355 files changed, 73657 insertions, 79280 deletions

diff --git a/src/H5.c b/src/H5.c
index ab7d45c..749f7af 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -15,40 +15,36 @@
 /* Module Setup */
 /****************/
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"          /* Generic Functions                    */
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Dprivate.h"         /* Datasets                             */
-#include "H5Eprivate.h"         /* Error handling                       */
-#include "H5FLprivate.h"        /* Free lists                           */
-#include "H5Lprivate.h"         /* Links                                */
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Pprivate.h"         /* Property lists                       */
-#include "H5SLprivate.h"        /* Skip lists                           */
-#include "H5Tprivate.h"         /* Datatypes                            */
+#include "H5private.h"   /* Generic Functions                    */
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Dprivate.h"  /* Datasets                             */
+#include "H5Eprivate.h"  /* Error handling                       */
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Lprivate.h"  /* Links                                */
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Pprivate.h"  /* Property lists                       */
+#include "H5SLprivate.h" /* Skip lists                           */
+#include "H5Tprivate.h"  /* Datatypes                            */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static void H5_debug_mask(const char*);
+static void H5_debug_mask(const char *);
 #ifdef H5_HAVE_PARALLEL
 static int H5_mpi_delete_cb(MPI_Comm comm, int keyval, void *attr_val, int *flag);
 #endif /*H5_HAVE_PARALLEL*/
@@ -57,7 +53,6 @@ static int H5_mpi_delete_cb(MPI_Comm comm, int keyval, void *attr_val, int *flag
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
@@ -67,23 +62,21 @@ static int H5_mpi_delete_cb(MPI_Comm comm, int keyval, void *attr_val, int *flag
 #ifdef H5_HAVE_THREADSAFE
 H5_api_t H5_g;
 #else
-hbool_t H5_libinit_g = FALSE;   /* Library hasn't been initialized */
+hbool_t H5_libinit_g = FALSE; /* Library hasn't been initialized */
 #endif
 
 #ifdef H5_HAVE_MPE
-hbool_t H5_MPEinit_g = FALSE;	/* MPE Library hasn't been initialized */
+hbool_t H5_MPEinit_g = FALSE; /* MPE Library hasn't been initialized */
 #endif
 
-char			H5_lib_vers_info_g[] = H5_VERS_INFO;
-static hbool_t          H5_dont_atexit_g = FALSE;
-H5_debug_t		H5_debug_g;		/*debugging info	*/
-
+char           H5_lib_vers_info_g[] = H5_VERS_INFO;
+static hbool_t H5_dont_atexit_g     = FALSE;
+H5_debug_t     H5_debug_g; /*debugging info	*/
 
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*--------------------------------------------------------------------------
  * NAME
  *   H5_init_library -- Initialize library-global information
@@ -107,12 +100,12 @@ H5_init_library(void)
 
 #ifdef H5_HAVE_PARALLEL
     {
-	int mpi_initialized;
-	int mpi_finalized;
+        int mpi_initialized;
+        int mpi_finalized;
         int mpi_code;
 
-	MPI_Initialized(&mpi_initialized);
-	MPI_Finalized(&mpi_finalized);
+        MPI_Initialized(&mpi_initialized);
+        MPI_Finalized(&mpi_finalized);
 
 #ifdef H5_HAVE_MPE
         /* Initialize MPE instrumentation library. */
@@ -120,7 +113,7 @@ H5_init_library(void)
             int mpe_code;
             if (mpi_initialized && !mpi_finalized) {
                 mpe_code = MPE_Init_log();
-                HDassert(mpe_code >=0);
+                HDassert(mpe_code >= 0);
                 H5_MPEinit_g = TRUE;
             }
         }
@@ -131,15 +124,15 @@ H5_init_library(void)
         if (mpi_initialized && !mpi_finalized) {
             int key_val;
 
-            if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, 
-                                                                 (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, 
-                                                                 &key_val, NULL)))
+            if (MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(
+                                    MPI_COMM_NULL_COPY_FN, (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb,
+                                    &key_val, NULL)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code)
 
-            if(MPI_SUCCESS != (mpi_code = MPI_Comm_set_attr(MPI_COMM_SELF, key_val, NULL)))
+            if (MPI_SUCCESS != (mpi_code = MPI_Comm_set_attr(MPI_COMM_SELF, key_val, NULL)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Comm_set_attr failed", mpi_code)
 
-            if(MPI_SUCCESS != (mpi_code = MPI_Comm_free_keyval(&key_val)))
+            if (MPI_SUCCESS != (mpi_code = MPI_Comm_free_keyval(&key_val)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Comm_free_keyval failed", mpi_code)
         }
     }
@@ -149,24 +142,24 @@ H5_init_library(void)
      * Make sure the package information is updated.
      */
     HDmemset(&H5_debug_g, 0, sizeof H5_debug_g);
-    H5_debug_g.pkg[H5_PKG_A].name = "a";
+    H5_debug_g.pkg[H5_PKG_A].name  = "a";
     H5_debug_g.pkg[H5_PKG_AC].name = "ac";
-    H5_debug_g.pkg[H5_PKG_B].name = "b";
-    H5_debug_g.pkg[H5_PKG_D].name = "d";
-    H5_debug_g.pkg[H5_PKG_E].name = "e";
-    H5_debug_g.pkg[H5_PKG_F].name = "f";
-    H5_debug_g.pkg[H5_PKG_G].name = "g";
+    H5_debug_g.pkg[H5_PKG_B].name  = "b";
+    H5_debug_g.pkg[H5_PKG_D].name  = "d";
+    H5_debug_g.pkg[H5_PKG_E].name  = "e";
+    H5_debug_g.pkg[H5_PKG_F].name  = "f";
+    H5_debug_g.pkg[H5_PKG_G].name  = "g";
     H5_debug_g.pkg[H5_PKG_HG].name = "hg";
     H5_debug_g.pkg[H5_PKG_HL].name = "hl";
-    H5_debug_g.pkg[H5_PKG_I].name = "i";
+    H5_debug_g.pkg[H5_PKG_I].name  = "i";
     H5_debug_g.pkg[H5_PKG_MF].name = "mf";
     H5_debug_g.pkg[H5_PKG_MM].name = "mm";
-    H5_debug_g.pkg[H5_PKG_O].name = "o";
-    H5_debug_g.pkg[H5_PKG_P].name = "p";
-    H5_debug_g.pkg[H5_PKG_S].name = "s";
-    H5_debug_g.pkg[H5_PKG_T].name = "t";
-    H5_debug_g.pkg[H5_PKG_V].name = "v";
-    H5_debug_g.pkg[H5_PKG_Z].name = "z";
+    H5_debug_g.pkg[H5_PKG_O].name  = "o";
+    H5_debug_g.pkg[H5_PKG_P].name  = "p";
+    H5_debug_g.pkg[H5_PKG_S].name  = "s";
+    H5_debug_g.pkg[H5_PKG_T].name  = "t";
+    H5_debug_g.pkg[H5_PKG_V].name  = "v";
+    H5_debug_g.pkg[H5_PKG_Z].name  = "z";
 
     /*
      * Install atexit() library cleanup routines unless the H5dont_atexit()
@@ -181,7 +174,7 @@ H5_init_library(void)
          * This must be entered before the library cleanup code so it's
          * executed in LIFO order (i.e., last).
          */
-	    (void)HDatexit(H5TS_win32_process_exit);
+        (void)HDatexit(H5TS_win32_process_exit);
 #endif /* H5_HAVE_THREADSAFE && H5_HAVE_WIN_THREADS */
 
         /* Normal library termination code */
@@ -200,17 +193,17 @@ H5_init_library(void)
      * The link interface needs to be initialized so that link property lists
      * have their properties registered.
      */
-    if(H5E_init() < 0)
+    if (H5E_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize error interface")
-    if(H5P_init() < 0)
+    if (H5P_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize property list interface")
-    if(H5T_init() < 0)
+    if (H5T_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize datatype interface")
-    if(H5D_init() < 0)
+    if (H5D_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize dataset interface")
-    if(H5AC_init() < 0)
+    if (H5AC_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize metadata caching interface")
-    if(H5L_init() < 0)
+    if (H5L_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize link interface")
 
     /* Debugging? */
@@ -221,7 +214,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5_init_library() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_term_library
  *
@@ -241,9 +233,9 @@ done:
 void
 H5_term_library(void)
 {
-    int	pending, ntries = 0, n;
-    size_t	at = 0;
-    char	loop[1024];
+    int         pending, ntries = 0, n;
+    size_t      at = 0;
+    char        loop[1024];
     H5E_auto2_t func;
 
 #ifdef H5_HAVE_THREADSAFE
@@ -253,8 +245,8 @@ H5_term_library(void)
 #endif
 
     /* Don't do anything if the library is already closed */
-    if(!(H5_INIT_GLOBAL))
-	goto done;
+    if (!(H5_INIT_GLOBAL))
+        goto done;
 
     /* Check if we should display error output */
     (void)H5Eget_auto2(H5E_DEFAULT, &func, NULL);
@@ -264,30 +256,26 @@ H5_term_library(void)
      * value if they do something that might affect some other interface in a
      * way that would necessitate some cleanup work in the other interface.
      */
-#define DOWN(F)								      \
-    (((n = H5##F##_term_interface()) && (at + 8) < sizeof loop)?	      \
-     (HDsprintf(loop + at, "%s%s", (at ? "," : ""), #F),			      \
-      at += HDstrlen(loop + at),					      \
-      n):                                                                     \
-     ((n > 0 && (at + 5) < sizeof loop) ?				      \
-     (HDsprintf(loop + at, "..."),					      \
-      at += HDstrlen(loop + at),					      \
-     n) : n))
+#define DOWN(F)                                                                                              \
+    (((n = H5##F##_term_interface()) && (at + 8) < sizeof loop)                                              \
+         ? (HDsprintf(loop + at, "%s%s", (at ? "," : ""), #F), at += HDstrlen(loop + at), n)                 \
+         : ((n > 0 && (at + 5) < sizeof loop) ? (HDsprintf(loop + at, "..."), at += HDstrlen(loop + at), n)  \
+                                              : n))
 
     do {
-	pending = 0;
+        pending = 0;
         /* Try to organize these so the "higher" level components get shut
          * down before "lower" level components that they might rely on. -QAK
          */
-	pending += DOWN(R);
-	pending += DOWN(D);
-	pending += DOWN(L);
-	pending += DOWN(G);
-	pending += DOWN(A);
-	pending += DOWN(S);
-	pending += DOWN(T);
+        pending += DOWN(R);
+        pending += DOWN(D);
+        pending += DOWN(L);
+        pending += DOWN(G);
+        pending += DOWN(A);
+        pending += DOWN(S);
+        pending += DOWN(T);
         /* Don't shut down the file code until objects in files are shut down */
-        if(pending == 0)
+        if (pending == 0)
             pending += DOWN(F);
 
         /* Don't shut down "low-level" components until "high-level" components
@@ -295,7 +283,7 @@ H5_term_library(void)
          * from being closed "out from underneath" of the high-level objects
          * that depend on them. -QAK
          */
-        if(pending == 0) {
+        if (pending == 0) {
             pending += DOWN(AC);
             pending += DOWN(Z);
             pending += DOWN(FD);
@@ -303,36 +291,36 @@ H5_term_library(void)
             pending += DOWN(PL);
 
             /* Don't shut down the error code until other APIs which use it are shut down */
-            if(pending == 0)
+            if (pending == 0)
                 pending += DOWN(E);
             /* Don't shut down the ID code until other APIs which use them are shut down */
-            if(pending == 0)
+            if (pending == 0)
                 pending += DOWN(I);
             /* Don't shut down the skip list code until everything that uses it is down */
-            if(pending == 0)
+            if (pending == 0)
                 pending += DOWN(SL);
             /* Don't shut down the free list code until _everything_ else is down */
-            if(pending == 0)
+            if (pending == 0)
                 pending += DOWN(FL);
         }
-    } while(pending && ntries++ < 100);
+    } while (pending && ntries++ < 100);
 
-    if(pending) {
+    if (pending) {
         /* Only display the error message if the user is interested in them. */
-        if(func) {
+        if (func) {
             HDfprintf(stderr, "HDF5: infinite loop closing library\n");
             HDfprintf(stderr, "      %s\n", loop);
 #ifndef NDEBUG
             HDabort();
-#endif /* NDEBUG */
+#endif    /* NDEBUG */
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 #ifdef H5_HAVE_MPE
     /* Close MPE instrumentation library.  May need to move this
      * down if any of the below code involves using the instrumentation code.
      */
-    if(H5_MPEinit_g) {
+    if (H5_MPEinit_g) {
         int mpi_initialized;
         int mpi_finalized;
         int mpe_code;
@@ -342,15 +330,15 @@ H5_term_library(void)
 
         if (mpi_initialized && !mpi_finalized) {
             mpe_code = MPE_Finish_log("h5log");
-            HDassert(mpe_code >=0);
-        } /* end if */
-        H5_MPEinit_g = FALSE;	/* turn it off no matter what */
-    } /* end if */
+            HDassert(mpe_code >= 0);
+        }                     /* end if */
+        H5_MPEinit_g = FALSE; /* turn it off no matter what */
+    }                         /* end if */
 #endif
 
     /* Free open debugging streams */
-    while(H5_debug_g.open_stream) {
-        H5_debug_open_stream_t  *tmp_open_stream;
+    while (H5_debug_g.open_stream) {
+        H5_debug_open_stream_t *tmp_open_stream;
 
         tmp_open_stream = H5_debug_g.open_stream;
         (void)HDfclose(H5_debug_g.open_stream->stream);
@@ -368,7 +356,6 @@ done:
     return;
 } /* end H5_term_library() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5dont_atexit
  *
@@ -392,12 +379,12 @@ done:
 herr_t
 H5dont_atexit(void)
 {
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API_NOINIT_NOERR_NOFS
-    H5TRACE0("e","");
+    H5TRACE0("e", "");
 
-    if(H5_dont_atexit_g)
+    if (H5_dont_atexit_g)
         ret_value = FAIL;
     else
         H5_dont_atexit_g = TRUE;
@@ -405,7 +392,6 @@ H5dont_atexit(void)
     FUNC_LEAVE_API_NOFS(ret_value)
 } /* end H5dont_atexit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5garbage_collect
  *
@@ -426,20 +412,19 @@ H5dont_atexit(void)
 herr_t
 H5garbage_collect(void)
 {
-    herr_t                  ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE0("e","");
+    H5TRACE0("e", "");
 
     /* Call the garbage collection routines in the library */
-    if(H5FL_garbage_coll()<0)
+    if (H5FL_garbage_coll() < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "can't garbage collect objects")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5garbage_collect() */
+} /* end H5garbage_collect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5set_free_list_limits
  *
@@ -468,25 +453,24 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim,
-    int arr_list_lim, int blk_global_lim, int blk_list_lim)
+H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim, int arr_list_lim,
+                       int blk_global_lim, int blk_list_lim)
 {
-    herr_t                  ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "IsIsIsIsIsIs", reg_global_lim, reg_list_lim, arr_global_lim,
-             arr_list_lim, blk_global_lim, blk_list_lim);
+    H5TRACE6("e", "IsIsIsIsIsIs", reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim,
+             blk_list_lim);
 
     /* Call the free list function to actually set the limits */
-    if(H5FL_set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim,
-            blk_global_lim, blk_list_lim, blk_global_lim, blk_list_lim)<0)
+    if (H5FL_set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim,
+                                  blk_list_lim, blk_global_lim, blk_list_lim) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSET, FAIL, "can't set garbage collection limits")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5set_free_list_limits() */
+} /* end H5set_free_list_limits() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5_debug_mask
  *
@@ -513,102 +497,111 @@ done:
 static void
 H5_debug_mask(const char *s)
 {
-    FILE	*stream = stderr;
-    char	pkg_name[32], *rest;
-    size_t	i;
-    hbool_t	clear;
+    FILE *  stream = stderr;
+    char    pkg_name[32], *rest;
+    size_t  i;
+    hbool_t clear;
 
     while (s && *s) {
 
-        if (HDisalpha(*s) || '-'==*s || '+'==*s) {
+        if (HDisalpha(*s) || '-' == *s || '+' == *s) {
 
             /* Enable or Disable debugging? */
-            if ('-'==*s) {
+            if ('-' == *s) {
                 clear = TRUE;
                 s++;
-            } else if ('+'==*s) {
+            }
+            else if ('+' == *s) {
                 clear = FALSE;
                 s++;
-            } else {
+            }
+            else {
                 clear = FALSE;
             } /* end if */
 
             /* Get the name */
-            for (i=0; HDisalpha(*s); i++, s++)
-                if (i<sizeof pkg_name)
+            for (i = 0; HDisalpha(*s); i++, s++)
+                if (i < sizeof pkg_name)
                     pkg_name[i] = *s;
-            pkg_name[MIN(sizeof(pkg_name)-1, i)] = '\0';
+            pkg_name[MIN(sizeof(pkg_name) - 1, i)] = '\0';
 
             /* Trace, all, or one? */
             if (!HDstrcmp(pkg_name, "trace")) {
                 H5_debug_g.trace = clear ? NULL : stream;
-            } else if (!HDstrcmp(pkg_name, "ttop")) {
-                H5_debug_g.trace = stream;
-                H5_debug_g.ttop = (hbool_t)!clear;
-            } else if (!HDstrcmp(pkg_name, "ttimes")) {
+            }
+            else if (!HDstrcmp(pkg_name, "ttop")) {
                 H5_debug_g.trace = stream;
+                H5_debug_g.ttop  = (hbool_t)!clear;
+            }
+            else if (!HDstrcmp(pkg_name, "ttimes")) {
+                H5_debug_g.trace  = stream;
                 H5_debug_g.ttimes = (hbool_t)!clear;
-            } else if (!HDstrcmp(pkg_name, "all")) {
-                for (i=0; i<(size_t)H5_NPKGS; i++)
+            }
+            else if (!HDstrcmp(pkg_name, "all")) {
+                for (i = 0; i < (size_t)H5_NPKGS; i++)
                     H5_debug_g.pkg[i].stream = clear ? NULL : stream;
-            } else {
-                for (i=0; i<(size_t)H5_NPKGS; i++) {
+            }
+            else {
+                for (i = 0; i < (size_t)H5_NPKGS; i++) {
                     if (!HDstrcmp(H5_debug_g.pkg[i].name, pkg_name)) {
                         H5_debug_g.pkg[i].stream = clear ? NULL : stream;
                         break;
-		            } /* end if */
-                } /* end for */
-                if (i>=(size_t)H5_NPKGS)
+                    } /* end if */
+                }     /* end for */
+                if (i >= (size_t)H5_NPKGS)
                     HDfprintf(stderr, "HDF5_DEBUG: ignored %s\n", pkg_name);
             } /* end if-else */
-
-        } else if (HDisdigit(*s)) {
-            int fd = (int)HDstrtol(s, &rest, 0);
+        }
+        else if (HDisdigit(*s)) {
+            int                     fd = (int)HDstrtol(s, &rest, 0);
             H5_debug_open_stream_t *open_stream;
 
-            if((stream = HDfdopen(fd, "w")) != NULL) {
+            if ((stream = HDfdopen(fd, "w")) != NULL) {
                 (void)HDsetvbuf(stream, NULL, _IOLBF, (size_t)0);
 
-                if(NULL == (open_stream = (H5_debug_open_stream_t *)H5MM_malloc(sizeof(H5_debug_open_stream_t)))) {
+                if (NULL ==
+                    (open_stream = (H5_debug_open_stream_t *)H5MM_malloc(sizeof(H5_debug_open_stream_t)))) {
                     (void)HDfclose(stream);
                     return;
                 } /* end if */
 
-                open_stream->stream = stream;
-                open_stream->next = H5_debug_g.open_stream;
+                open_stream->stream    = stream;
+                open_stream->next      = H5_debug_g.open_stream;
                 H5_debug_g.open_stream = open_stream;
             } /* end if */
 
             s = rest;
-        } else {
+        }
+        else {
             s++;
         } /* end if-else */
-    } /* end while */
+    }     /* end while */
 
     return;
 
 } /* end H5_debug_mask() */
 
 #ifdef H5_HAVE_PARALLEL
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5_mpi_delete_cb
  *
- * Purpose:	Callback attribute on MPI_COMM_SELF to terminate the HDF5 
+ * Purpose:	Callback attribute on MPI_COMM_SELF to terminate the HDF5
  *              library when the communicator is destroyed, i.e. on MPI_Finalize.
  *
  * Return:	MPI_SUCCESS
  *
  *-------------------------------------------------------------------------
  */
-static int H5_mpi_delete_cb(MPI_Comm H5_ATTR_UNUSED comm, int H5_ATTR_UNUSED keyval, void H5_ATTR_UNUSED *attr_val, int H5_ATTR_UNUSED *flag)
+static int
+H5_mpi_delete_cb(MPI_Comm H5_ATTR_UNUSED comm, int H5_ATTR_UNUSED keyval, void H5_ATTR_UNUSED *attr_val,
+                 int H5_ATTR_UNUSED *flag)
 {
     H5_term_library();
     return MPI_SUCCESS;
 }
 #endif /*H5_HAVE_PARALLEL*/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5get_libversion
  *
@@ -628,21 +621,23 @@ static int H5_mpi_delete_cb(MPI_Comm H5_ATTR_UNUSED comm, int H5_ATTR_UNUSED key
 herr_t
 H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum)
 {
-    herr_t                  ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "*Iu*Iu*Iu", majnum, minnum, relnum);
 
     /* Set the version information */
-    if (majnum) *majnum = H5_VERS_MAJOR;
-    if (minnum) *minnum = H5_VERS_MINOR;
-    if (relnum) *relnum = H5_VERS_RELEASE;
+    if (majnum)
+        *majnum = H5_VERS_MAJOR;
+    if (minnum)
+        *minnum = H5_VERS_MINOR;
+    if (relnum)
+        *relnum = H5_VERS_RELEASE;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5get_libversion() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5check_version
  *
@@ -658,78 +653,76 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-#define VERSION_MISMATCH_WARNING \
-    "Warning! ***HDF5 library version mismatched error***\n" \
-    "The HDF5 header files used to compile this application do not match\n" \
-    "the version used by the HDF5 library to which this application is linked.\n" \
-    "Data corruption or segmentation faults may occur if the application continues.\n" \
-    "This can happen when an application was compiled by one version of HDF5 but\n" \
-    "linked with a different version of static or shared HDF5 library.\n" \
-    "You should recompile the application or check your shared library related\n" \
+#define VERSION_MISMATCH_WARNING                                                                             \
+    "Warning! ***HDF5 library version mismatched error***\n"                                                 \
+    "The HDF5 header files used to compile this application do not match\n"                                  \
+    "the version used by the HDF5 library to which this application is linked.\n"                            \
+    "Data corruption or segmentation faults may occur if the application continues.\n"                       \
+    "This can happen when an application was compiled by one version of HDF5 but\n"                          \
+    "linked with a different version of static or shared HDF5 library.\n"                                    \
+    "You should recompile the application or check your shared library related\n"                            \
     "settings such as 'LD_LIBRARY_PATH'.\n"
 
 herr_t
 H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
 {
-    char	lib_str[256];
-    char	substr[] = H5_VERS_SUBRELEASE;
-    static int	checked = 0;            /* If we've already checked the version info */
-    static unsigned int	disable_version_check = 0;      /* Set if the version check should be disabled */
-    static const char *version_mismatch_warning = VERSION_MISMATCH_WARNING;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    char                lib_str[256];
+    char                substr[]                 = H5_VERS_SUBRELEASE;
+    static int          checked                  = 0; /* If we've already checked the version info */
+    static unsigned int disable_version_check    = 0; /* Set if the version check should be disabled */
+    static const char * version_mismatch_warning = VERSION_MISMATCH_WARNING;
+    herr_t              ret_value                = SUCCEED; /* Return value */
 
     FUNC_ENTER_API_NOINIT_NOERR_NOFS
     H5TRACE3("e", "IuIuIu", majnum, minnum, relnum);
 
     /* Don't check again, if we already have */
     if (checked)
-	HGOTO_DONE(SUCCEED)
+        HGOTO_DONE(SUCCEED)
 
-    {    const char *s;  /* Environment string for disabling version check */
+    {
+        const char *s; /* Environment string for disabling version check */
 
         /* Allow different versions of the header files and library? */
-        s = HDgetenv ("HDF5_DISABLE_VERSION_CHECK");
+        s = HDgetenv("HDF5_DISABLE_VERSION_CHECK");
 
         if (s && HDisdigit(*s))
-            disable_version_check = (unsigned int)HDstrtol (s, NULL, 0);
+            disable_version_check = (unsigned int)HDstrtol(s, NULL, 0);
     }
 
-    if (H5_VERS_MAJOR!=majnum || H5_VERS_MINOR!=minnum ||
-            H5_VERS_RELEASE!=relnum) {
+    if (H5_VERS_MAJOR != majnum || H5_VERS_MINOR != minnum || H5_VERS_RELEASE != relnum) {
         switch (disable_version_check) {
-	case 0:
-	    HDfprintf(stderr, "%s%s", version_mismatch_warning,
-		     "You can, at your own risk, disable this warning by setting the environment\n"
-		     "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of '1'.\n"
-		     "Setting it to 2 or higher will suppress the warning messages totally.\n");
-	    /* Mention the versions we are referring to */
-	    HDfprintf (stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n",
-		     majnum, minnum, relnum,
-		     (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
-	    /* Show library settings if available */
-	    HDfprintf (stderr, "%s", H5libhdf5_settings);
-
-	    /* Bail out now. */
-	    HDfputs ("Bye...\n", stderr);
-	    HDabort ();
-	case 1:
-	    /* continue with a warning */
-	    /* Note that the warning message is embedded in the format string.*/
-            HDfprintf (stderr,
-                     "%s'HDF5_DISABLE_VERSION_CHECK' "
-                     "environment variable is set to %d, application will\n"
-                     "continue at your own risk.\n",
-		     version_mismatch_warning, disable_version_check);
-	    /* Mention the versions we are referring to */
-	    HDfprintf (stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n",
-		     majnum, minnum, relnum,
-		     (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
-	    /* Show library settings if available */
-	    HDfprintf (stderr, "%s", H5libhdf5_settings);
-	    break;
-	default:
-	    /* 2 or higher: continue silently */
-	    break;
+            case 0:
+                HDfprintf(stderr, "%s%s", version_mismatch_warning,
+                          "You can, at your own risk, disable this warning by setting the environment\n"
+                          "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of '1'.\n"
+                          "Setting it to 2 or higher will suppress the warning messages totally.\n");
+                /* Mention the versions we are referring to */
+                HDfprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum, relnum,
+                          (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
+                /* Show library settings if available */
+                HDfprintf(stderr, "%s", H5libhdf5_settings);
+
+                /* Bail out now. */
+                HDfputs("Bye...\n", stderr);
+                HDabort();
+            case 1:
+                /* continue with a warning */
+                /* Note that the warning message is embedded in the format string.*/
+                HDfprintf(stderr,
+                          "%s'HDF5_DISABLE_VERSION_CHECK' "
+                          "environment variable is set to %d, application will\n"
+                          "continue at your own risk.\n",
+                          version_mismatch_warning, disable_version_check);
+                /* Mention the versions we are referring to */
+                HDfprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum, relnum,
+                          (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
+                /* Show library settings if available */
+                HDfprintf(stderr, "%s", H5libhdf5_settings);
+                break;
+            default:
+                /* 2 or higher: continue silently */
+                break;
         } /* end switch */
 
     } /* end if */
@@ -737,39 +730,38 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
     /* Indicate that the version check has been performed */
     checked = 1;
 
-    if (!disable_version_check){
-	/*
-	 * Verify if H5_VERS_INFO is consistent with the other version information.
-	 * Check only the first sizeof(lib_str) char.  Assume the information
-	 * will fit within this size or enough significance.
-	 */
-	HDsnprintf(lib_str, sizeof(lib_str), "HDF5 library version: %d.%d.%d",
-	    H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
-	if(*substr) {
-	    HDstrncat(lib_str, "-", 1);
-	    HDstrncat(lib_str, substr, (sizeof(lib_str) - HDstrlen(lib_str)) - 1);
-	} /* end if */
-	if (HDstrcmp(lib_str, H5_lib_vers_info_g)){
-	    HDfputs ("Warning!  Library version information error.\n"
-		     "The HDF5 library version information are not "
-		     "consistent in its source code.\nThis is NOT a fatal error "
-		     "but should be corrected.  Setting the environment\n"
-		     "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of 1 "
-		     "will suppress\nthis warning.\n",
-		     stderr);
-	    HDfprintf (stderr, "Library version information are:\n"
-		     "H5_VERS_MAJOR=%d, H5_VERS_MINOR=%d, H5_VERS_RELEASE=%d, "
-		     "H5_VERS_SUBRELEASE=%s,\nH5_VERS_INFO=%s\n",
-		     H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE,
-		     H5_VERS_SUBRELEASE, H5_VERS_INFO);
-	} /* end if */
+    if (!disable_version_check) {
+        /*
+         * Verify if H5_VERS_INFO is consistent with the other version information.
+         * Check only the first sizeof(lib_str) char.  Assume the information
+         * will fit within this size or enough significance.
+         */
+        HDsnprintf(lib_str, sizeof(lib_str), "HDF5 library version: %d.%d.%d", H5_VERS_MAJOR, H5_VERS_MINOR,
+                   H5_VERS_RELEASE);
+        if (*substr) {
+            HDstrncat(lib_str, "-", 1);
+            HDstrncat(lib_str, substr, (sizeof(lib_str) - HDstrlen(lib_str)) - 1);
+        } /* end if */
+        if (HDstrcmp(lib_str, H5_lib_vers_info_g)) {
+            HDfputs("Warning!  Library version information error.\n"
+                    "The HDF5 library version information are not "
+                    "consistent in its source code.\nThis is NOT a fatal error "
+                    "but should be corrected.  Setting the environment\n"
+                    "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of 1 "
+                    "will suppress\nthis warning.\n",
+                    stderr);
+            HDfprintf(stderr,
+                      "Library version information are:\n"
+                      "H5_VERS_MAJOR=%d, H5_VERS_MINOR=%d, H5_VERS_RELEASE=%d, "
+                      "H5_VERS_SUBRELEASE=%s,\nH5_VERS_INFO=%s\n",
+                      H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE, H5_VERS_SUBRELEASE, H5_VERS_INFO);
+        } /* end if */
     }
 
 done:
     FUNC_LEAVE_API_NOFS(ret_value)
 } /* end H5check_version() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5open
  *
@@ -785,16 +777,15 @@ done:
 herr_t
 H5open(void)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API_NOCLEAR(FAIL)
-    H5TRACE0("e","");
+    H5TRACE0("e", "");
     /* all work is done by FUNC_ENTER() */
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5close
  *
@@ -813,14 +804,13 @@ H5close(void)
      * this function for an uninitialized library.
      */
     FUNC_ENTER_API_NOINIT_NOERR_NOFS
-    H5TRACE0("e","");
+    H5TRACE0("e", "");
 
     H5_term_library();
 
     FUNC_LEAVE_API_NOFS(SUCCEED)
 } /* end H5close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5allocate_memory
  *
@@ -840,7 +830,7 @@ H5close(void)
  * Return:
  *
  *      Success:    A pointer to the allocated buffer.
- *  
+ *
  *      Failure:    NULL
  *
  *-------------------------------------------------------------------------
@@ -853,7 +843,7 @@ H5allocate_memory(size_t size, hbool_t clear)
     FUNC_ENTER_API_NOINIT;
     H5TRACE2("*x", "zb", size, clear);
 
-    if(clear)
+    if (clear)
         ret_value = H5MM_calloc(size);
     else
         ret_value = H5MM_malloc(size);
@@ -862,7 +852,6 @@ H5allocate_memory(size_t size, hbool_t clear)
 
 } /* end H5allocate_memory() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5resize_memory
  *
@@ -882,7 +871,7 @@ H5allocate_memory(size_t size, hbool_t clear)
  * Return:
  *
  *      Success:    A pointer to the resized buffer.
- *  
+ *
  *      Failure:    NULL (the input buffer will be unchanged)
  *
  *-------------------------------------------------------------------------
@@ -901,7 +890,6 @@ H5resize_memory(void *mem, size_t size)
 
 } /* end H5resize_memory() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5free_memory
  *
@@ -927,7 +915,6 @@ H5free_memory(void *mem)
 
 } /* end H5free_memory() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5is_library_threadsafe
  *
@@ -947,19 +934,18 @@ H5is_library_threadsafe(hbool_t *is_ts)
     H5TRACE1("e", "*b", is_ts);
 
     HDassert(is_ts);
- 
+
 #ifdef H5_HAVE_THREADSAFE
     *is_ts = TRUE;
-#else /* H5_HAVE_THREADSAFE */
+#else  /* H5_HAVE_THREADSAFE */
     *is_ts = FALSE;
 #endif /* H5_HAVE_THREADSAFE */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5is_library_threadsafe() */
 
-
-#if defined(H5_HAVE_THREADSAFE) && defined(H5_BUILT_AS_DYNAMIC_LIB) \
-    && defined(H5_HAVE_WIN32_API) && defined(H5_HAVE_WIN_THREADS)
+#if defined(H5_HAVE_THREADSAFE) && defined(H5_BUILT_AS_DYNAMIC_LIB) && defined(H5_HAVE_WIN32_API) &&         \
+    defined(H5_HAVE_WIN_THREADS)
 /*-------------------------------------------------------------------------
  * Function:    DllMain
  *
@@ -984,35 +970,33 @@ DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved)
 
     BOOL fOkay = TRUE;
 
-    switch(fdwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        break;
+    switch (fdwReason) {
+        case DLL_PROCESS_ATTACH:
+            break;
 
-    case DLL_PROCESS_DETACH:
-        break;
+        case DLL_PROCESS_DETACH:
+            break;
 
-    case DLL_THREAD_ATTACH:
+        case DLL_THREAD_ATTACH:
 #ifdef H5_HAVE_WIN_THREADS
-        if(H5TS_win32_thread_enter() < 0)
-            fOkay = FALSE;
+            if (H5TS_win32_thread_enter() < 0)
+                fOkay = FALSE;
 #endif /* H5_HAVE_WIN_THREADS */
-        break;
+            break;
 
-    case DLL_THREAD_DETACH:
+        case DLL_THREAD_DETACH:
 #ifdef H5_HAVE_WIN_THREADS
-        if(H5TS_win32_thread_exit() < 0)
-            fOkay = FALSE;
+            if (H5TS_win32_thread_exit() < 0)
+                fOkay = FALSE;
 #endif /* H5_HAVE_WIN_THREADS */
-        break;
+            break;
 
-    default:
-        /* Shouldn't get here */
-        fOkay = FALSE;
-        break;
+        default:
+            /* Shouldn't get here */
+            fOkay = FALSE;
+            break;
     }
 
     return fOkay;
 }
 #endif /* H5_HAVE_WIN32_API && H5_BUILT_AS_DYNAMIC_LIB && H5_HAVE_WIN_THREADS && H5_HAVE_THREADSAFE*/
-
diff --git a/src/H5A.c b/src/H5A.c
index 93f8a34..58f5f51 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -15,31 +15,29 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg	*/
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	*/
+#define H5A_PACKAGE /*suppress error about including H5Apkg	*/
+#define H5O_PACKAGE /*suppress error about including H5Opkg	*/
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5A_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5A_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"		/* Object headers			*/
-#include "H5Sprivate.h"		/* Dataspace functions			*/
-#include "H5SMprivate.h"	/* Shared Object Header Messages	*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Sprivate.h"  /* Dataspace functions			*/
+#include "H5SMprivate.h" /* Shared Object Header Messages	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -48,30 +46,25 @@
 /* Data structure for callback for locating the index by name */
 typedef struct H5A_iter_cb1 {
     const char *name;
-    int idx;
+    int         idx;
 } H5A_iter_cb1;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -87,14 +80,12 @@ H5FL_BLK_DEFINE(attr_buf);
 
 /* Attribute ID class */
 static const H5I_class_t H5I_ATTR_CLS[1] = {{
-    H5I_ATTR,                   /* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,                          /* # of reserved IDs for class */
-    (H5I_free_t)H5A_close       /* Callback routine for closing objects of this class */
+    H5I_ATTR,             /* ID class value */
+    H5I_CLASS_REUSE_IDS,  /* Class flags */
+    0,                    /* # of reserved IDs for class */
+    (H5I_free_t)H5A_close /* Callback routine for closing objects of this class */
 }};
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_init
  *
@@ -111,7 +102,7 @@ static const H5I_class_t H5I_ATTR_CLS[1] = {{
 herr_t
 H5A_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -120,7 +111,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_init() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5A_init_interface -- Initialize interface-specific information
@@ -136,21 +126,20 @@ DESCRIPTION
 static herr_t
 H5A_init_interface(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /*
      * Create attribute ID type.
      */
-    if(H5I_register_type(H5I_ATTR_CLS) < 0)
+    if (H5I_register_type(H5I_ATTR_CLS) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_init_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5A_term_interface
@@ -170,32 +159,31 @@ done:
 int
 H5A_term_interface(void)
 {
-    int	n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
-	if(H5I_nmembers(H5I_ATTR) > 0) {
-	    (void)H5I_clear_type(H5I_ATTR, FALSE, FALSE);
+    if (H5_interface_initialize_g) {
+        if (H5I_nmembers(H5I_ATTR) > 0) {
+            (void)H5I_clear_type(H5I_ATTR, FALSE, FALSE);
             n++; /*H5I*/
-	} /* end if */
+        }        /* end if */
         else {
             /* Close deprecated interface */
             n += H5A__term_deprec_interface();
 
-	    /* Destroy the attribute object id group */
-	    (void)H5I_dec_type_ref(H5I_ATTR);
+            /* Destroy the attribute object id group */
+            (void)H5I_dec_type_ref(H5I_ATTR);
             n++; /*H5I*/
 
-	    /* Mark closed */
-	    H5_interface_initialize_g = 0;
-	} /* end else */
-    } /* end if */
+            /* Mark closed */
+            H5_interface_initialize_g = 0;
+        } /* end else */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* H5A_term_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Acreate2
@@ -226,49 +214,48 @@ H5A_term_interface(void)
 --------------------------------------------------------------------------*/
 /* ARGSUSED */
 hid_t
-H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id,
-    hid_t acpl_id, hid_t H5_ATTR_UNUSED aapl_id)
+H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id,
+           hid_t H5_ATTR_UNUSED aapl_id)
 {
-    H5A_t	        *attr = NULL;           /* Attribute created */
-    H5G_loc_t           loc;                    /* Object location */
-    H5T_t		*type;                  /* Datatype to use for attribute */
-    H5S_t		*space;                 /* Dataspace to use for attribute */
-    hid_t		ret_value;              /* Return value */
+    H5A_t *   attr = NULL; /* Attribute created */
+    H5G_loc_t loc;         /* Object location */
+    H5T_t *   type;        /* Datatype to use for attribute */
+    H5S_t *   space;       /* Dataspace to use for attribute */
+    hid_t     ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("i", "i*siiii", loc_id, attr_name, type_id, space_id, acpl_id, aapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(0 == (H5F_INTENT(loc.oloc->file) & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_ARGS, H5E_WRITEERROR, FAIL, "no write intent on file")
-    if(!attr_name || !*attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a type")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (0 == (H5F_INTENT(loc.oloc->file) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_ARGS, H5E_WRITEERROR, FAIL, "no write intent on file")
+    if (!attr_name || !*attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a type")
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Go do the real work for attaching the attribute to the dataset */
-    if(NULL == (attr = H5A_create(&loc, attr_name, type, space, acpl_id, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
+    if (NULL == (attr = H5A_create(&loc, attr_name, type, space, acpl_id, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
 
     /* Register the new attribute and get an ID for it */
-    if((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register attribute for ID")
 
 done:
     /* Cleanup on failure */
-    if(ret_value < 0 && attr && H5A_close(attr) < 0)
+    if (ret_value < 0 && attr && H5A_close(attr) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Acreate2() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Acreate_by_name
@@ -301,39 +288,37 @@ done:
 --------------------------------------------------------------------------*/
 /* ARGSUSED */
 hid_t
-H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
-    hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t H5_ATTR_UNUSED aapl_id,
-    hid_t lapl_id)
+H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id,
+                  hid_t acpl_id, hid_t H5_ATTR_UNUSED aapl_id, hid_t lapl_id)
 {
-    H5A_t	        *attr = NULL;           /* Attribute created */
-    H5G_loc_t           loc;                    /* Object location */
-    H5G_loc_t           obj_loc;                /* Location used to open group */
-    H5G_name_t          obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t           obj_oloc;            	/* Opened object object location */
-    hbool_t             loc_found = FALSE;      /* Entry at 'obj_name' found */
-    H5T_t		*type;                  /* Datatype to use for attribute */
-    H5S_t		*space;                 /* Dataspace to use for attribute */
-    hid_t		ret_value;              /* Return value */
+    H5A_t *    attr = NULL;       /* Attribute created */
+    H5G_loc_t  loc;               /* Object location */
+    H5G_loc_t  obj_loc;           /* Location used to open group */
+    H5G_name_t obj_path;          /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;          /* Opened object object location */
+    hbool_t    loc_found = FALSE; /* Entry at 'obj_name' found */
+    H5T_t *    type;              /* Datatype to use for attribute */
+    H5S_t *    space;             /* Dataspace to use for attribute */
+    hid_t      ret_value;         /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("i", "i*s*siiiii", loc_id, obj_name, attr_name, type_id, space_id,
-             acpl_id, aapl_id, lapl_id);
+    H5TRACE8("i", "i*s*siiiii", loc_id, obj_name, attr_name, type_id, space_id, acpl_id, aapl_id, lapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(0 == (H5F_INTENT(loc.oloc->file) & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_ARGS, H5E_WRITEERROR, FAIL, "no write intent on file")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(!attr_name || !*attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a type")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (0 == (H5F_INTENT(loc.oloc->file) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_ARGS, H5E_WRITEERROR, FAIL, "no write intent on file")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (!attr_name || !*attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a type")
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Set up opened group location to fill in */
     obj_loc.oloc = &obj_oloc;
@@ -341,28 +326,27 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find(&loc, obj_name, &obj_loc /*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Go do the real work for attaching the attribute to the dataset */
-    if(NULL == (attr = H5A_create(&obj_loc, attr_name, type, space, acpl_id, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
+    if (NULL == (attr = H5A_create(&obj_loc, attr_name, type, space, acpl_id, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
 
     /* Register the new attribute and get an ID for it */
-    if((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register attribute for ID")
 done:
     /* Release resources */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location")
-    if(ret_value < 0 && attr && H5A_close(attr) < 0)
-            HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
+    if (ret_value < 0 && attr && H5A_close(attr) < 0)
+        HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Acreate_by_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aopen
@@ -385,43 +369,43 @@ done:
 hid_t
 H5Aopen(hid_t loc_id, const char *attr_name, hid_t H5_ATTR_UNUSED aapl_id)
 {
-    H5G_loc_t    	loc;            /* Object location */
-    H5A_t               *attr = NULL;   /* Attribute opened */
-    hid_t		ret_value;
+    H5G_loc_t loc;         /* Object location */
+    H5A_t *   attr = NULL; /* Attribute opened */
+    hid_t     ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "i*si", loc_id, attr_name, aapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!attr_name || !*attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!attr_name || !*attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
 
     /* Read in attribute from object header */
-    if(NULL == (attr = H5O_attr_open_by_name(loc.oloc, attr_name, H5AC_ind_dxpl_id)))
-        HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to load attribute info from object header for attribute: '%s'", attr_name)
+    if (NULL == (attr = H5O_attr_open_by_name(loc.oloc, attr_name, H5AC_ind_dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL,
+                    "unable to load attribute info from object header for attribute: '%s'", attr_name)
 
     /* Finish initializing attribute */
-    if(H5A_open_common(&loc, attr) < 0)
+    if (H5A_open_common(&loc, attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to initialize attribute")
 
     /* Register the attribute and get an ID for it */
-    if((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register attribute for ID")
 
 done:
     /* Cleanup on failure */
-    if(ret_value < 0)
-        if(attr && H5A_close(attr) < 0)
+    if (ret_value < 0)
+        if (attr && H5A_close(attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aopen() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aopen_by_name
@@ -444,49 +428,47 @@ done:
     H5Aclose or resource leaks will develop.
 --------------------------------------------------------------------------*/
 hid_t
-H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
-    hid_t H5_ATTR_UNUSED aapl_id, hid_t lapl_id)
+H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t H5_ATTR_UNUSED aapl_id,
+                hid_t lapl_id)
 {
-    H5G_loc_t    	loc;            /* Object location */
-    H5A_t               *attr = NULL;   /* Attribute opened */
-    hid_t		ret_value;
+    H5G_loc_t loc;         /* Object location */
+    H5A_t *   attr = NULL; /* Attribute opened */
+    hid_t     ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("i", "i*s*sii", loc_id, obj_name, attr_name, aapl_id, lapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(!attr_name || !*attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (!attr_name || !*attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_name(&loc, obj_name, attr_name, lapl_id, H5AC_ind_dxpl_id)))
+    if (NULL == (attr = H5A_open_by_name(&loc, obj_name, attr_name, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Register the attribute and get an ID for it */
-    if((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register attribute for ID")
 
 done:
     /* Cleanup on failure */
-    if(ret_value < 0)
-        if(attr && H5A_close(attr) < 0)
+    if (ret_value < 0)
+        if (attr && H5A_close(attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aopen_by_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aopen_by_idx
@@ -512,52 +494,49 @@ done:
     H5Aclose or resource leaks will develop.
 --------------------------------------------------------------------------*/
 hid_t
-H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, hid_t H5_ATTR_UNUSED aapl_id, hid_t lapl_id)
+H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+               hid_t H5_ATTR_UNUSED aapl_id, hid_t lapl_id)
 {
-    H5A_t       *attr = NULL;   /* Attribute opened */
-    H5G_loc_t	loc;	        /* Object location */
-    hid_t	ret_value;      /* Return value */
+    H5A_t *   attr = NULL; /* Attribute opened */
+    H5G_loc_t loc;         /* Object location */
+    hid_t     ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("i", "i*sIiIohii", loc_id, obj_name, idx_type, order, n, aapl_id,
-             lapl_id);
+    H5TRACE7("i", "i*sIiIohii", loc_id, obj_name, idx_type, order, n, aapl_id, lapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute in the object header */
-    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
+    if (NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open attribute")
 
     /* Register the attribute and get an ID for it */
-    if((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register attribute for ID")
 
 done:
     /* Cleanup on failure */
-    if(ret_value < 0)
-        if(attr && H5A_close(attr) < 0)
+    if (ret_value < 0)
+        if (attr && H5A_close(attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aopen_by_idx() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Awrite
@@ -577,30 +556,29 @@ done:
 herr_t
 H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf)
 {
-    H5A_t *attr;                /* Attribute object for ID */
-    H5T_t *mem_type;            /* Memory datatype */
-    herr_t ret_value;           /* Return value */
+    H5A_t *attr;      /* Attribute object for ID */
+    H5T_t *mem_type;  /* Memory datatype */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
 
     /* check arguments */
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
-    if(NULL == (mem_type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
+    if (NULL == (mem_type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(NULL == buf)
+    if (NULL == buf)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null attribute buffer")
 
     /* Go write the actual data to the attribute */
-    if((ret_value = H5A_write(attr, mem_type, buf, H5AC_dxpl_id)) < 0)
+    if ((ret_value = H5A_write(attr, mem_type, buf, H5AC_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "unable to write attribute")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Awrite() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aread
@@ -620,30 +598,29 @@ done:
 herr_t
 H5Aread(hid_t attr_id, hid_t dtype_id, void *buf)
 {
-    H5A_t *attr;                /* Attribute object for ID */
-    H5T_t *mem_type;            /* Memory datatype */
-    herr_t ret_value;           /* Return value */
+    H5A_t *attr;      /* Attribute object for ID */
+    H5T_t *mem_type;  /* Memory datatype */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
 
     /* check arguments */
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
-    if(NULL == (mem_type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
+    if (NULL == (mem_type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(NULL == buf)
+    if (NULL == buf)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null attribute buffer")
 
     /* Go write the actual data to the attribute */
-    if((ret_value = H5A_read(attr, mem_type, buf, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5A_read(attr, mem_type, buf, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_READERROR, FAIL, "unable to read attribute")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Aread() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aget_space
@@ -663,34 +640,33 @@ done:
 hid_t
 H5Aget_space(hid_t attr_id)
 {
-    H5A_t	*attr;                  /* Attribute object for ID */
-    H5S_t      *ds = NULL;
-    hid_t	ret_value;
+    H5A_t *attr; /* Attribute object for ID */
+    H5S_t *ds = NULL;
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", attr_id);
 
     /* check arguments */
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
 
-    if(NULL == (ds = H5A_get_space(attr)))
+    if (NULL == (ds = H5A_get_space(attr)))
         HGOTO_ERROR(H5E_ARGS, H5E_CANTGET, FAIL, "can't get space ID of attribute")
 
     /* Atomize */
-    if((ret_value = H5I_register(H5I_DATASPACE, ds, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASPACE, ds, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom")
 
 done:
-    if(ret_value < 0) {
-        if(ds && (H5S_close(ds) < 0))
+    if (ret_value < 0) {
+        if (ds && (H5S_close(ds) < 0))
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataspace")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aget_space() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aget_type
@@ -710,34 +686,33 @@ done:
 hid_t
 H5Aget_type(hid_t attr_id)
 {
-    H5A_t	*attr;          /* Attribute object for ID */
-    H5T_t      *dt = NULL;
-    hid_t	 ret_value;     /* Return value */
+    H5A_t *attr; /* Attribute object for ID */
+    H5T_t *dt = NULL;
+    hid_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", attr_id);
 
     /* check arguments */
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
 
-    if(NULL == (dt = H5A_get_type(attr)))
+    if (NULL == (dt = H5A_get_type(attr)))
         HGOTO_ERROR(H5E_ARGS, H5E_CANTGET, FAIL, "can't get space ID of attribute")
 
     /* Create an atom */
-    if((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register datatype")
 
 done:
-    if(ret_value < 0) {
-        if(dt && (H5T_close(dt) < 0))
+    if (ret_value < 0) {
+        if (dt && (H5T_close(dt) < 0))
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release datatype")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aget_type() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aget_create_plist
@@ -760,8 +735,8 @@ done:
 hid_t
 H5Aget_create_plist(hid_t attr_id)
 {
-    H5A_t		*attr;               /* Attribute object for ID */
-    hid_t		ret_value;
+    H5A_t *attr; /* Attribute object for ID */
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", attr_id);
@@ -769,17 +744,16 @@ H5Aget_create_plist(hid_t attr_id)
     HDassert(H5P_LST_ATTRIBUTE_CREATE_ID_g != -1);
 
     /* Get attribute and default attribute creation property list*/
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
 
-    if((ret_value = H5A_get_create_plist(attr)) < 0)
+    if ((ret_value = H5A_get_create_plist(attr)) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTGET, FAIL, "can't get creation property list for attr")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Aget_create_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aget_name
@@ -804,27 +778,26 @@ done:
 ssize_t
 H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
 {
-    H5A_t		*my_attr;               /* Attribute object for ID */
-    ssize_t		ret_value;
+    H5A_t * my_attr; /* Attribute object for ID */
+    ssize_t ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "iz*s", attr_id, buf_size, buf);
 
     /* check arguments */
-    if(NULL == (my_attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (my_attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
-    if(!buf && buf_size)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer")
+    if (!buf && buf_size)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer")
 
     /* Call private function in turn */
-    if(0 > (ret_value = H5A_get_name(my_attr, buf_size, buf)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get attribute name")
+    if (0 > (ret_value = H5A_get_name(my_attr, buf_size, buf)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get attribute name")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Aget_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Aget_name_by_idx
  *
@@ -843,58 +816,54 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, char *name /*out*/, size_t size,
-    hid_t lapl_id)
+H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                   char *name /*out*/, size_t size, hid_t lapl_id)
 {
-    H5G_loc_t   loc;            /* Object location */
-    H5A_t	*attr = NULL;   /* Attribute object for name */
-    ssize_t	ret_value;      /* Return value */
+    H5G_loc_t loc;         /* Object location */
+    H5A_t *   attr = NULL; /* Attribute object for name */
+    ssize_t   ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("Zs", "i*sIiIohxzi", loc_id, obj_name, idx_type, order, n, name, size,
-             lapl_id);
+    H5TRACE8("Zs", "i*sIiIohxzi", loc_id, obj_name, idx_type, order, n, name, size, lapl_id);
 
     /* Check args */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
+    if (NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Get the length of the name */
     ret_value = (ssize_t)HDstrlen(attr->shared->name);
 
     /* Copy the name into the user's buffer, if given */
-    if(name) {
+    if (name) {
         HDstrncpy(name, attr->shared->name, MIN((size_t)(ret_value + 1), size));
-        if((size_t)ret_value >= size)
-            name[size - 1]='\0';
+        if ((size_t)ret_value >= size)
+            name[size - 1] = '\0';
     } /* end if */
 
 done:
     /* Release resources */
-    if(attr && H5A_close(attr) < 0)
+    if (attr && H5A_close(attr) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Aget_name_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Aget_storage_size
  *
@@ -915,14 +884,14 @@ done:
 hsize_t
 H5Aget_storage_size(hid_t attr_id)
 {
-    H5A_t	*attr;               /* Attribute object for ID */
-    hsize_t	ret_value;      /* Return value */
+    H5A_t * attr;      /* Attribute object for ID */
+    hsize_t ret_value; /* Return value */
 
     FUNC_ENTER_API(0)
     H5TRACE1("h", "i", attr_id);
 
     /* Check args */
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not an attribute")
 
     /* Set return value */
@@ -932,7 +901,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Aget_storage_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Aget_info
  *
@@ -949,25 +917,24 @@ done:
 herr_t
 H5Aget_info(hid_t attr_id, H5A_info_t *ainfo)
 {
-    H5A_t	*attr;                  /* Attribute object for name */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5A_t *attr;                /* Attribute object for name */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", attr_id, ainfo);
 
     /* Check args */
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
 
     /* Get the attribute information */
-    if(H5A_get_info(attr, ainfo) < 0)
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to get attribute info")
+    if (H5A_get_info(attr, ainfo) < 0)
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to get attribute info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Aget_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Aget_info_by_name
  *
@@ -982,50 +949,48 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
-    H5A_info_t *ainfo, hid_t lapl_id)
+H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, H5A_info_t *ainfo,
+                    hid_t lapl_id)
 {
-    H5G_loc_t   loc;                    /* Object location */
-    H5A_t	*attr = NULL;           /* Attribute object for name */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Object location */
+    H5A_t *   attr      = NULL;    /* Attribute object for name */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "i*s*s*xi", loc_id, obj_name, attr_name, ainfo, lapl_id);
 
     /* Check args */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(!attr_name || !*attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
-    if(NULL == ainfo)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (!attr_name || !*attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
+    if (NULL == ainfo)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid info pointer")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_name(&loc, obj_name, attr_name, lapl_id, H5AC_ind_dxpl_id)))
+    if (NULL == (attr = H5A_open_by_name(&loc, obj_name, attr_name, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Get the attribute information */
-    if(H5A_get_info(attr, ainfo) < 0)
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to get attribute info")
+    if (H5A_get_info(attr, ainfo) < 0)
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to get attribute info")
 
 done:
     /* Cleanup on failure */
-    if(attr && H5A_close(attr) < 0)
+    if (attr && H5A_close(attr) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Aget_info_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Aget_info_by_idx
  *
@@ -1041,53 +1006,50 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, H5A_info_t *ainfo, hid_t lapl_id)
+H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                   H5A_info_t *ainfo, hid_t lapl_id)
 {
-    H5G_loc_t   loc;                    /* Object location */
-    H5A_t	*attr = NULL;           /* Attribute object for name */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Object location */
+    H5A_t *   attr      = NULL;    /* Attribute object for name */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "i*sIiIoh*xi", loc_id, obj_name, idx_type, order, n, ainfo,
-             lapl_id);
+    H5TRACE7("e", "i*sIiIoh*xi", loc_id, obj_name, idx_type, order, n, ainfo, lapl_id);
 
     /* Check args */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(NULL == ainfo)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (NULL == ainfo)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid info pointer")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
+    if (NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Get the attribute information */
-    if(H5A_get_info(attr, ainfo) < 0)
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to get attribute info")
+    if (H5A_get_info(attr, ainfo) < 0)
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to get attribute info")
 
 done:
     /* Release resources */
-    if(attr && H5A_close(attr) < 0)
+    if (attr && H5A_close(attr) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Aget_info_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Arename
  *
@@ -1104,26 +1066,26 @@ done:
 herr_t
 H5Arename(hid_t loc_id, const char *old_name, const char *new_name)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*s*s", loc_id, old_name, new_name);
 
     /* check arguments */
-    if(!old_name || !new_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "name is nil")
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (!old_name || !new_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "name is nil")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
 
     /* Avoid thrashing things if the names are the same */
-    if(HDstrcmp(old_name, new_name)) {
-        H5G_loc_t	loc;	                /* Object location */
-  
-        if(H5G_loc(loc_id, & loc) < 0)
+    if (HDstrcmp(old_name, new_name)) {
+        H5G_loc_t loc; /* Object location */
+
+        if (H5G_loc(loc_id, &loc) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Call private attribute rename routine */
-        if(H5O_attr_rename(loc.oloc, H5AC_dxpl_id, old_name, new_name) < 0)
+        if (H5O_attr_rename(loc.oloc, H5AC_dxpl_id, old_name, new_name) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute")
     } /* end if */
 
@@ -1131,7 +1093,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Arename() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Arename_by_name
  *
@@ -1146,39 +1107,37 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name,
-    const char *new_attr_name, hid_t lapl_id)
+H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name,
+                  hid_t lapl_id)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE5("e", "i*s*s*si", loc_id, obj_name, old_attr_name, new_attr_name,
-             lapl_id);
+    H5TRACE5("e", "i*s*s*si", loc_id, obj_name, old_attr_name, new_attr_name, lapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(!old_attr_name || !*old_attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no old attribute name")
-    if(!new_attr_name || !*new_attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new attribute name")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (!old_attr_name || !*old_attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no old attribute name")
+    if (!new_attr_name || !*new_attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new attribute name")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Avoid thrashing things if the names are the same */
-    if(HDstrcmp(old_attr_name, new_attr_name)) {
-        H5G_loc_t loc;                /* Object location */
+    if (HDstrcmp(old_attr_name, new_attr_name)) {
+        H5G_loc_t loc; /* Object location */
 
-        if(H5G_loc(loc_id, & loc) < 0)
+        if (H5G_loc(loc_id, &loc) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Call private attribute rename routine */
-        if(H5A_rename_by_name(loc, obj_name, old_attr_name, new_attr_name, lapl_id, H5AC_dxpl_id) < 0)
+        if (H5A_rename_by_name(loc, obj_name, old_attr_name, new_attr_name, lapl_id, H5AC_dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute")
     } /* end if */
 
@@ -1186,7 +1145,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Arename_by_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aiterate2
@@ -1229,43 +1187,43 @@ done:
             attribute.
 --------------------------------------------------------------------------*/
 herr_t
-H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t *idx, H5A_operator2_t op, void *op_data)
+H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx, H5A_operator2_t op,
+            void *op_data)
 {
-    H5A_attr_iter_op_t attr_op; /* Attribute operator */
-    hsize_t	start_idx;      /* Index of attribute to start iterating at */
-    hsize_t	last_attr;      /* Index of last attribute examined */
-    herr_t	ret_value;      /* Return value */
+    H5A_attr_iter_op_t attr_op;   /* Attribute operator */
+    hsize_t            start_idx; /* Index of attribute to start iterating at */
+    hsize_t            last_attr; /* Index of last attribute examined */
+    herr_t             ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iIiIo*hx*x", loc_id, idx_type, order, idx, op, op_data);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
 
     /* Build attribute operator info */
-    attr_op.op_type = H5A_ATTR_OP_APP2;
+    attr_op.op_type   = H5A_ATTR_OP_APP2;
     attr_op.u.app_op2 = op;
 
     /* Call attribute iteration routine */
     last_attr = start_idx = (idx ? *idx : 0);
-    if((ret_value = H5O_attr_iterate(loc_id, H5AC_ind_dxpl_id, idx_type, order, start_idx, &last_attr, &attr_op, op_data)) < 0)
+    if ((ret_value = H5O_attr_iterate(loc_id, H5AC_ind_dxpl_id, idx_type, order, start_idx, &last_attr,
+                                      &attr_op, op_data)) < 0)
         HERROR(H5E_ATTR, H5E_BADITER, "error iterating over attributes");
 
     /* Set the last attribute information */
-    if(idx)
+    if (idx)
         *idx = last_attr;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Aiterate2() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aiterate_by_name
@@ -1310,41 +1268,38 @@ done:
             attribute.
 --------------------------------------------------------------------------*/
 herr_t
-H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t *idx, H5A_operator2_t op, void *op_data,
-    hid_t lapl_id)
+H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                   hsize_t *idx, H5A_operator2_t op, void *op_data, hid_t lapl_id)
 {
-    H5G_loc_t	loc;	        /* Object location */
-    H5G_loc_t   obj_loc;        /* Location used to open group */
-    H5G_name_t  obj_path;       /* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;       /* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
-    hid_t       obj_loc_id = (-1);      /* ID for object located */
-    H5A_attr_iter_op_t attr_op; /* Attribute operator */
-    hsize_t	start_idx;      /* Index of attribute to start iterating at */
-    hsize_t	last_attr;      /* Index of last attribute examined */
-    herr_t	ret_value;      /* Return value */
+    H5G_loc_t          loc;                /* Object location */
+    H5G_loc_t          obj_loc;            /* Location used to open group */
+    H5G_name_t         obj_path;           /* Opened object group hier. path */
+    H5O_loc_t          obj_oloc;           /* Opened object object location */
+    hbool_t            loc_found  = FALSE; /* Entry at 'obj_name' found */
+    hid_t              obj_loc_id = (-1);  /* ID for object located */
+    H5A_attr_iter_op_t attr_op;            /* Attribute operator */
+    hsize_t            start_idx;          /* Index of attribute to start iterating at */
+    hsize_t            last_attr;          /* Index of last attribute examined */
+    herr_t             ret_value;          /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, obj_name, idx_type, order, idx, op,
-             op_data, lapl_id);
+    H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, obj_name, idx_type, order, idx, op, op_data, lapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up opened group location to fill in */
     obj_loc.oloc = &obj_oloc;
@@ -1352,40 +1307,40 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find(&loc, obj_name, &obj_loc /*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Open the object */
-    if((obj_loc_id = H5O_open_by_loc(&obj_loc, lapl_id, H5AC_ind_dxpl_id, TRUE)) < 0)
+    if ((obj_loc_id = H5O_open_by_loc(&obj_loc, lapl_id, H5AC_ind_dxpl_id, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     /* Build attribute operator info */
-    attr_op.op_type = H5A_ATTR_OP_APP2;
+    attr_op.op_type   = H5A_ATTR_OP_APP2;
     attr_op.u.app_op2 = op;
 
     /* Call attribute iteration routine */
     last_attr = start_idx = (idx ? *idx : 0);
-    if((ret_value = H5O_attr_iterate(obj_loc_id, H5AC_ind_dxpl_id, idx_type, order, start_idx, &last_attr, &attr_op, op_data)) < 0)
+    if ((ret_value = H5O_attr_iterate(obj_loc_id, H5AC_ind_dxpl_id, idx_type, order, start_idx, &last_attr,
+                                      &attr_op, op_data)) < 0)
         HERROR(H5E_ATTR, H5E_BADITER, "error iterating over attributes");
 
     /* Set the last attribute information */
-    if(idx)
+    if (idx)
         *idx = last_attr;
 
 done:
     /* Release resources */
-    if(obj_loc_id > 0) {
-        if(H5I_dec_app_ref(obj_loc_id) < 0)
+    if (obj_loc_id > 0) {
+        if (H5I_dec_app_ref(obj_loc_id) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "unable to close temporary object")
     } /* end if */
-    else if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    else if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aiterate_by_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Adelete
@@ -1403,29 +1358,28 @@ done:
 herr_t
 H5Adelete(hid_t loc_id, const char *name)
 {
-    H5G_loc_t	loc;		        /* Object location */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Object location */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", loc_id, name);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Delete the attribute from the location */
-    if(H5O_attr_remove(loc.oloc, name, H5AC_dxpl_id) < 0)
+    if (H5O_attr_remove(loc.oloc, name, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Adelete() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Adelete_by_name
@@ -1443,33 +1397,31 @@ done:
     This function removes the named attribute from an object.
 --------------------------------------------------------------------------*/
 herr_t
-H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
-    hid_t lapl_id)
+H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t lapl_id)
 {
-    H5G_loc_t	loc;		        /* Object location */
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t  loc;                 /* Object location */
+    H5G_loc_t  obj_loc;             /* Location used to open group */
+    H5G_name_t obj_path;            /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;            /* Opened object object location */
+    hbool_t    loc_found = FALSE;   /* Entry at 'obj_name' found */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*s*si", loc_id, obj_name, attr_name, lapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(!attr_name || !*attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (!attr_name || !*attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up opened group location to fill in */
     obj_loc.oloc = &obj_oloc;
@@ -1477,23 +1429,22 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find(&loc, obj_name, &obj_loc /*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Delete the attribute from the location */
-    if(H5O_attr_remove(obj_loc.oloc, attr_name, H5AC_dxpl_id) < 0)
+    if (H5O_attr_remove(obj_loc.oloc, attr_name, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
 
 done:
     /* Release resources */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Adelete_by_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Adelete_by_idx
@@ -1519,35 +1470,34 @@ done:
     object to operate on.
 --------------------------------------------------------------------------*/
 herr_t
-H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, hid_t lapl_id)
+H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                 hid_t lapl_id)
 {
-    H5G_loc_t	loc;		        /* Object location */
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t  loc;                 /* Object location */
+    H5G_loc_t  obj_loc;             /* Location used to open group */
+    H5G_name_t obj_path;            /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;            /* Opened object object location */
+    hbool_t    loc_found = FALSE;   /* Entry at 'obj_name' found */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "i*sIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up opened group location to fill in */
     obj_loc.oloc = &obj_oloc;
@@ -1555,23 +1505,22 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find(&loc, obj_name, &obj_loc /*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Delete the attribute from the location */
-    if(H5O_attr_remove_by_idx(obj_loc.oloc, idx_type, order, n, H5AC_dxpl_id) < 0)
+    if (H5O_attr_remove_by_idx(obj_loc.oloc, idx_type, order, n, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
 
 done:
     /* Release resources */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Adelete_by_idx() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aclose
@@ -1590,24 +1539,23 @@ done:
 herr_t
 H5Aclose(hid_t attr_id)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", attr_id);
 
     /* check arguments */
-    if(NULL == H5I_object_verify(attr_id, H5I_ATTR))
+    if (NULL == H5I_object_verify(attr_id, H5I_ATTR))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
 
     /* Decrement references to that atom (and close it) */
-    if(H5I_dec_app_ref(attr_id) < 0)
+    if (H5I_dec_app_ref(attr_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "can't close attribute")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Aclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Aexists
  *
@@ -1625,29 +1573,28 @@ done:
 htri_t
 H5Aexists(hid_t obj_id, const char *attr_name)
 {
-    H5G_loc_t   loc;                    /* Object location */
-    htri_t	ret_value;              /* Return value */
+    H5G_loc_t loc;       /* Object location */
+    htri_t    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("t", "i*s", obj_id, attr_name);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(obj_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(obj_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!attr_name || !*attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
+    if (H5I_ATTR == H5I_get_type(obj_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(obj_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!attr_name || !*attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
 
     /* Check if the attribute exists */
-    if((ret_value = H5O_attr_exists(loc.oloc, attr_name, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5O_attr_exists(loc.oloc, attr_name, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to determine if attribute exists")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Aexists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Aexists_by_name
  *
@@ -1662,34 +1609,31 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
-    hid_t lapl_id)
+H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t lapl_id)
 {
-    H5G_loc_t   loc;                    /* Object location */
-    htri_t	ret_value;              /* Return value */
+    H5G_loc_t loc;       /* Object location */
+    htri_t    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("t", "i*s*si", loc_id, obj_name, attr_name, lapl_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
-    if(!attr_name || !*attr_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name")
+    if (!attr_name || !*attr_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
-    if((ret_value = H5A_exists_by_name(loc, obj_name, attr_name, lapl_id, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5A_exists_by_name(loc, obj_name, attr_name, lapl_id, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to determine if attribute exists")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Aexists_by_name() */
-
diff --git a/src/H5AC.c b/src/H5AC.c
index ff37f43..db8fe10 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -25,29 +25,28 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5AC_PACKAGE            /*suppress error about including H5ACpkg  */
-#define H5C_PACKAGE             /*suppress error about including H5Cpkg   */
-#define H5F_PACKAGE        /*suppress error about including H5Fpkg      */
+#define H5AC_PACKAGE /*suppress error about including H5ACpkg  */
+#define H5C_PACKAGE  /*suppress error about including H5Cpkg   */
+#define H5F_PACKAGE  /*suppress error about including H5Fpkg      */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5AC_init_interface
+#define H5_INTERFACE_INIT_FUNC H5AC_init_interface
 
 #ifdef H5_HAVE_PARALLEL
 #include <mpi.h>
 #endif /* H5_HAVE_PARALLEL */
 
-#include "H5private.h"        /* Generic Functions            */
-#include "H5ACpkg.h"        /* Metadata cache            */
-#include "H5Cpkg.h"             /* Cache                                */
-#include "H5Dprivate.h"        /* Dataset functions            */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5Fpkg.h"        /* Files                */
-#include "H5FDprivate.h"    /* File drivers                */
-#include "H5FLprivate.h"        /* Free Lists                           */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Pprivate.h"         /* Property lists                       */
-
+#include "H5private.h"   /* Generic Functions            */
+#include "H5ACpkg.h"     /* Metadata cache            */
+#include "H5Cpkg.h"      /* Cache                                */
+#include "H5Dprivate.h"  /* Dataset functions            */
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5Fpkg.h"      /* Files                */
+#include "H5FDprivate.h" /* File drivers                */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Pprivate.h"  /* Property lists                       */
 
 #ifdef H5_HAVE_PARALLEL
 
@@ -80,13 +79,12 @@ H5FL_DEFINE_STATIC(H5AC_aux_t);
 
 #ifdef H5_HAVE_PARALLEL
 
-#define H5AC__H5AC_SLIST_ENTRY_T_MAGIC        0x00D0A02
+#define H5AC__H5AC_SLIST_ENTRY_T_MAGIC 0x00D0A02
 
-typedef struct H5AC_slist_entry_t
-{
-    uint32_t    magic;
+typedef struct H5AC_slist_entry_t {
+    uint32_t magic;
 
-    haddr_t     addr;
+    haddr_t addr;
 } H5AC_slist_entry_t;
 
 /* Declare a free list to manage the H5AC_slist_entry_t struct */
@@ -94,7 +92,6 @@ H5FL_DEFINE_STATIC(H5AC_slist_entry_t);
 
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*
  * Private file-scope variables.
  */
@@ -102,110 +99,73 @@ H5FL_DEFINE_STATIC(H5AC_slist_entry_t);
 /* Default dataset transfer property list for metadata I/O calls */
 /* (Collective set, "block before metadata write" set and "library internal" set) */
 /* (Global variable definition, declaration is in H5ACprivate.h also) */
-hid_t H5AC_dxpl_id=(-1);
+hid_t H5AC_dxpl_id = (-1);
 
 /* Dataset transfer property list for independent metadata I/O calls */
 /* (just "library internal" set - i.e. independent transfer mode) */
 /* (Global variable definition, declaration is in H5ACprivate.h also) */
-H5P_genplist_t *H5AC_ind_dxpl_g = NULL;
-hid_t H5AC_ind_dxpl_id=(-1);
-
+H5P_genplist_t *H5AC_ind_dxpl_g  = NULL;
+hid_t           H5AC_ind_dxpl_id = (-1);
 
 /*
  * Private file-scope function declarations:
  */
 
-static herr_t H5AC_check_if_write_permitted(const H5F_t *f,
-                                            hid_t dxpl_id,
-                                            hbool_t * write_permitted_ptr);
+static herr_t H5AC_check_if_write_permitted(const H5F_t *f, hid_t dxpl_id, hbool_t *write_permitted_ptr);
 
-static herr_t H5AC_ext_config_2_int_config(H5AC_cache_config_t * ext_conf_ptr,
-                                           H5C_auto_size_ctl_t * int_conf_ptr);
+static herr_t H5AC_ext_config_2_int_config(H5AC_cache_config_t *ext_conf_ptr,
+                                           H5C_auto_size_ctl_t *int_conf_ptr);
 
 #ifdef H5_HAVE_PARALLEL
-static herr_t H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
-                                            int * num_entries_ptr,
-                                            haddr_t ** haddr_buf_ptr_ptr);
+static herr_t H5AC_broadcast_candidate_list(H5AC_t *cache_ptr, int *num_entries_ptr,
+                                            haddr_t **haddr_buf_ptr_ptr);
 
-static herr_t H5AC_broadcast_clean_list(H5AC_t * cache_ptr);
+static herr_t H5AC_broadcast_clean_list(H5AC_t *cache_ptr);
 
-static herr_t H5AC_construct_candidate_list(H5AC_t * cache_ptr,
-                                            H5AC_aux_t * aux_ptr,
-                                            int sync_point_op);
+static herr_t H5AC_construct_candidate_list(H5AC_t *cache_ptr, H5AC_aux_t *aux_ptr, int sync_point_op);
 
-static herr_t H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
-                                        int * num_entries_ptr,
-                                        haddr_t ** haddr_buf_ptr_ptr,
-                    size_t * MPI_Offset_buf_size_ptr,
-                                        MPI_Offset ** MPI_Offset_buf_ptr_ptr);
+static herr_t H5AC_copy_candidate_list_to_buffer(H5AC_t *cache_ptr, int *num_entries_ptr,
+                                                 haddr_t **haddr_buf_ptr_ptr, size_t *MPI_Offset_buf_size_ptr,
+                                                 MPI_Offset **MPI_Offset_buf_ptr_ptr);
 
 static herr_t H5AC_flush_entries(H5F_t *f);
 
-static herr_t H5AC_log_deleted_entry(H5AC_t * cache_ptr,
-                                     H5AC_info_t * entry_ptr,
-                                     haddr_t addr,
+static herr_t H5AC_log_deleted_entry(H5AC_t *cache_ptr, H5AC_info_t *entry_ptr, haddr_t addr,
                                      unsigned int flags);
 
-static herr_t H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr,
-                                     haddr_t addr);
+static herr_t H5AC_log_dirtied_entry(const H5AC_info_t *entry_ptr, haddr_t addr);
 
-static herr_t H5AC_log_flushed_entry(H5C_t * cache_ptr,
-                                     haddr_t addr,
-                                     hbool_t was_dirty,
-                                     unsigned flags,
+static herr_t H5AC_log_flushed_entry(H5C_t *cache_ptr, haddr_t addr, hbool_t was_dirty, unsigned flags,
                                      int type_id);
 
-static herr_t H5AC_log_moved_entry(const H5F_t * f,
-                                     haddr_t old_addr,
-                                     haddr_t new_addr);
+static herr_t H5AC_log_moved_entry(const H5F_t *f, haddr_t old_addr, haddr_t new_addr);
 
-static herr_t H5AC_log_inserted_entry(H5AC_t * cache_ptr,
-                                      H5AC_info_t * entry_ptr);
+static herr_t H5AC_log_inserted_entry(H5AC_t *cache_ptr, H5AC_info_t *entry_ptr);
 
-static herr_t H5AC_propagate_and_apply_candidate_list(H5F_t  * f,
-                                                      hid_t    dxpl_id,
-                                                      H5AC_t * cache_ptr);
+static herr_t H5AC_propagate_and_apply_candidate_list(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr);
 
-static herr_t H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
-                                                           hid_t dxpl_id,
-                                                           H5AC_t * cache_ptr);
+static herr_t H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr);
 
-static herr_t H5AC_receive_candidate_list(H5AC_t * cache_ptr,
-                                          int * num_entries_ptr,
-                                          haddr_t ** haddr_buf_ptr_ptr);
+static herr_t H5AC_receive_candidate_list(H5AC_t *cache_ptr, int *num_entries_ptr,
+                                          haddr_t **haddr_buf_ptr_ptr);
 
-static herr_t H5AC_receive_and_apply_clean_list(H5F_t  * f,
-                                                hid_t    primary_dxpl_id,
-                                                hid_t    secondary_dxpl_id,
-                                                H5AC_t * cache_ptr);
+static herr_t H5AC_receive_and_apply_clean_list(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                                H5AC_t *cache_ptr);
 
-static herr_t H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
-                                      int num_candidates,
-                                      haddr_t * candidates_list_ptr);
+static herr_t H5AC_tidy_cache_0_lists(H5AC_t *cache_ptr, int num_candidates, haddr_t *candidates_list_ptr);
 
-herr_t H5AC_rsp__dist_md_write__flush(H5F_t *f,
-                                      hid_t dxpl_id,
-                                      H5AC_t * cache_ptr);
+herr_t H5AC_rsp__dist_md_write__flush(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr);
 
-herr_t H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f,
-                                                   hid_t dxpl_id,
-                                                   H5AC_t * cache_ptr);
+herr_t H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr);
 
-herr_t H5AC_rsp__p0_only__flush(H5F_t *f,
-                                hid_t dxpl_id,
-                                H5AC_t * cache_ptr);
+herr_t H5AC_rsp__p0_only__flush(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr);
 
-herr_t H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
-                                             hid_t dxpl_id,
-                                             H5AC_t * cache_ptr);
+herr_t H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr);
 
-static herr_t H5AC_run_sync_point(H5F_t *f,
-                                  hid_t dxpl_id,
-                        int sync_point_op);
+static herr_t H5AC_run_sync_point(H5F_t *f, hid_t dxpl_id, int sync_point_op);
 
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_init
  *
@@ -223,7 +183,7 @@ static herr_t H5AC_run_sync_point(H5F_t *f,
 herr_t
 H5AC_init(void)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -232,7 +192,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_init_interface
  *
@@ -249,10 +208,10 @@ static herr_t
 H5AC_init_interface(void)
 {
 #ifdef H5_HAVE_PARALLEL
-    H5P_genplist_t  *xfer_plist;    /* Dataset transfer property list object */
-    unsigned coll_meta_write;       /* "collective metadata write" property value */
-#endif /* H5_HAVE_PARALLEL */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5P_genplist_t *xfer_plist;      /* Dataset transfer property list object */
+    unsigned        coll_meta_write; /* "collective metadata write" property value */
+#endif                               /* H5_HAVE_PARALLEL */
+    herr_t ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -261,7 +220,7 @@ H5AC_init_interface(void)
     HDassert(H5P_CLS_DATASET_XFER_g != NULL);
 
     /* Get an ID for the collective H5AC dxpl */
-    if((H5AC_dxpl_id = H5P_create_id(H5P_CLS_DATASET_XFER_g, FALSE)) < 0)
+    if ((H5AC_dxpl_id = H5P_create_id(H5P_CLS_DATASET_XFER_g, FALSE)) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "unable to register property list")
 
     /* Get the property list object */
@@ -270,28 +229,28 @@ H5AC_init_interface(void)
 
     /* Insert 'collective metadata write' property */
     coll_meta_write = 1;
-    if(H5P_insert(xfer_plist, H5AC_COLLECTIVE_META_WRITE_NAME, H5AC_COLLECTIVE_META_WRITE_SIZE, &coll_meta_write,
-                  NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_insert(xfer_plist, H5AC_COLLECTIVE_META_WRITE_NAME, H5AC_COLLECTIVE_META_WRITE_SIZE,
+                   &coll_meta_write, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert metadata cache dxpl property")
 
     /* Get an ID for the independent H5AC dxpl */
-    if((H5AC_ind_dxpl_id = H5P_create_id(H5P_CLS_DATASET_XFER_g, FALSE)) < 0)
+    if ((H5AC_ind_dxpl_id = H5P_create_id(H5P_CLS_DATASET_XFER_g, FALSE)) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "unable to register property list")
 
     /* Get the property list object */
-    if(NULL == (H5AC_ind_dxpl_g = (H5P_genplist_t *)H5I_object(H5AC_ind_dxpl_id)))
+    if (NULL == (H5AC_ind_dxpl_g = (H5P_genplist_t *)H5I_object(H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_CACHE, H5E_BADATOM, FAIL, "can't get new property list object")
 
     /* Insert 'collective metadata write' property */
     coll_meta_write = 0;
-    if(H5P_insert(H5AC_ind_dxpl_g, H5AC_COLLECTIVE_META_WRITE_NAME, H5AC_COLLECTIVE_META_WRITE_SIZE, &coll_meta_write,
-            NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_insert(H5AC_ind_dxpl_g, H5AC_COLLECTIVE_META_WRITE_NAME, H5AC_COLLECTIVE_META_WRITE_SIZE,
+                   &coll_meta_write, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert metadata cache dxpl property")
-#else /* H5_HAVE_PARALLEL */
+#else  /* H5_HAVE_PARALLEL */
     /* Sanity check */
-    HDassert(H5P_LST_DATASET_XFER_ID_g!=(-1));
+    HDassert(H5P_LST_DATASET_XFER_ID_g != (-1));
 
-    H5AC_dxpl_id = H5P_DATASET_XFER_DEFAULT;
+    H5AC_dxpl_id     = H5P_DATASET_XFER_DEFAULT;
     H5AC_ind_dxpl_id = H5P_DATASET_XFER_DEFAULT;
 
     /* Get the property list objects for the IDs */
@@ -303,7 +262,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5AC_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_term_interface
  *
@@ -322,34 +280,33 @@ done:
 int
 H5AC_term_interface(void)
 {
-    int    n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if (H5_interface_initialize_g) {
 #ifdef H5_HAVE_PARALLEL
-        if(H5AC_dxpl_id > 0 || H5AC_ind_dxpl_id > 0) {
+        if (H5AC_dxpl_id > 0 || H5AC_ind_dxpl_id > 0) {
             /* Indicate more work to do */
             n = 1; /* H5I */
 
             /* Close H5AC dxpl */
-            if(H5I_dec_ref(H5AC_dxpl_id) < 0 ||
-                    H5I_dec_ref(H5AC_ind_dxpl_id) < 0)
+            if (H5I_dec_ref(H5AC_dxpl_id) < 0 || H5I_dec_ref(H5AC_ind_dxpl_id) < 0)
                 H5E_clear_stack(NULL); /*ignore error*/
             else {
                 /* Reset static IDs */
-                H5AC_dxpl_id = (-1);
+                H5AC_dxpl_id     = (-1);
                 H5AC_ind_dxpl_id = (-1);
 
                 /* Reset interface initialization flag */
                 H5_interface_initialize_g = 0;
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else
-#else /* H5_HAVE_PARALLEL */
-            /* Reset static IDs */
-            H5AC_dxpl_id=(-1);
-            H5AC_ind_dxpl_id=(-1);
+#else  /* H5_HAVE_PARALLEL */
+        /* Reset static IDs */
+        H5AC_dxpl_id     = (-1);
+        H5AC_ind_dxpl_id = (-1);
 #endif /* H5_HAVE_PARALLEL */
             /* Reset interface initialization flag */
             H5_interface_initialize_g = 0;
@@ -358,8 +315,7 @@ H5AC_term_interface(void)
     FUNC_LEAVE_NOAPI(n)
 } /* end H5AC_term_interface() */
 
-static const char * H5AC_entry_type_names[H5AC_NTYPES] =
-{
+static const char *H5AC_entry_type_names[H5AC_NTYPES] = {
     "B-tree nodes",
     "symbol table nodes",
     "local heap prefixes",
@@ -378,10 +334,9 @@ static const char * H5AC_entry_type_names[H5AC_NTYPES] =
     "shared OH message master table",
     "shared OH message index",
     "superblock",
-    "test entry"    /* for testing only -- not used for actual files */
+    "test entry" /* for testing only -- not used for actual files */
 };
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_create
  *
@@ -401,77 +356,76 @@ static const char * H5AC_entry_type_names[H5AC_NTYPES] =
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_create(const H5F_t *f,
-            H5AC_cache_config_t *config_ptr)
+H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr)
 {
 #ifdef H5_HAVE_PARALLEL
-    char      prefix[H5C__PREFIX_LEN] = "";
-    H5AC_aux_t * aux_ptr = NULL;
-#endif /* H5_HAVE_PARALLEL */
-    herr_t ret_value = SUCCEED;      /* Return value */
+    char        prefix[H5C__PREFIX_LEN] = "";
+    H5AC_aux_t *aux_ptr                 = NULL;
+#endif                          /* H5_HAVE_PARALLEL */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(NULL == f->shared->cache);
-    HDassert(config_ptr != NULL) ;
+    HDassert(config_ptr != NULL);
     HDcompile_assert(NELMTS(H5AC_entry_type_names) == H5AC_NTYPES);
     HDcompile_assert(H5C__MAX_NUM_TYPE_IDS == H5AC_NTYPES);
 
-    if(H5AC_validate_config(config_ptr) < 0)
+    if (H5AC_validate_config(config_ptr) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad cache configuration")
 
 #ifdef H5_HAVE_PARALLEL
-    if(H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) {
-        MPI_Comm     mpi_comm;
-        int         mpi_rank;
-        int          mpi_size;
+    if (H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) {
+        MPI_Comm mpi_comm;
+        int      mpi_rank;
+        int      mpi_size;
 
-        if(MPI_COMM_NULL == (mpi_comm = H5F_mpi_get_comm(f)))
+        if (MPI_COMM_NULL == (mpi_comm = H5F_mpi_get_comm(f)))
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get MPI communicator")
 
-        if((mpi_rank = H5F_mpi_get_rank(f)) < 0)
+        if ((mpi_rank = H5F_mpi_get_rank(f)) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get mpi rank")
 
-        if((mpi_size = H5F_mpi_get_size(f)) < 0)
+        if ((mpi_size = H5F_mpi_get_size(f)) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get mpi size")
 
-        if(NULL == (aux_ptr = H5FL_CALLOC(H5AC_aux_t)))
+        if (NULL == (aux_ptr = H5FL_CALLOC(H5AC_aux_t)))
             HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, FAIL, "Can't allocate H5AC auxiliary structure.")
 
-        aux_ptr->magic = H5AC__H5AC_AUX_T_MAGIC;
-        aux_ptr->mpi_comm = mpi_comm;
-        aux_ptr->mpi_rank = mpi_rank;
-        aux_ptr->mpi_size = mpi_size;
-        aux_ptr->write_permitted = FALSE;
-        aux_ptr->dirty_bytes_threshold = H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD;
-        aux_ptr->dirty_bytes = 0;
+        aux_ptr->magic                   = H5AC__H5AC_AUX_T_MAGIC;
+        aux_ptr->mpi_comm                = mpi_comm;
+        aux_ptr->mpi_rank                = mpi_rank;
+        aux_ptr->mpi_size                = mpi_size;
+        aux_ptr->write_permitted         = FALSE;
+        aux_ptr->dirty_bytes_threshold   = H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD;
+        aux_ptr->dirty_bytes             = 0;
         aux_ptr->metadata_write_strategy = H5AC__DEFAULT_METADATA_WRITE_STRATEGY;
 #if H5AC_DEBUG_DIRTY_BYTES_CREATION
-        aux_ptr->dirty_bytes_propagations = 0;
-        aux_ptr->unprotect_dirty_bytes = 0;
+        aux_ptr->dirty_bytes_propagations      = 0;
+        aux_ptr->unprotect_dirty_bytes         = 0;
         aux_ptr->unprotect_dirty_bytes_updates = 0;
-        aux_ptr->insert_dirty_bytes = 0;
-        aux_ptr->insert_dirty_bytes_updates = 0;
-        aux_ptr->move_dirty_bytes = 0;
-        aux_ptr->move_dirty_bytes_updates = 0;
+        aux_ptr->insert_dirty_bytes            = 0;
+        aux_ptr->insert_dirty_bytes_updates    = 0;
+        aux_ptr->move_dirty_bytes              = 0;
+        aux_ptr->move_dirty_bytes_updates      = 0;
 #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
-        aux_ptr->d_slist_ptr = NULL;
-        aux_ptr->d_slist_len = 0;
-        aux_ptr->c_slist_ptr = NULL;
-        aux_ptr->c_slist_len = 0;
+        aux_ptr->d_slist_ptr         = NULL;
+        aux_ptr->d_slist_len         = 0;
+        aux_ptr->c_slist_ptr         = NULL;
+        aux_ptr->c_slist_len         = 0;
         aux_ptr->candidate_slist_ptr = NULL;
         aux_ptr->candidate_slist_len = 0;
-        aux_ptr->write_done = NULL;
-        aux_ptr->sync_point_done = NULL;
+        aux_ptr->write_done          = NULL;
+        aux_ptr->sync_point_done     = NULL;
 
         HDsprintf(prefix, "%d:", mpi_rank);
 
-        if(mpi_rank == 0) {
-            if(NULL == (aux_ptr->d_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)))
+        if (mpi_rank == 0) {
+            if (NULL == (aux_ptr->d_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)))
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create dirtied entry list.")
 
-            if(NULL == (aux_ptr->c_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)))
+            if (NULL == (aux_ptr->c_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)))
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create cleaned entry list.")
         } /* end if */
 
@@ -479,94 +433,77 @@ H5AC_create(const H5F_t *f,
          * when the distributed strategy is selected as all processes
          * will use it in the case of a flush.
          */
-        if(NULL == (aux_ptr->candidate_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)))
+        if (NULL == (aux_ptr->candidate_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)))
             HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create candidate entry list.")
 
-        if(aux_ptr != NULL) {
-            if(aux_ptr->mpi_rank == 0) {
-                f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE,
-                                        H5AC__DEFAULT_MIN_CLEAN_SIZE,
-                                        (H5AC_NTYPES - 1),
-                                        (const char **)H5AC_entry_type_names,
-                                        H5AC_check_if_write_permitted,
-                                        TRUE,
-                                        H5AC_log_flushed_entry,
-                                        (void *)aux_ptr);
-            } else {
-                f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE,
-                                        H5AC__DEFAULT_MIN_CLEAN_SIZE,
-                                        (H5AC_NTYPES - 1),
-                                        (const char **)H5AC_entry_type_names,
-                                        H5AC_check_if_write_permitted,
-                                        TRUE,
-                                        NULL,
-                                        (void *)aux_ptr);
+        if (aux_ptr != NULL) {
+            if (aux_ptr->mpi_rank == 0) {
+                f->shared->cache =
+                    H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE, (H5AC_NTYPES - 1),
+                               (const char **)H5AC_entry_type_names, H5AC_check_if_write_permitted, TRUE,
+                               H5AC_log_flushed_entry, (void *)aux_ptr);
+            }
+            else {
+                f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE,
+                                              (H5AC_NTYPES - 1), (const char **)H5AC_entry_type_names,
+                                              H5AC_check_if_write_permitted, TRUE, NULL, (void *)aux_ptr);
             }
-        } else {
-            f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE,
-                                        H5AC__DEFAULT_MIN_CLEAN_SIZE,
-                                        (H5AC_NTYPES - 1),
-                                        (const char **)H5AC_entry_type_names,
-                                        H5AC_check_if_write_permitted,
-                                        TRUE,
-                                        NULL,
-                                        NULL);
         }
-    } else {
+        else {
+            f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE,
+                                          (H5AC_NTYPES - 1), (const char **)H5AC_entry_type_names,
+                                          H5AC_check_if_write_permitted, TRUE, NULL, NULL);
+        }
+    }
+    else {
 #endif /* H5_HAVE_PARALLEL */
         /* The default max cache size and min clean size will frequently be
          * overwritten shortly by the subsequent set resize config call.
          *                                             -- JRM
          */
-        f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE,
-                                        H5AC__DEFAULT_MIN_CLEAN_SIZE,
-                                        (H5AC_NTYPES - 1),
-                                        (const char **)H5AC_entry_type_names,
-                                        H5AC_check_if_write_permitted,
-                                        TRUE,
-                                        NULL,
-                                        NULL);
+        f->shared->cache =
+            H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE, (H5AC_NTYPES - 1),
+                       (const char **)H5AC_entry_type_names, H5AC_check_if_write_permitted, TRUE, NULL, NULL);
 #ifdef H5_HAVE_PARALLEL
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    if(NULL == f->shared->cache)
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    if (NULL == f->shared->cache)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
 #ifdef H5_HAVE_PARALLEL
-    if(aux_ptr != NULL) {
-        if(H5C_set_prefix(f->shared->cache, prefix) < 0)
+    if (aux_ptr != NULL) {
+        if (H5C_set_prefix(f->shared->cache, prefix) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "H5C_set_prefix() failed")
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
-    if(H5AC_set_cache_auto_resize_config(f->shared->cache, config_ptr) < 0)
+    if (H5AC_set_cache_auto_resize_config(f->shared->cache, config_ptr) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "auto resize configuration failed")
 
 done:
 #ifdef H5_HAVE_PARALLEL
     /* if there is a failure, try to tidy up the auxiliary structure */
-    if(ret_value < 0) {
-        if(aux_ptr != NULL) {
-            if(aux_ptr->d_slist_ptr != NULL)
+    if (ret_value < 0) {
+        if (aux_ptr != NULL) {
+            if (aux_ptr->d_slist_ptr != NULL)
                 H5SL_close(aux_ptr->d_slist_ptr);
 
-            if(aux_ptr->c_slist_ptr != NULL)
+            if (aux_ptr->c_slist_ptr != NULL)
                 H5SL_close(aux_ptr->c_slist_ptr);
 
-            if(aux_ptr->candidate_slist_ptr != NULL)
+            if (aux_ptr->candidate_slist_ptr != NULL)
                 H5SL_close(aux_ptr->candidate_slist_ptr);
 
             aux_ptr->magic = 0;
-            aux_ptr = H5FL_FREE(H5AC_aux_t, aux_ptr);
+            aux_ptr        = H5FL_FREE(H5AC_aux_t, aux_ptr);
         } /* end if */
-    } /* end if */
-#endif /* H5_HAVE_PARALLEL */
+    }     /* end if */
+#endif    /* H5_HAVE_PARALLEL */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_dest
  *
@@ -586,9 +523,9 @@ herr_t
 H5AC_dest(H5F_t *f, hid_t dxpl_id)
 {
 #ifdef H5_HAVE_PARALLEL
-    H5AC_aux_t * aux_ptr = NULL;
-#endif /* H5_HAVE_PARALLEL */
-    herr_t ret_value = SUCCEED;      /* Return value */
+    H5AC_aux_t *aux_ptr = NULL;
+#endif                          /* H5_HAVE_PARALLEL */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -602,44 +539,43 @@ H5AC_dest(H5F_t *f, hid_t dxpl_id)
 #endif /* H5AC_DUMP_STATS_ON_CLOSE */
 
 #if H5AC__TRACE_FILE_ENABLED
-    if(H5AC_close_trace_file(f->shared->cache) < 0)
+    if (H5AC_close_trace_file(f->shared->cache) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_close_trace_file() failed.")
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
     aux_ptr = (struct H5AC_aux_t *)(f->shared->cache->aux_ptr);
-    if(aux_ptr)
+    if (aux_ptr)
         /* Sanity check */
         HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
     /* Attempt to flush all entries from rank 0 & Bcast clean list to other ranks */
-    if(H5AC_flush_entries(f) < 0)
+    if (H5AC_flush_entries(f) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't flush.")
 #endif /* H5_HAVE_PARALLEL */
 
     /* Destroy the cache */
-    if(H5C_dest(f, dxpl_id, H5AC_dxpl_id) < 0)
+    if (H5C_dest(f, dxpl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFREE, FAIL, "can't destroy cache")
     f->shared->cache = NULL;
 
 #ifdef H5_HAVE_PARALLEL
-    if(aux_ptr != NULL) {
-        if(aux_ptr->d_slist_ptr != NULL)
+    if (aux_ptr != NULL) {
+        if (aux_ptr->d_slist_ptr != NULL)
             H5SL_close(aux_ptr->d_slist_ptr);
-        if(aux_ptr->c_slist_ptr != NULL)
+        if (aux_ptr->c_slist_ptr != NULL)
             H5SL_close(aux_ptr->c_slist_ptr);
-        if(aux_ptr->candidate_slist_ptr != NULL)
+        if (aux_ptr->candidate_slist_ptr != NULL)
             H5SL_close(aux_ptr->candidate_slist_ptr);
         aux_ptr->magic = 0;
-        aux_ptr = H5FL_FREE(H5AC_aux_t, aux_ptr);
-    } /* end if */
+        aux_ptr        = H5FL_FREE(H5AC_aux_t, aux_ptr);
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_expunge_entry
  *
@@ -655,18 +591,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_expunge_entry(H5F_t *f,
-        hid_t dxpl_id,
-        const H5AC_class_t *type,
-        haddr_t addr,
-                   unsigned flags)
+H5AC_expunge_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, unsigned flags)
 {
-    herr_t  result;
+    herr_t result;
 #if H5AC__TRACE_FILE_ENABLED
-    char                trace[128] = "";
-    FILE *              trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t  ret_value = SUCCEED;      /* Return value */
+    char  trace[128]     = "";
+    FILE *trace_file_ptr = NULL;
+#endif                          /* H5AC__TRACE_FILE_ENABLED */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -679,43 +611,34 @@ H5AC_expunge_entry(H5F_t *f,
     HDassert(H5F_addr_defined(addr));
 
 #if H5AC__TRACE_FILE_ENABLED
-{
-    H5AC_t * cache_ptr = f->shared->cache;
+    {
+        H5AC_t *cache_ptr = f->shared->cache;
 
-    /* For the expunge entry call, only the addr, and type id are really
-     * necessary in the trace file.  Write the return value to catch occult
-     * errors.
-     */
-    if ( ( cache_ptr != NULL ) &&
-         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
-         ( trace_file_ptr != NULL ) ) {
+        /* For the expunge entry call, only the addr, and type id are really
+         * necessary in the trace file.  Write the return value to catch occult
+         * errors.
+         */
+        if ((cache_ptr != NULL) && (H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0) &&
+            (trace_file_ptr != NULL)) {
 
-        HDsprintf(trace, "H5AC_expunge_entry 0x%lx %d",
-            (unsigned long)addr,
-        (int)(type->id));
+            HDsprintf(trace, "H5AC_expunge_entry 0x%lx %d", (unsigned long)addr, (int)(type->id));
+        }
     }
-}
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
-    result = H5C_expunge_entry(f,
-                    dxpl_id,
-                               H5AC_dxpl_id,
-                               type,
-                               addr,
-                               flags);
+    result = H5C_expunge_entry(f, dxpl_id, H5AC_dxpl_id, type, addr, flags);
 
-    if ( result < 0 ) {
+    if (result < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, \
-                    "H5C_expunge_entry() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "H5C_expunge_entry() failed.")
     }
 
 done:
 
 #if H5AC__TRACE_FILE_ENABLED
-    if ( trace_file_ptr != NULL ) {
+    if (trace_file_ptr != NULL) {
 
-    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+        HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
@@ -723,7 +646,6 @@ done:
 
 } /* H5AC_expunge_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_flush
  *
@@ -748,10 +670,10 @@ herr_t
 H5AC_flush(H5F_t *f, hid_t dxpl_id)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char       trace[128] = "";
-    FILE *      trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t      ret_value = SUCCEED;      /* Return value */
+    char  trace[128]     = "";
+    FILE *trace_file_ptr = NULL;
+#endif                          /* H5AC__TRACE_FILE_ENABLED */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -763,34 +685,30 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id)
     /* For the flush, only the flags are really necessary in the trace file.
      * Write the result to catch occult errors.
      */
-    if((f != NULL) &&
-            (f->shared != NULL) &&
-            (f->shared->cache != NULL) &&
-            (H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
-            (trace_file_ptr != NULL))
-    HDsprintf(trace, "H5AC_flush");
+    if ((f != NULL) && (f->shared != NULL) && (f->shared->cache != NULL) &&
+        (H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) && (trace_file_ptr != NULL))
+        HDsprintf(trace, "H5AC_flush");
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
     /* Attempt to flush all entries from rank 0 & Bcast clean list to other ranks */
-    if(H5AC_flush_entries(f) < 0)
+    if (H5AC_flush_entries(f) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't flush.")
 #endif /* H5_HAVE_PARALLEL */
 
     /* Flush the cache */
-    if(H5C_flush_cache(f, dxpl_id, H5AC_dxpl_id, H5AC__NO_FLAGS_SET) < 0)
+    if (H5C_flush_cache(f, dxpl_id, H5AC_dxpl_id, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't flush cache.")
 
 done:
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr != NULL)
+    if (trace_file_ptr != NULL)
         HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_get_entry_status
  *
@@ -813,35 +731,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_get_entry_status(const H5F_t *f,
-                      haddr_t    addr,
-            unsigned * status_ptr)
+H5AC_get_entry_status(const H5F_t *f, haddr_t addr, unsigned *status_ptr)
 {
-    hbool_t    in_cache;
-    hbool_t    is_dirty;
-    hbool_t    is_protected;
-    hbool_t    is_pinned;
-    size_t    entry_size;
-    unsigned    status = 0;
-    herr_t      ret_value = SUCCEED;      /* Return value */
+    hbool_t  in_cache;
+    hbool_t  is_dirty;
+    hbool_t  is_protected;
+    hbool_t  is_pinned;
+    size_t   entry_size;
+    unsigned status    = 0;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if((f == NULL) || (!H5F_addr_defined(addr)) || (status_ptr == NULL))
+    if ((f == NULL) || (!H5F_addr_defined(addr)) || (status_ptr == NULL))
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry.")
 
-    if(H5C_get_entry_status(f, addr, &entry_size, &in_cache, &is_dirty,
-            &is_protected, &is_pinned) < 0)
+    if (H5C_get_entry_status(f, addr, &entry_size, &in_cache, &is_dirty, &is_protected, &is_pinned) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_entry_status() failed.")
 
-    if(in_cache) {
-    status |= H5AC_ES__IN_CACHE;
-    if(is_dirty)
-        status |= H5AC_ES__IS_DIRTY;
-    if(is_protected)
-        status |= H5AC_ES__IS_PROTECTED;
-    if(is_pinned)
-        status |= H5AC_ES__IS_PINNED;
+    if (in_cache) {
+        status |= H5AC_ES__IN_CACHE;
+        if (is_dirty)
+            status |= H5AC_ES__IS_DIRTY;
+        if (is_protected)
+            status |= H5AC_ES__IS_PROTECTED;
+        if (is_pinned)
+            status |= H5AC_ES__IS_PINNED;
     } /* end if */
 
     *status_ptr = status;
@@ -850,7 +765,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_get_entry_status() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_insert_entry
  *
@@ -867,14 +781,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *thing, unsigned int flags)
+H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *thing,
+                  unsigned int flags)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char              trace[128] = "";
-    size_t              trace_entry_size = 0;
-    FILE *            trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t ret_value = SUCCEED;      /* Return value */
+    char   trace[128]       = "";
+    size_t trace_entry_size = 0;
+    FILE * trace_file_ptr   = NULL;
+#endif                          /* H5AC__TRACE_FILE_ENABLED */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -888,8 +803,8 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add
     HDassert(thing);
 
     /* Check for invalid access request */
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
-    HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file")
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file")
 
 #if H5AC__TRACE_FILE_ENABLED
     /* For the insert, only the addr, size, type id and flags are really
@@ -899,60 +814,51 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add
      * Note that some data is not available right now -- put what we can
      * in the trace buffer now, and fill in the rest at the end.
      */
-    if ( ( f != NULL ) &&
-         ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
-         ( trace_file_ptr != NULL ) ) {
-
-        HDsprintf(trace, "H5AC_insert_entry 0x%lx %d 0x%x",
-            (unsigned long)addr,
-        type->id,
-        flags);
+    if ((f != NULL) && (f->shared != NULL) && (f->shared->cache != NULL) &&
+        (H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) && (trace_file_ptr != NULL)) {
+
+        HDsprintf(trace, "H5AC_insert_entry 0x%lx %d 0x%x", (unsigned long)addr, type->id, flags);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     /* Insert entry into metadata cache */
-    if(H5C_insert_entry(f, dxpl_id, H5AC_dxpl_id, type, addr, thing, flags) < 0)
+    if (H5C_insert_entry(f, dxpl_id, H5AC_dxpl_id, type, addr, thing, flags) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5C_insert_entry() failed")
 
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr != NULL) {
+    if (trace_file_ptr != NULL) {
         /* make note of the entry size */
         trace_entry_size = ((H5C_cache_entry_t *)thing)->size;
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
-{
-    H5AC_aux_t *aux_ptr;
+    {
+        H5AC_aux_t *aux_ptr;
 
-    if(NULL != (aux_ptr = (H5AC_aux_t *)f->shared->cache->aux_ptr)) {
-        /* Log the new entry */
-        if(H5AC_log_inserted_entry(f->shared->cache, (H5AC_info_t *)thing) < 0)
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5AC_log_inserted_entry() failed")
+        if (NULL != (aux_ptr = (H5AC_aux_t *)f->shared->cache->aux_ptr)) {
+            /* Log the new entry */
+            if (H5AC_log_inserted_entry(f->shared->cache, (H5AC_info_t *)thing) < 0)
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5AC_log_inserted_entry() failed")
 
-        /* Check if we should try to flush */
-        if(aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold)
-            if(H5AC_run_sync_point(f, H5AC_dxpl_id, H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) < 0)
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't run sync point.")
-    } /* end if */
-}
+            /* Check if we should try to flush */
+            if (aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold)
+                if (H5AC_run_sync_point(f, H5AC_dxpl_id, H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) < 0)
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't run sync point.")
+        } /* end if */
+    }
 #endif /* H5_HAVE_PARALLEL */
 
 done:
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr != NULL) {
-    HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
-                  (int)trace_entry_size,
-        (int)ret_value);
+    if (trace_file_ptr != NULL) {
+        HDfprintf(trace_file_ptr, "%s %d %d\n", trace, (int)trace_entry_size, (int)ret_value);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_insert_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_mark_entry_dirty
  *
@@ -970,10 +876,10 @@ herr_t
 H5AC_mark_entry_dirty(void *thing)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char              trace[128] = "";
-    FILE *            trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    char  trace[128]     = "";
+    FILE *trace_file_ptr = NULL;
+#endif                          /* H5AC__TRACE_FILE_ENABLED */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -985,41 +891,38 @@ H5AC_mark_entry_dirty(void *thing)
      * is really necessary in the trace file.  Write the result to catch
      * occult errors.
      */
-    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
-            (NULL != trace_file_ptr))
-        HDsprintf(trace, "%s 0x%lx", FUNC,
-            (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+    if ((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && (NULL != trace_file_ptr))
+        HDsprintf(trace, "%s 0x%lx", FUNC, (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
-{
-    H5AC_info_t *entry_ptr = (H5AC_info_t *)thing;
-    H5C_t *cache_ptr = entry_ptr->cache_ptr;
+    {
+        H5AC_info_t *entry_ptr = (H5AC_info_t *)thing;
+        H5C_t *      cache_ptr = entry_ptr->cache_ptr;
 
-    HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if((!entry_ptr->is_dirty) && (!entry_ptr->is_protected) &&
-             (entry_ptr->is_pinned) && (NULL != cache_ptr->aux_ptr)) {
-        if(H5AC_log_dirtied_entry(entry_ptr, entry_ptr->addr) < 0)
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't log dirtied entry")
-    } /* end if */
-}
+        if ((!entry_ptr->is_dirty) && (!entry_ptr->is_protected) && (entry_ptr->is_pinned) &&
+            (NULL != cache_ptr->aux_ptr)) {
+            if (H5AC_log_dirtied_entry(entry_ptr, entry_ptr->addr) < 0)
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't log dirtied entry")
+        } /* end if */
+    }
 #endif /* H5_HAVE_PARALLEL */
 
-    if(H5C_mark_entry_dirty(thing) < 0)
+    if (H5C_mark_entry_dirty(thing) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't mark pinned or protected entry dirty")
 
 done:
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr)
-    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    if (trace_file_ptr)
+        HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_mark_entry_dirty() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_move_entry
  *
@@ -1038,13 +941,13 @@ herr_t
 H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char              trace[128] = "";
-    FILE *            trace_file_ptr = NULL;
+    char  trace[128]     = "";
+    FILE *trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
 #ifdef H5_HAVE_PARALLEL
-    H5AC_aux_t        * aux_ptr;
-#endif /* H5_HAVE_PARALLEL */
-    herr_t ret_value=SUCCEED;      /* Return value */
+    H5AC_aux_t *aux_ptr;
+#endif                          /* H5_HAVE_PARALLEL */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1060,48 +963,42 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
      * necessary in the trace file.  Include the type id so we don't have to
      * look it up.  Also write the result to catch occult errors.
      */
-    if ( ( f != NULL ) &&
-         ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
-         ( trace_file_ptr != NULL ) ) {
-
-        HDsprintf(trace, "H5AC_move_entry 0x%lx 0x%lx %d",
-            (unsigned long)old_addr,
-        (unsigned long)new_addr,
-        (int)(type->id));
+    if ((f != NULL) && (f->shared != NULL) && (f->shared->cache != NULL) &&
+        (H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) && (trace_file_ptr != NULL)) {
+
+        HDsprintf(trace, "H5AC_move_entry 0x%lx 0x%lx %d", (unsigned long)old_addr, (unsigned long)new_addr,
+                  (int)(type->id));
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
     /* Log moving the entry */
-    if(NULL != (aux_ptr = (H5AC_aux_t *)f->shared->cache->aux_ptr)) {
-        if(H5AC_log_moved_entry(f, old_addr, new_addr) < 0)
+    if (NULL != (aux_ptr = (H5AC_aux_t *)f->shared->cache->aux_ptr)) {
+        if (H5AC_log_moved_entry(f, old_addr, new_addr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "can't log moved entry")
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
-    if(H5C_move_entry(f->shared->cache, type, old_addr, new_addr) < 0)
+    if (H5C_move_entry(f->shared->cache, type, old_addr, new_addr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, "H5C_move_entry() failed.")
 
 #ifdef H5_HAVE_PARALLEL
     /* Check if we should try to flush */
-    if(NULL != aux_ptr && aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold) {
-        if(H5AC_run_sync_point(f, H5AC_dxpl_id, H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) < 0)
+    if (NULL != aux_ptr && aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold) {
+        if (H5AC_run_sync_point(f, H5AC_dxpl_id, H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't run sync point.")
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
 done:
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr != NULL)
-    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    if (trace_file_ptr != NULL)
+        HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_move_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_pin_protected_entry()
  *
@@ -1119,10 +1016,10 @@ herr_t
 H5AC_pin_protected_entry(void *thing)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char        trace[128] = "";
-    FILE *      trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    char  trace[128]     = "";
+    FILE *trace_file_ptr = NULL;
+#endif                          /* H5AC__TRACE_FILE_ENABLED */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1133,25 +1030,22 @@ H5AC_pin_protected_entry(void *thing)
     /* For the pin protected entry call, only the addr is really necessary
      * in the trace file.  Also write the result to catch occult errors.
      */
-    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
-            (NULL != trace_file_ptr))
-        HDsprintf(trace, "%s 0x%lx", FUNC,
-            (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+    if ((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && (NULL != trace_file_ptr))
+        HDsprintf(trace, "%s 0x%lx", FUNC, (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if(H5C_pin_protected_entry(thing) < 0)
+    if (H5C_pin_protected_entry(thing) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, "can't pin entry")
 
 done:
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr)
-    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    if (trace_file_ptr)
+        HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_pin_protected_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_protect
  *
@@ -1177,21 +1071,16 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5AC_protect(H5F_t *f,
-             hid_t dxpl_id,
-             const H5AC_class_t *type,
-             haddr_t addr,
-        void *udata,
-             H5AC_protect_t rw)
+H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *udata, H5AC_protect_t rw)
 {
-    unsigned        protect_flags = H5C__NO_FLAGS_SET;
-    void *        thing = (void *)NULL;
+    unsigned protect_flags = H5C__NO_FLAGS_SET;
+    void *   thing         = (void *)NULL;
 #if H5AC__TRACE_FILE_ENABLED
-    char                trace[128] = "";
-    size_t        trace_entry_size = 0;
-    FILE *              trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    void *        ret_value;      /* Return value */
+    char   trace[128]       = "";
+    size_t trace_entry_size = 0;
+    FILE * trace_file_ptr   = NULL;
+#endif               /* H5AC__TRACE_FILE_ENABLED */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1205,8 +1094,8 @@ H5AC_protect(H5F_t *f,
     HDassert(H5F_addr_defined(addr));
 
     /* Check for invalid access request */
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR) && rw == H5AC_WRITE)
-    HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file")
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR) && rw == H5AC_WRITE)
+        HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file")
 
 #if H5AC__TRACE_FILE_ENABLED
     /* For the protect call, only the addr and type id is really necessary
@@ -1214,54 +1103,42 @@ H5AC_protect(H5F_t *f,
      * sanity check.  Also indicate whether the call was successful to
      * catch occult errors.
      */
-    if ( ( f != NULL ) &&
-         ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
-         ( trace_file_ptr != NULL ) ) {
-
-    const char * rw_string;
-
-        if ( rw == H5AC_WRITE ) {
+    if ((f != NULL) && (f->shared != NULL) && (f->shared->cache != NULL) &&
+        (H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) && (trace_file_ptr != NULL)) {
 
-        rw_string = "H5AC_WRITE";
+        const char *rw_string;
 
-    } else if ( rw == H5AC_READ ) {
+        if (rw == H5AC_WRITE) {
 
-        rw_string = "H5AC_READ";
+            rw_string = "H5AC_WRITE";
+        }
+        else if (rw == H5AC_READ) {
 
-    } else {
+            rw_string = "H5AC_READ";
+        }
+        else {
 
-        rw_string = "???";
-    }
+            rw_string = "???";
+        }
 
-        HDsprintf(trace, "H5AC_protect 0x%lx %d %s",
-            (unsigned long)addr,
-        (int)(type->id),
-        rw_string);
+        HDsprintf(trace, "H5AC_protect 0x%lx %d %s", (unsigned long)addr, (int)(type->id), rw_string);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if ( rw == H5AC_READ ) {
+    if (rw == H5AC_READ) {
 
-    protect_flags |= H5C__READ_ONLY_FLAG;
+        protect_flags |= H5C__READ_ONLY_FLAG;
     }
 
-    thing = H5C_protect(f,
-                dxpl_id,
-                        H5AC_dxpl_id,
-            type,
-            addr,
-            udata,
-            protect_flags);
+    thing = H5C_protect(f, dxpl_id, H5AC_dxpl_id, type, addr, udata, protect_flags);
 
-    if ( thing == NULL ) {
+    if (thing == NULL) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "H5C_protect() failed.")
     }
 
 #if H5AC__TRACE_FILE_ENABLED
-    if ( trace_file_ptr != NULL ) {
+    if (trace_file_ptr != NULL) {
 
         /* make note of the entry size */
         trace_entry_size = ((H5C_cache_entry_t *)thing)->size;
@@ -1274,11 +1151,9 @@ H5AC_protect(H5F_t *f,
 done:
 
 #if H5AC__TRACE_FILE_ENABLED
-    if ( trace_file_ptr != NULL ) {
+    if (trace_file_ptr != NULL) {
 
-    HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
-                  (int)trace_entry_size,
-                  (int)(ret_value != NULL));
+        HDfprintf(trace_file_ptr, "%s %d %d\n", trace, (int)trace_entry_size, (int)(ret_value != NULL));
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
@@ -1286,7 +1161,6 @@ done:
 
 } /* H5AC_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_resize_entry
  *
@@ -1303,10 +1177,10 @@ herr_t
 H5AC_resize_entry(void *thing, size_t new_size)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char              trace[128] = "";
-    FILE *            trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    char  trace[128]     = "";
+    FILE *trace_file_ptr = NULL;
+#endif                          /* H5AC__TRACE_FILE_ENABLED */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1318,41 +1192,38 @@ H5AC_resize_entry(void *thing, size_t new_size)
      * really necessary in the trace file. Write the result to catch
      * occult errors.
      */
-    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
-            (NULL != trace_file_ptr))
-        HDsprintf(trace, "%s 0x%lx %d", FUNC,
-            (unsigned long)(((H5C_cache_entry_t *)thing)->addr),
-        (int)new_size);
+    if ((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && (NULL != trace_file_ptr))
+        HDsprintf(trace, "%s 0x%lx %d", FUNC, (unsigned long)(((H5C_cache_entry_t *)thing)->addr),
+                  (int)new_size);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if(H5C_resize_entry(thing, new_size) < 0)
+    if (H5C_resize_entry(thing, new_size) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTRESIZE, FAIL, "can't resize entry")
 
 #ifdef H5_HAVE_PARALLEL
-{
-    H5AC_info_t * entry_ptr = (H5AC_info_t *)thing;
-    H5C_t *cache_ptr = entry_ptr->cache_ptr;
+    {
+        H5AC_info_t *entry_ptr = (H5AC_info_t *)thing;
+        H5C_t *      cache_ptr = entry_ptr->cache_ptr;
 
-    HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if((!entry_ptr->is_dirty) && (NULL != cache_ptr->aux_ptr)) {
-        if(H5AC_log_dirtied_entry(entry_ptr, entry_ptr->addr) < 0)
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't log dirtied entry")
-    } /* end if */
-}
+        if ((!entry_ptr->is_dirty) && (NULL != cache_ptr->aux_ptr)) {
+            if (H5AC_log_dirtied_entry(entry_ptr, entry_ptr->addr) < 0)
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't log dirtied entry")
+        } /* end if */
+    }
 #endif /* H5_HAVE_PARALLEL */
 
 done:
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr)
-    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    if (trace_file_ptr)
+        HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_resize_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_unpin_entry()
  *
@@ -1370,10 +1241,10 @@ herr_t
 H5AC_unpin_entry(void *thing)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char                trace[128] = "";
-    FILE *              trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    char  trace[128]     = "";
+    FILE *trace_file_ptr = NULL;
+#endif                          /* H5AC__TRACE_FILE_ENABLED */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1384,25 +1255,22 @@ H5AC_unpin_entry(void *thing)
     /* For the unpin entry call, only the addr is really necessary
      * in the trace file.  Also write the result to catch occult errors.
      */
-    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
-            (NULL != trace_file_ptr))
-        HDsprintf(trace, "%s 0x%lx", FUNC,
-            (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+    if ((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && (NULL != trace_file_ptr))
+        HDsprintf(trace, "%s 0x%lx", FUNC, (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if(H5C_unpin_entry(thing) < 0)
+    if (H5C_unpin_entry(thing) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPIN, FAIL, "can't unpin entry")
 
 done:
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr)
-    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    if (trace_file_ptr)
+        HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_unpin_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_unprotect
  *
@@ -1442,19 +1310,18 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
-    void *thing, unsigned flags)
+H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *thing, unsigned flags)
 {
-    hbool_t        dirtied;
-    hbool_t        deleted;
+    hbool_t dirtied;
+    hbool_t deleted;
 #ifdef H5_HAVE_PARALLEL
-    H5AC_aux_t        * aux_ptr = NULL;
+    H5AC_aux_t *aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 #if H5AC__TRACE_FILE_ENABLED
-    char                trace[128] = "";
-    FILE *              trace_file_ptr = NULL;
-#endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t              ret_value=SUCCEED;      /* Return value */
+    char  trace[128]     = "";
+    FILE *trace_file_ptr = NULL;
+#endif                          /* H5AC__TRACE_FILE_ENABLED */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1466,80 +1333,72 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
     HDassert(type->flush);
     HDassert(H5F_addr_defined(addr));
     HDassert(thing);
-    HDassert( ((H5AC_info_t *)thing)->addr == addr );
-    HDassert( ((H5AC_info_t *)thing)->type == type );
+    HDassert(((H5AC_info_t *)thing)->addr == addr);
+    HDassert(((H5AC_info_t *)thing)->type == type);
 
 #if H5AC__TRACE_FILE_ENABLED
     /* For the unprotect call, only the addr, type id, flags, and possible
      * new size are really necessary in the trace file.  Write the return
      * value to catch occult errors.
      */
-    if ( ( f != NULL ) &&
-         ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
-         ( trace_file_ptr != NULL ) ) {
-
-        HDsprintf(trace, "H5AC_unprotect 0x%lx %d",
-            (unsigned long)addr,
-        (int)(type->id));
+    if ((f != NULL) && (f->shared != NULL) && (f->shared->cache != NULL) &&
+        (H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) && (trace_file_ptr != NULL)) {
+
+        HDsprintf(trace, "H5AC_unprotect 0x%lx %d", (unsigned long)addr, (int)(type->id));
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
-    dirtied = (hbool_t)( ( (flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG ) ||
-        ( ((H5AC_info_t *)thing)->dirtied ) );
-    deleted = (hbool_t)( (flags & H5C__DELETED_FLAG) == H5C__DELETED_FLAG );
+    dirtied =
+        (hbool_t)(((flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG) || (((H5AC_info_t *)thing)->dirtied));
+    deleted = (hbool_t)((flags & H5C__DELETED_FLAG) == H5C__DELETED_FLAG);
 
     /* Check if the size changed out from underneath us, if we're not deleting
      *  the entry.
      */
-    if(dirtied && !deleted) {
-        size_t        curr_size = 0;
+    if (dirtied && !deleted) {
+        size_t curr_size = 0;
 
-        if((type->size)(f, thing, &curr_size) < 0)
+        if ((type->size)(f, thing, &curr_size) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, FAIL, "Can't get size of thing")
 
-        if(((H5AC_info_t *)thing)->size != curr_size)
+        if (((H5AC_info_t *)thing)->size != curr_size)
             HGOTO_ERROR(H5E_CACHE, H5E_BADSIZE, FAIL, "size of entry changed")
     } /* end if */
 
 #ifdef H5_HAVE_PARALLEL
-    if((dirtied) && (((H5AC_info_t *)thing)->is_dirty == FALSE) &&
-            (NULL != (aux_ptr = (H5AC_aux_t *)f->shared->cache->aux_ptr))) {
-        if(H5AC_log_dirtied_entry((H5AC_info_t *)thing, addr) < 0)
+    if ((dirtied) && (((H5AC_info_t *)thing)->is_dirty == FALSE) &&
+        (NULL != (aux_ptr = (H5AC_aux_t *)f->shared->cache->aux_ptr))) {
+        if (H5AC_log_dirtied_entry((H5AC_info_t *)thing, addr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "can't log dirtied entry")
     } /* end if */
 
-    if((deleted) &&
-            (NULL != (aux_ptr = (H5AC_aux_t *)(f->shared->cache->aux_ptr))) &&
-            (aux_ptr->mpi_rank == 0)) {
-        if(H5AC_log_deleted_entry(f->shared->cache, (H5AC_info_t *)thing, addr, flags) < 0)
+    if ((deleted) && (NULL != (aux_ptr = (H5AC_aux_t *)(f->shared->cache->aux_ptr))) &&
+        (aux_ptr->mpi_rank == 0)) {
+        if (H5AC_log_deleted_entry(f->shared->cache, (H5AC_info_t *)thing, addr, flags) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "H5AC_log_deleted_entry() failed.")
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
-    if(H5C_unprotect(f, dxpl_id, H5AC_dxpl_id, type, addr, thing, flags) < 0)
+    if (H5C_unprotect(f, dxpl_id, H5AC_dxpl_id, type, addr, thing, flags) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "H5C_unprotect() failed.")
 
 #ifdef H5_HAVE_PARALLEL
     /* Check if we should try to flush */
-    if((aux_ptr != NULL) && (aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold)) {
-        if(H5AC_run_sync_point(f, H5AC_dxpl_id, H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) < 0)
+    if ((aux_ptr != NULL) && (aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold)) {
+        if (H5AC_run_sync_point(f, H5AC_dxpl_id, H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't run sync point.")
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
 done:
 #if H5AC__TRACE_FILE_ENABLED
-    if(trace_file_ptr != NULL)
-    HDfprintf(trace_file_ptr, "%s %x %d\n",
-        trace, (unsigned)flags, (int)ret_value);
+    if (trace_file_ptr != NULL)
+        HDfprintf(trace_file_ptr, "%s %x %d\n", trace, (unsigned)flags, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_unprotect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    HA5C_set_sync_point_done_callback
  *
@@ -1557,10 +1416,10 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_set_sync_point_done_callback(H5C_t * cache_ptr,
-    void (* sync_point_done)(int num_writes, haddr_t * written_entries_tbl))
+H5AC_set_sync_point_done_callback(H5C_t *cache_ptr,
+                                  void (*sync_point_done)(int num_writes, haddr_t *written_entries_tbl))
 {
-    H5AC_aux_t * aux_ptr;
+    H5AC_aux_t *aux_ptr;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1568,8 +1427,8 @@ H5AC_set_sync_point_done_callback(H5C_t * cache_ptr,
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
     aux_ptr->sync_point_done = sync_point_done;
 
@@ -1577,7 +1436,6 @@ H5AC_set_sync_point_done_callback(H5C_t * cache_ptr,
 } /* H5AC_set_sync_point_done_callback() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    HA5C_set_write_done_callback
  *
@@ -1594,10 +1452,9 @@ H5AC_set_sync_point_done_callback(H5C_t * cache_ptr,
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_set_write_done_callback(H5C_t * cache_ptr,
-                             void (* write_done)(void))
+H5AC_set_write_done_callback(H5C_t *cache_ptr, void (*write_done)(void))
 {
-    H5AC_aux_t * aux_ptr;
+    H5AC_aux_t *aux_ptr;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1605,8 +1462,8 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr,
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
     aux_ptr->write_done = write_done;
 
@@ -1614,7 +1471,6 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr,
 } /* H5AC_set_write_done_callback() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_stats
  *
@@ -1630,7 +1486,7 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr,
 herr_t
 H5AC_stats(const H5F_t *f)
 {
-    herr_t        ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1645,7 +1501,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_stats() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_dump_cache
  *
@@ -1662,7 +1517,7 @@ done:
 herr_t
 H5AC_dump_cache(const H5F_t *f)
 {
-    herr_t              ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1670,7 +1525,7 @@ H5AC_dump_cache(const H5F_t *f)
     HDassert(f->shared);
     HDassert(f->shared->cache);
 
-    if ( H5C_dump_cache(f->shared->cache, H5F_OPEN_NAME(f)) < 0 ) {
+    if (H5C_dump_cache(f->shared->cache, H5F_OPEN_NAME(f)) < 0) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_dump_cache() failed.")
     }
@@ -1679,7 +1534,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_dump_cache() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_get_cache_auto_resize_config
  *
@@ -1693,57 +1547,41 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
-                                  H5AC_cache_config_t *config_ptr)
+H5AC_get_cache_auto_resize_config(const H5AC_t *cache_ptr, H5AC_cache_config_t *config_ptr)
 {
-    herr_t result;
-    herr_t ret_value = SUCCEED;      /* Return value */
-    hbool_t evictions_enabled;
+    herr_t              result;
+    herr_t              ret_value = SUCCEED; /* Return value */
+    hbool_t             evictions_enabled;
     H5C_auto_size_ctl_t internal_config;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( cache_ptr == NULL )
-         ||
+    if ((cache_ptr == NULL) ||
 #ifdef H5_HAVE_PARALLEL
-         ( ( cache_ptr->aux_ptr != NULL )
-           &&
-           ( ((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic
-             !=
-             H5AC__H5AC_AUX_T_MAGIC
-           )
-         )
-         ||
+        ((cache_ptr->aux_ptr != NULL) &&
+         (((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic != H5AC__H5AC_AUX_T_MAGIC)) ||
 #endif /* H5_HAVE_PARALLEL */
-         ( config_ptr == NULL )
-         ||
-         ( config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION )
-       )
-    {
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "Bad cache_ptr or config_ptr on entry.")
-
+        (config_ptr == NULL) || (config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION)) {
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr or config_ptr on entry.")
     }
 
-    result = H5C_get_cache_auto_resize_config((const H5C_t *)cache_ptr,
-                        &internal_config);
+    result = H5C_get_cache_auto_resize_config((const H5C_t *)cache_ptr, &internal_config);
 
-    if ( result < 0 ) {
+    if (result < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C_get_cache_auto_resize_config() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_cache_auto_resize_config() failed.")
     }
 
-    if(H5C_get_evictions_enabled((const H5C_t *)cache_ptr, &evictions_enabled) < 0)
+    if (H5C_get_evictions_enabled((const H5C_t *)cache_ptr, &evictions_enabled) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_resize_enabled() failed.")
 
-    if ( internal_config.rpt_fcn == NULL ) {
+    if (internal_config.rpt_fcn == NULL) {
 
         config_ptr->rpt_fcn_enabled = FALSE;
+    }
+    else {
 
-    } else {
-
-    config_ptr->rpt_fcn_enabled = TRUE;
+        config_ptr->rpt_fcn_enabled = TRUE;
     }
 
     config_ptr->open_trace_file        = FALSE;
@@ -1769,26 +1607,21 @@ H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
     config_ptr->decrement              = internal_config.decrement;
     config_ptr->apply_max_decrement    = internal_config.apply_max_decrement;
     config_ptr->max_decrement          = internal_config.max_decrement;
-    config_ptr->epochs_before_eviction =
-                                  (int)(internal_config.epochs_before_eviction);
+    config_ptr->epochs_before_eviction = (int)(internal_config.epochs_before_eviction);
     config_ptr->apply_empty_reserve    = internal_config.apply_empty_reserve;
     config_ptr->empty_reserve          = internal_config.empty_reserve;
 
 #ifdef H5_HAVE_PARALLEL
-    if ( cache_ptr->aux_ptr != NULL ) {
+    if (cache_ptr->aux_ptr != NULL) {
 
-        config_ptr->dirty_bytes_threshold =
-        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold;
-    config_ptr->metadata_write_strategy =
-        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->metadata_write_strategy;
-
-    } else {
+        config_ptr->dirty_bytes_threshold   = ((H5AC_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold;
+        config_ptr->metadata_write_strategy = ((H5AC_aux_t *)(cache_ptr->aux_ptr))->metadata_write_strategy;
+    }
+    else {
 #endif /* H5_HAVE_PARALLEL */
 
-        config_ptr->dirty_bytes_threshold =
-        H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD;
-    config_ptr->metadata_write_strategy =
-        H5AC__DEFAULT_METADATA_WRITE_STRATEGY;
+        config_ptr->dirty_bytes_threshold   = H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD;
+        config_ptr->metadata_write_strategy = H5AC__DEFAULT_METADATA_WRITE_STRATEGY;
 
 #ifdef H5_HAVE_PARALLEL
     }
@@ -1800,7 +1633,6 @@ done:
 
 } /* H5AC_get_cache_auto_resize_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_get_cache_size
  *
@@ -1814,27 +1646,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_get_cache_size(H5AC_t * cache_ptr,
-                    size_t * max_size_ptr,
-                    size_t * min_clean_size_ptr,
-                    size_t * cur_size_ptr,
-                    int32_t * cur_num_entries_ptr)
+H5AC_get_cache_size(H5AC_t *cache_ptr, size_t *max_size_ptr, size_t *min_clean_size_ptr, size_t *cur_size_ptr,
+                    int32_t *cur_num_entries_ptr)
 {
     herr_t result;
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    result = H5C_get_cache_size((H5C_t *)cache_ptr,
-                max_size_ptr,
-                min_clean_size_ptr,
-                cur_size_ptr,
-                cur_num_entries_ptr);
+    result = H5C_get_cache_size((H5C_t *)cache_ptr, max_size_ptr, min_clean_size_ptr, cur_size_ptr,
+                                cur_num_entries_ptr);
 
-    if ( result < 0 ) {
+    if (result < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C_get_cache_size() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_cache_size() failed.")
     }
 
 done:
@@ -1843,7 +1668,6 @@ done:
 
 } /* H5AC_get_cache_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_get_cache_hit_rate
  *
@@ -1857,20 +1681,19 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_get_cache_hit_rate(H5AC_t * cache_ptr, double * hit_rate_ptr)
+H5AC_get_cache_hit_rate(H5AC_t *cache_ptr, double *hit_rate_ptr)
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5C_get_cache_hit_rate((H5C_t *)cache_ptr, hit_rate_ptr) < 0)
+    if (H5C_get_cache_hit_rate((H5C_t *)cache_ptr, hit_rate_ptr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_cache_hit_rate() failed.")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_get_cache_hit_rate() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_reset_cache_hit_rate_stats()
@@ -1884,19 +1707,18 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_reset_cache_hit_rate_stats(H5AC_t * cache_ptr)
+H5AC_reset_cache_hit_rate_stats(H5AC_t *cache_ptr)
 {
     herr_t result;
-    herr_t      ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     result = H5C_reset_cache_hit_rate_stats((H5C_t *)cache_ptr);
 
-    if ( result < 0 ) {
+    if (result < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C_reset_cache_hit_rate_stats() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_reset_cache_hit_rate_stats() failed.")
     }
 
 done:
@@ -1905,7 +1727,6 @@ done:
 
 } /* H5AC_reset_cache_hit_rate_stats() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_set_cache_auto_resize_config
  *
@@ -1919,110 +1740,93 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr,
-                                  H5AC_cache_config_t *config_ptr)
+H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr, H5AC_cache_config_t *config_ptr)
 {
     herr_t              result;
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    herr_t              ret_value = SUCCEED; /* Return value */
     H5C_auto_size_ctl_t internal_config;
 #if H5AC__TRACE_FILE_ENABLED
-    H5AC_cache_config_t trace_config = H5AC__DEFAULT_CACHE_CONFIG;
+    H5AC_cache_config_t trace_config   = H5AC__DEFAULT_CACHE_CONFIG;
     FILE *              trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr );
+    HDassert(cache_ptr);
 
 #if H5AC__TRACE_FILE_ENABLED
     /* Make note of the new configuration.  Don't look up the trace file
      * pointer, as that may change before we use it.
      */
-    if ( config_ptr != NULL ) {
+    if (config_ptr != NULL) {
 
         trace_config = *config_ptr;
-
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if ( ( cache_ptr == NULL )
+    if ((cache_ptr == NULL)
 #ifdef H5_HAVE_PARALLEL
-         ||
-         ( ( cache_ptr->aux_ptr != NULL )
-           &&
-           (
-             ((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic
-             !=
-             H5AC__H5AC_AUX_T_MAGIC
-           )
-         )
+        || ((cache_ptr->aux_ptr != NULL) &&
+            (((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic != H5AC__H5AC_AUX_T_MAGIC))
 #endif /* H5_HAVE_PARALLEL */
-       ) {
+    ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "bad cache_ptr on entry.")
     }
 
     result = H5AC_validate_config(config_ptr);
 
-    if ( result != SUCCEED ) {
+    if (result != SUCCEED) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad cache configuration");
     }
 
-    if ( config_ptr->open_trace_file ) {
+    if (config_ptr->open_trace_file) {
 
-    FILE * file_ptr = NULL;
+        FILE *file_ptr = NULL;
 
-    if ( H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
+        if (H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-            "H5C_get_trace_file_ptr() failed.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_trace_file_ptr() failed.")
+        }
 
-    if ( ( ! ( config_ptr->close_trace_file ) ) &&
-        ( file_ptr != NULL ) ) {
+        if ((!(config_ptr->close_trace_file)) && (file_ptr != NULL)) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                        "Trace file already open.")
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Trace file already open.")
         }
     }
 
-    if ( config_ptr->close_trace_file ) {
+    if (config_ptr->close_trace_file) {
 
-    if ( H5AC_close_trace_file(cache_ptr) < 0 ) {
+        if (H5AC_close_trace_file(cache_ptr) < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5AC_close_trace_file() failed.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_close_trace_file() failed.")
+        }
     }
 
-    if ( config_ptr->open_trace_file ) {
+    if (config_ptr->open_trace_file) {
 
-        if ( H5AC_open_trace_file(cache_ptr, config_ptr->trace_file_name) < 0 )
-    {
+        if (H5AC_open_trace_file(cache_ptr, config_ptr->trace_file_name) < 0) {
 
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                        "H5AC_open_trace_file() failed.")
-    }
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "H5AC_open_trace_file() failed.")
+        }
     }
 
-    if(H5AC_ext_config_2_int_config(config_ptr, &internal_config) < 0)
+    if (H5AC_ext_config_2_int_config(config_ptr, &internal_config) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_ext_config_2_int_config() failed.")
 
-    if(H5C_set_cache_auto_resize_config(cache_ptr, &internal_config) < 0)
+    if (H5C_set_cache_auto_resize_config(cache_ptr, &internal_config) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_set_cache_auto_resize_config() failed.")
 
-    if(H5C_set_evictions_enabled(cache_ptr, config_ptr->evictions_enabled) < 0)
+    if (H5C_set_evictions_enabled(cache_ptr, config_ptr->evictions_enabled) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_set_evictions_enabled() failed.")
 
 #ifdef H5_HAVE_PARALLEL
-    if ( cache_ptr->aux_ptr != NULL ) {
+    if (cache_ptr->aux_ptr != NULL) {
 
-        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold =
-            config_ptr->dirty_bytes_threshold;
+        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold = config_ptr->dirty_bytes_threshold;
 
-        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->metadata_write_strategy =
-            config_ptr->metadata_write_strategy;
+        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->metadata_write_strategy = config_ptr->metadata_write_strategy;
     }
 #endif /* H5_HAVE_PARALLEL */
 
@@ -2033,44 +1837,26 @@ done:
      * of the config is necessary in the trace file. Write the return
      * value to catch occult errors.
      */
-    if ( ( cache_ptr != NULL ) &&
-         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
-         ( trace_file_ptr != NULL ) ) {
-
-    HDfprintf(trace_file_ptr,
-                  "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %f %f %d %d %d %f %f %d %d %d %d %f %d %d %d\n",
-        "H5AC_set_cache_auto_resize_config",
-        trace_config.version,
-        (int)(trace_config.rpt_fcn_enabled),
-        (int)(trace_config.open_trace_file),
-        (int)(trace_config.close_trace_file),
-        trace_config.trace_file_name,
-        (int)(trace_config.evictions_enabled),
-        (int)(trace_config.set_initial_size),
-        (int)(trace_config.initial_size),
-        trace_config.min_clean_fraction,
-        (int)(trace_config.max_size),
-        (int)(trace_config.min_size),
-        trace_config.epoch_length,
-        (int)(trace_config.incr_mode),
-        trace_config.lower_hr_threshold,
-        trace_config.increment,
-        (int)(trace_config.flash_incr_mode),
-        trace_config.flash_multiple,
-        trace_config.flash_threshold,
-        (int)(trace_config.apply_max_increment),
-        (int)(trace_config.max_increment),
-        (int)(trace_config.decr_mode),
-        trace_config.upper_hr_threshold,
-        trace_config.decrement,
-        (int)(trace_config.apply_max_decrement),
-        (int)(trace_config.max_decrement),
-        trace_config.epochs_before_eviction,
-        (int)(trace_config.apply_empty_reserve),
-        trace_config.empty_reserve,
-        trace_config.dirty_bytes_threshold,
-        trace_config.metadata_write_strategy,
-        (int)ret_value);
+    if ((cache_ptr != NULL) && (H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0) &&
+        (trace_file_ptr != NULL)) {
+
+        HDfprintf(
+            trace_file_ptr,
+            "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %f %f %d %d %d %f %f %d %d %d %d %f %d "
+            "%d %d\n",
+            "H5AC_set_cache_auto_resize_config", trace_config.version, (int)(trace_config.rpt_fcn_enabled),
+            (int)(trace_config.open_trace_file), (int)(trace_config.close_trace_file),
+            trace_config.trace_file_name, (int)(trace_config.evictions_enabled),
+            (int)(trace_config.set_initial_size), (int)(trace_config.initial_size),
+            trace_config.min_clean_fraction, (int)(trace_config.max_size), (int)(trace_config.min_size),
+            trace_config.epoch_length, (int)(trace_config.incr_mode), trace_config.lower_hr_threshold,
+            trace_config.increment, (int)(trace_config.flash_incr_mode), trace_config.flash_multiple,
+            trace_config.flash_threshold, (int)(trace_config.apply_max_increment),
+            (int)(trace_config.max_increment), (int)(trace_config.decr_mode), trace_config.upper_hr_threshold,
+            trace_config.decrement, (int)(trace_config.apply_max_decrement),
+            (int)(trace_config.max_decrement), trace_config.epochs_before_eviction,
+            (int)(trace_config.apply_empty_reserve), trace_config.empty_reserve,
+            trace_config.dirty_bytes_threshold, trace_config.metadata_write_strategy, (int)ret_value);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
@@ -2078,7 +1864,6 @@ done:
 
 } /* H5AC_set_cache_auto_resize_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_validate_config()
  *
@@ -2102,82 +1887,81 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_validate_config(H5AC_cache_config_t * config_ptr)
+H5AC_validate_config(H5AC_cache_config_t *config_ptr)
 {
     H5C_auto_size_ctl_t internal_config;
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(config_ptr == NULL)
+    if (config_ptr == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
 
-    if(config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION)
+    if (config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown config version.")
 
-    if((config_ptr->rpt_fcn_enabled != TRUE) && (config_ptr->rpt_fcn_enabled != FALSE))
+    if ((config_ptr->rpt_fcn_enabled != TRUE) && (config_ptr->rpt_fcn_enabled != FALSE))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->rpt_fcn_enabled must be either TRUE or FALSE.")
 
-    if((config_ptr->open_trace_file != TRUE) && (config_ptr->open_trace_file != FALSE))
+    if ((config_ptr->open_trace_file != TRUE) && (config_ptr->open_trace_file != FALSE))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->open_trace_file must be either TRUE or FALSE.")
 
-    if((config_ptr->close_trace_file != TRUE) && (config_ptr->close_trace_file != FALSE))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->close_trace_file must be either TRUE or FALSE.")
+    if ((config_ptr->close_trace_file != TRUE) && (config_ptr->close_trace_file != FALSE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                    "config_ptr->close_trace_file must be either TRUE or FALSE.")
 
     /* don't bother to test trace_file_name unless open_trace_file is TRUE */
-    if(config_ptr->open_trace_file) {
-        size_t            name_len;
+    if (config_ptr->open_trace_file) {
+        size_t name_len;
 
-    /* Can't really test the trace_file_name field without trying to
-    * open the file, so we will content ourselves with a couple of
-    * sanity checks on the length of the file name.
-    */
-    name_len = HDstrlen(config_ptr->trace_file_name);
+        /* Can't really test the trace_file_name field without trying to
+         * open the file, so we will content ourselves with a couple of
+         * sanity checks on the length of the file name.
+         */
+        name_len = HDstrlen(config_ptr->trace_file_name);
 
-    if(name_len == 0) {
+        if (name_len == 0) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->trace_file_name is empty.")
-        } else if(name_len > H5AC__MAX_TRACE_FILE_NAME_LEN) {
+        }
+        else if (name_len > H5AC__MAX_TRACE_FILE_NAME_LEN) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->trace_file_name too long.")
-    }
+        }
     }
 
-    if ( ( config_ptr->evictions_enabled != TRUE ) &&
-         ( config_ptr->evictions_enabled != FALSE ) ) {
+    if ((config_ptr->evictions_enabled != TRUE) && (config_ptr->evictions_enabled != FALSE)) {
 
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-            "config_ptr->evictions_enabled must be either TRUE or FALSE.")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                    "config_ptr->evictions_enabled must be either TRUE or FALSE.")
     }
 
-    if ( ( config_ptr->evictions_enabled == FALSE ) &&
-    ( ( config_ptr->incr_mode != H5C_incr__off ) ||
-    ( config_ptr->flash_incr_mode != H5C_flash_incr__off ) ||
-    ( config_ptr->decr_mode != H5C_decr__off ) ) ) {
+    if ((config_ptr->evictions_enabled == FALSE) &&
+        ((config_ptr->incr_mode != H5C_incr__off) || (config_ptr->flash_incr_mode != H5C_flash_incr__off) ||
+         (config_ptr->decr_mode != H5C_decr__off))) {
 
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                    "Can't disable evictions while auto-resize is enabled.")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Can't disable evictions while auto-resize is enabled.")
     }
 
-    if(config_ptr->dirty_bytes_threshold < H5AC__MIN_DIRTY_BYTES_THRESHOLD) {
+    if (config_ptr->dirty_bytes_threshold < H5AC__MIN_DIRTY_BYTES_THRESHOLD) {
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dirty_bytes_threshold too small.")
-    } else if(config_ptr->dirty_bytes_threshold > H5AC__MAX_DIRTY_BYTES_THRESHOLD) {
+    }
+    else if (config_ptr->dirty_bytes_threshold > H5AC__MAX_DIRTY_BYTES_THRESHOLD) {
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dirty_bytes_threshold too big.")
     }
 
-    if((config_ptr->metadata_write_strategy != H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY) &&
-         (config_ptr->metadata_write_strategy != H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED))
+    if ((config_ptr->metadata_write_strategy != H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY) &&
+        (config_ptr->metadata_write_strategy != H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->metadata_write_strategy out of range.")
 
-    if(H5AC_ext_config_2_int_config(config_ptr, &internal_config) < 0)
+    if (H5AC_ext_config_2_int_config(config_ptr, &internal_config) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_ext_config_2_int_config() failed.")
 
-    if(H5C_validate_resize_config(&internal_config, H5C_RESIZE_CFG__VALIDATE_ALL) < 0)
+    if (H5C_validate_resize_config(&internal_config, H5C_RESIZE_CFG__VALIDATE_ALL) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error(s) in new config.")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_validate_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_close_trace_file()
  *
@@ -2195,37 +1979,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_close_trace_file(H5AC_t * cache_ptr)
+H5AC_close_trace_file(H5AC_t *cache_ptr)
 
 {
-    herr_t   ret_value = SUCCEED;    /* Return value */
-    FILE *   trace_file_ptr = NULL;
+    herr_t ret_value      = SUCCEED; /* Return value */
+    FILE * trace_file_ptr = NULL;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if ( cache_ptr == NULL ) {
+    if (cache_ptr == NULL) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL cache_ptr on entry.")
     }
 
-    if ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) < 0 ) {
+    if (H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-            "H5C_get_trace_file_ptr() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_trace_file_ptr() failed.")
     }
 
-    if ( trace_file_ptr != NULL ) {
+    if (trace_file_ptr != NULL) {
 
-        if ( H5C_set_trace_file_ptr(cache_ptr, NULL) < 0 ) {
+        if (H5C_set_trace_file_ptr(cache_ptr, NULL) < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C_set_trace_file_ptr() failed.")
-         }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_set_trace_file_ptr() failed.")
+        }
 
-        if ( HDfclose(trace_file_ptr) != 0 ) {
+        if (HDfclose(trace_file_ptr) != 0) {
 
-            HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, \
-                        "can't close metadata cache trace file")
+            HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close metadata cache trace file")
         }
     }
 
@@ -2235,7 +2016,6 @@ done:
 
 } /* H5AC_close_trace_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_open_trace_file()
  *
@@ -2253,43 +2033,40 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_open_trace_file(H5AC_t * cache_ptr,
-            const char * trace_file_name)
+H5AC_open_trace_file(H5AC_t *cache_ptr, const char *trace_file_name)
 {
-    herr_t   ret_value = SUCCEED;    /* Return value */
-    char     file_name[H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 2];
-    FILE *   file_ptr = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
+    char   file_name[H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 2];
+    FILE * file_ptr = NULL;
 #ifdef H5_HAVE_PARALLEL
-    H5AC_aux_t * aux_ptr = NULL;
+    H5AC_aux_t *aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(cache_ptr);
 
-    if ( cache_ptr == NULL ) {
+    if (cache_ptr == NULL) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cache_ptr NULL on entry.")
     }
 
-    if ( trace_file_name == NULL ) {
+    if (trace_file_name == NULL) {
 
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-            "NULL trace_file_name on entry.")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL trace_file_name on entry.")
     }
 
-    if ( HDstrlen(trace_file_name) > H5AC__MAX_TRACE_FILE_NAME_LEN ) {
+    if (HDstrlen(trace_file_name) > H5AC__MAX_TRACE_FILE_NAME_LEN) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trace file name too long.")
     }
 
-    if ( H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
+    if (H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-            "H5C_get_trace_file_ptr() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_trace_file_ptr() failed.")
     }
 
-    if ( file_ptr != NULL ) {
+    if (file_ptr != NULL) {
 
         HGOTO_ERROR(H5E_FILE, H5E_FILEOPEN, FAIL, "trace file already open.")
     }
@@ -2298,48 +2075,43 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    if ( cache_ptr->aux_ptr == NULL ) {
+    if (cache_ptr->aux_ptr == NULL) {
 
         HDsprintf(file_name, "%s", trace_file_name);
+    }
+    else {
 
-    } else {
-
-    if ( aux_ptr->magic != H5AC__H5AC_AUX_T_MAGIC ) {
+        if (aux_ptr->magic != H5AC__H5AC_AUX_T_MAGIC) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad aux_ptr->magic.")
-    }
+        }
 
         HDsprintf(file_name, "%s.%d", trace_file_name, aux_ptr->mpi_rank);
-
     }
 
-    if ( HDstrlen(file_name) >
-         H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 1 ) {
+    if (HDstrlen(file_name) > H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 1) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-            "cooked trace file name too long.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "cooked trace file name too long.")
     }
 
 #else /* H5_HAVE_PARALLEL */
 
-    HDsnprintf(file_name,
-               (size_t)(H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 1),
-               "%s", trace_file_name);
+    HDsnprintf(file_name, (size_t)(H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 1), "%s",
+               trace_file_name);
 
 #endif /* H5_HAVE_PARALLEL */
 
-    if ( (file_ptr = HDfopen(file_name, "w")) == NULL ) {
+    if ((file_ptr = HDfopen(file_name, "w")) == NULL) {
 
-    /* trace file open failed */
+        /* trace file open failed */
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "trace file open failed.")
     }
 
     HDfprintf(file_ptr, "### HDF5 metadata cache trace file ###\n");
 
-    if ( H5C_set_trace_file_ptr(cache_ptr, file_ptr) < 0 ) {
+    if (H5C_set_trace_file_ptr(cache_ptr, file_ptr) < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-            "H5C_set_trace_file_ptr() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_set_trace_file_ptr() failed.")
     }
 
 done:
@@ -2348,7 +2120,6 @@ done:
 
 } /* H5AC_open_trace_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_add_candidate()
  *
@@ -2369,40 +2140,38 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_add_candidate(H5AC_t * cache_ptr,
-                   haddr_t addr)
+H5AC_add_candidate(H5AC_t *cache_ptr, haddr_t addr)
 {
-    H5AC_aux_t         * aux_ptr;
-    H5AC_slist_entry_t * slist_entry_ptr = NULL;
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    H5AC_aux_t *        aux_ptr;
+    H5AC_slist_entry_t *slist_entry_ptr = NULL;
+    herr_t              ret_value       = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
-    HDassert( aux_ptr->candidate_slist_ptr != NULL );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
+    HDassert(aux_ptr->candidate_slist_ptr != NULL);
 
     /* If the supplied address appears in the candidate list, scream and die. */
-    if(NULL != H5SL_search(aux_ptr->candidate_slist_ptr, (void *)(&addr)))
+    if (NULL != H5SL_search(aux_ptr->candidate_slist_ptr, (void *)(&addr)))
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "entry already in candidate slist.")
 
     /* otherwise, construct an entry for the supplied address, and insert
      * it into the candidate slist.
      */
-    if(NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)))
+    if (NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "Can't allocate candidate slist entry .")
 
     slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
     slist_entry_ptr->addr  = addr;
 
-    if(H5SL_insert(aux_ptr->candidate_slist_ptr, slist_entry_ptr, &(slist_entry_ptr->addr)) < 0)
+    if (H5SL_insert(aux_ptr->candidate_slist_ptr, slist_entry_ptr, &(slist_entry_ptr->addr)) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, "can't insert entry into dirty entry slist.")
 
     aux_ptr->candidate_slist_len += 1;
@@ -2412,7 +2181,6 @@ done:
 } /* H5AC_add_candidate() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*************************************************************************/
 /**************************** Private Functions: *************************/
 /*************************************************************************/
@@ -2443,61 +2211,57 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
-                              int * num_entries_ptr,
-                              haddr_t ** haddr_buf_ptr_ptr)
+H5AC_broadcast_candidate_list(H5AC_t *cache_ptr, int *num_entries_ptr, haddr_t **haddr_buf_ptr_ptr)
 {
-    hbool_t         success = FALSE;
-    H5AC_aux_t         * aux_ptr = NULL;
-    haddr_t            * haddr_buf_ptr = NULL;
-    MPI_Offset         * MPI_Offset_buf_ptr = NULL;
-    size_t         buf_size = 0;
-    int                  mpi_result;
-    int             chk_num_entries = 0;
-    int             num_entries = 0;
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    hbool_t     success            = FALSE;
+    H5AC_aux_t *aux_ptr            = NULL;
+    haddr_t *   haddr_buf_ptr      = NULL;
+    MPI_Offset *MPI_Offset_buf_ptr = NULL;
+    size_t      buf_size           = 0;
+    int         mpi_result;
+    int         chk_num_entries = 0;
+    int         num_entries     = 0;
+    herr_t      ret_value       = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->mpi_rank == 0 );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
-    HDassert( aux_ptr->candidate_slist_ptr != NULL );
-    HDassert( H5SL_count(aux_ptr->candidate_slist_ptr) ==
-            (size_t)(aux_ptr->candidate_slist_len) );
-    HDassert( num_entries_ptr != NULL );
-    HDassert( *num_entries_ptr == 0 );
-    HDassert( haddr_buf_ptr_ptr != NULL );
-    HDassert( *haddr_buf_ptr_ptr == NULL );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->mpi_rank == 0);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
+    HDassert(aux_ptr->candidate_slist_ptr != NULL);
+    HDassert(H5SL_count(aux_ptr->candidate_slist_ptr) == (size_t)(aux_ptr->candidate_slist_len));
+    HDassert(num_entries_ptr != NULL);
+    HDassert(*num_entries_ptr == 0);
+    HDassert(haddr_buf_ptr_ptr != NULL);
+    HDassert(*haddr_buf_ptr_ptr == NULL);
 
     /* First broadcast the number of entries in the list so that the
      * receivers can set up buffers to receive them.  If there aren't
      * any, we are done.
      */
     num_entries = aux_ptr->candidate_slist_len;
-    if(MPI_SUCCESS != (mpi_result = MPI_Bcast(&num_entries, 1, MPI_INT, 0, aux_ptr->mpi_comm)))
+    if (MPI_SUCCESS != (mpi_result = MPI_Bcast(&num_entries, 1, MPI_INT, 0, aux_ptr->mpi_comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed 1", mpi_result)
 
-    if(num_entries > 0) {
+    if (num_entries > 0) {
         /* convert the candidate list into the format we
          * are used to receiving from process 0, and also load it
          * into a buffer for transmission.
          */
-        if(H5AC_copy_candidate_list_to_buffer(cache_ptr, &chk_num_entries,
-                &haddr_buf_ptr, &buf_size, &MPI_Offset_buf_ptr) < 0)
+        if (H5AC_copy_candidate_list_to_buffer(cache_ptr, &chk_num_entries, &haddr_buf_ptr, &buf_size,
+                                               &MPI_Offset_buf_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't construct candidate buffer.")
 
-        HDassert( chk_num_entries == num_entries );
-        HDassert( haddr_buf_ptr != NULL );
-        HDassert( MPI_Offset_buf_ptr != NULL );
-        HDassert( aux_ptr->candidate_slist_len == 0 );
+        HDassert(chk_num_entries == num_entries);
+        HDassert(haddr_buf_ptr != NULL);
+        HDassert(MPI_Offset_buf_ptr != NULL);
+        HDassert(aux_ptr->candidate_slist_len == 0);
 
         /* Now broadcast the list of candidate entries -- if there is one.
          *
@@ -2506,24 +2270,26 @@ H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
          * Thus the element type is MPI_BYTE, with size equal to the
          * buf_size computed above.
          */
-        if(MPI_SUCCESS != (mpi_result = MPI_Bcast((void *)MPI_Offset_buf_ptr, (int)buf_size, MPI_BYTE, 0, aux_ptr->mpi_comm)))
+        if (MPI_SUCCESS != (mpi_result = MPI_Bcast((void *)MPI_Offset_buf_ptr, (int)buf_size, MPI_BYTE, 0,
+                                                   aux_ptr->mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed 2", mpi_result)
     } /* end if */
 
     success = TRUE;
 
 done:
-    if(MPI_Offset_buf_ptr != NULL)
+    if (MPI_Offset_buf_ptr != NULL)
         MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_xfree((void *)MPI_Offset_buf_ptr);
 
-    if(success) {
+    if (success) {
         /* Pass the number of entries and the buffer pointer
          * back to the caller.  Do this so that we can use the same code
          * to apply the candidate list to all the processes.
          */
-        *num_entries_ptr = num_entries;
+        *num_entries_ptr   = num_entries;
         *haddr_buf_ptr_ptr = haddr_buf_ptr;
-    } else if(haddr_buf_ptr != NULL) {
+    }
+    else if (haddr_buf_ptr != NULL) {
         haddr_buf_ptr = (haddr_t *)H5MM_xfree((void *)haddr_buf_ptr);
     }
 
@@ -2531,7 +2297,6 @@ done:
 } /* H5AC_broadcast_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_broadcast_clean_list()
@@ -2554,34 +2319,32 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
+H5AC_broadcast_clean_list(H5AC_t *cache_ptr)
 {
-    herr_t               ret_value = SUCCEED;    /* Return value */
-    haddr_t         addr;
-    haddr_t           * addr_buf_ptr = NULL;
-    H5AC_aux_t         * aux_ptr = NULL;
-    H5SL_node_t        * slist_node_ptr = NULL;
-    H5AC_slist_entry_t * slist_entry_ptr = NULL;
-    MPI_Offset         * buf_ptr = NULL;
-    size_t         buf_size;
-    int                  i = 0;
-    int                  mpi_result;
-    int             num_entries = 0;
+    herr_t              ret_value = SUCCEED; /* Return value */
+    haddr_t             addr;
+    haddr_t *           addr_buf_ptr    = NULL;
+    H5AC_aux_t *        aux_ptr         = NULL;
+    H5SL_node_t *       slist_node_ptr  = NULL;
+    H5AC_slist_entry_t *slist_entry_ptr = NULL;
+    MPI_Offset *        buf_ptr         = NULL;
+    size_t              buf_size;
+    int                 i = 0;
+    int                 mpi_result;
+    int                 num_entries = 0;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)cache_ptr->aux_ptr;
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->mpi_rank == 0 );
-    HDassert( aux_ptr->c_slist_ptr != NULL );
-    HDassert( H5SL_count(aux_ptr->c_slist_ptr) ==
-            (size_t)(aux_ptr->c_slist_len) );
-
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->mpi_rank == 0);
+    HDassert(aux_ptr->c_slist_ptr != NULL);
+    HDassert(H5SL_count(aux_ptr->c_slist_ptr) == (size_t)(aux_ptr->c_slist_len));
 
     /* First broadcast the number of entries in the list so that the
      * receives can set up a buffer to receive them.  If there aren't
@@ -2591,102 +2354,93 @@ H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
 
     mpi_result = MPI_Bcast(&num_entries, 1, MPI_INT, 0, aux_ptr->mpi_comm);
 
-    if ( mpi_result != MPI_SUCCESS ) {
+    if (mpi_result != MPI_SUCCESS) {
 
         HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed 1", mpi_result)
-
     }
 
-    if ( num_entries > 0 )
-    {
+    if (num_entries > 0) {
         /* allocate a buffer to store the list of entry base addresses in */
 
         buf_size = sizeof(MPI_Offset) * (size_t)num_entries;
 
         buf_ptr = (MPI_Offset *)H5MM_malloc(buf_size);
 
-        if ( buf_ptr == NULL ) {
+        if (buf_ptr == NULL) {
 
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                        "memory allocation failed for clean entry buffer")
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for clean entry buffer")
         }
 
         /* if the sync_point_done callback is defined, allocate the
          * addr buffer as well.
          */
-        if ( aux_ptr->sync_point_done != NULL ) {
+        if (aux_ptr->sync_point_done != NULL) {
 
             addr_buf_ptr = (haddr_t *)H5MM_malloc((size_t)num_entries * sizeof(haddr_t));
 
-            if ( addr_buf_ptr == NULL ) {
+            if (addr_buf_ptr == NULL) {
 
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                            "memory allocation failed for addr buffer")
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for addr buffer")
             }
         }
 
-
         /* now load the entry base addresses into the buffer, emptying the
          * cleaned entry list in passing
          */
 
-        while ( NULL != (slist_node_ptr = H5SL_first(aux_ptr->c_slist_ptr) ) )
-        {
+        while (NULL != (slist_node_ptr = H5SL_first(aux_ptr->c_slist_ptr))) {
             slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_item(slist_node_ptr);
 
             HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
 
-            HDassert( i < num_entries );
+            HDassert(i < num_entries);
 
             addr = slist_entry_ptr->addr;
 
-            if ( addr_buf_ptr != NULL ) {
+            if (addr_buf_ptr != NULL) {
 
                 addr_buf_ptr[i] = addr;
             }
 
-            if ( H5FD_mpi_haddr_to_MPIOff(addr, &(buf_ptr[i])) < 0 ) {
+            if (H5FD_mpi_haddr_to_MPIOff(addr, &(buf_ptr[i])) < 0) {
 
-                HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, \
-                            "can't convert from haddr to MPI off")
+                HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off")
             }
 
             i++;
 
             /* now remove the entry from the cleaned entry list */
-            if ( H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr))
-                 != slist_entry_ptr ) {
+            if (H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr)) != slist_entry_ptr) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, \
-                            "Can't delete entry from cleaned entry slist.")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from cleaned entry slist.")
             }
 
             slist_entry_ptr->magic = 0;
-            slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+            slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
             aux_ptr->c_slist_len -= 1;
 
-            HDassert( aux_ptr->c_slist_len >= 0 );
+            HDassert(aux_ptr->c_slist_len >= 0);
 
             /* and also remove the matching entry from the dirtied list
              * if it exists.
              */
-            if((slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->d_slist_ptr, (void *)(&addr))) != NULL) {
-                HDassert( slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
-                HDassert( slist_entry_ptr->addr == addr );
+            if ((slist_entry_ptr =
+                     (H5AC_slist_entry_t *)H5SL_search(aux_ptr->d_slist_ptr, (void *)(&addr))) != NULL) {
+                HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
+                HDassert(slist_entry_ptr->addr == addr);
 
-                if(H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
+                if (H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
                     HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from dirty entry slist.")
 
                 slist_entry_ptr->magic = 0;
-                slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+                slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
                 aux_ptr->d_slist_len -= 1;
 
-                HDassert( aux_ptr->d_slist_len >= 0 );
+                HDassert(aux_ptr->d_slist_len >= 0);
             } /* end if */
-        } /* while */
-
+        }     /* while */
 
         /* Now broadcast the list of cleaned entries -- if there is one.
          *
@@ -2696,29 +2450,27 @@ H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
          * buf_size computed above.
          */
 
-        mpi_result = MPI_Bcast((void *)buf_ptr, (int)buf_size, MPI_BYTE, 0,
-                               aux_ptr->mpi_comm);
+        mpi_result = MPI_Bcast((void *)buf_ptr, (int)buf_size, MPI_BYTE, 0, aux_ptr->mpi_comm);
 
-        if ( mpi_result != MPI_SUCCESS ) {
+        if (mpi_result != MPI_SUCCESS) {
 
             HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed 2", mpi_result)
         }
     }
 
-    if(aux_ptr->sync_point_done != NULL)
+    if (aux_ptr->sync_point_done != NULL)
         (aux_ptr->sync_point_done)(num_entries, addr_buf_ptr);
 
 done:
-    if(buf_ptr != NULL)
+    if (buf_ptr != NULL)
         buf_ptr = (MPI_Offset *)H5MM_xfree((void *)buf_ptr);
-    if(addr_buf_ptr != NULL)
+    if (addr_buf_ptr != NULL)
         addr_buf_ptr = (haddr_t *)H5MM_xfree((void *)addr_buf_ptr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_broadcast_clean_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_check_if_write_permitted
@@ -2740,46 +2492,41 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_check_if_write_permitted(const H5F_t *f,
-                              hid_t H5_ATTR_UNUSED dxpl_id,
-                              hbool_t * write_permitted_ptr)
-#else /* H5_HAVE_PARALLEL */
+H5AC_check_if_write_permitted(const H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t *write_permitted_ptr)
+#else  /* H5_HAVE_PARALLEL */
 static herr_t
-H5AC_check_if_write_permitted(const H5F_t H5_ATTR_UNUSED * f,
-                              hid_t H5_ATTR_UNUSED dxpl_id,
-                              hbool_t * write_permitted_ptr)
+H5AC_check_if_write_permitted(const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
+                              hbool_t *write_permitted_ptr)
 #endif /* H5_HAVE_PARALLEL */
 {
-    hbool_t        write_permitted = TRUE;
-    herr_t        ret_value = SUCCEED;      /* Return value */
+    hbool_t write_permitted = TRUE;
+    herr_t  ret_value       = SUCCEED; /* Return value */
 #ifdef H5_HAVE_PARALLEL
-    H5AC_aux_t *    aux_ptr = NULL;
+    H5AC_aux_t *aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 
-
     FUNC_ENTER_NOAPI(FAIL)
 
 #ifdef H5_HAVE_PARALLEL
-    HDassert( f != NULL );
-    HDassert( f->shared != NULL );
-    HDassert( f->shared->cache != NULL );
+    HDassert(f != NULL);
+    HDassert(f->shared != NULL);
+    HDassert(f->shared->cache != NULL);
 
     aux_ptr = (H5AC_aux_t *)(f->shared->cache->aux_ptr);
 
-    if ( aux_ptr != NULL ) {
-
-        HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
+    if (aux_ptr != NULL) {
 
-        if ( ( aux_ptr->mpi_rank == 0 ) ||
-             ( aux_ptr->metadata_write_strategy ==
-               H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED ) ) {
+        HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
-        write_permitted = aux_ptr->write_permitted;
+        if ((aux_ptr->mpi_rank == 0) ||
+            (aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED)) {
 
-        } else {
+            write_permitted = aux_ptr->write_permitted;
+        }
+        else {
 
-        write_permitted = FALSE;
-    }
+            write_permitted = FALSE;
+        }
     }
 #endif /* H5_HAVE_PARALLEL */
 
@@ -2791,7 +2538,6 @@ done:
 
 } /* H5AC_check_if_write_permitted() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_construct_candidate_list()
  *
@@ -2813,44 +2559,41 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_construct_candidate_list(H5AC_t * cache_ptr,
-                              H5AC_aux_t * aux_ptr,
-                              int sync_point_op)
+H5AC_construct_candidate_list(H5AC_t *cache_ptr, H5AC_aux_t *aux_ptr, int sync_point_op)
 {
-    herr_t ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
-    HDassert( ( sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_CACHE ) ||
-              ( aux_ptr->mpi_rank == 0 ) );
-    HDassert( aux_ptr->d_slist_ptr != NULL );
-    HDassert( aux_ptr->c_slist_ptr != NULL );
-    HDassert( aux_ptr->c_slist_len == 0 );
-    HDassert( aux_ptr->candidate_slist_ptr != NULL );
-    HDassert( aux_ptr->candidate_slist_len == 0 );
-    HDassert( ( sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN ) ||
-              ( sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_CACHE ) );
-
-    switch(sync_point_op) {
-    case H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN:
-            if(H5C_construct_candidate_list__min_clean((H5C_t *)cache_ptr) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_construct_candidate_list__min_clean() failed.")
-        break;
-
-    case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
-            if(H5C_construct_candidate_list__clean_cache((H5C_t *)cache_ptr) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_construct_candidate_list__clean_cache() failed.")
-        break;
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
+    HDassert((sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_CACHE) || (aux_ptr->mpi_rank == 0));
+    HDassert(aux_ptr->d_slist_ptr != NULL);
+    HDassert(aux_ptr->c_slist_ptr != NULL);
+    HDassert(aux_ptr->c_slist_len == 0);
+    HDassert(aux_ptr->candidate_slist_ptr != NULL);
+    HDassert(aux_ptr->candidate_slist_len == 0);
+    HDassert((sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) ||
+             (sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_CACHE));
+
+    switch (sync_point_op) {
+        case H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN:
+            if (H5C_construct_candidate_list__min_clean((H5C_t *)cache_ptr) < 0)
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_construct_candidate_list__min_clean() failed.")
+            break;
+
+        case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
+            if (H5C_construct_candidate_list__clean_cache((H5C_t *)cache_ptr) < 0)
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL,
+                            "H5C_construct_candidate_list__clean_cache() failed.")
+            break;
 
         default:
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown sync point operation.")
-        break;
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown sync point operation.")
+            break;
     } /* end switch */
 
 done:
@@ -2858,7 +2601,6 @@ done:
 } /* H5AC_construct_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_copy_candidate_list_to_buffer
@@ -2892,113 +2634,108 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
-                                   int * num_entries_ptr,
-                                   haddr_t ** haddr_buf_ptr_ptr,
-                                   size_t * MPI_Offset_buf_size_ptr,
-                                   MPI_Offset ** MPI_Offset_buf_ptr_ptr)
+H5AC_copy_candidate_list_to_buffer(H5AC_t *cache_ptr, int *num_entries_ptr, haddr_t **haddr_buf_ptr_ptr,
+                                   size_t *MPI_Offset_buf_size_ptr, MPI_Offset **MPI_Offset_buf_ptr_ptr)
 {
-    herr_t               ret_value = SUCCEED;    /* Return value */
-    hbool_t         success = FALSE;
-    haddr_t         addr;
-    H5AC_aux_t         * aux_ptr = NULL;
-    H5SL_node_t        * slist_node_ptr = NULL;
-    H5AC_slist_entry_t * slist_entry_ptr = NULL;
-    MPI_Offset         * MPI_Offset_buf_ptr = NULL;
-    haddr_t            * haddr_buf_ptr = NULL;
-    size_t         buf_size;
-    int                  i = 0;
-    int             num_entries = 0;
+    herr_t              ret_value = SUCCEED; /* Return value */
+    hbool_t             success   = FALSE;
+    haddr_t             addr;
+    H5AC_aux_t *        aux_ptr            = NULL;
+    H5SL_node_t *       slist_node_ptr     = NULL;
+    H5AC_slist_entry_t *slist_entry_ptr    = NULL;
+    MPI_Offset *        MPI_Offset_buf_ptr = NULL;
+    haddr_t *           haddr_buf_ptr      = NULL;
+    size_t              buf_size;
+    int                 i           = 0;
+    int                 num_entries = 0;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
-    HDassert( aux_ptr->candidate_slist_ptr != NULL );
-    HDassert( H5SL_count(aux_ptr->candidate_slist_ptr) ==
-            (size_t)(aux_ptr->candidate_slist_len) );
-    HDassert( aux_ptr->candidate_slist_len > 0 );
-    HDassert( num_entries_ptr != NULL );
-    HDassert( *num_entries_ptr == 0 );
-    HDassert( haddr_buf_ptr_ptr != NULL );
-    HDassert( *haddr_buf_ptr_ptr == NULL );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
+    HDassert(aux_ptr->candidate_slist_ptr != NULL);
+    HDassert(H5SL_count(aux_ptr->candidate_slist_ptr) == (size_t)(aux_ptr->candidate_slist_len));
+    HDassert(aux_ptr->candidate_slist_len > 0);
+    HDassert(num_entries_ptr != NULL);
+    HDassert(*num_entries_ptr == 0);
+    HDassert(haddr_buf_ptr_ptr != NULL);
+    HDassert(*haddr_buf_ptr_ptr == NULL);
 
     num_entries = aux_ptr->candidate_slist_len;
 
     /* allocate a buffer(s) to store the list of candidate entry
      * base addresses in
      */
-    if(MPI_Offset_buf_ptr_ptr != NULL) {
-        HDassert( MPI_Offset_buf_size_ptr != NULL );
+    if (MPI_Offset_buf_ptr_ptr != NULL) {
+        HDassert(MPI_Offset_buf_size_ptr != NULL);
 
         /* allocate a buffer of MPI_Offset */
         buf_size = sizeof(MPI_Offset) * (size_t)num_entries;
-        if(NULL == (MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_malloc(buf_size)))
+        if (NULL == (MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_malloc(buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for MPI_Offset buffer")
     } /* end if */
 
     /* allocate a buffer of haddr_t */
-    if(NULL == (haddr_buf_ptr = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * (size_t)num_entries)))
+    if (NULL == (haddr_buf_ptr = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * (size_t)num_entries)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for haddr buffer")
 
     /* now load the entry base addresses into the buffer, emptying the
      * candidate entry list in passing
      */
-    while(NULL != (slist_node_ptr = H5SL_first(aux_ptr->candidate_slist_ptr))) {
+    while (NULL != (slist_node_ptr = H5SL_first(aux_ptr->candidate_slist_ptr))) {
         slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_item(slist_node_ptr);
 
         HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
-        HDassert( i < num_entries );
+        HDassert(i < num_entries);
 
-        addr = slist_entry_ptr->addr;
+        addr             = slist_entry_ptr->addr;
         haddr_buf_ptr[i] = addr;
-        if(MPI_Offset_buf_ptr != NULL) {
-            if(H5FD_mpi_haddr_to_MPIOff(addr, &(MPI_Offset_buf_ptr[i])) < 0)
+        if (MPI_Offset_buf_ptr != NULL) {
+            if (H5FD_mpi_haddr_to_MPIOff(addr, &(MPI_Offset_buf_ptr[i])) < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off")
         } /* end if */
 
         i++;
 
         /* now remove the entry from the cleaned entry list */
-        if(H5SL_remove(aux_ptr->candidate_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
+        if (H5SL_remove(aux_ptr->candidate_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from candidate entry slist.")
 
         slist_entry_ptr->magic = 0;
-        slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+        slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
         aux_ptr->candidate_slist_len -= 1;
 
-        HDassert( aux_ptr->candidate_slist_len >= 0 );
+        HDassert(aux_ptr->candidate_slist_len >= 0);
     } /* while */
-    HDassert( aux_ptr->candidate_slist_len == 0 );
+    HDassert(aux_ptr->candidate_slist_len == 0);
 
     success = TRUE;
 
 done:
-    if(success) {
+    if (success) {
         /* Pass the number of entries and the buffer pointer
          * back to the caller.
          */
-        *num_entries_ptr = num_entries;
+        *num_entries_ptr   = num_entries;
         *haddr_buf_ptr_ptr = haddr_buf_ptr;
 
-        if(MPI_Offset_buf_ptr_ptr != NULL) {
-            HDassert( MPI_Offset_buf_ptr != NULL);
-        *MPI_Offset_buf_size_ptr = buf_size;
-        *MPI_Offset_buf_ptr_ptr = MPI_Offset_buf_ptr;
+        if (MPI_Offset_buf_ptr_ptr != NULL) {
+            HDassert(MPI_Offset_buf_ptr != NULL);
+            *MPI_Offset_buf_size_ptr = buf_size;
+            *MPI_Offset_buf_ptr_ptr  = MPI_Offset_buf_ptr;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
-        if(MPI_Offset_buf_ptr != NULL)
+        if (MPI_Offset_buf_ptr != NULL)
             MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_xfree((void *)MPI_Offset_buf_ptr);
-        if(haddr_buf_ptr != NULL)
+        if (haddr_buf_ptr != NULL)
             haddr_buf_ptr = (haddr_t *)H5MM_xfree((void *)haddr_buf_ptr);
     } /* end else */
 
@@ -3006,7 +2743,6 @@ done:
 } /* H5AC_copy_candidate_list_to_buffer() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_ext_config_2_int_config()
  *
@@ -3026,46 +2762,43 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_ext_config_2_int_config(H5AC_cache_config_t * ext_conf_ptr,
-                             H5C_auto_size_ctl_t * int_conf_ptr)
+H5AC_ext_config_2_int_config(H5AC_cache_config_t *ext_conf_ptr, H5C_auto_size_ctl_t *int_conf_ptr)
 {
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( ext_conf_ptr == NULL ) ||
-         ( ext_conf_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION ) ||
-         ( int_conf_ptr == NULL ) ) {
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "Bad ext_conf_ptr or inf_conf_ptr on entry.")
+    if ((ext_conf_ptr == NULL) || (ext_conf_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION) ||
+        (int_conf_ptr == NULL)) {
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad ext_conf_ptr or inf_conf_ptr on entry.")
     }
 
-    int_conf_ptr->version                = H5C__CURR_AUTO_SIZE_CTL_VER;
-
-    if ( ext_conf_ptr->rpt_fcn_enabled ) {
+    int_conf_ptr->version = H5C__CURR_AUTO_SIZE_CTL_VER;
 
-        int_conf_ptr->rpt_fcn            = H5C_def_auto_resize_rpt_fcn;
+    if (ext_conf_ptr->rpt_fcn_enabled) {
 
-    } else {
+        int_conf_ptr->rpt_fcn = H5C_def_auto_resize_rpt_fcn;
+    }
+    else {
 
-        int_conf_ptr->rpt_fcn            = NULL;
+        int_conf_ptr->rpt_fcn = NULL;
     }
 
-    int_conf_ptr->set_initial_size       = ext_conf_ptr->set_initial_size;
-    int_conf_ptr->initial_size           = ext_conf_ptr->initial_size;
-    int_conf_ptr->min_clean_fraction     = ext_conf_ptr->min_clean_fraction;
-    int_conf_ptr->max_size               = ext_conf_ptr->max_size;
-    int_conf_ptr->min_size               = ext_conf_ptr->min_size;
-    int_conf_ptr->epoch_length           = (int64_t)(ext_conf_ptr->epoch_length);
-
-    int_conf_ptr->incr_mode              = ext_conf_ptr->incr_mode;
-    int_conf_ptr->lower_hr_threshold     = ext_conf_ptr->lower_hr_threshold;
-    int_conf_ptr->increment              = ext_conf_ptr->increment;
-    int_conf_ptr->apply_max_increment    = ext_conf_ptr->apply_max_increment;
-    int_conf_ptr->max_increment          = ext_conf_ptr->max_increment;
-    int_conf_ptr->flash_incr_mode        = ext_conf_ptr->flash_incr_mode;
-    int_conf_ptr->flash_multiple         = ext_conf_ptr->flash_multiple;
-    int_conf_ptr->flash_threshold        = ext_conf_ptr->flash_threshold;
+    int_conf_ptr->set_initial_size   = ext_conf_ptr->set_initial_size;
+    int_conf_ptr->initial_size       = ext_conf_ptr->initial_size;
+    int_conf_ptr->min_clean_fraction = ext_conf_ptr->min_clean_fraction;
+    int_conf_ptr->max_size           = ext_conf_ptr->max_size;
+    int_conf_ptr->min_size           = ext_conf_ptr->min_size;
+    int_conf_ptr->epoch_length       = (int64_t)(ext_conf_ptr->epoch_length);
+
+    int_conf_ptr->incr_mode           = ext_conf_ptr->incr_mode;
+    int_conf_ptr->lower_hr_threshold  = ext_conf_ptr->lower_hr_threshold;
+    int_conf_ptr->increment           = ext_conf_ptr->increment;
+    int_conf_ptr->apply_max_increment = ext_conf_ptr->apply_max_increment;
+    int_conf_ptr->max_increment       = ext_conf_ptr->max_increment;
+    int_conf_ptr->flash_incr_mode     = ext_conf_ptr->flash_incr_mode;
+    int_conf_ptr->flash_multiple      = ext_conf_ptr->flash_multiple;
+    int_conf_ptr->flash_threshold     = ext_conf_ptr->flash_threshold;
 
     int_conf_ptr->decr_mode              = ext_conf_ptr->decr_mode;
     int_conf_ptr->upper_hr_threshold     = ext_conf_ptr->upper_hr_threshold;
@@ -3080,7 +2813,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_ext_config_2_int_config() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_deleted_entry()
@@ -3101,73 +2833,71 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_log_deleted_entry(H5AC_t * cache_ptr,
-                       H5AC_info_t * entry_ptr,
-                       haddr_t addr,
-                       unsigned int flags)
+H5AC_log_deleted_entry(H5AC_t *cache_ptr, H5AC_info_t *entry_ptr, haddr_t addr, unsigned int flags)
 {
-    H5AC_aux_t         * aux_ptr;
-    H5AC_slist_entry_t * slist_entry_ptr = NULL;
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    H5AC_aux_t *        aux_ptr;
+    H5AC_slist_entry_t *slist_entry_ptr = NULL;
+    herr_t              ret_value       = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
-    HDassert( entry_ptr != NULL );
-    HDassert( entry_ptr->addr == addr );
+    HDassert(entry_ptr != NULL);
+    HDassert(entry_ptr->addr == addr);
 
-    HDassert( (flags & H5C__DELETED_FLAG) != 0 );
+    HDassert((flags & H5C__DELETED_FLAG) != 0);
 
-    if(aux_ptr->mpi_rank == 0) {
-        HDassert( aux_ptr->d_slist_ptr != NULL );
-        HDassert( aux_ptr->c_slist_ptr != NULL );
+    if (aux_ptr->mpi_rank == 0) {
+        HDassert(aux_ptr->d_slist_ptr != NULL);
+        HDassert(aux_ptr->c_slist_ptr != NULL);
 
         /* if the entry appears in the dirtied entry slist, remove it. */
-        if((slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->d_slist_ptr, (void *)(&addr))) != NULL) {
+        if ((slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->d_slist_ptr, (void *)(&addr))) !=
+            NULL) {
             HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
             HDassert(slist_entry_ptr->addr == addr);
 
-            if(H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
+            if (H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from dirty entry slist.")
 
             slist_entry_ptr->magic = 0;
-            slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+            slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
             aux_ptr->d_slist_len -= 1;
 
-            HDassert( aux_ptr->d_slist_len >= 0 );
+            HDassert(aux_ptr->d_slist_len >= 0);
         } /* end if */
 
         /* if the entry appears in the cleaned entry slist, remove it. */
-        if((slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr))) != NULL) {
+        if ((slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr))) !=
+            NULL) {
             HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
             HDassert(slist_entry_ptr->addr == addr);
 
-            if(H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
+            if (H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from cleaned entry slist.")
 
             slist_entry_ptr->magic = 0;
-            slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+            slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
             aux_ptr->c_slist_len -= 1;
 
-            HDassert( aux_ptr->c_slist_len >= 0 );
+            HDassert(aux_ptr->c_slist_len >= 0);
         } /* end if */
-    } /* if */
+    }     /* if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_log_deleted_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_dirtied_entry()
@@ -3193,84 +2923,82 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr,
-                       haddr_t addr)
+H5AC_log_dirtied_entry(const H5AC_info_t *entry_ptr, haddr_t addr)
 {
-    H5AC_t             * cache_ptr;
-    H5AC_aux_t         * aux_ptr;
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    H5AC_t *    cache_ptr;
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( entry_ptr );
-    HDassert( entry_ptr->addr == addr );
-    HDassert( entry_ptr->is_dirty == FALSE );
+    HDassert(entry_ptr);
+    HDassert(entry_ptr->addr == addr);
+    HDassert(entry_ptr->is_dirty == FALSE);
 
     cache_ptr = entry_ptr->cache_ptr;
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
-    if ( aux_ptr->mpi_rank == 0 ) {
-        H5AC_slist_entry_t * slist_entry_ptr;
+    if (aux_ptr->mpi_rank == 0) {
+        H5AC_slist_entry_t *slist_entry_ptr;
 
-        HDassert( aux_ptr->d_slist_ptr != NULL );
-        HDassert( aux_ptr->c_slist_ptr != NULL );
+        HDassert(aux_ptr->d_slist_ptr != NULL);
+        HDassert(aux_ptr->c_slist_ptr != NULL);
 
-        if ( H5SL_search(aux_ptr->d_slist_ptr, (void *)(&addr)) == NULL ) {
+        if (H5SL_search(aux_ptr->d_slist_ptr, (void *)(&addr)) == NULL) {
 
             /* insert the address of the entry in the dirty entry list, and
              * add its size to the dirty_bytes count.
              */
-            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)) ) {
+            if (NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t))) {
 
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                            "Can't allocate dirty slist entry .")
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "Can't allocate dirty slist entry .")
             }
 
             slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
             slist_entry_ptr->addr  = addr;
 
-            if ( H5SL_insert(aux_ptr->d_slist_ptr, slist_entry_ptr,
-                             &(slist_entry_ptr->addr)) < 0 ) {
+            if (H5SL_insert(aux_ptr->d_slist_ptr, slist_entry_ptr, &(slist_entry_ptr->addr)) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, \
-                            "can't insert entry into dirty entry slist.")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, "can't insert entry into dirty entry slist.")
             }
 
             aux_ptr->d_slist_len += 1;
             aux_ptr->dirty_bytes += entry_ptr->size;
 #if H5AC_DEBUG_DIRTY_BYTES_CREATION
-        aux_ptr->unprotect_dirty_bytes += entry_ptr->size;
-        aux_ptr->unprotect_dirty_bytes_updates += 1;
+            aux_ptr->unprotect_dirty_bytes += entry_ptr->size;
+            aux_ptr->unprotect_dirty_bytes_updates += 1;
 #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
         }
 
-        if(H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr)) != NULL) {
+        if (H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr)) != NULL) {
             /* the entry is dirty.  If it exists on the cleaned entries list,
              * remove it.
              */
-            if((slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr))) != NULL) {
+            if ((slist_entry_ptr =
+                     (H5AC_slist_entry_t *)H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr))) != NULL) {
                 HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
                 HDassert(slist_entry_ptr->addr == addr);
 
-                if(H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
+                if (H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr)) != slist_entry_ptr)
                     HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from clean entry slist.")
 
                 slist_entry_ptr->magic = 0;
-                slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+                slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
                 aux_ptr->c_slist_len -= 1;
 
-                HDassert( aux_ptr->c_slist_len >= 0 );
+                HDassert(aux_ptr->c_slist_len >= 0);
             } /* end if */
-        } /* end if */
-    } else {
+        }     /* end if */
+    }
+    else {
 
         aux_ptr->dirty_bytes += entry_ptr->size;
 #if H5AC_DEBUG_DIRTY_BYTES_CREATION
@@ -3286,7 +3014,6 @@ done:
 } /* H5AC_log_dirtied_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_flushed_entry()
@@ -3310,100 +3037,89 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_log_flushed_entry(H5C_t * cache_ptr,
-                       haddr_t addr,
-                       hbool_t was_dirty,
-                       unsigned flags,
+H5AC_log_flushed_entry(H5C_t *cache_ptr, haddr_t addr, hbool_t was_dirty, unsigned flags,
                        int H5_ATTR_UNUSED type_id)
 {
-    herr_t               ret_value = SUCCEED;    /* Return value */
-    hbool_t         cleared;
-    H5AC_aux_t         * aux_ptr;
-    H5AC_slist_entry_t * slist_entry_ptr = NULL;
-
+    herr_t              ret_value = SUCCEED; /* Return value */
+    hbool_t             cleared;
+    H5AC_aux_t *        aux_ptr;
+    H5AC_slist_entry_t *slist_entry_ptr = NULL;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->mpi_rank == 0 );
-    HDassert( aux_ptr->c_slist_ptr != NULL );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->mpi_rank == 0);
+    HDassert(aux_ptr->c_slist_ptr != NULL);
 
-    cleared = ( (flags & H5C__FLUSH_CLEAR_ONLY_FLAG) != 0 );
+    cleared = ((flags & H5C__FLUSH_CLEAR_ONLY_FLAG) != 0);
 
-    if ( cleared ) {
+    if (cleared) {
 
         /* If the entry has been cleared, must remove it from both the
          * cleaned list and the dirtied list.
          */
 
-        if ( (slist_entry_ptr = (H5AC_slist_entry_t *)
-                H5SL_search(aux_ptr->c_slist_ptr,
-                                            (void *)(&addr))) != NULL ) {
+        if ((slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr))) !=
+            NULL) {
 
-            HDassert( slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
-            HDassert( slist_entry_ptr->addr == addr );
+            HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
+            HDassert(slist_entry_ptr->addr == addr);
 
-            if ( H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr))
-                 != slist_entry_ptr ) {
+            if (H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr)) != slist_entry_ptr) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, \
-                            "Can't delete entry from clean entry slist.")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from clean entry slist.")
             }
 
             slist_entry_ptr->magic = 0;
-            slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+            slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
             aux_ptr->c_slist_len -= 1;
 
-            HDassert( aux_ptr->c_slist_len >= 0 );
+            HDassert(aux_ptr->c_slist_len >= 0);
         }
 
-        if ( (slist_entry_ptr = (H5AC_slist_entry_t *)
-                 H5SL_search(aux_ptr->d_slist_ptr, (void *)(&addr))) != NULL ) {
+        if ((slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->d_slist_ptr, (void *)(&addr))) !=
+            NULL) {
 
-            HDassert( slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
-            HDassert( slist_entry_ptr->addr == addr );
+            HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
+            HDassert(slist_entry_ptr->addr == addr);
 
-            if ( H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr))
-                 != slist_entry_ptr ) {
+            if (H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr)) != slist_entry_ptr) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, \
-                            "Can't delete entry from dirty entry slist.")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from dirty entry slist.")
             }
 
             slist_entry_ptr->magic = 0;
-            slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+            slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
             aux_ptr->d_slist_len -= 1;
 
-            HDassert( aux_ptr->d_slist_len >= 0 );
+            HDassert(aux_ptr->d_slist_len >= 0);
         }
-    } else if ( was_dirty ) {
+    }
+    else if (was_dirty) {
 
-        if ( H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr)) == NULL ) {
+        if (H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr)) == NULL) {
 
             /* insert the address of the entry in the clean entry list. */
 
-            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)) ) {
+            if (NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t))) {
 
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                            "Can't allocate clean slist entry .")
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "Can't allocate clean slist entry .")
             }
 
             slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
             slist_entry_ptr->addr  = addr;
 
-            if ( H5SL_insert(aux_ptr->c_slist_ptr, slist_entry_ptr,
-                             &(slist_entry_ptr->addr)) < 0 ) {
+            if (H5SL_insert(aux_ptr->c_slist_ptr, slist_entry_ptr, &(slist_entry_ptr->addr)) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, \
-                            "can't insert entry into clean entry slist.")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, "can't insert entry into clean entry slist.")
             }
 
             aux_ptr->c_slist_len += 1;
@@ -3417,7 +3133,6 @@ done:
 } /* H5AC_log_flushed_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_inserted_entry()
@@ -3440,11 +3155,10 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_log_inserted_entry(H5AC_t * cache_ptr,
-                        H5AC_info_t * entry_ptr)
+H5AC_log_inserted_entry(H5AC_t *cache_ptr, H5AC_info_t *entry_ptr)
 {
-    H5AC_aux_t         * aux_ptr;
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3456,32 +3170,32 @@ H5AC_log_inserted_entry(H5AC_t * cache_ptr,
     HDassert(aux_ptr != NULL);
     HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
-    HDassert( entry_ptr != NULL );
+    HDassert(entry_ptr != NULL);
 
-    if(aux_ptr->mpi_rank == 0) {
-        H5AC_slist_entry_t * slist_entry_ptr;
+    if (aux_ptr->mpi_rank == 0) {
+        H5AC_slist_entry_t *slist_entry_ptr;
 
         HDassert(aux_ptr->d_slist_ptr != NULL);
         HDassert(aux_ptr->c_slist_ptr != NULL);
 
-        if(NULL != H5SL_search(aux_ptr->d_slist_ptr, (void *)(&entry_ptr->addr)))
+        if (NULL != H5SL_search(aux_ptr->d_slist_ptr, (void *)(&entry_ptr->addr)))
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Inserted entry already in dirty slist.")
 
         /* insert the address of the entry in the dirty entry list, and
          * add its size to the dirty_bytes count.
          */
-        if(NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)))
+        if (NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "Can't allocate dirty slist entry .")
 
         slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
         slist_entry_ptr->addr  = entry_ptr->addr;
 
-        if(H5SL_insert(aux_ptr->d_slist_ptr, slist_entry_ptr, &(slist_entry_ptr->addr)) < 0 )
+        if (H5SL_insert(aux_ptr->d_slist_ptr, slist_entry_ptr, &(slist_entry_ptr->addr)) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, "can't insert entry into dirty entry slist.")
 
         aux_ptr->d_slist_len += 1;
 
-        if(NULL != H5SL_search(aux_ptr->c_slist_ptr, (void *)(&entry_ptr->addr)))
+        if (NULL != H5SL_search(aux_ptr->c_slist_ptr, (void *)(&entry_ptr->addr)))
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Inserted entry in clean slist.")
     } /* end if */
 
@@ -3497,7 +3211,6 @@ done:
 } /* H5AC_log_inserted_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_moved_entry()
@@ -3546,114 +3259,104 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_log_moved_entry(const H5F_t *f,
-                       haddr_t old_addr,
-                       haddr_t new_addr)
+H5AC_log_moved_entry(const H5F_t *f, haddr_t old_addr, haddr_t new_addr)
 {
-    H5AC_t *             cache_ptr;
-    hbool_t         entry_in_cache;
-    hbool_t         entry_dirty;
-    size_t               entry_size;
-    H5AC_aux_t         * aux_ptr = NULL;
-    H5AC_slist_entry_t * slist_entry_ptr = NULL;
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    H5AC_t *            cache_ptr;
+    hbool_t             entry_in_cache;
+    hbool_t             entry_dirty;
+    size_t              entry_size;
+    H5AC_aux_t *        aux_ptr         = NULL;
+    H5AC_slist_entry_t *slist_entry_ptr = NULL;
+    herr_t              ret_value       = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f );
-    HDassert( f->shared );
+    HDassert(f);
+    HDassert(f->shared);
 
     cache_ptr = (H5AC_t *)f->shared->cache;
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
     /* get entry status, size, etc here */
-    if ( H5C_get_entry_status(f, old_addr, &entry_size, &entry_in_cache,
-                              &entry_dirty, NULL, NULL) < 0 ) {
+    if (H5C_get_entry_status(f, old_addr, &entry_size, &entry_in_cache, &entry_dirty, NULL, NULL) < 0) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get entry status.")
+    }
+    else if (!entry_in_cache) {
 
-    } else if ( ! entry_in_cache ) {
-
-        HDassert( entry_in_cache );
+        HDassert(entry_in_cache);
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "entry not in cache.")
     }
 
-    if ( aux_ptr->mpi_rank == 0 ) {
+    if (aux_ptr->mpi_rank == 0) {
 
-        HDassert( aux_ptr->d_slist_ptr != NULL );
-        HDassert( aux_ptr->c_slist_ptr != NULL );
+        HDassert(aux_ptr->d_slist_ptr != NULL);
+        HDassert(aux_ptr->c_slist_ptr != NULL);
 
         /* if the entry appears in the cleaned entry slist, under its old
          * address, remove it.
          */
-        if ( (slist_entry_ptr = (H5AC_slist_entry_t *)
-        H5SL_search(aux_ptr->c_slist_ptr, (void *)(&old_addr))) != NULL ) {
+        if ((slist_entry_ptr =
+                 (H5AC_slist_entry_t *)H5SL_search(aux_ptr->c_slist_ptr, (void *)(&old_addr))) != NULL) {
 
-            HDassert( slist_entry_ptr->magic ==
-                          H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
-            HDassert( slist_entry_ptr->addr == old_addr );
+            HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
+            HDassert(slist_entry_ptr->addr == old_addr);
 
-            if ( H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&old_addr))
-                               != slist_entry_ptr ) {
+            if (H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&old_addr)) != slist_entry_ptr) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, \
-                            "Can't delete entry from cleaned entry slist.")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from cleaned entry slist.")
             }
 
             slist_entry_ptr->magic = 0;
-            slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
+            slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
 
             aux_ptr->c_slist_len -= 1;
 
-            HDassert( aux_ptr->c_slist_len >= 0 );
+            HDassert(aux_ptr->c_slist_len >= 0);
         }
 
         /* if the entry appears in the dirtied entry slist under its old
          * address, remove it, but don't free it. Set addr to new_addr.
          */
-        if ( (slist_entry_ptr = (H5AC_slist_entry_t *)
-        H5SL_search(aux_ptr->d_slist_ptr, (void *)(&old_addr))) != NULL ) {
+        if ((slist_entry_ptr =
+                 (H5AC_slist_entry_t *)H5SL_search(aux_ptr->d_slist_ptr, (void *)(&old_addr))) != NULL) {
 
-            HDassert( slist_entry_ptr->magic ==
-                      H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
-            HDassert( slist_entry_ptr->addr == old_addr );
+            HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
+            HDassert(slist_entry_ptr->addr == old_addr);
 
-            if ( H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&old_addr))
-                != slist_entry_ptr ) {
+            if (H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&old_addr)) != slist_entry_ptr) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, \
-                            "Can't delete entry from dirty entry slist.")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from dirty entry slist.")
             }
 
             slist_entry_ptr->addr = new_addr;
 
             aux_ptr->d_slist_len -= 1;
 
-            HDassert( aux_ptr->d_slist_len >= 0 );
-
-        } else {
-
-             /* otherwise, allocate a new entry that is ready
-              * for insertion, and increment dirty_bytes.
-              *
-              * Note that the fact that the entry wasn't in the dirtied
-              * list under its old address implies that it must have
-              * been clean to start with.
-              */
+            HDassert(aux_ptr->d_slist_len >= 0);
+        }
+        else {
+
+            /* otherwise, allocate a new entry that is ready
+             * for insertion, and increment dirty_bytes.
+             *
+             * Note that the fact that the entry wasn't in the dirtied
+             * list under its old address implies that it must have
+             * been clean to start with.
+             */
 
-            HDassert( !entry_dirty );
+            HDassert(!entry_dirty);
 
-            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)) ) {
+            if (NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t))) {
 
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                            "Can't allocate dirty slist entry .")
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "Can't allocate dirty slist entry .")
             }
 
             slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
@@ -3668,23 +3371,20 @@ H5AC_log_moved_entry(const H5F_t *f,
         }
 
         /* verify that there is no entry at new_addr in the dirty slist */
-        if ( H5SL_search(aux_ptr->d_slist_ptr, (void *)(&new_addr)) != NULL ) {
+        if (H5SL_search(aux_ptr->d_slist_ptr, (void *)(&new_addr)) != NULL) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "dirty slist already contains entry at new_addr.")
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "dirty slist already contains entry at new_addr.")
         }
 
         /* insert / reinsert the entry in the dirty slist */
-        if ( H5SL_insert(aux_ptr->d_slist_ptr, slist_entry_ptr,
-                         &(slist_entry_ptr->addr)) < 0 ) {
+        if (H5SL_insert(aux_ptr->d_slist_ptr, slist_entry_ptr, &(slist_entry_ptr->addr)) < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, \
-                        "can't insert entry into dirty entry slist.")
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, "can't insert entry into dirty entry slist.")
         }
 
         aux_ptr->d_slist_len += 1;
-
-    } else if ( ! entry_dirty ) {
+    }
+    else if (!entry_dirty) {
 
         aux_ptr->dirty_bytes += entry_size;
 
@@ -3699,7 +3399,6 @@ done:
 } /* H5AC_log_moved_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_propagate_and_apply_candidate_list
  *
@@ -3797,47 +3496,44 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_propagate_and_apply_candidate_list(H5F_t  * f,
-                                        hid_t    dxpl_id,
-                                        H5AC_t * cache_ptr)
+H5AC_propagate_and_apply_candidate_list(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr)
 {
-    int                 mpi_code;
-    int                     num_candidates = 0;
-    haddr_t            * candidates_list_ptr = NULL;
-    H5AC_aux_t         * aux_ptr;
-    herr_t               ret_value = SUCCEED;   /* Return value */
+    int         mpi_code;
+    int         num_candidates      = 0;
+    haddr_t *   candidates_list_ptr = NULL;
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
 
     /* to prevent "messages from the future" we must synchronize all
      * processes before we write any entries.
      */
-    if(MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed 1", mpi_code)
 
-    if(aux_ptr->mpi_rank == 0) {
-        if(H5AC_broadcast_candidate_list(cache_ptr, &num_candidates, &candidates_list_ptr) < 0)
+    if (aux_ptr->mpi_rank == 0) {
+        if (H5AC_broadcast_candidate_list(cache_ptr, &num_candidates, &candidates_list_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't broadcast candidate slist.")
 
-        HDassert( aux_ptr->candidate_slist_len == 0 );
+        HDassert(aux_ptr->candidate_slist_len == 0);
     } /* end if */
     else {
-        if(H5AC_receive_candidate_list(cache_ptr, &num_candidates, &candidates_list_ptr) < 0)
+        if (H5AC_receive_candidate_list(cache_ptr, &num_candidates, &candidates_list_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't receive candidate broadcast.")
     } /* end else */
 
-    if(num_candidates > 0) {
-        herr_t             result;
+    if (num_candidates > 0) {
+        herr_t result;
 
         /* all processes apply the candidate list.
          * H5C_apply_candidate_list() handles the details of
@@ -3846,51 +3542,44 @@ H5AC_propagate_and_apply_candidate_list(H5F_t  * f,
 
         aux_ptr->write_permitted = TRUE;
 
-        result = H5C_apply_candidate_list(f,
-                                          dxpl_id,
-                                          dxpl_id,
-                                          cache_ptr,
-                                          num_candidates,
-                                          candidates_list_ptr,
-                                          aux_ptr->mpi_rank,
-                                          aux_ptr->mpi_size);
+        result = H5C_apply_candidate_list(f, dxpl_id, dxpl_id, cache_ptr, num_candidates, candidates_list_ptr,
+                                          aux_ptr->mpi_rank, aux_ptr->mpi_size);
 
         aux_ptr->write_permitted = FALSE;
 
-        if(result < 0)
+        if (result < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't apply candidate list.")
 
-    if(aux_ptr->write_done != NULL)
-        (aux_ptr->write_done)();
+        if (aux_ptr->write_done != NULL)
+            (aux_ptr->write_done)();
 
         /* to prevent "messages from the past" we must synchronize all
          * processes again before we go on.
          */
-        if(MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed 2", mpi_code)
 
-        if(aux_ptr->mpi_rank == 0) {
-            if(H5AC_tidy_cache_0_lists(cache_ptr, num_candidates, candidates_list_ptr) < 0)
+        if (aux_ptr->mpi_rank == 0) {
+            if (H5AC_tidy_cache_0_lists(cache_ptr, num_candidates, candidates_list_ptr) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't tidy up process 0 lists.")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* if it is defined, call the sync point done callback.  Note
      * that this callback is defined purely for testing purposes,
      * and should be undefined under normal operating circumstances.
      */
-    if(aux_ptr->sync_point_done != NULL)
+    if (aux_ptr->sync_point_done != NULL)
         (aux_ptr->sync_point_done)(num_candidates, candidates_list_ptr);
 
 done:
-    if(candidates_list_ptr != NULL)
+    if (candidates_list_ptr != NULL)
         candidates_list_ptr = (haddr_t *)H5MM_xfree((void *)candidates_list_ptr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_propagate_and_apply_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_propagate_flushed_and_still_clean_entries_list
  *
@@ -3964,12 +3653,10 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
-                                                    hid_t    dxpl_id,
-                                                    H5AC_t * cache_ptr)
+H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr)
 {
-    H5AC_aux_t * aux_ptr;
-    herr_t     ret_value = SUCCEED;   /* Return value */
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3980,16 +3667,15 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
 
     HDassert(aux_ptr != NULL);
     HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
-    HDassert(aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
 
-    if(aux_ptr->mpi_rank == 0) {
-        if(H5AC_broadcast_clean_list(cache_ptr) < 0)
+    if (aux_ptr->mpi_rank == 0) {
+        if (H5AC_broadcast_clean_list(cache_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't broadcast clean slist.")
-        HDassert( aux_ptr->c_slist_len == 0 );
+        HDassert(aux_ptr->c_slist_len == 0);
     } /* end if */
     else {
-        if(H5AC_receive_and_apply_clean_list(f, dxpl_id, H5AC_dxpl_id, cache_ptr) < 0)
+        if (H5AC_receive_and_apply_clean_list(f, dxpl_id, H5AC_dxpl_id, cache_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't receive and/or process clean slist broadcast.")
     } /* end else */
 
@@ -3998,7 +3684,6 @@ done:
 } /* H5AC_propagate_flushed_and_still_clean_entries_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_receive_and_apply_clean_list()
@@ -4019,48 +3704,45 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_receive_and_apply_clean_list(H5F_t  * f,
-                                  hid_t    primary_dxpl_id,
-                                  hid_t    secondary_dxpl_id,
-                                  H5AC_t * cache_ptr)
+H5AC_receive_and_apply_clean_list(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, H5AC_t *cache_ptr)
 {
-    H5AC_aux_t         * aux_ptr;
-    haddr_t           * haddr_buf_ptr = NULL;
-    MPI_Offset         * MPI_Offset_buf_ptr = NULL;
-    int                  mpi_result;
-    int             num_entries = 0;
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    H5AC_aux_t *aux_ptr;
+    haddr_t *   haddr_buf_ptr      = NULL;
+    MPI_Offset *MPI_Offset_buf_ptr = NULL;
+    int         mpi_result;
+    int         num_entries = 0;
+    herr_t      ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f != NULL );
-    HDassert( f->shared->cache == cache_ptr );
+    HDassert(f != NULL);
+    HDassert(f->shared->cache == cache_ptr);
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->mpi_rank != 0 );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->mpi_rank != 0);
 
     /* First receive the number of entries in the list so that we
      * can set up a buffer to receive them.  If there aren't
      * any, we are done.
      */
-    if(MPI_SUCCESS != (mpi_result = MPI_Bcast(&num_entries, 1, MPI_INT, 0, aux_ptr->mpi_comm)))
+    if (MPI_SUCCESS != (mpi_result = MPI_Bcast(&num_entries, 1, MPI_INT, 0, aux_ptr->mpi_comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed 1", mpi_result)
 
-    if(num_entries > 0) {
+    if (num_entries > 0) {
         size_t buf_size;
-        int i;
+        int    i;
 
         /* allocate buffers to store the list of entry base addresses in */
         buf_size = sizeof(MPI_Offset) * (size_t)num_entries;
-        if(NULL == (MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_malloc(buf_size)))
+        if (NULL == (MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_malloc(buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for receive buffer")
-        if(NULL == (haddr_buf_ptr = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * (size_t)num_entries)))
+        if (NULL == (haddr_buf_ptr = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * (size_t)num_entries)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for haddr buffer")
 
         /* Now receive the list of cleaned entries
@@ -4070,23 +3752,24 @@ H5AC_receive_and_apply_clean_list(H5F_t  * f,
          * Thus the element type is MPI_BYTE, with size equal to the
          * buf_size computed above.
          */
-        if(MPI_SUCCESS != (mpi_result = MPI_Bcast((void *)MPI_Offset_buf_ptr, (int)buf_size, MPI_BYTE, 0, aux_ptr->mpi_comm)))
+        if (MPI_SUCCESS != (mpi_result = MPI_Bcast((void *)MPI_Offset_buf_ptr, (int)buf_size, MPI_BYTE, 0,
+                                                   aux_ptr->mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed 2", mpi_result)
 
         /* translate the MPI_Offsets to haddr_t */
         i = 0;
-        while(i < num_entries) {
+        while (i < num_entries) {
             haddr_buf_ptr[i] = H5FD_mpi_MPIOff_to_haddr(MPI_Offset_buf_ptr[i]);
 
-            if(haddr_buf_ptr[i] == HADDR_UNDEF)
+            if (haddr_buf_ptr[i] == HADDR_UNDEF)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert MPI off to haddr")
 
             i++;
         } /* end while */
 
         /* mark the indicated entries as clean */
-        if(H5C_mark_entries_as_clean(f, primary_dxpl_id, secondary_dxpl_id,
-                (int32_t)num_entries, &(haddr_buf_ptr[0])) < 0)
+        if (H5C_mark_entries_as_clean(f, primary_dxpl_id, secondary_dxpl_id, (int32_t)num_entries,
+                                      &(haddr_buf_ptr[0])) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't mark entries clean.")
     } /* end if */
 
@@ -4094,20 +3777,19 @@ H5AC_receive_and_apply_clean_list(H5F_t  * f,
      * that this callback is defined purely for testing purposes,
      * and should be undefined under normal operating circumstances.
      */
-    if(aux_ptr->sync_point_done != NULL)
+    if (aux_ptr->sync_point_done != NULL)
         (aux_ptr->sync_point_done)(num_entries, haddr_buf_ptr);
 
 done:
-    if(MPI_Offset_buf_ptr != NULL)
+    if (MPI_Offset_buf_ptr != NULL)
         MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_xfree((void *)MPI_Offset_buf_ptr);
-    if(haddr_buf_ptr != NULL)
+    if (haddr_buf_ptr != NULL)
         haddr_buf_ptr = (haddr_t *)H5MM_xfree((void *)haddr_buf_ptr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_receive_and_apply_clean_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_receive_candidate_list()
@@ -4130,55 +3812,51 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_receive_candidate_list(H5AC_t * cache_ptr,
-                            int * num_entries_ptr,
-                            haddr_t ** haddr_buf_ptr_ptr)
+H5AC_receive_candidate_list(H5AC_t *cache_ptr, int *num_entries_ptr, haddr_t **haddr_buf_ptr_ptr)
 {
-    hbool_t         success = FALSE;
-    H5AC_aux_t         * aux_ptr;
-    haddr_t           * haddr_buf_ptr = NULL;
-    MPI_Offset         * MPI_Offset_buf_ptr = NULL;
-    int                  mpi_result;
-    int             num_entries;
-    herr_t               ret_value = SUCCEED;    /* Return value */
+    hbool_t     success = FALSE;
+    H5AC_aux_t *aux_ptr;
+    haddr_t *   haddr_buf_ptr      = NULL;
+    MPI_Offset *MPI_Offset_buf_ptr = NULL;
+    int         mpi_result;
+    int         num_entries;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->mpi_rank != 0 );
-    HDassert( aux_ptr-> metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
-
-    HDassert( num_entries_ptr != NULL );
-    HDassert( *num_entries_ptr == 0 );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->mpi_rank != 0);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
 
-    HDassert( haddr_buf_ptr_ptr != NULL );
-    HDassert( *haddr_buf_ptr_ptr == NULL );
+    HDassert(num_entries_ptr != NULL);
+    HDassert(*num_entries_ptr == 0);
 
+    HDassert(haddr_buf_ptr_ptr != NULL);
+    HDassert(*haddr_buf_ptr_ptr == NULL);
 
     /* First receive the number of entries in the list so that we
      * can set up a buffer to receive them.  If there aren't
      * any, we are done.
      */
-    if(MPI_SUCCESS != (mpi_result = MPI_Bcast(&num_entries, 1, MPI_INT, 0, aux_ptr->mpi_comm)))
+    if (MPI_SUCCESS != (mpi_result = MPI_Bcast(&num_entries, 1, MPI_INT, 0, aux_ptr->mpi_comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed 1", mpi_result)
 
-    if(num_entries > 0) {
+    if (num_entries > 0) {
         size_t buf_size;
-        int i;
+        int    i;
 
         /* allocate buffers to store the list of entry base addresses in */
         buf_size = sizeof(MPI_Offset) * (size_t)num_entries;
 
-        if(NULL == (MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_malloc(buf_size)))
+        if (NULL == (MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_malloc(buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for receive buffer")
-        if(NULL == (haddr_buf_ptr = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * (size_t)num_entries)))
+        if (NULL == (haddr_buf_ptr = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * (size_t)num_entries)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for haddr buffer")
 
         /* Now receive the list of candidate entries
@@ -4188,37 +3866,38 @@ H5AC_receive_candidate_list(H5AC_t * cache_ptr,
          * Thus the element type is MPI_BYTE, with size equal to the
          * buf_size computed above.
          */
-        if(MPI_SUCCESS != (mpi_result = MPI_Bcast((void *)MPI_Offset_buf_ptr, (int)buf_size, MPI_BYTE, 0, aux_ptr->mpi_comm)))
+        if (MPI_SUCCESS != (mpi_result = MPI_Bcast((void *)MPI_Offset_buf_ptr, (int)buf_size, MPI_BYTE, 0,
+                                                   aux_ptr->mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed 2", mpi_result)
 
         /* translate the MPI_Offsets to haddr_t */
         i = 0;
-        while(i < num_entries) {
+        while (i < num_entries) {
             haddr_buf_ptr[i] = H5FD_mpi_MPIOff_to_haddr(MPI_Offset_buf_ptr[i]);
 
-            if(haddr_buf_ptr[i] == HADDR_UNDEF)
+            if (haddr_buf_ptr[i] == HADDR_UNDEF)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert MPI off to haddr")
 
             i++;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     success = TRUE;
 
 done:
-    if(MPI_Offset_buf_ptr != NULL)
+    if (MPI_Offset_buf_ptr != NULL)
         MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_xfree((void *)MPI_Offset_buf_ptr);
 
-    if(success) {
+    if (success) {
         /* finally, pass the number of entries and the buffer pointer
          * back to the caller.  Do this so that we can use the same code
          * to apply the candidate list to all the processes.
          */
-        *num_entries_ptr = num_entries;
+        *num_entries_ptr   = num_entries;
         *haddr_buf_ptr_ptr = haddr_buf_ptr;
     } /* end if */
     else {
-        if(haddr_buf_ptr != NULL)
+        if (haddr_buf_ptr != NULL)
             haddr_buf_ptr = (haddr_t *)H5MM_xfree((void *)haddr_buf_ptr);
     } /* end else */
 
@@ -4226,7 +3905,6 @@ done:
 } /* H5AC_receive_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_rsp__dist_md_write__flush
  *
@@ -4278,103 +3956,93 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_rsp__dist_md_write__flush(H5F_t *f,
-                               hid_t dxpl_id,
-                               H5AC_t * cache_ptr)
+H5AC_rsp__dist_md_write__flush(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr)
 {
     int         mpi_code;
-    int          num_entries = 0;
-    haddr_t    * haddr_buf_ptr = NULL;
-    H5AC_aux_t * aux_ptr;
-    herr_t     ret_value = SUCCEED;   /* Return value */
+    int         num_entries   = 0;
+    haddr_t *   haddr_buf_ptr = NULL;
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f != NULL );
-    HDassert( f->shared->cache == cache_ptr );
+    HDassert(f != NULL);
+    HDassert(f->shared->cache == cache_ptr);
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
 
     /* first construct the candidate list -- initially, this will be in the
      * form of a skip list.  We will convert it later.
      */
-    if(H5C_construct_candidate_list__clean_cache(cache_ptr) < 0)
+    if (H5C_construct_candidate_list__clean_cache(cache_ptr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't construct candidate list.")
 
-    if(aux_ptr->candidate_slist_len > 0) {
-        herr_t     result;
+    if (aux_ptr->candidate_slist_len > 0) {
+        herr_t result;
 
         /* convert the candidate list into the format we
          * are used to receiving from process 0.
          */
-        if(H5AC_copy_candidate_list_to_buffer(cache_ptr, &num_entries, &haddr_buf_ptr, NULL, NULL) < 0)
+        if (H5AC_copy_candidate_list_to_buffer(cache_ptr, &num_entries, &haddr_buf_ptr, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't construct candidate buffer.")
 
         /* initial sync point barrier */
-        if(MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed 1", mpi_code)
 
         /* apply the candidate list */
         aux_ptr->write_permitted = TRUE;
 
-        result = H5C_apply_candidate_list(f,
-                                          dxpl_id,
-                                          dxpl_id,
-                                          cache_ptr,
-                                          num_entries,
-                                          haddr_buf_ptr,
-                                          aux_ptr->mpi_rank,
-                                          aux_ptr->mpi_size);
+        result = H5C_apply_candidate_list(f, dxpl_id, dxpl_id, cache_ptr, num_entries, haddr_buf_ptr,
+                                          aux_ptr->mpi_rank, aux_ptr->mpi_size);
 
         aux_ptr->write_permitted = FALSE;
 
-        if(result < 0)
+        if (result < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't apply candidate list.")
 
         /* this code exists primarily for the test bed -- it allows us to
          * enforce posix semantics on the server that pretends to be a
          * file system in our parallel tests.
          */
-        if(aux_ptr->write_done != NULL)
+        if (aux_ptr->write_done != NULL)
             (aux_ptr->write_done)();
 
         /* final sync point barrier */
-        if(MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed 1", mpi_code)
 
-    /* if this is process zero, tidy up the dirtied,
+        /* if this is process zero, tidy up the dirtied,
          * and flushed and still clean lists.
          */
-        if(aux_ptr->mpi_rank == 0) {
-            if(H5AC_tidy_cache_0_lists(cache_ptr, num_entries, haddr_buf_ptr) < 0)
+        if (aux_ptr->mpi_rank == 0) {
+            if (H5AC_tidy_cache_0_lists(cache_ptr, num_entries, haddr_buf_ptr) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't tidy up process 0 lists.")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* if it is defined, call the sync point done callback.  Note
      * that this callback is defined purely for testing purposes,
      * and should be undefined under normal operating circumstances.
      */
-    if(aux_ptr->sync_point_done != NULL)
+    if (aux_ptr->sync_point_done != NULL)
         (aux_ptr->sync_point_done)(num_entries, haddr_buf_ptr);
 
 done:
-    if(haddr_buf_ptr != NULL)
+    if (haddr_buf_ptr != NULL)
         haddr_buf_ptr = (haddr_t *)H5MM_xfree((void *)haddr_buf_ptr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_rsp__dist_md_write__flush() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_rsp__dist_md_write__flush_to_min_clean
  *
@@ -4431,42 +4099,39 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f,
-                                            hid_t dxpl_id,
-                                            H5AC_t * cache_ptr)
+H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr)
 {
-    hbool_t      evictions_enabled;
-    H5AC_aux_t * aux_ptr;
-    herr_t     ret_value = SUCCEED;   /* Return value */
+    hbool_t     evictions_enabled;
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f != NULL );
-    HDassert( f->shared->cache == cache_ptr );
+    HDassert(f != NULL);
+    HDassert(f->shared->cache == cache_ptr);
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
 
     /* Query if evictions are allowed */
-    if(H5C_get_evictions_enabled((const H5C_t *)cache_ptr, &evictions_enabled) < 0)
+    if (H5C_get_evictions_enabled((const H5C_t *)cache_ptr, &evictions_enabled) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5C_get_evictions_enabled() failed.")
 
-    if(evictions_enabled) {
+    if (evictions_enabled) {
         /* construct candidate list -- process 0 only */
-        if(aux_ptr->mpi_rank == 0) {
-            if(H5AC_construct_candidate_list(cache_ptr, aux_ptr, H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) < 0)
+        if (aux_ptr->mpi_rank == 0) {
+            if (H5AC_construct_candidate_list(cache_ptr, aux_ptr, H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't construct candidate list.")
         } /* mpi rank == 0 */
 
         /* propagate and apply candidate list -- all processes */
-        if(H5AC_propagate_and_apply_candidate_list(f, dxpl_id, cache_ptr) < 0)
+        if (H5AC_propagate_and_apply_candidate_list(f, dxpl_id, cache_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't propagate and apply candidate list.")
     } /* evictions enabled */
 
@@ -4475,7 +4140,6 @@ done:
 } /* H5AC_rsp__dist_md_write__flush_to_min_clean() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_rsp__p0_only__flush
  *
@@ -4514,40 +4178,36 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_rsp__p0_only__flush(H5F_t *f,
-                         hid_t dxpl_id,
-                         H5AC_t * cache_ptr)
+H5AC_rsp__p0_only__flush(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr)
 {
     int         mpi_code;
-    H5AC_aux_t * aux_ptr;
-    herr_t     ret_value = SUCCEED;   /* Return value */
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f != NULL );
-    HDassert( f->shared->cache == cache_ptr );
+    HDassert(f != NULL);
+    HDassert(f->shared->cache == cache_ptr);
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY );
-
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
 
     /* to prevent "messages from the future" we must
      * synchronize all processes before we start the flush.
      * Hence the following barrier.
      */
-    if(MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed 1", mpi_code)
 
     /* Flush data to disk, from rank 0 process */
-    if(aux_ptr->mpi_rank == 0) {
-        herr_t        result;
+    if (aux_ptr->mpi_rank == 0) {
+        herr_t result;
 
         aux_ptr->write_permitted = TRUE;
 
@@ -4555,15 +4215,15 @@ H5AC_rsp__p0_only__flush(H5F_t *f,
 
         aux_ptr->write_permitted = FALSE;
 
-        if(result < 0)
+        if (result < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't flush.")
 
-        if(aux_ptr->write_done != NULL)
+        if (aux_ptr->write_done != NULL)
             (aux_ptr->write_done)();
     } /* end if */
 
     /* Propagate cleaned entries to other ranks. */
-    if(H5AC_propagate_flushed_and_still_clean_entries_list(f, H5AC_dxpl_id, cache_ptr) < 0)
+    if (H5AC_propagate_flushed_and_still_clean_entries_list(f, H5AC_dxpl_id, cache_ptr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't propagate clean entries list.")
 
 done:
@@ -4571,7 +4231,6 @@ done:
 } /* H5AC_rsp__p0_only__flush() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_rsp__p0_only__flush_to_min_clean
  *
@@ -4616,31 +4275,28 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
-                                      hid_t dxpl_id,
-                                      H5AC_t * cache_ptr)
+H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr)
 {
-    hbool_t      evictions_enabled;
-    H5AC_aux_t * aux_ptr;
-    herr_t     ret_value = SUCCEED;   /* Return value */
+    hbool_t     evictions_enabled;
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f != NULL );
-    HDassert( f->shared->cache == cache_ptr );
+    HDassert(f != NULL);
+    HDassert(f->shared->cache == cache_ptr);
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
 
     /* Query if evictions are allowed */
-    if(H5C_get_evictions_enabled((const H5C_t *)cache_ptr, &evictions_enabled) < 0)
+    if (H5C_get_evictions_enabled((const H5C_t *)cache_ptr, &evictions_enabled) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5C_get_evictions_enabled() failed.")
 
     /* Flush if evictions are allowed -- following call
@@ -4650,18 +4306,18 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
      *
      * Otherwise, do nothing.
      */
-    if(evictions_enabled) {
-        int          mpi_code;
+    if (evictions_enabled) {
+        int mpi_code;
 
         /* to prevent "messages from the future" we must synchronize all
          * processes before we start the flush.  This synchronization may
          * already be done -- hence the do_barrier parameter.
          */
-        if(MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
 
-        if(0 == aux_ptr->mpi_rank) {
-            herr_t     result;
+        if (0 == aux_ptr->mpi_rank) {
+            herr_t result;
 
             /* here, process 0 flushes as many entries as necessary to
              * comply with the currently specified min clean size.
@@ -4674,18 +4330,18 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
 
             aux_ptr->write_permitted = FALSE;
 
-            if(result < 0)
+            if (result < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_flush_to_min_clean() failed.")
 
             /* this call exists primarily for the test code -- it is used
-        * to enforce POSIX semantics on the process used to simulate
-        * reads and writes in t_cache.c.
+             * to enforce POSIX semantics on the process used to simulate
+             * reads and writes in t_cache.c.
              */
-            if(aux_ptr->write_done != NULL)
+            if (aux_ptr->write_done != NULL)
                 (aux_ptr->write_done)();
         } /* end if */
 
-        if(H5AC_propagate_flushed_and_still_clean_entries_list(f, dxpl_id, cache_ptr) < 0)
+        if (H5AC_propagate_flushed_and_still_clean_entries_list(f, dxpl_id, cache_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't propagate clean entries list.")
     } /* end if */
 
@@ -4694,7 +4350,6 @@ done:
 } /* H5AC_rsp__p0_only__flush_to_min_clean() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_run_sync_point
  *
@@ -4728,91 +4383,85 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_run_sync_point(H5F_t *f,
-                    hid_t dxpl_id,
-            int sync_point_op)
+H5AC_run_sync_point(H5F_t *f, hid_t dxpl_id, int sync_point_op)
 {
-    H5AC_t * cache_ptr;
-    H5AC_aux_t * aux_ptr;
-    herr_t     ret_value = SUCCEED;   /* Return value */
+    H5AC_t *    cache_ptr;
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f != NULL );
+    HDassert(f != NULL);
 
     cache_ptr = f->shared->cache;
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
 
-    HDassert( ( sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN ) ||
-              ( sync_point_op == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED ) );
+    HDassert((sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN) ||
+             (sync_point_op == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED));
 
 #if H5AC_DEBUG_DIRTY_BYTES_CREATION
-    HDfprintf(stdout,
-              "%d:H5AC_propagate...:%d: (u/uu/i/iu/r/ru) = %d/%d/%d/%d/%d/%d\n",
-              (int)(aux_ptr->mpi_rank),
-              (int)(aux_ptr->dirty_bytes_propagations),
-              (int)(aux_ptr->unprotect_dirty_bytes),
-              (int)(aux_ptr->unprotect_dirty_bytes_updates),
-              (int)(aux_ptr->insert_dirty_bytes),
-              (int)(aux_ptr->insert_dirty_bytes_updates),
-              (int)(aux_ptr->rename_dirty_bytes),
-              (int)(aux_ptr->rename_dirty_bytes_updates));
+    HDfprintf(stdout, "%d:H5AC_propagate...:%d: (u/uu/i/iu/r/ru) = %d/%d/%d/%d/%d/%d\n",
+              (int)(aux_ptr->mpi_rank), (int)(aux_ptr->dirty_bytes_propagations),
+              (int)(aux_ptr->unprotect_dirty_bytes), (int)(aux_ptr->unprotect_dirty_bytes_updates),
+              (int)(aux_ptr->insert_dirty_bytes), (int)(aux_ptr->insert_dirty_bytes_updates),
+              (int)(aux_ptr->rename_dirty_bytes), (int)(aux_ptr->rename_dirty_bytes_updates));
 #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
 
-    switch(aux_ptr->metadata_write_strategy) {
+    switch (aux_ptr->metadata_write_strategy) {
         case H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY:
-        switch(sync_point_op) {
+            switch (sync_point_op) {
                 case H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN:
-                if(H5AC_rsp__p0_only__flush_to_min_clean(f, dxpl_id, cache_ptr) < 0)
-                        HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5AC_rsp__p0_only__flush_to_min_clean() failed.")
-            break;
+                    if (H5AC_rsp__p0_only__flush_to_min_clean(f, dxpl_id, cache_ptr) < 0)
+                        HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL,
+                                    "H5AC_rsp__p0_only__flush_to_min_clean() failed.")
+                    break;
 
-        case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
-                if(H5AC_rsp__p0_only__flush(f, dxpl_id, cache_ptr) < 0)
+                case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
+                    if (H5AC_rsp__p0_only__flush(f, dxpl_id, cache_ptr) < 0)
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5AC_rsp__p0_only__flush() failed.")
-            break;
+                    break;
 
-        default:
+                default:
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown flush op");
+                    break;
+            } /* end switch */
             break;
-        } /* end switch */
-        break;
 
-    case H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED:
-        switch(sync_point_op) {
+        case H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED:
+            switch (sync_point_op) {
                 case H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN:
-                if(H5AC_rsp__dist_md_write__flush_to_min_clean(f, dxpl_id, cache_ptr) < 0)
+                    if (H5AC_rsp__dist_md_write__flush_to_min_clean(f, dxpl_id, cache_ptr) < 0)
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5AC_rsp__dist_md_write__flush() failed.")
-            break;
+                    break;
 
-        case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
-                if(H5AC_rsp__dist_md_write__flush(f, dxpl_id, cache_ptr) < 0)
+                case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
+                    if (H5AC_rsp__dist_md_write__flush(f, dxpl_id, cache_ptr) < 0)
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5AC_rsp__dist_md_write__flush() failed.")
-            break;
+                    break;
 
-        default:
+                default:
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown flush op");
+                    break;
+            } /* end switch */
             break;
-        } /* end switch */
-        break;
 
-    default:
+        default:
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown metadata write strategy.")
-        break;
+            break;
     } /* end switch */
 
     /* reset the dirty bytes count */
     aux_ptr->dirty_bytes = 0;
 
 #if H5AC_DEBUG_DIRTY_BYTES_CREATION
-    aux_ptr->dirty_bytes_propagations     += 1;
+    aux_ptr->dirty_bytes_propagations += 1;
     aux_ptr->unprotect_dirty_bytes         = 0;
     aux_ptr->unprotect_dirty_bytes_updates = 0;
     aux_ptr->insert_dirty_bytes            = 0;
@@ -4826,7 +4475,6 @@ done:
 } /* H5AC_run_sync_point() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_tidy_cache_0_lists()
  *
@@ -4864,29 +4512,26 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
-                        int num_candidates,
-                        haddr_t * candidates_list_ptr)
+H5AC_tidy_cache_0_lists(H5AC_t *cache_ptr, int num_candidates, haddr_t *candidates_list_ptr)
 
 {
-    int                  i;
-    H5AC_aux_t         * aux_ptr;
-    herr_t               ret_value = SUCCEED;   /* Return value */
+    int         i;
+    H5AC_aux_t *aux_ptr;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
-    HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy ==
-              H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
-    HDassert( aux_ptr->mpi_rank == 0 );
-    HDassert( num_candidates > 0 );
-    HDassert( candidates_list_ptr != NULL );
+    HDassert(aux_ptr != NULL);
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+    HDassert(aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
+    HDassert(aux_ptr->mpi_rank == 0);
+    HDassert(num_candidates > 0);
+    HDassert(candidates_list_ptr != NULL);
 
     /* clean up dirtied and flushed and still clean lists by removing
      * all entries on the candidate list.  Cleared entries should
@@ -4895,10 +4540,10 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
      * cleaned list.  However, for this metadata write strategy,
      * we just want to remove all references to the candidate entries.
      */
-    for(i = 0; i < num_candidates; i++) {
-        H5AC_slist_entry_t * d_slist_entry_ptr;
-        H5AC_slist_entry_t * c_slist_entry_ptr;
-        haddr_t              addr;
+    for (i = 0; i < num_candidates; i++) {
+        H5AC_slist_entry_t *d_slist_entry_ptr;
+        H5AC_slist_entry_t *c_slist_entry_ptr;
+        haddr_t             addr;
 
         addr = candidates_list_ptr[i];
 
@@ -4906,15 +4551,15 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
          * and still clean list.  Remove it.
          */
         d_slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->d_slist_ptr, (void *)&addr);
-        if(d_slist_entry_ptr != NULL) {
+        if (d_slist_entry_ptr != NULL) {
             HDassert(d_slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
             HDassert(d_slist_entry_ptr->addr == addr);
 
-            if(H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr)) != d_slist_entry_ptr)
+            if (H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr)) != d_slist_entry_ptr)
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from dirty entry slist.")
 
             d_slist_entry_ptr->magic = 0;
-            d_slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, d_slist_entry_ptr);
+            d_slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, d_slist_entry_ptr);
 
             aux_ptr->d_slist_len -= 1;
 
@@ -4922,28 +4567,27 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
         } /* end if */
 
         c_slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->c_slist_ptr, (void *)&addr);
-        if(c_slist_entry_ptr != NULL) {
+        if (c_slist_entry_ptr != NULL) {
             HDassert(c_slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
             HDassert(c_slist_entry_ptr->addr == addr);
 
-            if(H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr)) != c_slist_entry_ptr)
+            if (H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr)) != c_slist_entry_ptr)
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTDELETE, FAIL, "Can't delete entry from clean entry slist.")
 
             c_slist_entry_ptr->magic = 0;
-            c_slist_entry_ptr = H5FL_FREE(H5AC_slist_entry_t, c_slist_entry_ptr);
+            c_slist_entry_ptr        = H5FL_FREE(H5AC_slist_entry_t, c_slist_entry_ptr);
 
             aux_ptr->c_slist_len -= 1;
 
-            HDassert( aux_ptr->c_slist_len >= 0 );
+            HDassert(aux_ptr->c_slist_len >= 0);
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_tidy_cache_0_lists() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5AC_flush_entries
  *
@@ -4964,7 +4608,7 @@ done:
 herr_t
 H5AC_flush_entries(H5F_t *f)
 {
-    herr_t        ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4972,8 +4616,8 @@ H5AC_flush_entries(H5F_t *f)
     HDassert(f->shared->cache);
 
     /* Check if we have >1 ranks */
-    if(f->shared->cache->aux_ptr) {
-        if(H5AC_run_sync_point(f, H5AC_dxpl_id, H5AC_SYNC_POINT_OP__FLUSH_CACHE) < 0)
+    if (f->shared->cache->aux_ptr) {
+        if (H5AC_run_sync_point(f, H5AC_dxpl_id, H5AC_SYNC_POINT_OP__FLUSH_CACHE) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't run sync point.")
     } /* end if */
 
@@ -4981,4 +4625,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_flush_entries() */
 #endif /* H5_HAVE_PARALLEL */
-
diff --git a/src/H5ACpkg.h b/src/H5ACpkg.h
index 42f0b18..92dd5b1 100644
--- a/src/H5ACpkg.h
+++ b/src/H5ACpkg.h
@@ -34,15 +34,13 @@
 #define _H5ACpkg_H
 
 /* Get package's private header */
-#include "H5ACprivate.h"	/* Metadata cache			*/
-
+#include "H5ACprivate.h" /* Metadata cache			*/
 
 /* Get needed headers */
-#include "H5Cprivate.h"         /* Cache                                */
-#include "H5SLprivate.h"        /* Skip lists */
-
+#include "H5Cprivate.h"  /* Cache                                */
+#include "H5SLprivate.h" /* Skip lists */
 
-#define H5AC_DEBUG_DIRTY_BYTES_CREATION	0
+#define H5AC_DEBUG_DIRTY_BYTES_CREATION 0
 
 #ifdef H5_HAVE_PARALLEL
 
@@ -50,8 +48,8 @@
  * at a sync point.
  */
 
-#define H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN		0
-#define H5AC_SYNC_POINT_OP__FLUSH_CACHE			1
+#define H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN 0
+#define H5AC_SYNC_POINT_OP__FLUSH_CACHE        1
 
 #endif /* H5_HAVE_PARALLEL */
 
@@ -62,12 +60,9 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5AC__MIN_DIRTY_BYTES_THRESHOLD		(int32_t) \
-						(H5C__MIN_MAX_CACHE_SIZE / 2)
-#define H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD	(256 * 1024)
-#define H5AC__MAX_DIRTY_BYTES_THRESHOLD   	(int32_t) \
-						(H5C__MAX_MAX_CACHE_SIZE / 4)
-
+#define H5AC__MIN_DIRTY_BYTES_THRESHOLD     (int32_t)(H5C__MIN_MAX_CACHE_SIZE / 2)
+#define H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD (256 * 1024)
+#define H5AC__MAX_DIRTY_BYTES_THRESHOLD     (int32_t)(H5C__MAX_MAX_CACHE_SIZE / 4)
 
 /****************************************************************************
  *
@@ -172,10 +167,10 @@
  *		broadcast.  This field is reset to zero after each such
  *		broadcast.
  *
- * metadata_write_strategy: Integer code indicating how we will be 
- *		writing the metadata.  In the first incarnation of 
+ * metadata_write_strategy: Integer code indicating how we will be
+ *		writing the metadata.  In the first incarnation of
  *		this code, all writes were done from process 0.  This
- *		field exists to facilitate experiments with other 
+ *		field exists to facilitate experiments with other
  *		strategies.
  *
  * dirty_bytes_propagations: This field only exists when the
@@ -229,7 +224,7 @@
  *
  * Things have changed a bit since the following four fields were defined.
  * If metadata_write_strategy is H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY,
- * all comments hold as before -- with the caviate that pending further 
+ * all comments hold as before -- with the caviate that pending further
  * coding, the process 0 metadata cache is forbidden to flush entries outside
  * of a sync point.
  *
@@ -312,77 +307,74 @@
  *              needed.
  *
  *		Note: This field has been extended for use by all processes
- *		      with the addition of support for the distributed 
- *		      metadata write strategy.        
+ *		      with the addition of support for the distributed
+ *		      metadata write strategy.
  *                                                     JRM -- 5/9/10
  *
  * sync_point_done:  In the parallel test bed, it is necessary to verify
  *		that the expected writes, and only the expected writes,
  *		have taken place at the end of each sync point.
  *
- *		The sync_point_done callback allows t_cache to perform 
- *		this verification.  The field is set to NULL when the 
+ *		The sync_point_done callback allows t_cache to perform
+ *		this verification.  The field is set to NULL when the
  *		callback is not needed.
  *
  ****************************************************************************/
 
 #ifdef H5_HAVE_PARALLEL
 
-#define H5AC__H5AC_AUX_T_MAGIC        (unsigned)0x00D0A01
+#define H5AC__H5AC_AUX_T_MAGIC (unsigned)0x00D0A01
 
-typedef struct H5AC_aux_t
-{
-    uint32_t	magic;
+typedef struct H5AC_aux_t {
+    uint32_t magic;
 
-    MPI_Comm	mpi_comm;
+    MPI_Comm mpi_comm;
 
-    int		mpi_rank;
+    int mpi_rank;
 
-    int		mpi_size;
+    int mpi_size;
 
-    hbool_t	write_permitted;
+    hbool_t write_permitted;
 
-    int32_t	dirty_bytes_threshold;
+    int32_t dirty_bytes_threshold;
 
-    int32_t	dirty_bytes;
+    int32_t dirty_bytes;
 
-    int32_t	metadata_write_strategy;
+    int32_t metadata_write_strategy;
 
 #if H5AC_DEBUG_DIRTY_BYTES_CREATION
 
-    int32_t	dirty_bytes_propagations;
+    int32_t dirty_bytes_propagations;
 
-    int32_t     unprotect_dirty_bytes;
-    int32_t     unprotect_dirty_bytes_updates;
+    int32_t unprotect_dirty_bytes;
+    int32_t unprotect_dirty_bytes_updates;
 
-    int32_t     insert_dirty_bytes;
-    int32_t     insert_dirty_bytes_updates;
+    int32_t insert_dirty_bytes;
+    int32_t insert_dirty_bytes_updates;
 
-    int32_t     move_dirty_bytes;
-    int32_t     move_dirty_bytes_updates;
+    int32_t move_dirty_bytes;
+    int32_t move_dirty_bytes_updates;
 
 #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
 
-    H5SL_t *	d_slist_ptr;
+    H5SL_t *d_slist_ptr;
 
-    int32_t	d_slist_len;
+    int32_t d_slist_len;
 
-    H5SL_t *	c_slist_ptr;
+    H5SL_t *c_slist_ptr;
 
-    int32_t	c_slist_len;
+    int32_t c_slist_len;
 
-    H5SL_t *	candidate_slist_ptr;
+    H5SL_t *candidate_slist_ptr;
 
-    int32_t	candidate_slist_len;
+    int32_t candidate_slist_len;
 
-    void	(* write_done)(void);
+    void (*write_done)(void);
 
-    void	(* sync_point_done)(int num_writes, 
-                                    haddr_t * written_entries_tbl);
+    void (*sync_point_done)(int num_writes, haddr_t *written_entries_tbl);
 
 } H5AC_aux_t; /* struct H5AC_aux_t */
 
 #endif /* H5_HAVE_PARALLEL */
 
 #endif /* _H5ACpkg_H */
-
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 1889930..aac4209 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -26,42 +26,42 @@
 #ifndef _H5ACprivate_H
 #define _H5ACprivate_H
 
-#include "H5ACpublic.h"        /*public prototypes            */
+#include "H5ACpublic.h" /*public prototypes            */
 
 /* Pivate headers needed by this header */
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Cprivate.h"        /* Cache                */
-#include "H5Fprivate.h"        /* File access                */
-#include "H5Pprivate.h"        /* Property lists            */
+#include "H5private.h"  /* Generic Functions            */
+#include "H5Cprivate.h" /* Cache                */
+#include "H5Fprivate.h" /* File access                */
+#include "H5Pprivate.h" /* Property lists            */
 
 #ifdef H5_METADATA_TRACE_FILE
-#define H5AC__TRACE_FILE_ENABLED    1
+#define H5AC__TRACE_FILE_ENABLED 1
 #else /* H5_METADATA_TRACE_FILE */
-#define H5AC__TRACE_FILE_ENABLED    0
+#define H5AC__TRACE_FILE_ENABLED 0
 #endif /* H5_METADATA_TRACE_FILE */
 
 /* Types of metadata objects cached */
 typedef enum {
-    H5AC_BT_ID = 0,     /*B-tree nodes                     */
-    H5AC_SNODE_ID,    /*symbol table nodes                 */
-    H5AC_LHEAP_PRFX_ID, /*local heap prefix                 */
-    H5AC_LHEAP_DBLK_ID, /*local heap data block                 */
-    H5AC_GHEAP_ID,    /*global heap                     */
-    H5AC_OHDR_ID,    /*object header                     */
-    H5AC_OHDR_CHK_ID,    /*object header chunk                 */
-    H5AC_BT2_HDR_ID,    /*v2 B-tree header                 */
-    H5AC_BT2_INT_ID,    /*v2 B-tree internal node             */
-    H5AC_BT2_LEAF_ID,    /*v2 B-tree leaf node                 */
+    H5AC_BT_ID = 0,       /*B-tree nodes                     */
+    H5AC_SNODE_ID,        /*symbol table nodes                 */
+    H5AC_LHEAP_PRFX_ID,   /*local heap prefix                 */
+    H5AC_LHEAP_DBLK_ID,   /*local heap data block                 */
+    H5AC_GHEAP_ID,        /*global heap                     */
+    H5AC_OHDR_ID,         /*object header                     */
+    H5AC_OHDR_CHK_ID,     /*object header chunk                 */
+    H5AC_BT2_HDR_ID,      /*v2 B-tree header                 */
+    H5AC_BT2_INT_ID,      /*v2 B-tree internal node             */
+    H5AC_BT2_LEAF_ID,     /*v2 B-tree leaf node                 */
     H5AC_FHEAP_HDR_ID,    /*fractal heap header                 */
     H5AC_FHEAP_DBLOCK_ID, /*fractal heap direct block             */
     H5AC_FHEAP_IBLOCK_ID, /*fractal heap indirect block             */
-    H5AC_FSPACE_HDR_ID,    /*free space header                 */
-    H5AC_FSPACE_SINFO_ID,/*free space sections                 */
-    H5AC_SOHM_TABLE_ID, /*shared object header message master table  */
-    H5AC_SOHM_LIST_ID,  /*shared message index stored as a list      */
-    H5AC_SUPERBLOCK_ID, /* file superblock                           */
-    H5AC_TEST_ID,    /*test entry -- not used for actual files    */
-    H5AC_NTYPES        /* Number of types, must be last             */
+    H5AC_FSPACE_HDR_ID,   /*free space header                 */
+    H5AC_FSPACE_SINFO_ID, /*free space sections                 */
+    H5AC_SOHM_TABLE_ID,   /*shared object header message master table  */
+    H5AC_SOHM_LIST_ID,    /*shared message index stored as a list      */
+    H5AC_SUPERBLOCK_ID,   /* file superblock                           */
+    H5AC_TEST_ID,         /*test entry -- not used for actual files    */
+    H5AC_NTYPES           /* Number of types, must be last             */
 } H5AC_type_t;
 
 /* H5AC_DUMP_STATS_ON_CLOSE should always be FALSE when
@@ -75,11 +75,11 @@ typedef enum {
  */
 #if H5C_COLLECT_CACHE_STATS
 
-#define H5AC_DUMP_STATS_ON_CLOSE    0
+#define H5AC_DUMP_STATS_ON_CLOSE 0
 
 #else /* H5C_COLLECT_CACHE_STATS */
 
-#define H5AC_DUMP_STATS_ON_CLOSE    0
+#define H5AC_DUMP_STATS_ON_CLOSE 0
 
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -87,9 +87,8 @@ typedef enum {
  * At present, these are the same as those given in H5Cprivate.h.
  */
 
-#define H5AC__DEFAULT_MAX_CACHE_SIZE    H5C__DEFAULT_MAX_CACHE_SIZE
-#define H5AC__DEFAULT_MIN_CLEAN_SIZE    H5C__DEFAULT_MIN_CLEAN_SIZE
-
+#define H5AC__DEFAULT_MAX_CACHE_SIZE H5C__DEFAULT_MAX_CACHE_SIZE
+#define H5AC__DEFAULT_MIN_CLEAN_SIZE H5C__DEFAULT_MIN_CLEAN_SIZE
 
 /*
  * Class methods pertaining to caching.     Each type of cached object will
@@ -115,18 +114,17 @@ typedef enum {
  *        Note that the space allocated on disk may not be contiguous.
  */
 
-#define H5AC_CALLBACK__NO_FLAGS_SET             H5C_CALLBACK__NO_FLAGS_SET
-#define H5AC_CALLBACK__SIZE_CHANGED_FLAG    H5C_CALLBACK__SIZE_CHANGED_FLAG
-#define H5AC_CALLBACK__MOVED_FLAG             H5C_CALLBACK__MOVED_FLAG
-
-typedef H5C_load_func_t        H5AC_load_func_t;
-typedef H5C_flush_func_t    H5AC_flush_func_t;
-typedef H5C_dest_func_t        H5AC_dest_func_t;
-typedef H5C_clear_func_t    H5AC_clear_func_t;
-typedef H5C_size_func_t        H5AC_size_func_t;
+#define H5AC_CALLBACK__NO_FLAGS_SET      H5C_CALLBACK__NO_FLAGS_SET
+#define H5AC_CALLBACK__SIZE_CHANGED_FLAG H5C_CALLBACK__SIZE_CHANGED_FLAG
+#define H5AC_CALLBACK__MOVED_FLAG        H5C_CALLBACK__MOVED_FLAG
 
-typedef H5C_class_t            H5AC_class_t;
+typedef H5C_load_func_t  H5AC_load_func_t;
+typedef H5C_flush_func_t H5AC_flush_func_t;
+typedef H5C_dest_func_t  H5AC_dest_func_t;
+typedef H5C_clear_func_t H5AC_clear_func_t;
+typedef H5C_size_func_t  H5AC_size_func_t;
 
+typedef H5C_class_t H5AC_class_t;
 
 /* The H5AC_NSLOTS #define is now obsolete, as the metadata cache no longer
  * uses slots.  However I am leaving it in for now to avoid modifying the
@@ -141,11 +139,9 @@ typedef H5C_class_t            H5AC_class_t;
  * cache entry by hashing the object's file address.  Each file has its
  * own cache, an array of slots.
  */
-#define H5AC_NSLOTS     10330           /* The library "likes" this number... */
-
-
-typedef H5C_cache_entry_t        H5AC_info_t;
+#define H5AC_NSLOTS 10330 /* The library "likes" this number... */
 
+typedef H5C_cache_entry_t H5AC_info_t;
 
 /*===----------------------------------------------------------------------===
  *                             Protect Types
@@ -157,21 +153,20 @@ typedef H5C_cache_entry_t        H5AC_info_t;
  */
 
 typedef enum H5AC_protect_t {
-    H5AC_WRITE,                 /* Protect object for writing                */
-    H5AC_READ                   /* Protect object for reading                */
+    H5AC_WRITE, /* Protect object for writing                */
+    H5AC_READ   /* Protect object for reading                */
 } H5AC_protect_t;
 
-
 /* Typedef for metadata cache (defined in H5Cpkg.h) */
-typedef H5C_t    H5AC_t;
+typedef H5C_t H5AC_t;
 
 /* Metadata specific properties for FAPL */
 /* (Only used for parallel I/O) */
 #ifdef H5_HAVE_PARALLEL
 /* Definitions for "collective metadata write" property */
-#define H5AC_COLLECTIVE_META_WRITE_NAME         "H5AC_collective_metadata_write"
-#define H5AC_COLLECTIVE_META_WRITE_SIZE         sizeof(unsigned)
-#define H5AC_COLLECTIVE_META_WRITE_DEF          0
+#define H5AC_COLLECTIVE_META_WRITE_NAME "H5AC_collective_metadata_write"
+#define H5AC_COLLECTIVE_META_WRITE_SIZE sizeof(unsigned)
+#define H5AC_COLLECTIVE_META_WRITE_DEF  0
 #endif /* H5_HAVE_PARALLEL */
 
 /* Dataset transfer property list for flush calls */
@@ -183,13 +178,11 @@ extern hid_t H5AC_dxpl_id;
 /* (just "library internal" set - i.e. independent transfer mode) */
 /* (Global variable declaration, definition is in H5AC.c) */
 extern H5P_genplist_t *H5AC_ind_dxpl_g;
-extern hid_t H5AC_ind_dxpl_id;
-
+extern hid_t           H5AC_ind_dxpl_id;
 
 /* Default cache configuration. */
 
-#define H5AC__DEFAULT_METADATA_WRITE_STRATEGY   \
-                                H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED
+#define H5AC__DEFAULT_METADATA_WRITE_STRATEGY H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED
 
 /* clang-format off */
 #ifdef H5_HAVE_PARALLEL
@@ -267,7 +260,6 @@ extern hid_t H5AC_ind_dxpl_id;
 #endif /* H5_HAVE_PARALLEL */
 /* clang-format on */
 
-
 /*
  * Library prototypes.
  */
@@ -277,93 +269,79 @@ extern hid_t H5AC_ind_dxpl_id;
  * the equivalent flags from H5Cprivate.h.
  */
 
-#define H5AC__NO_FLAGS_SET          H5C__NO_FLAGS_SET
-#define H5AC__SET_FLUSH_MARKER_FLAG      H5C__SET_FLUSH_MARKER_FLAG
-#define H5AC__DELETED_FLAG          H5C__DELETED_FLAG
-#define H5AC__DIRTIED_FLAG          H5C__DIRTIED_FLAG
-#define H5AC__PIN_ENTRY_FLAG          H5C__PIN_ENTRY_FLAG
-#define H5AC__UNPIN_ENTRY_FLAG          H5C__UNPIN_ENTRY_FLAG
-#define H5AC__FLUSH_INVALIDATE_FLAG      H5C__FLUSH_INVALIDATE_FLAG
-#define H5AC__FLUSH_CLEAR_ONLY_FLAG      H5C__FLUSH_CLEAR_ONLY_FLAG
+#define H5AC__NO_FLAGS_SET                H5C__NO_FLAGS_SET
+#define H5AC__SET_FLUSH_MARKER_FLAG       H5C__SET_FLUSH_MARKER_FLAG
+#define H5AC__DELETED_FLAG                H5C__DELETED_FLAG
+#define H5AC__DIRTIED_FLAG                H5C__DIRTIED_FLAG
+#define H5AC__PIN_ENTRY_FLAG              H5C__PIN_ENTRY_FLAG
+#define H5AC__UNPIN_ENTRY_FLAG            H5C__UNPIN_ENTRY_FLAG
+#define H5AC__FLUSH_INVALIDATE_FLAG       H5C__FLUSH_INVALIDATE_FLAG
+#define H5AC__FLUSH_CLEAR_ONLY_FLAG       H5C__FLUSH_CLEAR_ONLY_FLAG
 #define H5AC__FLUSH_MARKED_ENTRIES_FLAG   H5C__FLUSH_MARKED_ENTRIES_FLAG
 #define H5AC__FLUSH_IGNORE_PROTECTED_FLAG H5C__FLUSH_IGNORE_PROTECTED_FLAG
-#define H5AC__FREE_FILE_SPACE_FLAG      H5C__FREE_FILE_SPACE_FLAG
+#define H5AC__FREE_FILE_SPACE_FLAG        H5C__FREE_FILE_SPACE_FLAG
 #define H5AC__TAKE_OWNERSHIP_FLAG         H5C__TAKE_OWNERSHIP_FLAG
 
-
 /* #defines of flags used to report entry status in the
  * H5AC_get_entry_status() call.
  */
 
-#define H5AC_ES__IN_CACHE    0x0001
-#define H5AC_ES__IS_DIRTY    0x0002
-#define H5AC_ES__IS_PROTECTED    0x0004
+#define H5AC_ES__IN_CACHE     0x0001
+#define H5AC_ES__IS_DIRTY     0x0002
+#define H5AC_ES__IS_PROTECTED 0x0004
 #define H5AC_ES__IS_PINNED    0x0008
 
-
 /* external function declarations: */
 
 H5_DLL herr_t H5AC_init(void);
 H5_DLL herr_t H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr);
-H5_DLL herr_t H5AC_get_entry_status(const H5F_t *f, haddr_t addr,
-                    unsigned * status_ptr);
-H5_DLL herr_t H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type,
-                       haddr_t addr, void *thing, unsigned int flags);
+H5_DLL herr_t H5AC_get_entry_status(const H5F_t *f, haddr_t addr, unsigned *status_ptr);
+H5_DLL herr_t H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *thing,
+                                unsigned int flags);
 H5_DLL herr_t H5AC_pin_protected_entry(void *thing);
-H5_DLL void * H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type,
-    haddr_t addr, void *udata, H5AC_protect_t rw);
+H5_DLL void * H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *udata,
+                           H5AC_protect_t rw);
 H5_DLL herr_t H5AC_resize_entry(void *thing, size_t new_size);
 H5_DLL herr_t H5AC_unpin_entry(void *thing);
-H5_DLL herr_t H5AC_unprotect(H5F_t *f, hid_t dxpl_id,
-                             const H5AC_class_t *type, haddr_t addr,
-                void *thing, unsigned flags);
+H5_DLL herr_t H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *thing,
+                             unsigned flags);
 H5_DLL herr_t H5AC_flush(H5F_t *f, hid_t dxpl_id);
 H5_DLL herr_t H5AC_mark_entry_dirty(void *thing);
-H5_DLL herr_t H5AC_move_entry(H5F_t *f, const H5AC_class_t *type,
-            haddr_t old_addr, haddr_t new_addr);
+H5_DLL herr_t H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr);
 
 H5_DLL herr_t H5AC_dest(H5F_t *f, hid_t dxpl_id);
 
-H5_DLL herr_t H5AC_expunge_entry(H5F_t *f, hid_t dxpl_id,
-                                 const H5AC_class_t *type, haddr_t addr,
+H5_DLL herr_t H5AC_expunge_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
                                  unsigned flags);
 
 H5_DLL herr_t H5AC_set_sync_point_done_callback(H5C_t *cache_ptr,
-    void (*sync_point_done)(int num_writes, haddr_t *written_entries_tbl));
+                                                void (*sync_point_done)(int      num_writes,
+                                                                        haddr_t *written_entries_tbl));
 
-H5_DLL herr_t H5AC_set_write_done_callback(H5C_t * cache_ptr,
-                                           void (* write_done)(void));
+H5_DLL herr_t H5AC_set_write_done_callback(H5C_t *cache_ptr, void (*write_done)(void));
 H5_DLL herr_t H5AC_stats(const H5F_t *f);
 
 H5_DLL herr_t H5AC_dump_cache(const H5F_t *f);
 
-H5_DLL herr_t H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
-                                               H5AC_cache_config_t *config_ptr);
+H5_DLL herr_t H5AC_get_cache_auto_resize_config(const H5AC_t *cache_ptr, H5AC_cache_config_t *config_ptr);
 
-H5_DLL herr_t H5AC_get_cache_size(H5AC_t * cache_ptr,
-                                  size_t * max_size_ptr,
-                                  size_t * min_clean_size_ptr,
-                                  size_t * cur_size_ptr,
-                                  int32_t * cur_num_entries_ptr);
+H5_DLL herr_t H5AC_get_cache_size(H5AC_t *cache_ptr, size_t *max_size_ptr, size_t *min_clean_size_ptr,
+                                  size_t *cur_size_ptr, int32_t *cur_num_entries_ptr);
 
-H5_DLL herr_t H5AC_get_cache_hit_rate(H5AC_t * cache_ptr,
-                                      double * hit_rate_ptr);
+H5_DLL herr_t H5AC_get_cache_hit_rate(H5AC_t *cache_ptr, double *hit_rate_ptr);
 
-H5_DLL herr_t H5AC_reset_cache_hit_rate_stats(H5AC_t * cache_ptr);
+H5_DLL herr_t H5AC_reset_cache_hit_rate_stats(H5AC_t *cache_ptr);
 
-H5_DLL herr_t H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr,
-                                               H5AC_cache_config_t *config_ptr);
+H5_DLL herr_t H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr, H5AC_cache_config_t *config_ptr);
 
-H5_DLL herr_t H5AC_validate_config(H5AC_cache_config_t * config_ptr);
+H5_DLL herr_t H5AC_validate_config(H5AC_cache_config_t *config_ptr);
 
-H5_DLL herr_t H5AC_close_trace_file( H5AC_t * cache_ptr);
+H5_DLL herr_t H5AC_close_trace_file(H5AC_t *cache_ptr);
 
-H5_DLL herr_t H5AC_open_trace_file(H5AC_t * cache_ptr,
-                        const char * trace_file_name);
+H5_DLL herr_t H5AC_open_trace_file(H5AC_t *cache_ptr, const char *trace_file_name);
 
 #ifdef H5_HAVE_PARALLEL
-H5_DLL herr_t H5AC_add_candidate(H5AC_t * cache_ptr, haddr_t addr);
+H5_DLL herr_t H5AC_add_candidate(H5AC_t *cache_ptr, haddr_t addr);
 #endif /* H5_HAVE_PARALLEL */
 
 #endif /* !_H5ACprivate_H */
-
diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h
index 6c2e2c8..3323407 100644
--- a/src/H5ACpublic.h
+++ b/src/H5ACpublic.h
@@ -432,74 +432,69 @@ extern "C" {
  *
  ****************************************************************************/
 
-#define H5AC__CURR_CACHE_CONFIG_VERSION     1
-#define H5AC__MAX_TRACE_FILE_NAME_LEN        1024
+#define H5AC__CURR_CACHE_CONFIG_VERSION 1
+#define H5AC__MAX_TRACE_FILE_NAME_LEN   1024
 
-#define H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY    0
-#define H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED       1
+#define H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY 0
+#define H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED    1
 
-typedef struct H5AC_cache_config_t
-{
+typedef struct H5AC_cache_config_t {
     /* general configuration fields: */
-    int                      version;
+    int version;
 
-    hbool_t             rpt_fcn_enabled;
+    hbool_t rpt_fcn_enabled;
 
-    hbool_t             open_trace_file;
-    hbool_t                  close_trace_file;
-    char                     trace_file_name[H5AC__MAX_TRACE_FILE_NAME_LEN + 1];
+    hbool_t open_trace_file;
+    hbool_t close_trace_file;
+    char    trace_file_name[H5AC__MAX_TRACE_FILE_NAME_LEN + 1];
 
-    hbool_t                  evictions_enabled;
+    hbool_t evictions_enabled;
 
-    hbool_t                  set_initial_size;
-    size_t                   initial_size;
+    hbool_t set_initial_size;
+    size_t  initial_size;
 
-    double                   min_clean_fraction;
+    double min_clean_fraction;
 
-    size_t                   max_size;
-    size_t                   min_size;
-
-    long int                 epoch_length;
+    size_t max_size;
+    size_t min_size;
 
+    long int epoch_length;
 
     /* size increase control fields: */
     enum H5C_cache_incr_mode incr_mode;
 
-    double                   lower_hr_threshold;
-
-    double                   increment;
+    double lower_hr_threshold;
 
-    hbool_t                  apply_max_increment;
-    size_t                   max_increment;
+    double increment;
 
-    enum H5C_cache_flash_incr_mode      flash_incr_mode;
-    double                              flash_multiple;
-    double                              flash_threshold;
+    hbool_t apply_max_increment;
+    size_t  max_increment;
 
+    enum H5C_cache_flash_incr_mode flash_incr_mode;
+    double                         flash_multiple;
+    double                         flash_threshold;
 
     /* size decrease control fields: */
     enum H5C_cache_decr_mode decr_mode;
 
-    double                   upper_hr_threshold;
+    double upper_hr_threshold;
 
-    double                   decrement;
+    double decrement;
 
-    hbool_t                  apply_max_decrement;
-    size_t                   max_decrement;
+    hbool_t apply_max_decrement;
+    size_t  max_decrement;
 
-    int                      epochs_before_eviction;
-
-    hbool_t                  apply_empty_reserve;
-    double                   empty_reserve;
+    int epochs_before_eviction;
 
+    hbool_t apply_empty_reserve;
+    double  empty_reserve;
 
     /* parallel configuration fields: */
-    int                      dirty_bytes_threshold;
-    int                      metadata_write_strategy;
+    int dirty_bytes_threshold;
+    int metadata_write_strategy;
 
 } H5AC_cache_config_t;
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index 318c60d..34359d6 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -26,23 +26,20 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg  */
-
+#define H5A_PACKAGE /*suppress error about including H5Apkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5SMprivate.h"	/* Shared object header messages        */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes	  			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5SMprivate.h" /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -53,23 +50,21 @@
  */
 typedef struct H5A_fh_ud_cmp_t {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    const char  *name;                  /* Name of attribute to compare      */
-    const H5A_dense_bt2_name_rec_t *record;     /* v2 B-tree record for attribute */
-    H5A_bt2_found_t found_op;           /* Callback when correct attribute is found */
-    void        *found_op_data;         /* Callback data when correct attribute is found */
+    H5F_t *                         f;             /* Pointer to file that fractal heap is in */
+    hid_t                           dxpl_id;       /* DXPL for operation                */
+    const char *                    name;          /* Name of attribute to compare      */
+    const H5A_dense_bt2_name_rec_t *record;        /* v2 B-tree record for attribute */
+    H5A_bt2_found_t                 found_op;      /* Callback when correct attribute is found */
+    void *                          found_op_data; /* Callback data when correct attribute is found */
 
     /* upward */
-    int         cmp;                    /* Comparison of two attribute names */
+    int cmp; /* Comparison of two attribute names */
 } H5A_fh_ud_cmp_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -79,74 +74,67 @@ typedef struct H5A_fh_ud_cmp_t {
 /* v2 B-tree driver callbacks for 'creation order' index */
 static herr_t H5A_dense_btree2_corder_store(void *native, const void *udata);
 static herr_t H5A_dense_btree2_corder_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5A_dense_btree2_corder_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5A_dense_btree2_corder_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5A_dense_btree2_corder_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5A_dense_btree2_corder_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent,
+                                            int fwidth, const void *record, const void *_udata);
 
 /* v2 B-tree driver callbacks for 'name' index */
 static herr_t H5A_dense_btree2_name_store(void *native, const void *udata);
 static herr_t H5A_dense_btree2_name_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5A_dense_btree2_name_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5A_dense_btree2_name_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5A_dense_btree2_name_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5A_dense_btree2_name_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5A_dense_btree2_name_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5A_dense_btree2_name_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth,
+                                          const void *record, const void *_udata);
 
 /* Fractal heap function callbacks */
 static herr_t H5A_dense_fh_name_cmp(const void *obj, size_t obj_len, void *op_data);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 /* v2 B-tree class for indexing 'name' field of attributes */
-const H5B2_class_t H5A_BT2_NAME[1]={{  /* B-tree class information */
-    H5B2_ATTR_DENSE_NAME_ID,           /* Type of B-tree */
-    "H5B2_ATTR_DENSE_NAME_ID",         /* Name of B-tree class */
-    sizeof(H5A_dense_bt2_name_rec_t),  /* Size of native record */
-    NULL,                              /* Create client callback context */
-    NULL,                              /* Destroy client callback context */
-    H5A_dense_btree2_name_store,       /* Record storage callback */
-    H5A_dense_btree2_name_compare,     /* Record comparison callback */
-    H5A_dense_btree2_name_encode,      /* Record encoding callback */
-    H5A_dense_btree2_name_decode,      /* Record decoding callback */
-    H5A_dense_btree2_name_debug,       /* Record debugging callback */
-    NULL,                              /* Create debugging context */
-    NULL                               /* Destroy debugging context */
+const H5B2_class_t H5A_BT2_NAME[1] = {{
+    /* B-tree class information */
+    H5B2_ATTR_DENSE_NAME_ID,          /* Type of B-tree */
+    "H5B2_ATTR_DENSE_NAME_ID",        /* Name of B-tree class */
+    sizeof(H5A_dense_bt2_name_rec_t), /* Size of native record */
+    NULL,                             /* Create client callback context */
+    NULL,                             /* Destroy client callback context */
+    H5A_dense_btree2_name_store,      /* Record storage callback */
+    H5A_dense_btree2_name_compare,    /* Record comparison callback */
+    H5A_dense_btree2_name_encode,     /* Record encoding callback */
+    H5A_dense_btree2_name_decode,     /* Record decoding callback */
+    H5A_dense_btree2_name_debug,      /* Record debugging callback */
+    NULL,                             /* Create debugging context */
+    NULL                              /* Destroy debugging context */
 }};
 
 /* v2 B-tree class for indexing 'creation order' field of attributes */
-const H5B2_class_t H5A_BT2_CORDER[1]={{ /* B-tree class information */
-    H5B2_ATTR_DENSE_CORDER_ID,         /* Type of B-tree */
-    "H5B2_ATTR_DENSE_CORDER_ID",       /* Name of B-tree class */
-    sizeof(H5A_dense_bt2_corder_rec_t),/* Size of native record */
-    NULL,                              /* Create client callback context */
-    NULL,                              /* Destroy client callback context */
-    H5A_dense_btree2_corder_store,     /* Record storage callback */
-    H5A_dense_btree2_corder_compare,   /* Record comparison callback */
-    H5A_dense_btree2_corder_encode,    /* Record encoding callback */
-    H5A_dense_btree2_corder_decode,    /* Record decoding callback */
-    H5A_dense_btree2_corder_debug,     /* Record debugging callback */
-    NULL,                              /* Create debugging context */
-    NULL                               /* Destroy debugging context */
+const H5B2_class_t H5A_BT2_CORDER[1] = {{
+    /* B-tree class information */
+    H5B2_ATTR_DENSE_CORDER_ID,          /* Type of B-tree */
+    "H5B2_ATTR_DENSE_CORDER_ID",        /* Name of B-tree class */
+    sizeof(H5A_dense_bt2_corder_rec_t), /* Size of native record */
+    NULL,                               /* Create client callback context */
+    NULL,                               /* Destroy client callback context */
+    H5A_dense_btree2_corder_store,      /* Record storage callback */
+    H5A_dense_btree2_corder_compare,    /* Record comparison callback */
+    H5A_dense_btree2_corder_encode,     /* Record encoding callback */
+    H5A_dense_btree2_corder_decode,     /* Record decoding callback */
+    H5A_dense_btree2_corder_debug,      /* Record debugging callback */
+    NULL,                               /* Create debugging context */
+    NULL                                /* Destroy debugging context */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_fh_name_cmp
  *
@@ -164,43 +152,43 @@ const H5B2_class_t H5A_BT2_CORDER[1]={{ /* B-tree class information */
 static herr_t
 H5A_dense_fh_name_cmp(const void *obj, size_t obj_len, void *_udata)
 {
-    H5A_fh_ud_cmp_t *udata = (H5A_fh_ud_cmp_t *)_udata;         /* User data for 'op' callback */
-    H5A_t *attr = NULL;                 /* Pointer to attribute created from heap object */
-    hbool_t took_ownership = FALSE;     /* Whether the "found" operator took ownership of the attribute */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_fh_ud_cmp_t *udata = (H5A_fh_ud_cmp_t *)_udata; /* User data for 'op' callback */
+    H5A_t *          attr  = NULL;                      /* Pointer to attribute created from heap object */
+    hbool_t took_ownership = FALSE;   /* Whether the "found" operator took ownership of the attribute */
+    herr_t  ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Decode attribute information */
-    if(NULL == (attr = (H5A_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_ATTR_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (attr = (H5A_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_ATTR_ID, obj_len,
+                                                (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode attribute")
 
     /* Compare the string values */
     udata->cmp = HDstrcmp(udata->name, attr->shared->name);
 
     /* Check for correct attribute & callback to make */
-    if(udata->cmp == 0 && udata->found_op) {
+    if (udata->cmp == 0 && udata->found_op) {
         /* Check whether we should "reconstitute" the shared message info */
-        if(udata->record->flags & H5O_MSG_FLAG_SHARED)
+        if (udata->record->flags & H5O_MSG_FLAG_SHARED)
             H5SM_reconstitute(&(attr->sh_loc), udata->f, H5O_ATTR_ID, udata->record->id);
 
         /* Set the creation order index for the attribute */
         attr->shared->crt_idx = udata->record->corder;
 
         /* Make callback */
-        if((udata->found_op)(attr, &took_ownership, udata->found_op_data) < 0)
+        if ((udata->found_op)(attr, &took_ownership, udata->found_op_data) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTOPERATE, FAIL, "attribute found callback failed")
     } /* end if */
 
 done:
     /* Release the space allocated for the attrbute */
-    if(attr && !took_ownership)
+    if (attr && !took_ownership)
         H5O_msg_free(H5O_ATTR_ID, attr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_fh_name_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_store
  *
@@ -217,21 +205,20 @@ done:
 static herr_t
 H5A_dense_btree2_name_store(void *_nrecord, const void *_udata)
 {
-    const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata;
+    const H5A_bt2_ud_ins_t *  udata   = (const H5A_bt2_ud_ins_t *)_udata;
     H5A_dense_bt2_name_rec_t *nrecord = (H5A_dense_bt2_name_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Copy user information info native record */
-    nrecord->id = udata->id;
-    nrecord->flags = udata->common.flags;
+    nrecord->id     = udata->id;
+    nrecord->flags  = udata->common.flags;
     nrecord->corder = udata->common.corder;
-    nrecord->hash = udata->common.name_hash;
+    nrecord->hash   = udata->common.name_hash;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_name_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_compare
  *
@@ -249,9 +236,9 @@ H5A_dense_btree2_name_store(void *_nrecord, const void *_udata)
 static herr_t
 H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int *result)
 {
-    const H5A_bt2_ud_common_t *bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata;
-    const H5A_dense_bt2_name_rec_t *bt2_rec = (const H5A_dense_bt2_name_rec_t *)_bt2_rec;
-    herr_t ret_value = SUCCEED;            /* Return value */
+    const H5A_bt2_ud_common_t *     bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata;
+    const H5A_dense_bt2_name_rec_t *bt2_rec   = (const H5A_dense_bt2_name_rec_t *)_bt2_rec;
+    herr_t                          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -260,38 +247,38 @@ H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int
     HDassert(bt2_rec);
 
     /* Check hash value */
-    if(bt2_udata->name_hash < bt2_rec->hash)
+    if (bt2_udata->name_hash < bt2_rec->hash)
         *result = (-1);
-    else if(bt2_udata->name_hash > bt2_rec->hash)
+    else if (bt2_udata->name_hash > bt2_rec->hash)
         *result = 1;
     else {
-        H5A_fh_ud_cmp_t fh_udata;       /* User data for fractal heap 'op' callback */
-        H5HF_t *fheap;                  /* Fractal heap handle to use for finding object */
+        H5A_fh_ud_cmp_t fh_udata; /* User data for fractal heap 'op' callback */
+        H5HF_t *        fheap;    /* Fractal heap handle to use for finding object */
 
         /* Sanity check */
         HDassert(bt2_udata->name_hash == bt2_rec->hash);
 
         /* Prepare user data for callback */
         /* down */
-        fh_udata.f = bt2_udata->f;
-        fh_udata.dxpl_id = bt2_udata->dxpl_id;
-        fh_udata.name = bt2_udata->name;
-        fh_udata.record = bt2_rec;
-        fh_udata.found_op = bt2_udata->found_op;
+        fh_udata.f             = bt2_udata->f;
+        fh_udata.dxpl_id       = bt2_udata->dxpl_id;
+        fh_udata.name          = bt2_udata->name;
+        fh_udata.record        = bt2_rec;
+        fh_udata.found_op      = bt2_udata->found_op;
         fh_udata.found_op_data = bt2_udata->found_op_data;
 
         /* up */
         fh_udata.cmp = 0;
 
         /* Check for attribute in shared storage */
-        if(bt2_rec->flags & H5O_MSG_FLAG_SHARED)
+        if (bt2_rec->flags & H5O_MSG_FLAG_SHARED)
             fheap = bt2_udata->shared_fheap;
         else
             fheap = bt2_udata->fheap;
         HDassert(fheap);
 
         /* Check if the user's attribute and the B-tree's attribute have the same name */
-        if(H5HF_op(fheap, bt2_udata->dxpl_id, &bt2_rec->id, H5A_dense_fh_name_cmp, &fh_udata) < 0)
+        if (H5HF_op(fheap, bt2_udata->dxpl_id, &bt2_rec->id, H5A_dense_fh_name_cmp, &fh_udata) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
 
         /* Callback will set comparison value */
@@ -302,7 +289,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_dense_btree2_name_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_encode
  *
@@ -333,7 +319,6 @@ H5A_dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR_UN
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_name_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_decode
  *
@@ -364,7 +349,6 @@ H5A_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_UN
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_name_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_debug
  *
@@ -380,20 +364,19 @@ H5A_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_UN
  */
 static herr_t
 H5A_dense_btree2_name_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
+                            int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5A_dense_bt2_name_rec_t *nrecord = (const H5A_dense_bt2_name_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u, %08lx}\n", indent, "", fwidth,
-        "Record:",
-        (hsize_t)nrecord->id.val, (unsigned)nrecord->flags, (unsigned)nrecord->corder, (unsigned long)nrecord->hash);
+              "Record:", (hsize_t)nrecord->id.val, (unsigned)nrecord->flags, (unsigned)nrecord->corder,
+              (unsigned long)nrecord->hash);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_name_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_store
  *
@@ -410,20 +393,19 @@ H5A_dense_btree2_name_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H
 static herr_t
 H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata)
 {
-    const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata;
+    const H5A_bt2_ud_ins_t *    udata   = (const H5A_bt2_ud_ins_t *)_udata;
     H5A_dense_bt2_corder_rec_t *nrecord = (H5A_dense_bt2_corder_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Copy user information info native record */
-    nrecord->id = udata->id;
-    nrecord->flags = udata->common.flags;
+    nrecord->id     = udata->id;
+    nrecord->flags  = udata->common.flags;
     nrecord->corder = udata->common.corder;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_compare
  *
@@ -441,8 +423,8 @@ H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata)
 static herr_t
 H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, int *result)
 {
-    const H5A_bt2_ud_common_t *bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata;
-    const H5A_dense_bt2_corder_rec_t *bt2_rec = (const H5A_dense_bt2_corder_rec_t *)_bt2_rec;
+    const H5A_bt2_ud_common_t *       bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata;
+    const H5A_dense_bt2_corder_rec_t *bt2_rec   = (const H5A_dense_bt2_corder_rec_t *)_bt2_rec;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -451,9 +433,9 @@ H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, in
     HDassert(bt2_rec);
 
     /* Check creation order value */
-    if(bt2_udata->corder < bt2_rec->corder)
+    if (bt2_udata->corder < bt2_rec->corder)
         *result = -1;
-    else if(bt2_udata->corder > bt2_rec->corder)
+    else if (bt2_udata->corder > bt2_rec->corder)
         *result = 1;
     else
         *result = 0;
@@ -461,7 +443,6 @@ H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, in
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_encode
  *
@@ -491,7 +472,6 @@ H5A_dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_decode
  *
@@ -521,7 +501,6 @@ H5A_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_debug
  *
@@ -537,16 +516,14 @@ H5A_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_
  */
 static herr_t
 H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
+                              int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5A_dense_bt2_corder_rec_t *nrecord = (const H5A_dense_bt2_corder_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u}\n", indent, "", fwidth,
-        "Record:",
-        (hsize_t)nrecord->id.val, (unsigned)nrecord->flags, (unsigned)nrecord->corder);
+    HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u}\n", indent, "", fwidth, "Record:", (hsize_t)nrecord->id.val,
+              (unsigned)nrecord->flags, (unsigned)nrecord->corder);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_debug() */
-
diff --git a/src/H5Adense.c b/src/H5Adense.c
index a0e7ea0..8e6d0e9 100644
--- a/src/H5Adense.c
+++ b/src/H5Adense.c
@@ -27,39 +27,36 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg  */
-
+#define H5A_PACKAGE /*suppress error about including H5Apkg  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"		/* Object headers			*/
-#include "H5SMprivate.h"	/* Shared object header messages        */
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes	  			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5SMprivate.h" /* Shared object header messages        */
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* v2 B-tree creation macros for 'name' field index */
-#define H5A_NAME_BT2_NODE_SIZE          512
-#define H5A_NAME_BT2_MERGE_PERC         40
-#define H5A_NAME_BT2_SPLIT_PERC         100
+#define H5A_NAME_BT2_NODE_SIZE  512
+#define H5A_NAME_BT2_MERGE_PERC 40
+#define H5A_NAME_BT2_SPLIT_PERC 100
 
 /* v2 B-tree creation macros for 'corder' field index */
-#define H5A_CORDER_BT2_NODE_SIZE        512
-#define H5A_CORDER_BT2_MERGE_PERC       40
-#define H5A_CORDER_BT2_SPLIT_PERC       100
+#define H5A_CORDER_BT2_NODE_SIZE  512
+#define H5A_CORDER_BT2_MERGE_PERC 40
+#define H5A_CORDER_BT2_SPLIT_PERC 100
 
 /* Size of stack buffer for serialized attributes */
-#define H5A_ATTR_BUF_SIZE               128
-
+#define H5A_ATTR_BUF_SIZE 128
 
 /******************/
 /* Local Typedefs */
@@ -71,12 +68,12 @@
  */
 typedef struct H5A_bt2_od_wrt_t {
     /* downward */
-    H5F_t  *f;                  /* Pointer to file that fractal heap is in */
-    hid_t dxpl_id;              /* DXPL for operation */
-    H5HF_t *fheap;              /* Fractal heap handle to operate on */
-    H5HF_t *shared_fheap;       /* Fractal heap handle for shared messages */
-    H5A_t  *attr;               /* Attribute to write */
-    haddr_t corder_bt2_addr;    /* v2 B-tree address of creation order index */
+    H5F_t * f;               /* Pointer to file that fractal heap is in */
+    hid_t   dxpl_id;         /* DXPL for operation */
+    H5HF_t *fheap;           /* Fractal heap handle to operate on */
+    H5HF_t *shared_fheap;    /* Fractal heap handle for shared messages */
+    H5A_t * attr;            /* Attribute to write */
+    haddr_t corder_bt2_addr; /* v2 B-tree address of creation order index */
 } H5A_bt2_od_wrt_t;
 
 /*
@@ -85,20 +82,20 @@ typedef struct H5A_bt2_od_wrt_t {
  */
 typedef struct {
     /* downward (internal) */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    H5HF_t      *fheap;                 /* Fractal heap handle               */
-    H5HF_t      *shared_fheap;          /* Fractal heap handle for shared messages */
-    hsize_t     count;                  /* # of attributes examined          */
+    H5F_t * f;            /* Pointer to file that fractal heap is in */
+    hid_t   dxpl_id;      /* DXPL for operation                */
+    H5HF_t *fheap;        /* Fractal heap handle               */
+    H5HF_t *shared_fheap; /* Fractal heap handle for shared messages */
+    hsize_t count;        /* # of attributes examined          */
 
     /* downward (from application) */
-    hid_t       loc_id;                 /* Object ID for application callback */
-    hsize_t     skip;                   /* Number of attributes to skip      */
-    const H5A_attr_iter_op_t *attr_op;  /* Callback for each attribute       */
-    void        *op_data;               /* Callback data for each attribute  */
+    hid_t                     loc_id;  /* Object ID for application callback */
+    hsize_t                   skip;    /* Number of attributes to skip      */
+    const H5A_attr_iter_op_t *attr_op; /* Callback for each attribute       */
+    void *                    op_data; /* Callback data for each attribute  */
 
     /* upward */
-    int         op_ret;                 /* Return value from callback        */
+    int op_ret; /* Return value from callback        */
 } H5A_bt2_ud_it_t;
 
 /*
@@ -108,12 +105,12 @@ typedef struct {
  */
 typedef struct {
     /* downward (internal) */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    const H5A_dense_bt2_name_rec_t *record;     /* v2 B-tree record for attribute */
+    H5F_t *                         f;       /* Pointer to file that fractal heap is in */
+    hid_t                           dxpl_id; /* DXPL for operation                */
+    const H5A_dense_bt2_name_rec_t *record;  /* v2 B-tree record for attribute */
 
     /* upward */
-    H5A_t  *attr;                       /* Copy of attribute                 */
+    H5A_t *attr; /* Copy of attribute                 */
 } H5A_fh_ud_cp_t;
 
 /*
@@ -122,8 +119,8 @@ typedef struct {
  */
 typedef struct H5A_bt2_ud_rm_t {
     /* downward */
-    H5A_bt2_ud_common_t common;         /* Common info for B-tree user data (must be first) */
-    haddr_t corder_bt2_addr;            /* v2 B-tree address of creation order index */
+    H5A_bt2_ud_common_t common;          /* Common info for B-tree user data (must be first) */
+    haddr_t             corder_bt2_addr; /* v2 B-tree address of creation order index */
 } H5A_bt2_ud_rm_t;
 
 /*
@@ -132,41 +129,34 @@ typedef struct H5A_bt2_ud_rm_t {
  */
 typedef struct H5A_bt2_ud_rmbi_t {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    H5HF_t      *fheap;                 /* Fractal heap handle               */
-    H5HF_t      *shared_fheap;          /* Fractal heap handle for shared messages */
-    H5_index_t  idx_type;               /* Index type for operation */
-    haddr_t     other_bt2_addr;         /* v2 B-tree address of "other" index */
+    H5F_t *    f;              /* Pointer to file that fractal heap is in */
+    hid_t      dxpl_id;        /* DXPL for operation                */
+    H5HF_t *   fheap;          /* Fractal heap handle               */
+    H5HF_t *   shared_fheap;   /* Fractal heap handle for shared messages */
+    H5_index_t idx_type;       /* Index type for operation */
+    haddr_t    other_bt2_addr; /* v2 B-tree address of "other" index */
 } H5A_bt2_ud_rmbi_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_create
  *
@@ -185,10 +175,10 @@ H5A_dense_create(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo)
 {
     H5HF_create_t fheap_cparam;         /* Fractal heap creation parameters */
     H5B2_create_t bt2_cparam;           /* v2 B-tree creation parameters */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for names */
-    H5B2_t *bt2_corder = NULL;          /* v2 B-tree handle for creation order */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_t *      fheap      = NULL;    /* Fractal heap handle */
+    H5B2_t *      bt2_name   = NULL;    /* v2 B-tree handle for names */
+    H5B2_t *      bt2_corder = NULL;    /* v2 B-tree handle for creation order */
+    herr_t        ret_value  = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -197,96 +187,95 @@ H5A_dense_create(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo)
     HDassert(ainfo);
 
     /* Set fractal heap creation parameters */
-/* XXX: Give some control of these to applications? */
+    /* XXX: Give some control of these to applications? */
     HDmemset(&fheap_cparam, 0, sizeof(fheap_cparam));
-    fheap_cparam.managed.width = H5O_FHEAP_MAN_WIDTH;
+    fheap_cparam.managed.width            = H5O_FHEAP_MAN_WIDTH;
     fheap_cparam.managed.start_block_size = H5O_FHEAP_MAN_START_BLOCK_SIZE;
-    fheap_cparam.managed.max_direct_size = H5O_FHEAP_MAN_MAX_DIRECT_SIZE;
-    fheap_cparam.managed.max_index = H5O_FHEAP_MAN_MAX_INDEX;
-    fheap_cparam.managed.start_root_rows = H5O_FHEAP_MAN_START_ROOT_ROWS;
-    fheap_cparam.checksum_dblocks = H5O_FHEAP_CHECKSUM_DBLOCKS;
-    fheap_cparam.max_man_size = H5O_FHEAP_MAX_MAN_SIZE;
+    fheap_cparam.managed.max_direct_size  = H5O_FHEAP_MAN_MAX_DIRECT_SIZE;
+    fheap_cparam.managed.max_index        = H5O_FHEAP_MAN_MAX_INDEX;
+    fheap_cparam.managed.start_root_rows  = H5O_FHEAP_MAN_START_ROOT_ROWS;
+    fheap_cparam.checksum_dblocks         = H5O_FHEAP_CHECKSUM_DBLOCKS;
+    fheap_cparam.max_man_size             = H5O_FHEAP_MAX_MAN_SIZE;
 
     /* Create fractal heap for storing attributes */
-    if(NULL == (fheap = H5HF_create(f, dxpl_id, &fheap_cparam)))
+    if (NULL == (fheap = H5HF_create(f, dxpl_id, &fheap_cparam)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create fractal heap")
 
     /* Retrieve the heap's address in the file */
-    if(H5HF_get_heap_addr(fheap, &ainfo->fheap_addr) < 0)
+    if (H5HF_get_heap_addr(fheap, &ainfo->fheap_addr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get fractal heap address")
 #ifdef QAK
-HDfprintf(stderr, "%s: ainfo->fheap_addr = %a\n", FUNC, ainfo->fheap_addr);
+    HDfprintf(stderr, "%s: ainfo->fheap_addr = %a\n", FUNC, ainfo->fheap_addr);
 #endif /* QAK */
 
 #ifndef NDEBUG
-{
-    size_t fheap_id_len;                /* Fractal heap ID length */
+    {
+        size_t fheap_id_len; /* Fractal heap ID length */
 
-    /* Retrieve the heap's ID length in the file */
-    if(H5HF_get_id_len(fheap, &fheap_id_len) < 0)
-        HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get fractal heap ID length")
-    HDassert(fheap_id_len == H5O_FHEAP_ID_LEN);
+        /* Retrieve the heap's ID length in the file */
+        if (H5HF_get_id_len(fheap, &fheap_id_len) < 0)
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get fractal heap ID length")
+        HDassert(fheap_id_len == H5O_FHEAP_ID_LEN);
 #ifdef QAK
-HDfprintf(stderr, "%s: fheap_id_len = %Zu\n", FUNC, fheap_id_len);
+        HDfprintf(stderr, "%s: fheap_id_len = %Zu\n", FUNC, fheap_id_len);
 #endif /* QAK */
-}
+    }
 #endif /* NDEBUG */
 
     /* Create the name index v2 B-tree */
     HDmemset(&bt2_cparam, 0, sizeof(bt2_cparam));
-    bt2_cparam.cls = H5A_BT2_NAME;
+    bt2_cparam.cls       = H5A_BT2_NAME;
     bt2_cparam.node_size = (size_t)H5A_NAME_BT2_NODE_SIZE;
-    bt2_cparam.rrec_size = 4 +          /* Name's hash value */
-            4 +                         /* Creation order index */
-            1 +                         /* Message flags */
-            H5O_FHEAP_ID_LEN;           /* Fractal heap ID */
+    bt2_cparam.rrec_size = 4 +               /* Name's hash value */
+                           4 +               /* Creation order index */
+                           1 +               /* Message flags */
+                           H5O_FHEAP_ID_LEN; /* Fractal heap ID */
     bt2_cparam.split_percent = H5A_NAME_BT2_SPLIT_PERC;
     bt2_cparam.merge_percent = H5A_NAME_BT2_MERGE_PERC;
-    if(NULL == (bt2_name = H5B2_create(f, dxpl_id, &bt2_cparam, NULL)))
+    if (NULL == (bt2_name = H5B2_create(f, dxpl_id, &bt2_cparam, NULL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create v2 B-tree for name index")
 
     /* Retrieve the v2 B-tree's address in the file */
-    if(H5B2_get_addr(bt2_name, &ainfo->name_bt2_addr) < 0)
+    if (H5B2_get_addr(bt2_name, &ainfo->name_bt2_addr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get v2 B-tree address for name index")
 #ifdef QAK
-HDfprintf(stderr, "%s: ainfo->name_bt2_addr = %a\n", FUNC, ainfo->name_bt2_addr);
+    HDfprintf(stderr, "%s: ainfo->name_bt2_addr = %a\n", FUNC, ainfo->name_bt2_addr);
 #endif /* QAK */
 
     /* Check if we should create a creation order index v2 B-tree */
-    if(ainfo->index_corder) {
+    if (ainfo->index_corder) {
         /* Create the creation order index v2 B-tree */
         HDmemset(&bt2_cparam, 0, sizeof(bt2_cparam));
-        bt2_cparam.cls = H5A_BT2_CORDER;
+        bt2_cparam.cls       = H5A_BT2_CORDER;
         bt2_cparam.node_size = (size_t)H5A_CORDER_BT2_NODE_SIZE;
-        bt2_cparam.rrec_size = 4 +      /* Creation order index */
-                1 +                     /* Message flags */
-                H5O_FHEAP_ID_LEN;       /* Fractal heap ID */
+        bt2_cparam.rrec_size = 4 +               /* Creation order index */
+                               1 +               /* Message flags */
+                               H5O_FHEAP_ID_LEN; /* Fractal heap ID */
         bt2_cparam.split_percent = H5A_CORDER_BT2_SPLIT_PERC;
         bt2_cparam.merge_percent = H5A_CORDER_BT2_MERGE_PERC;
-        if(NULL == (bt2_corder = H5B2_create(f, dxpl_id, &bt2_cparam, NULL)))
+        if (NULL == (bt2_corder = H5B2_create(f, dxpl_id, &bt2_cparam, NULL)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create v2 B-tree for creation order index")
 
         /* Retrieve the v2 B-tree's address in the file */
-        if(H5B2_get_addr(bt2_corder, &ainfo->corder_bt2_addr) < 0)
+        if (H5B2_get_addr(bt2_corder, &ainfo->corder_bt2_addr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get v2 B-tree address for creation order index")
 #ifdef QAK
-HDfprintf(stderr, "%s: ainfo->corder_bt2_addr = %a\n", FUNC, ainfo->corder_bt2_addr);
+        HDfprintf(stderr, "%s: ainfo->corder_bt2_addr = %a\n", FUNC, ainfo->corder_bt2_addr);
 #endif /* QAK */
-    } /* end if */
+    }  /* end if */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A__dense_fnd_cb
  *
@@ -314,13 +303,12 @@ H5A__dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr)
     HDassert(user_attr);
 
     /* Take over attribute ownership */
-    *user_attr = attr;
+    *user_attr      = attr;
     *took_ownership = TRUE;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5A__dense_fnd_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_open
  *
@@ -337,13 +325,13 @@ H5A__dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr)
 H5A_t *
 H5A_dense_open(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name)
 {
-    H5A_bt2_ud_common_t udata;          /* User data for v2 B-tree modify */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    htri_t attr_sharable;               /* Flag indicating attributes are sharable */
-    htri_t attr_exists;                 /* Attribute exists in v2 B-tree */
-    H5A_t *ret_value = NULL;            /* Return value */
+    H5A_bt2_ud_common_t udata;               /* User data for v2 B-tree modify */
+    H5HF_t *            fheap        = NULL; /* Fractal heap handle */
+    H5HF_t *            shared_fheap = NULL; /* Fractal heap handle for shared header messages */
+    H5B2_t *            bt2_name     = NULL; /* v2 B-tree handle for name index */
+    htri_t              attr_sharable;       /* Flag indicating attributes are sharable */
+    htri_t              attr_exists;         /* Attribute exists in v2 B-tree */
+    H5A_t *             ret_value = NULL;    /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -353,64 +341,63 @@ H5A_dense_open(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *na
     HDassert(name);
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to open fractal heap")
 
     /* Check if attributes are shared in this file */
-    if((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
+    if ((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "can't determine if attributes are shared")
 
     /* Get handle for shared message heap, if attributes are sharable */
-    if(attr_sharable) {
-        haddr_t shared_fheap_addr;      /* Address of fractal heap to use */
+    if (attr_sharable) {
+        haddr_t shared_fheap_addr; /* Address of fractal heap to use */
 
         /* Retrieve the address of the shared message's fractal heap */
-        if(H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
+        if (H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "can't get shared message heap address")
 
         /* Check if there are any shared messages currently */
-        if(H5F_addr_defined(shared_fheap_addr)) {
+        if (H5F_addr_defined(shared_fheap_addr)) {
             /* Open the fractal heap for shared header messages */
-            if(NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
+            if (NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to open fractal heap")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to open v2 B-tree for name index")
 
     /* Create the "udata" information for v2 B-tree record find */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.fheap = fheap;
-    udata.shared_fheap = shared_fheap;
-    udata.name = name;
-    udata.name_hash = H5_checksum_lookup3(name, HDstrlen(name), 0);
-    udata.flags = 0;
-    udata.corder = 0;
-    udata.found_op = H5A__dense_fnd_cb;       /* v2 B-tree comparison callback */
+    udata.f             = f;
+    udata.dxpl_id       = dxpl_id;
+    udata.fheap         = fheap;
+    udata.shared_fheap  = shared_fheap;
+    udata.name          = name;
+    udata.name_hash     = H5_checksum_lookup3(name, HDstrlen(name), 0);
+    udata.flags         = 0;
+    udata.corder        = 0;
+    udata.found_op      = H5A__dense_fnd_cb; /* v2 B-tree comparison callback */
     udata.found_op_data = &ret_value;
 
     /* Find & copy the attribute in the 'name' index */
-    if((attr_exists = H5B2_find(bt2_name, dxpl_id, &udata, NULL, NULL)) < 0)
+    if ((attr_exists = H5B2_find(bt2_name, dxpl_id, &udata, NULL, NULL)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, NULL, "can't search for attribute in name index")
-    else if(attr_exists == FALSE)
+    else if (attr_exists == FALSE)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, NULL, "can't locate attribute in name index")
 
 done:
     /* Release resources */
-    if(shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
+    if (shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, NULL, "can't close fractal heap")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, NULL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, NULL, "can't close v2 B-tree for name index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_insert
  *
@@ -427,16 +414,16 @@ done:
 herr_t
 H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
 {
-    H5A_bt2_ud_ins_t udata;             /* User data for v2 B-tree insertion */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle for attributes */
-    H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    H5B2_t *bt2_corder = NULL;          /* v2 B-tree handle for creation order index */
-    H5WB_t *wb = NULL;                  /* Wrapped buffer for attribute data */
-    uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing message */
-    unsigned mesg_flags = 0;            /* Flags for storing message */
-    htri_t attr_sharable;               /* Flag indicating attributes are sharable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_bt2_ud_ins_t udata;                       /* User data for v2 B-tree insertion */
+    H5HF_t *         fheap        = NULL;         /* Fractal heap handle for attributes */
+    H5HF_t *         shared_fheap = NULL;         /* Fractal heap handle for shared header messages */
+    H5B2_t *         bt2_name     = NULL;         /* v2 B-tree handle for name index */
+    H5B2_t *         bt2_corder   = NULL;         /* v2 B-tree handle for creation order index */
+    H5WB_t *         wb           = NULL;         /* Wrapped buffer for attribute data */
+    uint8_t          attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing message */
+    unsigned         mesg_flags = 0;              /* Flags for storing message */
+    htri_t           attr_sharable;               /* Flag indicating attributes are sharable */
+    herr_t           ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -446,23 +433,23 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
     HDassert(attr);
 
     /* Check if attributes are shared in this file */
-    if((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
+    if ((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't determine if attributes are shared")
 
     /* Get handle for shared message heap, if attributes are sharable */
-    if(attr_sharable) {
-        haddr_t shared_fheap_addr;      /* Address of fractal heap to use */
-        htri_t shared_mesg;             /* Should this message be stored in the Shared Message table? */
+    if (attr_sharable) {
+        haddr_t shared_fheap_addr; /* Address of fractal heap to use */
+        htri_t  shared_mesg;       /* Should this message be stored in the Shared Message table? */
 
         /* Check if message is already shared */
-        if((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, attr)) < 0)
+        if ((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, attr)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "error determining if message is shared")
-        else if(shared_mesg > 0)
+        else if (shared_mesg > 0)
             /* Mark the message as shared */
             mesg_flags |= H5O_MSG_FLAG_SHARED;
         else {
             /* Should this attribute be written as a SOHM? */
-            if(H5SM_try_share(f, dxpl_id, NULL, 0, H5O_ATTR_ID, attr, &mesg_flags) < 0)
+            if (H5SM_try_share(f, dxpl_id, NULL, 0, H5O_ATTR_ID, attr, &mesg_flags) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "error determining if message should be shared")
 
             /* Attributes can't be "unique be shareable" yet */
@@ -470,23 +457,23 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
         } /* end else */
 
         /* Retrieve the address of the shared message's fractal heap */
-        if(H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
+        if (H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get shared message heap address")
 
         /* Check if there are any shared messages currently */
-        if(H5F_addr_defined(shared_fheap_addr)) {
+        if (H5F_addr_defined(shared_fheap_addr)) {
             /* Open the fractal heap for shared header messages */
-            if(NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
+            if (NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Check for inserting shared attribute */
-    if(mesg_flags & H5O_MSG_FLAG_SHARED) {
+    if (mesg_flags & H5O_MSG_FLAG_SHARED) {
         /* Sanity check */
         HDassert(attr_sharable);
 
@@ -494,81 +481,80 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
         udata.id = attr->sh_loc.u.heap_id;
     } /* end if */
     else {
-        void *attr_ptr;         /* Pointer to serialized message */
-        size_t attr_size;       /* Size of serialized attribute in the heap */
+        void * attr_ptr;  /* Pointer to serialized message */
+        size_t attr_size; /* Size of serialized attribute in the heap */
 
         /* Find out the size of buffer needed for serialized message */
-        if((attr_size = H5O_msg_raw_size(f, H5O_ATTR_ID, FALSE, attr)) == 0)
+        if ((attr_size = H5O_msg_raw_size(f, H5O_ATTR_ID, FALSE, attr)) == 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get message size")
 
         /* Wrap the local buffer for serialized attributes */
-        if(NULL == (wb = H5WB_wrap(attr_buf, sizeof(attr_buf))))
+        if (NULL == (wb = H5WB_wrap(attr_buf, sizeof(attr_buf))))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for attribute */
-        if(NULL == (attr_ptr = H5WB_actual(wb, attr_size)))
+        if (NULL == (attr_ptr = H5WB_actual(wb, attr_size)))
             HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Create serialized form of attribute or shared message */
-        if(H5O_msg_encode(f, H5O_ATTR_ID, FALSE, (unsigned char *)attr_ptr, attr) < 0)
+        if (H5O_msg_encode(f, H5O_ATTR_ID, FALSE, (unsigned char *)attr_ptr, attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "can't encode attribute")
 
         /* Insert the serialized attribute into the fractal heap */
         /* (sets the heap ID in the user data) */
-        if(H5HF_insert(fheap, dxpl_id, attr_size, attr_ptr, &udata.id) < 0)
+        if (H5HF_insert(fheap, dxpl_id, attr_size, attr_ptr, &udata.id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to insert attribute into fractal heap")
     } /* end else */
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Create the callback information for v2 B-tree record insertion */
-    udata.common.f = f;
-    udata.common.dxpl_id = dxpl_id;
-    udata.common.fheap = fheap;
+    udata.common.f            = f;
+    udata.common.dxpl_id      = dxpl_id;
+    udata.common.fheap        = fheap;
     udata.common.shared_fheap = shared_fheap;
-    udata.common.name = attr->shared->name;
-    udata.common.name_hash = H5_checksum_lookup3(attr->shared->name, HDstrlen(attr->shared->name), 0);
+    udata.common.name         = attr->shared->name;
+    udata.common.name_hash    = H5_checksum_lookup3(attr->shared->name, HDstrlen(attr->shared->name), 0);
     H5_CHECKED_ASSIGN(udata.common.flags, uint8_t, mesg_flags, unsigned);
-    udata.common.corder = attr->shared->crt_idx;
-    udata.common.found_op = NULL;
+    udata.common.corder        = attr->shared->crt_idx;
+    udata.common.found_op      = NULL;
     udata.common.found_op_data = NULL;
     /* udata.id already set */
 
     /* Insert attribute into 'name' tracking v2 B-tree */
-    if(H5B2_insert(bt2_name, dxpl_id, &udata) < 0)
+    if (H5B2_insert(bt2_name, dxpl_id, &udata) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to insert record into v2 B-tree")
 
     /* Check if we should create a creation order index v2 B-tree record */
-    if(ainfo->index_corder) {
+    if (ainfo->index_corder) {
         /* Open the creation order index v2 B-tree */
         HDassert(H5F_addr_defined(ainfo->corder_bt2_addr));
-        if(NULL == (bt2_corder = H5B2_open(f, dxpl_id, ainfo->corder_bt2_addr, NULL)))
+        if (NULL == (bt2_corder = H5B2_open(f, dxpl_id, ainfo->corder_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
 
         /* Insert the record into the creation order index v2 B-tree */
-        if(H5B2_insert(bt2_corder, dxpl_id, &udata) < 0)
+        if (H5B2_insert(bt2_corder, dxpl_id, &udata) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to insert record into v2 B-tree")
     } /* end if */
 
 done:
     /* Release resources */
-    if(shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
+    if (shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A__dense_write_bt2_cb2
  *
@@ -586,7 +572,7 @@ static herr_t
 H5A__dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed)
 {
     H5A_dense_bt2_corder_rec_t *record = (H5A_dense_bt2_corder_rec_t *)_record; /* Record from B-tree */
-    H5O_fheap_id_t *new_heap_id = (H5O_fheap_id_t *)_op_data;       /* "op data" from v2 B-tree modify */
+    H5O_fheap_id_t *new_heap_id        = (H5O_fheap_id_t *)_op_data; /* "op data" from v2 B-tree modify */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -603,7 +589,6 @@ H5A__dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5A__dense_write_bt2_cb2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A__dense_write_bt2_cb
  *
@@ -619,12 +604,12 @@ H5A__dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed)
 static herr_t
 H5A__dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
 {
-    H5A_dense_bt2_name_rec_t *record = (H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */
-    H5A_bt2_od_wrt_t *op_data = (H5A_bt2_od_wrt_t *)_op_data;       /* "op data" from v2 B-tree modify */
-    H5B2_t *bt2_corder = NULL;          /* v2 B-tree handle for creation order index */
-    H5WB_t *wb = NULL;                  /* Wrapped buffer for attribute data */
-    uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing attribute */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_dense_bt2_name_rec_t *record     = (H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */
+    H5A_bt2_od_wrt_t *        op_data    = (H5A_bt2_od_wrt_t *)_op_data; /* "op data" from v2 B-tree modify */
+    H5B2_t *                  bt2_corder = NULL;           /* v2 B-tree handle for creation order index */
+    H5WB_t *                  wb         = NULL;           /* Wrapped buffer for attribute data */
+    uint8_t                   attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing attribute */
+    herr_t                    ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -633,36 +618,39 @@ H5A__dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
     HDassert(op_data);
 
     /* Check for modifying shared attribute */
-    if(record->flags & H5O_MSG_FLAG_SHARED) {
+    if (record->flags & H5O_MSG_FLAG_SHARED) {
         /* Update the shared attribute in the SOHM info */
-        if(H5O_attr_update_shared(op_data->f, op_data->dxpl_id, NULL, op_data->attr, NULL) < 0)
+        if (H5O_attr_update_shared(op_data->f, op_data->dxpl_id, NULL, op_data->attr, NULL) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update attribute in shared storage")
 
         /* Update record's heap ID */
         record->id = op_data->attr->sh_loc.u.heap_id;
 
         /* Check if we need to modify the creation order index with new heap ID */
-        if(H5F_addr_defined(op_data->corder_bt2_addr)) {
-            H5A_bt2_ud_common_t udata;          /* User data for v2 B-tree modify */
+        if (H5F_addr_defined(op_data->corder_bt2_addr)) {
+            H5A_bt2_ud_common_t udata; /* User data for v2 B-tree modify */
 
             /* Open the creation order index v2 B-tree */
-            if(NULL == (bt2_corder = H5B2_open(op_data->f, op_data->dxpl_id, op_data->corder_bt2_addr, NULL)))
-                HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
+            if (NULL ==
+                (bt2_corder = H5B2_open(op_data->f, op_data->dxpl_id, op_data->corder_bt2_addr, NULL)))
+                HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL,
+                            "unable to open v2 B-tree for creation order index")
 
             /* Create the "udata" information for v2 B-tree record modify */
-            udata.f = op_data->f;
-            udata.dxpl_id = op_data->dxpl_id;
-            udata.fheap = NULL;
-            udata.shared_fheap = NULL;
-            udata.name = NULL;
-            udata.name_hash = 0;
-            udata.flags = 0;
-            udata.corder = op_data->attr->shared->crt_idx;
-            udata.found_op = NULL;
+            udata.f             = op_data->f;
+            udata.dxpl_id       = op_data->dxpl_id;
+            udata.fheap         = NULL;
+            udata.shared_fheap  = NULL;
+            udata.name          = NULL;
+            udata.name_hash     = 0;
+            udata.flags         = 0;
+            udata.corder        = op_data->attr->shared->crt_idx;
+            udata.found_op      = NULL;
             udata.found_op_data = NULL;
 
             /* Modify record for creation order index */
-            if(H5B2_modify(bt2_corder, op_data->dxpl_id, &udata, H5A__dense_write_bt2_cb2, &op_data->attr->sh_loc.u.heap_id) < 0)
+            if (H5B2_modify(bt2_corder, op_data->dxpl_id, &udata, H5A__dense_write_bt2_cb2,
+                            &op_data->attr->sh_loc.u.heap_id) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to modify record in v2 B-tree")
         } /* end if */
 
@@ -670,52 +658,51 @@ H5A__dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
         *changed = TRUE;
     } /* end if */
     else {
-        void *attr_ptr;         /* Pointer to serialized message */
-        size_t attr_size;       /* Size of serialized attribute in the heap */
+        void * attr_ptr;  /* Pointer to serialized message */
+        size_t attr_size; /* Size of serialized attribute in the heap */
 
         /* Find out the size of buffer needed for serialized attribute */
-        if((attr_size = H5O_msg_raw_size(op_data->f, H5O_ATTR_ID, FALSE, op_data->attr)) == 0)
+        if ((attr_size = H5O_msg_raw_size(op_data->f, H5O_ATTR_ID, FALSE, op_data->attr)) == 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get attribute size")
 
         /* Wrap the local buffer for serialized attributes */
-        if(NULL == (wb = H5WB_wrap(attr_buf, sizeof(attr_buf))))
+        if (NULL == (wb = H5WB_wrap(attr_buf, sizeof(attr_buf))))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for attribute */
-        if(NULL == (attr_ptr = H5WB_actual(wb, attr_size)))
+        if (NULL == (attr_ptr = H5WB_actual(wb, attr_size)))
             HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Create serialized form of attribute */
-        if(H5O_msg_encode(op_data->f, H5O_ATTR_ID, FALSE, (unsigned char *)attr_ptr, op_data->attr) < 0)
+        if (H5O_msg_encode(op_data->f, H5O_ATTR_ID, FALSE, (unsigned char *)attr_ptr, op_data->attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "can't encode attribute")
 
 /* Sanity check */
 #ifndef NDEBUG
-{
-    size_t obj_len;             /* Length of existing encoded attribute */
+        {
+            size_t obj_len; /* Length of existing encoded attribute */
 
-    if(H5HF_get_obj_len(op_data->fheap, op_data->dxpl_id, &record->id, &obj_len) < 0)
-        HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get object size")
-    HDassert(obj_len == attr_size);
-}
+            if (H5HF_get_obj_len(op_data->fheap, op_data->dxpl_id, &record->id, &obj_len) < 0)
+                HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get object size")
+            HDassert(obj_len == attr_size);
+        }
 #endif /* NDEBUG */
         /* Update existing attribute in heap */
         /* (might be more efficient as fractal heap 'op' callback, but leave that for later -QAK) */
-        if(H5HF_write(op_data->fheap, op_data->dxpl_id, &record->id, changed, attr_ptr) < 0)
+        if (H5HF_write(op_data->fheap, op_data->dxpl_id, &record->id, changed, attr_ptr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update attribute in heap")
     } /* end else */
 
 done:
     /* Release resources */
-    if(bt2_corder && H5B2_close(bt2_corder, op_data->dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, op_data->dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__dense_write_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_write
  *
@@ -732,13 +719,13 @@ done:
 herr_t
 H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
 {
-    H5A_bt2_ud_common_t udata;          /* User data for v2 B-tree modify */
-    H5A_bt2_od_wrt_t op_data;           /* "Op data" for v2 B-tree modify */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    htri_t attr_sharable;               /* Flag indicating attributes are sharable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_bt2_ud_common_t udata;               /* User data for v2 B-tree modify */
+    H5A_bt2_od_wrt_t    op_data;             /* "Op data" for v2 B-tree modify */
+    H5HF_t *            fheap        = NULL; /* Fractal heap handle */
+    H5HF_t *            shared_fheap = NULL; /* Fractal heap handle for shared header messages */
+    H5B2_t *            bt2_name     = NULL; /* v2 B-tree handle for name index */
+    htri_t              attr_sharable;       /* Flag indicating attributes are sharable */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -750,70 +737,69 @@ H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
     HDassert(attr);
 
     /* Check if attributes are shared in this file */
-    if((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
+    if ((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't determine if attributes are shared")
 
     /* Get handle for shared message heap, if attributes are sharable */
-    if(attr_sharable) {
-        haddr_t shared_fheap_addr;      /* Address of fractal heap to use */
+    if (attr_sharable) {
+        haddr_t shared_fheap_addr; /* Address of fractal heap to use */
 
         /* Retrieve the address of the shared message's fractal heap */
-        if(H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
+        if (H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get shared message heap address")
 
         /* Check if there are any shared messages currently */
-        if(H5F_addr_defined(shared_fheap_addr)) {
+        if (H5F_addr_defined(shared_fheap_addr)) {
             /* Open the fractal heap for shared header messages */
-            if(NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
+            if (NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Create the "udata" information for v2 B-tree record modify */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.fheap = fheap;
-    udata.shared_fheap = shared_fheap;
-    udata.name = attr->shared->name;
-    udata.name_hash = H5_checksum_lookup3(attr->shared->name, HDstrlen(attr->shared->name), 0);
-    udata.flags = 0;
-    udata.corder = 0;
-    udata.found_op = NULL;
+    udata.f             = f;
+    udata.dxpl_id       = dxpl_id;
+    udata.fheap         = fheap;
+    udata.shared_fheap  = shared_fheap;
+    udata.name          = attr->shared->name;
+    udata.name_hash     = H5_checksum_lookup3(attr->shared->name, HDstrlen(attr->shared->name), 0);
+    udata.flags         = 0;
+    udata.corder        = 0;
+    udata.found_op      = NULL;
     udata.found_op_data = NULL;
 
     /* Create the "op_data" for the v2 B-tree record 'modify' callback */
-    op_data.f = f;
-    op_data.dxpl_id = dxpl_id;
-    op_data.fheap = fheap;
-    op_data.shared_fheap = shared_fheap;
-    op_data.attr = attr;
+    op_data.f               = f;
+    op_data.dxpl_id         = dxpl_id;
+    op_data.fheap           = fheap;
+    op_data.shared_fheap    = shared_fheap;
+    op_data.attr            = attr;
     op_data.corder_bt2_addr = ainfo->corder_bt2_addr;
 
     /* Modify attribute through 'name' tracking v2 B-tree */
-    if(H5B2_modify(bt2_name, dxpl_id, &udata, H5A__dense_write_bt2_cb, &op_data) < 0)
+    if (H5B2_modify(bt2_name, dxpl_id, &udata, H5A__dense_write_bt2_cb, &op_data) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to modify record in v2 B-tree")
 
 done:
     /* Release resources */
-    if(shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
+    if (shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A__dense_copy_fh_cb
  *
@@ -831,8 +817,8 @@ done:
 static herr_t
 H5A__dense_copy_fh_cb(const void *obj, size_t obj_len, void *_udata)
 {
-    H5A_fh_ud_cp_t *udata = (H5A_fh_ud_cp_t *)_udata;       /* User data for fractal heap 'op' callback */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5A_fh_ud_cp_t *udata     = (H5A_fh_ud_cp_t *)_udata; /* User data for fractal heap 'op' callback */
+    herr_t          ret_value = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -843,21 +829,21 @@ H5A__dense_copy_fh_cb(const void *obj, size_t obj_len, void *_udata)
      *  HDF5 routine, it could attempt to re-protect that direct block for the
      *  heap, causing the HDF5 routine called to fail)
      */
-    if(NULL == (udata->attr = (H5A_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_ATTR_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (udata->attr = (H5A_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_ATTR_ID, obj_len,
+                                                       (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDECODE, FAIL, "can't decode attribute")
 
     /* Set the creation order index for the attribute */
     udata->attr->shared->crt_idx = udata->record->corder;
 
     /* Check whether we should "reconstitute" the shared message info */
-    if(udata->record->flags & H5O_MSG_FLAG_SHARED)
+    if (udata->record->flags & H5O_MSG_FLAG_SHARED)
         H5SM_reconstitute(&(udata->attr->sh_loc), udata->f, H5O_ATTR_ID, udata->record->id);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__dense_copy_fh_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_rename
  *
@@ -873,18 +859,18 @@ done:
  */
 herr_t
 H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *old_name,
-    const char *new_name)
+                 const char *new_name)
 {
-    H5A_bt2_ud_common_t udata;          /* User data for v2 B-tree modify */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    H5B2_t *bt2_corder = NULL;          /* v2 B-tree handle for creation order ndex */
-    H5A_t *attr_copy = NULL;            /* Copy of attribute to rename */
-    htri_t attr_sharable;               /* Flag indicating attributes are sharable */
-    htri_t shared_mesg;                 /* Should this message be stored in the Shared Message table? */
-    htri_t attr_exists;                 /* Attribute exists in v2 B-tree */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_bt2_ud_common_t udata;               /* User data for v2 B-tree modify */
+    H5HF_t *            fheap        = NULL; /* Fractal heap handle */
+    H5HF_t *            shared_fheap = NULL; /* Fractal heap handle for shared header messages */
+    H5B2_t *            bt2_name     = NULL; /* v2 B-tree handle for name index */
+    H5B2_t *            bt2_corder   = NULL; /* v2 B-tree handle for creation order ndex */
+    H5A_t *             attr_copy    = NULL; /* Copy of attribute to rename */
+    htri_t              attr_sharable;       /* Flag indicating attributes are sharable */
+    htri_t              shared_mesg;         /* Should this message be stored in the Shared Message table? */
+    htri_t              attr_exists;         /* Attribute exists in v2 B-tree */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -895,56 +881,56 @@ H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
     HDassert(new_name);
 
     /* Check if attributes are shared in this file */
-    if((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
+    if ((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't determine if attributes are shared")
 
     /* Get handle for shared message heap, if attributes are sharable */
-    if(attr_sharable) {
-        haddr_t shared_fheap_addr;      /* Address of fractal heap to use */
+    if (attr_sharable) {
+        haddr_t shared_fheap_addr; /* Address of fractal heap to use */
 
         /* Retrieve the address of the shared message's fractal heap */
-        if(H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
+        if (H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get shared message heap address")
 
         /* Check if there are any shared messages currently */
-        if(H5F_addr_defined(shared_fheap_addr)) {
+        if (H5F_addr_defined(shared_fheap_addr)) {
             /* Open the fractal heap for shared header messages */
-            if(NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
+            if (NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Create the "udata" information for v2 B-tree record modify */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.fheap = fheap;
-    udata.shared_fheap = shared_fheap;
-    udata.name = old_name;
-    udata.name_hash = H5_checksum_lookup3(old_name, HDstrlen(old_name), 0);
-    udata.flags = 0;
-    udata.corder = 0;
-    udata.found_op = H5A__dense_fnd_cb;       /* v2 B-tree comparison callback */
+    udata.f             = f;
+    udata.dxpl_id       = dxpl_id;
+    udata.fheap         = fheap;
+    udata.shared_fheap  = shared_fheap;
+    udata.name          = old_name;
+    udata.name_hash     = H5_checksum_lookup3(old_name, HDstrlen(old_name), 0);
+    udata.flags         = 0;
+    udata.corder        = 0;
+    udata.found_op      = H5A__dense_fnd_cb; /* v2 B-tree comparison callback */
     udata.found_op_data = &attr_copy;
 
     /* Get copy of attribute through 'name' tracking v2 B-tree */
-    if((attr_exists = H5B2_find(bt2_name, dxpl_id, &udata, NULL, NULL)) < 0)
+    if ((attr_exists = H5B2_find(bt2_name, dxpl_id, &udata, NULL, NULL)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "can't search for attribute in name index")
-    else if(attr_exists == FALSE)
+    else if (attr_exists == FALSE)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "can't locate attribute in name index")
     HDassert(attr_copy);
 
     /* Check if message is already shared */
-    if((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, attr_copy)) < 0)
+    if ((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, attr_copy)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "error determining if message is shared")
-    else if(shared_mesg > 0) {
+    else if (shared_mesg > 0) {
         /* Reset shared status of copy */
         /* (so it will get shared again if necessary) */
         attr_copy->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;
@@ -955,47 +941,48 @@ H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
     attr_copy->shared->name = H5MM_xstrdup(new_name);
 
     /* Recompute the version to encode the attribute with */
-    if(H5A_set_version(f, attr_copy) < 0)
+    if (H5A_set_version(f, attr_copy) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTSET, FAIL, "unable to update attribute version")
 
     /* Need to remove the attribute from the creation order index v2 B-tree */
-    if(ainfo->index_corder) {
-        htri_t corder_attr_exists;  /* Attribute exists in v2 B-tree */
+    if (ainfo->index_corder) {
+        htri_t corder_attr_exists; /* Attribute exists in v2 B-tree */
 
         /* Open the creation order index v2 B-tree */
         HDassert(H5F_addr_defined(ainfo->corder_bt2_addr));
-        if(NULL == (bt2_corder = H5B2_open(f, dxpl_id, ainfo->corder_bt2_addr, NULL)))
+        if (NULL == (bt2_corder = H5B2_open(f, dxpl_id, ainfo->corder_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation index")
 
         /* Set up the creation order to search for */
         udata.corder = attr_copy->shared->crt_idx;
 
-        if((corder_attr_exists = H5B2_find(bt2_corder, dxpl_id, &udata, NULL, NULL)) < 0)
+        if ((corder_attr_exists = H5B2_find(bt2_corder, dxpl_id, &udata, NULL, NULL)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "can't search for attribute in name index")
 
-        if(corder_attr_exists) {
+        if (corder_attr_exists) {
             H5A_bt2_ud_rm_t rm_udata;
 
             /* Set up the creation order in user data for the v2 B-tree 'record remove' callback */
             rm_udata.common.corder = attr_copy->shared->crt_idx;
 
             /* Remove the record from the creation order index v2 B-tree */
-            if(H5B2_remove(bt2_corder, dxpl_id, &rm_udata, NULL, NULL) < 0)
-                HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove attribute from creation order index v2 B-tree")
+            if (H5B2_remove(bt2_corder, dxpl_id, &rm_udata, NULL, NULL) < 0)
+                HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL,
+                            "unable to remove attribute from creation order index v2 B-tree")
         }
     }
 
     /* Insert renamed attribute back into dense storage */
     /* (Possibly making it shared) */
-    if(H5A_dense_insert(f, dxpl_id, ainfo, attr_copy) < 0)
+    if (H5A_dense_insert(f, dxpl_id, ainfo, attr_copy) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to add to dense storage")
 
     /* Was this attribute shared? */
-    if((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, attr_copy)) > 0) {
-        hsize_t attr_rc;                /* Attribute's ref count in shared message storage */
+    if ((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, attr_copy)) > 0) {
+        hsize_t attr_rc; /* Attribute's ref count in shared message storage */
 
         /* Retrieve ref count for shared attribute */
-        if(H5SM_get_refcount(f, dxpl_id, H5O_ATTR_ID, &attr_copy->sh_loc, &attr_rc) < 0)
+        if (H5SM_get_refcount(f, dxpl_id, H5O_ATTR_ID, &attr_copy->sh_loc, &attr_rc) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve shared message ref count")
 
         /* If the newly shared attribute needs to share "ownership" of the shared
@@ -1005,42 +992,41 @@ H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
          *
          *      *ick* -QAK, 2007/01/08
          */
-        if(attr_rc == 1) {
+        if (attr_rc == 1) {
             /* Increment reference count on attribute components */
-            if(H5O_attr_link(f, dxpl_id, NULL, attr_copy) < 0)
+            if (H5O_attr_link(f, dxpl_id, NULL, attr_copy) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust attribute link count")
         } /* end if */
-    } /* end if */
-    else if(shared_mesg == 0) {
+    }     /* end if */
+    else if (shared_mesg == 0) {
         /* Increment reference count on attribute components */
         /* (so that they aren't deleted when the attribute is removed shortly) */
-        if(H5O_attr_link(f, dxpl_id, NULL, attr_copy) < 0)
+        if (H5O_attr_link(f, dxpl_id, NULL, attr_copy) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust attribute link count")
     } /* end if */
-    else if(shared_mesg < 0)
-	HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "error determining if message should be shared")
+    else if (shared_mesg < 0)
+        HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "error determining if message should be shared")
 
     /* Delete old attribute from dense storage */
-    if(H5A_dense_remove(f, dxpl_id, ainfo, old_name) < 0)
+    if (H5A_dense_remove(f, dxpl_id, ainfo, old_name) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute in dense storage")
 
 done:
     /* Release resources */
-    if(shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
+    if (shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
-    if(attr_copy)
+    if (attr_copy)
         H5O_msg_free(H5O_ATTR_ID, attr_copy);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_rename() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A__dense_iterate_bt2_cb
  *
@@ -1057,55 +1043,57 @@ done:
 static herr_t
 H5A__dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
 {
-    const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */
-    H5A_bt2_ud_it_t *bt2_udata = (H5A_bt2_ud_it_t *)_bt2_udata;         /* User data for callback */
-    herr_t ret_value = H5_ITER_CONT;         /* Return value */
+    const H5A_dense_bt2_name_rec_t *record =
+        (const H5A_dense_bt2_name_rec_t *)_record;              /* Record from B-tree */
+    H5A_bt2_ud_it_t *bt2_udata = (H5A_bt2_ud_it_t *)_bt2_udata; /* User data for callback */
+    herr_t           ret_value = H5_ITER_CONT;                  /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Check for skipping attributes */
-    if(bt2_udata->skip > 0)
+    if (bt2_udata->skip > 0)
         --bt2_udata->skip;
     else {
-        H5A_fh_ud_cp_t fh_udata;        /* User data for fractal heap 'op' callback */
-        H5HF_t *fheap;                  /* Fractal heap handle for attribute storage */
+        H5A_fh_ud_cp_t fh_udata; /* User data for fractal heap 'op' callback */
+        H5HF_t *       fheap;    /* Fractal heap handle for attribute storage */
 
         /* Check for iterating over shared attribute */
-        if(record->flags & H5O_MSG_FLAG_SHARED)
+        if (record->flags & H5O_MSG_FLAG_SHARED)
             fheap = bt2_udata->shared_fheap;
         else
             fheap = bt2_udata->fheap;
 
         /* Prepare user data for callback */
         /* down */
-        fh_udata.f = bt2_udata->f;
+        fh_udata.f       = bt2_udata->f;
         fh_udata.dxpl_id = bt2_udata->dxpl_id;
-        fh_udata.record = record;
-        fh_udata.attr = NULL;
+        fh_udata.record  = record;
+        fh_udata.attr    = NULL;
 
         /* Call fractal heap 'op' routine, to copy the attribute information */
-        if(H5HF_op(fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0)
+        if (H5HF_op(fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPERATE, H5_ITER_ERROR, "heap op callback failed")
 
         /* Check which type of callback to make */
-        switch(bt2_udata->attr_op->op_type) {
-            case H5A_ATTR_OP_APP2:
-            {
-                H5A_info_t ainfo;               /* Info for attribute */
+        switch (bt2_udata->attr_op->op_type) {
+            case H5A_ATTR_OP_APP2: {
+                H5A_info_t ainfo; /* Info for attribute */
 
                 /* Get the attribute information */
-                if(H5A_get_info(fh_udata.attr, &ainfo) < 0)
+                if (H5A_get_info(fh_udata.attr, &ainfo) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, H5_ITER_ERROR, "unable to get attribute info")
 
                 /* Make the application callback */
-                ret_value = (bt2_udata->attr_op->u.app_op2)(bt2_udata->loc_id, fh_udata.attr->shared->name, &ainfo, bt2_udata->op_data);
+                ret_value = (bt2_udata->attr_op->u.app_op2)(bt2_udata->loc_id, fh_udata.attr->shared->name,
+                                                            &ainfo, bt2_udata->op_data);
                 break;
             }
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
             case H5A_ATTR_OP_APP:
                 /* Make the application callback */
-                ret_value = (bt2_udata->attr_op->u.app_op)(bt2_udata->loc_id, fh_udata.attr->shared->name, bt2_udata->op_data);
+                ret_value = (bt2_udata->attr_op->u.app_op)(bt2_udata->loc_id, fh_udata.attr->shared->name,
+                                                           bt2_udata->op_data);
                 break;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
@@ -1118,7 +1106,7 @@ H5A__dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
                 HDassert("unknown attribute op type" && 0);
 #ifdef NDEBUG
                 HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type")
-#endif /* NDEBUG */
+#endif    /* NDEBUG */
         } /* end switch */
 
         /* Release the space allocated for the attribute */
@@ -1130,14 +1118,13 @@ H5A__dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
     bt2_udata->count++;
 
     /* Check for callback failure and pass along return value */
-    if(ret_value < 0)
+    if (ret_value < 0)
         HERROR(H5E_ATTR, H5E_CANTNEXT, "iteration operator failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__dense_iterate_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_iterate
  *
@@ -1152,16 +1139,16 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_attr,
-    const H5A_attr_iter_op_t *attr_op, void *op_data)
+H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainfo, H5_index_t idx_type,
+                  H5_iter_order_t order, hsize_t skip, hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op,
+                  void *op_data)
 {
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
-    H5A_attr_table_t atable = {0, NULL};        /* Table of attributes */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    haddr_t bt2_addr;                   /* Address of v2 B-tree to use for lookup */
-    herr_t ret_value;                   /* Return value */
+    H5HF_t *         fheap        = NULL;      /* Fractal heap handle */
+    H5HF_t *         shared_fheap = NULL;      /* Fractal heap handle for shared header messages */
+    H5A_attr_table_t atable       = {0, NULL}; /* Table of attributes */
+    H5B2_t *         bt2          = NULL;      /* v2 B-tree handle for index */
+    haddr_t          bt2_addr;                 /* Address of v2 B-tree to use for lookup */
+    herr_t           ret_value;                /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1173,12 +1160,12 @@ H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainf
     HDassert(attr_op);
 
     /* Determine the address of the index to use */
-    if(idx_type == H5_INDEX_NAME) {
+    if (idx_type == H5_INDEX_NAME) {
         /* Check if "native" order is OK - since names are hashed, getting them
          *      in strictly increasing or decreasing order requires building a
          *      table and sorting it.
          */
-        if(order == H5_ITER_NATIVE) {
+        if (order == H5_ITER_NATIVE) {
             HDassert(H5F_addr_defined(ainfo->name_bt2_addr));
             bt2_addr = ainfo->name_bt2_addr;
         } /* end if */
@@ -1196,84 +1183,83 @@ H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainf
     } /* end else */
 
     /* Check on iteration order */
-    if(order == H5_ITER_NATIVE && H5F_addr_defined(bt2_addr)) {
-        H5A_bt2_ud_it_t udata;              /* User data for iterator callback */
-        htri_t attr_sharable;               /* Flag indicating attributes are sharable */
+    if (order == H5_ITER_NATIVE && H5F_addr_defined(bt2_addr)) {
+        H5A_bt2_ud_it_t udata;         /* User data for iterator callback */
+        htri_t          attr_sharable; /* Flag indicating attributes are sharable */
 
         /* Open the fractal heap */
-        if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+        if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
         /* Check if attributes are shared in this file */
-        if((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
+        if ((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't determine if attributes are shared")
 
         /* Get handle for shared message heap, if attributes are sharable */
-        if(attr_sharable) {
-            haddr_t shared_fheap_addr;      /* Address of fractal heap to use */
+        if (attr_sharable) {
+            haddr_t shared_fheap_addr; /* Address of fractal heap to use */
 
             /* Retrieve the address of the shared message's fractal heap */
-            if(H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
+            if (H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get shared message heap address")
 
             /* Check if there are any shared messages currently */
-            if(H5F_addr_defined(shared_fheap_addr)) {
+            if (H5F_addr_defined(shared_fheap_addr)) {
                 /* Open the fractal heap for shared header messages */
-                if(NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
+                if (NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for index")
 
         /* Construct the user data for v2 B-tree iterator callback */
-        udata.f = f;
-        udata.dxpl_id = dxpl_id;
-        udata.fheap = fheap;
+        udata.f            = f;
+        udata.dxpl_id      = dxpl_id;
+        udata.fheap        = fheap;
         udata.shared_fheap = shared_fheap;
-        udata.loc_id = loc_id;
-        udata.skip = skip;
-        udata.count = 0;
-        udata.attr_op = attr_op;
-        udata.op_data = op_data;
+        udata.loc_id       = loc_id;
+        udata.skip         = skip;
+        udata.count        = 0;
+        udata.attr_op      = attr_op;
+        udata.op_data      = op_data;
 
         /* Iterate over the records in the v2 B-tree's "native" order */
         /* (by hash of name) */
-        if((ret_value = H5B2_iterate(bt2, dxpl_id, H5A__dense_iterate_bt2_cb, &udata)) < 0)
+        if ((ret_value = H5B2_iterate(bt2, dxpl_id, H5A__dense_iterate_bt2_cb, &udata)) < 0)
             HERROR(H5E_ATTR, H5E_BADITER, "attribute iteration failed");
 
         /* Update the last attribute examined, if requested */
-        if(last_attr)
+        if (last_attr)
             *last_attr = udata.count;
     } /* end if */
     else {
         /* Build the table of attributes for this object */
         /* (build table using the name index, but sort according to idx_type) */
-        if(H5A_dense_build_table(f, dxpl_id, ainfo, idx_type, order, &atable) < 0)
+        if (H5A_dense_build_table(f, dxpl_id, ainfo, idx_type, order, &atable) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "error building table of attributes")
 
         /* Iterate over attributes in table */
-        if((ret_value = H5A_attr_iterate_table(&atable, skip, last_attr, loc_id, attr_op, op_data)) < 0)
+        if ((ret_value = H5A_attr_iterate_table(&atable, skip, last_attr, loc_id, attr_op, op_data)) < 0)
             HERROR(H5E_ATTR, H5E_CANTNEXT, "iteration operator failed");
     } /* end else */
 
 done:
     /* Release resources */
-    if(shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
+    if (shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
-    if(atable.attrs && H5A_attr_release_table(&atable) < 0)
+    if (atable.attrs && H5A_attr_release_table(&atable) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to release attribute table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A__dense_remove_bt2_cb
  *
@@ -1291,53 +1277,54 @@ static herr_t
 H5A__dense_remove_bt2_cb(const void *_record, void *_udata)
 {
     const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record;
-    H5A_bt2_ud_rm_t *udata = (H5A_bt2_ud_rm_t *)_udata;         /* User data for callback */
-    H5A_t *attr = *(H5A_t **)udata->common.found_op_data;  /* Pointer to attribute to remove */
-    H5B2_t *bt2_corder = NULL;          /* v2 B-tree handle for creation order index */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_bt2_ud_rm_t *               udata  = (H5A_bt2_ud_rm_t *)_udata; /* User data for callback */
+    H5A_t * attr       = *(H5A_t **)udata->common.found_op_data;        /* Pointer to attribute to remove */
+    H5B2_t *bt2_corder = NULL;    /* v2 B-tree handle for creation order index */
+    herr_t  ret_value  = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Check for removing the link from the creation order index */
-    if(H5F_addr_defined(udata->corder_bt2_addr)) {
+    if (H5F_addr_defined(udata->corder_bt2_addr)) {
         /* Open the creation order index v2 B-tree */
-        if(NULL == (bt2_corder = H5B2_open(udata->common.f, udata->common.dxpl_id, udata->corder_bt2_addr, NULL)))
+        if (NULL ==
+            (bt2_corder = H5B2_open(udata->common.f, udata->common.dxpl_id, udata->corder_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
 
         /* Set up the user data for the v2 B-tree 'record remove' callback */
         udata->common.corder = attr->shared->crt_idx;
 
         /* Remove the record from the creation order index v2 B-tree */
-        if(H5B2_remove(bt2_corder, udata->common.dxpl_id, udata, NULL, NULL) < 0)
-            HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove attribute from creation order index v2 B-tree")
+        if (H5B2_remove(bt2_corder, udata->common.dxpl_id, udata, NULL, NULL) < 0)
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL,
+                        "unable to remove attribute from creation order index v2 B-tree")
     } /* end if */
 
     /* Check for removing shared attribute */
-    if(record->flags & H5O_MSG_FLAG_SHARED) {
+    if (record->flags & H5O_MSG_FLAG_SHARED) {
         /* Decrement the reference count on the shared attribute message */
-        if(H5SM_delete(udata->common.f, udata->common.dxpl_id, NULL, &(attr->sh_loc)) < 0)
+        if (H5SM_delete(udata->common.f, udata->common.dxpl_id, NULL, &(attr->sh_loc)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to delete shared attribute")
     } /* end if */
     else {
         /* Perform the deletion action on the attribute */
         /* (takes care of shared & committed datatype/dataspace components) */
-        if(H5O_attr_delete(udata->common.f, udata->common.dxpl_id, NULL, attr) < 0)
+        if (H5O_attr_delete(udata->common.f, udata->common.dxpl_id, NULL, attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
 
         /* Remove record from fractal heap */
-        if(H5HF_remove(udata->common.fheap, udata->common.dxpl_id, &record->id) < 0)
+        if (H5HF_remove(udata->common.fheap, udata->common.dxpl_id, &record->id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove attribute from fractal heap")
     } /* end else */
 
 done:
     /* Release resources */
-    if(bt2_corder && H5B2_close(bt2_corder, udata->common.dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, udata->common.dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__dense_remove_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_remove
  *
@@ -1354,13 +1341,13 @@ done:
 herr_t
 H5A_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name)
 {
-    H5A_bt2_ud_rm_t udata;              /* User data for v2 B-tree record removal */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    H5A_t *attr_copy = NULL;            /* Copy of attribute to remove */
-    htri_t attr_sharable;               /* Flag indicating attributes are sharable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_bt2_ud_rm_t udata;               /* User data for v2 B-tree record removal */
+    H5HF_t *        fheap        = NULL; /* Fractal heap handle */
+    H5HF_t *        shared_fheap = NULL; /* Fractal heap handle for shared header messages */
+    H5B2_t *        bt2_name     = NULL; /* v2 B-tree handle for name index */
+    H5A_t *         attr_copy    = NULL; /* Copy of attribute to remove */
+    htri_t          attr_sharable;       /* Flag indicating attributes are sharable */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1370,63 +1357,62 @@ H5A_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
     HDassert(name && *name);
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Check if attributes are shared in this file */
-    if((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
+    if ((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't determine if attributes are shared")
 
     /* Get handle for shared message heap, if attributes are sharable */
-    if(attr_sharable) {
-        haddr_t shared_fheap_addr;      /* Address of fractal heap to use */
+    if (attr_sharable) {
+        haddr_t shared_fheap_addr; /* Address of fractal heap to use */
 
         /* Retrieve the address of the shared message's fractal heap */
-        if(H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
+        if (H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get shared message heap address")
 
         /* Check if there are any shared messages currently */
-        if(H5F_addr_defined(shared_fheap_addr)) {
+        if (H5F_addr_defined(shared_fheap_addr)) {
             /* Open the fractal heap for shared header messages */
-            if(NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
+            if (NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Set up the user data for the v2 B-tree 'record remove' callback */
-    udata.common.f = f;
-    udata.common.dxpl_id = dxpl_id;
-    udata.common.fheap = fheap;
-    udata.common.shared_fheap = shared_fheap;
-    udata.common.name = name;
-    udata.common.name_hash = H5_checksum_lookup3(name, HDstrlen(name), 0);
-    udata.common.found_op = H5A__dense_fnd_cb;       /* v2 B-tree comparison callback */
+    udata.common.f             = f;
+    udata.common.dxpl_id       = dxpl_id;
+    udata.common.fheap         = fheap;
+    udata.common.shared_fheap  = shared_fheap;
+    udata.common.name          = name;
+    udata.common.name_hash     = H5_checksum_lookup3(name, HDstrlen(name), 0);
+    udata.common.found_op      = H5A__dense_fnd_cb; /* v2 B-tree comparison callback */
     udata.common.found_op_data = &attr_copy;
-    udata.corder_bt2_addr = ainfo->corder_bt2_addr;
+    udata.corder_bt2_addr      = ainfo->corder_bt2_addr;
 
     /* Remove the record from the name index v2 B-tree */
-    if(H5B2_remove(bt2_name, dxpl_id, &udata, H5A__dense_remove_bt2_cb, &udata) < 0)
+    if (H5B2_remove(bt2_name, dxpl_id, &udata, H5A__dense_remove_bt2_cb, &udata) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove attribute from name index v2 B-tree")
 
 done:
     /* Release resources */
-    if(shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
+    if (shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
-    if(attr_copy)
+    if (attr_copy)
         H5O_msg_free_real(H5O_MSG_ATTR, attr_copy);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A__dense_remove_by_idx_bt2_cb
  *
@@ -1443,33 +1429,33 @@ done:
 static herr_t
 H5A__dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
 {
-    H5HF_t *fheap;                      /* Fractal heap handle */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
+    H5HF_t *                        fheap;         /* Fractal heap handle */
+    H5B2_t *                        bt2    = NULL; /* v2 B-tree handle for index */
     const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; /* v2 B-tree record */
-    H5A_bt2_ud_rmbi_t *bt2_udata = (H5A_bt2_ud_rmbi_t *)_bt2_udata;         /* User data for callback */
-    H5A_fh_ud_cp_t fh_udata;            /* User data for fractal heap 'op' callback */
-    H5O_shared_t sh_loc;                /* Shared message info for attribute */
-    hbool_t use_sh_loc;                 /* Whether to use the attribute's shared location or the separate one */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_bt2_ud_rmbi_t *             bt2_udata = (H5A_bt2_ud_rmbi_t *)_bt2_udata; /* User data for callback */
+    H5A_fh_ud_cp_t                  fh_udata; /* User data for fractal heap 'op' callback */
+    H5O_shared_t                    sh_loc;   /* Shared message info for attribute */
+    hbool_t use_sh_loc;          /* Whether to use the attribute's shared location or the separate one */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Set up the user data for fractal heap 'op' callback */
-    fh_udata.f = bt2_udata->f;
+    fh_udata.f       = bt2_udata->f;
     fh_udata.dxpl_id = bt2_udata->dxpl_id;
-    fh_udata.record = record;
-    fh_udata.attr = NULL;
+    fh_udata.record  = record;
+    fh_udata.attr    = NULL;
 
     /* Get correct fractal heap handle to use for operations */
-    if(record->flags & H5O_MSG_FLAG_SHARED)
+    if (record->flags & H5O_MSG_FLAG_SHARED)
         fheap = bt2_udata->shared_fheap;
     else
         fheap = bt2_udata->fheap;
 
     /* Check whether to make a copy of the attribute or just need the shared location info */
-    if(H5F_addr_defined(bt2_udata->other_bt2_addr) || !(record->flags & H5O_MSG_FLAG_SHARED)) {
+    if (H5F_addr_defined(bt2_udata->other_bt2_addr) || !(record->flags & H5O_MSG_FLAG_SHARED)) {
         /* Call fractal heap 'op' routine, to make copy of attribute to remove */
-        if(H5HF_op(fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0)
+        if (H5HF_op(fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPERATE, FAIL, "attribute removal callback failed")
         HDassert(fh_udata.attr);
 
@@ -1485,11 +1471,11 @@ H5A__dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
     } /* end else */
 
     /* Check for removing the link from the "other" index (creation order, when name used and vice versa) */
-    if(H5F_addr_defined(bt2_udata->other_bt2_addr)) {
-        H5A_bt2_ud_common_t other_bt2_udata;    /* Info for B-tree callbacks */
+    if (H5F_addr_defined(bt2_udata->other_bt2_addr)) {
+        H5A_bt2_ud_common_t other_bt2_udata; /* Info for B-tree callbacks */
 
         /* Determine the index being used */
-        if(bt2_udata->idx_type == H5_INDEX_NAME) {
+        if (bt2_udata->idx_type == H5_INDEX_NAME) {
             /* Set up the user data for the v2 B-tree 'record remove' callback */
             other_bt2_udata.corder = fh_udata.attr->shared->crt_idx;
         } /* end if */
@@ -1497,63 +1483,64 @@ H5A__dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
             HDassert(bt2_udata->idx_type == H5_INDEX_CRT_ORDER);
 
             /* Set up the user data for the v2 B-tree 'record remove' callback */
-            other_bt2_udata.f = bt2_udata->f;
-            other_bt2_udata.dxpl_id = bt2_udata->dxpl_id;
-            other_bt2_udata.fheap = bt2_udata->fheap;
+            other_bt2_udata.f            = bt2_udata->f;
+            other_bt2_udata.dxpl_id      = bt2_udata->dxpl_id;
+            other_bt2_udata.fheap        = bt2_udata->fheap;
             other_bt2_udata.shared_fheap = bt2_udata->shared_fheap;
-            other_bt2_udata.name = fh_udata.attr->shared->name;
-            other_bt2_udata.name_hash = H5_checksum_lookup3(fh_udata.attr->shared->name, HDstrlen(fh_udata.attr->shared->name), 0);
-            other_bt2_udata.found_op = NULL;
+            other_bt2_udata.name         = fh_udata.attr->shared->name;
+            other_bt2_udata.name_hash =
+                H5_checksum_lookup3(fh_udata.attr->shared->name, HDstrlen(fh_udata.attr->shared->name), 0);
+            other_bt2_udata.found_op      = NULL;
             other_bt2_udata.found_op_data = NULL;
         } /* end else */
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(bt2_udata->f, bt2_udata->dxpl_id, bt2_udata->other_bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(bt2_udata->f, bt2_udata->dxpl_id, bt2_udata->other_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for index")
 
         /* Set the common information for the v2 B-tree remove operation */
 
         /* Remove the record from the "other" index v2 B-tree */
-        if(H5B2_remove(bt2, bt2_udata->dxpl_id, &other_bt2_udata, NULL, NULL) < 0)
-            HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove record from 'other' index v2 B-tree")
+        if (H5B2_remove(bt2, bt2_udata->dxpl_id, &other_bt2_udata, NULL, NULL) < 0)
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL,
+                        "unable to remove record from 'other' index v2 B-tree")
     } /* end if */
 
     /* Check for removing shared attribute */
-    if(record->flags & H5O_MSG_FLAG_SHARED) {
-        H5O_shared_t *sh_loc_ptr;       /* Pointer to shared message info for attribute */
+    if (record->flags & H5O_MSG_FLAG_SHARED) {
+        H5O_shared_t *sh_loc_ptr; /* Pointer to shared message info for attribute */
 
         /* Set up pointer to correct shared location */
-        if(use_sh_loc)
+        if (use_sh_loc)
             sh_loc_ptr = &sh_loc;
         else
             sh_loc_ptr = &(fh_udata.attr->sh_loc);
 
         /* Decrement the reference count on the shared attribute message */
-        if(H5SM_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, sh_loc_ptr) < 0)
+        if (H5SM_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, sh_loc_ptr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to delete shared attribute")
     } /* end if */
     else {
         /* Perform the deletion action on the attribute */
         /* (takes care of shared & committed datatype/dataspace components) */
-        if(H5O_attr_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, fh_udata.attr) < 0)
+        if (H5O_attr_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, fh_udata.attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
 
         /* Remove record from fractal heap */
-        if(H5HF_remove(fheap, bt2_udata->dxpl_id, &record->id) < 0)
+        if (H5HF_remove(fheap, bt2_udata->dxpl_id, &record->id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove attribute from fractal heap")
     } /* end else */
 
 done:
     /* Release resources */
-    if(bt2 && H5B2_close(bt2, bt2_udata->dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, bt2_udata->dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
-    if(fh_udata.attr)
+    if (fh_udata.attr)
         H5O_msg_free(H5O_ATTR_ID, fh_udata.attr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__dense_remove_by_idx_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_remove_by_idx
  *
@@ -1569,15 +1556,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n)
+H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5_index_t idx_type,
+                        H5_iter_order_t order, hsize_t n)
 {
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
-    H5A_attr_table_t atable = {0, NULL};        /* Table of attributes */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    haddr_t bt2_addr;                   /* Address of v2 B-tree to use for operation */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_t *         fheap        = NULL;      /* Fractal heap handle */
+    H5HF_t *         shared_fheap = NULL;      /* Fractal heap handle for shared header messages */
+    H5A_attr_table_t atable       = {0, NULL}; /* Table of attributes */
+    H5B2_t *         bt2          = NULL;      /* v2 B-tree handle for index */
+    haddr_t          bt2_addr;                 /* Address of v2 B-tree to use for operation */
+    herr_t           ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1586,12 +1573,12 @@ H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
     HDassert(ainfo);
 
     /* Determine the address of the index to use */
-    if(idx_type == H5_INDEX_NAME) {
+    if (idx_type == H5_INDEX_NAME) {
         /* Check if "native" order is OK - since names are hashed, getting them
          *      in strictly increasing or decreasing order requires building a
          *      table and sorting it.
          */
-        if(order == H5_ITER_NATIVE) {
+        if (order == H5_ITER_NATIVE) {
             bt2_addr = ainfo->name_bt2_addr;
             HDassert(H5F_addr_defined(bt2_addr));
         } /* end if */
@@ -1609,80 +1596,79 @@ H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
     } /* end else */
 
     /* If there is an index defined for the field, use it */
-    if(H5F_addr_defined(bt2_addr)) {
-        H5A_bt2_ud_rmbi_t udata;        /* User data for v2 B-tree record removal */
-        htri_t attr_sharable;           /* Flag indicating attributes are sharable */
+    if (H5F_addr_defined(bt2_addr)) {
+        H5A_bt2_ud_rmbi_t udata;         /* User data for v2 B-tree record removal */
+        htri_t            attr_sharable; /* Flag indicating attributes are sharable */
 
         /* Open the fractal heap */
-        if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+        if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
         /* Check if attributes are shared in this file */
-        if((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
+        if ((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't determine if attributes are shared")
 
         /* Get handle for shared message heap, if attributes are sharable */
-        if(attr_sharable) {
-            haddr_t shared_fheap_addr;      /* Address of fractal heap to use */
+        if (attr_sharable) {
+            haddr_t shared_fheap_addr; /* Address of fractal heap to use */
 
             /* Retrieve the address of the shared message's fractal heap */
-            if(H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
+            if (H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get shared message heap address")
 
             /* Check if there are any shared messages currently */
-            if(H5F_addr_defined(shared_fheap_addr)) {
+            if (H5F_addr_defined(shared_fheap_addr)) {
                 /* Open the fractal heap for shared header messages */
-                if(NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
+                if (NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for index")
 
         /* Set up the user data for the v2 B-tree 'record remove' callback */
-        udata.f = f;
-        udata.dxpl_id = dxpl_id;
-        udata.fheap = fheap;
-        udata.shared_fheap = shared_fheap;
-        udata.idx_type = idx_type;
+        udata.f              = f;
+        udata.dxpl_id        = dxpl_id;
+        udata.fheap          = fheap;
+        udata.shared_fheap   = shared_fheap;
+        udata.idx_type       = idx_type;
         udata.other_bt2_addr = idx_type == H5_INDEX_NAME ? ainfo->corder_bt2_addr : ainfo->name_bt2_addr;
 
         /* Remove the record from the name index v2 B-tree */
-        if(H5B2_remove_by_idx(bt2, dxpl_id, order, n, H5A__dense_remove_by_idx_bt2_cb, &udata) < 0)
+        if (H5B2_remove_by_idx(bt2, dxpl_id, order, n, H5A__dense_remove_by_idx_bt2_cb, &udata) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove attribute from v2 B-tree index")
     } /* end if */
     else {
         /* Build the table of attributes for this object */
         /* (build table using the name index, but sort according to idx_type) */
-        if(H5A_dense_build_table(f, dxpl_id, ainfo, idx_type, order, &atable) < 0)
+        if (H5A_dense_build_table(f, dxpl_id, ainfo, idx_type, order, &atable) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "error building table of attributes")
 
         /* Check for skipping too many attributes */
-        if(n >= atable.nattrs)
+        if (n >= atable.nattrs)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
 
         /* Delete appropriate attribute from dense storage */
-        if(H5A_dense_remove(f, dxpl_id, ainfo, ((atable.attrs[n])->shared)->name) < 0)
+        if (H5A_dense_remove(f, dxpl_id, ainfo, ((atable.attrs[n])->shared)->name) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute in dense storage")
     } /* end else */
 
 done:
     /* Release resources */
-    if(shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
+    if (shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
-    if(atable.attrs && H5A_attr_release_table(&atable) < 0)
+    if (atable.attrs && H5A_attr_release_table(&atable) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to release attribute table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_remove_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_exists
  *
@@ -1700,12 +1686,12 @@ done:
 htri_t
 H5A_dense_exists(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name)
 {
-    H5A_bt2_ud_common_t udata;          /* User data for v2 B-tree modify */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    htri_t attr_sharable;               /* Flag indicating attributes are sharable */
-    htri_t ret_value = TRUE;            /* Return value */
+    H5A_bt2_ud_common_t udata;               /* User data for v2 B-tree modify */
+    H5HF_t *            fheap        = NULL; /* Fractal heap handle */
+    H5HF_t *            shared_fheap = NULL; /* Fractal heap handle for shared header messages */
+    H5B2_t *            bt2_name     = NULL; /* v2 B-tree handle for name index */
+    htri_t              attr_sharable;       /* Flag indicating attributes are sharable */
+    htri_t              ret_value = TRUE;    /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1715,62 +1701,61 @@ H5A_dense_exists(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
     HDassert(name);
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Check if attributes are shared in this file */
-    if((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
+    if ((attr_sharable = H5SM_type_shared(f, H5O_ATTR_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't determine if attributes are shared")
 
     /* Get handle for shared message heap, if attributes are sharable */
-    if(attr_sharable) {
-        haddr_t shared_fheap_addr;      /* Address of fractal heap to use */
+    if (attr_sharable) {
+        haddr_t shared_fheap_addr; /* Address of fractal heap to use */
 
         /* Retrieve the address of the shared message's fractal heap */
-        if(H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
+        if (H5SM_get_fheap_addr(f, dxpl_id, H5O_ATTR_ID, &shared_fheap_addr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get shared message heap address")
 
         /* Check if there are any shared messages currently */
-        if(H5F_addr_defined(shared_fheap_addr)) {
+        if (H5F_addr_defined(shared_fheap_addr)) {
             /* Open the fractal heap for shared header messages */
-            if(NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
+            if (NULL == (shared_fheap = H5HF_open(f, dxpl_id, shared_fheap_addr)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Create the "udata" information for v2 B-tree record 'find' */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.fheap = fheap;
-    udata.shared_fheap = shared_fheap;
-    udata.name = name;
-    udata.name_hash = H5_checksum_lookup3(name, HDstrlen(name), 0);
-    udata.flags = 0;
-    udata.corder = 0;
-    udata.found_op = NULL;       /* v2 B-tree comparison callback */
+    udata.f             = f;
+    udata.dxpl_id       = dxpl_id;
+    udata.fheap         = fheap;
+    udata.shared_fheap  = shared_fheap;
+    udata.name          = name;
+    udata.name_hash     = H5_checksum_lookup3(name, HDstrlen(name), 0);
+    udata.flags         = 0;
+    udata.corder        = 0;
+    udata.found_op      = NULL; /* v2 B-tree comparison callback */
     udata.found_op_data = NULL;
 
     /* Find the attribute in the 'name' index */
-    if((ret_value = H5B2_find(bt2_name, dxpl_id, &udata, NULL, NULL)) < 0)
+    if ((ret_value = H5B2_find(bt2_name, dxpl_id, &udata, NULL, NULL)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "can't search for attribute in name index")
 
 done:
     /* Release resources */
-    if(shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
+    if (shared_fheap && H5HF_close(shared_fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_exists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A__dense_delete_bt2_cb
  *
@@ -1787,55 +1772,55 @@ done:
 static herr_t
 H5A__dense_delete_bt2_cb(const void *_record, void *_bt2_udata)
 {
-    const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */
-    H5A_bt2_ud_common_t *bt2_udata = (H5A_bt2_ud_common_t *)_bt2_udata;         /* User data for callback */
-    H5A_t *attr = NULL;                 /* Attribute being removed */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5A_dense_bt2_name_rec_t *record =
+        (const H5A_dense_bt2_name_rec_t *)_record;                      /* Record from B-tree */
+    H5A_bt2_ud_common_t *bt2_udata = (H5A_bt2_ud_common_t *)_bt2_udata; /* User data for callback */
+    H5A_t *              attr      = NULL;                              /* Attribute being removed */
+    herr_t               ret_value = SUCCEED;                           /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Check for shared attribute */
-    if(record->flags & H5O_MSG_FLAG_SHARED) {
-        H5O_shared_t sh_mesg;   /* Temporary shared message info */
+    if (record->flags & H5O_MSG_FLAG_SHARED) {
+        H5O_shared_t sh_mesg; /* Temporary shared message info */
 
         /* "reconstitute" the shared message info for the attribute */
         H5SM_reconstitute(&sh_mesg, bt2_udata->f, H5O_ATTR_ID, record->id);
 
         /* Decrement the reference count on the shared attribute message */
-        if(H5SM_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, &sh_mesg) < 0)
+        if (H5SM_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, &sh_mesg) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to delete shared attribute")
     } /* end if */
     else {
-        H5A_fh_ud_cp_t fh_udata;            /* User data for fractal heap 'op' callback */
+        H5A_fh_ud_cp_t fh_udata; /* User data for fractal heap 'op' callback */
 
         /* Prepare user data for callback */
         /* down */
-        fh_udata.f = bt2_udata->f;
+        fh_udata.f       = bt2_udata->f;
         fh_udata.dxpl_id = bt2_udata->dxpl_id;
-        fh_udata.record = record;
+        fh_udata.record  = record;
         /* up */
         fh_udata.attr = NULL;
 
         /* Call fractal heap 'op' routine, to copy the attribute information */
-        if(H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0)
+        if (H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPERATE, FAIL, "heap op callback failed")
         attr = fh_udata.attr;
 
         /* Perform the deletion action on the attribute */
         /* (takes care of shared/committed datatype & dataspace components) */
-        if(H5O_attr_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, fh_udata.attr) < 0)
+        if (H5O_attr_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, fh_udata.attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
     } /* end else */
 
 done:
     /* Release resources */
-    if(attr)
+    if (attr)
         H5O_msg_free_real(H5O_MSG_ATTR, attr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__dense_delete_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_delete
  *
@@ -1852,9 +1837,9 @@ done:
 herr_t
 H5A_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo)
 {
-    H5A_bt2_ud_common_t udata;          /* v2 B-tree user data for deleting attributes */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_bt2_ud_common_t udata;               /* v2 B-tree user data for deleting attributes */
+    H5HF_t *            fheap     = NULL;    /* Fractal heap handle */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1863,48 +1848,47 @@ H5A_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo)
     HDassert(ainfo);
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo->fheap_addr)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Create the "udata" information for v2 B-tree 'delete' */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.fheap = fheap;
-    udata.shared_fheap = NULL;
-    udata.name = NULL;
-    udata.name_hash = 0;
-    udata.flags = 0;
-    udata.found_op = NULL;       /* v2 B-tree comparison callback */
+    udata.f             = f;
+    udata.dxpl_id       = dxpl_id;
+    udata.fheap         = fheap;
+    udata.shared_fheap  = NULL;
+    udata.name          = NULL;
+    udata.name_hash     = 0;
+    udata.flags         = 0;
+    udata.found_op      = NULL; /* v2 B-tree comparison callback */
     udata.found_op_data = NULL;
 
     /* Delete name index v2 B-tree */
-    if(H5B2_delete(f, dxpl_id, ainfo->name_bt2_addr, NULL, H5A__dense_delete_bt2_cb, &udata) < 0)
+    if (H5B2_delete(f, dxpl_id, ainfo->name_bt2_addr, NULL, H5A__dense_delete_bt2_cb, &udata) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete v2 B-tree for name index")
     ainfo->name_bt2_addr = HADDR_UNDEF;
 
     /* Release resources */
-    if(H5HF_close(fheap, dxpl_id) < 0)
+    if (H5HF_close(fheap, dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
     fheap = NULL;
 
     /* Check if we should delete the creation order index v2 B-tree */
-    if(H5F_addr_defined(ainfo->corder_bt2_addr)) {
+    if (H5F_addr_defined(ainfo->corder_bt2_addr)) {
         /* Delete the creation order index, without adjusting the ref. count on the attributes  */
-        if(H5B2_delete(f, dxpl_id, ainfo->corder_bt2_addr, NULL, NULL, NULL) < 0)
+        if (H5B2_delete(f, dxpl_id, ainfo->corder_bt2_addr, NULL, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete v2 B-tree for creation order index")
         ainfo->corder_bt2_addr = HADDR_UNDEF;
     } /* end if */
 
     /* Delete fractal heap */
-    if(H5HF_delete(f, dxpl_id, ainfo->fheap_addr) < 0)
+    if (H5HF_delete(f, dxpl_id, ainfo->fheap_addr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete fractal heap")
     ainfo->fheap_addr = HADDR_UNDEF;
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_delete() */
-
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c
index 3a0bc18..b240b93 100644
--- a/src/H5Adeprec.c
+++ b/src/H5Adeprec.c
@@ -29,60 +29,50 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg   */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	*/
+#define H5A_PACKAGE /*suppress error about including H5Apkg   */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	*/
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5A__init_deprec_interface
-
+#define H5_INTERFACE_INIT_FUNC H5A__init_deprec_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes				*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Opkg.h"             /* Object headers			*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Apkg.h"     /* Attributes				*/
+#include "H5Dprivate.h" /* Datasets				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Opkg.h"     /* Object headers			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5A__init_deprec_interface -- Initialize interface-specific information
@@ -103,7 +93,6 @@ H5A__init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5A_init())
 } /* H5A__init_deprec_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5A__term_deprec_interface -- Terminate interface
@@ -128,7 +117,7 @@ H5A__term_deprec_interface(void)
 } /* H5A__term_deprec_interface() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5Acreate1
@@ -157,45 +146,43 @@ H5A__term_deprec_interface(void)
 
 --------------------------------------------------------------------------*/
 hid_t
-H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
-	  hid_t plist_id)
+H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t plist_id)
 {
-    H5A_t	        *attr = NULL;           /* Attribute created */
-    H5G_loc_t           loc;                    /* Object location */
-    H5T_t		*type;                  /* Datatype to use for attribute */
-    H5S_t		*space;                 /* Dataspace to use for attribute */
-    hid_t		ret_value;              /* Return value */
+    H5A_t *   attr = NULL; /* Attribute created */
+    H5G_loc_t loc;         /* Object location */
+    H5T_t *   type;        /* Datatype to use for attribute */
+    H5S_t *   space;       /* Dataspace to use for attribute */
+    hid_t     ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, plist_id);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(0 == (H5F_INTENT(loc.oloc->file) & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_ARGS, H5E_WRITEERROR, FAIL, "no write intent on file")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a type")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (0 == (H5F_INTENT(loc.oloc->file) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_ARGS, H5E_WRITEERROR, FAIL, "no write intent on file")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a type")
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Go do the real work for attaching the attribute to the dataset */
-    if(NULL==(attr = H5A_create(&loc, name, type, space, plist_id, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
+    if (NULL == (attr = H5A_create(&loc, name, type, space, plist_id, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
 
     /* Register the new attribute and get an ID for it */
-    if((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register attribute for ID")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Acreate1() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aopen_name
@@ -221,39 +208,38 @@ done:
 hid_t
 H5Aopen_name(hid_t loc_id, const char *name)
 {
-    H5G_loc_t    	loc;            /* Object location */
-    H5A_t               *attr = NULL;   /* Attribute opened */
-    hid_t		ret_value;
+    H5G_loc_t loc;         /* Object location */
+    H5A_t *   attr = NULL; /* Attribute opened */
+    hid_t     ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "i*s", loc_id, name);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_name(&loc, ".", name, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)))
+    if (NULL == (attr = H5A_open_by_name(&loc, ".", name, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute: '%s'", name)
 
     /* Register the attribute and get an ID for it */
-    if((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register attribute for ID")
 
 done:
     /* Cleanup on failure */
-    if(ret_value < 0)
-        if(attr && H5A_close(attr) < 0)
+    if (ret_value < 0)
+        if (attr && H5A_close(attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aopen_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aopen_idx
@@ -279,37 +265,37 @@ done:
 hid_t
 H5Aopen_idx(hid_t loc_id, unsigned idx)
 {
-    H5G_loc_t	loc;	        /* Object location */
-    H5A_t       *attr = NULL;   /* Attribute opened */
-    hid_t	ret_value;
+    H5G_loc_t loc;         /* Object location */
+    H5A_t *   attr = NULL; /* Attribute opened */
+    hid_t     ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "iIu", loc_id, idx);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Open the attribute in the object header */
-    if(NULL == (attr = H5A_open_by_idx(&loc, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)idx, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)))
+    if (NULL == (attr = H5A_open_by_idx(&loc, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)idx,
+                                        H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open attribute")
 
     /* Register the attribute and get an ID for it */
-    if((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ATTR, attr, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register attribute for ID")
 
 done:
     /* Cleanup on failure */
-    if(ret_value < 0)
-        if(attr && H5A_close(attr) < 0)
+    if (ret_value < 0)
+        if (attr && H5A_close(attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute")
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aopen_idx() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aget_num_attrs
@@ -331,33 +317,33 @@ done:
 int
 H5Aget_num_attrs(hid_t loc_id)
 {
-    H5O_loc_t    	*loc;	/* Object location for attribute */
-    void           	*obj;
-    int			ret_value;
+    H5O_loc_t *loc; /* Object location for attribute */
+    void *     obj;
+    int        ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", loc_id);
 
     /* check arguments */
-    if(H5I_BADID == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad location ID")
-    if(H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
-    if(NULL == (obj = H5I_object(loc_id)))
+    if (H5I_BADID == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad location ID")
+    if (H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (NULL == (obj = H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADATOM, FAIL, "illegal object atom")
-    switch(H5I_get_type (loc_id)) {
+    switch (H5I_get_type(loc_id)) {
         case H5I_DATASET:
-            if(NULL == (loc = H5D_oloc((H5D_t*)obj)))
+            if (NULL == (loc = H5D_oloc((H5D_t *)obj)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get location for object")
             break;
 
         case H5I_DATATYPE:
-            if(NULL == (loc = H5T_oloc((H5T_t*)obj)))
+            if (NULL == (loc = H5T_oloc((H5T_t *)obj)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "target datatype is not committed")
             break;
 
         case H5I_GROUP:
-            if(NULL == (loc = H5G_oloc((H5G_t*)obj)))
+            if (NULL == (loc = H5G_oloc((H5G_t *)obj)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get location for object")
             break;
 
@@ -379,14 +365,13 @@ H5Aget_num_attrs(hid_t loc_id)
     } /*lint !e788 All appropriate cases are covered */
 
     /* Look up the # of attributes for the object */
-    if((ret_value = H5O_attr_count(loc, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5O_attr_count(loc, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "can't get attribute count for object")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Aget_num_attrs() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Aiterate1
@@ -427,33 +412,33 @@ done:
 herr_t
 H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op, void *op_data)
 {
-    H5A_attr_iter_op_t  attr_op;        /* Attribute operator */
-    hsize_t		start_idx;      /* Index of attribute to start iterating at */
-    hsize_t		last_attr;      /* Index of last attribute examined */
-    herr_t	        ret_value;      /* Return value */
+    H5A_attr_iter_op_t attr_op;   /* Attribute operator */
+    hsize_t            start_idx; /* Index of attribute to start iterating at */
+    hsize_t            last_attr; /* Index of last attribute examined */
+    herr_t             ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*Iux*x", loc_id, attr_num, op, op_data);
 
     /* check arguments */
-    if(H5I_ATTR == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
+    if (H5I_ATTR == H5I_get_type(loc_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
 
     /* Build attribute operator info */
-    attr_op.op_type = H5A_ATTR_OP_APP;
+    attr_op.op_type  = H5A_ATTR_OP_APP;
     attr_op.u.app_op = op;
 
     /* Call attribute iteration routine */
     last_attr = start_idx = (hsize_t)(attr_num ? *attr_num : 0);
-    if((ret_value = H5O_attr_iterate(loc_id, H5AC_ind_dxpl_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, start_idx, &last_attr, &attr_op, op_data)) < 0)
+    if ((ret_value = H5O_attr_iterate(loc_id, H5AC_ind_dxpl_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, start_idx,
+                                      &last_attr, &attr_op, op_data)) < 0)
         HERROR(H5E_ATTR, H5E_BADITER, "error iterating over attributes");
 
     /* Set the last attribute information */
-    if(attr_num)
+    if (attr_num)
         *attr_num = (unsigned)last_attr;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Aiterate1() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Aint.c b/src/H5Aint.c
index 6dadea2..e60427d 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -26,96 +26,87 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
+#define H5A_PACKAGE /*suppress error about including H5Apkg  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5SMprivate.h"	/* Shared Object Header Messages	*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes	  			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5SMprivate.h" /* Shared Object Header Messages	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Data exchange structure to use when building table of compact attributes for an object */
 typedef struct {
-    H5F_t       *f;             /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;        /* DXPL for operation                */
-    H5A_attr_table_t *atable;   /* Pointer to attribute table to build */
-    size_t curr_attr;           /* Current attribute to operate on */
-    hbool_t bogus_crt_idx;      /* Whether bogus creation index values need to be set */
+    H5F_t *           f;             /* Pointer to file that fractal heap is in */
+    hid_t             dxpl_id;       /* DXPL for operation                */
+    H5A_attr_table_t *atable;        /* Pointer to attribute table to build */
+    size_t            curr_attr;     /* Current attribute to operate on */
+    hbool_t           bogus_crt_idx; /* Whether bogus creation index values need to be set */
 } H5A_compact_bt_ud_t;
 
 /* Data exchange structure to use when building table of dense attributes for an object */
 typedef struct {
-    H5A_attr_table_t *atable;   /* Pointer to attribute table to build */
-    size_t curr_attr;           /* Current attribute to operate on */
+    H5A_attr_table_t *atable;    /* Pointer to attribute table to build */
+    size_t            curr_attr; /* Current attribute to operate on */
 } H5A_dense_bt_ud_t;
 
 /* Data exchange structure to use when copying an attribute from _SRC to _DST */
 typedef struct {
-    const H5O_ainfo_t *ainfo;   /* dense information    */
-    H5F_t *file;                /* file                 */
-    hbool_t *recompute_size;    /* Flag to indicate if size changed */
-    H5O_copy_t *cpy_info;       /* Information on copying options   */
-    hid_t dxpl_id;              /* DXPL for operation               */
-    const H5O_loc_t *oloc_src;
-    H5O_loc_t *oloc_dst;
+    const H5O_ainfo_t *ainfo;          /* dense information    */
+    H5F_t *            file;           /* file                 */
+    hbool_t *          recompute_size; /* Flag to indicate if size changed */
+    H5O_copy_t *       cpy_info;       /* Information on copying options   */
+    hid_t              dxpl_id;        /* DXPL for operation               */
+    const H5O_loc_t *  oloc_src;
+    H5O_loc_t *        oloc_dst;
 } H5A_dense_file_cp_ud_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static herr_t H5A__compact_build_table_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned sequence, unsigned *oh_flags_ptr, void *_udata/*in,out*/);
+static herr_t H5A__compact_build_table_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence,
+                                          unsigned *oh_flags_ptr, void *_udata /*in,out*/);
 static herr_t H5A_dense_build_table_cb(const H5A_t *attr, void *_udata);
-static int H5A__attr_cmp_name_inc(const void *attr1, const void *attr2);
-static int H5A__attr_cmp_name_dec(const void *attr1, const void *attr2);
-static int H5A__attr_cmp_corder_inc(const void *attr1, const void *attr2);
-static int H5A__attr_cmp_corder_dec(const void *attr1, const void *attr2);
-static herr_t H5A__attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type,
-    H5_iter_order_t order);
+static int    H5A__attr_cmp_name_inc(const void *attr1, const void *attr2);
+static int    H5A__attr_cmp_name_dec(const void *attr1, const void *attr2);
+static int    H5A__attr_cmp_corder_inc(const void *attr1, const void *attr2);
+static int    H5A__attr_cmp_corder_dec(const void *attr1, const void *attr2);
+static herr_t H5A__attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type, H5_iter_order_t order);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-typedef H5A_t*	H5A_t_ptr;
+typedef H5A_t *H5A_t_ptr;
 H5FL_SEQ_DEFINE(H5A_t_ptr);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_create
  *
@@ -137,14 +128,14 @@ H5FL_SEQ_DEFINE(H5A_t_ptr);
  *-------------------------------------------------------------------------
  */
 H5A_t *
-H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
-    const H5S_t *space, hid_t acpl_id, hid_t dxpl_id)
+H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type, const H5S_t *space, hid_t acpl_id,
+           hid_t dxpl_id)
 {
-    H5A_t	*attr = NULL;   /* Attribute created */
-    hssize_t	snelmts;	/* elements in attribute */
-    size_t	nelmts;		/* elements in attribute */
-    htri_t      tri_ret;        /* htri_t return value */
-    H5A_t	*ret_value = NULL; /* Return value */
+    H5A_t *  attr = NULL;      /* Attribute created */
+    hssize_t snelmts;          /* elements in attribute */
+    size_t   nelmts;           /* elements in attribute */
+    htri_t   tri_ret;          /* htri_t return value */
+    H5A_t *  ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -159,37 +150,37 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
      *  name, but it's going to be hard to unwind all the special cases on
      *  failure, so just check first, for now - QAK)
      */
-    if((tri_ret = H5O_attr_exists(loc->oloc, name, H5AC_ind_dxpl_id)) < 0)
+    if ((tri_ret = H5O_attr_exists(loc->oloc, name, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, NULL, "error checking attributes")
-    else if(tri_ret > 0)
+    else if (tri_ret > 0)
         HGOTO_ERROR(H5E_ATTR, H5E_ALREADYEXISTS, NULL, "attribute already exists")
 
     /* Check if the dataspace has an extent set (or is NULL) */
-    if(!(H5S_has_extent(space)))
+    if (!(H5S_has_extent(space)))
         HGOTO_ERROR(H5E_ATTR, H5E_BADVALUE, NULL, "dataspace extent has not been set")
 
     /* Check if the datatype is "sensible" for use in a dataset */
-    if(H5T_is_sensible(type) != TRUE)
+    if (H5T_is_sensible(type) != TRUE)
         HGOTO_ERROR(H5E_ATTR, H5E_BADTYPE, NULL, "datatype is not sensible")
 
     /* Build the attribute information */
-    if(NULL == (attr = H5FL_CALLOC(H5A_t)))
+    if (NULL == (attr = H5FL_CALLOC(H5A_t)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, NULL, "memory allocation failed for attribute info")
 
-    if(NULL == (attr->shared = H5FL_CALLOC(H5A_shared_t)))
+    if (NULL == (attr->shared = H5FL_CALLOC(H5A_shared_t)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, NULL, "can't allocate shared attr structure")
 
     /* If the creation property list is H5P_DEFAULT, use the default character encoding */
-    if(acpl_id == H5P_DEFAULT)
+    if (acpl_id == H5P_DEFAULT)
         attr->shared->encoding = H5F_DEFAULT_CSET;
     else {
-        H5P_genplist_t  *ac_plist;      /* ACPL Property list */
+        H5P_genplist_t *ac_plist; /* ACPL Property list */
 
         /* Get a local copy of the attribute creation property list */
-        if(NULL == (ac_plist = (H5P_genplist_t *)H5I_object(acpl_id)))
+        if (NULL == (ac_plist = (H5P_genplist_t *)H5I_object(acpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list")
 
-        if(H5P_get(ac_plist, H5P_STRCRT_CHAR_ENCODING_NAME, &(attr->shared->encoding)) < 0)
+        if (H5P_get(ac_plist, H5P_STRCRT_CHAR_ENCODING_NAME, &(attr->shared->encoding)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get character encoding flag")
     } /* end else */
 
@@ -197,54 +188,54 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
     attr->shared->name = H5MM_xstrdup(name);
 
     /* Copy datatype */
-    if(NULL == (attr->shared->dt = H5T_copy(type, H5T_COPY_ALL)))
+    if (NULL == (attr->shared->dt = H5T_copy(type, H5T_COPY_ALL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "can't get shared datatype info")
 
     /* Convert a datatype (if committed) to a transient type if the committed datatype's file
        location is different from the file location where the attribute will be created */
-    if(H5T_convert_committed_datatype(attr->shared->dt, loc->oloc->file) < 0)
+    if (H5T_convert_committed_datatype(attr->shared->dt, loc->oloc->file) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "can't get shared datatype info")
 
     /* Mark datatype as being on disk now */
-    if(H5T_set_loc(attr->shared->dt, loc->oloc->file, H5T_LOC_DISK) < 0)
+    if (H5T_set_loc(attr->shared->dt, loc->oloc->file, H5T_LOC_DISK) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location")
 
     /* Set the latest format for datatype, if requested */
-    if(H5F_USE_LATEST_FORMAT(loc->oloc->file))
-        if(H5T_set_latest_version(attr->shared->dt) < 0)
+    if (H5F_USE_LATEST_FORMAT(loc->oloc->file))
+        if (H5T_set_latest_version(attr->shared->dt) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, NULL, "can't set latest version of datatype")
 
     /* Copy the dataspace for the attribute */
     attr->shared->ds = H5S_copy(space, FALSE, TRUE);
 
     /* Set the latest format for dataspace, if requested */
-    if(H5F_USE_LATEST_FORMAT(loc->oloc->file))
-        if(H5S_set_latest_version(attr->shared->ds) < 0)
+    if (H5F_USE_LATEST_FORMAT(loc->oloc->file))
+        if (H5S_set_latest_version(attr->shared->ds) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, NULL, "can't set latest version of dataspace")
 
     /* Copy the object header information */
-    if(H5O_loc_copy(&(attr->oloc), loc->oloc, H5_COPY_DEEP) < 0)
+    if (H5O_loc_copy(&(attr->oloc), loc->oloc, H5_COPY_DEEP) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to copy entry")
 
     /* Deep copy of the group hierarchy path */
-    if(H5G_name_copy(&(attr->path), loc->path, H5_COPY_DEEP) < 0)
+    if (H5G_name_copy(&(attr->path), loc->path, H5_COPY_DEEP) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, NULL, "unable to copy path")
 
     /* Check if any of the pieces should be (or are already) shared in the
      * SOHM table
      */
-    if(H5SM_try_share(attr->oloc.file, dxpl_id, NULL, 0, H5O_DTYPE_ID, attr->shared->dt, NULL) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, NULL, "trying to share datatype failed")
-    if(H5SM_try_share(attr->oloc.file, dxpl_id, NULL, 0, H5O_SDSPACE_ID, attr->shared->ds, NULL) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, NULL, "trying to share dataspace failed")
+    if (H5SM_try_share(attr->oloc.file, dxpl_id, NULL, 0, H5O_DTYPE_ID, attr->shared->dt, NULL) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, NULL, "trying to share datatype failed")
+    if (H5SM_try_share(attr->oloc.file, dxpl_id, NULL, 0, H5O_SDSPACE_ID, attr->shared->ds, NULL) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, NULL, "trying to share dataspace failed")
 
     /* Check whether datatype is committed & increment ref count
      * (to maintain ref. count incr/decr similarity with "shared message"
      *      type of datatype sharing)
      */
-    if(H5T_committed(attr->shared->dt)) {
+    if (H5T_committed(attr->shared->dt)) {
         /* Increment the reference count on the shared datatype */
-        if(H5T_link(attr->shared->dt, 1, dxpl_id) < 0)
+        if (H5T_link(attr->shared->dt, 1, dxpl_id) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, NULL, "unable to adjust shared datatype link count")
     } /* end if */
 
@@ -256,7 +247,7 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
     attr->shared->ds_size = H5O_msg_raw_size(attr->oloc.file, H5O_SDSPACE_ID, FALSE, attr->shared->ds);
 
     /* Get # of elements for attribute's dataspace */
-    if((snelmts = H5S_GET_EXTENT_NPOINTS(attr->shared->ds)) < 0)
+    if ((snelmts = H5S_GET_EXTENT_NPOINTS(attr->shared->ds)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, NULL, "dataspace is invalid")
     H5_CHECKED_ASSIGN(nelmts, size_t, snelmts, hssize_t);
 
@@ -265,29 +256,28 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
     attr->shared->data_size = nelmts * H5T_GET_SIZE(attr->shared->dt);
 
     /* Hold the symbol table entry (and file) open */
-    if(H5O_open(&(attr->oloc)) < 0)
+    if (H5O_open(&(attr->oloc)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to open")
     attr->obj_opened = TRUE;
 
     /* Set the version to encode the attribute with */
-    if(H5A_set_version(attr->oloc.file, attr) < 0)
+    if (H5A_set_version(attr->oloc.file, attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTSET, NULL, "unable to update attribute version")
 
     /* Insert the attribute into the object header */
-    if(H5O_attr_create(&(attr->oloc), dxpl_id, attr) < 0)
+    if (H5O_attr_create(&(attr->oloc), dxpl_id, attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, NULL, "unable to create attribute in object header")
 
     ret_value = attr;
 
 done:
-    if(NULL == ret_value && attr && H5A_close(attr))
+    if (NULL == ret_value && attr && H5A_close(attr))
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "can't close attribute")
 
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* H5A_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_open_common
  *
@@ -309,7 +299,7 @@ done:
 herr_t
 H5A_open_common(const H5G_loc_t *loc, H5A_t *attr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -319,24 +309,24 @@ H5A_open_common(const H5G_loc_t *loc, H5A_t *attr)
 
 #if defined(H5_USING_MEMCHECKER) || !defined(NDEBUG)
     /* Clear object location */
-    if(H5O_loc_reset(&(attr->oloc)) < 0)
+    if (H5O_loc_reset(&(attr->oloc)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to reset location")
 #endif /* H5_USING_MEMCHECKER */
 
     /* Free any previous group hier. path */
-    if(H5G_name_free(&(attr->path)) < 0)
+    if (H5G_name_free(&(attr->path)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release group hier. path")
 
     /* Deep copy of the symbol table entry */
-    if(H5O_loc_copy(&(attr->oloc), loc->oloc, H5_COPY_DEEP) < 0)
+    if (H5O_loc_copy(&(attr->oloc), loc->oloc, H5_COPY_DEEP) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to copy entry")
 
     /* Deep copy of the group hier. path */
-    if(H5G_name_copy(&(attr->path), loc->path, H5_COPY_DEEP) < 0)
+    if (H5G_name_copy(&(attr->path), loc->path, H5_COPY_DEEP) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, FAIL, "unable to copy entry")
 
     /* Hold the symbol table entry (and file) open */
-    if(H5O_open(&(attr->oloc)) < 0)
+    if (H5O_open(&(attr->oloc)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open")
     attr->obj_opened = TRUE;
 
@@ -344,7 +334,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_open_common() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_open_by_idx
  *
@@ -358,15 +347,15 @@ done:
  *-------------------------------------------------------------------------
  */
 H5A_t *
-H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t dxpl_id)
+H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                hsize_t n, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
-    H5A_t       *attr = NULL;           /* Attribute from object header */
-    H5A_t       *ret_value = NULL;      /* Return value */
+    H5G_loc_t  obj_loc;           /* Location used to open group */
+    H5G_name_t obj_path;          /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;          /* Opened object object location */
+    hbool_t    loc_found = FALSE; /* Entry at 'obj_name' found */
+    H5A_t *    attr      = NULL;  /* Attribute from object header */
+    H5A_t *    ret_value = NULL;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -380,16 +369,16 @@ H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(loc, obj_name, &obj_loc/*out*/, lapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(loc, obj_name, &obj_loc /*out*/, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, NULL, "object not found")
     loc_found = TRUE;
 
     /* Read in attribute from object header */
-    if(NULL == (attr = H5O_attr_open_by_idx(obj_loc.oloc, idx_type, order, n, dxpl_id)))
+    if (NULL == (attr = H5O_attr_open_by_idx(obj_loc.oloc, idx_type, order, n, dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to load attribute info from object header")
 
     /* Finish initializing attribute */
-    if(H5A_open_common(&obj_loc, attr) < 0)
+    if (H5A_open_common(&obj_loc, attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "unable to initialize attribute")
 
     /* Set return value */
@@ -397,18 +386,17 @@ H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type,
 
 done:
     /* Release resources */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, NULL, "can't free location")
 
     /* Cleanup on failure */
-    if(ret_value == NULL)
-        if(attr && H5A_close(attr) < 0)
+    if (ret_value == NULL)
+        if (attr && H5A_close(attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "can't close attribute")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_open_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_open_by_name
  *
@@ -422,15 +410,15 @@ done:
  *-------------------------------------------------------------------------
  */
 H5A_t *
-H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_name,
-    hid_t lapl_id, hid_t dxpl_id)
+H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_name, hid_t lapl_id,
+                 hid_t dxpl_id)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
-    H5A_t       *attr = NULL;           /* Attribute from object header */
-    H5A_t       *ret_value = NULL;      /* Return value */
+    H5G_loc_t  obj_loc;           /* Location used to open group */
+    H5G_name_t obj_path;          /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;          /* Opened object object location */
+    hbool_t    loc_found = FALSE; /* Entry at 'obj_name' found */
+    H5A_t *    attr      = NULL;  /* Attribute from object header */
+    H5A_t *    ret_value = NULL;  /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -445,16 +433,16 @@ H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_na
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(loc, obj_name, &obj_loc/*out*/, lapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(loc, obj_name, &obj_loc /*out*/, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, NULL, "object not found")
     loc_found = TRUE;
 
     /* Read in attribute from object header */
-    if(NULL == (attr = H5O_attr_open_by_name(obj_loc.oloc, attr_name, dxpl_id)))
+    if (NULL == (attr = H5O_attr_open_by_name(obj_loc.oloc, attr_name, dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "unable to load attribute info from object header")
 
     /* Finish initializing attribute */
-    if(H5A_open_common(loc, attr) < 0)
+    if (H5A_open_common(loc, attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "unable to initialize attribute")
 
     /* Set return value */
@@ -462,18 +450,17 @@ H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_na
 
 done:
     /* Release resources */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, NULL, "can't free location")
 
     /* Cleanup on failure */
-    if(ret_value == NULL)
-        if(attr && H5A_close(attr) < 0)
+    if (ret_value == NULL)
+        if (attr && H5A_close(attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "can't close attribute")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_open_by_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5A_write
@@ -493,17 +480,17 @@ done:
 herr_t
 H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id)
 {
-    uint8_t		*tconv_buf = NULL;	/* datatype conv buffer */
-    hbool_t             tconv_owned = FALSE;    /* Whether the datatype conv buffer is owned by attribute */
-    uint8_t		*bkg_buf = NULL;	/* temp conversion buffer */
-    hssize_t		snelmts;		/* elements in attribute */
-    size_t		nelmts;		    	/* elements in attribute */
-    H5T_path_t		*tpath = NULL;		/* conversion information*/
-    hid_t		src_id = -1, dst_id = -1;/* temporary type atoms */
-    size_t		src_type_size;		/* size of source type	*/
-    size_t		dst_type_size;		/* size of destination type*/
-    size_t		buf_size;		/* desired buffer size	*/
-    herr_t		ret_value = SUCCEED;
+    uint8_t *   tconv_buf   = NULL;       /* datatype conv buffer */
+    hbool_t     tconv_owned = FALSE;      /* Whether the datatype conv buffer is owned by attribute */
+    uint8_t *   bkg_buf     = NULL;       /* temp conversion buffer */
+    hssize_t    snelmts;                  /* elements in attribute */
+    size_t      nelmts;                   /* elements in attribute */
+    H5T_path_t *tpath  = NULL;            /* conversion information*/
+    hid_t       src_id = -1, dst_id = -1; /* temporary type atoms */
+    size_t      src_type_size;            /* size of source type	*/
+    size_t      dst_type_size;            /* size of destination type*/
+    size_t      buf_size;                 /* desired buffer size	*/
+    herr_t      ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -512,56 +499,57 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id)
     HDassert(buf);
 
     /* Get # of elements for attribute's dataspace */
-    if((snelmts = H5S_GET_EXTENT_NPOINTS(attr->shared->ds)) < 0)
+    if ((snelmts = H5S_GET_EXTENT_NPOINTS(attr->shared->ds)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "dataspace is invalid")
     H5_CHECKED_ASSIGN(nelmts, size_t, snelmts, hssize_t);
 
     /* If there's actually data elements for the attribute, make a copy of the data passed in */
-    if(nelmts > 0) {
+    if (nelmts > 0) {
         /* Get the memory and file datatype sizes */
         src_type_size = H5T_GET_SIZE(mem_type);
         dst_type_size = H5T_GET_SIZE(attr->shared->dt);
 
         /* Convert memory buffer into disk buffer */
         /* Set up type conversion function */
-        if(NULL == (tpath = H5T_path_find(mem_type, attr->shared->dt, NULL, NULL, dxpl_id, FALSE)))
+        if (NULL == (tpath = H5T_path_find(mem_type, attr->shared->dt, NULL, NULL, dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dst datatypes")
 
         /* Check for type conversion required */
-        if(!H5T_path_noop(tpath)) {
-            if((src_id = H5I_register(H5I_DATATYPE, H5T_copy(mem_type, H5T_COPY_ALL), FALSE)) < 0 ||
-                    (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(attr->shared->dt, H5T_COPY_ALL), FALSE)) < 0)
+        if (!H5T_path_noop(tpath)) {
+            if ((src_id = H5I_register(H5I_DATATYPE, H5T_copy(mem_type, H5T_COPY_ALL), FALSE)) < 0 ||
+                (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(attr->shared->dt, H5T_COPY_ALL), FALSE)) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
 
             /* Get the maximum buffer size needed and allocate it */
             buf_size = nelmts * MAX(src_type_size, dst_type_size);
-            if(NULL == (tconv_buf = H5FL_BLK_MALLOC(attr_buf, buf_size)))
+            if (NULL == (tconv_buf = H5FL_BLK_MALLOC(attr_buf, buf_size)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, FAIL, "memory allocation failed")
-            if(NULL == (bkg_buf = H5FL_BLK_CALLOC(attr_buf, buf_size)))
+            if (NULL == (bkg_buf = H5FL_BLK_CALLOC(attr_buf, buf_size)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
             /* Copy the user's data into the buffer for conversion */
             HDmemcpy(tconv_buf, buf, (src_type_size * nelmts));
 
             /* Perform datatype conversion */
-            if(H5T_convert(tpath, src_id, dst_id, nelmts, (size_t)0, (size_t)0, tconv_buf, bkg_buf, dxpl_id) < 0)
+            if (H5T_convert(tpath, src_id, dst_id, nelmts, (size_t)0, (size_t)0, tconv_buf, bkg_buf,
+                            dxpl_id) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "datatype conversion failed")
 
             /* Free the previous attribute data buffer, if there is one */
-            if(attr->shared->data)
+            if (attr->shared->data)
                 attr->shared->data = H5FL_BLK_FREE(attr_buf, attr->shared->data);
 
             /* Set the pointer to the attribute data to the converted information */
             attr->shared->data = tconv_buf;
-            tconv_owned = TRUE;
+            tconv_owned        = TRUE;
         } /* end if */
         /* No type conversion necessary */
         else {
             HDassert(dst_type_size == src_type_size);
 
             /* Allocate the attribute buffer, if there isn't one */
-            if(attr->shared->data == NULL)
-                if(NULL == (attr->shared->data = H5FL_BLK_MALLOC(attr_buf, dst_type_size * nelmts)))
+            if (attr->shared->data == NULL)
+                if (NULL == (attr->shared->data = H5FL_BLK_MALLOC(attr_buf, dst_type_size * nelmts)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Copy the attribute data into the user's buffer */
@@ -569,25 +557,24 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id)
         } /* end else */
 
         /* Modify the attribute in the object header */
-        if(H5O_attr_write(&(attr->oloc), dxpl_id, attr) < 0)
+        if (H5O_attr_write(&(attr->oloc), dxpl_id, attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to modify attribute")
     } /* end if */
 
 done:
     /* Release resources */
-    if(src_id >= 0 && H5I_dec_ref(src_id) < 0)
+    if (src_id >= 0 && H5I_dec_ref(src_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "unable to close temporary object")
-    if(dst_id >= 0 && H5I_dec_ref(dst_id) < 0)
+    if (dst_id >= 0 && H5I_dec_ref(dst_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "unable to close temporary object")
-    if(tconv_buf && !tconv_owned)
+    if (tconv_buf && !tconv_owned)
         tconv_buf = H5FL_BLK_FREE(attr_buf, tconv_buf);
-    if(bkg_buf)
+    if (bkg_buf)
         bkg_buf = H5FL_BLK_FREE(attr_buf, bkg_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_write() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5A_read
@@ -607,64 +594,67 @@ done:
 herr_t
 H5A_read(const H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id)
 {
-    uint8_t		*tconv_buf = NULL;	/* datatype conv buffer*/
-    uint8_t		*bkg_buf = NULL;	/* background buffer */
-    hssize_t		snelmts;		/* elements in attribute */
-    size_t		nelmts;			/* elements in attribute*/
-    H5T_path_t		*tpath = NULL;		/* type conversion info	*/
-    hid_t		src_id = -1, dst_id = -1;/* temporary type atoms*/
-    size_t		src_type_size;		/* size of source type 	*/
-    size_t		dst_type_size;		/* size of destination type */
-    size_t		buf_size;		/* desired buffer size	*/
-    herr_t		ret_value = SUCCEED;
+    uint8_t *   tconv_buf = NULL;         /* datatype conv buffer*/
+    uint8_t *   bkg_buf   = NULL;         /* background buffer */
+    hssize_t    snelmts;                  /* elements in attribute */
+    size_t      nelmts;                   /* elements in attribute*/
+    H5T_path_t *tpath  = NULL;            /* type conversion info	*/
+    hid_t       src_id = -1, dst_id = -1; /* temporary type atoms*/
+    size_t      src_type_size;            /* size of source type 	*/
+    size_t      dst_type_size;            /* size of destination type */
+    size_t      buf_size;                 /* desired buffer size	*/
+    herr_t      ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(attr);
     HDassert(mem_type);
     HDassert(buf);
-    
+
     /* Patch the top level file pointer in attr->shared->dt->shared->u.vlen.f if needed */
-    if(H5T_patch_vlen_file(attr->shared->dt, attr->oloc.file) < 0 )
+    if (H5T_patch_vlen_file(attr->shared->dt, attr->oloc.file) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch VL datatype file pointer")
 
     /* Create buffer for data to store on disk */
-    if((snelmts = H5S_GET_EXTENT_NPOINTS(attr->shared->ds)) < 0)
+    if ((snelmts = H5S_GET_EXTENT_NPOINTS(attr->shared->ds)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "dataspace is invalid")
     H5_CHECKED_ASSIGN(nelmts, size_t, snelmts, hssize_t);
 
-    if(nelmts > 0) {
+    if (nelmts > 0) {
         /* Get the memory and file datatype sizes */
         src_type_size = H5T_GET_SIZE(attr->shared->dt);
         dst_type_size = H5T_GET_SIZE(mem_type);
 
         /* Check if the attribute has any data yet, if not, fill with zeroes */
-        if(attr->obj_opened && !attr->shared->data)
+        if (attr->obj_opened && !attr->shared->data)
             HDmemset(buf, 0, (dst_type_size * nelmts));
-        else {  /* Attribute exists and has a value */
+        else { /* Attribute exists and has a value */
             /* Convert memory buffer into disk buffer */
             /* Set up type conversion function */
-            if(NULL == (tpath = H5T_path_find(attr->shared->dt, mem_type, NULL, NULL, dxpl_id, FALSE)))
-                HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dst datatypes")
+            if (NULL == (tpath = H5T_path_find(attr->shared->dt, mem_type, NULL, NULL, dxpl_id, FALSE)))
+                HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL,
+                            "unable to convert between src and dst datatypes")
 
             /* Check for type conversion required */
-            if(!H5T_path_noop(tpath)) {
-                if((src_id = H5I_register(H5I_DATATYPE, H5T_copy(attr->shared->dt, H5T_COPY_ALL), FALSE)) < 0 ||
-                        (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(mem_type, H5T_COPY_ALL), FALSE)) < 0)
+            if (!H5T_path_noop(tpath)) {
+                if ((src_id = H5I_register(H5I_DATATYPE, H5T_copy(attr->shared->dt, H5T_COPY_ALL), FALSE)) <
+                        0 ||
+                    (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(mem_type, H5T_COPY_ALL), FALSE)) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
 
                 /* Get the maximum buffer size needed and allocate it */
                 buf_size = nelmts * MAX(src_type_size, dst_type_size);
-                if(NULL == (tconv_buf = H5FL_BLK_MALLOC(attr_buf, buf_size)))
+                if (NULL == (tconv_buf = H5FL_BLK_MALLOC(attr_buf, buf_size)))
                     HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, FAIL, "memory allocation failed")
-                if(NULL == (bkg_buf = H5FL_BLK_CALLOC(attr_buf, buf_size)))
+                if (NULL == (bkg_buf = H5FL_BLK_CALLOC(attr_buf, buf_size)))
                     HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, FAIL, "memory allocation failed")
 
                 /* Copy the attribute data into the buffer for conversion */
                 HDmemcpy(tconv_buf, attr->shared->data, (src_type_size * nelmts));
 
                 /* Perform datatype conversion.  */
-                if(H5T_convert(tpath, src_id, dst_id, nelmts, (size_t)0, (size_t)0, tconv_buf, bkg_buf, dxpl_id) < 0)
+                if (H5T_convert(tpath, src_id, dst_id, nelmts, (size_t)0, (size_t)0, tconv_buf, bkg_buf,
+                                dxpl_id) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "datatype conversion failed")
 
                 /* Copy the converted data into the user's buffer */
@@ -677,24 +667,23 @@ H5A_read(const H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id)
                 /* Copy the attribute data into the user's buffer */
                 HDmemcpy(buf, attr->shared->data, (dst_type_size * nelmts));
             } /* end else */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
 
 done:
     /* Release resources */
-    if(src_id >= 0 && H5I_dec_ref(src_id) < 0)
+    if (src_id >= 0 && H5I_dec_ref(src_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "unable to close temporary object")
-    if(dst_id >= 0 && H5I_dec_ref(dst_id) < 0)
+    if (dst_id >= 0 && H5I_dec_ref(dst_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "unable to close temporary object")
-    if(tconv_buf)
+    if (tconv_buf)
         tconv_buf = H5FL_BLK_FREE(attr_buf, tconv_buf);
-    if(bkg_buf)
-	bkg_buf = H5FL_BLK_FREE(attr_buf, bkg_buf);
+    if (bkg_buf)
+        bkg_buf = H5FL_BLK_FREE(attr_buf, bkg_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_get_space
  *
@@ -719,14 +708,13 @@ H5A_get_space(H5A_t *attr)
     HDassert(attr);
 
     /* Copy the attribute's dataspace */
-    if(NULL == (ret_value = H5S_copy(attr->shared->ds, FALSE, TRUE)))
+    if (NULL == (ret_value = H5S_copy(attr->shared->ds, FALSE, TRUE)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "unable to copy dataspace")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_get_space() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_get_type
  *
@@ -744,7 +732,7 @@ done:
 H5T_t *
 H5A_get_type(H5A_t *attr)
 {
-    H5T_t *dt = NULL;
+    H5T_t *dt        = NULL;
     H5T_t *ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -752,7 +740,7 @@ H5A_get_type(H5A_t *attr)
     HDassert(attr);
 
     /* Patch the datatype's "top level" file pointer */
-    if(H5T_patch_file(attr->shared->dt, attr->oloc.file) < 0)
+    if (H5T_patch_file(attr->shared->dt, attr->oloc.file) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "unable to patch datatype's file pointer")
 
     /*
@@ -760,27 +748,26 @@ H5A_get_type(H5A_t *attr)
      * reopen the type before returning it to the user. Make the type
      * read-only.
      */
-    if(NULL == (dt = H5T_copy(attr->shared->dt, H5T_COPY_REOPEN)))
+    if (NULL == (dt = H5T_copy(attr->shared->dt, H5T_COPY_REOPEN)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "unable to copy datatype")
 
     /* Mark any datatypes as being in memory now */
-    if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
+    if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location")
 
     /* Lock copied type */
-    if(H5T_lock(dt, FALSE) < 0)
+    if (H5T_lock(dt, FALSE) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to lock transient datatype")
 
     ret_value = dt;
 
 done:
-    if(!ret_value && dt && (H5T_close(dt) < 0))
+    if (!ret_value && dt && (H5T_close(dt) < 0))
         HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release datatype")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_get_type() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5A_get_create_plist
@@ -798,25 +785,25 @@ done:
     resource leaks will occur.
 --------------------------------------------------------------------------*/
 hid_t
-H5A_get_create_plist(H5A_t* attr)
+H5A_get_create_plist(H5A_t *attr)
 {
-    H5P_genplist_t      *plist;              /* Default property list */
-    hid_t               new_plist_id;        /* ID of ACPL to return */
-    H5P_genplist_t      *new_plist;          /* ACPL to return */
-    hid_t               ret_value;
+    H5P_genplist_t *plist;        /* Default property list */
+    hid_t           new_plist_id; /* ID of ACPL to return */
+    H5P_genplist_t *new_plist;    /* ACPL to return */
+    hid_t           ret_value;
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(H5P_LST_ATTRIBUTE_CREATE_ID_g)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(H5P_LST_ATTRIBUTE_CREATE_ID_g)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "can't get default ACPL")
 
     /* Create the property list object to return */
-    if((new_plist_id = H5P_copy_plist(plist, TRUE)) < 0)
-	HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to copy attribute creation properties")
-    if(NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_plist_id)))
+    if ((new_plist_id = H5P_copy_plist(plist, TRUE)) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to copy attribute creation properties")
+    if (NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_plist_id)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Set the character encoding on the new property list */
-    if(H5P_set(new_plist, H5P_STRCRT_CHAR_ENCODING_NAME, &(attr->shared->encoding)) < 0)
+    if (H5P_set(new_plist, H5P_STRCRT_CHAR_ENCODING_NAME, &(attr->shared->encoding)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set character encoding")
 
     ret_value = new_plist_id;
@@ -825,7 +812,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Aget_create_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5A_get_name
@@ -845,8 +831,8 @@ done:
 ssize_t
 H5A_get_name(H5A_t *attr, size_t buf_size, char *buf)
 {
-    size_t              copy_len, nbytes;
-    ssize_t		ret_value;
+    size_t  copy_len, nbytes;
+    ssize_t ret_value;
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -858,11 +844,11 @@ H5A_get_name(H5A_t *attr, size_t buf_size, char *buf)
     copy_len = MIN(buf_size - 1, nbytes);
 
     /* Copy all/some of the name */
-    if(buf && copy_len > 0) {
+    if (buf && copy_len > 0) {
         HDmemcpy(buf, attr->shared->name, copy_len);
 
         /* Terminate the string */
-        buf[copy_len]='\0';
+        buf[copy_len] = '\0';
     } /* end if */
 
     /* Set return value */
@@ -871,7 +857,6 @@ H5A_get_name(H5A_t *attr, size_t buf_size, char *buf)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_get_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_get_info
  *
@@ -895,21 +880,20 @@ H5A_get_info(const H5A_t *attr, H5A_info_t *ainfo)
     HDassert(ainfo);
 
     /* Set info for attribute */
-    ainfo->cset = attr->shared->encoding;
+    ainfo->cset      = attr->shared->encoding;
     ainfo->data_size = attr->shared->data_size;
-    if(attr->shared->crt_idx == H5O_MAX_CRT_ORDER_IDX) {
+    if (attr->shared->crt_idx == H5O_MAX_CRT_ORDER_IDX) {
         ainfo->corder_valid = FALSE;
-        ainfo->corder = 0;
+        ainfo->corder       = 0;
     } /* end if */
     else {
         ainfo->corder_valid = TRUE;
-        ainfo->corder = attr->shared->crt_idx;
+        ainfo->corder       = attr->shared->crt_idx;
     } /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5A_get_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_copy
  *
@@ -927,9 +911,9 @@ H5A_get_info(const H5A_t *attr, H5A_info_t *ainfo)
 H5A_t *
 H5A_copy(H5A_t *_new_attr, const H5A_t *old_attr)
 {
-    H5A_t	*new_attr = NULL;
-    hbool_t     allocated_attr = FALSE;   /* Whether the attribute was allocated */
-    H5A_t	*ret_value = NULL;        /* Return value */
+    H5A_t * new_attr       = NULL;
+    hbool_t allocated_attr = FALSE; /* Whether the attribute was allocated */
+    H5A_t * ret_value      = NULL;  /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -937,8 +921,8 @@ H5A_copy(H5A_t *_new_attr, const H5A_t *old_attr)
     HDassert(old_attr);
 
     /* Allocate attribute structure */
-    if(_new_attr == NULL) {
-        if(NULL == (new_attr = H5FL_CALLOC(H5A_t)))
+    if (_new_attr == NULL) {
+        if (NULL == (new_attr = H5FL_CALLOC(H5A_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
         allocated_attr = TRUE;
     } /* end if */
@@ -949,7 +933,7 @@ H5A_copy(H5A_t *_new_attr, const H5A_t *old_attr)
     new_attr->sh_loc = old_attr->sh_loc;
 
     /* Deep copy of the group hierarchy path */
-    if(H5G_name_copy(&(new_attr->path), &(old_attr->path), H5_COPY_DEEP) < 0)
+    if (H5G_name_copy(&(new_attr->path), &(old_attr->path), H5_COPY_DEEP) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, NULL, "unable to copy path")
 
     /* Share some attribute information */
@@ -965,14 +949,13 @@ H5A_copy(H5A_t *_new_attr, const H5A_t *old_attr)
     ret_value = new_attr;
 
 done:
-    if(ret_value == NULL)
-        if(allocated_attr && new_attr && H5A_close(new_attr) < 0)
+    if (ret_value == NULL)
+        if (allocated_attr && new_attr && H5A_close(new_attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "can't close attribute")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_free
  *
@@ -991,35 +974,34 @@ done:
 herr_t
 H5A_free(H5A_t *attr)
 {
-    herr_t ret_value = SUCCEED;           /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(attr);
 
     /* Free dynamically allocated items */
-    if(attr->shared->name) {
+    if (attr->shared->name) {
         H5MM_xfree(attr->shared->name);
         attr->shared->name = NULL;
     }
-    if(attr->shared->dt) {
-        if(H5T_close(attr->shared->dt) < 0)
-	    HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release datatype info")
+    if (attr->shared->dt) {
+        if (H5T_close(attr->shared->dt) < 0)
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release datatype info")
         attr->shared->dt = NULL;
     }
-    if(attr->shared->ds) {
-        if(H5S_close(attr->shared->ds) < 0)
-	    HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release dataspace info")
+    if (attr->shared->ds) {
+        if (H5S_close(attr->shared->ds) < 0)
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release dataspace info")
         attr->shared->ds = NULL;
     }
-    if(attr->shared->data)
+    if (attr->shared->data)
         attr->shared->data = H5FL_BLK_FREE(attr_buf, attr->shared->data);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_close
  *
@@ -1035,7 +1017,7 @@ done:
 herr_t
 H5A_close(H5A_t *attr)
 {
-    herr_t ret_value = SUCCEED;           /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1043,13 +1025,13 @@ H5A_close(H5A_t *attr)
     HDassert(attr->shared);
 
     /* Close the object's symbol-table entry */
-    if(attr->obj_opened && (H5O_close(&(attr->oloc)) < 0))
+    if (attr->obj_opened && (H5O_close(&(attr->oloc)) < 0))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release object header info")
 
     /* Reference count can be 0.  It only happens when H5A_create fails. */
-    if(attr->shared->nrefs <= 1) {
+    if (attr->shared->nrefs <= 1) {
         /* Free dynamically allocated items */
-        if(H5A_free(attr) < 0)
+        if (H5A_free(attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release attribute info")
 
         /* Destroy shared attribute struct */
@@ -1062,17 +1044,16 @@ H5A_close(H5A_t *attr)
     } /* end else */
 
     /* Free group hierarchy path */
-    if(H5G_name_free(&(attr->path)) < 0)
+    if (H5G_name_free(&(attr->path)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release group hier. path")
 
     attr->shared = NULL;
-    attr = H5FL_FREE(H5A_t, attr);
+    attr         = H5FL_FREE(H5A_t, attr);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_oloc
  *
@@ -1091,7 +1072,7 @@ done:
 H5O_loc_t *
 H5A_oloc(H5A_t *attr)
 {
-    H5O_loc_t *ret_value;   /* Return value */
+    H5O_loc_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -1103,7 +1084,6 @@ H5A_oloc(H5A_t *attr)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_oloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_nameof
  *
@@ -1122,19 +1102,18 @@ H5A_oloc(H5A_t *attr)
 H5G_name_t *
 H5A_nameof(H5A_t *attr)
 {
-    H5G_name_t *ret_value;   /* Return value */
+    H5G_name_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
     HDassert(attr);
 
     /* Set return value */
-    ret_value=&(attr->path);
+    ret_value = &(attr->path);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_nameof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A_type
  *
@@ -1151,7 +1130,7 @@ H5A_nameof(H5A_t *attr)
 H5T_t *
 H5A_type(const H5A_t *attr)
 {
-    H5T_t *ret_value;   /* Return value */
+    H5T_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -1163,7 +1142,6 @@ H5A_type(const H5A_t *attr)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_exists_by_name
  *
@@ -1178,14 +1156,13 @@ H5A_type(const H5A_t *attr)
  *-------------------------------------------------------------------------
  */
 htri_t
-H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name,
-                   hid_t lapl_id, hid_t dxpl_id)
+H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
-    htri_t	ret_value = FAIL;       /* Return value */
+    H5G_loc_t  obj_loc;           /* Location used to open group */
+    H5G_name_t obj_path;          /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;          /* Opened object object location */
+    hbool_t    loc_found = FALSE; /* Entry at 'obj_name' found */
+    htri_t     ret_value = FAIL;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1195,23 +1172,22 @@ H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(&loc, obj_name, &obj_loc /*out*/, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Check if the attribute exists */
-    if((ret_value = H5O_attr_exists(obj_loc.oloc, attr_name, dxpl_id)) < 0)
+    if ((ret_value = H5O_attr_exists(obj_loc.oloc, attr_name, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to determine if attribute exists")
 
 done:
     /* Release resources */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_exists_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A__compact_build_table_cb
  *
@@ -1231,11 +1207,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5A__compact_build_table_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned sequence, unsigned H5_ATTR_UNUSED *oh_modified, void *_udata/*in,out*/)
+H5A__compact_build_table_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence,
+                            unsigned H5_ATTR_UNUSED *oh_modified, void *_udata /*in,out*/)
 {
-    H5A_compact_bt_ud_t *udata = (H5A_compact_bt_ud_t *)_udata;   /* Operator user data */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    H5A_compact_bt_ud_t *udata     = (H5A_compact_bt_ud_t *)_udata; /* Operator user data */
+    herr_t               ret_value = H5_ITER_CONT;                  /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1243,26 +1219,26 @@ H5A__compact_build_table_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/
     HDassert(mesg);
 
     /* Re-allocate the table if necessary */
-    if(udata->curr_attr == udata->atable->nattrs) {
-        H5A_t **new_table;          /* New table for attributes */
-        size_t new_table_size;      /* Number of attributes in new table */
+    if (udata->curr_attr == udata->atable->nattrs) {
+        H5A_t **new_table;      /* New table for attributes */
+        size_t  new_table_size; /* Number of attributes in new table */
 
         /* Allocate larger table */
         new_table_size = MAX(1, 2 * udata->atable->nattrs);
-        if(NULL == (new_table = (H5A_t **)H5FL_SEQ_REALLOC(H5A_t_ptr, udata->atable->attrs, new_table_size)))
+        if (NULL == (new_table = (H5A_t **)H5FL_SEQ_REALLOC(H5A_t_ptr, udata->atable->attrs, new_table_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, H5_ITER_ERROR, "unable to extend attribute table")
 
         /* Update table information in user data */
-        udata->atable->attrs = new_table;
+        udata->atable->attrs  = new_table;
         udata->atable->nattrs = new_table_size;
     } /* end if */
 
     /* Copy attribute into table */
-    if(NULL == (udata->atable->attrs[udata->curr_attr] = H5A_copy(NULL, (const H5A_t *)mesg->native)))
+    if (NULL == (udata->atable->attrs[udata->curr_attr] = H5A_copy(NULL, (const H5A_t *)mesg->native)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy attribute")
 
     /* Assign [somewhat arbitrary] creation order value, if requested */
-    if(udata->bogus_crt_idx)
+    if (udata->bogus_crt_idx)
         ((udata->atable->attrs[udata->curr_attr])->shared)->crt_idx = sequence;
 
     /* Increment current attribute */
@@ -1272,7 +1248,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__compact_build_table_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_compact_build_table
  *
@@ -1290,12 +1265,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type,
-    H5_iter_order_t order, H5A_attr_table_t *atable)
+H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type, H5_iter_order_t order,
+                        H5A_attr_table_t *atable)
 {
-    H5A_compact_bt_ud_t udata;                  /* User data for iteration callback */
-    H5O_mesg_operator_t op;             /* Wrapper for operator */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_compact_bt_ud_t udata;               /* User data for iteration callback */
+    H5O_mesg_operator_t op;                  /* Wrapper for operator */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1305,30 +1280,30 @@ H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type,
     HDassert(atable);
 
     /* Initialize table */
-    atable->attrs = NULL;
+    atable->attrs  = NULL;
     atable->nattrs = 0;
 
     /* Set up user data for iteration */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.atable = atable;
-    udata.curr_attr = 0;
-    udata.bogus_crt_idx = (hbool_t)((oh->version == H5O_VERSION_1 ||
-            !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)) ? TRUE : FALSE);
+    udata.f             = f;
+    udata.dxpl_id       = dxpl_id;
+    udata.atable        = atable;
+    udata.curr_attr     = 0;
+    udata.bogus_crt_idx = (hbool_t)(
+        (oh->version == H5O_VERSION_1 || !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)) ? TRUE : FALSE);
 
     /* Iterate over existing attributes, checking for attribute with same name */
-    op.op_type = H5O_MESG_OP_LIB;
+    op.op_type  = H5O_MESG_OP_LIB;
     op.u.lib_op = H5A__compact_build_table_cb;
-    if(H5O_msg_iterate_real(f, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+    if (H5O_msg_iterate_real(f, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_BADITER, FAIL, "error building attribute table")
 
     /* Correct # of attributes in table */
     atable->nattrs = udata.curr_attr;
 
     /* Don't sort an empty table. */
-    if(atable->nattrs > 0) {
+    if (atable->nattrs > 0) {
         /* Sort attribute table in correct iteration order */
-        if(H5A__attr_sort_table(atable, idx_type, order) < 0)
+        if (H5A__attr_sort_table(atable, idx_type, order) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTSORT, FAIL, "error sorting attribute table")
     } /* end if */
 
@@ -1336,7 +1311,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_compact_build_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_build_table_cb
  *
@@ -1355,8 +1329,8 @@ done:
 static herr_t
 H5A_dense_build_table_cb(const H5A_t *attr, void *_udata)
 {
-    H5A_dense_bt_ud_t *udata = (H5A_dense_bt_ud_t *)_udata;     /* 'User data' passed in */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    H5A_dense_bt_ud_t *udata     = (H5A_dense_bt_ud_t *)_udata; /* 'User data' passed in */
+    herr_t             ret_value = H5_ITER_CONT;                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1366,11 +1340,11 @@ H5A_dense_build_table_cb(const H5A_t *attr, void *_udata)
     HDassert(udata->curr_attr < udata->atable->nattrs);
 
     /* Allocate attribute for entry in the table */
-    if(NULL == (udata->atable->attrs[udata->curr_attr] = H5FL_CALLOC(H5A_t)))
+    if (NULL == (udata->atable->attrs[udata->curr_attr] = H5FL_CALLOC(H5A_t)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, H5_ITER_ERROR, "can't allocate attribute")
 
     /* Copy attribute information.  Share the attribute object in copying. */
-    if(NULL == H5A_copy(udata->atable->attrs[udata->curr_attr], attr))
+    if (NULL == H5A_copy(udata->atable->attrs[udata->curr_attr], attr))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy attribute")
 
     /* Increment number of attributes stored */
@@ -1380,7 +1354,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_build_table_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_build_table
  *
@@ -1399,12 +1372,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    H5_index_t idx_type, H5_iter_order_t order, H5A_attr_table_t *atable)
+H5A_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5_index_t idx_type,
+                      H5_iter_order_t order, H5A_attr_table_t *atable)
 {
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    hsize_t nrec;                       /* # of records in v2 B-tree */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5B2_t *bt2_name = NULL;     /* v2 B-tree handle for name index */
+    hsize_t nrec;                /* # of records in v2 B-tree */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1416,12 +1389,12 @@ H5A_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
     HDassert(atable);
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Retrieve # of records in "name" B-tree */
     /* (should be same # of records in all indices) */
-    if(H5B2_get_nrec(bt2_name, &nrec) < 0)
+    if (H5B2_get_nrec(bt2_name, &nrec) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve # of records in index")
 
     /* Set size of table */
@@ -1429,29 +1402,29 @@ H5A_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
     atable->nattrs = (size_t)nrec;
 
     /* Allocate space for the table entries */
-    if(atable->nattrs > 0) {
-        H5A_dense_bt_ud_t udata;       /* User data for iteration callback */
-        H5A_attr_iter_op_t attr_op;    /* Attribute operator */
+    if (atable->nattrs > 0) {
+        H5A_dense_bt_ud_t  udata;   /* User data for iteration callback */
+        H5A_attr_iter_op_t attr_op; /* Attribute operator */
 
         /* Allocate the table to store the attributes */
-        if((atable->attrs = (H5A_t **)H5FL_SEQ_CALLOC(H5A_t_ptr, atable->nattrs)) == NULL)
+        if ((atable->attrs = (H5A_t **)H5FL_SEQ_CALLOC(H5A_t_ptr, atable->nattrs)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Set up user data for iteration */
-        udata.atable = atable;
+        udata.atable    = atable;
         udata.curr_attr = 0;
 
         /* Build iterator operator */
-        attr_op.op_type = H5A_ATTR_OP_LIB;
+        attr_op.op_type  = H5A_ATTR_OP_LIB;
         attr_op.u.lib_op = H5A_dense_build_table_cb;
 
         /* Iterate over the links in the group, building a table of the link messages */
-        if(H5A_dense_iterate(f, dxpl_id, (hid_t)0, ainfo, H5_INDEX_NAME,
-                H5_ITER_NATIVE, (hsize_t)0, NULL, &attr_op, &udata) < 0)
+        if (H5A_dense_iterate(f, dxpl_id, (hid_t)0, ainfo, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL,
+                              &attr_op, &udata) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "error building attribute table")
 
         /* Sort attribute table in correct iteration order */
-        if(H5A__attr_sort_table(atable, idx_type, order) < 0)
+        if (H5A__attr_sort_table(atable, idx_type, order) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTSORT, FAIL, "error sorting attribute table")
     } /* end if */
     else
@@ -1459,13 +1432,12 @@ H5A_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_build_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A__attr_cmp_name_inc
  *
@@ -1489,11 +1461,10 @@ H5A__attr_cmp_name_inc(const void *attr1, const void *attr2)
 {
     FUNC_ENTER_STATIC_NOERR
 
-    FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t * const *)attr1)->shared->name,
-            (*(const H5A_t * const *)attr2)->shared->name))
+    FUNC_LEAVE_NOAPI(
+        HDstrcmp((*(const H5A_t *const *)attr1)->shared->name, (*(const H5A_t *const *)attr2)->shared->name))
 } /* end H5A__attr_cmp_name_inc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A__attr_cmp_name_dec
  *
@@ -1517,11 +1488,10 @@ H5A__attr_cmp_name_dec(const void *attr1, const void *attr2)
 {
     FUNC_ENTER_STATIC_NOERR
 
-    FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t * const *)attr2)->shared->name,
-            (*(const H5A_t * const *)attr1)->shared->name))
+    FUNC_LEAVE_NOAPI(
+        HDstrcmp((*(const H5A_t *const *)attr2)->shared->name, (*(const H5A_t *const *)attr1)->shared->name))
 } /* end H5A__attr_cmp_name_dec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A__attr_cmp_corder_inc
  *
@@ -1542,13 +1512,14 @@ H5A__attr_cmp_name_dec(const void *attr1, const void *attr2)
 static int
 H5A__attr_cmp_corder_inc(const void *attr1, const void *attr2)
 {
-    int ret_value = 0;          /* Return value */
+    int ret_value = 0; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
-    if((*(const H5A_t * const *)attr1)->shared->crt_idx < (*(const H5A_t * const *)attr2)->shared->crt_idx)
+    if ((*(const H5A_t *const *)attr1)->shared->crt_idx < (*(const H5A_t *const *)attr2)->shared->crt_idx)
         ret_value = -1;
-    else if((*(const H5A_t * const *)attr1)->shared->crt_idx > (*(const H5A_t * const *)attr2)->shared->crt_idx)
+    else if ((*(const H5A_t *const *)attr1)->shared->crt_idx >
+             (*(const H5A_t *const *)attr2)->shared->crt_idx)
         ret_value = 1;
     else
         ret_value = 0;
@@ -1556,7 +1527,6 @@ H5A__attr_cmp_corder_inc(const void *attr1, const void *attr2)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__attr_cmp_corder_inc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A__attr_cmp_corder_dec
  *
@@ -1577,13 +1547,14 @@ H5A__attr_cmp_corder_inc(const void *attr1, const void *attr2)
 static int
 H5A__attr_cmp_corder_dec(const void *attr1, const void *attr2)
 {
-    int ret_value = 0;              /* Return value */
+    int ret_value = 0; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
-    if((*(const H5A_t * const *)attr1)->shared->crt_idx < (*(const H5A_t * const *)attr2)->shared->crt_idx)
+    if ((*(const H5A_t *const *)attr1)->shared->crt_idx < (*(const H5A_t *const *)attr2)->shared->crt_idx)
         ret_value = 1;
-    else if((*(const H5A_t * const *)attr1)->shared->crt_idx > (*(const H5A_t * const *)attr2)->shared->crt_idx)
+    else if ((*(const H5A_t *const *)attr1)->shared->crt_idx >
+             (*(const H5A_t *const *)attr2)->shared->crt_idx)
         ret_value = -1;
     else
         ret_value = 0;
@@ -1591,7 +1562,6 @@ H5A__attr_cmp_corder_dec(const void *attr1, const void *attr2)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__attr_cmp_corder_dec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A__attr_sort_table
  *
@@ -1606,8 +1576,7 @@ H5A__attr_cmp_corder_dec(const void *attr1, const void *attr2)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5A__attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type,
-    H5_iter_order_t order)
+H5A__attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type, H5_iter_order_t order)
 {
     FUNC_ENTER_STATIC_NOERR
 
@@ -1615,20 +1584,20 @@ H5A__attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type,
     HDassert(atable);
 
     /* Pick appropriate comparison routine */
-    if(idx_type == H5_INDEX_NAME) {
-        if(order == H5_ITER_INC)
-            HDqsort(atable->attrs, atable->nattrs, sizeof(H5A_t*), H5A__attr_cmp_name_inc);
-        else if(order == H5_ITER_DEC)
-            HDqsort(atable->attrs, atable->nattrs, sizeof(H5A_t*), H5A__attr_cmp_name_dec);
+    if (idx_type == H5_INDEX_NAME) {
+        if (order == H5_ITER_INC)
+            HDqsort(atable->attrs, atable->nattrs, sizeof(H5A_t *), H5A__attr_cmp_name_inc);
+        else if (order == H5_ITER_DEC)
+            HDqsort(atable->attrs, atable->nattrs, sizeof(H5A_t *), H5A__attr_cmp_name_dec);
         else
             HDassert(order == H5_ITER_NATIVE);
     } /* end if */
     else {
         HDassert(idx_type == H5_INDEX_CRT_ORDER);
-        if(order == H5_ITER_INC)
-            HDqsort(atable->attrs, atable->nattrs, sizeof(H5A_t*), H5A__attr_cmp_corder_inc);
-        else if(order == H5_ITER_DEC)
-            HDqsort(atable->attrs, atable->nattrs, sizeof(H5A_t*), H5A__attr_cmp_corder_dec);
+        if (order == H5_ITER_INC)
+            HDqsort(atable->attrs, atable->nattrs, sizeof(H5A_t *), H5A__attr_cmp_corder_inc);
+        else if (order == H5_ITER_DEC)
+            HDqsort(atable->attrs, atable->nattrs, sizeof(H5A_t *), H5A__attr_cmp_corder_dec);
         else
             HDassert(order == H5_ITER_NATIVE);
     } /* end else */
@@ -1636,7 +1605,6 @@ H5A__attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5A__attr_sort_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_attr_iterate_table
  *
@@ -1652,12 +1620,11 @@ H5A__attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip,
-    hsize_t *last_attr, hid_t loc_id, const H5A_attr_iter_op_t *attr_op,
-    void *op_data)
+H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip, hsize_t *last_attr, hid_t loc_id,
+                       const H5A_attr_iter_op_t *attr_op, void *op_data)
 {
-    size_t u;                           /* Local index variable */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    size_t u;                        /* Local index variable */
+    herr_t ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1666,20 +1633,19 @@ H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip,
     HDassert(attr_op);
 
     /* Skip over attributes, if requested */
-    if(last_attr)
+    if (last_attr)
         *last_attr = skip;
 
     /* Iterate over attribute messages */
     H5_CHECKED_ASSIGN(u, size_t, skip, hsize_t)
-    for(; u < atable->nattrs && !ret_value; u++) {
+    for (; u < atable->nattrs && !ret_value; u++) {
         /* Check which type of callback to make */
-        switch(attr_op->op_type) {
-            case H5A_ATTR_OP_APP2:
-            {
-                H5A_info_t ainfo;               /* Info for attribute */
+        switch (attr_op->op_type) {
+            case H5A_ATTR_OP_APP2: {
+                H5A_info_t ainfo; /* Info for attribute */
 
                 /* Get the attribute information */
-                if(H5A_get_info(atable->attrs[u], &ainfo) < 0)
+                if (H5A_get_info(atable->attrs[u], &ainfo) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, H5_ITER_ERROR, "unable to get attribute info")
 
                 /* Make the application callback */
@@ -1703,23 +1669,22 @@ H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip,
                 HDassert("unknown attribute op type" && 0);
 #ifdef NDEBUG
                 HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type")
-#endif /* NDEBUG */
+#endif    /* NDEBUG */
         } /* end switch */
 
         /* Increment the number of entries passed through */
-        if(last_attr)
+        if (last_attr)
             (*last_attr)++;
     } /* end for */
 
     /* Check for callback failure and pass along return value */
-    if(ret_value < 0)
+    if (ret_value < 0)
         HERROR(H5E_ATTR, H5E_CANTNEXT, "iteration operator failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_attr_iterate_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	  H5A_attr_release_table
  *
@@ -1736,7 +1701,7 @@ done:
 herr_t
 H5A_attr_release_table(H5A_attr_table_t *atable)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1744,12 +1709,12 @@ H5A_attr_release_table(H5A_attr_table_t *atable)
     HDassert(atable);
 
     /* Release attribute info, if any. */
-    if(atable->nattrs > 0) {
-        size_t      u;               /* Local index variable */
+    if (atable->nattrs > 0) {
+        size_t u; /* Local index variable */
 
         /* Free attribute message information */
-        for(u = 0; u < atable->nattrs; u++)
-            if(atable->attrs[u] && H5A_close(atable->attrs[u]) < 0)
+        for (u = 0; u < atable->nattrs; u++)
+            if (atable->attrs[u] && H5A_close(atable->attrs[u]) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to release attribute")
     } /* end if */
     else
@@ -1761,7 +1726,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_attr_release_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A_get_ainfo
  *
@@ -1780,8 +1744,8 @@ done:
 htri_t
 H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo)
 {
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    htri_t ret_value;   /* Return value */
+    H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
+    htri_t  ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1791,41 +1755,40 @@ H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo)
     HDassert(ainfo);
 
     /* Check if the "attribute info" message exists */
-    if((ret_value = H5O_msg_exists_oh(oh, H5O_AINFO_ID)) < 0)
-	HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "unable to check object header")
-    if(ret_value > 0) {
+    if ((ret_value = H5O_msg_exists_oh(oh, H5O_AINFO_ID)) < 0)
+        HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "unable to check object header")
+    if (ret_value > 0) {
         /* Retrieve the "attribute info" structure */
-        if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_AINFO_ID, ainfo))
-	    HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't read AINFO message")
+        if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_AINFO_ID, ainfo))
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't read AINFO message")
 
         /* Check if we don't know how many attributes there are */
-        if(ainfo->nattrs == HSIZET_MAX) {
+        if (ainfo->nattrs == HSIZET_MAX) {
             /* Check if we are using "dense" attribute storage */
-            if(H5F_addr_defined(ainfo->fheap_addr)) {
+            if (H5F_addr_defined(ainfo->fheap_addr)) {
                 /* Open the name index v2 B-tree */
-                if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
+                if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo->name_bt2_addr, NULL)))
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
                 /* Retrieve # of records in "name" B-tree */
                 /* (should be same # of records in all indices) */
-                if(H5B2_get_nrec(bt2_name, &ainfo->nattrs) < 0)
+                if (H5B2_get_nrec(bt2_name, &ainfo->nattrs) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve # of records in index")
             } /* end if */
             else
                 /* Retrieve # of attributes from object header */
                 ainfo->nattrs = oh->attr_msgs_seen;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_get_ainfo() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A_set_version
  *
@@ -1845,8 +1808,9 @@ done:
 herr_t
 H5A_set_version(const H5F_t *f, H5A_t *attr)
 {
-    hbool_t type_shared, space_shared;  /* Flags to indicate that shared messages are used for this attribute */
-    hbool_t use_latest_format;          /* Flag indicating the newest file format should be used */
+    hbool_t type_shared,
+        space_shared;          /* Flags to indicate that shared messages are used for this attribute */
+    hbool_t use_latest_format; /* Flag indicating the newest file format should be used */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -1858,30 +1822,30 @@ H5A_set_version(const H5F_t *f, H5A_t *attr)
     use_latest_format = H5F_USE_LATEST_FORMAT(f);
 
     /* Check whether datatype and dataspace are shared */
-    if(H5O_msg_is_shared(H5O_DTYPE_ID, attr->shared->dt) > 0)
+    if (H5O_msg_is_shared(H5O_DTYPE_ID, attr->shared->dt) > 0)
         type_shared = TRUE;
     else
         type_shared = FALSE;
 
-    if(H5O_msg_is_shared(H5O_SDSPACE_ID, attr->shared->ds) > 0)
+    if (H5O_msg_is_shared(H5O_SDSPACE_ID, attr->shared->ds) > 0)
         space_shared = TRUE;
     else
         space_shared = FALSE;
 
     /* Check which version to encode attribute with */
-    if(use_latest_format)
-        attr->shared->version = H5O_ATTR_VERSION_LATEST;      /* Write out latest version of format */
-    else if(attr->shared->encoding != H5T_CSET_ASCII)
-        attr->shared->version = H5O_ATTR_VERSION_3;   /* Write version which includes the character encoding */
-    else if(type_shared || space_shared)
-        attr->shared->version = H5O_ATTR_VERSION_2;   /* Write out version with flag for indicating shared datatype or dataspace */
+    if (use_latest_format)
+        attr->shared->version = H5O_ATTR_VERSION_LATEST; /* Write out latest version of format */
+    else if (attr->shared->encoding != H5T_CSET_ASCII)
+        attr->shared->version = H5O_ATTR_VERSION_3; /* Write version which includes the character encoding */
+    else if (type_shared || space_shared)
+        attr->shared->version =
+            H5O_ATTR_VERSION_2; /* Write out version with flag for indicating shared datatype or dataspace */
     else
-        attr->shared->version = H5O_ATTR_VERSION_1;   /* Write out basic version */
+        attr->shared->version = H5O_ATTR_VERSION_1; /* Write out basic version */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5A_set_version() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A_attr_copy_file
  *
@@ -1903,21 +1867,21 @@ H5A_set_version(const H5F_t *f, H5A_t *attr)
  *-------------------------------------------------------------------------
  */
 H5A_t *
-H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_size,
-    H5O_copy_t *cpy_info, hid_t dxpl_id)
+H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_size, H5O_copy_t *cpy_info,
+                   hid_t dxpl_id)
 {
-    H5A_t        *attr_dst = NULL;
+    H5A_t *attr_dst = NULL;
 
     /* for dataype conversion */
-    hid_t       tid_src = -1;           /* Datatype ID for source datatype */
-    hid_t       tid_dst = -1;           /* Datatype ID for destination datatype */
-    hid_t       tid_mem = -1;           /* Datatype ID for memory datatype */
-    void       *buf = NULL;             /* Buffer for copying data */
-    void       *reclaim_buf = NULL;     /* Buffer for reclaiming data */
-    void       *bkg_buf = NULL;     	/* Background buffer */
-    hid_t       buf_sid = -1;           /* ID for buffer dataspace */
+    hid_t tid_src     = -1;   /* Datatype ID for source datatype */
+    hid_t tid_dst     = -1;   /* Datatype ID for destination datatype */
+    hid_t tid_mem     = -1;   /* Datatype ID for memory datatype */
+    void *buf         = NULL; /* Buffer for copying data */
+    void *reclaim_buf = NULL; /* Buffer for reclaiming data */
+    void *bkg_buf     = NULL; /* Background buffer */
+    hid_t buf_sid     = -1;   /* ID for buffer dataspace */
 
-    H5A_t       *ret_value;             /* Return value */
+    H5A_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1928,13 +1892,13 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si
     HDassert(!cpy_info->copy_without_attr);
 
     /* Allocate space for the destination message */
-    if(NULL == (attr_dst = H5FL_CALLOC(H5A_t)))
+    if (NULL == (attr_dst = H5FL_CALLOC(H5A_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the top level of the attribute */
     *attr_dst = *attr_src;
 
-    if(NULL == (attr_dst->shared = H5FL_CALLOC(H5A_shared_t)))
+    if (NULL == (attr_dst->shared = H5FL_CALLOC(H5A_shared_t)))
         HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate shared attr structure")
 
     /* Don't have an opened group location for copy */
@@ -1953,19 +1917,19 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si
     /* Copy attribute's datatype */
     /* If source is named, we will keep dst as named, but we will not actually
      * copy the target and update the message until post copy */
-    if(NULL == (attr_dst->shared->dt = H5T_copy(attr_src->shared->dt, H5T_COPY_ALL)))
+    if (NULL == (attr_dst->shared->dt = H5T_copy(attr_src->shared->dt, H5T_COPY_ALL)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "cannot copy datatype")
 
     /* Set the location of the destination datatype */
-    if(H5T_set_loc(attr_dst->shared->dt, file_dst, H5T_LOC_DISK) < 0)
+    if (H5T_set_loc(attr_dst->shared->dt, file_dst, H5T_LOC_DISK) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "cannot mark datatype on disk")
 
-    if(!H5T_committed(attr_src->shared->dt)) {
+    if (!H5T_committed(attr_src->shared->dt)) {
         /* If the datatype is not named, it may have been shared in the
          * source file's heap.  Un-share it for now. We'll try to shared
          * it in the destination file below.
          */
-        if(H5O_msg_reset_share(H5O_DTYPE_ID, attr_dst->shared->dt) < 0)
+        if (H5O_msg_reset_share(H5O_DTYPE_ID, attr_dst->shared->dt) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to reset datatype sharing")
     }
 
@@ -1977,17 +1941,17 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si
     /* Reset the dataspace's sharing in the source file before trying to share
      * it in the destination.
      */
-    if(H5O_msg_reset_share(H5O_SDSPACE_ID, attr_dst->shared->ds) < 0)
+    if (H5O_msg_reset_share(H5O_SDSPACE_ID, attr_dst->shared->ds) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to reset dataspace sharing")
 
     /* Simulate trying to share both the datatype and dataset, to determine the
      * final size of the messages.  This does nothing if the datatype is
      * committed or sharing is disabled.
      */
-    if(H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_DEFER, H5O_DTYPE_ID, attr_dst->shared->dt, NULL) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, NULL, "can't share attribute datatype")
-    if(H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_DEFER, H5O_SDSPACE_ID, attr_dst->shared->ds, NULL) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, NULL, "can't share attribute dataspace")
+    if (H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_DEFER, H5O_DTYPE_ID, attr_dst->shared->dt, NULL) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, NULL, "can't share attribute datatype")
+    if (H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_DEFER, H5O_SDSPACE_ID, attr_dst->shared->ds, NULL) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, NULL, "can't share attribute dataspace")
 
     /* Compute the sizes of the datatype and dataspace. This is their raw
      * size unless they're shared.
@@ -1999,7 +1963,8 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si
 
     /* Check whether to recompute the size of the attribute */
     /* (happens when the datatype or dataspace changes sharing status) */
-    if(attr_dst->shared->dt_size != attr_src->shared->dt_size || attr_dst->shared->ds_size != attr_src->shared->ds_size)
+    if (attr_dst->shared->dt_size != attr_src->shared->dt_size ||
+        attr_dst->shared->ds_size != attr_src->shared->ds_size)
         *recompute_size = TRUE;
 
     /* Compute the size of the data */
@@ -2007,57 +1972,64 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si
      * expecting overflow here, we should implement testing similar to
      * that described in CERT bulletins INT30-C and INT32-C.
      */
-    H5_CHECKED_ASSIGN(attr_dst->shared->data_size, size_t, H5S_GET_EXTENT_NPOINTS(attr_dst->shared->ds) * H5T_get_size(attr_dst->shared->dt), hssize_t);
+    H5_CHECKED_ASSIGN(attr_dst->shared->data_size, size_t,
+                      H5S_GET_EXTENT_NPOINTS(attr_dst->shared->ds) * H5T_get_size(attr_dst->shared->dt),
+                      hssize_t);
 
     /* Copy (& convert) the data, if necessary */
-    if(attr_src->shared->data) {
-        if(NULL == (attr_dst->shared->data = H5FL_BLK_MALLOC(attr_buf, attr_dst->shared->data_size)))
+    if (attr_src->shared->data) {
+        if (NULL == (attr_dst->shared->data = H5FL_BLK_MALLOC(attr_buf, attr_dst->shared->data_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* Check if we need to convert data */
-        if(H5T_detect_class(attr_src->shared->dt, H5T_VLEN, FALSE) > 0) {
-            H5T_path_t  *tpath_src_mem, *tpath_mem_dst;   /* Datatype conversion paths */
-            H5T_t *dt_mem;              /* Memory datatype */
-            size_t src_dt_size;         /* Source datatype size */
-            size_t tmp_dt_size;         /* Temp. datatype size */
-            size_t max_dt_size;         /* Max atatype size */
-            H5S_t *buf_space;           /* Dataspace describing buffer */
-            hsize_t buf_dim;            /* Dimension for buffer */
-            size_t nelmts;              /* Number of elements in buffer */
-            size_t buf_size;            /* Size of copy buffer */
+        if (H5T_detect_class(attr_src->shared->dt, H5T_VLEN, FALSE) > 0) {
+            H5T_path_t *tpath_src_mem, *tpath_mem_dst; /* Datatype conversion paths */
+            H5T_t *     dt_mem;                        /* Memory datatype */
+            size_t      src_dt_size;                   /* Source datatype size */
+            size_t      tmp_dt_size;                   /* Temp. datatype size */
+            size_t      max_dt_size;                   /* Max atatype size */
+            H5S_t *     buf_space;                     /* Dataspace describing buffer */
+            hsize_t     buf_dim;                       /* Dimension for buffer */
+            size_t      nelmts;                        /* Number of elements in buffer */
+            size_t      buf_size;                      /* Size of copy buffer */
 
             /* Create datatype ID for src datatype */
-            if((tid_src = H5I_register(H5I_DATATYPE, attr_src->shared->dt, FALSE)) < 0)
+            if ((tid_src = H5I_register(H5I_DATATYPE, attr_src->shared->dt, FALSE)) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register source file datatype")
 
             /* create a memory copy of the variable-length datatype */
-            if(NULL == (dt_mem = H5T_copy(attr_src->shared->dt, H5T_COPY_TRANSIENT)))
+            if (NULL == (dt_mem = H5T_copy(attr_src->shared->dt, H5T_COPY_TRANSIENT)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy")
-            if((tid_mem = H5I_register(H5I_DATATYPE, dt_mem, FALSE)) < 0)
+            if ((tid_mem = H5I_register(H5I_DATATYPE, dt_mem, FALSE)) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register memory datatype")
 
             /* create variable-length datatype at the destinaton file */
-            if((tid_dst = H5I_register(H5I_DATATYPE, attr_dst->shared->dt, FALSE)) < 0)
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register destination file datatype")
+            if ((tid_dst = H5I_register(H5I_DATATYPE, attr_dst->shared->dt, FALSE)) < 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
+                            "unable to register destination file datatype")
 
             /* Set up the conversion functions */
-            if(NULL == (tpath_src_mem = H5T_path_find(attr_src->shared->dt, dt_mem, NULL, NULL, dxpl_id, FALSE)))
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to convert between src and mem datatypes")
-            if(NULL == (tpath_mem_dst = H5T_path_find(dt_mem, attr_dst->shared->dt, NULL, NULL, dxpl_id, FALSE)))
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to convert between mem and dst datatypes")
+            if (NULL ==
+                (tpath_src_mem = H5T_path_find(attr_src->shared->dt, dt_mem, NULL, NULL, dxpl_id, FALSE)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
+                            "unable to convert between src and mem datatypes")
+            if (NULL ==
+                (tpath_mem_dst = H5T_path_find(dt_mem, attr_dst->shared->dt, NULL, NULL, dxpl_id, FALSE)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
+                            "unable to convert between mem and dst datatypes")
 
             /* Determine largest datatype size */
-            if(0 == (src_dt_size = H5T_get_size(attr_src->shared->dt)))
+            if (0 == (src_dt_size = H5T_get_size(attr_src->shared->dt)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to determine datatype size")
-            if(0 == (tmp_dt_size = H5T_get_size(dt_mem)))
+            if (0 == (tmp_dt_size = H5T_get_size(dt_mem)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to determine datatype size")
             max_dt_size = MAX(src_dt_size, tmp_dt_size);
-            if(0 == (tmp_dt_size = H5T_get_size(attr_dst->shared->dt)))
+            if (0 == (tmp_dt_size = H5T_get_size(attr_dst->shared->dt)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to determine datatype size")
             max_dt_size = MAX(max_dt_size, tmp_dt_size);
 
             /* Set number of whole elements that fit in buffer */
-            if(0 == (nelmts = attr_src->shared->data_size / src_dt_size))
+            if (0 == (nelmts = attr_src->shared->data_size / src_dt_size))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "element size too large")
 
             /* Set up number of bytes to copy, and initial buffer size */
@@ -2067,100 +2039,101 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si
             buf_dim = nelmts;
 
             /* Create the space and set the initial extent */
-            if(NULL == (buf_space = H5S_create_simple((unsigned)1, &buf_dim, NULL)))
+            if (NULL == (buf_space = H5S_create_simple((unsigned)1, &buf_dim, NULL)))
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, NULL, "can't create simple dataspace")
 
             /* Atomize */
-            if((buf_sid = H5I_register(H5I_DATASPACE, buf_space, FALSE)) < 0) {
+            if ((buf_sid = H5I_register(H5I_DATASPACE, buf_space, FALSE)) < 0) {
                 H5S_close(buf_space);
                 HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, NULL, "unable to register dataspace ID")
             } /* end if */
 
             /* Allocate memory for recclaim buf */
-            if(NULL == (reclaim_buf = H5FL_BLK_MALLOC(attr_buf, buf_size)))
+            if (NULL == (reclaim_buf = H5FL_BLK_MALLOC(attr_buf, buf_size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation NULLed for raw data chunk")
 
             /* Allocate memory for copying the chunk */
-            if(NULL == (buf = H5FL_BLK_MALLOC(attr_buf, buf_size)))
+            if (NULL == (buf = H5FL_BLK_MALLOC(attr_buf, buf_size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation NULLed for raw data chunk")
 
             HDmemcpy(buf, attr_src->shared->data, attr_src->shared->data_size);
 
             /* Allocate background memory */
-            if(H5T_path_bkg(tpath_src_mem) || H5T_path_bkg(tpath_mem_dst)) {
-                if(NULL == (bkg_buf = H5FL_BLK_CALLOC(attr_buf, buf_size)))
+            if (H5T_path_bkg(tpath_src_mem) || H5T_path_bkg(tpath_mem_dst)) {
+                if (NULL == (bkg_buf = H5FL_BLK_CALLOC(attr_buf, buf_size)))
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, FAIL, "memory allocation failed")
             }
 
             /* Convert from source file to memory */
-            if(H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, bkg_buf, dxpl_id) < 0)
+            if (H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, bkg_buf,
+                            dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "datatype conversion NULLed")
 
             HDmemcpy(reclaim_buf, buf, buf_size);
 
             /* Set background buffer to all zeros */
-            if(bkg_buf)
+            if (bkg_buf)
                 HDmemset(bkg_buf, 0, buf_size);
 
             /* Convert from memory to destination file */
-            if(H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg_buf, dxpl_id) < 0)
+            if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg_buf,
+                            dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "datatype conversion NULLed")
 
             HDmemcpy(attr_dst->shared->data, buf, attr_dst->shared->data_size);
 
-            if(H5D_vlen_reclaim(tid_mem, buf_space, H5P_DATASET_XFER_DEFAULT, reclaim_buf) < 0)
+            if (H5D_vlen_reclaim(tid_mem, buf_space, H5P_DATASET_XFER_DEFAULT, reclaim_buf) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_BADITER, NULL, "unable to reclaim variable-length data")
-        }  /* end if */
+        } /* end if */
         else {
             HDassert(attr_dst->shared->data_size == attr_src->shared->data_size);
             HDmemcpy(attr_dst->shared->data, attr_src->shared->data, attr_src->shared->data_size);
         } /* end else */
-    } /* end if(attr_src->shared->data) */
+    }     /* end if(attr_src->shared->data) */
 
     /* Copy the creation order */
     attr_dst->shared->crt_idx = attr_src->shared->crt_idx;
 
     /* Recompute the version to encode the destination attribute */
-    if(H5A_set_version(file_dst, attr_dst) < 0)
+    if (H5A_set_version(file_dst, attr_dst) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTSET, NULL, "unable to update attribute version")
 
     /* Recompute the destination attribute's size, if it's a different version */
-    if(attr_src->shared->version != attr_dst->shared->version)
+    if (attr_src->shared->version != attr_dst->shared->version)
         *recompute_size = TRUE;
 
     /* Set return value */
     ret_value = attr_dst;
 
 done:
-    if(buf_sid > 0 && H5I_dec_ref(buf_sid) < 0)
+    if (buf_sid > 0 && H5I_dec_ref(buf_sid) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "Can't decrement temporary dataspace ID")
-    if(tid_src > 0)
+    if (tid_src > 0)
         /* Don't decrement ID, we want to keep underlying datatype */
-        if(NULL == H5I_remove(tid_src))
+        if (NULL == H5I_remove(tid_src))
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "Can't decrement temporary datatype ID")
-    if(tid_dst > 0)
+    if (tid_dst > 0)
         /* Don't decrement ID, we want to keep underlying datatype */
-        if(NULL == H5I_remove(tid_dst))
+        if (NULL == H5I_remove(tid_dst))
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "Can't decrement temporary datatype ID")
-    if(tid_mem > 0)
+    if (tid_mem > 0)
         /* Decrement the memory datatype ID, it's transient */
-        if(H5I_dec_ref(tid_mem) < 0)
+        if (H5I_dec_ref(tid_mem) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "Can't decrement temporary datatype ID")
-    if(buf)
+    if (buf)
         buf = H5FL_BLK_FREE(attr_buf, buf);
-    if(reclaim_buf)
+    if (reclaim_buf)
         reclaim_buf = H5FL_BLK_FREE(attr_buf, reclaim_buf);
-    if(bkg_buf)
+    if (bkg_buf)
         bkg_buf = H5FL_BLK_FREE(attr_buf, bkg_buf);
 
     /* Release destination attribute information on failure */
-    if(!ret_value && attr_dst && H5A_close(attr_dst) < 0)
+    if (!ret_value && attr_dst && H5A_close(attr_dst) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, NULL, "can't close attribute")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_attr_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A_attr_post_copy_file
  *
@@ -2178,11 +2151,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src,
-    H5O_loc_t *dst_oloc, const H5A_t *attr_dst, hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src, H5O_loc_t *dst_oloc,
+                        const H5A_t *attr_dst, hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
-    H5F_t  *file_src, *file_dst;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5F_t *file_src, *file_dst;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2198,9 +2171,9 @@ H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src,
     HDassert(file_src);
     HDassert(file_dst);
 
-    if(H5T_committed(attr_src->shared->dt)) {
-        H5O_loc_t         *src_oloc_dt;           /* Pointer to source datatype's object location */
-        H5O_loc_t         *dst_oloc_dt;           /* Pointer to dest. datatype's object location */
+    if (H5T_committed(attr_src->shared->dt)) {
+        H5O_loc_t *src_oloc_dt; /* Pointer to source datatype's object location */
+        H5O_loc_t *dst_oloc_dt; /* Pointer to dest. datatype's object location */
 
         /* Get group entries for source & destination */
         src_oloc_dt = H5T_oloc(attr_src->shared->dt);
@@ -2213,7 +2186,7 @@ H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src,
         dst_oloc_dt->file = file_dst;
 
         /* Copy the shared object from source to destination */
-        if(H5O_copy_header_map(src_oloc_dt, dst_oloc_dt, dxpl_id, cpy_info, FALSE, NULL, NULL) < 0)
+        if (H5O_copy_header_map(src_oloc_dt, dst_oloc_dt, dxpl_id, cpy_info, FALSE, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
         /* Update shared message info from named datatype info */
@@ -2223,30 +2196,33 @@ H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src,
     /* Try to share both the datatype and dataset.  This does nothing if the
      * datatype is committed or sharing is disabled.
      */
-    if(H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_WAS_DEFERRED, H5O_DTYPE_ID, attr_dst->shared->dt, NULL) < 0)
+    if (H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_WAS_DEFERRED, H5O_DTYPE_ID, attr_dst->shared->dt, NULL) <
+        0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "can't share attribute datatype")
-    if(H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_WAS_DEFERRED, H5O_SDSPACE_ID, attr_dst->shared->ds, NULL) < 0)
+    if (H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_WAS_DEFERRED, H5O_SDSPACE_ID, attr_dst->shared->ds,
+                       NULL) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "can't share attribute dataspace")
 
     /* Only need to fix reference attribute with real data being copied to
      *  another file.
      */
-    if((NULL != attr_dst->shared->data) && (H5T_get_class(attr_dst->shared->dt, FALSE) == H5T_REFERENCE) ) {
+    if ((NULL != attr_dst->shared->data) && (H5T_get_class(attr_dst->shared->dt, FALSE) == H5T_REFERENCE)) {
 
         /* copy object pointed by reference. The current implementation does not
          *  deal with nested reference such as reference in a compound structure
          */
 
         /* Check for expanding references */
-        if(cpy_info->expand_ref) {
+        if (cpy_info->expand_ref) {
             size_t ref_count;
 
             /* Determine # of reference elements to copy */
             ref_count = attr_dst->shared->data_size / H5T_get_size(attr_dst->shared->dt);
 
             /* Copy objects referenced in source buffer to destination file and set destination elements */
-            if(H5O_copy_expand_ref(file_src, attr_dst->shared->data, dxpl_id,
-                    file_dst, attr_dst->shared->data, ref_count, H5T_get_ref_type(attr_dst->shared->dt), cpy_info) < 0)
+            if (H5O_copy_expand_ref(file_src, attr_dst->shared->data, dxpl_id, file_dst,
+                                    attr_dst->shared->data, ref_count, H5T_get_ref_type(attr_dst->shared->dt),
+                                    cpy_info) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, FAIL, "unable to copy reference attribute")
         } /* end if */
         else
@@ -2258,7 +2234,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_attr_post_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A_dense_post_copy_file_cb
  *
@@ -2276,9 +2251,9 @@ done:
 static herr_t
 H5A_dense_post_copy_file_cb(const H5A_t *attr_src, void *_udata)
 {
-    H5A_dense_file_cp_ud_t *udata = (H5A_dense_file_cp_ud_t *)_udata;
-    H5A_t *attr_dst = NULL;
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    H5A_dense_file_cp_ud_t *udata     = (H5A_dense_file_cp_ud_t *)_udata;
+    H5A_t *                 attr_dst  = NULL;
+    herr_t                  ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2289,30 +2264,29 @@ H5A_dense_post_copy_file_cb(const H5A_t *attr_src, void *_udata)
     HDassert(udata->file);
     HDassert(udata->cpy_info);
 
-    if(NULL == (attr_dst = H5A_attr_copy_file(attr_src, udata->file,
-            udata->recompute_size, udata->cpy_info,  udata->dxpl_id)))
+    if (NULL == (attr_dst = H5A_attr_copy_file(attr_src, udata->file, udata->recompute_size, udata->cpy_info,
+                                               udata->dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy attribute")
 
-    if(H5A_attr_post_copy_file(udata->oloc_src, attr_src, udata->oloc_dst, attr_dst,
-            udata->dxpl_id, udata->cpy_info) < 0)
+    if (H5A_attr_post_copy_file(udata->oloc_src, attr_src, udata->oloc_dst, attr_dst, udata->dxpl_id,
+                                udata->cpy_info) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy attribute")
 
     /* Reset shared location information */
-    if(H5O_msg_reset_share(H5O_ATTR_ID, attr_dst) < 0)
+    if (H5O_msg_reset_share(H5O_ATTR_ID, attr_dst) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to reset attribute sharing")
 
     /* Insert attribute into dense storage */
-    if(H5A_dense_insert(udata->file, udata->dxpl_id, udata->ainfo, attr_dst) < 0)
+    if (H5A_dense_insert(udata->file, udata->dxpl_id, udata->ainfo, attr_dst) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR, "unable to add to dense storage")
 
 done:
-    if(attr_dst && H5A_close(attr_dst) < 0)
+    if (attr_dst && H5A_close(attr_dst) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close destination attribute")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_post_copy_file_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5A_dense_post_copy_file_all
  *
@@ -2328,13 +2302,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_dense_post_copy_file_all(const H5O_loc_t *src_oloc, const H5O_ainfo_t *ainfo_src,
-    H5O_loc_t *dst_oloc, H5O_ainfo_t *ainfo_dst, hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5A_dense_post_copy_file_all(const H5O_loc_t *src_oloc, const H5O_ainfo_t *ainfo_src, H5O_loc_t *dst_oloc,
+                             H5O_ainfo_t *ainfo_dst, hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
-    H5A_dense_file_cp_ud_t udata;       /* User data for iteration callback */
-    H5A_attr_iter_op_t attr_op;         /* Attribute operator */
-    hbool_t recompute_size = FALSE;     /* recompute the size */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_dense_file_cp_ud_t udata;                    /* User data for iteration callback */
+    H5A_attr_iter_op_t     attr_op;                  /* Attribute operator */
+    hbool_t                recompute_size = FALSE;   /* recompute the size */
+    herr_t                 ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2342,27 +2316,25 @@ H5A_dense_post_copy_file_all(const H5O_loc_t *src_oloc, const H5O_ainfo_t *ainfo
     HDassert(ainfo_src);
     HDassert(ainfo_dst);
 
-    udata.ainfo = ainfo_dst;                  /* Destination dense information    */
-    udata.file = dst_oloc->file;              /* Destination file                 */
-    udata.recompute_size = &recompute_size;   /* Flag to indicate if size changed */
-    udata.cpy_info = cpy_info;                /* Information on copying options   */
-    udata.dxpl_id = dxpl_id;                  /* DXPL for operation               */
-    udata.oloc_src = src_oloc;
-    udata.oloc_dst = dst_oloc;
+    udata.ainfo          = ainfo_dst;       /* Destination dense information    */
+    udata.file           = dst_oloc->file;  /* Destination file                 */
+    udata.recompute_size = &recompute_size; /* Flag to indicate if size changed */
+    udata.cpy_info       = cpy_info;        /* Information on copying options   */
+    udata.dxpl_id        = dxpl_id;         /* DXPL for operation               */
+    udata.oloc_src       = src_oloc;
+    udata.oloc_dst       = dst_oloc;
 
-    attr_op.op_type = H5A_ATTR_OP_LIB;
+    attr_op.op_type  = H5A_ATTR_OP_LIB;
     attr_op.u.lib_op = H5A_dense_post_copy_file_cb;
 
-
-     if(H5A_dense_iterate(src_oloc->file, dxpl_id, (hid_t)0, ainfo_src, H5_INDEX_NAME,
-            H5_ITER_NATIVE, (hsize_t)0, NULL, &attr_op, &udata) < 0)
+    if (H5A_dense_iterate(src_oloc->file, dxpl_id, (hid_t)0, ainfo_src, H5_INDEX_NAME, H5_ITER_NATIVE,
+                          (hsize_t)0, NULL, &attr_op, &udata) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "error building attribute table")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_post_copy_file_all */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_rename_by_name
  *
@@ -2377,37 +2349,37 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_rename_by_name(H5G_loc_t loc, const char *obj_name, const char *old_attr_name,
-                   const char *new_attr_name, hid_t lapl_id, hid_t dxpl_id)
+H5A_rename_by_name(H5G_loc_t loc, const char *obj_name, const char *old_attr_name, const char *new_attr_name,
+                   hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t  obj_loc;             /* Location used to open group */
+    H5G_name_t obj_path;            /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;            /* Opened object object location */
+    hbool_t    loc_found = FALSE;   /* Entry at 'obj_name' found */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Avoid thrashing things if the names are the same */
-    if(HDstrcmp(old_attr_name, new_attr_name)) {
+    if (HDstrcmp(old_attr_name, new_attr_name)) {
         /* Set up opened group location to fill in */
         obj_loc.oloc = &obj_oloc;
         obj_loc.path = &obj_path;
         H5G_loc_reset(&obj_loc);
 
         /* Find the object's location */
-        if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+        if (H5G_loc_find(&loc, obj_name, &obj_loc /*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
         loc_found = TRUE;
 
         /* Call attribute rename routine */
-        if(H5O_attr_rename(obj_loc.oloc, dxpl_id, old_attr_name, new_attr_name) < 0)
+        if (H5O_attr_rename(obj_loc.oloc, dxpl_id, old_attr_name, new_attr_name) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute")
     } /* end if */
 
 done:
     /* Release resources */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Apkg.h b/src/H5Apkg.h
index 84b82fe..e9c6704 100644
--- a/src/H5Apkg.h
+++ b/src/H5Apkg.h
@@ -30,72 +30,70 @@
  * Define this to enable debugging.
  */
 #ifdef NDEBUG
-#  undef H5A_DEBUG
+#undef H5A_DEBUG
 #endif
 
 /* Get package's private header */
 #include "H5Aprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5B2private.h"	/* v2 B-trees				*/
-#include "H5FLprivate.h"	/* Free Lists				*/
-#include "H5HFprivate.h"	/* Fractal heaps			*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Sprivate.h"		/* Dataspace				*/
-#include "H5Tprivate.h"		/* Datatype functions			*/
-
+#include "H5B2private.h" /* v2 B-trees				*/
+#include "H5FLprivate.h" /* Free Lists				*/
+#include "H5HFprivate.h" /* Fractal heaps			*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Sprivate.h"  /* Dataspace				*/
+#include "H5Tprivate.h"  /* Datatype functions			*/
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
 /* This is the initial version, which does not have support for shared datatypes */
-#define H5O_ATTR_VERSION_1	1
+#define H5O_ATTR_VERSION_1 1
 
 /* This version allows support for shared datatypes & dataspaces by adding a
  *      'flag' byte indicating when those components are shared.  This version
  *      also dropped the alignment on all the components.
  */
-#define H5O_ATTR_VERSION_2	2
+#define H5O_ATTR_VERSION_2 2
 
 /* Add support for different character encodings of attribute names */
-#define H5O_ATTR_VERSION_3      3
+#define H5O_ATTR_VERSION_3 3
 
 /* The latest version of the format.  Look through the 'encode', 'decode'
  *      and 'size' message callbacks for places to change when updating this.
  */
 #define H5O_ATTR_VERSION_LATEST H5O_ATTR_VERSION_3
 
-
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 /* Define the shared attribute structure */
 typedef struct H5A_shared_t {
-    uint8_t     version;    /* Version to encode attribute with */
+    uint8_t version; /* Version to encode attribute with */
 
-    char        *name;      /* Attribute's name */
-    H5T_cset_t  encoding;   /* Character encoding of attribute name */
+    char *     name;     /* Attribute's name */
+    H5T_cset_t encoding; /* Character encoding of attribute name */
 
-    H5T_t       *dt;        /* Attribute's datatype */
-    size_t      dt_size;    /* Size of datatype on disk */
+    H5T_t *dt;      /* Attribute's datatype */
+    size_t dt_size; /* Size of datatype on disk */
 
-    H5S_t       *ds;        /* Attribute's dataspace */
-    size_t      ds_size;    /* Size of dataspace on disk */
+    H5S_t *ds;      /* Attribute's dataspace */
+    size_t ds_size; /* Size of dataspace on disk */
 
-    void        *data;      /* Attribute data (on a temporary basis) */
-    size_t      data_size;  /* Size of data on disk */
-    H5O_msg_crt_idx_t crt_idx;  /* Attribute's creation index in the object header */
-    unsigned	nrefs;		/* Ref count for times this object is referred	*/
+    void *            data;      /* Attribute data (on a temporary basis) */
+    size_t            data_size; /* Size of data on disk */
+    H5O_msg_crt_idx_t crt_idx;   /* Attribute's creation index in the object header */
+    unsigned          nrefs;     /* Ref count for times this object is referred	*/
 } H5A_shared_t;
 
 /* Define the main attribute structure */
 struct H5A_t {
-    H5O_shared_t sh_loc;     /* Shared message info (must be first) */
-    H5O_loc_t    oloc;       /* Object location for object attribute is on */
-    hbool_t      obj_opened; /* Object header entry opened? */
-    H5G_name_t   path;       /* Group hierarchy path */
-    H5A_shared_t *shared;    /* Shared attribute information */
+    H5O_shared_t  sh_loc;     /* Shared message info (must be first) */
+    H5O_loc_t     oloc;       /* Object location for object attribute is on */
+    hbool_t       obj_opened; /* Object header entry opened? */
+    H5G_name_t    path;       /* Group hierarchy path */
+    H5A_shared_t *shared;     /* Shared attribute information */
 };
 
 /* Typedefs for "dense" attribute storage */
@@ -104,18 +102,18 @@ struct H5A_t {
 /* Typedef for native 'name' field index records in the v2 B-tree */
 /* (Keep 'id' field first so generic record handling in callbacks works) */
 typedef struct H5A_dense_bt2_name_rec_t {
-    H5O_fheap_id_t id;                  /* Heap ID for attribute */
-    uint8_t flags;                      /* Object header message flags for attribute */
-    H5O_msg_crt_idx_t corder;           /* 'creation order' field value */
-    uint32_t hash;                      /* Hash of 'name' field value */
+    H5O_fheap_id_t    id;     /* Heap ID for attribute */
+    uint8_t           flags;  /* Object header message flags for attribute */
+    H5O_msg_crt_idx_t corder; /* 'creation order' field value */
+    uint32_t          hash;   /* Hash of 'name' field value */
 } H5A_dense_bt2_name_rec_t;
 
 /* Typedef for native 'creation order' field index records in the v2 B-tree */
 /* (Keep 'id' field first so generic record handling in callbacks works) */
 typedef struct H5A_dense_bt2_corder_rec_t {
-    H5O_fheap_id_t id;                  /* Heap ID for attribute */
-    uint8_t flags;                      /* Object header message flags for attribute */
-    H5O_msg_crt_idx_t corder;           /* 'creation order' field value */
+    H5O_fheap_id_t    id;     /* Heap ID for attribute */
+    uint8_t           flags;  /* Object header message flags for attribute */
+    H5O_msg_crt_idx_t corder; /* 'creation order' field value */
 } H5A_dense_bt2_corder_rec_t;
 
 /* Define the 'found' callback function pointer for matching an attribute record in a v2 B-tree */
@@ -128,16 +126,16 @@ typedef herr_t (*H5A_bt2_found_t)(const H5A_t *attr, hbool_t *took_ownership, vo
  */
 typedef struct H5A_bt2_ud_common_t {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    H5HF_t      *fheap;                 /* Fractal heap handle               */
-    H5HF_t      *shared_fheap;          /* Fractal heap handle for shared messages */
-    const char  *name;                  /* Name of attribute to compare      */
-    uint32_t    name_hash;              /* Hash of name of attribute to compare */
-    uint8_t     flags;                  /* Flags for attribute storage location */
-    H5O_msg_crt_idx_t corder;           /* Creation order value of attribute to compare */
-    H5A_bt2_found_t found_op;           /* Callback when correct attribute is found */
-    void        *found_op_data;         /* Callback data when correct attribute is found */
+    H5F_t *           f;             /* Pointer to file that fractal heap is in */
+    hid_t             dxpl_id;       /* DXPL for operation                */
+    H5HF_t *          fheap;         /* Fractal heap handle               */
+    H5HF_t *          shared_fheap;  /* Fractal heap handle for shared messages */
+    const char *      name;          /* Name of attribute to compare      */
+    uint32_t          name_hash;     /* Hash of name of attribute to compare */
+    uint8_t           flags;         /* Flags for attribute storage location */
+    H5O_msg_crt_idx_t corder;        /* Creation order value of attribute to compare */
+    H5A_bt2_found_t   found_op;      /* Callback when correct attribute is found */
+    void *            found_op_data; /* Callback data when correct attribute is found */
 } H5A_bt2_ud_common_t;
 
 /*
@@ -146,17 +144,16 @@ typedef struct H5A_bt2_ud_common_t {
  */
 typedef struct H5A_bt2_ud_ins_t {
     /* downward */
-    H5A_bt2_ud_common_t common;         /* Common info for B-tree user data (must be first) */
-    H5O_fheap_id_t id;                  /* Heap ID of attribute to insert    */
+    H5A_bt2_ud_common_t common; /* Common info for B-tree user data (must be first) */
+    H5O_fheap_id_t      id;     /* Heap ID of attribute to insert    */
 } H5A_bt2_ud_ins_t;
 
 /* Data structure to hold table of attributes for an object */
 typedef struct {
-    size_t      nattrs;         /* # of attributes in table */
-    H5A_t       **attrs;        /* Pointer to array of attribute pointers */
+    size_t  nattrs; /* # of attributes in table */
+    H5A_t **attrs;  /* Pointer to array of attribute pointers */
 } H5A_attr_table_t;
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -176,7 +173,6 @@ H5_DLLVAR const H5B2_class_t H5A_BT2_NAME[1];
 /* The v2 B-tree class for indexing 'creation order' field on attributes */
 H5_DLLVAR const H5B2_class_t H5A_BT2_CORDER[1];
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
@@ -184,89 +180,76 @@ H5_DLLVAR const H5B2_class_t H5A_BT2_CORDER[1];
 /* Function prototypes for H5A package scope */
 H5_DLL herr_t H5A_init(void);
 H5_DLL herr_t H5A__term_deprec_interface(void);
-H5_DLL H5A_t *H5A_create(const H5G_loc_t *loc, const char *name,
-    const H5T_t *type, const H5S_t *space, hid_t acpl_id, hid_t dxpl_id);
-H5_DLL H5A_t *H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name,
-    const char *attr_name, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL H5A_t *H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5A_open_common(const H5G_loc_t *loc, H5A_t *attr);
-H5_DLL herr_t H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id);
-H5_DLL herr_t H5A_read(const H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id);
+H5_DLL H5A_t *H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type, const H5S_t *space,
+                         hid_t acpl_id, hid_t dxpl_id);
+H5_DLL H5A_t *H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_name,
+                               hid_t lapl_id, hid_t dxpl_id);
+H5_DLL H5A_t * H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type,
+                               H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t  H5A_open_common(const H5G_loc_t *loc, H5A_t *attr);
+H5_DLL herr_t  H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id);
+H5_DLL herr_t  H5A_read(const H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id);
 H5_DLL ssize_t H5A_get_name(H5A_t *attr, size_t buf_size, char *buf);
 H5_DLL H5A_t *H5A_copy(H5A_t *new_attr, const H5A_t *old_attr);
 H5_DLL herr_t H5A_get_info(const H5A_t *attr, H5A_info_t *ainfo);
-H5_DLL hid_t H5A_get_create_plist(H5A_t* attr);
+H5_DLL hid_t  H5A_get_create_plist(H5A_t *attr);
 H5_DLL herr_t H5A_free(H5A_t *attr);
 H5_DLL herr_t H5A_close(H5A_t *attr);
 H5_DLL htri_t H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo);
 H5_DLL herr_t H5A_set_version(const H5F_t *f, H5A_t *attr);
 H5_DLL herr_t H5A_rename_by_name(H5G_loc_t loc, const char *obj_name, const char *old_attr_name,
-    const char *new_attr_name, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL htri_t H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name,
-    hid_t lapl_id, hid_t dxpl_id);
+                                 const char *new_attr_name, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL htri_t H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name, hid_t lapl_id,
+                                 hid_t dxpl_id);
 
 /* Attribute "dense" storage routines */
 H5_DLL herr_t H5A_dense_create(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo);
-H5_DLL H5A_t *H5A_dense_open(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    const char *name);
-H5_DLL herr_t H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    H5A_t *attr);
-H5_DLL herr_t H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    H5A_t *attr);
-H5_DLL herr_t H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    const char *old_name, const char *new_name);
-H5_DLL herr_t H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id,
-    const H5O_ainfo_t *ainfo, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t skip, hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op,
-    void *op_data);
-H5_DLL herr_t H5A_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    const char *name);
-H5_DLL herr_t H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n);
-H5_DLL htri_t H5A_dense_exists(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
-    const char *name);
+H5_DLL H5A_t *H5A_dense_open(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name);
+H5_DLL herr_t H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr);
+H5_DLL herr_t H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr);
+H5_DLL herr_t H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *old_name,
+                               const char *new_name);
+H5_DLL herr_t H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainfo,
+                                H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_attr,
+                                const H5A_attr_iter_op_t *attr_op, void *op_data);
+H5_DLL herr_t H5A_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name);
+H5_DLL herr_t H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5_index_t idx_type,
+                                      H5_iter_order_t order, hsize_t n);
+H5_DLL htri_t H5A_dense_exists(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name);
 H5_DLL herr_t H5A_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo);
 
-
 /* Attribute table operations */
-H5_DLL herr_t H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    H5_index_t idx_type, H5_iter_order_t order, H5A_attr_table_t *atable);
-H5_DLL herr_t H5A_dense_build_table(H5F_t *f, hid_t dxpl_id,
-    const H5O_ainfo_t *ainfo, H5_index_t idx_type, H5_iter_order_t order,
-    H5A_attr_table_t *atable);
-H5_DLL herr_t H5A_attr_iterate_table(const H5A_attr_table_t *atable,
-    hsize_t skip, hsize_t *last_attr, hid_t loc_id,
-    const H5A_attr_iter_op_t *attr_op, void *op_data);
+H5_DLL herr_t H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type,
+                                      H5_iter_order_t order, H5A_attr_table_t *atable);
+H5_DLL herr_t H5A_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5_index_t idx_type,
+                                    H5_iter_order_t order, H5A_attr_table_t *atable);
+H5_DLL herr_t H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip, hsize_t *last_attr,
+                                     hid_t loc_id, const H5A_attr_iter_op_t *attr_op, void *op_data);
 H5_DLL herr_t H5A_attr_release_table(H5A_attr_table_t *atable);
 
 /* Attribute operations */
 H5_DLL herr_t H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr);
-H5_DLL H5A_t *H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name,
-    hid_t dxpl_id);
-H5_DLL H5A_t *H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, hid_t dxpl_id);
-H5_DLL herr_t H5O_attr_update_shared(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-        H5A_t *attr, H5O_shared_t *sh_mesg);
-H5_DLL herr_t H5O_attr_write(const H5O_loc_t *loc, hid_t dxpl_id,
-    H5A_t *attr);
-H5_DLL herr_t H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id,
-    const char *old_name, const char *new_name);
-H5_DLL herr_t H5O_attr_remove(const H5O_loc_t *loc, const char *name,
-    hid_t dxpl_id);
-H5_DLL herr_t H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, hid_t dxpl_id);
+H5_DLL H5A_t *H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id);
+H5_DLL H5A_t *H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, H5_iter_order_t order,
+                                   hsize_t n, hid_t dxpl_id);
+H5_DLL herr_t H5O_attr_update_shared(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5A_t *attr, H5O_shared_t *sh_mesg);
+H5_DLL herr_t H5O_attr_write(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr);
+H5_DLL herr_t H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id, const char *old_name,
+                              const char *new_name);
+H5_DLL herr_t H5O_attr_remove(const H5O_loc_t *loc, const char *name, hid_t dxpl_id);
+H5_DLL herr_t H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, H5_iter_order_t order,
+                                     hsize_t n, hid_t dxpl_id);
 H5_DLL htri_t H5O_attr_exists(const H5O_loc_t *loc, const char *name, hid_t dxpl_id);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 H5_DLL int H5O_attr_count(const H5O_loc_t *loc, hid_t dxpl_id);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 H5_DLL H5A_t *H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_size,
-    H5O_copy_t *cpy_info, hid_t dxpl_id);
-H5_DLL herr_t H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *mesg_src,
-    H5O_loc_t *dst_oloc, const H5A_t *mesg_dst, hid_t dxpl_id, H5O_copy_t *cpy_info);
-H5_DLL herr_t H5A_dense_post_copy_file_all(const H5O_loc_t *src_oloc, const H5O_ainfo_t * ainfo_src,
-    H5O_loc_t *dst_oloc, H5O_ainfo_t *ainfo_dst, hid_t dxpl_id, H5O_copy_t *cpy_info);
-
+                                 H5O_copy_t *cpy_info, hid_t dxpl_id);
+H5_DLL herr_t H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *mesg_src, H5O_loc_t *dst_oloc,
+                                      const H5A_t *mesg_dst, hid_t dxpl_id, H5O_copy_t *cpy_info);
+H5_DLL herr_t H5A_dense_post_copy_file_all(const H5O_loc_t *src_oloc, const H5O_ainfo_t *ainfo_src,
+                                           H5O_loc_t *dst_oloc, H5O_ainfo_t *ainfo_dst, hid_t dxpl_id,
+                                           H5O_copy_t *cpy_info);
 
 /* Testing functions */
 #ifdef H5A_TESTING
@@ -275,4 +258,3 @@ H5_DLL herr_t H5A_get_shared_rc_test(hid_t attr_id, hsize_t *ref_count);
 #endif /* H5A_TESTING */
 
 #endif /* _H5Apkg_H */
-
diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h
index b285920..5487806 100644
--- a/src/H5Aprivate.h
+++ b/src/H5Aprivate.h
@@ -21,17 +21,15 @@
 #include "H5Apublic.h"
 
 /* Private headers needed by this file */
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5Oprivate.h"         /* Object headers                       */
-#include "H5Sprivate.h"         /* Dataspace                            */
-#include "H5Tprivate.h"         /* Datatypes                            */
-
+#include "H5Gprivate.h" /* Groups				*/
+#include "H5Oprivate.h" /* Object headers                       */
+#include "H5Sprivate.h" /* Dataspace                            */
+#include "H5Tprivate.h" /* Datatypes                            */
 
 /**************************/
 /* Library Private Macros */
 /**************************/
 
-
 /****************************/
 /* Library Private Typedefs */
 /****************************/
@@ -45,29 +43,27 @@ typedef herr_t (*H5A_lib_iterate_t)(const H5A_t *attr, void *op_data);
 /* Describe kind of callback to make for each attribute */
 typedef enum H5A_attr_iter_op_type_t {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-    H5A_ATTR_OP_APP,                /* Application callback */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-    H5A_ATTR_OP_APP2,               /* Revised application callback */
-    H5A_ATTR_OP_LIB                 /* Library internal callback */
+    H5A_ATTR_OP_APP,  /* Application callback */
+#endif                /* H5_NO_DEPRECATED_SYMBOLS */
+    H5A_ATTR_OP_APP2, /* Revised application callback */
+    H5A_ATTR_OP_LIB   /* Library internal callback */
 } H5A_attr_iter_op_type_t;
 
 typedef struct H5A_attr_iter_op_t {
     H5A_attr_iter_op_type_t op_type;
     union {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        H5A_operator1_t app_op;         /* Application callback for each attribute */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-        H5A_operator2_t app_op2;        /* Revised application callback for each attribute */
-        H5A_lib_iterate_t lib_op;       /* Library internal callback for each attribute */
+        H5A_operator1_t app_op;    /* Application callback for each attribute */
+#endif                             /* H5_NO_DEPRECATED_SYMBOLS */
+        H5A_operator2_t   app_op2; /* Revised application callback for each attribute */
+        H5A_lib_iterate_t lib_op;  /* Library internal callback for each attribute */
     } u;
 } H5A_attr_iter_op_t;
 
-
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
@@ -78,12 +74,10 @@ H5_DLL H5G_name_t *H5A_nameof(H5A_t *attr);
 H5_DLL H5T_t *H5A_type(const H5A_t *attr);
 H5_DLL H5T_t *H5A_get_type(H5A_t *attr);
 H5_DLL H5S_t *H5A_get_space(H5A_t *attr);
-H5_DLL herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc,
-    hid_t dxpl_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
-    hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data);
-H5_DLL herr_t H5O_attr_iterate(hid_t loc_id, hid_t dxpl_id, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t skip, hsize_t *last_attr,
-    const H5A_attr_iter_op_t *op, void *op_data);
+H5_DLL herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id, H5_index_t idx_type,
+                                    H5_iter_order_t order, hsize_t skip, hsize_t *last_attr,
+                                    const H5A_attr_iter_op_t *attr_op, void *op_data);
+H5_DLL herr_t H5O_attr_iterate(hid_t loc_id, hid_t dxpl_id, H5_index_t idx_type, H5_iter_order_t order,
+                               hsize_t skip, hsize_t *last_attr, const H5A_attr_iter_op_t *op, void *op_data);
 
 #endif /* _H5Aprivate_H */
-
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index 7162f6e..89a3b04 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -18,28 +18,26 @@
 #define _H5Apublic_H
 
 /* Public headers needed by this file */
-#include "H5Ipublic.h"		/* IDs			  		*/
-#include "H5Opublic.h"		/* Object Headers			*/
-#include "H5Tpublic.h"		/* Datatypes				*/
+#include "H5Ipublic.h" /* IDs			  		*/
+#include "H5Opublic.h" /* Object Headers			*/
+#include "H5Tpublic.h" /* Datatypes				*/
 
 /* Information struct for attribute (for H5Aget_info/H5Aget_info_by_idx) */
 typedef struct {
-    hbool_t             corder_valid;   /* Indicate if creation order is valid */
-    H5O_msg_crt_idx_t   corder;         /* Creation order                 */
-    H5T_cset_t          cset;           /* Character set of attribute name */
-    hsize_t             data_size;      /* Size of raw data		  */
+    hbool_t           corder_valid; /* Indicate if creation order is valid */
+    H5O_msg_crt_idx_t corder;       /* Creation order                 */
+    H5T_cset_t        cset;         /* Character set of attribute name */
+    hsize_t           data_size;    /* Size of raw data		  */
 } H5A_info_t;
 
 /* Typedef for H5Aiterate2() callbacks */
-typedef herr_t (*H5A_operator2_t)(hid_t location_id/*in*/,
-    const char *attr_name/*in*/, const H5A_info_t *ainfo/*in*/, void *op_data/*in,out*/);
-
+typedef herr_t (*H5A_operator2_t)(hid_t location_id /*in*/, const char *attr_name /*in*/,
+                                  const H5A_info_t *ainfo /*in*/, void *op_data /*in,out*/);
 
 /********************/
 /* Public Variables */
 /********************/
 
-
 /*********************/
 /* Public Prototypes */
 /*********************/
@@ -47,16 +45,15 @@ typedef herr_t (*H5A_operator2_t)(hid_t location_id/*in*/,
 extern "C" {
 #endif
 
-H5_DLL hid_t   H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id,
-    hid_t space_id, hid_t acpl_id, hid_t aapl_id);
-H5_DLL hid_t   H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
-    hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id);
+H5_DLL hid_t   H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id,
+                          hid_t aapl_id);
+H5_DLL hid_t   H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id,
+                                 hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id);
 H5_DLL hid_t   H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id);
-H5_DLL hid_t   H5Aopen_by_name(hid_t loc_id, const char *obj_name,
-    const char *attr_name, hid_t aapl_id, hid_t lapl_id);
-H5_DLL hid_t   H5Aopen_by_idx(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id,
-    hid_t lapl_id);
+H5_DLL hid_t   H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id,
+                               hid_t lapl_id);
+H5_DLL hid_t   H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                              hsize_t n, hid_t aapl_id, hid_t lapl_id);
 H5_DLL herr_t  H5Awrite(hid_t attr_id, hid_t type_id, const void *buf);
 H5_DLL herr_t  H5Aread(hid_t attr_id, hid_t type_id, void *buf);
 H5_DLL herr_t  H5Aclose(hid_t attr_id);
@@ -64,32 +61,29 @@ H5_DLL hid_t   H5Aget_space(hid_t attr_id);
 H5_DLL hid_t   H5Aget_type(hid_t attr_id);
 H5_DLL hid_t   H5Aget_create_plist(hid_t attr_id);
 H5_DLL ssize_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf);
-H5_DLL ssize_t H5Aget_name_by_idx(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    char *name /*out*/, size_t size, hid_t lapl_id);
+H5_DLL ssize_t H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+                                  H5_iter_order_t order, hsize_t n, char *name /*out*/, size_t size,
+                                  hid_t lapl_id);
 H5_DLL hsize_t H5Aget_storage_size(hid_t attr_id);
 H5_DLL herr_t  H5Aget_info(hid_t attr_id, H5A_info_t *ainfo /*out*/);
-H5_DLL herr_t  H5Aget_info_by_name(hid_t loc_id, const char *obj_name,
-    const char *attr_name, H5A_info_t *ainfo /*out*/, hid_t lapl_id);
-H5_DLL herr_t  H5Aget_info_by_idx(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    H5A_info_t *ainfo /*out*/, hid_t lapl_id);
+H5_DLL herr_t  H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                   H5A_info_t *ainfo /*out*/, hid_t lapl_id);
+H5_DLL herr_t  H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+                                  H5_iter_order_t order, hsize_t n, H5A_info_t *ainfo /*out*/, hid_t lapl_id);
 H5_DLL herr_t  H5Arename(hid_t loc_id, const char *old_name, const char *new_name);
-H5_DLL herr_t  H5Arename_by_name(hid_t loc_id, const char *obj_name,
-    const char *old_attr_name, const char *new_attr_name, hid_t lapl_id);
-H5_DLL herr_t  H5Aiterate2(hid_t loc_id, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t *idx, H5A_operator2_t op, void *op_data);
+H5_DLL herr_t  H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name,
+                                 const char *new_attr_name, hid_t lapl_id);
+H5_DLL herr_t  H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx,
+                           H5A_operator2_t op, void *op_data);
 H5_DLL herr_t  H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t *idx, H5A_operator2_t op, void *op_data,
-    hid_t lapd_id);
+                                  H5_iter_order_t order, hsize_t *idx, H5A_operator2_t op, void *op_data,
+                                  hid_t lapd_id);
 H5_DLL herr_t  H5Adelete(hid_t loc_id, const char *name);
-H5_DLL herr_t  H5Adelete_by_name(hid_t loc_id, const char *obj_name,
-    const char *attr_name, hid_t lapl_id);
-H5_DLL herr_t  H5Adelete_by_idx(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id);
+H5_DLL herr_t  H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t lapl_id);
+H5_DLL herr_t H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                               hsize_t n, hid_t lapl_id);
 H5_DLL htri_t H5Aexists(hid_t obj_id, const char *attr_name);
-H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name,
-    const char *attr_name, hid_t lapl_id);
+H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char *attr_name, hid_t lapl_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
@@ -99,22 +93,18 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name,
 
 /* Macros */
 
-
 /* Typedefs */
 
 /* Typedef for H5Aiterate1() callbacks */
-typedef herr_t (*H5A_operator1_t)(hid_t location_id/*in*/,
-    const char *attr_name/*in*/, void *operator_data/*in,out*/);
-
+typedef herr_t (*H5A_operator1_t)(hid_t location_id /*in*/, const char *attr_name /*in*/,
+                                  void *operator_data /*in,out*/);
 
 /* Function prototypes */
-H5_DLL hid_t   H5Acreate1(hid_t loc_id, const char *name, hid_t type_id,
-    hid_t space_id, hid_t acpl_id);
-H5_DLL hid_t   H5Aopen_name(hid_t loc_id, const char *name);
-H5_DLL hid_t   H5Aopen_idx(hid_t loc_id, unsigned idx);
-H5_DLL int     H5Aget_num_attrs(hid_t loc_id);
-H5_DLL herr_t  H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op,
-    void *op_data);
+H5_DLL hid_t  H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t acpl_id);
+H5_DLL hid_t  H5Aopen_name(hid_t loc_id, const char *name);
+H5_DLL hid_t  H5Aopen_idx(hid_t loc_id, unsigned idx);
+H5_DLL int    H5Aget_num_attrs(hid_t loc_id);
+H5_DLL herr_t H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op, void *op_data);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
@@ -123,4 +113,3 @@ H5_DLL herr_t  H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op,
 #endif
 
 #endif /* _H5Apublic_H */
-
diff --git a/src/H5Atest.c b/src/H5Atest.c
index 09a4834..2aade87 100644
--- a/src/H5Atest.c
+++ b/src/H5Atest.c
@@ -24,56 +24,47 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg  */
-#define H5A_TESTING		/*suppress warning about H5A testing funcs*/
-
+#define H5A_PACKAGE /*suppress error about including H5Apkg  */
+#define H5A_TESTING /*suppress warning about H5A testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5SMprivate.h"        /* Shared object header messages        */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes	  			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5SMprivate.h" /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_is_shared_test
  *
@@ -90,13 +81,13 @@
 htri_t
 H5A_is_shared_test(hid_t attr_id)
 {
-    H5A_t	*attr;                  /* Attribute object for ID */
-    htri_t	ret_value = FAIL;       /* Return value */
+    H5A_t *attr;             /* Attribute object for ID */
+    htri_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check arguments */
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
 
     /* Check if attribute is shared */
@@ -106,7 +97,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_is_shared_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_get_shared_rc_test
  *
@@ -123,24 +113,22 @@ done:
 herr_t
 H5A_get_shared_rc_test(hid_t attr_id, hsize_t *ref_count)
 {
-    H5A_t	*attr;                  /* Attribute object for ID */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5A_t *attr;                /* Attribute object for ID */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check arguments */
-    if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
+    if (NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
 
     /* Sanity check */
     HDassert(H5O_msg_is_shared(H5O_ATTR_ID, attr));
 
     /* Retrieve ref count for shared or shareable attribute */
-    if(H5SM_get_refcount(attr->oloc.file, H5AC_ind_dxpl_id, H5O_ATTR_ID,
-            &attr->sh_loc, ref_count) < 0)
+    if (H5SM_get_refcount(attr->oloc.file, H5AC_ind_dxpl_id, H5O_ATTR_ID, &attr->sh_loc, ref_count) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve shared message ref count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_get_shared_rc_test() */
-
diff --git a/src/H5B.c b/src/H5B.c
index 197afa9..4ffd8f7 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -95,31 +95,32 @@
 /* Module Setup */
 /****************/
 
-#define H5B_PACKAGE		/*suppress error about including H5Bpkg	  */
-
+#define H5B_PACKAGE /*suppress error about including H5Bpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Bpkg.h"		/* B-link trees				*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5Pprivate.h"         /* Property lists                       */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Bpkg.h"      /* B-link trees				*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5Pprivate.h"  /* Property lists                       */
 
 /****************/
 /* Local Macros */
 /****************/
-#define H5B_SIZEOF_HDR(F)						      \
-   (H5_SIZEOF_MAGIC +		/*magic number				  */  \
-    4 +				/*type, level, num entries		  */  \
-    2*H5F_SIZEOF_ADDR(F))	/*left and right sibling addresses	  */
+#define H5B_SIZEOF_HDR(F)                                                                                    \
+    (H5_SIZEOF_MAGIC +       /*magic number				  */                                                          \
+     4 +                     /*type, level, num entries		  */                                                \
+     2 * H5F_SIZEOF_ADDR(F)) /*left and right sibling addresses	  */
 
 /* Default initializer for H5B_ins_ud_t */
-#define H5B_INS_UD_T_NULL {NULL, HADDR_UNDEF, H5AC__NO_FLAGS_SET}
+#define H5B_INS_UD_T_NULL                                                                                    \
+    {                                                                                                        \
+        NULL, HADDR_UNDEF, H5AC__NO_FLAGS_SET                                                                \
+    }
 
 /******************/
 /* Local Typedefs */
@@ -127,38 +128,30 @@
 
 /* "user data" for iterating over B-tree (collects B-tree metadata size) */
 typedef struct H5B_iter_ud_t {
-    H5B_info_t *bt_info;        /* Information about B-tree */
-    void    *udata;             /* Node type's 'udata' for loading & iterator callback */
+    H5B_info_t *bt_info; /* Information about B-tree */
+    void *      udata;   /* Node type's 'udata' for loading & iterator callback */
 } H5B_info_ud_t;
 
 /* Convenience struct for the arguments needed to unprotect a b-tree after a
  * call to H5B_iterate_helper() or H5B_split() */
 typedef struct H5B_ins_ud_t {
-    H5B_t       *bt;            /* B-tree */
-    haddr_t     addr;           /* B-tree address */
-    unsigned    cache_flags;    /* Cache flags for H5AC_unprotect() */
+    H5B_t *  bt;          /* B-tree */
+    haddr_t  addr;        /* B-tree address */
+    unsigned cache_flags; /* Cache flags for H5AC_unprotect() */
 } H5B_ins_ud_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static H5B_ins_t H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
-				   const H5B_class_t *type,
-				   uint8_t *lt_key,
-				   hbool_t *lt_key_changed,
-				   uint8_t *md_key, void *udata,
-				   uint8_t *rt_key,
-				   hbool_t *rt_key_changed,
-				   H5B_ins_ud_t *split_bt_ud/*out*/);
-static herr_t H5B_insert_child(H5B_t *bt, unsigned *bt_flags,
-                               unsigned idx, haddr_t child,
-			       H5B_ins_t anchor, const void *md_key);
-static herr_t H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
-                        unsigned idx, void *udata,
-                        H5B_ins_ud_t *split_bt_ud/*out*/);
-static H5B_t * H5B_copy(const H5B_t *old_bt);
-
+static H5B_ins_t H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, const H5B_class_t *type,
+                                   uint8_t *lt_key, hbool_t *lt_key_changed, uint8_t *md_key, void *udata,
+                                   uint8_t *rt_key, hbool_t *rt_key_changed,
+                                   H5B_ins_ud_t *split_bt_ud /*out*/);
+static herr_t H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx, haddr_t child, H5B_ins_t anchor,
+                               const void *md_key);
+static herr_t H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx, void *udata,
+                        H5B_ins_ud_t *split_bt_ud /*out*/);
+static H5B_t *H5B_copy(const H5B_t *old_bt);
 
 /*********************/
 /* Package Variables */
@@ -173,12 +166,10 @@ H5FL_BLK_DEFINE(native_block);
 /* Declare a free list to manage the H5B_t struct */
 H5FL_DEFINE(H5B_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -192,8 +183,6 @@ H5FL_BLK_DEFINE_STATIC(page);
 /* Declare a free list to manage the native key offset sequence information */
 H5FL_SEQ_DEFINE_STATIC(size_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_create
  *
@@ -213,12 +202,11 @@ H5FL_SEQ_DEFINE_STATIC(size_t);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata,
-	   haddr_t *addr_p/*out*/)
+H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata, haddr_t *addr_p /*out*/)
 {
-    H5B_t		*bt = NULL;
-    H5B_shared_t        *shared=NULL;        /* Pointer to shared B-tree info */
-    herr_t		ret_value = SUCCEED;
+    H5B_t *       bt        = NULL;
+    H5B_shared_t *shared    = NULL; /* Pointer to shared B-tree info */
+    herr_t        ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -232,49 +220,48 @@ H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata,
     /*
      * Allocate file and memory data structures.
      */
-    if(NULL == (bt = H5FL_MALLOC(H5B_t)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for B-tree root node")
+    if (NULL == (bt = H5FL_MALLOC(H5B_t)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for B-tree root node")
     HDmemset(&bt->cache_info, 0, sizeof(H5AC_info_t));
-    bt->level = 0;
-    bt->left = HADDR_UNDEF;
-    bt->right = HADDR_UNDEF;
+    bt->level     = 0;
+    bt->left      = HADDR_UNDEF;
+    bt->right     = HADDR_UNDEF;
     bt->nchildren = 0;
-    if(NULL == (bt->rc_shared = (type->get_shared)(f, udata)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree node buffer")
+    if (NULL == (bt->rc_shared = (type->get_shared)(f, udata)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree node buffer")
     H5RC_INC(bt->rc_shared);
-    shared=(H5B_shared_t *)H5RC_GET_OBJ(bt->rc_shared);
+    shared = (H5B_shared_t *)H5RC_GET_OBJ(bt->rc_shared);
     HDassert(shared);
-    if(NULL == (bt->native = H5FL_BLK_MALLOC(native_block, shared->sizeof_keys)) ||
-            NULL == (bt->child = H5FL_SEQ_MALLOC(haddr_t, (size_t)shared->two_k)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for B-tree root node")
-    if(HADDR_UNDEF == (*addr_p = H5MF_alloc(f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)shared->sizeof_rnode)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "file allocation failed for B-tree root node")
+    if (NULL == (bt->native = H5FL_BLK_MALLOC(native_block, shared->sizeof_keys)) ||
+        NULL == (bt->child = H5FL_SEQ_MALLOC(haddr_t, (size_t)shared->two_k)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for B-tree root node")
+    if (HADDR_UNDEF == (*addr_p = H5MF_alloc(f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)shared->sizeof_rnode)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "file allocation failed for B-tree root node")
 
     /*
      * Cache the new B-tree node.
      */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_BT, *addr_p, bt, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree root node to cache")
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_BT, *addr_p, bt, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree root node to cache")
 #ifdef H5B_DEBUG
     H5B_assert(f, dxpl_id, *addr_p, shared->type, udata);
 #endif
 
 done:
-    if(ret_value < 0) {
-        if(shared && shared->sizeof_rnode>0) {
-            H5_CHECK_OVERFLOW(shared->sizeof_rnode,size_t,hsize_t);
+    if (ret_value < 0) {
+        if (shared && shared->sizeof_rnode > 0) {
+            H5_CHECK_OVERFLOW(shared->sizeof_rnode, size_t, hsize_t);
             (void)H5MF_xfree(f, H5FD_MEM_BTREE, dxpl_id, *addr_p, (hsize_t)shared->sizeof_rnode);
         } /* end if */
-	if(bt)
+        if (bt)
             /* Destroy B-tree node */
-            if(H5B_node_dest(bt) < 0)
+            if (H5B_node_dest(bt) < 0)
                 HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5B_create() */        /*lint !e818 Can't make udata a pointer to const */
+} /* end H5B_create() */ /*lint !e818 Can't make udata a pointer to const */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_find
  *
@@ -301,13 +288,13 @@ done:
 htri_t
 H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata)
 {
-    H5B_t	*bt = NULL;
-    H5RC_t	*rc_shared;             /* Ref-counted shared info */
-    H5B_shared_t *shared;               /* Pointer to shared B-tree info */
+    H5B_t *        bt = NULL;
+    H5RC_t *       rc_shared;           /* Ref-counted shared info */
+    H5B_shared_t * shared;              /* Pointer to shared B-tree info */
     H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    unsigned    idx = 0, lt = 0, rt;    /* Final, left & right key indices */
-    int	        cmp = 1;                /* Key comparison value */
-    htri_t	ret_value = FAIL;       /* Return value */
+    unsigned       idx = 0, lt = 0, rt; /* Final, left & right key indices */
+    int            cmp       = 1;       /* Key comparison value */
+    htri_t         ret_value = FAIL;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -322,8 +309,8 @@ H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *u
     HDassert(H5F_addr_defined(addr));
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, udata)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
+    if (NULL == (rc_shared = (type->get_shared)(f, udata)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
@@ -331,47 +318,46 @@ H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *u
      * Perform a binary search to locate the child which contains
      * the thing for which we're searching.
      */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
+    if (NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
 
     rt = bt->nchildren;
-    while(lt < rt && cmp) {
-	idx = (lt + rt) / 2;
-	/* compare */
-	if((cmp = (type->cmp3)(H5B_NKEY(bt, shared, idx), udata, H5B_NKEY(bt, shared, (idx + 1)))) < 0)
-	    rt = idx;
-	else
-	    lt = idx + 1;
+    while (lt < rt && cmp) {
+        idx = (lt + rt) / 2;
+        /* compare */
+        if ((cmp = (type->cmp3)(H5B_NKEY(bt, shared, idx), udata, H5B_NKEY(bt, shared, (idx + 1)))) < 0)
+            rt = idx;
+        else
+            lt = idx + 1;
     } /* end while */
     /* Check if not found */
-    if(cmp)
-	HGOTO_DONE(FALSE)
+    if (cmp)
+        HGOTO_DONE(FALSE)
 
     /*
      * Follow the link to the subtree or to the data node.
      */
     HDassert(idx < bt->nchildren);
 
-    if(bt->level > 0) {
-	if((ret_value = H5B_find(f, dxpl_id, type, bt->child[idx], udata)) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "can't lookup key in subtree")
+    if (bt->level > 0) {
+        if ((ret_value = H5B_find(f, dxpl_id, type, bt->child[idx], udata)) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "can't lookup key in subtree")
     } /* end if */
     else {
-	if((ret_value = (type->found)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx), udata)) < 0)
+        if ((ret_value = (type->found)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx), udata)) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "can't lookup key in leaf node")
     } /* end else */
 
 done:
-    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release node")
+    if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_find() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_split
  *
@@ -395,15 +381,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx,
-    void *udata, H5B_ins_ud_t *split_bt_ud/*out*/)
+H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx, void *udata,
+          H5B_ins_ud_t *split_bt_ud /*out*/)
 {
-    H5P_genplist_t *dx_plist;           /* Data transfer property list */
-    H5B_shared_t  *shared;              /* Pointer to shared B-tree info */
-    H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    unsigned	nleft, nright;          /* Number of keys in left & right halves */
-    double      split_ratios[3];        /* B-tree split ratios */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *dx_plist;            /* Data transfer property list */
+    H5B_shared_t *  shared;              /* Pointer to shared B-tree info */
+    H5B_cache_ud_t  cache_udata;         /* User-data for metadata cache callback */
+    unsigned        nleft, nright;       /* Number of keys in left & right halves */
+    double          split_ratios[3];     /* B-tree split ratios */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -425,27 +411,27 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx,
     HDassert(bt_ud->bt->nchildren == shared->two_k);
 
     /* Get the dataset transfer property list */
-    if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_BTREE, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
     /* Get B-tree split ratios */
-    if(H5P_get(dx_plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &split_ratios[0]) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &split_ratios[0]) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree split ratios")
 
 #ifdef H5B_DEBUG
-    if(H5DEBUG(B)) {
-	const char *side;
-
-	if(!H5F_addr_defined(bt_ud->bt->left) && !H5F_addr_defined(bt_ud->bt->right))
-	    side = "ONLY";
-	else if(!H5F_addr_defined(bt_ud->bt->right))
-	    side = "RIGHT";
-	else if(!H5F_addr_defined(bt_ud->bt->left))
-	    side = "LEFT";
-	else
-	    side = "MIDDLE";
-        HDfprintf(H5DEBUG(B), "H5B_split: %3u {%5.3f,%5.3f,%5.3f} %6s",
-            shared->two_k, split_ratios[0], split_ratios[1], split_ratios[2], side);
+    if (H5DEBUG(B)) {
+        const char *side;
+
+        if (!H5F_addr_defined(bt_ud->bt->left) && !H5F_addr_defined(bt_ud->bt->right))
+            side = "ONLY";
+        else if (!H5F_addr_defined(bt_ud->bt->right))
+            side = "RIGHT";
+        else if (!H5F_addr_defined(bt_ud->bt->left))
+            side = "LEFT";
+        else
+            side = "MIDDLE";
+        HDfprintf(H5DEBUG(B), "H5B_split: %3u {%5.3f,%5.3f,%5.3f} %6s", shared->two_k, split_ratios[0],
+                  split_ratios[1], split_ratios[2], side);
     }
 #endif
 
@@ -453,38 +439,39 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx,
      * Decide how to split the children of the old node among the old node
      * and the new node.
      */
-    if(!H5F_addr_defined(bt_ud->bt->right))
-	nleft = (unsigned)((double)shared->two_k * split_ratios[2]);	/*right*/
-    else if(!H5F_addr_defined(bt_ud->bt->left))
-	nleft = (unsigned)((double)shared->two_k * split_ratios[0]);	/*left*/
+    if (!H5F_addr_defined(bt_ud->bt->right))
+        nleft = (unsigned)((double)shared->two_k * split_ratios[2]); /*right*/
+    else if (!H5F_addr_defined(bt_ud->bt->left))
+        nleft = (unsigned)((double)shared->two_k * split_ratios[0]); /*left*/
     else
-	nleft = (unsigned)((double)shared->two_k * split_ratios[1]);	/*middle*/
+        nleft = (unsigned)((double)shared->two_k * split_ratios[1]); /*middle*/
 
     /*
      * Keep the new child in the same node as the child that split.  This can
      * result in nodes that have an unused child when data is written
      * sequentially, but it simplifies stuff below.
      */
-    if(idx < nleft && nleft == shared->two_k)
-	--nleft;
-    else if(idx >= nleft && 0 == nleft)
-	nleft++;
+    if (idx < nleft && nleft == shared->two_k)
+        --nleft;
+    else if (idx >= nleft && 0 == nleft)
+        nleft++;
     nright = shared->two_k - nleft;
 #ifdef H5B_DEBUG
-    if(H5DEBUG(B))
+    if (H5DEBUG(B))
         HDfprintf(H5DEBUG(B), " split %3d/%-3d\n", nleft, nright);
 #endif
 
     /*
      * Create the new B-tree node.
      */
-    if(H5B_create(f, dxpl_id, shared->type, udata, &split_bt_ud->addr/*out*/) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create B-tree")
-    cache_udata.f = f;
-    cache_udata.type = shared->type;
+    if (H5B_create(f, dxpl_id, shared->type, udata, &split_bt_ud->addr /*out*/) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create B-tree")
+    cache_udata.f         = f;
+    cache_udata.type      = shared->type;
     cache_udata.rc_shared = bt_ud->bt->rc_shared;
-    if(NULL == (split_bt_ud->bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, split_bt_ud->addr, &cache_udata, H5AC_WRITE)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree")
+    if (NULL == (split_bt_ud->bt =
+                     (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, split_bt_ud->addr, &cache_udata, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree")
     split_bt_ud->bt->level = bt_ud->bt->level;
 
     /*
@@ -492,12 +479,9 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx,
      */
 
     split_bt_ud->cache_flags = H5AC__DIRTIED_FLAG;
-    HDmemcpy(split_bt_ud->bt->native,
-	     bt_ud->bt->native + nleft * shared->type->sizeof_nkey,
-	     (nright + 1) * shared->type->sizeof_nkey);
-    HDmemcpy(split_bt_ud->bt->child,
-            &bt_ud->bt->child[nleft],
-            nright * sizeof(haddr_t));
+    HDmemcpy(split_bt_ud->bt->native, bt_ud->bt->native + nleft * shared->type->sizeof_nkey,
+             (nright + 1) * shared->type->sizeof_nkey);
+    HDmemcpy(split_bt_ud->bt->child, &bt_ud->bt->child[nleft], nright * sizeof(haddr_t));
 
     split_bt_ud->bt->nchildren = nright;
 
@@ -510,36 +494,37 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx,
     /*
      * Update other sibling pointers.
      */
-    split_bt_ud->bt->left = bt_ud->addr;
+    split_bt_ud->bt->left  = bt_ud->addr;
     split_bt_ud->bt->right = bt_ud->bt->right;
 
-    if(H5F_addr_defined(bt_ud->bt->right)) {
-        H5B_t   *tmp_bt;
+    if (H5F_addr_defined(bt_ud->bt->right)) {
+        H5B_t *tmp_bt;
 
-        if(NULL == (tmp_bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt_ud->bt->right, &cache_udata, H5AC_WRITE)))
+        if (NULL ==
+            (tmp_bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt_ud->bt->right, &cache_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load right sibling")
 
         tmp_bt->left = split_bt_ud->addr;
 
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt_ud->bt->right, tmp_bt, H5AC__DIRTIED_FLAG) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT, bt_ud->bt->right, tmp_bt, H5AC__DIRTIED_FLAG) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     } /* end if */
 
     bt_ud->bt->right = split_bt_ud->addr;
 
 done:
-    if(ret_value < 0) {
-        if(split_bt_ud->bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, split_bt_ud->addr, split_bt_ud->bt, split_bt_ud->cache_flags) < 0)
+    if (ret_value < 0) {
+        if (split_bt_ud->bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, split_bt_ud->addr, split_bt_ud->bt,
+                                              split_bt_ud->cache_flags) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
-        split_bt_ud->bt = NULL;
-        split_bt_ud->addr = HADDR_UNDEF;
+        split_bt_ud->bt          = NULL;
+        split_bt_ud->addr        = HADDR_UNDEF;
         split_bt_ud->cache_flags = H5AC__NO_FLAGS_SET;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_split() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_insert
  *
@@ -559,22 +544,22 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     /*
      * These are defined this way to satisfy alignment constraints.
      */
-    uint64_t	_lt_key[128], _md_key[128], _rt_key[128];
-    uint8_t	*lt_key=(uint8_t*)_lt_key;
-    uint8_t	*md_key=(uint8_t*)_md_key;
-    uint8_t	*rt_key=(uint8_t*)_rt_key;
-
-    hbool_t	lt_key_changed = FALSE, rt_key_changed = FALSE;
-    haddr_t     old_root_addr = HADDR_UNDEF;
-    unsigned	level;
-    H5B_ins_ud_t bt_ud = H5B_INS_UD_T_NULL; /* (Old) root node */
-    H5B_ins_ud_t split_bt_ud = H5B_INS_UD_T_NULL; /* Split B-tree node */
-    H5B_t       *new_root_bt = NULL;    /* New root node */
-    H5RC_t	*rc_shared;             /* Ref-counted shared info */
-    H5B_shared_t        *shared;        /* Pointer to shared B-tree info */
-    H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    H5B_ins_t	my_ins = H5B_INS_ERROR;
-    herr_t	ret_value = SUCCEED;
+    uint64_t _lt_key[128], _md_key[128], _rt_key[128];
+    uint8_t *lt_key = (uint8_t *)_lt_key;
+    uint8_t *md_key = (uint8_t *)_md_key;
+    uint8_t *rt_key = (uint8_t *)_rt_key;
+
+    hbool_t        lt_key_changed = FALSE, rt_key_changed = FALSE;
+    haddr_t        old_root_addr = HADDR_UNDEF;
+    unsigned       level;
+    H5B_ins_ud_t   bt_ud       = H5B_INS_UD_T_NULL; /* (Old) root node */
+    H5B_ins_ud_t   split_bt_ud = H5B_INS_UD_T_NULL; /* Split B-tree node */
+    H5B_t *        new_root_bt = NULL;              /* New root node */
+    H5RC_t *       rc_shared;                       /* Ref-counted shared info */
+    H5B_shared_t * shared;                          /* Pointer to shared B-tree info */
+    H5B_cache_ud_t cache_udata;                     /* User-data for metadata cache callback */
+    H5B_ins_t      my_ins    = H5B_INS_ERROR;
+    herr_t         ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -585,27 +570,26 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     HDassert(H5F_addr_defined(addr));
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, udata)))
+    if (NULL == (rc_shared = (type->get_shared)(f, udata)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
     /* Protect the root node */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    bt_ud.addr = addr;
-    if(NULL == (bt_ud.bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_WRITE)))
+    bt_ud.addr            = addr;
+    if (NULL == (bt_ud.bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to locate root of B-tree")
 
     /* Insert the object */
-    if((int)(my_ins = H5B_insert_helper(f, dxpl_id, &bt_ud, type, lt_key,
-            &lt_key_changed, md_key, udata, rt_key, &rt_key_changed,
-            &split_bt_ud/*out*/)) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to insert key")
+    if ((int)(my_ins = H5B_insert_helper(f, dxpl_id, &bt_ud, type, lt_key, &lt_key_changed, md_key, udata,
+                                         rt_key, &rt_key_changed, &split_bt_ud /*out*/)) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to insert key")
 
     /* Check if the root node split */
-    if(H5B_INS_NOOP == my_ins) {
+    if (H5B_INS_NOOP == my_ins) {
         HDassert(!split_bt_ud.bt);
         HGOTO_DONE(SUCCEED)
     } /* end if */
@@ -617,37 +601,38 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     level = bt_ud.bt->level;
 
     /* update left and right keys */
-    if(!lt_key_changed)
-	HDmemcpy(lt_key, H5B_NKEY(bt_ud.bt,shared,0), type->sizeof_nkey);
-    if(!rt_key_changed)
-	HDmemcpy(rt_key, H5B_NKEY(split_bt_ud.bt,shared,split_bt_ud.bt->nchildren), type->sizeof_nkey);
+    if (!lt_key_changed)
+        HDmemcpy(lt_key, H5B_NKEY(bt_ud.bt, shared, 0), type->sizeof_nkey);
+    if (!rt_key_changed)
+        HDmemcpy(rt_key, H5B_NKEY(split_bt_ud.bt, shared, split_bt_ud.bt->nchildren), type->sizeof_nkey);
 
     /*
      * Copy the old root node to some other file location and make the new root
      * at the old root's previous address.  This prevents the B-tree from
      * "moving".
      */
-    H5_CHECK_OVERFLOW(shared->sizeof_rnode,size_t,hsize_t);
-    if(HADDR_UNDEF == (old_root_addr = H5MF_alloc(f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)shared->sizeof_rnode)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "unable to allocate file space to move root")
+    H5_CHECK_OVERFLOW(shared->sizeof_rnode, size_t, hsize_t);
+    if (HADDR_UNDEF ==
+        (old_root_addr = H5MF_alloc(f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)shared->sizeof_rnode)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "unable to allocate file space to move root")
 
     /*
      * Move the node to the new location
      */
 
     /* Make a copy of the old root information */
-    if(NULL == (new_root_bt = H5B_copy(bt_ud.bt)))
+    if (NULL == (new_root_bt = H5B_copy(bt_ud.bt)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTCOPY, FAIL, "unable to copy old root")
 
     /* Unprotect the old root so we can move it.  Also force it to be marked
      * dirty so it is written to the new location. */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt_ud.addr, bt_ud.bt, H5AC__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, H5AC_BT, bt_ud.addr, bt_ud.bt, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release old root")
-    bt_ud.bt = NULL;  /* Make certain future references will be caught */
+    bt_ud.bt = NULL; /* Make certain future references will be caught */
 
     /* Move the location of the old root on the disk */
-    if(H5AC_move_entry(f, H5AC_BT, bt_ud.addr, old_root_addr) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to move B-tree root node")
+    if (H5AC_move_entry(f, H5AC_BT, bt_ud.addr, old_root_addr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to move B-tree root node")
     bt_ud.addr = old_root_addr;
 
     /* Update the split b-tree's left pointer to point to the new location */
@@ -655,11 +640,11 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     split_bt_ud.cache_flags |= H5AC__DIRTIED_FLAG;
 
     /* clear the old root info at the old address (we already copied it) */
-    new_root_bt->left = HADDR_UNDEF;
+    new_root_bt->left  = HADDR_UNDEF;
     new_root_bt->right = HADDR_UNDEF;
 
     /* Set the new information for the copy */
-    new_root_bt->level = level + 1;
+    new_root_bt->level     = level + 1;
     new_root_bt->nchildren = 2;
 
     new_root_bt->child[0] = bt_ud.addr;
@@ -670,31 +655,31 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     HDmemcpy(H5B_NKEY(new_root_bt, shared, 2), rt_key, shared->type->sizeof_nkey);
 
     /* Insert the modified copy of the old root into the file again */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_BT, addr, new_root_bt, H5AC__NO_FLAGS_SET) < 0)
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_BT, addr, new_root_bt, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to add old B-tree root node to cache")
 
 done:
-    if(ret_value < 0)
-        if(new_root_bt && H5B_node_dest(new_root_bt) < 0)
+    if (ret_value < 0)
+        if (new_root_bt && H5B_node_dest(new_root_bt) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to free B-tree root node");
 
-    if(bt_ud.bt)
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt_ud.addr, bt_ud.bt, bt_ud.cache_flags) < 0)
+    if (bt_ud.bt)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT, bt_ud.addr, bt_ud.bt, bt_ud.cache_flags) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to unprotect old root")
 
-    if(split_bt_ud.bt)
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, split_bt_ud.addr, split_bt_ud.bt, split_bt_ud.cache_flags) < 0)
+    if (split_bt_ud.bt)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT, split_bt_ud.addr, split_bt_ud.bt, split_bt_ud.cache_flags) <
+            0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to unprotect new child")
 
 #ifdef H5B_DEBUG
-    if(ret_value >= 0)
+    if (ret_value >= 0)
         H5B_assert(f, dxpl_id, addr, type, udata);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_insert_child
  *
@@ -711,11 +696,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx,
-    haddr_t child, H5B_ins_t anchor, const void *md_key)
+H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx, haddr_t child, H5B_ins_t anchor,
+                 const void *md_key)
 {
-    H5B_shared_t        *shared;        /* Pointer to shared B-tree info */
-    uint8_t             *base;          /* Base offset for move */
+    H5B_shared_t *shared; /* Pointer to shared B-tree info */
+    uint8_t *     base;   /* Base offset for move */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -730,32 +715,30 @@ H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx,
      * records to an unlimited dimension chunked dataset)
      */
     base = H5B_NKEY(bt, shared, (idx + 1));
-    if((idx + 1) == bt->nchildren) {
+    if ((idx + 1) == bt->nchildren) {
         /* Make room for the new key */
         HDmemcpy(base + shared->type->sizeof_nkey, base,
-                  shared->type->sizeof_nkey);   /* No overlap possible - memcpy() OK */
+                 shared->type->sizeof_nkey); /* No overlap possible - memcpy() OK */
         HDmemcpy(base, md_key, shared->type->sizeof_nkey);
 
         /* The MD_KEY is the left key of the new node */
-        if(H5B_INS_RIGHT == anchor)
-            idx++;  /* Don't have to memmove() child addresses down, just add new child */
+        if (H5B_INS_RIGHT == anchor)
+            idx++; /* Don't have to memmove() child addresses down, just add new child */
         else
             /* Make room for the new child address */
             bt->child[idx + 1] = bt->child[idx];
     } /* end if */
     else {
         /* Make room for the new key */
-        HDmemmove(base + shared->type->sizeof_nkey, base,
-                  (bt->nchildren - idx) * shared->type->sizeof_nkey);
+        HDmemmove(base + shared->type->sizeof_nkey, base, (bt->nchildren - idx) * shared->type->sizeof_nkey);
         HDmemcpy(base, md_key, shared->type->sizeof_nkey);
 
         /* The MD_KEY is the left key of the new node */
-        if(H5B_INS_RIGHT == anchor)
+        if (H5B_INS_RIGHT == anchor)
             idx++;
 
         /* Make room for the new child address */
-        HDmemmove(bt->child + idx + 1, bt->child + idx,
-                  (bt->nchildren - idx) * sizeof(haddr_t));
+        HDmemmove(bt->child + idx + 1, bt->child + idx, (bt->nchildren - idx) * sizeof(haddr_t));
     } /* end if */
 
     bt->child[idx] = child;
@@ -767,7 +750,6 @@ H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5B_insert_child() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_insert_helper
  *
@@ -800,23 +782,20 @@ H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx,
  *-------------------------------------------------------------------------
  */
 static H5B_ins_t
-H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
-                  const H5B_class_t *type,
-                  uint8_t *lt_key, hbool_t *lt_key_changed,
-                  uint8_t *md_key, void *udata,
-		  uint8_t *rt_key, hbool_t *rt_key_changed,
-		  H5B_ins_ud_t *split_bt_ud/*out*/)
+H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, const H5B_class_t *type, uint8_t *lt_key,
+                  hbool_t *lt_key_changed, uint8_t *md_key, void *udata, uint8_t *rt_key,
+                  hbool_t *rt_key_changed, H5B_ins_ud_t *split_bt_ud /*out*/)
 {
-    H5B_t       *bt;                    /* Convenience pointer to B-tree */
-    H5RC_t	*rc_shared;             /* Ref-counted shared info */
-    H5B_shared_t *shared;               /* Pointer to shared B-tree info */
-    H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    unsigned	lt = 0, idx = 0, rt;    /* Left, final & right index values */
-    int         cmp = -1;               /* Key comparison value */
-    H5B_ins_ud_t child_bt_ud = H5B_INS_UD_T_NULL; /* Child B-tree */
-    H5B_ins_ud_t new_child_bt_ud = H5B_INS_UD_T_NULL; /* Newly split child B-tree */
-    H5B_ins_t	my_ins = H5B_INS_ERROR;
-    H5B_ins_t	ret_value = H5B_INS_ERROR;      /* Return value */
+    H5B_t *        bt;                                  /* Convenience pointer to B-tree */
+    H5RC_t *       rc_shared;                           /* Ref-counted shared info */
+    H5B_shared_t * shared;                              /* Pointer to shared B-tree info */
+    H5B_cache_ud_t cache_udata;                         /* User-data for metadata cache callback */
+    unsigned       lt = 0, idx = 0, rt;                 /* Left, final & right index values */
+    int            cmp             = -1;                /* Key comparison value */
+    H5B_ins_ud_t   child_bt_ud     = H5B_INS_UD_T_NULL; /* Child B-tree */
+    H5B_ins_ud_t   new_child_bt_ud = H5B_INS_UD_T_NULL; /* Newly split child B-tree */
+    H5B_ins_t      my_ins          = H5B_INS_ERROR;
+    H5B_ins_t      ret_value       = H5B_INS_ERROR; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -846,8 +825,8 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
     *rt_key_changed = FALSE;
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, udata)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, H5B_INS_ERROR, "can't retrieve B-tree's shared ref. count object")
+    if (NULL == (rc_shared = (type->get_shared)(f, udata)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, H5B_INS_ERROR, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
@@ -858,75 +837,78 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
      */
     rt = bt->nchildren;
 
-    while(lt < rt && cmp) {
-	idx = (lt + rt) / 2;
-	if((cmp = (type->cmp3)(H5B_NKEY(bt, shared, idx), udata, H5B_NKEY(bt, shared, idx + 1))) < 0)
-	    rt = idx;
-	else
-	    lt = idx + 1;
+    while (lt < rt && cmp) {
+        idx = (lt + rt) / 2;
+        if ((cmp = (type->cmp3)(H5B_NKEY(bt, shared, idx), udata, H5B_NKEY(bt, shared, idx + 1))) < 0)
+            rt = idx;
+        else
+            lt = idx + 1;
     } /* end while */
 
     /* Set up user data for cache callbacks */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
 
-    if(0 == bt->nchildren) {
-	/*
-	 * The value being inserted will be the only value in this tree. We
-	 * must necessarily be at level zero.
-	 */
-	HDassert(0 == bt->level);
-	if((type->new_node)(f, dxpl_id, H5B_INS_FIRST, H5B_NKEY(bt, shared, 0), udata,
-			     H5B_NKEY(bt, shared, 1), bt->child + 0/*out*/) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, H5B_INS_ERROR, "unable to create leaf node")
-	bt->nchildren = 1;
+    if (0 == bt->nchildren) {
+        /*
+         * The value being inserted will be the only value in this tree. We
+         * must necessarily be at level zero.
+         */
+        HDassert(0 == bt->level);
+        if ((type->new_node)(f, dxpl_id, H5B_INS_FIRST, H5B_NKEY(bt, shared, 0), udata,
+                             H5B_NKEY(bt, shared, 1), bt->child + 0 /*out*/) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, H5B_INS_ERROR, "unable to create leaf node")
+        bt->nchildren = 1;
         bt_ud->cache_flags |= H5AC__DIRTIED_FLAG;
-	idx = 0;
-
-	if(type->follow_min) {
-	    if((int)(my_ins = (type->insert)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx),
-                     lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
-                     rt_key_changed, &new_child_bt_ud.addr/*out*/)) < 0)
-		HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "unable to insert first leaf node")
-	} /* end if */
+        idx = 0;
+
+        if (type->follow_min) {
+            if ((int)(my_ins = (type->insert)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx),
+                                              lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
+                                              rt_key_changed, &new_child_bt_ud.addr /*out*/)) < 0)
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "unable to insert first leaf node")
+        } /* end if */
         else
-	    my_ins = H5B_INS_NOOP;
-    } else if(cmp < 0 && idx == 0) {
-        if(bt->level > 0) {
+            my_ins = H5B_INS_NOOP;
+    }
+    else if (cmp < 0 && idx == 0) {
+        if (bt->level > 0) {
             /*
              * The value being inserted is less than any value in this tree.
              * Follow the minimum branch out of this node to a subtree.
              */
             child_bt_ud.addr = bt->child[idx];
-            if(NULL == (child_bt_ud.bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, child_bt_ud.addr, &cache_udata, H5AC_WRITE)))
+            if (NULL == (child_bt_ud.bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, child_bt_ud.addr,
+                                                                &cache_udata, H5AC_WRITE)))
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load node")
 
-            if((int)(my_ins = H5B_insert_helper(f, dxpl_id, &child_bt_ud, type,
-                    H5B_NKEY(bt,shared,idx), lt_key_changed, md_key,
-                    udata, H5B_NKEY(bt, shared, idx + 1), rt_key_changed,
-                    &new_child_bt_ud/*out*/)) < 0)
+            if ((int)(my_ins = H5B_insert_helper(f, dxpl_id, &child_bt_ud, type, H5B_NKEY(bt, shared, idx),
+                                                 lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
+                                                 rt_key_changed, &new_child_bt_ud /*out*/)) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert minimum subtree")
-        } else if(type->follow_min) {
+        }
+        else if (type->follow_min) {
             /*
              * The value being inserted is less than any leaf node out of this
              * current node.  Follow the minimum branch to a leaf node and let
              * the subclass handle the problem.
              */
-            if((int)(my_ins = (type->insert)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx),
-                    lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
-                    rt_key_changed, &new_child_bt_ud.addr/*out*/)) < 0)
+            if ((int)(my_ins = (type->insert)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx),
+                                              lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
+                                              rt_key_changed, &new_child_bt_ud.addr /*out*/)) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert minimum leaf node")
-        } else {
+        }
+        else {
             /*
              * The value being inserted is less than any leaf node out of the
              * current node. Create a new minimum leaf node out of this B-tree
              * node. This node is not empty (handled above).
              */
             my_ins = H5B_INS_LEFT;
-            HDmemcpy(md_key, H5B_NKEY(bt,shared,idx), type->sizeof_nkey);
-            if((type->new_node)(f, dxpl_id, H5B_INS_LEFT, H5B_NKEY(bt, shared, idx), udata,
-                    md_key, &new_child_bt_ud.addr/*out*/) < 0)
+            HDmemcpy(md_key, H5B_NKEY(bt, shared, idx), type->sizeof_nkey);
+            if ((type->new_node)(f, dxpl_id, H5B_INS_LEFT, H5B_NKEY(bt, shared, idx), udata, md_key,
+                                 &new_child_bt_ud.addr /*out*/) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert minimum leaf node")
             *lt_key_changed = TRUE;
         } /* end else */
@@ -934,47 +916,50 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
 #ifdef H5_STRICT_FORMAT_CHECKS
         /* Since we are to the left of the leftmost key there must not be a left
          * sibling */
-        if(H5F_addr_defined(bt->left))
+        if (H5F_addr_defined(bt->left))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "internal error: likely corrupt key values")
 #endif /* H5_STRICT_FORMAT_CHECKS */
-    } else if(cmp > 0 && idx + 1 >= bt->nchildren) {
+    }
+    else if (cmp > 0 && idx + 1 >= bt->nchildren) {
         if (bt->level > 0) {
             /*
-            * The value being inserted is larger than any value in this tree.
-            * Follow the maximum branch out of this node to a subtree.
-            */
-            idx = bt->nchildren - 1;
+             * The value being inserted is larger than any value in this tree.
+             * Follow the maximum branch out of this node to a subtree.
+             */
+            idx              = bt->nchildren - 1;
             child_bt_ud.addr = bt->child[idx];
-            if(NULL == (child_bt_ud.bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, child_bt_ud.addr, &cache_udata, H5AC_WRITE)))
+            if (NULL == (child_bt_ud.bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, child_bt_ud.addr,
+                                                                &cache_udata, H5AC_WRITE)))
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load node")
 
-            if((int)(my_ins = H5B_insert_helper(f, dxpl_id, &child_bt_ud, type,
-                    H5B_NKEY(bt, shared, idx), lt_key_changed, md_key, udata,
-                    H5B_NKEY(bt, shared, idx + 1), rt_key_changed,
-                    &new_child_bt_ud/*out*/)) < 0)
+            if ((int)(my_ins = H5B_insert_helper(f, dxpl_id, &child_bt_ud, type, H5B_NKEY(bt, shared, idx),
+                                                 lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
+                                                 rt_key_changed, &new_child_bt_ud /*out*/)) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert maximum subtree")
-        } else if(type->follow_max) {
+        }
+        else if (type->follow_max) {
             /*
              * The value being inserted is larger than any leaf node out of the
              * current node.  Follow the maximum branch to a leaf node and let
              * the subclass handle the problem.
              */
             idx = bt->nchildren - 1;
-            if((int)(my_ins = (type->insert)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx),
-                    lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
-                    rt_key_changed, &new_child_bt_ud.addr/*out*/)) < 0)
+            if ((int)(my_ins = (type->insert)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx),
+                                              lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
+                                              rt_key_changed, &new_child_bt_ud.addr /*out*/)) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert maximum leaf node")
-        } else {
+        }
+        else {
             /*
              * The value being inserted is larger than any leaf node out of the
              * current node.  Create a new maximum leaf node out of this B-tree
              * node.
              */
-            idx = bt->nchildren - 1;
+            idx    = bt->nchildren - 1;
             my_ins = H5B_INS_RIGHT;
             HDmemcpy(md_key, H5B_NKEY(bt, shared, idx + 1), type->sizeof_nkey);
-            if((type->new_node)(f, dxpl_id, H5B_INS_RIGHT, md_key, udata,
-                    H5B_NKEY(bt, shared, idx + 1), &new_child_bt_ud.addr/*out*/) < 0)
+            if ((type->new_node)(f, dxpl_id, H5B_INS_RIGHT, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
+                                 &new_child_bt_ud.addr /*out*/) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert maximum leaf node")
             *rt_key_changed = TRUE;
         } /* end else */
@@ -982,49 +967,53 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
 #ifdef H5_STRICT_FORMAT_CHECKS
         /* Since we are to the right of the rightmost key there must not be a
          * right sibling */
-        if(H5F_addr_defined(bt->right))
+        if (H5F_addr_defined(bt->right))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "internal error: likely corrupt key values")
 #endif /* H5_STRICT_FORMAT_CHECKS */
-    } else if(cmp) {
-	/*
-	 * We couldn't figure out which branch to follow out of this node. THIS
-	 * IS A MAJOR PROBLEM THAT NEEDS TO BE FIXED --rpm.
-	 */
-	HDassert("INTERNAL HDF5 ERROR (contact rpm)" && 0);
+    }
+    else if (cmp) {
+        /*
+         * We couldn't figure out which branch to follow out of this node. THIS
+         * IS A MAJOR PROBLEM THAT NEEDS TO BE FIXED --rpm.
+         */
+        HDassert("INTERNAL HDF5 ERROR (contact rpm)" && 0);
 #ifdef NDEBUG
-	HDabort();
+        HDabort();
 #endif /* NDEBUG */
-    } else if(bt->level > 0) {
-	/*
-	 * Follow a branch out of this node to another subtree.
-	 */
-	HDassert(idx < bt->nchildren);
-	child_bt_ud.addr = bt->child[idx];
-        if(NULL == (child_bt_ud.bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, child_bt_ud.addr, &cache_udata, H5AC_WRITE)))
+    }
+    else if (bt->level > 0) {
+        /*
+         * Follow a branch out of this node to another subtree.
+         */
+        HDassert(idx < bt->nchildren);
+        child_bt_ud.addr = bt->child[idx];
+        if (NULL == (child_bt_ud.bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, child_bt_ud.addr,
+                                                            &cache_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load node")
 
-	if((int)(my_ins = H5B_insert_helper(f, dxpl_id, &child_bt_ud, type,
-                H5B_NKEY(bt, shared, idx), lt_key_changed, md_key, udata,
-                H5B_NKEY(bt, shared, idx + 1), rt_key_changed, &new_child_bt_ud/*out*/)) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert subtree")
-    } else {
-	/*
-	 * Follow a branch out of this node to a leaf node of some other type.
-	 */
-	HDassert(idx < bt->nchildren);
-	if((int)(my_ins = (type->insert)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx),
-                  lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
-                  rt_key_changed, &new_child_bt_ud.addr/*out*/)) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert leaf node")
+        if ((int)(my_ins = H5B_insert_helper(f, dxpl_id, &child_bt_ud, type, H5B_NKEY(bt, shared, idx),
+                                             lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
+                                             rt_key_changed, &new_child_bt_ud /*out*/)) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert subtree")
+    }
+    else {
+        /*
+         * Follow a branch out of this node to a leaf node of some other type.
+         */
+        HDassert(idx < bt->nchildren);
+        if ((int)(my_ins = (type->insert)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx),
+                                          lt_key_changed, md_key, udata, H5B_NKEY(bt, shared, idx + 1),
+                                          rt_key_changed, &new_child_bt_ud.addr /*out*/)) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert leaf node")
     }
     HDassert((int)my_ins >= 0);
 
     /*
      * Update the left and right keys of the current node.
      */
-    if(*lt_key_changed) {
+    if (*lt_key_changed) {
         bt_ud->cache_flags |= H5AC__DIRTIED_FLAG;
-        if(idx > 0) {
+        if (idx > 0) {
             HDassert(type->critical_key == H5B_LEFT);
             HDassert(!(H5B_INS_LEFT == my_ins || H5B_INS_RIGHT == my_ins));
             *lt_key_changed = FALSE;
@@ -1032,9 +1021,9 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
         else
             HDmemcpy(lt_key, H5B_NKEY(bt, shared, idx), type->sizeof_nkey);
     } /* end if */
-    if(*rt_key_changed) {
+    if (*rt_key_changed) {
         bt_ud->cache_flags |= H5AC__DIRTIED_FLAG;
-        if(idx + 1 < bt->nchildren) {
+        if (idx + 1 < bt->nchildren) {
             HDassert(type->critical_key == H5B_RIGHT);
             HDassert(!(H5B_INS_LEFT == my_ins || H5B_INS_RIGHT == my_ins));
             *rt_key_changed = FALSE;
@@ -1046,76 +1035,78 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
     /*
      * Handle changes/additions to children
      */
-    if(H5B_INS_CHANGE == my_ins) {
-	/*
-	 * The insertion simply changed the address for the child.
-	 */
-	HDassert(!child_bt_ud.bt);
-	HDassert(bt->level == 0);
-	bt->child[idx] = new_child_bt_ud.addr;
+    if (H5B_INS_CHANGE == my_ins) {
+        /*
+         * The insertion simply changed the address for the child.
+         */
+        HDassert(!child_bt_ud.bt);
+        HDassert(bt->level == 0);
+        bt->child[idx] = new_child_bt_ud.addr;
         bt_ud->cache_flags |= H5AC__DIRTIED_FLAG;
-    } else if(H5B_INS_LEFT == my_ins || H5B_INS_RIGHT == my_ins) {
+    }
+    else if (H5B_INS_LEFT == my_ins || H5B_INS_RIGHT == my_ins) {
         hbool_t *tmp_bt_flags_ptr = NULL;
-        H5B_t	*tmp_bt;
-
-	/*
-	 * If this node is full then split it before inserting the new child.
-	 */
-	if(bt->nchildren == shared->two_k) {
-	    if(H5B_split(f, dxpl_id, bt_ud, idx, udata, split_bt_ud/*out*/) < 0)
-		HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, H5B_INS_ERROR, "unable to split node")
-	    if(idx < bt->nchildren) {
-		tmp_bt = bt;
+        H5B_t *  tmp_bt;
+
+        /*
+         * If this node is full then split it before inserting the new child.
+         */
+        if (bt->nchildren == shared->two_k) {
+            if (H5B_split(f, dxpl_id, bt_ud, idx, udata, split_bt_ud /*out*/) < 0)
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, H5B_INS_ERROR, "unable to split node")
+            if (idx < bt->nchildren) {
+                tmp_bt           = bt;
                 tmp_bt_flags_ptr = &bt_ud->cache_flags;
-	    } else {
-		idx -= bt->nchildren;
-		tmp_bt = split_bt_ud->bt;
+            }
+            else {
+                idx -= bt->nchildren;
+                tmp_bt           = split_bt_ud->bt;
                 tmp_bt_flags_ptr = &split_bt_ud->cache_flags;
-	    }
-	} /* end if */
+            }
+        } /* end if */
         else {
-	    tmp_bt = bt;
+            tmp_bt           = bt;
             tmp_bt_flags_ptr = &bt_ud->cache_flags;
-	} /* end else */
+        } /* end else */
 
-	/* Insert the child */
-	if(H5B_insert_child(tmp_bt, tmp_bt_flags_ptr, idx, new_child_bt_ud.addr, my_ins, md_key) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert child")
+        /* Insert the child */
+        if (H5B_insert_child(tmp_bt, tmp_bt_flags_ptr, idx, new_child_bt_ud.addr, my_ins, md_key) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert child")
     } /* end else-if */
 
     /*
      * If this node split, return the mid key (the one that is shared
      * by the left and right node).
      */
-    if(split_bt_ud->bt) {
-	HDmemcpy(md_key, H5B_NKEY(split_bt_ud->bt, shared, 0), type->sizeof_nkey);
-	ret_value = H5B_INS_RIGHT;
+    if (split_bt_ud->bt) {
+        HDmemcpy(md_key, H5B_NKEY(split_bt_ud->bt, shared, 0), type->sizeof_nkey);
+        ret_value = H5B_INS_RIGHT;
 #ifdef H5B_DEBUG
-	/*
-	 * The max key in the original left node must be equal to the min key
-	 * in the new node.
-	 */
-	cmp = (type->cmp2)(H5B_NKEY(bt, shared, bt->nchildren), udata,
-			    H5B_NKEY(split_bt_ud->bt, shared, 0));
-	HDassert(0 == cmp);
+        /*
+         * The max key in the original left node must be equal to the min key
+         * in the new node.
+         */
+        cmp = (type->cmp2)(H5B_NKEY(bt, shared, bt->nchildren), udata, H5B_NKEY(split_bt_ud->bt, shared, 0));
+        HDassert(0 == cmp);
 #endif
     } /* end if */
     else
-	ret_value = H5B_INS_NOOP;
+        ret_value = H5B_INS_NOOP;
 
 done:
-    if(child_bt_ud.bt)
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, child_bt_ud.addr, child_bt_ud.bt, child_bt_ud.cache_flags) < 0)
+    if (child_bt_ud.bt)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT, child_bt_ud.addr, child_bt_ud.bt, child_bt_ud.cache_flags) <
+            0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to unprotect child")
 
-    if(new_child_bt_ud.bt)
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, new_child_bt_ud.addr, new_child_bt_ud.bt, new_child_bt_ud.cache_flags) < 0)
+    if (new_child_bt_ud.bt)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT, new_child_bt_ud.addr, new_child_bt_ud.bt,
+                           new_child_bt_ud.cache_flags) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to unprotect new child")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_insert_helper() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_iterate_helper
  *
@@ -1131,15 +1122,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
-    H5B_operator_t op, void *udata)
+H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, H5B_operator_t op,
+                   void *udata)
 {
-    H5B_t               *bt = NULL;     /* Pointer to current B-tree node */
-    H5RC_t	        *rc_shared;     /* Ref-counted shared info */
-    H5B_shared_t        *shared;        /* Pointer to shared B-tree info */
-    H5B_cache_ud_t      cache_udata;    /* User-data for metadata cache callback */
-    unsigned            u;              /* Local index variable */
-    herr_t              ret_value = H5_ITER_CONT; /* Return value */
+    H5B_t *        bt = NULL;                /* Pointer to current B-tree node */
+    H5RC_t *       rc_shared;                /* Ref-counted shared info */
+    H5B_shared_t * shared;                   /* Pointer to shared B-tree info */
+    H5B_cache_ud_t cache_udata;              /* User-data for metadata cache callback */
+    unsigned       u;                        /* Local index variable */
+    herr_t         ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1153,36 +1144,36 @@ H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t add
     HDassert(udata);
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, udata)))
+    if (NULL == (rc_shared = (type->get_shared)(f, udata)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
     /* Protect the initial/current node */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
+    if (NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5_ITER_ERROR, "unable to load B-tree node")
 
     /* Iterate over node's children */
-    for(u = 0; u < bt->nchildren && ret_value == H5_ITER_CONT; u++) {
-        if(bt->level > 0)
+    for (u = 0; u < bt->nchildren && ret_value == H5_ITER_CONT; u++) {
+        if (bt->level > 0)
             ret_value = H5B_iterate_helper(f, dxpl_id, type, bt->child[u], op, udata);
         else
-            ret_value = (*op)(f, dxpl_id, H5B_NKEY(bt, shared, u), bt->child[u], H5B_NKEY(bt, shared, u + 1), udata);
-        if(ret_value < 0)
+            ret_value =
+                (*op)(f, dxpl_id, H5B_NKEY(bt, shared, u), bt->child[u], H5B_NKEY(bt, shared, u + 1), udata);
+        if (ret_value < 0)
             HERROR(H5E_BTREE, H5E_BADITER, "B-tree iteration failed");
     } /* end for */
 
 done:
-    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+    if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_iterate_helper() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_iterate
  *
@@ -1198,10 +1189,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B_iterate(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
-    H5B_operator_t op, void *udata)
+H5B_iterate(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, H5B_operator_t op, void *udata)
 {
-    herr_t ret_value = FAIL;            /* Return value */
+    herr_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -1215,13 +1205,12 @@ H5B_iterate(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
     HDassert(udata);
 
     /* Iterate over the B-tree records */
-    if((ret_value = H5B_iterate_helper(f, dxpl_id, type, addr, op, udata)) < 0)
+    if ((ret_value = H5B_iterate_helper(f, dxpl_id, type, addr, op, udata)) < 0)
         HERROR(H5E_BTREE, H5E_BADITER, "B-tree iteration failed");
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_remove_helper
  *
@@ -1247,19 +1236,18 @@ H5B_iterate(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
  *-------------------------------------------------------------------------
  */
 static H5B_ins_t
-H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type,
-		  int level, uint8_t *lt_key/*out*/,
-		  hbool_t *lt_key_changed/*out*/, void *udata,
-		  uint8_t *rt_key/*out*/, hbool_t *rt_key_changed/*out*/)
+H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, int level,
+                  uint8_t *lt_key /*out*/, hbool_t *lt_key_changed /*out*/, void *udata,
+                  uint8_t *rt_key /*out*/, hbool_t *rt_key_changed /*out*/)
 {
-    H5B_t	*bt = NULL, *sibling = NULL;
-    unsigned	bt_flags = H5AC__NO_FLAGS_SET;
-    H5RC_t	*rc_shared;             /* Ref-counted shared info */
-    H5B_shared_t *shared;               /* Pointer to shared B-tree info */
+    H5B_t *        bt = NULL, *sibling = NULL;
+    unsigned       bt_flags = H5AC__NO_FLAGS_SET;
+    H5RC_t *       rc_shared;           /* Ref-counted shared info */
+    H5B_shared_t * shared;              /* Pointer to shared B-tree info */
     H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    unsigned    idx = 0, lt = 0, rt;    /* Final, left & right indices */
-    int         cmp = 1;                /* Key comparison value */
-    H5B_ins_t	ret_value = H5B_INS_ERROR;
+    unsigned       idx = 0, lt = 0, rt; /* Final, left & right indices */
+    int            cmp       = 1;       /* Key comparison value */
+    H5B_ins_t      ret_value = H5B_INS_ERROR;
 
     FUNC_ENTER_NOAPI(H5B_INS_ERROR)
 
@@ -1273,8 +1261,8 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
     HDassert(rt_key && rt_key_changed);
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, udata)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, H5B_INS_ERROR, "can't retrieve B-tree's shared ref. count object")
+    if (NULL == (rc_shared = (type->get_shared)(f, udata)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, H5B_INS_ERROR, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
@@ -1282,54 +1270,56 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
      * Perform a binary search to locate the child which contains the thing
      * for which we're searching.
      */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_WRITE)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load B-tree node")
+    if (NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load B-tree node")
 
     rt = bt->nchildren;
-    while(lt < rt && cmp) {
-	idx = (lt + rt) / 2;
-	if((cmp = (type->cmp3)(H5B_NKEY(bt, shared, idx), udata, H5B_NKEY(bt, shared, idx + 1))) < 0)
-	    rt = idx;
-	else
-	    lt = idx + 1;
+    while (lt < rt && cmp) {
+        idx = (lt + rt) / 2;
+        if ((cmp = (type->cmp3)(H5B_NKEY(bt, shared, idx), udata, H5B_NKEY(bt, shared, idx + 1))) < 0)
+            rt = idx;
+        else
+            lt = idx + 1;
     } /* end while */
-    if(cmp)
-	HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, H5B_INS_ERROR, "B-tree key not found")
+    if (cmp)
+        HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, H5B_INS_ERROR, "B-tree key not found")
 
     /*
      * Follow the link to the subtree or to the data node.  The return value
      * will be one of H5B_INS_ERROR, H5B_INS_NOOP, or H5B_INS_REMOVE.
      */
     HDassert(idx < bt->nchildren);
-    if(bt->level > 0) {
-	/* We're at an internal node -- call recursively */
-	if((int)(ret_value = H5B_remove_helper(f, dxpl_id,
-                 bt->child[idx], type, level + 1, H5B_NKEY(bt, shared, idx)/*out*/,
-                 lt_key_changed/*out*/, udata, H5B_NKEY(bt, shared, idx + 1)/*out*/,
-                 rt_key_changed/*out*/)) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, H5B_INS_ERROR, "key not found in subtree")
-    } else if(type->remove) {
-	/*
-	 * We're at a leaf node but the leaf node points to an object that
-	 * has a removal method.  Pass the removal request to the pointed-to
-	 * object and let it decide how to progress.
-	 */
-	if((int)(ret_value = (type->remove)(f, dxpl_id,
-                  bt->child[idx], H5B_NKEY(bt, shared, idx), lt_key_changed, udata,
-                  H5B_NKEY(bt, shared, idx + 1), rt_key_changed)) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, H5B_INS_ERROR, "key not found in leaf node")
-    } else {
-	/*
-	 * We're at a leaf node which points to an object that has no removal
-	 * method.  The best we can do is to leave the object alone but
-	 * remove the B-tree reference to the object.
-	 */
-	*lt_key_changed = FALSE;
-	*rt_key_changed = FALSE;
-	ret_value = H5B_INS_REMOVE;
+    if (bt->level > 0) {
+        /* We're at an internal node -- call recursively */
+        if ((int)(ret_value =
+                      H5B_remove_helper(f, dxpl_id, bt->child[idx], type, level + 1,
+                                        H5B_NKEY(bt, shared, idx) /*out*/, lt_key_changed /*out*/, udata,
+                                        H5B_NKEY(bt, shared, idx + 1) /*out*/, rt_key_changed /*out*/)) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, H5B_INS_ERROR, "key not found in subtree")
+    }
+    else if (type->remove) {
+        /*
+         * We're at a leaf node but the leaf node points to an object that
+         * has a removal method.  Pass the removal request to the pointed-to
+         * object and let it decide how to progress.
+         */
+        if ((int)(ret_value =
+                      (type->remove)(f, dxpl_id, bt->child[idx], H5B_NKEY(bt, shared, idx), lt_key_changed,
+                                     udata, H5B_NKEY(bt, shared, idx + 1), rt_key_changed)) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, H5B_INS_ERROR, "key not found in leaf node")
+    }
+    else {
+        /*
+         * We're at a leaf node which points to an object that has no removal
+         * method.  The best we can do is to leave the object alone but
+         * remove the B-tree reference to the object.
+         */
+        *lt_key_changed = FALSE;
+        *rt_key_changed = FALSE;
+        ret_value       = H5B_INS_REMOVE;
     }
 
     /*
@@ -1340,20 +1330,20 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
      * key changed and it's the right most key of this node we must update
      * our right key and indicate that it changed.
      */
-    if(*lt_key_changed) {
+    if (*lt_key_changed) {
         HDassert(type->critical_key == H5B_LEFT);
         bt_flags |= H5AC__DIRTIED_FLAG;
 
-        if(idx > 0)
+        if (idx > 0)
             /* Don't propagate change out of this B-tree node */
             *lt_key_changed = FALSE;
         else
             HDmemcpy(lt_key, H5B_NKEY(bt, shared, idx), type->sizeof_nkey);
     } /* end if */
-    if(*rt_key_changed) {
+    if (*rt_key_changed) {
         HDassert(type->critical_key == H5B_RIGHT);
         bt_flags |= H5AC__DIRTIED_FLAG;
-        if(idx + 1 < bt->nchildren)
+        if (idx + 1 < bt->nchildren)
             /* Don't propagate change out of this B-tree node */
             *rt_key_changed = FALSE;
         else
@@ -1364,14 +1354,14 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
      * If the subtree returned H5B_INS_REMOVE then we should remove the
      * subtree entry from the current node.  There are four cases:
      */
-    if(H5B_INS_REMOVE == ret_value) {
+    if (H5B_INS_REMOVE == ret_value) {
         /* Clients should not change keys when a node is removed.  This function
          * will handle it as appropriate, based on the value of bt->critical_key
          */
         HDassert(!(*lt_key_changed));
         HDassert(!(*rt_key_changed));
 
-        if(1 == bt->nchildren) {
+        if (1 == bt->nchildren) {
             /*
              * The subtree is the only child of this node.  Discard both
              * keys and the subtree pointer. Free this node (unless it's the
@@ -1379,116 +1369,124 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
              */
             /* Only delete the node if it is not the root node.  Note that this
              * "level" is the opposite of bt->level */
-            if(level > 0) {
+            if (level > 0) {
                 /* Fix siblings, making sure that the keys remain consistent
                  * between siblings.  Overwrite the key that that is not
                  * "critical" for any child in its node to maintain this
                  * consistency (and avoid breaking key/child consistency) */
-                if(H5F_addr_defined(bt->left)) {
-                    if(NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->left, &cache_udata, H5AC_WRITE)))
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load node from tree")
+                if (H5F_addr_defined(bt->left)) {
+                    if (NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->left, &cache_udata,
+                                                                 H5AC_WRITE)))
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR,
+                                    "unable to load node from tree")
 
                     /* Copy right-most key from deleted node to right-most key
                      * in its left neighbor, but only if it is not the critical
                      * key for the right-most child of the left neighbor */
-                    if(type->critical_key == H5B_LEFT)
-                        HDmemcpy(H5B_NKEY(sibling, shared, sibling->nchildren),
-                                H5B_NKEY(bt, shared, 1), type->sizeof_nkey);
+                    if (type->critical_key == H5B_LEFT)
+                        HDmemcpy(H5B_NKEY(sibling, shared, sibling->nchildren), H5B_NKEY(bt, shared, 1),
+                                 type->sizeof_nkey);
 
                     sibling->right = bt->right;
 
-                    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->left, sibling, H5AC__DIRTIED_FLAG) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node from tree")
-                    sibling = NULL;   /* Make certain future references will be caught */
-                } /* end if */
-                if(H5F_addr_defined(bt->right)) {
-                    if(NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->right, &cache_udata, H5AC_WRITE)))
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to unlink node from tree")
+                    if (H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->left, sibling, H5AC__DIRTIED_FLAG) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR,
+                                    "unable to release node from tree")
+                    sibling = NULL; /* Make certain future references will be caught */
+                }                   /* end if */
+                if (H5F_addr_defined(bt->right)) {
+                    if (NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->right, &cache_udata,
+                                                                 H5AC_WRITE)))
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR,
+                                    "unable to unlink node from tree")
 
                     /* Copy left-most key from deleted node to left-most key in
                      * its right neighbor, but only if it is not the critical
                      * key for the left-most child of the right neighbor */
-                    if(type->critical_key == H5B_RIGHT)
-                        HDmemcpy(H5B_NKEY(sibling, shared, 0),
-                                H5B_NKEY(bt, shared, 0), type->sizeof_nkey);
+                    if (type->critical_key == H5B_RIGHT)
+                        HDmemcpy(H5B_NKEY(sibling, shared, 0), H5B_NKEY(bt, shared, 0), type->sizeof_nkey);
 
                     sibling->left = bt->left;
 
-                    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->right, sibling, H5AC__DIRTIED_FLAG) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node from tree")
-                    sibling = NULL;   /* Make certain future references will be caught */
-                } /* end if */
+                    if (H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->right, sibling, H5AC__DIRTIED_FLAG) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR,
+                                    "unable to release node from tree")
+                    sibling = NULL; /* Make certain future references will be caught */
+                }                   /* end if */
 
                 /* Update bt struct */
-                bt->left = HADDR_UNDEF;
-                bt->right = HADDR_UNDEF;
+                bt->left      = HADDR_UNDEF;
+                bt->right     = HADDR_UNDEF;
                 bt->nchildren = 0;
 
                 /* Delete the node from disk (via the metadata cache) */
                 bt_flags |= H5AC__DIRTIED_FLAG;
                 H5_CHECK_OVERFLOW(shared->sizeof_rnode, size_t, hsize_t);
-                if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, bt_flags | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0) {
-                    bt = NULL;
+                if (H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt,
+                                   bt_flags | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0) {
+                    bt       = NULL;
                     bt_flags = H5AC__NO_FLAGS_SET;
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to free B-tree node")
                 } /* end if */
-                bt = NULL;
+                bt       = NULL;
                 bt_flags = H5AC__NO_FLAGS_SET;
-            } else {
+            }
+            else {
                 /* We removed the last child in the root node, set the level
                  * back to 0 (as well as nchildren) */
                 bt->nchildren = 0;
-                bt->level = 0;
+                bt->level     = 0;
                 bt_flags |= H5AC__DIRTIED_FLAG;
             } /* end else */
-        } else if(0 == idx) {
+        }
+        else if (0 == idx) {
             /*
              * The subtree is the left-most child of this node. We update the
              * key and child arrays and lt_key as appropriate, depending on the
              * status of bt->critical_key.  Return H5B_INS_NOOP.
              */
-            if(type->critical_key == H5B_LEFT) {
+            if (type->critical_key == H5B_LEFT) {
                 /* Slide all keys down 1, update lt_key */
                 HDmemmove(H5B_NKEY(bt, shared, 0), H5B_NKEY(bt, shared, 1),
-                        bt->nchildren * type->sizeof_nkey);
+                          bt->nchildren * type->sizeof_nkey);
                 HDmemcpy(lt_key, H5B_NKEY(bt, shared, 0), type->sizeof_nkey);
                 *lt_key_changed = TRUE;
-            } else
+            }
+            else
                 /* Slide all but the leftmost 2 keys down, leaving the leftmost
                  * key intact (the right key of the leftmost child is
                  * overwritten) */
                 HDmemmove(H5B_NKEY(bt, shared, 1), H5B_NKEY(bt, shared, 2),
-                        (bt->nchildren - 1) * type->sizeof_nkey);
+                          (bt->nchildren - 1) * type->sizeof_nkey);
 
-            HDmemmove(bt->child,
-                    bt->child + 1,
-                    (bt->nchildren - 1) * sizeof(haddr_t));
+            HDmemmove(bt->child, bt->child + 1, (bt->nchildren - 1) * sizeof(haddr_t));
 
             bt->nchildren -= 1;
             bt_flags |= H5AC__DIRTIED_FLAG;
             ret_value = H5B_INS_NOOP;
-        } else if(idx + 1 == bt->nchildren) {
+        }
+        else if (idx + 1 == bt->nchildren) {
             /*
              * The subtree is the right-most child of this node. We update the
              * key and child arrays and rt_key as appropriate, depending on the
              * status of bt->critical_key.  Return H5B_INS_NOOP.
              */
-            if(type->critical_key == H5B_LEFT)
+            if (type->critical_key == H5B_LEFT)
                 /* Slide the rightmost key down one, overwriting the left key of
                  * the deleted (righmost) child */
-                HDmemmove(H5B_NKEY(bt, shared, bt->nchildren - 1),
-                        H5B_NKEY(bt, shared, bt->nchildren), type->sizeof_nkey);
+                HDmemmove(H5B_NKEY(bt, shared, bt->nchildren - 1), H5B_NKEY(bt, shared, bt->nchildren),
+                          type->sizeof_nkey);
             else {
                 /* Just update rt_key */
-                HDmemcpy(rt_key, H5B_NKEY(bt, shared, bt->nchildren - 1),
-                        type->sizeof_nkey);
+                HDmemcpy(rt_key, H5B_NKEY(bt, shared, bt->nchildren - 1), type->sizeof_nkey);
                 *rt_key_changed = TRUE;
             } /* end else */
 
             bt->nchildren -= 1;
             bt_flags |= H5AC__DIRTIED_FLAG;
             ret_value = H5B_INS_NOOP;
-        } else {
+        }
+        else {
             /*
              * There are subtrees out of this node to both the left and right of
              * the subtree being removed.  The subtree and its critical key are
@@ -1496,66 +1494,62 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
              * shifted left by one place.  The subtree has already been freed.
              * Return H5B_INS_NOOP.
              */
-            if(type->critical_key == H5B_LEFT)
-                HDmemmove(H5B_NKEY(bt, shared, idx),
-                        H5B_NKEY(bt, shared, idx + 1),
-                        (bt->nchildren - idx) * type->sizeof_nkey);
+            if (type->critical_key == H5B_LEFT)
+                HDmemmove(H5B_NKEY(bt, shared, idx), H5B_NKEY(bt, shared, idx + 1),
+                          (bt->nchildren - idx) * type->sizeof_nkey);
             else
-                HDmemmove(H5B_NKEY(bt, shared, idx + 1),
-                        H5B_NKEY(bt, shared, idx + 2),
-                        (bt->nchildren - 1 - idx) * type->sizeof_nkey);
+                HDmemmove(H5B_NKEY(bt, shared, idx + 1), H5B_NKEY(bt, shared, idx + 2),
+                          (bt->nchildren - 1 - idx) * type->sizeof_nkey);
 
-            HDmemmove(bt->child + idx,
-                    bt->child + idx + 1,
-                    (bt->nchildren - 1 - idx) * sizeof(haddr_t));
+            HDmemmove(bt->child + idx, bt->child + idx + 1, (bt->nchildren - 1 - idx) * sizeof(haddr_t));
 
             bt->nchildren -= 1;
             bt_flags |= H5AC__DIRTIED_FLAG;
             ret_value = H5B_INS_NOOP;
         } /* end else */
-    } else /* H5B_INS_REMOVE != ret_value */
+    }
+    else /* H5B_INS_REMOVE != ret_value */
         ret_value = H5B_INS_NOOP;
 
     /* Patch keys in neighboring trees if necessary */
-    if(*lt_key_changed && H5F_addr_defined(bt->left)) {
+    if (*lt_key_changed && H5F_addr_defined(bt->left)) {
         HDassert(type->critical_key == H5B_LEFT);
         HDassert(level > 0);
 
         /* Update the rightmost key in the left sibling */
-        if(NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->left, &cache_udata, H5AC_WRITE)))
+        if (NULL ==
+            (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->left, &cache_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to protect node")
 
-        HDmemcpy(H5B_NKEY(sibling, shared, sibling->nchildren),
-                H5B_NKEY(bt, shared, 0), type->sizeof_nkey);
+        HDmemcpy(H5B_NKEY(sibling, shared, sibling->nchildren), H5B_NKEY(bt, shared, 0), type->sizeof_nkey);
 
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->left, sibling, H5AC__DIRTIED_FLAG) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->left, sibling, H5AC__DIRTIED_FLAG) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node from tree")
-        sibling = NULL;   /* Make certain future references will be caught */
-    } /* end if */
-    else if(*rt_key_changed && H5F_addr_defined(bt->right)) {
+        sibling = NULL; /* Make certain future references will be caught */
+    }                   /* end if */
+    else if (*rt_key_changed && H5F_addr_defined(bt->right)) {
         HDassert(type->critical_key == H5B_RIGHT);
         HDassert(level > 0);
 
         /* Update the lefttmost key in the right sibling */
-        if(NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->right, &cache_udata, H5AC_WRITE)))
+        if (NULL ==
+            (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->right, &cache_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to protect node")
 
-        HDmemcpy(H5B_NKEY(sibling, shared, 0),
-                H5B_NKEY(bt, shared, bt->nchildren), type->sizeof_nkey);
+        HDmemcpy(H5B_NKEY(sibling, shared, 0), H5B_NKEY(bt, shared, bt->nchildren), type->sizeof_nkey);
 
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->right, sibling, H5AC__DIRTIED_FLAG) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->right, sibling, H5AC__DIRTIED_FLAG) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node from tree")
-        sibling = NULL;   /* Make certain future references will be caught */
-    } /* end else */
+        sibling = NULL; /* Make certain future references will be caught */
+    }                   /* end else */
 
 done:
-    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, bt_flags) < 0)
-	HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node")
+    if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, bt_flags) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_remove_helper() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_remove
  *
@@ -1576,12 +1570,12 @@ herr_t
 H5B_remove(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata)
 {
     /* These are defined this way to satisfy alignment constraints */
-    uint64_t	_lt_key[128], _rt_key[128];
-    uint8_t	*lt_key = (uint8_t*)_lt_key;	/*left key*/
-    uint8_t	*rt_key = (uint8_t*)_rt_key;	/*right key*/
-    hbool_t	lt_key_changed = FALSE;		/*left key changed?*/
-    hbool_t	rt_key_changed = FALSE;		/*right key changed?*/
-    herr_t      ret_value = SUCCEED;            /* Return value */
+    uint64_t _lt_key[128], _rt_key[128];
+    uint8_t *lt_key         = (uint8_t *)_lt_key; /*left key*/
+    uint8_t *rt_key         = (uint8_t *)_rt_key; /*right key*/
+    hbool_t  lt_key_changed = FALSE;              /*left key changed?*/
+    hbool_t  rt_key_changed = FALSE;              /*right key changed?*/
+    herr_t   ret_value      = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1592,9 +1586,9 @@ H5B_remove(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     HDassert(H5F_addr_defined(addr));
 
     /* The actual removal */
-    if(H5B_remove_helper(f, dxpl_id, addr, type, 0, lt_key, &lt_key_changed,
-			  udata, rt_key, &rt_key_changed) == H5B_INS_ERROR)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to remove entry from B-tree")
+    if (H5B_remove_helper(f, dxpl_id, addr, type, 0, lt_key, &lt_key_changed, udata, rt_key,
+                          &rt_key_changed) == H5B_INS_ERROR)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to remove entry from B-tree")
 
 #ifdef H5B_DEBUG
     H5B_assert(f, dxpl_id, addr, type, udata);
@@ -1603,7 +1597,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_delete
  *
@@ -1620,12 +1613,12 @@ done:
 herr_t
 H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata)
 {
-    H5B_t	*bt = NULL;             /* B-tree node being operated on */
-    H5RC_t	*rc_shared;             /* Ref-counted shared info */
-    H5B_shared_t *shared;               /* Pointer to shared B-tree info */
+    H5B_t *        bt = NULL;           /* B-tree node being operated on */
+    H5RC_t *       rc_shared;           /* Ref-counted shared info */
+    H5B_shared_t * shared;              /* Pointer to shared B-tree info */
     H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    unsigned    u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned       u;                   /* Local index variable */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1635,23 +1628,23 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     HDassert(H5F_addr_defined(addr));
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, udata)))
+    if (NULL == (rc_shared = (type->get_shared)(f, udata)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
     /* Lock this B-tree node into memory for now */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_WRITE)))
+    if (NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
 
     /* Iterate over all children in tree, deleting them */
-    if(bt->level > 0) {
+    if (bt->level > 0) {
         /* Iterate over all children in node, deleting them */
-        for(u = 0; u < bt->nchildren; u++)
-            if(H5B_delete(f, dxpl_id, type, bt->child[u], udata) < 0)
+        for (u = 0; u < bt->nchildren; u++)
+            if (H5B_delete(f, dxpl_id, type, bt->child[u], udata) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "unable to delete B-tree node")
 
     } /* end if */
@@ -1659,26 +1652,25 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
         hbool_t lt_key_changed, rt_key_changed; /* Whether key changed (unused here, just for callback) */
 
         /* Check for removal callback */
-        if(type->remove) {
+        if (type->remove) {
             /* Iterate over all entries in node, calling callback */
-            for(u = 0; u < bt->nchildren; u++) {
+            for (u = 0; u < bt->nchildren; u++) {
                 /* Call user's callback for each entry */
-                if((type->remove)(f, dxpl_id,
-                          bt->child[u], H5B_NKEY(bt, shared, u), &lt_key_changed, udata,
-                          H5B_NKEY(bt, shared, u + 1), &rt_key_changed) < H5B_INS_NOOP)
+                if ((type->remove)(f, dxpl_id, bt->child[u], H5B_NKEY(bt, shared, u), &lt_key_changed, udata,
+                                   H5B_NKEY(bt, shared, u + 1), &rt_key_changed) < H5B_INS_NOOP)
                     HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "can't remove B-tree node")
             } /* end for */
-        } /* end if */
-    } /* end else */
+        }     /* end if */
+    }         /* end else */
 
 done:
-    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
+    if (bt &&
+        H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node in cache")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_shared_new
  *
@@ -1696,9 +1688,9 @@ done:
 H5B_shared_t *
 H5B_shared_new(const H5F_t *f, const H5B_class_t *type, size_t sizeof_rkey)
 {
-    H5B_shared_t *shared = NULL;        /* New shared B-tree struct */
-    size_t	u;                      /* Local index variable */
-    H5B_shared_t *ret_value = NULL;     /* Return value */
+    H5B_shared_t *shared = NULL;    /* New shared B-tree struct */
+    size_t        u;                /* Local index variable */
+    H5B_shared_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1708,44 +1700,44 @@ H5B_shared_new(const H5F_t *f, const H5B_class_t *type, size_t sizeof_rkey)
     HDassert(type);
 
     /* Allocate space for the shared structure */
-    if(NULL == (shared = H5FL_CALLOC(H5B_shared_t)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for shared B-tree info")
+    if (NULL == (shared = H5FL_CALLOC(H5B_shared_t)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for shared B-tree info")
 
     /* Set up the "global" information for this file's groups */
-    shared->type = type;
-    shared->two_k = 2 * H5F_KVALUE(f, type);
+    shared->type        = type;
+    shared->two_k       = 2 * H5F_KVALUE(f, type);
     shared->sizeof_addr = H5F_SIZEOF_ADDR(f);
-    shared->sizeof_len = H5F_SIZEOF_SIZE(f);
+    shared->sizeof_len  = H5F_SIZEOF_SIZE(f);
     shared->sizeof_rkey = sizeof_rkey;
     HDassert(shared->sizeof_rkey);
-    shared->sizeof_keys = (shared->two_k + 1) * type->sizeof_nkey;
-    shared->sizeof_rnode = ((size_t)H5B_SIZEOF_HDR(f) + /*node header	*/
-	    shared->two_k * H5F_SIZEOF_ADDR(f) +	/*child pointers */
-	    (shared->two_k + 1) * shared->sizeof_rkey);	/*keys		*/
+    shared->sizeof_keys  = (shared->two_k + 1) * type->sizeof_nkey;
+    shared->sizeof_rnode = ((size_t)H5B_SIZEOF_HDR(f) +                 /*node header	*/
+                            shared->two_k * H5F_SIZEOF_ADDR(f) +        /*child pointers */
+                            (shared->two_k + 1) * shared->sizeof_rkey); /*keys		*/
     HDassert(shared->sizeof_rnode);
 
     /* Allocate shared buffers */
-    if(NULL == (shared->page = H5FL_BLK_MALLOC(page, shared->sizeof_rnode)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree page")
+    if (NULL == (shared->page = H5FL_BLK_MALLOC(page, shared->sizeof_rnode)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree page")
 #ifdef H5_CLEAR_MEMORY
-HDmemset(shared->page, 0, shared->sizeof_rnode);
+    HDmemset(shared->page, 0, shared->sizeof_rnode);
 #endif /* H5_CLEAR_MEMORY */
-    if(NULL == (shared->nkey = H5FL_SEQ_MALLOC(size_t, (size_t)(2 * H5F_KVALUE(f, type) + 1))))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree native keys")
+    if (NULL == (shared->nkey = H5FL_SEQ_MALLOC(size_t, (size_t)(2 * H5F_KVALUE(f, type) + 1))))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree native keys")
 
     /* Initialize the offsets into the native key buffer */
-    for(u = 0; u < (2 * H5F_KVALUE(f, type) + 1); u++)
+    for (u = 0; u < (2 * H5F_KVALUE(f, type) + 1); u++)
         shared->nkey[u] = u * type->sizeof_nkey;
 
     /* Set return value */
     ret_value = shared;
 
 done:
-    if(NULL == ret_value)
-        if(shared) {
-            if(shared->page)
+    if (NULL == ret_value)
+        if (shared) {
+            if (shared->page)
                 shared->page = H5FL_BLK_FREE(page, shared->page);
-            if(shared->nkey)
+            if (shared->nkey)
                 shared->nkey = H5FL_SEQ_FREE(size_t, shared->nkey);
             shared = H5FL_FREE(H5B_shared_t, shared);
         } /* end if */
@@ -1753,7 +1745,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_shared_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_shared_free
  *
@@ -1785,7 +1776,6 @@ H5B_shared_free(void *_shared)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5B_shared_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_copy
  *
@@ -1804,9 +1794,9 @@ H5B_shared_free(void *_shared)
 static H5B_t *
 H5B_copy(const H5B_t *old_bt)
 {
-    H5B_t		*new_node = NULL;
-    H5B_shared_t        *shared;        /* Pointer to shared B-tree info */
-    H5B_t		*ret_value = NULL;      /* Return value */
+    H5B_t *       new_node = NULL;
+    H5B_shared_t *shared;           /* Pointer to shared B-tree info */
+    H5B_t *       ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1818,7 +1808,7 @@ H5B_copy(const H5B_t *old_bt)
     HDassert(shared);
 
     /* Allocate memory for the new H5B_t object */
-    if(NULL == (new_node = H5FL_MALLOC(H5B_t)))
+    if (NULL == (new_node = H5FL_MALLOC(H5B_t)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree root node")
 
     /* Copy the main structure */
@@ -1827,8 +1817,8 @@ H5B_copy(const H5B_t *old_bt)
     /* Reset cache info */
     HDmemset(&new_node->cache_info, 0, sizeof(H5AC_info_t));
 
-    if(NULL == (new_node->native = H5FL_BLK_MALLOC(native_block, shared->sizeof_keys)) ||
-            NULL == (new_node->child = H5FL_SEQ_MALLOC(haddr_t, (size_t)shared->two_k)))
+    if (NULL == (new_node->native = H5FL_BLK_MALLOC(native_block, shared->sizeof_keys)) ||
+        NULL == (new_node->child = H5FL_SEQ_MALLOC(haddr_t, (size_t)shared->two_k)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree root node")
 
     /* Copy the other structures */
@@ -1842,18 +1832,17 @@ H5B_copy(const H5B_t *old_bt)
     ret_value = new_node;
 
 done:
-    if(NULL == ret_value) {
-        if(new_node) {
-	    new_node->native = H5FL_BLK_FREE(native_block, new_node->native);
-	    new_node->child = H5FL_SEQ_FREE(haddr_t, new_node->child);
-	    new_node = H5FL_FREE(H5B_t, new_node);
+    if (NULL == ret_value) {
+        if (new_node) {
+            new_node->native = H5FL_BLK_FREE(native_block, new_node->native);
+            new_node->child  = H5FL_SEQ_FREE(haddr_t, new_node->child);
+            new_node         = H5FL_FREE(H5B_t, new_node);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_get_info_helper
  *
@@ -1869,17 +1858,17 @@ done:
  */
 static herr_t
 H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
-    const H5B_info_ud_t *info_udata)
+                    const H5B_info_ud_t *info_udata)
 {
-    H5B_t *bt = NULL;           /* Pointer to current B-tree node */
-    H5RC_t *rc_shared;          /* Ref-counted shared info */
-    H5B_shared_t *shared;       /* Pointer to shared B-tree info */
-    H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */
-    unsigned level;		/* Node level			     */
-    size_t sizeof_rnode;	/* Size of raw (disk) node	     */
-    haddr_t next_addr;          /* Address of next node to the right */
-    haddr_t left_child;         /* Address of left-most child in node */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5B_t *        bt = NULL;           /* Pointer to current B-tree node */
+    H5RC_t *       rc_shared;           /* Ref-counted shared info */
+    H5B_shared_t * shared;              /* Pointer to shared B-tree info */
+    H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
+    unsigned       level;               /* Node level			     */
+    size_t         sizeof_rnode;        /* Size of raw (disk) node	     */
+    haddr_t        next_addr;           /* Address of next node to the right */
+    haddr_t        left_child;          /* Address of left-most child in node */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1894,8 +1883,8 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
     HDassert(info_udata->udata);
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, info_udata->udata)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
+    if (NULL == (rc_shared = (type->get_shared)(f, info_udata->udata)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
@@ -1903,23 +1892,23 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
     sizeof_rnode = shared->sizeof_rnode;
 
     /* Protect the initial/current node */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
+    if (NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
 
     /* Cache information from this node */
     left_child = bt->child[0];
-    next_addr = bt->right;
-    level = bt->level;
+    next_addr  = bt->right;
+    level      = bt->level;
 
     /* Update B-tree info */
     info_udata->bt_info->size += sizeof_rnode;
     info_udata->bt_info->num_nodes++;
 
     /* Release current node */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+    if (H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     bt = NULL;
 
@@ -1927,10 +1916,10 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
      * Follow the right-sibling pointer from node to node until we've
      *      processed all nodes.
      */
-    while(H5F_addr_defined(next_addr)) {
+    while (H5F_addr_defined(next_addr)) {
         /* Protect the next node to the right */
         addr = next_addr;
-        if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
+        if (NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "B-tree node")
 
         /* Cache information from this node */
@@ -1941,26 +1930,25 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
         info_udata->bt_info->num_nodes++;
 
         /* Unprotect node */
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
         bt = NULL;
     } /* end while */
 
     /* Check for another "row" of B-tree nodes to iterate over */
-    if(level > 0) {
-	/* Keep following the left-most child until we reach a leaf node. */
-	if(H5B_get_info_helper(f, dxpl_id, type, left_child, info_udata) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "unable to list B-tree node")
+    if (level > 0) {
+        /* Keep following the left-most child until we reach a leaf node. */
+        if (H5B_get_info_helper(f, dxpl_id, type, left_child, info_udata) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "unable to list B-tree node")
     } /* end if */
 
 done:
-    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+    if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_get_info_helper() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B_get_info
  *
@@ -1974,11 +1962,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B_get_info(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
-    H5B_info_t *bt_info, H5B_operator_t op, void *udata)
+H5B_get_info(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, H5B_info_t *bt_info,
+             H5B_operator_t op, void *udata)
 {
-    H5B_info_ud_t       info_udata;     /* User-data for B-tree size iteration */
-    herr_t		ret_value = SUCCEED;      /* Return value */
+    H5B_info_ud_t info_udata;          /* User-data for B-tree size iteration */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1996,23 +1984,22 @@ H5B_get_info(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
 
     /* Set up internal user-data for the B-tree 'get info' helper routine */
     info_udata.bt_info = bt_info;
-    info_udata.udata = udata;
+    info_udata.udata   = udata;
 
     /* Iterate over the B-tree nodes */
-    if(H5B_get_info_helper(f, dxpl_id, type, addr, &info_udata) < 0)
+    if (H5B_get_info_helper(f, dxpl_id, type, addr, &info_udata) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_BADITER, FAIL, "B-tree iteration failed")
 
     /* Iterate over the B-tree records, making any "leaf" callbacks */
     /* (Only if operator defined) */
-    if(op)
-        if((ret_value = H5B_iterate_helper(f, dxpl_id, type, addr, op, udata)) < 0)
+    if (op)
+        if ((ret_value = H5B_iterate_helper(f, dxpl_id, type, addr, op, udata)) < 0)
             HERROR(H5E_BTREE, H5E_BADITER, "B-tree iteration failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_get_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B_valid
  *
@@ -2028,11 +2015,11 @@ done:
 htri_t
 H5B_valid(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr)
 {
-    H5B_t               *bt = NULL;             /* The B-tree */
-    H5RC_t	        *rc_shared;             /* Ref-counted shared info */
-    H5B_shared_t        *shared;                /* Pointer to shared B-tree info */
-    H5B_cache_ud_t      cache_udata;            /* User-data for metadata cache callback */
-    htri_t		ret_value = SUCCEED;    /* Return value */
+    H5B_t *        bt = NULL;           /* The B-tree */
+    H5RC_t *       rc_shared;           /* Ref-counted shared info */
+    H5B_shared_t * shared;              /* Pointer to shared B-tree info */
+    H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
+    htri_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2042,33 +2029,32 @@ H5B_valid(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr)
     HDassert(f);
     HDassert(type);
 
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, FAIL, "address is undefined")
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, NULL)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
+    if (NULL == (rc_shared = (type->get_shared)(f, NULL)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
     /*
      * Load the tree node.
      */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree node")
+    if (NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree node")
 
 done:
     /* Release the node */
-    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+    if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_valid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B_node_dest
  *
@@ -2092,11 +2078,10 @@ H5B_node_dest(H5B_t *bt)
     HDassert(bt);
     HDassert(bt->rc_shared);
 
-    bt->child = H5FL_SEQ_FREE(haddr_t, bt->child);
+    bt->child  = H5FL_SEQ_FREE(haddr_t, bt->child);
     bt->native = H5FL_BLK_FREE(native_block, bt->native);
     H5RC_DEC(bt->rc_shared);
     bt = H5FL_FREE(H5B_t, bt);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5B_node_dest() */
-
diff --git a/src/H5B2.c b/src/H5B2.c
index 7b5e46d..32cc218 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -31,36 +31,31 @@
 /* Module Setup */
 /****************/
 
-#define H5B2_PACKAGE		/*suppress error about including H5B2pkg  */
+#define H5B2_PACKAGE /*suppress error about including H5B2pkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5B2pkg.h"		/* v2 B-trees				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5B2pkg.h"    /* v2 B-trees				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -82,24 +77,22 @@ extern const H5B2_class_t H5A_BT2_NAME[1];
 extern const H5B2_class_t H5A_BT2_CORDER[1];
 
 const H5B2_class_t *const H5B2_client_class_g[] = {
-    H5B2_TEST,			/* 0 - H5B2_TEST_ID 			*/
-    H5HF_HUGE_BT2_INDIR,	/* 1 - H5B2_FHEAP_HUGE_INDIR_ID 	*/
-    H5HF_HUGE_BT2_FILT_INDIR,	/* 2 - H5B2_FHEAP_HUGE_FILT_INDIR_ID 	*/
-    H5HF_HUGE_BT2_DIR,		/* 3 - H5B2_FHEAP_HUGE_DIR_ID 		*/
-    H5HF_HUGE_BT2_FILT_DIR,	/* 4 - H5B2_FHEAP_HUGE_FILT_DIR_ID 	*/
-    H5G_BT2_NAME,		/* 5 - H5B2_GRP_DENSE_NAME_ID 		*/
-    H5G_BT2_CORDER,		/* 6 - H5B2_GRP_DENSE_CORDER_ID 	*/
-    H5SM_INDEX,			/* 7 - H5B2_SOHM_INDEX_ID 		*/
-    H5A_BT2_NAME,		/* 8 - H5B2_ATTR_DENSE_NAME_ID 		*/
-    H5A_BT2_CORDER,		/* 9 - H5B2_ATTR_DENSE_CORDER_ID 	*/
+    H5B2_TEST,                /* 0 - H5B2_TEST_ID 			*/
+    H5HF_HUGE_BT2_INDIR,      /* 1 - H5B2_FHEAP_HUGE_INDIR_ID 	*/
+    H5HF_HUGE_BT2_FILT_INDIR, /* 2 - H5B2_FHEAP_HUGE_FILT_INDIR_ID 	*/
+    H5HF_HUGE_BT2_DIR,        /* 3 - H5B2_FHEAP_HUGE_DIR_ID 		*/
+    H5HF_HUGE_BT2_FILT_DIR,   /* 4 - H5B2_FHEAP_HUGE_FILT_DIR_ID 	*/
+    H5G_BT2_NAME,             /* 5 - H5B2_GRP_DENSE_NAME_ID 		*/
+    H5G_BT2_CORDER,           /* 6 - H5B2_GRP_DENSE_CORDER_ID 	*/
+    H5SM_INDEX,               /* 7 - H5B2_SOHM_INDEX_ID 		*/
+    H5A_BT2_NAME,             /* 8 - H5B2_ATTR_DENSE_NAME_ID 		*/
+    H5A_BT2_CORDER,           /* 9 - H5B2_ATTR_DENSE_CORDER_ID 	*/
 };
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -107,8 +100,6 @@ const H5B2_class_t *const H5B2_client_class_g[] = {
 /* Declare a free list to manage the H5B2_t struct */
 H5FL_DEFINE_STATIC(H5B2_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_create
  *
@@ -126,11 +117,11 @@ H5FL_DEFINE_STATIC(H5B2_t);
 H5B2_t *
 H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udata)
 {
-    H5B2_t      *bt2 = NULL;            /* Pointer to the B-tree */
-    H5B2_hdr_t  *hdr = NULL;            /* Pointer to the B-tree header */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
-    haddr_t     hdr_addr;               /* B-tree header address */
-    H5B2_t      *ret_value = NULL;      /* Return value */
+    H5B2_t *            bt2 = NULL;       /* Pointer to the B-tree */
+    H5B2_hdr_t *        hdr = NULL;       /* Pointer to the B-tree header */
+    H5B2_hdr_cache_ud_t cache_udata;      /* User-data for callback */
+    haddr_t             hdr_addr;         /* B-tree header address */
+    H5B2_t *            ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -144,27 +135,30 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udat
     HDcompile_assert(H5B2_NUM_BTREE_ID == NELMTS(H5B2_client_class_g));
 
     /* Create shared v2 B-tree header */
-    if(HADDR_UNDEF == (hdr_addr = H5B2_hdr_create(f, dxpl_id, cparam, ctx_udata)))
+    if (HADDR_UNDEF == (hdr_addr = H5B2_hdr_create(f, dxpl_id, cparam, ctx_udata)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, NULL, "can't create v2 B-tree header")
 
     /* Create v2 B-tree wrapper */
-    if(NULL == (bt2 = H5FL_MALLOC(H5B2_t)))
+    if (NULL == (bt2 = H5FL_MALLOC(H5B2_t)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for v2 B-tree info")
 
     /* Look up the B-tree header */
-    cache_udata.f = f;
+    cache_udata.f         = f;
     cache_udata.ctx_udata = ctx_udata;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC_WRITE)))
+    if (NULL ==
+        (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to load B-tree header")
 
     /* Point v2 B-tree wrapper at header and bump it's ref count */
     bt2->hdr = hdr;
-    if(H5B2_hdr_incr(bt2->hdr) < 0)
-        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL, "can't increment reference count on shared v2 B-tree header")
+    if (H5B2_hdr_incr(bt2->hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL,
+                    "can't increment reference count on shared v2 B-tree header")
 
     /* Increment # of files using this v2 B-tree header */
-    if(H5B2_hdr_fuse_incr(bt2->hdr) < 0)
-        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL, "can't increment file reference count on shared v2 B-tree header")
+    if (H5B2_hdr_fuse_incr(bt2->hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL,
+                    "can't increment file reference count on shared v2 B-tree header")
 
     /* Set file pointer for this v2 B-tree open context */
     bt2->f = f;
@@ -173,16 +167,15 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udat
     ret_value = bt2;
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, NULL, "unable to release v2 B-tree header")
-    if(!ret_value && bt2)
-        if(H5B2_close(bt2, dxpl_id) < 0)
+    if (!ret_value && bt2)
+        if (H5B2_close(bt2, dxpl_id) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTCLOSEOBJ, NULL, "unable to close v2 B-tree")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_open
  *
@@ -200,10 +193,10 @@ done:
 H5B2_t *
 H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata)
 {
-    H5B2_t	*bt2 = NULL;            /* Pointer to the B-tree */
-    H5B2_hdr_t	*hdr = NULL;            /* Pointer to the B-tree header */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
-    H5B2_t	*ret_value;             /* Return value */
+    H5B2_t *            bt2 = NULL;  /* Pointer to the B-tree */
+    H5B2_hdr_t *        hdr = NULL;  /* Pointer to the B-tree header */
+    H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
+    H5B2_t *            ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -212,27 +205,29 @@ H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata)
     HDassert(H5F_addr_defined(addr));
 
     /* Look up the B-tree header */
-    cache_udata.f = f;
+    cache_udata.f         = f;
     cache_udata.ctx_udata = ctx_udata;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to load B-tree header")
+    if (NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to load B-tree header")
 
     /* Check for pending heap deletion */
-    if(hdr->pending_delete)
+    if (hdr->pending_delete)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTOPENOBJ, NULL, "can't open v2 B-tree pending deletion")
 
     /* Create v2 B-tree info */
-    if(NULL == (bt2 = H5FL_MALLOC(H5B2_t)))
+    if (NULL == (bt2 = H5FL_MALLOC(H5B2_t)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for v2 B-tree info")
 
     /* Point v2 B-tree wrapper at header */
     bt2->hdr = hdr;
-    if(H5B2_hdr_incr(bt2->hdr) < 0)
-        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL, "can't increment reference count on shared v2 B-tree header")
+    if (H5B2_hdr_incr(bt2->hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL,
+                    "can't increment reference count on shared v2 B-tree header")
 
     /* Increment # of files using this v2 B-tree header */
-    if(H5B2_hdr_fuse_incr(bt2->hdr) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL, "can't increment file reference count on shared v2 B-tree header")
+    if (H5B2_hdr_fuse_incr(bt2->hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL,
+                    "can't increment file reference count on shared v2 B-tree header")
 
     /* Set file pointer for this v2 B-tree open context */
     bt2->f = f;
@@ -241,16 +236,15 @@ H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata)
     ret_value = bt2;
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, NULL, "unable to release v2 B-tree header")
-    if(!ret_value && bt2)
-        if(H5B2_close(bt2, dxpl_id) < 0)
+    if (!ret_value && bt2)
+        if (H5B2_close(bt2, dxpl_id) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTCLOSEOBJ, NULL, "unable to close v2 B-tree")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_insert
  *
@@ -267,8 +261,8 @@ done:
 herr_t
 H5B2_insert(H5B2_t *bt2, hid_t dxpl_id, void *udata)
 {
-    H5B2_hdr_t	*hdr;                   /* Pointer to the B-tree header */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *hdr;                 /* Pointer to the B-tree header */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -283,37 +277,36 @@ H5B2_insert(H5B2_t *bt2, hid_t dxpl_id, void *udata)
     hdr = bt2->hdr;
 
     /* Check if the root node is allocated yet */
-    if(!H5F_addr_defined(hdr->root.addr)) {
+    if (!H5F_addr_defined(hdr->root.addr)) {
         /* Create root node as leaf node in B-tree */
-        if(H5B2_create_leaf(hdr, dxpl_id, &(hdr->root)) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create root node")
+        if (H5B2_create_leaf(hdr, dxpl_id, &(hdr->root)) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create root node")
     } /* end if */
     /* Check if we need to split the root node (equiv. to a 1->2 node split) */
-    else if(hdr->root.node_nrec == hdr->node_info[hdr->depth].split_nrec) {
+    else if (hdr->root.node_nrec == hdr->node_info[hdr->depth].split_nrec) {
         /* Split root node */
-        if(H5B2_split_root(hdr, dxpl_id) < 0)
+        if (H5B2_split_root(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split root node")
     } /* end if */
 
     /* Attempt to insert record into B-tree */
-    if(hdr->depth > 0) {
-        if(H5B2_insert_internal(hdr, dxpl_id, hdr->depth, NULL, &hdr->root, H5B2_POS_ROOT, udata) < 0)
+    if (hdr->depth > 0) {
+        if (H5B2_insert_internal(hdr, dxpl_id, hdr->depth, NULL, &hdr->root, H5B2_POS_ROOT, udata) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree internal node")
     } /* end if */
     else {
-        if(H5B2_insert_leaf(hdr, dxpl_id, &hdr->root, H5B2_POS_ROOT, udata) < 0)
+        if (H5B2_insert_leaf(hdr, dxpl_id, &hdr->root, H5B2_POS_ROOT, udata) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree leaf node")
     } /* end else */
 
     /* Mark B-tree header as dirty */
-    if(H5B2_hdr_dirty(hdr) < 0)
+    if (H5B2_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTMARKDIRTY, FAIL, "unable to mark B-tree header dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_get_addr
  *
@@ -344,7 +337,6 @@ H5B2_get_addr(const H5B2_t *bt2, haddr_t *addr_p)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5B2_get_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_iterate
  *
@@ -365,8 +357,8 @@ H5B2_get_addr(const H5B2_t *bt2, haddr_t *addr_p)
 herr_t
 H5B2_iterate(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, void *op_data)
 {
-    H5B2_hdr_t	*hdr;                   /* Pointer to the B-tree header */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *hdr;                 /* Pointer to the B-tree header */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -381,16 +373,15 @@ H5B2_iterate(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, void *op_data)
     hdr = bt2->hdr;
 
     /* Iterate through records */
-    if(hdr->root.node_nrec > 0) {
+    if (hdr->root.node_nrec > 0) {
         /* Iterate through nodes */
-        if((ret_value = H5B2_iterate_node(hdr, dxpl_id, hdr->depth, &hdr->root, op, op_data)) < 0)
+        if ((ret_value = H5B2_iterate_node(hdr, dxpl_id, hdr->depth, &hdr->root, op, op_data)) < 0)
             HERROR(H5E_BTREE, H5E_CANTLIST, "node iteration failed");
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_find
  *
@@ -415,16 +406,15 @@ H5B2_iterate(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, void *op_data)
  *-------------------------------------------------------------------------
  */
 htri_t
-H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op,
-    void *op_data)
+H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op, void *op_data)
 {
-    H5B2_hdr_t  *hdr;                   /* Pointer to the B-tree header */
-    H5B2_node_ptr_t curr_node_ptr;      /* Node pointer info for current node */
-    unsigned    depth;                  /* Current depth of the tree */
-    int         cmp;                    /* Comparison value of records */
-    unsigned    idx;                    /* Location of record which matches key */
-    H5B2_nodepos_t curr_pos;            /* Position of the current node */
-    htri_t      ret_value = TRUE;       /* Return value */
+    H5B2_hdr_t *    hdr;              /* Pointer to the B-tree header */
+    H5B2_node_ptr_t curr_node_ptr;    /* Node pointer info for current node */
+    unsigned        depth;            /* Current depth of the tree */
+    int             cmp;              /* Comparison value of records */
+    unsigned        idx;              /* Location of record which matches key */
+    H5B2_nodepos_t  curr_pos;         /* Position of the current node */
+    htri_t          ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -441,73 +431,76 @@ H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op,
     curr_node_ptr = hdr->root;
 
     /* Check for empty tree */
-    if(curr_node_ptr.node_nrec == 0)
+    if (curr_node_ptr.node_nrec == 0)
         HGOTO_DONE(FALSE)
 
     /* Check record against min & max records in tree, to attempt to quickly
      *  find candidates or avoid further searching.
      */
-    if(hdr->min_native_rec != NULL) {
-        if((hdr->cls->compare)(udata, hdr->min_native_rec, &cmp) < 0)
+    if (hdr->min_native_rec != NULL) {
+        if ((hdr->cls->compare)(udata, hdr->min_native_rec, &cmp) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-        if(cmp < 0)
-            HGOTO_DONE(FALSE) 	/* Less than the least record--not found */ 
-	else if(cmp == 0) { /* Record is found */
-	    if(op && (op)(hdr->min_native_rec, op_data) < 0)
-                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
-	    HGOTO_DONE(TRUE)
-	} /* end if */
-    } /* end if */
-    if(hdr->max_native_rec != NULL) {
-	if((hdr->cls->compare)(udata, hdr->max_native_rec, &cmp) < 0)
+        if (cmp < 0)
+            HGOTO_DONE(FALSE) /* Less than the least record--not found */
+        else if (cmp == 0) {  /* Record is found */
+            if (op && (op)(hdr->min_native_rec, op_data) < 0)
+                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL,
+                            "'found' callback failed for B-tree find operation")
+            HGOTO_DONE(TRUE)
+        } /* end if */
+    }     /* end if */
+    if (hdr->max_native_rec != NULL) {
+        if ((hdr->cls->compare)(udata, hdr->max_native_rec, &cmp) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-        if(cmp > 0)
-            HGOTO_DONE(FALSE) 	/* Less than the least record--not found */ 
-	else if(cmp == 0) { /* Record is found */
-	    if(op && (op)(hdr->max_native_rec, op_data) < 0)
-                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
-	    HGOTO_DONE(TRUE)
-	} /* end if */
-    } /* end if */
+        if (cmp > 0)
+            HGOTO_DONE(FALSE) /* Less than the least record--not found */
+        else if (cmp == 0) {  /* Record is found */
+            if (op && (op)(hdr->max_native_rec, op_data) < 0)
+                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL,
+                            "'found' callback failed for B-tree find operation")
+            HGOTO_DONE(TRUE)
+        } /* end if */
+    }     /* end if */
 
     /* Current depth of the tree */
     depth = hdr->depth;
 
     /* Walk down B-tree to find record or leaf node where record is located */
-    cmp = -1;
+    cmp      = -1;
     curr_pos = H5B2_POS_ROOT;
-    while(depth > 0) {
-        H5B2_internal_t *internal;          /* Pointer to internal node in B-tree */
-        H5B2_node_ptr_t next_node_ptr;      /* Node pointer info for next node */
+    while (depth > 0) {
+        H5B2_internal_t *internal;      /* Pointer to internal node in B-tree */
+        H5B2_node_ptr_t  next_node_ptr; /* Node pointer info for next node */
 
         /* Lock B-tree current node */
-        if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC_READ)))
+        if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr.addr,
+                                                      curr_node_ptr.node_nrec, depth, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate node pointer for child */
-        if(H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, 
-                               udata, &idx, &cmp) < 0) {
+        if (H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx,
+                               &cmp) < 0) {
             /* Unlock current node before failing */
             H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET);
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
         }
 
-        if(cmp > 0)
+        if (cmp > 0)
             idx++;
-        if(cmp != 0) {
+        if (cmp != 0) {
             /* Get node pointer for next node to search */
-            next_node_ptr=internal->node_ptrs[idx];
+            next_node_ptr = internal->node_ptrs[idx];
 
             /* Set the position of the next node */
-            if(H5B2_POS_MIDDLE != curr_pos) {
-                if(idx == 0) {
-                    if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
+            if (H5B2_POS_MIDDLE != curr_pos) {
+                if (idx == 0) {
+                    if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
                         curr_pos = H5B2_POS_LEFT;
                     else
                         curr_pos = H5B2_POS_MIDDLE;
                 } /* end if */
-                else if(idx == internal->nrec) {
-                    if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
+                else if (idx == internal->nrec) {
+                    if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
                         curr_pos = H5B2_POS_RIGHT;
                     else
                         curr_pos = H5B2_POS_MIDDLE;
@@ -517,7 +510,8 @@ H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op,
             } /* end if */
 
             /* Unlock current node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                               H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Set pointer to next node to load */
@@ -525,16 +519,19 @@ H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op,
         } /* end if */
         else {
             /* Make callback for current record */
-            if(op && (op)(H5B2_INT_NREC(internal, hdr, idx), op_data) < 0) {
+            if (op && (op)(H5B2_INT_NREC(internal, hdr, idx), op_data) < 0) {
                 /* Unlock current node */
-                if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                                   H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
-                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
+                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL,
+                            "'found' callback failed for B-tree find operation")
             } /* end if */
 
             /* Unlock current node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                               H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Indicate record found */
@@ -546,23 +543,25 @@ H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op,
     } /* end while */
 
     {
-        H5B2_leaf_t *leaf;          /* Pointer to leaf node in B-tree */
+        H5B2_leaf_t *leaf; /* Pointer to leaf node in B-tree */
 
         /* Lock B-tree leaf node */
-        if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, H5AC_READ)))
+        if (NULL ==
+            (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* Locate record */
-        if(H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, 
-                               udata, &idx, &cmp) < 0) {
+        if (H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) <
+            0) {
             /* unlock current node before failing */
             H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET);
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
         }
 
-        if(cmp != 0) {
+        if (cmp != 0) {
             /* Unlock leaf node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) <
+                0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Record not found */
@@ -570,38 +569,42 @@ H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op,
         } /* end if */
         else {
             /* Make callback for current record */
-            if(op && (op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data) < 0) {
+            if (op && (op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data) < 0) {
                 /* Unlock current node */
-                if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf,
+                                   H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
-                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
+                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL,
+                            "'found' callback failed for B-tree find operation")
             } /* end if */
 
             /* Check for record being the min or max for the tree */
             /* (Don't use 'else' for the idx check, to allow for root leaf node) */
-            if(H5B2_POS_MIDDLE != curr_pos) {
-                if(idx == 0) {
-                    if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                        if(hdr->min_native_rec == NULL)
-                            if(NULL == (hdr->min_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
-                                HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for v2 B-tree min record info")
+            if (H5B2_POS_MIDDLE != curr_pos) {
+                if (idx == 0) {
+                    if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                        if (hdr->min_native_rec == NULL)
+                            if (NULL == (hdr->min_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
+                                HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL,
+                                            "memory allocation failed for v2 B-tree min record info")
                         HDmemcpy(hdr->min_native_rec, H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size);
                     } /* end if */
-                } /* end if */
-                if(idx == (unsigned)(leaf->nrec - 1)) {
-                    if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                        if(hdr->max_native_rec == NULL)
-                            if(NULL == (hdr->max_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
-                                HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for v2 B-tree max record info")
+                }     /* end if */
+                if (idx == (unsigned)(leaf->nrec - 1)) {
+                    if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                        if (hdr->max_native_rec == NULL)
+                            if (NULL == (hdr->max_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
+                                HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL,
+                                            "memory allocation failed for v2 B-tree max record info")
                         HDmemcpy(hdr->max_native_rec, H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size);
                     } /* end if */
-                } /* end if */
-            } /* end if */
-        } /* end else */
+                }     /* end if */
+            }         /* end if */
+        }             /* end else */
 
         /* Unlock current node */
-        if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     } /* end block */
 
@@ -609,7 +612,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_find() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_index
  *
@@ -629,13 +631,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx,
-    H5B2_found_t op, void *op_data)
+H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx, H5B2_found_t op, void *op_data)
 {
-    H5B2_hdr_t	*hdr;                   /* Pointer to the B-tree header */
-    H5B2_node_ptr_t curr_node_ptr;      /* Node pointer info for current node */
-    unsigned    depth;                  /* Current depth of the tree */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *    hdr;                 /* Pointer to the B-tree header */
+    H5B2_node_ptr_t curr_node_ptr;       /* Node pointer info for current node */
+    unsigned        depth;               /* Current depth of the tree */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -653,39 +654,41 @@ H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx,
     curr_node_ptr = hdr->root;
 
     /* Check for empty tree */
-    if(curr_node_ptr.node_nrec == 0)
+    if (curr_node_ptr.node_nrec == 0)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "B-tree has no records")
 
     /* Check for index greater than the number of records in the tree */
-    if(idx >= curr_node_ptr.all_nrec)
+    if (idx >= curr_node_ptr.all_nrec)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "B-tree doesn't have that many records")
 
     /* Current depth of the tree */
     depth = hdr->depth;
 
     /* Check for reverse indexing and map requested index to appropriate forward index */
-    if(order == H5_ITER_DEC)
+    if (order == H5_ITER_DEC)
         idx = curr_node_ptr.all_nrec - (idx + 1);
 
     /* Walk down B-tree to find record or leaf node where record is located */
-    while(depth > 0) {
-        H5B2_internal_t *internal;          /* Pointer to internal node in B-tree */
-        H5B2_node_ptr_t next_node_ptr;      /* Node pointer info for next node */
-        unsigned u;                         /* Local index variable */
+    while (depth > 0) {
+        H5B2_internal_t *internal;      /* Pointer to internal node in B-tree */
+        H5B2_node_ptr_t  next_node_ptr; /* Node pointer info for next node */
+        unsigned         u;             /* Local index variable */
 
         /* Lock B-tree current node */
-        if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC_READ)))
+        if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr.addr,
+                                                      curr_node_ptr.node_nrec, depth, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Search for record with correct index */
-        for(u = 0; u < internal->nrec; u++) {
+        for (u = 0; u < internal->nrec; u++) {
             /* Check if record is in child node */
-            if(internal->node_ptrs[u].all_nrec > idx) {
+            if (internal->node_ptrs[u].all_nrec > idx) {
                 /* Get node pointer for next node to search */
                 next_node_ptr = internal->node_ptrs[u];
 
                 /* Unlock current node */
-                if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                                   H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 /* Set pointer to next node to load */
@@ -696,18 +699,21 @@ H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx,
             } /* end if */
 
             /* Check if record is in this node */
-            if(internal->node_ptrs[u].all_nrec == idx) {
+            if (internal->node_ptrs[u].all_nrec == idx) {
                 /* Make callback for current record */
-                if((op)(H5B2_INT_NREC(internal, hdr, u), op_data) < 0) {
+                if ((op)(H5B2_INT_NREC(internal, hdr, u), op_data) < 0) {
                     /* Unlock current node */
-                    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+                    if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                                       H5AC__NO_FLAGS_SET) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
-                    HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
+                    HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL,
+                                "'found' callback failed for B-tree find operation")
                 } /* end if */
 
                 /* Unlock current node */
-                if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                                   H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 HGOTO_DONE(SUCCEED);
@@ -720,14 +726,15 @@ H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx,
         } /* end for */
 
         /* Check last node pointer */
-        if(u == internal->nrec) {
+        if (u == internal->nrec) {
             /* Check if record is in child node */
-            if(internal->node_ptrs[u].all_nrec > idx) {
+            if (internal->node_ptrs[u].all_nrec > idx) {
                 /* Get node pointer for next node to search */
                 next_node_ptr = internal->node_ptrs[u];
 
                 /* Unlock current node */
-                if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                                   H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 /* Set pointer to next node to load */
@@ -743,26 +750,28 @@ H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx,
     } /* end while */
 
     {
-        H5B2_leaf_t *leaf;          /* Pointer to leaf node in B-tree */
+        H5B2_leaf_t *leaf; /* Pointer to leaf node in B-tree */
 
         /* Lock B-tree leaf node */
-        if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, H5AC_READ)))
+        if (NULL ==
+            (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* Sanity check index */
         HDassert(idx < leaf->nrec);
 
         /* Make callback for correct record */
-        if((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data) < 0) {
+        if ((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data) < 0) {
             /* Unlock current node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) <
+                0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
         } /* end if */
 
         /* Unlock current node */
-        if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     } /* end block */
 
@@ -770,7 +779,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_remove
  *
@@ -785,11 +793,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_remove(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_remove_t op,
-    void *op_data)
+H5B2_remove(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_remove_t op, void *op_data)
 {
-    H5B2_hdr_t	*hdr;                   /* Pointer to the B-tree header */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *hdr;                 /* Pointer to the B-tree header */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -803,33 +810,35 @@ H5B2_remove(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_remove_t op,
     hdr = bt2->hdr;
 
     /* Check for empty B-tree */
-    if(0 == hdr->root.all_nrec)
+    if (0 == hdr->root.all_nrec)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "record is not in B-tree")
 
     /* Attempt to remove record from B-tree */
-    if(hdr->depth > 0) {
-        hbool_t depth_decreased = FALSE;  /* Flag to indicate whether the depth of the B-tree decreased */
+    if (hdr->depth > 0) {
+        hbool_t depth_decreased = FALSE; /* Flag to indicate whether the depth of the B-tree decreased */
 
-        if(H5B2_remove_internal(hdr, dxpl_id, &depth_decreased, NULL, hdr->depth,
-                &(hdr->cache_info), NULL, H5B2_POS_ROOT, &hdr->root, udata, op, op_data) < 0)
+        if (H5B2_remove_internal(hdr, dxpl_id, &depth_decreased, NULL, hdr->depth, &(hdr->cache_info), NULL,
+                                 H5B2_POS_ROOT, &hdr->root, udata, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record from B-tree internal node")
 
         /* Check for decreasing the depth of the B-tree */
-        if(depth_decreased) {
+        if (depth_decreased) {
             /* Destroy free list factories for previous depth */
-            if(hdr->node_info[hdr->depth].nat_rec_fac)
-                if(H5FL_fac_term(hdr->node_info[hdr->depth].nat_rec_fac) < 0)
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't destroy node's native record block factory")
-            if(hdr->node_info[hdr->depth].node_ptr_fac)
-                if(H5FL_fac_term(hdr->node_info[hdr->depth].node_ptr_fac) < 0)
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't destroy node's node pointer block factory")
+            if (hdr->node_info[hdr->depth].nat_rec_fac)
+                if (H5FL_fac_term(hdr->node_info[hdr->depth].nat_rec_fac) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL,
+                                "can't destroy node's native record block factory")
+            if (hdr->node_info[hdr->depth].node_ptr_fac)
+                if (H5FL_fac_term(hdr->node_info[hdr->depth].node_ptr_fac) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL,
+                                "can't destroy node's node pointer block factory")
 
             HDassert((uint16_t)(hdr->depth - depth_decreased) < hdr->depth);
             hdr->depth = (uint16_t)(hdr->depth - depth_decreased);
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
-        if(H5B2_remove_leaf(hdr, dxpl_id, &hdr->root, H5B2_POS_ROOT, udata, op, op_data) < 0)
+        if (H5B2_remove_leaf(hdr, dxpl_id, &hdr->root, H5B2_POS_ROOT, udata, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record from B-tree leaf node")
     } /* end else */
 
@@ -837,14 +846,13 @@ H5B2_remove(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_remove_t op,
     hdr->root.all_nrec--;
 
     /* Mark B-tree header as dirty */
-    if(H5B2_hdr_dirty(hdr) < 0)
+    if (H5B2_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTMARKDIRTY, FAIL, "unable to mark B-tree header dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_remove_by_idx
  *
@@ -859,11 +867,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order,
-    hsize_t idx, H5B2_remove_t op, void *op_data)
+H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx, H5B2_remove_t op,
+                   void *op_data)
 {
-    H5B2_hdr_t	*hdr;                   /* Pointer to the B-tree header */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *hdr;                 /* Pointer to the B-tree header */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -877,41 +885,43 @@ H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order,
     hdr = bt2->hdr;
 
     /* Check for empty B-tree */
-    if(0 == hdr->root.all_nrec)
+    if (0 == hdr->root.all_nrec)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "record is not in B-tree")
 
     /* Check for index greater than the number of records in the tree */
-    if(idx >= hdr->root.all_nrec)
+    if (idx >= hdr->root.all_nrec)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "B-tree doesn't have that many records")
 
     /* Check for reverse indexing and map requested index to appropriate forward index */
-    if(H5_ITER_DEC == order)
+    if (H5_ITER_DEC == order)
         idx = hdr->root.all_nrec - (idx + 1);
 
     /* Attempt to remove record from B-tree */
-    if(hdr->depth > 0) {
-        hbool_t depth_decreased = FALSE;  /* Flag to indicate whether the depth of the B-tree decreased */
+    if (hdr->depth > 0) {
+        hbool_t depth_decreased = FALSE; /* Flag to indicate whether the depth of the B-tree decreased */
 
-        if(H5B2_remove_internal_by_idx(hdr, dxpl_id, &depth_decreased, NULL, hdr->depth,
-                &(hdr->cache_info), NULL, &hdr->root, H5B2_POS_ROOT, idx, op, op_data) < 0)
+        if (H5B2_remove_internal_by_idx(hdr, dxpl_id, &depth_decreased, NULL, hdr->depth, &(hdr->cache_info),
+                                        NULL, &hdr->root, H5B2_POS_ROOT, idx, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record from B-tree internal node")
 
         /* Check for decreasing the depth of the B-tree */
-        if(depth_decreased) {
+        if (depth_decreased) {
             /* Destroy free list factories for previous depth */
-            if(hdr->node_info[hdr->depth].nat_rec_fac)
-                if(H5FL_fac_term(hdr->node_info[hdr->depth].nat_rec_fac) < 0)
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't destroy node's native record block factory")
-            if(hdr->node_info[hdr->depth].node_ptr_fac)
-                if(H5FL_fac_term(hdr->node_info[hdr->depth].node_ptr_fac) < 0)
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't destroy node's node pointer block factory")
+            if (hdr->node_info[hdr->depth].nat_rec_fac)
+                if (H5FL_fac_term(hdr->node_info[hdr->depth].nat_rec_fac) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL,
+                                "can't destroy node's native record block factory")
+            if (hdr->node_info[hdr->depth].node_ptr_fac)
+                if (H5FL_fac_term(hdr->node_info[hdr->depth].node_ptr_fac) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL,
+                                "can't destroy node's node pointer block factory")
 
             HDassert((uint16_t)(hdr->depth - depth_decreased) < hdr->depth);
             hdr->depth = (uint16_t)(hdr->depth - depth_decreased);
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
-        if(H5B2_remove_leaf_by_idx(hdr, dxpl_id, &hdr->root, H5B2_POS_ROOT, (unsigned)idx, op, op_data) < 0)
+        if (H5B2_remove_leaf_by_idx(hdr, dxpl_id, &hdr->root, H5B2_POS_ROOT, (unsigned)idx, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record from B-tree leaf node")
     } /* end else */
 
@@ -919,14 +929,13 @@ H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order,
     hdr->root.all_nrec--;
 
     /* Mark B-tree header as dirty */
-    if(H5B2_hdr_dirty(hdr) < 0)
+    if (H5B2_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTMARKDIRTY, FAIL, "unable to mark B-tree header dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_remove_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_get_nrec
  *
@@ -955,7 +964,6 @@ H5B2_get_nrec(const H5B2_t *bt2, hsize_t *nrec)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_get_nrec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_neighbor
  *
@@ -982,11 +990,10 @@ H5B2_get_nrec(const H5B2_t *bt2, hsize_t *nrec)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_neighbor(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range, void *udata,
-    H5B2_found_t op, void *op_data)
+H5B2_neighbor(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range, void *udata, H5B2_found_t op, void *op_data)
 {
-    H5B2_hdr_t	*hdr;                   /* Pointer to the B-tree header */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *hdr;                 /* Pointer to the B-tree header */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1001,16 +1008,17 @@ H5B2_neighbor(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range, void *udata,
     hdr = bt2->hdr;
 
     /* Check for empty tree */
-    if(!H5F_addr_defined(hdr->root.addr))
+    if (!H5F_addr_defined(hdr->root.addr))
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "B-tree has no records")
 
     /* Attempt to find neighbor record in B-tree */
-    if(hdr->depth > 0) {
-        if(H5B2_neighbor_internal(hdr, dxpl_id, hdr->depth, &hdr->root, NULL, range, udata, op, op_data) < 0)
-            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "unable to find neighbor record in B-tree internal node")
+    if (hdr->depth > 0) {
+        if (H5B2_neighbor_internal(hdr, dxpl_id, hdr->depth, &hdr->root, NULL, range, udata, op, op_data) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL,
+                        "unable to find neighbor record in B-tree internal node")
     } /* end if */
     else {
-        if(H5B2_neighbor_leaf(hdr, dxpl_id, &hdr->root, NULL, range, udata, op, op_data) < 0)
+        if (H5B2_neighbor_leaf(hdr, dxpl_id, &hdr->root, NULL, range, udata, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "unable to find neighbor record in B-tree leaf node")
     } /* end else */
 
@@ -1018,7 +1026,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_neighbor() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_modify
  *
@@ -1040,16 +1047,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op,
-    void *op_data)
+H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op, void *op_data)
 {
-    H5B2_hdr_t	*hdr;                   /* Pointer to the B-tree header */
-    H5B2_node_ptr_t curr_node_ptr;      /* Node pointer info for current node */
-    H5B2_nodepos_t curr_pos;            /* Position of current node */
-    unsigned    depth;                  /* Current depth of the tree */
-    int         cmp;                    /* Comparison value of records */
-    unsigned    idx;                    /* Location of record which matches key */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *    hdr;                 /* Pointer to the B-tree header */
+    H5B2_node_ptr_t curr_node_ptr;       /* Node pointer info for current node */
+    H5B2_nodepos_t  curr_pos;            /* Position of current node */
+    unsigned        depth;               /* Current depth of the tree */
+    int             cmp;                 /* Comparison value of records */
+    unsigned        idx;                 /* Location of record which matches key */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1067,49 +1073,50 @@ H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op,
     curr_node_ptr = hdr->root;
 
     /* Check for empty tree */
-    if(0 == curr_node_ptr.node_nrec)
+    if (0 == curr_node_ptr.node_nrec)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "B-tree has no records")
 
     /* Current depth of the tree */
     depth = hdr->depth;
 
     /* Walk down B-tree to find record or leaf node where record is located */
-    cmp = -1;
+    cmp      = -1;
     curr_pos = H5B2_POS_ROOT;
-    while(depth > 0) {
-        unsigned internal_flags = H5AC__NO_FLAGS_SET;
-        H5B2_internal_t *internal;          /* Pointer to internal node in B-tree */
-        H5B2_node_ptr_t next_node_ptr;      /* Node pointer info for next node */
+    while (depth > 0) {
+        unsigned         internal_flags = H5AC__NO_FLAGS_SET;
+        H5B2_internal_t *internal;      /* Pointer to internal node in B-tree */
+        H5B2_node_ptr_t  next_node_ptr; /* Node pointer info for next node */
 
         /* Lock B-tree current node */
-        if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC_WRITE)))
+        if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr.addr,
+                                                      curr_node_ptr.node_nrec, depth, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate node pointer for child */
-        if(H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, 
-                               udata, &idx, &cmp) < 0) {
+        if (H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx,
+                               &cmp) < 0) {
             /* Unlock current node */
             H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET);
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
         }
 
-        if(cmp > 0)
+        if (cmp > 0)
             idx++;
 
-        if(cmp != 0) {
+        if (cmp != 0) {
             /* Get node pointer for next node to search */
             next_node_ptr = internal->node_ptrs[idx];
 
             /* Set the position of the next node */
-            if(H5B2_POS_MIDDLE != curr_pos) {
-                if(idx == 0) {
-                    if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
+            if (H5B2_POS_MIDDLE != curr_pos) {
+                if (idx == 0) {
+                    if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
                         curr_pos = H5B2_POS_LEFT;
                     else
                         curr_pos = H5B2_POS_MIDDLE;
                 } /* end if */
-                else if(idx == internal->nrec) {
-                    if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
+                else if (idx == internal->nrec) {
+                    if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
                         curr_pos = H5B2_POS_RIGHT;
                     else
                         curr_pos = H5B2_POS_MIDDLE;
@@ -1119,32 +1126,36 @@ H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op,
             } /* end if */
 
             /* Unlock current node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                               H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Set pointer to next node to load */
             curr_node_ptr = next_node_ptr;
         } /* end if */
         else {
-            hbool_t changed;            /* Whether the 'modify' callback changed the record */
+            hbool_t changed; /* Whether the 'modify' callback changed the record */
 
             /* Make callback for current record */
-            if((op)(H5B2_INT_NREC(internal, hdr, idx), op_data, &changed) < 0) {
+            if ((op)(H5B2_INT_NREC(internal, hdr, idx), op_data, &changed) < 0) {
                 /* Make certain that the callback didn't modify the value if it failed */
                 HDassert(changed == FALSE);
 
                 /* Unlock current node */
-                if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                                   H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
-                HGOTO_ERROR(H5E_BTREE, H5E_CANTMODIFY, FAIL, "'modify' callback failed for B-tree find operation")
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTMODIFY, FAIL,
+                            "'modify' callback failed for B-tree find operation")
             } /* end if */
 
             /* Mark the node as dirty if it changed */
             internal_flags |= changed ? H5AC__DIRTIED_FLAG : 0;
 
             /* Unlock current node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, internal_flags) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, internal_flags) <
+                0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             HGOTO_DONE(SUCCEED);
@@ -1155,76 +1166,82 @@ H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op,
     } /* end while */
 
     {
-        H5B2_leaf_t *leaf;      /* Pointer to leaf node in B-tree */
-        unsigned leaf_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting the leaf node */
-        hbool_t changed = FALSE;/* Whether the 'modify' callback changed the record */
+        H5B2_leaf_t *leaf;                            /* Pointer to leaf node in B-tree */
+        unsigned     leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting the leaf node */
+        hbool_t      changed    = FALSE;              /* Whether the 'modify' callback changed the record */
 
         /* Lock B-tree leaf node */
-        if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, H5AC_WRITE)))
+        if (NULL ==
+            (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* Locate record */
-        if(H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, 
-                               udata, &idx, &cmp) < 0) {
+        if (H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) <
+            0) {
             H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET);
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
         }
 
-        if(cmp != 0) {
+        if (cmp != 0) {
             /* Unlock leaf node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) <
+                0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
-            /* Note: don't push error on stack, leave that to next higher level,
-             *      since many times the B-tree is searched in order to determine
-             *      if an object exists in the B-tree or not. -QAK
-             */
+                /* Note: don't push error on stack, leave that to next higher level,
+                 *      since many times the B-tree is searched in order to determine
+                 *      if an object exists in the B-tree or not. -QAK
+                 */
 #ifdef OLD_WAY
-                HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "key not found in leaf node")
-#else /* OLD_WAY */
-                HGOTO_DONE(FAIL)
-#endif /* OLD_WAY */
+            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "key not found in leaf node")
+#else     /* OLD_WAY */
+            HGOTO_DONE(FAIL)
+#endif    /* OLD_WAY */
         } /* end if */
         else {
             /* Make callback for current record */
-            if((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data, &changed) < 0) {
+            if ((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data, &changed) < 0) {
                 /* Make certain that the callback didn't modify the value if it failed */
                 HDassert(changed == FALSE);
 
                 /* Unlock current node */
-                if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf,
+                                   H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
-                HGOTO_ERROR(H5E_BTREE, H5E_CANTMODIFY, FAIL, "'modify' callback failed for B-tree find operation")
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTMODIFY, FAIL,
+                            "'modify' callback failed for B-tree find operation")
             } /* end if */
 
             /* Check for modified record being the min or max for the tree */
             /* (Don't use 'else' for the idx check, to allow for root leaf node) */
-            if(H5B2_POS_MIDDLE != curr_pos) {
-                if(idx == 0) {
-                    if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                        if(hdr->min_native_rec == NULL)
-                            if(NULL == (hdr->min_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
-                                HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for v2 B-tree min record info")
+            if (H5B2_POS_MIDDLE != curr_pos) {
+                if (idx == 0) {
+                    if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                        if (hdr->min_native_rec == NULL)
+                            if (NULL == (hdr->min_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
+                                HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL,
+                                            "memory allocation failed for v2 B-tree min record info")
                         HDmemcpy(hdr->min_native_rec, H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size);
                     } /* end if */
-                } /* end if */
-                if(idx == (unsigned)(leaf->nrec - 1)) {
-                    if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                        if(hdr->max_native_rec == NULL)
-                            if(NULL == (hdr->max_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
-                                HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for v2 B-tree max record info")
+                }     /* end if */
+                if (idx == (unsigned)(leaf->nrec - 1)) {
+                    if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                        if (hdr->max_native_rec == NULL)
+                            if (NULL == (hdr->max_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
+                                HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL,
+                                            "memory allocation failed for v2 B-tree max record info")
                         HDmemcpy(hdr->max_native_rec, H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size);
                     } /* end if */
-                } /* end if */
-            } /* end if */
-        } /* end else */
+                }     /* end if */
+            }         /* end if */
+        }             /* end else */
 
         /* Mark the node as dirty if it changed */
         leaf_flags |= (changed ? H5AC__DIRTIED_FLAG : 0);
 
         /* Unlock current node */
-        if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, leaf_flags) < 0)
+        if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, leaf_flags) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     }
 
@@ -1232,7 +1249,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_modify() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_close
  *
@@ -1249,9 +1265,9 @@ done:
 herr_t
 H5B2_close(H5B2_t *bt2, hid_t dxpl_id)
 {
-    haddr_t bt2_addr = HADDR_UNDEF;     /* Address of v2 B-tree (for deletion) */
-    hbool_t pending_delete = FALSE;     /* Whether the v2 B-tree is pending deletion */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    haddr_t bt2_addr       = HADDR_UNDEF; /* Address of v2 B-tree (for deletion) */
+    hbool_t pending_delete = FALSE;       /* Whether the v2 B-tree is pending deletion */
+    herr_t  ret_value      = SUCCEED;     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1260,45 +1276,48 @@ H5B2_close(H5B2_t *bt2, hid_t dxpl_id)
     HDassert(bt2->f);
 
     /* Decrement file reference & check if this is the last open v2 B-tree using the shared B-tree header */
-    if(0 == H5B2_hdr_fuse_decr(bt2->hdr)) {
+    if (0 == H5B2_hdr_fuse_decr(bt2->hdr)) {
         /* Set the shared v2 B-tree header's file context for this operation */
         bt2->hdr->f = bt2->f;
 
         /* Check for pending B-tree deletion */
-        if(bt2->hdr->pending_delete) {
+        if (bt2->hdr->pending_delete) {
             /* Set local info, so B-tree deletion can occur after decrementing the
              *  header's ref count
              */
             pending_delete = TRUE;
-            bt2_addr = bt2->hdr->addr;
+            bt2_addr       = bt2->hdr->addr;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Check for pending v2 B-tree deletion */
-    if(pending_delete) {
-        H5B2_hdr_t *hdr;            /* Another pointer to v2 B-tree header */
+    if (pending_delete) {
+        H5B2_hdr_t *hdr; /* Another pointer to v2 B-tree header */
 
         /* Sanity check */
         HDassert(H5F_addr_defined(bt2_addr));
 
 #ifndef NDEBUG
-{
-    unsigned hdr_status = 0;         /* Header's status in the metadata cache */
-
-    /* Check the header's status in the metadata cache */
-    if(H5AC_get_entry_status(bt2->f, bt2_addr, &hdr_status) < 0)
-        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to check metadata cache status for v2 B-tree header, address = %llu", (unsigned long long)bt2_addr)
-
-    /* Sanity checks on header */
-    HDassert(hdr_status & H5AC_ES__IN_CACHE);
-    HDassert(hdr_status & H5AC_ES__IS_PINNED);
-    HDassert(!(hdr_status & H5AC_ES__IS_PROTECTED));
-}
+        {
+            unsigned hdr_status = 0; /* Header's status in the metadata cache */
+
+            /* Check the header's status in the metadata cache */
+            if (H5AC_get_entry_status(bt2->f, bt2_addr, &hdr_status) < 0)
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL,
+                            "unable to check metadata cache status for v2 B-tree header, address = %llu",
+                            (unsigned long long)bt2_addr)
+
+            /* Sanity checks on header */
+            HDassert(hdr_status & H5AC_ES__IN_CACHE);
+            HDassert(hdr_status & H5AC_ES__IS_PINNED);
+            HDassert(!(hdr_status & H5AC_ES__IS_PROTECTED));
+        }
 #endif /* NDEBUG */
 
         /* Lock the v2 B-tree header into memory */
         /* (OK to pass in NULL for callback context, since we know the header must be in the cache) */
-        if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(bt2->f, dxpl_id, H5AC_BT2_HDR, bt2_addr, NULL, H5AC_WRITE)))
+        if (NULL ==
+            (hdr = (H5B2_hdr_t *)H5AC_protect(bt2->f, dxpl_id, H5AC_BT2_HDR, bt2_addr, NULL, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect v2 B-tree header")
 
         /* Set the shared v2 B-tree header's file context for this operation */
@@ -1308,11 +1327,12 @@ H5B2_close(H5B2_t *bt2, hid_t dxpl_id)
         /* (don't put in H5B2_hdr_fuse_decr() as the B-tree header may be evicted
          *  immediately -QAK)
          */
-        if(H5B2_hdr_decr(bt2->hdr) < 0)
-            HGOTO_ERROR(H5E_BTREE, H5E_CANTDEC, FAIL, "can't decrement reference count on shared v2 B-tree header")
+        if (H5B2_hdr_decr(bt2->hdr) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTDEC, FAIL,
+                        "can't decrement reference count on shared v2 B-tree header")
 
         /* Delete v2 B-tree, starting with header (unprotects header) */
-        if(H5B2_hdr_delete(hdr, dxpl_id) < 0)
+        if (H5B2_hdr_delete(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to delete v2 B-tree")
     } /* end if */
     else {
@@ -1320,8 +1340,9 @@ H5B2_close(H5B2_t *bt2, hid_t dxpl_id)
         /* (don't put in H5B2_hdr_fuse_decr() as the B-tree header may be evicted
          *  immediately -QAK)
          */
-        if(H5B2_hdr_decr(bt2->hdr) < 0)
-            HGOTO_ERROR(H5E_BTREE, H5E_CANTDEC, FAIL, "can't decrement reference count on shared v2 B-tree header")
+        if (H5B2_hdr_decr(bt2->hdr) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTDEC, FAIL,
+                        "can't decrement reference count on shared v2 B-tree header")
 
     } /* end else */
 
@@ -1332,7 +1353,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_delete
  *
@@ -1356,12 +1376,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata,
-    H5B2_remove_t op, void *op_data)
+H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata, H5B2_remove_t op, void *op_data)
 {
-    H5B2_hdr_t	*hdr = NULL;            /* Pointer to the B-tree header */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *        hdr = NULL;          /* Pointer to the B-tree header */
+    H5B2_hdr_cache_ud_t cache_udata;         /* User-data for callback */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1371,35 +1390,34 @@ H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata,
 
     /* Lock the v2 B-tree header into memory */
 #ifdef QAK
-HDfprintf(stderr, "%s: addr = %a\n", FUNC, addr);
+    HDfprintf(stderr, "%s: addr = %a\n", FUNC, addr);
 #endif /* QAK */
-    cache_udata.f = f;
+    cache_udata.f         = f;
     cache_udata.ctx_udata = ctx_udata;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC_WRITE)))
+    if (NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect v2 B-tree header")
 
     /* Remember the callback & context for later */
-    hdr->remove_op = op;
+    hdr->remove_op      = op;
     hdr->remove_op_data = op_data;
 
     /* Check for files using shared v2 B-tree header */
-    if(hdr->file_rc)
+    if (hdr->file_rc)
         hdr->pending_delete = TRUE;
     else {
         /* Set the shared v2 B-tree header's file context for this operation */
         hdr->f = f;
 
         /* Delete v2 B-tree now, starting with header (unprotects header) */
-        if(H5B2_hdr_delete(hdr, dxpl_id) < 0)
+        if (H5B2_hdr_delete(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to delete v2 B-tree")
         hdr = NULL;
     } /* end if */
 
 done:
     /* Unprotect the header, if an error occurred */
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release v2 B-tree header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_delete() */
-
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index 4bc2745..f32b195 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -26,64 +26,61 @@
 /* Module Setup */
 /****************/
 
-#define H5B2_PACKAGE		/*suppress error about including H5B2pkg  */
-
+#define H5B2_PACKAGE /*suppress error about including H5B2pkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5B2pkg.h"		/* v2 B-trees				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5B2pkg.h"     /* v2 B-trees				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* B-tree format version #'s */
-#define H5B2_HDR_VERSION 0              /* Header */
-#define H5B2_INT_VERSION 0              /* Internal node */
-#define H5B2_LEAF_VERSION 0             /* Leaf node */
+#define H5B2_HDR_VERSION  0 /* Header */
+#define H5B2_INT_VERSION  0 /* Internal node */
+#define H5B2_LEAF_VERSION 0 /* Leaf node */
 
 /* Size of stack buffer for serialized headers */
-#define H5B2_HDR_BUF_SIZE               128
-
+#define H5B2_HDR_BUF_SIZE 128
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Metadata cache callbacks */
 static H5B2_hdr_t *H5B2__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5B2__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_hdr_t *hdr, unsigned H5_ATTR_UNUSED * flags_ptr);
+static herr_t H5B2__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_hdr_t *hdr,
+                                    unsigned H5_ATTR_UNUSED *flags_ptr);
 static herr_t H5B2__cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr);
 static herr_t H5B2__cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy);
 static herr_t H5B2__cache_hdr_size(const H5F_t *f, const H5B2_hdr_t *hdr, size_t *size_ptr);
 static H5B2_internal_t *H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_internal_t *i, unsigned H5_ATTR_UNUSED * flags_ptr);
-static herr_t H5B2__cache_internal_dest(H5F_t *f, H5B2_internal_t *internal);
-static herr_t H5B2__cache_internal_clear(H5F_t *f, H5B2_internal_t *i, hbool_t destroy);
-static herr_t H5B2__cache_internal_size(const H5F_t *f, const H5B2_internal_t *i, size_t *size_ptr);
-static H5B2_leaf_t *H5B2__cache_leaf_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *l, unsigned H5_ATTR_UNUSED * flags_ptr);
+static herr_t           H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+                                                   H5B2_internal_t *i, unsigned H5_ATTR_UNUSED *flags_ptr);
+static herr_t           H5B2__cache_internal_dest(H5F_t *f, H5B2_internal_t *internal);
+static herr_t           H5B2__cache_internal_clear(H5F_t *f, H5B2_internal_t *i, hbool_t destroy);
+static herr_t           H5B2__cache_internal_size(const H5F_t *f, const H5B2_internal_t *i, size_t *size_ptr);
+static H5B2_leaf_t *    H5B2__cache_leaf_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
+static herr_t H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *l,
+                                     unsigned H5_ATTR_UNUSED *flags_ptr);
 static herr_t H5B2__cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf);
 static herr_t H5B2__cache_leaf_clear(H5F_t *f, H5B2_leaf_t *l, hbool_t destroy);
 static herr_t H5B2__cache_leaf_size(const H5F_t *f, const H5B2_leaf_t *l, size_t *size_ptr);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -118,18 +115,14 @@ const H5AC_class_t H5AC_BT2_LEAF[1] = {{
     (H5AC_size_func_t)H5B2__cache_leaf_size,
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_hdr_load
  *
@@ -147,18 +140,18 @@ const H5AC_class_t H5AC_BT2_LEAF[1] = {{
 static H5B2_hdr_t *
 H5B2__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5B2_hdr_t		*hdr = NULL;    /* B-tree header */
+    H5B2_hdr_t *         hdr   = NULL; /* B-tree header */
     H5B2_hdr_cache_ud_t *udata = (H5B2_hdr_cache_ud_t *)_udata;
-    H5B2_create_t       cparam;         /* B-tree creation parameters */
-    H5B2_subid_t        id;		/* ID of B-tree class, as found in file */
-    uint16_t            depth;          /* Depth of B-tree */
-    uint32_t            stored_chksum;  /* Stored metadata checksum value */
-    uint32_t            computed_chksum; /* Computed metadata checksum value */
-    H5WB_t              *wb = NULL;     /* Wrapped buffer for header data */
-    uint8_t             hdr_buf[H5B2_HDR_BUF_SIZE]; /* Buffer for header */
-    uint8_t		*buf;           /* Pointer to header buffer */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
-    H5B2_hdr_t		*ret_value;     /* Return value */
+    H5B2_create_t        cparam;                     /* B-tree creation parameters */
+    H5B2_subid_t         id;                         /* ID of B-tree class, as found in file */
+    uint16_t             depth;                      /* Depth of B-tree */
+    uint32_t             stored_chksum;              /* Stored metadata checksum value */
+    uint32_t             computed_chksum;            /* Computed metadata checksum value */
+    H5WB_t *             wb = NULL;                  /* Wrapped buffer for header data */
+    uint8_t              hdr_buf[H5B2_HDR_BUF_SIZE]; /* Buffer for header */
+    uint8_t *            buf;                        /* Pointer to header buffer */
+    const uint8_t *      p;                          /* Pointer into raw data buffer */
+    H5B2_hdr_t *         ret_value;                  /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -168,36 +161,36 @@ H5B2__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata);
 
     /* Allocate new B-tree header and reset cache info */
-    if(NULL == (hdr = H5B2_hdr_alloc(udata->f)))
+    if (NULL == (hdr = H5B2_hdr_alloc(udata->f)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "allocation failed for B-tree header")
 
     /* Wrap the local buffer for serialized header info */
-    if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
+    if (NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, NULL, "can't wrap buffer")
 
     /* Get a pointer to a buffer that's large enough for header */
-    if(NULL == (buf = (uint8_t *)H5WB_actual(wb, hdr->hdr_size)))
+    if (NULL == (buf = (uint8_t *)H5WB_actual(wb, hdr->hdr_size)))
         HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, NULL, "can't get actual buffer")
 
     /* Read header from disk */
-    if(H5F_block_read(f, H5FD_MEM_BTREE, addr, hdr->hdr_size, dxpl_id, buf) < 0)
+    if (H5F_block_read(f, H5FD_MEM_BTREE, addr, hdr->hdr_size, dxpl_id, buf) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_READERROR, NULL, "can't read B-tree header")
 
     /* Get temporary pointer to serialized header */
     p = buf;
 
     /* Magic number */
-    if(HDmemcmp(p, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "wrong B-tree header signature")
+    if (HDmemcmp(p, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "wrong B-tree header signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5B2_HDR_VERSION)
-	HGOTO_ERROR(H5E_BTREE, H5E_BADRANGE, NULL, "wrong B-tree header version")
+    if (*p++ != H5B2_HDR_VERSION)
+        HGOTO_ERROR(H5E_BTREE, H5E_BADRANGE, NULL, "wrong B-tree header version")
 
     /* B-tree class */
     id = (H5B2_subid_t)*p++;
-    if(id >= H5B2_NUM_BTREE_ID)
+    if (id >= H5B2_NUM_BTREE_ID)
         HGOTO_ERROR(H5E_BTREE, H5E_BADTYPE, NULL, "incorrect B-tree type")
 
     /* Node size (in bytes) */
@@ -228,12 +221,12 @@ H5B2__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     computed_chksum = H5_checksum_metadata(buf, (hdr->hdr_size - H5B2_SIZEOF_CHKSUM), 0);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
+    if (stored_chksum != computed_chksum)
         HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "incorrect metadata checksum for v2 B-tree header")
 
     /* Initialize B-tree header info */
     cparam.cls = H5B2_client_class_g[id];
-    if(H5B2_hdr_init(hdr, &cparam, udata->ctx_udata, depth) < 0)
+    if (H5B2_hdr_init(hdr, &cparam, udata->ctx_udata, depth) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, NULL, "can't initialize B-tree header info")
 
     /* Set the B-tree header's address */
@@ -244,16 +237,15 @@ H5B2__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
-    if(!ret_value && hdr)
-        if(H5B2_hdr_free(hdr) < 0)
+    if (!ret_value && hdr)
+        if (H5B2_hdr_free(hdr) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, NULL, "can't release v2 B-tree header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__cache_hdr_load() */ /*lint !e818 Can't make udata a pointer to const */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_hdr_flush
  *
@@ -268,12 +260,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
-    H5B2_hdr_t *hdr, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5B2__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_hdr_t *hdr,
+                      unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    H5WB_t      *wb = NULL;             /* Wrapped buffer for header data */
-    uint8_t     hdr_buf[H5B2_HDR_BUF_SIZE]; /* Buffer for header */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5WB_t *wb = NULL;                  /* Wrapped buffer for header data */
+    uint8_t hdr_buf[H5B2_HDR_BUF_SIZE]; /* Buffer for header */
+    herr_t  ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -282,20 +274,20 @@ H5B2__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
     HDassert(H5F_addr_defined(addr));
     HDassert(hdr);
 
-    if(hdr->cache_info.is_dirty) {
-        uint8_t	*buf;           /* Pointer to header buffer */
-        uint8_t *p;             /* Pointer into raw data buffer */
+    if (hdr->cache_info.is_dirty) {
+        uint8_t *buf;             /* Pointer to header buffer */
+        uint8_t *p;               /* Pointer into raw data buffer */
         uint32_t metadata_chksum; /* Computed metadata checksum value */
 
         /* Set the B-tree header's file context for this operation */
         hdr->f = f;
 
         /* Wrap the local buffer for serialized header info */
-        if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
+        if (NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for header */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, hdr->hdr_size)))
+        if (NULL == (buf = (uint8_t *)H5WB_actual(wb, hdr->hdr_size)))
             HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Get temporary pointer to serialized header */
@@ -339,25 +331,24 @@ H5B2__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
 
         /* Write the B-tree header. */
         HDassert((size_t)(p - buf) == hdr->hdr_size);
-        if(H5F_block_write(f, H5FD_MEM_BTREE, addr, hdr->hdr_size, dxpl_id, buf) < 0)
+        if (H5F_block_write(f, H5FD_MEM_BTREE, addr, hdr->hdr_size, dxpl_id, buf) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to save B-tree header to disk")
 
         hdr->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5B2__cache_hdr_dest(f, hdr) < 0)
+    if (destroy)
+        if (H5B2__cache_hdr_dest(f, hdr) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree header")
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2__cache_hdr_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_hdr_dest
  *
@@ -374,7 +365,7 @@ done:
 static herr_t
 H5B2__cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;     /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -386,22 +377,21 @@ H5B2__cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr)
     HDassert(!hdr->cache_info.free_file_space_on_destroy || H5F_addr_defined(hdr->cache_info.addr));
 
     /* Check for freeing file space for B-tree header */
-    if(hdr->cache_info.free_file_space_on_destroy) {
+    if (hdr->cache_info.free_file_space_on_destroy) {
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, hdr->cache_info.addr, (hsize_t)hdr->hdr_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, hdr->cache_info.addr, (hsize_t)hdr->hdr_size) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free v2 B-tree header")
     } /* end if */
 
     /* Release B-tree header info */
-    if(H5B2_hdr_free(hdr) < 0)
+    if (H5B2_hdr_free(hdr) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free v2 B-tree header info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__cache_hdr_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_hdr_clear
  *
@@ -418,7 +408,7 @@ done:
 static herr_t
 H5B2__cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -430,15 +420,14 @@ H5B2__cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy)
     /* Reset the dirty flag.  */
     hdr->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5B2__cache_hdr_dest(f, hdr) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree header")
+    if (destroy)
+        if (H5B2__cache_hdr_dest(f, hdr) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__cache_hdr_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B2__cache_hdr_size
  *
@@ -470,7 +459,6 @@ H5B2__cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5B2_hdr_t *hdr, size_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2__cache_hdr_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_internal_load
  *
@@ -488,15 +476,15 @@ H5B2__cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5B2_hdr_t *hdr, size_
 static H5B2_internal_t *
 H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5B2_internal_cache_ud_t *udata = (H5B2_internal_cache_ud_t *)_udata;     /* Pointer to user data */
-    H5B2_internal_t	*internal = NULL;       /* Internal node read */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
-    uint8_t		*native;        /* Pointer to native record info */
-    H5B2_node_ptr_t	*int_node_ptr;  /* Pointer to node pointer info */
-    uint32_t            stored_chksum;  /* Stored metadata checksum value */
-    uint32_t            computed_chksum; /* Computed metadata checksum value */
-    unsigned		u;              /* Local index variable */
-    H5B2_internal_t	*ret_value;     /* Return value */
+    H5B2_internal_cache_ud_t *udata    = (H5B2_internal_cache_ud_t *)_udata; /* Pointer to user data */
+    H5B2_internal_t *         internal = NULL;                               /* Internal node read */
+    const uint8_t *           p;               /* Pointer into raw data buffer */
+    uint8_t *                 native;          /* Pointer to native record info */
+    H5B2_node_ptr_t *         int_node_ptr;    /* Pointer to node pointer info */
+    uint32_t                  stored_chksum;   /* Stored metadata checksum value */
+    uint32_t                  computed_chksum; /* Computed metadata checksum value */
+    unsigned                  u;               /* Local index variable */
+    H5B2_internal_t *         ret_value;       /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -506,56 +494,60 @@ H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata);
 
     /* Allocate new internal node and reset cache info */
-    if(NULL == (internal = H5FL_MALLOC(H5B2_internal_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (internal = H5FL_MALLOC(H5B2_internal_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     HDmemset(&internal->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Set the B-tree header's file context for this operation */
     udata->hdr->f = f;
 
     /* Increment ref. count on B-tree header */
-    if(H5B2_hdr_incr(udata->hdr) < 0)
+    if (H5B2_hdr_incr(udata->hdr) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL, "can't increment ref. count on B-tree header")
 
     /* Share B-tree information */
     internal->hdr = udata->hdr;
 
     /* Read header from disk */
-    if(H5F_block_read(f, H5FD_MEM_BTREE, addr, udata->hdr->node_size, dxpl_id, udata->hdr->page) < 0)
+    if (H5F_block_read(f, H5FD_MEM_BTREE, addr, udata->hdr->node_size, dxpl_id, udata->hdr->page) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_READERROR, NULL, "can't read B-tree internal node")
 
     p = udata->hdr->page;
 
     /* Magic number */
-    if(HDmemcmp(p, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+    if (HDmemcmp(p, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC))
         HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "wrong B-tree internal node signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5B2_INT_VERSION)
-	HGOTO_ERROR(H5E_BTREE, H5E_BADRANGE, NULL, "wrong B-tree internal node version")
+    if (*p++ != H5B2_INT_VERSION)
+        HGOTO_ERROR(H5E_BTREE, H5E_BADRANGE, NULL, "wrong B-tree internal node version")
 
     /* B-tree type */
-    if(*p++ != (uint8_t)udata->hdr->cls->id)
+    if (*p++ != (uint8_t)udata->hdr->cls->id)
         HGOTO_ERROR(H5E_BTREE, H5E_BADTYPE, NULL, "incorrect B-tree type")
 
     /* Allocate space for the native keys in memory */
-    if(NULL == (internal->int_native = (uint8_t *)H5FL_FAC_MALLOC(udata->hdr->node_info[udata->depth].nat_rec_fac)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for B-tree internal native keys")
+    if (NULL ==
+        (internal->int_native = (uint8_t *)H5FL_FAC_MALLOC(udata->hdr->node_info[udata->depth].nat_rec_fac)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for B-tree internal native keys")
 
     /* Allocate space for the node pointers in memory */
-    if(NULL == (internal->node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_MALLOC(udata->hdr->node_info[udata->depth].node_ptr_fac)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for B-tree internal node pointers")
+    if (NULL == (internal->node_ptrs =
+                     (H5B2_node_ptr_t *)H5FL_FAC_MALLOC(udata->hdr->node_info[udata->depth].node_ptr_fac)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for B-tree internal node pointers")
 
     /* Set the number of records in the leaf & it's depth */
-    internal->nrec = udata->nrec;
+    internal->nrec  = udata->nrec;
     internal->depth = udata->depth;
 
     /* Deserialize records for internal node */
     native = internal->int_native;
-    for(u = 0; u < internal->nrec; u++) {
+    for (u = 0; u < internal->nrec; u++) {
         /* Decode record */
-        if((udata->hdr->cls->decode)(p, native, udata->hdr->cb_ctx) < 0)
+        if ((udata->hdr->cls->decode)(p, native, udata->hdr->cb_ctx) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDECODE, NULL, "unable to decode B-tree record")
 
         /* Move to next record */
@@ -565,12 +557,13 @@ H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
     /* Deserialize node pointers for internal node */
     int_node_ptr = internal->node_ptrs;
-    for(u = 0; u < (unsigned)(internal->nrec + 1); u++) {
+    for (u = 0; u < (unsigned)(internal->nrec + 1); u++) {
         /* Decode node pointer */
         H5F_addr_decode(udata->f, (const uint8_t **)&p, &(int_node_ptr->addr));
         UINT64DECODE_VAR(p, int_node_ptr->node_nrec, udata->hdr->max_nrec_size);
-        if(udata->depth > 1)
-            UINT64DECODE_VAR(p, int_node_ptr->all_nrec, udata->hdr->node_info[udata->depth - 1].cum_max_nrec_size)
+        if (udata->depth > 1)
+            UINT64DECODE_VAR(p, int_node_ptr->all_nrec,
+                             udata->hdr->node_info[udata->depth - 1].cum_max_nrec_size)
         else
             int_node_ptr->all_nrec = int_node_ptr->node_nrec;
 
@@ -579,7 +572,8 @@ H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     } /* end for */
 
     /* Compute checksum on internal node */
-    computed_chksum = H5_checksum_metadata(udata->hdr->page, (size_t)(p - (const uint8_t *)udata->hdr->page), 0);
+    computed_chksum =
+        H5_checksum_metadata(udata->hdr->page, (size_t)(p - (const uint8_t *)udata->hdr->page), 0);
 
     /* Metadata checksum */
     UINT32DECODE(p, stored_chksum);
@@ -588,21 +582,20 @@ H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert((size_t)(p - (const uint8_t *)udata->hdr->page) <= udata->hdr->node_size);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
+    if (stored_chksum != computed_chksum)
         HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "incorrect metadata checksum for v2 internal node")
 
     /* Set return value */
     ret_value = internal;
 
 done:
-    if(!ret_value && internal)
-        if(H5B2_internal_free(internal) < 0)
+    if (!ret_value && internal)
+        if (H5B2_internal_free(internal) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, NULL, "unable to destroy B-tree internal node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2__cache_internal_load() */ /*lint !e818 Can't make udata a pointer to const */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_internal_flush
  *
@@ -617,9 +610,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_internal_t *internal, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_internal_t *internal,
+                           unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -629,12 +623,12 @@ H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t add
     HDassert(internal);
     HDassert(internal->hdr);
 
-    if(internal->cache_info.is_dirty) {
-        uint8_t *p;             /* Pointer into raw data buffer */
-        uint8_t *native;        /* Pointer to native record info */
-        H5B2_node_ptr_t *int_node_ptr;      /* Pointer to node pointer info */
-        uint32_t metadata_chksum; /* Computed metadata checksum value */
-        unsigned u;             /* Local index variable */
+    if (internal->cache_info.is_dirty) {
+        uint8_t *        p;               /* Pointer into raw data buffer */
+        uint8_t *        native;          /* Pointer to native record info */
+        H5B2_node_ptr_t *int_node_ptr;    /* Pointer to node pointer info */
+        uint32_t         metadata_chksum; /* Computed metadata checksum value */
+        unsigned         u;               /* Local index variable */
 
         /* Set the B-tree header's file context for this operation */
         internal->hdr->f = f;
@@ -654,9 +648,9 @@ H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t add
 
         /* Serialize records for internal node */
         native = internal->int_native;
-        for(u = 0; u < internal->nrec; u++) {
+        for (u = 0; u < internal->nrec; u++) {
             /* Encode record */
-            if((internal->hdr->cls->encode)(p, native, internal->hdr->cb_ctx) < 0)
+            if ((internal->hdr->cls->encode)(p, native, internal->hdr->cb_ctx) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, FAIL, "unable to encode B-tree record")
 
             /* Move to next record */
@@ -666,12 +660,13 @@ H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t add
 
         /* Serialize node pointers for internal node */
         int_node_ptr = internal->node_ptrs;
-        for(u = 0; u < (unsigned)(internal->nrec + 1); u++) {
+        for (u = 0; u < (unsigned)(internal->nrec + 1); u++) {
             /* Encode node pointer */
             H5F_addr_encode(f, &p, int_node_ptr->addr);
             UINT64ENCODE_VAR(p, int_node_ptr->node_nrec, internal->hdr->max_nrec_size);
-            if(internal->depth > 1)
-                UINT64ENCODE_VAR(p, int_node_ptr->all_nrec, internal->hdr->node_info[internal->depth - 1].cum_max_nrec_size);
+            if (internal->depth > 1)
+                UINT64ENCODE_VAR(p, int_node_ptr->all_nrec,
+                                 internal->hdr->node_info[internal->depth - 1].cum_max_nrec_size);
 
             /* Move to next node pointer */
             int_node_ptr++;
@@ -683,23 +678,23 @@ H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t add
         /* Metadata checksum */
         UINT32ENCODE(p, metadata_chksum);
 
-	/* Write the B-tree internal node */
+        /* Write the B-tree internal node */
         HDassert((size_t)(p - internal->hdr->page) <= internal->hdr->node_size);
-	if(H5F_block_write(f, H5FD_MEM_BTREE, addr, internal->hdr->node_size, dxpl_id, internal->hdr->page) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to save B-tree internal node to disk")
+        if (H5F_block_write(f, H5FD_MEM_BTREE, addr, internal->hdr->node_size, dxpl_id, internal->hdr->page) <
+            0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to save B-tree internal node to disk")
 
-	internal->cache_info.is_dirty = FALSE;
+        internal->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5B2__cache_internal_dest(f, internal) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree internal node")
+    if (destroy)
+        if (H5B2__cache_internal_dest(f, internal) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree internal node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2__cache_internal_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_internal_dest
  *
@@ -716,7 +711,7 @@ done:
 static herr_t
 H5B2__cache_internal_dest(H5F_t *f, H5B2_internal_t *internal)
 {
-    herr_t ret_value = SUCCEED;     /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -729,22 +724,22 @@ H5B2__cache_internal_dest(H5F_t *f, H5B2_internal_t *internal)
     HDassert(!internal->cache_info.free_file_space_on_destroy || H5F_addr_defined(internal->cache_info.addr));
 
     /* Check for freeing file space for B-tree internal node */
-    if(internal->cache_info.free_file_space_on_destroy) {
+    if (internal->cache_info.free_file_space_on_destroy) {
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, internal->cache_info.addr, (hsize_t)internal->hdr->node_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, internal->cache_info.addr,
+                       (hsize_t)internal->hdr->node_size) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free v2 B-tree internal node")
     } /* end if */
 
     /* Release v2 b-tree internal node */
-    if(H5B2_internal_free(internal) < 0)
+    if (H5B2_internal_free(internal) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to release v2 B-tree internal node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__cache_internal_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_internal_clear
  *
@@ -773,15 +768,14 @@ H5B2__cache_internal_clear(H5F_t *f, H5B2_internal_t *internal, hbool_t destroy)
     /* Reset the dirty flag.  */
     internal->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5B2__cache_internal_dest(f, internal) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree internal node")
+    if (destroy)
+        if (H5B2__cache_internal_dest(f, internal) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree internal node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__cache_internal_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_internal_size
  *
@@ -813,7 +807,6 @@ H5B2__cache_internal_size(const H5F_t H5_ATTR_UNUSED *f, const H5B2_internal_t *
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2__cache_internal_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_leaf_load
  *
@@ -832,13 +825,13 @@ static H5B2_leaf_t *
 H5B2__cache_leaf_load(H5F_t H5_ATTR_UNUSED *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
     H5B2_leaf_cache_ud_t *udata = (H5B2_leaf_cache_ud_t *)_udata;
-    H5B2_leaf_t		*leaf = NULL;   /* Pointer to lead node loaded */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
-    uint8_t		*native;        /* Pointer to native keys */
-    uint32_t            stored_chksum;  /* Stored metadata checksum value */
-    uint32_t            computed_chksum; /* Computed metadata checksum value */
-    unsigned		u;              /* Local index variable */
-    H5B2_leaf_t		*ret_value;     /* Return value */
+    H5B2_leaf_t *         leaf  = NULL;    /* Pointer to lead node loaded */
+    const uint8_t *       p;               /* Pointer into raw data buffer */
+    uint8_t *             native;          /* Pointer to native keys */
+    uint32_t              stored_chksum;   /* Stored metadata checksum value */
+    uint32_t              computed_chksum; /* Computed metadata checksum value */
+    unsigned              u;               /* Local index variable */
+    H5B2_leaf_t *         ret_value;       /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -848,7 +841,7 @@ H5B2__cache_leaf_load(H5F_t H5_ATTR_UNUSED *f, hid_t dxpl_id, haddr_t addr, void
     HDassert(udata);
 
     /* Allocate new leaf node and reset cache info */
-    if(NULL == (leaf = H5FL_MALLOC(H5B2_leaf_t)))
+    if (NULL == (leaf = H5FL_MALLOC(H5B2_leaf_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     HDmemset(&leaf->cache_info, 0, sizeof(H5AC_info_t));
 
@@ -856,33 +849,33 @@ H5B2__cache_leaf_load(H5F_t H5_ATTR_UNUSED *f, hid_t dxpl_id, haddr_t addr, void
     udata->hdr->f = udata->f;
 
     /* Increment ref. count on B-tree header */
-    if(H5B2_hdr_incr(udata->hdr) < 0)
+    if (H5B2_hdr_incr(udata->hdr) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, NULL, "can't increment ref. count on B-tree header")
 
     /* Share B-tree header information */
     leaf->hdr = udata->hdr;
 
     /* Read header from disk */
-    if(H5F_block_read(udata->f, H5FD_MEM_BTREE, addr, udata->hdr->node_size, dxpl_id, udata->hdr->page) < 0)
+    if (H5F_block_read(udata->f, H5FD_MEM_BTREE, addr, udata->hdr->node_size, dxpl_id, udata->hdr->page) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_READERROR, NULL, "can't read B-tree leaf node")
 
     p = udata->hdr->page;
 
     /* Magic number */
-    if(HDmemcmp(p, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+    if (HDmemcmp(p, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "wrong B-tree leaf node signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5B2_LEAF_VERSION)
+    if (*p++ != H5B2_LEAF_VERSION)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "wrong B-tree leaf node version")
 
     /* B-tree type */
-    if(*p++ != (uint8_t)udata->hdr->cls->id)
+    if (*p++ != (uint8_t)udata->hdr->cls->id)
         HGOTO_ERROR(H5E_BTREE, H5E_BADTYPE, NULL, "incorrect B-tree type")
 
     /* Allocate space for the native keys in memory */
-    if(NULL == (leaf->leaf_native = (uint8_t *)H5FL_FAC_MALLOC(udata->hdr->node_info[0].nat_rec_fac)))
+    if (NULL == (leaf->leaf_native = (uint8_t *)H5FL_FAC_MALLOC(udata->hdr->node_info[0].nat_rec_fac)))
         HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, NULL, "memory allocation failed for B-tree leaf native keys")
 
     /* Set the number of records in the leaf */
@@ -890,9 +883,9 @@ H5B2__cache_leaf_load(H5F_t H5_ATTR_UNUSED *f, hid_t dxpl_id, haddr_t addr, void
 
     /* Deserialize records for leaf node */
     native = leaf->leaf_native;
-    for(u = 0; u < leaf->nrec; u++) {
+    for (u = 0; u < leaf->nrec; u++) {
         /* Decode record */
-        if((udata->hdr->cls->decode)(p, native, udata->hdr->cb_ctx) < 0)
+        if ((udata->hdr->cls->decode)(p, native, udata->hdr->cb_ctx) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, NULL, "unable to decode B-tree record")
 
         /* Move to next record */
@@ -901,7 +894,8 @@ H5B2__cache_leaf_load(H5F_t H5_ATTR_UNUSED *f, hid_t dxpl_id, haddr_t addr, void
     } /* end for */
 
     /* Compute checksum on internal node */
-    computed_chksum = H5_checksum_metadata(udata->hdr->page, (size_t)(p - (const uint8_t *)udata->hdr->page), 0);
+    computed_chksum =
+        H5_checksum_metadata(udata->hdr->page, (size_t)(p - (const uint8_t *)udata->hdr->page), 0);
 
     /* Metadata checksum */
     UINT32DECODE(p, stored_chksum);
@@ -910,21 +904,20 @@ H5B2__cache_leaf_load(H5F_t H5_ATTR_UNUSED *f, hid_t dxpl_id, haddr_t addr, void
     HDassert((size_t)(p - (const uint8_t *)udata->hdr->page) <= udata->hdr->node_size);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
-	HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "incorrect metadata checksum for v2 leaf node")
+    if (stored_chksum != computed_chksum)
+        HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "incorrect metadata checksum for v2 leaf node")
 
     /* Set return value */
     ret_value = leaf;
 
 done:
-    if(!ret_value && leaf)
-        if(H5B2_leaf_free(leaf) < 0)
+    if (!ret_value && leaf)
+        if (H5B2_leaf_free(leaf) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, NULL, "unable to destroy B-tree leaf node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2__cache_leaf_load() */ /*lint !e818 Can't make udata a pointer to const */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_leaf_flush
  *
@@ -939,9 +932,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *leaf, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *leaf,
+                       unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -951,11 +945,11 @@ H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H
     HDassert(leaf);
     HDassert(leaf->hdr);
 
-    if(leaf->cache_info.is_dirty) {
-        uint8_t *p;             /* Pointer into raw data buffer */
-        uint8_t *native;        /* Pointer to native keys */
+    if (leaf->cache_info.is_dirty) {
+        uint8_t *p;               /* Pointer into raw data buffer */
+        uint8_t *native;          /* Pointer to native keys */
         uint32_t metadata_chksum; /* Computed metadata checksum value */
-        unsigned u;             /* Local index variable */
+        unsigned u;               /* Local index variable */
 
         /* Set the B-tree header's file context for this operation */
         leaf->hdr->f = f;
@@ -975,9 +969,9 @@ H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H
 
         /* Serialize records for leaf node */
         native = leaf->leaf_native;
-        for(u = 0; u < leaf->nrec; u++) {
+        for (u = 0; u < leaf->nrec; u++) {
             /* Encode record */
-            if((leaf->hdr->cls->encode)(p, native, leaf->hdr->cb_ctx) < 0)
+            if ((leaf->hdr->cls->encode)(p, native, leaf->hdr->cb_ctx) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, FAIL, "unable to encode B-tree record")
 
             /* Move to next record */
@@ -991,23 +985,22 @@ H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H
         /* Metadata checksum */
         UINT32ENCODE(p, metadata_chksum);
 
-	/* Write the B-tree leaf node */
+        /* Write the B-tree leaf node */
         HDassert((size_t)(p - leaf->hdr->page) <= leaf->hdr->node_size);
-	if(H5F_block_write(f, H5FD_MEM_BTREE, addr, leaf->hdr->node_size, dxpl_id, leaf->hdr->page) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to save B-tree leaf node to disk")
+        if (H5F_block_write(f, H5FD_MEM_BTREE, addr, leaf->hdr->node_size, dxpl_id, leaf->hdr->page) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to save B-tree leaf node to disk")
 
-	leaf->cache_info.is_dirty = FALSE;
+        leaf->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5B2__cache_leaf_dest(f, leaf) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree leaf node")
+    if (destroy)
+        if (H5B2__cache_leaf_dest(f, leaf) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree leaf node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2__cache_leaf_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_leaf_dest
  *
@@ -1024,7 +1017,7 @@ done:
 static herr_t
 H5B2__cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf)
 {
-    herr_t ret_value = SUCCEED;     /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1037,22 +1030,22 @@ H5B2__cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf)
     HDassert(!leaf->cache_info.free_file_space_on_destroy || H5F_addr_defined(leaf->cache_info.addr));
 
     /* Check for freeing file space for B-tree leaf node */
-    if(leaf->cache_info.free_file_space_on_destroy) {
+    if (leaf->cache_info.free_file_space_on_destroy) {
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, leaf->cache_info.addr, (hsize_t)leaf->hdr->node_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, leaf->cache_info.addr,
+                       (hsize_t)leaf->hdr->node_size) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free v2 B-tree leaf node")
     } /* end if */
 
     /* Destroy v2 b-tree leaf node */
-    if(H5B2_leaf_free(leaf) < 0)
+    if (H5B2_leaf_free(leaf) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree leaf node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__cache_leaf_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_leaf_clear
  *
@@ -1081,15 +1074,14 @@ H5B2__cache_leaf_clear(H5F_t *f, H5B2_leaf_t *leaf, hbool_t destroy)
     /* Reset the dirty flag.  */
     leaf->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5B2__cache_leaf_dest(f, leaf) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree leaf node")
+    if (destroy)
+        if (H5B2__cache_leaf_dest(f, leaf) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree leaf node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__cache_leaf_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2__cache_leaf_size
  *
@@ -1120,4 +1112,3 @@ H5B2__cache_leaf_size(const H5F_t H5_ATTR_UNUSED *f, const H5B2_leaf_t *leaf, si
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2__cache_leaf_size() */
-
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index 3c92390..9c1b380 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -26,51 +26,44 @@
 /* Module Setup */
 /****************/
 
-#define H5B2_PACKAGE		/*suppress error about including H5B2pkg  */
+#define H5B2_PACKAGE /*suppress error about including H5B2pkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5B2pkg.h"		/* v2 B-trees				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5B2pkg.h"     /* v2 B-trees				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_hdr_debug
  *
@@ -86,14 +79,14 @@
  */
 herr_t
 H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
-    const H5B2_class_t *type, haddr_t obj_addr)
+               const H5B2_class_t *type, haddr_t obj_addr)
 {
-    H5B2_hdr_t	*hdr = NULL;            /* B-tree header info */
-    void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
-    unsigned    u;                      /* Local index variable */
-    char        temp_str[128];          /* Temporary string, for formatting */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *        hdr     = NULL;      /* B-tree header info */
+    void *              dbg_ctx = NULL;      /* v2 B-tree debugging context */
+    unsigned            u;                   /* Local index variable */
+    char                temp_str[128];       /* Temporary string, for formatting */
+    H5B2_hdr_cache_ud_t cache_udata;         /* User-data for callback */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -108,22 +101,22 @@ H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     HDassert(fwidth >= 0);
     HDassert(type);
     HDassert((type->crt_dbg_ctx && type->dst_dbg_ctx) ||
-        (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
+             (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
 
     /* Check for debugging context callback available */
-    if(type->crt_dbg_ctx) {
+    if (type->crt_dbg_ctx) {
         /* Create debugging context */
-        if(NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
+        if (NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
     } /* end if */
 
     /*
      * Load the B-tree header.
      */
-    cache_udata.f = f;
+    cache_udata.f         = f;
     cache_udata.ctx_udata = dbg_ctx;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
+    if (NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
 
     /* Set file pointer for this B-tree operation */
     hdr->f = f;
@@ -134,58 +127,40 @@ H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth,
-	      "Tree type ID:", hdr->cls->name, (unsigned)hdr->cls->id);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of node:",
-	      hdr->node_size);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of raw (disk) record:",
-	      hdr->rrec_size);
+    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
+              (unsigned)hdr->cls->id);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of node:", hdr->node_size);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of raw (disk) record:", hdr->rrec_size);
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Dirty flag:",
-	      hdr->cache_info.is_dirty ? "True" : "False");
+              "Dirty flag:", hdr->cache_info.is_dirty ? "True" : "False");
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Depth:", hdr->depth);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Number of records in tree:", hdr->root.all_nrec);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Depth:",
-	      hdr->depth);
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Number of records in tree:",
-	      hdr->root.all_nrec);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of records in root node:",
-	      hdr->root.node_nrec);
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Address of root node:",
-	      hdr->root.addr);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Split percent:",
-	      hdr->split_percent);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Merge percent:",
-	      hdr->merge_percent);
+              "Number of records in root node:", hdr->root.node_nrec);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Address of root node:", hdr->root.addr);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Split percent:", hdr->split_percent);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Merge percent:", hdr->merge_percent);
 
     /* Print relevant node info */
     HDfprintf(stream, "%*sNode Info: (max_nrec/split_nrec/merge_nrec)\n", indent, "");
-    for(u = 0; u < (unsigned)(hdr->depth + 1); u++) {
+    for (u = 0; u < (unsigned)(hdr->depth + 1); u++) {
         HDsnprintf(temp_str, sizeof(temp_str), "Depth %u:", u);
-        HDfprintf(stream, "%*s%-*s (%u/%u/%u)\n", indent + 3, "", MAX(0, fwidth - 3),
-            temp_str,
-            hdr->node_info[u].max_nrec, hdr->node_info[u].split_nrec, hdr->node_info[u].merge_nrec);
+        HDfprintf(stream, "%*s%-*s (%u/%u/%u)\n", indent + 3, "", MAX(0, fwidth - 3), temp_str,
+                  hdr->node_info[u].max_nrec, hdr->node_info[u].split_nrec, hdr->node_info[u].merge_nrec);
     } /* end for */
 
 done:
-    if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
+    if (dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
-    if(hdr) {
+    if (hdr) {
         hdr->f = NULL;
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_hdr_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_int_debug
  *
@@ -201,15 +176,15 @@ done:
  */
 herr_t
 H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
-    const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, unsigned depth, haddr_t obj_addr)
+               const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, unsigned depth, haddr_t obj_addr)
 {
-    H5B2_hdr_t	*hdr = NULL;            /* B-tree header */
-    H5B2_internal_t	*internal = NULL;   /* B-tree internal node */
-    void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
-    unsigned	u;                      /* Local index variable */
-    char        temp_str[128];          /* Temporary string, for formatting */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
-    herr_t      ret_value=SUCCEED;      /* Return value */
+    H5B2_hdr_t *        hdr      = NULL;     /* B-tree header */
+    H5B2_internal_t *   internal = NULL;     /* B-tree internal node */
+    void *              dbg_ctx  = NULL;     /* v2 B-tree debugging context */
+    unsigned            u;                   /* Local index variable */
+    char                temp_str[128];       /* Temporary string, for formatting */
+    H5B2_hdr_cache_ud_t cache_udata;         /* User-data for callback */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -223,25 +198,26 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     HDassert(fwidth >= 0);
     HDassert(type);
     HDassert((type->crt_dbg_ctx && type->dst_dbg_ctx) ||
-        (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
+             (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
     HDassert(H5F_addr_defined(hdr_addr));
     HDassert(H5F_addr_defined(obj_addr));
     HDassert(nrec > 0);
 
     /* Check for debugging context callback available */
-    if(type->crt_dbg_ctx) {
+    if (type->crt_dbg_ctx) {
         /* Create debugging context */
-        if(NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
+        if (NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
     } /* end if */
 
     /*
      * Load the B-tree header.
      */
-    cache_udata.f = f;
+    cache_udata.f         = f;
     cache_udata.ctx_udata = dbg_ctx;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
+    if (NULL ==
+        (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
 
     /* Set file pointer for this B-tree operation */
     hdr->f = f;
@@ -249,11 +225,11 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Load the B-tree internal node
      */
-    if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, addr, nrec, depth, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node")
+    if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, addr, nrec, depth, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node")
 
     /* Print opening message */
-    if(internal->depth == 1)
+    if (internal->depth == 1)
         HDfprintf(stream, "%*sv2 B-tree Internal 'Leaf' Node...\n", indent, "");
     else
         HDfprintf(stream, "%*sv2 B-tree Internal 'Branch' Node...\n", indent, "");
@@ -261,63 +237,49 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth,
-	      "Tree type ID:", hdr->cls->name, (unsigned)hdr->cls->id);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of node:",
-	      hdr->node_size);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of raw (disk) record:",
-	      hdr->rrec_size);
+    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
+              (unsigned)hdr->cls->id);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of node:", hdr->node_size);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of raw (disk) record:", hdr->rrec_size);
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Dirty flag:",
-	      internal->cache_info.is_dirty ? "True" : "False");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of records in node:",
-	      internal->nrec);
+              "Dirty flag:", internal->cache_info.is_dirty ? "True" : "False");
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of records in node:", internal->nrec);
 
     /* Print all node pointers and records */
-    for(u = 0; u < internal->nrec; u++) {
+    for (u = 0; u < internal->nrec; u++) {
         /* Print node pointer */
         HDsnprintf(temp_str, sizeof(temp_str), "Node pointer #%u: (all/node/addr)", u);
-        HDfprintf(stream, "%*s%-*s (%Hu/%u/%a)\n", indent + 3, "", MAX(0, fwidth - 3),
-                  temp_str,
-                  internal->node_ptrs[u].all_nrec,
-                  internal->node_ptrs[u].node_nrec,
+        HDfprintf(stream, "%*s%-*s (%Hu/%u/%a)\n", indent + 3, "", MAX(0, fwidth - 3), temp_str,
+                  internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].node_nrec,
                   internal->node_ptrs[u].addr);
 
         /* Print record */
         HDsnprintf(temp_str, sizeof(temp_str), "Record #%u:", u);
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-                  temp_str);
+        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
         HDassert(H5B2_INT_NREC(internal, hdr, u));
-        (void)(type->debug)(stream, f, dxpl_id, indent + 6, MAX (0, fwidth-6),
-            H5B2_INT_NREC(internal, hdr, u), dbg_ctx);
+        (void)(type->debug)(stream, f, dxpl_id, indent + 6, MAX(0, fwidth - 6),
+                            H5B2_INT_NREC(internal, hdr, u), dbg_ctx);
     } /* end for */
 
     /* Print final node pointer */
     HDsnprintf(temp_str, sizeof(temp_str), "Node pointer #%u: (all/node/addr)", u);
-    HDfprintf(stream, "%*s%-*s (%Hu/%u/%a)\n", indent + 3, "", MAX(0, fwidth - 3),
-              temp_str,
-              internal->node_ptrs[u].all_nrec,
-              internal->node_ptrs[u].node_nrec,
-              internal->node_ptrs[u].addr);
+    HDfprintf(stream, "%*s%-*s (%Hu/%u/%a)\n", indent + 3, "", MAX(0, fwidth - 3), temp_str,
+              internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].node_nrec, internal->node_ptrs[u].addr);
 
 done:
-    if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
+    if (dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
-    if(hdr) {
+    if (hdr) {
         hdr->f = NULL;
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
     } /* end if */
-    if(internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, addr, internal, H5AC__NO_FLAGS_SET) < 0)
+    if (internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, addr, internal, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree internal node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_int_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_leaf_debug
  *
@@ -333,15 +295,15 @@ done:
  */
 herr_t
 H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
-    const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, haddr_t obj_addr)
+                const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, haddr_t obj_addr)
 {
-    H5B2_hdr_t	*hdr = NULL;            /* B-tree header */
-    H5B2_leaf_t	*leaf = NULL;           /* B-tree leaf node */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
-    void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
-    unsigned	u;                      /* Local index variable */
-    char        temp_str[128];          /* Temporary string, for formatting */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *        hdr  = NULL;         /* B-tree header */
+    H5B2_leaf_t *       leaf = NULL;         /* B-tree leaf node */
+    H5B2_hdr_cache_ud_t cache_udata;         /* User-data for callback */
+    void *              dbg_ctx = NULL;      /* v2 B-tree debugging context */
+    unsigned            u;                   /* Local index variable */
+    char                temp_str[128];       /* Temporary string, for formatting */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -355,25 +317,26 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     HDassert(fwidth >= 0);
     HDassert(type);
     HDassert((type->crt_dbg_ctx && type->dst_dbg_ctx) ||
-        (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
+             (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
     HDassert(H5F_addr_defined(hdr_addr));
     HDassert(H5F_addr_defined(obj_addr));
     HDassert(nrec > 0);
 
     /* Check for debugging context callback available */
-    if(type->crt_dbg_ctx) {
+    if (type->crt_dbg_ctx) {
         /* Create debugging context */
-        if(NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
+        if (NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
     } /* end if */
 
     /*
      * Load the B-tree header.
      */
-    cache_udata.f = f;
+    cache_udata.f         = f;
     cache_udata.ctx_udata = dbg_ctx;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree header")
+    if (NULL ==
+        (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree header")
 
     /* Set file pointer for this B-tree operation */
     hdr->f = f;
@@ -381,8 +344,8 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Load the B-tree leaf node
      */
-    if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, addr, nrec, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
+    if (NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, addr, nrec, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
     /* Print opening message */
     HDfprintf(stream, "%*sv2 B-tree Leaf Node...\n", indent, "");
@@ -390,43 +353,34 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth,
-	      "Tree type ID:", hdr->cls->name, (unsigned)hdr->cls->id);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of node:",
-	      hdr->node_size);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of raw (disk) record:",
-	      hdr->rrec_size);
+    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
+              (unsigned)hdr->cls->id);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of node:", hdr->node_size);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of raw (disk) record:", hdr->rrec_size);
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Dirty flag:",
-	      leaf->cache_info.is_dirty ? "True" : "False");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of records in node:",
-	      leaf->nrec);
+              "Dirty flag:", leaf->cache_info.is_dirty ? "True" : "False");
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of records in node:", leaf->nrec);
 
     /* Print all node pointers and records */
-    for(u = 0; u < leaf->nrec; u++) {
+    for (u = 0; u < leaf->nrec; u++) {
         /* Print record */
         HDsnprintf(temp_str, sizeof(temp_str), "Record #%u:", u);
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-                  temp_str);
+        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
         HDassert(H5B2_LEAF_NREC(leaf, hdr, u));
-        (void)(type->debug)(stream, f, dxpl_id, indent + 6, MAX (0, fwidth-6),
-            H5B2_LEAF_NREC(leaf, hdr, u), dbg_ctx);
+        (void)(type->debug)(stream, f, dxpl_id, indent + 6, MAX(0, fwidth - 6), H5B2_LEAF_NREC(leaf, hdr, u),
+                            dbg_ctx);
     } /* end for */
 
 done:
-    if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
+    if (dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
-    if(hdr) {
+    if (hdr) {
         hdr->f = NULL;
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
     } /* end if */
-    if(leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+    if (leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, addr, leaf, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree leaf node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_leaf_debug() */
-
diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c
index d45c2cb..af457cd 100644
--- a/src/H5B2hdr.c
+++ b/src/H5B2hdr.c
@@ -26,24 +26,23 @@
 /* Module Setup */
 /****************/
 
-#define H5B2_PACKAGE		/*suppress error about including H5B2pkg  */
+#define H5B2_PACKAGE /*suppress error about including H5B2pkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5B2pkg.h"		/* v2 B-trees				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5B2pkg.h"     /* v2 B-trees				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Number of records that fit into leaf node */
-#define H5B2_NUM_LEAF_REC(n, r) \
-    (((n) - H5B2_LEAF_PREFIX_SIZE) / (r))
+#define H5B2_NUM_LEAF_REC(n, r) (((n)-H5B2_LEAF_PREFIX_SIZE) / (r))
 
 /* Uncomment this macro to enable extra sanity checking */
 /* #define H5B2_DEBUG */
@@ -52,27 +51,22 @@
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -89,8 +83,6 @@ H5FL_SEQ_DEFINE_STATIC(size_t);
 /* Declare a free list to manage the 'H5B2_node_info_t' sequence information */
 H5FL_SEQ_DEFINE(H5B2_node_info_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_hdr_init
  *
@@ -105,13 +97,12 @@ H5FL_SEQ_DEFINE(H5B2_node_info_t);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata,
-    uint16_t depth)
+H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata, uint16_t depth)
 {
-    size_t sz_max_nrec;                 /* Temporary variable for range checking */
-    unsigned u_max_nrec_size;           /* Temporary variable for range checking */
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t   sz_max_nrec;         /* Temporary variable for range checking */
+    unsigned u_max_nrec_size;     /* Temporary variable for range checking */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -122,7 +113,7 @@ H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata,
     HDassert(cparam);
     HDassert(cparam->cls);
     HDassert((cparam->cls->crt_context && cparam->cls->dst_context) ||
-        (NULL == cparam->cls->crt_context && NULL == cparam->cls->dst_context));
+             (NULL == cparam->cls->crt_context && NULL == cparam->cls->dst_context));
     HDassert(cparam->node_size > 0);
     HDassert(cparam->rrec_size > 0);
     HDassert(cparam->merge_percent > 0 && cparam->merge_percent <= 100);
@@ -130,7 +121,7 @@ H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata,
     HDassert(cparam->merge_percent < (cparam->split_percent / 2));
 
     /* Initialize basic information */
-    hdr->rc = 0;
+    hdr->rc             = 0;
     hdr->pending_delete = FALSE;
 
     /* Assign dynamic information */
@@ -139,42 +130,43 @@ H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata,
     /* Assign user's information */
     hdr->split_percent = cparam->split_percent;
     hdr->merge_percent = cparam->merge_percent;
-    hdr->node_size = cparam->node_size;
-    hdr->rrec_size = cparam->rrec_size;
+    hdr->node_size     = cparam->node_size;
+    hdr->rrec_size     = cparam->rrec_size;
 
     /* Assign common type information */
     hdr->cls = cparam->cls;
 
     /* Allocate "page" for node I/O */
-    if(NULL == (hdr->page = H5FL_BLK_MALLOC(node_page, hdr->node_size)))
+    if (NULL == (hdr->page = H5FL_BLK_MALLOC(node_page, hdr->node_size)))
         HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, FAIL, "memory allocation failed")
 #ifdef H5_CLEAR_MEMORY
-HDmemset(hdr->page, 0, hdr->node_size);
+    HDmemset(hdr->page, 0, hdr->node_size);
 #endif /* H5_CLEAR_MEMORY */
 
     /* Allocate array of node info structs */
-    if(NULL == (hdr->node_info = H5FL_SEQ_MALLOC(H5B2_node_info_t, (size_t)(hdr->depth + 1))))
+    if (NULL == (hdr->node_info = H5FL_SEQ_MALLOC(H5B2_node_info_t, (size_t)(hdr->depth + 1))))
         HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize leaf node info */
     sz_max_nrec = H5B2_NUM_LEAF_REC(hdr->node_size, hdr->rrec_size);
     H5_CHECKED_ASSIGN(hdr->node_info[0].max_nrec, unsigned, sz_max_nrec, size_t)
-    hdr->node_info[0].split_nrec = (hdr->node_info[0].max_nrec * hdr->split_percent) / 100;
-    hdr->node_info[0].merge_nrec = (hdr->node_info[0].max_nrec * hdr->merge_percent) / 100;
-    hdr->node_info[0].cum_max_nrec = hdr->node_info[0].max_nrec;
+    hdr->node_info[0].split_nrec        = (hdr->node_info[0].max_nrec * hdr->split_percent) / 100;
+    hdr->node_info[0].merge_nrec        = (hdr->node_info[0].max_nrec * hdr->merge_percent) / 100;
+    hdr->node_info[0].cum_max_nrec      = hdr->node_info[0].max_nrec;
     hdr->node_info[0].cum_max_nrec_size = 0;
-    if(NULL == (hdr->node_info[0].nat_rec_fac = H5FL_fac_init(hdr->cls->nrec_size * hdr->node_info[0].max_nrec)))
+    if (NULL ==
+        (hdr->node_info[0].nat_rec_fac = H5FL_fac_init(hdr->cls->nrec_size * hdr->node_info[0].max_nrec)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't create node native key block factory")
     hdr->node_info[0].node_ptr_fac = NULL;
 
     /* Allocate array of pointers to internal node native keys */
     /* (uses leaf # of records because its the largest) */
-    if(NULL == (hdr->nat_off = H5FL_SEQ_MALLOC(size_t, (size_t)hdr->node_info[0].max_nrec)))
+    if (NULL == (hdr->nat_off = H5FL_SEQ_MALLOC(size_t, (size_t)hdr->node_info[0].max_nrec)))
         HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize offsets in native key block */
     /* (uses leaf # of records because its the largest) */
-    for(u = 0; u < hdr->node_info[0].max_nrec; u++)
+    for (u = 0; u < hdr->node_info[0].max_nrec; u++)
         hdr->nat_off[u] = hdr->cls->nrec_size * u;
 
     /* Compute size to store # of records in each node */
@@ -184,8 +176,8 @@ HDmemset(hdr->page, 0, hdr->node_size);
     HDassert(hdr->max_nrec_size <= H5B2_SIZEOF_RECORDS_PER_NODE);
 
     /* Initialize internal node info */
-    if(depth > 0) {
-        for(u = 1; u < (unsigned)(depth + 1); u++) {
+    if (depth > 0) {
+        for (u = 1; u < (unsigned)(depth + 1); u++) {
             sz_max_nrec = H5B2_NUM_INT_REC(hdr, u);
             H5_CHECKED_ASSIGN(hdr->node_info[u].max_nrec, unsigned, sz_max_nrec, size_t)
             HDassert(hdr->node_info[u].max_nrec <= hdr->node_info[u - 1].max_nrec);
@@ -193,33 +185,36 @@ HDmemset(hdr->page, 0, hdr->node_size);
             hdr->node_info[u].split_nrec = (hdr->node_info[u].max_nrec * hdr->split_percent) / 100;
             hdr->node_info[u].merge_nrec = (hdr->node_info[u].max_nrec * hdr->merge_percent) / 100;
 
-            hdr->node_info[u].cum_max_nrec = ((hdr->node_info[u].max_nrec + 1) *
-                hdr->node_info[u - 1].cum_max_nrec) + hdr->node_info[u].max_nrec;
+            hdr->node_info[u].cum_max_nrec =
+                ((hdr->node_info[u].max_nrec + 1) * hdr->node_info[u - 1].cum_max_nrec) +
+                hdr->node_info[u].max_nrec;
             u_max_nrec_size = H5VM_limit_enc_size((uint64_t)hdr->node_info[u].cum_max_nrec);
             H5_CHECKED_ASSIGN(hdr->node_info[u].cum_max_nrec_size, uint8_t, u_max_nrec_size, unsigned)
 
-            if(NULL == (hdr->node_info[u].nat_rec_fac = H5FL_fac_init(hdr->cls->nrec_size * hdr->node_info[u].max_nrec)))
+            if (NULL == (hdr->node_info[u].nat_rec_fac =
+                             H5FL_fac_init(hdr->cls->nrec_size * hdr->node_info[u].max_nrec)))
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't create node native key block factory")
-            if(NULL == (hdr->node_info[u].node_ptr_fac = H5FL_fac_init(sizeof(H5B2_node_ptr_t) * (hdr->node_info[u].max_nrec + 1))))
-                HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't create internal 'branch' node node pointer block factory")
+            if (NULL == (hdr->node_info[u].node_ptr_fac =
+                             H5FL_fac_init(sizeof(H5B2_node_ptr_t) * (hdr->node_info[u].max_nrec + 1))))
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL,
+                            "can't create internal 'branch' node node pointer block factory")
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Create the callback context, if the callback exists */
-    if(hdr->cls->crt_context) {
-        if(NULL == (hdr->cb_ctx = (*hdr->cls->crt_context)(ctx_udata)))
+    if (hdr->cls->crt_context) {
+        if (NULL == (hdr->cb_ctx = (*hdr->cls->crt_context)(ctx_udata)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCREATE, FAIL, "unable to create v2 B-tree client callback context")
     } /* end if */
 
 done:
-    if(ret_value < 0)
-        if(H5B2_hdr_free(hdr) < 0)
+    if (ret_value < 0)
+        if (H5B2_hdr_free(hdr) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free shared v2 B-tree info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_hdr_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_hdr_alloc
  *
@@ -236,8 +231,8 @@ done:
 H5B2_hdr_t *
 H5B2_hdr_alloc(H5F_t *f)
 {
-    H5B2_hdr_t *hdr = NULL;             /* v2 B-tree header */
-    H5B2_hdr_t *ret_value;              /* Return value */
+    H5B2_hdr_t *hdr = NULL; /* v2 B-tree header */
+    H5B2_hdr_t *ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -247,15 +242,15 @@ H5B2_hdr_alloc(H5F_t *f)
     HDassert(f);
 
     /* Allocate space for the shared information */
-    if(NULL == (hdr = H5FL_CALLOC(H5B2_hdr_t)))
+    if (NULL == (hdr = H5FL_CALLOC(H5B2_hdr_t)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree header")
 
     /* Assign non-zero information */
-    hdr->f = f;
+    hdr->f           = f;
     hdr->sizeof_addr = H5F_SIZEOF_ADDR(f);
     hdr->sizeof_size = H5F_SIZEOF_SIZE(f);
-    hdr->hdr_size = H5B2_HEADER_SIZE(hdr);
-    hdr->root.addr = HADDR_UNDEF;
+    hdr->hdr_size    = H5B2_HEADER_SIZE(hdr);
+    hdr->root.addr   = HADDR_UNDEF;
 
     /* Set return value */
     ret_value = hdr;
@@ -265,7 +260,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_hdr_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_create
  *
@@ -280,11 +274,10 @@ done:
  *-------------------------------------------------------------------------
  */
 haddr_t
-H5B2_hdr_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam,
-    void *ctx_udata)
+H5B2_hdr_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udata)
 {
-    H5B2_hdr_t *hdr = NULL;     /* The new v2 B-tree header information */
-    haddr_t ret_value;          /* Return value */
+    H5B2_hdr_t *hdr = NULL; /* The new v2 B-tree header information */
+    haddr_t     ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -295,33 +288,32 @@ H5B2_hdr_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam,
     HDassert(cparam);
 
     /* Allocate v2 B-tree header */
-    if(NULL == (hdr = H5B2_hdr_alloc(f)))
+    if (NULL == (hdr = H5B2_hdr_alloc(f)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, HADDR_UNDEF, "allocation failed for B-tree header")
 
     /* Initialize shared B-tree info */
-    if(H5B2_hdr_init(hdr, cparam, ctx_udata, (uint16_t)0) < 0)
+    if (H5B2_hdr_init(hdr, cparam, ctx_udata, (uint16_t)0) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, HADDR_UNDEF, "can't create shared B-tree info")
 
     /* Allocate space for the header on disk */
-    if(HADDR_UNDEF == (hdr->addr = H5MF_alloc(f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)hdr->hdr_size)))
+    if (HADDR_UNDEF == (hdr->addr = H5MF_alloc(f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)hdr->hdr_size)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, HADDR_UNDEF, "file allocation failed for B-tree header")
 
     /* Cache the new B-tree node */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, HADDR_UNDEF, "can't add B-tree header to cache")
 
     /* Set address of v2 B-tree header to return */
     ret_value = hdr->addr;
 
 done:
-    if(!H5F_addr_defined(ret_value) && hdr)
-        if(H5B2_hdr_free(hdr) < 0)
+    if (!H5F_addr_defined(ret_value) && hdr)
+        if (H5B2_hdr_free(hdr) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, HADDR_UNDEF, "unable to release v2 B-tree header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_hdr_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_hdr_incr
  *
@@ -338,7 +330,7 @@ done:
 herr_t
 H5B2_hdr_incr(H5B2_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -346,8 +338,8 @@ H5B2_hdr_incr(H5B2_hdr_t *hdr)
     HDassert(hdr);
 
     /* Mark header as un-evictable when a B-tree node is depending on it */
-    if(hdr->rc == 0)
-        if(H5AC_pin_protected_entry(hdr) < 0)
+    if (hdr->rc == 0)
+        if (H5AC_pin_protected_entry(hdr) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPIN, FAIL, "unable to pin v2 B-tree header")
 
     /* Increment reference count on B-tree header */
@@ -357,7 +349,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_incr_hdr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_hdr_decr
  *
@@ -374,7 +365,7 @@ done:
 herr_t
 H5B2_hdr_decr(H5B2_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -386,15 +377,14 @@ H5B2_hdr_decr(H5B2_hdr_t *hdr)
     hdr->rc--;
 
     /* Mark header as evictable again when no nodes depend on it */
-    if(hdr->rc == 0)
-        if(H5AC_unpin_entry(hdr) < 0)
+    if (hdr->rc == 0)
+        if (H5AC_unpin_entry(hdr) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPIN, FAIL, "unable to unpin v2 B-tree header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_hdr_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B2_hdr_fuse_incr
  *
@@ -422,7 +412,6 @@ H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5B2_hdr_fuse_incr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B2_hdr_fuse_decr
  *
@@ -451,7 +440,6 @@ H5B2_hdr_fuse_decr(H5B2_hdr_t *hdr)
     FUNC_LEAVE_NOAPI(hdr->file_rc)
 } /* end H5B2_hdr_fuse_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_hdr_dirty
  *
@@ -468,7 +456,7 @@ H5B2_hdr_fuse_decr(H5B2_hdr_t *hdr)
 herr_t
 H5B2_hdr_dirty(H5B2_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -476,14 +464,13 @@ H5B2_hdr_dirty(H5B2_hdr_t *hdr)
     HDassert(hdr);
 
     /* Mark B-tree header as dirty in cache */
-    if(H5AC_mark_entry_dirty(hdr) < 0)
+    if (H5AC_mark_entry_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTMARKDIRTY, FAIL, "unable to mark v2 B-tree header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_hdr_dirty() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_hdr_free
  *
@@ -500,7 +487,7 @@ done:
 herr_t
 H5B2_hdr_free(H5B2_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -508,32 +495,34 @@ H5B2_hdr_free(H5B2_hdr_t *hdr)
     HDassert(hdr);
 
     /* Destroy the callback context */
-    if(hdr->cb_ctx) {
-        if((*hdr->cls->dst_context)(hdr->cb_ctx) < 0)
+    if (hdr->cb_ctx) {
+        if ((*hdr->cls->dst_context)(hdr->cb_ctx) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "can't destroy v2 B-tree client callback context")
         hdr->cb_ctx = NULL;
     } /* end if */
 
     /* Free the B-tree node buffer */
-    if(hdr->page)
+    if (hdr->page)
         hdr->page = H5FL_BLK_FREE(node_page, hdr->page);
 
     /* Free the array of offsets into the native key block */
-    if(hdr->nat_off)
+    if (hdr->nat_off)
         hdr->nat_off = H5FL_SEQ_FREE(size_t, hdr->nat_off);
 
     /* Release the node info */
-    if(hdr->node_info) {
-        unsigned u;             /* Local index variable */
+    if (hdr->node_info) {
+        unsigned u; /* Local index variable */
 
         /* Destroy free list factories */
-        for(u = 0; u < (unsigned)(hdr->depth + 1); u++) {
-            if(hdr->node_info[u].nat_rec_fac)
-                if(H5FL_fac_term(hdr->node_info[u].nat_rec_fac) < 0)
-                    HGOTO_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "can't destroy node's native record block factory")
-            if(hdr->node_info[u].node_ptr_fac)
-                if(H5FL_fac_term(hdr->node_info[u].node_ptr_fac) < 0)
-                    HGOTO_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "can't destroy node's node pointer block factory")
+        for (u = 0; u < (unsigned)(hdr->depth + 1); u++) {
+            if (hdr->node_info[u].nat_rec_fac)
+                if (H5FL_fac_term(hdr->node_info[u].nat_rec_fac) < 0)
+                    HGOTO_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL,
+                                "can't destroy node's native record block factory")
+            if (hdr->node_info[u].node_ptr_fac)
+                if (H5FL_fac_term(hdr->node_info[u].node_ptr_fac) < 0)
+                    HGOTO_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL,
+                                "can't destroy node's node pointer block factory")
         } /* end for */
 
         /* Free the array of node info structs */
@@ -541,13 +530,13 @@ H5B2_hdr_free(H5B2_hdr_t *hdr)
     } /* end if */
 
     /* Release the min & max record info, if set */
-    if(hdr->min_native_rec) {
-	HDfree(hdr->min_native_rec);
-	hdr->min_native_rec = NULL;
+    if (hdr->min_native_rec) {
+        HDfree(hdr->min_native_rec);
+        hdr->min_native_rec = NULL;
     } /* end if */
-    if(hdr->max_native_rec) {
-	HDfree(hdr->max_native_rec);
-	hdr->max_native_rec = NULL;
+    if (hdr->max_native_rec) {
+        HDfree(hdr->max_native_rec);
+        hdr->max_native_rec = NULL;
     } /* end if */
 
     /* Free B-tree header info */
@@ -557,7 +546,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_hdr_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_hdr_delete
  *
@@ -574,8 +562,8 @@ done:
 herr_t
 H5B2_hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id)
 {
-    unsigned cache_flags = H5AC__NO_FLAGS_SET;  /* Flags for unprotecting v2 B-tree header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting v2 B-tree header */
+    herr_t   ret_value   = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -583,22 +571,23 @@ H5B2_hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id)
     HDassert(hdr);
 
 #ifndef NDEBUG
-{
-    unsigned hdr_status = 0;         /* v2 B-tree header's status in the metadata cache */
-
-    /* Check the v2 B-tree header's status in the metadata cache */
-    if(H5AC_get_entry_status(hdr->f, hdr->addr, &hdr_status) < 0)
-        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to check metadata cache status for v2 B-tree header")
-
-    /* Sanity checks on v2 B-tree header */
-    HDassert(hdr_status & H5AC_ES__IN_CACHE);
-    HDassert(hdr_status & H5AC_ES__IS_PROTECTED);
-} /* end block */
+    {
+        unsigned hdr_status = 0; /* v2 B-tree header's status in the metadata cache */
+
+        /* Check the v2 B-tree header's status in the metadata cache */
+        if (H5AC_get_entry_status(hdr->f, hdr->addr, &hdr_status) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL,
+                        "unable to check metadata cache status for v2 B-tree header")
+
+        /* Sanity checks on v2 B-tree header */
+        HDassert(hdr_status & H5AC_ES__IN_CACHE);
+        HDassert(hdr_status & H5AC_ES__IS_PROTECTED);
+    }  /* end block */
 #endif /* NDEBUG */
 
     /* Delete all nodes in B-tree */
-    if(H5F_addr_defined(hdr->root.addr))
-        if(H5B2_delete_node(hdr, dxpl_id, hdr->depth, &hdr->root, hdr->remove_op, hdr->remove_op_data) < 0)
+    if (H5F_addr_defined(hdr->root.addr))
+        if (H5B2_delete_node(hdr, dxpl_id, hdr->depth, &hdr->root, hdr->remove_op, hdr->remove_op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to delete B-tree nodes")
 
     /* Indicate that the heap header should be deleted & file space freed */
@@ -606,9 +595,8 @@ H5B2_hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id)
 
 done:
     /* Unprotect the header with appropriate flags */
-    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, cache_flags) < 0)
+    if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, cache_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_hdr_delete() */
-
diff --git a/src/H5B2int.c b/src/H5B2int.c
index 518a41f..73db537 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -26,16 +26,16 @@
 /* Module Setup */
 /****************/
 
-#define H5B2_PACKAGE		/*suppress error about including H5B2pkg  */
+#define H5B2_PACKAGE /*suppress error about including H5B2pkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5B2pkg.h"		/* v2 B-trees				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5B2pkg.h"     /* v2 B-trees				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
@@ -48,40 +48,38 @@
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Helper functions */
-static herr_t H5B2_create_internal(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    H5B2_node_ptr_t *node_ptr, unsigned depth);
-static herr_t H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_node_ptr_t *curr_node_ptr, unsigned *parent_cache_info_flags_ptr,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx);
-static herr_t H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_internal_t *internal, unsigned idx);
-static herr_t H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx);
-static herr_t H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_node_ptr_t *curr_node_ptr, unsigned *parent_cache_info_flags_ptr,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx);
-static herr_t H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_node_ptr_t *curr_node_ptr, unsigned *parent_cache_info_flags_ptr,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx);
-static herr_t H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr,
-    unsigned idx, void *swap_loc);
+static herr_t H5B2_create_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr, unsigned depth);
+static herr_t H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ptr,
+                          unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal,
+                          unsigned *internal_flags_ptr, unsigned idx);
+static herr_t H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal_t *internal,
+                                 unsigned idx);
+static herr_t H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal_t *internal,
+                                 unsigned *internal_flags_ptr, unsigned idx);
+static herr_t H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ptr,
+                          unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal,
+                          unsigned *internal_flags_ptr, unsigned idx);
+static herr_t H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ptr,
+                          unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal,
+                          unsigned *internal_flags_ptr, unsigned idx);
+static herr_t H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal_t *internal,
+                             unsigned *internal_flags_ptr, unsigned idx, void *swap_loc);
 #ifdef H5B2_DEBUG
 static herr_t H5B2_assert_leaf(const H5B2_hdr_t *hdr, const H5B2_leaf_t *leaf);
 static herr_t H5B2_assert_leaf2(const H5B2_hdr_t *hdr, const H5B2_leaf_t *leaf, const H5B2_leaf_t *leaf2);
-static herr_t H5B2_assert_internal(hsize_t parent_all_nrec, const H5B2_hdr_t *hdr, const H5B2_internal_t *internal);
-static herr_t H5B2_assert_internal2(hsize_t parent_all_nrec, const H5B2_hdr_t *hdr, const H5B2_internal_t *internal, const H5B2_internal_t *internal2);
+static herr_t H5B2_assert_internal(hsize_t parent_all_nrec, const H5B2_hdr_t *hdr,
+                                   const H5B2_internal_t *internal);
+static herr_t H5B2_assert_internal2(hsize_t parent_all_nrec, const H5B2_hdr_t *hdr,
+                                    const H5B2_internal_t *internal, const H5B2_internal_t *internal2);
 #endif /* H5B2_DEBUG */
 
 /*********************/
@@ -94,12 +92,10 @@ H5FL_DEFINE(H5B2_internal_t);
 /* Declare a free list to manage the H5B2_leaf_t struct */
 H5FL_DEFINE(H5B2_leaf_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -107,8 +103,6 @@ H5FL_DEFINE(H5B2_leaf_t);
 /* Declare a free list to manage the 'H5B2_node_info_t' sequence information */
 H5FL_SEQ_EXTERN(H5B2_node_info_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_locate_record
  *
@@ -131,26 +125,26 @@ H5FL_SEQ_EXTERN(H5B2_node_info_t);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_locate_record(const H5B2_class_t *type, unsigned nrec, size_t *rec_off,
-                    const uint8_t *native, const void *udata, unsigned *idx, int *cmp)
+H5B2_locate_record(const H5B2_class_t *type, unsigned nrec, size_t *rec_off, const uint8_t *native,
+                   const void *udata, unsigned *idx, int *cmp)
 {
-    unsigned	lo = 0, hi;     /* Low & high index values */
-    unsigned    my_idx = 0;     /* Final index value */
-    herr_t      ret_value = SUCCEED;
+    unsigned lo        = 0, hi; /* Low & high index values */
+    unsigned my_idx    = 0;     /* Final index value */
+    herr_t   ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     *cmp = -1;
 
     hi = nrec;
-    while(lo < hi && *cmp) {
-	my_idx = (lo + hi) / 2;
-	if((type->compare)(udata, native + rec_off[my_idx], cmp) < 0)
+    while (lo < hi && *cmp) {
+        my_idx = (lo + hi) / 2;
+        if ((type->compare)(udata, native + rec_off[my_idx], cmp) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-	if(*cmp < 0)
-	    hi = my_idx;
-	else
-	    lo = my_idx + 1;
+        if (*cmp < 0)
+            hi = my_idx;
+        else
+            lo = my_idx + 1;
     }
 
     *idx = my_idx;
@@ -159,7 +153,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_locate_record */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_split1
  *
@@ -175,20 +168,22 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_node_ptr_t *curr_node_ptr, unsigned *parent_cache_info_flags_ptr,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx)
+H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ptr,
+            unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal, unsigned *internal_flags_ptr,
+            unsigned idx)
 {
-    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
-    haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
-    void *left_child = NULL, *right_child = NULL;     /* Pointers to child nodes */
-    uint16_t *left_nrec, *right_nrec;   /* Pointers to child # of records */
-    uint8_t *left_native, *right_native;/* Pointers to childs' native records */
-    H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL;/* Pointers to childs' node pointer info */
-    uint16_t mid_record;                /* Index of "middle" record in current node */
-    uint16_t old_node_nrec;             /* Number of records in internal node split */
-    unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET;     /* Flags for unprotecting child nodes */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5AC_class_t *child_class;                            /* Pointer to child node's class info */
+    haddr_t             left_addr, right_addr;                  /* Addresses of left & right child nodes */
+    void *              left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
+    uint16_t *          left_nrec, *right_nrec;                 /* Pointers to child # of records */
+    uint8_t *           left_native, *right_native;             /* Pointers to childs' native records */
+    H5B2_node_ptr_t *   left_node_ptrs = NULL,
+                    *right_node_ptrs   = NULL; /* Pointers to childs' node pointer info */
+    uint16_t mid_record;                       /* Index of "middle" record in current node */
+    uint16_t old_node_nrec;                    /* Number of records in internal node split */
+    unsigned left_child_flags  = H5AC__NO_FLAGS_SET,
+             right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
+    herr_t ret_value           = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -198,66 +193,74 @@ H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(internal_flags_ptr);
 
     /* Slide records in parent node up one space, to make room for promoted record */
-    if(idx < internal->nrec) {
-        HDmemmove(H5B2_INT_NREC(internal, hdr, idx + 1), H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size * (internal->nrec - idx));
-        HDmemmove(&(internal->node_ptrs[idx + 2]), &(internal->node_ptrs[idx + 1]), sizeof(H5B2_node_ptr_t) * (internal->nrec - idx));
+    if (idx < internal->nrec) {
+        HDmemmove(H5B2_INT_NREC(internal, hdr, idx + 1), H5B2_INT_NREC(internal, hdr, idx),
+                  hdr->cls->nrec_size * (internal->nrec - idx));
+        HDmemmove(&(internal->node_ptrs[idx + 2]), &(internal->node_ptrs[idx + 1]),
+                  sizeof(H5B2_node_ptr_t) * (internal->nrec - idx));
     } /* end if */
 
     /* Check for the kind of B-tree node to split */
-    if(depth > 1) {
-        H5B2_internal_t *left_int = NULL, *right_int = NULL;       /* Pointers to old & new internal nodes */
+    if (depth > 1) {
+        H5B2_internal_t *left_int = NULL, *right_int = NULL; /* Pointers to old & new internal nodes */
 
         /* Create new internal node */
         internal->node_ptrs[idx + 1].all_nrec = internal->node_ptrs[idx + 1].node_nrec = 0;
-        if(H5B2_create_internal(hdr, dxpl_id, &(internal->node_ptrs[idx + 1]), (depth - 1)) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new internal node")
+        if (H5B2_create_internal(hdr, dxpl_id, &(internal->node_ptrs[idx + 1]), (depth - 1)) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new internal node")
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_INT;
-        left_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        left_addr   = internal->node_ptrs[idx].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Protect both leaves */
-        if(NULL == (left_int = H5B2_protect_internal(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL ==
+            (left_int = H5B2_protect_internal(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec,
+                                              (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
-        if(NULL == (right_int = H5B2_protect_internal(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (right_int = H5B2_protect_internal(hdr, dxpl_id, right_addr,
+                                                       internal->node_ptrs[idx + 1].node_nrec, (depth - 1),
+                                                       H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
         /* More setup for child nodes */
-        left_child = left_int;
-        right_child = right_int;
-        left_nrec = &(left_int->nrec);
-        right_nrec = &(right_int->nrec);
-        left_native = left_int->int_native;
-        right_native = right_int->int_native;
-        left_node_ptrs = left_int->node_ptrs;
+        left_child      = left_int;
+        right_child     = right_int;
+        left_nrec       = &(left_int->nrec);
+        right_nrec      = &(right_int->nrec);
+        left_native     = left_int->int_native;
+        right_native    = right_int->int_native;
+        left_node_ptrs  = left_int->node_ptrs;
         right_node_ptrs = right_int->node_ptrs;
     } /* end if */
     else {
-        H5B2_leaf_t *left_leaf = NULL, *right_leaf = NULL;       /* Pointers to old & new leaf nodes */
+        H5B2_leaf_t *left_leaf = NULL, *right_leaf = NULL; /* Pointers to old & new leaf nodes */
 
         /* Create new leaf node */
         internal->node_ptrs[idx + 1].all_nrec = internal->node_ptrs[idx + 1].node_nrec = 0;
-        if(H5B2_create_leaf(hdr, dxpl_id, &(internal->node_ptrs[idx + 1])) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new leaf node")
+        if (H5B2_create_leaf(hdr, dxpl_id, &(internal->node_ptrs[idx + 1])) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new leaf node")
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_LEAF;
-        left_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        left_addr   = internal->node_ptrs[idx].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Protect both leaves */
-        if(NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
+        if (NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr,
+                                                   internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
-        if(NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
+        if (NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr,
+                                                    internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* More setup for child nodes */
-        left_child = left_leaf;
-        right_child = right_leaf;
-        left_nrec = &(left_leaf->nrec);
-        right_nrec = &(right_leaf->nrec);
-        left_native = left_leaf->leaf_native;
+        left_child   = left_leaf;
+        right_child  = right_leaf;
+        left_nrec    = &(left_leaf->nrec);
+        right_nrec   = &(right_leaf->nrec);
+        left_native  = left_leaf->leaf_native;
         right_native = right_leaf->leaf_native;
     } /* end if */
 
@@ -268,17 +271,17 @@ H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     mid_record = (uint16_t)(old_node_nrec / 2);
 
     /* Copy "upper half" of records to new child */
-    HDmemcpy(H5B2_NAT_NREC(right_native, hdr, 0),
-            H5B2_NAT_NREC(left_native, hdr, mid_record + (unsigned)1),
-            hdr->cls->nrec_size * (old_node_nrec - (mid_record + (unsigned)1)));
+    HDmemcpy(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(left_native, hdr, mid_record + (unsigned)1),
+             hdr->cls->nrec_size * (old_node_nrec - (mid_record + (unsigned)1)));
 
     /* Copy "upper half" of node pointers, if the node is an internal node */
-    if(depth > 1)
+    if (depth > 1)
         HDmemcpy(&(right_node_ptrs[0]), &(left_node_ptrs[mid_record + (unsigned)1]),
-                sizeof(H5B2_node_ptr_t) * (size_t)(old_node_nrec - mid_record));
+                 sizeof(H5B2_node_ptr_t) * (size_t)(old_node_nrec - mid_record));
 
     /* Copy "middle" record to internal node */
-    HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(left_native, hdr, mid_record), hdr->cls->nrec_size);
+    HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(left_native, hdr, mid_record),
+             hdr->cls->nrec_size);
 
     /* Mark nodes as dirty */
     left_child_flags |= H5AC__DIRTIED_FLAG;
@@ -289,25 +292,25 @@ H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     internal->node_ptrs[idx + 1].node_nrec = *right_nrec = (uint16_t)(old_node_nrec - (mid_record + 1));
 
     /* Determine total number of records in new child nodes */
-    if(depth > 1) {
-        unsigned u;             /* Local index variable */
-        hsize_t new_left_all_nrec;     /* New total number of records in left child */
-        hsize_t new_right_all_nrec;    /* New total number of records in right child */
+    if (depth > 1) {
+        unsigned u;                  /* Local index variable */
+        hsize_t  new_left_all_nrec;  /* New total number of records in left child */
+        hsize_t  new_right_all_nrec; /* New total number of records in right child */
 
         /* Compute total of all records in each child node */
         new_left_all_nrec = internal->node_ptrs[idx].node_nrec;
-        for(u = 0; u < (*left_nrec + (unsigned)1); u++)
+        for (u = 0; u < (*left_nrec + (unsigned)1); u++)
             new_left_all_nrec += left_node_ptrs[u].all_nrec;
 
         new_right_all_nrec = internal->node_ptrs[idx + 1].node_nrec;
-        for(u = 0; u < (*right_nrec + (unsigned)1); u++)
+        for (u = 0; u < (*right_nrec + (unsigned)1); u++)
             new_right_all_nrec += right_node_ptrs[u].all_nrec;
 
-        internal->node_ptrs[idx].all_nrec = new_left_all_nrec;
+        internal->node_ptrs[idx].all_nrec     = new_left_all_nrec;
         internal->node_ptrs[idx + 1].all_nrec = new_right_all_nrec;
     } /* end if */
     else {
-        internal->node_ptrs[idx].all_nrec = internal->node_ptrs[idx].node_nrec;
+        internal->node_ptrs[idx].all_nrec     = internal->node_ptrs[idx].node_nrec;
         internal->node_ptrs[idx + 1].all_nrec = internal->node_ptrs[idx + 1].node_nrec;
     } /* end else */
 
@@ -321,32 +324,35 @@ H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     curr_node_ptr->node_nrec++;
 
     /* Mark grandparent as dirty, if given */
-    if(parent_cache_info_flags_ptr)
+    if (parent_cache_info_flags_ptr)
         *parent_cache_info_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0, hdr, internal);
-    if(depth > 1) {
-        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)left_child, (H5B2_internal_t *)right_child);
-        H5B2_assert_internal2(internal->node_ptrs[idx + 1].all_nrec, hdr, (H5B2_internal_t *)right_child, (H5B2_internal_t *)left_child);
+    if (depth > 1) {
+        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)left_child,
+                              (H5B2_internal_t *)right_child);
+        H5B2_assert_internal2(internal->node_ptrs[idx + 1].all_nrec, hdr, (H5B2_internal_t *)right_child,
+                              (H5B2_internal_t *)left_child);
     } /* end if */
     else {
         H5B2_assert_leaf2(hdr, (H5B2_leaf_t *)left_child, (H5B2_leaf_t *)right_child);
         H5B2_assert_leaf(hdr, (H5B2_leaf_t *)right_child);
-    } /* end else */
+    }  /* end else */
 #endif /* H5B2_DEBUG */
 
 done:
     /* Release child nodes (marked as dirty) */
-    if(left_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
+    if (left_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree leaf node")
-    if(right_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
+    if (right_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree leaf node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_split1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_split_root
  *
@@ -364,12 +370,12 @@ done:
 herr_t
 H5B2_split_root(H5B2_hdr_t *hdr, hid_t dxpl_id)
 {
-    H5B2_internal_t *new_root = NULL;   /* Pointer to new root node */
-    unsigned new_root_flags = H5AC__NO_FLAGS_SET;   /* Cache flags for new root node */
-    H5B2_node_ptr_t old_root_ptr;       /* Old node pointer to root node in B-tree */
-    size_t sz_max_nrec;                 /* Temporary variable for range checking */
-    unsigned u_max_nrec_size;           /* Temporary variable for range checking */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5B2_internal_t *new_root       = NULL;               /* Pointer to new root node */
+    unsigned         new_root_flags = H5AC__NO_FLAGS_SET; /* Cache flags for new root node */
+    H5B2_node_ptr_t  old_root_ptr;                        /* Old node pointer to root node in B-tree */
+    size_t           sz_max_nrec;                         /* Temporary variable for range checking */
+    unsigned         u_max_nrec_size;                     /* Temporary variable for range checking */
+    herr_t           ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -380,7 +386,8 @@ H5B2_split_root(H5B2_hdr_t *hdr, hid_t dxpl_id)
     hdr->depth++;
 
     /* Re-allocate array of node info structs */
-    if(NULL == (hdr->node_info = H5FL_SEQ_REALLOC(H5B2_node_info_t, hdr->node_info, (size_t)(hdr->depth + 1))))
+    if (NULL ==
+        (hdr->node_info = H5FL_SEQ_REALLOC(H5B2_node_info_t, hdr->node_info, (size_t)(hdr->depth + 1))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Update node info for new depth of tree */
@@ -388,43 +395,48 @@ H5B2_split_root(H5B2_hdr_t *hdr, hid_t dxpl_id)
     H5_CHECKED_ASSIGN(hdr->node_info[hdr->depth].max_nrec, unsigned, sz_max_nrec, size_t)
     hdr->node_info[hdr->depth].split_nrec = (hdr->node_info[hdr->depth].max_nrec * hdr->split_percent) / 100;
     hdr->node_info[hdr->depth].merge_nrec = (hdr->node_info[hdr->depth].max_nrec * hdr->merge_percent) / 100;
-    hdr->node_info[hdr->depth].cum_max_nrec = ((hdr->node_info[hdr->depth].max_nrec + 1) *
-        hdr->node_info[hdr->depth - 1].cum_max_nrec) + hdr->node_info[hdr->depth].max_nrec;
+    hdr->node_info[hdr->depth].cum_max_nrec =
+        ((hdr->node_info[hdr->depth].max_nrec + 1) * hdr->node_info[hdr->depth - 1].cum_max_nrec) +
+        hdr->node_info[hdr->depth].max_nrec;
     u_max_nrec_size = H5VM_limit_enc_size((uint64_t)hdr->node_info[hdr->depth].cum_max_nrec);
     H5_CHECKED_ASSIGN(hdr->node_info[hdr->depth].cum_max_nrec_size, uint8_t, u_max_nrec_size, unsigned)
-    if(NULL == (hdr->node_info[hdr->depth].nat_rec_fac = H5FL_fac_init(hdr->cls->nrec_size * hdr->node_info[hdr->depth].max_nrec)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create node native key block factory")
-    if(NULL == (hdr->node_info[hdr->depth].node_ptr_fac = H5FL_fac_init(sizeof(H5B2_node_ptr_t) * (hdr->node_info[hdr->depth].max_nrec + 1))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create internal 'branch' node node pointer block factory")
+    if (NULL == (hdr->node_info[hdr->depth].nat_rec_fac =
+                     H5FL_fac_init(hdr->cls->nrec_size * hdr->node_info[hdr->depth].max_nrec)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create node native key block factory")
+    if (NULL == (hdr->node_info[hdr->depth].node_ptr_fac =
+                     H5FL_fac_init(sizeof(H5B2_node_ptr_t) * (hdr->node_info[hdr->depth].max_nrec + 1))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL,
+                    "can't create internal 'branch' node node pointer block factory")
 
     /* Keep old root node pointer info */
     old_root_ptr = hdr->root;
 
     /* Create new internal node to use as root */
     hdr->root.node_nrec = 0;
-    if(H5B2_create_internal(hdr, dxpl_id, &(hdr->root), hdr->depth) < 0)
+    if (H5B2_create_internal(hdr, dxpl_id, &(hdr->root), hdr->depth) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new internal node")
 
     /* Protect new root node */
-    if(NULL == (new_root = H5B2_protect_internal(hdr, dxpl_id, hdr->root.addr, hdr->root.node_nrec, hdr->depth, H5AC_WRITE)))
+    if (NULL == (new_root = H5B2_protect_internal(hdr, dxpl_id, hdr->root.addr, hdr->root.node_nrec,
+                                                  hdr->depth, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
     /* Set first node pointer in root node to old root node pointer info */
     new_root->node_ptrs[0] = old_root_ptr;
 
     /* Split original root node */
-    if(H5B2_split1(hdr, dxpl_id, hdr->depth, &(hdr->root), NULL, new_root, &new_root_flags, 0) < 0)
+    if (H5B2_split1(hdr, dxpl_id, hdr->depth, &(hdr->root), NULL, new_root, &new_root_flags, 0) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split old root node")
 
 done:
     /* Release new root node (marked as dirty) */
-    if(new_root && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, hdr->root.addr, new_root, new_root_flags) < 0)
+    if (new_root &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, hdr->root.addr, new_root, new_root_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree internal node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_split_root() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_redistribute2
  *
@@ -440,18 +452,19 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_internal_t *internal, unsigned idx)
+H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal_t *internal, unsigned idx)
 {
-    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
-    haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
-    void *left_child = NULL, *right_child = NULL;     /* Pointers to child nodes */
-    uint16_t *left_nrec, *right_nrec;   /* Pointers to child # of records */
-    uint8_t *left_native, *right_native;    /* Pointers to childs' native records */
-    H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL;/* Pointers to childs' node pointer info */
+    const H5AC_class_t *child_class;                            /* Pointer to child node's class info */
+    haddr_t             left_addr, right_addr;                  /* Addresses of left & right child nodes */
+    void *              left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
+    uint16_t *          left_nrec, *right_nrec;                 /* Pointers to child # of records */
+    uint8_t *           left_native, *right_native;             /* Pointers to childs' native records */
+    H5B2_node_ptr_t *   left_node_ptrs = NULL,
+                    *right_node_ptrs   = NULL;          /* Pointers to childs' node pointer info */
     hssize_t left_moved_nrec = 0, right_moved_nrec = 0; /* Number of records moved, for internal redistrib */
-    unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET;     /* Flags for unprotecting child nodes */
-    herr_t ret_value = SUCCEED;           /* Return value */
+    unsigned left_child_flags  = H5AC__NO_FLAGS_SET,
+             right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
+    herr_t ret_value           = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -460,108 +473,124 @@ H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(internal);
 
     /* Check for the kind of B-tree node to redistribute */
-    if(depth > 1) {
-        H5B2_internal_t *left_internal;         /* Pointer to left internal node */
-        H5B2_internal_t *right_internal;        /* Pointer to right internal node */
+    if (depth > 1) {
+        H5B2_internal_t *left_internal;  /* Pointer to left internal node */
+        H5B2_internal_t *right_internal; /* Pointer to right internal node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_INT;
-        left_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        left_addr   = internal->node_ptrs[idx].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Lock left & right B-tree child nodes */
-        if(NULL == (left_internal = H5B2_protect_internal(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (left_internal =
+                         H5B2_protect_internal(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec,
+                                               (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
-        if(NULL == (right_internal = H5B2_protect_internal(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (right_internal = H5B2_protect_internal(hdr, dxpl_id, right_addr,
+                                                            internal->node_ptrs[idx + 1].node_nrec,
+                                                            (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* More setup for child nodes */
-        left_child = left_internal;
-        right_child = right_internal;
-        left_nrec = &(left_internal->nrec);
-        right_nrec = &(right_internal->nrec);
-        left_native = left_internal->int_native;
-        right_native = right_internal->int_native;
-        left_node_ptrs = left_internal->node_ptrs;
+        left_child      = left_internal;
+        right_child     = right_internal;
+        left_nrec       = &(left_internal->nrec);
+        right_nrec      = &(right_internal->nrec);
+        left_native     = left_internal->int_native;
+        right_native    = right_internal->int_native;
+        left_node_ptrs  = left_internal->node_ptrs;
         right_node_ptrs = right_internal->node_ptrs;
     } /* end if */
     else {
-        H5B2_leaf_t *left_leaf;         /* Pointer to left leaf node */
-        H5B2_leaf_t *right_leaf;        /* Pointer to right leaf node */
+        H5B2_leaf_t *left_leaf;  /* Pointer to left leaf node */
+        H5B2_leaf_t *right_leaf; /* Pointer to right leaf node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_LEAF;
-        left_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        left_addr   = internal->node_ptrs[idx].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Lock left & right B-tree child nodes */
-        if(NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
+        if (NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr,
+                                                   internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
-        if(NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
+        if (NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr,
+                                                    internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* More setup for child nodes */
-        left_child = left_leaf;
-        right_child = right_leaf;
-        left_nrec = &(left_leaf->nrec);
-        right_nrec = &(right_leaf->nrec);
-        left_native = left_leaf->leaf_native;
+        left_child   = left_leaf;
+        right_child  = right_leaf;
+        left_nrec    = &(left_leaf->nrec);
+        right_nrec   = &(right_leaf->nrec);
+        left_native  = left_leaf->leaf_native;
         right_native = right_leaf->leaf_native;
     } /* end else */
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0, hdr, internal);
-    if(depth > 1) {
-        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)left_child, (H5B2_internal_t *)right_child);
-        H5B2_assert_internal2(internal->node_ptrs[idx + 1].all_nrec, hdr, (H5B2_internal_t *)right_child, (H5B2_internal_t *)left_child);
+    if (depth > 1) {
+        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)left_child,
+                              (H5B2_internal_t *)right_child);
+        H5B2_assert_internal2(internal->node_ptrs[idx + 1].all_nrec, hdr, (H5B2_internal_t *)right_child,
+                              (H5B2_internal_t *)left_child);
     } /* end if */
     else {
         H5B2_assert_leaf2(hdr, (H5B2_leaf_t *)left_child, (H5B2_leaf_t *)right_child);
         H5B2_assert_leaf(hdr, (H5B2_leaf_t *)right_child);
-    } /* end else */
+    }  /* end else */
 #endif /* H5B2_DEBUG */
 
     /* Determine whether to shuffle records left or right */
-    if(*left_nrec < *right_nrec) {
+    if (*left_nrec < *right_nrec) {
         /* Moving record from right node to left */
 
-        uint16_t new_right_nrec = (uint16_t)((*left_nrec + *right_nrec) / 2);    /* New number of records for right child */
-        uint16_t move_nrec = (uint16_t)(*right_nrec - new_right_nrec);           /* Number of records to move from right node to left */
+        uint16_t new_right_nrec =
+            (uint16_t)((*left_nrec + *right_nrec) / 2); /* New number of records for right child */
+        uint16_t move_nrec =
+            (uint16_t)(*right_nrec - new_right_nrec); /* Number of records to move from right node to left */
 
         /* Copy record from parent node down into left child */
-        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size);
+        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx),
+                 hdr->cls->nrec_size);
 
         /* See if we need to move records from right node */
-        if(move_nrec > 1)
-            HDmemcpy(H5B2_NAT_NREC(left_native, hdr, (*left_nrec + 1)), H5B2_NAT_NREC(right_native, hdr, 0), hdr->cls->nrec_size * (size_t)(move_nrec - 1));
+        if (move_nrec > 1)
+            HDmemcpy(H5B2_NAT_NREC(left_native, hdr, (*left_nrec + 1)), H5B2_NAT_NREC(right_native, hdr, 0),
+                     hdr->cls->nrec_size * (size_t)(move_nrec - 1));
 
         /* Move record from right node into parent node */
-        HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(right_native, hdr, (move_nrec - 1)), hdr->cls->nrec_size);
+        HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(right_native, hdr, (move_nrec - 1)),
+                 hdr->cls->nrec_size);
 
         /* Slide records in right node down */
-        HDmemmove(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(right_native, hdr, move_nrec), hdr->cls->nrec_size * new_right_nrec);
+        HDmemmove(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(right_native, hdr, move_nrec),
+                  hdr->cls->nrec_size * new_right_nrec);
 
         /* Handle node pointers, if we have an internal node */
-        if(depth > 1) {
-            hsize_t moved_nrec=move_nrec;   /* Total number of records moved, for internal redistrib */
-            unsigned u;             /* Local index variable */
+        if (depth > 1) {
+            hsize_t  moved_nrec = move_nrec; /* Total number of records moved, for internal redistrib */
+            unsigned u;                      /* Local index variable */
 
             /* Count the number of records being moved */
-            for(u=0; u<move_nrec; u++)
+            for (u = 0; u < move_nrec; u++)
                 moved_nrec += right_node_ptrs[u].all_nrec;
 
             H5_CHECKED_ASSIGN(left_moved_nrec, hssize_t, moved_nrec, hsize_t)
             right_moved_nrec -= (hssize_t)moved_nrec;
 
             /* Copy node pointers from right node to left */
-            HDmemcpy(&(left_node_ptrs[*left_nrec+1]),&(right_node_ptrs[0]),sizeof(H5B2_node_ptr_t)*move_nrec);
+            HDmemcpy(&(left_node_ptrs[*left_nrec + 1]), &(right_node_ptrs[0]),
+                     sizeof(H5B2_node_ptr_t) * move_nrec);
 
             /* Slide node pointers in right node down */
-            HDmemmove(&(right_node_ptrs[0]), &(right_node_ptrs[move_nrec]), sizeof(H5B2_node_ptr_t) * (new_right_nrec + (unsigned)1));
+            HDmemmove(&(right_node_ptrs[0]), &(right_node_ptrs[move_nrec]),
+                      sizeof(H5B2_node_ptr_t) * (new_right_nrec + (unsigned)1));
         } /* end if */
 
         /* Update number of records in child nodes */
-        *left_nrec = (uint16_t)(*left_nrec + move_nrec);
+        *left_nrec  = (uint16_t)(*left_nrec + move_nrec);
         *right_nrec = new_right_nrec;
 
         /* Mark nodes as dirty */
@@ -571,37 +600,44 @@ H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     else {
         /* Moving record from left node to right */
 
-        uint16_t new_left_nrec = (uint16_t)((*left_nrec + *right_nrec) / 2);    /* New number of records for left child */
-        uint16_t move_nrec = (uint16_t)(*left_nrec - new_left_nrec);            /* Number of records to move from left node to right */
+        uint16_t new_left_nrec =
+            (uint16_t)((*left_nrec + *right_nrec) / 2); /* New number of records for left child */
+        uint16_t move_nrec =
+            (uint16_t)(*left_nrec - new_left_nrec); /* Number of records to move from left node to right */
 
         /* Slide records in right node up */
-        HDmemmove(H5B2_NAT_NREC(right_native, hdr, move_nrec),
-                H5B2_NAT_NREC(right_native, hdr, 0),
-                hdr->cls->nrec_size * (*right_nrec));
+        HDmemmove(H5B2_NAT_NREC(right_native, hdr, move_nrec), H5B2_NAT_NREC(right_native, hdr, 0),
+                  hdr->cls->nrec_size * (*right_nrec));
 
         /* Copy record from parent node down into right child */
-        HDmemcpy(H5B2_NAT_NREC(right_native, hdr, (move_nrec - 1)), H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size);
+        HDmemcpy(H5B2_NAT_NREC(right_native, hdr, (move_nrec - 1)), H5B2_INT_NREC(internal, hdr, idx),
+                 hdr->cls->nrec_size);
 
         /* See if we need to move records from left node */
-        if(move_nrec > 1)
-            HDmemcpy(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(left_native, hdr, ((*left_nrec - move_nrec) + 1)), hdr->cls->nrec_size * (size_t)(move_nrec - 1));
+        if (move_nrec > 1)
+            HDmemcpy(H5B2_NAT_NREC(right_native, hdr, 0),
+                     H5B2_NAT_NREC(left_native, hdr, ((*left_nrec - move_nrec) + 1)),
+                     hdr->cls->nrec_size * (size_t)(move_nrec - 1));
 
         /* Move record from left node into parent node */
-        HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(left_native, hdr, (*left_nrec - move_nrec)), hdr->cls->nrec_size);
+        HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(left_native, hdr, (*left_nrec - move_nrec)),
+                 hdr->cls->nrec_size);
 
         /* Handle node pointers, if we have an internal node */
-        if(depth > 1) {
-            hsize_t moved_nrec = move_nrec;   /* Total number of records moved, for internal redistrib */
-            unsigned u;             /* Local index variable */
+        if (depth > 1) {
+            hsize_t  moved_nrec = move_nrec; /* Total number of records moved, for internal redistrib */
+            unsigned u;                      /* Local index variable */
 
             /* Slide node pointers in right node up */
-            HDmemmove(&(right_node_ptrs[move_nrec]), &(right_node_ptrs[0]), sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1));
+            HDmemmove(&(right_node_ptrs[move_nrec]), &(right_node_ptrs[0]),
+                      sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1));
 
             /* Copy node pointers from left node to right */
-            HDmemcpy(&(right_node_ptrs[0]), &(left_node_ptrs[new_left_nrec + 1]), sizeof(H5B2_node_ptr_t) * move_nrec);
+            HDmemcpy(&(right_node_ptrs[0]), &(left_node_ptrs[new_left_nrec + 1]),
+                     sizeof(H5B2_node_ptr_t) * move_nrec);
 
             /* Count the number of records being moved */
-            for(u = 0; u < move_nrec; u++)
+            for (u = 0; u < move_nrec; u++)
                 moved_nrec += right_node_ptrs[u].all_nrec;
 
             left_moved_nrec -= (hssize_t)moved_nrec;
@@ -609,7 +645,7 @@ H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
         } /* end if */
 
         /* Update number of records in child nodes */
-        *left_nrec = new_left_nrec;
+        *left_nrec  = new_left_nrec;
         *right_nrec = (uint16_t)(*right_nrec + move_nrec);
 
         /* Mark nodes as dirty */
@@ -618,42 +654,47 @@ H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     } /* end else */
 
     /* Update # of records in child nodes */
-    internal->node_ptrs[idx].node_nrec = *left_nrec;
+    internal->node_ptrs[idx].node_nrec     = *left_nrec;
     internal->node_ptrs[idx + 1].node_nrec = *right_nrec;
 
     /* Update total # of records in child B-trees */
-    if(depth > 1) {
-        internal->node_ptrs[idx].all_nrec = (hsize_t)((hssize_t)internal->node_ptrs[idx].all_nrec + left_moved_nrec);
-        internal->node_ptrs[idx + 1].all_nrec = (hsize_t)((hssize_t)internal->node_ptrs[idx + 1].all_nrec + right_moved_nrec);
+    if (depth > 1) {
+        internal->node_ptrs[idx].all_nrec =
+            (hsize_t)((hssize_t)internal->node_ptrs[idx].all_nrec + left_moved_nrec);
+        internal->node_ptrs[idx + 1].all_nrec =
+            (hsize_t)((hssize_t)internal->node_ptrs[idx + 1].all_nrec + right_moved_nrec);
     } /* end if */
     else {
-        internal->node_ptrs[idx].all_nrec = internal->node_ptrs[idx].node_nrec;
+        internal->node_ptrs[idx].all_nrec     = internal->node_ptrs[idx].node_nrec;
         internal->node_ptrs[idx + 1].all_nrec = internal->node_ptrs[idx + 1].node_nrec;
     } /* end else */
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0, hdr, internal);
-    if(depth > 1) {
-        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)left_child, (H5B2_internal_t *)right_child);
-        H5B2_assert_internal2(internal->node_ptrs[idx + 1].all_nrec, hdr, (H5B2_internal_t *)right_child, (H5B2_internal_t *)left_child);
+    if (depth > 1) {
+        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)left_child,
+                              (H5B2_internal_t *)right_child);
+        H5B2_assert_internal2(internal->node_ptrs[idx + 1].all_nrec, hdr, (H5B2_internal_t *)right_child,
+                              (H5B2_internal_t *)left_child);
     } /* end if */
     else {
         H5B2_assert_leaf2(hdr, (H5B2_leaf_t *)left_child, (H5B2_leaf_t *)right_child);
         H5B2_assert_leaf(hdr, (H5B2_leaf_t *)right_child);
-    } /* end else */
+    }  /* end else */
 #endif /* H5B2_DEBUG */
 
 done:
     /* Release child nodes (marked as dirty) */
-    if(left_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
+    if (left_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
-    if(right_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
+    if (right_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_redistribute2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_redistribute3
  *
@@ -669,25 +710,27 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx)
+H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal_t *internal,
+                   unsigned *internal_flags_ptr, unsigned idx)
 {
-    H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
-    H5B2_node_ptr_t *middle_node_ptrs = NULL; /* Pointers to childs' node pointer info */
-    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
-    haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
-    haddr_t middle_addr;                /* Address of middle child node */
-    void *left_child = NULL, *right_child = NULL;     /* Pointers to child nodes */
-    void *middle_child = NULL;          /* Pointers to middle child node */
-    uint16_t *left_nrec, *right_nrec;   /* Pointers to child # of records */
-    uint16_t *middle_nrec;              /* Pointers to middle child # of records */
-    uint8_t *left_native, *right_native;    /* Pointers to childs' native records */
-    uint8_t *middle_native;             /* Pointers to middle child's native records */
+    H5B2_node_ptr_t *left_node_ptrs      = NULL,
+                    *right_node_ptrs     = NULL;                /* Pointers to childs' node pointer info */
+    H5B2_node_ptr_t *   middle_node_ptrs = NULL;                /* Pointers to childs' node pointer info */
+    const H5AC_class_t *child_class;                            /* Pointer to child node's class info */
+    haddr_t             left_addr, right_addr;                  /* Addresses of left & right child nodes */
+    haddr_t             middle_addr;                            /* Address of middle child node */
+    void *              left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
+    void *              middle_child = NULL;                    /* Pointers to middle child node */
+    uint16_t *          left_nrec, *right_nrec;                 /* Pointers to child # of records */
+    uint16_t *          middle_nrec;                            /* Pointers to middle child # of records */
+    uint8_t *           left_native, *right_native;             /* Pointers to childs' native records */
+    uint8_t *           middle_native;                  /* Pointers to middle child's native records */
     hssize_t left_moved_nrec = 0, right_moved_nrec = 0; /* Number of records moved, for internal split */
-    hssize_t middle_moved_nrec = 0;     /* Number of records moved, for internal split */
-    unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET;     /* Flags for unprotecting child nodes */
-    unsigned middle_child_flags = H5AC__NO_FLAGS_SET;     /* Flags for unprotecting child nodes */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hssize_t middle_moved_nrec  = 0;                    /* Number of records moved, for internal split */
+    unsigned left_child_flags   = H5AC__NO_FLAGS_SET,
+             right_child_flags  = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
+    unsigned middle_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
+    herr_t   ret_value          = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -697,77 +740,86 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(internal_flags_ptr);
 
     /* Check for the kind of B-tree node to redistribute */
-    if(depth > 1) {
-        H5B2_internal_t *left_internal;         /* Pointer to left internal node */
-        H5B2_internal_t *middle_internal;       /* Pointer to middle internal node */
-        H5B2_internal_t *right_internal;        /* Pointer to right internal node */
+    if (depth > 1) {
+        H5B2_internal_t *left_internal;   /* Pointer to left internal node */
+        H5B2_internal_t *middle_internal; /* Pointer to middle internal node */
+        H5B2_internal_t *right_internal;  /* Pointer to right internal node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_INT;
-        left_addr = internal->node_ptrs[idx - 1].addr;
+        left_addr   = internal->node_ptrs[idx - 1].addr;
         middle_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Lock B-tree child nodes */
-        if(NULL == (left_internal = H5B2_protect_internal(hdr, dxpl_id, left_addr, internal->node_ptrs[idx - 1].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (left_internal = H5B2_protect_internal(hdr, dxpl_id, left_addr,
+                                                           internal->node_ptrs[idx - 1].node_nrec,
+                                                           (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
-        if(NULL == (middle_internal = H5B2_protect_internal(hdr, dxpl_id, middle_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (middle_internal =
+                         H5B2_protect_internal(hdr, dxpl_id, middle_addr, internal->node_ptrs[idx].node_nrec,
+                                               (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
-        if(NULL == (right_internal = H5B2_protect_internal(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (right_internal = H5B2_protect_internal(hdr, dxpl_id, right_addr,
+                                                            internal->node_ptrs[idx + 1].node_nrec,
+                                                            (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
         /* More setup for child nodes */
-        left_child = left_internal;
-        middle_child = middle_internal;
-        right_child = right_internal;
-        left_nrec = &(left_internal->nrec);
-        middle_nrec = &(middle_internal->nrec);
-        right_nrec = &(right_internal->nrec);
-        left_native = left_internal->int_native;
-        middle_native = middle_internal->int_native;
-        right_native = right_internal->int_native;
-        left_node_ptrs = left_internal->node_ptrs;
+        left_child       = left_internal;
+        middle_child     = middle_internal;
+        right_child      = right_internal;
+        left_nrec        = &(left_internal->nrec);
+        middle_nrec      = &(middle_internal->nrec);
+        right_nrec       = &(right_internal->nrec);
+        left_native      = left_internal->int_native;
+        middle_native    = middle_internal->int_native;
+        right_native     = right_internal->int_native;
+        left_node_ptrs   = left_internal->node_ptrs;
         middle_node_ptrs = middle_internal->node_ptrs;
-        right_node_ptrs = right_internal->node_ptrs;
+        right_node_ptrs  = right_internal->node_ptrs;
     } /* end if */
     else {
-        H5B2_leaf_t *left_leaf;         /* Pointer to left leaf node */
-        H5B2_leaf_t *middle_leaf;       /* Pointer to middle leaf node */
-        H5B2_leaf_t *right_leaf;        /* Pointer to right leaf node */
+        H5B2_leaf_t *left_leaf;   /* Pointer to left leaf node */
+        H5B2_leaf_t *middle_leaf; /* Pointer to middle leaf node */
+        H5B2_leaf_t *right_leaf;  /* Pointer to right leaf node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_LEAF;
-        left_addr = internal->node_ptrs[idx - 1].addr;
+        left_addr   = internal->node_ptrs[idx - 1].addr;
         middle_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Lock B-tree child nodes */
-        if(NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr, internal->node_ptrs[idx - 1].node_nrec, H5AC_WRITE)))
+        if (NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr,
+                                                   internal->node_ptrs[idx - 1].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
-        if(NULL == (middle_leaf = H5B2_protect_leaf(hdr, dxpl_id, middle_addr, internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
+        if (NULL == (middle_leaf = H5B2_protect_leaf(hdr, dxpl_id, middle_addr,
+                                                     internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
-        if(NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
+        if (NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr,
+                                                    internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* More setup for child nodes */
-        left_child = left_leaf;
-        middle_child = middle_leaf;
-        right_child = right_leaf;
-        left_nrec = &(left_leaf->nrec);
-        middle_nrec = &(middle_leaf->nrec);
-        right_nrec = &(right_leaf->nrec);
-        left_native = left_leaf->leaf_native;
+        left_child    = left_leaf;
+        middle_child  = middle_leaf;
+        right_child   = right_leaf;
+        left_nrec     = &(left_leaf->nrec);
+        middle_nrec   = &(middle_leaf->nrec);
+        right_nrec    = &(right_leaf->nrec);
+        left_native   = left_leaf->leaf_native;
         middle_native = middle_leaf->leaf_native;
-        right_native = right_leaf->leaf_native;
+        right_native  = right_leaf->leaf_native;
     } /* end else */
 
     /* Redistribute records */
     {
         /* Compute new # of records in each node */
-        unsigned total_nrec = (unsigned)(*left_nrec + *middle_nrec + *right_nrec + 2);
+        unsigned total_nrec      = (unsigned)(*left_nrec + *middle_nrec + *right_nrec + 2);
         uint16_t new_middle_nrec = (uint16_t)((total_nrec - 2) / 3);
-        uint16_t new_left_nrec = (uint16_t)(((total_nrec - 2) - new_middle_nrec) / 2);
-        uint16_t new_right_nrec = (uint16_t)((total_nrec - 2) - (unsigned)(new_left_nrec + new_middle_nrec));
+        uint16_t new_left_nrec   = (uint16_t)(((total_nrec - 2) - new_middle_nrec) / 2);
+        uint16_t new_right_nrec  = (uint16_t)((total_nrec - 2) - (unsigned)(new_left_nrec + new_middle_nrec));
         uint16_t curr_middle_nrec = *middle_nrec;
 
         /* Sanity check rounding */
@@ -775,43 +827,50 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
         HDassert(new_middle_nrec <= new_right_nrec);
 
         /* Move records into left node */
-        if(new_left_nrec > *left_nrec) {
-            uint16_t moved_middle_nrec = 0;      /* Number of records moved into left node */
+        if (new_left_nrec > *left_nrec) {
+            uint16_t moved_middle_nrec = 0; /* Number of records moved into left node */
 
             /* Move left parent record down to left node */
-            HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx - 1), hdr->cls->nrec_size);
+            HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx - 1),
+                     hdr->cls->nrec_size);
 
             /* Move records from middle node into left node */
-            if((new_left_nrec - 1) > *left_nrec) {
+            if ((new_left_nrec - 1) > *left_nrec) {
                 moved_middle_nrec = (uint16_t)(new_left_nrec - (*left_nrec + 1));
-                HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec + 1), H5B2_NAT_NREC(middle_native, hdr, 0), hdr->cls->nrec_size * moved_middle_nrec);
+                HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec + 1),
+                         H5B2_NAT_NREC(middle_native, hdr, 0), hdr->cls->nrec_size * moved_middle_nrec);
             } /* end if */
 
             /* Move record from middle node up to parent node */
-            HDmemcpy(H5B2_INT_NREC(internal, hdr, idx - 1), H5B2_NAT_NREC(middle_native, hdr, moved_middle_nrec), hdr->cls->nrec_size);
+            HDmemcpy(H5B2_INT_NREC(internal, hdr, idx - 1),
+                     H5B2_NAT_NREC(middle_native, hdr, moved_middle_nrec), hdr->cls->nrec_size);
             moved_middle_nrec++;
 
             /* Slide records in middle node down */
-            HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0), H5B2_NAT_NREC(middle_native, hdr, moved_middle_nrec), hdr->cls->nrec_size * (size_t)(*middle_nrec - moved_middle_nrec));
+            HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0),
+                      H5B2_NAT_NREC(middle_native, hdr, moved_middle_nrec),
+                      hdr->cls->nrec_size * (size_t)(*middle_nrec - moved_middle_nrec));
 
             /* Move node pointers also if this is an internal node */
-            if(depth > 1) {
-                hsize_t moved_nrec;         /* Total number of records moved, for internal redistrib */
-                unsigned move_nptrs;    /* Number of node pointers to move */
-                unsigned u;             /* Local index variable */
+            if (depth > 1) {
+                hsize_t  moved_nrec; /* Total number of records moved, for internal redistrib */
+                unsigned move_nptrs; /* Number of node pointers to move */
+                unsigned u;          /* Local index variable */
 
                 /* Move middle node pointers into left node */
                 move_nptrs = (unsigned)(new_left_nrec - *left_nrec);
-                HDmemcpy(&(left_node_ptrs[*left_nrec + 1]), &(middle_node_ptrs[0]), sizeof(H5B2_node_ptr_t)*move_nptrs);
+                HDmemcpy(&(left_node_ptrs[*left_nrec + 1]), &(middle_node_ptrs[0]),
+                         sizeof(H5B2_node_ptr_t) * move_nptrs);
 
                 /* Count the number of records being moved into the left node */
-                for(u = 0, moved_nrec = 0; u < move_nptrs; u++)
+                for (u = 0, moved_nrec = 0; u < move_nptrs; u++)
                     moved_nrec += middle_node_ptrs[u].all_nrec;
                 left_moved_nrec = (hssize_t)(moved_nrec + move_nptrs);
                 middle_moved_nrec -= (hssize_t)(moved_nrec + move_nptrs);
 
                 /* Slide the node pointers in middle node down */
-                HDmemmove(&(middle_node_ptrs[0]), &(middle_node_ptrs[move_nptrs]), sizeof(H5B2_node_ptr_t) * ((*middle_nrec - move_nptrs) + 1));
+                HDmemmove(&(middle_node_ptrs[0]), &(middle_node_ptrs[move_nptrs]),
+                          sizeof(H5B2_node_ptr_t) * ((*middle_nrec - move_nptrs) + 1));
             } /* end if */
 
             /* Update the current number of records in middle node */
@@ -823,35 +882,44 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
         } /* end if */
 
         /* Move records into right node */
-        if(new_right_nrec > *right_nrec) {
-            unsigned right_nrec_move = (unsigned)(new_right_nrec - *right_nrec); /* Number of records to move out of right node */
+        if (new_right_nrec > *right_nrec) {
+            unsigned right_nrec_move =
+                (unsigned)(new_right_nrec - *right_nrec); /* Number of records to move out of right node */
 
             /* Slide records in right node up */
-            HDmemmove(H5B2_NAT_NREC(right_native, hdr, right_nrec_move), H5B2_NAT_NREC(right_native, hdr, 0), hdr->cls->nrec_size * (*right_nrec));
+            HDmemmove(H5B2_NAT_NREC(right_native, hdr, right_nrec_move), H5B2_NAT_NREC(right_native, hdr, 0),
+                      hdr->cls->nrec_size * (*right_nrec));
 
             /* Move right parent record down to right node */
-            HDmemcpy(H5B2_NAT_NREC(right_native, hdr, right_nrec_move - 1), H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size);
+            HDmemcpy(H5B2_NAT_NREC(right_native, hdr, right_nrec_move - 1), H5B2_INT_NREC(internal, hdr, idx),
+                     hdr->cls->nrec_size);
 
             /* Move records from middle node into right node */
-            if(right_nrec_move > 1)
-                HDmemcpy(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(middle_native, hdr, ((curr_middle_nrec - right_nrec_move) + 1)), hdr->cls->nrec_size * (right_nrec_move - 1));
+            if (right_nrec_move > 1)
+                HDmemcpy(H5B2_NAT_NREC(right_native, hdr, 0),
+                         H5B2_NAT_NREC(middle_native, hdr, ((curr_middle_nrec - right_nrec_move) + 1)),
+                         hdr->cls->nrec_size * (right_nrec_move - 1));
 
             /* Move record from middle node up to parent node */
-            HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(middle_native, hdr, (curr_middle_nrec - right_nrec_move)), hdr->cls->nrec_size);
+            HDmemcpy(H5B2_INT_NREC(internal, hdr, idx),
+                     H5B2_NAT_NREC(middle_native, hdr, (curr_middle_nrec - right_nrec_move)),
+                     hdr->cls->nrec_size);
 
             /* Move node pointers also if this is an internal node */
-            if(depth > 1) {
-                hsize_t moved_nrec;         /* Total number of records moved, for internal redistrib */
-                unsigned u;             /* Local index variable */
+            if (depth > 1) {
+                hsize_t  moved_nrec; /* Total number of records moved, for internal redistrib */
+                unsigned u;          /* Local index variable */
 
                 /* Slide the node pointers in right node up */
-                HDmemmove(&(right_node_ptrs[right_nrec_move]), &(right_node_ptrs[0]), sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1));
+                HDmemmove(&(right_node_ptrs[right_nrec_move]), &(right_node_ptrs[0]),
+                          sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1));
 
                 /* Move middle node pointers into right node */
-                HDmemcpy(&(right_node_ptrs[0]), &(middle_node_ptrs[(curr_middle_nrec - right_nrec_move) + 1]), sizeof(H5B2_node_ptr_t) * right_nrec_move);
+                HDmemcpy(&(right_node_ptrs[0]), &(middle_node_ptrs[(curr_middle_nrec - right_nrec_move) + 1]),
+                         sizeof(H5B2_node_ptr_t) * right_nrec_move);
 
                 /* Count the number of records being moved into the right node */
-                for(u = 0, moved_nrec = 0; u < right_nrec_move; u++)
+                for (u = 0, moved_nrec = 0; u < right_nrec_move; u++)
                     moved_nrec += right_node_ptrs[u].all_nrec;
                 right_moved_nrec = (hssize_t)(moved_nrec + right_nrec_move);
                 middle_moved_nrec -= (hssize_t)(moved_nrec + right_nrec_move);
@@ -866,35 +934,43 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
         } /* end if */
 
         /* Move records out of left node */
-        if(new_left_nrec < *left_nrec) {
-            unsigned left_nrec_move = (unsigned)(*left_nrec - new_left_nrec); /* Number of records to move out of left node */
+        if (new_left_nrec < *left_nrec) {
+            unsigned left_nrec_move =
+                (unsigned)(*left_nrec - new_left_nrec); /* Number of records to move out of left node */
 
             /* Slide middle records up */
-            HDmemmove(H5B2_NAT_NREC(middle_native, hdr, left_nrec_move), H5B2_NAT_NREC(middle_native, hdr, 0), hdr->cls->nrec_size * curr_middle_nrec);
+            HDmemmove(H5B2_NAT_NREC(middle_native, hdr, left_nrec_move), H5B2_NAT_NREC(middle_native, hdr, 0),
+                      hdr->cls->nrec_size * curr_middle_nrec);
 
             /* Move left parent record down to middle node */
-            HDmemcpy(H5B2_NAT_NREC(middle_native, hdr, left_nrec_move - 1), H5B2_INT_NREC(internal, hdr, idx - 1), hdr->cls->nrec_size);
+            HDmemcpy(H5B2_NAT_NREC(middle_native, hdr, left_nrec_move - 1),
+                     H5B2_INT_NREC(internal, hdr, idx - 1), hdr->cls->nrec_size);
 
             /* Move left records to middle node */
-            if(left_nrec_move > 1)
-                HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0), H5B2_NAT_NREC(left_native, hdr, new_left_nrec + 1), hdr->cls->nrec_size * (left_nrec_move - 1));
+            if (left_nrec_move > 1)
+                HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0),
+                          H5B2_NAT_NREC(left_native, hdr, new_left_nrec + 1),
+                          hdr->cls->nrec_size * (left_nrec_move - 1));
 
             /* Move left parent record up from left node */
-            HDmemcpy(H5B2_INT_NREC(internal, hdr, idx - 1), H5B2_NAT_NREC(left_native, hdr, new_left_nrec), hdr->cls->nrec_size);
+            HDmemcpy(H5B2_INT_NREC(internal, hdr, idx - 1), H5B2_NAT_NREC(left_native, hdr, new_left_nrec),
+                     hdr->cls->nrec_size);
 
             /* Move node pointers also if this is an internal node */
-            if(depth > 1) {
-                hsize_t moved_nrec;         /* Total number of records moved, for internal redistrib */
-                unsigned u;             /* Local index variable */
+            if (depth > 1) {
+                hsize_t  moved_nrec; /* Total number of records moved, for internal redistrib */
+                unsigned u;          /* Local index variable */
 
                 /* Slide the node pointers in middle node up */
-                HDmemmove(&(middle_node_ptrs[left_nrec_move]), &(middle_node_ptrs[0]), sizeof(H5B2_node_ptr_t) * (size_t)(curr_middle_nrec + 1));
+                HDmemmove(&(middle_node_ptrs[left_nrec_move]), &(middle_node_ptrs[0]),
+                          sizeof(H5B2_node_ptr_t) * (size_t)(curr_middle_nrec + 1));
 
                 /* Move left node pointers into middle node */
-                HDmemcpy(&(middle_node_ptrs[0]), &(left_node_ptrs[new_left_nrec + 1]), sizeof(H5B2_node_ptr_t) * left_nrec_move);
+                HDmemcpy(&(middle_node_ptrs[0]), &(left_node_ptrs[new_left_nrec + 1]),
+                         sizeof(H5B2_node_ptr_t) * left_nrec_move);
 
                 /* Count the number of records being moved into the left node */
-                for(u = 0, moved_nrec = 0; u < left_nrec_move; u++)
+                for (u = 0, moved_nrec = 0; u < left_nrec_move; u++)
                     moved_nrec += middle_node_ptrs[u].all_nrec;
                 left_moved_nrec -= (hssize_t)(moved_nrec + left_nrec_move);
                 middle_moved_nrec += (hssize_t)(moved_nrec + left_nrec_move);
@@ -909,37 +985,44 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
         } /* end if */
 
         /* Move records out of right node */
-        if(new_right_nrec < *right_nrec) {
-            unsigned right_nrec_move = (unsigned)(*right_nrec - new_right_nrec); /* Number of records to move out of right node */
+        if (new_right_nrec < *right_nrec) {
+            unsigned right_nrec_move =
+                (unsigned)(*right_nrec - new_right_nrec); /* Number of records to move out of right node */
 
             /* Move right parent record down to middle node */
-            HDmemcpy(H5B2_NAT_NREC(middle_native, hdr, curr_middle_nrec), H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size);
+            HDmemcpy(H5B2_NAT_NREC(middle_native, hdr, curr_middle_nrec), H5B2_INT_NREC(internal, hdr, idx),
+                     hdr->cls->nrec_size);
 
             /* Move right records to middle node */
-            HDmemmove(H5B2_NAT_NREC(middle_native, hdr, (curr_middle_nrec + 1)), H5B2_NAT_NREC(right_native, hdr, 0), hdr->cls->nrec_size * (right_nrec_move - 1));
+            HDmemmove(H5B2_NAT_NREC(middle_native, hdr, (curr_middle_nrec + 1)),
+                      H5B2_NAT_NREC(right_native, hdr, 0), hdr->cls->nrec_size * (right_nrec_move - 1));
 
             /* Move right parent record up from right node */
-            HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(right_native, hdr, right_nrec_move - 1), hdr->cls->nrec_size);
+            HDmemcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(right_native, hdr, right_nrec_move - 1),
+                     hdr->cls->nrec_size);
 
             /* Slide right records down */
-            HDmemmove(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(right_native, hdr, right_nrec_move), hdr->cls->nrec_size * new_right_nrec);
+            HDmemmove(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(right_native, hdr, right_nrec_move),
+                      hdr->cls->nrec_size * new_right_nrec);
 
             /* Move node pointers also if this is an internal node */
-            if(depth > 1) {
-                hsize_t moved_nrec;         /* Total number of records moved, for internal redistrib */
-                unsigned u;             /* Local index variable */
+            if (depth > 1) {
+                hsize_t  moved_nrec; /* Total number of records moved, for internal redistrib */
+                unsigned u;          /* Local index variable */
 
                 /* Move right node pointers into middle node */
-                HDmemcpy(&(middle_node_ptrs[curr_middle_nrec + 1]), &(right_node_ptrs[0]), sizeof(H5B2_node_ptr_t) * right_nrec_move);
+                HDmemcpy(&(middle_node_ptrs[curr_middle_nrec + 1]), &(right_node_ptrs[0]),
+                         sizeof(H5B2_node_ptr_t) * right_nrec_move);
 
                 /* Count the number of records being moved into the right node */
-                for(u = 0, moved_nrec = 0; u < right_nrec_move; u++)
+                for (u = 0, moved_nrec = 0; u < right_nrec_move; u++)
                     moved_nrec += right_node_ptrs[u].all_nrec;
                 right_moved_nrec -= (hssize_t)(moved_nrec + right_nrec_move);
                 middle_moved_nrec += (hssize_t)(moved_nrec + right_nrec_move);
 
                 /* Slide the node pointers in right node down */
-                HDmemmove(&(right_node_ptrs[0]), &(right_node_ptrs[right_nrec_move]), sizeof(H5B2_node_ptr_t) * (size_t)(new_right_nrec + 1));
+                HDmemmove(&(right_node_ptrs[0]), &(right_node_ptrs[right_nrec_move]),
+                          sizeof(H5B2_node_ptr_t) * (size_t)(new_right_nrec + 1));
             } /* end if */
 
             /* Mark nodes as dirty */
@@ -948,25 +1031,28 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
         } /* end if */
 
         /* Update # of records in nodes */
-        *left_nrec = new_left_nrec;
+        *left_nrec   = new_left_nrec;
         *middle_nrec = new_middle_nrec;
-        *right_nrec = new_right_nrec;
+        *right_nrec  = new_right_nrec;
     } /* end block */
 
     /* Update # of records in child nodes */
     internal->node_ptrs[idx - 1].node_nrec = *left_nrec;
-    internal->node_ptrs[idx].node_nrec = *middle_nrec;
+    internal->node_ptrs[idx].node_nrec     = *middle_nrec;
     internal->node_ptrs[idx + 1].node_nrec = *right_nrec;
 
     /* Update total # of records in child B-trees */
-    if(depth > 1) {
-        internal->node_ptrs[idx - 1].all_nrec = (hsize_t)((hssize_t)internal->node_ptrs[idx - 1].all_nrec + left_moved_nrec);
-        internal->node_ptrs[idx].all_nrec = (hsize_t)((hssize_t)internal->node_ptrs[idx].all_nrec + middle_moved_nrec);
-        internal->node_ptrs[idx + 1].all_nrec = (hsize_t)((hssize_t)internal->node_ptrs[idx + 1].all_nrec + right_moved_nrec);
+    if (depth > 1) {
+        internal->node_ptrs[idx - 1].all_nrec =
+            (hsize_t)((hssize_t)internal->node_ptrs[idx - 1].all_nrec + left_moved_nrec);
+        internal->node_ptrs[idx].all_nrec =
+            (hsize_t)((hssize_t)internal->node_ptrs[idx].all_nrec + middle_moved_nrec);
+        internal->node_ptrs[idx + 1].all_nrec =
+            (hsize_t)((hssize_t)internal->node_ptrs[idx + 1].all_nrec + right_moved_nrec);
     } /* end if */
     else {
         internal->node_ptrs[idx - 1].all_nrec = internal->node_ptrs[idx - 1].node_nrec;
-        internal->node_ptrs[idx].all_nrec = internal->node_ptrs[idx].node_nrec;
+        internal->node_ptrs[idx].all_nrec     = internal->node_ptrs[idx].node_nrec;
         internal->node_ptrs[idx + 1].all_nrec = internal->node_ptrs[idx + 1].node_nrec;
     } /* end else */
 
@@ -974,73 +1060,85 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     *internal_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef QAK
-{
-    unsigned u;
+    {
+        unsigned u;
 
-    HDfprintf(stderr, "%s: Internal records:\n", FUNC);
-    for(u = 0; u < internal->nrec; u++) {
-        HDfprintf(stderr, "%s: u = %u\n", FUNC, u);
-        (hdr->cls->debug)(stderr, hdr->f, dxpl_id, 3, 4, H5B2_INT_NREC(internal, hdr, u), NULL);
-    } /* end for */
+        HDfprintf(stderr, "%s: Internal records:\n", FUNC);
+        for (u = 0; u < internal->nrec; u++) {
+            HDfprintf(stderr, "%s: u = %u\n", FUNC, u);
+            (hdr->cls->debug)(stderr, hdr->f, dxpl_id, 3, 4, H5B2_INT_NREC(internal, hdr, u), NULL);
+        } /* end for */
 
-    HDfprintf(stderr, "%s: Left Child records:\n", FUNC);
-    for(u = 0; u < *left_nrec; u++) {
-        HDfprintf(stderr, "%s: u = %u\n", FUNC, u);
-        (hdr->cls->debug)(stderr, hdr->f, dxpl_id, 3, 4, H5B2_NAT_NREC(left_native, hdr, u), NULL);
-    } /* end for */
+        HDfprintf(stderr, "%s: Left Child records:\n", FUNC);
+        for (u = 0; u < *left_nrec; u++) {
+            HDfprintf(stderr, "%s: u = %u\n", FUNC, u);
+            (hdr->cls->debug)(stderr, hdr->f, dxpl_id, 3, 4, H5B2_NAT_NREC(left_native, hdr, u), NULL);
+        } /* end for */
 
-    HDfprintf(stderr, "%s: Middle Child records:\n", FUNC);
-    for(u = 0; u < *middle_nrec; u++) {
-        HDfprintf(stderr, "%s: u = %u\n", FUNC, u);
-        (hdr->cls->debug)(stderr, hdr->f, dxpl_id, 3, 4, H5B2_NAT_NREC(middle_native, hdr, u), NULL);
-    } /* end for */
+        HDfprintf(stderr, "%s: Middle Child records:\n", FUNC);
+        for (u = 0; u < *middle_nrec; u++) {
+            HDfprintf(stderr, "%s: u = %u\n", FUNC, u);
+            (hdr->cls->debug)(stderr, hdr->f, dxpl_id, 3, 4, H5B2_NAT_NREC(middle_native, hdr, u), NULL);
+        } /* end for */
 
-    HDfprintf(stderr, "%s: Right Child records:\n", FUNC);
-    for(u = 0; u < *right_nrec; u++) {
-        HDfprintf(stderr, "%s: u = %u\n", FUNC, u);
-        (hdr->cls->debug)(stderr, hdr->f, dxpl_id, 3, 4, H5B2_NAT_NREC(right_native, hdr, u), NULL);
-    } /* end for */
+        HDfprintf(stderr, "%s: Right Child records:\n", FUNC);
+        for (u = 0; u < *right_nrec; u++) {
+            HDfprintf(stderr, "%s: u = %u\n", FUNC, u);
+            (hdr->cls->debug)(stderr, hdr->f, dxpl_id, 3, 4, H5B2_NAT_NREC(right_native, hdr, u), NULL);
+        } /* end for */
 
-    for(u = 0; u < internal->nrec + 1; u++)
-        HDfprintf(stderr, "%s: internal->node_ptrs[%u] = (%Hu/%u/%a)\n", FUNC, u, internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].node_nrec, internal->node_ptrs[u].addr);
-    if(depth > 1) {
-        for(u = 0; u < *left_nrec + 1; u++)
-            HDfprintf(stderr, "%s: left_node_ptr[%u] = (%Hu/%u/%a)\n", FUNC, u, left_node_ptrs[u].all_nrec, left_node_ptrs[u].node_nrec, left_node_ptrs[u].addr);
-        for(u = 0; u < *middle_nrec + 1; u++)
-            HDfprintf(stderr, "%s: middle_node_ptr[%u] = (%Hu/%u/%a)\n", FUNC, u, middle_node_ptrs[u].all_nrec, middle_node_ptrs[u].node_nrec, middle_node_ptrs[u].addr);
-        for(u = 0; u < *right_nrec + 1; u++)
-            HDfprintf(stderr, "%s: right_node_ptr[%u] = (%Hu/%u/%a)\n", FUNC, u, right_node_ptrs[u].all_nrec, right_node_ptrs[u].node_nrec, right_node_ptrs[u].addr);
-    } /* end if */
-}
+        for (u = 0; u < internal->nrec + 1; u++)
+            HDfprintf(stderr, "%s: internal->node_ptrs[%u] = (%Hu/%u/%a)\n", FUNC, u,
+                      internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].node_nrec,
+                      internal->node_ptrs[u].addr);
+        if (depth > 1) {
+            for (u = 0; u < *left_nrec + 1; u++)
+                HDfprintf(stderr, "%s: left_node_ptr[%u] = (%Hu/%u/%a)\n", FUNC, u,
+                          left_node_ptrs[u].all_nrec, left_node_ptrs[u].node_nrec, left_node_ptrs[u].addr);
+            for (u = 0; u < *middle_nrec + 1; u++)
+                HDfprintf(stderr, "%s: middle_node_ptr[%u] = (%Hu/%u/%a)\n", FUNC, u,
+                          middle_node_ptrs[u].all_nrec, middle_node_ptrs[u].node_nrec,
+                          middle_node_ptrs[u].addr);
+            for (u = 0; u < *right_nrec + 1; u++)
+                HDfprintf(stderr, "%s: right_node_ptr[%u] = (%Hu/%u/%a)\n", FUNC, u,
+                          right_node_ptrs[u].all_nrec, right_node_ptrs[u].node_nrec, right_node_ptrs[u].addr);
+        } /* end if */
+    }
 #endif /* QAK */
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0, hdr, internal);
-    if(depth > 1) {
-        H5B2_assert_internal2(internal->node_ptrs[idx - 1].all_nrec, hdr, (H5B2_internal_t *)left_child, (H5B2_internal_t *)middle_child);
-        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)middle_child, (H5B2_internal_t *)left_child);
-        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)middle_child, (H5B2_internal_t *)right_child);
-        H5B2_assert_internal2(internal->node_ptrs[idx + 1].all_nrec, hdr, (H5B2_internal_t *)right_child, (H5B2_internal_t *)middle_child);
+    if (depth > 1) {
+        H5B2_assert_internal2(internal->node_ptrs[idx - 1].all_nrec, hdr, (H5B2_internal_t *)left_child,
+                              (H5B2_internal_t *)middle_child);
+        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)middle_child,
+                              (H5B2_internal_t *)left_child);
+        H5B2_assert_internal2(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)middle_child,
+                              (H5B2_internal_t *)right_child);
+        H5B2_assert_internal2(internal->node_ptrs[idx + 1].all_nrec, hdr, (H5B2_internal_t *)right_child,
+                              (H5B2_internal_t *)middle_child);
     } /* end if */
     else {
         H5B2_assert_leaf2(hdr, (H5B2_leaf_t *)left_child, (H5B2_leaf_t *)middle_child);
         H5B2_assert_leaf2(hdr, (H5B2_leaf_t *)middle_child, (H5B2_leaf_t *)right_child);
         H5B2_assert_leaf(hdr, (H5B2_leaf_t *)right_child);
-    } /* end else */
+    }  /* end else */
 #endif /* H5B2_DEBUG */
 
 done:
     /* Unlock child nodes (marked as dirty) */
-    if(left_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
+    if (left_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
-    if(middle_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, middle_addr, middle_child, middle_child_flags) < 0)
+    if (middle_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, middle_addr, middle_child, middle_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
-    if(right_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
+    if (right_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_redistribute3() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_merge2
  *
@@ -1057,18 +1155,20 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_node_ptr_t *curr_node_ptr, unsigned *parent_cache_info_flags_ptr,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx)
+H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ptr,
+            unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal, unsigned *internal_flags_ptr,
+            unsigned idx)
 {
-    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
-    haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
-    void *left_child = NULL, *right_child = NULL;     /* Pointers to left & right child nodes */
-    uint16_t *left_nrec, *right_nrec;   /* Pointers to left & right child # of records */
-    uint8_t *left_native, *right_native;    /* Pointers to left & right children's native records */
-    H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL;/* Pointers to childs' node pointer info */
-    unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET;     /* Flags for unprotecting child nodes */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5AC_class_t *child_class;                            /* Pointer to child node's class info */
+    haddr_t             left_addr, right_addr;                  /* Addresses of left & right child nodes */
+    void *              left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */
+    uint16_t *          left_nrec, *right_nrec;     /* Pointers to left & right child # of records */
+    uint8_t *           left_native, *right_native; /* Pointers to left & right children's native records */
+    H5B2_node_ptr_t *   left_node_ptrs = NULL,
+                    *right_node_ptrs   = NULL; /* Pointers to childs' node pointer info */
+    unsigned left_child_flags          = H5AC__NO_FLAGS_SET,
+             right_child_flags         = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
+    herr_t ret_value                   = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1079,66 +1179,75 @@ H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(internal_flags_ptr);
 
     /* Check for the kind of B-tree node to split */
-    if(depth > 1) {
-        H5B2_internal_t *left_internal;         /* Pointer to left internal node */
-        H5B2_internal_t *right_internal;        /* Pointer to right internal node */
+    if (depth > 1) {
+        H5B2_internal_t *left_internal;  /* Pointer to left internal node */
+        H5B2_internal_t *right_internal; /* Pointer to right internal node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_INT;
-        left_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        left_addr   = internal->node_ptrs[idx].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Lock left & right B-tree child nodes */
-        if(NULL == (left_internal = H5B2_protect_internal(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (left_internal =
+                         H5B2_protect_internal(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec,
+                                               (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
-        if(NULL == (right_internal = H5B2_protect_internal(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (right_internal = H5B2_protect_internal(hdr, dxpl_id, right_addr,
+                                                            internal->node_ptrs[idx + 1].node_nrec,
+                                                            (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
         /* More setup for accessing child node information */
-        left_child = left_internal;
-        right_child = right_internal;
-        left_nrec = &(left_internal->nrec);
-        right_nrec = &(right_internal->nrec);
-        left_native = left_internal->int_native;
-        right_native = right_internal->int_native;
-        left_node_ptrs = left_internal->node_ptrs;
+        left_child      = left_internal;
+        right_child     = right_internal;
+        left_nrec       = &(left_internal->nrec);
+        right_nrec      = &(right_internal->nrec);
+        left_native     = left_internal->int_native;
+        right_native    = right_internal->int_native;
+        left_node_ptrs  = left_internal->node_ptrs;
         right_node_ptrs = right_internal->node_ptrs;
     } /* end if */
     else {
-        H5B2_leaf_t *left_leaf;         /* Pointer to left leaf node */
-        H5B2_leaf_t *right_leaf;        /* Pointer to right leaf node */
+        H5B2_leaf_t *left_leaf;  /* Pointer to left leaf node */
+        H5B2_leaf_t *right_leaf; /* Pointer to right leaf node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_LEAF;
-        left_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        left_addr   = internal->node_ptrs[idx].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Lock left & right B-tree child nodes */
-        if(NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr, internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
+        if (NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr,
+                                                   internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
-        if(NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
+        if (NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr,
+                                                    internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* More setup for accessing child node information */
-        left_child = left_leaf;
-        right_child = right_leaf;
-        left_nrec = &(left_leaf->nrec);
-        right_nrec = &(right_leaf->nrec);
-        left_native = left_leaf->leaf_native;
+        left_child   = left_leaf;
+        right_child  = right_leaf;
+        left_nrec    = &(left_leaf->nrec);
+        right_nrec   = &(right_leaf->nrec);
+        left_native  = left_leaf->leaf_native;
         right_native = right_leaf->leaf_native;
     } /* end else */
 
     /* Redistribute records into left node */
     {
         /* Copy record from parent node to proper location */
-        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size);
+        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx),
+                 hdr->cls->nrec_size);
 
         /* Copy records from right node to left node */
-        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec + 1), H5B2_NAT_NREC(right_native, hdr, 0), hdr->cls->nrec_size * (*right_nrec));
+        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec + 1), H5B2_NAT_NREC(right_native, hdr, 0),
+                 hdr->cls->nrec_size * (*right_nrec));
 
         /* Copy node pointers from right node into left node */
-        if(depth > 1)
-            HDmemcpy(&(left_node_ptrs[*left_nrec + 1]), &(right_node_ptrs[0]), sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1));
+        if (depth > 1)
+            HDmemcpy(&(left_node_ptrs[*left_nrec + 1]), &(right_node_ptrs[0]),
+                     sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1));
 
         /* Update # of records in left node */
         *left_nrec = (uint16_t)(*left_nrec + *right_nrec + 1);
@@ -1155,9 +1264,11 @@ H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     internal->node_ptrs[idx].all_nrec += internal->node_ptrs[idx + 1].all_nrec + 1;
 
     /* Slide records in parent node down, to eliminate demoted record */
-    if((idx + 1) < internal->nrec) {
-        HDmemmove(H5B2_INT_NREC(internal, hdr, idx), H5B2_INT_NREC(internal, hdr, idx + 1), hdr->cls->nrec_size * (internal->nrec - (idx + 1)));
-        HDmemmove(&(internal->node_ptrs[idx + 1]), &(internal->node_ptrs[idx + 2]), sizeof(H5B2_node_ptr_t) * (internal->nrec - (idx + 1)));
+    if ((idx + 1) < internal->nrec) {
+        HDmemmove(H5B2_INT_NREC(internal, hdr, idx), H5B2_INT_NREC(internal, hdr, idx + 1),
+                  hdr->cls->nrec_size * (internal->nrec - (idx + 1)));
+        HDmemmove(&(internal->node_ptrs[idx + 1]), &(internal->node_ptrs[idx + 2]),
+                  sizeof(H5B2_node_ptr_t) * (internal->nrec - (idx + 1)));
     } /* end if */
 
     /* Update # of records in parent node */
@@ -1170,12 +1281,12 @@ H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     curr_node_ptr->node_nrec--;
 
     /* Mark grandparent as dirty, if given */
-    if(parent_cache_info_flags_ptr)
+    if (parent_cache_info_flags_ptr)
         *parent_cache_info_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0, hdr, internal);
-    if(depth > 1)
+    if (depth > 1)
         H5B2_assert_internal(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)left_child);
     else
         H5B2_assert_leaf(hdr, (H5B2_leaf_t *)left_child);
@@ -1183,17 +1294,18 @@ H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
 
 done:
     /* Unlock left node (marked as dirty) */
-    if(left_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
+    if (left_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     /* Delete right node & remove from cache (marked as dirty) */
-    if(right_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
+    if (right_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_merge2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_merge3
  *
@@ -1210,25 +1322,27 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_node_ptr_t *curr_node_ptr, unsigned *parent_cache_info_flags_ptr,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx)
+H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ptr,
+            unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal, unsigned *internal_flags_ptr,
+            unsigned idx)
 {
-    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
-    haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
-    haddr_t middle_addr;                /* Address of middle child node */
-    void *left_child = NULL, *right_child = NULL;     /* Pointers to left & right child nodes */
-    void *middle_child = NULL;          /* Pointer to middle child node */
-    uint16_t *left_nrec, *right_nrec;   /* Pointers to left & right child # of records */
-    uint16_t *middle_nrec;              /* Pointer to middle child # of records */
-    uint8_t *left_native, *right_native;    /* Pointers to left & right children's native records */
-    uint8_t *middle_native;             /* Pointer to middle child's native records */
-    H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL;/* Pointers to childs' node pointer info */
-    H5B2_node_ptr_t *middle_node_ptrs = NULL;/* Pointer to child's node pointer info */
-    hsize_t middle_moved_nrec;          /* Number of records moved, for internal split */
-    unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET;     /* Flags for unprotecting child nodes */
-    unsigned middle_child_flags = H5AC__NO_FLAGS_SET;     /* Flags for unprotecting child nodes */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5AC_class_t *child_class;                            /* Pointer to child node's class info */
+    haddr_t             left_addr, right_addr;                  /* Addresses of left & right child nodes */
+    haddr_t             middle_addr;                            /* Address of middle child node */
+    void *              left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */
+    void *              middle_child = NULL;                    /* Pointer to middle child node */
+    uint16_t *          left_nrec, *right_nrec;     /* Pointers to left & right child # of records */
+    uint16_t *          middle_nrec;                /* Pointer to middle child # of records */
+    uint8_t *           left_native, *right_native; /* Pointers to left & right children's native records */
+    uint8_t *           middle_native;              /* Pointer to middle child's native records */
+    H5B2_node_ptr_t *   left_node_ptrs = NULL,
+                    *right_node_ptrs   = NULL; /* Pointers to childs' node pointer info */
+    H5B2_node_ptr_t *middle_node_ptrs  = NULL; /* Pointer to child's node pointer info */
+    hsize_t          middle_moved_nrec;        /* Number of records moved, for internal split */
+    unsigned         left_child_flags = H5AC__NO_FLAGS_SET,
+             right_child_flags        = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
+    unsigned middle_child_flags       = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
+    herr_t   ret_value                = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1239,107 +1353,122 @@ H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(internal_flags_ptr);
 
     /* Check for the kind of B-tree node to split */
-    if(depth > 1) {
-        H5B2_internal_t *left_internal;         /* Pointer to left internal node */
-        H5B2_internal_t *middle_internal;       /* Pointer to middle internal node */
-        H5B2_internal_t *right_internal;        /* Pointer to right internal node */
+    if (depth > 1) {
+        H5B2_internal_t *left_internal;   /* Pointer to left internal node */
+        H5B2_internal_t *middle_internal; /* Pointer to middle internal node */
+        H5B2_internal_t *right_internal;  /* Pointer to right internal node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_INT;
-        left_addr = internal->node_ptrs[idx - 1].addr;
+        left_addr   = internal->node_ptrs[idx - 1].addr;
         middle_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Lock B-tree child nodes */
-        if(NULL == (left_internal = H5B2_protect_internal(hdr, dxpl_id, left_addr, internal->node_ptrs[idx - 1].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (left_internal = H5B2_protect_internal(hdr, dxpl_id, left_addr,
+                                                           internal->node_ptrs[idx - 1].node_nrec,
+                                                           (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
-        if(NULL == (middle_internal = H5B2_protect_internal(hdr, dxpl_id, middle_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (middle_internal =
+                         H5B2_protect_internal(hdr, dxpl_id, middle_addr, internal->node_ptrs[idx].node_nrec,
+                                               (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
-        if(NULL == (right_internal = H5B2_protect_internal(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (right_internal = H5B2_protect_internal(hdr, dxpl_id, right_addr,
+                                                            internal->node_ptrs[idx + 1].node_nrec,
+                                                            (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
         /* More setup for accessing child node information */
-        left_child = left_internal;
-        middle_child = middle_internal;
-        right_child = right_internal;
-        left_nrec = &(left_internal->nrec);
-        middle_nrec = &(middle_internal->nrec);
-        right_nrec = &(right_internal->nrec);
-        left_native = left_internal->int_native;
-        middle_native = middle_internal->int_native;
-        right_native = right_internal->int_native;
-        left_node_ptrs = left_internal->node_ptrs;
+        left_child       = left_internal;
+        middle_child     = middle_internal;
+        right_child      = right_internal;
+        left_nrec        = &(left_internal->nrec);
+        middle_nrec      = &(middle_internal->nrec);
+        right_nrec       = &(right_internal->nrec);
+        left_native      = left_internal->int_native;
+        middle_native    = middle_internal->int_native;
+        right_native     = right_internal->int_native;
+        left_node_ptrs   = left_internal->node_ptrs;
         middle_node_ptrs = middle_internal->node_ptrs;
-        right_node_ptrs = right_internal->node_ptrs;
+        right_node_ptrs  = right_internal->node_ptrs;
     } /* end if */
     else {
-        H5B2_leaf_t *left_leaf;         /* Pointer to left leaf node */
-        H5B2_leaf_t *middle_leaf;       /* Pointer to middle leaf node */
-        H5B2_leaf_t *right_leaf;        /* Pointer to right leaf node */
+        H5B2_leaf_t *left_leaf;   /* Pointer to left leaf node */
+        H5B2_leaf_t *middle_leaf; /* Pointer to middle leaf node */
+        H5B2_leaf_t *right_leaf;  /* Pointer to right leaf node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_LEAF;
-        left_addr = internal->node_ptrs[idx - 1].addr;
+        left_addr   = internal->node_ptrs[idx - 1].addr;
         middle_addr = internal->node_ptrs[idx].addr;
-        right_addr = internal->node_ptrs[idx + 1].addr;
+        right_addr  = internal->node_ptrs[idx + 1].addr;
 
         /* Lock B-tree child nodes */
-        if(NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr, internal->node_ptrs[idx - 1].node_nrec, H5AC_WRITE)))
+        if (NULL == (left_leaf = H5B2_protect_leaf(hdr, dxpl_id, left_addr,
+                                                   internal->node_ptrs[idx - 1].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
-        if(NULL == (middle_leaf = H5B2_protect_leaf(hdr, dxpl_id, middle_addr, internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
+        if (NULL == (middle_leaf = H5B2_protect_leaf(hdr, dxpl_id, middle_addr,
+                                                     internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
-        if(NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr, internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
+        if (NULL == (right_leaf = H5B2_protect_leaf(hdr, dxpl_id, right_addr,
+                                                    internal->node_ptrs[idx + 1].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* More setup for accessing child node information */
-        left_child = left_leaf;
-        middle_child = middle_leaf;
-        right_child = right_leaf;
-        left_nrec = &(left_leaf->nrec);
-        middle_nrec = &(middle_leaf->nrec);
-        right_nrec = &(right_leaf->nrec);
-        left_native = left_leaf->leaf_native;
+        left_child    = left_leaf;
+        middle_child  = middle_leaf;
+        right_child   = right_leaf;
+        left_nrec     = &(left_leaf->nrec);
+        middle_nrec   = &(middle_leaf->nrec);
+        right_nrec    = &(right_leaf->nrec);
+        left_native   = left_leaf->leaf_native;
         middle_native = middle_leaf->leaf_native;
-        right_native = right_leaf->leaf_native;
+        right_native  = right_leaf->leaf_native;
     } /* end else */
 
     /* Redistribute records into left node */
     {
-        unsigned total_nrec = (unsigned)(*left_nrec + *middle_nrec + *right_nrec + 2);
+        unsigned total_nrec       = (unsigned)(*left_nrec + *middle_nrec + *right_nrec + 2);
         unsigned middle_nrec_move = ((total_nrec - 1) / 2) - *left_nrec;
 
         /* Set the base number of records moved from middle node */
         middle_moved_nrec = middle_nrec_move;
 
         /* Copy record from parent node to proper location in left node */
-        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx - 1), hdr->cls->nrec_size);
+        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx - 1),
+                 hdr->cls->nrec_size);
 
         /* Copy records from middle node to left node */
-        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec + 1), H5B2_NAT_NREC(middle_native, hdr, 0), hdr->cls->nrec_size * (middle_nrec_move - 1));
+        HDmemcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec + 1), H5B2_NAT_NREC(middle_native, hdr, 0),
+                 hdr->cls->nrec_size * (middle_nrec_move - 1));
 
         /* Copy record from middle node to proper location in parent node */
-        HDmemcpy(H5B2_INT_NREC(internal, hdr, idx - 1), H5B2_NAT_NREC(middle_native, hdr, (middle_nrec_move - 1)), hdr->cls->nrec_size);
+        HDmemcpy(H5B2_INT_NREC(internal, hdr, idx - 1),
+                 H5B2_NAT_NREC(middle_native, hdr, (middle_nrec_move - 1)), hdr->cls->nrec_size);
 
         /* Slide records in middle node down */
-        HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0), H5B2_NAT_NREC(middle_native, hdr, middle_nrec_move), hdr->cls->nrec_size * (*middle_nrec - middle_nrec_move));
+        HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0), H5B2_NAT_NREC(middle_native, hdr, middle_nrec_move),
+                  hdr->cls->nrec_size * (*middle_nrec - middle_nrec_move));
 
         /* Move node pointers also if this is an internal node */
-        if(depth > 1) {
-            unsigned u;         /* Local index variable */
+        if (depth > 1) {
+            unsigned u; /* Local index variable */
 
             /* Copy node pointers from middle node into left node */
-            HDmemcpy(&(left_node_ptrs[*left_nrec + 1]), &(middle_node_ptrs[0]), sizeof(H5B2_node_ptr_t) * middle_nrec_move);
+            HDmemcpy(&(left_node_ptrs[*left_nrec + 1]), &(middle_node_ptrs[0]),
+                     sizeof(H5B2_node_ptr_t) * middle_nrec_move);
 
             /* Count the number of records being moved into the left node */
-            for(u = 0; u < middle_nrec_move; u++)
+            for (u = 0; u < middle_nrec_move; u++)
                 middle_moved_nrec += middle_node_ptrs[u].all_nrec;
 
             /* Slide the node pointers in middle node down */
-            HDmemmove(&(middle_node_ptrs[0]), &(middle_node_ptrs[middle_nrec_move]), sizeof(H5B2_node_ptr_t) * (size_t)((unsigned)(*middle_nrec + 1) - middle_nrec_move));
+            HDmemmove(&(middle_node_ptrs[0]), &(middle_node_ptrs[middle_nrec_move]),
+                      sizeof(H5B2_node_ptr_t) * (size_t)((unsigned)(*middle_nrec + 1) - middle_nrec_move));
         } /* end if */
 
         /* Update # of records in left & middle nodes */
-        *left_nrec = (uint16_t)(*left_nrec + middle_nrec_move);
+        *left_nrec   = (uint16_t)(*left_nrec + middle_nrec_move);
         *middle_nrec = (uint16_t)(*middle_nrec - middle_nrec_move);
 
         /* Mark nodes as dirty */
@@ -1350,15 +1479,18 @@ H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     /* Redistribute records into middle node */
     {
         /* Copy record from parent node to proper location in middle node */
-        HDmemcpy(H5B2_NAT_NREC(middle_native, hdr, *middle_nrec), H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size);
+        HDmemcpy(H5B2_NAT_NREC(middle_native, hdr, *middle_nrec), H5B2_INT_NREC(internal, hdr, idx),
+                 hdr->cls->nrec_size);
 
         /* Copy records from right node to middle node */
-        HDmemcpy(H5B2_NAT_NREC(middle_native, hdr, *middle_nrec + 1), H5B2_NAT_NREC(right_native, hdr, 0), hdr->cls->nrec_size * (*right_nrec));
+        HDmemcpy(H5B2_NAT_NREC(middle_native, hdr, *middle_nrec + 1), H5B2_NAT_NREC(right_native, hdr, 0),
+                 hdr->cls->nrec_size * (*right_nrec));
 
         /* Move node pointers also if this is an internal node */
-        if(depth > 1)
+        if (depth > 1)
             /* Copy node pointers from right node into middle node */
-            HDmemcpy(&(middle_node_ptrs[*middle_nrec + 1]), &(right_node_ptrs[0]), sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1));
+            HDmemcpy(&(middle_node_ptrs[*middle_nrec + 1]), &(right_node_ptrs[0]),
+                     sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1));
 
         /* Update # of records in middle node */
         *middle_nrec = (uint16_t)(*middle_nrec + (*right_nrec + 1));
@@ -1370,16 +1502,18 @@ H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
 
     /* Update # of records in child nodes */
     internal->node_ptrs[idx - 1].node_nrec = *left_nrec;
-    internal->node_ptrs[idx].node_nrec = *middle_nrec;
+    internal->node_ptrs[idx].node_nrec     = *middle_nrec;
 
     /* Update total # of records in child B-trees */
     internal->node_ptrs[idx - 1].all_nrec += middle_moved_nrec;
     internal->node_ptrs[idx].all_nrec += (internal->node_ptrs[idx + 1].all_nrec + 1) - middle_moved_nrec;
 
     /* Slide records in parent node down, to eliminate demoted record */
-    if((idx + 1) < internal->nrec) {
-        HDmemmove(H5B2_INT_NREC(internal, hdr, idx), H5B2_INT_NREC(internal, hdr, idx + 1), hdr->cls->nrec_size * (internal->nrec - (idx + 1)));
-        HDmemmove(&(internal->node_ptrs[idx + 1]), &(internal->node_ptrs[idx + 2]), sizeof(H5B2_node_ptr_t) * (internal->nrec - (idx + 1)));
+    if ((idx + 1) < internal->nrec) {
+        HDmemmove(H5B2_INT_NREC(internal, hdr, idx), H5B2_INT_NREC(internal, hdr, idx + 1),
+                  hdr->cls->nrec_size * (internal->nrec - (idx + 1)));
+        HDmemmove(&(internal->node_ptrs[idx + 1]), &(internal->node_ptrs[idx + 2]),
+                  sizeof(H5B2_node_ptr_t) * (internal->nrec - (idx + 1)));
     } /* end if */
 
     /* Update # of records in parent node */
@@ -1392,36 +1526,39 @@ H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     curr_node_ptr->node_nrec--;
 
     /* Mark grandparent as dirty, if given */
-    if(parent_cache_info_flags_ptr)
+    if (parent_cache_info_flags_ptr)
         *parent_cache_info_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0, hdr, internal);
-    if(depth > 1) {
-        H5B2_assert_internal2(internal->node_ptrs[idx - 1].all_nrec, hdr, (H5B2_internal_t *)left_child, (H5B2_internal_t *)middle_child);
+    if (depth > 1) {
+        H5B2_assert_internal2(internal->node_ptrs[idx - 1].all_nrec, hdr, (H5B2_internal_t *)left_child,
+                              (H5B2_internal_t *)middle_child);
         H5B2_assert_internal(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)middle_child);
     } /* end if */
     else {
         H5B2_assert_leaf2(hdr, (H5B2_leaf_t *)left_child, (H5B2_leaf_t *)middle_child);
         H5B2_assert_leaf(hdr, (H5B2_leaf_t *)middle_child);
-    } /* end else */
+    }  /* end else */
 #endif /* H5B2_DEBUG */
 
 done:
     /* Unlock left & middle nodes (marked as dirty) */
-    if(left_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
+    if (left_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, left_addr, left_child, left_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
-    if(middle_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, middle_addr, middle_child, middle_child_flags) < 0)
+    if (middle_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, middle_addr, middle_child, middle_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     /* Delete right node & remove from cache (marked as dirty) */
-    if(right_child && H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
+    if (right_child &&
+        H5AC_unprotect(hdr->f, dxpl_id, child_class, right_addr, right_child, right_child_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_merge3() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_swap_leaf
  *
@@ -1438,15 +1575,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_internal_t *internal, unsigned *internal_flags_ptr,
-    unsigned idx, void *swap_loc)
+H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal_t *internal,
+               unsigned *internal_flags_ptr, unsigned idx, void *swap_loc)
 {
-    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
-    haddr_t child_addr;                 /* Address of child node */
-    void *child = NULL;                 /* Pointer to child node */
-    uint8_t *child_native;              /* Pointer to child's native records */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5AC_class_t *child_class;         /* Pointer to child node's class info */
+    haddr_t             child_addr;          /* Address of child node */
+    void *              child = NULL;        /* Pointer to child node */
+    uint8_t *           child_native;        /* Pointer to child's native records */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1457,34 +1593,37 @@ H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(idx <= internal->nrec);
 
     /* Check for the kind of B-tree node to swap */
-    if(depth > 1) {
-        H5B2_internal_t *child_internal;        /* Pointer to internal node */
+    if (depth > 1) {
+        H5B2_internal_t *child_internal; /* Pointer to internal node */
 
         /* Setup information for unlocking child node */
         child_class = H5AC_BT2_INT;
-        child_addr = internal->node_ptrs[idx].addr;
+        child_addr  = internal->node_ptrs[idx].addr;
 
         /* Lock B-tree child nodes */
-        if(NULL == (child_internal = H5B2_protect_internal(hdr, dxpl_id, child_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
+        if (NULL == (child_internal =
+                         H5B2_protect_internal(hdr, dxpl_id, child_addr, internal->node_ptrs[idx].node_nrec,
+                                               (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
         /* More setup for accessing child node information */
-        child = child_internal;
+        child        = child_internal;
         child_native = child_internal->int_native;
     } /* end if */
     else {
-        H5B2_leaf_t *child_leaf;        /* Pointer to leaf node */
+        H5B2_leaf_t *child_leaf; /* Pointer to leaf node */
 
         /* Setup information for unlocking child nodes */
         child_class = H5AC_BT2_LEAF;
-        child_addr = internal->node_ptrs[idx].addr;
+        child_addr  = internal->node_ptrs[idx].addr;
 
         /* Lock B-tree child node */
-        if(NULL == (child_leaf = H5B2_protect_leaf(hdr, dxpl_id, child_addr, internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
+        if (NULL == (child_leaf = H5B2_protect_leaf(hdr, dxpl_id, child_addr,
+                                                    internal->node_ptrs[idx].node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* More setup for accessing child node information */
-        child = child_leaf;
+        child        = child_leaf;
         child_native = child_leaf->leaf_native;
     } /* end else */
 
@@ -1498,7 +1637,7 @@ H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0, hdr, internal);
-    if(depth > 1)
+    if (depth > 1)
         H5B2_assert_internal(internal->node_ptrs[idx].all_nrec, hdr, (H5B2_internal_t *)child);
     else
         H5B2_assert_leaf(hdr, (H5B2_leaf_t *)child);
@@ -1506,13 +1645,12 @@ H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
 
 done:
     /* Unlock child node */
-    if(child && H5AC_unprotect(hdr->f, dxpl_id, child_class, child_addr, child, H5AC__DIRTIED_FLAG) < 0)
+    if (child && H5AC_unprotect(hdr->f, dxpl_id, child_class, child_addr, child, H5AC__DIRTIED_FLAG) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_swap_leaf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_insert_leaf
  *
@@ -1527,13 +1665,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
-    H5B2_nodepos_t curr_pos, void *udata)
+H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos,
+                 void *udata)
 {
-    H5B2_leaf_t *leaf;                  /* Pointer to leaf node */
-    int         cmp;                    /* Comparison value of records */
-    unsigned    idx;                    /* Location of record which matches key */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_leaf_t *leaf;                /* Pointer to leaf node */
+    int          cmp;                 /* Comparison value of records */
+    unsigned     idx;                 /* Location of record which matches key */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1543,7 +1681,8 @@ H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
     HDassert(H5F_addr_defined(curr_node_ptr->addr));
 
     /* Lock current B-tree node */
-    if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, H5AC_WRITE)))
+    if (NULL ==
+        (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
     /* Must have a leaf node with enough space to insert a record now */
@@ -1554,24 +1693,25 @@ H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
     HDassert(leaf->nrec == curr_node_ptr->node_nrec);
 
     /* Check for inserting into empty leaf */
-    if(leaf->nrec == 0)
+    if (leaf->nrec == 0)
         idx = 0;
     else {
         /* Find correct location to insert this record */
-        if(H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) < 0)
+        if (H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-        if(cmp == 0)
+        if (cmp == 0)
             HGOTO_ERROR(H5E_BTREE, H5E_EXISTS, FAIL, "record is already in B-tree")
-        if(cmp > 0)
+        if (cmp > 0)
             idx++;
 
         /* Make room for new record */
-        if(idx < leaf->nrec)
-            HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx + 1), H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size * (leaf->nrec - idx));
+        if (idx < leaf->nrec)
+            HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx + 1), H5B2_LEAF_NREC(leaf, hdr, idx),
+                      hdr->cls->nrec_size * (leaf->nrec - idx));
     } /* end else */
 
     /* Make callback to store record in native form */
-    if((hdr->cls->store)(H5B2_LEAF_NREC(leaf, hdr, idx), udata) < 0)
+    if ((hdr->cls->store)(H5B2_LEAF_NREC(leaf, hdr, idx), udata) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into leaf node")
 
     /* Update record count for node pointer to current node */
@@ -1583,34 +1723,36 @@ H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
 
     /* Check for new record being the min or max for the tree */
     /* (Don't use 'else' for the idx check, to allow for root leaf node) */
-    if(H5B2_POS_MIDDLE != curr_pos) {
-        if(idx == 0) {
-            if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                if(hdr->min_native_rec == NULL)
-                    if(NULL == (hdr->min_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for v2 B-tree min record info")
+    if (H5B2_POS_MIDDLE != curr_pos) {
+        if (idx == 0) {
+            if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                if (hdr->min_native_rec == NULL)
+                    if (NULL == (hdr->min_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL,
+                                    "memory allocation failed for v2 B-tree min record info")
                 HDmemcpy(hdr->min_native_rec, H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size);
             } /* end if */
-        } /* end if */
-        if(idx == (unsigned)(leaf->nrec - 1)) {
-            if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                if(hdr->max_native_rec == NULL)
-                    if(NULL == (hdr->max_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for v2 B-tree max record info")
+        }     /* end if */
+        if (idx == (unsigned)(leaf->nrec - 1)) {
+            if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                if (hdr->max_native_rec == NULL)
+                    if (NULL == (hdr->max_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL,
+                                    "memory allocation failed for v2 B-tree max record info")
                 HDmemcpy(hdr->max_native_rec, H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size);
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
 done:
     /* Release the B-tree leaf node (marked as dirty) */
-    if(leaf && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, leaf, H5AC__DIRTIED_FLAG) < 0)
+    if (leaf &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, leaf, H5AC__DIRTIED_FLAG) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release leaf B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_insert_leaf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_insert_internal
  *
@@ -1625,15 +1767,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    unsigned *parent_cache_info_flags_ptr, H5B2_node_ptr_t *curr_node_ptr,
-    H5B2_nodepos_t curr_pos, void *udata)
+H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, unsigned *parent_cache_info_flags_ptr,
+                     H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, void *udata)
 {
-    H5B2_internal_t *internal = NULL;   /* Pointer to internal node */
-    unsigned internal_flags = H5AC__NO_FLAGS_SET;
-    unsigned    idx;                    /* Location of record which matches key */
-    H5B2_nodepos_t next_pos = H5B2_POS_MIDDLE;    /* Position of node */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_internal_t *internal       = NULL; /* Pointer to internal node */
+    unsigned         internal_flags = H5AC__NO_FLAGS_SET;
+    unsigned         idx;                         /* Location of record which matches key */
+    H5B2_nodepos_t   next_pos  = H5B2_POS_MIDDLE; /* Position of node */
+    herr_t           ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1644,22 +1785,23 @@ H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(H5F_addr_defined(curr_node_ptr->addr));
 
     /* Lock current B-tree node */
-    if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, depth, H5AC_WRITE)))
+    if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec,
+                                                  depth, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
     /* Split or redistribute child node pointers, if necessary */
     {
-        int         cmp;        /* Comparison value of records */
-        unsigned retries;       /* Number of times to attempt redistribution */
-        size_t      split_nrec; /* Number of records to split node at */
+        int      cmp;        /* Comparison value of records */
+        unsigned retries;    /* Number of times to attempt redistribution */
+        size_t   split_nrec; /* Number of records to split node at */
 
         /* Locate node pointer for child */
-        if(H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, 
-                               udata, &idx, &cmp) < 0)
+        if (H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx,
+                               &cmp) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-        if(cmp == 0)
+        if (cmp == 0)
             HGOTO_ERROR(H5E_BTREE, H5E_EXISTS, FAIL, "record is already in B-tree")
-        if(cmp > 0)
+        if (cmp > 0)
             idx++;
 
         /* Set the number of redistribution retries */
@@ -1674,77 +1816,82 @@ H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
         split_nrec = hdr->node_info[depth - 1].split_nrec;
 
         /* Preemptively split/redistribute a node we will enter */
-        while(internal->node_ptrs[idx].node_nrec == split_nrec) {
+        while (internal->node_ptrs[idx].node_nrec == split_nrec) {
             /* Attempt to redistribute records among children */
-            if(idx == 0) {    /* Left-most child */
-                if(retries > 0 && (internal->node_ptrs[idx + 1].node_nrec < split_nrec)) {
-                    if(H5B2_redistribute2(hdr, dxpl_id, depth, internal, idx) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+            if (idx == 0) { /* Left-most child */
+                if (retries > 0 && (internal->node_ptrs[idx + 1].node_nrec < split_nrec)) {
+                    if (H5B2_redistribute2(hdr, dxpl_id, depth, internal, idx) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_split1(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, idx) < 0)
+                    if (H5B2_split1(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, idx) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split child node")
-                } /* end else */
-            } /* end if */
-            else if(idx == internal->nrec) { /* Right-most child */
-                if(retries > 0 && (internal->node_ptrs[idx - 1].node_nrec < split_nrec)) {
-                    if(H5B2_redistribute2(hdr, dxpl_id, depth, internal, (idx - 1)) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+                }                             /* end else */
+            }                                 /* end if */
+            else if (idx == internal->nrec) { /* Right-most child */
+                if (retries > 0 && (internal->node_ptrs[idx - 1].node_nrec < split_nrec)) {
+                    if (H5B2_redistribute2(hdr, dxpl_id, depth, internal, (idx - 1)) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_split1(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, idx) < 0)
+                    if (H5B2_split1(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, idx) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split child node")
-                } /* end else */
-            } /* end if */
+                }  /* end else */
+            }      /* end if */
             else { /* Middle child */
-                if(retries > 0 && ((internal->node_ptrs[idx + 1].node_nrec < split_nrec) ||
-                            (internal->node_ptrs[idx - 1].node_nrec < split_nrec))) {
-                    if(H5B2_redistribute3(hdr, dxpl_id, depth, internal, &internal_flags, idx) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+                if (retries > 0 && ((internal->node_ptrs[idx + 1].node_nrec < split_nrec) ||
+                                    (internal->node_ptrs[idx - 1].node_nrec < split_nrec))) {
+                    if (H5B2_redistribute3(hdr, dxpl_id, depth, internal, &internal_flags, idx) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_split1(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, idx) < 0)
+                    if (H5B2_split1(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, idx) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split child node")
                 } /* end else */
-            } /* end else */
+            }     /* end else */
 
             /* Locate node pointer for child (after split/redistribute) */
-            /* Actually, this can be easily updated (for 2-node redistrib.) and shouldn't require re-searching */
-            if(H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, 
-                                   udata, &idx, &cmp) < 0)
+            /* Actually, this can be easily updated (for 2-node redistrib.) and shouldn't require re-searching
+             */
+            if (H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx,
+                                   &cmp) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-            if(cmp == 0)
+            if (cmp == 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_EXISTS, FAIL, "record is already in B-tree")
-            if(cmp > 0)
+            if (cmp > 0)
                 idx++;
 
             /* Decrement the number of redistribution retries left */
             retries--;
         } /* end while */
-    } /* end block */
+    }     /* end block */
 
     /* Check if this node is left/right-most */
-    if(H5B2_POS_MIDDLE != curr_pos) {
-        if(idx == 0) {
-            if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
+    if (H5B2_POS_MIDDLE != curr_pos) {
+        if (idx == 0) {
+            if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
                 next_pos = H5B2_POS_LEFT;
         } /* end if */
-        else if(idx == internal->nrec) {
-            if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
+        else if (idx == internal->nrec) {
+            if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
                 next_pos = H5B2_POS_RIGHT;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Attempt to insert node */
-    if(depth > 1) {
-        if(H5B2_insert_internal(hdr, dxpl_id, (depth - 1), &internal_flags, &internal->node_ptrs[idx], next_pos, udata) < 0)
+    if (depth > 1) {
+        if (H5B2_insert_internal(hdr, dxpl_id, (depth - 1), &internal_flags, &internal->node_ptrs[idx],
+                                 next_pos, udata) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree internal node")
     } /* end if */
     else {
-        if(H5B2_insert_leaf(hdr, dxpl_id, &internal->node_ptrs[idx], next_pos, udata) < 0)
+        if (H5B2_insert_leaf(hdr, dxpl_id, &internal->node_ptrs[idx], next_pos, udata) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree leaf node")
     } /* end else */
 
@@ -1756,13 +1903,13 @@ H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
 
 done:
     /* Release the B-tree internal node */
-    if(internal && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, internal, internal_flags) < 0)
+    if (internal &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, internal, internal_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_insert_internal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_create_leaf
  *
@@ -1780,8 +1927,8 @@ done:
 herr_t
 H5B2_create_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr)
 {
-    H5B2_leaf_t *leaf = NULL;           /* Pointer to new leaf node created */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5B2_leaf_t *leaf      = NULL;    /* Pointer to new leaf node created */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1790,48 +1937,48 @@ H5B2_create_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr)
     HDassert(node_ptr);
 
     /* Allocate memory for leaf information */
-    if(NULL == (leaf = H5FL_MALLOC(H5B2_leaf_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree leaf info")
+    if (NULL == (leaf = H5FL_MALLOC(H5B2_leaf_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree leaf info")
 
     /* Set metadata cache info */
     HDmemset(&leaf->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Increment ref. count on B-tree header */
-    if(H5B2_hdr_incr(hdr) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, FAIL, "can't increment ref. count on B-tree header")
+    if (H5B2_hdr_incr(hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, FAIL, "can't increment ref. count on B-tree header")
 
     /* Share B-tree header information */
     leaf->hdr = hdr;
 
     /* Allocate space for the native keys in memory */
-    if(NULL == (leaf->leaf_native = (uint8_t *)H5FL_FAC_MALLOC(hdr->node_info[0].nat_rec_fac)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree leaf native keys")
+    if (NULL == (leaf->leaf_native = (uint8_t *)H5FL_FAC_MALLOC(hdr->node_info[0].nat_rec_fac)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree leaf native keys")
 #ifdef H5_CLEAR_MEMORY
-HDmemset(leaf->leaf_native, 0, hdr->cls->nrec_size * hdr->node_info[0].max_nrec);
+    HDmemset(leaf->leaf_native, 0, hdr->cls->nrec_size * hdr->node_info[0].max_nrec);
 #endif /* H5_CLEAR_MEMORY */
 
     /* Set number of records */
     leaf->nrec = 0;
 
     /* Allocate space on disk for the leaf */
-    if(HADDR_UNDEF == (node_ptr->addr = H5MF_alloc(hdr->f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)hdr->node_size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for B-tree leaf node")
+    if (HADDR_UNDEF ==
+        (node_ptr->addr = H5MF_alloc(hdr->f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)hdr->node_size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for B-tree leaf node")
 
     /* Cache the new B-tree node */
-    if(H5AC_insert_entry(hdr->f, dxpl_id, H5AC_BT2_LEAF, node_ptr->addr, leaf, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree leaf to cache")
+    if (H5AC_insert_entry(hdr->f, dxpl_id, H5AC_BT2_LEAF, node_ptr->addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree leaf to cache")
 
 done:
-    if(ret_value < 0) {
-	if(leaf)
-            if(H5B2_leaf_free(leaf) < 0)
+    if (ret_value < 0) {
+        if (leaf)
+            if (H5B2_leaf_free(leaf) < 0)
                 HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to release v2 B-tree leaf node")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_create_leaf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_protect_leaf
  *
@@ -1846,11 +1993,10 @@ done:
  *-------------------------------------------------------------------------
  */
 H5B2_leaf_t *
-H5B2_protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec,
-    H5AC_protect_t rw)
+H5B2_protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec, H5AC_protect_t rw)
 {
-    H5B2_leaf_cache_ud_t udata;         /* User-data for callback */
-    H5B2_leaf_t *ret_value;             /* Return value */
+    H5B2_leaf_cache_ud_t udata;     /* User-data for callback */
+    H5B2_leaf_t *        ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1859,19 +2005,18 @@ H5B2_protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec,
     HDassert(H5F_addr_defined(addr));
 
     /* Set up user data for callback */
-    udata.f = hdr->f;
+    udata.f   = hdr->f;
     udata.hdr = hdr;
     H5_CHECKED_ASSIGN(udata.nrec, uint16_t, nrec, unsigned)
 
     /* Protect the leaf node */
-    if(NULL == (ret_value = (H5B2_leaf_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_BT2_LEAF, addr, &udata, rw)))
+    if (NULL == (ret_value = (H5B2_leaf_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_BT2_LEAF, addr, &udata, rw)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to protect B-tree leaf node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_protect_leaf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_create_internal
  *
@@ -1887,11 +2032,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_create_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr,
-    unsigned depth)
+H5B2_create_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr, unsigned depth)
 {
-    H5B2_internal_t *internal = NULL;   /* Pointer to new internal node created */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_internal_t *internal  = NULL;    /* Pointer to new internal node created */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1901,56 +2045,59 @@ H5B2_create_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr,
     HDassert(depth > 0);
 
     /* Allocate memory for internal node information */
-    if(NULL == (internal = H5FL_MALLOC(H5B2_internal_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal info")
+    if (NULL == (internal = H5FL_MALLOC(H5B2_internal_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal info")
 
     /* Set metadata cache info */
     HDmemset(&internal->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Increment ref. count on B-tree header */
-    if(H5B2_hdr_incr(hdr) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, FAIL, "can't increment ref. count on B-tree header")
+    if (H5B2_hdr_incr(hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINC, FAIL, "can't increment ref. count on B-tree header")
 
     /* Share B-tree header information */
     internal->hdr = hdr;
 
     /* Allocate space for the native keys in memory */
-    if(NULL == (internal->int_native = (uint8_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].nat_rec_fac)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal native keys")
+    if (NULL == (internal->int_native = (uint8_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].nat_rec_fac)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "memory allocation failed for B-tree internal native keys")
 #ifdef H5_CLEAR_MEMORY
-HDmemset(internal->int_native, 0, hdr->cls->nrec_size * hdr->node_info[depth].max_nrec);
+    HDmemset(internal->int_native, 0, hdr->cls->nrec_size * hdr->node_info[depth].max_nrec);
 #endif /* H5_CLEAR_MEMORY */
 
     /* Allocate space for the node pointers in memory */
-    if(NULL == (internal->node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].node_ptr_fac)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal node pointers")
+    if (NULL ==
+        (internal->node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].node_ptr_fac)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "memory allocation failed for B-tree internal node pointers")
 #ifdef H5_CLEAR_MEMORY
-HDmemset(internal->node_ptrs, 0, sizeof(H5B2_node_ptr_t) * (hdr->node_info[depth].max_nrec + 1));
+    HDmemset(internal->node_ptrs, 0, sizeof(H5B2_node_ptr_t) * (hdr->node_info[depth].max_nrec + 1));
 #endif /* H5_CLEAR_MEMORY */
 
     /* Set number of records & depth of the node */
-    internal->nrec = 0;
+    internal->nrec  = 0;
     internal->depth = (uint16_t)depth;
 
     /* Allocate space on disk for the internal node */
-    if(HADDR_UNDEF == (node_ptr->addr = H5MF_alloc(hdr->f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)hdr->node_size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for B-tree internal node")
+    if (HADDR_UNDEF ==
+        (node_ptr->addr = H5MF_alloc(hdr->f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)hdr->node_size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for B-tree internal node")
 
     /* Cache the new B-tree node */
-    if(H5AC_insert_entry(hdr->f, dxpl_id, H5AC_BT2_INT, node_ptr->addr, internal, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree internal node to cache")
+    if (H5AC_insert_entry(hdr->f, dxpl_id, H5AC_BT2_INT, node_ptr->addr, internal, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree internal node to cache")
 
 done:
-    if(ret_value < 0) {
-	if(internal)
-            if(H5B2_internal_free(internal) < 0)
+    if (ret_value < 0) {
+        if (internal)
+            if (H5B2_internal_free(internal) < 0)
                 HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to release v2 B-tree internal node")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_create_internal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_protect_internal
  *
@@ -1965,11 +2112,11 @@ done:
  *-------------------------------------------------------------------------
  */
 H5B2_internal_t *
-H5B2_protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr,
-    unsigned nrec, unsigned depth, H5AC_protect_t rw)
+H5B2_protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec, unsigned depth,
+                      H5AC_protect_t rw)
 {
     H5B2_internal_cache_ud_t udata;     /* User data to pass through to cache 'deserialize' callback */
-    H5B2_internal_t *ret_value;         /* Return value */
+    H5B2_internal_t *        ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1979,20 +2126,20 @@ H5B2_protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr,
     HDassert(depth > 0);
 
     /* Set up user data for callback */
-    udata.f = hdr->f;
+    udata.f   = hdr->f;
     udata.hdr = hdr;
     H5_CHECKED_ASSIGN(udata.nrec, uint16_t, nrec, unsigned)
     H5_CHECKED_ASSIGN(udata.depth, uint16_t, depth, unsigned)
 
     /* Protect the internal node */
-    if(NULL == (ret_value = (H5B2_internal_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_BT2_INT, addr, &udata, rw)))
+    if (NULL ==
+        (ret_value = (H5B2_internal_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_BT2_INT, addr, &udata, rw)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to protect B-tree internal node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_protect_internal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_iterate_node
  *
@@ -2011,16 +2158,16 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    const H5B2_node_ptr_t *curr_node, H5B2_operator_t op, void *op_data)
+H5B2_iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, const H5B2_node_ptr_t *curr_node,
+                  H5B2_operator_t op, void *op_data)
 {
-    const H5AC_class_t *curr_node_class = NULL; /* Pointer to current node's class info */
-    void *node = NULL;                  /* Pointers to current node */
-    uint8_t *node_native;               /* Pointers to node's native records */
-    uint8_t *native = NULL;             /* Pointers to copy of node's native records */
-    H5B2_node_ptr_t *node_ptrs = NULL;  /* Pointers to node's node pointers */
-    unsigned u;                         /* Local index */
-    herr_t ret_value = H5_ITER_CONT;    /* Iterator return value */
+    const H5AC_class_t *curr_node_class = NULL;   /* Pointer to current node's class info */
+    void *              node            = NULL;   /* Pointers to current node */
+    uint8_t *           node_native;              /* Pointers to node's native records */
+    uint8_t *           native    = NULL;         /* Pointers to copy of node's native records */
+    H5B2_node_ptr_t *   node_ptrs = NULL;         /* Pointers to node's node pointers */
+    unsigned            u;                        /* Local index */
+    herr_t              ret_value = H5_ITER_CONT; /* Iterator return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2030,82 +2177,86 @@ H5B2_iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(op);
 
     /* Protect current node & set up variables */
-    if(depth > 0) {
-        H5B2_internal_t *internal;     /* Pointer to internal node */
+    if (depth > 0) {
+        H5B2_internal_t *internal; /* Pointer to internal node */
 
         /* Lock the current B-tree node */
-        if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec, depth, H5AC_READ)))
+        if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec,
+                                                      depth, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
         /* Set up information about current node */
         curr_node_class = H5AC_BT2_INT;
-        node = internal;
-        node_native = internal->int_native;
+        node            = internal;
+        node_native     = internal->int_native;
 
         /* Allocate space for the node pointers in memory */
-        if(NULL == (node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].node_ptr_fac)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal node pointers")
+        if (NULL == (node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].node_ptr_fac)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                        "memory allocation failed for B-tree internal node pointers")
 
         /* Copy the node pointers */
-        HDmemcpy(node_ptrs, internal->node_ptrs, (sizeof(H5B2_node_ptr_t) * (size_t)(curr_node->node_nrec + 1)));
+        HDmemcpy(node_ptrs, internal->node_ptrs,
+                 (sizeof(H5B2_node_ptr_t) * (size_t)(curr_node->node_nrec + 1)));
     } /* end if */
     else {
-        H5B2_leaf_t *leaf;             /* Pointer to leaf node */
+        H5B2_leaf_t *leaf; /* Pointer to leaf node */
 
         /* Lock the current B-tree node */
-        if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec, H5AC_READ)))
+        if (NULL ==
+            (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* Set up information about current node */
         curr_node_class = H5AC_BT2_LEAF;
-        node = leaf;
-        node_native = leaf->leaf_native;
+        node            = leaf;
+        node_native     = leaf->leaf_native;
     } /* end else */
 
     /* Allocate space for the native keys in memory */
-    if(NULL == (native = (uint8_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].nat_rec_fac)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal native keys")
+    if (NULL == (native = (uint8_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].nat_rec_fac)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "memory allocation failed for B-tree internal native keys")
 
     /* Copy the native keys */
     HDmemcpy(native, node_native, (hdr->cls->nrec_size * curr_node->node_nrec));
 
     /* Unlock the node */
-    if(H5AC_unprotect(hdr->f, dxpl_id, curr_node_class, curr_node->addr, node, H5AC__NO_FLAGS_SET) < 0)
+    if (H5AC_unprotect(hdr->f, dxpl_id, curr_node_class, curr_node->addr, node, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     node = NULL;
 
     /* Iterate through records, in order */
-    for(u = 0; u < curr_node->node_nrec && !ret_value; u++) {
+    for (u = 0; u < curr_node->node_nrec && !ret_value; u++) {
         /* Descend into child node, if current node is an internal node */
-        if(depth > 0) {
-            if((ret_value = H5B2_iterate_node(hdr, dxpl_id, (depth - 1), &(node_ptrs[u]), op, op_data)) < 0)
+        if (depth > 0) {
+            if ((ret_value = H5B2_iterate_node(hdr, dxpl_id, (depth - 1), &(node_ptrs[u]), op, op_data)) < 0)
                 HERROR(H5E_BTREE, H5E_CANTLIST, "node iteration failed");
         } /* end if */
 
         /* Make callback for current record */
-        if(!ret_value) {
-            if((ret_value = (op)(H5B2_NAT_NREC(native, hdr, u), op_data)) < 0)
+        if (!ret_value) {
+            if ((ret_value = (op)(H5B2_NAT_NREC(native, hdr, u), op_data)) < 0)
                 HERROR(H5E_BTREE, H5E_CANTLIST, "iterator function failed");
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Descend into last child node, if current node is an internal node */
-    if(!ret_value && depth > 0) {
-        if((ret_value = H5B2_iterate_node(hdr, dxpl_id, (depth - 1), &(node_ptrs[u]), op, op_data)) < 0)
+    if (!ret_value && depth > 0) {
+        if ((ret_value = H5B2_iterate_node(hdr, dxpl_id, (depth - 1), &(node_ptrs[u]), op, op_data)) < 0)
             HERROR(H5E_BTREE, H5E_CANTLIST, "node iteration failed");
     } /* end if */
 
 done:
     /* Release the node pointers & native records, if they were copied */
-    if(node_ptrs)
+    if (node_ptrs)
         node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_FREE(hdr->node_info[depth].node_ptr_fac, node_ptrs);
-    if(native)
+    if (native)
         native = (uint8_t *)H5FL_FAC_FREE(hdr->node_info[depth].nat_rec_fac, native);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_iterate_node() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_remove_leaf
  *
@@ -2120,15 +2271,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
-    H5B2_nodepos_t curr_pos, void *udata, H5B2_remove_t op, void *op_data)
+H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos,
+                 void *udata, H5B2_remove_t op, void *op_data)
 {
-    H5B2_leaf_t *leaf;                  /* Pointer to leaf node */
-    haddr_t     leaf_addr = HADDR_UNDEF;  /* Leaf address on disk */
-    unsigned    leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
-    unsigned    idx;                    /* Location of record which matches key */
-    int         cmp;                    /* Comparison value of records */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_leaf_t *leaf;                            /* Pointer to leaf node */
+    haddr_t      leaf_addr  = HADDR_UNDEF;        /* Leaf address on disk */
+    unsigned     leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
+    unsigned     idx;                             /* Location of record which matches key */
+    int          cmp;                             /* Comparison value of records */
+    herr_t       ret_value = SUCCEED;             /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2139,7 +2290,7 @@ H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
 
     /* Lock current B-tree node */
     leaf_addr = curr_node_ptr->addr;
-    if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, leaf_addr, curr_node_ptr->node_nrec, H5AC_WRITE)))
+    if (NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, leaf_addr, curr_node_ptr->node_nrec, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
     /* Sanity check number of records */
@@ -2147,35 +2298,35 @@ H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
     HDassert(leaf->nrec == curr_node_ptr->node_nrec);
 
     /* Find correct location to remove this record */
-    if(H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) < 0)
+    if (H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-    if(cmp != 0)
+    if (cmp != 0)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "record is not in B-tree")
 
     /* Check for invalidating the min/max record for the tree */
-    if(H5B2_POS_MIDDLE != curr_pos) {
+    if (H5B2_POS_MIDDLE != curr_pos) {
         /* (Don't use 'else' for the idx check, to allow for root leaf node) */
-        if(idx == 0) {
-            if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                if(hdr->min_native_rec) {
+        if (idx == 0) {
+            if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                if (hdr->min_native_rec) {
                     HDfree(hdr->min_native_rec);
                     hdr->min_native_rec = NULL;
                 } /* end if */
-            } /* end if */
-        } /* end if */
-        if(idx == (unsigned)(leaf->nrec - 1)) {
-            if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                if(hdr->max_native_rec) {
+            }     /* end if */
+        }         /* end if */
+        if (idx == (unsigned)(leaf->nrec - 1)) {
+            if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                if (hdr->max_native_rec) {
                     HDfree(hdr->max_native_rec);
                     hdr->max_native_rec = NULL;
                 } /* end if */
-            } /* end if */
-        } /* end if */
-    } /* end if */
+            }     /* end if */
+        }         /* end if */
+    }             /* end if */
 
     /* Make 'remove' callback if there is one */
-    if(op)
-        if((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data) < 0)
+    if (op)
+        if ((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record into leaf node")
 
     /* Update number of records in node */
@@ -2184,10 +2335,11 @@ H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
     /* Mark leaf node as dirty also */
     leaf_flags |= H5AC__DIRTIED_FLAG;
 
-    if(leaf->nrec > 0) {
+    if (leaf->nrec > 0) {
         /* Pack record out of leaf */
-        if(idx < leaf->nrec)
-            HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx), H5B2_LEAF_NREC(leaf, hdr, (idx + 1)), hdr->cls->nrec_size * (leaf->nrec - idx));
+        if (idx < leaf->nrec)
+            HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx), H5B2_LEAF_NREC(leaf, hdr, (idx + 1)),
+                      hdr->cls->nrec_size * (leaf->nrec - idx));
     } /* end if */
     else {
         /* Let the cache know that the object is deleted */
@@ -2202,13 +2354,12 @@ H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
 
 done:
     /* Release the B-tree leaf node */
-    if(leaf && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, leaf_addr, leaf, leaf_flags) < 0)
+    if (leaf && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, leaf_addr, leaf, leaf_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release leaf B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_remove_leaf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_remove_internal
  *
@@ -2223,21 +2374,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
-    void *swap_loc, unsigned depth, H5AC_info_t *parent_cache_info,
-    unsigned *parent_cache_info_flags_ptr, H5B2_nodepos_t curr_pos,
-    H5B2_node_ptr_t *curr_node_ptr, void *udata, H5B2_remove_t op, void *op_data)
+H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased, void *swap_loc, unsigned depth,
+                     H5AC_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr,
+                     H5B2_nodepos_t curr_pos, H5B2_node_ptr_t *curr_node_ptr, void *udata, H5B2_remove_t op,
+                     void *op_data)
 {
-    H5AC_info_t *new_cache_info;        /* Pointer to new cache info */
-    unsigned *new_cache_info_flags_ptr = NULL;
-    H5B2_node_ptr_t *new_node_ptr;      /* Pointer to new node pointer */
-    H5B2_internal_t *internal;          /* Pointer to internal node */
-    H5B2_nodepos_t next_pos = H5B2_POS_MIDDLE;  /* Position of next node */
-    unsigned internal_flags = H5AC__NO_FLAGS_SET;
-    haddr_t internal_addr;              /* Address of internal node */
-    size_t      merge_nrec;             /* Number of records to merge node at */
-    hbool_t     collapsed_root = FALSE; /* Whether the root was collapsed */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5AC_info_t *    new_cache_info; /* Pointer to new cache info */
+    unsigned *       new_cache_info_flags_ptr = NULL;
+    H5B2_node_ptr_t *new_node_ptr;                     /* Pointer to new node pointer */
+    H5B2_internal_t *internal;                         /* Pointer to internal node */
+    H5B2_nodepos_t   next_pos       = H5B2_POS_MIDDLE; /* Position of next node */
+    unsigned         internal_flags = H5AC__NO_FLAGS_SET;
+    haddr_t          internal_addr;            /* Address of internal node */
+    size_t           merge_nrec;               /* Number of records to merge node at */
+    hbool_t          collapsed_root = FALSE;   /* Whether the root was collapsed */
+    herr_t           ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2250,7 +2401,8 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
 
     /* Lock current B-tree node */
     internal_addr = curr_node_ptr->addr;
-    if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, internal_addr, curr_node_ptr->node_nrec, depth, H5AC_WRITE)))
+    if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, internal_addr, curr_node_ptr->node_nrec,
+                                                  depth, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
     /* Determine the correct number of records to merge at */
@@ -2258,28 +2410,28 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
 
     /* Check for needing to collapse the root node */
     /* (The root node is the only internal node allowed to have 1 record) */
-    if(internal->nrec == 1 &&
-            ((internal->node_ptrs[0].node_nrec + internal->node_ptrs[1].node_nrec) <= ((merge_nrec * 2) + 1))) {
+    if (internal->nrec == 1 &&
+        ((internal->node_ptrs[0].node_nrec + internal->node_ptrs[1].node_nrec) <= ((merge_nrec * 2) + 1))) {
 
         /* Merge children of root node */
-        if(H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr,
-                parent_cache_info_flags_ptr, internal, &internal_flags, 0) < 0)
+        if (H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                        &internal_flags, 0) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to merge child node")
 
         /* Let the cache know that the object is deleted */
         internal_flags |= H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
 
         /* Reset information in header's root node pointer */
-        curr_node_ptr->addr = internal->node_ptrs[0].addr;
+        curr_node_ptr->addr      = internal->node_ptrs[0].addr;
         curr_node_ptr->node_nrec = internal->node_ptrs[0].node_nrec;
 
         /* Indicate that the level of the B-tree decreased */
         *depth_decreased = TRUE;
 
         /* Set pointers for advancing to child node */
-        new_cache_info = parent_cache_info;
+        new_cache_info           = parent_cache_info;
         new_cache_info_flags_ptr = parent_cache_info_flags_ptr;
-        new_node_ptr = curr_node_ptr;
+        new_node_ptr             = curr_node_ptr;
 
         /* Set flag to indicate root was collapsed */
         collapsed_root = TRUE;
@@ -2289,18 +2441,18 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
     } /* end if */
     /* Merge or redistribute child node pointers, if necessary */
     else {
-        unsigned idx;           /* Location of record which matches key */
-        int cmp = 0;            /* Comparison value of records */
-        unsigned retries;       /* Number of times to attempt redistribution */
+        unsigned idx;     /* Location of record which matches key */
+        int      cmp = 0; /* Comparison value of records */
+        unsigned retries; /* Number of times to attempt redistribution */
 
         /* Locate node pointer for child */
-        if(swap_loc)
+        if (swap_loc)
             idx = 0;
         else {
-            if(H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, 
-                                   udata, &idx, &cmp) < 0)
+            if (H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx,
+                                   &cmp) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-            if(cmp >= 0)
+            if (cmp >= 0)
                 idx++;
         } /* end else */
 
@@ -2313,7 +2465,7 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
         retries = 2;
 
         /* Preemptively merge/redistribute a node we will enter */
-        while(internal->node_ptrs[idx].node_nrec == merge_nrec) {
+        while (internal->node_ptrs[idx].node_nrec == merge_nrec) {
             /* Attempt to redistribute records among children */
             /* (NOTE: These 2-node redistributions should actually get the
              *  record to promote from the node with more records. - QAK)
@@ -2321,49 +2473,54 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
             /* (NOTE: This code is the same in both H5B2_remove_internal() and
              *  H5B2_remove_internal_by_idx(), fix bugs in both places! - QAK)
              */
-            if(idx == 0) {    /* Left-most child */
-                if(retries > 0 && (internal->node_ptrs[idx + 1].node_nrec > merge_nrec)) {
-                    if(H5B2_redistribute2(hdr, dxpl_id, depth, internal, idx) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+            if (idx == 0) { /* Left-most child */
+                if (retries > 0 && (internal->node_ptrs[idx + 1].node_nrec > merge_nrec)) {
+                    if (H5B2_redistribute2(hdr, dxpl_id, depth, internal, idx) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, idx) < 0)
+                    if (H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, idx) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to merge child node")
-                } /* end else */
-            } /* end if */
-            else if(idx == internal->nrec) { /* Right-most child */
-                if(retries > 0 && (internal->node_ptrs[idx - 1].node_nrec > merge_nrec)) {
-                    if(H5B2_redistribute2(hdr, dxpl_id, depth, internal, (idx - 1)) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+                }                             /* end else */
+            }                                 /* end if */
+            else if (idx == internal->nrec) { /* Right-most child */
+                if (retries > 0 && (internal->node_ptrs[idx - 1].node_nrec > merge_nrec)) {
+                    if (H5B2_redistribute2(hdr, dxpl_id, depth, internal, (idx - 1)) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, (idx - 1)) < 0)
+                    if (H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, (idx - 1)) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to merge child node")
-                } /* end else */
-            } /* end if */
+                }  /* end else */
+            }      /* end if */
             else { /* Middle child */
-                if(retries > 0 && ((internal->node_ptrs[idx + 1].node_nrec > merge_nrec) ||
-                            (internal->node_ptrs[idx - 1].node_nrec > merge_nrec))) {
-                    if(H5B2_redistribute3(hdr, dxpl_id, depth, internal, &internal_flags, idx) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+                if (retries > 0 && ((internal->node_ptrs[idx + 1].node_nrec > merge_nrec) ||
+                                    (internal->node_ptrs[idx - 1].node_nrec > merge_nrec))) {
+                    if (H5B2_redistribute3(hdr, dxpl_id, depth, internal, &internal_flags, idx) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_merge3(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, idx) < 0)
+                    if (H5B2_merge3(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, idx) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to merge child node")
                 } /* end else */
-            } /* end else */
+            }     /* end else */
 
             /* Locate node pointer for child (after merge/redistribute) */
-            if(swap_loc)
+            if (swap_loc)
                 idx = 0;
             else {
-/* Actually, this can be easily updated (for 2-node redistrib.) and shouldn't require re-searching */
-                if(H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx, &cmp) < 0)
+                /* Actually, this can be easily updated (for 2-node redistrib.) and shouldn't require
+                 * re-searching */
+                if (H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata,
+                                       &idx, &cmp) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-                if(cmp >= 0)
+                if (cmp >= 0)
                     idx++;
             } /* end else */
 
@@ -2372,63 +2529,64 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
         } /* end while */
 
         /* Handle deleting a record from an internal node */
-        if(!swap_loc && cmp == 0)
+        if (!swap_loc && cmp == 0)
             swap_loc = H5B2_INT_NREC(internal, hdr, idx - 1);
 
         /* Swap record to delete with record from leaf, if we are the last internal node */
-        if(swap_loc && depth == 1)
-            if(H5B2_swap_leaf(hdr, dxpl_id, depth, internal, &internal_flags, idx, swap_loc) < 0)
+        if (swap_loc && depth == 1)
+            if (H5B2_swap_leaf(hdr, dxpl_id, depth, internal, &internal_flags, idx, swap_loc) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTSWAP, FAIL, "Can't swap records in B-tree")
 
         /* Set pointers for advancing to child node */
         new_cache_info_flags_ptr = &internal_flags;
-        new_cache_info = &internal->cache_info;
-        new_node_ptr = &internal->node_ptrs[idx];
+        new_cache_info           = &internal->cache_info;
+        new_node_ptr             = &internal->node_ptrs[idx];
 
         /* Indicate position of next node */
-        if(H5B2_POS_MIDDLE != curr_pos) {
-            if(idx == 0) {
-                if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
+        if (H5B2_POS_MIDDLE != curr_pos) {
+            if (idx == 0) {
+                if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
                     next_pos = H5B2_POS_LEFT;
             } /* end if */
-            else if(idx == internal->nrec) {
-                if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
+            else if (idx == internal->nrec) {
+                if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
                     next_pos = H5B2_POS_RIGHT;
             } /* end if */
-        } /* end if */
-    } /* end else */
+        }     /* end if */
+    }         /* end else */
 
     /* Attempt to remove record from child node */
-    if(depth > 1) {
-        if(H5B2_remove_internal(hdr, dxpl_id, depth_decreased, swap_loc, depth - 1,
-                new_cache_info, new_cache_info_flags_ptr, next_pos, new_node_ptr, udata, op, op_data) < 0)
+    if (depth > 1) {
+        if (H5B2_remove_internal(hdr, dxpl_id, depth_decreased, swap_loc, depth - 1, new_cache_info,
+                                 new_cache_info_flags_ptr, next_pos, new_node_ptr, udata, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record from B-tree internal node")
     } /* end if */
     else {
-        if(H5B2_remove_leaf(hdr, dxpl_id, new_node_ptr, next_pos, udata, op, op_data) < 0)
+        if (H5B2_remove_leaf(hdr, dxpl_id, new_node_ptr, next_pos, udata, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record from B-tree leaf node")
     } /* end else */
 
     /* Update record count for node pointer to current node */
-    if(!collapsed_root)
+    if (!collapsed_root)
         new_node_ptr->all_nrec--;
 
     /* Mark node as dirty */
     internal_flags |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
-    H5B2_assert_internal((!collapsed_root ? (curr_node_ptr->all_nrec - 1) : new_node_ptr->all_nrec), hdr, internal);
+    H5B2_assert_internal((!collapsed_root ? (curr_node_ptr->all_nrec - 1) : new_node_ptr->all_nrec), hdr,
+                         internal);
 #endif /* H5B2_DEBUG */
 
 done:
     /* Release the B-tree internal node */
-    if(internal && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, internal_addr, internal, internal_flags) < 0)
+    if (internal &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, internal_addr, internal, internal_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_remove_internal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_remove_leaf_by_idx
  *
@@ -2444,14 +2602,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos,
-    unsigned idx, H5B2_remove_t op, void *op_data)
+H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
+                        H5B2_nodepos_t curr_pos, unsigned idx, H5B2_remove_t op, void *op_data)
 {
-    H5B2_leaf_t *leaf;                  /* Pointer to leaf node */
-    haddr_t     leaf_addr = HADDR_UNDEF;  /* Leaf address on disk */
-    unsigned    leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_leaf_t *leaf;                            /* Pointer to leaf node */
+    haddr_t      leaf_addr  = HADDR_UNDEF;        /* Leaf address on disk */
+    unsigned     leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
+    herr_t       ret_value  = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2462,7 +2619,7 @@ H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
 
     /* Lock B-tree leaf node */
     leaf_addr = curr_node_ptr->addr;
-    if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, leaf_addr, curr_node_ptr->node_nrec, H5AC_WRITE)))
+    if (NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, leaf_addr, curr_node_ptr->node_nrec, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
     /* Sanity check number of records */
@@ -2471,29 +2628,29 @@ H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
     HDassert(idx < leaf->nrec);
 
     /* Check for invalidating the min/max record for the tree */
-    if(H5B2_POS_MIDDLE != curr_pos) {
+    if (H5B2_POS_MIDDLE != curr_pos) {
         /* (Don't use 'else' for the idx check, to allow for root leaf node) */
-        if(idx == 0) {
-            if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                if(hdr->min_native_rec) {
+        if (idx == 0) {
+            if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                if (hdr->min_native_rec) {
                     HDfree(hdr->min_native_rec);
                     hdr->min_native_rec = NULL;
                 } /* end if */
-            } /* end if */
-        } /* end if */
-        if(idx == (unsigned)(leaf->nrec - 1)) {
-            if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
-                if(hdr->max_native_rec) {
+            }     /* end if */
+        }         /* end if */
+        if (idx == (unsigned)(leaf->nrec - 1)) {
+            if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                if (hdr->max_native_rec) {
                     HDfree(hdr->max_native_rec);
                     hdr->max_native_rec = NULL;
                 } /* end if */
-            } /* end if */
-        } /* end if */
-    } /* end if */
+            }     /* end if */
+        }         /* end if */
+    }             /* end if */
 
     /* Make 'remove' callback if there is one */
-    if(op)
-        if((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data) < 0)
+    if (op)
+        if ((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record into leaf node")
 
     /* Update number of records in node */
@@ -2502,10 +2659,11 @@ H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
     /* Mark leaf node as dirty also */
     leaf_flags |= H5AC__DIRTIED_FLAG;
 
-    if(leaf->nrec > 0) {
+    if (leaf->nrec > 0) {
         /* Pack record out of leaf */
-        if(idx < leaf->nrec)
-            HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx), H5B2_LEAF_NREC(leaf, hdr, (idx + 1)), hdr->cls->nrec_size * (leaf->nrec - idx));
+        if (idx < leaf->nrec)
+            HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx), H5B2_LEAF_NREC(leaf, hdr, (idx + 1)),
+                      hdr->cls->nrec_size * (leaf->nrec - idx));
     } /* end if */
     else {
         /* Let the cache know that the object is deleted */
@@ -2520,13 +2678,12 @@ H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
 
 done:
     /* Release the B-tree leaf node */
-    if(leaf && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, leaf_addr, leaf, leaf_flags) < 0)
+    if (leaf && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, leaf_addr, leaf, leaf_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release leaf B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_remove_leaf_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_remove_internal_by_idx
  *
@@ -2542,22 +2699,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    hbool_t *depth_decreased, void *swap_loc, unsigned depth,
-    H5AC_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr,
-    H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, hsize_t n,
-    H5B2_remove_t op, void *op_data)
+H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased, void *swap_loc,
+                            unsigned depth, H5AC_info_t *parent_cache_info,
+                            unsigned *parent_cache_info_flags_ptr, H5B2_node_ptr_t *curr_node_ptr,
+                            H5B2_nodepos_t curr_pos, hsize_t n, H5B2_remove_t op, void *op_data)
 {
-    H5AC_info_t *new_cache_info;        /* Pointer to new cache info */
-    unsigned *new_cache_info_flags_ptr = NULL;
-    H5B2_node_ptr_t *new_node_ptr;      /* Pointer to new node pointer */
-    H5B2_internal_t *internal;          /* Pointer to internal node */
-    H5B2_nodepos_t next_pos = H5B2_POS_MIDDLE;  /* Position of next node */
-    unsigned internal_flags = H5AC__NO_FLAGS_SET;
-    haddr_t internal_addr;              /* Address of internal node */
-    size_t      merge_nrec;             /* Number of records to merge node at */
-    hbool_t     collapsed_root = FALSE; /* Whether the root was collapsed */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5AC_info_t *    new_cache_info; /* Pointer to new cache info */
+    unsigned *       new_cache_info_flags_ptr = NULL;
+    H5B2_node_ptr_t *new_node_ptr;                     /* Pointer to new node pointer */
+    H5B2_internal_t *internal;                         /* Pointer to internal node */
+    H5B2_nodepos_t   next_pos       = H5B2_POS_MIDDLE; /* Position of next node */
+    unsigned         internal_flags = H5AC__NO_FLAGS_SET;
+    haddr_t          internal_addr;            /* Address of internal node */
+    size_t           merge_nrec;               /* Number of records to merge node at */
+    hbool_t          collapsed_root = FALSE;   /* Whether the root was collapsed */
+    herr_t           ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2570,7 +2726,8 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
 
     /* Lock current B-tree node */
     internal_addr = curr_node_ptr->addr;
-    if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, internal_addr, curr_node_ptr->node_nrec, depth, H5AC_WRITE)))
+    if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, internal_addr, curr_node_ptr->node_nrec,
+                                                  depth, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
     HDassert(internal->nrec == curr_node_ptr->node_nrec);
     HDassert(depth == hdr->depth || internal->nrec > 1);
@@ -2580,29 +2737,29 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
 
     /* Check for needing to collapse the root node */
     /* (The root node is the only internal node allowed to have 1 record) */
-    if(internal->nrec == 1 &&
-            ((internal->node_ptrs[0].node_nrec + internal->node_ptrs[1].node_nrec) <= ((merge_nrec * 2) + 1))) {
+    if (internal->nrec == 1 &&
+        ((internal->node_ptrs[0].node_nrec + internal->node_ptrs[1].node_nrec) <= ((merge_nrec * 2) + 1))) {
         HDassert(depth == hdr->depth);
 
         /* Merge children of root node */
-        if(H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr,
-                parent_cache_info_flags_ptr, internal, &internal_flags, 0) < 0)
+        if (H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                        &internal_flags, 0) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to merge child node")
 
         /* Let the cache know that the object is deleted */
         internal_flags |= H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
 
         /* Reset information in header's root node pointer */
-        curr_node_ptr->addr = internal->node_ptrs[0].addr;
+        curr_node_ptr->addr      = internal->node_ptrs[0].addr;
         curr_node_ptr->node_nrec = internal->node_ptrs[0].node_nrec;
 
         /* Indicate that the level of the B-tree decreased */
         *depth_decreased = TRUE;
 
         /* Set pointers for advancing to child node */
-        new_cache_info = parent_cache_info;
+        new_cache_info           = parent_cache_info;
         new_cache_info_flags_ptr = parent_cache_info_flags_ptr;
-        new_node_ptr = curr_node_ptr;
+        new_node_ptr             = curr_node_ptr;
 
         /* Set flag to indicate root was collapsed */
         collapsed_root = TRUE;
@@ -2612,26 +2769,26 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
     } /* end if */
     /* Merge or redistribute child node pointers, if necessary */
     else {
-        hsize_t orig_n = n;     /* Original index looked for */
+        hsize_t  orig_n = n;    /* Original index looked for */
         unsigned idx;           /* Location of record which matches key */
-        hbool_t found = FALSE;  /* Comparison value of records */
+        hbool_t  found = FALSE; /* Comparison value of records */
         unsigned retries;       /* Number of times to attempt redistribution */
 
         /* Locate node pointer for child */
-        if(swap_loc)
+        if (swap_loc)
             idx = 0;
         else {
             /* Search for record with correct index */
-            for(idx = 0; idx < internal->nrec; idx++) {
+            for (idx = 0; idx < internal->nrec; idx++) {
                 /* Check which child node contains indexed record */
-                if(internal->node_ptrs[idx].all_nrec >= n) {
+                if (internal->node_ptrs[idx].all_nrec >= n) {
                     /* Check if record is in this node */
-                    if(internal->node_ptrs[idx].all_nrec == n) {
+                    if (internal->node_ptrs[idx].all_nrec == n) {
                         /* Indicate the record was found and that the index
                          *      in child nodes is zero from now on
                          */
                         found = TRUE;
-                        n = 0;
+                        n     = 0;
 
                         /* Increment to next record */
                         idx++;
@@ -2646,7 +2803,7 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
                  */
                 n -= (internal->node_ptrs[idx].all_nrec + 1);
             } /* end for */
-        } /* end else */
+        }     /* end else */
 
         /* Set the number of redistribution retries */
         /* This takes care of the case where a B-tree node needs to be
@@ -2657,7 +2814,7 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
         retries = 2;
 
         /* Preemptively merge/redistribute a node we will enter */
-        while(internal->node_ptrs[idx].node_nrec == merge_nrec) {
+        while (internal->node_ptrs[idx].node_nrec == merge_nrec) {
             /* Attempt to redistribute records among children */
             /* (NOTE: These 2-node redistributions should actually get the
              *  record to promote from the node with more records. - QAK)
@@ -2665,43 +2822,46 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
             /* (NOTE: This code is the same in both H5B2_remove_internal() and
              *  H5B2_remove_internal_by_idx(), fix bugs in both places! - QAK)
              */
-            if(idx == 0) {    /* Left-most child */
-                if(retries > 0 && (internal->node_ptrs[idx + 1].node_nrec > merge_nrec)) {
-                    if(H5B2_redistribute2(hdr, dxpl_id, depth, internal, idx) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+            if (idx == 0) { /* Left-most child */
+                if (retries > 0 && (internal->node_ptrs[idx + 1].node_nrec > merge_nrec)) {
+                    if (H5B2_redistribute2(hdr, dxpl_id, depth, internal, idx) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, idx) < 0)
+                    if (H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, idx) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to merge child node")
-                } /* end else */
-            } /* end if */
-            else if(idx == internal->nrec) { /* Right-most child */
-                if(retries > 0 && (internal->node_ptrs[idx - 1].node_nrec > merge_nrec)) {
-                    if(H5B2_redistribute2(hdr, dxpl_id, depth, internal, (idx - 1)) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+                }                             /* end else */
+            }                                 /* end if */
+            else if (idx == internal->nrec) { /* Right-most child */
+                if (retries > 0 && (internal->node_ptrs[idx - 1].node_nrec > merge_nrec)) {
+                    if (H5B2_redistribute2(hdr, dxpl_id, depth, internal, (idx - 1)) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, (idx - 1)) < 0)
+                    if (H5B2_merge2(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, (idx - 1)) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to merge child node")
-                } /* end else */
-            } /* end if */
+                }  /* end else */
+            }      /* end if */
             else { /* Middle child */
-                if(retries > 0 && ((internal->node_ptrs[idx + 1].node_nrec > merge_nrec) ||
-                            (internal->node_ptrs[idx - 1].node_nrec > merge_nrec))) {
-                    if(H5B2_redistribute3(hdr, dxpl_id, depth, internal, &internal_flags, idx) < 0)
-                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL, "unable to redistribute child node records")
+                if (retries > 0 && ((internal->node_ptrs[idx + 1].node_nrec > merge_nrec) ||
+                                    (internal->node_ptrs[idx - 1].node_nrec > merge_nrec))) {
+                    if (H5B2_redistribute3(hdr, dxpl_id, depth, internal, &internal_flags, idx) < 0)
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTREDISTRIBUTE, FAIL,
+                                    "unable to redistribute child node records")
                 } /* end if */
                 else {
-                    if(H5B2_merge3(hdr, dxpl_id, depth, curr_node_ptr,
-                           parent_cache_info_flags_ptr, internal, &internal_flags, idx) < 0)
+                    if (H5B2_merge3(hdr, dxpl_id, depth, curr_node_ptr, parent_cache_info_flags_ptr, internal,
+                                    &internal_flags, idx) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to merge child node")
                 } /* end else */
-            } /* end else */
+            }     /* end else */
 
             /* Locate node pointer for child (after merge/redistribute) */
-            if(swap_loc)
+            if (swap_loc)
                 idx = 0;
             else {
                 /* Count from the orginal index value again */
@@ -2713,16 +2873,16 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
                 found = FALSE;
 
                 /* Search for record with correct index */
-                for(idx = 0; idx < internal->nrec; idx++) {
+                for (idx = 0; idx < internal->nrec; idx++) {
                     /* Check which child node contains indexed record */
-                    if(internal->node_ptrs[idx].all_nrec >= n) {
+                    if (internal->node_ptrs[idx].all_nrec >= n) {
                         /* Check if record is in this node */
-                        if(internal->node_ptrs[idx].all_nrec == n) {
+                        if (internal->node_ptrs[idx].all_nrec == n) {
                             /* Indicate the record was found and that the index
                              *      in child nodes is zero from now on
                              */
                             found = TRUE;
-                            n = 0;
+                            n     = 0;
 
                             /* Increment to next record */
                             idx++;
@@ -2737,70 +2897,71 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
                      */
                     n -= (internal->node_ptrs[idx].all_nrec + 1);
                 } /* end for */
-            } /* end else */
+            }     /* end else */
 
             /* Decrement the number of redistribution retries left */
             retries--;
         } /* end while */
 
         /* Handle deleting a record from an internal node */
-        if(!swap_loc && found)
+        if (!swap_loc && found)
             swap_loc = H5B2_INT_NREC(internal, hdr, idx - 1);
 
         /* Swap record to delete with record from leaf, if we are the last internal node */
-        if(swap_loc && depth == 1)
-            if(H5B2_swap_leaf(hdr, dxpl_id, depth, internal, &internal_flags, idx, swap_loc) < 0)
+        if (swap_loc && depth == 1)
+            if (H5B2_swap_leaf(hdr, dxpl_id, depth, internal, &internal_flags, idx, swap_loc) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTSWAP, FAIL, "can't swap records in B-tree")
 
         /* Set pointers for advancing to child node */
         new_cache_info_flags_ptr = &internal_flags;
-        new_cache_info = &internal->cache_info;
-        new_node_ptr = &internal->node_ptrs[idx];
+        new_cache_info           = &internal->cache_info;
+        new_node_ptr             = &internal->node_ptrs[idx];
 
         /* Indicate position of next node */
-        if(H5B2_POS_MIDDLE != curr_pos) {
-            if(idx == 0) {
-                if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
+        if (H5B2_POS_MIDDLE != curr_pos) {
+            if (idx == 0) {
+                if (H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
                     next_pos = H5B2_POS_LEFT;
             } /* end if */
-            else if(idx == internal->nrec) {
-                if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
+            else if (idx == internal->nrec) {
+                if (H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
                     next_pos = H5B2_POS_RIGHT;
             } /* end if */
-        } /* end if */
-    } /* end else */
+        }     /* end if */
+    }         /* end else */
 
     /* Attempt to remove record from child node */
-    if(depth > 1) {
-        if(H5B2_remove_internal_by_idx(hdr, dxpl_id, depth_decreased, swap_loc, depth - 1,
-                new_cache_info, new_cache_info_flags_ptr, new_node_ptr, next_pos, n, op, op_data) < 0)
+    if (depth > 1) {
+        if (H5B2_remove_internal_by_idx(hdr, dxpl_id, depth_decreased, swap_loc, depth - 1, new_cache_info,
+                                        new_cache_info_flags_ptr, new_node_ptr, next_pos, n, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record from B-tree internal node")
     } /* end if */
     else {
-        if(H5B2_remove_leaf_by_idx(hdr, dxpl_id, new_node_ptr, next_pos, (unsigned)n, op, op_data) < 0)
+        if (H5B2_remove_leaf_by_idx(hdr, dxpl_id, new_node_ptr, next_pos, (unsigned)n, op, op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to remove record from B-tree leaf node")
     } /* end else */
 
     /* Update record count for node pointer to child node */
-    if(!collapsed_root)
+    if (!collapsed_root)
         new_node_ptr->all_nrec--;
 
     /* Mark node as dirty */
     internal_flags |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
-    H5B2_assert_internal((!collapsed_root ? (curr_node_ptr->all_nrec - 1) : new_node_ptr->all_nrec), hdr, internal);
+    H5B2_assert_internal((!collapsed_root ? (curr_node_ptr->all_nrec - 1) : new_node_ptr->all_nrec), hdr,
+                         internal);
 #endif /* H5B2_DEBUG */
 
 done:
     /* Release the B-tree internal node */
-    if(internal && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, internal_addr, internal, internal_flags) < 0)
+    if (internal &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, internal_addr, internal, internal_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_remove_internal_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_neighbor_leaf
  *
@@ -2828,14 +2989,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_neighbor_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
-    void *neighbor_loc, H5B2_compare_t comp, void *udata, H5B2_found_t op,
-    void *op_data)
+H5B2_neighbor_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr, void *neighbor_loc,
+                   H5B2_compare_t comp, void *udata, H5B2_found_t op, void *op_data)
 {
-    H5B2_leaf_t *leaf;                  /* Pointer to leaf node */
-    unsigned    idx;                    /* Location of record which matches key */
-    int         cmp = 0;                /* Comparison value of records */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_leaf_t *leaf;                /* Pointer to leaf node */
+    unsigned     idx;                 /* Location of record which matches key */
+    int          cmp       = 0;       /* Comparison value of records */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2846,48 +3006,49 @@ H5B2_neighbor_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_pt
     HDassert(op);
 
     /* Lock current B-tree node */
-    if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, H5AC_READ)))
+    if (NULL ==
+        (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, H5AC_READ)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
     /* Locate node pointer for child */
-    if(H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) < 0)
+    if (H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-    if(cmp > 0)
+    if (cmp > 0)
+        idx++;
+    else if (cmp == 0 && comp == H5B2_COMPARE_GREATER)
         idx++;
-    else
-        if(cmp == 0 && comp == H5B2_COMPARE_GREATER)
-            idx++;
 
     /* Set the neighbor location, if appropriate */
-    if(comp == H5B2_COMPARE_LESS) {
-        if(idx > 0)
+    if (comp == H5B2_COMPARE_LESS) {
+        if (idx > 0)
             neighbor_loc = H5B2_LEAF_NREC(leaf, hdr, idx - 1);
     } /* end if */
     else {
         HDassert(comp == H5B2_COMPARE_GREATER);
 
-        if(idx < leaf->nrec)
+        if (idx < leaf->nrec)
             neighbor_loc = H5B2_LEAF_NREC(leaf, hdr, idx);
     } /* end else */
 
     /* Make callback if neighbor record has been found */
-    if(neighbor_loc) {
+    if (neighbor_loc) {
         /* Make callback for current record */
-        if((op)(neighbor_loc, op_data) < 0)
-            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree neighbor operation")
+        if ((op)(neighbor_loc, op_data) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL,
+                        "'found' callback failed for B-tree neighbor operation")
     } /* end if */
     else
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "unable to find neighbor record in B-tree")
 
 done:
     /* Release the B-tree internal node */
-    if(leaf && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+    if (leaf &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, leaf, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree leaf node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_neighbor_leaf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_neighbor_internal
  *
@@ -2915,14 +3076,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_neighbor_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    H5B2_node_ptr_t *curr_node_ptr, void *neighbor_loc, H5B2_compare_t comp,
-    void *udata, H5B2_found_t op, void *op_data)
+H5B2_neighbor_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ptr,
+                       void *neighbor_loc, H5B2_compare_t comp, void *udata, H5B2_found_t op, void *op_data)
 {
-    H5B2_internal_t *internal;          /* Pointer to internal node */
-    unsigned    idx;                    /* Location of record which matches key */
-    int         cmp = 0;                /* Comparison value of records */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_internal_t *internal;            /* Pointer to internal node */
+    unsigned         idx;                 /* Location of record which matches key */
+    int              cmp       = 0;       /* Comparison value of records */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2934,47 +3094,51 @@ H5B2_neighbor_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(op);
 
     /* Lock current B-tree node */
-    if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, depth, H5AC_READ)))
+    if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec,
+                                                  depth, H5AC_READ)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
     /* Locate node pointer for child */
-    if(H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, 
-                           udata, &idx, &cmp) < 0)
+    if (H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx, &cmp) <
+        0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
-    if(cmp > 0)
+    if (cmp > 0)
         idx++;
 
     /* Set the neighbor location, if appropriate */
-    if(comp == H5B2_COMPARE_LESS) {
-        if(idx > 0)
+    if (comp == H5B2_COMPARE_LESS) {
+        if (idx > 0)
             neighbor_loc = H5B2_INT_NREC(internal, hdr, idx - 1);
     } /* end if */
     else {
         HDassert(comp == H5B2_COMPARE_GREATER);
 
-        if(idx < internal->nrec)
+        if (idx < internal->nrec)
             neighbor_loc = H5B2_INT_NREC(internal, hdr, idx);
     } /* end else */
 
     /* Attempt to find neighboring record */
-    if(depth > 1) {
-        if(H5B2_neighbor_internal(hdr, dxpl_id, depth - 1, &internal->node_ptrs[idx], neighbor_loc, comp, udata, op, op_data) < 0)
-            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "unable to find neighbor record in B-tree internal node")
+    if (depth > 1) {
+        if (H5B2_neighbor_internal(hdr, dxpl_id, depth - 1, &internal->node_ptrs[idx], neighbor_loc, comp,
+                                   udata, op, op_data) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL,
+                        "unable to find neighbor record in B-tree internal node")
     } /* end if */
     else {
-        if(H5B2_neighbor_leaf(hdr, dxpl_id, &internal->node_ptrs[idx], neighbor_loc, comp, udata, op, op_data) < 0)
+        if (H5B2_neighbor_leaf(hdr, dxpl_id, &internal->node_ptrs[idx], neighbor_loc, comp, udata, op,
+                               op_data) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "unable to find neighbor record in B-tree leaf node")
     } /* end else */
 
 done:
     /* Release the B-tree internal node */
-    if(internal && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, internal, H5AC__NO_FLAGS_SET) < 0)
+    if (internal &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, internal, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_neighbor_internal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_delete_node
  *
@@ -2990,13 +3154,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_delete_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    const H5B2_node_ptr_t *curr_node, H5B2_remove_t op, void *op_data)
+H5B2_delete_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, const H5B2_node_ptr_t *curr_node,
+                 H5B2_remove_t op, void *op_data)
 {
     const H5AC_class_t *curr_node_class = NULL; /* Pointer to current node's class info */
-    void *node = NULL;                  /* Pointers to current node */
-    uint8_t *native;                    /* Pointers to node's native records */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    void *              node            = NULL; /* Pointers to current node */
+    uint8_t *           native;                 /* Pointers to node's native records */
+    herr_t              ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3004,58 +3168,60 @@ H5B2_delete_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(hdr);
     HDassert(curr_node);
 
-    if(depth > 0) {
-        H5B2_internal_t *internal;     /* Pointer to internal node */
-        unsigned u;                    /* Local index */
+    if (depth > 0) {
+        H5B2_internal_t *internal; /* Pointer to internal node */
+        unsigned         u;        /* Local index */
 
         /* Lock the current B-tree node */
-        if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec, depth, H5AC_WRITE)))
+        if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec,
+                                                      depth, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
         /* Set up information about current node */
         curr_node_class = H5AC_BT2_INT;
-        node = internal;
-        native = internal->int_native;
+        node            = internal;
+        native          = internal->int_native;
 
         /* Descend into children */
-        for(u = 0; u < internal->nrec + (unsigned)1; u++)
-            if(H5B2_delete_node(hdr, dxpl_id, (depth - 1), &(internal->node_ptrs[u]), op, op_data) < 0)
+        for (u = 0; u < internal->nrec + (unsigned)1; u++)
+            if (H5B2_delete_node(hdr, dxpl_id, (depth - 1), &(internal->node_ptrs[u]), op, op_data) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "node descent failed")
     } /* end if */
     else {
-        H5B2_leaf_t *leaf;             /* Pointer to leaf node */
+        H5B2_leaf_t *leaf; /* Pointer to leaf node */
 
         /* Lock the current B-tree node */
-        if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec, H5AC_WRITE)))
+        if (NULL ==
+            (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* Set up information about current node */
         curr_node_class = H5AC_BT2_LEAF;
-        node = leaf;
-        native = leaf->leaf_native;
+        node            = leaf;
+        native          = leaf->leaf_native;
     } /* end else */
 
     /* If there's a callback defined, iterate over the records in this node */
-    if(op) {
-        unsigned u;             /* Local index */
+    if (op) {
+        unsigned u; /* Local index */
 
         /* Iterate through records in this node */
-        for(u = 0; u < curr_node->node_nrec; u++) {
+        for (u = 0; u < curr_node->node_nrec; u++) {
             /* Make callback for each record */
-            if((op)(H5B2_NAT_NREC(native, hdr, u), op_data) < 0)
+            if ((op)(H5B2_NAT_NREC(native, hdr, u), op_data) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "iterator function failed")
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Unlock & delete current node */
-    if(node && H5AC_unprotect(hdr->f, dxpl_id, curr_node_class, curr_node->addr, node, H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
+    if (node && H5AC_unprotect(hdr->f, dxpl_id, curr_node_class, curr_node->addr, node,
+                               H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_delete_node() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B2_node_size
  *
@@ -3070,11 +3236,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_node_size(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    const H5B2_node_ptr_t *curr_node, hsize_t *btree_size)
+H5B2_node_size(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, const H5B2_node_ptr_t *curr_node,
+               hsize_t *btree_size)
 {
-    H5B2_internal_t 	*internal = NULL;     	/* Pointer to internal node */
-    herr_t 		ret_value = SUCCEED;  	/* Iterator return value */
+    H5B2_internal_t *internal  = NULL;    /* Pointer to internal node */
+    herr_t           ret_value = SUCCEED; /* Iterator return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3085,18 +3251,19 @@ H5B2_node_size(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     HDassert(depth > 0);
 
     /* Lock the current B-tree node */
-    if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec, depth, H5AC_READ)))
+    if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node->addr, curr_node->node_nrec, depth,
+                                                  H5AC_READ)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
     /* Recursively descend into child nodes, if we are above the "twig" level in the B-tree */
-    if(depth > 1) {
-        unsigned 	u;                      /* Local index */
+    if (depth > 1) {
+        unsigned u; /* Local index */
 
         /* Descend into children */
-        for(u = 0; u < internal->nrec + (unsigned)1; u++)
-            if(H5B2_node_size(hdr, dxpl_id, (depth - 1), &(internal->node_ptrs[u]), btree_size) < 0)
+        for (u = 0; u < internal->nrec + (unsigned)1; u++)
+            if (H5B2_node_size(hdr, dxpl_id, (depth - 1), &(internal->node_ptrs[u]), btree_size) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "node iteration failed")
-    } /* end if */
+    }    /* end if */
     else /* depth is 1: count all the leaf nodes from this node */
         *btree_size += (hsize_t)(internal->nrec + 1) * hdr->node_size;
 
@@ -3104,13 +3271,13 @@ H5B2_node_size(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
     *btree_size += hdr->node_size;
 
 done:
-    if(internal && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node->addr, internal, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
+    if (internal &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node->addr, internal, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_node_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_internal_free
  *
@@ -3127,7 +3294,7 @@ done:
 herr_t
 H5B2_internal_free(H5B2_internal_t *internal)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3137,16 +3304,18 @@ H5B2_internal_free(H5B2_internal_t *internal)
     HDassert(internal);
 
     /* Release internal node's native key buffer */
-    if(internal->int_native)
-        internal->int_native = (uint8_t *)H5FL_FAC_FREE(internal->hdr->node_info[internal->depth].nat_rec_fac, internal->int_native);
+    if (internal->int_native)
+        internal->int_native = (uint8_t *)H5FL_FAC_FREE(internal->hdr->node_info[internal->depth].nat_rec_fac,
+                                                        internal->int_native);
 
     /* Release internal node's node pointer buffer */
-    if(internal->node_ptrs)
-        internal->node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_FREE(internal->hdr->node_info[internal->depth].node_ptr_fac, internal->node_ptrs);
+    if (internal->node_ptrs)
+        internal->node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_FREE(
+            internal->hdr->node_info[internal->depth].node_ptr_fac, internal->node_ptrs);
 
     /* Decrement ref. count on B-tree header */
-    if(H5B2_hdr_decr(internal->hdr) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTDEC, FAIL, "can't decrement ref. count on B-tree header")
+    if (H5B2_hdr_decr(internal->hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTDEC, FAIL, "can't decrement ref. count on B-tree header")
 
     /* Free B-tree internal node info */
     internal = H5FL_FREE(H5B2_internal_t, internal);
@@ -3155,7 +3324,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2_internal_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_leaf_free
  *
@@ -3172,7 +3340,7 @@ done:
 herr_t
 H5B2_leaf_free(H5B2_leaf_t *leaf)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3182,12 +3350,12 @@ H5B2_leaf_free(H5B2_leaf_t *leaf)
     HDassert(leaf);
 
     /* Release leaf's native key buffer */
-    if(leaf->leaf_native)
+    if (leaf->leaf_native)
         leaf->leaf_native = (uint8_t *)H5FL_FAC_FREE(leaf->hdr->node_info[0].nat_rec_fac, leaf->leaf_native);
 
     /* Decrement ref. count on B-tree header */
-    if(H5B2_hdr_decr(leaf->hdr) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTDEC, FAIL, "can't decrement ref. count on B-tree header")
+    if (H5B2_hdr_decr(leaf->hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTDEC, FAIL, "can't decrement ref. count on B-tree header")
 
     /* Free B-tree leaf node info */
     leaf = H5FL_FREE(H5B2_leaf_t, leaf);
@@ -3197,7 +3365,7 @@ done:
 } /* end H5B2_leaf_free() */
 
 #ifdef H5B2_DEBUG
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5B2_assert_leaf
  *
@@ -3217,10 +3385,9 @@ H5B2_assert_leaf(const H5B2_hdr_t *hdr, const H5B2_leaf_t *leaf)
     /* General sanity checking on node */
     HDassert(leaf->nrec <= hdr->node_info->split_nrec);
 
-    return(0);
+    return (0);
 } /* end H5B2_assert_leaf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_assert_leaf2
  *
@@ -3240,10 +3407,9 @@ H5B2_assert_leaf2(const H5B2_hdr_t *hdr, const H5B2_leaf_t *leaf, const H5B2_lea
     /* General sanity checking on node */
     HDassert(leaf->nrec <= hdr->node_info->split_nrec);
 
-    return(0);
+    return (0);
 } /* end H5B2_assert_leaf2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_assert_internal
  *
@@ -3260,31 +3426,30 @@ H5B2_assert_leaf2(const H5B2_hdr_t *hdr, const H5B2_leaf_t *leaf, const H5B2_lea
 static herr_t
 H5B2_assert_internal(hsize_t parent_all_nrec, const H5B2_hdr_t *hdr, const H5B2_internal_t *internal)
 {
-    hsize_t tot_all_nrec;       /* Total number of records at or below this node */
-    uint16_t u, v;               /* Local index variables */
+    hsize_t  tot_all_nrec; /* Total number of records at or below this node */
+    uint16_t u, v;         /* Local index variables */
 
     /* General sanity checking on node */
     HDassert(internal->nrec <= hdr->node_info->split_nrec);
 
     /* Sanity checking on node pointers */
     tot_all_nrec = internal->nrec;
-    for(u = 0; u < internal->nrec + 1; u++) {
+    for (u = 0; u < internal->nrec + 1; u++) {
         tot_all_nrec += internal->node_ptrs[u].all_nrec;
 
         HDassert(H5F_addr_defined(internal->node_ptrs[u].addr));
         HDassert(internal->node_ptrs[u].addr > 0);
-        for(v = 0; v < u; v++)
+        for (v = 0; v < u; v++)
             HDassert(internal->node_ptrs[u].addr != internal->node_ptrs[v].addr);
     } /* end for */
 
     /* Sanity check all_nrec total in parent */
-    if(parent_all_nrec > 0)
+    if (parent_all_nrec > 0)
         HDassert(tot_all_nrec == parent_all_nrec);
 
-    return(0);
+    return (0);
 } /* end H5B2_assert_internal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_assert_internal2
  *
@@ -3299,32 +3464,32 @@ H5B2_assert_internal(hsize_t parent_all_nrec, const H5B2_hdr_t *hdr, const H5B2_
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_assert_internal2(hsize_t parent_all_nrec, const H5B2_hdr_t *hdr, const H5B2_internal_t *internal, const H5B2_internal_t *internal2)
+H5B2_assert_internal2(hsize_t parent_all_nrec, const H5B2_hdr_t *hdr, const H5B2_internal_t *internal,
+                      const H5B2_internal_t *internal2)
 {
-    hsize_t tot_all_nrec;       /* Total number of records at or below this node */
-    uint16_t u, v;       /* Local index variables */
+    hsize_t  tot_all_nrec; /* Total number of records at or below this node */
+    uint16_t u, v;         /* Local index variables */
 
     /* General sanity checking on node */
     HDassert(internal->nrec <= hdr->node_info->split_nrec);
 
     /* Sanity checking on node pointers */
-    tot_all_nrec =internal->nrec;
-    for(u =0; u < internal->nrec + 1; u++) {
+    tot_all_nrec = internal->nrec;
+    for (u = 0; u < internal->nrec + 1; u++) {
         tot_all_nrec += internal->node_ptrs[u].all_nrec;
 
         HDassert(H5F_addr_defined(internal->node_ptrs[u].addr));
         HDassert(internal->node_ptrs[u].addr > 0);
-        for(v = 0; v < u; v++)
+        for (v = 0; v < u; v++)
             HDassert(internal->node_ptrs[u].addr != internal->node_ptrs[v].addr);
-        for(v = 0; v < internal2->nrec + 1; v++)
+        for (v = 0; v < internal2->nrec + 1; v++)
             HDassert(internal->node_ptrs[u].addr != internal2->node_ptrs[v].addr);
     } /* end for */
 
     /* Sanity check all_nrec total in parent */
-    if(parent_all_nrec > 0)
+    if (parent_all_nrec > 0)
         HDassert(tot_all_nrec == parent_all_nrec);
 
-    return(0);
+    return (0);
 } /* end H5B2_assert_internal2() */
 #endif /* H5B2_DEBUG */
-
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h
index d82077f..92b2975 100644
--- a/src/H5B2pkg.h
+++ b/src/H5B2pkg.h
@@ -30,89 +30,82 @@
 #include "H5B2private.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5FLprivate.h" /* Free Lists                           */
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
 /* Size of storage for number of records per node (on disk) */
-#define H5B2_SIZEOF_RECORDS_PER_NODE    (unsigned)2
+#define H5B2_SIZEOF_RECORDS_PER_NODE (unsigned)2
 
 /* Size of a "tree pointer" (on disk) */
 /* (essentially, the largest internal pointer allowed) */
-#define H5B2_TREE_POINTER_SIZE(h)       (                                     \
-    (h)->sizeof_addr +                                                        \
-    H5B2_SIZEOF_RECORDS_PER_NODE +                                            \
-    (h)->sizeof_size                                                          \
-    )
+#define H5B2_TREE_POINTER_SIZE(h) ((h)->sizeof_addr + H5B2_SIZEOF_RECORDS_PER_NODE + (h)->sizeof_size)
 
 /* Size of a internal node pointer (on disk) */
-#define H5B2_INT_POINTER_SIZE(h, d) (                                         \
-    (unsigned)(h)->sizeof_addr  /* Address of child node */                   \
-    + (h)->max_nrec_size        /* # of records in child node */              \
-    + (h)->node_info[(d) - 1].cum_max_nrec_size /* Total # of records in child & below */ \
+#define H5B2_INT_POINTER_SIZE(h, d)                                                                          \
+    ((unsigned)(h)->sizeof_addr                /* Address of child node */                                   \
+     + (h)->max_nrec_size                      /* # of records in child node */                              \
+     + (h)->node_info[(d)-1].cum_max_nrec_size /* Total # of records in child & below */                     \
     )
 
 /* Size of checksum information (on disk) */
-#define H5B2_SIZEOF_CHKSUM      4
+#define H5B2_SIZEOF_CHKSUM 4
 
 /* Format overhead for all v2 B-tree metadata in the file */
-#define H5B2_METADATA_PREFIX_SIZE (                                           \
-    (unsigned)H5_SIZEOF_MAGIC   /* Signature */                               \
-    + (unsigned)1 /* Version */                                               \
-    + (unsigned)1 /* Tree type */                                             \
-    + (unsigned)H5B2_SIZEOF_CHKSUM /* Metadata checksum */                    \
+#define H5B2_METADATA_PREFIX_SIZE                                                                            \
+    ((unsigned)H5_SIZEOF_MAGIC      /* Signature */                                                          \
+     + (unsigned)1                  /* Version */                                                            \
+     + (unsigned)1                  /* Tree type */                                                          \
+     + (unsigned)H5B2_SIZEOF_CHKSUM /* Metadata checksum */                                                  \
     )
 
 /* Size of the v2 B-tree header on disk */
-#define H5B2_HEADER_SIZE(h)   (                                             \
-    /* General metadata fields */                                             \
-    H5B2_METADATA_PREFIX_SIZE                                                 \
-                                                                              \
-    /* Header specific fields */                                              \
-    + (unsigned)4 /* Node size, in bytes */                                   \
-    + (unsigned)2 /* Record size, in bytes */                                 \
-    + (unsigned)2 /* Depth of tree */                                         \
-    + (unsigned)1 /* Split % of full (as integer, ie. "98" means 98%) */      \
-    + (unsigned)1 /* Merge % of full (as integer, ie. "98" means 98%) */      \
-    + H5B2_TREE_POINTER_SIZE(h)  /* Node pointer to root node in tree */      \
+#define H5B2_HEADER_SIZE(h)                                                                                  \
+    (/* General metadata fields */                                                                           \
+     H5B2_METADATA_PREFIX_SIZE                                                                               \
+                                                                                                             \
+     /* Header specific fields */                                                                            \
+     + (unsigned)4               /* Node size, in bytes */                                                   \
+     + (unsigned)2               /* Record size, in bytes */                                                 \
+     + (unsigned)2               /* Depth of tree */                                                         \
+     + (unsigned)1               /* Split % of full (as integer, ie. "98" means 98%) */                      \
+     + (unsigned)1               /* Merge % of full (as integer, ie. "98" means 98%) */                      \
+     + H5B2_TREE_POINTER_SIZE(h) /* Node pointer to root node in tree */                                     \
     )
 
 /* Size of the v2 B-tree internal node prefix */
-#define H5B2_INT_PREFIX_SIZE (                                                \
-    /* General metadata fields */                                             \
-    H5B2_METADATA_PREFIX_SIZE                                                 \
-                                                                              \
-    /* Header specific fields */                                              \
-    /* <none> */                                                              \
+#define H5B2_INT_PREFIX_SIZE                                                                                 \
+    (/* General metadata fields */                                                                           \
+     H5B2_METADATA_PREFIX_SIZE                                                                               \
+                                                                                                             \
+     /* Header specific fields */ /* <none> */                                                               \
     )
 
 /* Size of the v2 B-tree leaf node prefix */
-#define H5B2_LEAF_PREFIX_SIZE (                                               \
-    /* General metadata fields */                                             \
-    H5B2_METADATA_PREFIX_SIZE                                                 \
-                                                                              \
-    /* Header specific fields */                                              \
-    /* <none> */                                                              \
+#define H5B2_LEAF_PREFIX_SIZE                                                                                \
+    (/* General metadata fields */                                                                           \
+     H5B2_METADATA_PREFIX_SIZE                                                                               \
+                                                                                                             \
+     /* Header specific fields */ /* <none> */                                                               \
     )
 
 /* Macro to retrieve pointer to i'th native record for native record buffer */
-#define H5B2_NAT_NREC(b, hdr, idx)  ((b) + (hdr)->nat_off[(idx)])
+#define H5B2_NAT_NREC(b, hdr, idx) ((b) + (hdr)->nat_off[(idx)])
 
 /* Macro to retrieve pointer to i'th native record for internal node */
-#define H5B2_INT_NREC(i, hdr, idx)  H5B2_NAT_NREC((i)->int_native, (hdr), (idx))
+#define H5B2_INT_NREC(i, hdr, idx) H5B2_NAT_NREC((i)->int_native, (hdr), (idx))
 
 /* Macro to retrieve pointer to i'th native record for leaf node */
-#define H5B2_LEAF_NREC(l, hdr, idx)  H5B2_NAT_NREC((l)->leaf_native, (hdr), (idx))
+#define H5B2_LEAF_NREC(l, hdr, idx) H5B2_NAT_NREC((l)->leaf_native, (hdr), (idx))
 
 /* Number of records that fit into internal node */
 /* (accounts for extra node pointer by counting it in with the prefix bytes) */
-#define H5B2_NUM_INT_REC(h, d) \
-    (((h)->node_size - (H5B2_INT_PREFIX_SIZE + H5B2_INT_POINTER_SIZE(h, d))) / ((h)->rrec_size + H5B2_INT_POINTER_SIZE(h, d)))
-
+#define H5B2_NUM_INT_REC(h, d)                                                                               \
+    (((h)->node_size - (H5B2_INT_PREFIX_SIZE + H5B2_INT_POINTER_SIZE(h, d))) /                               \
+     ((h)->rrec_size + H5B2_INT_POINTER_SIZE(h, d)))
 
 /****************************/
 /* Package Private Typedefs */
@@ -120,20 +113,20 @@
 
 /* A "node pointer" to another B-tree node */
 typedef struct {
-    haddr_t     addr;           /* Address of other node */
-    uint16_t    node_nrec;      /* Number of records used in node pointed to */
-    hsize_t     all_nrec;       /* Number of records in node pointed to and all it's children */
+    haddr_t  addr;      /* Address of other node */
+    uint16_t node_nrec; /* Number of records used in node pointed to */
+    hsize_t  all_nrec;  /* Number of records in node pointed to and all it's children */
 } H5B2_node_ptr_t;
 
 /* Information about a node at a given depth */
 typedef struct {
-    unsigned    max_nrec;       /* Max. number of records in node */
-    unsigned    split_nrec;     /* Number of records to split node at */
-    unsigned    merge_nrec;     /* Number of records to merge node at */
-    hsize_t     cum_max_nrec;   /* Cumulative max. # of records below this node's depth */
-    uint8_t     cum_max_nrec_size; /* Size to store cumulative max. # of records for this node (in bytes) */
-    H5FL_fac_head_t *nat_rec_fac;   /* Factory for native record blocks */
-    H5FL_fac_head_t *node_ptr_fac;  /* Factory for node pointer blocks */
+    unsigned max_nrec;             /* Max. number of records in node */
+    unsigned split_nrec;           /* Number of records to split node at */
+    unsigned merge_nrec;           /* Number of records to merge node at */
+    hsize_t  cum_max_nrec;         /* Cumulative max. # of records below this node's depth */
+    uint8_t  cum_max_nrec_size;    /* Size to store cumulative max. # of records for this node (in bytes) */
+    H5FL_fac_head_t *nat_rec_fac;  /* Factory for native record blocks */
+    H5FL_fac_head_t *node_ptr_fac; /* Factory for node pointer blocks */
 } H5B2_node_info_t;
 
 /* The B-tree header information */
@@ -142,40 +135,40 @@ typedef struct H5B2_hdr_t {
     H5AC_info_t cache_info;
 
     /* Internal B-tree information (stored) */
-    H5B2_node_ptr_t root;       /* Node pointer to root node in B-tree        */
+    H5B2_node_ptr_t root; /* Node pointer to root node in B-tree        */
 
     /* Information set by user (stored) */
-    uint8_t     split_percent;  /* Percent full at which to split the node, when inserting */
-    uint8_t     merge_percent;  /* Percent full at which to merge the node, when deleting */
-    uint32_t    node_size;      /* Size of B-tree nodes, in bytes             */
-    uint32_t    rrec_size;      /* Size of "raw" (on disk) record, in bytes   */
+    uint8_t  split_percent; /* Percent full at which to split the node, when inserting */
+    uint8_t  merge_percent; /* Percent full at which to merge the node, when deleting */
+    uint32_t node_size;     /* Size of B-tree nodes, in bytes             */
+    uint32_t rrec_size;     /* Size of "raw" (on disk) record, in bytes   */
 
     /* Dynamic information (stored) */
-    uint16_t	depth;		/* B-tree's overall depth                     */
+    uint16_t depth; /* B-tree's overall depth                     */
 
     /* Derived information from user's information (not stored) */
-    uint8_t     max_nrec_size;  /* Size to store max. # of records in any node (in bytes) */
+    uint8_t max_nrec_size; /* Size to store max. # of records in any node (in bytes) */
 
     /* Shared internal data structures (not stored) */
-    H5F_t       *f;             /* Pointer to the file that the B-tree is in */
-    haddr_t     addr;           /* Address of B-tree header in the file */
-    size_t      hdr_size;       /* Size of the B-tree header on disk */
-    size_t      rc;             /* Reference count of nodes using this header */
-    size_t      file_rc;        /* Reference count of files using this header */
-    hbool_t     pending_delete; /* B-tree is pending deletion */
-    uint8_t     sizeof_size;    /* Size of file sizes */
-    uint8_t     sizeof_addr;    /* Size of file addresses */
-    H5B2_remove_t remove_op;    /* Callback operator for deleting B-tree */
-    void        *remove_op_data;/* B-tree deletion callback's context */
-    uint8_t	*page;	        /* Common disk page for I/O */
-    size_t      *nat_off;       /* Array of offsets of native records */
-    H5B2_node_info_t *node_info; /* Table of node info structs for current depth of B-tree */
-    uint8_t     *min_native_rec;   /* Pointer to minimum native record                  */
-    uint8_t     *max_native_rec;   /* Pointer to maximum native record                  */
+    H5F_t *           f;              /* Pointer to the file that the B-tree is in */
+    haddr_t           addr;           /* Address of B-tree header in the file */
+    size_t            hdr_size;       /* Size of the B-tree header on disk */
+    size_t            rc;             /* Reference count of nodes using this header */
+    size_t            file_rc;        /* Reference count of files using this header */
+    hbool_t           pending_delete; /* B-tree is pending deletion */
+    uint8_t           sizeof_size;    /* Size of file sizes */
+    uint8_t           sizeof_addr;    /* Size of file addresses */
+    H5B2_remove_t     remove_op;      /* Callback operator for deleting B-tree */
+    void *            remove_op_data; /* B-tree deletion callback's context */
+    uint8_t *         page;           /* Common disk page for I/O */
+    size_t *          nat_off;        /* Array of offsets of native records */
+    H5B2_node_info_t *node_info;      /* Table of node info structs for current depth of B-tree */
+    uint8_t *         min_native_rec; /* Pointer to minimum native record                  */
+    uint8_t *         max_native_rec; /* Pointer to maximum native record                  */
 
     /* Client information (not stored) */
-    const H5B2_class_t *cls;	/* Class of B-tree client */
-    void        *cb_ctx;        /* Client callback context */
+    const H5B2_class_t *cls;    /* Class of B-tree client */
+    void *              cb_ctx; /* Client callback context */
 } H5B2_hdr_t;
 
 /* B-tree leaf node information */
@@ -184,9 +177,9 @@ typedef struct H5B2_leaf_t {
     H5AC_info_t cache_info;
 
     /* Internal B-tree information */
-    H5B2_hdr_t	*hdr;		/* Pointer to the [pinned] v2 B-tree header   */
-    uint8_t     *leaf_native;   /* Pointer to native records                  */
-    uint16_t    nrec;           /* Number of records in node                  */
+    H5B2_hdr_t *hdr;         /* Pointer to the [pinned] v2 B-tree header   */
+    uint8_t *   leaf_native; /* Pointer to native records                  */
+    uint16_t    nrec;        /* Number of records in node                  */
 } H5B2_leaf_t;
 
 /* B-tree internal node information */
@@ -195,57 +188,56 @@ typedef struct H5B2_internal_t {
     H5AC_info_t cache_info;
 
     /* Internal B-tree information */
-    H5B2_hdr_t	*hdr;		/* Pointer to the [pinned] v2 B-tree header   */
-    uint8_t     *int_native;    /* Pointer to native records                  */
-    H5B2_node_ptr_t *node_ptrs; /* Pointer to node pointers                   */
-    uint16_t    nrec;           /* Number of records in node                  */
-    uint16_t    depth;          /* Depth of this node in the B-tree           */
+    H5B2_hdr_t *     hdr;        /* Pointer to the [pinned] v2 B-tree header   */
+    uint8_t *        int_native; /* Pointer to native records                  */
+    H5B2_node_ptr_t *node_ptrs;  /* Pointer to node pointers                   */
+    uint16_t         nrec;       /* Number of records in node                  */
+    uint16_t         depth;      /* Depth of this node in the B-tree           */
 } H5B2_internal_t;
 
 /* v2 B-tree */
 struct H5B2_t {
-    H5B2_hdr_t  *hdr;           /* Pointer to internal v2 B-tree header info */
-    H5F_t      *f;              /* Pointer to file for v2 B-tree */
+    H5B2_hdr_t *hdr; /* Pointer to internal v2 B-tree header info */
+    H5F_t *     f;   /* Pointer to file for v2 B-tree */
 };
 
 /* Node position, for min/max determination */
 typedef enum H5B2_nodepos_t {
-    H5B2_POS_ROOT,              /* Node is root (i.e. both right & left-most in tree) */
-    H5B2_POS_RIGHT,             /* Node is right-most in tree, at a given depth */
-    H5B2_POS_LEFT,              /* Node is left-most in tree, at a given depth */
-    H5B2_POS_MIDDLE             /* Node is neither right or left-most in tree */
+    H5B2_POS_ROOT,  /* Node is root (i.e. both right & left-most in tree) */
+    H5B2_POS_RIGHT, /* Node is right-most in tree, at a given depth */
+    H5B2_POS_LEFT,  /* Node is left-most in tree, at a given depth */
+    H5B2_POS_MIDDLE /* Node is neither right or left-most in tree */
 } H5B2_nodepos_t;
 
 /* Callback info for loading a free space header into the cache */
 typedef struct H5B2_hdr_cache_ud_t {
-    H5F_t *f;                   /* File that v2 b-tree header is within */
-    void *ctx_udata;            /* User-data for protecting */
+    H5F_t *f;         /* File that v2 b-tree header is within */
+    void * ctx_udata; /* User-data for protecting */
 } H5B2_hdr_cache_ud_t;
 
 /* Callback info for loading a free space internal node into the cache */
 typedef struct H5B2_internal_cache_ud_t {
-    H5F_t *f;                   /* File that v2 b-tree header is within */
-    H5B2_hdr_t *hdr;            /* v2 B-tree header */
-    unsigned nrec;              /* Number of records in node to load */
-    unsigned depth;             /* Depth of node to load */
+    H5F_t *     f;     /* File that v2 b-tree header is within */
+    H5B2_hdr_t *hdr;   /* v2 B-tree header */
+    unsigned    nrec;  /* Number of records in node to load */
+    unsigned    depth; /* Depth of node to load */
 } H5B2_internal_cache_ud_t;
 
 /* Callback info for loading a free space leaf node into the cache */
 typedef struct H5B2_leaf_cache_ud_t {
-    H5F_t *f;                   /* File that v2 b-tree header is within */
-    H5B2_hdr_t *hdr;            /* v2 B-tree header */
-    unsigned nrec;              /* Number of records in node to load */
+    H5F_t *     f;    /* File that v2 b-tree header is within */
+    H5B2_hdr_t *hdr;  /* v2 B-tree header */
+    unsigned    nrec; /* Number of records in node to load */
 } H5B2_leaf_cache_ud_t;
 
 #ifdef H5B2_TESTING
 /* Node information for testing */
 typedef struct {
-    unsigned depth;             /* Depth of node */
-    unsigned nrec;              /* Number of records in node */
+    unsigned depth; /* Depth of node */
+    unsigned nrec;  /* Number of records in node */
 } H5B2_node_info_test_t;
 #endif /* H5B2_TESTING */
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -273,17 +265,14 @@ H5_DLLVAR const H5B2_class_t H5B2_TEST[1];
 /* Array of v2 B-tree client ID -> client class mappings */
 extern const H5B2_class_t *const H5B2_client_class_g[H5B2_NUM_BTREE_ID];
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 
 /* Routines for managing B-tree header info */
 H5_DLL H5B2_hdr_t *H5B2_hdr_alloc(H5F_t *f);
-H5_DLL haddr_t H5B2_hdr_create(H5F_t *f, hid_t dxpl_id,
-    const H5B2_create_t *cparam, void *ctx_udata);
-H5_DLL herr_t H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam,
-    void *ctx_udata, uint16_t depth);
+H5_DLL haddr_t     H5B2_hdr_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udata);
+H5_DLL herr_t H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata, uint16_t depth);
 H5_DLL herr_t H5B2_hdr_incr(H5B2_hdr_t *hdr);
 H5_DLL herr_t H5B2_hdr_decr(H5B2_hdr_t *hdr);
 H5_DLL herr_t H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr);
@@ -292,17 +281,16 @@ H5_DLL herr_t H5B2_hdr_dirty(H5B2_hdr_t *hdr);
 H5_DLL herr_t H5B2_hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id);
 
 /* Routines for operating on leaf nodes */
-H5B2_leaf_t *H5B2_protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr,
-    unsigned nrec, H5AC_protect_t rw);
+H5B2_leaf_t *H5B2_protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec,
+                               H5AC_protect_t rw);
 
 /* Routines for operating on internal nodes */
-H5_DLL H5B2_internal_t *H5B2_protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    haddr_t addr, unsigned nrec, unsigned depth, H5AC_protect_t rw);
+H5_DLL H5B2_internal_t *H5B2_protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec,
+                                              unsigned depth, H5AC_protect_t rw);
 
 /* Routines for allocating nodes */
 H5_DLL herr_t H5B2_split_root(H5B2_hdr_t *hdr, hid_t dxpl_id);
-H5_DLL herr_t H5B2_create_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    H5B2_node_ptr_t *node_ptr);
+H5_DLL herr_t H5B2_create_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr);
 
 /* Routines for releasing structures */
 H5_DLL herr_t H5B2_hdr_free(H5B2_hdr_t *hdr);
@@ -310,67 +298,62 @@ H5_DLL herr_t H5B2_leaf_free(H5B2_leaf_t *l);
 H5_DLL herr_t H5B2_internal_free(H5B2_internal_t *i);
 
 /* Routines for inserting records */
-H5_DLL herr_t H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    unsigned depth, unsigned *parent_cache_info_flags_ptr,
-    H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, void *udata);
-H5_DLL herr_t H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, void *udata);
+H5_DLL herr_t H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
+                                   unsigned *parent_cache_info_flags_ptr, H5B2_node_ptr_t *curr_node_ptr,
+                                   H5B2_nodepos_t curr_pos, void *udata);
+H5_DLL herr_t H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
+                               H5B2_nodepos_t curr_pos, void *udata);
 
 /* Routines for iterating over nodes/records */
 H5_DLL herr_t H5B2_iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    const H5B2_node_ptr_t *curr_node, H5B2_operator_t op, void *op_data);
-H5_DLL herr_t H5B2_node_size(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    unsigned depth, const H5B2_node_ptr_t *curr_node, hsize_t *op_data);
+                                const H5B2_node_ptr_t *curr_node, H5B2_operator_t op, void *op_data);
+H5_DLL herr_t H5B2_node_size(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, const H5B2_node_ptr_t *curr_node,
+                             hsize_t *op_data);
 
 /* Routines for locating records */
-H5_DLL int H5B2_locate_record(const H5B2_class_t *type, unsigned nrec,
-    size_t *rec_off, const uint8_t *native, const void *udata, unsigned *idx, int *result);
-H5_DLL herr_t H5B2_neighbor_internal(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    unsigned depth, H5B2_node_ptr_t *curr_node_ptr, void *neighbor_loc,
-    H5B2_compare_t comp, void *udata, H5B2_found_t op, void *op_data);
-H5_DLL herr_t H5B2_neighbor_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    H5B2_node_ptr_t *curr_node_ptr, void *neighbor_loc,
-    H5B2_compare_t comp, void *udata, H5B2_found_t op, void *op_data);
+H5_DLL int H5B2_locate_record(const H5B2_class_t *type, unsigned nrec, size_t *rec_off, const uint8_t *native,
+                              const void *udata, unsigned *idx, int *result);
+H5_DLL herr_t H5B2_neighbor_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
+                                     H5B2_node_ptr_t *curr_node_ptr, void *neighbor_loc, H5B2_compare_t comp,
+                                     void *udata, H5B2_found_t op, void *op_data);
+H5_DLL herr_t H5B2_neighbor_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
+                                 void *neighbor_loc, H5B2_compare_t comp, void *udata, H5B2_found_t op,
+                                 void *op_data);
 
 /* Routines for removing records */
-H5_DLL herr_t H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    hbool_t *depth_decreased, void *swap_loc, unsigned depth,
-    H5AC_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr,
-    H5B2_nodepos_t curr_pos, H5B2_node_ptr_t *curr_node_ptr, void *udata,
-    H5B2_remove_t op, void *op_data);
-H5_DLL herr_t H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos,
-    void *udata, H5B2_remove_t op, void *op_data);
-H5_DLL herr_t H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    hbool_t *depth_decreased, void *swap_loc, unsigned depth,
-    H5AC_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr,
-    H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, hsize_t n,
-    H5B2_remove_t op, void *op_data);
-H5_DLL herr_t H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
-    H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos,
-    unsigned idx, H5B2_remove_t op, void *op_data);
+H5_DLL herr_t H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased, void *swap_loc,
+                                   unsigned depth, H5AC_info_t *parent_cache_info,
+                                   unsigned *parent_cache_info_flags_ptr, H5B2_nodepos_t curr_pos,
+                                   H5B2_node_ptr_t *curr_node_ptr, void *udata, H5B2_remove_t op,
+                                   void *op_data);
+H5_DLL herr_t H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
+                               H5B2_nodepos_t curr_pos, void *udata, H5B2_remove_t op, void *op_data);
+H5_DLL herr_t H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
+                                          void *swap_loc, unsigned depth, H5AC_info_t *parent_cache_info,
+                                          unsigned *       parent_cache_info_flags_ptr,
+                                          H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, hsize_t n,
+                                          H5B2_remove_t op, void *op_data);
+H5_DLL herr_t H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
+                                      H5B2_nodepos_t curr_pos, unsigned idx, H5B2_remove_t op, void *op_data);
 
 /* Routines for deleting nodes */
 H5_DLL herr_t H5B2_delete_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
-    const H5B2_node_ptr_t *curr_node, H5B2_remove_t op, void *op_data);
+                               const H5B2_node_ptr_t *curr_node, H5B2_remove_t op, void *op_data);
 
 /* Debugging routines for dumping file structures */
-H5_DLL herr_t H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth, const H5B2_class_t *type, haddr_t obj_addr);
-H5_DLL herr_t H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth, const H5B2_class_t *type,
-    haddr_t hdr_addr, unsigned nrec, unsigned depth, haddr_t obj_addr);
-H5_DLL herr_t H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth, const H5B2_class_t *type,
-    haddr_t hdr_addr, unsigned nrec, haddr_t obj_addr);
+H5_DLL herr_t H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                             const H5B2_class_t *type, haddr_t obj_addr);
+H5_DLL herr_t H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                             const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, unsigned depth,
+                             haddr_t obj_addr);
+H5_DLL herr_t H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                              const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, haddr_t obj_addr);
 
 /* Testing routines */
 #ifdef H5B2_TESTING
 H5_DLL herr_t H5B2_get_root_addr_test(H5B2_t *bt2, haddr_t *root_addr);
-H5_DLL int H5B2_get_node_depth_test(H5B2_t *bt2, hid_t dxpl_id, void *udata);
-H5_DLL herr_t H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id,
-    void *udata, H5B2_node_info_test_t *ninfo);
+H5_DLL int    H5B2_get_node_depth_test(H5B2_t *bt2, hid_t dxpl_id, void *udata);
+H5_DLL herr_t H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_node_info_test_t *ninfo);
 #endif /* H5B2_TESTING */
 
 #endif /* _H5B2pkg_H */
-
diff --git a/src/H5B2private.h b/src/H5B2private.h
index ea6814a..46c7843 100644
--- a/src/H5B2private.h
+++ b/src/H5B2private.h
@@ -29,30 +29,34 @@
 #include "H5B2public.h"
 
 /* Private headers needed by this file */
-#include "H5Fprivate.h"		/* File access				*/
+#include "H5Fprivate.h" /* File access				*/
 
 /**************************/
 /* Library Private Macros */
 /**************************/
 
-
 /****************************/
 /* Library Private Typedefs */
 /****************************/
 
 /* B-tree IDs for various internal things. */
 typedef enum H5B2_subid_t {
-    H5B2_TEST_ID	 = 0,	/* B-tree is for testing (do not use for actual data) */
-    H5B2_FHEAP_HUGE_INDIR_ID, 	/* B-tree is for fractal heap indirectly accessed, non-filtered 'huge' objects */
-    H5B2_FHEAP_HUGE_FILT_INDIR_ID, /* B-tree is for fractal heap indirectly accessed, filtered 'huge' objects */
-    H5B2_FHEAP_HUGE_DIR_ID, 	/* B-tree is for fractal heap directly accessed, non-filtered 'huge' objects */
+    H5B2_TEST_ID = 0,         /* B-tree is for testing (do not use for actual data) */
+    H5B2_FHEAP_HUGE_INDIR_ID, /* B-tree is for fractal heap indirectly accessed, non-filtered 'huge' objects
+                               */
+    H5B2_FHEAP_HUGE_FILT_INDIR_ID, /* B-tree is for fractal heap indirectly accessed, filtered 'huge' objects
+                                    */
+    H5B2_FHEAP_HUGE_DIR_ID, /* B-tree is for fractal heap directly accessed, non-filtered 'huge' objects */
     H5B2_FHEAP_HUGE_FILT_DIR_ID, /* B-tree is for fractal heap directly accessed, filtered 'huge' objects */
-    H5B2_GRP_DENSE_NAME_ID,     /* B-tree is for indexing 'name' field for "dense" link storage in groups */
-    H5B2_GRP_DENSE_CORDER_ID,   /* B-tree is for indexing 'creation order' field for "dense" link storage in groups */
-    H5B2_SOHM_INDEX_ID,         /* B-tree is an index for shared object header messages */
-    H5B2_ATTR_DENSE_NAME_ID,    /* B-tree is for indexing 'name' field for "dense" attribute storage on objects */
-    H5B2_ATTR_DENSE_CORDER_ID,  /* B-tree is for indexing 'creation order' field for "dense" attribute storage on objects */
-    H5B2_NUM_BTREE_ID           /* Number of B-tree IDs (must be last)  */
+    H5B2_GRP_DENSE_NAME_ID,      /* B-tree is for indexing 'name' field for "dense" link storage in groups */
+    H5B2_GRP_DENSE_CORDER_ID,    /* B-tree is for indexing 'creation order' field for "dense" link storage in
+                                    groups */
+    H5B2_SOHM_INDEX_ID,          /* B-tree is an index for shared object header messages */
+    H5B2_ATTR_DENSE_NAME_ID,   /* B-tree is for indexing 'name' field for "dense" attribute storage on objects
+                                */
+    H5B2_ATTR_DENSE_CORDER_ID, /* B-tree is for indexing 'creation order' field for "dense" attribute storage
+                                  on objects */
+    H5B2_NUM_BTREE_ID          /* Number of B-tree IDs (must be last)  */
 } H5B2_subid_t;
 
 /* Define the operator callback function pointer for H5B2_iterate() */
@@ -69,8 +73,8 @@ typedef herr_t (*H5B2_remove_t)(const void *record, void *op_data);
 
 /* Comparisons for H5B2_neighbor() call */
 typedef enum H5B2_compare_t {
-    H5B2_COMPARE_LESS,            /* Records with keys less than query value */
-    H5B2_COMPARE_GREATER          /* Records with keys greater than query value */
+    H5B2_COMPARE_LESS,   /* Records with keys less than query value */
+    H5B2_COMPARE_GREATER /* Records with keys greater than query value */
 } H5B2_compare_t;
 
 /*
@@ -79,78 +83,71 @@ typedef enum H5B2_compare_t {
  */
 typedef struct H5B2_class_t H5B2_class_t;
 struct H5B2_class_t {
-    H5B2_subid_t id;		/* ID of B-tree class, as found in file */
-    const char *name;		/* Name of B-tree class, for debugging */
-    size_t nrec_size;           /* Size of native (memory) record */
+    H5B2_subid_t id;        /* ID of B-tree class, as found in file */
+    const char * name;      /* Name of B-tree class, for debugging */
+    size_t       nrec_size; /* Size of native (memory) record */
 
     /* Extensible array client callback methods */
-    void *(*crt_context)(void *udata);          /* Create context for other client callbacks */
-    herr_t (*dst_context)(void *ctx);           /* Destroy client callback context */
-    herr_t (*store)(void *nrecord, const void *udata);              	/* Store application record in native record table */
+    void *(*crt_context)(void *udata);                 /* Create context for other client callbacks */
+    herr_t (*dst_context)(void *ctx);                  /* Destroy client callback context */
+    herr_t (*store)(void *nrecord, const void *udata); /* Store application record in native record table */
     herr_t (*compare)(const void *rec1, const void *rec2, int *result); /* Compare two native records */
-    herr_t (*encode)(uint8_t *raw, const void *record, void *ctx);  	/* Encode record from native form to disk storage form */
-    herr_t (*decode)(const uint8_t *raw, void *record, void *ctx);  	/* Decode record from disk storage form to native form */
-    herr_t (*debug)(FILE *stream, const H5F_t *f, hid_t dxpl_id,    	/* Print a record for debugging */
-        int indent, int fwidth, const void *record, const void *ctx);
-    void *(*crt_dbg_ctx)(H5F_t *f, hid_t dxpl_id, haddr_t obj_addr); 	/* Create debugging context */
-    herr_t (*dst_dbg_ctx)(void *dbg_ctx);       /* Destroy debugging context */
+    herr_t (*encode)(uint8_t *raw, const void *record,
+                     void *ctx); /* Encode record from native form to disk storage form */
+    herr_t (*decode)(const uint8_t *raw, void *record,
+                     void *ctx); /* Decode record from disk storage form to native form */
+    herr_t (*debug)(FILE *stream, const H5F_t *f, hid_t dxpl_id, /* Print a record for debugging */
+                    int indent, int fwidth, const void *record, const void *ctx);
+    void *(*crt_dbg_ctx)(H5F_t *f, hid_t dxpl_id, haddr_t obj_addr); /* Create debugging context */
+    herr_t (*dst_dbg_ctx)(void *dbg_ctx);                            /* Destroy debugging context */
 };
 
 /* v2 B-tree creation parameters */
 typedef struct H5B2_create_t {
-    const H5B2_class_t *cls;            /* v2 B-tree client class */
-    uint32_t node_size;                 /* Size of each node (in bytes) */
-    uint32_t rrec_size;                 /* Size of raw record (in bytes) */
-    uint8_t split_percent;              /* % full to split nodes */
-    uint8_t merge_percent;              /* % full to merge nodes */
+    const H5B2_class_t *cls;           /* v2 B-tree client class */
+    uint32_t            node_size;     /* Size of each node (in bytes) */
+    uint32_t            rrec_size;     /* Size of raw record (in bytes) */
+    uint8_t             split_percent; /* % full to split nodes */
+    uint8_t             merge_percent; /* % full to merge nodes */
 } H5B2_create_t;
 
 /* v2 B-tree metadata statistics info */
 typedef struct H5B2_stat_t {
-    unsigned depth;             /* Depth of B-tree */
-    hsize_t nrecords;          /* Number of records */
+    unsigned depth;    /* Depth of B-tree */
+    hsize_t  nrecords; /* Number of records */
 } H5B2_stat_t;
 
 /* v2 B-tree info (forward decl - defined in H5B2pkg.h) */
 typedef struct H5B2_t H5B2_t;
 
-
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
-H5_DLL H5B2_t *H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam,
-    void *ctx_udata);
+H5_DLL H5B2_t *H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udata);
 H5_DLL H5B2_t *H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata);
-H5_DLL herr_t H5B2_get_addr(const H5B2_t *bt2, haddr_t *addr/*out*/);
-H5_DLL herr_t H5B2_insert(H5B2_t *bt2, hid_t dxpl_id, void *udata);
-H5_DLL herr_t H5B2_iterate(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op,
-    void *op_data);
-H5_DLL htri_t H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata,
-    H5B2_found_t op, void *op_data);
-H5_DLL herr_t H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order,
-    hsize_t idx, H5B2_found_t op, void *op_data);
-H5_DLL herr_t H5B2_neighbor(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range,
-    void *udata, H5B2_found_t op, void *op_data);
-H5_DLL herr_t H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata,
-    H5B2_modify_t op, void *op_data);
-H5_DLL herr_t H5B2_remove(H5B2_t *b2, hid_t dxpl_id, void *udata,
-    H5B2_remove_t op, void *op_data);
-H5_DLL herr_t H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id,
-    H5_iter_order_t order, hsize_t idx, H5B2_remove_t op, void *op_data);
-H5_DLL herr_t H5B2_get_nrec(const H5B2_t *bt2, hsize_t *nrec);
-H5_DLL herr_t H5B2_size(H5B2_t *bt2, hid_t dxpl_id,
-    hsize_t *btree_size);
-H5_DLL herr_t H5B2_close(H5B2_t *bt2, hid_t dxpl_id);
-H5_DLL herr_t H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    void *ctx_udata, H5B2_remove_t op, void *op_data);
+H5_DLL herr_t  H5B2_get_addr(const H5B2_t *bt2, haddr_t *addr /*out*/);
+H5_DLL herr_t  H5B2_insert(H5B2_t *bt2, hid_t dxpl_id, void *udata);
+H5_DLL herr_t  H5B2_iterate(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, void *op_data);
+H5_DLL htri_t  H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op, void *op_data);
+H5_DLL herr_t  H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx, H5B2_found_t op,
+                          void *op_data);
+H5_DLL herr_t  H5B2_neighbor(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range, void *udata, H5B2_found_t op,
+                             void *op_data);
+H5_DLL herr_t  H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op, void *op_data);
+H5_DLL herr_t  H5B2_remove(H5B2_t *b2, hid_t dxpl_id, void *udata, H5B2_remove_t op, void *op_data);
+H5_DLL herr_t  H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx,
+                                  H5B2_remove_t op, void *op_data);
+H5_DLL herr_t  H5B2_get_nrec(const H5B2_t *bt2, hsize_t *nrec);
+H5_DLL herr_t  H5B2_size(H5B2_t *bt2, hid_t dxpl_id, hsize_t *btree_size);
+H5_DLL herr_t  H5B2_close(H5B2_t *bt2, hid_t dxpl_id);
+H5_DLL herr_t  H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata, H5B2_remove_t op,
+                           void *op_data);
 
 /* Statistics routines */
 H5_DLL herr_t H5B2_stat_info(H5B2_t *bt2, H5B2_stat_t *info);
 
 #endif /* _H5B2private_H */
-
diff --git a/src/H5B2public.h b/src/H5B2public.h
index 6e0b964..a1618d0 100644
--- a/src/H5B2public.h
+++ b/src/H5B2public.h
@@ -49,4 +49,3 @@ extern "C" {
 #endif
 
 #endif /* _H5B2public_H */
-
diff --git a/src/H5B2stat.c b/src/H5B2stat.c
index e30d162..23f9e84 100644
--- a/src/H5B2stat.c
+++ b/src/H5B2stat.c
@@ -22,52 +22,43 @@
 /* Module Setup */
 /****************/
 
-#define H5B2_PACKAGE        /* Suppress error about including H5B2pkg   */
-
+#define H5B2_PACKAGE /* Suppress error about including H5B2pkg   */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions                        */
-#include "H5B2pkg.h"        /* v2 B-trees                               */
-#include "H5Eprivate.h"     /* Error handling                           */
-
+#include "H5private.h"  /* Generic Functions                        */
+#include "H5B2pkg.h"    /* v2 B-trees                               */
+#include "H5Eprivate.h" /* Error handling                           */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B2_stat_info
  *
@@ -89,13 +80,12 @@ H5B2_stat_info(H5B2_t *bt2, H5B2_stat_t *info)
     HDassert(info);
 
     /* Get information about the B-tree */
-    info->depth = bt2->hdr->depth;
+    info->depth    = bt2->hdr->depth;
     info->nrecords = bt2->hdr->root.all_nrec;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_stat_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5B2_size
  *
@@ -112,8 +102,8 @@ H5B2_stat_info(H5B2_t *bt2, H5B2_stat_t *info)
 herr_t
 H5B2_size(H5B2_t *bt2, hid_t dxpl_id, hsize_t *btree_size)
 {
-    H5B2_hdr_t  *hdr;                   /* Pointer to the B-tree header */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *hdr;                 /* Pointer to the B-tree header */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -131,17 +121,16 @@ H5B2_size(H5B2_t *bt2, hid_t dxpl_id, hsize_t *btree_size)
     *btree_size += hdr->hdr_size;
 
     /* Iterate through records */
-    if(hdr->root.node_nrec > 0) {
+    if (hdr->root.node_nrec > 0) {
         /* Check for root node being a leaf */
-        if(hdr->depth == 0)
+        if (hdr->depth == 0)
             *btree_size += hdr->node_size;
         else
             /* Iterate through nodes */
-            if(H5B2_node_size(hdr, dxpl_id, hdr->depth, &hdr->root, btree_size) < 0)
-                HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "node iteration failed")
+            if (H5B2_node_size(hdr, dxpl_id, hdr->depth, &hdr->root, btree_size) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "node iteration failed")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_size() */
-
diff --git a/src/H5B2test.c b/src/H5B2test.c
index b7fab99..14b01e6 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -18,92 +18,82 @@
  *
  */
 
-
 /****************/
 /* Module Setup */
 /****************/
 
-#define H5B2_PACKAGE		/*suppress error about including H5B2pkg  */
-#define H5B2_TESTING		/*suppress warning about H5B2 testing funcs*/
-
+#define H5B2_PACKAGE /*suppress error about including H5B2pkg  */
+#define H5B2_TESTING /*suppress warning about H5B2 testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5B2pkg.h"		/* v2 B-trees				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5B2pkg.h"    /* v2 B-trees				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* v2 B-tree client callback context */
 typedef struct H5B2_test_ctx_t {
-    uint8_t     sizeof_size;    /* Size of file sizes */
+    uint8_t sizeof_size; /* Size of file sizes */
 } H5B2_test_ctx_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static void *H5B2_test_crt_context(void *udata);
+static void * H5B2_test_crt_context(void *udata);
 static herr_t H5B2_test_dst_context(void *ctx);
 static herr_t H5B2_test_store(void *nrecord, const void *udata);
 static herr_t H5B2_test_compare(const void *rec1, const void *rec2, int *result);
 static herr_t H5B2_test_encode(uint8_t *raw, const void *nrecord, void *ctx);
 static herr_t H5B2_test_decode(const uint8_t *raw, void *nrecord, void *ctx);
-static herr_t H5B2_test_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
-static void *H5B2_test_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
-
+static herr_t H5B2_test_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth,
+                              const void *record, const void *_udata);
+static void * H5B2_test_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-const H5B2_class_t H5B2_TEST[1]={{   /* B-tree class information */
-    H5B2_TEST_ID,               /* Type of B-tree */
-    "H5B2_TEST_ID",             /* Name of B-tree class */
-    sizeof(hsize_t),            /* Size of native record */
-    H5B2_test_crt_context,      /* Create client callback context */
-    H5B2_test_dst_context,      /* Destroy client callback context */
-    H5B2_test_store,            /* Record storage callback */
-    H5B2_test_compare,          /* Record comparison callback */
-    H5B2_test_encode,           /* Record encoding callback */
-    H5B2_test_decode,           /* Record decoding callback */
-    H5B2_test_debug,            /* Record debugging callback */
-    H5B2_test_crt_dbg_context,  /* Create debugging context */
-    H5B2_test_dst_context       /* Destroy debugging context */
+const H5B2_class_t H5B2_TEST[1] = {{
+    /* B-tree class information */
+    H5B2_TEST_ID,              /* Type of B-tree */
+    "H5B2_TEST_ID",            /* Name of B-tree class */
+    sizeof(hsize_t),           /* Size of native record */
+    H5B2_test_crt_context,     /* Create client callback context */
+    H5B2_test_dst_context,     /* Destroy client callback context */
+    H5B2_test_store,           /* Record storage callback */
+    H5B2_test_compare,         /* Record comparison callback */
+    H5B2_test_encode,          /* Record encoding callback */
+    H5B2_test_decode,          /* Record decoding callback */
+    H5B2_test_debug,           /* Record debugging callback */
+    H5B2_test_crt_dbg_context, /* Create debugging context */
+    H5B2_test_dst_context      /* Destroy debugging context */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /* Declare a free list to manage the H5B2_test_ctx_t struct */
 H5FL_DEFINE_STATIC(H5B2_test_ctx_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_crt_context
  *
@@ -120,9 +110,9 @@ H5FL_DEFINE_STATIC(H5B2_test_ctx_t);
 static void *
 H5B2_test_crt_context(void *_f)
 {
-    H5F_t *f = (H5F_t *)_f;     /* User data for building callback context */
-    H5B2_test_ctx_t *ctx;       /* Callback context structure */
-    void *ret_value;            /* Return value */
+    H5F_t *          f = (H5F_t *)_f; /* User data for building callback context */
+    H5B2_test_ctx_t *ctx;             /* Callback context structure */
+    void *           ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -130,7 +120,7 @@ H5B2_test_crt_context(void *_f)
     HDassert(f);
 
     /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5B2_test_ctx_t)))
+    if (NULL == (ctx = H5FL_MALLOC(H5B2_test_ctx_t)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate callback context")
 
     /* Determine the size of lengths in the file */
@@ -143,7 +133,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_test_crt_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_dst_context
  *
@@ -160,7 +149,7 @@ done:
 static herr_t
 H5B2_test_dst_context(void *_ctx)
 {
-    H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx;       /* Callback context structure */
+    H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -173,7 +162,6 @@ H5B2_test_dst_context(void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_test_dst_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_store
  *
@@ -197,7 +185,6 @@ H5B2_test_store(void *nrecord, const void *udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_test_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_compare
  *
@@ -222,7 +209,6 @@ H5B2_test_compare(const void *rec1, const void *rec2, int *result)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_test_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_encode
  *
@@ -239,7 +225,7 @@ H5B2_test_compare(const void *rec1, const void *rec2, int *result)
 static herr_t
 H5B2_test_encode(uint8_t *raw, const void *nrecord, void *_ctx)
 {
-    H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx;       /* Callback context structure */
+    H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -251,7 +237,6 @@ H5B2_test_encode(uint8_t *raw, const void *nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_test_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_decode
  *
@@ -268,7 +253,7 @@ H5B2_test_encode(uint8_t *raw, const void *nrecord, void *_ctx)
 static herr_t
 H5B2_test_decode(const uint8_t *raw, void *nrecord, void *_ctx)
 {
-    H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx;       /* Callback context structure */
+    H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -280,7 +265,6 @@ H5B2_test_decode(const uint8_t *raw, void *nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_test_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_debug
  *
@@ -295,21 +279,18 @@ H5B2_test_decode(const uint8_t *raw, void *nrecord, void *_ctx)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_test_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *record,
-    const void H5_ATTR_UNUSED *_udata)
+H5B2_test_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, int indent,
+                int fwidth, const void *record, const void H5_ATTR_UNUSED *_udata)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert (record);
+    HDassert(record);
 
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Record:",
-        *(const hsize_t *)record);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Record:", *(const hsize_t *)record);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_test_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_crt_dbg_context
  *
@@ -327,7 +308,7 @@ static void *
 H5B2_test_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr)
 {
     H5B2_test_ctx_t *ctx;       /* Callback context structure */
-    void *ret_value;            /* Return value */
+    void *           ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -335,7 +316,7 @@ H5B2_test_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATT
     HDassert(f);
 
     /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5B2_test_ctx_t)))
+    if (NULL == (ctx = H5FL_MALLOC(H5B2_test_ctx_t)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate callback context")
 
     /* Determine the size of addresses & lengths in the file */
@@ -348,7 +329,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_test_crt_dbg_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_get_root_addr_test
  *
@@ -377,7 +357,6 @@ H5B2_get_root_addr_test(H5B2_t *bt2, haddr_t *root_addr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2_get_root_addr_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_get_node_info_test
  *
@@ -392,15 +371,14 @@ H5B2_get_root_addr_test(H5B2_t *bt2, haddr_t *root_addr)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata,
-    H5B2_node_info_test_t *ninfo)
+H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_node_info_test_t *ninfo)
 {
-    H5B2_hdr_t	*hdr;                   /* Pointer to the B-tree header */
-    H5B2_node_ptr_t curr_node_ptr;      /* Node pointer info for current node */
-    unsigned    depth;                  /* Current depth of the tree */
-    int         cmp;                    /* Comparison value of records */
-    unsigned    idx;                    /* Location of record which matches key */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5B2_hdr_t *    hdr;                 /* Pointer to the B-tree header */
+    H5B2_node_ptr_t curr_node_ptr;       /* Node pointer info for current node */
+    unsigned        depth;               /* Current depth of the tree */
+    int             cmp;                 /* Comparison value of records */
+    unsigned        idx;                 /* Location of record which matches key */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -420,33 +398,35 @@ H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata,
     depth = hdr->depth;
 
     /* Check for empty tree */
-    if(0 == curr_node_ptr.node_nrec)
+    if (0 == curr_node_ptr.node_nrec)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "B-tree has no records")
 
     /* Walk down B-tree to find record or leaf node where record is located */
     cmp = -1;
-    while(depth > 0 && cmp != 0) {
-        H5B2_internal_t *internal;          /* Pointer to internal node in B-tree */
-        H5B2_node_ptr_t next_node_ptr;      /* Node pointer info for next node */
+    while (depth > 0 && cmp != 0) {
+        H5B2_internal_t *internal;      /* Pointer to internal node in B-tree */
+        H5B2_node_ptr_t  next_node_ptr; /* Node pointer info for next node */
 
         /* Lock B-tree current node */
-        if(NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC_READ)))
+        if (NULL == (internal = H5B2_protect_internal(hdr, dxpl_id, curr_node_ptr.addr,
+                                                      curr_node_ptr.node_nrec, depth, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate node pointer for child */
-        if(H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, 
-                               udata, &idx, &cmp) < 0)
+        if (H5B2_locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx,
+                               &cmp) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
 
-        if(cmp > 0)
+        if (cmp > 0)
             idx++;
 
-        if(cmp != 0) {
+        if (cmp != 0) {
             /* Get node pointer for next node to search */
             next_node_ptr = internal->node_ptrs[idx];
 
             /* Unlock current node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                               H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Set pointer to next node to load */
@@ -454,12 +434,13 @@ H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata,
         } /* end if */
         else {
             /* Unlock current node */
-            if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, internal,
+                               H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Fill in information about the node */
             ninfo->depth = depth;
-            ninfo->nrec = curr_node_ptr.node_nrec;
+            ninfo->nrec  = curr_node_ptr.node_nrec;
 
             /* Indicate success */
             HGOTO_DONE(SUCCEED)
@@ -470,35 +451,34 @@ H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata,
     } /* end while */
 
     {
-        H5B2_leaf_t *leaf;          /* Pointer to leaf node in B-tree */
+        H5B2_leaf_t *leaf; /* Pointer to leaf node in B-tree */
 
         /* Lock B-tree leaf node */
-        if(NULL == (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, H5AC_READ)))
+        if (NULL ==
+            (leaf = H5B2_protect_leaf(hdr, dxpl_id, curr_node_ptr.addr, curr_node_ptr.node_nrec, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
         /* Locate record */
-        if(H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, 
-                               udata, &idx, &cmp) < 0)
+        if (H5B2_locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx, &cmp) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
 
         /* Unlock current node */
-        if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
         /* Indicate the depth that the record was found */
-        if(cmp != 0)
+        if (cmp != 0)
             HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "record not in B-tree")
     } /* end block */
 
     /* Fill in information about the leaf node */
     ninfo->depth = depth;
-    ninfo->nrec = curr_node_ptr.node_nrec;
+    ninfo->nrec  = curr_node_ptr.node_nrec;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_get_node_info_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B2_get_node_depth_test
  *
@@ -518,8 +498,8 @@ done:
 int
 H5B2_get_node_depth_test(H5B2_t *bt2, hid_t dxpl_id, void *udata)
 {
-    H5B2_node_info_test_t ninfo;        /* Node information */
-    int		ret_value;              /* Return information */
+    H5B2_node_info_test_t ninfo;     /* Node information */
+    int                   ret_value; /* Return information */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -527,7 +507,7 @@ H5B2_get_node_depth_test(H5B2_t *bt2, hid_t dxpl_id, void *udata)
     HDassert(bt2);
 
     /* Get information abou the node */
-    if(H5B2_get_node_info_test(bt2, dxpl_id, udata, &ninfo) < 0)
+    if (H5B2_get_node_info_test(bt2, dxpl_id, udata, &ninfo) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "error looking up node info")
 
     /* Set return value */
@@ -536,4 +516,3 @@ H5B2_get_node_depth_test(H5B2_t *bt2, hid_t dxpl_id, void *udata)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_get_node_depth_test() */
-
diff --git a/src/H5Bcache.c b/src/H5Bcache.c
index b710f57..e6d7e48 100644
--- a/src/H5Bcache.c
+++ b/src/H5Bcache.c
@@ -26,40 +26,36 @@
 /* Module Setup */
 /****************/
 
-#define H5B_PACKAGE		/*suppress error about including H5Bpkg  */
-
+#define H5B_PACKAGE /*suppress error about including H5Bpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Bpkg.h"		/* B-link trees				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MFprivate.h"	/* File memory management		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Bpkg.h"      /* B-link trees				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MFprivate.h" /* File memory management		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Metadata cache callbacks */
 static H5B_t *H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *b, unsigned H5_ATTR_UNUSED * flags_ptr);
+static herr_t H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *b,
+                         unsigned H5_ATTR_UNUSED *flags_ptr);
 static herr_t H5B__dest(H5F_t *f, H5B_t *bt);
 static herr_t H5B__clear(H5F_t *f, H5B_t *b, hbool_t destroy);
 static herr_t H5B__compute_size(const H5F_t *f, const H5B_t *bt, size_t *size_ptr);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -78,8 +74,6 @@ const H5AC_class_t H5AC_BT[1] = {{
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5B__load
  *
@@ -97,13 +91,13 @@ const H5AC_class_t H5AC_BT[1] = {{
 static H5B_t *
 H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5B_t *bt = NULL;           /* Pointer to the deserialized B-tree node */
-    H5B_cache_ud_t *udata = (H5B_cache_ud_t *)_udata;       /* User data for callback */
-    H5B_shared_t *shared;       /* Pointer to shared B-tree info */
-    const uint8_t *p;           /* Pointer into raw data buffer */
-    uint8_t *native;            /* Pointer to native keys */
-    unsigned u;                 /* Local index variable */
-    H5B_t *ret_value;           /* Return value */
+    H5B_t *         bt    = NULL;                     /* Pointer to the deserialized B-tree node */
+    H5B_cache_ud_t *udata = (H5B_cache_ud_t *)_udata; /* User data for callback */
+    H5B_shared_t *  shared;                           /* Pointer to shared B-tree info */
+    const uint8_t * p;                                /* Pointer into raw data buffer */
+    uint8_t *       native;                           /* Pointer to native keys */
+    unsigned        u;                                /* Local index variable */
+    H5B_t *         ret_value;                        /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -112,8 +106,8 @@ H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(H5F_addr_defined(addr));
     HDassert(udata);
 
-    if(NULL == (bt = H5FL_MALLOC(H5B_t)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate B-tree struct")
+    if (NULL == (bt = H5FL_MALLOC(H5B_t)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate B-tree struct")
     HDmemset(&bt->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Set & increment the ref-counted "shared" B-tree information for the node */
@@ -125,32 +119,32 @@ H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(shared);
 
     /* Allocate space for the native keys and child addresses */
-    if(NULL == (bt->native = H5FL_BLK_MALLOC(native_block, shared->sizeof_keys)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate buffer for native keys")
-    if(NULL == (bt->child = H5FL_SEQ_MALLOC(haddr_t, (size_t)shared->two_k)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate buffer for child addresses")
+    if (NULL == (bt->native = H5FL_BLK_MALLOC(native_block, shared->sizeof_keys)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate buffer for native keys")
+    if (NULL == (bt->child = H5FL_SEQ_MALLOC(haddr_t, (size_t)shared->two_k)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate buffer for child addresses")
 
-    if(H5F_block_read(f, H5FD_MEM_BTREE, addr, shared->sizeof_rnode, dxpl_id, shared->page) < 0)
-	HGOTO_ERROR(H5E_BTREE, H5E_READERROR, NULL, "can't read B-tree node")
+    if (H5F_block_read(f, H5FD_MEM_BTREE, addr, shared->sizeof_rnode, dxpl_id, shared->page) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_READERROR, NULL, "can't read B-tree node")
 
     /* Set the pointer into the raw data buffer */
     p = shared->page;
 
     /* magic number */
-    if(HDmemcmp(p, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "wrong B-tree signature")
+    if (HDmemcmp(p, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "wrong B-tree signature")
     p += 4;
 
     /* node type and level */
-    if(*p++ != (uint8_t)udata->type->id)
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "incorrect B-tree node type")
+    if (*p++ != (uint8_t)udata->type->id)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "incorrect B-tree node type")
     bt->level = *p++;
 
     /* entries used */
     UINT16DECODE(p, bt->nchildren);
 
     /* Check if bt->nchildren is greater than two_k */
-    if(bt->nchildren > shared->two_k)
+    if (bt->nchildren > shared->two_k)
         HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "number of children is greater than maximum")
 
     /* sibling pointers */
@@ -159,9 +153,9 @@ H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
     /* the child/key pairs */
     native = bt->native;
-    for(u = 0; u < bt->nchildren; u++) {
+    for (u = 0; u < bt->nchildren; u++) {
         /* Decode native key value */
-        if((udata->type->decode)(shared, p, native) < 0)
+        if ((udata->type->decode)(shared, p, native) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDECODE, NULL, "unable to decode key")
         p += shared->sizeof_rkey;
         native += udata->type->sizeof_nkey;
@@ -171,9 +165,9 @@ H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     } /* end for */
 
     /* Decode final key */
-    if(bt->nchildren > 0) {
+    if (bt->nchildren > 0) {
         /* Decode native key value */
-        if((udata->type->decode)(shared, p, native) < 0)
+        if ((udata->type->decode)(shared, p, native) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTDECODE, NULL, "unable to decode key")
     } /* end if */
 
@@ -181,14 +175,13 @@ H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     ret_value = bt;
 
 done:
-    if(!ret_value && bt)
-        if(H5B_node_dest(bt) < 0)
+    if (!ret_value && bt)
+        if (H5B_node_dest(bt) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, NULL, "unable to destroy B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5B__load() */  /*lint !e818 Can't make udata a pointer to const */
+} /* end H5B__load() */ /*lint !e818 Can't make udata a pointer to const */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B__flush
  *
@@ -203,10 +196,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt,
+           unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    H5B_shared_t *shared;       /* Pointer to shared B-tree info */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5B_shared_t *shared;              /* Pointer to shared B-tree info */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -219,10 +213,10 @@ H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, un
     HDassert(shared->type);
     HDassert(shared->type->encode);
 
-    if(bt->cache_info.is_dirty) {
-        uint8_t    *p;              /* Pointer into raw data buffer */
-        uint8_t    *native;         /* Pointer to native keys */
-        unsigned    u;              /* Local index variable */
+    if (bt->cache_info.is_dirty) {
+        uint8_t *p;      /* Pointer into raw data buffer */
+        uint8_t *native; /* Pointer to native keys */
+        unsigned u;      /* Local index variable */
 
         p = shared->page;
 
@@ -244,9 +238,9 @@ H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, un
 
         /* child keys and pointers */
         native = bt->native;
-        for(u = 0; u < bt->nchildren; ++u) {
+        for (u = 0; u < bt->nchildren; ++u) {
             /* encode the key */
-            if(shared->type->encode(shared, p, native) < 0)
+            if (shared->type->encode(shared, p, native) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, FAIL, "unable to encode B-tree key")
             p += shared->sizeof_rkey;
             native += shared->type->sizeof_nkey;
@@ -254,32 +248,31 @@ H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, un
             /* encode the child address */
             H5F_addr_encode(f, &p, bt->child[u]);
         } /* end for */
-        if(bt->nchildren > 0) {
+        if (bt->nchildren > 0) {
             /* Encode the final key */
-            if(shared->type->encode(shared, p, native) < 0)
+            if (shared->type->encode(shared, p, native) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, FAIL, "unable to encode B-tree key")
         } /* end if */
 
-	/*
+        /*
          * Write the disk page.	We always write the header, but we don't
          * bother writing data for the child entries that don't exist or
          * for the final unchanged children.
-	 */
-	if(H5F_block_write(f, H5FD_MEM_BTREE, addr, shared->sizeof_rnode, dxpl_id, shared->page) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to save B-tree node to disk")
+         */
+        if (H5F_block_write(f, H5FD_MEM_BTREE, addr, shared->sizeof_rnode, dxpl_id, shared->page) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to save B-tree node to disk")
 
-	bt->cache_info.is_dirty = FALSE;
+        bt->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5B__dest(f, bt) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node")
+    if (destroy)
+        if (H5B__dest(f, bt) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B__flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B__dest
  *
@@ -296,7 +289,7 @@ done:
 static herr_t
 H5B__dest(H5F_t *f, H5B_t *bt)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -311,8 +304,8 @@ H5B__dest(H5F_t *f, H5B_t *bt)
     HDassert(!bt->cache_info.free_file_space_on_destroy || H5F_addr_defined(bt->cache_info.addr));
 
     /* Check for freeing file space for B-tree node */
-    if(bt->cache_info.free_file_space_on_destroy) {
-        H5B_shared_t *shared;               /* Pointer to shared B-tree info */
+    if (bt->cache_info.free_file_space_on_destroy) {
+        H5B_shared_t *shared; /* Pointer to shared B-tree info */
 
         /* Get the pointer to the shared B-tree info */
         shared = (H5B_shared_t *)H5RC_GET_OBJ(bt->rc_shared);
@@ -320,19 +313,19 @@ H5B__dest(H5F_t *f, H5B_t *bt)
 
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, bt->cache_info.addr, (hsize_t)shared->sizeof_rnode) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, bt->cache_info.addr, (hsize_t)shared->sizeof_rnode) <
+            0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free B-tree node")
     } /* end if */
 
     /* Destroy B-tree node */
-    if(H5B_node_dest(bt) < 0)
+    if (H5B_node_dest(bt) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B__dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B__clear
  *
@@ -361,15 +354,14 @@ H5B__clear(H5F_t *f, H5B_t *bt, hbool_t destroy)
     /* Reset the dirty flag.  */
     bt->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5B__dest(f, bt) < 0)
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node")
+    if (destroy)
+        if (H5B__dest(f, bt) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B__clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B__compute_size
  *
@@ -387,7 +379,7 @@ done:
 static herr_t
 H5B__compute_size(const H5F_t H5_ATTR_UNUSED *f, const H5B_t *bt, size_t *size_ptr)
 {
-    H5B_shared_t        *shared;        /* Pointer to shared B-tree info */
+    H5B_shared_t *shared; /* Pointer to shared B-tree info */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -405,4 +397,3 @@ H5B__compute_size(const H5F_t H5_ATTR_UNUSED *f, const H5B_t *bt, size_t *size_p
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B__compute_size() */
-
diff --git a/src/H5Bdbg.c b/src/H5Bdbg.c
index f502f8b..127e7eb 100644
--- a/src/H5Bdbg.c
+++ b/src/H5Bdbg.c
@@ -26,19 +26,16 @@
 /* Module Setup */
 /****************/
 
-#define H5B_PACKAGE		/*suppress error about including H5Bpkg	  */
-
+#define H5B_PACKAGE /*suppress error about including H5Bpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Bpkg.h"		/* B-link trees				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Bpkg.h"      /* B-link trees				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_debug
  *
@@ -54,14 +51,14 @@
  */
 herr_t
 H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
-	  const H5B_class_t *type, void *udata)
+          const H5B_class_t *type, void *udata)
 {
-    H5B_t	*bt = NULL;
-    H5RC_t	*rc_shared;             /* Ref-counted shared info */
-    H5B_shared_t *shared;               /* Pointer to shared B-tree info */
+    H5B_t *        bt = NULL;
+    H5RC_t *       rc_shared;           /* Ref-counted shared info */
+    H5B_shared_t * shared;              /* Pointer to shared B-tree info */
     H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    unsigned	u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned       u;                   /* Local index variable */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -76,83 +73,66 @@ H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
     HDassert(type);
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, udata)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
+    if (NULL == (rc_shared = (type->get_shared)(f, udata)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
     /*
      * Load the tree node.
      */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
+    if (NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
 
     /*
      * Print the values.
      */
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Tree type ID:",
+              ((shared->type->id) == H5B_SNODE_ID
+                   ? "H5B_SNODE_ID"
+                   : ((shared->type->id) == H5B_CHUNK_ID ? "H5B_CHUNK_ID" : "Unknown!")));
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of node:", shared->sizeof_rnode);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of raw (disk) key:", shared->sizeof_rkey);
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Tree type ID:",
-	      ((shared->type->id) == H5B_SNODE_ID ? "H5B_SNODE_ID" :
-            ((shared->type->id) == H5B_CHUNK_ID ? "H5B_CHUNK_ID" : "Unknown!")));
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of node:",
-	      shared->sizeof_rnode);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of raw (disk) key:",
-	      shared->sizeof_rkey);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Dirty flag:",
-	      bt->cache_info.is_dirty ? "True" : "False");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Level:",
-	      bt->level);
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Address of left sibling:",
-	      bt->left);
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Address of right sibling:",
-	      bt->right);
-    HDfprintf(stream, "%*s%-*s %u (%u)\n", indent, "", fwidth,
-	      "Number of children (max):",
-	      bt->nchildren, shared->two_k);
+              "Dirty flag:", bt->cache_info.is_dirty ? "True" : "False");
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Level:", bt->level);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Address of left sibling:", bt->left);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Address of right sibling:", bt->right);
+    HDfprintf(stream, "%*s%-*s %u (%u)\n", indent, "", fwidth, "Number of children (max):", bt->nchildren,
+              shared->two_k);
 
     /*
      * Print the child addresses
      */
-    for(u = 0; u < bt->nchildren; u++) {
-	HDfprintf(stream, "%*sChild %d...\n", indent, "", u);
-	HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Address:", bt->child[u]);
+    for (u = 0; u < bt->nchildren; u++) {
+        HDfprintf(stream, "%*sChild %d...\n", indent, "", u);
+        HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", MAX(0, fwidth - 3), "Address:", bt->child[u]);
 
         /* If there is a key debugging routine, use it to display the left & right keys */
-	if(type->debug_key) {
+        if (type->debug_key) {
             /* Decode the 'left' key & print it */
-            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "Left Key:");
-            HDassert(H5B_NKEY(bt,shared,u));
-	    (void)(type->debug_key)(stream, indent + 6, MAX(0, fwidth - 6),
-			      H5B_NKEY(bt, shared, u), udata);
+            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "Left Key:");
+            HDassert(H5B_NKEY(bt, shared, u));
+            (void)(type->debug_key)(stream, indent + 6, MAX(0, fwidth - 6), H5B_NKEY(bt, shared, u), udata);
 
             /* Decode the 'right' key & print it */
-            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "Right Key:");
+            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "Right Key:");
             HDassert(H5B_NKEY(bt, shared, u + 1));
-	    (void)(type->debug_key)(stream, indent + 6, MAX (0, fwidth - 6),
-			      H5B_NKEY(bt, shared, u + 1), udata);
-	} /* end if */
-    } /* end for */
+            (void)(type->debug_key)(stream, indent + 6, MAX(0, fwidth - 6), H5B_NKEY(bt, shared, u + 1),
+                                    udata);
+        } /* end if */
+    }     /* end for */
 
 done:
-    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+    if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5B_assert
  *
@@ -171,52 +151,52 @@ done:
 herr_t
 H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void *udata)
 {
-    H5B_t	*bt = NULL;
-    H5RC_t	*rc_shared;             /* Ref-counted shared info */
-    H5B_shared_t *shared;               /* Pointer to shared B-tree info */
-    H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    int	        ncell, cmp;
-    static int	ncalls = 0;
-    herr_t	status;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5B_t *        bt = NULL;
+    H5RC_t *       rc_shared;   /* Ref-counted shared info */
+    H5B_shared_t * shared;      /* Pointer to shared B-tree info */
+    H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */
+    int            ncell, cmp;
+    static int     ncalls = 0;
+    herr_t         status;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     /* A queue of child data */
     struct child_t {
-	haddr_t			addr;
-	unsigned		level;
-	struct child_t	       *next;
+        haddr_t         addr;
+        unsigned        level;
+        struct child_t *next;
     } *head = NULL, *tail = NULL, *prev = NULL, *cur = NULL, *tmp = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(0 == ncalls++) {
-	if(H5DEBUG(B))
-	    HDfprintf(H5DEBUG(B), "H5B: debugging B-trees (expensive)\n");
+    if (0 == ncalls++) {
+        if (H5DEBUG(B))
+            HDfprintf(H5DEBUG(B), "H5B: debugging B-trees (expensive)\n");
     } /* end if */
 
     /* Get shared info for B-tree */
-    if(NULL == (rc_shared = (type->get_shared)(f, udata)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
+    if (NULL == (rc_shared = (type->get_shared)(f, udata)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
     shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
     HDassert(shared);
 
     /* Initialize the queue */
-    cache_udata.f = f;
-    cache_udata.type = type;
+    cache_udata.f         = f;
+    cache_udata.type      = type;
     cache_udata.rc_shared = rc_shared;
-    bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ);
+    bt                    = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_READ);
     HDassert(bt);
     shared = (H5B_shared_t *)H5RC_GET_OBJ(bt->rc_shared);
     HDassert(shared);
     cur = (struct child_t *)H5MM_calloc(sizeof(struct child_t));
     HDassert(cur);
-    cur->addr = addr;
+    cur->addr  = addr;
     cur->level = bt->level;
     head = tail = cur;
 
     status = H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__NO_FLAGS_SET);
     HDassert(status >= 0);
-    bt = NULL;    /* Make certain future references will be caught */
+    bt = NULL; /* Make certain future references will be caught */
 
     /*
      * Do a breadth-first search of the tree.  New nodes are added to the end
@@ -224,65 +204,64 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
      * remove any nodes from the queue because we need them in the uniqueness
      * test.
      */
-    for(ncell = 0; cur; ncell++) {
-	bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, cur->addr, &cache_udata, H5AC_READ);
-	HDassert(bt);
-
-	/* Check node header */
-	HDassert(bt->level == cur->level);
-	if(cur->next && cur->next->level == bt->level)
-	    HDassert(H5F_addr_eq(bt->right, cur->next->addr));
-	else
-	    HDassert(!H5F_addr_defined(bt->right));
-	if(prev && prev->level == bt->level)
-	    HDassert(H5F_addr_eq(bt->left, prev->addr));
-	else
-	    HDassert(!H5F_addr_defined(bt->left));
-
-	if(cur->level > 0) {
+    for (ncell = 0; cur; ncell++) {
+        bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, cur->addr, &cache_udata, H5AC_READ);
+        HDassert(bt);
+
+        /* Check node header */
+        HDassert(bt->level == cur->level);
+        if (cur->next && cur->next->level == bt->level)
+            HDassert(H5F_addr_eq(bt->right, cur->next->addr));
+        else
+            HDassert(!H5F_addr_defined(bt->right));
+        if (prev && prev->level == bt->level)
+            HDassert(H5F_addr_eq(bt->left, prev->addr));
+        else
+            HDassert(!H5F_addr_defined(bt->left));
+
+        if (cur->level > 0) {
             unsigned u;
 
-	    for(u = 0; u < bt->nchildren; u++) {
-		/*
-		 * Check that child nodes haven't already been seen.  If they
-		 * have then the tree has a cycle.
-		 */
-		for(tmp = head; tmp; tmp = tmp->next)
-		    HDassert(H5F_addr_ne(tmp->addr, bt->child[u]));
-
-		/* Add the child node to the end of the queue */
-		tmp = (struct child_t *)H5MM_calloc(sizeof(struct child_t));
-		HDassert(tmp);
-		tmp->addr = bt->child[u];
-		tmp->level = bt->level - 1;
-		tail->next = tmp;
-		tail = tmp;
-
-		/* Check that the keys are monotonically increasing */
-		cmp = (type->cmp2)(H5B_NKEY(bt, shared, u), udata, H5B_NKEY(bt, shared, u + 1));
-		HDassert(cmp < 0);
-	    } /* end for */
-	} /* end if */
-
-	/* Release node */
-	status = H5AC_unprotect(f, dxpl_id, H5AC_BT, cur->addr, bt, H5AC__NO_FLAGS_SET);
-	HDassert(status >= 0);
-        bt = NULL;    /* Make certain future references will be caught */
-
-	/* Advance current location in queue */
-	prev = cur;
-	cur = cur->next;
+            for (u = 0; u < bt->nchildren; u++) {
+                /*
+                 * Check that child nodes haven't already been seen.  If they
+                 * have then the tree has a cycle.
+                 */
+                for (tmp = head; tmp; tmp = tmp->next)
+                    HDassert(H5F_addr_ne(tmp->addr, bt->child[u]));
+
+                /* Add the child node to the end of the queue */
+                tmp = (struct child_t *)H5MM_calloc(sizeof(struct child_t));
+                HDassert(tmp);
+                tmp->addr  = bt->child[u];
+                tmp->level = bt->level - 1;
+                tail->next = tmp;
+                tail       = tmp;
+
+                /* Check that the keys are monotonically increasing */
+                cmp = (type->cmp2)(H5B_NKEY(bt, shared, u), udata, H5B_NKEY(bt, shared, u + 1));
+                HDassert(cmp < 0);
+            } /* end for */
+        }     /* end if */
+
+        /* Release node */
+        status = H5AC_unprotect(f, dxpl_id, H5AC_BT, cur->addr, bt, H5AC__NO_FLAGS_SET);
+        HDassert(status >= 0);
+        bt = NULL; /* Make certain future references will be caught */
+
+        /* Advance current location in queue */
+        prev = cur;
+        cur  = cur->next;
     } /* end for */
 
     /* Free all entries from queue */
-    while(head) {
-	tmp = head->next;
-	H5MM_xfree(head);
-	head = tmp;
+    while (head) {
+        tmp = head->next;
+        H5MM_xfree(head);
+        head = tmp;
     } /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B_assert() */
 #endif /* H5B_DEBUG */
-
diff --git a/src/H5Bpkg.h b/src/H5Bpkg.h
index 4acd607..1a3906c 100644
--- a/src/H5Bpkg.h
+++ b/src/H5Bpkg.h
@@ -30,17 +30,15 @@
 #include "H5Bprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5FLprivate.h"        /* Free Lists                           */
-
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5FLprivate.h" /* Free Lists                           */
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
 /* Get the native key at a given index */
-#define H5B_NKEY(b, shared, idx)  ((b)->native + (shared)->nkey[(idx)])
-
+#define H5B_NKEY(b, shared, idx) ((b)->native + (shared)->nkey[(idx)])
 
 /****************************/
 /* Package Private Typedefs */
@@ -48,22 +46,22 @@
 
 /* The B-tree node as stored in memory...  */
 typedef struct H5B_t {
-    H5AC_info_t        cache_info;     /* Information for H5AC cache functions */
-                                        /* _must_ be first field in structure */
-    H5RC_t		*rc_shared;	/*ref-counted shared info	     */
-    unsigned		level;		/*node level			     */
-    unsigned		nchildren;	/*number of child pointers	     */
-    haddr_t		left;		/*address of left sibling	     */
-    haddr_t		right;		/*address of right sibling	     */
-    uint8_t		*native;	/*array of keys in native format     */
-    haddr_t		*child;		/*2k child pointers		     */
+    H5AC_info_t cache_info; /* Information for H5AC cache functions */
+                            /* _must_ be first field in structure */
+    H5RC_t * rc_shared;     /*ref-counted shared info	     */
+    unsigned level;         /*node level			     */
+    unsigned nchildren;     /*number of child pointers	     */
+    haddr_t  left;          /*address of left sibling	     */
+    haddr_t  right;         /*address of right sibling	     */
+    uint8_t *native;        /*array of keys in native format     */
+    haddr_t *child;         /*2k child pointers		     */
 } H5B_t;
 
 /* Callback info for loading a B-tree node into the cache */
 typedef struct H5B_cache_ud_t {
-    H5F_t *f;                           /* File that B-tree node is within   */
-    const struct H5B_class_t *type;     /* Type of tree			     */
-    H5RC_t *rc_shared;                  /* Ref-counted shared info	     */
+    H5F_t *                   f;         /* File that B-tree node is within   */
+    const struct H5B_class_t *type;      /* Type of tree			     */
+    H5RC_t *                  rc_shared; /* Ref-counted shared info	     */
 } H5B_cache_ud_t;
 
 /*****************************/
@@ -82,15 +80,12 @@ H5FL_BLK_EXTERN(native_block);
 /* Declare a free list to manage the H5B_t struct */
 H5FL_EXTERN(H5B_t);
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 H5_DLL herr_t H5B_node_dest(H5B_t *bt);
 #ifdef H5B_DEBUG
-herr_t H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type,
-			 void *udata);
+herr_t H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void *udata);
 #endif
 
 #endif /*_H5Bpkg_H*/
-
diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index 9b565ab..c4c7bf2 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -27,12 +27,12 @@
 #ifndef _H5Bprivate_H
 #define _H5Bprivate_H
 
-#include "H5Bpublic.h"		/*API prototypes			     */
+#include "H5Bpublic.h" /*API prototypes			     */
 
 /* Private headers needed by this file */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5RCprivate.h"	/* Reference counted object functions	*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5RCprivate.h" /* Reference counted object functions	*/
 
 /**************************/
 /* Library Private Macros */
@@ -45,10 +45,9 @@
  *	    being enabled.
  */
 #ifdef NDEBUG
-#  undef H5B_DEBUG
+#undef H5B_DEBUG
 #endif
 
-
 /****************************/
 /* Library Private Typedefs */
 /****************************/
@@ -58,46 +57,46 @@
  * nodes) they use will need to be stored in the file somewhere. -QAK
  */
 typedef enum H5B_subid_t {
-    H5B_SNODE_ID	 = 0,	/*B-tree is for symbol table nodes	     */
-    H5B_CHUNK_ID	 = 1,	/*B-tree is for chunked dataset storage	     */
-    H5B_NUM_BTREE_ID            /* Number of B-tree key IDs (must be last)   */
+    H5B_SNODE_ID = 0, /*B-tree is for symbol table nodes	     */
+    H5B_CHUNK_ID = 1, /*B-tree is for chunked dataset storage	     */
+    H5B_NUM_BTREE_ID  /* Number of B-tree key IDs (must be last)   */
 } H5B_subid_t;
 
 /* Define return values from B-tree insertion callbacks */
 typedef enum H5B_ins_t {
-    H5B_INS_ERROR	 = -1,	/*error return value			     */
-    H5B_INS_NOOP	 = 0,	/*insert made no changes		     */
-    H5B_INS_LEFT	 = 1,	/*insert new node to left of cur node	     */
-    H5B_INS_RIGHT	 = 2,	/*insert new node to right of cur node	     */
-    H5B_INS_CHANGE	 = 3,	/*change child address for cur node	     */
-    H5B_INS_FIRST	 = 4,	/*insert first node in (sub)tree	     */
-    H5B_INS_REMOVE	 = 5	/*remove current node			     */
+    H5B_INS_ERROR  = -1, /*error return value			     */
+    H5B_INS_NOOP   = 0,  /*insert made no changes		     */
+    H5B_INS_LEFT   = 1,  /*insert new node to left of cur node	     */
+    H5B_INS_RIGHT  = 2,  /*insert new node to right of cur node	     */
+    H5B_INS_CHANGE = 3,  /*change child address for cur node	     */
+    H5B_INS_FIRST  = 4,  /*insert first node in (sub)tree	     */
+    H5B_INS_REMOVE = 5   /*remove current node			     */
 } H5B_ins_t;
 
 /* Enum for specifying the direction of the critical key in relation to the
  * child */
 typedef enum H5B_dir_t {
-    H5B_LEFT            = 0,    /* Critical key is to the left */
-    H5B_RIGHT           = 1     /* Critical key is to the right */
+    H5B_LEFT  = 0, /* Critical key is to the left */
+    H5B_RIGHT = 1  /* Critical key is to the right */
 } H5B_dir_t;
 
 /* Define the operator callback function pointer for H5B_iterate() */
-typedef int (*H5B_operator_t)(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
-                                        const void *_rt_key, void *_udata);
+typedef int (*H5B_operator_t)(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr, const void *_rt_key,
+                              void *_udata);
 
 /* Each B-tree has certain information that can be shared across all
  * the instances of nodes in that B-tree.
  */
 typedef struct H5B_shared_t {
-    const struct H5B_class_t	*type;	/* Type of tree			     */
-    unsigned            two_k;          /* 2*"K" value for tree's nodes      */
-    size_t		sizeof_rkey;	/* Size of raw (disk) key	     */
-    size_t		sizeof_rnode;	/* Size of raw (disk) node	     */
-    size_t		sizeof_keys;	/* Size of native (memory) key node  */
-    size_t              sizeof_addr;    /* Size of file address (in bytes)   */
-    size_t              sizeof_len;     /* Size of file lengths (in bytes)   */
-    uint8_t	        *page;	        /* Disk page */
-    size_t              *nkey;          /* Offsets of each native key in native key buffer */
+    const struct H5B_class_t *type;         /* Type of tree			     */
+    unsigned                  two_k;        /* 2*"K" value for tree's nodes      */
+    size_t                    sizeof_rkey;  /* Size of raw (disk) key	     */
+    size_t                    sizeof_rnode; /* Size of raw (disk) node	     */
+    size_t                    sizeof_keys;  /* Size of native (memory) key node  */
+    size_t                    sizeof_addr;  /* Size of file address (in bytes)   */
+    size_t                    sizeof_len;   /* Size of file lengths (in bytes)   */
+    uint8_t *                 page;         /* Disk page */
+    size_t *                  nkey;         /* Offsets of each native key in native key buffer */
 } H5B_shared_t;
 
 /*
@@ -109,71 +108,60 @@ typedef struct H5B_shared_t {
  */
 
 typedef struct H5B_class_t {
-    H5B_subid_t id;					/*id as found in file*/
-    size_t	sizeof_nkey;			/*size of native (memory) key*/
-    H5RC_t *    (*get_shared)(const H5F_t*, const void*);    /*shared info for node */
-    herr_t	(*new_node)(H5F_t*, hid_t, H5B_ins_t, void*, void*, void*, haddr_t*);
-    int         (*cmp2)(void*, void*, void*);	    /*compare 2 keys */
-    int         (*cmp3)(void*, void*, void*);	    /*compare 3 keys */
-    htri_t	(*found)(H5F_t*, hid_t, haddr_t, const void*, void*);
+    H5B_subid_t id;                                     /*id as found in file*/
+    size_t      sizeof_nkey;                            /*size of native (memory) key*/
+    H5RC_t *(*get_shared)(const H5F_t *, const void *); /*shared info for node */
+    herr_t (*new_node)(H5F_t *, hid_t, H5B_ins_t, void *, void *, void *, haddr_t *);
+    int (*cmp2)(void *, void *, void *); /*compare 2 keys */
+    int (*cmp3)(void *, void *, void *); /*compare 3 keys */
+    htri_t (*found)(H5F_t *, hid_t, haddr_t, const void *, void *);
 
     /* insert new data */
-    H5B_ins_t	(*insert)(H5F_t*, hid_t, haddr_t, void*, hbool_t*, void*, void*,
-			  void*, hbool_t*, haddr_t*);
+    H5B_ins_t (*insert)(H5F_t *, hid_t, haddr_t, void *, hbool_t *, void *, void *, void *, hbool_t *,
+                        haddr_t *);
 
     /* min insert uses min leaf, not new(), similarly for max insert */
-    hbool_t	follow_min;
-    hbool_t	follow_max;
+    hbool_t follow_min;
+    hbool_t follow_max;
 
     /* The direction of the key that is intrinsically associated with each node */
-    H5B_dir_t   critical_key;
+    H5B_dir_t critical_key;
 
     /* remove existing data */
-    H5B_ins_t	(*remove)(H5F_t*, hid_t, haddr_t, void*, hbool_t*, void*, void*,
-			  hbool_t*);
+    H5B_ins_t (*remove)(H5F_t *, hid_t, haddr_t, void *, hbool_t *, void *, void *, hbool_t *);
 
     /* encode, decode, debug key values */
-    herr_t	(*decode)(const H5B_shared_t*, const uint8_t*, void*);
-    herr_t	(*encode)(const H5B_shared_t*, uint8_t*, const void*);
-    herr_t	(*debug_key)(FILE*, int, int, const void*, const void*);
+    herr_t (*decode)(const H5B_shared_t *, const uint8_t *, void *);
+    herr_t (*encode)(const H5B_shared_t *, uint8_t *, const void *);
+    herr_t (*debug_key)(FILE *, int, int, const void *, const void *);
 } H5B_class_t;
 
 /* Information about B-tree */
 typedef struct H5B_info_t {
-    hsize_t     size;           /* Size of B-tree nodes */
-    hsize_t     num_nodes;      /* Number of B-tree nodes */
+    hsize_t size;      /* Size of B-tree nodes */
+    hsize_t num_nodes; /* Number of B-tree nodes */
 } H5B_info_t;
 
-
-
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
-H5_DLL herr_t H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type,
-    void *udata, haddr_t *addr_p/*out*/);
-H5_DLL herr_t H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type,
-    haddr_t addr, void *udata);
-H5_DLL herr_t H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type,
-    haddr_t addr, void *udata);
-H5_DLL herr_t H5B_iterate(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type,
-    haddr_t addr, H5B_operator_t op, void *udata);
-H5_DLL herr_t H5B_get_info(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type,
-    haddr_t addr, H5B_info_t *bt_info, H5B_operator_t op, void *udata);
-H5_DLL herr_t H5B_remove(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type,
-    haddr_t addr, void *udata);
-H5_DLL herr_t H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type,
-    haddr_t addr, void *udata);
-H5_DLL H5B_shared_t *H5B_shared_new(const H5F_t *f, const H5B_class_t *type,
-    size_t sizeof_rkey);
-H5_DLL herr_t H5B_shared_free(void *_shared);
-H5_DLL herr_t H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream,
-    int indent, int fwidth, const H5B_class_t *type, void *udata);
-H5_DLL htri_t H5B_valid(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type,
-    haddr_t addr);
+H5_DLL herr_t H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata,
+                         haddr_t *addr_p /*out*/);
+H5_DLL herr_t H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata);
+H5_DLL herr_t H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata);
+H5_DLL herr_t H5B_iterate(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, H5B_operator_t op,
+                          void *udata);
+H5_DLL herr_t H5B_get_info(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
+                           H5B_info_t *bt_info, H5B_operator_t op, void *udata);
+H5_DLL herr_t H5B_remove(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata);
+H5_DLL herr_t H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata);
+H5_DLL H5B_shared_t *H5B_shared_new(const H5F_t *f, const H5B_class_t *type, size_t sizeof_rkey);
+H5_DLL herr_t        H5B_shared_free(void *_shared);
+H5_DLL herr_t        H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                               const H5B_class_t *type, void *udata);
+H5_DLL htri_t        H5B_valid(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr);
 #endif /* _H5Bprivate_H */
-
diff --git a/src/H5C.c b/src/H5C.c
index aa92610..97803b7 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -68,25 +68,23 @@
  *
  **************************************************************************/
 
-#define H5C_PACKAGE        /*suppress error about including H5Cpkg   */
-#define H5F_PACKAGE        /*suppress error about including H5Fpkg      */
+#define H5C_PACKAGE /*suppress error about including H5Cpkg   */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg      */
 
-
-#include "H5private.h"        /* Generic Functions            */
+#include "H5private.h" /* Generic Functions            */
 #ifdef H5_HAVE_PARALLEL
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#endif /* H5_HAVE_PARALLEL */
-#include "H5Cpkg.h"        /* Cache                */
-#include "H5Dprivate.h"        /* Dataset functions            */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5Fpkg.h"        /* Files                */
-#include "H5FDprivate.h"    /* File drivers                */
-#include "H5FLprivate.h"    /* Free Lists                           */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Pprivate.h"         /* Property lists                       */
-#include "H5SLprivate.h"    /* Skip lists                */
-
+#include "H5ACprivate.h" /* Metadata cache                       */
+#endif                   /* H5_HAVE_PARALLEL */
+#include "H5Cpkg.h"      /* Cache                */
+#include "H5Dprivate.h"  /* Dataset functions            */
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5Fpkg.h"      /* Files                */
+#include "H5FDprivate.h" /* File drivers                */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Pprivate.h"  /* Property lists                       */
+#include "H5SLprivate.h" /* Skip lists                */
 
 /*
  * Private file-scope variables.
@@ -95,77 +93,49 @@
 /* Declare a free list to manage the H5C_t struct */
 H5FL_DEFINE_STATIC(H5C_t);
 
-
 /*
  * Private file-scope function declarations:
  */
 
-static herr_t H5C__auto_adjust_cache_size(H5F_t * f,
-                                          hid_t primary_dxpl_id,
-                                          hid_t secondary_dxpl_id,
-                                          hbool_t write_permitted,
-                                          hbool_t * first_flush_ptr);
-
-static herr_t H5C__autoadjust__ageout(H5F_t * f,
-                                      double hit_rate,
-                                      enum H5C_resize_status * status_ptr,
-                                      size_t * new_max_cache_size_ptr,
-                                      hid_t primary_dxpl_id,
-                                      hid_t secondary_dxpl_id,
-                                      hbool_t write_permitted,
-                                      hbool_t * first_flush_ptr);
-
-static herr_t H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t * cache_ptr);
-
-static herr_t H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
-                                                    hid_t primary_dxpl_id,
-                                                    hid_t secondary_dxpl_id,
-                                                    hbool_t write_permitted,
-                                                    hbool_t * first_flush_ptr);
-
-static herr_t H5C__autoadjust__ageout__insert_new_marker(H5C_t * cache_ptr);
-
-static herr_t H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr);
-
-static herr_t H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr);
-
-static herr_t H5C__flash_increase_cache_size(H5C_t * cache_ptr,
-                                             size_t old_entry_size,
-                                             size_t new_entry_size);
-
-static herr_t H5C_flush_single_entry(H5F_t *            f,
-                                     hid_t               primary_dxpl_id,
-                                     hid_t               secondary_dxpl_id,
-                                     const H5C_class_t * type_ptr,
-                                     haddr_t             addr,
-                                     unsigned            flags,
-                                     hbool_t *           first_flush_ptr,
-                                     hbool_t    del_entry_from_slist_on_destroy);
-
-static herr_t H5C_flush_invalidate_cache(H5F_t *  f,
-                                    hid_t    primary_dxpl_id,
-                        hid_t    secondary_dxpl_id,
-                    unsigned flags);
-
-static void * H5C_load_entry(H5F_t *             f,
-                             hid_t               dxpl_id,
-                             const H5C_class_t * type,
-                             haddr_t             addr,
-                             void *              udata);
-
-static herr_t H5C_make_space_in_cache(H5F_t * f,
-                                      hid_t   primary_dxpl_id,
-                                      hid_t   secondary_dxpl_id,
-                                      size_t  space_needed,
-                                      hbool_t write_permitted,
-                                      hbool_t * first_flush_ptr);
+static herr_t H5C__auto_adjust_cache_size(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                          hbool_t write_permitted, hbool_t *first_flush_ptr);
+
+static herr_t H5C__autoadjust__ageout(H5F_t *f, double hit_rate, enum H5C_resize_status *status_ptr,
+                                      size_t *new_max_cache_size_ptr, hid_t primary_dxpl_id,
+                                      hid_t secondary_dxpl_id, hbool_t write_permitted,
+                                      hbool_t *first_flush_ptr);
+
+static herr_t H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t *cache_ptr);
+
+static herr_t H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *f, hid_t primary_dxpl_id,
+                                                              hid_t    secondary_dxpl_id,
+                                                              hbool_t  write_permitted,
+                                                              hbool_t *first_flush_ptr);
+
+static herr_t H5C__autoadjust__ageout__insert_new_marker(H5C_t *cache_ptr);
+
+static herr_t H5C__autoadjust__ageout__remove_all_markers(H5C_t *cache_ptr);
+
+static herr_t H5C__autoadjust__ageout__remove_excess_markers(H5C_t *cache_ptr);
+
+static herr_t H5C__flash_increase_cache_size(H5C_t *cache_ptr, size_t old_entry_size, size_t new_entry_size);
+
+static herr_t H5C_flush_single_entry(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                     const H5C_class_t *type_ptr, haddr_t addr, unsigned flags,
+                                     hbool_t *first_flush_ptr, hbool_t del_entry_from_slist_on_destroy);
+
+static herr_t H5C_flush_invalidate_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                         unsigned flags);
+
+static void *H5C_load_entry(H5F_t *f, hid_t dxpl_id, const H5C_class_t *type, haddr_t addr, void *udata);
+
+static herr_t H5C_make_space_in_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                      size_t space_needed, hbool_t write_permitted, hbool_t *first_flush_ptr);
 #if H5C_DO_EXTREME_SANITY_CHECKS
-static herr_t H5C_validate_lru_list(H5C_t * cache_ptr);
-static herr_t H5C_verify_not_in_index(H5C_t * cache_ptr,
-                                      H5C_cache_entry_t * entry_ptr);
+static herr_t H5C_validate_lru_list(H5C_t *cache_ptr);
+static herr_t H5C_verify_not_in_index(H5C_t *cache_ptr, H5C_cache_entry_t *entry_ptr);
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-
 /****************************************************************************
  *
  * #defines and declarations for epoch marker cache entries.
@@ -181,27 +151,23 @@ static herr_t H5C_verify_not_in_index(H5C_t * cache_ptr,
  * it is needed to dimension arrays in H5C_t.
  */
 
-#define H5C__EPOCH_MARKER_TYPE    H5C__MAX_NUM_TYPE_IDS
+#define H5C__EPOCH_MARKER_TYPE H5C__MAX_NUM_TYPE_IDS
 
-static void *H5C_epoch_marker_load(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-                                   void *udata);
-static herr_t H5C_epoch_marker_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest,
-                                     haddr_t addr, void *thing,
-                    unsigned *flags_ptr);
+static void * H5C_epoch_marker_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
+static herr_t H5C_epoch_marker_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, void *thing,
+                                     unsigned *flags_ptr);
 static herr_t H5C_epoch_marker_dest(H5F_t *f, void *thing);
 static herr_t H5C_epoch_marker_clear(H5F_t *f, void *thing, hbool_t dest);
 static herr_t H5C_epoch_marker_notify(H5C_notify_action_t action, void *thing);
 static herr_t H5C_epoch_marker_size(const H5F_t *f, const void *thing, size_t *size_ptr);
 
-const H5C_class_t epoch_marker_class =
-{
+const H5C_class_t epoch_marker_class = {
     /* id    = */ H5C__EPOCH_MARKER_TYPE,
     /* load  = */ &H5C_epoch_marker_load,
     /* flush = */ &H5C_epoch_marker_flush,
     /* dest  = */ &H5C_epoch_marker_dest,
     /* clear = */ &H5C_epoch_marker_clear,
-    /* size  = */ &H5C_epoch_marker_size
-};
+    /* size  = */ &H5C_epoch_marker_size};
 
 /***************************************************************************
  * Class functions for H5C__EPOCH_MAKER_TYPE:
@@ -213,12 +179,10 @@ const H5C_class_t epoch_marker_class =
  ***************************************************************************/
 
 static void *
-H5C_epoch_marker_load(H5F_t H5_ATTR_UNUSED * f,
-                      hid_t H5_ATTR_UNUSED dxpl_id,
-                      haddr_t H5_ATTR_UNUSED addr,
-                      void H5_ATTR_UNUSED * udata)
+H5C_epoch_marker_load(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr,
+                      void H5_ATTR_UNUSED *udata)
 {
-    void * ret_value = NULL;      /* Return value */
+    void *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -230,14 +194,11 @@ done:
 }
 
 static herr_t
-H5C_epoch_marker_flush(H5F_t H5_ATTR_UNUSED *f,
-                       hid_t H5_ATTR_UNUSED dxpl_id,
-                       hbool_t H5_ATTR_UNUSED dest,
-                       haddr_t H5_ATTR_UNUSED addr,
-                       void H5_ATTR_UNUSED *thing,
-            unsigned H5_ATTR_UNUSED * flags_ptr)
+H5C_epoch_marker_flush(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED dest,
+                       haddr_t H5_ATTR_UNUSED addr, void H5_ATTR_UNUSED *thing,
+                       unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    herr_t ret_value = FAIL;      /* Return value */
+    herr_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -249,10 +210,9 @@ done:
 }
 
 static herr_t
-H5C_epoch_marker_dest(H5F_t H5_ATTR_UNUSED * f,
-                      void H5_ATTR_UNUSED * thing)
+H5C_epoch_marker_dest(H5F_t H5_ATTR_UNUSED *f, void H5_ATTR_UNUSED *thing)
 {
-    herr_t ret_value = FAIL;      /* Return value */
+    herr_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -264,11 +224,9 @@ done:
 }
 
 static herr_t
-H5C_epoch_marker_clear(H5F_t H5_ATTR_UNUSED * f,
-                       void H5_ATTR_UNUSED * thing,
-                       hbool_t H5_ATTR_UNUSED dest)
+H5C_epoch_marker_clear(H5F_t H5_ATTR_UNUSED *f, void H5_ATTR_UNUSED *thing, hbool_t H5_ATTR_UNUSED dest)
 {
-    herr_t ret_value = FAIL;      /* Return value */
+    herr_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -280,10 +238,9 @@ done:
 }
 
 static herr_t
-H5C_epoch_marker_notify(H5C_notify_action_t H5_ATTR_UNUSED action,
-                       void H5_ATTR_UNUSED * thing)
+H5C_epoch_marker_notify(H5C_notify_action_t H5_ATTR_UNUSED action, void H5_ATTR_UNUSED *thing)
 {
-    herr_t ret_value = FAIL;      /* Return value */
+    herr_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -294,11 +251,10 @@ done:
 }
 
 static herr_t
-H5C_epoch_marker_size(const H5F_t H5_ATTR_UNUSED * f,
-                      const void H5_ATTR_UNUSED * thing,
-                      size_t H5_ATTR_UNUSED * size_ptr)
+H5C_epoch_marker_size(const H5F_t H5_ATTR_UNUSED *f, const void H5_ATTR_UNUSED *thing,
+                      size_t H5_ATTR_UNUSED *size_ptr)
 {
-    herr_t ret_value = FAIL;      /* Return value */
+    herr_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -309,7 +265,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_apply_candidate_list
  *
@@ -402,59 +357,51 @@ done:
 #ifdef H5_HAVE_PARALLEL
 #define H5C_APPLY_CANDIDATE_LIST__DEBUG 0
 herr_t
-H5C_apply_candidate_list(H5F_t * f,
-                         hid_t primary_dxpl_id,
-                         hid_t secondary_dxpl_id,
-                         H5C_t * cache_ptr,
-                         int num_candidates,
-                         haddr_t * candidates_list_ptr,
-                         int mpi_rank,
-                         int mpi_size)
+H5C_apply_candidate_list(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, H5C_t *cache_ptr,
+                         int num_candidates, haddr_t *candidates_list_ptr, int mpi_rank, int mpi_size)
 {
-    hbool_t             first_flush = FALSE;
-    int                 i;
-    int            m;
-    int            n;
-    int            first_entry_to_flush;
-    int            last_entry_to_flush;
-    int            entries_to_clear = 0;
-    int            entries_to_flush = 0;
-    int            entries_cleared = 0;
-    int            entries_flushed = 0;
-    int            entries_examined = 0;
-    int            initial_list_len;
-    int               * candidate_assignment_table = NULL;
-    haddr_t        addr;
-    H5C_cache_entry_t *    clear_ptr = NULL;
-    H5C_cache_entry_t *    entry_ptr = NULL;
-    H5C_cache_entry_t *    flush_ptr = NULL;
+    hbool_t            first_flush = FALSE;
+    int                i;
+    int                m;
+    int                n;
+    int                first_entry_to_flush;
+    int                last_entry_to_flush;
+    int                entries_to_clear = 0;
+    int                entries_to_flush = 0;
+    int                entries_cleared  = 0;
+    int                entries_flushed  = 0;
+    int                entries_examined = 0;
+    int                initial_list_len;
+    int *              candidate_assignment_table = NULL;
+    haddr_t            addr;
+    H5C_cache_entry_t *clear_ptr = NULL;
+    H5C_cache_entry_t *entry_ptr = NULL;
+    H5C_cache_entry_t *flush_ptr = NULL;
 #if H5C_DO_SANITY_CHECKS
-    haddr_t        last_addr;
+    haddr_t last_addr;
 #endif /* H5C_DO_SANITY_CHECKS */
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    char        tbl_buf[1024];
-#endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    char tbl_buf[1024];
+#endif                          /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( num_candidates > 0 );
-    HDassert( num_candidates <= cache_ptr->slist_len );
-    HDassert( candidates_list_ptr != NULL );
-    HDassert( 0 <= mpi_rank );
-    HDassert( mpi_rank < mpi_size );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+    HDassert(num_candidates > 0);
+    HDassert(num_candidates <= cache_ptr->slist_len);
+    HDassert(candidates_list_ptr != NULL);
+    HDassert(0 <= mpi_rank);
+    HDassert(mpi_rank < mpi_size);
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    HDfprintf(stdout, "%s:%d: setting up candidate assignment table.\n",
-              FUNC, mpi_rank);
-    for ( i = 0; i < 1024; i++ ) tbl_buf[i] = '\0';
+    HDfprintf(stdout, "%s:%d: setting up candidate assignment table.\n", FUNC, mpi_rank);
+    for (i = 0; i < 1024; i++)
+        tbl_buf[i] = '\0';
     sprintf(&(tbl_buf[0]), "candidate list = ");
-    for ( i = 0; i < num_candidates; i++ )
-    {
-        sprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " 0x%llx",
-                (long long)(*(candidates_list_ptr + i)));
+    for (i = 0; i < num_candidates; i++) {
+        sprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " 0x%llx", (long long)(*(candidates_list_ptr + i)));
     }
     sprintf(&(tbl_buf[HDstrlen(tbl_buf)]), "\n");
     HDfprintf(stdout, "%s", tbl_buf);
@@ -464,74 +411,75 @@ H5C_apply_candidate_list(H5F_t * f,
     m = num_candidates % mpi_size;
     HDassert(n >= 0);
 
-    if(NULL == (candidate_assignment_table = (int *)H5MM_malloc(sizeof(int) * (size_t)(mpi_size + 1))))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for candidate assignment table")
+    if (NULL == (candidate_assignment_table = (int *)H5MM_malloc(sizeof(int) * (size_t)(mpi_size + 1))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "memory allocation failed for candidate assignment table")
 
-    candidate_assignment_table[0] = 0;
+    candidate_assignment_table[0]        = 0;
     candidate_assignment_table[mpi_size] = num_candidates;
 
-    if(m == 0) { /* mpi_size is an even divisor of num_candidates */
+    if (m == 0) { /* mpi_size is an even divisor of num_candidates */
         HDassert(n > 0);
-        for(i = 1; i < mpi_size; i++)
+        for (i = 1; i < mpi_size; i++)
             candidate_assignment_table[i] = candidate_assignment_table[i - 1] + n;
     } /* end if */
     else {
-        for(i = 1; i <= m; i++)
+        for (i = 1; i <= m; i++)
             candidate_assignment_table[i] = candidate_assignment_table[i - 1] + n + 1;
 
-        if(num_candidates < mpi_size) {
-            for(i = m + 1; i < mpi_size; i++)
+        if (num_candidates < mpi_size) {
+            for (i = m + 1; i < mpi_size; i++)
                 candidate_assignment_table[i] = num_candidates;
         } /* end if */
         else {
-            for(i = m + 1; i < mpi_size; i++)
+            for (i = m + 1; i < mpi_size; i++)
                 candidate_assignment_table[i] = candidate_assignment_table[i - 1] + n;
         } /* end else */
-    } /* end else */
+    }     /* end else */
     HDassert((candidate_assignment_table[mpi_size - 1] + n) == num_candidates);
 
 #if H5C_DO_SANITY_CHECKS
     /* verify that the candidate assignment table has the expected form */
-    for ( i = 1; i < mpi_size - 1; i++ )
-    {
+    for (i = 1; i < mpi_size - 1; i++) {
         int a, b;
 
         a = candidate_assignment_table[i] - candidate_assignment_table[i - 1];
         b = candidate_assignment_table[i + 1] - candidate_assignment_table[i];
 
-        HDassert( n + 1 >= a );
-        HDassert( a >= b );
-        HDassert( b >= n );
+        HDassert(n + 1 >= a);
+        HDassert(a >= b);
+        HDassert(b >= n);
     }
 #endif /* H5C_DO_SANITY_CHECKS */
 
     first_entry_to_flush = candidate_assignment_table[mpi_rank];
-    last_entry_to_flush = candidate_assignment_table[mpi_rank + 1] - 1;
+    last_entry_to_flush  = candidate_assignment_table[mpi_rank + 1] - 1;
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    for ( i = 0; i < 1024; i++ )
+    for (i = 0; i < 1024; i++)
         tbl_buf[i] = '\0';
     sprintf(&(tbl_buf[0]), "candidate assignment table = ");
-    for(i = 0; i <= mpi_size; i++)
+    for (i = 0; i <= mpi_size; i++)
         sprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " %d", candidate_assignment_table[i]);
     sprintf(&(tbl_buf[HDstrlen(tbl_buf)]), "\n");
     HDfprintf(stdout, "%s", tbl_buf);
 
-    HDfprintf(stdout, "%s:%d: flush entries [%d, %d].\n",
-              FUNC, mpi_rank, first_entry_to_flush, last_entry_to_flush);
+    HDfprintf(stdout, "%s:%d: flush entries [%d, %d].\n", FUNC, mpi_rank, first_entry_to_flush,
+              last_entry_to_flush);
 
     HDfprintf(stdout, "%s:%d: marking entries.\n", FUNC, mpi_rank);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
-    for(i = 0; i < num_candidates; i++) {
+    for (i = 0; i < num_candidates; i++) {
         addr = candidates_list_ptr[i];
-        HDassert( H5F_addr_defined(addr) );
+        HDassert(H5F_addr_defined(addr));
 
 #if H5C_DO_SANITY_CHECKS
-        if ( i > 0 ) {
-            if ( last_addr == addr ) {
+        if (i > 0) {
+            if (last_addr == addr) {
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Duplicate entry in cleaned list.\n")
-            } else if ( last_addr > addr ) {
+            }
+            else if (last_addr > addr) {
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "candidate list not sorted.\n")
             }
         }
@@ -540,23 +488,26 @@ H5C_apply_candidate_list(H5F_t * f,
 #endif /* H5C_DO_SANITY_CHECKS */
 
         H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
-        if(entry_ptr == NULL) {
+        if (entry_ptr == NULL) {
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed candidate entry not in cache?!?!?.")
-        } else if(!entry_ptr->is_dirty) {
+        }
+        else if (!entry_ptr->is_dirty) {
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed entry not dirty?!?!?.")
-        } else if ( entry_ptr->is_protected ) {
+        }
+        else if (entry_ptr->is_protected) {
             /* For now at least, we can't deal with protected entries.
              * If we encounter one, scream and die.  If it becomes an
              * issue, we should be able to work around this.
              */
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed entry is protected?!?!?.")
-        } else {
+        }
+        else {
             /* determine whether the entry is to be cleared or flushed,
              * and mark it accordingly.  We will scan the protected and
              * pinned list shortly, and clear or flush according to these
              * markings.
              */
-            if((i >= first_entry_to_flush) && (i <= last_entry_to_flush)) {
+            if ((i >= first_entry_to_flush) && (i <= last_entry_to_flush)) {
                 entries_to_flush++;
                 entry_ptr->flush_immediately = TRUE;
             } /* end if */
@@ -564,16 +515,14 @@ H5C_apply_candidate_list(H5F_t * f,
                 entries_to_clear++;
                 entry_ptr->clear_on_unprotect = TRUE;
             } /* end else */
-        } /* end else */
-    } /* end for */
+        }     /* end else */
+    }         /* end for */
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    HDfprintf(stdout, "%s:%d: num candidates/to clear/to flush = %d/%d/%d.\n",
-              FUNC, mpi_rank, (int)num_candidates, (int)entries_to_clear,
-              (int)entries_to_flush);
+    HDfprintf(stdout, "%s:%d: num candidates/to clear/to flush = %d/%d/%d.\n", FUNC, mpi_rank,
+              (int)num_candidates, (int)entries_to_clear, (int)entries_to_flush);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
-
     /* We have now marked all the entries on the candidate list for
      * either flush or clear -- now scan the LRU and the pinned list
      * for these entries and do the deed.
@@ -591,51 +540,39 @@ H5C_apply_candidate_list(H5F_t * f,
 
     entries_examined = 0;
     initial_list_len = cache_ptr->LRU_list_len;
-    entry_ptr = cache_ptr->LRU_tail_ptr;
+    entry_ptr        = cache_ptr->LRU_tail_ptr;
 
-    while((entry_ptr != NULL) && (entries_examined <= initial_list_len) &&
-            ((entries_cleared + entries_flushed) < num_candidates)) {
-        if(entry_ptr->clear_on_unprotect) {
+    while ((entry_ptr != NULL) && (entries_examined <= initial_list_len) &&
+           ((entries_cleared + entries_flushed) < num_candidates)) {
+        if (entry_ptr->clear_on_unprotect) {
             entry_ptr->clear_on_unprotect = FALSE;
-            clear_ptr = entry_ptr;
-            entry_ptr = entry_ptr->prev;
+            clear_ptr                     = entry_ptr;
+            entry_ptr                     = entry_ptr->prev;
             entries_cleared++;
 
-#if ( H5C_APPLY_CANDIDATE_LIST__DEBUG > 1 )
-    HDfprintf(stdout, "%s:%d: clearing 0x%llx.\n", FUNC, mpi_rank,
-              (long long)clear_ptr->addr);
+#if (H5C_APPLY_CANDIDATE_LIST__DEBUG > 1)
+            HDfprintf(stdout, "%s:%d: clearing 0x%llx.\n", FUNC, mpi_rank, (long long)clear_ptr->addr);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
-            if(H5C_flush_single_entry(f,
-                                      primary_dxpl_id,
-                                      secondary_dxpl_id,
-                                      clear_ptr->type,
-                                      clear_ptr->addr,
-                                      H5C__FLUSH_CLEAR_ONLY_FLAG,
-                                      &first_flush,
-                                      TRUE) < 0)
+            if (H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, clear_ptr->type,
+                                       clear_ptr->addr, H5C__FLUSH_CLEAR_ONLY_FLAG, &first_flush, TRUE) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
-        } else if(entry_ptr->flush_immediately) {
+        }
+        else if (entry_ptr->flush_immediately) {
             entry_ptr->flush_immediately = FALSE;
-            flush_ptr = entry_ptr;
-            entry_ptr = entry_ptr->prev;
+            flush_ptr                    = entry_ptr;
+            entry_ptr                    = entry_ptr->prev;
             entries_flushed++;
 
-#if ( H5C_APPLY_CANDIDATE_LIST__DEBUG > 1 )
-    HDfprintf(stdout, "%s:%d: flushing 0x%llx.\n", FUNC, mpi_rank,
-              (long long)flush_ptr->addr);
+#if (H5C_APPLY_CANDIDATE_LIST__DEBUG > 1)
+            HDfprintf(stdout, "%s:%d: flushing 0x%llx.\n", FUNC, mpi_rank, (long long)flush_ptr->addr);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
-            if(H5C_flush_single_entry(f,
-                                      primary_dxpl_id,
-                                      secondary_dxpl_id,
-                                      flush_ptr->type,
-                                      flush_ptr->addr,
-                                      H5C__NO_FLAGS_SET,
-                                      &first_flush,
-                                      TRUE) < 0)
+            if (H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, flush_ptr->type,
+                                       flush_ptr->addr, H5C__NO_FLAGS_SET, &first_flush, TRUE) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
-        } else {
+        }
+        else {
             entry_ptr = entry_ptr->prev;
         }
 
@@ -643,9 +580,8 @@ H5C_apply_candidate_list(H5F_t * f,
     } /* end while */
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    HDfprintf(stdout, "%s:%d: entries examined/cleared/flushed = %d/%d/%d.\n",
-              FUNC, mpi_rank, entries_examined,
-              entries_cleared, entries_flushed);
+    HDfprintf(stdout, "%s:%d: entries examined/cleared/flushed = %d/%d/%d.\n", FUNC, mpi_rank,
+              entries_examined, entries_cleared, entries_flushed);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
     /* It is also possible that some of the cleared entries are on the
@@ -653,80 +589,64 @@ H5C_apply_candidate_list(H5F_t * f,
      */
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    HDfprintf(stdout, "%s:%d: scanning pinned entry list. len = %d\n",
-             FUNC, mpi_rank, (int)(cache_ptr->pel_len));
+    HDfprintf(stdout, "%s:%d: scanning pinned entry list. len = %d\n", FUNC, mpi_rank,
+              (int)(cache_ptr->pel_len));
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
     entry_ptr = cache_ptr->pel_head_ptr;
-    while((entry_ptr != NULL) &&
-            ((entries_cleared + entries_flushed) < num_candidates)) {
-        if(entry_ptr->clear_on_unprotect) {
+    while ((entry_ptr != NULL) && ((entries_cleared + entries_flushed) < num_candidates)) {
+        if (entry_ptr->clear_on_unprotect) {
             entry_ptr->clear_on_unprotect = FALSE;
-            clear_ptr = entry_ptr;
-            entry_ptr = entry_ptr->next;
+            clear_ptr                     = entry_ptr;
+            entry_ptr                     = entry_ptr->next;
             entries_cleared++;
 
-#if ( H5C_APPLY_CANDIDATE_LIST__DEBUG > 1 )
-            HDfprintf(stdout, "%s:%d: clearing 0x%llx.\n", FUNC, mpi_rank,
-                      (long long)clear_ptr->addr);
+#if (H5C_APPLY_CANDIDATE_LIST__DEBUG > 1)
+            HDfprintf(stdout, "%s:%d: clearing 0x%llx.\n", FUNC, mpi_rank, (long long)clear_ptr->addr);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
-            if(H5C_flush_single_entry(f,
-                                      primary_dxpl_id,
-                                      secondary_dxpl_id,
-                                      clear_ptr->type,
-                                      clear_ptr->addr,
-                                      H5C__FLUSH_CLEAR_ONLY_FLAG,
-                                      &first_flush,
-                                      TRUE) < 0)
+            if (H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, clear_ptr->type,
+                                       clear_ptr->addr, H5C__FLUSH_CLEAR_ONLY_FLAG, &first_flush, TRUE) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
-        } else if(entry_ptr->flush_immediately) {
+        }
+        else if (entry_ptr->flush_immediately) {
             entry_ptr->flush_immediately = FALSE;
-            flush_ptr = entry_ptr;
-            entry_ptr = entry_ptr->next;
+            flush_ptr                    = entry_ptr;
+            entry_ptr                    = entry_ptr->next;
             entries_flushed++;
 
-#if ( H5C_APPLY_CANDIDATE_LIST__DEBUG > 1 )
-            HDfprintf(stdout, "%s:%d: flushing 0x%llx.\n", FUNC, mpi_rank,
-                      (long long)flush_ptr->addr);
+#if (H5C_APPLY_CANDIDATE_LIST__DEBUG > 1)
+            HDfprintf(stdout, "%s:%d: flushing 0x%llx.\n", FUNC, mpi_rank, (long long)flush_ptr->addr);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
-            if(H5C_flush_single_entry(f,
-                                      primary_dxpl_id,
-                                      secondary_dxpl_id,
-                                      flush_ptr->type,
-                                      flush_ptr->addr,
-                                      H5C__NO_FLAGS_SET,
-                                      &first_flush,
-                                      TRUE) < 0)
+            if (H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, flush_ptr->type,
+                                       flush_ptr->addr, H5C__NO_FLAGS_SET, &first_flush, TRUE) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
-        } else {
+        }
+        else {
             entry_ptr = entry_ptr->next;
         }
     } /* end while */
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    HDfprintf(stdout,
-              "%s:%d: pel entries examined/cleared/flushed = %d/%d/%d.\n",
-              FUNC, mpi_rank, entries_examined,
-              entries_cleared, entries_flushed);
+    HDfprintf(stdout, "%s:%d: pel entries examined/cleared/flushed = %d/%d/%d.\n", FUNC, mpi_rank,
+              entries_examined, entries_cleared, entries_flushed);
     HDfprintf(stdout, "%s:%d: done.\n", FUNC, mpi_rank);
 
     HDfsync(stdout);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
-    if((entries_flushed != entries_to_flush) || (entries_cleared != entries_to_clear))
+    if ((entries_flushed != entries_to_flush) || (entries_cleared != entries_to_clear))
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "entry count mismatch.")
 
 done:
-    if(candidate_assignment_table != NULL)
+    if (candidate_assignment_table != NULL)
         candidate_assignment_table = (int *)H5MM_xfree((void *)candidate_assignment_table);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_apply_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_construct_candidate_list__clean_cache
  *
@@ -747,15 +667,15 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr)
+H5C_construct_candidate_list__clean_cache(H5C_t *cache_ptr)
 {
-    size_t              space_needed;
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    size_t space_needed;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     /* As a sanity check, set space needed to the size of the skip list.
      * This should be the sum total of the sizes of all the dirty entries
@@ -767,58 +687,54 @@ H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr)
      * point, it is possible that some dirty entries may reside on the
      * pinned list at this point.
      */
-    HDassert( cache_ptr->slist_size <=
-              (cache_ptr->dLRU_list_size + cache_ptr->pel_size) );
-    HDassert( cache_ptr->slist_len  <=
-              (cache_ptr->dLRU_list_len + cache_ptr->pel_len) );
+    HDassert(cache_ptr->slist_size <= (cache_ptr->dLRU_list_size + cache_ptr->pel_size));
+    HDassert(cache_ptr->slist_len <= (cache_ptr->dLRU_list_len + cache_ptr->pel_len));
 
-    if(space_needed > 0) { /* we have work to do */
+    if (space_needed > 0) { /* we have work to do */
         H5C_cache_entry_t *entry_ptr;
-        int     nominated_entries_count = 0;
-        size_t  nominated_entries_size = 0;
-        haddr_t    nominated_addr;
+        int                nominated_entries_count = 0;
+        size_t             nominated_entries_size  = 0;
+        haddr_t            nominated_addr;
 
-        HDassert( cache_ptr->slist_len > 0 );
+        HDassert(cache_ptr->slist_len > 0);
 
         /* Scan the dirty LRU list from tail forward and nominate sufficient
          * entries to free up the necessary space.
          */
         entry_ptr = cache_ptr->dLRU_tail_ptr;
-        while((nominated_entries_size < space_needed) &&
-                (nominated_entries_count < cache_ptr->slist_len) &&
-                (entry_ptr != NULL)) {
-            HDassert( ! (entry_ptr->is_protected) );
-            HDassert( ! (entry_ptr->is_read_only) );
-            HDassert( entry_ptr->ro_ref_count == 0 );
-            HDassert( entry_ptr->is_dirty );
-            HDassert( entry_ptr->in_slist );
+        while ((nominated_entries_size < space_needed) && (nominated_entries_count < cache_ptr->slist_len) &&
+               (entry_ptr != NULL)) {
+            HDassert(!(entry_ptr->is_protected));
+            HDassert(!(entry_ptr->is_read_only));
+            HDassert(entry_ptr->ro_ref_count == 0);
+            HDassert(entry_ptr->is_dirty);
+            HDassert(entry_ptr->in_slist);
 
             nominated_addr = entry_ptr->addr;
-            if(H5AC_add_candidate((H5AC_t *)cache_ptr, nominated_addr) < 0)
+            if (H5AC_add_candidate((H5AC_t *)cache_ptr, nominated_addr) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_add_candidate() failed(1).")
 
             nominated_entries_size += entry_ptr->size;
             nominated_entries_count++;
             entry_ptr = entry_ptr->aux_prev;
         } /* end while */
-        HDassert( entry_ptr == NULL );
+        HDassert(entry_ptr == NULL);
 
         /* it is possible that there are some dirty entries on the
          * protected entry list as well -- scan it too if necessary
          */
         entry_ptr = cache_ptr->pel_head_ptr;
-        while((nominated_entries_size < space_needed) &&
-                (nominated_entries_count < cache_ptr->slist_len) &&
-                (entry_ptr != NULL)) {
-            if(entry_ptr->is_dirty) {
-                HDassert( ! (entry_ptr->is_protected) );
-                HDassert( ! (entry_ptr->is_read_only) );
-                HDassert( entry_ptr->ro_ref_count == 0 );
-                HDassert( entry_ptr->is_dirty );
-                HDassert( entry_ptr->in_slist );
+        while ((nominated_entries_size < space_needed) && (nominated_entries_count < cache_ptr->slist_len) &&
+               (entry_ptr != NULL)) {
+            if (entry_ptr->is_dirty) {
+                HDassert(!(entry_ptr->is_protected));
+                HDassert(!(entry_ptr->is_read_only));
+                HDassert(entry_ptr->ro_ref_count == 0);
+                HDassert(entry_ptr->is_dirty);
+                HDassert(entry_ptr->in_slist);
 
                 nominated_addr = entry_ptr->addr;
-                if(H5AC_add_candidate((H5AC_t *)cache_ptr, nominated_addr) < 0)
+                if (H5AC_add_candidate((H5AC_t *)cache_ptr, nominated_addr) < 0)
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_add_candidate() failed(2).")
 
                 nominated_entries_size += entry_ptr->size;
@@ -828,8 +744,8 @@ H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr)
             entry_ptr = entry_ptr->next;
         } /* end while */
 
-        HDassert( nominated_entries_count == cache_ptr->slist_len );
-        HDassert( nominated_entries_size == space_needed );
+        HDassert(nominated_entries_count == cache_ptr->slist_len);
+        HDassert(nominated_entries_size == space_needed);
     } /* end if */
 
 done:
@@ -837,7 +753,6 @@ done:
 } /* H5C_construct_candidate_list__clean_cache() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_construct_candidate_list__min_clean
  *
@@ -858,68 +773,65 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5C_construct_candidate_list__min_clean(H5C_t * cache_ptr)
+H5C_construct_candidate_list__min_clean(H5C_t *cache_ptr)
 {
-    size_t              space_needed = 0;
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    size_t space_needed = 0;
+    herr_t ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     /* compute the number of bytes (if any) that must be flushed to get the
      * cache back within its min clean constraints.
      */
-    if(cache_ptr->max_cache_size > cache_ptr->index_size) {
-        if(((cache_ptr->max_cache_size - cache_ptr->index_size) +
-               cache_ptr->cLRU_list_size) >= cache_ptr->min_clean_size)
+    if (cache_ptr->max_cache_size > cache_ptr->index_size) {
+        if (((cache_ptr->max_cache_size - cache_ptr->index_size) + cache_ptr->cLRU_list_size) >=
+            cache_ptr->min_clean_size)
             space_needed = 0;
         else
             space_needed = cache_ptr->min_clean_size -
-                ((cache_ptr->max_cache_size - cache_ptr->index_size) +
-                 cache_ptr->cLRU_list_size);
+                           ((cache_ptr->max_cache_size - cache_ptr->index_size) + cache_ptr->cLRU_list_size);
     } /* end if */
     else {
-        if(cache_ptr->min_clean_size <= cache_ptr->cLRU_list_size)
-           space_needed = 0;
+        if (cache_ptr->min_clean_size <= cache_ptr->cLRU_list_size)
+            space_needed = 0;
         else
-            space_needed = cache_ptr->min_clean_size -
-                           cache_ptr->cLRU_list_size;
+            space_needed = cache_ptr->min_clean_size - cache_ptr->cLRU_list_size;
     } /* end else */
 
-    if(space_needed > 0) { /* we have work to do */
+    if (space_needed > 0) { /* we have work to do */
         H5C_cache_entry_t *entry_ptr;
-        int    nominated_entries_count = 0;
-        size_t nominated_entries_size = 0;
+        int                nominated_entries_count = 0;
+        size_t             nominated_entries_size  = 0;
 
-        HDassert( cache_ptr->slist_len > 0 );
+        HDassert(cache_ptr->slist_len > 0);
 
         /* Scan the dirty LRU list from tail forward and nominate sufficient
          * entries to free up the necessary space.
          */
         entry_ptr = cache_ptr->dLRU_tail_ptr;
-        while((nominated_entries_size < space_needed) &&
-                (nominated_entries_count < cache_ptr->slist_len) &&
-                (entry_ptr != NULL)) {
-            haddr_t        nominated_addr;
+        while ((nominated_entries_size < space_needed) && (nominated_entries_count < cache_ptr->slist_len) &&
+               (entry_ptr != NULL)) {
+            haddr_t nominated_addr;
 
-            HDassert( ! (entry_ptr->is_protected) );
-            HDassert( ! (entry_ptr->is_read_only) );
-            HDassert( entry_ptr->ro_ref_count == 0 );
-            HDassert( entry_ptr->is_dirty );
-            HDassert( entry_ptr->in_slist );
+            HDassert(!(entry_ptr->is_protected));
+            HDassert(!(entry_ptr->is_read_only));
+            HDassert(entry_ptr->ro_ref_count == 0);
+            HDassert(entry_ptr->is_dirty);
+            HDassert(entry_ptr->in_slist);
 
             nominated_addr = entry_ptr->addr;
-            if(H5AC_add_candidate((H5AC_t *)cache_ptr, nominated_addr) < 0)
+            if (H5AC_add_candidate((H5AC_t *)cache_ptr, nominated_addr) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_add_candidate() failed.")
 
             nominated_entries_size += entry_ptr->size;
             nominated_entries_count++;
             entry_ptr = entry_ptr->aux_prev;
         } /* end while */
-        HDassert( nominated_entries_count <= cache_ptr->slist_len );
-        HDassert( nominated_entries_size >= space_needed );
+        HDassert(nominated_entries_count <= cache_ptr->slist_len);
+        HDassert(nominated_entries_size >= space_needed);
     } /* end if */
 
 done:
@@ -927,7 +839,6 @@ done:
 } /* H5C_construct_candidate_list__min_clean() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_create
  *
@@ -953,44 +864,38 @@ done:
  *-------------------------------------------------------------------------
  */
 H5C_t *
-H5C_create(size_t              max_cache_size,
-           size_t              min_clean_size,
-           int                  max_type_id,
-           const char *              (* type_name_table_ptr),
-           H5C_write_permitted_func_t check_write_permitted,
-           hbool_t              write_permitted,
-           H5C_log_flush_func_t       log_flush,
-           void *                     aux_ptr)
+H5C_create(size_t max_cache_size, size_t min_clean_size, int max_type_id, const char *(*type_name_table_ptr),
+           H5C_write_permitted_func_t check_write_permitted, hbool_t write_permitted,
+           H5C_log_flush_func_t log_flush, void *aux_ptr)
 {
-    int i;
-    H5C_t * cache_ptr = NULL;
-    H5C_t * ret_value = NULL;      /* Return value */
+    int    i;
+    H5C_t *cache_ptr = NULL;
+    H5C_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
-    HDassert( max_cache_size >= H5C__MIN_MAX_CACHE_SIZE );
-    HDassert( max_cache_size <= H5C__MAX_MAX_CACHE_SIZE );
-    HDassert( min_clean_size <= max_cache_size );
+    HDassert(max_cache_size >= H5C__MIN_MAX_CACHE_SIZE);
+    HDassert(max_cache_size <= H5C__MAX_MAX_CACHE_SIZE);
+    HDassert(min_clean_size <= max_cache_size);
 
-    HDassert( max_type_id >= 0 );
-    HDassert( max_type_id < H5C__MAX_NUM_TYPE_IDS );
-    HDassert( type_name_table_ptr );
+    HDassert(max_type_id >= 0);
+    HDassert(max_type_id < H5C__MAX_NUM_TYPE_IDS);
+    HDassert(type_name_table_ptr);
 
-    HDassert( ( write_permitted == TRUE ) || ( write_permitted == FALSE ) );
+    HDassert((write_permitted == TRUE) || (write_permitted == FALSE));
 
-    for ( i = 0; i <= max_type_id; i++ ) {
+    for (i = 0; i <= max_type_id; i++) {
 
-        HDassert( (type_name_table_ptr)[i] );
-        HDassert( HDstrlen(( type_name_table_ptr)[i]) > 0 );
+        HDassert((type_name_table_ptr)[i]);
+        HDassert(HDstrlen((type_name_table_ptr)[i]) > 0);
     }
 
-    if ( NULL == (cache_ptr = H5FL_CALLOC(H5C_t)) ) {
+    if (NULL == (cache_ptr = H5FL_CALLOC(H5C_t))) {
 
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, \
-                    "memory allocation failed")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     }
 
-    if ( (cache_ptr->slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)) == NULL ) {
+    if ((cache_ptr->slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)) == NULL) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, NULL, "can't create skip list.")
     }
@@ -999,170 +904,166 @@ H5C_create(size_t              max_cache_size,
      * the fields.
      */
 
-    cache_ptr->magic                 = H5C__H5C_T_MAGIC;
+    cache_ptr->magic = H5C__H5C_T_MAGIC;
 
-    cache_ptr->flush_in_progress        = FALSE;
+    cache_ptr->flush_in_progress = FALSE;
 
-    cache_ptr->trace_file_ptr            = NULL;
+    cache_ptr->trace_file_ptr = NULL;
 
-    cache_ptr->aux_ptr                = aux_ptr;
+    cache_ptr->aux_ptr = aux_ptr;
 
-    cache_ptr->max_type_id            = max_type_id;
+    cache_ptr->max_type_id = max_type_id;
 
-    cache_ptr->type_name_table_ptr        = type_name_table_ptr;
+    cache_ptr->type_name_table_ptr = type_name_table_ptr;
 
-    cache_ptr->max_cache_size            = max_cache_size;
-    cache_ptr->min_clean_size            = min_clean_size;
+    cache_ptr->max_cache_size = max_cache_size;
+    cache_ptr->min_clean_size = min_clean_size;
 
-    cache_ptr->check_write_permitted        = check_write_permitted;
-    cache_ptr->write_permitted            = write_permitted;
+    cache_ptr->check_write_permitted = check_write_permitted;
+    cache_ptr->write_permitted       = write_permitted;
 
-    cache_ptr->log_flush            = log_flush;
+    cache_ptr->log_flush = log_flush;
 
-    cache_ptr->evictions_enabled        = TRUE;
+    cache_ptr->evictions_enabled = TRUE;
 
-    cache_ptr->index_len            = 0;
-    cache_ptr->index_size            = (size_t)0;
-    cache_ptr->clean_index_size            = (size_t)0;
-    cache_ptr->dirty_index_size            = (size_t)0;
+    cache_ptr->index_len        = 0;
+    cache_ptr->index_size       = (size_t)0;
+    cache_ptr->clean_index_size = (size_t)0;
+    cache_ptr->dirty_index_size = (size_t)0;
 
-    cache_ptr->slist_len            = 0;
-    cache_ptr->slist_size            = (size_t)0;
+    cache_ptr->slist_len  = 0;
+    cache_ptr->slist_size = (size_t)0;
 
 #if H5C_DO_SANITY_CHECKS
-    cache_ptr->slist_len_increase        = 0;
-    cache_ptr->slist_size_increase        = 0;
+    cache_ptr->slist_len_increase  = 0;
+    cache_ptr->slist_size_increase = 0;
 #endif /* H5C_DO_SANITY_CHECKS */
 
-    for ( i = 0; i < H5C__HASH_TABLE_LEN; i++ )
-    {
+    for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
         (cache_ptr->index)[i] = NULL;
     }
 
-    cache_ptr->pl_len                = 0;
-    cache_ptr->pl_size                = (size_t)0;
-    cache_ptr->pl_head_ptr            = NULL;
-    cache_ptr->pl_tail_ptr            = NULL;
+    cache_ptr->pl_len      = 0;
+    cache_ptr->pl_size     = (size_t)0;
+    cache_ptr->pl_head_ptr = NULL;
+    cache_ptr->pl_tail_ptr = NULL;
 
-    cache_ptr->pel_len                = 0;
-    cache_ptr->pel_size                = (size_t)0;
-    cache_ptr->pel_head_ptr            = NULL;
-    cache_ptr->pel_tail_ptr            = NULL;
+    cache_ptr->pel_len      = 0;
+    cache_ptr->pel_size     = (size_t)0;
+    cache_ptr->pel_head_ptr = NULL;
+    cache_ptr->pel_tail_ptr = NULL;
 
-    cache_ptr->LRU_list_len            = 0;
-    cache_ptr->LRU_list_size            = (size_t)0;
-    cache_ptr->LRU_head_ptr            = NULL;
-    cache_ptr->LRU_tail_ptr            = NULL;
+    cache_ptr->LRU_list_len  = 0;
+    cache_ptr->LRU_list_size = (size_t)0;
+    cache_ptr->LRU_head_ptr  = NULL;
+    cache_ptr->LRU_tail_ptr  = NULL;
 
-    cache_ptr->cLRU_list_len            = 0;
-    cache_ptr->cLRU_list_size            = (size_t)0;
-    cache_ptr->cLRU_head_ptr            = NULL;
-    cache_ptr->cLRU_tail_ptr            = NULL;
+    cache_ptr->cLRU_list_len  = 0;
+    cache_ptr->cLRU_list_size = (size_t)0;
+    cache_ptr->cLRU_head_ptr  = NULL;
+    cache_ptr->cLRU_tail_ptr  = NULL;
 
-    cache_ptr->dLRU_list_len            = 0;
-    cache_ptr->dLRU_list_size            = (size_t)0;
-    cache_ptr->dLRU_head_ptr            = NULL;
-    cache_ptr->dLRU_tail_ptr            = NULL;
+    cache_ptr->dLRU_list_len  = 0;
+    cache_ptr->dLRU_list_size = (size_t)0;
+    cache_ptr->dLRU_head_ptr  = NULL;
+    cache_ptr->dLRU_tail_ptr  = NULL;
 
     cache_ptr->size_increase_possible        = FALSE;
-    cache_ptr->flash_size_increase_possible     = FALSE;
-    cache_ptr->flash_size_increase_threshold    = 0;
+    cache_ptr->flash_size_increase_possible  = FALSE;
+    cache_ptr->flash_size_increase_threshold = 0;
     cache_ptr->size_decrease_possible        = FALSE;
-    cache_ptr->resize_enabled            = FALSE;
-    cache_ptr->cache_full            = FALSE;
-    cache_ptr->size_decreased            = FALSE;
-
-    (cache_ptr->resize_ctl).version        = H5C__CURR_AUTO_SIZE_CTL_VER;
-    (cache_ptr->resize_ctl).rpt_fcn        = NULL;
-    (cache_ptr->resize_ctl).set_initial_size    = FALSE;
-    (cache_ptr->resize_ctl).initial_size    = H5C__DEF_AR_INIT_SIZE;
-    (cache_ptr->resize_ctl).min_clean_fraction    = H5C__DEF_AR_MIN_CLEAN_FRAC;
-    (cache_ptr->resize_ctl).max_size        = H5C__DEF_AR_MAX_SIZE;
-    (cache_ptr->resize_ctl).min_size        = H5C__DEF_AR_MIN_SIZE;
-    (cache_ptr->resize_ctl).epoch_length    = H5C__DEF_AR_EPOCH_LENGTH;
-
-    (cache_ptr->resize_ctl).incr_mode        = H5C_incr__off;
-    (cache_ptr->resize_ctl).lower_hr_threshold    = H5C__DEF_AR_LOWER_THRESHHOLD;
-    (cache_ptr->resize_ctl).increment            = H5C__DEF_AR_INCREMENT;
-    (cache_ptr->resize_ctl).apply_max_increment    = TRUE;
-    (cache_ptr->resize_ctl).max_increment    = H5C__DEF_AR_MAX_INCREMENT;
-
-    (cache_ptr->resize_ctl).flash_incr_mode     = H5C_flash_incr__off;
-    (cache_ptr->resize_ctl).flash_multiple      = 1.0f;
-    (cache_ptr->resize_ctl).flash_threshold     = 0.25f;
-
-    (cache_ptr->resize_ctl).decr_mode        = H5C_decr__off;
-    (cache_ptr->resize_ctl).upper_hr_threshold    = H5C__DEF_AR_UPPER_THRESHHOLD;
-    (cache_ptr->resize_ctl).decrement            = H5C__DEF_AR_DECREMENT;
+    cache_ptr->resize_enabled                = FALSE;
+    cache_ptr->cache_full                    = FALSE;
+    cache_ptr->size_decreased                = FALSE;
+
+    (cache_ptr->resize_ctl).version            = H5C__CURR_AUTO_SIZE_CTL_VER;
+    (cache_ptr->resize_ctl).rpt_fcn            = NULL;
+    (cache_ptr->resize_ctl).set_initial_size   = FALSE;
+    (cache_ptr->resize_ctl).initial_size       = H5C__DEF_AR_INIT_SIZE;
+    (cache_ptr->resize_ctl).min_clean_fraction = H5C__DEF_AR_MIN_CLEAN_FRAC;
+    (cache_ptr->resize_ctl).max_size           = H5C__DEF_AR_MAX_SIZE;
+    (cache_ptr->resize_ctl).min_size           = H5C__DEF_AR_MIN_SIZE;
+    (cache_ptr->resize_ctl).epoch_length       = H5C__DEF_AR_EPOCH_LENGTH;
+
+    (cache_ptr->resize_ctl).incr_mode           = H5C_incr__off;
+    (cache_ptr->resize_ctl).lower_hr_threshold  = H5C__DEF_AR_LOWER_THRESHHOLD;
+    (cache_ptr->resize_ctl).increment           = H5C__DEF_AR_INCREMENT;
+    (cache_ptr->resize_ctl).apply_max_increment = TRUE;
+    (cache_ptr->resize_ctl).max_increment       = H5C__DEF_AR_MAX_INCREMENT;
+
+    (cache_ptr->resize_ctl).flash_incr_mode = H5C_flash_incr__off;
+    (cache_ptr->resize_ctl).flash_multiple  = 1.0f;
+    (cache_ptr->resize_ctl).flash_threshold = 0.25f;
+
+    (cache_ptr->resize_ctl).decr_mode              = H5C_decr__off;
+    (cache_ptr->resize_ctl).upper_hr_threshold     = H5C__DEF_AR_UPPER_THRESHHOLD;
+    (cache_ptr->resize_ctl).decrement              = H5C__DEF_AR_DECREMENT;
     (cache_ptr->resize_ctl).apply_max_decrement    = TRUE;
-    (cache_ptr->resize_ctl).max_decrement    = H5C__DEF_AR_MAX_DECREMENT;
+    (cache_ptr->resize_ctl).max_decrement          = H5C__DEF_AR_MAX_DECREMENT;
     (cache_ptr->resize_ctl).epochs_before_eviction = H5C__DEF_AR_EPCHS_B4_EVICT;
-    (cache_ptr->resize_ctl).apply_empty_reserve = TRUE;
-    (cache_ptr->resize_ctl).empty_reserve    = H5C__DEF_AR_EMPTY_RESERVE;
+    (cache_ptr->resize_ctl).apply_empty_reserve    = TRUE;
+    (cache_ptr->resize_ctl).empty_reserve          = H5C__DEF_AR_EMPTY_RESERVE;
 
-    cache_ptr->epoch_markers_active        = 0;
+    cache_ptr->epoch_markers_active = 0;
 
     /* no need to initialize the ring buffer itself */
-    cache_ptr->epoch_marker_ringbuf_first    = 1;
-    cache_ptr->epoch_marker_ringbuf_last    = 0;
-    cache_ptr->epoch_marker_ringbuf_size    = 0;
+    cache_ptr->epoch_marker_ringbuf_first = 1;
+    cache_ptr->epoch_marker_ringbuf_last  = 0;
+    cache_ptr->epoch_marker_ringbuf_size  = 0;
 
-    for ( i = 0; i < H5C__MAX_EPOCH_MARKERS; i++ )
-    {
-        (cache_ptr->epoch_marker_active)[i]         = FALSE;
+    for (i = 0; i < H5C__MAX_EPOCH_MARKERS; i++) {
+        (cache_ptr->epoch_marker_active)[i] = FALSE;
 #ifndef NDEBUG
-        ((cache_ptr->epoch_markers)[i]).magic         =
-                        H5C__H5C_CACHE_ENTRY_T_MAGIC;
+        ((cache_ptr->epoch_markers)[i]).magic = H5C__H5C_CACHE_ENTRY_T_MAGIC;
 #endif /* NDEBUG */
         ((cache_ptr->epoch_markers)[i]).addr         = (haddr_t)i;
         ((cache_ptr->epoch_markers)[i]).size         = (size_t)0;
         ((cache_ptr->epoch_markers)[i]).type         = &epoch_marker_class;
         ((cache_ptr->epoch_markers)[i]).is_dirty     = FALSE;
-        ((cache_ptr->epoch_markers)[i]).dirtied         = FALSE;
-        ((cache_ptr->epoch_markers)[i]).is_protected     = FALSE;
-    ((cache_ptr->epoch_markers)[i]).is_read_only     = FALSE;
-    ((cache_ptr->epoch_markers)[i]).ro_ref_count     = 0;
-        ((cache_ptr->epoch_markers)[i]).is_pinned     = FALSE;
+        ((cache_ptr->epoch_markers)[i]).dirtied      = FALSE;
+        ((cache_ptr->epoch_markers)[i]).is_protected = FALSE;
+        ((cache_ptr->epoch_markers)[i]).is_read_only = FALSE;
+        ((cache_ptr->epoch_markers)[i]).ro_ref_count = 0;
+        ((cache_ptr->epoch_markers)[i]).is_pinned    = FALSE;
         ((cache_ptr->epoch_markers)[i]).in_slist     = FALSE;
-        ((cache_ptr->epoch_markers)[i]).ht_next         = NULL;
-        ((cache_ptr->epoch_markers)[i]).ht_prev         = NULL;
+        ((cache_ptr->epoch_markers)[i]).ht_next      = NULL;
+        ((cache_ptr->epoch_markers)[i]).ht_prev      = NULL;
         ((cache_ptr->epoch_markers)[i]).next         = NULL;
         ((cache_ptr->epoch_markers)[i]).prev         = NULL;
         ((cache_ptr->epoch_markers)[i]).aux_next     = NULL;
         ((cache_ptr->epoch_markers)[i]).aux_prev     = NULL;
 #if H5C_COLLECT_CACHE_ENTRY_STATS
-        ((cache_ptr->epoch_markers)[i]).accesses     = 0;
-        ((cache_ptr->epoch_markers)[i]).clears         = 0;
-        ((cache_ptr->epoch_markers)[i]).flushes         = 0;
-        ((cache_ptr->epoch_markers)[i]).pins         = 0;
+        ((cache_ptr->epoch_markers)[i]).accesses = 0;
+        ((cache_ptr->epoch_markers)[i]).clears   = 0;
+        ((cache_ptr->epoch_markers)[i]).flushes  = 0;
+        ((cache_ptr->epoch_markers)[i]).pins     = 0;
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
     }
 
-    if ( H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
+    if (H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED) {
 
         /* this should be impossible... */
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, \
-                    "H5C_reset_cache_hit_rate_stats failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, "H5C_reset_cache_hit_rate_stats failed.")
     }
 
     H5C_stats__reset(cache_ptr);
 
-    cache_ptr->prefix[0]            = '\0';  /* empty string */
+    cache_ptr->prefix[0] = '\0'; /* empty string */
 
     /* Set return value */
     ret_value = cache_ptr;
 
 done:
 
-    if ( ret_value == 0 ) {
+    if (ret_value == 0) {
 
-        if ( cache_ptr != NULL ) {
+        if (cache_ptr != NULL) {
 
-            if ( cache_ptr->slist_ptr != NULL )
+            if (cache_ptr->slist_ptr != NULL)
                 H5SL_close(cache_ptr->slist_ptr);
 
             cache_ptr->magic = 0;
-            cache_ptr = H5FL_FREE(H5C_t, cache_ptr);
+            cache_ptr        = H5FL_FREE(H5C_t, cache_ptr);
 
         } /* end if */
 
@@ -1172,7 +1073,6 @@ done:
 
 } /* H5C_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_def_auto_resize_rpt_fcn
  *
@@ -1189,168 +1089,120 @@ done:
  *-------------------------------------------------------------------------
  */
 void
-H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr,
+H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr,
 #ifndef NDEBUG
                             int32_t version,
-#else /* NDEBUG */
+#else  /* NDEBUG */
                             int32_t H5_ATTR_UNUSED version,
 #endif /* NDEBUG */
-                            double hit_rate,
-                            enum H5C_resize_status status,
-                            size_t old_max_cache_size,
-                            size_t new_max_cache_size,
-                            size_t old_min_clean_size,
-                            size_t new_min_clean_size)
+                            double hit_rate, enum H5C_resize_status status, size_t old_max_cache_size,
+                            size_t new_max_cache_size, size_t old_min_clean_size, size_t new_min_clean_size)
 {
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( version == H5C__CURR_AUTO_RESIZE_RPT_FCN_VER );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+    HDassert(version == H5C__CURR_AUTO_RESIZE_RPT_FCN_VER);
 
-    switch ( status )
-    {
+    switch (status) {
         case in_spec:
-            HDfprintf(stdout,
-                      "%sAuto cache resize -- no change. (hit rate = %lf)\n",
-                      cache_ptr->prefix, hit_rate);
+            HDfprintf(stdout, "%sAuto cache resize -- no change. (hit rate = %lf)\n", cache_ptr->prefix,
+                      hit_rate);
             break;
 
         case increase:
-            HDassert( hit_rate < (cache_ptr->resize_ctl).lower_hr_threshold );
-            HDassert( old_max_cache_size < new_max_cache_size );
-
-            HDfprintf(stdout,
-                      "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
-                      cache_ptr->prefix, hit_rate,
-                      (cache_ptr->resize_ctl).lower_hr_threshold);
-
-            HDfprintf(stdout,
-                    "%s    cache size increased from (%Zu/%Zu) to (%Zu/%Zu).\n",
-                    cache_ptr->prefix,
-                    old_max_cache_size,
-                    old_min_clean_size,
-                    new_max_cache_size,
-                    new_min_clean_size);
+            HDassert(hit_rate < (cache_ptr->resize_ctl).lower_hr_threshold);
+            HDassert(old_max_cache_size < new_max_cache_size);
+
+            HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
+                      cache_ptr->prefix, hit_rate, (cache_ptr->resize_ctl).lower_hr_threshold);
+
+            HDfprintf(stdout, "%s    cache size increased from (%Zu/%Zu) to (%Zu/%Zu).\n", cache_ptr->prefix,
+                      old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
             break;
 
         case flash_increase:
-            HDassert( old_max_cache_size < new_max_cache_size );
-
-            HDfprintf(stdout,
-                    "%sflash cache resize(%d) -- size threshold = %Zu.\n",
-                    cache_ptr->prefix,
-                    (int)((cache_ptr->resize_ctl).flash_incr_mode),
-                    cache_ptr->flash_size_increase_threshold);
-
-            HDfprintf(stdout,
-                  "%s cache size increased from (%Zu/%Zu) to (%Zu/%Zu).\n",
-                   cache_ptr->prefix,
-                   old_max_cache_size,
-                   old_min_clean_size,
-                   new_max_cache_size,
-                   new_min_clean_size);
-                break;
+            HDassert(old_max_cache_size < new_max_cache_size);
+
+            HDfprintf(stdout, "%sflash cache resize(%d) -- size threshold = %Zu.\n", cache_ptr->prefix,
+                      (int)((cache_ptr->resize_ctl).flash_incr_mode),
+                      cache_ptr->flash_size_increase_threshold);
+
+            HDfprintf(stdout, "%s cache size increased from (%Zu/%Zu) to (%Zu/%Zu).\n", cache_ptr->prefix,
+                      old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
+            break;
 
         case decrease:
-            HDassert( old_max_cache_size > new_max_cache_size );
+            HDassert(old_max_cache_size > new_max_cache_size);
 
-            switch ( (cache_ptr->resize_ctl).decr_mode )
-            {
+            switch ((cache_ptr->resize_ctl).decr_mode) {
                 case H5C_decr__off:
-                    HDfprintf(stdout,
-                              "%sAuto cache resize -- decrease off.  HR = %lf\n",
-                              cache_ptr->prefix, hit_rate);
+                    HDfprintf(stdout, "%sAuto cache resize -- decrease off.  HR = %lf\n", cache_ptr->prefix,
+                              hit_rate);
                     break;
 
                 case H5C_decr__threshold:
-                    HDassert( hit_rate >
-                              (cache_ptr->resize_ctl).upper_hr_threshold );
+                    HDassert(hit_rate > (cache_ptr->resize_ctl).upper_hr_threshold);
 
-                    HDfprintf(stdout,
-                              "%sAuto cache resize -- decrease by threshold.  HR = %lf > %6.5lf\n",
-                              cache_ptr->prefix, hit_rate,
-                              (cache_ptr->resize_ctl).upper_hr_threshold);
+                    HDfprintf(stdout, "%sAuto cache resize -- decrease by threshold.  HR = %lf > %6.5lf\n",
+                              cache_ptr->prefix, hit_rate, (cache_ptr->resize_ctl).upper_hr_threshold);
 
-                    HDfprintf(stdout, "%sout of bounds high (%6.5lf).\n",
-                              cache_ptr->prefix,
+                    HDfprintf(stdout, "%sout of bounds high (%6.5lf).\n", cache_ptr->prefix,
                               (cache_ptr->resize_ctl).upper_hr_threshold);
                     break;
 
                 case H5C_decr__age_out:
-                    HDfprintf(stdout,
-                              "%sAuto cache resize -- decrease by ageout.  HR = %lf\n",
+                    HDfprintf(stdout, "%sAuto cache resize -- decrease by ageout.  HR = %lf\n",
                               cache_ptr->prefix, hit_rate);
                     break;
 
                 case H5C_decr__age_out_with_threshold:
-                    HDassert( hit_rate >
-                              (cache_ptr->resize_ctl).upper_hr_threshold );
+                    HDassert(hit_rate > (cache_ptr->resize_ctl).upper_hr_threshold);
 
                     HDfprintf(stdout,
                               "%sAuto cache resize -- decrease by ageout with threshold. HR = %lf > %6.5lf\n",
-                              cache_ptr->prefix, hit_rate,
-                              (cache_ptr->resize_ctl).upper_hr_threshold);
+                              cache_ptr->prefix, hit_rate, (cache_ptr->resize_ctl).upper_hr_threshold);
                     break;
 
                 default:
-                    HDfprintf(stdout,
-                              "%sAuto cache resize -- decrease by unknown mode.  HR = %lf\n",
+                    HDfprintf(stdout, "%sAuto cache resize -- decrease by unknown mode.  HR = %lf\n",
                               cache_ptr->prefix, hit_rate);
             }
 
-            HDfprintf(stdout,
-                      "%s    cache size decreased from (%Zu/%Zu) to (%Zu/%Zu).\n",
-                      cache_ptr->prefix,
-                      old_max_cache_size,
-                      old_min_clean_size,
-                      new_max_cache_size,
-                      new_min_clean_size);
+            HDfprintf(stdout, "%s    cache size decreased from (%Zu/%Zu) to (%Zu/%Zu).\n", cache_ptr->prefix,
+                      old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
             break;
 
         case at_max_size:
-            HDfprintf(stdout,
-                      "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
-                      cache_ptr->prefix, hit_rate,
-                      (cache_ptr->resize_ctl).lower_hr_threshold);
-            HDfprintf(stdout,
-                      "%s    cache already at maximum size so no change.\n",
-                      cache_ptr->prefix);
+            HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
+                      cache_ptr->prefix, hit_rate, (cache_ptr->resize_ctl).lower_hr_threshold);
+            HDfprintf(stdout, "%s    cache already at maximum size so no change.\n", cache_ptr->prefix);
             break;
 
         case at_min_size:
-            HDfprintf(stdout,
-                      "%sAuto cache resize -- hit rate (%lf) -- can't decrease.\n",
-                      cache_ptr->prefix, hit_rate);
-            HDfprintf(stdout, "%s    cache already at minimum size.\n",
-                      cache_ptr->prefix);
+            HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) -- can't decrease.\n", cache_ptr->prefix,
+                      hit_rate);
+            HDfprintf(stdout, "%s    cache already at minimum size.\n", cache_ptr->prefix);
             break;
 
         case increase_disabled:
-            HDfprintf(stdout,
-                      "%sAuto cache resize -- increase disabled -- HR = %lf.",
-                      cache_ptr->prefix, hit_rate);
+            HDfprintf(stdout, "%sAuto cache resize -- increase disabled -- HR = %lf.", cache_ptr->prefix,
+                      hit_rate);
             break;
 
         case decrease_disabled:
-            HDfprintf(stdout,
-                      "%sAuto cache resize -- decrease disabled -- HR = %lf.\n",
-                      cache_ptr->prefix, hit_rate);
+            HDfprintf(stdout, "%sAuto cache resize -- decrease disabled -- HR = %lf.\n", cache_ptr->prefix,
+                      hit_rate);
             break;
 
         case not_full:
-            HDassert( hit_rate < (cache_ptr->resize_ctl).lower_hr_threshold );
-
-            HDfprintf(stdout,
-                      "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
-                      cache_ptr->prefix, hit_rate,
-                      (cache_ptr->resize_ctl).lower_hr_threshold);
-            HDfprintf(stdout,
-                      "%s    cache not full so no increase in size.\n",
-                      cache_ptr->prefix);
+            HDassert(hit_rate < (cache_ptr->resize_ctl).lower_hr_threshold);
+
+            HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
+                      cache_ptr->prefix, hit_rate, (cache_ptr->resize_ctl).lower_hr_threshold);
+            HDfprintf(stdout, "%s    cache not full so no increase in size.\n", cache_ptr->prefix);
             break;
 
         default:
-            HDfprintf(stdout, "%sAuto cache resize -- unknown status code.\n",
-                      cache_ptr->prefix);
+            HDfprintf(stdout, "%sAuto cache resize -- unknown status code.\n", cache_ptr->prefix);
             break;
     }
 
@@ -1358,7 +1210,6 @@ H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr,
 
 } /* H5C_def_auto_resize_rpt_fcn() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_dest
  *
@@ -1384,12 +1235,10 @@ H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_dest(H5F_t * f,
-         hid_t     primary_dxpl_id,
-         hid_t     secondary_dxpl_id)
+H5C_dest(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id)
 {
-    H5C_t * cache_ptr = f->shared->cache;
-    herr_t ret_value = SUCCEED;      /* Return value */
+    H5C_t *cache_ptr = f->shared->cache;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1398,11 +1247,10 @@ H5C_dest(H5F_t * f,
     HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     /* Flush and invalidate all cache entries */
-    if(H5C_flush_invalidate_cache(f, primary_dxpl_id, secondary_dxpl_id,
-                H5C__NO_FLAGS_SET) < 0 )
+    if (H5C_flush_invalidate_cache(f, primary_dxpl_id, secondary_dxpl_id, H5C__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache")
 
-    if(cache_ptr->slist_ptr != NULL) {
+    if (cache_ptr->slist_ptr != NULL) {
         H5SL_close(cache_ptr->slist_ptr);
         cache_ptr->slist_ptr = NULL;
     } /* end if */
@@ -1415,7 +1263,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_dest() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5C_expunge_entry
@@ -1432,101 +1279,86 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_expunge_entry(H5F_t *             f,
-                  hid_t               primary_dxpl_id,
-                  hid_t               secondary_dxpl_id,
-                  const H5C_class_t * type,
-                  haddr_t           addr,
-                  unsigned           flags)
+H5C_expunge_entry(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type,
+                  haddr_t addr, unsigned flags)
 {
-    H5C_t *        cache_ptr;
-    herr_t        result;
-    hbool_t        first_flush = TRUE;
-    H5C_cache_entry_t *    entry_ptr = NULL;
-    herr_t        ret_value = SUCCEED;      /* Return value */
+    H5C_t *            cache_ptr;
+    herr_t             result;
+    hbool_t            first_flush = TRUE;
+    H5C_cache_entry_t *entry_ptr   = NULL;
+    herr_t             ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f );
-    HDassert( f->shared );
+    HDassert(f);
+    HDassert(f->shared);
 
     cache_ptr = f->shared->cache;
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( type );
-    HDassert( type->clear );
-    HDassert( type->dest );
-    HDassert( H5F_addr_defined(addr) );
+    HDassert(cache_ptr);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+    HDassert(type);
+    HDassert(type->clear);
+    HDassert(type->dest);
+    HDassert(H5F_addr_defined(addr));
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+    if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
-        }
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
+    }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
     H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
 
-    if ( ( entry_ptr == NULL ) || ( entry_ptr->type != type ) ) {
+    if ((entry_ptr == NULL) || (entry_ptr->type != type)) {
 
         /* the target doesn't exist in the cache, so we are done. */
         HGOTO_DONE(SUCCEED)
     }
 
-    HDassert( entry_ptr->addr == addr );
-    HDassert( entry_ptr->type == type );
+    HDassert(entry_ptr->addr == addr);
+    HDassert(entry_ptr->type == type);
 
-    if ( entry_ptr->is_protected ) {
+    if (entry_ptr->is_protected) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, \
-            "Target entry is protected.")
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "Target entry is protected.")
     }
 
-    if ( entry_ptr->is_pinned ) {
+    if (entry_ptr->is_pinned) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, \
-            "Target entry is pinned.")
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "Target entry is pinned.")
     }
 
     /* Pass along 'free file space' flag to cache client */
-    entry_ptr->free_file_space_on_destroy = ( (flags & H5C__FREE_FILE_SPACE_FLAG) != 0 );
+    entry_ptr->free_file_space_on_destroy = ((flags & H5C__FREE_FILE_SPACE_FLAG) != 0);
 
     /* If we get this far, call H5C_flush_single_entry() with the
      * H5C__FLUSH_INVALIDATE_FLAG and the H5C__FLUSH_CLEAR_ONLY_FLAG.
      * This will clear the entry, and then delete it from the cache.
      */
-    result = H5C_flush_single_entry(f,
-                                    primary_dxpl_id,
-                                    secondary_dxpl_id,
-                                    entry_ptr->type,
-                                    entry_ptr->addr,
-                                    H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG,
-                                    &first_flush,
-                                    TRUE);
-
-    if ( result < 0 ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, \
-                    "H5C_flush_single_entry() failed.")
+    result =
+        H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, entry_ptr->type, entry_ptr->addr,
+                               H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, &first_flush, TRUE);
+
+    if (result < 0) {
+
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "H5C_flush_single_entry() failed.")
     }
 
 done:
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+    if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
-        }
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
+    }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* H5C_expunge_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_flush_cache
  *
@@ -1556,189 +1388,174 @@ done:
 herr_t
 H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsigned flags)
 {
-    H5C_t * cache_ptr = f->shared->cache;
-    herr_t              status;
-    herr_t        ret_value = SUCCEED;
-    hbool_t             destroy;
-    hbool_t        flushed_entries_last_pass;
-    hbool_t        flush_marked_entries;
-    hbool_t        first_flush = TRUE;
-    hbool_t        ignore_protected;
-    hbool_t        tried_to_flush_protected_entry = FALSE;
-    int32_t        passes = 0;
-    int32_t        protected_entries = 0;
-    H5SL_node_t *     node_ptr = NULL;
-    H5C_cache_entry_t *    entry_ptr = NULL;
-    H5C_cache_entry_t *    next_entry_ptr = NULL;
+    H5C_t *            cache_ptr = f->shared->cache;
+    herr_t             status;
+    herr_t             ret_value = SUCCEED;
+    hbool_t            destroy;
+    hbool_t            flushed_entries_last_pass;
+    hbool_t            flush_marked_entries;
+    hbool_t            first_flush = TRUE;
+    hbool_t            ignore_protected;
+    hbool_t            tried_to_flush_protected_entry = FALSE;
+    int32_t            passes                         = 0;
+    int32_t            protected_entries              = 0;
+    H5SL_node_t *      node_ptr                       = NULL;
+    H5C_cache_entry_t *entry_ptr                      = NULL;
+    H5C_cache_entry_t *next_entry_ptr                 = NULL;
 #if H5C_DO_SANITY_CHECKS
-    int64_t        flushed_entries_count;
-    size_t        flushed_entries_size;
-    int64_t        initial_slist_len;
-    size_t              initial_slist_size;
+    int64_t flushed_entries_count;
+    size_t  flushed_entries_size;
+    int64_t initial_slist_len;
+    size_t  initial_slist_size;
 #endif /* H5C_DO_SANITY_CHECKS */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( cache_ptr->slist_ptr );
+    HDassert(cache_ptr);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+    HDassert(cache_ptr->slist_ptr);
 
-    ignore_protected = ( (flags & H5C__FLUSH_IGNORE_PROTECTED_FLAG) != 0 );
+    ignore_protected = ((flags & H5C__FLUSH_IGNORE_PROTECTED_FLAG) != 0);
 
-    destroy = ( (flags & H5C__FLUSH_INVALIDATE_FLAG) != 0 );
+    destroy = ((flags & H5C__FLUSH_INVALIDATE_FLAG) != 0);
 
     /* note that flush_marked_entries is set to FALSE if destroy is TRUE */
-    flush_marked_entries = ( ( (flags & H5C__FLUSH_MARKED_ENTRIES_FLAG) != 0 )
-                             &&
-                             ( ! destroy )
-                           );
+    flush_marked_entries = (((flags & H5C__FLUSH_MARKED_ENTRIES_FLAG) != 0) && (!destroy));
 
-    HDassert( ! ( destroy && ignore_protected ) );
+    HDassert(!(destroy && ignore_protected));
 
-    HDassert( ! ( cache_ptr->flush_in_progress ) );
+    HDassert(!(cache_ptr->flush_in_progress));
 
     cache_ptr->flush_in_progress = TRUE;
 
-    if ( destroy ) {
+    if (destroy) {
 
-        status = H5C_flush_invalidate_cache(f,
-                                primary_dxpl_id,
-                        secondary_dxpl_id,
-                        flags);
+        status = H5C_flush_invalidate_cache(f, primary_dxpl_id, secondary_dxpl_id, flags);
 
-        if ( status < 0 ) {
+        if (status < 0) {
 
             /* This shouldn't happen -- if it does, we are toast so
              * just scream and die.
              */
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-            "flush invalidate failed.")
-        }
-    } else {
-    /* When we are only flushing marked entries, the slist will usually
-    * still contain entries when we have flushed everything we should.
-    * Thus we track whether we have flushed any entries in the last
-    * pass, and terminate if we haven't.
-    */
-
-    flushed_entries_last_pass = TRUE;
-
-        while ( ( passes < H5C__MAX_PASSES_ON_FLUSH ) &&
-        ( cache_ptr->slist_len != 0 ) &&
-        ( protected_entries == 0 ) &&
-        ( flushed_entries_last_pass ) )
-    {
-        flushed_entries_last_pass = FALSE;
-            node_ptr = H5SL_first(cache_ptr->slist_ptr);
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "flush invalidate failed.")
+        }
+    }
+    else {
+        /* When we are only flushing marked entries, the slist will usually
+         * still contain entries when we have flushed everything we should.
+         * Thus we track whether we have flushed any entries in the last
+         * pass, and terminate if we haven't.
+         */
 
-            if ( node_ptr != NULL ) {
+        flushed_entries_last_pass = TRUE;
+
+        while ((passes < H5C__MAX_PASSES_ON_FLUSH) && (cache_ptr->slist_len != 0) &&
+               (protected_entries == 0) && (flushed_entries_last_pass)) {
+            flushed_entries_last_pass = FALSE;
+            node_ptr                  = H5SL_first(cache_ptr->slist_ptr);
+
+            if (node_ptr != NULL) {
 
                 next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
 
-                if ( next_entry_ptr == NULL ) {
+                if (next_entry_ptr == NULL) {
 
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "next_entry_ptr == NULL 1 ?!?!");
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "next_entry_ptr == NULL 1 ?!?!");
                 }
 #ifndef NDEBUG
-        HDassert( next_entry_ptr->magic ==
-                          H5C__H5C_CACHE_ENTRY_T_MAGIC );
+                HDassert(next_entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
 #endif /* NDEBUG */
-            HDassert( next_entry_ptr->is_dirty );
-                HDassert( next_entry_ptr->in_slist );
-
-            } else {
+                HDassert(next_entry_ptr->is_dirty);
+                HDassert(next_entry_ptr->in_slist);
+            }
+            else {
 
                 next_entry_ptr = NULL;
-
             }
 
-        HDassert( node_ptr != NULL );
+            HDassert(node_ptr != NULL);
 
 #if H5C_DO_SANITY_CHECKS
-        /* For sanity checking, try to verify that the skip list has
-        * the expected size and number of entries at the end of each
-        * internal while loop (see below).
-        *
-        * Doing this get a bit tricky, as depending on flags, we may
-        * or may not flush all the entries in the slist.
-        *
-        * To make things more entertaining, with the advent of the
-        * fractal heap, the entry flush callback can cause entries
-        * to be dirtied, resized, and/or moved.
-        *
-        * To deal with this, we first make note of the initial
-        * skip list length and size:
-        */
-            initial_slist_len = cache_ptr->slist_len;
+            /* For sanity checking, try to verify that the skip list has
+             * the expected size and number of entries at the end of each
+             * internal while loop (see below).
+             *
+             * Doing this get a bit tricky, as depending on flags, we may
+             * or may not flush all the entries in the slist.
+             *
+             * To make things more entertaining, with the advent of the
+             * fractal heap, the entry flush callback can cause entries
+             * to be dirtied, resized, and/or moved.
+             *
+             * To deal with this, we first make note of the initial
+             * skip list length and size:
+             */
+            initial_slist_len  = cache_ptr->slist_len;
             initial_slist_size = cache_ptr->slist_size;
 
-        /* We then zero counters that we use to track the number
-        * and total size of entries flushed:
-        */
+            /* We then zero counters that we use to track the number
+             * and total size of entries flushed:
+             */
             flushed_entries_count = 0;
-            flushed_entries_size = 0;
-
-        /* As mentioned above, there is the possibility that
-        * entries will be dirtied, resized, and/or flushed during
-        * our pass through the skip list.  To capture the number
-        * of entries added, and the skip list size delta,
-        * zero the slist_len_increase and slist_size_increase of
-        * the cache's instance of H5C_t.  These fields will be
-        * updated elsewhere to account for slist insertions and/or
-        * dirty entry size changes.
-        */
-        cache_ptr->slist_len_increase = 0;
-        cache_ptr->slist_size_increase = 0;
-
-        /* at the end of the loop, use these values to compute the
-        * expected slist length and size and compare this with the
-        * value recorded in the cache's instance of H5C_t.
-        */
+            flushed_entries_size  = 0;
+
+            /* As mentioned above, there is the possibility that
+             * entries will be dirtied, resized, and/or flushed during
+             * our pass through the skip list.  To capture the number
+             * of entries added, and the skip list size delta,
+             * zero the slist_len_increase and slist_size_increase of
+             * the cache's instance of H5C_t.  These fields will be
+             * updated elsewhere to account for slist insertions and/or
+             * dirty entry size changes.
+             */
+            cache_ptr->slist_len_increase  = 0;
+            cache_ptr->slist_size_increase = 0;
+
+            /* at the end of the loop, use these values to compute the
+             * expected slist length and size and compare this with the
+             * value recorded in the cache's instance of H5C_t.
+             */
 #endif /* H5C_DO_SANITY_CHECKS */
 
-        while ( node_ptr != NULL )
-        {
+            while (node_ptr != NULL) {
                 entry_ptr = next_entry_ptr;
 
                 /* With the advent of the fractal heap, it is possible
-        * that the flush callback will dirty and/or resize
-        * other entries in the cache.  In particular, while
-        * Quincey has promised me that this will never happen,
-        * it is possible that the flush callback for an
-        * entry may protect an entry that is not in the cache,
-        * perhaps causing the cache to flush and possibly
-        * evict the entry associated with node_ptr to make
-        * space for the new entry.
-        *
-        * Thus we do a bit of extra sanity checking on entry_ptr,
-        * and break out of this scan of the skip list if we
-        * detect minor problems.  We have a bit of leaway on the
-        * number of passes though the skip list, so this shouldn't
-        * be an issue in the flush in and of itself, as it should
-        * be all but impossible for this to happen more than once
-        * in any flush.
-        *
-        * Observe that that breaking out of the scan early
-        * shouldn't break the sanity checks just after the end
-        * of this while loop.
-        *
-        * If an entry has merely been marked clean and removed from
-        * the s-list, we simply break out of the scan.
-        *
-        * If the entry has been evicted, we flag an error and
-        * exit.
-        */
+                 * that the flush callback will dirty and/or resize
+                 * other entries in the cache.  In particular, while
+                 * Quincey has promised me that this will never happen,
+                 * it is possible that the flush callback for an
+                 * entry may protect an entry that is not in the cache,
+                 * perhaps causing the cache to flush and possibly
+                 * evict the entry associated with node_ptr to make
+                 * space for the new entry.
+                 *
+                 * Thus we do a bit of extra sanity checking on entry_ptr,
+                 * and break out of this scan of the skip list if we
+                 * detect minor problems.  We have a bit of leaway on the
+                 * number of passes though the skip list, so this shouldn't
+                 * be an issue in the flush in and of itself, as it should
+                 * be all but impossible for this to happen more than once
+                 * in any flush.
+                 *
+                 * Observe that that breaking out of the scan early
+                 * shouldn't break the sanity checks just after the end
+                 * of this while loop.
+                 *
+                 * If an entry has merely been marked clean and removed from
+                 * the s-list, we simply break out of the scan.
+                 *
+                 * If the entry has been evicted, we flag an error and
+                 * exit.
+                 */
 #ifndef NDEBUG
-        if ( entry_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC ) {
+                if (entry_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC) {
 
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                                "entry_ptr->magic invalid ?!?!");
-
-            } else
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "entry_ptr->magic invalid ?!?!");
+                }
+                else
 #endif /* NDEBUG */
-        if ( ( ! entry_ptr->is_dirty ) ||
-                     ( ! entry_ptr->in_slist ) ) {
+                    if ((!entry_ptr->is_dirty) || (!entry_ptr->in_slist)) {
 
                     /* the s-list has been modified out from under us.
                      * set node_ptr to NULL and break out of the loop.
@@ -1752,93 +1569,79 @@ H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsign
                  */
                 node_ptr = H5SL_next(node_ptr);
 
-                if ( node_ptr != NULL ) {
+                if (node_ptr != NULL) {
                     next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
 
-                    if ( next_entry_ptr == NULL ) {
-                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                                    "next_entry_ptr == NULL 2 ?!?!");
-            }
+                    if (next_entry_ptr == NULL) {
+                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "next_entry_ptr == NULL 2 ?!?!");
+                    }
 #ifndef NDEBUG
-            HDassert( next_entry_ptr->magic ==
-                              H5C__H5C_CACHE_ENTRY_T_MAGIC );
+                    HDassert(next_entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
 #endif /* NDEBUG */
-                    HDassert( next_entry_ptr->is_dirty );
-                    HDassert( next_entry_ptr->in_slist );
-                } else {
+                    HDassert(next_entry_ptr->is_dirty);
+                    HDassert(next_entry_ptr->in_slist);
+                }
+                else {
                     next_entry_ptr = NULL;
                 }
 
-                HDassert( entry_ptr != NULL );
-                HDassert( entry_ptr->in_slist );
+                HDassert(entry_ptr != NULL);
+                HDassert(entry_ptr->in_slist);
 
-                if ( ( ! flush_marked_entries ) ||
-                     ( entry_ptr->flush_marker ) ) {
+                if ((!flush_marked_entries) || (entry_ptr->flush_marker)) {
 
-                    if ( entry_ptr->is_protected ) {
+                    if (entry_ptr->is_protected) {
 
                         /* we probably have major problems -- but lets flush
                          * everything we can before we decide whether to flag
                          * an error.
                          */
                         tried_to_flush_protected_entry = TRUE;
-                    protected_entries++;
-
-                    } else if ( entry_ptr->is_pinned ) {
-            /* Test to see if we are can flush the entry now.
-            * If we can, go ahead and flush.  Note that we
-            * aren't trying to do a destroy here, so that
-            * is not an issue.
-            */
-                        if ( TRUE ) { /* When we get to multithreaded cache,
-                                       * we will need either locking code,
-                                       * and/or a test to see if the entry
-                                       * is in flushable condition here.
-                                       */
+                        protected_entries++;
+                    }
+                    else if (entry_ptr->is_pinned) {
+                        /* Test to see if we are can flush the entry now.
+                         * If we can, go ahead and flush.  Note that we
+                         * aren't trying to do a destroy here, so that
+                         * is not an issue.
+                         */
+                        if (TRUE) { /* When we get to multithreaded cache,
+                                     * we will need either locking code,
+                                     * and/or a test to see if the entry
+                                     * is in flushable condition here.
+                                     */
 #if H5C_DO_SANITY_CHECKS
                             flushed_entries_count++;
                             flushed_entries_size += entry_ptr->size;
 #endif /* H5C_DO_SANITY_CHECKS */
-                            status = H5C_flush_single_entry(f,
-                                                            primary_dxpl_id,
-                                                            secondary_dxpl_id,
-                                                            NULL,
-                                                            entry_ptr->addr,
-                                                            flags,
-                                                            &first_flush,
-                                                            FALSE);
-                            if ( status < 0 ) {
+                            status = H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, NULL,
+                                                            entry_ptr->addr, flags, &first_flush, FALSE);
+                            if (status < 0) {
 
                                 /* This shouldn't happen -- if it does, we are
-                    * toast so just scream and die.
+                                 * toast so just scream and die.
                                  */
-                                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
+                                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL,
                                             "dirty pinned entry flush failed.")
                             }
-                flushed_entries_last_pass = TRUE;
-            }
-                    } else {
+                            flushed_entries_last_pass = TRUE;
+                        }
+                    }
+                    else {
 #if H5C_DO_SANITY_CHECKS
                         flushed_entries_count++;
-            flushed_entries_size += entry_ptr->size;
+                        flushed_entries_size += entry_ptr->size;
 #endif /* H5C_DO_SANITY_CHECKS */
-                        status = H5C_flush_single_entry(f,
-                                                        primary_dxpl_id,
-                                                        secondary_dxpl_id,
-                                                        NULL,
-                                                        entry_ptr->addr,
-                                                        flags,
-                                                        &first_flush,
-                                                        FALSE);
-                        if ( status < 0 ) {
+                        status = H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, NULL,
+                                                        entry_ptr->addr, flags, &first_flush, FALSE);
+                        if (status < 0) {
 
                             /* This shouldn't happen -- if it does, we are
-                * toast so just scream and die.
+                             * toast so just scream and die.
                              */
-                            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                                        "Can't flush entry.")
+                            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't flush entry.")
                         }
-            flushed_entries_last_pass = TRUE;
+                        flushed_entries_last_pass = TRUE;
                     }
                 }
             } /* while ( node_ptr != NULL ) */
@@ -1846,41 +1649,35 @@ H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsign
 #if H5C_DO_SANITY_CHECKS
             /* Verify that the slist size and length are as expected. */
 
-        HDassert( (initial_slist_len + cache_ptr->slist_len_increase -
-                       flushed_entries_count) == cache_ptr->slist_len );
-        HDassert( (initial_slist_size + cache_ptr->slist_size_increase -
-            flushed_entries_size) == cache_ptr->slist_size );
+            HDassert((initial_slist_len + cache_ptr->slist_len_increase - flushed_entries_count) ==
+                     cache_ptr->slist_len);
+            HDassert((initial_slist_size + cache_ptr->slist_size_increase - flushed_entries_size) ==
+                     cache_ptr->slist_size);
 #endif /* H5C_DO_SANITY_CHECKS */
 
-        passes++;
+            passes++;
 
-    } /* while */
+        } /* while */
 
-        HDassert( protected_entries <= cache_ptr->pl_len );
+        HDassert(protected_entries <= cache_ptr->pl_len);
 
-        if ( ( ( cache_ptr->pl_len > 0 ) && ( !ignore_protected ) )
-             ||
-             ( tried_to_flush_protected_entry ) ) {
+        if (((cache_ptr->pl_len > 0) && (!ignore_protected)) || (tried_to_flush_protected_entry)) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                "cache has protected items")
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "cache has protected items")
         }
 
-    if ( ( cache_ptr->slist_len != 0 ) &&
-        ( passes >= H5C__MAX_PASSES_ON_FLUSH ) ) {
+        if ((cache_ptr->slist_len != 0) && (passes >= H5C__MAX_PASSES_ON_FLUSH)) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                "flush pass limit exceeded.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "flush pass limit exceeded.")
+        }
 
 #if H5C_DO_SANITY_CHECKS
-        if ( ! flush_marked_entries ) {
+        if (!flush_marked_entries) {
 
-            HDassert( cache_ptr->slist_len == 0 );
-            HDassert( cache_ptr->slist_size == 0 );
+            HDassert(cache_ptr->slist_len == 0);
+            HDassert(cache_ptr->slist_size == 0);
         }
 #endif /* H5C_DO_SANITY_CHECKS */
-
     }
 
 done:
@@ -1891,7 +1688,6 @@ done:
 
 } /* H5C_flush_cache() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_flush_to_min_clean
  *
@@ -1917,15 +1713,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_flush_to_min_clean(H5F_t * f,
-                       hid_t   primary_dxpl_id,
-                       hid_t   secondary_dxpl_id)
+H5C_flush_to_min_clean(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id)
 {
-    H5C_t *            cache_ptr;
-    herr_t          result;
-    hbool_t        first_flush = TRUE;
-    hbool_t        write_permitted;
-#if 0 /* modified code -- commented out for now */
+    H5C_t * cache_ptr;
+    herr_t  result;
+    hbool_t first_flush = TRUE;
+    hbool_t write_permitted;
+#if 0  /* modified code -- commented out for now */
     int            i;
     int            flushed_entries_count = 0;
     size_t        flushed_entries_size = 0;
@@ -1933,94 +1727,83 @@ H5C_flush_to_min_clean(H5F_t * f,
     haddr_t          * flushed_entries_list = NULL;
     H5C_cache_entry_t *    entry_ptr = NULL;
 #endif /* JRM */
-    herr_t        ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f );
-    HDassert( f->shared );
+    HDassert(f);
+    HDassert(f->shared);
 
     cache_ptr = f->shared->cache;
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if ( cache_ptr->check_write_permitted != NULL ) {
+    if (cache_ptr->check_write_permitted != NULL) {
 
-        result = (cache_ptr->check_write_permitted)(f,
-                                                    primary_dxpl_id,
-                                                    &write_permitted);
+        result = (cache_ptr->check_write_permitted)(f, primary_dxpl_id, &write_permitted);
 
-        if ( result < 0 ) {
+        if (result < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "Can't get write_permitted")
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get write_permitted")
         }
-    } else {
+    }
+    else {
 
         write_permitted = cache_ptr->write_permitted;
     }
 
-    if ( ! write_permitted ) {
+    if (!write_permitted) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "cache write is not permitted!?!\n");
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "cache write is not permitted!?!\n");
     }
 #if 1 /* original code */
-    result = H5C_make_space_in_cache(f,
-                                     primary_dxpl_id,
-                                     secondary_dxpl_id,
-                                     (size_t)0,
-                                     write_permitted,
+    result = H5C_make_space_in_cache(f, primary_dxpl_id, secondary_dxpl_id, (size_t)0, write_permitted,
                                      &first_flush);
 
-    if ( result < 0 ) {
+    if (result < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C_make_space_in_cache failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_make_space_in_cache failed.")
     }
-#else /* modified code -- commented out for now */
-    if ( cache_ptr->max_cache_size > cache_ptr->index_size ) {
+#else  /* modified code -- commented out for now */
+    if (cache_ptr->max_cache_size > cache_ptr->index_size) {
 
-        if ( ((cache_ptr->max_cache_size - cache_ptr->index_size) +
-               cache_ptr->cLRU_list_size) >= cache_ptr->min_clean_size ) {
+        if (((cache_ptr->max_cache_size - cache_ptr->index_size) + cache_ptr->cLRU_list_size) >=
+            cache_ptr->min_clean_size) {
 
             space_needed = 0;
-
-        } else {
+        }
+        else {
 
             space_needed = cache_ptr->min_clean_size -
-                ((cache_ptr->max_cache_size - cache_ptr->index_size) +
-                 cache_ptr->cLRU_list_size);
+                           ((cache_ptr->max_cache_size - cache_ptr->index_size) + cache_ptr->cLRU_list_size);
         }
-    } else {
-
-        if ( cache_ptr->min_clean_size <= cache_ptr->cLRU_list_size ) {
+    }
+    else {
 
-           space_needed = 0;
+        if (cache_ptr->min_clean_size <= cache_ptr->cLRU_list_size) {
 
-        } else {
+            space_needed = 0;
+        }
+        else {
 
-            space_needed = cache_ptr->min_clean_size -
-                           cache_ptr->cLRU_list_size;
+            space_needed = cache_ptr->min_clean_size - cache_ptr->cLRU_list_size;
         }
     }
 
-    if ( space_needed > 0 ) { /* we have work to do */
+    if (space_needed > 0) { /* we have work to do */
 
-        HDassert( cache_ptr->slist_len > 0 );
+        HDassert(cache_ptr->slist_len > 0);
 
         /* allocate an array to keep a list of the entries that we
          * mark for flush.  We need this list to touch up the LRU
          * list after the flush.
          */
-        flushed_entries_list = (haddr_t *)H5MM_malloc(sizeof(haddr_t) *
-                                              (size_t)(cache_ptr->slist_len));
+        flushed_entries_list = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * (size_t)(cache_ptr->slist_len));
 
-        if ( flushed_entries_list == NULL ) {
+        if (flushed_entries_list == NULL) {
 
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                        "memory allocation failed for flushed entries list")
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for flushed entries list")
         }
 
         /* Scan the dirty LRU list from tail forward and mark sufficient
@@ -2029,15 +1812,13 @@ H5C_flush_to_min_clean(H5F_t * f,
          */
         entry_ptr = cache_ptr->dLRU_tail_ptr;
 
-        while ( ( flushed_entries_size < space_needed ) &&
-                ( flushed_entries_count < cache_ptr->slist_len ) &&
-                ( entry_ptr != NULL ) )
-        {
-            HDassert( ! (entry_ptr->is_protected) );
-            HDassert( ! (entry_ptr->is_read_only) );
-            HDassert( entry_ptr->ro_ref_count == 0 );
-            HDassert( entry_ptr->is_dirty );
-            HDassert( entry_ptr->in_slist );
+        while ((flushed_entries_size < space_needed) && (flushed_entries_count < cache_ptr->slist_len) &&
+               (entry_ptr != NULL)) {
+            HDassert(!(entry_ptr->is_protected));
+            HDassert(!(entry_ptr->is_read_only));
+            HDassert(entry_ptr->ro_ref_count == 0);
+            HDassert(entry_ptr->is_dirty);
+            HDassert(entry_ptr->in_slist);
 
             entry_ptr->flush_marker = TRUE;
             flushed_entries_size += entry_ptr->size;
@@ -2046,15 +1827,14 @@ H5C_flush_to_min_clean(H5F_t * f,
             entry_ptr = entry_ptr->aux_prev;
         }
 
-        HDassert( flushed_entries_count <= cache_ptr->slist_len );
-        HDassert( flushed_entries_size >= space_needed );
-
+        HDassert(flushed_entries_count <= cache_ptr->slist_len);
+        HDassert(flushed_entries_size >= space_needed);
 
         /* Flush the marked entries */
-    result = H5C_flush_cache(f, primary_dxpl_id, secondary_dxpl_id,
+        result = H5C_flush_cache(f, primary_dxpl_id, secondary_dxpl_id,
                                  H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_IGNORE_PROTECTED_FLAG);
 
-        if ( result < 0 ) {
+        if (result < 0) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_flush_cache failed.")
         }
@@ -2065,16 +1845,14 @@ H5C_flush_to_min_clean(H5F_t * f,
          */
 
         i = 0;
-        while ( i < flushed_entries_count )
-        {
-            H5C__SEARCH_INDEX_NO_STATS(cache_ptr, flushed_entries_list[i], \
-                                       entry_ptr, FAIL)
+        while (i < flushed_entries_count) {
+            H5C__SEARCH_INDEX_NO_STATS(cache_ptr, flushed_entries_list[i], entry_ptr, FAIL)
 
-        /* At present, the above search must always succeed.  However,
+            /* At present, the above search must always succeed.  However,
              * that may change.  Write the code so we need only remove the
              * following assert in that event.
              */
-            HDassert( entry_ptr != NULL );
+            HDassert(entry_ptr != NULL);
             H5C__FAKE_RP_FOR_MOST_RECENT_ACCESS(cache_ptr, entry_ptr, FAIL)
             i++;
         }
@@ -2085,7 +1863,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_flush_to_min_clean() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_get_cache_auto_resize_config
  *
@@ -2101,19 +1878,18 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_get_cache_auto_resize_config(const H5C_t * cache_ptr,
-                                 H5C_auto_size_ctl_t *config_ptr)
+H5C_get_cache_auto_resize_config(const H5C_t *cache_ptr, H5C_auto_size_ctl_t *config_ptr)
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+    if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
 
-    if ( config_ptr == NULL ) {
+    if (config_ptr == NULL) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad config_ptr on entry.")
     }
@@ -2121,7 +1897,7 @@ H5C_get_cache_auto_resize_config(const H5C_t * cache_ptr,
     *config_ptr = cache_ptr->resize_ctl;
 
     config_ptr->set_initial_size = FALSE;
-    config_ptr->initial_size = cache_ptr->max_cache_size;
+    config_ptr->initial_size     = cache_ptr->max_cache_size;
 
 done:
 
@@ -2129,7 +1905,6 @@ done:
 
 } /* H5C_get_cache_auto_resize_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_get_cache_size
  *
@@ -2147,37 +1922,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_get_cache_size(H5C_t * cache_ptr,
-                   size_t * max_size_ptr,
-                   size_t * min_clean_size_ptr,
-                   size_t * cur_size_ptr,
-                   int32_t * cur_num_entries_ptr)
+H5C_get_cache_size(H5C_t *cache_ptr, size_t *max_size_ptr, size_t *min_clean_size_ptr, size_t *cur_size_ptr,
+                   int32_t *cur_num_entries_ptr)
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+    if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
 
-    if ( max_size_ptr != NULL ) {
+    if (max_size_ptr != NULL) {
 
         *max_size_ptr = cache_ptr->max_cache_size;
     }
 
-    if ( min_clean_size_ptr != NULL ) {
+    if (min_clean_size_ptr != NULL) {
 
         *min_clean_size_ptr = cache_ptr->min_clean_size;
     }
 
-    if ( cur_size_ptr != NULL ) {
+    if (cur_size_ptr != NULL) {
 
         *cur_size_ptr = cache_ptr->index_size;
     }
 
-    if ( cur_num_entries_ptr != NULL ) {
+    if (cur_num_entries_ptr != NULL) {
 
         *cur_num_entries_ptr = cache_ptr->index_len;
     }
@@ -2188,7 +1960,6 @@ done:
 
 } /* H5C_get_cache_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_get_cache_hit_rate
  *
@@ -2206,33 +1977,31 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_get_cache_hit_rate(H5C_t * cache_ptr,
-                       double * hit_rate_ptr)
+H5C_get_cache_hit_rate(H5C_t *cache_ptr, double *hit_rate_ptr)
 
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+    if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
 
-    if ( hit_rate_ptr == NULL ) {
+    if (hit_rate_ptr == NULL) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad hit_rate_ptr on entry.")
     }
 
-    HDassert( cache_ptr->cache_hits >= 0 );
-    HDassert( cache_ptr->cache_accesses >= cache_ptr->cache_hits );
-
-    if ( cache_ptr->cache_accesses > 0 ) {
+    HDassert(cache_ptr->cache_hits >= 0);
+    HDassert(cache_ptr->cache_accesses >= cache_ptr->cache_hits);
 
-        *hit_rate_ptr = ((double)(cache_ptr->cache_hits)) /
-                         ((double)(cache_ptr->cache_accesses));
+    if (cache_ptr->cache_accesses > 0) {
 
-    } else {
+        *hit_rate_ptr = ((double)(cache_ptr->cache_hits)) / ((double)(cache_ptr->cache_accesses));
+    }
+    else {
 
         *hit_rate_ptr = 0.0f;
     }
@@ -2243,7 +2012,6 @@ done:
 
 } /* H5C_get_cache_hit_rate() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5C_get_entry_status
@@ -2267,67 +2035,62 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_get_entry_status(const H5F_t *f,
-                     haddr_t   addr,
-                     size_t *  size_ptr,
-                     hbool_t * in_cache_ptr,
-                     hbool_t * is_dirty_ptr,
-                     hbool_t * is_protected_ptr,
-            hbool_t * is_pinned_ptr)
+H5C_get_entry_status(const H5F_t *f, haddr_t addr, size_t *size_ptr, hbool_t *in_cache_ptr,
+                     hbool_t *is_dirty_ptr, hbool_t *is_protected_ptr, hbool_t *is_pinned_ptr)
 {
-    H5C_t             * cache_ptr;
-    H5C_cache_entry_t *    entry_ptr = NULL;
-    herr_t        ret_value = SUCCEED;      /* Return value */
+    H5C_t *            cache_ptr;
+    H5C_cache_entry_t *entry_ptr = NULL;
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f );
-    HDassert( f->shared );
+    HDassert(f);
+    HDassert(f->shared);
 
     cache_ptr = f->shared->cache;
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( H5F_addr_defined(addr) );
-    HDassert( in_cache_ptr != NULL );
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(in_cache_ptr != NULL);
 
     /* this test duplicates two of the above asserts, but we need an
      * invocation of HGOTO_ERROR to keep the compiler happy.
      */
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+    if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
 
     H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
 
-    if ( entry_ptr == NULL ) {
+    if (entry_ptr == NULL) {
 
         /* the entry doesn't exist in the cache -- report this
          * and quit.
          */
         *in_cache_ptr = FALSE;
-
-    } else {
+    }
+    else {
 
         *in_cache_ptr = TRUE;
 
-        if ( size_ptr != NULL ) {
+        if (size_ptr != NULL) {
 
             *size_ptr = entry_ptr->size;
         }
 
-        if ( is_dirty_ptr != NULL ) {
+        if (is_dirty_ptr != NULL) {
 
             *is_dirty_ptr = entry_ptr->is_dirty;
         }
 
-        if ( is_protected_ptr != NULL ) {
+        if (is_protected_ptr != NULL) {
 
             *is_protected_ptr = entry_ptr->is_protected;
         }
 
-        if ( is_pinned_ptr != NULL ) {
+        if (is_pinned_ptr != NULL) {
 
             *is_pinned_ptr = entry_ptr->is_pinned;
         }
@@ -2339,7 +2102,6 @@ done:
 
 } /* H5C_get_entry_status() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_get_evictions_enabled()
  *
@@ -2354,22 +2116,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_get_evictions_enabled(const H5C_t *cache_ptr,
-                          hbool_t * evictions_enabled_ptr)
+H5C_get_evictions_enabled(const H5C_t *cache_ptr, hbool_t *evictions_enabled_ptr)
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+    if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
 
-    if ( evictions_enabled_ptr == NULL ) {
+    if (evictions_enabled_ptr == NULL) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "Bad evictions_enabled_ptr on entry.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad evictions_enabled_ptr on entry.")
     }
 
     *evictions_enabled_ptr = cache_ptr->evictions_enabled;
@@ -2380,7 +2140,6 @@ done:
 
 } /* H5C_get_evictions_enabled() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_get_trace_file_ptr
  *
@@ -2411,7 +2170,6 @@ H5C_get_trace_file_ptr(const H5C_t *cache_ptr, FILE **trace_file_ptr_ptr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5C_get_trace_file_ptr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_get_trace_file_ptr_from_entry
  *
@@ -2429,8 +2187,7 @@ H5C_get_trace_file_ptr(const H5C_t *cache_ptr, FILE **trace_file_ptr_ptr)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
-    FILE **trace_file_ptr_ptr)
+H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr, FILE **trace_file_ptr_ptr)
 {
     FUNC_ENTER_NOAPI_NOERR
 
@@ -2443,7 +2200,6 @@ H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5C_get_trace_file_ptr_from_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_insert_entry
  *
@@ -2472,57 +2228,51 @@ H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_insert_entry(H5F_t *             f,
-                 hid_t             primary_dxpl_id,
-                 hid_t             secondary_dxpl_id,
-                 const H5C_class_t * type,
-                 haddr_t          addr,
-                 void *             thing,
-                 unsigned int        flags)
+H5C_insert_entry(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type,
+                 haddr_t addr, void *thing, unsigned int flags)
 {
-    H5C_t *             cache_ptr;
-    herr_t        result;
-    herr_t        ret_value = SUCCEED;    /* Return value */
-    hbool_t        first_flush = TRUE;
-    hbool_t        insert_pinned;
-    hbool_t             set_flush_marker;
-    hbool_t        write_permitted = TRUE;
-    size_t        empty_space;
-    H5C_cache_entry_t *    entry_ptr;
-    H5C_cache_entry_t *    test_entry_ptr;
+    H5C_t *            cache_ptr;
+    herr_t             result;
+    herr_t             ret_value   = SUCCEED; /* Return value */
+    hbool_t            first_flush = TRUE;
+    hbool_t            insert_pinned;
+    hbool_t            set_flush_marker;
+    hbool_t            write_permitted = TRUE;
+    size_t             empty_space;
+    H5C_cache_entry_t *entry_ptr;
+    H5C_cache_entry_t *test_entry_ptr;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f );
-    HDassert( f->shared );
+    HDassert(f);
+    HDassert(f->shared);
 
     cache_ptr = f->shared->cache;
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( type );
-    HDassert( type->flush );
-    HDassert( type->size );
-    HDassert( H5F_addr_defined(addr) );
-    HDassert( thing );
+    HDassert(cache_ptr);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+    HDassert(type);
+    HDassert(type->flush);
+    HDassert(type->size);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(thing);
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-    if ( H5C_verify_not_in_index(cache_ptr, (H5C_cache_entry_t *)thing) < 0 ) {
+    if (H5C_verify_not_in_index(cache_ptr, (H5C_cache_entry_t *)thing) < 0) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "thing already in index.\n");
     }
 #endif /* H5C_DO_SANITY_CHECKS */
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-    if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+    if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "LRU sanity check failed.\n");
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
     }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    set_flush_marker = ( (flags & H5C__SET_FLUSH_MARKER_FLAG) != 0 );
-    insert_pinned    = ( (flags & H5C__PIN_ENTRY_FLAG) != 0 );
+    set_flush_marker = ((flags & H5C__SET_FLUSH_MARKER_FLAG) != 0);
+    insert_pinned    = ((flags & H5C__PIN_ENTRY_FLAG) != 0);
 
     entry_ptr = (H5C_cache_entry_t *)thing;
 
@@ -2532,17 +2282,15 @@ H5C_insert_entry(H5F_t *             f,
 
     H5C__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
 
-    if ( test_entry_ptr != NULL ) {
-
-        if ( test_entry_ptr == entry_ptr ) {
+    if (test_entry_ptr != NULL) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, \
-                        "entry already in cache.")
+        if (test_entry_ptr == entry_ptr) {
 
-        } else {
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "entry already in cache.")
+        }
+        else {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, \
-                        "duplicate entry in cache.")
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "duplicate entry in cache.")
         }
     }
 
@@ -2550,8 +2298,8 @@ H5C_insert_entry(H5F_t *             f,
     entry_ptr->magic = H5C__H5C_CACHE_ENTRY_T_MAGIC;
 #endif /* NDEBUG */
     entry_ptr->cache_ptr = cache_ptr;
-    entry_ptr->addr  = addr;
-    entry_ptr->type  = type;
+    entry_ptr->addr      = addr;
+    entry_ptr->type      = type;
 
     entry_ptr->is_protected = FALSE;
     entry_ptr->is_read_only = FALSE;
@@ -2563,22 +2311,22 @@ H5C_insert_entry(H5F_t *             f,
     entry_ptr->is_dirty = TRUE;
 
     /* not protected, so can't be dirtied */
-    entry_ptr->dirtied  = FALSE;
+    entry_ptr->dirtied = FALSE;
 
     /* Retrieve the size of the thing */
-    if((type->size)(f, thing, &(entry_ptr->size)) < 0)
+    if ((type->size)(f, thing, &(entry_ptr->size)) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, FAIL, "Can't get size of thing")
-    HDassert(entry_ptr->size > 0 &&  entry_ptr->size < H5C_MAX_ENTRY_SIZE);
+    HDassert(entry_ptr->size > 0 && entry_ptr->size < H5C_MAX_ENTRY_SIZE);
 
     entry_ptr->in_slist = FALSE;
 
 #ifdef H5_HAVE_PARALLEL
     entry_ptr->clear_on_unprotect = FALSE;
-    entry_ptr->flush_immediately = FALSE;
+    entry_ptr->flush_immediately  = FALSE;
 #endif /* H5_HAVE_PARALLEL */
 
-    entry_ptr->flush_in_progress = FALSE;
-    entry_ptr->destroy_in_progress = FALSE;
+    entry_ptr->flush_in_progress          = FALSE;
+    entry_ptr->destroy_in_progress        = FALSE;
     entry_ptr->free_file_space_on_destroy = FALSE;
 
     entry_ptr->ht_next = NULL;
@@ -2592,69 +2340,56 @@ H5C_insert_entry(H5F_t *             f,
 
     H5C__RESET_CACHE_ENTRY_STATS(entry_ptr)
 
-    if ( ( cache_ptr->flash_size_increase_possible ) &&
-         ( entry_ptr->size > cache_ptr->flash_size_increase_threshold ) ) {
+    if ((cache_ptr->flash_size_increase_possible) &&
+        (entry_ptr->size > cache_ptr->flash_size_increase_threshold)) {
 
         result = H5C__flash_increase_cache_size(cache_ptr, 0, entry_ptr->size);
 
-        if ( result < 0 ) {
+        if (result < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, \
-                        "H5C__flash_increase_cache_size failed.")
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5C__flash_increase_cache_size failed.")
         }
     }
 
-    if ( cache_ptr->index_size >= cache_ptr->max_cache_size ) {
-
-       empty_space = 0;
+    if (cache_ptr->index_size >= cache_ptr->max_cache_size) {
 
-    } else {
-
-       empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+        empty_space = 0;
+    }
+    else {
 
+        empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
     }
 
-    if ( ( cache_ptr->evictions_enabled )
-    &&
-         ( ( (cache_ptr->index_size + entry_ptr->size) >
-        cache_ptr->max_cache_size
-    )
-    ||
-    (
-        ( ( empty_space + cache_ptr->clean_index_size ) <
-        cache_ptr->min_clean_size )
-    )
-    )
-       ) {
+    if ((cache_ptr->evictions_enabled) &&
+        (((cache_ptr->index_size + entry_ptr->size) > cache_ptr->max_cache_size) ||
+         (((empty_space + cache_ptr->clean_index_size) < cache_ptr->min_clean_size)))) {
 
         size_t space_needed;
 
-    if ( empty_space <= entry_ptr->size ) {
+        if (empty_space <= entry_ptr->size) {
 
             cache_ptr->cache_full = TRUE;
-    }
+        }
 
-        if ( cache_ptr->check_write_permitted != NULL ) {
+        if (cache_ptr->check_write_permitted != NULL) {
 
-            result = (cache_ptr->check_write_permitted)(f,
-                                                        primary_dxpl_id,
-                                                        &write_permitted);
+            result = (cache_ptr->check_write_permitted)(f, primary_dxpl_id, &write_permitted);
 
-            if ( result < 0 ) {
+            if (result < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, \
-                            "Can't get write_permitted")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "Can't get write_permitted")
             }
-        } else {
+        }
+        else {
 
             write_permitted = cache_ptr->write_permitted;
         }
 
-        HDassert( entry_ptr->size <= H5C_MAX_ENTRY_SIZE );
+        HDassert(entry_ptr->size <= H5C_MAX_ENTRY_SIZE);
 
         space_needed = entry_ptr->size;
 
-        if ( space_needed > cache_ptr->max_cache_size ) {
+        if (space_needed > cache_ptr->max_cache_size) {
 
             space_needed = cache_ptr->max_cache_size;
         }
@@ -2684,17 +2419,12 @@ H5C_insert_entry(H5F_t *             f,
          * no point in worrying about the third.
          */
 
-        result = H5C_make_space_in_cache(f,
-                                         primary_dxpl_id,
-                                         secondary_dxpl_id,
-                                         space_needed,
-                                         write_permitted,
+        result = H5C_make_space_in_cache(f, primary_dxpl_id, secondary_dxpl_id, space_needed, write_permitted,
                                          &first_flush);
 
-        if ( result < 0 ) {
+        if (result < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, \
-                        "H5C_make_space_in_cache failed.")
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5C_make_space_in_cache failed.")
         }
     }
 
@@ -2704,12 +2434,12 @@ H5C_insert_entry(H5F_t *             f,
      * unnecessary.  Rework it once the rest of the code changes are
      * in and tested.   -- JRM
      */
-    if ( entry_ptr->is_dirty ) {
+    if (entry_ptr->is_dirty) {
 
         entry_ptr->flush_marker = set_flush_marker;
         H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
-
-    } else {
+    }
+    else {
 
         entry_ptr->flush_marker = FALSE;
     }
@@ -2717,10 +2447,9 @@ H5C_insert_entry(H5F_t *             f,
     H5C__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, FAIL)
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-    if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+    if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "LRU sanity check failed.\n");
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
     }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
@@ -2729,10 +2458,9 @@ H5C_insert_entry(H5F_t *             f,
 done:
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-    if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+    if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "LRU sanity check failed.\n");
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
     }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
@@ -2740,7 +2468,6 @@ done:
 
 } /* H5C_insert_entry() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5C_mark_entries_as_clean
@@ -2774,105 +2501,91 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5C_mark_entries_as_clean(H5F_t *  f,
-                          hid_t     primary_dxpl_id,
-                          hid_t     secondary_dxpl_id,
-                          int32_t   ce_array_len,
-                          haddr_t * ce_array_ptr)
+H5C_mark_entries_as_clean(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, int32_t ce_array_len,
+                          haddr_t *ce_array_ptr)
 {
-    H5C_t *             cache_ptr;
-    hbool_t        first_flush = TRUE;
-    int            entries_cleared;
-    int            entries_examined;
-    int                 i;
-    int            initial_list_len;
-    haddr_t        addr;
+    H5C_t * cache_ptr;
+    hbool_t first_flush = TRUE;
+    int     entries_cleared;
+    int     entries_examined;
+    int     i;
+    int     initial_list_len;
+    haddr_t addr;
 #if H5C_DO_SANITY_CHECKS
-    int            pinned_entries_marked = 0;
-    int            protected_entries_marked = 0;
-    int            other_entries_marked = 0;
-    haddr_t        last_addr;
+    int     pinned_entries_marked    = 0;
+    int     protected_entries_marked = 0;
+    int     other_entries_marked     = 0;
+    haddr_t last_addr;
 #endif /* H5C_DO_SANITY_CHECKS */
-    H5C_cache_entry_t *    clear_ptr = NULL;
-    H5C_cache_entry_t *    entry_ptr = NULL;
-    herr_t        ret_value = SUCCEED;      /* Return value */
+    H5C_cache_entry_t *clear_ptr = NULL;
+    H5C_cache_entry_t *entry_ptr = NULL;
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f );
-    HDassert( f->shared );
+    HDassert(f);
+    HDassert(f->shared);
     cache_ptr = f->shared->cache;
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert(cache_ptr);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    HDassert( ce_array_len > 0 );
-    HDassert( ce_array_ptr != NULL );
+    HDassert(ce_array_len > 0);
+    HDassert(ce_array_ptr != NULL);
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+    if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HDassert(0);
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
-        }
+        HDassert(0);
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
+    }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    for ( i = 0; i < ce_array_len; i++ )
-    {
+    for (i = 0; i < ce_array_len; i++) {
         addr = ce_array_ptr[i];
 
 #if H5C_DO_SANITY_CHECKS
-        if ( i == 0 ) {
+        if (i == 0) {
 
             last_addr = addr;
+        }
+        else {
 
-        } else {
-
-            if ( last_addr == addr ) {
-
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "Duplicate entry in cleaned list.\n");
+            if (last_addr == addr) {
 
-            } else if ( last_addr > addr ) {
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Duplicate entry in cleaned list.\n");
+            }
+            else if (last_addr > addr) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "cleaned list not sorted.\n");
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "cleaned list not sorted.\n");
             }
         }
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+        if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HDassert(0);
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
+            HDassert(0);
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
         }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 #endif /* H5C_DO_SANITY_CHECKS */
 
-        HDassert( H5F_addr_defined(addr) );
+        HDassert(H5F_addr_defined(addr));
 
         H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
 
-        if ( entry_ptr == NULL ) {
+        if (entry_ptr == NULL) {
 #if H5C_DO_SANITY_CHECKS
-        HDfprintf(stdout,
-                  "H5C_mark_entries_as_clean: entry[%d] = %ld not in cache.\n",
-                      (int)i,
+            HDfprintf(stdout, "H5C_mark_entries_as_clean: entry[%d] = %ld not in cache.\n", (int)i,
                       (long)addr);
 #endif /* H5C_DO_SANITY_CHECKS */
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "Listed entry not in cache?!?!?.")
-
-        } else if ( ! entry_ptr->is_dirty ) {
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed entry not in cache?!?!?.")
+        }
+        else if (!entry_ptr->is_dirty) {
 
 #if H5C_DO_SANITY_CHECKS
-        HDfprintf(stdout,
-                      "H5C_mark_entries_as_clean: entry %ld is not dirty!?!\n",
-                      (long)addr);
+            HDfprintf(stdout, "H5C_mark_entries_as_clean: entry %ld is not dirty!?!\n", (long)addr);
 #endif /* H5C_DO_SANITY_CHECKS */
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "Listed entry not dirty?!?!?.")
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed entry not dirty?!?!?.")
 #if 0 /* original code */
         } else if ( entry_ptr->is_protected ) {
 
@@ -2893,5482 +2606,4848 @@ H5C_mark_entries_as_clean(H5F_t *  f,
             }
         }
 #else /* modified code */
-        } else {
+        }
+        else {
             /* Mark the entry to be cleared on unprotect.  We will
              * scan the LRU list shortly, and clear all those entries
              * not currently protected.
              */
             entry_ptr->clear_on_unprotect = TRUE;
 #if H5C_DO_SANITY_CHECKS
-        if ( entry_ptr->is_protected ) {
-
-        protected_entries_marked++;
+            if (entry_ptr->is_protected) {
 
-        } else if ( entry_ptr->is_pinned ) {
-
-        pinned_entries_marked++;
+                protected_entries_marked++;
+            }
+            else if (entry_ptr->is_pinned) {
 
-        } else {
+                pinned_entries_marked++;
+            }
+            else {
 
-        other_entries_marked++;
-        }
+                other_entries_marked++;
+            }
 #endif /* H5C_DO_SANITY_CHECKS */
         }
 #endif /* end modified code */
-    }
+        }
 #if 1 /* modified code */
-    /* Scan through the LRU list from back to front, and flush the
-     * entries whose clear_on_unprotect flags are set.  Observe that
-     * any protected entries will not be on the LRU, and therefore
-     * will not be flushed at this time.
-     */
+        /* Scan through the LRU list from back to front, and flush the
+         * entries whose clear_on_unprotect flags are set.  Observe that
+         * any protected entries will not be on the LRU, and therefore
+         * will not be flushed at this time.
+         */
 
-    entries_cleared = 0;
-    entries_examined = 0;
-    initial_list_len = cache_ptr->LRU_list_len;
-    entry_ptr = cache_ptr->LRU_tail_ptr;
+        entries_cleared  = 0;
+        entries_examined = 0;
+        initial_list_len = cache_ptr->LRU_list_len;
+        entry_ptr        = cache_ptr->LRU_tail_ptr;
 
-    while ( ( entry_ptr != NULL ) &&
-            ( entries_examined <= initial_list_len ) &&
-            ( entries_cleared < ce_array_len ) )
-    {
-        if ( entry_ptr->clear_on_unprotect ) {
+        while ((entry_ptr != NULL) && (entries_examined <= initial_list_len) &&
+               (entries_cleared < ce_array_len)) {
+            if (entry_ptr->clear_on_unprotect) {
 
-            entry_ptr->clear_on_unprotect = FALSE;
-            clear_ptr = entry_ptr;
-            entry_ptr = entry_ptr->prev;
-            entries_cleared++;
+                entry_ptr->clear_on_unprotect = FALSE;
+                clear_ptr                     = entry_ptr;
+                entry_ptr                     = entry_ptr->prev;
+                entries_cleared++;
 
-            if ( H5C_flush_single_entry(f,
-                                        primary_dxpl_id,
-                                        secondary_dxpl_id,
-                                        clear_ptr->type,
-                                        clear_ptr->addr,
-                                        H5C__FLUSH_CLEAR_ONLY_FLAG,
-                                        &first_flush,
-                                        TRUE) < 0 ) {
+                if (H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, clear_ptr->type,
+                                           clear_ptr->addr, H5C__FLUSH_CLEAR_ONLY_FLAG, &first_flush,
+                                           TRUE) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
+                }
             }
-        } else {
+            else {
 
-            entry_ptr = entry_ptr->prev;
+                entry_ptr = entry_ptr->prev;
+            }
+            entries_examined++;
         }
-        entries_examined++;
-    }
 
 #if H5C_DO_SANITY_CHECKS
-    HDassert( entries_cleared == other_entries_marked );
+        HDassert(entries_cleared == other_entries_marked);
 #endif /* H5C_DO_SANITY_CHECKS */
 
-    /* It is also possible that some of the cleared entries are on the
-     * pinned list.  Must scan that also.
-     */
+        /* It is also possible that some of the cleared entries are on the
+         * pinned list.  Must scan that also.
+         */
 
-    entry_ptr = cache_ptr->pel_head_ptr;
+        entry_ptr = cache_ptr->pel_head_ptr;
 
-    while ( entry_ptr != NULL )
-    {
-        if ( entry_ptr->clear_on_unprotect ) {
+        while (entry_ptr != NULL) {
+            if (entry_ptr->clear_on_unprotect) {
 
-            entry_ptr->clear_on_unprotect = FALSE;
-            clear_ptr = entry_ptr;
-            entry_ptr = entry_ptr->next;
-            entries_cleared++;
+                entry_ptr->clear_on_unprotect = FALSE;
+                clear_ptr                     = entry_ptr;
+                entry_ptr                     = entry_ptr->next;
+                entries_cleared++;
 
-            if ( H5C_flush_single_entry(f,
-                                        primary_dxpl_id,
-                                        secondary_dxpl_id,
-                                        clear_ptr->type,
-                                        clear_ptr->addr,
-                                        H5C__FLUSH_CLEAR_ONLY_FLAG,
-                                        &first_flush,
-                                        TRUE) < 0 ) {
+                if (H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, clear_ptr->type,
+                                           clear_ptr->addr, H5C__FLUSH_CLEAR_ONLY_FLAG, &first_flush,
+                                           TRUE) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
+                }
             }
-        } else {
+            else {
 
-            entry_ptr = entry_ptr->next;
+                entry_ptr = entry_ptr->next;
+            }
         }
-    }
 
 #if H5C_DO_SANITY_CHECKS
-    HDassert( entries_cleared == pinned_entries_marked + other_entries_marked );
-    HDassert( entries_cleared + protected_entries_marked == ce_array_len );
+        HDassert(entries_cleared == pinned_entries_marked + other_entries_marked);
+        HDassert(entries_cleared + protected_entries_marked == ce_array_len);
 #endif /* H5C_DO_SANITY_CHECKS */
 
-    HDassert( ( entries_cleared == ce_array_len ) ||
-              ( (ce_array_len - entries_cleared) <= cache_ptr->pl_len ) );
+        HDassert((entries_cleared == ce_array_len) ||
+                 ((ce_array_len - entries_cleared) <= cache_ptr->pl_len));
 
 #if H5C_DO_SANITY_CHECKS
-    i = 0;
-    entry_ptr = cache_ptr->pl_head_ptr;
-    while ( entry_ptr != NULL )
-    {
-        if ( entry_ptr->clear_on_unprotect ) {
+        i         = 0;
+        entry_ptr = cache_ptr->pl_head_ptr;
+        while (entry_ptr != NULL) {
+            if (entry_ptr->clear_on_unprotect) {
 
-            i++;
+                i++;
+            }
+            entry_ptr = entry_ptr->next;
         }
-        entry_ptr = entry_ptr->next;
-    }
-    HDassert( (entries_cleared + i) == ce_array_len );
+        HDassert((entries_cleared + i) == ce_array_len);
 #endif /* H5C_DO_SANITY_CHECKS */
 #endif /* modified code */
 
 done:
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+        if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HDassert(0);
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
+            HDassert(0);
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
         }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C_mark_entries_as_clean() */
+    }  /* H5C_mark_entries_as_clean() */
 #endif /* H5_HAVE_PARALLEL */
 
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_mark_entry_dirty
+     *
+     * Purpose:    Mark a pinned or protected entry as dirty.  The target entry
+     *         MUST be either pinned or protected, and MAY be both.
+     *
+     *         In the protected case, this call is the functional
+     *         equivalent of setting the H5C__DIRTIED_FLAG on an unprotect
+     *         call.
+     *
+     *         In the pinned but not protected case, if the entry is not
+     *         already dirty, the function places function marks the entry
+     *         dirty and places it on the skip list.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              5/15/06
+     *
+     *         JRM -- 11/5/08
+     *         Added call to H5C__UPDATE_INDEX_FOR_ENTRY_DIRTY() to
+     *         update the new clean_index_size and dirty_index_size
+     *         fields of H5C_t in the case that the entry was clean
+     *         prior to this call, and is pinned and not protected.
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_mark_entry_dirty(void *thing)
+    {
+        H5C_t *            cache_ptr;
+        H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)thing;
+        herr_t             ret_value = SUCCEED; /* Return value */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_mark_entry_dirty
- *
- * Purpose:    Mark a pinned or protected entry as dirty.  The target entry
- *         MUST be either pinned or protected, and MAY be both.
- *
- *         In the protected case, this call is the functional
- *         equivalent of setting the H5C__DIRTIED_FLAG on an unprotect
- *         call.
- *
- *         In the pinned but not protected case, if the entry is not
- *         already dirty, the function places function marks the entry
- *         dirty and places it on the skip list.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              5/15/06
- *
- *         JRM -- 11/5/08
- *         Added call to H5C__UPDATE_INDEX_FOR_ENTRY_DIRTY() to
- *         update the new clean_index_size and dirty_index_size
- *         fields of H5C_t in the case that the entry was clean
- *         prior to this call, and is pinned and not protected.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_mark_entry_dirty(void *thing)
-{
-    H5C_t *             cache_ptr;
-    H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
-    herr_t              ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    /* Sanity checks */
-    HDassert(entry_ptr);
-    HDassert(H5F_addr_defined(entry_ptr->addr));
-    cache_ptr = entry_ptr->cache_ptr;
-    HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        /* Sanity checks */
+        HDassert(entry_ptr);
+        HDassert(H5F_addr_defined(entry_ptr->addr));
+        cache_ptr = entry_ptr->cache_ptr;
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if ( entry_ptr->is_protected ) {
-    HDassert( ! ((entry_ptr)->is_read_only) );
+        if (entry_ptr->is_protected) {
+            HDassert(!((entry_ptr)->is_read_only));
 
-        /* set the dirtied flag */
-        entry_ptr->dirtied = TRUE;
+            /* set the dirtied flag */
+            entry_ptr->dirtied = TRUE;
+        }
+        else if (entry_ptr->is_pinned) {
+            hbool_t was_pinned_unprotected_and_clean;
 
-    } else if ( entry_ptr->is_pinned ) {
-        hbool_t        was_pinned_unprotected_and_clean;
+            was_pinned_unprotected_and_clean = !(entry_ptr->is_dirty);
 
-    was_pinned_unprotected_and_clean = ! ( entry_ptr->is_dirty );
+            /* mark the entry as dirty if it isn't already */
+            entry_ptr->is_dirty = TRUE;
 
-        /* mark the entry as dirty if it isn't already */
-        entry_ptr->is_dirty = TRUE;
+            if (was_pinned_unprotected_and_clean) {
 
-    if ( was_pinned_unprotected_and_clean ) {
+                H5C__UPDATE_INDEX_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr);
+            }
 
-        H5C__UPDATE_INDEX_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr);
-    }
+            if (!(entry_ptr->in_slist)) {
 
-        if ( ! (entry_ptr->in_slist) ) {
+                H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+            }
 
-            H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+            H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
         }
+        else {
 
-        H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
-
-    } else {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, \
-                    "Entry is neither pinned nor protected??")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "Entry is neither pinned nor protected??")
+        }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_mark_entry_dirty() */
+        FUNC_LEAVE_NOAPI(ret_value)
+    } /* H5C_mark_entry_dirty() */
 
-
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C_move_entry
- *
- * Purpose:     Use this function to notify the cache that an entry's
- *              file address changed.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              6/2/04
- *
- *              JRM -- 11/5/08
- *              On review this function looks like no change is needed to
- *              support the new clean_index_size and dirty_index_size
- *              fields of H5C_t.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_move_entry(H5C_t *         cache_ptr,
-                 const H5C_class_t * type,
-                 haddr_t          old_addr,
-            haddr_t          new_addr)
-{
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C_move_entry
+     *
+     * Purpose:     Use this function to notify the cache that an entry's
+     *              file address changed.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              6/2/04
+     *
+     *              JRM -- 11/5/08
+     *              On review this function looks like no change is needed to
+     *              support the new clean_index_size and dirty_index_size
+     *              fields of H5C_t.
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_move_entry(H5C_t * cache_ptr, const H5C_class_t *type, haddr_t old_addr, haddr_t new_addr)
+    {
 #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
-    hbool_t            was_dirty;
+        hbool_t was_dirty;
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
-    H5C_cache_entry_t *    entry_ptr = NULL;
-    H5C_cache_entry_t *    test_entry_ptr = NULL;
+        H5C_cache_entry_t *entry_ptr      = NULL;
+        H5C_cache_entry_t *test_entry_ptr = NULL;
 #if H5C_DO_SANITY_CHECKS
-    hbool_t            removed_entry_from_slist = FALSE;
-#endif /* H5C_DO_SANITY_CHECKS */
-    herr_t            ret_value = SUCCEED;      /* Return value */
+        hbool_t removed_entry_from_slist = FALSE;
+#endif                              /* H5C_DO_SANITY_CHECKS */
+        herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( type );
-    HDassert( H5F_addr_defined(old_addr) );
-    HDassert( H5F_addr_defined(new_addr) );
-    HDassert( H5F_addr_ne(old_addr, new_addr) );
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(type);
+        HDassert(H5F_addr_defined(old_addr));
+        HDassert(H5F_addr_defined(new_addr));
+        HDassert(H5F_addr_ne(old_addr, new_addr));
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+        if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
         }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    H5C__SEARCH_INDEX(cache_ptr, old_addr, entry_ptr, FAIL)
-
-    if ( ( entry_ptr == NULL ) || ( entry_ptr->type != type ) ) {
+        H5C__SEARCH_INDEX(cache_ptr, old_addr, entry_ptr, FAIL)
 
-        /* the old item doesn't exist in the cache, so we are done. */
-        HGOTO_DONE(SUCCEED)
-    }
+        if ((entry_ptr == NULL) || (entry_ptr->type != type)) {
 
-    HDassert( entry_ptr->addr == old_addr );
-    HDassert( entry_ptr->type == type );
+            /* the old item doesn't exist in the cache, so we are done. */
+            HGOTO_DONE(SUCCEED)
+        }
 
-    if ( entry_ptr->is_protected ) {
+        HDassert(entry_ptr->addr == old_addr);
+        HDassert(entry_ptr->type == type);
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, \
-            "Target entry is protected.")
-    }
+        if (entry_ptr->is_protected) {
 
-    H5C__SEARCH_INDEX(cache_ptr, new_addr, test_entry_ptr, FAIL)
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, "Target entry is protected.")
+        }
 
-    if ( test_entry_ptr != NULL ) { /* we are hosed */
+        H5C__SEARCH_INDEX(cache_ptr, new_addr, test_entry_ptr, FAIL)
 
-        if ( test_entry_ptr->type == type ) {
+        if (test_entry_ptr != NULL) { /* we are hosed */
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, \
-                        "Target already moved & reinserted???.")
+            if (test_entry_ptr->type == type) {
 
-        } else {
-
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, \
-                        "New address already in use?.")
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, "Target already moved & reinserted???.")
+            }
+            else {
 
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, "New address already in use?.")
+            }
         }
-    }
 
-    /* If we get this far we have work to do.  Remove *entry_ptr from
-     * the hash table (and skip list if necessary), change its address to the
-     * new address, mark it as dirty (if it isn't already) and then re-insert.
-     *
-     * Update the replacement policy for a hit to avoid an eviction before
-     * the moved entry is touched.  Update stats for a move.
-     *
-     * Note that we do not check the size of the cache, or evict anything.
-     * Since this is a simple re-name, cache size should be unaffected.
-     *
-     * Check to see if the target entry is in the process of being destroyed
-     * before we delete from the index, etc.  If it is, all we do is
-     * change the addr.  If the entry is only in the process of being flushed,
-     * don't mark it as dirty either, lest we confuse the flush call back.
-     */
+        /* If we get this far we have work to do.  Remove *entry_ptr from
+         * the hash table (and skip list if necessary), change its address to the
+         * new address, mark it as dirty (if it isn't already) and then re-insert.
+         *
+         * Update the replacement policy for a hit to avoid an eviction before
+         * the moved entry is touched.  Update stats for a move.
+         *
+         * Note that we do not check the size of the cache, or evict anything.
+         * Since this is a simple re-name, cache size should be unaffected.
+         *
+         * Check to see if the target entry is in the process of being destroyed
+         * before we delete from the index, etc.  If it is, all we do is
+         * change the addr.  If the entry is only in the process of being flushed,
+         * don't mark it as dirty either, lest we confuse the flush call back.
+         */
 
-    if ( ! ( entry_ptr->destroy_in_progress ) ) {
+        if (!(entry_ptr->destroy_in_progress)) {
 
-        H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
+            H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
 
-        if ( entry_ptr->in_slist ) {
+            if (entry_ptr->in_slist) {
 
-            HDassert( cache_ptr->slist_ptr );
+                HDassert(cache_ptr->slist_ptr);
 
-            H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
+                H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
 
 #if H5C_DO_SANITY_CHECKS
 
-            removed_entry_from_slist = TRUE;
+                removed_entry_from_slist = TRUE;
 
 #endif /* H5C_DO_SANITY_CHECKS */
+            }
         }
-    }
 
-    entry_ptr->addr = new_addr;
+        entry_ptr->addr = new_addr;
 
-    if ( ! ( entry_ptr->destroy_in_progress ) ) {
+        if (!(entry_ptr->destroy_in_progress)) {
 
 #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
-        was_dirty = entry_ptr->is_dirty;
+            was_dirty = entry_ptr->is_dirty;
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-    if ( ! ( entry_ptr->flush_in_progress ) ) {
+            if (!(entry_ptr->flush_in_progress)) {
 
-            entry_ptr->is_dirty = TRUE;
-    }
+                entry_ptr->is_dirty = TRUE;
+            }
 
-        H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL)
+            H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL)
 
-    if ( ! ( entry_ptr->flush_in_progress ) ) {
+            if (!(entry_ptr->flush_in_progress)) {
 
-            H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+                H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
 
 #if H5C_DO_SANITY_CHECKS
 
-            if ( removed_entry_from_slist ) {
+                if (removed_entry_from_slist) {
 
-        /* we just removed the entry from the slist.  Thus we
-        * must touch up cache_ptr->slist_len_increase and
-        * cache_ptr->slist_size_increase to keep from skewing
-        * the sanity checks.
-        */
-        HDassert( cache_ptr->slist_len_increase > 1 );
-        HDassert( cache_ptr->slist_size_increase > entry_ptr->size );
+                    /* we just removed the entry from the slist.  Thus we
+                     * must touch up cache_ptr->slist_len_increase and
+                     * cache_ptr->slist_size_increase to keep from skewing
+                     * the sanity checks.
+                     */
+                    HDassert(cache_ptr->slist_len_increase > 1);
+                    HDassert(cache_ptr->slist_size_increase > entry_ptr->size);
 
-        cache_ptr->slist_len_increase -= 1;
-        cache_ptr->slist_size_increase -= entry_ptr->size;
-        }
+                    cache_ptr->slist_len_increase -= 1;
+                    cache_ptr->slist_size_increase -= entry_ptr->size;
+                }
 
 #endif /* H5C_DO_SANITY_CHECKS */
 
-            H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, FAIL)
-    }
-    }
+                H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, FAIL)
+            }
+        }
 
-    H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, entry_ptr)
+        H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, entry_ptr)
 
 done:
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+        if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
         }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_move_entry() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C_move_entry() */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_resize_entry
- *
- * Purpose:    Resize a pinned or protected entry.
- *
- *         Resizing an entry dirties it, so if the entry is not
- *         already dirty, the function places the entry on the
- *         skip list.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              7/5/06
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_resize_entry(void *thing, size_t new_size)
-{
-    H5C_t             * cache_ptr;
-    H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_resize_entry
+     *
+     * Purpose:    Resize a pinned or protected entry.
+     *
+     *         Resizing an entry dirties it, so if the entry is not
+     *         already dirty, the function places the entry on the
+     *         skip list.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              7/5/06
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_resize_entry(void *thing, size_t new_size)
+    {
+        H5C_t *            cache_ptr;
+        H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)thing;
+        herr_t             ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    /* Sanity checks */
-    HDassert(entry_ptr);
-    HDassert(H5F_addr_defined(entry_ptr->addr));
-    cache_ptr = entry_ptr->cache_ptr;
-    HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        /* Sanity checks */
+        HDassert(entry_ptr);
+        HDassert(H5F_addr_defined(entry_ptr->addr));
+        cache_ptr = entry_ptr->cache_ptr;
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    /* Check for usage errors */
-    if(new_size <= 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "New size is non-positive.")
-    if(!(entry_ptr->is_pinned || entry_ptr->is_protected))
-        HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, FAIL, "Entry isn't pinned or protected??")
+        /* Check for usage errors */
+        if (new_size <= 0)
+            HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "New size is non-positive.")
+        if (!(entry_ptr->is_pinned || entry_ptr->is_protected))
+            HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, FAIL, "Entry isn't pinned or protected??")
 
-    /* update for change in entry size if necessary */
-    if ( entry_ptr->size != new_size ) {
-        hbool_t        was_clean;
+        /* update for change in entry size if necessary */
+        if (entry_ptr->size != new_size) {
+            hbool_t was_clean;
 
-        /* make note of whether the entry was clean to begin with */
-        was_clean = ! ( entry_ptr->is_dirty );
+            /* make note of whether the entry was clean to begin with */
+            was_clean = !(entry_ptr->is_dirty);
 
-        /* mark the entry as dirty if it isn't already */
-        entry_ptr->is_dirty = TRUE;
+            /* mark the entry as dirty if it isn't already */
+            entry_ptr->is_dirty = TRUE;
 
-        /* do a flash cache size increase if appropriate */
-        if ( cache_ptr->flash_size_increase_possible ) {
+            /* do a flash cache size increase if appropriate */
+            if (cache_ptr->flash_size_increase_possible) {
 
-            if ( new_size > entry_ptr->size ) {
-                size_t                 size_increase;
+                if (new_size > entry_ptr->size) {
+                    size_t size_increase;
 
-                size_increase = new_size - entry_ptr->size;
+                    size_increase = new_size - entry_ptr->size;
 
-                if(size_increase >= cache_ptr->flash_size_increase_threshold) {
-                    if(H5C__flash_increase_cache_size(cache_ptr, entry_ptr->size, new_size) < 0)
-                        HGOTO_ERROR(H5E_CACHE, H5E_CANTRESIZE, FAIL, "flash cache increase failed")
+                    if (size_increase >= cache_ptr->flash_size_increase_threshold) {
+                        if (H5C__flash_increase_cache_size(cache_ptr, entry_ptr->size, new_size) < 0)
+                            HGOTO_ERROR(H5E_CACHE, H5E_CANTRESIZE, FAIL, "flash cache increase failed")
+                    }
                 }
             }
-        }
 
-        /* update the pinned and/or protected entry list */
-        if(entry_ptr->is_pinned) {
-            H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pel_len), \
-                                            (cache_ptr->pel_size), \
-                                            (entry_ptr->size), (new_size))
-        } /* end if */
-        if(entry_ptr->is_protected) {
-            H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pl_len), \
-                                            (cache_ptr->pl_size), \
-                                            (entry_ptr->size), (new_size))
-        } /* end if */
+            /* update the pinned and/or protected entry list */
+            if (entry_ptr->is_pinned) {
+                H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pel_len), (cache_ptr->pel_size),
+                                                (entry_ptr->size), (new_size))
+            } /* end if */
+            if (entry_ptr->is_protected) {
+                H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pl_len), (cache_ptr->pl_size), (entry_ptr->size),
+                                                (new_size))
+            } /* end if */
 
-        /* update the hash table */
-    H5C__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
-                                          (new_size), (entry_ptr), (was_clean));
+            /* update the hash table */
+            H5C__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size), (new_size), (entry_ptr),
+                                              (was_clean));
 
-        /* if the entry is in the skip list, update that too */
-        if ( entry_ptr->in_slist ) {
-        H5C__UPDATE_SLIST_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
-                                              (new_size));
-        } /* end if */
+            /* if the entry is in the skip list, update that too */
+            if (entry_ptr->in_slist) {
+                H5C__UPDATE_SLIST_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size), (new_size));
+            } /* end if */
 
-        /* update statistics just before changing the entry size */
-    H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
-                                                (new_size));
+            /* update statistics just before changing the entry size */
+            H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), (new_size));
 
-    /* finally, update the entry size proper */
-    entry_ptr->size = new_size;
+            /* finally, update the entry size proper */
+            entry_ptr->size = new_size;
 
-        if(!entry_ptr->in_slist) {
-            H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
-        } /* end if */
+            if (!entry_ptr->in_slist) {
+                H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+            } /* end if */
 
-        if(entry_ptr->is_pinned) {
-            H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
-        } /* end if */
-    } /* end if */
+            if (entry_ptr->is_pinned) {
+                H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
+            } /* end if */
+        }     /* end if */
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_resize_entry() */
+        FUNC_LEAVE_NOAPI(ret_value)
+    } /* H5C_resize_entry() */
 
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_pin_protected_entry()
+     *
+     * Purpose:    Pin a protected cache entry.  The entry must be protected
+     *         at the time of call, and must be unpinned.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              4/26/06
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_pin_protected_entry(void *thing)
+    {
+        H5C_t *            cache_ptr;
+        H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)thing; /* Pointer to entry to pin */
+        herr_t             ret_value = SUCCEED;                    /* Return value */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_pin_protected_entry()
- *
- * Purpose:    Pin a protected cache entry.  The entry must be protected
- *         at the time of call, and must be unpinned.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              4/26/06
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_pin_protected_entry(void *thing)
-{
-    H5C_t             * cache_ptr;
-    H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing; /* Pointer to entry to pin */
-    herr_t              ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    /* Sanity checks */
-    HDassert(entry_ptr);
-    HDassert(H5F_addr_defined(entry_ptr->addr));
-    cache_ptr = entry_ptr->cache_ptr;
-    HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        /* Sanity checks */
+        HDassert(entry_ptr);
+        HDassert(H5F_addr_defined(entry_ptr->addr));
+        cache_ptr = entry_ptr->cache_ptr;
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if ( ! ( entry_ptr->is_protected ) ) {
+        if (!(entry_ptr->is_protected)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, "Entry isn't protected")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, "Entry isn't protected")
+        }
 
-    if ( entry_ptr->is_pinned ) {
+        if (entry_ptr->is_pinned) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, "Entry is already pinned")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, "Entry is already pinned")
+        }
 
-    entry_ptr->is_pinned = TRUE;
+        entry_ptr->is_pinned = TRUE;
 
-    H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
+        H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C_pin_protected_entry() */
+    } /* H5C_pin_protected_entry() */
 
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_protect
+     *
+     * Purpose:     If the target entry is not in the cache, load it.  If
+     *        necessary, attempt to evict one or more entries to keep
+     *        the cache within its maximum size.
+     *
+     *        Mark the target entry as protected, and return its address
+     *        to the caller.  The caller must call H5C_unprotect() when
+     *        finished with the entry.
+     *
+     *        While it is protected, the entry may not be either evicted
+     *        or flushed -- nor may it be accessed by another call to
+     *        H5C_protect.  Any attempt to do so will result in a failure.
+     *
+     *        The primary_dxpl_id and secondary_dxpl_id parameters
+     *        specify the dxpl_ids used on the first write occasioned
+     *        by the insertion (primary_dxpl_id), and on all subsequent
+     *        writes (secondary_dxpl_id).  This is useful in the
+     *        metadata cache, but may not be needed elsewhere.  If so,
+     *        just use the same dxpl_id for both parameters.
+     *
+     *        All reads are performed with the primary_dxpl_id.
+     *
+     *        Similarly, the primary_dxpl_id is passed to the
+     *        check_write_permitted function if it is called.
+     *
+     * Return:      Success:        Ptr to the desired entry
+     *              Failure:        NULL
+     *
+     * Programmer:  John Mainzer -  6/2/04
+     *
+     *         JRM -- 11/13/08
+     *         Modified function to call H5C_make_space_in_cache() when
+     *         the min_clean_size is violated, not just when there isn't
+     *         enough space for and entry that has just been loaded.
+     *
+     *              The purpose of this modification is to avoid "metadata
+     *              blizzards" in the write only case.  In such instances,
+     *              the cache was allowed to fill with dirty metadata.  When
+     *              we finally needed to evict an entry to make space, we had
+     *              to flush out a whole cache full of metadata -- which has
+     *              interesting performance effects.  We hope to avoid (or
+     *              perhaps more accurately hide) this effect by maintaining
+     *              the min_clean_size, which should force us to start flushing
+     *              entries long before we actually have to evict something
+     *              to make space.
+     *
+     *-------------------------------------------------------------------------
+     */
+    void *H5C_protect(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type,
+                      haddr_t addr, void *udata, unsigned flags)
+    {
+        H5C_t *            cache_ptr;
+        hbool_t            hit;
+        hbool_t            first_flush;
+        hbool_t            have_write_permitted = FALSE;
+        hbool_t            read_only            = FALSE;
+        hbool_t            write_permitted;
+        herr_t             result;
+        size_t             empty_space;
+        void *             thing;
+        H5C_cache_entry_t *entry_ptr;
+        void *             ret_value; /* Return value */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_protect
- *
- * Purpose:     If the target entry is not in the cache, load it.  If
- *        necessary, attempt to evict one or more entries to keep
- *        the cache within its maximum size.
- *
- *        Mark the target entry as protected, and return its address
- *        to the caller.  The caller must call H5C_unprotect() when
- *        finished with the entry.
- *
- *        While it is protected, the entry may not be either evicted
- *        or flushed -- nor may it be accessed by another call to
- *        H5C_protect.  Any attempt to do so will result in a failure.
- *
- *        The primary_dxpl_id and secondary_dxpl_id parameters
- *        specify the dxpl_ids used on the first write occasioned
- *        by the insertion (primary_dxpl_id), and on all subsequent
- *        writes (secondary_dxpl_id).  This is useful in the
- *        metadata cache, but may not be needed elsewhere.  If so,
- *        just use the same dxpl_id for both parameters.
- *
- *        All reads are performed with the primary_dxpl_id.
- *
- *        Similarly, the primary_dxpl_id is passed to the
- *        check_write_permitted function if it is called.
- *
- * Return:      Success:        Ptr to the desired entry
- *              Failure:        NULL
- *
- * Programmer:  John Mainzer -  6/2/04
- *
- *         JRM -- 11/13/08
- *         Modified function to call H5C_make_space_in_cache() when
- *         the min_clean_size is violated, not just when there isn't
- *         enough space for and entry that has just been loaded.
- *
- *              The purpose of this modification is to avoid "metadata
- *              blizzards" in the write only case.  In such instances,
- *              the cache was allowed to fill with dirty metadata.  When
- *              we finally needed to evict an entry to make space, we had
- *              to flush out a whole cache full of metadata -- which has
- *              interesting performance effects.  We hope to avoid (or
- *              perhaps more accurately hide) this effect by maintaining
- *              the min_clean_size, which should force us to start flushing
- *              entries long before we actually have to evict something
- *              to make space.
- *
- *-------------------------------------------------------------------------
- */
-void *
-H5C_protect(H5F_t *        f,
-            hid_t            primary_dxpl_id,
-            hid_t            secondary_dxpl_id,
-            const H5C_class_t * type,
-            haddr_t             addr,
-            void *              udata,
-        unsigned        flags)
-{
-    H5C_t *        cache_ptr;
-    hbool_t        hit;
-    hbool_t        first_flush;
-    hbool_t        have_write_permitted = FALSE;
-    hbool_t        read_only = FALSE;
-    hbool_t        write_permitted;
-    herr_t        result;
-    size_t        empty_space;
-    void *        thing;
-    H5C_cache_entry_t *    entry_ptr;
-    void *        ret_value;      /* Return value */
-
-    FUNC_ENTER_NOAPI(NULL)
+        FUNC_ENTER_NOAPI(NULL)
 
-    /* check args */
-    HDassert( f );
-    HDassert( f->shared );
+        /* check args */
+        HDassert(f);
+        HDassert(f->shared);
 
-    cache_ptr = f->shared->cache;
+        cache_ptr = f->shared->cache;
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( type );
-    HDassert( type->flush );
-    HDassert( type->load );
-    HDassert( H5F_addr_defined(addr) );
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(type);
+        HDassert(type->flush);
+        HDassert(type->load);
+        HDassert(H5F_addr_defined(addr));
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-    if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+        if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-    HDassert(0);
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, \
-                    "LRU sanity check failed.\n");
-    }
+            HDassert(0);
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, "LRU sanity check failed.\n");
+        }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    if ( (flags & H5C__READ_ONLY_FLAG) != 0 )
-    {
-    read_only = TRUE;
-    }
-
-    /* first check to see if the target is in cache */
-    H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, NULL)
+        if ((flags & H5C__READ_ONLY_FLAG) != 0) {
+            read_only = TRUE;
+        }
 
-    if ( entry_ptr != NULL ) {
+        /* first check to see if the target is in cache */
+        H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, NULL)
 
-        /* Check for trying to load the wrong type of entry from an address */
-        if(entry_ptr->type != type)
-            HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, NULL, "incorrect cache entry type")
+        if (entry_ptr != NULL) {
 
-        hit = TRUE;
-    thing = (void *)entry_ptr;
+            /* Check for trying to load the wrong type of entry from an address */
+            if (entry_ptr->type != type)
+                HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, NULL, "incorrect cache entry type")
 
-    } else {
+            hit   = TRUE;
+            thing = (void *)entry_ptr;
+        }
+        else {
 
-        /* must try to load the entry from disk. */
+            /* must try to load the entry from disk. */
 
-        hit = FALSE;
+            hit = FALSE;
 
-        thing = H5C_load_entry(f, primary_dxpl_id, type, addr, udata);
+            thing = H5C_load_entry(f, primary_dxpl_id, type, addr, udata);
 
-        if ( thing == NULL ) {
+            if (thing == NULL) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, "can't load entry")
-        }
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, "can't load entry")
+            }
 
-        entry_ptr = (H5C_cache_entry_t *)thing;
+            entry_ptr = (H5C_cache_entry_t *)thing;
 
-        /* If the entry is very large, and we are configured to allow it,
-         * we may wish to perform a flash cache size increase.
-         */
-        if ( ( cache_ptr->flash_size_increase_possible ) &&
-             ( entry_ptr->size > cache_ptr->flash_size_increase_threshold ) ) {
-
-            result = H5C__flash_increase_cache_size(cache_ptr, 0,
-                                                     entry_ptr->size);
+            /* If the entry is very large, and we are configured to allow it,
+             * we may wish to perform a flash cache size increase.
+             */
+            if ((cache_ptr->flash_size_increase_possible) &&
+                (entry_ptr->size > cache_ptr->flash_size_increase_threshold)) {
 
-            if ( result < 0 ) {
+                result = H5C__flash_increase_cache_size(cache_ptr, 0, entry_ptr->size);
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                            "H5C__flash_increase_cache_size failed.")
-             }
-        }
+                if (result < 0) {
 
-        if ( cache_ptr->index_size >= cache_ptr->max_cache_size ) {
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "H5C__flash_increase_cache_size failed.")
+                }
+            }
 
-           empty_space = 0;
+            if (cache_ptr->index_size >= cache_ptr->max_cache_size) {
 
-        } else {
+                empty_space = 0;
+            }
+            else {
 
-           empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+                empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+            }
 
-        }
+            /* try to free up if necceary and if evictions are permitted.  Note
+             * that if evictions are enabled, we will call H5C_make_space_in_cache()
+             * regardless if the min_free_space requirement is not met.
+             */
 
-    /* try to free up if necceary and if evictions are permitted.  Note
-    * that if evictions are enabled, we will call H5C_make_space_in_cache()
-    * regardless if the min_free_space requirement is not met.
-    */
+            if ((cache_ptr->evictions_enabled) &&
+                (((cache_ptr->index_size + entry_ptr->size) > cache_ptr->max_cache_size) ||
+                 ((empty_space + cache_ptr->clean_index_size) < cache_ptr->min_clean_size))) {
 
-        if ( ( cache_ptr->evictions_enabled ) &&
-             ( ( (cache_ptr->index_size + entry_ptr->size) >
-            cache_ptr->max_cache_size)
-        ||
-        ( ( empty_space + cache_ptr->clean_index_size ) <
-            cache_ptr->min_clean_size )
-        )
-           ) {
+                size_t space_needed;
 
-            size_t space_needed;
+                if (empty_space <= entry_ptr->size) {
 
-        if ( empty_space <= entry_ptr->size ) {
+                    cache_ptr->cache_full = TRUE;
+                }
 
-                cache_ptr->cache_full = TRUE;
+                if (cache_ptr->check_write_permitted != NULL) {
 
-        }
+                    result = (cache_ptr->check_write_permitted)(f, primary_dxpl_id, &write_permitted);
 
-            if ( cache_ptr->check_write_permitted != NULL ) {
+                    if (result < 0) {
 
-                result = (cache_ptr->check_write_permitted)(f,
-                                                            primary_dxpl_id,
-                                                            &write_permitted);
+                        HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "Can't get write_permitted 1")
+                    }
+                    else {
 
-                if ( result < 0 ) {
+                        have_write_permitted = TRUE;
 
-                    HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                               "Can't get write_permitted 1")
+                        first_flush = TRUE;
+                    }
+                }
+                else {
 
-                } else {
+                    write_permitted = cache_ptr->write_permitted;
 
                     have_write_permitted = TRUE;
 
                     first_flush = TRUE;
                 }
-            } else {
 
-                write_permitted = cache_ptr->write_permitted;
+                HDassert(entry_ptr->size <= H5C_MAX_ENTRY_SIZE);
 
-                have_write_permitted = TRUE;
+                space_needed = entry_ptr->size;
 
-                first_flush = TRUE;
-            }
+                if (space_needed > cache_ptr->max_cache_size) {
 
-            HDassert( entry_ptr->size <= H5C_MAX_ENTRY_SIZE );
+                    space_needed = cache_ptr->max_cache_size;
+                }
 
-            space_needed = entry_ptr->size;
+                /* Note that space_needed is just the amount of space that
+                 * needed to insert the new entry without exceeding the cache
+                 * size limit.  The subsequent call to H5C_make_space_in_cache()
+                 * may evict the entries required to free more or less space
+                 * depending on conditions.  It MAY be less if the cache is
+                 * currently undersized, or more if the cache is oversized.
+                 *
+                 * The cache can exceed its maximum size limit via the following
+                 * mechanisms:
+                 *
+                 * First, it is possible for the cache to grow without
+                 * bound as long as entries are protected and not unprotected.
+                 *
+                 * Second, when writes are not permitted it is also possible
+                 * for the cache to grow without bound.
+                 *
+                 * Third, the user may choose to disable evictions -- causing
+                 * the cache to grow without bound until evictions are
+                 * re-enabled.
+                 *
+                 * Finally, we usually don't check to see if the cache is
+                 * oversized at the end of an unprotect.  As a result, it is
+                 * possible to have a vastly oversized cache with no protected
+                 * entries as long as all the protects preceed the unprotects.
+                 *
+                 * Since items 1, 2, and 3 are not changing any time soon, I
+                 * see no point in worrying about the fourth.
+                 */
+
+                result = H5C_make_space_in_cache(f, primary_dxpl_id, secondary_dxpl_id, space_needed,
+                                                 write_permitted, &first_flush);
 
-            if ( space_needed > cache_ptr->max_cache_size ) {
+                if (result < 0) {
 
-                space_needed = cache_ptr->max_cache_size;
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "H5C_make_space_in_cache failed 1.")
+                }
             }
 
-            /* Note that space_needed is just the amount of space that
-             * needed to insert the new entry without exceeding the cache
-             * size limit.  The subsequent call to H5C_make_space_in_cache()
-             * may evict the entries required to free more or less space
-             * depending on conditions.  It MAY be less if the cache is
-             * currently undersized, or more if the cache is oversized.
-             *
-             * The cache can exceed its maximum size limit via the following
-             * mechanisms:
-             *
-             * First, it is possible for the cache to grow without
-             * bound as long as entries are protected and not unprotected.
+            /* Insert the entry in the hash table.  It can't be dirty yet, so
+             * we don't even check to see if it should go in the skip list.
              *
-             * Second, when writes are not permitted it is also possible
-             * for the cache to grow without bound.
-        *
-        * Third, the user may choose to disable evictions -- causing
-        * the cache to grow without bound until evictions are
-        * re-enabled.
-             *
-             * Finally, we usually don't check to see if the cache is
-             * oversized at the end of an unprotect.  As a result, it is
-             * possible to have a vastly oversized cache with no protected
-             * entries as long as all the protects preceed the unprotects.
-             *
-             * Since items 1, 2, and 3 are not changing any time soon, I
-             * see no point in worrying about the fourth.
+             * This is no longer true -- due to a bug fix, we may modify
+             * data on load to repair a file.
              */
+            H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, NULL)
 
-            result = H5C_make_space_in_cache(f, primary_dxpl_id,
-                                             secondary_dxpl_id,
-                                             space_needed, write_permitted,
-                                             &first_flush);
+            if ((entry_ptr->is_dirty) && (!(entry_ptr->in_slist))) {
 
-            if ( result < 0 ) {
-
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                            "H5C_make_space_in_cache failed 1.")
+                H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, NULL)
             }
-        }
 
-        /* Insert the entry in the hash table.  It can't be dirty yet, so
-         * we don't even check to see if it should go in the skip list.
-         *
-         * This is no longer true -- due to a bug fix, we may modify
-         * data on load to repair a file.
-         */
-        H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, NULL)
-
-        if ( ( entry_ptr->is_dirty ) && ( ! (entry_ptr->in_slist) ) ) {
-
-            H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, NULL)
+            /* insert the entry in the data structures used by the replacement
+             * policy.  We are just going to take it out again when we update
+             * the replacement policy for a protect, but this simplifies the
+             * code.  If we do this often enough, we may want to optimize this.
+             */
+            H5C__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, NULL)
         }
 
-        /* insert the entry in the data structures used by the replacement
-         * policy.  We are just going to take it out again when we update
-         * the replacement policy for a protect, but this simplifies the
-         * code.  If we do this often enough, we may want to optimize this.
-         */
-        H5C__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, NULL)
-    }
+        HDassert(entry_ptr->addr == addr);
+        HDassert(entry_ptr->type == type);
 
-    HDassert( entry_ptr->addr == addr );
-    HDassert( entry_ptr->type == type );
+        if (entry_ptr->is_protected) {
 
-    if ( entry_ptr->is_protected ) {
+            if ((read_only) && (entry_ptr->is_read_only)) {
 
-    if ( ( read_only ) && ( entry_ptr->is_read_only ) ) {
+                HDassert(entry_ptr->ro_ref_count > 0);
 
-        HDassert( entry_ptr->ro_ref_count > 0 );
+                (entry_ptr->ro_ref_count)++;
+            }
+            else {
 
-        (entry_ptr->ro_ref_count)++;
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "Target already protected & not read only?!?.")
+            }
+        }
+        else {
 
-    } else {
+            H5C__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, NULL)
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                        "Target already protected & not read only?!?.")
-    }
-    } else {
+            entry_ptr->is_protected = TRUE;
 
-        H5C__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, NULL)
+            if (read_only) {
 
-        entry_ptr->is_protected = TRUE;
+                entry_ptr->is_read_only = TRUE;
+                entry_ptr->ro_ref_count = 1;
+            }
 
-    if ( read_only ) {
+            entry_ptr->dirtied = FALSE;
+        }
 
-        entry_ptr->is_read_only = TRUE;
-        entry_ptr->ro_ref_count = 1;
-    }
+        H5C__UPDATE_CACHE_HIT_RATE_STATS(cache_ptr, hit)
 
-        entry_ptr->dirtied = FALSE;
-    }
+        H5C__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)
 
-    H5C__UPDATE_CACHE_HIT_RATE_STATS(cache_ptr, hit)
+        ret_value = thing;
 
-    H5C__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)
+        if ((cache_ptr->evictions_enabled) &&
+            ((cache_ptr->size_decreased) ||
+             ((cache_ptr->resize_enabled) &&
+              (cache_ptr->cache_accesses >= (cache_ptr->resize_ctl).epoch_length)))) {
 
-    ret_value = thing;
+            if (!have_write_permitted) {
 
-    if ( ( cache_ptr->evictions_enabled ) &&
-         ( ( cache_ptr->size_decreased ) ||
-           ( ( cache_ptr->resize_enabled ) &&
-             ( cache_ptr->cache_accesses >=
-               (cache_ptr->resize_ctl).epoch_length ) ) ) ) {
+                if (cache_ptr->check_write_permitted != NULL) {
 
-        if ( ! have_write_permitted ) {
+                    result = (cache_ptr->check_write_permitted)(f, primary_dxpl_id, &write_permitted);
 
-            if ( cache_ptr->check_write_permitted != NULL ) {
+                    if (result < 0) {
 
-                result = (cache_ptr->check_write_permitted)(f,
-                                                            primary_dxpl_id,
-                                                            &write_permitted);
+                        HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "Can't get write_permitted 2")
+                    }
+                    else {
 
-                if ( result < 0 ) {
+                        have_write_permitted = TRUE;
 
-                    HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                               "Can't get write_permitted 2")
+                        first_flush = TRUE;
+                    }
+                }
+                else {
 
-                } else {
+                    write_permitted = cache_ptr->write_permitted;
 
                     have_write_permitted = TRUE;
 
                     first_flush = TRUE;
                 }
-            } else {
-
-                write_permitted = cache_ptr->write_permitted;
-
-                have_write_permitted = TRUE;
-
-                first_flush = TRUE;
             }
-        }
 
-        if ( ( cache_ptr->resize_enabled ) &&
-             ( cache_ptr->cache_accesses >=
-               (cache_ptr->resize_ctl).epoch_length ) ) {
+            if ((cache_ptr->resize_enabled) &&
+                (cache_ptr->cache_accesses >= (cache_ptr->resize_ctl).epoch_length)) {
 
-            result = H5C__auto_adjust_cache_size(f,
-                                                 primary_dxpl_id,
-                                                 secondary_dxpl_id,
-                                                 write_permitted,
-                                                 &first_flush);
-            if ( result != SUCCEED ) {
+                result = H5C__auto_adjust_cache_size(f, primary_dxpl_id, secondary_dxpl_id, write_permitted,
+                                                     &first_flush);
+                if (result != SUCCEED) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                            "Cache auto-resize failed.")
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "Cache auto-resize failed.")
+                }
             }
-        }
 
-        if ( cache_ptr->size_decreased  ) {
+            if (cache_ptr->size_decreased) {
 
-            cache_ptr->size_decreased = FALSE;
+                cache_ptr->size_decreased = FALSE;
 
-            /* check to see if the cache is now oversized due to the cache
-             * size reduction.  If it is, try to evict enough entries to
-             * bring the cache size down to the current maximum cache size.
-        *
-        * Also, if the min_clean_size requirement is not met, we
-        * should also call H5C_make_space_in_cache() to bring us
-        * into complience.
-             */
-
-            if ( cache_ptr->index_size >= cache_ptr->max_cache_size ) {
-
-               empty_space = 0;
+                /* check to see if the cache is now oversized due to the cache
+                 * size reduction.  If it is, try to evict enough entries to
+                 * bring the cache size down to the current maximum cache size.
+                 *
+                 * Also, if the min_clean_size requirement is not met, we
+                 * should also call H5C_make_space_in_cache() to bring us
+                 * into complience.
+                 */
 
-            } else {
+                if (cache_ptr->index_size >= cache_ptr->max_cache_size) {
 
-               empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+                    empty_space = 0;
+                }
+                else {
 
-            }
+                    empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+                }
 
-            if ( ( cache_ptr->index_size > cache_ptr->max_cache_size )
-            ||
-            ( ( empty_space + cache_ptr->clean_index_size ) <
-            cache_ptr->min_clean_size) ) {
+                if ((cache_ptr->index_size > cache_ptr->max_cache_size) ||
+                    ((empty_space + cache_ptr->clean_index_size) < cache_ptr->min_clean_size)) {
 
-        if ( cache_ptr->index_size > cache_ptr->max_cache_size ) {
+                    if (cache_ptr->index_size > cache_ptr->max_cache_size) {
 
-                    cache_ptr->cache_full = TRUE;
-        }
+                        cache_ptr->cache_full = TRUE;
+                    }
 
-                result = H5C_make_space_in_cache(f, primary_dxpl_id,
-                                                 secondary_dxpl_id,
-                                                 (size_t)0, write_permitted,
-                                                 &first_flush);
+                    result = H5C_make_space_in_cache(f, primary_dxpl_id, secondary_dxpl_id, (size_t)0,
+                                                     write_permitted, &first_flush);
 
-                if ( result < 0 ) {
+                    if (result < 0) {
 
-                    HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                                "H5C_make_space_in_cache failed 2.")
+                        HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "H5C_make_space_in_cache failed 2.")
+                    }
                 }
             }
         }
-    }
 
 done:
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+        if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, \
-                            "LRU sanity check failed.\n");
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, "LRU sanity check failed.\n");
         }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_protect() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C_protect() */
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C_reset_cache_hit_rate_stats()
- *
- * Purpose:     Reset the cache hit rate computation fields.
- *
- * Return:      SUCCEED on success, and FAIL on failure.
- *
- * Programmer:  John Mainzer, 10/5/04
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_reset_cache_hit_rate_stats(H5C_t * cache_ptr)
-{
-    herr_t    ret_value = SUCCEED;      /* Return value */
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C_reset_cache_hit_rate_stats()
+     *
+     * Purpose:     Reset the cache hit rate computation fields.
+     *
+     * Return:      SUCCEED on success, and FAIL on failure.
+     *
+     * Programmer:  John Mainzer, 10/5/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_reset_cache_hit_rate_stats(H5C_t * cache_ptr)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+        if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
+        }
 
-    cache_ptr->cache_hits        = 0;
-    cache_ptr->cache_accesses        = 0;
+        cache_ptr->cache_hits     = 0;
+        cache_ptr->cache_accesses = 0;
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_reset_cache_hit_rate_stats() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C_reset_cache_hit_rate_stats() */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_set_cache_auto_resize_config
- *
- * Purpose:    Set the cache automatic resize configuration to the
- *        provided values if they are in range, and fail if they
- *        are not.
- *
- *        If the new configuration enables automatic cache resizing,
- *        coerce the cache max size and min clean size into agreement
- *        with the new policy and re-set the full cache hit rate
- *        stats.
- *
- * Return:      SUCCEED on success, and FAIL on failure.
- *
- * Programmer:  John Mainzer
- *        10/8/04
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_set_cache_auto_resize_config(H5C_t *cache_ptr,
-                                 H5C_auto_size_ctl_t *config_ptr)
-{
-    herr_t    result;
-    size_t      new_max_cache_size;
-    size_t      new_min_clean_size;
-    herr_t    ret_value = SUCCEED;      /* Return value */
-
-    FUNC_ENTER_NOAPI(FAIL)
-
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_set_cache_auto_resize_config
+     *
+     * Purpose:    Set the cache automatic resize configuration to the
+     *        provided values if they are in range, and fail if they
+     *        are not.
+     *
+     *        If the new configuration enables automatic cache resizing,
+     *        coerce the cache max size and min clean size into agreement
+     *        with the new policy and re-set the full cache hit rate
+     *        stats.
+     *
+     * Return:      SUCCEED on success, and FAIL on failure.
+     *
+     * Programmer:  John Mainzer
+     *        10/8/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_set_cache_auto_resize_config(H5C_t * cache_ptr, H5C_auto_size_ctl_t * config_ptr)
+    {
+        herr_t result;
+        size_t new_max_cache_size;
+        size_t new_min_clean_size;
+        herr_t ret_value = SUCCEED; /* Return value */
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
-    }
+        FUNC_ENTER_NOAPI(FAIL)
 
-    if ( config_ptr == NULL ) {
+        if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "NULL config_ptr on entry.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
+        }
 
-    if ( config_ptr->version != H5C__CURR_AUTO_SIZE_CTL_VER ) {
+        if (config_ptr == NULL) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown config version.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "NULL config_ptr on entry.")
+        }
 
-    /* check general configuration section of the config: */
-    if ( SUCCEED != H5C_validate_resize_config(config_ptr,
-                                   H5C_RESIZE_CFG__VALIDATE_GENERAL) ) {
+        if (config_ptr->version != H5C__CURR_AUTO_SIZE_CTL_VER) {
 
-        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, \
-                    "error in general configuration fields of new config.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown config version.")
+        }
 
-    /* check size increase control fields of the config: */
-    if ( SUCCEED != H5C_validate_resize_config(config_ptr,
-                                   H5C_RESIZE_CFG__VALIDATE_INCREMENT) ) {
+        /* check general configuration section of the config: */
+        if (SUCCEED != H5C_validate_resize_config(config_ptr, H5C_RESIZE_CFG__VALIDATE_GENERAL)) {
 
-        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, \
-                    "error in the size increase control fields of new config.")
-    }
+            HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "error in general configuration fields of new config.")
+        }
 
-    /* check size decrease control fields of the config: */
-    if ( SUCCEED != H5C_validate_resize_config(config_ptr,
-                                   H5C_RESIZE_CFG__VALIDATE_DECREMENT) ) {
+        /* check size increase control fields of the config: */
+        if (SUCCEED != H5C_validate_resize_config(config_ptr, H5C_RESIZE_CFG__VALIDATE_INCREMENT)) {
 
-        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, \
-                    "error in the size decrease control fields of new config.")
-    }
+            HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL,
+                        "error in the size increase control fields of new config.")
+        }
 
-    /* check for conflicts between size increase and size decrease controls: */
-    if ( SUCCEED != H5C_validate_resize_config(config_ptr,
-                                   H5C_RESIZE_CFG__VALIDATE_INTERACTIONS) ) {
+        /* check size decrease control fields of the config: */
+        if (SUCCEED != H5C_validate_resize_config(config_ptr, H5C_RESIZE_CFG__VALIDATE_DECREMENT)) {
 
-        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, \
-                    "conflicting threshold fields in new config.")
-    }
+            HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL,
+                        "error in the size decrease control fields of new config.")
+        }
 
-    /* will set the increase possible fields to FALSE later if needed */
-    cache_ptr->size_increase_possible       = TRUE;
-    cache_ptr->flash_size_increase_possible = TRUE;
-    cache_ptr->size_decrease_possible       = TRUE;
+        /* check for conflicts between size increase and size decrease controls: */
+        if (SUCCEED != H5C_validate_resize_config(config_ptr, H5C_RESIZE_CFG__VALIDATE_INTERACTIONS)) {
 
-    switch ( config_ptr->incr_mode )
-    {
-        case H5C_incr__off:
-            cache_ptr->size_increase_possible = FALSE;
-            break;
+            HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "conflicting threshold fields in new config.")
+        }
 
-        case H5C_incr__threshold:
-            if ( ( config_ptr->lower_hr_threshold <= (double)0.0f ) ||
-                 ( config_ptr->increment <= (double)1.0f ) ||
-                 ( ( config_ptr->apply_max_increment ) &&
-                   ( config_ptr->max_increment <= 0 ) ) ) {
+        /* will set the increase possible fields to FALSE later if needed */
+        cache_ptr->size_increase_possible       = TRUE;
+        cache_ptr->flash_size_increase_possible = TRUE;
+        cache_ptr->size_decrease_possible       = TRUE;
 
-                 cache_ptr->size_increase_possible = FALSE;
-            }
-            break;
+        switch (config_ptr->incr_mode) {
+            case H5C_incr__off:
+                cache_ptr->size_increase_possible = FALSE;
+                break;
 
-        default: /* should be unreachable */
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown incr_mode?!?!?.")
-    }
+            case H5C_incr__threshold:
+                if ((config_ptr->lower_hr_threshold <= (double)0.0f) ||
+                    (config_ptr->increment <= (double)1.0f) ||
+                    ((config_ptr->apply_max_increment) && (config_ptr->max_increment <= 0))) {
 
-    /* logically, this is were configuration for flash cache size increases
-     * should go.  However, this configuration depends on max_cache_size, so
-     * we wait until the end of the function, when this field is set.
-     */
+                    cache_ptr->size_increase_possible = FALSE;
+                }
+                break;
 
-    switch ( config_ptr->decr_mode )
-    {
-        case H5C_decr__off:
-            cache_ptr->size_decrease_possible = FALSE;
-            break;
+            default: /* should be unreachable */
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown incr_mode?!?!?.")
+        }
 
-        case H5C_decr__threshold:
-            if ( ( config_ptr->upper_hr_threshold >= (double)1.0f ) ||
-                 ( config_ptr->decrement >= (double)1.0f ) ||
-                 ( ( config_ptr->apply_max_decrement ) &&
-                   ( config_ptr->max_decrement <= 0 ) ) ) {
+        /* logically, this is were configuration for flash cache size increases
+         * should go.  However, this configuration depends on max_cache_size, so
+         * we wait until the end of the function, when this field is set.
+         */
 
+        switch (config_ptr->decr_mode) {
+            case H5C_decr__off:
                 cache_ptr->size_decrease_possible = FALSE;
-            }
-            break;
+                break;
 
-        case H5C_decr__age_out:
-            if ( ( ( config_ptr->apply_empty_reserve ) &&
-                   ( config_ptr->empty_reserve >= (double)1.0f ) ) ||
-                 ( ( config_ptr->apply_max_decrement ) &&
-                   ( config_ptr->max_decrement <= 0 ) ) ) {
+            case H5C_decr__threshold:
+                if ((config_ptr->upper_hr_threshold >= (double)1.0f) ||
+                    (config_ptr->decrement >= (double)1.0f) ||
+                    ((config_ptr->apply_max_decrement) && (config_ptr->max_decrement <= 0))) {
 
-                cache_ptr->size_decrease_possible = FALSE;
-            }
-            break;
+                    cache_ptr->size_decrease_possible = FALSE;
+                }
+                break;
 
-        case H5C_decr__age_out_with_threshold:
-            if ( ( ( config_ptr->apply_empty_reserve ) &&
-                   ( config_ptr->empty_reserve >= (double)1.0f ) ) ||
-                 ( ( config_ptr->apply_max_decrement ) &&
-                   ( config_ptr->max_decrement <= 0 ) ) ||
-                 ( config_ptr->upper_hr_threshold >= (double)1.0f ) ) {
+            case H5C_decr__age_out:
+                if (((config_ptr->apply_empty_reserve) && (config_ptr->empty_reserve >= (double)1.0f)) ||
+                    ((config_ptr->apply_max_decrement) && (config_ptr->max_decrement <= 0))) {
 
-                cache_ptr->size_decrease_possible = FALSE;
-            }
-            break;
+                    cache_ptr->size_decrease_possible = FALSE;
+                }
+                break;
 
-        default: /* should be unreachable */
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown decr_mode?!?!?.")
-    }
+            case H5C_decr__age_out_with_threshold:
+                if (((config_ptr->apply_empty_reserve) && (config_ptr->empty_reserve >= (double)1.0f)) ||
+                    ((config_ptr->apply_max_decrement) && (config_ptr->max_decrement <= 0)) ||
+                    (config_ptr->upper_hr_threshold >= (double)1.0f)) {
 
-    if ( config_ptr->max_size == config_ptr->min_size ) {
+                    cache_ptr->size_decrease_possible = FALSE;
+                }
+                break;
 
-        cache_ptr->size_increase_possible = FALSE;
-    cache_ptr->flash_size_increase_possible = FALSE;
-        cache_ptr->size_decrease_possible = FALSE;
-    }
+            default: /* should be unreachable */
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown decr_mode?!?!?.")
+        }
 
-    /* flash_size_increase_possible is intentionally omitted from the
-     * following:
-     */
-    cache_ptr->resize_enabled = cache_ptr->size_increase_possible ||
-                                cache_ptr->size_decrease_possible;
+        if (config_ptr->max_size == config_ptr->min_size) {
 
-    cache_ptr->resize_ctl = *config_ptr;
+            cache_ptr->size_increase_possible       = FALSE;
+            cache_ptr->flash_size_increase_possible = FALSE;
+            cache_ptr->size_decrease_possible       = FALSE;
+        }
 
-    /* Resize the cache to the supplied initial value if requested, or as
-     * necessary to force it within the bounds of the current automatic
-     * cache resizing configuration.
-     *
-     * Note that the min_clean_fraction may have changed, so we
-     * go through the exercise even if the current size is within
-     * range and an initial size has not been provided.
-     */
-    if ( (cache_ptr->resize_ctl).set_initial_size ) {
+        /* flash_size_increase_possible is intentionally omitted from the
+         * following:
+         */
+        cache_ptr->resize_enabled = cache_ptr->size_increase_possible || cache_ptr->size_decrease_possible;
 
-        new_max_cache_size = (cache_ptr->resize_ctl).initial_size;
-    }
-    else if ( cache_ptr->max_cache_size > (cache_ptr->resize_ctl).max_size ) {
+        cache_ptr->resize_ctl = *config_ptr;
 
-        new_max_cache_size = (cache_ptr->resize_ctl).max_size;
-    }
-    else if ( cache_ptr->max_cache_size < (cache_ptr->resize_ctl).min_size ) {
+        /* Resize the cache to the supplied initial value if requested, or as
+         * necessary to force it within the bounds of the current automatic
+         * cache resizing configuration.
+         *
+         * Note that the min_clean_fraction may have changed, so we
+         * go through the exercise even if the current size is within
+         * range and an initial size has not been provided.
+         */
+        if ((cache_ptr->resize_ctl).set_initial_size) {
 
-        new_max_cache_size = (cache_ptr->resize_ctl).min_size;
+            new_max_cache_size = (cache_ptr->resize_ctl).initial_size;
+        }
+        else if (cache_ptr->max_cache_size > (cache_ptr->resize_ctl).max_size) {
 
-    } else {
+            new_max_cache_size = (cache_ptr->resize_ctl).max_size;
+        }
+        else if (cache_ptr->max_cache_size < (cache_ptr->resize_ctl).min_size) {
 
-        new_max_cache_size = cache_ptr->max_cache_size;
-    }
+            new_max_cache_size = (cache_ptr->resize_ctl).min_size;
+        }
+        else {
 
-    new_min_clean_size = (size_t)
-                         ((double)new_max_cache_size *
-                          ((cache_ptr->resize_ctl).min_clean_fraction));
+            new_max_cache_size = cache_ptr->max_cache_size;
+        }
 
+        new_min_clean_size =
+            (size_t)((double)new_max_cache_size * ((cache_ptr->resize_ctl).min_clean_fraction));
 
-    /* since new_min_clean_size is of type size_t, we have
-     *
-     *     ( 0 <= new_min_clean_size )
-     *
-     * by definition.
-     */
-    HDassert( new_min_clean_size <= new_max_cache_size );
-    HDassert( (cache_ptr->resize_ctl).min_size <= new_max_cache_size );
-    HDassert( new_max_cache_size <= (cache_ptr->resize_ctl).max_size );
+        /* since new_min_clean_size is of type size_t, we have
+         *
+         *     ( 0 <= new_min_clean_size )
+         *
+         * by definition.
+         */
+        HDassert(new_min_clean_size <= new_max_cache_size);
+        HDassert((cache_ptr->resize_ctl).min_size <= new_max_cache_size);
+        HDassert(new_max_cache_size <= (cache_ptr->resize_ctl).max_size);
 
-    if ( new_max_cache_size < cache_ptr->max_cache_size ) {
+        if (new_max_cache_size < cache_ptr->max_cache_size) {
 
-        cache_ptr->size_decreased = TRUE;
-    }
+            cache_ptr->size_decreased = TRUE;
+        }
 
-    cache_ptr->max_cache_size = new_max_cache_size;
-    cache_ptr->min_clean_size = new_min_clean_size;
+        cache_ptr->max_cache_size = new_max_cache_size;
+        cache_ptr->min_clean_size = new_min_clean_size;
 
-    if ( H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
+        if (H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED) {
 
-        /* this should be impossible... */
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C_reset_cache_hit_rate_stats failed.")
-    }
+            /* this should be impossible... */
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_reset_cache_hit_rate_stats failed.")
+        }
 
-    /* remove excess epoch markers if any */
-    if ( ( config_ptr->decr_mode == H5C_decr__age_out_with_threshold ) ||
-         ( config_ptr->decr_mode == H5C_decr__age_out ) ) {
+        /* remove excess epoch markers if any */
+        if ((config_ptr->decr_mode == H5C_decr__age_out_with_threshold) ||
+            (config_ptr->decr_mode == H5C_decr__age_out)) {
 
-        if ( cache_ptr->epoch_markers_active >
-             (cache_ptr->resize_ctl).epochs_before_eviction ) {
+            if (cache_ptr->epoch_markers_active > (cache_ptr->resize_ctl).epochs_before_eviction) {
 
-            result =
-                H5C__autoadjust__ageout__remove_excess_markers(cache_ptr);
+                result = H5C__autoadjust__ageout__remove_excess_markers(cache_ptr);
 
-            if ( result != SUCCEED ) {
+                if (result != SUCCEED) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "can't remove excess epoch markers.")
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "can't remove excess epoch markers.")
+                }
             }
         }
-    } else if ( cache_ptr->epoch_markers_active > 0 ) {
+        else if (cache_ptr->epoch_markers_active > 0) {
 
-        result = H5C__autoadjust__ageout__remove_all_markers(cache_ptr);
+            result = H5C__autoadjust__ageout__remove_all_markers(cache_ptr);
 
-        if ( result != SUCCEED ) {
+            if (result != SUCCEED) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "error removing all epoch markers.")
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "error removing all epoch markers.")
+            }
         }
-    }
 
-    /* configure flash size increase facility.  We wait until the
-     * end of the function, as we need the max_cache_size set before
-     * we start to keep things simple.
-     *
-     * If we haven't already ruled out flash cache size increases above,
-     * go ahead and configure it.
-     */
+        /* configure flash size increase facility.  We wait until the
+         * end of the function, as we need the max_cache_size set before
+         * we start to keep things simple.
+         *
+         * If we haven't already ruled out flash cache size increases above,
+         * go ahead and configure it.
+         */
 
-    if ( cache_ptr->flash_size_increase_possible ) {
+        if (cache_ptr->flash_size_increase_possible) {
 
-        switch ( config_ptr->flash_incr_mode )
-        {
-            case H5C_flash_incr__off:
-                cache_ptr->flash_size_increase_possible = FALSE;
-                break;
+            switch (config_ptr->flash_incr_mode) {
+                case H5C_flash_incr__off:
+                    cache_ptr->flash_size_increase_possible = FALSE;
+                    break;
 
-            case H5C_flash_incr__add_space:
-                cache_ptr->flash_size_increase_possible = TRUE;
-                cache_ptr->flash_size_increase_threshold =
-                    (size_t)
-                    (((double)(cache_ptr->max_cache_size)) *
-                     ((cache_ptr->resize_ctl).flash_threshold));
-                break;
+                case H5C_flash_incr__add_space:
+                    cache_ptr->flash_size_increase_possible  = TRUE;
+                    cache_ptr->flash_size_increase_threshold = (size_t)(
+                        ((double)(cache_ptr->max_cache_size)) * ((cache_ptr->resize_ctl).flash_threshold));
+                    break;
 
-            default: /* should be unreachable */
-                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                             "Unknown flash_incr_mode?!?!?.")
-                 break;
+                default: /* should be unreachable */
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown flash_incr_mode?!?!?.")
+                    break;
+            }
         }
-    }
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C_set_cache_auto_resize_config() */
+    } /* H5C_set_cache_auto_resize_config() */
 
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_set_evictions_enabled()
+     *
+     * Purpose:     Set cache_ptr->evictions_enabled to the value of the
+     *              evictions enabled parameter.
+     *
+     * Return:      SUCCEED on success, and FAIL on failure.
+     *
+     * Programmer:  John Mainzer
+     *              7/27/07
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_set_evictions_enabled(H5C_t * cache_ptr, hbool_t evictions_enabled)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_set_evictions_enabled()
- *
- * Purpose:     Set cache_ptr->evictions_enabled to the value of the
- *              evictions enabled parameter.
- *
- * Return:      SUCCEED on success, and FAIL on failure.
- *
- * Programmer:  John Mainzer
- *              7/27/07
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_set_evictions_enabled(H5C_t *cache_ptr,
-                          hbool_t evictions_enabled)
-{
-    herr_t ret_value = SUCCEED;      /* Return value */
-
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+        if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
+        }
 
-    if ( ( evictions_enabled != TRUE ) && ( evictions_enabled != FALSE ) ) {
+        if ((evictions_enabled != TRUE) && (evictions_enabled != FALSE)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "Bad evictions_enabled on entry.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad evictions_enabled on entry.")
+        }
 
-    /* There is no fundamental reason why we should not permit
-     * evictions to be disabled while automatic resize is enabled.
-     * However, I can't think of any good reason why one would
-     * want to, and allowing it would greatly complicate testing
-     * the feature.  Hence the following:
-     */
-    if ( ( evictions_enabled != TRUE ) &&
-         ( ( cache_ptr->resize_ctl.incr_mode != H5C_incr__off ) ||
-    ( cache_ptr->resize_ctl.decr_mode != H5C_decr__off ) ) ) {
+        /* There is no fundamental reason why we should not permit
+         * evictions to be disabled while automatic resize is enabled.
+         * However, I can't think of any good reason why one would
+         * want to, and allowing it would greatly complicate testing
+         * the feature.  Hence the following:
+         */
+        if ((evictions_enabled != TRUE) && ((cache_ptr->resize_ctl.incr_mode != H5C_incr__off) ||
+                                            (cache_ptr->resize_ctl.decr_mode != H5C_decr__off))) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "Can't disable evictions when auto resize enabled.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't disable evictions when auto resize enabled.")
+        }
 
-    cache_ptr->evictions_enabled = evictions_enabled;
+        cache_ptr->evictions_enabled = evictions_enabled;
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C_set_evictions_enabled() */
+    } /* H5C_set_evictions_enabled() */
 
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_set_prefix
+     *
+     * Purpose:     Set the values of the prefix field of H5C_t.  This
+     *        filed is used to label some debugging output.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              1/20/06
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_set_prefix(H5C_t * cache_ptr, char *prefix)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_set_prefix
- *
- * Purpose:     Set the values of the prefix field of H5C_t.  This
- *        filed is used to label some debugging output.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              1/20/06
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_set_prefix(H5C_t * cache_ptr, char * prefix)
-{
-    herr_t ret_value = SUCCEED;   /* Return value */
-
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    if ( ( cache_ptr == NULL ) ||
-         ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ||
-         ( prefix == NULL ) ||
-         ( HDstrlen(prefix) >= H5C__PREFIX_LEN ) ) {
+        if ((cache_ptr == NULL) || (cache_ptr->magic != H5C__H5C_T_MAGIC) || (prefix == NULL) ||
+            (HDstrlen(prefix) >= H5C__PREFIX_LEN)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry.")
+        }
 
-    HDstrncpy(&(cache_ptr->prefix[0]), prefix, (size_t)(H5C__PREFIX_LEN));
+        HDstrncpy(&(cache_ptr->prefix[0]), prefix, (size_t)(H5C__PREFIX_LEN));
 
-    cache_ptr->prefix[H5C__PREFIX_LEN - 1] = '\0';
+        cache_ptr->prefix[H5C__PREFIX_LEN - 1] = '\0';
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_set_prefix() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C_set_prefix() */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_set_trace_file_ptr
- *
- * Purpose:     Set the trace_file_ptr field for the cache.
- *
- *              This field must either be NULL (which turns of trace
- *              file logging), or be a pointer to an open file to which
- *              trace file data is to be written.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              1/20/06
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_set_trace_file_ptr(H5C_t * cache_ptr,
-                       FILE * trace_file_ptr)
-{
-    herr_t        ret_value = SUCCEED;   /* Return value */
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_set_trace_file_ptr
+     *
+     * Purpose:     Set the trace_file_ptr field for the cache.
+     *
+     *              This field must either be NULL (which turns of trace
+     *              file logging), or be a pointer to an open file to which
+     *              trace file data is to be written.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              1/20/06
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_set_trace_file_ptr(H5C_t * cache_ptr, FILE * trace_file_ptr)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    /* This would normally be an assert, but we need to use an HGOTO_ERROR
-     * call to shut up the compiler.
-     */
-    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
+        /* This would normally be an assert, but we need to use an HGOTO_ERROR
+         * call to shut up the compiler.
+         */
+        if ((!cache_ptr) || (cache_ptr->magic != H5C__H5C_T_MAGIC)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr")
+        }
 
-    cache_ptr->trace_file_ptr = trace_file_ptr;
+        cache_ptr->trace_file_ptr = trace_file_ptr;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_set_trace_file_ptr() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C_set_trace_file_ptr() */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_stats
- *
- * Purpose:     Prints statistics about the cache.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              6/2/04
- *
- *        JRM -- 11/13/08
- *        Added code displaying the max_clean_index_size and
- *        max_dirty_index_size.
- *
- *              MAM -- 01/06/09
- *              Added code displaying the calls_to_msic,
- *              total_entries_skipped_in_msic, total_entries_scanned_in_msic,
- *              and max_entries_skipped_in_msic fields.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_stats(H5C_t * cache_ptr,
-          const char *  cache_name,
-          hbool_t
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_stats
+     *
+     * Purpose:     Prints statistics about the cache.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              6/2/04
+     *
+     *        JRM -- 11/13/08
+     *        Added code displaying the max_clean_index_size and
+     *        max_dirty_index_size.
+     *
+     *              MAM -- 01/06/09
+     *              Added code displaying the calls_to_msic,
+     *              total_entries_skipped_in_msic, total_entries_scanned_in_msic,
+     *              and max_entries_skipped_in_msic fields.
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_stats(H5C_t * cache_ptr, const char *cache_name,
+                     hbool_t
 #if !H5C_COLLECT_CACHE_STATS
-          H5_ATTR_UNUSED
+                         H5_ATTR_UNUSED
 #endif /* H5C_COLLECT_CACHE_STATS */
-          display_detailed_stats)
-{
-    herr_t    ret_value = SUCCEED;   /* Return value */
+                             display_detailed_stats)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
 
 #if H5C_COLLECT_CACHE_STATS
-    int        i;
-    int64_t     total_hits = 0;
-    int64_t     total_misses = 0;
-    int64_t    total_write_protects = 0;
-    int64_t    total_read_protects = 0;
-    int64_t    max_read_protects = 0;
-    int64_t     total_insertions = 0;
-    int64_t     total_pinned_insertions = 0;
-    int64_t     total_clears = 0;
-    int64_t     total_flushes = 0;
-    int64_t     total_evictions = 0;
-    int64_t     total_moves = 0;
-    int64_t     total_entry_flush_moves = 0;
-    int64_t     total_cache_flush_moves = 0;
-    int64_t    total_size_increases = 0;
-    int64_t    total_size_decreases = 0;
-    int64_t    total_entry_flush_size_changes = 0;
-    int64_t    total_cache_flush_size_changes = 0;
-    int64_t    total_pins = 0;
-    int64_t    total_unpins = 0;
-    int64_t    total_dirty_pins = 0;
-    int64_t    total_pinned_flushes = 0;
-    int64_t    total_pinned_clears = 0;
-    int32_t     aggregate_max_accesses = 0;
-    int32_t     aggregate_min_accesses = 1000000;
-    int32_t     aggregate_max_clears = 0;
-    int32_t     aggregate_max_flushes = 0;
-    size_t      aggregate_max_size = 0;
-    int32_t    aggregate_max_pins = 0;
-    double      hit_rate;
-    double    average_successful_search_depth = 0.0;
-    double    average_failed_search_depth = 0.0;
-    double      average_entries_skipped_per_calls_to_msic = 0.0;
-    double      average_entries_scanned_per_calls_to_msic = 0.0;
+        int     i;
+        int64_t total_hits                     = 0;
+        int64_t total_misses                   = 0;
+        int64_t total_write_protects           = 0;
+        int64_t total_read_protects            = 0;
+        int64_t max_read_protects              = 0;
+        int64_t total_insertions               = 0;
+        int64_t total_pinned_insertions        = 0;
+        int64_t total_clears                   = 0;
+        int64_t total_flushes                  = 0;
+        int64_t total_evictions                = 0;
+        int64_t total_moves                    = 0;
+        int64_t total_entry_flush_moves        = 0;
+        int64_t total_cache_flush_moves        = 0;
+        int64_t total_size_increases           = 0;
+        int64_t total_size_decreases           = 0;
+        int64_t total_entry_flush_size_changes = 0;
+        int64_t total_cache_flush_size_changes = 0;
+        int64_t total_pins                     = 0;
+        int64_t total_unpins                   = 0;
+        int64_t total_dirty_pins               = 0;
+        int64_t total_pinned_flushes           = 0;
+        int64_t total_pinned_clears            = 0;
+        int32_t aggregate_max_accesses         = 0;
+        int32_t aggregate_min_accesses         = 1000000;
+        int32_t aggregate_max_clears           = 0;
+        int32_t aggregate_max_flushes          = 0;
+        size_t  aggregate_max_size             = 0;
+        int32_t aggregate_max_pins             = 0;
+        double  hit_rate;
+        double  average_successful_search_depth           = 0.0;
+        double  average_failed_search_depth               = 0.0;
+        double  average_entries_skipped_per_calls_to_msic = 0.0;
+        double  average_entries_scanned_per_calls_to_msic = 0.0;
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    /* This would normally be an assert, but we need to use an HGOTO_ERROR
-     * call to shut up the compiler.
-     */
-    if ( ( ! cache_ptr ) ||
-         ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ||
-         ( !cache_name ) ) {
+        /* This would normally be an assert, but we need to use an HGOTO_ERROR
+         * call to shut up the compiler.
+         */
+        if ((!cache_ptr) || (cache_ptr->magic != H5C__H5C_T_MAGIC) || (!cache_name)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr or cache_name")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr or cache_name")
+        }
 
 #if H5C_COLLECT_CACHE_STATS
 
-    for ( i = 0; i <= cache_ptr->max_type_id; i++ ) {
+        for (i = 0; i <= cache_ptr->max_type_id; i++) {
 
-        total_hits              += cache_ptr->hits[i];
-        total_misses            += cache_ptr->misses[i];
-    total_write_protects    += cache_ptr->write_protects[i];
-    total_read_protects    += cache_ptr->read_protects[i];
-    if ( max_read_protects < cache_ptr->max_read_protects[i] ) {
-        max_read_protects = cache_ptr->max_read_protects[i];
-    }
-        total_insertions        += cache_ptr->insertions[i];
-        total_pinned_insertions += cache_ptr->pinned_insertions[i];
-        total_clears            += cache_ptr->clears[i];
-        total_flushes           += cache_ptr->flushes[i];
-        total_evictions         += cache_ptr->evictions[i];
-        total_moves           += cache_ptr->moves[i];
-    total_entry_flush_moves
-                += cache_ptr->entry_flush_moves[i];
-    total_cache_flush_moves
-                += cache_ptr->cache_flush_moves[i];
-        total_size_increases    += cache_ptr->size_increases[i];
-        total_size_decreases    += cache_ptr->size_decreases[i];
-        total_entry_flush_size_changes
-                += cache_ptr->entry_flush_size_changes[i];
-        total_cache_flush_size_changes
-                += cache_ptr->cache_flush_size_changes[i];
-    total_pins              += cache_ptr->pins[i];
-    total_unpins            += cache_ptr->unpins[i];
-    total_dirty_pins        += cache_ptr->dirty_pins[i];
-    total_pinned_flushes    += cache_ptr->pinned_flushes[i];
-    total_pinned_clears     += cache_ptr->pinned_clears[i];
+            total_hits += cache_ptr->hits[i];
+            total_misses += cache_ptr->misses[i];
+            total_write_protects += cache_ptr->write_protects[i];
+            total_read_protects += cache_ptr->read_protects[i];
+            if (max_read_protects < cache_ptr->max_read_protects[i]) {
+                max_read_protects = cache_ptr->max_read_protects[i];
+            }
+            total_insertions += cache_ptr->insertions[i];
+            total_pinned_insertions += cache_ptr->pinned_insertions[i];
+            total_clears += cache_ptr->clears[i];
+            total_flushes += cache_ptr->flushes[i];
+            total_evictions += cache_ptr->evictions[i];
+            total_moves += cache_ptr->moves[i];
+            total_entry_flush_moves += cache_ptr->entry_flush_moves[i];
+            total_cache_flush_moves += cache_ptr->cache_flush_moves[i];
+            total_size_increases += cache_ptr->size_increases[i];
+            total_size_decreases += cache_ptr->size_decreases[i];
+            total_entry_flush_size_changes += cache_ptr->entry_flush_size_changes[i];
+            total_cache_flush_size_changes += cache_ptr->cache_flush_size_changes[i];
+            total_pins += cache_ptr->pins[i];
+            total_unpins += cache_ptr->unpins[i];
+            total_dirty_pins += cache_ptr->dirty_pins[i];
+            total_pinned_flushes += cache_ptr->pinned_flushes[i];
+            total_pinned_clears += cache_ptr->pinned_clears[i];
 #if H5C_COLLECT_CACHE_ENTRY_STATS
-    if ( aggregate_max_accesses < cache_ptr->max_accesses[i] )
-        aggregate_max_accesses = cache_ptr->max_accesses[i];
-    if ( aggregate_min_accesses > aggregate_max_accesses )
-        aggregate_min_accesses = aggregate_max_accesses;
-    if ( aggregate_min_accesses > cache_ptr->min_accesses[i] )
-        aggregate_min_accesses = cache_ptr->min_accesses[i];
-    if ( aggregate_max_clears < cache_ptr->max_clears[i] )
-        aggregate_max_clears = cache_ptr->max_clears[i];
-    if ( aggregate_max_flushes < cache_ptr->max_flushes[i] )
-        aggregate_max_flushes = cache_ptr->max_flushes[i];
-    if ( aggregate_max_size < cache_ptr->max_size[i] )
-        aggregate_max_size = cache_ptr->max_size[i];
-    if ( aggregate_max_pins < cache_ptr->max_pins[i] )
-        aggregate_max_pins = cache_ptr->max_pins[i];
+            if (aggregate_max_accesses < cache_ptr->max_accesses[i])
+                aggregate_max_accesses = cache_ptr->max_accesses[i];
+            if (aggregate_min_accesses > aggregate_max_accesses)
+                aggregate_min_accesses = aggregate_max_accesses;
+            if (aggregate_min_accesses > cache_ptr->min_accesses[i])
+                aggregate_min_accesses = cache_ptr->min_accesses[i];
+            if (aggregate_max_clears < cache_ptr->max_clears[i])
+                aggregate_max_clears = cache_ptr->max_clears[i];
+            if (aggregate_max_flushes < cache_ptr->max_flushes[i])
+                aggregate_max_flushes = cache_ptr->max_flushes[i];
+            if (aggregate_max_size < cache_ptr->max_size[i])
+                aggregate_max_size = cache_ptr->max_size[i];
+            if (aggregate_max_pins < cache_ptr->max_pins[i])
+                aggregate_max_pins = cache_ptr->max_pins[i];
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
-    }
+        }
 
-    if ( ( total_hits > 0 ) || ( total_misses > 0 ) ) {
+        if ((total_hits > 0) || (total_misses > 0)) {
 
-        hit_rate = 100.0 * ((double)(total_hits)) /
-                   ((double)(total_hits + total_misses));
-    } else {
-        hit_rate = 0.0;
-    }
+            hit_rate = 100.0 * ((double)(total_hits)) / ((double)(total_hits + total_misses));
+        }
+        else {
+            hit_rate = 0.0;
+        }
 
-    if ( cache_ptr->successful_ht_searches > 0 ) {
+        if (cache_ptr->successful_ht_searches > 0) {
 
-        average_successful_search_depth =
-            ((double)(cache_ptr->total_successful_ht_search_depth)) /
-            ((double)(cache_ptr->successful_ht_searches));
-    }
+            average_successful_search_depth = ((double)(cache_ptr->total_successful_ht_search_depth)) /
+                                              ((double)(cache_ptr->successful_ht_searches));
+        }
 
-    if ( cache_ptr->failed_ht_searches > 0 ) {
+        if (cache_ptr->failed_ht_searches > 0) {
 
-        average_failed_search_depth =
-            ((double)(cache_ptr->total_failed_ht_search_depth)) /
-            ((double)(cache_ptr->failed_ht_searches));
-    }
+            average_failed_search_depth = ((double)(cache_ptr->total_failed_ht_search_depth)) /
+                                          ((double)(cache_ptr->failed_ht_searches));
+        }
 
+        HDfprintf(stdout, "\n%sH5C: cache statistics for %s\n", cache_ptr->prefix, cache_name);
 
-    HDfprintf(stdout, "\n%sH5C: cache statistics for %s\n",
-              cache_ptr->prefix, cache_name);
-
-    HDfprintf(stdout, "\n");
-
-    HDfprintf(stdout,
-              "%s  hash table insertion / deletions   = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->total_ht_insertions),
-              (long)(cache_ptr->total_ht_deletions));
-
-    HDfprintf(stdout,
-              "%s  HT successful / failed searches    = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->successful_ht_searches),
-              (long)(cache_ptr->failed_ht_searches));
-
-    HDfprintf(stdout,
-              "%s  Av. HT suc / failed search depth   = %f / %f\n",
-              cache_ptr->prefix,
-              average_successful_search_depth,
-              average_failed_search_depth);
-
-    HDfprintf(stdout,
-             "%s  current (max) index size / length  = %ld (%ld) / %ld (%ld)\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->index_size),
-              (long)(cache_ptr->max_index_size),
-              (long)(cache_ptr->index_len),
-              (long)(cache_ptr->max_index_len));
-
-    HDfprintf(stdout,
-             "%s  current (max) clean/dirty idx size = %ld (%ld) / %ld (%ld)\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->clean_index_size),
-              (long)(cache_ptr->max_clean_index_size),
-              (long)(cache_ptr->dirty_index_size),
-              (long)(cache_ptr->max_dirty_index_size));
-
-    HDfprintf(stdout,
-             "%s  current (max) slist size / length  = %ld (%ld) / %ld (%ld)\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->slist_size),
-              (long)(cache_ptr->max_slist_size),
-              (long)(cache_ptr->slist_len),
-              (long)(cache_ptr->max_slist_len));
-
-    HDfprintf(stdout,
-             "%s  current (max) PL size / length     = %ld (%ld) / %ld (%ld)\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->pl_size),
-              (long)(cache_ptr->max_pl_size),
-              (long)(cache_ptr->pl_len),
-              (long)(cache_ptr->max_pl_len));
-
-    HDfprintf(stdout,
-             "%s  current (max) PEL size / length    = %ld (%ld) / %ld (%ld)\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->pel_size),
-              (long)(cache_ptr->max_pel_size),
-              (long)(cache_ptr->pel_len),
-              (long)(cache_ptr->max_pel_len));
-
-    HDfprintf(stdout,
-              "%s  current LRU list size / length     = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->LRU_list_size),
-              (long)(cache_ptr->LRU_list_len));
-
-    HDfprintf(stdout,
-              "%s  current clean LRU size / length    = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->cLRU_list_size),
-              (long)(cache_ptr->cLRU_list_len));
-
-    HDfprintf(stdout,
-              "%s  current dirty LRU size / length    = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)(cache_ptr->dLRU_list_size),
-              (long)(cache_ptr->dLRU_list_len));
-
-    HDfprintf(stdout,
-              "%s  Total hits / misses / hit_rate     = %ld / %ld / %f\n",
-              cache_ptr->prefix,
-              (long)total_hits,
-              (long)total_misses,
-              hit_rate);
-
-    HDfprintf(stdout,
-              "%s  Total write / read (max) protects  = %ld / %ld (%ld)\n",
-              cache_ptr->prefix,
-              (long)total_write_protects,
-              (long)total_read_protects,
-              (long)max_read_protects);
-
-    HDfprintf(stdout,
-              "%s  Total clears / flushes / evictions = %ld / %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)total_clears,
-              (long)total_flushes,
-              (long)total_evictions);
-
-    HDfprintf(stdout,
-        "%s  Total insertions(pinned) / moves = %ld(%ld) / %ld\n",
-              cache_ptr->prefix,
-              (long)total_insertions,
-              (long)total_pinned_insertions,
-              (long)total_moves);
-
-    HDfprintf(stdout,
-        "%s  Total entry / cache flush moves  = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)total_entry_flush_moves,
-              (long)total_cache_flush_moves);
-
-    HDfprintf(stdout, "%s  Total entry size incrs / decrs     = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)total_size_increases,
-              (long)total_size_decreases);
-
-    HDfprintf(stdout, "%s  Ttl entry/cache flush size changes = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)total_entry_flush_size_changes,
-              (long)total_cache_flush_size_changes);
-
-    HDfprintf(stdout,
-        "%s  Total entry pins (dirty) / unpins  = %ld (%ld) / %ld\n",
-              cache_ptr->prefix,
-              (long)total_pins,
-        (long)total_dirty_pins,
-              (long)total_unpins);
-
-    HDfprintf(stdout, "%s  Total pinned flushes / clears      = %ld / %ld\n",
-              cache_ptr->prefix,
-              (long)total_pinned_flushes,
-              (long)total_pinned_clears);
-
-    HDfprintf(stdout, "%s  MSIC: (make space in cache) calls  = %lld\n",
-              cache_ptr->prefix,
-              (long long)(cache_ptr->calls_to_msic));
-
-    if (cache_ptr->calls_to_msic > 0) {
-        average_entries_skipped_per_calls_to_msic =
-            (((double)(cache_ptr->total_entries_skipped_in_msic)) /
-            ((double)(cache_ptr->calls_to_msic)));
-    }
+        HDfprintf(stdout, "\n");
 
-    HDfprintf(stdout, "%s  MSIC: Average/max entries skipped  = %lf / %ld\n",
-              cache_ptr->prefix,
-              (float)average_entries_skipped_per_calls_to_msic,
-              (long)(cache_ptr->max_entries_skipped_in_msic));
+        HDfprintf(stdout, "%s  hash table insertion / deletions   = %ld / %ld\n", cache_ptr->prefix,
+                  (long)(cache_ptr->total_ht_insertions), (long)(cache_ptr->total_ht_deletions));
 
-    if (cache_ptr->calls_to_msic > 0) {
-        average_entries_scanned_per_calls_to_msic =
-            (((double)(cache_ptr->total_entries_scanned_in_msic)) /
-            ((double)(cache_ptr->calls_to_msic)));
-    }
+        HDfprintf(stdout, "%s  HT successful / failed searches    = %ld / %ld\n", cache_ptr->prefix,
+                  (long)(cache_ptr->successful_ht_searches), (long)(cache_ptr->failed_ht_searches));
+
+        HDfprintf(stdout, "%s  Av. HT suc / failed search depth   = %f / %f\n", cache_ptr->prefix,
+                  average_successful_search_depth, average_failed_search_depth);
+
+        HDfprintf(stdout, "%s  current (max) index size / length  = %ld (%ld) / %ld (%ld)\n",
+                  cache_ptr->prefix, (long)(cache_ptr->index_size), (long)(cache_ptr->max_index_size),
+                  (long)(cache_ptr->index_len), (long)(cache_ptr->max_index_len));
+
+        HDfprintf(stdout, "%s  current (max) clean/dirty idx size = %ld (%ld) / %ld (%ld)\n",
+                  cache_ptr->prefix, (long)(cache_ptr->clean_index_size),
+                  (long)(cache_ptr->max_clean_index_size), (long)(cache_ptr->dirty_index_size),
+                  (long)(cache_ptr->max_dirty_index_size));
+
+        HDfprintf(stdout, "%s  current (max) slist size / length  = %ld (%ld) / %ld (%ld)\n",
+                  cache_ptr->prefix, (long)(cache_ptr->slist_size), (long)(cache_ptr->max_slist_size),
+                  (long)(cache_ptr->slist_len), (long)(cache_ptr->max_slist_len));
+
+        HDfprintf(stdout, "%s  current (max) PL size / length     = %ld (%ld) / %ld (%ld)\n",
+                  cache_ptr->prefix, (long)(cache_ptr->pl_size), (long)(cache_ptr->max_pl_size),
+                  (long)(cache_ptr->pl_len), (long)(cache_ptr->max_pl_len));
+
+        HDfprintf(stdout, "%s  current (max) PEL size / length    = %ld (%ld) / %ld (%ld)\n",
+                  cache_ptr->prefix, (long)(cache_ptr->pel_size), (long)(cache_ptr->max_pel_size),
+                  (long)(cache_ptr->pel_len), (long)(cache_ptr->max_pel_len));
+
+        HDfprintf(stdout, "%s  current LRU list size / length     = %ld / %ld\n", cache_ptr->prefix,
+                  (long)(cache_ptr->LRU_list_size), (long)(cache_ptr->LRU_list_len));
+
+        HDfprintf(stdout, "%s  current clean LRU size / length    = %ld / %ld\n", cache_ptr->prefix,
+                  (long)(cache_ptr->cLRU_list_size), (long)(cache_ptr->cLRU_list_len));
+
+        HDfprintf(stdout, "%s  current dirty LRU size / length    = %ld / %ld\n", cache_ptr->prefix,
+                  (long)(cache_ptr->dLRU_list_size), (long)(cache_ptr->dLRU_list_len));
+
+        HDfprintf(stdout, "%s  Total hits / misses / hit_rate     = %ld / %ld / %f\n", cache_ptr->prefix,
+                  (long)total_hits, (long)total_misses, hit_rate);
+
+        HDfprintf(stdout, "%s  Total write / read (max) protects  = %ld / %ld (%ld)\n", cache_ptr->prefix,
+                  (long)total_write_protects, (long)total_read_protects, (long)max_read_protects);
+
+        HDfprintf(stdout, "%s  Total clears / flushes / evictions = %ld / %ld / %ld\n", cache_ptr->prefix,
+                  (long)total_clears, (long)total_flushes, (long)total_evictions);
+
+        HDfprintf(stdout, "%s  Total insertions(pinned) / moves = %ld(%ld) / %ld\n", cache_ptr->prefix,
+                  (long)total_insertions, (long)total_pinned_insertions, (long)total_moves);
+
+        HDfprintf(stdout, "%s  Total entry / cache flush moves  = %ld / %ld\n", cache_ptr->prefix,
+                  (long)total_entry_flush_moves, (long)total_cache_flush_moves);
+
+        HDfprintf(stdout, "%s  Total entry size incrs / decrs     = %ld / %ld\n", cache_ptr->prefix,
+                  (long)total_size_increases, (long)total_size_decreases);
+
+        HDfprintf(stdout, "%s  Ttl entry/cache flush size changes = %ld / %ld\n", cache_ptr->prefix,
+                  (long)total_entry_flush_size_changes, (long)total_cache_flush_size_changes);
+
+        HDfprintf(stdout, "%s  Total entry pins (dirty) / unpins  = %ld (%ld) / %ld\n", cache_ptr->prefix,
+                  (long)total_pins, (long)total_dirty_pins, (long)total_unpins);
+
+        HDfprintf(stdout, "%s  Total pinned flushes / clears      = %ld / %ld\n", cache_ptr->prefix,
+                  (long)total_pinned_flushes, (long)total_pinned_clears);
+
+        HDfprintf(stdout, "%s  MSIC: (make space in cache) calls  = %lld\n", cache_ptr->prefix,
+                  (long long)(cache_ptr->calls_to_msic));
+
+        if (cache_ptr->calls_to_msic > 0) {
+            average_entries_skipped_per_calls_to_msic =
+                (((double)(cache_ptr->total_entries_skipped_in_msic)) / ((double)(cache_ptr->calls_to_msic)));
+        }
+
+        HDfprintf(stdout, "%s  MSIC: Average/max entries skipped  = %lf / %ld\n", cache_ptr->prefix,
+                  (float)average_entries_skipped_per_calls_to_msic,
+                  (long)(cache_ptr->max_entries_skipped_in_msic));
+
+        if (cache_ptr->calls_to_msic > 0) {
+            average_entries_scanned_per_calls_to_msic =
+                (((double)(cache_ptr->total_entries_scanned_in_msic)) / ((double)(cache_ptr->calls_to_msic)));
+        }
 
-    HDfprintf(stdout, "%s  MSIC: Average/max entries scanned  = %lf / %ld\n",
-              cache_ptr->prefix,
-              (float)average_entries_scanned_per_calls_to_msic,
-              (long)(cache_ptr->max_entries_scanned_in_msic));
+        HDfprintf(stdout, "%s  MSIC: Average/max entries scanned  = %lf / %ld\n", cache_ptr->prefix,
+                  (float)average_entries_scanned_per_calls_to_msic,
+                  (long)(cache_ptr->max_entries_scanned_in_msic));
 
-    HDfprintf(stdout, "%s  MSIC: Scanned to make space(evict) = %lld\n",
-              cache_ptr->prefix,
-              (long long)(cache_ptr->entries_scanned_to_make_space));
+        HDfprintf(stdout, "%s  MSIC: Scanned to make space(evict) = %lld\n", cache_ptr->prefix,
+                  (long long)(cache_ptr->entries_scanned_to_make_space));
 
-    HDfprintf(stdout, "%s  MSIC: Scanned to satisfy min_clean = %lld\n",
-              cache_ptr->prefix,
-              (long long)(cache_ptr->total_entries_scanned_in_msic -
-                            cache_ptr->entries_scanned_to_make_space));
+        HDfprintf(
+            stdout, "%s  MSIC: Scanned to satisfy min_clean = %lld\n", cache_ptr->prefix,
+            (long long)(cache_ptr->total_entries_scanned_in_msic - cache_ptr->entries_scanned_to_make_space));
 
 #if H5C_COLLECT_CACHE_ENTRY_STATS
 
-    HDfprintf(stdout, "%s  aggregate max / min accesses       = %d / %d\n",
-              cache_ptr->prefix,
-              (int)aggregate_max_accesses,
-              (int)aggregate_min_accesses);
+        HDfprintf(stdout, "%s  aggregate max / min accesses       = %d / %d\n", cache_ptr->prefix,
+                  (int)aggregate_max_accesses, (int)aggregate_min_accesses);
 
-    HDfprintf(stdout, "%s  aggregate max_clears / max_flushes = %d / %d\n",
-              cache_ptr->prefix,
-              (int)aggregate_max_clears,
-              (int)aggregate_max_flushes);
+        HDfprintf(stdout, "%s  aggregate max_clears / max_flushes = %d / %d\n", cache_ptr->prefix,
+                  (int)aggregate_max_clears, (int)aggregate_max_flushes);
 
-    HDfprintf(stdout, "%s  aggregate max_size / max_pins      = %d / %d\n",
-              cache_ptr->prefix,
-              (int)aggregate_max_size,
-        (int)aggregate_max_pins);
+        HDfprintf(stdout, "%s  aggregate max_size / max_pins      = %d / %d\n", cache_ptr->prefix,
+                  (int)aggregate_max_size, (int)aggregate_max_pins);
 
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
-    if ( display_detailed_stats )
-    {
+        if (display_detailed_stats) {
 
-        for ( i = 0; i <= cache_ptr->max_type_id; i++ ) {
+            for (i = 0; i <= cache_ptr->max_type_id; i++) {
 
-            HDfprintf(stdout, "\n");
+                HDfprintf(stdout, "\n");
 
-            HDfprintf(stdout, "%s  Stats on %s:\n",
-                      cache_ptr->prefix,
-                      ((cache_ptr->type_name_table_ptr))[i]);
+                HDfprintf(stdout, "%s  Stats on %s:\n", cache_ptr->prefix,
+                          ((cache_ptr->type_name_table_ptr))[i]);
 
-            if ( ( cache_ptr->hits[i] > 0 ) || ( cache_ptr->misses[i] > 0 ) ) {
+                if ((cache_ptr->hits[i] > 0) || (cache_ptr->misses[i] > 0)) {
 
-                hit_rate = 100.0 * ((double)(cache_ptr->hits[i])) /
-                          ((double)(cache_ptr->hits[i] + cache_ptr->misses[i]));
-            } else {
-                hit_rate = 0.0;
-            }
+                    hit_rate = 100.0 * ((double)(cache_ptr->hits[i])) /
+                               ((double)(cache_ptr->hits[i] + cache_ptr->misses[i]));
+                }
+                else {
+                    hit_rate = 0.0;
+                }
 
-            HDfprintf(stdout,
-                      "%s    hits / misses / hit_rate       = %ld / %ld / %f\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->hits[i]),
-                      (long)(cache_ptr->misses[i]),
-                      hit_rate);
+                HDfprintf(stdout, "%s    hits / misses / hit_rate       = %ld / %ld / %f\n",
+                          cache_ptr->prefix, (long)(cache_ptr->hits[i]), (long)(cache_ptr->misses[i]),
+                          hit_rate);
 
-            HDfprintf(stdout,
-                      "%s    write / read (max) protects    = %ld / %ld (%d)\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->write_protects[i]),
-                      (long)(cache_ptr->read_protects[i]),
-                      (int)(cache_ptr->max_read_protects[i]));
-
-            HDfprintf(stdout,
-                     "%s    clears / flushes / evictions   = %ld / %ld / %ld\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->clears[i]),
-                      (long)(cache_ptr->flushes[i]),
-                      (long)(cache_ptr->evictions[i]));
-
-            HDfprintf(stdout,
-                      "%s    insertions(pinned) / moves   = %ld(%ld) / %ld\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->insertions[i]),
-                      (long)(cache_ptr->pinned_insertions[i]),
-                      (long)(cache_ptr->moves[i]));
-
-            HDfprintf(stdout,
-                      "%s    entry / cache flush moves    = %ld / %ld\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->entry_flush_moves[i]),
-                      (long)(cache_ptr->cache_flush_moves[i]));
-
-            HDfprintf(stdout,
-                      "%s    size increases / decreases     = %ld / %ld\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->size_increases[i]),
-                      (long)(cache_ptr->size_decreases[i]));
-
-            HDfprintf(stdout,
-                      "%s    entry/cache flush size changes = %ld / %ld\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->entry_flush_size_changes[i]),
-                      (long)(cache_ptr->cache_flush_size_changes[i]));
-
-
-            HDfprintf(stdout,
-                      "%s    entry pins / unpins            = %ld / %ld\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->pins[i]),
-                      (long)(cache_ptr->unpins[i]));
-
-            HDfprintf(stdout,
-                      "%s    entry dirty pins/pin'd flushes  = %ld / %ld\n",
-                      cache_ptr->prefix,
-                      (long)(cache_ptr->dirty_pins[i]),
-                      (long)(cache_ptr->pinned_flushes[i]));
+                HDfprintf(stdout, "%s    write / read (max) protects    = %ld / %ld (%d)\n",
+                          cache_ptr->prefix, (long)(cache_ptr->write_protects[i]),
+                          (long)(cache_ptr->read_protects[i]), (int)(cache_ptr->max_read_protects[i]));
 
-#if H5C_COLLECT_CACHE_ENTRY_STATS
+                HDfprintf(stdout, "%s    clears / flushes / evictions   = %ld / %ld / %ld\n",
+                          cache_ptr->prefix, (long)(cache_ptr->clears[i]), (long)(cache_ptr->flushes[i]),
+                          (long)(cache_ptr->evictions[i]));
 
-            HDfprintf(stdout,
-                      "%s    entry max / min accesses       = %d / %d\n",
-                      cache_ptr->prefix,
-                      cache_ptr->max_accesses[i],
-                      cache_ptr->min_accesses[i]);
+                HDfprintf(stdout, "%s    insertions(pinned) / moves   = %ld(%ld) / %ld\n", cache_ptr->prefix,
+                          (long)(cache_ptr->insertions[i]), (long)(cache_ptr->pinned_insertions[i]),
+                          (long)(cache_ptr->moves[i]));
 
-            HDfprintf(stdout,
-                      "%s    entry max_clears / max_flushes = %d / %d\n",
-                      cache_ptr->prefix,
-                      cache_ptr->max_clears[i],
-                      cache_ptr->max_flushes[i]);
+                HDfprintf(stdout, "%s    entry / cache flush moves    = %ld / %ld\n", cache_ptr->prefix,
+                          (long)(cache_ptr->entry_flush_moves[i]), (long)(cache_ptr->cache_flush_moves[i]));
 
-            HDfprintf(stdout,
-                      "%s    entry max_size / max_pins      = %d / %d\n",
-                      cache_ptr->prefix,
-                      (int)(cache_ptr->max_size[i]),
-            (int)(cache_ptr->max_pins[i]));
+                HDfprintf(stdout, "%s    size increases / decreases     = %ld / %ld\n", cache_ptr->prefix,
+                          (long)(cache_ptr->size_increases[i]), (long)(cache_ptr->size_decreases[i]));
 
+                HDfprintf(stdout, "%s    entry/cache flush size changes = %ld / %ld\n", cache_ptr->prefix,
+                          (long)(cache_ptr->entry_flush_size_changes[i]),
+                          (long)(cache_ptr->cache_flush_size_changes[i]));
 
-#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
+                HDfprintf(stdout, "%s    entry pins / unpins            = %ld / %ld\n", cache_ptr->prefix,
+                          (long)(cache_ptr->pins[i]), (long)(cache_ptr->unpins[i]));
+
+                HDfprintf(stdout, "%s    entry dirty pins/pin'd flushes  = %ld / %ld\n", cache_ptr->prefix,
+                          (long)(cache_ptr->dirty_pins[i]), (long)(cache_ptr->pinned_flushes[i]));
 
+#if H5C_COLLECT_CACHE_ENTRY_STATS
+
+                HDfprintf(stdout, "%s    entry max / min accesses       = %d / %d\n", cache_ptr->prefix,
+                          cache_ptr->max_accesses[i], cache_ptr->min_accesses[i]);
+
+                HDfprintf(stdout, "%s    entry max_clears / max_flushes = %d / %d\n", cache_ptr->prefix,
+                          cache_ptr->max_clears[i], cache_ptr->max_flushes[i]);
+
+                HDfprintf(stdout, "%s    entry max_size / max_pins      = %d / %d\n", cache_ptr->prefix,
+                          (int)(cache_ptr->max_size[i]), (int)(cache_ptr->max_pins[i]));
+
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
+            }
         }
-    }
 
-    HDfprintf(stdout, "\n");
+        HDfprintf(stdout, "\n");
 
 #endif /* H5C_COLLECT_CACHE_STATS */
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C_stats() */
+    } /* H5C_stats() */
 
-
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C_stats__reset
- *
- * Purpose:     Reset the stats fields to their initial values.
- *
- * Return:      void
- *
- * Programmer:  John Mainzer, 4/28/04
- *
- *        JRM 11/13/08
- *        Added initialization for the new max_clean_index_size and
- *        max_dirty_index_size fields.
- *
- *              MAM -- 01/06/09
- *              Added code to initalize the calls_to_msic,
- *              total_entries_skipped_in_msic, total_entries_scanned_in_msic,
- *              and max_entries_skipped_in_msic fields.
- *
- *-------------------------------------------------------------------------
- */
-void
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C_stats__reset
+     *
+     * Purpose:     Reset the stats fields to their initial values.
+     *
+     * Return:      void
+     *
+     * Programmer:  John Mainzer, 4/28/04
+     *
+     *        JRM 11/13/08
+     *        Added initialization for the new max_clean_index_size and
+     *        max_dirty_index_size fields.
+     *
+     *              MAM -- 01/06/09
+     *              Added code to initalize the calls_to_msic,
+     *              total_entries_skipped_in_msic, total_entries_scanned_in_msic,
+     *              and max_entries_skipped_in_msic fields.
+     *
+     *-------------------------------------------------------------------------
+     */
+    void
 #ifndef NDEBUG
-H5C_stats__reset(H5C_t * cache_ptr)
+        H5C_stats__reset(H5C_t * cache_ptr)
 #else /* NDEBUG */
 #if H5C_COLLECT_CACHE_STATS
-H5C_stats__reset(H5C_t * cache_ptr)
-#else /* H5C_COLLECT_CACHE_STATS */
-H5C_stats__reset(H5C_t H5_ATTR_UNUSED * cache_ptr)
+H5C_stats__reset(H5C_t *cache_ptr)
+#else  /* H5C_COLLECT_CACHE_STATS */
+H5C_stats__reset(H5C_t H5_ATTR_UNUSED *cache_ptr)
 #endif /* H5C_COLLECT_CACHE_STATS */
 #endif /* NDEBUG */
-{
+    {
 #if H5C_COLLECT_CACHE_STATS
-    int i;
+        int i;
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
 #if H5C_COLLECT_CACHE_STATS
-    for ( i = 0; i <= cache_ptr->max_type_id; i++ )
-    {
-        cache_ptr->hits[i]            = 0;
-        cache_ptr->misses[i]            = 0;
-        cache_ptr->write_protects[i]        = 0;
-        cache_ptr->read_protects[i]        = 0;
-        cache_ptr->max_read_protects[i]        = 0;
-        cache_ptr->insertions[i]        = 0;
-        cache_ptr->pinned_insertions[i]        = 0;
-        cache_ptr->clears[i]            = 0;
-        cache_ptr->flushes[i]            = 0;
-        cache_ptr->evictions[i]             = 0;
-        cache_ptr->moves[i]             = 0;
-        cache_ptr->entry_flush_moves[i]    = 0;
-        cache_ptr->cache_flush_moves[i]    = 0;
-        cache_ptr->pins[i]             = 0;
-        cache_ptr->unpins[i]             = 0;
-        cache_ptr->dirty_pins[i]         = 0;
-        cache_ptr->pinned_flushes[i]         = 0;
-        cache_ptr->pinned_clears[i]         = 0;
-        cache_ptr->size_increases[i]         = 0;
-        cache_ptr->size_decreases[i]         = 0;
-    cache_ptr->entry_flush_size_changes[i]    = 0;
-    cache_ptr->cache_flush_size_changes[i]    = 0;
-    }
-
-    cache_ptr->total_ht_insertions        = 0;
-    cache_ptr->total_ht_deletions        = 0;
-    cache_ptr->successful_ht_searches        = 0;
-    cache_ptr->total_successful_ht_search_depth    = 0;
-    cache_ptr->failed_ht_searches        = 0;
-    cache_ptr->total_failed_ht_search_depth    = 0;
-
-    cache_ptr->max_index_len            = 0;
-    cache_ptr->max_index_size            = (size_t)0;
-    cache_ptr->max_clean_index_size        = (size_t)0;
-    cache_ptr->max_dirty_index_size        = (size_t)0;
-
-    cache_ptr->max_slist_len            = 0;
-    cache_ptr->max_slist_size            = (size_t)0;
-
-    cache_ptr->max_pl_len            = 0;
-    cache_ptr->max_pl_size            = (size_t)0;
-
-    cache_ptr->max_pel_len            = 0;
-    cache_ptr->max_pel_size            = (size_t)0;
-
-    cache_ptr->calls_to_msic                    = 0;
-    cache_ptr->total_entries_skipped_in_msic    = 0;
-    cache_ptr->total_entries_scanned_in_msic    = 0;
-    cache_ptr->max_entries_skipped_in_msic      = 0;
-    cache_ptr->max_entries_scanned_in_msic      = 0;
-    cache_ptr->entries_scanned_to_make_space    = 0;
+        for (i = 0; i <= cache_ptr->max_type_id; i++) {
+            cache_ptr->hits[i]                     = 0;
+            cache_ptr->misses[i]                   = 0;
+            cache_ptr->write_protects[i]           = 0;
+            cache_ptr->read_protects[i]            = 0;
+            cache_ptr->max_read_protects[i]        = 0;
+            cache_ptr->insertions[i]               = 0;
+            cache_ptr->pinned_insertions[i]        = 0;
+            cache_ptr->clears[i]                   = 0;
+            cache_ptr->flushes[i]                  = 0;
+            cache_ptr->evictions[i]                = 0;
+            cache_ptr->moves[i]                    = 0;
+            cache_ptr->entry_flush_moves[i]        = 0;
+            cache_ptr->cache_flush_moves[i]        = 0;
+            cache_ptr->pins[i]                     = 0;
+            cache_ptr->unpins[i]                   = 0;
+            cache_ptr->dirty_pins[i]               = 0;
+            cache_ptr->pinned_flushes[i]           = 0;
+            cache_ptr->pinned_clears[i]            = 0;
+            cache_ptr->size_increases[i]           = 0;
+            cache_ptr->size_decreases[i]           = 0;
+            cache_ptr->entry_flush_size_changes[i] = 0;
+            cache_ptr->cache_flush_size_changes[i] = 0;
+        }
+
+        cache_ptr->total_ht_insertions              = 0;
+        cache_ptr->total_ht_deletions               = 0;
+        cache_ptr->successful_ht_searches           = 0;
+        cache_ptr->total_successful_ht_search_depth = 0;
+        cache_ptr->failed_ht_searches               = 0;
+        cache_ptr->total_failed_ht_search_depth     = 0;
+
+        cache_ptr->max_index_len        = 0;
+        cache_ptr->max_index_size       = (size_t)0;
+        cache_ptr->max_clean_index_size = (size_t)0;
+        cache_ptr->max_dirty_index_size = (size_t)0;
+
+        cache_ptr->max_slist_len  = 0;
+        cache_ptr->max_slist_size = (size_t)0;
+
+        cache_ptr->max_pl_len  = 0;
+        cache_ptr->max_pl_size = (size_t)0;
+
+        cache_ptr->max_pel_len  = 0;
+        cache_ptr->max_pel_size = (size_t)0;
+
+        cache_ptr->calls_to_msic                 = 0;
+        cache_ptr->total_entries_skipped_in_msic = 0;
+        cache_ptr->total_entries_scanned_in_msic = 0;
+        cache_ptr->max_entries_skipped_in_msic   = 0;
+        cache_ptr->max_entries_scanned_in_msic   = 0;
+        cache_ptr->entries_scanned_to_make_space = 0;
 
 #if H5C_COLLECT_CACHE_ENTRY_STATS
 
-    for ( i = 0; i <= cache_ptr->max_type_id; i++ )
-    {
-        cache_ptr->max_accesses[i]        = 0;
-        cache_ptr->min_accesses[i]        = 1000000;
-        cache_ptr->max_clears[i]        = 0;
-        cache_ptr->max_flushes[i]        = 0;
-        cache_ptr->max_size[i]            = (size_t)0;
-        cache_ptr->max_pins[i]            = 0;
-    }
+        for (i = 0; i <= cache_ptr->max_type_id; i++) {
+            cache_ptr->max_accesses[i] = 0;
+            cache_ptr->min_accesses[i] = 1000000;
+            cache_ptr->max_clears[i]   = 0;
+            cache_ptr->max_flushes[i]  = 0;
+            cache_ptr->max_size[i]     = (size_t)0;
+            cache_ptr->max_pins[i]     = 0;
+        }
 
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-    return;
+        return;
 
-} /* H5C_stats__reset() */
+    } /* H5C_stats__reset() */
 
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_dump_cache
+     *
+     * Purpose:     Print a summary of the contents of the metadata cache for
+     *              debugging purposes.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              10/10/10
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_dump_cache(H5C_t * cache_ptr, const char *cache_name)
+    {
+        herr_t             ret_value = SUCCEED; /* Return value */
+        int                i;
+        H5C_cache_entry_t *entry_ptr = NULL;
+        H5SL_t *           slist_ptr = NULL;
+        H5SL_node_t *      node_ptr  = NULL;
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_dump_cache
- *
- * Purpose:     Print a summary of the contents of the metadata cache for
- *              debugging purposes.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              10/10/10
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_dump_cache(H5C_t * cache_ptr,
-               const char *  cache_name)
-{
-    herr_t              ret_value = SUCCEED;   /* Return value */
-    int                 i;
-    H5C_cache_entry_t * entry_ptr = NULL;
-    H5SL_t *            slist_ptr = NULL;
-    H5SL_node_t *       node_ptr = NULL;
+        FUNC_ENTER_NOAPI(FAIL)
 
-    FUNC_ENTER_NOAPI(FAIL)
+        HDassert(cache_ptr != NULL);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(cache_name != NULL);
 
-    HDassert(cache_ptr != NULL);
-    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
-    HDassert(cache_name != NULL );
+        /* First, create a skip list */
+        slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL);
 
-    /* First, create a skip list */
-    slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL);
+        if (slist_ptr == NULL) {
 
-    if ( slist_ptr == NULL ) {
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create skip list.")
+        }
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create skip list.")
-    }
+        /* Next, scan the index, and insert all entries in the skip list.
+         * Do this, as we want to display cache entries in increasing address
+         * order.
+         */
+        for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
 
-    /* Next, scan the index, and insert all entries in the skip list.
-     * Do this, as we want to display cache entries in increasing address
-     * order.
-     */
-    for ( i = 0; i < H5C__HASH_TABLE_LEN; i++ ) {
+            entry_ptr = cache_ptr->index[i];
 
-        entry_ptr = cache_ptr->index[i];
+            while (entry_ptr != NULL) {
 
-        while ( entry_ptr != NULL ) {
+                HDassert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
 
-            HDassert( entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC );
+                if (H5SL_insert(slist_ptr, entry_ptr, &(entry_ptr->addr)) < 0) {
 
-            if ( H5SL_insert(slist_ptr, entry_ptr, &(entry_ptr->addr)) < 0 ) {
+                    HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "Can't insert entry in skip list")
+                }
 
-                HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, \
-                            "Can't insert entry in skip list")
+                entry_ptr = entry_ptr->ht_next;
             }
-
-            entry_ptr = entry_ptr->ht_next;
         }
-    }
 
-    /* If we get this far, all entries in the cache are listed in the
-     * skip list -- scan the skip list generating the desired output.
-     */
-
-    HDfprintf(stdout, "\n\nDump of metadata cache \"%s\".\n", cache_name);
-    HDfprintf(stdout,
-        "Num:   Addr:           Len:    Type:   Prot:   Pinned: Dirty:\n");
+        /* If we get this far, all entries in the cache are listed in the
+         * skip list -- scan the skip list generating the desired output.
+         */
 
-    i = 0;
+        HDfprintf(stdout, "\n\nDump of metadata cache \"%s\".\n", cache_name);
+        HDfprintf(stdout, "Num:   Addr:           Len:    Type:   Prot:   Pinned: Dirty:\n");
 
-    node_ptr = H5SL_first(slist_ptr);
+        i = 0;
 
-    if ( node_ptr != NULL ) {
+        node_ptr = H5SL_first(slist_ptr);
 
-        entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
+        if (node_ptr != NULL) {
 
-    } else {
+            entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
+        }
+        else {
 
-        entry_ptr = NULL;
-    }
+            entry_ptr = NULL;
+        }
 
-    while ( entry_ptr != NULL ) {
+        while (entry_ptr != NULL) {
 
-        HDassert( entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC );
+            HDassert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
 
-        HDfprintf(stdout,
-            "%s%d       0x%08llx        0x%3llx %2d     %d      %d      %d\n",
-             cache_ptr->prefix, i,
-             (long long)(entry_ptr->addr),
-             (long long)(entry_ptr->size),
-             (int)(entry_ptr->type->id),
-             (int)(entry_ptr->is_protected),
-             (int)(entry_ptr->is_pinned),
-             (int)(entry_ptr->is_dirty));
+            HDfprintf(stdout, "%s%d       0x%08llx        0x%3llx %2d     %d      %d      %d\n",
+                      cache_ptr->prefix, i, (long long)(entry_ptr->addr), (long long)(entry_ptr->size),
+                      (int)(entry_ptr->type->id), (int)(entry_ptr->is_protected), (int)(entry_ptr->is_pinned),
+                      (int)(entry_ptr->is_dirty));
 
-        /* increment node_ptr before we delete its target */
-        node_ptr = H5SL_next(node_ptr);
+            /* increment node_ptr before we delete its target */
+            node_ptr = H5SL_next(node_ptr);
 
-        /* remove the first item in the skip list */
-        if ( H5SL_remove(slist_ptr, &(entry_ptr->addr)) != entry_ptr ) {
+            /* remove the first item in the skip list */
+            if (H5SL_remove(slist_ptr, &(entry_ptr->addr)) != entry_ptr) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, \
-                        "Can't delete entry from skip list.")
-        }
+                HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "Can't delete entry from skip list.")
+            }
 
-        if ( node_ptr != NULL ) {
+            if (node_ptr != NULL) {
 
-            entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
+                entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
+            }
+            else {
 
-        } else {
+                entry_ptr = NULL;
+            }
 
-            entry_ptr = NULL;
+            i++;
         }
 
-        i++;
-    }
-
-    HDfprintf(stdout, "\n\n");
+        HDfprintf(stdout, "\n\n");
 
-    /* Finally, discard the skip list */
+        /* Finally, discard the skip list */
 
-    HDassert( H5SL_count(slist_ptr) == 0 );
+        HDassert(H5SL_count(slist_ptr) == 0);
 
-    H5SL_close(slist_ptr);
+        H5SL_close(slist_ptr);
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_dump_cache() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C_dump_cache() */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_unpin_entry()
- *
- * Purpose:    Unpin a cache entry.  The entry must be unprotected at
- *         the time of call, and must be pinned.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              3/22/06
- *
- * Modifications:
- *
- *         JRM -- 4/26/06
- *        Modified routine to allow it to operate on protected
- *        entries.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_unpin_entry(void *_entry_ptr)
-{
-    H5C_t             * cache_ptr;
-    H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)_entry_ptr; /* Pointer to entry to unpin */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_unpin_entry()
+     *
+     * Purpose:    Unpin a cache entry.  The entry must be unprotected at
+     *         the time of call, and must be pinned.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              3/22/06
+     *
+     * Modifications:
+     *
+     *         JRM -- 4/26/06
+     *        Modified routine to allow it to operate on protected
+     *        entries.
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_unpin_entry(void *_entry_ptr)
+    {
+        H5C_t *            cache_ptr;
+        H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)_entry_ptr; /* Pointer to entry to unpin */
+        herr_t             ret_value = SUCCEED;                         /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    /* Sanity check */
-    HDassert(entry_ptr);
-    cache_ptr = entry_ptr->cache_ptr;
-    HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        /* Sanity check */
+        HDassert(entry_ptr);
+        cache_ptr = entry_ptr->cache_ptr;
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if ( ! ( entry_ptr->is_pinned ) ) {
+        if (!(entry_ptr->is_pinned)) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPIN, FAIL, "Entry isn't pinned")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPIN, FAIL, "Entry isn't pinned")
+        }
 
-    if ( ! ( entry_ptr->is_protected ) ) {
+        if (!(entry_ptr->is_protected)) {
 
-        H5C__UPDATE_RP_FOR_UNPIN(cache_ptr, entry_ptr, FAIL)
-    }
+            H5C__UPDATE_RP_FOR_UNPIN(cache_ptr, entry_ptr, FAIL)
+        }
 
-    entry_ptr->is_pinned = FALSE;
+        entry_ptr->is_pinned = FALSE;
 
-    H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
+        H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C_unpin_entry() */
+    } /* H5C_unpin_entry() */
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5C_unprotect
- *
- * Purpose:    Undo an H5C_protect() call -- specifically, mark the
- *        entry as unprotected, remove it from the protected list,
- *        and give it back to the replacement policy.
- *
- *        The TYPE and ADDR arguments must be the same as those in
- *        the corresponding call to H5C_protect() and the THING
- *        argument must be the value returned by that call to
- *        H5C_protect().
- *
- *        The primary_dxpl_id and secondary_dxpl_id parameters
- *        specify the dxpl_ids used on the first write occasioned
- *        by the unprotect (primary_dxpl_id), and on all subsequent
- *        writes (secondary_dxpl_id).  Since an uprotect cannot
- *        occasion a write at present, all this is moot for now.
- *        However, things change, and in any case,
- *        H5C_flush_single_entry() needs primary_dxpl_id and
- *        secondary_dxpl_id in its parameter list.
- *
- *        The function can't cause a read either, so the dxpl_id
- *        parameters are moot in this case as well.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- *        If the deleted flag is TRUE, simply remove the target entry
- *        from the cache, clear it, and free it without writing it to
- *        disk.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              6/2/04
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_unprotect(H5F_t *          f,
-              hid_t          primary_dxpl_id,
-              hid_t          secondary_dxpl_id,
-              const H5C_class_t * type,
-              haddr_t          addr,
-              void *          thing,
-              unsigned int        flags)
-{
-    H5C_t *        cache_ptr;
-    hbool_t        deleted;
-    hbool_t        dirtied;
-    hbool_t             set_flush_marker;
-    hbool_t        pin_entry;
-    hbool_t        unpin_entry;
-    hbool_t        free_file_space;
-    hbool_t        take_ownership;
-    hbool_t         was_clean;
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_unprotect
+     *
+     * Purpose:    Undo an H5C_protect() call -- specifically, mark the
+     *        entry as unprotected, remove it from the protected list,
+     *        and give it back to the replacement policy.
+     *
+     *        The TYPE and ADDR arguments must be the same as those in
+     *        the corresponding call to H5C_protect() and the THING
+     *        argument must be the value returned by that call to
+     *        H5C_protect().
+     *
+     *        The primary_dxpl_id and secondary_dxpl_id parameters
+     *        specify the dxpl_ids used on the first write occasioned
+     *        by the unprotect (primary_dxpl_id), and on all subsequent
+     *        writes (secondary_dxpl_id).  Since an uprotect cannot
+     *        occasion a write at present, all this is moot for now.
+     *        However, things change, and in any case,
+     *        H5C_flush_single_entry() needs primary_dxpl_id and
+     *        secondary_dxpl_id in its parameter list.
+     *
+     *        The function can't cause a read either, so the dxpl_id
+     *        parameters are moot in this case as well.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     *        If the deleted flag is TRUE, simply remove the target entry
+     *        from the cache, clear it, and free it without writing it to
+     *        disk.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              6/2/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_unprotect(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type,
+                         haddr_t addr, void *thing, unsigned int flags)
+    {
+        H5C_t * cache_ptr;
+        hbool_t deleted;
+        hbool_t dirtied;
+        hbool_t set_flush_marker;
+        hbool_t pin_entry;
+        hbool_t unpin_entry;
+        hbool_t free_file_space;
+        hbool_t take_ownership;
+        hbool_t was_clean;
 #ifdef H5_HAVE_PARALLEL
-    hbool_t        clear_entry = FALSE;
+        hbool_t clear_entry = FALSE;
 #endif /* H5_HAVE_PARALLEL */
-    H5C_cache_entry_t *    entry_ptr;
-    H5C_cache_entry_t *    test_entry_ptr;
-    herr_t              ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_NOAPI(FAIL)
-
-    deleted          = ( (flags & H5C__DELETED_FLAG) != 0 );
-    dirtied          = ( (flags & H5C__DIRTIED_FLAG) != 0 );
-    set_flush_marker = ( (flags & H5C__SET_FLUSH_MARKER_FLAG) != 0 );
-    pin_entry        = ( (flags & H5C__PIN_ENTRY_FLAG) != 0 );
-    unpin_entry      = ( (flags & H5C__UNPIN_ENTRY_FLAG) != 0 );
-    free_file_space  = ( (flags & H5C__FREE_FILE_SPACE_FLAG) != 0 );
-    take_ownership   = ( (flags & H5C__TAKE_OWNERSHIP_FLAG) != 0 );
-
-    HDassert( f );
-    HDassert( f->shared );
-
-    cache_ptr = f->shared->cache;
-
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( type );
-    HDassert( type->clear );
-    HDassert( type->flush );
-    HDassert( H5F_addr_defined(addr) );
-    HDassert( thing );
-    HDassert( ! ( pin_entry && unpin_entry ) );
-    HDassert( ( ! free_file_space ) || ( deleted ) );   /* deleted flag must accompany free_file_space */
-    HDassert( ( ! take_ownership ) || ( deleted ) );    /* deleted flag must accompany take_ownership */
-    HDassert( ! ( free_file_space && take_ownership ) );    /* can't have both free_file_space & take_ownership */
+        H5C_cache_entry_t *entry_ptr;
+        H5C_cache_entry_t *test_entry_ptr;
+        herr_t             ret_value = SUCCEED; /* Return value */
+
+        FUNC_ENTER_NOAPI(FAIL)
+
+        deleted          = ((flags & H5C__DELETED_FLAG) != 0);
+        dirtied          = ((flags & H5C__DIRTIED_FLAG) != 0);
+        set_flush_marker = ((flags & H5C__SET_FLUSH_MARKER_FLAG) != 0);
+        pin_entry        = ((flags & H5C__PIN_ENTRY_FLAG) != 0);
+        unpin_entry      = ((flags & H5C__UNPIN_ENTRY_FLAG) != 0);
+        free_file_space  = ((flags & H5C__FREE_FILE_SPACE_FLAG) != 0);
+        take_ownership   = ((flags & H5C__TAKE_OWNERSHIP_FLAG) != 0);
+
+        HDassert(f);
+        HDassert(f->shared);
+
+        cache_ptr = f->shared->cache;
+
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(type);
+        HDassert(type->clear);
+        HDassert(type->flush);
+        HDassert(H5F_addr_defined(addr));
+        HDassert(thing);
+        HDassert(!(pin_entry && unpin_entry));
+        HDassert((!free_file_space) || (deleted));      /* deleted flag must accompany free_file_space */
+        HDassert((!take_ownership) || (deleted));       /* deleted flag must accompany take_ownership */
+        HDassert(!(free_file_space && take_ownership)); /* can't have both free_file_space & take_ownership */
 
-    entry_ptr = (H5C_cache_entry_t *)thing;
+        entry_ptr = (H5C_cache_entry_t *)thing;
 
-    HDassert( entry_ptr->addr == addr );
-    HDassert( entry_ptr->type == type );
+        HDassert(entry_ptr->addr == addr);
+        HDassert(entry_ptr->type == type);
 
-    /* also set the dirtied variable if the dirtied field is set in
-     * the entry.
-     */
-    dirtied |= entry_ptr->dirtied;
-    was_clean = ! ( entry_ptr->is_dirty );
+        /* also set the dirtied variable if the dirtied field is set in
+         * the entry.
+         */
+        dirtied |= entry_ptr->dirtied;
+        was_clean = !(entry_ptr->is_dirty);
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+        if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
         }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
+        /* if the entry has multiple read only protects, just decrement
+         * the ro_ref_counter.  Don't actually unprotect until the ref count
+         * drops to zero.
+         */
+        if (entry_ptr->ro_ref_count > 1) {
 
-    /* if the entry has multiple read only protects, just decrement
-     * the ro_ref_counter.  Don't actually unprotect until the ref count
-     * drops to zero.
-     */
-    if ( entry_ptr->ro_ref_count > 1 ) {
-
-    HDassert( entry_ptr->is_protected );
-        HDassert( entry_ptr->is_read_only );
+            HDassert(entry_ptr->is_protected);
+            HDassert(entry_ptr->is_read_only);
 
-    if ( dirtied ) {
+            if (dirtied) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                        "Read only entry modified(1)??")
-    }
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Read only entry modified(1)??")
+            }
 
-    (entry_ptr->ro_ref_count)--;
+            (entry_ptr->ro_ref_count)--;
 
-        /* Pin or unpin the entry as requested. */
-        if ( pin_entry ) {
+            /* Pin or unpin the entry as requested. */
+            if (pin_entry) {
 
-            if ( entry_ptr->is_pinned ) {
+                if (entry_ptr->is_pinned) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, \
-                            "Entry already pinned???")
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, "Entry already pinned???")
+                }
+                entry_ptr->is_pinned = TRUE;
+                H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
             }
-        entry_ptr->is_pinned = TRUE;
-        H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
-
-        } else if ( unpin_entry ) {
+            else if (unpin_entry) {
 
-            if ( ! ( entry_ptr->is_pinned ) ) {
+                if (!(entry_ptr->is_pinned)) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPIN, FAIL, \
-                "Entry already unpinned???")
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPIN, FAIL, "Entry already unpinned???")
+                }
+                entry_ptr->is_pinned = FALSE;
+                H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
             }
-        entry_ptr->is_pinned = FALSE;
-        H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
-
         }
+        else {
 
-    } else {
-
-    if ( entry_ptr->is_read_only ) {
+            if (entry_ptr->is_read_only) {
 
-        HDassert( entry_ptr->ro_ref_count == 1 );
+                HDassert(entry_ptr->ro_ref_count == 1);
 
-        if ( dirtied ) {
+                if (dirtied) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                            "Read only entry modified(2)??")
-        }
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Read only entry modified(2)??")
+                }
 
-        entry_ptr->is_read_only = FALSE;
-        entry_ptr->ro_ref_count = 0;
-    }
+                entry_ptr->is_read_only = FALSE;
+                entry_ptr->ro_ref_count = 0;
+            }
 
 #ifdef H5_HAVE_PARALLEL
-        /* When the H5C code is used to implement the metadata cache in the
-         * PHDF5 case, only the cache on process 0 is allowed to write to file.
-         * All the other metadata caches must hold dirty entries until they
-         * are told that the entries are clean.
-         *
-         * The clear_on_unprotect flag in the H5C_cache_entry_t structure
-         * exists to deal with the case in which an entry is protected when
-         * its cache receives word that the entry is now clean.  In this case,
-         * the clear_on_unprotect flag is set, and the entry is flushed with
-         * the H5C__FLUSH_CLEAR_ONLY_FLAG.
-         *
-         * All this is a bit awkward, but until the metadata cache entries
-         * are contiguous, with only one dirty flag, we have to let the supplied
-         * functions deal with the resetting the is_dirty flag.
-         */
-        if ( entry_ptr->clear_on_unprotect ) {
+            /* When the H5C code is used to implement the metadata cache in the
+             * PHDF5 case, only the cache on process 0 is allowed to write to file.
+             * All the other metadata caches must hold dirty entries until they
+             * are told that the entries are clean.
+             *
+             * The clear_on_unprotect flag in the H5C_cache_entry_t structure
+             * exists to deal with the case in which an entry is protected when
+             * its cache receives word that the entry is now clean.  In this case,
+             * the clear_on_unprotect flag is set, and the entry is flushed with
+             * the H5C__FLUSH_CLEAR_ONLY_FLAG.
+             *
+             * All this is a bit awkward, but until the metadata cache entries
+             * are contiguous, with only one dirty flag, we have to let the supplied
+             * functions deal with the resetting the is_dirty flag.
+             */
+            if (entry_ptr->clear_on_unprotect) {
 
-            HDassert( entry_ptr->is_dirty );
+                HDassert(entry_ptr->is_dirty);
 
-            entry_ptr->clear_on_unprotect = FALSE;
+                entry_ptr->clear_on_unprotect = FALSE;
 
-            if ( ! dirtied ) {
+                if (!dirtied) {
 
-                clear_entry = TRUE;
+                    clear_entry = TRUE;
+                }
             }
-        }
 #endif /* H5_HAVE_PARALLEL */
 
-        if ( ! (entry_ptr->is_protected) ) {
+            if (!(entry_ptr->is_protected)) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                            "Entry already unprotected??")
-        }
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Entry already unprotected??")
+            }
 
-        /* mark the entry as dirty if appropriate */
-        entry_ptr->is_dirty = ( (entry_ptr->is_dirty) || dirtied );
+            /* mark the entry as dirty if appropriate */
+            entry_ptr->is_dirty = ((entry_ptr->is_dirty) || dirtied);
 
-        if ( ( was_clean ) && ( entry_ptr->is_dirty ) ) {
+            if ((was_clean) && (entry_ptr->is_dirty)) {
 
-        H5C__UPDATE_INDEX_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr)
-    }
+                H5C__UPDATE_INDEX_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr)
+            }
 
-        /* Pin or unpin the entry as requested. */
-        if ( pin_entry ) {
+            /* Pin or unpin the entry as requested. */
+            if (pin_entry) {
 
-            if ( entry_ptr->is_pinned ) {
+                if (entry_ptr->is_pinned) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, \
-                            "Entry already pinned???")
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, "Entry already pinned???")
+                }
+                entry_ptr->is_pinned = TRUE;
+                H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
             }
-        entry_ptr->is_pinned = TRUE;
-        H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
-
-        } else if ( unpin_entry ) {
+            else if (unpin_entry) {
 
-            if ( ! ( entry_ptr->is_pinned ) ) {
+                if (!(entry_ptr->is_pinned)) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPIN, FAIL, \
-                "Entry already unpinned???")
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPIN, FAIL, "Entry already unpinned???")
+                }
+                entry_ptr->is_pinned = FALSE;
+                H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
             }
-        entry_ptr->is_pinned = FALSE;
-        H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
-
-        }
 
-        /* H5C__UPDATE_RP_FOR_UNPROTECT will place the unprotected entry on
-         * the pinned entry list if entry_ptr->is_pinned is TRUE.
-         */
-        H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, FAIL)
+            /* H5C__UPDATE_RP_FOR_UNPROTECT will place the unprotected entry on
+             * the pinned entry list if entry_ptr->is_pinned is TRUE.
+             */
+            H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, FAIL)
 
-        entry_ptr->is_protected = FALSE;
+            entry_ptr->is_protected = FALSE;
 
-        /* if the entry is dirty, 'or' its flush_marker with the set flush flag,
-         * and then add it to the skip list if it isn't there already.
-         */
+            /* if the entry is dirty, 'or' its flush_marker with the set flush flag,
+             * and then add it to the skip list if it isn't there already.
+             */
 
-        if ( entry_ptr->is_dirty ) {
+            if (entry_ptr->is_dirty) {
 
-            entry_ptr->flush_marker |= set_flush_marker;
+                entry_ptr->flush_marker |= set_flush_marker;
 
-            if ( ! (entry_ptr->in_slist) ) {
+                if (!(entry_ptr->in_slist)) {
 
-                H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+                    H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+                }
             }
-        }
-
-        /* this implementation of the "deleted" option is a bit inefficient, as
-         * we re-insert the entry to be deleted into the replacement policy
-         * data structures, only to remove them again.  Depending on how often
-         * we do this, we may want to optimize a bit.
-         *
-         * On the other hand, this implementation is reasonably clean, and
-         * makes good use of existing code.
-         *                                             JRM - 5/19/04
-         */
-        if ( deleted ) {
 
-            /* the following first flush flag will never be used as we are
-             * calling H5C_flush_single_entry with both the
-             * H5C__FLUSH_CLEAR_ONLY_FLAG and H5C__FLUSH_INVALIDATE_FLAG flags.
-        * However, it is needed for the function call.
+            /* this implementation of the "deleted" option is a bit inefficient, as
+             * we re-insert the entry to be deleted into the replacement policy
+             * data structures, only to remove them again.  Depending on how often
+             * we do this, we may want to optimize a bit.
+             *
+             * On the other hand, this implementation is reasonably clean, and
+             * makes good use of existing code.
+             *                                             JRM - 5/19/04
              */
-            hbool_t    dummy_first_flush = TRUE;
-            unsigned    flush_flags = (H5C__FLUSH_CLEAR_ONLY_FLAG |
-                                         H5C__FLUSH_INVALIDATE_FLAG);
+            if (deleted) {
 
-        /* we can't delete a pinned entry */
-        HDassert ( ! (entry_ptr->is_pinned ) );
+                /* the following first flush flag will never be used as we are
+                 * calling H5C_flush_single_entry with both the
+                 * H5C__FLUSH_CLEAR_ONLY_FLAG and H5C__FLUSH_INVALIDATE_FLAG flags.
+                 * However, it is needed for the function call.
+                 */
+                hbool_t  dummy_first_flush = TRUE;
+                unsigned flush_flags       = (H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_INVALIDATE_FLAG);
 
-            /* verify that the target entry is in the cache. */
+                /* we can't delete a pinned entry */
+                HDassert(!(entry_ptr->is_pinned));
 
-            H5C__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
+                /* verify that the target entry is in the cache. */
 
-            if ( test_entry_ptr == NULL ) {
+                H5C__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                            "entry not in hash table?!?.")
-            }
-            else if ( test_entry_ptr != entry_ptr ) {
+                if (test_entry_ptr == NULL) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                            "hash table contains multiple entries for addr?!?.")
-            }
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "entry not in hash table?!?.")
+                }
+                else if (test_entry_ptr != entry_ptr) {
 
-            /* Pass along 'free file space' flag to cache client */
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL,
+                                "hash table contains multiple entries for addr?!?.")
+                }
 
-            entry_ptr->free_file_space_on_destroy = free_file_space;
+                /* Pass along 'free file space' flag to cache client */
 
-            /* Set the "take ownership" flag for the flush, if needed */
-            if ( take_ownership) {
+                entry_ptr->free_file_space_on_destroy = free_file_space;
 
-                flush_flags |= H5C__TAKE_OWNERSHIP_FLAG;
-            }
+                /* Set the "take ownership" flag for the flush, if needed */
+                if (take_ownership) {
 
-            if ( H5C_flush_single_entry(f,
-                                        primary_dxpl_id,
-                                        secondary_dxpl_id,
-                                        type,
-                                        addr,
-                                        flush_flags,
-                                        &dummy_first_flush,
-                                        TRUE) < 0 ) {
+                    flush_flags |= H5C__TAKE_OWNERSHIP_FLAG;
+                }
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Can't flush.")
+                if (H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, type, addr, flush_flags,
+                                           &dummy_first_flush, TRUE) < 0) {
+
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Can't flush.")
+                }
             }
-        }
 #ifdef H5_HAVE_PARALLEL
-        else if ( clear_entry ) {
+            else if (clear_entry) {
 
-            /* the following first flush flag will never be used as we are
-             * calling H5C_flush_single_entry with the
-        * H5C__FLUSH_CLEAR_ONLY_FLAG flag.  However, it is needed for
-        * the function call.
-             */
-            hbool_t        dummy_first_flush = TRUE;
+                /* the following first flush flag will never be used as we are
+                 * calling H5C_flush_single_entry with the
+                 * H5C__FLUSH_CLEAR_ONLY_FLAG flag.  However, it is needed for
+                 * the function call.
+                 */
+                hbool_t dummy_first_flush = TRUE;
 
-            /* verify that the target entry is in the cache. */
+                /* verify that the target entry is in the cache. */
 
-            H5C__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
+                H5C__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
 
-            if ( test_entry_ptr == NULL ) {
+                if (test_entry_ptr == NULL) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                            "entry not in hash table?!?.")
-            }
-            else if ( test_entry_ptr != entry_ptr ) {
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "entry not in hash table?!?.")
+                }
+                else if (test_entry_ptr != entry_ptr) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                            "hash table contains multiple entries for addr?!?.")
-            }
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL,
+                                "hash table contains multiple entries for addr?!?.")
+                }
 
-            if ( H5C_flush_single_entry(f,
-                                        primary_dxpl_id,
-                                        secondary_dxpl_id,
-                                        type,
-                                        addr,
-                                        H5C__FLUSH_CLEAR_ONLY_FLAG,
-                                        &dummy_first_flush,
-                                        TRUE) < 0 ) {
+                if (H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, type, addr,
+                                           H5C__FLUSH_CLEAR_ONLY_FLAG, &dummy_first_flush, TRUE) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Can't clear.")
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Can't clear.")
+                }
             }
-        }
 #endif /* H5_HAVE_PARALLEL */
-    }
+        }
 
-    H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)
+        H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)
 
 done:
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
-        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
+        if (H5C_validate_lru_list(cache_ptr) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "LRU sanity check failed.\n");
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "LRU sanity check failed.\n");
         }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_unprotect() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5C_validate_resize_config()
- *
- * Purpose:    Run a sanity check on the specified sections of the
- *        provided instance of struct H5C_auto_size_ctl_t.
- *
- *        Do nothing and return SUCCEED if no errors are detected,
- *        and flag an error and return FAIL otherwise.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  John Mainzer
- *              3/23/05
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5C_validate_resize_config(H5C_auto_size_ctl_t * config_ptr,
-                           unsigned int tests)
-{
-    herr_t              ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_NOAPI(FAIL)
-
-    if ( config_ptr == NULL ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "NULL config_ptr on entry.")
-    }
-
-    if ( config_ptr->version != H5C__CURR_AUTO_SIZE_CTL_VER ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown config version.")
-    }
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C_unprotect() */
 
-    if ( (tests & H5C_RESIZE_CFG__VALIDATE_GENERAL) != 0 ) {
-
-        if ( ( config_ptr->set_initial_size != TRUE ) &&
-             ( config_ptr->set_initial_size != FALSE ) ) {
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_validate_resize_config()
+     *
+     * Purpose:    Run a sanity check on the specified sections of the
+     *        provided instance of struct H5C_auto_size_ctl_t.
+     *
+     *        Do nothing and return SUCCEED if no errors are detected,
+     *        and flag an error and return FAIL otherwise.
+     *
+     * Return:      Non-negative on success/Negative on failure
+     *
+     * Programmer:  John Mainzer
+     *              3/23/05
+     *
+     *-------------------------------------------------------------------------
+     */
+    herr_t H5C_validate_resize_config(H5C_auto_size_ctl_t * config_ptr, unsigned int tests)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                        "set_initial_size must be either TRUE or FALSE");
-        }
+        FUNC_ENTER_NOAPI(FAIL)
 
-        if ( config_ptr->max_size > H5C__MAX_MAX_CACHE_SIZE ) {
+        if (config_ptr == NULL) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "max_size too big");
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "NULL config_ptr on entry.")
         }
 
-        if ( config_ptr->min_size < H5C__MIN_MAX_CACHE_SIZE ) {
+        if (config_ptr->version != H5C__CURR_AUTO_SIZE_CTL_VER) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "min_size too small");
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown config version.")
         }
 
-        if ( config_ptr->min_size > config_ptr->max_size ) {
+        if ((tests & H5C_RESIZE_CFG__VALIDATE_GENERAL) != 0) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "min_size > max_size");
-        }
-
-        if ( ( config_ptr->set_initial_size ) &&
-             ( ( config_ptr->initial_size < config_ptr->min_size ) ||
-               ( config_ptr->initial_size > config_ptr->max_size ) ) ) {
+            if ((config_ptr->set_initial_size != TRUE) && (config_ptr->set_initial_size != FALSE)) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                  "initial_size must be in the interval [min_size, max_size]");
-        }
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "set_initial_size must be either TRUE or FALSE");
+            }
 
-        if ( ( config_ptr->min_clean_fraction < (double)0.0f ) ||
-             ( config_ptr->min_clean_fraction > (double)1.0f ) ) {
+            if (config_ptr->max_size > H5C__MAX_MAX_CACHE_SIZE) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                  "min_clean_fraction must be in the interval [0.0, 1.0]");
-        }
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "max_size too big");
+            }
 
-        if ( config_ptr->epoch_length < H5C__MIN_AR_EPOCH_LENGTH ) {
+            if (config_ptr->min_size < H5C__MIN_MAX_CACHE_SIZE) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "epoch_length too small");
-        }
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "min_size too small");
+            }
 
-        if ( config_ptr->epoch_length > H5C__MAX_AR_EPOCH_LENGTH ) {
+            if (config_ptr->min_size > config_ptr->max_size) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "epoch_length too big");
-        }
-    } /* H5C_RESIZE_CFG__VALIDATE_GENERAL */
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "min_size > max_size");
+            }
 
+            if ((config_ptr->set_initial_size) && ((config_ptr->initial_size < config_ptr->min_size) ||
+                                                   (config_ptr->initial_size > config_ptr->max_size))) {
 
-    if ( (tests & H5C_RESIZE_CFG__VALIDATE_INCREMENT) != 0 ) {
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                            "initial_size must be in the interval [min_size, max_size]");
+            }
 
-        if ( ( config_ptr->incr_mode != H5C_incr__off ) &&
-             ( config_ptr->incr_mode != H5C_incr__threshold ) ) {
+            if ((config_ptr->min_clean_fraction < (double)0.0f) ||
+                (config_ptr->min_clean_fraction > (double)1.0f)) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid incr_mode");
-        }
-
-        if ( config_ptr->incr_mode == H5C_incr__threshold ) {
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                            "min_clean_fraction must be in the interval [0.0, 1.0]");
+            }
 
-            if ( ( config_ptr->lower_hr_threshold < (double)0.0f ) ||
-                 ( config_ptr->lower_hr_threshold > (double)1.0f ) ) {
+            if (config_ptr->epoch_length < H5C__MIN_AR_EPOCH_LENGTH) {
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                    "lower_hr_threshold must be in the range [0.0, 1.0]");
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "epoch_length too small");
             }
 
-            if ( config_ptr->increment < (double)1.0f ) {
+            if (config_ptr->epoch_length > H5C__MAX_AR_EPOCH_LENGTH) {
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "increment must be greater than or equal to 1.0");
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "epoch_length too big");
             }
+        } /* H5C_RESIZE_CFG__VALIDATE_GENERAL */
+
+        if ((tests & H5C_RESIZE_CFG__VALIDATE_INCREMENT) != 0) {
 
-            if ( ( config_ptr->apply_max_increment != TRUE ) &&
-                 ( config_ptr->apply_max_increment != FALSE ) ) {
+            if ((config_ptr->incr_mode != H5C_incr__off) && (config_ptr->incr_mode != H5C_incr__threshold)) {
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "apply_max_increment must be either TRUE or FALSE");
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid incr_mode");
             }
 
-            /* no need to check max_increment, as it is a size_t,
-             * and thus must be non-negative.
-             */
-        } /* H5C_incr__threshold */
+            if (config_ptr->incr_mode == H5C_incr__threshold) {
 
-        switch ( config_ptr->flash_incr_mode )
-        {
-            case H5C_flash_incr__off:
-                /* nothing to do here */
-                break;
+                if ((config_ptr->lower_hr_threshold < (double)0.0f) ||
+                    (config_ptr->lower_hr_threshold > (double)1.0f)) {
 
-            case H5C_flash_incr__add_space:
-                if ( ( config_ptr->flash_multiple < (double)0.1f ) ||
-                     ( config_ptr->flash_multiple > (double)10.0f ) ) {
-
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                        "flash_multiple must be in the range [0.1, 10.0]");
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                "lower_hr_threshold must be in the range [0.0, 1.0]");
                 }
 
-                if ( ( config_ptr->flash_threshold < (double)0.1f ) ||
-                     ( config_ptr->flash_threshold > (double)1.0f ) ) {
+                if (config_ptr->increment < (double)1.0f) {
 
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                           "flash_threshold must be in the range [0.1, 1.0]");
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                "increment must be greater than or equal to 1.0");
                 }
-                break;
 
-            default:
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "Invalid flash_incr_mode");
-                break;
-        }
-    } /* H5C_RESIZE_CFG__VALIDATE_INCREMENT */
+                if ((config_ptr->apply_max_increment != TRUE) && (config_ptr->apply_max_increment != FALSE)) {
+
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                "apply_max_increment must be either TRUE or FALSE");
+                }
 
+                /* no need to check max_increment, as it is a size_t,
+                 * and thus must be non-negative.
+                 */
+            } /* H5C_incr__threshold */
 
-    if ( (tests & H5C_RESIZE_CFG__VALIDATE_DECREMENT) != 0 ) {
+            switch (config_ptr->flash_incr_mode) {
+                case H5C_flash_incr__off:
+                    /* nothing to do here */
+                    break;
 
-        if ( ( config_ptr->decr_mode != H5C_decr__off ) &&
-             ( config_ptr->decr_mode != H5C_decr__threshold ) &&
-             ( config_ptr->decr_mode != H5C_decr__age_out ) &&
-             ( config_ptr->decr_mode != H5C_decr__age_out_with_threshold )
-           ) {
+                case H5C_flash_incr__add_space:
+                    if ((config_ptr->flash_multiple < (double)0.1f) ||
+                        (config_ptr->flash_multiple > (double)10.0f)) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid decr_mode");
-        }
+                        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                    "flash_multiple must be in the range [0.1, 10.0]");
+                    }
 
-        if ( config_ptr->decr_mode == H5C_decr__threshold ) {
+                    if ((config_ptr->flash_threshold < (double)0.1f) ||
+                        (config_ptr->flash_threshold > (double)1.0f)) {
 
-            if ( config_ptr->upper_hr_threshold > (double)1.0f ) {
+                        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                    "flash_threshold must be in the range [0.1, 1.0]");
+                    }
+                    break;
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "upper_hr_threshold must be <= 1.0");
+                default:
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid flash_incr_mode");
+                    break;
             }
+        } /* H5C_RESIZE_CFG__VALIDATE_INCREMENT */
 
-            if ( ( config_ptr->decrement > (double)1.0f ) ||
-                 ( config_ptr->decrement < (double)0.0f ) ) {
+        if ((tests & H5C_RESIZE_CFG__VALIDATE_DECREMENT) != 0) {
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "decrement must be in the interval [0.0, 1.0]");
+            if ((config_ptr->decr_mode != H5C_decr__off) && (config_ptr->decr_mode != H5C_decr__threshold) &&
+                (config_ptr->decr_mode != H5C_decr__age_out) &&
+                (config_ptr->decr_mode != H5C_decr__age_out_with_threshold)) {
+
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid decr_mode");
             }
 
-            /* no need to check max_decrement as it is a size_t
-             * and thus must be non-negative.
-             */
-        } /* H5C_decr__threshold */
+            if (config_ptr->decr_mode == H5C_decr__threshold) {
 
-        if ( ( config_ptr->decr_mode == H5C_decr__age_out ) ||
-             ( config_ptr->decr_mode == H5C_decr__age_out_with_threshold )
-           ) {
+                if (config_ptr->upper_hr_threshold > (double)1.0f) {
 
-            if ( config_ptr->epochs_before_eviction < 1 ) {
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "upper_hr_threshold must be <= 1.0");
+                }
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "epochs_before_eviction must be positive");
-            }
+                if ((config_ptr->decrement > (double)1.0f) || (config_ptr->decrement < (double)0.0f)) {
 
-            if ( config_ptr->epochs_before_eviction > H5C__MAX_EPOCH_MARKERS ) {
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "decrement must be in the interval [0.0, 1.0]");
+                }
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "epochs_before_eviction too big");
-            }
+                /* no need to check max_decrement as it is a size_t
+                 * and thus must be non-negative.
+                 */
+            } /* H5C_decr__threshold */
 
-            if ( ( config_ptr->apply_empty_reserve != TRUE ) &&
-                 ( config_ptr->apply_empty_reserve != FALSE ) ) {
+            if ((config_ptr->decr_mode == H5C_decr__age_out) ||
+                (config_ptr->decr_mode == H5C_decr__age_out_with_threshold)) {
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "apply_empty_reserve must be either TRUE or FALSE");
-            }
+                if (config_ptr->epochs_before_eviction < 1) {
 
-            if ( ( config_ptr->apply_empty_reserve ) &&
-                 ( ( config_ptr->empty_reserve > (double)1.0f ) ||
-                   ( config_ptr->empty_reserve < (double)0.0f ) ) ) {
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "epochs_before_eviction must be positive");
+                }
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                            "empty_reserve must be in the interval [0.0, 1.0]");
-            }
+                if (config_ptr->epochs_before_eviction > H5C__MAX_EPOCH_MARKERS) {
 
-            /* no need to check max_decrement as it is a size_t
-             * and thus must be non-negative.
-             */
-        } /* H5C_decr__age_out || H5C_decr__age_out_with_threshold */
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "epochs_before_eviction too big");
+                }
 
-        if ( config_ptr->decr_mode == H5C_decr__age_out_with_threshold ) {
+                if ((config_ptr->apply_empty_reserve != TRUE) && (config_ptr->apply_empty_reserve != FALSE)) {
 
-            if ( ( config_ptr->upper_hr_threshold > (double)1.0f ) ||
-                 ( config_ptr->upper_hr_threshold < (double)0.0f ) ) {
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                "apply_empty_reserve must be either TRUE or FALSE");
+                }
 
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                       "upper_hr_threshold must be in the interval [0.0, 1.0]");
-            }
-        } /* H5C_decr__age_out_with_threshold */
+                if ((config_ptr->apply_empty_reserve) && ((config_ptr->empty_reserve > (double)1.0f) ||
+                                                          (config_ptr->empty_reserve < (double)0.0f))) {
 
-    } /* H5C_RESIZE_CFG__VALIDATE_DECREMENT */
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                "empty_reserve must be in the interval [0.0, 1.0]");
+                }
 
+                /* no need to check max_decrement as it is a size_t
+                 * and thus must be non-negative.
+                 */
+            } /* H5C_decr__age_out || H5C_decr__age_out_with_threshold */
 
-    if ( (tests & H5C_RESIZE_CFG__VALIDATE_INTERACTIONS) != 0 ) {
+            if (config_ptr->decr_mode == H5C_decr__age_out_with_threshold) {
 
-        if ( ( config_ptr->incr_mode == H5C_incr__threshold )
-             &&
-             ( ( config_ptr->decr_mode == H5C_decr__threshold )
-               ||
-               ( config_ptr->decr_mode == H5C_decr__age_out_with_threshold )
-             )
-             &&
-             ( config_ptr->lower_hr_threshold
-               >=
-               config_ptr->upper_hr_threshold
-             )
-           ) {
+                if ((config_ptr->upper_hr_threshold > (double)1.0f) ||
+                    (config_ptr->upper_hr_threshold < (double)0.0f)) {
 
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                        "conflicting threshold fields in config.")
-        }
-    } /* H5C_RESIZE_CFG__VALIDATE_INTERACTIONS */
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                "upper_hr_threshold must be in the interval [0.0, 1.0]");
+                }
+            } /* H5C_decr__age_out_with_threshold */
 
-done:
+        } /* H5C_RESIZE_CFG__VALIDATE_DECREMENT */
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        if ((tests & H5C_RESIZE_CFG__VALIDATE_INTERACTIONS) != 0) {
 
-} /* H5C_validate_resize_config() */
+            if ((config_ptr->incr_mode == H5C_incr__threshold) &&
+                ((config_ptr->decr_mode == H5C_decr__threshold) ||
+                 (config_ptr->decr_mode == H5C_decr__age_out_with_threshold)) &&
+                (config_ptr->lower_hr_threshold >= config_ptr->upper_hr_threshold)) {
 
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "conflicting threshold fields in config.")
+            }
+        } /* H5C_RESIZE_CFG__VALIDATE_INTERACTIONS */
 
-/*************************************************************************/
-/**************************** Private Functions: *************************/
-/*************************************************************************/
+done:
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C__auto_adjust_cache_size
- *
- * Purpose:        Obtain the current full cache hit rate, and compare it
- *        with the hit rate thresholds for modifying cache size.
- *        If one of the thresholds has been crossed, adjusts the
- *        size of the cache accordingly.
- *
- *        The function then resets the full cache hit rate
- *        statistics, and exits.
- *
- * Return:      Non-negative on success/Negative on failure or if there was
- *        an attempt to flush a protected item.
- *
- *
- * Programmer:  John Mainzer, 10/7/04
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C__auto_adjust_cache_size(H5F_t * f,
-                            hid_t primary_dxpl_id,
-                            hid_t secondary_dxpl_id,
-                            hbool_t write_permitted,
-                            hbool_t * first_flush_ptr)
-{
-    H5C_t *            cache_ptr = f->shared->cache;
-    herr_t            result;
-    hbool_t            inserted_epoch_marker = FALSE;
-    size_t            new_max_cache_size = 0;
-    size_t            old_max_cache_size = 0;
-    size_t            new_min_clean_size = 0;
-    size_t            old_min_clean_size = 0;
-    double            hit_rate;
-    enum H5C_resize_status    status = in_spec; /* will change if needed */
-    herr_t            ret_value = SUCCEED;      /* Return value */
+        FUNC_LEAVE_NOAPI(ret_value)
 
-    FUNC_ENTER_NOAPI_NOINIT
+    } /* H5C_validate_resize_config() */
 
-    HDassert( f );
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( cache_ptr->cache_accesses >=
-              (cache_ptr->resize_ctl).epoch_length );
-    HDassert( (double)0.0f <= (cache_ptr->resize_ctl).min_clean_fraction );
-    HDassert( (cache_ptr->resize_ctl).min_clean_fraction <= (double)100.0f );
+    /*************************************************************************/
+    /**************************** Private Functions: *************************/
+    /*************************************************************************/
 
-    if ( !cache_ptr->resize_enabled ) {
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C__auto_adjust_cache_size
+     *
+     * Purpose:        Obtain the current full cache hit rate, and compare it
+     *        with the hit rate thresholds for modifying cache size.
+     *        If one of the thresholds has been crossed, adjusts the
+     *        size of the cache accordingly.
+     *
+     *        The function then resets the full cache hit rate
+     *        statistics, and exits.
+     *
+     * Return:      Non-negative on success/Negative on failure or if there was
+     *        an attempt to flush a protected item.
+     *
+     *
+     * Programmer:  John Mainzer, 10/7/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C__auto_adjust_cache_size(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                              hbool_t write_permitted, hbool_t * first_flush_ptr)
+    {
+        H5C_t *                cache_ptr = f->shared->cache;
+        herr_t                 result;
+        hbool_t                inserted_epoch_marker = FALSE;
+        size_t                 new_max_cache_size    = 0;
+        size_t                 old_max_cache_size    = 0;
+        size_t                 new_min_clean_size    = 0;
+        size_t                 old_min_clean_size    = 0;
+        double                 hit_rate;
+        enum H5C_resize_status status    = in_spec; /* will change if needed */
+        herr_t                 ret_value = SUCCEED; /* Return value */
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Auto cache resize disabled.")
-    }
+        FUNC_ENTER_NOAPI_NOINIT
 
-    HDassert( ( (cache_ptr->resize_ctl).incr_mode != H5C_incr__off ) || \
-              ( (cache_ptr->resize_ctl).decr_mode != H5C_decr__off ) );
+        HDassert(f);
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(cache_ptr->cache_accesses >= (cache_ptr->resize_ctl).epoch_length);
+        HDassert((double)0.0f <= (cache_ptr->resize_ctl).min_clean_fraction);
+        HDassert((cache_ptr->resize_ctl).min_clean_fraction <= (double)100.0f);
 
-    if ( H5C_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED ) {
+        if (!cache_ptr->resize_enabled) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get hit rate.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Auto cache resize disabled.")
+        }
 
-    HDassert( ( (double)0.0f <= hit_rate ) && ( hit_rate <= (double)1.0f ) );
+        HDassert(((cache_ptr->resize_ctl).incr_mode != H5C_incr__off) ||
+                 ((cache_ptr->resize_ctl).decr_mode != H5C_decr__off));
 
-    switch ( (cache_ptr->resize_ctl).incr_mode )
-    {
-        case H5C_incr__off:
-            if ( cache_ptr->size_increase_possible ) {
+        if (H5C_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                           "size_increase_possible but H5C_incr__off?!?!?")
-            }
-            break;
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get hit rate.")
+        }
 
-        case H5C_incr__threshold:
-            if ( hit_rate < (cache_ptr->resize_ctl).lower_hr_threshold ) {
+        HDassert(((double)0.0f <= hit_rate) && (hit_rate <= (double)1.0f));
 
-                if ( ! cache_ptr->size_increase_possible ) {
+        switch ((cache_ptr->resize_ctl).incr_mode) {
+            case H5C_incr__off:
+                if (cache_ptr->size_increase_possible) {
 
-                    status = increase_disabled;
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "size_increase_possible but H5C_incr__off?!?!?")
+                }
+                break;
 
-                } else if ( cache_ptr->max_cache_size >=
-                            (cache_ptr->resize_ctl).max_size ) {
+            case H5C_incr__threshold:
+                if (hit_rate < (cache_ptr->resize_ctl).lower_hr_threshold) {
 
-                    HDassert( cache_ptr->max_cache_size == \
-                              (cache_ptr->resize_ctl).max_size );
-                    status = at_max_size;
+                    if (!cache_ptr->size_increase_possible) {
 
-                } else if ( ! cache_ptr->cache_full ) {
+                        status = increase_disabled;
+                    }
+                    else if (cache_ptr->max_cache_size >= (cache_ptr->resize_ctl).max_size) {
 
-                    status = not_full;
+                        HDassert(cache_ptr->max_cache_size == (cache_ptr->resize_ctl).max_size);
+                        status = at_max_size;
+                    }
+                    else if (!cache_ptr->cache_full) {
 
-                } else {
+                        status = not_full;
+                    }
+                    else {
 
-                    new_max_cache_size = (size_t)
-                                     (((double)(cache_ptr->max_cache_size)) *
-                                      (cache_ptr->resize_ctl).increment);
+                        new_max_cache_size = (size_t)(((double)(cache_ptr->max_cache_size)) *
+                                                      (cache_ptr->resize_ctl).increment);
 
-                    /* clip to max size if necessary */
-                    if ( new_max_cache_size >
-                         (cache_ptr->resize_ctl).max_size ) {
+                        /* clip to max size if necessary */
+                        if (new_max_cache_size > (cache_ptr->resize_ctl).max_size) {
 
-                        new_max_cache_size = (cache_ptr->resize_ctl).max_size;
-                    }
+                            new_max_cache_size = (cache_ptr->resize_ctl).max_size;
+                        }
 
-                    /* clip to max increment if necessary */
-                    if ( ( (cache_ptr->resize_ctl).apply_max_increment ) &&
-                         ( (cache_ptr->max_cache_size +
-                            (cache_ptr->resize_ctl).max_increment) <
-                           new_max_cache_size ) ) {
+                        /* clip to max increment if necessary */
+                        if (((cache_ptr->resize_ctl).apply_max_increment) &&
+                            ((cache_ptr->max_cache_size + (cache_ptr->resize_ctl).max_increment) <
+                             new_max_cache_size)) {
 
-                        new_max_cache_size = cache_ptr->max_cache_size +
-                                         (cache_ptr->resize_ctl).max_increment;
-                    }
+                            new_max_cache_size =
+                                cache_ptr->max_cache_size + (cache_ptr->resize_ctl).max_increment;
+                        }
 
-                    status = increase;
+                        status = increase;
+                    }
                 }
-            }
-            break;
-
-        default:
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown incr_mode.")
-    }
+                break;
 
-    /* If the decr_mode is either age out or age out with threshold, we
-     * must run the marker maintenance code, whether we run the size
-     * reduction code or not.  We do this in two places -- here we
-     * insert a new marker if the number of active epoch markers is
-     * is less than the the current epochs before eviction, and after
-     * the ageout call, we cycle the markers.
-     *
-     * However, we can't call the ageout code or cycle the markers
-     * unless there was a full complement of markers in place on
-     * entry.  The inserted_epoch_marker flag is used to track this.
-     */
+            default:
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown incr_mode.")
+        }
 
-    if ( ( ( (cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out )
-           ||
-           ( (cache_ptr->resize_ctl).decr_mode ==
-              H5C_decr__age_out_with_threshold
-           )
-         )
-         &&
-         ( cache_ptr->epoch_markers_active <
-           (cache_ptr->resize_ctl).epochs_before_eviction
-         )
-       ) {
+        /* If the decr_mode is either age out or age out with threshold, we
+         * must run the marker maintenance code, whether we run the size
+         * reduction code or not.  We do this in two places -- here we
+         * insert a new marker if the number of active epoch markers is
+         * is less than the the current epochs before eviction, and after
+         * the ageout call, we cycle the markers.
+         *
+         * However, we can't call the ageout code or cycle the markers
+         * unless there was a full complement of markers in place on
+         * entry.  The inserted_epoch_marker flag is used to track this.
+         */
 
-        result = H5C__autoadjust__ageout__insert_new_marker(cache_ptr);
+        if ((((cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out) ||
+             ((cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out_with_threshold)) &&
+            (cache_ptr->epoch_markers_active < (cache_ptr->resize_ctl).epochs_before_eviction)) {
 
-        if ( result != SUCCEED ) {
+            result = H5C__autoadjust__ageout__insert_new_marker(cache_ptr);
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "can't insert new epoch marker.")
+            if (result != SUCCEED) {
 
-        } else {
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "can't insert new epoch marker.")
+            }
+            else {
 
-            inserted_epoch_marker = TRUE;
+                inserted_epoch_marker = TRUE;
+            }
         }
-    }
 
-    /* don't run the cache size decrease code unless the cache size
-     * increase code is disabled, or the size increase code sees no need
-     * for action.  In either case, status == in_spec at this point.
-     */
+        /* don't run the cache size decrease code unless the cache size
+         * increase code is disabled, or the size increase code sees no need
+         * for action.  In either case, status == in_spec at this point.
+         */
 
-    if ( status == in_spec ) {
+        if (status == in_spec) {
 
-        switch ( (cache_ptr->resize_ctl).decr_mode )
-        {
-            case H5C_decr__off:
-                break;
-
-            case H5C_decr__threshold:
-                if ( hit_rate > (cache_ptr->resize_ctl).upper_hr_threshold ) {
+            switch ((cache_ptr->resize_ctl).decr_mode) {
+                case H5C_decr__off:
+                    break;
 
-                    if ( ! cache_ptr->size_decrease_possible ) {
+                case H5C_decr__threshold:
+                    if (hit_rate > (cache_ptr->resize_ctl).upper_hr_threshold) {
 
-                        status = decrease_disabled;
+                        if (!cache_ptr->size_decrease_possible) {
 
-                    } else if ( cache_ptr->max_cache_size <=
-                                (cache_ptr->resize_ctl).min_size ) {
+                            status = decrease_disabled;
+                        }
+                        else if (cache_ptr->max_cache_size <= (cache_ptr->resize_ctl).min_size) {
 
-                        HDassert( cache_ptr->max_cache_size ==
-                                  (cache_ptr->resize_ctl).min_size );
-                        status = at_min_size;
+                            HDassert(cache_ptr->max_cache_size == (cache_ptr->resize_ctl).min_size);
+                            status = at_min_size;
+                        }
+                        else {
 
-                    } else {
+                            new_max_cache_size = (size_t)(((double)(cache_ptr->max_cache_size)) *
+                                                          (cache_ptr->resize_ctl).decrement);
 
-                        new_max_cache_size = (size_t)
-                                 (((double)(cache_ptr->max_cache_size)) *
-                                  (cache_ptr->resize_ctl).decrement);
+                            /* clip to min size if necessary */
+                            if (new_max_cache_size < (cache_ptr->resize_ctl).min_size) {
 
-                        /* clip to min size if necessary */
-                        if ( new_max_cache_size <
-                             (cache_ptr->resize_ctl).min_size ) {
+                                new_max_cache_size = (cache_ptr->resize_ctl).min_size;
+                            }
 
-                            new_max_cache_size =
-                                (cache_ptr->resize_ctl).min_size;
-                        }
+                            /* clip to max decrement if necessary */
+                            if (((cache_ptr->resize_ctl).apply_max_decrement) &&
+                                (((cache_ptr->resize_ctl).max_decrement + new_max_cache_size) <
+                                 cache_ptr->max_cache_size)) {
 
-                        /* clip to max decrement if necessary */
-                        if ( ( (cache_ptr->resize_ctl).apply_max_decrement ) &&
-                             ( ((cache_ptr->resize_ctl).max_decrement +
-                                new_max_cache_size) <
-                               cache_ptr->max_cache_size ) ) {
+                                new_max_cache_size =
+                                    cache_ptr->max_cache_size - (cache_ptr->resize_ctl).max_decrement;
+                            }
 
-                            new_max_cache_size = cache_ptr->max_cache_size -
-                                         (cache_ptr->resize_ctl).max_decrement;
+                            status = decrease;
                         }
-
-                        status = decrease;
                     }
-                }
-                break;
-
-            case H5C_decr__age_out_with_threshold:
-            case H5C_decr__age_out:
-                if ( ! inserted_epoch_marker ) {
+                    break;
 
-                    if ( ! cache_ptr->size_decrease_possible ) {
+                case H5C_decr__age_out_with_threshold:
+                case H5C_decr__age_out:
+                    if (!inserted_epoch_marker) {
 
-                        status = decrease_disabled;
+                        if (!cache_ptr->size_decrease_possible) {
 
-                    } else {
+                            status = decrease_disabled;
+                        }
+                        else {
 
-                        result = H5C__autoadjust__ageout(f,
-                                                         hit_rate,
-                                                         &status,
-                                                         &new_max_cache_size,
-                                                         primary_dxpl_id,
-                                                         secondary_dxpl_id,
-                                                         write_permitted,
-                                                         first_flush_ptr);
+                            result = H5C__autoadjust__ageout(f, hit_rate, &status, &new_max_cache_size,
+                                                             primary_dxpl_id, secondary_dxpl_id,
+                                                             write_permitted, first_flush_ptr);
 
-                        if ( result != SUCCEED ) {
+                            if (result != SUCCEED) {
 
-                            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                                        "ageout code failed.")
+                                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ageout code failed.")
+                            }
                         }
                     }
-                }
-                break;
+                    break;
 
-            default:
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown incr_mode.")
+                default:
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown incr_mode.")
+            }
         }
-    }
 
-    /* cycle the epoch markers here if appropriate */
-    if ( ( ( (cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out )
-           ||
-           ( (cache_ptr->resize_ctl).decr_mode ==
-              H5C_decr__age_out_with_threshold
-           )
-         )
-         &&
-         ( ! inserted_epoch_marker )
-       ) {
+        /* cycle the epoch markers here if appropriate */
+        if ((((cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out) ||
+             ((cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out_with_threshold)) &&
+            (!inserted_epoch_marker)) {
 
-        /* move last epoch marker to the head of the LRU list */
-        result = H5C__autoadjust__ageout__cycle_epoch_marker(cache_ptr);
+            /* move last epoch marker to the head of the LRU list */
+            result = H5C__autoadjust__ageout__cycle_epoch_marker(cache_ptr);
 
-        if ( result != SUCCEED ) {
+            if (result != SUCCEED) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "error cycling epoch marker.")
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "error cycling epoch marker.")
+            }
         }
-    }
 
-    if ( ( status == increase ) || ( status == decrease ) ) {
+        if ((status == increase) || (status == decrease)) {
 
-        old_max_cache_size = cache_ptr->max_cache_size;
-        old_min_clean_size = cache_ptr->min_clean_size;
+            old_max_cache_size = cache_ptr->max_cache_size;
+            old_min_clean_size = cache_ptr->min_clean_size;
 
-        new_min_clean_size = (size_t)
-                             ((double)new_max_cache_size *
-                              ((cache_ptr->resize_ctl).min_clean_fraction));
-
-        /* new_min_clean_size is of size_t, and thus must be non-negative.
-         * Hence we have
-         *
-         *     ( 0 <= new_min_clean_size ).
-         *
-    * by definition.
-         */
-        HDassert( new_min_clean_size <= new_max_cache_size );
-        HDassert( (cache_ptr->resize_ctl).min_size <= new_max_cache_size );
-        HDassert( new_max_cache_size <= (cache_ptr->resize_ctl).max_size );
+            new_min_clean_size =
+                (size_t)((double)new_max_cache_size * ((cache_ptr->resize_ctl).min_clean_fraction));
 
-        cache_ptr->max_cache_size = new_max_cache_size;
-        cache_ptr->min_clean_size = new_min_clean_size;
+            /* new_min_clean_size is of size_t, and thus must be non-negative.
+             * Hence we have
+             *
+             *     ( 0 <= new_min_clean_size ).
+             *
+             * by definition.
+             */
+            HDassert(new_min_clean_size <= new_max_cache_size);
+            HDassert((cache_ptr->resize_ctl).min_size <= new_max_cache_size);
+            HDassert(new_max_cache_size <= (cache_ptr->resize_ctl).max_size);
 
-        if ( status == increase ) {
+            cache_ptr->max_cache_size = new_max_cache_size;
+            cache_ptr->min_clean_size = new_min_clean_size;
 
-            cache_ptr->cache_full = FALSE;
+            if (status == increase) {
 
-        } else if ( status == decrease ) {
+                cache_ptr->cache_full = FALSE;
+            }
+            else if (status == decrease) {
 
-            cache_ptr->size_decreased = TRUE;
-        }
+                cache_ptr->size_decreased = TRUE;
+            }
 
-    /* update flash cache size increase fields as appropriate */
-    if ( cache_ptr->flash_size_increase_possible ) {
+            /* update flash cache size increase fields as appropriate */
+            if (cache_ptr->flash_size_increase_possible) {
 
-            switch ( (cache_ptr->resize_ctl).flash_incr_mode )
-            {
-                case H5C_flash_incr__off:
+                switch ((cache_ptr->resize_ctl).flash_incr_mode) {
+                    case H5C_flash_incr__off:
 
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                     "flash_size_increase_possible but H5C_flash_incr__off?!")
-                    break;
+                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL,
+                                    "flash_size_increase_possible but H5C_flash_incr__off?!")
+                        break;
 
-                case H5C_flash_incr__add_space:
-                    cache_ptr->flash_size_increase_threshold =
-                        (size_t)
-                        (((double)(cache_ptr->max_cache_size)) *
-                         ((cache_ptr->resize_ctl).flash_threshold));
-                     break;
+                    case H5C_flash_incr__add_space:
+                        cache_ptr->flash_size_increase_threshold =
+                            (size_t)(((double)(cache_ptr->max_cache_size)) *
+                                     ((cache_ptr->resize_ctl).flash_threshold));
+                        break;
 
-                default: /* should be unreachable */
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                                "Unknown flash_incr_mode?!?!?.")
-                    break;
+                    default: /* should be unreachable */
+                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown flash_incr_mode?!?!?.")
+                        break;
+                }
             }
         }
-    }
 
-    if ( (cache_ptr->resize_ctl).rpt_fcn != NULL ) {
-
-        (*((cache_ptr->resize_ctl).rpt_fcn))
-            (cache_ptr,
-             H5C__CURR_AUTO_RESIZE_RPT_FCN_VER,
-             hit_rate,
-             status,
-             old_max_cache_size,
-             new_max_cache_size,
-             old_min_clean_size,
-             new_min_clean_size);
-    }
+        if ((cache_ptr->resize_ctl).rpt_fcn != NULL) {
 
-    if ( H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
+            (*((cache_ptr->resize_ctl).rpt_fcn))(cache_ptr, H5C__CURR_AUTO_RESIZE_RPT_FCN_VER, hit_rate,
+                                                 status, old_max_cache_size, new_max_cache_size,
+                                                 old_min_clean_size, new_min_clean_size);
+        }
 
-        /* this should be impossible... */
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C_reset_cache_hit_rate_stats failed.")
-    }
+        if (H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED) {
 
-done:
+            /* this should be impossible... */
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_reset_cache_hit_rate_stats failed.")
+        }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+done:
 
-} /* H5C__auto_adjust_cache_size() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C__auto_adjust_cache_size() */
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C__autoadjust__ageout
- *
- * Purpose:     Implement the ageout automatic cache size decrement
- *        algorithm.  Note that while this code evicts aged out
- *        entries, the code does not change the maximum cache size.
- *        Instead, the function simply computes the new value (if
- *        any change is indicated) and reports this value in
- *        *new_max_cache_size_ptr.
- *
- * Return:      Non-negative on success/Negative on failure or if there was
- *              an attempt to flush a protected item.
- *
- *
- * Programmer:  John Mainzer, 11/18/04
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C__autoadjust__ageout(H5F_t * f,
-                        double hit_rate,
-                        enum H5C_resize_status * status_ptr,
-                        size_t * new_max_cache_size_ptr,
-                        hid_t primary_dxpl_id,
-                        hid_t secondary_dxpl_id,
-                        hbool_t write_permitted,
-                        hbool_t * first_flush_ptr)
-{
-    H5C_t *     cache_ptr = f->shared->cache;
-    herr_t    result;
-    size_t    test_size;
-    herr_t    ret_value = SUCCEED;      /* Return value */
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C__autoadjust__ageout
+     *
+     * Purpose:     Implement the ageout automatic cache size decrement
+     *        algorithm.  Note that while this code evicts aged out
+     *        entries, the code does not change the maximum cache size.
+     *        Instead, the function simply computes the new value (if
+     *        any change is indicated) and reports this value in
+     *        *new_max_cache_size_ptr.
+     *
+     * Return:      Non-negative on success/Negative on failure or if there was
+     *              an attempt to flush a protected item.
+     *
+     *
+     * Programmer:  John Mainzer, 11/18/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C__autoadjust__ageout(
+        H5F_t * f, double hit_rate, enum H5C_resize_status *status_ptr, size_t *new_max_cache_size_ptr,
+        hid_t primary_dxpl_id, hid_t secondary_dxpl_id, hbool_t write_permitted, hbool_t *first_flush_ptr)
+    {
+        H5C_t *cache_ptr = f->shared->cache;
+        herr_t result;
+        size_t test_size;
+        herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+        FUNC_ENTER_NOAPI_NOINIT
 
-    HDassert( f );
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( ( status_ptr ) && ( *status_ptr == in_spec ) );
-    HDassert( ( new_max_cache_size_ptr ) && ( *new_max_cache_size_ptr == 0 ) );
+        HDassert(f);
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert((status_ptr) && (*status_ptr == in_spec));
+        HDassert((new_max_cache_size_ptr) && (*new_max_cache_size_ptr == 0));
 
-    /* remove excess epoch markers if any */
-    if ( cache_ptr->epoch_markers_active >
-         (cache_ptr->resize_ctl).epochs_before_eviction ) {
+        /* remove excess epoch markers if any */
+        if (cache_ptr->epoch_markers_active > (cache_ptr->resize_ctl).epochs_before_eviction) {
 
-        result = H5C__autoadjust__ageout__remove_excess_markers(cache_ptr);
+            result = H5C__autoadjust__ageout__remove_excess_markers(cache_ptr);
 
-        if ( result != SUCCEED ) {
+            if (result != SUCCEED) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "can't remove excess epoch markers.")
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "can't remove excess epoch markers.")
+            }
         }
-    }
 
-    if ( ( (cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out )
-         ||
-         ( ( (cache_ptr->resize_ctl).decr_mode ==
-              H5C_decr__age_out_with_threshold
-               )
-           &&
-           ( hit_rate >= (cache_ptr->resize_ctl).upper_hr_threshold )
-         )
-       ) {
+        if (((cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out) ||
+            (((cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out_with_threshold) &&
+             (hit_rate >= (cache_ptr->resize_ctl).upper_hr_threshold))) {
 
-        if ( cache_ptr->max_cache_size > (cache_ptr->resize_ctl).min_size ){
+            if (cache_ptr->max_cache_size > (cache_ptr->resize_ctl).min_size) {
 
-            /* evict aged out cache entries if appropriate... */
-            if(H5C__autoadjust__ageout__evict_aged_out_entries(f, primary_dxpl_id,
-                    secondary_dxpl_id, write_permitted, first_flush_ptr) < 0)
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "error flushing aged out entries.")
+                /* evict aged out cache entries if appropriate... */
+                if (H5C__autoadjust__ageout__evict_aged_out_entries(f, primary_dxpl_id, secondary_dxpl_id,
+                                                                    write_permitted, first_flush_ptr) < 0)
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "error flushing aged out entries.")
 
-            /* ... and then reduce cache size if appropriate */
-            if ( cache_ptr->index_size < cache_ptr->max_cache_size ) {
+                /* ... and then reduce cache size if appropriate */
+                if (cache_ptr->index_size < cache_ptr->max_cache_size) {
 
-                if ( (cache_ptr->resize_ctl).apply_empty_reserve ) {
+                    if ((cache_ptr->resize_ctl).apply_empty_reserve) {
 
-                    test_size = (size_t)(((double)cache_ptr->index_size) /
-                                (1 - (cache_ptr->resize_ctl).empty_reserve));
+                        test_size = (size_t)(((double)cache_ptr->index_size) /
+                                             (1 - (cache_ptr->resize_ctl).empty_reserve));
 
-                    if ( test_size < cache_ptr->max_cache_size ) {
+                        if (test_size < cache_ptr->max_cache_size) {
 
-                        *status_ptr = decrease;
-                        *new_max_cache_size_ptr = test_size;
+                            *status_ptr             = decrease;
+                            *new_max_cache_size_ptr = test_size;
+                        }
                     }
-                } else {
+                    else {
 
-                    *status_ptr = decrease;
-                    *new_max_cache_size_ptr = cache_ptr->index_size;
-                }
+                        *status_ptr             = decrease;
+                        *new_max_cache_size_ptr = cache_ptr->index_size;
+                    }
 
-                if ( *status_ptr == decrease ) {
+                    if (*status_ptr == decrease) {
 
-                    /* clip to min size if necessary */
-                    if ( *new_max_cache_size_ptr <
-                         (cache_ptr->resize_ctl).min_size ) {
+                        /* clip to min size if necessary */
+                        if (*new_max_cache_size_ptr < (cache_ptr->resize_ctl).min_size) {
 
-                        *new_max_cache_size_ptr =
-                                (cache_ptr->resize_ctl).min_size;
-                    }
+                            *new_max_cache_size_ptr = (cache_ptr->resize_ctl).min_size;
+                        }
 
-                    /* clip to max decrement if necessary */
-                    if ( ( (cache_ptr->resize_ctl).apply_max_decrement ) &&
-                         ( ((cache_ptr->resize_ctl).max_decrement +
-                            *new_max_cache_size_ptr) <
-                           cache_ptr->max_cache_size ) ) {
+                        /* clip to max decrement if necessary */
+                        if (((cache_ptr->resize_ctl).apply_max_decrement) &&
+                            (((cache_ptr->resize_ctl).max_decrement + *new_max_cache_size_ptr) <
+                             cache_ptr->max_cache_size)) {
 
-                        *new_max_cache_size_ptr = cache_ptr->max_cache_size -
-                                         (cache_ptr->resize_ctl).max_decrement;
+                            *new_max_cache_size_ptr =
+                                cache_ptr->max_cache_size - (cache_ptr->resize_ctl).max_decrement;
+                        }
                     }
                 }
             }
-        } else {
+            else {
 
-            *status_ptr = at_min_size;
+                *status_ptr = at_min_size;
+            }
         }
-    }
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C__autoadjust__ageout() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C__autoadjust__ageout() */
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C__autoadjust__ageout__cycle_epoch_marker
- *
- * Purpose:     Remove the oldest epoch marker from the LRU list,
- *        and reinsert it at the head of the LRU list.  Also
- *        remove the epoch marker's index from the head of the
- *        ring buffer, and re-insert it at the tail of the ring
- *        buffer.
- *
- * Return:      SUCCEED on success/FAIL on failure.
- *
- * Programmer:  John Mainzer, 11/22/04
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t * cache_ptr)
-{
-    herr_t                      ret_value = SUCCEED;      /* Return value */
-    int i;
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C__autoadjust__ageout__cycle_epoch_marker
+     *
+     * Purpose:     Remove the oldest epoch marker from the LRU list,
+     *        and reinsert it at the head of the LRU list.  Also
+     *        remove the epoch marker's index from the head of the
+     *        ring buffer, and re-insert it at the tail of the ring
+     *        buffer.
+     *
+     * Return:      SUCCEED on success/FAIL on failure.
+     *
+     * Programmer:  John Mainzer, 11/22/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t * cache_ptr)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
+        int    i;
 
-    FUNC_ENTER_NOAPI_NOINIT
+        FUNC_ENTER_NOAPI_NOINIT
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if ( cache_ptr->epoch_markers_active <= 0 ) {
+        if (cache_ptr->epoch_markers_active <= 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "No active epoch markers on entry?!?!?.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "No active epoch markers on entry?!?!?.")
+        }
 
-    /* remove the last marker from both the ring buffer and the LRU list */
+        /* remove the last marker from both the ring buffer and the LRU list */
 
-    i = cache_ptr->epoch_marker_ringbuf[cache_ptr->epoch_marker_ringbuf_first];
+        i = cache_ptr->epoch_marker_ringbuf[cache_ptr->epoch_marker_ringbuf_first];
 
-    cache_ptr->epoch_marker_ringbuf_first =
-            (cache_ptr->epoch_marker_ringbuf_first + 1) %
-            (H5C__MAX_EPOCH_MARKERS + 1);
+        cache_ptr->epoch_marker_ringbuf_first =
+            (cache_ptr->epoch_marker_ringbuf_first + 1) % (H5C__MAX_EPOCH_MARKERS + 1);
 
-    cache_ptr->epoch_marker_ringbuf_size -= 1;
+        cache_ptr->epoch_marker_ringbuf_size -= 1;
 
-    if ( cache_ptr->epoch_marker_ringbuf_size < 0 ) {
+        if (cache_ptr->epoch_marker_ringbuf_size < 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer underflow.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer underflow.")
+        }
 
-    if ( (cache_ptr->epoch_marker_active)[i] != TRUE ) {
+        if ((cache_ptr->epoch_marker_active)[i] != TRUE) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unused marker in LRU?!?")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unused marker in LRU?!?")
+        }
 
-    H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
-                    (cache_ptr)->LRU_head_ptr, \
-                    (cache_ptr)->LRU_tail_ptr, \
-                    (cache_ptr)->LRU_list_len, \
-                    (cache_ptr)->LRU_list_size, \
-                    (FAIL))
+        H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), (cache_ptr)->LRU_head_ptr,
+                        (cache_ptr)->LRU_tail_ptr, (cache_ptr)->LRU_list_len, (cache_ptr)->LRU_list_size,
+                        (FAIL))
 
-    /* now, re-insert it at the head of the LRU list, and at the tail of
-     * the ring buffer.
-     */
+        /* now, re-insert it at the head of the LRU list, and at the tail of
+         * the ring buffer.
+         */
 
-    HDassert( ((cache_ptr->epoch_markers)[i]).addr == (haddr_t)i );
-    HDassert( ((cache_ptr->epoch_markers)[i]).next == NULL );
-    HDassert( ((cache_ptr->epoch_markers)[i]).prev == NULL );
+        HDassert(((cache_ptr->epoch_markers)[i]).addr == (haddr_t)i);
+        HDassert(((cache_ptr->epoch_markers)[i]).next == NULL);
+        HDassert(((cache_ptr->epoch_markers)[i]).prev == NULL);
 
-    cache_ptr->epoch_marker_ringbuf_last =
-        (cache_ptr->epoch_marker_ringbuf_last + 1) %
-        (H5C__MAX_EPOCH_MARKERS + 1);
+        cache_ptr->epoch_marker_ringbuf_last =
+            (cache_ptr->epoch_marker_ringbuf_last + 1) % (H5C__MAX_EPOCH_MARKERS + 1);
 
-    (cache_ptr->epoch_marker_ringbuf)[cache_ptr->epoch_marker_ringbuf_last] = i;
+        (cache_ptr->epoch_marker_ringbuf)[cache_ptr->epoch_marker_ringbuf_last] = i;
 
-    cache_ptr->epoch_marker_ringbuf_size += 1;
+        cache_ptr->epoch_marker_ringbuf_size += 1;
 
-    if ( cache_ptr->epoch_marker_ringbuf_size > H5C__MAX_EPOCH_MARKERS ) {
+        if (cache_ptr->epoch_marker_ringbuf_size > H5C__MAX_EPOCH_MARKERS) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer overflow.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer overflow.")
+        }
 
-    H5C__DLL_PREPEND((&((cache_ptr->epoch_markers)[i])), \
-                     (cache_ptr)->LRU_head_ptr, \
-                     (cache_ptr)->LRU_tail_ptr, \
-                     (cache_ptr)->LRU_list_len, \
-                     (cache_ptr)->LRU_list_size, \
-                     (FAIL))
+        H5C__DLL_PREPEND((&((cache_ptr->epoch_markers)[i])), (cache_ptr)->LRU_head_ptr,
+                         (cache_ptr)->LRU_tail_ptr, (cache_ptr)->LRU_list_len, (cache_ptr)->LRU_list_size,
+                         (FAIL))
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C__autoadjust__ageout__cycle_epoch_marker() */
+    } /* H5C__autoadjust__ageout__cycle_epoch_marker() */
 
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C__autoadjust__ageout__evict_aged_out_entries
+     *
+     * Purpose:     Evict clean entries in the cache that haven't
+     *        been accessed for at least
+     *              (cache_ptr->resize_ctl).epochs_before_eviction epochs,
+     *          and flush dirty entries that haven't been accessed for
+     *        that amount of time.
+     *
+     *        Depending on configuration, the function will either
+     *        flush or evict all such entries, or all such entries it
+     *        encounters until it has freed the maximum amount of space
+     *        allowed under the maximum decrement.
+     *
+     *        If we are running in parallel mode, writes may not be
+     *        permitted.  If so, the function simply skips any dirty
+     *        entries it may encounter.
+     *
+     *        The function makes no attempt to maintain the minimum
+     *        clean size, as there is no guarantee that the cache size
+     *        will be changed.
+     *
+     *        If there is no cache size change, the minimum clean size
+     *        constraint will be met through a combination of clean
+     *        entries and free space in the cache.
+     *
+     *        If there is a cache size reduction, the minimum clean size
+     *        will be re-calculated, and will be enforced the next time
+     *        we have to make space in the cache.
+     *
+     *              The primary_dxpl_id and secondary_dxpl_id parameters
+     *              specify the dxpl_ids used depending on the value of
+     *        *first_flush_ptr.  The idea is to use the primary_dxpl_id
+     *        on the first write in a sequence of writes, and to use
+     *        the secondary_dxpl_id on all subsequent writes.
+     *
+     *              This is useful in the metadata cache, but may not be
+     *        needed elsewhere.  If so, just use the same dxpl_id for
+     *        both parameters.
+     *
+     *              Observe that this function cannot occasion a read.
+     *
+     * Return:      Non-negative on success/Negative on failure.
+     *
+     * Programmer:  John Mainzer, 11/22/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C__autoadjust__ageout__evict_aged_out_entries(
+        H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, hbool_t write_permitted,
+        hbool_t * first_flush_ptr)
+    {
+        H5C_t *            cache_ptr = f->shared->cache;
+        herr_t             result;
+        size_t             eviction_size_limit;
+        size_t             bytes_evicted = 0;
+        hbool_t            prev_is_dirty = FALSE;
+        H5C_cache_entry_t *entry_ptr;
+        H5C_cache_entry_t *next_ptr;
+        H5C_cache_entry_t *prev_ptr;
+        herr_t             ret_value = SUCCEED; /* Return value */
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C__autoadjust__ageout__evict_aged_out_entries
- *
- * Purpose:     Evict clean entries in the cache that haven't
- *        been accessed for at least
- *              (cache_ptr->resize_ctl).epochs_before_eviction epochs,
- *          and flush dirty entries that haven't been accessed for
- *        that amount of time.
- *
- *        Depending on configuration, the function will either
- *        flush or evict all such entries, or all such entries it
- *        encounters until it has freed the maximum amount of space
- *        allowed under the maximum decrement.
- *
- *        If we are running in parallel mode, writes may not be
- *        permitted.  If so, the function simply skips any dirty
- *        entries it may encounter.
- *
- *        The function makes no attempt to maintain the minimum
- *        clean size, as there is no guarantee that the cache size
- *        will be changed.
- *
- *        If there is no cache size change, the minimum clean size
- *        constraint will be met through a combination of clean
- *        entries and free space in the cache.
- *
- *        If there is a cache size reduction, the minimum clean size
- *        will be re-calculated, and will be enforced the next time
- *        we have to make space in the cache.
- *
- *              The primary_dxpl_id and secondary_dxpl_id parameters
- *              specify the dxpl_ids used depending on the value of
- *        *first_flush_ptr.  The idea is to use the primary_dxpl_id
- *        on the first write in a sequence of writes, and to use
- *        the secondary_dxpl_id on all subsequent writes.
- *
- *              This is useful in the metadata cache, but may not be
- *        needed elsewhere.  If so, just use the same dxpl_id for
- *        both parameters.
- *
- *              Observe that this function cannot occasion a read.
- *
- * Return:      Non-negative on success/Negative on failure.
- *
- * Programmer:  John Mainzer, 11/22/04
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
-                                                hid_t   primary_dxpl_id,
-                                                hid_t   secondary_dxpl_id,
-                                                hbool_t write_permitted,
-                                                hbool_t * first_flush_ptr)
-{
-    H5C_t *        cache_ptr = f->shared->cache;
-    herr_t              result;
-    size_t        eviction_size_limit;
-    size_t        bytes_evicted = 0;
-    hbool_t        prev_is_dirty = FALSE;
-    H5C_cache_entry_t * entry_ptr;
-    H5C_cache_entry_t * next_ptr;
-    H5C_cache_entry_t * prev_ptr;
-    herr_t              ret_value = SUCCEED;      /* Return value */
+        FUNC_ENTER_NOAPI_NOINIT
 
-    FUNC_ENTER_NOAPI_NOINIT
+        HDassert(f);
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    HDassert( f );
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+        /* if there is a limit on the amount that the cache size can be decrease
+         * in any one round of the cache size reduction algorithm, load that
+         * limit into eviction_size_limit.  Otherwise, set eviction_size_limit
+         * to the equivalent of infinity.  The current size of the index will
+         * do nicely.
+         */
+        if ((cache_ptr->resize_ctl).apply_max_decrement) {
 
-    /* if there is a limit on the amount that the cache size can be decrease
-     * in any one round of the cache size reduction algorithm, load that
-     * limit into eviction_size_limit.  Otherwise, set eviction_size_limit
-     * to the equivalent of infinity.  The current size of the index will
-     * do nicely.
-     */
-    if ( (cache_ptr->resize_ctl).apply_max_decrement ) {
+            eviction_size_limit = (cache_ptr->resize_ctl).max_decrement;
+        }
+        else {
 
-        eviction_size_limit = (cache_ptr->resize_ctl).max_decrement;
+            eviction_size_limit = cache_ptr->index_size; /* i.e. infinity */
+        }
 
-    } else {
+        if (write_permitted) {
 
-        eviction_size_limit = cache_ptr->index_size; /* i.e. infinity */
-    }
+            entry_ptr = cache_ptr->LRU_tail_ptr;
 
-    if ( write_permitted ) {
+            while ((entry_ptr != NULL) && ((entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE) &&
+                   (bytes_evicted < eviction_size_limit)) {
+                HDassert(!(entry_ptr->is_protected));
 
-        entry_ptr = cache_ptr->LRU_tail_ptr;
+                next_ptr = entry_ptr->next;
+                prev_ptr = entry_ptr->prev;
 
-        while ( ( entry_ptr != NULL ) &&
-                ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) &&
-                ( bytes_evicted < eviction_size_limit ) )
-        {
-            HDassert( ! (entry_ptr->is_protected) );
+                if (prev_ptr != NULL) {
 
-        next_ptr = entry_ptr->next;
-            prev_ptr = entry_ptr->prev;
+                    prev_is_dirty = prev_ptr->is_dirty;
+                }
 
-        if ( prev_ptr != NULL ) {
+                if (entry_ptr->is_dirty) {
 
-                prev_is_dirty = prev_ptr->is_dirty;
-            }
+                    result =
+                        H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, entry_ptr->type,
+                                               entry_ptr->addr, H5C__NO_FLAGS_SET, first_flush_ptr, FALSE);
+                }
+                else {
 
-            if ( entry_ptr->is_dirty ) {
-
-                result = H5C_flush_single_entry(f,
-                                                primary_dxpl_id,
-                                                secondary_dxpl_id,
-                                                entry_ptr->type,
-                                                entry_ptr->addr,
-                                                H5C__NO_FLAGS_SET,
-                                                first_flush_ptr,
-                                                FALSE);
-            } else {
-
-                bytes_evicted += entry_ptr->size;
-
-                result = H5C_flush_single_entry(f,
-                                                primary_dxpl_id,
-                                                secondary_dxpl_id,
-                                                entry_ptr->type,
-                                                entry_ptr->addr,
-                                                H5C__FLUSH_INVALIDATE_FLAG,
-                                                first_flush_ptr,
-                                                TRUE);
-            }
+                    bytes_evicted += entry_ptr->size;
 
-            if ( result < 0 ) {
+                    result = H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, entry_ptr->type,
+                                                    entry_ptr->addr, H5C__FLUSH_INVALIDATE_FLAG,
+                                                    first_flush_ptr, TRUE);
+                }
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                            "unable to flush entry")
-            }
+                if (result < 0) {
 
-            if ( prev_ptr != NULL ) {
-#ifndef NDEBUG
-                if ( prev_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC ) {
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush entry")
+                }
 
-                    /* something horrible has happened to *prev_ptr --
-                     * scream and die.
-                     */
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                                "*prev_ptr corrupt")
+                if (prev_ptr != NULL) {
+#ifndef NDEBUG
+                    if (prev_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC) {
 
-                } else
+                        /* something horrible has happened to *prev_ptr --
+                         * scream and die.
+                         */
+                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "*prev_ptr corrupt")
+                    }
+                    else
 #endif /* NDEBUG */
-        if ( ( prev_ptr->is_dirty != prev_is_dirty )
-                         ||
-                         ( prev_ptr->next != next_ptr )
-                         ||
-                         ( prev_ptr->is_protected )
-                         ||
-                         ( prev_ptr->is_pinned ) ) {
-
-                    /* something has happened to the LRU -- start over
-            * from the tail.
-                     */
-                    entry_ptr = cache_ptr->LRU_tail_ptr;
-
-                } else {
+                        if ((prev_ptr->is_dirty != prev_is_dirty) || (prev_ptr->next != next_ptr) ||
+                            (prev_ptr->is_protected) || (prev_ptr->is_pinned)) {
 
-                    entry_ptr = prev_ptr;
+                        /* something has happened to the LRU -- start over
+                         * from the tail.
+                         */
+                        entry_ptr = cache_ptr->LRU_tail_ptr;
+                    }
+                    else {
 
+                        entry_ptr = prev_ptr;
+                    }
                 }
-        } else {
+                else {
 
-        entry_ptr = NULL;
+                    entry_ptr = NULL;
+                }
+            } /* end while */
 
+            /* for now at least, don't bother to maintain the minimum clean size,
+             * as the cache should now be less than its maximum size.  Due to
+             * the vaguries of the cache size reduction algorthim, we may not
+             * reduce the size of the cache.
+             *
+             * If we do, we will calculate a new minimum clean size, which will
+             * be enforced the next time we try to make space in the cache.
+             *
+             * If we don't, no action is necessary, as we have just evicted and/or
+             * or flushed a bunch of entries and therefore the sum of the clean
+             * and free space in the cache must be greater than or equal to the
+             * min clean space requirement (assuming that requirement was met on
+             * entry).
+             */
         }
-        } /* end while */
+        else /* ! write_permitted */ {
 
-        /* for now at least, don't bother to maintain the minimum clean size,
-         * as the cache should now be less than its maximum size.  Due to
-         * the vaguries of the cache size reduction algorthim, we may not
-         * reduce the size of the cache.
-         *
-         * If we do, we will calculate a new minimum clean size, which will
-         * be enforced the next time we try to make space in the cache.
-         *
-         * If we don't, no action is necessary, as we have just evicted and/or
-         * or flushed a bunch of entries and therefore the sum of the clean
-         * and free space in the cache must be greater than or equal to the
-         * min clean space requirement (assuming that requirement was met on
-         * entry).
-         */
-
-    } else /* ! write_permitted */  {
-
-        /* since we are not allowed to write, all we can do is evict
-         * any clean entries that we may encounter before we either
-         * hit the eviction size limit, or encounter the epoch marker.
-         *
-         * If we are operating read only, this isn't an issue, as there
-         * will not be any dirty entries.
-         *
-         * If we are operating in R/W mode, all the dirty entries we
-         * skip will be flushed the next time we attempt to make space
-         * when writes are permitted.  This may have some local
-         * performance implications, but it shouldn't cause any net
-         * slowdown.
-         */
+            /* since we are not allowed to write, all we can do is evict
+             * any clean entries that we may encounter before we either
+             * hit the eviction size limit, or encounter the epoch marker.
+             *
+             * If we are operating read only, this isn't an issue, as there
+             * will not be any dirty entries.
+             *
+             * If we are operating in R/W mode, all the dirty entries we
+             * skip will be flushed the next time we attempt to make space
+             * when writes are permitted.  This may have some local
+             * performance implications, but it shouldn't cause any net
+             * slowdown.
+             */
 
-        HDassert( H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS );
+            HDassert(H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS);
 
-        entry_ptr = cache_ptr->LRU_tail_ptr;
+            entry_ptr = cache_ptr->LRU_tail_ptr;
 
-        while ( ( entry_ptr != NULL ) &&
-                ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) &&
-                ( bytes_evicted < eviction_size_limit ) )
-        {
-            HDassert( ! (entry_ptr->is_protected) );
+            while ((entry_ptr != NULL) && ((entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE) &&
+                   (bytes_evicted < eviction_size_limit)) {
+                HDassert(!(entry_ptr->is_protected));
 
-            prev_ptr = entry_ptr->prev;
+                prev_ptr = entry_ptr->prev;
 
-            if ( ! (entry_ptr->is_dirty) ) {
+                if (!(entry_ptr->is_dirty)) {
 
-                result = H5C_flush_single_entry(f,
-                                                primary_dxpl_id,
-                                                secondary_dxpl_id,
-                                                entry_ptr->type,
-                                                entry_ptr->addr,
-                                                H5C__FLUSH_INVALIDATE_FLAG,
-                                                first_flush_ptr,
-                                                TRUE);
+                    result = H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, entry_ptr->type,
+                                                    entry_ptr->addr, H5C__FLUSH_INVALIDATE_FLAG,
+                                                    first_flush_ptr, TRUE);
 
-                if ( result < 0 ) {
+                    if (result < 0) {
 
-                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                                "unable to flush clean entry")
+                        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush clean entry")
+                    }
                 }
-            }
-            /* just skip the entry if it is dirty, as we can't do
-             * anything with it now since we can't write.
-             */
+                /* just skip the entry if it is dirty, as we can't do
+                 * anything with it now since we can't write.
+                 */
 
-            entry_ptr = prev_ptr;
+                entry_ptr = prev_ptr;
 
-        } /* end while */
-    }
+            } /* end while */
+        }
 
-    if ( cache_ptr->index_size < cache_ptr->max_cache_size ) {
+        if (cache_ptr->index_size < cache_ptr->max_cache_size) {
 
-        cache_ptr->cache_full = FALSE;
-    }
+            cache_ptr->cache_full = FALSE;
+        }
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C__autoadjust__ageout__evict_aged_out_entries() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C__autoadjust__ageout__evict_aged_out_entries() */
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C__autoadjust__ageout__insert_new_marker
- *
- * Purpose:     Find an unused marker cache entry, mark it as used, and
- *        insert it at the head of the LRU list.  Also add the
- *        marker's index in the epoch_markers array.
- *
- * Return:      SUCCEED on success/FAIL on failure.
- *
- * Programmer:  John Mainzer, 11/19/04
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C__autoadjust__ageout__insert_new_marker(H5C_t * cache_ptr)
-{
-    herr_t                      ret_value = SUCCEED;      /* Return value */
-    int i;
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C__autoadjust__ageout__insert_new_marker
+     *
+     * Purpose:     Find an unused marker cache entry, mark it as used, and
+     *        insert it at the head of the LRU list.  Also add the
+     *        marker's index in the epoch_markers array.
+     *
+     * Return:      SUCCEED on success/FAIL on failure.
+     *
+     * Programmer:  John Mainzer, 11/19/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C__autoadjust__ageout__insert_new_marker(H5C_t * cache_ptr)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
+        int    i;
 
-    FUNC_ENTER_NOAPI_NOINIT
+        FUNC_ENTER_NOAPI_NOINIT
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if ( cache_ptr->epoch_markers_active >=
-         (cache_ptr->resize_ctl).epochs_before_eviction ) {
+        if (cache_ptr->epoch_markers_active >= (cache_ptr->resize_ctl).epochs_before_eviction) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "Already have a full complement of markers.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Already have a full complement of markers.")
+        }
 
-    /* find an unused marker */
-    i = 0;
-    while ( ( (cache_ptr->epoch_marker_active)[i] ) &&
-            ( i < H5C__MAX_EPOCH_MARKERS ) )
-    {
-        i++;
-    }
+        /* find an unused marker */
+        i = 0;
+        while (((cache_ptr->epoch_marker_active)[i]) && (i < H5C__MAX_EPOCH_MARKERS)) {
+            i++;
+        }
 
-    if(i >= H5C__MAX_EPOCH_MARKERS)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't find unused marker.")
+        if (i >= H5C__MAX_EPOCH_MARKERS)
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't find unused marker.")
 
-    HDassert( ((cache_ptr->epoch_markers)[i]).addr == (haddr_t)i );
-    HDassert( ((cache_ptr->epoch_markers)[i]).next == NULL );
-    HDassert( ((cache_ptr->epoch_markers)[i]).prev == NULL );
+        HDassert(((cache_ptr->epoch_markers)[i]).addr == (haddr_t)i);
+        HDassert(((cache_ptr->epoch_markers)[i]).next == NULL);
+        HDassert(((cache_ptr->epoch_markers)[i]).prev == NULL);
 
-    (cache_ptr->epoch_marker_active)[i] = TRUE;
+        (cache_ptr->epoch_marker_active)[i] = TRUE;
 
-    cache_ptr->epoch_marker_ringbuf_last =
-        (cache_ptr->epoch_marker_ringbuf_last + 1) %
-        (H5C__MAX_EPOCH_MARKERS + 1);
+        cache_ptr->epoch_marker_ringbuf_last =
+            (cache_ptr->epoch_marker_ringbuf_last + 1) % (H5C__MAX_EPOCH_MARKERS + 1);
 
-    (cache_ptr->epoch_marker_ringbuf)[cache_ptr->epoch_marker_ringbuf_last] = i;
+        (cache_ptr->epoch_marker_ringbuf)[cache_ptr->epoch_marker_ringbuf_last] = i;
 
-    cache_ptr->epoch_marker_ringbuf_size += 1;
+        cache_ptr->epoch_marker_ringbuf_size += 1;
 
-    if ( cache_ptr->epoch_marker_ringbuf_size > H5C__MAX_EPOCH_MARKERS ) {
+        if (cache_ptr->epoch_marker_ringbuf_size > H5C__MAX_EPOCH_MARKERS) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer overflow.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer overflow.")
+        }
 
-    H5C__DLL_PREPEND((&((cache_ptr->epoch_markers)[i])), \
-                     (cache_ptr)->LRU_head_ptr, \
-                     (cache_ptr)->LRU_tail_ptr, \
-                     (cache_ptr)->LRU_list_len, \
-                     (cache_ptr)->LRU_list_size, \
-                     (FAIL))
+        H5C__DLL_PREPEND((&((cache_ptr->epoch_markers)[i])), (cache_ptr)->LRU_head_ptr,
+                         (cache_ptr)->LRU_tail_ptr, (cache_ptr)->LRU_list_len, (cache_ptr)->LRU_list_size,
+                         (FAIL))
 
-    cache_ptr->epoch_markers_active += 1;
+        cache_ptr->epoch_markers_active += 1;
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C__autoadjust__ageout__insert_new_marker() */
+    } /* H5C__autoadjust__ageout__insert_new_marker() */
 
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C__autoadjust__ageout__remove_all_markers
+     *
+     * Purpose:     Remove all epoch markers from the LRU list and mark them
+     *        as inactive.
+     *
+     * Return:      SUCCEED on success/FAIL on failure.
+     *
+     * Programmer:  John Mainzer, 11/22/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
+        int    i;
+        int    ring_buf_index;
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C__autoadjust__ageout__remove_all_markers
- *
- * Purpose:     Remove all epoch markers from the LRU list and mark them
- *        as inactive.
- *
- * Return:      SUCCEED on success/FAIL on failure.
- *
- * Programmer:  John Mainzer, 11/22/04
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr)
-{
-    herr_t                      ret_value = SUCCEED;      /* Return value */
-    int i;
-    int ring_buf_index;
+        FUNC_ENTER_NOAPI_NOINIT
 
-    FUNC_ENTER_NOAPI_NOINIT
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+        while (cache_ptr->epoch_markers_active > 0) {
+            /* get the index of the last epoch marker in the LRU list
+             * and remove it from the ring buffer.
+             */
 
-    while ( cache_ptr->epoch_markers_active > 0 )
-    {
-        /* get the index of the last epoch marker in the LRU list
-         * and remove it from the ring buffer.
-         */
+            ring_buf_index = cache_ptr->epoch_marker_ringbuf_first;
+            i              = (cache_ptr->epoch_marker_ringbuf)[ring_buf_index];
 
-        ring_buf_index = cache_ptr->epoch_marker_ringbuf_first;
-        i = (cache_ptr->epoch_marker_ringbuf)[ring_buf_index];
+            cache_ptr->epoch_marker_ringbuf_first =
+                (cache_ptr->epoch_marker_ringbuf_first + 1) % (H5C__MAX_EPOCH_MARKERS + 1);
 
-        cache_ptr->epoch_marker_ringbuf_first =
-            (cache_ptr->epoch_marker_ringbuf_first + 1) %
-            (H5C__MAX_EPOCH_MARKERS + 1);
+            cache_ptr->epoch_marker_ringbuf_size -= 1;
 
-        cache_ptr->epoch_marker_ringbuf_size -= 1;
+            if (cache_ptr->epoch_marker_ringbuf_size < 0) {
 
-        if ( cache_ptr->epoch_marker_ringbuf_size < 0 ) {
-
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer underflow.")
-        }
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer underflow.")
+            }
 
-        if ( (cache_ptr->epoch_marker_active)[i] != TRUE ) {
+            if ((cache_ptr->epoch_marker_active)[i] != TRUE) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unused marker in LRU?!?")
-        }
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unused marker in LRU?!?")
+            }
 
-        /* remove the epoch marker from the LRU list */
-        H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
-                        (cache_ptr)->LRU_head_ptr, \
-                        (cache_ptr)->LRU_tail_ptr, \
-                        (cache_ptr)->LRU_list_len, \
-                        (cache_ptr)->LRU_list_size, \
-                        (FAIL))
+            /* remove the epoch marker from the LRU list */
+            H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), (cache_ptr)->LRU_head_ptr,
+                            (cache_ptr)->LRU_tail_ptr, (cache_ptr)->LRU_list_len, (cache_ptr)->LRU_list_size,
+                            (FAIL))
 
-        /* mark the epoch marker as unused. */
-        (cache_ptr->epoch_marker_active)[i] = FALSE;
+            /* mark the epoch marker as unused. */
+            (cache_ptr->epoch_marker_active)[i] = FALSE;
 
-        HDassert( ((cache_ptr->epoch_markers)[i]).addr == (haddr_t)i );
-        HDassert( ((cache_ptr->epoch_markers)[i]).next == NULL );
-        HDassert( ((cache_ptr->epoch_markers)[i]).prev == NULL );
+            HDassert(((cache_ptr->epoch_markers)[i]).addr == (haddr_t)i);
+            HDassert(((cache_ptr->epoch_markers)[i]).next == NULL);
+            HDassert(((cache_ptr->epoch_markers)[i]).prev == NULL);
 
-        /* decrement the number of active epoch markers */
-        cache_ptr->epoch_markers_active -= 1;
+            /* decrement the number of active epoch markers */
+            cache_ptr->epoch_markers_active -= 1;
 
-        HDassert( cache_ptr->epoch_markers_active == \
-                  cache_ptr->epoch_marker_ringbuf_size );
-    }
+            HDassert(cache_ptr->epoch_markers_active == cache_ptr->epoch_marker_ringbuf_size);
+        }
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C__autoadjust__ageout__remove_all_markers() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C__autoadjust__ageout__remove_all_markers() */
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C__autoadjust__ageout__remove_excess_markers
- *
- * Purpose:     Remove epoch markers from the end of the LRU list and
- *        mark them as inactive until the number of active markers
- *        equals the the current value of
- *        (cache_ptr->resize_ctl).epochs_before_eviction.
- *
- * Return:      SUCCEED on success/FAIL on failure.
- *
- * Programmer:  John Mainzer, 11/19/04
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr)
-{
-    herr_t    ret_value = SUCCEED;      /* Return value */
-    int        i;
-    int        ring_buf_index;
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C__autoadjust__ageout__remove_excess_markers
+     *
+     * Purpose:     Remove epoch markers from the end of the LRU list and
+     *        mark them as inactive until the number of active markers
+     *        equals the the current value of
+     *        (cache_ptr->resize_ctl).epochs_before_eviction.
+     *
+     * Return:      SUCCEED on success/FAIL on failure.
+     *
+     * Programmer:  John Mainzer, 11/19/04
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr)
+    {
+        herr_t ret_value = SUCCEED; /* Return value */
+        int    i;
+        int    ring_buf_index;
 
-    FUNC_ENTER_NOAPI_NOINIT
+        FUNC_ENTER_NOAPI_NOINIT
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if ( cache_ptr->epoch_markers_active <=
-         (cache_ptr->resize_ctl).epochs_before_eviction ) {
+        if (cache_ptr->epoch_markers_active <= (cache_ptr->resize_ctl).epochs_before_eviction) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "no excess markers on entry.")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "no excess markers on entry.")
+        }
 
-    while ( cache_ptr->epoch_markers_active >
-            (cache_ptr->resize_ctl).epochs_before_eviction )
-    {
-        /* get the index of the last epoch marker in the LRU list
-         * and remove it from the ring buffer.
-         */
+        while (cache_ptr->epoch_markers_active > (cache_ptr->resize_ctl).epochs_before_eviction) {
+            /* get the index of the last epoch marker in the LRU list
+             * and remove it from the ring buffer.
+             */
 
-        ring_buf_index = cache_ptr->epoch_marker_ringbuf_first;
-        i = (cache_ptr->epoch_marker_ringbuf)[ring_buf_index];
+            ring_buf_index = cache_ptr->epoch_marker_ringbuf_first;
+            i              = (cache_ptr->epoch_marker_ringbuf)[ring_buf_index];
 
-        cache_ptr->epoch_marker_ringbuf_first =
-            (cache_ptr->epoch_marker_ringbuf_first + 1) %
-            (H5C__MAX_EPOCH_MARKERS + 1);
+            cache_ptr->epoch_marker_ringbuf_first =
+                (cache_ptr->epoch_marker_ringbuf_first + 1) % (H5C__MAX_EPOCH_MARKERS + 1);
 
-        cache_ptr->epoch_marker_ringbuf_size -= 1;
+            cache_ptr->epoch_marker_ringbuf_size -= 1;
 
-        if ( cache_ptr->epoch_marker_ringbuf_size < 0 ) {
+            if (cache_ptr->epoch_marker_ringbuf_size < 0) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer underflow.")
-        }
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer underflow.")
+            }
 
-        if ( (cache_ptr->epoch_marker_active)[i] != TRUE ) {
+            if ((cache_ptr->epoch_marker_active)[i] != TRUE) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unused marker in LRU?!?")
-        }
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unused marker in LRU?!?")
+            }
 
-        /* remove the epoch marker from the LRU list */
-        H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
-                        (cache_ptr)->LRU_head_ptr, \
-                        (cache_ptr)->LRU_tail_ptr, \
-                        (cache_ptr)->LRU_list_len, \
-                        (cache_ptr)->LRU_list_size, \
-                        (FAIL))
+            /* remove the epoch marker from the LRU list */
+            H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), (cache_ptr)->LRU_head_ptr,
+                            (cache_ptr)->LRU_tail_ptr, (cache_ptr)->LRU_list_len, (cache_ptr)->LRU_list_size,
+                            (FAIL))
 
-        /* mark the epoch marker as unused. */
-        (cache_ptr->epoch_marker_active)[i] = FALSE;
+            /* mark the epoch marker as unused. */
+            (cache_ptr->epoch_marker_active)[i] = FALSE;
 
-        HDassert( ((cache_ptr->epoch_markers)[i]).addr == (haddr_t)i );
-        HDassert( ((cache_ptr->epoch_markers)[i]).next == NULL );
-        HDassert( ((cache_ptr->epoch_markers)[i]).prev == NULL );
+            HDassert(((cache_ptr->epoch_markers)[i]).addr == (haddr_t)i);
+            HDassert(((cache_ptr->epoch_markers)[i]).next == NULL);
+            HDassert(((cache_ptr->epoch_markers)[i]).prev == NULL);
 
-        /* decrement the number of active epoch markers */
-        cache_ptr->epoch_markers_active -= 1;
+            /* decrement the number of active epoch markers */
+            cache_ptr->epoch_markers_active -= 1;
 
-        HDassert( cache_ptr->epoch_markers_active == \
-                  cache_ptr->epoch_marker_ringbuf_size );
-    }
+            HDassert(cache_ptr->epoch_markers_active == cache_ptr->epoch_marker_ringbuf_size);
+        }
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C__autoadjust__ageout__remove_excess_markers() */
+    } /* H5C__autoadjust__ageout__remove_excess_markers() */
 
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C__flash_increase_cache_size
+     *
+     * Purpose:     If there is not at least new_entry_size - old_entry_size
+     *              bytes of free space in the cache and the current
+     *              max_cache_size is less than (cache_ptr->resize_ctl).max_size,
+     *              perform a flash increase in the cache size and then reset
+     *              the full cache hit rate statistics, and exit.
+     *
+     * Return:      Non-negative on success/Negative on failure.
+     *
+     * Programmer:  John Mainzer, 12/31/07
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C__flash_increase_cache_size(H5C_t * cache_ptr, size_t old_entry_size,
+                                                 size_t new_entry_size)
+    {
+        size_t                 new_max_cache_size = 0;
+        size_t                 old_max_cache_size = 0;
+        size_t                 new_min_clean_size = 0;
+        size_t                 old_min_clean_size = 0;
+        size_t                 space_needed;
+        enum H5C_resize_status status = flash_increase; /* may change */
+        double                 hit_rate;
+        herr_t                 ret_value = SUCCEED; /* Return value */
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C__flash_increase_cache_size
- *
- * Purpose:     If there is not at least new_entry_size - old_entry_size
- *              bytes of free space in the cache and the current
- *              max_cache_size is less than (cache_ptr->resize_ctl).max_size,
- *              perform a flash increase in the cache size and then reset
- *              the full cache hit rate statistics, and exit.
- *
- * Return:      Non-negative on success/Negative on failure.
- *
- * Programmer:  John Mainzer, 12/31/07
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C__flash_increase_cache_size(H5C_t * cache_ptr,
-                               size_t old_entry_size,
-                               size_t new_entry_size)
-{
-    size_t                     new_max_cache_size = 0;
-    size_t                     old_max_cache_size = 0;
-    size_t                     new_min_clean_size = 0;
-    size_t                     old_min_clean_size = 0;
-    size_t                     space_needed;
-    enum H5C_resize_status     status = flash_increase;  /* may change */
-    double                     hit_rate;
-    herr_t                     ret_value = SUCCEED;      /* Return value */
+        FUNC_ENTER_NOAPI_NOINIT
 
-    FUNC_ENTER_NOAPI_NOINIT
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(cache_ptr->flash_size_increase_possible);
+        HDassert(new_entry_size > cache_ptr->flash_size_increase_threshold);
+        HDassert(old_entry_size < new_entry_size);
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( cache_ptr->flash_size_increase_possible );
-    HDassert( new_entry_size > cache_ptr->flash_size_increase_threshold );
-    HDassert( old_entry_size < new_entry_size );
+        if (old_entry_size >= new_entry_size) {
 
-    if ( old_entry_size >= new_entry_size ) {
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "old_entry_size >= new_entry_size")
+        }
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "old_entry_size >= new_entry_size")
-    }
+        space_needed = new_entry_size - old_entry_size;
 
-    space_needed = new_entry_size - old_entry_size;
+        if (((cache_ptr->index_size + space_needed) > cache_ptr->max_cache_size) &&
+            (cache_ptr->max_cache_size < (cache_ptr->resize_ctl).max_size)) {
 
-    if ( ( (cache_ptr->index_size + space_needed) >
-                            cache_ptr->max_cache_size ) &&
-         ( cache_ptr->max_cache_size < (cache_ptr->resize_ctl).max_size ) ) {
+            /* we have work to do */
 
-        /* we have work to do */
+            switch ((cache_ptr->resize_ctl).flash_incr_mode) {
+                case H5C_flash_incr__off:
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL,
+                                "flash_size_increase_possible but H5C_flash_incr__off?!")
+                    break;
 
-        switch ( (cache_ptr->resize_ctl).flash_incr_mode )
-        {
-            case H5C_flash_incr__off:
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                   "flash_size_increase_possible but H5C_flash_incr__off?!")
-                break;
+                case H5C_flash_incr__add_space:
+                    if (cache_ptr->index_size < cache_ptr->max_cache_size) {
 
-            case H5C_flash_incr__add_space:
-                if ( cache_ptr->index_size < cache_ptr->max_cache_size ) {
+                        HDassert((cache_ptr->max_cache_size - cache_ptr->index_size) < space_needed);
+                        space_needed -= cache_ptr->max_cache_size - cache_ptr->index_size;
+                    }
+                    space_needed = (size_t)(((double)space_needed) * (cache_ptr->resize_ctl).flash_multiple);
 
-                    HDassert( (cache_ptr->max_cache_size - cache_ptr->index_size)
-                               < space_needed );
-                    space_needed -= cache_ptr->max_cache_size -
-                        cache_ptr->index_size;
-                }
-                space_needed =
-                    (size_t)(((double)space_needed) *
-                             (cache_ptr->resize_ctl).flash_multiple);
+                    new_max_cache_size = cache_ptr->max_cache_size + space_needed;
 
-                new_max_cache_size = cache_ptr->max_cache_size + space_needed;
+                    break;
 
-                break;
+                default: /* should be unreachable */
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown flash_incr_mode?!?!?.")
+                    break;
+            }
 
-            default: /* should be unreachable */
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "Unknown flash_incr_mode?!?!?.")
-                break;
-        }
+            if (new_max_cache_size > (cache_ptr->resize_ctl).max_size) {
 
-        if ( new_max_cache_size > (cache_ptr->resize_ctl).max_size ) {
+                new_max_cache_size = (cache_ptr->resize_ctl).max_size;
+            }
 
-            new_max_cache_size = (cache_ptr->resize_ctl).max_size;
-        }
+            HDassert(new_max_cache_size > cache_ptr->max_cache_size);
 
-        HDassert( new_max_cache_size > cache_ptr->max_cache_size );
+            new_min_clean_size =
+                (size_t)((double)new_max_cache_size * ((cache_ptr->resize_ctl).min_clean_fraction));
 
-        new_min_clean_size = (size_t)
-                             ((double)new_max_cache_size *
-                              ((cache_ptr->resize_ctl).min_clean_fraction));
+            HDassert(new_min_clean_size <= new_max_cache_size);
 
-        HDassert( new_min_clean_size <= new_max_cache_size );
+            old_max_cache_size = cache_ptr->max_cache_size;
+            old_min_clean_size = cache_ptr->min_clean_size;
 
-        old_max_cache_size = cache_ptr->max_cache_size;
-        old_min_clean_size = cache_ptr->min_clean_size;
+            cache_ptr->max_cache_size = new_max_cache_size;
+            cache_ptr->min_clean_size = new_min_clean_size;
 
-        cache_ptr->max_cache_size = new_max_cache_size;
-        cache_ptr->min_clean_size = new_min_clean_size;
+            /* update flash cache size increase fields as appropriate */
+            HDassert(cache_ptr->flash_size_increase_possible);
 
-        /* update flash cache size increase fields as appropriate */
-        HDassert ( cache_ptr->flash_size_increase_possible );
+            switch ((cache_ptr->resize_ctl).flash_incr_mode) {
+                case H5C_flash_incr__off:
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL,
+                                "flash_size_increase_possible but H5C_flash_incr__off?!")
+                    break;
 
-        switch ( (cache_ptr->resize_ctl).flash_incr_mode )
-        {
-            case H5C_flash_incr__off:
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "flash_size_increase_possible but H5C_flash_incr__off?!")
-                break;
+                case H5C_flash_incr__add_space:
+                    cache_ptr->flash_size_increase_threshold = (size_t)(
+                        ((double)(cache_ptr->max_cache_size)) * ((cache_ptr->resize_ctl).flash_threshold));
+                    break;
 
-            case H5C_flash_incr__add_space:
-                cache_ptr->flash_size_increase_threshold =
-                    (size_t)
-                    (((double)(cache_ptr->max_cache_size)) *
-                     ((cache_ptr->resize_ctl).flash_threshold));
-                break;
+                default: /* should be unreachable */
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown flash_incr_mode?!?!?.")
+                    break;
+            }
 
-            default: /* should be unreachable */
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "Unknown flash_incr_mode?!?!?.")
-                break;
-        }
+            /* note that we don't cycle the epoch markers.  We can
+             * argue either way as to whether we should, but for now
+             * we don't.
+             */
 
-        /* note that we don't cycle the epoch markers.  We can
-    * argue either way as to whether we should, but for now
-    * we don't.
-    */
+            if ((cache_ptr->resize_ctl).rpt_fcn != NULL) {
 
-        if ( (cache_ptr->resize_ctl).rpt_fcn != NULL ) {
+                /* get the hit rate for the reporting function.  Should still
+                 * be good as we haven't reset the hit rate statistics.
+                 */
+                if (H5C_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED) {
 
-            /* get the hit rate for the reporting function.  Should still
-             * be good as we haven't reset the hit rate statistics.
-             */
-            if ( H5C_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED ) {
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get hit rate.")
+                }
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get hit rate.")
+                (*((cache_ptr->resize_ctl).rpt_fcn))(cache_ptr, H5C__CURR_AUTO_RESIZE_RPT_FCN_VER, hit_rate,
+                                                     status, old_max_cache_size, new_max_cache_size,
+                                                     old_min_clean_size, new_min_clean_size);
             }
 
-            (*((cache_ptr->resize_ctl).rpt_fcn))
-                (cache_ptr,
-                 H5C__CURR_AUTO_RESIZE_RPT_FCN_VER,
-                 hit_rate,
-                 status,
-                 old_max_cache_size,
-                 new_max_cache_size,
-                 old_min_clean_size,
-                 new_min_clean_size);
-        }
-
-        if ( H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
+            if (H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED) {
 
-            /* this should be impossible... */
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C_reset_cache_hit_rate_stats failed.")
+                /* this should be impossible... */
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_reset_cache_hit_rate_stats failed.")
+            }
         }
-    }
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C__flash_increase_cache_size() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C__flash_increase_cache_size() */
 
-/*-------------------------------------------------------------------------
- * Function:    H5C_flush_invalidate_cache
- *
- * Purpose:    Flush and destroy the entries contained in the target
- *        cache.
- *
- *        If the cache contains protected entries, the function will
- *        fail, as protected entries cannot be either flushed or
- *        destroyed.  However all unprotected entries should be
- *        flushed and destroyed before the function returns failure.
- *
- *        While pinned entries can usually be flushed, they cannot
- *        be destroyed.  However, they should be unpinned when all
- *        the entries that reference them have been destroyed (thus
- *        reduding the pinned entry's reference count to 0, allowing
- *        it to be unpinned).
- *
- *        If pinned entries are present, the function makes repeated
- *        passes through the cache, flushing all dirty entries
- *        (including the pinned dirty entries where permitted) and
- *        destroying all unpinned entries.  This process is repeated
- *        until either the cache is empty, or the number of pinned
- *        entries stops decreasing on each pass.
- *
- *        The primary_dxpl_id and secondary_dxpl_id parameters
- *        specify the dxpl_ids used on the first write occasioned
- *        by the flush (primary_dxpl_id), and on all subsequent
- *        writes (secondary_dxpl_id).
- *
- * Return:      Non-negative on success/Negative on failure or if there was
- *        a request to flush all items and something was protected.
- *
- * Programmer:  John Mainzer
- *        3/24/065
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C_flush_invalidate_cache(H5F_t * f,
-                           hid_t    primary_dxpl_id,
-                           hid_t    secondary_dxpl_id,
-            unsigned flags)
-{
-    H5C_t *        cache_ptr = f->shared->cache;
-    herr_t              status;
-    hbool_t        first_flush = TRUE;
-    int32_t        protected_entries = 0;
-    int32_t        i;
-    int32_t        cur_pel_len;
-    int32_t        old_pel_len;
-    int32_t        passes = 0;
-    unsigned        cooked_flags;
-    H5SL_node_t *     node_ptr = NULL;
-    H5C_cache_entry_t *    entry_ptr = NULL;
-    H5C_cache_entry_t *    next_entry_ptr = NULL;
+    /*-------------------------------------------------------------------------
+     * Function:    H5C_flush_invalidate_cache
+     *
+     * Purpose:    Flush and destroy the entries contained in the target
+     *        cache.
+     *
+     *        If the cache contains protected entries, the function will
+     *        fail, as protected entries cannot be either flushed or
+     *        destroyed.  However all unprotected entries should be
+     *        flushed and destroyed before the function returns failure.
+     *
+     *        While pinned entries can usually be flushed, they cannot
+     *        be destroyed.  However, they should be unpinned when all
+     *        the entries that reference them have been destroyed (thus
+     *        reduding the pinned entry's reference count to 0, allowing
+     *        it to be unpinned).
+     *
+     *        If pinned entries are present, the function makes repeated
+     *        passes through the cache, flushing all dirty entries
+     *        (including the pinned dirty entries where permitted) and
+     *        destroying all unpinned entries.  This process is repeated
+     *        until either the cache is empty, or the number of pinned
+     *        entries stops decreasing on each pass.
+     *
+     *        The primary_dxpl_id and secondary_dxpl_id parameters
+     *        specify the dxpl_ids used on the first write occasioned
+     *        by the flush (primary_dxpl_id), and on all subsequent
+     *        writes (secondary_dxpl_id).
+     *
+     * Return:      Non-negative on success/Negative on failure or if there was
+     *        a request to flush all items and something was protected.
+     *
+     * Programmer:  John Mainzer
+     *        3/24/065
+     *
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C_flush_invalidate_cache(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                             unsigned flags)
+    {
+        H5C_t *            cache_ptr = f->shared->cache;
+        herr_t             status;
+        hbool_t            first_flush       = TRUE;
+        int32_t            protected_entries = 0;
+        int32_t            i;
+        int32_t            cur_pel_len;
+        int32_t            old_pel_len;
+        int32_t            passes = 0;
+        unsigned           cooked_flags;
+        H5SL_node_t *      node_ptr       = NULL;
+        H5C_cache_entry_t *entry_ptr      = NULL;
+        H5C_cache_entry_t *next_entry_ptr = NULL;
 #if H5C_DO_SANITY_CHECKS
-    int64_t        actual_slist_len = 0;
-    int64_t        initial_slist_len = 0;
-    size_t              actual_slist_size = 0;
-    size_t              initial_slist_size = 0;
+        int64_t actual_slist_len   = 0;
+        int64_t initial_slist_len  = 0;
+        size_t  actual_slist_size  = 0;
+        size_t  initial_slist_size = 0;
 #endif /* H5C_DO_SANITY_CHECKS */
-    herr_t        ret_value = SUCCEED;
+        herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(FAIL)
+        FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert( f );
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( cache_ptr->slist_ptr );
+        HDassert(f);
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(cache_ptr->slist_ptr);
 
-    /* Filter out the flags that are not relevant to the flush/invalidate.
-     * At present, only the H5C__FLUSH_CLEAR_ONLY_FLAG is kept.
-     */
-    cooked_flags = flags & H5C__FLUSH_CLEAR_ONLY_FLAG;
+        /* Filter out the flags that are not relevant to the flush/invalidate.
+         * At present, only the H5C__FLUSH_CLEAR_ONLY_FLAG is kept.
+         */
+        cooked_flags = flags & H5C__FLUSH_CLEAR_ONLY_FLAG;
 
-    /* remove ageout markers if present */
-    if ( cache_ptr->epoch_markers_active > 0 ) {
+        /* remove ageout markers if present */
+        if (cache_ptr->epoch_markers_active > 0) {
 
-        status = H5C__autoadjust__ageout__remove_all_markers(cache_ptr);
+            status = H5C__autoadjust__ageout__remove_all_markers(cache_ptr);
 
-        if ( status != SUCCEED ) {
+            if (status != SUCCEED) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "error removing all epoch markers.")
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "error removing all epoch markers.")
+            }
         }
-    }
 
-    /* The flush procedure here is a bit strange.
-     *
-     * In the outer while loop we make at least one pass through the
-     * cache, and then repeat until either all the pinned entries
-     * unpin themselves, or until the number of pinned entries stops
-     * declining.  In this later case, we scream and die.
-     *
-     * Since the fractal heap can dirty, resize, and/or move entries
-     * in is flush callback, it is possible that the cache will still
-     * contain dirty entries at this point.  If so, we must make up to
-     * H5C__MAX_PASSES_ON_FLUSH more passes through the skip list
-     * to allow it to empty.  If is is not empty at this point, we again
-     * scream and die.
-     *
-     * Further, since clean entries can be dirtied, resized, and/or moved
-     * as the result of a flush call back (either the entries own, or that
-     * for some other cache entry), we can no longer promise to flush
-     * the cache entries in increasing address order.
-     *
-     * Instead, we just do the best we can -- making a pass through
-     * the skip list, and then a pass through the "clean" entries, and
-     * then repeating as needed.  Thus it is quite possible that an
-     * entry will be evicted from the cache only to be re-loaded later
-     * in the flush process (From what Quincey tells me, the pin
-     * mechanism makes this impossible, but even it it is true now,
-     * we shouldn't count on it in the future.)
-     *
-     * The bottom line is that entries will probably be flushed in close
-     * to increasing address order, but there are no guarantees.
-     */
-
-    cur_pel_len = cache_ptr->pel_len;
-    old_pel_len = cache_ptr->pel_len;
+        /* The flush procedure here is a bit strange.
+         *
+         * In the outer while loop we make at least one pass through the
+         * cache, and then repeat until either all the pinned entries
+         * unpin themselves, or until the number of pinned entries stops
+         * declining.  In this later case, we scream and die.
+         *
+         * Since the fractal heap can dirty, resize, and/or move entries
+         * in is flush callback, it is possible that the cache will still
+         * contain dirty entries at this point.  If so, we must make up to
+         * H5C__MAX_PASSES_ON_FLUSH more passes through the skip list
+         * to allow it to empty.  If is is not empty at this point, we again
+         * scream and die.
+         *
+         * Further, since clean entries can be dirtied, resized, and/or moved
+         * as the result of a flush call back (either the entries own, or that
+         * for some other cache entry), we can no longer promise to flush
+         * the cache entries in increasing address order.
+         *
+         * Instead, we just do the best we can -- making a pass through
+         * the skip list, and then a pass through the "clean" entries, and
+         * then repeating as needed.  Thus it is quite possible that an
+         * entry will be evicted from the cache only to be re-loaded later
+         * in the flush process (From what Quincey tells me, the pin
+         * mechanism makes this impossible, but even it it is true now,
+         * we shouldn't count on it in the future.)
+         *
+         * The bottom line is that entries will probably be flushed in close
+         * to increasing address order, but there are no guarantees.
+         */
 
-    while ( cache_ptr->index_len > 0 )
-    {
-    /* first, try to flush-destroy any dirty entries.   Do this by
-    * making a scan through the slist.  Note that new dirty entries
-    * may be created by the flush call backs.  Thus it is possible
-    * that the slist will not be empty after we finish the scan.
-    */
+        cur_pel_len = cache_ptr->pel_len;
+        old_pel_len = cache_ptr->pel_len;
 
-        if ( cache_ptr->slist_len == 0 ) {
+        while (cache_ptr->index_len > 0) {
+            /* first, try to flush-destroy any dirty entries.   Do this by
+             * making a scan through the slist.  Note that new dirty entries
+             * may be created by the flush call backs.  Thus it is possible
+             * that the slist will not be empty after we finish the scan.
+             */
 
-            node_ptr = NULL;
-            HDassert( cache_ptr->slist_size == 0 );
+            if (cache_ptr->slist_len == 0) {
 
-        } else {
+                node_ptr = NULL;
+                HDassert(cache_ptr->slist_size == 0);
+            }
+            else {
 
-            node_ptr = H5SL_first(cache_ptr->slist_ptr);
+                node_ptr = H5SL_first(cache_ptr->slist_ptr);
 
-            if ( node_ptr == NULL ) {
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "slist_len != 0 && node_ptr == NULL");
-            }
+                if (node_ptr == NULL) {
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "slist_len != 0 && node_ptr == NULL");
+                }
 
-            next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
+                next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
 
-            if ( next_entry_ptr == NULL ) {
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "next_entry_ptr == NULL 1 ?!?!");
-            }
+                if (next_entry_ptr == NULL) {
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "next_entry_ptr == NULL 1 ?!?!");
+                }
 #ifndef NDEBUG
-        HDassert( next_entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC );
+                HDassert(next_entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
 #endif /* NDEBUG */
-            HDassert( next_entry_ptr->is_dirty );
-            HDassert( next_entry_ptr->in_slist );
-
-        }
+                HDassert(next_entry_ptr->is_dirty);
+                HDassert(next_entry_ptr->in_slist);
+            }
 
 #if H5C_DO_SANITY_CHECKS
-        /* Depending on circumstances, H5C_flush_single_entry() will
-         * remove dirty entries from the slist as it flushes them.
-         * Thus for sanity checks we must make note of the initial
-         * slist length and size before we do any flushes.
-         */
-        initial_slist_len = cache_ptr->slist_len;
-        initial_slist_size = cache_ptr->slist_size;
-
-        /* There is also the possibility that entries will be
-         * dirtied, resized, and/or moved as the result of
-         * calls to the flush callbacks.  We use the slist_len_increase
-         * and slist_size_increase increase fields in struct H5C_t
-         * to track these changes for purpose of sanity checking.
-         * To this end, we must zero these fields before we start
-         * the pass through the slist.
-         */
-        cache_ptr->slist_len_increase = 0;
-        cache_ptr->slist_size_increase = 0;
-
-    /* Finally, reset the actual_slist_len and actual_slist_size
-    * fields to zero, as these fields are used to accumulate
-    * the slist lenght and size that we see as we scan through
-    * the slist.
-    */
-    actual_slist_len = 0;
-    actual_slist_size = 0;
-#endif /* H5C_DO_SANITY_CHECKS */
+            /* Depending on circumstances, H5C_flush_single_entry() will
+             * remove dirty entries from the slist as it flushes them.
+             * Thus for sanity checks we must make note of the initial
+             * slist length and size before we do any flushes.
+             */
+            initial_slist_len  = cache_ptr->slist_len;
+            initial_slist_size = cache_ptr->slist_size;
 
-        while ( node_ptr != NULL )
-        {
-            entry_ptr = next_entry_ptr;
-
-            /* With the advent of the fractal heap, it is possible
-             * that the flush callback will dirty and/or resize
-             * other entries in the cache.  In particular, while
-             * Quincey has promised me that this will never happen,
-             * it is possible that the flush callback for an
-             * entry may protect an entry that is not in the cache,
-             * perhaps causing the cache to flush and possibly
-             * evict the entry associated with node_ptr to make
-             * space for the new entry.
-             *
-             * Thus we do a bit of extra sanity checking on entry_ptr,
-             * and break out of this scan of the skip list if we
-             * detect major problems.  We have a bit of leaway on the
-             * number of passes though the skip list, so this shouldn't
-             * be an issue in the flush in and of itself, as it should
-             * be all but impossible for this to happen more than once
-             * in any flush.
-             *
-             * Observe that that breaking out of the scan early
-             * shouldn't break the sanity checks just after the end
-        * of this while loop.
-        *
-        * If an entry has merely been marked clean and removed from
-        * the s-list, we simply break out of the scan.
-        *
-        * If the entry has been evicted, we flag an error and
-        * exit.
+            /* There is also the possibility that entries will be
+             * dirtied, resized, and/or moved as the result of
+             * calls to the flush callbacks.  We use the slist_len_increase
+             * and slist_size_increase increase fields in struct H5C_t
+             * to track these changes for purpose of sanity checking.
+             * To this end, we must zero these fields before we start
+             * the pass through the slist.
              */
-#ifndef NDEBUG
-        if ( entry_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC ) {
+            cache_ptr->slist_len_increase  = 0;
+            cache_ptr->slist_size_increase = 0;
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "entry_ptr->magic is invalid ?!?!");
+            /* Finally, reset the actual_slist_len and actual_slist_size
+             * fields to zero, as these fields are used to accumulate
+             * the slist lenght and size that we see as we scan through
+             * the slist.
+             */
+            actual_slist_len  = 0;
+            actual_slist_size = 0;
+#endif /* H5C_DO_SANITY_CHECKS */
 
-        } else
-#endif /* NDEBUG */
-        if ( ( ! entry_ptr->is_dirty ) ||
-                 ( ! entry_ptr->in_slist ) ) {
+            while (node_ptr != NULL) {
+                entry_ptr = next_entry_ptr;
 
-                /* the s-list has been modified out from under us.
-            * break out of the loop.
+                /* With the advent of the fractal heap, it is possible
+                 * that the flush callback will dirty and/or resize
+                 * other entries in the cache.  In particular, while
+                 * Quincey has promised me that this will never happen,
+                 * it is possible that the flush callback for an
+                 * entry may protect an entry that is not in the cache,
+                 * perhaps causing the cache to flush and possibly
+                 * evict the entry associated with node_ptr to make
+                 * space for the new entry.
+                 *
+                 * Thus we do a bit of extra sanity checking on entry_ptr,
+                 * and break out of this scan of the skip list if we
+                 * detect major problems.  We have a bit of leaway on the
+                 * number of passes though the skip list, so this shouldn't
+                 * be an issue in the flush in and of itself, as it should
+                 * be all but impossible for this to happen more than once
+                 * in any flush.
+                 *
+                 * Observe that that breaking out of the scan early
+                 * shouldn't break the sanity checks just after the end
+                 * of this while loop.
+                 *
+                 * If an entry has merely been marked clean and removed from
+                 * the s-list, we simply break out of the scan.
+                 *
+                 * If the entry has been evicted, we flag an error and
+                 * exit.
                  */
-                break;
-            }
+#ifndef NDEBUG
+                if (entry_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC) {
 
-            /* increment node pointer now, before we delete its target
-             * from the slist.
-             */
-            node_ptr = H5SL_next(node_ptr);
-            if ( node_ptr != NULL ) {
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "entry_ptr->magic is invalid ?!?!");
+                }
+                else
+#endif /* NDEBUG */
+                    if ((!entry_ptr->is_dirty) || (!entry_ptr->in_slist)) {
 
-                next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
-                if ( next_entry_ptr == NULL ) {
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                                "next_entry_ptr == NULL 2 ?!?!");
-            }
+                    /* the s-list has been modified out from under us.
+                     * break out of the loop.
+                     */
+                    break;
+                }
+
+                /* increment node pointer now, before we delete its target
+                 * from the slist.
+                 */
+                node_ptr = H5SL_next(node_ptr);
+                if (node_ptr != NULL) {
+
+                    next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
+                    if (next_entry_ptr == NULL) {
+                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "next_entry_ptr == NULL 2 ?!?!");
+                    }
 #ifndef NDEBUG
-        HDassert( next_entry_ptr->magic ==
-                          H5C__H5C_CACHE_ENTRY_T_MAGIC );
+                    HDassert(next_entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
 #endif /* NDEBUG */
-                HDassert( next_entry_ptr->is_dirty );
-                HDassert( next_entry_ptr->in_slist );
-
-            } else {
+                    HDassert(next_entry_ptr->is_dirty);
+                    HDassert(next_entry_ptr->in_slist);
+                }
+                else {
 
-                next_entry_ptr = NULL;
-        }
+                    next_entry_ptr = NULL;
+                }
 
-            /* Note that we now remove nodes from the slist as we flush
-        * the associated entries, instead of leaving them there
-        * until we are done, and then destroying all nodes in
-             * the slist.
-             *
-             * While this optimization used to be easy, with the possibility
-             * of new entries being added to the slist in the midst of the
-             * flush, we must keep the slist in canonical form at all
-             * times.
-             */
+                /* Note that we now remove nodes from the slist as we flush
+                 * the associated entries, instead of leaving them there
+                 * until we are done, and then destroying all nodes in
+                 * the slist.
+                 *
+                 * While this optimization used to be easy, with the possibility
+                 * of new entries being added to the slist in the midst of the
+                 * flush, we must keep the slist in canonical form at all
+                 * times.
+                 */
 
-            HDassert( entry_ptr != NULL );
-            HDassert( entry_ptr->in_slist );
+                HDassert(entry_ptr != NULL);
+                HDassert(entry_ptr->in_slist);
 
 #if H5C_DO_SANITY_CHECKS
-            /* update actual_slist_len & actual_slist_size before
-        * the flush.  Note that the entry will be removed
-        * from the slist after the flush, and thus may be
-        * resized by the flush callback.  This is OK, as
-        * we will catch the size delta in
-        * cache_ptr->slist_size_increase.
-        *
-        * Note that we include pinned entries in this count, even
-        * though we will not actually flush them.
-        */
-            actual_slist_len++;
-            actual_slist_size += entry_ptr->size;
+                /* update actual_slist_len & actual_slist_size before
+                 * the flush.  Note that the entry will be removed
+                 * from the slist after the flush, and thus may be
+                 * resized by the flush callback.  This is OK, as
+                 * we will catch the size delta in
+                 * cache_ptr->slist_size_increase.
+                 *
+                 * Note that we include pinned entries in this count, even
+                 * though we will not actually flush them.
+                 */
+                actual_slist_len++;
+                actual_slist_size += entry_ptr->size;
 #endif /* H5C_DO_SANITY_CHECKS */
 
-            if ( entry_ptr->is_protected ) {
+                if (entry_ptr->is_protected) {
 
-                /* we have major problems -- but lets flush
-                 * everything we can before we flag an error.
-                 */
-            protected_entries++;
+                    /* we have major problems -- but lets flush
+                     * everything we can before we flag an error.
+                     */
+                    protected_entries++;
+                }
+                else if (entry_ptr->is_pinned) {
 
-            } else if ( entry_ptr->is_pinned ) {
+                    /* Test to see if we are can flush the entry now.
+                     * If we can, go ahead and flush, but don't tell
+                     * H5C_flush_single_entry() to destroy the entry
+                     * as pinned entries can't be evicted.
+                     */
+                    if (TRUE) { /* When we get to multithreaded cache,
+                                 * we will need either locking code, and/or
+                                 * a test to see if the entry is in flushable
+                                 * condition here.
+                                 */
 
-        /* Test to see if we are can flush the entry now.
-                 * If we can, go ahead and flush, but don't tell
-                 * H5C_flush_single_entry() to destroy the entry
-                 * as pinned entries can't be evicted.
-                 */
-        if ( TRUE ) { /* When we get to multithreaded cache,
-                * we will need either locking code, and/or
-                * a test to see if the entry is in flushable
-                * condition here.
-                */
-
-                    status = H5C_flush_single_entry(f,
-                                                    primary_dxpl_id,
-                                                    secondary_dxpl_id,
-                                                    NULL,
-                                                    entry_ptr->addr,
-                                                    H5C__NO_FLAGS_SET,
-                                                    &first_flush,
-                                                    FALSE);
-                    if ( status < 0 ) {
-
-                        /* This shouldn't happen -- if it does, we are toast
-                         * so just scream and die.
-                         */
+                        status =
+                            H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, NULL,
+                                                   entry_ptr->addr, H5C__NO_FLAGS_SET, &first_flush, FALSE);
+                        if (status < 0) {
 
-                        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                                    "dirty pinned entry flush failed.")
+                            /* This shouldn't happen -- if it does, we are toast
+                             * so just scream and die.
+                             */
+
+                            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "dirty pinned entry flush failed.")
+                        }
                     }
                 }
-            } else {
-
-                status = H5C_flush_single_entry(f,
-                                                primary_dxpl_id,
-                                                secondary_dxpl_id,
-                                                NULL,
-                                                entry_ptr->addr,
-                                                (cooked_flags | H5C__FLUSH_INVALIDATE_FLAG),
-                                                &first_flush,
-                                                TRUE);
-                if ( status < 0 ) {
+                else {
 
-                    /* This shouldn't happen -- if it does, we are toast so
-                     * just scream and die.
-                     */
+                    status = H5C_flush_single_entry(
+                        f, primary_dxpl_id, secondary_dxpl_id, NULL, entry_ptr->addr,
+                        (cooked_flags | H5C__FLUSH_INVALIDATE_FLAG), &first_flush, TRUE);
+                    if (status < 0) {
+
+                        /* This shouldn't happen -- if it does, we are toast so
+                         * just scream and die.
+                         */
 
-                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                                "dirty entry flush destroy failed.")
+                        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "dirty entry flush destroy failed.")
+                    }
                 }
-            }
-        } /* end while loop scanning skip list */
+            } /* end while loop scanning skip list */
 
 #if H5C_DO_SANITY_CHECKS
-    /* It is possible that entries were added to the slist during
-    * the scan, either before or after scan pointer.  The following
-    * asserts take this into account.
-         *
-         * Don't bother with the sanity checks if node_ptr != NULL, as
-         * in this case we broke out of the loop because it got changed
-         * out from under us.
-         */
+            /* It is possible that entries were added to the slist during
+             * the scan, either before or after scan pointer.  The following
+             * asserts take this into account.
+             *
+             * Don't bother with the sanity checks if node_ptr != NULL, as
+             * in this case we broke out of the loop because it got changed
+             * out from under us.
+             */
 
-    if ( node_ptr == NULL ) {
+            if (node_ptr == NULL) {
 
-            HDassert( (actual_slist_len + cache_ptr->slist_len) ==
-            (initial_slist_len + cache_ptr->slist_len_increase) );
-            HDassert( (actual_slist_size + cache_ptr->slist_size) ==
-            (initial_slist_size + cache_ptr->slist_size_increase) );
-    }
+                HDassert((actual_slist_len + cache_ptr->slist_len) ==
+                         (initial_slist_len + cache_ptr->slist_len_increase));
+                HDassert((actual_slist_size + cache_ptr->slist_size) ==
+                         (initial_slist_size + cache_ptr->slist_size_increase));
+            }
 #endif /* H5C_DO_SANITY_CHECKS */
 
-        /* Since we are doing a destroy, we must make a pass through
-         * the hash table and try to flush - destroy all entries that
-         * remain.
-    *
-    * It used to be that all entries remaining in the cache at
-    * this point had to be clean, but with the fractal heap mods
-    * this may not be the case.  If so, we will flush entries out
-    * of increasing address order.
-    *
-    * Writes to disk are possible here.
-         */
-        for ( i = 0; i < H5C__HASH_TABLE_LEN; i++ )
-        {
-        next_entry_ptr = cache_ptr->index[i];
+            /* Since we are doing a destroy, we must make a pass through
+             * the hash table and try to flush - destroy all entries that
+             * remain.
+             *
+             * It used to be that all entries remaining in the cache at
+             * this point had to be clean, but with the fractal heap mods
+             * this may not be the case.  If so, we will flush entries out
+             * of increasing address order.
+             *
+             * Writes to disk are possible here.
+             */
+            for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
+                next_entry_ptr = cache_ptr->index[i];
 
-            while ( next_entry_ptr != NULL )
-            {
-                entry_ptr = next_entry_ptr;
+                while (next_entry_ptr != NULL) {
+                    entry_ptr = next_entry_ptr;
 
-                next_entry_ptr = entry_ptr->ht_next;
+                    next_entry_ptr = entry_ptr->ht_next;
 #ifndef NDEBUG
-        HDassert ( ( next_entry_ptr == NULL ) ||
-                           ( next_entry_ptr->magic ==
-                             H5C__H5C_CACHE_ENTRY_T_MAGIC ) );
+                    HDassert((next_entry_ptr == NULL) ||
+                             (next_entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC));
 #endif /* NDEBUG */
-                if ( entry_ptr->is_protected ) {
+                    if (entry_ptr->is_protected) {
 #ifndef NDEBUG
-                    HDassert( entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC );
+                        HDassert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
 #endif /* NDEBUG */
 
-                    /* we have major problems -- but lets flush and destroy
-                     * everything we can before we flag an error.
-                     */
-                protected_entries++;
+                        /* we have major problems -- but lets flush and destroy
+                         * everything we can before we flag an error.
+                         */
+                        protected_entries++;
 
-                    if ( ! entry_ptr->in_slist ) {
+                        if (!entry_ptr->in_slist) {
 
-                        HDassert( !(entry_ptr->is_dirty) );
+                            HDassert(!(entry_ptr->is_dirty));
+                        }
                     }
-                } else if ( ! ( entry_ptr->is_pinned ) ) {
-
-                    status = H5C_flush_single_entry(f,
-                                                    primary_dxpl_id,
-                                                    secondary_dxpl_id,
-                                                    NULL,
-                                                    entry_ptr->addr,
-                                                    (cooked_flags | H5C__FLUSH_INVALIDATE_FLAG),
-                                                    &first_flush,
-                                                    TRUE);
-                    if ( status < 0 ) {
+                    else if (!(entry_ptr->is_pinned)) {
 
-                        /* This shouldn't happen -- if it does, we are toast so
-                         * just scream and die.
-                         */
+                        status = H5C_flush_single_entry(
+                            f, primary_dxpl_id, secondary_dxpl_id, NULL, entry_ptr->addr,
+                            (cooked_flags | H5C__FLUSH_INVALIDATE_FLAG), &first_flush, TRUE);
+                        if (status < 0) {
 
-                        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                                    "Entry flush destroy failed.")
-                    }
-                }
-            /* We can't do anything if the entry is pinned.  The
-        * hope is that the entry will be unpinned as the
-        * result of destroys of entries that reference it.
-        *
-        * We detect this by noting the change in the number
-        * of pinned entries from pass to pass.  If it stops
-        * shrinking before it hits zero, we scream and die.
-        */
-                /* if the flush function on the entry we last evicted
-                 * loaded an entry into cache (as Quincey has promised me
-                 * it never will), and if the cache was full, it is
-                 * possible that *next_entry_ptr was flushed or evicted.
-                 *
-                 * Test to see if this happened here.  Note that if this
-        * test is triggred, we are accessing a deallocated piece
-        * of dynamically allocated memory, so we just scream and
-        * die.
-                 */
-#ifndef NDEBUG
-                if ( ( next_entry_ptr != NULL ) &&
-                     ( next_entry_ptr->magic !=
-                       H5C__H5C_CACHE_ENTRY_T_MAGIC ) ) {
+                            /* This shouldn't happen -- if it does, we are toast so
+                             * just scream and die.
+                             */
 
-                    /* Something horrible has happened to
-                     * *next_entry_ptr -- scream and die.
+                            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Entry flush destroy failed.")
+                        }
+                    }
+                    /* We can't do anything if the entry is pinned.  The
+                     * hope is that the entry will be unpinned as the
+                     * result of destroys of entries that reference it.
+                     *
+                     * We detect this by noting the change in the number
+                     * of pinned entries from pass to pass.  If it stops
+                     * shrinking before it hits zero, we scream and die.
                      */
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                                "next_entry_ptr->magic is invalid?!?!?.")
-                }
-#endif /* NDEBUG */
-            } /* end while loop scanning hash table bin */
-        } /* end for loop scanning hash table */
-
-    old_pel_len = cur_pel_len;
-    cur_pel_len = cache_ptr->pel_len;
-
-    if ( ( cur_pel_len > 0 ) && ( cur_pel_len >= old_pel_len ) ) {
-
-    /* The number of pinned entries is positive, and it is not
-        * declining.  Scream and die.
-        */
+                    /* if the flush function on the entry we last evicted
+                     * loaded an entry into cache (as Quincey has promised me
+                     * it never will), and if the cache was full, it is
+                     * possible that *next_entry_ptr was flushed or evicted.
+                     *
+                     * Test to see if this happened here.  Note that if this
+                     * test is triggred, we are accessing a deallocated piece
+                     * of dynamically allocated memory, so we just scream and
+                     * die.
+                     */
+#ifndef NDEBUG
+                    if ((next_entry_ptr != NULL) && (next_entry_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC)) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                        "Pinned entry count not decreasing, cur_pel_len = %d, old_pel_len = %d", (int)cur_pel_len, (int)old_pel_len)
+                        /* Something horrible has happened to
+                         * *next_entry_ptr -- scream and die.
+                         */
+                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "next_entry_ptr->magic is invalid?!?!?.")
+                    }
+#endif            /* NDEBUG */
+                } /* end while loop scanning hash table bin */
+            }     /* end for loop scanning hash table */
 
-        } else if ( ( cur_pel_len == 0 ) && ( old_pel_len == 0 ) ) {
+            old_pel_len = cur_pel_len;
+            cur_pel_len = cache_ptr->pel_len;
 
-        /* increment the pass count */
-        passes++;
-    }
+            if ((cur_pel_len > 0) && (cur_pel_len >= old_pel_len)) {
 
-    if ( passes >= H5C__MAX_PASSES_ON_FLUSH ) {
+                /* The number of pinned entries is positive, and it is not
+                 * declining.  Scream and die.
+                 */
 
-        /* we have exceeded the maximum number of passes through the
-        * cache to flush and destroy all entries.  Scream and die.
-        */
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL,
+                            "Pinned entry count not decreasing, cur_pel_len = %d, old_pel_len = %d",
+                            (int)cur_pel_len, (int)old_pel_len)
+            }
+            else if ((cur_pel_len == 0) && (old_pel_len == 0)) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                    "Maximum passes on flush exceeded.")
-    }
-    } /* main while loop */
+                /* increment the pass count */
+                passes++;
+            }
 
-    /* Invariants, after destroying all entries in the hash table */
-    HDassert( cache_ptr->index_size == 0 );
-    HDassert( cache_ptr->clean_index_size == 0 );
-    HDassert( cache_ptr->dirty_index_size == 0 );
-    HDassert( cache_ptr->slist_len == 0 );
-    HDassert( cache_ptr->slist_size == 0 );
-    HDassert( cache_ptr->pel_len == 0 );
-    HDassert( cache_ptr->pel_size == 0 );
-    HDassert( cache_ptr->pl_len == 0 );
-    HDassert( cache_ptr->pl_size == 0 );
-    HDassert( cache_ptr->LRU_list_len == 0 );
-    HDassert( cache_ptr->LRU_list_size == 0 );
+            if (passes >= H5C__MAX_PASSES_ON_FLUSH) {
 
+                /* we have exceeded the maximum number of passes through the
+                 * cache to flush and destroy all entries.  Scream and die.
+                 */
 
-    HDassert( protected_entries <= cache_ptr->pl_len );
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Maximum passes on flush exceeded.")
+            }
+        } /* main while loop */
 
-    if ( protected_entries > 0 ) {
+        /* Invariants, after destroying all entries in the hash table */
+        HDassert(cache_ptr->index_size == 0);
+        HDassert(cache_ptr->clean_index_size == 0);
+        HDassert(cache_ptr->dirty_index_size == 0);
+        HDassert(cache_ptr->slist_len == 0);
+        HDassert(cache_ptr->slist_size == 0);
+        HDassert(cache_ptr->pel_len == 0);
+        HDassert(cache_ptr->pel_size == 0);
+        HDassert(cache_ptr->pl_len == 0);
+        HDassert(cache_ptr->pl_size == 0);
+        HDassert(cache_ptr->LRU_list_len == 0);
+        HDassert(cache_ptr->LRU_list_size == 0);
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                "Cache has protected entries.")
+        HDassert(protected_entries <= cache_ptr->pl_len);
 
-    } else if ( cur_pel_len > 0 ) {
+        if (protected_entries > 0) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                "Can't unpin all pinned entries.")
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Cache has protected entries.")
+        }
+        else if (cur_pel_len > 0) {
 
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't unpin all pinned entries.")
+        }
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_flush_invalidate_cache() */
-
-
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C_flush_single_entry
- *
- * Purpose:     Flush or clear (and evict if requested) the cache entry
- *        with the specified address and type.  If the type is NULL,
- *        any unprotected entry at the specified address will be
- *        flushed (and possibly evicted).
- *
- *        Attempts to flush a protected entry will result in an
- *        error.
- *
- *        *first_flush_ptr should be true if only one
- *        flush is contemplated before the next load, or if this
- *        is the first of a sequence of flushes that will be
- *        completed before the next load.  *first_flush_ptr is set
- *        to false if a flush actually takes place, and should be
- *        left false until the end of the sequence.
- *
- *        The primary_dxpl_id is used if *first_flush_ptr is TRUE
- *        on entry, and a flush actually takes place.  The
- *        secondary_dxpl_id is used in any subsequent flush where
- *        *first_flush_ptr is FALSE on entry.
- *
- *        If the H5C__FLUSH_INVALIDATE_FLAG flag is set, the entry will
- *        be cleared and not flushed -- in the case *first_flush_ptr,
- *        primary_dxpl_id, and secondary_dxpl_id are all irrelevent,
- *        and the call can't be part of a sequence of flushes.
- *
- *        If the caller knows the address of the TBBT node at
- *        which the target entry resides, it can avoid a lookup
- *        by supplying that address in the tgt_node_ptr parameter.
- *        If this parameter is NULL, the function will do a TBBT
- *        search for the entry instead.
- *
- *        The function does nothing silently if there is no entry
- *        at the supplied address, or if the entry found has the
- *        wrong type.
- *
- * Return:      Non-negative on success/Negative on failure or if there was
- *        an attempt to flush a protected item.
- *
- * Programmer:  John Mainzer, 5/5/04
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C_flush_single_entry(H5F_t *              f,
-                       hid_t            primary_dxpl_id,
-                       hid_t            secondary_dxpl_id,
-                       const H5C_class_t * type_ptr,
-                       haddr_t           addr,
-                       unsigned                flags,
-                       hbool_t *       first_flush_ptr,
-                       hbool_t           del_entry_from_slist_on_destroy)
-{
-    H5C_t *             cache_ptr = f->shared->cache;
-    hbool_t        destroy;
-    hbool_t        clear_only;
-    hbool_t        take_ownership;
-    hbool_t        was_dirty;
-    hbool_t        destroy_entry;
-    herr_t        status;
-    int            type_id;
-    unsigned        flush_flags = H5C_CALLBACK__NO_FLAGS_SET;
-    H5C_cache_entry_t * entry_ptr = NULL;
-    herr_t        ret_value = SUCCEED;      /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT
-
-    HDassert( f );
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( H5F_addr_defined(addr) );
-    HDassert( first_flush_ptr );
+        FUNC_LEAVE_NOAPI(ret_value)
 
-    destroy = ( (flags & H5C__FLUSH_INVALIDATE_FLAG) != 0 );
-    clear_only = ( (flags & H5C__FLUSH_CLEAR_ONLY_FLAG) != 0);
-    take_ownership = ( (flags & H5C__TAKE_OWNERSHIP_FLAG) != 0);
+    } /* H5C_flush_invalidate_cache() */
 
-    /* Set the flag for destroying the entry, based on the 'take ownership'
-     *  and 'destroy' flags
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C_flush_single_entry
+     *
+     * Purpose:     Flush or clear (and evict if requested) the cache entry
+     *        with the specified address and type.  If the type is NULL,
+     *        any unprotected entry at the specified address will be
+     *        flushed (and possibly evicted).
+     *
+     *        Attempts to flush a protected entry will result in an
+     *        error.
+     *
+     *        *first_flush_ptr should be true if only one
+     *        flush is contemplated before the next load, or if this
+     *        is the first of a sequence of flushes that will be
+     *        completed before the next load.  *first_flush_ptr is set
+     *        to false if a flush actually takes place, and should be
+     *        left false until the end of the sequence.
+     *
+     *        The primary_dxpl_id is used if *first_flush_ptr is TRUE
+     *        on entry, and a flush actually takes place.  The
+     *        secondary_dxpl_id is used in any subsequent flush where
+     *        *first_flush_ptr is FALSE on entry.
+     *
+     *        If the H5C__FLUSH_INVALIDATE_FLAG flag is set, the entry will
+     *        be cleared and not flushed -- in the case *first_flush_ptr,
+     *        primary_dxpl_id, and secondary_dxpl_id are all irrelevent,
+     *        and the call can't be part of a sequence of flushes.
+     *
+     *        If the caller knows the address of the TBBT node at
+     *        which the target entry resides, it can avoid a lookup
+     *        by supplying that address in the tgt_node_ptr parameter.
+     *        If this parameter is NULL, the function will do a TBBT
+     *        search for the entry instead.
+     *
+     *        The function does nothing silently if there is no entry
+     *        at the supplied address, or if the entry found has the
+     *        wrong type.
+     *
+     * Return:      Non-negative on success/Negative on failure or if there was
+     *        an attempt to flush a protected item.
+     *
+     * Programmer:  John Mainzer, 5/5/04
+     *
+     *-------------------------------------------------------------------------
      */
-    if(take_ownership)
-        destroy_entry = FALSE;
-    else
-        destroy_entry = destroy;
+    static herr_t H5C_flush_single_entry(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                         const H5C_class_t *type_ptr, haddr_t addr, unsigned flags,
+                                         hbool_t *first_flush_ptr, hbool_t del_entry_from_slist_on_destroy)
+    {
+        H5C_t *            cache_ptr = f->shared->cache;
+        hbool_t            destroy;
+        hbool_t            clear_only;
+        hbool_t            take_ownership;
+        hbool_t            was_dirty;
+        hbool_t            destroy_entry;
+        herr_t             status;
+        int                type_id;
+        unsigned           flush_flags = H5C_CALLBACK__NO_FLAGS_SET;
+        H5C_cache_entry_t *entry_ptr   = NULL;
+        herr_t             ret_value   = SUCCEED; /* Return value */
+
+        FUNC_ENTER_NOAPI_NOINIT
+
+        HDassert(f);
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(H5F_addr_defined(addr));
+        HDassert(first_flush_ptr);
+
+        destroy        = ((flags & H5C__FLUSH_INVALIDATE_FLAG) != 0);
+        clear_only     = ((flags & H5C__FLUSH_CLEAR_ONLY_FLAG) != 0);
+        take_ownership = ((flags & H5C__TAKE_OWNERSHIP_FLAG) != 0);
+
+        /* Set the flag for destroying the entry, based on the 'take ownership'
+         *  and 'destroy' flags
+         */
+        if (take_ownership)
+            destroy_entry = FALSE;
+        else
+            destroy_entry = destroy;
 
-    /* attempt to find the target entry in the hash table */
-    H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+        /* attempt to find the target entry in the hash table */
+        H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
 
 #if H5C_DO_SANITY_CHECKS
-    if ( entry_ptr != NULL ) {
+        if (entry_ptr != NULL) {
 
-        HDassert( ! ( ( destroy ) && ( entry_ptr->is_pinned ) ) );
+            HDassert(!((destroy) && (entry_ptr->is_pinned)));
 
-        if ( entry_ptr->in_slist ) {
+            if (entry_ptr->in_slist) {
 
-            if ( ( ( entry_ptr->flush_marker ) && ( ! entry_ptr->is_dirty ) ) ||
-                 ( entry_ptr->addr != addr ) ) {
+                if (((entry_ptr->flush_marker) && (!entry_ptr->is_dirty)) || (entry_ptr->addr != addr)) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "entry in slist failed sanity checks.")
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "entry in slist failed sanity checks.")
+                }
             }
-        } else {
+            else {
 
-            if ( ( entry_ptr->is_dirty ) ||
-                 ( entry_ptr->flush_marker ) ||
-                 ( entry_ptr->addr != addr ) ) {
+                if ((entry_ptr->is_dirty) || (entry_ptr->flush_marker) || (entry_ptr->addr != addr)) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "entry failed sanity checks.")
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "entry failed sanity checks.")
+                }
             }
         }
-    }
 #endif /* H5C_DO_SANITY_CHECKS */
 
-    if ( ( entry_ptr != NULL ) && ( entry_ptr->is_protected ) )
-    {
+        if ((entry_ptr != NULL) && (entry_ptr->is_protected)) {
 
-        /* Attempt to flush a protected entry -- scream and die. */
-        HGOTO_ERROR(H5E_CACHE, H5E_PROTECT, FAIL, \
-                    "Attempt to flush a protected entry.")
-    }
+            /* Attempt to flush a protected entry -- scream and die. */
+            HGOTO_ERROR(H5E_CACHE, H5E_PROTECT, FAIL, "Attempt to flush a protected entry.")
+        }
 
-    if ( ( entry_ptr != NULL ) &&
-         ( ( type_ptr == NULL ) || ( type_ptr->id == entry_ptr->type->id ) ) )
-    {
-        /* we have work to do */
+        if ((entry_ptr != NULL) && ((type_ptr == NULL) || (type_ptr->id == entry_ptr->type->id))) {
+            /* we have work to do */
 
-    /* We will set flush_in_progress back to FALSE at the end if the
-    * entry still exists at that point.
-    */
-    entry_ptr->flush_in_progress = TRUE;
+            /* We will set flush_in_progress back to FALSE at the end if the
+             * entry still exists at that point.
+             */
+            entry_ptr->flush_in_progress = TRUE;
 
 #ifdef H5_HAVE_PARALLEL
 #ifndef NDEBUG
-        /* If MPI based VFD is used, do special parallel I/O sanity checks.
-         * Note that we only do these sanity checks when the clear_only flag
-         * is not set, and the entry to be flushed is dirty.  Don't bother
-         * otherwise as no file I/O can result.
-         */
-        if(!clear_only && entry_ptr->is_dirty &&
-                H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) {
-            H5P_genplist_t *dxpl;       /* Dataset transfer property list */
-            unsigned coll_meta;         /* Collective metadata write flag */
+            /* If MPI based VFD is used, do special parallel I/O sanity checks.
+             * Note that we only do these sanity checks when the clear_only flag
+             * is not set, and the entry to be flushed is dirty.  Don't bother
+             * otherwise as no file I/O can result.
+             */
+            if (!clear_only && entry_ptr->is_dirty && H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) {
+                H5P_genplist_t *dxpl;      /* Dataset transfer property list */
+                unsigned        coll_meta; /* Collective metadata write flag */
 
-            /* Get the dataset transfer property list */
-            if(NULL == (dxpl = H5I_object(primary_dxpl_id)))
-                HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
+                /* Get the dataset transfer property list */
+                if (NULL == (dxpl = H5I_object(primary_dxpl_id)))
+                    HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
-            /* Get the collective metadata write property */
-            if(H5P_get(dxpl, H5AC_COLLECTIVE_META_WRITE_NAME, &coll_meta) < 0)
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "can't retrieve xfer mode")
+                /* Get the collective metadata write property */
+                if (H5P_get(dxpl, H5AC_COLLECTIVE_META_WRITE_NAME, &coll_meta) < 0)
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "can't retrieve xfer mode")
 
-            /* Sanity check collective metadata write flag */
-            HDassert(coll_meta);
-        } /* end if */
-#endif /* NDEBUG */
-#endif /* H5_HAVE_PARALLEL */
+                /* Sanity check collective metadata write flag */
+                HDassert(coll_meta);
+            } /* end if */
+#endif        /* NDEBUG */
+#endif        /* H5_HAVE_PARALLEL */
 
-        was_dirty = entry_ptr->is_dirty;
-        type_id = entry_ptr->type->id;
+            was_dirty = entry_ptr->is_dirty;
+            type_id   = entry_ptr->type->id;
 
-        entry_ptr->flush_marker = FALSE;
+            entry_ptr->flush_marker = FALSE;
 
-        if ( clear_only ) {
-            H5C__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)
-        } else {
-            H5C__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)
-        }
+            if (clear_only) {
+                H5C__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)
+            }
+            else {
+                H5C__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)
+            }
 
-        if ( destroy ) {
-            H5C__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr)
-        }
+            if (destroy) {
+                H5C__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr)
+            }
 
-        /* Always remove the entry from the hash table on a destroy.  On a
-         * flush with destroy, it is cheaper to discard the skip list all at
-         * once rather than remove the entries one by one, so we only delete
-         * from the slist only if requested.
-         *
-         * We must do deletions now as the callback routines will free the
-         * entry if destroy is true.
-    *
-    * Note that it is possible that the entry will be moved during
-    * its call to flush.  This will upset H5C_move_entry() if we
-    * don't tell it that it doesn't have to worry about updating the
-    * index and SLIST.  Use the destroy_in_progress field for this
-    * purpose.
-         */
-        if ( destroy ) {
+            /* Always remove the entry from the hash table on a destroy.  On a
+             * flush with destroy, it is cheaper to discard the skip list all at
+             * once rather than remove the entries one by one, so we only delete
+             * from the slist only if requested.
+             *
+             * We must do deletions now as the callback routines will free the
+             * entry if destroy is true.
+             *
+             * Note that it is possible that the entry will be moved during
+             * its call to flush.  This will upset H5C_move_entry() if we
+             * don't tell it that it doesn't have to worry about updating the
+             * index and SLIST.  Use the destroy_in_progress field for this
+             * purpose.
+             */
+            if (destroy) {
 
-            entry_ptr->destroy_in_progress = TRUE;
+                entry_ptr->destroy_in_progress = TRUE;
 
-            H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
+                H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
 
-            if ( ( entry_ptr->in_slist ) &&
-                 ( del_entry_from_slist_on_destroy ) ) {
+                if ((entry_ptr->in_slist) && (del_entry_from_slist_on_destroy)) {
 
-                H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
+                    H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
+                }
             }
-        }
 
-        /* Update the replacement policy for the flush or eviction.
-         * Again, do this now so we don't have to reference freed
-         * memory in the destroy case.
-         */
-        if ( destroy ) { /* AKA eviction */
-
-            H5C__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, FAIL)
+            /* Update the replacement policy for the flush or eviction.
+             * Again, do this now so we don't have to reference freed
+             * memory in the destroy case.
+             */
+            if (destroy) { /* AKA eviction */
 
-        } else {
+                H5C__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, FAIL)
+            }
+            else {
 
-            H5C__UPDATE_RP_FOR_FLUSH(cache_ptr, entry_ptr, FAIL)
-        }
+                H5C__UPDATE_RP_FOR_FLUSH(cache_ptr, entry_ptr, FAIL)
+            }
 
-        /* Clear the dirty flag only, if requested */
-        if ( clear_only ) {
+            /* Clear the dirty flag only, if requested */
+            if (clear_only) {
 
-        if ( destroy ) {
+                if (destroy) {
 #ifndef NDEBUG
-        /* we are about to call the clear callback with the
-        * destroy flag set -- this will result in *entry_ptr
-        * being freed.  Set the magic field to bad magic
-        * so we can detect a freed cache entry if we see
-        * one.
-        */
-        entry_ptr->magic = H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC;
+                    /* we are about to call the clear callback with the
+                     * destroy flag set -- this will result in *entry_ptr
+                     * being freed.  Set the magic field to bad magic
+                     * so we can detect a freed cache entry if we see
+                     * one.
+                     */
+                    entry_ptr->magic = H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC;
 #endif /* NDEBUG */
-                entry_ptr->cache_ptr = NULL;
-        }
-            /* Call the callback routine to clear all dirty flags for object */
-            if ( (entry_ptr->type->clear)(f, entry_ptr, destroy_entry) < 0 ) {
+                    entry_ptr->cache_ptr = NULL;
+                }
+                /* Call the callback routine to clear all dirty flags for object */
+                if ((entry_ptr->type->clear)(f, entry_ptr, destroy_entry) < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "can't clear entry")
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "can't clear entry")
+                }
             }
-        } else {
+            else {
 
 #if H5C_DO_SANITY_CHECKS
-            if ( ( entry_ptr->is_dirty ) &&
-                 ( cache_ptr->check_write_permitted == NULL ) &&
-                 ( ! (cache_ptr->write_permitted) ) ) {
+                if ((entry_ptr->is_dirty) && (cache_ptr->check_write_permitted == NULL) &&
+                    (!(cache_ptr->write_permitted))) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "Write when writes are always forbidden!?!?!")
-            }
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Write when writes are always forbidden!?!?!")
+                }
 #endif /* H5C_DO_SANITY_CHECKS */
 
-        if ( destroy ) {
+                if (destroy) {
 #ifndef NDEBUG
-            /* we are about to call the flush callback with the
-            * destroy flag set -- this will result in *entry_ptr
-            * being freed.  Set the magic field to bad magic
-            * so we can detect a freed cache entry if we see
-            * one.
-            */
-            entry_ptr->magic = H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC;
+                    /* we are about to call the flush callback with the
+                     * destroy flag set -- this will result in *entry_ptr
+                     * being freed.  Set the magic field to bad magic
+                     * so we can detect a freed cache entry if we see
+                     * one.
+                     */
+                    entry_ptr->magic = H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC;
 #endif /* NDEBUG */
-                entry_ptr->cache_ptr = NULL;
-        }
-
-            /* Only block for all the processes on the first piece of metadata
-             */
+                    entry_ptr->cache_ptr = NULL;
+                }
 
-            if ( *first_flush_ptr && entry_ptr->is_dirty ) {
+                /* Only block for all the processes on the first piece of metadata
+                 */
 
-                status = (entry_ptr->type->flush)(f, primary_dxpl_id, destroy_entry,
-                                                 entry_ptr->addr, entry_ptr,
-                        &flush_flags);
-                *first_flush_ptr = FALSE;
+                if (*first_flush_ptr && entry_ptr->is_dirty) {
 
-            } else {
+                    status = (entry_ptr->type->flush)(f, primary_dxpl_id, destroy_entry, entry_ptr->addr,
+                                                      entry_ptr, &flush_flags);
+                    *first_flush_ptr = FALSE;
+                }
+                else {
 
-                status = (entry_ptr->type->flush)(f, secondary_dxpl_id,
-                                                 destroy_entry, entry_ptr->addr,
-                                                 entry_ptr, &flush_flags);
-            }
+                    status = (entry_ptr->type->flush)(f, secondary_dxpl_id, destroy_entry, entry_ptr->addr,
+                                                      entry_ptr, &flush_flags);
+                }
 
-            if ( status < 0 ) {
+                if (status < 0) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                            "unable to flush entry")
-            }
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush entry")
+                }
 
 #ifdef H5_HAVE_PARALLEL
-            if ( flush_flags != H5C_CALLBACK__NO_FLAGS_SET ) {
-
-                /* In the parallel case, flush operations can
-        * cause problems.  If they occur, scream and
-        * die.
-        *
-        * At present, in the parallel case, the aux_ptr
-        * will only be set if there is more than one
-        * process.  Thus we can use this to detect
-        * the parallel case.
-        *
-        * This works for now, but if we start using the
-        * aux_ptr for other purposes, we will have to
-        * change this test accordingly.
-        *
-        * NB: While this test detects entryies that attempt
-        *     to resize or move themselves during a flush
-        *     in the parallel case, it will not detect an
-        *     entry that dirties, resizes, and/or moves
-        *     other entries during its flush.
-        *
-        *     From what Quincey tells me, this test is
-        *     sufficient for now, as any flush routine that
-        *     does the latter will also do the former.
-        *
-        *     If that ceases to be the case, further
-        *     tests will be necessary.
-        */
-        if ( cache_ptr->aux_ptr != NULL ) {
-
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                "resize/move in serialize occurred in parallel case.")
+                if (flush_flags != H5C_CALLBACK__NO_FLAGS_SET) {
+
+                    /* In the parallel case, flush operations can
+                     * cause problems.  If they occur, scream and
+                     * die.
+                     *
+                     * At present, in the parallel case, the aux_ptr
+                     * will only be set if there is more than one
+                     * process.  Thus we can use this to detect
+                     * the parallel case.
+                     *
+                     * This works for now, but if we start using the
+                     * aux_ptr for other purposes, we will have to
+                     * change this test accordingly.
+                     *
+                     * NB: While this test detects entryies that attempt
+                     *     to resize or move themselves during a flush
+                     *     in the parallel case, it will not detect an
+                     *     entry that dirties, resizes, and/or moves
+                     *     other entries during its flush.
+                     *
+                     *     From what Quincey tells me, this test is
+                     *     sufficient for now, as any flush routine that
+                     *     does the latter will also do the former.
+                     *
+                     *     If that ceases to be the case, further
+                     *     tests will be necessary.
+                     */
+                    if (cache_ptr->aux_ptr != NULL) {
 
-        }
-        }
+                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL,
+                                    "resize/move in serialize occurred in parallel case.")
+                    }
+                }
 #endif /* H5_HAVE_PARALLEL */
-        }
-
-        if ( ( ! destroy ) && ( entry_ptr->in_slist ) ) {
+            }
 
-            H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
+            if ((!destroy) && (entry_ptr->in_slist)) {
 
-        }
+                H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
+            }
 
-    if ( ( ! destroy ) && ( was_dirty ) ) {
+            if ((!destroy) && (was_dirty)) {
 
-            H5C__UPDATE_INDEX_FOR_ENTRY_CLEAN(cache_ptr, entry_ptr);
-        }
-
-        if ( ! destroy ) { /* i.e. if the entry still exists */
+                H5C__UPDATE_INDEX_FOR_ENTRY_CLEAN(cache_ptr, entry_ptr);
+            }
 
-            HDassert( !(entry_ptr->is_dirty) );
-            HDassert( !(entry_ptr->flush_marker) );
-            HDassert( !(entry_ptr->in_slist) );
-            HDassert( !(entry_ptr->is_protected) );
-            HDassert( !(entry_ptr->is_read_only) );
-            HDassert( (entry_ptr->ro_ref_count) == 0 );
+            if (!destroy) { /* i.e. if the entry still exists */
 
-        if ( (flush_flags & H5C_CALLBACK__SIZE_CHANGED_FLAG) != 0 ) {
+                HDassert(!(entry_ptr->is_dirty));
+                HDassert(!(entry_ptr->flush_marker));
+                HDassert(!(entry_ptr->in_slist));
+                HDassert(!(entry_ptr->is_protected));
+                HDassert(!(entry_ptr->is_read_only));
+                HDassert((entry_ptr->ro_ref_count) == 0);
 
-        /* The entry size changed as a result of the flush.
-        *
-        * Most likely, the entry was compressed, and the
-        * new version is of a different size than the old.
-        *
-        * In any case, we must update entry and cache size
-        * accordingly.
-        */
-        size_t new_size;
+                if ((flush_flags & H5C_CALLBACK__SIZE_CHANGED_FLAG) != 0) {
 
-                if ( (entry_ptr->type->size)(f, (void *)entry_ptr, &new_size)
-                     < 0 ) {
+                    /* The entry size changed as a result of the flush.
+                     *
+                     * Most likely, the entry was compressed, and the
+                     * new version is of a different size than the old.
+                     *
+                     * In any case, we must update entry and cache size
+                     * accordingly.
+                     */
+                    size_t new_size;
 
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, FAIL, \
-                                "Can't get entry size after flush")
-                }
+                    if ((entry_ptr->type->size)(f, (void *)entry_ptr, &new_size) < 0) {
 
-        if ( new_size != entry_ptr->size ) {
-
-                    HDassert( entry_ptr->size < H5C_MAX_ENTRY_SIZE );
-
-                    /* update the hash table for the size change
-            * We pass TRUE as the was_clean parameter, as we
-            * have already updated the clean and dirty index
-            * size fields for the fact that the entry has
-            * been flushed. (See above call to
-            * H5C__UPDATE_INDEX_FOR_ENTRY_CLEAN()).
-            */
-                H5C__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), \
-                                    (entry_ptr->size), \
-                                                      (new_size), \
-                            (entry_ptr), \
-                            (TRUE))
-
-            /* The entry can't be protected since we just flushed it.
-            * Thus we must update the replacement policy data
-            * structures for the size change.  The macro deals
-            * with the pinned case.
-            */
-            H5C__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, entry_ptr, \
-                                new_size)
-
-            /* The entry can't be in the slist, so no need to update
-            * the slist for the size change.
-            */
-
-            /* update stats for the size change */
-            H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, \
-                                            entry_ptr, \
-                                new_size)
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, FAIL, "Can't get entry size after flush")
+                    }
 
-            /* finally, update the entry size proper */
-            entry_ptr->size = new_size;
-        }
-        }
+                    if (new_size != entry_ptr->size) {
 
-        if ( (flush_flags & H5C_CALLBACK__MOVED_FLAG) != 0 ) {
+                        HDassert(entry_ptr->size < H5C_MAX_ENTRY_SIZE);
 
-        /* The entry was moved as the result of the flush.
-        *
-        * Most likely, the entry was compressed, and the
-        * new version is larger than the old and thus had
-        * to be relocated.
-        *
-        * At preset, all processing for this case is
-        * handled elsewhere.  But lets keep the if statement
-        * around just in case.
-        */
+                        /* update the hash table for the size change
+                         * We pass TRUE as the was_clean parameter, as we
+                         * have already updated the clean and dirty index
+                         * size fields for the fact that the entry has
+                         * been flushed. (See above call to
+                         * H5C__UPDATE_INDEX_FOR_ENTRY_CLEAN()).
+                         */
+                        H5C__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size), (new_size),
+                                                          (entry_ptr), (TRUE))
 
-        }
+                        /* The entry can't be protected since we just flushed it.
+                         * Thus we must update the replacement policy data
+                         * structures for the size change.  The macro deals
+                         * with the pinned case.
+                         */
+                        H5C__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)
 
-        entry_ptr->flush_in_progress = FALSE;
-        }
+                        /* The entry can't be in the slist, so no need to update
+                         * the slist for the size change.
+                         */
 
-        if ( cache_ptr->log_flush ) {
+                        /* update stats for the size change */
+                        H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)
 
-            status = (cache_ptr->log_flush)(cache_ptr, addr, was_dirty,
-                                            flags, type_id);
+                        /* finally, update the entry size proper */
+                        entry_ptr->size = new_size;
+                    }
+                }
 
-            if ( status < 0 ) {
+                if ((flush_flags & H5C_CALLBACK__MOVED_FLAG) != 0) {
+
+                    /* The entry was moved as the result of the flush.
+                     *
+                     * Most likely, the entry was compressed, and the
+                     * new version is larger than the old and thus had
+                     * to be relocated.
+                     *
+                     * At preset, all processing for this case is
+                     * handled elsewhere.  But lets keep the if statement
+                     * around just in case.
+                     */
+                }
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                            "log_flush callback failed.")
+                entry_ptr->flush_in_progress = FALSE;
             }
-        }
-    }
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_flush_single_entry() */
+            if (cache_ptr->log_flush) {
 
+                status = (cache_ptr->log_flush)(cache_ptr, addr, was_dirty, flags, type_id);
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C_load_entry
- *
- * Purpose:     Attempt to load the entry at the specified disk address
- *        and with the specified type into memory.  If successful.
- *        return the in memory address of the entry.  Return NULL
- *        on failure.
- *
- *        Note that this function simply loads the entry into
- *        core.  It does not insert it into the cache.
- *
- * Return:      Non-NULL on success / NULL on failure.
- *
- * Programmer:  John Mainzer, 5/18/04
- *
- *        QAK -- 1/31/08
- *        Added initialization for the new free_file_space_on_destroy
- *        field.
- *
- *-------------------------------------------------------------------------
- */
-static void *
-H5C_load_entry(H5F_t *             f,
-               hid_t               dxpl_id,
-               const H5C_class_t * type,
-               haddr_t             addr,
-               void *              udata)
-{
-    void *        thing = NULL;   /* Pointer to thing loaded */
-    H5C_cache_entry_t *    entry;          /* Alias for thing loaded, as cache entry */
-    void *        ret_value;      /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT
-
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->cache);
-    HDassert(type);
-    HDassert(type->load);
-    HDassert(type->size);
-    HDassert(H5F_addr_defined(addr));
-
-    if(NULL == (thing = (type->load)(f, dxpl_id, addr, udata)))
-
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, "unable to load entry")
+                if (status < 0) {
 
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "log_flush callback failed.")
+                }
+            }
+        }
 
-    entry = (H5C_cache_entry_t *)thing;
+done:
+        FUNC_LEAVE_NOAPI(ret_value)
+    } /* H5C_flush_single_entry() */
 
-    /* In general, an entry should be clean just after it is loaded.
+    /*-------------------------------------------------------------------------
      *
-     * However, when this code is used in the metadata cache, it is
-     * possible that object headers will be dirty at this point, as
-     * the load function will alter object headers if necessary to
-     * fix an old bug.
+     * Function:    H5C_load_entry
      *
-     * To support this bug fix, I have replace the old assert:
+     * Purpose:     Attempt to load the entry at the specified disk address
+     *        and with the specified type into memory.  If successful.
+     *        return the in memory address of the entry.  Return NULL
+     *        on failure.
      *
-     *     HDassert( entry->is_dirty == FALSE );
+     *        Note that this function simply loads the entry into
+     *        core.  It does not insert it into the cache.
      *
-     * with:
+     * Return:      Non-NULL on success / NULL on failure.
      *
-     *     HDassert( ( entry->is_dirty == FALSE ) || ( type->id == 5 ) );
+     * Programmer:  John Mainzer, 5/18/04
      *
-     * Note that type id 5 is associated with object headers in the metadata
-     * cache.
+     *        QAK -- 1/31/08
+     *        Added initialization for the new free_file_space_on_destroy
+     *        field.
      *
-     * When we get to using H5C for other purposes, we may wish to
-     * tighten up the assert so that the loophole only applies to the
-     * metadata cache.
+     *-------------------------------------------------------------------------
      */
+    static void *H5C_load_entry(H5F_t * f, hid_t dxpl_id, const H5C_class_t *type, haddr_t addr, void *udata)
+    {
+        void *             thing = NULL; /* Pointer to thing loaded */
+        H5C_cache_entry_t *entry;        /* Alias for thing loaded, as cache entry */
+        void *             ret_value;    /* Return value */
+
+        FUNC_ENTER_NOAPI_NOINIT
+
+        HDassert(f);
+        HDassert(f->shared);
+        HDassert(f->shared->cache);
+        HDassert(type);
+        HDassert(type->load);
+        HDassert(type->size);
+        HDassert(H5F_addr_defined(addr));
+
+        if (NULL == (thing = (type->load)(f, dxpl_id, addr, udata)))
 
-    HDassert( ( entry->is_dirty == FALSE ) || ( type->id == 5 ) );
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, "unable to load entry")
+
+        entry = (H5C_cache_entry_t *)thing;
+
+        /* In general, an entry should be clean just after it is loaded.
+         *
+         * However, when this code is used in the metadata cache, it is
+         * possible that object headers will be dirty at this point, as
+         * the load function will alter object headers if necessary to
+         * fix an old bug.
+         *
+         * To support this bug fix, I have replace the old assert:
+         *
+         *     HDassert( entry->is_dirty == FALSE );
+         *
+         * with:
+         *
+         *     HDassert( ( entry->is_dirty == FALSE ) || ( type->id == 5 ) );
+         *
+         * Note that type id 5 is associated with object headers in the metadata
+         * cache.
+         *
+         * When we get to using H5C for other purposes, we may wish to
+         * tighten up the assert so that the loophole only applies to the
+         * metadata cache.
+         */
+
+        HDassert((entry->is_dirty == FALSE) || (type->id == 5));
 #ifndef NDEBUG
-    entry->magic                = H5C__H5C_CACHE_ENTRY_T_MAGIC;
+        entry->magic = H5C__H5C_CACHE_ENTRY_T_MAGIC;
 #endif /* NDEBUG */
-    entry->cache_ptr            = f->shared->cache;
-    entry->addr                 = addr;
-    entry->type                 = type;
-    entry->is_protected         = FALSE;
-    entry->is_read_only         = FALSE;
-    entry->ro_ref_count         = 0;
-    entry->in_slist             = FALSE;
-    entry->flush_marker         = FALSE;
+        entry->cache_ptr    = f->shared->cache;
+        entry->addr         = addr;
+        entry->type         = type;
+        entry->is_protected = FALSE;
+        entry->is_read_only = FALSE;
+        entry->ro_ref_count = 0;
+        entry->in_slist     = FALSE;
+        entry->flush_marker = FALSE;
 #ifdef H5_HAVE_PARALLEL
-    entry->clear_on_unprotect   = FALSE;
-    entry->flush_immediately    = FALSE;
+        entry->clear_on_unprotect = FALSE;
+        entry->flush_immediately  = FALSE;
 #endif /* H5_HAVE_PARALLEL */
-    entry->flush_in_progress    = FALSE;
-    entry->destroy_in_progress  = FALSE;
-    entry->free_file_space_on_destroy = FALSE;
+        entry->flush_in_progress          = FALSE;
+        entry->destroy_in_progress        = FALSE;
+        entry->free_file_space_on_destroy = FALSE;
 
-    if((type->size)(f, thing, &(entry->size)) < 0)
+        if ((type->size)(f, thing, &(entry->size)) < 0)
 
-        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, NULL, "Can't get size of thing")
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, NULL, "Can't get size of thing")
 
-    HDassert( entry->size < H5C_MAX_ENTRY_SIZE );
+        HDassert(entry->size < H5C_MAX_ENTRY_SIZE);
 
-    entry->next                 = NULL;
-    entry->prev                 = NULL;
+        entry->next = NULL;
+        entry->prev = NULL;
 
-    entry->aux_next             = NULL;
-    entry->aux_prev             = NULL;
+        entry->aux_next = NULL;
+        entry->aux_prev = NULL;
 
-    H5C__RESET_CACHE_ENTRY_STATS(entry);
+        H5C__RESET_CACHE_ENTRY_STATS(entry);
 
-    ret_value = thing;
+        ret_value = thing;
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_load_entry() */
-
+        FUNC_LEAVE_NOAPI(ret_value)
+    } /* H5C_load_entry() */
 
-/*-------------------------------------------------------------------------
- *
- * Function:    H5C_make_space_in_cache
- *
- * Purpose:     Attempt to evict cache entries until the index_size
- *        is at least needed_space below max_cache_size.
- *
- *        In passing, also attempt to bring cLRU_list_size to a
- *        value greater than min_clean_size.
- *
- *        Depending on circumstances, both of these goals may
- *        be impossible, as in parallel mode, we must avoid generating
- *        a write as part of a read (to avoid deadlock in collective
- *        I/O), and in all cases, it is possible (though hopefully
- *        highly unlikely) that the protected list may exceed the
- *        maximum size of the cache.
- *
- *        Thus the function simply does its best, returning success
- *        unless an error is encountered.
- *
- *        The primary_dxpl_id and secondary_dxpl_id parameters
- *        specify the dxpl_ids used on the first write occasioned
- *        by the call (primary_dxpl_id), and on all subsequent
- *        writes (secondary_dxpl_id).  This is useful in the metadata
- *        cache, but may not be needed elsewhere.  If so, just use the
- *        same dxpl_id for both parameters.
- *
- *        Observe that this function cannot occasion a read.
- *
- * Return:      Non-negative on success/Negative on failure.
- *
- * Programmer:  John Mainzer, 5/14/04
- *
- *              JRM -- 11/13/08
- *              Modified function to always observe the min_clean_size
- *              whether we are maintaining the clean and dirt LRU lists
- *              or not.  To do this, we had to add the new clean_index_size
- *              and dirty_index_size fields to H5C_t, and supporting code
- *              as needed throughout the cache.
- *
- *              The purpose of this modification is to avoid "metadata
- *              blizzards" in the write only case.  In such instances,
- *              the cache was allowed to fill with dirty metadata.  When
- *              we finally needed to evict an entry to make space, we had
- *              to flush out a whole cache full of metadata -- which has
- *              interesting performance effects.  We hope to avoid (or
- *              perhaps more accurately hide) this effect by maintaining
- *              the min_clean_size, which should force us to start flushing
- *              entries long before we actually have to evict something
- *              to make space.
- *
- *              MAM -- 01/06/09
- *              Added code to maintain clean_entries_skipped and total_entries
- *              scanned statistics.
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5C_make_space_in_cache(H5F_t *    f,
-                        hid_t    primary_dxpl_id,
-                        hid_t    secondary_dxpl_id,
-                size_t    space_needed,
-                        hbool_t    write_permitted,
-                        hbool_t * first_flush_ptr)
-{
-    H5C_t *        cache_ptr = f->shared->cache;
-    herr_t        result;
+    /*-------------------------------------------------------------------------
+     *
+     * Function:    H5C_make_space_in_cache
+     *
+     * Purpose:     Attempt to evict cache entries until the index_size
+     *        is at least needed_space below max_cache_size.
+     *
+     *        In passing, also attempt to bring cLRU_list_size to a
+     *        value greater than min_clean_size.
+     *
+     *        Depending on circumstances, both of these goals may
+     *        be impossible, as in parallel mode, we must avoid generating
+     *        a write as part of a read (to avoid deadlock in collective
+     *        I/O), and in all cases, it is possible (though hopefully
+     *        highly unlikely) that the protected list may exceed the
+     *        maximum size of the cache.
+     *
+     *        Thus the function simply does its best, returning success
+     *        unless an error is encountered.
+     *
+     *        The primary_dxpl_id and secondary_dxpl_id parameters
+     *        specify the dxpl_ids used on the first write occasioned
+     *        by the call (primary_dxpl_id), and on all subsequent
+     *        writes (secondary_dxpl_id).  This is useful in the metadata
+     *        cache, but may not be needed elsewhere.  If so, just use the
+     *        same dxpl_id for both parameters.
+     *
+     *        Observe that this function cannot occasion a read.
+     *
+     * Return:      Non-negative on success/Negative on failure.
+     *
+     * Programmer:  John Mainzer, 5/14/04
+     *
+     *              JRM -- 11/13/08
+     *              Modified function to always observe the min_clean_size
+     *              whether we are maintaining the clean and dirt LRU lists
+     *              or not.  To do this, we had to add the new clean_index_size
+     *              and dirty_index_size fields to H5C_t, and supporting code
+     *              as needed throughout the cache.
+     *
+     *              The purpose of this modification is to avoid "metadata
+     *              blizzards" in the write only case.  In such instances,
+     *              the cache was allowed to fill with dirty metadata.  When
+     *              we finally needed to evict an entry to make space, we had
+     *              to flush out a whole cache full of metadata -- which has
+     *              interesting performance effects.  We hope to avoid (or
+     *              perhaps more accurately hide) this effect by maintaining
+     *              the min_clean_size, which should force us to start flushing
+     *              entries long before we actually have to evict something
+     *              to make space.
+     *
+     *              MAM -- 01/06/09
+     *              Added code to maintain clean_entries_skipped and total_entries
+     *              scanned statistics.
+     *-------------------------------------------------------------------------
+     */
+    static herr_t H5C_make_space_in_cache(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                          size_t space_needed, hbool_t write_permitted,
+                                          hbool_t * first_flush_ptr)
+    {
+        H5C_t *cache_ptr = f->shared->cache;
+        herr_t result;
 #if H5C_COLLECT_CACHE_STATS
-    int32_t             clean_entries_skipped = 0;
-    int32_t             total_entries_scanned = 0;
+        int32_t clean_entries_skipped = 0;
+        int32_t total_entries_scanned = 0;
 #endif /* H5C_COLLECT_CACHE_STATS */
-    int32_t        entries_examined = 0;
-    int32_t        initial_list_len;
-    size_t        empty_space;
-    hbool_t        prev_is_dirty = FALSE;
-    hbool_t             didnt_flush_entry = FALSE;
-    H5C_cache_entry_t *    entry_ptr;
-    H5C_cache_entry_t *    prev_ptr;
-    H5C_cache_entry_t *    next_ptr;
-    herr_t        ret_value = SUCCEED;      /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT
+        int32_t            entries_examined = 0;
+        int32_t            initial_list_len;
+        size_t             empty_space;
+        hbool_t            prev_is_dirty     = FALSE;
+        hbool_t            didnt_flush_entry = FALSE;
+        H5C_cache_entry_t *entry_ptr;
+        H5C_cache_entry_t *prev_ptr;
+        H5C_cache_entry_t *next_ptr;
+        herr_t             ret_value = SUCCEED; /* Return value */
 
-    HDassert( f );
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( first_flush_ptr != NULL );
-    HDassert( ( *first_flush_ptr == TRUE ) || ( *first_flush_ptr == FALSE ) );
-    HDassert( cache_ptr->index_size ==
-        (cache_ptr->clean_index_size + cache_ptr->dirty_index_size) );
+        FUNC_ENTER_NOAPI_NOINIT
 
-    if ( write_permitted ) {
+        HDassert(f);
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(first_flush_ptr != NULL);
+        HDassert((*first_flush_ptr == TRUE) || (*first_flush_ptr == FALSE));
+        HDassert(cache_ptr->index_size == (cache_ptr->clean_index_size + cache_ptr->dirty_index_size));
 
-        initial_list_len = cache_ptr->LRU_list_len;
+        if (write_permitted) {
 
-        entry_ptr = cache_ptr->LRU_tail_ptr;
+            initial_list_len = cache_ptr->LRU_list_len;
 
-    if ( cache_ptr->index_size >= cache_ptr->max_cache_size ) {
+            entry_ptr = cache_ptr->LRU_tail_ptr;
 
-    empty_space = 0;
+            if (cache_ptr->index_size >= cache_ptr->max_cache_size) {
 
-    } else {
-
-    empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+                empty_space = 0;
+            }
+            else {
 
-    }
+                empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+            }
 
-        while ( ( ( (cache_ptr->index_size + space_needed)
-                    >
-                    cache_ptr->max_cache_size
-                  )
-        ||
-        (
-            ( empty_space + cache_ptr->clean_index_size )
-            <
-            ( cache_ptr->min_clean_size )
-                  )
-        )
-                &&
-                ( entries_examined <= (2 * initial_list_len) )
-                &&
-                ( entry_ptr != NULL )
-              )
-        {
-            HDassert( ! (entry_ptr->is_protected) );
-            HDassert( ! (entry_ptr->is_read_only) );
-            HDassert( (entry_ptr->ro_ref_count) == 0 );
+            while ((((cache_ptr->index_size + space_needed) > cache_ptr->max_cache_size) ||
+                    ((empty_space + cache_ptr->clean_index_size) < (cache_ptr->min_clean_size))) &&
+                   (entries_examined <= (2 * initial_list_len)) && (entry_ptr != NULL)) {
+                HDassert(!(entry_ptr->is_protected));
+                HDassert(!(entry_ptr->is_read_only));
+                HDassert((entry_ptr->ro_ref_count) == 0);
 
-        next_ptr = entry_ptr->next;
-            prev_ptr = entry_ptr->prev;
+                next_ptr = entry_ptr->next;
+                prev_ptr = entry_ptr->prev;
 
-        if ( prev_ptr != NULL ) {
+                if (prev_ptr != NULL) {
 
-        prev_is_dirty = prev_ptr->is_dirty;
-        }
+                    prev_is_dirty = prev_ptr->is_dirty;
+                }
 
-            if ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) {
+                if ((entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE) {
 
-                didnt_flush_entry = FALSE;
+                    didnt_flush_entry = FALSE;
 
-                if ( entry_ptr->is_dirty ) {
+                    if (entry_ptr->is_dirty) {
 
 #if H5C_COLLECT_CACHE_STATS
-                    if ( (cache_ptr->index_size + space_needed)
-                           >
-                          cache_ptr->max_cache_size ) {
+                        if ((cache_ptr->index_size + space_needed) > cache_ptr->max_cache_size) {
 
-                        cache_ptr->entries_scanned_to_make_space++;
-                    }
+                            cache_ptr->entries_scanned_to_make_space++;
+                        }
 #endif /* H5C_COLLECT_CACHE_STATS */
-                    result = H5C_flush_single_entry(f,
-                                                    primary_dxpl_id,
-                                                    secondary_dxpl_id,
-                                                    entry_ptr->type,
-                                                    entry_ptr->addr,
-                                                    H5C__NO_FLAGS_SET,
-                                                    first_flush_ptr,
-                                                    FALSE);
-                } else if ( (cache_ptr->index_size + space_needed)
-                              >
-                             cache_ptr->max_cache_size ) {
+                        result = H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id,
+                                                        entry_ptr->type, entry_ptr->addr, H5C__NO_FLAGS_SET,
+                                                        first_flush_ptr, FALSE);
+                    }
+                    else if ((cache_ptr->index_size + space_needed) > cache_ptr->max_cache_size) {
 #if H5C_COLLECT_CACHE_STATS
-                    cache_ptr->entries_scanned_to_make_space++;
+                        cache_ptr->entries_scanned_to_make_space++;
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-                    result = H5C_flush_single_entry(f,
-                                                    primary_dxpl_id,
-                                                    secondary_dxpl_id,
-                                                    entry_ptr->type,
-                                                    entry_ptr->addr,
-                                                    H5C__FLUSH_INVALIDATE_FLAG,
-                                                    first_flush_ptr,
-                                                    TRUE);
-                } else {
-
-                    /* We have enough space so don't flush clean entry.
-                     * Set result to SUCCEED to avoid triggering the error
-                     * code below.
-                     */
+                        result = H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id,
+                                                        entry_ptr->type, entry_ptr->addr,
+                                                        H5C__FLUSH_INVALIDATE_FLAG, first_flush_ptr, TRUE);
+                    }
+                    else {
+
+                        /* We have enough space so don't flush clean entry.
+                         * Set result to SUCCEED to avoid triggering the error
+                         * code below.
+                         */
 #if H5C_COLLECT_CACHE_STATS
-                    clean_entries_skipped++;
+                        clean_entries_skipped++;
 #endif /* H5C_COLLECT_CACHE_STATS */
-                    didnt_flush_entry = TRUE;
-                    result = SUCCEED;
-
-                }
+                        didnt_flush_entry = TRUE;
+                        result            = SUCCEED;
+                    }
 
 #if H5C_COLLECT_CACHE_STATS
-                total_entries_scanned++;
+                    total_entries_scanned++;
 #endif /* H5C_COLLECT_CACHE_STATS */
+                }
+                else {
 
+                    /* Skip epoch markers.  Set result to SUCCEED to avoid
+                     * triggering the error code below.
+                     */
+                    didnt_flush_entry = TRUE;
+                    result            = SUCCEED;
+                }
 
-            } else {
+                if (result < 0) {
 
-                /* Skip epoch markers.  Set result to SUCCEED to avoid
-                 * triggering the error code below.
-                 */
-                didnt_flush_entry = TRUE;
-                result = SUCCEED;
-            }
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush entry")
+                }
 
-            if ( result < 0 ) {
+                if (prev_ptr != NULL) {
+#ifndef NDEBUG
+                    if (prev_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                            "unable to flush entry")
-            }
+                        /* something horrible has happened to *prev_ptr --
+                         * scream and die.
+                         */
+                        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "*prev_ptr corrupt 1")
+                    }
+#endif /* NDEBUG */
+                    if (didnt_flush_entry) {
 
-        if ( prev_ptr != NULL ) {
-#ifndef NDEBUG
-        if ( prev_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC ) {
+                        /* epoch markers don't get flushed, so the sanity checks
+                         * on normal entries will fail -- thus just set entry_ptr
+                         * to prev_ptr and go on.
+                         */
+                        entry_ptr = prev_ptr;
+                    }
+                    else if ((prev_ptr->is_dirty != prev_is_dirty) || (prev_ptr->next != next_ptr) ||
+                             (prev_ptr->is_protected) || (prev_ptr->is_pinned)) {
 
-            /* something horrible has happened to *prev_ptr --
-            * scream and die.
-            */
-                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                "*prev_ptr corrupt 1")
+                        /* something has happened to the LRU -- start over
+                         * from the tail.
+                         */
+                        entry_ptr = cache_ptr->LRU_tail_ptr;
+                    }
+                    else {
 
+                        entry_ptr = prev_ptr;
+                    }
                 }
-#endif /* NDEBUG */
-        if ( didnt_flush_entry ) {
-
-            /* epoch markers don't get flushed, so the sanity checks
-            * on normal entries will fail -- thus just set entry_ptr
-            * to prev_ptr and go on.
-            */
-                    entry_ptr = prev_ptr;
-
-        } else if ( ( prev_ptr->is_dirty != prev_is_dirty )
-                    ||
-                    ( prev_ptr->next != next_ptr )
-                    ||
-                    ( prev_ptr->is_protected )
-                    ||
-                    ( prev_ptr->is_pinned ) ) {
-
-            /* something has happened to the LRU -- start over
-            * from the tail.
-            */
-                entry_ptr = cache_ptr->LRU_tail_ptr;
+                else {
 
-        } else {
-
-            entry_ptr = prev_ptr;
+                    entry_ptr = NULL;
+                }
 
-        }
-        } else {
+                entries_examined++;
 
-        entry_ptr = NULL;
+                if (cache_ptr->index_size >= cache_ptr->max_cache_size) {
 
-        }
+                    empty_space = 0;
+                }
+                else {
 
-        entries_examined++;
+                    empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+                }
 
-        if ( cache_ptr->index_size >= cache_ptr->max_cache_size ) {
+                HDassert(cache_ptr->index_size ==
+                         (cache_ptr->clean_index_size + cache_ptr->dirty_index_size));
+            }
 
-        empty_space = 0;
+#if H5C_COLLECT_CACHE_STATS
+            cache_ptr->calls_to_msic++;
 
-        } else {
+            cache_ptr->total_entries_skipped_in_msic += clean_entries_skipped;
+            cache_ptr->total_entries_scanned_in_msic += total_entries_scanned;
 
-        empty_space = cache_ptr->max_cache_size - cache_ptr->index_size;
+            if (clean_entries_skipped > cache_ptr->max_entries_skipped_in_msic) {
 
-        }
+                cache_ptr->max_entries_skipped_in_msic = clean_entries_skipped;
+            }
 
-        HDassert( cache_ptr->index_size ==
-                (cache_ptr->clean_index_size +
-            cache_ptr->dirty_index_size) );
+            if (total_entries_scanned > cache_ptr->max_entries_scanned_in_msic) {
 
-    }
+                cache_ptr->max_entries_scanned_in_msic = total_entries_scanned;
+            }
+#endif /* H5C_COLLECT_CACHE_STATS */
 
-#if H5C_COLLECT_CACHE_STATS
-        cache_ptr->calls_to_msic++;
+            HDassert((entries_examined > (2 * initial_list_len)) ||
+                     ((cache_ptr->pl_size + cache_ptr->pel_size + cache_ptr->min_clean_size) >
+                      cache_ptr->max_cache_size) ||
+                     ((cache_ptr->clean_index_size + empty_space) >= cache_ptr->min_clean_size));
 
-        cache_ptr->total_entries_skipped_in_msic += clean_entries_skipped;
-        cache_ptr->total_entries_scanned_in_msic += total_entries_scanned;
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-        if ( clean_entries_skipped > cache_ptr->max_entries_skipped_in_msic ) {
+            HDassert((entries_examined > (2 * initial_list_len)) ||
+                     (cache_ptr->cLRU_list_size <= cache_ptr->clean_index_size));
+            HDassert((entries_examined > (2 * initial_list_len)) ||
+                     (cache_ptr->dLRU_list_size <= cache_ptr->dirty_index_size));
 
-            cache_ptr->max_entries_skipped_in_msic = clean_entries_skipped;
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
         }
+        else {
 
-        if ( total_entries_scanned > cache_ptr->max_entries_scanned_in_msic ) {
+            HDassert(H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS);
 
-            cache_ptr->max_entries_scanned_in_msic = total_entries_scanned;
-        }
-#endif /* H5C_COLLECT_CACHE_STATS */
+            initial_list_len = cache_ptr->cLRU_list_len;
+            entry_ptr        = cache_ptr->cLRU_tail_ptr;
 
-    HDassert( ( entries_examined > (2 * initial_list_len) ) ||
-        ( (cache_ptr->pl_size + cache_ptr->pel_size + cache_ptr->min_clean_size) >
-            cache_ptr->max_cache_size ) ||
-        ( ( cache_ptr->clean_index_size + empty_space )
-            >= cache_ptr->min_clean_size ) );
+            while (((cache_ptr->index_size + space_needed) > cache_ptr->max_cache_size) &&
+                   (entries_examined <= initial_list_len) && (entry_ptr != NULL)) {
+                HDassert(!(entry_ptr->is_protected));
+                HDassert(!(entry_ptr->is_read_only));
+                HDassert((entry_ptr->ro_ref_count) == 0);
+                HDassert(!(entry_ptr->is_dirty));
 
-#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+                prev_ptr = entry_ptr->aux_prev;
 
-        HDassert( ( entries_examined > (2 * initial_list_len) ) ||
-        ( cache_ptr->cLRU_list_size <= cache_ptr->clean_index_size ) );
-        HDassert( ( entries_examined > (2 * initial_list_len) ) ||
-        ( cache_ptr->dLRU_list_size <= cache_ptr->dirty_index_size ) );
+                result = H5C_flush_single_entry(f, primary_dxpl_id, secondary_dxpl_id, entry_ptr->type,
+                                                entry_ptr->addr, H5C__FLUSH_INVALIDATE_FLAG, first_flush_ptr,
+                                                TRUE);
 
-#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+                if (result < 0) {
 
-    } else {
-
-        HDassert( H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS );
-
-        initial_list_len = cache_ptr->cLRU_list_len;
-        entry_ptr = cache_ptr->cLRU_tail_ptr;
-
-        while ( ( (cache_ptr->index_size + space_needed)
-                  >
-                  cache_ptr->max_cache_size
-                )
-                &&
-                ( entries_examined <= initial_list_len )
-                &&
-                ( entry_ptr != NULL )
-              )
-        {
-            HDassert( ! (entry_ptr->is_protected) );
-            HDassert( ! (entry_ptr->is_read_only) );
-            HDassert( (entry_ptr->ro_ref_count) == 0 );
-            HDassert( ! (entry_ptr->is_dirty) );
-
-            prev_ptr = entry_ptr->aux_prev;
-
-            result = H5C_flush_single_entry(f,
-                                            primary_dxpl_id,
-                                            secondary_dxpl_id,
-                                            entry_ptr->type,
-                                            entry_ptr->addr,
-                                            H5C__FLUSH_INVALIDATE_FLAG,
-                                            first_flush_ptr,
-                                            TRUE);
-
-            if ( result < 0 ) {
-
-                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-                            "unable to flush entry")
-            }
+                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush entry")
+                }
 
-            entry_ptr = prev_ptr;
-        entries_examined++;
+                entry_ptr = prev_ptr;
+                entries_examined++;
+            }
         }
-    }
 
 done:
 
-    FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5C_make_space_in_cache() */
+        FUNC_LEAVE_NOAPI(ret_value)
 
+    } /* H5C_make_space_in_cache() */
 
 /*-------------------------------------------------------------------------
  *
@@ -8388,106 +7467,81 @@ done:
  */
 #if H5C_DO_EXTREME_SANITY_CHECKS
 
-static herr_t
-H5C_validate_lru_list(H5C_t * cache_ptr)
-{
-    herr_t        ret_value = SUCCEED;      /* Return value */
-    int32_t             len = 0;
-    size_t              size = 0;
-    H5C_cache_entry_t *    entry_ptr = NULL;
-
-    FUNC_ENTER_NOAPI_NOINIT
+    static herr_t H5C_validate_lru_list(H5C_t * cache_ptr)
+    {
+        herr_t             ret_value = SUCCEED; /* Return value */
+        int32_t            len       = 0;
+        size_t             size      = 0;
+        H5C_cache_entry_t *entry_ptr = NULL;
 
-    HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+        FUNC_ENTER_NOAPI_NOINIT
 
-    if ( ( ( cache_ptr->LRU_head_ptr == NULL )
-           ||
-           ( cache_ptr->LRU_tail_ptr == NULL )
-         )
-         &&
-         ( cache_ptr->LRU_head_ptr != cache_ptr->LRU_tail_ptr )
-       ) {
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 1 failed")
-    }
+        if (((cache_ptr->LRU_head_ptr == NULL) || (cache_ptr->LRU_tail_ptr == NULL)) &&
+            (cache_ptr->LRU_head_ptr != cache_ptr->LRU_tail_ptr)) {
 
-    if ( ( cache_ptr->LRU_list_len < 0 ) || ( cache_ptr->LRU_list_size < 0 ) ) {
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 1 failed")
+        }
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 2 failed")
-    }
+        if ((cache_ptr->LRU_list_len < 0) || (cache_ptr->LRU_list_size < 0)) {
 
-    if ( ( cache_ptr->LRU_list_len == 1 )
-         &&
-         ( ( cache_ptr->LRU_head_ptr != cache_ptr->LRU_tail_ptr )
-           ||
-           ( cache_ptr->LRU_head_ptr == NULL )
-           ||
-           ( cache_ptr->LRU_head_ptr->size != cache_ptr->LRU_list_size )
-         )
-       ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 3 failed")
-    }
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 2 failed")
+        }
 
-    if ( ( cache_ptr->LRU_list_len >= 1 )
-         &&
-         ( ( cache_ptr->LRU_head_ptr == NULL )
-           ||
-           ( cache_ptr->LRU_head_ptr->prev != NULL )
-           ||
-           ( cache_ptr->LRU_tail_ptr == NULL )
-           ||
-           ( cache_ptr->LRU_tail_ptr->next != NULL )
-         )
-       ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 4 failed")
-    }
+        if ((cache_ptr->LRU_list_len == 1) &&
+            ((cache_ptr->LRU_head_ptr != cache_ptr->LRU_tail_ptr) || (cache_ptr->LRU_head_ptr == NULL) ||
+             (cache_ptr->LRU_head_ptr->size != cache_ptr->LRU_list_size))) {
 
-    entry_ptr = cache_ptr->LRU_head_ptr;
-    while ( entry_ptr != NULL )
-    {
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 3 failed")
+        }
 
-        if ( ( entry_ptr != cache_ptr->LRU_head_ptr ) &&
-             ( ( entry_ptr->prev == NULL ) ||
-               ( entry_ptr->prev->next != entry_ptr ) ) ) {
+        if ((cache_ptr->LRU_list_len >= 1) &&
+            ((cache_ptr->LRU_head_ptr == NULL) || (cache_ptr->LRU_head_ptr->prev != NULL) ||
+             (cache_ptr->LRU_tail_ptr == NULL) || (cache_ptr->LRU_tail_ptr->next != NULL))) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 5 failed")
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 4 failed")
         }
 
-        if ( ( entry_ptr != cache_ptr->LRU_tail_ptr ) &&
-             ( ( entry_ptr->next == NULL ) ||
-               ( entry_ptr->next->prev != entry_ptr ) ) ) {
+        entry_ptr = cache_ptr->LRU_head_ptr;
+        while (entry_ptr != NULL) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 6 failed")
-        }
+            if ((entry_ptr != cache_ptr->LRU_head_ptr) &&
+                ((entry_ptr->prev == NULL) || (entry_ptr->prev->next != entry_ptr))) {
 
-        len++;
-        size += entry_ptr->size;
-        entry_ptr = entry_ptr->next;
-    }
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 5 failed")
+            }
 
-    if ( ( cache_ptr->LRU_list_len != len ) ||
-         ( cache_ptr->LRU_list_size != size ) ) {
+            if ((entry_ptr != cache_ptr->LRU_tail_ptr) &&
+                ((entry_ptr->next == NULL) || (entry_ptr->next->prev != entry_ptr))) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 7 failed")
-    }
+                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 6 failed")
+            }
+
+            len++;
+            size += entry_ptr->size;
+            entry_ptr = entry_ptr->next;
+        }
+
+        if ((cache_ptr->LRU_list_len != len) || (cache_ptr->LRU_list_size != size)) {
+
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 7 failed")
+        }
 
 done:
 
-    if ( ret_value != SUCCEED ) {
+        if (ret_value != SUCCEED) {
 
-        HDassert(0);
-    }
+            HDassert(0);
+        }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C_validate_lru_list() */
+    } /* H5C_validate_lru_list() */
 
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5C_verify_not_in_index
@@ -8508,48 +7562,42 @@ done:
  */
 #if H5C_DO_EXTREME_SANITY_CHECKS
 
-static herr_t
-H5C_verify_not_in_index(H5C_t * cache_ptr,
-                        H5C_cache_entry_t * entry_ptr)
-{
-    herr_t        ret_value = SUCCEED;      /* Return value */
-    int32_t             i;
-    int32_t             depth;
-    H5C_cache_entry_t *    scan_ptr = NULL;
+    static herr_t H5C_verify_not_in_index(H5C_t * cache_ptr, H5C_cache_entry_t * entry_ptr)
+    {
+        herr_t             ret_value = SUCCEED; /* Return value */
+        int32_t            i;
+        int32_t            depth;
+        H5C_cache_entry_t *scan_ptr = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT
+        FUNC_ENTER_NOAPI_NOINIT
 
-    HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
-    HDassert( entry_ptr != NULL );
+        HDassert(cache_ptr != NULL);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+        HDassert(entry_ptr != NULL);
 
-    for ( i = 0; i < H5C__HASH_TABLE_LEN; i++ )
-    {
-        depth = 0;
-        scan_ptr = cache_ptr->index[i];
+        for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
+            depth    = 0;
+            scan_ptr = cache_ptr->index[i];
 
-        while ( scan_ptr != NULL )
-        {
-            if ( scan_ptr == entry_ptr ) {
+            while (scan_ptr != NULL) {
+                if (scan_ptr == entry_ptr) {
 
-                HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "Entry already in index.")
+                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Entry already in index.")
+                }
+                depth++;
+                scan_ptr = scan_ptr->ht_next;
             }
-            depth++;
-            scan_ptr = scan_ptr->ht_next;
         }
-    }
 
 done:
 
-    if ( ret_value != SUCCEED ) {
+        if (ret_value != SUCCEED) {
 
-        HDassert(0);
-    }
+            HDassert(0);
+        }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+        FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C_verify_not_in_index() */
+    } /* H5C_verify_not_in_index() */
 
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
-
diff --git a/src/H5CS.c b/src/H5CS.c
index a173c0b..ddedcdc 100644
--- a/src/H5CS.c
+++ b/src/H5CS.c
@@ -25,10 +25,9 @@
  *
  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5CSprivate.h"	/* Function stack			*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5CSprivate.h" /* Function stack			*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 #ifdef H5_HAVE_CODESTACK
 
@@ -43,17 +42,16 @@
  * by "H5CS_t *fstack =".
  */
 static H5CS_t *H5CS_get_stack(void);
-#define H5CS_get_my_stack()  H5CS_get_stack()
+#define H5CS_get_my_stack() H5CS_get_stack()
 #else /* H5_HAVE_THREADSAFE */
 /*
  * The function stack.  Eventually we'll have some sort of global table so each
  * thread has it's own stack.  The stacks will be created on demand when the
  * thread first calls H5CS_push().  */
-H5CS_t		H5CS_stack_g[1];
-#define H5CS_get_my_stack()	(H5CS_stack_g+0)
+H5CS_t H5CS_stack_g[1];
+#define H5CS_get_my_stack() (H5CS_stack_g + 0)
 #endif /* H5_HAVE_THREADSAFE */
 
-
 #ifdef H5_HAVE_THREADSAFE
 /*-------------------------------------------------------------------------
  * Function:	H5CS_get_stack
@@ -83,14 +81,16 @@ H5CS_get_stack(void)
     if (!fstack) {
         /* No associated value with current thread - create one */
 #ifdef H5_HAVE_WIN_THREADS
-        fstack = (H5CS_t *)LocalAlloc(LPTR, sizeof(H5CS_t)); /* Win32 has to use LocalAlloc to match the LocalFree in DllMain */
+        fstack = (H5CS_t *)LocalAlloc(
+            LPTR, sizeof(H5CS_t)); /* Win32 has to use LocalAlloc to match the LocalFree in DllMain */
 #else
-        fstack = (H5CS_t *)HDmalloc(sizeof(H5CS_t)); /* Don't use H5MM_malloc() here, it causes infinite recursion */
+        fstack = (H5CS_t *)HDmalloc(
+            sizeof(H5CS_t)); /* Don't use H5MM_malloc() here, it causes infinite recursion */
 #endif /* H5_HAVE_WIN_THREADS */
         HDassert(fstack);
 
         /* Set the thread-specific info */
-        fstack->nused=0;
+        fstack->nused = 0;
 
         /* (It's not necessary to release this in this API, it is
          *      released by the "key destructor" set up in the H5TS
@@ -101,9 +101,8 @@ H5CS_get_stack(void)
 
     FUNC_LEAVE_NOAPI_NOFS(fstack);
 } /* end H5CS_get_stack() */
-#endif  /* H5_HAVE_THREADSAFE */
+#endif /* H5_HAVE_THREADSAFE */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5CS_print_stack
  *
@@ -121,8 +120,8 @@ H5CS_get_stack(void)
 herr_t
 H5CS_print_stack(const H5CS_t *fstack, FILE *stream)
 {
-    const int	indent = 2;             /* Indention level */
-    int         i;                      /* Local index ariable */
+    const int indent = 2; /* Indention level */
+    int       i;          /* Local index ariable */
 
     /* Don't push this function on the function stack... :-) */
     FUNC_ENTER_NOAPI_NOERR_NOFS
@@ -134,24 +133,23 @@ H5CS_print_stack(const H5CS_t *fstack, FILE *stream)
     if (!stream)
         stream = stderr;
 
-    HDfprintf (stream, "HDF5-DIAG: Function stack from %s ", H5_lib_vers_info_g);
+    HDfprintf(stream, "HDF5-DIAG: Function stack from %s ", H5_lib_vers_info_g);
     /* try show the process or thread id in multiple processes cases*/
 #ifdef H5_HAVE_THREADSAFE
-    HDfprintf (stream, "thread %lu.", HDpthread_self_ulong());
+    HDfprintf(stream, "thread %lu.", HDpthread_self_ulong());
 #else  /* H5_HAVE_THREADSAFE */
-    HDfprintf (stream, "thread 0.");
-#endif  /* H5_HAVE_THREADSAFE */
-    if (fstack && fstack->nused>0)
-        HDfprintf (stream, "  Back trace follows.");
-    HDfputc ('\n', stream);
+    HDfprintf(stream, "thread 0.");
+#endif /* H5_HAVE_THREADSAFE */
+    if (fstack && fstack->nused > 0)
+        HDfprintf(stream, "  Back trace follows.");
+    HDfputc('\n', stream);
 
-    for (i=fstack->nused-1; i>=0; --i)
+    for (i = fstack->nused - 1; i >= 0; --i)
         HDfprintf(stream, "%*s#%03d: Routine: %s\n", indent, "", i, fstack->slot[i]);
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
 } /* end H5CS_print_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5CS_print
  *
@@ -169,7 +167,7 @@ H5CS_print_stack(const H5CS_t *fstack, FILE *stream)
 herr_t
 H5CS_print(FILE *stream)
 {
-    H5CS_t	*fstack = H5CS_get_my_stack (); /* Get the correct function stack */
+    H5CS_t *fstack = H5CS_get_my_stack(); /* Get the correct function stack */
 
     /* Don't push this function on the function stack... :-) */
     FUNC_ENTER_NOAPI_NOERR_NOFS
@@ -182,7 +180,6 @@ H5CS_print(FILE *stream)
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
 } /* end H5CS_print() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5CS_push
  *
@@ -201,7 +198,7 @@ H5CS_print(FILE *stream)
 herr_t
 H5CS_push(const char *func_name)
 {
-    H5CS_t	*fstack = H5CS_get_my_stack ();
+    H5CS_t *fstack = H5CS_get_my_stack();
 
     /* Don't push this function on the function stack... :-) */
     FUNC_ENTER_NOAPI_NOERR_NOFS
@@ -213,14 +210,13 @@ H5CS_push(const char *func_name)
     /*
      * Push the function if there's room.  Otherwise just increment count
      */
-    if (fstack->nused<H5CS_NSLOTS)
-	fstack->slot[fstack->nused] = func_name;
+    if (fstack->nused < H5CS_NSLOTS)
+        fstack->slot[fstack->nused] = func_name;
     fstack->nused++;
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
 } /* end H5CS_push() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5CS_pop
  *
@@ -238,14 +234,14 @@ H5CS_push(const char *func_name)
 herr_t
 H5CS_pop(void)
 {
-    H5CS_t	*fstack = H5CS_get_my_stack ();
+    H5CS_t *fstack = H5CS_get_my_stack();
 
     /* Don't push this function on the function stack... :-) */
     FUNC_ENTER_NOAPI_NOERR_NOFS
 
     /* Sanity check */
     HDassert(fstack);
-    HDassert(fstack->nused>0);
+    HDassert(fstack->nused > 0);
 
     /* Pop the function. */
     fstack->nused--;
@@ -253,7 +249,6 @@ H5CS_pop(void)
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
 } /* end H5CS_pop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5CS_copy_stack
  *
@@ -271,8 +266,8 @@ H5CS_pop(void)
 herr_t
 H5CS_copy_stack(H5CS_t *new_stack)
 {
-    H5CS_t	*old_stack = H5CS_get_my_stack ();
-    unsigned    u;                      /* Local index variable */
+    H5CS_t * old_stack = H5CS_get_my_stack();
+    unsigned u; /* Local index variable */
 
     /* Don't push this function on the function stack... :-) */
     FUNC_ENTER_NOAPI_NOERR_NOFS
@@ -281,14 +276,13 @@ H5CS_copy_stack(H5CS_t *new_stack)
     HDassert(old_stack);
 
     /* Copy old stack to new one, duplicating the strings */
-    for(u = 0; u < old_stack->nused; u++)
+    for (u = 0; u < old_stack->nused; u++)
         new_stack->slot[u] = H5MM_strdup(old_stack->slot[u]);
     new_stack->nused = old_stack->nused;
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
 } /* end H5CS_copy_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5CS_close_stack
  *
@@ -306,7 +300,7 @@ H5CS_copy_stack(H5CS_t *new_stack)
 herr_t
 H5CS_close_stack(H5CS_t *stack)
 {
-    unsigned    u;                      /* Local index variable */
+    unsigned u; /* Local index variable */
 
     /* Don't push this function on the function stack... :-) */
     FUNC_ENTER_NOAPI_NOERR_NOFS
@@ -315,11 +309,10 @@ H5CS_close_stack(H5CS_t *stack)
     HDassert(stack);
 
     /* Free strings on stack */
-    for(u = 0; u < stack->nused; u++)
+    for (u = 0; u < stack->nused; u++)
         stack->slot[u] = H5MM_xfree((void *)stack->slot[u]);
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
 } /* end H5CS_close_stack() */
 
 #endif /* H5_HAVE_CODESTACK */
-
diff --git a/src/H5CSprivate.h b/src/H5CSprivate.h
index 0746a6d..7da7605 100644
--- a/src/H5CSprivate.h
+++ b/src/H5CSprivate.h
@@ -24,19 +24,19 @@
 /* Private headers needed by this file */
 #include "H5private.h"
 
-#define H5CS_NSLOTS	48	/*number of slots in an function stack	     */
+#define H5CS_NSLOTS 48 /*number of slots in an function stack	     */
 
 /* A function stack */
 typedef struct H5CS_t {
-    unsigned	nused;			        /*num slots currently used in stack  */
-    const char *slot[H5CS_NSLOTS];	/*array of function records	     */
+    unsigned    nused;             /*num slots currently used in stack  */
+    const char *slot[H5CS_NSLOTS]; /*array of function records	     */
 } H5CS_t;
 
-H5_DLL herr_t H5CS_push (const char *func_name);
-H5_DLL herr_t H5CS_pop (void);
-H5_DLL herr_t H5CS_print (FILE *stream);
-H5_DLL herr_t H5CS_print_stack (const H5CS_t *stack, FILE *stream);
-H5_DLL herr_t H5CS_copy_stack (H5CS_t *stack);
-H5_DLL herr_t H5CS_close_stack (H5CS_t *stack);
+H5_DLL herr_t H5CS_push(const char *func_name);
+H5_DLL herr_t H5CS_pop(void);
+H5_DLL herr_t H5CS_print(FILE *stream);
+H5_DLL herr_t H5CS_print_stack(const H5CS_t *stack, FILE *stream);
+H5_DLL herr_t H5CS_copy_stack(H5CS_t *stack);
+H5_DLL herr_t H5CS_close_stack(H5CS_t *stack);
 
 #endif /* _H5CSprivate_H */
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 7ab359b..bc79f13 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -3565,4 +3565,3 @@ if ( (cache_ptr)->index_size !=                                             \
 
 #endif /* _H5Cpkg_H */
 /* clang-format on */
-
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index e9b8c1b..6f29574 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -28,15 +28,14 @@
 #ifndef _H5Cprivate_H
 #define _H5Cprivate_H
 
-#include "H5Cpublic.h"        /* public prototypes                */
+#include "H5Cpublic.h" /* public prototypes                */
 
 /* Pivate headers needed by this header */
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Fprivate.h"        /* File access                */
+#include "H5private.h"  /* Generic Functions            */
+#include "H5Fprivate.h" /* File access                */
 
-
-#define H5C_DO_SANITY_CHECKS        0
-#define H5C_DO_EXTREME_SANITY_CHECKS    0
+#define H5C_DO_SANITY_CHECKS         0
+#define H5C_DO_EXTREME_SANITY_CHECKS 0
 
 /* This sanity checking constant was picked out of the air.  Increase
  * or decrease it if appropriate.  Its purposes is to detect corrupt
@@ -44,12 +43,12 @@
  *
  *                    JRM - 5/17/04
  */
-#define H5C_MAX_ENTRY_SIZE        ((size_t)(32 * 1024 * 1024))
+#define H5C_MAX_ENTRY_SIZE ((size_t)(32 * 1024 * 1024))
 
 /* H5C_COLLECT_CACHE_STATS controls overall collection of statistics
  * on cache activity.  In general, this #define should be set to 0.
  */
-#define H5C_COLLECT_CACHE_STATS    0
+#define H5C_COLLECT_CACHE_STATS 0
 
 /* H5C_COLLECT_CACHE_ENTRY_STATS controls collection of statistics
  * in individual cache entries.
@@ -59,21 +58,20 @@
  */
 #if H5C_COLLECT_CACHE_STATS
 
-#define H5C_COLLECT_CACHE_ENTRY_STATS    1
+#define H5C_COLLECT_CACHE_ENTRY_STATS 1
 
 #else
 
-#define H5C_COLLECT_CACHE_ENTRY_STATS    0
+#define H5C_COLLECT_CACHE_ENTRY_STATS 0
 
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-
 #ifdef H5_HAVE_PARALLEL
 
 /* we must maintain the clean and dirty LRU lists when we are compiled
  * with parallel support.
  */
-#define H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS  1
+#define H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS 1
 
 #else /* H5_HAVE_PARALLEL */
 
@@ -81,16 +79,14 @@
  * want them on for testing on occasion, but in general they should be
  * off.
  */
-#define H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS  0
+#define H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS 0
 
 #endif /* H5_HAVE_PARALLEL */
 
-
 /* Typedef for the main structure for the cache (defined in H5Cpkg.h) */
 
 typedef struct H5C_t H5C_t;
 
-
 /*
  * Class methods pertaining to caching.     Each type of cached object will
  * have a constant variable with permanent life-span that describes how
@@ -115,61 +111,42 @@ typedef struct H5C_t H5C_t;
  *        Note that the space allocated on disk may not be contiguous.
  */
 
-#define H5C_CALLBACK__NO_FLAGS_SET        0x0
-#define H5C_CALLBACK__SIZE_CHANGED_FLAG        0x1
+#define H5C_CALLBACK__NO_FLAGS_SET      0x0
+#define H5C_CALLBACK__SIZE_CHANGED_FLAG 0x1
 #define H5C_CALLBACK__MOVED_FLAG        0x2
 
 /* Actions that can be reported to 'notify' client callback */
 typedef enum H5C_notify_action_t {
-    H5C_NOTIFY_ACTION_AFTER_INSERT,     /* Entry has been added to the cache */
-                                        /* (could be loaded from file with
-                                         *      'protect' call, or inserted
-                                         *      with 'set' call)
-                                         */
-    H5C_NOTIFY_ACTION_BEFORE_EVICT      /* Entry is about to be evicted from cache */
+    H5C_NOTIFY_ACTION_AFTER_INSERT, /* Entry has been added to the cache */
+                                    /* (could be loaded from file with
+                                     *      'protect' call, or inserted
+                                     *      with 'set' call)
+                                     */
+    H5C_NOTIFY_ACTION_BEFORE_EVICT  /* Entry is about to be evicted from cache */
 } H5C_notify_action_t;
 
-typedef void *(*H5C_load_func_t)(H5F_t *f,
-                                 hid_t dxpl_id,
-                                 haddr_t addr,
-                                 void *udata);
-typedef herr_t (*H5C_flush_func_t)(H5F_t *f,
-                                   hid_t dxpl_id,
-                                   hbool_t dest,
-                                   haddr_t addr,
-                                   void *thing,
-                unsigned * flags_ptr);
-typedef herr_t (*H5C_dest_func_t)(H5F_t *f,
-                                  void *thing);
-typedef herr_t (*H5C_clear_func_t)(H5F_t *f,
-                                   void *thing,
-                                   hbool_t dest);
-typedef herr_t (*H5C_notify_func_t)(H5C_notify_action_t action,
-                                 void *thing);
-typedef herr_t (*H5C_size_func_t)(const H5F_t *f,
-                                  const void *thing,
-                                  size_t *size_ptr);
+typedef void *(*H5C_load_func_t)(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
+typedef herr_t (*H5C_flush_func_t)(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, void *thing,
+                                   unsigned *flags_ptr);
+typedef herr_t (*H5C_dest_func_t)(H5F_t *f, void *thing);
+typedef herr_t (*H5C_clear_func_t)(H5F_t *f, void *thing, hbool_t dest);
+typedef herr_t (*H5C_notify_func_t)(H5C_notify_action_t action, void *thing);
+typedef herr_t (*H5C_size_func_t)(const H5F_t *f, const void *thing, size_t *size_ptr);
 
 typedef struct H5C_class_t {
-    int            id;
-    H5C_load_func_t    load;
-    H5C_flush_func_t    flush;
-    H5C_dest_func_t    dest;
-    H5C_clear_func_t    clear;
-    H5C_size_func_t    size;
+    int              id;
+    H5C_load_func_t  load;
+    H5C_flush_func_t flush;
+    H5C_dest_func_t  dest;
+    H5C_clear_func_t clear;
+    H5C_size_func_t  size;
 } H5C_class_t;
 
-
 /* Type definitions of call back functions used by the cache as a whole */
 
-typedef herr_t (*H5C_write_permitted_func_t)(const H5F_t *f,
-                                             hid_t dxpl_id,
-                                             hbool_t * write_permitted_ptr);
+typedef herr_t (*H5C_write_permitted_func_t)(const H5F_t *f, hid_t dxpl_id, hbool_t *write_permitted_ptr);
 
-typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
-                                       haddr_t addr,
-                                       hbool_t was_dirty,
-                                       unsigned flags,
+typedef herr_t (*H5C_log_flush_func_t)(H5C_t *cache_ptr, haddr_t addr, hbool_t was_dirty, unsigned flags,
                                        int type_id);
 
 /* Upper and lower limits on cache size.  These limits are picked
@@ -181,17 +158,15 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
  * size.
  */
 
-#define H5C__MAX_MAX_CACHE_SIZE        ((size_t)(128 * 1024 * 1024))
-#define H5C__MIN_MAX_CACHE_SIZE        ((size_t)(1024))
-
+#define H5C__MAX_MAX_CACHE_SIZE ((size_t)(128 * 1024 * 1024))
+#define H5C__MIN_MAX_CACHE_SIZE ((size_t)(1024))
 
 /* Default max cache size and min clean size are give here to make
  * them generally accessible.
  */
 
-#define H5C__DEFAULT_MAX_CACHE_SIZE     ((size_t)(4 * 1024 * 1024))
-#define H5C__DEFAULT_MIN_CLEAN_SIZE     ((size_t)(2 * 1024 * 1024))
-
+#define H5C__DEFAULT_MAX_CACHE_SIZE ((size_t)(4 * 1024 * 1024))
+#define H5C__DEFAULT_MIN_CLEAN_SIZE ((size_t)(2 * 1024 * 1024))
 
 /****************************************************************************
  *
@@ -517,19 +492,18 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
  ****************************************************************************/
 
 #ifndef NDEBUG
-#define H5C__H5C_CACHE_ENTRY_T_MAGIC        0x005CAC0A
-#define H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC    0xDeadBeef
+#define H5C__H5C_CACHE_ENTRY_T_MAGIC     0x005CAC0A
+#define H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC 0xDeadBeef
 #endif /* NDEBUG */
 
-typedef struct H5C_cache_entry_t
-{
+typedef struct H5C_cache_entry_t {
 #ifndef NDEBUG
-    uint32_t            magic;
+    uint32_t magic;
 #endif /* NDEBUG */
-    H5C_t *                     cache_ptr;
+    H5C_t *            cache_ptr;
     haddr_t            addr;
-    size_t            size;
-    const H5C_class_t *        type;
+    size_t             size;
+    const H5C_class_t *type;
     hbool_t            is_dirty;
     hbool_t            dirtied;
     hbool_t            is_protected;
@@ -539,39 +513,38 @@ typedef struct H5C_cache_entry_t
     hbool_t            in_slist;
     hbool_t            flush_marker;
 #ifdef H5_HAVE_PARALLEL
-    hbool_t            clear_on_unprotect;
-    hbool_t        flush_immediately;
+    hbool_t clear_on_unprotect;
+    hbool_t flush_immediately;
 #endif /* H5_HAVE_PARALLEL */
-    hbool_t            flush_in_progress;
-    hbool_t            destroy_in_progress;
-    hbool_t        free_file_space_on_destroy;
+    hbool_t flush_in_progress;
+    hbool_t destroy_in_progress;
+    hbool_t free_file_space_on_destroy;
 
     /* fields supporting the hash table: */
 
-    struct H5C_cache_entry_t *    ht_next;
-    struct H5C_cache_entry_t *    ht_prev;
+    struct H5C_cache_entry_t *ht_next;
+    struct H5C_cache_entry_t *ht_prev;
 
     /* fields supporting replacement policies: */
 
-    struct H5C_cache_entry_t *    next;
-    struct H5C_cache_entry_t *    prev;
-    struct H5C_cache_entry_t *    aux_next;
-    struct H5C_cache_entry_t *    aux_prev;
+    struct H5C_cache_entry_t *next;
+    struct H5C_cache_entry_t *prev;
+    struct H5C_cache_entry_t *aux_next;
+    struct H5C_cache_entry_t *aux_prev;
 
 #if H5C_COLLECT_CACHE_ENTRY_STATS
 
     /* cache entry stats fields */
 
-    int32_t            accesses;
-    int32_t            clears;
-    int32_t            flushes;
-    int32_t            pins;
+    int32_t accesses;
+    int32_t clears;
+    int32_t flushes;
+    int32_t pins;
 
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
 } H5C_cache_entry_t;
 
-
 /****************************************************************************
  *
  * structure H5C_auto_size_ctl_t
@@ -812,10 +785,10 @@ typedef struct H5C_cache_entry_t
  *
  ****************************************************************************/
 
-#define H5C_RESIZE_CFG__VALIDATE_GENERAL        0x1
-#define H5C_RESIZE_CFG__VALIDATE_INCREMENT      0x2
-#define H5C_RESIZE_CFG__VALIDATE_DECREMENT      0x4
-#define H5C_RESIZE_CFG__VALIDATE_INTERACTIONS   0x8
+#define H5C_RESIZE_CFG__VALIDATE_GENERAL      0x1
+#define H5C_RESIZE_CFG__VALIDATE_INCREMENT    0x2
+#define H5C_RESIZE_CFG__VALIDATE_DECREMENT    0x4
+#define H5C_RESIZE_CFG__VALIDATE_INTERACTIONS 0x8
 /* clang-format off */
 #define H5C_RESIZE_CFG__VALIDATE_ALL      \
 (                                         \
@@ -827,31 +800,30 @@ typedef struct H5C_cache_entry_t
 
 /* clang-format on */
 
-#define H5C__CURR_AUTO_SIZE_CTL_VER        1
-#define H5C__CURR_AUTO_RESIZE_RPT_FCN_VER    1
-
-#define H5C__MAX_EPOCH_MARKERS          10
-
-#define H5C__DEF_AR_UPPER_THRESHHOLD        0.9999f
-#define H5C__DEF_AR_LOWER_THRESHHOLD        0.9f
-#define H5C__DEF_AR_MAX_SIZE            ((size_t)(16 * 1024 * 1024))
-#define H5C__DEF_AR_INIT_SIZE            ((size_t)( 1 * 1024 * 1024))
-#define H5C__DEF_AR_MIN_SIZE            ((size_t)( 1 * 1024 * 1024))
-#define H5C__DEF_AR_MIN_CLEAN_FRAC        0.5f
-#define H5C__DEF_AR_INCREMENT            2.0f
-#define H5C__DEF_AR_MAX_INCREMENT        ((size_t)( 2 * 1024 * 1024))
-#define H5C__DEF_AR_FLASH_MULTIPLE              1.0f
-#define H5C__DEV_AR_FLASH_THRESHOLD             0.25f
-#define H5C__DEF_AR_DECREMENT            0.9f
-#define H5C__DEF_AR_MAX_DECREMENT        ((size_t)( 1 * 1024 * 1024))
-#define H5C__DEF_AR_EPCHS_B4_EVICT        3
-#define H5C__DEF_AR_EMPTY_RESERVE        0.05f
-#define H5C__MIN_AR_EPOCH_LENGTH        100
-#define H5C__DEF_AR_EPOCH_LENGTH        50000
-#define H5C__MAX_AR_EPOCH_LENGTH        1000000
-
-enum H5C_resize_status
-{
+#define H5C__CURR_AUTO_SIZE_CTL_VER       1
+#define H5C__CURR_AUTO_RESIZE_RPT_FCN_VER 1
+
+#define H5C__MAX_EPOCH_MARKERS 10
+
+#define H5C__DEF_AR_UPPER_THRESHHOLD 0.9999f
+#define H5C__DEF_AR_LOWER_THRESHHOLD 0.9f
+#define H5C__DEF_AR_MAX_SIZE         ((size_t)(16 * 1024 * 1024))
+#define H5C__DEF_AR_INIT_SIZE        ((size_t)(1 * 1024 * 1024))
+#define H5C__DEF_AR_MIN_SIZE         ((size_t)(1 * 1024 * 1024))
+#define H5C__DEF_AR_MIN_CLEAN_FRAC   0.5f
+#define H5C__DEF_AR_INCREMENT        2.0f
+#define H5C__DEF_AR_MAX_INCREMENT    ((size_t)(2 * 1024 * 1024))
+#define H5C__DEF_AR_FLASH_MULTIPLE   1.0f
+#define H5C__DEV_AR_FLASH_THRESHOLD  0.25f
+#define H5C__DEF_AR_DECREMENT        0.9f
+#define H5C__DEF_AR_MAX_DECREMENT    ((size_t)(1 * 1024 * 1024))
+#define H5C__DEF_AR_EPCHS_B4_EVICT   3
+#define H5C__DEF_AR_EMPTY_RESERVE    0.05f
+#define H5C__MIN_AR_EPOCH_LENGTH     100
+#define H5C__DEF_AR_EPOCH_LENGTH     50000
+#define H5C__MAX_AR_EPOCH_LENGTH     1000000
+
+enum H5C_resize_status {
     in_spec,
     increase,
     flash_increase,
@@ -863,65 +835,57 @@ enum H5C_resize_status
     not_full
 }; /* enum H5C_resize_conditions */
 
-typedef void (*H5C_auto_resize_rpt_fcn)(H5C_t * cache_ptr,
-                                        int32_t version,
-                                        double hit_rate,
-                                        enum H5C_resize_status status,
-                                        size_t old_max_cache_size,
-                                        size_t new_max_cache_size,
-                                        size_t old_min_clean_size,
+typedef void (*H5C_auto_resize_rpt_fcn)(H5C_t *cache_ptr, int32_t version, double hit_rate,
+                                        enum H5C_resize_status status, size_t old_max_cache_size,
+                                        size_t new_max_cache_size, size_t old_min_clean_size,
                                         size_t new_min_clean_size);
 
-typedef struct H5C_auto_size_ctl_t
-{
+typedef struct H5C_auto_size_ctl_t {
     /* general configuration fields: */
-    int32_t                version;
-    H5C_auto_resize_rpt_fcn        rpt_fcn;
-
-    hbool_t                set_initial_size;
-    size_t                initial_size;
+    int32_t                 version;
+    H5C_auto_resize_rpt_fcn rpt_fcn;
 
-    double                min_clean_fraction;
+    hbool_t set_initial_size;
+    size_t  initial_size;
 
-    size_t                max_size;
-    size_t                min_size;
+    double min_clean_fraction;
 
-    int64_t                epoch_length;
+    size_t max_size;
+    size_t min_size;
 
+    int64_t epoch_length;
 
     /* size increase control fields: */
-    enum H5C_cache_incr_mode        incr_mode;
-
-    double                lower_hr_threshold;
+    enum H5C_cache_incr_mode incr_mode;
 
-    double                increment;
+    double lower_hr_threshold;
 
-    hbool_t                apply_max_increment;
-    size_t                max_increment;
+    double increment;
 
-    enum H5C_cache_flash_incr_mode      flash_incr_mode;
-    double                              flash_multiple;
-    double                              flash_threshold;
+    hbool_t apply_max_increment;
+    size_t  max_increment;
 
+    enum H5C_cache_flash_incr_mode flash_incr_mode;
+    double                         flash_multiple;
+    double                         flash_threshold;
 
     /* size decrease control fields: */
-    enum H5C_cache_decr_mode        decr_mode;
+    enum H5C_cache_decr_mode decr_mode;
 
-    double                upper_hr_threshold;
+    double upper_hr_threshold;
 
-    double                decrement;
+    double decrement;
 
-    hbool_t                apply_max_decrement;
-    size_t                max_decrement;
+    hbool_t apply_max_decrement;
+    size_t  max_decrement;
 
-    int32_t                epochs_before_eviction;
+    int32_t epochs_before_eviction;
 
-    hbool_t                apply_empty_reserve;
-    double                empty_reserve;
+    hbool_t apply_empty_reserve;
+    double  empty_reserve;
 
 } H5C_auto_size_ctl_t;
 
-
 /*
  * Library prototypes.
  */
@@ -975,168 +939,102 @@ typedef struct H5C_auto_size_ctl_t
  *      H5C__TAKE_OWNERSHIP_FLAG
  */
 
-#define H5C__NO_FLAGS_SET            0x0000
-#define H5C__SET_FLUSH_MARKER_FLAG        0x0001
-#define H5C__DELETED_FLAG            0x0002
-#define H5C__DIRTIED_FLAG            0x0004
-#define H5C__PIN_ENTRY_FLAG            0x0008
+#define H5C__NO_FLAGS_SET                0x0000
+#define H5C__SET_FLUSH_MARKER_FLAG       0x0001
+#define H5C__DELETED_FLAG                0x0002
+#define H5C__DIRTIED_FLAG                0x0004
+#define H5C__PIN_ENTRY_FLAG              0x0008
 #define H5C__UNPIN_ENTRY_FLAG            0x0010
-#define H5C__FLUSH_INVALIDATE_FLAG        0x0020
-#define H5C__FLUSH_CLEAR_ONLY_FLAG        0x0040
-#define H5C__FLUSH_MARKED_ENTRIES_FLAG        0x0080
-#define H5C__FLUSH_IGNORE_PROTECTED_FLAG    0x0100
-#define H5C__READ_ONLY_FLAG            0x0200
+#define H5C__FLUSH_INVALIDATE_FLAG       0x0020
+#define H5C__FLUSH_CLEAR_ONLY_FLAG       0x0040
+#define H5C__FLUSH_MARKED_ENTRIES_FLAG   0x0080
+#define H5C__FLUSH_IGNORE_PROTECTED_FLAG 0x0100
+#define H5C__READ_ONLY_FLAG              0x0200
 #define H5C__FREE_FILE_SPACE_FLAG        0x0800
-#define H5C__TAKE_OWNERSHIP_FLAG        0x1000
+#define H5C__TAKE_OWNERSHIP_FLAG         0x1000
 
 #ifdef H5_HAVE_PARALLEL
-H5_DLL herr_t H5C_apply_candidate_list(H5F_t * f,
-                                       hid_t primary_dxpl_id,
-                                       hid_t secondary_dxpl_id,
-                                       H5C_t * cache_ptr,
-                                       int num_candidates,
-                                       haddr_t * candidates_list_ptr,
-                                       int mpi_rank,
-                                       int mpi_size);
-
-H5_DLL herr_t H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr);
-
-H5_DLL herr_t H5C_construct_candidate_list__min_clean(H5C_t * cache_ptr);
+H5_DLL herr_t H5C_apply_candidate_list(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                       H5C_t *cache_ptr, int num_candidates, haddr_t *candidates_list_ptr,
+                                       int mpi_rank, int mpi_size);
+
+H5_DLL herr_t H5C_construct_candidate_list__clean_cache(H5C_t *cache_ptr);
+
+H5_DLL herr_t H5C_construct_candidate_list__min_clean(H5C_t *cache_ptr);
 #endif /* H5_HAVE_PARALLEL */
 
-H5_DLL H5C_t * H5C_create(size_t                     max_cache_size,
-                          size_t                     min_clean_size,
-                          int                        max_type_id,
-            const char *               (* type_name_table_ptr),
-                          H5C_write_permitted_func_t check_write_permitted,
-                          hbool_t                    write_permitted,
-                          H5C_log_flush_func_t       log_flush,
-                          void *                     aux_ptr);
-
-H5_DLL void H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr,
-                                        int32_t version,
-                                        double hit_rate,
-                                        enum H5C_resize_status status,
-                                        size_t old_max_cache_size,
-                                        size_t new_max_cache_size,
-                                        size_t old_min_clean_size,
+H5_DLL H5C_t *H5C_create(size_t max_cache_size, size_t min_clean_size, int max_type_id,
+                         const char *(*type_name_table_ptr), H5C_write_permitted_func_t check_write_permitted,
+                         hbool_t write_permitted, H5C_log_flush_func_t log_flush, void *aux_ptr);
+
+H5_DLL void H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr, int32_t version, double hit_rate,
+                                        enum H5C_resize_status status, size_t old_max_cache_size,
+                                        size_t new_max_cache_size, size_t old_min_clean_size,
                                         size_t new_min_clean_size);
 
-H5_DLL herr_t H5C_dest(H5F_t * f,
-                       hid_t   primary_dxpl_id,
-                       hid_t   secondary_dxpl_id);
-
-H5_DLL herr_t H5C_expunge_entry(H5F_t *             f,
-                        hid_t               primary_dxpl_id,
-                                hid_t               secondary_dxpl_id,
-                                const H5C_class_t * type,
-                                haddr_t             addr,
-                                unsigned            flags);
-
-H5_DLL herr_t H5C_flush_cache(H5F_t *  f,
-                              hid_t    primary_dxpl_id,
-                              hid_t    secondary_dxpl_id,
-                              unsigned flags);
-
-H5_DLL herr_t H5C_flush_to_min_clean(H5F_t * f,
-                                     hid_t   primary_dxpl_id,
-                                     hid_t   secondary_dxpl_id);
-
-H5_DLL herr_t H5C_get_cache_auto_resize_config(const H5C_t * cache_ptr,
-                                               H5C_auto_size_ctl_t *config_ptr);
-
-H5_DLL herr_t H5C_get_cache_size(H5C_t * cache_ptr,
-                                 size_t * max_size_ptr,
-                                 size_t * min_clean_size_ptr,
-                                 size_t * cur_size_ptr,
-                                 int32_t * cur_num_entries_ptr);
-
-H5_DLL herr_t H5C_get_cache_hit_rate(H5C_t * cache_ptr,
-                                     double * hit_rate_ptr);
-
-H5_DLL herr_t H5C_get_entry_status(const H5F_t *f,
-                                   haddr_t   addr,
-                                   size_t *  size_ptr,
-                                   hbool_t * in_cache_ptr,
-                                   hbool_t * is_dirty_ptr,
-                                   hbool_t * is_protected_ptr,
-                hbool_t * is_pinned_ptr);
-
-H5_DLL herr_t H5C_get_evictions_enabled(const H5C_t * cache_ptr,
-                                        hbool_t * evictions_enabled_ptr);
-
-H5_DLL herr_t H5C_get_trace_file_ptr(const H5C_t *cache_ptr,
-    FILE **trace_file_ptr_ptr);
+H5_DLL herr_t H5C_dest(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id);
+
+H5_DLL herr_t H5C_expunge_entry(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                const H5C_class_t *type, haddr_t addr, unsigned flags);
+
+H5_DLL herr_t H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsigned flags);
+
+H5_DLL herr_t H5C_flush_to_min_clean(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id);
+
+H5_DLL herr_t H5C_get_cache_auto_resize_config(const H5C_t *cache_ptr, H5C_auto_size_ctl_t *config_ptr);
+
+H5_DLL herr_t H5C_get_cache_size(H5C_t *cache_ptr, size_t *max_size_ptr, size_t *min_clean_size_ptr,
+                                 size_t *cur_size_ptr, int32_t *cur_num_entries_ptr);
+
+H5_DLL herr_t H5C_get_cache_hit_rate(H5C_t *cache_ptr, double *hit_rate_ptr);
+
+H5_DLL herr_t H5C_get_entry_status(const H5F_t *f, haddr_t addr, size_t *size_ptr, hbool_t *in_cache_ptr,
+                                   hbool_t *is_dirty_ptr, hbool_t *is_protected_ptr, hbool_t *is_pinned_ptr);
+
+H5_DLL herr_t H5C_get_evictions_enabled(const H5C_t *cache_ptr, hbool_t *evictions_enabled_ptr);
+
+H5_DLL herr_t H5C_get_trace_file_ptr(const H5C_t *cache_ptr, FILE **trace_file_ptr_ptr);
 H5_DLL herr_t H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
-    FILE **trace_file_ptr_ptr);
-
-H5_DLL herr_t H5C_insert_entry(H5F_t *             f,
-                               hid_t               primary_dxpl_id,
-                               hid_t               secondary_dxpl_id,
-                               const H5C_class_t * type,
-                               haddr_t             addr,
-                               void *              thing,
-                               unsigned int        flags);
-
-H5_DLL herr_t H5C_mark_entries_as_clean(H5F_t *  f,
-                                        hid_t    primary_dxpl_id,
-                                        hid_t    secondary_dxpl_id,
-                                        int32_t  ce_array_len,
-                                        haddr_t *ce_array_ptr);
+                                                FILE **                  trace_file_ptr_ptr);
+
+H5_DLL herr_t H5C_insert_entry(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                               const H5C_class_t *type, haddr_t addr, void *thing, unsigned int flags);
+
+H5_DLL herr_t H5C_mark_entries_as_clean(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id,
+                                        int32_t ce_array_len, haddr_t *ce_array_ptr);
 
 H5_DLL herr_t H5C_mark_entry_dirty(void *thing);
 
-H5_DLL herr_t H5C_move_entry(H5C_t *             cache_ptr,
-                               const H5C_class_t * type,
-                               haddr_t             old_addr,
-                               haddr_t             new_addr);
+H5_DLL herr_t H5C_move_entry(H5C_t *cache_ptr, const H5C_class_t *type, haddr_t old_addr, haddr_t new_addr);
 
 H5_DLL herr_t H5C_pin_protected_entry(void *thing);
 
-H5_DLL void * H5C_protect(H5F_t *             f,
-                          hid_t               primary_dxpl_id,
-                          hid_t               secondary_dxpl_id,
-            const H5C_class_t * type,
-                          haddr_t             addr,
-                          void *              udata,
-                          unsigned            flags);
+H5_DLL void *H5C_protect(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type,
+                         haddr_t addr, void *udata, unsigned flags);
 
-H5_DLL herr_t H5C_reset_cache_hit_rate_stats(H5C_t * cache_ptr);
+H5_DLL herr_t H5C_reset_cache_hit_rate_stats(H5C_t *cache_ptr);
 
 H5_DLL herr_t H5C_resize_entry(void *thing, size_t new_size);
 
-H5_DLL herr_t H5C_set_cache_auto_resize_config(H5C_t *cache_ptr,
-                                               H5C_auto_size_ctl_t *config_ptr);
+H5_DLL herr_t H5C_set_cache_auto_resize_config(H5C_t *cache_ptr, H5C_auto_size_ctl_t *config_ptr);
 
-H5_DLL herr_t H5C_set_evictions_enabled(H5C_t *cache_ptr,
-                                        hbool_t evictions_enabled);
+H5_DLL herr_t H5C_set_evictions_enabled(H5C_t *cache_ptr, hbool_t evictions_enabled);
 
-H5_DLL herr_t H5C_set_prefix(H5C_t * cache_ptr, char * prefix);
+H5_DLL herr_t H5C_set_prefix(H5C_t *cache_ptr, char *prefix);
 
-H5_DLL herr_t H5C_set_trace_file_ptr(H5C_t * cache_ptr,
-                            FILE * trace_file_ptr);
+H5_DLL herr_t H5C_set_trace_file_ptr(H5C_t *cache_ptr, FILE *trace_file_ptr);
 
-H5_DLL herr_t H5C_stats(H5C_t * cache_ptr,
-                        const char * cache_name,
-                        hbool_t display_detailed_stats);
+H5_DLL herr_t H5C_stats(H5C_t *cache_ptr, const char *cache_name, hbool_t display_detailed_stats);
 
-H5_DLL void H5C_stats__reset(H5C_t * cache_ptr);
+H5_DLL void H5C_stats__reset(H5C_t *cache_ptr);
 
-H5_DLL herr_t H5C_dump_cache(H5C_t * cache_ptr,
-                             const char *  cache_name);
+H5_DLL herr_t H5C_dump_cache(H5C_t *cache_ptr, const char *cache_name);
 
 H5_DLL herr_t H5C_unpin_entry(void *thing);
 
-H5_DLL herr_t H5C_unprotect(H5F_t *             f,
-                            hid_t               primary_dxpl_id,
-                            hid_t               secondary_dxpl_id,
-                            const H5C_class_t * type,
-                            haddr_t             addr,
-                            void *              thing,
-                            unsigned int        flags);
+H5_DLL herr_t H5C_unprotect(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type,
+                            haddr_t addr, void *thing, unsigned int flags);
 
-H5_DLL herr_t H5C_validate_resize_config(H5C_auto_size_ctl_t * config_ptr,
-                                         unsigned int tests);
+H5_DLL herr_t H5C_validate_resize_config(H5C_auto_size_ctl_t *config_ptr, unsigned int tests);
 
 #endif /* !_H5Cprivate_H */
-
diff --git a/src/H5Cpublic.h b/src/H5Cpublic.h
index 62107d9..d735745 100644
--- a/src/H5Cpublic.h
+++ b/src/H5Cpublic.h
@@ -33,20 +33,11 @@
 extern "C" {
 #endif
 
-enum H5C_cache_incr_mode
-{
-    H5C_incr__off,
-    H5C_incr__threshold
-};
+enum H5C_cache_incr_mode { H5C_incr__off, H5C_incr__threshold };
 
-enum H5C_cache_flash_incr_mode
-{
-     H5C_flash_incr__off,
-     H5C_flash_incr__add_space
-};
+enum H5C_cache_flash_incr_mode { H5C_flash_incr__off, H5C_flash_incr__add_space };
 
-enum H5C_cache_decr_mode
-{
+enum H5C_cache_decr_mode {
     H5C_decr__off,
     H5C_decr__threshold,
     H5C_decr__age_out,
diff --git a/src/H5D.c b/src/H5D.c
index 4a6c0ee..6265e5d 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -15,37 +15,32 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5D__init_pub_interface
-
+#define H5_INTERFACE_INIT_FUNC H5D__init_pub_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Datasets 				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Datasets 				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -56,7 +51,6 @@ H5FL_BLK_EXTERN(vlen_vl_buf);
 /* Declare extern the free list to manage other blocks of VL data */
 H5FL_BLK_EXTERN(vlen_fl_buf);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
@@ -64,13 +58,10 @@ H5FL_BLK_EXTERN(vlen_fl_buf);
 /* Declare extern the free list to manage blocks of type conversion data */
 H5FL_BLK_EXTERN(type_conv);
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5D__init_pub_interface -- Initialize interface-specific information
@@ -91,7 +82,6 @@ H5D__init_pub_interface(void)
     FUNC_LEAVE_NOAPI(H5D_init())
 } /* H5D__init_pub_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5D__term_pub_interface -- Terminate interface
@@ -115,7 +105,6 @@ H5D__term_pub_interface(void)
     FUNC_LEAVE_NOAPI(0)
 } /* H5D__term_pub_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dcreate2
  *
@@ -146,62 +135,58 @@ H5D__term_pub_interface(void)
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
-    hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id)
+H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id,
+           hid_t dapl_id)
 {
-    H5G_loc_t	   loc;                 /* Object location to insert dataset into */
-    H5D_t	   *dset = NULL;        /* New dataset's info */
-    const H5S_t    *space;              /* Dataspace for dataset */
-    hid_t           ret_value;          /* Return value */
+    H5G_loc_t    loc;         /* Object location to insert dataset into */
+    H5D_t *      dset = NULL; /* New dataset's info */
+    const H5S_t *space;       /* Dataspace for dataset */
+    hid_t        ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id,
-             dapl_id);
+    H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id, dapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
-    if(H5I_DATATYPE != H5I_get_type(type_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
-    if(NULL == (space = (const H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
+    if (H5I_DATATYPE != H5I_get_type(type_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
+    if (NULL == (space = (const H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace ID")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == lcpl_id)
+    if (H5P_DEFAULT == lcpl_id)
         lcpl_id = H5P_LINK_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
+    else if (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == dcpl_id)
+    if (H5P_DEFAULT == dcpl_id)
         dcpl_id = H5P_DATASET_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dcpl_id, H5P_DATASET_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
+    else if (TRUE != H5P_isa_class(dcpl_id, H5P_DATASET_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == dapl_id)
+    if (H5P_DEFAULT == dapl_id)
         dapl_id = H5P_DATASET_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dapl_id, H5P_DATASET_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
+    else if (TRUE != H5P_isa_class(dapl_id, H5P_DATASET_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     /* Create the new dataset & get its ID */
-    if(NULL == (dset = H5D__create_named(&loc, name, type_id, space, lcpl_id, dcpl_id, dapl_id, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
-    if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
+    if (NULL ==
+        (dset = H5D__create_named(&loc, name, type_id, space, lcpl_id, dcpl_id, dapl_id, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
+    if ((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
 
 done:
-    if(ret_value < 0)
-        if(dset && H5D_close(dset) < 0)
+    if (ret_value < 0)
+        if (dset && H5D_close(dset) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dcreate2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dcreate_anon
  *
@@ -238,68 +223,65 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id,
-    hid_t dapl_id)
+H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id)
 {
-    H5G_loc_t	   loc;                 /* Object location to insert dataset into */
-    H5D_t	   *dset = NULL;        /* New dataset's info */
-    const H5S_t    *space;              /* Dataspace for dataset */
-    hid_t           ret_value;          /* Return value */
+    H5G_loc_t    loc;         /* Object location to insert dataset into */
+    H5D_t *      dset = NULL; /* New dataset's info */
+    const H5S_t *space;       /* Dataspace for dataset */
+    hid_t        ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("i", "iiiii", loc_id, type_id, space_id, dcpl_id, dapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
-    if(H5I_DATATYPE != H5I_get_type(type_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
-    if(NULL == (space = (const H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
+    if (H5I_DATATYPE != H5I_get_type(type_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
+    if (NULL == (space = (const H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace ID")
-    if(H5P_DEFAULT == dcpl_id)
+    if (H5P_DEFAULT == dcpl_id)
         dcpl_id = H5P_DATASET_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dcpl_id, H5P_DATASET_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
+    else if (TRUE != H5P_isa_class(dcpl_id, H5P_DATASET_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == dapl_id)
+    if (H5P_DEFAULT == dapl_id)
         dapl_id = H5P_DATASET_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dapl_id, H5P_DATASET_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
+    else if (TRUE != H5P_isa_class(dapl_id, H5P_DATASET_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     /* build and open the new dataset */
-    if(NULL == (dset = H5D__create(loc.oloc->file, type_id, space, dcpl_id, dapl_id, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
+    if (NULL == (dset = H5D__create(loc.oloc->file, type_id, space, dcpl_id, dapl_id, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
 
     /* Register the new dataset to get an ID for it */
-    if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
+    if ((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
 
 done:
     /* Release the dataset's object header, if it was created */
-    if(dset) {
-        H5O_loc_t *oloc;         /* Object location for dataset */
+    if (dset) {
+        H5O_loc_t *oloc; /* Object location for dataset */
 
         /* Get the new dataset's object location */
-        if(NULL == (oloc = H5D_oloc(dset)))
+        if (NULL == (oloc = H5D_oloc(dset)))
             HDONE_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to get object location of dataset")
 
         /* Decrement refcount on dataset's object header in memory */
-        if(H5O_dec_rc_by_loc(oloc, H5AC_dxpl_id) < 0)
-           HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
+        if (H5O_dec_rc_by_loc(oloc, H5AC_dxpl_id) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL,
+                        "unable to decrement refcount on newly created object")
     } /* end if */
 
     /* Cleanup on failure */
-    if(ret_value < 0)
-        if(dset && H5D_close(dset) < 0)
+    if (ret_value < 0)
+        if (dset && H5D_close(dset) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dcreate_anon() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dopen2
  *
@@ -320,31 +302,30 @@ done:
 hid_t
 H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id)
 {
-    H5D_t       *dset = NULL;
-    H5G_loc_t	 loc;		        /* Object location of group */
-    H5G_loc_t	 dset_loc;		/* Object location of dataset */
-    H5G_name_t   path;            	/* Dataset group hier. path */
-    H5O_loc_t    oloc;            	/* Dataset object location */
-    H5O_type_t   obj_type;              /* Type of object at location */
-    hbool_t      loc_found = FALSE;     /* Location at 'name' found */
-    hid_t        dxpl_id = H5AC_ind_dxpl_id;    /* dxpl to use to open datset */
-    hid_t        ret_value;
+    H5D_t *    dset = NULL;
+    H5G_loc_t  loc;                          /* Object location of group */
+    H5G_loc_t  dset_loc;                     /* Object location of dataset */
+    H5G_name_t path;                         /* Dataset group hier. path */
+    H5O_loc_t  oloc;                         /* Dataset object location */
+    H5O_type_t obj_type;                     /* Type of object at location */
+    hbool_t    loc_found = FALSE;            /* Location at 'name' found */
+    hid_t      dxpl_id   = H5AC_ind_dxpl_id; /* dxpl to use to open datset */
+    hid_t      ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "i*si", loc_id, name, dapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == dapl_id)
+    if (H5P_DEFAULT == dapl_id)
         dapl_id = H5P_DATASET_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dapl_id, H5P_DATASET_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
+    else if (TRUE != H5P_isa_class(dapl_id, H5P_DATASET_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     /* Set up dataset location to fill in */
     dset_loc.oloc = &oloc;
@@ -352,40 +333,39 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id)
     H5G_loc_reset(&dset_loc);
 
     /* Find the dataset object */
-    if(H5G_loc_find(&loc, name, &dset_loc, dapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(&loc, name, &dset_loc, dapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found")
     loc_found = TRUE;
 
     /* Check that the object found is the correct type */
-    if(H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
+    if (H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object type")
-    if(obj_type != H5O_TYPE_DATASET)
+    if (obj_type != H5O_TYPE_DATASET)
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
 
     /* Open the dataset */
-    if(NULL == (dset = H5D_open(&dset_loc, dapl_id, dxpl_id)))
+    if (NULL == (dset = H5D_open(&dset_loc, dapl_id, dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't open dataset")
 
     /* Register an atom for the dataset */
-    if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "can't register dataset atom")
 
 done:
-    if(ret_value < 0) {
-        if(dset) {
-            if(H5D_close(dset) < 0)
+    if (ret_value < 0) {
+        if (dset) {
+            if (H5D_close(dset) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
         } /* end if */
         else {
-            if(loc_found && H5G_loc_free(&dset_loc) < 0)
+            if (loc_found && H5G_loc_free(&dset_loc) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't free location")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dopen2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dclose
  *
@@ -403,14 +383,14 @@ done:
 herr_t
 H5Dclose(hid_t dset_id)
 {
-    herr_t       ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", dset_id);
 
     /* Check args */
-    if(NULL == H5I_object_verify(dset_id, H5I_DATASET))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (NULL == H5I_object_verify(dset_id, H5I_DATASET))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
     /*
      * Decrement the counter on the dataset.  It will be freed if the count
@@ -420,14 +400,13 @@ H5Dclose(hid_t dset_id)
      * dataset's ID even though the freeing function might fail.  Please
      * see the comments in H5I_dec_ref for details. (SLU - 2010/9/7)
      */
-    if(H5I_dec_app_ref_always_close(dset_id) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "can't decrement count on dataset ID")
+    if (H5I_dec_app_ref_always_close(dset_id) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "can't decrement count on dataset ID")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dget_space
  *
@@ -447,24 +426,23 @@ done:
 hid_t
 H5Dget_space(hid_t dset_id)
 {
-    H5D_t	*dset = NULL;
-    hid_t	ret_value;
+    H5D_t *dset = NULL;
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", dset_id);
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if((ret_value = H5D_get_space(dset)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get dataspace")
+    if ((ret_value = H5D_get_space(dset)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get dataspace")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dget_space_status
  *
@@ -482,25 +460,24 @@ done:
 herr_t
 H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation)
 {
-    H5D_t 	*dset = NULL;
-    herr_t 	ret_value = SUCCEED;
+    H5D_t *dset      = NULL;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Ds", dset_id, allocation);
 
     /* Check arguments */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
     /* Read dataspace address and return */
-    if(H5D__get_space_status(dset, allocation, H5AC_ind_dxpl_id) < 0)
+    if (H5D__get_space_status(dset, allocation, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get space status")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dget_type
  *
@@ -521,24 +498,23 @@ hid_t
 H5Dget_type(hid_t dset_id)
 {
 
-    H5D_t	*dset;                  /* Dataset */
-    hid_t	ret_value;              /* Return value */
+    H5D_t *dset;      /* Dataset */
+    hid_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", dset_id);
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if((ret_value = H5D_get_type(dset)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get dataspace")
+    if ((ret_value = H5D_get_type(dset)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get dataspace")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dget_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dget_create_plist
  *
@@ -558,24 +534,23 @@ done:
 hid_t
 H5Dget_create_plist(hid_t dset_id)
 {
-    H5D_t		*dataset;                  /* Dataset structure */
-    hid_t		ret_value = SUCCEED;    /* Return value */
+    H5D_t *dataset;             /* Dataset structure */
+    hid_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", dset_id);
 
     /* Check args */
-    if(NULL == (dataset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (NULL == (dataset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if((ret_value = H5D_get_create_plist(dataset)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't get creation plist")
+    if ((ret_value = H5D_get_create_plist(dataset)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't get creation plist")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dget_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dget_access_plist
  *
@@ -612,8 +587,8 @@ done:
 hid_t
 H5Dget_access_plist(hid_t dset_id)
 {
-    H5D_t           *dset;          /* Dataset structure */
-    hid_t           ret_value;      /* Return value */
+    H5D_t *dset;      /* Dataset structure */
+    hid_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", dset_id);
@@ -622,14 +597,13 @@ H5Dget_access_plist(hid_t dset_id)
     if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if((ret_value = H5D_get_access_plist(dset)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't get access plist")
+    if ((ret_value = H5D_get_access_plist(dset)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't get access plist")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dget_access_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dget_storage_size
  *
@@ -651,25 +625,24 @@ done:
 hsize_t
 H5Dget_storage_size(hid_t dset_id)
 {
-    H5D_t	*dset;          /* Dataset to query */
-    hsize_t	ret_value;      /* Return value */
+    H5D_t * dset;      /* Dataset to query */
+    hsize_t ret_value; /* Return value */
 
     FUNC_ENTER_API(0)
     H5TRACE1("h", "i", dset_id);
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a dataset")
 
     /* Set return value */
-    if(H5D__get_storage_size(dset, H5AC_ind_dxpl_id, &ret_value) < 0)
+    if (H5D__get_storage_size(dset, H5AC_ind_dxpl_id, &ret_value) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, 0, "can't get size of dataset's storage")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dget_storage_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dget_offset
  *
@@ -687,14 +660,14 @@ done:
 haddr_t
 H5Dget_offset(hid_t dset_id)
 {
-    H5D_t	*dset;          /* Dataset to query */
-    haddr_t	ret_value;      /* Return value */
+    H5D_t * dset;      /* Dataset to query */
+    haddr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(HADDR_UNDEF)
     H5TRACE1("a", "i", dset_id);
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, HADDR_UNDEF, "not a dataset")
 
     /* Set return value */
@@ -704,7 +677,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dget_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Diterate
  *
@@ -765,42 +737,40 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op,
-        void *operator_data)
+H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, void *operator_data)
 {
-    H5T_t *type;                /* Datatype */
-    H5S_t *space;               /* Dataspace for iteration */
-    H5S_sel_iter_op_t dset_op;  /* Operator for iteration */
-    herr_t ret_value;           /* Return value */
+    H5T_t *           type;      /* Datatype */
+    H5S_t *           space;     /* Dataspace for iteration */
+    H5S_sel_iter_op_t dset_op;   /* Operator for iteration */
+    herr_t            ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "*xiix*x", buf, type_id, space_id, op, operator_data);
 
     /* Check args */
-    if(NULL == op)
+    if (NULL == op)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid operator")
-    if(NULL == buf)
+    if (NULL == buf)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer")
-    if(H5I_DATATYPE != H5I_get_type(type_id))
+    if (H5I_DATATYPE != H5I_get_type(type_id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid datatype")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataspace")
-    if(!(H5S_has_extent(space)))
+    if (!(H5S_has_extent(space)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspace does not have extent set")
 
-    dset_op.op_type = H5S_SEL_ITER_OP_APP;
-    dset_op.u.app_op.op = op;
+    dset_op.op_type          = H5S_SEL_ITER_OP_APP;
+    dset_op.u.app_op.op      = op;
     dset_op.u.app_op.type_id = type_id;
 
     ret_value = H5S_select_iterate(buf, type, space, &dset_op, operator_data);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Diterate() */
+} /* end H5Diterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dvlen_reclaim
  *
@@ -819,35 +789,33 @@ done:
 herr_t
 H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf)
 {
-    H5S_t *space;               /* Dataspace for iteration */
-    herr_t ret_value;           /* Return value */
+    H5S_t *space;     /* Dataspace for iteration */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iii*x", type_id, space_id, plist_id, buf);
 
     /* Check args */
-    if(H5I_DATATYPE != H5I_get_type(type_id) || buf == NULL)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (H5I_DATATYPE != H5I_get_type(type_id) || buf == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument")
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataspace")
-    if(!(H5S_has_extent(space)))
+    if (!(H5S_has_extent(space)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspace does not have extent set")
 
     /* Get the default dataset transfer property list if the user didn't provide one */
-    if(H5P_DEFAULT == plist_id)
+    if (H5P_DEFAULT == plist_id)
         plist_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    else if (TRUE != H5P_isa_class(plist_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Call internal routine */
     ret_value = H5D_vlen_reclaim(type_id, space, plist_id, buf);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Dvlen_reclaim() */
+} /* end H5Dvlen_reclaim() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dvlen_get_buf_size
  *
@@ -873,97 +841,94 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id,
-        hsize_t *size)
+H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size)
 {
     H5D_vlen_bufsize_t vlen_bufsize = {0, 0, 0, 0, 0, 0, 0};
-    H5D_t *dset;                /* Dataset for operation */
-    H5S_t *fspace = NULL;       /* Dataset's dataspace */
-    H5S_t *mspace = NULL;       /* Memory dataspace */
-    char bogus;                 /* bogus value to pass to H5Diterate() */
-    H5S_t *space;               /* Dataspace for iteration */
-    H5P_genplist_t  *plist;     /* Property list */
-    H5T_t *type;                /* Datatype */
-    H5S_sel_iter_op_t dset_op;  /* Operator for iteration */
-    herr_t ret_value;           /* Return value */
+    H5D_t *            dset;          /* Dataset for operation */
+    H5S_t *            fspace = NULL; /* Dataset's dataspace */
+    H5S_t *            mspace = NULL; /* Memory dataspace */
+    char               bogus;         /* bogus value to pass to H5Diterate() */
+    H5S_t *            space;         /* Dataspace for iteration */
+    H5P_genplist_t *   plist;         /* Property list */
+    H5T_t *            type;          /* Datatype */
+    H5S_sel_iter_op_t  dset_op;       /* Operator for iteration */
+    herr_t             ret_value;     /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iii*h", dataset_id, type_id, space_id, size);
 
     /* Check args */
-    if(H5I_DATASET != H5I_get_type(dataset_id) ||
-            H5I_DATATYPE != H5I_get_type(type_id) || size == NULL)
+    if (H5I_DATASET != H5I_get_type(dataset_id) || H5I_DATATYPE != H5I_get_type(type_id) || size == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument")
-    if(NULL == (dset = (H5D_t *)H5I_object(dataset_id)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dset = (H5D_t *)H5I_object(dataset_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataspace")
-    if(!(H5S_has_extent(space)))
+    if (!(H5S_has_extent(space)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspace does not have extent set")
 
     /* Save the dataset */
     vlen_bufsize.dset = dset;
 
     /* Get a copy of the dataset's dataspace */
-    if(NULL == (fspace = H5S_copy(dset->shared->space, FALSE, TRUE)))
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to get dataspace")
+    if (NULL == (fspace = H5S_copy(dset->shared->space, FALSE, TRUE)))
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to get dataspace")
     vlen_bufsize.fspace = fspace;
 
     /* Create a scalar for the memory dataspace */
-    if(NULL == (mspace = H5S_create(H5S_SCALAR)))
+    if (NULL == (mspace = H5S_create(H5S_SCALAR)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create dataspace")
     vlen_bufsize.mspace = mspace;
 
     /* Grab the temporary buffers required */
-    if(NULL == (vlen_bufsize.fl_tbuf = H5FL_BLK_MALLOC(vlen_fl_buf, (size_t)1)))
+    if (NULL == (vlen_bufsize.fl_tbuf = H5FL_BLK_MALLOC(vlen_fl_buf, (size_t)1)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "no temporary buffers available")
-    if(NULL == (vlen_bufsize.vl_tbuf = H5FL_BLK_MALLOC(vlen_vl_buf, (size_t)1)))
+    if (NULL == (vlen_bufsize.vl_tbuf = H5FL_BLK_MALLOC(vlen_vl_buf, (size_t)1)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "no temporary buffers available")
 
     /* Change to the custom memory allocation routines for reading VL data */
-    if((vlen_bufsize.xfer_pid = H5P_create_id(H5P_CLS_DATASET_XFER_g, FALSE)) < 0)
+    if ((vlen_bufsize.xfer_pid = H5P_create_id(H5P_CLS_DATASET_XFER_g, FALSE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "no dataset xfer plists available")
 
     /* Get the property list struct */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(vlen_bufsize.xfer_pid)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(vlen_bufsize.xfer_pid)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
     /* Set the memory manager to the special allocation routine */
-    if(H5P_set_vlen_mem_manager(plist, H5D__vlen_get_buf_size_alloc, &vlen_bufsize, NULL, NULL) < 0)
+    if (H5P_set_vlen_mem_manager(plist, H5D__vlen_get_buf_size_alloc, &vlen_bufsize, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set VL data allocation routine")
 
     /* Set the initial number of bytes required */
     vlen_bufsize.size = 0;
 
     /* Call H5S_select_iterate with args, etc. */
-    dset_op.op_type = H5S_SEL_ITER_OP_APP;
-    dset_op.u.app_op.op = H5D__vlen_get_buf_size;
+    dset_op.op_type          = H5S_SEL_ITER_OP_APP;
+    dset_op.u.app_op.op      = H5D__vlen_get_buf_size;
     dset_op.u.app_op.type_id = type_id;
 
     ret_value = H5S_select_iterate(&bogus, type, space, &dset_op, &vlen_bufsize);
 
     /* Get the size if we succeeded */
-    if(ret_value >= 0)
+    if (ret_value >= 0)
         *size = vlen_bufsize.size;
 
 done:
-    if(fspace && H5S_close(fspace) < 0)
+    if (fspace && H5S_close(fspace) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataspace")
-    if(mspace && H5S_close(mspace) < 0)
+    if (mspace && H5S_close(mspace) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataspace")
-    if(vlen_bufsize.fl_tbuf != NULL)
+    if (vlen_bufsize.fl_tbuf != NULL)
         vlen_bufsize.fl_tbuf = H5FL_BLK_FREE(vlen_fl_buf, vlen_bufsize.fl_tbuf);
-    if(vlen_bufsize.vl_tbuf != NULL)
+    if (vlen_bufsize.vl_tbuf != NULL)
         vlen_bufsize.vl_tbuf = H5FL_BLK_FREE(vlen_vl_buf, vlen_bufsize.vl_tbuf);
-    if(vlen_bufsize.xfer_pid > 0 && H5I_dec_ref(vlen_bufsize.xfer_pid) < 0)
+    if (vlen_bufsize.xfer_pid > 0 && H5I_dec_ref(vlen_bufsize.xfer_pid) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to decrement ref count on property list")
 
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Dvlen_get_buf_size() */
+} /* end H5Dvlen_get_buf_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dset_extent
  *
@@ -987,20 +952,19 @@ H5Dset_extent(hid_t dset_id, const hsize_t size[])
     H5TRACE2("e", "i*h", dset_id, size);
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
-    if(!size)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (!size)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
 
     /* Private function */
-    if(H5D__set_extent(dset, size, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set extend dataset")
+    if (H5D__set_extent(dset, size, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set extend dataset")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dset_extent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Dget_chunk_storage_size
  *
@@ -1016,28 +980,27 @@ done:
 herr_t
 H5Dget_chunk_storage_size(hid_t dset_id, const hsize_t *offset, hsize_t *chunk_nbytes)
 {
-    H5D_t       *dset = NULL;
-    herr_t      ret_value = SUCCEED;
+    H5D_t *dset      = NULL;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*h*h", dset_id, offset, chunk_nbytes);
 
     /* Check arguments */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
-    if( NULL == offset )
+    if (NULL == offset)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument (null)")
-    if( NULL == chunk_nbytes )
+    if (NULL == chunk_nbytes)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument (null)")
 
-    if(H5D_CHUNKED != dset->shared->layout.type)
+    if (H5D_CHUNKED != dset->shared->layout.type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a chunked dataset")
 
     /* Call private function */
-    if(H5D__get_chunk_storage_size(dset, H5AC_ind_dxpl_id, offset, chunk_nbytes) < 0)
+    if (H5D__get_chunk_storage_size(dset, H5AC_ind_dxpl_id, offset, chunk_nbytes) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get storage size of chunk")
 
 done:
     FUNC_LEAVE_API(ret_value);
 }
-
diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index 5e9ffbc..eda8eae 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -24,24 +24,23 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Bprivate.h"		/* B-link trees				*/
-#include "H5Dpkg.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MFprivate.h"	/* File space management		*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Sprivate.h"         /* Dataspaces                           */
-#include "H5VMprivate.h"		/* Vector and array functions		*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Bprivate.h"  /* B-link trees				*/
+#include "H5Dpkg.h"      /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* Files				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MFprivate.h" /* File space management		*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Sprivate.h"  /* Dataspaces                           */
+#include "H5VMprivate.h" /* Vector and array functions		*/
 
 /****************/
 /* Local Macros */
@@ -51,7 +50,7 @@
  * Given a B-tree node return the dimensionality of the chunks pointed to by
  * that node.
  */
-#define H5D_BTREE_NDIMS(X)	(((X)->sizeof_rkey-8)/8)
+#define H5D_BTREE_NDIMS(X) (((X)->sizeof_rkey - 8) / 8)
 
 /******************/
 /* Local Typedefs */
@@ -72,106 +71,81 @@
  * The chunk's file address is part of the B-tree and not part of the key.
  */
 typedef struct H5D_btree_key_t {
-    uint32_t	nbytes;				/*size of stored data	*/
-    hsize_t	offset[H5O_LAYOUT_NDIMS];	/*logical offset to start*/
-    unsigned	filter_mask;			/*excluded filters	*/
+    uint32_t nbytes;                   /*size of stored data	*/
+    hsize_t  offset[H5O_LAYOUT_NDIMS]; /*logical offset to start*/
+    unsigned filter_mask;              /*excluded filters	*/
 } H5D_btree_key_t;
 
 /* B-tree callback info for iteration over chunks */
 typedef struct H5D_btree_it_ud_t {
-    H5D_chunk_common_ud_t common;		/* Common info for B-tree user data (must be first) */
-    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 B-tree user data (must be first) */
+    H5D_chunk_cb_func_t   cb;     /* Chunk callback routine */
+    void *                udata;  /* User data for chunk callback routine */
 } H5D_btree_it_ud_t;
 
 /* B-tree callback info for debugging */
 typedef struct H5D_btree_dbg_t {
-    H5D_chunk_common_ud_t common;               /* Common info for B-tree user data (must be first) */
-    unsigned            ndims;                  /* Number of dimensions */
+    H5D_chunk_common_ud_t common; /* Common info for B-tree user data (must be first) */
+    unsigned              ndims;  /* Number of dimensions */
 } H5D_btree_dbg_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static herr_t H5D__btree_shared_create(const H5F_t *f, H5O_storage_chunk_t *store,
-    unsigned ndims);
+static herr_t H5D__btree_shared_create(const H5F_t *f, H5O_storage_chunk_t *store, unsigned ndims);
 
 /* B-tree iterator callbacks */
-static int H5D__btree_idx_iterate_cb(H5F_t *f, hid_t dxpl_id, const void *left_key,
-    haddr_t addr, const void *right_key, void *_udata);
+static int H5D__btree_idx_iterate_cb(H5F_t *f, hid_t dxpl_id, const void *left_key, haddr_t addr,
+                                     const void *right_key, void *_udata);
 
 /* B-tree callbacks */
-static H5RC_t *H5D__btree_get_shared(const H5F_t *f, const void *_udata);
-static herr_t H5D__btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t, void *_lt_key,
-    void *_udata, void *_rt_key, haddr_t *addr_p /*out*/);
-static int H5D__btree_cmp2(void *_lt_key, void *_udata, void *_rt_key);
-static int H5D__btree_cmp3(void *_lt_key, void *_udata, void *_rt_key);
-static htri_t H5D__btree_found(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    const void *_lt_key, void *_udata);
-static H5B_ins_t H5D__btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    void *_lt_key, hbool_t *lt_key_changed, void *_md_key, void *_udata,
-    void *_rt_key, hbool_t *rt_key_changed, haddr_t *new_node/*out*/);
-static H5B_ins_t H5D__btree_remove( H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    void *_lt_key, hbool_t *lt_key_changed, void *_udata, void *_rt_key,
-    hbool_t *rt_key_changed);
-static herr_t H5D__btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw,
-    void *_key);
-static herr_t H5D__btree_encode_key(const H5B_shared_t *shared, uint8_t *raw,
-    const void *_key);
-static herr_t H5D__btree_debug_key(FILE *stream, int indent, int fwidth,
-    const void *key, const void *udata);
+static H5RC_t *  H5D__btree_get_shared(const H5F_t *f, const void *_udata);
+static herr_t    H5D__btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t, void *_lt_key, void *_udata,
+                                     void *_rt_key, haddr_t *addr_p /*out*/);
+static int       H5D__btree_cmp2(void *_lt_key, void *_udata, void *_rt_key);
+static int       H5D__btree_cmp3(void *_lt_key, void *_udata, void *_rt_key);
+static htri_t    H5D__btree_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_lt_key, void *_udata);
+static H5B_ins_t H5D__btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
+                                   hbool_t *lt_key_changed, void *_md_key, void *_udata, void *_rt_key,
+                                   hbool_t *rt_key_changed, haddr_t *new_node /*out*/);
+static H5B_ins_t H5D__btree_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
+                                   hbool_t *lt_key_changed, void *_udata, void *_rt_key,
+                                   hbool_t *rt_key_changed);
+static herr_t    H5D__btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key);
+static herr_t    H5D__btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key);
+static herr_t H5D__btree_debug_key(FILE *stream, int indent, int fwidth, const void *key, const void *udata);
 
 /* Chunked layout indexing callbacks */
-static herr_t H5D__btree_idx_init(const H5D_chk_idx_info_t *idx_info,
-    const H5S_t *space, haddr_t dset_ohdr_addr);
-static herr_t H5D__btree_idx_create(const H5D_chk_idx_info_t *idx_info);
+static herr_t  H5D__btree_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t *space,
+                                   haddr_t dset_ohdr_addr);
+static herr_t  H5D__btree_idx_create(const H5D_chk_idx_info_t *idx_info);
 static hbool_t H5D__btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage);
-static herr_t H5D__btree_idx_insert(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_ud_t *udata);
-static herr_t H5D__btree_idx_get_addr(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_ud_t *udata);
-static int H5D__btree_idx_iterate(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_cb_func_t chunk_cb, void *chunk_udata);
-static herr_t H5D__btree_idx_remove(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_common_ud_t *udata);
-static herr_t H5D__btree_idx_delete(const H5D_chk_idx_info_t *idx_info);
-static herr_t H5D__btree_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__btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
-    H5O_storage_chunk_t *storage_dst, hid_t dxpl_id);
-static herr_t H5D__btree_idx_size(const H5D_chk_idx_info_t *idx_info,
-    hsize_t *size);
+static herr_t  H5D__btree_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata);
+static herr_t  H5D__btree_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata);
+static int     H5D__btree_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chunk_cb,
+                                      void *chunk_udata);
+static herr_t  H5D__btree_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *udata);
+static herr_t  H5D__btree_idx_delete(const H5D_chk_idx_info_t *idx_info);
+static herr_t  H5D__btree_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__btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src, H5O_storage_chunk_t *storage_dst,
+                                           hid_t dxpl_id);
+static herr_t H5D__btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *size);
 static herr_t H5D__btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr);
-static herr_t H5D__btree_idx_dump(const H5O_storage_chunk_t *storage,
-    FILE *stream);
+static herr_t H5D__btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream);
 static herr_t H5D__btree_idx_dest(const H5D_chk_idx_info_t *idx_info);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* v1 B-tree indexed chunk I/O ops */
-const H5D_chunk_ops_t H5D_COPS_BTREE[1] = {{
-    H5D__btree_idx_init,
-    H5D__btree_idx_create,
-    H5D__btree_idx_is_space_alloc,
-    H5D__btree_idx_insert,
-    H5D__btree_idx_get_addr,
-    NULL,
-    H5D__btree_idx_iterate,
-    H5D__btree_idx_remove,
-    H5D__btree_idx_delete,
-    H5D__btree_idx_copy_setup,
-    H5D__btree_idx_copy_shutdown,
-    H5D__btree_idx_size,
-    H5D__btree_idx_reset,
-    H5D__btree_idx_dump,
-    H5D__btree_idx_dest
-}};
-
+const H5D_chunk_ops_t H5D_COPS_BTREE[1] = {
+    {H5D__btree_idx_init, H5D__btree_idx_create, H5D__btree_idx_is_space_alloc, H5D__btree_idx_insert,
+     H5D__btree_idx_get_addr, NULL, H5D__btree_idx_iterate, H5D__btree_idx_remove, H5D__btree_idx_delete,
+     H5D__btree_idx_copy_setup, H5D__btree_idx_copy_shutdown, H5D__btree_idx_size, H5D__btree_idx_reset,
+     H5D__btree_idx_dump, H5D__btree_idx_dest}};
 
 /*****************************/
 /* Library Private Variables */
@@ -179,29 +153,27 @@ const H5D_chunk_ops_t H5D_COPS_BTREE[1] = {{
 
 /* inherits B-tree like properties from H5B */
 H5B_class_t H5B_BTREE[1] = {{
-    H5B_CHUNK_ID,		/*id			*/
-    sizeof(H5D_btree_key_t),	/*sizeof_nkey		*/
-    H5D__btree_get_shared,	/*get_shared		*/
-    H5D__btree_new_node,	/*new			*/
-    H5D__btree_cmp2,		/*cmp2			*/
-    H5D__btree_cmp3,		/*cmp3			*/
-    H5D__btree_found,		/*found			*/
-    H5D__btree_insert,		/*insert		*/
-    FALSE,			/*follow min branch?	*/
-    FALSE,			/*follow max branch?	*/
-    H5B_LEFT,                   /*critical key          */
-    H5D__btree_remove,		/*remove		*/
-    H5D__btree_decode_key,	/*decode		*/
-    H5D__btree_encode_key,	/*encode		*/
-    H5D__btree_debug_key	/*debug			*/
+    H5B_CHUNK_ID,            /*id			*/
+    sizeof(H5D_btree_key_t), /*sizeof_nkey		*/
+    H5D__btree_get_shared,   /*get_shared		*/
+    H5D__btree_new_node,     /*new			*/
+    H5D__btree_cmp2,         /*cmp2			*/
+    H5D__btree_cmp3,         /*cmp3			*/
+    H5D__btree_found,        /*found			*/
+    H5D__btree_insert,       /*insert		*/
+    FALSE,                   /*follow min branch?	*/
+    FALSE,                   /*follow max branch?	*/
+    H5B_LEFT,                /*critical key          */
+    H5D__btree_remove,       /*remove		*/
+    H5D__btree_decode_key,   /*decode		*/
+    H5D__btree_encode_key,   /*encode		*/
+    H5D__btree_debug_key     /*debug			*/
 }};
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_get_shared
  *
@@ -220,7 +192,7 @@ H5B_class_t H5B_BTREE[1] = {{
 static H5RC_t *
 H5D__btree_get_shared(const H5F_t H5_ATTR_UNUSED *f, const void *_udata)
 {
-    const H5D_chunk_common_ud_t *udata = (const H5D_chunk_common_ud_t *) _udata;
+    const H5D_chunk_common_ud_t *udata = (const H5D_chunk_common_ud_t *)_udata;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -233,7 +205,6 @@ H5D__btree_get_shared(const H5F_t H5_ATTR_UNUSED *f, const void *_udata)
     FUNC_LEAVE_NOAPI(udata->storage->u.btree.shared)
 } /* end H5D__btree_get_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_new_node
  *
@@ -253,15 +224,14 @@ H5D__btree_get_shared(const H5F_t H5_ATTR_UNUSED *f, const void *_udata)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op,
-		    void *_lt_key, void *_udata, void *_rt_key,
-		    haddr_t *addr_p/*out*/)
+H5D__btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op, void *_lt_key, void *_udata, void *_rt_key,
+                    haddr_t *addr_p /*out*/)
 {
-    H5D_btree_key_t	*lt_key = (H5D_btree_key_t *) _lt_key;
-    H5D_btree_key_t	*rt_key = (H5D_btree_key_t *) _rt_key;
-    H5D_chunk_ud_t	*udata = (H5D_chunk_ud_t *) _udata;
-    unsigned		u;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5D_btree_key_t *lt_key = (H5D_btree_key_t *)_lt_key;
+    H5D_btree_key_t *rt_key = (H5D_btree_key_t *)_rt_key;
+    H5D_chunk_ud_t * udata  = (H5D_chunk_ud_t *)_udata;
+    unsigned         u;
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -276,7 +246,7 @@ H5D__btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op,
     /* Allocate new storage */
     HDassert(udata->nbytes > 0);
     H5_CHECK_OVERFLOW(udata->nbytes, uint32_t, hsize_t);
-    if(HADDR_UNDEF == (*addr_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
+    if (HADDR_UNDEF == (*addr_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
         HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "couldn't allocate new file storage")
     udata->addr = *addr_p;
 
@@ -284,30 +254,28 @@ H5D__btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op,
      * The left key describes the storage of the UDATA chunk being
      * inserted into the tree.
      */
-    lt_key->nbytes = udata->nbytes;
+    lt_key->nbytes      = udata->nbytes;
     lt_key->filter_mask = udata->filter_mask;
-    for(u = 0; u < udata->common.layout->ndims; u++)
+    for (u = 0; u < udata->common.layout->ndims; u++)
         lt_key->offset[u] = udata->common.offset[u];
 
     /*
      * The right key might already be present.  If not, then add a zero-width
      * chunk.
      */
-    if(H5B_INS_LEFT != op) {
-        rt_key->nbytes = 0;
+    if (H5B_INS_LEFT != op) {
+        rt_key->nbytes      = 0;
         rt_key->filter_mask = 0;
-        for(u = 0; u < udata->common.layout->ndims; u++) {
-            HDassert(udata->common.offset[u] + udata->common.layout->dim[u] >
-                udata->common.offset[u]);
+        for (u = 0; u < udata->common.layout->ndims; u++) {
+            HDassert(udata->common.offset[u] + udata->common.layout->dim[u] > udata->common.offset[u]);
             rt_key->offset[u] = udata->common.offset[u] + udata->common.layout->dim[u];
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_new_node() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_cmp2
  *
@@ -330,10 +298,10 @@ done:
 static int
 H5D__btree_cmp2(void *_lt_key, void *_udata, void *_rt_key)
 {
-    H5D_btree_key_t	*lt_key = (H5D_btree_key_t *) _lt_key;
-    H5D_btree_key_t	*rt_key = (H5D_btree_key_t *) _rt_key;
-    H5D_chunk_common_ud_t	*udata = (H5D_chunk_common_ud_t *) _udata;
-    int		ret_value;
+    H5D_btree_key_t *      lt_key = (H5D_btree_key_t *)_lt_key;
+    H5D_btree_key_t *      rt_key = (H5D_btree_key_t *)_rt_key;
+    H5D_chunk_common_ud_t *udata  = (H5D_chunk_common_ud_t *)_udata;
+    int                    ret_value;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -348,7 +316,6 @@ H5D__btree_cmp2(void *_lt_key, void *_udata, void *_rt_key)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_cmp2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_cmp3
  *
@@ -379,10 +346,10 @@ H5D__btree_cmp2(void *_lt_key, void *_udata, void *_rt_key)
 static int
 H5D__btree_cmp3(void *_lt_key, void *_udata, void *_rt_key)
 {
-    H5D_btree_key_t	*lt_key = (H5D_btree_key_t *) _lt_key;
-    H5D_btree_key_t	*rt_key = (H5D_btree_key_t *) _rt_key;
-    H5D_chunk_common_ud_t	*udata = (H5D_chunk_common_ud_t *) _udata;
-    int		ret_value = 0;
+    H5D_btree_key_t *      lt_key    = (H5D_btree_key_t *)_lt_key;
+    H5D_btree_key_t *      rt_key    = (H5D_btree_key_t *)_rt_key;
+    H5D_chunk_common_ud_t *udata     = (H5D_chunk_common_ud_t *)_udata;
+    int                    ret_value = 0;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -397,26 +364,24 @@ H5D__btree_cmp3(void *_lt_key, void *_udata, void *_rt_key)
     /* slightly odd way the library initializes the right-most node in the */
     /* indexed storage B-tree... */
     /* (Dump the B-tree with h5debug to look at it) -QAK */
-    if(udata->layout->ndims == 2) {
-        if(udata->offset[0] > rt_key->offset[0])
+    if (udata->layout->ndims == 2) {
+        if (udata->offset[0] > rt_key->offset[0])
             ret_value = 1;
-        else if(udata->offset[0] == rt_key->offset[0] &&
-                udata->offset[1] >= rt_key->offset[1])
+        else if (udata->offset[0] == rt_key->offset[0] && udata->offset[1] >= rt_key->offset[1])
             ret_value = 1;
-        else if(udata->offset[0] < lt_key->offset[0])
+        else if (udata->offset[0] < lt_key->offset[0])
             ret_value = (-1);
     } /* end if */
     else {
-        if(H5VM_vector_ge_u(udata->layout->ndims, udata->offset, rt_key->offset))
+        if (H5VM_vector_ge_u(udata->layout->ndims, udata->offset, rt_key->offset))
             ret_value = 1;
-        else if(H5VM_vector_lt_u(udata->layout->ndims, udata->offset, lt_key->offset))
+        else if (H5VM_vector_lt_u(udata->layout->ndims, udata->offset, lt_key->offset))
             ret_value = (-1);
     } /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_cmp3() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_found
  *
@@ -444,12 +409,12 @@ H5D__btree_cmp3(void *_lt_key, void *_udata, void *_rt_key)
 /* ARGSUSED */
 static htri_t
 H5D__btree_found(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, const void *_lt_key,
-		 void *_udata)
+                 void *_udata)
 {
-    H5D_chunk_ud_t	   *udata = (H5D_chunk_ud_t *) _udata;
-    const H5D_btree_key_t *lt_key = (const H5D_btree_key_t *) _lt_key;
-    unsigned		u;
-    htri_t      ret_value = TRUE;       /* Return value */
+    H5D_chunk_ud_t *       udata  = (H5D_chunk_ud_t *)_udata;
+    const H5D_btree_key_t *lt_key = (const H5D_btree_key_t *)_lt_key;
+    unsigned               u;
+    htri_t                 ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -460,21 +425,20 @@ H5D__btree_found(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t
     HDassert(lt_key);
 
     /* Is this *really* the requested chunk? */
-    for(u = 0; u < udata->common.layout->ndims; u++)
-        if(udata->common.offset[u] >= lt_key->offset[u] + udata->common.layout->dim[u])
+    for (u = 0; u < udata->common.layout->ndims; u++)
+        if (udata->common.offset[u] >= lt_key->offset[u] + udata->common.layout->dim[u])
             HGOTO_DONE(FALSE)
 
     /* Initialize return values */
     HDassert(lt_key->nbytes > 0);
-    udata->addr = addr;
-    udata->nbytes = lt_key->nbytes;
+    udata->addr        = addr;
+    udata->nbytes      = lt_key->nbytes;
     udata->filter_mask = lt_key->filter_mask;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_found() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_insert
  *
@@ -505,19 +469,17 @@ done:
  */
 /* ARGSUSED */
 static H5B_ins_t
-H5D__btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
-		  hbool_t *lt_key_changed,
-		  void *_md_key, void *_udata, void *_rt_key,
-		  hbool_t H5_ATTR_UNUSED *rt_key_changed,
-		  haddr_t *new_node_p/*out*/)
+H5D__btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key, hbool_t *lt_key_changed,
+                  void *_md_key, void *_udata, void *_rt_key, hbool_t H5_ATTR_UNUSED *rt_key_changed,
+                  haddr_t *new_node_p /*out*/)
 {
-    H5D_btree_key_t	*lt_key = (H5D_btree_key_t *) _lt_key;
-    H5D_btree_key_t	*md_key = (H5D_btree_key_t *) _md_key;
-    H5D_btree_key_t	*rt_key = (H5D_btree_key_t *) _rt_key;
-    H5D_chunk_ud_t	*udata = (H5D_chunk_ud_t *) _udata;
-    int		cmp;
-    unsigned		u;
-    H5B_ins_t		ret_value;
+    H5D_btree_key_t *lt_key = (H5D_btree_key_t *)_lt_key;
+    H5D_btree_key_t *md_key = (H5D_btree_key_t *)_md_key;
+    H5D_btree_key_t *rt_key = (H5D_btree_key_t *)_rt_key;
+    H5D_chunk_ud_t * udata  = (H5D_chunk_ud_t *)_udata;
+    int              cmp;
+    unsigned         u;
+    H5B_ins_t        ret_value;
 
     FUNC_ENTER_STATIC
 
@@ -534,18 +496,17 @@ H5D__btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
     cmp = H5D__btree_cmp3(lt_key, udata, rt_key);
     HDassert(cmp <= 0);
 
-    if(cmp < 0) {
+    if (cmp < 0) {
         /* Negative indices not supported yet */
         HGOTO_ERROR(H5E_STORAGE, H5E_UNSUPPORTED, H5B_INS_ERROR, "internal error")
-
-    } else if(H5VM_vector_eq_u(udata->common.layout->ndims,
-				udata->common.offset, lt_key->offset) &&
-	       lt_key->nbytes > 0) {
+    }
+    else if (H5VM_vector_eq_u(udata->common.layout->ndims, udata->common.offset, lt_key->offset) &&
+             lt_key->nbytes > 0) {
         /*
          * Already exists.  If the new size is not the same as the old size
          * then we should reallocate storage.
          */
-        if(lt_key->nbytes != udata->nbytes) {
+        if (lt_key->nbytes != udata->nbytes) {
 /* Currently, the old chunk data is "thrown away" after the space is reallocated,
  * so avoid data copy in H5MF_realloc() call by just free'ing the space and
  * allocating new space.
@@ -556,40 +517,39 @@ H5D__btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
  * QAK - 11/19/2002
  */
 #ifdef OLD_WAY
-            if(HADDR_UNDEF == (*new_node_p = H5MF_realloc(f, H5FD_MEM_DRAW, addr,
-                      (hsize_t)lt_key->nbytes, (hsize_t)udata->nbytes)))
+            if (HADDR_UNDEF == (*new_node_p = H5MF_realloc(f, H5FD_MEM_DRAW, addr, (hsize_t)lt_key->nbytes,
+                                                           (hsize_t)udata->nbytes)))
                 HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, H5B_INS_ERROR, "unable to reallocate chunk storage")
-#else /* OLD_WAY */
+#else  /* OLD_WAY */
             H5_CHECK_OVERFLOW(lt_key->nbytes, uint32_t, hsize_t);
-            if(H5MF_xfree(f, H5FD_MEM_DRAW, dxpl_id, addr, (hsize_t)lt_key->nbytes) < 0)
+            if (H5MF_xfree(f, H5FD_MEM_DRAW, dxpl_id, addr, (hsize_t)lt_key->nbytes) < 0)
                 HGOTO_ERROR(H5E_STORAGE, H5E_CANTFREE, H5B_INS_ERROR, "unable to free chunk")
             H5_CHECK_OVERFLOW(udata->nbytes, uint32_t, hsize_t);
-            if(HADDR_UNDEF == (*new_node_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
+            if (HADDR_UNDEF == (*new_node_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
                 HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, H5B_INS_ERROR, "unable to reallocate chunk")
 #endif /* OLD_WAY */
-            lt_key->nbytes = udata->nbytes;
+            lt_key->nbytes      = udata->nbytes;
             lt_key->filter_mask = udata->filter_mask;
-            *lt_key_changed = TRUE;
-            udata->addr = *new_node_p;
-            ret_value = H5B_INS_CHANGE;
-        } else {
+            *lt_key_changed     = TRUE;
+            udata->addr         = *new_node_p;
+            ret_value           = H5B_INS_CHANGE;
+        }
+        else {
             udata->addr = addr;
-            ret_value = H5B_INS_NOOP;
+            ret_value   = H5B_INS_NOOP;
         }
-
-    } else if (H5VM_hyper_disjointp(udata->common.layout->ndims,
-				   lt_key->offset, udata->common.layout->dim,
-				   udata->common.offset, udata->common.layout->dim)) {
-        HDassert(H5VM_hyper_disjointp(udata->common.layout->ndims,
-				   rt_key->offset, udata->common.layout->dim,
-				   udata->common.offset, udata->common.layout->dim));
+    }
+    else if (H5VM_hyper_disjointp(udata->common.layout->ndims, lt_key->offset, udata->common.layout->dim,
+                                  udata->common.offset, udata->common.layout->dim)) {
+        HDassert(H5VM_hyper_disjointp(udata->common.layout->ndims, rt_key->offset, udata->common.layout->dim,
+                                      udata->common.offset, udata->common.layout->dim));
         /*
          * Split this node, inserting the new new node to the right of the
          * current node.  The MD_KEY is where the split occurs.
          */
-        md_key->nbytes = udata->nbytes;
+        md_key->nbytes      = udata->nbytes;
         md_key->filter_mask = udata->filter_mask;
-        for(u = 0; u < udata->common.layout->ndims; u++) {
+        for (u = 0; u < udata->common.layout->ndims; u++) {
             HDassert(0 == udata->common.offset[u] % udata->common.layout->dim[u]);
             md_key->offset[u] = udata->common.offset[u];
         } /* end for */
@@ -598,12 +558,12 @@ H5D__btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
          * Allocate storage for the new chunk
          */
         H5_CHECK_OVERFLOW(udata->nbytes, uint32_t, hsize_t);
-        if(HADDR_UNDEF == (*new_node_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
+        if (HADDR_UNDEF == (*new_node_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
             HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, H5B_INS_ERROR, "file allocation failed")
         udata->addr = *new_node_p;
-        ret_value = H5B_INS_RIGHT;
-
-    } else {
+        ret_value   = H5B_INS_RIGHT;
+    }
+    else {
         HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, H5B_INS_ERROR, "internal error")
     }
 
@@ -611,7 +571,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_remove
  *
@@ -627,20 +586,18 @@ done:
  */
 /* ARGSUSED */
 static H5B_ins_t
-H5D__btree_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out */ ,
-	hbool_t *lt_key_changed /*out */ ,
-	void H5_ATTR_UNUSED * _udata /*in,out */ ,
-	void H5_ATTR_UNUSED * _rt_key /*in,out */ ,
-	hbool_t *rt_key_changed /*out */ )
+H5D__btree_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out */,
+                  hbool_t *lt_key_changed /*out */, void H5_ATTR_UNUSED *_udata /*in,out */,
+                  void H5_ATTR_UNUSED *_rt_key /*in,out */, hbool_t *rt_key_changed /*out */)
 {
-    H5D_btree_key_t    *lt_key = (H5D_btree_key_t *)_lt_key;
-    H5B_ins_t ret_value=H5B_INS_REMOVE; /* Return value */
+    H5D_btree_key_t *lt_key    = (H5D_btree_key_t *)_lt_key;
+    H5B_ins_t        ret_value = H5B_INS_REMOVE; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Remove raw data chunk from file */
     H5_CHECK_OVERFLOW(lt_key->nbytes, uint32_t, hsize_t);
-    if(H5MF_xfree(f, H5FD_MEM_DRAW, dxpl_id, addr, (hsize_t)lt_key->nbytes) < 0)
+    if (H5MF_xfree(f, H5FD_MEM_DRAW, dxpl_id, addr, (hsize_t)lt_key->nbytes) < 0)
         HGOTO_ERROR(H5E_STORAGE, H5E_CANTFREE, H5B_INS_ERROR, "unable to free chunk")
 
     /* Mark keys as unchanged */
@@ -651,7 +608,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_decode_key
  *
@@ -667,9 +623,9 @@ done:
 static herr_t
 H5D__btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
 {
-    H5D_btree_key_t	*key = (H5D_btree_key_t *) _key;
-    size_t		ndims;
-    unsigned		u;
+    H5D_btree_key_t *key = (H5D_btree_key_t *)_key;
+    size_t           ndims;
+    unsigned         u;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -683,13 +639,12 @@ H5D__btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key
     /* decode */
     UINT32DECODE(raw, key->nbytes);
     UINT32DECODE(raw, key->filter_mask);
-    for(u = 0; u < ndims; u++)
-	UINT64DECODE(raw, key->offset[u]);
+    for (u = 0; u < ndims; u++)
+        UINT64DECODE(raw, key->offset[u]);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__btree_decode_key() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_encode_key
  *
@@ -706,8 +661,8 @@ static herr_t
 H5D__btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
 {
     const H5D_btree_key_t *key = (const H5D_btree_key_t *)_key;
-    size_t		ndims;
-    unsigned		u;
+    size_t                 ndims;
+    unsigned               u;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -721,13 +676,12 @@ H5D__btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key
     /* encode */
     UINT32ENCODE(raw, key->nbytes);
     UINT32ENCODE(raw, key->filter_mask);
-    for(u = 0; u < ndims; u++)
-	UINT64ENCODE(raw, key->offset[u]);
+    for (u = 0; u < ndims; u++)
+        UINT64ENCODE(raw, key->offset[u]);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__btree_encode_key() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_debug_key
  *
@@ -742,12 +696,11 @@ H5D__btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key
  */
 /* ARGSUSED */
 static herr_t
-H5D__btree_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
-    const void *_udata)
+H5D__btree_debug_key(FILE *stream, int indent, int fwidth, const void *_key, const void *_udata)
 {
-    const H5D_btree_key_t	*key = (const H5D_btree_key_t *)_key;
-    const H5D_btree_dbg_t	*udata = (const H5D_btree_dbg_t *)_udata;
-    unsigned		u;
+    const H5D_btree_key_t *key   = (const H5D_btree_key_t *)_key;
+    const H5D_btree_dbg_t *udata = (const H5D_btree_dbg_t *)_udata;
+    unsigned               u;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -756,14 +709,13 @@ H5D__btree_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
     HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth, "Chunk size:", (unsigned)key->nbytes);
     HDfprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth, "Filter mask:", key->filter_mask);
     HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Logical offset:");
-    for(u = 0; u < udata->ndims; u++)
-        HDfprintf(stream, "%s%Hd", u?", ":"", key->offset[u]);
+    for (u = 0; u < udata->ndims; u++)
+        HDfprintf(stream, "%s%Hd", u ? ", " : "", key->offset[u]);
     HDfputs("}\n", stream);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__btree_debug_key() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_shared_create
  *
@@ -779,33 +731,32 @@ H5D__btree_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
 static herr_t
 H5D__btree_shared_create(const H5F_t *f, H5O_storage_chunk_t *store, unsigned ndims)
 {
-    H5B_shared_t *shared;               /* Shared B-tree node info */
-    size_t	sizeof_rkey;	        /* Size of raw (disk) key	     */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5B_shared_t *shared;              /* Shared B-tree node info */
+    size_t        sizeof_rkey;         /* Size of raw (disk) key	     */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Set the raw key size */
-    sizeof_rkey = 4 +			/*storage size		*/
-                4 +			/*filter mask		*/
-                ndims * 8;		/*dimension indices	*/
+    sizeof_rkey = 4 +        /*storage size		*/
+                  4 +        /*filter mask		*/
+                  ndims * 8; /*dimension indices	*/
 
     /* Allocate & initialize global info for the shared structure */
-    if(NULL == (shared = H5B_shared_new(f, H5B_BTREE, sizeof_rkey)))
-	HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, FAIL, "memory allocation failed for shared B-tree info")
+    if (NULL == (shared = H5B_shared_new(f, H5B_BTREE, sizeof_rkey)))
+        HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, FAIL, "memory allocation failed for shared B-tree info")
 
     /* Set up the "local" information for this dataset's chunks */
-        /* <none> */
+    /* <none> */
 
     /* Make shared B-tree info reference counted */
-    if(NULL == (store->u.btree.shared = H5RC_create(shared, H5B_shared_free)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create ref-count wrapper for shared B-tree info")
+    if (NULL == (store->u.btree.shared = H5RC_create(shared, H5B_shared_free)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create ref-count wrapper for shared B-tree info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_shared_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_init
  *
@@ -820,9 +771,9 @@ done:
  */
 static herr_t
 H5D__btree_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNUSED *space,
-    haddr_t dset_ohdr_addr)
+                    haddr_t dset_ohdr_addr)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -837,14 +788,13 @@ H5D__btree_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNUS
     idx_info->storage->u.btree.dset_ohdr_addr = dset_ohdr_addr;
 
     /* Allocate the shared structure */
-    if(H5D__btree_shared_create(idx_info->f, idx_info->storage, idx_info->layout->ndims) < 0)
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info")
+    if (H5D__btree_shared_create(idx_info->f, idx_info->storage, idx_info->layout->ndims) < 0)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_create
  *
@@ -866,8 +816,8 @@ done:
 static herr_t
 H5D__btree_idx_create(const H5D_chk_idx_info_t *idx_info)
 {
-    H5D_chunk_common_ud_t udata;        /* User data for B-tree callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_chunk_common_ud_t udata;               /* User data for B-tree callback */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -880,18 +830,18 @@ H5D__btree_idx_create(const H5D_chk_idx_info_t *idx_info)
     HDassert(!H5F_addr_defined(idx_info->storage->idx_addr));
 
     /* Initialize "user" data for B-tree callbacks, etc. */
-    udata.layout = idx_info->layout;
+    udata.layout  = idx_info->layout;
     udata.storage = idx_info->storage;
 
     /* Create the v1 B-tree for the chunk index */
-    if(H5B_create(idx_info->f, idx_info->dxpl_id, H5B_BTREE, &udata, &(idx_info->storage->idx_addr)/*out*/) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create B-tree")
+    if (H5B_create(idx_info->f, idx_info->dxpl_id, H5B_BTREE, &udata,
+                   &(idx_info->storage->idx_addr) /*out*/) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create B-tree")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_is_space_alloc
  *
@@ -907,7 +857,7 @@ done:
 static hbool_t
 H5D__btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
 {
-    hbool_t ret_value;          /* Return value */
+    hbool_t ret_value; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -920,7 +870,6 @@ H5D__btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_is_space_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_insert
  *
@@ -937,7 +886,7 @@ H5D__btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
 static herr_t
 H5D__btree_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -953,14 +902,13 @@ H5D__btree_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata)
      * Create the chunk it if it doesn't exist, or reallocate the chunk if
      * its size changed.
      */
-    if(H5B_insert(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, udata) < 0)
+    if (H5B_insert(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, udata) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to allocate chunk")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__btree_idx_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_get_addr
  *
@@ -978,7 +926,7 @@ done:
 static herr_t
 H5D__btree_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata)
 {
-    herr_t	ret_value = SUCCEED;	/* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -992,14 +940,13 @@ H5D__btree_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udat
     HDassert(udata);
 
     /* Go get the chunk information from the B-tree */
-    if(H5B_find(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, udata) < 0)
+    if (H5B_find(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, udata) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__btree_idx_get_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_iterate_cb
  *
@@ -1017,14 +964,13 @@ done:
  */
 /* ARGSUSED */
 static int
-H5D__btree_idx_iterate_cb(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    const void *_lt_key, haddr_t addr, const void H5_ATTR_UNUSED *_rt_key,
-    void *_udata)
+H5D__btree_idx_iterate_cb(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_lt_key,
+                          haddr_t addr, const void H5_ATTR_UNUSED *_rt_key, void *_udata)
 {
-    H5D_btree_it_ud_t	*udata = (H5D_btree_it_ud_t *)_udata; /* User data */
-    const H5D_btree_key_t	*lt_key = (const H5D_btree_key_t *)_lt_key; /* B-tree key for chunk */
-    H5D_chunk_rec_t chunk_rec;  /* Generic chunk record for callback */
-    int ret_value;              /* Return value */
+    H5D_btree_it_ud_t *    udata  = (H5D_btree_it_ud_t *)_udata;      /* User data */
+    const H5D_btree_key_t *lt_key = (const H5D_btree_key_t *)_lt_key; /* B-tree key for chunk */
+    H5D_chunk_rec_t        chunk_rec;                                 /* Generic chunk record for callback */
+    int                    ret_value;                                 /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1041,13 +987,12 @@ H5D__btree_idx_iterate_cb(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
     chunk_rec.chunk_addr = addr;
 
     /* Make "generic chunk" callback */
-    if((ret_value = (udata->cb)(&chunk_rec, udata->udata)) < 0)
+    if ((ret_value = (udata->cb)(&chunk_rec, udata->udata)) < 0)
         HERROR(H5E_DATASET, H5E_CALLBACK, "failure in generic chunk iterator callback");
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__btree_idx_iterate_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_iterate
  *
@@ -1062,11 +1007,10 @@ H5D__btree_idx_iterate_cb(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
  *-------------------------------------------------------------------------
  */
 static int
-H5D__btree_idx_iterate(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_cb_func_t chunk_cb, void *chunk_udata)
+H5D__btree_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chunk_cb, void *chunk_udata)
 {
-    H5D_btree_it_ud_t	udata;  /* User data for B-tree iterator callback */
-    int ret_value;              /* Return value */
+    H5D_btree_it_ud_t udata;     /* User data for B-tree iterator callback */
+    int               ret_value; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1081,19 +1025,19 @@ H5D__btree_idx_iterate(const H5D_chk_idx_info_t *idx_info,
 
     /* 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;
-    udata.cb = chunk_cb;
-    udata.udata = chunk_udata;
+    udata.cb             = chunk_cb;
+    udata.udata          = chunk_udata;
 
     /* Iterate over existing chunks */
-    if((ret_value = H5B_iterate(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, H5D__btree_idx_iterate_cb, &udata)) < 0)
+    if ((ret_value = H5B_iterate(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr,
+                                 H5D__btree_idx_iterate_cb, &udata)) < 0)
         HERROR(H5E_DATASET, H5E_BADITER, "unable to iterate over chunk B-tree");
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_remove
  *
@@ -1109,7 +1053,7 @@ H5D__btree_idx_iterate(const H5D_chk_idx_info_t *idx_info,
 static herr_t
 H5D__btree_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *udata)
 {
-    herr_t	ret_value = SUCCEED;	/* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1124,14 +1068,13 @@ H5D__btree_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t
     /* Remove the chunk from the v1 B-tree index and release the space for the
      * chunk (in the B-tree callback).
      */
-    if(H5B_remove(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, udata) < 0)
+    if (H5B_remove(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, udata) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to remove chunk entry")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__btree_idx_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_delete
  *
@@ -1149,7 +1092,7 @@ done:
 static herr_t
 H5D__btree_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
 
@@ -1161,30 +1104,30 @@ H5D__btree_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)) {
-        H5O_storage_chunk_t tmp_storage;  /* Local copy of storage info */
-        H5D_chunk_common_ud_t udata;            /* User data for B-tree operations */
+    if (H5F_addr_defined(idx_info->storage->idx_addr)) {
+        H5O_storage_chunk_t   tmp_storage; /* Local copy of storage info */
+        H5D_chunk_common_ud_t udata;       /* User data for B-tree operations */
 
         /* Set up temporary chunked storage info */
         tmp_storage = *idx_info->storage;
 
         /* Set up the shared structure */
-        if(H5D__btree_shared_create(idx_info->f, &tmp_storage, idx_info->layout->ndims) < 0)
+        if (H5D__btree_shared_create(idx_info->f, &tmp_storage, idx_info->layout->ndims) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info")
 
         /* Set up B-tree user data */
         HDmemset(&udata, 0, sizeof udata);
-        udata.layout = idx_info->layout;
+        udata.layout  = idx_info->layout;
         udata.storage = &tmp_storage;
 
         /* Delete entire B-tree */
-        if(H5B_delete(idx_info->f, idx_info->dxpl_id, H5B_BTREE, tmp_storage.idx_addr, &udata) < 0)
+        if (H5B_delete(idx_info->f, idx_info->dxpl_id, H5B_BTREE, tmp_storage.idx_addr, &udata) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to delete chunk B-tree")
 
         /* Release the shared B-tree page */
-        if(NULL == tmp_storage.u.btree.shared)
+        if (NULL == tmp_storage.u.btree.shared)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "ref-counted page nil")
-        if(H5RC_DEC(tmp_storage.u.btree.shared) < 0)
+        if (H5RC_DEC(tmp_storage.u.btree.shared) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to decrement ref-counted page")
     } /* end if */
 
@@ -1192,7 +1135,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_copy_setup
  *
@@ -1206,10 +1148,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__btree_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
-    const H5D_chk_idx_info_t *idx_info_dst)
+H5D__btree_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
 
@@ -1226,13 +1167,14 @@ H5D__btree_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
     HDassert(!H5F_addr_defined(idx_info_dst->storage->idx_addr));
 
     /* Create shared B-tree info for each file */
-    if(H5D__btree_shared_create(idx_info_src->f, idx_info_src->storage, idx_info_src->layout->ndims) < 0)
+    if (H5D__btree_shared_create(idx_info_src->f, idx_info_src->storage, idx_info_src->layout->ndims) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for source shared B-tree info")
-    if(H5D__btree_shared_create(idx_info_dst->f, idx_info_dst->storage, idx_info_dst->layout->ndims) < 0)
-        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for destination shared B-tree info")
+    if (H5D__btree_shared_create(idx_info_dst->f, idx_info_dst->storage, idx_info_dst->layout->ndims) < 0)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL,
+                    "can't create wrapper for destination shared B-tree info")
 
     /* Create the root of the B-tree that describes chunked storage in the dest. file */
-    if(H5D__btree_idx_create(idx_info_dst) < 0)
+    if (H5D__btree_idx_create(idx_info_dst) < 0)
         HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to initialize chunked storage")
     HDassert(H5F_addr_defined(idx_info_dst->storage->idx_addr));
 
@@ -1240,7 +1182,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_copy_setup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_copy_shutdown
  *
@@ -1254,11 +1195,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
-    H5O_storage_chunk_t *storage_dst,
-    hid_t H5_ATTR_UNUSED dxpl_id)
+H5D__btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src, H5O_storage_chunk_t *storage_dst,
+                             hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1266,16 +1206,15 @@ H5D__btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
     HDassert(storage_dst);
 
     /* Decrement refcount on shared B-tree info */
-    if(H5RC_DEC(storage_src->u.btree.shared) < 0)
+    if (H5RC_DEC(storage_src->u.btree.shared) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to decrement ref-counted page")
-    if(H5RC_DEC(storage_dst->u.btree.shared) < 0)
+    if (H5RC_DEC(storage_dst->u.btree.shared) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to decrement ref-counted page")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_copy_shutdown() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__btree_idx_size
  *
@@ -1292,10 +1231,10 @@ done:
 static herr_t
 H5D__btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
 {
-    H5D_chunk_common_ud_t udata;              /* User-data for loading B-tree nodes */
-    H5B_info_t bt_info;                 /* B-tree info */
-    hbool_t shared_init = FALSE;        /* Whether shared B-tree info is initialized */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_chunk_common_ud_t udata;                 /* User-data for loading B-tree nodes */
+    H5B_info_t            bt_info;               /* B-tree info */
+    hbool_t               shared_init = FALSE;   /* Whether shared B-tree info is initialized */
+    herr_t                ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1308,34 +1247,34 @@ H5D__btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
     HDassert(index_size);
 
     /* Initialize the shared info for the B-tree traversal */
-    if(H5D__btree_shared_create(idx_info->f, idx_info->storage, idx_info->layout->ndims) < 0)
+    if (H5D__btree_shared_create(idx_info->f, idx_info->storage, idx_info->layout->ndims) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info")
     shared_init = TRUE;
 
     /* Initialize B-tree node user-data */
     HDmemset(&udata, 0, sizeof udata);
-    udata.layout = idx_info->layout;
+    udata.layout  = idx_info->layout;
     udata.storage = idx_info->storage;
 
     /* Get metadata information for B-tree */
-    if(H5B_get_info(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, &bt_info, NULL, &udata) < 0)
+    if (H5B_get_info(idx_info->f, idx_info->dxpl_id, H5B_BTREE, idx_info->storage->idx_addr, &bt_info, NULL,
+                     &udata) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to iterate over chunk B-tree")
 
     /* Set the size of the B-tree */
     *index_size = bt_info.size;
 
 done:
-    if(shared_init) {
-        if(NULL == idx_info->storage->u.btree.shared)
+    if (shared_init) {
+        if (NULL == idx_info->storage->u.btree.shared)
             HDONE_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "ref-counted page nil")
-        if(H5RC_DEC(idx_info->storage->u.btree.shared) < 0)
+        if (H5RC_DEC(idx_info->storage->u.btree.shared) < 0)
             HDONE_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "unable to decrement ref-counted page")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_reset
  *
@@ -1356,14 +1295,13 @@ H5D__btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
     HDassert(storage);
 
     /* Reset index info */
-    if(reset_addr)
-	storage->idx_addr = HADDR_UNDEF;
+    if (reset_addr)
+        storage->idx_addr = HADDR_UNDEF;
     storage->u.btree.shared = NULL;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__btree_idx_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_dump
  *
@@ -1389,7 +1327,6 @@ H5D__btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__btree_idx_dump() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__btree_idx_dest
  *
@@ -1405,7 +1342,7 @@ H5D__btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
 static herr_t
 H5D__btree_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
 
@@ -1416,16 +1353,15 @@ H5D__btree_idx_dest(const H5D_chk_idx_info_t *idx_info)
     HDassert(idx_info->storage);
 
     /* Free the raw B-tree node buffer */
-    if(NULL == idx_info->storage->u.btree.shared)
+    if (NULL == idx_info->storage->u.btree.shared)
         HGOTO_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "ref-counted page nil")
-    if(H5RC_DEC(idx_info->storage->u.btree.shared) < 0)
-	HGOTO_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "unable to decrement ref-counted page")
+    if (H5RC_DEC(idx_info->storage->u.btree.shared) < 0)
+        HGOTO_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "unable to decrement ref-counted page")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__btree_idx_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D_btree_debug
  *
@@ -1439,13 +1375,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
-		 int fwidth, unsigned ndims)
+H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, unsigned ndims)
 {
-    H5D_btree_dbg_t     udata;          /* User data for B-tree callback */
-    H5O_storage_chunk_t storage;        /* Storage information for B-tree callback */
-    hbool_t     shared_init = FALSE;    /* Whether B-tree shared info is initialized */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5D_btree_dbg_t     udata;                 /* User data for B-tree callback */
+    H5O_storage_chunk_t storage;               /* Storage information for B-tree callback */
+    hbool_t             shared_init = FALSE;   /* Whether B-tree shared info is initialized */
+    herr_t              ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1454,29 +1389,27 @@ H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent
     storage.idx_type = H5D_CHUNK_BTREE;
 
     /* Allocate the shared structure */
-    if(H5D__btree_shared_create(f, &storage, ndims) < 0)
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info")
+    if (H5D__btree_shared_create(f, &storage, ndims) < 0)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info")
     shared_init = TRUE;
 
     /* Set up user data for callback */
-    udata.common.layout = NULL;
+    udata.common.layout  = NULL;
     udata.common.storage = &storage;
-    udata.common.offset = NULL;
-    udata.ndims = ndims;
+    udata.common.offset  = NULL;
+    udata.ndims          = ndims;
 
     /* Dump the records for the B-tree */
     (void)H5B_debug(f, dxpl_id, addr, stream, indent, fwidth, H5B_BTREE, &udata);
 
 done:
-    if(shared_init) {
+    if (shared_init) {
         /* Free the raw B-tree node buffer */
-        if(NULL == storage.u.btree.shared)
+        if (NULL == storage.u.btree.shared)
             HDONE_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "ref-counted page nil")
-        else
-            if(H5RC_DEC(storage.u.btree.shared) < 0)
-                HDONE_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "unable to decrement ref-counted page")
+        else if (H5RC_DEC(storage.u.btree.shared) < 0)
+            HDONE_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "unable to decrement ref-counted page")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_btree_debug() */
-
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index c9dfe87..6847e42 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -42,23 +42,21 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE        /*suppress error about including H5Dpkg      */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg      */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"        /* Generic Functions            */
+#include "H5private.h" /* Generic Functions            */
 #ifdef H5_HAVE_PARALLEL
-#include "H5ACprivate.h"    /* Metadata cache            */
-#endif /* H5_HAVE_PARALLEL */
-#include "H5Dpkg.h"        /* Dataset functions            */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5FLprivate.h"    /* Free Lists                           */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5VMprivate.h"        /* Vector and array functions        */
-
+#include "H5ACprivate.h" /* Metadata cache            */
+#endif                   /* H5_HAVE_PARALLEL */
+#include "H5Dpkg.h"      /* Dataset functions            */
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5VMprivate.h" /* Vector and array functions        */
 
 /****************/
 /* Local Macros */
@@ -66,8 +64,9 @@
 
 /* Macros for iterating over chunks to operate on */
 #define H5D_CHUNK_GET_FIRST_NODE(map) (map->use_single ? (H5SL_node_t *)(1) : H5SL_first(map->sel_chunks))
-#define H5D_CHUNK_GET_NODE_INFO(map, node)  (map->use_single ? map->single_chunk_info : (H5D_chunk_info_t *)H5SL_item(node))
-#define H5D_CHUNK_GET_NEXT_NODE(map, node)  (map->use_single ? (H5SL_node_t *)NULL : H5SL_next(node))
+#define H5D_CHUNK_GET_NODE_INFO(map, node)                                                                   \
+    (map->use_single ? map->single_chunk_info : (H5D_chunk_info_t *)H5SL_item(node))
+#define H5D_CHUNK_GET_NEXT_NODE(map, node) (map->use_single ? (H5SL_node_t *)NULL : H5SL_next(node))
 
 /*
  * Feature: If this constant is defined then every cache preemption and load
@@ -95,94 +94,94 @@
 
 /*#define H5D_CHUNK_DEBUG */
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Callback info for iteration to prune chunks */
 typedef struct H5D_chunk_it_ud1_t {
-    H5D_chunk_common_ud_t common;       /* Common info for B-tree user data (must be first) */
-    const H5D_chk_idx_info_t *idx_info; /* Chunked index info */
-    const H5D_io_info_t *io_info;       /* I/O info for dataset operation */
-    const hsize_t    *space_dim;    /* New dataset dimensions    */
-    const hbool_t       *shrunk_dim;    /* Dimensions which have been shrunk */
-    H5S_t               *chunk_space;   /* Dataspace for a chunk */
-    uint32_t            elmts_per_chunk;/* Elements in chunk */
-    hsize_t             *hyper_start;   /* Starting location of hyperslab */
-    H5D_fill_buf_info_t fb_info;        /* Dataset's fill buffer info */
-    hbool_t             fb_info_init;   /* Whether the fill value buffer has been initialized */
+    H5D_chunk_common_ud_t     common;          /* Common info for B-tree user data (must be first) */
+    const H5D_chk_idx_info_t *idx_info;        /* Chunked index info */
+    const H5D_io_info_t *     io_info;         /* I/O info for dataset operation */
+    const hsize_t *           space_dim;       /* New dataset dimensions    */
+    const hbool_t *           shrunk_dim;      /* Dimensions which have been shrunk */
+    H5S_t *                   chunk_space;     /* Dataspace for a chunk */
+    uint32_t                  elmts_per_chunk; /* Elements in chunk */
+    hsize_t *                 hyper_start;     /* Starting location of hyperslab */
+    H5D_fill_buf_info_t       fb_info;         /* Dataset's fill buffer info */
+    hbool_t                   fb_info_init;    /* Whether the fill value buffer has been initialized */
 } H5D_chunk_it_ud1_t;
 
-/* Callback info for iteration to obtain chunk address and the index of the chunk for all chunks in the B-tree. */
+/* Callback info for iteration to obtain chunk address and the index of the chunk for all chunks in the
+ * B-tree. */
 typedef struct H5D_chunk_it_ud2_t {
     /* down */
-    H5D_chunk_common_ud_t common;               /* Common info for B-tree user data (must be first) */
+    H5D_chunk_common_ud_t common; /* Common info for B-tree user data (must be first) */
 
     /* up */
-    haddr_t             *chunk_addr;            /* Array of chunk addresses to fill in */
+    haddr_t *chunk_addr; /* Array of chunk addresses to fill in */
 } H5D_chunk_it_ud2_t;
 
 /* Callback info for iteration to copy data */
 typedef struct H5D_chunk_it_ud3_t {
-    H5D_chunk_common_ud_t common;           /* Common info for B-tree user data (must be first) */
-    H5F_t               *file_src;              /* Source file for copy */
-    H5D_chk_idx_info_t  *idx_info_dst;          /* Dest. chunk index info object */
-    void                *buf;                   /* Buffer to hold chunk data for read/write */
-    void                *bkg;                   /* Buffer for background information during type conversion */
-    size_t              buf_size;               /* Buffer size */
-    hbool_t             do_convert;             /* Whether to perform type conversions */
+    H5D_chunk_common_ud_t common;       /* Common info for B-tree user data (must be first) */
+    H5F_t *               file_src;     /* Source file for copy */
+    H5D_chk_idx_info_t *  idx_info_dst; /* Dest. chunk index info object */
+    void *                buf;          /* Buffer to hold chunk data for read/write */
+    void *                bkg;          /* Buffer for background information during type conversion */
+    size_t                buf_size;     /* Buffer size */
+    hbool_t               do_convert;   /* Whether to perform type conversions */
 
     /* needed for converting variable-length data */
-    hid_t               tid_src;                /* Datatype ID for source datatype */
-    hid_t               tid_dst;                /* Datatype ID for destination datatype */
-    hid_t               tid_mem;                /* Datatype ID for memory datatype */
-    const H5T_t         *dt_src;                /* Source datatype */
-    H5T_path_t          *tpath_src_mem;         /* Datatype conversion path from source file to memory */
-    H5T_path_t          *tpath_mem_dst;         /* Datatype conversion path from memory to dest. file */
-    void                *reclaim_buf;           /* Buffer for reclaiming data */
-    size_t              reclaim_buf_size;       /* Reclaim buffer size */
-    uint32_t            nelmts;                 /* Number of elements in buffer */
-    H5S_t               *buf_space;             /* Dataspace describing buffer */
+    hid_t        tid_src;          /* Datatype ID for source datatype */
+    hid_t        tid_dst;          /* Datatype ID for destination datatype */
+    hid_t        tid_mem;          /* Datatype ID for memory datatype */
+    const H5T_t *dt_src;           /* Source datatype */
+    H5T_path_t * tpath_src_mem;    /* Datatype conversion path from source file to memory */
+    H5T_path_t * tpath_mem_dst;    /* Datatype conversion path from memory to dest. file */
+    void *       reclaim_buf;      /* Buffer for reclaiming data */
+    size_t       reclaim_buf_size; /* Reclaim buffer size */
+    uint32_t     nelmts;           /* Number of elements in buffer */
+    H5S_t *      buf_space;        /* Dataspace describing buffer */
 
     /* needed for compressed variable-length data */
-    const H5O_pline_t   *pline;                 /* Filter pipeline */
+    const H5O_pline_t *pline; /* Filter pipeline */
 
     /* needed for copy object pointed by refs */
-    H5O_copy_t          *cpy_info;              /* Copy options */
+    H5O_copy_t *cpy_info; /* Copy options */
 
     /* needed for getting raw data from chunk cache */
-    hbool_t             chunk_in_cache;
-    uint8_t             *chunk;                 /* the unfiltered chunk data        */
+    hbool_t  chunk_in_cache;
+    uint8_t *chunk; /* the unfiltered chunk data        */
 } H5D_chunk_it_ud3_t;
 
 /* Callback info for iteration to dump index */
 typedef struct H5D_chunk_it_ud4_t {
-    FILE        *stream;        /* Output stream    */
-    hbool_t             header_displayed;       /* Node's header is displayed? */
-    unsigned            ndims;                  /* Number of dimensions for chunk/dataset */
+    FILE *   stream;           /* Output stream    */
+    hbool_t  header_displayed; /* Node's header is displayed? */
+    unsigned ndims;            /* Number of dimensions for chunk/dataset */
 } H5D_chunk_it_ud4_t;
 
 /* Callback info for nonexistent readvv operation */
 typedef struct H5D_chunk_readvv_ud_t {
-    unsigned char *rbuf;        /* Read buffer to initialize */
-    const H5D_t *dset;          /* Dataset to operate on */
-    hid_t dxpl_id;              /* DXPL for operation */
+    unsigned char *rbuf;    /* Read buffer to initialize */
+    const H5D_t *  dset;    /* Dataset to operate on */
+    hid_t          dxpl_id; /* DXPL for operation */
 } H5D_chunk_readvv_ud_t;
 
 /* Callback info for file selection iteration */
 typedef struct H5D_chunk_file_iter_ud_t {
-    H5D_chunk_map_t *fm;                /* File->memory chunk mapping info */
+    H5D_chunk_map_t *fm; /* File->memory chunk mapping info */
 #ifdef H5_HAVE_PARALLEL
-    const H5D_io_info_t *io_info;       /* I/O info for operation */
-#endif /* H5_HAVE_PARALLEL */
+    const H5D_io_info_t *io_info; /* I/O info for operation */
+#endif                            /* H5_HAVE_PARALLEL */
 } H5D_chunk_file_iter_ud_t;
 
 #ifdef H5_HAVE_PARALLEL
 /* information to construct a collective I/O operation for filling chunks */
 typedef struct H5D_chunk_coll_info_t {
-    size_t num_io;       /* Number of write operations */
-    haddr_t *addr;       /* array of the file addresses of the write operation */
+    size_t   num_io; /* Number of write operations */
+    haddr_t *addr;   /* array of the file addresses of the write operation */
 } H5D_chunk_coll_info_t;
 #endif /* H5_HAVE_PARALLEL */
 
@@ -192,107 +191,75 @@ typedef struct H5D_chunk_coll_info_t {
 
 /* Chunked layout operation callbacks */
 static herr_t H5D__chunk_construct(H5F_t *f, H5D_t *dset);
-static herr_t H5D__chunk_io_init(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
-static herr_t H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm);
-static herr_t H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm);
+static herr_t H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                 hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                 H5D_chunk_map_t *fm);
+static herr_t H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                              const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t *fm);
+static herr_t H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                               const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t *fm);
 static herr_t H5D__chunk_flush(H5D_t *dset, hid_t dxpl_id);
 static herr_t H5D__chunk_io_term(const H5D_chunk_map_t *fm);
 static herr_t H5D__chunk_cinfo_cache_reset(H5D_chunk_cached_t *last);
 
 /* "Nonexistent" layout operation callback */
-static ssize_t
-H5D__nonexistent_readvv(const H5D_io_info_t *io_info,
-    size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[], hsize_t chunk_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+static ssize_t H5D__nonexistent_readvv(const H5D_io_info_t *io_info, size_t chunk_max_nseq,
+                                       size_t *chunk_curr_seq, size_t chunk_len_arr[],
+                                       hsize_t chunk_offset_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+                                       size_t mem_len_arr[], hsize_t mem_offset_arr[]);
 
 /* Helper routines */
-static herr_t H5D__chunk_set_info_real(H5O_layout_chunk_t *layout, unsigned ndims,
-    const hsize_t *curr_dims);
-static void *H5D__chunk_alloc(size_t size, const H5O_pline_t *pline);
-static void *H5D__chunk_xfree(void *chk, const H5O_pline_t *pline);
-static void *H5D__chunk_realloc(void *chk, size_t size,
-    const H5O_pline_t *pline);
-static herr_t H5D__chunk_cinfo_cache_update(H5D_chunk_cached_t *last,
-    const H5D_chunk_ud_t *udata);
-static hbool_t H5D__chunk_cinfo_cache_found(const H5D_chunk_cached_t *last,
-    H5D_chunk_ud_t *udata);
-static herr_t H5D__free_chunk_info(void *item, void *key, void *opdata);
-static herr_t H5D__create_chunk_map_single(H5D_chunk_map_t *fm,
-    const H5D_io_info_t *io_info);
-static herr_t H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm,
-    const H5D_io_info_t *io_info);
-static herr_t H5D__create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm);
-static herr_t H5D__chunk_file_cb(void *elem, const H5T_t *type, unsigned ndims,
-    const hsize_t *coords, void *fm);
-static herr_t H5D__chunk_mem_cb(void *elem, const H5T_t *type, unsigned ndims,
-    const hsize_t *coords, void *fm);
-static herr_t H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id,
-    const H5D_dxpl_cache_t *dxpl_cache, H5D_rdcc_ent_t *ent, hbool_t reset);
-static herr_t H5D__chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id,
-    const H5D_dxpl_cache_t *dxpl_cache, H5D_rdcc_ent_t *ent, hbool_t flush);
-static herr_t H5D__chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id,
-    const H5D_dxpl_cache_t *dxpl_cache, size_t size);
-static herr_t H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata);
+static herr_t  H5D__chunk_set_info_real(H5O_layout_chunk_t *layout, unsigned ndims, const hsize_t *curr_dims);
+static void *  H5D__chunk_alloc(size_t size, const H5O_pline_t *pline);
+static void *  H5D__chunk_xfree(void *chk, const H5O_pline_t *pline);
+static void *  H5D__chunk_realloc(void *chk, size_t size, const H5O_pline_t *pline);
+static herr_t  H5D__chunk_cinfo_cache_update(H5D_chunk_cached_t *last, const H5D_chunk_ud_t *udata);
+static hbool_t H5D__chunk_cinfo_cache_found(const H5D_chunk_cached_t *last, H5D_chunk_ud_t *udata);
+static herr_t  H5D__free_chunk_info(void *item, void *key, void *opdata);
+static herr_t  H5D__create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info);
+static herr_t  H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info);
+static herr_t  H5D__create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm);
+static herr_t  H5D__chunk_file_cb(void *elem, const H5T_t *type, unsigned ndims, const hsize_t *coords,
+                                  void *fm);
+static herr_t  H5D__chunk_mem_cb(void *elem, const H5T_t *type, unsigned ndims, const hsize_t *coords,
+                                 void *fm);
+static herr_t  H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *dxpl_cache,
+                                      H5D_rdcc_ent_t *ent, hbool_t reset);
+static herr_t  H5D__chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *dxpl_cache,
+                                      H5D_rdcc_ent_t *ent, hbool_t flush);
+static herr_t  H5D__chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *dxpl_cache,
+                                      size_t size);
+static herr_t  H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata);
 #ifdef H5_HAVE_PARALLEL
-static herr_t H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id,
-    H5D_chunk_coll_info_t *chunk_info, size_t chunk_size, const void *fill_buf);
+static herr_t H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id, H5D_chunk_coll_info_t *chunk_info,
+                                         size_t chunk_size, const void *fill_buf);
 #endif /* H5_HAVE_PARALLEL */
 
-static int
-H5D__chunk_dump_index_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata);
+static int H5D__chunk_dump_index_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* Chunked storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_CHUNK[1] = {{
-    H5D__chunk_construct,
-    H5D__chunk_init,
-    H5D__chunk_is_space_alloc,
-    H5D__chunk_is_data_cached,
-    H5D__chunk_io_init,
-    H5D__chunk_read,
-    H5D__chunk_write,
+const H5D_layout_ops_t H5D_LOPS_CHUNK[1] = {{H5D__chunk_construct, H5D__chunk_init, H5D__chunk_is_space_alloc,
+                                             H5D__chunk_is_data_cached, H5D__chunk_io_init, H5D__chunk_read,
+                                             H5D__chunk_write,
 #ifdef H5_HAVE_PARALLEL
-    H5D__chunk_collective_read,
-    H5D__chunk_collective_write,
+                                             H5D__chunk_collective_read, H5D__chunk_collective_write,
 #endif /* H5_HAVE_PARALLEL */
-    NULL,
-    NULL,
-    H5D__chunk_flush,
-    H5D__chunk_io_term
-}};
-
+                                             NULL, NULL, H5D__chunk_flush, H5D__chunk_io_term}};
 
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* "nonexistent" storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_NONEXISTENT[1] = {{
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
+const H5D_layout_ops_t H5D_LOPS_NONEXISTENT[1] = {{NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 #ifdef H5_HAVE_PARALLEL
-    NULL,
-    NULL,
+                                                   NULL, NULL,
 #endif /* H5_HAVE_PARALLEL */
-    H5D__nonexistent_readvv,
-    NULL,
-    NULL,
-    NULL
-}};
+                                                   H5D__nonexistent_readvv, NULL, NULL, NULL}};
 
 /* Declare a free list to manage the H5F_rdcc_ent_ptr_t sequence information */
 H5FL_SEQ_DEFINE_STATIC(H5D_rdcc_ent_ptr_t);
@@ -306,7 +273,6 @@ H5FL_DEFINE(H5D_chunk_info_t);
 /* Declare a free list to manage the chunk sequence information */
 H5FL_BLK_DEFINE_STATIC(chunk);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_direct_write
  *
@@ -321,16 +287,16 @@ H5FL_BLK_DEFINE_STATIC(chunk);
  */
 herr_t
 H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsize_t *offset,
-     uint32_t data_size, const void *buf)
+                        uint32_t data_size, const void *buf)
 {
-    const H5O_layout_t *layout = &(dset->shared->layout);       /* Dataset layout */
-    H5D_chunk_ud_t udata;               /* User data for querying chunk info */
-    hsize_t chunk_idx;                  /* Index of chunk cache entry */
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    const H5D_rdcc_t       *rdcc = &(dset->shared->cache.chunk);    /*raw data chunk cache */
-    unsigned    space_ndims;            /* Dataset's space rank */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_layout_t *layout = &(dset->shared->layout);          /* Dataset layout */
+    H5D_chunk_ud_t      udata;                                     /* User data for querying chunk info */
+    hsize_t             chunk_idx;                                 /* Index of chunk cache entry */
+    H5D_dxpl_cache_t    _dxpl_cache;                               /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *  dxpl_cache = &_dxpl_cache;                 /* Data transfer property cache */
+    const H5D_rdcc_t *  rdcc       = &(dset->shared->cache.chunk); /*raw data chunk cache */
+    unsigned            space_ndims;                               /* Dataset's space rank */
+    herr_t              ret_value = SUCCEED;                       /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -338,21 +304,21 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz
     HDassert(layout->type == H5D_CHUNKED);
 
     /* Allocate data space and initialize it if it hasn't been. */
-    if(!H5D__chunk_is_space_alloc(&dset->shared->layout.storage))
+    if (!H5D__chunk_is_space_alloc(&dset->shared->layout.storage))
         /* Allocate storage */
-        if(H5D__alloc_storage(dset, dxpl_id, H5D_ALLOC_WRITE, FALSE, NULL) < 0)
+        if (H5D__alloc_storage(dset, dxpl_id, H5D_ALLOC_WRITE, FALSE, NULL) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize storage")
 
     /* Retrieve the dataset dimensions */
     space_ndims = dset->shared->layout.u.chunk.ndims - 1;
 
     /* Calculate the index of this chunk */
-    if(H5VM_chunk_index(space_ndims, offset,
-                        layout->u.chunk.dim, layout->u.chunk.down_chunks, &chunk_idx) < 0)
+    if (H5VM_chunk_index(space_ndims, offset, layout->u.chunk.dim, layout->u.chunk.down_chunks, &chunk_idx) <
+        0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't get chunk index")
 
     /* Find out the file address of the chunk */
-    if(H5D__chunk_lookup(dset, dxpl_id, offset, chunk_idx, &udata) < 0)
+    if (H5D__chunk_lookup(dset, dxpl_id, offset, chunk_idx, &udata) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
 
     udata.filter_mask = filters;
@@ -361,13 +327,13 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz
      *      the 'insert' operation could resize it)
      */
     {
-        H5D_chk_idx_info_t idx_info;        /* Chunked index info */
+        H5D_chk_idx_info_t idx_info; /* Chunked index info */
 
         /* Compose chunked index info struct */
-        idx_info.f = dset->oloc.file;
+        idx_info.f       = dset->oloc.file;
         idx_info.dxpl_id = dxpl_id;
-        idx_info.pline = &(dset->shared->dcpl_cache.pline);
-        idx_info.layout = &(dset->shared->layout.u.chunk);
+        idx_info.pline   = &(dset->shared->dcpl_cache.pline);
+        idx_info.layout  = &(dset->shared->layout.u.chunk);
         idx_info.storage = &(dset->shared->layout.storage.u.chunk);
 
         /* Set up the size of chunk for user data */
@@ -376,29 +342,29 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz
         /* Create the chunk it if it doesn't exist, or reallocate the chunk
          *  if its size changed.
          */
-        if((dset->shared->layout.storage.u.chunk.ops->insert)(&idx_info, &udata) < 0)
+        if ((dset->shared->layout.storage.u.chunk.ops->insert)(&idx_info, &udata) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert/resize chunk")
 
         /* Cache the new chunk information */
         H5D__chunk_cinfo_cache_update(&dset->shared->cache.chunk.last, &udata);
 
         /* Make sure the address of the chunk is returned. */
-        if(!H5F_addr_defined(udata.addr))
+        if (!H5F_addr_defined(udata.addr))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunk address isn't defined")
-     }
+    }
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Evict the entry from the cache if present, but do not flush
      * it to disk */
-    if(UINT_MAX != udata.idx_hint)
-        if(H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, rdcc->slot[udata.idx_hint], FALSE) < 0)
+    if (UINT_MAX != udata.idx_hint)
+        if (H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, rdcc->slot[udata.idx_hint], FALSE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTREMOVE, FAIL, "unable to evict chunk")
 
     /* Write the data to the file */
-    if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, data_size, dxpl_id, buf) < 0)
+    if (H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, data_size, dxpl_id, buf) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
 
 done:
@@ -418,18 +384,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset,
-    uint32_t* filters, void *buf)
+H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset, uint32_t *filters, void *buf)
 {
-    const H5O_layout_t *layout = &(dset->shared->layout);    /* Dataset layout */
-    const H5D_rdcc_t   *rdcc = &(dset->shared->cache.chunk); /* raw data chunk cache */
-    H5D_chunk_ud_t     udata;          /* User data for querying chunk info */
-    unsigned            space_ndims;    /* Dataset's space rank */
-    hsize_t            chunk_offset[H5O_LAYOUT_NDIMS]; /* Dataset's chunk offset */
-    hsize_t            chunk_idx;      /* Index of chunk cache entry */
-    H5D_dxpl_cache_t   _dxpl_cache;    /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t   *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
-    herr_t             ret_value = SUCCEED;        /* Return value */
+    const H5O_layout_t *layout = &(dset->shared->layout);      /* Dataset layout */
+    const H5D_rdcc_t *  rdcc   = &(dset->shared->cache.chunk); /* raw data chunk cache */
+    H5D_chunk_ud_t      udata;                                 /* User data for querying chunk info */
+    unsigned            space_ndims;                           /* Dataset's space rank */
+    hsize_t             chunk_offset[H5O_LAYOUT_NDIMS];        /* Dataset's chunk offset */
+    hsize_t             chunk_idx;                             /* Index of chunk cache entry */
+    H5D_dxpl_cache_t    _dxpl_cache;                           /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *  dxpl_cache = &_dxpl_cache;             /* Data transfer property cache */
+    herr_t              ret_value  = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -445,8 +410,7 @@ H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset,
     space_ndims = dset->shared->layout.u.chunk.ndims - 1;
 
     /* Check if chunk storage is allocated for dataset */
-    if((H5D__chunk_is_space_alloc(&(layout->storage)) == FALSE)
-            && !H5D__chunk_is_data_cached(dset->shared))
+    if ((H5D__chunk_is_space_alloc(&(layout->storage)) == FALSE) && !H5D__chunk_is_data_cached(dset->shared))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "storage is not initialized")
 
     /* Initialize the chunk offset */
@@ -454,24 +418,24 @@ H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset,
     chunk_offset[space_ndims] = (hsize_t)0;
 
     /* Calculate the index of this chunk */
-    if(H5VM_chunk_index(space_ndims, chunk_offset,
-                        layout->u.chunk.dim, layout->u.chunk.down_chunks, &chunk_idx) < 0)
+    if (H5VM_chunk_index(space_ndims, chunk_offset, layout->u.chunk.dim, layout->u.chunk.down_chunks,
+                         &chunk_idx) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't get chunk index")
 
     /* Reset fields about the chunk we are looking for */
-    udata.nbytes = 0;
+    udata.nbytes      = 0;
     udata.filter_mask = 0;
-    udata.addr = HADDR_UNDEF;
-    udata.idx_hint = UINT_MAX;
+    udata.addr        = HADDR_UNDEF;
+    udata.idx_hint    = UINT_MAX;
 
     /* Find out the file address of the chunk */
-    if(H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
+    if (H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
 
     /* Check if the requested chunk exists in the chunk cache */
-    if(UINT_MAX != udata.idx_hint) {
+    if (UINT_MAX != udata.idx_hint) {
         H5D_rdcc_ent_t *ent = rdcc->slot[udata.idx_hint];
-        hbool_t flush;
+        hbool_t         flush;
 
         /* Sanity checks  */
         HDassert(udata.idx_hint < rdcc->nslots);
@@ -480,30 +444,30 @@ H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset,
         flush = (ent->dirty == TRUE) ? TRUE : FALSE;
 
         /* Fill the DXPL cache values for later use */
-        if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+        if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
         /* Flush the chunk to disk and clear the cache entry */
-        if(H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, rdcc->slot[udata.idx_hint], flush) < 0)
+        if (H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, rdcc->slot[udata.idx_hint], flush) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTREMOVE, FAIL, "unable to evict chunk")
 
         /* Reset fields about the chunk we are looking for */
-        udata.nbytes = 0;
+        udata.nbytes      = 0;
         udata.filter_mask = 0;
-        udata.addr = HADDR_UNDEF;
-        udata.idx_hint = UINT_MAX;
+        udata.addr        = HADDR_UNDEF;
+        udata.idx_hint    = UINT_MAX;
 
         /* Get the new file address / chunk size after flushing */
-        if(H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
+        if (H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
     }
 
     /* Make sure the address of the chunk is returned. */
-    if(!H5F_addr_defined(udata.addr))
+    if (!H5F_addr_defined(udata.addr))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunk address isn't defined")
 
     /* Read the chunk data into the supplied buffer */
-    if(H5F_block_read(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.nbytes, dxpl_id, buf) < 0)
+    if (H5F_block_read(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.nbytes, dxpl_id, buf) < 0)
         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
 
     /* Return the filter mask */
@@ -528,16 +492,16 @@ done:
 herr_t
 H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, hsize_t *storage_size)
 {
-    const H5O_layout_t *layout = &(dset->shared->layout);    /* Dataset layout */
-    const H5D_rdcc_t   *rdcc = &(dset->shared->cache.chunk); /* raw data chunk cache */
-    H5D_chunk_ud_t     udata;          /* User data for querying chunk info */
-    unsigned           space_ndims;    /* Dataset's space rank */
-    hsize_t            chunk_offset[H5O_LAYOUT_NDIMS]; /* Dataset's chunk offset */
-    hsize_t            chunk_idx;      /* Index of chunk cache entry */
-    H5D_dxpl_cache_t   _dxpl_cache;    /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t   *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
-    hbool_t flush;                      /* Flush cache or not */
-    herr_t             ret_value = SUCCEED;        /* Return value */
+    const H5O_layout_t *layout = &(dset->shared->layout);      /* Dataset layout */
+    const H5D_rdcc_t *  rdcc   = &(dset->shared->cache.chunk); /* raw data chunk cache */
+    H5D_chunk_ud_t      udata;                                 /* User data for querying chunk info */
+    unsigned            space_ndims;                           /* Dataset's space rank */
+    hsize_t             chunk_offset[H5O_LAYOUT_NDIMS];        /* Dataset's chunk offset */
+    hsize_t             chunk_idx;                             /* Index of chunk cache entry */
+    H5D_dxpl_cache_t    _dxpl_cache;                           /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *  dxpl_cache = &_dxpl_cache;             /* Data transfer property cache */
+    hbool_t             flush;                                 /* Flush cache or not */
+    herr_t              ret_value = SUCCEED;                   /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -551,7 +515,7 @@ H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, h
     /* Retrieve the dataset dimensions */
     space_ndims = dset->shared->layout.u.chunk.ndims - 1;
 
-    if(H5D__chunk_is_space_alloc(&(layout->storage)) == FALSE)
+    if (H5D__chunk_is_space_alloc(&(layout->storage)) == FALSE)
         HGOTO_DONE(SUCCEED)
 
     /* Initialize the chunk offset */
@@ -559,27 +523,27 @@ H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, h
     chunk_offset[space_ndims] = (hsize_t)0;
 
     /* Calculate the index of this chunk */
-    if(H5VM_chunk_index(space_ndims, chunk_offset,
-                        layout->u.chunk.dim, layout->u.chunk.down_chunks, &chunk_idx) < 0)
+    if (H5VM_chunk_index(space_ndims, chunk_offset, layout->u.chunk.dim, layout->u.chunk.down_chunks,
+                         &chunk_idx) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't get chunk index")
 
     /* Reset fields about the chunk we are looking for */
-    udata.nbytes = 0;
-    udata.addr = HADDR_UNDEF;
+    udata.nbytes   = 0;
+    udata.addr     = HADDR_UNDEF;
     udata.idx_hint = UINT_MAX;
 
     /* Find out the file address of the chunk */
-    if(H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
+    if (H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
 
     /* The requested chunk is not in cache or on disk */
-    if(!H5F_addr_defined(udata.addr) && UINT_MAX == udata.idx_hint)
+    if (!H5F_addr_defined(udata.addr) && UINT_MAX == udata.idx_hint)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunk storage is not allocated")
 
     /* Check if there are filters registered to the dataset */
-    if( dset->shared->dcpl_cache.pline.nused > 0 ) {
+    if (dset->shared->dcpl_cache.pline.nused > 0) {
         /* Check if the requested chunk exists in the chunk cache */
-        if(UINT_MAX != udata.idx_hint) {
+        if (UINT_MAX != udata.idx_hint) {
             H5D_rdcc_ent_t *ent = rdcc->slot[udata.idx_hint];
 
             /* Sanity checks  */
@@ -589,25 +553,25 @@ H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, h
             flush = (ent->dirty == TRUE) ? TRUE : FALSE;
 
             /* Fill the DXPL cache values for later use */
-            if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+            if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
             /* Flush the chunk to disk and clear the cache entry */
-            if(H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, rdcc->slot[udata.idx_hint], flush) < 0)
+            if (H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, rdcc->slot[udata.idx_hint], flush) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTREMOVE, FAIL, "unable to evict chunk")
 
             /* Reset fields about the chunk we are looking for */
-            udata.nbytes = 0;
-            udata.addr = HADDR_UNDEF;
+            udata.nbytes   = 0;
+            udata.addr     = HADDR_UNDEF;
             udata.idx_hint = UINT_MAX;
 
             /* Get the new file address / chunk size after flushing */
-            if(H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
+            if (H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
         }
 
         /* Make sure the address of the chunk is returned. */
-        if(!H5F_addr_defined(udata.addr))
+        if (!H5F_addr_defined(udata.addr))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunk address isn't defined")
 
         /* Return the chunk size on disk */
@@ -621,8 +585,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__get_chunk_storage_size */
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_set_info_real
  *
@@ -638,8 +600,8 @@ done:
 static herr_t
 H5D__chunk_set_info_real(H5O_layout_chunk_t *layout, unsigned ndims, const hsize_t *curr_dims)
 {
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -649,23 +611,22 @@ H5D__chunk_set_info_real(H5O_layout_chunk_t *layout, unsigned ndims, const hsize
     HDassert(curr_dims);
 
     /* Compute the # of chunks in dataset dimensions */
-    for(u = 0, layout->nchunks = 1; u < ndims; u++) {
+    for (u = 0, layout->nchunks = 1; u < ndims; u++) {
         /* Round up to the next integer # of chunks, to accommodate partial chunks */
-    layout->chunks[u] = ((curr_dims[u] + layout->dim[u]) - 1) / layout->dim[u];
+        layout->chunks[u] = ((curr_dims[u] + layout->dim[u]) - 1) / layout->dim[u];
 
         /* Accumulate the # of chunks */
-    layout->nchunks *= layout->chunks[u];
+        layout->nchunks *= layout->chunks[u];
     } /* end for */
 
     /* Get the "down" sizes for each dimension */
-    if(H5VM_array_down(ndims, layout->chunks, layout->down_chunks) < 0)
+    if (H5VM_array_down(ndims, layout->chunks, layout->down_chunks) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't compute 'down' chunk size value")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_set_info_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_set_info
  *
@@ -681,10 +642,10 @@ done:
 herr_t
 H5D__chunk_set_info(const H5D_t *dset)
 {
-    hsize_t curr_dims[H5O_LAYOUT_NDIMS];    /* Curr. size of dataset dimensions */
-    int sndims;                 /* Rank of dataspace */
-    unsigned ndims;             /* Rank of dataspace */
-    herr_t ret_value = SUCCEED; /* Return value */
+    hsize_t  curr_dims[H5O_LAYOUT_NDIMS]; /* Curr. size of dataset dimensions */
+    int      sndims;                      /* Rank of dataspace */
+    unsigned ndims;                       /* Rank of dataspace */
+    herr_t   ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -692,23 +653,23 @@ H5D__chunk_set_info(const H5D_t *dset)
     HDassert(dset);
 
     /* Get the dim info for dataset */
-    if((sndims = H5S_get_simple_extent_dims(dset->shared->space, curr_dims, NULL)) < 0)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataspace dimensions")
+    if ((sndims = H5S_get_simple_extent_dims(dset->shared->space, curr_dims, NULL)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataspace dimensions")
     H5_CHECKED_ASSIGN(ndims, unsigned, sndims, int);
 
     /* Set the base layout information */
-    if(H5D__chunk_set_info_real(&dset->shared->layout.u.chunk, ndims, curr_dims) < 0)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set layout's chunk info")
+    if (H5D__chunk_set_info_real(&dset->shared->layout.u.chunk, ndims, curr_dims) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set layout's chunk info")
 
     /* Call the index's "resize" callback */
-    if(dset->shared->layout.storage.u.chunk.ops->resize && (dset->shared->layout.storage.u.chunk.ops->resize)(&dset->shared->layout.u.chunk) < 0)
+    if (dset->shared->layout.storage.u.chunk.ops->resize &&
+        (dset->shared->layout.storage.u.chunk.ops->resize)(&dset->shared->layout.u.chunk) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to resize chunk index information")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_set_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_construct
  *
@@ -724,13 +685,13 @@ done:
 static herr_t
 H5D__chunk_construct(H5F_t H5_ATTR_UNUSED *f, H5D_t *dset)
 {
-    const H5T_t *type = dset->shared->type;      /* Convenience pointer to dataset's datatype */
-    hsize_t max_dims[H5O_LAYOUT_NDIMS];          /* Maximum size of data in elements */
-    hsize_t dims[H5O_LAYOUT_NDIMS];              /* Dimension size of data in elements */
-    uint64_t chunk_size;        /* Size of chunk in bytes */
-    int ndims;                  /* Rank of dataspace */
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    const H5T_t *type = dset->shared->type;  /* Convenience pointer to dataset's datatype */
+    hsize_t      max_dims[H5O_LAYOUT_NDIMS]; /* Maximum size of data in elements */
+    hsize_t      dims[H5O_LAYOUT_NDIMS];     /* Dimension size of data in elements */
+    uint64_t     chunk_size;                 /* Size of chunk in bytes */
+    int          ndims;                      /* Rank of dataspace */
+    unsigned     u;                          /* Local index variable */
+    herr_t       ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -739,13 +700,13 @@ H5D__chunk_construct(H5F_t H5_ATTR_UNUSED *f, H5D_t *dset)
     HDassert(dset);
 
     /* Check for invalid chunk dimension rank */
-    if(0 == dset->shared->layout.u.chunk.ndims)
+    if (0 == dset->shared->layout.u.chunk.ndims)
         HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "no chunk information set?")
 
     /* Set up layout information */
-    if((ndims = H5S_GET_EXTENT_NDIMS(dset->shared->space)) < 0)
+    if ((ndims = H5S_GET_EXTENT_NDIMS(dset->shared->space)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to get rank")
-    if(dset->shared->layout.u.chunk.ndims != (unsigned)ndims)
+    if (dset->shared->layout.u.chunk.ndims != (unsigned)ndims)
         HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "dimensionality of chunks doesn't match the dataspace")
 
     /* Increment # of chunk dimensions, to account for datatype size as last element */
@@ -753,20 +714,20 @@ H5D__chunk_construct(H5F_t H5_ATTR_UNUSED *f, H5D_t *dset)
     HDassert((unsigned)(dset->shared->layout.u.chunk.ndims) <= NELMTS(dset->shared->layout.u.chunk.dim));
 
     /* Chunked storage is not compatible with external storage (currently) */
-    if(dset->shared->dcpl_cache.efl.nused > 0)
+    if (dset->shared->dcpl_cache.efl.nused > 0)
         HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "external storage not supported with chunked layout")
 
     /* Set the last dimension of the chunk size to the size of the datatype */
     dset->shared->layout.u.chunk.dim[dset->shared->layout.u.chunk.ndims - 1] = (uint32_t)H5T_GET_SIZE(type);
 
     /* Get local copy of dataset dimensions (for sanity checking) */
-    if(H5S_get_simple_extent_dims(dset->shared->space, dims, max_dims) < 0)
+    if (H5S_get_simple_extent_dims(dset->shared->space, dims, max_dims) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to query maximum dimensions")
 
     /* Sanity check dimensions */
-    for(u = 0; u < dset->shared->layout.u.chunk.ndims - 1; u++) {
+    for (u = 0; u < dset->shared->layout.u.chunk.ndims - 1; u++) {
         /* Don't allow zero-sized chunk dimensions */
-        if(0 == dset->shared->layout.u.chunk.dim[u])
+        if (0 == dset->shared->layout.u.chunk.dim[u])
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "chunk size must be > 0, dim = %u ", u)
 
         /*
@@ -774,32 +735,33 @@ H5D__chunk_construct(H5F_t H5_ATTR_UNUSED *f, H5D_t *dset)
          * the maximum dimension size. If any dimension size is zero, there
          * will be no such restriction.
          */
-        if(dims[u] && max_dims[u] != H5S_UNLIMITED && max_dims[u] < dset->shared->layout.u.chunk.dim[u])
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "chunk size must be <= maximum dimension size for fixed-sized dimensions")
+        if (dims[u] && max_dims[u] != H5S_UNLIMITED && max_dims[u] < dset->shared->layout.u.chunk.dim[u])
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                        "chunk size must be <= maximum dimension size for fixed-sized dimensions")
     } /* end for */
 
     /* Compute the total size of a chunk */
     /* (Use 64-bit value to ensure that we can detect >4GB chunks) */
-    for(u = 1, chunk_size = (uint64_t)dset->shared->layout.u.chunk.dim[0]; u < dset->shared->layout.u.chunk.ndims; u++)
+    for (u = 1, chunk_size = (uint64_t)dset->shared->layout.u.chunk.dim[0];
+         u < dset->shared->layout.u.chunk.ndims; u++)
         chunk_size *= (uint64_t)dset->shared->layout.u.chunk.dim[u];
 
     /* Check for chunk larger than can be represented in 32-bits */
     /* (Chunk size is encoded in 32-bit value in v1 B-tree records) */
-    if(chunk_size > (uint64_t)0xffffffff)
+    if (chunk_size > (uint64_t)0xffffffff)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "chunk size must be < 4GB")
 
     /* Retain computed chunk size */
     H5_CHECKED_ASSIGN(dset->shared->layout.u.chunk.size, uint32_t, chunk_size, uint64_t);
 
     /* Reset address and pointer of the array struct for the chunked storage index */
-    if(H5D_chunk_idx_reset(&dset->shared->layout.storage.u.chunk, TRUE) < 0)
+    if (H5D_chunk_idx_reset(&dset->shared->layout.storage.u.chunk, TRUE) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to reset chunked storage index")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_construct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_init
  *
@@ -816,10 +778,10 @@ done:
 herr_t
 H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id)
 {
-    H5D_chk_idx_info_t idx_info;        /* Chunked index info */
-    H5D_rdcc_t    *rdcc = &(dset->shared->cache.chunk);   /* Convenience pointer to dataset's chunk cache */
-    H5P_genplist_t *dapl;               /* Data access property list object pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5D_chk_idx_info_t idx_info;                            /* Chunked index info */
+    H5D_rdcc_t *       rdcc = &(dset->shared->cache.chunk); /* Convenience pointer to dataset's chunk cache */
+    H5P_genplist_t *   dapl;                                /* Data access property list object pointer */
+    herr_t             ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -827,31 +789,31 @@ H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id)
     HDassert(f);
     HDassert(dset);
 
-    if(NULL == (dapl = (H5P_genplist_t *)H5I_object(dapl_id)))
+    if (NULL == (dapl = (H5P_genplist_t *)H5I_object(dapl_id)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for fapl ID");
 
     /* Use the properties in dapl_id if they have been set, otherwise use the properties from the file */
-    if(H5P_get(dapl, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, &rdcc->nslots) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache number of slots");
-    if(rdcc->nslots == H5D_CHUNK_CACHE_NSLOTS_DEFAULT)
+    if (H5P_get(dapl, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, &rdcc->nslots) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get data cache number of slots");
+    if (rdcc->nslots == H5D_CHUNK_CACHE_NSLOTS_DEFAULT)
         rdcc->nslots = H5F_RDCC_NSLOTS(f);
 
-    if(H5P_get(dapl, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &rdcc->nbytes_max) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache byte size");
-    if(rdcc->nbytes_max == H5D_CHUNK_CACHE_NBYTES_DEFAULT)
+    if (H5P_get(dapl, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &rdcc->nbytes_max) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get data cache byte size");
+    if (rdcc->nbytes_max == H5D_CHUNK_CACHE_NBYTES_DEFAULT)
         rdcc->nbytes_max = H5F_RDCC_NBYTES(f);
 
-    if(H5P_get(dapl, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, &rdcc->w0) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks");
-    if(rdcc->w0 < 0)
+    if (H5P_get(dapl, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, &rdcc->w0) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get preempt read chunks");
+    if (rdcc->w0 < 0)
         rdcc->w0 = H5F_RDCC_W0(f);
 
     /* If nbytes_max or nslots is 0, set them both to 0 and avoid allocating space */
-    if(!rdcc->nbytes_max || !rdcc->nslots)
+    if (!rdcc->nbytes_max || !rdcc->nslots)
         rdcc->nbytes_max = rdcc->nslots = 0;
     else {
         rdcc->slot = H5FL_SEQ_CALLOC(H5D_rdcc_ent_ptr_t, rdcc->nslots);
-        if(NULL == rdcc->slot)
+        if (NULL == rdcc->slot)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Reset any cached chunk info for this dataset */
@@ -859,25 +821,25 @@ H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id)
     } /* end else */
 
     /* Compose chunked index info struct */
-    idx_info.f = f;
+    idx_info.f       = f;
     idx_info.dxpl_id = dxpl_id;
-    idx_info.pline = &dset->shared->dcpl_cache.pline;
-    idx_info.layout = &dset->shared->layout.u.chunk;
+    idx_info.pline   = &dset->shared->dcpl_cache.pline;
+    idx_info.layout  = &dset->shared->layout.u.chunk;
     idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
     /* Allocate any indexing structures */
-    if(dset->shared->layout.storage.u.chunk.ops->init && (dset->shared->layout.storage.u.chunk.ops->init)(&idx_info, dset->shared->space, dset->oloc.addr) < 0)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize indexing information")
+    if (dset->shared->layout.storage.u.chunk.ops->init &&
+        (dset->shared->layout.storage.u.chunk.ops->init)(&idx_info, dset->shared->space, dset->oloc.addr) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize indexing information")
 
     /* Set the number of chunks in dataset, etc. */
-    if(H5D__chunk_set_info(dset) < 0)
+    if (H5D__chunk_set_info(dset) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set # of chunks for dataset")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_is_space_alloc
  *
@@ -893,7 +855,7 @@ done:
 hbool_t
 H5D__chunk_is_space_alloc(const H5O_storage_t *storage)
 {
-    hbool_t ret_value;                  /* Return value */
+    hbool_t ret_value; /* Return value */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -906,7 +868,6 @@ H5D__chunk_is_space_alloc(const H5O_storage_t *storage)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_is_space_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_is_data_cached
  *
@@ -930,7 +891,6 @@ H5D__chunk_is_data_cached(const H5D_shared_t *shared_dset)
     FUNC_LEAVE_NOAPI(shared_dset->cache.chunk.nused > 0)
 } /* end H5D__chunk_is_data_cached() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_io_init
  *
@@ -944,24 +904,23 @@ H5D__chunk_is_data_cached(const H5D_shared_t *shared_dset)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm)
+H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                   const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t *fm)
 {
-    const H5D_t *dataset = io_info->dset;     /* Local pointer to dataset info */
-    const H5T_t *mem_type = type_info->mem_type;        /* Local pointer to memory datatype */
-    H5S_t *tmp_mspace = NULL;   /* Temporary memory dataspace */
-    hssize_t old_offset[H5O_LAYOUT_NDIMS];  /* Old selection offset */
-    htri_t file_space_normalized = FALSE;   /* File dataspace was normalized */
-    H5T_t *file_type = NULL;    /* Temporary copy of file datatype for iteration */
-    hbool_t iter_init = FALSE;  /* Selection iteration info has been initialized */
-    unsigned f_ndims;           /* The number of dimensions of the file's dataspace */
-    int sm_ndims;               /* The number of dimensions of the memory buffer's dataspace (signed) */
-    H5SL_node_t *curr_node;     /* Current node in skip list */
-    H5S_sel_type fsel_type;     /* Selection type on disk */
-    char bogus;                 /* "bogus" buffer to pass to selection iterator */
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value = SUCCEED;    /* Return value        */
+    const H5D_t *dataset    = io_info->dset;       /* Local pointer to dataset info */
+    const H5T_t *mem_type   = type_info->mem_type; /* Local pointer to memory datatype */
+    H5S_t *      tmp_mspace = NULL;                /* Temporary memory dataspace */
+    hssize_t     old_offset[H5O_LAYOUT_NDIMS];     /* Old selection offset */
+    htri_t       file_space_normalized = FALSE;    /* File dataspace was normalized */
+    H5T_t *      file_type             = NULL;     /* Temporary copy of file datatype for iteration */
+    hbool_t      iter_init             = FALSE;    /* Selection iteration info has been initialized */
+    unsigned     f_ndims;                          /* The number of dimensions of the file's dataspace */
+    int          sm_ndims;            /* The number of dimensions of the memory buffer's dataspace (signed) */
+    H5SL_node_t *curr_node;           /* Current node in skip list */
+    H5S_sel_type fsel_type;           /* Selection type on disk */
+    char         bogus;               /* "bogus" buffer to pass to selection iterator */
+    unsigned     u;                   /* Local index variable */
+    herr_t       ret_value = SUCCEED; /* Return value        */
 
     FUNC_ENTER_STATIC
 
@@ -970,14 +929,14 @@ H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
     fm->nelmts = nelmts;
 
     /* Check if the memory space is scalar & make equivalent memory space */
-    if((sm_ndims = H5S_GET_EXTENT_NDIMS(mem_space)) < 0)
+    if ((sm_ndims = H5S_GET_EXTENT_NDIMS(mem_space)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimension number")
     /* Set the number of dimensions for the memory dataspace */
     H5_CHECKED_ASSIGN(fm->m_ndims, unsigned, sm_ndims, int);
 
     /* Get dim number and dimensionality for each dataspace */
     fm->f_ndims = f_ndims = dataset->shared->layout.u.chunk.ndims - 1;
-    if(H5S_get_simple_extent_dims(file_space, fm->f_dims, NULL) < 0)
+    if (H5S_get_simple_extent_dims(file_space, fm->f_dims, NULL) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimensionality")
 
     /* Normalize hyperslab selections by adjusting them by the offset */
@@ -986,11 +945,11 @@ H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
      * speed up hyperslab calculations by removing the extra checks and/or
      * additions involving the offset and the hyperslab selection -QAK)
      */
-    if((file_space_normalized = H5S_hyper_normalize_offset((H5S_t *)file_space, old_offset)) < 0)
+    if ((file_space_normalized = H5S_hyper_normalize_offset((H5S_t *)file_space, old_offset)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to normalize dataspace by offset")
 
     /* Decide the number of chunks in each dimension*/
-    for(u = 0; u < f_ndims; u++) {
+    for (u = 0; u < f_ndims; u++) {
         /* Keep the size of the chunk dimensions as hsize_t for various routines */
         fm->chunk_dim[u] = fm->layout->u.chunk.dim[u];
     } /* end for */
@@ -998,55 +957,55 @@ H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
 #ifdef H5_HAVE_PARALLEL
     /* Calculate total chunk in file map*/
     fm->select_chunk = NULL;
-    if(io_info->using_mpi_vfd) {
+    if (io_info->using_mpi_vfd) {
         H5_CHECK_OVERFLOW(fm->layout->u.chunk.nchunks, hsize_t, size_t);
-        if(fm->layout->u.chunk.nchunks) {
-            if(NULL == (fm->select_chunk = (H5D_chunk_info_t **)H5MM_calloc((size_t)fm->layout->u.chunk.nchunks * sizeof(H5D_chunk_info_t *))))
+        if (fm->layout->u.chunk.nchunks) {
+            if (NULL == (fm->select_chunk = (H5D_chunk_info_t **)H5MM_calloc(
+                             (size_t)fm->layout->u.chunk.nchunks * sizeof(H5D_chunk_info_t *))))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
         }
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
-
     /* Initialize "last chunk" information */
-    fm->last_index = (hsize_t)-1;
+    fm->last_index      = (hsize_t)-1;
     fm->last_chunk_info = NULL;
 
     /* Point at the dataspaces */
     fm->file_space = file_space;
-    fm->mem_space = mem_space;
+    fm->mem_space  = mem_space;
 
     /* Special case for only one element in selection */
     /* (usually appending a record) */
-    if(nelmts == 1
+    if (nelmts == 1
 #ifdef H5_HAVE_PARALLEL
-            && !(io_info->using_mpi_vfd)
+        && !(io_info->using_mpi_vfd)
 #endif /* H5_HAVE_PARALLEL */
-            && H5S_SEL_ALL != H5S_GET_SELECT_TYPE(file_space)) {
+        && H5S_SEL_ALL != H5S_GET_SELECT_TYPE(file_space)) {
         /* Initialize skip list for chunk selections */
         fm->sel_chunks = NULL;
         fm->use_single = TRUE;
 
         /* Initialize single chunk dataspace */
-        if(NULL == dataset->shared->cache.chunk.single_space) {
+        if (NULL == dataset->shared->cache.chunk.single_space) {
             /* Make a copy of the dataspace for the dataset */
-            if((dataset->shared->cache.chunk.single_space = H5S_copy(file_space, TRUE, FALSE)) == NULL)
+            if ((dataset->shared->cache.chunk.single_space = H5S_copy(file_space, TRUE, FALSE)) == NULL)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file space")
 
             /* Resize chunk's dataspace dimensions to size of chunk */
-            if(H5S_set_extent_real(dataset->shared->cache.chunk.single_space, fm->chunk_dim) < 0)
+            if (H5S_set_extent_real(dataset->shared->cache.chunk.single_space, fm->chunk_dim) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "can't adjust chunk dimensions")
 
             /* Set the single chunk dataspace to 'all' selection */
-            if(H5S_select_all(dataset->shared->cache.chunk.single_space, TRUE) < 0)
+            if (H5S_select_all(dataset->shared->cache.chunk.single_space, TRUE) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "unable to set all selection")
         } /* end if */
         fm->single_space = dataset->shared->cache.chunk.single_space;
         HDassert(fm->single_space);
 
         /* Allocate the single chunk information */
-        if(NULL == dataset->shared->cache.chunk.single_chunk_info) {
-            if(NULL == (dataset->shared->cache.chunk.single_chunk_info = H5FL_MALLOC(H5D_chunk_info_t)))
+        if (NULL == dataset->shared->cache.chunk.single_chunk_info) {
+            if (NULL == (dataset->shared->cache.chunk.single_chunk_info = H5FL_MALLOC(H5D_chunk_info_t)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
         } /* end if */
         fm->single_chunk_info = dataset->shared->cache.chunk.single_chunk_info;
@@ -1056,15 +1015,16 @@ H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
         fm->mchunk_tmpl = NULL;
 
         /* Set up chunk mapping for single element */
-        if(H5D__create_chunk_map_single(fm, io_info) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create chunk selections for single element")
+        if (H5D__create_chunk_map_single(fm, io_info) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                        "unable to create chunk selections for single element")
     } /* end if */
     else {
-        hbool_t sel_hyper_flag;         /* Whether file selection is a hyperslab */
+        hbool_t sel_hyper_flag; /* Whether file selection is a hyperslab */
 
         /* Initialize skip list for chunk selections */
-        if(NULL == dataset->shared->cache.chunk.sel_chunks) {
-            if(NULL == (dataset->shared->cache.chunk.sel_chunks = H5SL_create(H5SL_TYPE_HSIZE, NULL)))
+        if (NULL == dataset->shared->cache.chunk.sel_chunks) {
+            if (NULL == (dataset->shared->cache.chunk.sel_chunks = H5SL_create(H5SL_TYPE_HSIZE, NULL)))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "can't create skip list for chunk selections")
         } /* end if */
         fm->sel_chunks = dataset->shared->cache.chunk.sel_chunks;
@@ -1074,46 +1034,46 @@ H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
         fm->use_single = FALSE;
 
         /* Get type of selection on disk & in memory */
-        if((fsel_type = H5S_GET_SELECT_TYPE(file_space)) < H5S_SEL_NONE)
+        if ((fsel_type = H5S_GET_SELECT_TYPE(file_space)) < H5S_SEL_NONE)
             HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to get type of selection")
-        if((fm->msel_type = H5S_GET_SELECT_TYPE(mem_space)) < H5S_SEL_NONE)
+        if ((fm->msel_type = H5S_GET_SELECT_TYPE(mem_space)) < H5S_SEL_NONE)
             HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to get type of selection")
 
         /* If the selection is NONE or POINTS, set the flag to FALSE */
-        if(fsel_type == H5S_SEL_POINTS || fsel_type == H5S_SEL_NONE)
+        if (fsel_type == H5S_SEL_POINTS || fsel_type == H5S_SEL_NONE)
             sel_hyper_flag = FALSE;
         else
             sel_hyper_flag = TRUE;
 
         /* Check if file selection is a not a hyperslab selection */
-        if(sel_hyper_flag) {
+        if (sel_hyper_flag) {
             /* Build the file selection for each chunk */
-            if(H5D__create_chunk_file_map_hyper(fm, io_info) < 0)
+            if (H5D__create_chunk_file_map_hyper(fm, io_info) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create file chunk selections")
 
             /* Clean file chunks' hyperslab span "scratch" information */
             curr_node = H5SL_first(fm->sel_chunks);
-            while(curr_node) {
-                H5D_chunk_info_t *chunk_info;   /* Pointer chunk information */
+            while (curr_node) {
+                H5D_chunk_info_t *chunk_info; /* Pointer chunk information */
 
                 /* Get pointer to chunk's information */
                 chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
                 HDassert(chunk_info);
 
                 /* Clean hyperslab span's "scratch" information */
-                if(H5S_hyper_reset_scratch(chunk_info->fspace) < 0)
+                if (H5S_hyper_reset_scratch(chunk_info->fspace) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to reset span scratch info")
 
                 /* Get the next chunk node in the skip list */
                 curr_node = H5SL_next(curr_node);
             } /* end while */
-        } /* end if */
+        }     /* end if */
         else {
-            H5S_sel_iter_op_t iter_op;  /* Operator for iteration */
-            H5D_chunk_file_iter_ud_t udata;     /* User data for iteration */
+            H5S_sel_iter_op_t        iter_op; /* Operator for iteration */
+            H5D_chunk_file_iter_ud_t udata;   /* User data for iteration */
 
             /* Create temporary datatypes for selection iteration */
-            if(NULL == (file_type = H5T_copy(dataset->shared->type, H5T_COPY_ALL)))
+            if (NULL == (file_type = H5T_copy(dataset->shared->type, H5T_COPY_ALL)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, FAIL, "unable to copy file datatype")
 
             /* Initialize the user data */
@@ -1122,116 +1082,116 @@ H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
             udata.io_info = io_info;
 #endif /* H5_HAVE_PARALLEL */
 
-            iter_op.op_type = H5S_SEL_ITER_OP_LIB;
+            iter_op.op_type  = H5S_SEL_ITER_OP_LIB;
             iter_op.u.lib_op = H5D__chunk_file_cb;
 
             /* Spaces might not be the same shape, iterate over the file selection directly */
-            if(H5S_select_iterate(&bogus, file_type, file_space, &iter_op, &udata) < 0)
+            if (H5S_select_iterate(&bogus, file_type, file_space, &iter_op, &udata) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create file chunk selections")
 
             /* Reset "last chunk" info */
-            fm->last_index = (hsize_t)-1;
+            fm->last_index      = (hsize_t)-1;
             fm->last_chunk_info = NULL;
         } /* end else */
 
         /* Build the memory selection for each chunk */
-        if(sel_hyper_flag && H5S_select_shape_same(file_space, mem_space) == TRUE) {
+        if (sel_hyper_flag && H5S_select_shape_same(file_space, mem_space) == TRUE) {
             /* Reset chunk template information */
             fm->mchunk_tmpl = NULL;
 
             /* If the selections are the same shape, use the file chunk information
              * to generate the memory chunk information quickly.
              */
-            if(H5D__create_chunk_mem_map_hyper(fm) < 0)
+            if (H5D__create_chunk_mem_map_hyper(fm) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create memory chunk selections")
         } /* end if */
         else {
-            H5S_sel_iter_op_t iter_op;  /* Operator for iteration */
-            size_t elmt_size;           /* Memory datatype size */
+            H5S_sel_iter_op_t iter_op;   /* Operator for iteration */
+            size_t            elmt_size; /* Memory datatype size */
 
             /* Make a copy of equivalent memory space */
-            if((tmp_mspace = H5S_copy(mem_space, TRUE, FALSE)) == NULL)
+            if ((tmp_mspace = H5S_copy(mem_space, TRUE, FALSE)) == NULL)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
 
             /* De-select the mem space copy */
-            if(H5S_select_none(tmp_mspace) < 0)
+            if (H5S_select_none(tmp_mspace) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to de-select memory space")
 
             /* Save chunk template information */
             fm->mchunk_tmpl = tmp_mspace;
 
             /* Create temporary datatypes for selection iteration */
-            if(!file_type) {
-                if(NULL == (file_type = H5T_copy(dataset->shared->type, H5T_COPY_ALL)))
+            if (!file_type) {
+                if (NULL == (file_type = H5T_copy(dataset->shared->type, H5T_COPY_ALL)))
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, FAIL, "unable to copy file datatype")
             } /* end if */
 
             /* Create selection iterator for memory selection */
-            if(0 == (elmt_size = H5T_get_size(mem_type)))
+            if (0 == (elmt_size = H5T_get_size(mem_type)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADSIZE, FAIL, "datatype size invalid")
-            if(H5S_select_iter_init(&(fm->mem_iter), mem_space, elmt_size) < 0)
+            if (H5S_select_iter_init(&(fm->mem_iter), mem_space, elmt_size) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
-            iter_init = TRUE;    /* Selection iteration info has been initialized */
+            iter_init = TRUE; /* Selection iteration info has been initialized */
 
-            iter_op.op_type = H5S_SEL_ITER_OP_LIB;
+            iter_op.op_type  = H5S_SEL_ITER_OP_LIB;
             iter_op.u.lib_op = H5D__chunk_mem_cb;
 
             /* Spaces aren't the same shape, iterate over the memory selection directly */
-            if(H5S_select_iterate(&bogus, file_type, file_space, &iter_op, fm) < 0)
+            if (H5S_select_iterate(&bogus, file_type, file_space, &iter_op, fm) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create memory chunk selections")
 
             /* Clean up hyperslab stuff, if necessary */
-            if(fm->msel_type != H5S_SEL_POINTS) {
+            if (fm->msel_type != H5S_SEL_POINTS) {
                 /* Clean memory chunks' hyperslab span "scratch" information */
                 curr_node = H5SL_first(fm->sel_chunks);
-                while(curr_node) {
-                    H5D_chunk_info_t *chunk_info;   /* Pointer chunk information */
+                while (curr_node) {
+                    H5D_chunk_info_t *chunk_info; /* Pointer chunk information */
 
                     /* Get pointer to chunk's information */
                     chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
                     HDassert(chunk_info);
 
                     /* Clean hyperslab span's "scratch" information */
-                    if(H5S_hyper_reset_scratch(chunk_info->mspace) < 0)
+                    if (H5S_hyper_reset_scratch(chunk_info->mspace) < 0)
                         HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to reset span scratch info")
 
                     /* Get the next chunk node in the skip list */
                     curr_node = H5SL_next(curr_node);
                 } /* end while */
-            } /* end if */
-        } /* end else */
-    } /* end else */
+            }     /* end if */
+        }         /* end else */
+    }             /* end else */
 
 done:
     /* Release the [potentially partially built] chunk mapping information if an error occurs */
-    if(ret_value < 0) {
-        if(tmp_mspace && !fm->mchunk_tmpl) {
-            if(H5S_close(tmp_mspace) < 0)
-                HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "can't release memory chunk dataspace template")
+    if (ret_value < 0) {
+        if (tmp_mspace && !fm->mchunk_tmpl) {
+            if (H5S_close(tmp_mspace) < 0)
+                HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL,
+                            "can't release memory chunk dataspace template")
         } /* end if */
 
-        if(H5D__chunk_io_term(fm) < 0)
+        if (H5D__chunk_io_term(fm) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release chunk mapping")
     } /* end if */
 
     /* Reset the global dataspace info */
     fm->file_space = NULL;
-    fm->mem_space = NULL;
+    fm->mem_space  = NULL;
 
-    if(iter_init && H5S_SELECT_ITER_RELEASE(&(fm->mem_iter)) < 0)
+    if (iter_init && H5S_SELECT_ITER_RELEASE(&(fm->mem_iter)) < 0)
         HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
-    if(file_type && (H5T_close(file_type) < 0))
+    if (file_type && (H5T_close(file_type) < 0))
         HDONE_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "Can't free temporary datatype")
-    if(file_space_normalized) {
+    if (file_space_normalized) {
         /* (Casting away const OK -QAK) */
-        if(H5S_hyper_denormalize_offset((H5S_t *)file_space, old_offset) < 0)
+        if (H5S_hyper_denormalize_offset((H5S_t *)file_space, old_offset) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to normalize dataspace by offset")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_io_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_alloc
  *
@@ -1249,14 +1209,14 @@ done:
 static void *
 H5D__chunk_alloc(size_t size, const H5O_pline_t *pline)
 {
-    void *ret_value = NULL;        /* Return value */
+    void *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
     HDassert(size);
     HDassert(pline);
 
-    if(pline->nused > 0)
+    if (pline->nused > 0)
         ret_value = H5MM_malloc(size);
     else
         ret_value = H5FL_BLK_MALLOC(chunk, size);
@@ -1264,7 +1224,6 @@ H5D__chunk_alloc(size_t size, const H5O_pline_t *pline)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_xfree
  *
@@ -1286,8 +1245,8 @@ H5D__chunk_xfree(void *chk, const H5O_pline_t *pline)
 
     HDassert(pline);
 
-    if(chk) {
-        if(pline->nused > 0)
+    if (chk) {
+        if (pline->nused > 0)
             H5MM_xfree(chk);
         else
             chk = H5FL_BLK_FREE(chunk, chk);
@@ -1296,7 +1255,6 @@ H5D__chunk_xfree(void *chk, const H5O_pline_t *pline)
     FUNC_LEAVE_NOAPI(NULL)
 } /* H5D__chunk_xfree() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_realloc
  *
@@ -1314,14 +1272,14 @@ H5D__chunk_xfree(void *chk, const H5O_pline_t *pline)
 static void *
 H5D__chunk_realloc(void *chk, size_t size, const H5O_pline_t *pline)
 {
-    void *ret_value = NULL;             /* Return value */
+    void *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
     HDassert(size);
     HDassert(pline);
 
-    if(pline->nused > 0)
+    if (pline->nused > 0)
         ret_value = H5MM_realloc(chk, size);
     else
         ret_value = H5FL_BLK_REALLOC(chunk, chk, size);
@@ -1329,7 +1287,6 @@ H5D__chunk_realloc(void *chk, size_t size, const H5O_pline_t *pline)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_realloc() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5D__free_chunk_info
@@ -1357,22 +1314,21 @@ H5D__free_chunk_info(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *
     HDassert(chunk_info);
 
     /* Close the chunk's file dataspace, if it's not shared */
-    if(!chunk_info->fspace_shared)
+    if (!chunk_info->fspace_shared)
         (void)H5S_close(chunk_info->fspace);
     else
         H5S_select_all(chunk_info->fspace, TRUE);
 
     /* Close the chunk's memory dataspace, if it's not shared */
-    if(!chunk_info->mspace_shared && chunk_info->mspace)
+    if (!chunk_info->mspace_shared && chunk_info->mspace)
         (void)H5S_close(chunk_info->mspace);
 
     /* Free the actual chunk info */
     chunk_info = H5FL_FREE(H5D_chunk_info_t, chunk_info);
 
     FUNC_LEAVE_NOAPI(0)
-}   /* H5D__free_chunk_info() */
+} /* H5D__free_chunk_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__create_chunk_map_single
  *
@@ -1388,15 +1344,15 @@ H5D__free_chunk_info(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *
 static herr_t
 H5D__create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t
 #ifndef H5_HAVE_PARALLEL
-    H5_ATTR_UNUSED
+                                                      H5_ATTR_UNUSED
 #endif /* H5_HAVE_PARALLEL */
-    *io_info)
+                                                          *io_info)
 {
-    H5D_chunk_info_t *chunk_info;           /* Chunk information to insert into skip list */
-    hsize_t     sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
-    hsize_t     sel_end[H5O_LAYOUT_NDIMS];  /* Offset of high bound of file selection */
-    unsigned    u;                          /* Local index variable */
-    herr_t    ret_value = SUCCEED;        /* Return value */
+    H5D_chunk_info_t *chunk_info;                  /* Chunk information to insert into skip list */
+    hsize_t           sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
+    hsize_t           sel_end[H5O_LAYOUT_NDIMS];   /* Offset of high bound of file selection */
+    unsigned          u;                           /* Local index variable */
+    herr_t            ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1404,35 +1360,36 @@ H5D__create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t
     HDassert(fm->f_ndims > 0);
 
     /* Get coordinate for selection */
-    if(H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
+    if (H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
 
     /* Initialize the 'single chunk' file & memory chunk information */
-    chunk_info = fm->single_chunk_info;
+    chunk_info               = fm->single_chunk_info;
     chunk_info->chunk_points = 1;
 
     /* Set chunk location & hyperslab size */
-    for(u = 0; u < fm->f_ndims; u++) {
+    for (u = 0; u < fm->f_ndims; u++) {
         HDassert(sel_start[u] == sel_end[u]);
         chunk_info->coords[u] = (sel_start[u] / fm->layout->u.chunk.dim[u]) * fm->layout->u.chunk.dim[u];
     } /* end for */
     chunk_info->coords[fm->f_ndims] = 0;
 
     /* Calculate the index of this chunk */
-    if(H5VM_chunk_index(fm->f_ndims, chunk_info->coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_info->index) < 0)
+    if (H5VM_chunk_index(fm->f_ndims, chunk_info->coords, fm->layout->u.chunk.dim,
+                         fm->layout->u.chunk.down_chunks, &chunk_info->index) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
 
     /* Copy selection for file's dataspace into chunk dataspace */
-    if(H5S_select_copy(fm->single_space, fm->file_space, FALSE) < 0)
+    if (H5S_select_copy(fm->single_space, fm->file_space, FALSE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file selection")
 
     /* Move selection back to have correct offset in chunk */
-    if(H5S_SELECT_ADJUST_U(fm->single_space, chunk_info->coords) < 0)
+    if (H5S_SELECT_ADJUST_U(fm->single_space, chunk_info->coords) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
 
 #ifdef H5_HAVE_PARALLEL
     /* store chunk selection information */
-    if(io_info->using_mpi_vfd)
+    if (io_info->using_mpi_vfd)
         fm->select_chunk[chunk_info->index] = chunk_info;
 #endif /* H5_HAVE_PARALLEL */
 
@@ -1453,7 +1410,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__create_chunk_map_single() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__create_chunk_file_map_hyper
  *
@@ -1469,77 +1425,78 @@ done:
 static herr_t
 H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
 #ifndef H5_HAVE_PARALLEL
-    H5_ATTR_UNUSED
+                                                          H5_ATTR_UNUSED
 #endif /* H5_HAVE_PARALLEL */
-    *io_info)
+                                                              *io_info)
 {
-    hsize_t     sel_start[H5O_LAYOUT_NDIMS];   /* Offset of low bound of file selection */
-    hsize_t     sel_end[H5O_LAYOUT_NDIMS];   /* Offset of high bound of file selection */
-    hsize_t     sel_points;                 /* Number of elements in file selection */
-    hsize_t     start_coords[H5O_LAYOUT_NDIMS];   /* Starting coordinates of selection */
-    hsize_t     coords[H5O_LAYOUT_NDIMS];   /* Current coordinates of chunk */
-    hsize_t     end[H5O_LAYOUT_NDIMS];      /* Current coordinates of chunk */
-    hsize_t     chunk_index;                /* Index of chunk */
-    int         curr_dim;                   /* Current dimension to increment */
-    unsigned    u;                          /* Local index variable */
-    herr_t    ret_value = SUCCEED;        /* Return value */
+    hsize_t  sel_start[H5O_LAYOUT_NDIMS];    /* Offset of low bound of file selection */
+    hsize_t  sel_end[H5O_LAYOUT_NDIMS];      /* Offset of high bound of file selection */
+    hsize_t  sel_points;                     /* Number of elements in file selection */
+    hsize_t  start_coords[H5O_LAYOUT_NDIMS]; /* Starting coordinates of selection */
+    hsize_t  coords[H5O_LAYOUT_NDIMS];       /* Current coordinates of chunk */
+    hsize_t  end[H5O_LAYOUT_NDIMS];          /* Current coordinates of chunk */
+    hsize_t  chunk_index;                    /* Index of chunk */
+    int      curr_dim;                       /* Current dimension to increment */
+    unsigned u;                              /* Local index variable */
+    herr_t   ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Sanity check */
-    HDassert(fm->f_ndims>0);
+    HDassert(fm->f_ndims > 0);
 
     /* Get number of elements selected in file */
     sel_points = fm->nelmts;
 
     /* Get bounding box for selection (to reduce the number of chunks to iterate over) */
-    if(H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
+    if (H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
 
     /* Set initial chunk location & hyperslab size */
-    for(u = 0; u < fm->f_ndims; u++) {
+    for (u = 0; u < fm->f_ndims; u++) {
         start_coords[u] = (sel_start[u] / fm->layout->u.chunk.dim[u]) * fm->layout->u.chunk.dim[u];
-        coords[u] = start_coords[u];
-        end[u] = (coords[u] + fm->chunk_dim[u]) - 1;
+        coords[u]       = start_coords[u];
+        end[u]          = (coords[u] + fm->chunk_dim[u]) - 1;
     } /* end for */
 
     /* Calculate the index of this chunk */
-    if(H5VM_chunk_index(fm->f_ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
+    if (H5VM_chunk_index(fm->f_ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks,
+                         &chunk_index) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
 
     /* Iterate through each chunk in the dataset */
-    while(sel_points) {
+    while (sel_points) {
         /* Check for intersection of temporary chunk and file selection */
         /* (Casting away const OK - QAK) */
-        if(TRUE == H5S_hyper_intersect_block((H5S_t *)fm->file_space, coords, end)) {
-            H5S_t *tmp_fchunk;                  /* Temporary file dataspace */
-            H5D_chunk_info_t *new_chunk_info;   /* chunk information to insert into skip list */
-            hssize_t    schunk_points;          /* Number of elements in chunk selection */
+        if (TRUE == H5S_hyper_intersect_block((H5S_t *)fm->file_space, coords, end)) {
+            H5S_t *           tmp_fchunk;     /* Temporary file dataspace */
+            H5D_chunk_info_t *new_chunk_info; /* chunk information to insert into skip list */
+            hssize_t          schunk_points;  /* Number of elements in chunk selection */
 
             /* Create "temporary" chunk for selection operations (copy file space) */
-            if(NULL == (tmp_fchunk = H5S_copy(fm->file_space, TRUE, FALSE)))
+            if (NULL == (tmp_fchunk = H5S_copy(fm->file_space, TRUE, FALSE)))
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
 
             /* Make certain selections are stored in span tree form (not "optimized hyperslab" or "all") */
-            if(H5S_hyper_convert(tmp_fchunk) < 0) {
+            if (H5S_hyper_convert(tmp_fchunk) < 0) {
                 (void)H5S_close(tmp_fchunk);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to convert selection to span trees")
             } /* end if */
 
             /* "AND" temporary chunk and current chunk */
-            if(H5S_select_hyperslab(tmp_fchunk,H5S_SELECT_AND,coords,NULL,fm->chunk_dim,NULL) < 0) {
+            if (H5S_select_hyperslab(tmp_fchunk, H5S_SELECT_AND, coords, NULL, fm->chunk_dim, NULL) < 0) {
                 (void)H5S_close(tmp_fchunk);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't create chunk selection")
             } /* end if */
 
             /* Resize chunk's dataspace dimensions to size of chunk */
-            if(H5S_set_extent_real(tmp_fchunk,fm->chunk_dim) < 0) {
+            if (H5S_set_extent_real(tmp_fchunk, fm->chunk_dim) < 0) {
                 (void)H5S_close(tmp_fchunk);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk dimensions")
             } /* end if */
 
             /* Move selection back to have correct offset in chunk */
-            if(H5S_SELECT_ADJUST_U(tmp_fchunk, coords) < 0) {
+            if (H5S_SELECT_ADJUST_U(tmp_fchunk, coords) < 0) {
                 (void)H5S_close(tmp_fchunk);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
             } /* end if */
@@ -1547,7 +1504,7 @@ H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
             /* Add temporary chunk to the list of chunks */
 
             /* Allocate the file & memory chunk information */
-            if (NULL==(new_chunk_info = H5FL_MALLOC(H5D_chunk_info_t))) {
+            if (NULL == (new_chunk_info = H5FL_MALLOC(H5D_chunk_info_t))) {
                 (void)H5S_close(tmp_fchunk);
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
             } /* end if */
@@ -1555,20 +1512,20 @@ H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
             /* Initialize the chunk information */
 
             /* Set the chunk index */
-            new_chunk_info->index=chunk_index;
+            new_chunk_info->index = chunk_index;
 
 #ifdef H5_HAVE_PARALLEL
             /* Store chunk selection information, for multi-chunk I/O */
-            if(io_info->using_mpi_vfd)
+            if (io_info->using_mpi_vfd)
                 fm->select_chunk[chunk_index] = new_chunk_info;
 #endif /* H5_HAVE_PARALLEL */
 
             /* Set the file chunk dataspace */
-            new_chunk_info->fspace = tmp_fchunk;
+            new_chunk_info->fspace        = tmp_fchunk;
             new_chunk_info->fspace_shared = FALSE;
 
             /* Set the memory chunk dataspace */
-            new_chunk_info->mspace=NULL;
+            new_chunk_info->mspace        = NULL;
             new_chunk_info->mspace_shared = FALSE;
 
             /* Copy the chunk's coordinates */
@@ -1576,13 +1533,13 @@ H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
             new_chunk_info->coords[fm->f_ndims] = 0;
 
             /* Insert the new chunk into the skip list */
-            if(H5SL_insert(fm->sel_chunks, new_chunk_info, &new_chunk_info->index) < 0) {
+            if (H5SL_insert(fm->sel_chunks, new_chunk_info, &new_chunk_info->index) < 0) {
                 H5D__free_chunk_info(new_chunk_info, NULL, NULL);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert chunk into skip list")
             } /* end if */
 
             /* Get number of elements selected in chunk */
-            if((schunk_points = H5S_GET_SELECT_NPOINTS(tmp_fchunk)) < 0)
+            if ((schunk_points = H5S_GET_SELECT_NPOINTS(tmp_fchunk)) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection # of elements")
             H5_CHECKED_ASSIGN(new_chunk_info->chunk_points, uint32_t, schunk_points, hssize_t);
 
@@ -1590,7 +1547,7 @@ H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
             sel_points -= (hsize_t)schunk_points;
 
             /* Leave if we are done */
-            if(sel_points == 0)
+            if (sel_points == 0)
                 HGOTO_DONE(SUCCEED)
         } /* end if */
 
@@ -1598,18 +1555,19 @@ H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
         chunk_index++;
 
         /* Set current increment dimension */
-        curr_dim=(int)fm->f_ndims-1;
+        curr_dim = (int)fm->f_ndims - 1;
 
         /* Increment chunk location in fastest changing dimension */
-        H5_CHECK_OVERFLOW(fm->chunk_dim[curr_dim],hsize_t,hssize_t);
-        coords[curr_dim]+=fm->chunk_dim[curr_dim];
-        end[curr_dim]+=fm->chunk_dim[curr_dim];
+        H5_CHECK_OVERFLOW(fm->chunk_dim[curr_dim], hsize_t, hssize_t);
+        coords[curr_dim] += fm->chunk_dim[curr_dim];
+        end[curr_dim] += fm->chunk_dim[curr_dim];
 
         /* Bring chunk location back into bounds, if necessary */
-        if(coords[curr_dim] > sel_end[curr_dim]) {
+        if (coords[curr_dim] > sel_end[curr_dim]) {
             do {
                 /* Reset current dimension's location to 0 */
-                coords[curr_dim] = start_coords[curr_dim]; /*lint !e771 The start_coords will always be initialized */
+                coords[curr_dim] =
+                    start_coords[curr_dim]; /*lint !e771 The start_coords will always be initialized */
                 end[curr_dim] = (coords[curr_dim] + fm->chunk_dim[curr_dim]) - 1;
 
                 /* Decrement current dimension */
@@ -1618,19 +1576,19 @@ H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
                 /* Increment chunk location in current dimension */
                 coords[curr_dim] += fm->chunk_dim[curr_dim];
                 end[curr_dim] = (coords[curr_dim] + fm->chunk_dim[curr_dim]) - 1;
-            } while(coords[curr_dim] > sel_end[curr_dim]);
+            } while (coords[curr_dim] > sel_end[curr_dim]);
 
             /* Re-calculate the index of this chunk */
-            if(H5VM_chunk_index(fm->f_ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
+            if (H5VM_chunk_index(fm->f_ndims, coords, fm->layout->u.chunk.dim,
+                                 fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
         } /* end if */
-    } /* end while */
+    }     /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__create_chunk_file_map_hyper() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__create_chunk_mem_map_hyper
  *
@@ -1650,27 +1608,27 @@ done:
 static herr_t
 H5D__create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
 {
-    H5SL_node_t *curr_node;                 /* Current node in skip list */
-    hsize_t    file_sel_start[H5O_LAYOUT_NDIMS];    /* Offset of low bound of file selection */
-    hsize_t    file_sel_end[H5O_LAYOUT_NDIMS];  /* Offset of high bound of file selection */
-    hsize_t    mem_sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
-    hsize_t    mem_sel_end[H5O_LAYOUT_NDIMS];   /* Offset of high bound of file selection */
-    hssize_t adjust[H5O_LAYOUT_NDIMS];      /* Adjustment to make to all file chunks */
-    hssize_t chunk_adjust[H5O_LAYOUT_NDIMS];  /* Adjustment to make to a particular chunk */
-    unsigned    u;                          /* Local index variable */
-    herr_t    ret_value = SUCCEED;        /* Return value */
+    H5SL_node_t *curr_node;                        /* Current node in skip list */
+    hsize_t      file_sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
+    hsize_t      file_sel_end[H5O_LAYOUT_NDIMS];   /* Offset of high bound of file selection */
+    hsize_t      mem_sel_start[H5O_LAYOUT_NDIMS];  /* Offset of low bound of file selection */
+    hsize_t      mem_sel_end[H5O_LAYOUT_NDIMS];    /* Offset of high bound of file selection */
+    hssize_t     adjust[H5O_LAYOUT_NDIMS];         /* Adjustment to make to all file chunks */
+    hssize_t     chunk_adjust[H5O_LAYOUT_NDIMS];   /* Adjustment to make to a particular chunk */
+    unsigned     u;                                /* Local index variable */
+    herr_t       ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Sanity check */
-    HDassert(fm->f_ndims>0);
+    HDassert(fm->f_ndims > 0);
 
     /* Check for all I/O going to a single chunk */
-    if(H5SL_count(fm->sel_chunks)==1) {
-        H5D_chunk_info_t *chunk_info;   /* Pointer to chunk information */
+    if (H5SL_count(fm->sel_chunks) == 1) {
+        H5D_chunk_info_t *chunk_info; /* Pointer to chunk information */
 
         /* Get the node */
-        curr_node=H5SL_first(fm->sel_chunks);
+        curr_node = H5SL_first(fm->sel_chunks);
 
         /* Get pointer to chunk's information */
         chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
@@ -1685,25 +1643,25 @@ H5D__create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
     } /* end if */
     else {
         /* Get bounding box for file selection */
-        if(H5S_SELECT_BOUNDS(fm->file_space, file_sel_start, file_sel_end) < 0)
+        if (H5S_SELECT_BOUNDS(fm->file_space, file_sel_start, file_sel_end) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
 
         /* Get bounding box for memory selection */
-        if(H5S_SELECT_BOUNDS(fm->mem_space, mem_sel_start, mem_sel_end) < 0)
+        if (H5S_SELECT_BOUNDS(fm->mem_space, mem_sel_start, mem_sel_end) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
 
         /* Calculate the adjustment for memory selection from file selection */
-        HDassert(fm->m_ndims==fm->f_ndims);
-        for(u=0; u<fm->f_ndims; u++) {
-            H5_CHECK_OVERFLOW(file_sel_start[u],hsize_t,hssize_t);
-            H5_CHECK_OVERFLOW(mem_sel_start[u],hsize_t,hssize_t);
-            adjust[u]=(hssize_t)file_sel_start[u]-(hssize_t)mem_sel_start[u];
+        HDassert(fm->m_ndims == fm->f_ndims);
+        for (u = 0; u < fm->f_ndims; u++) {
+            H5_CHECK_OVERFLOW(file_sel_start[u], hsize_t, hssize_t);
+            H5_CHECK_OVERFLOW(mem_sel_start[u], hsize_t, hssize_t);
+            adjust[u] = (hssize_t)file_sel_start[u] - (hssize_t)mem_sel_start[u];
         } /* end for */
 
         /* Iterate over each chunk in the chunk list */
-        curr_node=H5SL_first(fm->sel_chunks);
-        while(curr_node) {
-            H5D_chunk_info_t *chunk_info;   /* Pointer to chunk information */
+        curr_node = H5SL_first(fm->sel_chunks);
+        while (curr_node) {
+            H5D_chunk_info_t *chunk_info; /* Pointer to chunk information */
 
             /* Get pointer to chunk's information */
             chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
@@ -1712,37 +1670,40 @@ H5D__create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
             /* Copy the information */
 
             /* Copy the memory dataspace */
-            if((chunk_info->mspace = H5S_copy(fm->mem_space, TRUE, FALSE)) == NULL)
+            if ((chunk_info->mspace = H5S_copy(fm->mem_space, TRUE, FALSE)) == NULL)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
 
             /* Release the current selection */
-            if(H5S_SELECT_RELEASE(chunk_info->mspace) < 0)
+            if (H5S_SELECT_RELEASE(chunk_info->mspace) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection")
 
             /* Copy the file chunk's selection */
-            if(H5S_select_copy(chunk_info->mspace,chunk_info->fspace,FALSE) < 0)
+            if (H5S_select_copy(chunk_info->mspace, chunk_info->fspace, FALSE) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy selection")
 
             /* Compensate for the chunk offset */
-            for(u=0; u<fm->f_ndims; u++) {
-                H5_CHECK_OVERFLOW(chunk_info->coords[u],hsize_t,hssize_t);
-                chunk_adjust[u]=adjust[u]-(hssize_t)chunk_info->coords[u]; /*lint !e771 The adjust array will always be initialized */
-            } /* end for */
+            for (u = 0; u < fm->f_ndims; u++) {
+                H5_CHECK_OVERFLOW(chunk_info->coords[u], hsize_t, hssize_t);
+                chunk_adjust[u] =
+                    adjust[u] -
+                    (hssize_t)
+                        chunk_info->coords[u]; /*lint !e771 The adjust array will always be initialized */
+            }                                  /* end for */
 
             /* Adjust the selection */
-            if(H5S_hyper_adjust_s(chunk_info->mspace,chunk_adjust) < 0) /*lint !e772 The chunk_adjust array will always be initialized */
+            if (H5S_hyper_adjust_s(chunk_info->mspace, chunk_adjust) <
+                0) /*lint !e772 The chunk_adjust array will always be initialized */
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
 
             /* Get the next chunk node in the skip list */
-            curr_node=H5SL_next(curr_node);
+            curr_node = H5SL_next(curr_node);
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__create_chunk_mem_map_hyper() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_file_cb
  *
@@ -1757,24 +1718,26 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__chunk_file_cb(void H5_ATTR_UNUSED *elem, const H5T_t H5_ATTR_UNUSED *type, unsigned ndims, const hsize_t *coords, void *_udata)
+H5D__chunk_file_cb(void H5_ATTR_UNUSED *elem, const H5T_t H5_ATTR_UNUSED *type, unsigned ndims,
+                   const hsize_t *coords, void *_udata)
 {
-    H5D_chunk_file_iter_ud_t *udata = (H5D_chunk_file_iter_ud_t *)_udata;       /* User data for operation */
-    H5D_chunk_map_t      *fm = udata->fm;       /* File<->memory chunk mapping info */
-    H5D_chunk_info_t *chunk_info;               /* Chunk information for current chunk */
-    hsize_t     coords_in_chunk[H5O_LAYOUT_NDIMS];        /* Coordinates of element in chunk */
-    hsize_t     chunk_index;                    /* Chunk index */
-    unsigned    u;                              /* Local index variable */
-    herr_t    ret_value = SUCCEED;            /* Return value        */
+    H5D_chunk_file_iter_ud_t *udata = (H5D_chunk_file_iter_ud_t *)_udata; /* User data for operation */
+    H5D_chunk_map_t *         fm    = udata->fm;                 /* File<->memory chunk mapping info */
+    H5D_chunk_info_t *        chunk_info;                        /* Chunk information for current chunk */
+    hsize_t                   coords_in_chunk[H5O_LAYOUT_NDIMS]; /* Coordinates of element in chunk */
+    hsize_t                   chunk_index;                       /* Chunk index */
+    unsigned                  u;                                 /* Local index variable */
+    herr_t                    ret_value = SUCCEED;               /* Return value        */
 
     FUNC_ENTER_STATIC
 
     /* Calculate the index of this chunk */
-    if(H5VM_chunk_index(ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
+    if (H5VM_chunk_index(ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks,
+                         &chunk_index) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
 
     /* Find correct chunk in file & memory skip list */
-    if(chunk_index==fm->last_index) {
+    if (chunk_index == fm->last_index) {
         /* If the chunk index is the same as the last chunk index we used,
          * get the cached info to operate on.
          */
@@ -1785,73 +1748,74 @@ H5D__chunk_file_cb(void H5_ATTR_UNUSED *elem, const H5T_t H5_ATTR_UNUSED *type,
          * find the chunk in the skip list.
          */
         /* Get the chunk node from the skip list */
-        if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index))) {
-            H5S_t *fspace;                      /* Memory chunk's dataspace */
+        if (NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index))) {
+            H5S_t *fspace; /* Memory chunk's dataspace */
 
             /* Allocate the file & memory chunk information */
-            if (NULL==(chunk_info = H5FL_MALLOC (H5D_chunk_info_t)))
+            if (NULL == (chunk_info = H5FL_MALLOC(H5D_chunk_info_t)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
 
             /* Initialize the chunk information */
 
             /* Set the chunk index */
-            chunk_info->index=chunk_index;
+            chunk_info->index = chunk_index;
 
             /* Create a dataspace for the chunk */
-            if((fspace = H5S_create_simple(fm->f_ndims,fm->chunk_dim,NULL))==NULL) {
+            if ((fspace = H5S_create_simple(fm->f_ndims, fm->chunk_dim, NULL)) == NULL) {
                 chunk_info = H5FL_FREE(H5D_chunk_info_t, chunk_info);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "unable to create dataspace for chunk")
             } /* end if */
 
             /* De-select the chunk space */
-            if(H5S_select_none(fspace) < 0) {
+            if (H5S_select_none(fspace) < 0) {
                 (void)H5S_close(fspace);
                 chunk_info = H5FL_FREE(H5D_chunk_info_t, chunk_info);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to de-select dataspace")
             } /* end if */
 
             /* Set the file chunk dataspace */
-            chunk_info->fspace = fspace;
+            chunk_info->fspace        = fspace;
             chunk_info->fspace_shared = FALSE;
 
             /* Set the memory chunk dataspace */
-            chunk_info->mspace = NULL;
+            chunk_info->mspace        = NULL;
             chunk_info->mspace_shared = FALSE;
 
             /* Set the number of selected elements in chunk to zero */
             chunk_info->chunk_points = 0;
 
             /* Compute the chunk's coordinates */
-            for(u = 0; u < fm->f_ndims; u++) {
+            for (u = 0; u < fm->f_ndims; u++) {
                 H5_CHECK_OVERFLOW(fm->layout->u.chunk.dim[u], hsize_t, hssize_t);
-                chunk_info->coords[u] = (coords[u] / (hssize_t)fm->layout->u.chunk.dim[u]) * (hssize_t)fm->layout->u.chunk.dim[u];
+                chunk_info->coords[u] =
+                    (coords[u] / (hssize_t)fm->layout->u.chunk.dim[u]) * (hssize_t)fm->layout->u.chunk.dim[u];
             } /* end for */
             chunk_info->coords[fm->f_ndims] = 0;
 
             /* Insert the new chunk into the skip list */
-            if(H5SL_insert(fm->sel_chunks,chunk_info,&chunk_info->index) < 0) {
-                    H5D__free_chunk_info(chunk_info,NULL,NULL);
-                HGOTO_ERROR(H5E_DATASPACE,H5E_CANTINSERT,FAIL,"can't insert chunk into skip list")
+            if (H5SL_insert(fm->sel_chunks, chunk_info, &chunk_info->index) < 0) {
+                H5D__free_chunk_info(chunk_info, NULL, NULL);
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert chunk into skip list")
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
 #ifdef H5_HAVE_PARALLEL
         /* Store chunk selection information, for collective multi-chunk I/O */
-        if(udata->io_info->using_mpi_vfd)
+        if (udata->io_info->using_mpi_vfd)
             fm->select_chunk[chunk_index] = chunk_info;
 #endif /* H5_HAVE_PARALLEL */
 
         /* Update the "last chunk seen" information */
-        fm->last_index = chunk_index;
+        fm->last_index      = chunk_index;
         fm->last_chunk_info = chunk_info;
     } /* end else */
 
     /* Get the offset of the element within the chunk */
-    for(u = 0; u < fm->f_ndims; u++)
+    for (u = 0; u < fm->f_ndims; u++)
         coords_in_chunk[u] = coords[u] - chunk_info->coords[u];
 
     /* Add point to file selection for chunk */
-    if(H5S_select_elements(chunk_info->fspace, H5S_SELECT_APPEND, (size_t)1, coords_in_chunk) < 0)
+    if (H5S_select_elements(chunk_info->fspace, H5S_SELECT_APPEND, (size_t)1, coords_in_chunk) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
 
     /* Increment the number of elemented selected in chunk */
@@ -1861,7 +1825,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_file_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_mem_cb
  *
@@ -1877,22 +1840,24 @@ done:
  */
 /* ARGSUSED */
 static herr_t
-H5D__chunk_mem_cb(void H5_ATTR_UNUSED *elem, const H5T_t H5_ATTR_UNUSED *type, unsigned ndims, const hsize_t *coords, void *_fm)
+H5D__chunk_mem_cb(void H5_ATTR_UNUSED *elem, const H5T_t H5_ATTR_UNUSED *type, unsigned ndims,
+                  const hsize_t *coords, void *_fm)
 {
-    H5D_chunk_map_t      *fm = (H5D_chunk_map_t *)_fm;  /* File<->memory chunk mapping info */
-    H5D_chunk_info_t *chunk_info;               /* Chunk information for current chunk */
-    hsize_t    coords_in_mem[H5O_LAYOUT_NDIMS];        /* Coordinates of element in memory */
-    hsize_t     chunk_index;                    /* Chunk index */
-    herr_t    ret_value = SUCCEED;            /* Return value        */
+    H5D_chunk_map_t * fm = (H5D_chunk_map_t *)_fm;     /* File<->memory chunk mapping info */
+    H5D_chunk_info_t *chunk_info;                      /* Chunk information for current chunk */
+    hsize_t           coords_in_mem[H5O_LAYOUT_NDIMS]; /* Coordinates of element in memory */
+    hsize_t           chunk_index;                     /* Chunk index */
+    herr_t            ret_value = SUCCEED;             /* Return value        */
 
     FUNC_ENTER_STATIC
 
     /* Calculate the index of this chunk */
-    if(H5VM_chunk_index(ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
+    if (H5VM_chunk_index(ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks,
+                         &chunk_index) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
 
     /* Find correct chunk in file & memory skip list */
-    if(chunk_index == fm->last_index) {
+    if (chunk_index == fm->last_index) {
         /* If the chunk index is the same as the last chunk index we used,
          * get the cached spaces to operate on.
          */
@@ -1903,44 +1868,43 @@ H5D__chunk_mem_cb(void H5_ATTR_UNUSED *elem, const H5T_t H5_ATTR_UNUSED *type, u
          * find the chunk in the skip list.
          */
         /* Get the chunk node from the skip list */
-        if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index)))
+        if (NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_NOTFOUND, FAIL, "can't locate chunk in skip list")
 
         /* Check if the chunk already has a memory space */
-        if(NULL == chunk_info->mspace) {
+        if (NULL == chunk_info->mspace) {
             /* Copy the template memory chunk dataspace */
-            if(NULL == (chunk_info->mspace = H5S_copy(fm->mchunk_tmpl, FALSE, FALSE)))
+            if (NULL == (chunk_info->mspace = H5S_copy(fm->mchunk_tmpl, FALSE, FALSE)))
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file space")
         } /* end else */
 
         /* Update the "last chunk seen" information */
-        fm->last_index = chunk_index;
+        fm->last_index      = chunk_index;
         fm->last_chunk_info = chunk_info;
     } /* end else */
 
     /* Get coordinates of selection iterator for memory */
-    if(H5S_SELECT_ITER_COORDS(&fm->mem_iter, coords_in_mem) < 0)
+    if (H5S_SELECT_ITER_COORDS(&fm->mem_iter, coords_in_mem) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get iterator coordinates")
 
     /* Add point to memory selection for chunk */
-    if(fm->msel_type == H5S_SEL_POINTS) {
-        if(H5S_select_elements(chunk_info->mspace, H5S_SELECT_APPEND, (size_t)1, coords_in_mem) < 0)
+    if (fm->msel_type == H5S_SEL_POINTS) {
+        if (H5S_select_elements(chunk_info->mspace, H5S_SELECT_APPEND, (size_t)1, coords_in_mem) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
     } /* end if */
     else {
-        if(H5S_hyper_add_span_element(chunk_info->mspace, fm->m_ndims, coords_in_mem) < 0)
+        if (H5S_hyper_add_span_element(chunk_info->mspace, fm->m_ndims, coords_in_mem) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
     } /* end else */
 
     /* Move memory selection iterator to next element in selection */
-    if(H5S_SELECT_ITER_NEXT(&fm->mem_iter, (size_t)1) < 0)
+    if (H5S_SELECT_ITER_NEXT(&fm->mem_iter, (size_t)1) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL, "unable to move to next iterator location")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_mem_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_cacheable
  *
@@ -1957,8 +1921,8 @@ done:
 htri_t
 H5D__chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr, hbool_t write_op)
 {
-    const H5D_t *dataset = io_info->dset; /* Local pointer to dataset info */
-    htri_t ret_value = FAIL;            /* Return value */
+    const H5D_t *dataset   = io_info->dset; /* Local pointer to dataset info */
+    htri_t       ret_value = FAIL;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1966,16 +1930,16 @@ H5D__chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr, hbool_t write_
     HDassert(dataset);
 
     /* Must bring the whole chunk in if there are any filters */
-    if(dataset->shared->dcpl_cache.pline.nused > 0)
+    if (dataset->shared->dcpl_cache.pline.nused > 0)
         ret_value = TRUE;
     else {
 #ifdef H5_HAVE_PARALLEL
-         /* If MPI based VFD is used and the file is opened for write access, must
-          *         bypass the chunk-cache scheme because other MPI processes could
-          *         be writing to other elements in the same chunk.  Do a direct
-          *         write-through of only the elements requested.
-          */
-        if(io_info->using_mpi_vfd && (H5F_ACC_RDWR & H5F_INTENT(dataset->oloc.file)))
+        /* If MPI based VFD is used and the file is opened for write access, must
+         *         bypass the chunk-cache scheme because other MPI processes could
+         *         be writing to other elements in the same chunk.  Do a direct
+         *         write-through of only the elements requested.
+         */
+        if (io_info->using_mpi_vfd && (H5F_ACC_RDWR & H5F_INTENT(dataset->oloc.file)))
             ret_value = FALSE;
         else {
 #endif /* H5_HAVE_PARALLEL */
@@ -1984,38 +1948,39 @@ H5D__chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr, hbool_t write_
              * cache, just write the data to it directly.
              */
             H5_CHECK_OVERFLOW(dataset->shared->layout.u.chunk.size, uint32_t, size_t);
-            if((size_t)dataset->shared->layout.u.chunk.size > dataset->shared->cache.chunk.nbytes_max) {
-                if(write_op && !H5F_addr_defined(caddr)) {
+            if ((size_t)dataset->shared->layout.u.chunk.size > dataset->shared->cache.chunk.nbytes_max) {
+                if (write_op && !H5F_addr_defined(caddr)) {
                     const H5O_fill_t *fill = &(dataset->shared->dcpl_cache.fill); /* Fill value info */
-                    H5D_fill_value_t fill_status;    /* Fill value status */
+                    H5D_fill_value_t  fill_status;                                /* Fill value status */
 
                     /* Revtrieve the fill value status */
-                    if(H5P_is_fill_value_defined(fill, &fill_status) < 0)
+                    if (H5P_is_fill_value_defined(fill, &fill_status) < 0)
                         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined")
 
                     /* If the fill value needs to be written then we will need
                      * to use the cache to write the fill value */
-                    if(fill->fill_time == H5D_FILL_TIME_ALLOC ||
-                            (fill->fill_time == H5D_FILL_TIME_IFSET &&
-                            (fill_status == H5D_FILL_VALUE_USER_DEFINED ||
-                             fill_status == H5D_FILL_VALUE_DEFAULT)))
+                    if (fill->fill_time == H5D_FILL_TIME_ALLOC ||
+                        (fill->fill_time == H5D_FILL_TIME_IFSET &&
+                         (fill_status == H5D_FILL_VALUE_USER_DEFINED ||
+                          fill_status == H5D_FILL_VALUE_DEFAULT)))
                         ret_value = TRUE;
                     else
                         ret_value = FALSE;
-                } else
+                }
+                else
                     ret_value = FALSE;
-            } else
+            }
+            else
                 ret_value = TRUE;
 #ifdef H5_HAVE_PARALLEL
         } /* end else */
-#endif /* H5_HAVE_PARALLEL */
-    } /* end else */
+#endif    /* H5_HAVE_PARALLEL */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_cacheable() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_read
  *
@@ -2029,20 +1994,20 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
-    H5D_chunk_map_t *fm)
+H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t H5_ATTR_UNUSED nelmts,
+                const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
+                H5D_chunk_map_t *fm)
 {
-    H5SL_node_t *chunk_node;            /* Current node in chunk skip list */
-    H5D_io_info_t nonexistent_io_info;  /* "nonexistent" I/O info object */
-    H5D_io_info_t ctg_io_info;          /* Contiguous I/O info object */
-    H5D_storage_t ctg_store;            /* Chunk storage information as contiguous dataset */
-    H5D_io_info_t cpt_io_info;          /* Compact I/O info object */
-    H5D_storage_t cpt_store;            /* Chunk storage information as compact dataset */
-    hbool_t     cpt_dirty;              /* Temporary placeholder for compact storage "dirty" flag */
-    uint32_t    src_accessed_bytes = 0; /* Total accessed size in a chunk */
-    hbool_t     skip_missing_chunks = FALSE;    /* Whether to skip missing chunks */
-    herr_t    ret_value = SUCCEED;    /*return value        */
+    H5SL_node_t * chunk_node;                    /* Current node in chunk skip list */
+    H5D_io_info_t nonexistent_io_info;           /* "nonexistent" I/O info object */
+    H5D_io_info_t ctg_io_info;                   /* Contiguous I/O info object */
+    H5D_storage_t ctg_store;                     /* Chunk storage information as contiguous dataset */
+    H5D_io_info_t cpt_io_info;                   /* Compact I/O info object */
+    H5D_storage_t cpt_store;                     /* Chunk storage information as compact dataset */
+    hbool_t       cpt_dirty;                     /* Temporary placeholder for compact storage "dirty" flag */
+    uint32_t      src_accessed_bytes  = 0;       /* Total accessed size in a chunk */
+    hbool_t       skip_missing_chunks = FALSE;   /* Whether to skip missing chunks */
+    herr_t        ret_value           = SUCCEED; /*return value        */
 
     FUNC_ENTER_STATIC
 
@@ -2058,71 +2023,71 @@ H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
 
     /* Set up contiguous I/O info object */
     HDmemcpy(&ctg_io_info, io_info, sizeof(ctg_io_info));
-    ctg_io_info.store = &ctg_store;
+    ctg_io_info.store      = &ctg_store;
     ctg_io_info.layout_ops = *H5D_LOPS_CONTIG;
 
     /* Initialize temporary contiguous storage info */
-    H5_CHECKED_ASSIGN(ctg_store.contig.dset_size, hsize_t, io_info->dset->shared->layout.u.chunk.size, uint32_t);
+    H5_CHECKED_ASSIGN(ctg_store.contig.dset_size, hsize_t, io_info->dset->shared->layout.u.chunk.size,
+                      uint32_t);
 
     /* Set up compact I/O info object */
     HDmemcpy(&cpt_io_info, io_info, sizeof(cpt_io_info));
-    cpt_io_info.store = &cpt_store;
+    cpt_io_info.store      = &cpt_store;
     cpt_io_info.layout_ops = *H5D_LOPS_COMPACT;
 
     /* Initialize temporary compact storage info */
     cpt_store.compact.dirty = &cpt_dirty;
 
     {
-        const H5O_fill_t *fill = &(io_info->dset->shared->dcpl_cache.fill);    /* Fill value info */
-        H5D_fill_value_t fill_status;       /* Fill value status */
+        const H5O_fill_t *fill = &(io_info->dset->shared->dcpl_cache.fill); /* Fill value info */
+        H5D_fill_value_t  fill_status;                                      /* Fill value status */
 
         /* Check the fill value status */
-        if(H5P_is_fill_value_defined(fill, &fill_status) < 0)
+        if (H5P_is_fill_value_defined(fill, &fill_status) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined")
 
         /* If we are never to return fill values, or if we would return them
          * but they aren't set, set the flag to skip missing chunks.
          */
-        if(fill->fill_time == H5D_FILL_TIME_NEVER ||
-                (fill->fill_time == H5D_FILL_TIME_IFSET &&
-                 fill_status != H5D_FILL_VALUE_USER_DEFINED &&
-                 fill_status != H5D_FILL_VALUE_DEFAULT))
+        if (fill->fill_time == H5D_FILL_TIME_NEVER ||
+            (fill->fill_time == H5D_FILL_TIME_IFSET && fill_status != H5D_FILL_VALUE_USER_DEFINED &&
+             fill_status != H5D_FILL_VALUE_DEFAULT))
             skip_missing_chunks = TRUE;
     }
 
     /* Iterate through nodes in chunk skip list */
     chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
-    while(chunk_node) {
-        H5D_chunk_info_t *chunk_info;   /* Chunk information */
-        H5D_io_info_t *chk_io_info;     /* Pointer to I/O info object for this chunk */
-        void *chunk;                    /* Pointer to locked chunk buffer */
-        H5D_chunk_ud_t udata;        /* B-tree pass-through    */
-        htri_t cacheable;               /* Whether the chunk is cacheable */
+    while (chunk_node) {
+        H5D_chunk_info_t *chunk_info;  /* Chunk information */
+        H5D_io_info_t *   chk_io_info; /* Pointer to I/O info object for this chunk */
+        void *            chunk;       /* Pointer to locked chunk buffer */
+        H5D_chunk_ud_t    udata;       /* B-tree pass-through    */
+        htri_t            cacheable;   /* Whether the chunk is cacheable */
 
         /* Get the actual chunk information from the skip list node */
         chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
 
         /* Get the info for the chunk in the file */
-        if(H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords, chunk_info->index, &udata) < 0)
+        if (H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords, chunk_info->index,
+                              &udata) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
 
         /* Check for non-existant chunk & skip it if appropriate */
-        if(H5F_addr_defined(udata.addr) || UINT_MAX != udata.idx_hint
-                || !skip_missing_chunks) {
+        if (H5F_addr_defined(udata.addr) || UINT_MAX != udata.idx_hint || !skip_missing_chunks) {
             /* Load the chunk into cache and lock it. */
-            if((cacheable = H5D__chunk_cacheable(io_info, udata.addr, FALSE)) < 0)
+            if ((cacheable = H5D__chunk_cacheable(io_info, udata.addr, FALSE)) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't tell if chunk is cacheable")
-            if(cacheable) {
+            if (cacheable) {
                 /* Pass in chunk's coordinates in a union. */
                 io_info->store->chunk.offset = chunk_info->coords;
-                io_info->store->chunk.index = chunk_info->index;
+                io_info->store->chunk.index  = chunk_info->index;
 
                 /* Compute # of bytes accessed in chunk */
                 H5_CHECK_OVERFLOW(type_info->src_type_size, /*From:*/ size_t, /*To:*/ uint32_t);
                 src_accessed_bytes = chunk_info->chunk_points * (uint32_t)type_info->src_type_size;
 
                 /* Lock the chunk into the cache */
-                if(NULL == (chunk = H5D__chunk_lock(io_info, &udata, FALSE)))
+                if (NULL == (chunk = H5D__chunk_lock(io_info, &udata, FALSE)))
                     HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
 
                 /* Set up the storage buffer information for this chunk */
@@ -2131,7 +2096,7 @@ H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
                 /* Point I/O info at contiguous I/O info for this chunk */
                 chk_io_info = &cpt_io_info;
             } /* end if */
-            else if(H5F_addr_defined(udata.addr)) {
+            else if (H5F_addr_defined(udata.addr)) {
                 /* Set up the storage address information for this chunk */
                 ctg_store.contig.dset_addr = udata.addr;
 
@@ -2150,12 +2115,12 @@ H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
             } /* end else */
 
             /* Perform the actual read operation */
-            if((io_info->io_ops.single_read)(chk_io_info, type_info,
-                    (hsize_t)chunk_info->chunk_points, chunk_info->fspace, chunk_info->mspace) < 0)
+            if ((io_info->io_ops.single_read)(chk_io_info, type_info, (hsize_t)chunk_info->chunk_points,
+                                              chunk_info->fspace, chunk_info->mspace) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "chunked read failed")
 
             /* Release the cache lock on the chunk. */
-            if(chunk && H5D__chunk_unlock(io_info, &udata, FALSE, chunk, src_accessed_bytes) < 0)
+            if (chunk && H5D__chunk_unlock(io_info, &udata, FALSE, chunk, src_accessed_bytes) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
         } /* end if */
 
@@ -2167,7 +2132,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_write
  *
@@ -2181,18 +2145,18 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
-    H5D_chunk_map_t *fm)
+H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t H5_ATTR_UNUSED nelmts,
+                 const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
+                 H5D_chunk_map_t *fm)
 {
-    H5SL_node_t *chunk_node;            /* Current node in chunk skip list */
-    H5D_io_info_t ctg_io_info;          /* Contiguous I/O info object */
-    H5D_storage_t ctg_store;            /* Chunk storage information as contiguous dataset */
-    H5D_io_info_t cpt_io_info;          /* Compact I/O info object */
-    H5D_storage_t cpt_store;            /* Chunk storage information as compact dataset */
-    hbool_t     cpt_dirty;              /* Temporary placeholder for compact storage "dirty" flag */
-    uint32_t    dst_accessed_bytes = 0; /* Total accessed size in a chunk */
-    herr_t    ret_value = SUCCEED;    /* Return value        */
+    H5SL_node_t * chunk_node;                   /* Current node in chunk skip list */
+    H5D_io_info_t ctg_io_info;                  /* Contiguous I/O info object */
+    H5D_storage_t ctg_store;                    /* Chunk storage information as contiguous dataset */
+    H5D_io_info_t cpt_io_info;                  /* Compact I/O info object */
+    H5D_storage_t cpt_store;                    /* Chunk storage information as compact dataset */
+    hbool_t       cpt_dirty;                    /* Temporary placeholder for compact storage "dirty" flag */
+    uint32_t      dst_accessed_bytes = 0;       /* Total accessed size in a chunk */
+    herr_t        ret_value          = SUCCEED; /* Return value        */
 
     FUNC_ENTER_STATIC
 
@@ -2204,15 +2168,16 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
 
     /* Set up contiguous I/O info object */
     HDmemcpy(&ctg_io_info, io_info, sizeof(ctg_io_info));
-    ctg_io_info.store = &ctg_store;
+    ctg_io_info.store      = &ctg_store;
     ctg_io_info.layout_ops = *H5D_LOPS_CONTIG;
 
     /* Initialize temporary contiguous storage info */
-    H5_CHECKED_ASSIGN(ctg_store.contig.dset_size, hsize_t, io_info->dset->shared->layout.u.chunk.size, uint32_t);
+    H5_CHECKED_ASSIGN(ctg_store.contig.dset_size, hsize_t, io_info->dset->shared->layout.u.chunk.size,
+                      uint32_t);
 
     /* Set up compact I/O info object */
     HDmemcpy(&cpt_io_info, io_info, sizeof(cpt_io_info));
-    cpt_io_info.store = &cpt_store;
+    cpt_io_info.store      = &cpt_store;
     cpt_io_info.layout_ops = *H5D_LOPS_COMPACT;
 
     /* Initialize temporary compact storage info */
@@ -2220,40 +2185,41 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
 
     /* Iterate through nodes in chunk skip list */
     chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
-    while(chunk_node) {
-        H5D_chunk_info_t *chunk_info;   /* Chunk information */
-        H5D_io_info_t *chk_io_info;     /* Pointer to I/O info object for this chunk */
-        void *chunk;                    /* Pointer to locked chunk buffer */
-        H5D_chunk_ud_t udata;        /* Index pass-through    */
-        htri_t cacheable;               /* Whether the chunk is cacheable */
+    while (chunk_node) {
+        H5D_chunk_info_t *chunk_info;  /* Chunk information */
+        H5D_io_info_t *   chk_io_info; /* Pointer to I/O info object for this chunk */
+        void *            chunk;       /* Pointer to locked chunk buffer */
+        H5D_chunk_ud_t    udata;       /* Index pass-through    */
+        htri_t            cacheable;   /* Whether the chunk is cacheable */
 
         /* Get the actual chunk information from the skip list node */
         chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
 
         /* Load the chunk into cache.  But if the whole chunk is written,
          * simply allocate space instead of load the chunk. */
-        if(H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords, chunk_info->index, &udata) < 0)
+        if (H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords, chunk_info->index,
+                              &udata) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
-        if((cacheable = H5D__chunk_cacheable(io_info, udata.addr, TRUE)) < 0)
+        if ((cacheable = H5D__chunk_cacheable(io_info, udata.addr, TRUE)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't tell if chunk is cacheable")
-        if(cacheable) {
-            hbool_t entire_chunk = TRUE;       /* Whether whole chunk is selected */
+        if (cacheable) {
+            hbool_t entire_chunk = TRUE; /* Whether whole chunk is selected */
 
             /* Pass in chunk's coordinates in a union. */
             io_info->store->chunk.offset = chunk_info->coords;
-            io_info->store->chunk.index = chunk_info->index;
+            io_info->store->chunk.index  = chunk_info->index;
 
             /* Compute # of bytes accessed in chunk */
             H5_CHECK_OVERFLOW(type_info->dst_type_size, /*From:*/ size_t, /*To:*/ uint32_t);
             dst_accessed_bytes = chunk_info->chunk_points * (uint32_t)type_info->dst_type_size;
 
             /* Determine if we will access all the data in the chunk */
-            if(dst_accessed_bytes != ctg_store.contig.dset_size ||
-                    (chunk_info->chunk_points * type_info->src_type_size) != ctg_store.contig.dset_size)
+            if (dst_accessed_bytes != ctg_store.contig.dset_size ||
+                (chunk_info->chunk_points * type_info->src_type_size) != ctg_store.contig.dset_size)
                 entire_chunk = FALSE;
 
             /* Lock the chunk into the cache */
-            if(NULL == (chunk = H5D__chunk_lock(io_info, &udata, entire_chunk)))
+            if (NULL == (chunk = H5D__chunk_lock(io_info, &udata, entire_chunk)))
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
 
             /* Set up the storage buffer information for this chunk */
@@ -2264,25 +2230,25 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
         } /* end if */
         else {
             /* If the chunk hasn't been allocated on disk, do so now. */
-            if(!H5F_addr_defined(udata.addr)) {
-                H5D_chk_idx_info_t idx_info;        /* Chunked index info */
+            if (!H5F_addr_defined(udata.addr)) {
+                H5D_chk_idx_info_t idx_info; /* Chunked index info */
 
                 /* Compose chunked index info struct */
-                idx_info.f = io_info->dset->oloc.file;
+                idx_info.f       = io_info->dset->oloc.file;
                 idx_info.dxpl_id = io_info->dxpl_id;
-                idx_info.pline = &(io_info->dset->shared->dcpl_cache.pline);
-                idx_info.layout = &(io_info->dset->shared->layout.u.chunk);
+                idx_info.pline   = &(io_info->dset->shared->dcpl_cache.pline);
+                idx_info.layout  = &(io_info->dset->shared->layout.u.chunk);
                 idx_info.storage = &(io_info->dset->shared->layout.storage.u.chunk);
 
                 /* Set up the size of chunk for user data */
                 udata.nbytes = io_info->dset->shared->layout.u.chunk.size;
 
                 /* Create the chunk */
-                if((io_info->dset->shared->layout.storage.u.chunk.ops->insert)(&idx_info, &udata) < 0)
+                if ((io_info->dset->shared->layout.storage.u.chunk.ops->insert)(&idx_info, &udata) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert/resize chunk")
 
                 /* Make sure the address of the chunk is returned. */
-                if(!H5F_addr_defined(udata.addr))
+                if (!H5F_addr_defined(udata.addr))
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunk address isn't defined")
 
                 /* Cache the new chunk information */
@@ -2300,12 +2266,12 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
         } /* end else */
 
         /* Perform the actual write operation */
-        if((io_info->io_ops.single_write)(chk_io_info, type_info,
-                (hsize_t)chunk_info->chunk_points, chunk_info->fspace, chunk_info->mspace) < 0)
+        if ((io_info->io_ops.single_write)(chk_io_info, type_info, (hsize_t)chunk_info->chunk_points,
+                                           chunk_info->fspace, chunk_info->mspace) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "chunked write failed")
 
         /* Release the cache lock on the chunk. */
-        if(chunk && H5D__chunk_unlock(io_info, &udata, TRUE, chunk, dst_accessed_bytes) < 0)
+        if (chunk && H5D__chunk_unlock(io_info, &udata, TRUE, chunk, dst_accessed_bytes) < 0)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
 
         /* Advance to next chunk in list */
@@ -2316,7 +2282,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_flush
  *
@@ -2333,12 +2298,12 @@ done:
 static herr_t
 H5D__chunk_flush(H5D_t *dset, hid_t dxpl_id)
 {
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk);
-    H5D_rdcc_ent_t    *ent, *next;
-    unsigned        nerrors = 0;    /* Count of any errors encountered when flushing chunks */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_dxpl_cache_t  _dxpl_cache;               /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
+    H5D_rdcc_t *      rdcc       = &(dset->shared->cache.chunk);
+    H5D_rdcc_ent_t *  ent, *next;
+    unsigned          nerrors   = 0;       /* Count of any errors encountered when flushing chunks */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -2346,27 +2311,26 @@ H5D__chunk_flush(H5D_t *dset, hid_t dxpl_id)
     HDassert(dset);
 
     /* Flush any data caught in sieve buffer */
-    if(H5D__flush_sieve_buf(dset, dxpl_id) < 0)
+    if (H5D__flush_sieve_buf(dset, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to flush sieve buffer")
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Loop over all entries in the chunk cache */
-    for(ent = rdcc->head; ent; ent = next) {
-    next = ent->next;
-        if(H5D__chunk_flush_entry(dset, dxpl_id, dxpl_cache, ent, FALSE) < 0)
+    for (ent = rdcc->head; ent; ent = next) {
+        next = ent->next;
+        if (H5D__chunk_flush_entry(dset, dxpl_id, dxpl_cache, ent, FALSE) < 0)
             nerrors++;
     } /* end for */
-    if(nerrors)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks")
+    if (nerrors)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_io_term
  *
@@ -2382,12 +2346,12 @@ done:
 static herr_t
 H5D__chunk_io_term(const H5D_chunk_map_t *fm)
 {
-    herr_t    ret_value = SUCCEED;    /*return value        */
+    herr_t ret_value = SUCCEED; /*return value        */
 
     FUNC_ENTER_STATIC
 
     /* Single element I/O vs. multiple element I/O cleanup */
-    if(fm->use_single) {
+    if (fm->use_single) {
         /* Sanity checks */
         HDassert(fm->sel_chunks == NULL);
         HDassert(fm->single_chunk_info);
@@ -2399,17 +2363,17 @@ H5D__chunk_io_term(const H5D_chunk_map_t *fm)
     } /* end if */
     else {
         /* Release the nodes on the list of selected chunks */
-        if(fm->sel_chunks)
-            if(H5SL_free(fm->sel_chunks, H5D__free_chunk_info, NULL) < 0)
+        if (fm->sel_chunks)
+            if (H5SL_free(fm->sel_chunks, H5D__free_chunk_info, NULL) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTNEXT, FAIL, "can't iterate over chunks")
     } /* end else */
 
     /* Free the memory chunk dataspace template */
-    if(fm->mchunk_tmpl)
-        if(H5S_close(fm->mchunk_tmpl) < 0)
+    if (fm->mchunk_tmpl)
+        if (H5S_close(fm->mchunk_tmpl) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "can't release memory chunk dataspace template")
 #ifdef H5_HAVE_PARALLEL
-    if(fm->select_chunk)
+    if (fm->select_chunk)
         H5MM_xfree(fm->select_chunk);
 #endif /* H5_HAVE_PARALLEL */
 
@@ -2417,7 +2381,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_io_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_chunk_idx_reset
  *
@@ -2433,7 +2396,7 @@ done:
 herr_t
 H5D_chunk_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2442,14 +2405,13 @@ H5D_chunk_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
     HDassert(storage->ops);
 
     /* Reset index structures */
-    if((storage->ops->reset)(storage, reset_addr) < 0)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to reset chunk index info")
+    if ((storage->ops->reset)(storage, reset_addr) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to reset chunk index info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_chunk_idx_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_cinfo_cache_reset
  *
@@ -2476,7 +2438,6 @@ H5D__chunk_cinfo_cache_reset(H5D_chunk_cached_t *last)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5D__chunk_cinfo_cache_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_cinfo_cache_update
  *
@@ -2503,9 +2464,9 @@ H5D__chunk_cinfo_cache_update(H5D_chunk_cached_t *last, const H5D_chunk_ud_t *ud
 
     /* Stored the information to cache */
     HDmemcpy(last->offset, udata->common.offset, sizeof(hsize_t) * udata->common.layout->ndims);
-    last->nbytes = udata->nbytes;
+    last->nbytes      = udata->nbytes;
     last->filter_mask = udata->filter_mask;
-    last->addr = udata->addr;
+    last->addr        = udata->addr;
 
     /* Indicate that the cached info is valid */
     last->valid = TRUE;
@@ -2513,7 +2474,6 @@ H5D__chunk_cinfo_cache_update(H5D_chunk_cached_t *last, const H5D_chunk_ud_t *ud
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5D__chunk_cinfo_cache_update() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_cinfo_cache_found
  *
@@ -2529,7 +2489,7 @@ H5D__chunk_cinfo_cache_update(H5D_chunk_cached_t *last, const H5D_chunk_ud_t *ud
 static hbool_t
 H5D__chunk_cinfo_cache_found(const H5D_chunk_cached_t *last, H5D_chunk_ud_t *udata)
 {
-    hbool_t ret_value = FALSE;          /* Return value */
+    hbool_t ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -2541,18 +2501,18 @@ H5D__chunk_cinfo_cache_found(const H5D_chunk_cached_t *last, H5D_chunk_ud_t *uda
     HDassert(udata->common.offset);
 
     /* Check if the cached information is what is desired */
-    if(last->valid) {
-        unsigned    u;                      /* Local index variable */
+    if (last->valid) {
+        unsigned u; /* Local index variable */
 
         /* Check that the offset is the same */
-        for(u = 0; u < udata->common.layout->ndims; u++)
-            if(last->offset[u] != udata->common.offset[u])
+        for (u = 0; u < udata->common.layout->ndims; u++)
+            if (last->offset[u] != udata->common.offset[u])
                 HGOTO_DONE(FALSE)
 
         /* Retrieve the information from the cache */
-        udata->nbytes = last->nbytes;
+        udata->nbytes      = last->nbytes;
         udata->filter_mask = last->filter_mask;
-        udata->addr = last->addr;
+        udata->addr        = last->addr;
 
         /* Indicate that the data was found */
         HGOTO_DONE(TRUE)
@@ -2562,7 +2522,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_cinfo_cache_found() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_create
  *
@@ -2581,40 +2540,40 @@ done:
 herr_t
 H5D__chunk_create(const H5D_t *dset /*in,out*/, hid_t dxpl_id)
 {
-    H5D_chk_idx_info_t idx_info;        /* Chunked index info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_chk_idx_info_t idx_info;            /* Chunked index info */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(dset);
     HDassert(H5D_CHUNKED == dset->shared->layout.type);
-    HDassert(dset->shared->layout.u.chunk.ndims > 0 && dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
+    HDassert(dset->shared->layout.u.chunk.ndims > 0 &&
+             dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
 #ifndef NDEBUG
-{
-    unsigned u;                         /* Local index variable */
+    {
+        unsigned u; /* Local index variable */
 
-    for(u = 0; u < dset->shared->layout.u.chunk.ndims; u++)
-    HDassert(dset->shared->layout.u.chunk.dim[u] > 0);
-}
+        for (u = 0; u < dset->shared->layout.u.chunk.ndims; u++)
+            HDassert(dset->shared->layout.u.chunk.dim[u] > 0);
+    }
 #endif
 
     /* Compose chunked index info struct */
-    idx_info.f = dset->oloc.file;
+    idx_info.f       = dset->oloc.file;
     idx_info.dxpl_id = dxpl_id;
-    idx_info.pline = &dset->shared->dcpl_cache.pline;
-    idx_info.layout = &dset->shared->layout.u.chunk;
+    idx_info.pline   = &dset->shared->dcpl_cache.pline;
+    idx_info.layout  = &dset->shared->layout.u.chunk;
     idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
     /* Create the index for the chunks */
-    if((dset->shared->layout.storage.u.chunk.ops->create)(&idx_info) < 0)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create chunk index")
+    if ((dset->shared->layout.storage.u.chunk.ops->create)(&idx_info) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create chunk index")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_lookup
  *
@@ -2629,13 +2588,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset,
-    hsize_t chunk_idx, H5D_chunk_ud_t *udata)
+H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset, hsize_t chunk_idx,
+                  H5D_chunk_ud_t *udata)
 {
-    H5D_rdcc_ent_t  *ent = NULL;        /* Cache entry */
-    hbool_t         found = FALSE;      /* In cache? */
-    unsigned        u;                  /* Counter */
-    herr_t    ret_value = SUCCEED;    /* Return value */
+    H5D_rdcc_ent_t *ent   = NULL;        /* Cache entry */
+    hbool_t         found = FALSE;       /* In cache? */
+    unsigned        u;                   /* Counter */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -2645,62 +2604,60 @@ H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset,
     HDassert(udata);
 
     /* Initialize the query information about the chunk we are looking for */
-    udata->common.layout = &(dset->shared->layout.u.chunk);
+    udata->common.layout  = &(dset->shared->layout.u.chunk);
     udata->common.storage = &(dset->shared->layout.storage.u.chunk);
-    udata->common.offset = chunk_offset;
-    udata->common.rdcc = &(dset->shared->cache.chunk);
+    udata->common.offset  = chunk_offset;
+    udata->common.rdcc    = &(dset->shared->cache.chunk);
 
     /* Reset information about the chunk we are looking for */
-    udata->nbytes = 0;
+    udata->nbytes      = 0;
     udata->filter_mask = 0;
-    udata->addr = HADDR_UNDEF;
+    udata->addr        = HADDR_UNDEF;
 
     /* Check for chunk in cache */
-    if(dset->shared->cache.chunk.nslots > 0) {
+    if (dset->shared->cache.chunk.nslots > 0) {
         udata->idx_hint = H5D_CHUNK_HASH(dset->shared, chunk_idx);
-        ent = dset->shared->cache.chunk.slot[udata->idx_hint];
+        ent             = dset->shared->cache.chunk.slot[udata->idx_hint];
 
-        if(ent)
-            for(u = 0, found = TRUE; u < dset->shared->layout.u.chunk.ndims - 1;
-                    u++)
-                if(chunk_offset[u] != ent->offset[u]) {
+        if (ent)
+            for (u = 0, found = TRUE; u < dset->shared->layout.u.chunk.ndims - 1; u++)
+                if (chunk_offset[u] != ent->offset[u]) {
                     found = FALSE;
                     break;
                 } /* end if */
-    } /* end if */
+    }             /* end if */
 
     /* Find chunk addr */
-    if(found)
+    if (found)
         udata->addr = ent->chunk_addr;
     else {
         /* Invalidate idx_hint, to signal that the chunk is not in cache */
         udata->idx_hint = UINT_MAX;
 
         /* Check for cached information */
-        if(!H5D__chunk_cinfo_cache_found(&dset->shared->cache.chunk.last, udata)) {
-            H5D_chk_idx_info_t idx_info;        /* Chunked index info */
+        if (!H5D__chunk_cinfo_cache_found(&dset->shared->cache.chunk.last, udata)) {
+            H5D_chk_idx_info_t idx_info; /* Chunked index info */
 
             /* Compose chunked index info struct */
-            idx_info.f = dset->oloc.file;
+            idx_info.f       = dset->oloc.file;
             idx_info.dxpl_id = dxpl_id;
-            idx_info.pline = &dset->shared->dcpl_cache.pline;
-            idx_info.layout = &dset->shared->layout.u.chunk;
+            idx_info.pline   = &dset->shared->dcpl_cache.pline;
+            idx_info.layout  = &dset->shared->layout.u.chunk;
             idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
             /* Go get the chunk information */
-            if((dset->shared->layout.storage.u.chunk.ops->get_addr)(&idx_info, udata) < 0)
+            if ((dset->shared->layout.storage.u.chunk.ops->get_addr)(&idx_info, udata) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query chunk address")
 
             /* Cache the information retrieved */
             H5D__chunk_cinfo_cache_update(&dset->shared->cache.chunk.last, udata);
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_lookup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_flush_entry
  *
@@ -2718,11 +2675,11 @@ done:
  */
 static herr_t
 H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *dxpl_cache,
-    H5D_rdcc_ent_t *ent, hbool_t reset)
+                       H5D_rdcc_ent_t *ent, hbool_t reset)
 {
-    void    *buf = NULL;            /* Temporary buffer        */
-    hbool_t    point_of_no_return = FALSE;
-    herr_t    ret_value = SUCCEED;    /* Return value            */
+    void *  buf                = NULL; /* Temporary buffer        */
+    hbool_t point_of_no_return = FALSE;
+    herr_t  ret_value          = SUCCEED; /* Return value            */
 
     FUNC_ENTER_STATIC
 
@@ -2733,32 +2690,32 @@ H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
     HDassert(!ent->locked);
 
     buf = ent->chunk;
-    if(ent->dirty && !ent->deleted) {
-        H5D_chunk_ud_t     udata;        /* pass through B-tree        */
-        hbool_t must_insert = FALSE;    /* Whether the chunk must go through the "insert" method */
+    if (ent->dirty && !ent->deleted) {
+        H5D_chunk_ud_t udata;               /* pass through B-tree        */
+        hbool_t        must_insert = FALSE; /* Whether the chunk must go through the "insert" method */
 
         /* Set up user data for index callbacks */
-        udata.common.layout = &dset->shared->layout.u.chunk;
+        udata.common.layout  = &dset->shared->layout.u.chunk;
         udata.common.storage = &dset->shared->layout.storage.u.chunk;
-        udata.common.offset = ent->offset;
-        udata.common.rdcc = &(dset->shared->cache.chunk);
-        udata.filter_mask = 0;
-        udata.nbytes = dset->shared->layout.u.chunk.size;
-        udata.addr = ent->chunk_addr;
+        udata.common.offset  = ent->offset;
+        udata.common.rdcc    = &(dset->shared->cache.chunk);
+        udata.filter_mask    = 0;
+        udata.nbytes         = dset->shared->layout.u.chunk.size;
+        udata.addr           = ent->chunk_addr;
 
         /* Should the chunk be filtered before writing it to disk? */
-        if(dset->shared->dcpl_cache.pline.nused) {
-            size_t alloc = udata.nbytes;        /* Bytes allocated for BUF    */
-            size_t nbytes;                      /* Chunk size (in bytes) */
+        if (dset->shared->dcpl_cache.pline.nused) {
+            size_t alloc = udata.nbytes; /* Bytes allocated for BUF    */
+            size_t nbytes;               /* Chunk size (in bytes) */
 
-            if(!reset) {
+            if (!reset) {
                 /*
                  * Copy the chunk to a new buffer before running it through
                  * the pipeline because we'll want to save the original buffer
                  * for later.
                  */
                 H5_CHECKED_ASSIGN(alloc, size_t, udata.nbytes, uint32_t);
-                if(NULL == (buf = H5MM_malloc(alloc)))
+                if (NULL == (buf = H5MM_malloc(alloc)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for pipeline")
                 HDmemcpy(buf, ent->chunk, udata.nbytes);
             } /* end if */
@@ -2771,15 +2728,15 @@ H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
                  * even if we can't write the data to disk.
                  */
                 point_of_no_return = TRUE;
-                ent->chunk = NULL;
+                ent->chunk         = NULL;
             } /* end else */
             H5_CHECKED_ASSIGN(nbytes, size_t, udata.nbytes, uint32_t);
-            if(H5Z_pipeline(&(dset->shared->dcpl_cache.pline), 0, &(udata.filter_mask), dxpl_cache->err_detect,
-                     dxpl_cache->filter_cb, &nbytes, &alloc, &buf) < 0)
+            if (H5Z_pipeline(&(dset->shared->dcpl_cache.pline), 0, &(udata.filter_mask),
+                             dxpl_cache->err_detect, dxpl_cache->filter_cb, &nbytes, &alloc, &buf) < 0)
                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "output pipeline failed")
 #if H5_SIZEOF_SIZE_T > 4
             /* Check for the chunk expanding too much to encode in a 32-bit value */
-            if(nbytes > ((size_t)0xffffffff))
+            if (nbytes > ((size_t)0xffffffff))
                 HGOTO_ERROR(H5E_DATASET, H5E_BADRANGE, FAIL, "chunk too large for 32-bit length")
 #endif /* H5_SIZEOF_SIZE_T > 4 */
             H5_CHECKED_ASSIGN(udata.nbytes, uint32_t, nbytes, size_t);
@@ -2787,27 +2744,27 @@ H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
             /* Indicate that the chunk must go through 'insert' method */
             must_insert = TRUE;
         } /* end if */
-        else if(!H5F_addr_defined(udata.addr))
+        else if (!H5F_addr_defined(udata.addr))
             /* Indicate that the chunk must go through 'insert' method */
             must_insert = TRUE;
 
         /* Check if the chunk needs to be 'inserted' (could exist already and
          *      the 'insert' operation could resize it)
          */
-        if(must_insert) {
-            H5D_chk_idx_info_t idx_info;        /* Chunked index info */
+        if (must_insert) {
+            H5D_chk_idx_info_t idx_info; /* Chunked index info */
 
             /* Compose chunked index info struct */
-            idx_info.f = dset->oloc.file;
+            idx_info.f       = dset->oloc.file;
             idx_info.dxpl_id = dxpl_id;
-            idx_info.pline = &dset->shared->dcpl_cache.pline;
-            idx_info.layout = &dset->shared->layout.u.chunk;
+            idx_info.pline   = &dset->shared->dcpl_cache.pline;
+            idx_info.layout  = &dset->shared->layout.u.chunk;
             idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
             /* Create the chunk it if it doesn't exist, or reallocate the chunk
              *  if its size changed.
              */
-            if((dset->shared->layout.storage.u.chunk.ops->insert)(&idx_info, &udata) < 0)
+            if ((dset->shared->layout.storage.u.chunk.ops->insert)(&idx_info, &udata) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert/resize chunk")
 
             /* Update the chunk entry's address, in case it was allocated or relocated */
@@ -2816,7 +2773,7 @@ H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
 
         /* Write the data to the file */
         HDassert(H5F_addr_defined(udata.addr));
-        if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.nbytes, dxpl_id, buf) < 0)
+        if (H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.nbytes, dxpl_id, buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
 
         /* Cache the chunk's info, in case it's accessed again shortly */
@@ -2830,17 +2787,17 @@ H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
     } /* end if */
 
     /* Reset, but do not free or removed from list */
-    if(reset) {
+    if (reset) {
         point_of_no_return = FALSE;
-        if(buf == ent->chunk)
+        if (buf == ent->chunk)
             buf = NULL;
-        if(ent->chunk != NULL)
+        if (ent->chunk != NULL)
             ent->chunk = (uint8_t *)H5D__chunk_xfree(ent->chunk, &(dset->shared->dcpl_cache.pline));
     } /* end if */
 
 done:
     /* Free the temp buffer only if it's different than the entry chunk */
-    if(buf != ent->chunk)
+    if (buf != ent->chunk)
         H5MM_xfree(buf);
 
     /*
@@ -2849,15 +2806,14 @@ done:
      * output pipeline failed.  Do not free the entry or remove it from the
      * list.
      */
-    if(ret_value < 0 && point_of_no_return) {
-        if(ent->chunk)
+    if (ret_value < 0 && point_of_no_return) {
+        if (ent->chunk)
             ent->chunk = (uint8_t *)H5D__chunk_xfree(ent->chunk, &(dset->shared->dcpl_cache.pline));
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_flush_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_cache_evict
  *
@@ -2873,10 +2829,10 @@ done:
  */
 static herr_t
 H5D__chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *dxpl_cache,
-    H5D_rdcc_ent_t *ent, hbool_t flush)
+                       H5D_rdcc_ent_t *ent, hbool_t flush)
 {
-    H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk);
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5D_rdcc_t *rdcc      = &(dset->shared->cache.chunk);
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -2886,23 +2842,23 @@ H5D__chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
     HDassert(!ent->locked);
     HDassert(ent->idx < rdcc->nslots);
 
-    if(flush) {
+    if (flush) {
         /* Flush */
-        if(H5D__chunk_flush_entry(dset, dxpl_id, dxpl_cache, ent, TRUE) < 0)
+        if (H5D__chunk_flush_entry(dset, dxpl_id, dxpl_cache, ent, TRUE) < 0)
             HDONE_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "cannot flush indexed storage buffer")
     } /* end if */
     else {
         /* Don't flush, just free chunk */
-        if(ent->chunk != NULL)
+        if (ent->chunk != NULL)
             ent->chunk = (uint8_t *)H5D__chunk_xfree(ent->chunk, &(dset->shared->dcpl_cache.pline));
     } /* end else */
 
     /* Unlink from list */
-    if(ent->prev)
+    if (ent->prev)
         ent->prev->next = ent->next;
     else
         rdcc->head = ent->next;
-    if(ent->next)
+    if (ent->next)
         ent->next->prev = ent->prev;
     else
         rdcc->tail = ent->prev;
@@ -2910,7 +2866,7 @@ H5D__chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
 
     /* Remove from cache */
     rdcc->slot[ent->idx] = NULL;
-    ent->idx = UINT_MAX;
+    ent->idx             = UINT_MAX;
     rdcc->nbytes_used -= dset->shared->layout.u.chunk.size;
     --rdcc->nused;
 
@@ -2920,7 +2876,6 @@ H5D__chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_cache_evict() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_cache_prune
  *
@@ -2936,17 +2891,16 @@ H5D__chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id,
-    const H5D_dxpl_cache_t *dxpl_cache, size_t size)
+H5D__chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *dxpl_cache, size_t size)
 {
-    const H5D_rdcc_t    *rdcc = &(dset->shared->cache.chunk);
-    size_t        total = rdcc->nbytes_max;
-    const int        nmeth = 2;    /*number of methods        */
-    int                w[1];        /*weighting as an interval    */
-    H5D_rdcc_ent_t    *p[2], *cur;    /*list pointers            */
-    H5D_rdcc_ent_t    *n[2];        /*list next pointers        */
-    int        nerrors = 0;            /* Accumulated error count during preemptions */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    const H5D_rdcc_t *rdcc  = &(dset->shared->cache.chunk);
+    size_t            total = rdcc->nbytes_max;
+    const int         nmeth = 2;           /*number of methods        */
+    int               w[1];                /*weighting as an interval    */
+    H5D_rdcc_ent_t *  p[2], *cur;          /*list pointers            */
+    H5D_rdcc_ent_t *  n[2];                /*list next pointers        */
+    int               nerrors   = 0;       /* Accumulated error count during preemptions */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -2964,71 +2918,72 @@ H5D__chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id,
     p[0] = rdcc->head;
     p[1] = NULL;
 
-    while((p[0] || p[1]) && (rdcc->nbytes_used + size) > total) {
-        int i;          /* Local index variable */
+    while ((p[0] || p[1]) && (rdcc->nbytes_used + size) > total) {
+        int i; /* Local index variable */
 
-    /* Introduce new pointers */
-    for(i = 0; i < nmeth - 1; i++)
-            if(0 == w[i])
+        /* Introduce new pointers */
+        for (i = 0; i < nmeth - 1; i++)
+            if (0 == w[i])
                 p[i + 1] = rdcc->head;
 
-    /* Compute next value for each pointer */
-    for(i = 0; i < nmeth; i++)
+        /* Compute next value for each pointer */
+        for (i = 0; i < nmeth; i++)
             n[i] = p[i] ? p[i]->next : NULL;
 
-    /* Give each method a chance */
-    for(i = 0; i < nmeth && (rdcc->nbytes_used + size) > total; i++) {
-        if(0 == i && p[0] && !p[0]->locked &&
-                    ((0 == p[0]->rd_count && 0 == p[0]->wr_count) ||
-                     (0 == p[0]->rd_count && dset->shared->layout.u.chunk.size == p[0]->wr_count) ||
-                     (dset->shared->layout.u.chunk.size == p[0]->rd_count && 0 == p[0]->wr_count))) {
-        /*
-        * Method 0: Preempt entries that have been completely written
-        * and/or completely read but not entries that are partially
-        * written or partially read.
-        */
-        cur = p[0];
-        } else if(1 == i && p[1] && !p[1]->locked) {
-        /*
-        * Method 1: Preempt the entry without regard to
-        * considerations other than being locked.  This is the last
-        * resort preemption.
-        */
-        cur = p[1];
-        } else {
-        /* Nothing to preempt at this point */
-        cur = NULL;
-        }
+        /* Give each method a chance */
+        for (i = 0; i < nmeth && (rdcc->nbytes_used + size) > total; i++) {
+            if (0 == i && p[0] && !p[0]->locked &&
+                ((0 == p[0]->rd_count && 0 == p[0]->wr_count) ||
+                 (0 == p[0]->rd_count && dset->shared->layout.u.chunk.size == p[0]->wr_count) ||
+                 (dset->shared->layout.u.chunk.size == p[0]->rd_count && 0 == p[0]->wr_count))) {
+                /*
+                 * Method 0: Preempt entries that have been completely written
+                 * and/or completely read but not entries that are partially
+                 * written or partially read.
+                 */
+                cur = p[0];
+            }
+            else if (1 == i && p[1] && !p[1]->locked) {
+                /*
+                 * Method 1: Preempt the entry without regard to
+                 * considerations other than being locked.  This is the last
+                 * resort preemption.
+                 */
+                cur = p[1];
+            }
+            else {
+                /* Nothing to preempt at this point */
+                cur = NULL;
+            }
 
-        if(cur) {
-                int j;          /* Local index variable */
+            if (cur) {
+                int j; /* Local index variable */
 
-        for(j = 0; j < nmeth; j++) {
-            if(p[j] == cur)
+                for (j = 0; j < nmeth; j++) {
+                    if (p[j] == cur)
                         p[j] = NULL;
-            if(n[j] == cur)
+                    if (n[j] == cur)
                         n[j] = cur->next;
-        } /* end for */
-        if(H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, cur, TRUE) < 0)
+                } /* end for */
+                if (H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, cur, TRUE) < 0)
                     nerrors++;
-        } /* end if */
-    } /* end for */
+            } /* end if */
+        }     /* end for */
 
-    /* Advance pointers */
-    for(i = 0; i < nmeth; i++)
+        /* Advance pointers */
+        for (i = 0; i < nmeth; i++)
             p[i] = n[i];
-    for(i = 0; i < nmeth - 1; i++)
+        for (i = 0; i < nmeth - 1; i++)
             w[i] -= 1;
     } /* end while */
 
-    if(nerrors)
-    HGOTO_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "unable to preempt one or more raw data cache entry")
+    if (nerrors)
+        HGOTO_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "unable to preempt one or more raw data cache entry")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_cache_prune() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_lock
  *
@@ -3057,21 +3012,22 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
-    hbool_t relax)
+H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax)
 {
-    const H5D_t         *dset = io_info->dset;  /* Local pointer to the dataset info */
-    const H5O_pline_t   *pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info - always equal to the pline passed to H5D__chunk_alloc */
-    const H5O_layout_t  *layout = &(dset->shared->layout); /* Dataset layout */
-    const H5O_fill_t    *fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */
-    H5D_fill_buf_info_t fb_info;                /* Dataset's fill buffer info */
-    hbool_t             fb_info_init = FALSE;   /* Whether the fill value buffer has been initialized */
-    H5D_rdcc_t        *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache*/
-    H5D_rdcc_ent_t    *ent = NULL;        /*cache entry        */
-    haddr_t             chunk_addr = HADDR_UNDEF; /* Address of chunk on disk */
-    size_t        chunk_size;        /*size of a chunk    */
-    void        *chunk = NULL;        /*the file chunk    */
-    void        *ret_value;            /*return value        */
+    const H5D_t *      dset = io_info->dset; /* Local pointer to the dataset info */
+    const H5O_pline_t *pline =
+        &(dset->shared->dcpl_cache
+              .pline); /* I/O pipeline info - always equal to the pline passed to H5D__chunk_alloc */
+    const H5O_layout_t *layout = &(dset->shared->layout);          /* Dataset layout */
+    const H5O_fill_t *  fill   = &(dset->shared->dcpl_cache.fill); /* Fill value info */
+    H5D_fill_buf_info_t fb_info;                                   /* Dataset's fill buffer info */
+    hbool_t             fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */
+    H5D_rdcc_t *        rdcc         = &(dset->shared->cache.chunk); /*raw data chunk cache*/
+    H5D_rdcc_ent_t *    ent          = NULL;                         /*cache entry        */
+    haddr_t             chunk_addr   = HADDR_UNDEF;                  /* Address of chunk on disk */
+    size_t              chunk_size;                                  /*size of a chunk    */
+    void *              chunk = NULL;                                /*the file chunk    */
+    void *              ret_value;                                   /*return value        */
 
     FUNC_ENTER_PACKAGE
 
@@ -3087,7 +3043,7 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
     H5_CHECKED_ASSIGN(chunk_size, size_t, layout->u.chunk.size, uint32_t);
 
     /* Check if the chunk is in the cache */
-    if(UINT_MAX != udata->idx_hint) {
+    if (UINT_MAX != udata->idx_hint) {
         /* Sanity check */
         HDassert(udata->idx_hint < rdcc->nslots);
         HDassert(rdcc->slot[udata->idx_hint]);
@@ -3096,13 +3052,13 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
         ent = rdcc->slot[udata->idx_hint];
 
 #ifndef NDEBUG
-{
-        unsigned        u;            /*counters        */
+        {
+            unsigned u; /*counters        */
 
-        /* Make sure this is the right chunk */
-        for(u = 0; u < layout->u.chunk.ndims; u++)
-            HDassert(io_info->store->chunk.offset[u] == ent->offset[u]);
-}
+            /* Make sure this is the right chunk */
+            for (u = 0; u < layout->u.chunk.ndims; u++)
+                HDassert(io_info->store->chunk.offset[u] == ent->offset[u]);
+        }
 #endif /* NDEBUG */
 
         /*
@@ -3110,7 +3066,7 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
          */
         rdcc->stats.nhits++;
     } /* end if */
-    else if(relax) {
+    else if (relax) {
         /*
          * Not in the cache, but we're about to overwrite the whole thing
          * anyway, so just allocate a buffer for it but don't initialize that
@@ -3122,7 +3078,7 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
         /* Still save the chunk address so the cache stays consistent */
         chunk_addr = udata->addr;
 
-        if(NULL == (chunk = H5D__chunk_alloc(chunk_size, pline)))
+        if (NULL == (chunk = H5D__chunk_alloc(chunk_size, pline)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for raw data chunk")
 
         /* In the case that some dataset functions look through this data,
@@ -3139,20 +3095,22 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
         chunk_addr = udata->addr;
 
         /* Check if the chunk exists on disk */
-        if(H5F_addr_defined(chunk_addr)) {
-            size_t        chunk_alloc = 0;        /*allocated chunk size    */
+        if (H5F_addr_defined(chunk_addr)) {
+            size_t chunk_alloc = 0; /*allocated chunk size    */
 
             /* Chunk size on disk isn't [likely] the same size as the final chunk
              * size in memory, so allocate memory big enough. */
             H5_CHECKED_ASSIGN(chunk_alloc, size_t, udata->nbytes, uint32_t);
-            if(NULL == (chunk = H5D__chunk_alloc(chunk_alloc, pline)))
+            if (NULL == (chunk = H5D__chunk_alloc(chunk_alloc, pline)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for raw data chunk")
-            if(H5F_block_read(dset->oloc.file, H5FD_MEM_DRAW, chunk_addr, chunk_alloc, io_info->dxpl_id, chunk) < 0)
+            if (H5F_block_read(dset->oloc.file, H5FD_MEM_DRAW, chunk_addr, chunk_alloc, io_info->dxpl_id,
+                               chunk) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, NULL, "unable to read raw data chunk")
 
-            if(pline->nused) {
-                if(H5Z_pipeline(pline, H5Z_FLAG_REVERSE, &(udata->filter_mask), io_info->dxpl_cache->err_detect,
-                        io_info->dxpl_cache->filter_cb, &chunk_alloc, &chunk_alloc, &chunk) < 0)
+            if (pline->nused) {
+                if (H5Z_pipeline(pline, H5Z_FLAG_REVERSE, &(udata->filter_mask),
+                                 io_info->dxpl_cache->err_detect, io_info->dxpl_cache->filter_cb,
+                                 &chunk_alloc, &chunk_alloc, &chunk) < 0)
                     HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, NULL, "data pipeline read failed")
                 H5_CHECKED_ASSIGN(udata->nbytes, uint32_t, chunk_alloc, size_t);
             } /* end if */
@@ -3161,23 +3119,22 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
             rdcc->stats.nmisses++;
         } /* end if */
         else {
-            H5D_fill_value_t    fill_status;
+            H5D_fill_value_t fill_status;
 
             /* Sanity check */
             HDassert(fill->alloc_time != H5D_ALLOC_TIME_EARLY);
 
             /* Chunk size on disk isn't [likely] the same size as the final chunk
              * size in memory, so allocate memory big enough. */
-            if(NULL == (chunk = H5D__chunk_alloc(chunk_size, pline)))
+            if (NULL == (chunk = H5D__chunk_alloc(chunk_size, pline)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for raw data chunk")
 
-            if(H5P_is_fill_value_defined(fill, &fill_status) < 0)
+            if (H5P_is_fill_value_defined(fill, &fill_status) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't tell if fill value defined")
 
-            if(fill->fill_time == H5D_FILL_TIME_ALLOC ||
-                    (fill->fill_time == H5D_FILL_TIME_IFSET &&
-                     (fill_status == H5D_FILL_VALUE_USER_DEFINED ||
-                      fill_status == H5D_FILL_VALUE_DEFAULT))) {
+            if (fill->fill_time == H5D_FILL_TIME_ALLOC ||
+                (fill->fill_time == H5D_FILL_TIME_IFSET &&
+                 (fill_status == H5D_FILL_VALUE_USER_DEFINED || fill_status == H5D_FILL_VALUE_DEFAULT))) {
                 /*
                  * The chunk doesn't exist in the file.  Replicate the fill
                  * value throughout the chunk, if the fill value is defined.
@@ -3185,16 +3142,16 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
 
                 /* Initialize the fill value buffer */
                 /* (use the compact dataset storage buffer as the fill value buffer) */
-                if(H5D__fill_init(&fb_info, chunk, NULL, NULL, NULL, NULL,
-                        &dset->shared->dcpl_cache.fill, dset->shared->type,
-                        dset->shared->type_id, (size_t)0, chunk_size, io_info->dxpl_id) < 0)
+                if (H5D__fill_init(&fb_info, chunk, NULL, NULL, NULL, NULL, &dset->shared->dcpl_cache.fill,
+                                   dset->shared->type, dset->shared->type_id, (size_t)0, chunk_size,
+                                   io_info->dxpl_id) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't initialize fill buffer info")
                 fb_info_init = TRUE;
 
                 /* Check for VL datatype & non-default fill value */
-                if(fb_info.has_vlen_fill_type)
+                if (fb_info.has_vlen_fill_type)
                     /* Fill the buffer with VL datatype fill values */
-                    if(H5D__fill_refill_vl(&fb_info, fb_info.elmts_per_buf, io_info->dxpl_id) < 0)
+                    if (H5D__fill_refill_vl(&fb_info, fb_info.elmts_per_buf, io_info->dxpl_id) < 0)
                         HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, NULL, "can't refill fill value buffer")
             } /* end if */
             else
@@ -3203,48 +3160,49 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
             /* Increment # of creations */
             rdcc->stats.ninits++;
         } /* end else */
-    } /* end else */
+    }     /* end else */
     HDassert(chunk_size > 0);
 
-    if(ent) {
+    if (ent) {
         /*
          * The chunk is not at the beginning of the cache; move it backward
          * by one slot.  This is how we implement the LRU preemption
          * algorithm.
          */
         HDassert(ent);
-        if(ent->next) {
-            if(ent->next->next)
+        if (ent->next) {
+            if (ent->next->next)
                 ent->next->next->prev = ent;
             else
                 rdcc->tail = ent;
             ent->next->prev = ent->prev;
-            if(ent->prev)
+            if (ent->prev)
                 ent->prev->next = ent->next;
             else
                 rdcc->head = ent->next;
-            ent->prev = ent->next;
-            ent->next = ent->next->next;
+            ent->prev       = ent->next;
+            ent->next       = ent->next->next;
             ent->prev->next = ent;
         } /* end if */
-    } /* end if */
-    else if(rdcc->nslots > 0 && chunk_size <= rdcc->nbytes_max) {
+    }     /* end if */
+    else if (rdcc->nslots > 0 && chunk_size <= rdcc->nbytes_max) {
         /* Calculate the index */
         udata->idx_hint = H5D_CHUNK_HASH(dset->shared, io_info->store->chunk.index);
 
         /* Add the chunk to the cache only if the slot is not already locked */
         ent = rdcc->slot[udata->idx_hint];
-        if(!ent || !ent->locked) {
+        if (!ent || !ent->locked) {
             /* Preempt enough things from the cache to make room */
-            if(ent) {
-                if(H5D__chunk_cache_evict(io_info->dset, io_info->dxpl_id, io_info->dxpl_cache, ent, TRUE) < 0)
+            if (ent) {
+                if (H5D__chunk_cache_evict(io_info->dset, io_info->dxpl_id, io_info->dxpl_cache, ent, TRUE) <
+                    0)
                     HGOTO_ERROR(H5E_IO, H5E_CANTINIT, NULL, "unable to preempt chunk from cache")
             } /* end if */
-            if(H5D__chunk_cache_prune(io_info->dset, io_info->dxpl_id, io_info->dxpl_cache, chunk_size) < 0)
+            if (H5D__chunk_cache_prune(io_info->dset, io_info->dxpl_id, io_info->dxpl_cache, chunk_size) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_CANTINIT, NULL, "unable to preempt chunk(s) from cache")
 
             /* Create a new entry */
-            if(NULL == (ent = H5FL_CALLOC(H5D_rdcc_ent_t)))
+            if (NULL == (ent = H5FL_CALLOC(H5D_rdcc_ent_t)))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, NULL, "can't allocate raw data chunk entry")
 
             /* Initialize the new entry */
@@ -3257,15 +3215,15 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
             /* Add it to the cache */
             HDassert(NULL == rdcc->slot[udata->idx_hint]);
             rdcc->slot[udata->idx_hint] = ent;
-            ent->idx = udata->idx_hint;
+            ent->idx                    = udata->idx_hint;
             rdcc->nbytes_used += chunk_size;
             rdcc->nused++;
 
             /* Add it to the linked list */
-            if(rdcc->tail) {
+            if (rdcc->tail) {
                 rdcc->tail->next = ent;
-                ent->prev = rdcc->tail;
-                rdcc->tail = ent;
+                ent->prev        = rdcc->tail;
+                rdcc->tail       = ent;
             } /* end if */
             else
                 rdcc->head = rdcc->tail = ent;
@@ -3275,7 +3233,7 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
             ent = NULL;
     } /* end else */
 
-    if(!ent)
+    if (!ent)
         /*
          * The chunk cannot be placed in cache so we don't cache it. This is the
          * reason all those arguments have to be repeated for the unlock
@@ -3284,10 +3242,10 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
         udata->idx_hint = UINT_MAX;
 
     /* Lock the chunk into the cache */
-    if(ent) {
+    if (ent) {
         HDassert(!ent->locked);
         ent->locked = TRUE;
-        chunk = ent->chunk;
+        chunk       = ent->chunk;
     } /* end if */
 
     /* Set return value */
@@ -3295,18 +3253,17 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
 
 done:
     /* Release the fill buffer info, if it's been initialized */
-    if(fb_info_init && H5D__fill_term(&fb_info) < 0)
+    if (fb_info_init && H5D__fill_term(&fb_info) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, NULL, "Can't release fill buffer info")
 
     /* Release the chunk allocated, on error */
-    if(!ret_value)
-        if(chunk)
+    if (!ret_value)
+        if (chunk)
             chunk = H5D__chunk_xfree(chunk, pline);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_lock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_unlock
  *
@@ -3330,57 +3287,59 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__chunk_unlock(const H5D_io_info_t *io_info, const H5D_chunk_ud_t *udata,
-    hbool_t dirty, void *chunk, uint32_t naccessed)
+H5D__chunk_unlock(const H5D_io_info_t *io_info, const H5D_chunk_ud_t *udata, hbool_t dirty, void *chunk,
+                  uint32_t naccessed)
 {
-    const H5O_layout_t *layout = &(io_info->dset->shared->layout); /* Dataset layout */
-    const H5D_rdcc_t    *rdcc = &(io_info->dset->shared->cache.chunk);
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    const H5O_layout_t *layout    = &(io_info->dset->shared->layout); /* Dataset layout */
+    const H5D_rdcc_t *  rdcc      = &(io_info->dset->shared->cache.chunk);
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     HDassert(io_info);
     HDassert(udata);
 
-    if(UINT_MAX == udata->idx_hint) {
+    if (UINT_MAX == udata->idx_hint) {
         /*
          * It's not in the cache, probably because it's too big.  If it's
          * dirty then flush it to disk.  In any case, free the chunk.
          * Note: we have to copy the layout and filter messages so we
          *     don't discard the `const' qualifier.
          */
-        if(dirty) {
-            H5D_rdcc_ent_t fake_ent;         /* "fake" chunk cache entry */
+        if (dirty) {
+            H5D_rdcc_ent_t fake_ent; /* "fake" chunk cache entry */
 
             HDmemset(&fake_ent, 0, sizeof(fake_ent));
             fake_ent.dirty = TRUE;
-            HDmemcpy(fake_ent.offset, io_info->store->chunk.offset, layout->u.chunk.ndims * sizeof(fake_ent.offset[0]));
+            HDmemcpy(fake_ent.offset, io_info->store->chunk.offset,
+                     layout->u.chunk.ndims * sizeof(fake_ent.offset[0]));
             HDassert(layout->u.chunk.size > 0);
             fake_ent.chunk_addr = udata->addr;
-            fake_ent.chunk = (uint8_t *)chunk;
+            fake_ent.chunk      = (uint8_t *)chunk;
 
-            if(H5D__chunk_flush_entry(io_info->dset, io_info->dxpl_id, io_info->dxpl_cache, &fake_ent, TRUE) < 0)
+            if (H5D__chunk_flush_entry(io_info->dset, io_info->dxpl_id, io_info->dxpl_cache, &fake_ent,
+                                       TRUE) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "cannot flush indexed storage buffer")
         } /* end if */
         else {
-            if(chunk)
+            if (chunk)
                 chunk = H5D__chunk_xfree(chunk, &(io_info->dset->shared->dcpl_cache.pline));
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
-        H5D_rdcc_ent_t    *ent;   /* Chunk's entry in the cache */
+        H5D_rdcc_ent_t *ent; /* Chunk's entry in the cache */
 
         /* Sanity check */
-    HDassert(udata->idx_hint < rdcc->nslots);
-    HDassert(rdcc->slot[udata->idx_hint]);
-    HDassert(rdcc->slot[udata->idx_hint]->chunk == chunk);
+        HDassert(udata->idx_hint < rdcc->nslots);
+        HDassert(rdcc->slot[udata->idx_hint]);
+        HDassert(rdcc->slot[udata->idx_hint]->chunk == chunk);
 
         /*
          * It's in the cache so unlock it.
          */
         ent = rdcc->slot[udata->idx_hint];
         HDassert(ent->locked);
-        if(dirty) {
+        if (dirty) {
             ent->dirty = TRUE;
             ent->wr_count -= MIN(ent->wr_count, naccessed);
         } /* end if */
@@ -3393,7 +3352,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_unlock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_allocated_cb
  *
@@ -3420,7 +3378,6 @@ H5D__chunk_allocated_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
     FUNC_LEAVE_NOAPI(H5_ITER_CONT)
 } /* H5D__chunk_allocated_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_allocated
  *
@@ -3438,13 +3395,13 @@ H5D__chunk_allocated_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
 herr_t
 H5D__chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes)
 {
-    H5D_chk_idx_info_t idx_info;        /* Chunked index info */
-    const H5D_rdcc_t   *rdcc = &(dset->shared->cache.chunk);    /* Raw data chunk cache */
-    H5D_rdcc_ent_t     *ent;            /* Cache entry  */
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    hsize_t chunk_bytes = 0;            /* Number of bytes allocated for chunks */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_chk_idx_info_t idx_info;                            /* Chunked index info */
+    const H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /* Raw data chunk cache */
+    H5D_rdcc_ent_t *   ent;                                 /* Cache entry  */
+    H5D_dxpl_cache_t   _dxpl_cache;                         /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t * dxpl_cache  = &_dxpl_cache;          /* Data transfer property cache */
+    hsize_t            chunk_bytes = 0;                     /* Number of bytes allocated for chunks */
+    herr_t             ret_value   = SUCCEED;               /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -3452,26 +3409,28 @@ H5D__chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes)
     HDassert(dset->shared);
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Search for cached chunks that haven't been written out */
-    for(ent = rdcc->head; ent; ent = ent->next) {
+    for (ent = rdcc->head; ent; ent = ent->next) {
         /* Flush the chunk out to disk, to make certain the size is correct later */
-        if(H5D__chunk_flush_entry(dset, dxpl_id, dxpl_cache, ent, FALSE) < 0)
+        if (H5D__chunk_flush_entry(dset, dxpl_id, dxpl_cache, ent, FALSE) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "cannot flush indexed storage buffer")
     } /* end for */
 
     /* Compose chunked index info struct */
-    idx_info.f = dset->oloc.file;
+    idx_info.f       = dset->oloc.file;
     idx_info.dxpl_id = dxpl_id;
-    idx_info.pline = &dset->shared->dcpl_cache.pline;
-    idx_info.layout = &dset->shared->layout.u.chunk;
+    idx_info.pline   = &dset->shared->dcpl_cache.pline;
+    idx_info.layout  = &dset->shared->layout.u.chunk;
     idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
     /* Iterate over the chunks */
-    if((dset->shared->layout.storage.u.chunk.ops->iterate)(&idx_info, H5D__chunk_allocated_cb, &chunk_bytes) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve allocated chunk information from index")
+    if ((dset->shared->layout.storage.u.chunk.ops->iterate)(&idx_info, H5D__chunk_allocated_cb,
+                                                            &chunk_bytes) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL,
+                    "unable to retrieve allocated chunk information from index")
 
     /* Set number of bytes for caller */
     *nbytes = chunk_bytes;
@@ -3480,7 +3439,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_allocated() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_allocate
  *
@@ -3496,37 +3454,37 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
-    hsize_t old_dim[])
+H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite, hsize_t old_dim[])
 {
-    H5D_chk_idx_info_t idx_info;        /* Chunked index info */
-    const H5D_chunk_ops_t *ops = dset->shared->layout.storage.u.chunk.ops;      /* Chunk operations */
-    hsize_t     min_unalloc[H5O_LAYOUT_NDIMS]; /* First chunk in each dimension that is unallocated */
-    hsize_t     max_unalloc[H5O_LAYOUT_NDIMS]; /* Last chunk in each dimension that is unallocated */
-    hsize_t    chunk_offset[H5O_LAYOUT_NDIMS]; /* Offset of current chunk */
-    size_t    orig_chunk_size; /* Original size of chunk in bytes */
-    size_t      chunk_size;      /* Actual size of chunk in bytes, possibly filtered */
-    unsigned    filter_mask = 0; /* Filter mask for chunks that have them */
-    const H5O_layout_t *layout = &(dset->shared->layout);       /* Dataset layout */
-    const H5O_pline_t *pline = &(dset->shared->dcpl_cache.pline);    /* I/O pipeline info */
-    const H5O_fill_t *fill = &(dset->shared->dcpl_cache.fill);    /* Fill value info */
-    H5D_fill_value_t fill_status; /* The fill value status */
-    hbool_t     should_fill = FALSE; /* Whether fill values should be written */
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
+    H5D_chk_idx_info_t     idx_info;                                       /* Chunked index info */
+    const H5D_chunk_ops_t *ops = dset->shared->layout.storage.u.chunk.ops; /* Chunk operations */
+    hsize_t             min_unalloc[H5O_LAYOUT_NDIMS]; /* First chunk in each dimension that is unallocated */
+    hsize_t             max_unalloc[H5O_LAYOUT_NDIMS]; /* Last chunk in each dimension that is unallocated */
+    hsize_t             chunk_offset[H5O_LAYOUT_NDIMS]; /* Offset of current chunk */
+    size_t              orig_chunk_size;                /* Original size of chunk in bytes */
+    size_t              chunk_size;                     /* Actual size of chunk in bytes, possibly filtered */
+    unsigned            filter_mask = 0;                /* Filter mask for chunks that have them */
+    const H5O_layout_t *layout      = &(dset->shared->layout);           /* Dataset layout */
+    const H5O_pline_t * pline       = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info */
+    const H5O_fill_t *  fill        = &(dset->shared->dcpl_cache.fill);  /* Fill value info */
+    H5D_fill_value_t    fill_status;                                     /* The fill value status */
+    hbool_t             should_fill = FALSE;       /* Whether fill values should be written */
+    H5D_dxpl_cache_t    _dxpl_cache;               /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *  dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
 #ifdef H5_HAVE_PARALLEL
-    hbool_t     blocks_written = FALSE; /* Flag to indicate that chunk was actually written */
-    hbool_t     using_mpi = FALSE;    /* Flag to indicate that the file is being accessed with an MPI-capable file driver */
+    hbool_t blocks_written = FALSE; /* Flag to indicate that chunk was actually written */
+    hbool_t using_mpi =
+        FALSE; /* Flag to indicate that the file is being accessed with an MPI-capable file driver */
     H5D_chunk_coll_info_t chunk_info; /* chunk address information for doing I/O */
-#endif /* H5_HAVE_PARALLEL */
-    hbool_t    carry;          /* Flag to indicate that chunk increment carrys to higher dimension (sorta) */
-    int         space_ndims;    /* Dataset's space rank */
-    hsize_t     space_dim[H5O_LAYOUT_NDIMS];    /* Dataset's dataspace dimensions */
-    const uint32_t *chunk_dim = layout->u.chunk.dim; /* Convenience pointer to chunk dimensions */
-    int         op_dim;                 /* Current operationg dimension */
-    H5D_fill_buf_info_t fb_info;        /* Dataset's fill buffer info */
-    hbool_t     fb_info_init = FALSE;   /* Whether the fill value buffer has been initialized */
-    herr_t    ret_value = SUCCEED;    /* Return value */
+#endif                                /* H5_HAVE_PARALLEL */
+    hbool_t             carry; /* Flag to indicate that chunk increment carrys to higher dimension (sorta) */
+    int                 space_ndims;                     /* Dataset's space rank */
+    hsize_t             space_dim[H5O_LAYOUT_NDIMS];     /* Dataset's dataspace dimensions */
+    const uint32_t *    chunk_dim = layout->u.chunk.dim; /* Convenience pointer to chunk dimensions */
+    int                 op_dim;                          /* Current operationg dimension */
+    H5D_fill_buf_info_t fb_info;                         /* Dataset's fill buffer info */
+    hbool_t             fb_info_init = FALSE;   /* Whether the fill value buffer has been initialized */
+    herr_t              ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -3536,8 +3494,8 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
     HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
 
     /* Retrieve the dataset dimensions */
-    if((space_ndims = H5S_get_simple_extent_dims(dset->shared->space, space_dim, NULL)) < 0)
-         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get simple dataspace info")
+    if ((space_ndims = H5S_get_simple_extent_dims(dset->shared->space, space_dim, NULL)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get simple dataspace info")
     space_dim[space_ndims] = layout->u.chunk.dim[space_ndims];
 
     /* The last dimension in chunk_offset is always 0 */
@@ -3545,8 +3503,8 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
 
     /* Check if any space dimensions are 0, if so we do not have to do anything
      */
-    for(op_dim=0; op_dim<space_ndims; op_dim++)
-        if(space_dim[op_dim] == 0) {
+    for (op_dim = 0; op_dim < space_ndims; op_dim++)
+        if (space_dim[op_dim] == 0) {
             /* Reset any cached chunk info for this dataset */
             H5D__chunk_cinfo_cache_reset(&dset->shared->cache.chunk.last);
             HGOTO_DONE(SUCCEED)
@@ -3554,25 +3512,25 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
 
 #ifdef H5_HAVE_PARALLEL
     /* Retrieve MPI parameters */
-    if(H5F_HAS_FEATURE(dset->oloc.file, H5FD_FEAT_HAS_MPI)) {
+    if (H5F_HAS_FEATURE(dset->oloc.file, H5FD_FEAT_HAS_MPI)) {
         /* Set the MPI-capable file driver flag */
         using_mpi = TRUE;
 
         /* init chunk info stuff for collective I/O */
         chunk_info.num_io = 0;
-        chunk_info.addr = NULL;
-    } /* end if */
-#endif  /* H5_HAVE_PARALLEL */
+        chunk_info.addr   = NULL;
+    }  /* end if */
+#endif /* H5_HAVE_PARALLEL */
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Get original chunk size */
     H5_CHECKED_ASSIGN(orig_chunk_size, size_t, layout->u.chunk.size, uint32_t);
 
     /* Check the dataset's fill-value status */
-    if(H5P_is_fill_value_defined(fill, &fill_status) < 0)
+    if (H5P_is_fill_value_defined(fill, &fill_status) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined")
 
     /* If we are filling the dataset on allocation or "if set" and
@@ -3580,22 +3538,22 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
      * or if there are any pipeline filters defined,
      * set the "should fill" flag
      */
-    if((!full_overwrite && (fill->fill_time == H5D_FILL_TIME_ALLOC ||
-            (fill->fill_time == H5D_FILL_TIME_IFSET &&
-             (fill_status == H5D_FILL_VALUE_USER_DEFINED ||
-              fill_status == H5D_FILL_VALUE_DEFAULT))))
-            || pline->nused > 0)
+    if ((!full_overwrite &&
+         (fill->fill_time == H5D_FILL_TIME_ALLOC ||
+          (fill->fill_time == H5D_FILL_TIME_IFSET &&
+           (fill_status == H5D_FILL_VALUE_USER_DEFINED || fill_status == H5D_FILL_VALUE_DEFAULT)))) ||
+        pline->nused > 0)
         should_fill = TRUE;
 
     /* Check if fill values should be written to chunks */
-    if(should_fill) {
+    if (should_fill) {
         /* Initialize the fill value buffer */
         /* (delay allocating fill buffer for VL datatypes until refilling) */
         /* (casting away const OK - QAK) */
-        if(H5D__fill_init(&fb_info, NULL, (H5MM_allocate_t)H5D__chunk_alloc,
-                (void *)pline, (H5MM_free_t)H5D__chunk_xfree, (void *)pline,
-                &dset->shared->dcpl_cache.fill, dset->shared->type,
-                dset->shared->type_id, (size_t)0, orig_chunk_size, dxpl_id) < 0)
+        if (H5D__fill_init(&fb_info, NULL, (H5MM_allocate_t)H5D__chunk_alloc, (void *)pline,
+                           (H5MM_free_t)H5D__chunk_xfree, (void *)pline, &dset->shared->dcpl_cache.fill,
+                           dset->shared->type, dset->shared->type_id, (size_t)0, orig_chunk_size,
+                           dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize fill buffer info")
         fb_info_init = TRUE;
 
@@ -3603,35 +3561,35 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
         /* (only do this in advance when the chunk info can be re-used (i.e.
          *      it doesn't contain any non-default VL datatype fill values)
          */
-        if(!fb_info.has_vlen_fill_type && pline->nused > 0) {
+        if (!fb_info.has_vlen_fill_type && pline->nused > 0) {
             size_t buf_size = orig_chunk_size;
 
             /* Push the chunk through the filters */
-            if(H5Z_pipeline(pline, 0, &filter_mask, dxpl_cache->err_detect, dxpl_cache->filter_cb, &orig_chunk_size, &buf_size, &fb_info.fill_buf) < 0)
+            if (H5Z_pipeline(pline, 0, &filter_mask, dxpl_cache->err_detect, dxpl_cache->filter_cb,
+                             &orig_chunk_size, &buf_size, &fb_info.fill_buf) < 0)
                 HGOTO_ERROR(H5E_PLINE, H5E_WRITEERROR, FAIL, "output pipeline failed")
 #if H5_SIZEOF_SIZE_T > 4
             /* Check for the chunk expanding too much to encode in a 32-bit value */
-            if(orig_chunk_size > ((size_t)0xffffffff))
+            if (orig_chunk_size > ((size_t)0xffffffff))
                 HGOTO_ERROR(H5E_DATASET, H5E_BADRANGE, FAIL, "chunk too large for 32-bit length")
-#endif /* H5_SIZEOF_SIZE_T > 4 */
+#endif    /* H5_SIZEOF_SIZE_T > 4 */
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Compose chunked index info struct */
-    idx_info.f = dset->oloc.file;
+    idx_info.f       = dset->oloc.file;
     idx_info.dxpl_id = dxpl_id;
-    idx_info.pline = &dset->shared->dcpl_cache.pline;
-    idx_info.layout = &dset->shared->layout.u.chunk;
+    idx_info.pline   = &dset->shared->dcpl_cache.pline;
+    idx_info.layout  = &dset->shared->layout.u.chunk;
     idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
     /* Calculate the minimum and maximum chunk offsets in each dimension.  Note
      * that we assume here that all elements of space_dim are > 0.  This is
      * checked at the top of this function */
-    for(op_dim=0; op_dim<space_ndims; op_dim++) {
-        min_unalloc[op_dim] = ((old_dim[op_dim] + chunk_dim[op_dim] - 1)
-                / chunk_dim[op_dim]) * chunk_dim[op_dim];
-        max_unalloc[op_dim] = ((space_dim[op_dim] - 1) / chunk_dim[op_dim])
-                * chunk_dim[op_dim];
+    for (op_dim = 0; op_dim < space_ndims; op_dim++) {
+        min_unalloc[op_dim] =
+            ((old_dim[op_dim] + chunk_dim[op_dim] - 1) / chunk_dim[op_dim]) * chunk_dim[op_dim];
+        max_unalloc[op_dim] = ((space_dim[op_dim] - 1) / chunk_dim[op_dim]) * chunk_dim[op_dim];
     } /* end for */
 
     /* Loop over all chunks */
@@ -3652,12 +3610,12 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
      * certain dimension, max_unalloc is updated in order to avoid allocating
      * those chunks again.
      */
-    for(op_dim=0; op_dim<space_ndims; op_dim++) {
-        H5D_chunk_ud_t udata;   /* User data for querying chunk info */
-        int i;                  /* Local index variable */
+    for (op_dim = 0; op_dim < space_ndims; op_dim++) {
+        H5D_chunk_ud_t udata; /* User data for querying chunk info */
+        int            i;     /* Local index variable */
 
         /* Check if allocation along this dimension is really necessary */
-        if(min_unalloc[op_dim] > max_unalloc[op_dim])
+        if (min_unalloc[op_dim] > max_unalloc[op_dim])
             continue;
         else {
             /* Reset the chunk offset indices */
@@ -3667,7 +3625,7 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
             carry = FALSE;
         } /* end else */
 
-        while(!carry) {
+        while (!carry) {
             /* Reset size of chunk in bytes, in case filtered size changes */
             chunk_size = orig_chunk_size;
 
@@ -3677,12 +3635,11 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
                 hsize_t chunk_idx;
 
                 /* Calculate the index of this chunk */
-                if(H5VM_chunk_index((unsigned)space_ndims, chunk_offset,
-                        layout->u.chunk.dim, layout->u.chunk.down_chunks,
-                        &chunk_idx) < 0)
+                if (H5VM_chunk_index((unsigned)space_ndims, chunk_offset, layout->u.chunk.dim,
+                                     layout->u.chunk.down_chunks, &chunk_idx) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't get chunk index")
 
-                if(H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
+                if (H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chunk_idx, &udata) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
 
                 HDassert(!H5F_addr_defined(udata.addr));
@@ -3691,89 +3648,92 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
             /* Make sure the chunk is really in the dataset and outside the
              * original dimensions */
             {
-                unsigned u;             /* Local index variable */
-                hbool_t outside_orig = FALSE;
+                unsigned u; /* Local index variable */
+                hbool_t  outside_orig = FALSE;
 
-                for(u = 0; u < (unsigned)space_ndims; u++) {
+                for (u = 0; u < (unsigned)space_ndims; u++) {
                     HDassert(chunk_offset[u] < space_dim[u]);
-                    if(chunk_offset[u] >= old_dim[u])
+                    if (chunk_offset[u] >= old_dim[u])
                         outside_orig = TRUE;
                 } /* end for */
                 HDassert(outside_orig);
             } /* end block */
-#endif /* NDEBUG */
+#endif        /* NDEBUG */
 
             /* Check for VL datatype & non-default fill value */
-            if(fb_info_init && fb_info.has_vlen_fill_type) {
+            if (fb_info_init && fb_info.has_vlen_fill_type) {
                 /* Sanity check */
                 HDassert(should_fill);
 #ifdef H5_HAVE_PARALLEL
-                HDassert(!using_mpi);   /* Can't write VL datatypes in parallel currently */
+                HDassert(!using_mpi); /* Can't write VL datatypes in parallel currently */
 #endif
 
                 /* Check to make sure the buffer is large enough.  It is
                  * possible (though ill-advised) for the filter to shrink the
                  * buffer. */
-                if(fb_info.fill_buf_size < orig_chunk_size) {
-                    if(NULL == (fb_info.fill_buf = H5D__chunk_realloc(
-                            fb_info.fill_buf, orig_chunk_size, pline)))
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory reallocation failed for raw data chunk")
+                if (fb_info.fill_buf_size < orig_chunk_size) {
+                    if (NULL ==
+                        (fb_info.fill_buf = H5D__chunk_realloc(fb_info.fill_buf, orig_chunk_size, pline)))
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                    "memory reallocation failed for raw data chunk")
                     fb_info.fill_buf_size = orig_chunk_size;
                 } /* end if */
 
                 /* Fill the buffer with VL datatype fill values */
-                if(H5D__fill_refill_vl(&fb_info, fb_info.elmts_per_buf, dxpl_id) < 0)
+                if (H5D__fill_refill_vl(&fb_info, fb_info.elmts_per_buf, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "can't refill fill value buffer")
 
                 /* Check if there are filters which need to be applied to the chunk */
-                if(pline->nused > 0) {
+                if (pline->nused > 0) {
                     size_t nbytes = orig_chunk_size;
 
                     /* Push the chunk through the filters */
-                    if(H5Z_pipeline(pline, 0, &filter_mask, dxpl_cache->err_detect, dxpl_cache->filter_cb, &nbytes, &fb_info.fill_buf_size, &fb_info.fill_buf) < 0)
+                    if (H5Z_pipeline(pline, 0, &filter_mask, dxpl_cache->err_detect, dxpl_cache->filter_cb,
+                                     &nbytes, &fb_info.fill_buf_size, &fb_info.fill_buf) < 0)
                         HGOTO_ERROR(H5E_PLINE, H5E_WRITEERROR, FAIL, "output pipeline failed")
 
 #if H5_SIZEOF_SIZE_T > 4
                     /* Check for the chunk expanding too much to encode in a 32-bit value */
-                    if(nbytes > ((size_t)0xffffffff))
+                    if (nbytes > ((size_t)0xffffffff))
                         HGOTO_ERROR(H5E_DATASET, H5E_BADRANGE, FAIL, "chunk too large for 32-bit length")
 #endif /* H5_SIZEOF_SIZE_T > 4 */
 
                     /* Keep the number of bytes the chunk turned in to */
                     chunk_size = nbytes;
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             /* Initialize the chunk information */
-            udata.common.layout = &layout->u.chunk;
+            udata.common.layout  = &layout->u.chunk;
             udata.common.storage = &layout->storage.u.chunk;
-            udata.common.offset = chunk_offset;
-            udata.common.rdcc = NULL;
+            udata.common.offset  = chunk_offset;
+            udata.common.rdcc    = NULL;
             H5_CHECKED_ASSIGN(udata.nbytes, uint32_t, chunk_size, size_t);
             udata.filter_mask = filter_mask;
-            udata.addr = HADDR_UNDEF;
+            udata.addr        = HADDR_UNDEF;
 
             /* Allocate the chunk with all processes */
-            if((ops->insert)(&idx_info, &udata) < 0)
+            if ((ops->insert)(&idx_info, &udata) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert record into chunk index")
             HDassert(H5F_addr_defined(udata.addr));
 
             /* Check if fill values should be written to chunks */
-            if(should_fill) {
+            if (should_fill) {
                 /* Sanity check */
                 HDassert(fb_info_init);
                 HDassert(udata.nbytes == chunk_size);
 
 #ifdef H5_HAVE_PARALLEL
                 /* Check if this file is accessed with an MPI-capable file driver */
-                if(using_mpi) {
+                if (using_mpi) {
                     /* collect all chunk addresses to be written to
                        write collectively at the end */
                     /* allocate/resize address array if no more space left */
-                    if(0 == chunk_info.num_io % 1024) {
-                        if(NULL == (chunk_info.addr = (haddr_t *)HDrealloc
-                                    (chunk_info.addr, (chunk_info.num_io + 1024) * sizeof(haddr_t))))
-                            HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "memory allocation failed for chunk addresses");
+                    if (0 == chunk_info.num_io % 1024) {
+                        if (NULL == (chunk_info.addr = (haddr_t *)HDrealloc(
+                                         chunk_info.addr, (chunk_info.num_io + 1024) * sizeof(haddr_t))))
+                            HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL,
+                                        "memory allocation failed for chunk addresses");
                     } /* end if */
 
                     /* Store the chunk's address for later */
@@ -3785,35 +3745,35 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
                 } /* end if */
                 else {
 #endif /* H5_HAVE_PARALLEL */
-                    if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, chunk_size,
-                                       dxpl_id, fb_info.fill_buf) < 0)
+                    if (H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, chunk_size, dxpl_id,
+                                        fb_info.fill_buf) < 0)
                         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
 #ifdef H5_HAVE_PARALLEL
                 } /* end else */
-#endif /* H5_HAVE_PARALLEL */
-            } /* end if */
+#endif            /* H5_HAVE_PARALLEL */
+            }     /* end if */
 
             /* Increment indices */
             carry = TRUE;
-            for(i = ((int)space_ndims - 1); i >= 0; --i) {
+            for (i = ((int)space_ndims - 1); i >= 0; --i) {
                 chunk_offset[i] += chunk_dim[i];
-                if(chunk_offset[i] > max_unalloc[i]) {
-                    if(i == op_dim)
+                if (chunk_offset[i] > max_unalloc[i]) {
+                    if (i == op_dim)
                         chunk_offset[i] = min_unalloc[i];
                     else
                         chunk_offset[i] = 0;
-        } /* end if */
+                } /* end if */
                 else {
                     carry = FALSE;
                     break;
                 } /* end else */
-            } /* end for */
-        } /* end while(!carry) */
+            }     /* end for */
+        }         /* end while(!carry) */
 
         /* Adjust max_unalloc so we don't allocate the same chunk twice.  Also
          * check if this dimension started from 0 (and hence allocated all of
          * the chunks. */
-        if(min_unalloc[op_dim] == 0)
+        if (min_unalloc[op_dim] == 0)
             break;
         else
             max_unalloc[op_dim] = min_unalloc[op_dim] - chunk_dim[op_dim];
@@ -3821,10 +3781,10 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
 
 #ifdef H5_HAVE_PARALLEL
     /* do final collective I/O */
-    if(using_mpi && blocks_written) {
-        if(H5D__chunk_collective_fill(dset, dxpl_id, &chunk_info, chunk_size, fb_info.fill_buf) < 0)
+    if (using_mpi && blocks_written) {
+        if (H5D__chunk_collective_fill(dset, dxpl_id, &chunk_info, chunk_size, fb_info.fill_buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
     /* Reset any cached chunk info for this dataset */
@@ -3832,12 +3792,12 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
 
 done:
     /* Release the fill buffer info, if it's been initialized */
-    if(fb_info_init && H5D__fill_term(&fb_info) < 0)
+    if (fb_info_init && H5D__fill_term(&fb_info) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release fill buffer info")
 
 #ifdef H5_HAVE_PARALLEL
-    if(using_mpi) {
-        if(chunk_info.addr)
+    if (using_mpi) {
+        if (chunk_info.addr)
             HDfree(chunk_info.addr);
     } /* end if */
 #endif
@@ -3846,7 +3806,7 @@ done:
 } /* end H5D__chunk_allocate() */
 
 #ifdef H5_HAVE_PARALLEL
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_collective_fill
  *
@@ -3862,39 +3822,39 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id,
-    H5D_chunk_coll_info_t *chunk_info, size_t chunk_size, const void *fill_buf)
+H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id, H5D_chunk_coll_info_t *chunk_info,
+                           size_t chunk_size, const void *fill_buf)
 {
-    MPI_Comm    mpi_comm = MPI_COMM_NULL;    /* MPI communicator for file */
-    int         mpi_rank = (-1);    /* This process's rank  */
-    int         mpi_size = (-1);    /* MPI Comm size  */
-    int         mpi_code;           /* MPI return code */
-    size_t      num_blocks;         /* Number of blocks between processes. */
-    size_t      leftover_blocks;    /* Number of leftover blocks to handle */
-    int         blocks, leftover, block_len; /* converted to int for MPI */
-    MPI_Aint    *chunk_disp_array = NULL;
-    int         *block_lens = NULL;
+    MPI_Comm     mpi_comm = MPI_COMM_NULL;    /* MPI communicator for file */
+    int          mpi_rank = (-1);             /* This process's rank  */
+    int          mpi_size = (-1);             /* MPI Comm size  */
+    int          mpi_code;                    /* MPI return code */
+    size_t       num_blocks;                  /* Number of blocks between processes. */
+    size_t       leftover_blocks;             /* Number of leftover blocks to handle */
+    int          blocks, leftover, block_len; /* converted to int for MPI */
+    MPI_Aint *   chunk_disp_array = NULL;
+    int *        block_lens       = NULL;
     MPI_Datatype mem_type, file_type;
-    hid_t       data_dxpl_id = -1;  /* DXPL ID to use for raw data I/O operations */
-    int         i;                  /* Local index variable */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    hid_t        data_dxpl_id = -1;   /* DXPL ID to use for raw data I/O operations */
+    int          i;                   /* Local index variable */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Get the MPI communicator */
-    if(MPI_COMM_NULL == (mpi_comm = H5F_mpi_get_comm(dset->oloc.file)))
+    if (MPI_COMM_NULL == (mpi_comm = H5F_mpi_get_comm(dset->oloc.file)))
         HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI communicator")
 
     /* Get the MPI rank */
-    if((mpi_rank = H5F_mpi_get_rank(dset->oloc.file)) < 0)
+    if ((mpi_rank = H5F_mpi_get_rank(dset->oloc.file)) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank")
 
     /* Get the MPI size */
-    if((mpi_size = H5F_mpi_get_size(dset->oloc.file)) < 0)
+    if ((mpi_size = H5F_mpi_get_size(dset->oloc.file)) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI size")
 
     /* Get a copy of the DXPL, to modify */
-    if((data_dxpl_id = H5P_copy_plist((H5P_genplist_t *)H5I_object(dxpl_id), TRUE)) < 0)
+    if ((data_dxpl_id = H5P_copy_plist((H5P_genplist_t *)H5I_object(dxpl_id), TRUE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy property list")
 
     /* Distribute evenly the number of blocks between processes. */
@@ -3908,34 +3868,34 @@ H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id,
     /* Cast values to types needed by MPI */
     H5_CHECKED_ASSIGN(blocks, int, num_blocks, size_t);
     H5_CHECKED_ASSIGN(leftover, int, leftover_blocks, size_t);
-    H5_CHECKED_ASSIGN(block_len, int,  chunk_size, size_t);
+    H5_CHECKED_ASSIGN(block_len, int, chunk_size, size_t);
 
     /* Allocate buffers */
     /* (MSC - should not need block_lens if MPI_type_create_hindexed_block is working) */
-    if(NULL == (block_lens = (int *)H5MM_malloc((blocks + 1) * sizeof(int))))
+    if (NULL == (block_lens = (int *)H5MM_malloc((blocks + 1) * sizeof(int))))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk lengths buffer")
-    if(NULL == (chunk_disp_array = (MPI_Aint *)H5MM_malloc((blocks + 1) * sizeof(MPI_Aint))))
+    if (NULL == (chunk_disp_array = (MPI_Aint *)H5MM_malloc((blocks + 1) * sizeof(MPI_Aint))))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk file displacement buffer")
 
-    for(i = 0 ; i < blocks ; i++) {
+    for (i = 0; i < blocks; i++) {
         /* store the chunk address as an MPI_Aint */
-        chunk_disp_array[i] = (MPI_Aint)(chunk_info->addr[i + mpi_rank*blocks]);
+        chunk_disp_array[i] = (MPI_Aint)(chunk_info->addr[i + mpi_rank * blocks]);
 
         /* MSC - should not need this if MPI_type_create_hindexed_block is working */
         block_lens[i] = block_len;
 
         /* make sure that the addresses in the datatype are
            monotonically non decreasing */
-        if(i)
+        if (i)
             HDassert(chunk_disp_array[i] > chunk_disp_array[i - 1]);
     } /* end if */
 
     /* calculate if there are any leftover blocks after evenly
        distributing. If there are, then round robin the distribution
        to processes 0 -> leftover. */
-    if(leftover && leftover > mpi_rank) {
-        chunk_disp_array[blocks] = (MPI_Aint)chunk_info->addr[blocks*mpi_size + mpi_rank];
-        block_lens[blocks] = block_len;
+    if (leftover && leftover > mpi_rank) {
+        chunk_disp_array[blocks] = (MPI_Aint)chunk_info->addr[blocks * mpi_size + mpi_rank];
+        block_lens[blocks]       = block_len;
         blocks++;
     }
 
@@ -3943,70 +3903,70 @@ H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id,
      * should not have a special case for blocks == 0, but ompi (as of 1.8.1) has a bug
      * in file_set_view when a zero size datatype is create with hindexed or hvector.
      */
-    if(0 == blocks) {
+    if (0 == blocks) {
         mpi_code = MPI_Type_contiguous(0, MPI_BYTE, &file_type);
-        if(mpi_code != MPI_SUCCESS)
+        if (mpi_code != MPI_SUCCESS)
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
         mpi_code = MPI_Type_contiguous(0, MPI_BYTE, &mem_type);
-        if(mpi_code != MPI_SUCCESS)
+        if (mpi_code != MPI_SUCCESS)
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
     }
     else {
         /* MSC
          * should use this if MPI_type_create_hindexed block is working
-         * mpi_code = MPI_Type_create_hindexed_block(blocks, block_len, chunk_disp_array, MPI_BYTE, &file_type);
+         * mpi_code = MPI_Type_create_hindexed_block(blocks, block_len, chunk_disp_array, MPI_BYTE,
+         * &file_type);
          */
-        mpi_code = MPI_Type_create_hindexed(blocks, block_lens, chunk_disp_array,
-                                            MPI_BYTE, &file_type);
-        if(mpi_code != MPI_SUCCESS)
+        mpi_code = MPI_Type_create_hindexed(blocks, block_lens, chunk_disp_array, MPI_BYTE, &file_type);
+        if (mpi_code != MPI_SUCCESS)
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_hindexed failed", mpi_code)
         mpi_code = MPI_Type_create_hvector(blocks, block_len, 0, MPI_BYTE, &mem_type);
-        if(mpi_code != MPI_SUCCESS)
+        if (mpi_code != MPI_SUCCESS)
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_hvector failed", mpi_code)
     }
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&file_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(&file_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&mem_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(&mem_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
 
     /* set MPI-IO VFD properties */
     {
         H5FD_mpio_xfer_t xfer_mode = H5FD_MPIO_COLLECTIVE;
-        H5P_genplist_t  *plist;      /* Property list pointer */
+        H5P_genplist_t * plist; /* Property list pointer */
 
-        if(NULL == (plist = H5P_object_verify(data_dxpl_id, H5P_DATASET_XFER)))
+        if (NULL == (plist = H5P_object_verify(data_dxpl_id, H5P_DATASET_XFER)))
             HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dataset transfer list")
 
         /* Set buffer MPI type */
-        if(H5P_set(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, &mem_type) < 0)
+        if (H5P_set(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, &mem_type) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O property")
 
         /* Set File MPI type */
-        if(H5P_set(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, &file_type) < 0)
+        if (H5P_set(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, &file_type) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O property")
 
         /* set transfer mode */
-        if(H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
+        if (H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
     }
 
     /* low level write */
-    if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, (haddr_t)0, (blocks) ? (size_t)1 : (size_t)0,
-                       data_dxpl_id, fill_buf) < 0)
+    if (H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, (haddr_t)0, (blocks) ? (size_t)1 : (size_t)0,
+                        data_dxpl_id, fill_buf) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
 
     /* Barrier so processes don't race ahead */
-    if(MPI_SUCCESS != (mpi_code = MPI_Barrier(mpi_comm)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Barrier(mpi_comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
 
 done:
-    if(data_dxpl_id > 0 && H5I_dec_ref(data_dxpl_id) < 0)
+    if (data_dxpl_id > 0 && H5I_dec_ref(data_dxpl_id) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't free property list")
 
     /* free things */
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_free(&file_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_free(&file_type)))
         HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_free(&mem_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_free(&mem_type)))
         HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
     H5MM_xfree(chunk_disp_array);
     H5MM_xfree(block_lens);
@@ -4015,7 +3975,6 @@ done:
 } /* end H5D__chunk_collective_fill() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_prune_fill
  *
@@ -4032,21 +3991,21 @@ done:
 static herr_t
 H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata)
 {
-    const H5D_io_info_t *io_info = udata->io_info; /* Local pointer to I/O info */
-    const H5D_t *dset = io_info->dset;  /* Local pointer to the dataset info */
-    const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset's layout */
-    unsigned    rank = udata->common.layout->ndims - 1; /* Dataset rank */
-    const hsize_t *chunk_offset = io_info->store->chunk.offset; /* Chunk offset */
-    H5S_sel_iter_t chunk_iter;          /* Memory selection iteration info */
-    hssize_t    sel_nelmts;             /* Number of elements in selection */
-    hsize_t     count[H5O_LAYOUT_NDIMS]; /* Element count of hyperslab */
-    size_t      chunk_size;             /*size of a chunk       */
-    void        *chunk;                    /* The file chunk  */
-    H5D_chunk_ud_t chk_udata;           /* User data for locking chunk */
-    uint32_t    bytes_accessed;         /* Bytes accessed in chunk */
-    hbool_t     chunk_iter_init = FALSE; /* Whether the chunk iterator has been initialized */
-    unsigned    u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    const H5D_io_info_t *io_info      = udata->io_info;          /* Local pointer to I/O info */
+    const H5D_t *        dset         = io_info->dset;           /* Local pointer to the dataset info */
+    const H5O_layout_t * layout       = &(dset->shared->layout); /* Dataset's layout */
+    unsigned             rank         = udata->common.layout->ndims - 1; /* Dataset rank */
+    const hsize_t *      chunk_offset = io_info->store->chunk.offset;    /* Chunk offset */
+    H5S_sel_iter_t       chunk_iter;                                     /* Memory selection iteration info */
+    hssize_t             sel_nelmts;                                     /* Number of elements in selection */
+    hsize_t              count[H5O_LAYOUT_NDIMS];                        /* Element count of hyperslab */
+    size_t               chunk_size;                                     /*size of a chunk       */
+    void *               chunk;                                          /* The file chunk  */
+    H5D_chunk_ud_t       chk_udata;                                      /* User data for locking chunk */
+    uint32_t             bytes_accessed;                                 /* Bytes accessed in chunk */
+    hbool_t              chunk_iter_init = FALSE; /* Whether the chunk iterator has been initialized */
+    unsigned             u;                       /* Local index variable */
+    herr_t               ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -4055,45 +4014,42 @@ H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata)
     H5_CHECKED_ASSIGN(chunk_size, size_t, layout->u.chunk.size, uint32_t);
 
     /* Get the info for the chunk in the file */
-    if(H5D__chunk_lookup(dset, io_info->dxpl_id, chunk_offset, io_info->store->chunk.index, &chk_udata) < 0)
+    if (H5D__chunk_lookup(dset, io_info->dxpl_id, chunk_offset, io_info->store->chunk.index, &chk_udata) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk address")
 
     /* If this chunk does not exist in cache or on disk, no need to do anything
      */
-    if(!H5F_addr_defined(chk_udata.addr) && UINT_MAX == chk_udata.idx_hint)
+    if (!H5F_addr_defined(chk_udata.addr) && UINT_MAX == chk_udata.idx_hint)
         HGOTO_DONE(SUCCEED)
 
     /* Initialize the fill value buffer, if necessary */
-    if(!udata->fb_info_init) {
+    if (!udata->fb_info_init) {
         H5_CHECK_OVERFLOW(udata->elmts_per_chunk, uint32_t, size_t);
-        if(H5D__fill_init(&udata->fb_info, NULL, NULL, NULL, NULL, NULL,
-                &dset->shared->dcpl_cache.fill,
-                dset->shared->type, dset->shared->type_id, (size_t)udata->elmts_per_chunk,
-                chunk_size, io_info->dxpl_id) < 0)
+        if (H5D__fill_init(&udata->fb_info, NULL, NULL, NULL, NULL, NULL, &dset->shared->dcpl_cache.fill,
+                           dset->shared->type, dset->shared->type_id, (size_t)udata->elmts_per_chunk,
+                           chunk_size, io_info->dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize fill buffer info")
         udata->fb_info_init = TRUE;
     } /* end if */
 
     /* Compute the # of elements to leave with existing value, in each dimension */
-    for(u = 0; u < rank; u++) {
-        count[u] = MIN(layout->u.chunk.dim[u], (udata->space_dim[u]
-                - chunk_offset[u]));
+    for (u = 0; u < rank; u++) {
+        count[u] = MIN(layout->u.chunk.dim[u], (udata->space_dim[u] - chunk_offset[u]));
         HDassert(count[u] > 0);
     } /* end for */
 
     /* Select all elements in chunk, to begin with */
-    if(H5S_select_all(udata->chunk_space, TRUE) < 0)
+    if (H5S_select_all(udata->chunk_space, TRUE) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "unable to select space")
 
     /* "Subtract out" the elements to keep */
-    if(H5S_select_hyperslab(udata->chunk_space, H5S_SELECT_NOTB, udata->hyper_start, NULL, count, NULL) < 0)
+    if (H5S_select_hyperslab(udata->chunk_space, H5S_SELECT_NOTB, udata->hyper_start, NULL, count, NULL) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "unable to select hyperslab")
 
     /* Lock the chunk into the cache, to get a pointer to the chunk buffer */
-    if(NULL == (chunk = (void *)H5D__chunk_lock(io_info, &chk_udata, FALSE)))
+    if (NULL == (chunk = (void *)H5D__chunk_lock(io_info, &chk_udata, FALSE)))
         HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "unable to lock raw data chunk")
 
-
     /* Fill the selection in the memory buffer */
     /* Use the size of the elements in the chunk directly instead of */
     /* relying on the fill.size, which might be set to 0 if there is */
@@ -4105,39 +4061,38 @@ H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata)
     H5_CHECK_OVERFLOW(sel_nelmts, hssize_t, size_t);
 
     /* Check for VL datatype & non-default fill value */
-    if(udata->fb_info.has_vlen_fill_type)
+    if (udata->fb_info.has_vlen_fill_type)
         /* Re-fill the buffer to use for this I/O operation */
-        if(H5D__fill_refill_vl(&udata->fb_info, (size_t)sel_nelmts, io_info->dxpl_id) < 0)
+        if (H5D__fill_refill_vl(&udata->fb_info, (size_t)sel_nelmts, io_info->dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "can't refill fill value buffer")
 
     /* Create a selection iterator for scattering the elements to memory buffer */
-    if(H5S_select_iter_init(&chunk_iter, udata->chunk_space, layout->u.chunk.dim[rank]) < 0)
+    if (H5S_select_iter_init(&chunk_iter, udata->chunk_space, layout->u.chunk.dim[rank]) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize chunk selection information")
     chunk_iter_init = TRUE;
 
     /* Scatter the data into memory */
-    if(H5D__scatter_mem(udata->fb_info.fill_buf, udata->chunk_space, &chunk_iter, (size_t)sel_nelmts, io_info->dxpl_cache, chunk/*out*/) < 0)
+    if (H5D__scatter_mem(udata->fb_info.fill_buf, udata->chunk_space, &chunk_iter, (size_t)sel_nelmts,
+                         io_info->dxpl_cache, chunk /*out*/) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "scatter failed")
 
-
     /* The number of bytes accessed in the chunk */
     /* (i.e. the bytes replaced with fill values) */
     H5_CHECK_OVERFLOW(sel_nelmts, hssize_t, uint32_t);
     bytes_accessed = (uint32_t)sel_nelmts * layout->u.chunk.dim[rank];
 
     /* Release lock on chunk */
-    if(H5D__chunk_unlock(io_info, &chk_udata, TRUE, chunk, bytes_accessed) < 0)
+    if (H5D__chunk_unlock(io_info, &chk_udata, TRUE, chunk, bytes_accessed) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to unlock raw data chunk")
 
 done:
     /* Release the selection iterator */
-    if(chunk_iter_init && H5S_SELECT_ITER_RELEASE(&chunk_iter) < 0)
+    if (chunk_iter_init && H5S_SELECT_ITER_RELEASE(&chunk_iter) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_prune_fill */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_prune_by_extent
  *
@@ -4240,37 +4195,39 @@ done:
 herr_t
 H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
 {
-    hsize_t                 min_mod_chunk_off[H5O_LAYOUT_NDIMS]; /* Offset of first chunk to modify in each dimension */
-    hsize_t                 max_mod_chunk_off[H5O_LAYOUT_NDIMS]; /* Offset of last chunk to modify in each dimension */
-    hssize_t                max_fill_chunk_off[H5O_LAYOUT_NDIMS]; /* Offset of last chunk that might be filled in each dimension */
-    hbool_t                 fill_dim[H5O_LAYOUT_NDIMS]; /* Whether the plane of edge chunks in this dimension needs to be filled */
-    hbool_t                 dims_outside_fill[H5O_LAYOUT_NDIMS]; /* Dimensions in chunk offset outside fill dimensions */
-    int                     ndims_outside_fill = 0; /* Number of dimensions in chunk offset outside fill dimensions */
-    hbool_t                 has_fill = FALSE;   /* Whether there are chunks that must be filled */
-    H5D_chk_idx_info_t      idx_info;           /* Chunked index info */
-    H5D_io_info_t           chk_io_info;        /* Chunked I/O info object */
-    H5D_storage_t           chk_store;          /* Chunk storage information */
-    H5D_dxpl_cache_t        _dxpl_cache;        /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t       *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    const H5O_layout_t     *layout = &(dset->shared->layout);   /* Dataset's layout */
-    const H5D_rdcc_t       *rdcc = &(dset->shared->cache.chunk);    /*raw data chunk cache */
-    H5D_rdcc_ent_t         *ent = NULL;            /* Cache entry  */
-    int                     space_ndims;        /* Dataset's space rank */
-    hsize_t                 space_dim[H5O_LAYOUT_NDIMS]; /* Current dataspace dimensions */
-    int                     op_dim;             /* Current operationg dimension */
-    hbool_t                 shrunk_dim[H5O_LAYOUT_NDIMS]; /* Dimensions which have shrunk */
-    H5D_chunk_it_ud1_t      udata;      /* Chunk index iterator user data */
-    hbool_t                 udata_init = FALSE; /* Whether the chunk index iterator user data has been initialized */
-    H5D_chunk_common_ud_t   idx_udata;          /* User data for index removal routine */
-    H5D_chunk_ud_t          chk_udata;          /* User data for getting chunk info */
-    H5S_t                  *chunk_space = NULL;         /* Dataspace for a chunk */
-    hsize_t                 chunk_dim[H5O_LAYOUT_NDIMS];   /* Chunk dimensions */
-    hsize_t                 chunk_offset[H5O_LAYOUT_NDIMS]; /* Offset of current chunk */
-    hsize_t                 hyper_start[H5O_LAYOUT_NDIMS];  /* Starting location of hyperslab */
-    uint32_t                elmts_per_chunk;    /* Elements in chunk */
-    hbool_t                 carry;              /* Flag to indicate that chunk increment carrys to higher dimension (sorta) */
-    unsigned                u;                    /* Local index variable */
-    herr_t                  ret_value = SUCCEED;       /* Return value */
+    hsize_t  min_mod_chunk_off[H5O_LAYOUT_NDIMS];  /* Offset of first chunk to modify in each dimension */
+    hsize_t  max_mod_chunk_off[H5O_LAYOUT_NDIMS];  /* Offset of last chunk to modify in each dimension */
+    hssize_t max_fill_chunk_off[H5O_LAYOUT_NDIMS]; /* Offset of last chunk that might be filled in each
+                                                      dimension */
+    hbool_t fill_dim[H5O_LAYOUT_NDIMS]; /* Whether the plane of edge chunks in this dimension needs to be
+                                           filled */
+    hbool_t dims_outside_fill[H5O_LAYOUT_NDIMS]; /* Dimensions in chunk offset outside fill dimensions */
+    int     ndims_outside_fill = 0;     /* Number of dimensions in chunk offset outside fill dimensions */
+    hbool_t has_fill           = FALSE; /* Whether there are chunks that must be filled */
+    H5D_chk_idx_info_t  idx_info;       /* Chunked index info */
+    H5D_io_info_t       chk_io_info;    /* Chunked I/O info object */
+    H5D_storage_t       chk_store;      /* Chunk storage information */
+    H5D_dxpl_cache_t    _dxpl_cache;    /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *  dxpl_cache = &_dxpl_cache;                 /* Data transfer property cache */
+    const H5O_layout_t *layout     = &(dset->shared->layout);      /* Dataset's layout */
+    const H5D_rdcc_t *  rdcc       = &(dset->shared->cache.chunk); /*raw data chunk cache */
+    H5D_rdcc_ent_t *    ent        = NULL;                         /* Cache entry  */
+    int                 space_ndims;                               /* Dataset's space rank */
+    hsize_t             space_dim[H5O_LAYOUT_NDIMS];               /* Current dataspace dimensions */
+    int                 op_dim;                                    /* Current operationg dimension */
+    hbool_t             shrunk_dim[H5O_LAYOUT_NDIMS];              /* Dimensions which have shrunk */
+    H5D_chunk_it_ud1_t  udata;                                     /* Chunk index iterator user data */
+    hbool_t udata_init = FALSE;      /* Whether the chunk index iterator user data has been initialized */
+    H5D_chunk_common_ud_t idx_udata; /* User data for index removal routine */
+    H5D_chunk_ud_t        chk_udata; /* User data for getting chunk info */
+    H5S_t *               chunk_space = NULL;             /* Dataspace for a chunk */
+    hsize_t               chunk_dim[H5O_LAYOUT_NDIMS];    /* Chunk dimensions */
+    hsize_t               chunk_offset[H5O_LAYOUT_NDIMS]; /* Offset of current chunk */
+    hsize_t               hyper_start[H5O_LAYOUT_NDIMS];  /* Starting location of hyperslab */
+    uint32_t              elmts_per_chunk;                /* Elements in chunk */
+    hbool_t  carry; /* Flag to indicate that chunk increment carrys to higher dimension (sorta) */
+    unsigned u;     /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -4280,21 +4237,20 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
     HDassert(dxpl_cache);
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Go get the rank & dimensions (including the element size) */
-    if((space_ndims = H5S_get_simple_extent_dims(dset->shared->space, space_dim,
-            NULL)) < 0)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataset dimensions")
+    if ((space_ndims = H5S_get_simple_extent_dims(dset->shared->space, space_dim, NULL)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataset dimensions")
     space_dim[space_ndims] = layout->u.chunk.dim[space_ndims];
 
     /* The last dimension in chunk_offset is always 0 */
     chunk_offset[space_ndims] = (hsize_t)0;
 
     /* Check if any old dimensions are 0, if so we do not have to do anything */
-    for(op_dim=0; op_dim<space_ndims; op_dim++)
-        if(old_dim[op_dim] == 0) {
+    for (op_dim = 0; op_dim < space_ndims; op_dim++)
+        if (old_dim[op_dim] == 0) {
             /* Reset any cached chunk info for this dataset */
             H5D__chunk_cinfo_cache_reset(&dset->shared->cache.chunk.last);
             HGOTO_DONE(SUCCEED)
@@ -4306,15 +4262,15 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
     /* (also copy the chunk dimensions into 'hsize_t' array for creating dataspace) */
     /* (also compute the dimensions which have been shrunk) */
     elmts_per_chunk = 1;
-    for(u = 0; u < (unsigned)space_ndims; u++) {
+    for (u = 0; u < (unsigned)space_ndims; u++) {
         elmts_per_chunk *= layout->u.chunk.dim[u];
-    chunk_dim[u] = layout->u.chunk.dim[u];
-    shrunk_dim[u] = space_dim[u] < old_dim[u];
+        chunk_dim[u]  = layout->u.chunk.dim[u];
+        shrunk_dim[u] = space_dim[u] < old_dim[u];
     } /* end for */
 
     /* Create a dataspace for a chunk & set the extent */
-    if(NULL == (chunk_space = H5S_create_simple((unsigned)space_ndims, chunk_dim, NULL)))
-    HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create simple dataspace")
+    if (NULL == (chunk_space = H5S_create_simple((unsigned)space_ndims, chunk_dim, NULL)))
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create simple dataspace")
 
     /* Reset hyperslab start array */
     /* (hyperslabs will always start from origin) */
@@ -4327,28 +4283,28 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
     H5D_BUILD_IO_INFO_RD(&chk_io_info, dset, dxpl_cache, dxpl_id, &chk_store, NULL);
 
     /* Compose chunked index info struct */
-    idx_info.f = dset->oloc.file;
+    idx_info.f       = dset->oloc.file;
     idx_info.dxpl_id = dxpl_id;
-    idx_info.pline = &dset->shared->dcpl_cache.pline;
-    idx_info.layout = &dset->shared->layout.u.chunk;
+    idx_info.pline   = &dset->shared->dcpl_cache.pline;
+    idx_info.layout  = &dset->shared->layout.u.chunk;
     idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
     /* Initialize the user data for the iteration */
     HDmemset(&udata, 0, sizeof udata);
-    udata.common.layout = &layout->u.chunk;
-    udata.common.storage = &layout->storage.u.chunk;
-    udata.common.rdcc = rdcc;
-    udata.io_info = &chk_io_info;
-    udata.idx_info = &idx_info;
-    udata.space_dim = space_dim;
-    udata.shrunk_dim = shrunk_dim;
+    udata.common.layout   = &layout->u.chunk;
+    udata.common.storage  = &layout->storage.u.chunk;
+    udata.common.rdcc     = rdcc;
+    udata.io_info         = &chk_io_info;
+    udata.idx_info        = &idx_info;
+    udata.space_dim       = space_dim;
+    udata.shrunk_dim      = shrunk_dim;
     udata.elmts_per_chunk = elmts_per_chunk;
-    udata.chunk_space = chunk_space;
-    udata.hyper_start = hyper_start;
-    udata_init = TRUE;
+    udata.chunk_space     = chunk_space;
+    udata.hyper_start     = hyper_start;
+    udata_init            = TRUE;
 
     /* Initialize user data for removal */
-    idx_udata.layout = &layout->u.chunk;
+    idx_udata.layout  = &layout->u.chunk;
     idx_udata.storage = &layout->storage.u.chunk;
 
     /*
@@ -4356,33 +4312,30 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
      */
     HDmemset(min_mod_chunk_off, 0, sizeof(min_mod_chunk_off));
     HDmemset(max_mod_chunk_off, 0, sizeof(max_mod_chunk_off));
-    for(op_dim = 0; op_dim < space_ndims; op_dim++) {
+    for (op_dim = 0; op_dim < space_ndims; op_dim++) {
         /* Calculate the largest offset of chunks that might need to be
          * modified in this dimension */
-        max_mod_chunk_off[op_dim] = chunk_dim[op_dim] * ((old_dim[op_dim] - 1)
-                / chunk_dim[op_dim]);
+        max_mod_chunk_off[op_dim] = chunk_dim[op_dim] * ((old_dim[op_dim] - 1) / chunk_dim[op_dim]);
 
         /* Calculate the largest offset of chunks that might need to be
          * filled in this dimension */
-        if(0 == space_dim[op_dim])
+        if (0 == space_dim[op_dim])
             max_fill_chunk_off[op_dim] = -1;
         else
-            max_fill_chunk_off[op_dim] = (hssize_t)(chunk_dim[op_dim]
-                    * ((MIN(space_dim[op_dim], old_dim[op_dim]) - 1)
-                    / chunk_dim[op_dim]));
+            max_fill_chunk_off[op_dim] = (hssize_t)(
+                chunk_dim[op_dim] * ((MIN(space_dim[op_dim], old_dim[op_dim]) - 1) / chunk_dim[op_dim]));
 
-        if(shrunk_dim[op_dim]) {
+        if (shrunk_dim[op_dim]) {
             /* Calculate the smallest offset of chunks that might need to be
              * modified in this dimension.  Note that this array contains
              * garbage for all dimensions which are not shrunk.  These locations
              * must not be read from! */
-            min_mod_chunk_off[op_dim] = chunk_dim[op_dim] * (space_dim[op_dim]
-                    / chunk_dim[op_dim]);
+            min_mod_chunk_off[op_dim] = chunk_dim[op_dim] * (space_dim[op_dim] / chunk_dim[op_dim]);
 
             /* Determine if we need to fill chunks in this dimension */
-            if((hssize_t)min_mod_chunk_off[op_dim] == max_fill_chunk_off[op_dim]) {
+            if ((hssize_t)min_mod_chunk_off[op_dim] == max_fill_chunk_off[op_dim]) {
                 fill_dim[op_dim] = TRUE;
-                has_fill = TRUE;
+                has_fill         = TRUE;
             } /* end if */
             else
                 fill_dim[op_dim] = FALSE;
@@ -4394,23 +4347,23 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
     /* Check the cache for any entries that are outside the bounds.  Mark these
      * entries as deleted so they are not flushed to disk accidentally.  This is
      * only necessary if there are chunks that need to be filled. */
-    if(has_fill)
-        for(ent = rdcc->head; ent; ent = ent->next)
+    if (has_fill)
+        for (ent = rdcc->head; ent; ent = ent->next)
             /* Check for chunk offset outside of new dimensions */
-            for(u = 0; u < (unsigned)space_ndims; u++)
-                if((hsize_t)ent->offset[u] >= space_dim[u]) {
+            for (u = 0; u < (unsigned)space_ndims; u++)
+                if ((hsize_t)ent->offset[u] >= space_dim[u]) {
                     /* Mark the entry as "deleted" */
                     ent->deleted = TRUE;
                     break;
                 } /* end if */
 
     /* Main loop: fill or remove chunks */
-    for(op_dim=0; op_dim<space_ndims; op_dim++) {
+    for (op_dim = 0; op_dim < space_ndims; op_dim++) {
         /* Check if modification along this dimension is really necessary */
-        if(!shrunk_dim[op_dim])
+        if (!shrunk_dim[op_dim])
             continue;
         else {
-            HDassert((hsize_t) max_mod_chunk_off[op_dim] >= min_mod_chunk_off[op_dim]);
+            HDassert((hsize_t)max_mod_chunk_off[op_dim] >= min_mod_chunk_off[op_dim]);
 
             /* Reset the chunk offset indices */
             HDmemset(chunk_offset, 0, ((unsigned)space_ndims * sizeof(chunk_offset[0])));
@@ -4418,8 +4371,8 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
 
             /* Initialize "dims_outside_fill" array */
             ndims_outside_fill = 0;
-            for(u = 0; u < (unsigned)space_ndims; u++)
-                if((hssize_t)chunk_offset[u] > max_fill_chunk_off[u]) {
+            for (u = 0; u < (unsigned)space_ndims; u++)
+                if ((hssize_t)chunk_offset[u] > max_fill_chunk_off[u]) {
                     dims_outside_fill[u] = TRUE;
                     ndims_outside_fill++;
                 } /* end if */
@@ -4429,21 +4382,20 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
             carry = FALSE;
         } /* end if */
 
-        while(!carry) {
-            int i;                            /* Local index variable */
+        while (!carry) {
+            int i; /* Local index variable */
 
             /* Calculate the index of this chunk */
-            if(H5VM_chunk_index((unsigned)space_ndims, chunk_offset,
-                    layout->u.chunk.dim, layout->u.chunk.down_chunks,
-                    &(chk_io_info.store->chunk.index)) < 0)
+            if (H5VM_chunk_index((unsigned)space_ndims, chunk_offset, layout->u.chunk.dim,
+                                 layout->u.chunk.down_chunks, &(chk_io_info.store->chunk.index)) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't get chunk index")
 
-            if(0 == ndims_outside_fill) {
+            if (0 == ndims_outside_fill) {
                 HDassert(fill_dim[op_dim]);
                 HDassert(chunk_offset[op_dim] == min_mod_chunk_off[op_dim]);
 
                 /* Fill the unused parts of the chunk */
-                if(H5D__chunk_prune_fill(&udata) < 0)
+                if (H5D__chunk_prune_fill(&udata) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write fill value")
             } /* end if */
             else {
@@ -4452,61 +4404,64 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
                 {
                     hbool_t outside_dim = FALSE;
 
-                    for(u = 0; u < (unsigned)space_ndims; u++)
-                        if(chunk_offset[u] >= space_dim[u]) {
+                    for (u = 0; u < (unsigned)space_ndims; u++)
+                        if (chunk_offset[u] >= space_dim[u]) {
                             outside_dim = TRUE;
                             break;
                         } /* end if */
                     HDassert(outside_dim);
                 } /* end block */
-#endif /* NDEBUG */
+#endif            /* NDEBUG */
 
                 /* Check if the chunk exists in cache or on disk */
-                if(H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chk_io_info.store->chunk.index, &chk_udata) < 0)
+                if (H5D__chunk_lookup(dset, dxpl_id, chunk_offset, chk_io_info.store->chunk.index,
+                                      &chk_udata) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "error looking up chunk")
 
                 /* Evict the entry from the cache if present, but do not flush
                  * it to disk */
-                if(UINT_MAX != chk_udata.idx_hint)
-                    if(H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, rdcc->slot[chk_udata.idx_hint], FALSE) < 0)
+                if (UINT_MAX != chk_udata.idx_hint)
+                    if (H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, rdcc->slot[chk_udata.idx_hint],
+                                               FALSE) < 0)
                         HGOTO_ERROR(H5E_DATASET, H5E_CANTREMOVE, FAIL, "unable to evict chunk")
 
                 /* Remove the chunk from disk, if present */
-                if(H5F_addr_defined(chk_udata.addr)) {
+                if (H5F_addr_defined(chk_udata.addr)) {
                     /* Update the offset in idx_udata */
                     idx_udata.offset = chunk_offset;
 
                     /* Remove the chunk from disk */
-                    if((layout->storage.u.chunk.ops->remove)(&idx_info, &idx_udata) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to remove chunk entry from index")
+                    if ((layout->storage.u.chunk.ops->remove)(&idx_info, &idx_udata) < 0)
+                        HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL,
+                                    "unable to remove chunk entry from index")
                 } /* end if */
-            } /* end else */
+            }     /* end else */
 
             /* Increment indices */
             carry = TRUE;
-            for(i = (int)(space_ndims - 1); i >= 0; --i) {
+            for (i = (int)(space_ndims - 1); i >= 0; --i) {
                 chunk_offset[i] += chunk_dim[i];
-                if(chunk_offset[i] > (hsize_t) max_mod_chunk_off[i]) {
+                if (chunk_offset[i] > (hsize_t)max_mod_chunk_off[i]) {
                     /* Left maximum dimensions, "wrap around" and check if this
                      * dimension is no longer outside the fill dimension */
-                    if(i == op_dim) {
+                    if (i == op_dim) {
                         chunk_offset[i] = min_mod_chunk_off[i];
-                        if(dims_outside_fill[i] && fill_dim[i]) {
+                        if (dims_outside_fill[i] && fill_dim[i]) {
                             dims_outside_fill[i] = FALSE;
                             ndims_outside_fill--;
                         } /* end if */
-                    } /* end if */
+                    }     /* end if */
                     else {
                         chunk_offset[i] = 0;
-                        if(dims_outside_fill[i] && max_fill_chunk_off[i] >= 0) {
+                        if (dims_outside_fill[i] && max_fill_chunk_off[i] >= 0) {
                             dims_outside_fill[i] = FALSE;
                             ndims_outside_fill--;
                         } /* end if */
-                    } /* end else */
-                } /* end if */
+                    }     /* end else */
+                }         /* end if */
                 else {
                     /* Check if we just went outside the fill dimension */
-                    if(!dims_outside_fill[i] && (hssize_t)chunk_offset[i] > max_fill_chunk_off[i]) {
+                    if (!dims_outside_fill[i] && (hssize_t)chunk_offset[i] > max_fill_chunk_off[i]) {
                         dims_outside_fill[i] = TRUE;
                         ndims_outside_fill++;
                     } /* end if */
@@ -4515,13 +4470,13 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
                     carry = FALSE;
                     break;
                 } /* end else */
-            } /* end for */
-        } /* end while(!carry) */
+            }     /* end for */
+        }         /* end while(!carry) */
 
         /* Adjust max_mod_chunk_off so we don't modify the same chunk twice.
          * Also check if this dimension started from 0 (and hence removed all
          * of the chunks). */
-        if(min_mod_chunk_off[op_dim] == 0)
+        if (min_mod_chunk_off[op_dim] == 0)
             break;
         else
             max_mod_chunk_off[op_dim] = min_mod_chunk_off[op_dim] - chunk_dim[op_dim];
@@ -4532,17 +4487,17 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
 
 done:
     /* Release resources */
-    if(chunk_space && H5S_close(chunk_space) < 0)
+    if (chunk_space && H5S_close(chunk_space) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataspace")
-    if(udata_init)
-        if(udata.fb_info_init && H5D__fill_term(&udata.fb_info) < 0)
+    if (udata_init)
+        if (udata.fb_info_init && H5D__fill_term(&udata.fb_info) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release fill buffer info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_prune_by_extent() */
 
 #ifdef H5_HAVE_PARALLEL
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_addrmap_cb
  *
@@ -4559,16 +4514,17 @@ done:
 static int
 H5D__chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
 {
-    H5D_chunk_it_ud2_t    *udata = (H5D_chunk_it_ud2_t *)_udata;  /* User data for callback */
-    unsigned       rank = udata->common.layout->ndims - 1;    /* # of dimensions of dataset */
-    hsize_t        chunk_index;
-    int            ret_value = H5_ITER_CONT;     /* Return value */
+    H5D_chunk_it_ud2_t *udata = (H5D_chunk_it_ud2_t *)_udata;    /* User data for callback */
+    unsigned            rank  = udata->common.layout->ndims - 1; /* # of dimensions of dataset */
+    hsize_t             chunk_index;
+    int                 ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Compute the index for this chunk */
-    if(H5VM_chunk_index(rank, chunk_rec->offset, udata->common.layout->dim, udata->common.layout->down_chunks, &chunk_index) < 0)
-       HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, H5_ITER_ERROR, "can't get chunk index")
+    if (H5VM_chunk_index(rank, chunk_rec->offset, udata->common.layout->dim,
+                         udata->common.layout->down_chunks, &chunk_index) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, H5_ITER_ERROR, "can't get chunk index")
 
     /* Set it in the userdata to return */
     udata->chunk_addr[chunk_index] = chunk_rec->chunk_addr;
@@ -4577,7 +4533,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_addrmap_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_addrmap
  *
@@ -4594,10 +4549,10 @@ done:
 herr_t
 H5D__chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[])
 {
-    H5D_chk_idx_info_t idx_info;        /* Chunked index info */
-    const H5D_t *dset = io_info->dset;  /* Local pointer to dataset info */
-    H5D_chunk_it_ud2_t udata;              /* User data for iteration callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_chk_idx_info_t idx_info;             /* Chunked index info */
+    const H5D_t *      dset = io_info->dset; /* Local pointer to dataset info */
+    H5D_chunk_it_ud2_t udata;                /* User data for iteration callback */
+    herr_t             ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -4607,20 +4562,20 @@ H5D__chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[])
 
     /* Set up user data for B-tree callback */
     HDmemset(&udata, 0, sizeof(udata));
-    udata.common.layout = &dset->shared->layout.u.chunk;
+    udata.common.layout  = &dset->shared->layout.u.chunk;
     udata.common.storage = &dset->shared->layout.storage.u.chunk;
-    udata.common.rdcc = &(dset->shared->cache.chunk);
-    udata.chunk_addr = chunk_addr;
+    udata.common.rdcc    = &(dset->shared->cache.chunk);
+    udata.chunk_addr     = chunk_addr;
 
     /* Compose chunked index info struct */
-    idx_info.f = dset->oloc.file;
+    idx_info.f       = dset->oloc.file;
     idx_info.dxpl_id = io_info->dxpl_id;
-    idx_info.pline = &dset->shared->dcpl_cache.pline;
-    idx_info.layout = &dset->shared->layout.u.chunk;
+    idx_info.pline   = &dset->shared->dcpl_cache.pline;
+    idx_info.layout  = &dset->shared->layout.u.chunk;
     idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
     /* Iterate over chunks to build mapping of chunk addresses */
-    if((dset->shared->layout.storage.u.chunk.ops->iterate)(&idx_info, H5D__chunk_addrmap_cb, &udata) < 0)
+    if ((dset->shared->layout.storage.u.chunk.ops->iterate)(&idx_info, H5D__chunk_addrmap_cb, &udata) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to iterate over chunk index to build address map")
 
 done:
@@ -4628,7 +4583,6 @@ done:
 } /* end H5D__chunk_addrmap() */
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_delete
  *
@@ -4645,13 +4599,13 @@ done:
 herr_t
 H5D__chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_storage_t *storage)
 {
-    H5D_chk_idx_info_t idx_info;        /* Chunked index info */
-    H5O_layout_t layout;                /* Dataset layout  message */
-    hbool_t layout_read = FALSE;        /* Whether the layout message was read from the file */
-    H5O_pline_t pline;                  /* I/O pipeline message */
-    hbool_t pline_read = FALSE;         /* Whether the I/O pipeline message was read from the file */
-    htri_t    exists;                 /* Flag if header message of interest exists */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5D_chk_idx_info_t idx_info;            /* Chunked index info */
+    H5O_layout_t       layout;              /* Dataset layout  message */
+    hbool_t            layout_read = FALSE; /* Whether the layout message was read from the file */
+    H5O_pline_t        pline;               /* I/O pipeline message */
+    hbool_t            pline_read = FALSE;  /* Whether the I/O pipeline message was read from the file */
+    htri_t             exists;              /* Flag if header message of interest exists */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -4661,10 +4615,10 @@ H5D__chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_storage_t *storage)
     HDassert(storage);
 
     /* Check for I/O pipeline message */
-    if((exists = H5O_msg_exists_oh(oh, H5O_PLINE_ID)) < 0)
+    if ((exists = H5O_msg_exists_oh(oh, H5O_PLINE_ID)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to check for object header message")
-    else if(exists) {
-        if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_PLINE_ID, &pline))
+    else if (exists) {
+        if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_PLINE_ID, &pline))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get I/O pipeline message")
         pline_read = TRUE;
     } /* end else if */
@@ -4672,10 +4626,10 @@ H5D__chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_storage_t *storage)
         HDmemset(&pline, 0, sizeof(pline));
 
     /* Retrieve dataset layout message */
-    if((exists = H5O_msg_exists_oh(oh, H5O_LAYOUT_ID)) < 0)
+    if ((exists = H5O_msg_exists_oh(oh, H5O_LAYOUT_ID)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to check for object header message")
-    else if(exists) {
-        if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_LAYOUT_ID, &layout))
+    else if (exists) {
+        if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_LAYOUT_ID, &layout))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get layout message")
         layout_read = TRUE;
     } /* end else if */
@@ -4683,29 +4637,28 @@ H5D__chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_storage_t *storage)
         HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "can't find layout message")
 
     /* Compose chunked index info struct */
-    idx_info.f = f;
+    idx_info.f       = f;
     idx_info.dxpl_id = dxpl_id;
-    idx_info.pline = &pline;
-    idx_info.layout = &layout.u.chunk;
+    idx_info.pline   = &pline;
+    idx_info.layout  = &layout.u.chunk;
     idx_info.storage = &storage->u.chunk;
 
     /* Delete the chunked storage information in the file */
-    if((storage->u.chunk.ops->idx_delete)(&idx_info) < 0)
+    if ((storage->u.chunk.ops->idx_delete)(&idx_info) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to delete chunk index")
 
 done:
     /* Clean up any messages read in */
-    if(pline_read)
-        if(H5O_msg_reset(H5O_PLINE_ID, &pline) < 0)
+    if (pline_read)
+        if (H5O_msg_reset(H5O_PLINE_ID, &pline) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset I/O pipeline message")
-    if(layout_read)
-        if(H5O_msg_reset(H5O_LAYOUT_ID, &layout) < 0)
+    if (layout_read)
+        if (H5O_msg_reset(H5O_LAYOUT_ID, &layout) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset layout message")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_update_cache
  *
@@ -4723,60 +4676,62 @@ done:
 herr_t
 H5D__chunk_update_cache(H5D_t *dset, hid_t dxpl_id)
 {
-    H5D_rdcc_t         *rdcc = &(dset->shared->cache.chunk);    /*raw data chunk cache */
-    H5D_rdcc_ent_t     *ent, *next;    /*cache entry  */
-    H5D_rdcc_ent_t     *old_ent;    /* Old cache entry  */
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    unsigned            rank;            /* Current # of dimensions */
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    H5D_rdcc_t *      rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */
+    H5D_rdcc_ent_t *  ent, *next;                          /*cache entry  */
+    H5D_rdcc_ent_t *  old_ent;                             /* Old cache entry  */
+    H5D_dxpl_cache_t  _dxpl_cache;                         /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;           /* Data transfer property cache */
+    unsigned          rank;                                /* Current # of dimensions */
+    herr_t            ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(dset && H5D_CHUNKED == dset->shared->layout.type);
-    HDassert(dset->shared->layout.u.chunk.ndims > 0 && dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
+    HDassert(dset->shared->layout.u.chunk.ndims > 0 &&
+             dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
 
     /* Get the rank */
-    rank = dset->shared->layout.u.chunk.ndims-1;
+    rank = dset->shared->layout.u.chunk.ndims - 1;
     HDassert(rank > 0);
 
     /* 1-D dataset's chunks can't have their index change */
-    if(rank == 1)
+    if (rank == 1)
         HGOTO_DONE(SUCCEED)
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Recompute the index for each cached chunk that is in a dataset */
-    for(ent = rdcc->head; ent; ent = next) {
-        hsize_t             idx;        /* Chunk index */
-        unsigned        old_idx;    /* Previous index number    */
+    for (ent = rdcc->head; ent; ent = next) {
+        hsize_t  idx;     /* Chunk index */
+        unsigned old_idx; /* Previous index number    */
 
         /* Get the pointer to the next cache entry */
         next = ent->next;
 
         /* Calculate the index of this chunk */
-        if(H5VM_chunk_index(rank, ent->offset, dset->shared->layout.u.chunk.dim, dset->shared->layout.u.chunk.down_chunks, &idx) < 0)
+        if (H5VM_chunk_index(rank, ent->offset, dset->shared->layout.u.chunk.dim,
+                             dset->shared->layout.u.chunk.down_chunks, &idx) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
 
         /* Compute the index for the chunk entry */
-        old_idx = ent->idx;   /* Save for later */
+        old_idx  = ent->idx; /* Save for later */
         ent->idx = H5D_CHUNK_HASH(dset->shared, idx);
 
-        if(old_idx != ent->idx) {
+        if (old_idx != ent->idx) {
             /* Check if there is already a chunk at this chunk's new location */
             old_ent = rdcc->slot[ent->idx];
-            if(old_ent != NULL) {
+            if (old_ent != NULL) {
                 HDassert(old_ent->locked == 0);
 
                 /* Check if we are removing the entry we would walk to next */
-                if(old_ent == next)
+                if (old_ent == next)
                     next = old_ent->next;
 
                 /* Remove the old entry from the cache */
-                if(H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, old_ent, TRUE) < 0)
+                if (H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, old_ent, TRUE) < 0)
                     HGOTO_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks")
             } /* end if */
 
@@ -4786,13 +4741,12 @@ H5D__chunk_update_cache(H5D_t *dset, hid_t dxpl_id)
             /* Null out previous location */
             rdcc->slot[old_idx] = NULL;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_update_cache() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_copy_cb
  *
@@ -4809,23 +4763,23 @@ done:
 static int
 H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
 {
-    H5D_chunk_it_ud3_t      *udata = (H5D_chunk_it_ud3_t *)_udata;       /* User data for callback */
-    H5D_chunk_ud_t          udata_dst;                  /* User data about new destination chunk */
-    hbool_t                 is_vlen = FALSE;            /* Whether datatype is variable-length */
-    hbool_t                 fix_ref = FALSE;            /* Whether to fix up references in the dest. file */
+    H5D_chunk_it_ud3_t *udata = (H5D_chunk_it_ud3_t *)_udata; /* User data for callback */
+    H5D_chunk_ud_t      udata_dst;                            /* User data about new destination chunk */
+    hbool_t             is_vlen = FALSE;                      /* Whether datatype is variable-length */
+    hbool_t             fix_ref = FALSE; /* Whether to fix up references in the dest. file */
 
     /* General information about chunk copy */
-    void                    *bkg = udata->bkg;          /* Background buffer for datatype conversion */
-    void                    *buf = udata->buf;          /* Chunk buffer for I/O & datatype conversions */
-    size_t                  buf_size = udata->buf_size; /* Size of chunk buffer */
-    const H5O_pline_t       *pline = udata->pline;      /* I/O pipeline for applying filters */
+    void *             bkg      = udata->bkg;      /* Background buffer for datatype conversion */
+    void *             buf      = udata->buf;      /* Chunk buffer for I/O & datatype conversions */
+    size_t             buf_size = udata->buf_size; /* Size of chunk buffer */
+    const H5O_pline_t *pline    = udata->pline;    /* I/O pipeline for applying filters */
 
     /* needed for commpressed variable length data */
-    hbool_t                 has_filters = FALSE;        /* Whether chunk has filters */
-    size_t                  nbytes;                     /* Size of chunk in file (in bytes) */
-    H5Z_cb_t                cb_struct;                  /* Filter failure callback struct */
+    hbool_t  has_filters = FALSE; /* Whether chunk has filters */
+    size_t   nbytes;              /* Size of chunk in file (in bytes) */
+    H5Z_cb_t cb_struct;           /* Filter failure callback struct */
 
-    int                     ret_value = H5_ITER_CONT;   /* Return value */
+    int ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -4833,114 +4787,122 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
     H5_CHECKED_ASSIGN(nbytes, size_t, chunk_rec->nbytes, uint32_t);
 
     /* Check parameter for type conversion */
-    if(udata->do_convert) {
-        if(H5T_detect_class(udata->dt_src, H5T_VLEN, FALSE) > 0)
+    if (udata->do_convert) {
+        if (H5T_detect_class(udata->dt_src, H5T_VLEN, FALSE) > 0)
             is_vlen = TRUE;
-        else if((H5T_get_class(udata->dt_src, FALSE) == H5T_REFERENCE) && (udata->file_src != udata->idx_info_dst->f))
+        else if ((H5T_get_class(udata->dt_src, FALSE) == H5T_REFERENCE) &&
+                 (udata->file_src != udata->idx_info_dst->f))
             fix_ref = TRUE;
         else
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, H5_ITER_ERROR, "unable to copy dataset elements")
     } /* end if */
 
     /* Check for filtered chunks */
-    if(pline && pline->nused) {
-        has_filters = TRUE;
+    if (pline && pline->nused) {
+        has_filters    = TRUE;
         cb_struct.func = NULL; /* no callback function when failed */
-    } /* end if */
+    }                          /* end if */
 
     /* Resize the buf if it is too small to hold the data */
-    if(nbytes > buf_size) {
-        void *new_buf;          /* New buffer for data */
+    if (nbytes > buf_size) {
+        void *new_buf; /* New buffer for data */
 
         /* Re-allocate memory for copying the chunk */
-        if(NULL == (new_buf = H5MM_realloc(udata->buf, nbytes)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, H5_ITER_ERROR, "memory allocation failed for raw data chunk")
+        if (NULL == (new_buf = H5MM_realloc(udata->buf, nbytes)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, H5_ITER_ERROR,
+                        "memory allocation failed for raw data chunk")
         udata->buf = new_buf;
-        if(udata->bkg) {
-            if(NULL == (new_buf = H5MM_realloc(udata->bkg, nbytes)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, H5_ITER_ERROR, "memory allocation failed for raw data chunk")
+        if (udata->bkg) {
+            if (NULL == (new_buf = H5MM_realloc(udata->bkg, nbytes)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, H5_ITER_ERROR,
+                            "memory allocation failed for raw data chunk")
             udata->bkg = new_buf;
-            if(!udata->cpy_info->expand_ref)
+            if (!udata->cpy_info->expand_ref)
                 HDmemset((uint8_t *)udata->bkg + buf_size, 0, (size_t)(nbytes - buf_size));
 
             bkg = udata->bkg;
         } /* end if */
 
-        buf = udata->buf;
+        buf             = udata->buf;
         udata->buf_size = buf_size = nbytes;
     } /* end if */
 
-    if(udata->chunk_in_cache && udata->chunk) {
+    if (udata->chunk_in_cache && udata->chunk) {
         HDassert(!H5F_addr_defined(chunk_rec->chunk_addr));
         HDmemcpy(buf, udata->chunk, nbytes);
         udata->chunk = NULL;
-    } else {
-        H5D_rdcc_ent_t *ent = NULL;    /* Cache entry */
-        unsigned idx;                   /* Index of chunk in cache, if present */
-        unsigned u;                     /* Counter */
-        H5D_shared_t *shared_fo = udata->cpy_info->shared_fo;
+    }
+    else {
+        H5D_rdcc_ent_t *ent = NULL; /* Cache entry */
+        unsigned        idx;        /* Index of chunk in cache, if present */
+        unsigned        u;          /* Counter */
+        H5D_shared_t *  shared_fo = udata->cpy_info->shared_fo;
 
         /* See if the written chunk is in the chunk cache */
-        if(shared_fo && shared_fo->cache.chunk.nslots > 0) {
-            hsize_t chunk_idx;                  /* Index of chunk cache entry */
-            H5O_layout_t  *layout = &shared_fo->layout;
+        if (shared_fo && shared_fo->cache.chunk.nslots > 0) {
+            hsize_t       chunk_idx; /* Index of chunk cache entry */
+            H5O_layout_t *layout = &shared_fo->layout;
 
             /* Calculate the index of this chunk */
-            if(H5VM_chunk_index(layout->u.chunk.ndims - 1, chunk_rec->offset,
-                                layout->u.chunk.dim, layout->u.chunk.down_chunks, &chunk_idx) < 0)
+            if (H5VM_chunk_index(layout->u.chunk.ndims - 1, chunk_rec->offset, layout->u.chunk.dim,
+                                 layout->u.chunk.down_chunks, &chunk_idx) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't get chunk index")
             idx = H5D_CHUNK_HASH(shared_fo, chunk_idx);
 
             /* Get the chunk cache entry for that location */
             ent = shared_fo->cache.chunk.slot[idx];
-            if(ent) {
+            if (ent) {
                 /* Speculatively set the 'found' flag */
                 udata->chunk_in_cache = TRUE;
 
                 /* Verify that the cache entry is the correct chunk */
-                for(u = 0; u < (layout->u.chunk.ndims -1); u++)
-                    if(chunk_rec->offset[u] != ent->offset[u]) {
+                for (u = 0; u < (layout->u.chunk.ndims - 1); u++)
+                    if (chunk_rec->offset[u] != ent->offset[u]) {
                         udata->chunk_in_cache = FALSE;
                         break;
                     } /* end if */
-            } /* end if */
-        } /* end if */
+            }         /* end if */
+        }             /* end if */
 
-        if(udata->chunk_in_cache) {
+        if (udata->chunk_in_cache) {
             HDassert(H5F_addr_defined(chunk_rec->chunk_addr));
             HDassert(H5F_addr_defined(ent->chunk_addr));
 
             H5_CHECKED_ASSIGN(nbytes, size_t, shared_fo->layout.u.chunk.size, uint32_t);
             HDmemcpy(buf, ent->chunk, nbytes);
-        } else {
+        }
+        else {
             /* read chunk data from the source file */
-            if(H5F_block_read(udata->file_src, H5FD_MEM_DRAW, chunk_rec->chunk_addr, nbytes, udata->idx_info_dst->dxpl_id, buf) < 0)
+            if (H5F_block_read(udata->file_src, H5FD_MEM_DRAW, chunk_rec->chunk_addr, nbytes,
+                               udata->idx_info_dst->dxpl_id, buf) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, H5_ITER_ERROR, "unable to read raw data chunk")
         }
     }
 
     /* Need to uncompress variable-length & reference data elements */
-    if(has_filters && (is_vlen || fix_ref) && !udata->chunk_in_cache) {
+    if (has_filters && (is_vlen || fix_ref) && !udata->chunk_in_cache) {
         unsigned filter_mask = chunk_rec->filter_mask;
 
-        if(H5Z_pipeline(pline, H5Z_FLAG_REVERSE, &filter_mask, H5Z_NO_EDC, cb_struct, &nbytes, &buf_size, &buf) < 0)
+        if (H5Z_pipeline(pline, H5Z_FLAG_REVERSE, &filter_mask, H5Z_NO_EDC, cb_struct, &nbytes, &buf_size,
+                         &buf) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, H5_ITER_ERROR, "data pipeline read failed")
     } /* end if */
 
     /* Perform datatype conversion, if necessary */
-    if(is_vlen) {
-        H5T_path_t              *tpath_src_mem = udata->tpath_src_mem;
-        H5T_path_t              *tpath_mem_dst = udata->tpath_mem_dst;
-        H5S_t                   *buf_space = udata->buf_space;
-        hid_t                   tid_src = udata->tid_src;
-        hid_t                   tid_dst = udata->tid_dst;
-        hid_t                   tid_mem = udata->tid_mem;
-        void                    *reclaim_buf = udata->reclaim_buf;
-        size_t                  reclaim_buf_size = udata->reclaim_buf_size;
+    if (is_vlen) {
+        H5T_path_t *tpath_src_mem    = udata->tpath_src_mem;
+        H5T_path_t *tpath_mem_dst    = udata->tpath_mem_dst;
+        H5S_t *     buf_space        = udata->buf_space;
+        hid_t       tid_src          = udata->tid_src;
+        hid_t       tid_dst          = udata->tid_dst;
+        hid_t       tid_mem          = udata->tid_mem;
+        void *      reclaim_buf      = udata->reclaim_buf;
+        size_t      reclaim_buf_size = udata->reclaim_buf_size;
 
         /* Convert from source file to memory */
         H5_CHECK_OVERFLOW(udata->nelmts, uint32_t, size_t);
-        if(H5T_convert(tpath_src_mem, tid_src, tid_mem, (size_t)udata->nelmts, (size_t)0, (size_t)0, buf, bkg, udata->idx_info_dst->dxpl_id) < 0)
+        if (H5T_convert(tpath_src_mem, tid_src, tid_mem, (size_t)udata->nelmts, (size_t)0, (size_t)0, buf,
+                        bkg, udata->idx_info_dst->dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5_ITER_ERROR, "datatype conversion failed")
 
         /* Copy into another buffer, to reclaim memory later */
@@ -4950,24 +4912,27 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
         HDmemset(bkg, 0, buf_size);
 
         /* Convert from memory to destination file */
-        if(H5T_convert(tpath_mem_dst, tid_mem, tid_dst, udata->nelmts, (size_t)0, (size_t)0, buf, bkg, udata->idx_info_dst->dxpl_id) < 0)
+        if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, udata->nelmts, (size_t)0, (size_t)0, buf, bkg,
+                        udata->idx_info_dst->dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5_ITER_ERROR, "datatype conversion failed")
 
         /* Reclaim space from variable length data */
-        if(H5D_vlen_reclaim(tid_mem, buf_space, H5P_DATASET_XFER_DEFAULT, reclaim_buf) < 0)
+        if (H5D_vlen_reclaim(tid_mem, buf_space, H5P_DATASET_XFER_DEFAULT, reclaim_buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_BADITER, H5_ITER_ERROR, "unable to reclaim variable-length data")
     } /* end if */
-    else if(fix_ref) {
+    else if (fix_ref) {
         /* Check for expanding references */
         /* (background buffer has already been zeroed out, if not expanding) */
-        if(udata->cpy_info->expand_ref) {
+        if (udata->cpy_info->expand_ref) {
             size_t ref_count;
 
             /* Determine # of reference elements to copy */
             ref_count = nbytes / H5T_get_size(udata->dt_src);
 
             /* Copy the reference elements */
-            if(H5O_copy_expand_ref(udata->file_src, buf, udata->idx_info_dst->dxpl_id, udata->idx_info_dst->f, bkg, ref_count, H5T_get_ref_type(udata->dt_src), udata->cpy_info) < 0)
+            if (H5O_copy_expand_ref(udata->file_src, buf, udata->idx_info_dst->dxpl_id,
+                                    udata->idx_info_dst->f, bkg, ref_count, H5T_get_ref_type(udata->dt_src),
+                                    udata->cpy_info) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, H5_ITER_ERROR, "unable to copy reference attribute")
         } /* end if */
 
@@ -4976,42 +4941,43 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
     } /* end if */
 
     /* Set up destination chunk callback information for insertion */
-    udata_dst.common.layout = udata->idx_info_dst->layout;
+    udata_dst.common.layout  = udata->idx_info_dst->layout;
     udata_dst.common.storage = udata->idx_info_dst->storage;
-    udata_dst.common.offset = chunk_rec->offset;
-    udata_dst.common.rdcc = NULL;
-    udata_dst.nbytes = chunk_rec->nbytes;
-    udata_dst.filter_mask = chunk_rec->filter_mask;
-    udata_dst.addr = HADDR_UNDEF;
+    udata_dst.common.offset  = chunk_rec->offset;
+    udata_dst.common.rdcc    = NULL;
+    udata_dst.nbytes         = chunk_rec->nbytes;
+    udata_dst.filter_mask    = chunk_rec->filter_mask;
+    udata_dst.addr           = HADDR_UNDEF;
 
     /* Need to compress variable-length & reference data elements before writing to file */
-    if(has_filters && (is_vlen || fix_ref || udata->chunk_in_cache) ) {
-        if(H5Z_pipeline(pline, 0, &(udata_dst.filter_mask), H5Z_NO_EDC, cb_struct, &nbytes, &buf_size, &buf) < 0)
+    if (has_filters && (is_vlen || fix_ref || udata->chunk_in_cache)) {
+        if (H5Z_pipeline(pline, 0, &(udata_dst.filter_mask), H5Z_NO_EDC, cb_struct, &nbytes, &buf_size,
+                         &buf) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, H5_ITER_ERROR, "output pipeline failed")
 #if H5_SIZEOF_SIZE_T > 4
         /* Check for the chunk expanding too much to encode in a 32-bit value */
-        if(nbytes > ((size_t)0xffffffff))
+        if (nbytes > ((size_t)0xffffffff))
             HGOTO_ERROR(H5E_DATASET, H5E_BADRANGE, H5_ITER_ERROR, "chunk too large for 32-bit length")
 #endif /* H5_SIZEOF_SIZE_T > 4 */
         H5_CHECKED_ASSIGN(udata_dst.nbytes, uint32_t, nbytes, size_t);
-    udata->buf = buf;
-    udata->buf_size = buf_size;
+        udata->buf      = buf;
+        udata->buf_size = buf_size;
     } /* end if */
 
     /* Insert chunk into the destination index */
-    if((udata->idx_info_dst->storage->ops->insert)(udata->idx_info_dst, &udata_dst) < 0)
+    if ((udata->idx_info_dst->storage->ops->insert)(udata->idx_info_dst, &udata_dst) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, H5_ITER_ERROR, "unable to insert chunk into index")
 
     /* Write chunk data to destination file */
     HDassert(H5F_addr_defined(udata_dst.addr));
-    if(H5F_block_write(udata->idx_info_dst->f, H5FD_MEM_DRAW, udata_dst.addr, nbytes, udata->idx_info_dst->dxpl_id, buf) < 0)
+    if (H5F_block_write(udata->idx_info_dst->f, H5FD_MEM_DRAW, udata_dst.addr, nbytes,
+                        udata->idx_info_dst->dxpl_id, buf) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, H5_ITER_ERROR, "unable to write raw data to file")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_copy_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_copy
  *
@@ -5026,32 +4992,31 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src,
-    H5O_layout_chunk_t *layout_src, H5F_t *f_dst, H5O_storage_chunk_t *storage_dst,
-    const H5S_extent_t *ds_extent_src, const H5T_t *dt_src,
-    const H5O_pline_t *pline_src, H5O_copy_t *cpy_info, hid_t dxpl_id)
+H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk_t *layout_src, H5F_t *f_dst,
+                H5O_storage_chunk_t *storage_dst, const H5S_extent_t *ds_extent_src, const H5T_t *dt_src,
+                const H5O_pline_t *pline_src, H5O_copy_t *cpy_info, hid_t dxpl_id)
 {
-    H5D_chunk_it_ud3_t udata;           /* User data for iteration callback */
-    H5D_chk_idx_info_t idx_info_dst;    /* Dest. chunked index info */
-    H5D_chk_idx_info_t idx_info_src;    /* Source chunked index info */
-    H5O_pline_t _pline;                 /* Temporary pipeline info */
-    const H5O_pline_t *pline;           /* Pointer to pipeline info to use */
-    H5T_path_t  *tpath_src_mem = NULL, *tpath_mem_dst = NULL;   /* Datatype conversion paths */
-    hid_t       tid_src = -1;           /* Datatype ID for source datatype */
-    hid_t       tid_dst = -1;           /* Datatype ID for destination datatype */
-    hid_t       tid_mem = -1;           /* Datatype ID for memory datatype */
-    size_t      buf_size;               /* Size of copy buffer */
-    size_t      reclaim_buf_size;       /* Size of reclaim buffer */
-    void       *buf = NULL;             /* Buffer for copying data */
-    void       *bkg = NULL;             /* Buffer for background during type conversion */
-    void       *reclaim_buf = NULL;     /* Buffer for reclaiming data */
-    H5S_t      *buf_space = NULL;       /* Dataspace describing buffer */
-    hid_t       sid_buf = -1;           /* ID for buffer dataspace */
-    uint32_t    nelmts = 0;             /* Number of elements in buffer */
-    hbool_t     do_convert = FALSE;     /* Indicate that type conversions should be performed */
-    hbool_t     copy_setup_done = FALSE;        /* Indicate that 'copy setup' is done */
-    H5D_shared_t *shared_fo = (H5D_shared_t *)cpy_info->shared_fo;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5D_chunk_it_ud3_t udata;                                       /* User data for iteration callback */
+    H5D_chk_idx_info_t idx_info_dst;                                /* Dest. chunked index info */
+    H5D_chk_idx_info_t idx_info_src;                                /* Source chunked index info */
+    H5O_pline_t        _pline;                                      /* Temporary pipeline info */
+    const H5O_pline_t *pline;                                       /* Pointer to pipeline info to use */
+    H5T_path_t *       tpath_src_mem = NULL, *tpath_mem_dst = NULL; /* Datatype conversion paths */
+    hid_t              tid_src = -1;                                /* Datatype ID for source datatype */
+    hid_t              tid_dst = -1;                                /* Datatype ID for destination datatype */
+    hid_t              tid_mem = -1;                                /* Datatype ID for memory datatype */
+    size_t             buf_size;                                    /* Size of copy buffer */
+    size_t             reclaim_buf_size;                            /* Size of reclaim buffer */
+    void *             buf             = NULL;                      /* Buffer for copying data */
+    void *             bkg             = NULL;  /* Buffer for background during type conversion */
+    void *             reclaim_buf     = NULL;  /* Buffer for reclaiming data */
+    H5S_t *            buf_space       = NULL;  /* Dataspace describing buffer */
+    hid_t              sid_buf         = -1;    /* ID for buffer dataspace */
+    uint32_t           nelmts          = 0;     /* Number of elements in buffer */
+    hbool_t            do_convert      = FALSE; /* Indicate that type conversions should be performed */
+    hbool_t            copy_setup_done = FALSE; /* Indicate that 'copy setup' is done */
+    H5D_shared_t *     shared_fo       = (H5D_shared_t *)cpy_info->shared_fo;
+    herr_t             ret_value       = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -5065,7 +5030,7 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src,
     HDassert(dt_src);
 
     /* Initialize the temporary pipeline info */
-    if(NULL == pline_src) {
+    if (NULL == pline_src) {
         HDmemset(&_pline, 0, sizeof(_pline));
         pline = &_pline;
     } /* end if */
@@ -5073,122 +5038,123 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src,
         pline = pline_src;
 
     /* Layout is not created in the destination file, reset index address */
-    if(H5D_chunk_idx_reset(storage_dst, TRUE) < 0)
+    if (H5D_chunk_idx_reset(storage_dst, TRUE) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to reset chunked storage index in dest")
 
     /* Initialize layout information */
     {
-        hsize_t     curr_dims[H5O_LAYOUT_NDIMS];    /* Curr. size of dataset dimensions */
-        int         sndims;                 /* Rank of dataspace */
-        unsigned    ndims;                  /* Rank of dataspace */
+        hsize_t  curr_dims[H5O_LAYOUT_NDIMS]; /* Curr. size of dataset dimensions */
+        int      sndims;                      /* Rank of dataspace */
+        unsigned ndims;                       /* Rank of dataspace */
 
         /* Get the dim info for dataset */
-        if((sndims = H5S_extent_get_dims(ds_extent_src, curr_dims, NULL)) < 0)
+        if ((sndims = H5S_extent_get_dims(ds_extent_src, curr_dims, NULL)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataspace dimensions")
         H5_CHECKED_ASSIGN(ndims, unsigned, sndims, int);
 
         /* Set the source layout chunk information */
-        if(H5D__chunk_set_info_real(layout_src, ndims, curr_dims) < 0)
+        if (H5D__chunk_set_info_real(layout_src, ndims, curr_dims) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set layout's chunk info")
     } /* end block */
 
     /* Compose source & dest chunked index info structs */
-    idx_info_src.f = f_src;
+    idx_info_src.f       = f_src;
     idx_info_src.dxpl_id = dxpl_id;
-    idx_info_src.pline = pline;
-    idx_info_src.layout = layout_src;
+    idx_info_src.pline   = pline;
+    idx_info_src.layout  = layout_src;
     idx_info_src.storage = storage_src;
 
-    idx_info_dst.f = f_dst;
+    idx_info_dst.f       = f_dst;
     idx_info_dst.dxpl_id = dxpl_id;
-    idx_info_dst.pline = pline;     /* Use same I/O filter pipeline for dest. */
-    idx_info_dst.layout = layout_src /* Use same layout for dest. */;
+    idx_info_dst.pline   = pline; /* Use same I/O filter pipeline for dest. */
+    idx_info_dst.layout  = layout_src /* Use same layout for dest. */;
     idx_info_dst.storage = storage_dst;
 
     /* Call the index-specific "copy setup" routine */
-    if((storage_src->ops->copy_setup)(&idx_info_src, &idx_info_dst) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set up index-specific chunk copying information")
+    if ((storage_src->ops->copy_setup)(&idx_info_src, &idx_info_dst) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                    "unable to set up index-specific chunk copying information")
     copy_setup_done = TRUE;
 
     /* Create datatype ID for src datatype */
-    if((tid_src = H5I_register(H5I_DATATYPE, dt_src, FALSE)) < 0)
+    if ((tid_src = H5I_register(H5I_DATATYPE, dt_src, FALSE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register source file datatype")
 
     /* If there's a VLEN source datatype, set up type conversion information */
-    if(H5T_detect_class(dt_src, H5T_VLEN, FALSE) > 0) {
-        H5T_t *dt_dst;              /* Destination datatype */
-        H5T_t *dt_mem;              /* Memory datatype */
-        size_t mem_dt_size;         /* Memory datatype size */
-        size_t tmp_dt_size;         /* Temp. datatype size */
-        size_t max_dt_size;         /* Max atatype size */
-        hsize_t buf_dim;            /* Dimension for buffer */
+    if (H5T_detect_class(dt_src, H5T_VLEN, FALSE) > 0) {
+        H5T_t *  dt_dst;      /* Destination datatype */
+        H5T_t *  dt_mem;      /* Memory datatype */
+        size_t   mem_dt_size; /* Memory datatype size */
+        size_t   tmp_dt_size; /* Temp. datatype size */
+        size_t   max_dt_size; /* Max atatype size */
+        hsize_t  buf_dim;     /* Dimension for buffer */
         unsigned u;
 
         /* create a memory copy of the variable-length datatype */
-        if(NULL == (dt_mem = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
+        if (NULL == (dt_mem = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy")
-        if((tid_mem = H5I_register(H5I_DATATYPE, dt_mem, FALSE)) < 0) {
+        if ((tid_mem = H5I_register(H5I_DATATYPE, dt_mem, FALSE)) < 0) {
             (void)H5T_close(dt_mem);
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register memory datatype")
         } /* end if */
 
         /* create variable-length datatype at the destinaton file */
-        if(NULL == (dt_dst = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
+        if (NULL == (dt_dst = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy")
-        if(H5T_set_loc(dt_dst, f_dst, H5T_LOC_DISK) < 0) {
+        if (H5T_set_loc(dt_dst, f_dst, H5T_LOC_DISK) < 0) {
             (void)H5T_close(dt_dst);
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "cannot mark datatype on disk")
         } /* end if */
-        if((tid_dst = H5I_register(H5I_DATATYPE, dt_dst, FALSE)) < 0) {
+        if ((tid_dst = H5I_register(H5I_DATATYPE, dt_dst, FALSE)) < 0) {
             (void)H5T_close(dt_dst);
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register destination file datatype")
         } /* end if */
 
         /* Set up the conversion functions */
-        if(NULL == (tpath_src_mem = H5T_path_find(dt_src, dt_mem, NULL, NULL, dxpl_id, FALSE)))
+        if (NULL == (tpath_src_mem = H5T_path_find(dt_src, dt_mem, NULL, NULL, dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert between src and mem datatypes")
-        if(NULL == (tpath_mem_dst = H5T_path_find(dt_mem, dt_dst, NULL, NULL, dxpl_id, FALSE)))
+        if (NULL == (tpath_mem_dst = H5T_path_find(dt_mem, dt_dst, NULL, NULL, dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert between mem and dst datatypes")
 
         /* Determine largest datatype size */
-        if(0 == (max_dt_size = H5T_get_size(dt_src)))
+        if (0 == (max_dt_size = H5T_get_size(dt_src)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to determine datatype size")
-        if(0 == (mem_dt_size = H5T_get_size(dt_mem)))
+        if (0 == (mem_dt_size = H5T_get_size(dt_mem)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to determine datatype size")
         max_dt_size = MAX(max_dt_size, mem_dt_size);
-        if(0 == (tmp_dt_size = H5T_get_size(dt_dst)))
+        if (0 == (tmp_dt_size = H5T_get_size(dt_dst)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to determine datatype size")
         max_dt_size = MAX(max_dt_size, tmp_dt_size);
 
         /* Compute the number of elements per chunk */
         nelmts = 1;
-        for(u = 0;  u < (layout_src->ndims - 1); u++)
+        for (u = 0; u < (layout_src->ndims - 1); u++)
             nelmts *= layout_src->dim[u];
 
         /* Create the space and set the initial extent */
         buf_dim = nelmts;
-        if(NULL == (buf_space = H5S_create_simple((unsigned)1, &buf_dim, NULL)))
+        if (NULL == (buf_space = H5S_create_simple((unsigned)1, &buf_dim, NULL)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create simple dataspace")
 
         /* Atomize */
-        if((sid_buf = H5I_register(H5I_DATASPACE, buf_space, FALSE)) < 0) {
+        if ((sid_buf = H5I_register(H5I_DATASPACE, buf_space, FALSE)) < 0) {
             (void)H5S_close(buf_space);
             HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace ID")
         } /* end if */
 
         /* Set initial buffer sizes */
-        buf_size = nelmts * max_dt_size;
+        buf_size         = nelmts * max_dt_size;
         reclaim_buf_size = nelmts * mem_dt_size;
 
         /* Allocate memory for reclaim buf */
-        if(NULL == (reclaim_buf = H5MM_malloc(reclaim_buf_size)))
+        if (NULL == (reclaim_buf = H5MM_malloc(reclaim_buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for raw data chunk")
 
         /* Indicate that type conversion should be performed */
         do_convert = TRUE;
     } /* end if */
     else {
-        if(H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) {
+        if (H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) {
             /* Indicate that type conversion should be performed */
             do_convert = TRUE;
         } /* end if */
@@ -5198,72 +5164,71 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src,
     } /* end else */
 
     /* Set up conversion buffer, if appropriate */
-    if(do_convert) {
+    if (do_convert) {
         /* Allocate background memory for converting the chunk */
-        if(NULL == (bkg = H5MM_malloc(buf_size)))
+        if (NULL == (bkg = H5MM_malloc(buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for raw data chunk")
 
         /* Check for reference datatype and no expanding references & clear background buffer */
-        if(!cpy_info->expand_ref &&
-                ((H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) && (f_src != f_dst)))
+        if (!cpy_info->expand_ref && ((H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) && (f_src != f_dst)))
             /* Reset value to zero */
             HDmemset(bkg, 0, buf_size);
     } /* end if */
 
     /* Allocate memory for copying the chunk */
-    if(NULL == (buf = H5MM_malloc(buf_size)))
+    if (NULL == (buf = H5MM_malloc(buf_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for raw data chunk")
 
     /* Initialize the callback structure for the source */
     HDmemset(&udata, 0, sizeof udata);
-    udata.common.layout = layout_src;
-    udata.common.storage = storage_src;
-    udata.common.rdcc = NULL;
-    udata.file_src = f_src;
-    udata.idx_info_dst = &idx_info_dst;
-    udata.buf = buf;
-    udata.bkg = bkg;
-    udata.buf_size = buf_size;
-    udata.tid_src = tid_src;
-    udata.tid_mem = tid_mem;
-    udata.tid_dst = tid_dst;
-    udata.dt_src = dt_src;
-    udata.do_convert = do_convert;
-    udata.tpath_src_mem = tpath_src_mem;
-    udata.tpath_mem_dst = tpath_mem_dst;
-    udata.reclaim_buf = reclaim_buf;
+    udata.common.layout    = layout_src;
+    udata.common.storage   = storage_src;
+    udata.common.rdcc      = NULL;
+    udata.file_src         = f_src;
+    udata.idx_info_dst     = &idx_info_dst;
+    udata.buf              = buf;
+    udata.bkg              = bkg;
+    udata.buf_size         = buf_size;
+    udata.tid_src          = tid_src;
+    udata.tid_mem          = tid_mem;
+    udata.tid_dst          = tid_dst;
+    udata.dt_src           = dt_src;
+    udata.do_convert       = do_convert;
+    udata.tpath_src_mem    = tpath_src_mem;
+    udata.tpath_mem_dst    = tpath_mem_dst;
+    udata.reclaim_buf      = reclaim_buf;
     udata.reclaim_buf_size = reclaim_buf_size;
-    udata.buf_space = buf_space;
-    udata.nelmts = nelmts;
-    udata.pline = pline;
-    udata.cpy_info = cpy_info;
-    udata.chunk_in_cache = FALSE;
-    udata.chunk = NULL;
-
-    if(!H5F_addr_defined(idx_info_src.storage->idx_addr))
+    udata.buf_space        = buf_space;
+    udata.nelmts           = nelmts;
+    udata.pline            = pline;
+    udata.cpy_info         = cpy_info;
+    udata.chunk_in_cache   = FALSE;
+    udata.chunk            = NULL;
+
+    if (!H5F_addr_defined(idx_info_src.storage->idx_addr))
         idx_info_src.storage = &shared_fo->layout.storage.u.chunk;
 
     HDassert(H5F_addr_defined(idx_info_src.storage->idx_addr));
 
     /* Iterate over chunks to copy data */
-    if((storage_src->ops->iterate)(&idx_info_src, H5D__chunk_copy_cb, &udata) < 0)
+    if ((storage_src->ops->iterate)(&idx_info_src, H5D__chunk_copy_cb, &udata) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to iterate over chunk index to copy data")
 
-     /* Iterate over the chunk cache to copy data for chunks with undefined address */
-    if(shared_fo) {
-        H5D_rdcc_ent_t  *ent, *next;
+    /* Iterate over the chunk cache to copy data for chunks with undefined address */
+    if (shared_fo) {
+        H5D_rdcc_ent_t *ent, *next;
         H5D_chunk_rec_t chunk_rec;
 
-        chunk_rec.nbytes = layout_src->size;
+        chunk_rec.nbytes      = layout_src->size;
         chunk_rec.filter_mask = 0;
-        chunk_rec.chunk_addr = HADDR_UNDEF;
+        chunk_rec.chunk_addr  = HADDR_UNDEF;
 
-        for(ent = shared_fo->cache.chunk.head; ent; ent = next) {
-            if(!H5F_addr_defined(ent->chunk_addr)) {
+        for (ent = shared_fo->cache.chunk.head; ent; ent = next) {
+            if (!H5F_addr_defined(ent->chunk_addr)) {
                 HDmemcpy(chunk_rec.offset, ent->offset, sizeof(chunk_rec.offset));
-                udata.chunk = ent->chunk;
+                udata.chunk          = ent->chunk;
                 udata.chunk_in_cache = TRUE;
-                if(H5D__chunk_copy_cb(&chunk_rec, &udata) < 0)
+                if (H5D__chunk_copy_cb(&chunk_rec, &udata) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to copy chunk data in cache")
             }
             next = ent->next;
@@ -5275,30 +5240,29 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src,
     bkg = udata.bkg;
 
 done:
-    if(sid_buf > 0 && H5I_dec_ref(sid_buf) < 0)
+    if (sid_buf > 0 && H5I_dec_ref(sid_buf) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't decrement temporary dataspace ID")
-    if(tid_src > 0 && H5I_dec_ref(tid_src) < 0)
+    if (tid_src > 0 && H5I_dec_ref(tid_src) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(tid_dst > 0 && H5I_dec_ref(tid_dst) < 0)
+    if (tid_dst > 0 && H5I_dec_ref(tid_dst) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(tid_mem > 0 && H5I_dec_ref(tid_mem) < 0)
+    if (tid_mem > 0 && H5I_dec_ref(tid_mem) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(buf)
+    if (buf)
         H5MM_xfree(buf);
-    if(bkg)
+    if (bkg)
         H5MM_xfree(bkg);
-    if(reclaim_buf)
+    if (reclaim_buf)
         H5MM_xfree(reclaim_buf);
 
     /* Clean up any index information */
-    if(copy_setup_done)
-        if((storage_src->ops->copy_shutdown)(storage_src, storage_dst, dxpl_id) < 0)
+    if (copy_setup_done)
+        if ((storage_src->ops->copy_shutdown)(storage_src, storage_dst, dxpl_id) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to shut down index copying info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_bh_info
  *
@@ -5313,11 +5277,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
-    const H5O_pline_t *pline, hsize_t *index_size)
+H5D__chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout, const H5O_pline_t *pline,
+                   hsize_t *index_size)
 {
-    H5D_chk_idx_info_t idx_info;        /* Chunked index info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_chk_idx_info_t idx_info;            /* Chunked index info */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -5328,21 +5292,20 @@ H5D__chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
     HDassert(index_size);
 
     /* Compose chunked index info struct */
-    idx_info.f = f;
+    idx_info.f       = f;
     idx_info.dxpl_id = dxpl_id;
-    idx_info.pline = pline;
-    idx_info.layout = &layout->u.chunk;
+    idx_info.pline   = pline;
+    idx_info.layout  = &layout->u.chunk;
     idx_info.storage = &layout->storage.u.chunk;
 
     /* Get size of index structure */
-    if((layout->storage.u.chunk.ops->size)(&idx_info, index_size) < 0)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve chunk index info")
+    if ((layout->storage.u.chunk.ops->size)(&idx_info, index_size) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve chunk index info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_bh_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_dump_index_cb
  *
@@ -5362,25 +5325,27 @@ done:
 static int
 H5D__chunk_dump_index_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
 {
-    H5D_chunk_it_ud4_t    *udata = (H5D_chunk_it_ud4_t *)_udata;  /* User data from caller */
+    H5D_chunk_it_ud4_t *udata = (H5D_chunk_it_ud4_t *)_udata; /* User data from caller */
 
     FUNC_ENTER_STATIC_NOERR
 
-    if(udata->stream) {
-        unsigned u;     /* Local index variable */
+    if (udata->stream) {
+        unsigned u; /* Local index variable */
 
         /* Print header if not already displayed */
-        if(!udata->header_displayed) {
+        if (!udata->header_displayed) {
             HDfprintf(udata->stream, "           Flags    Bytes     Address          Logical Offset\n");
-            HDfprintf(udata->stream, "        ========== ======== ========== ==============================\n");
+            HDfprintf(udata->stream,
+                      "        ========== ======== ========== ==============================\n");
 
             /* Set flag that the headers has been printed */
             udata->header_displayed = TRUE;
         } /* end if */
 
         /* Print information about this chunk */
-        HDfprintf(udata->stream,     "        0x%08x %8Zu %10a [", chunk_rec->filter_mask, chunk_rec->nbytes, chunk_rec->chunk_addr);
-        for(u = 0; u < udata->ndims; u++)
+        HDfprintf(udata->stream, "        0x%08x %8Zu %10a [", chunk_rec->filter_mask, chunk_rec->nbytes,
+                  chunk_rec->chunk_addr);
+        for (u = 0; u < udata->ndims; u++)
             HDfprintf(udata->stream, "%s%Hd", (u ? ", " : ""), chunk_rec->offset[u]);
         HDfputs("]\n", udata->stream);
     } /* end if */
@@ -5388,7 +5353,6 @@ H5D__chunk_dump_index_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
     FUNC_LEAVE_NOAPI(H5_ITER_CONT)
 } /* H5D__chunk_dump_index_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_dump_index
  *
@@ -5406,7 +5370,7 @@ H5D__chunk_dump_index_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
 herr_t
 H5D__chunk_dump_index(H5D_t *dset, hid_t dxpl_id, FILE *stream)
 {
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -5414,36 +5378,38 @@ H5D__chunk_dump_index(H5D_t *dset, hid_t dxpl_id, FILE *stream)
     HDassert(dset);
 
     /* Only display info if stream is defined */
-    if(stream) {
-        H5D_chk_idx_info_t idx_info;    /* Chunked index info */
-        H5D_chunk_it_ud4_t udata;       /* User data for callback */
+    if (stream) {
+        H5D_chk_idx_info_t idx_info; /* Chunked index info */
+        H5D_chunk_it_ud4_t udata;    /* User data for callback */
 
         /* Display info for index */
-        if((dset->shared->layout.storage.u.chunk.ops->dump)(&dset->shared->layout.storage.u.chunk, stream) < 0)
+        if ((dset->shared->layout.storage.u.chunk.ops->dump)(&dset->shared->layout.storage.u.chunk, stream) <
+            0)
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to dump chunk index info")
 
         /* Compose chunked index info struct */
-        idx_info.f = dset->oloc.file;
+        idx_info.f       = dset->oloc.file;
         idx_info.dxpl_id = dxpl_id;
-        idx_info.pline = &dset->shared->dcpl_cache.pline;
-        idx_info.layout = &dset->shared->layout.u.chunk;
+        idx_info.pline   = &dset->shared->dcpl_cache.pline;
+        idx_info.layout  = &dset->shared->layout.u.chunk;
         idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
         /* Set up user data for callback */
-        udata.stream = stream;
+        udata.stream           = stream;
         udata.header_displayed = FALSE;
-        udata.ndims = dset->shared->layout.u.chunk.ndims;
+        udata.ndims            = dset->shared->layout.u.chunk.ndims;
 
         /* Iterate over index and dump chunk info */
-        if((dset->shared->layout.storage.u.chunk.ops->iterate)(&idx_info, H5D__chunk_dump_index_cb, &udata) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to iterate over chunk index to dump chunk info")
+        if ((dset->shared->layout.storage.u.chunk.ops->iterate)(&idx_info, H5D__chunk_dump_index_cb, &udata) <
+            0)
+            HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL,
+                        "unable to iterate over chunk index to dump chunk info")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_dump_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_dest
  *
@@ -5460,13 +5426,13 @@ done:
 herr_t
 H5D__chunk_dest(H5F_t *f, hid_t dxpl_id, H5D_t *dset)
 {
-    H5D_chk_idx_info_t idx_info;        /* Chunked index info */
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    H5D_rdcc_t    *rdcc = &(dset->shared->cache.chunk);   /* Dataset's chunk cache */
-    H5D_rdcc_ent_t    *ent = NULL, *next = NULL;      /* Pointer to current & next cache entries */
-    int        nerrors = 0;            /* Accumulated count of errors */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5D_chk_idx_info_t idx_info;                                  /* Chunked index info */
+    H5D_dxpl_cache_t   _dxpl_cache;                               /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t * dxpl_cache = &_dxpl_cache;                 /* Data transfer property cache */
+    H5D_rdcc_t *       rdcc       = &(dset->shared->cache.chunk); /* Dataset's chunk cache */
+    H5D_rdcc_ent_t *   ent = NULL, *next = NULL; /* Pointer to current & next cache entries */
+    int                nerrors   = 0;            /* Accumulated count of errors */
+    herr_t             ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -5474,43 +5440,43 @@ H5D__chunk_dest(H5F_t *f, hid_t dxpl_id, H5D_t *dset)
     HDassert(dset);
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Flush all the cached chunks */
-    for(ent = rdcc->head; ent; ent = next) {
-    next = ent->next;
-    if(H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, ent, TRUE) < 0)
-        nerrors++;
+    for (ent = rdcc->head; ent; ent = next) {
+        next = ent->next;
+        if (H5D__chunk_cache_evict(dset, dxpl_id, dxpl_cache, ent, TRUE) < 0)
+            nerrors++;
     } /* end for */
 
     /* Continue even if there are failures. */
-    if(nerrors)
-    HDONE_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks")
+    if (nerrors)
+        HDONE_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks")
 
     /* Release cache structures */
-    if(rdcc->slot)
+    if (rdcc->slot)
         rdcc->slot = H5FL_SEQ_FREE(H5D_rdcc_ent_ptr_t, rdcc->slot);
     HDmemset(rdcc, 0, sizeof(H5D_rdcc_t));
 
     /* Compose chunked index info struct */
-    idx_info.f = f;
+    idx_info.f       = f;
     idx_info.dxpl_id = dxpl_id;
-    idx_info.pline = &dset->shared->dcpl_cache.pline;
-    idx_info.layout = &dset->shared->layout.u.chunk;
+    idx_info.pline   = &dset->shared->dcpl_cache.pline;
+    idx_info.layout  = &dset->shared->layout.u.chunk;
     idx_info.storage = &dset->shared->layout.storage.u.chunk;
 
     /* Free any index structures */
-    if(dset->shared->layout.storage.u.chunk.ops->dest &&
-            (dset->shared->layout.storage.u.chunk.ops->dest)(&idx_info) < 0)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to release chunk index info")
+    if (dset->shared->layout.storage.u.chunk.ops->dest &&
+        (dset->shared->layout.storage.u.chunk.ops->dest)(&idx_info) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to release chunk index info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_dest() */
 
 #ifdef H5D_CHUNK_DEBUG
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_stats
  *
@@ -5528,10 +5494,10 @@ done:
 herr_t
 H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
 {
-    H5D_rdcc_t    *rdcc = &(dset->shared->cache.chunk);
-    double    miss_rate;
-    char    ascii[32];
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk);
+    double      miss_rate;
+    char        ascii[32];
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -5540,32 +5506,33 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
 
     if (headers) {
         HDfprintf(H5DEBUG(AC), "H5D: raw data cache statistics\n");
-        HDfprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s+%-8s\n",
-            "Layer", "Hits", "Misses", "MissRate", "Inits", "Flushes");
-        HDfprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s-%-8s\n",
-            "-----", "----", "------", "--------", "-----", "-------");
+        HDfprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s+%-8s\n", "Layer", "Hits", "Misses", "MissRate",
+                  "Inits", "Flushes");
+        HDfprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s-%-8s\n", "-----", "----", "------", "--------",
+                  "-----", "-------");
     }
 
 #ifdef H5AC_DEBUG
-    if (H5DEBUG(AC)) headers = TRUE;
+    if (H5DEBUG(AC))
+        headers = TRUE;
 #endif
 
     if (headers) {
-        if (rdcc->nhits>0 || rdcc->nmisses>0) {
-            miss_rate = 100.0 * rdcc->nmisses /
-                    (rdcc->nhits + rdcc->nmisses);
-        } else {
+        if (rdcc->nhits > 0 || rdcc->nmisses > 0) {
+            miss_rate = 100.0 * rdcc->nmisses / (rdcc->nhits + rdcc->nmisses);
+        }
+        else {
             miss_rate = 0.0;
         }
         if (miss_rate > 100) {
-            sprintf(ascii, "%7d%%", (int) (miss_rate + 0.5));
-        } else {
+            sprintf(ascii, "%7d%%", (int)(miss_rate + 0.5));
+        }
+        else {
             sprintf(ascii, "%7.2f%%", miss_rate);
         }
 
-        HDfprintf(H5DEBUG(AC), "   %-18s %8u %8u %7s %8d+%-9ld\n",
-            "raw data chunks", rdcc->nhits, rdcc->nmisses, ascii,
-            rdcc->ninits, (long)(rdcc->nflushes)-(long)(rdcc->ninits));
+        HDfprintf(H5DEBUG(AC), "   %-18s %8u %8u %7s %8d+%-9ld\n", "raw data chunks", rdcc->nhits,
+                  rdcc->nmisses, ascii, rdcc->ninits, (long)(rdcc->nflushes) - (long)(rdcc->ninits));
     }
 
 done:
@@ -5573,7 +5540,6 @@ done:
 } /* end H5D__chunk_stats() */
 #endif /* H5D_CHUNK_DEBUG */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__nonexistent_readvv_cb
  *
@@ -5593,36 +5559,35 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__nonexistent_readvv_cb(hsize_t H5_ATTR_UNUSED dst_off, hsize_t src_off, size_t len,
-    void *_udata)
+H5D__nonexistent_readvv_cb(hsize_t H5_ATTR_UNUSED dst_off, hsize_t src_off, size_t len, void *_udata)
 {
     H5D_chunk_readvv_ud_t *udata = (H5D_chunk_readvv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    H5D_fill_buf_info_t fb_info;    /* Dataset's fill buffer info */
-    hbool_t fb_info_init = FALSE;   /* Whether the fill value buffer has been initialized */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5D_fill_buf_info_t    fb_info;                                 /* Dataset's fill buffer info */
+    hbool_t                fb_info_init = FALSE;   /* Whether the fill value buffer has been initialized */
+    herr_t                 ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Initialize the fill value buffer */
-    if(H5D__fill_init(&fb_info, (udata->rbuf + src_off), NULL, NULL, NULL, NULL,
-            &udata->dset->shared->dcpl_cache.fill, udata->dset->shared->type,
-            udata->dset->shared->type_id, (size_t)0, len, udata->dxpl_id) < 0)
+    if (H5D__fill_init(&fb_info, (udata->rbuf + src_off), NULL, NULL, NULL, NULL,
+                       &udata->dset->shared->dcpl_cache.fill, udata->dset->shared->type,
+                       udata->dset->shared->type_id, (size_t)0, len, udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize fill buffer info")
     fb_info_init = TRUE;
 
     /* Check for VL datatype & fill the buffer with VL datatype fill values */
-    if(fb_info.has_vlen_fill_type && H5D__fill_refill_vl(&fb_info, fb_info.elmts_per_buf, udata->dxpl_id) < 0)
+    if (fb_info.has_vlen_fill_type &&
+        H5D__fill_refill_vl(&fb_info, fb_info.elmts_per_buf, udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "can't refill fill value buffer")
 
 done:
     /* Release the fill buffer info, if it's been initialized */
-    if(fb_info_init && H5D__fill_term(&fb_info) < 0)
+    if (fb_info_init && H5D__fill_term(&fb_info) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release fill buffer info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__nonexistent_readvv_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__nonexistent_readvv
  *
@@ -5644,12 +5609,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__nonexistent_readvv(const H5D_io_info_t *io_info,
-    size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[], hsize_t chunk_off_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[])
+H5D__nonexistent_readvv(const H5D_io_info_t *io_info, size_t chunk_max_nseq, size_t *chunk_curr_seq,
+                        size_t chunk_len_arr[], hsize_t chunk_off_arr[], size_t mem_max_nseq,
+                        size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[])
 {
-    H5D_chunk_readvv_ud_t udata;        /* User data for H5VM_opvv() operator */
-    ssize_t ret_value;                  /* Return value */
+    H5D_chunk_readvv_ud_t udata;     /* User data for H5VM_opvv() operator */
+    ssize_t               ret_value; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -5663,14 +5628,14 @@ H5D__nonexistent_readvv(const H5D_io_info_t *io_info,
     HDassert(mem_off_arr);
 
     /* Set up user data for H5VM_opvv() */
-    udata.rbuf = (unsigned char *)io_info->u.rbuf;
-    udata.dset = io_info->dset;
+    udata.rbuf    = (unsigned char *)io_info->u.rbuf;
+    udata.dset    = io_info->dset;
     udata.dxpl_id = io_info->dxpl_id;
 
     /* Call generic sequence operation routine */
-    if((ret_value = H5VM_opvv(chunk_max_nseq, chunk_curr_seq, chunk_len_arr, chunk_off_arr,
-            mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-            H5D__nonexistent_readvv_cb, &udata)) < 0)
+    if ((ret_value = H5VM_opvv(chunk_max_nseq, chunk_curr_seq, chunk_len_arr, chunk_off_arr, mem_max_nseq,
+                               mem_curr_seq, mem_len_arr, mem_off_arr, H5D__nonexistent_readvv_cb, &udata)) <
+        0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized fill value init")
 
 done:
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c
index 71866c3..9183df4 100644
--- a/src/H5Dcompact.c
+++ b/src/H5Dcompact.c
@@ -23,76 +23,60 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE             /*suppress error about including H5Dpkg   */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg   */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5VMprivate.h"		/* Vector and array functions		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Dataset functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* Files				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5VMprivate.h" /* Vector and array functions		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Layout operation callbacks */
-static herr_t H5D__compact_construct(H5F_t *f, H5D_t *dset);
+static herr_t  H5D__compact_construct(H5F_t *f, H5D_t *dset);
 static hbool_t H5D__compact_is_space_alloc(const H5O_storage_t *storage);
-static herr_t H5D__compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *cm);
-static ssize_t H5D__compact_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[]);
-static ssize_t H5D__compact_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[]);
-static herr_t H5D__compact_flush(H5D_t *dset, hid_t dxpl_id);
-
+static herr_t  H5D__compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                    H5D_chunk_map_t *cm);
+static ssize_t H5D__compact_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                                   size_t dset_size_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                                   size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[]);
+static ssize_t H5D__compact_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                                    size_t dset_size_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                                    size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[]);
+static herr_t  H5D__compact_flush(H5D_t *dset, hid_t dxpl_id);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* Compact storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_COMPACT[1] = {{
-    H5D__compact_construct,
-    NULL,
-    H5D__compact_is_space_alloc,
-    NULL,
-    H5D__compact_io_init,
-    H5D__contig_read,
-    H5D__contig_write,
+const H5D_layout_ops_t H5D_LOPS_COMPACT[1] = {
+    {H5D__compact_construct, NULL, H5D__compact_is_space_alloc, NULL, H5D__compact_io_init, H5D__contig_read,
+     H5D__contig_write,
 #ifdef H5_HAVE_PARALLEL
-    NULL,
-    NULL,
+     NULL, NULL,
 #endif /* H5_HAVE_PARALLEL */
-    H5D__compact_readvv,
-    H5D__compact_writevv,
-    H5D__compact_flush,
-    NULL
-}};
-
+     H5D__compact_readvv, H5D__compact_writevv, H5D__compact_flush, NULL}};
 
 /*******************/
 /* Local Variables */
@@ -101,8 +85,6 @@ const H5D_layout_ops_t H5D_LOPS_COMPACT[1] = {{
 /* Declare extern the free list to manage blocks of type conversion data */
 H5FL_BLK_EXTERN(type_conv);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__compact_fill
  *
@@ -118,9 +100,9 @@ H5FL_BLK_EXTERN(type_conv);
 herr_t
 H5D__compact_fill(const H5D_t *dset, hid_t dxpl_id)
 {
-    H5D_fill_buf_info_t fb_info;        /* Dataset's fill buffer info */
-    hbool_t     fb_info_init = FALSE;   /* Whether the fill value buffer has been initialized */
-    herr_t	ret_value = SUCCEED;	/* Return value */
+    H5D_fill_buf_info_t fb_info;                /* Dataset's fill buffer info */
+    hbool_t             fb_info_init = FALSE;   /* Whether the fill value buffer has been initialized */
+    herr_t              ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -133,28 +115,26 @@ H5D__compact_fill(const H5D_t *dset, hid_t dxpl_id)
 
     /* Initialize the fill value buffer */
     /* (use the compact dataset storage buffer as the fill value buffer) */
-    if(H5D__fill_init(&fb_info, dset->shared->layout.storage.u.compact.buf,
-            NULL, NULL, NULL, NULL,
-            &dset->shared->dcpl_cache.fill, dset->shared->type,
-            dset->shared->type_id, (size_t)0, dset->shared->layout.storage.u.compact.size, dxpl_id) < 0)
+    if (H5D__fill_init(&fb_info, dset->shared->layout.storage.u.compact.buf, NULL, NULL, NULL, NULL,
+                       &dset->shared->dcpl_cache.fill, dset->shared->type, dset->shared->type_id, (size_t)0,
+                       dset->shared->layout.storage.u.compact.size, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize fill buffer info")
     fb_info_init = TRUE;
 
     /* Check for VL datatype & non-default fill value */
-    if(fb_info.has_vlen_fill_type)
+    if (fb_info.has_vlen_fill_type)
         /* Fill the buffer with VL datatype fill values */
-        if(H5D__fill_refill_vl(&fb_info, fb_info.elmts_per_buf, dxpl_id) < 0)
+        if (H5D__fill_refill_vl(&fb_info, fb_info.elmts_per_buf, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "can't refill fill value buffer")
 
 done:
     /* Release the fill buffer info, if it's been initialized */
-    if(fb_info_init && H5D__fill_term(&fb_info) < 0)
+    if (fb_info_init && H5D__fill_term(&fb_info) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release fill buffer info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__compact_fill() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__compact_construct
  *
@@ -170,14 +150,14 @@ done:
 static herr_t
 H5D__compact_construct(H5F_t *f, H5D_t *dset)
 {
-    hssize_t stmp_size;         /* Temporary holder for raw data size */
-    hsize_t tmp_size;           /* Temporary holder for raw data size */
-    hsize_t max_comp_data_size; /* Max. allowed size of compact data */
-    hsize_t dim[H5O_LAYOUT_NDIMS];      /* Current size of data in elements */
-    hsize_t max_dim[H5O_LAYOUT_NDIMS];  /* Maximum size of data in elements */
-    int ndims;                          /* Rank of dataspace */
-    int i;                              /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hssize_t stmp_size;                 /* Temporary holder for raw data size */
+    hsize_t  tmp_size;                  /* Temporary holder for raw data size */
+    hsize_t  max_comp_data_size;        /* Max. allowed size of compact data */
+    hsize_t  dim[H5O_LAYOUT_NDIMS];     /* Current size of data in elements */
+    hsize_t  max_dim[H5O_LAYOUT_NDIMS]; /* Maximum size of data in elements */
+    int      ndims;                     /* Rank of dataspace */
+    int      i;                         /* Local index variable */
+    herr_t   ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -186,10 +166,10 @@ H5D__compact_construct(H5F_t *f, H5D_t *dset)
     HDassert(dset);
 
     /* Check for invalid dataset dimensions */
-    if((ndims = H5S_get_simple_extent_dims(dset->shared->space, dim, max_dim)) < 0)
+    if ((ndims = H5S_get_simple_extent_dims(dset->shared->space, dim, max_dim)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataspace dimensions")
-    for(i = 0; i < ndims; i++)
-        if(max_dim[i] > dim[i])
+    for (i = 0; i < ndims; i++)
+        if (max_dim[i] > dim[i])
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "extendible compact dataset")
 
     /*
@@ -207,14 +187,14 @@ H5D__compact_construct(H5F_t *f, H5D_t *dset)
      * (64KB) minus other layout message fields.
      */
     max_comp_data_size = H5O_MESG_MAX_SIZE - H5D__layout_meta_size(f, &(dset->shared->layout), FALSE);
-    if(dset->shared->layout.storage.u.compact.size > max_comp_data_size)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "compact dataset size is bigger than header message maximum size")
+    if (dset->shared->layout.storage.u.compact.size > max_comp_data_size)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                    "compact dataset size is bigger than header message maximum size")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__compact_construct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__compact_is_space_alloc
  *
@@ -239,7 +219,6 @@ H5D__compact_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage)
     FUNC_LEAVE_NOAPI(TRUE)
 } /* end H5D__compact_is_space_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__compact_io_init
  *
@@ -254,18 +233,17 @@ H5D__compact_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage)
  */
 static herr_t
 H5D__compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNUSED *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
-    H5D_chunk_map_t H5_ATTR_UNUSED *cm)
+                     hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space,
+                     const H5S_t H5_ATTR_UNUSED *mem_space, H5D_chunk_map_t H5_ATTR_UNUSED *cm)
 {
     FUNC_ENTER_STATIC_NOERR
 
-    io_info->store->compact.buf = io_info->dset->shared->layout.storage.u.compact.buf;
+    io_info->store->compact.buf   = io_info->dset->shared->layout.storage.u.compact.buf;
     io_info->store->compact.dirty = &io_info->dset->shared->layout.storage.u.compact.dirty;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__compact_io_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__compact_readvv
  *
@@ -285,25 +263,26 @@ H5D__compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__compact_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[])
+H5D__compact_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                    size_t dset_size_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                    size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[])
 {
-    ssize_t ret_value;                  /* Return value */
+    ssize_t ret_value; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(io_info);
 
     /* Use the vectorized memory copy routine to do actual work */
-    if((ret_value = H5VM_memcpyvv(io_info->u.rbuf, mem_max_nseq, mem_curr_seq, mem_size_arr, mem_offset_arr, io_info->store->compact.buf, dset_max_nseq, dset_curr_seq, dset_size_arr, dset_offset_arr)) < 0)
+    if ((ret_value = H5VM_memcpyvv(io_info->u.rbuf, mem_max_nseq, mem_curr_seq, mem_size_arr, mem_offset_arr,
+                                   io_info->store->compact.buf, dset_max_nseq, dset_curr_seq, dset_size_arr,
+                                   dset_offset_arr)) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vectorized memcpy failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__compact_readvv() */
+} /* end H5D__compact_readvv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__compact_writevv
  *
@@ -326,18 +305,20 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__compact_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[])
+H5D__compact_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                     size_t dset_size_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                     size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[])
 {
-    ssize_t ret_value;                  /* Return value */
+    ssize_t ret_value; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(io_info);
 
     /* Use the vectorized memory copy routine to do actual work */
-    if((ret_value = H5VM_memcpyvv(io_info->store->compact.buf, dset_max_nseq, dset_curr_seq, dset_size_arr, dset_offset_arr, io_info->u.wbuf, mem_max_nseq, mem_curr_seq, mem_size_arr, mem_offset_arr)) < 0)
+    if ((ret_value = H5VM_memcpyvv(io_info->store->compact.buf, dset_max_nseq, dset_curr_seq, dset_size_arr,
+                                   dset_offset_arr, io_info->u.wbuf, mem_max_nseq, mem_curr_seq, mem_size_arr,
+                                   mem_offset_arr)) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vectorized memcpy failed")
 
     /* Mark the compact dataset's buffer as dirty */
@@ -345,9 +326,8 @@ H5D__compact_writevv(const H5D_io_info_t *io_info,
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__compact_writevv() */
+} /* end H5D__compact_writevv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__compact_flush
  *
@@ -363,7 +343,7 @@ done:
 static herr_t
 H5D__compact_flush(H5D_t *dset, hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -371,9 +351,10 @@ H5D__compact_flush(H5D_t *dset, hid_t dxpl_id)
     HDassert(dset);
 
     /* Check if the buffered compact information is dirty */
-    if(dset->shared->layout.storage.u.compact.dirty) {
+    if (dset->shared->layout.storage.u.compact.dirty) {
         dset->shared->layout.storage.u.compact.dirty = FALSE;
-        if(H5O_msg_write(&(dset->oloc), H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &(dset->shared->layout), dxpl_id) < 0) {
+        if (H5O_msg_write(&(dset->oloc), H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &(dset->shared->layout),
+                          dxpl_id) < 0) {
             dset->shared->layout.storage.u.compact.dirty = TRUE;
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update layout message")
         }
@@ -383,7 +364,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__compact_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__compact_copy
  *
@@ -398,19 +378,18 @@ done:
  */
 herr_t
 H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_dst,
-    H5O_storage_compact_t *storage_dst, H5T_t *dt_src, H5O_copy_t *cpy_info,
-    hid_t dxpl_id)
+                  H5O_storage_compact_t *storage_dst, H5T_t *dt_src, H5O_copy_t *cpy_info, hid_t dxpl_id)
 {
-    hid_t       tid_src = -1;           /* Datatype ID for source datatype */
-    hid_t       tid_dst = -1;           /* Datatype ID for destination datatype */
-    hid_t       tid_mem = -1;           /* Datatype ID for memory datatype */
-    void       *buf = NULL;             /* Buffer for copying data */
-    void       *bkg = NULL;             /* Temporary buffer for copying data */
-    void       *reclaim_buf = NULL;     /* Buffer for reclaiming data */
-    hid_t       buf_sid = -1;           /* ID for buffer dataspace */
-    H5D_shared_t    *shared_fo = cpy_info->shared_fo;   /* Pointer to the shared struct for dataset object */
-    H5O_storage_compact_t *storage_src = _storage_src;  /* Pointer to storage_src */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    hid_t         tid_src     = -1;                    /* Datatype ID for source datatype */
+    hid_t         tid_dst     = -1;                    /* Datatype ID for destination datatype */
+    hid_t         tid_mem     = -1;                    /* Datatype ID for memory datatype */
+    void *        buf         = NULL;                  /* Buffer for copying data */
+    void *        bkg         = NULL;                  /* Temporary buffer for copying data */
+    void *        reclaim_buf = NULL;                  /* Buffer for reclaiming data */
+    hid_t         buf_sid     = -1;                    /* ID for buffer dataspace */
+    H5D_shared_t *shared_fo   = cpy_info->shared_fo;   /* Pointer to the shared struct for dataset object */
+    H5O_storage_compact_t *storage_src = _storage_src; /* Pointer to storage_src */
+    herr_t                 ret_value   = SUCCEED;      /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -422,68 +401,68 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds
     HDassert(dt_src);
 
     /* If the dataset is open in the file, point to "layout" in the shared struct */
-    if(shared_fo != NULL)
+    if (shared_fo != NULL)
         storage_src = &(shared_fo->layout.storage.u.compact);
 
     /* Allocate space for destination data */
-    if(NULL == (storage_dst->buf = H5MM_malloc(storage_src->size)))
+    if (NULL == (storage_dst->buf = H5MM_malloc(storage_src->size)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "unable to allocate memory for compact dataset")
 
     /* Create datatype ID for src datatype, so it gets freed */
-    if((tid_src = H5I_register(H5I_DATATYPE, dt_src, FALSE)) < 0)
+    if ((tid_src = H5I_register(H5I_DATATYPE, dt_src, FALSE)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register source file datatype")
 
     /* If there's a VLEN source datatype, do type conversion information */
-    if(H5T_detect_class(dt_src, H5T_VLEN, FALSE) > 0) {
-        H5T_path_t  *tpath_src_mem, *tpath_mem_dst;   /* Datatype conversion paths */
-        H5T_t *dt_dst;              /* Destination datatype */
-        H5T_t *dt_mem;              /* Memory datatype */
-        H5S_t *buf_space;           /* Dataspace describing buffer */
-        size_t buf_size;            /* Size of copy buffer */
-        size_t nelmts;              /* Number of elements in buffer */
-        size_t src_dt_size;         /* Source datatype size */
-        size_t tmp_dt_size;         /* Temporary datatype size */
-        size_t max_dt_size;         /* Max atatype size */
-        hsize_t buf_dim;            /* Dimension for buffer */
+    if (H5T_detect_class(dt_src, H5T_VLEN, FALSE) > 0) {
+        H5T_path_t *tpath_src_mem, *tpath_mem_dst; /* Datatype conversion paths */
+        H5T_t *     dt_dst;                        /* Destination datatype */
+        H5T_t *     dt_mem;                        /* Memory datatype */
+        H5S_t *     buf_space;                     /* Dataspace describing buffer */
+        size_t      buf_size;                      /* Size of copy buffer */
+        size_t      nelmts;                        /* Number of elements in buffer */
+        size_t      src_dt_size;                   /* Source datatype size */
+        size_t      tmp_dt_size;                   /* Temporary datatype size */
+        size_t      max_dt_size;                   /* Max atatype size */
+        hsize_t     buf_dim;                       /* Dimension for buffer */
 
         /* create a memory copy of the variable-length datatype */
-        if(NULL == (dt_mem = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
+        if (NULL == (dt_mem = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy")
-        if((tid_mem = H5I_register(H5I_DATATYPE, dt_mem, FALSE)) < 0) {
+        if ((tid_mem = H5I_register(H5I_DATATYPE, dt_mem, FALSE)) < 0) {
             H5T_close(dt_mem);
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register memory datatype")
         } /* end if */
 
         /* create variable-length datatype at the destinaton file */
-        if(NULL == (dt_dst = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
+        if (NULL == (dt_dst = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy")
-        if(H5T_set_loc(dt_dst, f_dst, H5T_LOC_DISK) < 0) {
+        if (H5T_set_loc(dt_dst, f_dst, H5T_LOC_DISK) < 0) {
             H5T_close(dt_dst);
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "cannot mark datatype on disk")
         } /* end if */
-        if((tid_dst = H5I_register(H5I_DATATYPE, dt_dst, FALSE)) < 0) {
+        if ((tid_dst = H5I_register(H5I_DATATYPE, dt_dst, FALSE)) < 0) {
             H5T_close(dt_dst);
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register destination file datatype")
         } /* end if */
 
         /* Set up the conversion functions */
-        if(NULL == (tpath_src_mem = H5T_path_find(dt_src, dt_mem, NULL, NULL, dxpl_id, FALSE)))
+        if (NULL == (tpath_src_mem = H5T_path_find(dt_src, dt_mem, NULL, NULL, dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to convert between src and mem datatypes")
-        if(NULL == (tpath_mem_dst = H5T_path_find(dt_mem, dt_dst, NULL, NULL, dxpl_id, FALSE)))
+        if (NULL == (tpath_mem_dst = H5T_path_find(dt_mem, dt_dst, NULL, NULL, dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to convert between mem and dst datatypes")
 
         /* Determine largest datatype size */
-        if(0 == (src_dt_size = H5T_get_size(dt_src)))
+        if (0 == (src_dt_size = H5T_get_size(dt_src)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to determine datatype size")
-        if(0 == (tmp_dt_size = H5T_get_size(dt_mem)))
+        if (0 == (tmp_dt_size = H5T_get_size(dt_mem)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to determine datatype size")
         max_dt_size = MAX(src_dt_size, tmp_dt_size);
-        if(0 == (tmp_dt_size = H5T_get_size(dt_dst)))
+        if (0 == (tmp_dt_size = H5T_get_size(dt_dst)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to determine datatype size")
         max_dt_size = MAX(max_dt_size, tmp_dt_size);
 
         /* Set number of whole elements that fit in buffer */
-        if(0 == (nelmts = storage_src->size / src_dt_size))
+        if (0 == (nelmts = storage_src->size / src_dt_size))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "element size too large")
 
         /* Set up number of bytes to copy, and initial buffer size */
@@ -493,31 +472,31 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds
         buf_dim = nelmts;
 
         /* Create the space and set the initial extent */
-        if(NULL == (buf_space = H5S_create_simple((unsigned)1, &buf_dim, NULL)))
+        if (NULL == (buf_space = H5S_create_simple((unsigned)1, &buf_dim, NULL)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create simple dataspace")
 
         /* Atomize */
-        if((buf_sid = H5I_register(H5I_DATASPACE, buf_space, FALSE)) < 0) {
+        if ((buf_sid = H5I_register(H5I_DATASPACE, buf_space, FALSE)) < 0) {
             H5S_close(buf_space);
             HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace ID")
         } /* end if */
 
         /* Allocate memory for recclaim buf */
-        if(NULL == (reclaim_buf = H5FL_BLK_MALLOC(type_conv, buf_size)))
+        if (NULL == (reclaim_buf = H5FL_BLK_MALLOC(type_conv, buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Allocate memory for copying the chunk */
-        if(NULL == (buf = H5FL_BLK_MALLOC(type_conv, buf_size)))
+        if (NULL == (buf = H5FL_BLK_MALLOC(type_conv, buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         HDmemcpy(buf, storage_src->buf, storage_src->size);
 
         /* allocate temporary bkg buff for data conversion */
-        if(NULL == (bkg = H5FL_BLK_MALLOC(type_conv, buf_size)))
+        if (NULL == (bkg = H5FL_BLK_MALLOC(type_conv, buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Convert from source file to memory */
-        if(H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
+        if (H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
 
         /* Copy into another buffer, to reclaim memory later */
@@ -527,26 +506,27 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds
         HDmemset(bkg, 0, buf_size);
 
         /* Convert from memory to destination file */
-        if(H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
+        if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
 
         HDmemcpy(storage_dst->buf, buf, storage_dst->size);
 
-        if(H5D_vlen_reclaim(tid_mem, buf_space, H5P_DATASET_XFER_DEFAULT, reclaim_buf) < 0)
+        if (H5D_vlen_reclaim(tid_mem, buf_space, H5P_DATASET_XFER_DEFAULT, reclaim_buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to reclaim variable-length data")
     } /* end if */
-    else if(H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) {
-        if(f_src != f_dst) {
+    else if (H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) {
+        if (f_src != f_dst) {
             /* Check for expanding references */
-            if(cpy_info->expand_ref) {
+            if (cpy_info->expand_ref) {
                 size_t ref_count;
 
                 /* Determine # of reference elements to copy */
                 ref_count = storage_src->size / H5T_get_size(dt_src);
 
-                /* Copy objects referenced in source buffer to destination file and set destination elements */
-                if(H5O_copy_expand_ref(f_src, storage_src->buf, dxpl_id, f_dst,
-                        storage_dst->buf, ref_count, H5T_get_ref_type(dt_src), cpy_info) < 0)
+                /* Copy objects referenced in source buffer to destination file and set destination elements
+                 */
+                if (H5O_copy_expand_ref(f_src, storage_src->buf, dxpl_id, f_dst, storage_dst->buf, ref_count,
+                                        H5T_get_ref_type(dt_src), cpy_info) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to copy reference attribute")
             } /* end if */
             else
@@ -565,21 +545,20 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds
     storage_dst->dirty = TRUE;
 
 done:
-    if(buf_sid > 0 && H5I_dec_ref(buf_sid) < 0)
+    if (buf_sid > 0 && H5I_dec_ref(buf_sid) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't decrement temporary dataspace ID")
-    if(tid_src > 0 && H5I_dec_ref(tid_src) < 0)
+    if (tid_src > 0 && H5I_dec_ref(tid_src) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(tid_dst > 0 && H5I_dec_ref(tid_dst) < 0)
+    if (tid_dst > 0 && H5I_dec_ref(tid_dst) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(tid_mem > 0 && H5I_dec_ref(tid_mem) < 0)
+    if (tid_mem > 0 && H5I_dec_ref(tid_mem) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(buf)
+    if (buf)
         buf = H5FL_BLK_FREE(type_conv, buf);
-    if(reclaim_buf)
+    if (reclaim_buf)
         reclaim_buf = H5FL_BLK_FREE(type_conv, reclaim_buf);
-    if(bkg)
+    if (bkg)
         bkg = H5FL_BLK_FREE(type_conv, bkg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__compact_copy() */
-
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 49e769b..c301f45 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -25,114 +25,97 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Pprivate.h"		/* Property lists			*/
-#include "H5VMprivate.h"		/* Vector and array functions		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Dataset functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* Files				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Pprivate.h"  /* Property lists			*/
+#include "H5VMprivate.h" /* Vector and array functions		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Callback info for sieve buffer readvv operation */
 typedef struct H5D_contig_readvv_sieve_ud_t {
-    H5F_t *file;                /* File for dataset */
-    H5D_rdcdc_t *dset_contig;   /* Cached information about contiguous data */
-    const H5D_contig_storage_t *store_contig;    /* Contiguous storage info for this I/O operation */
-    unsigned char *rbuf;        /* Pointer to buffer to fill */
-    hid_t dxpl_id;              /* DXPL for operation */
+    H5F_t *                     file;         /* File for dataset */
+    H5D_rdcdc_t *               dset_contig;  /* Cached information about contiguous data */
+    const H5D_contig_storage_t *store_contig; /* Contiguous storage info for this I/O operation */
+    unsigned char *             rbuf;         /* Pointer to buffer to fill */
+    hid_t                       dxpl_id;      /* DXPL for operation */
 } H5D_contig_readvv_sieve_ud_t;
 
 /* Callback info for [plain] readvv operation */
 typedef struct H5D_contig_readvv_ud_t {
-    H5F_t *file;                /* File for dataset */
-    haddr_t dset_addr;          /* Address of dataset */
-    unsigned char *rbuf;        /* Pointer to buffer to fill */
-    hid_t dxpl_id;              /* DXPL for operation */
+    H5F_t *        file;      /* File for dataset */
+    haddr_t        dset_addr; /* Address of dataset */
+    unsigned char *rbuf;      /* Pointer to buffer to fill */
+    hid_t          dxpl_id;   /* DXPL for operation */
 } H5D_contig_readvv_ud_t;
 
 /* Callback info for sieve buffer writevv operation */
 typedef struct H5D_contig_writevv_sieve_ud_t {
-    H5F_t *file;                /* File for dataset */
-    H5D_rdcdc_t *dset_contig;   /* Cached information about contiguous data */
-    const H5D_contig_storage_t *store_contig;    /* Contiguous storage info for this I/O operation */
-    const unsigned char *wbuf;  /* Pointer to buffer to write */
-    hid_t dxpl_id;              /* DXPL for operation */
+    H5F_t *                     file;         /* File for dataset */
+    H5D_rdcdc_t *               dset_contig;  /* Cached information about contiguous data */
+    const H5D_contig_storage_t *store_contig; /* Contiguous storage info for this I/O operation */
+    const unsigned char *       wbuf;         /* Pointer to buffer to write */
+    hid_t                       dxpl_id;      /* DXPL for operation */
 } H5D_contig_writevv_sieve_ud_t;
 
 /* Callback info for [plain] writevv operation */
 typedef struct H5D_contig_writevv_ud_t {
-    H5F_t *file;                /* File for dataset */
-    haddr_t dset_addr;          /* Address of dataset */
-    const unsigned char *wbuf;  /* Pointer to buffer to write */
-    hid_t dxpl_id;              /* DXPL for operation */
+    H5F_t *              file;      /* File for dataset */
+    haddr_t              dset_addr; /* Address of dataset */
+    const unsigned char *wbuf;      /* Pointer to buffer to write */
+    hid_t                dxpl_id;   /* DXPL for operation */
 } H5D_contig_writevv_ud_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Layout operation callbacks */
-static herr_t H5D__contig_construct(H5F_t *f, H5D_t *dset);
-static herr_t H5D__contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *cm);
-static ssize_t H5D__contig_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-static ssize_t H5D__contig_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-static herr_t H5D__contig_flush(H5D_t *dset, hid_t dxpl_id);
+static herr_t  H5D__contig_construct(H5F_t *f, H5D_t *dset);
+static herr_t  H5D__contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                   hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                   H5D_chunk_map_t *cm);
+static ssize_t H5D__contig_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                                  size_t dset_len_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                                  size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+static ssize_t H5D__contig_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                                   size_t dset_len_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                                   size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+static herr_t  H5D__contig_flush(H5D_t *dset, hid_t dxpl_id);
 
 /* Helper routines */
-static herr_t H5D__contig_write_one(H5D_io_info_t *io_info, hsize_t offset,
-    size_t size);
-
+static herr_t H5D__contig_write_one(H5D_io_info_t *io_info, hsize_t offset, size_t size);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* Contiguous storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_CONTIG[1] = {{
-    H5D__contig_construct,
-    NULL,
-    H5D__contig_is_space_alloc,
-    H5D__contig_is_data_cached,
-    H5D__contig_io_init,
-    H5D__contig_read,
-    H5D__contig_write,
+const H5D_layout_ops_t H5D_LOPS_CONTIG[1] = {
+    {H5D__contig_construct, NULL, H5D__contig_is_space_alloc, H5D__contig_is_data_cached, H5D__contig_io_init,
+     H5D__contig_read, H5D__contig_write,
 #ifdef H5_HAVE_PARALLEL
-    H5D__contig_collective_read,
-    H5D__contig_collective_write,
+     H5D__contig_collective_read, H5D__contig_collective_write,
 #endif /* H5_HAVE_PARALLEL */
-    H5D__contig_readvv,
-    H5D__contig_writevv,
-    H5D__contig_flush,
-    NULL
-}};
-
+     H5D__contig_readvv, H5D__contig_writevv, H5D__contig_flush, NULL}};
 
 /*******************/
 /* Local Variables */
@@ -144,8 +127,6 @@ H5FL_BLK_DEFINE(sieve_buf);
 /* Declare extern the free list to manage blocks of type conversion data */
 H5FL_BLK_EXTERN(type_conv);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_alloc
  *
@@ -159,9 +140,9 @@ H5FL_BLK_EXTERN(type_conv);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__contig_alloc(H5F_t *f, hid_t dxpl_id, H5O_storage_contig_t *storage /*out */ )
+H5D__contig_alloc(H5F_t *f, hid_t dxpl_id, H5O_storage_contig_t *storage /*out */)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -170,14 +151,13 @@ H5D__contig_alloc(H5F_t *f, hid_t dxpl_id, H5O_storage_contig_t *storage /*out *
     HDassert(storage);
 
     /* Allocate space for the contiguous data */
-    if(HADDR_UNDEF == (storage->addr = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, storage->size)))
+    if (HADDR_UNDEF == (storage->addr = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, storage->size)))
         HGOTO_ERROR(H5E_IO, H5E_NOSPACE, FAIL, "unable to reserve file space")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_alloc */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_fill
  *
@@ -193,24 +173,25 @@ done:
 herr_t
 H5D__contig_fill(const H5D_t *dset, hid_t dxpl_id)
 {
-    H5D_io_info_t ioinfo;       /* Dataset I/O info */
-    H5D_storage_t store;        /* Union of storage info for dataset */
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    hssize_t    snpoints;       /* Number of points in space (for error checking) */
-    size_t      npoints;        /* Number of points in space */
-    hsize_t	offset;         /* Offset of dataset */
+    H5D_io_info_t     ioinfo;                    /* Dataset I/O info */
+    H5D_storage_t     store;                     /* Union of storage info for dataset */
+    H5D_dxpl_cache_t  _dxpl_cache;               /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
+    hssize_t          snpoints;                  /* Number of points in space (for error checking) */
+    size_t            npoints;                   /* Number of points in space */
+    hsize_t           offset;                    /* Offset of dataset */
 #ifdef H5_HAVE_PARALLEL
-    MPI_Comm	mpi_comm = MPI_COMM_NULL;	/* MPI communicator for file */
-    int         mpi_rank = (-1);  /* This process's rank  */
-    int         mpi_code;       /* MPI return code */
-    hbool_t     blocks_written = FALSE; /* Flag to indicate that chunk was actually written */
-    hbool_t     using_mpi = FALSE;      /* Flag to indicate that the file is being accessed with an MPI-capable file driver */
-#endif /* H5_HAVE_PARALLEL */
-    H5D_fill_buf_info_t fb_info;        /* Dataset's fill buffer info */
-    hbool_t     fb_info_init = FALSE;   /* Whether the fill value buffer has been initialized */
-    hid_t       my_dxpl_id;     /* DXPL ID to use for this operation */
-    herr_t	ret_value = SUCCEED;	/* Return value */
+    MPI_Comm mpi_comm = MPI_COMM_NULL; /* MPI communicator for file */
+    int      mpi_rank = (-1);          /* This process's rank  */
+    int      mpi_code;                 /* MPI return code */
+    hbool_t  blocks_written = FALSE;   /* Flag to indicate that chunk was actually written */
+    hbool_t  using_mpi =
+        FALSE; /* Flag to indicate that the file is being accessed with an MPI-capable file driver */
+#endif         /* H5_HAVE_PARALLEL */
+    H5D_fill_buf_info_t fb_info;              /* Dataset's fill buffer info */
+    hbool_t             fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */
+    hid_t               my_dxpl_id;           /* DXPL ID to use for this operation */
+    herr_t              ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -224,13 +205,13 @@ H5D__contig_fill(const H5D_t *dset, hid_t dxpl_id)
 
 #ifdef H5_HAVE_PARALLEL
     /* Retrieve MPI parameters */
-    if(H5F_HAS_FEATURE(dset->oloc.file, H5FD_FEAT_HAS_MPI)) {
+    if (H5F_HAS_FEATURE(dset->oloc.file, H5FD_FEAT_HAS_MPI)) {
         /* Get the MPI communicator */
-        if(MPI_COMM_NULL == (mpi_comm = H5F_mpi_get_comm(dset->oloc.file)))
+        if (MPI_COMM_NULL == (mpi_comm = H5F_mpi_get_comm(dset->oloc.file)))
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI communicator")
 
         /* Get the MPI rank */
-        if((mpi_rank = H5F_mpi_get_rank(dset->oloc.file)) < 0)
+        if ((mpi_rank = H5F_mpi_get_rank(dset->oloc.file)) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank")
 
         /* Set the MPI-capable file driver flag */
@@ -240,15 +221,15 @@ H5D__contig_fill(const H5D_t *dset, hid_t dxpl_id)
         my_dxpl_id = H5AC_ind_dxpl_id;
     } /* end if */
     else {
-#endif  /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
         /* Use the DXPL we were given */
         my_dxpl_id = dxpl_id;
 #ifdef H5_HAVE_PARALLEL
-    } /* end else */
-#endif  /* H5_HAVE_PARALLEL */
+    }  /* end else */
+#endif /* H5_HAVE_PARALLEL */
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(my_dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(my_dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Initialize storage info for this dataset */
@@ -256,15 +237,14 @@ H5D__contig_fill(const H5D_t *dset, hid_t dxpl_id)
     store.contig.dset_size = dset->shared->layout.storage.u.contig.size;
 
     /* Get the number of elements in the dataset's dataspace */
-    if((snpoints = H5S_GET_EXTENT_NPOINTS(dset->shared->space)) < 0)
+    if ((snpoints = H5S_GET_EXTENT_NPOINTS(dset->shared->space)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "dataset has negative number of elements")
     H5_CHECKED_ASSIGN(npoints, size_t, snpoints, hssize_t);
 
     /* Initialize the fill value buffer */
-    if(H5D__fill_init(&fb_info, NULL, NULL, NULL, NULL, NULL,
-            &dset->shared->dcpl_cache.fill,
-            dset->shared->type, dset->shared->type_id, npoints,
-            dxpl_cache->max_temp_buf, my_dxpl_id) < 0)
+    if (H5D__fill_init(&fb_info, NULL, NULL, NULL, NULL, NULL, &dset->shared->dcpl_cache.fill,
+                       dset->shared->type, dset->shared->type_id, npoints, dxpl_cache->max_temp_buf,
+                       my_dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize fill buffer info")
     fb_info_init = TRUE;
 
@@ -281,67 +261,66 @@ H5D__contig_fill(const H5D_t *dset, hid_t dxpl_id)
      */
 
     /* Loop through writing the fill value to the dataset */
-    while(npoints > 0) {
-        size_t curr_points;     /* Number of elements to write on this iteration of the loop */
-        size_t size;            /* Size of buffer to write */
+    while (npoints > 0) {
+        size_t curr_points; /* Number of elements to write on this iteration of the loop */
+        size_t size;        /* Size of buffer to write */
 
         /* Compute # of elements and buffer size to write for this iteration */
         curr_points = MIN(fb_info.elmts_per_buf, npoints);
-        size = curr_points * fb_info.file_elmt_size;
+        size        = curr_points * fb_info.file_elmt_size;
 
         /* Check for VL datatype & non-default fill value */
-        if(fb_info.has_vlen_fill_type)
+        if (fb_info.has_vlen_fill_type)
             /* Re-fill the buffer to use for this I/O operation */
-            if(H5D__fill_refill_vl(&fb_info, curr_points, my_dxpl_id) < 0)
+            if (H5D__fill_refill_vl(&fb_info, curr_points, my_dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "can't refill fill value buffer")
 
 #ifdef H5_HAVE_PARALLEL
-            /* Check if this file is accessed with an MPI-capable file driver */
-            if(using_mpi) {
-                /* Write the chunks out from only one process */
-                /* !! Use the internal "independent" DXPL!! -QAK */
-                if(H5_PAR_META_WRITE == mpi_rank)
-                    if(H5D__contig_write_one(&ioinfo, offset, size) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to write fill value to dataset")
-
-                /* Indicate that blocks are being written */
-                blocks_written = TRUE;
-            } /* end if */
-            else {
-#endif /* H5_HAVE_PARALLEL */
-                H5_CHECK_OVERFLOW(size, size_t, hsize_t);
-                if(H5D__contig_write_one(&ioinfo, offset, size) < 0)
+        /* Check if this file is accessed with an MPI-capable file driver */
+        if (using_mpi) {
+            /* Write the chunks out from only one process */
+            /* !! Use the internal "independent" DXPL!! -QAK */
+            if (H5_PAR_META_WRITE == mpi_rank)
+                if (H5D__contig_write_one(&ioinfo, offset, size) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to write fill value to dataset")
-#ifdef H5_HAVE_PARALLEL
-            } /* end else */
+
+            /* Indicate that blocks are being written */
+            blocks_written = TRUE;
+        } /* end if */
+        else {
 #endif /* H5_HAVE_PARALLEL */
+            H5_CHECK_OVERFLOW(size, size_t, hsize_t);
+            if (H5D__contig_write_one(&ioinfo, offset, size) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to write fill value to dataset")
+#ifdef H5_HAVE_PARALLEL
+        } /* end else */
+#endif    /* H5_HAVE_PARALLEL */
 
-          npoints -= curr_points;
-          offset += size;
-      } /* end while */
+        npoints -= curr_points;
+        offset += size;
+    } /* end while */
 
 #ifdef H5_HAVE_PARALLEL
     /* Only need to block at the barrier if we actually wrote fill values */
     /* And if we are using an MPI-capable file driver */
-    if(using_mpi && blocks_written) {
+    if (using_mpi && blocks_written) {
         /* Wait at barrier to avoid race conditions where some processes are
          * still writing out fill values and other processes race ahead to data
          * in, getting bogus data.
          */
-        if(MPI_SUCCESS != (mpi_code = MPI_Barrier(mpi_comm)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Barrier(mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
 done:
     /* Release the fill buffer info, if it's been initialized */
-    if(fb_info_init && H5D__fill_term(&fb_info) < 0)
+    if (fb_info_init && H5D__fill_term(&fb_info) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release fill buffer info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_fill() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_delete
  *
@@ -357,7 +336,7 @@ done:
 herr_t
 H5D__contig_delete(H5F_t *f, hid_t dxpl_id, const H5O_storage_t *storage)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -366,14 +345,13 @@ H5D__contig_delete(H5F_t *f, hid_t dxpl_id, const H5O_storage_t *storage)
     HDassert(storage);
 
     /* Free the file space for the chunk */
-    if(H5MF_xfree(f, H5FD_MEM_DRAW, dxpl_id, storage->u.contig.addr, storage->u.contig.size) < 0)
+    if (H5MF_xfree(f, H5FD_MEM_DRAW, dxpl_id, storage->u.contig.addr, storage->u.contig.size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to free contiguous storage space")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_delete */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_construct
  *
@@ -391,15 +369,15 @@ static herr_t
 H5D__contig_construct(H5F_t *f, H5D_t *dset)
 {
     hssize_t snelmts;                   /* Temporary holder for number of elements in dataspace */
-    hsize_t nelmts;                     /* Number of elements in dataspace */
-    size_t dt_size;                     /* Size of datatype */
-    hsize_t tmp_size;                   /* Temporary holder for raw data size */
-    size_t tmp_sieve_buf_size;          /* Temporary holder for sieve buffer size */
-    hsize_t dim[H5O_LAYOUT_NDIMS];	/* Current size of data in elements */
-    hsize_t max_dim[H5O_LAYOUT_NDIMS];  /* Maximum size of data in elements */
-    int ndims;                          /* Rank of dataspace */
-    int i;                              /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hsize_t  nelmts;                    /* Number of elements in dataspace */
+    size_t   dt_size;                   /* Size of datatype */
+    hsize_t  tmp_size;                  /* Temporary holder for raw data size */
+    size_t   tmp_sieve_buf_size;        /* Temporary holder for sieve buffer size */
+    hsize_t  dim[H5O_LAYOUT_NDIMS];     /* Current size of data in elements */
+    hsize_t  max_dim[H5O_LAYOUT_NDIMS]; /* Maximum size of data in elements */
+    int      ndims;                     /* Rank of dataspace */
+    int      i;                         /* Local index variable */
+    herr_t   ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -414,26 +392,26 @@ H5D__contig_construct(H5F_t *f, H5D_t *dset)
      */
 
     /* Check for invalid dataset dimensions */
-    if((ndims = H5S_get_simple_extent_dims(dset->shared->space, dim, max_dim)) < 0)
+    if ((ndims = H5S_get_simple_extent_dims(dset->shared->space, dim, max_dim)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize contiguous storage")
-    for(i = 0; i < ndims; i++)
-        if(max_dim[i] > dim[i])
+    for (i = 0; i < ndims; i++)
+        if (max_dim[i] > dim[i])
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "extendible contiguous non-external dataset")
 
     /* Retrieve the number of elements in the dataspace */
-    if((snelmts = H5S_GET_EXTENT_NPOINTS(dset->shared->space)) < 0)
+    if ((snelmts = H5S_GET_EXTENT_NPOINTS(dset->shared->space)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve number of elements in dataspace")
     nelmts = (hsize_t)snelmts;
 
     /* Get the datatype's size */
-    if(0 == (dt_size = H5T_GET_SIZE(dset->shared->type)))
+    if (0 == (dt_size = H5T_GET_SIZE(dset->shared->type)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve size of datatype")
 
     /* Compute the size of the dataset's contiguous storage */
     tmp_size = nelmts * dt_size;
 
     /* Check for overflow during multiplication */
-    if(nelmts != (tmp_size / dt_size))
+    if (nelmts != (tmp_size / dt_size))
         HGOTO_ERROR(H5E_DATASET, H5E_OVERFLOW, FAIL, "size of dataset's storage overflowed")
 
     /* Assign the dataset's contiguous storage size */
@@ -444,7 +422,7 @@ H5D__contig_construct(H5F_t *f, H5D_t *dset)
 
     /* Adjust the sieve buffer size to the smaller one between the dataset size and the buffer size
      * from the file access property. (SLU - 2012/3/30) */
-    if(tmp_size < tmp_sieve_buf_size)
+    if (tmp_size < tmp_sieve_buf_size)
         dset->shared->cache.contig.sieve_buf_size = tmp_size;
     else
         dset->shared->cache.contig.sieve_buf_size = tmp_sieve_buf_size;
@@ -453,7 +431,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_construct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_is_space_alloc
  *
@@ -469,7 +446,7 @@ done:
 hbool_t
 H5D__contig_is_space_alloc(const H5O_storage_t *storage)
 {
-    hbool_t ret_value;                  /* Return value */
+    hbool_t ret_value; /* Return value */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -482,7 +459,6 @@ H5D__contig_is_space_alloc(const H5O_storage_t *storage)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_is_space_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__contig_is_data_cached
  *
@@ -506,7 +482,6 @@ H5D__contig_is_data_cached(const H5D_shared_t *shared_dset)
     FUNC_LEAVE_NOAPI(shared_dset->cache.contig.sieve_size > 0)
 } /* end H5D__contig_is_data_cached() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_io_init
  *
@@ -521,8 +496,8 @@ H5D__contig_is_data_cached(const H5D_shared_t *shared_dset)
  */
 static herr_t
 H5D__contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNUSED *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
-    H5D_chunk_map_t H5_ATTR_UNUSED *cm)
+                    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space,
+                    const H5S_t H5_ATTR_UNUSED *mem_space, H5D_chunk_map_t H5_ATTR_UNUSED *cm)
 {
     FUNC_ENTER_STATIC_NOERR
 
@@ -532,7 +507,6 @@ H5D__contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__contig_io_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_read
  *
@@ -546,11 +520,10 @@ H5D__contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t H5_ATTR_UNUSED *fm)
+H5D__contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                 const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t H5_ATTR_UNUSED *fm)
 {
-    herr_t	ret_value = SUCCEED;	/*return value		*/
+    herr_t ret_value = SUCCEED; /*return value		*/
 
     FUNC_ENTER_PACKAGE
 
@@ -562,14 +535,13 @@ H5D__contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
     HDassert(file_space);
 
     /* Read data */
-    if((io_info->io_ops.single_read)(io_info, type_info, nelmts, file_space, mem_space) < 0)
+    if ((io_info->io_ops.single_read)(io_info, type_info, nelmts, file_space, mem_space) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "contiguous read failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_write
  *
@@ -583,11 +555,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t H5_ATTR_UNUSED *fm)
+H5D__contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                  const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t H5_ATTR_UNUSED *fm)
 {
-    herr_t	ret_value = SUCCEED;	/*return value		*/
+    herr_t ret_value = SUCCEED; /*return value		*/
 
     FUNC_ENTER_PACKAGE
 
@@ -599,14 +570,13 @@ H5D__contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
     HDassert(file_space);
 
     /* Write data */
-    if((io_info->io_ops.single_write)(io_info, type_info, nelmts, file_space, mem_space) < 0)
+    if ((io_info->io_ops.single_write)(io_info, type_info, nelmts, file_space, mem_space) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "contiguous write failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_write_one
  *
@@ -624,27 +594,26 @@ done:
 static herr_t
 H5D__contig_write_one(H5D_io_info_t *io_info, hsize_t offset, size_t size)
 {
-    hsize_t dset_off = offset;  /* Offset in dataset */
-    size_t dset_len = size;     /* Length in dataset */
-    size_t dset_curr_seq = 0;   /* "Current sequence" in dataset */
-    hsize_t mem_off = 0;        /* Offset in memory */
-    size_t mem_len = size;      /* Length in memory */
-    size_t mem_curr_seq = 0;    /* "Current sequence" in memory */
-    herr_t ret_value = SUCCEED; /* Return value */
+    hsize_t dset_off      = offset;  /* Offset in dataset */
+    size_t  dset_len      = size;    /* Length in dataset */
+    size_t  dset_curr_seq = 0;       /* "Current sequence" in dataset */
+    hsize_t mem_off       = 0;       /* Offset in memory */
+    size_t  mem_len       = size;    /* Length in memory */
+    size_t  mem_curr_seq  = 0;       /* "Current sequence" in memory */
+    herr_t  ret_value     = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(io_info);
 
-    if(H5D__contig_writevv(io_info, (size_t)1, &dset_curr_seq, &dset_len, &dset_off,
-            (size_t)1, &mem_curr_seq, &mem_len, &mem_off) < 0)
+    if (H5D__contig_writevv(io_info, (size_t)1, &dset_curr_seq, &dset_len, &dset_off, (size_t)1,
+                            &mem_curr_seq, &mem_len, &mem_off) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__contig_write_one() */
+} /* end H5D__contig_write_one() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_readvv_sieve_cb
  *
@@ -658,30 +627,31 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
-    void *_udata)
+H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
 {
-    H5D_contig_readvv_sieve_ud_t *udata = (H5D_contig_readvv_sieve_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    H5F_t *file = udata->file;        /* File for dataset */
+    H5D_contig_readvv_sieve_ud_t *udata =
+        (H5D_contig_readvv_sieve_ud_t *)_udata;    /* User data for H5VM_opvv() operator */
+    H5F_t *      file        = udata->file;        /* File for dataset */
     H5D_rdcdc_t *dset_contig = udata->dset_contig; /* Cached information about contiguous data */
-    const H5D_contig_storage_t *store_contig = udata->store_contig;    /* Contiguous storage info for this I/O operation */
-    unsigned char *buf;         /* Pointer to buffer to fill */
-    haddr_t addr;               /* Actual address to read */
-    haddr_t sieve_start = HADDR_UNDEF, sieve_end = HADDR_UNDEF;     /* Start & end locations of sieve buffer */
-    haddr_t contig_end;         /* End locations of block to write */
-    size_t sieve_size = (size_t)-1;   /* Size of sieve buffer */
-    haddr_t rel_eoa;	        /* Relative end of file address	*/
-    hsize_t max_data;           /* Actual maximum size of data to cache */
-    hsize_t min;                /* temporary minimum value (avoids some ugly macro nesting) */
-    herr_t ret_value = SUCCEED; /* Return value */
+    const H5D_contig_storage_t *store_contig =
+        udata->store_contig; /* Contiguous storage info for this I/O operation */
+    unsigned char *buf;      /* Pointer to buffer to fill */
+    haddr_t        addr;     /* Actual address to read */
+    haddr_t sieve_start = HADDR_UNDEF, sieve_end = HADDR_UNDEF; /* Start & end locations of sieve buffer */
+    haddr_t contig_end;                                         /* End locations of block to write */
+    size_t  sieve_size = (size_t)-1;                            /* Size of sieve buffer */
+    haddr_t rel_eoa;                                            /* Relative end of file address	*/
+    hsize_t max_data;                                           /* Actual maximum size of data to cache */
+    hsize_t min;                 /* temporary minimum value (avoids some ugly macro nesting) */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Stash local copies of these value */
-    if(dset_contig->sieve_buf != NULL) {
+    if (dset_contig->sieve_buf != NULL) {
         sieve_start = dset_contig->sieve_loc;
-        sieve_size = dset_contig->sieve_size;
-        sieve_end = sieve_start + sieve_size;
+        sieve_size  = dset_contig->sieve_size;
+        sieve_end   = sieve_start + sieve_size;
     } /* end if */
 
     /* Compute offset on disk */
@@ -691,22 +661,22 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
     buf = udata->rbuf + src_off;
 
     /* Check if the sieve buffer is allocated yet */
-    if(NULL == dset_contig->sieve_buf) {
+    if (NULL == dset_contig->sieve_buf) {
         /* Check if we can actually hold the I/O request in the sieve buffer */
-        if(len > dset_contig->sieve_buf_size) {
-            if(H5F_block_read(file, H5FD_MEM_DRAW, addr, len, udata->dxpl_id, buf) < 0)
+        if (len > dset_contig->sieve_buf_size) {
+            if (H5F_block_read(file, H5FD_MEM_DRAW, addr, len, udata->dxpl_id, buf) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "block read failed")
         } /* end if */
         else {
             /* Allocate room for the data sieve buffer */
-            if(NULL == (dset_contig->sieve_buf = H5FL_BLK_CALLOC(sieve_buf, dset_contig->sieve_buf_size)))
+            if (NULL == (dset_contig->sieve_buf = H5FL_BLK_CALLOC(sieve_buf, dset_contig->sieve_buf_size)))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
             /* Determine the new sieve buffer size & location */
             dset_contig->sieve_loc = addr;
 
             /* Make certain we don't read off the end of the file */
-            if(HADDR_UNDEF == (rel_eoa = H5F_get_eoa(file, H5FD_MEM_DRAW)))
+            if (HADDR_UNDEF == (rel_eoa = H5F_get_eoa(file, H5FD_MEM_DRAW)))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to determine file size")
 
             /* Set up the buffer parameters */
@@ -717,7 +687,8 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
             H5_CHECKED_ASSIGN(dset_contig->sieve_size, size_t, min, hsize_t);
 
             /* Read the new sieve buffer */
-            if(H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size, udata->dxpl_id, dset_contig->sieve_buf) < 0)
+            if (H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size,
+                               udata->dxpl_id, dset_contig->sieve_buf) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "block read failed")
 
             /* Grab the data out of the buffer (must be first piece of data in buffer ) */
@@ -728,16 +699,16 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
 
             /* Stash local copies of these value */
             sieve_start = dset_contig->sieve_loc;
-            sieve_size = dset_contig->sieve_size;
-            sieve_end = sieve_start+sieve_size;
+            sieve_size  = dset_contig->sieve_size;
+            sieve_end   = sieve_start + sieve_size;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Compute end of sequence to retrieve */
         contig_end = addr + len - 1;
 
         /* If entire read is within the sieve buffer, read it from the buffer */
-        if(addr >= sieve_start && contig_end < sieve_end) {
+        if (addr >= sieve_start && contig_end < sieve_end) {
             unsigned char *base_sieve_buf = dset_contig->sieve_buf + (addr - sieve_start);
 
             /* Grab the data out of the buffer */
@@ -746,31 +717,33 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
         /* Entire request is not within this data sieve buffer */
         else {
             /* Check if we can actually hold the I/O request in the sieve buffer */
-            if(len > dset_contig->sieve_buf_size) {
+            if (len > dset_contig->sieve_buf_size) {
                 /* Check for any overlap with the current sieve buffer */
-                if((sieve_start >= addr && sieve_start < (contig_end + 1))
-                        || ((sieve_end - 1) >= addr && (sieve_end - 1) < (contig_end + 1))) {
+                if ((sieve_start >= addr && sieve_start < (contig_end + 1)) ||
+                    ((sieve_end - 1) >= addr && (sieve_end - 1) < (contig_end + 1))) {
                     /* Flush the sieve buffer, if it's dirty */
-                    if(dset_contig->sieve_dirty) {
+                    if (dset_contig->sieve_dirty) {
                         /* Write to file */
-                        if(H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, udata->dxpl_id, dset_contig->sieve_buf) < 0)
+                        if (H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, udata->dxpl_id,
+                                            dset_contig->sieve_buf) < 0)
                             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "block write failed")
 
                         /* Reset sieve buffer dirty flag */
                         dset_contig->sieve_dirty = FALSE;
                     } /* end if */
-                } /* end if */
+                }     /* end if */
 
                 /* Read directly into the user's buffer */
-                if(H5F_block_read(file, H5FD_MEM_DRAW, addr, len, udata->dxpl_id, buf) < 0)
+                if (H5F_block_read(file, H5FD_MEM_DRAW, addr, len, udata->dxpl_id, buf) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "block read failed")
             } /* end if */
             /* Element size fits within the buffer size */
             else {
                 /* Flush the sieve buffer if it's dirty */
-                if(dset_contig->sieve_dirty) {
+                if (dset_contig->sieve_dirty) {
                     /* Write to file */
-                    if(H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, udata->dxpl_id, dset_contig->sieve_buf) < 0)
+                    if (H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, udata->dxpl_id,
+                                        dset_contig->sieve_buf) < 0)
                         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "block write failed")
 
                     /* Reset sieve buffer dirty flag */
@@ -781,7 +754,7 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
                 dset_contig->sieve_loc = addr;
 
                 /* Make certain we don't read off the end of the file */
-                if(HADDR_UNDEF == (rel_eoa = H5F_get_eoa(file, H5FD_MEM_DRAW)))
+                if (HADDR_UNDEF == (rel_eoa = H5F_get_eoa(file, H5FD_MEM_DRAW)))
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to determine file size")
 
                 /* Only need this when resizing sieve buffer */
@@ -792,16 +765,17 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
                  * the end of the data element, and don't read more than
                  * the buffer size.
                  */
-                min = MIN3(rel_eoa - dset_contig->sieve_loc, max_data, dset_contig->sieve_buf_size); 
+                min = MIN3(rel_eoa - dset_contig->sieve_loc, max_data, dset_contig->sieve_buf_size);
                 H5_CHECKED_ASSIGN(dset_contig->sieve_size, size_t, min, hsize_t);
 
                 /* Update local copies of sieve information */
                 sieve_start = dset_contig->sieve_loc;
-                sieve_size = dset_contig->sieve_size;
-                sieve_end = sieve_start + sieve_size;
+                sieve_size  = dset_contig->sieve_size;
+                sieve_end   = sieve_start + sieve_size;
 
                 /* Read the new sieve buffer */
-                if(H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size, udata->dxpl_id, dset_contig->sieve_buf) < 0)
+                if (H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size,
+                                   udata->dxpl_id, dset_contig->sieve_buf) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "block read failed")
 
                 /* Grab the data out of the buffer (must be first piece of data in buffer ) */
@@ -810,14 +784,13 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
                 /* Reset sieve buffer dirty flag */
                 dset_contig->sieve_dirty = FALSE;
             } /* end else */
-        } /* end else */
-    } /* end else */
+        }     /* end else */
+    }         /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__contig_readvv_sieve_cb() */
+} /* end H5D__contig_readvv_sieve_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_readvv_cb
  *
@@ -834,20 +807,19 @@ static herr_t
 H5D__contig_readvv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
 {
     H5D_contig_readvv_ud_t *udata = (H5D_contig_readvv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t                  ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Write data */
-    if(H5F_block_read(udata->file, H5FD_MEM_DRAW, (udata->dset_addr + dst_off),
-            len, udata->dxpl_id, (udata->rbuf + src_off)) < 0)
+    if (H5F_block_read(udata->file, H5FD_MEM_DRAW, (udata->dset_addr + dst_off), len, udata->dxpl_id,
+                       (udata->rbuf + src_off)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "block write failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__contig_readvv_cb() */
+} /* end H5D__contig_readvv_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_readvv
  *
@@ -867,11 +839,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__contig_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_off_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[])
+H5D__contig_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                   size_t dset_len_arr[], hsize_t dset_off_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+                   size_t mem_len_arr[], hsize_t mem_off_arr[])
 {
-    ssize_t ret_value;          /* Return value */
+    ssize_t ret_value; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -885,43 +857,42 @@ H5D__contig_readvv(const H5D_io_info_t *io_info,
     HDassert(mem_off_arr);
 
     /* Check if data sieving is enabled */
-    if(H5F_HAS_FEATURE(io_info->dset->oloc.file, H5FD_FEAT_DATA_SIEVE)) {
-        H5D_contig_readvv_sieve_ud_t udata;     /* User data for H5VM_opvv() operator */
+    if (H5F_HAS_FEATURE(io_info->dset->oloc.file, H5FD_FEAT_DATA_SIEVE)) {
+        H5D_contig_readvv_sieve_ud_t udata; /* User data for H5VM_opvv() operator */
 
         /* Set up user data for H5VM_opvv() */
-        udata.file = io_info->dset->oloc.file;
-        udata.dset_contig = &(io_info->dset->shared->cache.contig);
+        udata.file         = io_info->dset->oloc.file;
+        udata.dset_contig  = &(io_info->dset->shared->cache.contig);
         udata.store_contig = &(io_info->store->contig);
-        udata.rbuf = (unsigned char *)io_info->u.rbuf;
-        udata.dxpl_id = io_info->dxpl_id;
+        udata.rbuf         = (unsigned char *)io_info->u.rbuf;
+        udata.dxpl_id      = io_info->dxpl_id;
 
         /* Call generic sequence operation routine */
-        if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr,
-                mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-                H5D__contig_readvv_sieve_cb, &udata)) < 0)
+        if ((ret_value =
+                 H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq,
+                           mem_curr_seq, mem_len_arr, mem_off_arr, H5D__contig_readvv_sieve_cb, &udata)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized sieve buffer read")
     } /* end if */
     else {
-        H5D_contig_readvv_ud_t udata;     /* User data for H5VM_opvv() operator */
+        H5D_contig_readvv_ud_t udata; /* User data for H5VM_opvv() operator */
 
         /* Set up user data for H5VM_opvv() */
-        udata.file = io_info->dset->oloc.file;
+        udata.file      = io_info->dset->oloc.file;
         udata.dset_addr = io_info->store->contig.dset_addr;
-        udata.rbuf = (unsigned char *)io_info->u.rbuf;
-        udata.dxpl_id = io_info->dxpl_id;
+        udata.rbuf      = (unsigned char *)io_info->u.rbuf;
+        udata.dxpl_id   = io_info->dxpl_id;
 
         /* Call generic sequence operation routine */
-        if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr,
-                mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-                H5D__contig_readvv_cb, &udata)) < 0)
+        if ((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq,
+                                   mem_curr_seq, mem_len_arr, mem_off_arr, H5D__contig_readvv_cb, &udata)) <
+            0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized read")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__contig_readvv() */
+} /* end H5D__contig_readvv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_writevv_sieve_cb
  *
@@ -935,30 +906,31 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
-    void *_udata)
+H5D__contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
 {
-    H5D_contig_writevv_sieve_ud_t *udata = (H5D_contig_writevv_sieve_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    H5F_t *file = udata->file;        /* File for dataset */
+    H5D_contig_writevv_sieve_ud_t *udata =
+        (H5D_contig_writevv_sieve_ud_t *)_udata;   /* User data for H5VM_opvv() operator */
+    H5F_t *      file        = udata->file;        /* File for dataset */
     H5D_rdcdc_t *dset_contig = udata->dset_contig; /* Cached information about contiguous data */
-    const H5D_contig_storage_t *store_contig = udata->store_contig;    /* Contiguous storage info for this I/O operation */
-    const unsigned char *buf;   /* Pointer to buffer to fill */
-    haddr_t addr;               /* Actual address to read */
-    haddr_t sieve_start = HADDR_UNDEF, sieve_end = HADDR_UNDEF;     /* Start & end locations of sieve buffer */
-    haddr_t contig_end;         /* End locations of block to write */
-    size_t sieve_size = (size_t)-1; /* size of sieve buffer */
-    haddr_t rel_eoa;	        /* Relative end of file address	*/
-    hsize_t max_data;           /* Actual maximum size of data to cache */
-    hsize_t min;                /* temporary minimum value (avoids some ugly macro nesting) */
-    herr_t ret_value = SUCCEED; /* Return value */
+    const H5D_contig_storage_t *store_contig =
+        udata->store_contig;   /* Contiguous storage info for this I/O operation */
+    const unsigned char *buf;  /* Pointer to buffer to fill */
+    haddr_t              addr; /* Actual address to read */
+    haddr_t sieve_start = HADDR_UNDEF, sieve_end = HADDR_UNDEF; /* Start & end locations of sieve buffer */
+    haddr_t contig_end;                                         /* End locations of block to write */
+    size_t  sieve_size = (size_t)-1;                            /* size of sieve buffer */
+    haddr_t rel_eoa;                                            /* Relative end of file address	*/
+    hsize_t max_data;                                           /* Actual maximum size of data to cache */
+    hsize_t min;                 /* temporary minimum value (avoids some ugly macro nesting) */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Stash local copies of these values */
-    if(dset_contig->sieve_buf != NULL) {
+    if (dset_contig->sieve_buf != NULL) {
         sieve_start = dset_contig->sieve_loc;
-        sieve_size = dset_contig->sieve_size;
-        sieve_end = sieve_start + sieve_size;
+        sieve_size  = dset_contig->sieve_size;
+        sieve_end   = sieve_start + sieve_size;
     } /* end if */
 
     /* Compute offset on disk */
@@ -968,40 +940,41 @@ H5D__contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
     buf = udata->wbuf + src_off;
 
     /* No data sieve buffer yet, go allocate one */
-    if(NULL == dset_contig->sieve_buf) {
+    if (NULL == dset_contig->sieve_buf) {
         /* Check if we can actually hold the I/O request in the sieve buffer */
-        if(len > dset_contig->sieve_buf_size) {
-            if(H5F_block_write(file, H5FD_MEM_DRAW, addr, len, udata->dxpl_id, buf) < 0)
+        if (len > dset_contig->sieve_buf_size) {
+            if (H5F_block_write(file, H5FD_MEM_DRAW, addr, len, udata->dxpl_id, buf) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "block write failed")
         } /* end if */
         else {
             /* Allocate room for the data sieve buffer */
-            if(NULL == (dset_contig->sieve_buf = H5FL_BLK_CALLOC(sieve_buf, dset_contig->sieve_buf_size)))
+            if (NULL == (dset_contig->sieve_buf = H5FL_BLK_CALLOC(sieve_buf, dset_contig->sieve_buf_size)))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
 #ifdef H5_CLEAR_MEMORY
-if(dset_contig->sieve_size > len)
-    HDmemset(dset_contig->sieve_buf + len, 0, (dset_contig->sieve_size - len));
+            if (dset_contig->sieve_size > len)
+                HDmemset(dset_contig->sieve_buf + len, 0, (dset_contig->sieve_size - len));
 #endif /* H5_CLEAR_MEMORY */
 
             /* Determine the new sieve buffer size & location */
             dset_contig->sieve_loc = addr;
 
             /* Make certain we don't read off the end of the file */
-            if(HADDR_UNDEF == (rel_eoa = H5F_get_eoa(file, H5FD_MEM_DRAW)))
+            if (HADDR_UNDEF == (rel_eoa = H5F_get_eoa(file, H5FD_MEM_DRAW)))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to determine file size")
 
             /* Set up the buffer parameters */
             max_data = store_contig->dset_size - dst_off;
 
             /* Compute the size of the sieve buffer */
-            min = MIN3(rel_eoa - dset_contig->sieve_loc, max_data, dset_contig->sieve_buf_size); 
+            min = MIN3(rel_eoa - dset_contig->sieve_loc, max_data, dset_contig->sieve_buf_size);
             H5_CHECKED_ASSIGN(dset_contig->sieve_size, size_t, min, hsize_t);
 
             /* Check if there is any point in reading the data from the file */
-            if(dset_contig->sieve_size > len) {
+            if (dset_contig->sieve_size > len) {
                 /* Read the new sieve buffer */
-                if(H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size, udata->dxpl_id, dset_contig->sieve_buf) < 0)
+                if (H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size,
+                                   udata->dxpl_id, dset_contig->sieve_buf) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "block read failed")
             } /* end if */
 
@@ -1013,16 +986,16 @@ if(dset_contig->sieve_size > len)
 
             /* Stash local copies of these values */
             sieve_start = dset_contig->sieve_loc;
-            sieve_size = dset_contig->sieve_size;
-            sieve_end = sieve_start + sieve_size;
+            sieve_size  = dset_contig->sieve_size;
+            sieve_end   = sieve_start + sieve_size;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Compute end of sequence to retrieve */
         contig_end = addr + len - 1;
 
         /* If entire write is within the sieve buffer, write it to the buffer */
-        if(addr >= sieve_start && contig_end < sieve_end) {
+        if (addr >= sieve_start && contig_end < sieve_end) {
             unsigned char *base_sieve_buf = dset_contig->sieve_buf + (addr - sieve_start);
 
             /* Put the data into the sieve buffer */
@@ -1034,14 +1007,15 @@ if(dset_contig->sieve_size > len)
         /* Entire request is not within this data sieve buffer */
         else {
             /* Check if we can actually hold the I/O request in the sieve buffer */
-            if(len > dset_contig->sieve_buf_size) {
+            if (len > dset_contig->sieve_buf_size) {
                 /* Check for any overlap with the current sieve buffer */
-                if((sieve_start >= addr && sieve_start < (contig_end + 1))
-                        || ((sieve_end - 1) >= addr && (sieve_end - 1) < (contig_end + 1))) {
+                if ((sieve_start >= addr && sieve_start < (contig_end + 1)) ||
+                    ((sieve_end - 1) >= addr && (sieve_end - 1) < (contig_end + 1))) {
                     /* Flush the sieve buffer, if it's dirty */
-                    if(dset_contig->sieve_dirty) {
+                    if (dset_contig->sieve_dirty) {
                         /* Write to file */
-                        if(H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, udata->dxpl_id, dset_contig->sieve_buf) < 0)
+                        if (H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, udata->dxpl_id,
+                                            dset_contig->sieve_buf) < 0)
                             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "block write failed")
 
                         /* Reset sieve buffer dirty flag */
@@ -1049,24 +1023,24 @@ if(dset_contig->sieve_size > len)
                     } /* end if */
 
                     /* Force the sieve buffer to be re-read the next time */
-                    dset_contig->sieve_loc = HADDR_UNDEF;
+                    dset_contig->sieve_loc  = HADDR_UNDEF;
                     dset_contig->sieve_size = 0;
                 } /* end if */
 
                 /* Write directly from the user's buffer */
-                if(H5F_block_write(file, H5FD_MEM_DRAW, addr, len, udata->dxpl_id, buf) < 0)
+                if (H5F_block_write(file, H5FD_MEM_DRAW, addr, len, udata->dxpl_id, buf) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "block write failed")
             } /* end if */
             /* Element size fits within the buffer size */
             else {
                 /* Check if it is possible to (exactly) prepend or append to existing (dirty) sieve buffer */
-                if(((addr + len) == sieve_start || addr == sieve_end) &&
-                        (len + sieve_size) <= dset_contig->sieve_buf_size &&
-                        dset_contig->sieve_dirty) {
+                if (((addr + len) == sieve_start || addr == sieve_end) &&
+                    (len + sieve_size) <= dset_contig->sieve_buf_size && dset_contig->sieve_dirty) {
                     /* Prepend to existing sieve buffer */
-                    if((addr + len) == sieve_start) {
+                    if ((addr + len) == sieve_start) {
                         /* Move existing sieve information to correct location */
-                        HDmemmove(dset_contig->sieve_buf + len, dset_contig->sieve_buf, dset_contig->sieve_size);
+                        HDmemmove(dset_contig->sieve_buf + len, dset_contig->sieve_buf,
+                                  dset_contig->sieve_size);
 
                         /* Copy in new information (must be first in sieve buffer) */
                         HDmemcpy(dset_contig->sieve_buf, buf, len);
@@ -1086,15 +1060,16 @@ if(dset_contig->sieve_size > len)
 
                     /* Update local copies of sieve information */
                     sieve_start = dset_contig->sieve_loc;
-                    sieve_size = dset_contig->sieve_size;
-                    sieve_end = sieve_start + sieve_size;
+                    sieve_size  = dset_contig->sieve_size;
+                    sieve_end   = sieve_start + sieve_size;
                 } /* end if */
                 /* Can't add the new data onto the existing sieve buffer */
                 else {
                     /* Flush the sieve buffer if it's dirty */
-                    if(dset_contig->sieve_dirty) {
+                    if (dset_contig->sieve_dirty) {
                         /* Write to file */
-                        if(H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, udata->dxpl_id, dset_contig->sieve_buf) < 0)
+                        if (H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, udata->dxpl_id,
+                                            dset_contig->sieve_buf) < 0)
                             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "block write failed")
 
                         /* Reset sieve buffer dirty flag */
@@ -1105,7 +1080,7 @@ if(dset_contig->sieve_size > len)
                     dset_contig->sieve_loc = addr;
 
                     /* Make certain we don't read off the end of the file */
-                    if(HADDR_UNDEF == (rel_eoa = H5F_get_eoa(file, H5FD_MEM_DRAW)))
+                    if (HADDR_UNDEF == (rel_eoa = H5F_get_eoa(file, H5FD_MEM_DRAW)))
                         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to determine file size")
 
                     /* Only need this when resizing sieve buffer */
@@ -1116,18 +1091,20 @@ if(dset_contig->sieve_size > len)
                      * the end of the data element, and don't read more than
                      * the buffer size.
                      */
-                    min = MIN3(rel_eoa - dset_contig->sieve_loc, max_data, dset_contig->sieve_buf_size); 
+                    min = MIN3(rel_eoa - dset_contig->sieve_loc, max_data, dset_contig->sieve_buf_size);
                     H5_CHECKED_ASSIGN(dset_contig->sieve_size, size_t, min, hsize_t);
 
                     /* Update local copies of sieve information */
                     sieve_start = dset_contig->sieve_loc;
-                    sieve_size = dset_contig->sieve_size;
-                    sieve_end = sieve_start + sieve_size;
+                    sieve_size  = dset_contig->sieve_size;
+                    sieve_end   = sieve_start + sieve_size;
 
                     /* Check if there is any point in reading the data from the file */
-                    if(dset_contig->sieve_size > len) {
+                    if (dset_contig->sieve_size > len) {
                         /* Read the new sieve buffer */
-                        if(H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size, udata->dxpl_id, dset_contig->sieve_buf) < 0)
+                        if (H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc,
+                                           dset_contig->sieve_size, udata->dxpl_id,
+                                           dset_contig->sieve_buf) < 0)
                             HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "block read failed")
                     } /* end if */
 
@@ -1137,15 +1114,14 @@ if(dset_contig->sieve_size > len)
                     /* Set sieve buffer dirty flag */
                     dset_contig->sieve_dirty = TRUE;
                 } /* end else */
-            } /* end else */
-        } /* end else */
-    } /* end else */
+            }     /* end else */
+        }         /* end else */
+    }             /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__contig_writevv_sieve_cb() */
+} /* end H5D__contig_writevv_sieve_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_writevv_cb
  *
@@ -1161,20 +1137,21 @@ done:
 static herr_t
 H5D__contig_writevv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
 {
-    H5D_contig_writevv_ud_t *udata = (H5D_contig_writevv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5D_contig_writevv_ud_t *udata =
+        (H5D_contig_writevv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
+    herr_t ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Write data */
-    if(H5F_block_write(udata->file, H5FD_MEM_DRAW, (udata->dset_addr + dst_off), len, udata->dxpl_id, (udata->wbuf + src_off)) < 0)
+    if (H5F_block_write(udata->file, H5FD_MEM_DRAW, (udata->dset_addr + dst_off), len, udata->dxpl_id,
+                        (udata->wbuf + src_off)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "block write failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__contig_writevv_cb() */
+} /* end H5D__contig_writevv_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_writevv
  *
@@ -1194,11 +1171,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__contig_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_off_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[])
+H5D__contig_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                    size_t dset_len_arr[], hsize_t dset_off_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+                    size_t mem_len_arr[], hsize_t mem_off_arr[])
 {
-    ssize_t ret_value;          /* Return value (Size of sequence in bytes) */
+    ssize_t ret_value; /* Return value (Size of sequence in bytes) */
 
     FUNC_ENTER_STATIC
 
@@ -1212,43 +1189,42 @@ H5D__contig_writevv(const H5D_io_info_t *io_info,
     HDassert(mem_off_arr);
 
     /* Check if data sieving is enabled */
-    if(H5F_HAS_FEATURE(io_info->dset->oloc.file, H5FD_FEAT_DATA_SIEVE)) {
-        H5D_contig_writevv_sieve_ud_t udata;    /* User data for H5VM_opvv() operator */
+    if (H5F_HAS_FEATURE(io_info->dset->oloc.file, H5FD_FEAT_DATA_SIEVE)) {
+        H5D_contig_writevv_sieve_ud_t udata; /* User data for H5VM_opvv() operator */
 
         /* Set up user data for H5VM_opvv() */
-        udata.file = io_info->dset->oloc.file;
-        udata.dset_contig = &(io_info->dset->shared->cache.contig);
+        udata.file         = io_info->dset->oloc.file;
+        udata.dset_contig  = &(io_info->dset->shared->cache.contig);
         udata.store_contig = &(io_info->store->contig);
-        udata.wbuf = (const unsigned char *)io_info->u.wbuf;
-        udata.dxpl_id = io_info->dxpl_id;
+        udata.wbuf         = (const unsigned char *)io_info->u.wbuf;
+        udata.dxpl_id      = io_info->dxpl_id;
 
         /* Call generic sequence operation routine */
-        if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr,
-                mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-                H5D__contig_writevv_sieve_cb, &udata)) < 0)
+        if ((ret_value =
+                 H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq,
+                           mem_curr_seq, mem_len_arr, mem_off_arr, H5D__contig_writevv_sieve_cb, &udata)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized sieve buffer write")
     } /* end if */
     else {
-        H5D_contig_writevv_ud_t udata;     /* User data for H5VM_opvv() operator */
+        H5D_contig_writevv_ud_t udata; /* User data for H5VM_opvv() operator */
 
         /* Set up user data for H5VM_opvv() */
-        udata.file = io_info->dset->oloc.file;
+        udata.file      = io_info->dset->oloc.file;
         udata.dset_addr = io_info->store->contig.dset_addr;
-        udata.wbuf = (const unsigned char *)io_info->u.wbuf;
-        udata.dxpl_id = io_info->dxpl_id;
+        udata.wbuf      = (const unsigned char *)io_info->u.wbuf;
+        udata.dxpl_id   = io_info->dxpl_id;
 
         /* Call generic sequence operation routine */
-        if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr,
-                mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-                H5D__contig_writevv_cb, &udata)) < 0)
+        if ((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq,
+                                   mem_curr_seq, mem_len_arr, mem_off_arr, H5D__contig_writevv_cb, &udata)) <
+            0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized read")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__contig_writevv() */
+} /* end H5D__contig_writevv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_flush
  *
@@ -1264,7 +1240,7 @@ done:
 static herr_t
 H5D__contig_flush(H5D_t *dset, hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1272,14 +1248,13 @@ H5D__contig_flush(H5D_t *dset, hid_t dxpl_id)
     HDassert(dset);
 
     /* Flush any data in sieve buffer */
-    if(H5D__flush_sieve_buf(dset, dxpl_id) < 0)
+    if (H5D__flush_sieve_buf(dset, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to flush sieve buffer")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__contig_copy
  *
@@ -1293,41 +1268,40 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
-    H5F_t *f_dst, H5O_storage_contig_t *storage_dst, H5T_t *dt_src,
-    H5O_copy_t *cpy_info, hid_t dxpl_id)
+H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f_dst,
+                 H5O_storage_contig_t *storage_dst, H5T_t *dt_src, H5O_copy_t *cpy_info, hid_t dxpl_id)
 {
-    haddr_t     addr_src;               /* File offset in source dataset */
-    haddr_t     addr_dst;               /* File offset in destination dataset */
-    H5T_path_t  *tpath_src_mem = NULL, *tpath_mem_dst = NULL;   /* Datatype conversion paths */
-    H5T_t       *dt_dst = NULL;         /* Destination datatype */
-    H5T_t       *dt_mem = NULL;         /* Memory datatype */
-    hid_t       tid_src = -1;           /* Datatype ID for source datatype */
-    hid_t       tid_dst = -1;           /* Datatype ID for destination datatype */
-    hid_t       tid_mem = -1;           /* Datatype ID for memory datatype */
-    size_t      src_dt_size = 0;        /* Source datatype size */
-    size_t      mem_dt_size = 0;        /* Memory datatype size */
-    size_t      dst_dt_size = 0;        /* Destination datatype size */
-    size_t      max_dt_size;            /* Max. datatype size */
-    size_t      nelmts = 0;             /* Number of elements in buffer */
-    size_t      src_nbytes;             /* Number of bytes to read from source */
-    size_t      mem_nbytes;             /* Number of bytes to convert in memory */
-    size_t      dst_nbytes;             /* Number of bytes to write to destination */
-    hsize_t     total_src_nbytes;       /* Total number of bytes to copy */
-    size_t      buf_size;               /* Size of copy buffer */
-    void       *buf = NULL;             /* Buffer for copying data */
-    void       *bkg = NULL;             /* Temporary buffer for copying data */
-    void       *reclaim_buf = NULL;     /* Buffer for reclaiming data */
-    H5S_t      *buf_space = NULL;       /* Dataspace describing buffer */
-    hid_t       buf_sid = -1;           /* ID for buffer dataspace */
-    hsize_t     buf_dim[1] = {0};       /* Dimension for buffer */
-    hbool_t     is_vlen = FALSE;        /* Flag to indicate that VL type conversion should occur */
-    hbool_t     fix_ref = FALSE;        /* Flag to indicate that ref values should be fixed */
-    H5D_shared_t    *shared_fo = cpy_info->shared_fo;  /* Pointer to the shared struct for dataset object */
-    hbool_t     try_sieve = FALSE;          /* Try to get data from the sieve buffer */
-    haddr_t     sieve_start = HADDR_UNDEF;  /* Start location of sieve buffer */
-    haddr_t     sieve_end = HADDR_UNDEF;    /* End locations of sieve buffer */ 
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    haddr_t       addr_src;                                    /* File offset in source dataset */
+    haddr_t       addr_dst;                                    /* File offset in destination dataset */
+    H5T_path_t *  tpath_src_mem = NULL, *tpath_mem_dst = NULL; /* Datatype conversion paths */
+    H5T_t *       dt_dst      = NULL;                          /* Destination datatype */
+    H5T_t *       dt_mem      = NULL;                          /* Memory datatype */
+    hid_t         tid_src     = -1;                            /* Datatype ID for source datatype */
+    hid_t         tid_dst     = -1;                            /* Datatype ID for destination datatype */
+    hid_t         tid_mem     = -1;                            /* Datatype ID for memory datatype */
+    size_t        src_dt_size = 0;                             /* Source datatype size */
+    size_t        mem_dt_size = 0;                             /* Memory datatype size */
+    size_t        dst_dt_size = 0;                             /* Destination datatype size */
+    size_t        max_dt_size;                                 /* Max. datatype size */
+    size_t        nelmts = 0;                                  /* Number of elements in buffer */
+    size_t        src_nbytes;                                  /* Number of bytes to read from source */
+    size_t        mem_nbytes;                                  /* Number of bytes to convert in memory */
+    size_t        dst_nbytes;                                  /* Number of bytes to write to destination */
+    hsize_t       total_src_nbytes;                            /* Total number of bytes to copy */
+    size_t        buf_size;                                    /* Size of copy buffer */
+    void *        buf         = NULL;                          /* Buffer for copying data */
+    void *        bkg         = NULL;                          /* Temporary buffer for copying data */
+    void *        reclaim_buf = NULL;                          /* Buffer for reclaiming data */
+    H5S_t *       buf_space   = NULL;                          /* Dataspace describing buffer */
+    hid_t         buf_sid     = -1;                            /* ID for buffer dataspace */
+    hsize_t       buf_dim[1]  = {0};                           /* Dimension for buffer */
+    hbool_t       is_vlen     = FALSE; /* Flag to indicate that VL type conversion should occur */
+    hbool_t       fix_ref     = FALSE; /* Flag to indicate that ref values should be fixed */
+    H5D_shared_t *shared_fo   = cpy_info->shared_fo; /* Pointer to the shared struct for dataset object */
+    hbool_t       try_sieve   = FALSE;               /* Try to get data from the sieve buffer */
+    haddr_t       sieve_start = HADDR_UNDEF;         /* Start location of sieve buffer */
+    haddr_t       sieve_end   = HADDR_UNDEF;         /* End locations of sieve buffer */
+    herr_t        ret_value   = SUCCEED;             /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1339,7 +1313,7 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
     HDassert(dt_src);
 
     /* Allocate space for destination raw data */
-    if(H5D__contig_alloc(f_dst, dxpl_id, storage_dst) < 0)
+    if (H5D__contig_alloc(f_dst, dxpl_id, storage_dst) < 0)
         HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to allocate contiguous storage")
 
     /* Set up number of bytes to copy, and initial buffer size */
@@ -1351,49 +1325,49 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
     /* Create datatype ID for src datatype.  We may or may not use this ID,
      * but this ensures that the src datatype will be freed.
      */
-    if((tid_src = H5I_register(H5I_DATATYPE, dt_src, FALSE)) < 0)
+    if ((tid_src = H5I_register(H5I_DATATYPE, dt_src, FALSE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register source file datatype")
 
     /* If there's a VLEN source datatype, set up type conversion information */
-    if(H5T_detect_class(dt_src, H5T_VLEN, FALSE) > 0) {
+    if (H5T_detect_class(dt_src, H5T_VLEN, FALSE) > 0) {
         /* create a memory copy of the variable-length datatype */
-        if(NULL == (dt_mem = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
+        if (NULL == (dt_mem = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy")
-        if((tid_mem = H5I_register(H5I_DATATYPE, dt_mem, FALSE)) < 0) {
+        if ((tid_mem = H5I_register(H5I_DATATYPE, dt_mem, FALSE)) < 0) {
             H5T_close(dt_mem);
             HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register memory datatype")
         } /* end if */
 
         /* create variable-length datatype at the destinaton file */
-        if(NULL == (dt_dst = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
+        if (NULL == (dt_dst = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to copy")
-        if(H5T_set_loc(dt_dst, f_dst, H5T_LOC_DISK) < 0) {
+        if (H5T_set_loc(dt_dst, f_dst, H5T_LOC_DISK) < 0) {
             H5T_close(dt_dst);
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "cannot mark datatype on disk")
         } /* end if */
-        if((tid_dst = H5I_register(H5I_DATATYPE, dt_dst, FALSE)) < 0) {
+        if ((tid_dst = H5I_register(H5I_DATATYPE, dt_dst, FALSE)) < 0) {
             H5T_close(dt_dst);
             HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register destination file datatype")
         } /* end if */
 
         /* Set up the conversion functions */
-        if(NULL == (tpath_src_mem = H5T_path_find(dt_src, dt_mem, NULL, NULL, dxpl_id, FALSE)))
+        if (NULL == (tpath_src_mem = H5T_path_find(dt_src, dt_mem, NULL, NULL, dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to convert between src and mem datatypes")
-        if(NULL == (tpath_mem_dst = H5T_path_find(dt_mem, dt_dst, NULL, NULL, dxpl_id, FALSE)))
+        if (NULL == (tpath_mem_dst = H5T_path_find(dt_mem, dt_dst, NULL, NULL, dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to convert between mem and dst datatypes")
 
         /* Determine largest datatype size */
-        if(0 == (src_dt_size = H5T_get_size(dt_src)))
+        if (0 == (src_dt_size = H5T_get_size(dt_src)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to determine datatype size")
-        if(0 == (mem_dt_size = H5T_get_size(dt_mem)))
+        if (0 == (mem_dt_size = H5T_get_size(dt_mem)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to determine datatype size")
         max_dt_size = MAX(src_dt_size, mem_dt_size);
-        if(0 == (dst_dt_size = H5T_get_size(dt_dst)))
+        if (0 == (dst_dt_size = H5T_get_size(dt_dst)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to determine datatype size")
         max_dt_size = MAX(max_dt_size, dst_dt_size);
 
         /* Set maximum number of whole elements that fit in buffer */
-        if(0 == (nelmts = buf_size / max_dt_size))
+        if (0 == (nelmts = buf_size / max_dt_size))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "element size too large")
 
         /* Set the number of bytes to transfer */
@@ -1408,11 +1382,11 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
         buf_dim[0] = nelmts;
 
         /* Create the space and set the initial extent */
-        if(NULL == (buf_space = H5S_create_simple((unsigned)1, buf_dim, NULL)))
+        if (NULL == (buf_space = H5S_create_simple((unsigned)1, buf_dim, NULL)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create simple dataspace")
 
         /* Atomize */
-        if((buf_sid = H5I_register(H5I_DATASPACE, buf_space, FALSE)) < 0) {
+        if ((buf_sid = H5I_register(H5I_DATASPACE, buf_space, FALSE)) < 0) {
             H5S_close(buf_space);
             HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace ID")
         } /* end if */
@@ -1422,9 +1396,9 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
     } /* end if */
     else {
         /* Check for reference datatype */
-        if(H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) {
+        if (H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) {
             /* Need to fix values of references when copying across files */
-            if(f_src != f_dst)
+            if (f_src != f_dst)
                 fix_ref = TRUE;
         } /* end if */
 
@@ -1434,16 +1408,16 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
 
     /* Allocate space for copy buffer */
     HDassert(buf_size);
-    if(NULL == (buf = H5FL_BLK_MALLOC(type_conv, buf_size)))
+    if (NULL == (buf = H5FL_BLK_MALLOC(type_conv, buf_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for copy buffer")
 
     /* Need extra buffer for datatype conversions, to prevent stranding/leaking memory */
-    if(is_vlen || fix_ref) {
-        if(NULL == (reclaim_buf = H5FL_BLK_MALLOC(type_conv, buf_size)))
+    if (is_vlen || fix_ref) {
+        if (NULL == (reclaim_buf = H5FL_BLK_MALLOC(type_conv, buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for copy buffer")
 
         /* allocate temporary bkg buff for data conversion */
-        if(NULL == (bkg = H5FL_BLK_MALLOC(type_conv, buf_size)))
+        if (NULL == (bkg = H5FL_BLK_MALLOC(type_conv, buf_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for copy buffer")
     } /* end if */
 
@@ -1452,37 +1426,36 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
 
     /* If data sieving is enabled and the dataset is open in the file,
        set up to copy data out of the sieve buffer if deemed possible later */
-    if(H5F_HAS_FEATURE(f_src, H5FD_FEAT_DATA_SIEVE) &&
-       shared_fo && shared_fo->cache.contig.sieve_buf) {
-        try_sieve = TRUE;
+    if (H5F_HAS_FEATURE(f_src, H5FD_FEAT_DATA_SIEVE) && shared_fo && shared_fo->cache.contig.sieve_buf) {
+        try_sieve   = TRUE;
         sieve_start = shared_fo->cache.contig.sieve_loc;
-        sieve_end = sieve_start + shared_fo->cache.contig.sieve_size;
-        /* 
+        sieve_end   = sieve_start + shared_fo->cache.contig.sieve_size;
+        /*
          * It is possble for addr_src to be undefined when:
          *  (a) The dataset is created and data is written to it.
          *  (b) The dataset is then copied via H5Ocopy().
-         *  H5D_mark() in H5Dint.c is different between 
+         *  H5D_mark() in H5Dint.c is different between
          *  1.8 and develop branches:
-         *  1.8--it just sets dataset->shared->layout_dirty as TRUE 
+         *  1.8--it just sets dataset->shared->layout_dirty as TRUE
          *       to be flushed later.
          *  develop--it will flush the layout message if it has been changed.
          */
-        if(!H5F_addr_defined(addr_src))
+        if (!H5F_addr_defined(addr_src))
             addr_src = sieve_start;
     }
 
     HDassert(H5F_addr_defined(addr_src));
     /* Loop over copying data */
-    while(total_src_nbytes > 0) {
+    while (total_src_nbytes > 0) {
         /* Check if we should reduce the number of bytes to transfer */
-        if(total_src_nbytes < src_nbytes) {
+        if (total_src_nbytes < src_nbytes) {
             /* Adjust bytes to transfer */
             src_nbytes = (size_t)total_src_nbytes;
 
             /* Adjust dataspace describing buffer */
-            if(is_vlen) {
+            if (is_vlen) {
                 /* Adjust destination & memory bytes to transfer */
-                nelmts = src_nbytes / src_dt_size;
+                nelmts     = src_nbytes / src_dt_size;
                 dst_nbytes = nelmts * dst_dt_size;
                 mem_nbytes = nelmts * mem_dt_size;
 
@@ -1490,7 +1463,7 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
                 buf_dim[0] = nelmts;
 
                 /* Adjust size of buffer's dataspace */
-                if(H5S_set_extent_real(buf_space, buf_dim) < 0)
+                if (H5S_set_extent_real(buf_space, buf_dim) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "unable to change buffer dataspace size")
             } /* end if */
             else
@@ -1498,20 +1471,22 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
                 dst_nbytes = mem_nbytes = src_nbytes;
         } /* end if */
 
-         /* If the entire copy is within the sieve buffer, copy data from the sieve buffer */
-        if(try_sieve && (addr_src >= sieve_start) && ((addr_src + src_nbytes -1) < sieve_end)) {
+        /* If the entire copy is within the sieve buffer, copy data from the sieve buffer */
+        if (try_sieve && (addr_src >= sieve_start) && ((addr_src + src_nbytes - 1) < sieve_end)) {
             unsigned char *base_sieve_buf = shared_fo->cache.contig.sieve_buf + (addr_src - sieve_start);
 
             HDmemcpy(buf, base_sieve_buf, src_nbytes);
-        } else
+        }
+        else
             /* Read raw data from source file */
-            if(H5F_block_read(f_src, H5FD_MEM_DRAW, addr_src, src_nbytes, H5P_DATASET_XFER_DEFAULT, buf) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "unable to read raw data")
+            if (H5F_block_read(f_src, H5FD_MEM_DRAW, addr_src, src_nbytes, H5P_DATASET_XFER_DEFAULT, buf) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "unable to read raw data")
 
         /* Perform datatype conversion, if necessary */
-        if(is_vlen) {
+        if (is_vlen) {
             /* Convert from source file to memory */
-            if(H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
+            if (H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, bkg,
+                            dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
 
             /* Copy into another buffer, to reclaim memory later */
@@ -1521,27 +1496,29 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
             HDmemset(bkg, 0, buf_size);
 
             /* Convert from memory to destination file */
-            if(H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
+            if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg,
+                            dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
 
             /* Reclaim space from variable length data */
-            if(H5D_vlen_reclaim(tid_mem, buf_space, H5P_DATASET_XFER_DEFAULT, reclaim_buf) < 0)
+            if (H5D_vlen_reclaim(tid_mem, buf_space, H5P_DATASET_XFER_DEFAULT, reclaim_buf) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to reclaim variable-length data")
         } /* end if */
-        else if(fix_ref) {
+        else if (fix_ref) {
             /* Check for expanding references */
-            if(cpy_info->expand_ref) {
+            if (cpy_info->expand_ref) {
                 size_t ref_count;
 
                 /* Determine # of reference elements to copy */
                 ref_count = src_nbytes / H5T_get_size(dt_src);
 
                 /* Copy the reference elements */
-                if(H5O_copy_expand_ref(f_src, buf, dxpl_id, f_dst, bkg, ref_count, H5T_get_ref_type(dt_src), cpy_info) < 0)
+                if (H5O_copy_expand_ref(f_src, buf, dxpl_id, f_dst, bkg, ref_count, H5T_get_ref_type(dt_src),
+                                        cpy_info) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to copy reference attribute")
 
                 /* After fix ref, copy the new reference elements to the buffer to write out */
-                HDmemcpy(buf, bkg,  buf_size);
+                HDmemcpy(buf, bkg, buf_size);
             } /* end if */
             else
                 /* Reset value to zero */
@@ -1549,7 +1526,7 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
         } /* end if */
 
         /* Write raw data to destination file */
-        if(H5F_block_write(f_dst, H5FD_MEM_DRAW, addr_dst, dst_nbytes, H5P_DATASET_XFER_DEFAULT, buf) < 0)
+        if (H5F_block_write(f_dst, H5FD_MEM_DRAW, addr_dst, dst_nbytes, H5P_DATASET_XFER_DEFAULT, buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write raw data")
 
         /* Adjust loop variables */
@@ -1559,21 +1536,20 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
     } /* end while */
 
 done:
-    if(buf_sid > 0 && H5I_dec_ref(buf_sid) < 0)
+    if (buf_sid > 0 && H5I_dec_ref(buf_sid) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't decrement temporary dataspace ID")
-    if(tid_src > 0 && H5I_dec_ref(tid_src) < 0)
+    if (tid_src > 0 && H5I_dec_ref(tid_src) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(tid_dst > 0 && H5I_dec_ref(tid_dst) < 0)
+    if (tid_dst > 0 && H5I_dec_ref(tid_dst) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(tid_mem > 0 && H5I_dec_ref(tid_mem) < 0)
+    if (tid_mem > 0 && H5I_dec_ref(tid_mem) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(buf)
+    if (buf)
         buf = H5FL_BLK_FREE(type_conv, buf);
-    if(reclaim_buf)
+    if (reclaim_buf)
         reclaim_buf = H5FL_BLK_FREE(type_conv, reclaim_buf);
-    if(bkg)
+    if (bkg)
         bkg = H5FL_BLK_FREE(type_conv, bkg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_copy() */
-
diff --git a/src/H5Ddbg.c b/src/H5Ddbg.c
index f955986..4658fa2 100644
--- a/src/H5Ddbg.c
+++ b/src/H5Ddbg.c
@@ -15,51 +15,43 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5D__init_dbg_interface
-
+#define H5_INTERFACE_INIT_FUNC H5D__init_dbg_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Datasets 				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Dpkg.h"     /* Datasets 				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5D__init_dbg_interface -- Initialize interface-specific information
@@ -80,7 +72,6 @@ H5D__init_dbg_interface(void)
     FUNC_LEAVE_NOAPI(H5D_init())
 } /* H5D__init_dbg_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Ddebug
  *
@@ -99,23 +90,22 @@ H5D__init_dbg_interface(void)
 herr_t
 H5Ddebug(hid_t dset_id)
 {
-    H5D_t	*dset;                  /* Dataset to debug */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5D_t *dset;                /* Dataset to debug */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", dset_id);
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
     /* Print B-tree information */
-    if(H5D_CHUNKED == dset->shared->layout.type)
-	(void)H5D__chunk_dump_index(dset, H5AC_ind_dxpl_id, stdout);
-    else if(H5D_CONTIGUOUS == dset->shared->layout.type)
-	HDfprintf(stdout, "    %-10s %a\n", "Address:", dset->shared->layout.storage.u.contig.addr);
+    if (H5D_CHUNKED == dset->shared->layout.type)
+        (void)H5D__chunk_dump_index(dset, H5AC_ind_dxpl_id, stdout);
+    else if (H5D_CONTIGUOUS == dset->shared->layout.type)
+        HDfprintf(stdout, "    %-10s %a\n", "Address:", dset->shared->layout.storage.u.contig.addr);
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ddebug() */
-
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index 3532db7..13fe91e 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -29,36 +29,31 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg   */
+#define H5D_PACKAGE /*suppress error about including H5Dpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5D__init_deprec_interface
-
+#define H5_INTERFACE_INIT_FUNC H5D__init_deprec_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Datasets 				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Dpkg.h"     /* Datasets 				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -67,23 +62,18 @@
 static herr_t H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5D__init_deprec_interface -- Initialize interface-specific information
@@ -104,7 +94,6 @@ H5D__init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5D_init())
 } /* H5D__init_deprec_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5D__term_deprec_interface -- Terminate interface
@@ -129,7 +118,7 @@ H5D__term_deprec_interface(void)
 } /* H5D__term_deprec_interface() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5Dcreate1
  *
@@ -160,49 +149,47 @@ H5D__term_deprec_interface(void)
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
-	  hid_t dcpl_id)
+H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t dcpl_id)
 {
-    H5G_loc_t	    loc;                /* Object location to insert dataset into */
-    H5D_t	   *dset = NULL;        /* New dataset's info */
-    const H5S_t    *space;              /* Dataspace for dataset */
-    hid_t           ret_value;          /* Return value */
+    H5G_loc_t    loc;         /* Object location to insert dataset into */
+    H5D_t *      dset = NULL; /* New dataset's info */
+    const H5S_t *space;       /* Dataspace for dataset */
+    hid_t        ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, dcpl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(H5I_DATATYPE != H5I_get_type(type_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
-    if(NULL == (space = (const H5S_t *)H5I_object_verify(space_id,H5I_DATASPACE)))
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (H5I_DATATYPE != H5I_get_type(type_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
+    if (NULL == (space = (const H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace ID")
-    if(H5P_DEFAULT == dcpl_id)
+    if (H5P_DEFAULT == dcpl_id)
         dcpl_id = H5P_DATASET_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dcpl_id, H5P_DATASET_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
+    else if (TRUE != H5P_isa_class(dcpl_id, H5P_DATASET_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
 
     /* Build and open the new dataset */
-    if(NULL == (dset = H5D__create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
+    if (NULL == (dset = H5D__create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id,
+                                          H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
 
     /* Register the new dataset to get an ID for it */
-    if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
+    if ((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
 
 done:
-    if(ret_value < 0)
-        if(dset && H5D_close(dset) < 0)
+    if (ret_value < 0)
+        if (dset && H5D_close(dset) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dcreate1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dopen1
  *
@@ -223,24 +210,24 @@ done:
 hid_t
 H5Dopen1(hid_t loc_id, const char *name)
 {
-    H5D_t       *dset = NULL;
-    H5G_loc_t	 loc;		        /* Object location of group */
-    H5G_loc_t	 dset_loc;		/* Object location of dataset */
-    H5G_name_t   path;            	/* Dataset group hier. path */
-    H5O_loc_t    oloc;            	/* Dataset object location */
-    H5O_type_t   obj_type;              /* Type of object at location */
-    hbool_t      loc_found = FALSE;     /* Location at 'name' found */
-    hid_t        dapl_id = H5P_DATASET_ACCESS_DEFAULT; /* dapl to use to open dataset */
-    hid_t        dxpl_id = H5AC_ind_dxpl_id;    /* dxpl to use to open datset */
-    hid_t        ret_value;
+    H5D_t *    dset = NULL;
+    H5G_loc_t  loc;                                    /* Object location of group */
+    H5G_loc_t  dset_loc;                               /* Object location of dataset */
+    H5G_name_t path;                                   /* Dataset group hier. path */
+    H5O_loc_t  oloc;                                   /* Dataset object location */
+    H5O_type_t obj_type;                               /* Type of object at location */
+    hbool_t    loc_found = FALSE;                      /* Location at 'name' found */
+    hid_t      dapl_id   = H5P_DATASET_ACCESS_DEFAULT; /* dapl to use to open dataset */
+    hid_t      dxpl_id   = H5AC_ind_dxpl_id;           /* dxpl to use to open datset */
+    hid_t      ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "i*s", loc_id, name);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Set up dataset location to fill in */
@@ -249,40 +236,39 @@ H5Dopen1(hid_t loc_id, const char *name)
     H5G_loc_reset(&dset_loc);
 
     /* Find the dataset object */
-    if(H5G_loc_find(&loc, name, &dset_loc, H5P_DEFAULT, dxpl_id) < 0)
+    if (H5G_loc_find(&loc, name, &dset_loc, H5P_DEFAULT, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found")
     loc_found = TRUE;
 
     /* Check that the object found is the correct type */
-    if(H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
+    if (H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object type")
-    if(obj_type != H5O_TYPE_DATASET)
+    if (obj_type != H5O_TYPE_DATASET)
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
 
     /* Open the dataset */
-    if(NULL == (dset = H5D_open(&dset_loc, dapl_id, dxpl_id)))
+    if (NULL == (dset = H5D_open(&dset_loc, dapl_id, dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't open dataset")
 
     /* Register an atom for the dataset */
-    if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "can't register dataset atom")
 
 done:
-    if(ret_value < 0) {
-        if(dset != NULL) {
-            if(H5D_close(dset) < 0)
+    if (ret_value < 0) {
+        if (dset != NULL) {
+            if (H5D_close(dset) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
         } /* end if */
         else {
-            if(loc_found && H5G_loc_free(&dset_loc) < 0)
+            if (loc_found && H5G_loc_free(&dset_loc) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dopen1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dextend
  *
@@ -302,27 +288,26 @@ done:
 herr_t
 H5Dextend(hid_t dset_id, const hsize_t size[])
 {
-    H5D_t	*dset;
-    herr_t       ret_value = SUCCEED;  /* Return value */
+    H5D_t *dset;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*h", dset_id, size);
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
-    if(!size)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (!size)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
 
     /* Increase size */
-    if(H5D__extend(dset, size, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset")
+    if (H5D__extend(dset, size, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dextend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__extend
  *
@@ -338,12 +323,12 @@ done:
 static herr_t
 H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
 {
-    htri_t changed;                     /* Flag to indicate that the dataspace was successfully extended */
-    H5S_t *space;                       /* Dataset's dataspace */
-    int     rank;                       /* Dataspace # of dimensions */
-    hsize_t curr_dims[H5O_LAYOUT_NDIMS];/* Current dimension sizes */
-    H5O_fill_t *fill;                   /* Dataset's fill value */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    htri_t      changed; /* Flag to indicate that the dataspace was successfully extended */
+    H5S_t *     space;   /* Dataset's dataspace */
+    int         rank;    /* Dataspace # of dimensions */
+    hsize_t     curr_dims[H5O_LAYOUT_NDIMS]; /* Current dimension sizes */
+    H5O_fill_t *fill;                        /* Dataset's fill value */
+    herr_t      ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -352,7 +337,7 @@ H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
     HDassert(size);
 
     /* Check if the filters in the DCPL will need to encode, and if so, can they? */
-    if(H5D__check_filters(dataset) < 0)
+    if (H5D__check_filters(dataset) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't apply filters")
 
     /*
@@ -363,32 +348,31 @@ H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
 
     /* Retrieve the current dimensions */
     space = dataset->shared->space;
-    if((rank = H5S_get_simple_extent_dims(space, curr_dims, NULL)) < 0)
+    if ((rank = H5S_get_simple_extent_dims(space, curr_dims, NULL)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataset dimensions")
 
     /* Increase the size of the data space */
-    if((changed = H5S_extend(space, size)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to increase size of data space")
+    if ((changed = H5S_extend(space, size)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to increase size of data space")
 
     /* Updated the dataset's info if the dataspace was successfully extended */
-    if(changed) {
+    if (changed) {
         /* Update the index values for the cached chunks for this dataset */
-        if(H5D_CHUNKED == dataset->shared->layout.type) {
-            if(H5D__chunk_set_info(dataset) < 0)
+        if (H5D_CHUNKED == dataset->shared->layout.type) {
+            if (H5D__chunk_set_info(dataset) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to update # of chunks")
-            if(H5D__chunk_update_cache(dataset, dxpl_id) < 0)
+            if (H5D__chunk_update_cache(dataset, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update cached chunk indices")
         } /* end if */
 
-	/* Allocate space for the new parts of the dataset, if appropriate */
+        /* Allocate space for the new parts of the dataset, if appropriate */
         fill = &dataset->shared->dcpl_cache.fill;
-        if(fill->alloc_time == H5D_ALLOC_TIME_EARLY)
-            if(H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_EXTEND, FALSE,
-                    curr_dims) < 0)
+        if (fill->alloc_time == H5D_ALLOC_TIME_EARLY)
+            if (H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_EXTEND, FALSE, curr_dims) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize dataset with fill value")
 
         /* Mark the dataspace as dirty, for later writing to the file */
-        if(H5D__mark(dataset, dxpl_id, H5D_MARK_SPACE) < 0)
+        if (H5D__mark(dataset, dxpl_id, H5D_MARK_SPACE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to mark dataspace as dirty")
     } /* end if */
 
@@ -396,4 +380,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__extend() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Defl.c b/src/H5Defl.c
index cda841a..6b721ea 100644
--- a/src/H5Defl.c
+++ b/src/H5Defl.c
@@ -20,98 +20,77 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"          /* Generic Functions                        */
-#include "H5Dpkg.h"             /* Datasets                                 */
-#include "H5Eprivate.h"         /* Error handling                           */
-#include "H5Fprivate.h"         /* Files                                    */
-#include "H5HLprivate.h"        /* Local Heaps                              */
-#include "H5MMprivate.h"        /* Memory management                        */
-#include "H5VMprivate.h"        /* Vector and array functions               */
-
+#include "H5private.h"   /* Generic Functions                        */
+#include "H5Dpkg.h"      /* Datasets                                 */
+#include "H5Eprivate.h"  /* Error handling                           */
+#include "H5Fprivate.h"  /* Files                                    */
+#include "H5HLprivate.h" /* Local Heaps                              */
+#include "H5MMprivate.h" /* Memory management                        */
+#include "H5VMprivate.h" /* Vector and array functions               */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Callback info for readvv operation */
 typedef struct H5D_efl_readvv_ud_t {
-    const H5O_efl_t *efl;       /* Pointer to efl info */
-    const H5D_t *dset;          /* The dataset */
-    unsigned char *rbuf;        /* Read buffer */
+    const H5O_efl_t *efl;  /* Pointer to efl info */
+    const H5D_t *    dset; /* The dataset */
+    unsigned char *  rbuf; /* Read buffer */
 } H5D_efl_readvv_ud_t;
 
 /* Callback info for writevv operation */
 typedef struct H5D_efl_writevv_ud_t {
-    const H5O_efl_t *efl;       /* Pointer to efl info */
-    const H5D_t *dset;          /* The dataset */
-    const unsigned char *wbuf;  /* Write buffer */
+    const H5O_efl_t *    efl;  /* Pointer to efl info */
+    const H5D_t *        dset; /* The dataset */
+    const unsigned char *wbuf; /* Write buffer */
 } H5D_efl_writevv_ud_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Layout operation callbacks */
 static herr_t H5D__efl_construct(H5F_t *f, H5D_t *dset);
-static herr_t H5D__efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *cm);
-static ssize_t H5D__efl_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-static ssize_t H5D__efl_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+static herr_t H5D__efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                               const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t *cm);
+static ssize_t H5D__efl_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                               size_t dset_len_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                               size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+static ssize_t H5D__efl_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                                size_t dset_len_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                                size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
 
 /* Helper routines */
-static herr_t H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size,
-    uint8_t *buf);
+static herr_t H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size, uint8_t *buf);
 static herr_t H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size,
-    const uint8_t *buf);
-
+                             const uint8_t *buf);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* External File List (EFL) storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_EFL[1] = {{
-    H5D__efl_construct,
-    NULL,
-    H5D__efl_is_space_alloc,
-    NULL,
-    H5D__efl_io_init,
-    H5D__contig_read,
-    H5D__contig_write,
+const H5D_layout_ops_t H5D_LOPS_EFL[1] = {{H5D__efl_construct, NULL, H5D__efl_is_space_alloc, NULL,
+                                           H5D__efl_io_init, H5D__contig_read, H5D__contig_write,
 #ifdef H5_HAVE_PARALLEL
-    NULL,
-    NULL,
+                                           NULL, NULL,
 #endif /* H5_HAVE_PARALLEL */
-    H5D__efl_readvv,
-    H5D__efl_writevv,
-    NULL,
-    NULL
-}};
-
+                                           H5D__efl_readvv, H5D__efl_writevv, NULL, NULL}};
 
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_construct
  *
@@ -127,16 +106,16 @@ const H5D_layout_ops_t H5D_LOPS_EFL[1] = {{
 static herr_t
 H5D__efl_construct(H5F_t *f, H5D_t *dset)
 {
-    size_t dt_size;                     /* Size of datatype */
-    hsize_t dim[H5O_LAYOUT_NDIMS];	/* Current size of data in elements */
-    hsize_t max_dim[H5O_LAYOUT_NDIMS];  /* Maximum size of data in elements */
+    size_t   dt_size;                   /* Size of datatype */
+    hsize_t  dim[H5O_LAYOUT_NDIMS];     /* Current size of data in elements */
+    hsize_t  max_dim[H5O_LAYOUT_NDIMS]; /* Maximum size of data in elements */
     hssize_t stmp_size;                 /* Temporary holder for raw data size */
-    hsize_t tmp_size;                   /* Temporary holder for raw data size */
-    hsize_t max_points;                 /* Maximum elements */
-    hsize_t max_storage;                /* Maximum storage size */
-    int ndims;                          /* Rank of dataspace */
-    int i;                              /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hsize_t  tmp_size;                  /* Temporary holder for raw data size */
+    hsize_t  max_points;                /* Maximum elements */
+    hsize_t  max_storage;               /* Maximum storage size */
+    int      ndims;                     /* Rank of dataspace */
+    int      i;                         /* Local index variable */
+    herr_t   ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -151,26 +130,26 @@ H5D__efl_construct(H5F_t *f, H5D_t *dset)
      */
 
     /* Check for invalid dataset dimensions */
-    if((ndims = H5S_get_simple_extent_dims(dset->shared->space, dim, max_dim)) < 0)
+    if ((ndims = H5S_get_simple_extent_dims(dset->shared->space, dim, max_dim)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize contiguous storage")
-    for(i = 1; i < ndims; i++)
-        if(max_dim[i] > dim[i])
+    for (i = 1; i < ndims; i++)
+        if (max_dim[i] > dim[i])
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "only the first dimension can be extendible")
 
     /* Retrieve the size of the dataset's datatype */
-    if(0 == (dt_size = H5T_get_size(dset->shared->type)))
+    if (0 == (dt_size = H5T_get_size(dset->shared->type)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to determine datatype size")
 
     /* Check for storage overflows */
-    max_points = H5S_get_npoints_max(dset->shared->space);
+    max_points  = H5S_get_npoints_max(dset->shared->space);
     max_storage = H5O_efl_total_size(&dset->shared->dcpl_cache.efl);
-    if(H5S_UNLIMITED == max_points) {
-        if(H5O_EFL_UNLIMITED != max_storage)
+    if (H5S_UNLIMITED == max_points) {
+        if (H5O_EFL_UNLIMITED != max_storage)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unlimited dataspace but finite storage")
     } /* end if */
-    else if((max_points * dt_size) < max_points)
+    else if ((max_points * dt_size) < max_points)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "dataspace * type size overflowed")
-    else if((max_points * dt_size) > max_storage)
+    else if ((max_points * dt_size) > max_storage)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "dataspace size exceeds external storage size")
 
     /* Compute the total size of dataset */
@@ -186,7 +165,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_construct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_is_space_alloc
  *
@@ -211,7 +189,6 @@ H5D__efl_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage)
     FUNC_LEAVE_NOAPI(TRUE)
 } /* end H5D__efl_is_space_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_io_init
  *
@@ -226,8 +203,8 @@ H5D__efl_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage)
  */
 static herr_t
 H5D__efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNUSED *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
-    H5D_chunk_map_t H5_ATTR_UNUSED *cm)
+                 hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space,
+                 const H5S_t H5_ATTR_UNUSED *mem_space, H5D_chunk_map_t H5_ATTR_UNUSED *cm)
 {
     FUNC_ENTER_STATIC_NOERR
 
@@ -236,7 +213,6 @@ H5D__efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNU
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__efl_io_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__efl_read
  *
@@ -255,17 +231,17 @@ H5D__efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNU
 static herr_t
 H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size, uint8_t *buf)
 {
-    int		fd = -1;
-    size_t	to_read;
+    int    fd = -1;
+    size_t to_read;
 #ifndef NDEBUG
-    hsize_t     tempto_read;
+    hsize_t tempto_read;
 #endif /* NDEBUG */
-    hsize_t     skip = 0;
-    haddr_t     cur;
-    ssize_t	n;
-    size_t      u;                      /* Local index variable */
-    char *full_name = NULL;             /* File name with prefix */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    hsize_t skip = 0;
+    haddr_t cur;
+    ssize_t n;
+    size_t  u;                   /* Local index variable */
+    char *  full_name = NULL;    /* File name with prefix */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -276,8 +252,8 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size
     HDassert(buf || 0 == size);
 
     /* Find the first efl member from which to read */
-    for (u=0, cur=0; u<efl->nused; u++) {
-        if(H5O_EFL_UNLIMITED == efl->slot[u].size || addr < cur + efl->slot[u].size) {
+    for (u = 0, cur = 0; u < efl->nused; u++) {
+        if (H5O_EFL_UNLIMITED == efl->slot[u].size || addr < cur + efl->slot[u].size) {
             skip = addr - cur;
             break;
         } /* end if */
@@ -285,28 +261,28 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size
     } /* end for */
 
     /* Read the data */
-    while(size) {
+    while (size) {
         HDassert(buf);
-        if(u >= efl->nused)
+        if (u >= efl->nused)
             HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "read past logical end of file")
-        if(H5F_OVERFLOW_HSIZET2OFFT(efl->slot[u].offset + skip))
+        if (H5F_OVERFLOW_HSIZET2OFFT(efl->slot[u].offset + skip))
             HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "external file address overflowed")
-        if(H5_combine_path(dset->shared->extfile_prefix, efl->slot[u].name, &full_name) < 0)
+        if (H5_combine_path(dset->shared->extfile_prefix, efl->slot[u].name, &full_name) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_NOSPACE, FAIL, "can't build external file name")
-        if((fd = HDopen(full_name, O_RDONLY, 0)) < 0)
+        if ((fd = HDopen(full_name, O_RDONLY, 0)) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_CANTOPENFILE, FAIL, "unable to open external raw data file")
-        if(HDlseek(fd, (HDoff_t)(efl->slot[u].offset + skip), SEEK_SET) < 0)
+        if (HDlseek(fd, (HDoff_t)(efl->slot[u].offset + skip), SEEK_SET) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_SEEKERROR, FAIL, "unable to seek in external raw data file")
 #ifndef NDEBUG
-        tempto_read = MIN((size_t)(efl->slot[u].size-skip), (hsize_t)size);
+        tempto_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
         H5_CHECK_OVERFLOW(tempto_read, hsize_t, size_t);
         to_read = (size_t)tempto_read;
-#else /* NDEBUG */
-        to_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
+#else  /* NDEBUG */
+        to_read  = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
 #endif /* NDEBUG */
-        if((n = HDread(fd, buf, to_read)) < 0)
+        if ((n = HDread(fd, buf, to_read)) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_READERROR, FAIL, "read error in external raw data file")
-        else if((size_t)n < to_read)
+        else if ((size_t)n < to_read)
             HDmemset(buf + n, 0, to_read - (size_t)n);
         full_name = (char *)H5MM_xfree(full_name);
         HDclose(fd);
@@ -318,15 +294,14 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size
     } /* end while */
 
 done:
-    if(full_name)
+    if (full_name)
         full_name = (char *)H5MM_xfree(full_name);
-    if(fd >= 0)
+    if (fd >= 0)
         HDclose(fd);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_write
  *
@@ -348,16 +323,16 @@ done:
 static herr_t
 H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size, const uint8_t *buf)
 {
-    int		fd = -1;
-    size_t	to_write;
+    int    fd = -1;
+    size_t to_write;
 #ifndef NDEBUG
-    hsize_t	tempto_write;
+    hsize_t tempto_write;
 #endif /* NDEBUG */
-    haddr_t     cur;
-    hsize_t     skip = 0;
-    size_t	u;                          /* Local index variable */
-    char *full_name = NULL;             /* File name with prefix */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    haddr_t cur;
+    hsize_t skip = 0;
+    size_t  u;                   /* Local index variable */
+    char *  full_name = NULL;    /* File name with prefix */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -368,8 +343,8 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz
     HDassert(buf || 0 == size);
 
     /* Find the first efl member in which to write */
-    for(u = 0, cur = 0; u < efl->nused; u++) {
-        if(H5O_EFL_UNLIMITED == efl->slot[u].size || addr < cur + efl->slot[u].size) {
+    for (u = 0, cur = 0; u < efl->nused; u++) {
+        if (H5O_EFL_UNLIMITED == efl->slot[u].size || addr < cur + efl->slot[u].size) {
             skip = addr - cur;
             break;
         } /* end if */
@@ -377,33 +352,33 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz
     } /* end for */
 
     /* Write the data */
-    while(size) {
+    while (size) {
         HDassert(buf);
-        if(u >= efl->nused)
+        if (u >= efl->nused)
             HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "write past logical end of file")
-        if(H5F_OVERFLOW_HSIZET2OFFT(efl->slot[u].offset + skip))
+        if (H5F_OVERFLOW_HSIZET2OFFT(efl->slot[u].offset + skip))
             HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "external file address overflowed")
-        if(H5_combine_path(dset->shared->extfile_prefix, efl->slot[u].name, &full_name) < 0)
+        if (H5_combine_path(dset->shared->extfile_prefix, efl->slot[u].name, &full_name) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_NOSPACE, FAIL, "can't build external file name")
-        if((fd = HDopen(full_name, O_CREAT | O_RDWR, 0666)) < 0) {
-            if(HDaccess(full_name, F_OK) < 0)
+        if ((fd = HDopen(full_name, O_CREAT | O_RDWR, 0666)) < 0) {
+            if (HDaccess(full_name, F_OK) < 0)
                 HGOTO_ERROR(H5E_EFL, H5E_CANTOPENFILE, FAIL, "external raw data file does not exist")
             else
                 HGOTO_ERROR(H5E_EFL, H5E_CANTOPENFILE, FAIL, "unable to open external raw data file")
-            } /* end if */
-        if(HDlseek(fd, (HDoff_t)(efl->slot[u].offset + skip), SEEK_SET) < 0)
+        } /* end if */
+        if (HDlseek(fd, (HDoff_t)(efl->slot[u].offset + skip), SEEK_SET) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_SEEKERROR, FAIL, "unable to seek in external raw data file")
 #ifndef NDEBUG
         tempto_write = MIN(efl->slot[u].size - skip, (hsize_t)size);
         H5_CHECK_OVERFLOW(tempto_write, hsize_t, size_t);
         to_write = (size_t)tempto_write;
-#else /* NDEBUG */
+#else  /* NDEBUG */
         to_write = MIN((size_t)(efl->slot[u].size - skip), size);
 #endif /* NDEBUG */
-        if((size_t)HDwrite(fd, buf, to_write) != to_write)
+        if ((size_t)HDwrite(fd, buf, to_write) != to_write)
             HGOTO_ERROR(H5E_EFL, H5E_READERROR, FAIL, "write error in external raw data file")
         full_name = (char *)H5MM_xfree(full_name);
-        HDclose (fd);
+        HDclose(fd);
         fd = -1;
         size -= to_write;
         buf += to_write;
@@ -412,15 +387,14 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz
     } /* end while */
 
 done:
-    if(full_name)
+    if (full_name)
         full_name = (char *)H5MM_xfree(full_name);
-    if(fd >= 0)
+    if (fd >= 0)
         HDclose(fd);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_readvv_cb
  *
@@ -436,20 +410,19 @@ done:
 static herr_t
 H5D__efl_readvv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
 {
-    H5D_efl_readvv_ud_t *udata = (H5D_efl_readvv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_efl_readvv_ud_t *udata     = (H5D_efl_readvv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
+    herr_t               ret_value = SUCCEED;                       /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Read data */
-    if(H5D__efl_read(udata->efl, udata->dset, dst_off, len, (udata->rbuf + src_off)) < 0)
+    if (H5D__efl_read(udata->efl, udata->dset, dst_off, len, (udata->rbuf + src_off)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "EFL read failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_readvv_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_readvv
  *
@@ -466,12 +439,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__efl_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_off_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[])
+H5D__efl_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                size_t dset_len_arr[], hsize_t dset_off_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+                size_t mem_len_arr[], hsize_t mem_off_arr[])
 {
-    H5D_efl_readvv_ud_t udata;  /* User data for H5VM_opvv() operator */
-    ssize_t ret_value;          /* Return value (Total size of sequence in bytes) */
+    H5D_efl_readvv_ud_t udata;     /* User data for H5VM_opvv() operator */
+    ssize_t             ret_value; /* Return value (Total size of sequence in bytes) */
 
     FUNC_ENTER_STATIC
 
@@ -490,21 +463,19 @@ H5D__efl_readvv(const H5D_io_info_t *io_info,
     HDassert(mem_off_arr);
 
     /* Set up user data for H5VM_opvv() */
-    udata.efl = &(io_info->store->efl);
+    udata.efl  = &(io_info->store->efl);
     udata.dset = io_info->dset;
     udata.rbuf = (unsigned char *)io_info->u.rbuf;
 
     /* Call generic sequence operation routine */
-    if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr,
-            mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-            H5D__efl_readvv_cb, &udata)) < 0)
+    if ((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq,
+                               mem_curr_seq, mem_len_arr, mem_off_arr, H5D__efl_readvv_cb, &udata)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized EFL read")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_readvv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_writevv_cb
  *
@@ -520,20 +491,19 @@ done:
 static herr_t
 H5D__efl_writevv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
 {
-    H5D_efl_writevv_ud_t *udata = (H5D_efl_writevv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_efl_writevv_ud_t *udata     = (H5D_efl_writevv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
+    herr_t                ret_value = SUCCEED;                        /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Write data */
-    if(H5D__efl_write(udata->efl, udata->dset, dst_off, len, (udata->wbuf + src_off)) < 0)
+    if (H5D__efl_write(udata->efl, udata->dset, dst_off, len, (udata->wbuf + src_off)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "EFL write failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_writevv_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_writevv
  *
@@ -550,12 +520,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__efl_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_off_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[])
+H5D__efl_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                 size_t dset_len_arr[], hsize_t dset_off_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+                 size_t mem_len_arr[], hsize_t mem_off_arr[])
 {
-    H5D_efl_writevv_ud_t udata;  /* User data for H5VM_opvv() operator */
-    ssize_t ret_value;          /* Return value (Total size of sequence in bytes) */
+    H5D_efl_writevv_ud_t udata;     /* User data for H5VM_opvv() operator */
+    ssize_t              ret_value; /* Return value (Total size of sequence in bytes) */
 
     FUNC_ENTER_STATIC
 
@@ -574,20 +544,18 @@ H5D__efl_writevv(const H5D_io_info_t *io_info,
     HDassert(mem_off_arr);
 
     /* Set up user data for H5VM_opvv() */
-    udata.efl = &(io_info->store->efl);
+    udata.efl  = &(io_info->store->efl);
     udata.dset = io_info->dset;
     udata.wbuf = (const unsigned char *)io_info->u.wbuf;
 
     /* Call generic sequence operation routine */
-    if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr,
-            mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-            H5D__efl_writevv_cb, &udata)) < 0)
+    if ((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq,
+                               mem_curr_seq, mem_len_arr, mem_off_arr, H5D__efl_writevv_cb, &udata)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized EFL write")
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_writevv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__efl_bh_info
  *
@@ -604,7 +572,7 @@ done:
 herr_t
 H5D__efl_bh_info(H5F_t *f, hid_t dxpl_id, H5O_efl_t *efl, hsize_t *heap_size)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -615,7 +583,7 @@ H5D__efl_bh_info(H5F_t *f, hid_t dxpl_id, H5O_efl_t *efl, hsize_t *heap_size)
     HDassert(heap_size);
 
     /* Get the size of the local heap for EFL's file list */
-    if(H5HL_heapsize(f, dxpl_id, efl->heap_addr, heap_size) < 0)
+    if (H5HL_heapsize(f, dxpl_id, efl->heap_addr, heap_size) < 0)
         HGOTO_ERROR(H5E_EFL, H5E_CANTINIT, FAIL, "unable to retrieve local heap info")
 
 done:
diff --git a/src/H5Dfill.c b/src/H5Dfill.c
index e0dde69..92cb96c 100644
--- a/src/H5Dfill.c
+++ b/src/H5Dfill.c
@@ -26,42 +26,37 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5VMprivate.h"		/* Vector and array functions		*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Dataset functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5VMprivate.h" /* Vector and array functions		*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static herr_t H5D__fill_release(H5D_fill_buf_info_t *fb_info);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -69,12 +64,10 @@ static herr_t H5D__fill_release(H5D_fill_buf_info_t *fb_info);
 /* Declare extern the free list to manage blocks of type conversion data */
 H5FL_BLK_EXTERN(type_conv);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -85,7 +78,6 @@ H5FL_BLK_DEFINE_STATIC(non_zero_fill);
 /* Declare the free list to manage blocks of zero fill-value data */
 H5FL_BLK_DEFINE_STATIC(zero_fill);
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Dfill
@@ -121,24 +113,23 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_
     H5TRACE5("e", "*xi*xii", fill, fill_type_id, buf, buf_type_id, space_id);
 
     /* Check args */
-    if(buf == NULL)
+    if (buf == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a dataspace")
-    if(NULL == (fill_type = (H5T_t *)H5I_object_verify(fill_type_id, H5I_DATATYPE)))
+    if (NULL == (fill_type = (H5T_t *)H5I_object_verify(fill_type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype")
-    if(NULL == (buf_type = (H5T_t *)H5I_object_verify(buf_type_id, H5I_DATATYPE)))
+    if (NULL == (buf_type = (H5T_t *)H5I_object_verify(buf_type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype")
 
     /* Fill the selection in the memory buffer */
-    if(H5D__fill(fill, fill_type, buf, buf_type, space, H5AC_ind_dxpl_id) < 0)
+    if (H5D__fill(fill, fill_type, buf, buf_type, space, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTENCODE, FAIL, "filling selection failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Dfill() */
+} /* H5Dfill() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5D__fill
@@ -168,18 +159,18 @@ done:
     on each element so that each of them has a copy of the VL data.
 --------------------------------------------------------------------------*/
 herr_t
-H5D__fill(const void *fill, const H5T_t *fill_type, void *buf,
-    const H5T_t *buf_type, const H5S_t *space, hid_t dxpl_id)
+H5D__fill(const void *fill, const H5T_t *fill_type, void *buf, const H5T_t *buf_type, const H5S_t *space,
+          hid_t dxpl_id)
 {
-    H5WB_t  *elem_wb = NULL;    /* Wrapped buffer for element data */
-    uint8_t elem_buf[H5T_ELEM_BUF_SIZE]; /* Buffer for element data */
-    H5WB_t  *bkg_elem_wb = NULL;     /* Wrapped buffer for background data */
-    uint8_t bkg_elem_buf[H5T_ELEM_BUF_SIZE]; /* Buffer for background data */
-    uint8_t *bkg_buf = NULL;    /* Background conversion buffer */
-    uint8_t *tmp_buf = NULL;    /* Temp conversion buffer */
-    hid_t src_id = -1, dst_id = -1;     /* Temporary type IDs */
-    size_t dst_type_size;       /* Size of destination type*/
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5WB_t * elem_wb = NULL;                  /* Wrapped buffer for element data */
+    uint8_t  elem_buf[H5T_ELEM_BUF_SIZE];     /* Buffer for element data */
+    H5WB_t * bkg_elem_wb = NULL;              /* Wrapped buffer for background data */
+    uint8_t  bkg_elem_buf[H5T_ELEM_BUF_SIZE]; /* Buffer for background data */
+    uint8_t *bkg_buf = NULL;                  /* Background conversion buffer */
+    uint8_t *tmp_buf = NULL;                  /* Temp conversion buffer */
+    hid_t    src_id = -1, dst_id = -1;        /* Temporary type IDs */
+    size_t   dst_type_size;                   /* Size of destination type*/
+    herr_t   ret_value = SUCCEED;             /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -190,32 +181,32 @@ H5D__fill(const void *fill, const H5T_t *fill_type, void *buf,
     HDassert(space);
 
     /* Make sure the dataspace has an extent set (or is NULL) */
-    if(!(H5S_has_extent(space)))
+    if (!(H5S_has_extent(space)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspace extent has not been set")
 
     /* Get the memory datatype size */
     dst_type_size = H5T_get_size(buf_type);
 
     /* If there's no fill value, just use zeros */
-    if(fill == NULL) {
-        void *elem_ptr;         /* Pointer to element to use for fill value */
+    if (fill == NULL) {
+        void *elem_ptr; /* Pointer to element to use for fill value */
 
         /* Wrap the local buffer for elements */
-        if(NULL == (elem_wb = H5WB_wrap(elem_buf, sizeof(elem_buf))))
+        if (NULL == (elem_wb = H5WB_wrap(elem_buf, sizeof(elem_buf))))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for element */
-        if(NULL == (elem_ptr = H5WB_actual_clear(elem_wb, dst_type_size)))
+        if (NULL == (elem_ptr = H5WB_actual_clear(elem_wb, dst_type_size)))
             HGOTO_ERROR(H5E_DATASET, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Fill the selection in the memory buffer */
-        if(H5S_select_fill(elem_ptr, dst_type_size, space, buf) < 0)
+        if (H5S_select_fill(elem_ptr, dst_type_size, space, buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTENCODE, FAIL, "filling selection failed")
     } /* end if */
     else {
-        H5T_path_t *tpath;      /* Conversion path information */
-        size_t src_type_size;   /* Size of source type	*/
-        size_t buf_size;        /* Desired buffer size	*/
+        H5T_path_t *tpath;         /* Conversion path information */
+        size_t      src_type_size; /* Size of source type	*/
+        size_t      buf_size;      /* Desired buffer size	*/
 
         /* Get the file datatype size */
         src_type_size = H5T_get_size(fill_type);
@@ -224,15 +215,15 @@ H5D__fill(const void *fill, const H5T_t *fill_type, void *buf,
         buf_size = MAX(src_type_size, dst_type_size);
 
         /* Set up type conversion function */
-        if(NULL == (tpath = H5T_path_find(fill_type, buf_type, NULL, NULL, dxpl_id, FALSE)))
+        if (NULL == (tpath = H5T_path_find(fill_type, buf_type, NULL, NULL, dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
 
         /* Construct source & destination datatype IDs, if we will need them */
-        if(!H5T_path_noop(tpath)) {
-            if((src_id = H5I_register(H5I_DATATYPE, H5T_copy(fill_type, H5T_COPY_ALL), FALSE)) < 0)
+        if (!H5T_path_noop(tpath)) {
+            if ((src_id = H5I_register(H5I_DATATYPE, H5T_copy(fill_type, H5T_COPY_ALL), FALSE)) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
 
-            if((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(buf_type, H5T_COPY_ALL), FALSE)) < 0)
+            if ((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(buf_type, H5T_COPY_ALL), FALSE)) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
         } /* end if */
 
@@ -240,11 +231,11 @@ H5D__fill(const void *fill, const H5T_t *fill_type, void *buf,
          * then do conversion on each element so that each of them has a copy
          * of the VL data.
          */
-        if(TRUE == H5T_detect_class(fill_type, H5T_VLEN, FALSE)) {
-            H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-            H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-            H5S_sel_iter_t mem_iter;            /* Memory selection iteration info */
-            hssize_t nelmts;                    /* Number of data elements */
+        if (TRUE == H5T_detect_class(fill_type, H5T_VLEN, FALSE)) {
+            H5D_dxpl_cache_t  _dxpl_cache;               /* Data transfer property cache buffer */
+            H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
+            H5S_sel_iter_t    mem_iter;                  /* Memory selection iteration info */
+            hssize_t          nelmts;                    /* Number of data elements */
 
             /* Get the number of elements in the selection */
             nelmts = H5S_GET_SELECT_NPOINTS(space);
@@ -252,52 +243,55 @@ H5D__fill(const void *fill, const H5T_t *fill_type, void *buf,
             H5_CHECK_OVERFLOW(nelmts, hssize_t, size_t);
 
             /* Allocate a temporary buffer */
-            if(NULL == (tmp_buf = H5FL_BLK_MALLOC(type_conv, (size_t)nelmts * buf_size)))
+            if (NULL == (tmp_buf = H5FL_BLK_MALLOC(type_conv, (size_t)nelmts * buf_size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Allocate a background buffer, if necessary */
-            if(H5T_path_bkg(tpath) && NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, (size_t)nelmts * buf_size)))
+            if (H5T_path_bkg(tpath) &&
+                NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, (size_t)nelmts * buf_size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Replicate the file's fill value into the temporary buffer */
             H5VM_array_fill(tmp_buf, fill, src_type_size, (size_t)nelmts);
 
             /* Convert from file's fill value into memory form */
-            if(H5T_convert(tpath, src_id, dst_id, (size_t)nelmts, (size_t)0, (size_t)0, tmp_buf, bkg_buf, dxpl_id) < 0)
+            if (H5T_convert(tpath, src_id, dst_id, (size_t)nelmts, (size_t)0, (size_t)0, tmp_buf, bkg_buf,
+                            dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "data type conversion failed")
 
             /* Fill the DXPL cache values for later use */
-            if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+            if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
             /* Create a selection iterator for scattering the elements to memory buffer */
-            if(H5S_select_iter_init(&mem_iter, space, dst_type_size) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
+            if (H5S_select_iter_init(&mem_iter, space, dst_type_size) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                            "unable to initialize memory selection information")
 
             /* Scatter the data into memory */
-            if(H5D__scatter_mem(tmp_buf, space, &mem_iter, (size_t)nelmts, dxpl_cache, buf/*out*/) < 0) {
+            if (H5D__scatter_mem(tmp_buf, space, &mem_iter, (size_t)nelmts, dxpl_cache, buf /*out*/) < 0) {
                 H5S_SELECT_ITER_RELEASE(&mem_iter);
                 HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "scatter failed")
             } /* end if */
 
             /* Release the selection iterator */
-            if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+            if (H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
         } /* end if */
         else {
-            const uint8_t *fill_buf;          /* Buffer to use for writing fill values */
+            const uint8_t *fill_buf; /* Buffer to use for writing fill values */
 
             /* Convert disk buffer into memory buffer */
-            if(!H5T_path_noop(tpath)) {
-                void *elem_ptr;         /* Pointer to element to use for fill value */
-                void *bkg_ptr = NULL;   /* Pointer to background element to use for fill value */
+            if (!H5T_path_noop(tpath)) {
+                void *elem_ptr;       /* Pointer to element to use for fill value */
+                void *bkg_ptr = NULL; /* Pointer to background element to use for fill value */
 
                 /* Wrap the local buffer for elements */
-                if(NULL == (elem_wb = H5WB_wrap(elem_buf, sizeof(elem_buf))))
+                if (NULL == (elem_wb = H5WB_wrap(elem_buf, sizeof(elem_buf))))
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
                 /* Get a pointer to a buffer that's large enough for element */
-                if(NULL == (elem_ptr = H5WB_actual(elem_wb, buf_size)))
+                if (NULL == (elem_ptr = H5WB_actual(elem_wb, buf_size)))
                     HGOTO_ERROR(H5E_DATASET, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
                 /* Copy the user's data into the buffer for conversion */
@@ -305,18 +299,19 @@ H5D__fill(const void *fill, const H5T_t *fill_type, void *buf,
 
                 /* If there's no VL type of data, do conversion first then fill the data into
                  * the memory buffer. */
-                if(H5T_path_bkg(tpath)) {
+                if (H5T_path_bkg(tpath)) {
                     /* Wrap the local buffer for background elements */
-                    if(NULL == (bkg_elem_wb = H5WB_wrap(bkg_elem_buf, sizeof(bkg_elem_buf))))
+                    if (NULL == (bkg_elem_wb = H5WB_wrap(bkg_elem_buf, sizeof(bkg_elem_buf))))
                         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
                     /* Get a pointer to a buffer that's large enough for element */
-                    if(NULL == (bkg_ptr = H5WB_actual_clear(bkg_elem_wb, buf_size)))
+                    if (NULL == (bkg_ptr = H5WB_actual_clear(bkg_elem_wb, buf_size)))
                         HGOTO_ERROR(H5E_DATASET, H5E_NOSPACE, FAIL, "can't get actual buffer")
                 } /* end if */
 
                 /* Perform datatype conversion */
-                if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, elem_ptr, bkg_ptr, dxpl_id) < 0)
+                if (H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, elem_ptr, bkg_ptr,
+                                dxpl_id) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "data type conversion failed")
 
                 /* Point at element buffer */
@@ -326,29 +321,28 @@ H5D__fill(const void *fill, const H5T_t *fill_type, void *buf,
                 fill_buf = (const uint8_t *)fill;
 
             /* Fill the selection in the memory buffer */
-            if(H5S_select_fill(fill_buf, dst_type_size, space, buf) < 0)
+            if (H5S_select_fill(fill_buf, dst_type_size, space, buf) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTENCODE, FAIL, "filling selection failed")
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
-    if(src_id != (-1) && H5I_dec_ref(src_id) < 0)
+    if (src_id != (-1) && H5I_dec_ref(src_id) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(dst_id != (-1) && H5I_dec_ref(dst_id) < 0)
+    if (dst_id != (-1) && H5I_dec_ref(dst_id) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    if(tmp_buf)
+    if (tmp_buf)
         tmp_buf = H5FL_BLK_FREE(type_conv, tmp_buf);
-    if(elem_wb && H5WB_unwrap(elem_wb) < 0)
+    if (elem_wb && H5WB_unwrap(elem_wb) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
-    if(bkg_elem_wb && H5WB_unwrap(bkg_elem_wb) < 0)
+    if (bkg_elem_wb && H5WB_unwrap(bkg_elem_wb) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
-    if(bkg_buf)
+    if (bkg_buf)
         bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__fill() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__fill_init
  *
@@ -362,13 +356,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
-    H5MM_allocate_t alloc_func, void *alloc_info,
-    H5MM_free_t free_func, void *free_info,
-    const H5O_fill_t *fill, const H5T_t *dset_type, hid_t dset_type_id,
-    size_t total_nelmts, size_t max_buf_size, hid_t dxpl_id)
+H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, H5MM_allocate_t alloc_func,
+               void *alloc_info, H5MM_free_t free_func, void *free_info, const H5O_fill_t *fill,
+               const H5T_t *dset_type, hid_t dset_type_id, size_t total_nelmts, size_t max_buf_size,
+               hid_t dxpl_id)
 {
-    herr_t	ret_value = SUCCEED;	/* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -382,29 +375,29 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
     HDmemset(fb_info, 0, sizeof(*fb_info));
 
     /* Cache constant information from the dataset */
-    fb_info->fill = fill;
-    fb_info->file_type = dset_type;
-    fb_info->file_tid = dset_type_id;
+    fb_info->fill            = fill;
+    fb_info->file_type       = dset_type;
+    fb_info->file_tid        = dset_type_id;
     fb_info->fill_alloc_func = alloc_func;
     fb_info->fill_alloc_info = alloc_info;
-    fb_info->fill_free_func = free_func;
-    fb_info->fill_free_info = free_info;
+    fb_info->fill_free_func  = free_func;
+    fb_info->fill_free_info  = free_info;
 
     /* Fill the buffer with the user's fill value */
-    if(fill->buf) {
-        htri_t has_vlen_type;   /* Whether the datatype has a VL component */
+    if (fill->buf) {
+        htri_t has_vlen_type; /* Whether the datatype has a VL component */
 
         /* Detect whether the datatype has a VL component */
-        if((has_vlen_type = H5T_detect_class(dset_type, H5T_VLEN, FALSE)) < 0)
+        if ((has_vlen_type = H5T_detect_class(dset_type, H5T_VLEN, FALSE)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "unable to detect vlen datatypes?")
         fb_info->has_vlen_fill_type = (hbool_t)has_vlen_type;
 
         /* If necessary, convert fill value datatypes (which copies VL components, etc.) */
-        if(fb_info->has_vlen_fill_type) {
+        if (fb_info->has_vlen_fill_type) {
             /* Create temporary datatype for conversion operation */
-            if(NULL == (fb_info->mem_type = H5T_copy(dset_type, H5T_COPY_REOPEN)))
+            if (NULL == (fb_info->mem_type = H5T_copy(dset_type, H5T_COPY_REOPEN)))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to copy file datatype")
-            if((fb_info->mem_tid = H5I_register(H5I_DATATYPE, fb_info->mem_type, FALSE)) < 0)
+            if ((fb_info->mem_tid = H5I_register(H5I_DATATYPE, fb_info->mem_type, FALSE)) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register memory datatype")
 
             /* Retrieve sizes of memory & file datatypes */
@@ -417,7 +410,7 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
             fb_info->max_elmt_size = MAX(fb_info->mem_elmt_size, fb_info->file_elmt_size);
 
             /* Compute the number of elements that fit within a buffer to write */
-            if(total_nelmts > 0)
+            if (total_nelmts > 0)
                 fb_info->elmts_per_buf = MIN(total_nelmts, MAX(1, (max_buf_size / fb_info->max_elmt_size)));
             else
                 fb_info->elmts_per_buf = max_buf_size / fb_info->max_elmt_size;
@@ -427,48 +420,52 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
             fb_info->fill_buf_size = MIN(max_buf_size, (fb_info->elmts_per_buf * fb_info->max_elmt_size));
 
             /* Allocate fill buffer */
-            if(caller_fill_buf) {
-                fb_info->fill_buf = caller_fill_buf;
+            if (caller_fill_buf) {
+                fb_info->fill_buf            = caller_fill_buf;
                 fb_info->use_caller_fill_buf = TRUE;
             } /* end if */
             else {
-                if(alloc_func)
+                if (alloc_func)
                     fb_info->fill_buf = alloc_func(fb_info->fill_buf_size, alloc_info);
                 else
                     fb_info->fill_buf = H5FL_BLK_MALLOC(non_zero_fill, fb_info->fill_buf_size);
-                if(NULL == fb_info->fill_buf)
+                if (NULL == fb_info->fill_buf)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fill buffer")
             } /* end else */
 
             /* Get the datatype conversion path for this operation */
-            if(NULL == (fb_info->fill_to_mem_tpath = H5T_path_find(dset_type, fb_info->mem_type, NULL, NULL, dxpl_id, FALSE)))
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert between src and dst datatypes")
+            if (NULL == (fb_info->fill_to_mem_tpath =
+                             H5T_path_find(dset_type, fb_info->mem_type, NULL, NULL, dxpl_id, FALSE)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+                            "unable to convert between src and dst datatypes")
 
             /* Get the inverse datatype conversion path for this operation */
-            if(NULL == (fb_info->mem_to_dset_tpath = H5T_path_find(fb_info->mem_type, dset_type, NULL, NULL, dxpl_id, FALSE)))
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert between src and dst datatypes")
+            if (NULL == (fb_info->mem_to_dset_tpath =
+                             H5T_path_find(fb_info->mem_type, dset_type, NULL, NULL, dxpl_id, FALSE)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+                            "unable to convert between src and dst datatypes")
 
             /* Check if we need to allocate a background buffer */
-            if(H5T_path_bkg(fb_info->fill_to_mem_tpath) || H5T_path_bkg(fb_info->mem_to_dset_tpath)) {
+            if (H5T_path_bkg(fb_info->fill_to_mem_tpath) || H5T_path_bkg(fb_info->mem_to_dset_tpath)) {
                 /* Check for inverse datatype conversion needing a background buffer */
                 /* (do this first, since it needs a larger buffer) */
-                if(H5T_path_bkg(fb_info->mem_to_dset_tpath))
+                if (H5T_path_bkg(fb_info->mem_to_dset_tpath))
                     fb_info->bkg_buf_size = fb_info->elmts_per_buf * fb_info->max_elmt_size;
                 else
                     fb_info->bkg_buf_size = fb_info->max_elmt_size;
 
                 /* Allocate the background buffer */
-                if(NULL == (fb_info->bkg_buf = H5FL_BLK_MALLOC(type_conv, fb_info->bkg_buf_size)))
+                if (NULL == (fb_info->bkg_buf = H5FL_BLK_MALLOC(type_conv, fb_info->bkg_buf_size)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else {
             /* If fill value is not library default, use it to set the element size */
             HDassert(fill->size >= 0);
             fb_info->max_elmt_size = fb_info->file_elmt_size = fb_info->mem_elmt_size = (size_t)fill->size;
 
             /* Compute the number of elements that fit within a buffer to write */
-            if(total_nelmts > 0)
+            if (total_nelmts > 0)
                 fb_info->elmts_per_buf = MIN(total_nelmts, MAX(1, (max_buf_size / fb_info->max_elmt_size)));
             else
                 fb_info->elmts_per_buf = max_buf_size / fb_info->max_elmt_size;
@@ -478,30 +475,30 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
             fb_info->fill_buf_size = MIN(max_buf_size, fb_info->elmts_per_buf * fb_info->max_elmt_size);
 
             /* Allocate temporary buffer */
-            if(caller_fill_buf) {
-                fb_info->fill_buf = caller_fill_buf;
+            if (caller_fill_buf) {
+                fb_info->fill_buf            = caller_fill_buf;
                 fb_info->use_caller_fill_buf = TRUE;
             } /* end if */
             else {
-                if(alloc_func)
+                if (alloc_func)
                     fb_info->fill_buf = alloc_func(fb_info->fill_buf_size, alloc_info);
                 else
                     fb_info->fill_buf = H5FL_BLK_MALLOC(non_zero_fill, fb_info->fill_buf_size);
-                if(NULL == fb_info->fill_buf)
+                if (NULL == fb_info->fill_buf)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fill buffer")
             } /* end else */
 
             /* Replicate the fill value into the cached buffer */
             H5VM_array_fill(fb_info->fill_buf, fill->buf, fb_info->max_elmt_size, fb_info->elmts_per_buf);
-        } /* end else */
-    } /* end if */
-    else {      /* Fill the buffer with the default fill value */
+        }  /* end else */
+    }      /* end if */
+    else { /* Fill the buffer with the default fill value */
         /* Retrieve size of elements */
         fb_info->max_elmt_size = fb_info->file_elmt_size = fb_info->mem_elmt_size = H5T_get_size(dset_type);
         HDassert(fb_info->max_elmt_size > 0);
 
         /* Compute the number of elements that fit within a buffer to write */
-        if(total_nelmts > 0)
+        if (total_nelmts > 0)
             fb_info->elmts_per_buf = MIN(total_nelmts, MAX(1, (max_buf_size / fb_info->max_elmt_size)));
         else
             fb_info->elmts_per_buf = max_buf_size / fb_info->max_elmt_size;
@@ -511,43 +508,44 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
         fb_info->fill_buf_size = MIN(max_buf_size, (fb_info->elmts_per_buf * fb_info->max_elmt_size));
 
         /* Use (and zero) caller's buffer, if provided */
-        if(caller_fill_buf) {
-            fb_info->fill_buf = caller_fill_buf;
+        if (caller_fill_buf) {
+            fb_info->fill_buf            = caller_fill_buf;
             fb_info->use_caller_fill_buf = TRUE;
 
             HDmemset(fb_info->fill_buf, 0, fb_info->fill_buf_size);
         } /* end if */
         else {
-            if(alloc_func) {
+            if (alloc_func) {
                 fb_info->fill_buf = alloc_func(fb_info->fill_buf_size, alloc_info);
 
                 HDmemset(fb_info->fill_buf, 0, fb_info->fill_buf_size);
             } /* end if */
             else {
-                htri_t buf_avail = H5FL_BLK_AVAIL(zero_fill, fb_info->fill_buf_size);  /* Check if there is an already zeroed out buffer available */
+                htri_t buf_avail = H5FL_BLK_AVAIL(
+                    zero_fill,
+                    fb_info->fill_buf_size); /* Check if there is an already zeroed out buffer available */
                 HDassert(buf_avail != FAIL);
 
                 /* Allocate temporary buffer (zeroing it if no buffer is available) */
-                if(!buf_avail)
+                if (!buf_avail)
                     fb_info->fill_buf = H5FL_BLK_CALLOC(zero_fill, fb_info->fill_buf_size);
                 else
                     fb_info->fill_buf = H5FL_BLK_MALLOC(zero_fill, fb_info->fill_buf_size);
             } /* end else */
-            if(fb_info->fill_buf == NULL)
+            if (fb_info->fill_buf == NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fill buffer")
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
     /* Cleanup on error */
-    if(ret_value < 0)
-        if(H5D__fill_term(fb_info) < 0)
+    if (ret_value < 0)
+        if (H5D__fill_term(fb_info) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release fill buffer info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__fill_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__fill_refill_vl
  *
@@ -563,8 +561,8 @@ done:
 herr_t
 H5D__fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts, hid_t dxpl_id)
 {
-    herr_t	ret_value = SUCCEED;	/* Return value */
-    void * buf = NULL;              /* Temporary fill buffer */
+    herr_t ret_value = SUCCEED; /* Return value */
+    void * buf       = NULL;    /* Temporary fill buffer */
 
     FUNC_ENTER_PACKAGE
 
@@ -577,49 +575,52 @@ H5D__fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts, hid_t dxpl_id)
     HDmemcpy(fb_info->fill_buf, fb_info->fill->buf, fb_info->file_elmt_size);
 
     /* Reset first element of background buffer, if necessary */
-    if(H5T_path_bkg(fb_info->fill_to_mem_tpath))
+    if (H5T_path_bkg(fb_info->fill_to_mem_tpath))
         HDmemset(fb_info->bkg_buf, 0, fb_info->max_elmt_size);
 
     /* Type convert the dataset buffer, to copy any VL components */
-    if(H5T_convert(fb_info->fill_to_mem_tpath, fb_info->file_tid, fb_info->mem_tid, (size_t)1, (size_t)0, (size_t)0, fb_info->fill_buf, fb_info->bkg_buf, dxpl_id) < 0)
+    if (H5T_convert(fb_info->fill_to_mem_tpath, fb_info->file_tid, fb_info->mem_tid, (size_t)1, (size_t)0,
+                    (size_t)0, fb_info->fill_buf, fb_info->bkg_buf, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "data type conversion failed")
 
     /* Replicate the fill value into the cached buffer */
-    if(nelmts > 1)
-        H5VM_array_fill((void *)((unsigned char *)fb_info->fill_buf + fb_info->mem_elmt_size), fb_info->fill_buf, fb_info->mem_elmt_size, (nelmts - 1));
+    if (nelmts > 1)
+        H5VM_array_fill((void *)((unsigned char *)fb_info->fill_buf + fb_info->mem_elmt_size),
+                        fb_info->fill_buf, fb_info->mem_elmt_size, (nelmts - 1));
 
     /* Reset the entire background buffer, if necessary */
-    if(H5T_path_bkg(fb_info->mem_to_dset_tpath))
+    if (H5T_path_bkg(fb_info->mem_to_dset_tpath))
         HDmemset(fb_info->bkg_buf, 0, fb_info->bkg_buf_size);
 
     /* Make a copy of the fill buffer so we can free dynamic elements after conversion */
-    if(fb_info->fill_alloc_func)
+    if (fb_info->fill_alloc_func)
         buf = fb_info->fill_alloc_func(fb_info->fill_buf_size, fb_info->fill_alloc_info);
     else
         buf = H5FL_BLK_MALLOC(non_zero_fill, fb_info->fill_buf_size);
-    if(!buf)
+    if (!buf)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "memory allocation failed for temporary fill buffer")
 
     HDmemcpy(buf, fb_info->fill_buf, fb_info->fill_buf_size);
 
     /* Type convert the dataset buffer, to copy any VL components */
-    if(H5T_convert(fb_info->mem_to_dset_tpath, fb_info->mem_tid, fb_info->file_tid, nelmts, (size_t)0, (size_t)0, fb_info->fill_buf, fb_info->bkg_buf, dxpl_id) < 0)
+    if (H5T_convert(fb_info->mem_to_dset_tpath, fb_info->mem_tid, fb_info->file_tid, nelmts, (size_t)0,
+                    (size_t)0, fb_info->fill_buf, fb_info->bkg_buf, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "data type conversion failed")
 
 done:
-    if(buf) {
+    if (buf) {
         /* Free dynamically allocated VL elements in fill buffer */
-        if(fb_info->fill->type) {
-            if(H5T_vlen_reclaim_elmt(buf, fb_info->fill->type, dxpl_id) < 0)
+        if (fb_info->fill->type) {
+            if (H5T_vlen_reclaim_elmt(buf, fb_info->fill->type, dxpl_id) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't reclaim vlen element")
         } /* end if */
         else {
-            if(H5T_vlen_reclaim_elmt(buf, fb_info->mem_type, dxpl_id) < 0)
+            if (H5T_vlen_reclaim_elmt(buf, fb_info->mem_type, dxpl_id) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't reclaim vlen element")
         } /* end else */
 
         /* Free temporary fill buffer */
-        if(fb_info->fill_free_func)
+        if (fb_info->fill_free_func)
             fb_info->fill_free_func(buf, fb_info->fill_free_info);
         else
             buf = H5FL_BLK_FREE(non_zero_fill, buf);
@@ -628,7 +629,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__fill_refill_vl() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__fill_release
  *
@@ -651,11 +651,11 @@ H5D__fill_release(H5D_fill_buf_info_t *fb_info)
     HDassert(fb_info->fill);
 
     /* Free the buffer for fill values */
-    if(!fb_info->use_caller_fill_buf && fb_info->fill_buf) {
-        if(fb_info->fill_free_func)
+    if (!fb_info->use_caller_fill_buf && fb_info->fill_buf) {
+        if (fb_info->fill_free_func)
             fb_info->fill_free_func(fb_info->fill_buf, fb_info->fill_free_info);
         else {
-            if(fb_info->fill->buf)
+            if (fb_info->fill->buf)
                 fb_info->fill_buf = H5FL_BLK_FREE(non_zero_fill, fb_info->fill_buf);
             else
                 fb_info->fill_buf = H5FL_BLK_FREE(zero_fill, fb_info->fill_buf);
@@ -666,7 +666,6 @@ H5D__fill_release(H5D_fill_buf_info_t *fb_info)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__fill_release() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__fill_term
  *
@@ -691,15 +690,14 @@ H5D__fill_term(H5D_fill_buf_info_t *fb_info)
     H5D__fill_release(fb_info);
 
     /* Free other resources for vlen fill values */
-    if(fb_info->has_vlen_fill_type) {
-        if(fb_info->mem_tid > 0)
+    if (fb_info->has_vlen_fill_type) {
+        if (fb_info->mem_tid > 0)
             H5I_dec_ref(fb_info->mem_tid);
-        else if(fb_info->mem_type)
+        else if (fb_info->mem_type)
             H5T_close(fb_info->mem_type);
-        if(fb_info->bkg_buf)
+        if (fb_info->bkg_buf)
             fb_info->bkg_buf = H5FL_BLK_FREE(type_conv, fb_info->bkg_buf);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__fill_term() */
-
diff --git a/src/H5Dint.c b/src/H5Dint.c
index bcd0dfb..d0c6488 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -15,60 +15,51 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE        /*suppress error about including H5Dpkg      */
+#define H5D_PACKAGE /*suppress error about including H5Dpkg      */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5D__init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5D__init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Dpkg.h"        /* Datasets                 */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5FLprivate.h"    /* Free Lists                           */
-#include "H5FOprivate.h"        /* File objects                         */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5Lprivate.h"        /* Links                  */
-#include "H5MMprivate.h"    /* Memory management            */
-
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Dpkg.h"      /* Datasets                 */
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5FOprivate.h" /* File objects                         */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5Lprivate.h"  /* Links                  */
+#include "H5MMprivate.h" /* Memory management            */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Struct for holding callback info during H5D_flush operation */
 typedef struct {
-    const H5F_t *f;             /* Pointer to file being flushed */
-    hid_t dxpl_id;              /* DXPL for I/O operations */
+    const H5F_t *f;       /* Pointer to file being flushed */
+    hid_t        dxpl_id; /* DXPL for I/O operations */
 } H5D_flush_ud_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* General stuff */
-static herr_t H5D__get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache);
-static H5D_shared_t *H5D__new(hid_t dcpl_id, hid_t dapl_id, hbool_t creating,
-    hbool_t vl_type);
-static herr_t H5D__init_type(H5F_t *file, const H5D_t *dset, hid_t type_id,
-    const H5T_t *type);
-static herr_t H5D__init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space);
-static herr_t H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset,
-    hid_t dapl_id);
-static herr_t H5D_build_extfile_prefix(const H5D_t *dset, hid_t dapl_id,
-    char **extfile_prefix);
-static herr_t H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id);
-static herr_t H5D__init_storage(const H5D_t *dataset, hbool_t full_overwrite,
-    hsize_t old_dim[], hid_t dxpl_id);
-
+static herr_t        H5D__get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache);
+static H5D_shared_t *H5D__new(hid_t dcpl_id, hid_t dapl_id, hbool_t creating, hbool_t vl_type);
+static herr_t        H5D__init_type(H5F_t *file, const H5D_t *dset, hid_t type_id, const H5T_t *type);
+static herr_t        H5D__init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space);
+static herr_t        H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id);
+static herr_t        H5D_build_extfile_prefix(const H5D_t *dset, hid_t dapl_id, char **extfile_prefix);
+static herr_t        H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id);
+static herr_t        H5D__init_storage(const H5D_t *dataset, hbool_t full_overwrite, hsize_t old_dim[],
+                                       hid_t dxpl_id);
 
 /*********************/
 /* Package Variables */
@@ -83,12 +74,10 @@ H5FL_BLK_DEFINE(vlen_vl_buf);
 /* Declare a free list to manage other blocks of VL data */
 H5FL_BLK_DEFINE(vlen_fl_buf);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -114,14 +103,12 @@ H5_GCC_DIAG_ON("larger-than=")
 
 /* Dataset ID class */
 static const H5I_class_t H5I_DATASET_CLS[1] = {{
-    H5I_DATASET,        /* ID class value */
-    H5I_CLASS_REUSE_IDS,    /* Class flags */
-    0,                /* # of reserved IDs for class */
-    (H5I_free_t)H5D_close       /* Callback routine for closing objects of this class */
+    H5I_DATASET,          /* ID class value */
+    H5I_CLASS_REUSE_IDS,  /* Class flags */
+    0,                    /* # of reserved IDs for class */
+    (H5I_free_t)H5D_close /* Callback routine for closing objects of this class */
 }};
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_init
  *
@@ -139,7 +126,7 @@ static const H5I_class_t H5I_DATASET_CLS[1] = {{
 herr_t
 H5D_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -148,7 +135,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_init() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5D__init_interface -- Initialize interface-specific information
@@ -167,13 +153,13 @@ NOTES
 static herr_t
 H5D__init_interface(void)
 {
-    H5P_genplist_t *def_dcpl;               /* Default Dataset Creation Property list */
-    herr_t          ret_value                = SUCCEED;   /* Return value */
+    H5P_genplist_t *def_dcpl;            /* Default Dataset Creation Property list */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Initialize the atom group for the dataset IDs */
-    if(H5I_register_type(H5I_DATASET_CLS) < 0)
+    if (H5I_register_type(H5I_DATASET_CLS) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
     /* Reset the "default dataset" information */
@@ -182,33 +168,32 @@ H5D__init_interface(void)
     /* Get the default dataset creation property list values and initialize the
      * default dataset with them.
      */
-    if(NULL == (def_dcpl = (H5P_genplist_t *)H5I_object(H5P_LST_DATASET_CREATE_ID_g)))
+    if (NULL == (def_dcpl = (H5P_genplist_t *)H5I_object(H5P_LST_DATASET_CREATE_ID_g)))
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "can't get default dataset creation property list")
 
     /* Get the default data storage layout */
-    if(H5P_get(def_dcpl, H5D_CRT_LAYOUT_NAME, &H5D_def_dset.layout) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve layout")
+    if (H5P_get(def_dcpl, H5D_CRT_LAYOUT_NAME, &H5D_def_dset.layout) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve layout")
 
     /* Get the default dataset creation properties */
-    if(H5P_get(def_dcpl, H5D_CRT_EXT_FILE_LIST_NAME, &H5D_def_dset.dcpl_cache.efl) < 0)
+    if (H5P_get(def_dcpl, H5D_CRT_EXT_FILE_LIST_NAME, &H5D_def_dset.dcpl_cache.efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve external file list")
-    if(H5P_get(def_dcpl, H5D_CRT_FILL_VALUE_NAME, &H5D_def_dset.dcpl_cache.fill) < 0)
+    if (H5P_get(def_dcpl, H5D_CRT_FILL_VALUE_NAME, &H5D_def_dset.dcpl_cache.fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve fill value")
-    if(H5P_get(def_dcpl, H5O_CRT_PIPELINE_NAME, &H5D_def_dset.dcpl_cache.pline) < 0)
+    if (H5P_get(def_dcpl, H5O_CRT_PIPELINE_NAME, &H5D_def_dset.dcpl_cache.pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve pipeline filter")
 
     /* Reset the "default DXPL cache" information */
     HDmemset(&H5D_def_dxpl_cache, 0, sizeof(H5D_dxpl_cache_t));
 
     /* Get the default DXPL cache information */
-    if(H5D__get_dxpl_cache_real(H5P_DATASET_XFER_DEFAULT, &H5D_def_dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache_real(H5P_DATASET_XFER_DEFAULT, &H5D_def_dxpl_cache) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve default DXPL info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_term_interface
  *
@@ -227,12 +212,12 @@ done:
 int
 H5D_term_interface(void)
 {
-    int    n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
-    if(H5I_nmembers(H5I_DATASET) > 0) {
+    if (H5_interface_initialize_g) {
+        if (H5I_nmembers(H5I_DATASET) > 0) {
             /* The dataset API uses the "force" flag set to true because it
              * is using the "file objects" (H5FO) API functions to track open
              * objects in the file.  Using the H5FO code means that dataset
@@ -255,9 +240,9 @@ H5D_term_interface(void)
              *
              * QAK - 5/13/03
              */
-        (void)H5I_clear_type(H5I_DATASET, TRUE, FALSE);
+            (void)H5I_clear_type(H5I_DATASET, TRUE, FALSE);
             n++; /*H5I*/
-    } /* end if */
+        }        /* end if */
         else {
             /* Close public interface */
             n += H5D__term_pub_interface();
@@ -265,19 +250,18 @@ H5D_term_interface(void)
             /* Close deprecated interface */
             n += H5D__term_deprec_interface();
 
-        /* Destroy the dataset object id group */
-        (void)H5I_dec_type_ref(H5I_DATASET);
+            /* Destroy the dataset object id group */
+            (void)H5I_dec_type_ref(H5I_DATASET);
             n++; /*H5I*/
 
-        /* Mark closed */
-        H5_interface_initialize_g = 0;
-    } /* end else */
-    } /* end if */
+            /* Mark closed */
+            H5_interface_initialize_g = 0;
+        } /* end else */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5D_term_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5D__get_dxpl_cache_real
@@ -300,8 +284,8 @@ H5D_term_interface(void)
 static herr_t
 H5D__get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache)
 {
-    H5P_genplist_t *dx_plist;   /* Data transfer property list */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *dx_plist;            /* Data transfer property list */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -309,57 +293,56 @@ H5D__get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache)
     HDassert(cache);
 
     /* Get the dataset transfer property list */
-    if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
     /* Get maximum temporary buffer size */
-    if(H5P_get(dx_plist, H5D_XFER_MAX_TEMP_BUF_NAME, &cache->max_temp_buf) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_MAX_TEMP_BUF_NAME, &cache->max_temp_buf) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve maximum temporary buffer size")
 
     /* Get temporary buffer pointer */
-    if(H5P_get(dx_plist, H5D_XFER_TCONV_BUF_NAME, &cache->tconv_buf) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_TCONV_BUF_NAME, &cache->tconv_buf) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve temporary buffer pointer")
 
     /* Get background buffer pointer */
-    if(H5P_get(dx_plist, H5D_XFER_BKGR_BUF_NAME, &cache->bkgr_buf) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_BKGR_BUF_NAME, &cache->bkgr_buf) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve background buffer pointer")
 
     /* Get background buffer type */
-    if(H5P_get(dx_plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &cache->bkgr_buf_type) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &cache->bkgr_buf_type) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve background buffer type")
 
     /* Get B-tree split ratios */
-    if(H5P_get(dx_plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &cache->btree_split_ratio) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &cache->btree_split_ratio) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve B-tree split ratios")
 
     /* Get I/O vector size */
-    if(H5P_get(dx_plist, H5D_XFER_HYPER_VECTOR_SIZE_NAME, &cache->vec_size) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_HYPER_VECTOR_SIZE_NAME, &cache->vec_size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve I/O vector size")
 
 #ifdef H5_HAVE_PARALLEL
     /* Collect Parallel I/O information for possible later use */
-    if(H5P_get(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &cache->xfer_mode) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &cache->xfer_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve parallel transfer method")
-    if(H5P_get(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &cache->coll_opt_mode) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &cache->coll_opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve collective transfer option")
 #endif /* H5_HAVE_PARALLEL */
 
     /* Get error detection properties */
-    if(H5P_get(dx_plist, H5D_XFER_EDC_NAME, &cache->err_detect) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_EDC_NAME, &cache->err_detect) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve error detection info")
 
     /* Get filter callback function */
-    if(H5P_get(dx_plist, H5D_XFER_FILTER_CB_NAME, &cache->filter_cb) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_FILTER_CB_NAME, &cache->filter_cb) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve filter callback function")
 
     /* Get the data transform property */
-    if(H5P_get(dx_plist, H5D_XFER_XFORM_NAME, &cache->data_xform_prop) < 0)
+    if (H5P_get(dx_plist, H5D_XFER_XFORM_NAME, &cache->data_xform_prop) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve data transform info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D__get_dxpl_cache_real() */
-
+} /* end H5D__get_dxpl_cache_real() */
 
 /*--------------------------------------------------------------------------
  NAME
@@ -386,7 +369,7 @@ done:
 herr_t
 H5D__get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -394,16 +377,14 @@ H5D__get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache)
     HDassert(cache);
 
     /* Check for the default DXPL */
-    if(dxpl_id==H5P_DATASET_XFER_DEFAULT)
-        *cache=&H5D_def_dxpl_cache;
-    else
-        if(H5D__get_dxpl_cache_real(dxpl_id,*cache) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't retrieve DXPL values")
+    if (dxpl_id == H5P_DATASET_XFER_DEFAULT)
+        *cache = &H5D_def_dxpl_cache;
+    else if (H5D__get_dxpl_cache_real(dxpl_id, *cache) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't retrieve DXPL values")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D__get_dxpl_cache() */
-
+} /* H5D__get_dxpl_cache() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5D__create_named
@@ -420,13 +401,12 @@ done:
  *-------------------------------------------------------------------------
  */
 H5D_t *
-H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id,
-    const H5S_t *space, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id,
-    hid_t dxpl_id)
+H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id, const H5S_t *space, hid_t lcpl_id,
+                  hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id)
 {
-    H5O_obj_create_t ocrt_info;         /* Information for object creation */
-    H5D_obj_create_t dcrt_info;         /* Information for dataset creation */
-    H5D_t       *ret_value;          /* Return value */
+    H5O_obj_create_t ocrt_info; /* Information for object creation */
+    H5D_obj_create_t dcrt_info; /* Information for dataset creation */
+    H5D_t *          ret_value; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -442,17 +422,17 @@ H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id,
 
     /* Set up dataset creation info */
     dcrt_info.type_id = type_id;
-    dcrt_info.space = space;
+    dcrt_info.space   = space;
     dcrt_info.dcpl_id = dcpl_id;
     dcrt_info.dapl_id = dapl_id;
 
     /* Set up object creation information */
     ocrt_info.obj_type = H5O_TYPE_DATASET;
     ocrt_info.crt_info = &dcrt_info;
-    ocrt_info.new_obj = NULL;
+    ocrt_info.new_obj  = NULL;
 
     /* Create the new dataset and link it to its parent group */
-    if(H5L_link_object(loc, name, &ocrt_info, lcpl_id, dapl_id, dxpl_id) < 0)
+    if (H5L_link_object(loc, name, &ocrt_info, lcpl_id, dapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to create and link to dataset")
     HDassert(ocrt_info.new_obj);
 
@@ -463,7 +443,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__create_named() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__get_space_status
  *
@@ -481,12 +460,12 @@ done:
 herr_t
 H5D__get_space_status(H5D_t *dset, H5D_space_status_t *allocation, hid_t dxpl_id)
 {
-    hsize_t     space_allocated;    /* The number of bytes allocated for chunks */
-    hssize_t    snelmts;            /* Temporary holder for number of elements in dataspace */
-    hsize_t     nelmts;             /* Number of elements in dataspace */
-    size_t      dt_size;            /* Size of datatype */
-    hsize_t     full_size;          /* The number of bytes in the dataset when fully populated */
-    herr_t      ret_value = SUCCEED;
+    hsize_t  space_allocated; /* The number of bytes allocated for chunks */
+    hssize_t snelmts;         /* Temporary holder for number of elements in dataspace */
+    hsize_t  nelmts;          /* Number of elements in dataspace */
+    size_t   dt_size;         /* Size of datatype */
+    hsize_t  full_size;       /* The number of bytes in the dataset when fully populated */
+    herr_t   ret_value = SUCCEED;
 
     FUNC_ENTER_PACKAGE
 
@@ -496,29 +475,29 @@ H5D__get_space_status(H5D_t *dset, H5D_space_status_t *allocation, hid_t dxpl_id
     HDassert(dset->shared->space);
 
     /* Get the total number of elements in dataset's dataspace */
-    if((snelmts = H5S_GET_EXTENT_NPOINTS(dset->shared->space)) < 0)
+    if ((snelmts = H5S_GET_EXTENT_NPOINTS(dset->shared->space)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve number of elements in dataspace")
     nelmts = (hsize_t)snelmts;
 
     /* Get the size of the dataset's datatype */
-    if(0 == (dt_size = H5T_GET_SIZE(dset->shared->type)))
+    if (0 == (dt_size = H5T_GET_SIZE(dset->shared->type)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve size of datatype")
 
     /* Compute the maximum size of the dataset in bytes */
     full_size = nelmts * dt_size;
 
     /* Check for overflow during multiplication */
-    if(nelmts != (full_size / dt_size))
+    if (nelmts != (full_size / dt_size))
         HGOTO_ERROR(H5E_DATASET, H5E_OVERFLOW, FAIL, "size of dataset's storage overflowed")
 
     /* Difficult to error check, since the error value is 0 and 0 is a valid value... :-/ */
-    if(H5D__get_storage_size(dset, dxpl_id, &space_allocated) < 0)
+    if (H5D__get_storage_size(dset, dxpl_id, &space_allocated) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get size of dataset's storage")
 
     /* Decide on how much of the space is allocated */
-    if(space_allocated == 0)
+    if (space_allocated == 0)
         *allocation = H5D_SPACE_STATUS_NOT_ALLOCATED;
-    else if(space_allocated == full_size)
+    else if (space_allocated == full_size)
         *allocation = H5D_SPACE_STATUS_ALLOCATED;
     else {
         /* Should only happen for chunked datasets currently */
@@ -531,7 +510,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__get_space_status() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__new
  *
@@ -549,14 +527,14 @@ done:
 static H5D_shared_t *
 H5D__new(hid_t dcpl_id, hid_t dapl_id, hbool_t creating, hbool_t vl_type)
 {
-    H5D_shared_t    *new_dset = NULL;   /* New dataset object */
-    H5P_genplist_t  *plist;             /* Property list created */
-    H5D_shared_t    *ret_value;         /* Return value */
+    H5D_shared_t *  new_dset = NULL; /* New dataset object */
+    H5P_genplist_t *plist;           /* Property list created */
+    H5D_shared_t *  ret_value;       /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Allocate new shared dataset structure */
-    if(NULL == (new_dset = H5FL_MALLOC(H5D_shared_t)))
+    if (NULL == (new_dset = H5FL_MALLOC(H5D_shared_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the default dataset information */
@@ -565,27 +543,27 @@ H5D__new(hid_t dcpl_id, hid_t dapl_id, hbool_t creating, hbool_t vl_type)
     /* If we are using the default dataset creation property list, during creation
      * don't bother to copy it, just increment the reference count
      */
-    if(!vl_type && creating && dcpl_id == H5P_DATASET_CREATE_DEFAULT) {
-        if(H5I_inc_ref(dcpl_id, FALSE) < 0)
+    if (!vl_type && creating && dcpl_id == H5P_DATASET_CREATE_DEFAULT) {
+        if (H5I_inc_ref(dcpl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, NULL, "can't increment default DCPL ID")
         new_dset->dcpl_id = dcpl_id;
     } /* end if */
     else {
         /* Get the property list */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list")
 
         new_dset->dcpl_id = H5P_copy_plist(plist, FALSE);
     } /* end else */
 
-    if(!vl_type && creating && dapl_id == H5P_DATASET_ACCESS_DEFAULT) {
-        if(H5I_inc_ref(dapl_id, FALSE) < 0)
+    if (!vl_type && creating && dapl_id == H5P_DATASET_ACCESS_DEFAULT) {
+        if (H5I_inc_ref(dapl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, NULL, "can't increment default DAPL ID")
         new_dset->dapl_id = dapl_id;
     } /* end if */
     else {
         /* Get the property list */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(dapl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(dapl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list")
 
         new_dset->dapl_id = H5P_copy_plist(plist, FALSE);
@@ -595,11 +573,11 @@ H5D__new(hid_t dcpl_id, hid_t dapl_id, hbool_t creating, hbool_t vl_type)
     ret_value = new_dset;
 
 done:
-    if(ret_value == NULL)
-        if(new_dset != NULL) {
-            if(new_dset->dcpl_id != 0 && H5I_dec_ref(new_dset->dcpl_id) < 0)
+    if (ret_value == NULL)
+        if (new_dset != NULL) {
+            if (new_dset->dcpl_id != 0 && H5I_dec_ref(new_dset->dcpl_id) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL, "can't decrement temporary datatype ID")
-            if(new_dset->dapl_id != 0 && H5I_dec_ref(new_dset->dapl_id) < 0)
+            if (new_dset->dapl_id != 0 && H5I_dec_ref(new_dset->dapl_id) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL, "can't decrement temporary datatype ID")
             new_dset = H5FL_FREE(H5D_shared_t, new_dset);
         } /* end if */
@@ -607,7 +585,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__init_type
  *
@@ -625,10 +602,10 @@ done:
 static herr_t
 H5D__init_type(H5F_t *file, const H5D_t *dset, hid_t type_id, const H5T_t *type)
 {
-    htri_t relocatable;                 /* Flag whether the type is relocatable */
-    htri_t immutable;                   /* Flag whether the type is immutable */
-    hbool_t use_latest_format;          /* Flag indicating the newest file format should be used */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    htri_t  relocatable;         /* Flag whether the type is relocatable */
+    htri_t  immutable;           /* Flag whether the type is immutable */
+    hbool_t use_latest_format;   /* Flag indicating the newest file format should be used */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -638,55 +615,54 @@ H5D__init_type(H5F_t *file, const H5D_t *dset, hid_t type_id, const H5T_t *type)
     HDassert(type);
 
     /* Check whether the datatype is relocatable */
-    if((relocatable = H5T_is_relocatable(type)) < 0)
+    if ((relocatable = H5T_is_relocatable(type)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't check datatype?")
 
     /* Check whether the datatype is immutable */
-    if((immutable = H5T_is_immutable(type)) < 0)
+    if ((immutable = H5T_is_immutable(type)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't check datatype?")
 
     /* Get the file's 'use the latest version of the format' flag */
     use_latest_format = H5F_USE_LATEST_FORMAT(file);
 
     /* Copy the datatype if it's a custom datatype or if it'll change when it's location is changed */
-    if(!immutable || relocatable || use_latest_format) {
+    if (!immutable || relocatable || use_latest_format) {
         /* Copy datatype for dataset */
-        if((dset->shared->type = H5T_copy(type, H5T_COPY_ALL)) == NULL)
+        if ((dset->shared->type = H5T_copy(type, H5T_COPY_ALL)) == NULL)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "can't copy datatype")
 
-    /* Convert a datatype (if committed) to a transient type if the committed datatype's file
-    location is different from the file location where the dataset will be created */
-        if(H5T_convert_committed_datatype(dset->shared->type, file) < 0)
+        /* Convert a datatype (if committed) to a transient type if the committed datatype's file
+        location is different from the file location where the dataset will be created */
+        if (H5T_convert_committed_datatype(dset->shared->type, file) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't get shared datatype info")
 
         /* Mark any datatypes as being on disk now */
-        if(H5T_set_loc(dset->shared->type, file, H5T_LOC_DISK) < 0)
+        if (H5T_set_loc(dset->shared->type, file, H5T_LOC_DISK) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't set datatype location")
 
         /* Set the latest format, if requested */
-        if(use_latest_format)
-            if(H5T_set_latest_version(dset->shared->type) < 0)
+        if (use_latest_format)
+            if (H5T_set_latest_version(dset->shared->type) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set latest version of datatype")
 
         /* Get a datatype ID for the dataset's datatype */
-    if((dset->shared->type_id = H5I_register(H5I_DATATYPE, dset->shared->type, FALSE)) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register type")
+        if ((dset->shared->type_id = H5I_register(H5I_DATATYPE, dset->shared->type, FALSE)) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register type")
     } /* end if */
     /* Not a custom datatype, just use it directly */
     else {
-        if(H5I_inc_ref(type_id, FALSE) < 0)
+        if (H5I_inc_ref(type_id, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, FAIL, "Can't increment datatype ID")
 
         /* Use existing datatype */
         dset->shared->type_id = type_id;
-        dset->shared->type = (H5T_t *)type; /* (Cast away const OK - QAK) */
-    } /* end else */
+        dset->shared->type    = (H5T_t *)type; /* (Cast away const OK - QAK) */
+    }                                          /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__init_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__init_space
  *
@@ -704,8 +680,8 @@ done:
 static herr_t
 H5D__init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space)
 {
-    hbool_t use_latest_format;          /* Flag indicating the newest file format should be used */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hbool_t use_latest_format;   /* Flag indicating the newest file format should be used */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -718,23 +694,22 @@ H5D__init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space)
     use_latest_format = H5F_USE_LATEST_FORMAT(file);
 
     /* Copy dataspace for dataset */
-    if(NULL == (dset->shared->space = H5S_copy(space, FALSE, TRUE)))
+    if (NULL == (dset->shared->space = H5S_copy(space, FALSE, TRUE)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "can't copy dataspace")
 
     /* Set the latest format, if requested */
-    if(use_latest_format)
-        if(H5S_set_latest_version(dset->shared->space) < 0)
+    if (use_latest_format)
+        if (H5S_set_latest_version(dset->shared->space) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set latest version of datatype")
 
     /* Set the dataset's dataspace to 'all' selection */
-    if(H5S_select_all(dset->shared->space, TRUE) < 0)
+    if (H5S_select_all(dset->shared->space, TRUE) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to set all selection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__init_space() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__update_oh_info
  *
@@ -751,17 +726,17 @@ done:
 static herr_t
 H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id)
 {
-    H5O_t              *oh = NULL;      /* Pointer to dataset's object header */
-    size_t              ohdr_size = H5D_MINHDR_SIZE;    /* Size of dataset's object header */
-    H5O_loc_t          *oloc = NULL;    /* Dataset's object location */
-    H5O_layout_t       *layout;         /* Dataset's layout information */
-    H5T_t              *type;           /* Dataset's datatype */
-    hbool_t             use_latest_format;      /* Flag indicating the newest file format should be used */
-    H5O_fill_t        *fill_prop;     /* Pointer to dataset's fill value information */
-    H5D_fill_value_t    fill_status;    /* Fill value status */
-    hbool_t             fill_changed = FALSE;      /* Flag indicating the fill value was changed */
-    hbool_t             layout_init = FALSE;    /* Flag to indicate that chunk information was initialized */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *          oh        = NULL;            /* Pointer to dataset's object header */
+    size_t           ohdr_size = H5D_MINHDR_SIZE; /* Size of dataset's object header */
+    H5O_loc_t *      oloc      = NULL;            /* Dataset's object location */
+    H5O_layout_t *   layout;                      /* Dataset's layout information */
+    H5T_t *          type;                        /* Dataset's datatype */
+    hbool_t          use_latest_format;           /* Flag indicating the newest file format should be used */
+    H5O_fill_t *     fill_prop;                   /* Pointer to dataset's fill value information */
+    H5D_fill_value_t fill_status;                 /* Fill value status */
+    hbool_t          fill_changed = FALSE;        /* Flag indicating the fill value was changed */
+    hbool_t          layout_init  = FALSE;   /* Flag to indicate that chunk information was initialized */
+    herr_t           ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -770,22 +745,22 @@ H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id)
     HDassert(dset);
 
     /* Set some local variables, for convenience */
-    oloc = &dset->oloc;
-    layout = &dset->shared->layout;
-    type = dset->shared->type;
+    oloc      = &dset->oloc;
+    layout    = &dset->shared->layout;
+    type      = dset->shared->type;
     fill_prop = &dset->shared->dcpl_cache.fill;
 
     /* Get the file's 'use the latest version of the format' flag */
     use_latest_format = H5F_USE_LATEST_FORMAT(file);
 
     /* Retrieve "defined" status of fill value */
-    if(H5P_is_fill_value_defined(fill_prop, &fill_status) < 0)
+    if (H5P_is_fill_value_defined(fill_prop, &fill_status) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined")
 
     /* Special case handling for variable-length types */
-    if(H5T_detect_class(type, H5T_VLEN, FALSE)) {
+    if (H5T_detect_class(type, H5T_VLEN, FALSE)) {
         /* If the default fill value is chosen for variable-length types, always write it */
-        if(fill_prop->fill_time == H5D_FILL_TIME_IFSET && fill_status == H5D_FILL_VALUE_DEFAULT) {
+        if (fill_prop->fill_time == H5D_FILL_TIME_IFSET && fill_status == H5D_FILL_VALUE_DEFAULT) {
             /* Update dataset creation property */
             fill_prop->fill_time = H5D_FILL_TIME_ALLOC;
 
@@ -794,69 +769,74 @@ H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id)
         } /* end if */
 
         /* Don't allow never writing fill values with variable-length types */
-        if(fill_prop->fill_time == H5D_FILL_TIME_NEVER)
-            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "Dataset doesn't support VL datatype when fill value is not defined")
+        if (fill_prop->fill_time == H5D_FILL_TIME_NEVER)
+            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
+                        "Dataset doesn't support VL datatype when fill value is not defined")
     } /* end if */
 
     /* Determine whether fill value is defined or not */
-    if(fill_status == H5D_FILL_VALUE_DEFAULT || fill_status == H5D_FILL_VALUE_USER_DEFINED) {
+    if (fill_status == H5D_FILL_VALUE_DEFAULT || fill_status == H5D_FILL_VALUE_USER_DEFINED) {
         /* Convert fill value buffer to dataset's datatype */
-        if(fill_prop->buf && fill_prop->size > 0 && H5O_fill_convert(fill_prop, type, &fill_changed, dxpl_id) < 0)
+        if (fill_prop->buf && fill_prop->size > 0 &&
+            H5O_fill_convert(fill_prop, type, &fill_changed, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to convert fill value to dataset type")
 
-    fill_prop->fill_defined = TRUE;
-    } else if(fill_status == H5D_FILL_VALUE_UNDEFINED) {
-    fill_prop->fill_defined = FALSE;
-    } else
+        fill_prop->fill_defined = TRUE;
+    }
+    else if (fill_status == H5D_FILL_VALUE_UNDEFINED) {
+        fill_prop->fill_defined = FALSE;
+    }
+    else
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to determine if fill value is defined")
 
     /* Check for invalid fill & allocation time setting */
-    if(fill_prop->fill_defined == FALSE && fill_prop->fill_time == H5D_FILL_TIME_ALLOC)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "fill value writing on allocation set, but no fill value defined")
+    if (fill_prop->fill_defined == FALSE && fill_prop->fill_time == H5D_FILL_TIME_ALLOC)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                    "fill value writing on allocation set, but no fill value defined")
 
     /* Check if the fill value info changed */
-    if(fill_changed) {
-        H5P_genplist_t     *dc_plist;               /* Dataset's creation property list */
+    if (fill_changed) {
+        H5P_genplist_t *dc_plist; /* Dataset's creation property list */
 
         /* Get dataset's property list object */
         HDassert(dset->shared->dcpl_id != H5P_DATASET_CREATE_DEFAULT);
-        if(NULL == (dc_plist = (H5P_genplist_t *)H5I_object(dset->shared->dcpl_id)))
+        if (NULL == (dc_plist = (H5P_genplist_t *)H5I_object(dset->shared->dcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get dataset creation property list")
 
         /* Update dataset creation property */
-        if(H5P_set(dc_plist, H5D_CRT_FILL_VALUE_NAME, fill_prop) < 0)
+        if (H5P_set(dc_plist, H5D_CRT_FILL_VALUE_NAME, fill_prop) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set fill value info")
     } /* end if */
 
     /* Add the dataset's raw data size to the size of the header, if the raw data will be stored as compact */
-    if(layout->type == H5D_COMPACT)
+    if (layout->type == H5D_COMPACT)
         ohdr_size += layout->storage.u.compact.size;
 
     /* Create an object header for the dataset */
-    if(H5O_create(file, dxpl_id, ohdr_size, (size_t)1, dset->shared->dcpl_id, oloc/*out*/) < 0)
+    if (H5O_create(file, dxpl_id, ohdr_size, (size_t)1, dset->shared->dcpl_id, oloc /*out*/) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset object header")
     HDassert(file == dset->oloc.file);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(oloc, dxpl_id)))
+    if (NULL == (oh = H5O_pin(oloc, dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTPIN, FAIL, "unable to pin dataset object header")
 
     /* Write the dataspace header message */
-    if(H5S_append(file, dxpl_id, oh, dset->shared->space) < 0)
+    if (H5S_append(file, dxpl_id, oh, dset->shared->space) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update dataspace header message")
 
     /* Write the datatype header message */
-    if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_DTYPE_ID, H5O_MSG_FLAG_CONSTANT, 0, type) < 0)
+    if (H5O_msg_append_oh(file, dxpl_id, oh, H5O_DTYPE_ID, H5O_MSG_FLAG_CONSTANT, 0, type) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update datatype header message")
 
     /* Write new fill value message */
-    if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_FILL_NEW_ID, H5O_MSG_FLAG_CONSTANT, 0, fill_prop) < 0)
+    if (H5O_msg_append_oh(file, dxpl_id, oh, H5O_FILL_NEW_ID, H5O_MSG_FLAG_CONSTANT, 0, fill_prop) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update new fill value header message")
 
     /* If there is valid information for the old fill value struct, add it */
     /* (only if we aren't trying to write the latest version of the file format) */
-    if(fill_prop->buf && !use_latest_format) {
-        H5O_fill_t old_fill_prop;       /* Copy of fill value property, for writing as "old" fill value */
+    if (fill_prop->buf && !use_latest_format) {
+        H5O_fill_t old_fill_prop; /* Copy of fill value property, for writing as "old" fill value */
 
         /* Shallow copy the fill value property */
         /* (we only want to make certain that the shared component isnt' modified) */
@@ -866,72 +846,71 @@ H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id)
         H5O_msg_reset_share(H5O_FILL_ID, &old_fill_prop);
 
         /* Write old fill value */
-        if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_FILL_ID, H5O_MSG_FLAG_CONSTANT, 0, &old_fill_prop) < 0)
+        if (H5O_msg_append_oh(file, dxpl_id, oh, H5O_FILL_ID, H5O_MSG_FLAG_CONSTANT, 0, &old_fill_prop) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update old fill value header message")
     } /* end if */
 
     /* Update/create the layout (and I/O pipeline & EFL) messages */
-    if(H5D__layout_oh_create(file, dxpl_id, oh, dset, dapl_id) < 0)
+    if (H5D__layout_oh_create(file, dxpl_id, oh, dset, dapl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update layout/pline/efl header message")
 
     /* Indicate that the layout information was initialized */
     layout_init = TRUE;
 
 #ifdef H5O_ENABLE_BOGUS
-{
-    H5P_genplist_t     *dc_plist;               /* Dataset's creation property list */
+    {
+        H5P_genplist_t *dc_plist; /* Dataset's creation property list */
 
-    /* Get dataset's property list object */
-    if(NULL == (dc_plist = (H5P_genplist_t *)H5I_object(dset->shared->dcpl_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get dataset creation property list")
+        /* Get dataset's property list object */
+        if (NULL == (dc_plist = (H5P_genplist_t *)H5I_object(dset->shared->dcpl_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get dataset creation property list")
 
-     /* Check whether to add a "bogus" message */
-    if( (H5P_exist_plist(dc_plist, H5O_BOGUS_MSG_FLAGS_NAME) > 0) &&
-        (H5P_exist_plist(dc_plist, H5O_BOGUS_MSG_ID_NAME) > 0) ) {
+        /* Check whether to add a "bogus" message */
+        if ((H5P_exist_plist(dc_plist, H5O_BOGUS_MSG_FLAGS_NAME) > 0) &&
+            (H5P_exist_plist(dc_plist, H5O_BOGUS_MSG_ID_NAME) > 0)) {
 
-        uint8_t bogus_flags = 0;        /* Flags for creating "bogus" message */
-        unsigned bogus_id;              /* "bogus" ID */
+            uint8_t  bogus_flags = 0; /* Flags for creating "bogus" message */
+            unsigned bogus_id;        /* "bogus" ID */
 
-         /* Retrieve "bogus" message ID */
-        if(H5P_get(dc_plist, H5O_BOGUS_MSG_ID_NAME, &bogus_id) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get bogus ID options")
-        /* Retrieve "bogus" message flags */
-        if(H5P_get(dc_plist, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get bogus message options")
+            /* Retrieve "bogus" message ID */
+            if (H5P_get(dc_plist, H5O_BOGUS_MSG_ID_NAME, &bogus_id) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get bogus ID options")
+            /* Retrieve "bogus" message flags */
+            if (H5P_get(dc_plist, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get bogus message options")
 
-        /* Add a "bogus" message (for error testing). */
-        if(H5O_bogus_oh(file, dxpl_id, oh, bogus_id, (unsigned)bogus_flags) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create 'bogus' message")
-    } /* end if */
-}
+            /* Add a "bogus" message (for error testing). */
+            if (H5O_bogus_oh(file, dxpl_id, oh, bogus_id, (unsigned)bogus_flags) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create 'bogus' message")
+        } /* end if */
+    }
 #endif /* H5O_ENABLE_BOGUS */
 
     /* Add a modification time message, if using older format. */
     /* (If using the latest format, the modification time is part of the object
      *  header and doesn't use a separate message -QAK)
      */
-    if(!use_latest_format)
-        if(H5O_touch_oh(file, dxpl_id, oh, TRUE) < 0)
+    if (!use_latest_format)
+        if (H5O_touch_oh(file, dxpl_id, oh, TRUE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update modification time message")
 
 done:
     /* Release pointer to object header itself */
-    if(oh != NULL)
-        if(H5O_unpin(oh) < 0)
+    if (oh != NULL)
+        if (H5O_unpin(oh) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTUNPIN, FAIL, "unable to unpin dataset object header")
 
     /* Error cleanup */
-    if(ret_value < 0) {
-        if(dset->shared->layout.type == H5D_CHUNKED && layout_init) {
-            if(H5D__chunk_dest(file, dxpl_id, dset) < 0)
+    if (ret_value < 0) {
+        if (dset->shared->layout.type == H5D_CHUNKED && layout_init) {
+            if (H5D__chunk_dest(file, dxpl_id, dset) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to destroy chunk cache")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__update_oh_info() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5D_build_extfile_prefix
  *
@@ -948,15 +927,14 @@ done:
 static herr_t
 H5D_build_extfile_prefix(const H5D_t *dset, hid_t dapl_id, char **extfile_prefix /*out*/)
 {
-    char            *prefix = NULL;       /* prefix used to look for the file               */
-    char            *extpath = NULL;      /* absolute path of directory the HDF5 file is in */
-    size_t          extpath_len;          /* length of extpath                              */
-    size_t          prefix_len;           /* length of prefix                               */
-    size_t          extfile_prefix_len;   /* length of expanded prefix                      */
-    hbool_t         free_prefix = FALSE;  /* Did the library allocate memory for prefix?    */
-    H5P_genplist_t  *plist = NULL;        /* Property list pointer                          */
-    herr_t          ret_value = SUCCEED;  /* Return value                                   */
-
+    char *          prefix  = NULL;        /* prefix used to look for the file               */
+    char *          extpath = NULL;        /* absolute path of directory the HDF5 file is in */
+    size_t          extpath_len;           /* length of extpath                              */
+    size_t          prefix_len;            /* length of prefix                               */
+    size_t          extfile_prefix_len;    /* length of expanded prefix                      */
+    hbool_t         free_prefix = FALSE;   /* Did the library allocate memory for prefix?    */
+    H5P_genplist_t *plist       = NULL;    /* Property list pointer                          */
+    herr_t          ret_value   = SUCCEED; /* Return value                                   */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -971,49 +949,48 @@ H5D_build_extfile_prefix(const H5D_t *dset, hid_t dapl_id, char **extfile_prefix
      */
     prefix = HDgetenv("HDF5_EXTFILE_PREFIX");
 
-    if(prefix == NULL || *prefix == '\0') {
+    if (prefix == NULL || *prefix == '\0') {
         /* Set prefix to value of H5D_ACS_EFILE_PREFIX_NAME property */
-        if(NULL == (plist = H5P_object_verify(dapl_id, H5P_DATASET_ACCESS)))
+        if (NULL == (plist = H5P_object_verify(dapl_id, H5P_DATASET_ACCESS)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
         /* No error checking possible here */
-        prefix = (char *)H5P_peek_voidp(plist, H5D_ACS_EFILE_PREFIX_NAME);
+        prefix      = (char *)H5P_peek_voidp(plist, H5D_ACS_EFILE_PREFIX_NAME);
         free_prefix = TRUE;
     } /* end if */
 
     /* Prefix has to be checked for NULL / empty string again because the
      * code above might have updated it.
      */
-    if(prefix == NULL || *prefix == '\0' || HDstrcmp(prefix, ".") == 0) {
+    if (prefix == NULL || *prefix == '\0' || HDstrcmp(prefix, ".") == 0) {
         /* filename is interpreted as relative to the current directory,
          * does not need to be expanded
          */
-        if(NULL == (*extfile_prefix = (char *)H5MM_strdup("")))
+        if (NULL == (*extfile_prefix = (char *)H5MM_strdup("")))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     } /* end if */
     else {
         if (HDstrncmp(prefix, "${ORIGIN}", HDstrlen("${ORIGIN}")) == 0) {
             /* Replace ${ORIGIN} at beginning of prefix by directory of HDF5 file */
-            extpath_len = HDstrlen(extpath);
-            prefix_len = HDstrlen(prefix);
+            extpath_len        = HDstrlen(extpath);
+            prefix_len         = HDstrlen(prefix);
             extfile_prefix_len = extpath_len + prefix_len - HDstrlen("${ORIGIN}") + 1;
 
-            if(NULL == (*extfile_prefix = (char *)H5MM_malloc(extfile_prefix_len)))
+            if (NULL == (*extfile_prefix = (char *)H5MM_malloc(extfile_prefix_len)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate buffer")
             HDsnprintf(*extfile_prefix, extfile_prefix_len, "%s%s", extpath, prefix + HDstrlen("${ORIGIN}"));
         } /* end if */
         else {
-            if(NULL == (*extfile_prefix = (char *)H5MM_strdup(prefix)))
+            if (NULL == (*extfile_prefix = (char *)H5MM_strdup(prefix)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
-    if(free_prefix && prefix)
+    if (free_prefix && prefix)
         H5MM_xfree(prefix);
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D_build_extfile_prefix() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__create
  *
@@ -1035,16 +1012,15 @@ done:
  *-------------------------------------------------------------------------
  */
 H5D_t *
-H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
-    hid_t dapl_id, hid_t dxpl_id)
+H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id)
 {
-    const H5T_t         *type;                  /* Datatype for dataset */
-    H5D_t        *new_dset = NULL;
-    H5P_genplist_t     *dc_plist = NULL;       /* New Property list */
-    hbool_t             has_vl_type = FALSE;    /* Flag to indicate a VL-type for dataset */
-    hbool_t             layout_init = FALSE;    /* Flag to indicate that chunk information was initialized */
-    H5G_loc_t           dset_loc;               /* Dataset location */
-    H5D_t        *ret_value;             /* Return value */
+    const H5T_t *   type; /* Datatype for dataset */
+    H5D_t *         new_dset    = NULL;
+    H5P_genplist_t *dc_plist    = NULL;  /* New Property list */
+    hbool_t         has_vl_type = FALSE; /* Flag to indicate a VL-type for dataset */
+    hbool_t         layout_init = FALSE; /* Flag to indicate that chunk information was initialized */
+    H5G_loc_t       dset_loc;            /* Dataset location */
+    H5D_t *         ret_value;           /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1056,23 +1032,23 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
     HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id));
 
     /* Get the dataset's datatype */
-    if(NULL == (type = (const H5T_t *)H5I_object(type_id)))
+    if (NULL == (type = (const H5T_t *)H5I_object(type_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a datatype")
 
     /* Check if the datatype is "sensible" for use in a dataset */
-    if(H5T_is_sensible(type) != TRUE)
+    if (H5T_is_sensible(type) != TRUE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "datatype is not sensible")
 
     /* Check if the datatype is/contains a VL-type */
-    if(H5T_detect_class(type, H5T_VLEN, FALSE))
+    if (H5T_detect_class(type, H5T_VLEN, FALSE))
         has_vl_type = TRUE;
 
     /* Check if the dataspace has an extent set (or is NULL) */
-    if(!H5S_has_extent(space))
+    if (!H5S_has_extent(space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "dataspace extent has not been set.")
 
     /* Initialize the dataset object */
-    if(NULL == (new_dset = H5FL_CALLOC(H5D_t)))
+    if (NULL == (new_dset = H5FL_CALLOC(H5D_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set up & reset dataset location */
@@ -1081,106 +1057,106 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
     H5G_loc_reset(&dset_loc);
 
     /* Initialize the shared dataset space */
-    if(NULL == (new_dset->shared = H5D__new(dcpl_id, dapl_id, TRUE, has_vl_type)))
+    if (NULL == (new_dset->shared = H5D__new(dcpl_id, dapl_id, TRUE, has_vl_type)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy & initialize datatype for dataset */
-    if(H5D__init_type(file, new_dset, type_id, type) < 0)
+    if (H5D__init_type(file, new_dset, type_id, type) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't copy datatype")
 
     /* Copy & initialize dataspace for dataset */
-    if(H5D__init_space(file, new_dset, space) < 0)
+    if (H5D__init_space(file, new_dset, space) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't copy dataspace")
 
     /* Set the dataset's checked_filters flag to enable writing */
     new_dset->shared->checked_filters = TRUE;
 
     /* Check if the dataset has a non-default DCPL & get important values, if so */
-    if(new_dset->shared->dcpl_id != H5P_DATASET_CREATE_DEFAULT) {
-        H5O_layout_t    *layout;        /* Dataset's layout information */
-        H5O_pline_t     *pline;         /* Dataset's I/O pipeline information */
-        H5O_fill_t      *fill;          /* Dataset's fill value info */
+    if (new_dset->shared->dcpl_id != H5P_DATASET_CREATE_DEFAULT) {
+        H5O_layout_t *layout; /* Dataset's layout information */
+        H5O_pline_t * pline;  /* Dataset's I/O pipeline information */
+        H5O_fill_t *  fill;   /* Dataset's fill value info */
 
         /* Check if the filters in the DCPL can be applied to this dataset */
-        if(H5Z_can_apply(new_dset->shared->dcpl_id, new_dset->shared->type_id) < 0)
+        if (H5Z_can_apply(new_dset->shared->dcpl_id, new_dset->shared->type_id) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, NULL, "I/O filters can't operate on this dataset")
 
         /* Make the "set local" filter callbacks for this dataset */
-        if(H5Z_set_local(new_dset->shared->dcpl_id, new_dset->shared->type_id) < 0)
+        if (H5Z_set_local(new_dset->shared->dcpl_id, new_dset->shared->type_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to set local filter parameters")
 
         /* Get new dataset's property list object */
-        if(NULL == (dc_plist = (H5P_genplist_t *)H5I_object(new_dset->shared->dcpl_id)))
+        if (NULL == (dc_plist = (H5P_genplist_t *)H5I_object(new_dset->shared->dcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "can't get dataset creation property list")
 
         /* Retrieve the properties we need */
         pline = &new_dset->shared->dcpl_cache.pline;
-        if(H5P_get(dc_plist, H5O_CRT_PIPELINE_NAME, pline) < 0)
+        if (H5P_get(dc_plist, H5O_CRT_PIPELINE_NAME, pline) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't retrieve pipeline filter")
         layout = &new_dset->shared->layout;
-        if(H5P_get(dc_plist, H5D_CRT_LAYOUT_NAME, layout) < 0)
+        if (H5P_get(dc_plist, H5D_CRT_LAYOUT_NAME, layout) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't retrieve layout")
-        if(pline->nused > 0 && H5D_CHUNKED != layout->type)
+        if (pline->nused > 0 && H5D_CHUNKED != layout->type)
             HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, NULL, "filters can only be used with chunked layout")
         fill = &new_dset->shared->dcpl_cache.fill;
-        if(H5P_get(dc_plist, H5D_CRT_FILL_VALUE_NAME, fill) < 0)
+        if (H5P_get(dc_plist, H5D_CRT_FILL_VALUE_NAME, fill) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't retrieve fill value info")
 
         /* Check if the alloc_time is the default and error out */
-        if(fill->alloc_time == H5D_ALLOC_TIME_DEFAULT)
+        if (fill->alloc_time == H5D_ALLOC_TIME_DEFAULT)
             HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, NULL, "invalid space allocation state")
 
         /* Don't allow compact datasets to allocate space later */
-        if(layout->type == H5D_COMPACT && fill->alloc_time != H5D_ALLOC_TIME_EARLY)
+        if (layout->type == H5D_COMPACT && fill->alloc_time != H5D_ALLOC_TIME_EARLY)
             HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, NULL, "compact dataset must have early space allocation")
 
         /* If MPI VFD is used, no filter support yet. */
-        if(H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI) && pline->nused > 0)
+        if (H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI) && pline->nused > 0)
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, NULL, "Parallel I/O does not support filters yet")
 
         /* Get the dataset's external file list information */
-        if(H5P_get(dc_plist, H5D_CRT_EXT_FILE_LIST_NAME, &new_dset->shared->dcpl_cache.efl) < 0)
+        if (H5P_get(dc_plist, H5D_CRT_EXT_FILE_LIST_NAME, &new_dset->shared->dcpl_cache.efl) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't retrieve external file list")
     } /* end if */
 
     /* Set the latest version of the layout, pline & fill messages, if requested */
-    if(H5F_USE_LATEST_FORMAT(file)) {
+    if (H5F_USE_LATEST_FORMAT(file)) {
         /* Set the latest version for the I/O pipeline message */
-        if(H5O_pline_set_latest_version(&new_dset->shared->dcpl_cache.pline) < 0)
+        if (H5O_pline_set_latest_version(&new_dset->shared->dcpl_cache.pline) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, NULL, "can't set latest version of I/O filter pipeline")
 
         /* Set the latest version for the fill value message */
-        if(H5O_fill_set_latest_version(&new_dset->shared->dcpl_cache.fill) < 0)
+        if (H5O_fill_set_latest_version(&new_dset->shared->dcpl_cache.fill) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, NULL, "can't set latest version of fill value")
     } /* end if */
 
     /* Check if this dataset is going into a parallel file and set space allocation time */
-    if(H5F_HAS_FEATURE(file, H5FD_FEAT_ALLOCATE_EARLY))
+    if (H5F_HAS_FEATURE(file, H5FD_FEAT_ALLOCATE_EARLY))
         new_dset->shared->dcpl_cache.fill.alloc_time = H5D_ALLOC_TIME_EARLY;
 
     /* Set the dataset's I/O operations */
-    if(H5D__layout_set_io_ops(new_dset) < 0)
+    if (H5D__layout_set_io_ops(new_dset) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize I/O operations")
 
     /* Create the layout information for the new dataset */
-    if((new_dset->shared->layout.ops->construct)(file, new_dset) < 0)
+    if ((new_dset->shared->layout.ops->construct)(file, new_dset) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to construct layout information")
 
     /* Update the dataset's object header info. */
-    if(H5D__update_oh_info(file, dxpl_id, new_dset, new_dset->shared->dapl_id) < 0)
+    if (H5D__update_oh_info(file, dxpl_id, new_dset, new_dset->shared->dapl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't update the metadata cache")
 
     /* Indicate that the layout information was initialized */
     layout_init = TRUE;
 
     /* Set the external file prefix */
-    if(H5D_build_extfile_prefix(new_dset, dapl_id, &new_dset->shared->extfile_prefix) < 0)
+    if (H5D_build_extfile_prefix(new_dset, dapl_id, &new_dset->shared->extfile_prefix) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize external file prefix")
 
     /* Add the dataset to the list of opened objects in the file */
-    if(H5FO_top_incr(new_dset->oloc.file, new_dset->oloc.addr) < 0)
+    if (H5FO_top_incr(new_dset->oloc.file, new_dset->oloc.addr) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, NULL, "can't incr object ref. count")
-    if(H5FO_insert(new_dset->oloc.file, new_dset->oloc.addr, new_dset->shared, TRUE) < 0)
+    if (H5FO_insert(new_dset->oloc.file, new_dset->oloc.addr, new_dset->shared, TRUE) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, NULL, "can't insert dataset into list of open objects")
     new_dset->shared->fo_count = 1;
 
@@ -1188,49 +1164,49 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
     ret_value = new_dset;
 
 done:
-    if(!ret_value && new_dset) {
-        if(new_dset->shared) {
-            if(new_dset->shared->layout.type == H5D_CHUNKED && layout_init) {
-                if(H5D__chunk_dest(file, dxpl_id, new_dset) < 0)
+    if (!ret_value && new_dset) {
+        if (new_dset->shared) {
+            if (new_dset->shared->layout.type == H5D_CHUNKED && layout_init) {
+                if (H5D__chunk_dest(file, dxpl_id, new_dset) < 0)
                     HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, NULL, "unable to destroy chunk cache")
             } /* end if */
-            if(new_dset->shared->space && H5S_close(new_dset->shared->space) < 0)
+            if (new_dset->shared->space && H5S_close(new_dset->shared->space) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release dataspace")
-            if(new_dset->shared->type) {
-                if(new_dset->shared->type_id > 0) {
-                    if(H5I_dec_ref(new_dset->shared->type_id) < 0)
+            if (new_dset->shared->type) {
+                if (new_dset->shared->type_id > 0) {
+                    if (H5I_dec_ref(new_dset->shared->type_id) < 0)
                         HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release datatype")
                 } /* end if */
                 else {
-                    if(H5T_close(new_dset->shared->type) < 0)
+                    if (H5T_close(new_dset->shared->type) < 0)
                         HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release datatype")
                 } /* end else */
-            } /* end if */
-            if(H5F_addr_defined(new_dset->oloc.addr)) {
-                if(H5O_dec_rc_by_loc(&(new_dset->oloc), dxpl_id) < 0)
-                    HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL, "unable to decrement refcount on newly created object")
-                if(H5O_close(&(new_dset->oloc)) < 0)
+            }     /* end if */
+            if (H5F_addr_defined(new_dset->oloc.addr)) {
+                if (H5O_dec_rc_by_loc(&(new_dset->oloc), dxpl_id) < 0)
+                    HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL,
+                                "unable to decrement refcount on newly created object")
+                if (H5O_close(&(new_dset->oloc)) < 0)
                     HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release object header")
-                if(file) {
-                    if(H5O_delete(file, dxpl_id, new_dset->oloc.addr) < 0)
+                if (file) {
+                    if (H5O_delete(file, dxpl_id, new_dset->oloc.addr) < 0)
                         HDONE_ERROR(H5E_DATASET, H5E_CANTDELETE, NULL, "unable to delete object header")
                 } /* end if */
-            } /* end if */
-            if(new_dset->shared->dcpl_id != 0 && H5I_dec_ref(new_dset->shared->dcpl_id) < 0)
+            }     /* end if */
+            if (new_dset->shared->dcpl_id != 0 && H5I_dec_ref(new_dset->shared->dcpl_id) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL, "unable to decrement ref count on property list")
-            if(new_dset->shared->dapl_id != 0 && H5I_dec_ref(new_dset->shared->dapl_id) < 0)
+            if (new_dset->shared->dapl_id != 0 && H5I_dec_ref(new_dset->shared->dapl_id) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL, "unable to decrement ref count on property list")
             new_dset->shared->extfile_prefix = (char *)H5MM_xfree(new_dset->shared->extfile_prefix);
-            new_dset->shared = H5FL_FREE(H5D_shared_t, new_dset->shared);
+            new_dset->shared                 = H5FL_FREE(H5D_shared_t, new_dset->shared);
         } /* end if */
         new_dset->oloc.file = NULL;
-        new_dset = H5FL_FREE(H5D_t, new_dset);
+        new_dset            = H5FL_FREE(H5D_t, new_dset);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__create() */
 
-
 /*
  *-------------------------------------------------------------------------
  * Function:    H5D_open
@@ -1249,10 +1225,10 @@ done:
 H5D_t *
 H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
 {
-    H5D_shared_t    *shared_fo = NULL;
-    H5D_t           *dataset = NULL;
-    char            *extfile_prefix = NULL;  /* Expanded external file prefix */
-    H5D_t           *ret_value = NULL;       /* Return value */
+    H5D_shared_t *shared_fo      = NULL;
+    H5D_t *       dataset        = NULL;
+    char *        extfile_prefix = NULL; /* Expanded external file prefix */
+    H5D_t *       ret_value      = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1260,36 +1236,36 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
     HDassert(loc);
 
     /* Allocate the dataset structure */
-    if(NULL == (dataset = H5FL_CALLOC(H5D_t)))
+    if (NULL == (dataset = H5FL_CALLOC(H5D_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Shallow copy (take ownership) of the object location object */
-    if(H5O_loc_copy(&(dataset->oloc), loc->oloc, H5_COPY_SHALLOW) < 0)
+    if (H5O_loc_copy(&(dataset->oloc), loc->oloc, H5_COPY_SHALLOW) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, NULL, "can't copy object location")
 
     /* Shallow copy (take ownership) of the group hier. path */
-    if(H5G_name_copy(&(dataset->path), loc->path, H5_COPY_SHALLOW) < 0)
+    if (H5G_name_copy(&(dataset->path), loc->path, H5_COPY_SHALLOW) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, NULL, "can't copy path")
 
     /* Get the external file prefix */
-    if(H5D_build_extfile_prefix(dataset, dapl_id, &extfile_prefix) < 0)
+    if (H5D_build_extfile_prefix(dataset, dapl_id, &extfile_prefix) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize external file prefix")
 
     /* Check if dataset was already open */
-    if(NULL == (shared_fo = (H5D_shared_t *)H5FO_opened(dataset->oloc.file, dataset->oloc.addr))) {
+    if (NULL == (shared_fo = (H5D_shared_t *)H5FO_opened(dataset->oloc.file, dataset->oloc.addr))) {
         /* Clear any errors from H5FO_opened() */
         H5E_clear_stack(NULL);
 
         /* Open the dataset object */
-        if(H5D__open_oid(dataset, dapl_id, dxpl_id) < 0)
+        if (H5D__open_oid(dataset, dapl_id, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, NULL, "not found")
 
         /* Add the dataset to the list of opened objects in the file */
-        if(H5FO_insert(dataset->oloc.file, dataset->oloc.addr, dataset->shared, FALSE) < 0)
+        if (H5FO_insert(dataset->oloc.file, dataset->oloc.addr, dataset->shared, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, NULL, "can't insert dataset into list of open objects")
 
         /* Increment object count for the object in the top file */
-        if(H5FO_top_incr(dataset->oloc.file, dataset->oloc.addr) < 0)
+        if (H5FO_top_incr(dataset->oloc.file, dataset->oloc.addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, NULL, "can't increment object count")
 
         /* We're the first dataset to use the the shared info */
@@ -1311,18 +1287,20 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
         /* Check whether the external file prefix of the already open dataset
          * matches the new external file prefix
          */
-        if(HDstrcmp(extfile_prefix, dataset->shared->extfile_prefix) != 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, NULL, "new external file prefix does not match external file prefix of already open dataset")
+        if (HDstrcmp(extfile_prefix, dataset->shared->extfile_prefix) != 0)
+            HGOTO_ERROR(
+                H5E_DATASET, H5E_CANTOPENOBJ, NULL,
+                "new external file prefix does not match external file prefix of already open dataset")
 
         /* Check if the object has been opened through the top file yet */
-        if(H5FO_top_count(dataset->oloc.file, dataset->oloc.addr) == 0) {
+        if (H5FO_top_count(dataset->oloc.file, dataset->oloc.addr) == 0) {
             /* Open the object through this top file */
-            if(H5O_open(&(dataset->oloc)) < 0)
+            if (H5O_open(&(dataset->oloc)) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, NULL, "unable to open object header")
         } /* end if */
 
         /* Increment object count for the object in the top file */
-        if(H5FO_top_incr(dataset->oloc.file, dataset->oloc.addr) < 0)
+        if (H5FO_top_incr(dataset->oloc.file, dataset->oloc.addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, NULL, "can't increment object count")
     } /* end else */
 
@@ -1332,12 +1310,12 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
 done:
     extfile_prefix = (char *)H5MM_xfree(extfile_prefix);
 
-    if(ret_value == NULL) {
+    if (ret_value == NULL) {
         /* Free the location--casting away const*/
-        if(dataset) {
-            if(shared_fo == NULL && dataset->shared) {   /* Need to free shared fo */
+        if (dataset) {
+            if (shared_fo == NULL && dataset->shared) { /* Need to free shared fo */
                 dataset->shared->extfile_prefix = (char *)H5MM_xfree(dataset->shared->extfile_prefix);
-                dataset->shared = H5FL_FREE(H5D_shared_t, dataset->shared);
+                dataset->shared                 = H5FL_FREE(H5D_shared_t, dataset->shared);
             }
 
             H5O_loc_free(&(dataset->oloc));
@@ -1345,14 +1323,13 @@ done:
 
             dataset = H5FL_FREE(H5D_t, dataset);
         } /* end if */
-        if(shared_fo)
+        if (shared_fo)
             shared_fo->fo_count--;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__open_oid
  *
@@ -1368,12 +1345,12 @@ done:
 static herr_t
 H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id)
 {
-    H5P_genplist_t *plist;              /* Property list */
-    H5O_fill_t *fill_prop;              /* Pointer to dataset's fill value info */
-    unsigned alloc_time_state;          /* Allocation time state */
-    htri_t msg_exists;                  /* Whether a particular type of message exists */
-    hbool_t layout_init = FALSE;        /* Flag to indicate that chunk information was initialized */
-    herr_t ret_value = SUCCEED;        /* Return value */
+    H5P_genplist_t *plist;                 /* Property list */
+    H5O_fill_t *    fill_prop;             /* Pointer to dataset's fill value info */
+    unsigned        alloc_time_state;      /* Allocation time state */
+    htri_t          msg_exists;            /* Whether a particular type of message exists */
+    hbool_t         layout_init = FALSE;   /* Flag to indicate that chunk information was initialized */
+    herr_t          ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1381,33 +1358,34 @@ H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id)
     HDassert(dataset);
 
     /* (Set the 'vl_type' parameter to FALSE since it doesn't matter from here) */
-    if(NULL == (dataset->shared = H5D__new(H5P_DATASET_CREATE_DEFAULT, dapl_id, FALSE, FALSE)))
+    if (NULL == (dataset->shared = H5D__new(H5P_DATASET_CREATE_DEFAULT, dapl_id, FALSE, FALSE)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Open the dataset object */
-    if(H5O_open(&(dataset->oloc)) < 0)
+    if (H5O_open(&(dataset->oloc)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open")
 
     /* Get the type and space */
-    if(NULL == (dataset->shared->type = (H5T_t *)H5O_msg_read(&(dataset->oloc), H5O_DTYPE_ID, NULL, dxpl_id)))
+    if (NULL ==
+        (dataset->shared->type = (H5T_t *)H5O_msg_read(&(dataset->oloc), H5O_DTYPE_ID, NULL, dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to load type info from dataset header")
 
-    if(H5T_set_loc(dataset->shared->type, dataset->oloc.file, H5T_LOC_DISK) < 0)
+    if (H5T_set_loc(dataset->shared->type, dataset->oloc.file, H5T_LOC_DISK) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid datatype location")
 
-    if(NULL == (dataset->shared->space = H5S_read(&(dataset->oloc), dxpl_id)))
+    if (NULL == (dataset->shared->space = H5S_read(&(dataset->oloc), dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to load dataspace info from dataset header")
 
     /* Get a datatype ID for the dataset's datatype */
-    if((dataset->shared->type_id = H5I_register(H5I_DATATYPE, dataset->shared->type, FALSE)) < 0)
+    if ((dataset->shared->type_id = H5I_register(H5I_DATATYPE, dataset->shared->type, FALSE)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register type")
 
     /* Get dataset creation property list object */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(dataset->shared->dcpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(dataset->shared->dcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get dataset creation property list")
 
     /* Get the layout/pline/efl message information */
-    if(H5D__layout_oh_read(dataset, dxpl_id, dapl_id, plist) < 0)
+    if (H5D__layout_oh_read(dataset, dxpl_id, dapl_id, plist) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get layout/pline/efl info")
 
     /* Indicate that the layout information was initialized */
@@ -1417,23 +1395,23 @@ H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id)
     fill_prop = &dataset->shared->dcpl_cache.fill;
 
     /* Try to get the new fill value message from the object header */
-    if((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_FILL_NEW_ID, dxpl_id)) < 0)
+    if ((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_FILL_NEW_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't check if message exists")
-    if(msg_exists) {
-        if(NULL == H5O_msg_read(&(dataset->oloc), H5O_FILL_NEW_ID, fill_prop, dxpl_id))
+    if (msg_exists) {
+        if (NULL == H5O_msg_read(&(dataset->oloc), H5O_FILL_NEW_ID, fill_prop, dxpl_id))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve message")
     } /* end if */
     else {
-    /* For backward compatibility, try to retrieve the old fill value message */
-        if((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_FILL_ID, dxpl_id)) < 0)
+        /* For backward compatibility, try to retrieve the old fill value message */
+        if ((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_FILL_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't check if message exists")
-        if(msg_exists) {
-            if(NULL == H5O_msg_read(&(dataset->oloc), H5O_FILL_ID, fill_prop, dxpl_id))
+        if (msg_exists) {
+            if (NULL == H5O_msg_read(&(dataset->oloc), H5O_FILL_ID, fill_prop, dxpl_id))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve message")
         } /* end if */
         else {
             /* Set the space allocation time appropriately, based on the type of dataset storage */
-            switch(dataset->shared->layout.type) {
+            switch (dataset->shared->layout.type) {
                 case H5D_COMPACT:
                     fill_prop->alloc_time = H5D_ALLOC_TIME_EARLY;
                     break;
@@ -1451,23 +1429,23 @@ H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id)
                 default:
                     HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "not implemented yet")
             } /* end switch */ /*lint !e788 All appropriate cases are covered */
-        } /* end else */
+        }                      /* end else */
 
         /* If "old" fill value size is 0 (undefined), map it to -1 */
-        if(fill_prop->size == 0)
+        if (fill_prop->size == 0)
             fill_prop->size = (ssize_t)-1;
     } /* end if */
     alloc_time_state = 0;
-    if((dataset->shared->layout.type == H5D_COMPACT && fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY)
-            || (dataset->shared->layout.type == H5D_CONTIGUOUS && fill_prop->alloc_time == H5D_ALLOC_TIME_LATE)
-            || (dataset->shared->layout.type == H5D_CHUNKED && fill_prop->alloc_time == H5D_ALLOC_TIME_INCR))
+    if ((dataset->shared->layout.type == H5D_COMPACT && fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY) ||
+        (dataset->shared->layout.type == H5D_CONTIGUOUS && fill_prop->alloc_time == H5D_ALLOC_TIME_LATE) ||
+        (dataset->shared->layout.type == H5D_CHUNKED && fill_prop->alloc_time == H5D_ALLOC_TIME_INCR))
         alloc_time_state = 1;
 
     /* Set revised fill value properties, if they are different from the defaults */
-    if(H5P_fill_value_cmp(&H5D_def_dset.dcpl_cache.fill, fill_prop, sizeof(H5O_fill_t))) {
-        if(H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, fill_prop) < 0)
+    if (H5P_fill_value_cmp(&H5D_def_dset.dcpl_cache.fill, fill_prop, sizeof(H5O_fill_t))) {
+        if (H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, fill_prop) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set fill value")
-        if(H5P_set(plist, H5D_CRT_ALLOC_TIME_STATE_NAME, &alloc_time_state) < 0)
+        if (H5P_set(plist, H5D_CRT_ALLOC_TIME_STATE_NAME, &alloc_time_state) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set allocation time state")
     } /* end if */
 
@@ -1476,40 +1454,39 @@ H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id)
      * This is important only for parallel I/O where the space must
      * be fully allocated before I/O can happen.
      */
-    if((H5F_INTENT(dataset->oloc.file) & H5F_ACC_RDWR)
-            && !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage)
-            && H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_ALLOCATE_EARLY)) {
-        if(H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_OPEN, FALSE, NULL) < 0)
+    if ((H5F_INTENT(dataset->oloc.file) & H5F_ACC_RDWR) &&
+        !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage) &&
+        H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_ALLOCATE_EARLY)) {
+        if (H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_OPEN, FALSE, NULL) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file storage")
     } /* end if */
 
 done:
-    if(ret_value < 0) {
-        if(H5F_addr_defined(dataset->oloc.addr) && H5O_close(&(dataset->oloc)) < 0)
+    if (ret_value < 0) {
+        if (H5F_addr_defined(dataset->oloc.addr) && H5O_close(&(dataset->oloc)) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release object header")
-        if(dataset->shared) {
-        if(dataset->shared->layout.type == H5D_CHUNKED && layout_init)
-                if(H5D__chunk_dest(dataset->oloc.file, dxpl_id, dataset) < 0)
+        if (dataset->shared) {
+            if (dataset->shared->layout.type == H5D_CHUNKED && layout_init)
+                if (H5D__chunk_dest(dataset->oloc.file, dxpl_id, dataset) < 0)
                     HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to destroy chunk cache")
-            if(dataset->shared->space && H5S_close(dataset->shared->space) < 0)
+            if (dataset->shared->space && H5S_close(dataset->shared->space) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataspace")
-            if(dataset->shared->type) {
-                if(dataset->shared->type_id > 0) {
-                    if(H5I_dec_ref(dataset->shared->type_id) < 0)
+            if (dataset->shared->type) {
+                if (dataset->shared->type_id > 0) {
+                    if (H5I_dec_ref(dataset->shared->type_id) < 0)
                         HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release datatype")
                 } /* end if */
                 else {
-                    if(H5T_close(dataset->shared->type) < 0)
+                    if (H5T_close(dataset->shared->type) < 0)
                         HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release datatype")
                 } /* end else */
-            } /* end if */
-        } /* end if */
-    } /* end if */
+            }     /* end if */
+        }         /* end if */
+    }             /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__open_oid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_close
  *
@@ -1528,7 +1505,7 @@ herr_t
 H5D_close(H5D_t *dataset)
 {
     unsigned free_failed = FALSE;
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t   ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1542,52 +1519,56 @@ H5D_close(H5D_t *dataset)
 #endif /* H5D_CHUNK_DEBUG */
 
     dataset->shared->fo_count--;
-    if(dataset->shared->fo_count == 0) {
+    if (dataset->shared->fo_count == 0) {
         /* Flush the dataset's information.  Continue to close even if it fails. */
-        if(H5D__flush_real(dataset, H5AC_dxpl_id) < 0)
+        if (H5D__flush_real(dataset, H5AC_dxpl_id) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to flush cached dataset info")
 
         /* Free the data sieve buffer, if it's been allocated */
-        if(dataset->shared->cache.contig.sieve_buf) {
-            HDassert(dataset->shared->layout.type != H5D_COMPACT);      /* We should never have a sieve buffer for compact storage */
+        if (dataset->shared->cache.contig.sieve_buf) {
+            HDassert(dataset->shared->layout.type !=
+                     H5D_COMPACT); /* We should never have a sieve buffer for compact storage */
 
-            dataset->shared->cache.contig.sieve_buf = (unsigned char *)H5FL_BLK_FREE(sieve_buf,dataset->shared->cache.contig.sieve_buf);
+            dataset->shared->cache.contig.sieve_buf =
+                (unsigned char *)H5FL_BLK_FREE(sieve_buf, dataset->shared->cache.contig.sieve_buf);
         } /* end if */
 
         /* Free cached information for each kind of dataset */
-        switch(dataset->shared->layout.type) {
+        switch (dataset->shared->layout.type) {
             case H5D_CONTIGUOUS:
                 break;
 
             case H5D_CHUNKED:
                 /* Check for skip list for iterating over chunks during I/O to close */
-                if(dataset->shared->cache.chunk.sel_chunks) {
+                if (dataset->shared->cache.chunk.sel_chunks) {
                     HDassert(H5SL_count(dataset->shared->cache.chunk.sel_chunks) == 0);
                     H5SL_close(dataset->shared->cache.chunk.sel_chunks);
                     dataset->shared->cache.chunk.sel_chunks = NULL;
                 } /* end if */
 
                 /* Check for cached single chunk dataspace */
-                if(dataset->shared->cache.chunk.single_space) {
+                if (dataset->shared->cache.chunk.single_space) {
                     (void)H5S_close(dataset->shared->cache.chunk.single_space);
                     dataset->shared->cache.chunk.single_space = NULL;
                 } /* end if */
 
                 /* Check for cached single element chunk info */
-                if(dataset->shared->cache.chunk.single_chunk_info) {
-                    dataset->shared->cache.chunk.single_chunk_info = H5FL_FREE(H5D_chunk_info_t, dataset->shared->cache.chunk.single_chunk_info);
+                if (dataset->shared->cache.chunk.single_chunk_info) {
+                    dataset->shared->cache.chunk.single_chunk_info =
+                        H5FL_FREE(H5D_chunk_info_t, dataset->shared->cache.chunk.single_chunk_info);
                     dataset->shared->cache.chunk.single_chunk_info = NULL;
                 } /* end if */
 
                 /* Flush and destroy chunks in the cache. Continue to close even if
                  * it fails. */
-                if(H5D__chunk_dest(dataset->oloc.file, H5AC_dxpl_id, dataset) < 0)
+                if (H5D__chunk_dest(dataset->oloc.file, H5AC_dxpl_id, dataset) < 0)
                     HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to destroy chunk cache")
                 break;
 
             case H5D_COMPACT:
                 /* Free the buffer for the raw data for compact datasets */
-                dataset->shared->layout.storage.u.compact.buf = H5MM_xfree(dataset->shared->layout.storage.u.compact.buf);
+                dataset->shared->layout.storage.u.compact.buf =
+                    H5MM_xfree(dataset->shared->layout.storage.u.compact.buf);
                 break;
 
             case H5D_LAYOUT_ERROR:
@@ -1596,30 +1577,30 @@ H5D_close(H5D_t *dataset)
                 HDassert("not implemented yet" && 0);
 #ifdef NDEBUG
                 HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif                     /* NDEBUG */
         } /* end switch */ /*lint !e788 All appropriate cases are covered */
 
         /* Free the external file prefix */
         dataset->shared->extfile_prefix = (char *)H5MM_xfree(dataset->shared->extfile_prefix);
 
         /*
-        * Release datatype, dataspace, creation and access property lists -- there isn't
-        * much we can do if one of these fails, so we just continue.
-        */
-        free_failed |= (unsigned)(H5I_dec_ref(dataset->shared->type_id) < 0 ||
-                                  H5S_close(dataset->shared->space) < 0 ||
-                                  H5I_dec_ref(dataset->shared->dcpl_id) < 0 ||
-                                  H5I_dec_ref(dataset->shared->dapl_id) < 0);
+         * Release datatype, dataspace, creation and access property lists -- there isn't
+         * much we can do if one of these fails, so we just continue.
+         */
+        free_failed |=
+            (unsigned)(H5I_dec_ref(dataset->shared->type_id) < 0 || H5S_close(dataset->shared->space) < 0 ||
+                       H5I_dec_ref(dataset->shared->dcpl_id) < 0 ||
+                       H5I_dec_ref(dataset->shared->dapl_id) < 0);
 
         /* Remove the dataset from the list of opened objects in the file */
-        if(H5FO_top_decr(dataset->oloc.file, dataset->oloc.addr) < 0)
+        if (H5FO_top_decr(dataset->oloc.file, dataset->oloc.addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-        if(H5FO_delete(dataset->oloc.file, H5AC_dxpl_id, dataset->oloc.addr) < 0)
+        if (H5FO_delete(dataset->oloc.file, H5AC_dxpl_id, dataset->oloc.addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't remove dataset from list of open objects")
 
         /* Close the dataset object */
         /* (This closes the file, if this is the last object open) */
-        if(H5O_close(&(dataset->oloc)) < 0)
+        if (H5O_close(&(dataset->oloc)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release object header")
 
         /*
@@ -1634,36 +1615,36 @@ H5D_close(H5D_t *dataset)
     } /* end if */
     else {
         /* Decrement the ref. count for this object in the top file */
-        if(H5FO_top_decr(dataset->oloc.file, dataset->oloc.addr) < 0)
+        if (H5FO_top_decr(dataset->oloc.file, dataset->oloc.addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
 
         /* Check reference count for this object in the top file */
-        if(H5FO_top_count(dataset->oloc.file, dataset->oloc.addr) == 0) {
-            if(H5O_close(&(dataset->oloc)) < 0)
+        if (H5FO_top_count(dataset->oloc.file, dataset->oloc.addr) == 0) {
+            if (H5O_close(&(dataset->oloc)) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to close")
         } /* end if */
         else
             /* Free object location (i.e. "unhold" the file if appropriate) */
-            if(H5O_loc_free(&(dataset->oloc)) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
+            if (H5O_loc_free(&(dataset->oloc)) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
     } /* end else */
 
-   /* Release the dataset's path info */
-   if(H5G_name_free(&(dataset->path)) < 0)
-       free_failed = TRUE;
+    /* Release the dataset's path info */
+    if (H5G_name_free(&(dataset->path)) < 0)
+        free_failed = TRUE;
 
     /* Free the dataset's memory structure */
     dataset = H5FL_FREE(H5D_t, dataset);
 
     /* Check if anything failed in the middle... */
-    if(free_failed)
-    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "couldn't free a component of the dataset, but the dataset was freed anyway.")
+    if (free_failed)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                    "couldn't free a component of the dataset, but the dataset was freed anyway.")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_oloc
  *
@@ -1686,7 +1667,6 @@ H5D_oloc(H5D_t *dataset)
     FUNC_LEAVE_NOAPI(dataset ? &(dataset->oloc) : (H5O_loc_t *)NULL)
 } /* end H5D_oloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_nameof
  *
@@ -1709,7 +1689,6 @@ H5D_nameof(H5D_t *dataset)
     FUNC_LEAVE_NOAPI(dataset ? &(dataset->path) : (H5G_name_t *)NULL)
 } /* end H5D_nameof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_typeof
  *
@@ -1737,7 +1716,6 @@ H5D_typeof(const H5D_t *dset)
     FUNC_LEAVE_NOAPI(dset->shared->type)
 } /* end H5D_typeof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__alloc_storage
  *
@@ -1751,14 +1729,14 @@ H5D_typeof(const H5D_t *dset)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc,
-    hbool_t full_overwrite, hsize_t old_dim[])
+H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc, hbool_t full_overwrite,
+                   hsize_t old_dim[])
 {
-    H5F_t *f = dset->oloc.file;         /* The dataset's file pointer */
-    H5O_layout_t *layout;               /* The dataset's layout information */
-    hbool_t must_init_space = FALSE;    /* Flag to indicate that space should be initialized */
-    hbool_t addr_set = FALSE;           /* Flag to indicate that the dataset's storage address was set */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5F_t *       f = dset->oloc.file;       /* The dataset's file pointer */
+    H5O_layout_t *layout;                    /* The dataset's layout information */
+    hbool_t       must_init_space = FALSE;   /* Flag to indicate that space should be initialized */
+    hbool_t       addr_set        = FALSE;   /* Flag to indicate that the dataset's storage address was set */
+    herr_t        ret_value       = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1770,17 +1748,17 @@ H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc
      * We assume that external storage is already
      * allocated by the caller, or at least will be before I/O is performed.
      */
-    if(!(H5S_NULL == H5S_GET_EXTENT_TYPE(dset->shared->space) || dset->shared->dcpl_cache.efl.nused > 0)) {
+    if (!(H5S_NULL == H5S_GET_EXTENT_TYPE(dset->shared->space) || dset->shared->dcpl_cache.efl.nused > 0)) {
         /* Get a pointer to the dataset's layout information */
         layout = &(dset->shared->layout);
 
-        switch(layout->type) {
+        switch (layout->type) {
             case H5D_CONTIGUOUS:
-                if(!(*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage)) {
+                if (!(*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage)) {
                     /* Check if we have a zero-sized dataset */
-                    if(layout->storage.u.contig.size > 0) {
+                    if (layout->storage.u.contig.size > 0) {
                         /* Reserve space in the file for the entire array */
-                        if(H5D__contig_alloc(f, dxpl_id, &layout->storage.u.contig/*out*/) < 0)
+                        if (H5D__contig_alloc(f, dxpl_id, &layout->storage.u.contig /*out*/) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to initialize contiguous storage")
 
                         /* Indicate that we should initialize storage space */
@@ -1795,9 +1773,9 @@ H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc
                 break;
 
             case H5D_CHUNKED:
-                if(!(*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage)) {
+                if (!(*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage)) {
                     /* Create the root of the B-tree that describes chunked storage */
-                    if(H5D__chunk_create(dset /*in,out*/, dxpl_id) < 0)
+                    if (H5D__chunk_create(dset /*in,out*/, dxpl_id) < 0)
                         HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to initialize chunked storage")
 
                     /* Indicate that we set the storage addr */
@@ -1808,33 +1786,36 @@ H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc
                 } /* end if */
 
                 /* If space allocation is set to 'early' and we are extending
-        * the dataset, indicate that space should be allocated, so the
+                 * the dataset, indicate that space should be allocated, so the
                  * B-tree gets expanded. -QAK
                  */
-        if(dset->shared->dcpl_cache.fill.alloc_time == H5D_ALLOC_TIME_EARLY
-                        && time_alloc == H5D_ALLOC_EXTEND)
-            must_init_space = TRUE;
+                if (dset->shared->dcpl_cache.fill.alloc_time == H5D_ALLOC_TIME_EARLY &&
+                    time_alloc == H5D_ALLOC_EXTEND)
+                    must_init_space = TRUE;
                 break;
 
             case H5D_COMPACT:
                 /* Check if space is already allocated */
-                if(NULL == layout->storage.u.compact.buf) {
+                if (NULL == layout->storage.u.compact.buf) {
                     /* Reserve space in layout header message for the entire array.
                      * Starting from the 1.8.7 release, we allow dataspace to have
                      * zero dimension size.  So the storage size can be zero.
                      * SLU 2011/4/4 */
-                    if(layout->storage.u.compact.size > 0) {
-                        if(NULL == (layout->storage.u.compact.buf = H5MM_malloc(layout->storage.u.compact.size)))
-                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory for compact dataset")
-                        if(!full_overwrite)
+                    if (layout->storage.u.compact.size > 0) {
+                        if (NULL ==
+                            (layout->storage.u.compact.buf = H5MM_malloc(layout->storage.u.compact.size)))
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                        "unable to allocate memory for compact dataset")
+                        if (!full_overwrite)
                             HDmemset(layout->storage.u.compact.buf, 0, layout->storage.u.compact.size);
                         layout->storage.u.compact.dirty = TRUE;
 
                         /* Indicate that we should initialize storage space */
                         must_init_space = TRUE;
-                    } else {
+                    }
+                    else {
                         layout->storage.u.compact.dirty = FALSE;
-                        must_init_space = FALSE;
+                        must_init_space                 = FALSE;
                     }
                 } /* end if */
                 break;
@@ -1845,12 +1826,12 @@ H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc
                 HDassert("not implemented yet" && 0);
 #ifdef NDEBUG
                 HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif                     /* NDEBUG */
         } /* end switch */ /*lint !e788 All appropriate cases are covered */
 
         /* Check if we need to initialize the space */
-        if(must_init_space) {
-            if(layout->type == H5D_CHUNKED) {
+        if (must_init_space) {
+            if (layout->type == H5D_CHUNKED) {
                 /* If we are doing incremental allocation and the B-tree got
                  * created during a H5Dwrite call, don't initialize the storage
                  * now, wait for the actual writes to each block and let the
@@ -1860,26 +1841,30 @@ H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc
                  * fill values to the chunks they allocate space for.  Yes,
                  * this is icky. -QAK
                  */
-                if(!(dset->shared->dcpl_cache.fill.alloc_time == H5D_ALLOC_TIME_INCR && time_alloc == H5D_ALLOC_WRITE))
-                    if(H5D__init_storage(dset, full_overwrite, old_dim, dxpl_id) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize dataset with fill value")
+                if (!(dset->shared->dcpl_cache.fill.alloc_time == H5D_ALLOC_TIME_INCR &&
+                      time_alloc == H5D_ALLOC_WRITE))
+                    if (H5D__init_storage(dset, full_overwrite, old_dim, dxpl_id) < 0)
+                        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                                    "unable to initialize dataset with fill value")
             } /* end if */
             else {
-                H5D_fill_value_t    fill_status;    /* The fill value status */
+                H5D_fill_value_t fill_status; /* The fill value status */
 
                 /* Check the dataset's fill-value status */
-                if(H5P_is_fill_value_defined(&dset->shared->dcpl_cache.fill, &fill_status) < 0)
+                if (H5P_is_fill_value_defined(&dset->shared->dcpl_cache.fill, &fill_status) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined")
 
                 /* If we are filling the dataset on allocation or "if set" and
                  * the fill value _is_ set, do that now */
-                if(dset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_ALLOC ||
-                        (dset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_IFSET && fill_status == H5D_FILL_VALUE_USER_DEFINED)) {
-                    if(H5D__init_storage(dset, full_overwrite, old_dim, dxpl_id) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize dataset with fill value")
+                if (dset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_ALLOC ||
+                    (dset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_IFSET &&
+                     fill_status == H5D_FILL_VALUE_USER_DEFINED)) {
+                    if (H5D__init_storage(dset, full_overwrite, old_dim, dxpl_id) < 0)
+                        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                                    "unable to initialize dataset with fill value")
                 } /* end if */
-            } /* end else */
-        } /* end if */
+            }     /* end else */
+        }         /* end if */
 
         /* If we set the address (and aren't in the middle of creating the
          *      dataset), mark the layout header message for later writing to
@@ -1888,9 +1873,9 @@ H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc
         /* (The layout message is already in the dataset's object header, this
          *      operation just sets the address and makes it constant)
          */
-        if(time_alloc != H5D_ALLOC_CREATE && addr_set)
+        if (time_alloc != H5D_ALLOC_CREATE && addr_set)
             /* Mark the layout as dirty, for later writing to the file */
-            if(H5D__mark(dset, dxpl_id, H5D_MARK_LAYOUT) < 0)
+            if (H5D__mark(dset, dxpl_id, H5D_MARK_LAYOUT) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to mark dataspace as dirty")
     } /* end if */
 
@@ -1898,7 +1883,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__alloc_storage() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__init_storage
  *
@@ -1914,10 +1898,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__init_storage(const H5D_t *dset, hbool_t full_overwrite, hsize_t old_dim[],
-    hid_t dxpl_id)
+H5D__init_storage(const H5D_t *dset, hbool_t full_overwrite, hsize_t old_dim[], hid_t dxpl_id)
 {
-    herr_t        ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1926,18 +1909,20 @@ H5D__init_storage(const H5D_t *dset, hbool_t full_overwrite, hsize_t old_dim[],
     switch (dset->shared->layout.type) {
         case H5D_COMPACT:
             /* If we will be immediately overwriting the values, don't bother to clear them */
-            if(!full_overwrite) {
+            if (!full_overwrite) {
                 /* Fill the compact dataset storage */
-                if(H5D__compact_fill(dset, dxpl_id) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize compact dataset storage")
+                if (H5D__compact_fill(dset, dxpl_id) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+                                "unable to initialize compact dataset storage")
             } /* end if */
             break;
 
         case H5D_CONTIGUOUS:
             /* Don't write default fill values to external files */
             /* If we will be immediately overwriting the values, don't bother to clear them */
-            if((dset->shared->dcpl_cache.efl.nused == 0 || dset->shared->dcpl_cache.fill.buf) && !full_overwrite)
-                if(H5D__contig_fill(dset, dxpl_id) < 0)
+            if ((dset->shared->dcpl_cache.efl.nused == 0 || dset->shared->dcpl_cache.fill.buf) &&
+                !full_overwrite)
+                if (H5D__contig_fill(dset, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to allocate all chunks of dataset")
             break;
 
@@ -1947,13 +1932,13 @@ H5D__init_storage(const H5D_t *dset, hbool_t full_overwrite, hsize_t old_dim[],
              * for all chunks now and initialize each chunk with the fill value.
              */
             {
-                hsize_t             zero_dim[H5O_LAYOUT_NDIMS] = {0};
+                hsize_t zero_dim[H5O_LAYOUT_NDIMS] = {0};
 
                 /* Use zeros for old dimensions if not specified */
-                if(old_dim == NULL)
+                if (old_dim == NULL)
                     old_dim = zero_dim;
 
-                if(H5D__chunk_allocate(dset, dxpl_id, full_overwrite, old_dim) < 0)
+                if (H5D__chunk_allocate(dset, dxpl_id, full_overwrite, old_dim) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to allocate all chunks of dataset")
                 break;
             } /* end block */
@@ -1964,14 +1949,13 @@ H5D__init_storage(const H5D_t *dset, hbool_t full_overwrite, hsize_t old_dim[],
             HDassert("not implemented yet" && 0);
 #ifdef NDEBUG
             HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif                 /* NDEBUG */
     } /* end switch */ /*lint !e788 All appropriate cases are covered */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__init_storage() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__get_storage_size
  *
@@ -1988,15 +1972,16 @@ done:
 herr_t
 H5D__get_storage_size(H5D_t *dset, hid_t dxpl_id, hsize_t *storage_size)
 {
-    herr_t    ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(dset->shared->layout.type) {
+    switch (dset->shared->layout.type) {
         case H5D_CHUNKED:
-            if((*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage)) {
-                if(H5D__chunk_allocated(dset, dxpl_id, storage_size) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve chunked dataset allocated size")
+            if ((*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage)) {
+                if (H5D__chunk_allocated(dset, dxpl_id, storage_size) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL,
+                                "can't retrieve chunked dataset allocated size")
             } /* end if */
             else
                 *storage_size = 0;
@@ -2004,7 +1989,7 @@ H5D__get_storage_size(H5D_t *dset, hid_t dxpl_id, hsize_t *storage_size)
 
         case H5D_CONTIGUOUS:
             /* Datasets which are not allocated yet are using no space on disk */
-            if((*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage))
+            if ((*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage))
                 *storage_size = dset->shared->layout.storage.u.contig.size;
             else
                 *storage_size = 0;
@@ -2024,7 +2009,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__get_storage_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__get_offset
  *
@@ -2043,13 +2027,13 @@ done:
 haddr_t
 H5D__get_offset(const H5D_t *dset)
 {
-    haddr_t    ret_value = HADDR_UNDEF;
+    haddr_t ret_value = HADDR_UNDEF;
 
     FUNC_ENTER_PACKAGE
 
     HDassert(dset);
 
-    switch(dset->shared->layout.type) {
+    switch (dset->shared->layout.type) {
         case H5D_CHUNKED:
         case H5D_COMPACT:
             break;
@@ -2057,7 +2041,8 @@ H5D__get_offset(const H5D_t *dset)
         case H5D_CONTIGUOUS:
             /* If dataspace hasn't been allocated or dataset is stored in
              * an external file, the value will be HADDR_UNDEF. */
-            if(dset->shared->dcpl_cache.efl.nused == 0 || H5F_addr_defined(dset->shared->layout.storage.u.contig.addr))
+            if (dset->shared->dcpl_cache.efl.nused == 0 ||
+                H5F_addr_defined(dset->shared->layout.storage.u.contig.addr))
                 /* Return the absolute dataset offset from the beginning of file. */
                 ret_value = dset->shared->layout.storage.u.contig.addr + H5F_BASE_ADDR(dset->oloc.file);
             break;
@@ -2072,7 +2057,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__get_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_vlen_reclaim
  *
@@ -2091,11 +2075,11 @@ done:
 herr_t
 H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id, void *buf)
 {
-    H5T_t *type;                /* Datatype */
-    H5S_sel_iter_op_t dset_op;  /* Operator for iteration */
-    H5T_vlen_alloc_info_t _vl_alloc_info;       /* VL allocation info buffer */
-    H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info;   /* VL allocation info */
-    herr_t ret_value;
+    H5T_t *                type;                            /* Datatype */
+    H5S_sel_iter_op_t      dset_op;                         /* Operator for iteration */
+    H5T_vlen_alloc_info_t  _vl_alloc_info;                  /* VL allocation info buffer */
+    H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info; /* VL allocation info */
+    herr_t                 ret_value;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2105,24 +2089,23 @@ H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id, void *buf)
     HDassert(H5P_isa_class(plist_id, H5P_DATASET_XFER));
     HDassert(buf);
 
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype")
 
     /* Get the allocation info */
-    if(H5T_vlen_get_alloc_info(plist_id,&vl_alloc_info) < 0)
+    if (H5T_vlen_get_alloc_info(plist_id, &vl_alloc_info) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to retrieve VL allocation info")
 
     /* Call H5S_select_iterate with args, etc. */
-    dset_op.op_type = H5S_SEL_ITER_OP_APP;
-    dset_op.u.app_op.op = H5T_vlen_reclaim;
+    dset_op.op_type          = H5S_SEL_ITER_OP_APP;
+    dset_op.u.app_op.op      = H5T_vlen_reclaim;
     dset_op.u.app_op.type_id = type_id;
 
     ret_value = H5S_select_iterate(buf, type, space, &dset_op, vl_alloc_info);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D_vlen_reclaim() */
-
+} /* end H5D_vlen_reclaim() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5D__vlen_get_buf_size_alloc
@@ -2143,12 +2126,12 @@ void *
 H5D__vlen_get_buf_size_alloc(size_t size, void *info)
 {
     H5D_vlen_bufsize_t *vlen_bufsize = (H5D_vlen_bufsize_t *)info;
-    void *ret_value;    /* Return value */
+    void *              ret_value; /* Return value */
 
     FUNC_ENTER_PACKAGE_NOERR
 
     /* Get a temporary pointer to space for the VL data */
-    if((vlen_bufsize->vl_tbuf = H5FL_BLK_REALLOC(vlen_vl_buf, vlen_bufsize->vl_tbuf, size)) != NULL)
+    if ((vlen_bufsize->vl_tbuf = H5FL_BLK_REALLOC(vlen_vl_buf, vlen_bufsize->vl_tbuf, size)) != NULL)
         vlen_bufsize->size += size;
 
     /* Set return value */
@@ -2157,7 +2140,6 @@ H5D__vlen_get_buf_size_alloc(size_t size, void *info)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__vlen_get_buf_size_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__vlen_get_buf_size
  *
@@ -2185,11 +2167,12 @@ H5D__vlen_get_buf_size_alloc(size_t size, void *info)
  */
 /* ARGSUSED */
 herr_t
-H5D__vlen_get_buf_size(void H5_ATTR_UNUSED *elem, hid_t type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t *point, void *op_data)
+H5D__vlen_get_buf_size(void H5_ATTR_UNUSED *elem, hid_t type_id, unsigned H5_ATTR_UNUSED ndim,
+                       const hsize_t *point, void *op_data)
 {
     H5D_vlen_bufsize_t *vlen_bufsize = (H5D_vlen_bufsize_t *)op_data;
-    H5T_t *dt;                          /* Datatype for operation */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5T_t *             dt;                  /* Datatype for operation */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -2197,26 +2180,27 @@ H5D__vlen_get_buf_size(void H5_ATTR_UNUSED *elem, hid_t type_id, unsigned H5_ATT
     HDassert(H5I_DATATYPE == H5I_get_type(type_id));
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object(type_id)))
+    if (NULL == (dt = (H5T_t *)H5I_object(type_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Make certain there is enough fixed-length buffer available */
-    if(NULL == (vlen_bufsize->fl_tbuf = H5FL_BLK_REALLOC(vlen_fl_buf, vlen_bufsize->fl_tbuf, H5T_get_size(dt))))
+    if (NULL ==
+        (vlen_bufsize->fl_tbuf = H5FL_BLK_REALLOC(vlen_fl_buf, vlen_bufsize->fl_tbuf, H5T_get_size(dt))))
         HGOTO_ERROR(H5E_DATASET, H5E_NOSPACE, FAIL, "can't resize tbuf")
 
     /* Select point to read in */
-    if(H5S_select_elements(vlen_bufsize->fspace, H5S_SELECT_SET, (size_t)1, point) < 0)
+    if (H5S_select_elements(vlen_bufsize->fspace, H5S_SELECT_SET, (size_t)1, point) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "can't select point")
 
     /* Read in the point (with the custom VL memory allocator) */
-    if(H5D__read(vlen_bufsize->dset, type_id, vlen_bufsize->mspace, vlen_bufsize->fspace, vlen_bufsize->xfer_pid, vlen_bufsize->fl_tbuf) < 0)
+    if (H5D__read(vlen_bufsize->dset, type_id, vlen_bufsize->mspace, vlen_bufsize->fspace,
+                  vlen_bufsize->xfer_pid, vlen_bufsize->fl_tbuf) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read point")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__vlen_get_buf_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__check_filters
  *
@@ -2232,8 +2216,8 @@ done:
 herr_t
 H5D__check_filters(H5D_t *dataset)
 {
-    H5O_fill_t *fill;                   /* Dataset's fill value */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_fill_t *fill;                /* Dataset's fill value */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -2246,31 +2230,30 @@ H5D__check_filters(H5D_t *dataset)
      * that requires writing on an extend.
      */
     fill = &dataset->shared->dcpl_cache.fill;
-    if(!dataset->shared->checked_filters) {
-        H5D_fill_value_t fill_status;       /* Whether the fill value is defined */
+    if (!dataset->shared->checked_filters) {
+        H5D_fill_value_t fill_status; /* Whether the fill value is defined */
 
         /* Retrieve the "defined" status of the fill value */
-        if(H5P_is_fill_value_defined(fill, &fill_status) < 0)
+        if (H5P_is_fill_value_defined(fill, &fill_status) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Couldn't retrieve fill value from dataset.")
 
         /* See if we can check the filter status */
-        if(fill_status == H5D_FILL_VALUE_DEFAULT || fill_status == H5D_FILL_VALUE_USER_DEFINED) {
-            if(fill->fill_time == H5D_FILL_TIME_ALLOC ||
-                    (fill->fill_time == H5D_FILL_TIME_IFSET && fill_status == H5D_FILL_VALUE_USER_DEFINED)) {
+        if (fill_status == H5D_FILL_VALUE_DEFAULT || fill_status == H5D_FILL_VALUE_USER_DEFINED) {
+            if (fill->fill_time == H5D_FILL_TIME_ALLOC ||
+                (fill->fill_time == H5D_FILL_TIME_IFSET && fill_status == H5D_FILL_VALUE_USER_DEFINED)) {
                 /* Filters must have encoding enabled. Ensure that all filters can be applied */
-                if(H5Z_can_apply(dataset->shared->dcpl_id, dataset->shared->type_id) < 0)
+                if (H5Z_can_apply(dataset->shared->dcpl_id, dataset->shared->type_id) < 0)
                     HGOTO_ERROR(H5E_PLINE, H5E_CANAPPLY, FAIL, "can't apply filters")
 
                 dataset->shared->checked_filters = TRUE;
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__check_filters() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__set_extent
  *
@@ -2287,11 +2270,11 @@ done:
 herr_t
 H5D__set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id)
 {
-    H5S_t   *space;                     /* Dataset's dataspace */
-    int     rank;                       /* Dataspace # of dimensions */
-    hsize_t curr_dims[H5O_LAYOUT_NDIMS];/* Current dimension sizes */
-    htri_t  changed;                    /* Whether the dataspace changed size */
-    herr_t  ret_value = SUCCEED;        /* Return value */
+    H5S_t * space;                       /* Dataset's dataspace */
+    int     rank;                        /* Dataspace # of dimensions */
+    hsize_t curr_dims[H5O_LAYOUT_NDIMS]; /* Current dimension sizes */
+    htri_t  changed;                     /* Whether the dataspace changed size */
+    herr_t  ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -2300,41 +2283,42 @@ H5D__set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id)
     HDassert(size);
 
     /* Check if we are allowed to modify this file */
-    if(0 == (H5F_INTENT(dset->oloc.file) & H5F_ACC_RDWR))
+    if (0 == (H5F_INTENT(dset->oloc.file) & H5F_ACC_RDWR))
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "no write intent on file")
 
-    /* Check if we are allowed to modify the space; only datasets with chunked and external storage are allowed to be modified */
-    if(H5D_COMPACT == dset->shared->layout.type)
+    /* Check if we are allowed to modify the space; only datasets with chunked and external storage are
+     * allowed to be modified */
+    if (H5D_COMPACT == dset->shared->layout.type)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "dataset has compact storage")
-    if(H5D_CONTIGUOUS == dset->shared->layout.type && 0 == dset->shared->dcpl_cache.efl.nused)
+    if (H5D_CONTIGUOUS == dset->shared->layout.type && 0 == dset->shared->dcpl_cache.efl.nused)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "dataset has contiguous storage")
 
     /* Check if the filters in the DCPL will need to encode, and if so, can they? */
-    if(H5D__check_filters(dset) < 0)
+    if (H5D__check_filters(dset) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't apply filters")
 
     /* Get the dataspace */
     space = dset->shared->space;
 
     /* Check if we are shrinking or expanding any of the dimensions */
-    if((rank = H5S_get_simple_extent_dims(space, curr_dims, NULL)) < 0)
+    if ((rank = H5S_get_simple_extent_dims(space, curr_dims, NULL)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataset dimensions")
 
     /* Modify the size of the dataspace */
-    if((changed = H5S_set_extent(space, size)) < 0)
+    if ((changed = H5S_set_extent(space, size)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to modify size of dataspace")
 
     /* Don't bother updating things, unless they've changed */
-    if(changed) {
-        hbool_t shrink = FALSE;             /* Flag to indicate a dimension has shrank */
-        hbool_t expand = FALSE;             /* Flag to indicate a dimension has grown */
-        unsigned u;                         /* Local index variable */
+    if (changed) {
+        hbool_t  shrink = FALSE; /* Flag to indicate a dimension has shrank */
+        hbool_t  expand = FALSE; /* Flag to indicate a dimension has grown */
+        unsigned u;              /* Local index variable */
 
         /* Determine if we are shrinking and/or expanding any dimensions */
-        for(u = 0; u < (unsigned)rank; u++) {
-            if(size[u] < curr_dims[u])
+        for (u = 0; u < (unsigned)rank; u++) {
+            if (size[u] < curr_dims[u])
                 shrink = TRUE;
-            if(size[u] > curr_dims[u])
+            if (size[u] > curr_dims[u])
                 expand = TRUE;
         } /* end for */
 
@@ -2343,17 +2327,17 @@ H5D__set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id)
          *-------------------------------------------------------------------------
          */
         /* Update the index values for the cached chunks for this dataset */
-        if(H5D_CHUNKED == dset->shared->layout.type) {
+        if (H5D_CHUNKED == dset->shared->layout.type) {
             /* Update the cached chunk info */
-            if(H5D__chunk_set_info(dset) < 0)
+            if (H5D__chunk_set_info(dset) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to update # of chunks")
-            if(H5D__chunk_update_cache(dset, dxpl_id) < 0)
+            if (H5D__chunk_update_cache(dset, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update cached chunk indices")
         } /* end if */
 
         /* Allocate space for the new parts of the dataset, if appropriate */
-        if(expand && dset->shared->dcpl_cache.fill.alloc_time == H5D_ALLOC_TIME_EARLY)
-            if(H5D__alloc_storage(dset, dxpl_id, H5D_ALLOC_EXTEND, FALSE, curr_dims) < 0)
+        if (expand && dset->shared->dcpl_cache.fill.alloc_time == H5D_ALLOC_TIME_EARLY)
+            if (H5D__alloc_storage(dset, dxpl_id, H5D_ALLOC_EXTEND, FALSE, curr_dims) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset storage")
 
         /*-------------------------------------------------------------------------
@@ -2362,15 +2346,16 @@ H5D__set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id)
          * and if the chunks are written
          *-------------------------------------------------------------------------
          */
-        if(shrink && H5D_CHUNKED == dset->shared->layout.type &&
-                ((*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage)
-                || (dset->shared->layout.ops->is_data_cached && (*dset->shared->layout.ops->is_data_cached)(dset->shared))))
+        if (shrink && H5D_CHUNKED == dset->shared->layout.type &&
+            ((*dset->shared->layout.ops->is_space_alloc)(&dset->shared->layout.storage) ||
+             (dset->shared->layout.ops->is_data_cached &&
+              (*dset->shared->layout.ops->is_data_cached)(dset->shared))))
             /* Remove excess chunks */
-            if(H5D__chunk_prune_by_extent(dset, dxpl_id, curr_dims) < 0)
+            if (H5D__chunk_prune_by_extent(dset, dxpl_id, curr_dims) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to remove chunks")
 
         /* Mark the dataspace as dirty, for later writing to the file */
-        if(H5D__mark(dset, dxpl_id, H5D_MARK_SPACE) < 0)
+        if (H5D__mark(dset, dxpl_id, H5D_MARK_SPACE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to mark dataspace as dirty")
     } /* end if */
 
@@ -2378,7 +2363,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__set_extent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__flush_sieve_buf
  *
@@ -2395,7 +2379,7 @@ done:
 herr_t
 H5D__flush_sieve_buf(H5D_t *dataset, hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -2403,12 +2387,14 @@ H5D__flush_sieve_buf(H5D_t *dataset, hid_t dxpl_id)
     HDassert(dataset);
 
     /* Flush the raw data buffer, if we have a dirty one */
-    if(dataset->shared->cache.contig.sieve_buf && dataset->shared->cache.contig.sieve_dirty) {
-        HDassert(dataset->shared->layout.type != H5D_COMPACT);      /* We should never have a sieve buffer for compact storage */
+    if (dataset->shared->cache.contig.sieve_buf && dataset->shared->cache.contig.sieve_dirty) {
+        HDassert(dataset->shared->layout.type !=
+                 H5D_COMPACT); /* We should never have a sieve buffer for compact storage */
 
         /* Write dirty data sieve buffer to file */
-        if(H5F_block_write(dataset->oloc.file, H5FD_MEM_DRAW, dataset->shared->cache.contig.sieve_loc,
-                dataset->shared->cache.contig.sieve_size, dxpl_id, dataset->shared->cache.contig.sieve_buf) < 0)
+        if (H5F_block_write(dataset->oloc.file, H5FD_MEM_DRAW, dataset->shared->cache.contig.sieve_loc,
+                            dataset->shared->cache.contig.sieve_size, dxpl_id,
+                            dataset->shared->cache.contig.sieve_buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
 
         /* Reset sieve buffer dirty flag */
@@ -2419,7 +2405,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__flush_sieve_buf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__flush_real
  *
@@ -2436,8 +2421,8 @@ done:
 herr_t
 H5D__flush_real(H5D_t *dataset, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Pointer to dataset's object header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *oh        = NULL;    /* Pointer to dataset's object header */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -2445,16 +2430,16 @@ H5D__flush_real(H5D_t *dataset, hid_t dxpl_id)
     HDassert(dataset);
 
     /* Check for metadata changes that will require updating the object's modification time */
-    if(dataset->shared->layout_dirty || dataset->shared->space_dirty) {
-        unsigned update_flags = H5O_UPDATE_TIME;        /* Modification time flag */
+    if (dataset->shared->layout_dirty || dataset->shared->space_dirty) {
+        unsigned update_flags = H5O_UPDATE_TIME; /* Modification time flag */
 
         /* Pin the object header */
-        if(NULL == (oh = H5O_pin(&dataset->oloc, dxpl_id)))
+        if (NULL == (oh = H5O_pin(&dataset->oloc, dxpl_id)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTPIN, FAIL, "unable to pin dataset object header")
 
         /* Update the layout on disk, if it's been changed */
-        if(dataset->shared->layout_dirty) {
-            if(H5D__layout_oh_write(dataset, dxpl_id, oh, update_flags) < 0)
+        if (dataset->shared->layout_dirty) {
+            if (H5D__layout_oh_write(dataset, dxpl_id, oh, update_flags) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update layout/pline/efl info")
             dataset->shared->layout_dirty = FALSE;
 
@@ -2463,8 +2448,8 @@ H5D__flush_real(H5D_t *dataset, hid_t dxpl_id)
         } /* end if */
 
         /* Update the dataspace on disk, if it's been changed */
-        if(dataset->shared->space_dirty) {
-            if(H5S_write(dataset->oloc.file, dxpl_id, oh, update_flags, dataset->shared->space) < 0)
+        if (dataset->shared->space_dirty) {
+            if (H5S_write(dataset->oloc.file, dxpl_id, oh, update_flags, dataset->shared->space) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update file with new dataspace")
             dataset->shared->space_dirty = FALSE;
 
@@ -2477,20 +2462,18 @@ H5D__flush_real(H5D_t *dataset, hid_t dxpl_id)
     } /* end if */
 
     /* Flush cached raw data for each kind of dataset layout */
-    if(dataset->shared->layout.ops->flush &&
-            (dataset->shared->layout.ops->flush)(dataset, dxpl_id) < 0)
+    if (dataset->shared->layout.ops->flush && (dataset->shared->layout.ops->flush)(dataset, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to flush raw data")
 
 done:
     /* Release pointer to object header */
-    if(oh != NULL)
-        if(H5O_unpin(oh) < 0)
+    if (oh != NULL)
+        if (H5O_unpin(oh) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTUNPIN, FAIL, "unable to unpin dataset object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__flush_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__mark
  *
@@ -2507,7 +2490,7 @@ done:
 herr_t
 H5D__mark(const H5D_t *dataset, hid_t H5_ATTR_UNUSED dxpl_id, unsigned flags)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -2516,15 +2499,14 @@ H5D__mark(const H5D_t *dataset, hid_t H5_ATTR_UNUSED dxpl_id, unsigned flags)
     HDassert(!(flags & (unsigned)~(H5D_MARK_SPACE | H5D_MARK_LAYOUT)));
 
     /* Mark aspects of the dataset as dirty */
-    if(flags & H5D_MARK_SPACE)
+    if (flags & H5D_MARK_SPACE)
         dataset->shared->space_dirty = TRUE;
-    if(flags & H5D_MARK_LAYOUT)
+    if (flags & H5D_MARK_LAYOUT)
         dataset->shared->layout_dirty = TRUE;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__mark() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__flush_cb
  *
@@ -2541,9 +2523,9 @@ H5D__mark(const H5D_t *dataset, hid_t H5_ATTR_UNUSED dxpl_id, unsigned flags)
 static int
 H5D__flush_cb(void *_dataset, hid_t H5_ATTR_UNUSED id, void *_udata)
 {
-    H5D_t       *dataset = (H5D_t *)_dataset;   /* Dataset pointer */
-    H5D_flush_ud_t *udata = (H5D_flush_ud_t *)_udata;   /* User data for callback */
-    int         ret_value = H5_ITER_CONT;       /* Return value */
+    H5D_t *         dataset   = (H5D_t *)_dataset;        /* Dataset pointer */
+    H5D_flush_ud_t *udata     = (H5D_flush_ud_t *)_udata; /* User data for callback */
+    int             ret_value = H5_ITER_CONT;             /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -2551,9 +2533,9 @@ H5D__flush_cb(void *_dataset, hid_t H5_ATTR_UNUSED id, void *_udata)
     HDassert(dataset);
 
     /* Check for dataset in same file */
-    if(udata->f == dataset->oloc.file) {
+    if (udata->f == dataset->oloc.file) {
         /* Flush the dataset's information */
-        if(H5D__flush_real(dataset, udata->dxpl_id) < 0)
+        if (H5D__flush_real(dataset, udata->dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, H5_ITER_ERROR, "unable to flush cached dataset info")
     } /* end if */
 
@@ -2561,7 +2543,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__flush_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_flush
  *
@@ -2579,7 +2560,7 @@ herr_t
 H5D_flush(const H5F_t *f, hid_t dxpl_id)
 {
     H5D_flush_ud_t udata;               /* User data for callback */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2587,18 +2568,17 @@ H5D_flush(const H5F_t *f, hid_t dxpl_id)
     HDassert(f);
 
     /* Set user data for callback */
-    udata.f = f;
+    udata.f       = f;
     udata.dxpl_id = dxpl_id;
 
     /* Iterate over all the open datasets */
-    if(H5I_iterate(H5I_DATASET, H5D__flush_cb, &udata, FALSE) < 0)
+    if (H5I_iterate(H5I_DATASET, H5D__flush_cb, &udata, FALSE) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to flush cached dataset info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_get_create_plist
  *
@@ -2618,104 +2598,106 @@ done:
 hid_t
 H5D_get_create_plist(H5D_t *dset)
 {
-    H5P_genplist_t      *dcpl_plist;            /* Dataset's DCPL */
-    H5P_genplist_t      *new_plist;             /* Copy of dataset's DCPL */
-    H5O_fill_t          copied_fill;            /* Fill value to tweak */
-    hid_t        new_dcpl_id = FAIL;
-    hid_t        ret_value;              /* Return value */
+    H5P_genplist_t *dcpl_plist;  /* Dataset's DCPL */
+    H5P_genplist_t *new_plist;   /* Copy of dataset's DCPL */
+    H5O_fill_t      copied_fill; /* Fill value to tweak */
+    hid_t           new_dcpl_id = FAIL;
+    hid_t           ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
-    if(NULL == (dcpl_plist = (H5P_genplist_t *)H5I_object(dset->shared->dcpl_id)))
+    if (NULL == (dcpl_plist = (H5P_genplist_t *)H5I_object(dset->shared->dcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Copy the creation property list */
-    if((new_dcpl_id = H5P_copy_plist(dcpl_plist, TRUE)) < 0)
+    if ((new_dcpl_id = H5P_copy_plist(dcpl_plist, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to copy the creation property list")
-    if(NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_dcpl_id)))
+    if (NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_dcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Retrieve any object creation properties */
-    if(H5O_get_create_plist(&dset->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
+    if (H5O_get_create_plist(&dset->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object creation info")
 
     /* Get the fill value property */
-    if(H5P_get(new_plist, H5D_CRT_FILL_VALUE_NAME, &copied_fill) < 0)
+    if (H5P_get(new_plist, H5D_CRT_FILL_VALUE_NAME, &copied_fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
     /* Check if there is a fill value, but no type yet */
-    if(copied_fill.buf != NULL && copied_fill.type == NULL) {
-        H5T_path_t *tpath;      /* Conversion information*/
+    if (copied_fill.buf != NULL && copied_fill.type == NULL) {
+        H5T_path_t *tpath; /* Conversion information*/
 
         /* Copy the dataset type into the fill value message */
-        if(NULL == (copied_fill.type = H5T_copy(dset->shared->type, H5T_COPY_TRANSIENT)))
+        if (NULL == (copied_fill.type = H5T_copy(dset->shared->type, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to copy dataset datatype for fill value")
 
         /* Set up type conversion function */
-        if(NULL == (tpath = H5T_path_find(dset->shared->type, copied_fill.type, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
-            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest data types")
+        if (NULL == (tpath = H5T_path_find(dset->shared->type, copied_fill.type, NULL, NULL, H5AC_ind_dxpl_id,
+                                           FALSE)))
+            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
+                        "unable to convert between src and dest data types")
 
         /* Convert disk form of fill value into memory form */
-        if(!H5T_path_noop(tpath)) {
-            hid_t dst_id, src_id;       /* Source & destination datatypes for type conversion */
-            uint8_t *bkg_buf = NULL;    /* Background conversion buffer */
-            size_t bkg_size;            /* Size of background buffer */
+        if (!H5T_path_noop(tpath)) {
+            hid_t    dst_id, src_id; /* Source & destination datatypes for type conversion */
+            uint8_t *bkg_buf = NULL; /* Background conversion buffer */
+            size_t   bkg_size;       /* Size of background buffer */
 
             /* Wrap copies of types to convert */
             dst_id = H5I_register(H5I_DATATYPE, H5T_copy(copied_fill.type, H5T_COPY_TRANSIENT), FALSE);
-            if(dst_id < 0)
+            if (dst_id < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy/register datatype")
             src_id = H5I_register(H5I_DATATYPE, H5T_copy(dset->shared->type, H5T_COPY_ALL), FALSE);
-            if(src_id < 0) {
+            if (src_id < 0) {
                 H5I_dec_ref(dst_id);
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy/register datatype")
             } /* end if */
 
             /* Allocate a background buffer */
             bkg_size = MAX(H5T_GET_SIZE(copied_fill.type), H5T_GET_SIZE(dset->shared->type));
-            if(H5T_path_bkg(tpath) && NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, bkg_size))) {
+            if (H5T_path_bkg(tpath) && NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, bkg_size))) {
                 H5I_dec_ref(src_id);
                 H5I_dec_ref(dst_id);
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
             } /* end if */
 
             /* Convert fill value */
-            if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, copied_fill.buf, bkg_buf, H5AC_ind_dxpl_id) < 0) {
+            if (H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, copied_fill.buf, bkg_buf,
+                            H5AC_ind_dxpl_id) < 0) {
                 H5I_dec_ref(src_id);
                 H5I_dec_ref(dst_id);
-                if(bkg_buf)
+                if (bkg_buf)
                     bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf);
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
             } /* end if */
 
             /* Release local resources */
-            if(H5I_dec_ref(src_id) < 0)
+            if (H5I_dec_ref(src_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to close temporary object")
-            if(H5I_dec_ref(dst_id) < 0)
+            if (H5I_dec_ref(dst_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to close temporary object")
-            if(bkg_buf)
+            if (bkg_buf)
                 bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Set back the fill value property to property list */
-    if(H5P_set(new_plist, H5D_CRT_FILL_VALUE_NAME, &copied_fill) < 0)
+    if (H5P_set(new_plist, H5D_CRT_FILL_VALUE_NAME, &copied_fill) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to set property list fill value")
 
     /* Set the return value */
     ret_value = new_dcpl_id;
 
 done:
-    if(ret_value < 0)
-        if(new_dcpl_id > 0)
-            if(H5I_dec_app_ref(new_dcpl_id) < 0)
+    if (ret_value < 0)
+        if (new_dcpl_id > 0)
+            if (H5I_dec_app_ref(new_dcpl_id) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to close temporary object")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_get_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_get_access_plist
  *
@@ -2734,17 +2716,17 @@ done:
 hid_t
 H5D_get_access_plist(H5D_t *dset)
 {
-    H5P_genplist_t      *old_plist;     /* Stored DAPL from dset */
-    H5P_genplist_t      *new_plist;     /* New DAPL */
-    H5P_genplist_t      *def_fapl;      /* Default FAPL */
-    H5D_rdcc_t          def_chunk_info;               /* Default chunk cache property */
-    hid_t               new_dapl_id = FAIL;
-    hid_t               ret_value = FAIL;
+    H5P_genplist_t *old_plist;      /* Stored DAPL from dset */
+    H5P_genplist_t *new_plist;      /* New DAPL */
+    H5P_genplist_t *def_fapl;       /* Default FAPL */
+    H5D_rdcc_t      def_chunk_info; /* Default chunk cache property */
+    hid_t           new_dapl_id = FAIL;
+    hid_t           ret_value   = FAIL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Make a copy of the dataset's dataset access property list */
-    if(NULL == (old_plist = (H5P_genplist_t *)H5I_object(dset->shared->dapl_id)))
+    if (NULL == (old_plist = (H5P_genplist_t *)H5I_object(dset->shared->dapl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "can't get property list")
     if ((new_dapl_id = H5P_copy_plist(old_plist, TRUE)) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "can't copy dataset access property list")
@@ -2756,31 +2738,33 @@ H5D_get_access_plist(H5D_t *dset)
     if (dset->shared->layout.type == H5D_CHUNKED) {
         if (H5P_set(new_plist, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, &(dset->shared->cache.chunk.nslots)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache number of slots")
-        if (H5P_set(new_plist, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &(dset->shared->cache.chunk.nbytes_max)) < 0)
+        if (H5P_set(new_plist, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &(dset->shared->cache.chunk.nbytes_max)) <
+            0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache byte size")
         if (H5P_set(new_plist, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, &(dset->shared->cache.chunk.w0)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set preempt read chunks")
-    } else {
+    }
+    else {
         /* Get the default FAPL */
-        if(NULL == (def_fapl = (H5P_genplist_t *)H5I_object(H5P_LST_FILE_ACCESS_ID_g)))
+        if (NULL == (def_fapl = (H5P_genplist_t *)H5I_object(H5P_LST_FILE_ACCESS_ID_g)))
             HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a property list")
 
         /* Set the data cache number of slots to the value of the default FAPL */
         if (H5P_get(def_fapl, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, &def_chunk_info.nslots) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET,FAIL, "can't get data number of slots");
-        if(H5P_set(new_plist, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, &def_chunk_info.nslots) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get data number of slots");
+        if (H5P_set(new_plist, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, &def_chunk_info.nslots) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set data cache number of slots")
 
         /* Set the data cache byte size to the value of the default FAPL */
         if (H5P_get(def_fapl, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &def_chunk_info.nbytes_max) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET,FAIL, "can't get data cache byte size");
-        if(H5P_set(new_plist, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &def_chunk_info.nbytes_max) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get data cache byte size");
+        if (H5P_set(new_plist, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &def_chunk_info.nbytes_max) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set data cache byte size")
 
         /* Set the preempt read chunks property to the value of the default FAPL */
         if (H5P_get(def_fapl, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, &def_chunk_info.w0) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET,FAIL, "can't get preempt read chunks");
-        if(H5P_set(new_plist, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, &def_chunk_info.w0) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get preempt read chunks");
+        if (H5P_set(new_plist, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, &def_chunk_info.w0) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set preempt read chunks")
     } /* end if-else */
 
@@ -2788,16 +2772,15 @@ H5D_get_access_plist(H5D_t *dset)
     ret_value = new_dapl_id;
 
 done:
-    if(ret_value < 0) {
-        if(new_dapl_id > 0)
-            if(H5I_dec_app_ref(new_dapl_id) < 0)
+    if (ret_value < 0) {
+        if (new_dapl_id > 0)
+            if (H5I_dec_app_ref(new_dapl_id) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "can't free")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_get_access_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_get_space
  *
@@ -2815,29 +2798,28 @@ done:
 hid_t
 H5D_get_space(H5D_t *dset)
 {
-    H5S_t    *space = NULL;
-    hid_t       ret_value = FAIL;
+    H5S_t *space     = NULL;
+    hid_t  ret_value = FAIL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Read the data space message and return a data space object */
-    if(NULL == (space = H5S_copy(dset->shared->space, FALSE, TRUE)))
+    if (NULL == (space = H5S_copy(dset->shared->space, FALSE, TRUE)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get data space")
 
     /* Create an atom */
-    if((ret_value = H5I_register(H5I_DATASPACE, space, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASPACE, space, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace")
 
 done:
-    if(ret_value < 0)
-        if(space != NULL)
-            if(H5S_close(space) < 0)
+    if (ret_value < 0)
+        if (space != NULL)
+            if (H5S_close(space) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataspace")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_get_space() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D_get_type
  *
@@ -2855,33 +2837,33 @@ done:
 hid_t
 H5D_get_type(H5D_t *dset)
 {
-    H5T_t    *dt = NULL;
-    hid_t       ret_value = FAIL;
+    H5T_t *dt        = NULL;
+    hid_t  ret_value = FAIL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Patch the datatype's "top level" file pointer */
-    if(H5T_patch_file(dset->shared->type, dset->oloc.file) < 0)
+    if (H5T_patch_file(dset->shared->type, dset->oloc.file) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to patch datatype's file pointer")
 
     /* Copy the dataset's datatype */
-    if(NULL == (dt = H5T_copy(dset->shared->type, H5T_COPY_REOPEN)))
+    if (NULL == (dt = H5T_copy(dset->shared->type, H5T_COPY_REOPEN)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to copy datatype")
 
     /* Mark any datatypes as being in memory now */
-    if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
+    if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid datatype location")
 
     /* Lock copied type */
-    if(H5T_lock(dt, FALSE) < 0)
+    if (H5T_lock(dt, FALSE) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to lock transient datatype")
 
-    if((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register datatype")
 
 done:
-    if(ret_value < 0) {
-        if(dt && H5T_close(dt) < 0)
+    if (ret_value < 0) {
+        if (dt && H5T_close(dt) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release datatype")
     } /* end if */
 
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 7807000..a5025fe 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -15,73 +15,65 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE        /* suppress error about including H5Dpkg      */
-
+#define H5D_PACKAGE /* suppress error about including H5Dpkg      */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions        */
-#include "H5Dpkg.h"         /* Dataset functions        */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5FLprivate.h"    /* Free Lists               */
-#include "H5Iprivate.h"     /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management        */
-#include "H5Sprivate.h"     /* Dataspace                */
-#include "H5Tprivate.h"     /* Datatype                 */
+#include "H5private.h"   /* Generic Functions        */
+#include "H5Dpkg.h"      /* Dataset functions        */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5FLprivate.h" /* Free Lists               */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Sprivate.h"  /* Dataspace                */
+#include "H5Tprivate.h"  /* Datatype                 */
 
 #ifdef H5_HAVE_PARALLEL
 /* Remove this if H5R_DATASET_REGION is no longer used in this file */
 #include "H5Rpublic.h"
 #endif /*H5_HAVE_PARALLEL*/
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Internal I/O routines */
-static herr_t H5D__write(H5D_t *dataset, hid_t mem_type_id,
-    const H5S_t *mem_space, const H5S_t *file_space, hid_t dset_xfer_plist,
-    const void *buf);
-static herr_t H5D__pre_write(H5D_t *dset, hbool_t direct_write, hid_t mem_type_id,
-    const H5S_t *mem_space, const H5S_t *file_space, hid_t dxpl_id, const void *buf);
+static herr_t H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, const H5S_t *file_space,
+                         hid_t dset_xfer_plist, const void *buf);
+static herr_t H5D__pre_write(H5D_t *dset, hbool_t direct_write, hid_t mem_type_id, const H5S_t *mem_space,
+                             const H5S_t *file_space, hid_t dxpl_id, const void *buf);
 
 /* Setup/teardown routines */
 static herr_t H5D__ioinfo_init(H5D_t *dset,
 #ifndef H5_HAVE_PARALLEL
-const
+                               const
 #endif /* H5_HAVE_PARALLEL */
-    H5D_dxpl_cache_t *dxpl_cache,
-    hid_t dxpl_id, const H5D_type_info_t *type_info, H5D_storage_t *store,
-    H5D_io_info_t *io_info);
-static herr_t H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
-    hid_t dxpl_id, hid_t mem_type_id, hbool_t do_write,
-    H5D_type_info_t *type_info);
+                               H5D_dxpl_cache_t *dxpl_cache,
+                               hid_t dxpl_id, const H5D_type_info_t *type_info, H5D_storage_t *store,
+                               H5D_io_info_t *io_info);
+static herr_t H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
+                                 hid_t mem_type_id, hbool_t do_write, H5D_type_info_t *type_info);
 #ifdef H5_HAVE_PARALLEL
-static herr_t H5D__ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset,
-    hid_t dxpl_id, const H5S_t *file_space, const H5S_t *mem_space,
-    const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm);
+static herr_t H5D__ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, hid_t dxpl_id,
+                                 const H5S_t *file_space, const H5S_t *mem_space,
+                                 const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm);
 static herr_t H5D__ioinfo_term(H5D_io_info_t *io_info);
 #endif /* H5_HAVE_PARALLEL */
 static herr_t H5D__typeinfo_term(const H5D_type_info_t *type_info);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -89,8 +81,6 @@ static herr_t H5D__typeinfo_term(const H5D_type_info_t *type_info);
 /* Declare a free list to manage blocks of type conversion data */
 H5FL_BLK_DEFINE(type_conv);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5Dread
  *
@@ -122,87 +112,85 @@ H5FL_BLK_DEFINE(type_conv);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
-    hid_t file_space_id, hid_t plist_id, void *buf/*out*/)
+H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id,
+        void *buf /*out*/)
 {
-    H5D_t           *dset = NULL;
-    H5P_genplist_t        *plist;      /* Property list pointer */
-    const H5S_t           *mem_space = NULL;
-    const H5S_t           *file_space = NULL;
-    herr_t                  ret_value = SUCCEED;  /* Return value */
-    hsize_t         *direct_offset = NULL;
-    hbool_t         direct_read = FALSE;
+    H5D_t *         dset = NULL;
+    H5P_genplist_t *plist; /* Property list pointer */
+    const H5S_t *   mem_space      = NULL;
+    const H5S_t *   file_space     = NULL;
+    herr_t          ret_value      = SUCCEED; /* Return value */
+    hsize_t *       direct_offset  = NULL;
+    hbool_t         direct_read    = FALSE;
     uint32_t        direct_filters = 0;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id,
-             plist_id, buf);
+    H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id, plist_id, buf);
 
     /* check arguments */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
-    if(NULL == dset->oloc.file)
+    if (NULL == dset->oloc.file)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if(mem_space_id < 0 || file_space_id < 0)
+    if (mem_space_id < 0 || file_space_id < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
-    if(H5S_ALL != mem_space_id) {
-        if(NULL == (mem_space = (const H5S_t *)H5I_object_verify(mem_space_id, H5I_DATASPACE)))
+    if (H5S_ALL != mem_space_id) {
+        if (NULL == (mem_space = (const H5S_t *)H5I_object_verify(mem_space_id, H5I_DATASPACE)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
         /* Check for valid selection */
-        if(H5S_SELECT_VALID(mem_space) != TRUE)
+        if (H5S_SELECT_VALID(mem_space) != TRUE)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "selection+offset not within extent")
     } /* end if */
-    if(H5S_ALL != file_space_id) {
-        if(NULL == (file_space = (const H5S_t *)H5I_object_verify(file_space_id, H5I_DATASPACE)))
+    if (H5S_ALL != file_space_id) {
+        if (NULL == (file_space = (const H5S_t *)H5I_object_verify(file_space_id, H5I_DATASPACE)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
         /* Check for valid selection */
-        if(H5S_SELECT_VALID(file_space) != TRUE)
+        if (H5S_SELECT_VALID(file_space) != TRUE)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "selection+offset not within extent")
     } /* end if */
 
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == plist_id)
-        plist_id= H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+        plist_id = H5P_DATASET_XFER_DEFAULT;
+    else if (TRUE != H5P_isa_class(plist_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Get the dataset transfer property list */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
     /* Retrieve the 'direct read' flag */
-    if(H5P_get(plist, H5D_XFER_DIRECT_CHUNK_READ_FLAG_NAME, &direct_read) < 0)
+    if (H5P_get(plist, H5D_XFER_DIRECT_CHUNK_READ_FLAG_NAME, &direct_read) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting flag for direct chunk read")
 
-    if(direct_read) {
+    if (direct_read) {
         unsigned u;
         int      ndims = 0;
         hsize_t  dims[H5O_LAYOUT_NDIMS];
         hsize_t  internal_offset[H5O_LAYOUT_NDIMS];
 
-        if(H5D_CHUNKED != dset->shared->layout.type)
+        if (H5D_CHUNKED != dset->shared->layout.type)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a chunked dataset")
         /* Get the direct chunk offset property */
-        if(H5P_get(plist, H5D_XFER_DIRECT_CHUNK_READ_OFFSET_NAME, &direct_offset) < 0)
+        if (H5P_get(plist, H5D_XFER_DIRECT_CHUNK_READ_OFFSET_NAME, &direct_offset) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting direct offset from xfer properties")
 
         /* The library's chunking code requires the offset terminates with a zero. So transfer the
          * offset array to an internal offset array */
-        if((ndims = H5S_get_simple_extent_dims(dset->shared->space, dims, NULL)) < 0)
+        if ((ndims = H5S_get_simple_extent_dims(dset->shared->space, dims, NULL)) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't retrieve dataspace extent dims")
 
-        for(u = 0; u < ndims; u++) {
+        for (u = 0; u < ndims; u++) {
             /* Make sure the offset doesn't exceed the dataset's dimensions */
-            if(direct_offset[u] > dims[u])
+            if (direct_offset[u] > dims[u])
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "offset exceeds dimensions of dataset")
 
             /* Make sure the offset fall right on a chunk's boundary */
-            if(direct_offset[u] % dset->shared->layout.u.chunk.dim[u])
+            if (direct_offset[u] % dset->shared->layout.u.chunk.dim[u])
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "offset doesn't fall on chunks's boundary")
 
             internal_offset[u] = direct_offset[u];
@@ -212,23 +200,22 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
         internal_offset[ndims] = 0;
 
         /* Read the raw chunk */
-        if(H5D__chunk_direct_read(dset, plist_id, internal_offset, &direct_filters, buf) < 0)
+        if (H5D__chunk_direct_read(dset, plist_id, internal_offset, &direct_filters, buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read chunk directly")
         /* Set the chunk filter mask property */
-        if(H5P_set(plist, H5D_XFER_DIRECT_CHUNK_READ_FILTERS_NAME, &direct_filters) < 0)
+        if (H5P_set(plist, H5D_XFER_DIRECT_CHUNK_READ_FILTERS_NAME, &direct_filters) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error setting filter mask xfer property")
     }
     else {
-      /* read raw data */
-      if(H5D__read(dset, mem_type_id, mem_space, file_space, plist_id, buf/*out*/) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
+        /* read raw data */
+        if (H5D__read(dset, mem_type_id, mem_space, file_space, plist_id, buf /*out*/) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
     }
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dread() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Dwrite
  *
@@ -261,72 +248,69 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
-    hid_t file_space_id, hid_t dxpl_id, const void *buf)
+H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id,
+         const void *buf)
 {
-    H5D_t           *dset = NULL;
-    H5P_genplist_t        *plist;      /* Property list pointer */
-    const H5S_t            *mem_space = NULL;
-    const H5S_t            *file_space = NULL;
-    hbool_t                 direct_write = FALSE;
-    herr_t                  ret_value = SUCCEED;  /* Return value */
+    H5D_t *         dset = NULL;
+    H5P_genplist_t *plist; /* Property list pointer */
+    const H5S_t *   mem_space    = NULL;
+    const H5S_t *   file_space   = NULL;
+    hbool_t         direct_write = FALSE;
+    herr_t          ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id,
-             dxpl_id, buf);
+    H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf);
 
     /* check arguments */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
-    if(NULL == dset->oloc.file)
+    if (NULL == dset->oloc.file)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Get the default dataset transfer property list if the user didn't provide one */
-    if(H5P_DEFAULT == dxpl_id)
-        dxpl_id= H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    if (H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Get the dataset transfer property list */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
     /* Retrieve the 'direct write' flag */
-    if(H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_NAME, &direct_write) < 0)
+    if (H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_NAME, &direct_write) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting flag for direct chunk write")
 
     /* Check dataspace selections if this is not a direct write */
-    if(!direct_write) {
-        if(mem_space_id < 0 || file_space_id < 0)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
+    if (!direct_write) {
+        if (mem_space_id < 0 || file_space_id < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
-        if(H5S_ALL != mem_space_id) {
-            if(NULL == (mem_space = (const H5S_t *)H5I_object_verify(mem_space_id, H5I_DATASPACE)))
+        if (H5S_ALL != mem_space_id) {
+            if (NULL == (mem_space = (const H5S_t *)H5I_object_verify(mem_space_id, H5I_DATASPACE)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
             /* Check for valid selection */
-            if(H5S_SELECT_VALID(mem_space) != TRUE)
+            if (H5S_SELECT_VALID(mem_space) != TRUE)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "memory selection+offset not within extent")
         } /* end if */
-        if(H5S_ALL != file_space_id) {
-            if(NULL == (file_space = (const H5S_t *)H5I_object_verify(file_space_id, H5I_DATASPACE)))
+        if (H5S_ALL != file_space_id) {
+            if (NULL == (file_space = (const H5S_t *)H5I_object_verify(file_space_id, H5I_DATASPACE)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
             /* Check for valid selection */
-            if(H5S_SELECT_VALID(file_space) != TRUE)
+            if (H5S_SELECT_VALID(file_space) != TRUE)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "file selection+offset not within extent")
         } /* end if */
     }
 
-    if(H5D__pre_write(dset, direct_write, mem_type_id, mem_space, file_space, dxpl_id, buf) < 0)
+    if (H5D__pre_write(dset, direct_write, mem_type_id, mem_space, file_space, dxpl_id, buf) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't prepare for writing data")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dwrite() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__pre_write
  *
@@ -340,52 +324,51 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__pre_write(H5D_t *dset, hbool_t direct_write, hid_t mem_type_id,
-         const H5S_t *mem_space, const H5S_t *file_space,
-         hid_t dxpl_id, const void *buf)
+H5D__pre_write(H5D_t *dset, hbool_t direct_write, hid_t mem_type_id, const H5S_t *mem_space,
+               const H5S_t *file_space, hid_t dxpl_id, const void *buf)
 {
-    herr_t                  ret_value = SUCCEED;  /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Direct chunk write */
-    if(direct_write) {
-        H5P_genplist_t *plist;      /* Property list pointer */
-        uint32_t direct_filters;
-        hsize_t *direct_offset;
-        uint32_t direct_datasize;
-        int      ndims = 0;
-        hsize_t  dims[H5O_LAYOUT_NDIMS];
-        hsize_t  internal_offset[H5O_LAYOUT_NDIMS];
-        unsigned u;
+    if (direct_write) {
+        H5P_genplist_t *plist; /* Property list pointer */
+        uint32_t        direct_filters;
+        hsize_t *       direct_offset;
+        uint32_t        direct_datasize;
+        int             ndims = 0;
+        hsize_t         dims[H5O_LAYOUT_NDIMS];
+        hsize_t         internal_offset[H5O_LAYOUT_NDIMS];
+        unsigned        u;
 
         /* Get the dataset transfer property list */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
-        if(H5D_CHUNKED != dset->shared->layout.type)
+        if (H5D_CHUNKED != dset->shared->layout.type)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a chunked dataset")
 
         /* Retrieve parameters for direct chunk write */
-        if(H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_NAME, &direct_filters) < 0)
+        if (H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_NAME, &direct_filters) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting filter info for direct chunk write")
-        if(H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_NAME, &direct_offset) < 0)
+        if (H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_NAME, &direct_offset) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting offset info for direct chunk write")
-        if(H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_NAME, &direct_datasize) < 0)
+        if (H5P_get(plist, H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_NAME, &direct_datasize) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting data size for direct chunk write")
 
         /* The library's chunking code requires the offset terminates with a zero. So transfer the
          * offset array to an internal offset array */
-        if((ndims = H5S_get_simple_extent_dims(dset->shared->space, dims, NULL)) < 0)
+        if ((ndims = H5S_get_simple_extent_dims(dset->shared->space, dims, NULL)) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't retrieve dataspace extent dims")
 
-        for(u = 0; u < ndims; u++) {
+        for (u = 0; u < ndims; u++) {
             /* Make sure the offset doesn't exceed the dataset's dimensions */
-            if(direct_offset[u] > dims[u])
+            if (direct_offset[u] > dims[u])
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "offset exceeds dimensions of dataset")
 
             /* Make sure the offset fall right on a chunk's boundary */
-            if(direct_offset[u] % dset->shared->layout.u.chunk.dim[u])
+            if (direct_offset[u] % dset->shared->layout.u.chunk.dim[u])
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "offset doesn't fall on chunks's boundary")
 
             internal_offset[u] = direct_offset[u];
@@ -395,12 +378,12 @@ H5D__pre_write(H5D_t *dset, hbool_t direct_write, hid_t mem_type_id,
         internal_offset[ndims] = 0;
 
         /* write raw data */
-        if(H5D__chunk_direct_write(dset, dxpl_id, direct_filters, internal_offset, direct_datasize, buf) < 0)
+        if (H5D__chunk_direct_write(dset, dxpl_id, direct_filters, internal_offset, direct_datasize, buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write chunk directly")
-    } /* end if */
-    else {     /* Normal write */
+    }      /* end if */
+    else { /* Normal write */
         /* write raw data */
-        if(H5D__write(dset, mem_type_id, mem_space, file_space, dxpl_id, buf) < 0)
+        if (H5D__write(dset, mem_type_id, mem_space, file_space, dxpl_id, buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data")
     } /* end else */
 
@@ -408,7 +391,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__pre_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__read
  *
@@ -423,91 +405,91 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
-    const H5S_t *file_space, hid_t dxpl_id, void *buf/*out*/)
+H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, const H5S_t *file_space, hid_t dxpl_id,
+          void *buf /*out*/)
 {
-    H5D_chunk_map_t fm;                 /* Chunk file<->memory mapping */
-    H5D_io_info_t io_info;              /* Dataset I/O info     */
-    H5D_type_info_t type_info;          /* Datatype info for operation */
-    hbool_t type_info_init = FALSE;     /* Whether the datatype info has been initialized */
-    H5S_t * projected_mem_space = NULL; /* If not NULL, ptr to dataspace containing a     */
-                                        /* projection of the supplied mem_space to a new  */
-                                        /* data space with rank equal to that of          */
-                                        /* file_space.                                    */
-                                        /*                                                */
-                                        /* This field is only used if                     */
-                                        /* H5S_select_shape_same() returns TRUE when      */
-                                        /* comparing the mem_space and the data_space,    */
-                                        /* and the mem_space have different rank.         */
-                                        /*                                                */
-                                        /* Note that if this variable is used, the        */
-                                        /* projected mem space must be discarded at the   */
-                                        /* end of the function to avoid a memory leak.    */
-    H5D_storage_t store;                /*union of EFL and chunk pointer in file space */
-    hssize_t    snelmts;                /*total number of elmts    (signed) */
-    hsize_t    nelmts;                 /*total number of elmts    */
+    H5D_chunk_map_t fm;                          /* Chunk file<->memory mapping */
+    H5D_io_info_t   io_info;                     /* Dataset I/O info     */
+    H5D_type_info_t type_info;                   /* Datatype info for operation */
+    hbool_t         type_info_init      = FALSE; /* Whether the datatype info has been initialized */
+    H5S_t *         projected_mem_space = NULL;  /* If not NULL, ptr to dataspace containing a     */
+                                                 /* projection of the supplied mem_space to a new  */
+                                                 /* data space with rank equal to that of          */
+                                                 /* file_space.                                    */
+                                                 /*                                                */
+                                                 /* This field is only used if                     */
+                                                 /* H5S_select_shape_same() returns TRUE when      */
+                                                 /* comparing the mem_space and the data_space,    */
+                                                 /* and the mem_space have different rank.         */
+                                                 /*                                                */
+                                                 /* Note that if this variable is used, the        */
+                                                 /* projected mem space must be discarded at the   */
+                                                 /* end of the function to avoid a memory leak.    */
+    H5D_storage_t store;                         /*union of EFL and chunk pointer in file space */
+    hssize_t      snelmts;                       /*total number of elmts    (signed) */
+    hsize_t       nelmts;                        /*total number of elmts    */
 #ifdef H5_HAVE_PARALLEL
-    hbool_t     io_info_init = FALSE;   /* Whether the I/O info has been initialized */
-#endif /*H5_HAVE_PARALLEL*/
-    hbool_t     io_op_init = FALSE;     /* Whether the I/O op has been initialized */
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    char        fake_char;              /* Temporary variable for NULL buffer pointers */
-    herr_t    ret_value = SUCCEED;    /* Return value    */
+    hbool_t io_info_init = FALSE;                /* Whether the I/O info has been initialized */
+#endif                                           /*H5_HAVE_PARALLEL*/
+    hbool_t           io_op_init = FALSE;        /* Whether the I/O op has been initialized */
+    H5D_dxpl_cache_t  _dxpl_cache;               /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
+    char              fake_char;                 /* Temporary variable for NULL buffer pointers */
+    herr_t            ret_value = SUCCEED;       /* Return value    */
 
     FUNC_ENTER_PACKAGE
 
     /* check args */
     HDassert(dataset && dataset->oloc.file);
 
-    if(!file_space)
+    if (!file_space)
         file_space = dataset->shared->space;
-    if(!mem_space)
+    if (!mem_space)
         mem_space = file_space;
-    if((snelmts = H5S_GET_SELECT_NPOINTS(mem_space)) < 0)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dst dataspace has invalid selection")
+    if ((snelmts = H5S_GET_SELECT_NPOINTS(mem_space)) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dst dataspace has invalid selection")
     H5_CHECKED_ASSIGN(nelmts, hsize_t, snelmts, hssize_t);
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Patch the top level file pointer for dt->shared->u.vlen.f if needed */
     H5T_patch_vlen_file(dataset->shared->type, dataset->oloc.file);
 
     /* Set up datatype info for operation */
-    if(H5D__typeinfo_init(dataset, dxpl_cache, dxpl_id, mem_type_id, FALSE, &type_info) < 0)
+    if (H5D__typeinfo_init(dataset, dxpl_cache, dxpl_id, mem_type_id, FALSE, &type_info) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set up type info")
     type_info_init = TRUE;
 
 #ifdef H5_HAVE_PARALLEL
     /* Collective access is not permissible without a MPI based VFD */
-    if(dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE &&
-       !(H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI)))
+    if (dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE &&
+        !(H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI)))
         HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPI-based drivers only")
 #endif /*H5_HAVE_PARALLEL*/
 
     /* Make certain that the number of elements in each selection is the same */
-    if(nelmts != (hsize_t)H5S_GET_SELECT_NPOINTS(file_space))
+    if (nelmts != (hsize_t)H5S_GET_SELECT_NPOINTS(file_space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src and dest data spaces have different sizes")
 
     /* Check for a NULL buffer, after the H5S_ALL dataspace selection has been handled */
-    if(NULL == buf) {
+    if (NULL == buf) {
         /* Check for any elements selected (which is invalid) */
-        if(nelmts > 0)
+        if (nelmts > 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no output buffer")
 
-    /* If the buffer is nil, and 0 element is selected, make a fake buffer.
-    * This is for some MPI package like ChaMPIon on NCSA's tungsten which
-    * doesn't support this feature.
-    */
+        /* If the buffer is nil, and 0 element is selected, make a fake buffer.
+         * This is for some MPI package like ChaMPIon on NCSA's tungsten which
+         * doesn't support this feature.
+         */
         buf = &fake_char;
     } /* end if */
 
     /* Make sure that both selections have their extents set */
-    if(!(H5S_has_extent(file_space)))
+    if (!(H5S_has_extent(file_space)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file dataspace does not have extent set")
-    if(!(H5S_has_extent(mem_space)))
+    if (!(H5S_has_extent(mem_space)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "memory dataspace does not have extent set")
 
     /* H5S_select_shape_same() has been modified to accept topologically identical
@@ -523,24 +505,24 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
      * Note that in general, this requires us to touch up the memory buffer as
      * well.
      */
-    if(TRUE == H5S_select_shape_same(mem_space, file_space) &&
-            H5S_GET_EXTENT_NDIMS(mem_space) != H5S_GET_EXTENT_NDIMS(file_space)) {
-        void *adj_buf = NULL;   /* Pointer to the location in buf corresponding  */
-                                /* to the beginning of the projected mem space.  */
+    if (TRUE == H5S_select_shape_same(mem_space, file_space) &&
+        H5S_GET_EXTENT_NDIMS(mem_space) != H5S_GET_EXTENT_NDIMS(file_space)) {
+        void *adj_buf = NULL; /* Pointer to the location in buf corresponding  */
+                              /* to the beginning of the projected mem space.  */
 
         /* Attempt to construct projected dataspace for memory dataspace */
-        if(H5S_select_construct_projection(mem_space, &projected_mem_space,
-                (unsigned)H5S_GET_EXTENT_NDIMS(file_space), buf, (const void **)&adj_buf, type_info.dst_type_size) < 0)
+        if (H5S_select_construct_projection(mem_space, &projected_mem_space,
+                                            (unsigned)H5S_GET_EXTENT_NDIMS(file_space), buf,
+                                            (const void **)&adj_buf, type_info.dst_type_size) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to construct projected memory dataspace")
         HDassert(projected_mem_space);
         HDassert(adj_buf);
 
         /* Switch to using projected memory dataspace & adjusted buffer */
         mem_space = projected_mem_space;
-        buf = adj_buf;
+        buf       = adj_buf;
     } /* end if */
 
-
     /* Retrieve dataset properties */
     /* <none needed in the general case> */
 
@@ -550,26 +532,30 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
      * fill time is NEVER, there is no way to tell whether part of data
      * has been overwritten.  So just proceed in reading.
      */
-    if(nelmts > 0 && dataset->shared->dcpl_cache.efl.nused == 0 &&
-            !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage) &&
-            !(dataset->shared->layout.ops->is_data_cached && (*dataset->shared->layout.ops->is_data_cached)(dataset->shared))) {
-        H5D_fill_value_t fill_status;   /* Whether/How the fill value is defined */
+    if (nelmts > 0 && dataset->shared->dcpl_cache.efl.nused == 0 &&
+        !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage) &&
+        !(dataset->shared->layout.ops->is_data_cached &&
+          (*dataset->shared->layout.ops->is_data_cached)(dataset->shared))) {
+        H5D_fill_value_t fill_status; /* Whether/How the fill value is defined */
 
         /* Retrieve dataset's fill-value properties */
-        if(H5P_is_fill_value_defined(&dataset->shared->dcpl_cache.fill, &fill_status) < 0)
+        if (H5P_is_fill_value_defined(&dataset->shared->dcpl_cache.fill, &fill_status) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined")
 
         /* Should be impossible, but check anyway... */
-        if(fill_status == H5D_FILL_VALUE_UNDEFINED &&
-                (dataset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_ALLOC || dataset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_IFSET))
-            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "read failed: dataset doesn't exist, no data can be read")
+        if (fill_status == H5D_FILL_VALUE_UNDEFINED &&
+            (dataset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_ALLOC ||
+             dataset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_IFSET))
+            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL,
+                        "read failed: dataset doesn't exist, no data can be read")
 
         /* If we're never going to fill this dataset, just leave the junk in the user's buffer */
-        if(dataset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_NEVER)
+        if (dataset->shared->dcpl_cache.fill.fill_time == H5D_FILL_TIME_NEVER)
             HGOTO_DONE(SUCCEED)
 
         /* Go fill the user's selection with the dataset's fill value */
-        if(H5D__fill(dataset->shared->dcpl_cache.fill.buf, dataset->shared->type, buf, type_info.mem_type, mem_space, dxpl_id) < 0)
+        if (H5D__fill(dataset->shared->dcpl_cache.fill.buf, dataset->shared->type, buf, type_info.mem_type,
+                      mem_space, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "filling buf failed")
         else
             HGOTO_DONE(SUCCEED)
@@ -577,59 +563,59 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
 
     /* Set up I/O operation */
     io_info.op_type = H5D_IO_OP_READ;
-    io_info.u.rbuf = buf;
-    if(H5D__ioinfo_init(dataset, dxpl_cache, dxpl_id, &type_info, &store, &io_info) < 0)
+    io_info.u.rbuf  = buf;
+    if (H5D__ioinfo_init(dataset, dxpl_cache, dxpl_id, &type_info, &store, &io_info) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to set up I/O operation")
 #ifdef H5_HAVE_PARALLEL
     io_info_init = TRUE;
 #endif /*H5_HAVE_PARALLEL*/
 
     /* Sanity check that space is allocated, if there are elements */
-    if(nelmts > 0)
-        HDassert((*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage)
-                || (dataset->shared->layout.ops->is_data_cached && (*dataset->shared->layout.ops->is_data_cached)(dataset->shared))
-                || dataset->shared->dcpl_cache.efl.nused > 0
-                || dataset->shared->layout.type == H5D_COMPACT);
+    if (nelmts > 0)
+        HDassert((*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage) ||
+                 (dataset->shared->layout.ops->is_data_cached &&
+                  (*dataset->shared->layout.ops->is_data_cached)(dataset->shared)) ||
+                 dataset->shared->dcpl_cache.efl.nused > 0 || dataset->shared->layout.type == H5D_COMPACT);
 
     /* Call storage method's I/O initialization routine */
     HDmemset(&fm, 0, sizeof(H5D_chunk_map_t));
-    if(io_info.layout_ops.io_init && (*io_info.layout_ops.io_init)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
+    if (io_info.layout_ops.io_init &&
+        (*io_info.layout_ops.io_init)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize I/O info")
     io_op_init = TRUE;
 
 #ifdef H5_HAVE_PARALLEL
     /* Adjust I/O info for any parallel I/O */
-    if(H5D__ioinfo_adjust(&io_info, dataset, dxpl_id, file_space, mem_space, &type_info, &fm) < 0)
+    if (H5D__ioinfo_adjust(&io_info, dataset, dxpl_id, file_space, mem_space, &type_info, &fm) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to adjust I/O info for parallel I/O")
 #endif /*H5_HAVE_PARALLEL*/
 
     /* Invoke correct "high level" I/O routine */
-    if((*io_info.io_ops.multi_read)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
+    if ((*io_info.io_ops.multi_read)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
 
 done:
     /* Shut down the I/O op information */
-    if(io_op_init && io_info.layout_ops.io_term && (*io_info.layout_ops.io_term)(&fm) < 0)
+    if (io_op_init && io_info.layout_ops.io_term && (*io_info.layout_ops.io_term)(&fm) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down I/O op info")
 #ifdef H5_HAVE_PARALLEL
     /* Shut down io_info struct */
-    if(io_info_init)
-        if(H5D__ioinfo_term(&io_info) < 0)
+    if (io_info_init)
+        if (H5D__ioinfo_term(&io_info) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "can't shut down io_info")
 #endif /*H5_HAVE_PARALLEL*/
     /* Shut down datatype info for operation */
-    if(type_info_init && H5D__typeinfo_term(&type_info) < 0)
+    if (type_info_init && H5D__typeinfo_term(&type_info) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down type info")
 
     /* discard projected mem space if it was created */
-    if(NULL != projected_mem_space)
-        if(H5S_close(projected_mem_space) < 0)
+    if (NULL != projected_mem_space)
+        if (H5S_close(projected_mem_space) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down projected memory dataspace")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__write
  *
@@ -644,37 +630,37 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
-    const H5S_t *file_space, hid_t dxpl_id, const void *buf)
+H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, const H5S_t *file_space, hid_t dxpl_id,
+           const void *buf)
 {
-    H5D_chunk_map_t fm;                 /* Chunk file<->memory mapping */
-    H5D_io_info_t io_info;              /* Dataset I/O info     */
-    H5D_type_info_t type_info;          /* Datatype info for operation */
-    hbool_t type_info_init = FALSE;     /* Whether the datatype info has been initialized */
-    H5S_t * projected_mem_space = NULL; /* If not NULL, ptr to dataspace containing a     */
-                                        /* projection of the supplied mem_space to a new  */
-                                        /* data space with rank equal to that of          */
-                                        /* file_space.                                    */
-                                        /*                                                */
-                                        /* This field is only used if                     */
-                                        /* H5S_select_shape_same() returns TRUE when      */
-                                        /* comparing the mem_space and the data_space,    */
-                                        /* and the mem_space have different rank.         */
-                                        /*                                                */
-                                        /* Note that if this variable is used, the        */
-                                        /* projected mem space must be discarded at the   */
-                                        /* end of the function to avoid a memory leak.    */
-    H5D_storage_t store;                /*union of EFL and chunk pointer in file space */
-    hssize_t    snelmts;                /*total number of elmts    (signed) */
-    hsize_t    nelmts;                 /*total number of elmts    */
+    H5D_chunk_map_t fm;                          /* Chunk file<->memory mapping */
+    H5D_io_info_t   io_info;                     /* Dataset I/O info     */
+    H5D_type_info_t type_info;                   /* Datatype info for operation */
+    hbool_t         type_info_init      = FALSE; /* Whether the datatype info has been initialized */
+    H5S_t *         projected_mem_space = NULL;  /* If not NULL, ptr to dataspace containing a     */
+                                                 /* projection of the supplied mem_space to a new  */
+                                                 /* data space with rank equal to that of          */
+                                                 /* file_space.                                    */
+                                                 /*                                                */
+                                                 /* This field is only used if                     */
+                                                 /* H5S_select_shape_same() returns TRUE when      */
+                                                 /* comparing the mem_space and the data_space,    */
+                                                 /* and the mem_space have different rank.         */
+                                                 /*                                                */
+                                                 /* Note that if this variable is used, the        */
+                                                 /* projected mem space must be discarded at the   */
+                                                 /* end of the function to avoid a memory leak.    */
+    H5D_storage_t store;                         /*union of EFL and chunk pointer in file space */
+    hssize_t      snelmts;                       /*total number of elmts    (signed) */
+    hsize_t       nelmts;                        /*total number of elmts    */
 #ifdef H5_HAVE_PARALLEL
-    hbool_t     io_info_init = FALSE;   /* Whether the I/O info has been initialized */
-#endif /*H5_HAVE_PARALLEL*/
-    hbool_t     io_op_init = FALSE;     /* Whether the I/O op has been initialized */
-    H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    char        fake_char;              /* Temporary variable for NULL buffer pointers */
-    herr_t    ret_value = SUCCEED;    /* Return value    */
+    hbool_t io_info_init = FALSE;                /* Whether the I/O info has been initialized */
+#endif                                           /*H5_HAVE_PARALLEL*/
+    hbool_t           io_op_init = FALSE;        /* Whether the I/O op has been initialized */
+    H5D_dxpl_cache_t  _dxpl_cache;               /* Data transfer property cache buffer */
+    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
+    char              fake_char;                 /* Temporary variable for NULL buffer pointers */
+    herr_t            ret_value = SUCCEED;       /* Return value    */
 
     FUNC_ENTER_STATIC
 
@@ -682,37 +668,38 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
     HDassert(dataset && dataset->oloc.file);
 
     /* All filters in the DCPL must have encoding enabled. */
-    if(!dataset->shared->checked_filters) {
-        if(H5Z_can_apply(dataset->shared->dcpl_id, dataset->shared->type_id) < 0)
+    if (!dataset->shared->checked_filters) {
+        if (H5Z_can_apply(dataset->shared->dcpl_id, dataset->shared->type_id) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANAPPLY, FAIL, "can't apply filters")
 
         dataset->shared->checked_filters = TRUE;
     } /* end if */
 
     /* Check if we are allowed to write to this file */
-    if(0 == (H5F_INTENT(dataset->oloc.file) & H5F_ACC_RDWR))
-    HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "no write intent on file")
+    if (0 == (H5F_INTENT(dataset->oloc.file) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Patch the top level file pointer for dt->shared->u.vlen.f if needed */
     H5T_patch_vlen_file(dataset->shared->type, dataset->oloc.file);
 
     /* Set up datatype info for operation */
-    if(H5D__typeinfo_init(dataset, dxpl_cache, dxpl_id, mem_type_id, TRUE, &type_info) < 0)
+    if (H5D__typeinfo_init(dataset, dxpl_cache, dxpl_id, mem_type_id, TRUE, &type_info) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set up type info")
     type_info_init = TRUE;
 
     /* Various MPI based checks */
 #ifdef H5_HAVE_PARALLEL
-    if(H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI)) {
+    if (H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI)) {
         /* If MPI based VFD is used, no VL datatype support yet. */
         /* This is because they use the global heap in the file and we don't */
         /* support parallel access of that yet */
-        if(H5T_detect_class(type_info.mem_type, H5T_VLEN, FALSE) > 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "Parallel IO does not support writing VL datatypes yet")
+        if (H5T_detect_class(type_info.mem_type, H5T_VLEN, FALSE) > 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
+                        "Parallel IO does not support writing VL datatypes yet")
 
         /* If MPI based VFD is used, no VL datatype support yet. */
         /* This is because they use the global heap in the file and we don't */
@@ -720,53 +707,54 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
         /* We should really use H5T_detect_class() here, but it will be difficult
          * to detect the type of the reference if it is nested... -QAK
          */
-        if(H5T_get_class(type_info.mem_type, TRUE) == H5T_REFERENCE &&
-                H5T_get_ref_type(type_info.mem_type) == H5R_DATASET_REGION)
-            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "Parallel IO does not support writing region reference datatypes yet")
+        if (H5T_get_class(type_info.mem_type, TRUE) == H5T_REFERENCE &&
+            H5T_get_ref_type(type_info.mem_type) == H5R_DATASET_REGION)
+            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
+                        "Parallel IO does not support writing region reference datatypes yet")
 
         /* Can't write to chunked datasets with filters, in parallel */
-        if(dataset->shared->layout.type == H5D_CHUNKED &&
-                dataset->shared->dcpl_cache.pline.nused > 0)
-            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "cannot write to chunked storage with filters in parallel")
+        if (dataset->shared->layout.type == H5D_CHUNKED && dataset->shared->dcpl_cache.pline.nused > 0)
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
+                        "cannot write to chunked storage with filters in parallel")
     } /* end if */
     else {
         /* Collective access is not permissible without a MPI based VFD */
-        if(dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE)
+        if (dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE)
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPI-based driver only")
-    } /* end else */
+    }  /* end else */
 #endif /*H5_HAVE_PARALLEL*/
 
     /* Initialize dataspace information */
-    if(!file_space)
+    if (!file_space)
         file_space = dataset->shared->space;
-    if(!mem_space)
+    if (!mem_space)
         mem_space = file_space;
 
-    if((snelmts = H5S_GET_SELECT_NPOINTS(mem_space)) < 0)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src dataspace has invalid selection")
+    if ((snelmts = H5S_GET_SELECT_NPOINTS(mem_space)) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src dataspace has invalid selection")
     H5_CHECKED_ASSIGN(nelmts, hsize_t, snelmts, hssize_t);
 
     /* Make certain that the number of elements in each selection is the same */
-    if(nelmts != (hsize_t)H5S_GET_SELECT_NPOINTS(file_space))
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src and dest data spaces have different sizes")
+    if (nelmts != (hsize_t)H5S_GET_SELECT_NPOINTS(file_space))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src and dest data spaces have different sizes")
 
     /* Check for a NULL buffer, after the H5S_ALL dataspace selection has been handled */
-    if(NULL == buf) {
+    if (NULL == buf) {
         /* Check for any elements selected (which is invalid) */
-        if(nelmts > 0)
+        if (nelmts > 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no output buffer")
 
-    /* If the buffer is nil, and 0 element is selected, make a fake buffer.
-    * This is for some MPI package like ChaMPIon on NCSA's tungsten which
-    * doesn't support this feature.
-    */
+        /* If the buffer is nil, and 0 element is selected, make a fake buffer.
+         * This is for some MPI package like ChaMPIon on NCSA's tungsten which
+         * doesn't support this feature.
+         */
         buf = &fake_char;
     } /* end if */
 
     /* Make sure that both selections have their extents set */
-    if(!(H5S_has_extent(file_space)))
+    if (!(H5S_has_extent(file_space)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file dataspace does not have extent set")
-    if(!(H5S_has_extent(mem_space)))
+    if (!(H5S_has_extent(mem_space)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "memory dataspace does not have extent set")
 
     /* H5S_select_shape_same() has been modified to accept topologically
@@ -782,51 +770,52 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
      * Note that in general, this requires us to touch up the memory buffer
      * as well.
      */
-    if(TRUE == H5S_select_shape_same(mem_space, file_space) &&
-            H5S_GET_EXTENT_NDIMS(mem_space) != H5S_GET_EXTENT_NDIMS(file_space)) {
-        void *adj_buf = NULL;   /* Pointer to the location in buf corresponding  */
-                                /* to the beginning of the projected mem space.  */
+    if (TRUE == H5S_select_shape_same(mem_space, file_space) &&
+        H5S_GET_EXTENT_NDIMS(mem_space) != H5S_GET_EXTENT_NDIMS(file_space)) {
+        void *adj_buf = NULL; /* Pointer to the location in buf corresponding  */
+                              /* to the beginning of the projected mem space.  */
 
         /* Attempt to construct projected dataspace for memory dataspace */
-        if(H5S_select_construct_projection(mem_space, &projected_mem_space,
-                (unsigned)H5S_GET_EXTENT_NDIMS(file_space), buf, (const void **)&adj_buf, type_info.src_type_size) < 0)
+        if (H5S_select_construct_projection(mem_space, &projected_mem_space,
+                                            (unsigned)H5S_GET_EXTENT_NDIMS(file_space), buf,
+                                            (const void **)&adj_buf, type_info.src_type_size) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to construct projected memory dataspace")
         HDassert(projected_mem_space);
         HDassert(adj_buf);
 
         /* Switch to using projected memory dataspace & adjusted buffer */
         mem_space = projected_mem_space;
-        buf = adj_buf;
+        buf       = adj_buf;
     } /* end if */
 
     /* Retrieve dataset properties */
     /* <none needed currently> */
 
     /* Allocate data space and initialize it if it hasn't been. */
-    if(nelmts > 0 && dataset->shared->dcpl_cache.efl.nused == 0 &&
-            !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage)) {
-        hssize_t file_nelmts;   /* Number of elements in file dataset's dataspace */
-        hbool_t full_overwrite; /* Whether we are over-writing all the elements */
+    if (nelmts > 0 && dataset->shared->dcpl_cache.efl.nused == 0 &&
+        !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage)) {
+        hssize_t file_nelmts;    /* Number of elements in file dataset's dataspace */
+        hbool_t  full_overwrite; /* Whether we are over-writing all the elements */
 
         /* Get the number of elements in file dataset's dataspace */
-        if((file_nelmts = H5S_GET_EXTENT_NPOINTS(file_space)) < 0)
+        if ((file_nelmts = H5S_GET_EXTENT_NPOINTS(file_space)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "can't retrieve number of elements in file dataset")
 
         /* Always allow fill values to be written if the dataset has a VL datatype */
-        if(H5T_detect_class(dataset->shared->type, H5T_VLEN, FALSE))
+        if (H5T_detect_class(dataset->shared->type, H5T_VLEN, FALSE))
             full_overwrite = FALSE;
         else
             full_overwrite = (hbool_t)((hsize_t)file_nelmts == nelmts ? TRUE : FALSE);
 
-    /* Allocate storage */
-        if(H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_WRITE, full_overwrite, NULL) < 0)
+        /* Allocate storage */
+        if (H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_WRITE, full_overwrite, NULL) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize storage")
     } /* end if */
 
     /* Set up I/O operation */
     io_info.op_type = H5D_IO_OP_WRITE;
-    io_info.u.wbuf = buf;
-    if(H5D__ioinfo_init(dataset, dxpl_cache, dxpl_id, &type_info, &store, &io_info) < 0)
+    io_info.u.wbuf  = buf;
+    if (H5D__ioinfo_init(dataset, dxpl_cache, dxpl_id, &type_info, &store, &io_info) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set up I/O operation")
 #ifdef H5_HAVE_PARALLEL
     io_info_init = TRUE;
@@ -834,60 +823,60 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
 
     /* Call storage method's I/O initialization routine */
     HDmemset(&fm, 0, sizeof(H5D_chunk_map_t));
-    if(io_info.layout_ops.io_init && (*io_info.layout_ops.io_init)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
+    if (io_info.layout_ops.io_init &&
+        (*io_info.layout_ops.io_init)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize I/O info")
     io_op_init = TRUE;
 
 #ifdef H5_HAVE_PARALLEL
     /* Adjust I/O info for any parallel I/O */
-    if(H5D__ioinfo_adjust(&io_info, dataset, dxpl_id, file_space, mem_space, &type_info, &fm) < 0)
+    if (H5D__ioinfo_adjust(&io_info, dataset, dxpl_id, file_space, mem_space, &type_info, &fm) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to adjust I/O info for parallel I/O")
 #endif /*H5_HAVE_PARALLEL*/
 
     /* Invoke correct "high level" I/O routine */
-    if((*io_info.io_ops.multi_write)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
+    if ((*io_info.io_ops.multi_write)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data")
 
 #ifdef OLD_WAY
-/*
- * This was taken out because it can be called in a parallel program with
- * independent access, causing the metadata cache to get corrupted. Its been
- * disabled for all types of access (serial as well as parallel) to make the
- * modification time consistent for all programs. -QAK
- *
- * We should set a value in the dataset's shared information instead and flush
- * it to the file when the dataset is being closed. -QAK
- */
+    /*
+     * This was taken out because it can be called in a parallel program with
+     * independent access, causing the metadata cache to get corrupted. Its been
+     * disabled for all types of access (serial as well as parallel) to make the
+     * modification time consistent for all programs. -QAK
+     *
+     * We should set a value in the dataset's shared information instead and flush
+     * it to the file when the dataset is being closed. -QAK
+     */
     /*
      * Update modification time.  We have to do this explicitly because
      * writing to a dataset doesn't necessarily change the object header.
      */
-    if(H5O_touch(&(dataset->oloc), FALSE, dxpl_id) < 0)
+    if (H5O_touch(&(dataset->oloc), FALSE, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update modification time")
 #endif /* OLD_WAY */
 
 done:
     /* Shut down the I/O op information */
-    if(io_op_init && io_info.layout_ops.io_term && (*io_info.layout_ops.io_term)(&fm) < 0)
+    if (io_op_init && io_info.layout_ops.io_term && (*io_info.layout_ops.io_term)(&fm) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down I/O op info")
 #ifdef H5_HAVE_PARALLEL
     /* Shut down io_info struct */
-    if(io_info_init && H5D__ioinfo_term(&io_info) < 0)
+    if (io_info_init && H5D__ioinfo_term(&io_info) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "can't shut down io_info")
 #endif /*H5_HAVE_PARALLEL*/
     /* Shut down datatype info for operation */
-    if(type_info_init && H5D__typeinfo_term(&type_info) < 0)
+    if (type_info_init && H5D__typeinfo_term(&type_info) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down type info")
 
     /* discard projected mem space if it was created */
-    if(NULL != projected_mem_space)
-        if(H5S_close(projected_mem_space) < 0)
+    if (NULL != projected_mem_space)
+        if (H5S_close(projected_mem_space) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down projected memory dataspace")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__ioinfo_init
  *
@@ -904,10 +893,11 @@ done:
 static herr_t
 H5D__ioinfo_init(H5D_t *dset,
 #ifndef H5_HAVE_PARALLEL
-const
+                 const
 #endif /* H5_HAVE_PARALLEL */
-    H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-    const H5D_type_info_t *type_info, H5D_storage_t *store, H5D_io_info_t *io_info)
+                 H5D_dxpl_cache_t *dxpl_cache,
+                 hid_t dxpl_id, const H5D_type_info_t *type_info, H5D_storage_t *store,
+                 H5D_io_info_t *io_info)
 {
     FUNC_ENTER_STATIC_NOERR
 
@@ -919,32 +909,32 @@ const
     HDassert(io_info);
 
     /* Set up "normal" I/O fields */
-    io_info->dset = dset;
+    io_info->dset       = dset;
     io_info->dxpl_cache = dxpl_cache;
-    io_info->dxpl_id = dxpl_id;
-    io_info->store = store;
+    io_info->dxpl_id    = dxpl_id;
+    io_info->store      = store;
 
     /* Set I/O operations to initial values */
     io_info->layout_ops = *dset->shared->layout.ops;
 
     /* Set the "high-level" I/O operations for the dataset */
-    io_info->io_ops.multi_read = dset->shared->layout.ops->ser_read;
+    io_info->io_ops.multi_read  = dset->shared->layout.ops->ser_read;
     io_info->io_ops.multi_write = dset->shared->layout.ops->ser_write;
 
     /* Set the I/O operations for reading/writing single blocks on disk */
-    if(type_info->is_xform_noop && type_info->is_conv_noop) {
+    if (type_info->is_xform_noop && type_info->is_conv_noop) {
         /*
          * If there is no data transform or type conversion then read directly into
          *  the application's buffer.  This saves at least one mem-to-mem copy.
          */
-        io_info->io_ops.single_read = H5D__select_read;
+        io_info->io_ops.single_read  = H5D__select_read;
         io_info->io_ops.single_write = H5D__select_write;
     } /* end if */
     else {
         /*
          * This is the general case (type conversion, usually).
          */
-        io_info->io_ops.single_read = H5D__scatgath_read;
+        io_info->io_ops.single_read  = H5D__scatgath_read;
         io_info->io_ops.single_write = H5D__scatgath_write;
     } /* end else */
 
@@ -956,7 +946,6 @@ const
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__ioinfo_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__typeinfo_init
  *
@@ -971,13 +960,12 @@ const
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
-    hid_t dxpl_id, hid_t mem_type_id, hbool_t do_write,
-    H5D_type_info_t *type_info)
+H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id, hid_t mem_type_id,
+                   hbool_t do_write, H5D_type_info_t *type_info)
 {
-    const H5T_t    *src_type;              /* Source datatype */
-    const H5T_t    *dst_type;              /* Destination datatype */
-    herr_t ret_value = SUCCEED;            /* Return value    */
+    const H5T_t *src_type;            /* Source datatype */
+    const H5T_t *dst_type;            /* Destination datatype */
+    herr_t       ret_value = SUCCEED; /* Return value    */
 
     FUNC_ENTER_STATIC
 
@@ -989,19 +977,19 @@ H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
     HDmemset(type_info, 0, sizeof(*type_info));
 
     /* Get the memory & dataset datatypes */
-    if(NULL == (type_info->mem_type = (const H5T_t *)H5I_object_verify(mem_type_id, H5I_DATATYPE)))
-    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type_info->mem_type = (const H5T_t *)H5I_object_verify(mem_type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
     type_info->dset_type = dset->shared->type;
 
-    if(do_write) {
-        src_type = type_info->mem_type;
-        dst_type = dset->shared->type;
+    if (do_write) {
+        src_type               = type_info->mem_type;
+        dst_type               = dset->shared->type;
         type_info->src_type_id = mem_type_id;
         type_info->dst_type_id = dset->shared->type_id;
     } /* end if */
     else {
-        src_type = dset->shared->type;
-        dst_type = type_info->mem_type;
+        src_type               = dset->shared->type;
+        dst_type               = type_info->mem_type;
         type_info->src_type_id = dset->shared->type_id;
         type_info->dst_type_id = mem_type_id;
     } /* end else */
@@ -1014,40 +1002,39 @@ H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
      * enough value in xfer_parms since turning off datatype conversion also
      * turns off background preservation.
      */
-    if(NULL == (type_info->tpath = H5T_path_find(src_type, dst_type, NULL, NULL, dxpl_id, FALSE)))
-    HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
+    if (NULL == (type_info->tpath = H5T_path_find(src_type, dst_type, NULL, NULL, dxpl_id, FALSE)))
+        HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
 
     /* Precompute some useful information */
     type_info->src_type_size = H5T_get_size(src_type);
     type_info->dst_type_size = H5T_get_size(dst_type);
     type_info->max_type_size = MAX(type_info->src_type_size, type_info->dst_type_size);
-    type_info->is_conv_noop = H5T_path_noop(type_info->tpath);
+    type_info->is_conv_noop  = H5T_path_noop(type_info->tpath);
     type_info->is_xform_noop = H5Z_xform_noop(dxpl_cache->data_xform_prop);
-    if(type_info->is_xform_noop && type_info->is_conv_noop) {
+    if (type_info->is_xform_noop && type_info->is_conv_noop) {
         type_info->cmpd_subset = NULL;
-        type_info->need_bkg = H5T_BKG_NO;
+        type_info->need_bkg    = H5T_BKG_NO;
     } /* end if */
     else {
-        size_t    target_size;        /* Desired buffer size    */
+        size_t target_size; /* Desired buffer size    */
 
         /* Check if the datatypes are compound subsets of one another */
         type_info->cmpd_subset = H5T_path_compound_subset(type_info->tpath);
 
         /* Check if we need a background buffer */
-        if(do_write && H5T_detect_class(dset->shared->type, H5T_VLEN, FALSE))
+        if (do_write && H5T_detect_class(dset->shared->type, H5T_VLEN, FALSE))
             type_info->need_bkg = H5T_BKG_YES;
         else {
-            H5T_bkg_t path_bkg;     /* Type conversion's background info */
+            H5T_bkg_t path_bkg; /* Type conversion's background info */
 
-            if((path_bkg = H5T_path_bkg(type_info->tpath))) {
+            if ((path_bkg = H5T_path_bkg(type_info->tpath))) {
                 /* Retrieve the bkgr buffer property */
                 type_info->need_bkg = dxpl_cache->bkgr_buf_type;
                 type_info->need_bkg = MAX(path_bkg, type_info->need_bkg);
             } /* end if */
             else
                 type_info->need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
-        } /* end else */
-
+        }                                         /* end else */
 
         /* Set up datatype conversion/background buffers */
 
@@ -1055,15 +1042,16 @@ H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
         target_size = dxpl_cache->max_temp_buf;
 
         /* If the buffer is too small to hold even one element, try to make it bigger */
-        if(target_size < type_info->max_type_size) {
-            hbool_t default_buffer_info;    /* Whether the buffer information are the defaults */
+        if (target_size < type_info->max_type_size) {
+            hbool_t default_buffer_info; /* Whether the buffer information are the defaults */
 
             /* Detect if we have all default settings for buffers */
-            default_buffer_info = (hbool_t)((H5D_TEMP_BUF_SIZE == dxpl_cache->max_temp_buf)
-                    && (NULL == dxpl_cache->tconv_buf) && (NULL == dxpl_cache->bkgr_buf));
+            default_buffer_info =
+                (hbool_t)((H5D_TEMP_BUF_SIZE == dxpl_cache->max_temp_buf) &&
+                          (NULL == dxpl_cache->tconv_buf) && (NULL == dxpl_cache->bkgr_buf));
 
             /* Check if we are using the default buffer info */
-            if(default_buffer_info)
+            if (default_buffer_info)
                 /* OK to get bigger for library default settings */
                 target_size = type_info->max_type_size;
             else
@@ -1075,7 +1063,7 @@ H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
         type_info->request_nelmts = target_size / type_info->max_type_size;
 
         /* Sanity check elements in temporary buffer */
-        if(type_info->request_nelmts == 0)
+        if (type_info->request_nelmts == 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "temporary buffer max size is too small")
 
         /*
@@ -1085,35 +1073,36 @@ H5D__typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
          * malloc() is usually less resource-intensive if we allocate/free the
          * same size over and over.
          */
-        if(NULL == (type_info->tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
+        if (NULL == (type_info->tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
             /* Allocate temporary buffer */
-            if(NULL == (type_info->tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
+            if (NULL == (type_info->tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
             type_info->tconv_buf_allocated = TRUE;
         } /* end if */
-        if(type_info->need_bkg && NULL == (type_info->bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
-            size_t    bkg_size;        /* Desired background buffer size    */
+        if (type_info->need_bkg && NULL == (type_info->bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
+            size_t bkg_size; /* Desired background buffer size    */
 
             /* Compute the background buffer size */
             /* (don't try to use buffers smaller than the default size) */
             bkg_size = type_info->request_nelmts * type_info->dst_type_size;
-            if(bkg_size < dxpl_cache->max_temp_buf)
+            if (bkg_size < dxpl_cache->max_temp_buf)
                 bkg_size = dxpl_cache->max_temp_buf;
 
             /* Allocate background buffer */
             /* (Need calloc()-like call since memory needs to be initialized) */
-            if(NULL == (type_info->bkg_buf = H5FL_BLK_CALLOC(type_conv, bkg_size)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
+            if (NULL == (type_info->bkg_buf = H5FL_BLK_CALLOC(type_conv, bkg_size)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                            "memory allocation failed for background conversion")
             type_info->bkg_buf_allocated = TRUE;
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__typeinfo_init() */
 
 #ifdef H5_HAVE_PARALLEL
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5D__ioinfo_adjust
  *
@@ -1127,14 +1116,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, hid_t dxpl_id,
-    const H5S_t *file_space, const H5S_t *mem_space,
-    const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm)
+H5D__ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, hid_t dxpl_id, const H5S_t *file_space,
+                   const H5S_t *mem_space, const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm)
 {
-    H5P_genplist_t *dx_plist;       /* Data transer property list */
+    H5P_genplist_t *                 dx_plist;              /* Data transer property list */
     H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode; /* performed chunk optimization */
-    H5D_mpio_actual_io_mode_t actual_io_mode; /* performed io mode */
-    herr_t    ret_value = SUCCEED;    /* Return value    */
+    H5D_mpio_actual_io_mode_t        actual_io_mode;        /* performed io mode */
+    herr_t                           ret_value = SUCCEED;   /* Return value    */
 
     FUNC_ENTER_STATIC
 
@@ -1148,43 +1136,43 @@ H5D__ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, hid_t dxpl_id,
     HDassert(io_info);
 
     /* Get the dataset transfer property list */
-    if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
     /* Reset the actual io mode properties to the default values in case
      * the dxpl was previously used in a collective I/O operation.
      */
     actual_chunk_opt_mode = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
-    actual_io_mode = H5D_MPIO_NO_COLLECTIVE;
-    if(H5P_set(dx_plist, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, &actual_chunk_opt_mode) < 0)
+    actual_io_mode        = H5D_MPIO_NO_COLLECTIVE;
+    if (H5P_set(dx_plist, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, &actual_chunk_opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set actual chunk opt mode property")
-    if(H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
+    if (H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set actual io mode property")
 
     /* Make any parallel I/O adjustments */
-    if(io_info->using_mpi_vfd) {
-        htri_t opt;         /* Flag whether a selection is optimizable */
+    if (io_info->using_mpi_vfd) {
+        htri_t opt; /* Flag whether a selection is optimizable */
 
         /* Record the original state of parallel I/O transfer options */
-        io_info->orig.xfer_mode = io_info->dxpl_cache->xfer_mode;
-        io_info->orig.coll_opt_mode = io_info->dxpl_cache->coll_opt_mode;
-        io_info->orig.io_ops.single_read = io_info->io_ops.single_read;
+        io_info->orig.xfer_mode           = io_info->dxpl_cache->xfer_mode;
+        io_info->orig.coll_opt_mode       = io_info->dxpl_cache->coll_opt_mode;
+        io_info->orig.io_ops.single_read  = io_info->io_ops.single_read;
         io_info->orig.io_ops.single_write = io_info->io_ops.single_write;
 
         /* Get MPI communicator */
-        if(MPI_COMM_NULL == (io_info->comm = H5F_mpi_get_comm(dset->oloc.file)))
+        if (MPI_COMM_NULL == (io_info->comm = H5F_mpi_get_comm(dset->oloc.file)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't retrieve MPI communicator")
 
         /* Check if we can set direct MPI-IO read/write functions */
-        if((opt = H5D__mpio_opt_possible(io_info, file_space, mem_space, type_info, fm, dx_plist)) < 0)
+        if ((opt = H5D__mpio_opt_possible(io_info, file_space, mem_space, type_info, fm, dx_plist)) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "invalid check for direct IO dataspace ")
 
         /* Check if we can use the optimized parallel I/O routines */
-        if(opt == TRUE) {
+        if (opt == TRUE) {
             /* Override the I/O op pointers to the MPI-specific routines */
-            io_info->io_ops.multi_read = dset->shared->layout.ops->par_read;
-            io_info->io_ops.multi_write = dset->shared->layout.ops->par_write;
-            io_info->io_ops.single_read = H5D__mpio_select_read;
+            io_info->io_ops.multi_read   = dset->shared->layout.ops->par_read;
+            io_info->io_ops.multi_write  = dset->shared->layout.ops->par_write;
+            io_info->io_ops.single_read  = H5D__mpio_select_read;
             io_info->io_ops.single_write = H5D__mpio_select_write;
         } /* end if */
         else {
@@ -1192,20 +1180,19 @@ H5D__ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, hid_t dxpl_id,
              * collective I/O, change the request to use independent I/O, but
              * mark it so that we remember to revert the change.
              */
-            if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
+            if (io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
                 /* Change the xfer_mode to independent for handling the I/O */
                 io_info->dxpl_cache->xfer_mode = H5FD_MPIO_INDEPENDENT;
-                if(H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
+                if (H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
             } /* end if */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__ioinfo_adjust() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__ioinfo_term
  *
@@ -1222,38 +1209,38 @@ done:
 static herr_t
 H5D__ioinfo_term(H5D_io_info_t *io_info)
 {
-    herr_t    ret_value = SUCCEED;    /*return value        */
+    herr_t ret_value = SUCCEED; /*return value        */
 
     FUNC_ENTER_STATIC
 
     /* Check if we used the MPI VFD for the I/O */
-    if(io_info->using_mpi_vfd) {
+    if (io_info->using_mpi_vfd) {
         /* Check if we need to revert the change to the xfer mode */
-        if(io_info->orig.xfer_mode != io_info->dxpl_cache->xfer_mode) {
-            H5P_genplist_t *dx_plist;           /* Data transer property list */
+        if (io_info->orig.xfer_mode != io_info->dxpl_cache->xfer_mode) {
+            H5P_genplist_t *dx_plist; /* Data transer property list */
 
             /* Get the dataset transfer property list */
-            if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
+            if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
             /* Restore the original parallel I/O mode */
-            if(H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->orig.xfer_mode) < 0)
+            if (H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->orig.xfer_mode) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
         } /* end if */
 
         /* Check if we need to revert the change to the collective opt mode */
-        if(io_info->orig.coll_opt_mode != io_info->dxpl_cache->coll_opt_mode) {
-            H5P_genplist_t *dx_plist;           /* Data transer property list */
+        if (io_info->orig.coll_opt_mode != io_info->dxpl_cache->coll_opt_mode) {
+            H5P_genplist_t *dx_plist; /* Data transer property list */
 
             /* Get the dataset transfer property list */
-            if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
+            if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
             /* Restore the original parallel I/O mode */
-            if(H5P_set(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &io_info->orig.coll_opt_mode) < 0)
+            if (H5P_set(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &io_info->orig.coll_opt_mode) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set collective option mode")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1261,7 +1248,6 @@ done:
 
 #endif /* H5_HAVE_PARALLEL */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__typeinfo_term
  *
@@ -1280,11 +1266,11 @@ H5D__typeinfo_term(const H5D_type_info_t *type_info)
     FUNC_ENTER_STATIC_NOERR
 
     /* Check for releasing datatype conversion & background buffers */
-    if(type_info->tconv_buf_allocated) {
+    if (type_info->tconv_buf_allocated) {
         HDassert(type_info->tconv_buf);
         (void)H5FL_BLK_FREE(type_conv, type_info->tconv_buf);
     } /* end if */
-    if(type_info->bkg_buf_allocated) {
+    if (type_info->bkg_buf_allocated) {
         HDassert(type_info->bkg_buf);
         (void)H5FL_BLK_FREE(type_conv, type_info->bkg_buf);
     } /* end if */
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c
index 94d4c6b..71f64ba 100644
--- a/src/H5Dlayout.c
+++ b/src/H5Dlayout.c
@@ -15,49 +15,40 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Datasets 				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HLprivate.h"	/* Local heaps				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Datasets 				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HLprivate.h" /* Local heaps				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__layout_set_io_ops
  *
@@ -74,7 +65,7 @@
 herr_t
 H5D__layout_set_io_ops(const H5D_t *dataset)
 {
-    herr_t ret_value = SUCCEED;		/* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -82,9 +73,9 @@ H5D__layout_set_io_ops(const H5D_t *dataset)
     HDassert(dataset);
 
     /* Set the I/O functions for each layout type */
-    switch(dataset->shared->layout.type) {
+    switch (dataset->shared->layout.type) {
         case H5D_CONTIGUOUS:
-            if(dataset->shared->dcpl_cache.efl.nused > 0)
+            if (dataset->shared->dcpl_cache.efl.nused > 0)
                 dataset->shared->layout.ops = H5D_LOPS_EFL;
             else
                 dataset->shared->layout.ops = H5D_LOPS_CONTIG;
@@ -112,7 +103,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__layout_set_io_ops() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__layout_meta_size
  *
@@ -131,7 +121,7 @@ done:
 size_t
 H5D__layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include_compact_data)
 {
-    size_t                  ret_value;
+    size_t ret_value;
 
     FUNC_ENTER_PACKAGE
 
@@ -139,20 +129,20 @@ H5D__layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t includ
     HDassert(f);
     HDassert(layout);
 
-    ret_value = 1 +                     /* Version number                       */
-                1;                      /* layout class type                    */
+    ret_value = 1 + /* Version number                       */
+                1;  /* layout class type                    */
 
-    switch(layout->type) {
+    switch (layout->type) {
         case H5D_COMPACT:
             /* Size of raw data */
             ret_value += 2;
-            if(include_compact_data)
-                ret_value += layout->storage.u.compact.size;/* data for compact dataset             */
+            if (include_compact_data)
+                ret_value += layout->storage.u.compact.size; /* data for compact dataset             */
             break;
 
         case H5D_CONTIGUOUS:
-            ret_value += H5F_SIZEOF_ADDR(f);    /* Address of data */
-            ret_value += H5F_SIZEOF_SIZE(f);    /* Length of data */
+            ret_value += H5F_SIZEOF_ADDR(f); /* Address of data */
+            ret_value += H5F_SIZEOF_SIZE(f); /* Length of data */
             break;
 
         case H5D_CHUNKED:
@@ -164,7 +154,7 @@ H5D__layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t includ
             ret_value += layout->u.chunk.ndims * 4;
 
             /* B-tree address */
-            ret_value += H5F_SIZEOF_ADDR(f);    /* Address of data */
+            ret_value += H5F_SIZEOF_ADDR(f); /* Address of data */
             break;
 
         case H5D_LAYOUT_ERROR:
@@ -177,7 +167,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__layout_meta_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__layout_oh_create
  *
@@ -192,13 +181,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset,
-    hid_t dapl_id)
+H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset, hid_t dapl_id)
 {
-    H5O_layout_t        *layout;         /* Dataset's layout information */
-    const H5O_fill_t	*fill_prop;     /* Pointer to dataset's fill value information */
-    hbool_t             layout_init = FALSE;    /* Flag to indicate that chunk information was initialized */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_layout_t *    layout;                /* Dataset's layout information */
+    const H5O_fill_t *fill_prop;             /* Pointer to dataset's fill value information */
+    hbool_t           layout_init = FALSE;   /* Flag to indicate that chunk information was initialized */
+    herr_t            ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -208,20 +196,21 @@ H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset,
     HDassert(dset);
 
     /* Set some local variables, for convenience */
-    layout = &dset->shared->layout;
+    layout    = &dset->shared->layout;
     fill_prop = &dset->shared->dcpl_cache.fill;
 
     /* Update the filters message, if this is a chunked dataset */
-    if(layout->type == H5D_CHUNKED) {
-        H5O_pline_t     *pline;         /* Dataset's I/O pipeline information */
+    if (layout->type == H5D_CHUNKED) {
+        H5O_pline_t *pline; /* Dataset's I/O pipeline information */
 
         pline = &dset->shared->dcpl_cache.pline;
-        if(pline->nused > 0 && H5O_msg_append_oh(file, dxpl_id, oh, H5O_PLINE_ID, H5O_MSG_FLAG_CONSTANT, 0, pline) < 0)
+        if (pline->nused > 0 &&
+            H5O_msg_append_oh(file, dxpl_id, oh, H5O_PLINE_ID, H5O_MSG_FLAG_CONSTANT, 0, pline) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update filter header message")
     } /* end if */
 
     /* Initialize the layout information for the new dataset */
-    if(dset->shared->layout.ops->init && (dset->shared->layout.ops->init)(file, dxpl_id, dset, dapl_id) < 0)
+    if (dset->shared->layout.ops->init && (dset->shared->layout.ops->init)(file, dxpl_id, dset, dapl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize layout information")
 
     /* Indicate that the layout information was initialized */
@@ -231,41 +220,41 @@ H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset,
      * Allocate storage if space allocate time is early; otherwise delay
      * allocation until later.
      */
-    if(fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY)
-        if(H5D__alloc_storage(dset, dxpl_id, H5D_ALLOC_CREATE, FALSE, NULL) < 0)
+    if (fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY)
+        if (H5D__alloc_storage(dset, dxpl_id, H5D_ALLOC_CREATE, FALSE, NULL) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize storage")
 
     /* Update external storage message, if it's used */
-    if(dset->shared->dcpl_cache.efl.nused > 0) {
+    if (dset->shared->dcpl_cache.efl.nused > 0) {
         H5O_efl_t *efl = &dset->shared->dcpl_cache.efl; /* Dataset's external file list */
-        H5HL_t *heap;                           /* Pointer to local heap for EFL file names */
-        size_t heap_size = H5HL_ALIGN(1);
-        size_t u;
+        H5HL_t *   heap;                                /* Pointer to local heap for EFL file names */
+        size_t     heap_size = H5HL_ALIGN(1);
+        size_t     u;
 
         /* Determine size of heap needed to stored the file names */
-        for(u = 0; u < efl->nused; ++u)
+        for (u = 0; u < efl->nused; ++u)
             heap_size += H5HL_ALIGN(HDstrlen(efl->slot[u].name) + 1);
 
         /* Create the heap for the EFL file names */
-        if(H5HL_create(file, dxpl_id, heap_size, &efl->heap_addr/*out*/) < 0)
+        if (H5HL_create(file, dxpl_id, heap_size, &efl->heap_addr /*out*/) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create EFL file name heap")
 
         /* Pin the heap down in memory */
-        if(NULL == (heap = H5HL_protect(file, dxpl_id, efl->heap_addr, H5AC_WRITE)))
+        if (NULL == (heap = H5HL_protect(file, dxpl_id, efl->heap_addr, H5AC_WRITE)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTPROTECT, FAIL, "unable to protect EFL file name heap")
 
         /* Insert "empty" name first */
-        if((size_t)(-1) == H5HL_insert(file, dxpl_id, heap, (size_t)1, "")) {
+        if ((size_t)(-1) == H5HL_insert(file, dxpl_id, heap, (size_t)1, "")) {
             H5HL_unprotect(heap);
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert file name into heap")
         } /* end if */
 
-        for(u = 0; u < efl->nused; ++u) {
-            size_t offset;      /* Offset of file name in heap */
+        for (u = 0; u < efl->nused; ++u) {
+            size_t offset; /* Offset of file name in heap */
 
             /* Insert file name into heap */
-            if((size_t)(-1) == (offset = H5HL_insert(file, dxpl_id, heap,
-                        HDstrlen(efl->slot[u].name) + 1, efl->slot[u].name))) {
+            if ((size_t)(-1) == (offset = H5HL_insert(file, dxpl_id, heap, HDstrlen(efl->slot[u].name) + 1,
+                                                      efl->slot[u].name))) {
                 H5HL_unprotect(heap);
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert file name into heap")
             } /* end if */
@@ -276,34 +265,38 @@ H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset,
         } /* end for */
 
         /* Release the heap */
-        if(H5HL_unprotect(heap) < 0)
+        if (H5HL_unprotect(heap) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTUNPROTECT, FAIL, "unable to unprotect EFL file name heap")
         heap = NULL;
 
         /* Insert EFL message into dataset object header */
-        if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_EFL_ID, H5O_MSG_FLAG_CONSTANT, 0, efl) < 0)
+        if (H5O_msg_append_oh(file, dxpl_id, oh, H5O_EFL_ID, H5O_MSG_FLAG_CONSTANT, 0, efl) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update external file list message")
     } /* end if */
 
     /* Create layout message */
-    /* (Don't make layout message constant unless allocation time is early, since space may not be allocated) */
+    /* (Don't make layout message constant unless allocation time is early, since space may not be allocated)
+     */
     /* (Note: this is relying on H5D__alloc_storage not calling H5O_msg_write during dataset creation) */
-    if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_LAYOUT_ID, ((fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY && H5D_COMPACT != layout->type) ? H5O_MSG_FLAG_CONSTANT : 0), 0, layout) < 0)
-         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update layout")
+    if (H5O_msg_append_oh(file, dxpl_id, oh, H5O_LAYOUT_ID,
+                          ((fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY && H5D_COMPACT != layout->type)
+                               ? H5O_MSG_FLAG_CONSTANT
+                               : 0),
+                          0, layout) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update layout")
 
 done:
     /* Error cleanup */
-    if(ret_value < 0) {
-        if(dset->shared->layout.type == H5D_CHUNKED && layout_init) {
-            if(H5D__chunk_dest(file, dxpl_id, dset) < 0)
+    if (ret_value < 0) {
+        if (dset->shared->layout.type == H5D_CHUNKED && layout_init) {
+            if (H5D__chunk_dest(file, dxpl_id, dset) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to destroy chunk cache")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__layout_oh_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__layout_oh_read
  *
@@ -320,8 +313,8 @@ done:
 herr_t
 H5D__layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t *plist)
 {
-    htri_t msg_exists;                  /* Whether a particular type of message exists */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    htri_t msg_exists;          /* Whether a particular type of message exists */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -330,15 +323,15 @@ H5D__layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t
     HDassert(plist);
 
     /* Get the optional filters message */
-    if((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_PLINE_ID, dxpl_id)) < 0)
+    if ((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_PLINE_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't check if message exists")
-    if(msg_exists) {
+    if (msg_exists) {
         /* Retrieve the I/O pipeline message */
-        if(NULL == H5O_msg_read(&(dataset->oloc), H5O_PLINE_ID, &dataset->shared->dcpl_cache.pline, dxpl_id))
+        if (NULL == H5O_msg_read(&(dataset->oloc), H5O_PLINE_ID, &dataset->shared->dcpl_cache.pline, dxpl_id))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve message")
 
         /* Set the I/O pipeline info in the property list */
-        if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &dataset->shared->dcpl_cache.pline) < 0)
+        if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &dataset->shared->dcpl_cache.pline) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set pipeline")
     } /* end if */
 
@@ -348,19 +341,19 @@ H5D__layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t
      * values are copied to the dataset create plist so the user can query
      * them.
      */
-    if(NULL == H5O_msg_read(&(dataset->oloc), H5O_LAYOUT_ID, &(dataset->shared->layout), dxpl_id))
+    if (NULL == H5O_msg_read(&(dataset->oloc), H5O_LAYOUT_ID, &(dataset->shared->layout), dxpl_id))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read data layout message")
 
     /* Check for external file list message (which might not exist) */
-    if((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_EFL_ID, dxpl_id)) < 0)
+    if ((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_EFL_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't check if message exists")
-    if(msg_exists) {
+    if (msg_exists) {
         /* Retrieve the EFL  message */
-        if(NULL == H5O_msg_read(&(dataset->oloc), H5O_EFL_ID, &dataset->shared->dcpl_cache.efl, dxpl_id))
+        if (NULL == H5O_msg_read(&(dataset->oloc), H5O_EFL_ID, &dataset->shared->dcpl_cache.efl, dxpl_id))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve message")
 
         /* Set the EFL info in the property list */
-        if(H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &dataset->shared->dcpl_cache.efl) < 0)
+        if (H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &dataset->shared->dcpl_cache.efl) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set external file list")
 
         /* Set the dataset's I/O operations */
@@ -371,66 +364,66 @@ H5D__layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t
     HDassert(dataset->shared->layout.ops);
 
     /* Adjust chunk dimensions to omit datatype size (in last dimension) for creation property */
-    if(H5D_CHUNKED == dataset->shared->layout.type)
+    if (H5D_CHUNKED == dataset->shared->layout.type)
         dataset->shared->layout.u.chunk.ndims--;
     /* Copy layout to the DCPL */
-    if(H5P_set(plist, H5D_CRT_LAYOUT_NAME, &dataset->shared->layout) < 0)
+    if (H5P_set(plist, H5D_CRT_LAYOUT_NAME, &dataset->shared->layout) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set layout")
     /* Adjust chunk dimensions back again (*sigh*) */
-    if(H5D_CHUNKED == dataset->shared->layout.type)
+    if (H5D_CHUNKED == dataset->shared->layout.type)
         dataset->shared->layout.u.chunk.ndims++;
 
-    switch(dataset->shared->layout.type) {
-        case H5D_CONTIGUOUS:
-        {
-            hsize_t tmp_size;                   /* Temporary holder for raw data size */
-            size_t tmp_sieve_buf_size;          /* Temporary holder for sieve buffer size */
+    switch (dataset->shared->layout.type) {
+        case H5D_CONTIGUOUS: {
+            hsize_t tmp_size;           /* Temporary holder for raw data size */
+            size_t  tmp_sieve_buf_size; /* Temporary holder for sieve buffer size */
 
             /* Compute the size of the contiguous storage for versions of the
              * layout message less than version 3 because versions 1 & 2 would
              * truncate the dimension sizes to 32-bits of information. - QAK 5/26/04
              */
-            if(dataset->shared->layout.version < 3) {
-                hssize_t snelmts;                   /* Temporary holder for number of elements in dataspace */
-                hsize_t nelmts;                     /* Number of elements in dataspace */
-                size_t dt_size;                     /* Size of datatype */
+            if (dataset->shared->layout.version < 3) {
+                hssize_t snelmts; /* Temporary holder for number of elements in dataspace */
+                hsize_t  nelmts;  /* Number of elements in dataspace */
+                size_t   dt_size; /* Size of datatype */
 
                 /* Retrieve the number of elements in the dataspace */
-                if((snelmts = H5S_GET_EXTENT_NPOINTS(dataset->shared->space)) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve number of elements in dataspace")
+                if ((snelmts = H5S_GET_EXTENT_NPOINTS(dataset->shared->space)) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL,
+                                "unable to retrieve number of elements in dataspace")
                 nelmts = (hsize_t)snelmts;
 
                 /* Get the datatype's size */
-                if(0 == (dt_size = H5T_GET_SIZE(dataset->shared->type)))
+                if (0 == (dt_size = H5T_GET_SIZE(dataset->shared->type)))
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve size of datatype")
 
                 /* Compute the size of the dataset's contiguous storage */
                 tmp_size = nelmts * dt_size;
 
                 /* Check for overflow during multiplication */
-                if(nelmts != (tmp_size / dt_size))
+                if (nelmts != (tmp_size / dt_size))
                     HGOTO_ERROR(H5E_DATASET, H5E_OVERFLOW, FAIL, "size of dataset's storage overflowed")
 
                 /* Assign the dataset's contiguous storage size */
                 dataset->shared->layout.storage.u.contig.size = tmp_size;
-            } else
+            }
+            else
                 tmp_size = dataset->shared->layout.storage.u.contig.size;
 
-	    /* Get the sieve buffer size for the file */
-	    tmp_sieve_buf_size = H5F_SIEVE_BUF_SIZE(dataset->oloc.file);
+            /* Get the sieve buffer size for the file */
+            tmp_sieve_buf_size = H5F_SIEVE_BUF_SIZE(dataset->oloc.file);
 
-	    /* Adjust the sieve buffer size to the smaller one between the dataset size and the buffer size
-	     * from the file access property.  (SLU - 2012/3/30) */
-	    if(tmp_size < tmp_sieve_buf_size)
-		dataset->shared->cache.contig.sieve_buf_size = tmp_size;
-	    else
-		dataset->shared->cache.contig.sieve_buf_size = tmp_sieve_buf_size;
-        }
-            break;
+            /* Adjust the sieve buffer size to the smaller one between the dataset size and the buffer size
+             * from the file access property.  (SLU - 2012/3/30) */
+            if (tmp_size < tmp_sieve_buf_size)
+                dataset->shared->cache.contig.sieve_buf_size = tmp_size;
+            else
+                dataset->shared->cache.contig.sieve_buf_size = tmp_sieve_buf_size;
+        } break;
 
         case H5D_CHUNKED:
             /* Initialize the chunk cache for the dataset */
-            if(H5D__chunk_init(dataset->oloc.file, dxpl_id, dataset, dapl_id) < 0)
+            if (H5D__chunk_init(dataset->oloc.file, dxpl_id, dataset, dapl_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize chunk cache")
             break;
 
@@ -447,7 +440,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__layout_oh_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__layout_oh_write
  *
@@ -464,7 +456,7 @@ done:
 herr_t
 H5D__layout_oh_write(H5D_t *dataset, hid_t dxpl_id, H5O_t *oh, unsigned update_flags)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -473,10 +465,10 @@ H5D__layout_oh_write(H5D_t *dataset, hid_t dxpl_id, H5O_t *oh, unsigned update_f
     HDassert(oh);
 
     /* Write the layout message to the dataset's header */
-    if(H5O_msg_write_oh(dataset->oloc.file, dxpl_id, oh, H5O_LAYOUT_ID, H5O_MSG_FLAG_CONSTANT, update_flags, &dataset->shared->layout) < 0)
+    if (H5O_msg_write_oh(dataset->oloc.file, dxpl_id, oh, H5O_LAYOUT_ID, H5O_MSG_FLAG_CONSTANT, update_flags,
+                         &dataset->shared->layout) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update layout message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__layout_oh_write() */
-
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index 4e5a121..de60f6c 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -27,21 +27,20 @@
 
 #define H5D_PACKAGE /* suppress error about including H5Dpkg */
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"        /* Generic Functions */
-#include "H5Dpkg.h"           /* Datasets          */
-#include "H5Eprivate.h"       /* Error handling    */
-#include "H5Fprivate.h"       /* File access       */
-#include "H5FDprivate.h"      /* File drivers      */
-#include "H5Iprivate.h"       /* IDs               */
-#include "H5MMprivate.h"      /* Memory management */
-#include "H5Oprivate.h"       /* Object headers    */
-#include "H5Pprivate.h"       /* Property lists    */
-#include "H5Sprivate.h"       /* Dataspaces        */
-#include "H5VMprivate.h"       /* Vector            */
+#include "H5private.h"   /* Generic Functions */
+#include "H5Dpkg.h"      /* Datasets          */
+#include "H5Eprivate.h"  /* Error handling    */
+#include "H5Fprivate.h"  /* File access       */
+#include "H5FDprivate.h" /* File drivers      */
+#include "H5Iprivate.h"  /* IDs               */
+#include "H5MMprivate.h" /* Memory management */
+#include "H5Oprivate.h"  /* Object headers    */
+#include "H5Pprivate.h"  /* Property lists    */
+#include "H5Sprivate.h"  /* Dataspaces        */
+#include "H5VMprivate.h" /* Vector            */
 
 #ifdef H5_HAVE_PARALLEL
 
@@ -66,7 +65,7 @@
 #define H5D_OBTAIN_ALL_CHUNK_ADDR_COL 2
 
 /* Macros to define the default ratio of obtaining all chunk addresses for one linked-chunk IO case */
-#define H5D_ALL_CHUNK_ADDR_THRES_COL  30
+#define H5D_ALL_CHUNK_ADDR_THRES_COL     30
 #define H5D_ALL_CHUNK_ADDR_THRES_COL_NUM 10000
 
 /***** Macros for multi-chunk collective IO case. *****/
@@ -76,66 +75,58 @@
 */
 
 /* Macros to represent different IO modes(NONE, Independent or collective)for multiple chunk IO case */
-#define H5D_CHUNK_IO_MODE_IND         0
-#define H5D_CHUNK_IO_MODE_COL         1
+#define H5D_CHUNK_IO_MODE_IND 0
+#define H5D_CHUNK_IO_MODE_COL 1
 
 /* Macros to represent the regularity of the selection for multiple chunk IO case. */
-#define H5D_CHUNK_SELECT_REG          1
-#define H5D_CHUNK_SELECT_IRREG        2
-#define H5D_CHUNK_SELECT_NONE         0
-
+#define H5D_CHUNK_SELECT_REG   1
+#define H5D_CHUNK_SELECT_IRREG 2
+#define H5D_CHUNK_SELECT_NONE  0
 
 /******************/
 /* Local Typedefs */
 /******************/
 /* Combine chunk address and chunk info into a struct for better performance. */
 typedef struct H5D_chunk_addr_info_t {
-  haddr_t chunk_addr;
-  H5D_chunk_info_t chunk_info;
+    haddr_t          chunk_addr;
+    H5D_chunk_info_t chunk_info;
 } H5D_chunk_addr_info_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5D__chunk_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, H5D_chunk_map_t *fm);
-static herr_t H5D__multi_chunk_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, H5D_chunk_map_t *fm,
-    H5P_genplist_t *dx_plist);
-static herr_t H5D__link_chunk_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, int sum_chunk,
-    H5P_genplist_t *dx_plist);
-static herr_t H5D__inter_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, const H5S_t *file_space,
-    const H5S_t *mem_space);
-static herr_t H5D__final_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, MPI_Datatype *mpi_file_type,
-    MPI_Datatype *mpi_buf_type);
+static herr_t H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                       H5D_chunk_map_t *fm);
+static herr_t H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                             H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist);
+static herr_t H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                            H5D_chunk_map_t *fm, int sum_chunk, H5P_genplist_t *dx_plist);
+static herr_t H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                       const H5S_t *file_space, const H5S_t *mem_space);
+static herr_t H5D__final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                       hsize_t nelmts, MPI_Datatype *mpi_file_type,
+                                       MPI_Datatype *mpi_buf_type);
 static herr_t H5D__sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
-    H5D_chunk_addr_info_t chunk_addr_info_array[], int many_chunk_opt);
-static herr_t H5D__obtain_mpio_mode(H5D_io_info_t *io_info, H5D_chunk_map_t *fm,
-    H5P_genplist_t *dx_plist, uint8_t assign_io_mode[], haddr_t chunk_addr[]);
+                              H5D_chunk_addr_info_t chunk_addr_info_array[], int many_chunk_opt);
+static herr_t H5D__obtain_mpio_mode(H5D_io_info_t *io_info, H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist,
+                                    uint8_t assign_io_mode[], haddr_t chunk_addr[]);
 static herr_t H5D__ioinfo_xfer_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
-    H5FD_mpio_xfer_t xfer_mode);
+                                    H5FD_mpio_xfer_t xfer_mode);
 static herr_t H5D__ioinfo_coll_opt_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
-    H5FD_mpio_collective_opt_t coll_opt_mode);
-static herr_t H5D__mpio_get_min_chunk(const H5D_io_info_t *io_info,
-    const H5D_chunk_map_t *fm, int *min_chunkf);
-static herr_t H5D__mpio_get_sum_chunk(const H5D_io_info_t *io_info,
-    const H5D_chunk_map_t *fm, int *sum_chunkf);
-
+                                        H5FD_mpio_collective_opt_t coll_opt_mode);
+static herr_t H5D__mpio_get_min_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
+                                      int *min_chunkf);
+static herr_t H5D__mpio_get_sum_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
+                                      int *sum_chunkf);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__mpio_opt_possible
  *
@@ -151,13 +142,12 @@ static herr_t H5D__mpio_get_sum_chunk(const H5D_io_info_t *io_info,
  *-------------------------------------------------------------------------
  */
 htri_t
-H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space,
-    const H5S_t *mem_space, const H5D_type_info_t *type_info,
-    const H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist)
+H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space, const H5S_t *mem_space,
+                       const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist)
 {
-    int local_cause = 0;        /* Local reason(s) for breaking collective mode */
-    int global_cause = 0;       /* Global reason(s) for breaking collective mode */
-    htri_t ret_value;           /* Return value */
+    int    local_cause  = 0; /* Local reason(s) for breaking collective mode */
+    int    global_cause = 0; /* Global reason(s) for breaking collective mode */
+    htri_t ret_value;        /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -167,36 +157,35 @@ H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space,
     HDassert(file_space);
     HDassert(type_info);
 
-
     /* For independent I/O, get out quickly and don't try to form consensus */
-    if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_INDEPENDENT)
+    if (io_info->dxpl_cache->xfer_mode == H5FD_MPIO_INDEPENDENT)
         local_cause |= H5D_MPIO_SET_INDEPENDENT;
 
     /* Optimized MPI types flag must be set */
     /* (based on 'HDF5_MPI_OPT_TYPES' environment variable) */
-    if(!H5FD_mpi_opt_types_g)
+    if (!H5FD_mpi_opt_types_g)
         local_cause |= H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED;
 
     /* Don't allow collective operations if datatype conversions need to happen */
-    if(!type_info->is_conv_noop)
+    if (!type_info->is_conv_noop)
         local_cause |= H5D_MPIO_DATATYPE_CONVERSION;
 
     /* Don't allow collective operations if data transform operations should occur */
-    if(!type_info->is_xform_noop)
+    if (!type_info->is_xform_noop)
         local_cause |= H5D_MPIO_DATA_TRANSFORMS;
 
     /* Check whether these are both simple or scalar dataspaces */
-    if(!((H5S_SIMPLE == H5S_GET_EXTENT_TYPE(mem_space) || H5S_SCALAR == H5S_GET_EXTENT_TYPE(mem_space))
-            && (H5S_SIMPLE == H5S_GET_EXTENT_TYPE(file_space) || H5S_SCALAR == H5S_GET_EXTENT_TYPE(file_space))))
+    if (!((H5S_SIMPLE == H5S_GET_EXTENT_TYPE(mem_space) || H5S_SCALAR == H5S_GET_EXTENT_TYPE(mem_space)) &&
+          (H5S_SIMPLE == H5S_GET_EXTENT_TYPE(file_space) || H5S_SCALAR == H5S_GET_EXTENT_TYPE(file_space))))
         local_cause |= H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES;
 
     /* Dataset storage must be contiguous or chunked */
-    if(!(io_info->dset->shared->layout.type == H5D_CONTIGUOUS ||
-            io_info->dset->shared->layout.type == H5D_CHUNKED))
+    if (!(io_info->dset->shared->layout.type == H5D_CONTIGUOUS ||
+          io_info->dset->shared->layout.type == H5D_CHUNKED))
         local_cause |= H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET;
 
     /* check if external-file storage is used */
-    if(io_info->dset->shared->dcpl_cache.efl.nused > 0)
+    if (io_info->dset->shared->dcpl_cache.efl.nused > 0)
         local_cause |= H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET;
 
     /* The handling of memory space is different for chunking and contiguous
@@ -207,29 +196,30 @@ H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space,
      */
 
     /* Don't allow collective operations if filters need to be applied */
-    if(io_info->dset->shared->layout.type == H5D_CHUNKED &&
-            io_info->dset->shared->dcpl_cache.pline.nused > 0)
+    if (io_info->dset->shared->layout.type == H5D_CHUNKED &&
+        io_info->dset->shared->dcpl_cache.pline.nused > 0)
         local_cause |= H5D_MPIO_FILTERS;
 
     /* Check for independent I/O */
-    if(local_cause & H5D_MPIO_SET_INDEPENDENT)
+    if (local_cause & H5D_MPIO_SET_INDEPENDENT)
         global_cause = local_cause;
     else {
-        int mpi_code;               /* MPI error code */
+        int mpi_code; /* MPI error code */
 
         /* Form consensus opinion among all processes about whether to perform
          * collective I/O
          */
-        if(MPI_SUCCESS != (mpi_code = MPI_Allreduce(&local_cause, &global_cause, 1, MPI_INT, MPI_BOR, io_info->comm)))
+        if (MPI_SUCCESS !=
+            (mpi_code = MPI_Allreduce(&local_cause, &global_cause, 1, MPI_INT, MPI_BOR, io_info->comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Allreduce failed", mpi_code)
     } /* end else */
 
     /* Write the local value of no-collective-cause to the DXPL. */
-    if(H5P_set(dx_plist, H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME, &local_cause) < 0)
-       HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set local no collective cause property")
+    if (H5P_set(dx_plist, H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME, &local_cause) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set local no collective cause property")
 
     /* Write the global value of no-collective-cause to the DXPL. */
-    if(H5P_set(dx_plist, H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME, &global_cause) < 0)
+    if (H5P_set(dx_plist, H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME, &global_cause) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set global no collective cause property")
 
     /* Set the return value, based on the global cause */
@@ -239,7 +229,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__mpio_opt_possible() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__mpio_select_read
  *
@@ -253,22 +242,24 @@ done:
  */
 herr_t
 H5D__mpio_select_read(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNUSED *type_info,
-    hsize_t mpi_buf_count, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space)
+                      hsize_t mpi_buf_count, const H5S_t H5_ATTR_UNUSED *file_space,
+                      const H5S_t H5_ATTR_UNUSED *mem_space)
 {
-    const H5D_contig_storage_t *store_contig = &(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
+    const H5D_contig_storage_t *store_contig =
+        &(io_info->store->contig); /* Contiguous storage info for this I/O operation */
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_PACKAGE
 
     H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
-    if(H5F_block_read(io_info->dset->oloc.file, H5FD_MEM_DRAW, store_contig->dset_addr, (size_t)mpi_buf_count, io_info->dxpl_id, io_info->u.rbuf) < 0)
+    if (H5F_block_read(io_info->dset->oloc.file, H5FD_MEM_DRAW, store_contig->dset_addr,
+                       (size_t)mpi_buf_count, io_info->dxpl_id, io_info->u.rbuf) < 0)
         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "can't finish collective parallel read")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__mpio_select_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__mpio_select_write
  *
@@ -282,23 +273,25 @@ done:
  */
 herr_t
 H5D__mpio_select_write(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNUSED *type_info,
-    hsize_t mpi_buf_count, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space)
+                       hsize_t mpi_buf_count, const H5S_t H5_ATTR_UNUSED *file_space,
+                       const H5S_t H5_ATTR_UNUSED *mem_space)
 {
-    const H5D_contig_storage_t *store_contig = &(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
+    const H5D_contig_storage_t *store_contig =
+        &(io_info->store->contig); /* Contiguous storage info for this I/O operation */
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_PACKAGE
 
     /*OKAY: CAST DISCARDS CONST QUALIFIER*/
     H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
-    if(H5F_block_write(io_info->dset->oloc.file, H5FD_MEM_DRAW, store_contig->dset_addr, (size_t)mpi_buf_count, io_info->dxpl_id, io_info->u.wbuf) < 0)
-       HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "can't finish collective parallel write")
+    if (H5F_block_write(io_info->dset->oloc.file, H5FD_MEM_DRAW, store_contig->dset_addr,
+                        (size_t)mpi_buf_count, io_info->dxpl_id, io_info->u.wbuf) < 0)
+        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "can't finish collective parallel write")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__mpio_select_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__ioinfo_xfer_mode
  *
@@ -312,29 +305,28 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__ioinfo_xfer_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
-    H5FD_mpio_xfer_t xfer_mode)
+H5D__ioinfo_xfer_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist, H5FD_mpio_xfer_t xfer_mode)
 {
-    herr_t  ret_value = SUCCEED;    /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_STATIC
 
     /* Change the xfer_mode */
     io_info->dxpl_cache->xfer_mode = xfer_mode;
-    if(H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
+    if (H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
 
     /* Change the "single I/O" function pointers */
-    if(xfer_mode == H5FD_MPIO_INDEPENDENT) {
+    if (xfer_mode == H5FD_MPIO_INDEPENDENT) {
         /* Set the pointers to the original, non-MPI-specific routines */
-        io_info->io_ops.single_read = io_info->orig.io_ops.single_read;
+        io_info->io_ops.single_read  = io_info->orig.io_ops.single_read;
         io_info->io_ops.single_write = io_info->orig.io_ops.single_write;
     } /* end if */
     else {
         HDassert(xfer_mode == H5FD_MPIO_COLLECTIVE);
 
         /* Set the pointers to the MPI-specific routines */
-        io_info->io_ops.single_read = H5D__mpio_select_read;
+        io_info->io_ops.single_read  = H5D__mpio_select_read;
         io_info->io_ops.single_write = H5D__mpio_select_write;
     } /* end else */
 
@@ -342,7 +334,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__ioinfo_xfer_mode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__ioinfo_coll_opt_mode
  *
@@ -358,22 +349,21 @@ done:
  */
 static herr_t
 H5D__ioinfo_coll_opt_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
-    H5FD_mpio_collective_opt_t coll_opt_mode)
+                          H5FD_mpio_collective_opt_t coll_opt_mode)
 {
-    herr_t  ret_value = SUCCEED;    /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_STATIC
 
     /* Change the optimal xfer_mode */
     io_info->dxpl_cache->coll_opt_mode = coll_opt_mode;
-    if(H5P_set(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &io_info->dxpl_cache->coll_opt_mode) < 0)
+    if (H5P_set(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &io_info->dxpl_cache->coll_opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__ioinfo_coll_opt_mode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__mpio_get_min_chunk
  *
@@ -388,11 +378,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__mpio_get_min_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
-    int *min_chunkf)
+H5D__mpio_get_min_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm, int *min_chunkf)
 {
-    int num_chunkf;             /* Number of chunks to iterate over */
-    int mpi_code;               /* MPI return code */
+    int    num_chunkf; /* Number of chunks to iterate over */
+    int    mpi_code;   /* MPI return code */
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
@@ -401,14 +390,14 @@ H5D__mpio_get_min_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
     num_chunkf = H5SL_count(fm->sel_chunks);
 
     /* Determine the minimum # of chunks for all processes */
-    if(MPI_SUCCESS != (mpi_code = MPI_Allreduce(&num_chunkf, min_chunkf, 1, MPI_INT, MPI_MIN, io_info->comm)))
+    if (MPI_SUCCESS !=
+        (mpi_code = MPI_Allreduce(&num_chunkf, min_chunkf, 1, MPI_INT, MPI_MIN, io_info->comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Allreduce failed", mpi_code)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__mpio_get_min_chunk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__mpio_get_sum_chunk
  *
@@ -423,30 +412,29 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__mpio_get_sum_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
-    int *sum_chunkf)
+H5D__mpio_get_sum_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm, int *sum_chunkf)
 {
-    int num_chunkf;             /* Number of chunks to iterate over */
+    int    num_chunkf; /* Number of chunks to iterate over */
     size_t ori_num_chunkf;
-    int mpi_code;               /* MPI return code */
+    int    mpi_code; /* MPI return code */
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
     /* Get the number of chunks to perform I/O on */
-    num_chunkf = 0;
+    num_chunkf     = 0;
     ori_num_chunkf = H5SL_count(fm->sel_chunks);
     H5_CHECKED_ASSIGN(num_chunkf, int, ori_num_chunkf, size_t);
 
     /* Determine the summation of number of chunks for all processes */
-    if(MPI_SUCCESS != (mpi_code = MPI_Allreduce(&num_chunkf, sum_chunkf, 1, MPI_INT, MPI_SUM, io_info->comm)))
+    if (MPI_SUCCESS !=
+        (mpi_code = MPI_Allreduce(&num_chunkf, sum_chunkf, 1, MPI_INT, MPI_SUM, io_info->comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Allreduce failed", mpi_code)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__mpio_get_sum_chunk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__contig_collective_read
  *
@@ -462,12 +450,12 @@ done:
  */
 herr_t
 H5D__contig_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t H5_ATTR_UNUSED *fm)
+                            hsize_t H5_ATTR_UNUSED nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                            H5D_chunk_map_t H5_ATTR_UNUSED *fm)
 {
     H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_CONTIGUOUS_COLLECTIVE;
-    H5P_genplist_t *dx_plist;           /* Pointer to DXPL */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *          dx_plist;            /* Pointer to DXPL */
+    herr_t                    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -476,24 +464,23 @@ H5D__contig_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_
     HDassert(TRUE == H5P_isa_class(io_info->dxpl_id, H5P_DATASET_XFER));
 
     /* Call generic internal collective I/O routine */
-    if(H5D__inter_collective_io(io_info, type_info, file_space, mem_space) < 0)
+    if (H5D__inter_collective_io(io_info, type_info, file_space, mem_space) < 0)
         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "couldn't finish shared collective MPI-IO")
 
     /* Obtain the data transfer properties */
-    if(NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
+    if (NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
 
     /* Set the actual I/O mode property. internal_collective_io will not break to
      * independent I/O, so we set it here.
      */
-    if(H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
+    if (H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set actual io mode property")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_collective_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__contig_collective_write
  *
@@ -509,12 +496,12 @@ done:
  */
 herr_t
 H5D__contig_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t H5_ATTR_UNUSED *fm)
+                             hsize_t H5_ATTR_UNUSED nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                             H5D_chunk_map_t H5_ATTR_UNUSED *fm)
 {
     H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_CONTIGUOUS_COLLECTIVE;
-    H5P_genplist_t *dx_plist;           /* Pointer to DXPL */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *          dx_plist;            /* Pointer to DXPL */
+    herr_t                    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -523,24 +510,23 @@ H5D__contig_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type
     HDassert(TRUE == H5P_isa_class(io_info->dxpl_id, H5P_DATASET_XFER));
 
     /* Call generic internal collective I/O routine */
-    if(H5D__inter_collective_io(io_info, type_info, file_space, mem_space) < 0)
+    if (H5D__inter_collective_io(io_info, type_info, file_space, mem_space) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "couldn't finish shared collective MPI-IO")
 
     /* Obtain the data transfer properties */
-    if(NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
+    if (NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
 
     /* Set the actual I/O mode property. internal_collective_io will not break to
      * independent I/O, so we set it here.
      */
-    if(H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
+    if (H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set actual io mode property")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__contig_collective_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_collective_io
  *
@@ -578,17 +564,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    H5D_chunk_map_t *fm)
+H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm)
 {
-    H5P_genplist_t *dx_plist;           /* Pointer to DXPL */
+    H5P_genplist_t *      dx_plist; /* Pointer to DXPL */
     H5FD_mpio_chunk_opt_t chunk_opt_mode;
-    int         io_option = H5D_MULTI_CHUNK_IO_MORE_OPT;
-    int         sum_chunk = -1;
+    int                   io_option = H5D_MULTI_CHUNK_IO_MORE_OPT;
+    int                   sum_chunk = -1;
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-    htri_t      temp_not_link_io = FALSE;
+    htri_t temp_not_link_io = FALSE;
 #endif
-    herr_t      ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
@@ -599,31 +584,33 @@ H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
     HDassert(fm);
 
     /* Obtain the data transfer properties */
-    if(NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
+    if (NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     /* Check the optional property list on what to do with collective chunk IO. */
     chunk_opt_mode = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME);
-    if(H5FD_MPIO_CHUNK_ONE_IO == chunk_opt_mode)
-        io_option = H5D_ONE_LINK_CHUNK_IO;      /*no opt*/
+    if (H5FD_MPIO_CHUNK_ONE_IO == chunk_opt_mode)
+        io_option = H5D_ONE_LINK_CHUNK_IO; /*no opt*/
     /* direct request to multi-chunk-io */
-    else if(H5FD_MPIO_CHUNK_MULTI_IO == chunk_opt_mode)
-        io_option = H5D_MULTI_CHUNK_IO;         
+    else if (H5FD_MPIO_CHUNK_MULTI_IO == chunk_opt_mode)
+        io_option = H5D_MULTI_CHUNK_IO;
     /* via default path. branch by num threshold */
     else {
-        unsigned one_link_chunk_io_threshold;   /* Threshhold to use single collective I/O for all chunks */
-        int mpi_size;                   /* Number of processes in MPI job */
+        unsigned one_link_chunk_io_threshold; /* Threshhold to use single collective I/O for all chunks */
+        int      mpi_size;                    /* Number of processes in MPI job */
 
-        if(H5D__mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes");
-        if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
+        if (H5D__mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL,
+                        "unable to obtain the total chunk number of all processes");
+        if ((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
             HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
 
         one_link_chunk_io_threshold = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME);
 
         /* step 1: choose an IO option */
-        /* If the average number of chunk per process is greater than a threshold, we will do one link chunked IO. */
-        if((unsigned)sum_chunk / mpi_size >= one_link_chunk_io_threshold)
+        /* If the average number of chunk per process is greater than a threshold, we will do one link chunked
+         * IO. */
+        if ((unsigned)sum_chunk / mpi_size >= one_link_chunk_io_threshold)
             io_option = H5D_ONE_LINK_CHUNK_IO_MORE_OPT;
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
         else
@@ -632,63 +619,63 @@ H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
     } /* end else */
 
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-{
-    H5P_genplist_t    *plist;           /* Property list pointer */
-    htri_t            check_prop;
-    int               new_value;
-
-    /* Get the dataset transfer property list */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
-        HGOTO_ERROR(H5E_IO, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
-
-    /*** Test collective chunk user-input optimization APIs. ***/
-    check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_LINK_HARD_NAME);
-    if(check_prop > 0) {
-        if(H5D_ONE_LINK_CHUNK_IO == io_option) {
-            new_value = 0;
-            if(H5P_set(plist, H5D_XFER_COLL_CHUNK_LINK_HARD_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-    check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME);
-    if(check_prop > 0) {
-        if(H5D_MULTI_CHUNK_IO == io_option) {
-            new_value = 0;
-            if(H5P_set(plist, H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-    check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME);
-    if(check_prop > 0) {
-        if(H5D_ONE_LINK_CHUNK_IO_MORE_OPT == io_option) {
-            new_value = 0;
-            if(H5P_set(plist, H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-    check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME);
-    if(check_prop > 0) {
-        if(temp_not_link_io) {
-            new_value = 0;
-            if(H5P_set(plist, H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-}
+    {
+        H5P_genplist_t *plist; /* Property list pointer */
+        htri_t          check_prop;
+        int             new_value;
+
+        /* Get the dataset transfer property list */
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
+            HGOTO_ERROR(H5E_IO, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
+
+        /*** Test collective chunk user-input optimization APIs. ***/
+        check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_LINK_HARD_NAME);
+        if (check_prop > 0) {
+            if (H5D_ONE_LINK_CHUNK_IO == io_option) {
+                new_value = 0;
+                if (H5P_set(plist, H5D_XFER_COLL_CHUNK_LINK_HARD_NAME, &new_value) < 0)
+                    HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
+            } /* end if */
+        }     /* end if */
+        check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME);
+        if (check_prop > 0) {
+            if (H5D_MULTI_CHUNK_IO == io_option) {
+                new_value = 0;
+                if (H5P_set(plist, H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME, &new_value) < 0)
+                    HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
+            } /* end if */
+        }     /* end if */
+        check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME);
+        if (check_prop > 0) {
+            if (H5D_ONE_LINK_CHUNK_IO_MORE_OPT == io_option) {
+                new_value = 0;
+                if (H5P_set(plist, H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME, &new_value) < 0)
+                    HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
+            } /* end if */
+        }     /* end if */
+        check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME);
+        if (check_prop > 0) {
+            if (temp_not_link_io) {
+                new_value = 0;
+                if (H5P_set(plist, H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME, &new_value) < 0)
+                    HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
+            } /* end if */
+        }     /* end if */
+    }
 #endif
 
     /* step 2:  Go ahead to do IO.*/
-    if(H5D_ONE_LINK_CHUNK_IO == io_option || H5D_ONE_LINK_CHUNK_IO_MORE_OPT == io_option) {
-        if(H5D__link_chunk_collective_io(io_info, type_info, fm, sum_chunk, dx_plist) < 0)
+    if (H5D_ONE_LINK_CHUNK_IO == io_option || H5D_ONE_LINK_CHUNK_IO_MORE_OPT == io_option) {
+        if (H5D__link_chunk_collective_io(io_info, type_info, fm, sum_chunk, dx_plist) < 0)
             HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish linked chunk MPI-IO")
     } /* end if */
     /* direct request to multi-chunk-io */
-    else if(H5D_MULTI_CHUNK_IO == io_option) {
-        if(H5D__multi_chunk_collective_io(io_info, type_info, fm, dx_plist) < 0)
+    else if (H5D_MULTI_CHUNK_IO == io_option) {
+        if (H5D__multi_chunk_collective_io(io_info, type_info, fm, dx_plist) < 0)
             HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish optimized multiple chunk MPI-IO")
-    } /* end if */
+    }      /* end if */
     else { /* multiple chunk IO via threshold */
-        if(H5D__multi_chunk_collective_io(io_info, type_info, fm, dx_plist) < 0)
+        if (H5D__multi_chunk_collective_io(io_info, type_info, fm, dx_plist) < 0)
             HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish optimized multiple chunk MPI-IO")
     } /* end else */
 
@@ -696,7 +683,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_collective_io */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_collective_read
  *
@@ -712,22 +698,21 @@ done:
  */
 herr_t
 H5D__chunk_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
-    H5D_chunk_map_t *fm)
+                           hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space,
+                           const H5S_t H5_ATTR_UNUSED *mem_space, H5D_chunk_map_t *fm)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Call generic selection operation */
-    if(H5D__chunk_collective_io(io_info, type_info, fm) < 0)
+    if (H5D__chunk_collective_io(io_info, type_info, fm) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_collective_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__chunk_collective_write
  *
@@ -743,22 +728,21 @@ done:
  */
 herr_t
 H5D__chunk_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
-    H5D_chunk_map_t *fm)
+                            hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space,
+                            const H5S_t H5_ATTR_UNUSED *mem_space, H5D_chunk_map_t *fm)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Call generic selection operation */
-    if(H5D__chunk_collective_io(io_info, type_info, fm) < 0)
+    if (H5D__chunk_collective_io(io_info, type_info, fm) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__chunk_collective_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__link_chunk_collective_io
  *
@@ -782,45 +766,48 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    H5D_chunk_map_t *fm, int sum_chunk, H5P_genplist_t *dx_plist)
+H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm,
+                              int sum_chunk, H5P_genplist_t *dx_plist)
 {
     H5D_chunk_addr_info_t *chunk_addr_info_array = NULL;
-    MPI_Datatype chunk_final_mtype;         /* Final memory MPI datatype for all chunks with seletion */
-    hbool_t chunk_final_mtype_is_derived = FALSE;
-    MPI_Datatype chunk_final_ftype;         /* Final file MPI datatype for all chunks with seletion */
-    hbool_t chunk_final_ftype_is_derived = FALSE;
-    H5D_storage_t ctg_store;                /* Storage info for "fake" contiguous dataset */
-    size_t              total_chunks;
-    haddr_t            *total_chunk_addr_array = NULL;
-    MPI_Datatype       *chunk_mtype = NULL;
-    MPI_Datatype       *chunk_ftype = NULL;
-    MPI_Aint           *chunk_disp_array = NULL;
-    MPI_Aint           *chunk_mem_disp_array = NULL;
-    hbool_t            *chunk_mft_is_derived_array = NULL;      /* Flags to indicate each chunk's MPI file datatype is derived */
-    hbool_t            *chunk_mbt_is_derived_array = NULL;      /* Flags to indicate each chunk's MPI memory datatype is derived */
-    int                *chunk_mpi_file_counts = NULL;   /* Count of MPI file datatype for each chunk */
-    int                *chunk_mpi_mem_counts = NULL;    /* Count of MPI memory datatype for each chunk */
-    int                 mpi_code;           /* MPI return code */
+    MPI_Datatype           chunk_final_mtype; /* Final memory MPI datatype for all chunks with seletion */
+    hbool_t                chunk_final_mtype_is_derived = FALSE;
+    MPI_Datatype           chunk_final_ftype; /* Final file MPI datatype for all chunks with seletion */
+    hbool_t                chunk_final_ftype_is_derived = FALSE;
+    H5D_storage_t          ctg_store; /* Storage info for "fake" contiguous dataset */
+    size_t                 total_chunks;
+    haddr_t *              total_chunk_addr_array = NULL;
+    MPI_Datatype *         chunk_mtype            = NULL;
+    MPI_Datatype *         chunk_ftype            = NULL;
+    MPI_Aint *             chunk_disp_array       = NULL;
+    MPI_Aint *             chunk_mem_disp_array   = NULL;
+    hbool_t *              chunk_mft_is_derived_array =
+        NULL; /* Flags to indicate each chunk's MPI file datatype is derived */
+    hbool_t *chunk_mbt_is_derived_array =
+        NULL;                          /* Flags to indicate each chunk's MPI memory datatype is derived */
+    int *chunk_mpi_file_counts = NULL; /* Count of MPI file datatype for each chunk */
+    int *chunk_mpi_mem_counts  = NULL; /* Count of MPI memory datatype for each chunk */
+    int  mpi_code;                     /* MPI return code */
     H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode = H5D_MPIO_LINK_CHUNK;
-    H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_CHUNK_COLLECTIVE;
-    herr_t              ret_value = SUCCEED;
+    H5D_mpio_actual_io_mode_t        actual_io_mode        = H5D_MPIO_CHUNK_COLLECTIVE;
+    herr_t                           ret_value             = SUCCEED;
 
     FUNC_ENTER_STATIC
 
     /* Set the actual-chunk-opt-mode property. */
-    if(H5P_set(dx_plist, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, &actual_chunk_opt_mode) < 0)
+    if (H5P_set(dx_plist, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, &actual_chunk_opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set actual chunk opt mode property")
 
     /* Set the actual-io-mode property.
      * Link chunk I/O does not break to independent, so can set right away */
-    if(H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
+    if (H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set actual io mode property")
 
     /* Get the sum # of chunks, if not already available */
-    if(sum_chunk < 0) {
-        if(H5D__mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes");
+    if (sum_chunk < 0) {
+        if (H5D__mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL,
+                        "unable to obtain the total chunk number of all processes");
     } /* end if */
 
     /* Retrieve total # of chunks in dataset */
@@ -830,15 +817,15 @@ H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ
      *  the dataset.  [This sometimes is used by developers who want the
      *  equivalent of compressed contiguous datasets - QAK]
      */
-    if(total_chunks == 1) {
-        H5SL_node_t *chunk_node;        /* Pointer to chunk node for selection */
-        H5S_t *fspace;                  /* Dataspace describing chunk & selection in it */
-        H5S_t *mspace;                  /* Dataspace describing selection in memory corresponding to this chunk */
+    if (total_chunks == 1) {
+        H5SL_node_t *chunk_node; /* Pointer to chunk node for selection */
+        H5S_t *      fspace;     /* Dataspace describing chunk & selection in it */
+        H5S_t *      mspace;     /* Dataspace describing selection in memory corresponding to this chunk */
 
         /* Check for this process having selection in this chunk */
         chunk_node = H5SL_first(fm->sel_chunks);
 
-        if(chunk_node == NULL) {
+        if (chunk_node == NULL) {
             /* Set the dataspace info for I/O to NULL, this process doesn't have any I/O to perform */
             fspace = mspace = NULL;
 
@@ -846,11 +833,11 @@ H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ
             ctg_store.contig.dset_addr = 0;
         } /* end if */
         else {
-            H5D_chunk_ud_t udata;           /* User data for querying chunk info */
-            H5D_chunk_info_t *chunk_info;   /* Info for chunk in skiplist */
+            H5D_chunk_ud_t    udata;      /* User data for querying chunk info */
+            H5D_chunk_info_t *chunk_info; /* Info for chunk in skiplist */
 
             /* Get the chunk info, for the selection in the chunk */
-            if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_item(chunk_node)))
+            if (NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_item(chunk_node)))
                 HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skip list")
 
             /* Set the dataspace info for I/O */
@@ -858,8 +845,8 @@ H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ
             mspace = chunk_info->mspace;
 
             /* Look up address of chunk */
-            if(H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords,
-                    chunk_info->index, &udata) < 0)
+            if (H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords, chunk_info->index,
+                                  &udata) < 0)
                 HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk address")
             ctg_store.contig.dset_addr = udata.addr;
         } /* end else */
@@ -868,69 +855,75 @@ H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ
         io_info->store = &ctg_store;
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before inter_collective_io for total chunk = 1 \n");
+        if (H5DEBUG(D))
+            HDfprintf(H5DEBUG(D), "before inter_collective_io for total chunk = 1 \n");
 #endif
 
         /* Perform I/O */
-        if(H5D__inter_collective_io(io_info, type_info, fspace, mspace) < 0)
+        if (H5D__inter_collective_io(io_info, type_info, fspace, mspace) < 0)
             HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't finish shared collective MPI-IO")
     } /* end if */
     else {
-        hsize_t mpi_buf_count;  /* Number of MPI types */
-        size_t num_chunk;       /* Number of chunks for this process */
-        size_t u;               /* Local index variable */
+        hsize_t mpi_buf_count; /* Number of MPI types */
+        size_t  num_chunk;     /* Number of chunks for this process */
+        size_t  u;             /* Local index variable */
 
         /* Get the number of chunks with a selection */
         num_chunk = H5SL_count(fm->sel_chunks);
         H5_CHECK_OVERFLOW(num_chunk, size_t, int);
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"total_chunks = %Zu, num_chunk = %Zu\n", total_chunks, num_chunk);
+        if (H5DEBUG(D))
+            HDfprintf(H5DEBUG(D), "total_chunks = %Zu, num_chunk = %Zu\n", total_chunks, num_chunk);
 #endif
 
         /* Set up MPI datatype for chunks selected */
-        if(num_chunk) {
+        if (num_chunk) {
             /* Allocate chunking information */
-            if(NULL == (chunk_addr_info_array = (H5D_chunk_addr_info_t *)H5MM_malloc(num_chunk * sizeof(H5D_chunk_addr_info_t))))
+            if (NULL == (chunk_addr_info_array =
+                             (H5D_chunk_addr_info_t *)H5MM_malloc(num_chunk * sizeof(H5D_chunk_addr_info_t))))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk array buffer")
-            if(NULL == (chunk_mtype           = (MPI_Datatype *)H5MM_malloc(num_chunk * sizeof(MPI_Datatype))))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk memory datatype buffer")
-            if(NULL == (chunk_ftype           = (MPI_Datatype *)H5MM_malloc(num_chunk * sizeof(MPI_Datatype))))
+            if (NULL == (chunk_mtype = (MPI_Datatype *)H5MM_malloc(num_chunk * sizeof(MPI_Datatype))))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL,
+                            "couldn't allocate chunk memory datatype buffer")
+            if (NULL == (chunk_ftype = (MPI_Datatype *)H5MM_malloc(num_chunk * sizeof(MPI_Datatype))))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk file datatype buffer")
-            if(NULL == (chunk_disp_array      = (MPI_Aint *)H5MM_malloc(num_chunk * sizeof(MPI_Aint))))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk file displacement buffer")
-            if(NULL == (chunk_mem_disp_array  = (MPI_Aint *)H5MM_calloc(num_chunk * sizeof(MPI_Aint))))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk memory displacement buffer")
-            if(NULL == (chunk_mpi_mem_counts        = (int *)H5MM_calloc(num_chunk * sizeof(int))))
+            if (NULL == (chunk_disp_array = (MPI_Aint *)H5MM_malloc(num_chunk * sizeof(MPI_Aint))))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL,
+                            "couldn't allocate chunk file displacement buffer")
+            if (NULL == (chunk_mem_disp_array = (MPI_Aint *)H5MM_calloc(num_chunk * sizeof(MPI_Aint))))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL,
+                            "couldn't allocate chunk memory displacement buffer")
+            if (NULL == (chunk_mpi_mem_counts = (int *)H5MM_calloc(num_chunk * sizeof(int))))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk memory counts buffer")
-            if(NULL == (chunk_mpi_file_counts       = (int *)H5MM_calloc(num_chunk * sizeof(int))))
+            if (NULL == (chunk_mpi_file_counts = (int *)H5MM_calloc(num_chunk * sizeof(int))))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk file counts buffer")
-            if(NULL == (chunk_mbt_is_derived_array  = (hbool_t *)H5MM_calloc(num_chunk * sizeof(hbool_t))))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk memory is derived datatype flags buffer")
-            if(NULL == (chunk_mft_is_derived_array  = (hbool_t *)H5MM_calloc(num_chunk * sizeof(hbool_t))))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate chunk file is derived datatype flags buffer")
+            if (NULL == (chunk_mbt_is_derived_array = (hbool_t *)H5MM_calloc(num_chunk * sizeof(hbool_t))))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL,
+                            "couldn't allocate chunk memory is derived datatype flags buffer")
+            if (NULL == (chunk_mft_is_derived_array = (hbool_t *)H5MM_calloc(num_chunk * sizeof(hbool_t))))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL,
+                            "couldn't allocate chunk file is derived datatype flags buffer")
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before sorting the chunk address \n");
+            if (H5DEBUG(D))
+                HDfprintf(H5DEBUG(D), "before sorting the chunk address \n");
 #endif
             /* Sort the chunk address */
-            if(H5D__sort_chunk(io_info, fm, chunk_addr_info_array, sum_chunk) < 0)
+            if (H5D__sort_chunk(io_info, fm, chunk_addr_info_array, sum_chunk) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to sort chunk address")
             ctg_store.contig.dset_addr = chunk_addr_info_array[0].chunk_addr;
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"after sorting the chunk address \n");
+            if (H5DEBUG(D))
+                HDfprintf(H5DEBUG(D), "after sorting the chunk address \n");
 #endif
 
             /* Obtain MPI derived datatype from all individual chunks */
-            for(u = 0; u < num_chunk; u++) {
-                hsize_t *permute_map = NULL; /* array that holds the mapping from the old, 
-                                                out-of-order displacements to the in-order 
-                                                displacements of the MPI datatypes of the 
+            for (u = 0; u < num_chunk; u++) {
+                hsize_t *permute_map = NULL; /* array that holds the mapping from the old,
+                                                out-of-order displacements to the in-order
+                                                displacements of the MPI datatypes of the
                                                 point selection of the file space */
                 hbool_t is_permuted = FALSE;
 
@@ -939,46 +932,43 @@ if(H5DEBUG(D))
                  *              and will be fed into the next call to H5S_mpio_space_type
                  *              where it will be freed.
                  */
-                if(H5S_mpio_space_type(chunk_addr_info_array[u].chunk_info.fspace,
-                                       type_info->src_type_size, 
-                                       &chunk_ftype[u], /* OUT: datatype created */ 
-                                       &chunk_mpi_file_counts[u], /* OUT */
-                                       &(chunk_mft_is_derived_array[u]), /* OUT */
-                                       TRUE, /* this is a file space,
-                                                so permute the
-                                                datatype if the point
-                                                selections are out of
-                                                order */
-                                       &permute_map,/* OUT: a map to indicate the
-                                                       permutation of points
-                                                       selected in case they
-                                                       are out of order */
-                                       &is_permuted /* OUT */) < 0)
+                if (H5S_mpio_space_type(chunk_addr_info_array[u].chunk_info.fspace, type_info->src_type_size,
+                                        &chunk_ftype[u],                  /* OUT: datatype created */
+                                        &chunk_mpi_file_counts[u],        /* OUT */
+                                        &(chunk_mft_is_derived_array[u]), /* OUT */
+                                        TRUE,                             /* this is a file space,
+                                                                             so permute the
+                                                                             datatype if the point
+                                                                             selections are out of
+                                                                             order */
+                                        &permute_map,                     /* OUT: a map to indicate the
+                                                                             permutation of points
+                                                                             selected in case they
+                                                                             are out of order */
+                                        &is_permuted /* OUT */) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI file type")
                 /* Sanity check */
-                if(is_permuted)
+                if (is_permuted)
                     HDassert(permute_map);
-                if(H5S_mpio_space_type(chunk_addr_info_array[u].chunk_info.mspace,
-                                       type_info->dst_type_size, &chunk_mtype[u], 
-                                       &chunk_mpi_mem_counts[u], 
-                                       &(chunk_mbt_is_derived_array[u]), 
-                                       FALSE, /* this is a memory
-                                                 space, so if the file
-                                                 space is not
-                                                 permuted, there is no
-                                                 need to permute the
-                                                 datatype if the point
-                                                 selections are out of
-                                                 order*/
-                                       &permute_map, /* IN: the permutation map
-                                                        generated by the
-                                                        file_space selection
-                                                        and applied to the
-                                                        memory selection */
-                                       &is_permuted /* IN */) < 0)
+                if (H5S_mpio_space_type(chunk_addr_info_array[u].chunk_info.mspace, type_info->dst_type_size,
+                                        &chunk_mtype[u], &chunk_mpi_mem_counts[u],
+                                        &(chunk_mbt_is_derived_array[u]), FALSE, /* this is a memory
+                                                                                    space, so if the file
+                                                                                    space is not
+                                                                                    permuted, there is no
+                                                                                    need to permute the
+                                                                                    datatype if the point
+                                                                                    selections are out of
+                                                                                    order*/
+                                        &permute_map,                            /* IN: the permutation map
+                                                                                    generated by the
+                                                                                    file_space selection
+                                                                                    and applied to the
+                                                                                    memory selection */
+                                        &is_permuted /* IN */) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI buf type")
                 /* Sanity check */
-                if(is_permuted)
+                if (is_permuted)
                     HDassert(!permute_map);
 
                 /* Chunk address relative to the first chunk */
@@ -990,46 +980,51 @@ if(H5DEBUG(D))
             } /* end for */
 
             /* Create final MPI derived datatype for the file */
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_create_struct((int)num_chunk, chunk_mpi_file_counts, chunk_disp_array, chunk_ftype, &chunk_final_ftype)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_Type_create_struct((int)num_chunk, chunk_mpi_file_counts, chunk_disp_array,
+                                                   chunk_ftype, &chunk_final_ftype)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_struct failed", mpi_code)
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_final_ftype)))
+            if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_final_ftype)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
             chunk_final_ftype_is_derived = TRUE;
 
             /* Create final MPI derived datatype for memory */
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_create_struct((int)num_chunk, chunk_mpi_mem_counts, chunk_mem_disp_array, chunk_mtype, &chunk_final_mtype)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_Type_create_struct((int)num_chunk, chunk_mpi_mem_counts, chunk_mem_disp_array,
+                                                   chunk_mtype, &chunk_final_mtype)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_struct failed", mpi_code)
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_final_mtype)))
+            if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_final_mtype)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
             chunk_final_mtype_is_derived = TRUE;
 
             /* Free the file & memory MPI datatypes for each chunk */
-            for(u = 0; u < num_chunk; u++) {
-                if(chunk_mbt_is_derived_array[u])
-                    if(MPI_SUCCESS != (mpi_code = MPI_Type_free(chunk_mtype + u)))
+            for (u = 0; u < num_chunk; u++) {
+                if (chunk_mbt_is_derived_array[u])
+                    if (MPI_SUCCESS != (mpi_code = MPI_Type_free(chunk_mtype + u)))
                         HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
 
-                if(chunk_mft_is_derived_array[u])
-                    if(MPI_SUCCESS != (mpi_code = MPI_Type_free(chunk_ftype + u)))
+                if (chunk_mft_is_derived_array[u])
+                    if (MPI_SUCCESS != (mpi_code = MPI_Type_free(chunk_ftype + u)))
                         HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
             } /* end for */
 
             /* We have a single, complicated MPI datatype for both memory & file */
-            mpi_buf_count  = (hsize_t)1;
-        } /* end if */
-        else {      /* no selection at all for this process */
+            mpi_buf_count = (hsize_t)1;
+        }      /* end if */
+        else { /* no selection at all for this process */
             /* Allocate chunking information */
-            if(NULL == (total_chunk_addr_array = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * total_chunks)))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate total chunk address arraybuffer")
+            if (NULL == (total_chunk_addr_array = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * total_chunks)))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL,
+                            "couldn't allocate total chunk address arraybuffer")
 
             /* Retrieve chunk address map */
-            if(H5D__chunk_addrmap(io_info, total_chunk_addr_array) < 0)
+            if (H5D__chunk_addrmap(io_info, total_chunk_addr_array) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address")
 
             /* Get chunk with lowest address */
             ctg_store.contig.dset_addr = HADDR_MAX;
-            for(u = 0; u < total_chunks; u++)
-                if(total_chunk_addr_array[u] < ctg_store.contig.dset_addr)
+            for (u = 0; u < total_chunks; u++)
+                if (total_chunk_addr_array[u] < ctg_store.contig.dset_addr)
                     ctg_store.contig.dset_addr = total_chunk_addr_array[u];
             HDassert(ctg_store.contig.dset_addr != HADDR_MAX);
 
@@ -1038,58 +1033,59 @@ if(H5DEBUG(D))
             chunk_final_mtype = MPI_BYTE;
 
             /* No chunks selected for this process */
-            mpi_buf_count  = (hsize_t)0;
+            mpi_buf_count = (hsize_t)0;
         } /* end else */
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before coming to final collective IO\n");
+        if (H5DEBUG(D))
+            HDfprintf(H5DEBUG(D), "before coming to final collective IO\n");
 #endif
 
         /* Set up the base storage address for this chunk */
         io_info->store = &ctg_store;
 
         /* Perform final collective I/O operation */
-        if(H5D__final_collective_io(io_info, type_info, mpi_buf_count, &chunk_final_ftype, &chunk_final_mtype) < 0)
+        if (H5D__final_collective_io(io_info, type_info, mpi_buf_count, &chunk_final_ftype,
+                                     &chunk_final_mtype) < 0)
             HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish MPI-IO")
     } /* end else */
 
 done:
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before freeing memory inside H5D_link_collective_io ret_value = %d\n", ret_value);
+    if (H5DEBUG(D))
+        HDfprintf(H5DEBUG(D), "before freeing memory inside H5D_link_collective_io ret_value = %d\n",
+                  ret_value);
 #endif
     /* Release resources */
-    if(total_chunk_addr_array)
+    if (total_chunk_addr_array)
         H5MM_xfree(total_chunk_addr_array);
-    if(chunk_addr_info_array)
+    if (chunk_addr_info_array)
         H5MM_xfree(chunk_addr_info_array);
-    if(chunk_mtype)
+    if (chunk_mtype)
         H5MM_xfree(chunk_mtype);
-    if(chunk_ftype)
+    if (chunk_ftype)
         H5MM_xfree(chunk_ftype);
-    if(chunk_disp_array)
+    if (chunk_disp_array)
         H5MM_xfree(chunk_disp_array);
-    if(chunk_mem_disp_array)
+    if (chunk_mem_disp_array)
         H5MM_xfree(chunk_mem_disp_array);
-    if(chunk_mpi_mem_counts)
+    if (chunk_mpi_mem_counts)
         H5MM_xfree(chunk_mpi_mem_counts);
-    if(chunk_mpi_file_counts)
+    if (chunk_mpi_file_counts)
         H5MM_xfree(chunk_mpi_file_counts);
-    if(chunk_mbt_is_derived_array)
+    if (chunk_mbt_is_derived_array)
         H5MM_xfree(chunk_mbt_is_derived_array);
-    if(chunk_mft_is_derived_array)
+    if (chunk_mft_is_derived_array)
         H5MM_xfree(chunk_mft_is_derived_array);
 
     /* Free the MPI buf and file types, if they were derived */
-    if(chunk_final_mtype_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&chunk_final_mtype)))
+    if (chunk_final_mtype_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&chunk_final_mtype)))
         HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-    if(chunk_final_ftype_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&chunk_final_ftype)))
+    if (chunk_final_ftype_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&chunk_final_ftype)))
         HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__link_chunk_collective_io */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__multi_chunk_collective_io
  *
@@ -1114,32 +1110,37 @@ if(H5DEBUG(D))
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist)
+H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm,
+                               H5P_genplist_t *dx_plist)
 {
-    H5D_io_info_t       ctg_io_info;          /* Contiguous I/O info object */
-    H5D_storage_t       ctg_store;            /* Chunk storage information as contiguous dataset */
-    H5D_io_info_t       cpt_io_info;          /* Compact I/O info object */
-    H5D_storage_t       cpt_store;            /* Chunk storage information as compact dataset */
-    hbool_t             cpt_dirty;            /* Temporary placeholder for compact storage "dirty" flag */
-    uint8_t            *chunk_io_option = NULL;
-    haddr_t            *chunk_addr = NULL;
-    H5D_storage_t       store;                /* union of EFL and chunk pointer in file space */
-    H5FD_mpio_xfer_t    last_xfer_mode = H5FD_MPIO_COLLECTIVE; /* Last parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */
-    H5FD_mpio_collective_opt_t last_coll_opt_mode = H5FD_MPIO_COLLECTIVE_IO; /* Last parallel transfer with independent IO or collective IO with this mode */
-    size_t              total_chunk;          /* Total # of chunks in dataset */
+    H5D_io_info_t    ctg_io_info; /* Contiguous I/O info object */
+    H5D_storage_t    ctg_store;   /* Chunk storage information as contiguous dataset */
+    H5D_io_info_t    cpt_io_info; /* Compact I/O info object */
+    H5D_storage_t    cpt_store;   /* Chunk storage information as compact dataset */
+    hbool_t          cpt_dirty;   /* Temporary placeholder for compact storage "dirty" flag */
+    uint8_t *        chunk_io_option = NULL;
+    haddr_t *        chunk_addr      = NULL;
+    H5D_storage_t    store; /* union of EFL and chunk pointer in file space */
+    H5FD_mpio_xfer_t last_xfer_mode =
+        H5FD_MPIO_COLLECTIVE; /* Last parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */
+    H5FD_mpio_collective_opt_t last_coll_opt_mode =
+        H5FD_MPIO_COLLECTIVE_IO; /* Last parallel transfer with independent IO or collective IO with this mode
+                                  */
+    size_t total_chunk;          /* Total # of chunks in dataset */
 #ifdef H5Dmpio_DEBUG
     int mpi_rank;
 #endif
-    size_t              u;                    /* Local index variable */
-    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode = H5D_MPIO_MULTI_CHUNK;  /* actual chunk optimization mode */
-    H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_NO_COLLECTIVE; /* Local variable for tracking the I/O mode used. */
-    herr_t              ret_value = SUCCEED;
+    size_t                           u; /* Local index variable */
+    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode =
+        H5D_MPIO_MULTI_CHUNK; /* actual chunk optimization mode */
+    H5D_mpio_actual_io_mode_t actual_io_mode =
+        H5D_MPIO_NO_COLLECTIVE; /* Local variable for tracking the I/O mode used. */
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
     /* Set the actual chunk opt mode property */
-    if(H5P_set(dx_plist, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, &actual_chunk_opt_mode) < 0)
+    if (H5P_set(dx_plist, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, &actual_chunk_opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set actual chunk opt mode property")
 
 #ifdef H5Dmpio_DEBUG
@@ -1154,17 +1155,17 @@ H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *ty
     chunk_io_option = (uint8_t *)H5MM_calloc(total_chunk);
     chunk_addr      = (haddr_t *)H5MM_calloc(total_chunk * sizeof(haddr_t));
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D), "total_chunk %Zu\n", total_chunk);
+    if (H5DEBUG(D))
+        HDfprintf(H5DEBUG(D), "total_chunk %Zu\n", total_chunk);
 #endif
 
     /* Obtain IO option for each chunk */
-    if(H5D__obtain_mpio_mode(io_info, fm, dx_plist, chunk_io_option, chunk_addr) < 0)
+    if (H5D__obtain_mpio_mode(io_info, fm, dx_plist, chunk_io_option, chunk_addr) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTRECV, FAIL, "unable to obtain MPIO mode")
 
     /* Set up contiguous I/O info object */
     HDmemcpy(&ctg_io_info, io_info, sizeof(ctg_io_info));
-    ctg_io_info.store = &ctg_store;
+    ctg_io_info.store      = &ctg_store;
     ctg_io_info.layout_ops = *H5D_LOPS_CONTIG;
 
     /* Initialize temporary contiguous storage info */
@@ -1172,7 +1173,7 @@ if(H5DEBUG(D))
 
     /* Set up compact I/O info object */
     HDmemcpy(&cpt_io_info, io_info, sizeof(cpt_io_info));
-    cpt_io_info.store = &cpt_store;
+    cpt_io_info.store      = &cpt_store;
     cpt_io_info.layout_ops = *H5D_LOPS_COMPACT;
 
     /* Initialize temporary compact storage info */
@@ -1182,39 +1183,40 @@ if(H5DEBUG(D))
     io_info->store = &store;
 
     /* Loop over _all_ the chunks */
-    for(u = 0; u < total_chunk; u++) {
-        H5D_chunk_info_t *chunk_info;    /* Chunk info for current chunk */
-        H5S_t *fspace;              /* Dataspace describing chunk & selection in it */
-        H5S_t *mspace;              /* Dataspace describing selection in memory corresponding to this chunk */
+    for (u = 0; u < total_chunk; u++) {
+        H5D_chunk_info_t *chunk_info; /* Chunk info for current chunk */
+        H5S_t *           fspace;     /* Dataspace describing chunk & selection in it */
+        H5S_t *           mspace; /* Dataspace describing selection in memory corresponding to this chunk */
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
+        if (H5DEBUG(D))
+            HDfprintf(H5DEBUG(D), "mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
 #endif
         /* Get the chunk info for this chunk, if there are elements selected */
         chunk_info = fm->select_chunk[u];
 
         /* Set the storage information for chunks with selections */
-        if(chunk_info) {
+        if (chunk_info) {
             HDassert(chunk_info->index == u);
 
             /* Pass in chunk's coordinates in a union. */
-            store.chunk.offset  = chunk_info->coords;
-            store.chunk.index   = chunk_info->index;
+            store.chunk.offset = chunk_info->coords;
+            store.chunk.index  = chunk_info->index;
         } /* end if */
 
         /* Collective IO for this chunk,
          * Note: even there is no selection for this process, the process still
          *      needs to contribute MPI NONE TYPE.
          */
-        if(chunk_io_option[u] == H5D_CHUNK_IO_MODE_COL) {
+        if (chunk_io_option[u] == H5D_CHUNK_IO_MODE_COL) {
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"inside collective chunk IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
+            if (H5DEBUG(D))
+                HDfprintf(H5DEBUG(D), "inside collective chunk IO mpi_rank = %d, chunk index = %Zu\n",
+                          mpi_rank, u);
 #endif
 
             /* Set the file & memory dataspaces */
-            if(chunk_info) {
+            if (chunk_info) {
                 fspace = chunk_info->fspace;
                 mspace = chunk_info->mspace;
 
@@ -1232,13 +1234,13 @@ if(H5DEBUG(D))
             } /* end else */
 
             /* Switch back to collective I/O */
-            if(last_xfer_mode != H5FD_MPIO_COLLECTIVE) {
-                if(H5D__ioinfo_xfer_mode(io_info, dx_plist, H5FD_MPIO_COLLECTIVE) < 0)
+            if (last_xfer_mode != H5FD_MPIO_COLLECTIVE) {
+                if (H5D__ioinfo_xfer_mode(io_info, dx_plist, H5FD_MPIO_COLLECTIVE) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O")
                 last_xfer_mode = H5FD_MPIO_COLLECTIVE;
             } /* end if */
-            if(last_coll_opt_mode != H5FD_MPIO_COLLECTIVE_IO) {
-                if(H5D__ioinfo_coll_opt_mode(io_info, dx_plist, H5FD_MPIO_COLLECTIVE_IO) < 0)
+            if (last_coll_opt_mode != H5FD_MPIO_COLLECTIVE_IO) {
+                if (H5D__ioinfo_coll_opt_mode(io_info, dx_plist, H5FD_MPIO_COLLECTIVE_IO) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O")
                 last_coll_opt_mode = H5FD_MPIO_COLLECTIVE_IO;
             } /* end if */
@@ -1247,19 +1249,20 @@ if(H5DEBUG(D))
             ctg_store.contig.dset_addr = chunk_addr[u];
 
             /* Perform the I/O */
-            if(H5D__inter_collective_io(&ctg_io_info, type_info, fspace, mspace) < 0)
+            if (H5D__inter_collective_io(&ctg_io_info, type_info, fspace, mspace) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish shared collective MPI-IO")
-        } /* end if */
-        else {  /* possible independent IO for this chunk */
+        }      /* end if */
+        else { /* possible independent IO for this chunk */
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"inside independent IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
+            if (H5DEBUG(D))
+                HDfprintf(H5DEBUG(D), "inside independent IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank,
+                          u);
 #endif
 
             HDassert(chunk_io_option[u] == 0);
 
             /* Set the file & memory dataspaces */
-            if(chunk_info) {
+            if (chunk_info) {
                 fspace = chunk_info->fspace;
                 mspace = chunk_info->mspace;
 
@@ -1271,8 +1274,8 @@ if(H5DEBUG(D))
             } /* end else */
 
             /* Using independent I/O with file setview.*/
-            if(last_coll_opt_mode != H5FD_MPIO_INDIVIDUAL_IO) {
-                if(H5D__ioinfo_coll_opt_mode(io_info, dx_plist, H5FD_MPIO_INDIVIDUAL_IO) < 0)
+            if (last_coll_opt_mode != H5FD_MPIO_INDIVIDUAL_IO) {
+                if (H5D__ioinfo_coll_opt_mode(io_info, dx_plist, H5FD_MPIO_INDIVIDUAL_IO) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to individual I/O")
                 last_coll_opt_mode = H5FD_MPIO_INDIVIDUAL_IO;
             } /* end if */
@@ -1281,29 +1284,28 @@ if(H5DEBUG(D))
             ctg_store.contig.dset_addr = chunk_addr[u];
 
             /* Perform the I/O */
-            if(H5D__inter_collective_io(&ctg_io_info, type_info, fspace, mspace) < 0)
+            if (H5D__inter_collective_io(&ctg_io_info, type_info, fspace, mspace) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish shared collective MPI-IO")
 #ifdef H5D_DEBUG
-  if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"after inter collective IO\n");
+            if (H5DEBUG(D))
+                HDfprintf(H5DEBUG(D), "after inter collective IO\n");
 #endif
         } /* end else */
-    } /* end for */
+    }     /* end for */
 
     /* Write the local value of actual io mode to the DXPL. */
-    if(H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
+    if (H5P_set(dx_plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, &actual_io_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "couldn't set actual io mode property")
 
 done:
-    if(chunk_io_option)
+    if (chunk_io_option)
         H5MM_xfree(chunk_io_option);
-    if(chunk_addr)
+    if (chunk_addr)
         H5MM_xfree(chunk_addr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__multi_chunk_collective_io */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__inter_collective_io
  *
@@ -1318,23 +1320,23 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    const H5S_t *file_space, const H5S_t *mem_space)
+H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, const H5S_t *file_space,
+                         const H5S_t *mem_space)
 {
-    int mpi_buf_count;                  /* # of MPI types */
-    hbool_t mbt_is_derived = FALSE;
-    hbool_t mft_is_derived = FALSE;
-    MPI_Datatype        mpi_file_type, mpi_buf_type;
-    int                 mpi_code;       /* MPI return code */
-    herr_t       ret_value = SUCCEED;   /* return value */
+    int          mpi_buf_count; /* # of MPI types */
+    hbool_t      mbt_is_derived = FALSE;
+    hbool_t      mft_is_derived = FALSE;
+    MPI_Datatype mpi_file_type, mpi_buf_type;
+    int          mpi_code;            /* MPI return code */
+    herr_t       ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_STATIC
 
-    if((file_space != NULL) && (mem_space != NULL)) {
-        int  mpi_file_count;         /* Number of file "objects" to transfer */
-        hsize_t *permute_map = NULL; /* array that holds the mapping from the old, 
-                                        out-of-order displacements to the in-order 
-                                        displacements of the MPI datatypes of the 
+    if ((file_space != NULL) && (mem_space != NULL)) {
+        int      mpi_file_count;     /* Number of file "objects" to transfer */
+        hsize_t *permute_map = NULL; /* array that holds the mapping from the old,
+                                        out-of-order displacements to the in-order
+                                        displacements of the MPI datatypes of the
                                         point selection of the file space */
         hbool_t is_permuted = FALSE;
 
@@ -1343,39 +1345,40 @@ H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
          *              and will be fed into the next call to H5S_mpio_space_type
          *              where it will be freed.
          */
-        if(H5S_mpio_space_type(file_space, type_info->src_type_size, 
-                               &mpi_file_type, &mpi_file_count, &mft_is_derived, /* OUT: datatype created */  
-                               TRUE, /* this is a file space, so
-                                        permute the datatype if the
-                                        point selection is out of
-                                        order */
-                               &permute_map, /* OUT: a map to indicate
-                                                the permutation of
-                                                points selected in
-                                                case they are out of
-                                                order */ 
-                               &is_permuted /* OUT */) < 0)
+        if (H5S_mpio_space_type(file_space, type_info->src_type_size, &mpi_file_type, &mpi_file_count,
+                                &mft_is_derived, /* OUT: datatype created */
+                                TRUE,            /* this is a file space, so
+                                                    permute the datatype if the
+                                                    point selection is out of
+                                                    order */
+                                &permute_map,    /* OUT: a map to indicate
+                                                    the permutation of
+                                                    points selected in
+                                                    case they are out of
+                                                    order */
+                                &is_permuted /* OUT */) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI file type")
         /* Sanity check */
-        if(is_permuted)
+        if (is_permuted)
             HDassert(permute_map);
-        if(H5S_mpio_space_type(mem_space, type_info->src_type_size, 
-                               &mpi_buf_type, &mpi_buf_count, &mbt_is_derived, /* OUT: datatype created */
-                               FALSE, /* this is a memory space, so if
-                                         the file space is not
-                                         permuted, there is no need to
-                                         permute the datatype if the
-                                         point selections are out of
-                                         order*/
-                               &permute_map /* IN: the permutation map
-                                               generated by the
-                                               file_space selection
-                                               and applied to the
-                                               memory selection */, 
-                               &is_permuted /* IN */) < 0)
+        if (H5S_mpio_space_type(mem_space, type_info->src_type_size, &mpi_buf_type, &mpi_buf_count,
+                                &mbt_is_derived, /* OUT: datatype created */
+                                FALSE,           /* this is a memory space, so if
+                                                    the file space is not
+                                                    permuted, there is no need to
+                                                    permute the datatype if the
+                                                    point selections are out of
+                                                    order*/
+                                &permute_map     /* IN: the permutation map
+                                                    generated by the
+                                                    file_space selection
+                                                    and applied to the
+                                                    memory selection */
+                                ,
+                                &is_permuted /* IN */) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI buffer type")
         /* Sanity check */
-        if(is_permuted)
+        if (is_permuted)
             HDassert(!permute_map);
     } /* end if */
     else {
@@ -1388,30 +1391,30 @@ H5D__inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
     } /* end else */
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before final collective IO \n");
+    if (H5DEBUG(D))
+        HDfprintf(H5DEBUG(D), "before final collective IO \n");
 #endif
 
     /* Perform final collective I/O operation */
-    if(H5D__final_collective_io(io_info, type_info, (hsize_t)mpi_buf_count, &mpi_file_type, &mpi_buf_type) < 0)
+    if (H5D__final_collective_io(io_info, type_info, (hsize_t)mpi_buf_count, &mpi_file_type, &mpi_buf_type) <
+        0)
         HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish collective MPI-IO")
 
 done:
     /* Free the MPI buf and file types, if they were derived */
-    if(mbt_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&mpi_buf_type)))
+    if (mbt_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&mpi_buf_type)))
         HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-    if(mft_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&mpi_file_type)))
+    if (mft_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&mpi_file_type)))
         HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before leaving inter_collective_io ret_value = %d\n",ret_value);
+    if (H5DEBUG(D))
+        HDfprintf(H5DEBUG(D), "before leaving inter_collective_io ret_value = %d\n", ret_value);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__inter_collective_io() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__final_collective_io
  *
@@ -1425,35 +1428,34 @@ if(H5DEBUG(D))
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t mpi_buf_count, MPI_Datatype *mpi_file_type, MPI_Datatype *mpi_buf_type)
+H5D__final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t mpi_buf_count,
+                         MPI_Datatype *mpi_file_type, MPI_Datatype *mpi_buf_type)
 {
-    herr_t      ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
     /* Pass buf type, file type to the file driver.  */
-    if(H5FD_mpi_setup_collective(io_info->dxpl_id, mpi_buf_type, mpi_file_type) < 0)
+    if (H5FD_mpi_setup_collective(io_info->dxpl_id, mpi_buf_type, mpi_file_type) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O properties")
 
-    if(io_info->op_type == H5D_IO_OP_WRITE) {
-        if((io_info->io_ops.single_write)(io_info, type_info, mpi_buf_count, NULL, NULL) < 0)
+    if (io_info->op_type == H5D_IO_OP_WRITE) {
+        if ((io_info->io_ops.single_write)(io_info, type_info, mpi_buf_count, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "optimized write failed")
     } /* end if */
     else {
-        if((io_info->io_ops.single_read)(io_info, type_info, mpi_buf_count, NULL, NULL) < 0)
+        if ((io_info->io_ops.single_read)(io_info, type_info, mpi_buf_count, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "optimized read failed")
     } /* end else */
 
 done:
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"ret_value before leaving final_collective_io=%d\n",ret_value);
+    if (H5DEBUG(D))
+        HDfprintf(H5DEBUG(D), "ret_value before leaving final_collective_io=%d\n", ret_value);
 #endif
-      FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__final_collective_io */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__cmp_chunk_addr
  *
@@ -1471,17 +1473,16 @@ if(H5DEBUG(D))
 static int
 H5D__cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2)
 {
-   haddr_t addr1, addr2;
+    haddr_t addr1, addr2;
 
-   FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
-   addr1 = ((const H5D_chunk_addr_info_t *)chunk_addr_info1)->chunk_addr;
-   addr2 = ((const H5D_chunk_addr_info_t *)chunk_addr_info2)->chunk_addr;
+    addr1 = ((const H5D_chunk_addr_info_t *)chunk_addr_info1)->chunk_addr;
+    addr2 = ((const H5D_chunk_addr_info_t *)chunk_addr_info2)->chunk_addr;
 
-   FUNC_LEAVE_NOAPI(H5F_addr_cmp(addr1, addr2))
+    FUNC_LEAVE_NOAPI(H5F_addr_cmp(addr1, addr2))
 } /* end H5D__cmp_chunk_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__sort_chunk
  *
@@ -1496,8 +1497,8 @@ H5D__cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2)
  * Parameters:
  *              Input: H5D_io_info_t* io_info,
  *                      H5D_chunk_map_t *fm(global chunk map struct)
- *              Input/Output:  H5D_chunk_addr_info_t chunk_addr_info_array[]   : array to store chunk address and information
- *                     many_chunk_opt                         : flag to optimize the way to obtain chunk addresses
+ *              Input/Output:  H5D_chunk_addr_info_t chunk_addr_info_array[]   : array to store chunk address
+ *and information many_chunk_opt                         : flag to optimize the way to obtain chunk addresses
  *                                                              for many chunks
  *
  * Return:      Non-negative on success/Negative on failure
@@ -1509,24 +1510,24 @@ H5D__cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2)
  */
 static herr_t
 H5D__sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
-    H5D_chunk_addr_info_t chunk_addr_info_array[], int sum_chunk)
+                H5D_chunk_addr_info_t chunk_addr_info_array[], int sum_chunk)
 {
-    H5SL_node_t    *chunk_node;         /* Current node in chunk skip list */
-    H5D_chunk_info_t *chunk_info;         /* Current chunking info. of this node. */
-    haddr_t         chunk_addr;         /* Current chunking address of this node */
-    haddr_t        *total_chunk_addr_array = NULL; /* The array of chunk address for the total number of chunk */
-    hbool_t         do_sort = FALSE;    /* Whether the addresses need to be sorted */
-    int             bsearch_coll_chunk_threshold;
-    int             many_chunk_opt = H5D_OBTAIN_ONE_CHUNK_ADDR_IND;
-    int             mpi_size;                   /* Number of MPI processes */
-    int             mpi_code;                   /* MPI return code */
-    int             i;                          /* Local index variable */
-    herr_t          ret_value = SUCCEED;        /* Return value */
+    H5SL_node_t *     chunk_node;            /* Current node in chunk skip list */
+    H5D_chunk_info_t *chunk_info;            /* Current chunking info. of this node. */
+    haddr_t           chunk_addr;            /* Current chunking address of this node */
+    haddr_t *total_chunk_addr_array = NULL;  /* The array of chunk address for the total number of chunk */
+    hbool_t  do_sort                = FALSE; /* Whether the addresses need to be sorted */
+    int      bsearch_coll_chunk_threshold;
+    int      many_chunk_opt = H5D_OBTAIN_ONE_CHUNK_ADDR_IND;
+    int      mpi_size;            /* Number of MPI processes */
+    int      mpi_code;            /* MPI return code */
+    int      i;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Retrieve # of MPI processes */
-    if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
+    if ((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
         HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
 
     /* Calculate the actual threshold to obtain all chunk addresses collectively
@@ -1538,57 +1539,60 @@ H5D__sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
      *   for each process.
      */
     bsearch_coll_chunk_threshold = (sum_chunk * 100) / ((int)fm->layout->u.chunk.nchunks * mpi_size);
-    if((bsearch_coll_chunk_threshold > H5D_ALL_CHUNK_ADDR_THRES_COL)
-            && ((sum_chunk / mpi_size) >= H5D_ALL_CHUNK_ADDR_THRES_COL_NUM))
+    if ((bsearch_coll_chunk_threshold > H5D_ALL_CHUNK_ADDR_THRES_COL) &&
+        ((sum_chunk / mpi_size) >= H5D_ALL_CHUNK_ADDR_THRES_COL_NUM))
         many_chunk_opt = H5D_OBTAIN_ALL_CHUNK_ADDR_COL;
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D), "many_chunk_opt= %d\n", many_chunk_opt);
+    if (H5DEBUG(D))
+        HDfprintf(H5DEBUG(D), "many_chunk_opt= %d\n", many_chunk_opt);
 #endif
 
     /* If we need to optimize the way to obtain the chunk address */
-    if(many_chunk_opt != H5D_OBTAIN_ONE_CHUNK_ADDR_IND) {
+    if (many_chunk_opt != H5D_OBTAIN_ONE_CHUNK_ADDR_IND) {
         int mpi_rank;
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D), "Coming inside H5D_OBTAIN_ALL_CHUNK_ADDR_COL\n");
+        if (H5DEBUG(D))
+            HDfprintf(H5DEBUG(D), "Coming inside H5D_OBTAIN_ALL_CHUNK_ADDR_COL\n");
 #endif
         /* Allocate array for chunk addresses */
-        if(NULL == (total_chunk_addr_array = H5MM_malloc(sizeof(haddr_t) * (size_t)fm->layout->u.chunk.nchunks)))
+        if (NULL ==
+            (total_chunk_addr_array = H5MM_malloc(sizeof(haddr_t) * (size_t)fm->layout->u.chunk.nchunks)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory chunk address array")
 
         /* Retrieve all the chunk addresses with process 0 */
-        if((mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file)) < 0)
+        if ((mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file)) < 0)
             HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi rank")
 
-        if(mpi_rank == 0) {
-            if(H5D__chunk_addrmap(io_info, total_chunk_addr_array) < 0)
+        if (mpi_rank == 0) {
+            if (H5D__chunk_addrmap(io_info, total_chunk_addr_array) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address")
         } /* end if */
 
         /* Broadcasting the MPI_IO option info. and chunk address info. */
-        if(MPI_SUCCESS != (mpi_code = MPI_Bcast(total_chunk_addr_array, (int)(sizeof(haddr_t) * fm->layout->u.chunk.nchunks), MPI_BYTE, (int)0, io_info->comm)))
-           HMPI_GOTO_ERROR(FAIL, "MPI_BCast failed", mpi_code)
+        if (MPI_SUCCESS != (mpi_code = MPI_Bcast(total_chunk_addr_array,
+                                                 (int)(sizeof(haddr_t) * fm->layout->u.chunk.nchunks),
+                                                 MPI_BYTE, (int)0, io_info->comm)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_BCast failed", mpi_code)
     } /* end if */
 
     /* Start at first node in chunk skip list */
     i = 0;
-    if(NULL == (chunk_node = H5SL_first(fm->sel_chunks)))
-        HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk node from skipped list")
+    if (NULL == (chunk_node = H5SL_first(fm->sel_chunks)))
+        HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk node from skipped list")
 
     /* Iterate over all chunks for this process */
-    while(chunk_node) {
-        if(NULL == (chunk_info = H5SL_item(chunk_node)))
-            HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list")
+    while (chunk_node) {
+        if (NULL == (chunk_info = H5SL_item(chunk_node)))
+            HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list")
 
-        if(many_chunk_opt == H5D_OBTAIN_ONE_CHUNK_ADDR_IND) {
-            H5D_chunk_ud_t udata;   /* User data for querying chunk info */
+        if (many_chunk_opt == H5D_OBTAIN_ONE_CHUNK_ADDR_IND) {
+            H5D_chunk_ud_t udata; /* User data for querying chunk info */
 
             /* Get address of chunk */
-            if(H5D__chunk_lookup(io_info->dset, io_info->dxpl_id,
-                    chunk_info->coords, chunk_info->index, &udata) < 0)
+            if (H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords, chunk_info->index,
+                                  &udata) < 0)
                 HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list")
             chunk_addr = udata.addr;
         } /* end if */
@@ -1596,7 +1600,7 @@ if(H5DEBUG(D))
             chunk_addr = total_chunk_addr_array[chunk_info->index];
 
         /* Check if chunk addresses are not in increasing order in the file */
-        if(i > 0 && chunk_addr < chunk_addr_info_array[i - 1].chunk_addr)
+        if (i > 0 && chunk_addr < chunk_addr_info_array[i - 1].chunk_addr)
             do_sort = TRUE;
 
         /* Set the address & info for this chunk */
@@ -1609,23 +1613,22 @@ if(H5DEBUG(D))
     } /* end while */
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D), "before Qsort\n");
+    if (H5DEBUG(D))
+        HDfprintf(H5DEBUG(D), "before Qsort\n");
 #endif
-    if(do_sort) {
+    if (do_sort) {
         size_t num_chunks = H5SL_count(fm->sel_chunks);
 
         HDqsort(chunk_addr_info_array, num_chunks, sizeof(chunk_addr_info_array[0]), H5D__cmp_chunk_addr);
     } /* end if */
 
 done:
-    if(total_chunk_addr_array)
+    if (total_chunk_addr_array)
         H5MM_xfree(total_chunk_addr_array);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__sort_chunk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__obtain_mpio_mode
  *
@@ -1646,7 +1649,8 @@ done:
  *                 c) Build MPI derived datatype to combine "chunk address" and "assign_io" information
  *                      in order to do MPI Bcast only once
  *                 d) MPI Bcast the IO mode and chunk address information for each chunk.
- *              4) Each process then retrieves IO mode and chunk address information to assign_io_mode and chunk_addr.
+ *              4) Each process then retrieves IO mode and chunk address information to assign_io_mode and
+ *chunk_addr.
  *
  * Parameters:
  *
@@ -1663,109 +1667,109 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
-    H5P_genplist_t *dx_plist, uint8_t assign_io_mode[], haddr_t chunk_addr[])
+H5D__obtain_mpio_mode(H5D_io_info_t *io_info, H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist,
+                      uint8_t assign_io_mode[], haddr_t chunk_addr[])
 {
     int               total_chunks;
     unsigned          percent_nproc_per_chunk, threshold_nproc_per_chunk;
-    uint8_t*          io_mode_info = NULL;
-    uint8_t*          recv_io_mode_info = NULL;
-    uint8_t*          mergebuf = NULL;
-    uint8_t*          tempbuf;
-    H5SL_node_t*      chunk_node;
-    H5D_chunk_info_t* chunk_info;
+    uint8_t *         io_mode_info      = NULL;
+    uint8_t *         recv_io_mode_info = NULL;
+    uint8_t *         mergebuf          = NULL;
+    uint8_t *         tempbuf;
+    H5SL_node_t *     chunk_node;
+    H5D_chunk_info_t *chunk_info;
     int               mpi_size, mpi_rank;
     MPI_Comm          comm;
     int               ic, root;
     int               mpi_code;
-    hbool_t           mem_cleanup      = FALSE;
+    hbool_t           mem_cleanup = FALSE;
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-    int new_value;
+    int    new_value;
     htri_t check_prop;
 #endif
-    herr_t            ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
     /* Assign the rank 0 to the root */
-    root              = 0;
-    comm              = io_info->comm;
+    root = 0;
+    comm = io_info->comm;
 
     /* Obtain the number of process and the current rank of the process */
-    if((mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file)) < 0)
+    if ((mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file)) < 0)
         HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi rank")
-    if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
+    if ((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
         HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
 
     /* Setup parameters */
     H5_CHECKED_ASSIGN(total_chunks, int, fm->layout->u.chunk.nchunks, hsize_t);
     percent_nproc_per_chunk = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME);
     /* if ratio is 0, perform collective io */
-    if(0 == percent_nproc_per_chunk) {
-        if(H5D__chunk_addrmap(io_info, chunk_addr) < 0)
-           HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");
-        for(ic = 0; ic < total_chunks; ic++)
-           assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
+    if (0 == percent_nproc_per_chunk) {
+        if (H5D__chunk_addrmap(io_info, chunk_addr) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");
+        for (ic = 0; ic < total_chunks; ic++)
+            assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
 
         HGOTO_DONE(SUCCEED)
     } /* end if */
-    threshold_nproc_per_chunk = mpi_size * percent_nproc_per_chunk/100;
+    threshold_nproc_per_chunk = mpi_size * percent_nproc_per_chunk / 100;
 
     /* Allocate memory */
-    io_mode_info      = (uint8_t *)H5MM_calloc(total_chunks);
-    mergebuf          = H5MM_malloc((sizeof(haddr_t) + 1) * total_chunks);
-    tempbuf           = mergebuf + total_chunks;
-    if(mpi_rank == root)
+    io_mode_info = (uint8_t *)H5MM_calloc(total_chunks);
+    mergebuf     = H5MM_malloc((sizeof(haddr_t) + 1) * total_chunks);
+    tempbuf      = mergebuf + total_chunks;
+    if (mpi_rank == root)
         recv_io_mode_info = (uint8_t *)H5MM_malloc(total_chunks * mpi_size);
-    mem_cleanup       = TRUE;
+    mem_cleanup = TRUE;
 
     /* Obtain the regularity and selection information for all chunks in this process. */
-    chunk_node        = H5SL_first(fm->sel_chunks);
-    while(chunk_node) {
-        chunk_info    = H5SL_item(chunk_node);
+    chunk_node = H5SL_first(fm->sel_chunks);
+    while (chunk_node) {
+        chunk_info = H5SL_item(chunk_node);
 
-            io_mode_info[chunk_info->index] = H5D_CHUNK_SELECT_REG; /* this chunk is selected and is "regular" */
-        chunk_node = H5SL_next(chunk_node);
+        io_mode_info[chunk_info->index] = H5D_CHUNK_SELECT_REG; /* this chunk is selected and is "regular" */
+        chunk_node                      = H5SL_next(chunk_node);
     } /* end while */
 
     /* Gather all the information */
-    if(MPI_SUCCESS != (mpi_code = MPI_Gather(io_mode_info, total_chunks, MPI_BYTE, recv_io_mode_info, total_chunks, MPI_BYTE, root, comm)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Gather(io_mode_info, total_chunks, MPI_BYTE, recv_io_mode_info,
+                                              total_chunks, MPI_BYTE, root, comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Gather failed", mpi_code)
 
     /* Calculate the mode for IO(collective, independent or none) at root process */
-    if(mpi_rank == root) {
-        int               nproc;
-        int*              nproc_per_chunk;
+    if (mpi_rank == root) {
+        int  nproc;
+        int *nproc_per_chunk;
 
         /* pre-computing: calculate number of processes and
             regularity of the selection occupied in each chunk */
-        nproc_per_chunk = (int*)H5MM_calloc(total_chunks * sizeof(int));
+        nproc_per_chunk = (int *)H5MM_calloc(total_chunks * sizeof(int));
 
         /* calculating the chunk address */
-        if(H5D__chunk_addrmap(io_info, chunk_addr) < 0) {
+        if (H5D__chunk_addrmap(io_info, chunk_addr) < 0) {
             HDfree(nproc_per_chunk);
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address")
         } /* end if */
 
         /* checking for number of process per chunk and regularity of the selection*/
-        for(nproc = 0; nproc < mpi_size; nproc++) {
+        for (nproc = 0; nproc < mpi_size; nproc++) {
             uint8_t *tmp_recv_io_mode_info = recv_io_mode_info + (nproc * total_chunks);
 
             /* Calculate the number of process per chunk and adding irregular selection option */
-            for(ic = 0; ic < total_chunks; ic++, tmp_recv_io_mode_info++) {
-                if(*tmp_recv_io_mode_info != 0) {
+            for (ic = 0; ic < total_chunks; ic++, tmp_recv_io_mode_info++) {
+                if (*tmp_recv_io_mode_info != 0) {
                     nproc_per_chunk[ic]++;
                 } /* end if */
-            } /* end for */
-        } /* end for */
+            }     /* end for */
+        }         /* end for */
 
         /* Calculating MPIO mode for each chunk (collective, independent, none) */
-        for(ic = 0; ic < total_chunks; ic++) {
-            if(nproc_per_chunk[ic] > MAX(1, threshold_nproc_per_chunk)) {
+        for (ic = 0; ic < total_chunks; ic++) {
+            if (nproc_per_chunk[ic] > MAX(1, threshold_nproc_per_chunk)) {
                 assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
             } /* end if */
-        } /* end for */
-
+        }     /* end for */
 
         /* merge buffer io_mode info and chunk addr into one */
         HDmemcpy(mergebuf, assign_io_mode, total_chunks);
@@ -1775,60 +1779,60 @@ H5D__obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
     } /* end if */
 
     /* Broadcasting the MPI_IO option info. and chunk address info. */
-    if(MPI_SUCCESS != (mpi_code = MPI_Bcast(mergebuf, ((sizeof(haddr_t) + 1) * total_chunks), MPI_BYTE, root, comm)))
+    if (MPI_SUCCESS !=
+        (mpi_code = MPI_Bcast(mergebuf, ((sizeof(haddr_t) + 1) * total_chunks), MPI_BYTE, root, comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_BCast failed", mpi_code)
 
     HDmemcpy(assign_io_mode, mergebuf, total_chunks);
     HDmemcpy(chunk_addr, tempbuf, sizeof(haddr_t) * total_chunks);
 
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-{
-    H5P_genplist_t    *plist;           /* Property list pointer */
+    {
+        H5P_genplist_t *plist; /* Property list pointer */
+
+        /* Get the dataset transfer property list */
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
+            HGOTO_ERROR(H5E_IO, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
+
+        check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME);
+        if (check_prop > 0) {
+            for (ic = 0; ic < total_chunks; ic++) {
+                if (assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
+                    new_value = 0;
+                    if (H5P_set(plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME, &new_value) < 0)
+                        HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value")
+                    break;
+                } /* end if */
+            }     /* end for */
+        }         /* end if */
 
-    /* Get the dataset transfer property list */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
-        HGOTO_ERROR(H5E_IO, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
+        check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME);
+        if (check_prop > 0) {
+            int temp_count = 0;
 
-    check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME);
-    if(check_prop > 0) {
-        for(ic = 0; ic < total_chunks; ic++) {
-            if(assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
+            for (ic = 0; ic < total_chunks; ic++) {
+                if (assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
+                    temp_count++;
+                    break;
+                } /* end if */
+            }     /* end for */
+            if (temp_count == 0) {
                 new_value = 0;
-                if(H5P_set(plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME, &new_value) < 0)
+                if (H5P_set(plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME, &new_value) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value")
-                break;
             } /* end if */
-        } /* end for */
-    } /* end if */
-
-    check_prop = H5P_exist_plist(plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME);
-    if(check_prop > 0) {
-        int temp_count = 0;
-
-        for(ic = 0; ic < total_chunks; ic++) {
-            if(assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
-                temp_count++;
-                break;
-            } /* end if */
-        } /* end for */
-        if(temp_count == 0) {
-            new_value = 0;
-            if(H5P_set(plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-}
+        }     /* end if */
+    }
 #endif
 
 done:
-    if(mem_cleanup) {
+    if (mem_cleanup) {
         HDfree(io_mode_info);
         HDfree(mergebuf);
-        if(mpi_rank == root)
+        if (mpi_rank == root)
             HDfree(recv_io_mode_info);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__obtain_mpio_mode() */
-#endif  /* H5_HAVE_PARALLEL */
-
+#endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5Doh.c b/src/H5Doh.c
index c9da16b..87cffd7 100644
--- a/src/H5Doh.c
+++ b/src/H5Doh.c
@@ -15,79 +15,68 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Opkg.h"             /* Object headers			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static void *H5O__dset_get_copy_file_udata(void);
-static void H5O__dset_free_copy_file_udata(void *);
-static htri_t H5O__dset_isa(H5O_t *loc);
-static hid_t H5O__dset_open(const H5G_loc_t *obj_loc, hid_t lapl_id,
-    hid_t dxpl_id, hbool_t app_ref);
-static void *H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc,
-    hid_t dxpl_id);
+static void *     H5O__dset_get_copy_file_udata(void);
+static void       H5O__dset_free_copy_file_udata(void *);
+static htri_t     H5O__dset_isa(H5O_t *loc);
+static hid_t      H5O__dset_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref);
+static void *     H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id);
 static H5O_loc_t *H5O__dset_get_oloc(hid_t obj_id);
-static herr_t H5O__dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    H5_ih_info_t *bh_info);
-static herr_t H5O__dset_flush(H5G_loc_t *obj_loc, hid_t dxpl_id);
-
+static herr_t     H5O__dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info);
+static herr_t     H5O__dset_flush(H5G_loc_t *obj_loc, hid_t dxpl_id);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* This message derives from H5O object class */
 const H5O_obj_class_t H5O_OBJ_DATASET[1] = {{
-    H5O_TYPE_DATASET,		/* object type			*/
-    "dataset",			/* object name, for debugging	*/
-    H5O__dset_get_copy_file_udata, /* get 'copy file' user data	*/
+    H5O_TYPE_DATASET,               /* object type			*/
+    "dataset",                      /* object name, for debugging	*/
+    H5O__dset_get_copy_file_udata,  /* get 'copy file' user data	*/
     H5O__dset_free_copy_file_udata, /* free 'copy file' user data	*/
-    H5O__dset_isa, 		/* "isa" message		*/
-    H5O__dset_open, 		/* open an object of this class */
-    H5O__dset_create, 		/* create an object of this class */
-    H5O__dset_get_oloc, 	/* get an object header location for an object */
-    H5O__dset_bh_info, 		/* get the index & heap info for an object */
-    H5O__dset_flush 		/* flush an opened object of this class */
+    H5O__dset_isa,                  /* "isa" message		*/
+    H5O__dset_open,                 /* open an object of this class */
+    H5O__dset_create,               /* create an object of this class */
+    H5O__dset_get_oloc,             /* get an object header location for an object */
+    H5O__dset_bh_info,              /* get the index & heap info for an object */
+    H5O__dset_flush                 /* flush an opened object of this class */
 }};
 
 /* Declare a free list to manage the H5D_copy_file_ud_t struct */
 H5FL_DEFINE(H5D_copy_file_ud_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O__dset_get_copy_file_udata
  *
@@ -106,19 +95,18 @@ H5FL_DEFINE(H5D_copy_file_ud_t);
 static void *
 H5O__dset_get_copy_file_udata(void)
 {
-    void *ret_value;       /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Allocate space for the 'copy file' user data for copying datasets */
-    if(NULL == (ret_value = H5FL_CALLOC(H5D_copy_file_ud_t)))
+    if (NULL == (ret_value = H5FL_CALLOC(H5D_copy_file_ud_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__dset_get_copy_file_udata() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O__dset_free_copy_file_udata
  *
@@ -143,15 +131,15 @@ H5O__dset_free_copy_file_udata(void *_udata)
     HDassert(udata);
 
     /* Release copy of dataset's dataspace extent, if it was set */
-    if(udata->src_space_extent)
+    if (udata->src_space_extent)
         H5O_msg_free(H5O_SDSPACE_ID, udata->src_space_extent);
 
     /* Release copy of dataset's datatype, if it was set */
-    if(udata->src_dtype)
+    if (udata->src_dtype)
         H5T_close(udata->src_dtype);
 
     /* Release copy of dataset's filter pipeline, if it was set */
-    if(udata->common.src_pline)
+    if (udata->common.src_pline)
         H5O_msg_free(H5O_PLINE_ID, udata->common.src_pline);
 
     /* Release space for 'copy file' user data */
@@ -160,7 +148,6 @@ H5O__dset_free_copy_file_udata(void *_udata)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5O__dset_free_copy_file_udata() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O__dset_isa
  *
@@ -181,30 +168,29 @@ H5O__dset_free_copy_file_udata(void *_udata)
 static htri_t
 H5O__dset_isa(H5O_t *oh)
 {
-    htri_t	exists;                 /* Flag if header message of interest exists */
-    htri_t	ret_value = TRUE;       /* Return value */
+    htri_t exists;           /* Flag if header message of interest exists */
+    htri_t ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(oh);
 
     /* Datatype */
-    if((exists = H5O_msg_exists_oh(oh, H5O_DTYPE_ID)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header")
-    else if(!exists)
-	HGOTO_DONE(FALSE)
+    if ((exists = H5O_msg_exists_oh(oh, H5O_DTYPE_ID)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header")
+    else if (!exists)
+        HGOTO_DONE(FALSE)
 
     /* Layout */
-    if((exists = H5O_msg_exists_oh(oh, H5O_SDSPACE_ID)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header")
-    else if(!exists)
-	HGOTO_DONE(FALSE)
+    if ((exists = H5O_msg_exists_oh(oh, H5O_SDSPACE_ID)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header")
+    else if (!exists)
+        HGOTO_DONE(FALSE)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__dset_isa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O__dset_open
  *
@@ -221,44 +207,42 @@ done:
 static hid_t
 H5O__dset_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref)
 {
-    H5D_t       *dset = NULL;           /* Dataset opened */
-    htri_t  isdapl;                 /* lapl_id is a dapl */
-    hid_t   dapl_id;                /* dapl to use to open this dataset */
-    hid_t	ret_value;              /* Return value */
+    H5D_t *dset = NULL; /* Dataset opened */
+    htri_t isdapl;      /* lapl_id is a dapl */
+    hid_t  dapl_id;     /* dapl to use to open this dataset */
+    hid_t  ret_value;   /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(obj_loc);
 
     /* If the lapl passed in is a dapl, use it.  Otherwise, use the default dapl */
-    if(lapl_id == H5P_DEFAULT)
+    if (lapl_id == H5P_DEFAULT)
         isdapl = FALSE;
-    else
-        if((isdapl = H5P_isa_class(lapl_id, H5P_DATASET_ACCESS)) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOMPARE, FAIL, "unable to compare property list classes")
+    else if ((isdapl = H5P_isa_class(lapl_id, H5P_DATASET_ACCESS)) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCOMPARE, FAIL, "unable to compare property list classes")
 
-    if(isdapl)
+    if (isdapl)
         dapl_id = lapl_id;
     else
         dapl_id = H5P_DATASET_ACCESS_DEFAULT;
 
     /* Open the dataset */
-    if(NULL == (dset = H5D_open(obj_loc, dapl_id, dxpl_id)))
+    if (NULL == (dset = H5D_open(obj_loc, dapl_id, dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset")
 
     /* Register an ID for the dataset */
-    if((ret_value = H5I_register(H5I_DATASET, dset, app_ref)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASET, dset, app_ref)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataset")
 
 done:
-    if(ret_value < 0)
-        if(dset && H5D_close(dset) < 0)
+    if (ret_value < 0)
+        if (dset && H5D_close(dset) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__dset_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O__dset_create
  *
@@ -276,8 +260,8 @@ static void *
 H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
 {
     H5D_obj_create_t *crt_info = (H5D_obj_create_t *)_crt_info; /* Dataset creation parameters */
-    H5D_t *dset = NULL;         /* New dataset created */
-    void *ret_value;            /* Return value */
+    H5D_t *           dset     = NULL;                          /* New dataset created */
+    void *            ret_value;                                /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -287,27 +271,27 @@ H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
     HDassert(obj_loc);
 
     /* Create the the dataset */
-    if(NULL == (dset = H5D__create(f, crt_info->type_id, crt_info->space, crt_info->dcpl_id, crt_info->dapl_id, dxpl_id)))
+    if (NULL == (dset = H5D__create(f, crt_info->type_id, crt_info->space, crt_info->dcpl_id,
+                                    crt_info->dapl_id, dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to create dataset")
 
     /* Set up the new dataset's location */
-    if(NULL == (obj_loc->oloc = H5D_oloc(dset)))
+    if (NULL == (obj_loc->oloc = H5D_oloc(dset)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get object location of dataset")
-    if(NULL == (obj_loc->path = H5D_nameof(dset)))
+    if (NULL == (obj_loc->path = H5D_nameof(dset)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get path of dataset")
 
     /* Set the return value */
     ret_value = dset;
 
 done:
-    if(ret_value == NULL)
-        if(dset && H5D_close(dset) < 0)
+    if (ret_value == NULL)
+        if (dset && H5D_close(dset) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release dataset")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__dset_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O__dset_get_oloc
  *
@@ -324,24 +308,23 @@ done:
 static H5O_loc_t *
 H5O__dset_get_oloc(hid_t obj_id)
 {
-    H5D_t       *dset;                  /* Dataset opened */
-    H5O_loc_t	*ret_value;             /* Return value */
+    H5D_t *    dset;      /* Dataset opened */
+    H5O_loc_t *ret_value; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Get the dataset */
-    if(NULL == (dset = (H5D_t *)H5I_object(obj_id)))
+    if (NULL == (dset = (H5D_t *)H5I_object(obj_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_BADATOM, NULL, "couldn't get object from ID")
 
     /* Get the dataset's object header location */
-    if(NULL == (ret_value = H5D_oloc(dset)))
+    if (NULL == (ret_value = H5D_oloc(dset)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__dset_get_oloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__dset_bh_info
  *
@@ -356,21 +339,21 @@ done:
  *
  * Modification:Raymond Lu
  *              5 February, 2010
- *              I added the call to H5O_msg_reset after H5D_chunk_bh_info 
- *              to free the PLINE. 
+ *              I added the call to H5O_msg_reset after H5D_chunk_bh_info
+ *              to free the PLINE.
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5O__dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
 {
-    H5O_layout_t        layout;         	/* Data storage layout message */
-    H5O_pline_t         pline;                  /* I/O pipeline message */
-    H5O_efl_t           efl;			/* External File List message */
-    hbool_t             layout_read = FALSE;    /* Whether the layout message was read */
-    hbool_t             pline_read = FALSE;     /* Whether the I/O pipeline message was read */
-    hbool_t             efl_read = FALSE;       /* Whether the external file list message was read */
-    htri_t		exists;                 /* Flag if header message of interest exists */
-    herr_t      	ret_value = SUCCEED;    /* Return value */
+    H5O_layout_t layout;              /* Data storage layout message */
+    H5O_pline_t  pline;               /* I/O pipeline message */
+    H5O_efl_t    efl;                 /* External File List message */
+    hbool_t      layout_read = FALSE; /* Whether the layout message was read */
+    hbool_t      pline_read  = FALSE; /* Whether the I/O pipeline message was read */
+    hbool_t      efl_read    = FALSE; /* Whether the external file list message was read */
+    htri_t       exists;              /* Flag if header message of interest exists */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -380,58 +363,57 @@ H5O__dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
     HDassert(bh_info);
 
     /* Get the layout message from the object header */
-    if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_LAYOUT_ID, &layout))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find layout message")
+    if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_LAYOUT_ID, &layout))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find layout message")
     layout_read = TRUE;
 
     /* Check for chunked dataset storage */
-    if(layout.type == H5D_CHUNKED && H5D__chunk_is_space_alloc(&layout.storage)) {
+    if (layout.type == H5D_CHUNKED && H5D__chunk_is_space_alloc(&layout.storage)) {
         /* Check for I/O pipeline message */
-        if((exists = H5O_msg_exists_oh(oh, H5O_PLINE_ID)) < 0)
+        if ((exists = H5O_msg_exists_oh(oh, H5O_PLINE_ID)) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header")
-        else if(exists) {
-            if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_PLINE_ID, &pline))
+        else if (exists) {
+            if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_PLINE_ID, &pline))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find I/O pipeline message")
             pline_read = TRUE;
         } /* end else if */
         else
             HDmemset(&pline, 0, sizeof(pline));
 
-        if(H5D__chunk_bh_info(f, dxpl_id, &layout, &pline, &(bh_info->index_size)) < 0)
+        if (H5D__chunk_bh_info(f, dxpl_id, &layout, &pline, &(bh_info->index_size)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't determine chunked dataset btree info")
     } /* end if */
 
     /* Check for External File List message in the object header */
-    if((exists = H5O_msg_exists_oh(oh, H5O_EFL_ID)) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "unable to check for EFL message")
+    if ((exists = H5O_msg_exists_oh(oh, H5O_EFL_ID)) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "unable to check for EFL message")
 
-    if(exists && H5D__efl_is_space_alloc(&layout.storage)) {
+    if (exists && H5D__efl_is_space_alloc(&layout.storage)) {
         /* Start with clean EFL info */
         HDmemset(&efl, 0, sizeof(efl));
 
-	/* Get External File List message from the object header */
-	if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_EFL_ID, &efl))
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find EFL message")
+        /* Get External File List message from the object header */
+        if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_EFL_ID, &efl))
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find EFL message")
         efl_read = TRUE;
 
-	/* Get size of local heap for EFL message's file list */
-	if(H5D__efl_bh_info(f, dxpl_id, &efl, &(bh_info->heap_size)) < 0)
+        /* Get size of local heap for EFL message's file list */
+        if (H5D__efl_bh_info(f, dxpl_id, &efl, &(bh_info->heap_size)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't determine EFL heap info")
     } /* end if */
 
 done:
     /* Free messages, if they've been read in */
-    if(layout_read && H5O_msg_reset(H5O_LAYOUT_ID, &layout) < 0)
+    if (layout_read && H5O_msg_reset(H5O_LAYOUT_ID, &layout) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset data storage layout message")
-    if(pline_read && H5O_msg_reset(H5O_PLINE_ID, &pline) < 0)
+    if (pline_read && H5O_msg_reset(H5O_PLINE_ID, &pline) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset I/O pipeline message")
-    if(efl_read && H5O_msg_reset(H5O_EFL_ID, &efl) < 0)
+    if (efl_read && H5O_msg_reset(H5O_EFL_ID, &efl) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset external file list message")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__dset_bh_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__dset_flush
  *
@@ -448,9 +430,9 @@ done:
 static herr_t
 H5O__dset_flush(H5G_loc_t *obj_loc, hid_t dxpl_id)
 {
-    H5D_t       *dset = NULL;          /* Dataset opened */
-    H5O_type_t 	obj_type;              /* Type of object at location */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5D_t *    dset = NULL;         /* Dataset opened */
+    H5O_type_t obj_type;            /* Type of object at location */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -458,22 +440,21 @@ H5O__dset_flush(H5G_loc_t *obj_loc, hid_t dxpl_id)
     HDassert(obj_loc->oloc);
 
     /* Check that the object found is the correct type */
-    if(H5O_obj_type(obj_loc->oloc, &obj_type, dxpl_id) < 0)
+    if (H5O_obj_type(obj_loc->oloc, &obj_type, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object type")
 
-    if(obj_type != H5O_TYPE_DATASET)
+    if (obj_type != H5O_TYPE_DATASET)
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
 
     /* Open the dataset */
-    if(NULL == (dset = H5D_open(obj_loc, H5P_DATASET_ACCESS_DEFAULT, dxpl_id)))
+    if (NULL == (dset = H5D_open(obj_loc, H5P_DATASET_ACCESS_DEFAULT, dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset")
-    
-    if(H5D__flush_real(dset, dxpl_id) < 0)
-	HDONE_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to flush cached dataset info")
+
+    if (H5D__flush_real(dset, dxpl_id) < 0)
+        HDONE_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to flush cached dataset info")
 
 done:
-    if(dset && H5D_close(dset) < 0)
-	HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
+    if (dset && H5D_close(dset) < 0)
+        HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__dset_flush() */
-
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 5ac140c..a730531 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -30,10 +30,10 @@
 #include "H5Dprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Gprivate.h"		/* Groups 			  	*/
-#include "H5SLprivate.h"	/* Skip lists				*/
-#include "H5Tprivate.h"		/* Datatypes         			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Gprivate.h"  /* Groups 			  	*/
+#include "H5SLprivate.h" /* Skip lists				*/
+#include "H5Tprivate.h"  /* Datatypes         			*/
 
 /**************************/
 /* Package Private Macros */
@@ -43,27 +43,26 @@
 #define H5D_MINHDR_SIZE 256
 
 /* [Simple] Macro to construct a H5D_io_info_t from it's components */
-#define H5D_BUILD_IO_INFO_WRT(io_info, ds, dxpl_c, dxpl_i, str, buf)    \
-    (io_info)->dset = ds;                                               \
-    (io_info)->dxpl_cache = dxpl_c;                                     \
-    (io_info)->dxpl_id = dxpl_i;                                        \
-    (io_info)->store = str;                                             \
-    (io_info)->op_type = H5D_IO_OP_WRITE;                               \
-    (io_info)->u.wbuf = buf
-#define H5D_BUILD_IO_INFO_RD(io_info, ds, dxpl_c, dxpl_i, str, buf)     \
-    (io_info)->dset = ds;                                               \
-    (io_info)->dxpl_cache = dxpl_c;                                     \
-    (io_info)->dxpl_id = dxpl_i;                                        \
-    (io_info)->store = str;                                             \
-    (io_info)->op_type = H5D_IO_OP_READ;                                \
-    (io_info)->u.rbuf = buf
+#define H5D_BUILD_IO_INFO_WRT(io_info, ds, dxpl_c, dxpl_i, str, buf)                                         \
+    (io_info)->dset       = ds;                                                                              \
+    (io_info)->dxpl_cache = dxpl_c;                                                                          \
+    (io_info)->dxpl_id    = dxpl_i;                                                                          \
+    (io_info)->store      = str;                                                                             \
+    (io_info)->op_type    = H5D_IO_OP_WRITE;                                                                 \
+    (io_info)->u.wbuf     = buf
+#define H5D_BUILD_IO_INFO_RD(io_info, ds, dxpl_c, dxpl_i, str, buf)                                          \
+    (io_info)->dset       = ds;                                                                              \
+    (io_info)->dxpl_cache = dxpl_c;                                                                          \
+    (io_info)->dxpl_id    = dxpl_i;                                                                          \
+    (io_info)->store      = str;                                                                             \
+    (io_info)->op_type    = H5D_IO_OP_READ;                                                                  \
+    (io_info)->u.rbuf     = buf
 
 #define H5D_CHUNK_HASH(D, ADDR) H5F_addr_hash(ADDR, (D)->cache.chunk.nslots)
 
 /* Flags for marking aspects of a dataset dirty */
 #define H5D_MARK_SPACE  0x01
-#define H5D_MARK_LAYOUT  0x02
-
+#define H5D_MARK_LAYOUT 0x02
 
 /****************************/
 /* Package Private Typedefs */
@@ -72,25 +71,25 @@
 /* Typedef for datatype information for raw data I/O operation */
 typedef struct H5D_type_info_t {
     /* Initial values */
-    const H5T_t *mem_type;              /* Pointer to memory datatype */
-    const H5T_t *dset_type;             /* Pointer to dataset datatype */
-    H5T_path_t *tpath;                  /* Datatype conversion path */
-    hid_t src_type_id;                  /* Source datatype ID */
-    hid_t dst_type_id;                  /* Destination datatype ID */
+    const H5T_t *mem_type;    /* Pointer to memory datatype */
+    const H5T_t *dset_type;   /* Pointer to dataset datatype */
+    H5T_path_t * tpath;       /* Datatype conversion path */
+    hid_t        src_type_id; /* Source datatype ID */
+    hid_t        dst_type_id; /* Destination datatype ID */
 
     /* Computed/derived values */
-    size_t src_type_size;		/* Size of source type	*/
-    size_t dst_type_size;	        /* Size of destination type*/
-    size_t max_type_size;	        /* Size of largest source/destination type */
-    hbool_t is_conv_noop;               /* Whether the type conversion is a NOOP */
-    hbool_t is_xform_noop;              /* Whether the data transform is a NOOP */
-    const H5T_subset_info_t *cmpd_subset;   /* Info related to the compound subset conversion functions */
-    H5T_bkg_t need_bkg;		        /* Type of background buf needed */
-    size_t request_nelmts;		/* Requested strip mine	*/
-    uint8_t *tconv_buf;	                /* Datatype conv buffer	*/
-    hbool_t tconv_buf_allocated;        /* Whether the type conversion buffer was allocated */
-    uint8_t *bkg_buf;	                /* Background buffer	*/
-    hbool_t bkg_buf_allocated;          /* Whether the background buffer was allocated */
+    size_t                   src_type_size;  /* Size of source type	*/
+    size_t                   dst_type_size;  /* Size of destination type*/
+    size_t                   max_type_size;  /* Size of largest source/destination type */
+    hbool_t                  is_conv_noop;   /* Whether the type conversion is a NOOP */
+    hbool_t                  is_xform_noop;  /* Whether the data transform is a NOOP */
+    const H5T_subset_info_t *cmpd_subset;    /* Info related to the compound subset conversion functions */
+    H5T_bkg_t                need_bkg;       /* Type of background buf needed */
+    size_t                   request_nelmts; /* Requested strip mine	*/
+    uint8_t *                tconv_buf;      /* Datatype conv buffer	*/
+    hbool_t                  tconv_buf_allocated; /* Whether the type conversion buffer was allocated */
+    uint8_t *                bkg_buf;             /* Background buffer	*/
+    hbool_t                  bkg_buf_allocated;   /* Whether the background buffer was allocated */
 } H5D_type_info_t;
 
 /* Forward declaration of structs used below */
@@ -100,131 +99,136 @@ typedef struct H5D_shared_t H5D_shared_t;
 
 /* Function pointers for I/O on particular types of dataset layouts */
 typedef herr_t (*H5D_layout_construct_func_t)(H5F_t *f, H5D_t *dset);
-typedef herr_t (*H5D_layout_init_func_t)(H5F_t *f, hid_t dxpl_id, const H5D_t *dset,
-    hid_t dapl_id);
+typedef herr_t (*H5D_layout_init_func_t)(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id);
 typedef hbool_t (*H5D_layout_is_space_alloc_func_t)(const H5O_storage_t *storage);
 typedef hbool_t (*H5D_layout_is_data_cached_func_t)(const H5D_shared_t *shared_dset);
 typedef herr_t (*H5D_layout_io_init_func_t)(const struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    struct H5D_chunk_map_t *cm);
-typedef herr_t (*H5D_layout_read_func_t)(struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, struct H5D_chunk_map_t *fm);
-typedef herr_t (*H5D_layout_write_func_t)(struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, struct H5D_chunk_map_t *fm);
-typedef ssize_t (*H5D_layout_readvv_func_t)(const struct H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-typedef ssize_t (*H5D_layout_writevv_func_t)(const struct H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+                                            const H5D_type_info_t *type_info, hsize_t nelmts,
+                                            const H5S_t *file_space, const H5S_t *mem_space,
+                                            struct H5D_chunk_map_t *cm);
+typedef herr_t (*H5D_layout_read_func_t)(struct H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                         hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                         struct H5D_chunk_map_t *fm);
+typedef herr_t (*H5D_layout_write_func_t)(struct H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                          hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                          struct H5D_chunk_map_t *fm);
+typedef ssize_t (*H5D_layout_readvv_func_t)(const struct H5D_io_info_t *io_info, size_t dset_max_nseq,
+                                            size_t *dset_curr_seq, size_t dset_len_arr[],
+                                            hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                                            size_t *mem_curr_seq, size_t mem_len_arr[],
+                                            hsize_t mem_offset_arr[]);
+typedef ssize_t (*H5D_layout_writevv_func_t)(const struct H5D_io_info_t *io_info, size_t dset_max_nseq,
+                                             size_t *dset_curr_seq, size_t dset_len_arr[],
+                                             hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                                             size_t *mem_curr_seq, size_t mem_len_arr[],
+                                             hsize_t mem_offset_arr[]);
 typedef herr_t (*H5D_layout_flush_func_t)(H5D_t *dataset, hid_t dxpl_id);
 typedef herr_t (*H5D_layout_io_term_func_t)(const struct H5D_chunk_map_t *cm);
 
 /* Typedef for grouping layout I/O routines */
 typedef struct H5D_layout_ops_t {
-    H5D_layout_construct_func_t construct;      /* Layout constructor for new datasets */
-    H5D_layout_init_func_t init;        /* Layout initializer for dataset */
-    H5D_layout_is_space_alloc_func_t is_space_alloc;    /* Query routine to determine if storage is allocated */
-    H5D_layout_is_data_cached_func_t is_data_cached;    /* Query routine to determine if any raw data is cached.  If routine is not present then the layout type never caches raw data. */
-    H5D_layout_io_init_func_t io_init;  /* I/O initialization routine */
-    H5D_layout_read_func_t ser_read;    /* High-level I/O routine for reading data in serial */
-    H5D_layout_write_func_t ser_write;  /* High-level I/O routine for writing data in serial */
+    H5D_layout_construct_func_t      construct;      /* Layout constructor for new datasets */
+    H5D_layout_init_func_t           init;           /* Layout initializer for dataset */
+    H5D_layout_is_space_alloc_func_t is_space_alloc; /* Query routine to determine if storage is allocated */
+    H5D_layout_is_data_cached_func_t
+        is_data_cached; /* Query routine to determine if any raw data is cached.  If routine is not present
+                           then the layout type never caches raw data. */
+    H5D_layout_io_init_func_t io_init;   /* I/O initialization routine */
+    H5D_layout_read_func_t    ser_read;  /* High-level I/O routine for reading data in serial */
+    H5D_layout_write_func_t   ser_write; /* High-level I/O routine for writing data in serial */
 #ifdef H5_HAVE_PARALLEL
-    H5D_layout_read_func_t par_read;    /* High-level I/O routine for reading data in parallel */
-    H5D_layout_write_func_t par_write;  /* High-level I/O routine for writing data in parallel */
-#endif /* H5_HAVE_PARALLEL */
-    H5D_layout_readvv_func_t readvv;    /* Low-level I/O routine for reading data */
-    H5D_layout_writevv_func_t writevv;  /* Low-level I/O routine for writing data */
-    H5D_layout_flush_func_t flush;      /* Low-level I/O routine for flushing raw data */
-    H5D_layout_io_term_func_t io_term;  /* I/O shutdown routine */
+    H5D_layout_read_func_t  par_read;  /* High-level I/O routine for reading data in parallel */
+    H5D_layout_write_func_t par_write; /* High-level I/O routine for writing data in parallel */
+#endif                                 /* H5_HAVE_PARALLEL */
+    H5D_layout_readvv_func_t  readvv;  /* Low-level I/O routine for reading data */
+    H5D_layout_writevv_func_t writevv; /* Low-level I/O routine for writing data */
+    H5D_layout_flush_func_t   flush;   /* Low-level I/O routine for flushing raw data */
+    H5D_layout_io_term_func_t io_term; /* I/O shutdown routine */
 } H5D_layout_ops_t;
 
 /* Function pointers for either multiple or single block I/O access */
 typedef herr_t (*H5D_io_single_read_func_t)(const struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+                                            const H5D_type_info_t *type_info, hsize_t nelmts,
+                                            const H5S_t *file_space, const H5S_t *mem_space);
 typedef herr_t (*H5D_io_single_write_func_t)(const struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+                                             const H5D_type_info_t *type_info, hsize_t nelmts,
+                                             const H5S_t *file_space, const H5S_t *mem_space);
 
 /* Typedef for raw data I/O framework info */
 typedef struct H5D_io_ops_t {
-    H5D_layout_read_func_t multi_read;          /* High-level I/O routine for reading data */
-    H5D_layout_write_func_t multi_write;        /* High-level I/O routine for writing data */
-    H5D_io_single_read_func_t single_read;      /* I/O routine for reading single block */
-    H5D_io_single_write_func_t single_write;    /* I/O routine for writing single block */
+    H5D_layout_read_func_t     multi_read;   /* High-level I/O routine for reading data */
+    H5D_layout_write_func_t    multi_write;  /* High-level I/O routine for writing data */
+    H5D_io_single_read_func_t  single_read;  /* I/O routine for reading single block */
+    H5D_io_single_write_func_t single_write; /* I/O routine for writing single block */
 } H5D_io_ops_t;
 
 /* Typedefs for dataset storage information */
 typedef struct {
-    haddr_t dset_addr;      /* Address of dataset in file */
-    hsize_t dset_size;      /* Total size of dataset in file */
+    haddr_t dset_addr; /* Address of dataset in file */
+    hsize_t dset_size; /* Total size of dataset in file */
 } H5D_contig_storage_t;
 
 typedef struct {
-    hsize_t index;          /* "Index" of chunk in dataset (must be first for TBBT routines) */
-    hsize_t *offset;        /* Chunk's coordinates in elements */
+    hsize_t  index;  /* "Index" of chunk in dataset (must be first for TBBT routines) */
+    hsize_t *offset; /* Chunk's coordinates in elements */
 } H5D_chunk_storage_t;
 
 typedef struct {
-    void *buf;              /* Buffer for compact dataset */
-    hbool_t *dirty;         /* Pointer to dirty flag to mark */
+    void *   buf;   /* Buffer for compact dataset */
+    hbool_t *dirty; /* Pointer to dirty flag to mark */
 } H5D_compact_storage_t;
 
 typedef union H5D_storage_t {
-    H5D_contig_storage_t contig; /* Contiguous information for dataset */
-    H5D_chunk_storage_t chunk;  /* Chunk information for dataset */
+    H5D_contig_storage_t  contig;  /* Contiguous information for dataset */
+    H5D_chunk_storage_t   chunk;   /* Chunk information for dataset */
     H5D_compact_storage_t compact; /* Compact information for dataset */
-    H5O_efl_t   efl;            /* External file list information for dataset */
+    H5O_efl_t             efl;     /* External file list information for dataset */
 } H5D_storage_t;
 
 /* Typedef for raw data I/O operation info */
 typedef enum H5D_io_op_type_t {
-    H5D_IO_OP_READ,         /* Read operation */
-    H5D_IO_OP_WRITE         /* Write operation */
+    H5D_IO_OP_READ, /* Read operation */
+    H5D_IO_OP_WRITE /* Write operation */
 } H5D_io_op_type_t;
 
 typedef struct H5D_io_info_t {
-    const H5D_t *dset;          /* Pointer to dataset being operated on */
+    const H5D_t *dset; /* Pointer to dataset being operated on */
 #ifndef H5_HAVE_PARALLEL
     const
-#endif /* H5_HAVE_PARALLEL */
+#endif                                /* H5_HAVE_PARALLEL */
         H5D_dxpl_cache_t *dxpl_cache; /* Pointer to cached DXPL info */
-    hid_t dxpl_id;              /* Original DXPL ID */
+    hid_t                 dxpl_id;    /* Original DXPL ID */
 #ifdef H5_HAVE_PARALLEL
-    MPI_Comm comm;              /* MPI communicator for file */
-    hbool_t using_mpi_vfd;      /* Whether the file is using an MPI-based VFD */
+    MPI_Comm comm;          /* MPI communicator for file */
+    hbool_t  using_mpi_vfd; /* Whether the file is using an MPI-based VFD */
     struct {
         H5FD_mpio_xfer_t xfer_mode; /* Parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */
-        H5FD_mpio_collective_opt_t coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */
-        H5D_io_ops_t io_ops;    /* I/O operation function pointers */
+        H5FD_mpio_collective_opt_t
+                     coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */
+        H5D_io_ops_t io_ops;        /* I/O operation function pointers */
     } orig;
-#endif /* H5_HAVE_PARALLEL */
-    H5D_storage_t *store;       /* Dataset storage info */
-    H5D_layout_ops_t layout_ops;    /* Dataset layout I/O operation function pointers */
-    H5D_io_ops_t io_ops;        /* I/O operation function pointers */
+#endif                           /* H5_HAVE_PARALLEL */
+    H5D_storage_t *  store;      /* Dataset storage info */
+    H5D_layout_ops_t layout_ops; /* Dataset layout I/O operation function pointers */
+    H5D_io_ops_t     io_ops;     /* I/O operation function pointers */
     H5D_io_op_type_t op_type;
     union {
-        void *rbuf;             /* Pointer to buffer for read */
-        const void *wbuf;       /* Pointer to buffer to write */
+        void *      rbuf; /* Pointer to buffer for read */
+        const void *wbuf; /* Pointer to buffer to write */
     } u;
 } H5D_io_info_t;
 
-
 /******************/
 /* Chunk typedefs */
 /******************/
 
 /* Typedef for chunked dataset index operation info */
 typedef struct H5D_chk_idx_info_t {
-    H5F_t *f;                   /* File pointer for operation */
-    hid_t dxpl_id;              /* DXPL ID for operation */
-    const H5O_pline_t *pline;   /* I/O pipeline info */
-    H5O_layout_chunk_t *layout;           /* Chunk layout description */
-    H5O_storage_chunk_t *storage;         /* Chunk storage description */
+    H5F_t *              f;       /* File pointer for operation */
+    hid_t                dxpl_id; /* DXPL ID for operation */
+    const H5O_pline_t *  pline;   /* I/O pipeline info */
+    H5O_layout_chunk_t * layout;  /* Chunk layout description */
+    H5O_storage_chunk_t *storage; /* Chunk storage description */
 } H5D_chk_idx_info_t;
 
 /*
@@ -239,10 +243,10 @@ typedef struct H5D_chk_idx_info_t {
  * The chunk's file address, filter mask and size on disk are not key values.
  */
 typedef struct H5D_chunk_rec_t {
-    uint32_t	nbytes;				/* Size of stored data	*/
-    hsize_t	offset[H5O_LAYOUT_NDIMS];	/* Logical offset to start */
-    unsigned	filter_mask;			/* Excluded filters	*/
-    haddr_t     chunk_addr;                     /* Address of chunk in file */
+    uint32_t nbytes;                   /* Size of stored data	*/
+    hsize_t  offset[H5O_LAYOUT_NDIMS]; /* Logical offset to start */
+    unsigned filter_mask;              /* Excluded filters	*/
+    haddr_t  chunk_addr;               /* Address of chunk in file */
 } H5D_chunk_rec_t;
 
 /*
@@ -252,154 +256,150 @@ typedef struct H5D_chunk_rec_t {
  */
 typedef struct H5D_chunk_common_ud_t {
     /* downward */
-    const H5O_layout_chunk_t *layout;           /* Chunk layout description */
-    const H5O_storage_chunk_t *storage;         /* Chunk storage description */
-    const hsize_t *offset;	                /* Logical offset of chunk */
-    const struct H5D_rdcc_t *rdcc;              /* Chunk cache.  Only necessary if the index may
-                                                 * be modified, and if any chunks in the dset
-                                                 * may be cached */
+    const H5O_layout_chunk_t * layout;  /* Chunk layout description */
+    const H5O_storage_chunk_t *storage; /* Chunk storage description */
+    const hsize_t *            offset;  /* Logical offset of chunk */
+    const struct H5D_rdcc_t *  rdcc;    /* Chunk cache.  Only necessary if the index may
+                                         * be modified, and if any chunks in the dset
+                                         * may be cached */
 } H5D_chunk_common_ud_t;
 
 /* B-tree callback info for various operations */
 typedef struct H5D_chunk_ud_t {
-    H5D_chunk_common_ud_t common;       /* Common info for B-tree user data (must be first) */
+    H5D_chunk_common_ud_t common; /* Common info for B-tree user data (must be first) */
 
     /* Upward */
-    unsigned    idx_hint;               /*index of chunk in cache, if present */
-    uint32_t	nbytes;			/*size of stored data	*/
-    unsigned	filter_mask;		/*excluded filters	*/
-    haddr_t	addr;			/*file address of chunk */
+    unsigned idx_hint;    /*index of chunk in cache, if present */
+    uint32_t nbytes;      /*size of stored data	*/
+    unsigned filter_mask; /*excluded filters	*/
+    haddr_t  addr;        /*file address of chunk */
 } H5D_chunk_ud_t;
 
 /* Typedef for "generic" chunk callbacks */
-typedef int (*H5D_chunk_cb_func_t)(const H5D_chunk_rec_t *chunk_rec,
-    void *udata);
+typedef int (*H5D_chunk_cb_func_t)(const H5D_chunk_rec_t *chunk_rec, void *udata);
 
 /* Typedefs for chunk operations */
-typedef herr_t (*H5D_chunk_init_func_t)(const H5D_chk_idx_info_t *idx_info,
-    const H5S_t *space, haddr_t dset_ohdr_addr);
+typedef herr_t (*H5D_chunk_init_func_t)(const H5D_chk_idx_info_t *idx_info, const H5S_t *space,
+                                        haddr_t dset_ohdr_addr);
 typedef herr_t (*H5D_chunk_create_func_t)(const H5D_chk_idx_info_t *idx_info);
 typedef hbool_t (*H5D_chunk_is_space_alloc_func_t)(const H5O_storage_chunk_t *storage);
-typedef herr_t (*H5D_chunk_insert_func_t)(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_ud_t *udata);
-typedef herr_t (*H5D_chunk_get_addr_func_t)(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_ud_t *udata);
+typedef herr_t (*H5D_chunk_insert_func_t)(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata);
+typedef herr_t (*H5D_chunk_get_addr_func_t)(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata);
 typedef herr_t (*H5D_chunk_resize_func_t)(H5O_layout_chunk_t *layout);
-typedef int (*H5D_chunk_iterate_func_t)(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_cb_func_t chunk_cb, void *chunk_udata);
-typedef herr_t (*H5D_chunk_remove_func_t)(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_common_ud_t *udata);
+typedef int (*H5D_chunk_iterate_func_t)(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chunk_cb,
+                                        void *chunk_udata);
+typedef herr_t (*H5D_chunk_remove_func_t)(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *udata);
 typedef herr_t (*H5D_chunk_delete_func_t)(const H5D_chk_idx_info_t *idx_info);
 typedef herr_t (*H5D_chunk_copy_setup_func_t)(const H5D_chk_idx_info_t *idx_info_src,
-    const H5D_chk_idx_info_t *idx_info_dst);
+                                              const H5D_chk_idx_info_t *idx_info_dst);
 typedef herr_t (*H5D_chunk_copy_shutdown_func_t)(H5O_storage_chunk_t *storage_src,
-    H5O_storage_chunk_t *storage_dst, hid_t dxpl_id);
-typedef herr_t (*H5D_chunk_size_func_t)(const H5D_chk_idx_info_t *idx_info,
-    hsize_t *idx_size);
+                                                 H5O_storage_chunk_t *storage_dst, hid_t dxpl_id);
+typedef herr_t (*H5D_chunk_size_func_t)(const H5D_chk_idx_info_t *idx_info, hsize_t *idx_size);
 typedef herr_t (*H5D_chunk_reset_func_t)(H5O_storage_chunk_t *storage, hbool_t reset_addr);
-typedef herr_t (*H5D_chunk_dump_func_t)(const H5O_storage_chunk_t *storage,
-    FILE *stream);
+typedef herr_t (*H5D_chunk_dump_func_t)(const H5O_storage_chunk_t *storage, FILE *stream);
 typedef herr_t (*H5D_chunk_dest_func_t)(const H5D_chk_idx_info_t *idx_info);
 
 /* Typedef for grouping chunk I/O routines */
 typedef struct H5D_chunk_ops_t {
-    H5D_chunk_init_func_t init;             /* Routine to initialize indexing information in memory */
-    H5D_chunk_create_func_t create;         /* Routine to create chunk index */
-    H5D_chunk_is_space_alloc_func_t is_space_alloc;    /* Query routine to determine if storage/index is allocated */
-    H5D_chunk_insert_func_t insert;         /* Routine to insert a chunk into an index */
-    H5D_chunk_get_addr_func_t get_addr;     /* Routine to retrieve address of chunk in file */
-    H5D_chunk_resize_func_t resize;         /* Routine to update chunk index info after resizing dataset */
-    H5D_chunk_iterate_func_t iterate;       /* Routine to iterate over chunks */
-    H5D_chunk_remove_func_t remove;         /* Routine to remove a chunk from an index */
-    H5D_chunk_delete_func_t idx_delete;     /* Routine to delete index & all chunks from file*/
+    H5D_chunk_init_func_t   init;   /* Routine to initialize indexing information in memory */
+    H5D_chunk_create_func_t create; /* Routine to create chunk index */
+    H5D_chunk_is_space_alloc_func_t
+                                is_space_alloc; /* Query routine to determine if storage/index is allocated */
+    H5D_chunk_insert_func_t     insert;         /* Routine to insert a chunk into an index */
+    H5D_chunk_get_addr_func_t   get_addr;       /* Routine to retrieve address of chunk in file */
+    H5D_chunk_resize_func_t     resize;     /* Routine to update chunk index info after resizing dataset */
+    H5D_chunk_iterate_func_t    iterate;    /* Routine to iterate over chunks */
+    H5D_chunk_remove_func_t     remove;     /* Routine to remove a chunk from an index */
+    H5D_chunk_delete_func_t     idx_delete; /* Routine to delete index & all chunks from file*/
     H5D_chunk_copy_setup_func_t copy_setup; /* Routine to perform any necessary setup for copying chunks */
-    H5D_chunk_copy_shutdown_func_t copy_shutdown; /* Routine to perform any necessary shutdown for copying chunks */
-    H5D_chunk_size_func_t size;             /* Routine to get size of indexing information */
-    H5D_chunk_reset_func_t reset;           /* Routine to reset indexing information */
-    H5D_chunk_dump_func_t dump;             /* Routine to dump indexing information */
-    H5D_chunk_dest_func_t dest;             /* Routine to destroy indexing information in memory */
+    H5D_chunk_copy_shutdown_func_t
+                           copy_shutdown; /* Routine to perform any necessary shutdown for copying chunks */
+    H5D_chunk_size_func_t  size;          /* Routine to get size of indexing information */
+    H5D_chunk_reset_func_t reset;         /* Routine to reset indexing information */
+    H5D_chunk_dump_func_t  dump;          /* Routine to dump indexing information */
+    H5D_chunk_dest_func_t  dest;          /* Routine to destroy indexing information in memory */
 } H5D_chunk_ops_t;
 
 /* Structure holding information about a chunk's selection for mapping */
 typedef struct H5D_chunk_info_t {
-    hsize_t index;              /* "Index" of chunk in dataset */
-    uint32_t chunk_points;      /* Number of elements selected in chunk */
-    hsize_t coords[H5O_LAYOUT_NDIMS];   /* Coordinates of chunk in file dataset's dataspace */
-    H5S_t *fspace;              /* Dataspace describing chunk & selection in it */
-    unsigned fspace_shared;     /* Indicate that the file space for a chunk is shared and shouldn't be freed */
-    H5S_t *mspace;              /* Dataspace describing selection in memory corresponding to this chunk */
-    unsigned mspace_shared;     /* Indicate that the memory space for a chunk is shared and shouldn't be freed */
+    hsize_t  index;                    /* "Index" of chunk in dataset */
+    uint32_t chunk_points;             /* Number of elements selected in chunk */
+    hsize_t  coords[H5O_LAYOUT_NDIMS]; /* Coordinates of chunk in file dataset's dataspace */
+    H5S_t *  fspace;                   /* Dataspace describing chunk & selection in it */
+    unsigned fspace_shared; /* Indicate that the file space for a chunk is shared and shouldn't be freed */
+    H5S_t *  mspace;        /* Dataspace describing selection in memory corresponding to this chunk */
+    unsigned mspace_shared; /* Indicate that the memory space for a chunk is shared and shouldn't be freed */
 } H5D_chunk_info_t;
 
 /* Main structure holding the mapping between file chunks and memory */
 typedef struct H5D_chunk_map_t {
-    H5O_layout_t *layout;       /* Dataset layout information*/
-    hsize_t nelmts;             /* Number of elements selected in file & memory dataspaces */
+    H5O_layout_t *layout; /* Dataset layout information*/
+    hsize_t       nelmts; /* Number of elements selected in file & memory dataspaces */
 
-    const H5S_t *file_space;    /* Pointer to the file dataspace */
-    unsigned f_ndims;           /* Number of dimensions for file dataspace */
-    hsize_t f_dims[H5O_LAYOUT_NDIMS];   /* File dataspace dimensions */
+    const H5S_t *file_space;               /* Pointer to the file dataspace */
+    unsigned     f_ndims;                  /* Number of dimensions for file dataspace */
+    hsize_t      f_dims[H5O_LAYOUT_NDIMS]; /* File dataspace dimensions */
 
-    const H5S_t *mem_space;     /* Pointer to the memory dataspace */
-    H5S_t *mchunk_tmpl;         /* Dataspace template for new memory chunks */
+    const H5S_t *  mem_space;   /* Pointer to the memory dataspace */
+    H5S_t *        mchunk_tmpl; /* Dataspace template for new memory chunks */
     H5S_sel_iter_t mem_iter;    /* Iterator for elements in memory selection */
-    unsigned m_ndims;           /* Number of dimensions for memory dataspace */
-    H5S_sel_type msel_type;     /* Selection type in memory */
+    unsigned       m_ndims;     /* Number of dimensions for memory dataspace */
+    H5S_sel_type   msel_type;   /* Selection type in memory */
 
-    H5SL_t *sel_chunks;         /* Skip list containing information for each chunk selected */
+    H5SL_t *sel_chunks; /* Skip list containing information for each chunk selected */
 
-    H5S_t  *single_space;       /* Dataspace for single chunk */
-    H5D_chunk_info_t *single_chunk_info;  /* Pointer to single chunk's info */
-    hbool_t use_single;         /* Whether I/O is on a single element */
+    H5S_t *           single_space;      /* Dataspace for single chunk */
+    H5D_chunk_info_t *single_chunk_info; /* Pointer to single chunk's info */
+    hbool_t           use_single;        /* Whether I/O is on a single element */
 
-    hsize_t last_index;         /* Index of last chunk operated on */
-    H5D_chunk_info_t *last_chunk_info;  /* Pointer to last chunk's info */
+    hsize_t           last_index;      /* Index of last chunk operated on */
+    H5D_chunk_info_t *last_chunk_info; /* Pointer to last chunk's info */
 
-    hsize_t chunk_dim[H5O_LAYOUT_NDIMS];    /* Size of chunk in each dimension */
+    hsize_t chunk_dim[H5O_LAYOUT_NDIMS]; /* Size of chunk in each dimension */
 
 #ifdef H5_HAVE_PARALLEL
-    H5D_chunk_info_t **select_chunk;    /* Store the information about whether this chunk is selected or not */
-#endif /* H5_HAVE_PARALLEL */
+    H5D_chunk_info_t **select_chunk; /* Store the information about whether this chunk is selected or not */
+#endif                               /* H5_HAVE_PARALLEL */
 } H5D_chunk_map_t;
 
 /* Cached information about a particular chunk */
 typedef struct H5D_chunk_cached_t {
-    hbool_t     valid;                          /*whether cache info is valid*/
-    hsize_t	offset[H5O_LAYOUT_NDIMS];	/*logical offset to start*/
-    uint32_t	nbytes;				/*size of stored data	*/
-    unsigned	filter_mask;			/*excluded filters	*/
-    haddr_t	addr;				/*file address of chunk */
+    hbool_t  valid;                    /*whether cache info is valid*/
+    hsize_t  offset[H5O_LAYOUT_NDIMS]; /*logical offset to start*/
+    uint32_t nbytes;                   /*size of stored data	*/
+    unsigned filter_mask;              /*excluded filters	*/
+    haddr_t  addr;                     /*file address of chunk */
 } H5D_chunk_cached_t;
 
 /* The raw data chunk cache */
 typedef struct H5D_rdcc_t {
     struct {
-        unsigned	ninits;	/* Number of chunk creations		*/
-        unsigned	nhits;	/* Number of cache hits			*/
-        unsigned	nmisses;/* Number of cache misses		*/
-        unsigned	nflushes;/* Number of cache flushes		*/
+        unsigned ninits;   /* Number of chunk creations		*/
+        unsigned nhits;    /* Number of cache hits			*/
+        unsigned nmisses;  /* Number of cache misses		*/
+        unsigned nflushes; /* Number of cache flushes		*/
     } stats;
-    size_t		nbytes_max; /* Maximum cached raw data in bytes	*/
-    size_t		nslots;	/* Number of chunk slots allocated	*/
-    double		w0;     /* Chunk preemption policy          */
-    struct H5D_rdcc_ent_t *head; /* Head of doubly linked list		*/
-    struct H5D_rdcc_ent_t *tail; /* Tail of doubly linked list		*/
-    size_t		nbytes_used; /* Current cached raw data in bytes */
-    int			nused;	/* Number of chunk slots in use		*/
-    H5D_chunk_cached_t last;    /* Cached copy of last chunk information */
-    struct H5D_rdcc_ent_t **slot; /* Chunk slots, each points to a chunk*/
-    H5SL_t		*sel_chunks; /* Skip list containing information for each chunk selected */
-    H5S_t		*single_space; /* Dataspace for single element I/O on chunks */
-    H5D_chunk_info_t *single_chunk_info;  /* Pointer to single chunk's info */
+    size_t                  nbytes_max;        /* Maximum cached raw data in bytes	*/
+    size_t                  nslots;            /* Number of chunk slots allocated	*/
+    double                  w0;                /* Chunk preemption policy          */
+    struct H5D_rdcc_ent_t * head;              /* Head of doubly linked list		*/
+    struct H5D_rdcc_ent_t * tail;              /* Tail of doubly linked list		*/
+    size_t                  nbytes_used;       /* Current cached raw data in bytes */
+    int                     nused;             /* Number of chunk slots in use		*/
+    H5D_chunk_cached_t      last;              /* Cached copy of last chunk information */
+    struct H5D_rdcc_ent_t **slot;              /* Chunk slots, each points to a chunk*/
+    H5SL_t *                sel_chunks;        /* Skip list containing information for each chunk selected */
+    H5S_t *                 single_space;      /* Dataspace for single element I/O on chunks */
+    H5D_chunk_info_t *      single_chunk_info; /* Pointer to single chunk's info */
 } H5D_rdcc_t;
 
 /* The raw data contiguous data cache */
 typedef struct H5D_rdcdc_t {
-    unsigned char *sieve_buf;   /* Buffer to hold data sieve buffer */
-    haddr_t sieve_loc;          /* File location (offset) of the data sieve buffer */
-    size_t sieve_size;          /* Size of the data sieve buffer used (in bytes) */
-    size_t sieve_buf_size;      /* Size of the data sieve buffer allocated (in bytes) */
-    hbool_t sieve_dirty;        /* Flag to indicate that the data sieve buffer is dirty */
+    unsigned char *sieve_buf;      /* Buffer to hold data sieve buffer */
+    haddr_t        sieve_loc;      /* File location (offset) of the data sieve buffer */
+    size_t         sieve_size;     /* Size of the data sieve buffer used (in bytes) */
+    size_t         sieve_buf_size; /* Size of the data sieve buffer allocated (in bytes) */
+    hbool_t        sieve_dirty;    /* Flag to indicate that the data sieve buffer is dirty */
 } H5D_rdcdc_t;
 
 /*
@@ -409,106 +409,106 @@ typedef struct H5D_rdcdc_t {
  * there will be two IDs and two H5D_t structs, both sharing one H5D_shared_t.
  */
 struct H5D_shared_t {
-    size_t              fo_count;       /* Reference count */
-    hid_t               type_id;        /* ID for dataset's datatype    */
-    H5T_t              *type;           /* Datatype for this dataset     */
-    H5S_t              *space;          /* Dataspace of this dataset    */
-    hbool_t             space_dirty;    /* Whether the dataspace info needs to be flushed to the file */
-    hbool_t             layout_dirty;   /* Whether the layout info needs to be flushed to the file */
-    hid_t               dcpl_id;        /* Dataset creation property id */
-    hid_t               dapl_id;        /* Dataset access property id */
-    H5D_dcpl_cache_t    dcpl_cache;     /* Cached DCPL values */
-    H5O_layout_t        layout;         /* Data layout                  */
-    hbool_t             checked_filters;/* TRUE if dataset passes can_apply check */
+    size_t           fo_count;        /* Reference count */
+    hid_t            type_id;         /* ID for dataset's datatype    */
+    H5T_t *          type;            /* Datatype for this dataset     */
+    H5S_t *          space;           /* Dataspace of this dataset    */
+    hbool_t          space_dirty;     /* Whether the dataspace info needs to be flushed to the file */
+    hbool_t          layout_dirty;    /* Whether the layout info needs to be flushed to the file */
+    hid_t            dcpl_id;         /* Dataset creation property id */
+    hid_t            dapl_id;         /* Dataset access property id */
+    H5D_dcpl_cache_t dcpl_cache;      /* Cached DCPL values */
+    H5O_layout_t     layout;          /* Data layout                  */
+    hbool_t          checked_filters; /* TRUE if dataset passes can_apply check */
 
     /* Buffered/cached information for types of raw data storage*/
     struct {
-        H5D_rdcdc_t     contig;         /* Information about contiguous data */
-                                        /* (Note that the "contig" cache
-                                         * information can be used by a chunked
-                                         * dataset in certain circumstances)
-                                         */
-        H5D_rdcc_t      chunk;          /* Information about chunked data */
+        H5D_rdcdc_t contig; /* Information about contiguous data */
+                            /* (Note that the "contig" cache
+                             * information can be used by a chunked
+                             * dataset in certain circumstances)
+                             */
+        H5D_rdcc_t chunk;   /* Information about chunked data */
     } cache;
 
-    char                *extfile_prefix; /* expanded external file prefix */
+    char *extfile_prefix; /* expanded external file prefix */
 };
 
 struct H5D_t {
-    H5O_loc_t           oloc;           /* Object header location       */
-    H5G_name_t          path;           /* Group hierarchy path         */
-    H5D_shared_t        *shared;        /* cached information from file */
+    H5O_loc_t     oloc;   /* Object header location       */
+    H5G_name_t    path;   /* Group hierarchy path         */
+    H5D_shared_t *shared; /* cached information from file */
 };
 
 /* Enumerated type for allocating dataset's storage */
 typedef enum {
-    H5D_ALLOC_CREATE,           /* Dataset is being created */
-    H5D_ALLOC_OPEN,             /* Dataset is being opened */
-    H5D_ALLOC_EXTEND,           /* Dataset's dataspace is being extended */
-    H5D_ALLOC_WRITE             /* Dataset is being extended */
+    H5D_ALLOC_CREATE, /* Dataset is being created */
+    H5D_ALLOC_OPEN,   /* Dataset is being opened */
+    H5D_ALLOC_EXTEND, /* Dataset's dataspace is being extended */
+    H5D_ALLOC_WRITE   /* Dataset is being extended */
 } H5D_time_alloc_t;
 
-
 /* Typedef for dataset creation operation */
 typedef struct {
-    hid_t type_id;              /* Datatype for dataset */
-    const H5S_t *space;         /* Dataspace for dataset */
-    hid_t dcpl_id;              /* Dataset creation property list */
-    hid_t dapl_id;              /* Dataset access property list */
+    hid_t        type_id; /* Datatype for dataset */
+    const H5S_t *space;   /* Dataspace for dataset */
+    hid_t        dcpl_id; /* Dataset creation property list */
+    hid_t        dapl_id; /* Dataset access property list */
 } H5D_obj_create_t;
 
 /* Typedef for filling a buffer with a fill value */
 typedef struct H5D_fill_buf_info_t {
-    H5MM_allocate_t fill_alloc_func;    /* Routine to call for allocating fill buffer */
-    void        *fill_alloc_info;       /* Extra info for allocation routine */
-    H5MM_free_t fill_free_func;         /* Routine to call for freeing fill buffer */
-    void        *fill_free_info;        /* Extra info for free routine */
-    H5T_path_t *fill_to_mem_tpath;      /* Datatype conversion path for converting the fill value to the memory buffer */
-    H5T_path_t *mem_to_dset_tpath;      /* Datatype conversion path for converting the memory buffer to the dataset elements */
-    const H5O_fill_t *fill;             /* Pointer to fill value */
-    void       *fill_buf;               /* Fill buffer */
-    size_t      fill_buf_size;          /* Size of fill buffer */
-    hbool_t     use_caller_fill_buf;    /* Whether the caller provided the fill buffer */
-    void       *bkg_buf;                /* Background conversion buffer */
-    size_t      bkg_buf_size;           /* Size of background buffer */
-    H5T_t      *mem_type;               /* Pointer to memory datatype */
-    const H5T_t *file_type;             /* Pointer to file datatype */
-    hid_t       mem_tid;                /* ID for memory version of disk datatype */
-    hid_t       file_tid;               /* ID for disk datatype */
-    size_t      mem_elmt_size, file_elmt_size;       /* Size of element in memory and on disk */
-    size_t      max_elmt_size;          /* Max. size of memory or file datatype */
-    size_t      elmts_per_buf;          /* # of elements that fit into a buffer */
-    hbool_t     has_vlen_fill_type;     /* Whether the datatype for the fill value has a variable-length component */
+    H5MM_allocate_t fill_alloc_func; /* Routine to call for allocating fill buffer */
+    void *          fill_alloc_info; /* Extra info for allocation routine */
+    H5MM_free_t     fill_free_func;  /* Routine to call for freeing fill buffer */
+    void *          fill_free_info;  /* Extra info for free routine */
+    H5T_path_t
+        *fill_to_mem_tpath; /* Datatype conversion path for converting the fill value to the memory buffer */
+    H5T_path_t *mem_to_dset_tpath; /* Datatype conversion path for converting the memory buffer to the dataset
+                                      elements */
+    const H5O_fill_t *fill;        /* Pointer to fill value */
+    void *            fill_buf;    /* Fill buffer */
+    size_t            fill_buf_size;                 /* Size of fill buffer */
+    hbool_t           use_caller_fill_buf;           /* Whether the caller provided the fill buffer */
+    void *            bkg_buf;                       /* Background conversion buffer */
+    size_t            bkg_buf_size;                  /* Size of background buffer */
+    H5T_t *           mem_type;                      /* Pointer to memory datatype */
+    const H5T_t *     file_type;                     /* Pointer to file datatype */
+    hid_t             mem_tid;                       /* ID for memory version of disk datatype */
+    hid_t             file_tid;                      /* ID for disk datatype */
+    size_t            mem_elmt_size, file_elmt_size; /* Size of element in memory and on disk */
+    size_t            max_elmt_size;                 /* Max. size of memory or file datatype */
+    size_t            elmts_per_buf;                 /* # of elements that fit into a buffer */
+    hbool_t has_vlen_fill_type; /* Whether the datatype for the fill value has a variable-length component */
 } H5D_fill_buf_info_t;
 
 /* Internal data structure for computing variable-length dataset's total size */
 typedef struct {
-    H5D_t *dset;        /* Dataset for operation */
-    H5S_t *fspace;      /* Dataset's dataspace for operation */
-    H5S_t *mspace;      /* Memory dataspace for operation */
-    void *fl_tbuf;      /* Ptr to the temporary buffer we are using for fixed-length data */
-    void *vl_tbuf;      /* Ptr to the temporary buffer we are using for VL data */
-    hid_t xfer_pid;     /* ID of the dataset xfer property list */
-    hsize_t size;       /* Accumulated number of bytes for the selection */
+    H5D_t * dset;     /* Dataset for operation */
+    H5S_t * fspace;   /* Dataset's dataspace for operation */
+    H5S_t * mspace;   /* Memory dataspace for operation */
+    void *  fl_tbuf;  /* Ptr to the temporary buffer we are using for fixed-length data */
+    void *  vl_tbuf;  /* Ptr to the temporary buffer we are using for VL data */
+    hid_t   xfer_pid; /* ID of the dataset xfer property list */
+    hsize_t size;     /* Accumulated number of bytes for the selection */
 } H5D_vlen_bufsize_t;
 
 /* Raw data chunks are cached.  Each entry in the cache is: */
 typedef struct H5D_rdcc_ent_t {
-    hbool_t	locked;		/*entry is locked in cache		*/
-    hbool_t	dirty;		/*needs to be written to disk?		*/
-    hbool_t     deleted;        /*chunk about to be deleted (do not flush) */
-    hsize_t	offset[H5O_LAYOUT_NDIMS]; /*chunk name			*/
-    uint32_t	rd_count;	/*bytes remaining to be read		*/
-    uint32_t	wr_count;	/*bytes remaining to be written		*/
-    haddr_t     chunk_addr;     /*address of chunk in file		*/
-    uint8_t	*chunk;		/*the unfiltered chunk data		*/
-    unsigned	idx;		/*index in hash table			*/
-    struct H5D_rdcc_ent_t *next;/*next item in doubly-linked list	*/
-    struct H5D_rdcc_ent_t *prev;/*previous item in doubly-linked list	*/
+    hbool_t                locked;                   /*entry is locked in cache		*/
+    hbool_t                dirty;                    /*needs to be written to disk?		*/
+    hbool_t                deleted;                  /*chunk about to be deleted (do not flush) */
+    hsize_t                offset[H5O_LAYOUT_NDIMS]; /*chunk name			*/
+    uint32_t               rd_count;                 /*bytes remaining to be read		*/
+    uint32_t               wr_count;                 /*bytes remaining to be written		*/
+    haddr_t                chunk_addr;               /*address of chunk in file		*/
+    uint8_t *              chunk;                    /*the unfiltered chunk data		*/
+    unsigned               idx;                      /*index in hash table			*/
+    struct H5D_rdcc_ent_t *next;                     /*next item in doubly-linked list	*/
+    struct H5D_rdcc_ent_t *prev;                     /*previous item in doubly-linked list	*/
 } H5D_rdcc_ent_t;
 typedef H5D_rdcc_ent_t *H5D_rdcc_ent_ptr_t; /* For free lists */
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -523,153 +523,127 @@ H5_DLLVAR const H5D_layout_ops_t H5D_LOPS_CHUNK[1];
 /* Chunked layout operations */
 H5_DLLVAR const H5D_chunk_ops_t H5D_COPS_BTREE[1];
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 
 H5_DLL herr_t H5D__term_pub_interface(void);
 H5_DLL herr_t H5D__term_deprec_interface(void);
-H5_DLL H5D_t *H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space,
-    hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id);
-H5_DLL H5D_t *H5D__create_named(const H5G_loc_t *loc, const char *name,
-    hid_t type_id, const H5S_t *space, hid_t lcpl_id, hid_t dcpl_id,
-    hid_t dapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5D__get_space_status(H5D_t *dset, H5D_space_status_t *allocation,
-    hid_t dxpl_id);
-H5_DLL herr_t H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc,
-    hbool_t full_overwrite, hsize_t old_dim[]);
-H5_DLL herr_t H5D__get_storage_size(H5D_t *dset, hid_t dxpl_id, hsize_t *storage_size);
-H5_DLL herr_t H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, hsize_t *storage_size);
+H5_DLL H5D_t *H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, hid_t dapl_id,
+                          hid_t dxpl_id);
+H5_DLL H5D_t * H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id, const H5S_t *space,
+                                 hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id);
+H5_DLL herr_t  H5D__get_space_status(H5D_t *dset, H5D_space_status_t *allocation, hid_t dxpl_id);
+H5_DLL herr_t  H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc,
+                                  hbool_t full_overwrite, hsize_t old_dim[]);
+H5_DLL herr_t  H5D__get_storage_size(H5D_t *dset, hid_t dxpl_id, hsize_t *storage_size);
+H5_DLL herr_t  H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset,
+                                           hsize_t *storage_size);
 H5_DLL haddr_t H5D__get_offset(const H5D_t *dset);
-H5_DLL void *H5D__vlen_get_buf_size_alloc(size_t size, void *info);
-H5_DLL herr_t H5D__vlen_get_buf_size(void *elem, hid_t type_id, unsigned ndim,
-    const hsize_t *point, void *op_data);
-H5_DLL herr_t H5D__check_filters(H5D_t *dataset);
-H5_DLL herr_t H5D__set_extent(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id);
-H5_DLL herr_t H5D__get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache);
-H5_DLL herr_t H5D__flush_sieve_buf(H5D_t *dataset, hid_t dxpl_id);
-H5_DLL herr_t H5D__mark(const H5D_t *dataset, hid_t dxpl_id, unsigned flags);
-H5_DLL herr_t H5D__flush_real(H5D_t *dataset, hid_t dxpl_id);
+H5_DLL void *  H5D__vlen_get_buf_size_alloc(size_t size, void *info);
+H5_DLL herr_t  H5D__vlen_get_buf_size(void *elem, hid_t type_id, unsigned ndim, const hsize_t *point,
+                                      void *op_data);
+H5_DLL herr_t  H5D__check_filters(H5D_t *dataset);
+H5_DLL herr_t  H5D__set_extent(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id);
+H5_DLL herr_t  H5D__get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache);
+H5_DLL herr_t  H5D__flush_sieve_buf(H5D_t *dataset, hid_t dxpl_id);
+H5_DLL herr_t  H5D__mark(const H5D_t *dataset, hid_t dxpl_id, unsigned flags);
+H5_DLL herr_t  H5D__flush_real(H5D_t *dataset, hid_t dxpl_id);
 
 /* Internal I/O routines */
-H5_DLL herr_t H5D__read(H5D_t *dataset, hid_t mem_type_id,
-    const H5S_t *mem_space, const H5S_t *file_space, hid_t dset_xfer_plist,
-    void *buf/*out*/);
+H5_DLL herr_t H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, const H5S_t *file_space,
+                        hid_t dset_xfer_plist, void *buf /*out*/);
 
 /* Functions that perform direct serial I/O operations */
-H5_DLL herr_t H5D__select_read(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-H5_DLL herr_t H5D__select_write(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+H5_DLL herr_t H5D__select_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                               const H5S_t *file_space, const H5S_t *mem_space);
+H5_DLL herr_t H5D__select_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
 
 /* Functions that perform scatter-gather serial I/O operations */
-H5_DLL herr_t H5D__scatter_mem(const void *_tscat_buf,
-    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
-    const H5D_dxpl_cache_t *dxpl_cache, void *_buf);
-H5_DLL herr_t H5D__scatgath_read(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-H5_DLL herr_t H5D__scatgath_write(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+H5_DLL herr_t H5D__scatter_mem(const void *_tscat_buf, const H5S_t *space, H5S_sel_iter_t *iter,
+                               size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache, void *_buf);
+H5_DLL herr_t H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                 hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+H5_DLL herr_t H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                  hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
 
 /* Functions that operate on dataset's layout information */
 H5_DLL herr_t H5D__layout_set_io_ops(const H5D_t *dataset);
-H5_DLL size_t H5D__layout_meta_size(const H5F_t *f, const H5O_layout_t *layout,
-    hbool_t include_compact_data);
-H5_DLL herr_t H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh,
-    H5D_t *dset, hid_t dapl_id);
-H5_DLL herr_t H5D__layout_oh_read(H5D_t *dset, hid_t dxpl_id, hid_t dapl_id,
-    H5P_genplist_t *plist);
-H5_DLL herr_t H5D__layout_oh_write(H5D_t *dataset, hid_t dxpl_id, H5O_t *oh,
-    unsigned update_flags);
+H5_DLL size_t H5D__layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include_compact_data);
+H5_DLL herr_t H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset, hid_t dapl_id);
+H5_DLL herr_t H5D__layout_oh_read(H5D_t *dset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t *plist);
+H5_DLL herr_t H5D__layout_oh_write(H5D_t *dataset, hid_t dxpl_id, H5O_t *oh, unsigned update_flags);
 
 /* Functions that operate on contiguous storage */
-H5_DLL herr_t H5D__contig_alloc(H5F_t *f, hid_t dxpl_id,
-    H5O_storage_contig_t *storage);
+H5_DLL herr_t  H5D__contig_alloc(H5F_t *f, hid_t dxpl_id, H5O_storage_contig_t *storage);
 H5_DLL hbool_t H5D__contig_is_space_alloc(const H5O_storage_t *storage);
 H5_DLL hbool_t H5D__contig_is_data_cached(const H5D_shared_t *shared_dset);
-H5_DLL herr_t H5D__contig_fill(const H5D_t *dset, hid_t dxpl_id);
-H5_DLL herr_t H5D__contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm);
-H5_DLL herr_t H5D__contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm);
-H5_DLL herr_t H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
-    H5F_t *f_dst, H5O_storage_contig_t *storage_dst, H5T_t *src_dtype,
-    H5O_copy_t *cpy_info, hid_t dxpl_id);
-H5_DLL herr_t H5D__contig_delete(H5F_t *f, hid_t dxpl_id,
-    const H5O_storage_t *store);
-
+H5_DLL herr_t  H5D__contig_fill(const H5D_t *dset, hid_t dxpl_id);
+H5_DLL herr_t  H5D__contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                                const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t *fm);
+H5_DLL herr_t  H5D__contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                                 const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t *fm);
+H5_DLL herr_t  H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f_dst,
+                                H5O_storage_contig_t *storage_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info,
+                                hid_t dxpl_id);
+H5_DLL herr_t  H5D__contig_delete(H5F_t *f, hid_t dxpl_id, const H5O_storage_t *store);
 
 /* Functions that operate on chunked dataset storage */
-H5_DLL htri_t H5D__chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr,
-    hbool_t write_op);
-H5_DLL herr_t H5D__chunk_create(const H5D_t *dset /*in,out*/, hid_t dxpl_id);
-H5_DLL herr_t H5D__chunk_set_info(const H5D_t *dset);
-H5_DLL herr_t H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset,
-    hid_t dapl_id);
+H5_DLL htri_t  H5D__chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr, hbool_t write_op);
+H5_DLL herr_t  H5D__chunk_create(const H5D_t *dset /*in,out*/, hid_t dxpl_id);
+H5_DLL herr_t  H5D__chunk_set_info(const H5D_t *dset);
+H5_DLL herr_t  H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id);
 H5_DLL hbool_t H5D__chunk_is_space_alloc(const H5O_storage_t *storage);
 H5_DLL hbool_t H5D__chunk_is_data_cached(const H5D_shared_t *shared_dset);
-H5_DLL herr_t H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id,
-    const hsize_t *chunk_offset, hsize_t chunk_idx, H5D_chunk_ud_t *udata);
-H5_DLL void *H5D__chunk_lock(const H5D_io_info_t *io_info,
-    H5D_chunk_ud_t *udata, hbool_t relax);
-H5_DLL herr_t H5D__chunk_unlock(const H5D_io_info_t *io_info,
-    const H5D_chunk_ud_t *udata, hbool_t dirty, void *chunk,
-    uint32_t naccessed);
-H5_DLL herr_t H5D__chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes);
-H5_DLL herr_t H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id,
-    hbool_t full_overwrite, hsize_t old_dim[]);
-H5_DLL herr_t H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id,
-    const hsize_t *old_dim);
+H5_DLL herr_t  H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset,
+                                 hsize_t chunk_idx, H5D_chunk_ud_t *udata);
+H5_DLL void *  H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax);
+H5_DLL herr_t  H5D__chunk_unlock(const H5D_io_info_t *io_info, const H5D_chunk_ud_t *udata, hbool_t dirty,
+                                 void *chunk, uint32_t naccessed);
+H5_DLL herr_t  H5D__chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes);
+H5_DLL herr_t  H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
+                                   hsize_t old_dim[]);
+H5_DLL herr_t  H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim);
 #ifdef H5_HAVE_PARALLEL
 H5_DLL herr_t H5D__chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[]);
 #endif /* H5_HAVE_PARALLEL */
 H5_DLL herr_t H5D__chunk_update_cache(H5D_t *dset, hid_t dxpl_id);
-H5_DLL herr_t H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src,
-    H5O_layout_chunk_t *layout_src, H5F_t *f_dst, H5O_storage_chunk_t *storage_dst,
-    const H5S_extent_t *ds_extent_src, const H5T_t *dt_src,
-    const H5O_pline_t *pline_src, H5O_copy_t *cpy_info, hid_t dxpl_id);
-H5_DLL herr_t H5D__chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
-    const H5O_pline_t *pline, hsize_t *btree_size);
+H5_DLL herr_t H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk_t *layout_src,
+                              H5F_t *f_dst, H5O_storage_chunk_t *storage_dst,
+                              const H5S_extent_t *ds_extent_src, const H5T_t *dt_src,
+                              const H5O_pline_t *pline_src, H5O_copy_t *cpy_info, hid_t dxpl_id);
+H5_DLL herr_t H5D__chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout, const H5O_pline_t *pline,
+                                 hsize_t *btree_size);
 H5_DLL herr_t H5D__chunk_dump_index(H5D_t *dset, hid_t dxpl_id, FILE *stream);
 H5_DLL herr_t H5D__chunk_dest(H5F_t *f, hid_t dxpl_id, H5D_t *dset);
-H5_DLL herr_t H5D__chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    H5O_storage_t *store);
-H5_DLL herr_t H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, 
-         hsize_t *offset, uint32_t data_size, const void *buf);
-H5_DLL herr_t H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset,
-         uint32_t *filters, void *buf);
+H5_DLL herr_t H5D__chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_storage_t *store);
+H5_DLL herr_t H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsize_t *offset,
+                                      uint32_t data_size, const void *buf);
+H5_DLL herr_t H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset, uint32_t *filters,
+                                     void *buf);
 #ifdef H5D_CHUNK_DEBUG
 H5_DLL herr_t H5D__chunk_stats(const H5D_t *dset, hbool_t headers);
 #endif /* H5D_CHUNK_DEBUG */
 
 /* Functions that operate on compact dataset storage */
 H5_DLL herr_t H5D__compact_fill(const H5D_t *dset, hid_t dxpl_id);
-H5_DLL herr_t H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *storage_src,
-    H5F_t *f_dst, H5O_storage_compact_t *storage_dst, H5T_t *src_dtype,
-    H5O_copy_t *cpy_info, hid_t dxpl_id);
+H5_DLL herr_t H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *storage_src, H5F_t *f_dst,
+                                H5O_storage_compact_t *storage_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info,
+                                hid_t dxpl_id);
 
 /* Functions that operate on EFL (External File List)*/
 H5_DLL hbool_t H5D__efl_is_space_alloc(const H5O_storage_t *storage);
-H5_DLL herr_t H5D__efl_bh_info(H5F_t *f, hid_t dxpl_id, H5O_efl_t *efl,
-    hsize_t *heap_size);
+H5_DLL herr_t  H5D__efl_bh_info(H5F_t *f, hid_t dxpl_id, H5O_efl_t *efl, hsize_t *heap_size);
 
 /* Functions that perform fill value operations on datasets */
-H5_DLL herr_t H5D__fill(const void *fill, const H5T_t *fill_type, void *buf,
-    const H5T_t *buf_type, const H5S_t *space, hid_t dxpl_id);
-H5_DLL herr_t H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
-    H5MM_allocate_t alloc_func, void *alloc_info,
-    H5MM_free_t free_func, void *free_info,
-    const H5O_fill_t *fill, const H5T_t *dset_type, hid_t dset_type_id,
-    size_t nelmts, size_t min_buf_size, hid_t dxpl_id);
-H5_DLL herr_t H5D__fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts,
-    hid_t dxpl_id);
+H5_DLL herr_t H5D__fill(const void *fill, const H5T_t *fill_type, void *buf, const H5T_t *buf_type,
+                        const H5S_t *space, hid_t dxpl_id);
+H5_DLL herr_t H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, H5MM_allocate_t alloc_func,
+                             void *alloc_info, H5MM_free_t free_func, void *free_info, const H5O_fill_t *fill,
+                             const H5T_t *dset_type, hid_t dset_type_id, size_t nelmts, size_t min_buf_size,
+                             hid_t dxpl_id);
+H5_DLL herr_t H5D__fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts, hid_t dxpl_id);
 H5_DLL herr_t H5D__fill_term(H5D_fill_buf_info_t *fb_info);
 
 #ifdef H5_HAVE_PARALLEL
@@ -678,39 +652,36 @@ H5_DLL herr_t H5D__fill_term(H5D_fill_buf_info_t *fb_info);
 #ifndef H5Dmpio_DEBUG
 #define H5Dmpio_DEBUG
 #endif /*H5Dmpio_DEBUG*/
-#endif/*H5S_DEBUG*/
+#endif /*H5S_DEBUG*/
 /* MPI-IO function to read, it will select either regular or irregular read */
-H5_DLL herr_t H5D__mpio_select_read(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+H5_DLL herr_t H5D__mpio_select_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
 
 /* MPI-IO function to write, it will select either regular or irregular read */
-H5_DLL herr_t H5D__mpio_select_write(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+H5_DLL herr_t H5D__mpio_select_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                     hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
 
 /* MPI-IO functions to handle contiguous collective IO */
-H5_DLL herr_t H5D__contig_collective_read(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
-H5_DLL herr_t H5D__contig_collective_write(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
+H5_DLL herr_t H5D__contig_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                          hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                          H5D_chunk_map_t *fm);
+H5_DLL herr_t H5D__contig_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                           hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                           H5D_chunk_map_t *fm);
 
 /* MPI-IO functions to handle chunked collective IO */
-H5_DLL herr_t H5D__chunk_collective_read(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
-H5_DLL herr_t H5D__chunk_collective_write(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
+H5_DLL herr_t H5D__chunk_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                         hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                         H5D_chunk_map_t *fm);
+H5_DLL herr_t H5D__chunk_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
+                                          hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+                                          H5D_chunk_map_t *fm);
 
 /* MPI-IO function to check if a direct I/O transfer is possible between
  * memory and the file */
-H5_DLL htri_t H5D__mpio_opt_possible(const H5D_io_info_t *io_info,
-    const H5S_t *file_space, const H5S_t *mem_space,
-    const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm,
-    H5P_genplist_t *dx_plist);
+H5_DLL htri_t H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space,
+                                     const H5S_t *mem_space, const H5D_type_info_t *type_info,
+                                     const H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist);
 
 #endif /* H5_HAVE_PARALLEL */
 
@@ -723,4 +694,3 @@ H5_DLL herr_t H5D__current_cache_size_test(hid_t did, size_t *nbytes_used, int *
 #endif /* H5D_TESTING */
 
 #endif /*_H5Dpkg_H*/
-
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 0fcd8c5..d1d1bfa 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -21,11 +21,10 @@
 #include "H5Dpublic.h"
 
 /* Private headers needed by this file */
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Sprivate.h"		/* Dataspaces 				*/
-#include "H5Zprivate.h"		/* Data filters				*/
-
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Sprivate.h"  /* Dataspaces 				*/
+#include "H5Zprivate.h"  /* Data filters				*/
 
 /**************************/
 /* Library Private Macros */
@@ -37,76 +36,77 @@
  *	    to have any effect.
  */
 #ifdef NDEBUG
-#  undef H5D_DEBUG
+#undef H5D_DEBUG
 #endif
 
 /* ========  Dataset creation property names ======== */
-#define H5D_CRT_LAYOUT_NAME        "layout"             /* Storage layout */
-#define H5D_CRT_FILL_VALUE_NAME    "fill_value"         /* Fill value */
+#define H5D_CRT_LAYOUT_NAME           "layout"           /* Storage layout */
+#define H5D_CRT_FILL_VALUE_NAME       "fill_value"       /* Fill value */
 #define H5D_CRT_ALLOC_TIME_STATE_NAME "alloc_time_state" /* Space allocation time state */
-#define H5D_CRT_EXT_FILE_LIST_NAME "efl"                /* External file list */
+#define H5D_CRT_EXT_FILE_LIST_NAME    "efl"              /* External file list */
 
 /* ========  Dataset access property names ======== */
-#define H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME   "rdcc_nslots"   /* Size of raw data chunk cache(slots) */
-#define H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME   "rdcc_nbytes"   /* Size of raw data chunk cache(bytes) */
-#define H5D_ACS_PREEMPT_READ_CHUNKS_NAME    "rdcc_w0"       /* Preemption read chunks first */
-#define H5D_ACS_EFILE_PREFIX_NAME           "external file prefix" /* External file prefix */
+#define H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME "rdcc_nslots"          /* Size of raw data chunk cache(slots) */
+#define H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME "rdcc_nbytes"          /* Size of raw data chunk cache(bytes) */
+#define H5D_ACS_PREEMPT_READ_CHUNKS_NAME  "rdcc_w0"              /* Preemption read chunks first */
+#define H5D_ACS_EFILE_PREFIX_NAME         "external file prefix" /* External file prefix */
 
 /* ======== Data transfer properties ======== */
-#define H5D_XFER_MAX_TEMP_BUF_NAME      "max_temp_buf"  /* Maximum temp buffer size */
-#define H5D_XFER_TCONV_BUF_NAME         "tconv_buf"     /* Type conversion buffer */
-#define H5D_XFER_BKGR_BUF_NAME          "bkgr_buf"      /* Background buffer */
-#define H5D_XFER_BKGR_BUF_TYPE_NAME     "bkgr_buf_type" /* Background buffer type */
+#define H5D_XFER_MAX_TEMP_BUF_NAME      "max_temp_buf"      /* Maximum temp buffer size */
+#define H5D_XFER_TCONV_BUF_NAME         "tconv_buf"         /* Type conversion buffer */
+#define H5D_XFER_BKGR_BUF_NAME          "bkgr_buf"          /* Background buffer */
+#define H5D_XFER_BKGR_BUF_TYPE_NAME     "bkgr_buf_type"     /* Background buffer type */
 #define H5D_XFER_BTREE_SPLIT_RATIO_NAME "btree_split_ratio" /* B-tree node splitting ratio */
-#define H5D_XFER_VLEN_ALLOC_NAME        "vlen_alloc"    /* Vlen allocation function */
-#define H5D_XFER_VLEN_ALLOC_INFO_NAME   "vlen_alloc_info" /* Vlen allocation info */
-#define H5D_XFER_VLEN_FREE_NAME         "vlen_free"     /* Vlen free function */
-#define H5D_XFER_VLEN_FREE_INFO_NAME    "vlen_free_info" /* Vlen free info */
-#define H5D_XFER_VFL_ID_NAME            "vfl_id"        /* File driver ID */
-#define H5D_XFER_VFL_INFO_NAME          "vfl_info"      /* File driver info */
-#define H5D_XFER_HYPER_VECTOR_SIZE_NAME "vec_size"      /* Hyperslab vector size */
+#define H5D_XFER_VLEN_ALLOC_NAME        "vlen_alloc"        /* Vlen allocation function */
+#define H5D_XFER_VLEN_ALLOC_INFO_NAME   "vlen_alloc_info"   /* Vlen allocation info */
+#define H5D_XFER_VLEN_FREE_NAME         "vlen_free"         /* Vlen free function */
+#define H5D_XFER_VLEN_FREE_INFO_NAME    "vlen_free_info"    /* Vlen free info */
+#define H5D_XFER_VFL_ID_NAME            "vfl_id"            /* File driver ID */
+#define H5D_XFER_VFL_INFO_NAME          "vfl_info"          /* File driver info */
+#define H5D_XFER_HYPER_VECTOR_SIZE_NAME "vec_size"          /* Hyperslab vector size */
 #ifdef H5_HAVE_PARALLEL
-#define H5D_XFER_IO_XFER_MODE_NAME      "io_xfer_mode"  /* I/O transfer mode */
-#define H5D_XFER_MPIO_COLLECTIVE_OPT_NAME "mpio_collective_opt" /* Optimization of MPI-IO transfer mode */
-#define H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME "mpio_chunk_opt_hard"
-#define H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME "mpio_chunk_opt_num"
-#define H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME "mpio_chunk_opt_ratio"
+#define H5D_XFER_IO_XFER_MODE_NAME          "io_xfer_mode"        /* I/O transfer mode */
+#define H5D_XFER_MPIO_COLLECTIVE_OPT_NAME   "mpio_collective_opt" /* Optimization of MPI-IO transfer mode */
+#define H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME   "mpio_chunk_opt_hard"
+#define H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME    "mpio_chunk_opt_num"
+#define H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME  "mpio_chunk_opt_ratio"
 #define H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME "actual_chunk_opt_mode"
-#define H5D_MPIO_ACTUAL_IO_MODE_NAME    "actual_io_mode"
-#define H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME "local_no_collective_cause"  /* cause of broken collective I/O in each process */
-#define H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME "global_no_collective_cause"  /* cause of broken collective I/O in all processes */
-#endif /* H5_HAVE_PARALLEL */
-#define H5D_XFER_EDC_NAME               "err_detect"    /* EDC */
-#define H5D_XFER_FILTER_CB_NAME         "filter_cb"     /* Filter callback function */
-#define H5D_XFER_CONV_CB_NAME           "type_conv_cb"  /* Type conversion callback function */
-#define H5D_XFER_XFORM_NAME             "data_transform" /* Data transform */
+#define H5D_MPIO_ACTUAL_IO_MODE_NAME        "actual_io_mode"
+#define H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME                                                              \
+    "local_no_collective_cause" /* cause of broken collective I/O in each process */
+#define H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME                                                             \
+    "global_no_collective_cause"                 /* cause of broken collective I/O in all processes */
+#endif                                           /* H5_HAVE_PARALLEL */
+#define H5D_XFER_EDC_NAME       "err_detect"     /* EDC */
+#define H5D_XFER_FILTER_CB_NAME "filter_cb"      /* Filter callback function */
+#define H5D_XFER_CONV_CB_NAME   "type_conv_cb"   /* Type conversion callback function */
+#define H5D_XFER_XFORM_NAME     "data_transform" /* Data transform */
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
 /* Collective chunk instrumentation properties */
-#define H5D_XFER_COLL_CHUNK_LINK_HARD_NAME "coll_chunk_link_hard"
-#define H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME "coll_chunk_multi_hard"
-#define H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME "coll_chunk_link_true"
-#define H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME "coll_chunk_link_false"
+#define H5D_XFER_COLL_CHUNK_LINK_HARD_NAME        "coll_chunk_link_hard"
+#define H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME       "coll_chunk_multi_hard"
+#define H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME    "coll_chunk_link_true"
+#define H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME   "coll_chunk_link_false"
 #define H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME "coll_chunk_multi_coll"
-#define H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME "coll_chunk_multi_ind"
+#define H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME  "coll_chunk_multi_ind"
 
 /* Definitions for all collective chunk instrumentation properties */
-#define H5D_XFER_COLL_CHUNK_SIZE        sizeof(unsigned)
-#define H5D_XFER_COLL_CHUNK_DEF         1
-#define H5D_XFER_COLL_CHUNK_FIX         0
+#define H5D_XFER_COLL_CHUNK_SIZE sizeof(unsigned)
+#define H5D_XFER_COLL_CHUNK_DEF  1
+#define H5D_XFER_COLL_CHUNK_FIX  0
 #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
 
 /* Default temporary buffer size */
-#define H5D_TEMP_BUF_SIZE       (1024 * 1024)
+#define H5D_TEMP_BUF_SIZE (1024 * 1024)
 
 /* Default I/O vector size */
-#define H5D_IO_VECTOR_SIZE      1024
+#define H5D_IO_VECTOR_SIZE 1024
 
 /* Default VL allocation & free info */
-#define H5D_VLEN_ALLOC          NULL
-#define H5D_VLEN_ALLOC_INFO     NULL
-#define H5D_VLEN_FREE           NULL
-#define H5D_VLEN_FREE_INFO      NULL
-
+#define H5D_VLEN_ALLOC      NULL
+#define H5D_VLEN_ALLOC_INFO NULL
+#define H5D_VLEN_FREE       NULL
+#define H5D_VLEN_FREE_INFO  NULL
 
 /****************************/
 /* Library Private Typedefs */
@@ -117,41 +117,40 @@ typedef struct H5D_t H5D_t;
 
 /* Typedef for cached dataset transfer property list information */
 typedef struct H5D_dxpl_cache_t {
-    size_t max_temp_buf;        /* Maximum temporary buffer size (H5D_XFER_MAX_TEMP_BUF_NAME) */
-    void *tconv_buf;            /* Temporary conversion buffer (H5D_XFER_TCONV_BUF_NAME) */
-    void *bkgr_buf;             /* Background conversion buffer (H5D_XFER_BKGR_BUF_NAME) */
-    H5T_bkg_t bkgr_buf_type;    /* Background buffer type (H5D_XFER_BKGR_BUF_NAME) */
-    H5Z_EDC_t err_detect;       /* Error detection info (H5D_XFER_EDC_NAME) */
-    double btree_split_ratio[3];/* B-tree split ratios (H5D_XFER_BTREE_SPLIT_RATIO_NAME) */
-    size_t vec_size;            /* Size of hyperslab vector (H5D_XFER_HYPER_VECTOR_SIZE_NAME) */
+    size_t    max_temp_buf;         /* Maximum temporary buffer size (H5D_XFER_MAX_TEMP_BUF_NAME) */
+    void *    tconv_buf;            /* Temporary conversion buffer (H5D_XFER_TCONV_BUF_NAME) */
+    void *    bkgr_buf;             /* Background conversion buffer (H5D_XFER_BKGR_BUF_NAME) */
+    H5T_bkg_t bkgr_buf_type;        /* Background buffer type (H5D_XFER_BKGR_BUF_NAME) */
+    H5Z_EDC_t err_detect;           /* Error detection info (H5D_XFER_EDC_NAME) */
+    double    btree_split_ratio[3]; /* B-tree split ratios (H5D_XFER_BTREE_SPLIT_RATIO_NAME) */
+    size_t    vec_size;             /* Size of hyperslab vector (H5D_XFER_HYPER_VECTOR_SIZE_NAME) */
 #ifdef H5_HAVE_PARALLEL
     H5FD_mpio_xfer_t xfer_mode; /* Parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */
-    H5FD_mpio_collective_opt_t coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */
-#endif /*H5_HAVE_PARALLEL*/
-    H5Z_cb_t filter_cb;         /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */
+    H5FD_mpio_collective_opt_t
+        coll_opt_mode;           /* Parallel transfer with independent IO or collective IO with this mode */
+#endif                           /*H5_HAVE_PARALLEL*/
+    H5Z_cb_t          filter_cb; /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */
     H5Z_data_xform_t *data_xform_prop; /* Data transform prop (H5D_XFER_XFORM_NAME) */
 } H5D_dxpl_cache_t;
 
 /* Typedef for cached dataset creation property list information */
 typedef struct H5D_dcpl_cache_t {
-    H5O_fill_t fill;            /* Fill value info (H5D_CRT_FILL_VALUE_NAME) */
-    H5O_pline_t pline;          /* I/O pipeline info (H5O_CRT_PIPELINE_NAME) */
-    H5O_efl_t efl;              /* External file list info (H5D_CRT_EXT_FILE_LIST_NAME) */
+    H5O_fill_t  fill;  /* Fill value info (H5D_CRT_FILL_VALUE_NAME) */
+    H5O_pline_t pline; /* I/O pipeline info (H5O_CRT_PIPELINE_NAME) */
+    H5O_efl_t   efl;   /* External file list info (H5D_CRT_EXT_FILE_LIST_NAME) */
 } H5D_dcpl_cache_t;
 
 /* Callback information for copying datasets */
 typedef struct H5D_copy_file_ud_t {
-    H5O_copy_file_ud_common_t common;   /* Shared information (must be first) */
-    struct H5S_extent_t *src_space_extent;     /* Copy of dataspace extent for dataset */
-    H5T_t *src_dtype;                   /* Copy of datatype for dataset */
+    H5O_copy_file_ud_common_t common;           /* Shared information (must be first) */
+    struct H5S_extent_t *     src_space_extent; /* Copy of dataspace extent for dataset */
+    H5T_t *                   src_dtype;        /* Copy of datatype for dataset */
 } H5D_copy_file_ud_t;
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /******************************/
 /* Library Private Prototypes */
 /******************************/
@@ -163,21 +162,19 @@ H5_DLL H5O_loc_t *H5D_oloc(H5D_t *dataset);
 H5_DLL H5G_name_t *H5D_nameof(H5D_t *dataset);
 H5_DLL H5T_t *H5D_typeof(const H5D_t *dset);
 H5_DLL herr_t H5D_flush(const H5F_t *f, hid_t dxpl_id);
-H5_DLL hid_t H5D_get_create_plist(H5D_t *dset);
-H5_DLL hid_t H5D_get_access_plist(H5D_t *dset);
-H5_DLL hid_t H5D_get_space(H5D_t *dset);
-H5_DLL hid_t H5D_get_type(H5D_t *dset);
+H5_DLL hid_t  H5D_get_create_plist(H5D_t *dset);
+H5_DLL hid_t  H5D_get_access_plist(H5D_t *dset);
+H5_DLL hid_t  H5D_get_space(H5D_t *dset);
+H5_DLL hid_t  H5D_get_type(H5D_t *dset);
 
 /* Functions that operate on vlen data */
-H5_DLL herr_t H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id,
-    void *buf);
+H5_DLL herr_t H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id, void *buf);
 
 /* Functions that operate on chunked storage */
 H5_DLL herr_t H5D_chunk_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr);
 
 /* Functions that operate on indexed storage */
-H5_DLL herr_t H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream,
-				int indent, int fwidth, unsigned ndims);
+H5_DLL herr_t H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                              unsigned ndims);
 
 #endif /* _H5Dprivate_H */
-
diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index 41bcc40..d968e67 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -28,20 +28,20 @@
 /*****************/
 
 /* Macros used to "unset" chunk cache configuration parameters */
-#define H5D_CHUNK_CACHE_NSLOTS_DEFAULT      ((size_t) -1)
-#define H5D_CHUNK_CACHE_NBYTES_DEFAULT      ((size_t) -1)
-#define H5D_CHUNK_CACHE_W0_DEFAULT          (-1.0f)
+#define H5D_CHUNK_CACHE_NSLOTS_DEFAULT ((size_t)-1)
+#define H5D_CHUNK_CACHE_NBYTES_DEFAULT ((size_t)-1)
+#define H5D_CHUNK_CACHE_W0_DEFAULT     (-1.0f)
 
 /* Property names for H5LTDdirect_chunk_write */
-#define H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_NAME	        "direct_chunk_flag"
-#define H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_NAME	"direct_chunk_filters"
-#define H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_NAME		"direct_chunk_offset"
-#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_NAME	"direct_chunk_datasize"
+#define H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_NAME     "direct_chunk_flag"
+#define H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_NAME  "direct_chunk_filters"
+#define H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_NAME   "direct_chunk_offset"
+#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_NAME "direct_chunk_datasize"
 
 /* Property names for H5LTDdirect_chunk_read */
-#define H5D_XFER_DIRECT_CHUNK_READ_FLAG_NAME        "direct_chunk_read_flag"
-#define H5D_XFER_DIRECT_CHUNK_READ_OFFSET_NAME      "direct_chunk_read_offset"
-#define H5D_XFER_DIRECT_CHUNK_READ_FILTERS_NAME      "direct_chunk_read_filters"
+#define H5D_XFER_DIRECT_CHUNK_READ_FLAG_NAME    "direct_chunk_read_flag"
+#define H5D_XFER_DIRECT_CHUNK_READ_OFFSET_NAME  "direct_chunk_read_offset"
+#define H5D_XFER_DIRECT_CHUNK_READ_FILTERS_NAME "direct_chunk_read_filters"
 
 /*******************/
 /* Public Typedefs */
@@ -49,50 +49,50 @@
 
 /* Values for the H5D_LAYOUT property */
 typedef enum H5D_layout_t {
-    H5D_LAYOUT_ERROR	= -1,
+    H5D_LAYOUT_ERROR = -1,
 
-    H5D_COMPACT		= 0,	/*raw data is very small		     */
-    H5D_CONTIGUOUS	= 1,	/*the default				     */
-    H5D_CHUNKED		= 2,	/*slow and fancy			     */
-    H5D_NLAYOUTS	= 3	/*this one must be last!		     */
+    H5D_COMPACT    = 0, /*raw data is very small		     */
+    H5D_CONTIGUOUS = 1, /*the default				     */
+    H5D_CHUNKED    = 2, /*slow and fancy			     */
+    H5D_NLAYOUTS   = 3  /*this one must be last!		     */
 } H5D_layout_t;
 
 /* Types of chunk index data structures */
 typedef enum H5D_chunk_index_t {
-    H5D_CHUNK_BTREE	= 0	/* v1 B-tree index			     */
+    H5D_CHUNK_BTREE = 0 /* v1 B-tree index			     */
 } H5D_chunk_index_t;
 
 /* Values for the space allocation time property */
 typedef enum H5D_alloc_time_t {
-    H5D_ALLOC_TIME_ERROR	= -1,
-    H5D_ALLOC_TIME_DEFAULT  	= 0,
-    H5D_ALLOC_TIME_EARLY	= 1,
-    H5D_ALLOC_TIME_LATE		= 2,
-    H5D_ALLOC_TIME_INCR		= 3
+    H5D_ALLOC_TIME_ERROR   = -1,
+    H5D_ALLOC_TIME_DEFAULT = 0,
+    H5D_ALLOC_TIME_EARLY   = 1,
+    H5D_ALLOC_TIME_LATE    = 2,
+    H5D_ALLOC_TIME_INCR    = 3
 } H5D_alloc_time_t;
 
 /* Values for the status of space allocation */
 typedef enum H5D_space_status_t {
-    H5D_SPACE_STATUS_ERROR		= -1,
-    H5D_SPACE_STATUS_NOT_ALLOCATED	= 0,
-    H5D_SPACE_STATUS_PART_ALLOCATED	= 1,
-    H5D_SPACE_STATUS_ALLOCATED		= 2
+    H5D_SPACE_STATUS_ERROR          = -1,
+    H5D_SPACE_STATUS_NOT_ALLOCATED  = 0,
+    H5D_SPACE_STATUS_PART_ALLOCATED = 1,
+    H5D_SPACE_STATUS_ALLOCATED      = 2
 } H5D_space_status_t;
 
 /* Values for time of writing fill value property */
 typedef enum H5D_fill_time_t {
-    H5D_FILL_TIME_ERROR	= -1,
+    H5D_FILL_TIME_ERROR = -1,
     H5D_FILL_TIME_ALLOC = 0,
-    H5D_FILL_TIME_NEVER	= 1,
-    H5D_FILL_TIME_IFSET	= 2
+    H5D_FILL_TIME_NEVER = 1,
+    H5D_FILL_TIME_IFSET = 2
 } H5D_fill_time_t;
 
 /* Values for fill value status */
 typedef enum H5D_fill_value_t {
-    H5D_FILL_VALUE_ERROR        =-1,
-    H5D_FILL_VALUE_UNDEFINED    =0,
-    H5D_FILL_VALUE_DEFAULT      =1,
-    H5D_FILL_VALUE_USER_DEFINED =2
+    H5D_FILL_VALUE_ERROR        = -1,
+    H5D_FILL_VALUE_UNDEFINED    = 0,
+    H5D_FILL_VALUE_DEFAULT      = 1,
+    H5D_FILL_VALUE_USER_DEFINED = 2
 } H5D_fill_value_t;
 
 /********************/
@@ -107,48 +107,43 @@ extern "C" {
 #endif
 
 /* Define the operator function pointer for H5Diterate() */
-typedef herr_t (*H5D_operator_t)(void *elem, hid_t type_id, unsigned ndim,
-				 const hsize_t *point, void *operator_data);
+typedef herr_t (*H5D_operator_t)(void *elem, hid_t type_id, unsigned ndim, const hsize_t *point,
+                                 void *operator_data);
 
 /* Define the operator function pointer for H5Dscatter() */
-typedef herr_t (*H5D_scatter_func_t)(const void **src_buf/*out*/,
-                                     size_t *src_buf_bytes_used/*out*/,
+typedef herr_t (*H5D_scatter_func_t)(const void **src_buf /*out*/, size_t *src_buf_bytes_used /*out*/,
                                      void *op_data);
 
 /* Define the operator function pointer for H5Dgather() */
-typedef herr_t (*H5D_gather_func_t)(const void *dst_buf,
-                                    size_t dst_buf_bytes_used, void *op_data);
-
-H5_DLL hid_t H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id,
-    hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id);
-H5_DLL hid_t H5Dcreate_anon(hid_t file_id, hid_t type_id, hid_t space_id,
-    hid_t plist_id, hid_t dapl_id);
-H5_DLL hid_t H5Dopen2(hid_t file_id, const char *name, hid_t dapl_id);
-H5_DLL herr_t H5Dclose(hid_t dset_id);
-H5_DLL hid_t H5Dget_space(hid_t dset_id);
-H5_DLL herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation);
-H5_DLL hid_t H5Dget_type(hid_t dset_id);
-H5_DLL hid_t H5Dget_create_plist(hid_t dset_id);
-H5_DLL hid_t H5Dget_access_plist(hid_t dset_id);
+typedef herr_t (*H5D_gather_func_t)(const void *dst_buf, size_t dst_buf_bytes_used, void *op_data);
+
+H5_DLL hid_t   H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id,
+                          hid_t dcpl_id, hid_t dapl_id);
+H5_DLL hid_t   H5Dcreate_anon(hid_t file_id, hid_t type_id, hid_t space_id, hid_t plist_id, hid_t dapl_id);
+H5_DLL hid_t   H5Dopen2(hid_t file_id, const char *name, hid_t dapl_id);
+H5_DLL herr_t  H5Dclose(hid_t dset_id);
+H5_DLL hid_t   H5Dget_space(hid_t dset_id);
+H5_DLL herr_t  H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation);
+H5_DLL hid_t   H5Dget_type(hid_t dset_id);
+H5_DLL hid_t   H5Dget_create_plist(hid_t dset_id);
+H5_DLL hid_t   H5Dget_access_plist(hid_t dset_id);
 H5_DLL hsize_t H5Dget_storage_size(hid_t dset_id);
-H5_DLL herr_t H5Dget_chunk_storage_size(hid_t dset_id, const hsize_t *offset, hsize_t *chunk_bytes);
+H5_DLL herr_t  H5Dget_chunk_storage_size(hid_t dset_id, const hsize_t *offset, hsize_t *chunk_bytes);
 H5_DLL haddr_t H5Dget_offset(hid_t dset_id);
-H5_DLL herr_t H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
-			hid_t file_space_id, hid_t plist_id, void *buf/*out*/);
-H5_DLL herr_t H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
-			 hid_t file_space_id, hid_t plist_id, const void *buf);
-H5_DLL herr_t H5Diterate(void *buf, hid_t type_id, hid_t space_id,
-            H5D_operator_t op, void *operator_data);
-H5_DLL herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
-H5_DLL herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size);
-H5_DLL herr_t H5Dfill(const void *fill, hid_t fill_type, void *buf,
-        hid_t buf_type, hid_t space);
-H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]);
-H5_DLL herr_t H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id,
-    hid_t dst_space_id, void *dst_buf);
-H5_DLL herr_t H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id,
-    size_t dst_buf_size, void *dst_buf, H5D_gather_func_t op, void *op_data);
-H5_DLL herr_t H5Ddebug(hid_t dset_id);
+H5_DLL herr_t  H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
+                       hid_t plist_id, void *buf /*out*/);
+H5_DLL herr_t  H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
+                        hid_t plist_id, const void *buf);
+H5_DLL herr_t  H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, void *operator_data);
+H5_DLL herr_t  H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
+H5_DLL herr_t  H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size);
+H5_DLL herr_t  H5Dfill(const void *fill, hid_t fill_type, void *buf, hid_t buf_type, hid_t space);
+H5_DLL herr_t  H5Dset_extent(hid_t dset_id, const hsize_t size[]);
+H5_DLL herr_t  H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, hid_t dst_space_id,
+                          void *dst_buf);
+H5_DLL herr_t  H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id, size_t dst_buf_size,
+                         void *dst_buf, H5D_gather_func_t op, void *op_data);
+H5_DLL herr_t  H5Ddebug(hid_t dset_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
@@ -158,14 +153,11 @@ H5_DLL herr_t H5Ddebug(hid_t dset_id);
 
 /* Macros */
 
-
 /* Typedefs */
 
-
 /* Function prototypes */
-H5_DLL hid_t H5Dcreate1(hid_t file_id, const char *name, hid_t type_id,
-    hid_t space_id, hid_t dcpl_id);
-H5_DLL hid_t H5Dopen1(hid_t file_id, const char *name);
+H5_DLL hid_t  H5Dcreate1(hid_t file_id, const char *name, hid_t type_id, hid_t space_id, hid_t dcpl_id);
+H5_DLL hid_t  H5Dopen1(hid_t file_id, const char *name);
 H5_DLL herr_t H5Dextend(hid_t dset_id, const hsize_t size[]);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c
index 8b58f62..7450100 100644
--- a/src/H5Dscatgath.c
+++ b/src/H5Dscatgath.c
@@ -15,52 +15,43 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs                                  */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Dataset functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs                                  */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5D__scatter_file(const H5D_io_info_t *io_info,
-    const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts,
-    const void *buf);
-static size_t H5D__gather_file(const H5D_io_info_t *io_info,
-    const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts,
-    void *buf);
-static size_t H5D__gather_mem(const void *_buf,
-    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
-    const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf/*out*/);
-static herr_t H5D__compound_opt_read(size_t nelmts, const H5S_t *mem_space,
-    H5S_sel_iter_t *iter, const H5D_dxpl_cache_t *dxpl_cache,
-    const H5D_type_info_t *type_info, void *user_buf/*out*/);
+static herr_t H5D__scatter_file(const H5D_io_info_t *io_info, const H5S_t *file_space,
+                                H5S_sel_iter_t *file_iter, size_t nelmts, const void *buf);
+static size_t H5D__gather_file(const H5D_io_info_t *io_info, const H5S_t *file_space,
+                               H5S_sel_iter_t *file_iter, size_t nelmts, void *buf);
+static size_t H5D__gather_mem(const void *_buf, const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
+                              const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf /*out*/);
+static herr_t H5D__compound_opt_read(size_t nelmts, const H5S_t *mem_space, H5S_sel_iter_t *iter,
+                                     const H5D_dxpl_cache_t *dxpl_cache, const H5D_type_info_t *type_info,
+                                     void *user_buf /*out*/);
 static herr_t H5D__compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -71,8 +62,6 @@ H5FL_SEQ_EXTERN(size_t);
 /* Declare a free list to manage sequences of hsize_t */
 H5FL_SEQ_EXTERN(hsize_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__scatter_file
  *
@@ -90,22 +79,21 @@ H5FL_SEQ_EXTERN(hsize_t);
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__scatter_file(const H5D_io_info_t *_io_info,
-    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
-    const void *_buf)
+H5D__scatter_file(const H5D_io_info_t *_io_info, const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
+                  const void *_buf)
 {
-    H5D_io_info_t tmp_io_info;     /* Temporary I/O info object */
-    hsize_t _off[H5D_IO_VECTOR_SIZE];             /* Array to store sequence offsets */
-    hsize_t *off = NULL;           /* Pointer to sequence offsets */
-    hsize_t mem_off;               /* Offset in memory */
-    size_t mem_curr_seq;           /* "Current sequence" in memory */
-    size_t dset_curr_seq;          /* "Current sequence" in dataset */
-    size_t _len[H5D_IO_VECTOR_SIZE];              /* Array to store sequence lengths */
-    size_t *len = NULL;            /* Array to store sequence lengths */
-    size_t orig_mem_len, mem_len;  /* Length of sequence in memory */
-    size_t  nseq;                  /* Number of sequences generated */
-    size_t  nelem;                 /* Number of elements used in sequences */
-    herr_t  ret_value = SUCCEED;   /* Return value */
+    H5D_io_info_t tmp_io_info;              /* Temporary I/O info object */
+    hsize_t       _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */
+    hsize_t *     off = NULL;               /* Pointer to sequence offsets */
+    hsize_t       mem_off;                  /* Offset in memory */
+    size_t        mem_curr_seq;             /* "Current sequence" in memory */
+    size_t        dset_curr_seq;            /* "Current sequence" in dataset */
+    size_t        _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */
+    size_t *      len = NULL;               /* Array to store sequence lengths */
+    size_t        orig_mem_len, mem_len;    /* Length of sequence in memory */
+    size_t        nseq;                     /* Number of sequences generated */
+    size_t        nelem;                    /* Number of elements used in sequences */
+    herr_t        ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -119,13 +107,13 @@ H5D__scatter_file(const H5D_io_info_t *_io_info,
     /* Set up temporary I/O info object */
     HDmemcpy(&tmp_io_info, _io_info, sizeof(*_io_info));
     tmp_io_info.op_type = H5D_IO_OP_WRITE;
-    tmp_io_info.u.wbuf = _buf;
+    tmp_io_info.u.wbuf  = _buf;
 
     /* Allocate the vector I/O arrays */
-    if(tmp_io_info.dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, tmp_io_info.dxpl_cache->vec_size)))
+    if (tmp_io_info.dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
+        if (NULL == (len = H5FL_SEQ_MALLOC(size_t, tmp_io_info.dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, tmp_io_info.dxpl_cache->vec_size)))
+        if (NULL == (off = H5FL_SEQ_MALLOC(hsize_t, tmp_io_info.dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
     } /* end if */
     else {
@@ -134,19 +122,20 @@ H5D__scatter_file(const H5D_io_info_t *_io_info,
     } /* end else */
 
     /* Loop until all elements are written */
-    while(nelmts > 0) {
+    while (nelmts > 0) {
         /* Get list of sequences for selection to write */
-        if(H5S_SELECT_GET_SEQ_LIST(space, H5S_GET_SEQ_LIST_SORTED, iter, tmp_io_info.dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) < 0)
+        if (H5S_SELECT_GET_SEQ_LIST(space, H5S_GET_SEQ_LIST_SORTED, iter, tmp_io_info.dxpl_cache->vec_size,
+                                    nelmts, &nseq, &nelem, off, len) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
 
         /* Reset the current sequence information */
         mem_curr_seq = dset_curr_seq = 0;
         orig_mem_len = mem_len = nelem * iter->elmt_size;
-        mem_off = 0;
+        mem_off                = 0;
 
         /* Write sequence list out */
-        if((*tmp_io_info.layout_ops.writevv)(&tmp_io_info, nseq, &dset_curr_seq,
-                len, off, (size_t)1, &mem_curr_seq, &mem_len, &mem_off) < 0)
+        if ((*tmp_io_info.layout_ops.writevv)(&tmp_io_info, nseq, &dset_curr_seq, len, off, (size_t)1,
+                                              &mem_curr_seq, &mem_len, &mem_off) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
 
         /* Update buffer */
@@ -158,15 +147,14 @@ H5D__scatter_file(const H5D_io_info_t *_io_info,
 
 done:
     /* Release resources, if allocated */
-    if(len && len != _len)
+    if (len && len != _len)
         len = H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
+    if (off && off != _off)
         off = H5FL_SEQ_FREE(hsize_t, off);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__scatter_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__gather_file
  *
@@ -189,22 +177,21 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5D__gather_file(const H5D_io_info_t *_io_info,
-    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
-    void *_buf/*out*/)
+H5D__gather_file(const H5D_io_info_t *_io_info, const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
+                 void *_buf /*out*/)
 {
-    H5D_io_info_t tmp_io_info;  /* Temporary I/O info object */
-    hsize_t _off[H5D_IO_VECTOR_SIZE];   /* Array to store sequence offsets */
-    hsize_t *off = NULL;        /* Pointer to sequence offsets */
-    hsize_t mem_off;            /* Offset in memory */
-    size_t mem_curr_seq;        /* "Current sequence" in memory */
-    size_t dset_curr_seq;       /* "Current sequence" in dataset */
-    size_t _len[H5D_IO_VECTOR_SIZE];    /* Array to store sequence lengths */
-    size_t *len = NULL;         /* Pointer to sequence lengths */
-    size_t orig_mem_len, mem_len;       /* Length of sequence in memory */
-    size_t nseq;                /* Number of sequences generated */
-    size_t nelem;               /* Number of elements used in sequences */
-    size_t ret_value = nelmts;  /* Return value */
+    H5D_io_info_t tmp_io_info;              /* Temporary I/O info object */
+    hsize_t       _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */
+    hsize_t *     off = NULL;               /* Pointer to sequence offsets */
+    hsize_t       mem_off;                  /* Offset in memory */
+    size_t        mem_curr_seq;             /* "Current sequence" in memory */
+    size_t        dset_curr_seq;            /* "Current sequence" in dataset */
+    size_t        _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */
+    size_t *      len = NULL;               /* Pointer to sequence lengths */
+    size_t        orig_mem_len, mem_len;    /* Length of sequence in memory */
+    size_t        nseq;                     /* Number of sequences generated */
+    size_t        nelem;                    /* Number of elements used in sequences */
+    size_t        ret_value = nelmts;       /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -220,13 +207,13 @@ H5D__gather_file(const H5D_io_info_t *_io_info,
     /* Set up temporary I/O info object */
     HDmemcpy(&tmp_io_info, _io_info, sizeof(*_io_info));
     tmp_io_info.op_type = H5D_IO_OP_READ;
-    tmp_io_info.u.rbuf = _buf;
+    tmp_io_info.u.rbuf  = _buf;
 
     /* Allocate the vector I/O arrays */
-    if(tmp_io_info.dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, tmp_io_info.dxpl_cache->vec_size)))
+    if (tmp_io_info.dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
+        if (NULL == (len = H5FL_SEQ_MALLOC(size_t, tmp_io_info.dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, tmp_io_info.dxpl_cache->vec_size)))
+        if (NULL == (off = H5FL_SEQ_MALLOC(hsize_t, tmp_io_info.dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O offset vector array")
     } /* end if */
     else {
@@ -235,19 +222,20 @@ H5D__gather_file(const H5D_io_info_t *_io_info,
     } /* end else */
 
     /* Loop until all elements are read */
-    while(nelmts > 0) {
+    while (nelmts > 0) {
         /* Get list of sequences for selection to read */
-        if(H5S_SELECT_GET_SEQ_LIST(space, H5S_GET_SEQ_LIST_SORTED, iter, tmp_io_info.dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) < 0)
+        if (H5S_SELECT_GET_SEQ_LIST(space, H5S_GET_SEQ_LIST_SORTED, iter, tmp_io_info.dxpl_cache->vec_size,
+                                    nelmts, &nseq, &nelem, off, len) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
 
         /* Reset the current sequence information */
         mem_curr_seq = dset_curr_seq = 0;
         orig_mem_len = mem_len = nelem * iter->elmt_size;
-        mem_off = 0;
+        mem_off                = 0;
 
         /* Read sequence list in */
-        if((*tmp_io_info.layout_ops.readvv)(&tmp_io_info, nseq, &dset_curr_seq,
-                len, off, (size_t)1, &mem_curr_seq, &mem_len, &mem_off) < 0)
+        if ((*tmp_io_info.layout_ops.readvv)(&tmp_io_info, nseq, &dset_curr_seq, len, off, (size_t)1,
+                                             &mem_curr_seq, &mem_len, &mem_off) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, 0, "read error")
 
         /* Update buffer */
@@ -259,15 +247,14 @@ H5D__gather_file(const H5D_io_info_t *_io_info,
 
 done:
     /* Release resources, if allocated */
-    if(len && len != _len)
+    if (len && len != _len)
         len = H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
+    if (off && off != _off)
         off = H5FL_SEQ_FREE(hsize_t, off);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__gather_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__scatter_mem
  *
@@ -284,21 +271,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__scatter_mem (const void *_tscat_buf, const H5S_t *space,
-    H5S_sel_iter_t *iter, size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache,
-    void *_buf/*out*/)
+H5D__scatter_mem(const void *_tscat_buf, const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
+                 const H5D_dxpl_cache_t *dxpl_cache, void *_buf /*out*/)
 {
-    uint8_t *buf = (uint8_t *)_buf;   /* Get local copies for address arithmetic */
+    uint8_t *      buf       = (uint8_t *)_buf; /* Get local copies for address arithmetic */
     const uint8_t *tscat_buf = (const uint8_t *)_tscat_buf;
-    hsize_t _off[H5D_IO_VECTOR_SIZE];          /* Array to store sequence offsets */
-    hsize_t *off = NULL;          /* Pointer to sequence offsets */
-    size_t _len[H5D_IO_VECTOR_SIZE];           /* Array to store sequence lengths */
-    size_t *len = NULL;           /* Pointer to sequence lengths */
-    size_t curr_len;            /* Length of bytes left to process in sequence */
-    size_t nseq;                /* Number of sequences generated */
-    size_t curr_seq;            /* Current sequence being processed */
-    size_t nelem;               /* Number of elements used in sequences */
-    herr_t ret_value = SUCCEED;   /* Number of elements scattered */
+    hsize_t        _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */
+    hsize_t *      off = NULL;               /* Pointer to sequence offsets */
+    size_t         _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */
+    size_t *       len = NULL;               /* Pointer to sequence lengths */
+    size_t         curr_len;                 /* Length of bytes left to process in sequence */
+    size_t         nseq;                     /* Number of sequences generated */
+    size_t         curr_seq;                 /* Current sequence being processed */
+    size_t         nelem;                    /* Number of elements used in sequences */
+    herr_t         ret_value = SUCCEED;      /* Number of elements scattered */
 
     FUNC_ENTER_PACKAGE
 
@@ -310,10 +296,10 @@ H5D__scatter_mem (const void *_tscat_buf, const H5S_t *space,
     HDassert(buf);
 
     /* Allocate the vector I/O arrays */
-    if(dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
+    if (dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
+        if (NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
+        if (NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
     } /* end if */
     else {
@@ -322,13 +308,14 @@ H5D__scatter_mem (const void *_tscat_buf, const H5S_t *space,
     } /* end else */
 
     /* Loop until all elements are written */
-    while(nelmts > 0) {
+    while (nelmts > 0) {
         /* Get list of sequences for selection to write */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) < 0)
-            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
+        if (H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) <
+            0)
+            HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
 
         /* Loop, while sequences left to process */
-        for(curr_seq = 0; curr_seq < nseq; curr_seq++) {
+        for (curr_seq = 0; curr_seq < nseq; curr_seq++) {
             /* Get the number of bytes in sequence */
             curr_len = len[curr_seq];
 
@@ -344,15 +331,14 @@ H5D__scatter_mem (const void *_tscat_buf, const H5S_t *space,
 
 done:
     /* Release resources, if allocated */
-    if(len && len != _len)
+    if (len && len != _len)
         len = H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
+    if (off && off != _off)
         off = H5FL_SEQ_FREE(hsize_t, off);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D__scatter_mem() */
+} /* H5D__scatter_mem() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__gather_mem
  *
@@ -371,21 +357,20 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5D__gather_mem(const void *_buf, const H5S_t *space,
-    H5S_sel_iter_t *iter, size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache,
-    void *_tgath_buf/*out*/)
+H5D__gather_mem(const void *_buf, const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
+                const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf /*out*/)
 {
-    const uint8_t *buf = (const uint8_t *)_buf;   /* Get local copies for address arithmetic */
-    uint8_t *tgath_buf = (uint8_t *)_tgath_buf;
-    hsize_t _off[H5D_IO_VECTOR_SIZE];          /* Array to store sequence offsets */
-    hsize_t *off = NULL;          /* Pointer to sequence offsets */
-    size_t _len[H5D_IO_VECTOR_SIZE];           /* Array to store sequence lengths */
-    size_t *len = NULL;           /* Pointer to sequence lengths */
-    size_t curr_len;            /* Length of bytes left to process in sequence */
-    size_t nseq;                /* Number of sequences generated */
-    size_t curr_seq;            /* Current sequence being processed */
-    size_t nelem;               /* Number of elements used in sequences */
-    size_t ret_value = nelmts;    /* Number of elements gathered */
+    const uint8_t *buf       = (const uint8_t *)_buf; /* Get local copies for address arithmetic */
+    uint8_t *      tgath_buf = (uint8_t *)_tgath_buf;
+    hsize_t        _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */
+    hsize_t *      off = NULL;               /* Pointer to sequence offsets */
+    size_t         _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */
+    size_t *       len = NULL;               /* Pointer to sequence lengths */
+    size_t         curr_len;                 /* Length of bytes left to process in sequence */
+    size_t         nseq;                     /* Number of sequences generated */
+    size_t         curr_seq;                 /* Current sequence being processed */
+    size_t         nelem;                    /* Number of elements used in sequences */
+    size_t         ret_value = nelmts;       /* Number of elements gathered */
 
     FUNC_ENTER_STATIC
 
@@ -397,10 +382,10 @@ H5D__gather_mem(const void *_buf, const H5S_t *space,
     HDassert(tgath_buf);
 
     /* Allocate the vector I/O arrays */
-    if(dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
+    if (dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
+        if (NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
+        if (NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O offset vector array")
     } /* end if */
     else {
@@ -409,13 +394,14 @@ H5D__gather_mem(const void *_buf, const H5S_t *space,
     } /* end else */
 
     /* Loop until all elements are written */
-    while(nelmts > 0) {
+    while (nelmts > 0) {
         /* Get list of sequences for selection to write */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) < 0)
-            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
+        if (H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) <
+            0)
+            HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
 
         /* Loop, while sequences left to process */
-        for(curr_seq = 0; curr_seq < nseq; curr_seq++) {
+        for (curr_seq = 0; curr_seq < nseq; curr_seq++) {
             /* Get the number of bytes in sequence */
             curr_len = len[curr_seq];
 
@@ -431,15 +417,14 @@ H5D__gather_mem(const void *_buf, const H5S_t *space,
 
 done:
     /* Release resources, if allocated */
-    if(len && len != _len)
+    if (len && len != _len)
         len = H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
+    if (off && off != _off)
         off = H5FL_SEQ_FREE(hsize_t, off);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D__gather_mem() */
+} /* H5D__gather_mem() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__scatgath_read
  *
@@ -453,20 +438,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
+H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                   const H5S_t *file_space, const H5S_t *mem_space)
 {
-    const H5D_dxpl_cache_t *dxpl_cache = io_info->dxpl_cache;     /* Local pointer to dataset transfer info */
-    void        *buf = io_info->u.rbuf; /* Local pointer to application buffer */
-    H5S_sel_iter_t mem_iter;            /*memory selection iteration info*/
-    hbool_t	mem_iter_init = FALSE;	/*memory selection iteration info has been initialized */
-    H5S_sel_iter_t bkg_iter;            /*background iteration info*/
-    hbool_t	bkg_iter_init = FALSE;	/*background iteration info has been initialized */
-    H5S_sel_iter_t file_iter;           /*file selection iteration info*/
-    hbool_t	file_iter_init = FALSE;	/*file selection iteration info has been initialized */
-    hsize_t	smine_start;		/*strip mine start loc	*/
-    size_t	smine_nelmts;		/*elements per strip	*/
-    herr_t	ret_value = SUCCEED;	/*return value		*/
+    const H5D_dxpl_cache_t *dxpl_cache = io_info->dxpl_cache; /* Local pointer to dataset transfer info */
+    void *                  buf        = io_info->u.rbuf;     /* Local pointer to application buffer */
+    H5S_sel_iter_t          mem_iter;                         /*memory selection iteration info*/
+    hbool_t                 mem_iter_init = FALSE;  /*memory selection iteration info has been initialized */
+    H5S_sel_iter_t          bkg_iter;               /*background iteration info*/
+    hbool_t                 bkg_iter_init = FALSE;  /*background iteration info has been initialized */
+    H5S_sel_iter_t          file_iter;              /*file selection iteration info*/
+    hbool_t                 file_iter_init = FALSE; /*file selection iteration info has been initialized */
+    hsize_t                 smine_start;            /*strip mine start loc	*/
+    size_t                  smine_nelmts;           /*elements per strip	*/
+    herr_t                  ret_value = SUCCEED;    /*return value		*/
 
     FUNC_ENTER_PACKAGE
 
@@ -478,23 +463,23 @@ H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
     HDassert(buf);
 
     /* Check for NOOP read */
-    if(nelmts == 0)
+    if (nelmts == 0)
         HGOTO_DONE(SUCCEED)
 
     /* Figure out the strip mine size. */
-    if(H5S_select_iter_init(&file_iter, file_space, type_info->src_type_size) < 0)
+    if (H5S_select_iter_init(&file_iter, file_space, type_info->src_type_size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file selection information")
-    file_iter_init = TRUE;	/*file selection iteration info has been initialized */
-    if(H5S_select_iter_init(&mem_iter, mem_space, type_info->dst_type_size) < 0)
+    file_iter_init = TRUE; /*file selection iteration info has been initialized */
+    if (H5S_select_iter_init(&mem_iter, mem_space, type_info->dst_type_size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
-    mem_iter_init = TRUE;	/*file selection iteration info has been initialized */
-    if(H5S_select_iter_init(&bkg_iter, mem_space, type_info->dst_type_size) < 0)
+    mem_iter_init = TRUE; /*file selection iteration info has been initialized */
+    if (H5S_select_iter_init(&bkg_iter, mem_space, type_info->dst_type_size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize background selection information")
-    bkg_iter_init = TRUE;	/*file selection iteration info has been initialized */
+    bkg_iter_init = TRUE; /*file selection iteration info has been initialized */
 
     /* Start strip mining... */
-    for(smine_start = 0; smine_start < nelmts; smine_start += smine_nelmts) {
-        size_t n;               /* Elements operated on */
+    for (smine_start = 0; smine_start < nelmts; smine_start += smine_nelmts) {
+        size_t n; /* Elements operated on */
 
         /* Go figure out how many elements to read from the file */
         HDassert(H5S_SELECT_ITER_NELMTS(&file_iter) == (nelmts - smine_start));
@@ -506,72 +491,71 @@ H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
          * if necessary.
          */
 
-	/*
+        /*
          * Gather data
          */
-        n = H5D__gather_file(io_info, file_space, &file_iter, smine_nelmts,
-                type_info->tconv_buf/*out*/);
-	if(n != smine_nelmts)
+        n = H5D__gather_file(io_info, file_space, &file_iter, smine_nelmts, type_info->tconv_buf /*out*/);
+        if (n != smine_nelmts)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed")
 
         /* If the source and destination are compound types and subset of each other
          * and no conversion is needed, copy the data directly into user's buffer and
          * bypass the rest of steps.
          */
-        if(type_info->cmpd_subset && H5T_SUBSET_FALSE != type_info->cmpd_subset->subset) {
-            if(H5D__compound_opt_read(smine_nelmts, mem_space, &mem_iter, dxpl_cache,
-                    type_info, buf /*out*/) < 0)
+        if (type_info->cmpd_subset && H5T_SUBSET_FALSE != type_info->cmpd_subset->subset) {
+            if (H5D__compound_opt_read(smine_nelmts, mem_space, &mem_iter, dxpl_cache, type_info,
+                                       buf /*out*/) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
         } /* end if */
         else {
-            if(H5T_BKG_YES == type_info->need_bkg) {
-                n = H5D__gather_mem(buf, mem_space, &bkg_iter, smine_nelmts,
-                        dxpl_cache, type_info->bkg_buf/*out*/);
-                if(n != smine_nelmts)
+            if (H5T_BKG_YES == type_info->need_bkg) {
+                n = H5D__gather_mem(buf, mem_space, &bkg_iter, smine_nelmts, dxpl_cache,
+                                    type_info->bkg_buf /*out*/);
+                if (n != smine_nelmts)
                     HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "mem gather failed")
             } /* end if */
 
             /*
              * Perform datatype conversion.
              */
-            if(H5T_convert(type_info->tpath, type_info->src_type_id, type_info->dst_type_id,
-                    smine_nelmts, (size_t)0, (size_t)0, type_info->tconv_buf,
-                    type_info->bkg_buf, io_info->dxpl_id) < 0)
+            if (H5T_convert(type_info->tpath, type_info->src_type_id, type_info->dst_type_id, smine_nelmts,
+                            (size_t)0, (size_t)0, type_info->tconv_buf, type_info->bkg_buf,
+                            io_info->dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
 
             /* Do the data transform after the conversion (since we're using type mem_type) */
-            if(!type_info->is_xform_noop)
-                if(H5Z_xform_eval(dxpl_cache->data_xform_prop, type_info->tconv_buf, smine_nelmts, type_info->mem_type) < 0)
+            if (!type_info->is_xform_noop)
+                if (H5Z_xform_eval(dxpl_cache->data_xform_prop, type_info->tconv_buf, smine_nelmts,
+                                   type_info->mem_type) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
 
             /*
              * Scatter the data into memory.
              */
-            if(H5D__scatter_mem(type_info->tconv_buf, mem_space, &mem_iter,
-                    smine_nelmts, dxpl_cache, buf/*out*/) < 0)
+            if (H5D__scatter_mem(type_info->tconv_buf, mem_space, &mem_iter, smine_nelmts, dxpl_cache,
+                                 buf /*out*/) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "scatter failed")
         } /* end else */
-    } /* end for */
+    }     /* end for */
 
 done:
     /* Release selection iterators */
-    if(file_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+    if (file_iter_init) {
+        if (H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
-    if(mem_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+    if (mem_iter_init) {
+        if (H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
-    if(bkg_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
+    if (bkg_iter_init) {
+        if (H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__scatgath_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__scatgath_write
  *
@@ -585,20 +569,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
+H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                    const H5S_t *file_space, const H5S_t *mem_space)
 {
-    const H5D_dxpl_cache_t *dxpl_cache = io_info->dxpl_cache;     /* Local pointer to dataset transfer info */
-    const void  *buf = io_info->u.wbuf; /* Local pointer to application buffer */
-    H5S_sel_iter_t mem_iter;            /*memory selection iteration info*/
-    hbool_t	mem_iter_init = FALSE;	/*memory selection iteration info has been initialized */
-    H5S_sel_iter_t bkg_iter;            /*background iteration info*/
-    hbool_t	bkg_iter_init = FALSE;	/*background iteration info has been initialized */
-    H5S_sel_iter_t file_iter;           /*file selection iteration info*/
-    hbool_t	file_iter_init = FALSE;	/*file selection iteration info has been initialized */
-    hsize_t	smine_start;		/*strip mine start loc	*/
-    size_t	smine_nelmts;		/*elements per strip	*/
-    herr_t	ret_value = SUCCEED;	/*return value		*/
+    const H5D_dxpl_cache_t *dxpl_cache = io_info->dxpl_cache; /* Local pointer to dataset transfer info */
+    const void *            buf        = io_info->u.wbuf;     /* Local pointer to application buffer */
+    H5S_sel_iter_t          mem_iter;                         /*memory selection iteration info*/
+    hbool_t                 mem_iter_init = FALSE;  /*memory selection iteration info has been initialized */
+    H5S_sel_iter_t          bkg_iter;               /*background iteration info*/
+    hbool_t                 bkg_iter_init = FALSE;  /*background iteration info has been initialized */
+    H5S_sel_iter_t          file_iter;              /*file selection iteration info*/
+    hbool_t                 file_iter_init = FALSE; /*file selection iteration info has been initialized */
+    hsize_t                 smine_start;            /*strip mine start loc	*/
+    size_t                  smine_nelmts;           /*elements per strip	*/
+    herr_t                  ret_value = SUCCEED;    /*return value		*/
 
     FUNC_ENTER_PACKAGE
 
@@ -610,23 +594,23 @@ H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_in
     HDassert(buf);
 
     /* Check for NOOP write */
-    if(nelmts == 0)
+    if (nelmts == 0)
         HGOTO_DONE(SUCCEED)
 
     /* Figure out the strip mine size. */
-    if(H5S_select_iter_init(&file_iter, file_space, type_info->dst_type_size) < 0)
+    if (H5S_select_iter_init(&file_iter, file_space, type_info->dst_type_size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file selection information")
-    file_iter_init = TRUE;	/*file selection iteration info has been initialized */
-    if(H5S_select_iter_init(&mem_iter, mem_space, type_info->src_type_size) < 0)
+    file_iter_init = TRUE; /*file selection iteration info has been initialized */
+    if (H5S_select_iter_init(&mem_iter, mem_space, type_info->src_type_size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
-    mem_iter_init = TRUE;	/*file selection iteration info has been initialized */
-    if(H5S_select_iter_init(&bkg_iter, file_space, type_info->dst_type_size) < 0)
+    mem_iter_init = TRUE; /*file selection iteration info has been initialized */
+    if (H5S_select_iter_init(&bkg_iter, file_space, type_info->dst_type_size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize background selection information")
-    bkg_iter_init = TRUE;	/*file selection iteration info has been initialized */
+    bkg_iter_init = TRUE; /*file selection iteration info has been initialized */
 
     /* Start strip mining... */
-    for(smine_start = 0; smine_start < nelmts; smine_start += smine_nelmts) {
-        size_t n;               /* Elements operated on */
+    for (smine_start = 0; smine_start < nelmts; smine_start += smine_nelmts) {
+        size_t n; /* Elements operated on */
 
         /* Go figure out how many elements to read from the file */
         HDassert(H5S_SELECT_ITER_NELMTS(&file_iter) == (nelmts - smine_start));
@@ -637,9 +621,9 @@ H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_in
          * buffer. Also gather data from the file into the background buffer
          * if necessary.
          */
-        n = H5D__gather_mem(buf, mem_space, &mem_iter, smine_nelmts,
-                dxpl_cache, type_info->tconv_buf/*out*/);
-        if(n != smine_nelmts)
+        n = H5D__gather_mem(buf, mem_space, &mem_iter, smine_nelmts, dxpl_cache,
+                            type_info->tconv_buf /*out*/);
+        if (n != smine_nelmts)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "mem gather failed")
 
         /* If the source and destination are compound types and the destination is
@@ -648,61 +632,60 @@ H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_in
          * is a subset of the destination, the optimization is done in conversion
          * function H5T_conv_struct_opt to protect the background data.
          */
-        if(type_info->cmpd_subset && H5T_SUBSET_DST == type_info->cmpd_subset->subset
-                && type_info->dst_type_size == type_info->cmpd_subset->copy_size) {
-            if(H5D__compound_opt_write(smine_nelmts, type_info) < 0)
+        if (type_info->cmpd_subset && H5T_SUBSET_DST == type_info->cmpd_subset->subset &&
+            type_info->dst_type_size == type_info->cmpd_subset->copy_size) {
+            if (H5D__compound_opt_write(smine_nelmts, type_info) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
         } /* end if */
         else {
-            if(H5T_BKG_YES == type_info->need_bkg) {
+            if (H5T_BKG_YES == type_info->need_bkg) {
                 n = H5D__gather_file(io_info, file_space, &bkg_iter, smine_nelmts,
-                        type_info->bkg_buf/*out*/);
-                if(n != smine_nelmts)
+                                     type_info->bkg_buf /*out*/);
+                if (n != smine_nelmts)
                     HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed")
             } /* end if */
 
             /* Do the data transform before the type conversion (since
              * transforms must be done in the memory type). */
-            if(!type_info->is_xform_noop)
-	        if(H5Z_xform_eval(dxpl_cache->data_xform_prop, type_info->tconv_buf, smine_nelmts, type_info->mem_type) < 0)
-		    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
+            if (!type_info->is_xform_noop)
+                if (H5Z_xform_eval(dxpl_cache->data_xform_prop, type_info->tconv_buf, smine_nelmts,
+                                   type_info->mem_type) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
 
             /*
              * Perform datatype conversion.
              */
-            if(H5T_convert(type_info->tpath, type_info->src_type_id, type_info->dst_type_id,
-                    smine_nelmts, (size_t)0, (size_t)0, type_info->tconv_buf,
-                    type_info->bkg_buf, io_info->dxpl_id) < 0)
-                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
+            if (H5T_convert(type_info->tpath, type_info->src_type_id, type_info->dst_type_id, smine_nelmts,
+                            (size_t)0, (size_t)0, type_info->tconv_buf, type_info->bkg_buf,
+                            io_info->dxpl_id) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
         } /* end else */
 
         /*
          * Scatter the data out to the file.
          */
-        if(H5D__scatter_file(io_info, file_space, &file_iter, smine_nelmts,
-                type_info->tconv_buf) < 0)
+        if (H5D__scatter_file(io_info, file_space, &file_iter, smine_nelmts, type_info->tconv_buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "scatter failed")
     } /* end for */
 
 done:
     /* Release selection iterators */
-    if(file_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+    if (file_iter_init) {
+        if (H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
-    if(mem_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+    if (mem_iter_init) {
+        if (H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
-    if(bkg_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
+    if (bkg_iter_init) {
+        if (H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__scatgath_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__compound_opt_read
  *
@@ -736,18 +719,18 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__compound_opt_read(size_t nelmts, const H5S_t *space,
-    H5S_sel_iter_t *iter, const H5D_dxpl_cache_t *dxpl_cache,
-    const H5D_type_info_t *type_info, void *user_buf/*out*/)
+H5D__compound_opt_read(size_t nelmts, const H5S_t *space, H5S_sel_iter_t *iter,
+                       const H5D_dxpl_cache_t *dxpl_cache, const H5D_type_info_t *type_info,
+                       void *user_buf /*out*/)
 {
-    uint8_t    *ubuf = (uint8_t *)user_buf;     /* Cast for pointer arithmetic	*/
-    uint8_t    *xdbuf;                          /* Pointer into dataset buffer */
-    hsize_t    _off[H5D_IO_VECTOR_SIZE];        /* Array to store sequence offsets */
-    hsize_t    *off = NULL;                     /* Pointer to sequence offsets */
-    size_t     _len[H5D_IO_VECTOR_SIZE];        /* Array to store sequence lengths */
-    size_t     *len = NULL;                     /* Pointer to sequence lengths */
-    size_t     src_stride, dst_stride, copy_size;
-    herr_t     ret_value = SUCCEED;	       /*return value		*/
+    uint8_t *ubuf = (uint8_t *)user_buf; /* Cast for pointer arithmetic	*/
+    uint8_t *xdbuf;                      /* Pointer into dataset buffer */
+    hsize_t  _off[H5D_IO_VECTOR_SIZE];   /* Array to store sequence offsets */
+    hsize_t *off = NULL;                 /* Pointer to sequence offsets */
+    size_t   _len[H5D_IO_VECTOR_SIZE];   /* Array to store sequence lengths */
+    size_t * len = NULL;                 /* Pointer to sequence lengths */
+    size_t   src_stride, dst_stride, copy_size;
+    herr_t   ret_value = SUCCEED; /*return value		*/
 
     FUNC_ENTER_STATIC
 
@@ -759,14 +742,14 @@ H5D__compound_opt_read(size_t nelmts, const H5S_t *space,
     HDassert(type_info);
     HDassert(type_info->cmpd_subset);
     HDassert(H5T_SUBSET_SRC == type_info->cmpd_subset->subset ||
-        H5T_SUBSET_DST == type_info->cmpd_subset->subset);
+             H5T_SUBSET_DST == type_info->cmpd_subset->subset);
     HDassert(user_buf);
 
     /* Allocate the vector I/O arrays */
-    if(dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
+    if (dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
+        if (NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
+        if (NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
     } /* end if */
     else {
@@ -783,22 +766,23 @@ H5D__compound_opt_read(size_t nelmts, const H5S_t *space,
 
     /* Loop until all elements are written */
     xdbuf = type_info->tconv_buf;
-    while(nelmts > 0) {
-        size_t     nseq;                /* Number of sequences generated */
-        size_t     curr_seq;            /* Current sequence being processed */
-        size_t     elmtno;		/* Element counter */
+    while (nelmts > 0) {
+        size_t nseq;     /* Number of sequences generated */
+        size_t curr_seq; /* Current sequence being processed */
+        size_t elmtno;   /* Element counter */
 
         /* Get list of sequences for selection to write */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &elmtno, off, len) < 0)
+        if (H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &elmtno, off, len) <
+            0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
 
         /* Loop, while sequences left to process */
-        for(curr_seq = 0; curr_seq < nseq; curr_seq++) {
-            size_t     curr_off;        /* Offset of bytes left to process in sequence */
-            size_t     curr_len;        /* Length of bytes left to process in sequence */
-            size_t     curr_nelmts;	/* Number of elements to process in sequence   */
-            uint8_t    *xubuf;
-            size_t     i;               /* Local index variable */
+        for (curr_seq = 0; curr_seq < nseq; curr_seq++) {
+            size_t   curr_off;    /* Offset of bytes left to process in sequence */
+            size_t   curr_len;    /* Length of bytes left to process in sequence */
+            size_t   curr_nelmts; /* Number of elements to process in sequence   */
+            uint8_t *xubuf;
+            size_t   i; /* Local index variable */
 
             /* Get the number of bytes and offset in sequence */
             curr_len = len[curr_seq];
@@ -807,17 +791,17 @@ H5D__compound_opt_read(size_t nelmts, const H5S_t *space,
 
             /* Decide the number of elements and position in the buffer. */
             curr_nelmts = curr_len / dst_stride;
-            xubuf = ubuf + curr_off;
+            xubuf       = ubuf + curr_off;
 
             /* Copy the data into the right place. */
-            for(i = 0; i < curr_nelmts; i++) {
+            for (i = 0; i < curr_nelmts; i++) {
                 HDmemmove(xubuf, xdbuf, copy_size);
 
                 /* Update pointers */
                 xdbuf += src_stride;
                 xubuf += dst_stride;
             } /* end for */
-        } /* end for */
+        }     /* end for */
 
         /* Decrement number of elements left to process */
         nelmts -= elmtno;
@@ -825,15 +809,14 @@ H5D__compound_opt_read(size_t nelmts, const H5S_t *space,
 
 done:
     /* Release resources, if allocated */
-    if(len && len != _len)
+    if (len && len != _len)
         len = H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
+    if (off && off != _off)
         off = H5FL_SEQ_FREE(hsize_t, off);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__compound_opt_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__compound_opt_write
  *
@@ -870,9 +853,9 @@ done:
 static herr_t
 H5D__compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info)
 {
-    uint8_t    *xsbuf, *xdbuf;                  /* Source & destination pointers into dataset buffer */
-    size_t     src_stride, dst_stride;          /* Strides through source & destination datatypes */
-    size_t     i;                               /* Local index variable */
+    uint8_t *xsbuf, *xdbuf;          /* Source & destination pointers into dataset buffer */
+    size_t   src_stride, dst_stride; /* Strides through source & destination datatypes */
+    size_t   i;                      /* Local index variable */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -887,7 +870,7 @@ H5D__compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info)
     /* Loop until all elements are written */
     xsbuf = (uint8_t *)type_info->tconv_buf;
     xdbuf = (uint8_t *)type_info->tconv_buf;
-    for(i = 0; i < nelmts; i++) {
+    for (i = 0; i < nelmts; i++) {
         HDmemmove(xdbuf, xsbuf, dst_stride);
 
         /* Update pointers */
@@ -898,7 +881,6 @@ H5D__compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__compound_opt_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Dscatter
  *
@@ -916,73 +898,72 @@ H5D__compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id,
-    hid_t dst_space_id, void *dst_buf)
+H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, hid_t dst_space_id, void *dst_buf)
 {
-    H5T_t *type;                /* Datatype */
-    H5S_t *dst_space;           /* Dataspace */
-    H5S_sel_iter_t iter;        /* Selection iteration info*/
-    hbool_t iter_init = FALSE;  /* Selection iteration info has been initialized */
-    const void *src_buf = NULL; /* Source (contiguous) data buffer */
-    size_t src_buf_nbytes = 0;  /* Size of src_buf */
-    size_t type_size;           /* Datatype element size */
-    hssize_t nelmts;            /* Number of remaining elements in selection */
-    size_t nelmts_scatter = 0;  /* Number of elements to scatter to dst_buf */
-    H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */
+    H5T_t *           type;                      /* Datatype */
+    H5S_t *           dst_space;                 /* Dataspace */
+    H5S_sel_iter_t    iter;                      /* Selection iteration info*/
+    hbool_t           iter_init      = FALSE;    /* Selection iteration info has been initialized */
+    const void *      src_buf        = NULL;     /* Source (contiguous) data buffer */
+    size_t            src_buf_nbytes = 0;        /* Size of src_buf */
+    size_t            type_size;                 /* Datatype element size */
+    hssize_t          nelmts;                    /* Number of remaining elements in selection */
+    size_t            nelmts_scatter = 0;        /* Number of elements to scatter to dst_buf */
+    H5D_dxpl_cache_t  _dxpl_cache;               /* Data transfer property cache buffer */
     H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
-    herr_t ret_value = SUCCEED; /* Return value */
+    herr_t            ret_value  = SUCCEED;      /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "x*xii*x", op, op_data, type_id, dst_space_id, dst_buf);
 
     /* Check args */
-    if(op == NULL)
+    if (op == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid callback function pointer")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(NULL == (dst_space= (H5S_t *)H5I_object_verify(dst_space_id, H5I_DATASPACE)))
+    if (NULL == (dst_space = (H5S_t *)H5I_object_verify(dst_space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
-    if(dst_buf == NULL)
+    if (dst_buf == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination buffer provided")
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(H5P_DATASET_XFER_DEFAULT, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(H5P_DATASET_XFER_DEFAULT, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Get datatype element size */
-    if(0 == (type_size = H5T_GET_SIZE(type)))
+    if (0 == (type_size = H5T_GET_SIZE(type)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get datatype size")
 
     /* Get number of elements in dataspace */
-    if((nelmts = (hssize_t)H5S_GET_SELECT_NPOINTS(dst_space)) < 0)
+    if ((nelmts = (hssize_t)H5S_GET_SELECT_NPOINTS(dst_space)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCOUNT, FAIL, "unable to get number of elements in selection")
 
     /* Initialize selection iterator */
-    if(H5S_select_iter_init(&iter, dst_space, type_size) < 0)
+    if (H5S_select_iter_init(&iter, dst_space, type_size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize selection iterator information")
     iter_init = TRUE;
 
     /* Loop until all data has been scattered */
-    while(nelmts > 0) {
+    while (nelmts > 0) {
         /* Make callback to retrieve data */
-        if(op(&src_buf, &src_buf_nbytes, op_data) < 0)
+        if (op(&src_buf, &src_buf_nbytes, op_data) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CALLBACK, FAIL, "callback operator returned failure")
 
         /* Calculate number of elements */
         nelmts_scatter = src_buf_nbytes / type_size;
 
         /* Check callback results */
-        if(!src_buf)
+        if (!src_buf)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "callback did not return a buffer")
-        if(src_buf_nbytes == 0)
+        if (src_buf_nbytes == 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "callback returned a buffer size of 0")
-        if(src_buf_nbytes % type_size)
+        if (src_buf_nbytes % type_size)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "buffer size is not a multiple of datatype size")
-        if(nelmts_scatter > (size_t)nelmts)
+        if (nelmts_scatter > (size_t)nelmts)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "callback returned more elements than in selection")
 
         /* Scatter data */
-        if(H5D__scatter_mem(src_buf, dst_space, &iter, nelmts_scatter, dxpl_cache, dst_buf) < 0)
+        if (H5D__scatter_mem(src_buf, dst_space, &iter, nelmts_scatter, dxpl_cache, dst_buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "scatter failed")
 
         nelmts -= (hssize_t)nelmts_scatter;
@@ -990,15 +971,14 @@ H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id,
 
 done:
     /* Release selection iterator */
-    if(iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&iter) < 0)
+    if (iter_init) {
+        if (H5S_SELECT_ITER_RELEASE(&iter) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
-}   /* H5Dscatter() */
+} /* H5Dscatter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Dgather
  *
@@ -1016,73 +996,74 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id,
-    size_t dst_buf_size, void *dst_buf, H5D_gather_func_t op, void *op_data)
+H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id, size_t dst_buf_size, void *dst_buf,
+          H5D_gather_func_t op, void *op_data)
 {
-    H5T_t *type;                /* Datatype */
-    H5S_t *src_space;           /* Dataspace */
-    H5S_sel_iter_t iter;        /* Selection iteration info*/
-    hbool_t iter_init = FALSE;  /* Selection iteration info has been initialized */
-    size_t type_size;           /* Datatype element size */
-    hssize_t nelmts;            /* Number of remaining elements in selection */
-    size_t dst_buf_nelmts;      /* Number of elements that can fit in dst_buf */
-    size_t nelmts_gathered;     /* Number of elements gathered from src_buf */
-    H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */
+    H5T_t *           type;                      /* Datatype */
+    H5S_t *           src_space;                 /* Dataspace */
+    H5S_sel_iter_t    iter;                      /* Selection iteration info*/
+    hbool_t           iter_init = FALSE;         /* Selection iteration info has been initialized */
+    size_t            type_size;                 /* Datatype element size */
+    hssize_t          nelmts;                    /* Number of remaining elements in selection */
+    size_t            dst_buf_nelmts;            /* Number of elements that can fit in dst_buf */
+    size_t            nelmts_gathered;           /* Number of elements gathered from src_buf */
+    H5D_dxpl_cache_t  _dxpl_cache;               /* Data transfer property cache buffer */
     H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
-    herr_t ret_value = SUCCEED; /* Return value */
+    herr_t            ret_value  = SUCCEED;      /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "i*xiz*xx*x", src_space_id, src_buf, type_id, dst_buf_size,
-             dst_buf, op, op_data);
+    H5TRACE7("e", "i*xiz*xx*x", src_space_id, src_buf, type_id, dst_buf_size, dst_buf, op, op_data);
 
     /* Check args */
-    if(NULL == (src_space= (H5S_t *)H5I_object_verify(src_space_id, H5I_DATASPACE)))
+    if (NULL == (src_space = (H5S_t *)H5I_object_verify(src_space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
-    if(src_buf == NULL)
+    if (src_buf == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no source buffer provided")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(dst_buf_size == 0)
+    if (dst_buf_size == 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "destination buffer size is 0")
-    if(dst_buf == NULL)
+    if (dst_buf == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination buffer provided")
 
     /* Fill the DXPL cache values for later use */
-    if(H5D__get_dxpl_cache(H5P_DATASET_XFER_DEFAULT, &dxpl_cache) < 0)
+    if (H5D__get_dxpl_cache(H5P_DATASET_XFER_DEFAULT, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Get datatype element size */
-    if(0 == (type_size = H5T_GET_SIZE(type)))
+    if (0 == (type_size = H5T_GET_SIZE(type)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get datatype size")
 
     /* Get number of elements in dst_buf_size */
     dst_buf_nelmts = dst_buf_size / type_size;
-    if(dst_buf_nelmts == 0)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "destination buffer is not large enough to hold one element")
+    if (dst_buf_nelmts == 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                    "destination buffer is not large enough to hold one element")
 
     /* Get number of elements in dataspace */
-    if((nelmts = (hssize_t)H5S_GET_SELECT_NPOINTS(src_space)) < 0)
+    if ((nelmts = (hssize_t)H5S_GET_SELECT_NPOINTS(src_space)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCOUNT, FAIL, "unable to get number of elements in selection")
 
     /* If dst_buf is not large enough to hold all the elements, make sure there
      * is a callback */
-    if(((size_t)nelmts > dst_buf_nelmts) && (op == NULL))
+    if (((size_t)nelmts > dst_buf_nelmts) && (op == NULL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback supplied and destination buffer too small")
 
     /* Initialize selection iterator */
-    if(H5S_select_iter_init(&iter, src_space, type_size) < 0)
+    if (H5S_select_iter_init(&iter, src_space, type_size) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize selection iterator information")
     iter_init = TRUE;
 
     /* Loop until all data has been scattered */
-    while(nelmts > 0) {
+    while (nelmts > 0) {
         /* Gather data */
-        if(0 == (nelmts_gathered = H5D__gather_mem(src_buf, src_space, &iter, MIN(dst_buf_nelmts, (size_t)nelmts), dxpl_cache, dst_buf)))
+        if (0 == (nelmts_gathered = H5D__gather_mem(
+                      src_buf, src_space, &iter, MIN(dst_buf_nelmts, (size_t)nelmts), dxpl_cache, dst_buf)))
             HGOTO_ERROR(H5E_IO, H5E_CANTCOPY, FAIL, "gather failed")
         HDassert(nelmts_gathered == MIN(dst_buf_nelmts, (size_t)nelmts));
 
         /* Make callback to process dst_buf */
-        if(op && op(dst_buf, nelmts_gathered * type_size, op_data) < 0)
+        if (op && op(dst_buf, nelmts_gathered * type_size, op_data) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CALLBACK, FAIL, "callback operator returned failure")
 
         nelmts -= (hssize_t)nelmts_gathered;
@@ -1091,11 +1072,10 @@ H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id,
 
 done:
     /* Release selection iterator */
-    if(iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&iter) < 0)
+    if (iter_init) {
+        if (H5S_SELECT_ITER_RELEASE(&iter) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
-}   /* H5Dgather() */
-
+} /* H5Dgather() */
diff --git a/src/H5Dselect.c b/src/H5Dselect.c
index 7c02c05..6169f5f 100644
--- a/src/H5Dselect.c
+++ b/src/H5Dselect.c
@@ -21,41 +21,35 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static herr_t H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size,
-    size_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-
+static herr_t H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size, size_t nelmts,
+                             const H5S_t *file_space, const H5S_t *mem_space);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -66,8 +60,6 @@ H5FL_SEQ_DEFINE(size_t);
 /* Declare a free list to manage sequences of hsize_t */
 H5FL_SEQ_DEFINE(hsize_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__select_io
  *
@@ -81,27 +73,27 @@ H5FL_SEQ_DEFINE(hsize_t);
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size,
-    size_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
+H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size, size_t nelmts, const H5S_t *file_space,
+               const H5S_t *mem_space)
 {
-    H5S_sel_iter_t mem_iter;    /* Memory selection iteration info */
-    hbool_t mem_iter_init = 0;  /* Memory selection iteration info has been initialized */
-    H5S_sel_iter_t file_iter;   /* File selection iteration info */
-    hbool_t file_iter_init = 0;	/* File selection iteration info has been initialized */
-    hsize_t _mem_off[H5D_IO_VECTOR_SIZE];      /* Array to store sequence offsets in memory */
-    hsize_t *mem_off = NULL;    /* Pointer to sequence offsets in memory */
-    hsize_t _file_off[H5D_IO_VECTOR_SIZE];     /* Array to store sequence offsets in the file */
-    hsize_t *file_off = NULL;   /* Pointer to sequence offsets in the file */
-    size_t _mem_len[H5D_IO_VECTOR_SIZE];       /* Array to store sequence lengths in memory */
-    size_t *mem_len = NULL;     /* Pointer to sequence lengths in memory */
-    size_t _file_len[H5D_IO_VECTOR_SIZE];      /* Array to store sequence lengths in the file */
-    size_t *file_len = NULL;    /* Pointer to sequence lengths in the file */
-    size_t curr_mem_seq;        /* Current memory sequence to operate on */
-    size_t curr_file_seq;       /* Current file sequence to operate on */
-    size_t mem_nseq;            /* Number of sequences generated in the file */
-    size_t file_nseq;           /* Number of sequences generated in memory */
-    ssize_t tmp_file_len;       /* Temporary number of bytes in file sequence */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5S_sel_iter_t mem_iter;                      /* Memory selection iteration info */
+    hbool_t        mem_iter_init = 0;             /* Memory selection iteration info has been initialized */
+    H5S_sel_iter_t file_iter;                     /* File selection iteration info */
+    hbool_t        file_iter_init = 0;            /* File selection iteration info has been initialized */
+    hsize_t        _mem_off[H5D_IO_VECTOR_SIZE];  /* Array to store sequence offsets in memory */
+    hsize_t *      mem_off = NULL;                /* Pointer to sequence offsets in memory */
+    hsize_t        _file_off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets in the file */
+    hsize_t *      file_off = NULL;               /* Pointer to sequence offsets in the file */
+    size_t         _mem_len[H5D_IO_VECTOR_SIZE];  /* Array to store sequence lengths in memory */
+    size_t *       mem_len = NULL;                /* Pointer to sequence lengths in memory */
+    size_t         _file_len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths in the file */
+    size_t *       file_len = NULL;               /* Pointer to sequence lengths in the file */
+    size_t         curr_mem_seq;                  /* Current memory sequence to operate on */
+    size_t         curr_file_seq;                 /* Current file sequence to operate on */
+    size_t         mem_nseq;                      /* Number of sequences generated in the file */
+    size_t         file_nseq;                     /* Number of sequences generated in memory */
+    ssize_t        tmp_file_len;                  /* Temporary number of bytes in file sequence */
+    herr_t         ret_value = SUCCEED;           /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -113,29 +105,29 @@ H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size,
     HDassert(io_info->u.rbuf);
 
     /* Allocate the vector I/O arrays */
-    if(io_info->dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (mem_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size)))
+    if (io_info->dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
+        if (NULL == (mem_len = H5FL_SEQ_MALLOC(size_t, io_info->dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
-        if(NULL == (mem_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size)))
+        if (NULL == (mem_off = H5FL_SEQ_MALLOC(hsize_t, io_info->dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
-        if(NULL == (file_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size)))
+        if (NULL == (file_len = H5FL_SEQ_MALLOC(size_t, io_info->dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
-        if(NULL == (file_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size)))
+        if (NULL == (file_off = H5FL_SEQ_MALLOC(hsize_t, io_info->dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
     } /* end if */
     else {
-        mem_len = _mem_len;
-        mem_off = _mem_off;
+        mem_len  = _mem_len;
+        mem_off  = _mem_off;
         file_len = _file_len;
         file_off = _file_off;
     } /* end else */
 
     /* Check for only one element in selection */
-    if(nelmts == 1) {
+    if (nelmts == 1) {
         /* Get offset of first element in selections */
-        if(H5S_SELECT_OFFSET(file_space, file_off) < 0)
+        if (H5S_SELECT_OFFSET(file_space, file_off) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "can't retrieve file selection offset")
-        if(H5S_SELECT_OFFSET(mem_space, mem_off) < 0)
+        if (H5S_SELECT_OFFSET(mem_space, mem_off) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "can't retrieve memory selection offset")
 
         /* Set up necessary information for I/O operation */
@@ -146,17 +138,17 @@ H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size,
         *file_len = *mem_len = elmt_size;
 
         /* Perform I/O on memory and file sequences */
-        if(io_info->op_type == H5D_IO_OP_READ) {
-            if((tmp_file_len = (*io_info->layout_ops.readvv)(io_info,
-                    file_nseq, &curr_file_seq, file_len, file_off,
-                    mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
+        if (io_info->op_type == H5D_IO_OP_READ) {
+            if ((tmp_file_len =
+                     (*io_info->layout_ops.readvv)(io_info, file_nseq, &curr_file_seq, file_len, file_off,
+                                                   mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
         } /* end if */
         else {
             HDassert(io_info->op_type == H5D_IO_OP_WRITE);
-            if((tmp_file_len = (*io_info->layout_ops.writevv)(io_info,
-                    file_nseq, &curr_file_seq, file_len, file_off,
-                    mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
+            if ((tmp_file_len =
+                     (*io_info->layout_ops.writevv)(io_info, file_nseq, &curr_file_seq, file_len, file_off,
+                                                    mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
         } /* end else */
 
@@ -164,29 +156,31 @@ H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size,
         HDassert(((size_t)tmp_file_len % elmt_size) == 0);
     } /* end if */
     else {
-        size_t mem_nelem;           /* Number of elements used in memory sequences */
-        size_t file_nelem;          /* Number of elements used in file sequences */
+        size_t mem_nelem;  /* Number of elements used in memory sequences */
+        size_t file_nelem; /* Number of elements used in file sequences */
 
         /* Initialize file iterator */
-        if(H5S_select_iter_init(&file_iter, file_space, elmt_size) < 0)
+        if (H5S_select_iter_init(&file_iter, file_space, elmt_size) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
-        file_iter_init = 1;	/* File selection iteration info has been initialized */
+        file_iter_init = 1; /* File selection iteration info has been initialized */
 
         /* Initialize memory iterator */
-        if(H5S_select_iter_init(&mem_iter, mem_space, elmt_size) < 0)
+        if (H5S_select_iter_init(&mem_iter, mem_space, elmt_size) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
-        mem_iter_init = 1;	/* Memory selection iteration info has been initialized */
+        mem_iter_init = 1; /* Memory selection iteration info has been initialized */
 
         /* Initialize sequence counts */
         curr_mem_seq = curr_file_seq = 0;
         mem_nseq = file_nseq = 0;
 
         /* Loop, until all bytes are processed */
-        while(nelmts > 0) {
+        while (nelmts > 0) {
             /* Check if more file sequences are needed */
-            if(curr_file_seq >= file_nseq) {
+            if (curr_file_seq >= file_nseq) {
                 /* Get sequences for file selection */
-                if(H5S_SELECT_GET_SEQ_LIST(file_space, H5S_GET_SEQ_LIST_SORTED, &file_iter, io_info->dxpl_cache->vec_size, nelmts, &file_nseq, &file_nelem, file_off, file_len) < 0)
+                if (H5S_SELECT_GET_SEQ_LIST(file_space, H5S_GET_SEQ_LIST_SORTED, &file_iter,
+                                            io_info->dxpl_cache->vec_size, nelmts, &file_nseq, &file_nelem,
+                                            file_off, file_len) < 0)
                     HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
 
                 /* Start at the beginning of the sequences again */
@@ -194,9 +188,10 @@ H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size,
             } /* end if */
 
             /* Check if more memory sequences are needed */
-            if(curr_mem_seq >= mem_nseq) {
+            if (curr_mem_seq >= mem_nseq) {
                 /* Get sequences for memory selection */
-                if(H5S_SELECT_GET_SEQ_LIST(mem_space, 0, &mem_iter, io_info->dxpl_cache->vec_size, nelmts, &mem_nseq, &mem_nelem, mem_off, mem_len) < 0)
+                if (H5S_SELECT_GET_SEQ_LIST(mem_space, 0, &mem_iter, io_info->dxpl_cache->vec_size, nelmts,
+                                            &mem_nseq, &mem_nelem, mem_off, mem_len) < 0)
                     HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
 
                 /* Start at the beginning of the sequences again */
@@ -204,53 +199,52 @@ H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size,
             } /* end if */
 
             /* Perform I/O on memory and file sequences */
-            if(io_info->op_type == H5D_IO_OP_READ) {
-                if((tmp_file_len = (*io_info->layout_ops.readvv)(io_info,
-                        file_nseq, &curr_file_seq, file_len, file_off,
-                        mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
+            if (io_info->op_type == H5D_IO_OP_READ) {
+                if ((tmp_file_len =
+                         (*io_info->layout_ops.readvv)(io_info, file_nseq, &curr_file_seq, file_len, file_off,
+                                                       mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
             } /* end if */
             else {
                 HDassert(io_info->op_type == H5D_IO_OP_WRITE);
-                if((tmp_file_len = (*io_info->layout_ops.writevv)(io_info,
-                        file_nseq, &curr_file_seq, file_len, file_off,
-                        mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
+                if ((tmp_file_len = (*io_info->layout_ops.writevv)(io_info, file_nseq, &curr_file_seq,
+                                                                   file_len, file_off, mem_nseq,
+                                                                   &curr_mem_seq, mem_len, mem_off)) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
             } /* end else */
 
             /* Decrement number of elements left to process */
             HDassert(((size_t)tmp_file_len % elmt_size) == 0);
-            if(elmt_size == 0)
+            if (elmt_size == 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "Resulted in division by zero")
             nelmts -= ((size_t)tmp_file_len / elmt_size);
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
 done:
     /* Release file selection iterator */
-    if(file_iter_init)
-        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+    if (file_iter_init)
+        if (H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
     /* Release memory selection iterator */
-    if(mem_iter_init)
-        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+    if (mem_iter_init)
+        if (H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
     /* Release vector arrays, if allocated */
-    if(file_len && file_len != _file_len)
+    if (file_len && file_len != _file_len)
         file_len = H5FL_SEQ_FREE(size_t, file_len);
-    if(file_off && file_off != _file_off)
+    if (file_off && file_off != _file_off)
         file_off = H5FL_SEQ_FREE(hsize_t, file_off);
-    if(mem_len && mem_len != _mem_len)
+    if (mem_len && mem_len != _mem_len)
         mem_len = H5FL_SEQ_FREE(size_t, mem_len);
-    if(mem_off && mem_off != _mem_off)
+    if (mem_off && mem_off != _mem_off)
         mem_off = H5FL_SEQ_FREE(hsize_t, mem_off);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__select_io() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__select_read
  *
@@ -264,8 +258,8 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__select_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
+H5D__select_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                 const H5S_t *file_space, const H5S_t *mem_space)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
@@ -273,15 +267,13 @@ H5D__select_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
 
     /* Call generic selection operation */
     H5_CHECK_OVERFLOW(nelmts, hsize_t, size_t);
-    if(H5D__select_io(io_info, type_info->src_type_size, (size_t)nelmts,
-            file_space, mem_space) < 0)
+    if (H5D__select_io(io_info, type_info->src_type_size, (size_t)nelmts, file_space, mem_space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__select_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__select_write
  *
@@ -295,8 +287,8 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D__select_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
+H5D__select_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                  const H5S_t *file_space, const H5S_t *mem_space)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
@@ -304,11 +296,9 @@ H5D__select_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info
 
     /* Call generic selection operation */
     H5_CHECK_OVERFLOW(nelmts, hsize_t, size_t);
-    if(H5D__select_io(io_info, type_info->dst_type_size, (size_t)nelmts,
-            file_space, mem_space) < 0)
+    if (H5D__select_io(io_info, type_info->dst_type_size, (size_t)nelmts, file_space, mem_space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__select_write() */
-
diff --git a/src/H5Dtest.c b/src/H5Dtest.c
index c74b844..ea17072 100644
--- a/src/H5Dtest.c
+++ b/src/H5Dtest.c
@@ -21,45 +21,37 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-#define H5D_TESTING		/*suppress warning about H5D testing funcs*/
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
+#define H5D_TESTING /*suppress warning about H5D testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Datasets 				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Dpkg.h"     /* Datasets 				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
  NAME
     H5D__layout_version_test
@@ -82,23 +74,22 @@
 herr_t
 H5D__layout_version_test(hid_t did, unsigned *version)
 {
-    H5D_t	*dset;          /* Pointer to dataset to query */
+    H5D_t *dset;                /* Pointer to dataset to query */
     herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if(version)
+    if (version)
         *version = dset->shared->layout.version;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D__layout_version_test() */
+} /* H5D__layout_version_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5D__layout_contig_size_test
@@ -121,25 +112,24 @@ done:
 herr_t
 H5D__layout_contig_size_test(hid_t did, hsize_t *size)
 {
-    H5D_t	*dset;          /* Pointer to dataset to query */
+    H5D_t *dset;                /* Pointer to dataset to query */
     herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if(size) {
+    if (size) {
         HDassert(dset->shared->layout.type == H5D_CONTIGUOUS);
         *size = dset->shared->layout.storage.u.contig.size;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D__layout_contig_size_test() */
+} /* H5D__layout_contig_size_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5D__layout_compact_dirty_test
@@ -168,19 +158,18 @@ H5D__layout_compact_dirty_test(hid_t did, hbool_t *dirty)
     FUNC_ENTER_PACKAGE
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if(dirty) {
+    if (dirty) {
         HDassert(dset->shared->layout.type == H5D_COMPACT);
         *dirty = dset->shared->layout.storage.u.compact.dirty;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D__layout_compact_dirty_test() */
+} /* H5D__layout_compact_dirty_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5D__current_cache_size_test
@@ -203,26 +192,25 @@ done:
 herr_t
 H5D__current_cache_size_test(hid_t did, size_t *nbytes_used, int *nused)
 {
-    H5D_t	*dset;          /* Pointer to dataset to query */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5D_t *dset;                /* Pointer to dataset to query */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
-    if(nbytes_used) {
+    if (nbytes_used) {
         HDassert(dset->shared->layout.type == H5D_CHUNKED);
         *nbytes_used = dset->shared->cache.chunk.nbytes_used;
     } /* end if */
 
-    if(nused) {
+    if (nused) {
         HDassert(dset->shared->layout.type == H5D_CHUNKED);
         *nused = dset->shared->cache.chunk.nused;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D__current_cache_size_test() */
-
+} /* H5D__current_cache_size_test() */
diff --git a/src/H5E.c b/src/H5E.c
index a94c5bc..ccd60cb 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -43,67 +43,59 @@
 /* Module Setup */
 /****************/
 
-#define H5E_PACKAGE		/*suppress error about including H5Epkg   */
+#define H5E_PACKAGE /*suppress error about including H5Epkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5E_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5E_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Iprivate.h"		/* IDs                                  */
-#include "H5Epkg.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5Epkg.h"      /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* HDF5 error class */
-#define H5E_CLS_NAME         "HDF5"
-#define H5E_CLS_LIB_NAME     "HDF5"
-
+#define H5E_CLS_NAME     "HDF5"
+#define H5E_CLS_LIB_NAME "HDF5"
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 /* Static function declarations */
-static H5E_cls_t *H5E_register_class(const char *cls_name, const char *lib_name,
-                                const char *version);
-static herr_t  H5E_unregister_class(H5E_cls_t *cls);
-static ssize_t H5E_get_class_name(const H5E_cls_t *cls, char *name, size_t size);
-static int H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *udata);
-static herr_t  H5E_close_msg(H5E_msg_t *err);
+static H5E_cls_t *H5E_register_class(const char *cls_name, const char *lib_name, const char *version);
+static herr_t     H5E_unregister_class(H5E_cls_t *cls);
+static ssize_t    H5E_get_class_name(const H5E_cls_t *cls, char *name, size_t size);
+static int        H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *udata);
+static herr_t     H5E_close_msg(H5E_msg_t *err);
 static H5E_msg_t *H5E_create_msg(H5E_cls_t *cls, H5E_type_t msg_type, const char *msg);
-static H5E_t  *H5E_get_current_stack(void);
-static herr_t  H5E_set_current_stack(H5E_t *estack);
-static herr_t  H5E_close_stack(H5E_t *err_stack);
-static ssize_t H5E_get_num(const H5E_t *err_stack);
-
+static H5E_t *    H5E_get_current_stack(void);
+static herr_t     H5E_set_current_stack(H5E_t *estack);
+static herr_t     H5E_close_stack(H5E_t *err_stack);
+static ssize_t    H5E_get_num(const H5E_t *err_stack);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -119,30 +111,28 @@ H5FL_DEFINE_STATIC(H5E_msg_t);
 
 /* Error class ID class */
 static const H5I_class_t H5I_ERRCLS_CLS[1] = {{
-    H5I_ERROR_CLASS,		/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,				/* # of reserved IDs for class */
+    H5I_ERROR_CLASS,                 /* ID class value */
+    H5I_CLASS_REUSE_IDS,             /* Class flags */
+    0,                               /* # of reserved IDs for class */
     (H5I_free_t)H5E_unregister_class /* Callback routine for closing objects of this class */
 }};
 
 /* Error message ID class */
 static const H5I_class_t H5I_ERRMSG_CLS[1] = {{
-    H5I_ERROR_MSG,		/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,				/* # of reserved IDs for class */
-    (H5I_free_t)H5E_close_msg   /* Callback routine for closing objects of this class */
+    H5I_ERROR_MSG,            /* ID class value */
+    H5I_CLASS_REUSE_IDS,      /* Class flags */
+    0,                        /* # of reserved IDs for class */
+    (H5I_free_t)H5E_close_msg /* Callback routine for closing objects of this class */
 }};
 
 /* Error stack ID class */
 static const H5I_class_t H5I_ERRSTK_CLS[1] = {{
-    H5I_ERROR_STACK,		/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,				/* # of reserved IDs for class */
+    H5I_ERROR_STACK,            /* ID class value */
+    H5I_CLASS_REUSE_IDS,        /* Class flags */
+    0,                          /* # of reserved IDs for class */
     (H5I_free_t)H5E_close_stack /* Callback routine for closing objects of this class */
 }};
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_init
  *
@@ -160,7 +150,7 @@ static const H5I_class_t H5I_ERRSTK_CLS[1] = {{
 herr_t
 H5E_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -169,7 +159,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_init() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5E_set_default_auto
  *
@@ -191,14 +180,14 @@ H5E_set_default_auto(H5E_t *stk)
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 #ifdef H5_USE_16_API_DEFAULT
     stk->auto_op.vers = 1;
-#else /* H5_USE_16_API */
+#else  /* H5_USE_16_API */
     stk->auto_op.vers = 2;
 #endif /* H5_USE_16_API_DEFAULT */
 
     stk->auto_op.func1 = stk->auto_op.func1_default = (H5E_auto1_t)H5Eprint1;
     stk->auto_op.func2 = stk->auto_op.func2_default = (H5E_auto2_t)H5Eprint2;
-    stk->auto_op.is_default = TRUE;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+    stk->auto_op.is_default                         = TRUE;
+#else  /* H5_NO_DEPRECATED_SYMBOLS */
     stk->auto_op.func2 = (H5E_auto2_t)H5Eprint2;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
@@ -207,7 +196,6 @@ H5E_set_default_auto(H5E_t *stk)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5E_set_default_auto() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5E_init_interface
  *
@@ -223,23 +211,23 @@ H5E_set_default_auto(H5E_t *stk)
 static herr_t
 H5E_init_interface(void)
 {
-    H5E_cls_t   *cls;           /* Pointer to error class */
-    H5E_msg_t   *msg;           /* Pointer to new error message */
-    char lib_vers[128];         /* Buffer to constructu library version within */
-    herr_t      ret_value = SUCCEED;   /* Return value */
+    H5E_cls_t *cls;                 /* Pointer to error class */
+    H5E_msg_t *msg;                 /* Pointer to new error message */
+    char       lib_vers[128];       /* Buffer to constructu library version within */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Initialize the atom group for the error class IDs */
-    if(H5I_register_type(H5I_ERRCLS_CLS) < 0)
+    if (H5I_register_type(H5I_ERRCLS_CLS) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINIT, FAIL, "unable to initialize ID group")
 
     /* Initialize the atom group for the major error IDs */
-    if(H5I_register_type(H5I_ERRMSG_CLS) < 0)
+    if (H5I_register_type(H5I_ERRMSG_CLS) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINIT, FAIL, "unable to initialize ID group")
 
     /* Initialize the atom group for the error stacks */
-    if(H5I_register_type(H5I_ERRSTK_CLS) < 0)
+    if (H5I_register_type(H5I_ERRSTK_CLS) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINIT, FAIL, "unable to initialize ID group")
 
 #ifndef H5_HAVE_THREADSAFE
@@ -249,20 +237,20 @@ H5E_init_interface(void)
 
     /* Allocate the HDF5 error class */
     HDassert(H5E_ERR_CLS_g == (-1));
-    HDsnprintf(lib_vers, sizeof(lib_vers), "%u.%u.%u%s", H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE, (HDstrlen(H5_VERS_SUBRELEASE) > 0 ? "-"H5_VERS_SUBRELEASE : ""));
-    if(NULL == (cls = H5E_register_class(H5E_CLS_NAME, H5E_CLS_LIB_NAME, lib_vers)))
+    HDsnprintf(lib_vers, sizeof(lib_vers), "%u.%u.%u%s", H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE,
+               (HDstrlen(H5_VERS_SUBRELEASE) > 0 ? "-" H5_VERS_SUBRELEASE : ""));
+    if (NULL == (cls = H5E_register_class(H5E_CLS_NAME, H5E_CLS_LIB_NAME, lib_vers)))
         HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "class initialization failed")
-    if((H5E_ERR_CLS_g = H5I_register(H5I_ERROR_CLASS, cls, FALSE)) < 0)
+    if ((H5E_ERR_CLS_g = H5I_register(H5I_ERROR_CLASS, cls, FALSE)) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error class")
 
-    /* Include the automatically generated error code initialization */
-    #include "H5Einit.h"
+/* Include the automatically generated error code initialization */
+#include "H5Einit.h"
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_term_interface
  *
@@ -281,11 +269,11 @@ done:
 int
 H5E_term_interface(void)
 {
-    int	n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
+    if (H5_interface_initialize_g) {
         int ncls, nmsg, nstk;
 
         /* Check if there are any open error stacks, classes or messages */
@@ -293,52 +281,51 @@ H5E_term_interface(void)
         nmsg = H5I_nmembers(H5I_ERROR_MSG);
         nstk = H5I_nmembers(H5I_ERROR_STACK);
 
-        if((ncls + nmsg + nstk) > 0) {
+        if ((ncls + nmsg + nstk) > 0) {
             /* Clear any outstanding error stacks */
-            if(nstk > 0)
-	        (void)H5I_clear_type(H5I_ERROR_STACK, FALSE, FALSE);
+            if (nstk > 0)
+                (void)H5I_clear_type(H5I_ERROR_STACK, FALSE, FALSE);
 
             /* Clear all the error classes */
-	    if(ncls > 0) {
-	        (void)H5I_clear_type(H5I_ERROR_CLASS, FALSE, FALSE);
+            if (ncls > 0) {
+                (void)H5I_clear_type(H5I_ERROR_CLASS, FALSE, FALSE);
 
                 /* Reset the HDF5 error class, if its been closed */
-                if(H5I_nmembers(H5I_ERROR_CLASS) == 0)
+                if (H5I_nmembers(H5I_ERROR_CLASS) == 0)
                     H5E_ERR_CLS_g = -1;
             } /* end if */
 
             /* Clear all the error messages */
-	    if(nmsg > 0) {
-	        (void)H5I_clear_type(H5I_ERROR_MSG, FALSE, FALSE);
+            if (nmsg > 0) {
+                (void)H5I_clear_type(H5I_ERROR_MSG, FALSE, FALSE);
 
                 /* Reset the HDF5 error messages, if they've been closed */
-                if(H5I_nmembers(H5I_ERROR_MSG) == 0) {
-                    /* Include the automatically generated error code termination */
-                    #include "H5Eterm.h"
+                if (H5I_nmembers(H5I_ERROR_MSG) == 0) {
+/* Include the automatically generated error code termination */
+#include "H5Eterm.h"
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             n++; /*H5I*/
-	} /* end if */
+        }        /* end if */
         else {
             /* Close deprecated interface */
             n += H5E__term_deprec_interface();
 
-	    /* Destroy the error class, message, and stack id groups */
-	    (void)H5I_dec_type_ref(H5I_ERROR_STACK);
-	    (void)H5I_dec_type_ref(H5I_ERROR_CLASS);
-	    (void)H5I_dec_type_ref(H5I_ERROR_MSG);
+            /* Destroy the error class, message, and stack id groups */
+            (void)H5I_dec_type_ref(H5I_ERROR_STACK);
+            (void)H5I_dec_type_ref(H5I_ERROR_CLASS);
+            (void)H5I_dec_type_ref(H5I_ERROR_MSG);
             n++; /*H5I*/
 
-	    /* Mark closed */
-	    H5_interface_initialize_g = 0;
-	} /* end else */
-    } /* end if */
+            /* Mark closed */
+            H5_interface_initialize_g = 0;
+        } /* end else */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5E_term_interface() */
 
-
 #ifdef H5_HAVE_THREADSAFE
 /*-------------------------------------------------------------------------
  * Function:	H5E_get_stack
@@ -364,10 +351,11 @@ H5E_get_stack(void)
 
     estack = (H5E_t *)H5TS_get_thread_local_value(H5TS_errstk_key_g);
 
-    if(!estack) {
+    if (!estack) {
         /* No associated value with current thread - create one */
 #ifdef H5_HAVE_WIN_THREADS
-        estack = (H5E_t *)LocalAlloc(LPTR, sizeof(H5E_t)); /* Win32 has to use LocalAlloc to match the LocalFree in DllMain */
+        estack = (H5E_t *)LocalAlloc(
+            LPTR, sizeof(H5E_t)); /* Win32 has to use LocalAlloc to match the LocalFree in DllMain */
 #else
         estack = (H5E_t *)H5FL_MALLOC(H5E_t);
 #endif /* H5_HAVE_WIN_THREADS */
@@ -387,9 +375,8 @@ H5E_get_stack(void)
     /* Set return value */
     FUNC_LEAVE_NOAPI(estack)
 } /* end H5E_get_stack() */
-#endif  /* H5_HAVE_THREADSAFE */
+#endif /* H5_HAVE_THREADSAFE */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_free_class
  *
@@ -411,15 +398,14 @@ H5E_free_class(H5E_cls_t *cls)
     HDassert(cls);
 
     /* Free error class structure */
-    cls->cls_name = (char *)H5MM_xfree((void*)cls->cls_name);
-    cls->lib_name = (char *)H5MM_xfree((void*)cls->lib_name);
-    cls->lib_vers = (char *)H5MM_xfree((void*)cls->lib_vers);
-    cls = H5FL_FREE(H5E_cls_t, cls);
+    cls->cls_name = (char *)H5MM_xfree((void *)cls->cls_name);
+    cls->lib_name = (char *)H5MM_xfree((void *)cls->lib_name);
+    cls->lib_vers = (char *)H5MM_xfree((void *)cls->lib_vers);
+    cls           = H5FL_FREE(H5E_cls_t, cls);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5E_free_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eregister_class
  *
@@ -435,29 +421,28 @@ H5E_free_class(H5E_cls_t *cls)
 hid_t
 H5Eregister_class(const char *cls_name, const char *lib_name, const char *version)
 {
-    H5E_cls_t   *cls;        /* Pointer to error class */
-    hid_t       ret_value;   /* Return value */
+    H5E_cls_t *cls;       /* Pointer to error class */
+    hid_t      ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "*s*s*s", cls_name, lib_name, version);
 
     /* Check arguments */
-    if(cls_name == NULL || lib_name == NULL || version == NULL)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid string")
+    if (cls_name == NULL || lib_name == NULL || version == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid string")
 
     /* Create the new error class object */
-    if(NULL == (cls = H5E_register_class(cls_name, lib_name, version)))
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTCREATE, FAIL, "can't create error class")
+    if (NULL == (cls = H5E_register_class(cls_name, lib_name, version)))
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTCREATE, FAIL, "can't create error class")
 
     /* Register the new error class to get an ID for it */
-    if((ret_value = H5I_register(H5I_ERROR_CLASS, cls, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ERROR_CLASS, cls, TRUE)) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error class")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eregister_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_register_class
  *
@@ -473,8 +458,8 @@ done:
 static H5E_cls_t *
 H5E_register_class(const char *cls_name, const char *lib_name, const char *version)
 {
-    H5E_cls_t   *cls = NULL; /* Pointer to error class */
-    H5E_cls_t   *ret_value;  /* Return value */
+    H5E_cls_t *cls = NULL; /* Pointer to error class */
+    H5E_cls_t *ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -484,29 +469,28 @@ H5E_register_class(const char *cls_name, const char *lib_name, const char *versi
     HDassert(version);
 
     /* Allocate space for new error class */
-    if(NULL == (cls = H5FL_CALLOC(H5E_cls_t)))
+    if (NULL == (cls = H5FL_CALLOC(H5E_cls_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Duplicate string information */
-    if(NULL == (cls->cls_name = H5MM_xstrdup(cls_name)))
+    if (NULL == (cls->cls_name = H5MM_xstrdup(cls_name)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    if(NULL == (cls->lib_name = H5MM_xstrdup(lib_name)))
+    if (NULL == (cls->lib_name = H5MM_xstrdup(lib_name)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    if(NULL == (cls->lib_vers = H5MM_xstrdup(version)))
+    if (NULL == (cls->lib_vers = H5MM_xstrdup(version)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set the return value */
     ret_value = cls;
 
 done:
-    if(!ret_value)
-        if(cls && H5E_free_class(cls) < 0)
+    if (!ret_value)
+        if (cls && H5E_free_class(cls) < 0)
             HDONE_ERROR(H5E_ERROR, H5E_CANTRELEASE, NULL, "unable to free error class")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_register_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eunregister_class
  *
@@ -522,27 +506,26 @@ done:
 herr_t
 H5Eunregister_class(hid_t class_id)
 {
-    herr_t       ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", class_id);
 
     /* Check arguments */
-    if(H5I_ERROR_CLASS != H5I_get_type(class_id))
+    if (H5I_ERROR_CLASS != H5I_get_type(class_id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an error class")
 
     /*
      * Decrement the counter on the dataset.  It will be freed if the count
      * reaches zero.
      */
-    if(H5I_dec_app_ref(class_id) < 0)
+    if (H5I_dec_app_ref(class_id) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTDEC, FAIL, "unable to decrement ref count on error class")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eunregister_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_unregister_class
  *
@@ -558,7 +541,7 @@ done:
 static herr_t
 H5E_unregister_class(H5E_cls_t *cls)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -566,18 +549,17 @@ H5E_unregister_class(H5E_cls_t *cls)
     HDassert(cls);
 
     /* Iterate over all the messages and delete those in this error class */
-    if(H5I_iterate(H5I_ERROR_MSG, H5E_close_msg_cb, cls, FALSE) < 0)
+    if (H5I_iterate(H5I_ERROR_MSG, H5E_close_msg_cb, cls, FALSE) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_BADITER, FAIL, "unable to free all messages in this error class")
 
     /* Free error class structure */
-    if(H5E_free_class(cls) < 0)
+    if (H5E_free_class(cls) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTRELEASE, FAIL, "unable to free error class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_unregister_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eget_class_name
  *
@@ -594,25 +576,24 @@ done:
 ssize_t
 H5Eget_class_name(hid_t class_id, char *name, size_t size)
 {
-    H5E_cls_t   *cls;        /* Pointer to error class */
-    ssize_t     ret_value;   /* Return value */
+    H5E_cls_t *cls;       /* Pointer to error class */
+    ssize_t    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "i*sz", class_id, name, size);
 
     /* Get the error class */
-    if(NULL == (cls = (H5E_cls_t *)H5I_object_verify(class_id, H5I_ERROR_CLASS)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error class ID")
+    if (NULL == (cls = (H5E_cls_t *)H5I_object_verify(class_id, H5I_ERROR_CLASS)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error class ID")
 
     /* Retrieve the class name */
-    if((ret_value = H5E_get_class_name(cls, name, size)) < 0)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get error class name")
+    if ((ret_value = H5E_get_class_name(cls, name, size)) < 0)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get error class name")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eget_class_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_get_class_name
  *
@@ -629,7 +610,7 @@ done:
 static ssize_t
 H5E_get_class_name(const H5E_cls_t *cls, char *name, size_t size)
 {
-    ssize_t       len;          /* Length of error class's name */
+    ssize_t len; /* Length of error class's name */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -640,17 +621,16 @@ H5E_get_class_name(const H5E_cls_t *cls, char *name, size_t size)
     len = (ssize_t)HDstrlen(cls->cls_name);
 
     /* Set the user's buffer, if provided */
-    if(name) {
-       HDstrncpy(name, cls->cls_name, MIN((size_t)(len + 1), size));
-       if((size_t)len >= size)
-          name[size - 1] = '\0';
+    if (name) {
+        HDstrncpy(name, cls->cls_name, MIN((size_t)(len + 1), size));
+        if ((size_t)len >= size)
+            name[size - 1] = '\0';
     } /* end if */
 
     /* Return the full length */
     FUNC_LEAVE_NOAPI(len)
 } /* end H5E_get_class_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5E_close_msg_cb
  *
@@ -667,9 +647,9 @@ H5E_get_class_name(const H5E_cls_t *cls, char *name, size_t size)
 static int
 H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *udata)
 {
-    H5E_msg_t   *err_msg = (H5E_msg_t*)obj_ptr;
-    H5E_cls_t   *cls = (H5E_cls_t*)udata;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5E_msg_t *err_msg   = (H5E_msg_t *)obj_ptr;
+    H5E_cls_t *cls       = (H5E_cls_t *)udata;
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -677,10 +657,10 @@ H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *udata)
     HDassert(err_msg);
 
     /* Close the message if it is in the class being closed */
-    if(err_msg->cls == cls) {
-        if(H5E_close_msg(err_msg) < 0)
+    if (err_msg->cls == cls) {
+        if (H5E_close_msg(err_msg) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTCLOSEOBJ, FAIL, "unable to close error message")
-        if(NULL == H5I_remove(obj_id))
+        if (NULL == H5I_remove(obj_id))
             HGOTO_ERROR(H5E_ERROR, H5E_CANTREMOVE, FAIL, "unable to remove error message")
     } /* end if */
 
@@ -688,7 +668,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_close_msg_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eclose_msg
  *
@@ -704,24 +683,23 @@ done:
 herr_t
 H5Eclose_msg(hid_t err_id)
 {
-    herr_t       ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", err_id);
 
     /* Check arguments */
-    if(H5I_ERROR_MSG != H5I_get_type(err_id))
+    if (H5I_ERROR_MSG != H5I_get_type(err_id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an error class")
 
     /* Decrement the counter.  It will be freed if the count reaches zero. */
-    if(H5I_dec_app_ref(err_id) < 0)
+    if (H5I_dec_app_ref(err_id) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTDEC, FAIL, "unable to decrement ref count on error message")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eclose_msg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_close_msg
  *
@@ -750,7 +728,6 @@ H5E_close_msg(H5E_msg_t *err)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5E_close_msg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Ecreate_msg
  *
@@ -766,29 +743,29 @@ H5E_close_msg(H5E_msg_t *err)
 hid_t
 H5Ecreate_msg(hid_t class_id, H5E_type_t msg_type, const char *msg_str)
 {
-    H5E_cls_t   *cls;           /* Pointer to error class */
-    H5E_msg_t   *msg;           /* Pointer to new error message */
-    hid_t       ret_value;      /* Return value */
+    H5E_cls_t *cls;       /* Pointer to error class */
+    H5E_msg_t *msg;       /* Pointer to new error message */
+    hid_t      ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "iEt*s", class_id, msg_type, msg_str);
 
     /* Check arguments */
-    if(msg_type != H5E_MAJOR && msg_type != H5E_MINOR)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid message type")
-    if(msg_str == NULL)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "message is NULL")
+    if (msg_type != H5E_MAJOR && msg_type != H5E_MINOR)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid message type")
+    if (msg_str == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "message is NULL")
 
     /* Get the error class */
-    if(NULL == (cls = (H5E_cls_t *)H5I_object_verify(class_id, H5I_ERROR_CLASS)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error class ID")
+    if (NULL == (cls = (H5E_cls_t *)H5I_object_verify(class_id, H5I_ERROR_CLASS)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error class ID")
 
     /* Create the new error message object */
-    if(NULL == (msg = H5E_create_msg(cls, msg_type, msg_str)))
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTCREATE, FAIL, "can't create error message")
+    if (NULL == (msg = H5E_create_msg(cls, msg_type, msg_str)))
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTCREATE, FAIL, "can't create error message")
 
     /* Register the new error class to get an ID for it */
-    if((ret_value = H5I_register(H5I_ERROR_MSG, msg, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_ERROR_MSG, msg, TRUE)) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 done:
@@ -810,8 +787,8 @@ done:
 static H5E_msg_t *
 H5E_create_msg(H5E_cls_t *cls, H5E_type_t msg_type, const char *msg_str)
 {
-    H5E_msg_t   *msg = NULL;    /* Pointer to new error message */
-    H5E_msg_t   *ret_value;     /* Return value */
+    H5E_msg_t *msg = NULL; /* Pointer to new error message */
+    H5E_msg_t *ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -821,27 +798,26 @@ H5E_create_msg(H5E_cls_t *cls, H5E_type_t msg_type, const char *msg_str)
     HDassert(msg_str);
 
     /* Allocate new message object */
-    if(NULL == (msg = H5FL_MALLOC(H5E_msg_t)))
+    if (NULL == (msg = H5FL_MALLOC(H5E_msg_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Fill new message object */
-    msg->cls = cls;
+    msg->cls  = cls;
     msg->type = msg_type;
-    if(NULL == (msg->msg = H5MM_xstrdup(msg_str)))
+    if (NULL == (msg->msg = H5MM_xstrdup(msg_str)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set return value */
     ret_value = msg;
 
 done:
-    if(!ret_value)
-        if(msg && H5E_close_msg(msg) < 0)
+    if (!ret_value)
+        if (msg && H5E_close_msg(msg) < 0)
             HDONE_ERROR(H5E_ERROR, H5E_CANTCLOSEOBJ, NULL, "unable to close error message")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_create_msg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eget_msg
  *
@@ -858,25 +834,24 @@ done:
 ssize_t
 H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg_str, size_t size)
 {
-    H5E_msg_t   *msg;           /* Pointer to error message */
-    ssize_t      ret_value;     /* Return value */
+    H5E_msg_t *msg;       /* Pointer to error message */
+    ssize_t    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("Zs", "i*Et*sz", msg_id, type, msg_str, size);
 
     /* Get the message object */
-    if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(msg_id, H5I_ERROR_MSG)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error message ID")
+    if (NULL == (msg = (H5E_msg_t *)H5I_object_verify(msg_id, H5I_ERROR_MSG)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error message ID")
 
     /* Get the message's text */
-    if((ret_value = H5E_get_msg(msg, type, msg_str, size)) < 0)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get error message text")
+    if ((ret_value = H5E_get_msg(msg, type, msg_str, size)) < 0)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get error message text")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eget_msg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Ecreate_stack
  *
@@ -892,28 +867,27 @@ done:
 hid_t
 H5Ecreate_stack(void)
 {
-    H5E_t	*stk;           /* Error stack */
-    hid_t       ret_value;      /* Return value */
+    H5E_t *stk;       /* Error stack */
+    hid_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE0("i","");
+    H5TRACE0("i", "");
 
     /* Allocate a new error stack */
-    if(NULL == (stk = H5FL_CALLOC(H5E_t)))
+    if (NULL == (stk = H5FL_CALLOC(H5E_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Set the "automatic" error reporting info to the library default */
     H5E_set_default_auto(stk);
 
     /* Register the stack */
-    if((ret_value = H5I_register(H5I_ERROR_STACK, stk, TRUE)) < 0)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't create error stack")
+    if ((ret_value = H5I_register(H5I_ERROR_STACK, stk, TRUE)) < 0)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't create error stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ecreate_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eget_current_stack
  *
@@ -930,26 +904,25 @@ done:
 hid_t
 H5Eget_current_stack(void)
 {
-    H5E_t	*stk;           /* Error stack */
-    hid_t       ret_value;   /* Return value */
+    H5E_t *stk;       /* Error stack */
+    hid_t  ret_value; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
-    H5TRACE0("i","");
+    H5TRACE0("i", "");
 
     /* Get the current stack */
-    if(NULL == (stk = H5E_get_current_stack()))
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTCREATE, FAIL, "can't create error stack")
+    if (NULL == (stk = H5E_get_current_stack()))
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTCREATE, FAIL, "can't create error stack")
 
     /* Register the stack */
-    if((ret_value = H5I_register(H5I_ERROR_STACK, stk, TRUE)) < 0)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't create error stack")
+    if ((ret_value = H5I_register(H5I_ERROR_STACK, stk, TRUE)) < 0)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't create error stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eget_current_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_get_current_stack
  *
@@ -965,51 +938,52 @@ done:
 static H5E_t *
 H5E_get_current_stack(void)
 {
-    H5E_t	*current_stack; /* Pointer to the current error stack */
-    H5E_t	*estack_copy=NULL;   /* Pointer to new error stack to return */
-    unsigned    u;              /* Local index variable */
-    H5E_t      *ret_value;   /* Return value */
+    H5E_t *  current_stack;      /* Pointer to the current error stack */
+    H5E_t *  estack_copy = NULL; /* Pointer to new error stack to return */
+    unsigned u;                  /* Local index variable */
+    H5E_t *  ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get a pointer to the current error stack */
-    if(NULL == (current_stack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get current error stack")
+    if (NULL == (current_stack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                         non-threaded case */
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get current error stack")
 
     /* Allocate a new error stack */
-    if(NULL == (estack_copy = H5FL_CALLOC(H5E_t)))
+    if (NULL == (estack_copy = H5FL_CALLOC(H5E_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Make a copy of current error stack */
     estack_copy->nused = current_stack->nused;
-    for(u = 0; u < current_stack->nused; u++) {
+    for (u = 0; u < current_stack->nused; u++) {
         H5E_error2_t *current_error, *new_error; /* Pointers to errors on each stack */
 
         /* Get pointers into the current error stack location */
         current_error = &(current_stack->slot[u]);
-        new_error = &(estack_copy->slot[u]);
+        new_error     = &(estack_copy->slot[u]);
 
         /* Increment the IDs to indicate that they are used in this stack */
-        if(H5I_inc_ref(current_error->cls_id, FALSE) < 0)
+        if (H5I_inc_ref(current_error->cls_id, FALSE) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTINC, NULL, "unable to increment ref count on error class")
         new_error->cls_id = current_error->cls_id;
-        if(H5I_inc_ref(current_error->maj_num, FALSE) < 0)
+        if (H5I_inc_ref(current_error->maj_num, FALSE) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTINC, NULL, "unable to increment ref count on error message")
         new_error->maj_num = current_error->maj_num;
-        if(H5I_inc_ref(current_error->min_num, FALSE) < 0)
+        if (H5I_inc_ref(current_error->min_num, FALSE) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTINC, NULL, "unable to increment ref count on error message")
         new_error->min_num = current_error->min_num;
-        if(NULL == (new_error->func_name = H5MM_xstrdup(current_error->func_name)))
+        if (NULL == (new_error->func_name = H5MM_xstrdup(current_error->func_name)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-        if(NULL == (new_error->file_name = H5MM_xstrdup(current_error->file_name)))
+        if (NULL == (new_error->file_name = H5MM_xstrdup(current_error->file_name)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
         new_error->line = current_error->line;
-        if(NULL == (new_error->desc = H5MM_xstrdup(current_error->desc)))
+        if (NULL == (new_error->desc = H5MM_xstrdup(current_error->desc)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     } /* end for */
 
     /* Copy the "automatic" error reporting information */
-    estack_copy->auto_op = current_stack->auto_op;
+    estack_copy->auto_op   = current_stack->auto_op;
     estack_copy->auto_data = current_stack->auto_data;
 
     /* Empty current error stack */
@@ -1019,14 +993,13 @@ H5E_get_current_stack(void)
     ret_value = estack_copy;
 
 done:
-    if(ret_value == NULL)
-        if(estack_copy)
+    if (ret_value == NULL)
+        if (estack_copy)
             estack_copy = H5FL_FREE(H5E_t, estack_copy);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_get_current_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eset_current_stack
  *
@@ -1042,31 +1015,31 @@ done:
  *              Raymond Lu
  *              7 September 2010
  *              Also closes the stack to avoid potential problem (bug 1799)
- * 
+ *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Eset_current_stack(hid_t err_stack)
 {
     H5E_t *estack;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", err_stack);
 
-    if(err_stack != H5E_DEFAULT) {
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
+    if (err_stack != H5E_DEFAULT) {
+        if (NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
 
         /* Set the current error stack */
-        if(H5E_set_current_stack(estack) < 0)
+        if (H5E_set_current_stack(estack) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "unable to set error stack")
 
         /*
          * Decrement the counter on the error stack.  It will be freed if the count
          * reaches zero.
          */
-        if(H5I_dec_app_ref(err_stack) < 0)
+        if (H5I_dec_app_ref(err_stack) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTDEC, FAIL, "unable to decrement ref count on error stack")
     } /* end if */
 
@@ -1074,7 +1047,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eset_current_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_set_current_stack
  *
@@ -1090,9 +1062,9 @@ done:
 static herr_t
 H5E_set_current_stack(H5E_t *estack)
 {
-    H5E_t	*current_stack;         /* Default error stack */
-    unsigned     u;                     /* Local index variable */
-    herr_t       ret_value = SUCCEED;   /* Return value */
+    H5E_t *  current_stack;       /* Default error stack */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1100,37 +1072,38 @@ H5E_set_current_stack(H5E_t *estack)
     HDassert(estack);
 
     /* Get a pointer to the current error stack */
-    if(NULL == (current_stack = H5E_get_my_stack ())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
+    if (NULL == (current_stack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                         non-threaded case */
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
 
     /* Empty current error stack */
     H5E_clear_stack(current_stack);
 
     /* Copy new stack to current error stack */
     current_stack->nused = estack->nused;
-    for(u = 0; u < current_stack->nused; u++) {
+    for (u = 0; u < current_stack->nused; u++) {
         H5E_error2_t *current_error, *new_error; /* Pointers to errors on each stack */
 
         /* Get pointers into the current error stack location */
         current_error = &(current_stack->slot[u]);
-        new_error = &(estack->slot[u]);
+        new_error     = &(estack->slot[u]);
 
         /* Increment the IDs to indicate that they are used in this stack */
-        if(H5I_inc_ref(new_error->cls_id, FALSE) < 0)
+        if (H5I_inc_ref(new_error->cls_id, FALSE) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTINC, FAIL, "unable to increment ref count on error class")
         current_error->cls_id = new_error->cls_id;
-        if(H5I_inc_ref(new_error->maj_num, FALSE) < 0)
+        if (H5I_inc_ref(new_error->maj_num, FALSE) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTINC, FAIL, "unable to increment ref count on error class")
         current_error->maj_num = new_error->maj_num;
-        if(H5I_inc_ref(new_error->min_num, FALSE) < 0)
+        if (H5I_inc_ref(new_error->min_num, FALSE) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTINC, FAIL, "unable to increment ref count on error class")
         current_error->min_num = new_error->min_num;
-        if(NULL == (current_error->func_name = H5MM_xstrdup(new_error->func_name)))
+        if (NULL == (current_error->func_name = H5MM_xstrdup(new_error->func_name)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-        if(NULL == (current_error->file_name = H5MM_xstrdup(new_error->file_name)))
+        if (NULL == (current_error->file_name = H5MM_xstrdup(new_error->file_name)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
         current_error->line = new_error->line;
-        if(NULL == (current_error->desc = H5MM_xstrdup(new_error->desc)))
+        if (NULL == (current_error->desc = H5MM_xstrdup(new_error->desc)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     } /* end for */
 
@@ -1138,7 +1111,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_set_current_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eclose_stack
  *
@@ -1154,21 +1126,21 @@ done:
 herr_t
 H5Eclose_stack(hid_t stack_id)
 {
-    herr_t       ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", stack_id);
 
-    if(H5E_DEFAULT != stack_id) {
+    if (H5E_DEFAULT != stack_id) {
         /* Check arguments */
-        if(H5I_ERROR_STACK != H5I_get_type(stack_id))
+        if (H5I_ERROR_STACK != H5I_get_type(stack_id))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
 
         /*
          * Decrement the counter on the error stack.  It will be freed if the count
          * reaches zero.
          */
-        if(H5I_dec_app_ref(stack_id) < 0)
+        if (H5I_dec_app_ref(stack_id) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTDEC, FAIL, "unable to decrement ref count on error stack")
     } /* end if */
 
@@ -1176,7 +1148,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eclose_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_close_stack
  *
@@ -1206,7 +1177,6 @@ H5E_close_stack(H5E_t *estack)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5E_close_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eget_num
  *
@@ -1222,16 +1192,17 @@ H5E_close_stack(H5E_t *estack)
 ssize_t
 H5Eget_num(hid_t error_stack_id)
 {
-    H5E_t *estack;         /* Error stack to operate on */
-    ssize_t ret_value;      /* Return value */
+    H5E_t * estack;    /* Error stack to operate on */
+    ssize_t ret_value; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     H5TRACE1("Zs", "i", error_stack_id);
 
     /* Need to check for errors */
-    if(error_stack_id == H5E_DEFAULT) {
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (error_stack_id == H5E_DEFAULT) {
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
     } /* end if */
     else {
@@ -1239,19 +1210,18 @@ H5Eget_num(hid_t error_stack_id)
         H5E_clear_stack(NULL);
 
         /* Get the error stack to operate on */
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(error_stack_id, H5I_ERROR_STACK)))
+        if (NULL == (estack = (H5E_t *)H5I_object_verify(error_stack_id, H5I_ERROR_STACK)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
     } /* end else */
 
     /* Get the number of errors on stack */
-    if((ret_value = H5E_get_num(estack)) < 0)
+    if ((ret_value = H5E_get_num(estack)) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get number of errors")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eget_num() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_get_num
  *
@@ -1274,7 +1244,6 @@ H5E_get_num(const H5E_t *estack)
     FUNC_LEAVE_NOAPI((ssize_t)estack->nused)
 } /* end H5E_get_num() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Epop
  *
@@ -1291,15 +1260,16 @@ herr_t
 H5Epop(hid_t err_stack, size_t count)
 {
     H5E_t *estack;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     H5TRACE2("e", "iz", err_stack, count);
 
     /* Need to check for errors */
-    if(err_stack == H5E_DEFAULT) {
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (err_stack == H5E_DEFAULT) {
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
     } /* end if */
     else {
@@ -1307,23 +1277,22 @@ H5Epop(hid_t err_stack, size_t count)
         H5E_clear_stack(NULL);
 
         /* Get the error stack to operate on */
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
+        if (NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
     } /* end else */
 
     /* Range limit the number of errors to pop off stack */
-    if(count > estack->nused)
+    if (count > estack->nused)
         count = estack->nused;
 
     /* Pop the errors off the stack */
-    if(H5E_pop(estack, count) < 0)
+    if (H5E_pop(estack, count) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTRELEASE, FAIL, "can't pop errors from stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Epop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Epush2
  *
@@ -1346,39 +1315,38 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line,
-        hid_t cls_id, hid_t maj_id, hid_t min_id, const char *fmt, ...)
+H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, hid_t cls_id, hid_t maj_id,
+         hid_t min_id, const char *fmt, ...)
 {
-    va_list     ap;             /* Varargs info */
-    H5E_t       *estack;        /* Pointer to error stack to modify */
+    va_list ap;     /* Varargs info */
+    H5E_t * estack; /* Pointer to error stack to modify */
 #ifndef H5_HAVE_VASPRINTF
-    int         tmp_len;        /* Current size of description buffer */
-    int         desc_len;       /* Actual length of description when formatted */
-#endif /* H5_HAVE_VASPRINTF */
-    char        *tmp = NULL;      /* Buffer to place formatted description in */
-    hbool_t     va_started = FALSE; /* Whether the variable argument list is open */
-    herr_t	ret_value=SUCCEED;      /* Return value */
+    int tmp_len;                  /* Current size of description buffer */
+    int desc_len;                 /* Actual length of description when formatted */
+#endif                            /* H5_HAVE_VASPRINTF */
+    char *  tmp        = NULL;    /* Buffer to place formatted description in */
+    hbool_t va_started = FALSE;   /* Whether the variable argument list is open */
+    herr_t  ret_value  = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
-    H5TRACE8("e", "i*s*sIuiii*s", err_stack, file, func, line, cls_id, maj_id,
-             min_id, fmt);
+    H5TRACE8("e", "i*s*sIuiii*s", err_stack, file, func, line, cls_id, maj_id, min_id, fmt);
 
-    if(err_stack == H5E_DEFAULT)
-    	estack = NULL;
+    if (err_stack == H5E_DEFAULT)
+        estack = NULL;
     else {
         /* Only clear the error stack if it's not the default stack */
         H5E_clear_stack(NULL);
 
         /* Get the error stack to operate on */
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
+        if (NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
     } /* end else */
 
-/* Note that the variable-argument parsing for the format is identical in
- *      the H5E_printf_stack() routine - correct errors and make changes in both
- *      places. -QAK
- */
+    /* Note that the variable-argument parsing for the format is identical in
+     *      the H5E_printf_stack() routine - correct errors and make changes in both
+     *      places. -QAK
+     */
 
     /* Format the description */
     va_start(ap, fmt);
@@ -1386,16 +1354,16 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line,
 
 #ifdef H5_HAVE_VASPRINTF
     /* Use the vasprintf() routine, since it does what we're trying to do below */
-    if(HDvasprintf(&tmp, fmt, ap) < 0)
+    if (HDvasprintf(&tmp, fmt, ap) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-#else /* H5_HAVE_VASPRINTF */
+#else  /* H5_HAVE_VASPRINTF */
     /* Allocate space for the formatted description buffer */
     tmp_len = 128;
-    if(NULL == (tmp = H5MM_malloc((size_t)tmp_len)))
+    if (NULL == (tmp = H5MM_malloc((size_t)tmp_len)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* If the description doesn't fit into the initial buffer size, allocate more space and try again */
-    while((desc_len = HDvsnprintf(tmp, (size_t)tmp_len, fmt, ap)) > (tmp_len - 1)) {
+    while ((desc_len = HDvsnprintf(tmp, (size_t)tmp_len, fmt, ap)) > (tmp_len - 1)) {
         /* shutdown & restart the va_list */
         va_end(ap);
         va_start(ap, fmt);
@@ -1405,25 +1373,24 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line,
 
         /* Allocate a description of the appropriate length */
         tmp_len = desc_len + 1;
-        if(NULL == (tmp = H5MM_malloc((size_t)tmp_len)))
+        if (NULL == (tmp = H5MM_malloc((size_t)tmp_len)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     } /* end while */
 #endif /* H5_HAVE_VASPRINTF */
 
     /* Push the error on the stack */
-    if(H5E_push_stack(estack, file, func, line, cls_id, maj_id, min_id, tmp) < 0)
+    if (H5E_push_stack(estack, file, func, line, cls_id, maj_id, min_id, tmp) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't push error on stack")
 
 done:
-    if(va_started)
+    if (va_started)
         va_end(ap);
-    if(tmp)
+    if (tmp)
         H5MM_xfree(tmp);
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Epush2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eclear2
  *
@@ -1439,33 +1406,32 @@ done:
 herr_t
 H5Eclear2(hid_t err_stack)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5E_t *estack;              /* Error stack to operate on */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     H5TRACE1("e", "i", err_stack);
 
     /* Need to check for errors */
-    if(err_stack == H5E_DEFAULT)
-    	estack = NULL;
+    if (err_stack == H5E_DEFAULT)
+        estack = NULL;
     else {
         /* Only clear the error stack if it's not the default stack */
         H5E_clear_stack(NULL);
 
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
+        if (NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
     } /* end else */
 
     /* Clear the error stack */
-    if(H5E_clear_stack(estack) < 0)
+    if (H5E_clear_stack(estack) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't clear error stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eclear2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eprint2
  *
@@ -1484,35 +1450,35 @@ done:
 herr_t
 H5Eprint2(hid_t err_stack, FILE *stream)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5E_t *estack;              /* Error stack to operate on */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     /*NO TRACE*/
 
     /* Need to check for errors */
-    if(err_stack == H5E_DEFAULT) {
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (err_stack == H5E_DEFAULT) {
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
     } /* end if */
     else {
         /* Only clear the error stack if it's not the default stack */
         H5E_clear_stack(NULL);
 
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
+        if (NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
     } /* end else */
 
     /* Print error stack */
-    if(H5E_print(estack, stream, FALSE) < 0)
+    if (H5E_print(estack, stream, FALSE) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't display error stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eprint2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Ewalk2
  *
@@ -1529,38 +1495,38 @@ done:
 herr_t
 H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t stack_func, void *client_data)
 {
-    H5E_t *estack;                      /* Error stack to operate on */
-    H5E_walk_op_t op;                   /* Operator for walking error stack */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5E_t *       estack;              /* Error stack to operate on */
+    H5E_walk_op_t op;                  /* Operator for walking error stack */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     /*NO TRACE*/
 
     /* Need to check for errors */
-    if(err_stack == H5E_DEFAULT) {
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (err_stack == H5E_DEFAULT) {
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
     } /* end if */
     else {
         /* Only clear the error stack if it's not the default stack */
         H5E_clear_stack(NULL);
 
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
+        if (NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
     } /* end else */
 
     /* Walk the error stack */
-    op.vers = 2;
+    op.vers    = 2;
     op.u.func2 = stack_func;
-    if(H5E_walk(estack, direction, &op, client_data) < 0)
+    if (H5E_walk(estack, direction, &op, client_data) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't walk error stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ewalk2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eget_auto2
  *
@@ -1576,47 +1542,46 @@ done:
  *
  * Modification:Raymond Lu
  *              4 October 2010
- *              If the printing function isn't the default H5Eprint1 or 2, 
- *              and H5Eset_auto1 has been called to set the old style 
+ *              If the printing function isn't the default H5Eprint1 or 2,
+ *              and H5Eset_auto1 has been called to set the old style
  *              printing function, a call to H5Eget_auto2 should fail.
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
-    H5E_auto_op_t op;           /* Error stack function */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5E_t *       estack;              /* Error stack to operate on */
+    H5E_auto_op_t op;                  /* Error stack function */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*x**x", estack_id, func, client_data);
 
-    if(estack_id == H5E_DEFAULT) {
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (estack_id == H5E_DEFAULT) {
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
     } /* end if */
-    else
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(estack_id, H5I_ERROR_STACK)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
+    else if (NULL == (estack = (H5E_t *)H5I_object_verify(estack_id, H5I_ERROR_STACK)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
 
     /* Get the automatic error reporting information */
-    if(H5E_get_auto(estack, &op, client_data) < 0)
+    if (H5E_get_auto(estack, &op, client_data) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get automatic error info")
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
     /* Fail if the printing function isn't the default(user-set) and set through H5Eset_auto1 */
-    if(!op.is_default && op.vers == 1)
+    if (!op.is_default && op.vers == 1)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "wrong API function, H5Eset_auto1 has been called")
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-    if(func)
+    if (func)
         *func = op.func2;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eget_auto2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eset_auto2
  *
@@ -1645,29 +1610,29 @@ done:
 herr_t
 H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
-    H5E_auto_op_t op;           /* Error stack operator */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5E_t *       estack;              /* Error stack to operate on */
+    H5E_auto_op_t op;                  /* Error stack operator */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     H5TRACE3("e", "ix*x", estack_id, func, client_data);
 
-    if(estack_id == H5E_DEFAULT) {
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (estack_id == H5E_DEFAULT) {
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
     } /* end if */
-    else
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(estack_id, H5I_ERROR_STACK)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
+    else if (NULL == (estack = (H5E_t *)H5I_object_verify(estack_id, H5I_ERROR_STACK)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
     /* Get the automatic error reporting information */
-    if(H5E_get_auto(estack, &op, NULL) < 0)
+    if (H5E_get_auto(estack, &op, NULL) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get automatic error info")
 
     /* Set the automatic error reporting information */
-    if(func != op.func2_default)
+    if (func != op.func2_default)
         op.is_default = FALSE;
     else
         op.is_default = TRUE;
@@ -1678,14 +1643,13 @@ H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data)
     /* Set the automatic error reporting function */
     op.func2 = func;
 
-    if(H5E_set_auto(estack, &op, client_data) < 0)
+    if (H5E_set_auto(estack, &op, client_data) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't set automatic error info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eset_auto2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eauto_is_v2
  *
@@ -1704,22 +1668,22 @@ done:
 herr_t
 H5Eauto_is_v2(hid_t estack_id, unsigned *is_stack)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
+    H5E_t *estack;              /* Error stack to operate on */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Iu", estack_id, is_stack);
 
-    if(estack_id == H5E_DEFAULT) {
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (estack_id == H5E_DEFAULT) {
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
     } /* end if */
-    else
-        if(NULL == (estack = (H5E_t *)H5I_object_verify(estack_id, H5I_ERROR_STACK)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
+    else if (NULL == (estack = (H5E_t *)H5I_object_verify(estack_id, H5I_ERROR_STACK)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID")
 
     /* Check if the error stack reporting function is the "newer" stack type */
-    if(is_stack)
+    if (is_stack)
 #ifndef H5_NO_DEPRECATED_SYMBOLS
         *is_stack = estack->auto_op.vers > 1;
 #else
@@ -1729,4 +1693,3 @@ H5Eauto_is_v2(hid_t estack_id, unsigned *is_stack)
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eauto_is_v2() */
-
diff --git a/src/H5Edefin.h b/src/H5Edefin.h
index 6c0e794..e3f65d3 100644
--- a/src/H5Edefin.h
+++ b/src/H5Edefin.h
@@ -14,201 +14,200 @@
 /* Generated automatically by bin/make_err -- do not edit */
 /* Add new errors to H5err.txt file */
 
-
 #ifndef _H5Edefin_H
 #define _H5Edefin_H
 
 /* Major error IDs */
-hid_t H5E_DATASET_g        = FAIL;      /* Dataset */
-hid_t H5E_FUNC_g           = FAIL;      /* Function entry/exit */
-hid_t H5E_STORAGE_g        = FAIL;      /* Data storage */
-hid_t H5E_FILE_g           = FAIL;      /* File accessibilty */
-hid_t H5E_SOHM_g           = FAIL;      /* Shared Object Header Messages */
-hid_t H5E_SYM_g            = FAIL;      /* Symbol table */
-hid_t H5E_PLUGIN_g         = FAIL;      /* Plugin for dynamically loaded library */
-hid_t H5E_VFL_g            = FAIL;      /* Virtual File Layer */
-hid_t H5E_INTERNAL_g       = FAIL;      /* Internal error (too specific to document in detail) */
-hid_t H5E_BTREE_g          = FAIL;      /* B-Tree node */
-hid_t H5E_REFERENCE_g      = FAIL;      /* References */
-hid_t H5E_DATASPACE_g      = FAIL;      /* Dataspace */
-hid_t H5E_RESOURCE_g       = FAIL;      /* Resource unavailable */
-hid_t H5E_PLIST_g          = FAIL;      /* Property lists */
-hid_t H5E_LINK_g           = FAIL;      /* Links */
-hid_t H5E_DATATYPE_g       = FAIL;      /* Datatype */
-hid_t H5E_RS_g             = FAIL;      /* Reference Counted Strings */
-hid_t H5E_HEAP_g           = FAIL;      /* Heap */
-hid_t H5E_OHDR_g           = FAIL;      /* Object header */
-hid_t H5E_ATOM_g           = FAIL;      /* Object atom */
-hid_t H5E_ATTR_g           = FAIL;      /* Attribute */
-hid_t H5E_NONE_MAJOR_g     = FAIL;      /* No error */
-hid_t H5E_IO_g             = FAIL;      /* Low-level I/O */
-hid_t H5E_SLIST_g          = FAIL;      /* Skip Lists */
-hid_t H5E_EFL_g            = FAIL;      /* External file list */
-hid_t H5E_TST_g            = FAIL;      /* Ternary Search Trees */
-hid_t H5E_ARGS_g           = FAIL;      /* Invalid arguments to routine */
-hid_t H5E_ERROR_g          = FAIL;      /* Error API */
-hid_t H5E_PLINE_g          = FAIL;      /* Data filters */
-hid_t H5E_FSPACE_g         = FAIL;      /* Free Space Manager */
-hid_t H5E_CACHE_g          = FAIL;      /* Object cache */
+hid_t H5E_DATASET_g    = FAIL; /* Dataset */
+hid_t H5E_FUNC_g       = FAIL; /* Function entry/exit */
+hid_t H5E_STORAGE_g    = FAIL; /* Data storage */
+hid_t H5E_FILE_g       = FAIL; /* File accessibilty */
+hid_t H5E_SOHM_g       = FAIL; /* Shared Object Header Messages */
+hid_t H5E_SYM_g        = FAIL; /* Symbol table */
+hid_t H5E_PLUGIN_g     = FAIL; /* Plugin for dynamically loaded library */
+hid_t H5E_VFL_g        = FAIL; /* Virtual File Layer */
+hid_t H5E_INTERNAL_g   = FAIL; /* Internal error (too specific to document in detail) */
+hid_t H5E_BTREE_g      = FAIL; /* B-Tree node */
+hid_t H5E_REFERENCE_g  = FAIL; /* References */
+hid_t H5E_DATASPACE_g  = FAIL; /* Dataspace */
+hid_t H5E_RESOURCE_g   = FAIL; /* Resource unavailable */
+hid_t H5E_PLIST_g      = FAIL; /* Property lists */
+hid_t H5E_LINK_g       = FAIL; /* Links */
+hid_t H5E_DATATYPE_g   = FAIL; /* Datatype */
+hid_t H5E_RS_g         = FAIL; /* Reference Counted Strings */
+hid_t H5E_HEAP_g       = FAIL; /* Heap */
+hid_t H5E_OHDR_g       = FAIL; /* Object header */
+hid_t H5E_ATOM_g       = FAIL; /* Object atom */
+hid_t H5E_ATTR_g       = FAIL; /* Attribute */
+hid_t H5E_NONE_MAJOR_g = FAIL; /* No error */
+hid_t H5E_IO_g         = FAIL; /* Low-level I/O */
+hid_t H5E_SLIST_g      = FAIL; /* Skip Lists */
+hid_t H5E_EFL_g        = FAIL; /* External file list */
+hid_t H5E_TST_g        = FAIL; /* Ternary Search Trees */
+hid_t H5E_ARGS_g       = FAIL; /* Invalid arguments to routine */
+hid_t H5E_ERROR_g      = FAIL; /* Error API */
+hid_t H5E_PLINE_g      = FAIL; /* Data filters */
+hid_t H5E_FSPACE_g     = FAIL; /* Free Space Manager */
+hid_t H5E_CACHE_g      = FAIL; /* Object cache */
 
 /* Minor error IDs */
 
 /* Generic low-level file I/O errors */
-hid_t H5E_SEEKERROR_g      = FAIL;      /* Seek failed */
-hid_t H5E_READERROR_g      = FAIL;      /* Read failed */
-hid_t H5E_WRITEERROR_g     = FAIL;      /* Write failed */
-hid_t H5E_CLOSEERROR_g     = FAIL;      /* Close failed */
-hid_t H5E_OVERFLOW_g       = FAIL;      /* Address overflowed */
-hid_t H5E_FCNTL_g          = FAIL;      /* File control (fcntl) failed */
+hid_t H5E_SEEKERROR_g  = FAIL; /* Seek failed */
+hid_t H5E_READERROR_g  = FAIL; /* Read failed */
+hid_t H5E_WRITEERROR_g = FAIL; /* Write failed */
+hid_t H5E_CLOSEERROR_g = FAIL; /* Close failed */
+hid_t H5E_OVERFLOW_g   = FAIL; /* Address overflowed */
+hid_t H5E_FCNTL_g      = FAIL; /* File control (fcntl) failed */
 
 /* Resource errors */
-hid_t H5E_NOSPACE_g        = FAIL;      /* No space available for allocation */
-hid_t H5E_CANTALLOC_g      = FAIL;      /* Can't allocate space */
-hid_t H5E_CANTCOPY_g       = FAIL;      /* Unable to copy object */
-hid_t H5E_CANTFREE_g       = FAIL;      /* Unable to free object */
-hid_t H5E_ALREADYEXISTS_g  = FAIL;      /* Object already exists */
-hid_t H5E_CANTLOCK_g       = FAIL;      /* Unable to lock object */
-hid_t H5E_CANTUNLOCK_g     = FAIL;      /* Unable to unlock object */
-hid_t H5E_CANTGC_g         = FAIL;      /* Unable to garbage collect */
-hid_t H5E_CANTGETSIZE_g    = FAIL;      /* Unable to compute size */
-hid_t H5E_OBJOPEN_g        = FAIL;      /* Object is already open */
+hid_t H5E_NOSPACE_g       = FAIL; /* No space available for allocation */
+hid_t H5E_CANTALLOC_g     = FAIL; /* Can't allocate space */
+hid_t H5E_CANTCOPY_g      = FAIL; /* Unable to copy object */
+hid_t H5E_CANTFREE_g      = FAIL; /* Unable to free object */
+hid_t H5E_ALREADYEXISTS_g = FAIL; /* Object already exists */
+hid_t H5E_CANTLOCK_g      = FAIL; /* Unable to lock object */
+hid_t H5E_CANTUNLOCK_g    = FAIL; /* Unable to unlock object */
+hid_t H5E_CANTGC_g        = FAIL; /* Unable to garbage collect */
+hid_t H5E_CANTGETSIZE_g   = FAIL; /* Unable to compute size */
+hid_t H5E_OBJOPEN_g       = FAIL; /* Object is already open */
 
 /* Heap errors */
-hid_t H5E_CANTRESTORE_g    = FAIL;      /* Can't restore condition */
-hid_t H5E_CANTCOMPUTE_g    = FAIL;      /* Can't compute value */
-hid_t H5E_CANTEXTEND_g     = FAIL;      /* Can't extend heap's space */
-hid_t H5E_CANTATTACH_g     = FAIL;      /* Can't attach object */
-hid_t H5E_CANTUPDATE_g     = FAIL;      /* Can't update object */
-hid_t H5E_CANTOPERATE_g    = FAIL;      /* Can't operate on object */
+hid_t H5E_CANTRESTORE_g = FAIL; /* Can't restore condition */
+hid_t H5E_CANTCOMPUTE_g = FAIL; /* Can't compute value */
+hid_t H5E_CANTEXTEND_g  = FAIL; /* Can't extend heap's space */
+hid_t H5E_CANTATTACH_g  = FAIL; /* Can't attach object */
+hid_t H5E_CANTUPDATE_g  = FAIL; /* Can't update object */
+hid_t H5E_CANTOPERATE_g = FAIL; /* Can't operate on object */
 
 /* Function entry/exit interface errors */
-hid_t H5E_CANTINIT_g       = FAIL;      /* Unable to initialize object */
-hid_t H5E_ALREADYINIT_g    = FAIL;      /* Object already initialized */
-hid_t H5E_CANTRELEASE_g    = FAIL;      /* Unable to release object */
+hid_t H5E_CANTINIT_g    = FAIL; /* Unable to initialize object */
+hid_t H5E_ALREADYINIT_g = FAIL; /* Object already initialized */
+hid_t H5E_CANTRELEASE_g = FAIL; /* Unable to release object */
 
 /* Property list errors */
-hid_t H5E_CANTGET_g        = FAIL;      /* Can't get value */
-hid_t H5E_CANTSET_g        = FAIL;      /* Can't set value */
-hid_t H5E_DUPCLASS_g       = FAIL;      /* Duplicate class name in parent class */
-hid_t H5E_SETDISALLOWED_g  = FAIL;      /* Disallowed operation */
+hid_t H5E_CANTGET_g       = FAIL; /* Can't get value */
+hid_t H5E_CANTSET_g       = FAIL; /* Can't set value */
+hid_t H5E_DUPCLASS_g      = FAIL; /* Duplicate class name in parent class */
+hid_t H5E_SETDISALLOWED_g = FAIL; /* Disallowed operation */
 
 /* Free space errors */
-hid_t H5E_CANTMERGE_g      = FAIL;      /* Can't merge objects */
-hid_t H5E_CANTREVIVE_g     = FAIL;      /* Can't revive object */
-hid_t H5E_CANTSHRINK_g     = FAIL;      /* Can't shrink container */
+hid_t H5E_CANTMERGE_g  = FAIL; /* Can't merge objects */
+hid_t H5E_CANTREVIVE_g = FAIL; /* Can't revive object */
+hid_t H5E_CANTSHRINK_g = FAIL; /* Can't shrink container */
 
 /* Object header related errors */
-hid_t H5E_LINKCOUNT_g      = FAIL;      /* Bad object header link count */
-hid_t H5E_VERSION_g        = FAIL;      /* Wrong version number */
-hid_t H5E_ALIGNMENT_g      = FAIL;      /* Alignment error */
-hid_t H5E_BADMESG_g        = FAIL;      /* Unrecognized message */
-hid_t H5E_CANTDELETE_g     = FAIL;      /* Can't delete message */
-hid_t H5E_BADITER_g        = FAIL;      /* Iteration failed */
-hid_t H5E_CANTPACK_g       = FAIL;      /* Can't pack messages */
-hid_t H5E_CANTRESET_g      = FAIL;      /* Can't reset object */
-hid_t H5E_CANTRENAME_g     = FAIL;      /* Unable to rename object */
+hid_t H5E_LINKCOUNT_g  = FAIL; /* Bad object header link count */
+hid_t H5E_VERSION_g    = FAIL; /* Wrong version number */
+hid_t H5E_ALIGNMENT_g  = FAIL; /* Alignment error */
+hid_t H5E_BADMESG_g    = FAIL; /* Unrecognized message */
+hid_t H5E_CANTDELETE_g = FAIL; /* Can't delete message */
+hid_t H5E_BADITER_g    = FAIL; /* Iteration failed */
+hid_t H5E_CANTPACK_g   = FAIL; /* Can't pack messages */
+hid_t H5E_CANTRESET_g  = FAIL; /* Can't reset object */
+hid_t H5E_CANTRENAME_g = FAIL; /* Unable to rename object */
 
 /* System level errors */
-hid_t H5E_SYSERRSTR_g      = FAIL;      /* System error message */
+hid_t H5E_SYSERRSTR_g = FAIL; /* System error message */
 
 /* I/O pipeline errors */
-hid_t H5E_NOFILTER_g       = FAIL;      /* Requested filter is not available */
-hid_t H5E_CALLBACK_g       = FAIL;      /* Callback failed */
-hid_t H5E_CANAPPLY_g       = FAIL;      /* Error from filter 'can apply' callback */
-hid_t H5E_SETLOCAL_g       = FAIL;      /* Error from filter 'set local' callback */
-hid_t H5E_NOENCODER_g      = FAIL;      /* Filter present but encoding disabled */
-hid_t H5E_CANTFILTER_g     = FAIL;      /* Filter operation failed */
+hid_t H5E_NOFILTER_g   = FAIL; /* Requested filter is not available */
+hid_t H5E_CALLBACK_g   = FAIL; /* Callback failed */
+hid_t H5E_CANAPPLY_g   = FAIL; /* Error from filter 'can apply' callback */
+hid_t H5E_SETLOCAL_g   = FAIL; /* Error from filter 'set local' callback */
+hid_t H5E_NOENCODER_g  = FAIL; /* Filter present but encoding disabled */
+hid_t H5E_CANTFILTER_g = FAIL; /* Filter operation failed */
 
 /* Group related errors */
-hid_t H5E_CANTOPENOBJ_g    = FAIL;      /* Can't open object */
-hid_t H5E_CANTCLOSEOBJ_g   = FAIL;      /* Can't close object */
-hid_t H5E_COMPLEN_g        = FAIL;      /* Name component is too long */
-hid_t H5E_PATH_g           = FAIL;      /* Problem with path to object */
+hid_t H5E_CANTOPENOBJ_g  = FAIL; /* Can't open object */
+hid_t H5E_CANTCLOSEOBJ_g = FAIL; /* Can't close object */
+hid_t H5E_COMPLEN_g      = FAIL; /* Name component is too long */
+hid_t H5E_PATH_g         = FAIL; /* Problem with path to object */
 
 /* No error */
-hid_t H5E_NONE_MINOR_g     = FAIL;      /* No error */
+hid_t H5E_NONE_MINOR_g = FAIL; /* No error */
 
 /* Plugin errors */
-hid_t H5E_OPENERROR_g      = FAIL;      /* Can't open directory or file */
+hid_t H5E_OPENERROR_g = FAIL; /* Can't open directory or file */
 
 /* File accessibilty errors */
-hid_t H5E_FILEEXISTS_g     = FAIL;      /* File already exists */
-hid_t H5E_FILEOPEN_g       = FAIL;      /* File already open */
-hid_t H5E_CANTCREATE_g     = FAIL;      /* Unable to create file */
-hid_t H5E_CANTOPENFILE_g   = FAIL;      /* Unable to open file */
-hid_t H5E_CANTCLOSEFILE_g  = FAIL;      /* Unable to close file */
-hid_t H5E_NOTHDF5_g        = FAIL;      /* Not an HDF5 file */
-hid_t H5E_BADFILE_g        = FAIL;      /* Bad file ID accessed */
-hid_t H5E_TRUNCATED_g      = FAIL;      /* File has been truncated */
-hid_t H5E_MOUNT_g          = FAIL;      /* File mount error */
+hid_t H5E_FILEEXISTS_g    = FAIL; /* File already exists */
+hid_t H5E_FILEOPEN_g      = FAIL; /* File already open */
+hid_t H5E_CANTCREATE_g    = FAIL; /* Unable to create file */
+hid_t H5E_CANTOPENFILE_g  = FAIL; /* Unable to open file */
+hid_t H5E_CANTCLOSEFILE_g = FAIL; /* Unable to close file */
+hid_t H5E_NOTHDF5_g       = FAIL; /* Not an HDF5 file */
+hid_t H5E_BADFILE_g       = FAIL; /* Bad file ID accessed */
+hid_t H5E_TRUNCATED_g     = FAIL; /* File has been truncated */
+hid_t H5E_MOUNT_g         = FAIL; /* File mount error */
 
 /* Object atom related errors */
-hid_t H5E_BADATOM_g        = FAIL;      /* Unable to find atom information (already closed?) */
-hid_t H5E_BADGROUP_g       = FAIL;      /* Unable to find ID group information */
-hid_t H5E_CANTREGISTER_g   = FAIL;      /* Unable to register new atom */
-hid_t H5E_CANTINC_g        = FAIL;      /* Unable to increment reference count */
-hid_t H5E_CANTDEC_g        = FAIL;      /* Unable to decrement reference count */
-hid_t H5E_NOIDS_g          = FAIL;      /* Out of IDs for group */
+hid_t H5E_BADATOM_g      = FAIL; /* Unable to find atom information (already closed?) */
+hid_t H5E_BADGROUP_g     = FAIL; /* Unable to find ID group information */
+hid_t H5E_CANTREGISTER_g = FAIL; /* Unable to register new atom */
+hid_t H5E_CANTINC_g      = FAIL; /* Unable to increment reference count */
+hid_t H5E_CANTDEC_g      = FAIL; /* Unable to decrement reference count */
+hid_t H5E_NOIDS_g        = FAIL; /* Out of IDs for group */
 
 /* Cache related errors */
-hid_t H5E_CANTFLUSH_g      = FAIL;      /* Unable to flush data from cache */
-hid_t H5E_CANTSERIALIZE_g  = FAIL;      /* Unable to serialize data from cache */
-hid_t H5E_CANTLOAD_g       = FAIL;      /* Unable to load metadata into cache */
-hid_t H5E_PROTECT_g        = FAIL;      /* Protected metadata error */
-hid_t H5E_NOTCACHED_g      = FAIL;      /* Metadata not currently cached */
-hid_t H5E_SYSTEM_g         = FAIL;      /* Internal error detected */
-hid_t H5E_CANTINS_g        = FAIL;      /* Unable to insert metadata into cache */
-hid_t H5E_CANTPROTECT_g    = FAIL;      /* Unable to protect metadata */
-hid_t H5E_CANTUNPROTECT_g  = FAIL;      /* Unable to unprotect metadata */
-hid_t H5E_CANTPIN_g        = FAIL;      /* Unable to pin cache entry */
-hid_t H5E_CANTUNPIN_g      = FAIL;      /* Unable to un-pin cache entry */
-hid_t H5E_CANTMARKDIRTY_g  = FAIL;      /* Unable to mark a pinned entry as dirty */
-hid_t H5E_CANTDIRTY_g      = FAIL;      /* Unable to mark metadata as dirty */
-hid_t H5E_CANTEXPUNGE_g    = FAIL;      /* Unable to expunge a metadata cache entry */
-hid_t H5E_CANTRESIZE_g     = FAIL;      /* Unable to resize a metadata cache entry */
+hid_t H5E_CANTFLUSH_g     = FAIL; /* Unable to flush data from cache */
+hid_t H5E_CANTSERIALIZE_g = FAIL; /* Unable to serialize data from cache */
+hid_t H5E_CANTLOAD_g      = FAIL; /* Unable to load metadata into cache */
+hid_t H5E_PROTECT_g       = FAIL; /* Protected metadata error */
+hid_t H5E_NOTCACHED_g     = FAIL; /* Metadata not currently cached */
+hid_t H5E_SYSTEM_g        = FAIL; /* Internal error detected */
+hid_t H5E_CANTINS_g       = FAIL; /* Unable to insert metadata into cache */
+hid_t H5E_CANTPROTECT_g   = FAIL; /* Unable to protect metadata */
+hid_t H5E_CANTUNPROTECT_g = FAIL; /* Unable to unprotect metadata */
+hid_t H5E_CANTPIN_g       = FAIL; /* Unable to pin cache entry */
+hid_t H5E_CANTUNPIN_g     = FAIL; /* Unable to un-pin cache entry */
+hid_t H5E_CANTMARKDIRTY_g = FAIL; /* Unable to mark a pinned entry as dirty */
+hid_t H5E_CANTDIRTY_g     = FAIL; /* Unable to mark metadata as dirty */
+hid_t H5E_CANTEXPUNGE_g   = FAIL; /* Unable to expunge a metadata cache entry */
+hid_t H5E_CANTRESIZE_g    = FAIL; /* Unable to resize a metadata cache entry */
 
 /* Link related errors */
-hid_t H5E_TRAVERSE_g       = FAIL;      /* Link traversal failure */
-hid_t H5E_NLINKS_g         = FAIL;      /* Too many soft links in path */
-hid_t H5E_NOTREGISTERED_g  = FAIL;      /* Link class not registered */
-hid_t H5E_CANTMOVE_g       = FAIL;      /* Can't move object */
-hid_t H5E_CANTSORT_g       = FAIL;      /* Can't sort objects */
+hid_t H5E_TRAVERSE_g      = FAIL; /* Link traversal failure */
+hid_t H5E_NLINKS_g        = FAIL; /* Too many soft links in path */
+hid_t H5E_NOTREGISTERED_g = FAIL; /* Link class not registered */
+hid_t H5E_CANTMOVE_g      = FAIL; /* Can't move object */
+hid_t H5E_CANTSORT_g      = FAIL; /* Can't sort objects */
 
 /* Parallel MPI errors */
-hid_t H5E_MPI_g            = FAIL;      /* Some MPI function failed */
-hid_t H5E_MPIERRSTR_g      = FAIL;      /* MPI Error String */
-hid_t H5E_CANTRECV_g       = FAIL;      /* Can't receive data */
+hid_t H5E_MPI_g       = FAIL; /* Some MPI function failed */
+hid_t H5E_MPIERRSTR_g = FAIL; /* MPI Error String */
+hid_t H5E_CANTRECV_g  = FAIL; /* Can't receive data */
 
 /* Dataspace errors */
-hid_t H5E_CANTCLIP_g       = FAIL;      /* Can't clip hyperslab region */
-hid_t H5E_CANTCOUNT_g      = FAIL;      /* Can't count elements */
-hid_t H5E_CANTSELECT_g     = FAIL;      /* Can't select hyperslab */
-hid_t H5E_CANTNEXT_g       = FAIL;      /* Can't move to next iterator location */
-hid_t H5E_BADSELECT_g      = FAIL;      /* Invalid selection */
-hid_t H5E_CANTCOMPARE_g    = FAIL;      /* Can't compare objects */
+hid_t H5E_CANTCLIP_g    = FAIL; /* Can't clip hyperslab region */
+hid_t H5E_CANTCOUNT_g   = FAIL; /* Can't count elements */
+hid_t H5E_CANTSELECT_g  = FAIL; /* Can't select hyperslab */
+hid_t H5E_CANTNEXT_g    = FAIL; /* Can't move to next iterator location */
+hid_t H5E_BADSELECT_g   = FAIL; /* Invalid selection */
+hid_t H5E_CANTCOMPARE_g = FAIL; /* Can't compare objects */
 
 /* Argument errors */
-hid_t H5E_UNINITIALIZED_g  = FAIL;      /* Information is uinitialized */
-hid_t H5E_UNSUPPORTED_g    = FAIL;      /* Feature is unsupported */
-hid_t H5E_BADTYPE_g        = FAIL;      /* Inappropriate type */
-hid_t H5E_BADRANGE_g       = FAIL;      /* Out of range */
-hid_t H5E_BADVALUE_g       = FAIL;      /* Bad value */
+hid_t H5E_UNINITIALIZED_g = FAIL; /* Information is uinitialized */
+hid_t H5E_UNSUPPORTED_g   = FAIL; /* Feature is unsupported */
+hid_t H5E_BADTYPE_g       = FAIL; /* Inappropriate type */
+hid_t H5E_BADRANGE_g      = FAIL; /* Out of range */
+hid_t H5E_BADVALUE_g      = FAIL; /* Bad value */
 
 /* B-tree related errors */
-hid_t H5E_NOTFOUND_g       = FAIL;      /* Object not found */
-hid_t H5E_EXISTS_g         = FAIL;      /* Object already exists */
-hid_t H5E_CANTENCODE_g     = FAIL;      /* Unable to encode value */
-hid_t H5E_CANTDECODE_g     = FAIL;      /* Unable to decode value */
-hid_t H5E_CANTSPLIT_g      = FAIL;      /* Unable to split node */
-hid_t H5E_CANTREDISTRIBUTE_g = FAIL;      /* Unable to redistribute records */
-hid_t H5E_CANTSWAP_g       = FAIL;      /* Unable to swap records */
-hid_t H5E_CANTINSERT_g     = FAIL;      /* Unable to insert object */
-hid_t H5E_CANTLIST_g       = FAIL;      /* Unable to list node */
-hid_t H5E_CANTMODIFY_g     = FAIL;      /* Unable to modify record */
-hid_t H5E_CANTREMOVE_g     = FAIL;      /* Unable to remove object */
+hid_t H5E_NOTFOUND_g         = FAIL; /* Object not found */
+hid_t H5E_EXISTS_g           = FAIL; /* Object already exists */
+hid_t H5E_CANTENCODE_g       = FAIL; /* Unable to encode value */
+hid_t H5E_CANTDECODE_g       = FAIL; /* Unable to decode value */
+hid_t H5E_CANTSPLIT_g        = FAIL; /* Unable to split node */
+hid_t H5E_CANTREDISTRIBUTE_g = FAIL; /* Unable to redistribute records */
+hid_t H5E_CANTSWAP_g         = FAIL; /* Unable to swap records */
+hid_t H5E_CANTINSERT_g       = FAIL; /* Unable to insert object */
+hid_t H5E_CANTLIST_g         = FAIL; /* Unable to list node */
+hid_t H5E_CANTMODIFY_g       = FAIL; /* Unable to modify record */
+hid_t H5E_CANTREMOVE_g       = FAIL; /* Unable to remove object */
 
 /* Datatype conversion errors */
-hid_t H5E_CANTCONVERT_g    = FAIL;      /* Can't convert datatypes */
-hid_t H5E_BADSIZE_g        = FAIL;      /* Bad size for object */
+hid_t H5E_CANTCONVERT_g = FAIL; /* Can't convert datatypes */
+hid_t H5E_BADSIZE_g     = FAIL; /* Bad size for object */
 
 #endif /* H5Edefin_H */
diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c
index e2ef79c..a7f2aca 100644
--- a/src/H5Edeprec.c
+++ b/src/H5Edeprec.c
@@ -29,58 +29,48 @@
 /* Module Setup */
 /****************/
 
-#define H5E_PACKAGE		/*suppress error about including H5Epkg   */
+#define H5E_PACKAGE /*suppress error about including H5Epkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5E__init_deprec_interface
-
+#define H5_INTERFACE_INIT_FUNC H5E__init_deprec_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Iprivate.h"		/* IDs                                  */
-#include "H5Epkg.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5Epkg.h"      /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5E__init_deprec_interface -- Initialize interface-specific information
@@ -101,7 +91,6 @@ H5E__init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5E_init())
 } /* H5E__init_deprec_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5E__term_deprec_interface -- Terminate interface
@@ -126,7 +115,7 @@ H5E__term_deprec_interface(void)
 } /* H5E__term_deprec_interface() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5Eget_major
  *
@@ -143,43 +132,42 @@ H5E__term_deprec_interface(void)
 char *
 H5Eget_major(H5E_major_t maj)
 {
-    H5E_msg_t   *msg;           /* Pointer to error message */
-    ssize_t      size;
-    H5E_type_t  type;
-    char        *msg_str = NULL;
-    char        *ret_value;     /* Return value */
+    H5E_msg_t *msg; /* Pointer to error message */
+    ssize_t    size;
+    H5E_type_t type;
+    char *     msg_str = NULL;
+    char *     ret_value; /* Return value */
 
     FUNC_ENTER_API_NOCLEAR(NULL)
     H5TRACE1("*s", "i", maj);
 
     /* Get the message object */
-    if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(maj, H5I_ERROR_MSG)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a error message ID")
+    if (NULL == (msg = (H5E_msg_t *)H5I_object_verify(maj, H5I_ERROR_MSG)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a error message ID")
 
     /* Get the size & type of the message's text */
-    if((size = H5E_get_msg(msg, &type, NULL, (size_t)0)) < 0)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get error message text")
-    if(type != H5E_MAJOR)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "Error message isn't a major one")
+    if ((size = H5E_get_msg(msg, &type, NULL, (size_t)0)) < 0)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get error message text")
+    if (type != H5E_MAJOR)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "Error message isn't a major one")
 
     /* Application will free this */
     size++;
     msg_str = (char *)H5MM_malloc((size_t)size);
 
     /* Get the text for the message */
-    if(H5E_get_msg(msg, NULL, msg_str, (size_t)size) < 0)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get error message text")
+    if (H5E_get_msg(msg, NULL, msg_str, (size_t)size) < 0)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get error message text")
 
     ret_value = msg_str;
 
 done:
-    if(!ret_value)
+    if (!ret_value)
         msg_str = (char *)H5MM_xfree(msg_str);
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eget_major() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eget_minor
  *
@@ -196,43 +184,42 @@ done:
 char *
 H5Eget_minor(H5E_minor_t min)
 {
-    H5E_msg_t   *msg;           /* Pointer to error message */
-    ssize_t      size;
-    H5E_type_t  type;
-    char        *msg_str = NULL;
-    char        *ret_value;     /* Return value */
+    H5E_msg_t *msg; /* Pointer to error message */
+    ssize_t    size;
+    H5E_type_t type;
+    char *     msg_str = NULL;
+    char *     ret_value; /* Return value */
 
     FUNC_ENTER_API_NOCLEAR(NULL)
     H5TRACE1("*s", "i", min);
 
     /* Get the message object */
-    if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(min, H5I_ERROR_MSG)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a error message ID")
+    if (NULL == (msg = (H5E_msg_t *)H5I_object_verify(min, H5I_ERROR_MSG)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a error message ID")
 
     /* Get the size & type of the message's text */
-    if((size = H5E_get_msg(msg, &type, NULL, (size_t)0)) < 0)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get error message text")
-    if(type != H5E_MINOR)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "Error message isn't a minor one")
+    if ((size = H5E_get_msg(msg, &type, NULL, (size_t)0)) < 0)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get error message text")
+    if (type != H5E_MINOR)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "Error message isn't a minor one")
 
     /* Application will free this */
     size++;
     msg_str = (char *)H5MM_malloc((size_t)size);
 
     /* Get the text for the message */
-    if(H5E_get_msg(msg, NULL, msg_str, (size_t)size) < 0)
-	HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get error message text")
+    if (H5E_get_msg(msg, NULL, msg_str, (size_t)size) < 0)
+        HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, NULL, "can't get error message text")
 
     ret_value = msg_str;
 
 done:
-    if(!ret_value)
+    if (!ret_value)
         msg_str = (char *)H5MM_xfree(msg_str);
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eget_minor() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Epush1
  *
@@ -254,24 +241,22 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Epush1(const char *file, const char *func, unsigned line,
-        H5E_major_t maj, H5E_minor_t min, const char *str)
+H5Epush1(const char *file, const char *func, unsigned line, H5E_major_t maj, H5E_minor_t min, const char *str)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     H5TRACE6("e", "*s*sIuii*s", file, func, line, maj, min, str);
 
     /* Push the error on the default error stack */
-    if(H5E_push_stack(NULL, file, func, line, H5E_ERR_CLS_g, maj, min, str) < 0)
+    if (H5E_push_stack(NULL, file, func, line, H5E_ERR_CLS_g, maj, min, str) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't push error on stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Epush1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eclear1
  *
@@ -292,17 +277,16 @@ H5Eclear1(void)
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
-    H5TRACE0("e","");
+    H5TRACE0("e", "");
 
     /* Clear the default error stack */
-    if(H5E_clear_stack(NULL) < 0)
+    if (H5E_clear_stack(NULL) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't clear error stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eclear1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eprint1
  *
@@ -322,25 +306,25 @@ done:
 herr_t
 H5Eprint1(FILE *stream)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
+    H5E_t *estack;              /* Error stack to operate on */
     herr_t ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     /*NO TRACE*/
 
-    if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                  non-threaded case */
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
 
     /* Print error stack */
-    if(H5E_print(estack, stream, TRUE) < 0)
+    if (H5E_print(estack, stream, TRUE) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't display error stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eprint1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Ewalk1
  *
@@ -358,28 +342,28 @@ done:
 herr_t
 H5Ewalk1(H5E_direction_t direction, H5E_walk1_t func, void *client_data)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
-    H5E_walk_op_t walk_op;      /* Error stack walking callback */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5E_t *       estack;              /* Error stack to operate on */
+    H5E_walk_op_t walk_op;             /* Error stack walking callback */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     /*NO TRACE*/
 
-    if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                  non-threaded case */
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
 
     /* Walk the error stack */
-    walk_op.vers = 1;
+    walk_op.vers    = 1;
     walk_op.u.func1 = func;
-    if(H5E_walk(estack, direction, &walk_op, client_data) < 0)
+    if (H5E_walk(estack, direction, &walk_op, client_data) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't walk error stack")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ewalk1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eget_auto1
  *
@@ -396,41 +380,41 @@ done:
  *
  * Modification:Raymond Lu
  *              4 October 2010
- *              If the printing function isn't the default H5Eprint1 or 2, 
- *              and H5Eset_auto2 has been called to set the new style 
+ *              If the printing function isn't the default H5Eprint1 or 2,
+ *              and H5Eset_auto2 has been called to set the new style
  *              printing function, a call to H5Eget_auto1 should fail.
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Eget_auto1(H5E_auto1_t *func, void **client_data)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
-    H5E_auto_op_t auto_op;      /* Error stack operator */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5E_t *       estack;              /* Error stack to operate on */
+    H5E_auto_op_t auto_op;             /* Error stack operator */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "*x**x", func, client_data);
 
     /* Retrieve default error stack */
-    if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                  non-threaded case */
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
 
     /* Get the automatic error reporting information */
-    if(H5E_get_auto(estack, &auto_op, client_data) < 0)
+    if (H5E_get_auto(estack, &auto_op, client_data) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get automatic error info")
 
     /* Fail if the printing function isn't the default(user-set) and set through H5Eset_auto2 */
-    if(!auto_op.is_default && auto_op.vers == 2)
+    if (!auto_op.is_default && auto_op.vers == 2)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "wrong API function, H5Eset_auto2 has been called")
 
-    if(func)
+    if (func)
         *func = auto_op.func1;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eget_auto1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Eset_auto1
  *
@@ -460,34 +444,34 @@ done:
 herr_t
 H5Eset_auto1(H5E_auto1_t func, void *client_data)
 {
-    H5E_t   *estack;            /* Error stack to operate on */
-    H5E_auto_op_t auto_op;      /* Error stack operator */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5E_t *       estack;              /* Error stack to operate on */
+    H5E_auto_op_t auto_op;             /* Error stack operator */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(FAIL)
     H5TRACE2("e", "x*x", func, client_data);
 
-    if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                  non-threaded case */
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
 
     /* Get the automatic error reporting information */
-    if(H5E_get_auto(estack, &auto_op, NULL) < 0)
+    if (H5E_get_auto(estack, &auto_op, NULL) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get automatic error info")
 
     /* Set the automatic error reporting information */
     auto_op.vers = 1;
-    if(func != auto_op.func1_default)
+    if (func != auto_op.func1_default)
         auto_op.is_default = FALSE;
     else
         auto_op.is_default = TRUE;
     auto_op.func1 = func;
 
-    if(H5E_set_auto(estack, &auto_op, client_data) < 0)
+    if (H5E_set_auto(estack, &auto_op, client_data) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't set automatic error info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Eset_auto1() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Einit.h b/src/H5Einit.h
index eeca33e..accd38c 100644
--- a/src/H5Einit.h
+++ b/src/H5Einit.h
@@ -14,7 +14,6 @@
 /* Generated automatically by bin/make_err -- do not edit */
 /* Add new errors to H5err.txt file */
 
-
 #ifndef _H5Einit_H
 #define _H5Einit_H
 
@@ -22,787 +21,786 @@
 /* Major error codes */
 /*********************/
 
-HDassert(H5E_DATASET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataset"))==NULL)
+HDassert(H5E_DATASET_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataset")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FUNC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Function entry/exit"))==NULL)
+HDassert(H5E_FUNC_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Function entry/exit")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_STORAGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data storage"))==NULL)
+HDassert(H5E_STORAGE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Data storage")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessibilty"))==NULL)
+HDassert(H5E_FILE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessibilty")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SOHM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Shared Object Header Messages"))==NULL)
+HDassert(H5E_SOHM_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Shared Object Header Messages")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SOHM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_SOHM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SYM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Symbol table"))==NULL)
+HDassert(H5E_SYM_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Symbol table")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PLUGIN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Plugin for dynamically loaded library"))==NULL)
+HDassert(H5E_PLUGIN_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Plugin for dynamically loaded library")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PLUGIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_PLUGIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_VFL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Virtual File Layer"))==NULL)
+HDassert(H5E_VFL_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Virtual File Layer")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_VFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_VFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_INTERNAL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Internal error (too specific to document in detail)"))==NULL)
+HDassert(H5E_INTERNAL_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Internal error (too specific to document in detail)")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BTREE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "B-Tree node"))==NULL)
+HDassert(H5E_BTREE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "B-Tree node")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_REFERENCE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "References"))==NULL)
+HDassert(H5E_REFERENCE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "References")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_DATASPACE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataspace"))==NULL)
+HDassert(H5E_DATASPACE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataspace")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_RESOURCE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Resource unavailable"))==NULL)
+HDassert(H5E_RESOURCE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Resource unavailable")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PLIST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Property lists"))==NULL)
+HDassert(H5E_PLIST_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Property lists")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_LINK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Links"))==NULL)
+HDassert(H5E_LINK_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Links")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_DATATYPE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Datatype"))==NULL)
+HDassert(H5E_DATATYPE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Datatype")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_RS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Reference Counted Strings"))==NULL)
+HDassert(H5E_RS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Reference Counted Strings")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_HEAP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Heap"))==NULL)
+HDassert(H5E_HEAP_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Heap")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_OHDR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header"))==NULL)
+HDassert(H5E_OHDR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ATOM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object atom"))==NULL)
+HDassert(H5E_ATOM_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Object atom")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ATTR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Attribute"))==NULL)
+HDassert(H5E_ATTR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Attribute")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ATTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_ATTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NONE_MAJOR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "No error"))==NULL)
+HDassert(H5E_NONE_MAJOR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "No error")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NONE_MAJOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NONE_MAJOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_IO_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Low-level I/O"))==NULL)
+HDassert(H5E_IO_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Low-level I/O")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SLIST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Skip Lists"))==NULL)
+HDassert(H5E_SLIST_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Skip Lists")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_SLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_EFL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "External file list"))==NULL)
+HDassert(H5E_EFL_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "External file list")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_TST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Ternary Search Trees"))==NULL)
+HDassert(H5E_TST_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Ternary Search Trees")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ARGS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Invalid arguments to routine"))==NULL)
+HDassert(H5E_ARGS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Invalid arguments to routine")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ARGS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_ARGS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Error API"))==NULL)
+HDassert(H5E_ERROR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Error API")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PLINE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data filters"))==NULL)
+HDassert(H5E_PLINE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Data filters")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PLINE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_PLINE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FSPACE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Free Space Manager"))==NULL)
+HDassert(H5E_FSPACE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Free Space Manager")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_FSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CACHE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object cache"))==NULL)
+HDassert(H5E_CACHE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Object cache")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /*********************/
 /* Minor error codes */
 /*********************/
 
-
 /* Generic low-level file I/O errors */
-HDassert(H5E_SEEKERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed"))==NULL)
+HDassert(H5E_SEEKERROR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_READERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Read failed"))==NULL)
+HDassert(H5E_READERROR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Read failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_WRITEERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Write failed"))==NULL)
+HDassert(H5E_WRITEERROR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Write failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CLOSEERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Close failed"))==NULL)
+HDassert(H5E_CLOSEERROR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Close failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_OVERFLOW_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Address overflowed"))==NULL)
+HDassert(H5E_OVERFLOW_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Address overflowed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FCNTL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File control (fcntl) failed"))==NULL)
+HDassert(H5E_FCNTL_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "File control (fcntl) failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Resource errors */
-HDassert(H5E_NOSPACE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "No space available for allocation"))==NULL)
+HDassert(H5E_NOSPACE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "No space available for allocation")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTALLOC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't allocate space"))==NULL)
+HDassert(H5E_CANTALLOC_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't allocate space")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTALLOC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTALLOC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCOPY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to copy object"))==NULL)
+HDassert(H5E_CANTCOPY_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to copy object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTFREE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to free object"))==NULL)
+HDassert(H5E_CANTFREE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to free object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ALREADYEXISTS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
+HDassert(H5E_ALREADYEXISTS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTLOCK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to lock object"))==NULL)
+HDassert(H5E_CANTLOCK_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to lock object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTUNLOCK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unlock object"))==NULL)
+HDassert(H5E_CANTUNLOCK_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unlock object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTGC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to garbage collect"))==NULL)
+HDassert(H5E_CANTGC_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to garbage collect")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTGETSIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to compute size"))==NULL)
+HDassert(H5E_CANTGETSIZE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to compute size")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGETSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTGETSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_OBJOPEN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object is already open"))==NULL)
+HDassert(H5E_OBJOPEN_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object is already open")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OBJOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_OBJOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Heap errors */
-HDassert(H5E_CANTRESTORE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't restore condition"))==NULL)
+HDassert(H5E_CANTRESTORE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't restore condition")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRESTORE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTRESTORE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCOMPUTE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compute value"))==NULL)
+HDassert(H5E_CANTCOMPUTE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compute value")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOMPUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCOMPUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTEXTEND_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't extend heap's space"))==NULL)
+HDassert(H5E_CANTEXTEND_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't extend heap's space")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTEXTEND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTEXTEND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTATTACH_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't attach object"))==NULL)
+HDassert(H5E_CANTATTACH_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't attach object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTATTACH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTATTACH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTUPDATE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't update object"))==NULL)
+HDassert(H5E_CANTUPDATE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't update object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTUPDATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTUPDATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTOPERATE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't operate on object"))==NULL)
+HDassert(H5E_CANTOPERATE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't operate on object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTOPERATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTOPERATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Function entry/exit interface errors */
-HDassert(H5E_CANTINIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to initialize object"))==NULL)
+HDassert(H5E_CANTINIT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to initialize object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ALREADYINIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already initialized"))==NULL)
+HDassert(H5E_ALREADYINIT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object already initialized")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRELEASE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to release object"))==NULL)
+HDassert(H5E_CANTRELEASE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to release object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Property list errors */
-HDassert(H5E_CANTGET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't get value"))==NULL)
+HDassert(H5E_CANTGET_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't get value")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't set value"))==NULL)
+HDassert(H5E_CANTSET_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't set value")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_DUPCLASS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Duplicate class name in parent class"))==NULL)
+HDassert(H5E_DUPCLASS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Duplicate class name in parent class")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SETDISALLOWED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Disallowed operation"))==NULL)
+HDassert(H5E_SETDISALLOWED_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Disallowed operation")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SETDISALLOWED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_SETDISALLOWED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Free space errors */
-HDassert(H5E_CANTMERGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't merge objects"))==NULL)
+HDassert(H5E_CANTMERGE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't merge objects")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTMERGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTMERGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTREVIVE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't revive object"))==NULL)
+HDassert(H5E_CANTREVIVE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't revive object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTREVIVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTREVIVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSHRINK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't shrink container"))==NULL)
+HDassert(H5E_CANTSHRINK_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't shrink container")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSHRINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTSHRINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Object header related errors */
-HDassert(H5E_LINKCOUNT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad object header link count"))==NULL)
+HDassert(H5E_LINKCOUNT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Bad object header link count")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_VERSION_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Wrong version number"))==NULL)
+HDassert(H5E_VERSION_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Wrong version number")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ALIGNMENT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Alignment error"))==NULL)
+HDassert(H5E_ALIGNMENT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Alignment error")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADMESG_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unrecognized message"))==NULL)
+HDassert(H5E_BADMESG_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unrecognized message")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTDELETE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't delete message"))==NULL)
+HDassert(H5E_CANTDELETE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't delete message")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADITER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Iteration failed"))==NULL)
+HDassert(H5E_BADITER_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Iteration failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADITER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADITER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTPACK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't pack messages"))==NULL)
+HDassert(H5E_CANTPACK_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't pack messages")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTPACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTPACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRESET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't reset object"))==NULL)
+HDassert(H5E_CANTRESET_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't reset object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRESET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTRESET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRENAME_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to rename object"))==NULL)
+HDassert(H5E_CANTRENAME_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to rename object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRENAME_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTRENAME_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* System level errors */
-HDassert(H5E_SYSERRSTR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "System error message"))==NULL)
+HDassert(H5E_SYSERRSTR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "System error message")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SYSERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_SYSERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* I/O pipeline errors */
-HDassert(H5E_NOFILTER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Requested filter is not available"))==NULL)
+HDassert(H5E_NOFILTER_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Requested filter is not available")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NOFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CALLBACK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Callback failed"))==NULL)
+HDassert(H5E_CALLBACK_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Callback failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CALLBACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CALLBACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANAPPLY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'can apply' callback"))==NULL)
+HDassert(H5E_CANAPPLY_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'can apply' callback")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANAPPLY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANAPPLY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SETLOCAL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'set local' callback"))==NULL)
+HDassert(H5E_SETLOCAL_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'set local' callback")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SETLOCAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_SETLOCAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOENCODER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter present but encoding disabled"))==NULL)
+HDassert(H5E_NOENCODER_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Filter present but encoding disabled")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOENCODER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NOENCODER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTFILTER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter operation failed"))==NULL)
+HDassert(H5E_CANTFILTER_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Filter operation failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Group related errors */
-HDassert(H5E_CANTOPENOBJ_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open object"))==NULL)
+HDassert(H5E_CANTOPENOBJ_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCLOSEOBJ_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't close object"))==NULL)
+HDassert(H5E_CANTCLOSEOBJ_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't close object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCLOSEOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCLOSEOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_COMPLEN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Name component is too long"))==NULL)
+HDassert(H5E_COMPLEN_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Name component is too long")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PATH_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with path to object"))==NULL)
+HDassert(H5E_PATH_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with path to object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PATH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_PATH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* No error */
-HDassert(H5E_NONE_MINOR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "No error"))==NULL)
+HDassert(H5E_NONE_MINOR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "No error")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NONE_MINOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NONE_MINOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Plugin errors */
-HDassert(H5E_OPENERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open directory or file"))==NULL)
+HDassert(H5E_OPENERROR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open directory or file")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OPENERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_OPENERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* File accessibilty errors */
-HDassert(H5E_FILEEXISTS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File already exists"))==NULL)
+HDassert(H5E_FILEEXISTS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "File already exists")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FILEEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_FILEEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FILEOPEN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File already open"))==NULL)
+HDassert(H5E_FILEOPEN_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "File already open")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FILEOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_FILEOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCREATE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to create file"))==NULL)
+HDassert(H5E_CANTCREATE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to create file")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCREATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCREATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTOPENFILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to open file"))==NULL)
+HDassert(H5E_CANTOPENFILE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to open file")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTOPENFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTOPENFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCLOSEFILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to close file"))==NULL)
+HDassert(H5E_CANTCLOSEFILE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to close file")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCLOSEFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCLOSEFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOTHDF5_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Not an HDF5 file"))==NULL)
+HDassert(H5E_NOTHDF5_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Not an HDF5 file")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTHDF5_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NOTHDF5_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADFILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad file ID accessed"))==NULL)
+HDassert(H5E_BADFILE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Bad file ID accessed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_TRUNCATED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File has been truncated"))==NULL)
+HDassert(H5E_TRUNCATED_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "File has been truncated")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TRUNCATED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_TRUNCATED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_MOUNT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File mount error"))==NULL)
+HDassert(H5E_MOUNT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "File mount error")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Object atom related errors */
-HDassert(H5E_BADATOM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find atom information (already closed?)"))==NULL)
+HDassert(H5E_BADATOM_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find atom information (already closed?)")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADGROUP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find ID group information"))==NULL)
+HDassert(H5E_BADGROUP_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find ID group information")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTREGISTER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to register new atom"))==NULL)
+HDassert(H5E_CANTREGISTER_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to register new atom")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTINC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to increment reference count"))==NULL)
+HDassert(H5E_CANTINC_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to increment reference count")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTDEC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decrement reference count"))==NULL)
+HDassert(H5E_CANTDEC_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decrement reference count")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOIDS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of IDs for group"))==NULL)
+HDassert(H5E_NOIDS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Out of IDs for group")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Cache related errors */
-HDassert(H5E_CANTFLUSH_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to flush data from cache"))==NULL)
+HDassert(H5E_CANTFLUSH_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to flush data from cache")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTFLUSH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTFLUSH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSERIALIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to serialize data from cache"))==NULL)
+HDassert(H5E_CANTSERIALIZE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to serialize data from cache")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSERIALIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTSERIALIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTLOAD_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to load metadata into cache"))==NULL)
+HDassert(H5E_CANTLOAD_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to load metadata into cache")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTLOAD_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTLOAD_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PROTECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Protected metadata error"))==NULL)
+HDassert(H5E_PROTECT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Protected metadata error")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_PROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOTCACHED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Metadata not currently cached"))==NULL)
+HDassert(H5E_NOTCACHED_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Metadata not currently cached")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTCACHED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NOTCACHED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SYSTEM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Internal error detected"))==NULL)
+HDassert(H5E_SYSTEM_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Internal error detected")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SYSTEM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_SYSTEM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTINS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert metadata into cache"))==NULL)
+HDassert(H5E_CANTINS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert metadata into cache")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTINS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTPROTECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to protect metadata"))==NULL)
+HDassert(H5E_CANTPROTECT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to protect metadata")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTUNPROTECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unprotect metadata"))==NULL)
+HDassert(H5E_CANTUNPROTECT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unprotect metadata")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTUNPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTUNPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTPIN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to pin cache entry"))==NULL)
+HDassert(H5E_CANTPIN_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to pin cache entry")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTUNPIN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to un-pin cache entry"))==NULL)
+HDassert(H5E_CANTUNPIN_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to un-pin cache entry")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTUNPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTUNPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTMARKDIRTY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark a pinned entry as dirty"))==NULL)
+HDassert(H5E_CANTMARKDIRTY_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark a pinned entry as dirty")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTMARKDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTMARKDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTDIRTY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark metadata as dirty"))==NULL)
+HDassert(H5E_CANTDIRTY_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark metadata as dirty")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTEXPUNGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to expunge a metadata cache entry"))==NULL)
+HDassert(H5E_CANTEXPUNGE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to expunge a metadata cache entry")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTEXPUNGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTEXPUNGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRESIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to resize a metadata cache entry"))==NULL)
+HDassert(H5E_CANTRESIZE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to resize a metadata cache entry")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRESIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTRESIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Link related errors */
-HDassert(H5E_TRAVERSE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Link traversal failure"))==NULL)
+HDassert(H5E_TRAVERSE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Link traversal failure")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TRAVERSE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_TRAVERSE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NLINKS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Too many soft links in path"))==NULL)
+HDassert(H5E_NLINKS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Too many soft links in path")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NLINKS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NLINKS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOTREGISTERED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Link class not registered"))==NULL)
+HDassert(H5E_NOTREGISTERED_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Link class not registered")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTREGISTERED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NOTREGISTERED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTMOVE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move object"))==NULL)
+HDassert(H5E_CANTMOVE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSORT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't sort objects"))==NULL)
+HDassert(H5E_CANTSORT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't sort objects")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSORT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTSORT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Parallel MPI errors */
-HDassert(H5E_MPI_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Some MPI function failed"))==NULL)
+HDassert(H5E_MPI_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Some MPI function failed")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_MPIERRSTR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL)
+HDassert(H5E_MPIERRSTR_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRECV_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't receive data"))==NULL)
+HDassert(H5E_CANTRECV_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't receive data")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Dataspace errors */
-HDassert(H5E_CANTCLIP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region"))==NULL)
+HDassert(H5E_CANTCLIP_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCOUNT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't count elements"))==NULL)
+HDassert(H5E_CANTCOUNT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't count elements")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSELECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't select hyperslab"))==NULL)
+HDassert(H5E_CANTSELECT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't select hyperslab")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTNEXT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move to next iterator location"))==NULL)
+HDassert(H5E_CANTNEXT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move to next iterator location")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADSELECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Invalid selection"))==NULL)
+HDassert(H5E_BADSELECT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Invalid selection")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCOMPARE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects"))==NULL)
+HDassert(H5E_CANTCOMPARE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Argument errors */
-HDassert(H5E_UNINITIALIZED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL)
+HDassert(H5E_UNINITIALIZED_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_UNSUPPORTED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL)
+HDassert(H5E_UNSUPPORTED_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADTYPE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL)
+HDassert(H5E_BADTYPE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADRANGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL)
+HDassert(H5E_BADRANGE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADVALUE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL)
+HDassert(H5E_BADVALUE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* B-tree related errors */
-HDassert(H5E_NOTFOUND_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found"))==NULL)
+HDassert(H5E_NOTFOUND_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_EXISTS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
+HDassert(H5E_EXISTS_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTENCODE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to encode value"))==NULL)
+HDassert(H5E_CANTENCODE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to encode value")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTDECODE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decode value"))==NULL)
+HDassert(H5E_CANTDECODE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decode value")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSPLIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to split node"))==NULL)
+HDassert(H5E_CANTSPLIT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to split node")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTREDISTRIBUTE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to redistribute records"))==NULL)
+HDassert(H5E_CANTREDISTRIBUTE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to redistribute records")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTREDISTRIBUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTREDISTRIBUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSWAP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to swap records"))==NULL)
+HDassert(H5E_CANTSWAP_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to swap records")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSWAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTSWAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTINSERT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert object"))==NULL)
+HDassert(H5E_CANTINSERT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTLIST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to list node"))==NULL)
+HDassert(H5E_CANTLIST_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to list node")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTMODIFY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to modify record"))==NULL)
+HDassert(H5E_CANTMODIFY_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to modify record")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTMODIFY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTMODIFY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTREMOVE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to remove object"))==NULL)
+HDassert(H5E_CANTREMOVE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to remove object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTREMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTREMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Datatype conversion errors */
-HDassert(H5E_CANTCONVERT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes"))==NULL)
+HDassert(H5E_CANTCONVERT_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADSIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad size for object"))==NULL)
+HDassert(H5E_BADSIZE_g == (-1));
+if ((msg = H5E_create_msg(cls, H5E_MINOR, "Bad size for object")) == NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if ((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 #endif /* H5Einit_H */
diff --git a/src/H5Eint.c b/src/H5Eint.c
index ab378fb..18138d5 100644
--- a/src/H5Eint.c
+++ b/src/H5Eint.c
@@ -26,53 +26,45 @@
 /* Module Setup */
 /****************/
 
-#define H5E_PACKAGE		/*suppress error about including H5Epkg   */
+#define H5E_PACKAGE /*suppress error about including H5Epkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5E_init_int_interface
-
+#define H5_INTERFACE_INIT_FUNC H5E_init_int_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Epkg.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs                                  */
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Epkg.h"      /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Printing information */
 typedef struct H5E_print_t {
-    FILE        *stream;
-    H5E_cls_t   cls;
+    FILE *    stream;
+    H5E_cls_t cls;
 } H5E_print_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-static herr_t H5E_walk1_cb(int n, H5E_error1_t *err_desc,
-    void *client_data);
+static herr_t H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-static herr_t H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc,
-    void *client_data);
-static herr_t  H5E_clear_entries(H5E_t *estack, size_t nentries);
-
+static herr_t H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data);
+static herr_t H5E_clear_entries(H5E_t *estack, size_t nentries);
 
 /*********************/
 /* Package Variables */
@@ -85,7 +77,6 @@ static herr_t  H5E_clear_entries(H5E_t *estack, size_t nentries);
 H5E_t H5E_stack_g[1];
 #endif /* H5_HAVE_THREADSAFE */
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
@@ -100,7 +91,6 @@ hid_t H5E_ERR_CLS_g = FAIL;
 /* Include the automatically generated error code definitions */
 #include "H5Edefin.h"
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -109,12 +99,10 @@ hid_t H5E_ERR_CLS_g = FAIL;
 /*
  * variables used for MPI error reporting
  */
-char	H5E_mpi_error_str[MPI_MAX_ERROR_STRING];
-int	H5E_mpi_error_str_len;
+char H5E_mpi_error_str[MPI_MAX_ERROR_STRING];
+int  H5E_mpi_error_str_len;
 #endif /* H5_HAVE_PARALLEL */
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5E_init_int_interface -- Initialize interface-specific information
@@ -135,7 +123,6 @@ H5E_init_int_interface(void)
     FUNC_LEAVE_NOAPI(H5E_init())
 } /* H5E_init_int_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_get_msg
  *
@@ -152,7 +139,7 @@ H5E_init_int_interface(void)
 ssize_t
 H5E_get_msg(const H5E_msg_t *msg, H5E_type_t *type, char *msg_str, size_t size)
 {
-    ssize_t       len;          /* Length of error message */
+    ssize_t len; /* Length of error message */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -163,14 +150,14 @@ H5E_get_msg(const H5E_msg_t *msg, H5E_type_t *type, char *msg_str, size_t size)
     len = (ssize_t)HDstrlen(msg->msg);
 
     /* Copy the message into the user's buffer, if given */
-    if(msg_str) {
-       HDstrncpy(msg_str, msg->msg, MIN((size_t)(len+1), size));
-       if((size_t)len >= size)
-          msg_str[size - 1] = '\0';
+    if (msg_str) {
+        HDstrncpy(msg_str, msg->msg, MIN((size_t)(len + 1), size));
+        if ((size_t)len >= size)
+            msg_str[size - 1] = '\0';
     } /* end if */
 
     /* Give the message type, if asked */
-    if(type)
+    if (type)
         *type = msg->type;
 
     /* Set the return value to the full length of the message */
@@ -178,7 +165,7 @@ H5E_get_msg(const H5E_msg_t *msg, H5E_type_t *type, char *msg_str, size_t size)
 } /* end H5E_get_msg() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5E_walk1_cb
  *
@@ -215,15 +202,15 @@ H5E_get_msg(const H5E_msg_t *msg, H5E_type_t *type, char *msg_str, size_t size)
 static herr_t
 H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
 {
-    H5E_print_t         *eprint  = (H5E_print_t *)client_data;
-    FILE		*stream;        /* I/O stream to print output to */
-    H5E_cls_t           *cls_ptr;       /* Pointer to error class */
-    H5E_msg_t           *maj_ptr;       /* Pointer to major error info */
-    H5E_msg_t           *min_ptr;       /* Pointer to minor error info */
-    const char		*maj_str = "No major description";      /* Major error description */
-    const char		*min_str = "No minor description";      /* Minor error description */
-    unsigned            have_desc = 1;  /* Flag to indicate whether the error has a "real" description */
-    herr_t              ret_value = SUCCEED;
+    H5E_print_t *eprint = (H5E_print_t *)client_data;
+    FILE *       stream;                             /* I/O stream to print output to */
+    H5E_cls_t *  cls_ptr;                            /* Pointer to error class */
+    H5E_msg_t *  maj_ptr;                            /* Pointer to major error info */
+    H5E_msg_t *  min_ptr;                            /* Pointer to minor error info */
+    const char * maj_str   = "No major description"; /* Major error description */
+    const char * min_str   = "No minor description"; /* Minor error description */
+    unsigned     have_desc = 1; /* Flag to indicate whether the error has a "real" description */
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -231,7 +218,7 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
     HDassert(err_desc);
 
     /* If no client data was passed, output to stderr */
-    if(!client_data)
+    if (!client_data)
         stream = stderr;
     else
         stream = eprint->stream;
@@ -241,46 +228,46 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
     min_ptr = (H5E_msg_t *)H5I_object_verify(err_desc->min_num, H5I_ERROR_MSG);
 
     /* Check for bad pointer(s), but can't issue error, just leave */
-    if(!maj_ptr || !min_ptr)
+    if (!maj_ptr || !min_ptr)
         HGOTO_DONE(FAIL)
 
-    if(maj_ptr->msg)
+    if (maj_ptr->msg)
         maj_str = maj_ptr->msg;
-    if(min_ptr->msg)
+    if (min_ptr->msg)
         min_str = min_ptr->msg;
 
     /* Get error class info */
     cls_ptr = maj_ptr->cls;
 
     /* Print error class header if new class */
-    if(eprint->cls.lib_name == NULL || HDstrcmp(cls_ptr->lib_name, eprint->cls.lib_name)) {
+    if (eprint->cls.lib_name == NULL || HDstrcmp(cls_ptr->lib_name, eprint->cls.lib_name)) {
         /* update to the new class information */
-        if(cls_ptr->cls_name)
+        if (cls_ptr->cls_name)
             eprint->cls.cls_name = cls_ptr->cls_name;
-        if(cls_ptr->lib_name)
+        if (cls_ptr->lib_name)
             eprint->cls.lib_name = cls_ptr->lib_name;
-        if(cls_ptr->lib_vers)
+        if (cls_ptr->lib_vers)
             eprint->cls.lib_vers = cls_ptr->lib_vers;
 
         HDfprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
-            (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
-            (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
-            (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
+                  (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
+                  (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
+                  (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
 
         /* try show the process or thread id in multiple processes cases*/
 #ifdef H5_HAVE_PARALLEL
         {
             int mpi_rank, mpi_initialized, mpi_finalized;
 
-	    MPI_Initialized(&mpi_initialized);
+            MPI_Initialized(&mpi_initialized);
             MPI_Finalized(&mpi_finalized);
 
-            if(mpi_initialized && !mpi_finalized) {
-	        MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-	        HDfprintf(stream, "MPI-process %d", mpi_rank);
-	    } /* end if */
+            if (mpi_initialized && !mpi_finalized) {
+                MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+                HDfprintf(stream, "MPI-process %d", mpi_rank);
+            } /* end if */
             else
-	        HDfprintf(stream, "thread 0");
+                HDfprintf(stream, "thread 0");
         } /* end block */
 #elif defined(H5_HAVE_THREADSAFE)
         HDfprintf(stream, "thread %lu", (unsigned long)HDpthread_self_ulong());
@@ -291,14 +278,13 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
     } /* end if */
 
     /* Check for "real" error description - used to format output more nicely */
-    if(err_desc->desc == NULL || HDstrlen(err_desc->desc) == 0)
-        have_desc=0;
+    if (err_desc->desc == NULL || HDstrlen(err_desc->desc) == 0)
+        have_desc = 0;
 
     /* Print error message */
-    HDfprintf(stream, "%*s#%03d: %s line %u in %s()%s%s\n",
-	     H5E_INDENT, "", n, err_desc->file_name, err_desc->line,
-	     err_desc->func_name, (have_desc ? ": " : ""),
-             (have_desc ? err_desc->desc : ""));
+    HDfprintf(stream, "%*s#%03d: %s line %u in %s()%s%s\n", H5E_INDENT, "", n, err_desc->file_name,
+              err_desc->line, err_desc->func_name, (have_desc ? ": " : ""),
+              (have_desc ? err_desc->desc : ""));
     HDfprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
     HDfprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
 
@@ -307,7 +293,6 @@ done:
 } /* end H5E_walk1_cb() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_walk2_cb
  *
@@ -342,15 +327,15 @@ done:
 static herr_t
 H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
 {
-    H5E_print_t         *eprint  = (H5E_print_t *)client_data;
-    FILE		*stream;        /* I/O stream to print output to */
-    H5E_cls_t           *cls_ptr;       /* Pointer to error class */
-    H5E_msg_t           *maj_ptr;       /* Pointer to major error info */
-    H5E_msg_t           *min_ptr;       /* Pointer to minor error info */
-    const char		*maj_str = "No major description";      /* Major error description */
-    const char		*min_str = "No minor description";      /* Minor error description */
-    unsigned            have_desc = 1;  /* Flag to indicate whether the error has a "real" description */
-    herr_t              ret_value = SUCCEED;
+    H5E_print_t *eprint = (H5E_print_t *)client_data;
+    FILE *       stream;                             /* I/O stream to print output to */
+    H5E_cls_t *  cls_ptr;                            /* Pointer to error class */
+    H5E_msg_t *  maj_ptr;                            /* Pointer to major error info */
+    H5E_msg_t *  min_ptr;                            /* Pointer to minor error info */
+    const char * maj_str   = "No major description"; /* Major error description */
+    const char * min_str   = "No minor description"; /* Minor error description */
+    unsigned     have_desc = 1; /* Flag to indicate whether the error has a "real" description */
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -358,7 +343,7 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
     HDassert(err_desc);
 
     /* If no client data was passed, output to stderr */
-    if(!client_data)
+    if (!client_data)
         stream = stderr;
     else
         stream = eprint->stream;
@@ -368,12 +353,12 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
     min_ptr = (H5E_msg_t *)H5I_object_verify(err_desc->min_num, H5I_ERROR_MSG);
 
     /* Check for bad pointer(s), but can't issue error, just leave */
-    if(!maj_ptr || !min_ptr)
+    if (!maj_ptr || !min_ptr)
         HGOTO_DONE(FAIL)
 
-    if(maj_ptr->msg)
+    if (maj_ptr->msg)
         maj_str = maj_ptr->msg;
-    if(min_ptr->msg)
+    if (min_ptr->msg)
         min_str = min_ptr->msg;
 
     /* Get error class info.  Don't use the class of the major or minor error because
@@ -381,38 +366,38 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
     cls_ptr = (H5E_cls_t *)H5I_object_verify(err_desc->cls_id, H5I_ERROR_CLASS);
 
     /* Check for bad pointer(s), but can't issue error, just leave */
-    if(!cls_ptr)
+    if (!cls_ptr)
         HGOTO_DONE(FAIL)
 
     /* Print error class header if new class */
-    if(eprint->cls.lib_name == NULL || HDstrcmp(cls_ptr->lib_name, eprint->cls.lib_name)) {
+    if (eprint->cls.lib_name == NULL || HDstrcmp(cls_ptr->lib_name, eprint->cls.lib_name)) {
         /* update to the new class information */
-        if(cls_ptr->cls_name)
+        if (cls_ptr->cls_name)
             eprint->cls.cls_name = cls_ptr->cls_name;
-        if(cls_ptr->lib_name)
+        if (cls_ptr->lib_name)
             eprint->cls.lib_name = cls_ptr->lib_name;
-        if(cls_ptr->lib_vers)
+        if (cls_ptr->lib_vers)
             eprint->cls.lib_vers = cls_ptr->lib_vers;
 
         HDfprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
-            (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
-            (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
-            (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
+                  (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
+                  (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
+                  (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
 
         /* try show the process or thread id in multiple processes cases*/
 #ifdef H5_HAVE_PARALLEL
         {
             int mpi_rank, mpi_initialized, mpi_finalized;
 
-	    MPI_Initialized(&mpi_initialized);
+            MPI_Initialized(&mpi_initialized);
             MPI_Finalized(&mpi_finalized);
 
-            if(mpi_initialized && !mpi_finalized) {
-	        MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-	        HDfprintf(stream, "MPI-process %d", mpi_rank);
-	    } /* end if */
+            if (mpi_initialized && !mpi_finalized) {
+                MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+                HDfprintf(stream, "MPI-process %d", mpi_rank);
+            } /* end if */
             else
-	        HDfprintf(stream, "thread 0");
+                HDfprintf(stream, "thread 0");
         } /* end block */
 #elif defined(H5_HAVE_THREADSAFE)
         HDfprintf(stream, "thread %lu", (unsigned long)HDpthread_self_ulong());
@@ -423,14 +408,13 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
     } /* end if */
 
     /* Check for "real" error description - used to format output more nicely */
-    if(err_desc->desc == NULL || HDstrlen(err_desc->desc) == 0)
+    if (err_desc->desc == NULL || HDstrlen(err_desc->desc) == 0)
         have_desc = 0;
 
     /* Print error message */
-    HDfprintf(stream, "%*s#%03u: %s line %u in %s()%s%s\n",
-	     H5E_INDENT, "", n, err_desc->file_name, err_desc->line,
-	     err_desc->func_name, (have_desc ? ": " : ""),
-             (have_desc ? err_desc->desc : ""));
+    HDfprintf(stream, "%*s#%03u: %s line %u in %s()%s%s\n", H5E_INDENT, "", n, err_desc->file_name,
+              err_desc->line, err_desc->func_name, (have_desc ? ": " : ""),
+              (have_desc ? err_desc->desc : ""));
     HDfprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
     HDfprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
 
@@ -438,7 +422,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_walk2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_print
  *
@@ -458,9 +441,9 @@ done:
 herr_t
 H5E_print(const H5E_t *estack, FILE *stream, hbool_t bk_compatible)
 {
-    H5E_print_t eprint;         /* Callback information to pass to H5E_walk() */
-    H5E_walk_op_t walk_op;      /* Error stack walking callback */
-    herr_t ret_value = SUCCEED;
+    H5E_print_t   eprint;  /* Callback information to pass to H5E_walk() */
+    H5E_walk_op_t walk_op; /* Error stack walking callback */
+    herr_t        ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -468,7 +451,7 @@ H5E_print(const H5E_t *estack, FILE *stream, hbool_t bk_compatible)
     HDassert(estack);
 
     /* If no stream was given, use stderr */
-    if(!stream)
+    if (!stream)
         eprint.stream = stderr;
     else
         eprint.stream = stream;
@@ -477,20 +460,20 @@ H5E_print(const H5E_t *estack, FILE *stream, hbool_t bk_compatible)
     HDmemset(&eprint.cls, 0, sizeof(H5E_cls_t));
 
     /* Walk the error stack */
-    if(bk_compatible) {
+    if (bk_compatible) {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        walk_op.vers = 1;
+        walk_op.vers    = 1;
         walk_op.u.func1 = H5E_walk1_cb;
-        if(H5E_walk(estack, H5E_WALK_DOWNWARD, &walk_op, (void*)&eprint) < 0)
+        if (H5E_walk(estack, H5E_WALK_DOWNWARD, &walk_op, (void *)&eprint) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't walk error stack")
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else  /* H5_NO_DEPRECATED_SYMBOLS */
         HDassert(0 && "version 1 error stack print without deprecated symbols!");
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-    } /* end if */
+    }  /* end if */
     else {
-        walk_op.vers = 2;
+        walk_op.vers    = 2;
         walk_op.u.func2 = H5E_walk2_cb;
-        if(H5E_walk(estack, H5E_WALK_DOWNWARD, &walk_op, (void*)&eprint) < 0)
+        if (H5E_walk(estack, H5E_WALK_DOWNWARD, &walk_op, (void *)&eprint) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't walk error stack")
     } /* end else */
 
@@ -498,7 +481,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_print() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_walk
  *
@@ -530,12 +512,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5E_walk(const H5E_t *estack, H5E_direction_t direction, const H5E_walk_op_t *op,
-    void *client_data)
+H5E_walk(const H5E_t *estack, H5E_direction_t direction, const H5E_walk_op_t *op, void *client_data)
 {
-    int		i;              /* Local index variable */
-    herr_t	status;         /* Status from callback function */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    int    i;                   /* Local index variable */
+    herr_t status;              /* Status from callback function */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -544,75 +525,75 @@ H5E_walk(const H5E_t *estack, H5E_direction_t direction, const H5E_walk_op_t *op
     HDassert(op);
 
     /* check args, but rather than failing use some default value */
-    if(direction != H5E_WALK_UPWARD && direction != H5E_WALK_DOWNWARD)
-	direction = H5E_WALK_UPWARD;
+    if (direction != H5E_WALK_UPWARD && direction != H5E_WALK_DOWNWARD)
+        direction = H5E_WALK_UPWARD;
 
     /* Walk the stack if a callback function was given */
-    if(op->vers == 1) {
+    if (op->vers == 1) {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        if(op->u.func1) {
+        if (op->u.func1) {
             H5E_error1_t old_err;
 
             status = SUCCEED;
-            if(H5E_WALK_UPWARD == direction) {
-                for(i = 0; i < (int)estack->nused && status >= 0; i++) {
+            if (H5E_WALK_UPWARD == direction) {
+                for (i = 0; i < (int)estack->nused && status >= 0; i++) {
                     /* Point to each error record on the stack and pass it to callback function.*/
-                    old_err.maj_num = estack->slot[i].maj_num;
-                    old_err.min_num = estack->slot[i].min_num;
+                    old_err.maj_num   = estack->slot[i].maj_num;
+                    old_err.min_num   = estack->slot[i].min_num;
                     old_err.func_name = estack->slot[i].func_name;
                     old_err.file_name = estack->slot[i].file_name;
-                    old_err.desc = estack->slot[i].desc;
-                    old_err.line = estack->slot[i].line;
+                    old_err.desc      = estack->slot[i].desc;
+                    old_err.line      = estack->slot[i].line;
 
                     status = (op->u.func1)(i, &old_err, client_data);
                 } /* end for */
-            } /* end if */
+            }     /* end if */
             else {
                 H5_CHECK_OVERFLOW(estack->nused - 1, size_t, int);
-                for(i = (int)(estack->nused - 1); i >= 0 && status >= 0; i--) {
+                for (i = (int)(estack->nused - 1); i >= 0 && status >= 0; i--) {
                     /* Point to each error record on the stack and pass it to callback function.*/
-                    old_err.maj_num = estack->slot[i].maj_num;
-                    old_err.min_num = estack->slot[i].min_num;
+                    old_err.maj_num   = estack->slot[i].maj_num;
+                    old_err.min_num   = estack->slot[i].min_num;
                     old_err.func_name = estack->slot[i].func_name;
                     old_err.file_name = estack->slot[i].file_name;
-                    old_err.desc = estack->slot[i].desc;
-                    old_err.line = estack->slot[i].line;
+                    old_err.desc      = estack->slot[i].desc;
+                    old_err.line      = estack->slot[i].line;
 
                     status = (op->u.func1)((int)(estack->nused - (size_t)(i + 1)), &old_err, client_data);
                 } /* end for */
-            } /* end else */
+            }     /* end else */
 
-            if(status < 0)
+            if (status < 0)
                 HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't walk error stack")
         } /* end if */
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else     /* H5_NO_DEPRECATED_SYMBOLS */
         HDassert(0 && "version 1 error stack walk without deprecated symbols!");
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-    } /* end if */
+#endif    /* H5_NO_DEPRECATED_SYMBOLS */
+    }     /* end if */
     else {
         HDassert(op->vers == 2);
-        if(op->u.func2) {
+        if (op->u.func2) {
             status = SUCCEED;
-            if(H5E_WALK_UPWARD == direction) {
-                for(i = 0; i < (int)estack->nused && status >= 0; i++)
+            if (H5E_WALK_UPWARD == direction) {
+                for (i = 0; i < (int)estack->nused && status >= 0; i++)
                     status = (op->u.func2)((unsigned)i, estack->slot + i, client_data);
             } /* end if */
             else {
                 H5_CHECK_OVERFLOW(estack->nused - 1, size_t, int);
-                for(i = (int)(estack->nused - 1); i >= 0 && status >= 0; i--)
-                    status = (op->u.func2)((unsigned)(estack->nused - (size_t)(i + 1)), estack->slot + i, client_data);
+                for (i = (int)(estack->nused - 1); i >= 0 && status >= 0; i--)
+                    status = (op->u.func2)((unsigned)(estack->nused - (size_t)(i + 1)), estack->slot + i,
+                                           client_data);
             } /* end else */
 
-            if(status < 0)
+            if (status < 0)
                 HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't walk error stack")
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_walk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_get_auto
  *
@@ -636,15 +617,14 @@ H5E_get_auto(const H5E_t *estack, H5E_auto_op_t *op, void **client_data)
     HDassert(estack);
 
     /* Retrieve the requested information */
-    if(op)
+    if (op)
         *op = estack->auto_op;
-    if(client_data)
+    if (client_data)
         *client_data = estack->auto_data;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5E_get_auto2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_set_auto
  *
@@ -676,13 +656,12 @@ H5E_set_auto(H5E_t *estack, const H5E_auto_op_t *op, void *client_data)
     HDassert(estack);
 
     /* Set the automatic error reporting info */
-    estack->auto_op = *op;
+    estack->auto_op   = *op;
     estack->auto_data = client_data;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5E_set_auto() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_printf_stack
  *
@@ -696,17 +675,17 @@ H5E_set_auto(H5E_t *estack, const H5E_auto_op_t *op, void *client_data)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned line,
-    hid_t cls_id, hid_t maj_id, hid_t min_id, const char *fmt, ...)
+H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned line, hid_t cls_id, hid_t maj_id,
+                 hid_t min_id, const char *fmt, ...)
 {
-    va_list     ap;                     /* Varargs info */
+    va_list ap; /* Varargs info */
 #ifndef H5_HAVE_VASPRINTF
-    int         tmp_len;        /* Current size of description buffer */
-    int         desc_len;       /* Actual length of description when formatted */
-#endif /* H5_HAVE_VASPRINTF */
-    char        *tmp = NULL;      /* Buffer to place formatted description in */
-    hbool_t     va_started = FALSE; /* Whether the variable argument list is open */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    int tmp_len;                  /* Current size of description buffer */
+    int desc_len;                 /* Actual length of description when formatted */
+#endif                            /* H5_HAVE_VASPRINTF */
+    char *  tmp        = NULL;    /* Buffer to place formatted description in */
+    hbool_t va_started = FALSE;   /* Whether the variable argument list is open */
+    herr_t  ret_value  = SUCCEED; /* Return value */
 
     /*
      * WARNING: We cannot call HERROR() from within this function or else we
@@ -723,10 +702,10 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin
     HDassert(min_id > 0);
     HDassert(fmt);
 
-/* Note that the variable-argument parsing for the format is identical in
- *      the H5Epush2() routine - correct errors and make changes in both
- *      places. -QAK
- */
+    /* Note that the variable-argument parsing for the format is identical in
+     *      the H5Epush2() routine - correct errors and make changes in both
+     *      places. -QAK
+     */
 
     /* Start the variable-argument parsing */
     va_start(ap, fmt);
@@ -734,16 +713,16 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin
 
 #ifdef H5_HAVE_VASPRINTF
     /* Use the vasprintf() routine, since it does what we're trying to do below */
-    if(HDvasprintf(&tmp, fmt, ap) < 0)
+    if (HDvasprintf(&tmp, fmt, ap) < 0)
         HGOTO_DONE(FAIL)
-#else /* H5_HAVE_VASPRINTF */
+#else  /* H5_HAVE_VASPRINTF */
     /* Allocate space for the formatted description buffer */
     tmp_len = 128;
-    if(NULL == (tmp = H5MM_malloc((size_t)tmp_len)))
+    if (NULL == (tmp = H5MM_malloc((size_t)tmp_len)))
         HGOTO_DONE(FAIL)
 
     /* If the description doesn't fit into the initial buffer size, allocate more space and try again */
-    while((desc_len = HDvsnprintf(tmp, (size_t)tmp_len, fmt, ap)) > (tmp_len - 1)) {
+    while ((desc_len = HDvsnprintf(tmp, (size_t)tmp_len, fmt, ap)) > (tmp_len - 1)) {
         /* shutdown & restart the va_list */
         va_end(ap);
         va_start(ap, fmt);
@@ -753,25 +732,24 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin
 
         /* Allocate a description of the appropriate length */
         tmp_len = desc_len + 1;
-        if(NULL == (tmp = H5MM_malloc((size_t)tmp_len)))
+        if (NULL == (tmp = H5MM_malloc((size_t)tmp_len)))
             HGOTO_DONE(FAIL)
     } /* end while */
 #endif /* H5_HAVE_VASPRINTF */
 
     /* Push the error on the stack */
-    if(H5E_push_stack(estack, file, func, line, cls_id, maj_id, min_id, tmp) < 0)
+    if (H5E_push_stack(estack, file, func, line, cls_id, maj_id, min_id, tmp) < 0)
         HGOTO_DONE(FAIL)
 
 done:
-    if(va_started)
+    if (va_started)
         va_end(ap);
-    if(tmp)
+    if (tmp)
         H5MM_xfree(tmp);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_printf_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_push_stack
  *
@@ -793,10 +771,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5E_push_stack(H5E_t *estack, const char *file, const char *func, unsigned line,
-    hid_t cls_id, hid_t maj_id, hid_t min_id, const char *desc)
+H5E_push_stack(H5E_t *estack, const char *file, const char *func, unsigned line, hid_t cls_id, hid_t maj_id,
+               hid_t min_id, const char *desc)
 {
-    herr_t	ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     /*
      * WARNING: We cannot call HERROR() from within this function or else we
@@ -813,19 +791,20 @@ H5E_push_stack(H5E_t *estack, const char *file, const char *func, unsigned line,
     HDassert(min_id > 0);
 
     /* Check for 'default' error stack */
-    if(estack == NULL)
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (estack == NULL)
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_DONE(FAIL)
 
     /*
      * Don't fail if arguments are bad.  Instead, substitute some default
      * value.
      */
-    if(!func)
+    if (!func)
         func = "Unknown_Function";
-    if(!file)
+    if (!file)
         file = "Unknown_File";
-    if(!desc)
+    if (!desc)
         desc = "No description given";
 
     /*
@@ -833,32 +812,31 @@ H5E_push_stack(H5E_t *estack, const char *file, const char *func, unsigned line,
      */
     HDassert(estack);
 
-    if(estack->nused < H5E_NSLOTS) {
+    if (estack->nused < H5E_NSLOTS) {
         /* Increment the IDs to indicate that they are used in this stack */
-        if(H5I_inc_ref(cls_id, FALSE) < 0)
+        if (H5I_inc_ref(cls_id, FALSE) < 0)
             HGOTO_DONE(FAIL)
-	estack->slot[estack->nused].cls_id = cls_id;
-        if(H5I_inc_ref(maj_id, FALSE) < 0)
+        estack->slot[estack->nused].cls_id = cls_id;
+        if (H5I_inc_ref(maj_id, FALSE) < 0)
             HGOTO_DONE(FAIL)
-	estack->slot[estack->nused].maj_num = maj_id;
-        if(H5I_inc_ref(min_id, FALSE) < 0)
+        estack->slot[estack->nused].maj_num = maj_id;
+        if (H5I_inc_ref(min_id, FALSE) < 0)
             HGOTO_DONE(FAIL)
-	estack->slot[estack->nused].min_num = min_id;
-	if(NULL == (estack->slot[estack->nused].func_name = H5MM_xstrdup(func)))
+        estack->slot[estack->nused].min_num = min_id;
+        if (NULL == (estack->slot[estack->nused].func_name = H5MM_xstrdup(func)))
             HGOTO_DONE(FAIL)
-	if(NULL == (estack->slot[estack->nused].file_name = H5MM_xstrdup(file)))
+        if (NULL == (estack->slot[estack->nused].file_name = H5MM_xstrdup(file)))
             HGOTO_DONE(FAIL)
-	estack->slot[estack->nused].line = line;
-	if(NULL == (estack->slot[estack->nused].desc = H5MM_xstrdup(desc)))
+        estack->slot[estack->nused].line = line;
+        if (NULL == (estack->slot[estack->nused].desc = H5MM_xstrdup(desc)))
             HGOTO_DONE(FAIL)
-	estack->nused++;
+        estack->nused++;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_push_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_clear_entries
  *
@@ -875,9 +853,9 @@ done:
 static herr_t
 H5E_clear_entries(H5E_t *estack, size_t nentries)
 {
-    H5E_error2_t *error;        /* Pointer to error stack entry to clear */
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    H5E_error2_t *error;               /* Pointer to error stack entry to clear */
+    unsigned      u;                   /* Local index variable */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -886,26 +864,26 @@ H5E_clear_entries(H5E_t *estack, size_t nentries)
     HDassert(estack->nused >= nentries);
 
     /* Empty the error stack from the top down */
-    for(u = 0; nentries > 0; nentries--, u++) {
+    for (u = 0; nentries > 0; nentries--, u++) {
         error = &(estack->slot[estack->nused - (u + 1)]);
 
         /* Decrement the IDs to indicate that they are no longer used by this stack */
         /* (In reverse order that they were incremented, so that reference counts work well) */
-        if(H5I_dec_ref(error->min_num) < 0)
+        if (H5I_dec_ref(error->min_num) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTDEC, FAIL, "unable to decrement ref count on error message")
-        if(H5I_dec_ref(error->maj_num) < 0)
+        if (H5I_dec_ref(error->maj_num) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTDEC, FAIL, "unable to decrement ref count on error message")
-        if(H5I_dec_ref(error->cls_id) < 0)
+        if (H5I_dec_ref(error->cls_id) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTDEC, FAIL, "unable to decrement ref count on error class")
 
         /* Release strings */
-        if(error->func_name)
-            H5MM_xfree((void *)error->func_name);        /* Casting away const OK - QAK */
-        if(error->file_name)
-            H5MM_xfree((void *)error->file_name);        /* Casting away const OK - QAK */
-        if(error->desc)
-            H5MM_xfree((void *)error->desc);     /* Casting away const OK - QAK */
-    } /* end for */
+        if (error->func_name)
+            H5MM_xfree((void *)error->func_name); /* Casting away const OK - QAK */
+        if (error->file_name)
+            H5MM_xfree((void *)error->file_name); /* Casting away const OK - QAK */
+        if (error->desc)
+            H5MM_xfree((void *)error->desc); /* Casting away const OK - QAK */
+    }                                        /* end for */
 
     /* Decrement number of errors on stack */
     estack->nused -= u;
@@ -914,7 +892,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_clear_entries() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_clear_stack
  *
@@ -931,26 +908,26 @@ done:
 herr_t
 H5E_clear_stack(H5E_t *estack)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check for 'default' error stack */
-    if(estack == NULL)
-    	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
+    if (estack == NULL)
+        if (NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in
+                                                      non-threaded case */
             HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
 
     /* Empty the error stack */
     HDassert(estack);
-    if(estack->nused)
-        if(H5E_clear_entries(estack, estack->nused) < 0)
+    if (estack->nused)
+        if (H5E_clear_entries(estack, estack->nused) < 0)
             HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't clear error stack")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_clear_stack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_pop
  *
@@ -967,7 +944,7 @@ done:
 herr_t
 H5E_pop(H5E_t *estack, size_t count)
 {
-    herr_t      ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -976,14 +953,13 @@ H5E_pop(H5E_t *estack, size_t count)
     HDassert(estack->nused >= count);
 
     /* Remove the entries from the error stack */
-    if(H5E_clear_entries(estack, count) < 0)
+    if (H5E_clear_entries(estack, count) < 0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTRELEASE, FAIL, "can't remove errors from stack")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_pop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5E_dump_api_stack
  *
@@ -1001,32 +977,31 @@ done:
 herr_t
 H5E_dump_api_stack(int is_api)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Only dump the error stack during an API call */
-    if(is_api) {
+    if (is_api) {
         H5E_t *estack = H5E_get_my_stack();
 
         HDassert(estack);
 
 #ifdef H5_NO_DEPRECATED_SYMBOLS
-            if(estack->auto_op.func2)
-                (void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
-#else /* H5_NO_DEPRECATED_SYMBOLS */ 
-        if(estack->auto_op.vers == 1) {
-            if(estack->auto_op.func1)
+        if (estack->auto_op.func2)
+            (void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
+#else  /* H5_NO_DEPRECATED_SYMBOLS */
+        if (estack->auto_op.vers == 1) {
+            if (estack->auto_op.func1)
                 (void)((estack->auto_op.func1)(estack->auto_data));
         } /* end if */
         else {
-            if(estack->auto_op.func2)
+            if (estack->auto_op.func2)
                 (void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
         } /* end else */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-    } /* end if */
+    }  /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5E_dump_api_stack() */
-
diff --git a/src/H5Epkg.h b/src/H5Epkg.h
index 8c1656b..3014d21 100644
--- a/src/H5Epkg.h
+++ b/src/H5Epkg.h
@@ -31,16 +31,15 @@
 
 /* Other private headers needed by this file */
 
-
 /**************************/
 /* Package Private Macros */
 /**************************/
 
 /* Amount to indent each error */
-#define H5E_INDENT              2
+#define H5E_INDENT 2
 
 /* Number of slots in an error stack */
-#define H5E_NSLOTS	        32
+#define H5E_NSLOTS 32
 
 #ifdef H5_HAVE_THREADSAFE
 /*
@@ -52,7 +51,7 @@
  * In order for this macro to work, H5E_get_my_stack() must be preceeded
  * by "H5E_t *estack =".
  */
-#define H5E_get_my_stack()  H5E_get_stack()
+#define H5E_get_my_stack() H5E_get_stack()
 #else /* H5_HAVE_THREADSAFE */
 /*
  * The current error stack.
@@ -60,7 +59,6 @@
 #define H5E_get_my_stack() (H5E_stack_g + 0)
 #endif /* H5_HAVE_THREADSAFE */
 
-
 /****************************/
 /* Package Private Typedefs */
 /****************************/
@@ -68,53 +66,52 @@
 /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 typedef struct {
-    unsigned    vers;       /* Which version callback to use */
-    hbool_t     is_default; /* If the printing function is the library's own. */
-    H5E_auto1_t func1;      /* Old-style callback, NO error stack param. */
-    H5E_auto2_t func2;      /* New-style callback, with error stack param. */
-    H5E_auto1_t func1_default;      /* The saved library's default function - old style. */
-    H5E_auto2_t func2_default;      /* The saved library's default function - new style. */
+    unsigned    vers;          /* Which version callback to use */
+    hbool_t     is_default;    /* If the printing function is the library's own. */
+    H5E_auto1_t func1;         /* Old-style callback, NO error stack param. */
+    H5E_auto2_t func2;         /* New-style callback, with error stack param. */
+    H5E_auto1_t func1_default; /* The saved library's default function - old style. */
+    H5E_auto2_t func2_default; /* The saved library's default function - new style. */
 } H5E_auto_op_t;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else  /* H5_NO_DEPRECATED_SYMBOLS */
 typedef struct {
-    H5E_auto_t  func2;      /* Only the new style callback function is available. */
+    H5E_auto_t func2; /* Only the new style callback function is available. */
 } H5E_auto_op_t;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */ 
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */
 typedef struct {
-    unsigned vers;              /* Which version callback to use */
+    unsigned vers; /* Which version callback to use */
     union {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        H5E_walk1_t func1;      /* Old-style callback, NO error stack param. */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-        H5E_walk2_t func2;      /* New-style callback, with error stack param. */
-    }u;
+        H5E_walk1_t func1; /* Old-style callback, NO error stack param. */
+#endif                     /* H5_NO_DEPRECATED_SYMBOLS */
+        H5E_walk2_t func2; /* New-style callback, with error stack param. */
+    } u;
 } H5E_walk_op_t;
 
 /* Error class */
 typedef struct H5E_cls_t {
-    char *cls_name;             /* Name of error class */
-    char *lib_name;             /* Name of library within class */
-    char *lib_vers;             /* Version of library */
+    char *cls_name; /* Name of error class */
+    char *lib_name; /* Name of library within class */
+    char *lib_vers; /* Version of library */
 } H5E_cls_t;
 
 /* Major or minor message */
 typedef struct H5E_msg_t {
-    char        *msg;           /* Message for error */
-    H5E_type_t   type;          /* Type of error (major or minor) */
-    H5E_cls_t   *cls;           /* Which error class this message belongs to */
+    char *     msg;  /* Message for error */
+    H5E_type_t type; /* Type of error (major or minor) */
+    H5E_cls_t *cls;  /* Which error class this message belongs to */
 } H5E_msg_t;
 
 /* Error stack */
 struct H5E_t {
-    size_t nused;		        /* Num slots currently used in stack  */
-    H5E_error2_t slot[H5E_NSLOTS];	/* Array of error records	     */
-    H5E_auto_op_t auto_op;              /* Operator for 'automatic' error reporting */
-    void *auto_data;                    /* Callback data for 'automatic error reporting */
+    size_t        nused;            /* Num slots currently used in stack  */
+    H5E_error2_t  slot[H5E_NSLOTS]; /* Array of error records	     */
+    H5E_auto_op_t auto_op;          /* Operator for 'automatic' error reporting */
+    void *        auto_data;        /* Callback data for 'automatic error reporting */
 };
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -123,10 +120,9 @@ struct H5E_t {
 /*
  * The current error stack.
  */
-H5_DLLVAR H5E_t	H5E_stack_g[1];
+H5_DLLVAR H5E_t H5E_stack_g[1];
 #endif /* H5_HAVE_THREADSAFE */
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
@@ -134,16 +130,12 @@ H5_DLL herr_t H5E__term_deprec_interface(void);
 #ifdef H5_HAVE_THREADSAFE
 H5_DLL H5E_t *H5E_get_stack(void);
 #endif /* H5_HAVE_THREADSAFE */
-H5_DLL ssize_t H5E_get_msg(const H5E_msg_t *msg_ptr, H5E_type_t *type,
-    char *msg, size_t size);
-H5_DLL herr_t H5E_print(const H5E_t *estack, FILE *stream, hbool_t bk_compat);
-H5_DLL herr_t H5E_walk(const H5E_t *estack, H5E_direction_t direction,
-    const H5E_walk_op_t *op, void *client_data);
-H5_DLL herr_t H5E_get_auto(const H5E_t *estack, H5E_auto_op_t *op,
-    void **client_data);
-H5_DLL herr_t H5E_set_auto(H5E_t *estack, const H5E_auto_op_t *op,
-    void *client_data);
-H5_DLL herr_t H5E_pop(H5E_t *err_stack, size_t count);
+H5_DLL ssize_t H5E_get_msg(const H5E_msg_t *msg_ptr, H5E_type_t *type, char *msg, size_t size);
+H5_DLL herr_t  H5E_print(const H5E_t *estack, FILE *stream, hbool_t bk_compat);
+H5_DLL herr_t  H5E_walk(const H5E_t *estack, H5E_direction_t direction, const H5E_walk_op_t *op,
+                        void *client_data);
+H5_DLL herr_t  H5E_get_auto(const H5E_t *estack, H5E_auto_op_t *op, void **client_data);
+H5_DLL herr_t  H5E_set_auto(H5E_t *estack, const H5E_auto_op_t *op, void *client_data);
+H5_DLL herr_t  H5E_pop(H5E_t *err_stack, size_t count);
 
 #endif /* _H5Epkg_H */
-
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index 6de4cb5..440f40b 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -30,16 +30,17 @@ typedef struct H5E_t H5E_t;
  * and a FUNC_LEAVE() within a function body.  The arguments are the major
  * error number, the minor error number, and a description of the error.
  */
-#define HERROR(maj_id, min_id, ...) H5E_printf_stack(NULL, __FILE__, FUNC, __LINE__, H5E_ERR_CLS_g, maj_id, min_id, __VA_ARGS__)
+#define HERROR(maj_id, min_id, ...)                                                                          \
+    H5E_printf_stack(NULL, __FILE__, FUNC, __LINE__, H5E_ERR_CLS_g, maj_id, min_id, __VA_ARGS__)
 
 /*
  * HCOMMON_ERROR macro, used by HDONE_ERROR and HGOTO_ERROR
  * (Shouldn't need to be used outside this header file)
  */
-#define HCOMMON_ERROR(maj, min, ...)  				              \
-   HERROR(maj, min, __VA_ARGS__);					      \
-   err_occurred = TRUE;                                                       \
-   err_occurred = err_occurred;         /* Shut GCC warnings up! */
+#define HCOMMON_ERROR(maj, min, ...)                                                                         \
+    HERROR(maj, min, __VA_ARGS__);                                                                           \
+    err_occurred = TRUE;                                                                                     \
+    err_occurred = err_occurred; /* Shut GCC warnings up! */
 
 /*
  * HDONE_ERROR macro, used to facilitate error reporting between a
@@ -50,10 +51,11 @@ typedef struct H5E_t H5E_t;
  * (This macro can also be used to push an error and set the return value
  *      without jumping to any labels)
  */
-#define HDONE_ERROR(maj, min, ret_val, ...) {				      \
-   HCOMMON_ERROR(maj, min, __VA_ARGS__);					      \
-   ret_value = ret_val;                                                       \
-}
+#define HDONE_ERROR(maj, min, ret_val, ...)                                                                  \
+    {                                                                                                        \
+        HCOMMON_ERROR(maj, min, __VA_ARGS__);                                                                \
+        ret_value = ret_val;                                                                                 \
+    }
 
 /*
  * HGOTO_ERROR macro, used to facilitate error reporting between a
@@ -62,10 +64,11 @@ typedef struct H5E_t H5E_t;
  * error string.  The return value is assigned to a variable `ret_value' and
  * control branches to the `done' label.
  */
-#define HGOTO_ERROR(maj, min, ret_val, ...) {				      \
-   HCOMMON_ERROR(maj, min, __VA_ARGS__);					      \
-   HGOTO_DONE(ret_val)						              \
-}
+#define HGOTO_ERROR(maj, min, ret_val, ...)                                                                  \
+    {                                                                                                        \
+        HCOMMON_ERROR(maj, min, __VA_ARGS__);                                                                \
+        HGOTO_DONE(ret_val)                                                                                  \
+    }
 
 /*
  * HGOTO_DONE macro, used to facilitate normal return between a FUNC_ENTER()
@@ -73,14 +76,19 @@ typedef struct H5E_t H5E_t;
  * value which is assigned to the `ret_value' variable.	 Control branches to
  * the `done' label.
  */
-#define HGOTO_DONE(ret_val) {ret_value = ret_val; goto done;}
+#define HGOTO_DONE(ret_val)                                                                                  \
+    {                                                                                                        \
+        ret_value = ret_val;                                                                                 \
+        goto done;                                                                                           \
+    }
 /*
  * H5E_PRINTF macro, used to facilitate error reporting between a BEGIN_FUNC()
  * and an END_FUNC() within a function body.  The arguments are the minor
  * error number, a description of the error (as a printf-like format string),
  * and an optional set of arguments for the printf format arguments.
  */
-#define H5E_PRINTF(...) H5E_printf_stack(NULL, __FILE__, FUNC, __LINE__, H5E_ERR_CLS_g, H5_MY_PKG_ERR,  __VA_ARGS__)
+#define H5E_PRINTF(...)                                                                                      \
+    H5E_printf_stack(NULL, __FILE__, FUNC, __LINE__, H5E_ERR_CLS_g, H5_MY_PKG_ERR, __VA_ARGS__)
 
 /*
  * H5_LEAVE macro, used to facilitate control flow between a
@@ -89,11 +97,12 @@ typedef struct H5E_t H5E_t;
  * The return value is assigned to a variable `ret_value' and control branches
  * to the `catch_except' label, if we're not already past it.
  */
-#define H5_LEAVE(v) {							      \
-    ret_value = v;							      \
-    if(!past_catch)							      \
-        goto catch_except;						      \
-}
+#define H5_LEAVE(v)                                                                                          \
+    {                                                                                                        \
+        ret_value = v;                                                                                       \
+        if (!past_catch)                                                                                     \
+            goto catch_except;                                                                               \
+    }
 
 /*
  * H5E_THROW macro, used to facilitate error reporting between a
@@ -102,24 +111,25 @@ typedef struct H5E_t H5E_t;
  * The return value is assigned to a variable `ret_value' and control branches
  * to the `catch_except' label, if we're not already past it.
  */
-#define H5E_THROW(...) {						      \
-    H5E_PRINTF(__VA_ARGS__);						      \
-    H5_LEAVE(fail_value)						      \
-}
+#define H5E_THROW(...)                                                                                       \
+    {                                                                                                        \
+        H5E_PRINTF(__VA_ARGS__);                                                                             \
+        H5_LEAVE(fail_value)                                                                                 \
+    }
 
 /* Macro for "catching" flow of control when an error occurs.  Note that the
  *      H5_LEAVE macro won't jump back here once it's past this point.
  */
-#define CATCH catch_except:; past_catch = TRUE;
-
-
+#define CATCH                                                                                                \
+catch_except:;                                                                                               \
+    past_catch = TRUE;
 
 /* Library-private functions defined in H5E package */
 H5_DLL herr_t H5E_init(void);
-H5_DLL herr_t H5E_push_stack(H5E_t *estack, const char *file, const char *func,
-    unsigned line, hid_t cls_id, hid_t maj_id, hid_t min_id, const char *desc);
-H5_DLL herr_t H5E_printf_stack(H5E_t *estack, const char *file, const char *func,
-    unsigned line, hid_t cls_id, hid_t maj_id, hid_t min_id, const char *fmt, ...);
+H5_DLL herr_t H5E_push_stack(H5E_t *estack, const char *file, const char *func, unsigned line, hid_t cls_id,
+                             hid_t maj_id, hid_t min_id, const char *desc);
+H5_DLL herr_t H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned line, hid_t cls_id,
+                               hid_t maj_id, hid_t min_id, const char *fmt, ...);
 H5_DLL herr_t H5E_clear_stack(H5E_t *estack);
 H5_DLL herr_t H5E_dump_api_stack(int is_api);
 
@@ -131,36 +141,42 @@ H5_DLL herr_t H5E_dump_api_stack(int is_api);
 /* Retrieve the error code description string and push it onto the error
  * stack.
  */
-#define	HSYS_DONE_ERROR(majorcode, minorcode, retcode, str) {		      \
-    int myerrno = errno;							      \
-    HDONE_ERROR(majorcode, minorcode, retcode, "%s, errno = %d, error message = '%s'", str, myerrno, HDstrerror(myerrno));			      \
-}
-#define	HSYS_GOTO_ERROR(majorcode, minorcode, retcode, str) {		      \
-    int myerrno = errno;							      \
-    HGOTO_ERROR(majorcode, minorcode, retcode, "%s, errno = %d, error message = '%s'", str, myerrno, HDstrerror(myerrno));			      \
-}
+#define HSYS_DONE_ERROR(majorcode, minorcode, retcode, str)                                                  \
+    {                                                                                                        \
+        int myerrno = errno;                                                                                 \
+        HDONE_ERROR(majorcode, minorcode, retcode, "%s, errno = %d, error message = '%s'", str, myerrno,     \
+                    HDstrerror(myerrno));                                                                    \
+    }
+#define HSYS_GOTO_ERROR(majorcode, minorcode, retcode, str)                                                  \
+    {                                                                                                        \
+        int myerrno = errno;                                                                                 \
+        HGOTO_ERROR(majorcode, minorcode, retcode, "%s, errno = %d, error message = '%s'", str, myerrno,     \
+                    HDstrerror(myerrno));                                                                    \
+    }
 
 #ifdef H5_HAVE_PARALLEL
 /*
  * MPI error handling macros.
  */
 
-extern	char	H5E_mpi_error_str[MPI_MAX_ERROR_STRING];
-extern	int	H5E_mpi_error_str_len;
-
-#define	HMPI_ERROR(mpierr){						      \
-    MPI_Error_string(mpierr, H5E_mpi_error_str, &H5E_mpi_error_str_len);      \
-    HERROR(H5E_INTERNAL, H5E_MPIERRSTR, "%s", H5E_mpi_error_str);                   \
-}
-#define	HMPI_DONE_ERROR(retcode, str, mpierr){				      \
-    HMPI_ERROR(mpierr);							      \
-    HDONE_ERROR(H5E_INTERNAL, H5E_MPI, retcode, str);			      \
-}
-#define	HMPI_GOTO_ERROR(retcode, str, mpierr){				      \
-    HMPI_ERROR(mpierr);							      \
-    HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, retcode, str);			      \
-}
+extern char H5E_mpi_error_str[MPI_MAX_ERROR_STRING];
+extern int  H5E_mpi_error_str_len;
+
+#define HMPI_ERROR(mpierr)                                                                                   \
+    {                                                                                                        \
+        MPI_Error_string(mpierr, H5E_mpi_error_str, &H5E_mpi_error_str_len);                                 \
+        HERROR(H5E_INTERNAL, H5E_MPIERRSTR, "%s", H5E_mpi_error_str);                                        \
+    }
+#define HMPI_DONE_ERROR(retcode, str, mpierr)                                                                \
+    {                                                                                                        \
+        HMPI_ERROR(mpierr);                                                                                  \
+        HDONE_ERROR(H5E_INTERNAL, H5E_MPI, retcode, str);                                                    \
+    }
+#define HMPI_GOTO_ERROR(retcode, str, mpierr)                                                                \
+    {                                                                                                        \
+        HMPI_ERROR(mpierr);                                                                                  \
+        HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, retcode, str);                                                    \
+    }
 #endif /* H5_HAVE_PARALLEL */
 
 #endif /* _H5Eprivate_H */
-
diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h
index 0a72245..3c65f07 100644
--- a/src/H5Epubgen.h
+++ b/src/H5Epubgen.h
@@ -14,7 +14,6 @@
 /* Generated automatically by bin/make_err -- do not edit */
 /* Add new errors to H5err.txt file */
 
-
 #ifndef _H5Epubgen_H
 #define _H5Epubgen_H
 
@@ -26,98 +25,98 @@ extern "C" {
 /* Major error codes */
 /*********************/
 
-#define H5E_DATASET          (H5OPEN H5E_DATASET_g)
-#define H5E_FUNC             (H5OPEN H5E_FUNC_g)
-#define H5E_STORAGE          (H5OPEN H5E_STORAGE_g)
-#define H5E_FILE             (H5OPEN H5E_FILE_g)
-#define H5E_SOHM             (H5OPEN H5E_SOHM_g)
-#define H5E_SYM              (H5OPEN H5E_SYM_g)
-#define H5E_PLUGIN           (H5OPEN H5E_PLUGIN_g)
-#define H5E_VFL              (H5OPEN H5E_VFL_g)
-#define H5E_INTERNAL         (H5OPEN H5E_INTERNAL_g)
-#define H5E_BTREE            (H5OPEN H5E_BTREE_g)
-#define H5E_REFERENCE        (H5OPEN H5E_REFERENCE_g)
-#define H5E_DATASPACE        (H5OPEN H5E_DATASPACE_g)
-#define H5E_RESOURCE         (H5OPEN H5E_RESOURCE_g)
-#define H5E_PLIST            (H5OPEN H5E_PLIST_g)
-#define H5E_LINK             (H5OPEN H5E_LINK_g)
-#define H5E_DATATYPE         (H5OPEN H5E_DATATYPE_g)
-#define H5E_RS               (H5OPEN H5E_RS_g)
-#define H5E_HEAP             (H5OPEN H5E_HEAP_g)
-#define H5E_OHDR             (H5OPEN H5E_OHDR_g)
-#define H5E_ATOM             (H5OPEN H5E_ATOM_g)
-#define H5E_ATTR             (H5OPEN H5E_ATTR_g)
-#define H5E_NONE_MAJOR       (H5OPEN H5E_NONE_MAJOR_g)
-#define H5E_IO               (H5OPEN H5E_IO_g)
-#define H5E_SLIST            (H5OPEN H5E_SLIST_g)
-#define H5E_EFL              (H5OPEN H5E_EFL_g)
-#define H5E_TST              (H5OPEN H5E_TST_g)
-#define H5E_ARGS             (H5OPEN H5E_ARGS_g)
-#define H5E_ERROR            (H5OPEN H5E_ERROR_g)
-#define H5E_PLINE            (H5OPEN H5E_PLINE_g)
-#define H5E_FSPACE           (H5OPEN H5E_FSPACE_g)
-#define H5E_CACHE            (H5OPEN H5E_CACHE_g)
-H5_DLLVAR hid_t H5E_DATASET_g;       /* Dataset */
-H5_DLLVAR hid_t H5E_FUNC_g;          /* Function entry/exit */
-H5_DLLVAR hid_t H5E_STORAGE_g;       /* Data storage */
-H5_DLLVAR hid_t H5E_FILE_g;          /* File accessibilty */
-H5_DLLVAR hid_t H5E_SOHM_g;          /* Shared Object Header Messages */
-H5_DLLVAR hid_t H5E_SYM_g;           /* Symbol table */
-H5_DLLVAR hid_t H5E_PLUGIN_g;        /* Plugin for dynamically loaded library */
-H5_DLLVAR hid_t H5E_VFL_g;           /* Virtual File Layer */
-H5_DLLVAR hid_t H5E_INTERNAL_g;      /* Internal error (too specific to document in detail) */
-H5_DLLVAR hid_t H5E_BTREE_g;         /* B-Tree node */
-H5_DLLVAR hid_t H5E_REFERENCE_g;     /* References */
-H5_DLLVAR hid_t H5E_DATASPACE_g;     /* Dataspace */
-H5_DLLVAR hid_t H5E_RESOURCE_g;      /* Resource unavailable */
-H5_DLLVAR hid_t H5E_PLIST_g;         /* Property lists */
-H5_DLLVAR hid_t H5E_LINK_g;          /* Links */
-H5_DLLVAR hid_t H5E_DATATYPE_g;      /* Datatype */
-H5_DLLVAR hid_t H5E_RS_g;            /* Reference Counted Strings */
-H5_DLLVAR hid_t H5E_HEAP_g;          /* Heap */
-H5_DLLVAR hid_t H5E_OHDR_g;          /* Object header */
-H5_DLLVAR hid_t H5E_ATOM_g;          /* Object atom */
-H5_DLLVAR hid_t H5E_ATTR_g;          /* Attribute */
-H5_DLLVAR hid_t H5E_NONE_MAJOR_g;    /* No error */
-H5_DLLVAR hid_t H5E_IO_g;            /* Low-level I/O */
-H5_DLLVAR hid_t H5E_SLIST_g;         /* Skip Lists */
-H5_DLLVAR hid_t H5E_EFL_g;           /* External file list */
-H5_DLLVAR hid_t H5E_TST_g;           /* Ternary Search Trees */
-H5_DLLVAR hid_t H5E_ARGS_g;          /* Invalid arguments to routine */
-H5_DLLVAR hid_t H5E_ERROR_g;         /* Error API */
-H5_DLLVAR hid_t H5E_PLINE_g;         /* Data filters */
-H5_DLLVAR hid_t H5E_FSPACE_g;        /* Free Space Manager */
-H5_DLLVAR hid_t H5E_CACHE_g;         /* Object cache */
+#define H5E_DATASET    (H5OPEN H5E_DATASET_g)
+#define H5E_FUNC       (H5OPEN H5E_FUNC_g)
+#define H5E_STORAGE    (H5OPEN H5E_STORAGE_g)
+#define H5E_FILE       (H5OPEN H5E_FILE_g)
+#define H5E_SOHM       (H5OPEN H5E_SOHM_g)
+#define H5E_SYM        (H5OPEN H5E_SYM_g)
+#define H5E_PLUGIN     (H5OPEN H5E_PLUGIN_g)
+#define H5E_VFL        (H5OPEN H5E_VFL_g)
+#define H5E_INTERNAL   (H5OPEN H5E_INTERNAL_g)
+#define H5E_BTREE      (H5OPEN H5E_BTREE_g)
+#define H5E_REFERENCE  (H5OPEN H5E_REFERENCE_g)
+#define H5E_DATASPACE  (H5OPEN H5E_DATASPACE_g)
+#define H5E_RESOURCE   (H5OPEN H5E_RESOURCE_g)
+#define H5E_PLIST      (H5OPEN H5E_PLIST_g)
+#define H5E_LINK       (H5OPEN H5E_LINK_g)
+#define H5E_DATATYPE   (H5OPEN H5E_DATATYPE_g)
+#define H5E_RS         (H5OPEN H5E_RS_g)
+#define H5E_HEAP       (H5OPEN H5E_HEAP_g)
+#define H5E_OHDR       (H5OPEN H5E_OHDR_g)
+#define H5E_ATOM       (H5OPEN H5E_ATOM_g)
+#define H5E_ATTR       (H5OPEN H5E_ATTR_g)
+#define H5E_NONE_MAJOR (H5OPEN H5E_NONE_MAJOR_g)
+#define H5E_IO         (H5OPEN H5E_IO_g)
+#define H5E_SLIST      (H5OPEN H5E_SLIST_g)
+#define H5E_EFL        (H5OPEN H5E_EFL_g)
+#define H5E_TST        (H5OPEN H5E_TST_g)
+#define H5E_ARGS       (H5OPEN H5E_ARGS_g)
+#define H5E_ERROR      (H5OPEN H5E_ERROR_g)
+#define H5E_PLINE      (H5OPEN H5E_PLINE_g)
+#define H5E_FSPACE     (H5OPEN H5E_FSPACE_g)
+#define H5E_CACHE      (H5OPEN H5E_CACHE_g)
+H5_DLLVAR hid_t H5E_DATASET_g;    /* Dataset */
+H5_DLLVAR hid_t H5E_FUNC_g;       /* Function entry/exit */
+H5_DLLVAR hid_t H5E_STORAGE_g;    /* Data storage */
+H5_DLLVAR hid_t H5E_FILE_g;       /* File accessibilty */
+H5_DLLVAR hid_t H5E_SOHM_g;       /* Shared Object Header Messages */
+H5_DLLVAR hid_t H5E_SYM_g;        /* Symbol table */
+H5_DLLVAR hid_t H5E_PLUGIN_g;     /* Plugin for dynamically loaded library */
+H5_DLLVAR hid_t H5E_VFL_g;        /* Virtual File Layer */
+H5_DLLVAR hid_t H5E_INTERNAL_g;   /* Internal error (too specific to document in detail) */
+H5_DLLVAR hid_t H5E_BTREE_g;      /* B-Tree node */
+H5_DLLVAR hid_t H5E_REFERENCE_g;  /* References */
+H5_DLLVAR hid_t H5E_DATASPACE_g;  /* Dataspace */
+H5_DLLVAR hid_t H5E_RESOURCE_g;   /* Resource unavailable */
+H5_DLLVAR hid_t H5E_PLIST_g;      /* Property lists */
+H5_DLLVAR hid_t H5E_LINK_g;       /* Links */
+H5_DLLVAR hid_t H5E_DATATYPE_g;   /* Datatype */
+H5_DLLVAR hid_t H5E_RS_g;         /* Reference Counted Strings */
+H5_DLLVAR hid_t H5E_HEAP_g;       /* Heap */
+H5_DLLVAR hid_t H5E_OHDR_g;       /* Object header */
+H5_DLLVAR hid_t H5E_ATOM_g;       /* Object atom */
+H5_DLLVAR hid_t H5E_ATTR_g;       /* Attribute */
+H5_DLLVAR hid_t H5E_NONE_MAJOR_g; /* No error */
+H5_DLLVAR hid_t H5E_IO_g;         /* Low-level I/O */
+H5_DLLVAR hid_t H5E_SLIST_g;      /* Skip Lists */
+H5_DLLVAR hid_t H5E_EFL_g;        /* External file list */
+H5_DLLVAR hid_t H5E_TST_g;        /* Ternary Search Trees */
+H5_DLLVAR hid_t H5E_ARGS_g;       /* Invalid arguments to routine */
+H5_DLLVAR hid_t H5E_ERROR_g;      /* Error API */
+H5_DLLVAR hid_t H5E_PLINE_g;      /* Data filters */
+H5_DLLVAR hid_t H5E_FSPACE_g;     /* Free Space Manager */
+H5_DLLVAR hid_t H5E_CACHE_g;      /* Object cache */
 
 /*********************/
 /* Minor error codes */
 /*********************/
 
 /* Generic low-level file I/O errors */
-#define H5E_SEEKERROR        (H5OPEN H5E_SEEKERROR_g)
-#define H5E_READERROR        (H5OPEN H5E_READERROR_g)
-#define H5E_WRITEERROR       (H5OPEN H5E_WRITEERROR_g)
-#define H5E_CLOSEERROR       (H5OPEN H5E_CLOSEERROR_g)
-#define H5E_OVERFLOW         (H5OPEN H5E_OVERFLOW_g)
-#define H5E_FCNTL            (H5OPEN H5E_FCNTL_g)
-H5_DLLVAR hid_t H5E_SEEKERROR_g;     /* Seek failed */
-H5_DLLVAR hid_t H5E_READERROR_g;     /* Read failed */
-H5_DLLVAR hid_t H5E_WRITEERROR_g;    /* Write failed */
-H5_DLLVAR hid_t H5E_CLOSEERROR_g;    /* Close failed */
-H5_DLLVAR hid_t H5E_OVERFLOW_g;      /* Address overflowed */
-H5_DLLVAR hid_t H5E_FCNTL_g;         /* File control (fcntl) failed */
+#define H5E_SEEKERROR  (H5OPEN H5E_SEEKERROR_g)
+#define H5E_READERROR  (H5OPEN H5E_READERROR_g)
+#define H5E_WRITEERROR (H5OPEN H5E_WRITEERROR_g)
+#define H5E_CLOSEERROR (H5OPEN H5E_CLOSEERROR_g)
+#define H5E_OVERFLOW   (H5OPEN H5E_OVERFLOW_g)
+#define H5E_FCNTL      (H5OPEN H5E_FCNTL_g)
+H5_DLLVAR hid_t H5E_SEEKERROR_g;  /* Seek failed */
+H5_DLLVAR hid_t H5E_READERROR_g;  /* Read failed */
+H5_DLLVAR hid_t H5E_WRITEERROR_g; /* Write failed */
+H5_DLLVAR hid_t H5E_CLOSEERROR_g; /* Close failed */
+H5_DLLVAR hid_t H5E_OVERFLOW_g;   /* Address overflowed */
+H5_DLLVAR hid_t H5E_FCNTL_g;      /* File control (fcntl) failed */
 
 /* Resource errors */
-#define H5E_NOSPACE          (H5OPEN H5E_NOSPACE_g)
-#define H5E_CANTALLOC        (H5OPEN H5E_CANTALLOC_g)
-#define H5E_CANTCOPY         (H5OPEN H5E_CANTCOPY_g)
-#define H5E_CANTFREE         (H5OPEN H5E_CANTFREE_g)
-#define H5E_ALREADYEXISTS    (H5OPEN H5E_ALREADYEXISTS_g)
-#define H5E_CANTLOCK         (H5OPEN H5E_CANTLOCK_g)
-#define H5E_CANTUNLOCK       (H5OPEN H5E_CANTUNLOCK_g)
-#define H5E_CANTGC           (H5OPEN H5E_CANTGC_g)
-#define H5E_CANTGETSIZE      (H5OPEN H5E_CANTGETSIZE_g)
-#define H5E_OBJOPEN          (H5OPEN H5E_OBJOPEN_g)
+#define H5E_NOSPACE       (H5OPEN H5E_NOSPACE_g)
+#define H5E_CANTALLOC     (H5OPEN H5E_CANTALLOC_g)
+#define H5E_CANTCOPY      (H5OPEN H5E_CANTCOPY_g)
+#define H5E_CANTFREE      (H5OPEN H5E_CANTFREE_g)
+#define H5E_ALREADYEXISTS (H5OPEN H5E_ALREADYEXISTS_g)
+#define H5E_CANTLOCK      (H5OPEN H5E_CANTLOCK_g)
+#define H5E_CANTUNLOCK    (H5OPEN H5E_CANTUNLOCK_g)
+#define H5E_CANTGC        (H5OPEN H5E_CANTGC_g)
+#define H5E_CANTGETSIZE   (H5OPEN H5E_CANTGETSIZE_g)
+#define H5E_OBJOPEN       (H5OPEN H5E_OBJOPEN_g)
 H5_DLLVAR hid_t H5E_NOSPACE_g;       /* No space available for allocation */
 H5_DLLVAR hid_t H5E_CANTALLOC_g;     /* Can't allocate space */
 H5_DLLVAR hid_t H5E_CANTCOPY_g;      /* Unable to copy object */
@@ -130,111 +129,111 @@ H5_DLLVAR hid_t H5E_CANTGETSIZE_g;   /* Unable to compute size */
 H5_DLLVAR hid_t H5E_OBJOPEN_g;       /* Object is already open */
 
 /* Heap errors */
-#define H5E_CANTRESTORE      (H5OPEN H5E_CANTRESTORE_g)
-#define H5E_CANTCOMPUTE      (H5OPEN H5E_CANTCOMPUTE_g)
-#define H5E_CANTEXTEND       (H5OPEN H5E_CANTEXTEND_g)
-#define H5E_CANTATTACH       (H5OPEN H5E_CANTATTACH_g)
-#define H5E_CANTUPDATE       (H5OPEN H5E_CANTUPDATE_g)
-#define H5E_CANTOPERATE      (H5OPEN H5E_CANTOPERATE_g)
-H5_DLLVAR hid_t H5E_CANTRESTORE_g;   /* Can't restore condition */
-H5_DLLVAR hid_t H5E_CANTCOMPUTE_g;   /* Can't compute value */
-H5_DLLVAR hid_t H5E_CANTEXTEND_g;    /* Can't extend heap's space */
-H5_DLLVAR hid_t H5E_CANTATTACH_g;    /* Can't attach object */
-H5_DLLVAR hid_t H5E_CANTUPDATE_g;    /* Can't update object */
-H5_DLLVAR hid_t H5E_CANTOPERATE_g;   /* Can't operate on object */
+#define H5E_CANTRESTORE (H5OPEN H5E_CANTRESTORE_g)
+#define H5E_CANTCOMPUTE (H5OPEN H5E_CANTCOMPUTE_g)
+#define H5E_CANTEXTEND  (H5OPEN H5E_CANTEXTEND_g)
+#define H5E_CANTATTACH  (H5OPEN H5E_CANTATTACH_g)
+#define H5E_CANTUPDATE  (H5OPEN H5E_CANTUPDATE_g)
+#define H5E_CANTOPERATE (H5OPEN H5E_CANTOPERATE_g)
+H5_DLLVAR hid_t H5E_CANTRESTORE_g; /* Can't restore condition */
+H5_DLLVAR hid_t H5E_CANTCOMPUTE_g; /* Can't compute value */
+H5_DLLVAR hid_t H5E_CANTEXTEND_g;  /* Can't extend heap's space */
+H5_DLLVAR hid_t H5E_CANTATTACH_g;  /* Can't attach object */
+H5_DLLVAR hid_t H5E_CANTUPDATE_g;  /* Can't update object */
+H5_DLLVAR hid_t H5E_CANTOPERATE_g; /* Can't operate on object */
 
 /* Function entry/exit interface errors */
-#define H5E_CANTINIT         (H5OPEN H5E_CANTINIT_g)
-#define H5E_ALREADYINIT      (H5OPEN H5E_ALREADYINIT_g)
-#define H5E_CANTRELEASE      (H5OPEN H5E_CANTRELEASE_g)
-H5_DLLVAR hid_t H5E_CANTINIT_g;      /* Unable to initialize object */
-H5_DLLVAR hid_t H5E_ALREADYINIT_g;   /* Object already initialized */
-H5_DLLVAR hid_t H5E_CANTRELEASE_g;   /* Unable to release object */
+#define H5E_CANTINIT    (H5OPEN H5E_CANTINIT_g)
+#define H5E_ALREADYINIT (H5OPEN H5E_ALREADYINIT_g)
+#define H5E_CANTRELEASE (H5OPEN H5E_CANTRELEASE_g)
+H5_DLLVAR hid_t H5E_CANTINIT_g;    /* Unable to initialize object */
+H5_DLLVAR hid_t H5E_ALREADYINIT_g; /* Object already initialized */
+H5_DLLVAR hid_t H5E_CANTRELEASE_g; /* Unable to release object */
 
 /* Property list errors */
-#define H5E_CANTGET          (H5OPEN H5E_CANTGET_g)
-#define H5E_CANTSET          (H5OPEN H5E_CANTSET_g)
-#define H5E_DUPCLASS         (H5OPEN H5E_DUPCLASS_g)
-#define H5E_SETDISALLOWED    (H5OPEN H5E_SETDISALLOWED_g)
+#define H5E_CANTGET       (H5OPEN H5E_CANTGET_g)
+#define H5E_CANTSET       (H5OPEN H5E_CANTSET_g)
+#define H5E_DUPCLASS      (H5OPEN H5E_DUPCLASS_g)
+#define H5E_SETDISALLOWED (H5OPEN H5E_SETDISALLOWED_g)
 H5_DLLVAR hid_t H5E_CANTGET_g;       /* Can't get value */
 H5_DLLVAR hid_t H5E_CANTSET_g;       /* Can't set value */
 H5_DLLVAR hid_t H5E_DUPCLASS_g;      /* Duplicate class name in parent class */
 H5_DLLVAR hid_t H5E_SETDISALLOWED_g; /* Disallowed operation */
 
 /* Free space errors */
-#define H5E_CANTMERGE        (H5OPEN H5E_CANTMERGE_g)
-#define H5E_CANTREVIVE       (H5OPEN H5E_CANTREVIVE_g)
-#define H5E_CANTSHRINK       (H5OPEN H5E_CANTSHRINK_g)
-H5_DLLVAR hid_t H5E_CANTMERGE_g;     /* Can't merge objects */
-H5_DLLVAR hid_t H5E_CANTREVIVE_g;    /* Can't revive object */
-H5_DLLVAR hid_t H5E_CANTSHRINK_g;    /* Can't shrink container */
+#define H5E_CANTMERGE  (H5OPEN H5E_CANTMERGE_g)
+#define H5E_CANTREVIVE (H5OPEN H5E_CANTREVIVE_g)
+#define H5E_CANTSHRINK (H5OPEN H5E_CANTSHRINK_g)
+H5_DLLVAR hid_t H5E_CANTMERGE_g;  /* Can't merge objects */
+H5_DLLVAR hid_t H5E_CANTREVIVE_g; /* Can't revive object */
+H5_DLLVAR hid_t H5E_CANTSHRINK_g; /* Can't shrink container */
 
 /* Object header related errors */
-#define H5E_LINKCOUNT        (H5OPEN H5E_LINKCOUNT_g)
-#define H5E_VERSION          (H5OPEN H5E_VERSION_g)
-#define H5E_ALIGNMENT        (H5OPEN H5E_ALIGNMENT_g)
-#define H5E_BADMESG          (H5OPEN H5E_BADMESG_g)
-#define H5E_CANTDELETE       (H5OPEN H5E_CANTDELETE_g)
-#define H5E_BADITER          (H5OPEN H5E_BADITER_g)
-#define H5E_CANTPACK         (H5OPEN H5E_CANTPACK_g)
-#define H5E_CANTRESET        (H5OPEN H5E_CANTRESET_g)
-#define H5E_CANTRENAME       (H5OPEN H5E_CANTRENAME_g)
-H5_DLLVAR hid_t H5E_LINKCOUNT_g;     /* Bad object header link count */
-H5_DLLVAR hid_t H5E_VERSION_g;       /* Wrong version number */
-H5_DLLVAR hid_t H5E_ALIGNMENT_g;     /* Alignment error */
-H5_DLLVAR hid_t H5E_BADMESG_g;       /* Unrecognized message */
-H5_DLLVAR hid_t H5E_CANTDELETE_g;    /* Can't delete message */
-H5_DLLVAR hid_t H5E_BADITER_g;       /* Iteration failed */
-H5_DLLVAR hid_t H5E_CANTPACK_g;      /* Can't pack messages */
-H5_DLLVAR hid_t H5E_CANTRESET_g;     /* Can't reset object */
-H5_DLLVAR hid_t H5E_CANTRENAME_g;    /* Unable to rename object */
+#define H5E_LINKCOUNT  (H5OPEN H5E_LINKCOUNT_g)
+#define H5E_VERSION    (H5OPEN H5E_VERSION_g)
+#define H5E_ALIGNMENT  (H5OPEN H5E_ALIGNMENT_g)
+#define H5E_BADMESG    (H5OPEN H5E_BADMESG_g)
+#define H5E_CANTDELETE (H5OPEN H5E_CANTDELETE_g)
+#define H5E_BADITER    (H5OPEN H5E_BADITER_g)
+#define H5E_CANTPACK   (H5OPEN H5E_CANTPACK_g)
+#define H5E_CANTRESET  (H5OPEN H5E_CANTRESET_g)
+#define H5E_CANTRENAME (H5OPEN H5E_CANTRENAME_g)
+H5_DLLVAR hid_t H5E_LINKCOUNT_g;  /* Bad object header link count */
+H5_DLLVAR hid_t H5E_VERSION_g;    /* Wrong version number */
+H5_DLLVAR hid_t H5E_ALIGNMENT_g;  /* Alignment error */
+H5_DLLVAR hid_t H5E_BADMESG_g;    /* Unrecognized message */
+H5_DLLVAR hid_t H5E_CANTDELETE_g; /* Can't delete message */
+H5_DLLVAR hid_t H5E_BADITER_g;    /* Iteration failed */
+H5_DLLVAR hid_t H5E_CANTPACK_g;   /* Can't pack messages */
+H5_DLLVAR hid_t H5E_CANTRESET_g;  /* Can't reset object */
+H5_DLLVAR hid_t H5E_CANTRENAME_g; /* Unable to rename object */
 
 /* System level errors */
-#define H5E_SYSERRSTR        (H5OPEN H5E_SYSERRSTR_g)
-H5_DLLVAR hid_t H5E_SYSERRSTR_g;     /* System error message */
+#define H5E_SYSERRSTR (H5OPEN H5E_SYSERRSTR_g)
+H5_DLLVAR hid_t H5E_SYSERRSTR_g; /* System error message */
 
 /* I/O pipeline errors */
-#define H5E_NOFILTER         (H5OPEN H5E_NOFILTER_g)
-#define H5E_CALLBACK         (H5OPEN H5E_CALLBACK_g)
-#define H5E_CANAPPLY         (H5OPEN H5E_CANAPPLY_g)
-#define H5E_SETLOCAL         (H5OPEN H5E_SETLOCAL_g)
-#define H5E_NOENCODER        (H5OPEN H5E_NOENCODER_g)
-#define H5E_CANTFILTER       (H5OPEN H5E_CANTFILTER_g)
-H5_DLLVAR hid_t H5E_NOFILTER_g;      /* Requested filter is not available */
-H5_DLLVAR hid_t H5E_CALLBACK_g;      /* Callback failed */
-H5_DLLVAR hid_t H5E_CANAPPLY_g;      /* Error from filter 'can apply' callback */
-H5_DLLVAR hid_t H5E_SETLOCAL_g;      /* Error from filter 'set local' callback */
-H5_DLLVAR hid_t H5E_NOENCODER_g;     /* Filter present but encoding disabled */
-H5_DLLVAR hid_t H5E_CANTFILTER_g;    /* Filter operation failed */
+#define H5E_NOFILTER   (H5OPEN H5E_NOFILTER_g)
+#define H5E_CALLBACK   (H5OPEN H5E_CALLBACK_g)
+#define H5E_CANAPPLY   (H5OPEN H5E_CANAPPLY_g)
+#define H5E_SETLOCAL   (H5OPEN H5E_SETLOCAL_g)
+#define H5E_NOENCODER  (H5OPEN H5E_NOENCODER_g)
+#define H5E_CANTFILTER (H5OPEN H5E_CANTFILTER_g)
+H5_DLLVAR hid_t H5E_NOFILTER_g;   /* Requested filter is not available */
+H5_DLLVAR hid_t H5E_CALLBACK_g;   /* Callback failed */
+H5_DLLVAR hid_t H5E_CANAPPLY_g;   /* Error from filter 'can apply' callback */
+H5_DLLVAR hid_t H5E_SETLOCAL_g;   /* Error from filter 'set local' callback */
+H5_DLLVAR hid_t H5E_NOENCODER_g;  /* Filter present but encoding disabled */
+H5_DLLVAR hid_t H5E_CANTFILTER_g; /* Filter operation failed */
 
 /* Group related errors */
-#define H5E_CANTOPENOBJ      (H5OPEN H5E_CANTOPENOBJ_g)
-#define H5E_CANTCLOSEOBJ     (H5OPEN H5E_CANTCLOSEOBJ_g)
-#define H5E_COMPLEN          (H5OPEN H5E_COMPLEN_g)
-#define H5E_PATH             (H5OPEN H5E_PATH_g)
-H5_DLLVAR hid_t H5E_CANTOPENOBJ_g;   /* Can't open object */
-H5_DLLVAR hid_t H5E_CANTCLOSEOBJ_g;  /* Can't close object */
-H5_DLLVAR hid_t H5E_COMPLEN_g;       /* Name component is too long */
-H5_DLLVAR hid_t H5E_PATH_g;          /* Problem with path to object */
+#define H5E_CANTOPENOBJ  (H5OPEN H5E_CANTOPENOBJ_g)
+#define H5E_CANTCLOSEOBJ (H5OPEN H5E_CANTCLOSEOBJ_g)
+#define H5E_COMPLEN      (H5OPEN H5E_COMPLEN_g)
+#define H5E_PATH         (H5OPEN H5E_PATH_g)
+H5_DLLVAR hid_t H5E_CANTOPENOBJ_g;  /* Can't open object */
+H5_DLLVAR hid_t H5E_CANTCLOSEOBJ_g; /* Can't close object */
+H5_DLLVAR hid_t H5E_COMPLEN_g;      /* Name component is too long */
+H5_DLLVAR hid_t H5E_PATH_g;         /* Problem with path to object */
 
 /* No error */
-#define H5E_NONE_MINOR       (H5OPEN H5E_NONE_MINOR_g)
-H5_DLLVAR hid_t H5E_NONE_MINOR_g;    /* No error */
+#define H5E_NONE_MINOR (H5OPEN H5E_NONE_MINOR_g)
+H5_DLLVAR hid_t H5E_NONE_MINOR_g; /* No error */
 
 /* Plugin errors */
-#define H5E_OPENERROR        (H5OPEN H5E_OPENERROR_g)
-H5_DLLVAR hid_t H5E_OPENERROR_g;     /* Can't open directory or file */
+#define H5E_OPENERROR (H5OPEN H5E_OPENERROR_g)
+H5_DLLVAR hid_t H5E_OPENERROR_g; /* Can't open directory or file */
 
 /* File accessibilty errors */
-#define H5E_FILEEXISTS       (H5OPEN H5E_FILEEXISTS_g)
-#define H5E_FILEOPEN         (H5OPEN H5E_FILEOPEN_g)
-#define H5E_CANTCREATE       (H5OPEN H5E_CANTCREATE_g)
-#define H5E_CANTOPENFILE     (H5OPEN H5E_CANTOPENFILE_g)
-#define H5E_CANTCLOSEFILE    (H5OPEN H5E_CANTCLOSEFILE_g)
-#define H5E_NOTHDF5          (H5OPEN H5E_NOTHDF5_g)
-#define H5E_BADFILE          (H5OPEN H5E_BADFILE_g)
-#define H5E_TRUNCATED        (H5OPEN H5E_TRUNCATED_g)
-#define H5E_MOUNT            (H5OPEN H5E_MOUNT_g)
+#define H5E_FILEEXISTS    (H5OPEN H5E_FILEEXISTS_g)
+#define H5E_FILEOPEN      (H5OPEN H5E_FILEOPEN_g)
+#define H5E_CANTCREATE    (H5OPEN H5E_CANTCREATE_g)
+#define H5E_CANTOPENFILE  (H5OPEN H5E_CANTOPENFILE_g)
+#define H5E_CANTCLOSEFILE (H5OPEN H5E_CANTCLOSEFILE_g)
+#define H5E_NOTHDF5       (H5OPEN H5E_NOTHDF5_g)
+#define H5E_BADFILE       (H5OPEN H5E_BADFILE_g)
+#define H5E_TRUNCATED     (H5OPEN H5E_TRUNCATED_g)
+#define H5E_MOUNT         (H5OPEN H5E_MOUNT_g)
 H5_DLLVAR hid_t H5E_FILEEXISTS_g;    /* File already exists */
 H5_DLLVAR hid_t H5E_FILEOPEN_g;      /* File already open */
 H5_DLLVAR hid_t H5E_CANTCREATE_g;    /* Unable to create file */
@@ -246,35 +245,35 @@ H5_DLLVAR hid_t H5E_TRUNCATED_g;     /* File has been truncated */
 H5_DLLVAR hid_t H5E_MOUNT_g;         /* File mount error */
 
 /* Object atom related errors */
-#define H5E_BADATOM          (H5OPEN H5E_BADATOM_g)
-#define H5E_BADGROUP         (H5OPEN H5E_BADGROUP_g)
-#define H5E_CANTREGISTER     (H5OPEN H5E_CANTREGISTER_g)
-#define H5E_CANTINC          (H5OPEN H5E_CANTINC_g)
-#define H5E_CANTDEC          (H5OPEN H5E_CANTDEC_g)
-#define H5E_NOIDS            (H5OPEN H5E_NOIDS_g)
-H5_DLLVAR hid_t H5E_BADATOM_g;       /* Unable to find atom information (already closed?) */
-H5_DLLVAR hid_t H5E_BADGROUP_g;      /* Unable to find ID group information */
-H5_DLLVAR hid_t H5E_CANTREGISTER_g;  /* Unable to register new atom */
-H5_DLLVAR hid_t H5E_CANTINC_g;       /* Unable to increment reference count */
-H5_DLLVAR hid_t H5E_CANTDEC_g;       /* Unable to decrement reference count */
-H5_DLLVAR hid_t H5E_NOIDS_g;         /* Out of IDs for group */
+#define H5E_BADATOM      (H5OPEN H5E_BADATOM_g)
+#define H5E_BADGROUP     (H5OPEN H5E_BADGROUP_g)
+#define H5E_CANTREGISTER (H5OPEN H5E_CANTREGISTER_g)
+#define H5E_CANTINC      (H5OPEN H5E_CANTINC_g)
+#define H5E_CANTDEC      (H5OPEN H5E_CANTDEC_g)
+#define H5E_NOIDS        (H5OPEN H5E_NOIDS_g)
+H5_DLLVAR hid_t H5E_BADATOM_g;      /* Unable to find atom information (already closed?) */
+H5_DLLVAR hid_t H5E_BADGROUP_g;     /* Unable to find ID group information */
+H5_DLLVAR hid_t H5E_CANTREGISTER_g; /* Unable to register new atom */
+H5_DLLVAR hid_t H5E_CANTINC_g;      /* Unable to increment reference count */
+H5_DLLVAR hid_t H5E_CANTDEC_g;      /* Unable to decrement reference count */
+H5_DLLVAR hid_t H5E_NOIDS_g;        /* Out of IDs for group */
 
 /* Cache related errors */
-#define H5E_CANTFLUSH        (H5OPEN H5E_CANTFLUSH_g)
-#define H5E_CANTSERIALIZE    (H5OPEN H5E_CANTSERIALIZE_g)
-#define H5E_CANTLOAD         (H5OPEN H5E_CANTLOAD_g)
-#define H5E_PROTECT          (H5OPEN H5E_PROTECT_g)
-#define H5E_NOTCACHED        (H5OPEN H5E_NOTCACHED_g)
-#define H5E_SYSTEM           (H5OPEN H5E_SYSTEM_g)
-#define H5E_CANTINS          (H5OPEN H5E_CANTINS_g)
-#define H5E_CANTPROTECT      (H5OPEN H5E_CANTPROTECT_g)
-#define H5E_CANTUNPROTECT    (H5OPEN H5E_CANTUNPROTECT_g)
-#define H5E_CANTPIN          (H5OPEN H5E_CANTPIN_g)
-#define H5E_CANTUNPIN        (H5OPEN H5E_CANTUNPIN_g)
-#define H5E_CANTMARKDIRTY    (H5OPEN H5E_CANTMARKDIRTY_g)
-#define H5E_CANTDIRTY        (H5OPEN H5E_CANTDIRTY_g)
-#define H5E_CANTEXPUNGE      (H5OPEN H5E_CANTEXPUNGE_g)
-#define H5E_CANTRESIZE       (H5OPEN H5E_CANTRESIZE_g)
+#define H5E_CANTFLUSH     (H5OPEN H5E_CANTFLUSH_g)
+#define H5E_CANTSERIALIZE (H5OPEN H5E_CANTSERIALIZE_g)
+#define H5E_CANTLOAD      (H5OPEN H5E_CANTLOAD_g)
+#define H5E_PROTECT       (H5OPEN H5E_PROTECT_g)
+#define H5E_NOTCACHED     (H5OPEN H5E_NOTCACHED_g)
+#define H5E_SYSTEM        (H5OPEN H5E_SYSTEM_g)
+#define H5E_CANTINS       (H5OPEN H5E_CANTINS_g)
+#define H5E_CANTPROTECT   (H5OPEN H5E_CANTPROTECT_g)
+#define H5E_CANTUNPROTECT (H5OPEN H5E_CANTUNPROTECT_g)
+#define H5E_CANTPIN       (H5OPEN H5E_CANTPIN_g)
+#define H5E_CANTUNPIN     (H5OPEN H5E_CANTUNPIN_g)
+#define H5E_CANTMARKDIRTY (H5OPEN H5E_CANTMARKDIRTY_g)
+#define H5E_CANTDIRTY     (H5OPEN H5E_CANTDIRTY_g)
+#define H5E_CANTEXPUNGE   (H5OPEN H5E_CANTEXPUNGE_g)
+#define H5E_CANTRESIZE    (H5OPEN H5E_CANTRESIZE_g)
 H5_DLLVAR hid_t H5E_CANTFLUSH_g;     /* Unable to flush data from cache */
 H5_DLLVAR hid_t H5E_CANTSERIALIZE_g; /* Unable to serialize data from cache */
 H5_DLLVAR hid_t H5E_CANTLOAD_g;      /* Unable to load metadata into cache */
@@ -292,11 +291,11 @@ H5_DLLVAR hid_t H5E_CANTEXPUNGE_g;   /* Unable to expunge a metadata cache entry
 H5_DLLVAR hid_t H5E_CANTRESIZE_g;    /* Unable to resize a metadata cache entry */
 
 /* Link related errors */
-#define H5E_TRAVERSE         (H5OPEN H5E_TRAVERSE_g)
-#define H5E_NLINKS           (H5OPEN H5E_NLINKS_g)
-#define H5E_NOTREGISTERED    (H5OPEN H5E_NOTREGISTERED_g)
-#define H5E_CANTMOVE         (H5OPEN H5E_CANTMOVE_g)
-#define H5E_CANTSORT         (H5OPEN H5E_CANTSORT_g)
+#define H5E_TRAVERSE      (H5OPEN H5E_TRAVERSE_g)
+#define H5E_NLINKS        (H5OPEN H5E_NLINKS_g)
+#define H5E_NOTREGISTERED (H5OPEN H5E_NOTREGISTERED_g)
+#define H5E_CANTMOVE      (H5OPEN H5E_CANTMOVE_g)
+#define H5E_CANTSORT      (H5OPEN H5E_CANTSORT_g)
 H5_DLLVAR hid_t H5E_TRAVERSE_g;      /* Link traversal failure */
 H5_DLLVAR hid_t H5E_NLINKS_g;        /* Too many soft links in path */
 H5_DLLVAR hid_t H5E_NOTREGISTERED_g; /* Link class not registered */
@@ -304,33 +303,33 @@ H5_DLLVAR hid_t H5E_CANTMOVE_g;      /* Can't move object */
 H5_DLLVAR hid_t H5E_CANTSORT_g;      /* Can't sort objects */
 
 /* Parallel MPI errors */
-#define H5E_MPI              (H5OPEN H5E_MPI_g)
-#define H5E_MPIERRSTR        (H5OPEN H5E_MPIERRSTR_g)
-#define H5E_CANTRECV         (H5OPEN H5E_CANTRECV_g)
-H5_DLLVAR hid_t H5E_MPI_g;           /* Some MPI function failed */
-H5_DLLVAR hid_t H5E_MPIERRSTR_g;     /* MPI Error String */
-H5_DLLVAR hid_t H5E_CANTRECV_g;      /* Can't receive data */
+#define H5E_MPI       (H5OPEN H5E_MPI_g)
+#define H5E_MPIERRSTR (H5OPEN H5E_MPIERRSTR_g)
+#define H5E_CANTRECV  (H5OPEN H5E_CANTRECV_g)
+H5_DLLVAR hid_t H5E_MPI_g;       /* Some MPI function failed */
+H5_DLLVAR hid_t H5E_MPIERRSTR_g; /* MPI Error String */
+H5_DLLVAR hid_t H5E_CANTRECV_g;  /* Can't receive data */
 
 /* Dataspace errors */
-#define H5E_CANTCLIP         (H5OPEN H5E_CANTCLIP_g)
-#define H5E_CANTCOUNT        (H5OPEN H5E_CANTCOUNT_g)
-#define H5E_CANTSELECT       (H5OPEN H5E_CANTSELECT_g)
-#define H5E_CANTNEXT         (H5OPEN H5E_CANTNEXT_g)
-#define H5E_BADSELECT        (H5OPEN H5E_BADSELECT_g)
-#define H5E_CANTCOMPARE      (H5OPEN H5E_CANTCOMPARE_g)
-H5_DLLVAR hid_t H5E_CANTCLIP_g;      /* Can't clip hyperslab region */
-H5_DLLVAR hid_t H5E_CANTCOUNT_g;     /* Can't count elements */
-H5_DLLVAR hid_t H5E_CANTSELECT_g;    /* Can't select hyperslab */
-H5_DLLVAR hid_t H5E_CANTNEXT_g;      /* Can't move to next iterator location */
-H5_DLLVAR hid_t H5E_BADSELECT_g;     /* Invalid selection */
-H5_DLLVAR hid_t H5E_CANTCOMPARE_g;   /* Can't compare objects */
+#define H5E_CANTCLIP    (H5OPEN H5E_CANTCLIP_g)
+#define H5E_CANTCOUNT   (H5OPEN H5E_CANTCOUNT_g)
+#define H5E_CANTSELECT  (H5OPEN H5E_CANTSELECT_g)
+#define H5E_CANTNEXT    (H5OPEN H5E_CANTNEXT_g)
+#define H5E_BADSELECT   (H5OPEN H5E_BADSELECT_g)
+#define H5E_CANTCOMPARE (H5OPEN H5E_CANTCOMPARE_g)
+H5_DLLVAR hid_t H5E_CANTCLIP_g;    /* Can't clip hyperslab region */
+H5_DLLVAR hid_t H5E_CANTCOUNT_g;   /* Can't count elements */
+H5_DLLVAR hid_t H5E_CANTSELECT_g;  /* Can't select hyperslab */
+H5_DLLVAR hid_t H5E_CANTNEXT_g;    /* Can't move to next iterator location */
+H5_DLLVAR hid_t H5E_BADSELECT_g;   /* Invalid selection */
+H5_DLLVAR hid_t H5E_CANTCOMPARE_g; /* Can't compare objects */
 
 /* Argument errors */
-#define H5E_UNINITIALIZED    (H5OPEN H5E_UNINITIALIZED_g)
-#define H5E_UNSUPPORTED      (H5OPEN H5E_UNSUPPORTED_g)
-#define H5E_BADTYPE          (H5OPEN H5E_BADTYPE_g)
-#define H5E_BADRANGE         (H5OPEN H5E_BADRANGE_g)
-#define H5E_BADVALUE         (H5OPEN H5E_BADVALUE_g)
+#define H5E_UNINITIALIZED (H5OPEN H5E_UNINITIALIZED_g)
+#define H5E_UNSUPPORTED   (H5OPEN H5E_UNSUPPORTED_g)
+#define H5E_BADTYPE       (H5OPEN H5E_BADTYPE_g)
+#define H5E_BADRANGE      (H5OPEN H5E_BADRANGE_g)
+#define H5E_BADVALUE      (H5OPEN H5E_BADVALUE_g)
 H5_DLLVAR hid_t H5E_UNINITIALIZED_g; /* Information is uinitialized */
 H5_DLLVAR hid_t H5E_UNSUPPORTED_g;   /* Feature is unsupported */
 H5_DLLVAR hid_t H5E_BADTYPE_g;       /* Inappropriate type */
@@ -349,23 +348,23 @@ H5_DLLVAR hid_t H5E_BADVALUE_g;      /* Bad value */
 #define H5E_CANTLIST         (H5OPEN H5E_CANTLIST_g)
 #define H5E_CANTMODIFY       (H5OPEN H5E_CANTMODIFY_g)
 #define H5E_CANTREMOVE       (H5OPEN H5E_CANTREMOVE_g)
-H5_DLLVAR hid_t H5E_NOTFOUND_g;      /* Object not found */
-H5_DLLVAR hid_t H5E_EXISTS_g;        /* Object already exists */
-H5_DLLVAR hid_t H5E_CANTENCODE_g;    /* Unable to encode value */
-H5_DLLVAR hid_t H5E_CANTDECODE_g;    /* Unable to decode value */
-H5_DLLVAR hid_t H5E_CANTSPLIT_g;     /* Unable to split node */
+H5_DLLVAR hid_t H5E_NOTFOUND_g;         /* Object not found */
+H5_DLLVAR hid_t H5E_EXISTS_g;           /* Object already exists */
+H5_DLLVAR hid_t H5E_CANTENCODE_g;       /* Unable to encode value */
+H5_DLLVAR hid_t H5E_CANTDECODE_g;       /* Unable to decode value */
+H5_DLLVAR hid_t H5E_CANTSPLIT_g;        /* Unable to split node */
 H5_DLLVAR hid_t H5E_CANTREDISTRIBUTE_g; /* Unable to redistribute records */
-H5_DLLVAR hid_t H5E_CANTSWAP_g;      /* Unable to swap records */
-H5_DLLVAR hid_t H5E_CANTINSERT_g;    /* Unable to insert object */
-H5_DLLVAR hid_t H5E_CANTLIST_g;      /* Unable to list node */
-H5_DLLVAR hid_t H5E_CANTMODIFY_g;    /* Unable to modify record */
-H5_DLLVAR hid_t H5E_CANTREMOVE_g;    /* Unable to remove object */
+H5_DLLVAR hid_t H5E_CANTSWAP_g;         /* Unable to swap records */
+H5_DLLVAR hid_t H5E_CANTINSERT_g;       /* Unable to insert object */
+H5_DLLVAR hid_t H5E_CANTLIST_g;         /* Unable to list node */
+H5_DLLVAR hid_t H5E_CANTMODIFY_g;       /* Unable to modify record */
+H5_DLLVAR hid_t H5E_CANTREMOVE_g;       /* Unable to remove object */
 
 /* Datatype conversion errors */
-#define H5E_CANTCONVERT      (H5OPEN H5E_CANTCONVERT_g)
-#define H5E_BADSIZE          (H5OPEN H5E_BADSIZE_g)
-H5_DLLVAR hid_t H5E_CANTCONVERT_g;   /* Can't convert datatypes */
-H5_DLLVAR hid_t H5E_BADSIZE_g;       /* Bad size for object */
+#define H5E_CANTCONVERT (H5OPEN H5E_CANTCONVERT_g)
+#define H5E_BADSIZE     (H5OPEN H5E_BADSIZE_g)
+H5_DLLVAR hid_t H5E_CANTCONVERT_g; /* Can't convert datatypes */
+H5_DLLVAR hid_t H5E_BADSIZE_g;     /* Bad size for object */
 
 #ifdef __cplusplus
 }
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 3eae2da..9e5bc5d 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -17,42 +17,39 @@
 #ifndef _H5Epublic_H
 #define _H5Epublic_H
 
-#include <stdio.h>              /*FILE arg of H5Eprint()                     */
+#include <stdio.h> /*FILE arg of H5Eprint()                     */
 
 /* Public headers needed by this file */
 #include "H5public.h"
 #include "H5Ipublic.h"
 
 /* Value for the default error stack */
-#define H5E_DEFAULT             (hid_t)0
+#define H5E_DEFAULT (hid_t)0
 
 /* Different kinds of error information */
-typedef enum H5E_type_t {
-    H5E_MAJOR,
-    H5E_MINOR
-} H5E_type_t;
+typedef enum H5E_type_t { H5E_MAJOR, H5E_MINOR } H5E_type_t;
 
 /* Information about an error; element of error stack */
 typedef struct H5E_error2_t {
-    hid_t       cls_id;         /*class ID                           */
-    hid_t       maj_num;	/*major error ID		     */
-    hid_t       min_num;	/*minor error number		     */
-    unsigned	line;		/*line in file where error occurs    */
-    const char	*func_name;   	/*function in which error occurred   */
-    const char	*file_name;	/*file in which error occurred       */
-    const char	*desc;		/*optional supplied description      */
+    hid_t       cls_id;    /*class ID                           */
+    hid_t       maj_num;   /*major error ID		     */
+    hid_t       min_num;   /*minor error number		     */
+    unsigned    line;      /*line in file where error occurs    */
+    const char *func_name; /*function in which error occurred   */
+    const char *file_name; /*file in which error occurred       */
+    const char *desc;      /*optional supplied description      */
 } H5E_error2_t;
 
 /* When this header is included from a private header, don't make calls to H5open() */
 #undef H5OPEN
 #ifndef _H5private_H
-#define H5OPEN          H5open(),
-#else   /* _H5private_H */
+#define H5OPEN H5open(),
+#else /* _H5private_H */
 #define H5OPEN
-#endif  /* _H5private_H */
+#endif /* _H5private_H */
 
 /* HDF5 error class */
-#define H5E_ERR_CLS		(H5OPEN H5E_ERR_CLS_g)
+#define H5E_ERR_CLS (H5OPEN H5E_ERR_CLS_g)
 H5_DLLVAR hid_t H5E_ERR_CLS_g;
 
 /* Include the automatically generated public header information */
@@ -75,108 +72,108 @@ H5_DLLVAR hid_t H5E_ERR_CLS_g;
  * purpose.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-#define H5E_BEGIN_TRY {							      \
-    unsigned H5E_saved_is_v2;					              \
-    union {								      \
-        H5E_auto1_t efunc1;						      \
-        H5E_auto2_t efunc2;					              \
-    } H5E_saved;							      \
-    void *H5E_saved_edata;						      \
-								    	      \
-    (void)H5Eauto_is_v2(H5E_DEFAULT, &H5E_saved_is_v2);		              \
-    if(H5E_saved_is_v2) {						      \
-        (void)H5Eget_auto2(H5E_DEFAULT, &H5E_saved.efunc2, &H5E_saved_edata); \
-        (void)H5Eset_auto2(H5E_DEFAULT, NULL, NULL);		              \
-    } else {								      \
-        (void)H5Eget_auto1(&H5E_saved.efunc1, &H5E_saved_edata);		      \
-        (void)H5Eset_auto1(NULL, NULL);					      \
+#define H5E_BEGIN_TRY                                                                                        \
+    {                                                                                                        \
+        unsigned H5E_saved_is_v2;                                                                            \
+        union {                                                                                              \
+            H5E_auto1_t efunc1;                                                                              \
+            H5E_auto2_t efunc2;                                                                              \
+        } H5E_saved;                                                                                         \
+        void *H5E_saved_edata;                                                                               \
+                                                                                                             \
+        (void)H5Eauto_is_v2(H5E_DEFAULT, &H5E_saved_is_v2);                                                  \
+        if (H5E_saved_is_v2) {                                                                               \
+            (void)H5Eget_auto2(H5E_DEFAULT, &H5E_saved.efunc2, &H5E_saved_edata);                            \
+            (void)H5Eset_auto2(H5E_DEFAULT, NULL, NULL);                                                     \
+        }                                                                                                    \
+        else {                                                                                               \
+            (void)H5Eget_auto1(&H5E_saved.efunc1, &H5E_saved_edata);                                         \
+            (void)H5Eset_auto1(NULL, NULL);                                                                  \
+        }
+
+#define H5E_END_TRY                                                                                          \
+    if (H5E_saved_is_v2)                                                                                     \
+        (void)H5Eset_auto2(H5E_DEFAULT, H5E_saved.efunc2, H5E_saved_edata);                                  \
+    else                                                                                                     \
+        (void)H5Eset_auto1(H5E_saved.efunc1, H5E_saved_edata);                                               \
     }
-
-#define H5E_END_TRY							      \
-    if(H5E_saved_is_v2)							      \
-        (void)H5Eset_auto2(H5E_DEFAULT, H5E_saved.efunc2, H5E_saved_edata);   \
-    else								      \
-        (void)H5Eset_auto1(H5E_saved.efunc1, H5E_saved_edata);		      \
-}
 #else /* H5_NO_DEPRECATED_SYMBOLS */
-#define H5E_BEGIN_TRY {							      \
-    H5E_auto_t saved_efunc;						      \
-    void *H5E_saved_edata;						      \
-								    	      \
-    (void)H5Eget_auto(H5E_DEFAULT, &saved_efunc, &H5E_saved_edata);	      \
-    (void)H5Eset_auto(H5E_DEFAULT, NULL, NULL);
-
-#define H5E_END_TRY							      \
-    (void)H5Eset_auto(H5E_DEFAULT, saved_efunc, H5E_saved_edata);	      \
-}
+#define H5E_BEGIN_TRY                                                                                        \
+    {                                                                                                        \
+        H5E_auto_t saved_efunc;                                                                              \
+        void *     H5E_saved_edata;                                                                          \
+                                                                                                             \
+        (void)H5Eget_auto(H5E_DEFAULT, &saved_efunc, &H5E_saved_edata);                                      \
+        (void)H5Eset_auto(H5E_DEFAULT, NULL, NULL);
+
+#define H5E_END_TRY                                                                                          \
+    (void)H5Eset_auto(H5E_DEFAULT, saved_efunc, H5E_saved_edata);                                            \
+    }
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /*
  * Public API Convenience Macros for Error reporting - Documented
  */
 /* Use the Standard C __FILE__ & __LINE__ macros instead of typing them in */
-#define H5Epush_sim(func, cls, maj, min, str) H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, cls, maj, min, str)
+#define H5Epush_sim(func, cls, maj, min, str)                                                                \
+    H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, cls, maj, min, str)
 
 /*
  * Public API Convenience Macros for Error reporting - Undocumented
  */
 /* Use the Standard C __FILE__ & __LINE__ macros instead of typing them in */
 /*  And return after pushing error onto stack */
-#define H5Epush_ret(func, cls, maj, min, str, ret) {			      \
-    H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, cls, maj, min, str);      \
-    return(ret);							      \
-}
+#define H5Epush_ret(func, cls, maj, min, str, ret)                                                           \
+    {                                                                                                        \
+        H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, cls, maj, min, str);                                 \
+        return (ret);                                                                                        \
+    }
 
 /* Use the Standard C __FILE__ & __LINE__ macros instead of typing them in
  * And goto a label after pushing error onto stack.
  */
-#define H5Epush_goto(func, cls, maj, min, str, label) {			      \
-    H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, cls, maj, min, str);      \
-    goto label;								      \
-}
+#define H5Epush_goto(func, cls, maj, min, str, label)                                                        \
+    {                                                                                                        \
+        H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, cls, maj, min, str);                                 \
+        goto label;                                                                                          \
+    }
 
 /* Error stack traversal direction */
 typedef enum H5E_direction_t {
-    H5E_WALK_UPWARD	= 0,		/*begin deep, end at API function    */
-    H5E_WALK_DOWNWARD	= 1		/*begin at API function, end deep    */
+    H5E_WALK_UPWARD   = 0, /*begin deep, end at API function    */
+    H5E_WALK_DOWNWARD = 1  /*begin at API function, end deep    */
 } H5E_direction_t;
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Error stack traversal callback function pointers */
-typedef herr_t (*H5E_walk2_t)(unsigned n, const H5E_error2_t *err_desc,
-    void *client_data);
+typedef herr_t (*H5E_walk2_t)(unsigned n, const H5E_error2_t *err_desc, void *client_data);
 typedef herr_t (*H5E_auto2_t)(hid_t estack, void *client_data);
 
 /* Public API functions */
-H5_DLL hid_t  H5Eregister_class(const char *cls_name, const char *lib_name,
-    const char *version);
-H5_DLL herr_t H5Eunregister_class(hid_t class_id);
-H5_DLL herr_t H5Eclose_msg(hid_t err_id);
-H5_DLL hid_t  H5Ecreate_msg(hid_t cls, H5E_type_t msg_type, const char *msg);
-H5_DLL hid_t  H5Ecreate_stack(void);
-H5_DLL hid_t  H5Eget_current_stack(void);
-H5_DLL herr_t H5Eclose_stack(hid_t stack_id);
+H5_DLL hid_t   H5Eregister_class(const char *cls_name, const char *lib_name, const char *version);
+H5_DLL herr_t  H5Eunregister_class(hid_t class_id);
+H5_DLL herr_t  H5Eclose_msg(hid_t err_id);
+H5_DLL hid_t   H5Ecreate_msg(hid_t cls, H5E_type_t msg_type, const char *msg);
+H5_DLL hid_t   H5Ecreate_stack(void);
+H5_DLL hid_t   H5Eget_current_stack(void);
+H5_DLL herr_t  H5Eclose_stack(hid_t stack_id);
 H5_DLL ssize_t H5Eget_class_name(hid_t class_id, char *name, size_t size);
-H5_DLL herr_t H5Eset_current_stack(hid_t err_stack_id);
-H5_DLL herr_t H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line,
-    hid_t cls_id, hid_t maj_id, hid_t min_id, const char *msg, ...);
-H5_DLL herr_t H5Epop(hid_t err_stack, size_t count);
-H5_DLL herr_t H5Eprint2(hid_t err_stack, FILE *stream);
-H5_DLL herr_t H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t func,
-    void *client_data);
-H5_DLL herr_t H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data);
-H5_DLL herr_t H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data);
-H5_DLL herr_t H5Eclear2(hid_t err_stack);
-H5_DLL herr_t H5Eauto_is_v2(hid_t err_stack, unsigned *is_stack);
-H5_DLL ssize_t H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg,
-    size_t size);
+H5_DLL herr_t  H5Eset_current_stack(hid_t err_stack_id);
+H5_DLL herr_t  H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, hid_t cls_id,
+                        hid_t maj_id, hid_t min_id, const char *msg, ...);
+H5_DLL herr_t  H5Epop(hid_t err_stack, size_t count);
+H5_DLL herr_t  H5Eprint2(hid_t err_stack, FILE *stream);
+H5_DLL herr_t  H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t func, void *client_data);
+H5_DLL herr_t  H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data);
+H5_DLL herr_t  H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data);
+H5_DLL herr_t  H5Eclear2(hid_t err_stack);
+H5_DLL herr_t  H5Eauto_is_v2(hid_t err_stack, unsigned *is_stack);
+H5_DLL ssize_t H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg, size_t size);
 H5_DLL ssize_t H5Eget_num(hid_t error_stack_id);
 
-
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
  * Use of these symbols is deprecated.
@@ -188,17 +185,17 @@ H5_DLL ssize_t H5Eget_num(hid_t error_stack_id);
 /* Alias major & minor error types to hid_t's, for compatibility with new
  *      error API in v1.8
  */
-typedef hid_t   H5E_major_t;
-typedef hid_t   H5E_minor_t;
+typedef hid_t H5E_major_t;
+typedef hid_t H5E_minor_t;
 
 /* Information about an error element of error stack. */
 typedef struct H5E_error1_t {
-    H5E_major_t maj_num;                /*major error number                 */
-    H5E_minor_t min_num;                /*minor error number                 */
-    const char  *func_name;             /*function in which error occurred   */
-    const char  *file_name;             /*file in which error occurred       */
-    unsigned    line;                   /*line in file where error occurs    */
-    const char  *desc;                  /*optional supplied description      */
+    H5E_major_t maj_num;   /*major error number                 */
+    H5E_minor_t min_num;   /*minor error number                 */
+    const char *func_name; /*function in which error occurred   */
+    const char *file_name; /*file in which error occurred       */
+    unsigned    line;      /*line in file where error occurs    */
+    const char *desc;      /*optional supplied description      */
 } H5E_error1_t;
 
 /* Error stack traversal callback function pointers */
@@ -208,14 +205,13 @@ typedef herr_t (*H5E_auto1_t)(void *client_data);
 /* Function prototypes */
 H5_DLL herr_t H5Eclear1(void);
 H5_DLL herr_t H5Eget_auto1(H5E_auto1_t *func, void **client_data);
-H5_DLL herr_t H5Epush1(const char *file, const char *func, unsigned line,
-    H5E_major_t maj, H5E_minor_t min, const char *str);
+H5_DLL herr_t H5Epush1(const char *file, const char *func, unsigned line, H5E_major_t maj, H5E_minor_t min,
+                       const char *str);
 H5_DLL herr_t H5Eprint1(FILE *stream);
 H5_DLL herr_t H5Eset_auto1(H5E_auto1_t func, void *client_data);
-H5_DLL herr_t H5Ewalk1(H5E_direction_t direction, H5E_walk1_t func,
-    void *client_data);
-H5_DLL char *H5Eget_major(H5E_major_t maj);
-H5_DLL char *H5Eget_minor(H5E_minor_t min);
+H5_DLL herr_t H5Ewalk1(H5E_direction_t direction, H5E_walk1_t func, void *client_data);
+H5_DLL char * H5Eget_major(H5E_major_t maj);
+H5_DLL char * H5Eget_minor(H5E_minor_t min);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 #ifdef __cplusplus
@@ -223,4 +219,3 @@ H5_DLL char *H5Eget_minor(H5E_minor_t min);
 #endif
 
 #endif /* end _H5Epublic_H */
-
diff --git a/src/H5Eterm.h b/src/H5Eterm.h
index 2a8e11e..1d9f0f2 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -14,203 +14,89 @@
 /* Generated automatically by bin/make_err -- do not edit */
 /* Add new errors to H5err.txt file */
 
-
 #ifndef _H5Eterm_H
 #define _H5Eterm_H
 
 /* Reset major error IDs */
-    
-H5E_DATASET_g=    
-H5E_FUNC_g=    
-H5E_STORAGE_g=    
-H5E_FILE_g=    
-H5E_SOHM_g=    
-H5E_SYM_g=    
-H5E_PLUGIN_g=    
-H5E_VFL_g=    
-H5E_INTERNAL_g=    
-H5E_BTREE_g=    
-H5E_REFERENCE_g=    
-H5E_DATASPACE_g=    
-H5E_RESOURCE_g=    
-H5E_PLIST_g=    
-H5E_LINK_g=    
-H5E_DATATYPE_g=    
-H5E_RS_g=    
-H5E_HEAP_g=    
-H5E_OHDR_g=    
-H5E_ATOM_g=    
-H5E_ATTR_g=    
-H5E_NONE_MAJOR_g=    
-H5E_IO_g=    
-H5E_SLIST_g=    
-H5E_EFL_g=    
-H5E_TST_g=    
-H5E_ARGS_g=    
-H5E_ERROR_g=    
-H5E_PLINE_g=    
-H5E_FSPACE_g=    
-H5E_CACHE_g= (-1);
+
+H5E_DATASET_g = H5E_FUNC_g = H5E_STORAGE_g = H5E_FILE_g = H5E_SOHM_g = H5E_SYM_g = H5E_PLUGIN_g = H5E_VFL_g =
+    H5E_INTERNAL_g = H5E_BTREE_g = H5E_REFERENCE_g = H5E_DATASPACE_g = H5E_RESOURCE_g = H5E_PLIST_g =
+        H5E_LINK_g = H5E_DATATYPE_g = H5E_RS_g = H5E_HEAP_g = H5E_OHDR_g = H5E_ATOM_g = H5E_ATTR_g =
+            H5E_NONE_MAJOR_g = H5E_IO_g = H5E_SLIST_g = H5E_EFL_g = H5E_TST_g = H5E_ARGS_g = H5E_ERROR_g =
+                H5E_PLINE_g = H5E_FSPACE_g = H5E_CACHE_g = (-1);
 
 /* Reset minor error IDs */
 
+/* Generic low-level file I/O errors */
+H5E_SEEKERROR_g = H5E_READERROR_g = H5E_WRITEERROR_g = H5E_CLOSEERROR_g = H5E_OVERFLOW_g = H5E_FCNTL_g =
+
+    /* Resource errors */
+    H5E_NOSPACE_g = H5E_CANTALLOC_g = H5E_CANTCOPY_g = H5E_CANTFREE_g = H5E_ALREADYEXISTS_g = H5E_CANTLOCK_g =
+        H5E_CANTUNLOCK_g = H5E_CANTGC_g = H5E_CANTGETSIZE_g = H5E_OBJOPEN_g =
+
+            /* Heap errors */
+    H5E_CANTRESTORE_g = H5E_CANTCOMPUTE_g = H5E_CANTEXTEND_g = H5E_CANTATTACH_g = H5E_CANTUPDATE_g =
+        H5E_CANTOPERATE_g =
+
+            /* Function entry/exit interface errors */
+    H5E_CANTINIT_g = H5E_ALREADYINIT_g = H5E_CANTRELEASE_g =
+
+        /* Property list errors */
+    H5E_CANTGET_g = H5E_CANTSET_g = H5E_DUPCLASS_g = H5E_SETDISALLOWED_g =
+
+        /* Free space errors */
+    H5E_CANTMERGE_g = H5E_CANTREVIVE_g = H5E_CANTSHRINK_g =
+
+        /* Object header related errors */
+    H5E_LINKCOUNT_g = H5E_VERSION_g = H5E_ALIGNMENT_g = H5E_BADMESG_g = H5E_CANTDELETE_g = H5E_BADITER_g =
+        H5E_CANTPACK_g = H5E_CANTRESET_g = H5E_CANTRENAME_g =
+
+            /* System level errors */
+    H5E_SYSERRSTR_g =
+
+        /* I/O pipeline errors */
+    H5E_NOFILTER_g = H5E_CALLBACK_g = H5E_CANAPPLY_g = H5E_SETLOCAL_g = H5E_NOENCODER_g = H5E_CANTFILTER_g =
+
+        /* Group related errors */
+    H5E_CANTOPENOBJ_g = H5E_CANTCLOSEOBJ_g = H5E_COMPLEN_g = H5E_PATH_g =
+
+        /* No error */
+    H5E_NONE_MINOR_g =
+
+        /* Plugin errors */
+    H5E_OPENERROR_g =
+
+        /* File accessibilty errors */
+    H5E_FILEEXISTS_g = H5E_FILEOPEN_g = H5E_CANTCREATE_g = H5E_CANTOPENFILE_g = H5E_CANTCLOSEFILE_g =
+        H5E_NOTHDF5_g = H5E_BADFILE_g = H5E_TRUNCATED_g = H5E_MOUNT_g =
+
+            /* Object atom related errors */
+    H5E_BADATOM_g = H5E_BADGROUP_g = H5E_CANTREGISTER_g = H5E_CANTINC_g = H5E_CANTDEC_g = H5E_NOIDS_g =
+
+        /* Cache related errors */
+    H5E_CANTFLUSH_g = H5E_CANTSERIALIZE_g = H5E_CANTLOAD_g = H5E_PROTECT_g = H5E_NOTCACHED_g = H5E_SYSTEM_g =
+        H5E_CANTINS_g = H5E_CANTPROTECT_g = H5E_CANTUNPROTECT_g = H5E_CANTPIN_g = H5E_CANTUNPIN_g =
+            H5E_CANTMARKDIRTY_g = H5E_CANTDIRTY_g = H5E_CANTEXPUNGE_g = H5E_CANTRESIZE_g =
+
+                /* Link related errors */
+    H5E_TRAVERSE_g = H5E_NLINKS_g = H5E_NOTREGISTERED_g = H5E_CANTMOVE_g = H5E_CANTSORT_g =
+
+        /* Parallel MPI errors */
+    H5E_MPI_g = H5E_MPIERRSTR_g = H5E_CANTRECV_g =
+
+        /* Dataspace errors */
+    H5E_CANTCLIP_g = H5E_CANTCOUNT_g = H5E_CANTSELECT_g = H5E_CANTNEXT_g = H5E_BADSELECT_g =
+        H5E_CANTCOMPARE_g =
+
+            /* Argument errors */
+    H5E_UNINITIALIZED_g = H5E_UNSUPPORTED_g = H5E_BADTYPE_g = H5E_BADRANGE_g = H5E_BADVALUE_g =
+
+        /* B-tree related errors */
+    H5E_NOTFOUND_g = H5E_EXISTS_g = H5E_CANTENCODE_g = H5E_CANTDECODE_g = H5E_CANTSPLIT_g =
+        H5E_CANTREDISTRIBUTE_g = H5E_CANTSWAP_g = H5E_CANTINSERT_g = H5E_CANTLIST_g = H5E_CANTMODIFY_g =
+            H5E_CANTREMOVE_g =
 
-/* Generic low-level file I/O errors */    
-H5E_SEEKERROR_g=    
-H5E_READERROR_g=    
-H5E_WRITEERROR_g=    
-H5E_CLOSEERROR_g=    
-H5E_OVERFLOW_g=    
-H5E_FCNTL_g=
-
-/* Resource errors */    
-H5E_NOSPACE_g=    
-H5E_CANTALLOC_g=    
-H5E_CANTCOPY_g=    
-H5E_CANTFREE_g=    
-H5E_ALREADYEXISTS_g=    
-H5E_CANTLOCK_g=    
-H5E_CANTUNLOCK_g=    
-H5E_CANTGC_g=    
-H5E_CANTGETSIZE_g=    
-H5E_OBJOPEN_g=
-
-/* Heap errors */    
-H5E_CANTRESTORE_g=    
-H5E_CANTCOMPUTE_g=    
-H5E_CANTEXTEND_g=    
-H5E_CANTATTACH_g=    
-H5E_CANTUPDATE_g=    
-H5E_CANTOPERATE_g=
-
-/* Function entry/exit interface errors */    
-H5E_CANTINIT_g=    
-H5E_ALREADYINIT_g=    
-H5E_CANTRELEASE_g=
-
-/* Property list errors */    
-H5E_CANTGET_g=    
-H5E_CANTSET_g=    
-H5E_DUPCLASS_g=    
-H5E_SETDISALLOWED_g=
-
-/* Free space errors */    
-H5E_CANTMERGE_g=    
-H5E_CANTREVIVE_g=    
-H5E_CANTSHRINK_g=
-
-/* Object header related errors */    
-H5E_LINKCOUNT_g=    
-H5E_VERSION_g=    
-H5E_ALIGNMENT_g=    
-H5E_BADMESG_g=    
-H5E_CANTDELETE_g=    
-H5E_BADITER_g=    
-H5E_CANTPACK_g=    
-H5E_CANTRESET_g=    
-H5E_CANTRENAME_g=
-
-/* System level errors */    
-H5E_SYSERRSTR_g=
-
-/* I/O pipeline errors */    
-H5E_NOFILTER_g=    
-H5E_CALLBACK_g=    
-H5E_CANAPPLY_g=    
-H5E_SETLOCAL_g=    
-H5E_NOENCODER_g=    
-H5E_CANTFILTER_g=
-
-/* Group related errors */    
-H5E_CANTOPENOBJ_g=    
-H5E_CANTCLOSEOBJ_g=    
-H5E_COMPLEN_g=    
-H5E_PATH_g=
-
-/* No error */    
-H5E_NONE_MINOR_g=
-
-/* Plugin errors */    
-H5E_OPENERROR_g=
-
-/* File accessibilty errors */    
-H5E_FILEEXISTS_g=    
-H5E_FILEOPEN_g=    
-H5E_CANTCREATE_g=    
-H5E_CANTOPENFILE_g=    
-H5E_CANTCLOSEFILE_g=    
-H5E_NOTHDF5_g=    
-H5E_BADFILE_g=    
-H5E_TRUNCATED_g=    
-H5E_MOUNT_g=
-
-/* Object atom related errors */    
-H5E_BADATOM_g=    
-H5E_BADGROUP_g=    
-H5E_CANTREGISTER_g=    
-H5E_CANTINC_g=    
-H5E_CANTDEC_g=    
-H5E_NOIDS_g=
-
-/* Cache related errors */    
-H5E_CANTFLUSH_g=    
-H5E_CANTSERIALIZE_g=    
-H5E_CANTLOAD_g=    
-H5E_PROTECT_g=    
-H5E_NOTCACHED_g=    
-H5E_SYSTEM_g=    
-H5E_CANTINS_g=    
-H5E_CANTPROTECT_g=    
-H5E_CANTUNPROTECT_g=    
-H5E_CANTPIN_g=    
-H5E_CANTUNPIN_g=    
-H5E_CANTMARKDIRTY_g=    
-H5E_CANTDIRTY_g=    
-H5E_CANTEXPUNGE_g=    
-H5E_CANTRESIZE_g=
-
-/* Link related errors */    
-H5E_TRAVERSE_g=    
-H5E_NLINKS_g=    
-H5E_NOTREGISTERED_g=    
-H5E_CANTMOVE_g=    
-H5E_CANTSORT_g=
-
-/* Parallel MPI errors */    
-H5E_MPI_g=    
-H5E_MPIERRSTR_g=    
-H5E_CANTRECV_g=
-
-/* Dataspace errors */    
-H5E_CANTCLIP_g=    
-H5E_CANTCOUNT_g=    
-H5E_CANTSELECT_g=    
-H5E_CANTNEXT_g=    
-H5E_BADSELECT_g=    
-H5E_CANTCOMPARE_g=
-
-/* Argument errors */    
-H5E_UNINITIALIZED_g=    
-H5E_UNSUPPORTED_g=    
-H5E_BADTYPE_g=    
-H5E_BADRANGE_g=    
-H5E_BADVALUE_g=
-
-/* B-tree related errors */    
-H5E_NOTFOUND_g=    
-H5E_EXISTS_g=    
-H5E_CANTENCODE_g=    
-H5E_CANTDECODE_g=    
-H5E_CANTSPLIT_g=    
-H5E_CANTREDISTRIBUTE_g=    
-H5E_CANTSWAP_g=    
-H5E_CANTINSERT_g=    
-H5E_CANTLIST_g=    
-H5E_CANTMODIFY_g=    
-H5E_CANTREMOVE_g=
-
-/* Datatype conversion errors */    
-H5E_CANTCONVERT_g=    
-H5E_BADSIZE_g= (-1);
+                /* Datatype conversion errors */
+    H5E_CANTCONVERT_g = H5E_BADSIZE_g = (-1);
 
 #endif /* H5Eterm_H */
diff --git a/src/H5F.c b/src/H5F.c
index ca0fa57..1cc6ab3 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -15,76 +15,65 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5F__init_pub_interface
-
+#define H5_INTERFACE_INIT_FUNC H5F__init_pub_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Aprivate.h"		/* Attributes				*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"		/* Property lists			*/
-#include "H5SMprivate.h"	/* Shared Object Header Messages	*/
-#include "H5Tprivate.h"		/* Datatypes				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Aprivate.h"  /* Attributes				*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Gprivate.h"  /* Groups				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Pprivate.h"  /* Property lists			*/
+#include "H5SMprivate.h" /* Shared Object Header Messages	*/
+#include "H5Tprivate.h"  /* Datatypes				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /* File ID class */
 static const H5I_class_t H5I_FILE_CLS[1] = {{
-    H5I_FILE,			/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,				/* # of reserved IDs for class */
-    (H5I_free_t)H5F_close	/* Callback routine for closing objects of this class */
+    H5I_FILE,             /* ID class value */
+    H5I_CLASS_REUSE_IDS,  /* Class flags */
+    0,                    /* # of reserved IDs for class */
+    (H5I_free_t)H5F_close /* Callback routine for closing objects of this class */
 }};
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5F__init_pub_interface -- Initialize interface-specific information
@@ -100,13 +89,13 @@ DESCRIPTION
 static herr_t
 H5F__init_pub_interface(void)
 {
-    herr_t          ret_value                = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
     FUNC_ENTER_STATIC
 
     /*
      * Initialize the atom group for the file IDs.
      */
-    if(H5I_register_type(H5I_FILE_CLS) < 0)
+    if (H5I_register_type(H5I_FILE_CLS) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
     ret_value = H5F_init();
@@ -114,7 +103,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F__init_pub_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_init
  *
@@ -131,7 +119,7 @@ done:
 herr_t
 H5F_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -140,7 +128,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_term_interface
  *
@@ -162,32 +149,31 @@ done:
 int
 H5F_term_interface(void)
 {
-    int	n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
-	if(H5I_nmembers(H5I_FILE) > 0) {
+    if (H5_interface_initialize_g) {
+        if (H5I_nmembers(H5I_FILE) > 0) {
             (void)H5I_clear_type(H5I_FILE, FALSE, FALSE);
             n++; /*H5I*/
-	} /* end if */
+        }        /* end if */
         else {
             /* Make certain we've cleaned up all the shared file objects */
             H5F_sfile_assert_num(0);
 
             /* Destroy the file object id group */
-	    (void)H5I_dec_type_ref(H5I_FILE);
+            (void)H5I_dec_type_ref(H5I_FILE);
             n++; /*H5I*/
 
-	    /* Mark closed */
-	    H5_interface_initialize_g = 0;
-	} /* end else */
-    } /* end if */
+            /* Mark closed */
+            H5_interface_initialize_g = 0;
+        } /* end else */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5F_term_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fget_create_plist
  *
@@ -206,28 +192,27 @@ H5F_term_interface(void)
 hid_t
 H5Fget_create_plist(hid_t file_id)
 {
-    H5F_t *file;                /* File info */
-    H5P_genplist_t *plist;      /* Property list */
-    hid_t ret_value;            /* Return value */
+    H5F_t *         file;      /* File info */
+    H5P_genplist_t *plist;     /* Property list */
+    hid_t           ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", file_id);
 
     /* check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(file->shared->fcpl_id)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(file->shared->fcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Create the property list object to return */
-    if((ret_value = H5P_copy_plist(plist, TRUE)) < 0)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to copy file creation properties")
+    if ((ret_value = H5P_copy_plist(plist, TRUE)) < 0)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to copy file creation properties")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fget_access_plist
  *
@@ -252,25 +237,24 @@ done:
 hid_t
 H5Fget_access_plist(hid_t file_id)
 {
-    H5F_t *f;           /* File info */
-    hid_t ret_value;    /* Return value */
+    H5F_t *f;         /* File info */
+    hid_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", file_id);
 
     /* Check args */
-    if(NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+    if (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Retrieve the file's access property list */
-    if((ret_value = H5F_get_access_plist(f, TRUE)) < 0)
+    if ((ret_value = H5F_get_access_plist(f, TRUE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file access property list")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_access_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fget_obj_count
  *
@@ -287,22 +271,22 @@ done:
 ssize_t
 H5Fget_obj_count(hid_t file_id, unsigned types)
 {
-    H5F_t    *f = NULL;         /* File to query */
-    size_t  obj_count = 0;      /* Number of opened objects */
-    ssize_t  ret_value;         /* Return value */
+    H5F_t * f         = NULL; /* File to query */
+    size_t  obj_count = 0;    /* Number of opened objects */
+    ssize_t ret_value;        /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("Zs", "iIu", file_id, types);
 
     /* Check arguments */
-    if(file_id != (hid_t)H5F_OBJ_ALL && (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))))
+    if (file_id != (hid_t)H5F_OBJ_ALL && (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file id")
-    if(0 == (types & H5F_OBJ_ALL))
+    if (0 == (types & H5F_OBJ_ALL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not an object type")
 
     /* Perform the query */
-    if(H5F_get_obj_count(f, types, TRUE, &obj_count) < 0)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_BADITER, FAIL, "H5F_get_obj_count failed")
+    if (H5F_get_obj_count(f, types, TRUE, &obj_count) < 0)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADITER, FAIL, "H5F_get_obj_count failed")
 
     /* Set the return value */
     ret_value = (ssize_t)obj_count;
@@ -311,7 +295,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_obj_count() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fget_object_ids
  *
@@ -333,23 +316,23 @@ done:
 ssize_t
 H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *oid_list)
 {
-    H5F_t    *f = NULL;         /* File to query */
-    size_t    obj_id_count = 0; /* Number of open objects */
-    ssize_t   ret_value;        /* Return value */
+    H5F_t * f            = NULL; /* File to query */
+    size_t  obj_id_count = 0;    /* Number of open objects */
+    ssize_t ret_value;           /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("Zs", "iIuz*i", file_id, types, max_objs, oid_list);
 
     /* Check arguments */
-    if(file_id != (hid_t)H5F_OBJ_ALL && (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))))
+    if (file_id != (hid_t)H5F_OBJ_ALL && (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file id")
-    if(0 == (types & H5F_OBJ_ALL))
+    if (0 == (types & H5F_OBJ_ALL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not an object type")
-    if(!oid_list)
+    if (!oid_list)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "object ID list is NULL")
 
     /* Perform the query */
-    if(H5F_get_obj_ids(f, types, max_objs, oid_list, TRUE, &obj_id_count) < 0)
+    if (H5F_get_obj_ids(f, types, max_objs, oid_list, TRUE, &obj_id_count) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADITER, FAIL, "H5F_get_obj_ids failed")
 
     /* Set the return value */
@@ -359,7 +342,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_obj_ids() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_vfd_handle
  *
@@ -377,29 +359,28 @@ done:
 herr_t
 H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle)
 {
-    H5F_t               *file;          /* File to query */
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    H5F_t *file;                /* File to query */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ii**x", file_id, fapl, file_handle);
 
     /* Check args */
-    if(!file_handle)
+    if (!file_handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file handle pointer")
 
     /* Get the file */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file id")
 
     /* Retrieve the VFD handle for the file */
-    if(H5F_get_vfd_handle(file, fapl, file_handle) < 0)
+    if (H5F_get_vfd_handle(file, fapl, file_handle) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't retrieve VFD handle")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_vfd_handle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fis_hdf5
  *
@@ -423,17 +404,17 @@ done:
 htri_t
 H5Fis_hdf5(const char *name)
 {
-    htri_t      ret_value;              /* Return value */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "*s", name);
 
     /* Check args and all the boring stuff. */
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "no file name specified")
 
     /* call the private is_HDF5 function */
-    if((ret_value = H5F_is_hdf5(name)) < 0)
+    if ((ret_value = H5F_is_hdf5(name)) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_NOTHDF5, FAIL, "unable open file")
 
 done:
@@ -441,7 +422,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fis_hdf5() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fcreate
  *
@@ -472,69 +452,66 @@ done:
 hid_t
 H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
 {
-    H5F_t	*new_file = NULL;	/*file struct for new file	*/
-    hid_t	ret_value;	        /*return value			*/
+    H5F_t *new_file = NULL; /*file struct for new file	*/
+    hid_t  ret_value;       /*return value			*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("i", "*sIuii", filename, flags, fcpl_id, fapl_id);
 
     /* Check/fix arguments */
-    if(!filename || !*filename)
+    if (!filename || !*filename)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file name")
     /* In this routine, we only accept the following flags:
      *          H5F_ACC_EXCL and H5F_ACC_TRUNC
      */
-    if(flags & ~(H5F_ACC_EXCL | H5F_ACC_TRUNC))
+    if (flags & ~(H5F_ACC_EXCL | H5F_ACC_TRUNC))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid flags")
     /* The H5F_ACC_EXCL and H5F_ACC_TRUNC flags are mutually exclusive */
-    if((flags & H5F_ACC_EXCL) && (flags & H5F_ACC_TRUNC))
+    if ((flags & H5F_ACC_EXCL) && (flags & H5F_ACC_TRUNC))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "mutually exclusive flags for file creation")
 
     /* Check file creation property list */
-    if(H5P_DEFAULT == fcpl_id)
+    if (H5P_DEFAULT == fcpl_id)
         fcpl_id = H5P_FILE_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(fcpl_id, H5P_FILE_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file create property list")
+    else if (TRUE != H5P_isa_class(fcpl_id, H5P_FILE_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file create property list")
 
     /* Check the file access property list */
-    if(H5P_DEFAULT == fapl_id)
+    if (H5P_DEFAULT == fapl_id)
         fapl_id = H5P_FILE_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file access property list")
+    else if (TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file access property list")
 
     /*
      * Adjust bit flags by turning on the creation bit and making sure that
      * the EXCL or TRUNC bit is set.  All newly-created files are opened for
      * reading and writing.
      */
-    if (0==(flags & (H5F_ACC_EXCL|H5F_ACC_TRUNC)))
-	flags |= H5F_ACC_EXCL;	 /*default*/
+    if (0 == (flags & (H5F_ACC_EXCL | H5F_ACC_TRUNC)))
+        flags |= H5F_ACC_EXCL; /*default*/
     flags |= H5F_ACC_RDWR | H5F_ACC_CREAT;
 
     /*
      * Create a new file or truncate an existing file.
      */
-    if(NULL == (new_file = H5F_open(filename, flags, fcpl_id, fapl_id, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to create file")
+    if (NULL == (new_file = H5F_open(filename, flags, fcpl_id, fapl_id, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to create file")
 
     /* Get an atom for the file */
-    if((ret_value = H5I_register(H5I_FILE, new_file, TRUE)) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize file")
+    if ((ret_value = H5I_register(H5I_FILE, new_file, TRUE)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize file")
 
     /* Keep this ID in file object structure */
     new_file->file_id = ret_value;
 
 done:
-    if(ret_value < 0 && new_file)
-        if(H5F_close(new_file) < 0)
+    if (ret_value < 0 && new_file)
+        if (H5F_close(new_file) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fcreate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fopen
  *
@@ -578,44 +555,41 @@ done:
 hid_t
 H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
 {
-    H5F_t	*new_file = NULL;	/*file struct for new file	*/
-    hid_t	ret_value;	        /*return value			*/
+    H5F_t *new_file = NULL; /*file struct for new file	*/
+    hid_t  ret_value;       /*return value			*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "*sIui", filename, flags, fapl_id);
 
     /* Check/fix arguments. */
-    if(!filename || !*filename)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file name")
+    if (!filename || !*filename)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file name")
     /* Reject undefined flags (~H5F_ACC_PUBLIC_FLAGS) and the H5F_ACC_TRUNC & H5F_ACC_EXCL flags */
-    if((flags & ~H5F_ACC_PUBLIC_FLAGS) ||
-            (flags & H5F_ACC_TRUNC) || (flags & H5F_ACC_EXCL))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file open flags")
-    if(H5P_DEFAULT == fapl_id)
+    if ((flags & ~H5F_ACC_PUBLIC_FLAGS) || (flags & H5F_ACC_TRUNC) || (flags & H5F_ACC_EXCL))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file open flags")
+    if (H5P_DEFAULT == fapl_id)
         fapl_id = H5P_FILE_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file access property list")
+    else if (TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file access property list")
 
     /* Open the file */
-    if(NULL == (new_file = H5F_open(filename, flags, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to open file")
+    if (NULL == (new_file = H5F_open(filename, flags, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to open file")
 
     /* Get an atom for the file */
-    if((ret_value = H5I_register(H5I_FILE, new_file, TRUE)) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize file handle")
+    if ((ret_value = H5I_register(H5I_FILE, new_file, TRUE)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize file handle")
 
     /* Keep this ID in file object structure */
     new_file->file_id = ret_value;
 
 done:
-    if(ret_value < 0 && new_file && H5F_try_close(new_file) < 0)
+    if (ret_value < 0 && new_file && H5F_try_close(new_file) < 0)
         HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fopen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fflush
  *
@@ -633,58 +607,50 @@ done:
 herr_t
 H5Fflush(hid_t object_id, H5F_scope_t scope)
 {
-    H5F_t	*f = NULL;              /* File to flush */
-    H5O_loc_t	*oloc = NULL;           /* Object location for ID */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5F_t *    f         = NULL;    /* File to flush */
+    H5O_loc_t *oloc      = NULL;    /* Object location for ID */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iFs", object_id, scope);
 
-    switch(H5I_get_type(object_id)) {
+    switch (H5I_get_type(object_id)) {
         case H5I_FILE:
-            if(NULL == (f = (H5F_t *)H5I_object(object_id)))
+            if (NULL == (f = (H5F_t *)H5I_object(object_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
             break;
 
-        case H5I_GROUP:
-            {
-                H5G_t	*grp;
+        case H5I_GROUP: {
+            H5G_t *grp;
 
-                if(NULL == (grp = (H5G_t *)H5I_object(object_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid group identifier")
-                oloc = H5G_oloc(grp);
-            }
-            break;
+            if (NULL == (grp = (H5G_t *)H5I_object(object_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid group identifier")
+            oloc = H5G_oloc(grp);
+        } break;
 
-        case H5I_DATATYPE:
-            {
-                H5T_t	*type;
+        case H5I_DATATYPE: {
+            H5T_t *type;
 
-                if(NULL == (type = (H5T_t *)H5I_object(object_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid type identifier")
-                oloc = H5T_oloc(type);
-            }
-            break;
+            if (NULL == (type = (H5T_t *)H5I_object(object_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid type identifier")
+            oloc = H5T_oloc(type);
+        } break;
 
-        case H5I_DATASET:
-            {
-                H5D_t	*dset;
+        case H5I_DATASET: {
+            H5D_t *dset;
 
-                if(NULL == (dset = (H5D_t *)H5I_object(object_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset identifier")
-                oloc = H5D_oloc(dset);
-            }
-            break;
+            if (NULL == (dset = (H5D_t *)H5I_object(object_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset identifier")
+            oloc = H5D_oloc(dset);
+        } break;
 
-        case H5I_ATTR:
-            {
-                H5A_t	*attr;
+        case H5I_ATTR: {
+            H5A_t *attr;
 
-                if(NULL == (attr = (H5A_t *)H5I_object(object_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid attribute identifier")
-                oloc = H5A_oloc(attr);
-            }
-            break;
+            if (NULL == (attr = (H5A_t *)H5I_object(object_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid attribute identifier")
+            oloc = H5A_oloc(attr);
+        } break;
 
         case H5I_UNINIT:
         case H5I_BADID:
@@ -701,13 +667,13 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
     } /* end switch */
 
-    if(!f) {
-	if(!oloc)
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "object is not associated with a file")
-	f = oloc->file;
+    if (!f) {
+        if (!oloc)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "object is not associated with a file")
+        f = oloc->file;
     } /* end if */
-    if(!f)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "object is not associated with a file")
+    if (!f)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "object is not associated with a file")
 
     /* Flush the file */
     /*
@@ -717,25 +683,24 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
      * calling H5Fflush() with the read-only handle, still causes data
      * to be flushed.
      */
-    if(H5F_ACC_RDWR & H5F_INTENT(f)) {
+    if (H5F_ACC_RDWR & H5F_INTENT(f)) {
         /* Flush other files, depending on scope */
-        if(H5F_SCOPE_GLOBAL == scope) {
+        if (H5F_SCOPE_GLOBAL == scope) {
             /* Call the flush routine for mounted file hierarchies */
-            if(H5F_flush_mounts(f, H5AC_dxpl_id) < 0)
+            if (H5F_flush_mounts(f, H5AC_dxpl_id) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush mounted file hierarchy")
         } /* end if */
         else {
             /* Call the flush routine, for this file */
-            if(H5F_flush(f, H5AC_dxpl_id, FALSE) < 0)
+            if (H5F_flush(f, H5AC_dxpl_id, FALSE) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's cached information")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fflush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fclose
  *
@@ -760,28 +725,28 @@ done:
 herr_t
 H5Fclose(hid_t file_id)
 {
-    H5F_t       *f = NULL;
-    int         nref;
-    herr_t	ret_value = SUCCEED;
+    H5F_t *f = NULL;
+    int    nref;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", file_id);
 
     /* Check/fix arguments. */
-    if(H5I_FILE != H5I_get_type(file_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file ID")
+    if (H5I_FILE != H5I_get_type(file_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file ID")
 
     /* Flush file if this is the last reference to this id and we have write
      * intent, unless it will be flushed by the "shared" file being closed.
      * This is only necessary to replicate previous behaviour, and could be
      * disabled by an option/property to improve performance. */
-    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+    if (NULL == (f = (H5F_t *)H5I_object(file_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-    if((f->shared->nrefs > 1) && (H5F_INTENT(f) & H5F_ACC_RDWR)) {
-        if((nref = H5I_get_ref(file_id, FALSE)) < 0)
+    if ((f->shared->nrefs > 1) && (H5F_INTENT(f) & H5F_ACC_RDWR)) {
+        if ((nref = H5I_get_ref(file_id, FALSE)) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't get ID ref count")
-        if(nref == 1)
-            if(H5F_flush(f, H5AC_dxpl_id, FALSE) < 0)
+        if (nref == 1)
+            if (H5F_flush(f, H5AC_dxpl_id, FALSE) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache")
     } /* end if */
 
@@ -789,14 +754,13 @@ H5Fclose(hid_t file_id)
      * Decrement reference count on atom.  When it reaches zero the file will
      * be closed.
      */
-    if(H5I_dec_app_ref(file_id) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTCLOSEFILE, FAIL, "decrementing file ID failed")
+    if (H5I_dec_app_ref(file_id) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTCLOSEFILE, FAIL, "decrementing file ID failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Freopen
  *
@@ -818,41 +782,41 @@ done:
 hid_t
 H5Freopen(hid_t file_id)
 {
-    H5F_t	*old_file = NULL;
-    H5F_t	*new_file = NULL;
-    hid_t	ret_value;
+    H5F_t *old_file = NULL;
+    H5F_t *new_file = NULL;
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", file_id);
 
     /* Check arguments */
-    if(NULL == (old_file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (old_file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Get a new "top level" file struct, sharing the same "low level" file struct */
-    if(NULL == (new_file = H5F_new(old_file->shared, 0, H5P_FILE_CREATE_DEFAULT, H5P_FILE_ACCESS_DEFAULT, NULL)))
+    if (NULL ==
+        (new_file = H5F_new(old_file->shared, 0, H5P_FILE_CREATE_DEFAULT, H5P_FILE_ACCESS_DEFAULT, NULL)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to reopen file")
 
     /* Duplicate old file's names */
-    new_file->open_name = H5MM_xstrdup(old_file->open_name);
+    new_file->open_name   = H5MM_xstrdup(old_file->open_name);
     new_file->actual_name = H5MM_xstrdup(old_file->actual_name);
-    new_file->extpath = H5MM_xstrdup(old_file->extpath);
+    new_file->extpath     = H5MM_xstrdup(old_file->extpath);
 
-    if((ret_value = H5I_register(H5I_FILE, new_file, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_FILE, new_file, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize file handle")
 
     /* Keep this ID in file object structure */
     new_file->file_id = ret_value;
 
 done:
-    if(ret_value < 0 && new_file)
-        if(H5F_dest(new_file, H5AC_dxpl_id, FALSE) < 0)
+    if (ret_value < 0 && new_file)
+        if (H5F_dest(new_file, H5AC_dxpl_id, FALSE) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close file")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Freopen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fget_intent
  *
@@ -875,18 +839,18 @@ H5Fget_intent(hid_t file_id, unsigned *intent_flags)
     H5TRACE2("e", "i*Iu", file_id, intent_flags);
 
     /* If no intent flags were passed in, exit quietly */
-    if(intent_flags) {
-        H5F_t * file;           /* Pointer to file structure */
+    if (intent_flags) {
+        H5F_t *file; /* Pointer to file structure */
 
         /* Get the internal file structure */
-        if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
         /* HDF5 uses some flags internally that users don't know about.
          * Simplify things for them so that they only get either H5F_ACC_RDWR
          * or H5F_ACC_RDONLY.
          */
-        if(H5F_INTENT(file) & H5F_ACC_RDWR)
+        if (H5F_INTENT(file) & H5F_ACC_RDWR)
             *intent_flags = H5F_ACC_RDWR;
         else
             *intent_flags = H5F_ACC_RDONLY;
@@ -896,7 +860,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_intent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_freespace
  *
@@ -914,19 +877,19 @@ done:
 hssize_t
 H5Fget_freespace(hid_t file_id)
 {
-    H5F_t      *file;           /* File object for file ID */
-    hsize_t	tot_space;	/* Amount of free space in the file */
-    hssize_t    ret_value;      /* Return value */
+    H5F_t *  file;      /* File object for file ID */
+    hsize_t  tot_space; /* Amount of free space in the file */
+    hssize_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Hs", "i", file_id);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Go get the actual amount of free space in the file */
-    if(H5MF_get_freespace(file, H5AC_ind_dxpl_id, &tot_space, NULL) < 0)
+    if (H5MF_get_freespace(file, H5AC_ind_dxpl_id, &tot_space, NULL) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to check free space for file")
 
     ret_value = (hssize_t)tot_space;
@@ -935,7 +898,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_freespace() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_filesize
  *
@@ -955,62 +917,61 @@ done:
 herr_t
 H5Fget_filesize(hid_t file_id, hsize_t *size)
 {
-    H5F_t       *file;                  /* File object for file ID */
-    haddr_t     eof;                    /* End of file address */
-    haddr_t     base_addr;              /* Base address for the file */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5F_t * file;                /* File object for file ID */
+    haddr_t eof;                 /* End of file address */
+    haddr_t base_addr;           /* Base address for the file */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*h", file_id, size);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Go get the actual file size */
-    if(HADDR_UNDEF == (eof = H5FD_get_eof(file->shared->lf)))
+    if (HADDR_UNDEF == (eof = H5FD_get_eof(file->shared->lf)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get file size")
     base_addr = H5FD_get_base_addr(file->shared->lf);
 
-    if(size)
-        *size = (hsize_t)(eof + base_addr);     /* Convert relative base address for file to absolute address */
+    if (size)
+        *size = (hsize_t)(eof + base_addr); /* Convert relative base address for file to absolute address */
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_filesize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_file_image
  *
- * Purpose:     If a buffer is provided (via the buf_ptr argument) and is 
+ * Purpose:     If a buffer is provided (via the buf_ptr argument) and is
  *		big enough (size in buf_len argument), load *buf_ptr with
- *		an image of the open file whose ID is provided in the 
+ *		an image of the open file whose ID is provided in the
  *		file_id parameter, and return the number of bytes copied
  *		to the buffer.
  *
  *		If the buffer exists, but is too small to contain an image
  *		of the indicated file, return a negative number.
  *
- *		Finally, if no buffer is provided, return the size of the 
- *		buffer needed.  This value is simply the eoa of the target 
+ *		Finally, if no buffer is provided, return the size of the
+ *		buffer needed.  This value is simply the eoa of the target
  *		file.
  *
  *		Note that any user block is skipped.
  *
- *		Also note that the function may not be used on files 
+ *		Also note that the function may not be used on files
  *		opened with either the split/multi file driver or the
  *		family file driver.
  *
- *		In the former case, the sparse address space makes the 
+ *		In the former case, the sparse address space makes the
  *		get file image operation impractical, due to the size of
  *		the image typically required.
  *
  *		In the case of the family file driver, the problem is
  *		the driver message in the super block, which will prevent
  *		the image being opened with any driver other than the
- *		family file driver -- which negates the purpose of the 
- *		operation.  This can be fixed, but no resources for 
+ *		family file driver -- which negates the purpose of the
+ *		operation.  This can be fixed, but no resources for
  *		this now.
  *
  * Return:      Success:        Bytes copied / number of bytes needed.
@@ -1024,25 +985,24 @@ done:
 ssize_t
 H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len)
 {
-    H5F_t      *file;                   /* File object for file ID */
-    ssize_t     ret_value;              /* Return value */
+    H5F_t * file;      /* File object for file ID */
+    ssize_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "i*xz", file_id, buf_ptr, buf_len);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* call private get_file_image function */
-    if((ret_value = H5F_get_file_image(file, buf_ptr, buf_len)) < 0)
+    if ((ret_value = H5F_get_file_image(file, buf_ptr, buf_len)) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get file image")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Fget_file_image() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_mdc_config
  *
@@ -1064,27 +1024,26 @@ done:
 herr_t
 H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr)
 {
-    H5F_t      *file;                   /* File object for file ID */
-    herr_t     ret_value = SUCCEED;     /* Return value */
+    H5F_t *file;                /* File object for file ID */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", file_id, config_ptr);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
-    if((NULL == config_ptr) || (config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION))
+    if ((NULL == config_ptr) || (config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config_ptr")
 
     /* Go get the resize configuration */
-    if(H5AC_get_cache_auto_resize_config(file->shared->cache, config_ptr) < 0)
+    if (H5AC_get_cache_auto_resize_config(file->shared->cache, config_ptr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_auto_resize_config() failed.")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Fget_mdc_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fset_mdc_config
  *
@@ -1103,25 +1062,24 @@ done:
 herr_t
 H5Fset_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr)
 {
-    H5F_t      *file;                   /* File object for file ID */
-    herr_t     ret_value = SUCCEED;     /* Return value */
+    H5F_t *file;                /* File object for file ID */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", file_id, config_ptr);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* set the resize configuration  */
-    if(H5AC_set_cache_auto_resize_config(file->shared->cache, config_ptr) < 0)
+    if (H5AC_set_cache_auto_resize_config(file->shared->cache, config_ptr) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "H5AC_set_cache_auto_resize_config() failed.")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Fset_mdc_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_mdc_hit_rate
  *
@@ -1141,28 +1099,27 @@ done:
 herr_t
 H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr)
 {
-    H5F_t      *file;                   /* File object for file ID */
-    herr_t     ret_value = SUCCEED;     /* Return value */
+    H5F_t *file;                /* File object for file ID */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*d", file_id, hit_rate_ptr);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
-    if(NULL == hit_rate_ptr)
+    if (NULL == hit_rate_ptr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL hit rate pointer")
 
     /* Go get the current hit rate */
-    if(H5AC_get_cache_hit_rate(file->shared->cache, hit_rate_ptr) < 0)
+    if (H5AC_get_cache_hit_rate(file->shared->cache, hit_rate_ptr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_hit_rate() failed.")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Fget_mdc_hit_rate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_mdc_size
  *
@@ -1181,34 +1138,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
-    size_t *cur_size_ptr, int *cur_num_entries_ptr)
+H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr, size_t *cur_size_ptr,
+                int *cur_num_entries_ptr)
 {
-    H5F_t      *file;                   /* File object for file ID */
-    int32_t    cur_num_entries;
-    herr_t     ret_value = SUCCEED;     /* Return value */
+    H5F_t * file; /* File object for file ID */
+    int32_t cur_num_entries;
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE5("e", "i*z*z*z*Is", file_id, max_size_ptr, min_clean_size_ptr,
-             cur_size_ptr, cur_num_entries_ptr);
+    H5TRACE5("e", "i*z*z*z*Is", file_id, max_size_ptr, min_clean_size_ptr, cur_size_ptr, cur_num_entries_ptr);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Go get the size data */
-    if(H5AC_get_cache_size(file->shared->cache, max_size_ptr,
-            min_clean_size_ptr, cur_size_ptr, &cur_num_entries) < 0)
+    if (H5AC_get_cache_size(file->shared->cache, max_size_ptr, min_clean_size_ptr, cur_size_ptr,
+                            &cur_num_entries) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_size() failed.")
 
-    if(cur_num_entries_ptr != NULL)
-	*cur_num_entries_ptr = (int)cur_num_entries;
+    if (cur_num_entries_ptr != NULL)
+        *cur_num_entries_ptr = (int)cur_num_entries;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Fget_mdc_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Freset_mdc_hit_rate_stats
  *
@@ -1232,25 +1187,24 @@ done:
 herr_t
 H5Freset_mdc_hit_rate_stats(hid_t file_id)
 {
-    H5F_t      *file;                   /* File object for file ID */
-    herr_t     ret_value = SUCCEED;     /* Return value */
+    H5F_t *file;                /* File object for file ID */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", file_id);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Reset the hit rate statistic */
-    if(H5AC_reset_cache_hit_rate_stats(file->shared->cache) < 0)
+    if (H5AC_reset_cache_hit_rate_stats(file->shared->cache) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "can't reset cache hit rate")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Freset_mdc_hit_rate_stats() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_name
  *
@@ -1274,11 +1228,11 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5Fget_name(hid_t obj_id, char *name/*out*/, size_t size)
+H5Fget_name(hid_t obj_id, char *name /*out*/, size_t size)
 {
-    H5F_t         *f;           /* Top file in mount hierarchy */
-    size_t        len;
-    ssize_t       ret_value;
+    H5F_t * f; /* Top file in mount hierarchy */
+    size_t  len;
+    ssize_t ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "ixz", obj_id, name, size);
@@ -1287,25 +1241,25 @@ H5Fget_name(hid_t obj_id, char *name/*out*/, size_t size)
     /* (This prevents the H5G_loc() call from returning the file pointer for
      * the top file in a mount hierarchy)
      */
-    if(H5I_get_type(obj_id) == H5I_FILE ) {
-        if(NULL == (f = (H5F_t *)H5I_object(obj_id)))
+    if (H5I_get_type(obj_id) == H5I_FILE) {
+        if (NULL == (f = (H5F_t *)H5I_object(obj_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
     } /* end if */
     else {
-        H5G_loc_t     loc;        /* Object location */
+        H5G_loc_t loc; /* Object location */
 
         /* Get symbol table entry */
-        if(H5G_loc(obj_id, &loc) < 0)
-             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid object ID")
+        if (H5G_loc(obj_id, &loc) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid object ID")
         f = loc.oloc->file;
     } /* end else */
 
     len = HDstrlen(H5F_OPEN_NAME(f));
 
-    if(name) {
-        HDstrncpy(name, H5F_OPEN_NAME(f), MIN(len + 1,size));
-        if(len >= size)
-            name[size-1]='\0';
+    if (name) {
+        HDstrncpy(name, H5F_OPEN_NAME(f), MIN(len + 1, size));
+        if (len >= size)
+            name[size - 1] = '\0';
     } /* end if */
 
     /* Set return value */
@@ -1315,7 +1269,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_info
  *		1. Get storage size for superblock extension if there is one
@@ -1334,30 +1287,30 @@ done:
 herr_t
 H5Fget_info(hid_t obj_id, H5F_info_t *finfo)
 {
-    H5F_t *f;                           /* Top file in mount hierarchy */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5F_t *f;                   /* Top file in mount hierarchy */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", obj_id, finfo);
 
     /* Check args */
-    if(!finfo)
+    if (!finfo)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
 
     /* For file IDs, get the file object directly */
     /* (This prevents the H5G_loc() call from returning the file pointer for
      * the top file in a mount hierarchy)
      */
-    if(H5I_get_type(obj_id) == H5I_FILE ) {
-        if(NULL == (f = (H5F_t *)H5I_object(obj_id)))
+    if (H5I_get_type(obj_id) == H5I_FILE) {
+        if (NULL == (f = (H5F_t *)H5I_object(obj_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
     } /* end if */
     else {
-        H5G_loc_t     loc;        /* Object location */
+        H5G_loc_t loc; /* Object location */
 
         /* Get symbol table entry */
-        if(H5G_loc(obj_id, &loc) < 0)
-             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid object ID")
+        if (H5G_loc(obj_id, &loc) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid object ID")
         f = loc.oloc->file;
     } /* end else */
     HDassert(f->shared);
@@ -1366,19 +1319,18 @@ H5Fget_info(hid_t obj_id, H5F_info_t *finfo)
     HDmemset(finfo, 0, sizeof(H5F_info_t));
 
     /* Check for superblock extension info */
-    if(H5F_super_size(f, H5AC_ind_dxpl_id, NULL, &finfo->super_ext_size) < 0)
+    if (H5F_super_size(f, H5AC_ind_dxpl_id, NULL, &finfo->super_ext_size) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "Unable to retrieve superblock extension size")
 
     /* Check for SOHM info */
-    if(H5F_addr_defined(f->shared->sohm_addr))
-        if(H5SM_ih_size(f, H5AC_ind_dxpl_id, finfo) < 0)
+    if (H5F_addr_defined(f->shared->sohm_addr))
+        if (H5SM_ih_size(f, H5AC_ind_dxpl_id, finfo) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "Unable to retrieve SOHM btree & heap storage info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Fclear_elink_file_cache
  *
@@ -1396,19 +1348,19 @@ done:
 herr_t
 H5Fclear_elink_file_cache(hid_t file_id)
 {
-    H5F_t         *file;        /* File */
-    herr_t        ret_value = SUCCEED; /* Return value */
+    H5F_t *file;                /* File */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", file_id);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Release the EFC */
-    if(file->shared->efc)
-        if(H5F_efc_release(file->shared->efc) < 0)
+    if (file->shared->efc)
+        if (H5F_efc_release(file->shared->efc) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't release external file cache")
 
 done:
diff --git a/src/H5FD.c b/src/H5FD.c
index 11ef24a..7b2bdd2 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -26,73 +26,66 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE        /*suppress error about including H5Fpkg      */
-#define H5FD_PACKAGE        /*suppress error about including H5FDpkg  */
+#define H5F_PACKAGE  /*suppress error about including H5Fpkg      */
+#define H5FD_PACKAGE /*suppress error about including H5FDpkg  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5FD_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5FD_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Dprivate.h"        /* Datasets                */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5Fpkg.h"             /* File access                */
-#include "H5FDpkg.h"        /* File Drivers                */
-#include "H5FDcore.h"        /* Files stored entirely in memory    */
-#include "H5FDfamily.h"        /* File families             */
-#include "H5FDlog.h"            /* sec2 driver with I/O logging (for debugging) */
-#include "H5FDmpi.h"            /* MPI-based file drivers        */
-#include "H5FDmulti.h"        /* Usage-partitioned file family    */
-#include "H5FDsec2.h"        /* POSIX unbuffered file I/O        */
-#include "H5FDstdio.h"        /* Standard C buffered I/O        */
+#include "H5private.h"  /* Generic Functions            */
+#include "H5Dprivate.h" /* Datasets                */
+#include "H5Eprivate.h" /* Error handling              */
+#include "H5Fpkg.h"     /* File access                */
+#include "H5FDpkg.h"    /* File Drivers                */
+#include "H5FDcore.h"   /* Files stored entirely in memory    */
+#include "H5FDfamily.h" /* File families             */
+#include "H5FDlog.h"    /* sec2 driver with I/O logging (for debugging) */
+#include "H5FDmpi.h"    /* MPI-based file drivers        */
+#include "H5FDmulti.h"  /* Usage-partitioned file family    */
+#include "H5FDsec2.h"   /* POSIX unbuffered file I/O        */
+#include "H5FDstdio.h"  /* Standard C buffered I/O        */
 #ifdef H5_HAVE_WINDOWS
-#include "H5FDwindows.h"        /* Windows buffered I/O     */
+#include "H5FDwindows.h" /* Windows buffered I/O     */
 #endif
-#include "H5FDdirect.h"        /* Direct file I/O            */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Pprivate.h"        /* Property lists            */
+#include "H5FDdirect.h"  /* Direct file I/O            */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Pprivate.h"  /* Property lists            */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size,
-    const void *old_pl, void **copied_pl);
-static herr_t H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *),
-    void *pl);
+static herr_t H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size, const void *old_pl,
+                           void **copied_pl);
+static herr_t H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *), void *pl);
 static herr_t H5FD_free_cls(H5FD_class_t *cls);
 static herr_t H5FD_fapl_copy(hid_t driver_id, const void *fapl, void **copied_fapl);
-static int H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/);
-static int H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/);
+static int    H5FD_query(const H5FD_t *f, unsigned long *flags /*out*/);
+static int    H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags /*out*/);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -113,14 +106,12 @@ static unsigned long H5FD_file_serial_no_g;
 
 /* File driver ID class */
 static const H5I_class_t H5I_VFL_CLS[1] = {{
-    H5I_VFL,            /* ID class value */
-    H5I_CLASS_REUSE_IDS,    /* Class flags */
-    0,                /* # of reserved IDs for class */
-    (H5I_free_t)H5FD_free_cls    /* Callback routine for closing objects of this class */
+    H5I_VFL,                  /* ID class value */
+    H5I_CLASS_REUSE_IDS,      /* Class flags */
+    0,                        /* # of reserved IDs for class */
+    (H5I_free_t)H5FD_free_cls /* Callback routine for closing objects of this class */
 }};
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_init
  *
@@ -137,7 +128,7 @@ static const H5I_class_t H5I_VFL_CLS[1] = {{
 herr_t
 H5FD_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -146,7 +137,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_init_interface
  *
@@ -166,12 +156,12 @@ done:
 static herr_t
 H5FD_init_interface(void)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(H5I_register_type(H5I_VFL_CLS) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize interface")
+    if (H5I_register_type(H5I_VFL_CLS) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
     /* Reset the file serial numbers */
     H5FD_file_serial_no_g = 0;
@@ -180,7 +170,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_term_interface
  *
@@ -204,16 +193,16 @@ done:
 int
 H5FD_term_interface(void)
 {
-    int    n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
-    if(H5I_nmembers(H5I_VFL) > 0) {
-        (void)H5I_clear_type(H5I_VFL, FALSE, FALSE);
+    if (H5_interface_initialize_g) {
+        if (H5I_nmembers(H5I_VFL) > 0) {
+            (void)H5I_clear_type(H5I_VFL, FALSE, FALSE);
 
             /* Reset the VFL drivers, if they've been closed */
-            if(H5I_nmembers(H5I_VFL)==0) {
+            if (H5I_nmembers(H5I_VFL) == 0) {
                 H5FD_sec2_term();
 #ifdef H5_HAVE_DIRECT
                 H5FD_direct_term();
@@ -228,25 +217,24 @@ H5FD_term_interface(void)
                 H5FD_multi_term();
 #ifdef H5_HAVE_PARALLEL
                 H5FD_mpio_term();
-#endif /* H5_HAVE_PARALLEL */
+#endif        /* H5_HAVE_PARALLEL */
             } /* end if */
 
             n++; /*H5I*/
-    } /* end if */
+        }        /* end if */
         else {
             /* Destroy the VFL driver id group */
-        (void)H5I_dec_type_ref(H5I_VFL);
+            (void)H5I_dec_type_ref(H5I_VFL);
             n++; /*H5I*/
 
-        /* Mark closed */
-        H5_interface_initialize_g = 0;
-    } /* end else */
-    } /* end if */
+            /* Mark closed */
+            H5_interface_initialize_g = 0;
+        } /* end else */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5FD_term_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_free_cls
  *
@@ -275,7 +263,6 @@ H5FD_free_cls(H5FD_class_t *cls)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_free_cls() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDregister
  *
@@ -303,36 +290,35 @@ H5FD_free_cls(H5FD_class_t *cls)
 hid_t
 H5FDregister(const H5FD_class_t *cls)
 {
-    hid_t        ret_value;
-    H5FD_mem_t        type;
+    hid_t      ret_value;
+    H5FD_mem_t type;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "*x", cls);
 
     /* Check arguments */
-    if(!cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "null class pointer is disallowed")
-    if(!cls->open || !cls->close)
-    HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`open' and/or `close' methods are not defined")
-    if(!cls->get_eoa || !cls->set_eoa)
-    HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`get_eoa' and/or `set_eoa' methods are not defined")
-    if(!cls->get_eof)
-    HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`get_eof' method is not defined")
-    if(!cls->read || !cls->write)
-    HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`read' and/or `write' method is not defined")
-    for (type=H5FD_MEM_DEFAULT; type<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,type))
-    if(cls->fl_map[type]<H5FD_MEM_NOLIST || cls->fl_map[type]>=H5FD_MEM_NTYPES)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid free-list mapping")
+    if (!cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "null class pointer is disallowed")
+    if (!cls->open || !cls->close)
+        HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`open' and/or `close' methods are not defined")
+    if (!cls->get_eoa || !cls->set_eoa)
+        HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`get_eoa' and/or `set_eoa' methods are not defined")
+    if (!cls->get_eof)
+        HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`get_eof' method is not defined")
+    if (!cls->read || !cls->write)
+        HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`read' and/or `write' method is not defined")
+    for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
+        if (cls->fl_map[type] < H5FD_MEM_NOLIST || cls->fl_map[type] >= H5FD_MEM_NTYPES)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid free-list mapping")
 
     /* Create the new class ID */
-    if((ret_value=H5FD_register(cls, sizeof(H5FD_class_t), TRUE)) < 0)
+    if ((ret_value = H5FD_register(cls, sizeof(H5FD_class_t), TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register file driver ID")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_register
  *
@@ -363,10 +349,10 @@ done:
 hid_t
 H5FD_register(const void *_cls, size_t size, hbool_t app_ref)
 {
-    const H5FD_class_t    *cls = (const H5FD_class_t *)_cls;
-    H5FD_class_t    *saved = NULL;
-    H5FD_mem_t        type;
-    hid_t        ret_value;
+    const H5FD_class_t *cls   = (const H5FD_class_t *)_cls;
+    H5FD_class_t *      saved = NULL;
+    H5FD_mem_t          type;
+    hid_t               ret_value;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -376,27 +362,26 @@ H5FD_register(const void *_cls, size_t size, hbool_t app_ref)
     HDassert(cls->get_eoa && cls->set_eoa);
     HDassert(cls->get_eof);
     HDassert(cls->read && cls->write);
-    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
+    for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
         HDassert(cls->fl_map[type] >= H5FD_MEM_NOLIST && cls->fl_map[type] < H5FD_MEM_NTYPES);
 
     /* Copy the class structure so the caller can reuse or free it */
-    if(NULL == (saved = (H5FD_class_t *)H5MM_malloc(size)))
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for file driver class struct")
+    if (NULL == (saved = (H5FD_class_t *)H5MM_malloc(size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for file driver class struct")
     HDmemcpy(saved, cls, size);
 
     /* Create the new class ID */
-    if((ret_value = H5I_register(H5I_VFL, saved, app_ref)) < 0)
+    if ((ret_value = H5I_register(H5I_VFL, saved, app_ref)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register file driver ID")
 
 done:
-    if(ret_value < 0)
-        if(saved)
+    if (ret_value < 0)
+        if (saved)
             H5MM_xfree(saved);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_register() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDunregister
  *
@@ -417,24 +402,23 @@ done:
 herr_t
 H5FDunregister(hid_t driver_id)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", driver_id);
 
     /* Check arguments */
-    if(NULL == H5I_object_verify(driver_id, H5I_VFL))
-    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file driver")
+    if (NULL == H5I_object_verify(driver_id, H5I_VFL))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file driver")
 
     /* The H5FD_class_t struct will be freed by this function */
-    if(H5I_dec_app_ref(driver_id) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "unable to unregister file driver")
+    if (H5I_dec_app_ref(driver_id) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "unable to unregister file driver")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDunregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_get_class
  *
@@ -458,22 +442,22 @@ done:
 H5FD_class_t *
 H5FD_get_class(hid_t id)
 {
-    H5FD_class_t    *ret_value = NULL;
+    H5FD_class_t *ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(H5I_VFL == H5I_get_type(id))
-    ret_value = (H5FD_class_t *)H5I_object(id);
+    if (H5I_VFL == H5I_get_type(id))
+        ret_value = (H5FD_class_t *)H5I_object(id);
     else {
-        H5P_genplist_t *plist;      /* Property list pointer */
-        hid_t driver_id = -1;
+        H5P_genplist_t *plist; /* Property list pointer */
+        hid_t           driver_id = -1;
 
         /* Get the plist structure */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(id)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, NULL, "can't find object for ID")
 
-        if(TRUE == H5P_isa_class(id, H5P_FILE_ACCESS)) {
-            if(H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
+        if (TRUE == H5P_isa_class(id, H5P_FILE_ACCESS)) {
+            if (H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get driver ID")
             ret_value = H5FD_get_class(driver_id);
         } /* end if */
@@ -485,7 +469,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sb_size
  *
@@ -507,20 +490,19 @@ done:
 hsize_t
 H5FD_sb_size(H5FD_t *file)
 {
-    hsize_t    ret_value=0;
+    hsize_t ret_value = 0;
 
     FUNC_ENTER_NOAPI(0)
 
     HDassert(file && file->cls);
 
-    if(file->cls->sb_size)
-    ret_value = (file->cls->sb_size)(file);
+    if (file->cls->sb_size)
+        ret_value = (file->cls->sb_size)(file);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sb_encode
  *
@@ -543,22 +525,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf)
+H5FD_sb_encode(H5FD_t *file, char *name /*out*/, uint8_t *buf)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file && file->cls);
-    if(file->cls->sb_encode &&
-            (file->cls->sb_encode)(file, name/*out*/, buf/*out*/) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver sb_encode request failed")
+    if (file->cls->sb_encode && (file->cls->sb_encode)(file, name /*out*/, buf /*out*/) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver sb_encode request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sb_decode
  *
@@ -575,19 +555,18 @@ done:
 herr_t
 H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file && file->cls);
-    if(file->cls->sb_decode && (file->cls->sb_decode)(file, name, buf) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver sb_decode request failed")
+    if (file->cls->sb_decode && (file->cls->sb_decode)(file, name, buf) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver sb_decode request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sb_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_pl_copy
  *
@@ -611,34 +590,35 @@ done:
 static herr_t
 H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size, const void *old_pl, void **copied_pl)
 {
-    void *new_pl = NULL;        /* Copy of property list */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    void * new_pl    = NULL;    /* Copy of property list */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Copy old pl, if one exists */
-    if(old_pl) {
+    if (old_pl) {
         /* Allow the driver to copy or do it ourselves */
-        if(copy_func) {
+        if (copy_func) {
             new_pl = (copy_func)(old_pl);
-            if(new_pl==NULL)
+            if (new_pl == NULL)
                 HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "property list copy failed")
-        } else if(pl_size>0) {
-            if((new_pl = H5MM_malloc(pl_size))==NULL)
+        }
+        else if (pl_size > 0) {
+            if ((new_pl = H5MM_malloc(pl_size)) == NULL)
                 HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "property list allocation failed")
             HDmemcpy(new_pl, old_pl, pl_size);
-        } else
+        }
+        else
             HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "no way to copy driver property list")
     } /* end if */
 
     /* Set copied value */
-    *copied_pl=new_pl;
+    *copied_pl = new_pl;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_pl_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_pl_close
  *
@@ -657,27 +637,26 @@ done:
 static herr_t
 H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *), void *pl)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allow driver to free or do it ourselves */
-    if(pl && free_func) {
-    if((free_func)(pl) < 0)
-        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver free request failed")
+    if (pl && free_func) {
+        if ((free_func)(pl) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver free request failed")
     } /* end if */
     else
-    H5MM_xfree(pl);
+        H5MM_xfree(pl);
 
     /* Decrement reference count for driver */
-    if(H5I_dec_ref(driver_id) < 0)
+    if (H5I_dec_ref(driver_id) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't decrement reference count for driver")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_pl_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_fapl_get
  *
@@ -707,20 +686,19 @@ done:
 void *
 H5FD_fapl_get(H5FD_t *file)
 {
-    void    *ret_value=NULL;
+    void *ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(file);
 
-    if(file->cls->fapl_get)
-    ret_value = (file->cls->fapl_get)(file);
+    if (file->cls->fapl_get)
+        ret_value = (file->cls->fapl_get)(file);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_fapl_get() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_fapl_open
  *
@@ -740,33 +718,32 @@ done:
 herr_t
 H5FD_fapl_open(H5P_genplist_t *plist, hid_t driver_id, const void *driver_info)
 {
-    void *copied_driver_info = NULL;           /* Temporary VFL driver info */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    void * copied_driver_info = NULL;    /* Temporary VFL driver info */
+    herr_t ret_value          = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Increment the reference count on driver and copy driver info */
-    if(H5I_inc_ref(driver_id, FALSE) < 0)
+    if (H5I_inc_ref(driver_id, FALSE) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINC, FAIL, "unable to increment ref count on VFL driver")
-    if(H5FD_fapl_copy(driver_id, driver_info, &copied_driver_info) < 0)
+    if (H5FD_fapl_copy(driver_id, driver_info, &copied_driver_info) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "can't copy VFL driver info")
 
     /* Set the driver properties for the list */
-    if(H5P_set(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
+    if (H5P_set(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "can't set driver ID")
-    if(H5P_set(plist, H5F_ACS_FILE_DRV_INFO_NAME, &copied_driver_info) < 0)
+    if (H5P_set(plist, H5F_ACS_FILE_DRV_INFO_NAME, &copied_driver_info) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "can't set driver info")
     copied_driver_info = NULL;
 
 done:
-    if(ret_value < 0)
-        if(copied_driver_info && H5FD_fapl_close(driver_id, copied_driver_info) < 0)
+    if (ret_value < 0)
+        if (copied_driver_info && H5FD_fapl_close(driver_id, copied_driver_info) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "can't close copy of driver info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_fapl_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_fapl_copy
  *
@@ -786,23 +763,22 @@ static herr_t
 H5FD_fapl_copy(hid_t driver_id, const void *old_fapl, void **copied_fapl)
 {
     H5FD_class_t *driver;
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
-    if(NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
-    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a driver ID")
+    if (NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a driver ID")
 
     /* Copy the file access property list */
-    if(H5FD_pl_copy(driver->fapl_copy, driver->fapl_size, old_fapl, copied_fapl) < 0)
+    if (H5FD_pl_copy(driver->fapl_copy, driver->fapl_size, old_fapl, copied_fapl) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "can't copy driver file access property list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_fapl_close
  *
@@ -821,18 +797,18 @@ done:
 herr_t
 H5FD_fapl_close(hid_t driver_id, void *fapl)
 {
-    H5FD_class_t    *driver = NULL;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5FD_class_t *driver    = NULL;
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
-    if(driver_id > 0) {
-        if(NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
+    if (driver_id > 0) {
+        if (NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a driver ID")
 
         /* Close the driver for the property list */
-        if(H5FD_pl_close(driver_id, driver->fapl_free, fapl) < 0)
+        if (H5FD_pl_close(driver_id, driver->fapl_free, fapl) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver fapl_free request failed")
     } /* end if */
 
@@ -840,7 +816,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_fapl_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDopen
  *
@@ -899,26 +874,24 @@ done:
 H5FD_t *
 H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_t    *ret_value=NULL;
+    H5FD_t *ret_value = NULL;
 
     FUNC_ENTER_API(NULL)
     H5TRACE4("*x", "*sIuia", name, flags, fapl_id, maxaddr);
 
     /* Check arguments */
-    if(H5P_DEFAULT == fapl_id)
+    if (H5P_DEFAULT == fapl_id)
         fapl_id = H5P_FILE_ACCESS_DEFAULT;
-    else
-        if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
+    else if (TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
 
-    if(NULL==(ret_value=H5FD_open(name, flags, fapl_id, maxaddr)))
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "unable to open file")
+    if (NULL == (ret_value = H5FD_open(name, flags, fapl_id, maxaddr)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "unable to open file")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_open
  *
@@ -943,73 +916,73 @@ done:
 H5FD_t *
 H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_class_t    *driver;                /* VFD for file */
-    H5FD_t        *file = NULL;           /* VFD file struct */
-    hid_t               driver_id = -1;         /* VFD ID */
-    H5P_genplist_t      *plist;                 /* Property list pointer */
-    unsigned long       driver_flags = 0;       /* File-inspecific driver feature flags */
-    H5FD_file_image_info_t file_image_info;     /* Initial file image */
-    H5FD_t        *ret_value;             /* Return value */
+    H5FD_class_t *         driver;           /* VFD for file */
+    H5FD_t *               file      = NULL; /* VFD file struct */
+    hid_t                  driver_id = -1;   /* VFD ID */
+    H5P_genplist_t *       plist;            /* Property list pointer */
+    unsigned long          driver_flags = 0; /* File-inspecific driver feature flags */
+    H5FD_file_image_info_t file_image_info;  /* Initial file image */
+    H5FD_t *               ret_value;        /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Sanity check */
-    if(0 == maxaddr)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "zero format address range")
+    if (0 == maxaddr)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "zero format address range")
 
     /* Get file access property list */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
 
     /* Get the VFD to open the file with */
-    if(H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
+    if (H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get driver ID")
 
     /* Get driver info */
-    if(NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
-    HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "invalid driver ID in file access property list")
-    if(NULL == driver->open)
-    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, NULL, "file driver has no `open' method")
+    if (NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
+        HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "invalid driver ID in file access property list")
+    if (NULL == driver->open)
+        HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, NULL, "file driver has no `open' method")
 
     /* Query driver flag */
     H5FD_driver_query(driver, &driver_flags);
 
     /* Get initial file image info */
-    if(H5P_get(plist, H5F_ACS_FILE_IMAGE_INFO_NAME, &file_image_info) < 0)
+    if (H5P_get(plist, H5F_ACS_FILE_IMAGE_INFO_NAME, &file_image_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get file image info")
 
     /* If an image is provided, make sure the driver supports this feature */
     HDassert(((file_image_info.buffer != NULL) && (file_image_info.size > 0)) ||
              ((file_image_info.buffer == NULL) && (file_image_info.size == 0)));
-    if((file_image_info.buffer != NULL) && !(driver_flags & H5FD_FEAT_ALLOW_FILE_IMAGE))
+    if ((file_image_info.buffer != NULL) && !(driver_flags & H5FD_FEAT_ALLOW_FILE_IMAGE))
         HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, NULL, "file image set, but not supported.")
 
     /* Dispatch to file driver */
-    if(HADDR_UNDEF == maxaddr)
+    if (HADDR_UNDEF == maxaddr)
         maxaddr = driver->maxaddr;
-    if(NULL == (file = (driver->open)(name, flags, fapl_id, maxaddr)))
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "open failed")
+    if (NULL == (file = (driver->open)(name, flags, fapl_id, maxaddr)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "open failed")
 
     /*
      * Fill in public fields. We must increment the reference count on the
      * driver ID to prevent it from being freed while this file is open.
      */
     file->driver_id = driver_id;
-    if(H5I_inc_ref(file->driver_id, FALSE) < 0)
+    if (H5I_inc_ref(file->driver_id, FALSE) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTINC, NULL, "unable to increment ref count on VFL driver")
-    file->cls = driver;
+    file->cls     = driver;
     file->maxaddr = maxaddr;
-    if(H5P_get(plist, H5F_ACS_ALIGN_THRHD_NAME, &(file->threshold)) < 0)
+    if (H5P_get(plist, H5F_ACS_ALIGN_THRHD_NAME, &(file->threshold)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get alignment threshold")
-    if(H5P_get(plist, H5F_ACS_ALIGN_NAME, &(file->alignment)) < 0)
+    if (H5P_get(plist, H5F_ACS_ALIGN_NAME, &(file->alignment)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get alignment")
 
     /* Retrieve the VFL driver feature flags */
-    if(H5FD_query(file, &(file->feature_flags)) < 0)
+    if (H5FD_query(file, &(file->feature_flags)) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "unable to query file driver")
 
     /* Increment the global serial number & assign it to this H5FD_t object */
-    if(++H5FD_file_serial_no_g == 0) {
+    if (++H5FD_file_serial_no_g == 0) {
         /* (Just error out if we wrap around for now...) */
         HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "unable to get file serial number")
     } /* end if */
@@ -1027,7 +1000,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDclose
  *
@@ -1048,22 +1020,21 @@ done:
 herr_t
 H5FDclose(H5FD_t *file)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "*x", file);
 
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
 
-    if(H5FD_close(file) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
+    if (H5FD_close(file) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_close
  *
@@ -1090,7 +1061,7 @@ H5FD_close(H5FD_t *file)
 
     /* Prepare to close file by clearing all public fields */
     driver = file->cls;
-    if(H5I_dec_ref(file->driver_id) < 0)
+    if (H5I_dec_ref(file->driver_id) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't close driver ID")
 
     /*
@@ -1098,14 +1069,13 @@ H5FD_close(H5FD_t *file)
      * close the file then the file will be in an unusable state.
      */
     HDassert(driver->close);
-    if((driver->close)(file) < 0)
+    if ((driver->close)(file) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "close failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDcmp
  *
@@ -1133,7 +1103,7 @@ done:
 int
 H5FDcmp(const H5FD_t *f1, const H5FD_t *f2)
 {
-    int    ret_value;
+    int ret_value;
 
     FUNC_ENTER_API(-1) /*return value is arbitrary*/
     H5TRACE2("Is", "*x*x", f1, f2);
@@ -1144,7 +1114,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_cmp
  *
@@ -1164,28 +1133,28 @@ done:
 int
 H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2)
 {
-    int    ret_value;
+    int ret_value;
 
     FUNC_ENTER_NOAPI(-1) /*return value is arbitrary*/
 
-    if((!f1 || !f1->cls) && (!f2 || !f2->cls))
+    if ((!f1 || !f1->cls) && (!f2 || !f2->cls))
         HGOTO_DONE(0)
-    if(!f1 || !f1->cls)
+    if (!f1 || !f1->cls)
         HGOTO_DONE(-1)
-    if(!f2 || !f2->cls)
+    if (!f2 || !f2->cls)
         HGOTO_DONE(1)
-    if(f1->cls < f2->cls)
+    if (f1->cls < f2->cls)
         HGOTO_DONE(-1)
-    if(f1->cls > f2->cls)
+    if (f1->cls > f2->cls)
         HGOTO_DONE(1)
 
     /* Files are same driver; no cmp callback */
-    if(!f1->cls->cmp) {
-    if(f1<f2)
+    if (!f1->cls->cmp) {
+        if (f1 < f2)
             HGOTO_DONE(-1)
-    if(f1>f2)
+        if (f1 > f2)
             HGOTO_DONE(1)
-    HGOTO_DONE(0)
+        HGOTO_DONE(0)
     }
 
     ret_value = (f1->cls->cmp)(f1, f2);
@@ -1194,7 +1163,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDquery
  *
@@ -1212,9 +1180,9 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/)
+H5FDquery(const H5FD_t *f, unsigned long *flags /*out*/)
 {
-    int    ret_value;
+    int ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("Is", "*xx", f, flags);
@@ -1228,7 +1196,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_query
  *
@@ -1244,9 +1211,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/)
+H5FD_query(const H5FD_t *f, unsigned long *flags /*out*/)
 {
-    int    ret_value = 0;          /* Return value */
+    int ret_value = 0; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1254,35 +1221,34 @@ H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/)
     HDassert(flags);
 
     /* Check for query driver and call it */
-    if(f->cls->query)
+    if (f->cls->query)
         ret_value = (f->cls->query)(f, flags);
     else
-        *flags=0;
+        *flags = 0;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_query() */
 
-
 /*-------------------------------------------------------------------------
-* Function:    H5FD_driver_query
-*
-* Purpose: Similar to H5FD_query(), but intended for cases when we don't
-*          have a file available (e.g. before one is opened). Since we
-*          can't use the file to get the driver, the driver is passed in
-*          as a parameter.
-*
-* Return:  Success:    non-negative
-*          Failure:    negative
-*
-* Programmer:  Jacob Gruber
-*              Wednesday, August 17, 2011
-*
-*-------------------------------------------------------------------------
-*/
+ * Function:    H5FD_driver_query
+ *
+ * Purpose: Similar to H5FD_query(), but intended for cases when we don't
+ *          have a file available (e.g. before one is opened). Since we
+ *          can't use the file to get the driver, the driver is passed in
+ *          as a parameter.
+ *
+ * Return:  Success:    non-negative
+ *          Failure:    negative
+ *
+ * Programmer:  Jacob Gruber
+ *              Wednesday, August 17, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
 static int
-H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/)
+H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags /*out*/)
 {
-    int ret_value = 0;          /* Return value */
+    int ret_value = 0; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1290,7 +1256,7 @@ H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/)
     HDassert(flags);
 
     /* Check for the driver to query and then query it */
-    if(driver->query)
+    if (driver->query)
         ret_value = (driver->query)(NULL, flags);
     else
         *flags = 0;
@@ -1298,7 +1264,6 @@ H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_driver_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDalloc
  *
@@ -1341,27 +1306,26 @@ H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/)
 haddr_t
 H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
 {
-    haddr_t    ret_value = HADDR_UNDEF;
+    haddr_t ret_value = HADDR_UNDEF;
 
     FUNC_ENTER_API(HADDR_UNDEF)
     H5TRACE4("a", "*xMtih", file, type, dxpl_id, size);
 
     /* Check args */
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid file pointer")
-    if(type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid request type")
-    if(size == 0)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "zero-size request")
-    if(H5P_DEFAULT == dxpl_id)
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid file pointer")
+    if (type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid request type")
+    if (size == 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "zero-size request")
+    if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, HADDR_UNDEF, "not a data transfer property list")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, HADDR_UNDEF, "not a data transfer property list")
 
     /* Do the real work */
-    if(HADDR_UNDEF == (ret_value = H5FD_alloc_real(file, dxpl_id, type, size, NULL, NULL)))
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "unable to allocate file memory")
+    if (HADDR_UNDEF == (ret_value = H5FD_alloc_real(file, dxpl_id, type, size, NULL, NULL)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "unable to allocate file memory")
 
     /* (Note compensating for base address subtraction in internal routine) */
     ret_value += file->base_addr;
@@ -1370,7 +1334,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDalloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDfree
  *
@@ -1395,32 +1358,30 @@ done:
 herr_t
 H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "*xMtiah", file, type, dxpl_id, addr, size);
 
     /* Check args */
-    if(!file || !file->cls)
+    if (!file || !file->cls)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
-    if(type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
+    if (type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid request type")
-    if(H5P_DEFAULT == dxpl_id)
+    if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
 
     /* Do the real work */
     /* (Note compensating for base address addition in internal routine) */
-    if(H5FD_free_real(file, dxpl_id, type, addr - file->base_addr, size) < 0)
+    if (H5FD_free_real(file, dxpl_id, type, addr - file->base_addr, size) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "file deallocation request failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDfree() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDget_eoa
  *
@@ -1438,20 +1399,20 @@ done:
 haddr_t
 H5FDget_eoa(H5FD_t *file, H5FD_mem_t type)
 {
-    haddr_t    ret_value;
+    haddr_t ret_value;
 
     FUNC_ENTER_API(HADDR_UNDEF)
     H5TRACE2("a", "*xMt", file, type);
 
     /* Check args */
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid file pointer")
-    if(type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid file type")
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid file pointer")
+    if (type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid file type")
 
     /* The real work */
-    if(HADDR_UNDEF == (ret_value = H5FD_get_eoa(file, type)))
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "file get eoa request failed")
+    if (HADDR_UNDEF == (ret_value = H5FD_get_eoa(file, type)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "file get eoa request failed")
 
     /* (Note compensating for base address subtraction in internal routine) */
     ret_value += file->base_addr;
@@ -1460,7 +1421,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDget_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDset_eoa
  *
@@ -1488,29 +1448,28 @@ done:
 herr_t
 H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "*xMta", file, type, addr);
 
     /* Check args */
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
-    if(type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file type")
-    if(!H5F_addr_defined(addr) || addr > file->maxaddr)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid end-of-address value")
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
+    if (type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file type")
+    if (!H5F_addr_defined(addr) || addr > file->maxaddr)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid end-of-address value")
 
     /* The real work */
     /* (Note compensating for base address addition in internal routine) */
-    if(H5FD_set_eoa(file, type, addr - file->base_addr) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "file set eoa request failed")
+    if (H5FD_set_eoa(file, type, addr - file->base_addr) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "file set eoa request failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDset_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDget_eof
  *
@@ -1540,18 +1499,18 @@ done:
 haddr_t
 H5FDget_eof(H5FD_t *file)
 {
-    haddr_t    ret_value;
+    haddr_t ret_value;
 
     FUNC_ENTER_API(HADDR_UNDEF)
     H5TRACE1("a", "*x", file);
 
     /* Check arguments */
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid file pointer")
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, HADDR_UNDEF, "invalid file pointer")
 
     /* The real work */
-    if(HADDR_UNDEF == (ret_value = H5FD_get_eof(file)))
-    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "file get eof request failed")
+    if (HADDR_UNDEF == (ret_value = H5FD_get_eof(file)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "file get eof request failed")
 
     /* (Note compensating for base address subtraction in internal routine) */
     ret_value += file->base_addr;
@@ -1560,7 +1519,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDget_eof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_get_maxaddr
  *
@@ -1577,7 +1535,7 @@ done:
 haddr_t
 H5FD_get_maxaddr(const H5FD_t *file)
 {
-    haddr_t ret_value;          /* Return value */
+    haddr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
@@ -1590,7 +1548,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_maxaddr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_get_feature_flags
  *
@@ -1618,7 +1575,6 @@ H5FD_get_feature_flags(const H5FD_t *file, unsigned long *feature_flags)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_get_feature_flags() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_get_fs_type_map
  *
@@ -1635,7 +1591,7 @@ H5FD_get_feature_flags(const H5FD_t *file, unsigned long *feature_flags)
 herr_t
 H5FD_get_fs_type_map(const H5FD_t *file, H5FD_mem_t *type_map)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1644,9 +1600,9 @@ H5FD_get_fs_type_map(const H5FD_t *file, H5FD_mem_t *type_map)
     HDassert(type_map);
 
     /* Check for VFD class providing a type map retrieval rouine */
-    if(file->cls->get_type_map) {
+    if (file->cls->get_type_map) {
         /* Retrieve type mapping for this file */
-        if((file->cls->get_type_map)(file, type_map) < 0)
+        if ((file->cls->get_type_map)(file, type_map) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get type map failed")
     } /* end if */
     else
@@ -1657,7 +1613,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_fs_type_map() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDread
  *
@@ -1678,42 +1633,39 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
-    void *buf/*out*/)
+H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *buf /*out*/)
 {
-    H5P_genplist_t *dxpl;               /* DXPL object */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *dxpl;                /* DXPL object */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "*xMtiazx", file, type, dxpl_id, addr, size, buf);
 
     /* Check args */
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
 
     /* Get the default dataset transfer property list if the user didn't provide one */
-    if(H5P_DEFAULT == dxpl_id)
+    if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
-    if(!buf)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null result buffer")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
+    if (!buf)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null result buffer")
 
     /* Get the DXPL plist object for DXPL ID */
-    if(NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Do the real work */
     /* (Note compensating for base address addition in internal routine) */
-    if(H5FD_read(file, dxpl, type, addr - file->base_addr, size, buf) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "file read request failed")
+    if (H5FD_read(file, dxpl, type, addr - file->base_addr, size, buf) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "file read request failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDread() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDwrite
  *
@@ -1732,41 +1684,38 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
-    const void *buf)
+H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *buf)
 {
-    H5P_genplist_t *dxpl;               /* DXPL object */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *dxpl;                /* DXPL object */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "*xMtiaz*x", file, type, dxpl_id, addr, size, buf);
 
     /* Check args */
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
     /* Get the default dataset transfer property list if the user didn't provide one */
-    if(H5P_DEFAULT == dxpl_id)
+    if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
-    if(!buf)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null buffer")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
+    if (!buf)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null buffer")
 
     /* Get the DXPL plist object for DXPL ID */
-    if(NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* The real work */
     /* (Note compensating for base address addition in internal routine) */
-    if(H5FD_write(file, dxpl, type, addr - file->base_addr, size, buf) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "file write request failed")
+    if (H5FD_write(file, dxpl, type, addr - file->base_addr, size, buf) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "file write request failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDwrite() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDflush
  *
@@ -1789,29 +1738,27 @@ done:
 herr_t
 H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
 {
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "*xiIu", file, dxpl_id, closing);
 
     /* Check args */
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
-    if(H5P_DEFAULT == dxpl_id)
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
+    if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
 
     /* Do the real work */
-    if(H5FD_flush(file, dxpl_id, closing) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_CANTFLUSH, FAIL, "file flush request failed")
+    if (H5FD_flush(file, dxpl_id, closing) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTFLUSH, FAIL, "file flush request failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_flush
  *
@@ -1828,20 +1775,19 @@ done:
 herr_t
 H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file && file->cls);
 
-    if(file->cls->flush && (file->cls->flush)(file, dxpl_id, closing) < 0)
+    if (file->cls->flush && (file->cls->flush)(file, dxpl_id, closing) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver flush request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FDtruncate
  *
@@ -1858,29 +1804,27 @@ done:
 herr_t
 H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing)
 {
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "*xib", file, dxpl_id, closing);
 
     /* Check args */
-    if(!file || !file->cls)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
-    if(H5P_DEFAULT == dxpl_id)
+    if (!file || !file->cls)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
+    if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
 
     /* Do the real work */
-    if(H5FD_truncate(file, dxpl_id, closing) < 0)
-    HGOTO_ERROR(H5E_VFL, H5E_CANTUPDATE, FAIL, "file flush request failed")
+    if (H5FD_truncate(file, dxpl_id, closing) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTUPDATE, FAIL, "file flush request failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_truncate
  *
@@ -1897,20 +1841,19 @@ done:
 herr_t
 H5FD_truncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file && file->cls);
 
-    if(file->cls->truncate && (file->cls->truncate)(file, dxpl_id, closing) < 0)
+    if (file->cls->truncate && (file->cls->truncate)(file, dxpl_id, closing) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTUPDATE, FAIL, "driver truncate request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_truncate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_get_fileno
  *
@@ -1939,7 +1882,6 @@ H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_get_fileno() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5FDget_vfd_handle
  *
@@ -1958,7 +1900,7 @@ H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
 herr_t
 H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle)
 {
-    herr_t              ret_value;
+    herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "*xi**x", file, fapl, file_handle);
@@ -1973,7 +1915,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5FDget_vfd_handle() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5FD_get_vfd_handle
  *
@@ -1997,16 +1938,15 @@ H5FD_get_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle)
     HDassert(file);
     HDassert(file_handle);
 
-    if(NULL == file->cls->get_handle)
-    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "file driver has no `get_vfd_handle' method")
-    if((file->cls->get_handle)(file, fapl, file_handle) < 0)
+    if (NULL == file->cls->get_handle)
+        HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "file driver has no `get_vfd_handle' method")
+    if ((file->cls->get_handle)(file, fapl, file_handle) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get file handle for file driver")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_vfd_handle() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5FD_set_base_addr
  *
@@ -2033,7 +1973,6 @@ H5FD_set_base_addr(H5FD_t *file, haddr_t base_addr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_set_base_addr() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5FD_get_base_addr
  *
@@ -2059,28 +1998,28 @@ H5FD_get_base_addr(const H5FD_t *file)
 } /* end H5FD_get_base_addr() */
 
 /*-------------------------------------------------------------------------
-* Function: H5FDdriver_query
-*
-* Purpose:  Similar to H5FD_query(), but intended for cases when we don't
-*           have a file available (e.g. before one is opened). Since we
-*           can't use the file to get the driver, the driver ID is passed
-*           in as a parameter.
-*
-* Return:   SUCCEED/FAIL
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5FDdriver_query
+ *
+ * Purpose:  Similar to H5FD_query(), but intended for cases when we don't
+ *           have a file available (e.g. before one is opened). Since we
+ *           can't use the file to get the driver, the driver ID is passed
+ *           in as a parameter.
+ *
+ * Return:   SUCCEED/FAIL
+ *
+ *-------------------------------------------------------------------------
+ */
 herr_t
-H5FDdriver_query(hid_t driver_id, unsigned long *flags/*out*/)
+H5FDdriver_query(hid_t driver_id, unsigned long *flags /*out*/)
 {
-    H5FD_class_t *driver = NULL;            /* Pointer to VFD class struct  */
-    herr_t ret_value = SUCCEED;             /* Return value                 */
+    H5FD_class_t *driver    = NULL;    /* Pointer to VFD class struct  */
+    herr_t        ret_value = SUCCEED; /* Return value                 */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", driver_id, flags);
 
     /* Check arguments */
-    if(NULL == flags)
+    if (NULL == flags)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "flags parameter cannot be NULL")
 
     /* Check for the driver to query and then query it */
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index cf7b5bf..0cec769 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -21,26 +21,26 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC  H5FD_core_init_interface
-
-#include "H5private.h"      /* Generic Functions            */
-#include "H5Eprivate.h"     /* Error handling               */
-#include "H5Fprivate.h"     /* File access                  */
-#include "H5FDprivate.h"    /* File drivers                 */
-#include "H5FDcore.h"       /* Core file driver             */
-#include "H5FLprivate.h"    /* Free lists                   */
-#include "H5Iprivate.h"     /* IDs                          */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Pprivate.h"     /* Property lists               */
-#include "H5SLprivate.h"    /* Skip lists                   */
+#define H5_INTERFACE_INIT_FUNC H5FD_core_init_interface
+
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Eprivate.h"  /* Error handling               */
+#include "H5Fprivate.h"  /* File access                  */
+#include "H5FDprivate.h" /* File drivers                 */
+#include "H5FDcore.h"    /* Core file driver             */
+#include "H5FLprivate.h" /* Free lists                   */
+#include "H5Iprivate.h"  /* IDs                          */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Pprivate.h"  /* Property lists               */
+#include "H5SLprivate.h" /* Skip lists                   */
 
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_CORE_g = 0;
 
 /* The skip list node type.  Represents a region in the file. */
 typedef struct H5FD_core_region_t {
-    haddr_t start;              /* Start address of the region          */
-    haddr_t end;                /* End address of the region            */
+    haddr_t start; /* Start address of the region          */
+    haddr_t end;   /* End address of the region            */
 } H5FD_core_region_t;
 
 /* The description of a file belonging to this driver. The 'eoa' and 'eof'
@@ -48,22 +48,22 @@ typedef struct H5FD_core_region_t {
  * of the file (the current size of the underlying memory).
  */
 typedef struct H5FD_core_t {
-    H5FD_t  pub;                /* public stuff, must be first          */
-    char    *name;              /* for equivalence testing              */
-    unsigned char *mem;         /* the underlying memory                */
-    haddr_t eoa;                /* end of allocated region              */
-    haddr_t eof;                /* current allocated size               */
-    size_t  increment;          /* multiples for mem allocation         */
-    hbool_t backing_store;      /* write to file name on flush          */
-    size_t  bstore_page_size;   /* backing store page size              */
-    int     fd;                 /* backing store file descriptor        */
+    H5FD_t         pub;              /* public stuff, must be first          */
+    char *         name;             /* for equivalence testing              */
+    unsigned char *mem;              /* the underlying memory                */
+    haddr_t        eoa;              /* end of allocated region              */
+    haddr_t        eof;              /* current allocated size               */
+    size_t         increment;        /* multiples for mem allocation         */
+    hbool_t        backing_store;    /* write to file name on flush          */
+    size_t         bstore_page_size; /* backing store page size              */
+    int            fd;               /* backing store file descriptor        */
     /* Information for determining uniqueness of a file with a backing store */
 #ifndef H5_HAVE_WIN32_API
     /* On most systems the combination of device and i-node number uniquely
      * identify a file.
      */
-    dev_t       device;                 /*file device number            */
-    ino_t       inode;                  /*file i-node number            */
+    dev_t device; /*file device number            */
+    ino_t inode;  /*file i-node number            */
 #else
     /* Files in windows are uniquely identified by the volume serial
      * number and the file index (both low and high parts).
@@ -79,21 +79,21 @@ typedef struct H5FD_core_t {
      *
      * http://msdn.microsoft.com/en-us/library/aa363788(v=VS.85).aspx
      */
-    DWORD           nFileIndexLow;
-    DWORD           nFileIndexHigh;
-    DWORD           dwVolumeSerialNumber;
-
-    HANDLE          hFile;      /* Native windows file handle */
-#endif /* H5_HAVE_WIN32_API */
-    hbool_t dirty;                              /* changes not saved?       */
-    H5FD_file_image_callbacks_t fi_callbacks;   /* file image callbacks     */
-    H5SL_t *dirty_list;                         /* dirty parts of the file  */
+    DWORD nFileIndexLow;
+    DWORD nFileIndexHigh;
+    DWORD dwVolumeSerialNumber;
+
+    HANDLE hFile; /* Native windows file handle */
+#endif                                        /* H5_HAVE_WIN32_API */
+    hbool_t                     dirty;        /* changes not saved?       */
+    H5FD_file_image_callbacks_t fi_callbacks; /* file image callbacks     */
+    H5SL_t *                    dirty_list;   /* dirty parts of the file  */
 } H5FD_core_t;
 
 /* Driver-specific file access properties */
 typedef struct H5FD_core_fapl_t {
-    size_t  increment;          /* how much to grow memory */
-    hbool_t backing_store;      /* write to file name on flush */
+    size_t  increment;     /* how much to grow memory */
+    hbool_t backing_store; /* write to file name on flush */
 } H5FD_core_fapl_t;
 
 /* Allocate memory in multiples of this size by default */
@@ -112,72 +112,69 @@ typedef struct H5FD_core_fapl_t {
  * REGION_OVERFLOW: Checks whether an address and size pair describe data
  *                  which can be addressed entirely in memory.
  */
-#define MAXADDR             ((haddr_t)((~(size_t)0)-1))
-#define ADDR_OVERFLOW(A)    (HADDR_UNDEF==(A) || (A) > (haddr_t)MAXADDR)
-#define SIZE_OVERFLOW(Z)    ((Z) > (hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z)    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) ||    \
-                                 HADDR_UNDEF==(A)+(Z) ||                    \
-                                (size_t)((A)+(Z))<(size_t)(A))
+#define MAXADDR          ((haddr_t)((~(size_t)0) - 1))
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || (A) > (haddr_t)MAXADDR)
+#define SIZE_OVERFLOW(Z) ((Z) > (hsize_t)MAXADDR)
+#define REGION_OVERFLOW(A, Z)                                                                                \
+    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (size_t)((A) + (Z)) < (size_t)(A))
 
 /* Prototypes */
-static herr_t H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end);
-static herr_t H5FD_core_destroy_dirty_list(H5FD_core_t *file);
-static herr_t H5FD_core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size);
-static void *H5FD_core_fapl_get(H5FD_t *_file);
-static H5FD_t *H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id,
-            haddr_t maxaddr);
-static herr_t H5FD_core_close(H5FD_t *_file);
-static int H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t H5FD_core_query(const H5FD_t *_f1, unsigned long *flags);
+static herr_t  H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end);
+static herr_t  H5FD_core_destroy_dirty_list(H5FD_core_t *file);
+static herr_t  H5FD_core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size);
+static void *  H5FD_core_fapl_get(H5FD_t *_file);
+static H5FD_t *H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD_core_close(H5FD_t *_file);
+static int     H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD_core_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD_core_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD_core_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static herr_t  H5FD_core_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD_core_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_core_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_core_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, void *buf);
-static herr_t H5FD_core_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, const void *buf);
-static herr_t H5FD_core_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
-static herr_t H5FD_core_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD_core_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD_core_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                              void *buf);
+static herr_t  H5FD_core_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                               const void *buf);
+static herr_t  H5FD_core_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
+static herr_t  H5FD_core_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 
 static const H5FD_class_t H5FD_core_g = {
-    "core",                     /* name                 */
-    MAXADDR,                    /* maxaddr              */
-    H5F_CLOSE_WEAK,             /* fc_degree            */
-    NULL,                       /* sb_size              */
-    NULL,                       /* sb_encode            */
-    NULL,                       /* sb_decode            */
-    sizeof(H5FD_core_fapl_t),   /* fapl_size            */
-    H5FD_core_fapl_get,         /* fapl_get             */
-    NULL,                       /* fapl_copy            */
-    NULL,                       /* fapl_free            */
-    0,                          /* dxpl_size            */
-    NULL,                       /* dxpl_copy            */
-    NULL,                       /* dxpl_free            */
-    H5FD_core_open,             /* open                 */
-    H5FD_core_close,            /* close                */
-    H5FD_core_cmp,              /* cmp                  */
-    H5FD_core_query,            /* query                */
-    NULL,                       /* get_type_map         */
-    NULL,                       /* alloc                */
-    NULL,                       /* free                 */
-    H5FD_core_get_eoa,          /* get_eoa              */
-    H5FD_core_set_eoa,          /* set_eoa              */
-    H5FD_core_get_eof,          /* get_eof              */
-    H5FD_core_get_handle,       /* get_handle           */
-    H5FD_core_read,             /* read                 */
-    H5FD_core_write,            /* write                */
-    H5FD_core_flush,            /* flush                */
-    H5FD_core_truncate,         /* truncate             */
-    NULL,                       /* lock                 */
-    NULL,                       /* unlock               */
-    H5FD_FLMAP_DICHOTOMY        /* fl_map               */
+    "core",                   /* name                 */
+    MAXADDR,                  /* maxaddr              */
+    H5F_CLOSE_WEAK,           /* fc_degree            */
+    NULL,                     /* sb_size              */
+    NULL,                     /* sb_encode            */
+    NULL,                     /* sb_decode            */
+    sizeof(H5FD_core_fapl_t), /* fapl_size            */
+    H5FD_core_fapl_get,       /* fapl_get             */
+    NULL,                     /* fapl_copy            */
+    NULL,                     /* fapl_free            */
+    0,                        /* dxpl_size            */
+    NULL,                     /* dxpl_copy            */
+    NULL,                     /* dxpl_free            */
+    H5FD_core_open,           /* open                 */
+    H5FD_core_close,          /* close                */
+    H5FD_core_cmp,            /* cmp                  */
+    H5FD_core_query,          /* query                */
+    NULL,                     /* get_type_map         */
+    NULL,                     /* alloc                */
+    NULL,                     /* free                 */
+    H5FD_core_get_eoa,        /* get_eoa              */
+    H5FD_core_set_eoa,        /* set_eoa              */
+    H5FD_core_get_eof,        /* get_eof              */
+    H5FD_core_get_handle,     /* get_handle           */
+    H5FD_core_read,           /* read                 */
+    H5FD_core_write,          /* write                */
+    H5FD_core_flush,          /* flush                */
+    H5FD_core_truncate,       /* truncate             */
+    NULL,                     /* lock                 */
+    NULL,                     /* unlock               */
+    H5FD_FLMAP_DICHOTOMY      /* fl_map               */
 };
 
 /* Define a free list to manage the region type */
 H5FL_DEFINE(H5FD_core_region_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_add_dirty_region
  *
@@ -191,15 +188,15 @@ H5FL_DEFINE(H5FD_core_region_t);
 static herr_t
 H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
 {
-    H5FD_core_region_t *b_item  = NULL;
-    H5FD_core_region_t *a_item  = NULL;
-    H5FD_core_region_t *item    = NULL;
-    haddr_t     b_addr          = 0;
-    haddr_t     a_addr          = 0;
-    hbool_t     create_new_node = TRUE;
-    herr_t      ret_value       = SUCCEED;
+    H5FD_core_region_t *b_item          = NULL;
+    H5FD_core_region_t *a_item          = NULL;
+    H5FD_core_region_t *item            = NULL;
+    haddr_t             b_addr          = 0;
+    haddr_t             a_addr          = 0;
+    hbool_t             create_new_node = TRUE;
+    herr_t              ret_value       = SUCCEED;
 #ifdef DER
-    hbool_t     was_adjusted    = FALSE;
+    hbool_t was_adjusted = FALSE;
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -209,21 +206,21 @@ H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
     HDassert(start <= end);
 
 #ifdef DER
-HDfprintf(stderr, "Add region: (%llu, %llu)\n", start, end);
+    HDfprintf(stderr, "Add region: (%llu, %llu)\n", start, end);
 #endif
 
     /* Adjust the dirty region to the nearest block boundaries */
-    if(start % file->bstore_page_size != 0) {
+    if (start % file->bstore_page_size != 0) {
         start = (start / file->bstore_page_size) * file->bstore_page_size;
 #ifdef DER
         was_adjusted = TRUE;
 #endif
     }
-    if(end % file->bstore_page_size != (file->bstore_page_size - 1)) {
+    if (end % file->bstore_page_size != (file->bstore_page_size - 1)) {
         end = (((end / file->bstore_page_size) + 1) * file->bstore_page_size) - 1;
-        if(end > file->eof){
+        if (end > file->eof) {
 #ifdef DER
-HDfprintf(stderr, "Adjusted to EOF\n");
+            HDfprintf(stderr, "Adjusted to EOF\n");
 #endif
             end = file->eof - 1;
         }
@@ -233,27 +230,27 @@ HDfprintf(stderr, "Adjusted to EOF\n");
     }
 
 #ifdef DER
-if(was_adjusted)
-    HDfprintf(stderr, "Adjusted region: (%llu, %llu)\n", start, end);
+    if (was_adjusted)
+        HDfprintf(stderr, "Adjusted region: (%llu, %llu)\n", start, end);
 #endif
 
     /* Get the regions before and after the intended insertion point */
-    b_addr = start +1;
+    b_addr = start + 1;
     a_addr = end + 2;
     b_item = (H5FD_core_region_t *)H5SL_less(file->dirty_list, &b_addr);
     a_item = (H5FD_core_region_t *)H5SL_less(file->dirty_list, &a_addr);
 
     /* Check to see if we need to extend the upper end of the NEW region */
-    if(a_item) {
-        if(start < a_item->start && end < a_item->end) {
+    if (a_item) {
+        if (start < a_item->start && end < a_item->end) {
 
             /* Extend the end of the NEW region to match the existing AFTER region */
             end = a_item->end;
         }
     }
     /* Attempt to extend the PREV region */
-    if(b_item) {
-        if(start <= b_item->end + 1) {
+    if (b_item) {
+        if (start <= b_item->end + 1) {
 
             /* Need to set this for the delete algorithm */
             start = b_item->start;
@@ -266,10 +263,10 @@ if(was_adjusted)
     }
 
     /* Remove any old nodes that are no longer needed */
-    while(a_item && a_item->start > start) {
+    while (a_item && a_item->start > start) {
 
         H5FD_core_region_t *less;
-        haddr_t key = a_item->start - 1;
+        haddr_t             key = a_item->start - 1;
 
         /* Save the previous node before we trash this one */
         less = (H5FD_core_region_t *)H5SL_less(file->dirty_list, &key);
@@ -279,19 +276,20 @@ if(was_adjusted)
         a_item = H5FL_FREE(H5FD_core_region_t, a_item);
 
         /* Set up to check the next node */
-        if(less)
+        if (less)
             a_item = less;
     }
 
     /* Insert the new node */
-    if(create_new_node) {
-        if(NULL == (item = (H5FD_core_region_t *)H5SL_search(file->dirty_list, &start))) {
+    if (create_new_node) {
+        if (NULL == (item = (H5FD_core_region_t *)H5SL_search(file->dirty_list, &start))) {
             /* Ok to insert.  No pre-existing node with that key. */
-            item = (H5FD_core_region_t *)H5FL_CALLOC(H5FD_core_region_t);
+            item        = (H5FD_core_region_t *)H5FL_CALLOC(H5FD_core_region_t);
             item->start = start;
-            item->end = end;
-            if(H5SL_insert(file->dirty_list, item, &item->start) < 0)
-                HGOTO_ERROR(H5E_SLIST, H5E_CANTINSERT, FAIL, "can't insert new dirty region: (%llu, %llu)\n", start, end)
+            item->end   = end;
+            if (H5SL_insert(file->dirty_list, item, &item->start) < 0)
+                HGOTO_ERROR(H5E_SLIST, H5E_CANTINSERT, FAIL, "can't insert new dirty region: (%llu, %llu)\n",
+                            start, end)
         }
         else {
             /* Store the new item endpoint if it's bigger */
@@ -300,7 +298,7 @@ if(was_adjusted)
     }
     else {
         /* Update the size of the before region */
-        if(b_item->end < end)
+        if (b_item->end < end)
             b_item->end = end;
     }
 
@@ -308,7 +306,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_add_dirty_region() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_destroy_dirty_list
  *
@@ -328,20 +325,20 @@ H5FD_core_destroy_dirty_list(H5FD_core_t *file)
     HDassert(file);
 
     /* Destroy the list, including any remaining list elements */
-    if(file->dirty_list) {
+    if (file->dirty_list) {
         H5FD_core_region_t *region = NULL;
 
 #ifdef DER
-{
-size_t count = H5SL_count(file->dirty_list);
-if(count != 0)
-    HDfprintf(stderr, "LIST NOT EMPTY AT DESTROY\n");
-}
+        {
+            size_t count = H5SL_count(file->dirty_list);
+            if (count != 0)
+                HDfprintf(stderr, "LIST NOT EMPTY AT DESTROY\n");
+        }
 #endif
-        while(NULL != (region = (H5FD_core_region_t *)H5SL_remove_first(file->dirty_list)))
+        while (NULL != (region = (H5FD_core_region_t *)H5SL_remove_first(file->dirty_list)))
             region = H5FL_FREE(H5FD_core_region_t, region);
 
-        if(H5SL_close(file->dirty_list) < 0)
+        if (H5SL_close(file->dirty_list) < 0)
             HGOTO_ERROR(H5E_SLIST, H5E_CLOSEERROR, FAIL, "can't close core vfd dirty list")
         file->dirty_list = NULL;
     }
@@ -350,7 +347,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_destroy_dirty_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_write_to_bstore
  *
@@ -360,50 +356,57 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t H5FD_core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size)
+static herr_t
+H5FD_core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size)
 {
-    unsigned char  *ptr         = file->mem + addr;     /* mutable pointer into the
-                                                         * buffer (can't change mem)
-                                                         */
-    herr_t          ret_value   = SUCCEED;              /* Return value */
+    unsigned char *ptr = file->mem + addr; /* mutable pointer into the
+                                            * buffer (can't change mem)
+                                            */
+    herr_t ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(file);
 
     /* Write to backing store */
-    if((off_t)addr != HDlseek(file->fd, (off_t)addr, SEEK_SET))
+    if ((off_t)addr != HDlseek(file->fd, (off_t)addr, SEEK_SET))
         HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "error seeking in backing store")
 
     while (size > 0) {
 
-        h5_posix_io_t       bytes_in        = 0;    /* # of bytes to write  */
-        h5_posix_io_ret_t   bytes_wrote     = -1;   /* # of bytes written   */
+        h5_posix_io_t     bytes_in    = 0;  /* # of bytes to write  */
+        h5_posix_io_ret_t bytes_wrote = -1; /* # of bytes written   */
 
         /* Trying to write more bytes than the return type can handle is
          * undefined behavior in POSIX.
          */
-        if(size > H5_POSIX_MAX_IO_BYTES)
+        if (size > H5_POSIX_MAX_IO_BYTES)
             bytes_in = H5_POSIX_MAX_IO_BYTES;
         else
             bytes_in = (h5_posix_io_t)size;
 
 #ifdef DER
-HDfprintf(stderr, "\nNEW\n");
+        HDfprintf(stderr, "\nNEW\n");
 #endif
         do {
             bytes_wrote = HDwrite(file->fd, ptr, bytes_in);
 #ifdef DER
-HDfprintf(stderr, "bytes wrote: %lu\n", bytes_wrote);
+            HDfprintf(stderr, "bytes wrote: %lu\n", bytes_wrote);
 #endif
-        } while(-1 == bytes_wrote && EINTR == errno);
+        } while (-1 == bytes_wrote && EINTR == errno);
 
-        if(-1 == bytes_wrote) { /* error */
-            int myerrno = errno;
-            time_t mytime = HDtime(NULL);
+        if (-1 == bytes_wrote) { /* error */
+            int     myerrno  = errno;
+            time_t  mytime   = HDtime(NULL);
             HDoff_t myoffset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
-            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write to backing store failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', ptr = %p, total write size = %llu, bytes this sub-write = %llu, bytes actually written = %llu, offset = %llu", HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno), ptr, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_wrote, (unsigned long long)myoffset);
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
+                        "write to backing store failed: time = %s, filename = '%s', file descriptor = %d, "
+                        "errno = %d, error message = '%s', ptr = %p, total write size = %llu, bytes this "
+                        "sub-write = %llu, bytes actually written = %llu, offset = %llu",
+                        HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno), ptr,
+                        (unsigned long long)size, (unsigned long long)bytes_in,
+                        (unsigned long long)bytes_wrote, (unsigned long long)myoffset);
         } /* end if */
 
         HDassert(bytes_wrote > 0);
@@ -419,7 +422,6 @@ done:
 
 } /* end H5FD_core_write_to_bstore() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_init_interface
  *
@@ -438,7 +440,6 @@ H5FD_core_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_core_init())
 } /* H5FD_core_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_init
  *
@@ -456,12 +457,12 @@ H5FD_core_init_interface(void)
 hid_t
 H5FD_core_init(void)
 {
-    hid_t ret_value = H5FD_CORE_g;  /* Return value */
+    hid_t ret_value = H5FD_CORE_g; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5I_VFL != H5I_get_type(H5FD_CORE_g))
-        H5FD_CORE_g = H5FD_register(&H5FD_core_g,sizeof(H5FD_class_t),FALSE);
+    if (H5I_VFL != H5I_get_type(H5FD_CORE_g))
+        H5FD_CORE_g = H5FD_register(&H5FD_core_g, sizeof(H5FD_class_t), FALSE);
 
     /* Set return value */
     ret_value = H5FD_CORE_g;
@@ -470,7 +471,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD_core_term
  *
@@ -494,7 +494,6 @@ H5FD_core_term(void)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5FD_core_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_core
  *
@@ -512,27 +511,26 @@ H5FD_core_term(void)
 herr_t
 H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store)
 {
-    H5FD_core_fapl_t    fa;
-    H5P_genplist_t      *plist;         /* Property list pointer */
-    herr_t              ret_value;
+    H5FD_core_fapl_t fa;
+    H5P_genplist_t * plist; /* Property list pointer */
+    herr_t           ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "izb", fapl_id, increment, backing_store);
 
     /* Check argument */
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
-    fa.increment = increment;
+    fa.increment     = increment;
     fa.backing_store = backing_store;
 
-    ret_value= H5P_set_driver(plist, H5FD_CORE, &fa);
+    ret_value = H5P_set_driver(plist, H5FD_CORE, &fa);
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_fapl_core
  *
@@ -548,18 +546,18 @@ done:
 herr_t
 H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, hbool_t *backing_store /*out*/)
 {
-    H5FD_core_fapl_t    *fa;
-    H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5FD_core_fapl_t *fa;
+    H5P_genplist_t *  plist;               /* Property list pointer */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", fapl_id, increment, backing_store);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
-    if(H5FD_CORE != H5P_get_driver(plist))
+    if (H5FD_CORE != H5P_get_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
-    if(NULL == (fa = (H5FD_core_fapl_t *)H5P_get_driver_info(plist)))
+    if (NULL == (fa = (H5FD_core_fapl_t *)H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
 
     if (increment)
@@ -571,7 +569,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_fapl_get
  *
@@ -589,16 +586,16 @@ done:
 static void *
 H5FD_core_fapl_get(H5FD_t *_file)
 {
-    H5FD_core_t         *file = (H5FD_core_t*)_file;
-    H5FD_core_fapl_t    *fa;
-    void                *ret_value;     /* Return value */
+    H5FD_core_t *     file = (H5FD_core_t *)_file;
+    H5FD_core_fapl_t *fa;
+    void *            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(NULL == (fa = (H5FD_core_fapl_t *)H5MM_calloc(sizeof(H5FD_core_fapl_t))))
+    if (NULL == (fa = (H5FD_core_fapl_t *)H5MM_calloc(sizeof(H5FD_core_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
-    fa->increment = file->increment;
+    fa->increment     = file->increment;
     fa->backing_store = (hbool_t)(file->fd >= 0);
 
     /* Set return value */
@@ -608,7 +605,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_open
  *
@@ -628,77 +624,80 @@ done:
 static H5FD_t *
 H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    int                 o_flags;
-    H5FD_core_t         *file = NULL;
-    H5FD_core_fapl_t    *fa = NULL;
-    H5P_genplist_t      *plist;         /* Property list pointer */
+    int               o_flags;
+    H5FD_core_t *     file = NULL;
+    H5FD_core_fapl_t *fa   = NULL;
+    H5P_genplist_t *  plist; /* Property list pointer */
 #ifdef H5_HAVE_WIN32_API
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
-    h5_stat_t           sb;
-    int                 fd = -1;
-    H5FD_file_image_info_t  file_image_info;
-    H5FD_t              *ret_value;
+    h5_stat_t              sb;
+    int                    fd = -1;
+    H5FD_file_image_info_t file_image_info;
+    H5FD_t *               ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check arguments */
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if(0 == maxaddr || HADDR_UNDEF == maxaddr)
+    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-    if(ADDR_OVERFLOW(maxaddr))
+    if (ADDR_OVERFLOW(maxaddr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "maxaddr overflow")
     HDassert(H5P_DEFAULT != fapl_id);
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
-    if(NULL == (fa = (H5FD_core_fapl_t *)H5P_get_driver_info(plist)))
+    if (NULL == (fa = (H5FD_core_fapl_t *)H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
 
     /* Build the open flags */
     o_flags = (H5F_ACC_RDWR & flags) ? O_RDWR : O_RDONLY;
-    if(H5F_ACC_TRUNC & flags) o_flags |= O_TRUNC;
-    if(H5F_ACC_CREAT & flags) o_flags |= O_CREAT;
-    if(H5F_ACC_EXCL & flags) o_flags |= O_EXCL;
+    if (H5F_ACC_TRUNC & flags)
+        o_flags |= O_TRUNC;
+    if (H5F_ACC_CREAT & flags)
+        o_flags |= O_CREAT;
+    if (H5F_ACC_EXCL & flags)
+        o_flags |= O_EXCL;
 
     /* Retrieve initial file image info */
-    if(H5P_get(plist, H5F_ACS_FILE_IMAGE_INFO_NAME, &file_image_info) < 0)
+    if (H5P_get(plist, H5F_ACS_FILE_IMAGE_INFO_NAME, &file_image_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get initial file image info")
 
     /* If the file image exists and this is an open, make sure the file doesn't exist */
     HDassert(((file_image_info.buffer != NULL) && (file_image_info.size > 0)) ||
              ((file_image_info.buffer == NULL) && (file_image_info.size == 0)));
     HDmemset(&sb, 0, sizeof(sb));
-    if((file_image_info.buffer != NULL) && !(H5F_ACC_CREAT & flags)) {
-        if(HDopen(name, o_flags, 0666) >= 0)
+    if ((file_image_info.buffer != NULL) && !(H5F_ACC_CREAT & flags)) {
+        if (HDopen(name, o_flags, 0666) >= 0)
             HGOTO_ERROR(H5E_FILE, H5E_FILEEXISTS, NULL, "file already exists")
 
         /* If backing store is requested, create and stat the file
          * Note: We are forcing the O_CREAT flag here, even though this is
          * technically an open.
          */
-        if(fa->backing_store) {
-            if((fd = HDopen(name, o_flags | O_CREAT, 0666)) < 0)
+        if (fa->backing_store) {
+            if ((fd = HDopen(name, o_flags | O_CREAT, 0666)) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to create file")
-            if(HDfstat(fd, &sb) < 0)
+            if (HDfstat(fd, &sb) < 0)
                 HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, NULL, "unable to fstat file")
         } /* end if */
-    }  /* end if */
+    }     /* end if */
     /* Open backing store, and get stat() from file.  The only case that backing
      * store is off is when  the backing_store flag is off and H5F_ACC_CREAT is
      * on. */
-    else if(fa->backing_store || !(H5F_ACC_CREAT & flags)) {
-        if((fd = HDopen(name, o_flags, 0666)) < 0)
+    else if (fa->backing_store || !(H5F_ACC_CREAT & flags)) {
+        if ((fd = HDopen(name, o_flags, 0666)) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file")
-        if(HDfstat(fd, &sb) < 0)
+        if (HDfstat(fd, &sb) < 0)
             HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, NULL, "unable to fstat file")
     } /* end if */
 
     /* Create the new file struct */
-    if(NULL == (file = (H5FD_core_t *)H5MM_calloc(sizeof(H5FD_core_t))))
+    if (NULL == (file = (H5FD_core_t *)H5MM_calloc(sizeof(H5FD_core_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
     file->fd = fd;
-    if(name && *name)
+    if (name && *name)
         file->name = H5MM_xstrdup(name);
 
     /* The increment comes from either the file access property list or the
@@ -713,44 +712,45 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     /* Save file image callbacks */
     file->fi_callbacks = file_image_info.callbacks;
 
-    if(fd >= 0) {
+    if (fd >= 0) {
         /* Retrieve information for determining uniqueness of file */
 #ifdef H5_HAVE_WIN32_API
         file->hFile = (HANDLE)_get_osfhandle(fd);
-        if(INVALID_HANDLE_VALUE == file->hFile)
+        if (INVALID_HANDLE_VALUE == file->hFile)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to get Windows file handle")
 
-        if(!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo))
+        if (!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo))
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to get Windows file information")
 
-        file->nFileIndexHigh = fileinfo.nFileIndexHigh;
-        file->nFileIndexLow = fileinfo.nFileIndexLow;
+        file->nFileIndexHigh       = fileinfo.nFileIndexHigh;
+        file->nFileIndexLow        = fileinfo.nFileIndexLow;
         file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else  /* H5_HAVE_WIN32_API */
         file->device = sb.st_dev;
-        file->inode = sb.st_ino;
+        file->inode  = sb.st_ino;
 #endif /* H5_HAVE_WIN32_API */
-    } /* end if */
+    }  /* end if */
 
     /* If an existing file is opened, load the whole file into memory. */
-    if(!(H5F_ACC_CREAT & flags)) {
+    if (!(H5F_ACC_CREAT & flags)) {
         size_t size;
 
         /* Retrieve file size */
-        if(file_image_info.buffer && file_image_info.size > 0)
+        if (file_image_info.buffer && file_image_info.size > 0)
             size = file_image_info.size;
         else
             size = (size_t)sb.st_size;
 
         /* Check if we should allocate the memory buffer and read in existing data */
-        if(size) {
+        if (size) {
             /* Allocate memory for the file's data, using the file image callback if available. */
-            if(file->fi_callbacks.image_malloc) {
-                if(NULL == (file->mem = (unsigned char*)file->fi_callbacks.image_malloc(size, H5FD_FILE_IMAGE_OP_FILE_OPEN, file->fi_callbacks.udata)))
+            if (file->fi_callbacks.image_malloc) {
+                if (NULL == (file->mem = (unsigned char *)file->fi_callbacks.image_malloc(
+                                 size, H5FD_FILE_IMAGE_OP_FILE_OPEN, file->fi_callbacks.udata)))
                     HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, NULL, "image malloc callback failed")
             } /* end if */
             else {
-                if(NULL == (file->mem = (unsigned char*)H5MM_malloc(size)))
+                if (NULL == (file->mem = (unsigned char *)H5MM_malloc(size)))
                     HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, NULL, "unable to allocate memory block")
             } /* end else */
 
@@ -758,9 +758,11 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
             file->eof = size;
 
             /* If there is an initial file image, copy it, using the callback if possible */
-            if(file_image_info.buffer && file_image_info.size > 0) {
-                if(file->fi_callbacks.image_memcpy) {
-                    if(file->mem != file->fi_callbacks.image_memcpy(file->mem, file_image_info.buffer, size, H5FD_FILE_IMAGE_OP_FILE_OPEN, file->fi_callbacks.udata))
+            if (file_image_info.buffer && file_image_info.size > 0) {
+                if (file->fi_callbacks.image_memcpy) {
+                    if (file->mem != file->fi_callbacks.image_memcpy(file->mem, file_image_info.buffer, size,
+                                                                     H5FD_FILE_IMAGE_OP_FILE_OPEN,
+                                                                     file->fi_callbacks.udata))
                         HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, NULL, "image_memcpy callback failed")
                 } /* end if */
                 else
@@ -774,28 +776,35 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 
                 uint8_t *mem = file->mem; /* memory pointer for writes */
 
-                while(size > 0) {
-                    h5_posix_io_t       bytes_in        = 0;    /* # of bytes to read       */
-                    h5_posix_io_ret_t   bytes_read      = -1;   /* # of bytes actually read */
+                while (size > 0) {
+                    h5_posix_io_t     bytes_in   = 0;  /* # of bytes to read       */
+                    h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */
 
                     /* Trying to read more bytes than the return type can handle is
                      * undefined behavior in POSIX.
                      */
-                    if(size > H5_POSIX_MAX_IO_BYTES)
+                    if (size > H5_POSIX_MAX_IO_BYTES)
                         bytes_in = H5_POSIX_MAX_IO_BYTES;
                     else
                         bytes_in = (h5_posix_io_t)size;
 
                     do {
                         bytes_read = HDread(file->fd, mem, bytes_in);
-                    } while(-1 == bytes_read && EINTR == errno);
+                    } while (-1 == bytes_read && EINTR == errno);
 
-                    if(-1 == bytes_read) { /* error */
-                        int myerrno = errno;
-                        time_t mytime = HDtime(NULL);
+                    if (-1 == bytes_read) { /* error */
+                        int     myerrno  = errno;
+                        time_t  mytime   = HDtime(NULL);
                         HDoff_t myoffset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
-                        HGOTO_ERROR(H5E_IO, H5E_READERROR, NULL, "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', file->mem = %p, total read size = %llu, bytes this sub-read = %llu, bytes actually read = %llu, offset = %llu", HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno), file->mem, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_read, (unsigned long long)myoffset);
+                        HGOTO_ERROR(
+                            H5E_IO, H5E_READERROR, NULL,
+                            "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
+                            "error message = '%s', file->mem = %p, total read size = %llu, bytes this "
+                            "sub-read = %llu, bytes actually read = %llu, offset = %llu",
+                            HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno), file->mem,
+                            (unsigned long long)size, (unsigned long long)bytes_in,
+                            (unsigned long long)bytes_read, (unsigned long long)myoffset);
                     } /* end if */
 
                     HDassert(bytes_read >= 0);
@@ -804,22 +813,22 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
                     mem += bytes_read;
                     size -= (size_t)bytes_read;
                 } /* end while */
-            } /* end else */
-        } /* end if */
-    } /* end if */
+            }     /* end else */
+        }         /* end if */
+    }             /* end if */
 
     /* Set up write tracking if the backing store is on */
     file->dirty_list = NULL;
-    if(fa->backing_store) {
-        hbool_t write_tracking_flag = FALSE;    /* what the user asked for */
-        hbool_t use_write_tracking = FALSE;     /* what we're actually doing */
+    if (fa->backing_store) {
+        hbool_t write_tracking_flag = FALSE; /* what the user asked for */
+        hbool_t use_write_tracking  = FALSE; /* what we're actually doing */
 
         /* Get the write tracking flag */
-        if(H5P_get(plist, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, &write_tracking_flag) < 0)
+        if (H5P_get(plist, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, &write_tracking_flag) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get core VFD write tracking flag");
 
         /* Get the page size */
-        if(H5P_get(plist, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, &(file->bstore_page_size)) < 0)
+        if (H5P_get(plist, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, &(file->bstore_page_size)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get core VFD write tracking page size");
 
         /* default is to have write tracking OFF for create (hence the check to see
@@ -827,27 +836,26 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
          * on open (when not read-only).
          */
         /* Only use write tracking if the file is open for writing */
-        use_write_tracking =
-            TRUE == write_tracking_flag         /* user asked for write tracking */
-            && !(o_flags & O_RDONLY)            /* file is open for writing (i.e. not read-only) */
-            && file->bstore_page_size != 0;     /* page size is not zero */
+        use_write_tracking = TRUE == write_tracking_flag /* user asked for write tracking */
+                             && !(o_flags & O_RDONLY)    /* file is open for writing (i.e. not read-only) */
+                             && file->bstore_page_size != 0; /* page size is not zero */
 
         /* initialize the dirty list */
-        if(use_write_tracking) {
-            if(NULL == (file->dirty_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
+        if (use_write_tracking) {
+            if (NULL == (file->dirty_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
                 HGOTO_ERROR(H5E_SLIST, H5E_CANTCREATE, NULL, "can't create core vfd dirty region list");
 #ifdef DER
-HDfprintf(stderr, "\n");
+            HDfprintf(stderr, "\n");
 #endif
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Set return value */
     ret_value = (H5FD_t *)file;
 
 done:
-    if(!ret_value && file) {
-        if(file->fd >= 0)
+    if (!ret_value && file) {
+        if (file->fd >= 0)
             HDclose(file->fd);
         H5MM_xfree(file->name);
         H5MM_xfree(file->mem);
@@ -857,7 +865,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_close
  *
@@ -873,29 +880,30 @@ done:
 static herr_t
 H5FD_core_close(H5FD_t *_file)
 {
-    H5FD_core_t     *file = (H5FD_core_t*)_file;
-    herr_t          ret_value = SUCCEED;            /* Return value */
+    H5FD_core_t *file      = (H5FD_core_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Flush any changed buffers */
-    if(H5FD_core_flush(_file, (hid_t)-1, TRUE) < 0)
+    if (H5FD_core_flush(_file, (hid_t)-1, TRUE) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush core vfd backing store")
 
     /* Destroy the dirty region list */
-    if(file->dirty_list)
-        if(H5FD_core_destroy_dirty_list(file) != SUCCEED)
+    if (file->dirty_list)
+        if (H5FD_core_destroy_dirty_list(file) != SUCCEED)
             HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "unable to free core vfd dirty region list")
 
     /* Release resources */
-    if(file->fd >= 0)
+    if (file->fd >= 0)
         HDclose(file->fd);
-    if(file->name)
+    if (file->name)
         H5MM_xfree(file->name);
-    if(file->mem) {
+    if (file->mem) {
         /* Use image callback if available */
-        if(file->fi_callbacks.image_free) {
-            if(file->fi_callbacks.image_free(file->mem, H5FD_FILE_IMAGE_OP_FILE_CLOSE, file->fi_callbacks.udata) < 0)
+        if (file->fi_callbacks.image_free) {
+            if (file->fi_callbacks.image_free(file->mem, H5FD_FILE_IMAGE_OP_FILE_CLOSE,
+                                              file->fi_callbacks.udata) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "image_free callback failed")
         } /* end if */
         else
@@ -908,7 +916,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_cmp
  *
@@ -930,54 +937,66 @@ done:
 static int
 H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_core_t   *f1 = (const H5FD_core_t*)_f1;
-    const H5FD_core_t   *f2 = (const H5FD_core_t*)_f2;
-    int                 ret_value = 0;
+    const H5FD_core_t *f1        = (const H5FD_core_t *)_f1;
+    const H5FD_core_t *f2        = (const H5FD_core_t *)_f2;
+    int                ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(f1->fd >= 0 && f2->fd >= 0) {
+    if (f1->fd >= 0 && f2->fd >= 0) {
         /* Compare low level file information for backing store */
 #ifdef H5_HAVE_WIN32_API
-        if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) HGOTO_DONE(-1)
-        if(f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber) HGOTO_DONE(1)
+        if (f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber)
+            HGOTO_DONE(-1)
+        if (f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber)
+            HGOTO_DONE(1)
 
-        if(f1->nFileIndexHigh < f2->nFileIndexHigh) HGOTO_DONE(-1)
-        if(f1->nFileIndexHigh > f2->nFileIndexHigh) HGOTO_DONE(1)
+        if (f1->nFileIndexHigh < f2->nFileIndexHigh)
+            HGOTO_DONE(-1)
+        if (f1->nFileIndexHigh > f2->nFileIndexHigh)
+            HGOTO_DONE(1)
 
-        if(f1->nFileIndexLow < f2->nFileIndexLow) HGOTO_DONE(-1)
-        if(f1->nFileIndexLow > f2->nFileIndexLow) HGOTO_DONE(1)
+        if (f1->nFileIndexLow < f2->nFileIndexLow)
+            HGOTO_DONE(-1)
+        if (f1->nFileIndexLow > f2->nFileIndexLow)
+            HGOTO_DONE(1)
 
 #else
 #ifdef H5_DEV_T_IS_SCALAR
-        if (f1->device < f2->device) HGOTO_DONE(-1)
-        if (f1->device > f2->device) HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+        if (f1->device < f2->device)
+            HGOTO_DONE(-1)
+        if (f1->device > f2->device)
+            HGOTO_DONE(1)
+#else  /* H5_DEV_T_IS_SCALAR */
         /* If dev_t isn't a scalar value on this system, just use memcmp to
          * determine if the values are the same or not.  The actual return value
          * shouldn't really matter...
          */
-        if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t))<0) HGOTO_DONE(-1)
-        if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t))>0) HGOTO_DONE(1)
+        if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0)
+            HGOTO_DONE(-1)
+        if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0)
+            HGOTO_DONE(1)
 #endif /* H5_DEV_T_IS_SCALAR */
 
-        if (f1->inode < f2->inode) HGOTO_DONE(-1)
-        if (f1->inode > f2->inode) HGOTO_DONE(1)
+        if (f1->inode < f2->inode)
+            HGOTO_DONE(-1)
+        if (f1->inode > f2->inode)
+            HGOTO_DONE(1)
 
 #endif /*H5_HAVE_WIN32_API*/
-    } /* end if */
+    }  /* end if */
     else {
-        if (NULL==f1->name && NULL==f2->name) {
-            if (f1<f2)
+        if (NULL == f1->name && NULL == f2->name) {
+            if (f1 < f2)
                 HGOTO_DONE(-1)
-            if (f1>f2)
+            if (f1 > f2)
                 HGOTO_DONE(1)
             HGOTO_DONE(0)
         } /* end if */
 
-        if (NULL==f1->name)
+        if (NULL == f1->name)
             HGOTO_DONE(-1)
-        if (NULL==f2->name)
+        if (NULL == f2->name)
             HGOTO_DONE(1)
 
         ret_value = HDstrcmp(f1->name, f2->name);
@@ -987,7 +1006,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_query
  *
@@ -1002,9 +1020,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_core_query(const H5FD_t * _file, unsigned long *flags /* out */)
+H5FD_core_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
-    const H5FD_core_t   *file = (const H5FD_core_t*)_file;
+    const H5FD_core_t *file = (const H5FD_core_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1028,7 +1046,6 @@ H5FD_core_query(const H5FD_t * _file, unsigned long *flags /* out */)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_core_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_get_eoa
  *
@@ -1046,14 +1063,13 @@ H5FD_core_query(const H5FD_t * _file, unsigned long *flags /* out */)
 static haddr_t
 H5FD_core_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_core_t   *file = (const H5FD_core_t*)_file;
+    const H5FD_core_t *file = (const H5FD_core_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(file->eoa)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_set_eoa
  *
@@ -1071,12 +1087,12 @@ H5FD_core_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD_core_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
-    H5FD_core_t *file = (H5FD_core_t*)_file;
-    herr_t      ret_value = SUCCEED;            /* Return value */
+    H5FD_core_t *file      = (H5FD_core_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(ADDR_OVERFLOW(addr))
+    if (ADDR_OVERFLOW(addr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "address overflow")
 
     file->eoa = addr;
@@ -1085,7 +1101,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_set_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_get_eof
  *
@@ -1105,14 +1120,13 @@ done:
 static haddr_t
 H5FD_core_get_eof(const H5FD_t *_file)
 {
-    const H5FD_core_t   *file = (const H5FD_core_t*)_file;
+    const H5FD_core_t *file = (const H5FD_core_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD_core_get_handle
  *
@@ -1126,38 +1140,38 @@ H5FD_core_get_eof(const H5FD_t *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_core_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
+H5FD_core_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
 {
-    H5FD_core_t *file = (H5FD_core_t *)_file;   /* core VFD info */
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    H5FD_core_t *file      = (H5FD_core_t *)_file; /* core VFD info */
+    herr_t       ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
-    if(!file_handle)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
+    if (!file_handle)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
 
     /* Check for non-default FAPL */
-    if(H5P_FILE_ACCESS_DEFAULT != fapl && H5P_DEFAULT != fapl) {
-        H5P_genplist_t *plist;  /* Property list pointer */
+    if (H5P_FILE_ACCESS_DEFAULT != fapl && H5P_DEFAULT != fapl) {
+        H5P_genplist_t *plist; /* Property list pointer */
 
         /* Get the FAPL */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl)))
             HGOTO_ERROR(H5E_VFL, H5E_BADTYPE, FAIL, "not a file access property list")
 
         /* Check if private property for retrieving the backing store POSIX
          * file descriptor is set.  (This should not be set except within the
          * library)  QAK - 2009/12/04
          */
-        if(H5P_exist_plist(plist, H5F_ACS_WANT_POSIX_FD_NAME) > 0) {
-            hbool_t want_posix_fd;  /* Setting for retrieving file descriptor from core VFD */
+        if (H5P_exist_plist(plist, H5F_ACS_WANT_POSIX_FD_NAME) > 0) {
+            hbool_t want_posix_fd; /* Setting for retrieving file descriptor from core VFD */
 
             /* Get property */
-            if(H5P_get(plist, H5F_ACS_WANT_POSIX_FD_NAME, &want_posix_fd) < 0)
+            if (H5P_get(plist, H5F_ACS_WANT_POSIX_FD_NAME, &want_posix_fd) < 0)
                 HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get property of retrieving file descriptor")
 
             /* If property is set, pass back the file descriptor instead of the memory address */
-            if(want_posix_fd)
+            if (want_posix_fd)
                 *file_handle = &(file->fd);
             else
                 *file_handle = &(file->mem);
@@ -1172,7 +1186,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_get_handle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_read
  *
@@ -1192,10 +1205,10 @@ done:
  */
 static herr_t
 H5FD_core_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
-        size_t size, void *buf/*out*/)
+               size_t size, void *buf /*out*/)
 {
-    H5FD_core_t  *file = (H5FD_core_t*)_file;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5FD_core_t *file      = (H5FD_core_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1214,11 +1227,11 @@ H5FD_core_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
 #ifndef NDEBUG
         hsize_t temp_nbytes;
 
-        temp_nbytes = file->eof-addr;
-        H5_CHECK_OVERFLOW(temp_nbytes,hsize_t,size_t);
-        nbytes = MIN(size,(size_t)temp_nbytes);
-#else /* NDEBUG */
-        nbytes = MIN(size,(size_t)(file->eof-addr));
+        temp_nbytes = file->eof - addr;
+        H5_CHECK_OVERFLOW(temp_nbytes, hsize_t, size_t);
+        nbytes = MIN(size, (size_t)temp_nbytes);
+#else  /* NDEBUG */
+        nbytes = MIN(size, (size_t)(file->eof - addr));
 #endif /* NDEBUG */
 
         HDmemcpy(buf, file->mem + addr, nbytes);
@@ -1235,7 +1248,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_write
  *
@@ -1252,10 +1264,10 @@ done:
  */
 static herr_t
 H5FD_core_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
-        size_t size, const void *buf)
+                size_t size, const void *buf)
 {
-    H5FD_core_t *file = (H5FD_core_t*)_file;
-    herr_t      ret_value = SUCCEED;            /* Return value */
+    H5FD_core_t *file      = (H5FD_core_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1263,7 +1275,7 @@ H5FD_core_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
     HDassert(buf);
 
     /* Check for overflow conditions */
-    if(REGION_OVERFLOW(addr, size))
+    if (REGION_OVERFLOW(addr, size))
         HGOTO_ERROR(H5E_IO, H5E_OVERFLOW, FAIL, "file address overflowed")
 
     /*
@@ -1272,23 +1284,27 @@ H5FD_core_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
      * careful of non-Posix realloc() that doesn't understand what to do when
      * the first argument is null.
      */
-    if(addr + size > file->eof) {
+    if (addr + size > file->eof) {
         unsigned char *x;
-        size_t new_eof;
+        size_t         new_eof;
 
         /* Determine new size of memory buffer */
         H5_CHECKED_ASSIGN(new_eof, size_t, file->increment * ((addr + size) / file->increment), hsize_t);
-        if((addr + size) % file->increment)
+        if ((addr + size) % file->increment)
             new_eof += file->increment;
 
         /* (Re)allocate memory for the file buffer, using callbacks if available */
-        if(file->fi_callbacks.image_realloc) {
-            if(NULL == (x = (unsigned char *)file->fi_callbacks.image_realloc(file->mem, new_eof, H5FD_FILE_IMAGE_OP_FILE_RESIZE, file->fi_callbacks.udata)))
-                HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "unable to allocate memory block of %llu bytes with callback", (unsigned long long)new_eof)
+        if (file->fi_callbacks.image_realloc) {
+            if (NULL == (x = (unsigned char *)file->fi_callbacks.image_realloc(
+                             file->mem, new_eof, H5FD_FILE_IMAGE_OP_FILE_RESIZE, file->fi_callbacks.udata)))
+                HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL,
+                            "unable to allocate memory block of %llu bytes with callback",
+                            (unsigned long long)new_eof)
         } /* end if */
         else {
-            if(NULL == (x = (unsigned char *)H5MM_realloc(file->mem, new_eof)))
-                HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "unable to allocate memory block of %llu bytes", (unsigned long long)new_eof)
+            if (NULL == (x = (unsigned char *)H5MM_realloc(file->mem, new_eof)))
+                HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "unable to allocate memory block of %llu bytes",
+                            (unsigned long long)new_eof)
         } /* end else */
 
 #ifdef H5_CLEAR_MEMORY
@@ -1300,11 +1316,14 @@ H5FD_core_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
     } /* end if */
 
     /* Add the buffer region to the dirty list if using that optimization */
-    if(file->dirty_list) {
+    if (file->dirty_list) {
         haddr_t start = addr;
-        haddr_t end = addr + (haddr_t)size - 1;
-        if(H5FD_core_add_dirty_region(file, start, end) != SUCCEED)
-            HGOTO_ERROR(H5E_VFL, H5E_CANTINSERT, FAIL, "unable to add core VFD dirty region during write call - addresses: start=%llu end=%llu", start, end)
+        haddr_t end   = addr + (haddr_t)size - 1;
+        if (H5FD_core_add_dirty_region(file, start, end) != SUCCEED)
+            HGOTO_ERROR(
+                H5E_VFL, H5E_CANTINSERT, FAIL,
+                "unable to add core VFD dirty region during write call - addresses: start=%llu end=%llu",
+                start, end)
     }
 
     /* Write from BUF to memory */
@@ -1317,7 +1336,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_flush
  *
@@ -1334,8 +1352,8 @@ done:
 static herr_t
 H5FD_core_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned H5_ATTR_UNUSED closing)
 {
-    H5FD_core_t *file = (H5FD_core_t*)_file;
-    herr_t      ret_value = SUCCEED;            /* Return value */
+    H5FD_core_t *file      = (H5FD_core_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1343,44 +1361,43 @@ H5FD_core_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned H5_ATTR_UN
     if (file->dirty && file->fd >= 0 && file->backing_store) {
 
         /* Use the dirty list, if available */
-        if(file->dirty_list) {
+        if (file->dirty_list) {
             H5FD_core_region_t *item = NULL;
-            size_t size;
+            size_t              size;
 
 #ifdef DER
-    HDfprintf(stderr, "FLUSHING. DIRTY LIST:\n");
+            HDfprintf(stderr, "FLUSHING. DIRTY LIST:\n");
 #endif
-            while(NULL != (item = (H5FD_core_region_t *)H5SL_remove_first(file->dirty_list))) {
+            while (NULL != (item = (H5FD_core_region_t *)H5SL_remove_first(file->dirty_list))) {
 
                 /* The file may have been truncated, so check for that
                  * and skip or adjust as necessary.
                  */
-                if(item->start < file->eof) {
-                    if(item->end >= file->eof)
+                if (item->start < file->eof) {
+                    if (item->end >= file->eof)
                         item->end = file->eof - 1;
                     size = (size_t)((item->end - item->start) + 1);
 #ifdef DER
-HDfprintf(stderr, "(%llu, %llu : %lu)\n", item->start, item->end, size);
+                    HDfprintf(stderr, "(%llu, %llu : %lu)\n", item->start, item->end, size);
 #endif
-                    if(H5FD_core_write_to_bstore(file, item->start, size) != SUCCEED)
+                    if (H5FD_core_write_to_bstore(file, item->start, size) != SUCCEED)
                         HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "unable to write to backing store")
                 } /* end if */
 
                 item = H5FL_FREE(H5FD_core_region_t, item);
             } /* end while */
 
-
 #ifdef DER
-HDfprintf(stderr, "EOF: %llu\n", file->eof);
-HDfprintf(stderr, "EOA: %llu\n", file->eoa);
-if(file->eoa > file->eof)
-    HDfprintf(stderr, "*** EOA BADNESS ***\n");
-HDfprintf(stderr, "\n");
+            HDfprintf(stderr, "EOF: %llu\n", file->eof);
+            HDfprintf(stderr, "EOA: %llu\n", file->eoa);
+            if (file->eoa > file->eof)
+                HDfprintf(stderr, "*** EOA BADNESS ***\n");
+            HDfprintf(stderr, "\n");
 #endif
         }
         /* Otherwise, write the entire file out at once */
         else {
-            if(H5FD_core_write_to_bstore(file, (haddr_t)0, (size_t)file->eof) != SUCCEED)
+            if (H5FD_core_write_to_bstore(file, (haddr_t)0, (size_t)file->eof) != SUCCEED)
                 HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "unable to write to backing store")
 
         } /* end while */
@@ -1392,7 +1409,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_truncate
  *
@@ -1431,54 +1447,57 @@ done:
 static herr_t
 H5FD_core_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 {
-    H5FD_core_t *file = (H5FD_core_t*)_file;
-    size_t new_eof;                             /* New size of memory buffer */
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    H5FD_core_t *file = (H5FD_core_t *)_file;
+    size_t       new_eof;             /* New size of memory buffer */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(file);
 
     /* if we are closing and not using backing store, do nothing */
-    if(!closing || file->backing_store) {
-        if(closing) /* set eof to eoa */
+    if (!closing || file->backing_store) {
+        if (closing) /* set eof to eoa */
             new_eof = file->eoa;
         else { /* set eof to smallest multiple of increment that exceeds eoa */
             /* Determine new size of memory buffer */
             H5_CHECKED_ASSIGN(new_eof, size_t, file->increment * (file->eoa / file->increment), hsize_t);
-            if(file->eoa % file->increment)
+            if (file->eoa % file->increment)
                 new_eof += file->increment;
         } /* end else */
 
         /* Extend the file to make sure it's large enough */
-        if(!H5F_addr_eq(file->eof, (haddr_t)new_eof)) {
-            unsigned char *x;       /* Pointer to new buffer for file data */
+        if (!H5F_addr_eq(file->eof, (haddr_t)new_eof)) {
+            unsigned char *x; /* Pointer to new buffer for file data */
 
             /* (Re)allocate memory for the file buffer, using callback if available */
-            if(file->fi_callbacks.image_realloc) {
-                if(NULL == (x = (unsigned char *)file->fi_callbacks.image_realloc(file->mem, new_eof, H5FD_FILE_IMAGE_OP_FILE_RESIZE, file->fi_callbacks.udata)))
-                  HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "unable to allocate memory block with callback")
+            if (file->fi_callbacks.image_realloc) {
+                if (NULL ==
+                    (x = (unsigned char *)file->fi_callbacks.image_realloc(
+                         file->mem, new_eof, H5FD_FILE_IMAGE_OP_FILE_RESIZE, file->fi_callbacks.udata)))
+                    HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL,
+                                "unable to allocate memory block with callback")
             } /* end if */
             else {
-                if(NULL == (x = (unsigned char *)H5MM_realloc(file->mem, new_eof)))
+                if (NULL == (x = (unsigned char *)H5MM_realloc(file->mem, new_eof)))
                     HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "unable to allocate memory block")
             } /* end else */
 
 #ifdef H5_CLEAR_MEMORY
-            if(file->eof < new_eof)
+            if (file->eof < new_eof)
                 HDmemset(x + file->eof, 0, (size_t)(new_eof - file->eof));
 #endif /* H5_CLEAR_MEMORY */
             file->mem = x;
 
             /* Update backing store, if using it and if closing */
-            if(closing && (file->fd >= 0) && file->backing_store) {
+            if (closing && (file->fd >= 0) && file->backing_store) {
 #ifdef H5_HAVE_WIN32_API
-                LARGE_INTEGER   li;         /* 64-bit (union) integer for SetFilePointer() call */
-                DWORD           dwPtrLow;   /* Low-order pointer bits from SetFilePointer()
-                                             * Only used as an error code here.
-                                             */
-                DWORD           dwError;    /* DWORD error code from GetLastError() */
-                BOOL            bError;     /* Boolean error flag */
+                LARGE_INTEGER li;       /* 64-bit (union) integer for SetFilePointer() call */
+                DWORD         dwPtrLow; /* Low-order pointer bits from SetFilePointer()
+                                         * Only used as an error code here.
+                                         */
+                DWORD dwError;          /* DWORD error code from GetLastError() */
+                BOOL  bError;           /* Boolean error flag */
 
                 /* Windows uses this odd QuadPart union for 32/64-bit portability */
                 li.QuadPart = (__int64)file->eoa;
@@ -1489,31 +1508,30 @@ H5FD_core_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
                  * from SetFilePointer(), we also need to check GetLastError().
                  */
                 dwPtrLow = SetFilePointer(file->hFile, li.LowPart, &li.HighPart, FILE_BEGIN);
-                if(INVALID_SET_FILE_POINTER == dwPtrLow) {
+                if (INVALID_SET_FILE_POINTER == dwPtrLow) {
                     dwError = GetLastError();
-                    if(dwError != NO_ERROR )
+                    if (dwError != NO_ERROR)
                         HGOTO_ERROR(H5E_FILE, H5E_FILEOPEN, FAIL, "unable to set file pointer")
                 }
 
                 bError = SetEndOfFile(file->hFile);
-                if(0 == bError)
+                if (0 == bError)
                     HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
-                if(-1 == HDftruncate(file->fd, (HDoff_t)new_eof))
+#else  /* H5_HAVE_WIN32_API */
+                if (-1 == HDftruncate(file->fd, (HDoff_t)new_eof))
                     HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
 #endif /* H5_HAVE_WIN32_API */
 
 #ifdef DER
-HDfprintf(stderr, "OLD: Truncated to: %llu\n", file->eoa);
+                HDfprintf(stderr, "OLD: Truncated to: %llu\n", file->eoa);
 #endif
             } /* end if */
 
             /* Update the eof value */
             file->eof = new_eof;
         } /* end if */
-    } /* end if(file->eof < file->eoa) */
+    }     /* end if(file->eof < file->eoa) */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_core_truncate() */
-
diff --git a/src/H5FDcore.h b/src/H5FDcore.h
index f2b0fb0..a733dd5 100644
--- a/src/H5FDcore.h
+++ b/src/H5FDcore.h
@@ -22,17 +22,15 @@
 
 #include "H5Ipublic.h"
 
-#define H5FD_CORE	(H5FD_core_init())
+#define H5FD_CORE (H5FD_core_init())
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-H5_DLL hid_t H5FD_core_init(void);
-H5_DLL void H5FD_core_term(void);
-H5_DLL herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment,
-				hbool_t backing_store);
-H5_DLL herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/,
-				hbool_t *backing_store/*out*/);
+H5_DLL hid_t  H5FD_core_init(void);
+H5_DLL void   H5FD_core_term(void);
+H5_DLL herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store);
+H5_DLL herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, hbool_t *backing_store /*out*/);
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c
index ff18c71..cd3767b 100644
--- a/src/H5FDdirect.c
+++ b/src/H5FDdirect.c
@@ -21,21 +21,21 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC  H5FD_direct_init_interface
+#define H5_INTERFACE_INIT_FUNC H5FD_direct_init_interface
 
 /* For system function posix_memalign - Commented it out because copper isn't able to compile
  * this file. */
 /* #define _XOPEN_SOURCE 600 */
 
-#include "H5private.h"    /* Generic Functions      */
-#include "H5Eprivate.h"    /* Error handling        */
-#include "H5Fprivate.h"    /* File access        */
-#include "H5FDprivate.h"  /* File drivers        */
-#include "H5FDdirect.h"    /* Direct file driver      */
-#include "H5FLprivate.h"  /* Free Lists                           */
-#include "H5Iprivate.h"    /* IDs            */
-#include "H5MMprivate.h"  /* Memory management      */
-#include "H5Pprivate.h"    /* Property lists      */
+#include "H5private.h"   /* Generic Functions      */
+#include "H5Eprivate.h"  /* Error handling        */
+#include "H5Fprivate.h"  /* File access        */
+#include "H5FDprivate.h" /* File drivers        */
+#include "H5FDdirect.h"  /* Direct file driver      */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs            */
+#include "H5MMprivate.h" /* Memory management      */
+#include "H5Pprivate.h"  /* Property lists      */
 
 #ifdef H5_HAVE_DIRECT
 
@@ -43,16 +43,16 @@
 static hid_t H5FD_DIRECT_g = 0;
 
 /* File operations */
-#define OP_UNKNOWN  0
+#define OP_UNKNOWN 0
 #define OP_READ    1
-#define OP_WRITE  2
+#define OP_WRITE   2
 
 /* Driver-specific file access properties */
 typedef struct H5FD_direct_fapl_t {
     size_t  mboundary;  /* Memory boundary for alignment    */
-    size_t  fbsize;    /* File system block size      */
-    size_t  cbsize;    /* Maximal buffer size for copying user data  */
-    hbool_t     must_align;     /* Decides if data alignment is required        */
+    size_t  fbsize;     /* File system block size      */
+    size_t  cbsize;     /* Maximal buffer size for copying user data  */
+    hbool_t must_align; /* Decides if data alignment is required        */
 } H5FD_direct_fapl_t;
 
 /*
@@ -68,20 +68,20 @@ typedef struct H5FD_direct_fapl_t {
  * occurs), and `op' will be set to H5F_OP_UNKNOWN.
  */
 typedef struct H5FD_direct_t {
-    H5FD_t  pub;      /*public stuff, must be first  */
-    int    fd;      /*the unix file      */
-    haddr_t  eoa;      /*end of allocated region  */
-    haddr_t  eof;      /*end of file; current file size*/
-    haddr_t  pos;      /*current file I/O position  */
-    int    op;      /*last operation    */
-    H5FD_direct_fapl_t  fa;    /*file access properties  */
+    H5FD_t             pub; /*public stuff, must be first  */
+    int                fd;  /*the unix file      */
+    haddr_t            eoa; /*end of allocated region  */
+    haddr_t            eof; /*end of file; current file size*/
+    haddr_t            pos; /*current file I/O position  */
+    int                op;  /*last operation    */
+    H5FD_direct_fapl_t fa;  /*file access properties  */
 #ifndef H5_HAVE_WIN32_API
     /*
      * On most systems the combination of device and i-node number uniquely
      * identify a file.
      */
-    dev_t  device;      /*file device number    */
-    ino_t  inode;      /*file i-node number    */
+    dev_t device; /*file device number    */
+    ino_t inode;  /*file i-node number    */
 #else
     /*
      * On H5_HAVE_WIN32_API the low-order word of a unique identifier associated with the
@@ -112,70 +112,66 @@ typedef struct H5FD_direct_t {
  *      which can be addressed entirely by the second
  *      argument of the file seek function.
  */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
-#define ADDR_OVERFLOW(A)  (HADDR_UNDEF==(A) ||            \
-         ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z)  ((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z)  (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) ||      \
-                                 HADDR_UNDEF==(A)+(Z) ||          \
-         (HDoff_t)((A)+(Z))<(HDoff_t)(A))
+#define MAXADDR          (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
+#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR)
+#define REGION_OVERFLOW(A, Z)                                                                                \
+    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A))
 
 /* Prototypes */
-static void *H5FD_direct_fapl_get(H5FD_t *file);
-static void *H5FD_direct_fapl_copy(const void *_old_fa);
-static H5FD_t *H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id,
-            haddr_t maxaddr);
-static herr_t H5FD_direct_close(H5FD_t *_file);
-static int H5FD_direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t H5FD_direct_query(const H5FD_t *_f1, unsigned long *flags);
+static void *  H5FD_direct_fapl_get(H5FD_t *file);
+static void *  H5FD_direct_fapl_copy(const void *_old_fa);
+static H5FD_t *H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD_direct_close(H5FD_t *_file);
+static int     H5FD_direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD_direct_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD_direct_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD_direct_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static herr_t  H5FD_direct_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD_direct_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_direct_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_direct_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-           size_t size, void *buf);
-static herr_t H5FD_direct_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, const void *buf);
-static herr_t H5FD_direct_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD_direct_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD_direct_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                                void *buf);
+static herr_t  H5FD_direct_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                                 const void *buf);
+static herr_t  H5FD_direct_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 
 static const H5FD_class_t H5FD_direct_g = {
-    "direct",          /*name      */
-    MAXADDR,          /*maxaddr    */
-    H5F_CLOSE_WEAK,        /* fc_degree    */
-    NULL,          /*sb_size    */
-    NULL,          /*sb_encode    */
-    NULL,          /*sb_decode    */
-    sizeof(H5FD_direct_fapl_t),                 /*fapl_size    */
-    H5FD_direct_fapl_get,            /*fapl_get    */
-    H5FD_direct_fapl_copy,            /*fapl_copy    */
-    NULL,                /*fapl_free    */
-    0,            /*dxpl_size    */
-    NULL,          /*dxpl_copy    */
-    NULL,          /*dxpl_free    */
-    H5FD_direct_open,              /*open      */
-    H5FD_direct_close,                    /*close      */
-    H5FD_direct_cmp,              /*cmp      */
-    H5FD_direct_query,                    /*query      */
-    NULL,          /*get_type_map    */
-    NULL,          /*alloc      */
-    NULL,          /*free      */
-    H5FD_direct_get_eoa,      /*get_eoa    */
-    H5FD_direct_set_eoa,       /*set_eoa    */
-    H5FD_direct_get_eof,      /*get_eof    */
-    H5FD_direct_get_handle,                     /*get_handle            */
-    H5FD_direct_read,        /*read      */
-    H5FD_direct_write,        /*write      */
-    NULL,          /*flush      */
-    H5FD_direct_truncate,      /*truncate    */
-    NULL,                                       /*lock                  */
-    NULL,                                       /*unlock                */
-    H5FD_FLMAP_DICHOTOMY                        /*fl_map                */
+    "direct",                   /*name      */
+    MAXADDR,                    /*maxaddr    */
+    H5F_CLOSE_WEAK,             /* fc_degree    */
+    NULL,                       /*sb_size    */
+    NULL,                       /*sb_encode    */
+    NULL,                       /*sb_decode    */
+    sizeof(H5FD_direct_fapl_t), /*fapl_size    */
+    H5FD_direct_fapl_get,       /*fapl_get    */
+    H5FD_direct_fapl_copy,      /*fapl_copy    */
+    NULL,                       /*fapl_free    */
+    0,                          /*dxpl_size    */
+    NULL,                       /*dxpl_copy    */
+    NULL,                       /*dxpl_free    */
+    H5FD_direct_open,           /*open      */
+    H5FD_direct_close,          /*close      */
+    H5FD_direct_cmp,            /*cmp      */
+    H5FD_direct_query,          /*query      */
+    NULL,                       /*get_type_map    */
+    NULL,                       /*alloc      */
+    NULL,                       /*free      */
+    H5FD_direct_get_eoa,        /*get_eoa    */
+    H5FD_direct_set_eoa,        /*set_eoa    */
+    H5FD_direct_get_eof,        /*get_eof    */
+    H5FD_direct_get_handle,     /*get_handle            */
+    H5FD_direct_read,           /*read      */
+    H5FD_direct_write,          /*write      */
+    NULL,                       /*flush      */
+    H5FD_direct_truncate,       /*truncate    */
+    NULL,                       /*lock                  */
+    NULL,                       /*unlock                */
+    H5FD_FLMAP_DICHOTOMY        /*fl_map                */
 };
 
 /* Declare a free list to manage the H5FD_direct_t struct */
 H5FL_DEFINE_STATIC(H5FD_direct_t);
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5FD_direct_init_interface -- Initialize interface-specific information
@@ -197,7 +193,6 @@ H5FD_direct_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_direct_init())
 } /* H5FD_direct_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_init
  *
@@ -218,21 +213,20 @@ H5FD_direct_init_interface(void)
 hid_t
 H5FD_direct_init(void)
 {
-    hid_t ret_value;        /* Return value */
+    hid_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if (H5I_VFL!=H5I_get_type(H5FD_DIRECT_g))
-        H5FD_DIRECT_g = H5FD_register(&H5FD_direct_g,sizeof(H5FD_class_t),FALSE);
+    if (H5I_VFL != H5I_get_type(H5FD_DIRECT_g))
+        H5FD_DIRECT_g = H5FD_register(&H5FD_direct_g, sizeof(H5FD_class_t), FALSE);
 
     /* Set return value */
-    ret_value=H5FD_DIRECT_g;
+    ret_value = H5FD_DIRECT_g;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*---------------------------------------------------------------------------
  * Function:  H5FD_direct_term
  *
@@ -253,12 +247,11 @@ H5FD_direct_term(void)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Reset VFL ID */
-    H5FD_DIRECT_g=0;
+    H5FD_DIRECT_g = 0;
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5FD_direct_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pset_fapl_direct
  *
@@ -278,43 +271,42 @@ H5FD_direct_term(void)
 herr_t
 H5Pset_fapl_direct(hid_t fapl_id, size_t boundary, size_t block_size, size_t cbuf_size)
 {
-    H5P_genplist_t      *plist;      /* Property list pointer */
-    H5FD_direct_fapl_t  fa;
-    herr_t     ret_value;
+    H5P_genplist_t *   plist; /* Property list pointer */
+    H5FD_direct_fapl_t fa;
+    herr_t             ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "izzz", fapl_id, boundary, block_size, cbuf_size);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
-    if(boundary != 0)
-      fa.mboundary = boundary;
+    if (boundary != 0)
+        fa.mboundary = boundary;
     else
-  fa.mboundary = MBOUNDARY_DEF;
-    if(block_size != 0)
-      fa.fbsize = block_size;
+        fa.mboundary = MBOUNDARY_DEF;
+    if (block_size != 0)
+        fa.fbsize = block_size;
     else
-  fa.fbsize = FBSIZE_DEF;
-    if(cbuf_size != 0)
-      fa.cbsize = cbuf_size;
+        fa.fbsize = FBSIZE_DEF;
+    if (cbuf_size != 0)
+        fa.cbsize = cbuf_size;
     else
-  fa.cbsize = CBSIZE_DEF;
+        fa.cbsize = CBSIZE_DEF;
 
     /* Set the default to be true for data alignment */
     fa.must_align = TRUE;
 
     /* Copy buffer size must be a multiple of file block size */
-    if(fa.cbsize % fa.fbsize != 0)
+    if (fa.cbsize % fa.fbsize != 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "copy buffer size must be a multiple of block size")
 
-    ret_value= H5P_set_driver(plist, H5FD_DIRECT, &fa);
+    ret_value = H5P_set_driver(plist, H5FD_DIRECT, &fa);
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pget_fapl_direct
  *
@@ -333,34 +325,33 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, size_t *block_size/*out*/,
-    size_t *cbuf_size/*out*/)
+H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary /*out*/, size_t *block_size /*out*/,
+                   size_t *cbuf_size /*out*/)
 {
-    H5FD_direct_fapl_t  *fa;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5FD_direct_fapl_t *fa;
+    H5P_genplist_t *    plist;               /* Property list pointer */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "ixxx", fapl_id, boundary, block_size, cbuf_size);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
-    if (H5FD_DIRECT!=H5P_get_driver(plist))
+    if (H5FD_DIRECT != H5P_get_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
-    if (NULL==(fa=H5P_get_driver_info(plist)))
+    if (NULL == (fa = H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
     if (boundary)
         *boundary = fa->mboundary;
     if (block_size)
-  *block_size = fa->fbsize;
+        *block_size = fa->fbsize;
     if (cbuf_size)
-  *cbuf_size = fa->cbsize;
+        *cbuf_size = fa->cbsize;
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_fapl_get
  *
@@ -383,19 +374,18 @@ done:
 static void *
 H5FD_direct_fapl_get(H5FD_t *_file)
 {
-    H5FD_direct_t  *file = (H5FD_direct_t*)_file;
-    void *ret_value;    /* Return value */
+    H5FD_direct_t *file = (H5FD_direct_t *)_file;
+    void *         ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Set return value */
-    ret_value= H5FD_direct_fapl_copy(&(file->fa));
+    ret_value = H5FD_direct_fapl_copy(&(file->fa));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_direct_fapl_get() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_fapl_copy
  *
@@ -415,8 +405,8 @@ done:
 static void *
 H5FD_direct_fapl_copy(const void *_old_fa)
 {
-    const H5FD_direct_fapl_t *old_fa = (const H5FD_direct_fapl_t*)_old_fa;
-    H5FD_direct_fapl_t *new_fa = H5MM_malloc(sizeof(H5FD_direct_fapl_t));
+    const H5FD_direct_fapl_t *old_fa = (const H5FD_direct_fapl_t *)_old_fa;
+    H5FD_direct_fapl_t *      new_fa = H5MM_malloc(sizeof(H5FD_direct_fapl_t));
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -428,7 +418,6 @@ H5FD_direct_fapl_copy(const void *_old_fa)
     FUNC_LEAVE_NOAPI(new_fa)
 } /* end H5FD_direct_fapl_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_open
  *
@@ -450,62 +439,65 @@ H5FD_direct_fapl_copy(const void *_old_fa)
 static H5FD_t *
 H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    int      o_flags;
-    int      fd=(-1);
-    H5FD_direct_t  *file=NULL;
-    H5FD_direct_fapl_t  *fa;
+    int                 o_flags;
+    int                 fd   = (-1);
+    H5FD_direct_t *     file = NULL;
+    H5FD_direct_fapl_t *fa;
 #ifdef H5_HAVE_WIN32_API
-    HFILE     filehandle;
+    HFILE                              filehandle;
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
-    h5_stat_t    sb;
-    H5P_genplist_t   *plist;      /* Property list */
-    int                 *buf1, *buf2;
-    H5FD_t    *ret_value;
+    h5_stat_t       sb;
+    H5P_genplist_t *plist; /* Property list */
+    int *           buf1, *buf2;
+    H5FD_t *        ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check on file offsets */
-    HDassert(sizeof(HDoff_t)>=sizeof(size_t));
+    HDassert(sizeof(HDoff_t) >= sizeof(size_t));
 
     /* Check arguments */
     if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if (0==maxaddr || HADDR_UNDEF==maxaddr)
+    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
     if (ADDR_OVERFLOW(maxaddr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr")
 
     /* Build the open flags */
     o_flags = (H5F_ACC_RDWR & flags) ? O_RDWR : O_RDONLY;
-    if (H5F_ACC_TRUNC & flags) o_flags |= O_TRUNC;
-    if (H5F_ACC_CREAT & flags) o_flags |= O_CREAT;
-    if (H5F_ACC_EXCL & flags) o_flags |= O_EXCL;
+    if (H5F_ACC_TRUNC & flags)
+        o_flags |= O_TRUNC;
+    if (H5F_ACC_CREAT & flags)
+        o_flags |= O_CREAT;
+    if (H5F_ACC_EXCL & flags)
+        o_flags |= O_EXCL;
 
     /* Flag for Direct I/O */
     o_flags |= O_DIRECT;
 
     /* Open the file */
-    if ((fd=HDopen(name, o_flags, 0666))<0)
+    if ((fd = HDopen(name, o_flags, 0666)) < 0)
         HSYS_GOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file")
 
-    if (HDfstat(fd, &sb)<0)
+    if (HDfstat(fd, &sb) < 0)
         HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, NULL, "unable to fstat file")
 
     /* Create the new file struct */
-    if (NULL==(file=H5FL_CALLOC(H5FD_direct_t)))
+    if (NULL == (file = H5FL_CALLOC(H5FD_direct_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
 
     /* Get the driver specific information */
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
-    if(NULL == (fa = (H5FD_direct_fapl_t *)H5P_get_driver_info(plist)))
+    if (NULL == (fa = (H5FD_direct_fapl_t *)H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
 
     file->fd = fd;
     H5_CHECKED_ASSIGN(file->eof, haddr_t, sb.st_size, h5_stat_size_t);
     file->pos = HADDR_UNDEF;
-    file->op = OP_UNKNOWN;
+    file->op  = OP_UNKNOWN;
 #ifdef H5_HAVE_WIN32_API
     filehandle = _get_osfhandle(fd);
     (void)GetFileInformationByHandle((HANDLE)filehandle, &fileinfo);
@@ -513,67 +505,70 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
     file->fileindexlo = fileinfo.nFileIndexLow;
 #else
     file->device = sb.st_dev;
-    file->inode = sb.st_ino;
+    file->inode  = sb.st_ino;
 #endif /*H5_HAVE_WIN32_API*/
     file->fa.mboundary = fa->mboundary;
-    file->fa.fbsize = fa->fbsize;
-    file->fa.cbsize = fa->cbsize;
+    file->fa.fbsize    = fa->fbsize;
+    file->fa.cbsize    = fa->cbsize;
 
     /* Try to decide if data alignment is required.  The reason to check it here
      * is to handle correctly the case that the file is in a different file system
      * than the one where the program is running.
      */
     buf1 = (int *)HDmalloc(sizeof(int));
-    if(HDposix_memalign(&buf2, file->fa.mboundary, file->fa.fbsize) != 0)
+    if (HDposix_memalign(&buf2, file->fa.mboundary, file->fa.fbsize) != 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, NULL, "HDposix_memalign failed")
 
-    if(o_flags & O_CREAT) {
-        if(HDwrite(file->fd, (void*)buf1, sizeof(int))<0) {
-            if(HDwrite(file->fd, (void*)buf2, file->fa.fbsize)<0)
+    if (o_flags & O_CREAT) {
+        if (HDwrite(file->fd, (void *)buf1, sizeof(int)) < 0) {
+            if (HDwrite(file->fd, (void *)buf2, file->fa.fbsize) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, NULL, "file system may not support Direct I/O")
             else
                 file->fa.must_align = TRUE;
-        } else {
+        }
+        else {
             file->fa.must_align = FALSE;
             HDftruncate(file->fd, (HDoff_t)0);
         }
-    } else {
-        if(HDread(file->fd, (void*)buf1, sizeof(int))<0) {
-            if(HDread(file->fd, (void*)buf2, file->fa.fbsize)<0)
+    }
+    else {
+        if (HDread(file->fd, (void *)buf1, sizeof(int)) < 0) {
+            if (HDread(file->fd, (void *)buf2, file->fa.fbsize) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "file system may not support Direct I/O")
             else
                 file->fa.must_align = TRUE;
-        } else {
-            if(o_flags & O_RDWR) {
-                if(HDlseek(file->fd, (HDoff_t)0, SEEK_SET) < 0)
+        }
+        else {
+            if (o_flags & O_RDWR) {
+                if (HDlseek(file->fd, (HDoff_t)0, SEEK_SET) < 0)
                     HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, NULL, "unable to seek to proper position")
-                if(HDwrite(file->fd, (void *)buf1, sizeof(int))<0)
+                if (HDwrite(file->fd, (void *)buf1, sizeof(int)) < 0)
                     file->fa.must_align = TRUE;
                 else
                     file->fa.must_align = FALSE;
-            } else
+            }
+            else
                 file->fa.must_align = FALSE;
         }
     }
 
-    if(buf1)
+    if (buf1)
         HDfree(buf1);
-    if(buf2)
+    if (buf2)
         HDfree(buf2);
 
     /* Set return value */
-    ret_value=(H5FD_t*)file;
+    ret_value = (H5FD_t *)file;
 
 done:
-    if(ret_value==NULL) {
-        if(fd>=0)
+    if (ret_value == NULL) {
+        if (fd >= 0)
             HDclose(fd);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_close
  *
@@ -593,21 +588,20 @@ done:
 static herr_t
 H5FD_direct_close(H5FD_t *_file)
 {
-    H5FD_direct_t  *file = (H5FD_direct_t*)_file;
-    herr_t        ret_value=SUCCEED;       /* Return value */
+    H5FD_direct_t *file      = (H5FD_direct_t *)_file;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if (HDclose(file->fd)<0)
+    if (HDclose(file->fd) < 0)
         HSYS_GOTO_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
 
-    H5FL_FREE(H5FD_direct_t,file);
+    H5FL_FREE(H5FD_direct_t, file);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_cmp
  *
@@ -629,34 +623,44 @@ done:
 static int
 H5FD_direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_direct_t  *f1 = (const H5FD_direct_t*)_f1;
-    const H5FD_direct_t  *f2 = (const H5FD_direct_t*)_f2;
-    int ret_value=0;
+    const H5FD_direct_t *f1        = (const H5FD_direct_t *)_f1;
+    const H5FD_direct_t *f2        = (const H5FD_direct_t *)_f2;
+    int                  ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #ifdef H5_HAVE_WIN32_API
-    if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1)
-    if (f1->fileindexhi > f2->fileindexhi) HGOTO_DONE(1)
+    if (f1->fileindexhi < f2->fileindexhi)
+        HGOTO_DONE(-1)
+    if (f1->fileindexhi > f2->fileindexhi)
+        HGOTO_DONE(1)
 
-    if (f1->fileindexlo < f2->fileindexlo) HGOTO_DONE(-1)
-    if (f1->fileindexlo > f2->fileindexlo) HGOTO_DONE(1)
+    if (f1->fileindexlo < f2->fileindexlo)
+        HGOTO_DONE(-1)
+    if (f1->fileindexlo > f2->fileindexlo)
+        HGOTO_DONE(1)
 
 #else
 #ifdef H5_DEV_T_IS_SCALAR
-    if (f1->device < f2->device) HGOTO_DONE(-1)
-    if (f1->device > f2->device) HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+    if (f1->device < f2->device)
+        HGOTO_DONE(-1)
+    if (f1->device > f2->device)
+        HGOTO_DONE(1)
+#else  /* H5_DEV_T_IS_SCALAR */
     /* If dev_t isn't a scalar value on this system, just use memcmp to
      * determine if the values are the same or not.  The actual return value
      * shouldn't really matter...
      */
-    if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t))<0) HGOTO_DONE(-1)
-    if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t))>0) HGOTO_DONE(1)
+    if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0)
+        HGOTO_DONE(-1)
+    if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0)
+        HGOTO_DONE(1)
 #endif /* H5_DEV_T_IS_SCALAR */
 
-    if (f1->inode < f2->inode) HGOTO_DONE(-1)
-    if (f1->inode > f2->inode) HGOTO_DONE(1)
+    if (f1->inode < f2->inode)
+        HGOTO_DONE(-1)
+    if (f1->inode > f2->inode)
+        HGOTO_DONE(1)
 
 #endif
 
@@ -664,7 +668,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_query
  *
@@ -683,23 +686,22 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_direct_query(const H5FD_t H5_ATTR_UNUSED * _f, unsigned long *flags /* out */)
+H5FD_direct_query(const H5FD_t H5_ATTR_UNUSED *_f, unsigned long *flags /* out */)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set the VFL feature flags that this driver supports */
-    if(flags) {
+    if (flags) {
         *flags = 0;
-        *flags|=H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */
-        *flags|=H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
-        *flags|=H5FD_FEAT_DATA_SIEVE;       /* OK to perform data sieving for faster raw data reads & writes */
-        *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations */
+        *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
+        *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */
+        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
     }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_get_eoa
  *
@@ -724,14 +726,13 @@ H5FD_direct_query(const H5FD_t H5_ATTR_UNUSED * _f, unsigned long *flags /* out
 static haddr_t
 H5FD_direct_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_direct_t  *file = (const H5FD_direct_t*)_file;
+    const H5FD_direct_t *file = (const H5FD_direct_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(file->eoa)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_set_eoa
  *
@@ -756,7 +757,7 @@ H5FD_direct_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD_direct_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
-    H5FD_direct_t  *file = (H5FD_direct_t*)_file;
+    H5FD_direct_t *file = (H5FD_direct_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -765,7 +766,6 @@ H5FD_direct_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_get_eof
  *
@@ -789,14 +789,13 @@ H5FD_direct_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 static haddr_t
 H5FD_direct_get_eof(const H5FD_t *_file)
 {
-    const H5FD_direct_t  *file = (const H5FD_direct_t*)_file;
+    const H5FD_direct_t *file = (const H5FD_direct_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD_diect_get_handle
  *
@@ -812,14 +811,14 @@ H5FD_direct_get_eof(const H5FD_t *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_direct_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void** file_handle)
+H5FD_direct_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
-    H5FD_direct_t       *file = (H5FD_direct_t *)_file;
-    herr_t              ret_value = SUCCEED;
+    H5FD_direct_t *file      = (H5FD_direct_t *)_file;
+    herr_t         ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(!file_handle)
+    if (!file_handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
     *file_handle = &(file->fd);
 
@@ -827,7 +826,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_read
  *
@@ -849,20 +847,20 @@ done:
  */
 static herr_t
 H5FD_direct_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
-         size_t size, void *buf/*out*/)
+                 size_t size, void *buf /*out*/)
 {
-    H5FD_direct_t  *file = (H5FD_direct_t*)_file;
-    ssize_t    nbytes;
-    hbool_t    _must_align = TRUE;
-    herr_t        ret_value=SUCCEED;       /* Return value */
-    size_t    alloc_size;
-    void    *copy_buf = NULL, *p2;
-    size_t    _boundary;
-    size_t    _fbsize;
-    size_t    _cbsize;
-    haddr_t    read_size;              /* Size to read into copy buffer */
-    size_t    copy_size = size;       /* Size remaining to read when using copy buffer */
-    size_t              copy_offset;            /* Offset into copy buffer of the requested data */
+    H5FD_direct_t *file = (H5FD_direct_t *)_file;
+    ssize_t        nbytes;
+    hbool_t        _must_align = TRUE;
+    herr_t         ret_value   = SUCCEED; /* Return value */
+    size_t         alloc_size;
+    void *         copy_buf = NULL, *p2;
+    size_t         _boundary;
+    size_t         _fbsize;
+    size_t         _cbsize;
+    haddr_t        read_size;        /* Size to read into copy buffer */
+    size_t         copy_size = size; /* Size remaining to read when using copy buffer */
+    size_t         copy_offset;      /* Offset into copy buffer of the requested data */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -870,7 +868,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN
     HDassert(buf);
 
     /* Check for overflow conditions */
-    if (HADDR_UNDEF==addr)
+    if (HADDR_UNDEF == addr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined")
     if (REGION_OVERFLOW(addr, size))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow")
@@ -884,134 +882,131 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN
      * copy buffer size.
      */
     _boundary = file->fa.mboundary;
-    _fbsize = file->fa.fbsize;
-    _cbsize = file->fa.cbsize;
+    _fbsize   = file->fa.fbsize;
+    _cbsize   = file->fa.cbsize;
 
     /* if the data is aligned or the system doesn't require data to be aligned,
      * read it directly from the file.  If not, read a bigger
      * and aligned data first, then copy the data into memory buffer.
      */
-    if(!_must_align || ((addr%_fbsize==0) && (size%_fbsize==0) && ((size_t)buf%_boundary==0))) {
-      /* Seek to the correct location */
-      if ((addr!=file->pos || OP_READ!=file->op) &&
-        HDlseek(file->fd, (HDoff_t)addr, SEEK_SET)<0)
-    HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
-       /* Read the aligned data in file first, being careful of interrupted
-       * system calls and partial results. */
-      while (size>0) {
-    do {
-        nbytes = HDread(file->fd, buf, size);
-    } while (-1==nbytes && EINTR==errno);
-    if (-1==nbytes) /* error */
-        HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
-    if (0==nbytes) {
-        /* end of file but not end of format address space */
-        HDmemset(buf, 0, size);
-        break;
+    if (!_must_align || ((addr % _fbsize == 0) && (size % _fbsize == 0) && ((size_t)buf % _boundary == 0))) {
+        /* Seek to the correct location */
+        if ((addr != file->pos || OP_READ != file->op) && HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
+            HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
+        /* Read the aligned data in file first, being careful of interrupted
+         * system calls and partial results. */
+        while (size > 0) {
+            do {
+                nbytes = HDread(file->fd, buf, size);
+            } while (-1 == nbytes && EINTR == errno);
+            if (-1 == nbytes) /* error */
+                HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
+            if (0 == nbytes) {
+                /* end of file but not end of format address space */
+                HDmemset(buf, 0, size);
+                break;
+            }
+            HDassert(nbytes >= 0);
+            HDassert((size_t)nbytes <= size);
+            H5_CHECK_OVERFLOW(nbytes, ssize_t, size_t);
+            size -= (size_t)nbytes;
+            H5_CHECK_OVERFLOW(nbytes, ssize_t, haddr_t);
+            addr += (haddr_t)nbytes;
+            buf = (char *)buf + nbytes;
+        }
     }
-    HDassert(nbytes>=0);
-    HDassert((size_t)nbytes<=size);
-    H5_CHECK_OVERFLOW(nbytes,ssize_t,size_t);
-    size -= (size_t)nbytes;
-    H5_CHECK_OVERFLOW(nbytes,ssize_t,haddr_t);
-    addr += (haddr_t)nbytes;
-    buf = (char*)buf + nbytes;
-      }
-    } else {
-            /* Calculate where we will begin copying from the copy buffer */
-            copy_offset = (size_t)(addr % _fbsize);
-
-      /* allocate memory needed for the Direct IO option up to the maximal
-       * copy buffer size. Make a bigger buffer for aligned I/O if size is
-       * smaller than maximal copy buffer. */
-      alloc_size = ((copy_offset + size - 1) / _fbsize + 1) * _fbsize;
-      if(alloc_size > _cbsize)
-        alloc_size = _cbsize;
-      HDassert(!(alloc_size % _fbsize));
-      if (HDposix_memalign(&copy_buf, _boundary, alloc_size) != 0)
-    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "HDposix_memalign failed")
-
-            /* look for the aligned position for reading the data */
-            HDassert(!(((addr / _fbsize) * _fbsize) % _fbsize));
-            if(HDlseek(file->fd, (HDoff_t)((addr / _fbsize) * _fbsize),
-                    SEEK_SET) < 0)
-                HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
+    else {
+        /* Calculate where we will begin copying from the copy buffer */
+        copy_offset = (size_t)(addr % _fbsize);
+
+        /* allocate memory needed for the Direct IO option up to the maximal
+         * copy buffer size. Make a bigger buffer for aligned I/O if size is
+         * smaller than maximal copy buffer. */
+        alloc_size = ((copy_offset + size - 1) / _fbsize + 1) * _fbsize;
+        if (alloc_size > _cbsize)
+            alloc_size = _cbsize;
+        HDassert(!(alloc_size % _fbsize));
+        if (HDposix_memalign(&copy_buf, _boundary, alloc_size) != 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "HDposix_memalign failed")
+
+        /* look for the aligned position for reading the data */
+        HDassert(!(((addr / _fbsize) * _fbsize) % _fbsize));
+        if (HDlseek(file->fd, (HDoff_t)((addr / _fbsize) * _fbsize), SEEK_SET) < 0)
+            HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 
-      /*
-       * Read the aligned data in file into aligned buffer first, then copy the data
-       * into the final buffer.  If the data size is bigger than maximal copy buffer
-       * size, do the reading by segment (the outer while loop).  If not, do one step
-       * reading.
-       */
-      do {
-         /* Read the aligned data in file first.  Not able to handle interrupted
-     * system calls and partial results like sec2 driver does because the
-     * data may no longer be aligned. It's especially true when the data in
-     * file is smaller than ALLOC_SIZE. */
-        HDmemset(copy_buf, 0, alloc_size);
-
-                /* Calculate how much data we have to read in this iteration
-                 * (including unused parts of blocks) */
-                if((copy_size + copy_offset) < alloc_size)
-                    read_size = ((copy_size + copy_offset - 1) / _fbsize + 1)
-                            * _fbsize;
-                else
-                    read_size = alloc_size;
-
-                HDassert(!(read_size % _fbsize));
+        /*
+         * Read the aligned data in file into aligned buffer first, then copy the data
+         * into the final buffer.  If the data size is bigger than maximal copy buffer
+         * size, do the reading by segment (the outer while loop).  If not, do one step
+         * reading.
+         */
         do {
-        nbytes = HDread(file->fd, copy_buf, read_size);
-        } while(-1==nbytes && EINTR==errno);
-
-        if (-1==nbytes) /* error */
-        HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
-
-        /* Copy the needed data from the copy buffer to the output
-         * buffer, and update copy_size.  If the copy buffer does not
-                 * contain the rest of the data, just copy what's in the copy
-                 * buffer and also update read_addr and copy_offset to read the
-                 * next section of data. */
-        p2 = (unsigned char*)copy_buf + copy_offset;
-        if((copy_size + copy_offset) <= alloc_size) {
-            HDmemcpy(buf, p2, copy_size);
-            buf = (unsigned char *)buf + copy_size;
-            copy_size = 0;
-                } /* end if */
-                else {
-                    HDmemcpy(buf, p2, alloc_size - copy_offset);
-                    buf = (unsigned char*)buf + alloc_size - copy_offset;
-                    copy_size -= alloc_size - copy_offset;
-                    copy_offset = 0;
-                } /* end else */
-      } while (copy_size > 0);
-
-      /*Final step: update address*/
-      addr = (haddr_t)(((addr + size - 1) / _fbsize + 1) * _fbsize);
-
-      if(copy_buf) {
-                HDfree(copy_buf);
-                copy_buf = NULL;
+            /* Read the aligned data in file first.  Not able to handle interrupted
+             * system calls and partial results like sec2 driver does because the
+             * data may no longer be aligned. It's especially true when the data in
+             * file is smaller than ALLOC_SIZE. */
+            HDmemset(copy_buf, 0, alloc_size);
+
+            /* Calculate how much data we have to read in this iteration
+             * (including unused parts of blocks) */
+            if ((copy_size + copy_offset) < alloc_size)
+                read_size = ((copy_size + copy_offset - 1) / _fbsize + 1) * _fbsize;
+            else
+                read_size = alloc_size;
+
+            HDassert(!(read_size % _fbsize));
+            do {
+                nbytes = HDread(file->fd, copy_buf, read_size);
+            } while (-1 == nbytes && EINTR == errno);
+
+            if (-1 == nbytes) /* error */
+                HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
+
+            /* Copy the needed data from the copy buffer to the output
+             * buffer, and update copy_size.  If the copy buffer does not
+             * contain the rest of the data, just copy what's in the copy
+             * buffer and also update read_addr and copy_offset to read the
+             * next section of data. */
+            p2 = (unsigned char *)copy_buf + copy_offset;
+            if ((copy_size + copy_offset) <= alloc_size) {
+                HDmemcpy(buf, p2, copy_size);
+                buf       = (unsigned char *)buf + copy_size;
+                copy_size = 0;
             } /* end if */
+            else {
+                HDmemcpy(buf, p2, alloc_size - copy_offset);
+                buf = (unsigned char *)buf + alloc_size - copy_offset;
+                copy_size -= alloc_size - copy_offset;
+                copy_offset = 0;
+            } /* end else */
+        } while (copy_size > 0);
+
+        /*Final step: update address*/
+        addr = (haddr_t)(((addr + size - 1) / _fbsize + 1) * _fbsize);
+
+        if (copy_buf) {
+            HDfree(copy_buf);
+            copy_buf = NULL;
+        } /* end if */
     }
 
     /* Update current position */
     file->pos = addr;
-    file->op = OP_READ;
+    file->op  = OP_READ;
 
 done:
-    if(ret_value<0) {
-        if(copy_buf)
+    if (ret_value < 0) {
+        if (copy_buf)
             HDfree(copy_buf);
 
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_write
  *
@@ -1032,23 +1027,23 @@ done:
  */
 static herr_t
 H5FD_direct_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
-    size_t size, const void *buf)
+                  size_t size, const void *buf)
 {
-    H5FD_direct_t  *file = (H5FD_direct_t*)_file;
-    ssize_t    nbytes;
-    hbool_t    _must_align = TRUE;
-    herr_t        ret_value=SUCCEED;       /* Return value */
-    size_t    alloc_size;
-    void    *copy_buf = NULL, *p1;
-    const void    *p3;
-    size_t    _boundary;
-    size_t    _fbsize;
-    size_t    _cbsize;
-    haddr_t             write_addr;             /* Address to write copy buffer */
-    haddr_t             write_size;             /* Size to write from copy buffer */
-    haddr_t             read_size;              /* Size to read into copy buffer */
-    size_t              copy_size = size;       /* Size remaining to write when using copy buffer */
-    size_t              copy_offset;            /* Offset into copy buffer of the data to write */
+    H5FD_direct_t *file = (H5FD_direct_t *)_file;
+    ssize_t        nbytes;
+    hbool_t        _must_align = TRUE;
+    herr_t         ret_value   = SUCCEED; /* Return value */
+    size_t         alloc_size;
+    void *         copy_buf = NULL, *p1;
+    const void *   p3;
+    size_t         _boundary;
+    size_t         _fbsize;
+    size_t         _cbsize;
+    haddr_t        write_addr;       /* Address to write copy buffer */
+    haddr_t        write_size;       /* Size to write from copy buffer */
+    haddr_t        read_size;        /* Size to read into copy buffer */
+    size_t         copy_size = size; /* Size remaining to write when using copy buffer */
+    size_t         copy_offset;      /* Offset into copy buffer of the data to write */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1056,7 +1051,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_U
     HDassert(buf);
 
     /* Check for overflow conditions */
-    if (HADDR_UNDEF==addr)
+    if (HADDR_UNDEF == addr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined")
     if (REGION_OVERFLOW(addr, size))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow")
@@ -1070,181 +1065,177 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_U
      * copy buffer size.
      */
     _boundary = file->fa.mboundary;
-    _fbsize = file->fa.fbsize;
-    _cbsize = file->fa.cbsize;
+    _fbsize   = file->fa.fbsize;
+    _cbsize   = file->fa.cbsize;
 
     /* if the data is aligned or the system doesn't require data to be aligned,
      * write it directly to the file.  If not, read a bigger and aligned data
      * first, update buffer with user data, then write the data out.
      */
-    if(!_must_align || ((addr%_fbsize==0) && (size%_fbsize==0) && ((size_t)buf%_boundary==0))) {
-      /* Seek to the correct location */
-      if ((addr!=file->pos || OP_WRITE!=file->op) &&
-        HDlseek(file->fd, (HDoff_t)addr, SEEK_SET)<0)
-    HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
-
-      while (size>0) {
-    do {
-        nbytes = HDwrite(file->fd, buf, size);
-    } while (-1==nbytes && EINTR==errno);
-    if (-1==nbytes) /* error */
-        HSYS_GOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
-    HDassert(nbytes>0);
-    HDassert((size_t)nbytes<=size);
-    H5_CHECK_OVERFLOW(nbytes,ssize_t,size_t);
-    size -= (size_t)nbytes;
-    H5_CHECK_OVERFLOW(nbytes,ssize_t,haddr_t);
-    addr += (haddr_t)nbytes;
-    buf = (const char*)buf + nbytes;
-      }
-    } else {
-            /* Calculate where we will begin reading from (on disk) and where we
-             * will begin copying from the copy buffer */
-            write_addr = (addr / _fbsize) * _fbsize;
-            copy_offset = (size_t)(addr % _fbsize);
-
-      /* allocate memory needed for the Direct IO option up to the maximal
-       * copy buffer size. Make a bigger buffer for aligned I/O if size is
-       * smaller than maximal copy buffer.
-       */
-      alloc_size = ((copy_offset + size - 1) / _fbsize + 1) * _fbsize;
-            if(alloc_size > _cbsize)
-                alloc_size = _cbsize;
-            HDassert(!(alloc_size % _fbsize));
-
-      if (HDposix_memalign(&copy_buf, _boundary, alloc_size) != 0)
-    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "HDposix_memalign failed")
-
-            /* look for the right position for reading or writing the data */
-            if(HDlseek(file->fd, (HDoff_t)write_addr, SEEK_SET) < 0)
-                HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
-
-      p3 = buf;
-      do {
-                /* Calculate how much data we have to write in this iteration
-                 * (including unused parts of blocks) */
-                if((copy_size + copy_offset) < alloc_size)
-                    write_size = ((copy_size + copy_offset - 1) / _fbsize + 1)
-                            * _fbsize;
-                else
-                    write_size = alloc_size;
-
-        /*
-          * Read the aligned data first if the aligned region doesn't fall
-         * entirely in the range to be written.  Not able to handle interrupted
-     * system calls and partial results like sec2 driver does because the
-     * data may no longer be aligned. It's especially true when the data in
-     * file is smaller than ALLOC_SIZE.  Only read the entire section if
-                 * both ends are misaligned, otherwise only read the block on the
-                 * misaligned end.
+    if (!_must_align || ((addr % _fbsize == 0) && (size % _fbsize == 0) && ((size_t)buf % _boundary == 0))) {
+        /* Seek to the correct location */
+        if ((addr != file->pos || OP_WRITE != file->op) && HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
+            HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
+
+        while (size > 0) {
+            do {
+                nbytes = HDwrite(file->fd, buf, size);
+            } while (-1 == nbytes && EINTR == errno);
+            if (-1 == nbytes) /* error */
+                HSYS_GOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
+            HDassert(nbytes > 0);
+            HDassert((size_t)nbytes <= size);
+            H5_CHECK_OVERFLOW(nbytes, ssize_t, size_t);
+            size -= (size_t)nbytes;
+            H5_CHECK_OVERFLOW(nbytes, ssize_t, haddr_t);
+            addr += (haddr_t)nbytes;
+            buf = (const char *)buf + nbytes;
+        }
+    }
+    else {
+        /* Calculate where we will begin reading from (on disk) and where we
+         * will begin copying from the copy buffer */
+        write_addr  = (addr / _fbsize) * _fbsize;
+        copy_offset = (size_t)(addr % _fbsize);
+
+        /* allocate memory needed for the Direct IO option up to the maximal
+         * copy buffer size. Make a bigger buffer for aligned I/O if size is
+         * smaller than maximal copy buffer.
          */
-        HDmemset(copy_buf, 0, _fbsize);
-
-                if(copy_offset > 0) {
-                    if((write_addr + write_size) > (addr + size)) {
-                        HDassert((write_addr + write_size) - (addr + size) < _fbsize);
-                        read_size = write_size;
-                        p1 = copy_buf;
-                    } /* end if */
-                    else {
-                        read_size = _fbsize;
-                        p1 = copy_buf;
-                    } /* end else */
-                } /* end if */
-                else if((write_addr + write_size) > (addr + size)) {
-                    HDassert((write_addr + write_size) - (addr + size) < _fbsize);
-                    read_size = _fbsize;
-                    p1 = (unsigned char *)copy_buf + write_size - _fbsize;
-
-                    /* Seek to the last block, for reading */
-                    HDassert(!((write_addr + write_size - _fbsize) % _fbsize));
-                    if(HDlseek(file->fd,
-                            (HDoff_t)(write_addr + write_size - _fbsize),
-                            SEEK_SET) < 0)
-                        HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
-                } /* end if */
-                else
-                    p1 = NULL;
+        alloc_size = ((copy_offset + size - 1) / _fbsize + 1) * _fbsize;
+        if (alloc_size > _cbsize)
+            alloc_size = _cbsize;
+        HDassert(!(alloc_size % _fbsize));
 
-                if(p1) {
-                    HDassert(!(read_size % _fbsize));
-                    do {
-                        nbytes = HDread(file->fd, p1, read_size);
-                    } while (-1==nbytes && EINTR==errno);
+        if (HDposix_memalign(&copy_buf, _boundary, alloc_size) != 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "HDposix_memalign failed")
 
-                    if (-1==nbytes) /* error */
-                        HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
-                } /* end if */
+        /* look for the right position for reading or writing the data */
+        if (HDlseek(file->fd, (HDoff_t)write_addr, SEEK_SET) < 0)
+            HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 
-        /* look for the right position and append or copy the data to be written to
-          * the aligned buffer.
-               * Consider all possible situations here: file address is not aligned on
-               * file block size; the end of data address is not aligned; the end of data
-               * address is aligned; data size is smaller or bigger than maximal copy size.
-         */
-        p1 = (unsigned char *)copy_buf + copy_offset;
-        if((copy_size + copy_offset) <= alloc_size) {
-                    HDmemcpy(p1, p3, copy_size);
-                    copy_size = 0;
+        p3 = buf;
+        do {
+            /* Calculate how much data we have to write in this iteration
+             * (including unused parts of blocks) */
+            if ((copy_size + copy_offset) < alloc_size)
+                write_size = ((copy_size + copy_offset - 1) / _fbsize + 1) * _fbsize;
+            else
+                write_size = alloc_size;
+
+            /*
+             * Read the aligned data first if the aligned region doesn't fall
+             * entirely in the range to be written.  Not able to handle interrupted
+             * system calls and partial results like sec2 driver does because the
+             * data may no longer be aligned. It's especially true when the data in
+             * file is smaller than ALLOC_SIZE.  Only read the entire section if
+             * both ends are misaligned, otherwise only read the block on the
+             * misaligned end.
+             */
+            HDmemset(copy_buf, 0, _fbsize);
+
+            if (copy_offset > 0) {
+                if ((write_addr + write_size) > (addr + size)) {
+                    HDassert((write_addr + write_size) - (addr + size) < _fbsize);
+                    read_size = write_size;
+                    p1        = copy_buf;
                 } /* end if */
                 else {
-                    HDmemcpy(p1, p3, alloc_size - copy_offset);
-                    p3 = (const unsigned char *)p3 + (alloc_size - copy_offset);
-                    copy_size -= alloc_size - copy_offset;
-                    copy_offset = 0;
+                    read_size = _fbsize;
+                    p1        = copy_buf;
                 } /* end else */
+            }     /* end if */
+            else if ((write_addr + write_size) > (addr + size)) {
+                HDassert((write_addr + write_size) - (addr + size) < _fbsize);
+                read_size = _fbsize;
+                p1        = (unsigned char *)copy_buf + write_size - _fbsize;
+
+                /* Seek to the last block, for reading */
+                HDassert(!((write_addr + write_size - _fbsize) % _fbsize));
+                if (HDlseek(file->fd, (HDoff_t)(write_addr + write_size - _fbsize), SEEK_SET) < 0)
+                    HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
+            } /* end if */
+            else
+                p1 = NULL;
 
-        /*look for the aligned position for writing the data*/
-        HDassert(!(write_addr % _fbsize));
-        if(HDlseek(file->fd, (HDoff_t)write_addr, SEEK_SET) < 0)
-        HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
+            if (p1) {
+                HDassert(!(read_size % _fbsize));
+                do {
+                    nbytes = HDread(file->fd, p1, read_size);
+                } while (-1 == nbytes && EINTR == errno);
 
-        /*
-          * Write the data. It doesn't truncate the extra data introduced by
-     * alignment because that step is done in H5FD_direct_flush.
-         */
-        HDassert(!(write_size % _fbsize));
-    do {
-        nbytes = HDwrite(file->fd, copy_buf, write_size);
-    } while (-1==nbytes && EINTR==errno);
+                if (-1 == nbytes) /* error */
+                    HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
+            } /* end if */
+
+            /* look for the right position and append or copy the data to be written to
+             * the aligned buffer.
+             * Consider all possible situations here: file address is not aligned on
+             * file block size; the end of data address is not aligned; the end of data
+             * address is aligned; data size is smaller or bigger than maximal copy size.
+             */
+            p1 = (unsigned char *)copy_buf + copy_offset;
+            if ((copy_size + copy_offset) <= alloc_size) {
+                HDmemcpy(p1, p3, copy_size);
+                copy_size = 0;
+            } /* end if */
+            else {
+                HDmemcpy(p1, p3, alloc_size - copy_offset);
+                p3 = (const unsigned char *)p3 + (alloc_size - copy_offset);
+                copy_size -= alloc_size - copy_offset;
+                copy_offset = 0;
+            } /* end else */
+
+            /*look for the aligned position for writing the data*/
+            HDassert(!(write_addr % _fbsize));
+            if (HDlseek(file->fd, (HDoff_t)write_addr, SEEK_SET) < 0)
+                HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
+
+            /*
+             * Write the data. It doesn't truncate the extra data introduced by
+             * alignment because that step is done in H5FD_direct_flush.
+             */
+            HDassert(!(write_size % _fbsize));
+            do {
+                nbytes = HDwrite(file->fd, copy_buf, write_size);
+            } while (-1 == nbytes && EINTR == errno);
 
-    if (-1==nbytes) /* error */
-        HSYS_GOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
+            if (-1 == nbytes) /* error */
+                HSYS_GOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
-              /* update the write address */
-              write_addr += write_size;
-  } while (copy_size > 0);
+            /* update the write address */
+            write_addr += write_size;
+        } while (copy_size > 0);
 
-  /*Update the address and size*/
-  addr = write_addr;
-  buf = (const char*)buf + size;
+        /*Update the address and size*/
+        addr = write_addr;
+        buf  = (const char *)buf + size;
 
-  if(copy_buf) {
-      HDfree(copy_buf);
-      copy_buf = NULL;
+        if (copy_buf) {
+            HDfree(copy_buf);
+            copy_buf = NULL;
         } /* end if */
     }
 
     /* Update current position and eof */
     file->pos = addr;
-    file->op = OP_WRITE;
-    if (file->pos>file->eof)
+    file->op  = OP_WRITE;
+    if (file->pos > file->eof)
         file->eof = file->pos;
 
 done:
-    if(ret_value<0) {
-        if(copy_buf)
+    if (ret_value < 0) {
+        if (copy_buf)
             HDfree(copy_buf);
 
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_truncate
  *
@@ -1263,18 +1254,18 @@ done:
 static herr_t
 H5FD_direct_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing)
 {
-    H5FD_direct_t  *file = (H5FD_direct_t*)_file;
-    herr_t        ret_value = SUCCEED;       /* Return value */
+    H5FD_direct_t *file      = (H5FD_direct_t *)_file;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(file);
 
     /* Extend the file to make sure it's large enough */
-    if (file->eoa!=file->eof) {
+    if (file->eoa != file->eof) {
 #ifdef H5_HAVE_WIN32_API
-        HFILE filehandle;   /* Windows file handle */
-        LARGE_INTEGER li;   /* 64-bit integer for SetFilePointer() call */
+        HFILE         filehandle; /* Windows file handle */
+        LARGE_INTEGER li;         /* 64-bit integer for SetFilePointer() call */
 
         /* Map the posix file handle to a Windows file handle */
         filehandle = _get_osfhandle(file->fd);
@@ -1282,11 +1273,11 @@ H5FD_direct_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATT
         /* Translate 64-bit integers into form Windows wants */
         /* [This algorithm is from the Windows documentation for SetFilePointer()] */
         li.QuadPart = (LONGLONG)file->eoa;
-        (void)SetFilePointer((HANDLE)filehandle,li.LowPart,&li.HighPart,FILE_BEGIN);
-        if(SetEndOfFile((HANDLE)filehandle)==0)
+        (void)SetFilePointer((HANDLE)filehandle, li.LowPart, &li.HighPart, FILE_BEGIN);
+        if (SetEndOfFile((HANDLE)filehandle) == 0)
             HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
-        if (-1==HDftruncate(file->fd, (HDoff_t)file->eoa))
+#else  /* H5_HAVE_WIN32_API */
+        if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
 #endif /* H5_HAVE_WIN32_API */
 
@@ -1295,13 +1286,13 @@ H5FD_direct_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATT
 
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     }
-    else if (file->fa.must_align){
-  /*Even though eof is equal to eoa, file is still truncated because Direct I/O
-   *write introduces some extra data for alignment.
-   */
-        if (-1==HDftruncate(file->fd, (HDoff_t)file->eof))
+    else if (file->fa.must_align) {
+        /*Even though eof is equal to eoa, file is still truncated because Direct I/O
+         *write introduces some extra data for alignment.
+         */
+        if (-1 == HDftruncate(file->fd, (HDoff_t)file->eof))
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
     }
 
@@ -1309,4 +1300,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_direct_truncate() */
 #endif /* H5_HAVE_DIRECT */
-
diff --git a/src/H5FDdirect.h b/src/H5FDdirect.h
index f509e44..e0d5c30 100644
--- a/src/H5FDdirect.h
+++ b/src/H5FDdirect.h
@@ -23,9 +23,9 @@
 #include "H5Ipublic.h"
 
 #ifdef H5_HAVE_DIRECT
-#       define H5FD_DIRECT	(H5FD_direct_init())
+#define H5FD_DIRECT (H5FD_direct_init())
 #else
-#       define H5FD_DIRECT      (-1)
+#define H5FD_DIRECT (-1)
 #endif /* H5_HAVE_DIRECT */
 
 #ifdef H5_HAVE_DIRECT
@@ -35,16 +35,15 @@ extern "C" {
 
 /* Default values for memory boundary, file block size, and maximal copy buffer size.
  * Application can set these values through the function H5Pset_fapl_direct. */
-#define MBOUNDARY_DEF		4096
-#define FBSIZE_DEF		4096
-#define CBSIZE_DEF		16*1024*1024
-
-H5_DLL hid_t H5FD_direct_init(void);
-H5_DLL void H5FD_direct_term(void);
-H5_DLL herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size,
-			size_t cbuf_size);
-H5_DLL herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/,
-			size_t *block_size/*out*/, size_t *cbuf_size/*out*/);
+#define MBOUNDARY_DEF 4096
+#define FBSIZE_DEF    4096
+#define CBSIZE_DEF    16 * 1024 * 1024
+
+H5_DLL hid_t  H5FD_direct_init(void);
+H5_DLL void   H5FD_direct_term(void);
+H5_DLL herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size, size_t cbuf_size);
+H5_DLL herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary /*out*/, size_t *block_size /*out*/,
+                                 size_t *cbuf_size /*out*/);
 
 #ifdef __cplusplus
 }
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index cd07bc2..4c85a5b 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -33,114 +33,109 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5FD_family_init_interface
+#define H5_INTERFACE_INIT_FUNC H5FD_family_init_interface
 
-
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5Fprivate.h"        /* File access                */
-#include "H5FDprivate.h"    /* File drivers                */
-#include "H5FDfamily.h"         /* Family file driver             */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Pprivate.h"        /* Property lists            */
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5Fprivate.h"  /* File access                */
+#include "H5FDprivate.h" /* File drivers                */
+#include "H5FDfamily.h"  /* Family file driver             */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Pprivate.h"  /* Property lists            */
 
 #undef MAX
-#define MAX(X,Y)    ((X)>(Y)?(X):(Y))
+#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
 #undef MIN
-#define MIN(X,Y)    ((X)<(Y)?(X):(Y))
+#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
 
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_FAMILY_g = 0;
 
 /* The description of a file belonging to this driver. */
 typedef struct H5FD_family_t {
-    H5FD_t    pub;        /*public stuff, must be first        */
-    hid_t    memb_fapl_id;    /*file access property list for members    */
-    hsize_t    memb_size;    /*actual size of each member file    */
-    hsize_t    pmem_size;    /*member size passed in from property    */
-    unsigned    nmembs;        /*number of family members        */
-    unsigned    amembs;        /*number of member slots allocated    */
-    H5FD_t    **memb;        /*dynamic array of member pointers    */
-    haddr_t    eoa;        /*end of allocated addresses        */
-    char    *name;        /*name generator printf format        */
-    unsigned    flags;        /*flags for opening additional members    */
+    H5FD_t   pub;          /*public stuff, must be first        */
+    hid_t    memb_fapl_id; /*file access property list for members    */
+    hsize_t  memb_size;    /*actual size of each member file    */
+    hsize_t  pmem_size;    /*member size passed in from property    */
+    unsigned nmembs;       /*number of family members        */
+    unsigned amembs;       /*number of member slots allocated    */
+    H5FD_t **memb;         /*dynamic array of member pointers    */
+    haddr_t  eoa;          /*end of allocated addresses        */
+    char *   name;         /*name generator printf format        */
+    unsigned flags;        /*flags for opening additional members    */
 
     /* Information from properties set by 'h5repart' tool */
-    hsize_t    mem_newsize;    /*new member size passed in as private
-                                 * property. It's used only by h5repart */
-    hbool_t     repart_members; /* Whether to mark the superblock dirty
-                                 * when it is loaded, so that the family
-                                 * member sizes can be re-encoded       */
+    hsize_t mem_newsize;    /*new member size passed in as private
+                             * property. It's used only by h5repart */
+    hbool_t repart_members; /* Whether to mark the superblock dirty
+                             * when it is loaded, so that the family
+                             * member sizes can be re-encoded       */
 } H5FD_family_t;
 
 /* Driver-specific file access properties */
 typedef struct H5FD_family_fapl_t {
-    hsize_t    memb_size;    /*size of each member            */
-    hid_t    memb_fapl_id;    /*file access property list of each memb*/
+    hsize_t memb_size;    /*size of each member            */
+    hid_t   memb_fapl_id; /*file access property list of each memb*/
 } H5FD_family_fapl_t;
 
 /* Callback prototypes */
-static void *H5FD_family_fapl_get(H5FD_t *_file);
-static void *H5FD_family_fapl_copy(const void *_old_fa);
-static herr_t H5FD_family_fapl_free(void *_fa);
+static void *  H5FD_family_fapl_get(H5FD_t *_file);
+static void *  H5FD_family_fapl_copy(const void *_old_fa);
+static herr_t  H5FD_family_fapl_free(void *_fa);
 static hsize_t H5FD_family_sb_size(H5FD_t *_file);
-static herr_t H5FD_family_sb_encode(H5FD_t *_file, char *name/*out*/,
-            unsigned char *buf/*out*/);
-static herr_t H5FD_family_sb_decode(H5FD_t *_file, const char *name,
-                    const unsigned char *buf);
-static H5FD_t *H5FD_family_open(const char *name, unsigned flags,
-                hid_t fapl_id, haddr_t maxaddr);
-static herr_t H5FD_family_close(H5FD_t *_file);
-static int H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t H5FD_family_query(const H5FD_t *_f1, unsigned long *flags);
+static herr_t  H5FD_family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/);
+static herr_t  H5FD_family_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf);
+static H5FD_t *H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD_family_close(H5FD_t *_file);
+static int     H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD_family_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD_family_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD_family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa);
+static herr_t  H5FD_family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa);
 static haddr_t H5FD_family_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-                size_t size, void *_buf/*out*/);
-static herr_t H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-                size_t size, const void *_buf);
-static herr_t H5FD_family_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
-static herr_t H5FD_family_truncate(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
+static herr_t  H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                                void *_buf /*out*/);
+static herr_t  H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                                 const void *_buf);
+static herr_t  H5FD_family_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
+static herr_t  H5FD_family_truncate(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
 
 /* The class struct */
 static const H5FD_class_t H5FD_family_g = {
-    "family",                    /*name            */
-    HADDR_MAX,                    /*maxaddr        */
-    H5F_CLOSE_WEAK,                /*fc_degree        */
-    H5FD_family_sb_size,            /*sb_size        */
-    H5FD_family_sb_encode,            /*sb_encode        */
-    H5FD_family_sb_decode,            /*sb_decode        */
-    sizeof(H5FD_family_fapl_t),            /*fapl_size        */
-    H5FD_family_fapl_get,            /*fapl_get        */
-    H5FD_family_fapl_copy,            /*fapl_copy        */
-    H5FD_family_fapl_free,            /*fapl_free        */
-    0,                        /*dxpl_size        */
-    NULL,                    /*dxpl_copy        */
-    NULL,                    /*dxpl_free        */
-    H5FD_family_open,                /*open            */
-    H5FD_family_close,                /*close            */
-    H5FD_family_cmp,                /*cmp            */
-    H5FD_family_query,                        /*query            */
-    NULL,                    /*get_type_map        */
-    NULL,                    /*alloc            */
-    NULL,                    /*free            */
-    H5FD_family_get_eoa,            /*get_eoa        */
-    H5FD_family_set_eoa,            /*set_eoa        */
-    H5FD_family_get_eof,            /*get_eof        */
-    H5FD_family_get_handle,                     /*get_handle            */
-    H5FD_family_read,                /*read            */
-    H5FD_family_write,                /*write            */
-    H5FD_family_flush,                /*flush            */
-    H5FD_family_truncate,            /*truncate        */
-    NULL,                                       /*lock                  */
-    NULL,                                       /*unlock                */
-    H5FD_FLMAP_DICHOTOMY                        /*fl_map                */
+    "family",                   /*name            */
+    HADDR_MAX,                  /*maxaddr        */
+    H5F_CLOSE_WEAK,             /*fc_degree        */
+    H5FD_family_sb_size,        /*sb_size        */
+    H5FD_family_sb_encode,      /*sb_encode        */
+    H5FD_family_sb_decode,      /*sb_decode        */
+    sizeof(H5FD_family_fapl_t), /*fapl_size        */
+    H5FD_family_fapl_get,       /*fapl_get        */
+    H5FD_family_fapl_copy,      /*fapl_copy        */
+    H5FD_family_fapl_free,      /*fapl_free        */
+    0,                          /*dxpl_size        */
+    NULL,                       /*dxpl_copy        */
+    NULL,                       /*dxpl_free        */
+    H5FD_family_open,           /*open            */
+    H5FD_family_close,          /*close            */
+    H5FD_family_cmp,            /*cmp            */
+    H5FD_family_query,          /*query            */
+    NULL,                       /*get_type_map        */
+    NULL,                       /*alloc            */
+    NULL,                       /*free            */
+    H5FD_family_get_eoa,        /*get_eoa        */
+    H5FD_family_set_eoa,        /*set_eoa        */
+    H5FD_family_get_eof,        /*get_eof        */
+    H5FD_family_get_handle,     /*get_handle            */
+    H5FD_family_read,           /*read            */
+    H5FD_family_write,          /*write            */
+    H5FD_family_flush,          /*flush            */
+    H5FD_family_truncate,       /*truncate        */
+    NULL,                       /*lock                  */
+    NULL,                       /*unlock                */
+    H5FD_FLMAP_DICHOTOMY        /*fl_map                */
 };
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5FD_family_init_interface -- Initialize interface-specific information
@@ -162,7 +157,6 @@ H5FD_family_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_family_init())
 } /* H5FD_family_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_init
  *
@@ -183,11 +177,11 @@ H5FD_family_init_interface(void)
 hid_t
 H5FD_family_init(void)
 {
-    hid_t ret_value = H5FD_FAMILY_g;   /* Return value */
+    hid_t ret_value = H5FD_FAMILY_g; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5I_VFL != H5I_get_type(H5FD_FAMILY_g))
+    if (H5I_VFL != H5I_get_type(H5FD_FAMILY_g))
         H5FD_FAMILY_g = H5FD_register(&H5FD_family_g, sizeof(H5FD_class_t), FALSE);
 
     /* Set return value */
@@ -197,7 +191,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FD_family_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD_family_term
  *
@@ -218,12 +211,11 @@ H5FD_family_term(void)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Reset VFL ID */
-    H5FD_FAMILY_g=0;
+    H5FD_FAMILY_g = 0;
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5FD_family_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_family
  *
@@ -252,39 +244,36 @@ H5FD_family_term(void)
 herr_t
 H5Pset_fapl_family(hid_t fapl_id, hsize_t msize, hid_t memb_fapl_id)
 {
-    herr_t ret_value;
-    H5FD_family_fapl_t    fa={0, -1};
-    H5P_genplist_t *plist;      /* Property list pointer */
+    herr_t             ret_value;
+    H5FD_family_fapl_t fa = {0, -1};
+    H5P_genplist_t *   plist; /* Property list pointer */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ihi", fapl_id, msize, memb_fapl_id);
 
-
     /* Check arguments */
-    if(TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
+    if (TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
-    if(H5P_DEFAULT == memb_fapl_id)
+    if (H5P_DEFAULT == memb_fapl_id)
         memb_fapl_id = H5P_FILE_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(memb_fapl_id, H5P_FILE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
+    else if (TRUE != H5P_isa_class(memb_fapl_id, H5P_FILE_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
 
     /*
      * Initialize driver specific information. No need to copy it into the FA
      * struct since all members will be copied by H5P_set_driver().
      */
-    fa.memb_size = msize;
+    fa.memb_size    = msize;
     fa.memb_fapl_id = memb_fapl_id;
 
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
-    ret_value= H5P_set_driver(plist, H5FD_FAMILY, &fa);
+    ret_value = H5P_set_driver(plist, H5FD_FAMILY, &fa);
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_fapl_family
  *
@@ -308,26 +297,25 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fapl_family(hid_t fapl_id, hsize_t *msize/*out*/,
-        hid_t *memb_fapl_id/*out*/)
+H5Pget_fapl_family(hid_t fapl_id, hsize_t *msize /*out*/, hid_t *memb_fapl_id /*out*/)
 {
-    H5FD_family_fapl_t    *fa;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5FD_family_fapl_t *fa;
+    H5P_genplist_t *    plist;               /* Property list pointer */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", fapl_id, msize, memb_fapl_id);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
-    if(H5FD_FAMILY != H5P_get_driver(plist))
+    if (H5FD_FAMILY != H5P_get_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
-    if(NULL == (fa = (H5FD_family_fapl_t *)H5P_get_driver_info(plist)))
+    if (NULL == (fa = (H5FD_family_fapl_t *)H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
-    if(msize)
+    if (msize)
         *msize = fa->memb_size;
-    if(memb_fapl_id) {
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(fa->memb_fapl_id)))
+    if (memb_fapl_id) {
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(fa->memb_fapl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
         *memb_fapl_id = H5P_copy_plist(plist, TRUE);
     } /* end if */
@@ -336,7 +324,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_fapl_get
  *
@@ -357,33 +344,32 @@ done:
 static void *
 H5FD_family_fapl_get(H5FD_t *_file)
 {
-    H5FD_family_t    *file = (H5FD_family_t*)_file;
-    H5FD_family_fapl_t    *fa = NULL;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    void *ret_value;       /* Return value */
+    H5FD_family_t *     file = (H5FD_family_t *)_file;
+    H5FD_family_fapl_t *fa   = NULL;
+    H5P_genplist_t *    plist;     /* Property list pointer */
+    void *              ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(NULL == (fa = (H5FD_family_fapl_t *)H5MM_calloc(sizeof(H5FD_family_fapl_t))))
+    if (NULL == (fa = (H5FD_family_fapl_t *)H5MM_calloc(sizeof(H5FD_family_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     fa->memb_size = file->memb_size;
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(file->memb_fapl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(file->memb_fapl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
     fa->memb_fapl_id = H5P_copy_plist(plist, FALSE);
 
     /* Set return value */
-    ret_value=fa;
+    ret_value = fa;
 
 done:
-    if(ret_value==NULL) {
-        if(fa!=NULL)
+    if (ret_value == NULL) {
+        if (fa != NULL)
             H5MM_xfree(fa);
     } /* end if */
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_fapl_copy
  *
@@ -403,42 +389,41 @@ done:
 static void *
 H5FD_family_fapl_copy(const void *_old_fa)
 {
-    const H5FD_family_fapl_t *old_fa = (const H5FD_family_fapl_t*)_old_fa;
-    H5FD_family_fapl_t *new_fa = NULL;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    void *ret_value;       /* Return value */
+    const H5FD_family_fapl_t *old_fa = (const H5FD_family_fapl_t *)_old_fa;
+    H5FD_family_fapl_t *      new_fa = NULL;
+    H5P_genplist_t *          plist;     /* Property list pointer */
+    void *                    ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(NULL == (new_fa = (H5FD_family_fapl_t *)H5MM_malloc(sizeof(H5FD_family_fapl_t))))
+    if (NULL == (new_fa = (H5FD_family_fapl_t *)H5MM_malloc(sizeof(H5FD_family_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the fields of the structure */
     HDmemcpy(new_fa, old_fa, sizeof(H5FD_family_fapl_t));
 
     /* Deep copy the property list objects in the structure */
-    if(old_fa->memb_fapl_id==H5P_FILE_ACCESS_DEFAULT) {
-        if(H5I_inc_ref(new_fa->memb_fapl_id, FALSE)<0)
+    if (old_fa->memb_fapl_id == H5P_FILE_ACCESS_DEFAULT) {
+        if (H5I_inc_ref(new_fa->memb_fapl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTINC, NULL, "unable to increment ref count on VFL driver")
     } /* end if */
     else {
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(old_fa->memb_fapl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(old_fa->memb_fapl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
         new_fa->memb_fapl_id = H5P_copy_plist(plist, FALSE);
     } /* end else */
 
     /* Set return value */
-    ret_value=new_fa;
+    ret_value = new_fa;
 
 done:
-    if(ret_value==NULL) {
-        if(new_fa!=NULL)
+    if (ret_value == NULL) {
+        if (new_fa != NULL)
             H5MM_xfree(new_fa);
     } /* end if */
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_fapl_free
  *
@@ -458,12 +443,12 @@ done:
 static herr_t
 H5FD_family_fapl_free(void *_fa)
 {
-    H5FD_family_fapl_t    *fa = (H5FD_family_fapl_t*)_fa;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5FD_family_fapl_t *fa        = (H5FD_family_fapl_t *)_fa;
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(H5I_dec_ref(fa->memb_fapl_id) < 0)
+    if (H5I_dec_ref(fa->memb_fapl_id) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't close driver ID")
     H5MM_xfree(fa);
 
@@ -471,7 +456,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_sb_size
  *
@@ -499,7 +483,6 @@ H5FD_family_sb_size(H5FD_t H5_ATTR_UNUSED *_file)
     FUNC_LEAVE_NOAPI(8)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_sb_encode
  *
@@ -521,9 +504,9 @@ H5FD_family_sb_size(H5FD_t H5_ATTR_UNUSED *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out*/)
+H5FD_family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/)
 {
-    H5FD_family_t    *file = (H5FD_family_t*)_file;
+    H5FD_family_t *file = (H5FD_family_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -544,7 +527,6 @@ H5FD_family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out*
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_family_sb_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_sb_decode
  *
@@ -566,9 +548,9 @@ H5FD_family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out*
 static herr_t
 H5FD_family_sb_decode(H5FD_t *_file, const char H5_ATTR_UNUSED *name, const unsigned char *buf)
 {
-    H5FD_family_t    *file = (H5FD_family_t*)_file;
-    uint64_t            msize;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5FD_family_t *file = (H5FD_family_t *)_file;
+    uint64_t       msize;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -579,20 +561,22 @@ H5FD_family_sb_decode(H5FD_t *_file, const char H5_ATTR_UNUSED *name, const unsi
      * h5repart is being used to change member file size.  h5repart will open
      * files for read and write.  When the files are closed, metadata will be
      * flushed to the files and updated to this new size */
-    if(file->mem_newsize) {
+    if (file->mem_newsize) {
         file->memb_size = file->pmem_size = file->mem_newsize;
         HGOTO_DONE(ret_value)
     } /* end if */
 
     /* Default - use the saved member size */
-    if(file->pmem_size == H5F_FAMILY_DEFAULT)
-       file->pmem_size = msize;
+    if (file->pmem_size == H5F_FAMILY_DEFAULT)
+        file->pmem_size = msize;
 
     /* Check if member size from file access property is correct */
-    if(msize != file->pmem_size) {
+    if (msize != file->pmem_size) {
         char err_msg[128];
 
-        HDsnprintf(err_msg, sizeof(err_msg), "Family member size should be %lu.  But the size from file access property is %lu", (unsigned long)msize, (unsigned long)file->pmem_size);
+        HDsnprintf(err_msg, sizeof(err_msg),
+                   "Family member size should be %lu.  But the size from file access property is %lu",
+                   (unsigned long)msize, (unsigned long)file->pmem_size);
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, err_msg)
     } /* end if */
 
@@ -604,7 +588,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_family_sb_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_open
  *
@@ -646,92 +629,91 @@ done:
  */
 H5_GCC_DIAG_OFF("format-nonliteral")
 static H5FD_t *
-H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
-        haddr_t maxaddr)
+H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_family_t    *file=NULL;
-    H5FD_t             *ret_value=NULL;
-    char        memb_name[4096], temp[4096];
-    hsize_t        eof=HADDR_UNDEF;
-    unsigned        t_flags = flags & ~H5F_ACC_CREAT;
+    H5FD_family_t *file      = NULL;
+    H5FD_t *       ret_value = NULL;
+    char           memb_name[4096], temp[4096];
+    hsize_t        eof     = HADDR_UNDEF;
+    unsigned       t_flags = flags & ~H5F_ACC_CREAT;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check arguments */
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if(0 == maxaddr || HADDR_UNDEF == maxaddr)
+    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
 
     /* Initialize file from file access properties */
-    if(NULL == (file = (H5FD_family_t *)H5MM_calloc(sizeof(H5FD_family_t))))
+    if (NULL == (file = (H5FD_family_t *)H5MM_calloc(sizeof(H5FD_family_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
-    if(H5P_FILE_ACCESS_DEFAULT==fapl_id) {
+    if (H5P_FILE_ACCESS_DEFAULT == fapl_id) {
         file->memb_fapl_id = H5P_FILE_ACCESS_DEFAULT;
-        if(H5I_inc_ref(file->memb_fapl_id, FALSE) < 0)
+        if (H5I_inc_ref(file->memb_fapl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTINC, NULL, "unable to increment ref count on VFL driver")
-        file->memb_size = 1024 * 1024 * 1024; /*1GB. Actual member size to be updated later */
-        file->pmem_size = 1024 * 1024 * 1024; /*1GB. Member size passed in through property */
-        file->mem_newsize = 0;            /*New member size used by h5repart only       */
-    } /* end if */
+        file->memb_size   = 1024 * 1024 * 1024; /*1GB. Actual member size to be updated later */
+        file->pmem_size   = 1024 * 1024 * 1024; /*1GB. Member size passed in through property */
+        file->mem_newsize = 0;                  /*New member size used by h5repart only       */
+    }                                           /* end if */
     else {
-        H5P_genplist_t      *plist;      /* Property list pointer */
+        H5P_genplist_t *    plist; /* Property list pointer */
         H5FD_family_fapl_t *fa;
 
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
-        if(NULL == (fa = (H5FD_family_fapl_t *)H5P_get_driver_info(plist)))
+        if (NULL == (fa = (H5FD_family_fapl_t *)H5P_get_driver_info(plist)))
             HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
 
         /* Check for new family file size. It's used by h5repart only. */
-        if(H5P_exist_plist(plist, H5F_ACS_FAMILY_NEWSIZE_NAME) > 0) {
-            hsize_t fam_newsize = 0;        /* New member size, when repartitioning */
+        if (H5P_exist_plist(plist, H5F_ACS_FAMILY_NEWSIZE_NAME) > 0) {
+            hsize_t fam_newsize = 0; /* New member size, when repartitioning */
 
             /* Get the new family file size */
-            if(H5P_get(plist, H5F_ACS_FAMILY_NEWSIZE_NAME, &fam_newsize) < 0)
+            if (H5P_get(plist, H5F_ACS_FAMILY_NEWSIZE_NAME, &fam_newsize) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get new family member size")
 
             /* Store information for later */
-            file->mem_newsize = fam_newsize; /* New member size passed in through property */
+            file->mem_newsize    = fam_newsize; /* New member size passed in through property */
             file->repart_members = TRUE;
         } /* end if */
 
-        if(fa->memb_fapl_id==H5P_FILE_ACCESS_DEFAULT) {
-            if(H5I_inc_ref(fa->memb_fapl_id, FALSE)<0)
+        if (fa->memb_fapl_id == H5P_FILE_ACCESS_DEFAULT) {
+            if (H5I_inc_ref(fa->memb_fapl_id, FALSE) < 0)
                 HGOTO_ERROR(H5E_VFL, H5E_CANTINC, NULL, "unable to increment ref count on VFL driver")
             file->memb_fapl_id = fa->memb_fapl_id;
         } /* end if */
         else {
-            if(NULL == (plist = (H5P_genplist_t *)H5I_object(fa->memb_fapl_id)))
+            if (NULL == (plist = (H5P_genplist_t *)H5I_object(fa->memb_fapl_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
             file->memb_fapl_id = H5P_copy_plist(plist, FALSE);
-        } /* end else */
+        }                                /* end else */
         file->memb_size = fa->memb_size; /* Actual member size to be updated later */
         file->pmem_size = fa->memb_size; /* Member size passed in through property */
-    } /* end else */
-    file->name = H5MM_strdup(name);
+    }                                    /* end else */
+    file->name  = H5MM_strdup(name);
     file->flags = flags;
 
     /* Check that names are unique */
     HDsnprintf(memb_name, sizeof(memb_name), name, 0);
     HDsnprintf(temp, sizeof(temp), name, 1);
-    if(!HDstrcmp(memb_name, temp))
+    if (!HDstrcmp(memb_name, temp))
         HGOTO_ERROR(H5E_FILE, H5E_FILEEXISTS, NULL, "file names not unique")
 
     /* Open all the family members */
-    while(1) {
+    while (1) {
         HDsnprintf(memb_name, sizeof(memb_name), name, file->nmembs);
 
         /* Enlarge member array */
-        if(file->nmembs >= file->amembs) {
+        if (file->nmembs >= file->amembs) {
             unsigned n = MAX(64, 2 * file->amembs);
             H5FD_t **x;
 
             HDassert(n > 0);
-            if(NULL == (x = (H5FD_t **)H5MM_realloc(file->memb, n * sizeof(H5FD_t *))))
+            if (NULL == (x = (H5FD_t **)H5MM_realloc(file->memb, n * sizeof(H5FD_t *))))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to reallocate members")
             file->amembs = n;
-            file->memb = x;
+            file->memb   = x;
         } /* end if */
 
         /*
@@ -739,12 +721,14 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
          * otherwise an open failure means that we've reached the last member.
          * Allow H5F_ACC_CREAT only on the first family member.
          */
-        H5E_BEGIN_TRY {
-            file->memb[file->nmembs] = H5FDopen(memb_name,
-                (0==file->nmembs ? flags : t_flags), file->memb_fapl_id, HADDR_UNDEF);
-        } H5E_END_TRY;
+        H5E_BEGIN_TRY
+        {
+            file->memb[file->nmembs] =
+                H5FDopen(memb_name, (0 == file->nmembs ? flags : t_flags), file->memb_fapl_id, HADDR_UNDEF);
+        }
+        H5E_END_TRY;
         if (!file->memb[file->nmembs]) {
-            if (0==file->nmembs)
+            if (0 == file->nmembs)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open member file")
             H5E_clear_stack(NULL);
             break;
@@ -756,30 +740,31 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
      * smaller than the size specified through H5Pset_fapl_family().  Update the actual
      * member size.
      */
-    if ((eof=H5FDget_eof(file->memb[0]))) file->memb_size = eof;
+    if ((eof = H5FDget_eof(file->memb[0])))
+        file->memb_size = eof;
 
-    ret_value=(H5FD_t *)file;
+    ret_value = (H5FD_t *)file;
 
 done:
     /* Cleanup and fail */
-    if(ret_value == NULL && file != NULL) {
-        unsigned nerrors = 0;   /* Number of errors closing member files */
-        unsigned u;             /* Local index variable */
+    if (ret_value == NULL && file != NULL) {
+        unsigned nerrors = 0; /* Number of errors closing member files */
+        unsigned u;           /* Local index variable */
 
         /* Close as many members as possible. Use private function here to avoid clearing
          * the error stack. We need the error message to indicate wrong member file size. */
-        for(u = 0; u < file->nmembs; u++)
-            if(file->memb[u])
-                if(H5FD_close(file->memb[u]) < 0)
+        for (u = 0; u < file->nmembs; u++)
+            if (file->memb[u])
+                if (H5FD_close(file->memb[u]) < 0)
                     nerrors++;
-        if(nerrors)
+        if (nerrors)
             HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, NULL, "unable to close member files")
 
-        if(file->memb)
+        if (file->memb)
             H5MM_xfree(file->memb);
-        if(H5I_dec_ref(file->memb_fapl_id) < 0)
+        if (H5I_dec_ref(file->memb_fapl_id) < 0)
             HDONE_ERROR(H5E_VFL, H5E_CANTDEC, NULL, "can't close driver ID")
-        if(file->name)
+        if (file->name)
             H5MM_xfree(file->name);
         H5MM_xfree(file);
     } /* end if */
@@ -788,7 +773,6 @@ done:
 } /* end H5FD_family_open() */
 H5_GCC_DIAG_ON("format-nonliteral")
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_close
  *
@@ -808,29 +792,29 @@ H5_GCC_DIAG_ON("format-nonliteral")
 static herr_t
 H5FD_family_close(H5FD_t *_file)
 {
-    H5FD_family_t *file = (H5FD_family_t*)_file;
-    unsigned    nerrors = 0;    /* Number of errors while closing member files */
-    unsigned    u;              /* Local index variable */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5FD_family_t *file    = (H5FD_family_t *)_file;
+    unsigned       nerrors = 0;         /* Number of errors while closing member files */
+    unsigned       u;                   /* Local index variable */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Close as many members as possible. Use private function here to avoid clearing
      * the error stack. We need the error message to indicate wrong member file size. */
-    for(u = 0; u < file->nmembs; u++) {
-        if(file->memb[u]) {
-            if(H5FD_close(file->memb[u]) < 0)
+    for (u = 0; u < file->nmembs; u++) {
+        if (file->memb[u]) {
+            if (H5FD_close(file->memb[u]) < 0)
                 nerrors++;
             else
                 file->memb[u] = NULL;
         } /* end if */
-    } /* end for */
-    if(nerrors)
+    }     /* end for */
+    if (nerrors)
         /* Push error, but keep going*/
         HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close member files")
 
     /* Clean up other stuff */
-    if(H5I_dec_ref(file->memb_fapl_id) < 0)
+    if (H5I_dec_ref(file->memb_fapl_id) < 0)
         /* Push error, but keep going*/
         HDONE_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't close driver ID")
     H5MM_xfree(file->memb);
@@ -840,7 +824,6 @@ H5FD_family_close(H5FD_t *_file)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_family_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_cmp
  *
@@ -862,22 +845,21 @@ H5FD_family_close(H5FD_t *_file)
 static int
 H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_family_t    *f1 = (const H5FD_family_t*)_f1;
-    const H5FD_family_t    *f2 = (const H5FD_family_t*)_f2;
-    int ret_value=(H5FD_VFD_DEFAULT);
+    const H5FD_family_t *f1        = (const H5FD_family_t *)_f1;
+    const H5FD_family_t *f2        = (const H5FD_family_t *)_f2;
+    int                  ret_value = (H5FD_VFD_DEFAULT);
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    assert(f1->nmembs>=1 && f1->memb[0]);
-    assert(f2->nmembs>=1 && f2->memb[0]);
+    assert(f1->nmembs >= 1 && f1->memb[0]);
+    assert(f2->nmembs >= 1 && f2->memb[0]);
 
-    ret_value= H5FDcmp(f1->memb[0], f2->memb[0]);
+    ret_value = H5FDcmp(f1->memb[0], f2->memb[0]);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_query
  *
@@ -894,29 +876,29 @@ done:
  */
 /* ARGSUSED */
 static herr_t
-H5FD_family_query(const H5FD_t * _file, unsigned long *flags /* out */)
+H5FD_family_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
-    const H5FD_family_t    *file = (const H5FD_family_t*)_file;    /* Family VFD info */
+    const H5FD_family_t *file = (const H5FD_family_t *)_file; /* Family VFD info */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set the VFL feature flags that this driver supports */
-    if(flags) {
+    if (flags) {
         *flags = 0;
-        *flags |= H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations */
         *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes. */
-        *flags |= H5FD_FEAT_DATA_SIEVE;       /* OK to perform data sieving for faster raw data reads & writes */
+        *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */
         *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
 
         /* Check for flags that are set by h5repart */
-        if(file && file->repart_members)
-            *flags |= H5FD_FEAT_DIRTY_SBLK_LOAD; /* Mark the superblock dirty when it is loaded (so the family member sizes are rewritten) */
-    } /* end if */
+        if (file && file->repart_members)
+            *flags |= H5FD_FEAT_DIRTY_SBLK_LOAD; /* Mark the superblock dirty when it is loaded (so the family
+                                                    member sizes are rewritten) */
+    }                                            /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_family_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_get_eoa
  *
@@ -941,14 +923,13 @@ H5FD_family_query(const H5FD_t * _file, unsigned long *flags /* out */)
 static haddr_t
 H5FD_family_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_family_t    *file = (const H5FD_family_t*)_file;
+    const H5FD_family_t *file = (const H5FD_family_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(file->eoa)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_set_eoa
  *
@@ -978,55 +959,57 @@ H5_GCC_DIAG_OFF("format-nonliteral")
 static herr_t
 H5FD_family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t abs_eoa)
 {
-    H5FD_family_t    *file = (H5FD_family_t*)_file;
+    H5FD_family_t *file = (H5FD_family_t *)_file;
     haddr_t        addr = abs_eoa;
-    char        memb_name[4096];
-    unsigned        u;                      /* Local index variable */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    char           memb_name[4096];
+    unsigned       u;                   /* Local index variable */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    for(u = 0; addr || u < file->nmembs; u++) {
+    for (u = 0; addr || u < file->nmembs; u++) {
 
         /* Enlarge member array */
-        if(u >= file->amembs) {
+        if (u >= file->amembs) {
             unsigned n = MAX(64, 2 * file->amembs);
             H5FD_t **x = (H5FD_t **)H5MM_realloc(file->memb, n * sizeof(H5FD_t *));
 
-            if(!x)
+            if (!x)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory block")
             file->amembs = n;
-            file->memb = x;
+            file->memb   = x;
             file->nmembs = u;
         } /* end if */
 
         /* Create another file if necessary */
-        if(u >= file->nmembs || !file->memb[u]) {
-            file->nmembs = MAX(file->nmembs, u+1);
+        if (u >= file->nmembs || !file->memb[u]) {
+            file->nmembs = MAX(file->nmembs, u + 1);
             HDsnprintf(memb_name, sizeof(memb_name), file->name, u);
-            H5E_BEGIN_TRY {
+            H5E_BEGIN_TRY
+            {
                 H5_CHECK_OVERFLOW(file->memb_size, hsize_t, haddr_t);
-                file->memb[u] = H5FDopen(memb_name, file->flags | H5F_ACC_CREAT,
-                             file->memb_fapl_id, (haddr_t)file->memb_size);
-            } H5E_END_TRY;
-            if(NULL == file->memb[u])
+                file->memb[u] = H5FDopen(memb_name, file->flags | H5F_ACC_CREAT, file->memb_fapl_id,
+                                         (haddr_t)file->memb_size);
+            }
+            H5E_END_TRY;
+            if (NULL == file->memb[u])
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to open member file")
         } /* end if */
 
         /* Set the EOA marker for the member */
         /* (Note compensating for base address addition in internal routine) */
         H5_CHECK_OVERFLOW(file->memb_size, hsize_t, haddr_t);
-        if(addr > (haddr_t)file->memb_size) {
-            if(H5FD_set_eoa(file->memb[u], type, ((haddr_t)file->memb_size - file->pub.base_addr)) < 0)
+        if (addr > (haddr_t)file->memb_size) {
+            if (H5FD_set_eoa(file->memb[u], type, ((haddr_t)file->memb_size - file->pub.base_addr)) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to set file eoa")
             addr -= file->memb_size;
         } /* end if */
         else {
-            if(H5FD_set_eoa(file->memb[u], type, (addr - file->pub.base_addr)) < 0)
+            if (H5FD_set_eoa(file->memb[u], type, (addr - file->pub.base_addr)) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to set file eoa")
             addr = 0;
         } /* end else */
-    } /* end for */
+    }     /* end for */
 
     file->eoa = abs_eoa;
 
@@ -1035,7 +1018,6 @@ done:
 }
 H5_GCC_DIAG_ON("format-nonliteral")
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_get_eof
  *
@@ -1058,10 +1040,10 @@ H5_GCC_DIAG_ON("format-nonliteral")
 static haddr_t
 H5FD_family_get_eof(const H5FD_t *_file)
 {
-    const H5FD_family_t    *file = (const H5FD_family_t*)_file;
-    haddr_t        eof=0;
-    int            i;      /* Local index variable */
-    haddr_t ret_value;   /* Return value */
+    const H5FD_family_t *file = (const H5FD_family_t *)_file;
+    haddr_t              eof  = 0;
+    int                  i;         /* Local index variable */
+    haddr_t              ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1071,10 +1053,10 @@ H5FD_family_get_eof(const H5FD_t *_file)
      * loop with i==0.
      */
     HDassert(file->nmembs > 0);
-    for(i = (int)file->nmembs - 1; i >= 0; --i) {
-        if((eof = H5FD_get_eof(file->memb[i])) != 0)
+    for (i = (int)file->nmembs - 1; i >= 0; --i) {
+        if ((eof = H5FD_get_eof(file->memb[i])) != 0)
             break;
-        if(0 == i)
+        if (0 == i)
             break;
     } /* end for */
 
@@ -1085,7 +1067,7 @@ H5FD_family_get_eof(const H5FD_t *_file)
      * The file size is the number of members before the i'th member plus the
      * size of the i'th member.
      */
-    eof += ((unsigned)i)*file->memb_size;
+    eof += ((unsigned)i) * file->memb_size;
 
     /* Set return value */
     ret_value = MAX(eof, file->eoa);
@@ -1093,7 +1075,6 @@ H5FD_family_get_eof(const H5FD_t *_file)
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD_family_get_handle
  *
@@ -1109,25 +1090,25 @@ H5FD_family_get_eof(const H5FD_t *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
+H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
 {
-    H5FD_family_t       *file = (H5FD_family_t *)_file;
-    H5P_genplist_t      *plist;
-    hsize_t             offset;
-    int                 memb;
-    herr_t              ret_value;
+    H5FD_family_t * file = (H5FD_family_t *)_file;
+    H5P_genplist_t *plist;
+    hsize_t         offset;
+    int             memb;
+    herr_t          ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get the plist structure and family offset */
-    if(NULL == (plist = H5P_object_verify(fapl, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-    if(H5P_get(plist, H5F_ACS_FAMILY_OFFSET_NAME, &offset) < 0)
+    if (H5P_get(plist, H5F_ACS_FAMILY_OFFSET_NAME, &offset) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get offset for family driver")
 
-    if(offset > (file->memb_size * file->nmembs))
+    if (offset > (file->memb_size * file->nmembs))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "offset is bigger than file size")
-    memb = (int)(offset/file->memb_size);
+    memb = (int)(offset / file->memb_size);
 
     ret_value = H5FD_get_vfd_handle(file->memb[memb], fapl, file_handle);
 
@@ -1135,7 +1116,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_read
  *
@@ -1156,17 +1136,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
-        void *_buf/*out*/)
+H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *_buf /*out*/)
 {
-    H5FD_family_t    *file = (H5FD_family_t*)_file;
-    unsigned char    *buf = (unsigned char*)_buf;
-    haddr_t        sub;
-    size_t        req;
-    hsize_t             tempreq;
-    unsigned        u;              /* Local index variable */
-    H5P_genplist_t      *plist;      /* Property list pointer */
-    herr_t              ret_value=SUCCEED;       /* Return value */
+    H5FD_family_t * file = (H5FD_family_t *)_file;
+    unsigned char * buf  = (unsigned char *)_buf;
+    haddr_t         sub;
+    size_t          req;
+    hsize_t         tempreq;
+    unsigned        u;                   /* Local index variable */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1174,26 +1153,26 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
      * Get the member data transfer property list. If the transfer property
      * list does not belong to this driver then assume defaults
      */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     /* Read from each member */
-    while(size > 0) {
+    while (size > 0) {
         H5_CHECKED_ASSIGN(u, unsigned, addr / file->memb_size, hsize_t);
 
         sub = addr % file->memb_size;
 
-    /* This check is for mainly for IA32 architecture whose size_t's size
-    * is 4 bytes, to prevent overflow when user application is trying to
-    * write files bigger than 4GB. */
-        tempreq = file->memb_size-sub;
-    if(tempreq > SIZET_MAX)
-        tempreq = SIZET_MAX;
+        /* This check is for mainly for IA32 architecture whose size_t's size
+         * is 4 bytes, to prevent overflow when user application is trying to
+         * write files bigger than 4GB. */
+        tempreq = file->memb_size - sub;
+        if (tempreq > SIZET_MAX)
+            tempreq = SIZET_MAX;
         req = MIN(size, (size_t)tempreq);
 
-        HDassert(u<file->nmembs);
+        HDassert(u < file->nmembs);
 
-        if (H5FDread(file->memb[u], type, dxpl_id, sub, req, buf)<0)
+        if (H5FDread(file->memb[u], type, dxpl_id, sub, req, buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "member file read failed")
 
         addr += req;
@@ -1205,7 +1184,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_write
  *
@@ -1225,17 +1203,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
-        const void *_buf)
+H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *_buf)
 {
-    H5FD_family_t    *file = (H5FD_family_t*)_file;
-    const unsigned char    *buf = (const unsigned char*)_buf;
-    haddr_t        sub;
-    size_t        req;
-    hsize_t             tempreq;
-    unsigned        u;      /* Local index variable */
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5FD_family_t *      file = (H5FD_family_t *)_file;
+    const unsigned char *buf  = (const unsigned char *)_buf;
+    haddr_t              sub;
+    size_t               req;
+    hsize_t              tempreq;
+    unsigned             u;                   /* Local index variable */
+    H5P_genplist_t *     plist;               /* Property list pointer */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1243,11 +1220,11 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s
      * Get the member data transfer property list. If the transfer property
      * list does not belong to this driver then assume defaults.
      */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     /* Write to each member */
-    while (size>0) {
+    while (size > 0) {
         H5_CHECKED_ASSIGN(u, unsigned, addr / file->memb_size, hsize_t);
 
         sub = addr % file->memb_size;
@@ -1255,14 +1232,14 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s
         /* This check is for mainly for IA32 architecture whose size_t's size
          * is 4 bytes, to prevent overflow when user application is trying to
          * write files bigger than 4GB. */
-        tempreq = file->memb_size-sub;
-    if(tempreq > SIZET_MAX)
-        tempreq = SIZET_MAX;
+        tempreq = file->memb_size - sub;
+        if (tempreq > SIZET_MAX)
+            tempreq = SIZET_MAX;
         req = MIN(size, (size_t)tempreq);
 
-        HDassert(u<file->nmembs);
+        HDassert(u < file->nmembs);
 
-        if (H5FDwrite(file->memb[u], type, dxpl_id, sub, req, buf)<0)
+        if (H5FDwrite(file->memb[u], type, dxpl_id, sub, req, buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "member file write failed")
 
         addr += req;
@@ -1274,7 +1251,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_flush
  *
@@ -1291,24 +1267,23 @@ done:
 static herr_t
 H5FD_family_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
 {
-    H5FD_family_t    *file = (H5FD_family_t*)_file;
-    unsigned        u, nerrors = 0;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5FD_family_t *file = (H5FD_family_t *)_file;
+    unsigned       u, nerrors = 0;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    for(u = 0; u < file->nmembs; u++)
-        if(file->memb[u] && H5FD_flush(file->memb[u], dxpl_id, closing) < 0)
+    for (u = 0; u < file->nmembs; u++)
+        if (file->memb[u] && H5FD_flush(file->memb[u], dxpl_id, closing) < 0)
             nerrors++;
 
-    if(nerrors)
+    if (nerrors)
         HGOTO_ERROR(H5E_IO, H5E_BADVALUE, FAIL, "unable to flush member files")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_family_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_truncate
  *
@@ -1326,20 +1301,19 @@ done:
 static herr_t
 H5FD_family_truncate(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
 {
-    H5FD_family_t    *file = (H5FD_family_t*)_file;
-    unsigned        u, nerrors = 0;
-    herr_t          ret_value = SUCCEED;       /* Return value */
+    H5FD_family_t *file = (H5FD_family_t *)_file;
+    unsigned       u, nerrors = 0;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    for(u = 0; u < file->nmembs; u++)
-        if(file->memb[u] && H5FD_truncate(file->memb[u], dxpl_id, closing) < 0)
+    for (u = 0; u < file->nmembs; u++)
+        if (file->memb[u] && H5FD_truncate(file->memb[u], dxpl_id, closing) < 0)
             nerrors++;
 
-    if(nerrors)
+    if (nerrors)
         HGOTO_ERROR(H5E_IO, H5E_BADVALUE, FAIL, "unable to flush member files")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_family_truncate() */
-
diff --git a/src/H5FDfamily.h b/src/H5FDfamily.h
index 7dde5b8..6300767 100644
--- a/src/H5FDfamily.h
+++ b/src/H5FDfamily.h
@@ -22,18 +22,16 @@
 
 #include "H5Ipublic.h"
 
-#define H5FD_FAMILY	(H5FD_family_init())
+#define H5FD_FAMILY (H5FD_family_init())
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-H5_DLL hid_t H5FD_family_init(void);
-H5_DLL void H5FD_family_term(void);
-H5_DLL herr_t H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size,
-			  hid_t memb_fapl_id);
-H5_DLL herr_t H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size/*out*/,
-			  hid_t *memb_fapl_id/*out*/);
+H5_DLL hid_t  H5FD_family_init(void);
+H5_DLL void   H5FD_family_term(void);
+H5_DLL herr_t H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size, hid_t memb_fapl_id);
+H5_DLL herr_t H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size /*out*/, hid_t *memb_fapl_id /*out*/);
 
 #ifdef __cplusplus
 }
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index e833057..0f18318 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -21,18 +21,17 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC  H5FD_hdfs_init_interface
-
-
-#include "H5private.h"      /* Generic Functions        */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5Fprivate.h"     /* File access              */
-#include "H5FDprivate.h"    /* File drivers             */
-#include "H5FDhdfs.h"       /* hdfs file driver         */
-#include "H5FLprivate.h"    /* Free Lists               */
-#include "H5Iprivate.h"     /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management        */
-#include "H5Pprivate.h"     /* Property lists           */
+#define H5_INTERFACE_INIT_FUNC H5FD_hdfs_init_interface
+
+#include "H5private.h"   /* Generic Functions        */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5Fprivate.h"  /* File access              */
+#include "H5FDprivate.h" /* File drivers             */
+#include "H5FDhdfs.h"    /* hdfs file driver         */
+#include "H5FLprivate.h" /* Free Lists               */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Pprivate.h"  /* Property lists           */
 
 #ifdef H5_HAVE_LIBHDFS
 #include "hdfs.h"
@@ -62,35 +61,32 @@ static hid_t H5FD_HDFS_g = 0;
  * 2^(10+(1*16)) = 2^26 = 64MB
  *     Reads of 64MB or greater fall in "overflow" bin[BIN_COUNT]
  */
-#define HDFS_STATS_BASE         2
-#define HDFS_STATS_INTERVAL     1
+#define HDFS_STATS_BASE        2
+#define HDFS_STATS_INTERVAL    1
 #define HDFS_STATS_START_POWER 10
 #define HDFS_STATS_BIN_COUNT   16 /* MUST BE GREATER THAN 0 */
 
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Calculate `BASE ^ (START_POWER + (INTERVAL * bin_i))`
  * Stores result at `(unsigned long long *) out_ptr`.
  * Used in computing boundaries between stats bins.
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
-#define HDFS_STATS_POW(bin_i, out_ptr) {                       \
-    unsigned long long donotshadowresult = 1;                  \
-    unsigned           donotshadowindex  = 0;                  \
-    for (donotshadowindex = 0;                                 \
-         donotshadowindex < (((bin_i) * HDFS_STATS_INTERVAL) + \
-                              HDFS_STATS_START_POWER);         \
-         donotshadowindex++)                                   \
-    {                                                          \
-        donotshadowresult *= HDFS_STATS_BASE;                  \
-    }                                                          \
-    *(out_ptr) = donotshadowresult;                            \
-}
+#define HDFS_STATS_POW(bin_i, out_ptr)                                                                       \
+    {                                                                                                        \
+        unsigned long long donotshadowresult = 1;                                                            \
+        unsigned           donotshadowindex  = 0;                                                            \
+        for (donotshadowindex = 0;                                                                           \
+             donotshadowindex < (((bin_i)*HDFS_STATS_INTERVAL) + HDFS_STATS_START_POWER);                    \
+             donotshadowindex++) {                                                                           \
+            donotshadowresult *= HDFS_STATS_BASE;                                                            \
+        }                                                                                                    \
+        *(out_ptr) = donotshadowresult;                                                                      \
+    }
 
 /* array to hold pre-computed boundaries for stats bins */
 static unsigned long long hdfs_stats_boundaries[HDFS_STATS_BIN_COUNT];
 
-
 /***************************************************************************
  *
  * Structure: hdfs_statsbin
@@ -140,7 +136,6 @@ typedef struct {
  */
 #define HDFS_HDFST_MAGIC 0x1AD5DE84
 
-
 /***************************************************************************
  *
  * Structure: hdfs_t
@@ -183,13 +178,12 @@ typedef struct {
  ***************************************************************************
  */
 typedef struct {
-    unsigned long  magic;
-    hdfsFS         filesystem;
-    hdfsFileInfo  *fileinfo;
-    hdfsFile       file;
+    unsigned long magic;
+    hdfsFS        filesystem;
+    hdfsFileInfo *fileinfo;
+    hdfsFile      file;
 } hdfs_t;
 
-
 /*--------------------------------------------------------------------------
  * Function:   H5FD_hdfs_handle_open
  *
@@ -205,17 +199,13 @@ typedef struct {
  *--------------------------------------------------------------------------
  */
 static hdfs_t *
-H5FD_hdfs_handle_open(
-        const char    *path,
-        const char    *namenode_name,
-        const int32_t  namenode_port,
-        const char    *user_name,
-        const char    *kerberos_ticket_cache,
-        const int32_t  stream_buffer_size)
+H5FD_hdfs_handle_open(const char *path, const char *namenode_name, const int32_t namenode_port,
+                      const char *user_name, const char *kerberos_ticket_cache,
+                      const int32_t stream_buffer_size)
 {
     struct hdfsBuilder *builder   = NULL;
-    hdfs_t             *handle    = NULL;
-    hdfs_t             *ret_value = NULL;
+    hdfs_t *            handle    = NULL;
+    hdfs_t *            ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -224,26 +214,21 @@ H5FD_hdfs_handle_open(
 #endif
 
     if (path == NULL || path[0] == '\0') {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                    "path cannot be null.\n")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "path cannot be null.\n")
     }
-    if (namenode_name == NULL /* || namenode_name[0] == '\0' */ ) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                    "namenode name cannot be null.\n")
+    if (namenode_name == NULL /* || namenode_name[0] == '\0' */) {
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "namenode name cannot be null.\n")
     }
     if (namenode_port < 0 || namenode_port > 65535) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                    "namenode port must be non-negative and <= 65535.\n")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "namenode port must be non-negative and <= 65535.\n")
     }
     if (stream_buffer_size < 0) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                    "buffer size must non-negative.\n")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "buffer size must non-negative.\n")
     }
 
     handle = (hdfs_t *)H5MM_malloc(sizeof(hdfs_t));
     if (handle == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, NULL,
-                    "could not malloc space for handle.\n")
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, NULL, "could not malloc space for handle.\n")
     }
 
     handle->magic      = (unsigned long)HDFS_HDFST_MAGIC;
@@ -253,8 +238,7 @@ H5FD_hdfs_handle_open(
 
     builder = hdfsNewBuilder();
     if (!builder) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                    "(hdfs) failed to create builder")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "(hdfs) failed to create builder")
     }
     hdfsBuilderSetNameNode(builder, namenode_name);
     hdfsBuilderSetNameNodePort(builder, (tPort)namenode_port);
@@ -267,24 +251,15 @@ H5FD_hdfs_handle_open(
     /* Call to `hdfsBuilderConnect` releases builder, regardless of success. */
     handle->filesystem = hdfsBuilderConnect(builder);
     if (!handle->filesystem) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                    "(hdfs) could not connect to default namenode")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "(hdfs) could not connect to default namenode")
     }
     handle->fileinfo = hdfsGetPathInfo(handle->filesystem, path);
     if (!handle->fileinfo) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                    "hdfsGetPathInfo failed")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "hdfsGetPathInfo failed")
     }
-    handle->file = hdfsOpenFile(
-            handle->filesystem,
-            path,
-            O_RDONLY,
-            stream_buffer_size,
-            0,
-            0);
+    handle->file = hdfsOpenFile(handle->filesystem, path, O_RDONLY, stream_buffer_size, 0, 0);
     if (!handle->file) {
-        HGOTO_ERROR(H5E_VFL, H5E_CANTOPENFILE, NULL,
-                    "(hdfs) could not open")
+        HGOTO_ERROR(H5E_VFL, H5E_CANTOPENFILE, NULL, "(hdfs) could not open")
     }
 
     ret_value = handle;
@@ -296,8 +271,7 @@ done:
         handle->magic++;
         if (handle->file != NULL) {
             if (FAIL == (hdfsCloseFile(handle->filesystem, handle->file))) {
-                HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL,
-                            "unable to close hdfs file handle")
+                HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL, "unable to close hdfs file handle")
             }
         }
         if (handle->fileinfo != NULL) {
@@ -305,8 +279,7 @@ done:
         }
         if (handle->filesystem != NULL) {
             if (FAIL == (hdfsDisconnect(handle->filesystem))) {
-                HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL,
-                            "unable to disconnect from hdfs")
+                HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL, "unable to disconnect from hdfs")
             }
         }
         H5MM_xfree(handle);
@@ -316,7 +289,6 @@ done:
 
 } /* H5FD_hdfs_handle_open() */
 
-
 /*--------------------------------------------------------------------------
  * Function:   H5FD_hdfs_handle_close
  *
@@ -344,19 +316,16 @@ H5FD_hdfs_handle_close(hdfs_t *handle)
 #endif
 
     if (handle == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "handle cannot be null.\n")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "handle cannot be null.\n")
     }
     if (handle->magic != HDFS_HDFST_MAGIC) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "handle has invalid magic.\n")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "handle has invalid magic.\n")
     }
 
     handle->magic++;
     if (handle->file != NULL) {
         if (FAIL == (hdfsCloseFile(handle->filesystem, handle->file))) {
-            HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL,
-                        "unable to close hdfs file handle")
+            HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to close hdfs file handle")
         }
     }
     if (handle->fileinfo != NULL) {
@@ -364,8 +333,7 @@ H5FD_hdfs_handle_close(hdfs_t *handle)
     }
     if (handle->filesystem != NULL) {
         if (FAIL == (hdfsDisconnect(handle->filesystem))) {
-            HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL,
-                        "unable to disconnect hdfs file system")
+            HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to disconnect hdfs file system")
         }
     }
 
@@ -378,7 +346,6 @@ done:
 
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /***************************************************************************
  *
  * Structure: H5FD_hdfs_t
@@ -440,15 +407,15 @@ done:
  ***************************************************************************
  */
 typedef struct H5FD_hdfs_t {
-    H5FD_t            pub;
-    H5FD_hdfs_fapl_t  fa;
-    haddr_t           eoa;
+    H5FD_t           pub;
+    H5FD_hdfs_fapl_t fa;
+    haddr_t          eoa;
 #ifdef H5_HAVE_LIBHDFS
-    hdfs_t           *hdfs_handle;
+    hdfs_t *hdfs_handle;
 #endif
 #if HDFS_STATS
-    hdfs_statsbin     meta[HDFS_STATS_BIN_COUNT + 1];
-    hdfs_statsbin     raw[HDFS_STATS_BIN_COUNT + 1];
+    hdfs_statsbin meta[HDFS_STATS_BIN_COUNT + 1];
+    hdfs_statsbin raw[HDFS_STATS_BIN_COUNT + 1];
 #endif
 } H5FD_hdfs_t;
 
@@ -462,67 +429,64 @@ typedef struct H5FD_hdfs_t {
  *                  Only included if HDFS code should compile.
  *
  */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
+#define MAXADDR (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
 #ifdef H5_HAVE_LIBHDFS
-#define ADDR_OVERFLOW(A)    (HADDR_UNDEF==(A) || ((A) & ~(haddr_t)MAXADDR))
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
 #endif /* H5_HAVE_LIBHDFS */
 
 /* Prototypes */
-static void   *H5FD_hdfs_fapl_get(H5FD_t *_file);
-static void   *H5FD_hdfs_fapl_copy(const void *_old_fa);
+static void *  H5FD_hdfs_fapl_get(H5FD_t *_file);
+static void *  H5FD_hdfs_fapl_copy(const void *_old_fa);
 static herr_t  H5FD_hdfs_fapl_free(void *_fa);
-static H5FD_t *H5FD_hdfs_open(const char *name, unsigned flags, hid_t fapl_id,
-                              haddr_t maxaddr);
+static H5FD_t *H5FD_hdfs_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
 static herr_t  H5FD_hdfs_close(H5FD_t *_file);
 static int     H5FD_hdfs_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
 static herr_t  H5FD_hdfs_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD_hdfs_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
 static herr_t  H5FD_hdfs_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD_hdfs_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_hdfs_get_handle(H5FD_t *_file, hid_t fapl,
-                                    void** file_handle);
-static herr_t  H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
-                               haddr_t addr, size_t size, void *buf);
-static herr_t  H5FD_hdfs_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
-                               haddr_t addr, size_t size, const void *buf);
-static herr_t  H5FD_hdfs_truncate(H5FD_t *_file, hid_t dxpl_id,
-                                  hbool_t closing);
+static herr_t  H5FD_hdfs_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                              void *buf);
+static herr_t  H5FD_hdfs_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                               const void *buf);
+static herr_t  H5FD_hdfs_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 static herr_t  H5FD_hdfs_lock(H5FD_t *_file, hbool_t rw);
 static herr_t  H5FD_hdfs_unlock(H5FD_t *_file);
-static herr_t  H5FD_hdfs_validate_config(const H5FD_hdfs_fapl_t * fa);
+static herr_t  H5FD_hdfs_validate_config(const H5FD_hdfs_fapl_t *fa);
 
 static const H5FD_class_t H5FD_hdfs_g = {
-    "hdfs",                     /* name                 */
-    MAXADDR,                    /* maxaddr              */
-    H5F_CLOSE_WEAK,             /* fc_degree            */
-    NULL,                       /* sb_size              */
-    NULL,                       /* sb_encode            */
-    NULL,                       /* sb_decode            */
-    sizeof(H5FD_hdfs_fapl_t),   /* fapl_size            */
-    H5FD_hdfs_fapl_get,         /* fapl_get             */
-    H5FD_hdfs_fapl_copy,        /* fapl_copy            */
-    H5FD_hdfs_fapl_free,        /* fapl_free            */
-    0,                          /* dxpl_size            */
-    NULL,                       /* dxpl_copy            */
-    NULL,                       /* dxpl_free            */
-    H5FD_hdfs_open,             /* open                 */
-    H5FD_hdfs_close,            /* close                */
-    H5FD_hdfs_cmp,              /* cmp                  */
-    H5FD_hdfs_query,            /* query                */
-    NULL,                       /* get_type_map         */
-    NULL,                       /* alloc                */
-    NULL,                       /* free                 */
-    H5FD_hdfs_get_eoa,          /* get_eoa              */
-    H5FD_hdfs_set_eoa,          /* set_eoa              */
-    H5FD_hdfs_get_eof,          /* get_eof              */
-    H5FD_hdfs_get_handle,       /* get_handle           */
-    H5FD_hdfs_read,             /* read                 */
-    H5FD_hdfs_write,            /* write                */
-    NULL,                       /* flush                */
-    H5FD_hdfs_truncate,         /* truncate             */
-    H5FD_hdfs_lock,             /* lock                 */
-    H5FD_hdfs_unlock,           /* unlock               */
-    H5FD_FLMAP_DICHOTOMY        /* fl_map               */
+    "hdfs",                   /* name                 */
+    MAXADDR,                  /* maxaddr              */
+    H5F_CLOSE_WEAK,           /* fc_degree            */
+    NULL,                     /* sb_size              */
+    NULL,                     /* sb_encode            */
+    NULL,                     /* sb_decode            */
+    sizeof(H5FD_hdfs_fapl_t), /* fapl_size            */
+    H5FD_hdfs_fapl_get,       /* fapl_get             */
+    H5FD_hdfs_fapl_copy,      /* fapl_copy            */
+    H5FD_hdfs_fapl_free,      /* fapl_free            */
+    0,                        /* dxpl_size            */
+    NULL,                     /* dxpl_copy            */
+    NULL,                     /* dxpl_free            */
+    H5FD_hdfs_open,           /* open                 */
+    H5FD_hdfs_close,          /* close                */
+    H5FD_hdfs_cmp,            /* cmp                  */
+    H5FD_hdfs_query,          /* query                */
+    NULL,                     /* get_type_map         */
+    NULL,                     /* alloc                */
+    NULL,                     /* free                 */
+    H5FD_hdfs_get_eoa,        /* get_eoa              */
+    H5FD_hdfs_set_eoa,        /* set_eoa              */
+    H5FD_hdfs_get_eof,        /* get_eof              */
+    H5FD_hdfs_get_handle,     /* get_handle           */
+    H5FD_hdfs_read,           /* read                 */
+    H5FD_hdfs_write,          /* write                */
+    NULL,                     /* flush                */
+    H5FD_hdfs_truncate,       /* truncate             */
+    H5FD_hdfs_lock,           /* lock                 */
+    H5FD_hdfs_unlock,         /* unlock               */
+    H5FD_FLMAP_DICHOTOMY      /* fl_map               */
 };
 
 #ifdef H5_HAVE_LIBHDFS
@@ -530,7 +494,6 @@ static const H5FD_class_t H5FD_hdfs_g = {
 H5FL_DEFINE_STATIC(H5FD_hdfs_t);
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_init_interface
  *
@@ -549,7 +512,6 @@ H5FD_hdfs_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_hdfs_init())
 } /* H5FD_hdfs_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_init
  *
@@ -567,7 +529,7 @@ H5FD_hdfs_init_interface(void)
 hid_t
 H5FD_hdfs_init(void)
 {
-    hid_t ret_value = H5I_INVALID_HID; /* Return value */
+    hid_t        ret_value = H5I_INVALID_HID; /* Return value */
     unsigned int bin_i;
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -595,7 +557,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_hdfs_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD_log_term
  *
@@ -622,7 +583,6 @@ H5FD_hdfs_term(void)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5FD_hdfs_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_hdfs
  *
@@ -640,8 +600,8 @@ H5FD_hdfs_term(void)
 herr_t
 H5Pset_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa)
 {
-    H5P_genplist_t *plist = NULL; /* Property list pointer */
-    herr_t ret_value = FAIL;
+    H5P_genplist_t *plist     = NULL; /* Property list pointer */
+    herr_t          ret_value = FAIL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", fapl_id, fa);
@@ -652,11 +612,11 @@ H5Pset_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa)
     HDfprintf(stdout, "H5Pset_fapl_hdfs() called.\n");
 #endif
 
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     if (FAIL == H5FD_hdfs_validate_config(fa))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,"invalid hdfs config")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid hdfs config")
 
     ret_value = H5P_set_driver(plist, H5FD_HDFS, (void *)fa);
 
@@ -664,7 +624,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Pset_fapl_hdfs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_open()
  *
@@ -686,10 +645,10 @@ done:
 static H5FD_t *
 H5FD_hdfs_open(const char *path, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_hdfs_t      *file      = NULL;
-    hdfs_t           *handle    = NULL;
-    H5FD_hdfs_fapl_t  fa;
-    H5FD_t           *ret_value = NULL;
+    H5FD_hdfs_t *    file   = NULL;
+    hdfs_t *         handle = NULL;
+    H5FD_hdfs_fapl_t fa;
+    H5FD_t *         ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -701,29 +660,30 @@ H5FD_hdfs_open(const char *path, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
 
     /* Check arguments */
-    if(!path || !*path)
+    if (!path || !*path)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if(0 == maxaddr || HADDR_UNDEF == maxaddr)
+    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-    if(ADDR_OVERFLOW(maxaddr))
+    if (ADDR_OVERFLOW(maxaddr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr")
 
-    if(flags != H5F_ACC_RDONLY)
+    if (flags != H5F_ACC_RDONLY)
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, NULL, "only Read-Only access allowed")
-    if(fapl_id == H5P_DEFAULT || fapl_id == H5P_FILE_ACCESS_DEFAULT)
+    if (fapl_id == H5P_DEFAULT || fapl_id == H5P_FILE_ACCESS_DEFAULT)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "fapl cannot be H5P_DEFAULT")
-    if(FAIL == H5Pget_fapl_hdfs(fapl_id, &fa))
+    if (FAIL == H5Pget_fapl_hdfs(fapl_id, &fa))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "can't get property list")
 
-    handle = H5FD_hdfs_handle_open(path, fa.namenode_name, fa.namenode_port, fa.user_name, fa.kerberos_ticket_cache, fa.stream_buffer_size);
+    handle = H5FD_hdfs_handle_open(path, fa.namenode_name, fa.namenode_port, fa.user_name,
+                                   fa.kerberos_ticket_cache, fa.stream_buffer_size);
 
-    if(handle == NULL)
+    if (handle == NULL)
         HGOTO_ERROR(H5E_VFL, H5E_CANTOPENFILE, NULL, "could not open")
 
     HDassert(handle->magic == HDFS_HDFST_MAGIC);
 
     /* Create the new file struct */
-    if(NULL == (file = H5FL_CALLOC(H5FD_hdfs_t)))
+    if (NULL == (file = H5FL_CALLOC(H5FD_hdfs_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
 
     file->hdfs_handle = handle;
@@ -734,10 +694,10 @@ H5FD_hdfs_open(const char *path, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
         HGOTO_ERROR(H5E_INTERNAL, H5E_UNINITIALIZED, NULL, "unable to reset file statistics")
 #endif /* HDFS_STATS */
 
-    ret_value = (H5FD_t*)file;
+    ret_value = (H5FD_t *)file;
 
 done:
-    if(NULL == ret_value) {
+    if (NULL == ret_value) {
         if (handle != NULL) {
             if (FAIL == H5FD_hdfs_handle_close(handle))
                 HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL, "unable to close HDFS file handle")
@@ -751,12 +711,13 @@ done:
 
 } /* H5FD_hdfs_open() */
 
-#else /* H5_HAVE_LIBHDFS not defined */
+#else  /* H5_HAVE_LIBHDFS not defined */
 
 static H5FD_t *
-H5FD_hdfs_open(const char H5_ATTR_UNUSED *path, unsigned H5_ATTR_UNUSED flags, hid_t H5_ATTR_UNUSED fapl_id, haddr_t H5_ATTR_UNUSED  maxaddr)
+H5FD_hdfs_open(const char H5_ATTR_UNUSED *path, unsigned H5_ATTR_UNUSED flags, hid_t H5_ATTR_UNUSED fapl_id,
+               haddr_t H5_ATTR_UNUSED maxaddr)
 {
-    H5FD_t           *ret_value = NULL;
+    H5FD_t *ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -767,7 +728,6 @@ done:
 } /* H5FD_hdfs_open() */
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_close
  *
@@ -786,8 +746,8 @@ done:
 static herr_t
 H5FD_hdfs_close(H5FD_t *_file)
 {
-    H5FD_hdfs_t *file = (H5FD_hdfs_t *)_file;
-    herr_t      ret_value = SUCCEED;
+    H5FD_hdfs_t *file      = (H5FD_hdfs_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -804,7 +764,7 @@ H5FD_hdfs_close(H5FD_t *_file)
     if (file->hdfs_handle != NULL)
         if (FAIL == H5FD_hdfs_handle_close(file->hdfs_handle)) {
             HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to close HDFS file handle")
-    }
+        }
 
 #if HDFS_STATS
     /* TODO: mechanism to re-target stats printout */
@@ -824,7 +784,7 @@ done:
 static herr_t
 H5FD_hdfs_close(H5FD_t H5_ATTR_UNUSED *_file)
 {
-    herr_t       ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -836,7 +796,6 @@ done:
 
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_cmp()
  *
@@ -856,11 +815,11 @@ done:
 static int
 H5FD_hdfs_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_hdfs_t   *f1 = (const H5FD_hdfs_t *)_f1;
-    const H5FD_hdfs_t   *f2 = (const H5FD_hdfs_t *)_f2;
-    hdfsFileInfo        *finfo1    = NULL;
-    hdfsFileInfo        *finfo2    = NULL;
-    int ret_value = 0;
+    const H5FD_hdfs_t *f1        = (const H5FD_hdfs_t *)_f1;
+    const H5FD_hdfs_t *f2        = (const H5FD_hdfs_t *)_f2;
+    hdfsFileInfo *     finfo1    = NULL;
+    hdfsFileInfo *     finfo2    = NULL;
+    int                ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -878,16 +837,36 @@ H5FD_hdfs_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
     HDassert(finfo1 != NULL);
     HDassert(finfo2 != NULL);
 
-    if (finfo1->mKind        != finfo2->mKind)        { HGOTO_DONE(-1); }
-    if (finfo1->mName        != finfo2->mName)        { HGOTO_DONE(-1); }
-    if (finfo1->mLastMod     != finfo2->mLastMod)     { HGOTO_DONE(-1); }
-    if (finfo1->mSize        != finfo2->mSize)        { HGOTO_DONE(-1); }
-    if (finfo1->mReplication != finfo2->mReplication) { HGOTO_DONE(-1); }
-    if (finfo1->mBlockSize   != finfo2->mBlockSize)   { HGOTO_DONE(-1); }
-    if (strcmp(finfo1->mOwner, finfo2->mOwner))       { HGOTO_DONE(-1); }
-    if (strcmp(finfo1->mGroup, finfo2->mGroup))       { HGOTO_DONE(-1); }
-    if (finfo1->mPermissions != finfo2->mPermissions) { HGOTO_DONE(-1); }
-    if (finfo1->mLastAccess  != finfo2->mLastAccess)  { HGOTO_DONE(-1); }
+    if (finfo1->mKind != finfo2->mKind) {
+        HGOTO_DONE(-1);
+    }
+    if (finfo1->mName != finfo2->mName) {
+        HGOTO_DONE(-1);
+    }
+    if (finfo1->mLastMod != finfo2->mLastMod) {
+        HGOTO_DONE(-1);
+    }
+    if (finfo1->mSize != finfo2->mSize) {
+        HGOTO_DONE(-1);
+    }
+    if (finfo1->mReplication != finfo2->mReplication) {
+        HGOTO_DONE(-1);
+    }
+    if (finfo1->mBlockSize != finfo2->mBlockSize) {
+        HGOTO_DONE(-1);
+    }
+    if (strcmp(finfo1->mOwner, finfo2->mOwner)) {
+        HGOTO_DONE(-1);
+    }
+    if (strcmp(finfo1->mGroup, finfo2->mGroup)) {
+        HGOTO_DONE(-1);
+    }
+    if (finfo1->mPermissions != finfo2->mPermissions) {
+        HGOTO_DONE(-1);
+    }
+    if (finfo1->mLastAccess != finfo2->mLastAccess) {
+        HGOTO_DONE(-1);
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -896,11 +875,9 @@ done:
 #else /* H5_HAVE_LIBHDFS not defined */
 
 static int
-H5FD_hdfs_cmp(
-        const H5FD_t H5_ATTR_UNUSED *_f1,
-        const H5FD_t H5_ATTR_UNUSED *_f2)
+H5FD_hdfs_cmp(const H5FD_t H5_ATTR_UNUSED *_f1, const H5FD_t H5_ATTR_UNUSED *_f2)
 {
-    int                ret_value = 0;
+    int ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -937,7 +914,7 @@ H5FD_hdfs_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags) /* out
     HDfprintf(stdout, "H5FD_hdfs_query() called.\n");
 #endif
 
-    if(flags) {
+    if (flags) {
         *flags = 0;
         *flags |= H5FD_FEAT_DATA_SIEVE;
     }
@@ -945,7 +922,6 @@ H5FD_hdfs_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags) /* out
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FD_hdfs_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_get_eoa()
  *
@@ -979,7 +955,7 @@ H5FD_hdfs_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 #else /* H5_HAVE_LIBHDFS not defined */
 
 static haddr_t
-H5FD_hdfs_get_eoa( const H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type)
+H5FD_hdfs_get_eoa(const H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -992,7 +968,6 @@ H5FD_hdfs_get_eoa( const H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED
 
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_set_eoa()
  *
@@ -1026,7 +1001,7 @@ H5FD_hdfs_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 #else /* H5_HAVE_LIBHDFS not defined */
 
 static herr_t
-H5FD_hdfs_set_eoa(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED  type, haddr_t H5_ATTR_UNUSED  addr)
+H5FD_hdfs_set_eoa(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t H5_ATTR_UNUSED addr)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1039,7 +1014,6 @@ H5FD_hdfs_set_eoa(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED  type,
 
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_get_eof()
  *
@@ -1069,7 +1043,7 @@ H5FD_hdfs_get_eof(const H5FD_t *_file)
     HDassert(file->hdfs_handle != NULL);
     HDassert(file->hdfs_handle->magic == HDFS_HDFST_MAGIC);
 
-    FUNC_LEAVE_NOAPI((size_t) file->hdfs_handle->fileinfo->mSize)
+    FUNC_LEAVE_NOAPI((size_t)file->hdfs_handle->fileinfo->mSize)
 } /* end H5FD_hdfs_get_eof() */
 
 #else /* H5_HAVE_LIBHDFS not defined */
@@ -1088,7 +1062,6 @@ H5FD_hdfs_get_eof(const H5FD_t H5_ATTR_UNUSED *_file)
 
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_get_handle
  *
@@ -1115,7 +1088,7 @@ H5FD_hdfs_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handl
     HDfprintf(stdout, "H5FD_hdfs_get_handle() called.\n");
 #endif /* HDFS_DEBUG */
 
-    if(!file_handle)
+    if (!file_handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
 
     *file_handle = file->hdfs_handle;
@@ -1127,9 +1100,10 @@ done:
 #else /* H5_HAVE_LIBHDFS not defined */
 
 static herr_t
-H5FD_hdfs_get_handle(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED fapl, void H5_ATTR_UNUSED **file_handle)
+H5FD_hdfs_get_handle(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED fapl,
+                     void H5_ATTR_UNUSED **file_handle)
 {
-    herr_t       ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1145,7 +1119,6 @@ done:
 
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_read
  *
@@ -1166,8 +1139,8 @@ done:
 #ifdef H5_HAVE_LIBHDFS
 
 static herr_t
-H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
-        haddr_t addr, size_t size, void *buf /*out*/)
+H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
+               size_t size, void *buf /*out*/)
 {
     H5FD_hdfs_t *file      = (H5FD_hdfs_t *)_file;
     herr_t       ret_value = SUCCEED;
@@ -1189,12 +1162,13 @@ H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
     HDassert(file->hdfs_handle->magic == HDFS_HDFST_MAGIC);
     HDassert(buf != NULL);
 
-    filesize = (size_t) file->hdfs_handle->fileinfo->mSize;
+    filesize = (size_t)file->hdfs_handle->fileinfo->mSize;
 
     if ((addr > filesize) || ((addr + size) > filesize))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "range exceeds file address")
 
-    if (FAIL == hdfsPread(file->hdfs_handle->filesystem, file->hdfs_handle->file, (tOffset)addr, buf, (tSize)size))
+    if (FAIL ==
+        hdfsPread(file->hdfs_handle->filesystem, file->hdfs_handle->file, (tOffset)addr, buf, (tSize)size))
         HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "unable to execute read")
 
 #if HDFS_STATS
@@ -1206,9 +1180,7 @@ H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
             break;
         }
     }
-    bin = (type == H5FD_MEM_DRAW)
-        ? &file->raw[bin_i]
-        : &file->meta[bin_i];
+    bin = (type == H5FD_MEM_DRAW) ? &file->raw[bin_i] : &file->meta[bin_i];
 
     /* Store collected stats in appropriate bin */
     if (bin->count == 0) {
@@ -1216,8 +1188,12 @@ H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
         bin->max = size;
     }
     else {
-        if (size < bin->min) { bin->min = size; }
-        if (size > bin->max) { bin->max = size; }
+        if (size < bin->min) {
+            bin->min = size;
+        }
+        if (size > bin->max) {
+            bin->max = size;
+        }
     }
     bin->count++;
     bin->bytes += (unsigned long long)size;
@@ -1232,9 +1208,9 @@ done:
 
 static herr_t
 H5FD_hdfs_read(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
-        haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED size, void H5_ATTR_UNUSED *buf)
+               haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED size, void H5_ATTR_UNUSED *buf)
 {
-    herr_t       ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1242,7 +1218,7 @@ H5FD_hdfs_read(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid
     HDfprintf(stdout, "H5FD_hdfs_read() called.\n");
 #endif /* HDFS_DEBUG */
 
-    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL,"Illegal get-handle of unsupported virtual file (hdfs)");
+    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "Illegal get-handle of unsupported virtual file (hdfs)");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1250,7 +1226,6 @@ done:
 
 #endif /* H5_HAVE_LIBHDFS */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_write
  *
@@ -1282,7 +1257,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FD_hdfs_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_truncate
  *
@@ -1315,7 +1289,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_hdfs_truncate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_lock
  *
@@ -1333,15 +1306,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_hdfs_lock(
-        H5FD_t  H5_ATTR_UNUSED *_file,
-        hbool_t H5_ATTR_UNUSED  rw)
+H5FD_hdfs_lock(H5FD_t H5_ATTR_UNUSED *_file, hbool_t H5_ATTR_UNUSED rw)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_hdfs_lock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_unlock
  *
@@ -1383,7 +1353,7 @@ H5FD_hdfs_unlock(H5FD_t H5_ATTR_UNUSED *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_hdfs_validate_config(const H5FD_hdfs_fapl_t * fa)
+H5FD_hdfs_validate_config(const H5FD_hdfs_fapl_t *fa)
 {
     herr_t ret_value = SUCCEED;
 
@@ -1391,13 +1361,13 @@ H5FD_hdfs_validate_config(const H5FD_hdfs_fapl_t * fa)
 
     HDassert(fa != NULL);
 
-    if(fa->version != H5FD__CURR_HDFS_FAPL_T_VERSION)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown H5FD_hdfs_fapl_t version");
+    if (fa->version != H5FD__CURR_HDFS_FAPL_T_VERSION)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown H5FD_hdfs_fapl_t version");
 
-    if(fa->namenode_port > 65535)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid namenode port number");
-    if(fa->namenode_port < 0)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid namenode port number");
+    if (fa->namenode_port > 65535)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid namenode port number");
+    if (fa->namenode_port < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid namenode port number");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1421,7 +1391,7 @@ herr_t
 H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out)
 {
     const H5FD_hdfs_fapl_t *fa        = NULL;
-    H5P_genplist_t         *plist     = NULL;
+    H5P_genplist_t *        plist     = NULL;
     herr_t                  ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
@@ -1450,7 +1420,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Pget_fapl_hdfs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_fapl_get
  *
@@ -1468,14 +1437,14 @@ done:
 static void *
 H5FD_hdfs_fapl_get(H5FD_t *_file)
 {
-    H5FD_hdfs_t      *file      = (H5FD_hdfs_t*)_file;
+    H5FD_hdfs_t *     file      = (H5FD_hdfs_t *)_file;
     H5FD_hdfs_fapl_t *fa        = NULL;
-    void             *ret_value = NULL;
+    void *            ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     fa = (H5FD_hdfs_fapl_t *)H5MM_calloc(sizeof(H5FD_hdfs_fapl_t));
-    if(fa == NULL)
+    if (fa == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the fields of the structure */
@@ -1491,7 +1460,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FD_hdfs_fapl_get() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_fapl_copy
  *
@@ -1508,14 +1476,14 @@ done:
 static void *
 H5FD_hdfs_fapl_copy(const void *_old_fa)
 {
-    const H5FD_hdfs_fapl_t *old_fa    = (const H5FD_hdfs_fapl_t*)_old_fa;
-    H5FD_hdfs_fapl_t       *new_fa    = NULL;
-    void                   *ret_value = NULL;
+    const H5FD_hdfs_fapl_t *old_fa    = (const H5FD_hdfs_fapl_t *)_old_fa;
+    H5FD_hdfs_fapl_t *      new_fa    = NULL;
+    void *                  ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     new_fa = (H5FD_hdfs_fapl_t *)H5MM_malloc(sizeof(H5FD_hdfs_fapl_t));
-    if(new_fa == NULL)
+    if (new_fa == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     HDmemcpy(new_fa, old_fa, sizeof(H5FD_hdfs_fapl_t));
@@ -1528,7 +1496,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FD_hdfs_fapl_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_hdfs_fapl_free
  *
@@ -1544,7 +1511,7 @@ done:
 static herr_t
 H5FD_hdfs_fapl_free(void *_fa)
 {
-    H5FD_hdfs_fapl_t *fa = (H5FD_hdfs_fapl_t*)_fa;
+    H5FD_hdfs_fapl_t *fa = (H5FD_hdfs_fapl_t *)_fa;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1555,7 +1522,6 @@ H5FD_hdfs_fapl_free(void *_fa)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FD_hdfs_fapl_free() */
 
-
 #if HDFS_STATS
 
 /*----------------------------------------------------------------------------
@@ -1589,10 +1555,10 @@ hdfs_reset_stats(H5FD_hdfs_t *file)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file was null")
 
     for (i = 0; i <= HDFS_STATS_BIN_COUNT; i++) {
-        file->raw[i].bytes  = 0;
-        file->raw[i].count  = 0;
-        file->raw[i].min    = (unsigned long long)HDFS_STATS_STARTING_MIN;
-        file->raw[i].max    = 0;
+        file->raw[i].bytes = 0;
+        file->raw[i].count = 0;
+        file->raw[i].min   = (unsigned long long)HDFS_STATS_STARTING_MIN;
+        file->raw[i].max   = 0;
 
         file->meta[i].bytes = 0;
         file->meta[i].count = 0;
@@ -1605,7 +1571,6 @@ done:
 } /* hdfs_reset_stats */
 #endif /* HDFS_STATS */
 
-
 #if HDFS_STATS
 
 /*----------------------------------------------------------------------------
@@ -1661,26 +1626,26 @@ static herr_t
 hdfs_fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
 {
     herr_t             ret_value    = SUCCEED;
-    parsed_url_t      *purl         = NULL;
+    parsed_url_t *     purl         = NULL;
     unsigned           i            = 0;
     unsigned long      count_meta   = 0;
     unsigned long      count_raw    = 0;
     double             average_meta = 0.0;
     double             average_raw  = 0.0;
-    unsigned long long min_meta  = (unsigned long long)HDFS_STATS_STARTING_MIN;
-    unsigned long long min_raw   = (unsigned long long)HDFS_STATS_STARTING_MIN;
+    unsigned long long min_meta     = (unsigned long long)HDFS_STATS_STARTING_MIN;
+    unsigned long long min_raw      = (unsigned long long)HDFS_STATS_STARTING_MIN;
     unsigned long long max_meta     = 0;
     unsigned long long max_raw      = 0;
     unsigned long long bytes_raw    = 0;
     unsigned long long bytes_meta   = 0;
     double             re_dub       = 0.0; /* re-usable double variable */
     unsigned           suffix_i     = 0;
-    const char         suffixes[]   = { ' ', 'K', 'M', 'G', 'T', 'P' };
+    const char         suffixes[]   = {' ', 'K', 'M', 'G', 'T', 'P'};
 
     FUNC_ENTER_NOAPI_NOINIT
 
     if (stream == NULL)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file stream cannot be null" )
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file stream cannot be null")
     if (file == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file cannot be null")
     if (file->hdfs_handle == NULL)
@@ -1696,18 +1661,26 @@ hdfs_fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
         const hdfs_statsbin *r = &file->raw[i];
         const hdfs_statsbin *m = &file->meta[i];
 
-        if (m->min < min_meta)  { min_meta = m->min; }
-        if (r->min < min_raw)   { min_raw  = r->min; }
-        if (m->max > max_meta)  { max_meta = m->max; }
-        if (r->max > max_raw)   { max_raw  = r->max; }
+        if (m->min < min_meta) {
+            min_meta = m->min;
+        }
+        if (r->min < min_raw) {
+            min_raw = r->min;
+        }
+        if (m->max > max_meta) {
+            max_meta = m->max;
+        }
+        if (r->max > max_raw) {
+            max_raw = r->max;
+        }
 
-        count_raw  += r->count;
+        count_raw += r->count;
         count_meta += m->count;
-        bytes_raw  += r->bytes;
+        bytes_raw += r->bytes;
         bytes_meta += m->bytes;
     }
-    if (count_raw  > 0) {
-        average_raw  = (double)bytes_raw / (double)count_raw;
+    if (count_raw > 0) {
+        average_raw = (double)bytes_raw / (double)count_raw;
     }
     if (count_meta > 0) {
         average_meta = (double)bytes_meta / (double)count_meta;
@@ -1717,10 +1690,10 @@ hdfs_fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
      * PRINT OVERVIEW *
      ******************/
 
-    HDfprintf(stream, "TOTAL READS: %llu  (%llu meta, %llu raw)\n",
-              count_raw + count_meta, count_meta, count_raw);
-    HDfprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n",
-              bytes_raw + bytes_meta, bytes_meta, bytes_raw);
+    HDfprintf(stream, "TOTAL READS: %llu  (%llu meta, %llu raw)\n", count_raw + count_meta, count_meta,
+              count_raw);
+    HDfprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n", bytes_raw + bytes_meta, bytes_meta,
+              bytes_raw);
 
     if (count_raw + count_meta == 0) {
         goto done;
@@ -1790,10 +1763,8 @@ hdfs_fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
      * PRINT INDIVIDUAL BIN STATS *
      ******************************/
 
-    HDfprintf(stream,
-        "BINS             # of reads      total bytes         average size\n");
-    HDfprintf(stream,
-        "    up-to      meta     raw     meta      raw       meta      raw\n");
+    HDfprintf(stream, "BINS             # of reads      total bytes         average size\n");
+    HDfprintf(stream, "    up-to      meta     raw     meta      raw       meta      raw\n");
 
     for (i = 0; i <= HDFS_STATS_BIN_COUNT; i++) {
         const hdfs_statsbin *m;
@@ -1817,9 +1788,10 @@ hdfs_fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
         range_end = hdfs_stats_boundaries[i];
 
         if (i == HDFS_STATS_BIN_COUNT) {
-            range_end = hdfs_stats_boundaries[i-1];
+            range_end = hdfs_stats_boundaries[i - 1];
             HDfprintf(stream, ">");
-        } else {
+        }
+        else {
             HDfprintf(stream, " ");
         }
 
@@ -1861,16 +1833,14 @@ hdfs_fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
         }
         HDassert(suffix_i < sizeof(suffixes));
 
-        HDfprintf(
-                stream,
-                " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n",
-                re_dub, suffixes[suffix_i], /* bin ceiling      */
-                m->count,                   /* metadata reads   */
-                r->count,                   /* rawdata reads    */
-                bm_val, bm_suffix,          /* metadata bytes   */
-                br_val, br_suffix,          /* rawdata bytes    */
-                am_val, am_suffix,          /* metadata average */
-                ar_val, ar_suffix);         /* rawdata average  */
+        HDfprintf(stream, " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n", re_dub,
+                  suffixes[suffix_i], /* bin ceiling      */
+                  m->count,           /* metadata reads   */
+                  r->count,           /* rawdata reads    */
+                  bm_val, bm_suffix,  /* metadata bytes   */
+                  br_val, br_suffix,  /* rawdata bytes    */
+                  am_val, am_suffix,  /* metadata average */
+                  ar_val, ar_suffix); /* rawdata average  */
         fflush(stream);
     }
 
@@ -1878,4 +1848,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* hdfs_fprint_stats */
 #endif /* HDFS_STATS */
-
diff --git a/src/H5FDhdfs.h b/src/H5FDhdfs.h
index 328d36a..dd7b27e 100644
--- a/src/H5FDhdfs.h
+++ b/src/H5FDhdfs.h
@@ -43,7 +43,7 @@ extern "C" {
  *
  * `version` (int32_t)
  *
- *     Version number of the `H5FD_hdfs_fapl_t` structure.  Any instance passed 
+ *     Version number of the `H5FD_hdfs_fapl_t` structure.  Any instance passed
  *     to the above calls must have a recognized version number, or an error
  *     will be flagged.
  *
@@ -96,8 +96,8 @@ extern "C" {
 
 #define H5FD__CURR_HDFS_FAPL_T_VERSION 1
 
-#define H5FD__HDFS_NODE_NAME_SPACE 128
-#define H5FD__HDFS_USER_NAME_SPACE 128
+#define H5FD__HDFS_NODE_NAME_SPACE       128
+#define H5FD__HDFS_USER_NAME_SPACE       128
 #define H5FD__HDFS_KERB_CACHE_PATH_SPACE 128
 
 typedef struct H5FD_hdfs_fapl_t {
@@ -109,8 +109,8 @@ typedef struct H5FD_hdfs_fapl_t {
     int32_t stream_buffer_size;
 } H5FD_hdfs_fapl_t;
 
-H5_DLL hid_t H5FD_hdfs_init(void);
-H5_DLL void H5FD_hdfs_term(void);
+H5_DLL hid_t  H5FD_hdfs_init(void);
+H5_DLL void   H5FD_hdfs_term(void);
 H5_DLL herr_t H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out);
 H5_DLL herr_t H5Pset_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa);
 
@@ -119,5 +119,3 @@ H5_DLL herr_t H5Pset_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa);
 #endif
 
 #endif /* ifndef H5FDhdfs_H */
-
-
diff --git a/src/H5FDint.c b/src/H5FDint.c
index f9ac310..9313952 100644
--- a/src/H5FDint.c
+++ b/src/H5FDint.c
@@ -26,58 +26,48 @@
 /* Module Setup */
 /****************/
 
-#define H5FD_PACKAGE		/*suppress error about including H5FDpkg  */
+#define H5FD_PACKAGE /*suppress error about including H5FDpkg  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5FD_int_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5FD_int_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"         /* File access				*/
-#include "H5FDpkg.h"		/* File Drivers				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fprivate.h" /* File access				*/
+#include "H5FDpkg.h"    /* File Drivers				*/
+#include "H5Iprivate.h" /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5FD_int_init_interface -- Initialize interface-specific information
@@ -99,7 +89,6 @@ H5FD_int_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_init())
 } /* H5FD_int_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_locate_signature
  *
@@ -118,17 +107,18 @@ H5FD_int_init_interface(void)
 herr_t
 H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_addr)
 {
-    haddr_t         addr, eoa;
-    uint8_t         buf[H5F_SIGNATURE_LEN];
-    unsigned        n, maxpow;
-    herr_t          ret_value = SUCCEED; /* Return value */
+    haddr_t  addr, eoa;
+    uint8_t  buf[H5F_SIGNATURE_LEN];
+    unsigned n, maxpow;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Find the least N such that 2^N is larger than the file size */
-    if(HADDR_UNDEF == (addr = H5FD_get_eof(file)) || HADDR_UNDEF == (eoa = H5FD_get_eoa(file, H5FD_MEM_SUPER)))
+    if (HADDR_UNDEF == (addr = H5FD_get_eof(file)) ||
+        HADDR_UNDEF == (eoa = H5FD_get_eoa(file, H5FD_MEM_SUPER)))
         HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to obtain EOF/EOA value")
-    for(maxpow = 0; addr; maxpow++)
+    for (maxpow = 0; addr; maxpow++)
         addr >>= 1;
     maxpow = MAX(maxpow, 9);
 
@@ -136,13 +126,13 @@ H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_add
      * Search for the file signature at format address zero followed by
      * powers of two larger than 9.
      */
-    for(n = 8; n < maxpow; n++) {
+    for (n = 8; n < maxpow; n++) {
         addr = (8 == n) ? 0 : (haddr_t)1 << n;
-        if(H5FD_set_eoa(file, H5FD_MEM_SUPER, addr + H5F_SIGNATURE_LEN) < 0)
+        if (H5FD_set_eoa(file, H5FD_MEM_SUPER, addr + H5F_SIGNATURE_LEN) < 0)
             HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to set EOA value for file signature")
-        if(H5FD_read(file, dxpl, H5FD_MEM_SUPER, addr, (size_t)H5F_SIGNATURE_LEN, buf) < 0)
+        if (H5FD_read(file, dxpl, H5FD_MEM_SUPER, addr, (size_t)H5F_SIGNATURE_LEN, buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to read file signature")
-        if(!HDmemcmp(buf, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN))
+        if (!HDmemcmp(buf, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN))
             break;
     } /* end for */
 
@@ -150,8 +140,8 @@ H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_add
      * If the signature was not found then reset the EOA value and return
      * HADDR_UNDEF.
      */
-    if(n >= maxpow) {
-        if(H5FD_set_eoa(file, H5FD_MEM_SUPER, eoa) < 0)
+    if (n >= maxpow) {
+        if (H5FD_set_eoa(file, H5FD_MEM_SUPER, eoa) < 0)
             HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to reset EOA value")
         *sig_addr = HADDR_UNDEF;
     } /* end if */
@@ -163,7 +153,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_locate_signature() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_read
  *
@@ -178,11 +167,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr,
-    size_t size, void *buf/*out*/)
+H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size,
+          void *buf /*out*/)
 {
-    haddr_t     eoa = HADDR_UNDEF;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    haddr_t eoa       = HADDR_UNDEF;
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -194,25 +183,25 @@ H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t add
     /* Do not return early for Parallel mode since the I/O could be a */
     /* collective transfer. */
     /* The no-op case */
-    if(0 == size)
+    if (0 == size)
         HGOTO_DONE(SUCCEED)
 #endif /* H5_HAVE_PARALLEL */
 
-    if(HADDR_UNDEF == (eoa = (file->cls->get_eoa)(file, type)))
-	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
-    if((addr + file->base_addr + size) > eoa)
-        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%llu, eoa=%llu", 
-                    (unsigned long long)(addr+ file->base_addr), (unsigned long long)size, (unsigned long long)eoa)
+    if (HADDR_UNDEF == (eoa = (file->cls->get_eoa)(file, type)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
+    if ((addr + file->base_addr + size) > eoa)
+        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%llu, eoa=%llu",
+                    (unsigned long long)(addr + file->base_addr), (unsigned long long)size,
+                    (unsigned long long)eoa)
 
     /* Dispatch to driver */
-    if((file->cls->read)(file, type, H5P_PLIST_ID(dxpl), addr + file->base_addr, size, buf) < 0)
+    if ((file->cls->read)(file, type, H5P_PLIST_ID(dxpl), addr + file->base_addr, size, buf) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "driver read request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_write
  *
@@ -227,11 +216,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr,
-    size_t size, const void *buf)
+H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size,
+           const void *buf)
 {
-    haddr_t     eoa = HADDR_UNDEF;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    haddr_t eoa       = HADDR_UNDEF;
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -243,25 +232,25 @@ H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t ad
     /* Do not return early for Parallel mode since the I/O could be a */
     /* collective transfer. */
     /* The no-op case */
-    if(0 == size)
+    if (0 == size)
         HGOTO_DONE(SUCCEED)
 #endif /* H5_HAVE_PARALLEL */
 
-    if(HADDR_UNDEF == (eoa = (file->cls->get_eoa)(file, type)))
-	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
-    if((addr + file->base_addr + size) > eoa)
-        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%llu, eoa=%llu", 
-                    (unsigned long long)(addr+ file->base_addr), (unsigned long long)size, (unsigned long long)eoa)
+    if (HADDR_UNDEF == (eoa = (file->cls->get_eoa)(file, type)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
+    if ((addr + file->base_addr + size) > eoa)
+        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%llu, eoa=%llu",
+                    (unsigned long long)(addr + file->base_addr), (unsigned long long)size,
+                    (unsigned long long)eoa)
 
     /* Dispatch to driver */
-    if((file->cls->write)(file, type, H5P_PLIST_ID(dxpl), addr + file->base_addr, size, buf) < 0)
+    if ((file->cls->write)(file, type, H5P_PLIST_ID(dxpl), addr + file->base_addr, size, buf) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "driver write request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_set_eoa
  *
@@ -283,7 +272,7 @@ done:
 herr_t
 H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -291,14 +280,13 @@ H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
     HDassert(H5F_addr_defined(addr) && addr <= file->maxaddr);
 
     /* Dispatch to driver, convert to absolute address */
-    if((file->cls->set_eoa)(file, type, addr + file->base_addr) < 0)
-	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver set_eoa request failed")
+    if ((file->cls->set_eoa)(file, type, addr + file->base_addr) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver set_eoa request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_set_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_get_eoa
  *
@@ -320,15 +308,15 @@ done:
 haddr_t
 H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type)
 {
-    haddr_t	ret_value;
+    haddr_t ret_value;
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
     HDassert(file && file->cls);
 
     /* Dispatch to driver */
-    if(HADDR_UNDEF == (ret_value = (file->cls->get_eoa)(file, type)))
-	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "driver get_eoa request failed")
+    if (HADDR_UNDEF == (ret_value = (file->cls->get_eoa)(file, type)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "driver get_eoa request failed")
 
     /* Adjust for base address in file (convert to relative address) */
     ret_value -= file->base_addr;
@@ -337,7 +325,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_get_eof
  *
@@ -362,19 +349,19 @@ done:
 haddr_t
 H5FD_get_eof(const H5FD_t *file)
 {
-    haddr_t	ret_value;
+    haddr_t ret_value;
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
     HDassert(file && file->cls);
 
     /* Dispatch to driver */
-    if(file->cls->get_eof) {
-	if(HADDR_UNDEF == (ret_value = (file->cls->get_eof)(file)))
-	    HGOTO_ERROR(H5E_VFL, H5E_CANTGET, HADDR_UNDEF, "driver get_eof request failed")
+    if (file->cls->get_eof) {
+        if (HADDR_UNDEF == (ret_value = (file->cls->get_eof)(file)))
+            HGOTO_ERROR(H5E_VFL, H5E_CANTGET, HADDR_UNDEF, "driver get_eof request failed")
     } /* end if */
     else
-	ret_value = file->maxaddr;
+        ret_value = file->maxaddr;
 
     /* Adjust for base address in file (convert to relative address)  */
     ret_value -= file->base_addr;
@@ -382,4 +369,3 @@ H5FD_get_eof(const H5FD_t *file)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_eof() */
-
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 6bbd1d7..155bfb6 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -25,27 +25,26 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5FD_log_init_interface
-
-
-#include "H5private.h"      /* Generic Functions    */
-#include "H5Eprivate.h"     /* Error handling       */
-#include "H5Fprivate.h"     /* File access          */
-#include "H5FDprivate.h"    /* File drivers         */
-#include "H5FDlog.h"        /* Logging file driver  */
-#include "H5FLprivate.h"    /* Free Lists           */
-#include "H5Iprivate.h"     /* IDs                  */
-#include "H5MMprivate.h"    /* Memory management    */
-#include "H5Pprivate.h"     /* Property lists       */
+#define H5_INTERFACE_INIT_FUNC H5FD_log_init_interface
+
+#include "H5private.h"   /* Generic Functions    */
+#include "H5Eprivate.h"  /* Error handling       */
+#include "H5Fprivate.h"  /* File access          */
+#include "H5FDprivate.h" /* File drivers         */
+#include "H5FDlog.h"     /* Logging file driver  */
+#include "H5FLprivate.h" /* Free Lists           */
+#include "H5Iprivate.h"  /* IDs                  */
+#include "H5MMprivate.h" /* Memory management    */
+#include "H5Pprivate.h"  /* Property lists       */
 
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_LOG_g = 0;
 
 /* Driver-specific file access properties */
 typedef struct H5FD_log_fapl_t {
-    char *logfile;              /* Allocated log file name */
+    char *             logfile; /* Allocated log file name */
     unsigned long long flags;   /* Flags for logging behavior */
-    size_t buf_size;            /* Size of buffers for track flavor and number of times each byte is accessed */
+    size_t buf_size; /* Size of buffers for track flavor and number of times each byte is accessed */
 } H5FD_log_fapl_t;
 
 /* Define strings for the different file memory types
@@ -53,14 +52,9 @@ typedef struct H5FD_log_fapl_t {
  * Note that H5FD_MEM_NOLIST is not listed here since it has
  * a negative value.
  */
-static const char *flavors[]={
-    "H5FD_MEM_DEFAULT",
-    "H5FD_MEM_SUPER",
-    "H5FD_MEM_BTREE",
-    "H5FD_MEM_DRAW",
-    "H5FD_MEM_GHEAP",
-    "H5FD_MEM_LHEAP",
-    "H5FD_MEM_OHDR",
+static const char *flavors[] = {
+    "H5FD_MEM_DEFAULT", "H5FD_MEM_SUPER", "H5FD_MEM_BTREE", "H5FD_MEM_DRAW",
+    "H5FD_MEM_GHEAP",   "H5FD_MEM_LHEAP", "H5FD_MEM_OHDR",
 };
 
 /* The description of a file belonging to this driver. The `eoa' and `eof'
@@ -75,13 +69,13 @@ static const char *flavors[]={
  * occurs), and `op' will be set to H5F_OP_UNKNOWN.
  */
 typedef struct H5FD_log_t {
-    H5FD_t          pub;    /* public stuff, must be first      */
-    int             fd;     /* the unix file                    */
-    haddr_t         eoa;    /* end of allocated region          */
-    haddr_t         eof;    /* end of file; current file size   */
-    haddr_t         pos;    /* current file I/O position        */
-    H5FD_file_op_t  op;     /* last operation                   */
-    char            filename[H5FD_MAX_FILENAME_LEN];    /* Copy of file name from open operation */
+    H5FD_t         pub;                             /* public stuff, must be first      */
+    int            fd;                              /* the unix file                    */
+    haddr_t        eoa;                             /* end of allocated region          */
+    haddr_t        eof;                             /* end of file; current file size   */
+    haddr_t        pos;                             /* current file I/O position        */
+    H5FD_file_op_t op;                              /* last operation                   */
+    char           filename[H5FD_MAX_FILENAME_LEN]; /* Copy of file name from open operation */
 #ifndef H5_HAVE_WIN32_API
     /* On most systems the combination of device and i-node number uniquely
      * identify a file.  Note that Cygwin, MinGW and other Windows POSIX
@@ -89,8 +83,8 @@ typedef struct H5FD_log_t {
      * and will use the 'device + inodes' scheme as opposed to the
      * Windows code further below.
      */
-    dev_t           device;         /* file device number   */
-    ino_t           inode;          /* file i-node number   */
+    dev_t device; /* file device number   */
+    ino_t inode;  /* file i-node number   */
 #else
     /* Files in windows are uniquely identified by the volume serial
      * number and the file index (both low and high parts).
@@ -106,34 +100,34 @@ typedef struct H5FD_log_t {
      *
      * http://msdn.microsoft.com/en-us/library/aa363788(v=VS.85).aspx
      */
-    DWORD           nFileIndexLow;
-    DWORD           nFileIndexHigh;
-    DWORD           dwVolumeSerialNumber;
-    
-    HANDLE          hFile;      /* Native windows file handle */
-#endif  /* H5_HAVE_WIN32_API */
+    DWORD nFileIndexLow;
+    DWORD nFileIndexHigh;
+    DWORD dwVolumeSerialNumber;
+
+    HANDLE hFile; /* Native windows file handle */
+#endif /* H5_HAVE_WIN32_API */
 
     /* Information from properties set by 'h5repart' tool
      *
      * Whether to eliminate the family driver info and convert this file to
      * a single file
      */
-    hbool_t     fam_to_sec2;
+    hbool_t fam_to_sec2;
 
     /* Fields for tracking I/O operations */
-    unsigned char       *nread;                 /* Number of reads from a file location             */
-    unsigned char       *nwrite;                /* Number of write to a file location               */
-    unsigned char       *flavor;                /* Flavor of information written to file location   */
-    unsigned long long  total_read_ops;         /* Total number of read operations                  */
-    unsigned long long  total_write_ops;        /* Total number of write operations                 */
-    unsigned long long  total_seek_ops;         /* Total number of seek operations                  */
-    unsigned long long  total_truncate_ops;     /* Total number of truncate operations              */
-    double              total_read_time;        /* Total time spent in read operations              */
-    double              total_write_time;       /* Total time spent in write operations             */
-    double              total_seek_time;        /* Total time spent in seek operations              */
-    size_t              iosize;                 /* Size of I/O information buffers                  */
-    FILE                *logfp;                 /* Log file pointer                                 */
-    H5FD_log_fapl_t     fa;                     /* Driver-specific file access properties           */
+    unsigned char *    nread;              /* Number of reads from a file location             */
+    unsigned char *    nwrite;             /* Number of write to a file location               */
+    unsigned char *    flavor;             /* Flavor of information written to file location   */
+    unsigned long long total_read_ops;     /* Total number of read operations                  */
+    unsigned long long total_write_ops;    /* Total number of write operations                 */
+    unsigned long long total_seek_ops;     /* Total number of seek operations                  */
+    unsigned long long total_truncate_ops; /* Total number of truncate operations              */
+    double             total_read_time;    /* Total time spent in read operations              */
+    double             total_write_time;   /* Total time spent in write operations             */
+    double             total_seek_time;    /* Total time spent in seek operations              */
+    size_t             iosize;             /* Size of I/O information buffers                  */
+    FILE *             logfp;              /* Log file pointer                                 */
+    H5FD_log_fapl_t    fa;                 /* Driver-specific file access properties           */
 } H5FD_log_t;
 
 /*
@@ -151,71 +145,68 @@ typedef struct H5FD_log_t {
  *                  which can be addressed entirely by the second
  *                  argument of the file seek function.
  */
-#define MAXADDR                 (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
-#define ADDR_OVERFLOW(A)        (HADDR_UNDEF==(A) || ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z)        ((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z)    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) ||    \
-                                 HADDR_UNDEF==(A)+(Z) ||                    \
-                                (HDoff_t)((A)+(Z))<(HDoff_t)(A))
+#define MAXADDR          (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
+#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR)
+#define REGION_OVERFLOW(A, Z)                                                                                \
+    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A))
 
 /* Prototypes */
-static void *H5FD_log_fapl_get(H5FD_t *file);
-static void *H5FD_log_fapl_copy(const void *_old_fa);
-static herr_t H5FD_log_fapl_free(void *_fa);
-static H5FD_t *H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id,
-            haddr_t maxaddr);
-static herr_t H5FD_log_close(H5FD_t *_file);
-static int H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t H5FD_log_query(const H5FD_t *_f1, unsigned long *flags);
+static void *  H5FD_log_fapl_get(H5FD_t *file);
+static void *  H5FD_log_fapl_copy(const void *_old_fa);
+static herr_t  H5FD_log_fapl_free(void *_fa);
+static H5FD_t *H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD_log_close(H5FD_t *_file);
+static int     H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD_log_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
 static haddr_t H5FD_log_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD_log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static herr_t  H5FD_log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD_log_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_log_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, void *buf);
-static herr_t H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, const void *buf);
-static herr_t H5FD_log_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD_log_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                             void *buf);
+static herr_t  H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                              const void *buf);
+static herr_t  H5FD_log_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 
 static const H5FD_class_t H5FD_log_g = {
-    "log",					/*name			*/
-    MAXADDR,					/*maxaddr		*/
-    H5F_CLOSE_WEAK,				/* fc_degree		*/
-    NULL,					/*sb_size		*/
-    NULL,					/*sb_encode		*/
-    NULL,					/*sb_decode		*/
-    sizeof(H5FD_log_fapl_t),                    /*fapl_size		*/
-    H5FD_log_fapl_get,		                /*fapl_get		*/
-    H5FD_log_fapl_copy,		                /*fapl_copy		*/
-    H5FD_log_fapl_free,		                /*fapl_free		*/
-    0,						/*dxpl_size		*/
-    NULL,					/*dxpl_copy		*/
-    NULL,					/*dxpl_free		*/
-    H5FD_log_open,				/*open			*/
-    H5FD_log_close,				/*close			*/
-    H5FD_log_cmp,				/*cmp			*/
-    H5FD_log_query,				/*query			*/
-    NULL,					/*get_type_map		*/
-    H5FD_log_alloc,				/*alloc			*/
-    NULL,					/*free			*/
-    H5FD_log_get_eoa,				/*get_eoa		*/
-    H5FD_log_set_eoa, 				/*set_eoa		*/
-    H5FD_log_get_eof,				/*get_eof		*/
-    H5FD_log_get_handle,                        /*get_handle            */
-    H5FD_log_read,				/*read			*/
-    H5FD_log_write,				/*write			*/
-    NULL,					/*flush			*/
-    H5FD_log_truncate,				/*truncate		*/
-    NULL,                                       /*lock                  */
-    NULL,                                       /*unlock                */
-    H5FD_FLMAP_DICHOTOMY			/*fl_map		*/
+    "log",                   /*name			*/
+    MAXADDR,                 /*maxaddr		*/
+    H5F_CLOSE_WEAK,          /* fc_degree		*/
+    NULL,                    /*sb_size		*/
+    NULL,                    /*sb_encode		*/
+    NULL,                    /*sb_decode		*/
+    sizeof(H5FD_log_fapl_t), /*fapl_size		*/
+    H5FD_log_fapl_get,       /*fapl_get		*/
+    H5FD_log_fapl_copy,      /*fapl_copy		*/
+    H5FD_log_fapl_free,      /*fapl_free		*/
+    0,                       /*dxpl_size		*/
+    NULL,                    /*dxpl_copy		*/
+    NULL,                    /*dxpl_free		*/
+    H5FD_log_open,           /*open			*/
+    H5FD_log_close,          /*close			*/
+    H5FD_log_cmp,            /*cmp			*/
+    H5FD_log_query,          /*query			*/
+    NULL,                    /*get_type_map		*/
+    H5FD_log_alloc,          /*alloc			*/
+    NULL,                    /*free			*/
+    H5FD_log_get_eoa,        /*get_eoa		*/
+    H5FD_log_set_eoa,        /*set_eoa		*/
+    H5FD_log_get_eof,        /*get_eof		*/
+    H5FD_log_get_handle,     /*get_handle            */
+    H5FD_log_read,           /*read			*/
+    H5FD_log_write,          /*write			*/
+    NULL,                    /*flush			*/
+    H5FD_log_truncate,       /*truncate		*/
+    NULL,                    /*lock                  */
+    NULL,                    /*unlock                */
+    H5FD_FLMAP_DICHOTOMY     /*fl_map		*/
 };
 
 /* Declare a free list to manage the H5FD_log_t struct */
 H5FL_DEFINE_STATIC(H5FD_log_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_init_interface
  *
@@ -234,7 +225,6 @@ H5FD_log_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_log_init())
 } /* H5FD_log_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_init
  *
@@ -252,11 +242,11 @@ H5FD_log_init_interface(void)
 hid_t
 H5FD_log_init(void)
 {
-    hid_t ret_value;            /* Return value */
+    hid_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5I_VFL != H5I_get_type(H5FD_LOG_g))
+    if (H5I_VFL != H5I_get_type(H5FD_LOG_g))
         H5FD_LOG_g = H5FD_register(&H5FD_log_g, sizeof(H5FD_class_t), FALSE);
 
     /* Set return value */
@@ -266,7 +256,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD_log_term
  *
@@ -290,7 +279,6 @@ H5FD_log_term(void)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5FD_log_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_log
  *
@@ -307,31 +295,30 @@ H5FD_log_term(void)
 herr_t
 H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, size_t buf_size)
 {
-    H5FD_log_fapl_t     fa;         /* File access property list information */
-    H5P_genplist_t      *plist;     /* Property list pointer */
-    herr_t              ret_value;  /* Return value */
+    H5FD_log_fapl_t fa;        /* File access property list information */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    herr_t          ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*sULz", fapl_id, logfile, flags, buf_size);
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
-    /* This shallow copy is correct! The string will be properly 
-     * copied deep down in the H5P code. 
+    /* This shallow copy is correct! The string will be properly
+     * copied deep down in the H5P code.
      */
     fa.logfile = (char *)logfile;
 
-    fa.flags = flags;
+    fa.flags    = flags;
     fa.buf_size = buf_size;
-    ret_value = H5P_set_driver(plist, H5FD_LOG, &fa);
+    ret_value   = H5P_set_driver(plist, H5FD_LOG, &fa);
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fapl_log() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_fapl_get
  *
@@ -351,8 +338,8 @@ done:
 static void *
 H5FD_log_fapl_get(H5FD_t *_file)
 {
-    H5FD_log_t  *file = (H5FD_log_t *)_file;
-    void        *ret_value;                     /* Return value */
+    H5FD_log_t *file = (H5FD_log_t *)_file;
+    void *      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -362,7 +349,6 @@ H5FD_log_fapl_get(H5FD_t *_file)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_fapl_get() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_fapl_copy
  *
@@ -379,33 +365,33 @@ H5FD_log_fapl_get(H5FD_t *_file)
 static void *
 H5FD_log_fapl_copy(const void *_old_fa)
 {
-    const H5FD_log_fapl_t   *old_fa = (const H5FD_log_fapl_t*)_old_fa;
-    H5FD_log_fapl_t         *new_fa = NULL;     /* New FAPL info */
-    void                    *ret_value;         /* Return value */
+    const H5FD_log_fapl_t *old_fa = (const H5FD_log_fapl_t *)_old_fa;
+    H5FD_log_fapl_t *      new_fa = NULL; /* New FAPL info */
+    void *                 ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(old_fa);
 
     /* Allocate the new FAPL info */
-    if(NULL == (new_fa = (H5FD_log_fapl_t *)H5MM_calloc(sizeof(H5FD_log_fapl_t))))
+    if (NULL == (new_fa = (H5FD_log_fapl_t *)H5MM_calloc(sizeof(H5FD_log_fapl_t))))
         HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, NULL, "unable to allocate log file FAPL")
 
     /* Copy the general information */
     HDmemcpy(new_fa, old_fa, sizeof(H5FD_log_fapl_t));
 
     /* Deep copy the log file name */
-    if(old_fa->logfile != NULL)
-        if(NULL == (new_fa->logfile = H5MM_xstrdup(old_fa->logfile)))
+    if (old_fa->logfile != NULL)
+        if (NULL == (new_fa->logfile = H5MM_xstrdup(old_fa->logfile)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate log file name")
 
     /* Set return value */
     ret_value = new_fa;
 
 done:
-    if(NULL == ret_value)
-        if(new_fa) {
-            if(new_fa->logfile)
+    if (NULL == ret_value)
+        if (new_fa) {
+            if (new_fa->logfile)
                 H5MM_free(new_fa->logfile);
             H5MM_free(new_fa);
         } /* end if */
@@ -413,7 +399,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_fapl_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_fapl_free
  *
@@ -429,19 +414,18 @@ done:
 static herr_t
 H5FD_log_fapl_free(void *_fa)
 {
-    H5FD_log_fapl_t	*fa = (H5FD_log_fapl_t*)_fa;
+    H5FD_log_fapl_t *fa = (H5FD_log_fapl_t *)_fa;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Free the fapl information */
-    if(fa->logfile)
+    if (fa->logfile)
         H5MM_xfree(fa->logfile);
     H5MM_xfree(fa);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_log_fapl_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_open
  *
@@ -460,11 +444,11 @@ H5FD_log_fapl_free(void *_fa)
 static H5FD_t *
 H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_log_t      *file = NULL;
-    H5P_genplist_t  *plist;         /* Property list */
-    H5FD_log_fapl_t *fa;            /* File access property list information */
-    int             fd = -1;        /* File descriptor */
-    int             o_flags;        /* Flags for open() call */
+    H5FD_log_t *     file = NULL;
+    H5P_genplist_t * plist;   /* Property list */
+    H5FD_log_fapl_t *fa;      /* File access property list information */
+    int              fd = -1; /* File descriptor */
+    int              o_flags; /* Flags for open() call */
 #ifdef H5_HAVE_WIN32_API
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
@@ -473,8 +457,8 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     struct timeval open_timeval_diff;
     struct timeval stat_timeval_diff;
 #endif /* H5_HAVE_GETTIMEOFDAY */
-    h5_stat_t       sb;
-    H5FD_t          *ret_value;     /* Return value */
+    h5_stat_t sb;
+    H5FD_t *  ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -482,99 +466,102 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
 
     /* Check arguments */
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if(0 == maxaddr || HADDR_UNDEF == maxaddr)
+    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-    if(ADDR_OVERFLOW(maxaddr))
+    if (ADDR_OVERFLOW(maxaddr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr")
 
     /* Build the open flags */
     o_flags = (H5F_ACC_RDWR & flags) ? O_RDWR : O_RDONLY;
-    if(H5F_ACC_TRUNC & flags)
+    if (H5F_ACC_TRUNC & flags)
         o_flags |= O_TRUNC;
-    if(H5F_ACC_CREAT & flags)
+    if (H5F_ACC_CREAT & flags)
         o_flags |= O_CREAT;
-    if(H5F_ACC_EXCL & flags)
+    if (H5F_ACC_EXCL & flags)
         o_flags |= O_EXCL;
 
     /* Get the driver specific information */
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
-    if(NULL == (fa = (H5FD_log_fapl_t *)H5P_get_driver_info(plist)))
+    if (NULL == (fa = (H5FD_log_fapl_t *)H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
 
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(fa->flags & H5FD_LOG_TIME_OPEN)
+    if (fa->flags & H5FD_LOG_TIME_OPEN)
         HDgettimeofday(&timeval_start, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
     /* Open the file */
-    if((fd = HDopen(name, o_flags, 0666)) < 0) {
+    if ((fd = HDopen(name, o_flags, 0666)) < 0) {
         int myerrno = errno;
 
-        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: name = '%s', errno = %d, error message = '%s', flags = %x, o_flags = %x", name, myerrno, HDstrerror(myerrno), flags, (unsigned)o_flags);
+        HGOTO_ERROR(
+            H5E_FILE, H5E_CANTOPENFILE, NULL,
+            "unable to open file: name = '%s', errno = %d, error message = '%s', flags = %x, o_flags = %x",
+            name, myerrno, HDstrerror(myerrno), flags, (unsigned)o_flags);
     } /* end if */
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(fa->flags & H5FD_LOG_TIME_OPEN) {
+    if (fa->flags & H5FD_LOG_TIME_OPEN) {
         struct timeval timeval_stop;
 
         HDgettimeofday(&timeval_stop, NULL);
 
-         /* Calculate the elapsed gettimeofday time */
-         open_timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
-         open_timeval_diff.tv_sec = timeval_stop.tv_sec - timeval_start.tv_sec;
-         if(open_timeval_diff.tv_usec < 0) {
-             open_timeval_diff.tv_usec += 1000000;
-             open_timeval_diff.tv_sec--;
-         } /* end if */
-    } /* end if */
-#endif /* H5_HAVE_GETTIMEOFDAY */
+        /* Calculate the elapsed gettimeofday time */
+        open_timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
+        open_timeval_diff.tv_sec  = timeval_stop.tv_sec - timeval_start.tv_sec;
+        if (open_timeval_diff.tv_usec < 0) {
+            open_timeval_diff.tv_usec += 1000000;
+            open_timeval_diff.tv_sec--;
+        } /* end if */
+    }     /* end if */
+#endif    /* H5_HAVE_GETTIMEOFDAY */
 
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(fa->flags & H5FD_LOG_TIME_STAT)
+    if (fa->flags & H5FD_LOG_TIME_STAT)
         HDgettimeofday(&timeval_start, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
     /* Get the file stats */
-    if(HDfstat(fd, &sb) < 0)
+    if (HDfstat(fd, &sb) < 0)
         HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, NULL, "unable to fstat file")
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(fa->flags & H5FD_LOG_TIME_STAT) {
+    if (fa->flags & H5FD_LOG_TIME_STAT) {
         struct timeval timeval_stop;
 
         HDgettimeofday(&timeval_stop, NULL);
 
-         /* Calculate the elapsed gettimeofday time */
-         stat_timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
-         stat_timeval_diff.tv_sec = timeval_stop.tv_sec - timeval_start.tv_sec;
-         if(stat_timeval_diff.tv_usec < 0) {
-             stat_timeval_diff.tv_usec += 1000000;
-             stat_timeval_diff.tv_sec--;
-         } /* end if */
-    } /* end if */
-#endif /* H5_HAVE_GETTIMEOFDAY */
+        /* Calculate the elapsed gettimeofday time */
+        stat_timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
+        stat_timeval_diff.tv_sec  = timeval_stop.tv_sec - timeval_start.tv_sec;
+        if (stat_timeval_diff.tv_usec < 0) {
+            stat_timeval_diff.tv_usec += 1000000;
+            stat_timeval_diff.tv_sec--;
+        } /* end if */
+    }     /* end if */
+#endif    /* H5_HAVE_GETTIMEOFDAY */
 
     /* Create the new file struct */
-    if(NULL == (file = H5FL_CALLOC(H5FD_log_t)))
+    if (NULL == (file = H5FL_CALLOC(H5FD_log_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
 
     file->fd = fd;
     H5_CHECKED_ASSIGN(file->eof, haddr_t, sb.st_size, h5_stat_size_t);
     file->pos = HADDR_UNDEF;
-    file->op = OP_UNKNOWN;
+    file->op  = OP_UNKNOWN;
 #ifdef H5_HAVE_WIN32_API
     file->hFile = (HANDLE)_get_osfhandle(fd);
-    if(INVALID_HANDLE_VALUE == file->hFile)
+    if (INVALID_HANDLE_VALUE == file->hFile)
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to get Windows file handle")
 
-    if(!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo))
+    if (!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo))
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to get Windows file information")
 
-    file->nFileIndexHigh = fileinfo.nFileIndexHigh;
-    file->nFileIndexLow = fileinfo.nFileIndexLow;
+    file->nFileIndexHigh       = fileinfo.nFileIndexHigh;
+    file->nFileIndexLow        = fileinfo.nFileIndexLow;
     file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else  /* H5_HAVE_WIN32_API */
     file->device = sb.st_dev;
-    file->inode = sb.st_ino;
+    file->inode  = sb.st_ino;
 #endif /* H5_HAVE_WIN32_API */
 
     /* Retain a copy of the name used to open the file, for possible error reporting */
@@ -585,64 +572,67 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     file->fa.flags = fa->flags;
 
     /* Check if we are doing any logging at all */
-    if(file->fa.flags != 0) {
+    if (file->fa.flags != 0) {
         /* Allocate buffers for tracking file accesses and data "flavor" */
         file->iosize = fa->buf_size;
-        if(file->fa.flags & H5FD_LOG_FILE_READ) {
+        if (file->fa.flags & H5FD_LOG_FILE_READ) {
             file->nread = (unsigned char *)H5MM_calloc(file->iosize);
             HDassert(file->nread);
         } /* end if */
-        if(file->fa.flags & H5FD_LOG_FILE_WRITE) {
+        if (file->fa.flags & H5FD_LOG_FILE_WRITE) {
             file->nwrite = (unsigned char *)H5MM_calloc(file->iosize);
             HDassert(file->nwrite);
         } /* end if */
-        if(file->fa.flags & H5FD_LOG_FLAVOR) {
+        if (file->fa.flags & H5FD_LOG_FLAVOR) {
             file->flavor = (unsigned char *)H5MM_calloc(file->iosize);
             HDassert(file->flavor);
         } /* end if */
 
         /* Set the log file pointer */
-        if(fa->logfile)
+        if (fa->logfile)
             file->logfp = HDfopen(fa->logfile, "w");
         else
             file->logfp = stderr;
 
 #ifdef H5_HAVE_GETTIMEOFDAY
-        if(file->fa.flags & H5FD_LOG_TIME_OPEN)
-            HDfprintf(file->logfp, "Open took: (%f s)\n", (double)open_timeval_diff.tv_sec + ((double)open_timeval_diff.tv_usec / (double)1000000.0f));
-        if(file->fa.flags & H5FD_LOG_TIME_STAT)
-            HDfprintf(file->logfp, "Stat took: (%f s)\n", (double)stat_timeval_diff.tv_sec + ((double)stat_timeval_diff.tv_usec / (double)1000000.0f));
+        if (file->fa.flags & H5FD_LOG_TIME_OPEN)
+            HDfprintf(file->logfp, "Open took: (%f s)\n",
+                      (double)open_timeval_diff.tv_sec +
+                          ((double)open_timeval_diff.tv_usec / (double)1000000.0f));
+        if (file->fa.flags & H5FD_LOG_TIME_STAT)
+            HDfprintf(file->logfp, "Stat took: (%f s)\n",
+                      (double)stat_timeval_diff.tv_sec +
+                          ((double)stat_timeval_diff.tv_usec / (double)1000000.0f));
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
     } /* end if */
 
     /* Check for non-default FAPL */
-    if(H5P_FILE_ACCESS_DEFAULT != fapl_id) {
+    if (H5P_FILE_ACCESS_DEFAULT != fapl_id) {
         /* This step is for h5repart tool only. If user wants to change file driver from
          * family to sec2 while using h5repart, this private property should be set so that
          * in the later step, the library can ignore the family driver information saved
          * in the superblock.
          */
-        if(H5P_exist_plist(plist, H5F_ACS_FAMILY_TO_SEC2_NAME) > 0)
-            if(H5P_get(plist, H5F_ACS_FAMILY_TO_SEC2_NAME, &file->fam_to_sec2) < 0)
+        if (H5P_exist_plist(plist, H5F_ACS_FAMILY_TO_SEC2_NAME) > 0)
+            if (H5P_get(plist, H5F_ACS_FAMILY_TO_SEC2_NAME, &file->fam_to_sec2) < 0)
                 HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get property of changing family to sec2")
     } /* end if */
 
     /* Set return value */
-    ret_value = (H5FD_t*)file;
+    ret_value = (H5FD_t *)file;
 
 done:
-    if(NULL == ret_value) {
-        if(fd >= 0)
+    if (NULL == ret_value) {
+        if (fd >= 0)
             HDclose(fd);
-        if(file)
+        if (file)
             file = H5FL_FREE(H5FD_log_t, file);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_close
  *
@@ -659,11 +649,11 @@ done:
 static herr_t
 H5FD_log_close(H5FD_t *_file)
 {
-    H5FD_log_t	*file = (H5FD_log_t *)_file;
+    H5FD_log_t *file = (H5FD_log_t *)_file;
 #ifdef H5_HAVE_GETTIMEOFDAY
     struct timeval timeval_start, timeval_stop;
-#endif /* H5_HAVE_GETTIMEOFDAY */
-    herr_t ret_value = SUCCEED;                 /* Return value */
+#endif                          /* H5_HAVE_GETTIMEOFDAY */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -671,115 +661,122 @@ H5FD_log_close(H5FD_t *_file)
     HDassert(file);
 
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(file->fa.flags&H5FD_LOG_TIME_CLOSE)
+    if (file->fa.flags & H5FD_LOG_TIME_CLOSE)
         HDgettimeofday(&timeval_start, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
     /* Close the underlying file */
-    if(HDclose(file->fd) < 0)
+    if (HDclose(file->fd) < 0)
         HSYS_GOTO_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(file->fa.flags&H5FD_LOG_TIME_CLOSE)
+    if (file->fa.flags & H5FD_LOG_TIME_CLOSE)
         HDgettimeofday(&timeval_stop, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
     /* Dump I/O information */
-    if(file->fa.flags != 0) {
-        haddr_t addr;
-        haddr_t last_addr;
+    if (file->fa.flags != 0) {
+        haddr_t       addr;
+        haddr_t       last_addr;
         unsigned char last_val;
 
 #ifdef H5_HAVE_GETTIMEOFDAY
-        if(file->fa.flags & H5FD_LOG_TIME_CLOSE) {
+        if (file->fa.flags & H5FD_LOG_TIME_CLOSE) {
             struct timeval timeval_diff;
 
-             /* Calculate the elapsed gettimeofday time */
-             timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
-             timeval_diff.tv_sec = timeval_stop.tv_sec - timeval_start.tv_sec;
-             if(timeval_diff.tv_usec < 0) {
-                 timeval_diff.tv_usec += 1000000;
-                 timeval_diff.tv_sec--;
-             } /* end if */
-            HDfprintf(file->logfp, "Close took: (%f s)\n", (double)timeval_diff.tv_sec + ((double)timeval_diff.tv_usec / (double)1000000.0f));
+            /* Calculate the elapsed gettimeofday time */
+            timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
+            timeval_diff.tv_sec  = timeval_stop.tv_sec - timeval_start.tv_sec;
+            if (timeval_diff.tv_usec < 0) {
+                timeval_diff.tv_usec += 1000000;
+                timeval_diff.tv_sec--;
+            } /* end if */
+            HDfprintf(file->logfp, "Close took: (%f s)\n",
+                      (double)timeval_diff.tv_sec + ((double)timeval_diff.tv_usec / (double)1000000.0f));
         } /* end if */
-#endif /* H5_HAVE_GETTIMEOFDAY */
+#endif    /* H5_HAVE_GETTIMEOFDAY */
 
         /* Dump the total number of seek/read/write operations */
-        if(file->fa.flags & H5FD_LOG_NUM_READ)
+        if (file->fa.flags & H5FD_LOG_NUM_READ)
             HDfprintf(file->logfp, "Total number of read operations: %llu\n", file->total_read_ops);
-        if(file->fa.flags & H5FD_LOG_NUM_WRITE)
+        if (file->fa.flags & H5FD_LOG_NUM_WRITE)
             HDfprintf(file->logfp, "Total number of write operations: %llu\n", file->total_write_ops);
-        if(file->fa.flags & H5FD_LOG_NUM_SEEK)
+        if (file->fa.flags & H5FD_LOG_NUM_SEEK)
             HDfprintf(file->logfp, "Total number of seek operations: %llu\n", file->total_seek_ops);
-        if(file->fa.flags & H5FD_LOG_NUM_TRUNCATE)
+        if (file->fa.flags & H5FD_LOG_NUM_TRUNCATE)
             HDfprintf(file->logfp, "Total number of truncate operations: %llu\n", file->total_truncate_ops);
 
         /* Dump the total time in seek/read/write */
-        if(file->fa.flags & H5FD_LOG_TIME_READ)
+        if (file->fa.flags & H5FD_LOG_TIME_READ)
             HDfprintf(file->logfp, "Total time in read operations: %f s\n", file->total_read_time);
-        if(file->fa.flags & H5FD_LOG_TIME_WRITE)
+        if (file->fa.flags & H5FD_LOG_TIME_WRITE)
             HDfprintf(file->logfp, "Total time in write operations: %f s\n", file->total_write_time);
-        if(file->fa.flags & H5FD_LOG_TIME_SEEK)
+        if (file->fa.flags & H5FD_LOG_TIME_SEEK)
             HDfprintf(file->logfp, "Total time in seek operations: %f s\n", file->total_seek_time);
 
         /* Dump the write I/O information */
-        if(file->fa.flags & H5FD_LOG_FILE_WRITE) {
+        if (file->fa.flags & H5FD_LOG_FILE_WRITE) {
             HDfprintf(file->logfp, "Dumping write I/O information:\n");
-            last_val = file->nwrite[0];
+            last_val  = file->nwrite[0];
             last_addr = 0;
-            addr = 1;
-            while(addr < file->eoa) {
-                if(file->nwrite[addr] != last_val) {
-                    HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) written to %3d times\n", last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
-                    last_val = file->nwrite[addr];
+            addr      = 1;
+            while (addr < file->eoa) {
+                if (file->nwrite[addr] != last_val) {
+                    HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) written to %3d times\n", last_addr,
+                              (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
+                    last_val  = file->nwrite[addr];
                     last_addr = addr;
                 } /* end if */
                 addr++;
             } /* end while */
-            HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) written to %3d times\n", last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
+            HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) written to %3d times\n", last_addr,
+                      (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
         } /* end if */
 
         /* Dump the read I/O information */
-        if(file->fa.flags & H5FD_LOG_FILE_READ) {
+        if (file->fa.flags & H5FD_LOG_FILE_READ) {
             HDfprintf(file->logfp, "Dumping read I/O information:\n");
-            last_val = file->nread[0];
+            last_val  = file->nread[0];
             last_addr = 0;
-            addr = 1;
-            while(addr < file->eoa) {
-                if(file->nread[addr] != last_val) {
-                    HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) read from %3d times\n", last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
-                    last_val = file->nread[addr];
+            addr      = 1;
+            while (addr < file->eoa) {
+                if (file->nread[addr] != last_val) {
+                    HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) read from %3d times\n", last_addr,
+                              (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
+                    last_val  = file->nread[addr];
                     last_addr = addr;
                 } /* end if */
                 addr++;
             } /* end while */
-            HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) read from %3d times\n", last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
+            HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) read from %3d times\n", last_addr,
+                      (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
         } /* end if */
 
         /* Dump the I/O flavor information */
-        if(file->fa.flags & H5FD_LOG_FLAVOR) {
+        if (file->fa.flags & H5FD_LOG_FLAVOR) {
             HDfprintf(file->logfp, "Dumping I/O flavor information:\n");
-            last_val = file->flavor[0];
+            last_val  = file->flavor[0];
             last_addr = 0;
-            addr = 1;
-            while(addr < file->eoa) {
-                if(file->flavor[addr] != last_val) {
-                    HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) flavor is %s\n", last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]);
-                    last_val = file->flavor[addr];
+            addr      = 1;
+            while (addr < file->eoa) {
+                if (file->flavor[addr] != last_val) {
+                    HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) flavor is %s\n", last_addr,
+                              (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]);
+                    last_val  = file->flavor[addr];
                     last_addr = addr;
                 } /* end if */
                 addr++;
             } /* end while */
-            HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) flavor is %s\n", last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]);
+            HDfprintf(file->logfp, "\tAddr %10a-%10a (%10lu bytes) flavor is %s\n", last_addr, (addr - 1),
+                      (unsigned long)(addr - last_addr), flavors[last_val]);
         } /* end if */
 
         /* Free the logging information */
-        if(file->fa.flags & H5FD_LOG_FILE_WRITE)
+        if (file->fa.flags & H5FD_LOG_FILE_WRITE)
             file->nwrite = (unsigned char *)H5MM_xfree(file->nwrite);
-        if(file->fa.flags & H5FD_LOG_FILE_READ)
+        if (file->fa.flags & H5FD_LOG_FILE_READ)
             file->nread = (unsigned char *)H5MM_xfree(file->nread);
-        if(file->fa.flags & H5FD_LOG_FLAVOR)
+        if (file->fa.flags & H5FD_LOG_FLAVOR)
             file->flavor = (unsigned char *)H5MM_xfree(file->flavor);
-        if(file->logfp != stderr)
+        if (file->logfp != stderr)
             HDfclose(file->logfp);
     } /* end if */
 
@@ -790,7 +787,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_cmp
  *
@@ -809,36 +805,48 @@ done:
 static int
 H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_log_t    *f1 = (const H5FD_log_t *)_f1;
-    const H5FD_log_t    *f2 = (const H5FD_log_t *)_f2;
-    int ret_value = 0;
+    const H5FD_log_t *f1        = (const H5FD_log_t *)_f1;
+    const H5FD_log_t *f2        = (const H5FD_log_t *)_f2;
+    int               ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #ifdef H5_HAVE_WIN32_API
-    if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) HGOTO_DONE(-1)
-    if(f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber) HGOTO_DONE(1)
-
-    if(f1->nFileIndexHigh < f2->nFileIndexHigh) HGOTO_DONE(-1)
-    if(f1->nFileIndexHigh > f2->nFileIndexHigh) HGOTO_DONE(1)
-
-    if(f1->nFileIndexLow < f2->nFileIndexLow) HGOTO_DONE(-1)
-    if(f1->nFileIndexLow > f2->nFileIndexLow) HGOTO_DONE(1)
+    if (f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber)
+        HGOTO_DONE(-1)
+    if (f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber)
+        HGOTO_DONE(1)
+
+    if (f1->nFileIndexHigh < f2->nFileIndexHigh)
+        HGOTO_DONE(-1)
+    if (f1->nFileIndexHigh > f2->nFileIndexHigh)
+        HGOTO_DONE(1)
+
+    if (f1->nFileIndexLow < f2->nFileIndexLow)
+        HGOTO_DONE(-1)
+    if (f1->nFileIndexLow > f2->nFileIndexLow)
+        HGOTO_DONE(1)
 #else
 #ifdef H5_DEV_T_IS_SCALAR
-    if(f1->device < f2->device) HGOTO_DONE(-1)
-    if(f1->device > f2->device) HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+    if (f1->device < f2->device)
+        HGOTO_DONE(-1)
+    if (f1->device > f2->device)
+        HGOTO_DONE(1)
+#else  /* H5_DEV_T_IS_SCALAR */
     /* If dev_t isn't a scalar value on this system, just use memcmp to
      * determine if the values are the same or not.  The actual return value
      * shouldn't really matter...
      */
-    if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t)) < 0) HGOTO_DONE(-1)
-    if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t)) > 0) HGOTO_DONE(1)
+    if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0)
+        HGOTO_DONE(-1)
+    if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0)
+        HGOTO_DONE(1)
 #endif /* H5_DEV_T_IS_SCALAR */
 
-    if(f1->inode < f2->inode) HGOTO_DONE(-1)
-    if(f1->inode > f2->inode) HGOTO_DONE(1)
+    if (f1->inode < f2->inode)
+        HGOTO_DONE(-1)
+    if (f1->inode > f2->inode)
+        HGOTO_DONE(1)
 
 #endif
 
@@ -846,7 +854,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_query
  *
@@ -863,28 +870,28 @@ done:
 static herr_t
 H5FD_log_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
-    const H5FD_log_t    *file = (const H5FD_log_t *)_file;
+    const H5FD_log_t *file = (const H5FD_log_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set the VFL feature flags that this driver supports */
-    if(flags) {
+    if (flags) {
         *flags = 0;
-        *flags |= H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations */
         *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
-        *flags |= H5FD_FEAT_DATA_SIEVE;       /* OK to perform data sieving for faster raw data reads & writes */
+        *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */
         *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
         *flags |= H5FD_FEAT_POSIX_COMPAT_HANDLE; /* VFD handle is POSIX I/O call compatible */
 
         /* Check for flags that are set by h5repart */
-        if(file && file->fam_to_sec2)
-            *flags |= H5FD_FEAT_IGNORE_DRVRINFO; /* Ignore the driver info when file is opened (which eliminates it) */
-    } /* end if */
+        if (file && file->fam_to_sec2)
+            *flags |= H5FD_FEAT_IGNORE_DRVRINFO; /* Ignore the driver info when file is opened (which
+                                                    eliminates it) */
+    }                                            /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_log_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_alloc
  *
@@ -901,9 +908,9 @@ H5FD_log_query(const H5FD_t *_file, unsigned long *flags /* out */)
 static haddr_t
 H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hsize_t size)
 {
-    H5FD_log_t	*file = (H5FD_log_t *)_file;
-    haddr_t addr;
-    haddr_t ret_value;          /* Return value */
+    H5FD_log_t *file = (H5FD_log_t *)_file;
+    haddr_t     addr;
+    haddr_t     ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -911,24 +918,25 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hsi
     addr = file->eoa;
 
     /* Check if we need to align this block */
-    if(size >= file->pub.threshold) {
+    if (size >= file->pub.threshold) {
         /* Check for an already aligned block */
-        if(addr % file->pub.alignment != 0)
+        if (addr % file->pub.alignment != 0)
             addr = ((addr / file->pub.alignment) + 1) * file->pub.alignment;
     } /* end if */
 
     file->eoa = addr + size;
 
     /* Retain the (first) flavor of the information written to the file */
-    if(file->fa.flags != 0) {
-        if(file->fa.flags & H5FD_LOG_FLAVOR) {
+    if (file->fa.flags != 0) {
+        if (file->fa.flags & H5FD_LOG_FLAVOR) {
             HDassert(addr < file->iosize);
             H5_CHECK_OVERFLOW(size, hsize_t, size_t);
             HDmemset(&file->flavor[addr], (int)type, (size_t)size);
         } /* end if */
 
-        if(file->fa.flags & H5FD_LOG_ALLOC)
-            HDfprintf(file->logfp, "%10a-%10a (%10Hu bytes) (%s) Allocated\n", addr, (addr + size) - 1, size, flavors[type]);
+        if (file->fa.flags & H5FD_LOG_ALLOC)
+            HDfprintf(file->logfp, "%10a-%10a (%10Hu bytes) (%s) Allocated\n", addr, (addr + size) - 1, size,
+                      flavors[type]);
     } /* end if */
 
     /* Set return value */
@@ -937,7 +945,6 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hsi
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_get_eoa
  *
@@ -956,14 +963,13 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hsi
 static haddr_t
 H5FD_log_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_log_t    *file = (const H5FD_log_t *)_file;
+    const H5FD_log_t *file = (const H5FD_log_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(file->eoa)
 } /* end H5FD_log_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_set_eoa
  *
@@ -981,33 +987,33 @@ H5FD_log_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD_log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr)
 {
-    H5FD_log_t  *file = (H5FD_log_t *)_file;
+    H5FD_log_t *file = (H5FD_log_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(file->fa.flags != 0) {
-        if(H5F_addr_gt(addr, file->eoa) && H5F_addr_gt(addr, 0)) {
+    if (file->fa.flags != 0) {
+        if (H5F_addr_gt(addr, file->eoa) && H5F_addr_gt(addr, 0)) {
             hsize_t size = addr - file->eoa;
 
             /* Retain the flavor of the space allocated by the extension */
-            if(file->fa.flags & H5FD_LOG_FLAVOR) {
+            if (file->fa.flags & H5FD_LOG_FLAVOR) {
                 HDassert(addr < file->iosize);
                 H5_CHECK_OVERFLOW(size, hsize_t, size_t);
                 HDmemset(&file->flavor[file->eoa], (int)type, (size_t)size);
             } /* end if */
 
             /* Log the extension like an allocation */
-            if(file->fa.flags & H5FD_LOG_ALLOC)
-                HDfprintf(file->logfp, "%10a-%10a (%10Hu bytes) (%s) Allocated\n", file->eoa, addr, size, flavors[type]);
+            if (file->fa.flags & H5FD_LOG_ALLOC)
+                HDfprintf(file->logfp, "%10a-%10a (%10Hu bytes) (%s) Allocated\n", file->eoa, addr, size,
+                          flavors[type]);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     file->eoa = addr;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_log_set_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_get_eof
  *
@@ -1028,14 +1034,13 @@ H5FD_log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr)
 static haddr_t
 H5FD_log_get_eof(const H5FD_t *_file)
 {
-    const H5FD_log_t	*file = (const H5FD_log_t *)_file;
+    const H5FD_log_t *file = (const H5FD_log_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
 } /* end H5FD_log_get_eof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD_log_get_handle
  *
@@ -1051,12 +1056,12 @@ H5FD_log_get_eof(const H5FD_t *_file)
 static herr_t
 H5FD_log_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
-    H5FD_log_t          *file = (H5FD_log_t *)_file;
-    herr_t              ret_value = SUCCEED;
+    H5FD_log_t *file      = (H5FD_log_t *)_file;
+    herr_t      ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(!file_handle)
+    if (!file_handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
 
     *file_handle = &(file->fd);
@@ -1065,7 +1070,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_get_handle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_read
  *
@@ -1083,16 +1087,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
-            size_t size, void *buf/*out*/)
+H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, size_t size,
+              void *buf /*out*/)
 {
-    H5FD_log_t          *file = (H5FD_log_t *)_file;
-    size_t              orig_size = size; /* Save the original size for later */
-    haddr_t             orig_addr = addr;
+    H5FD_log_t *file      = (H5FD_log_t *)_file;
+    size_t      orig_size = size; /* Save the original size for later */
+    haddr_t     orig_addr = addr;
 #ifdef H5_HAVE_GETTIMEOFDAY
-    struct timeval      timeval_start, timeval_stop;
-#endif /* H5_HAVE_GETTIMEOFDAY */
-    herr_t              ret_value = SUCCEED;       /* Return value */
+    struct timeval timeval_start, timeval_stop;
+#endif                          /* H5_HAVE_GETTIMEOFDAY */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1100,51 +1104,51 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hadd
     HDassert(buf);
 
     /* Check for overflow conditions */
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined, addr = %llu", (unsigned long long)addr)
-    if(REGION_OVERFLOW(addr, size))
+    if (REGION_OVERFLOW(addr, size))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu", (unsigned long long)addr)
 
     /* Log the I/O information about the read */
-    if(file->fa.flags != 0) {
-        size_t tmp_size = size;
+    if (file->fa.flags != 0) {
+        size_t  tmp_size = size;
         haddr_t tmp_addr = addr;
 
         /* Log information about the number of times these locations are read */
-        if(file->fa.flags & H5FD_LOG_FILE_READ) {
+        if (file->fa.flags & H5FD_LOG_FILE_READ) {
             HDassert((addr + size) < file->iosize);
-            while(tmp_size-- > 0)
+            while (tmp_size-- > 0)
                 file->nread[tmp_addr++]++;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Seek to the correct location */
-    if(addr != file->pos || OP_READ != file->op) {
+    if (addr != file->pos || OP_READ != file->op) {
 #ifdef H5_HAVE_GETTIMEOFDAY
-        if(file->fa.flags & H5FD_LOG_TIME_SEEK)
+        if (file->fa.flags & H5FD_LOG_TIME_SEEK)
             HDgettimeofday(&timeval_start, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
-        if(HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
+        if (HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 #ifdef H5_HAVE_GETTIMEOFDAY
-        if(file->fa.flags & H5FD_LOG_TIME_SEEK)
+        if (file->fa.flags & H5FD_LOG_TIME_SEEK)
             HDgettimeofday(&timeval_stop, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
         /* Log information about the seek */
-        if(file->fa.flags & H5FD_LOG_NUM_SEEK)
+        if (file->fa.flags & H5FD_LOG_NUM_SEEK)
             file->total_seek_ops++;
-        if(file->fa.flags & H5FD_LOG_LOC_SEEK) {
+        if (file->fa.flags & H5FD_LOG_LOC_SEEK) {
             HDfprintf(file->logfp, "Seek: From %10a To %10a", file->pos, addr);
 #ifdef H5_HAVE_GETTIMEOFDAY
-            if(file->fa.flags & H5FD_LOG_TIME_SEEK) {
+            if (file->fa.flags & H5FD_LOG_TIME_SEEK) {
                 struct timeval timeval_diff;
-                double time_diff;
+                double         time_diff;
 
                 /* Calculate the elapsed gettimeofday time */
                 timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
-                timeval_diff.tv_sec = timeval_stop.tv_sec - timeval_start.tv_sec;
-                if(timeval_diff.tv_usec < 0) {
+                timeval_diff.tv_sec  = timeval_stop.tv_sec - timeval_start.tv_sec;
+                if (timeval_diff.tv_usec < 0) {
                     timeval_diff.tv_usec += 1000000;
                     timeval_diff.tv_sec--;
                 } /* end if */
@@ -1156,49 +1160,56 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hadd
             } /* end if */
             else
                 HDfprintf(file->logfp, "\n");
-#else /* H5_HAVE_GETTIMEOFDAY */
+#else     /* H5_HAVE_GETTIMEOFDAY */
             HDfprintf(file->logfp, "\n");
-#endif /* H5_HAVE_GETTIMEOFDAY */
+#endif    /* H5_HAVE_GETTIMEOFDAY */
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /*
      * Read data, being careful of interrupted system calls, partial results,
      * and the end of the file.
      */
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(file->fa.flags & H5FD_LOG_TIME_READ)
+    if (file->fa.flags & H5FD_LOG_TIME_READ)
         HDgettimeofday(&timeval_start, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
-    while(size > 0) {
+    while (size > 0) {
 
-        h5_posix_io_t       bytes_in        = 0;    /* # of bytes to read       */
-        h5_posix_io_ret_t   bytes_read      = -1;   /* # of bytes actually read */ 
+        h5_posix_io_t     bytes_in   = 0;  /* # of bytes to read       */
+        h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */
 
         /* Trying to read more bytes than the return type can handle is
          * undefined behavior in POSIX.
          */
-        if(size > H5_POSIX_MAX_IO_BYTES)
+        if (size > H5_POSIX_MAX_IO_BYTES)
             bytes_in = H5_POSIX_MAX_IO_BYTES;
         else
             bytes_in = (h5_posix_io_t)size;
 
         do {
             bytes_read = HDread(file->fd, buf, bytes_in);
-        } while(-1 == bytes_read && EINTR == errno);
+        } while (-1 == bytes_read && EINTR == errno);
 
-        if(-1 == bytes_read) { /* error */
-            int myerrno = errno;
-            time_t mytime = HDtime(NULL);
+        if (-1 == bytes_read) { /* error */
+            int     myerrno  = errno;
+            time_t  mytime   = HDtime(NULL);
             HDoff_t myoffset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
-            if(file->fa.flags & H5FD_LOG_LOC_READ)
-                HDfprintf(file->logfp, "Error! Reading: %10a-%10a (%10Zu bytes)\n", orig_addr, (orig_addr + orig_size) - 1, orig_size);
-
-            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', buf = %p, total read size = %llu, bytes this sub-read = %llu, bytes actually read = %llu, offset = %llu", HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_read, (unsigned long long)myoffset);
+            if (file->fa.flags & H5FD_LOG_LOC_READ)
+                HDfprintf(file->logfp, "Error! Reading: %10a-%10a (%10Zu bytes)\n", orig_addr,
+                          (orig_addr + orig_size) - 1, orig_size);
+
+            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL,
+                        "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
+                        "error message = '%s', buf = %p, total read size = %llu, bytes this sub-read = %llu, "
+                        "bytes actually read = %llu, offset = %llu",
+                        HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf,
+                        (unsigned long long)size, (unsigned long long)bytes_in,
+                        (unsigned long long)bytes_read, (unsigned long long)myoffset);
         } /* end if */
 
-        if(0 == bytes_read) {
+        if (0 == bytes_read) {
             /* end of file but not end of format address space */
             HDmemset(buf, 0, size);
             break;
@@ -1206,34 +1217,35 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hadd
 
         HDassert(bytes_read >= 0);
         HDassert((size_t)bytes_read <= size);
-        
+
         size -= (size_t)bytes_read;
         addr += (haddr_t)bytes_read;
         buf = (char *)buf + bytes_read;
 
     } /* end while */
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(file->fa.flags & H5FD_LOG_TIME_READ)
+    if (file->fa.flags & H5FD_LOG_TIME_READ)
         HDgettimeofday(&timeval_stop, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
     /* Log information about the read */
-    if(file->fa.flags & H5FD_LOG_NUM_READ)
+    if (file->fa.flags & H5FD_LOG_NUM_READ)
         file->total_read_ops++;
-    if(file->fa.flags & H5FD_LOG_LOC_READ) {
-        HDfprintf(file->logfp, "%10a-%10a (%10Zu bytes) (%s) Read", orig_addr, (orig_addr + orig_size) - 1, orig_size, flavors[type]);
+    if (file->fa.flags & H5FD_LOG_LOC_READ) {
+        HDfprintf(file->logfp, "%10a-%10a (%10Zu bytes) (%s) Read", orig_addr, (orig_addr + orig_size) - 1,
+                  orig_size, flavors[type]);
 
         /* XXX: Verify the flavor information, if we have it? */
 
 #ifdef H5_HAVE_GETTIMEOFDAY
-        if(file->fa.flags & H5FD_LOG_TIME_READ) {
+        if (file->fa.flags & H5FD_LOG_TIME_READ) {
             struct timeval timeval_diff;
-            double time_diff;
+            double         time_diff;
 
             /* Calculate the elapsed gettimeofday time */
             timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
-            timeval_diff.tv_sec = timeval_stop.tv_sec - timeval_start.tv_sec;
-            if(timeval_diff.tv_usec < 0) {
+            timeval_diff.tv_sec  = timeval_stop.tv_sec - timeval_start.tv_sec;
+            if (timeval_diff.tv_usec < 0) {
                 timeval_diff.tv_usec += 1000000;
                 timeval_diff.tv_sec--;
             } /* end if */
@@ -1245,26 +1257,25 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hadd
         } /* end if */
         else
             HDfprintf(file->logfp, "\n");
-#else /* H5_HAVE_GETTIMEOFDAY */
+#else  /* H5_HAVE_GETTIMEOFDAY */
         HDfprintf(file->logfp, "\n");
 #endif /* H5_HAVE_GETTIMEOFDAY */
-    } /* end if */
+    }  /* end if */
 
     /* Update current position */
     file->pos = addr;
-    file->op = OP_READ;
+    file->op  = OP_READ;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_write
  *
@@ -1280,16 +1291,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
-            size_t size, const void *buf)
+H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, size_t size,
+               const void *buf)
 {
-    H5FD_log_t          *file = (H5FD_log_t *)_file;
-    size_t              orig_size = size; /* Save the original size for later */
-    haddr_t             orig_addr = addr;
+    H5FD_log_t *file      = (H5FD_log_t *)_file;
+    size_t      orig_size = size; /* Save the original size for later */
+    haddr_t     orig_addr = addr;
 #ifdef H5_HAVE_GETTIMEOFDAY
-    struct timeval      timeval_start, timeval_stop;
-#endif /* H5_HAVE_GETTIMEOFDAY */
-    herr_t              ret_value = SUCCEED;       /* Return value */
+    struct timeval timeval_start, timeval_stop;
+#endif                          /* H5_HAVE_GETTIMEOFDAY */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1298,55 +1309,58 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
     HDassert(buf);
 
     /* Verify that we are writing out the type of data we allocated in this location */
-    if(file->flavor) {
-        HDassert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[addr] || (H5FD_mem_t)file->flavor[addr] == H5FD_MEM_DEFAULT);
-        HDassert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[(addr + size) - 1] || (H5FD_mem_t)file->flavor[(addr + size) - 1] == H5FD_MEM_DEFAULT);
+    if (file->flavor) {
+        HDassert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[addr] ||
+                 (H5FD_mem_t)file->flavor[addr] == H5FD_MEM_DEFAULT);
+        HDassert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[(addr + size) - 1] ||
+                 (H5FD_mem_t)file->flavor[(addr + size) - 1] == H5FD_MEM_DEFAULT);
     } /* end if */
 
     /* Check for overflow conditions */
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined, addr = %llu", (unsigned long long)addr)
-    if(REGION_OVERFLOW(addr, size))
-        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size = %llu", (unsigned long long)addr, (unsigned long long)size)
+    if (REGION_OVERFLOW(addr, size))
+        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size = %llu",
+                    (unsigned long long)addr, (unsigned long long)size)
 
     /* Log the I/O information about the write */
-    if(file->fa.flags & H5FD_LOG_FILE_WRITE) {
-        size_t tmp_size = size;
+    if (file->fa.flags & H5FD_LOG_FILE_WRITE) {
+        size_t  tmp_size = size;
         haddr_t tmp_addr = addr;
 
         /* Log information about the number of times these locations are read */
         HDassert((addr + size) < file->iosize);
-        while(tmp_size-- > 0)
+        while (tmp_size-- > 0)
             file->nwrite[tmp_addr++]++;
     } /* end if */
 
     /* Seek to the correct location */
-    if(addr != file->pos || OP_WRITE != file->op) {
+    if (addr != file->pos || OP_WRITE != file->op) {
 #ifdef H5_HAVE_GETTIMEOFDAY
-        if(file->fa.flags & H5FD_LOG_TIME_SEEK)
+        if (file->fa.flags & H5FD_LOG_TIME_SEEK)
             HDgettimeofday(&timeval_start, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
-        if(HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
+        if (HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 #ifdef H5_HAVE_GETTIMEOFDAY
-        if(file->fa.flags & H5FD_LOG_TIME_SEEK)
+        if (file->fa.flags & H5FD_LOG_TIME_SEEK)
             HDgettimeofday(&timeval_stop, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
         /* Log information about the seek */
-        if(file->fa.flags & H5FD_LOG_NUM_SEEK)
+        if (file->fa.flags & H5FD_LOG_NUM_SEEK)
             file->total_seek_ops++;
-        if(file->fa.flags & H5FD_LOG_LOC_SEEK) {
+        if (file->fa.flags & H5FD_LOG_LOC_SEEK) {
             HDfprintf(file->logfp, "Seek: From %10a To %10a", file->pos, addr);
 #ifdef H5_HAVE_GETTIMEOFDAY
-            if(file->fa.flags & H5FD_LOG_TIME_SEEK) {
+            if (file->fa.flags & H5FD_LOG_TIME_SEEK) {
                 struct timeval timeval_diff;
-                double time_diff;
+                double         time_diff;
 
                 /* Calculate the elapsed gettimeofday time */
                 timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
-                timeval_diff.tv_sec = timeval_stop.tv_sec - timeval_start.tv_sec;
-                if(timeval_diff.tv_usec < 0) {
+                timeval_diff.tv_sec  = timeval_stop.tv_sec - timeval_start.tv_sec;
+                if (timeval_diff.tv_usec < 0) {
                     timeval_diff.tv_usec += 1000000;
                     timeval_diff.tv_sec--;
                 } /* end if */
@@ -1358,46 +1372,53 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
             } /* end if */
             else
                 HDfprintf(file->logfp, "\n");
-#else /* H5_HAVE_GETTIMEOFDAY */
+#else     /* H5_HAVE_GETTIMEOFDAY */
             HDfprintf(file->logfp, "\n");
-#endif /* H5_HAVE_GETTIMEOFDAY */
+#endif    /* H5_HAVE_GETTIMEOFDAY */
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /*
      * Write the data, being careful of interrupted system calls and partial
      * results
      */
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(file->fa.flags&H5FD_LOG_TIME_WRITE)
+    if (file->fa.flags & H5FD_LOG_TIME_WRITE)
         HDgettimeofday(&timeval_start, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
-    while(size > 0) {
+    while (size > 0) {
 
-        h5_posix_io_t       bytes_in        = 0;    /* # of bytes to write  */
-        h5_posix_io_ret_t   bytes_wrote     = -1;   /* # of bytes written   */ 
+        h5_posix_io_t     bytes_in    = 0;  /* # of bytes to write  */
+        h5_posix_io_ret_t bytes_wrote = -1; /* # of bytes written   */
 
         /* Trying to write more bytes than the return type can handle is
          * undefined behavior in POSIX.
          */
-        if(size > H5_POSIX_MAX_IO_BYTES)
+        if (size > H5_POSIX_MAX_IO_BYTES)
             bytes_in = H5_POSIX_MAX_IO_BYTES;
         else
             bytes_in = (h5_posix_io_t)size;
 
         do {
             bytes_wrote = HDwrite(file->fd, buf, bytes_in);
-        } while(-1 == bytes_wrote && EINTR == errno);
+        } while (-1 == bytes_wrote && EINTR == errno);
 
-        if(-1 == bytes_wrote) { /* error */
-            int myerrno = errno;
-            time_t mytime = HDtime(NULL);
+        if (-1 == bytes_wrote) { /* error */
+            int     myerrno  = errno;
+            time_t  mytime   = HDtime(NULL);
             HDoff_t myoffset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
-            if(file->fa.flags & H5FD_LOG_LOC_WRITE)
-                HDfprintf(file->logfp, "Error! Writing: %10a-%10a (%10Zu bytes)\n", orig_addr, (orig_addr + orig_size) - 1, orig_size);
-
-            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', buf = %p, total write size = %llu, bytes this sub-write = %llu, bytes actually written = %llu, offset = %llu", HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_wrote, (unsigned long long)myoffset);
+            if (file->fa.flags & H5FD_LOG_LOC_WRITE)
+                HDfprintf(file->logfp, "Error! Writing: %10a-%10a (%10Zu bytes)\n", orig_addr,
+                          (orig_addr + orig_size) - 1, orig_size);
+
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
+                        "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
+                        "error message = '%s', buf = %p, total write size = %llu, bytes this sub-write = "
+                        "%llu, bytes actually written = %llu, offset = %llu",
+                        HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf,
+                        (unsigned long long)size, (unsigned long long)bytes_in,
+                        (unsigned long long)bytes_wrote, (unsigned long long)myoffset);
         } /* end if */
 
         HDassert(bytes_wrote > 0);
@@ -1408,31 +1429,33 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
         buf = (const char *)buf + bytes_wrote;
     } /* end while */
 #ifdef H5_HAVE_GETTIMEOFDAY
-    if(file->fa.flags & H5FD_LOG_TIME_WRITE)
+    if (file->fa.flags & H5FD_LOG_TIME_WRITE)
         HDgettimeofday(&timeval_stop, NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
     /* Log information about the write */
-    if(file->fa.flags & H5FD_LOG_NUM_WRITE)
+    if (file->fa.flags & H5FD_LOG_NUM_WRITE)
         file->total_write_ops++;
-    if(file->fa.flags & H5FD_LOG_LOC_WRITE) {
-        HDfprintf(file->logfp, "%10a-%10a (%10Zu bytes) (%s) Written", orig_addr, (orig_addr + orig_size) - 1, orig_size, flavors[type]);
-
-        /* Check if this is the first write into a "default" section, grabbed by the metadata agregation algorithm */
-        if(file->fa.flags & H5FD_LOG_FLAVOR) {
-            if((H5FD_mem_t)file->flavor[orig_addr] == H5FD_MEM_DEFAULT)
+    if (file->fa.flags & H5FD_LOG_LOC_WRITE) {
+        HDfprintf(file->logfp, "%10a-%10a (%10Zu bytes) (%s) Written", orig_addr, (orig_addr + orig_size) - 1,
+                  orig_size, flavors[type]);
+
+        /* Check if this is the first write into a "default" section, grabbed by the metadata agregation
+         * algorithm */
+        if (file->fa.flags & H5FD_LOG_FLAVOR) {
+            if ((H5FD_mem_t)file->flavor[orig_addr] == H5FD_MEM_DEFAULT)
                 HDmemset(&file->flavor[orig_addr], (int)type, orig_size);
         } /* end if */
 
 #ifdef H5_HAVE_GETTIMEOFDAY
-        if(file->fa.flags & H5FD_LOG_TIME_WRITE) {
+        if (file->fa.flags & H5FD_LOG_TIME_WRITE) {
             struct timeval timeval_diff;
-            double time_diff;
+            double         time_diff;
 
             /* Calculate the elapsed gettimeofday time */
             timeval_diff.tv_usec = timeval_stop.tv_usec - timeval_start.tv_usec;
-            timeval_diff.tv_sec = timeval_stop.tv_sec - timeval_start.tv_sec;
-            if(timeval_diff.tv_usec < 0) {
+            timeval_diff.tv_sec  = timeval_stop.tv_sec - timeval_start.tv_sec;
+            if (timeval_diff.tv_usec < 0) {
                 timeval_diff.tv_usec += 1000000;
                 timeval_diff.tv_sec--;
             } /* end if */
@@ -1444,28 +1467,27 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
         } /* end if */
         else
             HDfprintf(file->logfp, "\n");
-#else /* H5_HAVE_GETTIMEOFDAY */
+#else  /* H5_HAVE_GETTIMEOFDAY */
         HDfprintf(file->logfp, "\n");
 #endif /* H5_HAVE_GETTIMEOFDAY */
-    } /* end if */
+    }  /* end if */
 
     /* Update current position and eof */
     file->pos = addr;
-    file->op = OP_WRITE;
-    if(file->pos > file->eof)
+    file->op  = OP_WRITE;
+    if (file->pos > file->eof)
         file->eof = file->pos;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_log_truncate
  *
@@ -1482,22 +1504,22 @@ done:
 static herr_t
 H5FD_log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing)
 {
-    H5FD_log_t  *file = (H5FD_log_t *)_file;
-    herr_t      ret_value = SUCCEED;                /* Return value */
+    H5FD_log_t *file      = (H5FD_log_t *)_file;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(file);
 
     /* Extend the file to make sure it's large enough */
-    if(!H5F_addr_eq(file->eoa, file->eof)) {
+    if (!H5F_addr_eq(file->eoa, file->eof)) {
 #ifdef H5_HAVE_WIN32_API
-        LARGE_INTEGER   li;         /* 64-bit (union) integer for SetFilePointer() call */
-        DWORD           dwPtrLow;   /* Low-order pointer bits from SetFilePointer()
-                                     * Only used as an error code here.
-                                     */
-        DWORD           dwError;    /* DWORD error code from GetLastError() */
-        BOOL            bError;     /* Boolean error flag */
+        LARGE_INTEGER li;       /* 64-bit (union) integer for SetFilePointer() call */
+        DWORD         dwPtrLow; /* Low-order pointer bits from SetFilePointer()
+                                 * Only used as an error code here.
+                                 */
+        DWORD dwError;          /* DWORD error code from GetLastError() */
+        BOOL  bError;           /* Boolean error flag */
 
         /* Windows uses this odd QuadPart union for 32/64-bit portability */
         li.QuadPart = (__int64)file->eoa;
@@ -1508,22 +1530,22 @@ H5FD_log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_U
          * from SetFilePointer(), we also need to check GetLastError().
          */
         dwPtrLow = SetFilePointer(file->hFile, li.LowPart, &li.HighPart, FILE_BEGIN);
-        if(INVALID_SET_FILE_POINTER == dwPtrLow) {
+        if (INVALID_SET_FILE_POINTER == dwPtrLow) {
             dwError = GetLastError();
-            if(dwError != NO_ERROR )
+            if (dwError != NO_ERROR)
                 HGOTO_ERROR(H5E_FILE, H5E_FILEOPEN, FAIL, "unable to set file pointer")
         }
 
         bError = SetEndOfFile(file->hFile);
-        if(0 == bError)
+        if (0 == bError)
             HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
-        if(-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
+#else  /* H5_HAVE_WIN32_API */
+        if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
 #endif /* H5_HAVE_WIN32_API */
 
         /* Log information about the truncate */
-        if(file->fa.flags & H5FD_LOG_NUM_TRUNCATE)
+        if (file->fa.flags & H5FD_LOG_NUM_TRUNCATE)
             file->total_truncate_ops++;
 
         /* Update the eof value */
@@ -1531,10 +1553,9 @@ H5FD_log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_U
 
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_log_truncate() */
-
diff --git a/src/H5FDlog.h b/src/H5FDlog.h
index 8b3697c..4655bf6 100644
--- a/src/H5FDlog.h
+++ b/src/H5FDlog.h
@@ -22,26 +22,26 @@
 
 #include "H5Ipublic.h"
 
-#define H5FD_LOG	(H5FD_log_init())
+#define H5FD_LOG (H5FD_log_init())
 
 /* Flags for H5Pset_fapl_log() */
 /* Flags for tracking where reads/writes/seeks occur */
-#define H5FD_LOG_LOC_READ   0x00000001
-#define H5FD_LOG_LOC_WRITE  0x00000002
-#define H5FD_LOG_LOC_SEEK   0x00000004
-#define H5FD_LOG_LOC_IO     (H5FD_LOG_LOC_READ|H5FD_LOG_LOC_WRITE|H5FD_LOG_LOC_SEEK)
+#define H5FD_LOG_LOC_READ  0x00000001
+#define H5FD_LOG_LOC_WRITE 0x00000002
+#define H5FD_LOG_LOC_SEEK  0x00000004
+#define H5FD_LOG_LOC_IO    (H5FD_LOG_LOC_READ | H5FD_LOG_LOC_WRITE | H5FD_LOG_LOC_SEEK)
 /* Flags for tracking number of times each byte is read/written */
 #define H5FD_LOG_FILE_READ  0x00000008
 #define H5FD_LOG_FILE_WRITE 0x00000010
-#define H5FD_LOG_FILE_IO    (H5FD_LOG_FILE_READ|H5FD_LOG_FILE_WRITE)
+#define H5FD_LOG_FILE_IO    (H5FD_LOG_FILE_READ | H5FD_LOG_FILE_WRITE)
 /* Flag for tracking "flavor" (type) of information stored at each byte */
-#define H5FD_LOG_FLAVOR     0x00000020
+#define H5FD_LOG_FLAVOR 0x00000020
 /* Flags for tracking total number of reads/writes/seeks/truncates */
-#define H5FD_LOG_NUM_READ   0x00000040
-#define H5FD_LOG_NUM_WRITE  0x00000080
-#define H5FD_LOG_NUM_SEEK   0x00000100
+#define H5FD_LOG_NUM_READ     0x00000040
+#define H5FD_LOG_NUM_WRITE    0x00000080
+#define H5FD_LOG_NUM_SEEK     0x00000100
 #define H5FD_LOG_NUM_TRUNCATE 0x00000200
-#define H5FD_LOG_NUM_IO     (H5FD_LOG_NUM_READ|H5FD_LOG_NUM_WRITE|H5FD_LOG_NUM_SEEK|H5FD_LOG_NUM_TRUNCATE)
+#define H5FD_LOG_NUM_IO       (H5FD_LOG_NUM_READ | H5FD_LOG_NUM_WRITE | H5FD_LOG_NUM_SEEK | H5FD_LOG_NUM_TRUNCATE)
 /* Flags for tracking time spent in open/stat/read/write/seek/close */
 #define H5FD_LOG_TIME_OPEN  0x00000400
 #define H5FD_LOG_TIME_STAT  0x00000800
@@ -49,17 +49,21 @@
 #define H5FD_LOG_TIME_WRITE 0x00002000
 #define H5FD_LOG_TIME_SEEK  0x00004000
 #define H5FD_LOG_TIME_CLOSE 0x00008000
-#define H5FD_LOG_TIME_IO    (H5FD_LOG_TIME_OPEN|H5FD_LOG_TIME_STAT|H5FD_LOG_TIME_READ|H5FD_LOG_TIME_WRITE|H5FD_LOG_TIME_SEEK|H5FD_LOG_TIME_CLOSE)
+#define H5FD_LOG_TIME_IO                                                                                     \
+    (H5FD_LOG_TIME_OPEN | H5FD_LOG_TIME_STAT | H5FD_LOG_TIME_READ | H5FD_LOG_TIME_WRITE |                    \
+     H5FD_LOG_TIME_SEEK | H5FD_LOG_TIME_CLOSE)
 /* Flag for tracking allocation of space in file */
-#define H5FD_LOG_ALLOC      0x00010000
-#define H5FD_LOG_ALL        (H5FD_LOG_ALLOC|H5FD_LOG_TIME_IO|H5FD_LOG_NUM_IO|H5FD_LOG_FLAVOR|H5FD_LOG_FILE_IO|H5FD_LOG_LOC_IO)
+#define H5FD_LOG_ALLOC 0x00010000
+#define H5FD_LOG_ALL                                                                                         \
+    (H5FD_LOG_ALLOC | H5FD_LOG_TIME_IO | H5FD_LOG_NUM_IO | H5FD_LOG_FLAVOR | H5FD_LOG_FILE_IO |              \
+     H5FD_LOG_LOC_IO)
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-H5_DLL hid_t H5FD_log_init(void);
-H5_DLL void H5FD_log_term(void);
+H5_DLL hid_t  H5FD_log_init(void);
+H5_DLL void   H5FD_log_term(void);
 H5_DLL herr_t H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, size_t buf_size);
 
 #ifdef __cplusplus
@@ -67,4 +71,3 @@ H5_DLL herr_t H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long
 #endif
 
 #endif
-
diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c
index d463b53..100c012 100644
--- a/src/H5FDmpi.c
+++ b/src/H5FDmpi.c
@@ -19,17 +19,15 @@
  *
  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5FDmpi.h"            /* Common MPI file driver		*/
-#include "H5Pprivate.h"		/* Property lists			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5FDmpi.h"     /* Common MPI file driver		*/
+#include "H5Pprivate.h"  /* Property lists			*/
 
 #ifdef H5_HAVE_PARALLEL
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_mpi_get_rank
  *
@@ -51,24 +49,23 @@ H5FD_mpi_get_rank(const H5FD_t *file)
 {
     const H5FD_class_mpi_t *cls;
 
-    int	ret_value;
+    int ret_value;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file);
     cls = (const H5FD_class_mpi_t *)(file->cls);
     HDassert(cls);
-    HDassert(cls->get_rank);        /* All MPI drivers must implement this */
+    HDassert(cls->get_rank); /* All MPI drivers must implement this */
 
     /* Dispatch to driver */
-    if ((ret_value=(cls->get_rank)(file))<0)
+    if ((ret_value = (cls->get_rank)(file)) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_rank request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpi_get_rank() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_mpi_get_size
  *
@@ -89,24 +86,23 @@ int
 H5FD_mpi_get_size(const H5FD_t *file)
 {
     const H5FD_class_mpi_t *cls;
-    int	ret_value;
+    int                     ret_value;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file);
     cls = (const H5FD_class_mpi_t *)(file->cls);
     HDassert(cls);
-    HDassert(cls->get_size);        /* All MPI drivers must implement this */
+    HDassert(cls->get_size); /* All MPI drivers must implement this */
 
     /* Dispatch to driver */
-    if ((ret_value=(cls->get_size)(file))<0)
+    if ((ret_value = (cls->get_size)(file)) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_size request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpi_get_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_mpi_get_comm
  *
@@ -127,24 +123,23 @@ MPI_Comm
 H5FD_mpi_get_comm(const H5FD_t *file)
 {
     const H5FD_class_mpi_t *cls;
-    MPI_Comm	ret_value;
+    MPI_Comm                ret_value;
 
     FUNC_ENTER_NOAPI(MPI_COMM_NULL)
 
     HDassert(file);
     cls = (const H5FD_class_mpi_t *)(file->cls);
     HDassert(cls);
-    HDassert(cls->get_comm);        /* All MPI drivers must implement this */
+    HDassert(cls->get_comm); /* All MPI drivers must implement this */
 
     /* Dispatch to driver */
-    if ((ret_value=(cls->get_comm)(file))==MPI_COMM_NULL)
+    if ((ret_value = (cls->get_comm)(file)) == MPI_COMM_NULL)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, MPI_COMM_NULL, "driver get_comm request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpi_get_comm() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpi_MPIOff_to_haddr
  *
@@ -170,19 +165,18 @@ done:
 haddr_t
 H5FD_mpi_MPIOff_to_haddr(MPI_Offset mpi_off)
 {
-    haddr_t ret_value=HADDR_UNDEF;
+    haddr_t ret_value = HADDR_UNDEF;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if (mpi_off != (MPI_Offset)(haddr_t)mpi_off)
-        ret_value=HADDR_UNDEF;
+        ret_value = HADDR_UNDEF;
     else
-        ret_value=(haddr_t)mpi_off;
+        ret_value = (haddr_t)mpi_off;
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpi_haddr_to_MPIOff
  *
@@ -209,9 +203,9 @@ H5FD_mpi_MPIOff_to_haddr(MPI_Offset mpi_off)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/)
+H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off /*out*/)
 {
-    herr_t ret_value=FAIL;
+    herr_t ret_value = FAIL;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -221,14 +215,13 @@ H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/)
     *mpi_off = (MPI_Offset)addr;
 
     if (addr != (haddr_t)((MPI_Offset)addr))
-        ret_value=FAIL;
+        ret_value = FAIL;
     else
-        ret_value=SUCCEED;
+        ret_value = SUCCEED;
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpi_comm_info_dup
  *
@@ -252,28 +245,29 @@ H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/)
 herr_t
 H5FD_mpi_comm_info_dup(MPI_Comm comm, MPI_Info info, MPI_Comm *comm_new, MPI_Info *info_new)
 {
-    herr_t	ret_value=SUCCEED;
-    MPI_Comm	comm_dup=MPI_COMM_NULL;
-    MPI_Info	info_dup=MPI_INFO_NULL;
-    int		mpi_code;
+    herr_t   ret_value = SUCCEED;
+    MPI_Comm comm_dup  = MPI_COMM_NULL;
+    MPI_Info info_dup  = MPI_INFO_NULL;
+    int      mpi_code;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
     if (MPI_COMM_NULL == comm)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "not a valid argument")
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "not a valid argument")
     if (!comm_new || !info_new)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "bad pointers")
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "bad pointers")
 
     /* Dup them.  Using temporary variables for error recovery cleanup. */
-    if (MPI_SUCCESS != (mpi_code=MPI_Comm_dup(comm, &comm_dup)))
-	HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code)
-    if (MPI_INFO_NULL != info){
-	if (MPI_SUCCESS != (mpi_code=MPI_Info_dup(info, &info_dup)))
-	    HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
-    }else{
-	/* No dup, just copy it. */
-	info_dup = info;
+    if (MPI_SUCCESS != (mpi_code = MPI_Comm_dup(comm, &comm_dup)))
+        HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code)
+    if (MPI_INFO_NULL != info) {
+        if (MPI_SUCCESS != (mpi_code = MPI_Info_dup(info, &info_dup)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
+    }
+    else {
+        /* No dup, just copy it. */
+        info_dup = info;
     }
 
     /* copy them to the return arguments */
@@ -281,18 +275,17 @@ H5FD_mpi_comm_info_dup(MPI_Comm comm, MPI_Info info, MPI_Comm *comm_new, MPI_Inf
     *info_new = info_dup;
 
 done:
-    if (FAIL == ret_value){
-	/* need to free anything created here */
-	if (MPI_COMM_NULL != comm_dup)
-	    MPI_Comm_free(&comm_dup);
-	if (MPI_INFO_NULL != info_dup)
-	    MPI_Info_free(&info_dup);
+    if (FAIL == ret_value) {
+        /* need to free anything created here */
+        if (MPI_COMM_NULL != comm_dup)
+            MPI_Comm_free(&comm_dup);
+        if (MPI_INFO_NULL != info_dup)
+            MPI_Info_free(&info_dup);
     }
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpi_comm_info_free
  *
@@ -315,25 +308,25 @@ done:
 herr_t
 H5FD_mpi_comm_info_free(MPI_Comm *comm, MPI_Info *info)
 {
-    herr_t      ret_value=SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
     if (!comm || !info)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "not a valid argument")
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "not a valid argument")
 
     if (MPI_COMM_NULL != *comm)
-	MPI_Comm_free(comm);
+        MPI_Comm_free(comm);
     if (MPI_INFO_NULL != *info)
-	MPI_Info_free(info);
+        MPI_Info_free(info);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
 #ifdef NOT_YET
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5FD_mpio_wait_for_left_neighbor
  *
@@ -363,24 +356,24 @@ done:
 herr_t
 H5FD_mpio_wait_for_left_neighbor(H5FD_t *_file)
 {
-    H5FD_mpio_t	*file = (H5FD_mpio_t*)_file;
-    char msgbuf[1];
-    MPI_Status rcvstat;
-    int		mpi_code;		/* mpi return code */
-    herr_t      ret_value=SUCCEED;      /* Return value */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    char         msgbuf[1];
+    MPI_Status   rcvstat;
+    int          mpi_code;            /* mpi return code */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     /* Portably initialize MPI status variable */
-    HDmemset(&rcvstat,0,sizeof(MPI_Status));
+    HDmemset(&rcvstat, 0, sizeof(MPI_Status));
 
     /* p0 has no left neighbor; all other procs wait for msg */
     if (file->mpi_rank != 0) {
-        if (MPI_SUCCESS != (mpi_code=MPI_Recv( &msgbuf, 1, MPI_CHAR,
-			file->mpi_rank-1, MPI_ANY_TAG, file->comm, &rcvstat )))
+        if (MPI_SUCCESS != (mpi_code = MPI_Recv(&msgbuf, 1, MPI_CHAR, file->mpi_rank - 1, MPI_ANY_TAG,
+                                                file->comm, &rcvstat)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Recv failed", mpi_code)
     }
 
@@ -388,7 +381,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_mpio_signal_right_neighbor
  *
@@ -418,18 +410,19 @@ done:
 herr_t
 H5FD_mpio_signal_right_neighbor(H5FD_t *_file)
 {
-    H5FD_mpio_t	*file = (H5FD_mpio_t*)_file;
-    char msgbuf[1];
-    int		mpi_code;		/* mpi return code */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    char         msgbuf[1];
+    int          mpi_code;            /* mpi return code */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
-    if(file->mpi_rank != (file->mpi_size - 1))
-        if(MPI_SUCCESS != (mpi_code=MPI_Send(&msgbuf, 0/*empty msg*/, MPI_CHAR, file->mpi_rank + 1, 0, file->comm)))
+    if (file->mpi_rank != (file->mpi_size - 1))
+        if (MPI_SUCCESS !=
+            (mpi_code = MPI_Send(&msgbuf, 0 /*empty msg*/, MPI_CHAR, file->mpi_rank + 1, 0, file->comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Send failed", mpi_code)
 
 done:
@@ -437,7 +430,6 @@ done:
 }
 #endif /* NOT_YET */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_mpi_setup_collective
  *
@@ -466,21 +458,21 @@ done:
 herr_t
 H5FD_mpi_setup_collective(hid_t dxpl_id, MPI_Datatype *btype, MPI_Datatype *ftype)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dataset transfer list")
 
     /* Set buffer MPI type */
-    if(H5P_set(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, btype) < 0)
+    if (H5P_set(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, btype) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O property")
 
     /* Set File MPI type */
-    if(H5P_set(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, ftype) < 0)
+    if (H5P_set(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, ftype) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O property")
 
 done:
diff --git a/src/H5FDmpi.h b/src/H5FDmpi.h
index 2d62c79..d33105e 100644
--- a/src/H5FDmpi.h
+++ b/src/H5FDmpi.h
@@ -36,25 +36,24 @@
 #define H5D_MULTI_CHUNK_IO_COL_THRESHOLD 60
 /* Type of I/O for data transfer properties */
 typedef enum H5FD_mpio_xfer_t {
-    H5FD_MPIO_INDEPENDENT = 0, 		/*zero is the default*/
+    H5FD_MPIO_INDEPENDENT = 0, /*zero is the default*/
     H5FD_MPIO_COLLECTIVE
 } H5FD_mpio_xfer_t;
 
 /* Type of chunked dataset I/O */
 typedef enum H5FD_mpio_chunk_opt_t {
     H5FD_MPIO_CHUNK_DEFAULT = 0,
-    H5FD_MPIO_CHUNK_ONE_IO,  		/*zero is the default*/
+    H5FD_MPIO_CHUNK_ONE_IO, /*zero is the default*/
     H5FD_MPIO_CHUNK_MULTI_IO
 } H5FD_mpio_chunk_opt_t;
 
 /* Type of collective I/O */
 typedef enum H5FD_mpio_collective_opt_t {
     H5FD_MPIO_COLLECTIVE_IO = 0,
-    H5FD_MPIO_INDIVIDUAL_IO  		/*zero is the default*/
+    H5FD_MPIO_INDIVIDUAL_IO /*zero is the default*/
 } H5FD_mpio_collective_opt_t;
 
 /* Include all the MPI VFL headers */
-#include "H5FDmpio.h"           /* MPI I/O file driver			*/
+#include "H5FDmpio.h" /* MPI I/O file driver			*/
 
 #endif /* H5FDmpi_H */
-
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 61add6d..b086aab 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -20,18 +20,17 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC  H5FD_mpio_init_interface
-
-
-#include "H5private.h"    /* Generic Functions      */
-#include "H5Dprivate.h"    /* Dataset functions      */
-#include "H5Eprivate.h"    /* Error handling        */
-#include "H5Fprivate.h"    /* File access        */
-#include "H5FDprivate.h"  /* File drivers        */
-#include "H5FDmpi.h"            /* MPI-based file drivers    */
-#include "H5Iprivate.h"    /* IDs            */
-#include "H5MMprivate.h"  /* Memory management      */
-#include "H5Pprivate.h"         /* Property lists                       */
+#define H5_INTERFACE_INIT_FUNC H5FD_mpio_init_interface
+
+#include "H5private.h"   /* Generic Functions      */
+#include "H5Dprivate.h"  /* Dataset functions      */
+#include "H5Eprivate.h"  /* Error handling        */
+#include "H5Fprivate.h"  /* File access        */
+#include "H5FDprivate.h" /* File drivers        */
+#include "H5FDmpi.h"     /* MPI-based file drivers    */
+#include "H5Iprivate.h"  /* IDs            */
+#include "H5MMprivate.h" /* Memory management      */
+#include "H5Pprivate.h"  /* Property lists                       */
 
 #ifdef H5_HAVE_PARALLEL
 
@@ -58,85 +57,85 @@ static char H5FD_mpi_native_g[] = "native";
  * driver doesn't bother to keep it updated since it's an expensive operation.
  */
 typedef struct H5FD_mpio_t {
-    H5FD_t  pub;    /*public stuff, must be first    */
-    MPI_File  f;    /*MPIO file handle      */
-    MPI_Comm  comm;    /*communicator        */
-    MPI_Info  info;    /*file information      */
-    int         mpi_rank;       /* This process's rank                  */
-    int         mpi_size;       /* Total number of processes            */
-    haddr_t  eof;    /*end-of-file marker      */
-    haddr_t  eoa;    /*end-of-address marker      */
-    haddr_t  last_eoa;  /* Last known end-of-address marker  */
+    H5FD_t   pub;      /*public stuff, must be first    */
+    MPI_File f;        /*MPIO file handle      */
+    MPI_Comm comm;     /*communicator        */
+    MPI_Info info;     /*file information      */
+    int      mpi_rank; /* This process's rank                  */
+    int      mpi_size; /* Total number of processes            */
+    haddr_t  eof;      /*end-of-file marker      */
+    haddr_t  eoa;      /*end-of-address marker      */
+    haddr_t  last_eoa; /* Last known end-of-address marker  */
 } H5FD_mpio_t;
 
 /* Private Prototypes */
 
 /* Callbacks */
-static void *H5FD_mpio_fapl_get(H5FD_t *_file);
-static void *H5FD_mpio_fapl_copy(const void *_old_fa);
-static herr_t H5FD_mpio_fapl_free(void *_fa);
-static H5FD_t *H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
-            haddr_t maxaddr);
-static herr_t H5FD_mpio_close(H5FD_t *_file);
-static herr_t H5FD_mpio_query(const H5FD_t *_f1, unsigned long *flags);
-static haddr_t H5FD_mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD_mpio_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
-static haddr_t H5FD_mpio_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_mpio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-            size_t size, void *buf);
-static herr_t H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-            size_t size, const void *buf);
-static herr_t H5FD_mpio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
-static herr_t H5FD_mpio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
-static int H5FD_mpio_mpi_rank(const H5FD_t *_file);
-static int H5FD_mpio_mpi_size(const H5FD_t *_file);
+static void *   H5FD_mpio_fapl_get(H5FD_t *_file);
+static void *   H5FD_mpio_fapl_copy(const void *_old_fa);
+static herr_t   H5FD_mpio_fapl_free(void *_fa);
+static H5FD_t * H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t   H5FD_mpio_close(H5FD_t *_file);
+static herr_t   H5FD_mpio_query(const H5FD_t *_f1, unsigned long *flags);
+static haddr_t  H5FD_mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
+static herr_t   H5FD_mpio_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static haddr_t  H5FD_mpio_get_eof(const H5FD_t *_file);
+static herr_t   H5FD_mpio_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t   H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                               void *buf);
+static herr_t   H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                                const void *buf);
+static herr_t   H5FD_mpio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
+static herr_t   H5FD_mpio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static int      H5FD_mpio_mpi_rank(const H5FD_t *_file);
+static int      H5FD_mpio_mpi_size(const H5FD_t *_file);
 static MPI_Comm H5FD_mpio_communicator(const H5FD_t *_file);
 
 /* MPIO-specific file access properties */
 typedef struct H5FD_mpio_fapl_t {
-    MPI_Comm    comm;    /*communicator      */
-    MPI_Info    info;    /*file information    */
+    MPI_Comm comm; /*communicator      */
+    MPI_Info info; /*file information    */
 } H5FD_mpio_fapl_t;
 
 /* The MPIO file driver information */
 static const H5FD_class_mpi_t H5FD_mpio_g = {
-    {   /* Start of superclass information */
-    "mpio",          /*name      */
-    HADDR_MAX,          /*maxaddr    */
-    H5F_CLOSE_SEMI,        /* fc_degree    */
-    NULL,          /*sb_size    */
-    NULL,          /*sb_encode    */
-    NULL,          /*sb_decode    */
-    sizeof(H5FD_mpio_fapl_t),      /*fapl_size    */
-    H5FD_mpio_fapl_get,        /*fapl_get    */
-    H5FD_mpio_fapl_copy,      /*fapl_copy    */
-    H5FD_mpio_fapl_free,       /*fapl_free    */
-    0,                        /*dxpl_size    */
-    NULL,          /*dxpl_copy    */
-    NULL,          /*dxpl_free    */
-    H5FD_mpio_open,        /*open      */
-    H5FD_mpio_close,        /*close      */
-    NULL,          /*cmp      */
-    H5FD_mpio_query,                    /*query      */
-    NULL,          /*get_type_map    */
-    NULL,          /*alloc      */
-    NULL,          /*free      */
-    H5FD_mpio_get_eoa,        /*get_eoa    */
-    H5FD_mpio_set_eoa,         /*set_eoa    */
-    H5FD_mpio_get_eof,        /*get_eof    */
-    H5FD_mpio_get_handle,                       /*get_handle            */
-    H5FD_mpio_read,        /*read      */
-    H5FD_mpio_write,        /*write      */
-    H5FD_mpio_flush,        /*flush      */
-    H5FD_mpio_truncate,        /*truncate    */
-    NULL,                                       /*lock                  */
-    NULL,                                       /*unlock                */
-    H5FD_FLMAP_DICHOTOMY                        /*fl_map                */
-    },  /* End of superclass information */
-    H5FD_mpio_mpi_rank,                         /*get_rank              */
-    H5FD_mpio_mpi_size,                         /*get_size              */
-    H5FD_mpio_communicator                      /*get_comm              */
+    {
+        /* Start of superclass information */
+        "mpio",                   /*name      */
+        HADDR_MAX,                /*maxaddr    */
+        H5F_CLOSE_SEMI,           /* fc_degree    */
+        NULL,                     /*sb_size    */
+        NULL,                     /*sb_encode    */
+        NULL,                     /*sb_decode    */
+        sizeof(H5FD_mpio_fapl_t), /*fapl_size    */
+        H5FD_mpio_fapl_get,       /*fapl_get    */
+        H5FD_mpio_fapl_copy,      /*fapl_copy    */
+        H5FD_mpio_fapl_free,      /*fapl_free    */
+        0,                        /*dxpl_size    */
+        NULL,                     /*dxpl_copy    */
+        NULL,                     /*dxpl_free    */
+        H5FD_mpio_open,           /*open      */
+        H5FD_mpio_close,          /*close      */
+        NULL,                     /*cmp      */
+        H5FD_mpio_query,          /*query      */
+        NULL,                     /*get_type_map    */
+        NULL,                     /*alloc      */
+        NULL,                     /*free      */
+        H5FD_mpio_get_eoa,        /*get_eoa    */
+        H5FD_mpio_set_eoa,        /*set_eoa    */
+        H5FD_mpio_get_eof,        /*get_eof    */
+        H5FD_mpio_get_handle,     /*get_handle            */
+        H5FD_mpio_read,           /*read      */
+        H5FD_mpio_write,          /*write      */
+        H5FD_mpio_flush,          /*flush      */
+        H5FD_mpio_truncate,       /*truncate    */
+        NULL,                     /*lock                  */
+        NULL,                     /*unlock                */
+        H5FD_FLMAP_DICHOTOMY      /*fl_map                */
+    },                            /* End of superclass information */
+    H5FD_mpio_mpi_rank,           /*get_rank              */
+    H5FD_mpio_mpi_size,           /*get_size              */
+    H5FD_mpio_communicator        /*get_comm              */
 };
 
 #ifdef H5FDmpio_DEBUG
@@ -148,18 +147,17 @@ static const H5FD_class_mpi_t H5FD_mpio_g = {
  * 't' trace function entry and exit
  * 'w' show write offset and size
  */
-static int H5FD_mpio_Debug[256] =
-        { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
+static int H5FD_mpio_Debug[256] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 #endif
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5FD_mpio_init_interface -- Initialize interface-specific information
@@ -181,7 +179,6 @@ H5FD_mpio_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_mpio_init())
 } /* H5FD_mpio_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_init
  *
@@ -201,34 +198,34 @@ H5FD_mpio_init(void)
 {
 #ifdef H5FDmpio_DEBUG
     static int H5FD_mpio_Debug_inited = 0;
-#endif /* H5FDmpio_DEBUG */
-    const char *s;              /* String for environment variables */
-    hid_t ret_value;        	/* Return value */
+#endif                     /* H5FDmpio_DEBUG */
+    const char *s;         /* String for environment variables */
+    hid_t       ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Register the MPI-IO VFD, if it isn't already */
-    if(H5I_VFL != H5I_get_type(H5FD_MPIO_g))
+    if (H5I_VFL != H5I_get_type(H5FD_MPIO_g))
         H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g, sizeof(H5FD_class_mpi_t), FALSE);
 
     /* Allow MPI buf-and-file-type optimizations? */
     s = HDgetenv("HDF5_MPI_OPT_TYPES");
-    if(s && HDisdigit(*s))
+    if (s && HDisdigit(*s))
         H5FD_mpi_opt_types_g = (hbool_t)HDstrtol(s, NULL, 0);
 
 #ifdef H5FDmpio_DEBUG
-    if(!H5FD_mpio_Debug_inited) {
+    if (!H5FD_mpio_Debug_inited) {
         /* Retrieve MPI-IO debugging environment variable */
         s = HDgetenv("H5FD_mpio_Debug");
-        if(s) {
+        if (s) {
             /* Set debug mask */
-	    while(*s) {
-		H5FD_mpio_Debug[(int)*s]++;
-		s++;
-	    } /* end while */
-        } /* end if */
+            while (*s) {
+                H5FD_mpio_Debug[(int)*s]++;
+                s++;
+            } /* end while */
+        }     /* end if */
         H5FD_mpio_Debug_inited++;
-    } /* end if */
+    }  /* end if */
 #endif /* H5FDmpio_DEBUG */
 
     /* Set return value */
@@ -238,7 +235,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:  H5FD_mpio_term
  *
@@ -259,12 +255,11 @@ H5FD_mpio_term(void)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Reset VFL ID */
-    H5FD_MPIO_g=0;
+    H5FD_MPIO_g = 0;
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5FD_mpio_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pset_fapl_mpio
  *
@@ -327,34 +322,33 @@ H5FD_mpio_term(void)
 herr_t
 H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
 {
-    H5FD_mpio_fapl_t  fa;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value;
+    H5FD_mpio_fapl_t fa;
+    H5P_genplist_t * plist; /* Property list pointer */
+    herr_t           ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iMcMi", fapl_id, comm, info);
 
-    if(fapl_id == H5P_DEFAULT)
+    if (fapl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list")
-    if(MPI_COMM_NULL == comm)
-  HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a valid communicator")
+    if (MPI_COMM_NULL == comm)
+        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a valid communicator")
 
     /* Initialize driver specific properties */
     fa.comm = comm;
     fa.info = info;
 
     /* duplication is done during driver setting. */
-    ret_value= H5P_set_driver(plist, H5FD_MPIO, &fa);
+    ret_value = H5P_set_driver(plist, H5FD_MPIO, &fa);
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pget_fapl_mpio
  *
@@ -394,56 +388,56 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
+H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm /*out*/, MPI_Info *info /*out*/)
 {
-    H5FD_mpio_fapl_t  *fa;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    MPI_Comm  comm_tmp=MPI_COMM_NULL;
-    int    mpi_code;    /* mpi return code */
-    herr_t      ret_value=SUCCEED;      /* Return value */
+    H5FD_mpio_fapl_t *fa;
+    H5P_genplist_t *  plist; /* Property list pointer */
+    MPI_Comm          comm_tmp = MPI_COMM_NULL;
+    int               mpi_code;            /* mpi return code */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", fapl_id, comm, info);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list")
-    if(H5FD_MPIO != H5P_get_driver(plist))
+    if (H5FD_MPIO != H5P_get_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
-    if(NULL == (fa = (H5FD_mpio_fapl_t *)H5P_get_driver_info(plist)))
+    if (NULL == (fa = (H5FD_mpio_fapl_t *)H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
 
     /* Store the duplicated communicator in a temporary variable for error */
     /* recovery in case the INFO duplication fails.  We cannot attempt to */
     /* the value into *comm yet since if MPI_Comm_dup fails, we will end  */
     /* up freeing whatever *comm holds and that could be invalid. */
-    if (comm){
-  if (MPI_SUCCESS != (mpi_code=MPI_Comm_dup(fa->comm, &comm_tmp)))
-      HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code)
+    if (comm) {
+        if (MPI_SUCCESS != (mpi_code = MPI_Comm_dup(fa->comm, &comm_tmp)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code)
     }
 
-    if (info){
-  if (MPI_INFO_NULL != fa->info){
-      if (MPI_SUCCESS != (mpi_code=MPI_Info_dup(fa->info, info)))
-    HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
-  }else{
-      /* do not dup it */
-      *info = MPI_INFO_NULL;
-  }
+    if (info) {
+        if (MPI_INFO_NULL != fa->info) {
+            if (MPI_SUCCESS != (mpi_code = MPI_Info_dup(fa->info, info)))
+                HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
+        }
+        else {
+            /* do not dup it */
+            *info = MPI_INFO_NULL;
+        }
     }
 
     if (comm)
         *comm = comm_tmp;
 
 done:
-    if (FAIL==ret_value){
-  /* need to free anything created here */
-  if (comm_tmp != MPI_COMM_NULL)
-      MPI_Comm_free(&comm_tmp);
+    if (FAIL == ret_value) {
+        /* need to free anything created here */
+        if (comm_tmp != MPI_COMM_NULL)
+            MPI_Comm_free(&comm_tmp);
     }
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pset_dxpl_mpio
  *
@@ -469,30 +463,29 @@ done:
 herr_t
 H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDt", dxpl_id, xfer_mode);
 
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
-    if(H5FD_MPIO_INDEPENDENT != xfer_mode && H5FD_MPIO_COLLECTIVE != xfer_mode)
+    if (H5FD_MPIO_INDEPENDENT != xfer_mode && H5FD_MPIO_COLLECTIVE != xfer_mode)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "incorrect xfer_mode")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
+    if (H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pget_dxpl_mpio
  *
@@ -511,27 +504,26 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/)
+H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out*/)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", dxpl_id, xfer_mode);
 
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Get the transfer mode */
-    if(xfer_mode)
-        if(H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, xfer_mode) < 0)
+    if (xfer_mode)
+        if (H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, xfer_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to get value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_dxpl_mpio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pset_dxpl_mpio_collective_opt
  *
@@ -554,28 +546,27 @@ done:
 herr_t
 H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mode)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDc", dxpl_id, opt_mode);
 
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &opt_mode) < 0)
+    if (H5P_set(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio_collective_opt() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pset_dxpl_mpio_chunk_opt
  *
@@ -598,28 +589,27 @@ done:
 herr_t
 H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDh", dxpl_id, opt_mode);
 
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, &opt_mode) < 0)
+    if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, &opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio_chunk_opt() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pset_dxpl_mpio_chunk_opt_num
  *
@@ -640,28 +630,27 @@ done:
 herr_t
 H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", dxpl_id, num_chunk_per_proc);
 
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, &num_chunk_per_proc) < 0)
+    if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, &num_chunk_per_proc) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio_chunk_opt_num() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pset_dxpl_mpio_chunk_opt_ratio
  *
@@ -685,28 +674,27 @@ done:
 herr_t
 H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_chunk)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", dxpl_id, percent_num_proc_per_chunk);
 
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, &percent_num_proc_per_chunk) < 0)
+    if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, &percent_num_proc_per_chunk) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio_chunk_opt_ratio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_fapl_get
  *
@@ -726,21 +714,21 @@ done:
 static void *
 H5FD_mpio_fapl_get(H5FD_t *_file)
 {
-    H5FD_mpio_t    *file = (H5FD_mpio_t*)_file;
-    H5FD_mpio_fapl_t  *fa = NULL;
-    void      *ret_value;       /* Return value */
+    H5FD_mpio_t *     file = (H5FD_mpio_t *)_file;
+    H5FD_mpio_fapl_t *fa   = NULL;
+    void *            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
-    if(NULL == (fa = (H5FD_mpio_fapl_t *)H5MM_calloc(sizeof(H5FD_mpio_fapl_t))))
+    if (NULL == (fa = (H5FD_mpio_fapl_t *)H5MM_calloc(sizeof(H5FD_mpio_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Duplicate communicator and Info object. */
-    if(FAIL == H5FD_mpi_comm_info_dup(file->comm, file->info, &fa->comm, &fa->info))
-  HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
+    if (FAIL == H5FD_mpi_comm_info_dup(file->comm, file->info, &fa->comm, &fa->info))
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
 
     /* Set return value */
     ret_value = fa;
@@ -749,7 +737,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_fapl_copy
  *
@@ -767,42 +754,41 @@ done:
 static void *
 H5FD_mpio_fapl_copy(const void *_old_fa)
 {
-    void    *ret_value = NULL;
-    const H5FD_mpio_fapl_t *old_fa = (const H5FD_mpio_fapl_t*)_old_fa;
-    H5FD_mpio_fapl_t  *new_fa = NULL;
+    void *                  ret_value = NULL;
+    const H5FD_mpio_fapl_t *old_fa    = (const H5FD_mpio_fapl_t *)_old_fa;
+    H5FD_mpio_fapl_t *      new_fa    = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef H5FDmpio_DEBUG
-if (H5FD_mpio_Debug[(int)'t'])
-HDfprintf(stderr, "enter H5FD_mpio_fapl_copy\n");
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stderr, "enter H5FD_mpio_fapl_copy\n");
 #endif
 
-    if(NULL == (new_fa = (H5FD_mpio_fapl_t *)H5MM_malloc(sizeof(H5FD_mpio_fapl_t))))
+    if (NULL == (new_fa = (H5FD_mpio_fapl_t *)H5MM_malloc(sizeof(H5FD_mpio_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the general information */
     HDmemcpy(new_fa, old_fa, sizeof(H5FD_mpio_fapl_t));
 
     /* Duplicate communicator and Info object. */
-    if(FAIL == H5FD_mpi_comm_info_dup(old_fa->comm, old_fa->info, &new_fa->comm, &new_fa->info))
-  HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
+    if (FAIL == H5FD_mpi_comm_info_dup(old_fa->comm, old_fa->info, &new_fa->comm, &new_fa->info))
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
     ret_value = new_fa;
 
 done:
-    if (NULL == ret_value){
-  /* cleanup */
-  if (new_fa)
-      H5MM_xfree(new_fa);
+    if (NULL == ret_value) {
+        /* cleanup */
+        if (new_fa)
+            H5MM_xfree(new_fa);
     }
 
 #ifdef H5FDmpio_DEBUG
-if (H5FD_mpio_Debug[(int)'t'])
-HDfprintf(stderr, "leaving H5FD_mpio_fapl_copy\n");
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stderr, "leaving H5FD_mpio_fapl_copy\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_fapl_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_fapl_free
  *
@@ -822,29 +808,28 @@ HDfprintf(stderr, "leaving H5FD_mpio_fapl_copy\n");
 static herr_t
 H5FD_mpio_fapl_free(void *_fa)
 {
-    herr_t    ret_value = SUCCEED;
-    H5FD_mpio_fapl_t  *fa = (H5FD_mpio_fapl_t*)_fa;
+    herr_t            ret_value = SUCCEED;
+    H5FD_mpio_fapl_t *fa        = (H5FD_mpio_fapl_t *)_fa;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 #ifdef H5FDmpio_DEBUG
-if (H5FD_mpio_Debug[(int)'t'])
-HDfprintf(stderr, "in H5FD_mpio_fapl_free\n");
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stderr, "in H5FD_mpio_fapl_free\n");
 #endif
     HDassert(fa);
 
     /* Free the internal communicator and INFO object */
-    HDassert(MPI_COMM_NULL!=fa->comm);
+    HDassert(MPI_COMM_NULL != fa->comm);
     H5FD_mpi_comm_info_free(&fa->comm, &fa->info);
     H5MM_xfree(fa);
 
 #ifdef H5FDmpio_DEBUG
-if (H5FD_mpio_Debug[(int)'t'])
-HDfprintf(stderr, "leaving H5FD_mpio_fapl_free\n");
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stderr, "leaving H5FD_mpio_fapl_free\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_fapl_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_set_mpio_atomicity
  *
@@ -862,8 +847,8 @@ HDfprintf(stderr, "leaving H5FD_mpio_fapl_free\n");
 herr_t
 H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
-    int          mpi_code;               /* MPI return code */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    int          mpi_code; /* MPI return code */
     int          temp_flag;
     herr_t       ret_value = SUCCEED;
 
@@ -871,7 +856,7 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "Entering H5FD_set_mpio_atomicity\n");
+        HDfprintf(stdout, "Entering H5FD_set_mpio_atomicity\n");
 #endif
 
     if (FALSE == flag)
@@ -880,18 +865,17 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
         temp_flag = 1;
 
     /* set atomicity value */
-    if (MPI_SUCCESS != (mpi_code=MPI_File_set_atomicity(file->f, temp_flag)))
+    if (MPI_SUCCESS != (mpi_code = MPI_File_set_atomicity(file->f, temp_flag)))
         HMPI_GOTO_ERROR(FAIL, "MPI_File_set_atomicity", mpi_code)
 
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "Leaving H5FD_set_mpio_atomicity\n");
+        HDfprintf(stdout, "Leaving H5FD_set_mpio_atomicity\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FD_get_mpio_atomicity
  *
@@ -909,8 +893,8 @@ done:
 herr_t
 H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
-    int          mpi_code;               /* MPI return code */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    int          mpi_code; /* MPI return code */
     int          temp_flag;
     herr_t       ret_value = SUCCEED;
 
@@ -918,11 +902,11 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "Entering H5FD_get_mpio_atomicity\n");
+        HDfprintf(stdout, "Entering H5FD_get_mpio_atomicity\n");
 #endif
 
     /* get atomicity value */
-    if (MPI_SUCCESS != (mpi_code=MPI_File_get_atomicity(file->f, &temp_flag)))
+    if (MPI_SUCCESS != (mpi_code = MPI_File_get_atomicity(file->f, &temp_flag)))
         HMPI_GOTO_ERROR(FAIL, "MPI_File_get_atomicity", mpi_code)
 
     if (0 != temp_flag)
@@ -933,12 +917,11 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "Leaving H5FD_get_mpio_atomicity\n");
+        HDfprintf(stdout, "Leaving H5FD_get_mpio_atomicity\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpio_open
  *
@@ -985,67 +968,69 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5FD_t *
-H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
-	       haddr_t H5_ATTR_UNUSED maxaddr)
+H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t H5_ATTR_UNUSED maxaddr)
 {
-    H5FD_mpio_t      *file=NULL;
-    MPI_File      fh;
-    unsigned                    file_opened=0;  /* Flag to indicate that the file was successfully opened */
-    int        mpi_amode;
-    int        mpi_rank;       /* MPI rank of this process */
-    int        mpi_size;       /* Total number of MPI processes */
-    int        mpi_code;  /* mpi return code */
-    MPI_Offset      size;
-    const H5FD_mpio_fapl_t  *fa=NULL;
-    H5FD_mpio_fapl_t    _fa;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    MPI_Comm                    comm_dup=MPI_COMM_NULL;
-    MPI_Info                    info_dup=MPI_INFO_NULL;
-    H5FD_t      *ret_value;     /* Return value */
+    H5FD_mpio_t *           file = NULL;
+    MPI_File                fh;
+    unsigned                file_opened = 0; /* Flag to indicate that the file was successfully opened */
+    int                     mpi_amode;
+    int                     mpi_rank; /* MPI rank of this process */
+    int                     mpi_size; /* Total number of MPI processes */
+    int                     mpi_code; /* mpi return code */
+    MPI_Offset              size;
+    const H5FD_mpio_fapl_t *fa = NULL;
+    H5FD_mpio_fapl_t        _fa;
+    H5P_genplist_t *        plist; /* Property list pointer */
+    MPI_Comm                comm_dup = MPI_COMM_NULL;
+    MPI_Info                info_dup = MPI_INFO_NULL;
+    H5FD_t *                ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t']) {
-      HDfprintf(stdout, "Entering H5FD_mpio_open(name=\"%s\", flags=0x%x, "
-    "fapl_id=%d, maxaddr=%lu)\n", name, flags, (int)fapl_id, (unsigned long)maxaddr);
+        HDfprintf(stdout,
+                  "Entering H5FD_mpio_open(name=\"%s\", flags=0x%x, "
+                  "fapl_id=%d, maxaddr=%lu)\n",
+                  name, flags, (int)fapl_id, (unsigned long)maxaddr);
     }
 #endif
 
     /* Obtain a pointer to mpio-specific file access properties */
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
-    if(H5P_FILE_ACCESS_DEFAULT == fapl_id || H5FD_MPIO != H5P_get_driver(plist)) {
+    if (H5P_FILE_ACCESS_DEFAULT == fapl_id || H5FD_MPIO != H5P_get_driver(plist)) {
         _fa.comm = MPI_COMM_SELF; /*default*/
         _fa.info = MPI_INFO_NULL; /*default*/
-        fa = &_fa;
-    } else {
-        if(NULL == (fa = (const H5FD_mpio_fapl_t *)H5P_get_driver_info(plist)))
-	    HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
+        fa       = &_fa;
+    }
+    else {
+        if (NULL == (fa = (const H5FD_mpio_fapl_t *)H5P_get_driver_info(plist)))
+            HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
     }
 
     /* Duplicate communicator and Info object for use by this file. */
-    if (FAIL==H5FD_mpi_comm_info_dup(fa->comm, fa->info, &comm_dup, &info_dup))
+    if (FAIL == H5FD_mpi_comm_info_dup(fa->comm, fa->info, &comm_dup, &info_dup))
         HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
 
     /* convert HDF5 flags to MPI-IO flags */
     /* some combinations are illegal; let MPI-IO figure it out */
-    mpi_amode  = (flags&H5F_ACC_RDWR) ? MPI_MODE_RDWR : MPI_MODE_RDONLY;
-    if (flags&H5F_ACC_CREAT)  mpi_amode |= MPI_MODE_CREATE;
-    if (flags&H5F_ACC_EXCL)  mpi_amode |= MPI_MODE_EXCL;
+    mpi_amode = (flags & H5F_ACC_RDWR) ? MPI_MODE_RDWR : MPI_MODE_RDONLY;
+    if (flags & H5F_ACC_CREAT)
+        mpi_amode |= MPI_MODE_CREATE;
+    if (flags & H5F_ACC_EXCL)
+        mpi_amode |= MPI_MODE_EXCL;
 
 #ifdef H5FDmpio_DEBUG
     /* Check for debug commands in the info parameter */
     {
-  char debug_str[128];
-        int flag, i;
+        char debug_str[128];
+        int  flag, i;
         if (MPI_INFO_NULL != info_dup) {
-            MPI_Info_get(fa->info, H5F_MPIO_DEBUG_KEY, sizeof(debug_str)-1, debug_str, &flag);
+            MPI_Info_get(fa->info, H5F_MPIO_DEBUG_KEY, sizeof(debug_str) - 1, debug_str, &flag);
             if (flag) {
-                HDfprintf(stdout, "H5FD_mpio debug flags=%s\n", debug_str );
-                for (i=0;
-                     debug_str[i]/*end of string*/ && i<128/*just in case*/;
-                     ++i) {
+                HDfprintf(stdout, "H5FD_mpio debug flags=%s\n", debug_str);
+                for (i = 0; debug_str[i] /*end of string*/ && i < 128 /*just in case*/; ++i) {
                     H5FD_mpio_Debug[(int)debug_str[i]] = 1;
                 }
             }
@@ -1053,42 +1038,42 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
     }
 #endif
 
-    if(MPI_SUCCESS != (mpi_code = MPI_File_open(comm_dup, name, mpi_amode, info_dup, &fh)))
+    if (MPI_SUCCESS != (mpi_code = MPI_File_open(comm_dup, name, mpi_amode, info_dup, &fh)))
         HMPI_GOTO_ERROR(NULL, "MPI_File_open failed", mpi_code)
-    file_opened=1;
+    file_opened = 1;
 
     /* Get the MPI rank of this process and the total number of processes */
-    if (MPI_SUCCESS != (mpi_code=MPI_Comm_rank (comm_dup, &mpi_rank)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Comm_rank(comm_dup, &mpi_rank)))
         HMPI_GOTO_ERROR(NULL, "MPI_Comm_rank failed", mpi_code)
-    if (MPI_SUCCESS != (mpi_code=MPI_Comm_size (comm_dup, &mpi_size)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Comm_size(comm_dup, &mpi_size)))
         HMPI_GOTO_ERROR(NULL, "MPI_Comm_size failed", mpi_code)
 
     /* Build the return value and initialize it */
-    if(NULL == (file = (H5FD_mpio_t *)H5MM_calloc(sizeof(H5FD_mpio_t))))
+    if (NULL == (file = (H5FD_mpio_t *)H5MM_calloc(sizeof(H5FD_mpio_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    file->f = fh;
-    file->comm = comm_dup;
-    file->info = info_dup;
+    file->f        = fh;
+    file->comm     = comm_dup;
+    file->info     = info_dup;
     file->mpi_rank = mpi_rank;
     file->mpi_size = mpi_size;
 
     /* Only processor p0 will get the filesize and broadcast it. */
     if (mpi_rank == 0) {
-        if (MPI_SUCCESS != (mpi_code=MPI_File_get_size(fh, &size)))
+        if (MPI_SUCCESS != (mpi_code = MPI_File_get_size(fh, &size)))
             HMPI_GOTO_ERROR(NULL, "MPI_File_get_size failed", mpi_code)
     } /* end if */
 
     /* Broadcast file size */
-    if(MPI_SUCCESS != (mpi_code = MPI_Bcast(&size, (int)sizeof(MPI_Offset), MPI_BYTE, 0, comm_dup)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Bcast(&size, (int)sizeof(MPI_Offset), MPI_BYTE, 0, comm_dup)))
         HMPI_GOTO_ERROR(NULL, "MPI_Bcast failed", mpi_code)
 
     /* Determine if the file should be truncated */
-    if(size && (flags & H5F_ACC_TRUNC)) {
-        if (MPI_SUCCESS != (mpi_code=MPI_File_set_size(fh, (MPI_Offset)0)))
+    if (size && (flags & H5F_ACC_TRUNC)) {
+        if (MPI_SUCCESS != (mpi_code = MPI_File_set_size(fh, (MPI_Offset)0)))
             HMPI_GOTO_ERROR(NULL, "MPI_File_set_size failed", mpi_code)
 
         /* Don't let any proc return until all have truncated the file. */
-        if (MPI_SUCCESS!= (mpi_code=MPI_Barrier(comm_dup)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Barrier(comm_dup)))
             HMPI_GOTO_ERROR(NULL, "MPI_Barrier failed", mpi_code)
 
         /* File is zero size now */
@@ -1099,28 +1084,27 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
     file->eof = H5FD_mpi_MPIOff_to_haddr(size);
 
     /* Set return value */
-    ret_value=(H5FD_t*)file;
+    ret_value = (H5FD_t *)file;
 
 done:
-    if(ret_value==NULL) {
-        if(file_opened)
+    if (ret_value == NULL) {
+        if (file_opened)
             MPI_File_close(&fh);
-  if (MPI_COMM_NULL != comm_dup)
-      MPI_Comm_free(&comm_dup);
-  if (MPI_INFO_NULL != info_dup)
-      MPI_Info_free(&info_dup);
-  if (file)
-      H5MM_xfree(file);
+        if (MPI_COMM_NULL != comm_dup)
+            MPI_Comm_free(&comm_dup);
+        if (MPI_INFO_NULL != info_dup)
+            MPI_Info_free(&info_dup);
+        if (file)
+            H5MM_xfree(file);
     } /* end if */
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Leaving H5FD_mpio_open\n" );
+        HDfprintf(stdout, "Leaving H5FD_mpio_open\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpio_close
  *
@@ -1147,21 +1131,21 @@ done:
 static herr_t
 H5FD_mpio_close(H5FD_t *_file)
 {
-    H5FD_mpio_t  *file = (H5FD_mpio_t*)_file;
-    int    mpi_code;          /* MPI return code */
-    herr_t      ret_value=SUCCEED;      /* Return value */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    int          mpi_code;            /* MPI return code */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Entering H5FD_mpio_close\n");
+        HDfprintf(stdout, "Entering H5FD_mpio_close\n");
 #endif
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     /* MPI_File_close sets argument to MPI_FILE_NULL */
-    if (MPI_SUCCESS != (mpi_code=MPI_File_close(&(file->f)/*in,out*/)))
+    if (MPI_SUCCESS != (mpi_code = MPI_File_close(&(file->f) /*in,out*/)))
         HMPI_GOTO_ERROR(FAIL, "MPI_File_close failed", mpi_code)
 
     /* Clean up other stuff */
@@ -1171,12 +1155,11 @@ H5FD_mpio_close(H5FD_t *_file)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Leaving H5FD_mpio_close\n");
+        HDfprintf(stdout, "Leaving H5FD_mpio_close\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_query
  *
@@ -1207,18 +1190,17 @@ H5FD_mpio_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set the VFL feature flags that this driver supports */
-    if(flags) {
-        *flags=0;
-        *flags|=H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations */
-        *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
-        *flags|=H5FD_FEAT_HAS_MPI;             /* This driver uses MPI */
-        *flags|=H5FD_FEAT_ALLOCATE_EARLY;      /* Allocate space early instead of late */
-    } /* end if */
+    if (flags) {
+        *flags = 0;
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations */
+        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
+        *flags |= H5FD_FEAT_HAS_MPI;             /* This driver uses MPI */
+        *flags |= H5FD_FEAT_ALLOCATE_EARLY;      /* Allocate space early instead of late */
+    }                                            /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_get_eoa
  *
@@ -1243,17 +1225,16 @@ H5FD_mpio_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out
 static haddr_t
 H5FD_mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_mpio_t  *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     FUNC_LEAVE_NOAPI(file->eoa)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_set_eoa
  *
@@ -1278,19 +1259,18 @@ H5FD_mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD_mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
-    H5FD_mpio_t  *file = (H5FD_mpio_t*)_file;
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     file->eoa = addr;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_get_eof
  *
@@ -1323,17 +1303,16 @@ H5FD_mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 static haddr_t
 H5FD_mpio_get_eof(const H5FD_t *_file)
 {
-    const H5FD_mpio_t  *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     FUNC_LEAVE_NOAPI(file->eof)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD_mpio_get_handle
  *
@@ -1347,16 +1326,16 @@ H5FD_mpio_get_eof(const H5FD_t *_file)
  * Modifications:
  *
  *-------------------------------------------------------------------------
-*/
+ */
 static herr_t
-H5FD_mpio_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void** file_handle)
+H5FD_mpio_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
-    H5FD_mpio_t         *file = (H5FD_mpio_t *)_file;
-    herr_t              ret_value = SUCCEED;
+    H5FD_mpio_t *file      = (H5FD_mpio_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(!file_handle)
+    if (!file_handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
 
     *file_handle = &(file->f);
@@ -1365,7 +1344,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_read
  *
@@ -1436,40 +1414,40 @@ done:
  */
 static herr_t
 H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, haddr_t addr, size_t size,
-         void *buf/*out*/)
+               void *buf /*out*/)
 {
-    H5FD_mpio_t      *file = (H5FD_mpio_t*)_file;
+    H5FD_mpio_t *   file = (H5FD_mpio_t *)_file;
     MPI_Offset      mpi_off;
-    MPI_Status      mpi_stat;       /* Status from I/O operation */
-    int        mpi_code;  /* mpi return code */
-    MPI_Datatype    buf_type = MPI_BYTE;      /* MPI description of the selection in memory */
-    int             size_i;         /* Integer copy of 'size' to read */
-    int             bytes_read;     /* Number of bytes read in */
+    MPI_Status      mpi_stat;            /* Status from I/O operation */
+    int             mpi_code;            /* mpi return code */
+    MPI_Datatype    buf_type = MPI_BYTE; /* MPI description of the selection in memory */
+    int             size_i;              /* Integer copy of 'size' to read */
+    int             bytes_read;          /* Number of bytes read in */
     int             n;
-    int                         type_size;      /* MPI datatype used for I/O's size */
-    int                         io_size;        /* Actual number of bytes requested */
-    H5P_genplist_t              *plist = NULL;  /* Property list pointer */
-    hbool_t      use_view_this_time = FALSE;
-    herr_t                ret_value = SUCCEED;
+    int             type_size;                 /* MPI datatype used for I/O's size */
+    int             io_size;                   /* Actual number of bytes requested */
+    H5P_genplist_t *plist              = NULL; /* Property list pointer */
+    hbool_t         use_view_this_time = FALSE;
+    herr_t          ret_value          = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Entering H5FD_mpio_read\n" );
+        HDfprintf(stdout, "Entering H5FD_mpio_read\n");
 #endif
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
     /* Make certain we have the correct type of property list */
-    HDassert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
-    HDassert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER));
+    HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id));
+    HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
     HDassert(buf);
 
     /* Portably initialize MPI status variable */
-    HDmemset(&mpi_stat,0,sizeof(MPI_Status));
+    HDmemset(&mpi_stat, 0, sizeof(MPI_Status));
 
     /* some numeric conversions */
-    if (H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off/*out*/)<0)
+    if (H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off /*out*/) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off")
     size_i = (int)size;
     if ((hsize_t)size_i != size)
@@ -1477,20 +1455,19 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'r'])
-        HDfprintf(stdout, "in H5FD_mpio_read  mpi_off=%ld  size_i=%d\n",
-    (long)mpi_off, size_i );
+        HDfprintf(stdout, "in H5FD_mpio_read  mpi_off=%ld  size_i=%d\n", (long)mpi_off, size_i);
 #endif
 
     /* Only look for MPI views for raw data transfers */
-    if(type==H5FD_MEM_DRAW) {
-        H5FD_mpio_xfer_t            xfer_mode;   /* I/O transfer mode */
+    if (type == H5FD_MEM_DRAW) {
+        H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode */
 
         /* Obtain the data transfer properties */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
         /* get the transfer mode from the dxpl */
-        if(H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode)<0)
+        if (H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O transfer mode")
 
         /*
@@ -1499,71 +1476,76 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
          * us to test that btype=ftype=MPI_BYTE (or even MPI_TYPE_NULL, which
          * could mean "use MPI_BYTE" by convention).
          */
-        if(xfer_mode==H5FD_MPIO_COLLECTIVE) {
-            MPI_Datatype    file_type;
+        if (xfer_mode == H5FD_MPIO_COLLECTIVE) {
+            MPI_Datatype file_type;
 
             /* Remember that views are used */
             use_view_this_time = TRUE;
 
             /* prepare for a full-blown xfer using btype, ftype, and disp */
-            if(H5P_get(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, &buf_type)<0)
+            if (H5P_get(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, &buf_type) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O type property")
-            if(H5P_get(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, &file_type)<0)
+            if (H5P_get(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, &file_type) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O type property")
 
             /*
              * Set the file view when we are using MPI derived types
              */
-            if (MPI_SUCCESS != (mpi_code=MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type, H5FD_mpi_native_g,  file->info)))
+            if (MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type,
+                                                             H5FD_mpi_native_g, file->info)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
 
             /* When using types, use the address as the displacement for
              * MPI_File_set_view and reset the address for the read to zero
              */
-            mpi_off=0;
+            mpi_off = 0;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Read the data. */
-    if(use_view_this_time) {
-       H5FD_mpio_collective_opt_t coll_opt_mode;
+    if (use_view_this_time) {
+        H5FD_mpio_collective_opt_t coll_opt_mode;
 
 #ifdef H5FDmpio_DEBUG
-  if (H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "H5FD_mpio_read: using MPIO collective mode\n");
+        if (H5FD_mpio_Debug[(int)'t'])
+            HDfprintf(stdout, "H5FD_mpio_read: using MPIO collective mode\n");
 #endif
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
         HDassert(plist);
 
         /* get the transfer mode from the dxpl */
-        if(H5P_get(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &coll_opt_mode)<0)
+        if (H5P_get(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &coll_opt_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O collective_op property")
 
-        if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
+        if (coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'t'])
+            if (H5FD_mpio_Debug[(int)'t'])
                 HDfprintf(stdout, "H5FD_mpio_read: doing MPI collective IO\n");
 #endif
-            if(MPI_SUCCESS != (mpi_code = MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at_all failed", mpi_code)
         } /* end if */
         else {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'t'])
+            if (H5FD_mpio_Debug[(int)'t'])
                 HDfprintf(stdout, "H5FD_mpio_read: doing MPI independent IO\n");
 #endif
 
-            if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
         } /* end else */
 
         /*
          * Reset the file view when we used MPI derived types
          */
-        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g, file->info)))
+        if (MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE,
+                                                         H5FD_mpi_native_g, file->info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
-    } else {
-        if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+    }
+    else {
+        if (MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
     }
 
@@ -1573,36 +1555,35 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
      *  datatype in this call though... (We aren't because using it causes
      *  the LANL "qsc" machine to dump core - 12/19/03) - QAK]
      */
-    if (MPI_SUCCESS != (mpi_code=MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_read)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_read)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Get_elements failed", mpi_code)
 
     /* Get the type's size */
-    if (MPI_SUCCESS != (mpi_code=MPI_Type_size(buf_type,&type_size)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_size failed", mpi_code)
 
     /* Compute the actual number of bytes requested */
-    io_size=type_size*size_i;
+    io_size = type_size * size_i;
 
     /* Check for read failure */
-    if (bytes_read<0 || bytes_read>io_size)
+    if (bytes_read < 0 || bytes_read > io_size)
         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
 
     /*
      * This gives us zeroes beyond end of physical MPI file.
      */
-    if ((n=(io_size-bytes_read)) > 0)
-        HDmemset((char*)buf+bytes_read, 0, (size_t)n);
+    if ((n = (io_size - bytes_read)) > 0)
+        HDmemset((char *)buf + bytes_read, 0, (size_t)n);
 
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Leaving H5FD_mpio_read\n" );
+        HDfprintf(stdout, "Leaving H5FD_mpio_read\n");
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_write
  *
@@ -1725,58 +1706,57 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-    size_t size, const void *buf)
+H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *buf)
 {
-    H5FD_mpio_t      *file = (H5FD_mpio_t*)_file;
-    MPI_Offset        mpi_off;
-    MPI_Status      mpi_stat;       /* Status from I/O operation */
-    MPI_Datatype    buf_type = MPI_BYTE;      /* MPI description of the selection in memory */
-    int              mpi_code;  /* MPI return code */
+    H5FD_mpio_t *   file = (H5FD_mpio_t *)_file;
+    MPI_Offset      mpi_off;
+    MPI_Status      mpi_stat;            /* Status from I/O operation */
+    MPI_Datatype    buf_type = MPI_BYTE; /* MPI description of the selection in memory */
+    int             mpi_code;            /* MPI return code */
     int             size_i, bytes_written;
-    int                         type_size;      /* MPI datatype used for I/O's size */
-    int                         io_size;        /* Actual number of bytes requested */
-    hbool_t      use_view_this_time = FALSE;
-    H5P_genplist_t              *plist = NULL;  /* Property list pointer */
-    herr_t                ret_value = SUCCEED;
+    int             type_size; /* MPI datatype used for I/O's size */
+    int             io_size;   /* Actual number of bytes requested */
+    hbool_t         use_view_this_time = FALSE;
+    H5P_genplist_t *plist              = NULL; /* Property list pointer */
+    herr_t          ret_value          = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Entering H5FD_mpio_write\n" );
+        HDfprintf(stdout, "Entering H5FD_mpio_write\n");
 #endif
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
     /* Make certain we have the correct type of property list */
-    HDassert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
-    HDassert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER));
+    HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id));
+    HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
     HDassert(buf);
 
     /* Portably initialize MPI status variable */
     HDmemset(&mpi_stat, 0, sizeof(MPI_Status));
 
     /* some numeric conversions */
-    if(H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off) < 0)
+    if (H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off")
     size_i = (int)size;
-    if((hsize_t)size_i != size)
+    if ((hsize_t)size_i != size)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from size to size_i")
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'w'])
+    if (H5FD_mpio_Debug[(int)'w'])
         HDfprintf(stdout, "in H5FD_mpio_write  mpi_off=%ld  size_i=%d\n", (long)mpi_off, size_i);
 #endif
 
-    if(type == H5FD_MEM_DRAW) {
-        H5FD_mpio_xfer_t            xfer_mode;   /* I/O transfer mode */
+    if (type == H5FD_MEM_DRAW) {
+        H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode */
 
         /* Obtain the data transfer properties */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
         /* get the transfer mode from the dxpl */
-        if(H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode)<0)
+        if (H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O transfer mode")
 
         /*
@@ -1785,22 +1765,23 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
          * us to test that btype=ftype=MPI_BYTE (or even MPI_TYPE_NULL, which
          * could mean "use MPI_BYTE" by convention).
          */
-        if(xfer_mode == H5FD_MPIO_COLLECTIVE) {
-            MPI_Datatype    file_type;
+        if (xfer_mode == H5FD_MPIO_COLLECTIVE) {
+            MPI_Datatype file_type;
 
             /* Remember that views are used */
             use_view_this_time = TRUE;
 
             /* prepare for a full-blown xfer using btype, ftype, and disp */
-            if(H5P_get(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, &buf_type) < 0)
+            if (H5P_get(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, &buf_type) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O type property")
-            if(H5P_get(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, &file_type) < 0)
+            if (H5P_get(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, &file_type) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O type property")
 
             /*
              * Set the file view when we are using MPI derived types
              */
-            if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type, H5FD_mpi_native_g, file->info)))
+            if (MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type,
+                                                             H5FD_mpi_native_g, file->info)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
 
             /* When using types, use the address as the displacement for
@@ -1808,55 +1789,59 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
              */
             mpi_off = 0;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
 #if 0 /* JRM -- 3/23/10 */ /* this is no longer always the case */
         /* Only one process can do the actual metadata write */
         if(file->mpi_rank != H5_PAR_META_WRITE)
 #ifdef LATER
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "can't write metadata from non-zero rank")
-#else /* LATER */
+#else  /* LATER */
             HGOTO_DONE(SUCCEED) /* skip the actual write */
 #endif /* LATER */
 #endif /* JRM */
-    } /* end if */
+    }  /* end if */
 
     /* Write the data. */
-    if(use_view_this_time) {
+    if (use_view_this_time) {
         H5FD_mpio_collective_opt_t coll_opt_mode;
 
 #ifdef H5FDmpio_DEBUG
-        if(H5FD_mpio_Debug[(int)'t'])
+        if (H5FD_mpio_Debug[(int)'t'])
             HDfprintf(stdout, "H5FD_mpio_write: using MPIO collective mode\n");
 #endif
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
         HDassert(plist);
         /* get the transfer mode from the dxpl */
-        if(H5P_get(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &coll_opt_mode)<0)
+        if (H5P_get(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &coll_opt_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O collective_op property")
 
-        if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
+        if (coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'t'])
+            if (H5FD_mpio_Debug[(int)'t'])
                 HDfprintf(stdout, "H5FD_mpio_write: doing MPI collective IO\n");
 #endif
-            if(MPI_SUCCESS != (mpi_code = MPI_File_write_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_File_write_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at_all failed", mpi_code)
         } /* end if */
         else {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'t'])
+            if (H5FD_mpio_Debug[(int)'t'])
                 HDfprintf(stdout, "H5FD_mpio_write: doing MPI independent IO\n");
 #endif
-            if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
         } /* end else */
 
         /* Reset the file view when we used MPI derived types */
-        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g,  file->info)))
+        if (MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE,
+                                                         H5FD_mpi_native_g, file->info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
-    } else {
-        if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+    }
+    else {
+        if (MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
     }
 
@@ -1866,18 +1851,18 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
      *  datatype in this call though... (We aren't because using it causes
      *  the LANL "qsc" machine to dump core - 12/19/03) - QAK]
      */
-    if(MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_written)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_written)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Get_elements failed", mpi_code)
 
     /* Get the type's size */
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_size failed", mpi_code)
 
     /* Compute the actual number of bytes requested */
     io_size = type_size * size_i;
 
     /* Check for write failure */
-    if(bytes_written != io_size)
+    if (bytes_written != io_size)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
     /* Forget the EOF value (see H5FD_mpio_get_eof()) --rpm 1999-08-06 */
@@ -1885,14 +1870,12 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "proc %d: Leaving H5FD_mpio_write with ret_value=%d\n",
-      file->mpi_rank, ret_value );
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stdout, "proc %d: Leaving H5FD_mpio_write with ret_value=%d\n", file->mpi_rank, ret_value);
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpio_flush
  *
@@ -1910,35 +1893,34 @@ done:
 static herr_t
 H5FD_mpio_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned closing)
 {
-    H5FD_mpio_t    *file = (H5FD_mpio_t*)_file;
-    int      mpi_code;  /* mpi return code */
-    herr_t              ret_value = SUCCEED;
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    int          mpi_code; /* mpi return code */
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Entering %s\n", FUNC);
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stdout, "Entering %s\n", FUNC);
 #endif
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
     /* Only sync the file if we are not going to immediately close it */
-    if(!closing) {
-        if(MPI_SUCCESS != (mpi_code = MPI_File_sync(file->f)))
+    if (!closing) {
+        if (MPI_SUCCESS != (mpi_code = MPI_File_sync(file->f)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_sync failed", mpi_code)
     } /* end if */
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Leaving %s\n", FUNC);
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stdout, "Leaving %s\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpio_truncate
  *
@@ -1955,14 +1937,14 @@ done:
 static herr_t
 H5FD_mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing)
 {
-    H5FD_mpio_t    *file = (H5FD_mpio_t*)_file;
-    herr_t              ret_value = SUCCEED;
+    H5FD_mpio_t *file      = (H5FD_mpio_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Entering %s\n", FUNC);
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stdout, "Entering %s\n", FUNC);
 #endif
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
@@ -1971,24 +1953,24 @@ H5FD_mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
      * Unfortunately, keeping track of EOF is an expensive operation, so
      * we can't just check whether EOF<EOA like with other drivers.
      * Therefore we'll just read the byte at EOA-1 and then write it back. */
-    if(file->eoa > file->last_eoa) {
-        int    mpi_code;  /* mpi return code */
-        MPI_Offset      mpi_off;
+    if (file->eoa > file->last_eoa) {
+        int        mpi_code; /* mpi return code */
+        MPI_Offset mpi_off;
 
-        if(H5FD_mpi_haddr_to_MPIOff(file->eoa, &mpi_off) < 0)
+        if (H5FD_mpi_haddr_to_MPIOff(file->eoa, &mpi_off) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "cannot convert from haddr_t to MPI_Offset")
 
         /* Extend the file's size */
-        if(MPI_SUCCESS != (mpi_code = MPI_File_set_size(file->f, mpi_off)))
+        if (MPI_SUCCESS != (mpi_code = MPI_File_set_size(file->f, mpi_off)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_size failed", mpi_code)
 
-	/* Don't let any proc return until all have extended the file.
+        /* Don't let any proc return until all have extended the file.
          * (Prevents race condition where some processes go ahead and write
          * more data to the file before all the processes have finished making
          * it the shorter length, potentially truncating the file and dropping
          * the new data written)
          */
-        if(MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
 
         /* Update the 'last' eoa value */
@@ -1997,14 +1979,13 @@ H5FD_mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
-      HDfprintf(stdout, "Leaving %s\n", FUNC);
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stdout, "Leaving %s\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_truncate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_mpi_rank
  *
@@ -2023,17 +2004,16 @@ done:
 static int
 H5FD_mpio_mpi_rank(const H5FD_t *_file)
 {
-    const H5FD_mpio_t  *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     FUNC_LEAVE_NOAPI(file->mpi_rank)
 } /* end H5FD_mpio_mpi_rank() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_mpi_size
  *
@@ -2052,17 +2032,16 @@ H5FD_mpio_mpi_rank(const H5FD_t *_file)
 static int
 H5FD_mpio_mpi_size(const H5FD_t *_file)
 {
-    const H5FD_mpio_t  *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     FUNC_LEAVE_NOAPI(file->mpi_size)
 } /* end H5FD_mpio_mpi_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_communicator
  *
@@ -2082,15 +2061,14 @@ H5FD_mpio_mpi_size(const H5FD_t *_file)
 static MPI_Comm
 H5FD_mpio_communicator(const H5FD_t *_file)
 {
-    const H5FD_mpio_t  *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     FUNC_LEAVE_NOAPI(file->comm)
 }
 
 #endif /* H5_HAVE_PARALLEL */
-
diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h
index 223786e..c056ce5 100644
--- a/src/H5FDmpio.h
+++ b/src/H5FDmpio.h
@@ -23,9 +23,9 @@
 /* Macros */
 
 #ifdef H5_HAVE_PARALLEL
-#   define H5FD_MPIO	(H5FD_mpio_init())
+#define H5FD_MPIO (H5FD_mpio_init())
 #else
-#   define H5FD_MPIO	(-1)
+#define H5FD_MPIO (-1)
 #endif /* H5_HAVE_PARALLEL */
 
 #ifdef H5_HAVE_PARALLEL
@@ -44,13 +44,12 @@ H5_DLLVAR hbool_t H5FD_mpi_opt_types_g;
 #ifdef __cplusplus
 extern "C" {
 #endif
-H5_DLL hid_t H5FD_mpio_init(void);
-H5_DLL void H5FD_mpio_term(void);
+H5_DLL hid_t  H5FD_mpio_init(void);
+H5_DLL void   H5FD_mpio_term(void);
 H5_DLL herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info);
-H5_DLL herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/,
-			MPI_Info *info/*out*/);
+H5_DLL herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm /*out*/, MPI_Info *info /*out*/);
 H5_DLL herr_t H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode);
-H5_DLL herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/);
+H5_DLL herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out*/);
 H5_DLL herr_t H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mode);
 H5_DLL herr_t H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode);
 H5_DLL herr_t H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc);
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 41af084..b5826c4 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -33,55 +33,57 @@
 
 #include "hdf5.h"
 
-
 /* Our version of MAX */
 #undef MAX
-#define MAX(X,Y)    ((X)>(Y)?(X):(Y))
+#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
 
 #ifndef FALSE
-#define FALSE        0
+#define FALSE 0
 #endif
 #ifndef TRUE
-#define TRUE        1
+#define TRUE 1
 #endif
 
 /* Loop through all mapped files */
-#define UNIQUE_MEMBERS_CORE(MAP, ITER, SEEN, LOOPVAR) {                          \
-    H5FD_mem_t ITER, LOOPVAR;                          \
-    unsigned SEEN[H5FD_MEM_NTYPES];                          \
-                                        \
-    memset(SEEN, 0, sizeof SEEN);                                \
-    for (ITER=H5FD_MEM_SUPER; ITER<H5FD_MEM_NTYPES; ITER=(H5FD_mem_t)(ITER+1)) {  \
-    LOOPVAR = MAP[ITER];                          \
-    if (H5FD_MEM_DEFAULT==LOOPVAR) LOOPVAR=ITER;              \
-    assert(LOOPVAR>0 && LOOPVAR<H5FD_MEM_NTYPES);                  \
-    if (SEEN[LOOPVAR]++) continue;                          \
+#define UNIQUE_MEMBERS_CORE(MAP, ITER, SEEN, LOOPVAR)                                                        \
+    {                                                                                                        \
+        H5FD_mem_t ITER, LOOPVAR;                                                                            \
+        unsigned   SEEN[H5FD_MEM_NTYPES];                                                                    \
+                                                                                                             \
+        memset(SEEN, 0, sizeof SEEN);                                                                        \
+        for (ITER = H5FD_MEM_SUPER; ITER < H5FD_MEM_NTYPES; ITER = (H5FD_mem_t)(ITER + 1)) {                 \
+            LOOPVAR = MAP[ITER];                                                                             \
+            if (H5FD_MEM_DEFAULT == LOOPVAR)                                                                 \
+                LOOPVAR = ITER;                                                                              \
+            assert(LOOPVAR > 0 && LOOPVAR < H5FD_MEM_NTYPES);                                                \
+            if (SEEN[LOOPVAR]++)                                                                             \
+                continue;
 
 /* Need two front-ends, since they are nested sometimes */
-#define UNIQUE_MEMBERS(MAP, LOOPVAR)                                          \
-    UNIQUE_MEMBERS_CORE(MAP, _unmapped, _seen, LOOPVAR)
-#define UNIQUE_MEMBERS2(MAP, LOOPVAR)                                         \
-    UNIQUE_MEMBERS_CORE(MAP, _unmapped2, _seen2, LOOPVAR)
-
-#define ALL_MEMBERS(LOOPVAR) {                              \
-    H5FD_mem_t LOOPVAR;                                  \
-    for (LOOPVAR=H5FD_MEM_DEFAULT; LOOPVAR<H5FD_MEM_NTYPES; LOOPVAR=(H5FD_mem_t)(LOOPVAR+1)) {
+#define UNIQUE_MEMBERS(MAP, LOOPVAR)  UNIQUE_MEMBERS_CORE(MAP, _unmapped, _seen, LOOPVAR)
+#define UNIQUE_MEMBERS2(MAP, LOOPVAR) UNIQUE_MEMBERS_CORE(MAP, _unmapped2, _seen2, LOOPVAR)
 
+#define ALL_MEMBERS(LOOPVAR)                                                                                 \
+    {                                                                                                        \
+        H5FD_mem_t LOOPVAR;                                                                                  \
+        for (LOOPVAR = H5FD_MEM_DEFAULT; LOOPVAR < H5FD_MEM_NTYPES; LOOPVAR = (H5FD_mem_t)(LOOPVAR + 1)) {
 
-#define END_MEMBERS    }}
+#define END_MEMBERS                                                                                          \
+    }                                                                                                        \
+    }
 
-#define H5FD_MULT_MAX_FILE_NAME_LEN     1024
+#define H5FD_MULT_MAX_FILE_NAME_LEN 1024
 
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_MULTI_g = 0;
 
 /* Driver-specific file access properties */
 typedef struct H5FD_multi_fapl_t {
-    H5FD_mem_t  memb_map[H5FD_MEM_NTYPES];      /*memory usage map              */
-    hid_t       memb_fapl[H5FD_MEM_NTYPES];     /*member access properties      */
-    char        *memb_name[H5FD_MEM_NTYPES];    /*name generators               */
-    haddr_t     memb_addr[H5FD_MEM_NTYPES];     /*starting addr per member      */
-    hbool_t     relax;                          /*less stringent error checking    */
+    H5FD_mem_t memb_map[H5FD_MEM_NTYPES];  /*memory usage map              */
+    hid_t      memb_fapl[H5FD_MEM_NTYPES]; /*member access properties      */
+    char *     memb_name[H5FD_MEM_NTYPES]; /*name generators               */
+    haddr_t    memb_addr[H5FD_MEM_NTYPES]; /*starting addr per member      */
+    hbool_t    relax;                      /*less stringent error checking    */
 } H5FD_multi_fapl_t;
 
 /*
@@ -91,94 +93,89 @@ typedef struct H5FD_multi_fapl_t {
  * copied into the parent file struct in H5F_open().
  */
 typedef struct H5FD_multi_t {
-    H5FD_t              pub;                        /*public stuff, must be first               */
-    H5FD_multi_fapl_t   fa;                         /*driver-specific file access properties    */
-    haddr_t             memb_next[H5FD_MEM_NTYPES]; /*addr of next member                       */
-    H5FD_t             *memb[H5FD_MEM_NTYPES];      /*member pointers                           */
-    haddr_t             memb_eoa[H5FD_MEM_NTYPES];  /*EOA for individual files,
-                                                     *end of allocated addresses.  v1.6 library
-                                                     *have the EOA for the entire file. But it's
-                                                     *meaningless for MULTI file.  We replaced it
-                                                     *with the EOAs for individual files        */
-    unsigned            flags;                      /*file open flags saved for debugging       */
-    char               *name;                       /*name passed to H5Fopen or H5Fcreate       */
+    H5FD_t            pub;                        /*public stuff, must be first               */
+    H5FD_multi_fapl_t fa;                         /*driver-specific file access properties    */
+    haddr_t           memb_next[H5FD_MEM_NTYPES]; /*addr of next member                       */
+    H5FD_t *          memb[H5FD_MEM_NTYPES];      /*member pointers                           */
+    haddr_t           memb_eoa[H5FD_MEM_NTYPES];  /*EOA for individual files,
+                                                   *end of allocated addresses.  v1.6 library
+                                                   *have the EOA for the entire file. But it's
+                                                   *meaningless for MULTI file.  We replaced it
+                                                   *with the EOAs for individual files        */
+    unsigned flags;                               /*file open flags saved for debugging       */
+    char *   name;                                /*name passed to H5Fopen or H5Fcreate       */
 } H5FD_multi_t;
 
 /* Driver specific data transfer properties */
 typedef struct H5FD_multi_dxpl_t {
-    hid_t    memb_dxpl[H5FD_MEM_NTYPES];/*member data xfer properties*/
+    hid_t memb_dxpl[H5FD_MEM_NTYPES]; /*member data xfer properties*/
 } H5FD_multi_dxpl_t;
 
 /* Private functions */
 static char *my_strdup(const char *s);
-static int compute_next(H5FD_multi_t *file);
-static int open_members(H5FD_multi_t *file);
+static int   compute_next(H5FD_multi_t *file);
+static int   open_members(H5FD_multi_t *file);
 
 /* Callback prototypes */
 static hsize_t H5FD_multi_sb_size(H5FD_t *file);
-static herr_t H5FD_multi_sb_encode(H5FD_t *file, char *name/*out*/,
-                unsigned char *buf/*out*/);
-static herr_t H5FD_multi_sb_decode(H5FD_t *file, const char *name,
-                const unsigned char *buf);
-static void *H5FD_multi_fapl_get(H5FD_t *file);
-static void *H5FD_multi_fapl_copy(const void *_old_fa);
-static herr_t H5FD_multi_fapl_free(void *_fa);
-static H5FD_t *H5FD_multi_open(const char *name, unsigned flags,
-                hid_t fapl_id, haddr_t maxaddr);
-static herr_t H5FD_multi_close(H5FD_t *_file);
-static int H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t H5FD_multi_query(const H5FD_t *_f1, unsigned long *flags);
-static herr_t H5FD_multi_get_type_map(const H5FD_t *file, H5FD_mem_t *type_map);
+static herr_t  H5FD_multi_sb_encode(H5FD_t *file, char *name /*out*/, unsigned char *buf /*out*/);
+static herr_t  H5FD_multi_sb_decode(H5FD_t *file, const char *name, const unsigned char *buf);
+static void *  H5FD_multi_fapl_get(H5FD_t *file);
+static void *  H5FD_multi_fapl_copy(const void *_old_fa);
+static herr_t  H5FD_multi_fapl_free(void *_fa);
+static H5FD_t *H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD_multi_close(H5FD_t *_file);
+static int     H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD_multi_query(const H5FD_t *_f1, unsigned long *flags);
+static herr_t  H5FD_multi_get_type_map(const H5FD_t *file, H5FD_mem_t *type_map);
 static haddr_t H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa);
+static herr_t  H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa);
 static haddr_t H5FD_multi_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
+static herr_t  H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
 static haddr_t H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
-static herr_t H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-                hsize_t size);
-static herr_t H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-                size_t size, void *_buf/*out*/);
-static herr_t H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-                size_t size, const void *_buf);
-static herr_t H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
-static herr_t H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size);
+static herr_t  H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                               void *_buf /*out*/);
+static herr_t  H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                                const void *_buf);
+static herr_t  H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
+static herr_t  H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 
 /* The class struct */
 static const H5FD_class_t H5FD_multi_g = {
-    "multi",                    /*name            */
-    HADDR_MAX,                    /*maxaddr        */
-    H5F_CLOSE_WEAK,                /* fc_degree        */
-    H5FD_multi_sb_size,                /*sb_size        */
-    H5FD_multi_sb_encode,            /*sb_encode        */
-    H5FD_multi_sb_decode,            /*sb_decode        */
-    sizeof(H5FD_multi_fapl_t),            /*fapl_size        */
-    H5FD_multi_fapl_get,            /*fapl_get        */
-    H5FD_multi_fapl_copy,            /*fapl_copy        */
-    H5FD_multi_fapl_free,            /*fapl_free        */
-    0,                        /*dxpl_size        */
-    NULL,                    /*dxpl_copy        */
-    NULL,                    /*dxpl_free        */
-    H5FD_multi_open,                /*open            */
-    H5FD_multi_close,                /*close            */
-    H5FD_multi_cmp,                /*cmp            */
-    H5FD_multi_query,                /*query            */
-    H5FD_multi_get_type_map,            /*get_type_map        */
-    H5FD_multi_alloc,                /*alloc            */
-    H5FD_multi_free,                /*free            */
-    H5FD_multi_get_eoa,                /*get_eoa        */
-    H5FD_multi_set_eoa,                /*set_eoa        */
-    H5FD_multi_get_eof,                /*get_eof        */
-    H5FD_multi_get_handle,                      /*get_handle            */
-    H5FD_multi_read,                /*read            */
-    H5FD_multi_write,                /*write            */
-    H5FD_multi_flush,                /*flush            */
-    H5FD_multi_truncate,            /*truncate        */
-    NULL,                                       /*lock                  */
-    NULL,                                       /*unlock                */
-    H5FD_FLMAP_DEFAULT                 /*fl_map        */
+    "multi",                   /*name            */
+    HADDR_MAX,                 /*maxaddr        */
+    H5F_CLOSE_WEAK,            /* fc_degree        */
+    H5FD_multi_sb_size,        /*sb_size        */
+    H5FD_multi_sb_encode,      /*sb_encode        */
+    H5FD_multi_sb_decode,      /*sb_decode        */
+    sizeof(H5FD_multi_fapl_t), /*fapl_size        */
+    H5FD_multi_fapl_get,       /*fapl_get        */
+    H5FD_multi_fapl_copy,      /*fapl_copy        */
+    H5FD_multi_fapl_free,      /*fapl_free        */
+    0,                         /*dxpl_size        */
+    NULL,                      /*dxpl_copy        */
+    NULL,                      /*dxpl_free        */
+    H5FD_multi_open,           /*open            */
+    H5FD_multi_close,          /*close            */
+    H5FD_multi_cmp,            /*cmp            */
+    H5FD_multi_query,          /*query            */
+    H5FD_multi_get_type_map,   /*get_type_map        */
+    H5FD_multi_alloc,          /*alloc            */
+    H5FD_multi_free,           /*free            */
+    H5FD_multi_get_eoa,        /*get_eoa        */
+    H5FD_multi_set_eoa,        /*set_eoa        */
+    H5FD_multi_get_eof,        /*get_eof        */
+    H5FD_multi_get_handle,     /*get_handle            */
+    H5FD_multi_read,           /*read            */
+    H5FD_multi_write,          /*write            */
+    H5FD_multi_flush,          /*flush            */
+    H5FD_multi_truncate,       /*truncate        */
+    NULL,                      /*lock                  */
+    NULL,                      /*unlock                */
+    H5FD_FLMAP_DEFAULT         /*fl_map        */
 };
 
-
 /*-------------------------------------------------------------------------
  * Function:    my_strdup
  *
@@ -196,20 +193,19 @@ static const H5FD_class_t H5FD_multi_g = {
 static char *
 my_strdup(const char *s)
 {
-    char *x;
+    char * x;
     size_t str_len;
 
-    if(!s)
+    if (!s)
         return NULL;
     str_len = strlen(s) + 1;
-    if(NULL == (x = (char *)malloc(str_len)))
+    if (NULL == (x = (char *)malloc(str_len)))
         return NULL;
     memcpy(x, s, str_len);
 
     return x;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_init
  *
@@ -231,13 +227,12 @@ H5FD_multi_init(void)
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    if(H5I_VFL!=H5Iget_type(H5FD_MULTI_g))
+    if (H5I_VFL != H5Iget_type(H5FD_MULTI_g))
         H5FD_MULTI_g = H5FDregister(&H5FD_multi_g);
 
     return H5FD_MULTI_g;
 }
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD_multi_term
  *
@@ -254,11 +249,10 @@ void
 H5FD_multi_term(void)
 {
     /* Reset VFL ID */
-    H5FD_MULTI_g=0;
+    H5FD_MULTI_g = 0;
 
 } /* end H5FD_multi_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_split
  *
@@ -276,15 +270,15 @@ H5FD_multi_term(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
-        const char *raw_ext, hid_t raw_plist_id)
+H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const char *raw_ext,
+                  hid_t raw_plist_id)
 {
-    H5FD_mem_t        memb_map[H5FD_MEM_NTYPES];
-    hid_t        memb_fapl[H5FD_MEM_NTYPES];
-    const char        *memb_name[H5FD_MEM_NTYPES];
+    H5FD_mem_t  memb_map[H5FD_MEM_NTYPES];
+    hid_t       memb_fapl[H5FD_MEM_NTYPES];
+    const char *memb_name[H5FD_MEM_NTYPES];
     char        meta_name[H5FD_MULT_MAX_FILE_NAME_LEN];
     char        raw_name[H5FD_MULT_MAX_FILE_NAME_LEN];
-    haddr_t        memb_addr[H5FD_MEM_NTYPES];
+    haddr_t     memb_addr[H5FD_MEM_NTYPES];
 
     /*NO TRACE*/
 
@@ -292,63 +286,64 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
     H5Eclear2(H5E_DEFAULT);
 
     /* Initialize */
-    ALL_MEMBERS(mt) {
-    /* Treat global heap as raw data, not metadata */
-    memb_map[mt] = ((mt == H5FD_MEM_DRAW || mt == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : H5FD_MEM_SUPER);
-    memb_fapl[mt] = -1;
-    memb_name[mt] = NULL;
-    memb_addr[mt] = HADDR_UNDEF;
-    } END_MEMBERS;
+    ALL_MEMBERS(mt)
+    {
+        /* Treat global heap as raw data, not metadata */
+        memb_map[mt]  = ((mt == H5FD_MEM_DRAW || mt == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : H5FD_MEM_SUPER);
+        memb_fapl[mt] = -1;
+        memb_name[mt] = NULL;
+        memb_addr[mt] = HADDR_UNDEF;
+    }
+    END_MEMBERS;
 
     /* The file access properties */
     memb_fapl[H5FD_MEM_SUPER] = meta_plist_id;
-    memb_fapl[H5FD_MEM_DRAW] = raw_plist_id;
+    memb_fapl[H5FD_MEM_DRAW]  = raw_plist_id;
 
     /* The names */
     /* process meta filename */
-    if(meta_ext) {
-    if(strstr(meta_ext, "%s")) {
+    if (meta_ext) {
+        if (strstr(meta_ext, "%s")) {
             /* Note: this doesn't accommodate for when the '%s' in the user's
              *  string is at a position >sizeof(meta_name) - QK & JK - 2013/01/17
              */
-        strncpy(meta_name, meta_ext, sizeof(meta_name));
+            strncpy(meta_name, meta_ext, sizeof(meta_name));
             meta_name[sizeof(meta_name) - 1] = '\0';
         }
-    else
-        sprintf(meta_name, "%%s%s", meta_ext);
+        else
+            sprintf(meta_name, "%%s%s", meta_ext);
     }
     else {
-    strncpy(meta_name, "%s.meta", sizeof(meta_name));
+        strncpy(meta_name, "%s.meta", sizeof(meta_name));
         meta_name[sizeof(meta_name) - 1] = '\0';
     }
     memb_name[H5FD_MEM_SUPER] = meta_name;
 
     /* process raw filename */
-    if(raw_ext) {
-    if(strstr(raw_ext, "%s")) {
+    if (raw_ext) {
+        if (strstr(raw_ext, "%s")) {
             /* Note: this doesn't accommodate for when the '%s' in the user's
              *  string is at a position >sizeof(raw_name) - QK & JK - 2013/01/17
              */
-        strncpy(raw_name, raw_ext, sizeof(raw_name));
+            strncpy(raw_name, raw_ext, sizeof(raw_name));
             raw_name[sizeof(raw_name) - 1] = '\0';
         }
-    else
-        sprintf(raw_name, "%%s%s", raw_ext);
+        else
+            sprintf(raw_name, "%%s%s", raw_ext);
     }
     else {
-    strncpy(raw_name, "%s.raw", sizeof(raw_name));
+        strncpy(raw_name, "%s.raw", sizeof(raw_name));
         raw_name[sizeof(raw_name) - 1] = '\0';
     }
     memb_name[H5FD_MEM_DRAW] = raw_name;
 
     /* The sizes */
     memb_addr[H5FD_MEM_SUPER] = 0;
-    memb_addr[H5FD_MEM_DRAW] = HADDR_MAX/2;
+    memb_addr[H5FD_MEM_DRAW]  = HADDR_MAX / 2;
 
     return H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, TRUE);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_multi
  *
@@ -426,19 +421,18 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
-        const hid_t *memb_fapl, const char * const *memb_name,
-        const haddr_t *memb_addr, hbool_t relax)
+H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_fapl,
+                  const char *const *memb_name, const haddr_t *memb_addr, hbool_t relax)
 {
-    H5FD_multi_fapl_t    fa;
-    H5FD_mem_t        mt, mmt;
-    H5FD_mem_t        _memb_map[H5FD_MEM_NTYPES];
-    hid_t        _memb_fapl[H5FD_MEM_NTYPES];
-    char        _memb_name[H5FD_MEM_NTYPES][16];
-    const char        *_memb_name_ptrs[H5FD_MEM_NTYPES];
-    haddr_t        _memb_addr[H5FD_MEM_NTYPES];
-    static const char    *letters = "Xsbrglo";
-    static const char *func="H5FDset_fapl_multi";  /* Function Name for error reporting */
+    H5FD_multi_fapl_t  fa;
+    H5FD_mem_t         mt, mmt;
+    H5FD_mem_t         _memb_map[H5FD_MEM_NTYPES];
+    hid_t              _memb_fapl[H5FD_MEM_NTYPES];
+    char               _memb_name[H5FD_MEM_NTYPES][16];
+    const char *       _memb_name_ptrs[H5FD_MEM_NTYPES];
+    haddr_t            _memb_addr[H5FD_MEM_NTYPES];
+    static const char *letters = "Xsbrglo";
+    static const char *func    = "H5FDset_fapl_multi"; /* Function Name for error reporting */
 
     /*NO TRACE*/
 
@@ -446,71 +440,69 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
     H5Eclear2(H5E_DEFAULT);
 
     /* Check arguments and supply default values */
-    if(H5I_GENPROP_LST != H5Iget_type(fapl_id) ||
-            TRUE != H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "not an access list", -1)
-    if (!memb_map) {
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1))
-        _memb_map[mt] = H5FD_MEM_DEFAULT;
-    memb_map = _memb_map;
-    }
+    if (H5I_GENPROP_LST != H5Iget_type(fapl_id) || TRUE != H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "not an access list", -1) if (!memb_map)
+        {
+            for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1))
+                _memb_map[mt] = H5FD_MEM_DEFAULT;
+            memb_map = _memb_map;
+        }
     if (!memb_fapl) {
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1))
-        _memb_fapl[mt] = H5Pcreate(H5P_FILE_ACCESS);
-    memb_fapl = _memb_fapl;
+        for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1))
+            _memb_fapl[mt] = H5Pcreate(H5P_FILE_ACCESS);
+        memb_fapl = _memb_fapl;
     }
     if (!memb_name) {
-    assert(strlen(letters)==H5FD_MEM_NTYPES);
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1)) {
-        sprintf(_memb_name[mt], "%%s-%c.h5", letters[mt]);
-        _memb_name_ptrs[mt] = _memb_name[mt];
-    }
-    memb_name = _memb_name_ptrs;
+        assert(strlen(letters) == H5FD_MEM_NTYPES);
+        for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+            sprintf(_memb_name[mt], "%%s-%c.h5", letters[mt]);
+            _memb_name_ptrs[mt] = _memb_name[mt];
+        }
+        memb_name = _memb_name_ptrs;
     }
     if (!memb_addr) {
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1))
-        _memb_addr[mt] = (hsize_t)(mt ? (mt - 1) : 0) * (HADDR_MAX / (H5FD_MEM_NTYPES-1));
-    memb_addr = _memb_addr;
+        for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1))
+            _memb_addr[mt] = (hsize_t)(mt ? (mt - 1) : 0) * (HADDR_MAX / (H5FD_MEM_NTYPES - 1));
+        memb_addr = _memb_addr;
     }
 
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1)) {
-    /* Map usage type */
-    mmt = memb_map[mt];
-    if (mmt<0 || mmt>=H5FD_MEM_NTYPES)
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADRANGE, "file resource type out of range", -1)
-    if (H5FD_MEM_DEFAULT==mmt) mmt = mt;
+    for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+        /* Map usage type */
+        mmt = memb_map[mt];
+        if (mmt < 0 || mmt >= H5FD_MEM_NTYPES)
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADRANGE, "file resource type out of range",
+                        -1) if (H5FD_MEM_DEFAULT == mmt) mmt = mt;
 
-    /*
-    * All members of MEMB_FAPL must be either defaults or actual file
-    * access property lists.
-    */
-    if (H5P_DEFAULT!=memb_fapl[mmt] && TRUE!=H5Pisa_class(memb_fapl[mmt], H5P_FILE_ACCESS))
+        /*
+         * All members of MEMB_FAPL must be either defaults or actual file
+         * access property lists.
+         */
+        if (H5P_DEFAULT != memb_fapl[mmt] && TRUE != H5Pisa_class(memb_fapl[mmt], H5P_FILE_ACCESS))
             H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type incorrect", -1)
 
-    /* All names must be defined */
-    if (!memb_name[mmt] || !memb_name[mmt][0])
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type not set", -1)
+                /* All names must be defined */
+                if (!memb_name[mmt] || !memb_name[mmt][0]) H5Epush_ret(
+                    func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type not set", -1)
     }
 
     /*
      * Initialize driver specific information. No need to copy it into the FA
      * struct since all members will be copied by H5Pset_driver().
      */
-    memcpy(fa.memb_map, memb_map, H5FD_MEM_NTYPES*sizeof(H5FD_mem_t));
-    memcpy(fa.memb_fapl, memb_fapl, H5FD_MEM_NTYPES*sizeof(hid_t));
-    memcpy(fa.memb_name, memb_name, H5FD_MEM_NTYPES*sizeof(char*));
-    memcpy(fa.memb_addr, memb_addr, H5FD_MEM_NTYPES*sizeof(haddr_t));
+    memcpy(fa.memb_map, memb_map, H5FD_MEM_NTYPES * sizeof(H5FD_mem_t));
+    memcpy(fa.memb_fapl, memb_fapl, H5FD_MEM_NTYPES * sizeof(hid_t));
+    memcpy(fa.memb_name, memb_name, H5FD_MEM_NTYPES * sizeof(char *));
+    memcpy(fa.memb_addr, memb_addr, H5FD_MEM_NTYPES * sizeof(haddr_t));
     fa.relax = relax;
 
     /* Patch up H5P_DEFAULT property lists for members */
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1)) {
-        if(fa.memb_fapl[mt]==H5P_DEFAULT)
+    for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+        if (fa.memb_fapl[mt] == H5P_DEFAULT)
             fa.memb_fapl[mt] = H5Pcreate(H5P_FILE_ACCESS);
     }
     return H5Pset_driver(fapl_id, H5FD_MULTI, &fa);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_fapl_multi
  *
@@ -528,54 +520,50 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
-        hid_t *memb_fapl/*out*/, char **memb_name/*out*/,
-        haddr_t *memb_addr/*out*/, hbool_t *relax)
+H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl /*out*/,
+                  char **memb_name /*out*/, haddr_t *memb_addr /*out*/, hbool_t *relax)
 {
-    H5FD_multi_fapl_t    *fa;
-    H5FD_mem_t        mt;
-    static const char *func="H5FDget_fapl_multi";  /* Function Name for error reporting */
+    H5FD_multi_fapl_t *fa;
+    H5FD_mem_t         mt;
+    static const char *func = "H5FDget_fapl_multi"; /* Function Name for error reporting */
 
     /*NO TRACE*/
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    if(H5I_GENPROP_LST != H5Iget_type(fapl_id) ||
-            TRUE != H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not an access list", -1)
-    if(H5FD_MULTI != H5Pget_driver(fapl_id))
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "incorrect VFL driver", -1)
-    if(NULL == (fa= (H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id)))
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "bad VFL driver info", -1)
+    if (H5I_GENPROP_LST != H5Iget_type(fapl_id) || TRUE != H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not an access list",
+                    -1) if (H5FD_MULTI != H5Pget_driver(fapl_id))
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "incorrect VFL driver",
+                        -1) if (NULL == (fa = (H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id)))
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "bad VFL driver info", -1)
 
-    if (memb_map)
-        memcpy(memb_map, fa->memb_map, H5FD_MEM_NTYPES*sizeof(H5FD_mem_t));
+                    if (memb_map) memcpy(memb_map, fa->memb_map, H5FD_MEM_NTYPES * sizeof(H5FD_mem_t));
     if (memb_fapl) {
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1)) {
-        if (fa->memb_fapl[mt]>=0)
-        memb_fapl[mt] = H5Pcopy(fa->memb_fapl[mt]);
-        else
-        memb_fapl[mt] = fa->memb_fapl[mt]; /*default or bad ID*/
-    }
-    }
-    if(memb_name) {
-    for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
-        if(fa->memb_name[mt])
-        memb_name[mt] = my_strdup(fa->memb_name[mt]);
-        else
-        memb_name[mt] = NULL;
+        for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+            if (fa->memb_fapl[mt] >= 0)
+                memb_fapl[mt] = H5Pcopy(fa->memb_fapl[mt]);
+            else
+                memb_fapl[mt] = fa->memb_fapl[mt]; /*default or bad ID*/
+        }
     }
+    if (memb_name) {
+        for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+            if (fa->memb_name[mt])
+                memb_name[mt] = my_strdup(fa->memb_name[mt]);
+            else
+                memb_name[mt] = NULL;
+        }
     }
     if (memb_addr)
-    memcpy(memb_addr, fa->memb_addr, H5FD_MEM_NTYPES*sizeof(haddr_t));
+        memcpy(memb_addr, fa->memb_addr, H5FD_MEM_NTYPES * sizeof(haddr_t));
     if (relax)
-    *relax = fa->relax;
+        *relax = fa->relax;
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_sb_size
  *
@@ -594,31 +582,31 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
 static hsize_t
 H5FD_multi_sb_size(H5FD_t *_file)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    unsigned        nseen = 0;
-    hsize_t        nbytes = 8; /*size of header*/
+    H5FD_multi_t *file   = (H5FD_multi_t *)_file;
+    unsigned      nseen  = 0;
+    hsize_t       nbytes = 8; /*size of header*/
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     /* How many unique files? */
-    UNIQUE_MEMBERS(file->fa.memb_map, mt) {
-    nseen++;
-    } END_MEMBERS;
+    UNIQUE_MEMBERS(file->fa.memb_map, mt) { nseen++; }
+    END_MEMBERS;
 
     /* Addresses and EOA markers */
     nbytes += nseen * 2 * 8;
 
     /* Name templates */
-    UNIQUE_MEMBERS(file->fa.memb_map, mt) {
-        size_t n = strlen(file->fa.memb_name[mt])+1;
-        nbytes += (n+7) & ~((size_t)0x0007);
-    } END_MEMBERS;
+    UNIQUE_MEMBERS(file->fa.memb_map, mt)
+    {
+        size_t n = strlen(file->fa.memb_name[mt]) + 1;
+        nbytes += (n + 7) & ~((size_t)0x0007);
+    }
+    END_MEMBERS;
 
     return nbytes;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_sb_encode
  *
@@ -643,16 +631,15 @@ H5FD_multi_sb_size(H5FD_t *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/,
-            unsigned char *buf/*out*/)
+H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    haddr_t        memb_eoa;
-    unsigned char    *p;
-    size_t        nseen;
-    size_t        i;
-    H5FD_mem_t        m;
-    static const char *func="H5FD_multi_sb_encode";  /* Function Name for error reporting */
+    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    haddr_t            memb_eoa;
+    unsigned char *    p;
+    size_t             nseen;
+    size_t             i;
+    H5FD_mem_t         m;
+    static const char *func = "H5FD_multi_sb_encode"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -661,10 +648,10 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/,
     strncpy(name, "NCSAmulti", (size_t)8);
     name[8] = '\0';
 
-    assert(7==H5FD_MEM_NTYPES);
+    assert(7 == H5FD_MEM_NTYPES);
 
-    for (m=H5FD_MEM_SUPER; m<H5FD_MEM_NTYPES; m=(H5FD_mem_t)(m+1)) {
-        buf[m-1] = (unsigned char)file->fa.memb_map[m];
+    for (m = H5FD_MEM_SUPER; m < H5FD_MEM_NTYPES; m = (H5FD_mem_t)(m + 1)) {
+        buf[m - 1] = (unsigned char)file->fa.memb_map[m];
     }
     buf[6] = 0;
     buf[7] = 0;
@@ -676,33 +663,36 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/,
 
     /* Encode all starting addresses and EOA values */
     nseen = 0;
-    p = buf+8;
-    assert(sizeof(haddr_t)<=8);
-    UNIQUE_MEMBERS(file->fa.memb_map, mt) {
+    p     = buf + 8;
+    assert(sizeof(haddr_t) <= 8);
+    UNIQUE_MEMBERS(file->fa.memb_map, mt)
+    {
         memcpy(p, &(file->fa.memb_addr[mt]), sizeof(haddr_t));
         p += sizeof(haddr_t);
         memb_eoa = H5FDget_eoa(file->memb[mt], mt);
         memcpy(p, &memb_eoa, sizeof(haddr_t));
         p += sizeof(haddr_t);
         nseen++;
-    } END_MEMBERS;
-    if (H5Tconvert(H5T_NATIVE_HADDR, H5T_STD_U64LE, nseen*2, buf+8, NULL, H5P_DEFAULT)<0)
+    }
+    END_MEMBERS;
+    if (H5Tconvert(H5T_NATIVE_HADDR, H5T_STD_U64LE, nseen * 2, buf + 8, NULL, H5P_DEFAULT) < 0)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
 
-    /* Encode all name templates */
-    p = buf + 8 + nseen*2*8;
-    UNIQUE_MEMBERS(file->fa.memb_map, mt) {
+            /* Encode all name templates */
+            p = buf + 8 + nseen * 2 * 8;
+    UNIQUE_MEMBERS(file->fa.memb_map, mt)
+    {
         size_t n = strlen(file->fa.memb_name[mt]) + 1;
         strncpy((char *)p, file->fa.memb_name[mt], n);
         p += n;
-        for (i=n; i%8; i++)
+        for (i = n; i % 8; i++)
             *p++ = '\0';
-    } END_MEMBERS;
+    }
+    END_MEMBERS;
 
     return 0;
 } /* end H5FD_multi_sb_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_sb_decode
  *
@@ -726,18 +716,18 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/,
 static herr_t
 H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    char        x[2*H5FD_MEM_NTYPES*8];
-    H5FD_mem_t        map[H5FD_MEM_NTYPES];
-    int            i;
-    size_t        nseen=0;
-    hbool_t        map_changed=FALSE;
-    hbool_t        in_use[H5FD_MEM_NTYPES];
-    const char        *memb_name[H5FD_MEM_NTYPES];
-    haddr_t        memb_addr[H5FD_MEM_NTYPES];
-    haddr_t        memb_eoa[H5FD_MEM_NTYPES];
-    haddr_t        *ap;
-    static const char *func="H5FD_multi_sb_decode";  /* Function Name for error reporting */
+    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    char               x[2 * H5FD_MEM_NTYPES * 8];
+    H5FD_mem_t         map[H5FD_MEM_NTYPES];
+    int                i;
+    size_t             nseen       = 0;
+    hbool_t            map_changed = FALSE;
+    hbool_t            in_use[H5FD_MEM_NTYPES];
+    const char *       memb_name[H5FD_MEM_NTYPES];
+    haddr_t            memb_addr[H5FD_MEM_NTYPES];
+    haddr_t            memb_eoa[H5FD_MEM_NTYPES];
+    haddr_t *          ap;
+    static const char *func = "H5FD_multi_sb_decode"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -746,47 +736,52 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
     if (strcmp(name, "NCSAmult"))
         H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid multi superblock", -1)
 
-    /* Set default values */
-    ALL_MEMBERS(mt) {
-        memb_addr[mt] = HADDR_UNDEF;
-        memb_eoa[mt] = HADDR_UNDEF;
-        memb_name[mt] = NULL;
-    } END_MEMBERS;
+            /* Set default values */
+            ALL_MEMBERS(mt)
+        {
+            memb_addr[mt] = HADDR_UNDEF;
+            memb_eoa[mt]  = HADDR_UNDEF;
+            memb_name[mt] = NULL;
+        }
+    END_MEMBERS;
 
     /*
      * Read the map and count the unique members.
      */
     memset(map, 0, sizeof map);
 
-    for (i=0; i<6; i++) {
-        map[i+1] = (H5FD_mem_t)buf[i];
-        if (file->fa.memb_map[i+1]!=map[i+1])
-            map_changed=TRUE;
+    for (i = 0; i < 6; i++) {
+        map[i + 1] = (H5FD_mem_t)buf[i];
+        if (file->fa.memb_map[i + 1] != map[i + 1])
+            map_changed = TRUE;
     }
 
-    UNIQUE_MEMBERS(map, mt) {
-        nseen++;
-    } END_MEMBERS;
+    UNIQUE_MEMBERS(map, mt) { nseen++; }
+    END_MEMBERS;
     buf += 8;
 
     /* Decode Address and EOA values */
-    assert(sizeof(haddr_t)<=8);
-    memcpy(x, buf, (nseen*2*8));
-    buf += nseen*2*8;
-    if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HADDR, nseen*2, x, NULL, H5P_DEFAULT)<0)
+    assert(sizeof(haddr_t) <= 8);
+    memcpy(x, buf, (nseen * 2 * 8));
+    buf += nseen * 2 * 8;
+    if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HADDR, nseen * 2, x, NULL, H5P_DEFAULT) < 0)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
-    ap = (haddr_t*)x;
-    UNIQUE_MEMBERS(map, mt) {
+            ap = (haddr_t *)x;
+    UNIQUE_MEMBERS(map, mt)
+    {
         memb_addr[_unmapped] = *ap++;
-        memb_eoa[_unmapped] = *ap++;
-    } END_MEMBERS;
+        memb_eoa[_unmapped]  = *ap++;
+    }
+    END_MEMBERS;
 
     /* Decode name templates */
-    UNIQUE_MEMBERS(map, mt) {
-        size_t n = strlen((const char *)buf)+1;
+    UNIQUE_MEMBERS(map, mt)
+    {
+        size_t n             = strlen((const char *)buf) + 1;
         memb_name[_unmapped] = (const char *)buf;
-        buf += (n+7) & ~((unsigned)0x0007);
-    } END_MEMBERS;
+        buf += (n + 7) & ~((unsigned)0x0007);
+    }
+    END_MEMBERS;
 
     /*
      * Use the mapping saved in the superblock in preference to the one
@@ -796,54 +791,58 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
      */
     if (map_changed) {
         /* Commit map */
-        ALL_MEMBERS(mt) {
-            file->fa.memb_map[mt] = map[mt];
-        } END_MEMBERS;
+        ALL_MEMBERS(mt) { file->fa.memb_map[mt] = map[mt]; }
+        END_MEMBERS;
 
         /* Close files which are unused now */
         memset(in_use, 0, sizeof in_use);
-        UNIQUE_MEMBERS(map, mt) {
-            in_use[mt] = TRUE;
-        } END_MEMBERS;
-        ALL_MEMBERS(mt) {
+        UNIQUE_MEMBERS(map, mt) { in_use[mt] = TRUE; }
+        END_MEMBERS;
+        ALL_MEMBERS(mt)
+        {
             if (!in_use[mt] && file->memb[mt]) {
                 (void)H5FDclose(file->memb[mt]);
                 file->memb[mt] = NULL;
             }
             file->fa.memb_map[mt] = map[mt];
-        } END_MEMBERS;
+        }
+        END_MEMBERS;
     }
 
     /* Commit member starting addresses and name templates */
-    ALL_MEMBERS(mt) {
+    ALL_MEMBERS(mt)
+    {
         file->fa.memb_addr[mt] = memb_addr[mt];
         if (memb_name[mt]) {
             if (file->fa.memb_name[mt])
                 free(file->fa.memb_name[mt]);
             file->fa.memb_name[mt] = my_strdup(memb_name[mt]);
         }
-    } END_MEMBERS;
-    if (compute_next(file)<0)
+    }
+    END_MEMBERS;
+    if (compute_next(file) < 0)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "compute_next() failed", -1)
 
-    /* Open all necessary files */
-    if (open_members(file)<0)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "open_members() failed", -1)
+            /* Open all necessary files */
+            if (open_members(file) < 0)
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "open_members() failed", -1)
 
-    /* Set the EOA marker for all open files */
-    UNIQUE_MEMBERS(file->fa.memb_map, mt) {
-        if (file->memb[mt])
-            if(H5FDset_eoa(file->memb[mt], mt, memb_eoa[mt])<0)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET, "set_eoa() failed", -1)
+            /* Set the EOA marker for all open files */
+            UNIQUE_MEMBERS(file->fa.memb_map, mt)
+        {
+            if (file->memb[mt])
+                if (H5FDset_eoa(file->memb[mt], mt, memb_eoa[mt]) < 0)
+                    H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET, "set_eoa() failed", -1)
 
-        /* Save the individual EOAs in one place for later comparison (in H5FD_multi_set_eoa) */
-        file->memb_eoa[mt] = memb_eoa[mt];
-    } END_MEMBERS;
+                        /* Save the individual EOAs in one place for later comparison (in H5FD_multi_set_eoa)
+                         */
+                        file->memb_eoa[mt] = memb_eoa[mt];
+        }
+    END_MEMBERS;
 
     return 0;
 } /* end H5FD_multi_sb_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_fapl_get
  *
@@ -864,7 +863,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
 static void *
 H5FD_multi_fapl_get(H5FD_t *_file)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
+    H5FD_multi_t *file = (H5FD_multi_t *)_file;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -872,7 +871,6 @@ H5FD_multi_fapl_get(H5FD_t *_file)
     return H5FD_multi_fapl_copy(&(file->fa));
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_fapl_copy
  *
@@ -890,10 +888,10 @@ H5FD_multi_fapl_get(H5FD_t *_file)
 static void *
 H5FD_multi_fapl_copy(const void *_old_fa)
 {
-    const H5FD_multi_fapl_t *old_fa = (const H5FD_multi_fapl_t*)_old_fa;
-    H5FD_multi_fapl_t *new_fa = (H5FD_multi_fapl_t *)malloc(sizeof(H5FD_multi_fapl_t));
-    int nerrors = 0;
-    static const char *func="H5FD_multi_fapl_copy";  /* Function Name for error reporting */
+    const H5FD_multi_fapl_t *old_fa  = (const H5FD_multi_fapl_t *)_old_fa;
+    H5FD_multi_fapl_t *      new_fa  = (H5FD_multi_fapl_t *)malloc(sizeof(H5FD_multi_fapl_t));
+    int                      nerrors = 0;
+    static const char *      func    = "H5FD_multi_fapl_copy"; /* Function Name for error reporting */
 
     assert(new_fa);
 
@@ -901,32 +899,35 @@ H5FD_multi_fapl_copy(const void *_old_fa)
     H5Eclear2(H5E_DEFAULT);
 
     memcpy(new_fa, old_fa, sizeof(H5FD_multi_fapl_t));
-    ALL_MEMBERS(mt) {
-    if (old_fa->memb_fapl[mt]>=0) {
-        new_fa->memb_fapl[mt] = H5Pcopy(old_fa->memb_fapl[mt]);
-        if(new_fa->memb_fapl[mt]<0)
+    ALL_MEMBERS(mt)
+    {
+        if (old_fa->memb_fapl[mt] >= 0) {
+            new_fa->memb_fapl[mt] = H5Pcopy(old_fa->memb_fapl[mt]);
+            if (new_fa->memb_fapl[mt] < 0)
                 nerrors++;
+        }
+        if (old_fa->memb_name[mt]) {
+            new_fa->memb_name[mt] = my_strdup(old_fa->memb_name[mt]);
+            assert(new_fa->memb_name[mt]);
+        }
     }
-    if (old_fa->memb_name[mt]) {
-        new_fa->memb_name[mt] = my_strdup(old_fa->memb_name[mt]);
-        assert(new_fa->memb_name[mt]);
-    }
-    } END_MEMBERS;
+    END_MEMBERS;
 
     if (nerrors) {
-        ALL_MEMBERS(mt) {
-            if (new_fa->memb_fapl[mt]>=0)
+        ALL_MEMBERS(mt)
+        {
+            if (new_fa->memb_fapl[mt] >= 0)
                 (void)H5Pclose(new_fa->memb_fapl[mt]);
             if (new_fa->memb_name[mt])
                 free(new_fa->memb_name[mt]);
-        } END_MEMBERS;
+        }
+        END_MEMBERS;
         free(new_fa);
         H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "invalid freespace objects", NULL)
     }
     return new_fa;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_fapl_free
  *
@@ -944,25 +945,25 @@ H5FD_multi_fapl_copy(const void *_old_fa)
 static herr_t
 H5FD_multi_fapl_free(void *_fa)
 {
-    H5FD_multi_fapl_t    *fa = (H5FD_multi_fapl_t*)_fa;
-    static const char *func="H5FD_multi_fapl_free";  /* Function Name for error reporting */
+    H5FD_multi_fapl_t *fa   = (H5FD_multi_fapl_t *)_fa;
+    static const char *func = "H5FD_multi_fapl_free"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    ALL_MEMBERS(mt) {
-    if (fa->memb_fapl[mt]>=0)
-            if(H5Pclose(fa->memb_fapl[mt])<0)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list", -1)
-    if (fa->memb_name[mt])
-            free(fa->memb_name[mt]);
-    } END_MEMBERS;
+    ALL_MEMBERS(mt)
+    {
+        if (fa->memb_fapl[mt] >= 0)
+            if (H5Pclose(fa->memb_fapl[mt]) < 0)
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list",
+                            -1) if (fa->memb_name[mt]) free(fa->memb_name[mt]);
+    }
+    END_MEMBERS;
     free(fa);
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_open
  *
@@ -980,87 +981,94 @@ H5FD_multi_fapl_free(void *_fa)
  *-------------------------------------------------------------------------
  */
 static H5FD_t *
-H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id,
-        haddr_t maxaddr)
+H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_multi_t    *file=NULL;
-    hid_t        close_fapl=-1;
-    H5FD_multi_fapl_t    *fa;
-    H5FD_mem_t        m;
-    static const char *func="H5FD_multi_open";  /* Function Name for error reporting */
+    H5FD_multi_t *     file       = NULL;
+    hid_t              close_fapl = -1;
+    H5FD_multi_fapl_t *fa;
+    H5FD_mem_t         m;
+    static const char *func = "H5FD_multi_open"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     /* Check arguments */
     if (!name || !*name)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADVALUE, "invalid file name", NULL)
-    if (0==maxaddr || HADDR_UNDEF==maxaddr)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADRANGE, "bogus maxaddr", NULL)
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADVALUE, "invalid file name",
+                    NULL) if (0 == maxaddr || HADDR_UNDEF == maxaddr)
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADRANGE, "bogus maxaddr", NULL)
 
-    /*
-     * Initialize the file from the file access properties, using default
-     * values if necessary.  Make sure to use CALLOC here because the code
-     * in H5FD_multi_set_eoa depends on the proper initialization of memb_eoa
-     * in H5FD_multi_t.
-     */
-    if(NULL == (file = (H5FD_multi_t *)calloc((size_t)1, sizeof(H5FD_multi_t))))
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed", NULL)
-    if(H5P_FILE_ACCESS_DEFAULT==fapl_id || H5FD_MULTI!=H5Pget_driver(fapl_id)) {
-        close_fapl = fapl_id = H5Pcreate(H5P_FILE_ACCESS);
-        if(H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, TRUE)<0)
-            H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error)
-    }
+            /*
+             * Initialize the file from the file access properties, using default
+             * values if necessary.  Make sure to use CALLOC here because the code
+             * in H5FD_multi_set_eoa depends on the proper initialization of memb_eoa
+             * in H5FD_multi_t.
+             */
+            if (NULL == (file = (H5FD_multi_t *)calloc((size_t)1, sizeof(H5FD_multi_t)))) H5Epush_ret(
+                func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed",
+                NULL) if (H5P_FILE_ACCESS_DEFAULT == fapl_id || H5FD_MULTI != H5Pget_driver(fapl_id))
+        {
+            close_fapl = fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+            if (H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, TRUE) < 0)
+                H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error)
+        }
     fa = (H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id);
     assert(fa);
-    ALL_MEMBERS(mt) {
-    file->fa.memb_map[mt] = fa->memb_map[mt];
-    file->fa.memb_addr[mt] = fa->memb_addr[mt];
-    if (fa->memb_fapl[mt]>=0)
-        file->fa.memb_fapl[mt] = H5Pcopy(fa->memb_fapl[mt]);
-    else
-        file->fa.memb_fapl[mt] = fa->memb_fapl[mt];
-    if (fa->memb_name[mt])
-        file->fa.memb_name[mt] = my_strdup(fa->memb_name[mt]);
-    else
-        file->fa.memb_name[mt] = NULL;
-    } END_MEMBERS;
+    ALL_MEMBERS(mt)
+    {
+        file->fa.memb_map[mt]  = fa->memb_map[mt];
+        file->fa.memb_addr[mt] = fa->memb_addr[mt];
+        if (fa->memb_fapl[mt] >= 0)
+            file->fa.memb_fapl[mt] = H5Pcopy(fa->memb_fapl[mt]);
+        else
+            file->fa.memb_fapl[mt] = fa->memb_fapl[mt];
+        if (fa->memb_name[mt])
+            file->fa.memb_name[mt] = my_strdup(fa->memb_name[mt]);
+        else
+            file->fa.memb_name[mt] = NULL;
+    }
+    END_MEMBERS;
     file->fa.relax = fa->relax;
-    file->flags = flags;
-    file->name = my_strdup(name);
-    if (close_fapl>=0)
-        if(H5Pclose(close_fapl)<0)
+    file->flags    = flags;
+    file->name     = my_strdup(name);
+    if (close_fapl >= 0)
+        if (H5Pclose(close_fapl) < 0)
             H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list", error)
 
-    /* Compute derived properties and open member files */
-    if (compute_next(file)<0)
-        H5Epush_goto(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "compute_next() failed", error);
-    if (open_members(file)<0)
+                /* Compute derived properties and open member files */
+                if (compute_next(file) < 0) H5Epush_goto(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE,
+                                                         "compute_next() failed", error);
+    if (open_members(file) < 0)
         H5Epush_goto(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "open_members() failed", error);
 
     /* We must have opened at least the superblock file */
-    if (H5FD_MEM_DEFAULT==(m=file->fa.memb_map[H5FD_MEM_SUPER]))
+    if (H5FD_MEM_DEFAULT == (m = file->fa.memb_map[H5FD_MEM_SUPER]))
         m = H5FD_MEM_SUPER;
-    if (NULL==file->memb[m])
+    if (NULL == file->memb[m])
         goto error;
 
-    return (H5FD_t*)file;
+    return (H5FD_t *)file;
 
 error:
     /* Cleanup and fail */
     if (file) {
-    ALL_MEMBERS(mt) {
-        if (file->memb[mt]) (void)H5FDclose(file->memb[mt]);
-        if (file->fa.memb_fapl[mt]>=0) (void)H5Pclose(file->fa.memb_fapl[mt]);
-        if (file->fa.memb_name[mt]) free(file->fa.memb_name[mt]);
-    } END_MEMBERS;
-    if (file->name) free(file->name);
-    free(file);
+        ALL_MEMBERS(mt)
+        {
+            if (file->memb[mt])
+                (void)H5FDclose(file->memb[mt]);
+            if (file->fa.memb_fapl[mt] >= 0)
+                (void)H5Pclose(file->fa.memb_fapl[mt]);
+            if (file->fa.memb_name[mt])
+                free(file->fa.memb_name[mt]);
+        }
+        END_MEMBERS;
+        if (file->name)
+            free(file->name);
+        free(file);
     }
     return NULL;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_close
  *
@@ -1080,38 +1088,44 @@ error:
 static herr_t
 H5FD_multi_close(H5FD_t *_file)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    int            nerrors=0;
-    static const char *func="H5FD_multi_close";  /* Function Name for error reporting */
+    H5FD_multi_t *     file    = (H5FD_multi_t *)_file;
+    int                nerrors = 0;
+    static const char *func    = "H5FD_multi_close"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     /* Close as many members as possible */
-    ALL_MEMBERS(mt) {
-    if (file->memb[mt]) {
-        if (H5FDclose(file->memb[mt])<0) {
-            nerrors++;
-        } else {
-            file->memb[mt] = NULL;
+    ALL_MEMBERS(mt)
+    {
+        if (file->memb[mt]) {
+            if (H5FDclose(file->memb[mt]) < 0) {
+                nerrors++;
+            }
+            else {
+                file->memb[mt] = NULL;
+            }
         }
     }
-    } END_MEMBERS;
+    END_MEMBERS;
     if (nerrors)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error closing member files", -1)
 
-    /* Clean up other stuff */
-    ALL_MEMBERS(mt) {
-    if (file->fa.memb_fapl[mt]>=0) (void)H5Pclose(file->fa.memb_fapl[mt]);
-    if (file->fa.memb_name[mt]) free(file->fa.memb_name[mt]);
-    } END_MEMBERS;
+            /* Clean up other stuff */
+            ALL_MEMBERS(mt)
+        {
+            if (file->fa.memb_fapl[mt] >= 0)
+                (void)H5Pclose(file->fa.memb_fapl[mt]);
+            if (file->fa.memb_name[mt])
+                free(file->fa.memb_name[mt]);
+        }
+    END_MEMBERS;
 
     free(file->name);
     free(file);
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_cmp
  *
@@ -1134,33 +1148,34 @@ H5FD_multi_close(H5FD_t *_file)
 static int
 H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_multi_t    *f1 = (const H5FD_multi_t*)_f1;
-    const H5FD_multi_t    *f2 = (const H5FD_multi_t*)_f2;
-    H5FD_mem_t        out_mt = H5FD_MEM_DEFAULT;
-    int            cmp=0;
+    const H5FD_multi_t *f1     = (const H5FD_multi_t *)_f1;
+    const H5FD_multi_t *f2     = (const H5FD_multi_t *)_f2;
+    H5FD_mem_t          out_mt = H5FD_MEM_DEFAULT;
+    int                 cmp    = 0;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    ALL_MEMBERS(mt) {
+    ALL_MEMBERS(mt)
+    {
         out_mt = mt;
-    if(f1->memb[mt] && f2->memb[mt])
+        if (f1->memb[mt] && f2->memb[mt])
             break;
-    if(!cmp) {
-        if(f1->memb[mt])
+        if (!cmp) {
+            if (f1->memb[mt])
                 cmp = -1;
-        else if(f2->memb[mt])
+            else if (f2->memb[mt])
                 cmp = 1;
+        }
     }
-    } END_MEMBERS;
-    assert(cmp || out_mt<H5FD_MEM_NTYPES);
-    if(out_mt>=H5FD_MEM_NTYPES)
+    END_MEMBERS;
+    assert(cmp || out_mt < H5FD_MEM_NTYPES);
+    if (out_mt >= H5FD_MEM_NTYPES)
         return cmp;
 
     return H5FDcmp(f1->memb[out_mt], f2->memb[out_mt]);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_query
  *
@@ -1180,19 +1195,18 @@ static herr_t
 H5FD_multi_query(const H5FD_t *_f, unsigned long *flags /* out */)
 {
     /* Shut compiler up */
-    _f=_f;
+    _f = _f;
 
     /* Set the VFL feature flags that this driver supports */
-    if(flags) {
+    if (flags) {
         *flags = 0;
-        *flags |= H5FD_FEAT_DATA_SIEVE;       /* OK to perform data sieving for faster raw data reads & writes */
+        *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */
         *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
-    } /* end if */
+    }                                            /* end if */
 
-    return(0);
+    return (0);
 } /* end H5FD_multi_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_get_type_map
  *
@@ -1209,15 +1223,14 @@ H5FD_multi_query(const H5FD_t *_f, unsigned long *flags /* out */)
 static herr_t
 H5FD_multi_get_type_map(const H5FD_t *_file, H5FD_mem_t *type_map)
 {
-    const H5FD_multi_t    *file = (const H5FD_multi_t*)_file;
+    const H5FD_multi_t *file = (const H5FD_multi_t *)_file;
 
     /* Copy file's free space type mapping */
     memcpy(type_map, file->fa.memb_map, sizeof(file->fa.memb_map));
 
-    return(0);
+    return (0);
 } /* end H5FD_multi_get_type_map() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_get_eoa
  *
@@ -1245,10 +1258,10 @@ H5FD_multi_get_type_map(const H5FD_t *_file, H5FD_mem_t *type_map)
 static haddr_t
 H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
 {
-    const H5FD_multi_t    *file = (const H5FD_multi_t*)_file;
-    haddr_t eoa = 0;
-    haddr_t memb_eoa = 0;
-    static const char *func="H5FD_multi_get_eoa";  /* Function Name for error reporting */
+    const H5FD_multi_t *file     = (const H5FD_multi_t *)_file;
+    haddr_t             eoa      = 0;
+    haddr_t             memb_eoa = 0;
+    static const char * func     = "H5FD_multi_get_eoa"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -1259,61 +1272,65 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
      * Here the code finds the biggest EOA for individual file if
      * the query is for TYPE == H5FD_MEM_DEFAULT.
      */
-    if(H5FD_MEM_DEFAULT == type) {
-        UNIQUE_MEMBERS(file->fa.memb_map, mt) {
-        if (file->memb[mt]) {
+    if (H5FD_MEM_DEFAULT == type) {
+        UNIQUE_MEMBERS(file->fa.memb_map, mt)
+        {
+            if (file->memb[mt]) {
                 /* Retrieve EOA */
-            H5E_BEGIN_TRY {
-                    memb_eoa = H5FDget_eoa(file->memb[mt], mt);
-            } H5E_END_TRY;
+                H5E_BEGIN_TRY { memb_eoa = H5FDget_eoa(file->memb[mt], mt); }
+                H5E_END_TRY;
 
-            if(HADDR_UNDEF == memb_eoa)
-                    H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa", HADDR_UNDEF)
-        } else if (file->fa.relax) {
-            /*
-            * The member is not open yet (maybe it doesn't exist). Make the
-            * best guess about the end-of-file.
-            */
-            memb_eoa = file->memb_next[mt];
-            assert(HADDR_UNDEF != memb_eoa);
-        } else {
+                if (HADDR_UNDEF == memb_eoa)
+                    H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa",
+                                HADDR_UNDEF)
+            }
+            else if (file->fa.relax) {
+                /*
+                 * The member is not open yet (maybe it doesn't exist). Make the
+                 * best guess about the end-of-file.
+                 */
+                memb_eoa = file->memb_next[mt];
+                assert(HADDR_UNDEF != memb_eoa);
+            }
+            else {
                 H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eoa", HADDR_UNDEF)
-        }
+            }
 
-            if(memb_eoa > eoa)
+            if (memb_eoa > eoa)
                 eoa = memb_eoa;
-        } END_MEMBERS;
-    } else {
+        }
+        END_MEMBERS;
+    }
+    else {
         H5FD_mem_t mmt = file->fa.memb_map[type];
 
-        if(H5FD_MEM_DEFAULT == mmt)
+        if (H5FD_MEM_DEFAULT == mmt)
             mmt = type;
 
-    if(file->memb[mmt]) {
-            H5E_BEGIN_TRY {
-            eoa = H5FDget_eoa(file->memb[mmt], mmt);
-            } H5E_END_TRY;
+        if (file->memb[mmt]) {
+            H5E_BEGIN_TRY { eoa = H5FDget_eoa(file->memb[mmt], mmt); }
+            H5E_END_TRY;
 
-        if(HADDR_UNDEF == eoa)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa", HADDR_UNDEF)
-        if(eoa > 0)
-                eoa += file->fa.memb_addr[mmt];
-    } else if(file->fa.relax) {
-        /*
-        * The member is not open yet (maybe it doesn't exist). Make the
-        * best guess about the end-of-file.
-        */
-        eoa = file->memb_next[mmt];
-        assert(HADDR_UNDEF != eoa);
-    } else {
+            if (HADDR_UNDEF == eoa)
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa",
+                            HADDR_UNDEF) if (eoa > 0) eoa += file->fa.memb_addr[mmt];
+        }
+        else if (file->fa.relax) {
+            /*
+             * The member is not open yet (maybe it doesn't exist). Make the
+             * best guess about the end-of-file.
+             */
+            eoa = file->memb_next[mmt];
+            assert(HADDR_UNDEF != eoa);
+        }
+        else {
             H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eoa", HADDR_UNDEF)
-    }
+        }
     }
 
     return eoa;
 } /* end H5FD_multi_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_set_eoa
  *
@@ -1345,16 +1362,16 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
 static herr_t
 H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    H5FD_mem_t        mmt;
-    herr_t        status;
-    static const char *func="H5FD_multi_set_eoa";  /* Function Name for error reporting */
+    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_mem_t         mmt;
+    herr_t             status;
+    static const char *func = "H5FD_multi_set_eoa"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     mmt = file->fa.memb_map[type];
-    if(H5FD_MEM_DEFAULT == mmt)
+    if (H5FD_MEM_DEFAULT == mmt)
         mmt = type;
 
     /* Handle backward compatibility in a quick and simple way.  v1.6 library
@@ -1367,22 +1384,20 @@ H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
      * address, the EOAs of v1.6 and v1.8 files are the same.  It won't cause
      * any trouble.  (Please see Issue 2598 in Jira) SLU - 2011/6/21
      */
-    if(H5FD_MEM_SUPER == type && file->memb_eoa[H5FD_MEM_SUPER] > 0 && eoa > file->memb_eoa[H5FD_MEM_SUPER])
+    if (H5FD_MEM_SUPER == type && file->memb_eoa[H5FD_MEM_SUPER] > 0 && eoa > file->memb_eoa[H5FD_MEM_SUPER])
         return 0;
 
     assert(eoa >= file->fa.memb_addr[mmt]);
     assert(eoa < file->memb_next[mmt]);
 
-    H5E_BEGIN_TRY {
-    status = H5FDset_eoa(file->memb[mmt], mmt, (eoa - file->fa.memb_addr[mmt]));
-    } H5E_END_TRY;
-    if(status < 0)
+    H5E_BEGIN_TRY { status = H5FDset_eoa(file->memb[mmt], mmt, (eoa - file->fa.memb_addr[mmt])); }
+    H5E_END_TRY;
+    if (status < 0)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "member H5FDset_eoa failed", -1)
 
-    return 0;
+            return 0;
 } /* end H5FD_multi_set_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_get_eof
  *
@@ -1403,55 +1418,58 @@ H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
 static haddr_t
 H5FD_multi_get_eof(const H5FD_t *_file)
 {
-    const H5FD_multi_t    *file = (const H5FD_multi_t*)_file;
-    haddr_t        eof=0, tmp_eof;
-    haddr_t        eoa=0, tmp_eoa;
-    static const char *func="H5FD_multi_get_eof";  /* Function Name for error reporting */
+    const H5FD_multi_t *file = (const H5FD_multi_t *)_file;
+    haddr_t             eof  = 0, tmp_eof;
+    haddr_t             eoa  = 0, tmp_eoa;
+    static const char * func = "H5FD_multi_get_eof"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    UNIQUE_MEMBERS(file->fa.memb_map, mt) {
-    if (file->memb[mt]) {
+    UNIQUE_MEMBERS(file->fa.memb_map, mt)
+    {
+        if (file->memb[mt]) {
             /* Retrieve EOF */
-        H5E_BEGIN_TRY {
-        tmp_eof = H5FDget_eof(file->memb[mt]);
-        } H5E_END_TRY;
+            H5E_BEGIN_TRY { tmp_eof = H5FDget_eof(file->memb[mt]); }
+            H5E_END_TRY;
 
-        if (HADDR_UNDEF==tmp_eof)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof", HADDR_UNDEF)
-        if (tmp_eof>0) tmp_eof += file->fa.memb_addr[mt];
+            if (HADDR_UNDEF == tmp_eof)
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof",
+                            HADDR_UNDEF) if (tmp_eof > 0) tmp_eof += file->fa.memb_addr[mt];
 
             /* Retrieve EOA */
-        H5E_BEGIN_TRY {
-        tmp_eoa = H5FDget_eoa(file->memb[mt], mt);
-        } H5E_END_TRY;
-
-        if (HADDR_UNDEF==tmp_eoa)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa", HADDR_UNDEF)
-        if (tmp_eoa>0) tmp_eoa += file->fa.memb_addr[mt];
-    } else if (file->fa.relax) {
-        /*
-        * The member is not open yet (maybe it doesn't exist). Make the
-        * best guess about the end-of-file.
-        */
-        tmp_eof = file->memb_next[mt];
-        assert(HADDR_UNDEF!=tmp_eof);
-
-        tmp_eoa = file->memb_next[mt];
-        assert(HADDR_UNDEF!=tmp_eoa);
-    } else {
+            H5E_BEGIN_TRY { tmp_eoa = H5FDget_eoa(file->memb[mt], mt); }
+            H5E_END_TRY;
+
+            if (HADDR_UNDEF == tmp_eoa)
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa",
+                            HADDR_UNDEF) if (tmp_eoa > 0) tmp_eoa += file->fa.memb_addr[mt];
+        }
+        else if (file->fa.relax) {
+            /*
+             * The member is not open yet (maybe it doesn't exist). Make the
+             * best guess about the end-of-file.
+             */
+            tmp_eof = file->memb_next[mt];
+            assert(HADDR_UNDEF != tmp_eof);
+
+            tmp_eoa = file->memb_next[mt];
+            assert(HADDR_UNDEF != tmp_eoa);
+        }
+        else {
             H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eof", HADDR_UNDEF)
-    }
+        }
 
-    if (tmp_eof>eof) eof = tmp_eof;
-    if (tmp_eoa>eoa) eoa = tmp_eoa;
-    } END_MEMBERS;
+        if (tmp_eof > eof)
+            eof = tmp_eof;
+        if (tmp_eoa > eoa)
+            eoa = tmp_eoa;
+    }
+    END_MEMBERS;
 
     return MAX(eoa, eof);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD_multi_get_handle
  *
@@ -1465,24 +1483,24 @@ H5FD_multi_get_eof(const H5FD_t *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
+H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
 {
-    H5FD_multi_t        *file = (H5FD_multi_t *)_file;
-    H5FD_mem_t          type, mmt;
-    static const char   *func="H5FD_multi_get_handle";  /* Function Name for error reporting */
+    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_mem_t         type, mmt;
+    static const char *func = "H5FD_multi_get_handle"; /* Function Name for error reporting */
 
     /* Get data type for multi driver */
-    if(H5Pget_multi_type(fapl, &type) < 0)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "can't get data type for multi driver", -1)
-    if(type<H5FD_MEM_DEFAULT || type>=H5FD_MEM_NTYPES)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "data type is out of range", -1)
-    mmt = file->fa.memb_map[type];
-    if(H5FD_MEM_DEFAULT==mmt) mmt = type;
+    if (H5Pget_multi_type(fapl, &type) < 0)
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "can't get data type for multi driver",
+                    -1) if (type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "data type is out of range", -1) mmt =
+                file->fa.memb_map[type];
+    if (H5FD_MEM_DEFAULT == mmt)
+        mmt = type;
 
     return (H5FDget_vfd_handle(file->memb[mmt], fapl, file_handle));
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_alloc
  *
@@ -1500,36 +1518,36 @@ H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
 static haddr_t
 H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    H5FD_mem_t        mmt;
-    haddr_t        addr;
-    static const char *func="H5FD_multi_alloc";  /* Function Name for error reporting */
+    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_mem_t         mmt;
+    haddr_t            addr;
+    static const char *func = "H5FD_multi_alloc"; /* Function Name for error reporting */
 
     mmt = file->fa.memb_map[type];
-    if (H5FD_MEM_DEFAULT==mmt) mmt = type;
+    if (H5FD_MEM_DEFAULT == mmt)
+        mmt = type;
 
-    if (HADDR_UNDEF==(addr=H5FDalloc(file->memb[mmt], mmt, dxpl_id, size)))
+    if (HADDR_UNDEF == (addr = H5FDalloc(file->memb[mmt], mmt, dxpl_id, size)))
         H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file can't alloc", HADDR_UNDEF)
-    addr += file->fa.memb_addr[mmt];
+            addr += file->fa.memb_addr[mmt];
 
-/*#ifdef TMP
-    if ( addr + size > file->eoa ) {
+    /*#ifdef TMP
+        if ( addr + size > file->eoa ) {
 
-    if ( H5FD_multi_set_eoa(_file, addr + size) < 0 ) {
+        if ( H5FD_multi_set_eoa(_file, addr + size) < 0 ) {
 
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, \
-            "can't set eoa", HADDR_UNDEF)
-    }
-    }
-#else
-    if ( addr + size > file->eoa )
-    file->eoa = addr + size;
-#endif */
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, \
+                "can't set eoa", HADDR_UNDEF)
+        }
+        }
+    #else
+        if ( addr + size > file->eoa )
+        file->eoa = addr + size;
+    #endif */
 
     return addr;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_free
  *
@@ -1547,21 +1565,21 @@ H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
 static herr_t
 H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    H5FD_mem_t        mmt;
+    H5FD_multi_t *file = (H5FD_multi_t *)_file;
+    H5FD_mem_t    mmt;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     mmt = file->fa.memb_map[type];
-    if (H5FD_MEM_DEFAULT==mmt) mmt = type;
+    if (H5FD_MEM_DEFAULT == mmt)
+        mmt = type;
 
-    assert(addr>=file->fa.memb_addr[mmt]);
-    assert(addr+size<=file->memb_next[mmt]);
-    return H5FDfree(file->memb[mmt], mmt, dxpl_id, addr-file->fa.memb_addr[mmt], size);
+    assert(addr >= file->fa.memb_addr[mmt]);
+    assert(addr + size <= file->memb_next[mmt]);
+    return H5FDfree(file->memb[mmt], mmt, dxpl_id, addr - file->fa.memb_addr[mmt], size);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_read
  *
@@ -1580,40 +1598,38 @@ H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsi
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-    size_t size, void *_buf/*out*/)
+H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *_buf /*out*/)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    H5FD_multi_dxpl_t    dx;
-    htri_t              prop_exists = FALSE;    /* Whether the multi VFD DXPL property already exists */
+    H5FD_multi_t *    file = (H5FD_multi_t *)_file;
+    H5FD_multi_dxpl_t dx;
+    htri_t            prop_exists = FALSE; /* Whether the multi VFD DXPL property already exists */
     H5FD_mem_t        mt, mmt, hi = H5FD_MEM_DEFAULT;
-    haddr_t        start_addr = 0;
+    haddr_t           start_addr = 0;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     /* Find the file to which this address belongs */
-    for(mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
-    mmt = file->fa.memb_map[mt];
-    if(H5FD_MEM_DEFAULT == mmt)
+    for (mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+        mmt = file->fa.memb_map[mt];
+        if (H5FD_MEM_DEFAULT == mmt)
             mmt = mt;
-    assert(mmt > 0 && mmt < H5FD_MEM_NTYPES);
+        assert(mmt > 0 && mmt < H5FD_MEM_NTYPES);
 
-    if(file->fa.memb_addr[mmt] > addr)
+        if (file->fa.memb_addr[mmt] > addr)
             continue;
-    if(file->fa.memb_addr[mmt] >= start_addr) {
-        start_addr = file->fa.memb_addr[mmt];
-        hi = mmt;
-    } /* end if */
-    } /* end for */
+        if (file->fa.memb_addr[mmt] >= start_addr) {
+            start_addr = file->fa.memb_addr[mmt];
+            hi         = mmt;
+        } /* end if */
+    }     /* end for */
     assert(hi > 0);
 
     /* Read from that member */
-    return H5FDread(file->memb[hi], type, (prop_exists ? dx.memb_dxpl[hi] : H5P_DEFAULT),
-            addr - start_addr, size, _buf);
+    return H5FDread(file->memb[hi], type, (prop_exists ? dx.memb_dxpl[hi] : H5P_DEFAULT), addr - start_addr,
+                    size, _buf);
 } /* end H5FD_multi_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_write
  *
@@ -1631,40 +1647,38 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-    size_t size, const void *_buf)
+H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *_buf)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    H5FD_multi_dxpl_t    dx;
-    htri_t              prop_exists = FALSE;    /* Whether the multi VFD DXPL property already exists */
+    H5FD_multi_t *    file = (H5FD_multi_t *)_file;
+    H5FD_multi_dxpl_t dx;
+    htri_t            prop_exists = FALSE; /* Whether the multi VFD DXPL property already exists */
     H5FD_mem_t        mt, mmt, hi = H5FD_MEM_DEFAULT;
-    haddr_t        start_addr = 0;
+    haddr_t           start_addr = 0;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     /* Find the file to which this address belongs */
-    for(mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
-    mmt = file->fa.memb_map[mt];
-    if(H5FD_MEM_DEFAULT == mmt)
+    for (mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+        mmt = file->fa.memb_map[mt];
+        if (H5FD_MEM_DEFAULT == mmt)
             mmt = mt;
-    assert(mmt > 0 && mmt<H5FD_MEM_NTYPES);
+        assert(mmt > 0 && mmt < H5FD_MEM_NTYPES);
 
-    if(file->fa.memb_addr[mmt] > addr)
+        if (file->fa.memb_addr[mmt] > addr)
             continue;
-    if(file->fa.memb_addr[mmt] >= start_addr) {
-        start_addr = file->fa.memb_addr[mmt];
-        hi = mmt;
-    } /* end if */
-    } /* end for */
+        if (file->fa.memb_addr[mmt] >= start_addr) {
+            start_addr = file->fa.memb_addr[mmt];
+            hi         = mmt;
+        } /* end if */
+    }     /* end for */
     assert(hi > 0);
 
     /* Write to that member */
-    return H5FDwrite(file->memb[hi], type, (prop_exists ? dx.memb_dxpl[hi] : H5P_DEFAULT),
-            addr - start_addr, size, _buf);
+    return H5FDwrite(file->memb[hi], type, (prop_exists ? dx.memb_dxpl[hi] : H5P_DEFAULT), addr - start_addr,
+                     size, _buf);
 } /* end H5FD_multi_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_flush
  *
@@ -1682,10 +1696,10 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
 static herr_t
 H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    H5FD_mem_t        mt;
-    int            nerrors=0;
-    static const char *func="H5FD_multi_flush";  /* Function Name for error reporting */
+    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_mem_t         mt;
+    int                nerrors = 0;
+    static const char *func    = "H5FD_multi_flush"; /* Function Name for error reporting */
 
 #if 0
     H5FD_mem_t        mmt;
@@ -1723,20 +1737,22 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
     H5Eclear2(H5E_DEFAULT);
 
     /* Flush each file */
-    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1)) {
-    if (file->memb[mt]) {
-        H5E_BEGIN_TRY {
-        if (H5FDflush(file->memb[mt],dxpl_id,closing)<0) nerrors++;
-        } H5E_END_TRY;
-    }
+    for (mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+        if (file->memb[mt]) {
+            H5E_BEGIN_TRY
+            {
+                if (H5FDflush(file->memb[mt], dxpl_id, closing) < 0)
+                    nerrors++;
+            }
+            H5E_END_TRY;
+        }
     }
     if (nerrors)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error flushing member files", -1)
 
-    return 0;
+            return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_truncate
  *
@@ -1753,30 +1769,31 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
 static herr_t
 H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
 {
-    H5FD_multi_t    *file = (H5FD_multi_t*)_file;
-    H5FD_mem_t        mt;
-    int            nerrors=0;
-    static const char *func="H5FD_multi_truncate";  /* Function Name for error reporting */
+    H5FD_multi_t *     file = (H5FD_multi_t *)_file;
+    H5FD_mem_t         mt;
+    int                nerrors = 0;
+    static const char *func    = "H5FD_multi_truncate"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     /* Truncate each file */
-    for(mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
-    if(file->memb[mt]) {
-        H5E_BEGIN_TRY {
-        if(H5FDtruncate(file->memb[mt], dxpl_id, closing) < 0)
+    for (mt = H5FD_MEM_SUPER; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
+        if (file->memb[mt]) {
+            H5E_BEGIN_TRY
+            {
+                if (H5FDtruncate(file->memb[mt], dxpl_id, closing) < 0)
                     nerrors++;
-        } H5E_END_TRY;
-    }
+            }
+            H5E_END_TRY;
+        }
     }
-    if(nerrors)
+    if (nerrors)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error truncating member files", -1)
 
-    return 0;
+            return 0;
 } /* end H5FD_multi_truncate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    compute_next
  *
@@ -1798,27 +1815,28 @@ compute_next(H5FD_multi_t *file)
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    ALL_MEMBERS(mt) {
-    file->memb_next[mt] = HADDR_UNDEF;
-    } END_MEMBERS;
+    ALL_MEMBERS(mt) { file->memb_next[mt] = HADDR_UNDEF; }
+    END_MEMBERS;
 
-    UNIQUE_MEMBERS(file->fa.memb_map, mt1) {
-    UNIQUE_MEMBERS2(file->fa.memb_map, mt2) {
-        if (file->fa.memb_addr[mt1]<file->fa.memb_addr[mt2] &&
-        (HADDR_UNDEF==file->memb_next[mt1] ||
-        file->memb_next[mt1]>file->fa.memb_addr[mt2])) {
-        file->memb_next[mt1] = file->fa.memb_addr[mt2];
+    UNIQUE_MEMBERS(file->fa.memb_map, mt1)
+    {
+        UNIQUE_MEMBERS2(file->fa.memb_map, mt2)
+        {
+            if (file->fa.memb_addr[mt1] < file->fa.memb_addr[mt2] &&
+                (HADDR_UNDEF == file->memb_next[mt1] || file->memb_next[mt1] > file->fa.memb_addr[mt2])) {
+                file->memb_next[mt1] = file->fa.memb_addr[mt2];
+            }
+        }
+        END_MEMBERS;
+        if (HADDR_UNDEF == file->memb_next[mt1]) {
+            file->memb_next[mt1] = HADDR_MAX; /*last member*/
         }
-    } END_MEMBERS;
-    if (HADDR_UNDEF==file->memb_next[mt1]) {
-        file->memb_next[mt1] = HADDR_MAX; /*last member*/
     }
-    } END_MEMBERS;
+    END_MEMBERS;
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    open_members
  *
@@ -1843,38 +1861,38 @@ H5_GCC_DIAG_OFF("format-nonliteral")
 static int
 open_members(H5FD_multi_t *file)
 {
-    char    tmp[H5FD_MULT_MAX_FILE_NAME_LEN];
-    int        nerrors=0;
-    static const char *func="(H5FD_multi)open_members";  /* Function Name for error reporting */
+    char               tmp[H5FD_MULT_MAX_FILE_NAME_LEN];
+    int                nerrors = 0;
+    static const char *func    = "(H5FD_multi)open_members"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    UNIQUE_MEMBERS(file->fa.memb_map, mt) {
-    if(file->memb[mt])
+    UNIQUE_MEMBERS(file->fa.memb_map, mt)
+    {
+        if (file->memb[mt])
             continue; /*already open*/
-    assert(file->fa.memb_name[mt]);
+        assert(file->fa.memb_name[mt]);
         /* Note: This truncates the user's filename down to only sizeof(tmp)
          *      characters. -QK & JK, 2013/01/17
          */
-    sprintf(tmp, file->fa.memb_name[mt], file->name);
-
-    H5E_BEGIN_TRY {
-        file->memb[mt] = H5FDopen(tmp, file->flags, file->fa.memb_fapl[mt], HADDR_UNDEF);
-    } H5E_END_TRY;
-    if(!file->memb[mt]) {
-        if(!file->fa.relax || (file->flags & H5F_ACC_RDWR))
-        nerrors++;
+        sprintf(tmp, file->fa.memb_name[mt], file->name);
+
+        H5E_BEGIN_TRY { file->memb[mt] = H5FDopen(tmp, file->flags, file->fa.memb_fapl[mt], HADDR_UNDEF); }
+        H5E_END_TRY;
+        if (!file->memb[mt]) {
+            if (!file->fa.relax || (file->flags & H5F_ACC_RDWR))
+                nerrors++;
+        }
     }
-    } END_MEMBERS;
+    END_MEMBERS;
     if (nerrors)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error opening member files", -1)
 
-    return 0;
+            return 0;
 }
 H5_GCC_DIAG_ON("format-nonliteral")
 
-
 #ifdef _H5private_H
 /*
  * This is not related to the functionality of the driver code.
diff --git a/src/H5FDmulti.h b/src/H5FDmulti.h
index 959cc4d..6c6e505 100644
--- a/src/H5FDmulti.h
+++ b/src/H5FDmulti.h
@@ -21,25 +21,22 @@
 #define H5FDmulti_H
 
 #include "H5Ipublic.h"
-#include "H5Ppublic.h"             /* Property lists */
+#include "H5Ppublic.h" /* Property lists */
 #include "H5Fpublic.h"
 
-#define H5FD_MULTI	(H5FD_multi_init())
+#define H5FD_MULTI (H5FD_multi_init())
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-H5_DLL hid_t H5FD_multi_init(void);
-H5_DLL void H5FD_multi_term(void);
-H5_DLL herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
-			 const hid_t *memb_fapl, const char * const *memb_name,
-			 const haddr_t *memb_addr, hbool_t relax);
-H5_DLL herr_t H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
-			 hid_t *memb_fapl/*out*/, char **memb_name/*out*/,
-			 haddr_t *memb_addr/*out*/, hbool_t *relax/*out*/);
-H5_DLL herr_t H5Pset_fapl_split(hid_t fapl, const char *meta_ext,
-			 hid_t meta_plist_id, const char *raw_ext,
-			 hid_t raw_plist_id);
+H5_DLL hid_t  H5FD_multi_init(void);
+H5_DLL void   H5FD_multi_term(void);
+H5_DLL herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_fapl,
+                                const char *const *memb_name, const haddr_t *memb_addr, hbool_t relax);
+H5_DLL herr_t H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl /*out*/,
+                                char **memb_name /*out*/, haddr_t *memb_addr /*out*/, hbool_t *relax /*out*/);
+H5_DLL herr_t H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const char *raw_ext,
+                                hid_t raw_plist_id);
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/H5FDpkg.h b/src/H5FDpkg.h
index 0bacc9c..aef56f9 100644
--- a/src/H5FDpkg.h
+++ b/src/H5FDpkg.h
@@ -27,39 +27,33 @@
 #define _H5FDpkg_H
 
 /* Get package's private header */
-#include "H5FDprivate.h"	/* File drivers				*/
+#include "H5FDprivate.h" /* File drivers				*/
 
 /* Other private headers needed by this file */
-#include "H5FLprivate.h"	/* Free lists                           */
+#include "H5FLprivate.h" /* Free lists                           */
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
-
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
-H5_DLL herr_t H5FD_init(void);
-H5_DLL haddr_t H5FD_alloc_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type,
-    hsize_t size, haddr_t *align_addr, hsize_t *align_size);
-H5_DLL herr_t H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type,
-    haddr_t addr, hsize_t size);
-
+H5_DLL herr_t  H5FD_init(void);
+H5_DLL haddr_t H5FD_alloc_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, hsize_t size,
+                               haddr_t *align_addr, hsize_t *align_size);
+H5_DLL herr_t  H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, hsize_t size);
 
 /* Testing routines */
 #ifdef H5FD_TESTING
 #endif /* H5FD_TESTING */
 
 #endif /* _H5FDpkg_H */
-
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index 75cb145..52d5cf3 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -22,34 +22,33 @@
 #include "H5FDpublic.h"
 
 /* Private headers needed by this file */
-#include "H5Pprivate.h"        /* Property lists            */
+#include "H5Pprivate.h" /* Property lists            */
 
 /*
  * The MPI drivers are needed because there are
  * places where we check for things that aren't handled by these drivers.
  */
-#include "H5FDmpi.h"            /* MPI-based file drivers        */
-
+#include "H5FDmpi.h" /* MPI-based file drivers        */
 
 /**************************/
 /* Library Private Macros */
 /**************************/
 
 /* Length of filename buffer */
-#define H5FD_MAX_FILENAME_LEN      1024
+#define H5FD_MAX_FILENAME_LEN 1024
 
 #ifdef H5_HAVE_PARALLEL
 /* ======== Temporary data transfer properties ======== */
 /* Definitions for memory MPI type property */
-#define H5FD_MPI_XFER_MEM_MPI_TYPE_NAME        "H5FD_mpi_mem_mpi_type"
+#define H5FD_MPI_XFER_MEM_MPI_TYPE_NAME "H5FD_mpi_mem_mpi_type"
 /* Definitions for file MPI type property */
-#define H5FD_MPI_XFER_FILE_MPI_TYPE_NAME       "H5FD_mpi_file_mpi_type"
+#define H5FD_MPI_XFER_FILE_MPI_TYPE_NAME "H5FD_mpi_file_mpi_type"
 
 /* Sub-class the H5FD_class_t to add more specific functions for MPI-based VFDs */
 typedef struct H5FD_class_mpi_t {
-    H5FD_class_t        super;          /* Superclass information & methods */
-    int  (*get_rank)(const H5FD_t *file);     /* Get the MPI rank of a process */
-    int  (*get_size)(const H5FD_t *file);     /* Get the MPI size of a communicator */
+    H5FD_class_t super;                       /* Superclass information & methods */
+    int (*get_rank)(const H5FD_t *file);      /* Get the MPI rank of a process */
+    int (*get_size)(const H5FD_t *file);      /* Get the MPI size of a communicator */
     MPI_Comm (*get_comm)(const H5FD_t *file); /* Get the communicator for a file */
 } H5FD_class_mpi_t;
 #endif
@@ -60,46 +59,44 @@ typedef struct H5FD_class_mpi_t {
 
 /* File operations */
 typedef enum {
-    OP_UNKNOWN = 0,             /* Unknown last file operation */
-    OP_READ = 1,                /* Last file I/O operation was a read */
-    OP_WRITE = 2                /* Last file I/O operation was a write */
+    OP_UNKNOWN = 0, /* Unknown last file operation */
+    OP_READ    = 1, /* Last file I/O operation was a read */
+    OP_WRITE   = 2  /* Last file I/O operation was a write */
 } H5FD_file_op_t;
 
-
 /* Define structure to hold initial file image and other relevant information */
 typedef struct {
-    void *buffer;
-    size_t size;
+    void *                      buffer;
+    size_t                      size;
     H5FD_file_image_callbacks_t callbacks;
 } H5FD_file_image_info_t;
 
 /* Define default file image info */
-#define H5FD_DEFAULT_FILE_IMAGE_INFO { \
-    NULL, /* file image buffer */       \
-    0,    /* buffer size */             \
-    { /* Callbacks */                   \
-        NULL, /* image_malloc */        \
-        NULL, /* image_memcpy */        \
-        NULL, /* image_realloc */       \
-        NULL, /* image_free */          \
-        NULL, /* udata_copy */          \
-        NULL, /* udata_free */          \
-        NULL, /* udata */               \
-    }                                   \
-}
+#define H5FD_DEFAULT_FILE_IMAGE_INFO                                                                         \
+    {                                                                                                        \
+        NULL,         /* file image buffer */                                                                \
+            0,        /* buffer size */                                                                      \
+        {             /* Callbacks */                                                                        \
+            NULL,     /* image_malloc */                                                                     \
+                NULL, /* image_memcpy */                                                                     \
+                NULL, /* image_realloc */                                                                    \
+                NULL, /* image_free */                                                                       \
+                NULL, /* udata_copy */                                                                       \
+                NULL, /* udata_free */                                                                       \
+                NULL, /* udata */                                                                            \
+        }                                                                                                    \
+    }
 
 /* Define structure to hold driver ID & info for FAPLs */
 typedef struct {
-    hid_t driver_id;            /* Driver's ID */
-    const void *driver_info;    /* Driver info, for open callbacks */
+    hid_t       driver_id;   /* Driver's ID */
+    const void *driver_info; /* Driver info, for open callbacks */
 } H5FD_driver_prop_t;
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /******************************/
 /* Library Private Prototypes */
 /******************************/
@@ -108,42 +105,41 @@ typedef struct {
 struct H5P_genplist_t;
 struct H5F_t;
 
-H5_DLL int H5FD_term_interface(void);
+H5_DLL int    H5FD_term_interface(void);
 H5_DLL herr_t H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_addr);
 H5_DLL H5FD_class_t *H5FD_get_class(hid_t id);
-H5_DLL hsize_t H5FD_sb_size(H5FD_t *file);
-H5_DLL herr_t H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf);
-H5_DLL herr_t H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf);
-H5_DLL void *H5FD_fapl_get(H5FD_t *file);
-H5_DLL herr_t H5FD_fapl_open(struct H5P_genplist_t *plist, hid_t driver_id, const void *driver_info);
-H5_DLL herr_t H5FD_fapl_close(hid_t driver_id, void *fapl);
-H5_DLL hid_t H5FD_register(const void *cls, size_t size, hbool_t app_ref);
-H5_DLL H5FD_t *H5FD_open(const char *name, unsigned flags, hid_t fapl_id,
-        haddr_t maxaddr);
-H5_DLL herr_t H5FD_close(H5FD_t *file);
-H5_DLL int H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2);
-H5_DLL haddr_t H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f,
-    hsize_t size, haddr_t *align_addr, hsize_t *align_size);
-H5_DLL herr_t H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f,
-    haddr_t addr, hsize_t size);
-H5_DLL htri_t H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, struct H5F_t *f,
-    haddr_t blk_end, hsize_t extra_requested);
+H5_DLL hsize_t       H5FD_sb_size(H5FD_t *file);
+H5_DLL herr_t        H5FD_sb_encode(H5FD_t *file, char *name /*out*/, uint8_t *buf);
+H5_DLL herr_t        H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf);
+H5_DLL void *        H5FD_fapl_get(H5FD_t *file);
+H5_DLL herr_t        H5FD_fapl_open(struct H5P_genplist_t *plist, hid_t driver_id, const void *driver_info);
+H5_DLL herr_t        H5FD_fapl_close(hid_t driver_id, void *fapl);
+H5_DLL hid_t         H5FD_register(const void *cls, size_t size, hbool_t app_ref);
+H5_DLL H5FD_t *H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+H5_DLL herr_t  H5FD_close(H5FD_t *file);
+H5_DLL int     H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2);
+H5_DLL haddr_t H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f, hsize_t size,
+                          haddr_t *align_addr, hsize_t *align_size);
+H5_DLL herr_t  H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f, haddr_t addr,
+                         hsize_t size);
+H5_DLL htri_t  H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, struct H5F_t *f, haddr_t blk_end,
+                               hsize_t extra_requested);
 H5_DLL haddr_t H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type);
-H5_DLL herr_t H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr);
+H5_DLL herr_t  H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr);
 H5_DLL haddr_t H5FD_get_eof(const H5FD_t *file);
 H5_DLL haddr_t H5FD_get_maxaddr(const H5FD_t *file);
-H5_DLL herr_t H5FD_get_feature_flags(const H5FD_t *file, unsigned long *feature_flags);
-H5_DLL herr_t H5FD_get_fs_type_map(const H5FD_t *file, H5FD_mem_t *type_map);
-H5_DLL herr_t H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type,
-    haddr_t addr, size_t size, void *buf/*out*/);
-H5_DLL herr_t H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type,
-    haddr_t addr, size_t size, const void *buf);
+H5_DLL herr_t  H5FD_get_feature_flags(const H5FD_t *file, unsigned long *feature_flags);
+H5_DLL herr_t  H5FD_get_fs_type_map(const H5FD_t *file, H5FD_mem_t *type_map);
+H5_DLL herr_t  H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size,
+                         void *buf /*out*/);
+H5_DLL herr_t H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size,
+                         const void *buf);
 H5_DLL herr_t H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned closing);
 H5_DLL herr_t H5FD_truncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing);
 H5_DLL herr_t H5FD_lock(H5FD_t *file, hbool_t rw);
 H5_DLL herr_t H5FD_unlock(H5FD_t *file);
 H5_DLL herr_t H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum);
-H5_DLL herr_t H5FD_get_vfd_handle(H5FD_t *file, hid_t fapl, void** file_handle);
+H5_DLL herr_t H5FD_get_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle);
 H5_DLL herr_t H5FD_set_base_addr(H5FD_t *file, haddr_t base_addr);
 H5_DLL haddr_t H5FD_get_base_addr(const H5FD_t *file);
 
@@ -151,24 +147,21 @@ H5_DLL haddr_t H5FD_get_base_addr(const H5FD_t *file);
 #ifdef H5_HAVE_PARALLEL
 /* General routines */
 H5_DLL haddr_t H5FD_mpi_MPIOff_to_haddr(MPI_Offset mpi_off);
-H5_DLL herr_t H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/);
-H5_DLL herr_t H5FD_mpi_comm_info_dup(MPI_Comm comm, MPI_Info info,
-                MPI_Comm *comm_new, MPI_Info *info_new);
-H5_DLL herr_t H5FD_mpi_comm_info_free(MPI_Comm *comm, MPI_Info *info);
+H5_DLL herr_t  H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off /*out*/);
+H5_DLL herr_t  H5FD_mpi_comm_info_dup(MPI_Comm comm, MPI_Info info, MPI_Comm *comm_new, MPI_Info *info_new);
+H5_DLL herr_t  H5FD_mpi_comm_info_free(MPI_Comm *comm, MPI_Info *info);
 #ifdef NOT_YET
 H5_DLL herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file);
 H5_DLL herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file);
 #endif /* NOT_YET */
-H5_DLL herr_t H5FD_mpi_setup_collective(hid_t dxpl_id, MPI_Datatype *btype,
-    MPI_Datatype *ftype);
+H5_DLL herr_t H5FD_mpi_setup_collective(hid_t dxpl_id, MPI_Datatype *btype, MPI_Datatype *ftype);
 H5_DLL herr_t H5FD_set_mpio_atomicity(H5FD_t *file, hbool_t flag);
 H5_DLL herr_t H5FD_get_mpio_atomicity(H5FD_t *file, hbool_t *flag);
 
 /* Driver specific methods */
-H5_DLL int H5FD_mpi_get_rank(const H5FD_t *file);
-H5_DLL int H5FD_mpi_get_size(const H5FD_t *file);
+H5_DLL int      H5FD_mpi_get_rank(const H5FD_t *file);
+H5_DLL int      H5FD_mpi_get_size(const H5FD_t *file);
 H5_DLL MPI_Comm H5FD_mpi_get_comm(const H5FD_t *_file);
 #endif /* H5_HAVE_PARALLEL */
 
 #endif /* !_H5FDprivate_H */
-
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index 819385f..18fcfa2 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -19,13 +19,13 @@
 #define _H5FDpublic_H
 
 #include "H5public.h"
-#include "H5Fpublic.h"        /*for H5F_close_degree_t */
+#include "H5Fpublic.h" /*for H5F_close_degree_t */
 
-#define H5_HAVE_VFL 1 /*define a convenient app feature test*/
-#define H5FD_VFD_DEFAULT 0   /* Default VFL driver value */
+#define H5_HAVE_VFL      1 /*define a convenient app feature test*/
+#define H5FD_VFD_DEFAULT 0 /* Default VFL driver value */
 
 /* Types of allocation requests: see H5Fpublic.h  */
-typedef enum H5F_mem_t    H5FD_mem_t;
+typedef enum H5F_mem_t H5FD_mem_t;
 
 /* Map "fractal heap" header blocks to 'ohdr' type file memory, since its
  * a fair amount of work to add a new kind of file memory and they are similar
@@ -56,8 +56,8 @@ typedef enum H5F_mem_t    H5FD_mem_t;
  *
  *      -QAK
  */
-#define H5FD_MEM_FSPACE_HDR     H5FD_MEM_OHDR
-#define H5FD_MEM_FSPACE_SINFO   H5FD_MEM_LHEAP
+#define H5FD_MEM_FSPACE_HDR   H5FD_MEM_OHDR
+#define H5FD_MEM_FSPACE_SINFO H5FD_MEM_LHEAP
 
 /* Map "shared object header message" master table to 'ohdr' type file memory,
  * since its a fair amount of work to add a new kind of file memory and they are
@@ -69,8 +69,8 @@ typedef enum H5F_mem_t    H5FD_mem_t;
  *
  *      -QAK
  */
-#define H5FD_MEM_SOHM_TABLE     H5FD_MEM_OHDR
-#define H5FD_MEM_SOHM_INDEX     H5FD_MEM_BTREE
+#define H5FD_MEM_SOHM_TABLE H5FD_MEM_OHDR
+#define H5FD_MEM_SOHM_INDEX H5FD_MEM_BTREE
 
 /*
  * A free-list map which maps all types of allocation requests to a single
@@ -79,125 +79,128 @@ typedef enum H5F_mem_t    H5FD_mem_t;
  * want to make most efficient reuse of freed memory.  The use of the
  * H5FD_MEM_SUPER free list is arbitrary.
  */
-#define H5FD_FLMAP_SINGLE {                              \
-    H5FD_MEM_SUPER,            /*default*/                  \
-    H5FD_MEM_SUPER,            /*super*/                  \
-    H5FD_MEM_SUPER,            /*btree*/                  \
-    H5FD_MEM_SUPER,            /*draw*/                  \
-    H5FD_MEM_SUPER,            /*gheap*/                  \
-    H5FD_MEM_SUPER,            /*lheap*/                  \
-    H5FD_MEM_SUPER            /*ohdr*/                  \
-}
+#define H5FD_FLMAP_SINGLE                                                                                    \
+    {                                                                                                        \
+        H5FD_MEM_SUPER,     /*default*/                                                                      \
+            H5FD_MEM_SUPER, /*super*/                                                                        \
+            H5FD_MEM_SUPER, /*btree*/                                                                        \
+            H5FD_MEM_SUPER, /*draw*/                                                                         \
+            H5FD_MEM_SUPER, /*gheap*/                                                                        \
+            H5FD_MEM_SUPER, /*lheap*/                                                                        \
+            H5FD_MEM_SUPER  /*ohdr*/                                                                         \
+    }
 
 /*
  * A free-list map which segregates requests into `raw' or `meta' data
  * pools.
  */
-#define H5FD_FLMAP_DICHOTOMY {                              \
-    H5FD_MEM_SUPER,            /*default*/                  \
-    H5FD_MEM_SUPER,            /*super*/                  \
-    H5FD_MEM_SUPER,            /*btree*/                  \
-    H5FD_MEM_DRAW,            /*draw*/                  \
-    H5FD_MEM_DRAW,            /*gheap*/                  \
-    H5FD_MEM_SUPER,            /*lheap*/                  \
-    H5FD_MEM_SUPER            /*ohdr*/                  \
-}
+#define H5FD_FLMAP_DICHOTOMY                                                                                 \
+    {                                                                                                        \
+        H5FD_MEM_SUPER,     /*default*/                                                                      \
+            H5FD_MEM_SUPER, /*super*/                                                                        \
+            H5FD_MEM_SUPER, /*btree*/                                                                        \
+            H5FD_MEM_DRAW,  /*draw*/                                                                         \
+            H5FD_MEM_DRAW,  /*gheap*/                                                                        \
+            H5FD_MEM_SUPER, /*lheap*/                                                                        \
+            H5FD_MEM_SUPER  /*ohdr*/                                                                         \
+    }
 
 /*
  * The default free list map which causes each request type to use it's own
  * free-list.
  */
-#define H5FD_FLMAP_DEFAULT {                              \
-    H5FD_MEM_DEFAULT,            /*default*/                  \
-    H5FD_MEM_DEFAULT,            /*super*/                  \
-    H5FD_MEM_DEFAULT,            /*btree*/                  \
-    H5FD_MEM_DEFAULT,            /*draw*/                  \
-    H5FD_MEM_DEFAULT,            /*gheap*/                  \
-    H5FD_MEM_DEFAULT,            /*lheap*/                  \
-    H5FD_MEM_DEFAULT            /*ohdr*/                  \
-}
-
+#define H5FD_FLMAP_DEFAULT                                                                                   \
+    {                                                                                                        \
+        H5FD_MEM_DEFAULT,     /*default*/                                                                    \
+            H5FD_MEM_DEFAULT, /*super*/                                                                      \
+            H5FD_MEM_DEFAULT, /*btree*/                                                                      \
+            H5FD_MEM_DEFAULT, /*draw*/                                                                       \
+            H5FD_MEM_DEFAULT, /*gheap*/                                                                      \
+            H5FD_MEM_DEFAULT, /*lheap*/                                                                      \
+            H5FD_MEM_DEFAULT  /*ohdr*/                                                                       \
+    }
 
 /* Define VFL driver features that can be enabled on a per-driver basis */
 /* These are returned with the 'query' function pointer in H5FD_class_t */
-    /*
-     * Defining the H5FD_FEAT_AGGREGATE_METADATA for a VFL driver means that
-     * the library will attempt to allocate a larger block for metadata and
-     * then sub-allocate each metadata request from that larger block.
-     */
-#define H5FD_FEAT_AGGREGATE_METADATA    0x00000001
-    /*
-     * Defining the H5FD_FEAT_ACCUMULATE_METADATA for a VFL driver means that
-     * the library will attempt to cache metadata as it is written to the file
-     * and build up a larger block of metadata to eventually pass to the VFL
-     * 'write' routine.
-     *
-     * Distinguish between updating the metadata accumulator on writes and
-     * reads.  This is particularly (perhaps only, even) important for MPI-I/O
-     * where we guarantee that writes are collective, but reads may not be.
-     * If we were to allow the metadata accumulator to be written during a
-     * read operation, the application would hang.
-     */
-#define H5FD_FEAT_ACCUMULATE_METADATA_WRITE     0x00000002
-#define H5FD_FEAT_ACCUMULATE_METADATA_READ      0x00000004
-#define H5FD_FEAT_ACCUMULATE_METADATA   (H5FD_FEAT_ACCUMULATE_METADATA_WRITE|H5FD_FEAT_ACCUMULATE_METADATA_READ)
-    /*
-     * Defining the H5FD_FEAT_DATA_SIEVE for a VFL driver means that
-     * the library will attempt to cache raw data as it is read from/written to
-     * a file in a "data seive" buffer.  See Rajeev Thakur's papers:
-     *  http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps.gz
-     *  http://www.mcs.anl.gov/~thakur/papers/mpio-high-perf.ps.gz
-     */
-#define H5FD_FEAT_DATA_SIEVE            0x00000008
-    /*
-     * Defining the H5FD_FEAT_AGGREGATE_SMALLDATA for a VFL driver means that
-     * the library will attempt to allocate a larger block for "small" raw data
-     * and then sub-allocate "small" raw data requests from that larger block.
-     */
-#define H5FD_FEAT_AGGREGATE_SMALLDATA   0x00000010
-    /*
-     * Defining the H5FD_FEAT_IGNORE_DRVRINFO for a VFL driver means that
-     * the library will ignore the driver info that is encoded in the file
-     * for the VFL driver.  (This will cause the driver info to be eliminated
-     * from the file when it is flushed/closed, if the file is opened R/W).
-     */
-#define H5FD_FEAT_IGNORE_DRVRINFO       0x00000020
-    /*
-     * Defining the H5FD_FEAT_DIRTY_SBLK_LOAD for a VFL driver means that
-     * the library will mark the superblock dirty when the file is opened
-     * R/W.  This will cause the driver info to be re-encoded when the file
-     * is flushed/closed.
-     */
-#define H5FD_FEAT_DIRTY_SBLK_LOAD       0x00000040
-    /*
-     * Defining the H5FD_FEAT_POSIX_COMPAT_HANDLE for a VFL driver means that
-     * the handle for the VFD (returned with the 'get_handle' callback) is
-     * of type 'int' and is compatible with POSIX I/O calls.
-     */
-#define H5FD_FEAT_POSIX_COMPAT_HANDLE   0x00000080
-    /*
-     * Defining the H5FD_FEAT_HAS_MPI for a VFL driver means that
-     * the driver makes use of MPI communication and code may retrieve
-     * communicator/rank information from it
-     */
-#define H5FD_FEAT_HAS_MPI               0x00000100
-    /*
-     * Defining the H5FD_FEAT_ALLOCATE_EARLY for a VFL driver will force
-     * the library to use the H5D_ALLOC_TIME_EARLY on dataset create
-     * instead of the default H5D_ALLOC_TIME_LATE
-     */
-#define H5FD_FEAT_ALLOCATE_EARLY        0x00000200
-    /*
-     * Defining the H5FD_FEAT_ALLOW_FILE_IMAGE for a VFL driver means that
-     * the driver is able to use a file image in the fapl as the initial
-     * contents of a file.
-     */
-#define H5FD_FEAT_ALLOW_FILE_IMAGE      0x00000400
-    /*
-     * Defining the H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS for a VFL driver
-     * means that the driver is able to use callbacks to make a copy of the
-     * image to store in memory.
-     */
+/*
+ * Defining the H5FD_FEAT_AGGREGATE_METADATA for a VFL driver means that
+ * the library will attempt to allocate a larger block for metadata and
+ * then sub-allocate each metadata request from that larger block.
+ */
+#define H5FD_FEAT_AGGREGATE_METADATA 0x00000001
+/*
+ * Defining the H5FD_FEAT_ACCUMULATE_METADATA for a VFL driver means that
+ * the library will attempt to cache metadata as it is written to the file
+ * and build up a larger block of metadata to eventually pass to the VFL
+ * 'write' routine.
+ *
+ * Distinguish between updating the metadata accumulator on writes and
+ * reads.  This is particularly (perhaps only, even) important for MPI-I/O
+ * where we guarantee that writes are collective, but reads may not be.
+ * If we were to allow the metadata accumulator to be written during a
+ * read operation, the application would hang.
+ */
+#define H5FD_FEAT_ACCUMULATE_METADATA_WRITE 0x00000002
+#define H5FD_FEAT_ACCUMULATE_METADATA_READ  0x00000004
+#define H5FD_FEAT_ACCUMULATE_METADATA                                                                        \
+    (H5FD_FEAT_ACCUMULATE_METADATA_WRITE | H5FD_FEAT_ACCUMULATE_METADATA_READ)
+/*
+ * Defining the H5FD_FEAT_DATA_SIEVE for a VFL driver means that
+ * the library will attempt to cache raw data as it is read from/written to
+ * a file in a "data seive" buffer.  See Rajeev Thakur's papers:
+ *  http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps.gz
+ *  http://www.mcs.anl.gov/~thakur/papers/mpio-high-perf.ps.gz
+ */
+#define H5FD_FEAT_DATA_SIEVE 0x00000008
+/*
+ * Defining the H5FD_FEAT_AGGREGATE_SMALLDATA for a VFL driver means that
+ * the library will attempt to allocate a larger block for "small" raw data
+ * and then sub-allocate "small" raw data requests from that larger block.
+ */
+#define H5FD_FEAT_AGGREGATE_SMALLDATA 0x00000010
+/*
+ * Defining the H5FD_FEAT_IGNORE_DRVRINFO for a VFL driver means that
+ * the library will ignore the driver info that is encoded in the file
+ * for the VFL driver.  (This will cause the driver info to be eliminated
+ * from the file when it is flushed/closed, if the file is opened R/W).
+ */
+#define H5FD_FEAT_IGNORE_DRVRINFO 0x00000020
+/*
+ * Defining the H5FD_FEAT_DIRTY_SBLK_LOAD for a VFL driver means that
+ * the library will mark the superblock dirty when the file is opened
+ * R/W.  This will cause the driver info to be re-encoded when the file
+ * is flushed/closed.
+ */
+#define H5FD_FEAT_DIRTY_SBLK_LOAD 0x00000040
+/*
+ * Defining the H5FD_FEAT_POSIX_COMPAT_HANDLE for a VFL driver means that
+ * the handle for the VFD (returned with the 'get_handle' callback) is
+ * of type 'int' and is compatible with POSIX I/O calls.
+ */
+#define H5FD_FEAT_POSIX_COMPAT_HANDLE 0x00000080
+/*
+ * Defining the H5FD_FEAT_HAS_MPI for a VFL driver means that
+ * the driver makes use of MPI communication and code may retrieve
+ * communicator/rank information from it
+ */
+#define H5FD_FEAT_HAS_MPI 0x00000100
+/*
+ * Defining the H5FD_FEAT_ALLOCATE_EARLY for a VFL driver will force
+ * the library to use the H5D_ALLOC_TIME_EARLY on dataset create
+ * instead of the default H5D_ALLOC_TIME_LATE
+ */
+#define H5FD_FEAT_ALLOCATE_EARLY 0x00000200
+/*
+ * Defining the H5FD_FEAT_ALLOW_FILE_IMAGE for a VFL driver means that
+ * the driver is able to use a file image in the fapl as the initial
+ * contents of a file.
+ */
+#define H5FD_FEAT_ALLOW_FILE_IMAGE 0x00000400
+/*
+ * Defining the H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS for a VFL driver
+ * means that the driver is able to use callbacks to make a copy of the
+ * image to store in memory.
+ */
 #define H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS 0x00000800
 
 /* Forward declaration */
@@ -205,49 +208,44 @@ typedef struct H5FD_t H5FD_t;
 
 /* Class information for each file driver */
 typedef struct H5FD_class_t {
-    const char *name;
-    haddr_t maxaddr;
+    const char *       name;
+    haddr_t            maxaddr;
     H5F_close_degree_t fc_degree;
     hsize_t (*sb_size)(H5FD_t *file);
-    herr_t  (*sb_encode)(H5FD_t *file, char *name/*out*/,
-                         unsigned char *p/*out*/);
-    herr_t  (*sb_decode)(H5FD_t *f, const char *name, const unsigned char *p);
-    size_t  fapl_size;
-    void *  (*fapl_get)(H5FD_t *file);
-    void *  (*fapl_copy)(const void *fapl);
-    herr_t  (*fapl_free)(void *fapl);
-    size_t  dxpl_size;
-    void *  (*dxpl_copy)(const void *dxpl);
-    herr_t  (*dxpl_free)(void *dxpl);
-    H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl,
-                    haddr_t maxaddr);
-    herr_t  (*close)(H5FD_t *file);
-    int     (*cmp)(const H5FD_t *f1, const H5FD_t *f2);
-    herr_t  (*query)(const H5FD_t *f1, unsigned long *flags);
-    herr_t  (*get_type_map)(const H5FD_t *file, H5FD_mem_t *type_map);
+    herr_t (*sb_encode)(H5FD_t *file, char *name /*out*/, unsigned char *p /*out*/);
+    herr_t (*sb_decode)(H5FD_t *f, const char *name, const unsigned char *p);
+    size_t fapl_size;
+    void *(*fapl_get)(H5FD_t *file);
+    void *(*fapl_copy)(const void *fapl);
+    herr_t (*fapl_free)(void *fapl);
+    size_t dxpl_size;
+    void *(*dxpl_copy)(const void *dxpl);
+    herr_t (*dxpl_free)(void *dxpl);
+    H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr);
+    herr_t (*close)(H5FD_t *file);
+    int (*cmp)(const H5FD_t *f1, const H5FD_t *f2);
+    herr_t (*query)(const H5FD_t *f1, unsigned long *flags);
+    herr_t (*get_type_map)(const H5FD_t *file, H5FD_mem_t *type_map);
     haddr_t (*alloc)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
-    herr_t  (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id,
-                    haddr_t addr, hsize_t size);
+    herr_t (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size);
     haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type);
-    herr_t  (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr);
+    herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr);
     haddr_t (*get_eof)(const H5FD_t *file);
-    herr_t  (*get_handle)(H5FD_t *file, hid_t fapl, void**file_handle);
-    herr_t  (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl,
-                    haddr_t addr, size_t size, void *buffer);
-    herr_t  (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl,
-                     haddr_t addr, size_t size, const void *buffer);
-    herr_t  (*flush)(H5FD_t *file, hid_t dxpl_id, unsigned closing);
-    herr_t  (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing);
-    herr_t  (*lock)(H5FD_t *file, hbool_t last);
-    herr_t  (*unlock)(H5FD_t *file);
+    herr_t (*get_handle)(H5FD_t *file, hid_t fapl, void **file_handle);
+    herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer);
+    herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer);
+    herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, unsigned closing);
+    herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing);
+    herr_t (*lock)(H5FD_t *file, hbool_t last);
+    herr_t (*unlock)(H5FD_t *file);
     H5FD_mem_t fl_map[H5FD_MEM_NTYPES];
 } H5FD_class_t;
 
 /* A free list is a singly-linked list of address/size pairs. */
 typedef struct H5FD_free_t {
-    haddr_t        addr;
-    hsize_t        size;
-    struct H5FD_free_t    *next;
+    haddr_t             addr;
+    hsize_t             size;
+    struct H5FD_free_t *next;
 } H5FD_free_t;
 
 /*
@@ -255,16 +253,16 @@ typedef struct H5FD_free_t {
  * are declared here and the driver appends private fields in memory.
  */
 struct H5FD_t {
-    hid_t               driver_id;      /*driver ID for this file   */
-    const H5FD_class_t *cls;            /*constant class info       */
-    unsigned long       fileno;         /* File 'serial' number     */
-    unsigned long       feature_flags;  /* VFL Driver feature Flags */
-    haddr_t             maxaddr;        /* For this file, overrides class */
-    haddr_t             base_addr;      /* Base address for HDF5 data w/in file */
+    hid_t               driver_id;     /*driver ID for this file   */
+    const H5FD_class_t *cls;           /*constant class info       */
+    unsigned long       fileno;        /* File 'serial' number     */
+    unsigned long       feature_flags; /* VFL Driver feature Flags */
+    haddr_t             maxaddr;       /* For this file, overrides class */
+    haddr_t             base_addr;     /* Base address for HDF5 data w/in file */
 
     /* Space allocation management fields */
-    hsize_t             threshold;      /* Threshold for alignment  */
-    hsize_t             alignment;      /* Allocation alignment     */
+    hsize_t threshold; /* Threshold for alignment  */
+    hsize_t alignment; /* Allocation alignment     */
 };
 
 /* Define enum for the source of file image callbacks */
@@ -281,16 +279,13 @@ typedef enum {
 
 /* Define structure to hold file image callbacks */
 typedef struct {
-    void   *(*image_malloc)(size_t size, H5FD_file_image_op_t file_image_op,
-                            void *udata);
-    void   *(*image_memcpy)(void *dest, const void *src, size_t size,
-                            H5FD_file_image_op_t file_image_op, void *udata);
-    void   *(*image_realloc)(void *ptr, size_t size,
-                            H5FD_file_image_op_t file_image_op, void *udata);
-    herr_t  (*image_free)(void *ptr, H5FD_file_image_op_t file_image_op,
+    void *(*image_malloc)(size_t size, H5FD_file_image_op_t file_image_op, void *udata);
+    void *(*image_memcpy)(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op,
                           void *udata);
-    void   *(*udata_copy)(void *udata);
-    herr_t  (*udata_free)(void *udata);
+    void *(*image_realloc)(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *udata);
+    herr_t (*image_free)(void *ptr, H5FD_file_image_op_t file_image_op, void *udata);
+    void *(*udata_copy)(void *udata);
+    herr_t (*udata_free)(void *udata);
     void *udata;
 } H5FD_file_image_callbacks_t;
 
@@ -299,34 +294,30 @@ extern "C" {
 #endif
 
 /* Function prototypes */
-H5_DLL hid_t H5FDregister(const H5FD_class_t *cls);
+H5_DLL hid_t  H5FDregister(const H5FD_class_t *cls);
 H5_DLL herr_t H5FDunregister(hid_t driver_id);
-H5_DLL H5FD_t *H5FDopen(const char *name, unsigned flags, hid_t fapl_id,
-                        haddr_t maxaddr);
-H5_DLL herr_t H5FDclose(H5FD_t *file);
-H5_DLL int H5FDcmp(const H5FD_t *f1, const H5FD_t *f2);
-H5_DLL int H5FDquery(const H5FD_t *f, unsigned long *flags);
+H5_DLL H5FD_t *H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+H5_DLL herr_t  H5FDclose(H5FD_t *file);
+H5_DLL int     H5FDcmp(const H5FD_t *f1, const H5FD_t *f2);
+H5_DLL int     H5FDquery(const H5FD_t *f, unsigned long *flags);
 H5_DLL haddr_t H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
-H5_DLL herr_t H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id,
-                       haddr_t addr, hsize_t size);
+H5_DLL herr_t  H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size);
 H5_DLL haddr_t H5FDget_eoa(H5FD_t *file, H5FD_mem_t type);
-H5_DLL herr_t H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t eoa);
+H5_DLL herr_t  H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t eoa);
 H5_DLL haddr_t H5FDget_eof(H5FD_t *file);
-H5_DLL herr_t H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void**file_handle);
-H5_DLL herr_t H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id,
-                       haddr_t addr, size_t size, void *buf/*out*/);
-H5_DLL herr_t H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id,
-                        haddr_t addr, size_t size, const void *buf);
-H5_DLL herr_t H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing);
-H5_DLL herr_t H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing);
+H5_DLL herr_t  H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle);
+H5_DLL herr_t  H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                        void *buf /*out*/);
+H5_DLL herr_t  H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                         const void *buf);
+H5_DLL herr_t  H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing);
+H5_DLL herr_t  H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing);
 /* H5_DLL herr_t H5FDlock(H5FD_t *file, hbool_t rw);
 H5_DLL herr_t H5FDunlock(H5FD_t *file); */
 /* Allows querying a VFD ID for features before the file is opened */
-H5_DLL herr_t H5FDdriver_query(hid_t driver_id, unsigned long *flags/*out*/);
-
+H5_DLL herr_t H5FDdriver_query(hid_t driver_id, unsigned long *flags /*out*/);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index 3deca7c..002b858 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -21,19 +21,18 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC  H5FD_ros3_init_interface
-
-
-#include "H5private.h"      /* Generic Functions        */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5Fprivate.h"     /* File access              */
-#include "H5FDprivate.h"    /* File drivers             */
-#include "H5FDros3.h"       /* ros3 file driver         */
-#include "H5FLprivate.h"    /* Free Lists               */
-#include "H5Iprivate.h"     /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management        */
-#include "H5Pprivate.h"     /* Property lists           */
-#include "H5FDs3comms.h"    /* S3 Communications        */
+#define H5_INTERFACE_INIT_FUNC H5FD_ros3_init_interface
+
+#include "H5private.h"   /* Generic Functions        */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5Fprivate.h"  /* File access              */
+#include "H5FDprivate.h" /* File drivers             */
+#include "H5FDros3.h"    /* ros3 file driver         */
+#include "H5FLprivate.h" /* Free Lists               */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Pprivate.h"  /* Property lists           */
+#include "H5FDs3comms.h" /* S3 Communications        */
 
 #ifdef H5_HAVE_ROS3_VFD
 
@@ -64,29 +63,27 @@ static hid_t H5FD_ROS3_g = 0;
  * 2^(10+(1*16)) = 2^26 = 64MB
  *     Reads of 64MB or greater fall in "overflow" bin[BIN_COUNT]
  */
-#define ROS3_STATS_BASE         2
-#define ROS3_STATS_INTERVAL     1
+#define ROS3_STATS_BASE        2
+#define ROS3_STATS_INTERVAL    1
 #define ROS3_STATS_START_POWER 10
 #define ROS3_STATS_BIN_COUNT   16 /* MUST BE GREATER THAN 0 */
 
-
 /*
  * Calculate `BASE ^ (START_POWER + (INTERVAL * bin_i))`
  * Stores result at `(unsigned long long *) out_ptr`.
  * Used in computing boundaries between stats bins.
  */
-#define ROS3_STATS_POW(bin_i, out_ptr) {                       \
-    unsigned long long donotshadowresult = 1;                  \
-    unsigned           donotshadowindex  = 0;                  \
-    for (donotshadowindex = 0;                                 \
-         donotshadowindex < (((bin_i) * ROS3_STATS_INTERVAL) + \
-                              ROS3_STATS_START_POWER);         \
-         donotshadowindex++)                                   \
-    {                                                          \
-        donotshadowresult *= ROS3_STATS_BASE;                  \
-    }                                                          \
-    *(out_ptr) = donotshadowresult;                            \
-}
+#define ROS3_STATS_POW(bin_i, out_ptr)                                                                       \
+    {                                                                                                        \
+        unsigned long long donotshadowresult = 1;                                                            \
+        unsigned           donotshadowindex  = 0;                                                            \
+        for (donotshadowindex = 0;                                                                           \
+             donotshadowindex < (((bin_i)*ROS3_STATS_INTERVAL) + ROS3_STATS_START_POWER);                    \
+             donotshadowindex++) {                                                                           \
+            donotshadowresult *= ROS3_STATS_BASE;                                                            \
+        }                                                                                                    \
+        *(out_ptr) = donotshadowresult;                                                                      \
+    }
 
 /* array to hold pre-computed boundaries for stats bins
  */
@@ -193,13 +190,13 @@ typedef struct {
  *
  ***************************************************************************/
 typedef struct H5FD_ros3_t {
-    H5FD_t            pub;
-    H5FD_ros3_fapl_t  fa;
-    haddr_t           eoa;
-    s3r_t            *s3r_handle;
+    H5FD_t           pub;
+    H5FD_ros3_fapl_t fa;
+    haddr_t          eoa;
+    s3r_t *          s3r_handle;
 #if ROS3_STATS
-    ros3_statsbin    meta[ROS3_STATS_BIN_COUNT + 1];
-    ros3_statsbin    raw[ROS3_STATS_BIN_COUNT + 1];
+    ros3_statsbin meta[ROS3_STATS_BIN_COUNT + 1];
+    ros3_statsbin raw[ROS3_STATS_BIN_COUNT + 1];
 #endif
 } H5FD_ros3_t;
 
@@ -213,69 +210,67 @@ typedef struct H5FD_ros3_t {
  *                  Only included if it may be used -- ROS3 VFD is enabled.
  *
  */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
-#define ADDR_OVERFLOW(A)    (HADDR_UNDEF==(A) || ((A) & ~(haddr_t)MAXADDR))
+#define MAXADDR          (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
 
 /* Prototypes */
-static H5FD_t *H5FD_ros3_open(const char *name, unsigned flags, hid_t fapl_id,
-                              haddr_t maxaddr);
+static H5FD_t *H5FD_ros3_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
 static herr_t  H5FD_ros3_close(H5FD_t *_file);
 static int     H5FD_ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
 static herr_t  H5FD_ros3_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD_ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
 static herr_t  H5FD_ros3_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD_ros3_get_eof(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t  H5FD_ros3_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t  H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
-                               haddr_t addr, size_t size, void *buf);
-static herr_t  H5FD_ros3_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
-                               haddr_t addr, size_t size, const void *buf);
+static herr_t  H5FD_ros3_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                              void *buf);
+static herr_t  H5FD_ros3_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                               const void *buf);
 static herr_t  H5FD_ros3_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 static herr_t  H5FD_ros3_lock(H5FD_t *_file, hbool_t rw);
 static herr_t  H5FD_ros3_unlock(H5FD_t *_file);
-static herr_t  H5FD_ros3_validate_config(const H5FD_ros3_fapl_t * fa);
-static void   *H5FD_ros3_fapl_get(H5FD_t *_file);
-static void   *H5FD_ros3_fapl_copy(const void *_old_fa);
+static herr_t  H5FD_ros3_validate_config(const H5FD_ros3_fapl_t *fa);
+static void *  H5FD_ros3_fapl_get(H5FD_t *_file);
+static void *  H5FD_ros3_fapl_copy(const void *_old_fa);
 static herr_t  H5FD_ros3_fapl_free(void *_fa);
 
 static const H5FD_class_t H5FD_ros3_g = {
-    "ros3",                     /* name                 */
-    MAXADDR,                    /* maxaddr              */
-    H5F_CLOSE_WEAK,             /* fc_degree            */
-    NULL,                       /* sb_size              */
-    NULL,                       /* sb_encode            */
-    NULL,                       /* sb_decode            */
-    sizeof(H5FD_ros3_fapl_t),   /* fapl_size            */
-    H5FD_ros3_fapl_get,         /* fapl_get             */
-    H5FD_ros3_fapl_copy,        /* fapl_copy            */
-    H5FD_ros3_fapl_free,        /* fapl_free            */
-    0,                          /* dxpl_size            */
-    NULL,                       /* dxpl_copy            */
-    NULL,                       /* dxpl_free            */
-    H5FD_ros3_open,             /* open                 */
-    H5FD_ros3_close,            /* close                */
-    H5FD_ros3_cmp,              /* cmp                  */
-    H5FD_ros3_query,            /* query                */
-    NULL,                       /* get_type_map         */
-    NULL,                       /* alloc                */
-    NULL,                       /* free                 */
-    H5FD_ros3_get_eoa,          /* get_eoa              */
-    H5FD_ros3_set_eoa,          /* set_eoa              */
-    H5FD_ros3_get_eof,          /* get_eof              */
-    H5FD_ros3_get_handle,       /* get_handle           */
-    H5FD_ros3_read,             /* read                 */
-    H5FD_ros3_write,            /* write                */
-    NULL,                       /* flush                */
-    H5FD_ros3_truncate,         /* truncate             */
-    H5FD_ros3_lock,             /* lock                 */
-    H5FD_ros3_unlock,           /* unlock               */
-    H5FD_FLMAP_DICHOTOMY        /* fl_map               */
+    "ros3",                   /* name                 */
+    MAXADDR,                  /* maxaddr              */
+    H5F_CLOSE_WEAK,           /* fc_degree            */
+    NULL,                     /* sb_size              */
+    NULL,                     /* sb_encode            */
+    NULL,                     /* sb_decode            */
+    sizeof(H5FD_ros3_fapl_t), /* fapl_size            */
+    H5FD_ros3_fapl_get,       /* fapl_get             */
+    H5FD_ros3_fapl_copy,      /* fapl_copy            */
+    H5FD_ros3_fapl_free,      /* fapl_free            */
+    0,                        /* dxpl_size            */
+    NULL,                     /* dxpl_copy            */
+    NULL,                     /* dxpl_free            */
+    H5FD_ros3_open,           /* open                 */
+    H5FD_ros3_close,          /* close                */
+    H5FD_ros3_cmp,            /* cmp                  */
+    H5FD_ros3_query,          /* query                */
+    NULL,                     /* get_type_map         */
+    NULL,                     /* alloc                */
+    NULL,                     /* free                 */
+    H5FD_ros3_get_eoa,        /* get_eoa              */
+    H5FD_ros3_set_eoa,        /* set_eoa              */
+    H5FD_ros3_get_eof,        /* get_eof              */
+    H5FD_ros3_get_handle,     /* get_handle           */
+    H5FD_ros3_read,           /* read                 */
+    H5FD_ros3_write,          /* write                */
+    NULL,                     /* flush                */
+    H5FD_ros3_truncate,       /* truncate             */
+    H5FD_ros3_lock,           /* lock                 */
+    H5FD_ros3_unlock,         /* unlock               */
+    H5FD_FLMAP_DICHOTOMY      /* fl_map               */
 };
 
 /* Declare a free list to manage the H5FD_ros3_t struct */
 H5FL_DEFINE_STATIC(H5FD_ros3_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_ros3_init_interface
  *
@@ -294,7 +289,6 @@ H5FD_ros3_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_ros3_init())
 } /* H5FD_ros3_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_ros3_init
  *
@@ -311,7 +305,7 @@ H5FD_ros3_init_interface(void)
 hid_t
 H5FD_ros3_init(void)
 {
-    hid_t ret_value = H5I_INVALID_HID;
+    hid_t        ret_value = H5I_INVALID_HID;
     unsigned int bin_i;
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -340,7 +334,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_ros3_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD_ros3_term
  *
@@ -367,7 +360,6 @@ H5FD_ros3_term(void)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5FD_ros3_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_ros3
  *
@@ -398,7 +390,7 @@ H5Pset_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa)
     HDfprintf(stdout, "H5Pset_fapl_ros3() called.\n");
 #endif
 
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     if (FAIL == H5FD_ros3_validate_config(fa))
@@ -410,7 +402,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fapl_ros3() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5FD_ros3_open()
  *
@@ -438,15 +429,13 @@ done:
 static H5FD_t *
 H5FD_ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_ros3_t      *file      = NULL;
-    struct tm        *now       = NULL;
-    char              iso8601now[ISO8601_SIZE];
-    unsigned char     signing_key[SHA256_DIGEST_LENGTH];
-    s3r_t            *handle    = NULL;
-    H5FD_ros3_fapl_t  fa;
-    H5FD_t           *ret_value = NULL;
-
-
+    H5FD_ros3_t *    file = NULL;
+    struct tm *      now  = NULL;
+    char             iso8601now[ISO8601_SIZE];
+    unsigned char    signing_key[SHA256_DIGEST_LENGTH];
+    s3r_t *          handle = NULL;
+    H5FD_ros3_fapl_t fa;
+    H5FD_t *         ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -458,13 +447,13 @@ H5FD_ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
 
     /* Check arguments */
-    if(!url || !*url)
+    if (!url || !*url)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if(0 == maxaddr || HADDR_UNDEF == maxaddr)
+    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-    if(ADDR_OVERFLOW(maxaddr))
+    if (ADDR_OVERFLOW(maxaddr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr")
-    if(flags != H5F_ACC_RDONLY)
+    if (flags != H5F_ACC_RDONLY)
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, NULL, "only Read-Only access allowed")
 
     if (FAIL == H5Pget_fapl_ros3(fapl_id, &fa))
@@ -482,22 +471,16 @@ H5FD_ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
          * find way to re-use/share
          */
         now = gmnow();
-        HDassert( now != NULL );
+        HDassert(now != NULL);
         if (ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "problem while writing iso8601 timestamp")
-        if (FAIL == H5FD_s3comms_signing_key(signing_key,
-                                             (const char *)fa.secret_key,
-                                             (const char *)fa.aws_region,
-                                             (const char *)iso8601now) )
-        {
+        if (FAIL == H5FD_s3comms_signing_key(signing_key, (const char *)fa.secret_key,
+                                             (const char *)fa.aws_region, (const char *)iso8601now)) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "problem while computing signing key")
         }
 
-        handle = H5FD_s3comms_s3r_open(
-                 url,
-                 (const char *)fa.aws_region,
-                 (const char *)fa.secret_id,
-                 (const unsigned char *)signing_key);
+        handle = H5FD_s3comms_s3r_open(url, (const char *)fa.aws_region, (const char *)fa.secret_id,
+                                       (const unsigned char *)signing_key);
     }
     else {
         handle = H5FD_s3comms_s3r_open(url, NULL, NULL, NULL);
@@ -525,7 +508,7 @@ H5FD_ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
         HGOTO_ERROR(H5E_INTERNAL, H5E_UNINITIALIZED, NULL, "unable to reset file statistics")
 #endif /* ROS3_STATS */
 
-    ret_value = (H5FD_t*)file;
+    ret_value = (H5FD_t *)file;
 
 done:
     if (ret_value == NULL) {
@@ -537,13 +520,11 @@ done:
             file = H5FL_FREE(H5FD_ros3_t, file);
         }
         curl_global_cleanup(); /* early cleanup because open failed */
-    } /* end if null return value (error) */
+    }                          /* end if null return value (error) */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_ros3_open() */
 
-
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_close()
@@ -581,15 +562,13 @@ H5FD_ros3_close(H5FD_t H5_ATTR_UNUSED *_file)
     /* Close the underlying request handle
      */
     if (FAIL == H5FD_s3comms_s3r_close(file->s3r_handle)) {
-        HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL,
-                    "unable to close S3 request handle")
+        HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to close S3 request handle")
     }
 
 #if ROS3_STATS
     /* TODO: mechanism to re-target stats printout */
     if (ros3_fprint_stats(stdout, file) == FAIL) {
-        HGOTO_ERROR(H5E_INTERNAL, H5E_ERROR, FAIL,
-                    "problem while writing file statistics")
+        HGOTO_ERROR(H5E_INTERNAL, H5E_ERROR, FAIL, "problem while writing file statistics")
     }
 #endif /* ROS3_STATS */
 
@@ -604,7 +583,6 @@ done:
 
 } /* end H5FD_ros3_close() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_cmp()
@@ -636,12 +614,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5FD_ros3_cmp(
-        const H5FD_t *_f1,
-        const H5FD_t *_f2)
+H5FD_ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_ros3_t  *f1        = (const H5FD_ros3_t *)_f1;
-    const H5FD_ros3_t  *f2        = (const H5FD_ros3_t *)_f2;
+    const H5FD_ros3_t * f1        = (const H5FD_ros3_t *)_f1;
+    const H5FD_ros3_t * f2        = (const H5FD_ros3_t *)_f2;
     const parsed_url_t *purl1     = NULL;
     const parsed_url_t *purl2     = NULL;
     int                 ret_value = 0;
@@ -680,12 +656,10 @@ H5FD_ros3_cmp(
             HGOTO_DONE(-1);
         }
     }
-    else
-    if (purl1->port) {
+    else if (purl1->port) {
         HGOTO_DONE(-1);
     }
-    else
-    if (purl2->port) {
+    else if (purl2->port) {
         HGOTO_DONE(-1);
     }
 
@@ -695,12 +669,10 @@ H5FD_ros3_cmp(
             HGOTO_DONE(-1);
         }
     }
-    else
-    if (purl1->path && !purl2->path) {
+    else if (purl1->path && !purl2->path) {
         HGOTO_DONE(-1);
     }
-    else
-    if (purl2->path && !purl1->path) {
+    else if (purl2->path && !purl1->path) {
         HGOTO_DONE(-1);
     }
 
@@ -710,12 +682,10 @@ H5FD_ros3_cmp(
             HGOTO_DONE(-1);
         }
     }
-    else
-    if (purl1->query && !purl2->query) {
+    else if (purl1->query && !purl2->query) {
         HGOTO_DONE(-1);
     }
-    else
-    if (purl2->query && !purl1->query) {
+    else if (purl2->query && !purl1->query) {
         HGOTO_DONE(-1);
     }
 
@@ -725,12 +695,10 @@ H5FD_ros3_cmp(
             HGOTO_DONE(-1);
         }
     }
-    else
-    if (f1->fa.aws_region[0] != '\0') {
+    else if (f1->fa.aws_region[0] != '\0') {
         HGOTO_DONE(-1);
     }
-    else
-    if (f2->fa.aws_region[0] != '\0') {
+    else if (f2->fa.aws_region[0] != '\0') {
         HGOTO_DONE(-1);
     }
 
@@ -740,12 +708,10 @@ H5FD_ros3_cmp(
             HGOTO_DONE(-1);
         }
     }
-    else
-    if (f1->fa.secret_id[0] != '\0') {
+    else if (f1->fa.secret_id[0] != '\0') {
         HGOTO_DONE(-1);
     }
-    else
-    if (f2->fa.secret_id[0] != '\0') {
+    else if (f2->fa.secret_id[0] != '\0') {
         HGOTO_DONE(-1);
     }
 
@@ -755,12 +721,10 @@ H5FD_ros3_cmp(
             HGOTO_DONE(-1);
         }
     }
-    else
-    if (f1->fa.secret_key[0] != '\0') {
+    else if (f1->fa.secret_key[0] != '\0') {
         HGOTO_DONE(-1);
     }
-    else
-    if (f2->fa.secret_key[0] != '\0') {
+    else if (f2->fa.secret_key[0] != '\0') {
         HGOTO_DONE(-1);
     }
 
@@ -769,7 +733,6 @@ done:
 
 } /* H5FD_ros3_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_ros3_query
  *
@@ -790,8 +753,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_query(const H5FD_t H5_ATTR_UNUSED *_file,
-                unsigned long *flags /* out */)
+H5FD_ros3_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out */)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -810,7 +772,6 @@ H5FD_ros3_query(const H5FD_t H5_ATTR_UNUSED *_file,
 
 } /* H5FD_ros3_query() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_get_eoa()
@@ -831,8 +792,7 @@ H5FD_ros3_query(const H5FD_t H5_ATTR_UNUSED *_file,
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_ros3_get_eoa(const H5FD_t                *_file,
-                  H5FD_mem_t   H5_ATTR_UNUSED  type)
+H5FD_ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
     const H5FD_ros3_t *file = (const H5FD_ros3_t *)_file;
 
@@ -846,7 +806,6 @@ H5FD_ros3_get_eoa(const H5FD_t                *_file,
 
 } /* end H5FD_ros3_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_set_eoa()
@@ -865,9 +824,7 @@ H5FD_ros3_get_eoa(const H5FD_t                *_file,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_set_eoa(H5FD_t                    *_file,
-                  H5FD_mem_t H5_ATTR_UNUSED  type,
-                  haddr_t                    addr)
+H5FD_ros3_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
     H5FD_ros3_t *file = (H5FD_ros3_t *)_file;
 
@@ -883,7 +840,6 @@ H5FD_ros3_set_eoa(H5FD_t                    *_file,
 
 } /* H5FD_ros3_set_eoa() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_get_eof()
@@ -903,8 +859,7 @@ H5FD_ros3_set_eoa(H5FD_t                    *_file,
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_ros3_get_eof(const H5FD_t                *_file,
-                  H5FD_mem_t   H5_ATTR_UNUSED  type)
+H5FD_ros3_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
     const H5FD_ros3_t *file = (const H5FD_ros3_t *)_file;
 
@@ -918,7 +873,6 @@ H5FD_ros3_get_eof(const H5FD_t                *_file,
 
 } /* end H5FD_ros3_get_eof() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_get_handle()
@@ -937,9 +891,7 @@ H5FD_ros3_get_eof(const H5FD_t                *_file,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_get_handle(H5FD_t                *_file,
-                     hid_t H5_ATTR_UNUSED   fapl,
-                     void                 **file_handle)
+H5FD_ros3_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
     H5FD_ros3_t *file      = (H5FD_ros3_t *)_file;
     herr_t       ret_value = SUCCEED;
@@ -961,7 +913,6 @@ done:
 
 } /* end H5FD_ros3_get_handle() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_read()
@@ -985,12 +936,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_read(H5FD_t                    *_file,
-               H5FD_mem_t H5_ATTR_UNUSED  type,
-               hid_t      H5_ATTR_UNUSED  dxpl_id,
-               haddr_t                    addr, /* start offset   */
-               size_t                     size, /* length of read */
-               void                      *buf)  /* out            */
+H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
+               haddr_t addr, /* start offset   */
+               size_t  size, /* length of read */
+               void *  buf)    /* out            */
 {
     H5FD_ros3_t *file      = (H5FD_ros3_t *)_file;
     size_t       filesize  = 0;
@@ -1001,7 +950,6 @@ H5FD_ros3_read(H5FD_t                    *_file,
     unsigned       bin_i = 0;
 #endif /* ROS3_STATS */
 
-
     FUNC_ENTER_NOAPI_NOINIT
 
 #if ROS3_DEBUG
@@ -1031,9 +979,7 @@ H5FD_ros3_read(H5FD_t                    *_file,
             break;
         }
     }
-    bin = (type == H5FD_MEM_DRAW)
-        ? &file->raw[bin_i]
-        : &file->meta[bin_i];
+    bin = (type == H5FD_MEM_DRAW) ? &file->raw[bin_i] : &file->meta[bin_i];
 
     /* Store collected stats in appropriate bin
      */
@@ -1059,7 +1005,6 @@ done:
 
 } /* end H5FD_ros3_read() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_write()
@@ -1079,12 +1024,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_write(H5FD_t     H5_ATTR_UNUSED *_file,
-                H5FD_mem_t H5_ATTR_UNUSED  type,
-                hid_t      H5_ATTR_UNUSED  dxpl_id,
-                haddr_t    H5_ATTR_UNUSED  addr,
-                size_t     H5_ATTR_UNUSED  size,
-                const void H5_ATTR_UNUSED *buf)
+H5FD_ros3_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
+                haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED size, const void H5_ATTR_UNUSED *buf)
 {
     herr_t ret_value = FAIL;
 
@@ -1094,15 +1035,13 @@ H5FD_ros3_write(H5FD_t     H5_ATTR_UNUSED *_file,
     HDfprintf(stdout, "H5FD_ros3_write() called.\n");
 #endif
 
-    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL,
-                "cannot write to read-only file.")
+    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot write to read-only file.")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* H5FD_ros3_write() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_truncate()
@@ -1124,9 +1063,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_truncate(H5FD_t  H5_ATTR_UNUSED *_file,
-                   hid_t   H5_ATTR_UNUSED  dxpl_id,
-                   hbool_t H5_ATTR_UNUSED  closing)
+H5FD_ros3_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing)
 {
     herr_t ret_value = SUCCEED;
 
@@ -1136,15 +1073,13 @@ H5FD_ros3_truncate(H5FD_t  H5_ATTR_UNUSED *_file,
     HDfprintf(stdout, "H5FD_ros3_truncate() called.\n");
 #endif
 
-    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL,
-                "cannot truncate read-only file.")
+    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot truncate read-only file.")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* end H5FD_ros3_truncate() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_lock()
@@ -1167,15 +1102,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_lock(H5FD_t  H5_ATTR_UNUSED *_file,
-               hbool_t H5_ATTR_UNUSED  rw)
+H5FD_ros3_lock(H5FD_t H5_ATTR_UNUSED *_file, hbool_t H5_ATTR_UNUSED rw)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
     FUNC_LEAVE_NOAPI(SUCCEED)
 
 } /* end H5FD_ros3_lock() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function: H5FD_ros3_unlock()
@@ -1223,7 +1156,7 @@ H5FD_ros3_unlock(H5FD_t H5_ATTR_UNUSED *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_validate_config(const H5FD_ros3_fapl_t * fa)
+H5FD_ros3_validate_config(const H5FD_ros3_fapl_t *fa)
 {
     herr_t ret_value = SUCCEED;
 
@@ -1231,19 +1164,15 @@ H5FD_ros3_validate_config(const H5FD_ros3_fapl_t * fa)
 
     HDassert(fa != NULL);
 
-    if ( fa->version != H5FD_CURR_ROS3_FAPL_T_VERSION ) {
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                     "Unknown H5FD_ros3_fapl_t version");
+    if (fa->version != H5FD_CURR_ROS3_FAPL_T_VERSION) {
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown H5FD_ros3_fapl_t version");
     }
 
     /* if set to authenticate, region and id cannot be empty strings
      */
     if (fa->authenticate == TRUE) {
-        if ((fa->aws_region[0] == '\0') ||
-            (fa->secret_id[0]  == '\0'))
-        {
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                        "Inconsistent authentication information");
+        if ((fa->aws_region[0] == '\0') || (fa->secret_id[0] == '\0')) {
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Inconsistent authentication information");
         }
     }
 
@@ -1252,7 +1181,6 @@ done:
 
 } /* end H5FD_ros3_validate_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_fapl_ros3
  *
@@ -1271,11 +1199,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fapl_ros3(hid_t             fapl_id,
-                 H5FD_ros3_fapl_t *fa_out)
+H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out)
 {
     const H5FD_ros3_fapl_t *fa        = NULL;
-    H5P_genplist_t         *plist     = NULL;
+    H5P_genplist_t *        plist     = NULL;
     herr_t                  ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
@@ -1311,7 +1238,6 @@ done:
 
 } /* end H5Pget_fapl_ros3() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_ros3_fapl_get
  *
@@ -1332,16 +1258,15 @@ done:
 static void *
 H5FD_ros3_fapl_get(H5FD_t *_file)
 {
-    H5FD_ros3_t      *file      = (H5FD_ros3_t*)_file;
+    H5FD_ros3_t *     file      = (H5FD_ros3_t *)_file;
     H5FD_ros3_fapl_t *fa        = NULL;
-    void             *ret_value = NULL;
+    void *            ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     fa = (H5FD_ros3_fapl_t *)H5MM_calloc(sizeof(H5FD_ros3_fapl_t));
     if (fa == NULL) {
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                    "memory allocation failed")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     }
 
     /* Copy the fields of the structure */
@@ -1360,7 +1285,6 @@ done:
 
 } /* end H5FD_ros3_fapl_get() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_ros3_fapl_copy
  *
@@ -1380,16 +1304,15 @@ done:
 static void *
 H5FD_ros3_fapl_copy(const void *_old_fa)
 {
-    const H5FD_ros3_fapl_t *old_fa    = (const H5FD_ros3_fapl_t*)_old_fa;
-    H5FD_ros3_fapl_t       *new_fa    = NULL;
-    void                   *ret_value = NULL;
+    const H5FD_ros3_fapl_t *old_fa    = (const H5FD_ros3_fapl_t *)_old_fa;
+    H5FD_ros3_fapl_t *      new_fa    = NULL;
+    void *                  ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     new_fa = (H5FD_ros3_fapl_t *)H5MM_malloc(sizeof(H5FD_ros3_fapl_t));
     if (new_fa == NULL) {
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                    "memory allocation failed");
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
     }
 
     HDmemcpy(new_fa, old_fa, sizeof(H5FD_ros3_fapl_t));
@@ -1405,7 +1328,6 @@ done:
 
 } /* end H5FD_ros3_fapl_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_ros3_fapl_free
  *
@@ -1423,7 +1345,7 @@ done:
 static herr_t
 H5FD_ros3_fapl_free(void *_fa)
 {
-    H5FD_ros3_fapl_t *fa = (H5FD_ros3_fapl_t*)_fa;
+    H5FD_ros3_fapl_t *fa = (H5FD_ros3_fapl_t *)_fa;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1471,15 +1393,14 @@ ros3_reset_stats(H5FD_ros3_t *file)
 #endif
 
     if (file == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "file was null");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file was null");
     }
 
     for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
-        file->raw[i].bytes  = 0;
-        file->raw[i].count  = 0;
-        file->raw[i].min    = (unsigned long long)ROS3_STATS_STARTING_MIN;
-        file->raw[i].max    = 0;
+        file->raw[i].bytes = 0;
+        file->raw[i].count = 0;
+        file->raw[i].min   = (unsigned long long)ROS3_STATS_STARTING_MIN;
+        file->raw[i].max   = 0;
 
         file->meta[i].bytes = 0;
         file->meta[i].count = 0;
@@ -1550,45 +1471,38 @@ done:
  *----------------------------------------------------------------------------
  */
 static herr_t
-ros3_fprint_stats(FILE              *stream,
-                  const H5FD_ros3_t *file)
+ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
 {
     herr_t             ret_value    = SUCCEED;
-    parsed_url_t      *purl         = NULL;
+    parsed_url_t *     purl         = NULL;
     unsigned           i            = 0;
     unsigned long      count_meta   = 0;
     unsigned long      count_raw    = 0;
     double             average_meta = 0.0;
     double             average_raw  = 0.0;
-    unsigned long long min_meta   = (unsigned long long)ROS3_STATS_STARTING_MIN;
-    unsigned long long min_raw    = (unsigned long long)ROS3_STATS_STARTING_MIN;
+    unsigned long long min_meta     = (unsigned long long)ROS3_STATS_STARTING_MIN;
+    unsigned long long min_raw      = (unsigned long long)ROS3_STATS_STARTING_MIN;
     unsigned long long max_meta     = 0;
     unsigned long long max_raw      = 0;
     unsigned long long bytes_raw    = 0;
     unsigned long long bytes_meta   = 0;
     double             re_dub       = 0.0; /* re-usable double variable */
     unsigned           suffix_i     = 0;
-    const char         suffixes[]   = { ' ', 'K', 'M', 'G', 'T', 'P' };
-
-
+    const char         suffixes[]   = {' ', 'K', 'M', 'G', 'T', 'P'};
 
     FUNC_ENTER_NOAPI_NOINIT
 
     if (stream == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "file stream cannot be null" );
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file stream cannot be null");
     }
     if (file == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "file cannot be null");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file cannot be null");
     }
     if (file->s3r_handle == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "s3 request handle cannot be null");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "s3 request handle cannot be null");
     }
     if (file->s3r_handle->purl == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "parsed url structure cannot be null");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "parsed url structure cannot be null");
     }
     purl = file->s3r_handle->purl;
 
@@ -1605,7 +1519,8 @@ ros3_fprint_stats(FILE              *stream,
         else
             HDfprintf(stream, "/");
         HDfprintf(stream, "?%s", purl->query);
-    } else if (purl->path != NULL && purl->path[0] != '\0') {
+    }
+    else if (purl->path != NULL && purl->path[0] != '\0') {
         HDfprintf(stream, "/%s", purl->path);
     }
     HDfprintf(stream, "\n");
@@ -1618,14 +1533,18 @@ ros3_fprint_stats(FILE              *stream,
         const ros3_statsbin *r = &file->raw[i];
         const ros3_statsbin *m = &file->meta[i];
 
-        if (m->min < min_meta)  min_meta = m->min;
-        if (r->min < min_raw)   min_raw  = r->min;
-        if (m->max > max_meta)  max_meta = m->max;
-        if (r->max > max_raw)   max_raw  = r->max;
+        if (m->min < min_meta)
+            min_meta = m->min;
+        if (r->min < min_raw)
+            min_raw = r->min;
+        if (m->max > max_meta)
+            max_meta = m->max;
+        if (r->max > max_raw)
+            max_raw = r->max;
 
-        count_raw  += r->count;
+        count_raw += r->count;
         count_meta += m->count;
-        bytes_raw  += r->bytes;
+        bytes_raw += r->bytes;
         bytes_meta += m->bytes;
     }
     if (count_raw > 0)
@@ -1637,10 +1556,10 @@ ros3_fprint_stats(FILE              *stream,
      * PRINT OVERVIEW *
      ******************/
 
-    HDfprintf(stream, "TOTAL READS: %llu  (%llu meta, %llu raw)\n",
-              count_raw + count_meta, count_meta, count_raw);
-    HDfprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n",
-              bytes_raw + bytes_meta, bytes_meta, bytes_raw);
+    HDfprintf(stream, "TOTAL READS: %llu  (%llu meta, %llu raw)\n", count_raw + count_meta, count_meta,
+              count_raw);
+    HDfprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n", bytes_raw + bytes_meta, bytes_meta,
+              bytes_raw);
 
     if (count_raw + count_meta == 0)
         goto done;
@@ -1653,7 +1572,8 @@ ros3_fprint_stats(FILE              *stream,
     HDfprintf(stream, "  min ");
     if (count_meta == 0) {
         HDfprintf(stream, "   0.000  ");
-    } else {
+    }
+    else {
         re_dub = (double)min_meta;
         for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
@@ -1663,7 +1583,8 @@ ros3_fprint_stats(FILE              *stream,
 
     if (count_raw == 0) {
         HDfprintf(stream, "   0.000 \n");
-    } else {
+    }
+    else {
         re_dub = (double)min_raw;
         for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
@@ -1701,10 +1622,8 @@ ros3_fprint_stats(FILE              *stream,
      * PRINT INDIVIDUAL BIN STATS *
      ******************************/
 
-    HDfprintf(stream,
-        "BINS             # of reads      total bytes         average size\n");
-    HDfprintf(stream,
-        "    up-to      meta     raw     meta      raw       meta      raw\n");
+    HDfprintf(stream, "BINS             # of reads      total bytes         average size\n");
+    HDfprintf(stream, "    up-to      meta     raw     meta      raw       meta      raw\n");
 
     for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
         const ros3_statsbin *m;
@@ -1727,9 +1646,10 @@ ros3_fprint_stats(FILE              *stream,
         range_end = ros3_stats_boundaries[i];
 
         if (i == ROS3_STATS_BIN_COUNT) {
-            range_end = ros3_stats_boundaries[i-1];
+            range_end = ros3_stats_boundaries[i - 1];
             HDfprintf(stream, ">");
-        } else {
+        }
+        else {
             HDfprintf(stream, " ");
         }
 
@@ -1764,15 +1684,14 @@ ros3_fprint_stats(FILE              *stream,
             re_dub /= 1024.0;
         HDassert(suffix_i < sizeof(suffixes));
 
-        HDfprintf(stream,
-                  " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n",
-                  re_dub, suffixes[suffix_i], /* bin ceiling      */
-                  m->count,                   /* metadata reads   */
-                  r->count,                   /* rawdata reads    */
-                  bm_val, bm_suffix,          /* metadata bytes   */
-                  br_val, br_suffix,          /* rawdata bytes    */
-                  am_val, am_suffix,          /* metadata average */
-                  ar_val, ar_suffix);         /* rawdata average  */
+        HDfprintf(stream, " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n", re_dub,
+                  suffixes[suffix_i], /* bin ceiling      */
+                  m->count,           /* metadata reads   */
+                  r->count,           /* rawdata reads    */
+                  bm_val, bm_suffix,  /* metadata bytes   */
+                  br_val, br_suffix,  /* rawdata bytes    */
+                  am_val, am_suffix,  /* metadata average */
+                  ar_val, ar_suffix); /* rawdata average  */
 
         fflush(stream);
     }
@@ -1784,4 +1703,3 @@ done:
 #endif /* ROS3_STATS */
 
 #endif /* H5_HAVE_ROS3_VFD */
-
diff --git a/src/H5FDros3.h b/src/H5FDros3.h
index 8ecd7f0..0bcd2e2 100644
--- a/src/H5FDros3.h
+++ b/src/H5FDros3.h
@@ -22,9 +22,9 @@
 #define H5FDros3_H
 
 #ifdef H5_HAVE_ROS3_VFD
-#define H5FD_ROS3               (H5FD_ros3_init())
+#define H5FD_ROS3 (H5FD_ros3_init())
 #else
-#define H5FD_ROS3               (H5I_INVALID_HID)
+#define H5FD_ROS3 (H5I_INVALID_HID)
 #endif /* H5_HAVE_ROS3_VFD */
 
 #ifdef H5_HAVE_ROS3_VFD
@@ -71,11 +71,11 @@
  *
  ****************************************************************************/
 
-#define H5FD_CURR_ROS3_FAPL_T_VERSION     1
+#define H5FD_CURR_ROS3_FAPL_T_VERSION 1
 
-#define H5FD_ROS3_MAX_REGION_LEN         32
-#define H5FD_ROS3_MAX_SECRET_ID_LEN     128
-#define H5FD_ROS3_MAX_SECRET_KEY_LEN    128
+#define H5FD_ROS3_MAX_REGION_LEN     32
+#define H5FD_ROS3_MAX_SECRET_ID_LEN  128
+#define H5FD_ROS3_MAX_SECRET_KEY_LEN 128
 
 typedef struct H5FD_ros3_fapl_t {
     int32_t version;
@@ -85,13 +85,12 @@ typedef struct H5FD_ros3_fapl_t {
     char    secret_key[H5FD_ROS3_MAX_SECRET_KEY_LEN + 1];
 } H5FD_ros3_fapl_t;
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-H5_DLL hid_t H5FD_ros3_init(void);
-H5_DLL void H5FD_ros3_term(void);
+H5_DLL hid_t  H5FD_ros3_init(void);
+H5_DLL void   H5FD_ros3_term(void);
 H5_DLL herr_t H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out);
 H5_DLL herr_t H5Pset_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa);
 
@@ -102,5 +101,3 @@ H5_DLL herr_t H5Pset_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa);
 #endif /* H5_HAVE_ROS3_VFD */
 
 #endif /* ifndef H5FDros3_H */
-
-
diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c
index 4be52c4..378791c 100644
--- a/src/H5FDs3comms.c
+++ b/src/H5FDs3comms.c
@@ -81,8 +81,8 @@
  */
 struct s3r_datastruct {
     unsigned long magic;
-    char *data;
-    size_t size;
+    char *        data;
+    size_t        size;
 };
 #define S3COMMS_CALLBACK_DATASTRUCT_MAGIC 0x28c2b2ul
 
@@ -130,9 +130,9 @@ herr_t H5FD_s3comms_s3r_getsize(s3r_t *handle);
 size_t
 curlwritecallback(char *ptr, size_t size, size_t nmemb, void *userdata)
 {
-    struct s3r_datastruct *sds = (struct s3r_datastruct*) userdata;
-    size_t product = (size * nmemb);
-    size_t written = 0;
+    struct s3r_datastruct *sds     = (struct s3r_datastruct *)userdata;
+    size_t                 product = (size * nmemb);
+    size_t                 written = 0;
 
     if (sds->magic != S3COMMS_CALLBACK_DATASTRUCT_MAGIC)
         return written;
@@ -196,16 +196,16 @@ curlwritecallback(char *ptr, size_t size, size_t nmemb, void *userdata)
 herr_t
 H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
 {
-    size_t      i = 0;
-    char       *valuecpy = NULL;
-    char       *namecpy = NULL;
-    size_t      namelen = 0;
-    char       *lowername = NULL;
-    char       *nvcat = NULL;
-    hrb_node_t *node_ptr = NULL;
-    hrb_node_t *new_node = NULL;
+    size_t      i          = 0;
+    char *      valuecpy   = NULL;
+    char *      namecpy    = NULL;
+    size_t      namelen    = 0;
+    char *      lowername  = NULL;
+    char *      nvcat      = NULL;
+    hrb_node_t *node_ptr   = NULL;
+    hrb_node_t *new_node   = NULL;
     hbool_t     is_looking = TRUE;
-    herr_t      ret_value = SUCCEED;
+    herr_t      ret_value  = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -232,12 +232,12 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
      **********************/
 
     /* copy and lowercase name */
-    lowername = (char*) H5MM_malloc(sizeof(char) * (namelen + 1));
+    lowername = (char *)H5MM_malloc(sizeof(char) * (namelen + 1));
     if (lowername == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "cannot make space for lowercase name copy.\n");
 
     for (i = 0; i < namelen; i++)
-        lowername[i] = (char) tolower((int) name[i]);
+        lowername[i] = (char)tolower((int)name[i]);
 
     lowername[namelen] = 0;
 
@@ -245,45 +245,44 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
      * If NULL, we will be removing a node or doing nothing, so no need for copies
      */
     if (value != NULL) {
-        int    ret = 0;
+        int    ret      = 0;
         size_t valuelen = HDstrlen(value);
-        size_t catlen = namelen + valuelen + 2; /* +2 from ": " */
-        size_t catwrite = catlen + 3; /* 3 not 1 to quiet compiler warning */
+        size_t catlen   = namelen + valuelen + 2; /* +2 from ": " */
+        size_t catwrite = catlen + 3;             /* 3 not 1 to quiet compiler warning */
 
-        namecpy = (char*) H5MM_malloc(sizeof(char) * (namelen + 1));
+        namecpy = (char *)H5MM_malloc(sizeof(char) * (namelen + 1));
         if (namecpy == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "cannot make space for name copy.\n");
 
         HDmemcpy(namecpy, name, (namelen + 1));
 
-        valuecpy = (char*) H5MM_malloc(sizeof(char) * (valuelen + 1));
+        valuecpy = (char *)H5MM_malloc(sizeof(char) * (valuelen + 1));
         if (valuecpy == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "cannot make space for value copy.\n");
 
         HDmemcpy(valuecpy, value, (valuelen + 1));
 
-        nvcat = (char*) H5MM_malloc(sizeof(char) * catwrite);
+        nvcat = (char *)H5MM_malloc(sizeof(char) * catwrite);
         if (nvcat == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "cannot make space for concatenated string.\n");
 
         ret = HDsnprintf(nvcat, catwrite, "%s: %s", name, value);
-        if (ret < 0 || (size_t) ret > catlen)
+        if (ret < 0 || (size_t)ret > catlen)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cannot concatenate `%s: %s", name, value);
 
         HDassert(catlen == HDstrlen(nvcat));
 
         /* create new_node, should we need it */
-        new_node = (hrb_node_t*) H5MM_malloc(sizeof(hrb_node_t));
+        new_node = (hrb_node_t *)H5MM_malloc(sizeof(hrb_node_t));
         if (new_node == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "cannot make space for new set.\n");
 
-
-        new_node->magic = S3COMMS_HRB_NODE_MAGIC;
-        new_node->name = NULL;
-        new_node->value = NULL;
-        new_node->cat = NULL;
+        new_node->magic     = S3COMMS_HRB_NODE_MAGIC;
+        new_node->name      = NULL;
+        new_node->value     = NULL;
+        new_node->cat       = NULL;
         new_node->lowername = NULL;
-        new_node->next = NULL;
+        new_node->next      = NULL;
     }
 
     /***************
@@ -296,16 +295,17 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
         }
         else {
 #if S3COMMS_DEBUG
-HDprintf("CREATE NEW\n"); fflush(stdout);
+            HDprintf("CREATE NEW\n");
+            fflush(stdout);
 #endif
             /*******************
              * CREATE NEW LIST *
              *******************/
 
-            new_node->cat = nvcat;
-            new_node->name = namecpy;
+            new_node->cat       = nvcat;
+            new_node->name      = namecpy;
             new_node->lowername = lowername;
-            new_node->value = valuecpy;
+            new_node->value     = valuecpy;
 
             *L = new_node;
             goto done; /* bypass further seeking */
@@ -323,7 +323,8 @@ HDprintf("CREATE NEW\n"); fflush(stdout);
 
         if (value == NULL) {
 #if S3COMMS_DEBUG
-HDprintf("REMOVE HEAD\n"); fflush(stdout);
+            HDprintf("REMOVE HEAD\n");
+            fflush(stdout);
 #endif
             /***************
              * REMOVE HEAD *
@@ -331,42 +332,48 @@ HDprintf("REMOVE HEAD\n"); fflush(stdout);
             *L = node_ptr->next;
 
 #if S3COMMS_DEBUG
-HDprintf("FREEING CAT (node)\n"); fflush(stdout);
+            HDprintf("FREEING CAT (node)\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr->cat);
 #if S3COMMS_DEBUG
-HDprintf("FREEING LOWERNAME (node)\n"); fflush(stdout);
+            HDprintf("FREEING LOWERNAME (node)\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr->lowername);
 #if S3COMMS_DEBUG
-HDprintf("FREEING NAME (node)\n"); fflush(stdout);
+            HDprintf("FREEING NAME (node)\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr->name);
 #if S3COMMS_DEBUG
-HDprintf("FREEING VALUE (node)\n"); fflush(stdout);
+            HDprintf("FREEING VALUE (node)\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr->value);
 #if S3COMMS_DEBUG
-HDprintf("MAGIC OK? %s\n",
-        (node_ptr->magic == S3COMMS_HRB_NODE_MAGIC) ? "YES" : "NO");
-fflush(stdout);
+            HDprintf("MAGIC OK? %s\n", (node_ptr->magic == S3COMMS_HRB_NODE_MAGIC) ? "YES" : "NO");
+            fflush(stdout);
 #endif
             HDassert(node_ptr->magic == S3COMMS_HRB_NODE_MAGIC);
             node_ptr->magic += 1ul;
 #if S3COMMS_DEBUG
-HDprintf("FREEING POINTER\n"); fflush(stdout);
+            HDprintf("FREEING POINTER\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr);
 
 #if S3COMMS_DEBUG
-HDprintf("FREEING WORKING LOWERNAME\n"); fflush(stdout);
+            HDprintf("FREEING WORKING LOWERNAME\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(lowername);
             lowername = NULL;
         }
         else {
 #if S3COMMS_DEBUG
-HDprintf("MODIFY HEAD\n"); fflush(stdout);
+            HDprintf("MODIFY HEAD\n");
+            fflush(stdout);
 #endif
             /***************
              * MODIFY HEAD *
@@ -376,9 +383,9 @@ HDprintf("MODIFY HEAD\n"); fflush(stdout);
             H5MM_xfree(node_ptr->name);
             H5MM_xfree(node_ptr->value);
 
-            node_ptr->name = namecpy;
+            node_ptr->name  = namecpy;
             node_ptr->value = valuecpy;
-            node_ptr->cat = nvcat;
+            node_ptr->cat   = nvcat;
 
             H5MM_xfree(lowername);
             lowername = NULL;
@@ -395,17 +402,18 @@ HDprintf("MODIFY HEAD\n"); fflush(stdout);
         }
         else {
 #if S3COMMS_DEBUG
-HDprintf("PREPEND NEW HEAD\n"); fflush(stdout);
+            HDprintf("PREPEND NEW HEAD\n");
+            fflush(stdout);
 #endif
             /*******************
              * INSERT NEW HEAD *
              *******************/
-            new_node->name = namecpy;
-            new_node->value = valuecpy;
+            new_node->name      = namecpy;
+            new_node->value     = valuecpy;
             new_node->lowername = lowername;
-            new_node->cat = nvcat;
-            new_node->next = node_ptr;
-            *L = new_node;
+            new_node->cat       = nvcat;
+            new_node->next      = node_ptr;
+            *L                  = new_node;
         }
     }
 
@@ -422,17 +430,18 @@ HDprintf("PREPEND NEW HEAD\n"); fflush(stdout);
             }
             else {
 #if S3COMMS_DEBUG
-HDprintf("APPEND A NODE\n"); fflush(stdout);
+                HDprintf("APPEND A NODE\n");
+                fflush(stdout);
 #endif
                 /*******************
                  * APPEND NEW NODE *
                  *******************/
                 HDassert(strcmp(lowername, node_ptr->lowername) > 0);
-                new_node->name = namecpy;
-                new_node->value = valuecpy;
+                new_node->name      = namecpy;
+                new_node->value     = valuecpy;
                 new_node->lowername = lowername;
-                new_node->cat = nvcat;
-                node_ptr->next = new_node;
+                new_node->cat       = nvcat;
+                node_ptr->next      = new_node;
             }
         }
         else if (strcmp(lowername, node_ptr->next->lowername) < 0) {
@@ -443,18 +452,19 @@ HDprintf("APPEND A NODE\n"); fflush(stdout);
             }
             else {
 #if S3COMMS_DEBUG
-HDprintf("INSERT A NODE\n"); fflush(stdout);
+                HDprintf("INSERT A NODE\n");
+                fflush(stdout);
 #endif
                 /*******************
                  * INSERT NEW NODE *
                  *******************/
                 HDassert(strcmp(lowername, node_ptr->lowername) > 0);
-                new_node->name = namecpy;
-                new_node->value = valuecpy;
+                new_node->name      = namecpy;
+                new_node->value     = valuecpy;
                 new_node->lowername = lowername;
-                new_node->cat = nvcat;
-                new_node->next = node_ptr->next;
-                node_ptr->next = new_node;
+                new_node->cat       = nvcat;
+                new_node->next      = node_ptr->next;
+                node_ptr->next      = new_node;
             }
         }
         else if (strcmp(lowername, node_ptr->next->lowername) == 0) {
@@ -462,13 +472,14 @@ HDprintf("INSERT A NODE\n"); fflush(stdout);
 
             if (value == NULL) {
                 /*****************
-                * REMOVE A NODE *
-                *****************/
+                 * REMOVE A NODE *
+                 *****************/
                 hrb_node_t *tmp = node_ptr->next;
-                node_ptr->next = tmp->next;
+                node_ptr->next  = tmp->next;
 
 #if S3COMMS_DEBUG
-HDprintf("REMOVE A NODE\n"); fflush(stdout);
+                HDprintf("REMOVE A NODE\n");
+                fflush(stdout);
 #endif
                 H5MM_xfree(tmp->cat);
                 H5MM_xfree(tmp->lowername);
@@ -484,7 +495,8 @@ HDprintf("REMOVE A NODE\n"); fflush(stdout);
             }
             else {
 #if S3COMMS_DEBUG
-HDprintf("MODIFY A NODE\n"); fflush(stdout);
+                HDprintf("MODIFY A NODE\n");
+                fflush(stdout);
 #endif
                 /*****************
                  * MODIFY A NODE *
@@ -498,12 +510,12 @@ HDprintf("MODIFY A NODE\n"); fflush(stdout);
                 new_node->magic += 1ul;
                 H5MM_xfree(new_node);
                 H5MM_xfree(lowername);
-                new_node = NULL;
+                new_node  = NULL;
                 lowername = NULL;
 
-                node_ptr->name = namecpy;
+                node_ptr->name  = namecpy;
                 node_ptr->value = valuecpy;
-                node_ptr->cat = nvcat;
+                node_ptr->cat   = nvcat;
             }
         }
         else {
@@ -573,7 +585,7 @@ done:
 herr_t
 H5FD_s3comms_hrb_destroy(hrb_t **_buf)
 {
-    hrb_t *buf = NULL;
+    hrb_t *buf       = NULL;
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -624,17 +636,17 @@ done:
  *             2017-07-21
  *----------------------------------------------------------------------------
  */
-hrb_t*
+hrb_t *
 H5FD_s3comms_hrb_init_request(const char *_verb, const char *_resource, const char *_http_version)
 {
-    hrb_t *request = NULL;
-    char  *res = NULL;
-    size_t reslen = 0;
+    hrb_t *request   = NULL;
+    char * res       = NULL;
+    size_t reslen    = 0;
     hrb_t *ret_value = NULL;
-    char  *verb = NULL;
-    size_t verblen = 0;
-    char  *vrsn = NULL;
-    size_t vrsnlen = 0;
+    char * verb      = NULL;
+    size_t verblen   = 0;
+    char * vrsn      = NULL;
+    size_t vrsnlen   = 0;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -653,45 +665,45 @@ H5FD_s3comms_hrb_init_request(const char *_verb, const char *_resource, const ch
         _http_version = "HTTP/1.1";
 
     /* malloc space for and prepare structure */
-    request = (hrb_t*) H5MM_malloc(sizeof(hrb_t));
+    request = (hrb_t *)H5MM_malloc(sizeof(hrb_t));
     if (request == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, NULL, "no space for request structure");
 
-    request->magic = S3COMMS_HRB_MAGIC;
-    request->body = NULL;
-    request->body_len = 0;
+    request->magic        = S3COMMS_HRB_MAGIC;
+    request->body         = NULL;
+    request->body_len     = 0;
     request->first_header = NULL;
 
     /* malloc and copy strings for the structure
-    */
+     */
     reslen = HDstrlen(_resource);
 
     if (_resource[0] == '/') {
-        res = (char*) H5MM_malloc(sizeof(char) * (reslen + 1));
+        res = (char *)H5MM_malloc(sizeof(char) * (reslen + 1));
         if (res == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, NULL, "no space for resource string");
 
         HDmemcpy(res, _resource, (reslen + 1));
     }
     else {
-        res = (char*) H5MM_malloc(sizeof(char) * (reslen + 2));
+        res = (char *)H5MM_malloc(sizeof(char) * (reslen + 2));
         if (res == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, NULL, "no space for resource string");
 
         *res = '/';
         HDmemcpy((&res[1]), _resource, (reslen + 1));
-        HDassert((reslen+1) == HDstrlen(res));
+        HDassert((reslen + 1) == HDstrlen(res));
     } /* end if (else resource string not starting with '/') */
 
     verblen = HDstrlen(_verb) + 1;
-    verb = (char*) H5MM_malloc(sizeof(char) * verblen);
+    verb    = (char *)H5MM_malloc(sizeof(char) * verblen);
     if (verb == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "no space for verb string");
 
     HDstrncpy(verb, _verb, verblen);
 
     vrsnlen = HDstrlen(_http_version) + 1;
-    vrsn = (char*) H5MM_malloc(sizeof(char) * vrsnlen);
+    vrsn    = (char *)H5MM_malloc(sizeof(char) * vrsnlen);
     if (vrsn == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "no space for http-version string");
 
@@ -699,8 +711,8 @@ H5FD_s3comms_hrb_init_request(const char *_verb, const char *_resource, const ch
 
     /* place new copies into structure */
     request->resource = res;
-    request->verb = verb;
-    request->version = vrsn;
+    request->verb     = verb;
+    request->version  = vrsn;
 
     ret_value = request;
 
@@ -834,15 +846,13 @@ H5FD_s3comms_s3r_get_filesize(s3r_t *handle)
 herr_t
 H5FD_s3comms_s3r_getsize(s3r_t *handle)
 {
-    uintmax_t content_length = 0;
-    CURL     *curlh = NULL;
-    char     *end = NULL;
-    char     *headerresponse = NULL;
-    char     *start = NULL;
-    herr_t    ret_value = SUCCEED;
-    struct s3r_datastruct sds = {
-        S3COMMS_CALLBACK_DATASTRUCT_MAGIC, NULL, 0
-    };
+    uintmax_t             content_length = 0;
+    CURL *                curlh          = NULL;
+    char *                end            = NULL;
+    char *                headerresponse = NULL;
+    char *                start          = NULL;
+    herr_t                ret_value      = SUCCEED;
+    struct s3r_datastruct sds            = {S3COMMS_CALLBACK_DATASTRUCT_MAGIC, NULL, 0};
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -866,21 +876,23 @@ H5FD_s3comms_s3r_getsize(s3r_t *handle)
     curlh = handle->curlhandle;
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_NOBODY, 1L))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while setting CURL option (CURLOPT_NOBODY). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                    "error while setting CURL option (CURLOPT_NOBODY). "
+                    "(placeholder flags)");
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_HEADERDATA, &sds))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while setting CURL option (CURLOPT_HEADERDATA). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                    "error while setting CURL option (CURLOPT_HEADERDATA). "
+                    "(placeholder flags)");
 
     HDassert(handle->httpverb == NULL);
-    handle->httpverb = (char*) H5MM_malloc(sizeof(char) * 16);
+    handle->httpverb = (char *)H5MM_malloc(sizeof(char) * 16);
     if (handle->httpverb == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "unable to allocate space for S3 request HTTP verb");
 
     HDmemcpy(handle->httpverb, "HEAD", 5);
 
-    headerresponse = (char*) H5MM_malloc(sizeof(char) * CURL_MAX_HTTP_HEADER);
+    headerresponse = (char *)H5MM_malloc(sizeof(char) * CURL_MAX_HTTP_HEADER);
     if (headerresponse == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "unable to allocate space for curl header response");
 
@@ -918,38 +930,41 @@ H5FD_s3comms_s3r_getsize(s3r_t *handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not find \"Content-Length\" in response.\n");
 
     /* move "start" to beginning of value in line; find end of line
-    */
+     */
     start = start + HDstrlen("\r\nContent-Length: ");
-    end = strstr(start, "\r\n");
+    end   = strstr(start, "\r\n");
     if (end == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not find end of content length line");
 
     /* place null terminator at end of numbers */
     *end = '\0';
 
-    content_length = strtoumax((const char*) start, NULL, 0);
+    content_length = strtoumax((const char *)start, NULL, 0);
 
     if (UINTMAX_MAX > SIZE_MAX && content_length > SIZE_MAX)
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "content_length overflows size_t\n");
 
     if (content_length == 0 || errno == ERANGE) /* errno set by strtoumax*/
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                "could not convert found \"Content-Length\" response (\"%s\")", start); /* range is null-terminated, remember */
+                    "could not convert found \"Content-Length\" response (\"%s\")",
+                    start); /* range is null-terminated, remember */
 
-    handle->filesize = (size_t) content_length;
+    handle->filesize = (size_t)content_length;
 
     /**********************
-    * UNDO HEAD SETTINGS *
-    **********************/
+     * UNDO HEAD SETTINGS *
+     **********************/
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_NOBODY, NULL)) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while setting CURL option (CURLOPT_NOBODY). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                    "error while setting CURL option (CURLOPT_NOBODY). "
+                    "(placeholder flags)");
     }
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_HEADERDATA, NULL))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while setting CURL option (CURLOPT_HEADERDATA). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                    "error while setting CURL option (CURLOPT_HEADERDATA). "
+                    "(placeholder flags)");
 
 done:
     H5MM_xfree(headerresponse);
@@ -992,14 +1007,14 @@ done:
  *             2017-09-01
  *----------------------------------------------------------------------------
  */
-s3r_t*
+s3r_t *
 H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const unsigned char *signing_key)
 {
-    size_t tmplen = 0;
-    CURL  *curlh = NULL;
-    s3r_t *handle = NULL;
-    parsed_url_t *purl = NULL;
-    s3r_t *ret_value = NULL;
+    size_t        tmplen    = 0;
+    CURL *        curlh     = NULL;
+    s3r_t *       handle    = NULL;
+    parsed_url_t *purl      = NULL;
+    s3r_t *       ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1017,25 +1032,23 @@ H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const
     HDassert(purl != NULL); /* if above passes, this must be true */
     HDassert(purl->magic == S3COMMS_PARSED_URL_MAGIC);
 
-    handle = (s3r_t*) H5MM_malloc(sizeof(s3r_t));
+    handle = (s3r_t *)H5MM_malloc(sizeof(s3r_t));
     if (handle == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, NULL, "could not malloc space for handle.\n");
 
-    handle->magic = S3COMMS_S3R_MAGIC;
-    handle->purl = purl;
-    handle->filesize = 0;
-    handle->region = NULL;
-    handle->secret_id = NULL;
+    handle->magic       = S3COMMS_S3R_MAGIC;
+    handle->purl        = purl;
+    handle->filesize    = 0;
+    handle->region      = NULL;
+    handle->secret_id   = NULL;
     handle->signing_key = NULL;
-    handle->httpverb = NULL;
+    handle->httpverb    = NULL;
 
     /*************************************
      * RECORD AUTHENTICATION INFORMATION *
      *************************************/
 
-    if ((region != NULL && *region != '\0') ||
-            (id != NULL && *id != '\0') ||
-            (signing_key != NULL)) {
+    if ((region != NULL && *region != '\0') || (id != NULL && *id != '\0') || (signing_key != NULL)) {
         /* if one exists, all three must exist */
         if (region == NULL || region[0] == '\0')
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "region cannot be null.\n");
@@ -1047,22 +1060,22 @@ H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "signing key cannot be null.\n");
 
         /* copy strings */
-        tmplen = HDstrlen(region) + 1;
-        handle->region = (char*) H5MM_malloc(sizeof(char) * tmplen);
+        tmplen         = HDstrlen(region) + 1;
+        handle->region = (char *)H5MM_malloc(sizeof(char) * tmplen);
         if (handle->region == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "could not malloc space for handle region copy.\n");
 
         HDmemcpy(handle->region, region, tmplen);
 
-        tmplen = HDstrlen(id) + 1;
-        handle->secret_id = (char*) H5MM_malloc(sizeof(char) * tmplen);
+        tmplen            = HDstrlen(id) + 1;
+        handle->secret_id = (char *)H5MM_malloc(sizeof(char) * tmplen);
         if (handle->secret_id == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "could not malloc space for handle ID copy.\n");
 
         HDmemcpy(handle->secret_id, id, tmplen);
 
-        tmplen = SHA256_DIGEST_LENGTH;
-        handle->signing_key = (unsigned char*) H5MM_malloc(sizeof(unsigned char) * tmplen);
+        tmplen              = SHA256_DIGEST_LENGTH;
+        handle->signing_key = (unsigned char *)H5MM_malloc(sizeof(unsigned char) * tmplen);
         if (handle->signing_key == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "could not malloc space for handle key copy.\n");
 
@@ -1079,24 +1092,29 @@ H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "problem creating curl easy handle!\n");
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_HTTPGET, 1L))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "error while setting CURL option (CURLOPT_HTTPGET). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
+                    "error while setting CURL option (CURLOPT_HTTPGET). "
+                    "(placeholder flags)");
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "error while setting CURL option (CURLOPT_HTTP_VERSION). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
+                    "error while setting CURL option (CURLOPT_HTTP_VERSION). "
+                    "(placeholder flags)");
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_FAILONERROR, 1L))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "error while setting CURL option (CURLOPT_FAILONERROR). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
+                    "error while setting CURL option (CURLOPT_FAILONERROR). "
+                    "(placeholder flags)");
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_WRITEFUNCTION, curlwritecallback))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "error while setting CURL option (CURLOPT_WRITEFUNCTION). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
+                    "error while setting CURL option (CURLOPT_WRITEFUNCTION). "
+                    "(placeholder flags)");
 
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_URL, url))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "error while setting CURL option (CURLOPT_URL). "
-                "(placeholder flags)");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
+                    "error while setting CURL option (CURLOPT_URL). "
+                    "(placeholder flags)");
 
 #if S3COMMS_CURL_VERBOSITY > 1
     /* CURL will print (to stdout) information for each operation
@@ -1186,18 +1204,18 @@ done:
 herr_t
 H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
 {
-    CURL       *curlh = NULL;
-    CURLcode    p_status = CURLE_OK;
-    struct curl_slist *curlheaders = NULL;
-    hrb_node_t *headers = NULL;
-    hrb_node_t *node = NULL;
-    struct tm  *now = NULL;
-    char       *rangebytesstr = NULL;
-    hrb_t      *request = NULL;
-    int         ret = 0; /* working variable to check  */
+    CURL *             curlh         = NULL;
+    CURLcode           p_status      = CURLE_OK;
+    struct curl_slist *curlheaders   = NULL;
+    hrb_node_t *       headers       = NULL;
+    hrb_node_t *       node          = NULL;
+    struct tm *        now           = NULL;
+    char *             rangebytesstr = NULL;
+    hrb_t *            request       = NULL;
+    int                ret           = 0; /* working variable to check  */
     /* return value of HDsnprintf  */
-    struct s3r_datastruct *sds = NULL;
-    herr_t      ret_value = SUCCEED;
+    struct s3r_datastruct *sds       = NULL;
+    herr_t                 ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1205,9 +1223,9 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
     HDfprintf(stdout, "called H5FD_s3comms_s3r_read.\n");
 #endif
 
-/**************************************
- * ABSOLUTELY NECESSARY SANITY-CHECKS *
- **************************************/
+    /**************************************
+     * ABSOLUTELY NECESSARY SANITY-CHECKS *
+     **************************************/
 
     if (handle == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "handle cannot be null.\n");
@@ -1225,7 +1243,6 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
     if (offset > handle->filesize || (len + offset) > handle->filesize)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to read past EoF")
 
-
     curlh = handle->curlhandle;
 
     /*********************
@@ -1233,17 +1250,17 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
      *********************/
 
     if (dest != NULL) {
-        sds = (struct s3r_datastruct*) H5MM_malloc(sizeof(struct s3r_datastruct));
+        sds = (struct s3r_datastruct *)H5MM_malloc(sizeof(struct s3r_datastruct));
         if (sds == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "could not malloc destination datastructure.\n");
 
-
         sds->magic = S3COMMS_CALLBACK_DATASTRUCT_MAGIC;
-        sds->data = (char*) dest;
-        sds->size = 0;
+        sds->data  = (char *)dest;
+        sds->size  = 0;
         if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_WRITEDATA, sds))
-            HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "error while setting CURL option (CURLOPT_WRITEDATA). "
-                            "(placeholder flags)");
+            HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL,
+                        "error while setting CURL option (CURLOPT_WRITEDATA). "
+                        "(placeholder flags)");
     }
 
     /*********************
@@ -1251,22 +1268,22 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
      *********************/
 
     if (len > 0) {
-        rangebytesstr = (char*) H5MM_malloc(sizeof(char) * (S3COMMS_MAX_RANGE_STRING_SIZE + 1));
+        rangebytesstr = (char *)H5MM_malloc(sizeof(char) * (S3COMMS_MAX_RANGE_STRING_SIZE + 1));
         if (rangebytesstr == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "could not malloc range format string.\n");
 
         ret = HDsnprintf(rangebytesstr, (S3COMMS_MAX_RANGE_STRING_SIZE),
-                "bytes="H5_PRINTF_HADDR_FMT"-"H5_PRINTF_HADDR_FMT, offset, offset + len - 1);
+                         "bytes=" H5_PRINTF_HADDR_FMT "-" H5_PRINTF_HADDR_FMT, offset, offset + len - 1);
         if (ret <= 0 || ret >= S3COMMS_MAX_RANGE_STRING_SIZE)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to format HTTP Range value");
     }
     else if (offset > 0) {
-        rangebytesstr = (char*) H5MM_malloc(sizeof(char) * (S3COMMS_MAX_RANGE_STRING_SIZE + 1));
+        rangebytesstr = (char *)H5MM_malloc(sizeof(char) * (S3COMMS_MAX_RANGE_STRING_SIZE + 1));
         if (rangebytesstr == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "could not malloc range format string.\n");
 
-        ret = HDsnprintf(rangebytesstr, (S3COMMS_MAX_RANGE_STRING_SIZE), "bytes="H5_PRINTF_HADDR_FMT"-",
-                offset);
+        ret = HDsnprintf(rangebytesstr, (S3COMMS_MAX_RANGE_STRING_SIZE), "bytes=" H5_PRINTF_HADDR_FMT "-",
+                         offset);
         if (ret <= 0 || ret >= S3COMMS_MAX_RANGE_STRING_SIZE)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to format HTTP Range value");
     }
@@ -1288,7 +1305,7 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
 
             if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_RANGE, bytesrange_ptr))
                 HGOTO_ERROR(H5E_VFL, H5E_UNINITIALIZED, FAIL,
-                        "error while setting CURL option (CURLOPT_RANGE). ");
+                            "error while setting CURL option (CURLOPT_RANGE). ");
         }
     }
     else {
@@ -1313,10 +1330,10 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
          */
 
         /* zero start of strings */
-        authorization[0] = 0;
-        buffer1[0] = 0;
-        buffer2[0] = 0;
-        iso8601now[0] = 0;
+        authorization[0]  = 0;
+        buffer1[0]        = 0;
+        buffer2[0]        = 0;
+        iso8601now[0]     = 0;
         signed_headers[0] = 0;
 
         /**** VERIFY INFORMATION EXISTS ****/
@@ -1340,7 +1357,8 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
 
         /**** CREATE HTTP REQUEST STRUCTURE (hrb_t) ****/
 
-        request = H5FD_s3comms_hrb_init_request((const char*) handle->httpverb, (const char*) handle->purl->path, "HTTP/1.1");
+        request = H5FD_s3comms_hrb_init_request((const char *)handle->httpverb,
+                                                (const char *)handle->purl->path, "HTTP/1.1");
         if (request == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not allocate hrb_t request.\n");
 
@@ -1350,41 +1368,45 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
         if (ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not format ISO8601 time.\n");
 
-        if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "x-amz-date", (const char*) iso8601now))
+        if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "x-amz-date", (const char *)iso8601now))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set x-amz-date header")
 
         if (headers == NULL)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list. "
-                    "(placeholder flags)\n");
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "problem building headers list. "
+                        "(placeholder flags)\n");
 
         HDassert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
 
-        if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "x-amz-content-sha256", (const char*) EMPTY_SHA256))
+        if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "x-amz-content-sha256", (const char *)EMPTY_SHA256))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set x-amz-content-sha256 header")
 
         if (headers == NULL)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list. "
-                    "(placeholder flags)\n");
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "problem building headers list. "
+                        "(placeholder flags)\n");
 
         HDassert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
 
         if (rangebytesstr != NULL) {
-            if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "Range", (const char*) rangebytesstr))
+            if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "Range", (const char *)rangebytesstr))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set range header")
 
             if (headers == NULL)
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list. "
-                        "(placeholder flags)\n");
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                            "problem building headers list. "
+                            "(placeholder flags)\n");
 
             HDassert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
         }
 
-        if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "Host", (const char*) handle->purl->host))
+        if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "Host", (const char *)handle->purl->host))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set host header")
 
         if (headers == NULL)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list. "
-                    "(placeholder flags)\n");
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "problem building headers list. "
+                        "(placeholder flags)\n");
 
         HDassert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
 
@@ -1399,7 +1421,8 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "(placeholder flags)\n");
 
         /* buffer1 -> signature */
-        if (FAIL == H5FD_s3comms_HMAC_SHA256(handle->signing_key, SHA256_DIGEST_LENGTH, buffer2, HDstrlen(buffer2), buffer1))
+        if (FAIL == H5FD_s3comms_HMAC_SHA256(handle->signing_key, SHA256_DIGEST_LENGTH, buffer2,
+                                             HDstrlen(buffer2), buffer1))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "(placeholder flags)\n");
 
         iso8601now[8] = 0; /* trim to yyyyMMDD */
@@ -1408,21 +1431,22 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to format aws4 credential string");
 
         ret = HDsnprintf(authorization, 512, "AWS4-HMAC-SHA256 Credential=%s,SignedHeaders=%s,Signature=%s",
-                buffer2, signed_headers, buffer1);
+                         buffer2, signed_headers, buffer1);
         if (ret <= 0 || ret >= 512)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to format aws4 authorization string");
 
         /* append authorization header to http request buffer
-        */
-        if (H5FD_s3comms_hrb_node_set(&headers, "Authorization", (const char*) authorization) == FAIL)
+         */
+        if (H5FD_s3comms_hrb_node_set(&headers, "Authorization", (const char *)authorization) == FAIL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set Authorization header")
 
         if (headers == NULL)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list. "
-                    "(placeholder flags)\n");
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "problem building headers list. "
+                        "(placeholder flags)\n");
 
         /* update hrb's "first header" pointer
-        */
+         */
         request->first_header = headers;
 
         /**** SET CURLHANDLE HTTP HEADERS FROM GENERATED DATA ****/
@@ -1430,10 +1454,11 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
         node = request->first_header;
         while (node != NULL) {
             HDassert(node->magic == S3COMMS_HRB_NODE_MAGIC);
-            curlheaders = curl_slist_append(curlheaders, (const char*) node->cat);
+            curlheaders = curl_slist_append(curlheaders, (const char *)node->cat);
             if (curlheaders == NULL)
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not append header to curl slist. "
-                        "(placeholder flags)\n");
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                            "could not append header to curl slist. "
+                            "(placeholder flags)\n");
 
             node = node->next;
         }
@@ -1444,10 +1469,11 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "curlheaders was never populated.\n");
 
         /* finally, set http headers in curl handle
-        */
+         */
         if (curl_easy_setopt(curlh, CURLOPT_HTTPHEADER, curlheaders) != CURLE_OK)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while setting CURL option "
-                    "(CURLOPT_HTTPHEADER). (placeholder flags)");
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "error while setting CURL option "
+                        "(CURLOPT_HTTPHEADER). (placeholder flags)");
 
     } /* end if should authenticate (info provided) */
 
@@ -1481,10 +1507,10 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem unsetting error buffer")
     } /* verbose error reporting */
 #else
-            p_status = curl_easy_perform(curlh);
+    p_status = curl_easy_perform(curlh);
 
-            if (p_status != CURLE_OK)
-                HGOTO_ERROR(H5E_VFL, H5E_CANTOPENFILE, FAIL, "curl cannot perform request\n")
+    if (p_status != CURLE_OK)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTOPENFILE, FAIL, "curl cannot perform request\n")
 #endif
 
 #if S3COMMS_DEBUG
@@ -1562,11 +1588,11 @@ done:
  *             2017-07-12
  *----------------------------------------------------------------------------
  */
-struct tm*
+struct tm *
 gmnow(void)
 {
     time_t     now;
-    time_t    *now_ptr = &now;
+    time_t *   now_ptr   = &now;
     struct tm *ret_value = NULL;
 
     /* Doctor assert, checks against error in time() */
@@ -1614,16 +1640,16 @@ gmnow(void)
  */
 herr_t
 H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int _cr_size, char *signed_headers_dest,
-        int _sh_size, hrb_t *http_request)
+                                   int _sh_size, hrb_t *http_request)
 {
-    hrb_node_t *node = NULL;
+    hrb_node_t *node         = NULL;
     const char *query_params = ""; /* unused at present */
-    herr_t      ret_value = SUCCEED;
-    int         ret = 0;
-    size_t      cr_size = (size_t) _cr_size;
-    size_t      sh_size = (size_t) _sh_size;
-    size_t      cr_len = 0; /* working length of canonical request str */
-    size_t      sh_len = 0; /* working length of signed headers str */
+    herr_t      ret_value    = SUCCEED;
+    int         ret          = 0;
+    size_t      cr_size      = (size_t)_cr_size;
+    size_t      sh_size      = (size_t)_sh_size;
+    size_t      cr_len       = 0; /* working length of canonical request str */
+    size_t      sh_len       = 0; /* working length of signed headers str */
     char        tmpstr[256 + 1];
 
     tmpstr[256] = 0; /* terminating NULL */
@@ -1656,19 +1682,20 @@ H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int _cr_size, c
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "signed headers destination cannot be null.\n");
 
     /* HTTP verb, resource path, and query string lines
-    */
-    cr_len = (HDstrlen(http_request->verb) + HDstrlen(http_request->resource) + HDstrlen(query_params)
-            + (size_t) 3); /* three newline chars */
+     */
+    cr_len = (HDstrlen(http_request->verb) + HDstrlen(http_request->resource) + HDstrlen(query_params) +
+              (size_t)3); /* three newline chars */
     if (cr_len >= cr_size)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not enough space in canonical request");
 
-    ret = HDsnprintf( /* TODO: compiler warning */
-    canonical_request_dest, (cr_size - 1), "%s\n%s\n%s\n", http_request->verb, http_request->resource,  query_params);
-    if (ret < 0 || (size_t) ret >= cr_size)
+    ret = HDsnprintf(/* TODO: compiler warning */
+                     canonical_request_dest, (cr_size - 1), "%s\n%s\n%s\n", http_request->verb,
+                     http_request->resource, query_params);
+    if (ret < 0 || (size_t)ret >= cr_size)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to compose canonical request first line");
 
     /* write in canonical headers, building signed headers concurrently
-    */
+     */
     node = http_request->first_header; /* assumed sorted */
     while (node != NULL) {
         HDassert(node->magic == S3COMMS_HRB_NODE_MAGIC);
@@ -1676,7 +1703,7 @@ H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int _cr_size, c
         ret = HDsnprintf(tmpstr, 256, "%s:%s\n", node->lowername, node->value);
         if (ret < 0 || ret >= 256)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to concatenate HTTP header %s:%s",
-                    node->lowername, node->value);
+                        node->lowername, node->value);
 
         cr_len += HDstrlen(tmpstr);
         if (cr_len + 1 > cr_size)
@@ -1686,7 +1713,8 @@ H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int _cr_size, c
 
         ret = HDsnprintf(tmpstr, 256, "%s;", node->lowername);
         if (ret < 0 || ret >= 256)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to append semicolon to lowername %s", node->lowername);
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to append semicolon to lowername %s",
+                        node->lowername);
 
         sh_len += HDstrlen(tmpstr);
         if (sh_len + 1 > sh_size)
@@ -1743,7 +1771,7 @@ done:
 herr_t
 H5FD_s3comms_bytes_to_hex(char *dest, const unsigned char *msg, size_t msg_len, hbool_t lowercase)
 {
-    size_t i = 0;
+    size_t i         = 0;
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -1760,7 +1788,7 @@ H5FD_s3comms_bytes_to_hex(char *dest, const unsigned char *msg, size_t msg_len,
 
     for (i = 0; i < msg_len; i++) {
         int chars_written = HDsnprintf(&(dest[i * 2]), 3, /* 'X', 'X', '\n' */
-        (lowercase == TRUE) ? "%02x" : "%02X", msg[i]);
+                                       (lowercase == TRUE) ? "%02x" : "%02X", msg[i]);
         if (chars_written != 2) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem while writing hex chars for %c", msg[i]);
         }
@@ -1845,10 +1873,11 @@ H5FD_s3comms_free_purl(parsed_url_t *purl)
  *----------------------------------------------------------------------------
  */
 herr_t
-H5FD_s3comms_HMAC_SHA256(const unsigned char *key, size_t key_len, const char *msg, size_t msg_len, char *dest)
+H5FD_s3comms_HMAC_SHA256(const unsigned char *key, size_t key_len, const char *msg, size_t msg_len,
+                         char *dest)
 {
     unsigned char md[SHA256_DIGEST_LENGTH];
-    unsigned int  md_len = SHA256_DIGEST_LENGTH;
+    unsigned int  md_len    = SHA256_DIGEST_LENGTH;
     herr_t        ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -1860,9 +1889,9 @@ H5FD_s3comms_HMAC_SHA256(const unsigned char *key, size_t key_len, const char *m
     if (dest == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "destination cannot be null.");
 
-    HMAC(EVP_sha256(), key, (int) key_len, (const unsigned char*) msg, msg_len, md, &md_len);
+    HMAC(EVP_sha256(), key, (int)key_len, (const unsigned char *)msg, msg_len, md, &md_len);
 
-    if (H5FD_s3comms_bytes_to_hex(dest, (const unsigned char*) md, (size_t) md_len, TRUE) == FAIL)
+    if (H5FD_s3comms_bytes_to_hex(dest, (const unsigned char *)md, (size_t)md_len, TRUE) == FAIL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not convert to hex string.");
 
 done:
@@ -1915,19 +1944,27 @@ done:
  *-----------------------------------------------------------------------------
  */
 static herr_t
-H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, char *key_id,
-        char *access_key, char *aws_region)
+H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, char *key_id, char *access_key,
+                                       char *aws_region)
 {
     char        profile_line[32];
     char        buffer[128];
-    const char *setting_names[] = { "region", "aws_access_key_id", "aws_secret_access_key", };
-    char *const setting_pointers[] = { aws_region, key_id, access_key, };
-    unsigned    setting_count = 3;
-    herr_t      ret_value = SUCCEED;
-    unsigned    buffer_i = 0;
-    unsigned    setting_i = 0;
-    int         found_setting = 0;
-    char       *line_buffer = &(buffer[0]);
+    const char *setting_names[] = {
+        "region",
+        "aws_access_key_id",
+        "aws_secret_access_key",
+    };
+    char *const setting_pointers[] = {
+        aws_region,
+        key_id,
+        access_key,
+    };
+    unsigned setting_count = 3;
+    herr_t   ret_value     = SUCCEED;
+    unsigned buffer_i      = 0;
+    unsigned setting_i     = 0;
+    int      found_setting = 0;
+    char *   line_buffer   = &(buffer[0]);
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1935,7 +1972,7 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
     HDfprintf(stdout, "called load_aws_creds_from_file.\n");
 #endif
 
-/* format target line for start of profile */
+    /* format target line for start of profile */
     if (32 < HDsnprintf(profile_line, 32, "[%s]", profile_name))
         HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format profile label");
 
@@ -1968,11 +2005,11 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
 
         /* loop over names to see if line looks like assignment */
         for (setting_i = 0; setting_i < setting_count; setting_i++) {
-            size_t setting_name_len = 0;
-            const char *setting_name = NULL;
-            char line_prefix[128];
+            size_t      setting_name_len = 0;
+            const char *setting_name     = NULL;
+            char        line_prefix[128];
 
-            setting_name = setting_names[setting_i];
+            setting_name     = setting_names[setting_i];
             setting_name_len = HDstrlen(setting_name);
             if (HDsnprintf(line_prefix, 128, "%s=", setting_name) < 0)
                 HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format line prefix");
@@ -1985,7 +2022,6 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
                 if (setting_pointers[setting_i] == NULL)
                     break;
 
-
                 /* advance to end of name in string */
                 do {
                     line_buffer++;
@@ -1997,7 +2033,8 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
                 line_buffer++; /* was pointing at '='; advance */
 
                 /* copy line buffer into out pointer */
-                if (HDstrncpy(setting_pointers[setting_i], (const char *)line_buffer, HDstrlen(line_buffer)) == NULL)
+                if (HDstrncpy(setting_pointers[setting_i], (const char *)line_buffer,
+                              HDstrlen(line_buffer)) == NULL)
                     HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to copy line into pointer");
 
                 /* "trim" tailing whitespace by replacing with null terminator*/
@@ -2008,8 +2045,8 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
                 setting_pointers[setting_i][buffer_i] = '\0';
 
                 break; /* have read setting; don't compare with others */
-            } /* end if possible name match */
-        } /* end for each setting name */
+            }          /* end if possible name match */
+        }              /* end for each setting name */
     } while (found_setting);
 
 done:
@@ -2045,10 +2082,11 @@ done:
  *----------------------------------------------------------------------------
  */
 herr_t
-H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *secret_access_key_out, char *aws_region_out)
+H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *secret_access_key_out,
+                              char *aws_region_out)
 {
     herr_t ret_value = SUCCEED;
-    FILE  *credfile = NULL;
+    FILE * credfile  = NULL;
     char   awspath[117];
     char   filepath[128];
     int    ret = 0;
@@ -2060,21 +2098,21 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
 #endif
 
 #ifdef H5_HAVE_WIN32_API
-    ret = HDsnprintf(awspath, 117, "%s/.aws/", getenv("USERPROFILE")) ;
+    ret = HDsnprintf(awspath, 117, "%s/.aws/", getenv("USERPROFILE"));
 #else
     ret = HDsnprintf(awspath, 117, "%s/.aws/", getenv("HOME"));
 #endif
-    if (ret < 0 || (size_t) ret >= 117)
+    if (ret < 0 || (size_t)ret >= 117)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format home-aws path")
 
     ret = HDsnprintf(filepath, 128, "%s%s", awspath, "credentials");
-    if (ret < 0 || (size_t) ret >= 128)
+    if (ret < 0 || (size_t)ret >= 128)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format credentials path")
 
     credfile = fopen(filepath, "r");
     if (credfile != NULL) {
         if (H5FD__s3comms_load_aws_creds_from_file(credfile, profile_name, key_id_out, secret_access_key_out,
-                aws_region_out) == FAIL) {
+                                                   aws_region_out) == FAIL) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to load from aws credentials")
         }
         if (fclose(credfile) == EOF)
@@ -2084,13 +2122,13 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
     } /* end if credential file opened */
 
     ret = HDsnprintf(filepath, 128, "%s%s", awspath, "config");
-    if (ret < 0 || (size_t) ret >= 128)
+    if (ret < 0 || (size_t)ret >= 128)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format config path")
 
     credfile = fopen(filepath, "r");
     if (credfile != NULL) {
-        if (H5FD__s3comms_load_aws_creds_from_file(credfile, profile_name,
-                (*key_id_out == 0) ? key_id_out : NULL,
+        if (H5FD__s3comms_load_aws_creds_from_file(
+                credfile, profile_name, (*key_id_out == 0) ? key_id_out : NULL,
                 (*secret_access_key_out == 0) ? secret_access_key_out : NULL,
                 (*aws_region_out == 0) ? aws_region_out : NULL) == FAIL) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to load from aws config")
@@ -2105,7 +2143,8 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
     if (*key_id_out == 0 || *secret_access_key_out == 0 || *aws_region_out == 0)
         ret_value = FAIL;
 
-    done: if (credfile != NULL) {
+done:
+    if (credfile != NULL) {
         if (fclose(credfile) == EOF) {
             HDONE_ERROR(H5E_ARGS, H5E_ARGS, FAIL, "problem error-closing aws configuration file")
         }
@@ -2153,7 +2192,7 @@ H5FD_s3comms_nlowercase(char *dest, const char *s, size_t len)
         HDmemcpy(dest, s, len);
         do {
             len--;
-            dest[len] = (char) tolower((int) dest[len]);
+            dest[len] = (char)tolower((int)dest[len]);
         } while (len > 0);
     }
 
@@ -2191,12 +2230,12 @@ done:
 herr_t
 H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
 {
-    parsed_url_t *purl = NULL; /* pointer to new structure */
-    const char   *tmpstr = NULL; /* working pointer in string */
-    const char   *curstr = str; /* "start" pointer in string */
-    long int      len = 0; /* substring length */
-    long int      urllen = 0; /* length of passed-in url string */
-    unsigned int  i = 0;
+    parsed_url_t *purl      = NULL; /* pointer to new structure */
+    const char *  tmpstr    = NULL; /* working pointer in string */
+    const char *  curstr    = str;  /* "start" pointer in string */
+    long int      len       = 0;    /* substring length */
+    long int      urllen    = 0;    /* length of passed-in url string */
+    unsigned int  i         = 0;
     herr_t        ret_value = FAIL;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -2208,18 +2247,18 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
     if (str == NULL || *str == '\0')
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid url string");
 
-    urllen = (long int) HDstrlen(str);
+    urllen = (long int)HDstrlen(str);
 
-    purl = (parsed_url_t*) H5MM_malloc(sizeof(parsed_url_t));
+    purl = (parsed_url_t *)H5MM_malloc(sizeof(parsed_url_t));
     if (purl == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "can't allocate space for parsed_url_t");
 
-    purl->magic = S3COMMS_PARSED_URL_MAGIC;
+    purl->magic  = S3COMMS_PARSED_URL_MAGIC;
     purl->scheme = NULL;
-    purl->host = NULL;
-    purl->port = NULL;
-    purl->path = NULL;
-    purl->query = NULL;
+    purl->host   = NULL;
+    purl->port   = NULL;
+    purl->path   = NULL;
+    purl->query  = NULL;
 
     /***************
      * READ SCHEME *
@@ -2239,14 +2278,14 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid SCHEME construction");
     }
     /* copy lowercased scheme to structure */
-    purl->scheme = (char*) H5MM_malloc(sizeof(char) * (size_t)(len + 1));
+    purl->scheme = (char *)H5MM_malloc(sizeof(char) * (size_t)(len + 1));
     if (purl->scheme == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "can't allocate space for SCHEME");
 
-    (void) HDstrncpy(purl->scheme, curstr, (size_t )len);
+    (void)HDstrncpy(purl->scheme, curstr, (size_t)len);
     purl->scheme[len] = '\0';
     for (i = 0; i < len; i++) {
-        purl->scheme[i] = (char) tolower(purl->scheme[i]);
+        purl->scheme[i] = (char)tolower(purl->scheme[i]);
     }
 
     /* Skip "://" */
@@ -2254,8 +2293,8 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
     curstr = tmpstr;
 
     /*************
-    * READ HOST *
-    *************/
+     * READ HOST *
+     *************/
 
     if (*curstr == '[') {
         /* IPv6 */
@@ -2284,11 +2323,11 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
     }
 
     /* copy host */
-    purl->host = (char*) H5MM_malloc(sizeof(char) * (size_t)(len + 1));
+    purl->host = (char *)H5MM_malloc(sizeof(char) * (size_t)(len + 1));
     if (purl->host == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "can't allocate space for HOST");
 
-    (void) HDstrncpy(purl->host, curstr, (size_t )len);
+    (void)HDstrncpy(purl->host, curstr, (size_t)len);
     purl->host[len] = 0;
 
     /*************
@@ -2315,12 +2354,12 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
         }
 
         /* copy port
-        */
-        purl->port = (char*) H5MM_malloc(sizeof(char) * (size_t)(len + 1));
+         */
+        purl->port = (char *)H5MM_malloc(sizeof(char) * (size_t)(len + 1));
         if (purl->port == NULL) /* cannot malloc */
             HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "can't allocate space for PORT");
 
-        (void) HDstrncpy(purl->port, curstr, (size_t )len);
+        (void)HDstrncpy(purl->port, curstr, (size_t)len);
         purl->port[len] = 0;
     } /* end if PORT element */
 
@@ -2334,7 +2373,7 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
         curstr = tmpstr;
 
         /* seek end of PATH
-        */
+         */
         while ((0 != *tmpstr) && ('?' != *tmpstr)) {
             tmpstr++;
         }
@@ -2343,11 +2382,11 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem with length of PATH substring");
 
         if (len > 0) {
-            purl->path = (char*) H5MM_malloc(sizeof(char) * (size_t)(len + 1));
+            purl->path = (char *)H5MM_malloc(sizeof(char) * (size_t)(len + 1));
             if (purl->path == NULL)
                 HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "can't allocate space for PATH");
-             /* cannot malloc path pointer */
-            (void) HDstrncpy(purl->path, curstr, (size_t )len);
+            /* cannot malloc path pointer */
+            (void)HDstrncpy(purl->path, curstr, (size_t)len);
             purl->path[len] = 0;
         }
     } /* end if PATH element */
@@ -2369,15 +2408,15 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
         else if (len > urllen) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem with length of QUERY substring");
         }
-        purl->query = (char*) H5MM_malloc(sizeof(char) * (size_t)(len + 1));
+        purl->query = (char *)H5MM_malloc(sizeof(char) * (size_t)(len + 1));
         if (purl->query == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "can't allocate space for QUERY");
         /* cannot malloc path pointer */
-        (void) HDstrncpy(purl->query, curstr, (size_t )len);
+        (void)HDstrncpy(purl->query, curstr, (size_t)len);
         purl->query[len] = 0;
     } /* end if QUERY exists */
 
-    *_purl = purl;
+    *_purl    = purl;
     ret_value = SUCCEED;
 
 done:
@@ -2425,11 +2464,11 @@ done:
 herr_t
 H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr_len)
 {
-    unsigned int i = 0;
+    unsigned int i             = 0;
     int          chars_written = 0;
-    herr_t       ret_value = SUCCEED;
+    herr_t       ret_value     = SUCCEED;
 #if S3COMMS_DEBUG
-    unsigned char s[2] = {c, 0};
+    unsigned char s[2]   = {c, 0};
     unsigned char hex[3] = {0, 0, 0};
 #endif
 
@@ -2442,21 +2481,20 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
     if (repr == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination `repr`.\n")
 
-
 #if S3COMMS_DEBUG
     H5FD_s3comms_bytes_to_hex((char *)hex, s, 1, FALSE);
     HDfprintf(stdout, "    CHAR: \'%s\'\n", s);
     HDfprintf(stdout, "    CHAR-HEX: \"%s\"\n", hex);
 #endif
 
-    if (c <= (unsigned char) 0x7f) {
+    if (c <= (unsigned char)0x7f) {
         /* character represented in a single "byte"
          * and single percent-code
          */
 #if S3COMMS_DEBUG
         HDfprintf(stdout, "    SINGLE-BYTE\n");
 #endif
-        *repr_len = 3;
+        *repr_len     = 3;
         chars_written = HDsnprintf(repr, 4, "%%%02X", c);
         if (chars_written < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cannot write char %c", c);
@@ -2464,23 +2502,23 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
     } /* end if single-byte unicode char */
     else {
         /* multi-byte, multi-percent representation */
-        unsigned int acc = 0; /* byte accumulator */
-        unsigned int k = 0; /* uint character representation */
-        unsigned int stack_size = 0;
-                unsigned char stack[4] = { 0, 0, 0, 0 };
+        unsigned int  acc        = 0; /* byte accumulator */
+        unsigned int  k          = 0; /* uint character representation */
+        unsigned int  stack_size = 0;
+        unsigned char stack[4]   = {0, 0, 0, 0};
 #if S3COMMS_DEBUG
         HDfprintf(stdout, "    MULTI-BYTE\n");
 #endif
         stack_size = 0;
-        k = (unsigned int) c;
-        *repr_len = 0;
+        k          = (unsigned int)c;
+        *repr_len  = 0;
         do {
             /* push number onto stack in six-bit slices */
             acc = k;
             acc >>= 6; /* cull least */
             acc <<= 6; /* six bits   */
-            stack[stack_size++] = (unsigned char) (k - acc);
-            k = acc >> 6;
+            stack[stack_size++] = (unsigned char)(k - acc);
+            k                   = acc >> 6;
         } while (k > 0);
 
         /* `stack` now has two to four six-bit 'numbers' to be put into
@@ -2503,11 +2541,11 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
 
         /* prepend 11[1[1]]0 to first byte */
         /* 110xxxxx, 1110xxxx, or 11110xxx */
-        acc = 0xC0; /* 0x11000000 */
+        acc = 0xC0;                         /* 0x11000000 */
         acc += (stack_size > 2) ? 0x20 : 0; /* 0x00100000 */
         acc += (stack_size > 3) ? 0x10 : 0; /* 0x00010000 */
         stack_size--;
-        chars_written = HDsnprintf(repr, 4, "%%%02X", (unsigned char) (acc + stack[stack_size]));
+        chars_written = HDsnprintf(repr, 4, "%%%02X", (unsigned char)(acc + stack[stack_size]));
         if (chars_written < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cannot write char %c", c);
 
@@ -2519,13 +2557,14 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
 
         /* 10xxxxxx */
         for (i = 0; i < stack_size; i++) {
-            chars_written = HDsnprintf(&repr[i * 3 + 3], 4, "%%%02X", (unsigned char) (0x80 + stack[stack_size - 1 - i]));
+            chars_written =
+                HDsnprintf(&repr[i * 3 + 3], 4, "%%%02X", (unsigned char)(0x80 + stack[stack_size - 1 - i]));
             if (chars_written < 0)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cannot write char %c", c);
 
             *repr_len += 3;
         } /* end for each continuation byte */
-    } /* end else (multi-byte) */
+    }     /* end else (multi-byte) */
 
     *(repr + *repr_len) = '\0';
 
@@ -2570,12 +2609,12 @@ done:
 herr_t
 H5FD_s3comms_signing_key(unsigned char *md, const char *secret, const char *region, const char *iso8601now)
 {
-    char         *AWS4_secret = NULL;
+    char *        AWS4_secret     = NULL;
     size_t        AWS4_secret_len = 0;
     unsigned char datekey[SHA256_DIGEST_LENGTH];
     unsigned char dateregionkey[SHA256_DIGEST_LENGTH];
     unsigned char dateregionservicekey[SHA256_DIGEST_LENGTH];
-    int           ret = 0; /* return value of HDsnprintf */
+    int           ret       = 0; /* return value of HDsnprintf */
     herr_t        ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -2597,27 +2636,27 @@ H5FD_s3comms_signing_key(unsigned char *md, const char *secret, const char *regi
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "`iso8601now` cannot be NULL.\n")
 
     AWS4_secret_len = 4 + HDstrlen(secret) + 1;
-    AWS4_secret = (char*) H5MM_malloc(sizeof(char*) * AWS4_secret_len);
+    AWS4_secret     = (char *)H5MM_malloc(sizeof(char *) * AWS4_secret_len);
     if (AWS4_secret == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Could not allocate space.\n")
 
     /* prepend "AWS4" to start of the secret key */
     ret = HDsnprintf(AWS4_secret, AWS4_secret_len, "%s%s", "AWS4", secret);
-    if ((size_t) ret != (AWS4_secret_len - 1))
+    if ((size_t)ret != (AWS4_secret_len - 1))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem writing AWS4+secret `%s`", secret);
 
     /* hash_func, key, len(key), msg, len(msg), digest_dest, digest_len_dest
      * we know digest length, so ignore via NULL
      */
-    HMAC(EVP_sha256(), (const unsigned char*) AWS4_secret, (int) HDstrlen(AWS4_secret),
-            (const unsigned char*) iso8601now, 8, /* 8 --> length of 8 --> "yyyyMMDD"  */
-            datekey, NULL);
-    HMAC(EVP_sha256(), (const unsigned char*) datekey, SHA256_DIGEST_LENGTH, (const unsigned char*) region,
-            HDstrlen(region), dateregionkey, NULL);
-    HMAC(EVP_sha256(), (const unsigned char*) dateregionkey, SHA256_DIGEST_LENGTH, (const unsigned char*) "s3",
-            2, dateregionservicekey, NULL);
-    HMAC(EVP_sha256(), (const unsigned char*) dateregionservicekey, SHA256_DIGEST_LENGTH,
-            (const unsigned char*) "aws4_request", 12, md, NULL);
+    HMAC(EVP_sha256(), (const unsigned char *)AWS4_secret, (int)HDstrlen(AWS4_secret),
+         (const unsigned char *)iso8601now, 8, /* 8 --> length of 8 --> "yyyyMMDD"  */
+         datekey, NULL);
+    HMAC(EVP_sha256(), (const unsigned char *)datekey, SHA256_DIGEST_LENGTH, (const unsigned char *)region,
+         HDstrlen(region), dateregionkey, NULL);
+    HMAC(EVP_sha256(), (const unsigned char *)dateregionkey, SHA256_DIGEST_LENGTH,
+         (const unsigned char *)"s3", 2, dateregionservicekey, NULL);
+    HMAC(EVP_sha256(), (const unsigned char *)dateregionservicekey, SHA256_DIGEST_LENGTH,
+         (const unsigned char *)"aws4_request", 12, md, NULL);
 
 done:
     H5MM_xfree(AWS4_secret);
@@ -2664,8 +2703,8 @@ H5FD_s3comms_tostringtosign(char *dest, const char *req, const char *now, const
     size_t        d = 0;
     char          day[9];
     char          hexsum[SHA256_DIGEST_LENGTH * 2 + 1];
-    size_t        i = 0;
-    int           ret = 0; /* HDsnprintf return value */
+    size_t        i         = 0;
+    int           ret       = 0; /* HDsnprintf return value */
     herr_t        ret_value = SUCCEED;
     char          tmp[128];
 
@@ -2692,11 +2731,11 @@ H5FD_s3comms_tostringtosign(char *dest, const char *req, const char *now, const
     }
     for (i = 0; i < SHA256_DIGEST_LENGTH * 2 + 1; i++) {
         checksum[i] = '\0';
-        hexsum[i] = '\0';
+        hexsum[i]   = '\0';
     }
     HDstrncpy(day, now, 8);
     day[8] = '\0';
-    ret = HDsnprintf(tmp, 127, "%s/%s/s3/aws4_request", day, region);
+    ret    = HDsnprintf(tmp, 127, "%s/%s/s3/aws4_request", day, region);
     if (ret <= 0 || ret >= 127)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem adding day and region to string")
 
@@ -2711,9 +2750,10 @@ H5FD_s3comms_tostringtosign(char *dest, const char *req, const char *now, const
     d += HDstrlen(tmp);
     dest[d++] = '\n';
 
-    SHA256((const unsigned char*) req, HDstrlen(req), checksum);
+    SHA256((const unsigned char *)req, HDstrlen(req), checksum);
 
-    if (H5FD_s3comms_bytes_to_hex(hexsum, (const unsigned char*) checksum, SHA256_DIGEST_LENGTH, TRUE) == FAIL)
+    if (H5FD_s3comms_bytes_to_hex(hexsum, (const unsigned char *)checksum, SHA256_DIGEST_LENGTH, TRUE) ==
+        FAIL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not create hex string");
 
     for (i = 0; i < SHA256_DIGEST_LENGTH * 2; i++) {
@@ -2771,9 +2811,9 @@ H5FD_s3comms_trim(char *dest, char *s, size_t s_len, size_t *n_written)
 
     if (s_len > 0) {
         /* Find first non-whitespace character from start;
-        * reduce total length per character.
-        */
-        while ((s_len > 0) && isspace((unsigned char) s[0]) && s_len > 0) {
+         * reduce total length per character.
+         */
+        while ((s_len > 0) && isspace((unsigned char)s[0]) && s_len > 0) {
             s++;
             s_len--;
         }
@@ -2785,11 +2825,11 @@ H5FD_s3comms_trim(char *dest, char *s, size_t s_len, size_t *n_written)
         if (s_len > 0) {
             do {
                 s_len--;
-            } while (isspace((unsigned char) s[s_len]));
+            } while (isspace((unsigned char)s[s_len]));
             s_len++;
 
             /* write output into dest
-            */
+             */
             HDmemcpy(dest, s, s_len);
         }
     }
@@ -2837,13 +2877,13 @@ done:
 herr_t
 H5FD_s3comms_uriencode(char *dest, const char *s, size_t s_len, hbool_t encode_slash, size_t *n_written)
 {
-    char   c = 0;
+    char   c        = 0;
     size_t dest_off = 0;
     char   hex_buffer[13];
-    size_t hex_off = 0;
-    size_t hex_len = 0;
+    size_t hex_off   = 0;
+    size_t hex_len   = 0;
     herr_t ret_value = SUCCEED;
-    size_t s_off = 0;
+    size_t s_off     = 0;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2858,28 +2898,31 @@ H5FD_s3comms_uriencode(char *dest, const char *s, size_t s_len, hbool_t encode_s
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "destination cannot be NULL");
 
     /* Write characters to destination, converting to percent-encoded
-    * "hex-utf-8" strings if necessary.
-    * e.g., '$' -> "%24"
-    */
+     * "hex-utf-8" strings if necessary.
+     * e.g., '$' -> "%24"
+     */
     for (s_off = 0; s_off < s_len; s_off++) {
         c = s[s_off];
-        if (isalnum(c) || c == '.' || c == '-' || c == '_' || c == '~' || (c == '/' && encode_slash == FALSE)) {
+        if (isalnum(c) || c == '.' || c == '-' || c == '_' || c == '~' ||
+            (c == '/' && encode_slash == FALSE)) {
             dest[dest_off++] = c;
         }
         else {
             hex_off = 0;
-            if (H5FD_s3comms_percent_encode_char(hex_buffer, (const unsigned char) c, &hex_len) == FAIL) {
+            if (H5FD_s3comms_percent_encode_char(hex_buffer, (const unsigned char)c, &hex_len) == FAIL) {
                 hex_buffer[0] = c;
                 hex_buffer[1] = 0;
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to percent-encode character \'%s\' "
-                        "at %d in \"%s\"", hex_buffer, (int )s_off, s);
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                            "unable to percent-encode character \'%s\' "
+                            "at %d in \"%s\"",
+                            hex_buffer, (int)s_off, s);
             }
 
             for (hex_off = 0; hex_off < hex_len; hex_off++) {
                 dest[dest_off++] = hex_buffer[hex_off];
             }
         } /* end else (not a regular character) */
-    } /* end for each character */
+    }     /* end for each character */
 
     if (dest_off < s_len)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "buffer overflow");
@@ -2891,4 +2934,3 @@ done:
 } /* H5FD_s3comms_uriencode */
 
 #endif /* H5_HAVE_ROS3_VFD */
-
diff --git a/src/H5FDs3comms.h b/src/H5FDs3comms.h
index c9d6c9d..6bd3232 100644
--- a/src/H5FDs3comms.h
+++ b/src/H5FDs3comms.h
@@ -55,8 +55,7 @@
 #ifndef H5FDs3comms_H
 #define H5FDs3comms_H
 
-
-#include "H5private.h"      /* Generic Functions        */
+#include "H5private.h" /* Generic Functions        */
 
 #ifdef H5_HAVE_ROS3_VFD
 
@@ -73,8 +72,7 @@
 /* hexadecimal string of pre-computed sha256 checksum of the empty string
  * hex(sha256sum(""))
  */
-#define EMPTY_SHA256 \
-"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+#define EMPTY_SHA256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 
 /* string length (plus null terminator)
  * example ISO8601-format string: "20170713T145903Z" (YYYYmmdd'T'HHMMSS'_')
@@ -102,8 +100,7 @@
  *
  *---------------------------------------------------------------------------
  */
-#define ISO8601NOW(dest, now_gm) \
-strftime((dest), ISO8601_SIZE, "%Y%m%dT%H%M%SZ", (now_gm))
+#define ISO8601NOW(dest, now_gm) strftime((dest), ISO8601_SIZE, "%Y%m%dT%H%M%SZ", (now_gm))
 
 /*---------------------------------------------------------------------------
  *
@@ -121,9 +118,7 @@ strftime((dest), ISO8601_SIZE, "%Y%m%dT%H%M%SZ", (now_gm))
  *
  *---------------------------------------------------------------------------
  */
-#define RFC7231NOW(dest, now_gm) \
-strftime((dest), RFC7231_SIZE, "%a, %d %b %Y %H:%M:%S GMT", (now_gm))
-
+#define RFC7231NOW(dest, now_gm) strftime((dest), RFC7231_SIZE, "%a, %d %b %Y %H:%M:%S GMT", (now_gm))
 
 /* Reasonable maximum length of a credential string.
  * Provided for error-checking S3COMMS_FORMAT_CREDENTIAL (below).
@@ -135,7 +130,6 @@ strftime((dest), RFC7231_SIZE, "%a, %d %b %Y %H:%M:%S GMT", (now_gm))
  */
 #define S3COMMS_MAX_CREDENTIAL_SIZE 155
 
-
 /*---------------------------------------------------------------------------
  *
  * Macro: H5FD_S3COMMS_FORMAT_CREDENTIAL()
@@ -166,16 +160,14 @@ strftime((dest), RFC7231_SIZE, "%a, %d %b %Y %H:%M:%S GMT", (now_gm))
  *
  *---------------------------------------------------------------------------
  */
-#define S3COMMS_FORMAT_CREDENTIAL(dest, access, iso8601_date, region, service) \
-HDsnprintf((dest), S3COMMS_MAX_CREDENTIAL_SIZE,                                  \
-         "%s/%s/%s/%s/aws4_request",                                           \
-         (access), (iso8601_date), (region), (service))
+#define S3COMMS_FORMAT_CREDENTIAL(dest, access, iso8601_date, region, service)                               \
+    HDsnprintf((dest), S3COMMS_MAX_CREDENTIAL_SIZE, "%s/%s/%s/%s/aws4_request", (access), (iso8601_date),    \
+               (region), (service))
 
 /*********************
  * PUBLIC STRUCTURES *
  *********************/
 
-
 /*----------------------------------------------------------------------------
  *
  * Structure: hrb_node_t
@@ -260,15 +252,14 @@ HDsnprintf((dest), S3COMMS_MAX_CREDENTIAL_SIZE,
  */
 typedef struct hrb_node_t {
     unsigned long      magic;
-    char              *name;
-    char              *value;
-    char              *cat;
-    char              *lowername;
+    char *             name;
+    char *             value;
+    char *             cat;
+    char *             lowername;
     struct hrb_node_t *next;
 } hrb_node_t;
 #define S3COMMS_HRB_NODE_MAGIC 0x7F5757UL
 
-
 /*----------------------------------------------------------------------------
  *
  * Structure: hrb_t
@@ -336,17 +327,16 @@ typedef struct hrb_node_t {
  *----------------------------------------------------------------------------
  */
 typedef struct {
-    unsigned long  magic;
-    char          *body;
-    size_t         body_len;
-    hrb_node_t    *first_header;
-    char          *resource;
-    char          *verb;
-    char          *version;
+    unsigned long magic;
+    char *        body;
+    size_t        body_len;
+    hrb_node_t *  first_header;
+    char *        resource;
+    char *        verb;
+    char *        version;
 } hrb_t;
 #define S3COMMS_HRB_MAGIC 0x6DCC84UL
 
-
 /*----------------------------------------------------------------------------
  *
  * Structure: parsed_url_t
@@ -400,16 +390,15 @@ typedef struct {
  *----------------------------------------------------------------------------
  */
 typedef struct {
-    unsigned long  magic;
-    char          *scheme; /* required */
-    char          *host;   /* required */
-    char          *port;
-    char          *path;
-    char          *query;
+    unsigned long magic;
+    char *        scheme; /* required */
+    char *        host;   /* required */
+    char *        port;
+    char *        path;
+    char *        query;
 } parsed_url_t;
 #define S3COMMS_PARSED_URL_MAGIC 0x21D0DFUL
 
-
 /*----------------------------------------------------------------------------
  *
  * Structure: s3r_t
@@ -490,12 +479,12 @@ typedef struct {
  */
 typedef struct {
     unsigned long  magic;
-    CURL          *curlhandle;
+    CURL *         curlhandle;
     size_t         filesize;
-    char          *httpverb;
-    parsed_url_t  *purl;
-    char          *region;
-    char          *secret_id;
+    char *         httpverb;
+    parsed_url_t * purl;
+    char *         region;
+    char *         secret_id;
     unsigned char *signing_key;
 } s3r_t;
 
@@ -509,9 +498,7 @@ extern "C" {
  * DECLARATION OF HTTP FIELD LIST ROUTINES *
  *******************************************/
 
-H5_DLL herr_t H5FD_s3comms_hrb_node_set(hrb_node_t **L,
-                                 const char  *name,
-                                 const char  *value);
+H5_DLL herr_t H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value);
 
 /***********************************************
  * DECLARATION OF HTTP REQUEST BUFFER ROUTINES *
@@ -519,9 +506,7 @@ H5_DLL herr_t H5FD_s3comms_hrb_node_set(hrb_node_t **L,
 
 H5_DLL herr_t H5FD_s3comms_hrb_destroy(hrb_t **buf);
 
-H5_DLL hrb_t * H5FD_s3comms_hrb_init_request(const char *verb,
-                                      const char *resource,
-                                      const char *host);
+H5_DLL hrb_t *H5FD_s3comms_hrb_init_request(const char *verb, const char *resource, const char *host);
 
 /*************************************
  * DECLARATION OF S3REQUEST ROUTINES *
@@ -531,74 +516,47 @@ H5_DLL herr_t H5FD_s3comms_s3r_close(s3r_t *handle);
 
 H5_DLL size_t H5FD_s3comms_s3r_get_filesize(s3r_t *handle);
 
-H5_DLL s3r_t * H5FD_s3comms_s3r_open(const char          url[],
-                                     const char          region[],
-                                     const char          id[],
-                                     const unsigned char signing_key[]);
+H5_DLL s3r_t *H5FD_s3comms_s3r_open(const char url[], const char region[], const char id[],
+                                    const unsigned char signing_key[]);
 
-H5_DLL herr_t H5FD_s3comms_s3r_read(s3r_t   *handle,
-                                    haddr_t  offset,
-                                    size_t   len,
-                                    void    *dest);
+H5_DLL herr_t H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest);
 
 /*********************************
  * DECLARATION OF OTHER ROUTINES *
  *********************************/
 
-H5_DLL struct tm * gmnow(void);
+H5_DLL struct tm *gmnow(void);
 
-H5_DLL herr_t H5FD_s3comms_aws_canonical_request(char  *canonical_request_dest,
-                                          int    cr_size,
-                                          char  *signed_headers_dest,
-                                          int    sh_size,
-                                          hrb_t *http_request);
+H5_DLL herr_t H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int cr_size,
+                                                 char *signed_headers_dest, int sh_size, hrb_t *http_request);
 
-H5_DLL herr_t H5FD_s3comms_bytes_to_hex(char                *dest,
-                                 const unsigned char *msg,
-                                 size_t               msg_len,
-                                 hbool_t              lowercase);
+H5_DLL herr_t H5FD_s3comms_bytes_to_hex(char *dest, const unsigned char *msg, size_t msg_len,
+                                        hbool_t lowercase);
 
 H5_DLL herr_t H5FD_s3comms_free_purl(parsed_url_t *purl);
 
-H5_DLL herr_t H5FD_s3comms_HMAC_SHA256(const unsigned char *key,
-                                size_t               key_len,
-                                const char          *msg,
-                                size_t               msg_len,
-                                char                *dest);
+H5_DLL herr_t H5FD_s3comms_HMAC_SHA256(const unsigned char *key, size_t key_len, const char *msg,
+                                       size_t msg_len, char *dest);
 
-H5_DLL herr_t H5FD_s3comms_load_aws_profile(const char *name,
-                                     char       *key_id_out,
-                                     char       *secret_access_key_out,
-                                     char       *aws_region_out);
+H5_DLL herr_t H5FD_s3comms_load_aws_profile(const char *name, char *key_id_out, char *secret_access_key_out,
+                                            char *aws_region_out);
 
-H5_DLL herr_t H5FD_s3comms_nlowercase(char       *dest,
-                               const char *s,
-                               size_t      len);
+H5_DLL herr_t H5FD_s3comms_nlowercase(char *dest, const char *s, size_t len);
 
-H5_DLL herr_t H5FD_s3comms_parse_url(const char    *str,
-                              parsed_url_t **purl);
+H5_DLL herr_t H5FD_s3comms_parse_url(const char *str, parsed_url_t **purl);
 
-H5_DLL herr_t H5FD_s3comms_percent_encode_char(char                *repr,
-                                        const unsigned char  c,
-                                        size_t              *repr_len);
+H5_DLL herr_t H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr_len);
 
-H5_DLL herr_t H5FD_s3comms_signing_key(unsigned char *md,
-                                       const char    *secret,
-                                       const char    *region,
-                                       const char    *iso8601now);
+H5_DLL herr_t H5FD_s3comms_signing_key(unsigned char *md, const char *secret, const char *region,
+                                       const char *iso8601now);
 
-H5_DLL herr_t H5FD_s3comms_tostringtosign(char       *dest,
-                                   const char *req_str,
-                                   const char *now,
-                                   const char *region);
+H5_DLL herr_t H5FD_s3comms_tostringtosign(char *dest, const char *req_str, const char *now,
+                                          const char *region);
 
-H5_DLL herr_t H5FD_s3comms_trim(char   *dest,
-                         char   *s,
-                         size_t  s_len,
-                         size_t *n_written);
+H5_DLL herr_t H5FD_s3comms_trim(char *dest, char *s, size_t s_len, size_t *n_written);
 
-H5_DLL herr_t H5FD_s3comms_uriencode(char *dest, const char *s, size_t s_len,
-    hbool_t encode_slash, size_t *n_written);
+H5_DLL herr_t H5FD_s3comms_uriencode(char *dest, const char *s, size_t s_len, hbool_t encode_slash,
+                                     size_t *n_written);
 
 #ifdef __cplusplus
 }
@@ -607,4 +565,3 @@ H5_DLL herr_t H5FD_s3comms_uriencode(char *dest, const char *s, size_t s_len,
 #endif /* H5_HAVE_ROS3_VFD */
 
 #endif /* ifndef H5FDs3comms_H */
-
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 3ee738c..aedabe7 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -24,18 +24,17 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC  H5FD_sec2_init_interface
-
-
-#include "H5private.h"      /* Generic Functions        */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5Fprivate.h"     /* File access              */
-#include "H5FDprivate.h"    /* File drivers             */
-#include "H5FDsec2.h"       /* Sec2 file driver         */
-#include "H5FLprivate.h"    /* Free Lists               */
-#include "H5Iprivate.h"     /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management        */
-#include "H5Pprivate.h"     /* Property lists           */
+#define H5_INTERFACE_INIT_FUNC H5FD_sec2_init_interface
+
+#include "H5private.h"   /* Generic Functions        */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5Fprivate.h"  /* File access              */
+#include "H5FDprivate.h" /* File drivers             */
+#include "H5FDsec2.h"    /* Sec2 file driver         */
+#include "H5FLprivate.h" /* Free Lists               */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Pprivate.h"  /* Property lists           */
 
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_SEC2_g = 0;
@@ -52,13 +51,13 @@ static hid_t H5FD_SEC2_g = 0;
  * occurs), and 'op' will be set to H5F_OP_UNKNOWN.
  */
 typedef struct H5FD_sec2_t {
-    H5FD_t          pub;    /* public stuff, must be first      */
-    int             fd;     /* the filesystem file descriptor   */
-    haddr_t         eoa;    /* end of allocated region          */
-    haddr_t         eof;    /* end of file; current file size   */
-    haddr_t         pos;    /* current file I/O position        */
-    H5FD_file_op_t  op;     /* last operation                   */
-    char            filename[H5FD_MAX_FILENAME_LEN];    /* Copy of file name from open operation */
+    H5FD_t         pub;                             /* public stuff, must be first      */
+    int            fd;                              /* the filesystem file descriptor   */
+    haddr_t        eoa;                             /* end of allocated region          */
+    haddr_t        eof;                             /* end of file; current file size   */
+    haddr_t        pos;                             /* current file I/O position        */
+    H5FD_file_op_t op;                              /* last operation                   */
+    char           filename[H5FD_MAX_FILENAME_LEN]; /* Copy of file name from open operation */
 #ifndef H5_HAVE_WIN32_API
     /* On most systems the combination of device and i-node number uniquely
      * identify a file.  Note that Cygwin, MinGW and other Windows POSIX
@@ -66,8 +65,8 @@ typedef struct H5FD_sec2_t {
      * and will use the 'device + inodes' scheme as opposed to the
      * Windows code further below.
      */
-    dev_t           device;     /* file device number   */
-    ino_t           inode;      /* file i-node number   */
+    dev_t device; /* file device number   */
+    ino_t inode;  /* file i-node number   */
 #else
     /* Files in windows are uniquely identified by the volume serial
      * number and the file index (both low and high parts).
@@ -83,19 +82,19 @@ typedef struct H5FD_sec2_t {
      *
      * http://msdn.microsoft.com/en-us/library/aa363788(v=VS.85).aspx
      */
-    DWORD           nFileIndexLow;
-    DWORD           nFileIndexHigh;
-    DWORD           dwVolumeSerialNumber;
-    
-    HANDLE          hFile;      /* Native windows file handle */
-#endif  /* H5_HAVE_WIN32_API */
+    DWORD nFileIndexLow;
+    DWORD nFileIndexHigh;
+    DWORD dwVolumeSerialNumber;
+
+    HANDLE hFile; /* Native windows file handle */
+#endif /* H5_HAVE_WIN32_API */
 
     /* Information from properties set by 'h5repart' tool
      *
      * Whether to eliminate the family driver info and convert this file to
      * a single file.
      */
-    hbool_t         fam_to_sec2;
+    hbool_t fam_to_sec2;
 } H5FD_sec2_t;
 
 /*
@@ -113,67 +112,64 @@ typedef struct H5FD_sec2_t {
  *                  which can be addressed entirely by the second
  *                  argument of the file seek function.
  */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
-#define ADDR_OVERFLOW(A)    (HADDR_UNDEF==(A) || ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z)    ((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z)    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) ||    \
-                                 HADDR_UNDEF==(A)+(Z) ||                    \
-                                (HDoff_t)((A)+(Z))<(HDoff_t)(A))
+#define MAXADDR          (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
+#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR)
+#define REGION_OVERFLOW(A, Z)                                                                                \
+    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A))
 
 /* Prototypes */
-static H5FD_t *H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id,
-            haddr_t maxaddr);
-static herr_t H5FD_sec2_close(H5FD_t *_file);
-static int H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t H5FD_sec2_query(const H5FD_t *_f1, unsigned long *flags);
+static H5FD_t *H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD_sec2_close(H5FD_t *_file);
+static int     H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD_sec2_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD_sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static herr_t  H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD_sec2_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_sec2_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, void *buf);
-static herr_t H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, const void *buf);
-static herr_t H5FD_sec2_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD_sec2_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                              void *buf);
+static herr_t  H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                               const void *buf);
+static herr_t  H5FD_sec2_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 
 static const H5FD_class_t H5FD_sec2_g = {
-    "sec2",                     /* name                 */
-    MAXADDR,                    /* maxaddr              */
-    H5F_CLOSE_WEAK,             /* fc_degree            */
-    NULL,                       /* sb_size              */
-    NULL,                       /* sb_encode            */
-    NULL,                       /* sb_decode            */
-    0,                          /* fapl_size            */
-    NULL,                       /* fapl_get             */
-    NULL,                       /* fapl_copy            */
-    NULL,                       /* fapl_free            */
-    0,                          /* dxpl_size            */
-    NULL,                       /* dxpl_copy            */
-    NULL,                       /* dxpl_free            */
-    H5FD_sec2_open,             /* open                 */
-    H5FD_sec2_close,            /* close                */
-    H5FD_sec2_cmp,              /* cmp                  */
-    H5FD_sec2_query,            /* query                */
-    NULL,                       /* get_type_map         */
-    NULL,                       /* alloc                */
-    NULL,                       /* free                 */
-    H5FD_sec2_get_eoa,          /* get_eoa              */
-    H5FD_sec2_set_eoa,          /* set_eoa              */
-    H5FD_sec2_get_eof,          /* get_eof              */
-    H5FD_sec2_get_handle,       /* get_handle           */
-    H5FD_sec2_read,             /* read                 */
-    H5FD_sec2_write,            /* write                */
-    NULL,                       /* flush                */
-    H5FD_sec2_truncate,         /* truncate             */
-    NULL,                       /* lock                 */
-    NULL,                       /* unlock               */
-    H5FD_FLMAP_DICHOTOMY        /* fl_map               */
+    "sec2",               /* name                 */
+    MAXADDR,              /* maxaddr              */
+    H5F_CLOSE_WEAK,       /* fc_degree            */
+    NULL,                 /* sb_size              */
+    NULL,                 /* sb_encode            */
+    NULL,                 /* sb_decode            */
+    0,                    /* fapl_size            */
+    NULL,                 /* fapl_get             */
+    NULL,                 /* fapl_copy            */
+    NULL,                 /* fapl_free            */
+    0,                    /* dxpl_size            */
+    NULL,                 /* dxpl_copy            */
+    NULL,                 /* dxpl_free            */
+    H5FD_sec2_open,       /* open                 */
+    H5FD_sec2_close,      /* close                */
+    H5FD_sec2_cmp,        /* cmp                  */
+    H5FD_sec2_query,      /* query                */
+    NULL,                 /* get_type_map         */
+    NULL,                 /* alloc                */
+    NULL,                 /* free                 */
+    H5FD_sec2_get_eoa,    /* get_eoa              */
+    H5FD_sec2_set_eoa,    /* set_eoa              */
+    H5FD_sec2_get_eof,    /* get_eof              */
+    H5FD_sec2_get_handle, /* get_handle           */
+    H5FD_sec2_read,       /* read                 */
+    H5FD_sec2_write,      /* write                */
+    NULL,                 /* flush                */
+    H5FD_sec2_truncate,   /* truncate             */
+    NULL,                 /* lock                 */
+    NULL,                 /* unlock               */
+    H5FD_FLMAP_DICHOTOMY  /* fl_map               */
 };
 
 /* Declare a free list to manage the H5FD_sec2_t struct */
 H5FL_DEFINE_STATIC(H5FD_sec2_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_init_interface
  *
@@ -192,7 +188,6 @@ H5FD_sec2_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_sec2_init())
 } /* H5FD_sec2_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_init
  *
@@ -210,11 +205,11 @@ H5FD_sec2_init_interface(void)
 hid_t
 H5FD_sec2_init(void)
 {
-    hid_t ret_value;            /* Return value */
+    hid_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5I_VFL != H5I_get_type(H5FD_SEC2_g))
+    if (H5I_VFL != H5I_get_type(H5FD_SEC2_g))
         H5FD_SEC2_g = H5FD_register(&H5FD_sec2_g, sizeof(H5FD_class_t), FALSE);
 
     /* Set return value */
@@ -224,7 +219,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD_sec2_term
  *
@@ -248,7 +242,6 @@ H5FD_sec2_term(void)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5FD_sec2_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_sec2
  *
@@ -266,13 +259,13 @@ H5FD_sec2_term(void)
 herr_t
 H5Pset_fapl_sec2(hid_t fapl_id)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value;
+    H5P_genplist_t *plist; /* Property list pointer */
+    herr_t          ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", fapl_id);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     ret_value = H5P_set_driver(plist, H5FD_SEC2, NULL);
@@ -281,7 +274,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fapl_sec2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_open
  *
@@ -300,14 +292,14 @@ done:
 static H5FD_t *
 H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_sec2_t     *file       = NULL;     /* sec2 VFD info            */
-    int             fd          = -1;       /* File descriptor          */
-    int             o_flags;                /* Flags for open() call    */
+    H5FD_sec2_t *file = NULL; /* sec2 VFD info            */
+    int          fd   = -1;   /* File descriptor          */
+    int          o_flags;     /* Flags for open() call    */
 #ifdef H5_HAVE_WIN32_API
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
-    h5_stat_t       sb;
-    H5FD_t          *ret_value;             /* Return value             */
+    h5_stat_t sb;
+    H5FD_t *  ret_value; /* Return value             */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -315,53 +307,56 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
 
     /* Check arguments */
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if(0 == maxaddr || HADDR_UNDEF == maxaddr)
+    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-    if(ADDR_OVERFLOW(maxaddr))
+    if (ADDR_OVERFLOW(maxaddr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr")
 
     /* Build the open flags */
     o_flags = (H5F_ACC_RDWR & flags) ? O_RDWR : O_RDONLY;
-    if(H5F_ACC_TRUNC & flags)
+    if (H5F_ACC_TRUNC & flags)
         o_flags |= O_TRUNC;
-    if(H5F_ACC_CREAT & flags)
+    if (H5F_ACC_CREAT & flags)
         o_flags |= O_CREAT;
-    if(H5F_ACC_EXCL & flags)
+    if (H5F_ACC_EXCL & flags)
         o_flags |= O_EXCL;
 
     /* Open the file */
-    if((fd = HDopen(name, o_flags, 0666)) < 0) {
+    if ((fd = HDopen(name, o_flags, 0666)) < 0) {
         int myerrno = errno;
-        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: name = '%s', errno = %d, error message = '%s', flags = %x, o_flags = %x", name, myerrno, HDstrerror(myerrno), flags, (unsigned)o_flags);
+        HGOTO_ERROR(
+            H5E_FILE, H5E_CANTOPENFILE, NULL,
+            "unable to open file: name = '%s', errno = %d, error message = '%s', flags = %x, o_flags = %x",
+            name, myerrno, HDstrerror(myerrno), flags, (unsigned)o_flags);
     } /* end if */
 
-    if(HDfstat(fd, &sb) < 0)
+    if (HDfstat(fd, &sb) < 0)
         HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, NULL, "unable to fstat file")
 
     /* Create the new file struct */
-    if(NULL == (file = H5FL_CALLOC(H5FD_sec2_t)))
+    if (NULL == (file = H5FL_CALLOC(H5FD_sec2_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
 
     file->fd = fd;
     H5_CHECKED_ASSIGN(file->eof, haddr_t, sb.st_size, h5_stat_size_t);
     file->pos = HADDR_UNDEF;
-    file->op = OP_UNKNOWN;
+    file->op  = OP_UNKNOWN;
 #ifdef H5_HAVE_WIN32_API
     file->hFile = (HANDLE)_get_osfhandle(fd);
-    if(INVALID_HANDLE_VALUE == file->hFile)
+    if (INVALID_HANDLE_VALUE == file->hFile)
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to get Windows file handle")
 
-    if(!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo))
+    if (!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo))
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to get Windows file information")
 
-    file->nFileIndexHigh = fileinfo.nFileIndexHigh;
-    file->nFileIndexLow = fileinfo.nFileIndexLow;
+    file->nFileIndexHigh       = fileinfo.nFileIndexHigh;
+    file->nFileIndexLow        = fileinfo.nFileIndexLow;
     file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else  /* H5_HAVE_WIN32_API */
     file->device = sb.st_dev;
-    file->inode = sb.st_ino;
+    file->inode  = sb.st_ino;
 #endif /* H5_HAVE_WIN32_API */
 
     /* Retain a copy of the name used to open the file, for possible error reporting */
@@ -369,11 +364,11 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     file->filename[sizeof(file->filename) - 1] = '\0';
 
     /* Check for non-default FAPL */
-    if(H5P_FILE_ACCESS_DEFAULT != fapl_id) {
-        H5P_genplist_t      *plist;      /* Property list pointer */
+    if (H5P_FILE_ACCESS_DEFAULT != fapl_id) {
+        H5P_genplist_t *plist; /* Property list pointer */
 
         /* Get the FAPL */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
             HGOTO_ERROR(H5E_VFL, H5E_BADTYPE, NULL, "not a file access property list")
 
         /* This step is for h5repart tool only. If user wants to change file driver from
@@ -381,26 +376,25 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
          * in the later step, the library can ignore the family driver information saved
          * in the superblock.
          */
-        if(H5P_exist_plist(plist, H5F_ACS_FAMILY_TO_SEC2_NAME) > 0)
-            if(H5P_get(plist, H5F_ACS_FAMILY_TO_SEC2_NAME, &file->fam_to_sec2) < 0)
+        if (H5P_exist_plist(plist, H5F_ACS_FAMILY_TO_SEC2_NAME) > 0)
+            if (H5P_get(plist, H5F_ACS_FAMILY_TO_SEC2_NAME, &file->fam_to_sec2) < 0)
                 HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get property of changing family to sec2")
     } /* end if */
 
     /* Set return value */
-    ret_value = (H5FD_t*)file;
+    ret_value = (H5FD_t *)file;
 
 done:
-    if(NULL == ret_value) {
-        if(fd >= 0)
+    if (NULL == ret_value) {
+        if (fd >= 0)
             HDclose(fd);
-        if(file)
+        if (file)
             file = H5FL_FREE(H5FD_sec2_t, file);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_close
  *
@@ -417,8 +411,8 @@ done:
 static herr_t
 H5FD_sec2_close(H5FD_t *_file)
 {
-    H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
-    herr_t      ret_value = SUCCEED;                /* Return value */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -426,7 +420,7 @@ H5FD_sec2_close(H5FD_t *_file)
     HDassert(file);
 
     /* Close the underlying file */
-    if(HDclose(file->fd) < 0)
+    if (HDclose(file->fd) < 0)
         HSYS_GOTO_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
 
     /* Release the file info */
@@ -436,7 +430,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_cmp
  *
@@ -455,42 +448,53 @@ done:
 static int
 H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_sec2_t   *f1 = (const H5FD_sec2_t *)_f1;
-    const H5FD_sec2_t   *f2 = (const H5FD_sec2_t *)_f2;
-    int ret_value = 0;
+    const H5FD_sec2_t *f1        = (const H5FD_sec2_t *)_f1;
+    const H5FD_sec2_t *f2        = (const H5FD_sec2_t *)_f2;
+    int                ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #ifdef H5_HAVE_WIN32_API
-    if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) HGOTO_DONE(-1)
-    if(f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber) HGOTO_DONE(1)
-
-    if(f1->nFileIndexHigh < f2->nFileIndexHigh) HGOTO_DONE(-1)
-    if(f1->nFileIndexHigh > f2->nFileIndexHigh) HGOTO_DONE(1)
-
-    if(f1->nFileIndexLow < f2->nFileIndexLow) HGOTO_DONE(-1)
-    if(f1->nFileIndexLow > f2->nFileIndexLow) HGOTO_DONE(1)
+    if (f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber)
+        HGOTO_DONE(-1)
+    if (f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber)
+        HGOTO_DONE(1)
+
+    if (f1->nFileIndexHigh < f2->nFileIndexHigh)
+        HGOTO_DONE(-1)
+    if (f1->nFileIndexHigh > f2->nFileIndexHigh)
+        HGOTO_DONE(1)
+
+    if (f1->nFileIndexLow < f2->nFileIndexLow)
+        HGOTO_DONE(-1)
+    if (f1->nFileIndexLow > f2->nFileIndexLow)
+        HGOTO_DONE(1)
 #else /* H5_HAVE_WIN32_API */
 #ifdef H5_DEV_T_IS_SCALAR
-    if(f1->device < f2->device) HGOTO_DONE(-1)
-    if(f1->device > f2->device) HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+    if (f1->device < f2->device)
+        HGOTO_DONE(-1)
+    if (f1->device > f2->device)
+        HGOTO_DONE(1)
+#else  /* H5_DEV_T_IS_SCALAR */
     /* If dev_t isn't a scalar value on this system, just use memcmp to
      * determine if the values are the same or not.  The actual return value
      * shouldn't really matter...
      */
-    if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t)) < 0) HGOTO_DONE(-1)
-    if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t)) > 0) HGOTO_DONE(1)
+    if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0)
+        HGOTO_DONE(-1)
+    if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0)
+        HGOTO_DONE(1)
 #endif /* H5_DEV_T_IS_SCALAR */
-    if(f1->inode < f2->inode) HGOTO_DONE(-1)
-    if(f1->inode > f2->inode) HGOTO_DONE(1)
+    if (f1->inode < f2->inode)
+        HGOTO_DONE(-1)
+    if (f1->inode > f2->inode)
+        HGOTO_DONE(1)
 #endif /* H5_HAVE_WIN32_API */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_query
  *
@@ -507,28 +511,28 @@ done:
 static herr_t
 H5FD_sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
-    const H5FD_sec2_t	*file = (const H5FD_sec2_t *)_file;    /* sec2 VFD info */
+    const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file; /* sec2 VFD info */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set the VFL feature flags that this driver supports */
-    if(flags) {
+    if (flags) {
         *flags = 0;
-        *flags |= H5FD_FEAT_AGGREGATE_METADATA;     /* OK to aggregate metadata allocations                             */
-        *flags |= H5FD_FEAT_ACCUMULATE_METADATA;    /* OK to accumulate metadata for faster writes                      */
-        *flags |= H5FD_FEAT_DATA_SIEVE;             /* OK to perform data sieving for faster raw data reads & writes    */
-        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA;    /* OK to aggregate "small" raw data allocations                     */
-        *flags |= H5FD_FEAT_POSIX_COMPAT_HANDLE;    /* VFD handle is POSIX I/O call compatible                          */
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations  */
+        *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
+        *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes    */
+        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
+        *flags |= H5FD_FEAT_POSIX_COMPAT_HANDLE; /* VFD handle is POSIX I/O call compatible */
 
         /* Check for flags that are set by h5repart */
-        if(file && file->fam_to_sec2)
-            *flags |= H5FD_FEAT_IGNORE_DRVRINFO; /* Ignore the driver info when file is opened (which eliminates it) */
-    } /* end if */
+        if (file && file->fam_to_sec2)
+            *flags |= H5FD_FEAT_IGNORE_DRVRINFO; /* Ignore the driver info when file is opened (which
+                                                    eliminates it) */
+    }                                            /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_sec2_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_get_eoa
  *
@@ -546,14 +550,13 @@ H5FD_sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
 static haddr_t
 H5FD_sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_sec2_t	*file = (const H5FD_sec2_t *)_file;
+    const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(file->eoa)
 } /* end H5FD_sec2_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_set_eoa
  *
@@ -571,7 +574,7 @@ H5FD_sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
-    H5FD_sec2_t	*file = (H5FD_sec2_t *)_file;
+    H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -580,7 +583,6 @@ H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_sec2_set_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_get_eof
  *
@@ -588,7 +590,7 @@ H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
  *              either the filesystem end-of-file or the HDF5 end-of-address
  *              markers.
  *
- * Return:      End of file address, the first address past the end of the 
+ * Return:      End of file address, the first address past the end of the
  *              "file", either the filesystem file or the HDF5 file.
  *
  * Programmer:  Robb Matzke
@@ -599,14 +601,13 @@ H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 static haddr_t
 H5FD_sec2_get_eof(const H5FD_t *_file)
 {
-    const H5FD_sec2_t   *file = (const H5FD_sec2_t *)_file;
+    const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
 } /* end H5FD_sec2_get_eof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD_sec2_get_handle
  *
@@ -622,12 +623,12 @@ H5FD_sec2_get_eof(const H5FD_t *_file)
 static herr_t
 H5FD_sec2_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
-    H5FD_sec2_t         *file = (H5FD_sec2_t *)_file;
-    herr_t              ret_value = SUCCEED;
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(!file_handle)
+    if (!file_handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
 
     *file_handle = &(file->fd);
@@ -636,7 +637,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_get_handle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_read
  *
@@ -654,11 +654,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
-    haddr_t addr, size_t size, void *buf /*out*/)
+H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
+               size_t size, void *buf /*out*/)
 {
-    H5FD_sec2_t     *file       = (H5FD_sec2_t *)_file;
-    herr_t          ret_value   = SUCCEED;                  /* Return value */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -666,54 +666,60 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
     HDassert(buf);
 
     /* Check for overflow conditions */
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined, addr = %llu", (unsigned long long)addr)
-    if(REGION_OVERFLOW(addr, size))
+    if (REGION_OVERFLOW(addr, size))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu", (unsigned long long)addr)
 
     /* Seek to the correct location */
-    if(addr != file->pos || OP_READ != file->op) {
-        if(HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
+    if (addr != file->pos || OP_READ != file->op) {
+        if (HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
     } /* end if */
 
     /* Read data, being careful of interrupted system calls, partial results,
      * and the end of the file.
      */
-    while(size > 0) {
+    while (size > 0) {
 
-        h5_posix_io_t       bytes_in        = 0;    /* # of bytes to read       */
-        h5_posix_io_ret_t   bytes_read      = -1;   /* # of bytes actually read */ 
+        h5_posix_io_t     bytes_in   = 0;  /* # of bytes to read       */
+        h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */
 
         /* Trying to read more bytes than the return type can handle is
          * undefined behavior in POSIX.
          */
-        if(size > H5_POSIX_MAX_IO_BYTES)
+        if (size > H5_POSIX_MAX_IO_BYTES)
             bytes_in = H5_POSIX_MAX_IO_BYTES;
         else
             bytes_in = (h5_posix_io_t)size;
 
         do {
             bytes_read = HDread(file->fd, buf, bytes_in);
-        } while(-1 == bytes_read && EINTR == errno);
-        
-        if(-1 == bytes_read) { /* error */
-            int myerrno = errno;
-            time_t mytime = HDtime(NULL);
+        } while (-1 == bytes_read && EINTR == errno);
+
+        if (-1 == bytes_read) { /* error */
+            int     myerrno  = errno;
+            time_t  mytime   = HDtime(NULL);
             HDoff_t myoffset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
-            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', buf = %p, total read size = %llu, bytes this sub-read = %llu, bytes actually read = %llu, offset = %llu", HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_read, (unsigned long long)myoffset);
+            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL,
+                        "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
+                        "error message = '%s', buf = %p, total read size = %llu, bytes this sub-read = %llu, "
+                        "bytes actually read = %llu, offset = %llu",
+                        HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf,
+                        (unsigned long long)size, (unsigned long long)bytes_in,
+                        (unsigned long long)bytes_read, (unsigned long long)myoffset);
         } /* end if */
-        
-        if(0 == bytes_read) {
+
+        if (0 == bytes_read) {
             /* end of file but not end of format address space */
             HDmemset(buf, 0, size);
             break;
         } /* end if */
-        
+
         HDassert(bytes_read >= 0);
         HDassert((size_t)bytes_read <= size);
-        
+
         size -= (size_t)bytes_read;
         addr += (haddr_t)bytes_read;
         buf = (char *)buf + bytes_read;
@@ -721,19 +727,18 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
 
     /* Update current position */
     file->pos = addr;
-    file->op = OP_READ;
+    file->op  = OP_READ;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_write
  *
@@ -749,11 +754,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
-                haddr_t addr, size_t size, const void *buf)
+H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
+                size_t size, const void *buf)
 {
-    H5FD_sec2_t     *file       = (H5FD_sec2_t *)_file;
-    herr_t          ret_value   = SUCCEED;                  /* Return value */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -761,45 +766,52 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
     HDassert(buf);
 
     /* Check for overflow conditions */
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined, addr = %llu", (unsigned long long)addr)
-    if(REGION_OVERFLOW(addr, size))
-        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size = %llu", (unsigned long long)addr, (unsigned long long)size)
+    if (REGION_OVERFLOW(addr, size))
+        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size = %llu",
+                    (unsigned long long)addr, (unsigned long long)size)
 
     /* Seek to the correct location */
-    if(addr != file->pos || OP_WRITE != file->op) {
-        if(HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
+    if (addr != file->pos || OP_WRITE != file->op) {
+        if (HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
     } /* end if */
 
     /* Write the data, being careful of interrupted system calls and partial
      * results
      */
-    while(size > 0) {
+    while (size > 0) {
 
-        h5_posix_io_t       bytes_in        = 0;    /* # of bytes to write  */
-        h5_posix_io_ret_t   bytes_wrote     = -1;   /* # of bytes written   */ 
+        h5_posix_io_t     bytes_in    = 0;  /* # of bytes to write  */
+        h5_posix_io_ret_t bytes_wrote = -1; /* # of bytes written   */
 
         /* Trying to write more bytes than the return type can handle is
          * undefined behavior in POSIX.
          */
-        if(size > H5_POSIX_MAX_IO_BYTES)
+        if (size > H5_POSIX_MAX_IO_BYTES)
             bytes_in = H5_POSIX_MAX_IO_BYTES;
         else
             bytes_in = (h5_posix_io_t)size;
 
         do {
             bytes_wrote = HDwrite(file->fd, buf, bytes_in);
-        } while(-1 == bytes_wrote && EINTR == errno);
-        
-        if(-1 == bytes_wrote) { /* error */
-            int myerrno = errno;
-            time_t mytime = HDtime(NULL);
+        } while (-1 == bytes_wrote && EINTR == errno);
+
+        if (-1 == bytes_wrote) { /* error */
+            int     myerrno  = errno;
+            time_t  mytime   = HDtime(NULL);
             HDoff_t myoffset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
-            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', buf = %p, total write size = %llu, bytes this sub-write = %llu, bytes actually written = %llu, offset = %llu", HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_wrote, (unsigned long long)myoffset);
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
+                        "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
+                        "error message = '%s', buf = %p, total write size = %llu, bytes this sub-write = "
+                        "%llu, bytes actually written = %llu, offset = %llu",
+                        HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf,
+                        (unsigned long long)size, (unsigned long long)bytes_in,
+                        (unsigned long long)bytes_wrote, (unsigned long long)myoffset);
         } /* end if */
-        
+
         HDassert(bytes_wrote > 0);
         HDassert((size_t)bytes_wrote <= size);
 
@@ -810,21 +822,20 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
 
     /* Update current position and eof */
     file->pos = addr;
-    file->op = OP_WRITE;
-    if(file->pos > file->eof)
+    file->op  = OP_WRITE;
+    if (file->pos > file->eof)
         file->eof = file->pos;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_truncate
  *
@@ -841,22 +852,22 @@ done:
 static herr_t
 H5FD_sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing)
 {
-    H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(file);
 
     /* Extend the file to make sure it's large enough */
-    if(!H5F_addr_eq(file->eoa, file->eof)) {
+    if (!H5F_addr_eq(file->eoa, file->eof)) {
 #ifdef H5_HAVE_WIN32_API
-        LARGE_INTEGER   li;         /* 64-bit (union) integer for SetFilePointer() call */
-        DWORD           dwPtrLow;   /* Low-order pointer bits from SetFilePointer()
-                                     * Only used as an error code here.
-                                     */
-        DWORD           dwError;    /* DWORD error code from GetLastError() */
-        BOOL            bError;     /* Boolean error flag */
+        LARGE_INTEGER li;       /* 64-bit (union) integer for SetFilePointer() call */
+        DWORD         dwPtrLow; /* Low-order pointer bits from SetFilePointer()
+                                 * Only used as an error code here.
+                                 */
+        DWORD dwError;          /* DWORD error code from GetLastError() */
+        BOOL  bError;           /* Boolean error flag */
 
         /* Windows uses this odd QuadPart union for 32/64-bit portability */
         li.QuadPart = (__int64)file->eoa;
@@ -867,17 +878,17 @@ H5FD_sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
          * from SetFilePointer(), we also need to check GetLastError().
          */
         dwPtrLow = SetFilePointer(file->hFile, li.LowPart, &li.HighPart, FILE_BEGIN);
-        if(INVALID_SET_FILE_POINTER == dwPtrLow) {
+        if (INVALID_SET_FILE_POINTER == dwPtrLow) {
             dwError = GetLastError();
-            if(dwError != NO_ERROR )
+            if (dwError != NO_ERROR)
                 HGOTO_ERROR(H5E_FILE, H5E_FILEOPEN, FAIL, "unable to set file pointer")
         }
 
         bError = SetEndOfFile(file->hFile);
-        if(0 == bError)
+        if (0 == bError)
             HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
-        if(-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
+#else  /* H5_HAVE_WIN32_API */
+        if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
 #endif /* H5_HAVE_WIN32_API */
 
@@ -886,10 +897,9 @@ H5FD_sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
 
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_truncate() */
-
diff --git a/src/H5FDsec2.h b/src/H5FDsec2.h
index 65ef1db..8a9b10a 100644
--- a/src/H5FDsec2.h
+++ b/src/H5FDsec2.h
@@ -22,14 +22,14 @@
 
 #include "H5Ipublic.h"
 
-#define H5FD_SEC2	(H5FD_sec2_init())
+#define H5FD_SEC2 (H5FD_sec2_init())
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-H5_DLL hid_t H5FD_sec2_init(void);
-H5_DLL void H5FD_sec2_term(void);
+H5_DLL hid_t  H5FD_sec2_init(void);
+H5_DLL void   H5FD_sec2_term(void);
 H5_DLL herr_t H5Pset_fapl_sec2(hid_t fapl_id);
 
 #ifdef __cplusplus
@@ -37,4 +37,3 @@ H5_DLL herr_t H5Pset_fapl_sec2(hid_t fapl_id);
 #endif
 
 #endif
-
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index b7a60c0..f0be674 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -26,21 +26,19 @@
 /* Module Setup */
 /****************/
 
-#define H5FD_PACKAGE		/*suppress error about including H5FDpkg  */
+#define H5FD_PACKAGE /*suppress error about including H5FDpkg  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5FD_space_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5FD_space_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"         /* File access				*/
-#include "H5FDpkg.h"		/* File Drivers				*/
-#include "H5FDmulti.h"		/* Usage-partitioned file family	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fprivate.h" /* File access				*/
+#include "H5FDpkg.h"    /* File Drivers				*/
+#include "H5FDmulti.h"  /* Usage-partitioned file family	*/
 
 /****************/
 /* Local Macros */
@@ -49,32 +47,26 @@
 /* Define this to display information about file allocations */
 /* #define H5FD_ALLOC_DEBUG */
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -82,8 +74,6 @@
 /* Declare a free list to manage the H5FD_free_t struct */
 H5FL_DEFINE(H5FD_free_t);
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5FD_space_init_interface -- Initialize interface-specific information
@@ -105,7 +95,6 @@ H5FD_space_init_interface(void)
     FUNC_LEAVE_NOAPI(H5FD_init())
 } /* H5FD_space_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_extend
  *
@@ -122,12 +111,13 @@ H5FD_space_init_interface(void)
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_extend(H5FD_t *file, H5FD_mem_t type, hbool_t new_block, hsize_t size, haddr_t *frag_addr, hsize_t *frag_size)
+H5FD_extend(H5FD_t *file, H5FD_mem_t type, hbool_t new_block, hsize_t size, haddr_t *frag_addr,
+            hsize_t *frag_size)
 {
-    hsize_t orig_size = size;   /* Original allocation size */
-    haddr_t eoa;                /* Address of end-of-allocated space */
-    hsize_t extra;        	/* Extra space to allocate, to align request */
-    haddr_t ret_value;          /* Return value */
+    hsize_t orig_size = size; /* Original allocation size */
+    haddr_t eoa;              /* Address of end-of-allocated space */
+    hsize_t extra;            /* Extra space to allocate, to align request */
+    haddr_t ret_value;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -142,24 +132,24 @@ H5FD_extend(H5FD_t *file, H5FD_mem_t type, hbool_t new_block, hsize_t size, hadd
 
     /* Compute extra space to allocate, if this is a new block and should be aligned */
     extra = 0;
-    if(new_block && file->alignment > 1 && orig_size >= file->threshold) {
-        hsize_t mis_align;              /* Amount EOA is misaligned */
+    if (new_block && file->alignment > 1 && orig_size >= file->threshold) {
+        hsize_t mis_align; /* Amount EOA is misaligned */
 
         /* Check for EOA already aligned */
-        if((mis_align = (eoa % file->alignment)) > 0) {
+        if ((mis_align = (eoa % file->alignment)) > 0) {
             extra = file->alignment - mis_align;
-	    if(frag_addr)
-                *frag_addr = eoa - file->base_addr;     /* adjust for file's base address */
-	    if(frag_size)
+            if (frag_addr)
+                *frag_addr = eoa - file->base_addr; /* adjust for file's base address */
+            if (frag_size)
                 *frag_size = extra;
-	} /* end if */
-    } /* end if */
+        } /* end if */
+    }     /* end if */
 
     /* Add in extra allocation amount */
     size += extra;
 
     /* Check for overflow when extending */
-    if(H5F_addr_overflow(eoa, size) || (eoa + size) > file->maxaddr)
+    if (H5F_addr_overflow(eoa, size) || (eoa + size) > file->maxaddr)
         HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
 
     /* Set the [possibly aligned] address to return */
@@ -167,18 +157,17 @@ H5FD_extend(H5FD_t *file, H5FD_mem_t type, hbool_t new_block, hsize_t size, hadd
 
     /* Extend the end-of-allocated space address */
     eoa += size;
-    if(file->cls->set_eoa(file, type, eoa) < 0)
+    if (file->cls->set_eoa(file, type, eoa) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
 
     /* Post-condition sanity check */
-    if(new_block && file->alignment && orig_size >= file->threshold)
-	HDassert(!(ret_value % file->alignment));
+    if (new_block && file->alignment && orig_size >= file->threshold)
+        HDassert(!(ret_value % file->alignment));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_extend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_alloc_real
  *
@@ -193,13 +182,14 @@ done:
  *-------------------------------------------------------------------------
  */
 haddr_t
-H5FD_alloc_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, hsize_t size, haddr_t *frag_addr, hsize_t *frag_size)
+H5FD_alloc_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, hsize_t size, haddr_t *frag_addr,
+                hsize_t *frag_size)
 {
-    haddr_t     ret_value;              /* Return value */
+    haddr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 #ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
+    HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
 #endif /* H5FD_ALLOC_DEBUG */
 
     /* check args */
@@ -209,12 +199,12 @@ HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
     HDassert(size > 0);
 
     /* Dispatch to driver `alloc' callback or extend the end-of-address marker */
-    if(file->cls->alloc) {
-        if((ret_value = (file->cls->alloc)(file, type, dxpl_id, size)) == HADDR_UNDEF)
+    if (file->cls->alloc) {
+        if ((ret_value = (file->cls->alloc)(file, type, dxpl_id, size)) == HADDR_UNDEF)
             HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "driver allocation request failed")
     } /* end if */
     else {
-        if((ret_value = H5FD_extend(file, type, TRUE, size, frag_addr, frag_size)) == HADDR_UNDEF)
+        if ((ret_value = H5FD_extend(file, type, TRUE, size, frag_addr, frag_size)) == HADDR_UNDEF)
             HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "driver eoa update request failed")
     } /* end else */
 
@@ -223,12 +213,11 @@ HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
 
 done:
 #ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
 #endif /* H5FD_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_alloc_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_alloc
  *
@@ -248,10 +237,10 @@ HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
  *-------------------------------------------------------------------------
  */
 haddr_t
-H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, hsize_t size,
-    haddr_t *frag_addr, hsize_t *frag_size)
+H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, hsize_t size, haddr_t *frag_addr,
+           hsize_t *frag_size)
 {
-    haddr_t     ret_value;              /* Return value */
+    haddr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
@@ -263,18 +252,17 @@ H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, hsize_t size,
 
     /* Call the real 'alloc' routine */
     ret_value = H5FD_alloc_real(file, dxpl_id, type, size, frag_addr, frag_size);
-    if(!H5F_addr_defined(ret_value))
+    if (!H5F_addr_defined(ret_value))
         HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "real 'alloc' request failed")
 
     /* Mark superblock dirty in cache, so change to EOA will get encoded */
-    if(H5F_super_dirty(f) < 0)
+    if (H5F_super_dirty(f) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTMARKDIRTY, HADDR_UNDEF, "unable to mark superblock as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_free_real
  *
@@ -291,7 +279,7 @@ done:
 herr_t
 H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, hsize_t size)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -302,58 +290,58 @@ H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, hsize
     HDassert(size > 0);
 
 #ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type, addr, size);
+    HDfprintf(stderr, "%s: type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type, addr, size);
 #endif /* H5FD_ALLOC_DEBUG */
 
     /* Sanity checking */
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "invalid file offset")
 
     /* Convert address to absolute file offset */
     addr += file->base_addr;
 
     /* More sanity checking */
-    if(addr > file->maxaddr || H5F_addr_overflow(addr, size) || (addr + size) > file->maxaddr)
+    if (addr > file->maxaddr || H5F_addr_overflow(addr, size) || (addr + size) > file->maxaddr)
         HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "invalid file free space region to free")
 
     /* Check for file driver 'free' callback and call it if available */
-    if(file->cls->free) {
+    if (file->cls->free) {
 #ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Letting VFD free space\n", FUNC);
+        HDfprintf(stderr, "%s: Letting VFD free space\n", FUNC);
 #endif /* H5FD_ALLOC_DEBUG */
-        if((file->cls->free)(file, type, dxpl_id, addr, size) < 0)
+        if ((file->cls->free)(file, type, dxpl_id, addr, size) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "driver free request failed")
     } /* end if */
     /* Check if this free block is at the end of file allocated space.
      * Truncate it if this is true.
      */
-    else if(file->cls->get_eoa) {
-        haddr_t     eoa;
+    else if (file->cls->get_eoa) {
+        haddr_t eoa;
 
         eoa = file->cls->get_eoa(file, type);
 #ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: eoa = %a\n", FUNC, eoa);
+        HDfprintf(stderr, "%s: eoa = %a\n", FUNC, eoa);
 #endif /* H5FD_ALLOC_DEBUG */
-        if(eoa == (addr + size)) {
+        if (eoa == (addr + size)) {
 #ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Reducing file size to = %a\n", FUNC, addr);
+            HDfprintf(stderr, "%s: Reducing file size to = %a\n", FUNC, addr);
 #endif /* H5FD_ALLOC_DEBUG */
-            if(file->cls->set_eoa(file, type, addr) < 0)
+            if (file->cls->set_eoa(file, type, addr) < 0)
                 HGOTO_ERROR(H5E_VFL, H5E_CANTSET, FAIL, "set end of space allocation request failed")
         } /* end if */
-    } /* end else-if */
+    }     /* end else-if */
     else {
         /* leak memory */
 #ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: LEAKED MEMORY!!! type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type, addr, size);
+        HDfprintf(stderr, "%s: LEAKED MEMORY!!! type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type,
+                  addr, size);
 #endif /* H5FD_ALLOC_DEBUG */
-    } /* end else */
+    }  /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_free_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_free
  *
@@ -373,10 +361,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, haddr_t addr,
-    hsize_t size)
+H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, haddr_t addr, hsize_t size)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -387,18 +374,17 @@ H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, haddr_t addr,
     HDassert(size > 0);
 
     /* Call the real 'free' routine */
-    if(H5FD_free_real(file, dxpl_id, type, addr, size) < 0)
+    if (H5FD_free_real(file, dxpl_id, type, addr, size) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "real 'free' request failed")
 
     /* Mark superblock dirty in cache, so change to EOA will get encoded */
-    if(H5F_super_dirty(f) < 0)
+    if (H5F_super_dirty(f) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTMARKDIRTY, FAIL, "unable to mark superblock as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_try_extend
  *
@@ -418,11 +404,10 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, H5F_t *f, haddr_t blk_end,
-    hsize_t extra_requested)
+H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, H5F_t *f, haddr_t blk_end, hsize_t extra_requested)
 {
-    haddr_t eoa;                /* End of allocated space in file */
-    htri_t ret_value = FALSE;   /* Return value */
+    haddr_t eoa;               /* End of allocated space in file */
+    htri_t  ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -434,20 +419,20 @@ H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, H5F_t *f, haddr_t blk_end,
     HDassert(f);
 
     /* Retrieve the end of the address space */
-    if(HADDR_UNDEF == (eoa = file->cls->get_eoa(file, type)))
-	HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_eoa request failed")
+    if (HADDR_UNDEF == (eoa = file->cls->get_eoa(file, type)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_eoa request failed")
 
     /* Adjust block end by base address of the file, to create absolute address */
     blk_end += file->base_addr;
 
     /* Check if the block is exactly at the end of the file */
-    if(H5F_addr_eq(blk_end, eoa)) {
+    if (H5F_addr_eq(blk_end, eoa)) {
         /* Extend the object by extending the underlying file */
-        if(HADDR_UNDEF == H5FD_extend(file, type, FALSE, extra_requested, NULL, NULL))
+        if (HADDR_UNDEF == H5FD_extend(file, type, FALSE, extra_requested, NULL, NULL))
             HGOTO_ERROR(H5E_VFL, H5E_CANTEXTEND, FAIL, "driver extend request failed")
 
         /* Mark superblock dirty in cache, so change to EOA will get encoded */
-        if(H5F_super_dirty(f) < 0)
+        if (H5F_super_dirty(f) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTMARKDIRTY, FAIL, "unable to mark superblock as dirty")
 
         /* Indicate success */
@@ -457,4 +442,3 @@ H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, H5F_t *f, haddr_t blk_end,
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_try_extend() */
-
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index 1cabddf..73218f0 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -35,8 +35,8 @@
 
 #ifdef H5_HAVE_WIN32_API
 /* The following two defines must be before any windows headers are included */
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
-#define NOGDI                  /* Exclude Graphic Display Interface macros */
+#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */
+#define NOGDI               /* Exclude Graphic Display Interface macros */
 
 #include <windows.h>
 #include <io.h>
@@ -51,7 +51,7 @@
 #ifdef MAX
 #undef MAX
 #endif /* MAX */
-#define MAX(X,Y)  ((X)>(Y)?(X):(Y))
+#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
 
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_STDIO_g = 0;
@@ -61,10 +61,10 @@ static size_t H5_STDIO_MAX_IO_BYTES_g = (size_t)-1;
 
 /* File operations */
 typedef enum {
-    H5FD_STDIO_OP_UNKNOWN=0,
-    H5FD_STDIO_OP_READ=1,
-    H5FD_STDIO_OP_WRITE=2,
-    H5FD_STDIO_OP_SEEK=3
+    H5FD_STDIO_OP_UNKNOWN = 0,
+    H5FD_STDIO_OP_READ    = 1,
+    H5FD_STDIO_OP_WRITE   = 2,
+    H5FD_STDIO_OP_SEEK    = 3
 } H5FD_stdio_file_op;
 
 /* The description of a file belonging to this driver. The 'eoa' and 'eof'
@@ -79,14 +79,14 @@ typedef enum {
  * occurs), and 'op' will be set to H5F_OP_UNKNOWN.
  */
 typedef struct H5FD_stdio_t {
-    H5FD_t      pub;            /* public stuff, must be first      */
-    FILE        *fp;            /* the file handle                  */
-    int         fd;             /* file descriptor (for truncate)   */
-    haddr_t     eoa;            /* end of allocated region          */
-    haddr_t     eof;            /* end of file; current file size   */
-    haddr_t     pos;            /* current file I/O position        */
-    unsigned    write_access;   /* Flag to indicate the file was opened with write access */
-    H5FD_stdio_file_op op;  /* last operation */
+    H5FD_t             pub;          /* public stuff, must be first      */
+    FILE *             fp;           /* the file handle                  */
+    int                fd;           /* file descriptor (for truncate)   */
+    haddr_t            eoa;          /* end of allocated region          */
+    haddr_t            eof;          /* end of file; current file size   */
+    haddr_t            pos;          /* current file I/O position        */
+    unsigned           write_access; /* Flag to indicate the file was opened with write access */
+    H5FD_stdio_file_op op;           /* last operation */
 #ifndef H5_HAVE_WIN32_API
     /* On most systems the combination of device and i-node number uniquely
      * identify a file.  Note that Cygwin, MinGW and other Windows POSIX
@@ -94,8 +94,8 @@ typedef struct H5FD_stdio_t {
      * and will use the 'device + inodes' scheme as opposed to the
      * Windows code further below.
      */
-    dev_t           device;     /* file device number   */
-    ino_t           inode;      /* file i-node number   */
+    dev_t device; /* file device number   */
+    ino_t inode;  /* file i-node number   */
 #else
     /* Files in windows are uniquely identified by the volume serial
      * number and the file index (both low and high parts).
@@ -111,21 +111,21 @@ typedef struct H5FD_stdio_t {
      *
      * http://msdn.microsoft.com/en-us/library/aa363788(v=VS.85).aspx
      */
-    DWORD           nFileIndexLow;
-    DWORD           nFileIndexHigh;
-    DWORD           dwVolumeSerialNumber;
-    
-    HANDLE          hFile;      /* Native windows file handle */
-#endif  /* H5_HAVE_WIN32_API */
+    DWORD nFileIndexLow;
+    DWORD nFileIndexHigh;
+    DWORD dwVolumeSerialNumber;
+
+    HANDLE      hFile; /* Native windows file handle */
+#endif /* H5_HAVE_WIN32_API */
 } H5FD_stdio_t;
 
 /* Use similar structure as in H5private.h by defining Windows stuff first. */
 #ifdef H5_HAVE_WIN32_API
 #ifndef H5_HAVE_MINGW
-    #define file_fseek      _fseeki64
-    #define file_offset_t   __int64
-    #define file_ftruncate  _chsize_s   /* Supported in VS 2005 or newer */
-    #define file_ftell      _ftelli64
+#define file_fseek     _fseeki64
+#define file_offset_t  __int64
+#define file_ftruncate _chsize_s /* Supported in VS 2005 or newer */
+#define file_ftell     _ftelli64
 #endif /* H5_HAVE_MINGW */
 #endif /* H5_HAVE_WIN32_API */
 
@@ -133,10 +133,10 @@ typedef struct H5FD_stdio_t {
  * more platform-independent names.
  */
 #ifndef file_fseek
-    #define file_fseek      fseeko
-    #define file_offset_t   off_t
-    #define file_ftruncate  ftruncate
-    #define file_ftell      ftello
+#define file_fseek     fseeko
+#define file_offset_t  off_t
+#define file_ftruncate ftruncate
+#define file_ftell     ftello
 #endif /* file_fseek */
 
 /* These macros check for overflow of various quantities.  These macros
@@ -154,65 +154,64 @@ typedef struct H5FD_stdio_t {
  *      argument of the file seek function.
  */
 /* adding for windows NT filesystem support. */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1)
-#define ADDR_OVERFLOW(A)  (HADDR_UNDEF==(A) || ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z)  ((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z)  (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || \
-    HADDR_UNDEF==(A)+(Z) || (file_offset_t)((A)+(Z))<(file_offset_t)(A))
+#define MAXADDR          (((haddr_t)1 << (8 * sizeof(file_offset_t) - 1)) - 1)
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
+#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR)
+#define REGION_OVERFLOW(A, Z)                                                                                \
+    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) ||                                     \
+     (file_offset_t)((A) + (Z)) < (file_offset_t)(A))
 
 /* Prototypes */
-static H5FD_t *H5FD_stdio_open(const char *name, unsigned flags,
-                 hid_t fapl_id, haddr_t maxaddr);
-static herr_t H5FD_stdio_close(H5FD_t *lf);
-static int H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t H5FD_stdio_query(const H5FD_t *_f1, unsigned long *flags);
+static H5FD_t *H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD_stdio_close(H5FD_t *lf);
+static int     H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD_stdio_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
 static haddr_t H5FD_stdio_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD_stdio_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static herr_t  H5FD_stdio_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD_stdio_get_eof(const H5FD_t *_file);
-static herr_t  H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_stdio_read(H5FD_t *lf, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-                size_t size, void *buf);
-static herr_t H5FD_stdio_write(H5FD_t *lf, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-                size_t size, const void *buf);
-static herr_t H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
-static herr_t H5FD_stdio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD_stdio_read(H5FD_t *lf, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                               void *buf);
+static herr_t  H5FD_stdio_write(H5FD_t *lf, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                                const void *buf);
+static herr_t  H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
+static herr_t  H5FD_stdio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 
 static const H5FD_class_t H5FD_stdio_g = {
-    "stdio",                    /* name         */
-    MAXADDR,                    /* maxaddr      */
-    H5F_CLOSE_WEAK,             /* fc_degree    */
-    NULL,                       /* sb_size      */
-    NULL,                       /* sb_encode    */
-    NULL,                       /* sb_decode    */
-    0,                          /* fapl_size    */
-    NULL,                       /* fapl_get     */
-    NULL,                       /* fapl_copy    */
-    NULL,                       /* fapl_free    */
-    0,                          /* dxpl_size    */
-    NULL,                       /* dxpl_copy    */
-    NULL,                       /* dxpl_free    */
-    H5FD_stdio_open,            /* open         */
-    H5FD_stdio_close,           /* close        */
-    H5FD_stdio_cmp,             /* cmp          */
-    H5FD_stdio_query,           /* query        */
-    NULL,                       /* get_type_map */
-    H5FD_stdio_alloc,           /* alloc        */
-    NULL,                       /* free         */
-    H5FD_stdio_get_eoa,         /* get_eoa      */
-    H5FD_stdio_set_eoa,         /* set_eoa      */
-    H5FD_stdio_get_eof,         /* get_eof      */
-    H5FD_stdio_get_handle,      /* get_handle   */
-    H5FD_stdio_read,            /* read         */
-    H5FD_stdio_write,           /* write        */
-    H5FD_stdio_flush,           /* flush        */
-    H5FD_stdio_truncate,        /* truncate     */
-    NULL,                       /* lock         */
-    NULL,                       /* unlock       */
-    H5FD_FLMAP_DICHOTOMY	/* fl_map       */
+    "stdio",               /* name         */
+    MAXADDR,               /* maxaddr      */
+    H5F_CLOSE_WEAK,        /* fc_degree    */
+    NULL,                  /* sb_size      */
+    NULL,                  /* sb_encode    */
+    NULL,                  /* sb_decode    */
+    0,                     /* fapl_size    */
+    NULL,                  /* fapl_get     */
+    NULL,                  /* fapl_copy    */
+    NULL,                  /* fapl_free    */
+    0,                     /* dxpl_size    */
+    NULL,                  /* dxpl_copy    */
+    NULL,                  /* dxpl_free    */
+    H5FD_stdio_open,       /* open         */
+    H5FD_stdio_close,      /* close        */
+    H5FD_stdio_cmp,        /* cmp          */
+    H5FD_stdio_query,      /* query        */
+    NULL,                  /* get_type_map */
+    H5FD_stdio_alloc,      /* alloc        */
+    NULL,                  /* free         */
+    H5FD_stdio_get_eoa,    /* get_eoa      */
+    H5FD_stdio_set_eoa,    /* set_eoa      */
+    H5FD_stdio_get_eof,    /* get_eof      */
+    H5FD_stdio_get_handle, /* get_handle   */
+    H5FD_stdio_read,       /* read         */
+    H5FD_stdio_write,      /* write        */
+    H5FD_stdio_flush,      /* flush        */
+    H5FD_stdio_truncate,   /* truncate     */
+    NULL,                  /* lock         */
+    NULL,                  /* unlock       */
+    H5FD_FLMAP_DICHOTOMY   /* fl_map       */
 };
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_init
  *
@@ -234,12 +233,11 @@ H5FD_stdio_init(void)
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    if (H5I_VFL!=H5Iget_type(H5FD_STDIO_g))
+    if (H5I_VFL != H5Iget_type(H5FD_STDIO_g))
         H5FD_STDIO_g = H5FDregister(&H5FD_stdio_g);
     return H5FD_STDIO_g;
 } /* end H5FD_stdio_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:  H5FD_stdio_term
  *
@@ -261,7 +259,6 @@ H5FD_stdio_term(void)
     return;
 } /* end H5FD_stdio_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Pset_fapl_stdio
  *
@@ -279,20 +276,19 @@ H5FD_stdio_term(void)
 herr_t
 H5Pset_fapl_stdio(hid_t fapl_id)
 {
-    static const char *func = "H5FDset_fapl_stdio";  /*for error reporting*/
+    static const char *func = "H5FDset_fapl_stdio"; /*for error reporting*/
 
     /*NO TRACE*/
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
-    if(0 == H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
+    if (0 == H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
         H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not a file access property list", -1)
 
-    return H5Pset_driver(fapl_id, H5FD_STDIO, NULL);
+            return H5Pset_driver(fapl_id, H5FD_STDIO, NULL);
 } /* end H5Pset_fapl_stdio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_open
  *
@@ -318,18 +314,17 @@ H5Pset_fapl_stdio(hid_t fapl_id)
  *-------------------------------------------------------------------------
  */
 static H5FD_t *
-H5FD_stdio_open( const char *name, unsigned flags, hid_t fapl_id,
-    haddr_t maxaddr)
+H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    FILE                *f = NULL;
-    unsigned            write_access = 0;           /* File opened with write access? */
-    H5FD_stdio_t        *file = NULL;
-    static const char   *func = "H5FD_stdio_open";  /* Function Name for error reporting */
+    FILE *             f            = NULL;
+    unsigned           write_access = 0; /* File opened with write access? */
+    H5FD_stdio_t *     file         = NULL;
+    static const char *func         = "H5FD_stdio_open"; /* Function Name for error reporting */
 #ifdef H5_HAVE_WIN32_API
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
-#else /* H5_HAVE_WIN32_API */
-    struct stat         sb;
-#endif  /* H5_HAVE_WIN32_API */
+#else  /* H5_HAVE_WIN32_API */
+    struct stat sb;
+#endif /* H5_HAVE_WIN32_API */
 
     /* Sanity check on file offsets */
     assert(sizeof(file_offset_t) >= sizeof(size_t));
@@ -342,104 +337,108 @@ H5FD_stdio_open( const char *name, unsigned flags, hid_t fapl_id,
 
     /* Check arguments */
     if (!name || !*name)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADVALUE, "invalid file name", NULL)
-    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADRANGE, "bogus maxaddr", NULL)
-    if (ADDR_OVERFLOW(maxaddr))
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_OVERFLOW, "maxaddr too large", NULL)
-
-    /* Tentatively open file in read-only mode, to check for existence */
-    if(flags & H5F_ACC_RDWR)
-        f = fopen(name, "rb+");
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADVALUE, "invalid file name",
+                    NULL) if (0 == maxaddr || HADDR_UNDEF == maxaddr)
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADRANGE, "bogus maxaddr",
+                        NULL) if (ADDR_OVERFLOW(maxaddr))
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_OVERFLOW, "maxaddr too large", NULL)
+
+            /* Tentatively open file in read-only mode, to check for existence */
+            if (flags & H5F_ACC_RDWR) f = fopen(name, "rb+");
     else
         f = fopen(name, "rb");
 
-    if(!f) {
+    if (!f) {
         /* File doesn't exist */
-        if(flags & H5F_ACC_CREAT) {
+        if (flags & H5F_ACC_CREAT) {
             assert(flags & H5F_ACC_RDWR);
-            f = fopen(name, "wb+");
-            write_access = 1;     /* Note the write access */
+            f            = fopen(name, "wb+");
+            write_access = 1; /* Note the write access */
         }
         else
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_CANTOPENFILE, "file doesn't exist and CREAT wasn't specified", NULL)
-    } else if(flags & H5F_ACC_EXCL) {
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_CANTOPENFILE,
+                        "file doesn't exist and CREAT wasn't specified", NULL)
+    }
+    else if (flags & H5F_ACC_EXCL) {
         /* File exists, but EXCL is passed.  Fail. */
         assert(flags & H5F_ACC_CREAT);
         fclose(f);
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_FILEEXISTS, "file exists but CREAT and EXCL were specified", NULL)
-    } else if(flags & H5F_ACC_RDWR) {
-        if(flags & H5F_ACC_TRUNC)
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_FILEEXISTS,
+                    "file exists but CREAT and EXCL were specified", NULL)
+    }
+    else if (flags & H5F_ACC_RDWR) {
+        if (flags & H5F_ACC_TRUNC)
             f = freopen(name, "wb+", f);
-        write_access = 1;     /* Note the write access */
-    } /* end if */
+        write_access = 1; /* Note the write access */
+    }                     /* end if */
     /* Note there is no need to reopen if neither TRUNC nor EXCL are specified,
      * as the tentative open will work */
 
-    if(!f)
+    if (!f)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_CANTOPENFILE, "fopen failed", NULL)
 
-    /* Build the return value */
-    if(NULL == (file = (H5FD_stdio_t *)calloc((size_t)1, sizeof(H5FD_stdio_t)))) {
-        fclose(f);
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed", NULL)
-    } /* end if */
-    file->fp = f;
-    file->op = H5FD_STDIO_OP_SEEK;
-    file->pos = HADDR_UNDEF;
-    file->write_access = write_access;    /* Note the write_access for later */
-    if(file_fseek(file->fp, (file_offset_t)0, SEEK_END) < 0) {
+            /* Build the return value */
+            if (NULL == (file = (H5FD_stdio_t *)calloc((size_t)1, sizeof(H5FD_stdio_t))))
+        {
+            fclose(f);
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed", NULL)
+        } /* end if */
+    file->fp           = f;
+    file->op           = H5FD_STDIO_OP_SEEK;
+    file->pos          = HADDR_UNDEF;
+    file->write_access = write_access; /* Note the write_access for later */
+    if (file_fseek(file->fp, (file_offset_t)0, SEEK_END) < 0) {
         file->op = H5FD_STDIO_OP_UNKNOWN;
-    } else {
+    }
+    else {
         file_offset_t x = file_ftell(file->fp);
-        assert (x >= 0);
+        assert(x >= 0);
         file->eof = (haddr_t)x;
     }
 
     /* Get the file descriptor (needed for truncate and some Windows information) */
 #ifdef H5_HAVE_WIN32_API
     file->fd = _fileno(file->fp);
-#else /* H5_HAVE_WIN32_API */
+#else  /* H5_HAVE_WIN32_API */
     file->fd = fileno(file->fp);
 #endif /* H5_HAVE_WIN32_API */
-    if(file->fd < 0) {
+    if (file->fd < 0) {
         free(file);
         fclose(f);
         H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE, "unable to get file descriptor", NULL);
     } /* end if */
 
-
 #ifdef H5_HAVE_WIN32_API
     file->hFile = (HANDLE)_get_osfhandle(file->fd);
-    if(INVALID_HANDLE_VALUE == file->hFile) {
+    if (INVALID_HANDLE_VALUE == file->hFile) {
         free(file);
         fclose(f);
         H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE, "unable to get Windows file handle", NULL);
     } /* end if */
 
-    if(!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo)) {
+    if (!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo)) {
         free(file);
         fclose(f);
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE, "unable to get Windows file descriptor information", NULL);
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE,
+                    "unable to get Windows file descriptor information", NULL);
     } /* end if */
 
-    file->nFileIndexHigh = fileinfo.nFileIndexHigh;
-    file->nFileIndexLow = fileinfo.nFileIndexLow;
+    file->nFileIndexHigh       = fileinfo.nFileIndexHigh;
+    file->nFileIndexLow        = fileinfo.nFileIndexLow;
     file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
-    if(fstat(file->fd, &sb) < 0) {
+#else  /* H5_HAVE_WIN32_API */
+    if (fstat(file->fd, &sb) < 0) {
         free(file);
         fclose(f);
         H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADFILE, "unable to fstat file", NULL)
     } /* end if */
     file->device = sb.st_dev;
-    file->inode = sb.st_ino;
+    file->inode  = sb.st_ino;
 #endif /* H5_HAVE_WIN32_API */
 
-    return (H5FD_t*)file;
+    return (H5FD_t *)file;
 } /* end H5FD_stdio_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5F_stdio_close
  *
@@ -458,8 +457,8 @@ H5FD_stdio_open( const char *name, unsigned flags, hid_t fapl_id,
 static herr_t
 H5FD_stdio_close(H5FD_t *_file)
 {
-    H5FD_stdio_t  *file = (H5FD_stdio_t*)_file;
-    static const char *func = "H5FD_stdio_close";  /* Function Name for error reporting */
+    H5FD_stdio_t *     file = (H5FD_stdio_t *)_file;
+    static const char *func = "H5FD_stdio_close"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -467,12 +466,11 @@ H5FD_stdio_close(H5FD_t *_file)
     if (fclose(file->fp) < 0)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_CLOSEERROR, "fclose failed", -1)
 
-    free(file);
+            free(file);
 
     return 0;
 } /* end H5FD_stdio_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_cmp
  *
@@ -492,41 +490,52 @@ H5FD_stdio_close(H5FD_t *_file)
 static int
 H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_stdio_t  *f1 = (const H5FD_stdio_t*)_f1;
-    const H5FD_stdio_t  *f2 = (const H5FD_stdio_t*)_f2;
+    const H5FD_stdio_t *f1 = (const H5FD_stdio_t *)_f1;
+    const H5FD_stdio_t *f2 = (const H5FD_stdio_t *)_f2;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
 #ifdef H5_HAVE_WIN32_API
-    if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) return -1;
-    if(f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber) return 1;
-
-    if(f1->nFileIndexHigh < f2->nFileIndexHigh) return -1;
-    if(f1->nFileIndexHigh > f2->nFileIndexHigh) return 1;
-
-    if(f1->nFileIndexLow < f2->nFileIndexLow) return -1;
-    if(f1->nFileIndexLow > f2->nFileIndexLow) return 1;
+    if (f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber)
+        return -1;
+    if (f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber)
+        return 1;
+
+    if (f1->nFileIndexHigh < f2->nFileIndexHigh)
+        return -1;
+    if (f1->nFileIndexHigh > f2->nFileIndexHigh)
+        return 1;
+
+    if (f1->nFileIndexLow < f2->nFileIndexLow)
+        return -1;
+    if (f1->nFileIndexLow > f2->nFileIndexLow)
+        return 1;
 #else /* H5_HAVE_WIN32_API */
 #ifdef H5_DEV_T_IS_SCALAR
-    if(f1->device < f2->device) return -1;
-    if(f1->device > f2->device) return 1;
-#else /* H5_DEV_T_IS_SCALAR */
+    if (f1->device < f2->device)
+        return -1;
+    if (f1->device > f2->device)
+        return 1;
+#else  /* H5_DEV_T_IS_SCALAR */
     /* If dev_t isn't a scalar value on this system, just use memcmp to
      * determine if the values are the same or not.  The actual return value
      * shouldn't really matter...
      */
-    if(memcmp(&(f1->device),&(f2->device),sizeof(dev_t)) < 0) return -1;
-    if(memcmp(&(f1->device),&(f2->device),sizeof(dev_t)) > 0) return 1;
+    if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0)
+        return -1;
+    if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0)
+        return 1;
 #endif /* H5_DEV_T_IS_SCALAR */
-    if(f1->inode < f2->inode) return -1;
-    if(f1->inode > f2->inode) return 1;
+    if (f1->inode < f2->inode)
+        return -1;
+    if (f1->inode > f2->inode)
+        return 1;
 #endif /* H5_HAVE_WIN32_API */
 
     return 0;
 } /* H5FD_stdio_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_query
  *
@@ -546,21 +555,20 @@ static herr_t
 H5FD_stdio_query(const H5FD_t *_f, unsigned long *flags /* out */)
 {
     /* Quiet the compiler */
-    _f=_f;
+    _f = _f;
 
     /* Set the VFL feature flags that this driver supports */
-    if(flags) {
+    if (flags) {
         *flags = 0;
-        *flags|=H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */
-        *flags|=H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
-        *flags|=H5FD_FEAT_DATA_SIEVE;       /* OK to perform data sieving for faster raw data reads & writes */
-        *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations */
+        *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
+        *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */
+        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
     }
 
     return 0;
 } /* end H5FD_stdio_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_alloc
  *
@@ -580,13 +588,14 @@ H5FD_stdio_query(const H5FD_t *_f, unsigned long *flags /* out */)
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, hid_t /*H5_ATTR_UNUSED*/ dxpl_id, hsize_t size)
+H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, hid_t /*H5_ATTR_UNUSED*/ dxpl_id,
+                 hsize_t size)
 {
-    H5FD_stdio_t    *file = (H5FD_stdio_t*)_file;
-    haddr_t         addr;
+    H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
+    haddr_t       addr;
 
     /* Quiet compiler */
-    type = type;
+    type    = type;
     dxpl_id = dxpl_id;
 
     /* Clear the error stack */
@@ -596,9 +605,9 @@ H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, hid_t /*H5_A
     addr = file->eoa;
 
     /* Check if we need to align this block */
-    if(size >= file->pub.threshold) {
+    if (size >= file->pub.threshold) {
         /* Check for an already aligned block */
-        if((addr % file->pub.alignment) != 0)
+        if ((addr % file->pub.alignment) != 0)
             addr = ((addr / file->pub.alignment) + 1) * file->pub.alignment;
     } /* end if */
 
@@ -607,7 +616,6 @@ H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, hid_t /*H5_A
     return addr;
 } /* end H5FD_stdio_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_get_eoa
  *
@@ -638,7 +646,6 @@ H5FD_stdio_get_eoa(const H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type)
     return file->eoa;
 } /* end H5FD_stdio_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_set_eoa
  *
@@ -658,7 +665,7 @@ H5FD_stdio_get_eoa(const H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type)
 static herr_t
 H5FD_stdio_set_eoa(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, haddr_t addr)
 {
-    H5FD_stdio_t  *file = (H5FD_stdio_t*)_file;
+    H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -671,7 +678,6 @@ H5FD_stdio_set_eoa(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, haddr_t ad
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_get_eof
  *
@@ -693,7 +699,7 @@ H5FD_stdio_set_eoa(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, haddr_t ad
 static haddr_t
 H5FD_stdio_get_eof(const H5FD_t *_file)
 {
-    const H5FD_stdio_t  *file = (const H5FD_stdio_t *)_file;
+    const H5FD_stdio_t *file = (const H5FD_stdio_t *)_file;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -701,7 +707,6 @@ H5FD_stdio_get_eof(const H5FD_t *_file)
     return MAX(file->eof, file->eoa);
 } /* end H5FD_stdio_get_eof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD_stdio_get_handle
  *
@@ -715,10 +720,10 @@ H5FD_stdio_get_eof(const H5FD_t *_file)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
+H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
 {
-    H5FD_stdio_t       *file = (H5FD_stdio_t *)_file;
-    static const char  *func = "H5FD_stdio_get_handle";  /* Function Name for error reporting */
+    H5FD_stdio_t *     file = (H5FD_stdio_t *)_file;
+    static const char *func = "H5FD_stdio_get_handle"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
     fapl = fapl;
@@ -727,13 +732,12 @@ H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
     H5Eclear2(H5E_DEFAULT);
 
     *file_handle = &(file->fp);
-    if(*file_handle == NULL)
+    if (*file_handle == NULL)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "get handle failed", -1)
 
-    return 0;
+            return 0;
 } /* end H5FD_stdio_get_handle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_read
  *
@@ -753,38 +757,35 @@ H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
-    void *buf/*out*/)
+H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *buf /*out*/)
 {
-    H5FD_stdio_t    *file = (H5FD_stdio_t*)_file;
-    static const char *func = "H5FD_stdio_read";  /* Function Name for error reporting */
+    H5FD_stdio_t *     file = (H5FD_stdio_t *)_file;
+    static const char *func = "H5FD_stdio_read"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
-    type = type;
+    type    = type;
     dxpl_id = dxpl_id;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     /* Check for overflow */
-    if (HADDR_UNDEF==addr)
-        H5Epush_ret (func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1)
-    if (REGION_OVERFLOW(addr, size))
-        H5Epush_ret (func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1)
+    if (HADDR_UNDEF == addr)
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed",
+                    -1) if (REGION_OVERFLOW(addr, size))
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1)
 
-    /* Check easy cases */
-    if (0 == size)
-        return 0;
+            /* Check easy cases */
+            if (0 == size) return 0;
     if ((haddr_t)addr >= file->eof) {
         memset(buf, 0, size);
         return 0;
     }
 
     /* Seek to the correct file position. */
-    if (!(file->op == H5FD_STDIO_OP_READ || file->op == H5FD_STDIO_OP_SEEK) ||
-            file->pos != addr) {
+    if (!(file->op == H5FD_STDIO_OP_READ || file->op == H5FD_STDIO_OP_SEEK) || file->pos != addr) {
         if (file_fseek(file->fp, (file_offset_t)addr, SEEK_SET) < 0) {
-            file->op = H5FD_STDIO_OP_UNKNOWN;
+            file->op  = H5FD_STDIO_OP_UNKNOWN;
             file->pos = HADDR_UNDEF;
             H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "fseek failed", -1)
         }
@@ -793,7 +794,7 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
 
     /* Read zeros past the logical end of file (physical is handled below) */
     if (addr + size > file->eof) {
-        size_t nbytes = (size_t) (addr + size - file->eof);
+        size_t nbytes = (size_t)(addr + size - file->eof);
         memset((unsigned char *)buf + size - nbytes, 0, nbytes);
         size -= nbytes;
     }
@@ -802,44 +803,43 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
      * will advance the file position by N.  If N is zero or an error
      * occurs then the file position is undefined.
      */
-    while(size > 0) {
+    while (size > 0) {
 
-        size_t bytes_in        = 0;    /* # of bytes to read       */
-        size_t bytes_read      = 0;    /* # of bytes actually read */
-        size_t item_size       = 1;    /* size of items in bytes */
+        size_t bytes_in   = 0; /* # of bytes to read       */
+        size_t bytes_read = 0; /* # of bytes actually read */
+        size_t item_size  = 1; /* size of items in bytes */
 
-        if(size > H5_STDIO_MAX_IO_BYTES_g)
+        if (size > H5_STDIO_MAX_IO_BYTES_g)
             bytes_in = H5_STDIO_MAX_IO_BYTES_g;
         else
             bytes_in = size;
 
         bytes_read = fread(buf, item_size, bytes_in, file->fp);
 
-        if(0 == bytes_read && ferror(file->fp)) { /* error */
-            file->op = H5FD_STDIO_OP_UNKNOWN;
+        if (0 == bytes_read && ferror(file->fp)) { /* error */
+            file->op  = H5FD_STDIO_OP_UNKNOWN;
             file->pos = HADDR_UNDEF;
             H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_READERROR, "fread failed", -1)
         } /* end if */
-        
-        if(0 == bytes_read && feof(file->fp)) {
+
+        if (0 == bytes_read && feof(file->fp)) {
             /* end of file but not end of format address space */
             memset((unsigned char *)buf, 0, size);
             break;
         } /* end if */
-        
+
         size -= bytes_read;
         addr += (haddr_t)bytes_read;
         buf = (char *)buf + bytes_read;
     } /* end while */
 
     /* Update the file position data. */
-    file->op = H5FD_STDIO_OP_READ;
+    file->op  = H5FD_STDIO_OP_READ;
     file->pos = addr;
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_write
  *
@@ -858,59 +858,58 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-    size_t size, const void *buf)
+H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *buf)
 {
-    H5FD_stdio_t    *file = (H5FD_stdio_t*)_file;
-    static const char *func = "H5FD_stdio_write";  /* Function Name for error reporting */
+    H5FD_stdio_t *     file = (H5FD_stdio_t *)_file;
+    static const char *func = "H5FD_stdio_write"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
     dxpl_id = dxpl_id;
-    type = type;
+    type    = type;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
 
     /* Check for overflow conditions */
     if (HADDR_UNDEF == addr)
-        H5Epush_ret (func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1)
-    if (REGION_OVERFLOW(addr, size))
-        H5Epush_ret (func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1)
-
-    /* Seek to the correct file position. */
-    if ((file->op != H5FD_STDIO_OP_WRITE && file->op != H5FD_STDIO_OP_SEEK) ||
-                file->pos != addr) {
-        if (file_fseek(file->fp, (file_offset_t)addr, SEEK_SET) < 0) {
-            file->op = H5FD_STDIO_OP_UNKNOWN;
-            file->pos = HADDR_UNDEF;
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "fseek failed", -1)
+        H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed",
+                    -1) if (REGION_OVERFLOW(addr, size))
+            H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1)
+
+            /* Seek to the correct file position. */
+            if ((file->op != H5FD_STDIO_OP_WRITE && file->op != H5FD_STDIO_OP_SEEK) || file->pos != addr)
+        {
+            if (file_fseek(file->fp, (file_offset_t)addr, SEEK_SET) < 0) {
+                file->op  = H5FD_STDIO_OP_UNKNOWN;
+                file->pos = HADDR_UNDEF;
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "fseek failed", -1)
+            }
+            file->pos = addr;
         }
-        file->pos = addr;
-    }
 
     /* Write the buffer.  On successful return, the file position will be
      * advanced by the number of bytes read.  On failure, the file position is
      * undefined.
      */
-    while(size > 0) {
+    while (size > 0) {
 
-        size_t bytes_in        = 0;    /* # of bytes to write  */
-        size_t bytes_wrote     = 0;    /* # of bytes written   */
-        size_t item_size       = 1;    /* size of items in bytes */
+        size_t bytes_in    = 0; /* # of bytes to write  */
+        size_t bytes_wrote = 0; /* # of bytes written   */
+        size_t item_size   = 1; /* size of items in bytes */
 
-        if(size > H5_STDIO_MAX_IO_BYTES_g)
+        if (size > H5_STDIO_MAX_IO_BYTES_g)
             bytes_in = H5_STDIO_MAX_IO_BYTES_g;
         else
             bytes_in = size;
 
         bytes_wrote = fwrite(buf, item_size, bytes_in, file->fp);
 
-        if(bytes_wrote != bytes_in || (0 == bytes_wrote && ferror(file->fp))) { /* error */
-            file->op = H5FD_STDIO_OP_UNKNOWN;
+        if (bytes_wrote != bytes_in || (0 == bytes_wrote && ferror(file->fp))) { /* error */
+            file->op  = H5FD_STDIO_OP_UNKNOWN;
             file->pos = HADDR_UNDEF;
             H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fwrite failed", -1)
         } /* end if */
-        
+
         assert(bytes_wrote > 0);
         assert((size_t)bytes_wrote <= size);
 
@@ -920,7 +919,7 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
     }
 
     /* Update seek optimizing data. */
-    file->op = H5FD_STDIO_OP_WRITE;
+    file->op  = H5FD_STDIO_OP_WRITE;
     file->pos = addr;
 
     /* Update EOF if necessary */
@@ -930,7 +929,6 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_flush
  *
@@ -950,8 +948,8 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
 static herr_t
 H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
 {
-    H5FD_stdio_t  *file = (H5FD_stdio_t*)_file;
-    static const char *func = "H5FD_stdio_flush";  /* Function Name for error reporting */
+    H5FD_stdio_t *     file = (H5FD_stdio_t *)_file;
+    static const char *func = "H5FD_stdio_flush"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
     dxpl_id = dxpl_id;
@@ -960,21 +958,20 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
     H5Eclear2(H5E_DEFAULT);
 
     /* Only try to flush the file if we have write access */
-    if(file->write_access) {
-        if(!closing) {
-            if(fflush(file->fp) < 0)
+    if (file->write_access) {
+        if (!closing) {
+            if (fflush(file->fp) < 0)
                 H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fflush failed", -1)
 
-            /* Reset last file I/O information */
-            file->pos = HADDR_UNDEF;
+                    /* Reset last file I/O information */
+                    file->pos = HADDR_UNDEF;
             file->op = H5FD_STDIO_OP_UNKNOWN;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     return 0;
 } /* end H5FD_stdio_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5FD_stdio_truncate
  *
@@ -995,8 +992,8 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
 static herr_t
 H5FD_stdio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
 {
-    H5FD_stdio_t  *file = (H5FD_stdio_t*)_file;
-    static const char *func = "H5FD_stdio_truncate";  /* Function Name for error reporting */
+    H5FD_stdio_t *     file = (H5FD_stdio_t *)_file;
+    static const char *func = "H5FD_stdio_truncate"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
     dxpl_id = dxpl_id;
@@ -1006,17 +1003,17 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
     H5Eclear2(H5E_DEFAULT);
 
     /* Only try to flush the file if we have write access */
-    if(file->write_access) {
+    if (file->write_access) {
         /* Makes sure that the true file size is the same as the end-of-address. */
-        if(file->eoa != file->eof) {
+        if (file->eoa != file->eof) {
 
 #ifdef H5_HAVE_WIN32_API
-            LARGE_INTEGER   li;         /* 64-bit (union) integer for SetFilePointer() call */
-            DWORD           dwPtrLow;   /* Low-order pointer bits from SetFilePointer()
-                                         * Only used as an error code here.
-                                         */
-            DWORD           dwError;    /* DWORD error code from GetLastError() */
-            BOOL            bError;     /* Boolean error flag */
+            LARGE_INTEGER li;       /* 64-bit (union) integer for SetFilePointer() call */
+            DWORD         dwPtrLow; /* Low-order pointer bits from SetFilePointer()
+                                     * Only used as an error code here.
+                                     */
+            DWORD dwError;          /* DWORD error code from GetLastError() */
+            BOOL  bError;           /* Boolean error flag */
 
             /* Reset seek offset to beginning of file, so that file isn't re-extended later */
             rewind(file->fp);
@@ -1030,42 +1027,43 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
              * from SetFilePointer(), we also need to check GetLastError().
              */
             dwPtrLow = SetFilePointer(file->hFile, li.LowPart, &li.HighPart, FILE_BEGIN);
-            if(INVALID_SET_FILE_POINTER == dwPtrLow) {
+            if (INVALID_SET_FILE_POINTER == dwPtrLow) {
                 dwError = GetLastError();
-                if(dwError != NO_ERROR )
+                if (dwError != NO_ERROR)
                     H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_FILEOPEN, "unable to set file pointer", -1)
             }
-            
+
             bError = SetEndOfFile(file->hFile);
-            if(0 == bError)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "unable to truncate/extend file properly", -1)
-#else /* H5_HAVE_WIN32_API */
+            if (0 == bError)
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR,
+                            "unable to truncate/extend file properly", -1)
+#else  /* H5_HAVE_WIN32_API */
             /* Reset seek offset to beginning of file, so that file isn't re-extended later */
             rewind(file->fp);
 
             /* Truncate file to proper length */
-            if(-1 == file_ftruncate(file->fd, (file_offset_t)file->eoa))
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "unable to truncate/extend file properly", -1)
+            if (-1 == file_ftruncate(file->fd, (file_offset_t)file->eoa))
+                H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR,
+                            "unable to truncate/extend file properly", -1)
 #endif /* H5_HAVE_WIN32_API */
 
-            /* Update the eof value */
-            file->eof = file->eoa;
+                    /* Update the eof value */
+                    file->eof = file->eoa;
 
             /* Reset last file I/O information */
             file->pos = HADDR_UNDEF;
-            file->op = H5FD_STDIO_OP_UNKNOWN;
+            file->op  = H5FD_STDIO_OP_UNKNOWN;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
         /* Double-check for problems */
-        if(file->eoa > file->eof)
+        if (file->eoa > file->eof)
             H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_TRUNCATED, "eoa > eof!", -1)
     } /* end else */
 
     return 0;
 } /* end H5FD_stdio_truncate() */
 
-
 #ifdef _H5private_H
 /*
  * This is not related to the functionality of the driver code.
@@ -1074,4 +1072,3 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
  */
 #error "Do not use HDF5 private definitions"
 #endif
-
diff --git a/src/H5FDstdio.h b/src/H5FDstdio.h
index b629981..0a4e560 100644
--- a/src/H5FDstdio.h
+++ b/src/H5FDstdio.h
@@ -22,14 +22,14 @@
 
 #include "H5Ipublic.h"
 
-#define H5FD_STDIO	(H5FD_stdio_init())
+#define H5FD_STDIO (H5FD_stdio_init())
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-H5_DLL hid_t H5FD_stdio_init(void);
-H5_DLL void H5FD_stdio_term(void);
+H5_DLL hid_t  H5FD_stdio_init(void);
+H5_DLL void   H5FD_stdio_term(void);
 H5_DLL herr_t H5Pset_fapl_stdio(hid_t fapl_id);
 
 #ifdef __cplusplus
diff --git a/src/H5FDwindows.c b/src/H5FDwindows.c
index 76c4f18..a5b98f0 100644
--- a/src/H5FDwindows.c
+++ b/src/H5FDwindows.c
@@ -11,20 +11,19 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5private.h"      /* Generic Functions        */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5Fprivate.h"     /* File access              */
-#include "H5FDprivate.h"    /* File drivers             */
-#include "H5FDwindows.h"    /* Windows file driver      */
-#include "H5FDsec2.h"       /* Windows file driver      */
-#include "H5FLprivate.h"    /* Free Lists               */
-#include "H5Iprivate.h"     /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management        */
-#include "H5Pprivate.h"     /* Property lists           */
+#include "H5private.h"   /* Generic Functions        */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5Fprivate.h"  /* File access              */
+#include "H5FDprivate.h" /* File drivers             */
+#include "H5FDwindows.h" /* Windows file driver      */
+#include "H5FDsec2.h"    /* Windows file driver      */
+#include "H5FLprivate.h" /* Free Lists               */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Pprivate.h"  /* Property lists           */
 
 #ifdef H5_HAVE_WINDOWS
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_windows
  *
@@ -48,13 +47,13 @@
 herr_t
 H5Pset_fapl_windows(hid_t fapl_id)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value;
+    H5P_genplist_t *plist; /* Property list pointer */
+    herr_t          ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", fapl_id);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     ret_value = H5P_set_driver(plist, H5FD_WINDOWS, NULL);
@@ -64,4 +63,3 @@ done:
 } /* end H5Pset_fapl_windows() */
 
 #endif /* H5_HAVE_WINDOWS */
-
diff --git a/src/H5FDwindows.h b/src/H5FDwindows.h
index a32233a..249ee5c 100644
--- a/src/H5FDwindows.h
+++ b/src/H5FDwindows.h
@@ -24,7 +24,7 @@
 #include "H5Ipublic.h"
 #include "H5FDsec2.h"
 
-#define H5FD_WINDOWS	(H5FD_windows_init())
+#define H5FD_WINDOWS (H5FD_windows_init())
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/H5FL.c b/src/H5FL.c
index 59f0f82..049e91d 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -26,15 +26,14 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5FL_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5FL_init_interface
 
 /* #define H5FL_DEBUG */
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5MMprivate.h" /* Memory management			*/
 
 /*
  * Private type definitions
@@ -44,84 +43,85 @@
     Default limits on how much memory can accumulate on each free list before
     it is garbage collected.
  */
-static size_t H5FL_reg_glb_mem_lim=1*1024*1024; /* Default to 1MB limit on all regular free lists */
-static size_t H5FL_reg_lst_mem_lim=1*65536;     /* Default to 64KB limit on each regular free list */
-static size_t H5FL_arr_glb_mem_lim=4*1024*1024; /* Default to 4MB limit on all array free lists */
-static size_t H5FL_arr_lst_mem_lim=4*65536;     /* Default to 256KB limit on each array free list */
-static size_t H5FL_blk_glb_mem_lim=16*1024*1024; /* Default to 16MB limit on all block free lists */
-static size_t H5FL_blk_lst_mem_lim=1024*1024;   /* Default to 1024KB (1MB) limit on each block free list */
-static size_t H5FL_fac_glb_mem_lim=16*1024*1024; /* Default to 16MB limit on all factory free lists */
-static size_t H5FL_fac_lst_mem_lim=1024*1024;     /* Default to 1024KB (1MB) limit on each factory free list */
+static size_t H5FL_reg_glb_mem_lim = 1 * 1024 * 1024;  /* Default to 1MB limit on all regular free lists */
+static size_t H5FL_reg_lst_mem_lim = 1 * 65536;        /* Default to 64KB limit on each regular free list */
+static size_t H5FL_arr_glb_mem_lim = 4 * 1024 * 1024;  /* Default to 4MB limit on all array free lists */
+static size_t H5FL_arr_lst_mem_lim = 4 * 65536;        /* Default to 256KB limit on each array free list */
+static size_t H5FL_blk_glb_mem_lim = 16 * 1024 * 1024; /* Default to 16MB limit on all block free lists */
+static size_t H5FL_blk_lst_mem_lim = 1024 * 1024; /* Default to 1024KB (1MB) limit on each block free list */
+static size_t H5FL_fac_glb_mem_lim = 16 * 1024 * 1024; /* Default to 16MB limit on all factory free lists */
+static size_t H5FL_fac_lst_mem_lim =
+    1024 * 1024; /* Default to 1024KB (1MB) limit on each factory free list */
 
 /* A garbage collection node for regular free lists */
 typedef struct H5FL_reg_gc_node_t {
-    H5FL_reg_head_t *list;              /* Pointer to the head of the list to garbage collect */
-    struct H5FL_reg_gc_node_t *next;    /* Pointer to the next node in the list of things to garbage collect */
+    H5FL_reg_head_t *          list; /* Pointer to the head of the list to garbage collect */
+    struct H5FL_reg_gc_node_t *next; /* Pointer to the next node in the list of things to garbage collect */
 } H5FL_reg_gc_node_t;
 
 /* The garbage collection head for regular free lists */
 typedef struct H5FL_reg_gc_list_t {
-    size_t mem_freed;               /* Amount of free memory on list */
-    struct H5FL_reg_gc_node_t *first;   /* Pointer to the first node in the list of things to garbage collect */
+    size_t                     mem_freed; /* Amount of free memory on list */
+    struct H5FL_reg_gc_node_t *first; /* Pointer to the first node in the list of things to garbage collect */
 } H5FL_reg_gc_list_t;
 
 /* The head of the list of things to garbage collect */
-static H5FL_reg_gc_list_t H5FL_reg_gc_head={0,NULL};
+static H5FL_reg_gc_list_t H5FL_reg_gc_head = {0, NULL};
 
 /* A garbage collection node for array free lists */
 typedef struct H5FL_gc_arr_node_t {
-    H5FL_arr_head_t *list;              /* Pointer to the head of the list to garbage collect */
-    struct H5FL_gc_arr_node_t *next;    /* Pointer to the next node in the list of things to garbage collect */
+    H5FL_arr_head_t *          list; /* Pointer to the head of the list to garbage collect */
+    struct H5FL_gc_arr_node_t *next; /* Pointer to the next node in the list of things to garbage collect */
 } H5FL_gc_arr_node_t;
 
 /* The garbage collection head for array free lists */
 typedef struct H5FL_gc_arr_list_t {
-    size_t mem_freed;                    /* Amount of free memory on list */
-    struct H5FL_gc_arr_node_t *first;    /* Pointer to the first node in the list of things to garbage collect */
+    size_t                     mem_freed; /* Amount of free memory on list */
+    struct H5FL_gc_arr_node_t *first; /* Pointer to the first node in the list of things to garbage collect */
 } H5FL_gc_arr_list_t;
 
 /* The head of the list of array things to garbage collect */
-static H5FL_gc_arr_list_t H5FL_arr_gc_head={0,NULL};
+static H5FL_gc_arr_list_t H5FL_arr_gc_head = {0, NULL};
 
 /* A garbage collection node for blocks */
 typedef struct H5FL_blk_gc_node_t {
-    H5FL_blk_head_t *pq;                /* Pointer to the head of the PQ to garbage collect */
-    struct H5FL_blk_gc_node_t *next;    /* Pointer to the next node in the list of things to garbage collect */
+    H5FL_blk_head_t *          pq;   /* Pointer to the head of the PQ to garbage collect */
+    struct H5FL_blk_gc_node_t *next; /* Pointer to the next node in the list of things to garbage collect */
 } H5FL_blk_gc_node_t;
 
 /* The garbage collection head for blocks */
 typedef struct H5FL_blk_gc_list_t {
-    size_t mem_freed;                   /* Amount of free memory on list */
-    struct H5FL_blk_gc_node_t *first;   /* Pointer to the first node in the list of things to garbage collect */
+    size_t                     mem_freed; /* Amount of free memory on list */
+    struct H5FL_blk_gc_node_t *first; /* Pointer to the first node in the list of things to garbage collect */
 } H5FL_blk_gc_list_t;
 
 /* The head of the list of PQs to garbage collect */
-static H5FL_blk_gc_list_t H5FL_blk_gc_head={0,NULL};
+static H5FL_blk_gc_list_t H5FL_blk_gc_head = {0, NULL};
 
 /* A garbage collection node for factory free lists */
 struct H5FL_fac_gc_node_t {
-    H5FL_fac_head_t *list;              /* Pointer to the head of the list to garbage collect */
-    struct H5FL_fac_gc_node_t *next;    /* Pointer to the next node in the list of things to garbage collect */
+    H5FL_fac_head_t *          list; /* Pointer to the head of the list to garbage collect */
+    struct H5FL_fac_gc_node_t *next; /* Pointer to the next node in the list of things to garbage collect */
 };
 
 /* The garbage collection head for factory free lists */
 typedef struct H5FL_fac_gc_list_t {
-    size_t mem_freed;               /* Amount of free memory on list */
-    struct H5FL_fac_gc_node_t *first;   /* Pointer to the first node in the list of things to garbage collect */
+    size_t                     mem_freed; /* Amount of free memory on list */
+    struct H5FL_fac_gc_node_t *first; /* Pointer to the first node in the list of things to garbage collect */
 } H5FL_fac_gc_list_t;
 
 /* Data structure to store each block in factory free list */
 struct H5FL_fac_node_t {
-    struct H5FL_fac_node_t *next;   /* Pointer to next block in free list */
+    struct H5FL_fac_node_t *next; /* Pointer to next block in free list */
 };
 
 /* The head of the list of factory things to garbage collect */
-static H5FL_fac_gc_list_t H5FL_fac_gc_head={0,NULL};
+static H5FL_fac_gc_list_t H5FL_fac_gc_head = {0, NULL};
 
 #ifdef H5FL_TRACK
 
 /* Extra headers needed */
-#include "H5CSprivate.h"	/* Function stack			*/
+#include "H5CSprivate.h" /* Function stack			*/
 
 /* Head of "outstanding allocations" list */
 static H5FL_track_t *H5FL_out_head_g = NULL;
@@ -146,7 +146,6 @@ H5FL_DEFINE(H5FL_fac_gc_node_t);
 /* Declare a free list to manage the H5FL_fac_head_t struct */
 H5FL_DEFINE(H5FL_fac_head_t);
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5FL_init_interface -- Initialize interface-specific information
@@ -169,7 +168,6 @@ H5FL_init_interface(void)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FL_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_malloc
  *
@@ -189,26 +187,25 @@ H5FL_init_interface(void)
 static void *
 H5FL_malloc(size_t mem_size)
 {
-    void *ret_value;   /* return value*/
+    void *ret_value; /* return value*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Attempt to allocate the memory requested */
-    if(NULL==(ret_value=H5MM_malloc(mem_size))) {
+    if (NULL == (ret_value = H5MM_malloc(mem_size))) {
         /* If we can't allocate the memory now, try garbage collecting first */
-        if(H5FL_garbage_coll()<0)
+        if (H5FL_garbage_coll() < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during allocation")
 
         /* Now try allocating the memory again */
-        if(NULL==(ret_value=H5MM_malloc(mem_size)))
+        if (NULL == (ret_value = H5MM_malloc(mem_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for chunk")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_malloc() */
+} /* end H5FL_malloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_reg_init
  *
@@ -228,39 +225,38 @@ done:
 static herr_t
 H5FL_reg_init(H5FL_reg_head_t *head)
 {
-    H5FL_reg_gc_node_t *new_node;   /* Pointer to the node for the new list to garbage collect */
-    herr_t ret_value=SUCCEED;   /* return value*/
+    H5FL_reg_gc_node_t *new_node;            /* Pointer to the node for the new list to garbage collect */
+    herr_t              ret_value = SUCCEED; /* return value*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate a new garbage collection node */
-    if(NULL == (new_node = (H5FL_reg_gc_node_t *)H5MM_malloc(sizeof(H5FL_reg_gc_node_t))))
+    if (NULL == (new_node = (H5FL_reg_gc_node_t *)H5MM_malloc(sizeof(H5FL_reg_gc_node_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the new garbage collection node */
     new_node->list = head;
 
     /* Link in to the garbage collection list */
-    new_node->next=H5FL_reg_gc_head.first;
-    H5FL_reg_gc_head.first=new_node;
+    new_node->next         = H5FL_reg_gc_head.first;
+    H5FL_reg_gc_head.first = new_node;
 
     /* Indicate that the free list is initialized */
-    head->init=1;
+    head->init = 1;
 
     /* Make certain that the space allocated is large enough to store a free list pointer (eventually) */
-    if(head->size<sizeof(H5FL_reg_node_t))
-        head->size=sizeof(H5FL_reg_node_t);
+    if (head->size < sizeof(H5FL_reg_node_t))
+        head->size = sizeof(H5FL_reg_node_t);
 
-    /* Make certain there's room for tracking information, if any */
+        /* Make certain there's room for tracking information, if any */
 #ifdef H5FL_TRACK
     head->size += sizeof(H5FL_track_t);
 #endif /* H5FL_TRACK */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_reg_init() */
+} /* end H5FL_reg_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_reg_free
  *
@@ -279,7 +275,7 @@ done:
 void *
 H5FL_reg_free(H5FL_reg_head_t *head, void *obj)
 {
-    void *ret_value=NULL;       /* Return value */
+    void *ret_value = NULL; /* Return value */
 
     /* NOINIT OK here because this must be called after H5FL_reg_malloc/calloc
      * -NAF */
@@ -296,58 +292,57 @@ H5FL_reg_free(H5FL_reg_head_t *head, void *obj)
         /* Free tracking information about the allocation location */
         H5CS_close_stack(trk->stack);
         trk->stack = H5MM_xfree(trk->stack);
-        trk->file = H5MM_xfree(trk->file);
-        trk->func = H5MM_xfree(trk->func);
+        trk->file  = H5MM_xfree(trk->file);
+        trk->func  = H5MM_xfree(trk->func);
 
         /* Remove from "outstanding allocations" list */
-        if(trk == H5FL_out_head_g) {
+        if (trk == H5FL_out_head_g) {
             H5FL_out_head_g = H5FL_out_head_g->next;
-            if(H5FL_out_head_g)
+            if (H5FL_out_head_g)
                 H5FL_out_head_g->prev = NULL;
         } /* end if */
         else {
             trk->prev->next = trk->next;
-            if(trk->next)
+            if (trk->next)
                 trk->next->prev = trk->prev;
         } /* end else */
     }
 #endif /* H5FL_TRACK */
 
 #ifdef H5FL_DEBUG
-    HDmemset(obj,255,head->size);
+    HDmemset(obj, 255, head->size);
 #endif /* H5FL_DEBUG */
 
     /* Make certain that the free list is initialized */
     HDassert(head->init);
 
     /* Link into the free list */
-    ((H5FL_reg_node_t *)obj)->next=head->list;
+    ((H5FL_reg_node_t *)obj)->next = head->list;
 
     /* Point free list at the node freed */
-    head->list=(H5FL_reg_node_t *)obj;
+    head->list = (H5FL_reg_node_t *)obj;
 
     /* Increment the number of blocks on free list */
     head->onlist++;
 
     /* Increment the amount of "regular" freed memory globally */
-    H5FL_reg_gc_head.mem_freed+=head->size;
+    H5FL_reg_gc_head.mem_freed += head->size;
 
     /* Check for exceeding free list memory use limits */
     /* First check this particular list */
-    if(head->onlist * head->size > H5FL_reg_lst_mem_lim)
-        if(H5FL_reg_gc_list(head)<0)
+    if (head->onlist * head->size > H5FL_reg_lst_mem_lim)
+        if (H5FL_reg_gc_list(head) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during free")
 
     /* Then check the global amount memory on regular free lists */
-    if(H5FL_reg_gc_head.mem_freed>H5FL_reg_glb_mem_lim)
-        if(H5FL_reg_gc()<0)
+    if (H5FL_reg_gc_head.mem_freed > H5FL_reg_glb_mem_lim)
+        if (H5FL_reg_gc() < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during free")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_reg_free() */
+} /* end H5FL_reg_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_reg_malloc
  *
@@ -366,7 +361,7 @@ done:
 void *
 H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -374,27 +369,27 @@ H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
     HDassert(head);
 
     /* Make certain the list is initialized first */
-    if(!head->init)
-        if(H5FL_reg_init(head)<0)
+    if (!head->init)
+        if (H5FL_reg_init(head) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "can't initialize 'regular' blocks")
 
     /* Check for nodes available on the free list first */
-    if(head->list!=NULL) {
+    if (head->list != NULL) {
         /* Get a pointer to the block on the free list */
-        ret_value=(void *)(head->list);
+        ret_value = (void *)(head->list);
 
         /* Remove node from free list */
-        head->list=head->list->next;
+        head->list = head->list->next;
 
         /* Decrement the number of blocks & memory on free list */
         head->onlist--;
 
         /* Decrement the amount of global "regular" free list memory in use */
-        H5FL_reg_gc_head.mem_freed-=(head->size);
+        H5FL_reg_gc_head.mem_freed -= (head->size);
     } /* end if */
     /* Otherwise allocate a node */
     else {
-        if (NULL==(ret_value = H5FL_malloc(head->size)))
+        if (NULL == (ret_value = H5FL_malloc(head->size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* Increment the number of blocks allocated in list */
@@ -412,7 +407,7 @@ H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
     /* Add to "outstanding allocations" list */
     ((H5FL_track_t *)ret_value)->prev = NULL;
     ((H5FL_track_t *)ret_value)->next = H5FL_out_head_g;
-    if(H5FL_out_head_g)
+    if (H5FL_out_head_g)
         H5FL_out_head_g->prev = (H5FL_track_t *)ret_value;
     H5FL_out_head_g = (H5FL_track_t *)ret_value;
 
@@ -422,9 +417,8 @@ H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_reg_malloc() */
+} /* end H5FL_reg_malloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_reg_calloc
  *
@@ -443,7 +437,7 @@ done:
 void *
 H5FL_reg_calloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -451,18 +445,17 @@ H5FL_reg_calloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
     HDassert(head);
 
     /* Allocate the block */
-    if (NULL==(ret_value = H5FL_reg_malloc(head H5FL_TRACK_INFO_INT)))
+    if (NULL == (ret_value = H5FL_reg_malloc(head H5FL_TRACK_INFO_INT)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Clear to zeros */
     /* (Accommodate tracking information, if present) */
-    HDmemset(ret_value,0,head->size - H5FL_TRACK_SIZE);
+    HDmemset(ret_value, 0, head->size - H5FL_TRACK_SIZE);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_reg_calloc() */
+} /* end H5FL_reg_calloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_reg_gc_list
  *
@@ -482,18 +475,18 @@ static herr_t
 H5FL_reg_gc_list(H5FL_reg_head_t *head)
 {
     H5FL_reg_node_t *free_list; /* Pointer to nodes in free list being garbage collected */
-    void *tmp;          /* Temporary node pointer */
-    size_t total_mem;   /* Total memory used on list */
+    void *           tmp;       /* Temporary node pointer */
+    size_t           total_mem; /* Total memory used on list */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Calculate the total memory used on this list */
-    total_mem=head->onlist*head->size;
+    total_mem = head->onlist * head->size;
 
     /* For each free list being garbage collected, walk through the nodes and free them */
-    free_list=head->list;
-    while(free_list!=NULL) {
-        tmp=free_list->next;
+    free_list = head->list;
+    while (free_list != NULL) {
+        tmp = free_list->next;
 
         /* Decrement the count of nodes allocated and free the node */
         head->allocated--;
@@ -504,16 +497,15 @@ H5FL_reg_gc_list(H5FL_reg_head_t *head)
     } /* end while */
 
     /* Indicate no free nodes on the free list */
-    head->list=NULL;
-    head->onlist=0;
+    head->list   = NULL;
+    head->onlist = 0;
 
     /* Decrement global count of free memory on "regular" lists */
-    H5FL_reg_gc_head.mem_freed-=total_mem;
+    H5FL_reg_gc_head.mem_freed -= total_mem;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* end H5FL_reg_gc_list() */
+} /* end H5FL_reg_gc_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_reg_gc
  *
@@ -534,30 +526,29 @@ H5FL_reg_gc_list(H5FL_reg_head_t *head)
 static herr_t
 H5FL_reg_gc(void)
 {
-    H5FL_reg_gc_node_t *gc_node;    /* Pointer into the list of things to garbage collect */
-    herr_t ret_value=SUCCEED;   /* return value*/
+    H5FL_reg_gc_node_t *gc_node;             /* Pointer into the list of things to garbage collect */
+    herr_t              ret_value = SUCCEED; /* return value*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Walk through all the free lists, free()'ing the nodes */
-    gc_node=H5FL_reg_gc_head.first;
-    while(gc_node!=NULL) {
+    gc_node = H5FL_reg_gc_head.first;
+    while (gc_node != NULL) {
         /* Release the free nodes on the list */
-        if(H5FL_reg_gc_list(gc_node->list)<0)
+        if (H5FL_reg_gc_list(gc_node->list) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "garbage collection of list failed")
 
         /* Go on to the next free list to garbage collect */
-        gc_node=gc_node->next;
+        gc_node = gc_node->next;
     } /* end while */
 
     /* Double check that all the memory on the free lists is recycled */
-    HDassert(H5FL_reg_gc_head.mem_freed==0);
+    HDassert(H5FL_reg_gc_head.mem_freed == 0);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_reg_gc() */
+} /* end H5FL_reg_gc() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FL_reg_term
@@ -568,7 +559,7 @@ done:
  RETURNS
     Success:	Positive if any action might have caused a change in some
                 other interface; zero otherwise.
-   	Failure:	Negative
+        Failure:	Negative
  DESCRIPTION
     Release any resources allocated.
  GLOBAL VARIABLES
@@ -586,40 +577,41 @@ done:
 static int
 H5FL_reg_term(void)
 {
-    H5FL_reg_gc_node_t *left;   /* pointer to garbage collection lists with work left */
-    H5FL_reg_gc_node_t *tmp;    /* Temporary pointer to a garbage collection node */
+    H5FL_reg_gc_node_t *left; /* pointer to garbage collection lists with work left */
+    H5FL_reg_gc_node_t *tmp;  /* Temporary pointer to a garbage collection node */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if (H5_interface_initialize_g) {
         /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
-        left=NULL;
-        while(H5FL_reg_gc_head.first!=NULL) {
-            tmp=H5FL_reg_gc_head.first->next;
+        left = NULL;
+        while (H5FL_reg_gc_head.first != NULL) {
+            tmp = H5FL_reg_gc_head.first->next;
 
 #ifdef H5FL_DEBUG
-            printf("H5FL_reg_term: head->name=%s, head->allocated=%d\n", H5FL_reg_gc_head.first->list->name,(int)H5FL_reg_gc_head.first->list->allocated);
+            printf("H5FL_reg_term: head->name=%s, head->allocated=%d\n", H5FL_reg_gc_head.first->list->name,
+                   (int)H5FL_reg_gc_head.first->list->allocated);
 #endif /* H5FL_DEBUG */
             /* Check if the list has allocations outstanding */
-            if(H5FL_reg_gc_head.first->list->allocated>0) {
+            if (H5FL_reg_gc_head.first->list->allocated > 0) {
                 /* Add free list to the list of nodes with allocations open still */
-                H5FL_reg_gc_head.first->next=left;
-                left=H5FL_reg_gc_head.first;
+                H5FL_reg_gc_head.first->next = left;
+                left                         = H5FL_reg_gc_head.first;
             } /* end if */
             /* No allocations left open for list, get rid of it */
             else {
                 /* Reset the "initialized" flag, in case we restart this list somehow (I don't know how..) */
-                H5FL_reg_gc_head.first->list->init=0;
+                H5FL_reg_gc_head.first->list->init = 0;
 
                 /* Free the node from the garbage collection list */
                 H5MM_xfree(H5FL_reg_gc_head.first);
             } /* end else */
 
-            H5FL_reg_gc_head.first=tmp;
+            H5FL_reg_gc_head.first = tmp;
         } /* end while */
 
         /* Point to the list of nodes left with allocations open, if any */
-        H5FL_reg_gc_head.first=left;
+        H5FL_reg_gc_head.first = left;
         if (!left)
             H5_interface_initialize_g = 0; /*this layer has reached its initial state*/
     }
@@ -627,9 +619,8 @@ H5FL_reg_term(void)
     /* Terminating this layer never affects other layers; rather, other layers affect
      * the termination of this layer. */
     FUNC_LEAVE_NOAPI(0)
-}   /* end H5FL_reg_term() */
+} /* end H5FL_reg_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_find_list
  *
@@ -652,47 +643,46 @@ H5FL_reg_term(void)
 static H5FL_blk_node_t *
 H5FL_blk_find_list(H5FL_blk_node_t **head, size_t size)
 {
-    H5FL_blk_node_t *temp;  /* Temp. pointer to node in the native list */
+    H5FL_blk_node_t *temp; /* Temp. pointer to node in the native list */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Find the correct free list */
-    temp=*head;
+    temp = *head;
 
     /* Check if the node is at the head of the list */
-    if(temp && temp->size!=size) {
-        temp=temp->next;
+    if (temp && temp->size != size) {
+        temp = temp->next;
 
-        while(temp!=NULL) {
+        while (temp != NULL) {
             /* Check if we found the correct node */
-            if(temp->size==size) {
+            if (temp->size == size) {
                 /* Take the node found out of it's current position */
-                if(temp->next==NULL) {
-                    temp->prev->next=NULL;
+                if (temp->next == NULL) {
+                    temp->prev->next = NULL;
                 } /* end if */
                 else {
-                    temp->prev->next=temp->next;
-                    temp->next->prev=temp->prev;
+                    temp->prev->next = temp->next;
+                    temp->next->prev = temp->prev;
                 } /* end else */
 
                 /* Move the found node to the head of the list */
-                temp->prev=NULL;
-                temp->next=*head;
-                (*head)->prev=temp;
-                *head=temp;
+                temp->prev    = NULL;
+                temp->next    = *head;
+                (*head)->prev = temp;
+                *head         = temp;
 
                 /* Get out */
                 break;
             } /* end if */
 
-            temp=temp->next;
+            temp = temp->next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(temp)
 } /* end H5FL_blk_find_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_create_list
  *
@@ -713,38 +703,37 @@ H5FL_blk_find_list(H5FL_blk_node_t **head, size_t size)
 static H5FL_blk_node_t *
 H5FL_blk_create_list(H5FL_blk_node_t **head, size_t size)
 {
-    H5FL_blk_node_t *temp;  /* Temp. pointer to node in the list */
+    H5FL_blk_node_t *temp; /* Temp. pointer to node in the list */
     H5FL_blk_node_t *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate room for the new free list node */
-    if(NULL==(temp=H5FL_MALLOC(H5FL_blk_node_t)))
+    if (NULL == (temp = H5FL_MALLOC(H5FL_blk_node_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for chunk info")
 
     /* Set the correct values for the new free list */
-    temp->size=size;
-    temp->list=NULL;
+    temp->size = size;
+    temp->list = NULL;
 
     /* Attach to head of priority queue */
-    if(*head==NULL) {
-        *head=temp;
-        temp->next=temp->prev=NULL;
+    if (*head == NULL) {
+        *head      = temp;
+        temp->next = temp->prev = NULL;
     } /* end if */
     else {
-        temp->next=*head;
-        (*head)->prev=temp;
-        temp->prev=NULL;
-        *head=temp;
+        temp->next    = *head;
+        (*head)->prev = temp;
+        temp->prev    = NULL;
+        *head         = temp;
     } /* end else */
 
-    ret_value=temp;
+    ret_value = temp;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FL_blk_create_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_init
  *
@@ -764,30 +753,29 @@ done:
 static herr_t
 H5FL_blk_init(H5FL_blk_head_t *head)
 {
-    H5FL_blk_gc_node_t *new_node;   /* Pointer to the node for the new list to garbage collect */
-    herr_t ret_value=SUCCEED;       /* return value*/
+    H5FL_blk_gc_node_t *new_node;            /* Pointer to the node for the new list to garbage collect */
+    herr_t              ret_value = SUCCEED; /* return value*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate a new garbage collection node */
-    if(NULL == (new_node = (H5FL_blk_gc_node_t *)H5MM_malloc(sizeof(H5FL_blk_gc_node_t))))
+    if (NULL == (new_node = (H5FL_blk_gc_node_t *)H5MM_malloc(sizeof(H5FL_blk_gc_node_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the new garbage collection node */
     new_node->pq = head;
 
     /* Link in to the garbage collection list */
-    new_node->next=H5FL_blk_gc_head.first;
-    H5FL_blk_gc_head.first=new_node;
+    new_node->next         = H5FL_blk_gc_head.first;
+    H5FL_blk_gc_head.first = new_node;
 
     /* Indicate that the PQ is initialized */
-    head->init=1;
+    head->init = 1;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_blk_init() */
+} /* end H5FL_blk_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_free_block_avail
  *
@@ -807,8 +795,8 @@ done:
 htri_t
 H5FL_blk_free_block_avail(H5FL_blk_head_t *head, size_t size)
 {
-    H5FL_blk_node_t *free_list;  /* The free list of nodes of correct size */
-    htri_t ret_value;   /* Return value */
+    H5FL_blk_node_t *free_list; /* The free list of nodes of correct size */
+    htri_t           ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -817,15 +805,14 @@ H5FL_blk_free_block_avail(H5FL_blk_head_t *head, size_t size)
 
     /* check if there is a free list for blocks of this size */
     /* and if there are any blocks available on the list */
-    if((free_list=H5FL_blk_find_list(&(head->head),size))!=NULL && free_list->list!=NULL)
-        ret_value=TRUE;
+    if ((free_list = H5FL_blk_find_list(&(head->head), size)) != NULL && free_list->list != NULL)
+        ret_value = TRUE;
     else
-        ret_value=FALSE;
+        ret_value = FALSE;
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FL_blk_free_block_avail() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_malloc
  *
@@ -847,9 +834,9 @@ done:
 void *
 H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
 {
-    H5FL_blk_node_t *free_list;  /* The free list of nodes of correct size */
-    H5FL_blk_list_t *temp;  /* Temp. ptr to the new native list allocated */
-    void *ret_value;    /* Pointer to the block to return to the user */
+    H5FL_blk_node_t *free_list; /* The free list of nodes of correct size */
+    H5FL_blk_list_t *temp;      /* Temp. ptr to the new native list allocated */
+    void *           ret_value; /* Pointer to the block to return to the user */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -858,29 +845,29 @@ H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
     HDassert(size);
 
     /* Make certain the list is initialized first */
-    if(!head->init)
-        if(H5FL_blk_init(head)<0)
+    if (!head->init)
+        if (H5FL_blk_init(head) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "can't initialize 'block' list")
 
     /* check if there is a free list for blocks of this size */
     /* and if there are any blocks available on the list */
-    if((free_list=H5FL_blk_find_list(&(head->head),size))!=NULL && free_list->list!=NULL) {
+    if ((free_list = H5FL_blk_find_list(&(head->head), size)) != NULL && free_list->list != NULL) {
         /* Remove the first node from the free list */
-        temp=free_list->list;
-        free_list->list=free_list->list->next;
+        temp            = free_list->list;
+        free_list->list = free_list->list->next;
 
         /* Decrement the number of blocks & memory used on free list */
         head->onlist--;
-        head->list_mem-=size;
+        head->list_mem -= size;
 
         /* Decrement the amount of global "block" free list memory in use */
-        H5FL_blk_gc_head.mem_freed-=size;
+        H5FL_blk_gc_head.mem_freed -= size;
 
     } /* end if */
     /* No free list available, or there are no nodes on the list, allocate a new node to give to the user */
     else {
         /* Allocate new node, with room for the page info header and the actual page data */
-        if(NULL == (temp = (H5FL_blk_list_t *)H5FL_malloc(sizeof(H5FL_blk_list_t) + H5FL_TRACK_SIZE + size)))
+        if (NULL == (temp = (H5FL_blk_list_t *)H5FL_malloc(sizeof(H5FL_blk_list_t) + H5FL_TRACK_SIZE + size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for chunk")
 
         /* Increment the number of blocks allocated */
@@ -888,10 +875,10 @@ H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
     } /* end else */
 
     /* Initialize the block allocated */
-    temp->size=size;
+    temp->size = size;
 
     /* Set the return value to the block itself */
-    ret_value=((char *)temp)+sizeof(H5FL_blk_list_t);
+    ret_value = ((char *)temp) + sizeof(H5FL_blk_list_t);
 
 #ifdef H5FL_TRACK
     /* Copy allocation location information */
@@ -904,7 +891,7 @@ H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
     /* Add to "outstanding allocations" list */
     ((H5FL_track_t *)ret_value)->prev = NULL;
     ((H5FL_track_t *)ret_value)->next = H5FL_out_head_g;
-    if(H5FL_out_head_g)
+    if (H5FL_out_head_g)
         H5FL_out_head_g->prev = (H5FL_track_t *)ret_value;
     H5FL_out_head_g = (H5FL_track_t *)ret_value;
 
@@ -916,7 +903,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FL_blk_malloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_calloc
  *
@@ -939,7 +925,7 @@ done:
 void *
 H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
 {
-    void *ret_value;    /* Pointer to the block to return to the user */
+    void *ret_value; /* Pointer to the block to return to the user */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -948,17 +934,16 @@ H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
     HDassert(size);
 
     /* Allocate the block */
-    if (NULL==(ret_value = H5FL_blk_malloc(head,size H5FL_TRACK_INFO_INT)))
+    if (NULL == (ret_value = H5FL_blk_malloc(head, size H5FL_TRACK_INFO_INT)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Clear the block to zeros */
-    HDmemset(ret_value,0,size);
+    HDmemset(ret_value, 0, size);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FL_blk_calloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_free
  *
@@ -980,10 +965,10 @@ done:
 void *
 H5FL_blk_free(H5FL_blk_head_t *head, void *block)
 {
-    H5FL_blk_node_t *free_list;      /* The free list of nodes of correct size */
-    H5FL_blk_list_t *temp;      /* Temp. ptr to the new free list node allocated */
-    size_t free_size;           /* Size of the block freed */
-    void *ret_value=NULL;       /* Return value */
+    H5FL_blk_node_t *free_list;        /* The free list of nodes of correct size */
+    H5FL_blk_list_t *temp;             /* Temp. ptr to the new free list node allocated */
+    size_t           free_size;        /* Size of the block freed */
+    void *           ret_value = NULL; /* Return value */
 
     /* NOINIT OK here because this must be called after H5FL_blk_malloc/calloc
      * -NAF */
@@ -1000,69 +985,71 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block)
         /* Free tracking information about the allocation location */
         H5CS_close_stack(trk->stack);
         trk->stack = H5MM_xfree(trk->stack);
-        trk->file = H5MM_xfree(trk->file);
-        trk->func = H5MM_xfree(trk->func);
+        trk->file  = H5MM_xfree(trk->file);
+        trk->func  = H5MM_xfree(trk->func);
 
         /* Remove from "outstanding allocations" list */
-        if(trk == H5FL_out_head_g) {
+        if (trk == H5FL_out_head_g) {
             H5FL_out_head_g = H5FL_out_head_g->next;
-            if(H5FL_out_head_g)
+            if (H5FL_out_head_g)
                 H5FL_out_head_g->prev = NULL;
         } /* end if */
         else {
             trk->prev->next = trk->next;
-            if(trk->next)
+            if (trk->next)
                 trk->next->prev = trk->prev;
         } /* end else */
     }
 #endif /* H5FL_TRACK */
 
     /* Get the pointer to the native block info header in front of the native block to free */
-    temp=(H5FL_blk_list_t *)((unsigned char *)block-sizeof(H5FL_blk_list_t)); /*lint !e826 Pointer-to-pointer cast is appropriate here */
+    temp =
+        (H5FL_blk_list_t *)((unsigned char *)block -
+                            sizeof(
+                                H5FL_blk_list_t)); /*lint !e826 Pointer-to-pointer cast is appropriate here */
 
     /* Save the block's size for later */
-    free_size=temp->size;
+    free_size = temp->size;
 
 #ifdef H5FL_DEBUG
-    HDmemset(temp,255,free_size + sizeof(H5FL_blk_list_t) + H5FL_TRACK_SIZE);
+    HDmemset(temp, 255, free_size + sizeof(H5FL_blk_list_t) + H5FL_TRACK_SIZE);
 #endif /* H5FL_DEBUG */
 
     /* check if there is a free list for native blocks of this size */
-    if((free_list=H5FL_blk_find_list(&(head->head),free_size))==NULL) {
+    if ((free_list = H5FL_blk_find_list(&(head->head), free_size)) == NULL) {
         /* No free list available, create a new list node and insert it to the queue */
-        free_list=H5FL_blk_create_list(&(head->head),free_size);
+        free_list = H5FL_blk_create_list(&(head->head), free_size);
         HDassert(free_list);
     } /* end if */
 
     /* Prepend the free'd native block to the front of the free list */
-    if(free_list!=NULL) {
-        temp->next=free_list->list; /* Overwrites the size field in union */
-        free_list->list=temp;
+    if (free_list != NULL) {
+        temp->next      = free_list->list; /* Overwrites the size field in union */
+        free_list->list = temp;
     } /* end if */
 
     /* Increment the number of blocks on free list */
     head->onlist++;
-    head->list_mem+=free_size;
+    head->list_mem += free_size;
 
     /* Increment the amount of "block" freed memory globally */
-    H5FL_blk_gc_head.mem_freed+=free_size;
+    H5FL_blk_gc_head.mem_freed += free_size;
 
     /* Check for exceeding free list memory use limits */
     /* First check this particular list */
-    if(head->list_mem>H5FL_blk_lst_mem_lim)
-        if(H5FL_blk_gc_list(head)<0)
+    if (head->list_mem > H5FL_blk_lst_mem_lim)
+        if (H5FL_blk_gc_list(head) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during free")
 
     /* Then check the global amount memory on block free lists */
-    if(H5FL_blk_gc_head.mem_freed>H5FL_blk_glb_mem_lim)
-        if(H5FL_blk_gc()<0)
+    if (H5FL_blk_gc_head.mem_freed > H5FL_blk_glb_mem_lim)
+        if (H5FL_blk_gc() < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during free")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FL_blk_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_realloc
  *
@@ -1083,7 +1070,7 @@ done:
 void *
 H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_PARAMS)
 {
-    void *ret_value=NULL;       /* Return value */
+    void *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1092,21 +1079,24 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_
     HDassert(new_size);
 
     /* Check if we are actually re-allocating a block */
-    if(block!=NULL) {
-        H5FL_blk_list_t *temp;      /* Temp. ptr to the new block node allocated */
+    if (block != NULL) {
+        H5FL_blk_list_t *temp; /* Temp. ptr to the new block node allocated */
 
         /* Get the pointer to the chunk info header in front of the chunk to free */
-        temp=(H5FL_blk_list_t *)((unsigned char *)block - (sizeof(H5FL_blk_list_t) + H5FL_TRACK_SIZE)); /*lint !e826 Pointer-to-pointer cast is appropriate here */
+        temp = (H5FL_blk_list_t
+                    *)((unsigned char *)block -
+                       (sizeof(H5FL_blk_list_t) +
+                        H5FL_TRACK_SIZE)); /*lint !e826 Pointer-to-pointer cast is appropriate here */
 
         /* check if we are actually changing the size of the buffer */
-        if(new_size!=temp->size) {
-            size_t blk_size;           /* Temporary block size */
+        if (new_size != temp->size) {
+            size_t blk_size; /* Temporary block size */
 
-            if((ret_value=H5FL_blk_malloc(head,new_size H5FL_TRACK_INFO_INT))==NULL)
+            if ((ret_value = H5FL_blk_malloc(head, new_size H5FL_TRACK_INFO_INT)) == NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for block")
-            blk_size=MIN(new_size,temp->size);
-            HDmemcpy(ret_value,block,blk_size);
-            H5FL_blk_free(head,block);
+            blk_size = MIN(new_size, temp->size);
+            HDmemcpy(ret_value, block, blk_size);
+            H5FL_blk_free(head, block);
         } /* end if */
         else {
 #ifdef H5FL_TRACK
@@ -1125,18 +1115,17 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_
                 trk->line = call_line;
             }
 #endif /* H5FL_TRACK */
-            ret_value=block;
+            ret_value = block;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     /* Not re-allocating, just allocate a fresh block */
     else
-        ret_value=H5FL_blk_malloc(head,new_size H5FL_TRACK_INFO_INT);
+        ret_value = H5FL_blk_malloc(head, new_size H5FL_TRACK_INFO_INT);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FL_blk_realloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_gc_list
  *
@@ -1156,26 +1145,26 @@ static herr_t
 H5FL_blk_gc_list(H5FL_blk_head_t *head)
 {
     H5FL_blk_list_t *list; /* The free list of native nodes of a particular size */
-    void *next;     /* Temp. ptr to the free list list node */
-    void *temp;     /* Temp. ptr to the free list page node */
+    void *           next; /* Temp. ptr to the free list list node */
+    void *           temp; /* Temp. ptr to the free list page node */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Loop through all the nodes in the block free list queue */
-    while(head->head!=NULL) {
-        temp=head->head->next;
+    while (head->head != NULL) {
+        temp = head->head->next;
 
         /* Loop through all the blocks in the free list, freeing them */
-        list=head->head->list;
-        while(list!=NULL) {
-            next=list->next;
+        list = head->head->list;
+        while (list != NULL) {
+            next = list->next;
 
             /* Decrement the number of blocks & memory allocated from this PQ */
             head->allocated--;
-            head->list_mem-=head->head->size;
+            head->list_mem -= head->head->size;
 
             /* Decrement global count of free memory on "block" lists */
-            H5FL_blk_gc_head.mem_freed-=head->head->size;
+            H5FL_blk_gc_head.mem_freed -= head->head->size;
 
             /* Free the block */
             H5MM_free(list);
@@ -1191,16 +1180,15 @@ H5FL_blk_gc_list(H5FL_blk_head_t *head)
     } /* end while */
 
     /* Indicate no free nodes on the free list */
-    head->head = NULL;
+    head->head   = NULL;
     head->onlist = 0;
 
     /* Double check that all the memory on this list is recycled */
     HDassert(0 == head->list_mem);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* end H5FL_blk_gc_list() */
+} /* end H5FL_blk_gc_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_blk_gc
  *
@@ -1219,30 +1207,29 @@ H5FL_blk_gc_list(H5FL_blk_head_t *head)
 static herr_t
 H5FL_blk_gc(void)
 {
-    H5FL_blk_gc_node_t *gc_node;    /* Pointer into the list of things to garbage collect */
-    herr_t ret_value=SUCCEED;   /* return value*/
+    H5FL_blk_gc_node_t *gc_node;             /* Pointer into the list of things to garbage collect */
+    herr_t              ret_value = SUCCEED; /* return value*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Walk through all the free lists, free()'ing the nodes */
-    gc_node=H5FL_blk_gc_head.first;
-    while(gc_node!=NULL) {
+    gc_node = H5FL_blk_gc_head.first;
+    while (gc_node != NULL) {
         /* For each free list being garbage collected, walk through the nodes and free them */
-        if(H5FL_blk_gc_list(gc_node->pq)<0)
+        if (H5FL_blk_gc_list(gc_node->pq) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "garbage collection of list failed")
 
         /* Go on to the next free list to garbage collect */
-        gc_node=gc_node->next;
+        gc_node = gc_node->next;
     } /* end while */
 
     /* Double check that all the memory on the free lists are recycled */
-    HDassert(H5FL_blk_gc_head.mem_freed==0);
+    HDassert(H5FL_blk_gc_head.mem_freed == 0);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_blk_gc() */
+} /* end H5FL_blk_gc() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FL_blk_term
@@ -1253,7 +1240,7 @@ done:
  RETURNS
     Success:	Positive if any action might have caused a change in some
                 other interface; zero otherwise.
-   	Failure:	Negative
+        Failure:	Negative
  DESCRIPTION
     Release any resources allocated.
  GLOBAL VARIABLES
@@ -1265,45 +1252,45 @@ done:
 static int
 H5FL_blk_term(void)
 {
-    H5FL_blk_gc_node_t *left;   /* pointer to garbage collection lists with work left */
-    H5FL_blk_gc_node_t *tmp;    /* Temporary pointer to a garbage collection node */
+    H5FL_blk_gc_node_t *left; /* pointer to garbage collection lists with work left */
+    H5FL_blk_gc_node_t *tmp;  /* Temporary pointer to a garbage collection node */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
-    left=NULL;
-    while(H5FL_blk_gc_head.first!=NULL) {
-        tmp=H5FL_blk_gc_head.first->next;
+    left = NULL;
+    while (H5FL_blk_gc_head.first != NULL) {
+        tmp = H5FL_blk_gc_head.first->next;
 
 #ifdef H5FL_DEBUG
-printf("H5FL_blk_term: head->name=%s, head->allocated=%d\n", H5FL_blk_gc_head.first->pq->name,(int)H5FL_blk_gc_head.first->pq->allocated);
+        printf("H5FL_blk_term: head->name=%s, head->allocated=%d\n", H5FL_blk_gc_head.first->pq->name,
+               (int)H5FL_blk_gc_head.first->pq->allocated);
 #endif /* H5FL_DEBUG */
 
         /* Check if the list has allocations outstanding */
-        if(H5FL_blk_gc_head.first->pq->allocated>0) {
+        if (H5FL_blk_gc_head.first->pq->allocated > 0) {
             /* Add free list to the list of nodes with allocations open still */
-            H5FL_blk_gc_head.first->next=left;
-            left=H5FL_blk_gc_head.first;
+            H5FL_blk_gc_head.first->next = left;
+            left                         = H5FL_blk_gc_head.first;
         } /* end if */
         /* No allocations left open for list, get rid of it */
         else {
             /* Reset the "initialized" flag, in case we restart this list somehow (I don't know how..) */
-            H5FL_blk_gc_head.first->pq->init=0;
+            H5FL_blk_gc_head.first->pq->init = 0;
 
             /* Free the node from the garbage collection list */
             H5MM_free(H5FL_blk_gc_head.first);
         } /* end else */
 
-        H5FL_blk_gc_head.first=tmp;
+        H5FL_blk_gc_head.first = tmp;
     } /* end while */
 
     /* Point to the list of nodes left with allocations open, if any */
-    H5FL_blk_gc_head.first=left;
+    H5FL_blk_gc_head.first = left;
 
-    FUNC_LEAVE_NOAPI(H5FL_blk_gc_head.first!=NULL ? 1 : 0)
-}   /* end H5FL_blk_term() */
+    FUNC_LEAVE_NOAPI(H5FL_blk_gc_head.first != NULL ? 1 : 0)
+} /* end H5FL_blk_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_arr_init
  *
@@ -1323,29 +1310,30 @@ printf("H5FL_blk_term: head->name=%s, head->allocated=%d\n", H5FL_blk_gc_head.fi
 static herr_t
 H5FL_arr_init(H5FL_arr_head_t *head)
 {
-    H5FL_gc_arr_node_t *new_node;   /* Pointer to the node for the new list to garbage collect */
-    size_t u;                       /* Local index variable */
-    herr_t ret_value=SUCCEED;       /* return value*/
+    H5FL_gc_arr_node_t *new_node;            /* Pointer to the node for the new list to garbage collect */
+    size_t              u;                   /* Local index variable */
+    herr_t              ret_value = SUCCEED; /* return value*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate a new garbage collection node */
-    if(NULL == (new_node = (H5FL_gc_arr_node_t *)H5MM_malloc(sizeof(H5FL_gc_arr_node_t))))
+    if (NULL == (new_node = (H5FL_gc_arr_node_t *)H5MM_malloc(sizeof(H5FL_gc_arr_node_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the new garbage collection node */
     new_node->list = head;
 
     /* Link in to the garbage collection list */
-    new_node->next=H5FL_arr_gc_head.first;
-    H5FL_arr_gc_head.first=new_node;
+    new_node->next         = H5FL_arr_gc_head.first;
+    H5FL_arr_gc_head.first = new_node;
 
     /* Allocate room for the free lists */
-    if(NULL == (head->list_arr = (H5FL_arr_node_t *)H5MM_calloc((size_t)head->maxelem*sizeof(H5FL_arr_node_t))))
+    if (NULL ==
+        (head->list_arr = (H5FL_arr_node_t *)H5MM_calloc((size_t)head->maxelem * sizeof(H5FL_arr_node_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the size of each array */
-    for(u = 0; u < (size_t)head->maxelem; u++)
+    for (u = 0; u < (size_t)head->maxelem; u++)
         head->list_arr[u].size = head->base_size + (head->elem_size * u);
 
     /* Indicate that the free list is initialized */
@@ -1353,9 +1341,8 @@ H5FL_arr_init(H5FL_arr_head_t *head)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_arr_init() */
+} /* end H5FL_arr_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_arr_free
  *
@@ -1374,10 +1361,10 @@ done:
 void *
 H5FL_arr_free(H5FL_arr_head_t *head, void *obj)
 {
-    H5FL_arr_list_t *temp;  /* Temp. ptr to the new free list node allocated */
-    size_t mem_size;        /* Size of memory being freed */
-    size_t free_nelem;      /* Number of elements in node being free'd */
-    void *ret_value=NULL;   /* Return value */
+    H5FL_arr_list_t *temp;             /* Temp. ptr to the new free list node allocated */
+    size_t           mem_size;         /* Size of memory being freed */
+    size_t           free_nelem;       /* Number of elements in node being free'd */
+    void *           ret_value = NULL; /* Return value */
 
     /* NOINIT OK here because this must be called after H5FL_arr_malloc/calloc
      * -NAF */
@@ -1385,7 +1372,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj)
 
     /* The H5MM_xfree code allows obj to null */
     if (!obj)
-        HGOTO_DONE (NULL)
+        HGOTO_DONE(NULL)
 
     /* Double check parameters */
     HDassert(head);
@@ -1394,46 +1381,48 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj)
     HDassert(head->init);
 
     /* Get the pointer to the info header in front of the block to free */
-    temp=(H5FL_arr_list_t *)((unsigned char *)obj-sizeof(H5FL_arr_list_t)); /*lint !e826 Pointer-to-pointer cast is appropriate here */
+    temp =
+        (H5FL_arr_list_t *)((unsigned char *)obj -
+                            sizeof(
+                                H5FL_arr_list_t)); /*lint !e826 Pointer-to-pointer cast is appropriate here */
 
     /* Get the number of elements */
-    free_nelem=temp->nelem;
+    free_nelem = temp->nelem;
 
     /* Double-check that there is enough room for arrays of this size */
-    HDassert((int)free_nelem<=head->maxelem);
+    HDassert((int)free_nelem <= head->maxelem);
 
     /* Link into the free list */
-    temp->next=head->list_arr[free_nelem].list;
+    temp->next = head->list_arr[free_nelem].list;
 
     /* Point free list at the node freed */
-    head->list_arr[free_nelem].list=temp;
+    head->list_arr[free_nelem].list = temp;
 
     /* Get the size of arrays with this many elements */
-    mem_size=head->list_arr[free_nelem].size;
+    mem_size = head->list_arr[free_nelem].size;
 
     /* Increment the number of blocks & memory used on free list */
     head->list_arr[free_nelem].onlist++;
-    head->list_mem+=mem_size;
+    head->list_mem += mem_size;
 
     /* Increment the amount of "array" freed memory globally */
-    H5FL_arr_gc_head.mem_freed+=mem_size;
+    H5FL_arr_gc_head.mem_freed += mem_size;
 
     /* Check for exceeding free list memory use limits */
     /* First check this particular list */
-    if(head->list_mem>H5FL_arr_lst_mem_lim)
-        if(H5FL_arr_gc_list(head)<0)
+    if (head->list_mem > H5FL_arr_lst_mem_lim)
+        if (H5FL_arr_gc_list(head) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during free")
 
     /* Then check the global amount memory on array free lists */
-    if(H5FL_arr_gc_head.mem_freed>H5FL_arr_glb_mem_lim)
-        if(H5FL_arr_gc()<0)
+    if (H5FL_arr_gc_head.mem_freed > H5FL_arr_glb_mem_lim)
+        if (H5FL_arr_gc() < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during free")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_arr_free() */
+} /* end H5FL_arr_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_arr_malloc
  *
@@ -1453,8 +1442,8 @@ void *
 H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem)
 {
     H5FL_arr_list_t *new_obj;   /* Pointer to the new free list node allocated */
-    void *ret_value;        /* Pointer to object to return */
-    size_t mem_size;        /* Size of memory block being recycled */
+    void *           ret_value; /* Pointer to object to return */
+    size_t           mem_size;  /* Size of memory block being recycled */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1463,35 +1452,35 @@ H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem)
     HDassert(elem);
 
     /* Make certain the list is initialized first */
-    if(!head->init)
-        if(H5FL_arr_init(head)<0)
+    if (!head->init)
+        if (H5FL_arr_init(head) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "can't initialize 'array' blocks")
 
     /* Sanity check that the number of elements is supported */
-    HDassert(elem<=(unsigned) head->maxelem);
+    HDassert(elem <= (unsigned)head->maxelem);
 
     /* Get the set of the memory block */
-    mem_size=head->list_arr[elem].size;
+    mem_size = head->list_arr[elem].size;
 
     /* Check for nodes available on the free list first */
-    if(head->list_arr[elem].list!=NULL) {
+    if (head->list_arr[elem].list != NULL) {
         /* Get a pointer to the block on the free list */
-        new_obj=head->list_arr[elem].list;
+        new_obj = head->list_arr[elem].list;
 
         /* Remove node from free list */
-        head->list_arr[elem].list=head->list_arr[elem].list->next;
+        head->list_arr[elem].list = head->list_arr[elem].list->next;
 
         /* Decrement the number of blocks & memory used on free list */
         head->list_arr[elem].onlist--;
-        head->list_mem-=mem_size;
+        head->list_mem -= mem_size;
 
         /* Decrement the amount of global "array" free list memory in use */
-        H5FL_arr_gc_head.mem_freed-=mem_size;
+        H5FL_arr_gc_head.mem_freed -= mem_size;
 
     } /* end if */
     /* Otherwise allocate a node */
     else {
-        if(NULL == (new_obj = (H5FL_arr_list_t *)H5FL_malloc(sizeof(H5FL_arr_list_t)+mem_size)))
+        if (NULL == (new_obj = (H5FL_arr_list_t *)H5FL_malloc(sizeof(H5FL_arr_list_t) + mem_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* Increment the number of blocks allocated in list */
@@ -1499,16 +1488,15 @@ H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem)
     } /* end else */
 
     /* Initialize the new object */
-    new_obj->nelem=elem;
+    new_obj->nelem = elem;
 
     /* Get a pointer to the new block */
-    ret_value=((char *)new_obj)+sizeof(H5FL_arr_list_t);
+    ret_value = ((char *)new_obj) + sizeof(H5FL_arr_list_t);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_arr_malloc() */
+} /* end H5FL_arr_malloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_arr_calloc
  *
@@ -1527,7 +1515,7 @@ done:
 void *
 H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1536,7 +1524,7 @@ H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem)
     HDassert(elem);
 
     /* Allocate the array */
-    if(NULL == (ret_value = H5FL_arr_malloc(head, elem)))
+    if (NULL == (ret_value = H5FL_arr_malloc(head, elem)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Clear to zeros */
@@ -1544,9 +1532,8 @@ H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_arr_calloc() */
+} /* end H5FL_arr_calloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_arr_realloc
  *
@@ -1563,9 +1550,9 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5FL_arr_realloc(H5FL_arr_head_t *head, void * obj, size_t new_elem)
+H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1574,40 +1561,41 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void * obj, size_t new_elem)
     HDassert(new_elem);
 
     /* Check if we are really allocating the object */
-    if(obj==NULL)
-        ret_value=H5FL_arr_malloc(head,new_elem);
+    if (obj == NULL)
+        ret_value = H5FL_arr_malloc(head, new_elem);
     else {
-        H5FL_arr_list_t *temp;  /* Temp. ptr to the new free list node allocated */
+        H5FL_arr_list_t *temp; /* Temp. ptr to the new free list node allocated */
 
         /* Sanity check that the number of elements is supported */
-        HDassert((int)new_elem<=head->maxelem);
+        HDassert((int)new_elem <= head->maxelem);
 
         /* Get the pointer to the info header in front of the block to free */
-        temp=(H5FL_arr_list_t *)((unsigned char *)obj-sizeof(H5FL_arr_list_t)); /*lint !e826 Pointer-to-pointer cast is appropriate here */
+        temp = (H5FL_arr_list_t
+                    *)((unsigned char *)obj -
+                       sizeof(H5FL_arr_list_t)); /*lint !e826 Pointer-to-pointer cast is appropriate here */
 
         /* Check if the size is really changing */
-        if(temp->nelem!=new_elem) {
-            size_t blk_size;       /* Size of block */
+        if (temp->nelem != new_elem) {
+            size_t blk_size; /* Size of block */
 
             /* Get the new array of objects */
-            ret_value=H5FL_arr_malloc(head,new_elem);
+            ret_value = H5FL_arr_malloc(head, new_elem);
 
             /* Copy the appropriate amount of elements */
-            blk_size = head->list_arr[ MIN(temp->nelem, new_elem) ].size;
-            HDmemcpy(ret_value,obj,blk_size);
+            blk_size = head->list_arr[MIN(temp->nelem, new_elem)].size;
+            HDmemcpy(ret_value, obj, blk_size);
 
             /* Free the old block */
-            H5FL_arr_free(head,obj);
+            H5FL_arr_free(head, obj);
         } /* end if */
         else
-            ret_value=obj;
+            ret_value = obj;
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_arr_realloc() */
+} /* end H5FL_arr_realloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_arr_gc_list
  *
@@ -1627,21 +1615,21 @@ static herr_t
 H5FL_arr_gc_list(H5FL_arr_head_t *head)
 {
     H5FL_arr_list_t *arr_free_list; /* Pointer to nodes in free list being garbage collected */
-    void *tmp;      /* Temporary node pointer */
-    unsigned u;     /* Counter for array of free lists */
-    size_t total_mem;   /* Total memory used on list */
+    void *           tmp;           /* Temporary node pointer */
+    unsigned         u;             /* Counter for array of free lists */
+    size_t           total_mem;     /* Total memory used on list */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Walk through the array of free lists */
-    for(u=0; u<(unsigned)head->maxelem; u++) {
-        if(head->list_arr[u].onlist>0) {
+    for (u = 0; u < (unsigned)head->maxelem; u++) {
+        if (head->list_arr[u].onlist > 0) {
             /* Calculate the total memory used on this list */
-            total_mem=head->list_arr[u].onlist*head->list_arr[u].size;
+            total_mem = head->list_arr[u].onlist * head->list_arr[u].size;
 
             /* For each free list being garbage collected, walk through the nodes and free them */
-            arr_free_list=head->list_arr[u].list;
-            while(arr_free_list!=NULL) {
+            arr_free_list = head->list_arr[u].list;
+            while (arr_free_list != NULL) {
                 tmp = arr_free_list->next;
 
                 /* Decrement the count of nodes allocated and free the node */
@@ -1652,24 +1640,23 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head)
             } /* end while */
 
             /* Indicate no free nodes on the free list */
-            head->list_arr[u].list = NULL;
+            head->list_arr[u].list   = NULL;
             head->list_arr[u].onlist = 0;
 
             /* Decrement count of free memory on this "array" list */
-            head->list_mem-=total_mem;
+            head->list_mem -= total_mem;
 
             /* Decrement global count of free memory on "array" lists */
-            H5FL_arr_gc_head.mem_freed-=total_mem;
+            H5FL_arr_gc_head.mem_freed -= total_mem;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Double check that all the memory on this list is recycled */
-    HDassert(head->list_mem==0);
+    HDassert(head->list_mem == 0);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* end H5FL_arr_gc_list() */
+} /* end H5FL_arr_gc_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_arr_gc
  *
@@ -1688,30 +1675,29 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head)
 static herr_t
 H5FL_arr_gc(void)
 {
-    H5FL_gc_arr_node_t *gc_arr_node;    /* Pointer into the list of things to garbage collect */
-    herr_t ret_value=SUCCEED;   /* return value*/
+    H5FL_gc_arr_node_t *gc_arr_node;         /* Pointer into the list of things to garbage collect */
+    herr_t              ret_value = SUCCEED; /* return value*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Walk through all the free lists, free()'ing the nodes */
-    gc_arr_node=H5FL_arr_gc_head.first;
-    while(gc_arr_node!=NULL) {
+    gc_arr_node = H5FL_arr_gc_head.first;
+    while (gc_arr_node != NULL) {
         /* Release the free nodes on the list */
-        if(H5FL_arr_gc_list(gc_arr_node->list)<0)
+        if (H5FL_arr_gc_list(gc_arr_node->list) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "garbage collection of list failed")
 
         /* Go on to the next free list to garbage collect */
-        gc_arr_node=gc_arr_node->next;
+        gc_arr_node = gc_arr_node->next;
     } /* end while */
 
     /* Double check that all the memory on the free lists are recycled */
-    HDassert(H5FL_arr_gc_head.mem_freed==0);
+    HDassert(H5FL_arr_gc_head.mem_freed == 0);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_arr_gc() */
+} /* end H5FL_arr_gc() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FL_arr_term
@@ -1722,7 +1708,7 @@ done:
  RETURNS
     Success:	Positive if any action might have caused a change in some
                 other interface; zero otherwise.
-   	Failure:	Negative
+        Failure:	Negative
  DESCRIPTION
     Release any resources allocated.
  GLOBAL VARIABLES
@@ -1734,24 +1720,25 @@ done:
 static int
 H5FL_arr_term(void)
 {
-    H5FL_gc_arr_node_t *left;   /* pointer to garbage collection lists with work left */
-    H5FL_gc_arr_node_t *tmp;    /* Temporary pointer to a garbage collection node */
+    H5FL_gc_arr_node_t *left; /* pointer to garbage collection lists with work left */
+    H5FL_gc_arr_node_t *tmp;  /* Temporary pointer to a garbage collection node */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
-    left=NULL;
-    while(H5FL_arr_gc_head.first!=NULL) {
-        tmp=H5FL_arr_gc_head.first->next;
+    left = NULL;
+    while (H5FL_arr_gc_head.first != NULL) {
+        tmp = H5FL_arr_gc_head.first->next;
 
         /* Check if the list has allocations outstanding */
 #ifdef H5FL_DEBUG
-printf("H5FL_arr_term: head->name=%s, head->allocated=%d\n", H5FL_arr_gc_head.first->list->name,(int)H5FL_arr_gc_head.first->list->allocated);
+        printf("H5FL_arr_term: head->name=%s, head->allocated=%d\n", H5FL_arr_gc_head.first->list->name,
+               (int)H5FL_arr_gc_head.first->list->allocated);
 #endif /* H5FL_DEBUG */
-        if(H5FL_arr_gc_head.first->list->allocated>0) {
+        if (H5FL_arr_gc_head.first->list->allocated > 0) {
             /* Add free list to the list of nodes with allocations open still */
-            H5FL_arr_gc_head.first->next=left;
-            left=H5FL_arr_gc_head.first;
+            H5FL_arr_gc_head.first->next = left;
+            left                         = H5FL_arr_gc_head.first;
         } /* end if */
         /* No allocations left open for list, get rid of it */
         else {
@@ -1759,22 +1746,21 @@ printf("H5FL_arr_term: head->name=%s, head->allocated=%d\n", H5FL_arr_gc_head.fi
             H5MM_xfree(H5FL_arr_gc_head.first->list->list_arr);
 
             /* Reset the "initialized" flag, in case we restart this list somehow (I don't know how..) */
-            H5FL_arr_gc_head.first->list->init=0;
+            H5FL_arr_gc_head.first->list->init = 0;
 
             /* Free the node from the garbage collection list */
             H5MM_free(H5FL_arr_gc_head.first);
         } /* end else */
 
-        H5FL_arr_gc_head.first=tmp;
+        H5FL_arr_gc_head.first = tmp;
     } /* end while */
 
     /* Point to the list of nodes left with allocations open, if any */
-    H5FL_arr_gc_head.first=left;
+    H5FL_arr_gc_head.first = left;
 
-    FUNC_LEAVE_NOAPI(H5FL_arr_gc_head.first!=NULL ? 1 : 0)
-}   /* end H5FL_arr_term() */
+    FUNC_LEAVE_NOAPI(H5FL_arr_gc_head.first != NULL ? 1 : 0)
+} /* end H5FL_arr_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_seq_free
  *
@@ -1805,12 +1791,11 @@ H5FL_seq_free(H5FL_seq_head_t *head, void *obj)
     HDassert(head->queue.init);
 
     /* Use block routine */
-    H5FL_blk_free(&(head->queue),obj);
+    H5FL_blk_free(&(head->queue), obj);
 
     FUNC_LEAVE_NOAPI(NULL)
-}   /* end H5FL_seq_free() */
+} /* end H5FL_seq_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_seq_malloc
  *
@@ -1829,7 +1814,7 @@ H5FL_seq_free(H5FL_seq_head_t *head, void *obj)
 void *
 H5FL_seq_malloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1838,13 +1823,12 @@ H5FL_seq_malloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS)
     HDassert(elem);
 
     /* Use block routine */
-    ret_value=H5FL_blk_malloc(&(head->queue),head->size*elem H5FL_TRACK_INFO_INT);
+    ret_value = H5FL_blk_malloc(&(head->queue), head->size * elem H5FL_TRACK_INFO_INT);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_seq_malloc() */
+} /* end H5FL_seq_malloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_seq_calloc
  *
@@ -1863,7 +1847,7 @@ done:
 void *
 H5FL_seq_calloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1872,13 +1856,12 @@ H5FL_seq_calloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS)
     HDassert(elem);
 
     /* Use block routine */
-    ret_value=H5FL_blk_calloc(&(head->queue),head->size*elem H5FL_TRACK_INFO_INT);
+    ret_value = H5FL_blk_calloc(&(head->queue), head->size * elem H5FL_TRACK_INFO_INT);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_seq_calloc() */
+} /* end H5FL_seq_calloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_seq_realloc
  *
@@ -1895,9 +1878,9 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5FL_seq_realloc(H5FL_seq_head_t *head, void * obj, size_t new_elem H5FL_TRACK_PARAMS)
+H5FL_seq_realloc(H5FL_seq_head_t *head, void *obj, size_t new_elem H5FL_TRACK_PARAMS)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1906,13 +1889,12 @@ H5FL_seq_realloc(H5FL_seq_head_t *head, void * obj, size_t new_elem H5FL_TRACK_P
     HDassert(new_elem);
 
     /* Use block routine */
-    ret_value=H5FL_blk_realloc(&(head->queue),obj,head->size*new_elem H5FL_TRACK_INFO_INT);
+    ret_value = H5FL_blk_realloc(&(head->queue), obj, head->size * new_elem H5FL_TRACK_INFO_INT);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_seq_realloc() */
+} /* end H5FL_seq_realloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_fac_init
  *
@@ -1934,9 +1916,9 @@ done:
 H5FL_fac_head_t *
 H5FL_fac_init(size_t size)
 {
-    H5FL_fac_gc_node_t  *new_node = NULL; /* Pointer to the node for the new list to garbage collect */
-    H5FL_fac_head_t     *factory = NULL; /* Pointer to new block factory */
-    H5FL_fac_head_t     *ret_value;     /* Return value */
+    H5FL_fac_gc_node_t *new_node = NULL; /* Pointer to the node for the new list to garbage collect */
+    H5FL_fac_head_t *   factory  = NULL; /* Pointer to new block factory */
+    H5FL_fac_head_t *   ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1944,31 +1926,31 @@ H5FL_fac_init(size_t size)
     HDassert(size > 0);
 
     /* Allocate room for the new factory */
-    if(NULL == (factory = (H5FL_fac_head_t *)H5FL_CALLOC(H5FL_fac_head_t)))
+    if (NULL == (factory = (H5FL_fac_head_t *)H5FL_CALLOC(H5FL_fac_head_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for factory object")
 
     /* Set size of blocks for factory */
     factory->size = size;
 
     /* Allocate a new garbage collection node */
-    if(NULL == (new_node = (H5FL_fac_gc_node_t *)H5FL_MALLOC(H5FL_fac_gc_node_t)))
+    if (NULL == (new_node = (H5FL_fac_gc_node_t *)H5FL_MALLOC(H5FL_fac_gc_node_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Initialize the new garbage collection node */
     new_node->list = factory;
 
     /* Link in to the garbage collection list */
-    new_node->next = H5FL_fac_gc_head.first;
+    new_node->next         = H5FL_fac_gc_head.first;
     H5FL_fac_gc_head.first = new_node;
-    if(new_node->next)
-        new_node->next->list->prev_gc=new_node;
+    if (new_node->next)
+        new_node->next->list->prev_gc = new_node;
     /* The new factory's prev_gc field will be set to NULL */
 
     /* Make certain that the space allocated is large enough to store a free list pointer (eventually) */
-    if(factory->size < sizeof(H5FL_fac_node_t))
+    if (factory->size < sizeof(H5FL_fac_node_t))
         factory->size = sizeof(H5FL_fac_node_t);
 
-    /* Make certain there's room for tracking information, if any */
+        /* Make certain there's room for tracking information, if any */
 #ifdef H5FL_TRACK
     factory->size += sizeof(H5FL_track_t);
 #endif /* H5FL_TRACK */
@@ -1980,17 +1962,16 @@ H5FL_fac_init(size_t size)
     ret_value = factory;
 
 done:
-    if(!ret_value) {
-        if(factory)
+    if (!ret_value) {
+        if (factory)
             factory = H5FL_FREE(H5FL_fac_head_t, factory);
-        if(new_node)
+        if (new_node)
             new_node = H5FL_FREE(H5FL_fac_gc_node_t, new_node);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_fac_init() */
+} /* end H5FL_fac_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_fac_free
  *
@@ -2011,7 +1992,7 @@ done:
 void *
 H5FL_fac_free(H5FL_fac_head_t *head, void *obj)
 {
-    void *ret_value=NULL;       /* Return value */
+    void *ret_value = NULL; /* Return value */
 
     /* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
     FUNC_ENTER_NOAPI_NOINIT
@@ -2027,58 +2008,57 @@ H5FL_fac_free(H5FL_fac_head_t *head, void *obj)
         /* Free tracking information about the allocation location */
         H5CS_close_stack(trk->stack);
         trk->stack = H5MM_xfree(trk->stack);
-        trk->file = H5MM_xfree(trk->file);
-        trk->func = H5MM_xfree(trk->func);
+        trk->file  = H5MM_xfree(trk->file);
+        trk->func  = H5MM_xfree(trk->func);
 
         /* Remove from "outstanding allocations" list */
-        if(trk == H5FL_out_head_g) {
+        if (trk == H5FL_out_head_g) {
             H5FL_out_head_g = H5FL_out_head_g->next;
-            if(H5FL_out_head_g)
+            if (H5FL_out_head_g)
                 H5FL_out_head_g->prev = NULL;
         } /* end if */
         else {
             trk->prev->next = trk->next;
-            if(trk->next)
+            if (trk->next)
                 trk->next->prev = trk->prev;
         } /* end else */
     }
 #endif /* H5FL_TRACK */
 
 #ifdef H5FL_DEBUG
-    HDmemset(obj,255,head->size);
+    HDmemset(obj, 255, head->size);
 #endif /* H5FL_DEBUG */
 
     /* Make certain that the free list is initialized */
     HDassert(head->init);
 
     /* Link into the free list */
-    ((H5FL_fac_node_t *)obj)->next=head->list;
+    ((H5FL_fac_node_t *)obj)->next = head->list;
 
     /* Point free list at the node freed */
-    head->list=(H5FL_fac_node_t *)obj;
+    head->list = (H5FL_fac_node_t *)obj;
 
     /* Increment the number of blocks on free list */
     head->onlist++;
 
     /* Increment the amount of "factory" freed memory globally */
-    H5FL_fac_gc_head.mem_freed+=head->size;
+    H5FL_fac_gc_head.mem_freed += head->size;
 
     /* Check for exceeding free list memory use limits */
     /* First check this particular list */
-    if(head->onlist * head->size > H5FL_fac_lst_mem_lim)
-        if(H5FL_fac_gc_list(head)<0)
+    if (head->onlist * head->size > H5FL_fac_lst_mem_lim)
+        if (H5FL_fac_gc_list(head) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during free")
 
     /* Then check the global amount memory on factory free lists */
-    if(H5FL_fac_gc_head.mem_freed > H5FL_fac_glb_mem_lim)
-        if(H5FL_fac_gc()<0)
+    if (H5FL_fac_gc_head.mem_freed > H5FL_fac_glb_mem_lim)
+        if (H5FL_fac_gc() < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, NULL, "garbage collection failed during free")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_fac_free() */
+} /* end H5FL_fac_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_fac_malloc
  *
@@ -2100,7 +2080,7 @@ done:
 void *
 H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     /* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
     FUNC_ENTER_NOAPI_NOINIT
@@ -2110,22 +2090,22 @@ H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
     HDassert(head->init);
 
     /* Check for nodes available on the free list first */
-    if(head->list!=NULL) {
+    if (head->list != NULL) {
         /* Get a pointer to the block on the free list */
-        ret_value=(void *)(head->list);
+        ret_value = (void *)(head->list);
 
         /* Remove node from free list */
-        head->list=head->list->next;
+        head->list = head->list->next;
 
         /* Decrement the number of blocks & memory on free list */
         head->onlist--;
 
         /* Decrement the amount of global "factory" free list memory in use */
-        H5FL_fac_gc_head.mem_freed-=(head->size);
+        H5FL_fac_gc_head.mem_freed -= (head->size);
     } /* end if */
     /* Otherwise allocate a node */
     else {
-        if (NULL==(ret_value = H5FL_malloc(head->size)))
+        if (NULL == (ret_value = H5FL_malloc(head->size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* Increment the number of blocks allocated in list */
@@ -2143,7 +2123,7 @@ H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
     /* Add to "outstanding allocations" list */
     ((H5FL_track_t *)ret_value)->prev = NULL;
     ((H5FL_track_t *)ret_value)->next = H5FL_out_head_g;
-    if(H5FL_out_head_g)
+    if (H5FL_out_head_g)
         H5FL_out_head_g->prev = (H5FL_track_t *)ret_value;
     H5FL_out_head_g = (H5FL_track_t *)ret_value;
 
@@ -2153,9 +2133,8 @@ H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_fac_malloc() */
+} /* end H5FL_fac_malloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_fac_calloc
  *
@@ -2177,7 +2156,7 @@ done:
 void *
 H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
 {
-    void *ret_value;        /* Pointer to object to return */
+    void *ret_value; /* Pointer to object to return */
 
     /* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
     FUNC_ENTER_NOAPI_NOINIT
@@ -2186,17 +2165,17 @@ H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
     HDassert(head);
 
     /* Allocate the block */
-    if (NULL==(ret_value = H5FL_fac_malloc(head H5FL_TRACK_INFO_INT)))
+    if (NULL == (ret_value = H5FL_fac_malloc(head H5FL_TRACK_INFO_INT)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Clear to zeros */
     /* (Accommodate tracking information, if present) */
-    HDmemset(ret_value,0,head->size - H5FL_TRACK_SIZE);
+    HDmemset(ret_value, 0, head->size - H5FL_TRACK_SIZE);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_fac_calloc() */
-
+} /* end H5FL_fac_calloc() */
+
 /*-------------------------------------------------------------------------
  * Function:	H5FL_fac_gc_list
  *
@@ -2216,18 +2195,18 @@ static herr_t
 H5FL_fac_gc_list(H5FL_fac_head_t *head)
 {
     H5FL_fac_node_t *free_list; /* Pointer to nodes in free list being garbage collected */
-    void *tmp;          /* Temporary node pointer */
-    size_t total_mem;   /* Total memory used on list */
+    void *           tmp;       /* Temporary node pointer */
+    size_t           total_mem; /* Total memory used on list */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Calculate the total memory used on this list */
-    total_mem=head->onlist*head->size;
+    total_mem = head->onlist * head->size;
 
     /* For each free list being garbage collected, walk through the nodes and free them */
-    free_list=head->list;
-    while(free_list!=NULL) {
-        tmp=free_list->next;
+    free_list = head->list;
+    while (free_list != NULL) {
+        tmp = free_list->next;
 
         /* Decrement the count of nodes allocated and free the node */
         head->allocated--;
@@ -2238,16 +2217,15 @@ H5FL_fac_gc_list(H5FL_fac_head_t *head)
     } /* end while */
 
     /* Indicate no free nodes on the free list */
-    head->list=NULL;
-    head->onlist=0;
+    head->list   = NULL;
+    head->onlist = 0;
 
     /* Decrement global count of free memory on "factory" lists */
-    H5FL_fac_gc_head.mem_freed-=total_mem;
+    H5FL_fac_gc_head.mem_freed -= total_mem;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* end H5FL_fac_gc_list() */
+} /* end H5FL_fac_gc_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_fac_gc
  *
@@ -2266,30 +2244,29 @@ H5FL_fac_gc_list(H5FL_fac_head_t *head)
 static herr_t
 H5FL_fac_gc(void)
 {
-    H5FL_fac_gc_node_t *gc_node;    /* Pointer into the list of things to garbage collect */
-    herr_t ret_value=SUCCEED;   /* return value*/
+    H5FL_fac_gc_node_t *gc_node;             /* Pointer into the list of things to garbage collect */
+    herr_t              ret_value = SUCCEED; /* return value*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Walk through all the free lists, free()'ing the nodes */
-    gc_node=H5FL_fac_gc_head.first;
-    while(gc_node!=NULL) {
+    gc_node = H5FL_fac_gc_head.first;
+    while (gc_node != NULL) {
         /* Release the free nodes on the list */
-        if(H5FL_fac_gc_list(gc_node->list)<0)
+        if (H5FL_fac_gc_list(gc_node->list) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "garbage collection of list failed")
 
         /* Go on to the next free list to garbage collect */
-        gc_node=gc_node->next;
+        gc_node = gc_node->next;
     } /* end while */
 
     /* Double check that all the memory on the free lists is recycled */
-    HDassert(H5FL_fac_gc_head.mem_freed==0);
+    HDassert(H5FL_fac_gc_head.mem_freed == 0);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_fac_gc() */
+} /* end H5FL_fac_gc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_fac_term
  *
@@ -2311,8 +2288,8 @@ done:
 herr_t
 H5FL_fac_term(H5FL_fac_head_t *factory)
 {
-    H5FL_fac_gc_node_t *tmp;        /* Temporary pointer to a garbage collection node */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5FL_fac_gc_node_t *tmp;                 /* Temporary pointer to a garbage collection node */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     /* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
     FUNC_ENTER_NOAPI_NOINIT
@@ -2321,29 +2298,31 @@ H5FL_fac_term(H5FL_fac_head_t *factory)
     HDassert(factory);
 
     /* Garbage collect all the blocks in the factory's free list */
-    if(H5FL_fac_gc_list(factory)<0)
+    if (H5FL_fac_gc_list(factory) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "garbage collection of factory failed")
 
     /* Verify that all the blocks have been freed */
-    if(factory->allocated>0)
+    if (factory->allocated > 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "factory still has objects allocated")
 
     /* Unlink block free list for factory from global free list */
-    if(factory->prev_gc) {
-        H5FL_fac_gc_node_t *last = factory->prev_gc;    /* Garbage collection node before the one being removed */
+    if (factory->prev_gc) {
+        H5FL_fac_gc_node_t *last =
+            factory->prev_gc; /* Garbage collection node before the one being removed */
 
         HDassert(last->next->list == factory);
-        tmp = last->next->next;
+        tmp        = last->next->next;
         last->next = H5FL_FREE(H5FL_fac_gc_node_t, last->next);
         last->next = tmp;
-        if(tmp)
+        if (tmp)
             tmp->list->prev_gc = last;
-    } else {
+    }
+    else {
         HDassert(H5FL_fac_gc_head.first->list == factory);
-        tmp = H5FL_fac_gc_head.first->next;
+        tmp                    = H5FL_fac_gc_head.first->next;
         H5FL_fac_gc_head.first = H5FL_FREE(H5FL_fac_gc_node_t, H5FL_fac_gc_head.first);
         H5FL_fac_gc_head.first = tmp;
-        if(tmp)
+        if (tmp)
             tmp->list->prev_gc = NULL;
     } /* end else */
 
@@ -2352,9 +2331,8 @@ H5FL_fac_term(H5FL_fac_head_t *factory)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_fac_term() */
+} /* end H5FL_fac_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_fac_term_all
  *
@@ -2373,16 +2351,17 @@ done:
 static int
 H5FL_fac_term_all(void)
 {
-    H5FL_fac_gc_node_t *tmp;    /* Temporary pointer to a garbage collection node */
+    H5FL_fac_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Free the nodes on the garbage collection list */
-    while(H5FL_fac_gc_head.first != NULL) {
-        tmp=H5FL_fac_gc_head.first->next;
+    while (H5FL_fac_gc_head.first != NULL) {
+        tmp = H5FL_fac_gc_head.first->next;
 
 #ifdef H5FL_DEBUG
-printf("H5FL_fac_term: head->size=%d, head->allocated=%d\n", (int)H5FL_fac_gc_head.first->list->size,(int)H5FL_fac_gc_head.first->list->allocated);
+        printf("H5FL_fac_term: head->size=%d, head->allocated=%d\n", (int)H5FL_fac_gc_head.first->list->size,
+               (int)H5FL_fac_gc_head.first->list->allocated);
 #endif /* H5FL_DEBUG */
 
         /* The list cannot have any allocations outstanding */
@@ -2398,9 +2377,8 @@ printf("H5FL_fac_term: head->size=%d, head->allocated=%d\n", (int)H5FL_fac_gc_he
     } /* end while */
 
     FUNC_LEAVE_NOAPI(0)
-}   /* end H5FL_fac_term_all() */
+} /* end H5FL_fac_term_all() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_garbage_coll
  *
@@ -2419,31 +2397,30 @@ printf("H5FL_fac_term: head->size=%d, head->allocated=%d\n", (int)H5FL_fac_gc_he
 herr_t
 H5FL_garbage_coll(void)
 {
-    herr_t                  ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Garbage collect the free lists for array objects */
-    if(H5FL_arr_gc()<0)
+    if (H5FL_arr_gc() < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "can't garbage collect array objects")
 
     /* Garbage collect free lists for blocks */
-    if(H5FL_blk_gc()<0)
+    if (H5FL_blk_gc() < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "can't garbage collect block objects")
 
     /* Garbage collect the free lists for regular objects */
-    if(H5FL_reg_gc()<0)
+    if (H5FL_reg_gc() < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "can't garbage collect regular objects")
 
     /* Garbage collect the free lists for factory objects */
-    if(H5FL_fac_gc()<0)
+    if (H5FL_fac_gc() < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "can't garbage collect regular objects")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_garbage_coll() */
+} /* end H5FL_garbage_coll() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FL_set_free_list_limits
  *
@@ -2476,37 +2453,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim,
-    int arr_list_lim, int blk_global_lim, int blk_list_lim, int fac_global_lim,
-    int fac_list_lim)
+H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim, int arr_list_lim,
+                          int blk_global_lim, int blk_list_lim, int fac_global_lim, int fac_list_lim)
 {
-    herr_t                  ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Set the limit variables */
     /* limit on all regular free lists */
-    H5FL_reg_glb_mem_lim=(reg_global_lim==-1 ? UINT_MAX : (size_t)reg_global_lim);
+    H5FL_reg_glb_mem_lim = (reg_global_lim == -1 ? UINT_MAX : (size_t)reg_global_lim);
     /* limit on each regular free list */
-    H5FL_reg_lst_mem_lim=(reg_list_lim==-1 ? UINT_MAX : (size_t)reg_list_lim);
+    H5FL_reg_lst_mem_lim = (reg_list_lim == -1 ? UINT_MAX : (size_t)reg_list_lim);
     /* limit on all array free lists */
-    H5FL_arr_glb_mem_lim=(arr_global_lim==-1 ? UINT_MAX : (size_t)arr_global_lim);
+    H5FL_arr_glb_mem_lim = (arr_global_lim == -1 ? UINT_MAX : (size_t)arr_global_lim);
     /* limit on each array free list */
-    H5FL_arr_lst_mem_lim=(arr_list_lim==-1 ? UINT_MAX : (size_t)arr_list_lim);
+    H5FL_arr_lst_mem_lim = (arr_list_lim == -1 ? UINT_MAX : (size_t)arr_list_lim);
     /* limit on all block free lists */
-    H5FL_blk_glb_mem_lim=(blk_global_lim==-1 ? UINT_MAX : (size_t)blk_global_lim);
+    H5FL_blk_glb_mem_lim = (blk_global_lim == -1 ? UINT_MAX : (size_t)blk_global_lim);
     /* limit on each block free list */
-    H5FL_blk_lst_mem_lim=(blk_list_lim==-1 ? UINT_MAX : (size_t)blk_list_lim);
+    H5FL_blk_lst_mem_lim = (blk_list_lim == -1 ? UINT_MAX : (size_t)blk_list_lim);
     /* limit on all factory free lists */
-    H5FL_fac_glb_mem_lim=(fac_global_lim==-1 ? UINT_MAX : (size_t)fac_global_lim);
+    H5FL_fac_glb_mem_lim = (fac_global_lim == -1 ? UINT_MAX : (size_t)fac_global_lim);
     /* limit on each factory free list */
-    H5FL_fac_lst_mem_lim=(fac_list_lim==-1 ? UINT_MAX : (size_t)fac_list_lim);
+    H5FL_fac_lst_mem_lim = (fac_list_lim == -1 ? UINT_MAX : (size_t)fac_list_lim);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5FL_set_free_list_limits() */
+} /* end H5FL_set_free_list_limits() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FL_term_interface
@@ -2517,7 +2492,7 @@ done:
  RETURNS
     Success:	Positive if any action might have caused a change in some
                 other interface; zero otherwise.
-   	Failure:	Negative
+        Failure:	Negative
  DESCRIPTION
     Release any resources allocated.
  GLOBAL VARIABLES
@@ -2529,33 +2504,33 @@ done:
 int
 H5FL_term_interface(void)
 {
-    int ret_value=0;
+    int ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    /* Garbage collect any nodes on the free lists */
-    (void)H5FL_garbage_coll();
+        /* Garbage collect any nodes on the free lists */
+        (void)
+    H5FL_garbage_coll();
 
-    ret_value=H5FL_reg_term()+H5FL_fac_term_all()+H5FL_arr_term()+H5FL_blk_term();
+    ret_value = H5FL_reg_term() + H5FL_fac_term_all() + H5FL_arr_term() + H5FL_blk_term();
 
 #ifdef H5FL_TRACK
     /* If we haven't freed all the allocated memory, dump out the list now */
-    if(ret_value > 0 && H5FL_out_head_g) {
+    if (ret_value > 0 && H5FL_out_head_g) {
         H5FL_track_t *trk = H5FL_out_head_g;
 
         /* Dump information about all the outstanding allocations */
-        while(trk != NULL) {
+        while (trk != NULL) {
             /* Print information about the outstanding block */
-            HDfprintf(stderr,"%s: Outstanding allocation:\n", "H5FL_term_interface");
-            HDfprintf(stderr,"\tFile: %s, Function: %s, Line: %d\n", trk->file, trk->func, trk->line);
+            HDfprintf(stderr, "%s: Outstanding allocation:\n", "H5FL_term_interface");
+            HDfprintf(stderr, "\tFile: %s, Function: %s, Line: %d\n", trk->file, trk->func, trk->line);
             H5CS_print_stack(trk->stack, stderr);
 
             /* Advance to next node */
             trk = trk->next;
         } /* end while */
-    } /* end if */
-#endif /* H5FL_TRACK */
+    }     /* end if */
+#endif    /* H5FL_TRACK */
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
-
diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
index 7d69fa2..b609d7b 100644
--- a/src/H5FLprivate.h
+++ b/src/H5FLprivate.h
@@ -28,8 +28,8 @@
 
 /* Public headers needed by this file */
 #ifdef LATER
-#include "H5FLpublic.h"		/*API prototypes			     */
-#endif /* LATER */
+#include "H5FLpublic.h" /*API prototypes			     */
+#endif                  /* LATER */
 
 /* Private headers needed by this file */
 
@@ -53,23 +53,23 @@
 /* #define H5FL_TRACK */
 #ifdef H5FL_TRACK
 /* Macro for inclusion in the free list allocation calls */
-#define H5FL_TRACK_INFO         ,__FILE__, FUNC, __LINE__
+#define H5FL_TRACK_INFO , __FILE__, FUNC, __LINE__
 
 /* Macro for inclusion in internal free list allocation calls */
-#define H5FL_TRACK_INFO_INT     ,call_file, call_func, call_line
+#define H5FL_TRACK_INFO_INT , call_file, call_func, call_line
 
 /* Macro for inclusion in the free list allocation parameters */
-#define H5FL_TRACK_PARAMS       ,const char *call_file, const char *call_func, int call_line
+#define H5FL_TRACK_PARAMS , const char *call_file, const char *call_func, int call_line
 
 /* Forward declarations for structure fields */
 struct H5CS_t;
 
 /* Tracking information for each block */
 typedef struct H5FL_track_t {
-    struct H5CS_t *stack;      /* Function stack */
-    char *file;         /* Name of file containing calling function */
-    char *func;         /* Name of calling function */
-    int line;           /* Line # within calling function */
+    struct H5CS_t *      stack; /* Function stack */
+    char *               file;  /* Name of file containing calling function */
+    char *               func;  /* Name of calling function */
+    int                  line;  /* Line # within calling function */
     struct H5FL_track_t *next;  /* Pointer to next tracking block */
     struct H5FL_track_t *prev;  /* Pointer to previous tracking block */
 } H5FL_track_t;
@@ -81,7 +81,7 @@ typedef struct H5FL_track_t {
 #define H5FL_TRACK_INFO
 #define H5FL_TRACK_INFO_INT
 #define H5FL_TRACK_PARAMS
-#define H5FL_TRACK_SIZE         0
+#define H5FL_TRACK_SIZE 0
 #endif /* H5FL_TRACK */
 
 /*
@@ -90,44 +90,44 @@ typedef struct H5FL_track_t {
 
 /* Data structure to store each block in free list */
 typedef struct H5FL_reg_node_t {
-    struct H5FL_reg_node_t *next;   /* Pointer to next block in free list */
+    struct H5FL_reg_node_t *next; /* Pointer to next block in free list */
 } H5FL_reg_node_t;
 
 /* Data structure for free list of blocks */
 typedef struct H5FL_reg_head_t {
-    unsigned init;      /* Whether the free list has been initialized */
-    unsigned allocated; /* Number of blocks allocated */
-    unsigned onlist;    /* Number of blocks on free list */
-    const char *name;   /* Name of the type */
-    size_t size;        /* Size of the blocks in the list */
-    H5FL_reg_node_t *list;  /* List of free blocks */
+    unsigned         init;      /* Whether the free list has been initialized */
+    unsigned         allocated; /* Number of blocks allocated */
+    unsigned         onlist;    /* Number of blocks on free list */
+    const char *     name;      /* Name of the type */
+    size_t           size;      /* Size of the blocks in the list */
+    H5FL_reg_node_t *list;      /* List of free blocks */
 } H5FL_reg_head_t;
 
 /*
  * Macros for defining & using free lists for a type
  */
-#define H5FL_REG_NAME(t)        H5_##t##_reg_free_list
+#define H5FL_REG_NAME(t) H5_##t##_reg_free_list
 #ifndef H5_NO_REG_FREE_LISTS
 /* Common macros for H5FL_DEFINE & H5FL_DEFINE_STATIC */
-#define H5FL_DEFINE_COMMON(t) H5FL_reg_head_t H5FL_REG_NAME(t)={0,0,0,#t,sizeof(t),NULL}
+#define H5FL_DEFINE_COMMON(t) H5FL_reg_head_t H5FL_REG_NAME(t) = {0, 0, 0, #t, sizeof(t), NULL}
 
 /* Declare a free list to manage objects of type 't' */
 #define H5FL_DEFINE(t) H5_DLL H5FL_DEFINE_COMMON(t)
 
 /* Reference a free list for type 't' defined in another file */
-#define H5FL_EXTERN(t)  H5_DLLVAR H5FL_reg_head_t H5FL_REG_NAME(t)
+#define H5FL_EXTERN(t) H5_DLLVAR H5FL_reg_head_t H5FL_REG_NAME(t)
 
 /* Declare a static free list to manage objects of type 't' */
-#define H5FL_DEFINE_STATIC(t)  static H5FL_DEFINE_COMMON(t)
+#define H5FL_DEFINE_STATIC(t) static H5FL_DEFINE_COMMON(t)
 
 /* Allocate an object of type 't' */
-#define H5FL_MALLOC(t) (t *)H5FL_reg_malloc(&(H5FL_REG_NAME(t)) H5FL_TRACK_INFO)
+#define H5FL_MALLOC(t) (t *)H5FL_reg_malloc(&(H5FL_REG_NAME(t))H5FL_TRACK_INFO)
 
 /* Allocate an object of type 't' and clear it to all zeros */
-#define H5FL_CALLOC(t) (t *)H5FL_reg_calloc(&(H5FL_REG_NAME(t)) H5FL_TRACK_INFO)
+#define H5FL_CALLOC(t) (t *)H5FL_reg_calloc(&(H5FL_REG_NAME(t))H5FL_TRACK_INFO)
 
 /* Free an object of type 't' */
-#define H5FL_FREE(t,obj) (t *)H5FL_reg_free(&(H5FL_REG_NAME(t)),obj)
+#define H5FL_FREE(t, obj) (t *)H5FL_reg_free(&(H5FL_REG_NAME(t)), obj)
 
 /* Re-allocating an object of type 't' is not defined, because these free-lists
  * only support fixed sized types, like structs, etc..
@@ -138,167 +138,169 @@ typedef struct H5FL_reg_head_t {
 /* Common macro for H5FL_DEFINE & H5FL_DEFINE_STATIC */
 #define H5FL_DEFINE_COMMON(t) int H5_ATTR_UNUSED H5FL_REG_NAME(t)
 
-#define H5FL_DEFINE(t)  H5_DLL H5FL_DEFINE_COMMON(t)
-#define H5FL_EXTERN(t)  H5_DLLVAR H5FL_DEFINE_COMMON(t)
-#define H5FL_DEFINE_STATIC(t)  static H5FL_DEFINE_COMMON(t)
-#define H5FL_MALLOC(t) (t *)H5MM_malloc(sizeof(t))
-#define H5FL_CALLOC(t) (t *)H5MM_calloc(sizeof(t))
-#define H5FL_FREE(t,obj) (t *)H5MM_xfree(obj)
+#define H5FL_DEFINE(t)        H5_DLL H5FL_DEFINE_COMMON(t)
+#define H5FL_EXTERN(t)        H5_DLLVAR H5FL_DEFINE_COMMON(t)
+#define H5FL_DEFINE_STATIC(t) static H5FL_DEFINE_COMMON(t)
+#define H5FL_MALLOC(t)        (t *)H5MM_malloc(sizeof(t))
+#define H5FL_CALLOC(t)        (t *)H5MM_calloc(sizeof(t))
+#define H5FL_FREE(t, obj)     (t *)H5MM_xfree(obj)
 #endif /* H5_NO_REG_FREE_LISTS */
 
 /* Data structure to store information about each block allocated */
 typedef union H5FL_blk_list_t {
-    size_t size;                /* Size of the page */
-    union H5FL_blk_list_t *next;   /* Pointer to next block in free list */
-    double unused1;         /* Unused normally, just here for aligment */
-    haddr_t unused2;        /* Unused normally, just here for aligment */
+    size_t                 size;    /* Size of the page */
+    union H5FL_blk_list_t *next;    /* Pointer to next block in free list */
+    double                 unused1; /* Unused normally, just here for aligment */
+    haddr_t                unused2; /* Unused normally, just here for aligment */
 } H5FL_blk_list_t;
 
 /* Data structure for priority queue node of block free lists */
 typedef struct H5FL_blk_node_t {
-    size_t size;                /* Size of the blocks in the list */
-    H5FL_blk_list_t *list;      /* List of free blocks */
-    struct H5FL_blk_node_t *next;    /* Pointer to next free list in queue */
-    struct H5FL_blk_node_t *prev;    /* Pointer to previous free list in queue */
+    size_t                  size; /* Size of the blocks in the list */
+    H5FL_blk_list_t *       list; /* List of free blocks */
+    struct H5FL_blk_node_t *next; /* Pointer to next free list in queue */
+    struct H5FL_blk_node_t *prev; /* Pointer to previous free list in queue */
 } H5FL_blk_node_t;
 
 /* Data structure for priority queue of native block free lists */
 typedef struct H5FL_blk_head_t {
-    unsigned init;         /* Whether the free list has been initialized */
-    unsigned allocated;    /* Number of blocks allocated */
-    unsigned onlist;       /* Number of blocks on free list */
-    size_t list_mem;    /* Amount of memory in block on free list */
-    const char *name;   /* Name of the type */
-    H5FL_blk_node_t *head;  /* Pointer to first free list in queue */
+    unsigned         init;      /* Whether the free list has been initialized */
+    unsigned         allocated; /* Number of blocks allocated */
+    unsigned         onlist;    /* Number of blocks on free list */
+    size_t           list_mem;  /* Amount of memory in block on free list */
+    const char *     name;      /* Name of the type */
+    H5FL_blk_node_t *head;      /* Pointer to first free list in queue */
 } H5FL_blk_head_t;
 
 /*
  * Macros for defining & using priority queues
  */
-#define H5FL_BLK_NAME(t)        H5_##t##_blk_free_list
+#define H5FL_BLK_NAME(t) H5_##t##_blk_free_list
 #ifndef H5_NO_BLK_FREE_LISTS
 /* Common macro for H5FL_BLK_DEFINE & H5FL_BLK_DEFINE_STATIC */
-#define H5FL_BLK_DEFINE_COMMON(t) H5FL_blk_head_t H5FL_BLK_NAME(t)={0,0,0,0,#t"_blk",NULL}
+#define H5FL_BLK_DEFINE_COMMON(t) H5FL_blk_head_t H5FL_BLK_NAME(t) = {0, 0, 0, 0, #t "_blk", NULL}
 
 /* Declare a free list to manage objects of type 't' */
-#define H5FL_BLK_DEFINE(t)  H5_DLL H5FL_BLK_DEFINE_COMMON(t)
+#define H5FL_BLK_DEFINE(t) H5_DLL H5FL_BLK_DEFINE_COMMON(t)
 
 /* Reference a free list for type 't' defined in another file */
-#define H5FL_BLK_EXTERN(t)  H5_DLLVAR H5FL_blk_head_t H5FL_BLK_NAME(t)
+#define H5FL_BLK_EXTERN(t) H5_DLLVAR H5FL_blk_head_t H5FL_BLK_NAME(t)
 
 /* Declare a static free list to manage objects of type 't' */
-#define H5FL_BLK_DEFINE_STATIC(t)  static H5FL_BLK_DEFINE_COMMON(t)
+#define H5FL_BLK_DEFINE_STATIC(t) static H5FL_BLK_DEFINE_COMMON(t)
 
 /* Allocate an block of type 't' */
-#define H5FL_BLK_MALLOC(t,size) (uint8_t *)H5FL_blk_malloc(&(H5FL_BLK_NAME(t)),size H5FL_TRACK_INFO)
+#define H5FL_BLK_MALLOC(t, size) (uint8_t *)H5FL_blk_malloc(&(H5FL_BLK_NAME(t)), size H5FL_TRACK_INFO)
 
 /* Allocate an block of type 't' and clear it to zeros */
-#define H5FL_BLK_CALLOC(t,size) (uint8_t *)H5FL_blk_calloc(&(H5FL_BLK_NAME(t)),size H5FL_TRACK_INFO)
+#define H5FL_BLK_CALLOC(t, size) (uint8_t *)H5FL_blk_calloc(&(H5FL_BLK_NAME(t)), size H5FL_TRACK_INFO)
 
 /* Free a block of type 't' */
-#define H5FL_BLK_FREE(t,blk) (uint8_t *)H5FL_blk_free(&(H5FL_BLK_NAME(t)),blk)
+#define H5FL_BLK_FREE(t, blk) (uint8_t *)H5FL_blk_free(&(H5FL_BLK_NAME(t)), blk)
 
 /* Re-allocate a block of type 't' */
-#define H5FL_BLK_REALLOC(t,blk,new_size) (uint8_t *)H5FL_blk_realloc(&(H5FL_BLK_NAME(t)),blk,new_size H5FL_TRACK_INFO)
+#define H5FL_BLK_REALLOC(t, blk, new_size)                                                                   \
+    (uint8_t *)H5FL_blk_realloc(&(H5FL_BLK_NAME(t)), blk, new_size H5FL_TRACK_INFO)
 
 /* Check if there is a free block available to re-use */
-#define H5FL_BLK_AVAIL(t,size)  H5FL_blk_free_block_avail(&(H5FL_BLK_NAME(t)),size)
+#define H5FL_BLK_AVAIL(t, size) H5FL_blk_free_block_avail(&(H5FL_BLK_NAME(t)), size)
 
 #else /* H5_NO_BLK_FREE_LISTS */
 /* Common macro for H5FL_BLK_DEFINE & H5FL_BLK_DEFINE_STATIC */
 #define H5FL_BLK_DEFINE_COMMON(t) int H5_ATTR_UNUSED H5FL_BLK_NAME(t)
 
-#define H5FL_BLK_DEFINE(t)      H5_DLL H5FL_BLK_DEFINE_COMMON(t)
-#define H5FL_BLK_EXTERN(t)      H5_DLLVAR H5FL_BLK_DEFINE_COMMON(t)
-#define H5FL_BLK_DEFINE_STATIC(t)  static H5FL_BLK_DEFINE_COMMON(t)
-#define H5FL_BLK_MALLOC(t,size) (uint8_t *)H5MM_malloc(size)
-#define H5FL_BLK_CALLOC(t,size) (uint8_t *)H5MM_calloc(size)
-#define H5FL_BLK_FREE(t,blk) (uint8_t *)H5MM_xfree(blk)
-#define H5FL_BLK_REALLOC(t,blk,new_size) (uint8_t *)H5MM_realloc(blk,new_size)
-#define H5FL_BLK_AVAIL(t,size)  (FALSE)
+#define H5FL_BLK_DEFINE(t)                 H5_DLL H5FL_BLK_DEFINE_COMMON(t)
+#define H5FL_BLK_EXTERN(t)                 H5_DLLVAR H5FL_BLK_DEFINE_COMMON(t)
+#define H5FL_BLK_DEFINE_STATIC(t)          static H5FL_BLK_DEFINE_COMMON(t)
+#define H5FL_BLK_MALLOC(t, size)           (uint8_t *)H5MM_malloc(size)
+#define H5FL_BLK_CALLOC(t, size)           (uint8_t *)H5MM_calloc(size)
+#define H5FL_BLK_FREE(t, blk)              (uint8_t *)H5MM_xfree(blk)
+#define H5FL_BLK_REALLOC(t, blk, new_size) (uint8_t *)H5MM_realloc(blk, new_size)
+#define H5FL_BLK_AVAIL(t, size)            (FALSE)
 #endif /* H5_NO_BLK_FREE_LISTS */
 
 /* Data structure to store each array in free list */
 typedef union H5FL_arr_list_t {
-    union H5FL_arr_list_t *next;   /* Pointer to next block in free list */
-    size_t nelem;               /* Number of elements in this array */
-    double unused1;             /* Unused normally, just here for aligment */
-    haddr_t unused2;            /* Unused normally, just here for aligment */
+    union H5FL_arr_list_t *next;    /* Pointer to next block in free list */
+    size_t                 nelem;   /* Number of elements in this array */
+    double                 unused1; /* Unused normally, just here for aligment */
+    haddr_t                unused2; /* Unused normally, just here for aligment */
 } H5FL_arr_list_t;
 
 /* Data structure for each size of array element */
 typedef struct H5FL_arr_node_t {
-    size_t size;                /* Size of the blocks in the list */
-    unsigned onlist;            /* Number of blocks on free list */
-    H5FL_arr_list_t *list;      /* List of free blocks */
+    size_t           size;   /* Size of the blocks in the list */
+    unsigned         onlist; /* Number of blocks on free list */
+    H5FL_arr_list_t *list;   /* List of free blocks */
 } H5FL_arr_node_t;
 
 /* Data structure for free list of array blocks */
 typedef struct H5FL_arr_head_t {
-    unsigned init;         /* Whether the free list has been initialized */
-    unsigned allocated;    /* Number of blocks allocated */
-    size_t list_mem;       /* Amount of memory in block on free list */
-    const char *name;      /* Name of the type */
-    int  maxelem;          /* Maximum number of elements in an array */
-    size_t base_size;      /* Size of the "base" object in the list */
-    size_t elem_size;      /* Size of the array elements in the list */
+    unsigned         init;      /* Whether the free list has been initialized */
+    unsigned         allocated; /* Number of blocks allocated */
+    size_t           list_mem;  /* Amount of memory in block on free list */
+    const char *     name;      /* Name of the type */
+    int              maxelem;   /* Maximum number of elements in an array */
+    size_t           base_size; /* Size of the "base" object in the list */
+    size_t           elem_size; /* Size of the array elements in the list */
     H5FL_arr_node_t *list_arr;  /* Array of lists of free blocks */
 } H5FL_arr_head_t;
 
 /*
  * Macros for defining & using free lists for an array of a type
  */
-#define H5FL_ARR_NAME(t)        H5_##t##_arr_free_list
+#define H5FL_ARR_NAME(t) H5_##t##_arr_free_list
 #ifndef H5_NO_ARR_FREE_LISTS
 /* Common macro for H5FL_ARR_DEFINE & H5FL_ARR_DEFINE_STATIC (and H5FL_BARR variants) */
-#define H5FL_ARR_DEFINE_COMMON(b,t,m) H5FL_arr_head_t H5FL_ARR_NAME(t)={0,0,0,#t"_arr",m+1,b,sizeof(t),NULL}
+#define H5FL_ARR_DEFINE_COMMON(b, t, m)                                                                      \
+    H5FL_arr_head_t H5FL_ARR_NAME(t) = {0, 0, 0, #t "_arr", m + 1, b, sizeof(t), NULL}
 
 /* Declare a free list to manage arrays of type 't' */
-#define H5FL_ARR_DEFINE(t,m)  H5_DLL H5FL_ARR_DEFINE_COMMON(0,t,m)
+#define H5FL_ARR_DEFINE(t, m) H5_DLL H5FL_ARR_DEFINE_COMMON(0, t, m)
 
 /* Declare a free list to manage base 'b' + arrays of type 't' */
-#define H5FL_BARR_DEFINE(b,t,m)  H5_DLL H5FL_ARR_DEFINE_COMMON(sizeof(b),t,m)
+#define H5FL_BARR_DEFINE(b, t, m) H5_DLL H5FL_ARR_DEFINE_COMMON(sizeof(b), t, m)
 
 /* Reference a free list for arrays of type 't' defined in another file */
-#define H5FL_ARR_EXTERN(t)  H5_DLLVAR H5FL_arr_head_t H5FL_ARR_NAME(t)
+#define H5FL_ARR_EXTERN(t) H5_DLLVAR H5FL_arr_head_t H5FL_ARR_NAME(t)
 
 /* Declare a static free list to manage arrays of type 't' */
-#define H5FL_ARR_DEFINE_STATIC(t,m)  static H5FL_ARR_DEFINE_COMMON(0,t,m)
+#define H5FL_ARR_DEFINE_STATIC(t, m) static H5FL_ARR_DEFINE_COMMON(0, t, m)
 
 /* Declare a static free list to manage base 'b' + arrays of type 't' */
-#define H5FL_BARR_DEFINE_STATIC(b,t,m)  static H5FL_ARR_DEFINE_COMMON(sizeof(b),t,m)
+#define H5FL_BARR_DEFINE_STATIC(b, t, m) static H5FL_ARR_DEFINE_COMMON(sizeof(b), t, m)
 
 /* Allocate an array of type 't' */
-#define H5FL_ARR_MALLOC(t,elem) H5FL_arr_malloc(&(H5FL_ARR_NAME(t)),elem)
+#define H5FL_ARR_MALLOC(t, elem) H5FL_arr_malloc(&(H5FL_ARR_NAME(t)), elem)
 
 /* Allocate an array of type 't' and clear it to all zeros */
-#define H5FL_ARR_CALLOC(t,elem) H5FL_arr_calloc(&(H5FL_ARR_NAME(t)),elem)
+#define H5FL_ARR_CALLOC(t, elem) H5FL_arr_calloc(&(H5FL_ARR_NAME(t)), elem)
 
 /* Free an array of type 't' */
-#define H5FL_ARR_FREE(t,obj) (t *)H5FL_arr_free(&(H5FL_ARR_NAME(t)),obj)
+#define H5FL_ARR_FREE(t, obj) (t *)H5FL_arr_free(&(H5FL_ARR_NAME(t)), obj)
 
 /* Re-allocate an array of type 't' */
-#define H5FL_ARR_REALLOC(t,obj,new_elem) H5FL_arr_realloc(&(H5FL_ARR_NAME(t)),obj,new_elem)
+#define H5FL_ARR_REALLOC(t, obj, new_elem) H5FL_arr_realloc(&(H5FL_ARR_NAME(t)), obj, new_elem)
 
 #else /* H5_NO_ARR_FREE_LISTS */
 /* Common macro for H5FL_ARR_DEFINE & H5FL_ARR_DEFINE_STATIC (and H5FL_BARR variants) */
-#define H5FL_ARR_DEFINE_COMMON(t,m) size_t H5FL_ARR_NAME(t)
-
-#define H5FL_ARR_DEFINE(t,m)    H5_DLL H5FL_ARR_DEFINE_COMMON(t,m) = 0
-#define H5FL_BARR_DEFINE(b,t,m) H5_DLL H5FL_ARR_DEFINE_COMMON(t,m) = sizeof(b)
-#define H5FL_ARR_EXTERN(t)      H5_DLLVAR H5FL_ARR_DEFINE_COMMON(t,m)
-#define H5FL_ARR_DEFINE_STATIC(t,m)  static H5FL_ARR_DEFINE_COMMON(t,m) = 0
-#define H5FL_BARR_DEFINE_STATIC(b,t,m)  static H5FL_ARR_DEFINE_COMMON(t,m) = sizeof(b)
-#define H5FL_ARR_MALLOC(t,elem) H5MM_malloc(H5FL_ARR_NAME(t) + ((elem)*sizeof(t)))
-#define H5FL_ARR_CALLOC(t,elem) H5MM_calloc(H5FL_ARR_NAME(t) + ((elem)*sizeof(t)))
-#define H5FL_ARR_FREE(t,obj) (t *)H5MM_xfree(obj)
-#define H5FL_ARR_REALLOC(t,obj,new_elem) H5MM_realloc(obj,H5FL_ARR_NAME(t) + ((new_elem)*sizeof(t)))
+#define H5FL_ARR_DEFINE_COMMON(t, m) size_t H5FL_ARR_NAME(t)
+
+#define H5FL_ARR_DEFINE(t, m)              H5_DLL H5FL_ARR_DEFINE_COMMON(t, m) = 0
+#define H5FL_BARR_DEFINE(b, t, m)          H5_DLL H5FL_ARR_DEFINE_COMMON(t, m) = sizeof(b)
+#define H5FL_ARR_EXTERN(t)                 H5_DLLVAR H5FL_ARR_DEFINE_COMMON(t, m)
+#define H5FL_ARR_DEFINE_STATIC(t, m)       static H5FL_ARR_DEFINE_COMMON(t, m) = 0
+#define H5FL_BARR_DEFINE_STATIC(b, t, m)   static H5FL_ARR_DEFINE_COMMON(t, m) = sizeof(b)
+#define H5FL_ARR_MALLOC(t, elem)           H5MM_malloc(H5FL_ARR_NAME(t) + ((elem) * sizeof(t)))
+#define H5FL_ARR_CALLOC(t, elem)           H5MM_calloc(H5FL_ARR_NAME(t) + ((elem) * sizeof(t)))
+#define H5FL_ARR_FREE(t, obj)              (t *)H5MM_xfree(obj)
+#define H5FL_ARR_REALLOC(t, obj, new_elem) H5MM_realloc(obj, H5FL_ARR_NAME(t) + ((new_elem) * sizeof(t)))
 #endif /* H5_NO_ARR_FREE_LISTS */
 
 /* Data structure for free list of sequence blocks */
 typedef struct H5FL_seq_head_t {
-    H5FL_blk_head_t queue;      /* Priority queue of sequence blocks */
-    size_t size;                /* Size of the sequence elements in the list */
+    H5FL_blk_head_t queue; /* Priority queue of sequence blocks */
+    size_t          size;  /* Size of the sequence elements in the list */
 } H5FL_seq_head_t;
 
 /*
@@ -307,60 +309,61 @@ typedef struct H5FL_seq_head_t {
  * Sequences are like arrays, except they have no upper limit.
  *
  */
-#define H5FL_SEQ_NAME(t)        H5_##t##_seq_free_list
+#define H5FL_SEQ_NAME(t) H5_##t##_seq_free_list
 #ifndef H5_NO_SEQ_FREE_LISTS
 /* Common macro for H5FL_SEQ_DEFINE & H5FL_SEQ_DEFINE_STATIC */
-#define H5FL_SEQ_DEFINE_COMMON(t) H5FL_seq_head_t H5FL_SEQ_NAME(t)={{0,0,0,0,#t"_seq",NULL},sizeof(t)}
+#define H5FL_SEQ_DEFINE_COMMON(t)                                                                            \
+    H5FL_seq_head_t H5FL_SEQ_NAME(t) = {{0, 0, 0, 0, #t "_seq", NULL}, sizeof(t)}
 
 /* Declare a free list to manage sequences of type 't' */
-#define H5FL_SEQ_DEFINE(t)  H5_DLL H5FL_SEQ_DEFINE_COMMON(t)
+#define H5FL_SEQ_DEFINE(t) H5_DLL H5FL_SEQ_DEFINE_COMMON(t)
 
 /* Reference a free list for sequences of type 't' defined in another file */
-#define H5FL_SEQ_EXTERN(t)  H5_DLLVAR H5FL_seq_head_t H5FL_SEQ_NAME(t)
+#define H5FL_SEQ_EXTERN(t) H5_DLLVAR H5FL_seq_head_t H5FL_SEQ_NAME(t)
 
 /* Declare a static free list to manage sequences of type 't' */
-#define H5FL_SEQ_DEFINE_STATIC(t)  static H5FL_SEQ_DEFINE_COMMON(t)
+#define H5FL_SEQ_DEFINE_STATIC(t) static H5FL_SEQ_DEFINE_COMMON(t)
 
 /* Allocate a sequence of type 't' */
-#define H5FL_SEQ_MALLOC(t,elem) (t *)H5FL_seq_malloc(&(H5FL_SEQ_NAME(t)),elem H5FL_TRACK_INFO)
+#define H5FL_SEQ_MALLOC(t, elem) (t *)H5FL_seq_malloc(&(H5FL_SEQ_NAME(t)), elem H5FL_TRACK_INFO)
 
 /* Allocate a sequence of type 't' and clear it to all zeros */
-#define H5FL_SEQ_CALLOC(t,elem) (t *)H5FL_seq_calloc(&(H5FL_SEQ_NAME(t)),elem H5FL_TRACK_INFO)
+#define H5FL_SEQ_CALLOC(t, elem) (t *)H5FL_seq_calloc(&(H5FL_SEQ_NAME(t)), elem H5FL_TRACK_INFO)
 
 /* Free a sequence of type 't' */
-#define H5FL_SEQ_FREE(t,obj) H5FL_seq_free(&(H5FL_SEQ_NAME(t)),obj)
+#define H5FL_SEQ_FREE(t, obj) H5FL_seq_free(&(H5FL_SEQ_NAME(t)), obj)
 
 /* Re-allocate a sequence of type 't' */
-#define H5FL_SEQ_REALLOC(t,obj,new_elem) (t *)H5FL_seq_realloc(&(H5FL_SEQ_NAME(t)),obj,new_elem H5FL_TRACK_INFO)
+#define H5FL_SEQ_REALLOC(t, obj, new_elem)                                                                   \
+    (t *)H5FL_seq_realloc(&(H5FL_SEQ_NAME(t)), obj, new_elem H5FL_TRACK_INFO)
 
 #else /* H5_NO_SEQ_FREE_LISTS */
 /* Common macro for H5FL_SEQ_DEFINE & H5FL_SEQ_DEFINE_STATIC */
 #define H5FL_SEQ_DEFINE_COMMON(t) int H5_ATTR_UNUSED H5FL_SEQ_NAME(t)
 
-#define H5FL_SEQ_DEFINE(t)      H5_DLL H5FL_SEQ_DEFINE_COMMON(t)
-#define H5FL_SEQ_EXTERN(t)      H5_DLLVAR H5FL_SEQ_DEFINE_COMMON(t)
-#define H5FL_SEQ_DEFINE_STATIC(t)  static H5FL_SEQ_DEFINE_COMMON(t)
-#define H5FL_SEQ_MALLOC(t,elem) (t *)H5MM_malloc((elem)*sizeof(t))
-#define H5FL_SEQ_CALLOC(t,elem) (t *)H5MM_calloc((elem)*sizeof(t))
-#define H5FL_SEQ_FREE(t,obj) (t *)H5MM_xfree(obj)
-#define H5FL_SEQ_REALLOC(t,obj,new_elem) (t *)H5MM_realloc(obj,(new_elem)*sizeof(t))
+#define H5FL_SEQ_DEFINE(t)                 H5_DLL H5FL_SEQ_DEFINE_COMMON(t)
+#define H5FL_SEQ_EXTERN(t)                 H5_DLLVAR H5FL_SEQ_DEFINE_COMMON(t)
+#define H5FL_SEQ_DEFINE_STATIC(t)          static H5FL_SEQ_DEFINE_COMMON(t)
+#define H5FL_SEQ_MALLOC(t, elem)           (t *)H5MM_malloc((elem) * sizeof(t))
+#define H5FL_SEQ_CALLOC(t, elem)           (t *)H5MM_calloc((elem) * sizeof(t))
+#define H5FL_SEQ_FREE(t, obj)              (t *)H5MM_xfree(obj)
+#define H5FL_SEQ_REALLOC(t, obj, new_elem) (t *)H5MM_realloc(obj, (new_elem) * sizeof(t))
 #endif /* H5_NO_SEQ_FREE_LISTS */
 
 /* Forward declarations of the data structures for free list block factory */
 typedef struct H5FL_fac_gc_node_t H5FL_fac_gc_node_t;
-typedef struct H5FL_fac_node_t H5FL_fac_node_t;
+typedef struct H5FL_fac_node_t    H5FL_fac_node_t;
 
 /* Data structure for free list block factory */
 typedef struct H5FL_fac_head_t {
-    unsigned init;      /* Whether the free list has been initialized */
-    unsigned allocated; /* Number of blocks allocated */
-    unsigned onlist;    /* Number of blocks on free list */
-    size_t size;        /* Size of the blocks in the list */
-    H5FL_fac_node_t *list;  /* List of free blocks */
-    H5FL_fac_gc_node_t *prev_gc; /* Previous garbage collection node in list */
+    unsigned            init;      /* Whether the free list has been initialized */
+    unsigned            allocated; /* Number of blocks allocated */
+    unsigned            onlist;    /* Number of blocks on free list */
+    size_t              size;      /* Size of the blocks in the list */
+    H5FL_fac_node_t *   list;      /* List of free blocks */
+    H5FL_fac_gc_node_t *prev_gc;   /* Previous garbage collection node in list */
 } H5FL_fac_head_t;
 
-
 /*
  * Macros for defining & using free list factories
  *
@@ -379,15 +382,15 @@ typedef struct H5FL_fac_head_t {
 #define H5FL_FAC_FREE(f, obj) H5FL_fac_free(f, obj)
 
 #else /* H5_NO_FAC_FREE_LISTS */
-#define H5FL_FAC_MALLOC(f) H5MM_malloc(f->size)
-#define H5FL_FAC_CALLOC(f) H5MM_calloc(f->size)
+#define H5FL_FAC_MALLOC(f)    H5MM_malloc(f->size)
+#define H5FL_FAC_CALLOC(f)    H5MM_calloc(f->size)
 #define H5FL_FAC_FREE(f, obj) H5MM_xfree(obj)
 #endif /* H5_NO_FAC_FREE_LISTS */
 
 /*
  * Library prototypes.
  */
- /* Block free lists */
+/* Block free lists */
 H5_DLL void * H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS);
 H5_DLL void * H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS);
 H5_DLL void * H5FL_blk_free(H5FL_blk_head_t *head, void *block);
@@ -395,34 +398,34 @@ H5_DLL void * H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_si
 H5_DLL htri_t H5FL_blk_free_block_avail(H5FL_blk_head_t *head, size_t size);
 
 /* Regular free lists */
-H5_DLL void * H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS);
-H5_DLL void * H5FL_reg_calloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS);
-H5_DLL void * H5FL_reg_free(H5FL_reg_head_t *head, void *obj);
+H5_DLL void *H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS);
+H5_DLL void *H5FL_reg_calloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS);
+H5_DLL void *H5FL_reg_free(H5FL_reg_head_t *head, void *obj);
 
 /* Array free lists */
-H5_DLL void * H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem);
-H5_DLL void * H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem);
-H5_DLL void * H5FL_arr_free(H5FL_arr_head_t *head, void *obj);
-H5_DLL void * H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem);
+H5_DLL void *H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem);
+H5_DLL void *H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem);
+H5_DLL void *H5FL_arr_free(H5FL_arr_head_t *head, void *obj);
+H5_DLL void *H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem);
 
 /* Sequence free lists */
-H5_DLL void * H5FL_seq_malloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS);
-H5_DLL void * H5FL_seq_calloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS);
-H5_DLL void * H5FL_seq_free(H5FL_seq_head_t *head, void *obj);
-H5_DLL void * H5FL_seq_realloc(H5FL_seq_head_t *head, void *obj, size_t new_elem H5FL_TRACK_PARAMS);
+H5_DLL void *H5FL_seq_malloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS);
+H5_DLL void *H5FL_seq_calloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS);
+H5_DLL void *H5FL_seq_free(H5FL_seq_head_t *head, void *obj);
+H5_DLL void *H5FL_seq_realloc(H5FL_seq_head_t *head, void *obj, size_t new_elem H5FL_TRACK_PARAMS);
 
 /* Factory free lists */
 H5_DLL H5FL_fac_head_t *H5FL_fac_init(size_t size);
-H5_DLL void * H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS);
-H5_DLL void * H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS);
-H5_DLL void * H5FL_fac_free(H5FL_fac_head_t *head, void *obj);
-H5_DLL herr_t H5FL_fac_term(H5FL_fac_head_t *head);
+H5_DLL void *           H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS);
+H5_DLL void *           H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS);
+H5_DLL void *           H5FL_fac_free(H5FL_fac_head_t *head, void *obj);
+H5_DLL herr_t           H5FL_fac_term(H5FL_fac_head_t *head);
 
 /* General free list routines */
 H5_DLL herr_t H5FL_garbage_coll(void);
-H5_DLL herr_t H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim,
-    int arr_global_lim, int arr_list_lim, int blk_global_lim, int blk_list_lim,
-    int fac_global_lim, int fac_list_lim);
-H5_DLL int   H5FL_term_interface(void);
+H5_DLL herr_t H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim,
+                                        int arr_list_lim, int blk_global_lim, int blk_list_lim,
+                                        int fac_global_lim, int fac_list_lim);
+H5_DLL int    H5FL_term_interface(void);
 
 #endif
diff --git a/src/H5FO.c b/src/H5FO.c
index 504d594..e8dd164 100644
--- a/src/H5FO.c
+++ b/src/H5FO.c
@@ -19,28 +19,27 @@
  *
  */
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
-
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access                          */
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5FOprivate.h"        /* File objects                         */
-#include "H5Oprivate.h"		/* Object headers		  	*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access                          */
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5FOprivate.h" /* File objects                         */
+#include "H5Oprivate.h"  /* Object headers		  	*/
 
 /* Private typedefs */
 
 /* Information about open objects in a file */
 typedef struct H5FO_open_obj_t {
-    haddr_t addr;                       /* Address of object header for object */
-    void *obj;                          /* Pointer to the object            */
-    hbool_t deleted;                    /* Flag to indicate that the object was deleted from the file */
+    haddr_t addr;    /* Address of object header for object */
+    void *  obj;     /* Pointer to the object            */
+    hbool_t deleted; /* Flag to indicate that the object was deleted from the file */
 } H5FO_open_obj_t;
 
 /* Information about counted objects in a file */
 typedef struct H5FO_obj_count_t {
-    haddr_t addr;                       /* Address of object header for object */
-    hsize_t count;                      /* Number of times object is opened */
+    haddr_t addr;  /* Address of object header for object */
+    hsize_t count; /* Number of times object is opened */
 } H5FO_obj_count_t;
 
 /* Declare a free list to manage the H5FO_open_obj_t struct */
@@ -49,7 +48,6 @@ H5FL_DEFINE_STATIC(H5FO_open_obj_t);
 /* Declare a free list to manage the H5FO_obj_count_t struct */
 H5FL_DEFINE_STATIC(H5FO_obj_count_t);
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_create
@@ -71,7 +69,7 @@ H5FL_DEFINE_STATIC(H5FO_obj_count_t);
 herr_t
 H5FO_create(const H5F_t *f)
 {
-    herr_t ret_value=SUCCEED;          /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -80,14 +78,13 @@ H5FO_create(const H5F_t *f)
     HDassert(f->shared);
 
     /* Create container used to store open object info */
-    if((f->shared->open_objs = H5SL_create(H5SL_TYPE_HADDR, NULL)) == NULL)
+    if ((f->shared->open_objs = H5SL_create(H5SL_TYPE_HADDR, NULL)) == NULL)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to create open object container")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_opened
@@ -112,7 +109,7 @@ void *
 H5FO_opened(const H5F_t *f, haddr_t addr)
 {
     H5FO_open_obj_t *open_obj;  /* Information about open object */
-    void *ret_value;            /* Return value */
+    void *           ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -123,7 +120,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
     HDassert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
-    if(NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs,&addr))) {
+    if (NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr))) {
         ret_value = open_obj->obj;
         HDassert(ret_value != NULL);
     } /* end if */
@@ -133,7 +130,6 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_opened() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_insert
@@ -158,8 +154,8 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
 herr_t
 H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag)
 {
-    H5FO_open_obj_t *open_obj;  /* Information about open object */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    H5FO_open_obj_t *open_obj;            /* Information about open object */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -171,23 +167,22 @@ H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag)
     HDassert(obj);
 
     /* Allocate new opened object information structure */
-    if((open_obj=H5FL_MALLOC(H5FO_open_obj_t))==NULL)
-        HGOTO_ERROR(H5E_CACHE,H5E_NOSPACE,FAIL,"memory allocation failed")
+    if ((open_obj = H5FL_MALLOC(H5FO_open_obj_t)) == NULL)
+        HGOTO_ERROR(H5E_CACHE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Assign information */
-    open_obj->addr=addr;
-    open_obj->obj=obj;
-    open_obj->deleted=delete_flag;
+    open_obj->addr    = addr;
+    open_obj->obj     = obj;
+    open_obj->deleted = delete_flag;
 
     /* Insert into container */
-    if(H5SL_insert(f->shared->open_objs,&open_obj->addr,open_obj)<0)
-        HGOTO_ERROR(H5E_CACHE,H5E_CANTINSERT,FAIL,"can't insert object into container")
+    if (H5SL_insert(f->shared->open_objs, &open_obj->addr, open_obj) < 0)
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, "can't insert object into container")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_insert() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_delete
@@ -210,8 +205,8 @@ done:
 herr_t
 H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
 {
-    H5FO_open_obj_t *open_obj;  /* Information about open object */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    H5FO_open_obj_t *open_obj;            /* Information about open object */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -222,12 +217,12 @@ H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
     HDassert(H5F_addr_defined(addr));
 
     /* Remove from container */
-    if(NULL == (open_obj = (H5FO_open_obj_t *)H5SL_remove(f->shared->open_objs, &addr)))
-        HGOTO_ERROR(H5E_CACHE,H5E_CANTRELEASE,FAIL,"can't remove object from container")
+    if (NULL == (open_obj = (H5FO_open_obj_t *)H5SL_remove(f->shared->open_objs, &addr)))
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "can't remove object from container")
 
     /* Check if the object was deleted from the file */
-    if(open_obj->deleted) {
-        if(H5O_delete(f, dxpl_id, addr) < 0)
+    if (open_obj->deleted) {
+        if (H5O_delete(f, dxpl_id, addr) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't delete object from file")
     } /* end if */
 
@@ -238,7 +233,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_delete() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_mark
@@ -261,8 +255,8 @@ done:
 herr_t
 H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted)
 {
-    H5FO_open_obj_t *open_obj;  /* Information about open object */
-    herr_t ret_value=SUCCEED;            /* Return value */
+    H5FO_open_obj_t *open_obj;            /* Information about open object */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -273,7 +267,7 @@ H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted)
     HDassert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
-    if(NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr)))
+    if (NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr)))
         open_obj->deleted = deleted;
     else
         ret_value = FAIL;
@@ -281,7 +275,6 @@ H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_mark() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_marked
@@ -305,8 +298,8 @@ H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted)
 hbool_t
 H5FO_marked(const H5F_t *f, haddr_t addr)
 {
-    H5FO_open_obj_t *open_obj;  /* Information about open object */
-    hbool_t ret_value = FALSE;  /* Return value */
+    H5FO_open_obj_t *open_obj;          /* Information about open object */
+    hbool_t          ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -317,13 +310,12 @@ H5FO_marked(const H5F_t *f, haddr_t addr)
     HDassert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
-    if(NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr)))
+    if (NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr)))
         ret_value = open_obj->deleted;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_marked() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_dest
@@ -345,7 +337,7 @@ H5FO_marked(const H5F_t *f, haddr_t addr)
 herr_t
 H5FO_dest(const H5F_t *f)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -355,20 +347,19 @@ H5FO_dest(const H5F_t *f)
     HDassert(f->shared->open_objs);
 
     /* Check if the object info set is empty */
-    if(H5SL_count(f->shared->open_objs)!=0)
+    if (H5SL_count(f->shared->open_objs) != 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "objects still in open object info set")
 
     /* Release the open object info set container */
-    if(H5SL_close(f->shared->open_objs)<0)
+    if (H5SL_close(f->shared->open_objs) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCLOSEOBJ, FAIL, "can't close open object info set")
 
-    f->shared->open_objs=NULL;
+    f->shared->open_objs = NULL;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_dest() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_top_create
@@ -390,7 +381,7 @@ done:
 herr_t
 H5FO_top_create(H5F_t *f)
 {
-    herr_t ret_value = SUCCEED;          /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -398,14 +389,13 @@ H5FO_top_create(H5F_t *f)
     HDassert(f);
 
     /* Create container used to store open object info */
-    if((f->obj_count = H5SL_create(H5SL_TYPE_HADDR, NULL)) == NULL)
+    if ((f->obj_count = H5SL_create(H5SL_TYPE_HADDR, NULL)) == NULL)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to create open object container")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_top_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_top_incr
@@ -428,8 +418,8 @@ done:
 herr_t
 H5FO_top_incr(const H5F_t *f, haddr_t addr)
 {
-    H5FO_obj_count_t *obj_count;  /* Ref. count for object */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5FO_obj_count_t *obj_count;           /* Ref. count for object */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -439,28 +429,27 @@ H5FO_top_incr(const H5F_t *f, haddr_t addr)
     HDassert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
-    if(NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr))) {
+    if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr))) {
         (obj_count->count)++;
     } /* end if */
     else {
         /* Allocate new opened object information structure */
-        if(NULL == (obj_count = H5FL_MALLOC(H5FO_obj_count_t)))
-            HGOTO_ERROR(H5E_CACHE,H5E_NOSPACE,FAIL,"memory allocation failed")
+        if (NULL == (obj_count = H5FL_MALLOC(H5FO_obj_count_t)))
+            HGOTO_ERROR(H5E_CACHE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Assign information */
-        obj_count->addr = addr;
+        obj_count->addr  = addr;
         obj_count->count = 1;
 
         /* Insert into container */
-        if(H5SL_insert(f->obj_count, &obj_count->addr, obj_count) < 0)
-            HGOTO_ERROR(H5E_CACHE,H5E_CANTINSERT,FAIL,"can't insert object into container")
+        if (H5SL_insert(f->obj_count, &obj_count->addr, obj_count) < 0)
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTINSERT, FAIL, "can't insert object into container")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_top_incr() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_top_decr
@@ -483,8 +472,8 @@ done:
 herr_t
 H5FO_top_decr(const H5F_t *f, haddr_t addr)
 {
-    H5FO_obj_count_t *obj_count;  /* Ref. count for object */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5FO_obj_count_t *obj_count;           /* Ref. count for object */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -494,19 +483,19 @@ H5FO_top_decr(const H5F_t *f, haddr_t addr)
     HDassert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
-    if(NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr))) {
+    if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr))) {
         /* Decrement the reference count for the object */
         (obj_count->count)--;
 
-        if(obj_count->count == 0) {
+        if (obj_count->count == 0) {
             /* Remove from container */
-            if(NULL == (obj_count = (H5FO_obj_count_t *)H5SL_remove(f->obj_count, &addr)))
+            if (NULL == (obj_count = (H5FO_obj_count_t *)H5SL_remove(f->obj_count, &addr)))
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "can't remove object from container")
 
             /* Release the object information */
             obj_count = H5FL_FREE(H5FO_obj_count_t, obj_count);
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else
         HGOTO_ERROR(H5E_CACHE, H5E_NOTFOUND, FAIL, "can't decrement ref. count")
 
@@ -514,7 +503,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_top_decr() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_top_count
@@ -537,8 +525,8 @@ done:
 hsize_t
 H5FO_top_count(const H5F_t *f, haddr_t addr)
 {
-    H5FO_obj_count_t *obj_count;        /* Ref. count for object */
-    hsize_t ret_value;                  /* Return value */
+    H5FO_obj_count_t *obj_count; /* Ref. count for object */
+    hsize_t           ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -548,7 +536,7 @@ H5FO_top_count(const H5F_t *f, haddr_t addr)
     HDassert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
-    if(NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr)))
+    if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr)))
         ret_value = obj_count->count;
     else
         ret_value = 0;
@@ -556,7 +544,6 @@ H5FO_top_count(const H5F_t *f, haddr_t addr)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_top_count() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5FO_top_dest
@@ -578,7 +565,7 @@ H5FO_top_count(const H5F_t *f, haddr_t addr)
 herr_t
 H5FO_top_dest(H5F_t *f)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -587,11 +574,11 @@ H5FO_top_dest(H5F_t *f)
     HDassert(f->obj_count);
 
     /* Check if the object count set is empty */
-    if(H5SL_count(f->obj_count) != 0)
+    if (H5SL_count(f->obj_count) != 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "objects still in open object info set")
 
     /* Release the open object count set container */
-    if(H5SL_close(f->obj_count) < 0)
+    if (H5SL_close(f->obj_count) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCLOSEOBJ, FAIL, "can't close open object info set")
 
     f->obj_count = NULL;
@@ -599,4 +586,3 @@ H5FO_top_dest(H5F_t *f)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_top_dest() */
-
diff --git a/src/H5FOprivate.h b/src/H5FOprivate.h
index aa85c29..9404e2a 100644
--- a/src/H5FOprivate.h
+++ b/src/H5FOprivate.h
@@ -22,30 +22,29 @@
 #endif /* LATER */
 
 /* Private headers needed by this file */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5SLprivate.h"	/* Skip lists				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5SLprivate.h" /* Skip lists				*/
 
 /* Typedefs */
 
 /* Typedef for open object cache */
-typedef H5SL_t H5FO_t;       /* Currently, all open objects are stored in skip list */
+typedef H5SL_t H5FO_t; /* Currently, all open objects are stored in skip list */
 
 /* Macros */
 
 /* Private routines */
-H5_DLL herr_t H5FO_create(const H5F_t *f);
-H5_DLL void  *H5FO_opened(const H5F_t *f, haddr_t addr);
-H5_DLL herr_t H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag);
-H5_DLL herr_t H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr);
-H5_DLL herr_t H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted);
+H5_DLL herr_t  H5FO_create(const H5F_t *f);
+H5_DLL void *  H5FO_opened(const H5F_t *f, haddr_t addr);
+H5_DLL herr_t  H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag);
+H5_DLL herr_t  H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr);
+H5_DLL herr_t  H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted);
 H5_DLL hbool_t H5FO_marked(const H5F_t *f, haddr_t addr);
-H5_DLL herr_t H5FO_dest(const H5F_t *f);
-H5_DLL herr_t H5FO_top_create(H5F_t *f);
-H5_DLL herr_t H5FO_top_incr(const H5F_t *f, haddr_t addr);
-H5_DLL herr_t H5FO_top_decr(const H5F_t *f, haddr_t addr);
+H5_DLL herr_t  H5FO_dest(const H5F_t *f);
+H5_DLL herr_t  H5FO_top_create(H5F_t *f);
+H5_DLL herr_t  H5FO_top_incr(const H5F_t *f, haddr_t addr);
+H5_DLL herr_t  H5FO_top_decr(const H5F_t *f, haddr_t addr);
 H5_DLL hsize_t H5FO_top_count(const H5F_t *f, haddr_t addr);
-H5_DLL herr_t H5FO_top_dest(H5F_t *f);
+H5_DLL herr_t  H5FO_top_dest(H5F_t *f);
 
 #endif /* _H5FOprivate_H */
-
diff --git a/src/H5FS.c b/src/H5FS.c
index 7cdbea1..f41796f 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -25,32 +25,29 @@
 /* Module Setup */
 /****************/
 
-#define H5FS_PACKAGE		/*suppress error about including H5FSpkg  */
+#define H5FS_PACKAGE /*suppress error about including H5FSpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FSpkg.h"		/* File free space			*/
-#include "H5MFprivate.h"	/* File memory management		*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FSpkg.h"     /* File free space			*/
+#include "H5MFprivate.h" /* File memory management		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -59,7 +56,6 @@
 static herr_t H5FS_sinfo_free_sect_cb(void *item, void *key, void *op_data);
 static herr_t H5FS_sinfo_free_node_cb(void *item, void *key, void *op_data);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -70,18 +66,14 @@ H5FL_SEQ_DEFINE(H5FS_section_class_t);
 /* Declare a free list to manage the H5FS_t struct */
 H5FL_DEFINE(H5FS_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_create
  *
@@ -101,15 +93,15 @@ H5FL_DEFINE(H5FS_t);
  *-------------------------------------------------------------------------
  */
 H5FS_t *
-H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr, const H5FS_create_t *fs_create,
-    size_t nclasses, const H5FS_section_class_t *classes[], void *cls_init_udata, hsize_t alignment, hsize_t threshold)
+H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr, const H5FS_create_t *fs_create, size_t nclasses,
+            const H5FS_section_class_t *classes[], void *cls_init_udata, hsize_t alignment, hsize_t threshold)
 {
-    H5FS_t *fspace = NULL;      /* New free space structure */
-    H5FS_t *ret_value;          /* Return value */
+    H5FS_t *fspace = NULL; /* New free space structure */
+    H5FS_t *ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", FUNC, nclasses);
+    HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", FUNC, nclasses);
 #endif /* H5FS_DEBUG */
 
     /* Check arguments. */
@@ -121,27 +113,28 @@ HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", FUNC, ncl
     /*
      * Allocate free space structure
      */
-    if(NULL == (fspace = H5FS_new(f, nclasses, classes, cls_init_udata)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space free list")
+    if (NULL == (fspace = H5FS_new(f, nclasses, classes, cls_init_udata)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space free list")
 
     /* Initialize creation information for free space manager */
-    fspace->client = fs_create->client;
+    fspace->client         = fs_create->client;
     fspace->shrink_percent = fs_create->shrink_percent;
     fspace->expand_percent = fs_create->expand_percent;
-    fspace->max_sect_addr = fs_create->max_sect_addr;
-    fspace->max_sect_size = fs_create->max_sect_size;
+    fspace->max_sect_addr  = fs_create->max_sect_addr;
+    fspace->max_sect_size  = fs_create->max_sect_size;
 
     fspace->alignment = alignment;
     fspace->threshold = threshold;
 
     /* Check if the free space tracker is supposed to be persistent */
-    if(fs_addr) {
+    if (fs_addr) {
         /* Allocate space for the free space header */
-        if(HADDR_UNDEF == (fspace->addr = H5MF_alloc(f, H5FD_MEM_FSPACE_HDR, dxpl_id, (hsize_t)fspace->hdr_size)))
+        if (HADDR_UNDEF ==
+            (fspace->addr = H5MF_alloc(f, H5FD_MEM_FSPACE_HDR, dxpl_id, (hsize_t)fspace->hdr_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "file allocation failed for free space header")
 
         /* Cache the new free space header (pinned) */
-        if(H5AC_insert_entry(f, dxpl_id, H5AC_FSPACE_HDR, fspace->addr, fspace, H5AC__PIN_ENTRY_FLAG) < 0)
+        if (H5AC_insert_entry(f, dxpl_id, H5AC_FSPACE_HDR, fspace->addr, fspace, H5AC__PIN_ENTRY_FLAG) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't add free space header to cache")
 
         /* Return free space header address to caller, if desired */
@@ -154,21 +147,20 @@ HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", FUNC, ncl
     /* Set the return value */
     ret_value = fspace;
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: fspace = %p, fspace->addr = %a\n", FUNC, fspace, fspace->addr);
+    HDfprintf(stderr, "%s: fspace = %p, fspace->addr = %a\n", FUNC, fspace, fspace->addr);
 #endif /* H5FS_DEBUG */
 
 done:
-    if(!ret_value && fspace)
-        if(H5FS_hdr_dest(fspace) < 0)
+    if (!ret_value && fspace)
+        if (H5FS_hdr_dest(fspace) < 0)
             HDONE_ERROR(H5E_FSPACE, H5E_CANTFREE, NULL, "unable to destroy free space header")
 
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
 #endif /* H5FS_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_open
  *
@@ -189,16 +181,17 @@ HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
  *-------------------------------------------------------------------------
  */
 H5FS_t *
-H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, size_t nclasses,
-    const H5FS_section_class_t *classes[], void *cls_init_udata, hsize_t alignment, hsize_t threshold)
+H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, size_t nclasses, const H5FS_section_class_t *classes[],
+          void *cls_init_udata, hsize_t alignment, hsize_t threshold)
 {
-    H5FS_t *fspace = NULL;      /* New free space structure */
-    H5FS_hdr_cache_ud_t cache_udata; /* User-data for metadata cache callback */
-    H5FS_t *ret_value;          /* Return value */
+    H5FS_t *            fspace = NULL; /* New free space structure */
+    H5FS_hdr_cache_ud_t cache_udata;   /* User-data for metadata cache callback */
+    H5FS_t *            ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Opening free space manager, fs_addr = %a, nclasses = %Zu\n", FUNC, fs_addr, nclasses);
+    HDfprintf(stderr, "%s: Opening free space manager, fs_addr = %a, nclasses = %Zu\n", FUNC, fs_addr,
+              nclasses);
 #endif /* H5FS_DEBUG */
 
     /* Check arguments. */
@@ -207,33 +200,34 @@ HDfprintf(stderr, "%s: Opening free space manager, fs_addr = %a, nclasses = %Zu\
     HDassert(classes);
 
     /* Initialize user data for protecting the free space manager */
-    cache_udata.f = f;
-    cache_udata.nclasses = nclasses;
-    cache_udata.classes = classes;
+    cache_udata.f              = f;
+    cache_udata.nclasses       = nclasses;
+    cache_udata.classes        = classes;
     cache_udata.cls_init_udata = cls_init_udata;
-    cache_udata.addr = fs_addr;
+    cache_udata.addr           = fs_addr;
 
     /* Protect the free space header */
-    if(NULL == (fspace = (H5FS_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, &cache_udata, H5AC_READ)))
+    if (NULL ==
+        (fspace = (H5FS_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, &cache_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, NULL, "unable to load free space header")
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: fspace->sect_addr = %a\n", FUNC, fspace->sect_addr);
-HDfprintf(stderr, "%s: fspace->sect_size = %Hu\n", FUNC, fspace->sect_size);
-HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu\n", FUNC, fspace->alloc_sect_size);
-HDfprintf(stderr, "%s: fspace->sinfo = %p\n", FUNC, fspace->sinfo);
-HDfprintf(stderr, "%s: fspace->rc = %u\n", FUNC, fspace->rc);
+    HDfprintf(stderr, "%s: fspace->sect_addr = %a\n", FUNC, fspace->sect_addr);
+    HDfprintf(stderr, "%s: fspace->sect_size = %Hu\n", FUNC, fspace->sect_size);
+    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu\n", FUNC, fspace->alloc_sect_size);
+    HDfprintf(stderr, "%s: fspace->sinfo = %p\n", FUNC, fspace->sinfo);
+    HDfprintf(stderr, "%s: fspace->rc = %u\n", FUNC, fspace->rc);
 #endif /* H5FS_DEBUG */
 
     /* Increment the reference count on the free space manager header */
     HDassert(fspace->rc <= 1);
-    if(H5FS_incr(fspace) < 0)
+    if (H5FS_incr(fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTINC, NULL, "unable to increment ref. count on free space header")
 
     fspace->alignment = alignment;
     fspace->threshold = threshold;
 
     /* Unlock free space header */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__NO_FLAGS_SET) < 0)
+    if (H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, NULL, "unable to release free space header")
 
     /* Set return value */
@@ -243,7 +237,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_delete
  *
@@ -261,13 +254,13 @@ done:
 herr_t
 H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr)
 {
-    H5FS_t *fspace = NULL;              /* Free space header loaded from file */
-    H5FS_hdr_cache_ud_t cache_udata; /* User-data for metadata cache callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_t *            fspace = NULL;       /* Free space header loaded from file */
+    H5FS_hdr_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Deleting free space manager, fs_addr = %a\n", FUNC, fs_addr);
+    HDfprintf(stderr, "%s: Deleting free space manager, fs_addr = %a\n", FUNC, fs_addr);
 #endif /* H5FS_DEBUG */
 
     /* Check arguments. */
@@ -276,14 +269,15 @@ HDfprintf(stderr, "%s: Deleting free space manager, fs_addr = %a\n", FUNC, fs_ad
 
     /* Initialize user data for protecting the free space manager */
     /* (no class information necessary for delete) */
-    cache_udata.f = f;
-    cache_udata.nclasses = 0;
-    cache_udata.classes = NULL;
+    cache_udata.f              = f;
+    cache_udata.nclasses       = 0;
+    cache_udata.classes        = NULL;
     cache_udata.cls_init_udata = NULL;
-    cache_udata.addr = fs_addr;
+    cache_udata.addr           = fs_addr;
 
     /* Protect the free space header */
-    if(NULL == (fspace = (H5FS_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, &cache_udata, H5AC_WRITE)))
+    if (NULL ==
+        (fspace = (H5FS_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, FAIL, "unable to protect free space header")
 
     /* Sanity check */
@@ -291,51 +285,54 @@ HDfprintf(stderr, "%s: Deleting free space manager, fs_addr = %a\n", FUNC, fs_ad
 
     /* Delete serialized section storage, if there are any */
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: fspace->sect_addr = %a\n", FUNC, fspace->sect_addr);
+    HDfprintf(stderr, "%s: fspace->sect_addr = %a\n", FUNC, fspace->sect_addr);
 #endif /* H5FS_DEBUG */
-    if(fspace->serial_sect_count > 0) {
-        unsigned sinfo_status = 0;      /* Free space section info's status in the metadata cache */
+    if (fspace->serial_sect_count > 0) {
+        unsigned sinfo_status = 0; /* Free space section info's status in the metadata cache */
 
         /* Sanity check */
         HDassert(H5F_addr_defined(fspace->sect_addr));
         HDassert(fspace->alloc_sect_size > 0);
 
         /* Check the free space section info's status in the metadata cache */
-        if(H5AC_get_entry_status(f, fspace->sect_addr, &sinfo_status) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for free space section info")
+        if (H5AC_get_entry_status(f, fspace->sect_addr, &sinfo_status) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
+                        "unable to check metadata cache status for free space section info")
 
         /* If the free space section info is in the cache, expunge it now */
-        if(sinfo_status & H5AC_ES__IN_CACHE) {
+        if (sinfo_status & H5AC_ES__IN_CACHE) {
             /* Sanity checks on direct block */
             HDassert(!(sinfo_status & H5AC_ES__IS_PINNED));
             HDassert(!(sinfo_status & H5AC_ES__IS_PROTECTED));
 
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Expunging free space section info from cache\n", FUNC);
+            HDfprintf(stderr, "%s: Expunging free space section info from cache\n", FUNC);
 #endif /* H5FS_DEBUG */
             /* Evict the free space section info from the metadata cache */
             /* (Free file space) */
-            if(H5AC_expunge_entry(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, H5AC__FREE_FILE_SPACE_FLAG) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "unable to remove free space section info from cache")
+            if (H5AC_expunge_entry(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr,
+                                   H5AC__FREE_FILE_SPACE_FLAG) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL,
+                            "unable to remove free space section info from cache")
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Done expunging free space section info from cache\n", FUNC);
-#endif /* H5FS_DEBUG */
+            HDfprintf(stderr, "%s: Done expunging free space section info from cache\n", FUNC);
+#endif    /* H5FS_DEBUG */
         } /* end if */
         else {
             /* Release the space in the file */
-            if(H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_addr, fspace->alloc_sect_size) < 0)
+            if (H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_addr, fspace->alloc_sect_size) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to release free space sections")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
-    if(fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
+    if (fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace,
+                                 H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, FAIL, "unable to release free space header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_close
  *
@@ -354,7 +351,7 @@ done:
 herr_t
 H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -362,58 +359,67 @@ H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
     HDassert(f);
     HDassert(fspace);
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Entering, fspace = %p, fspace->addr = %a, fspace->sinfo = %p\n", FUNC, fspace, fspace->addr, fspace->sinfo);
+    HDfprintf(stderr, "%s: Entering, fspace = %p, fspace->addr = %a, fspace->sinfo = %p\n", FUNC, fspace,
+              fspace->addr, fspace->sinfo);
 #endif /* H5FS_DEBUG */
 
     /* Check if section info is valid */
     /* (i.e. the header "owns" the section info and it's not in the cache) */
-    if(fspace->sinfo) {
+    if (fspace->sinfo) {
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu, fspace->serial_sect_count = %Hu, fspace->sect_addr = %a, fspace->rc = %u\n", FUNC, fspace->tot_sect_count, fspace->serial_sect_count, fspace->sect_addr, fspace->rc);
-HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC, fspace->alloc_sect_size, fspace->sect_size);
+        HDfprintf(stderr,
+                  "%s: fspace->tot_sect_count = %Hu, fspace->serial_sect_count = %Hu, fspace->sect_addr = "
+                  "%a, fspace->rc = %u\n",
+                  FUNC, fspace->tot_sect_count, fspace->serial_sect_count, fspace->sect_addr, fspace->rc);
+        HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC,
+                  fspace->alloc_sect_size, fspace->sect_size);
 #endif /* H5FS_DEBUG */
         /* If there are sections to serialize, update them */
         /* (if the free space manager is persistent) */
-        if(fspace->serial_sect_count > 0 && H5F_addr_defined(fspace->addr)) {
+        if (fspace->serial_sect_count > 0 && H5F_addr_defined(fspace->addr)) {
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Real sections to store in file\n", FUNC);
+            HDfprintf(stderr, "%s: Real sections to store in file\n", FUNC);
 #endif /* H5FS_DEBUG */
-            if(fspace->sinfo->dirty) {
+            if (fspace->sinfo->dirty) {
                 /* Check if the section info is "floating" */
-                if(!H5F_addr_defined(fspace->sect_addr)) {
+                if (!H5F_addr_defined(fspace->sect_addr)) {
                     /* Sanity check */
                     HDassert(fspace->sect_size > 0);
 
                     /* Allocate space for the section info in file */
-                    if(HADDR_UNDEF == (fspace->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_size)))
-                        HGOTO_ERROR(H5E_FSPACE, H5E_NOSPACE, FAIL, "file allocation failed for free space sections")
+                    if (HADDR_UNDEF == (fspace->sect_addr =
+                                            H5MF_alloc(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_size)))
+                        HGOTO_ERROR(H5E_FSPACE, H5E_NOSPACE, FAIL,
+                                    "file allocation failed for free space sections")
                     fspace->alloc_sect_size = (size_t)fspace->sect_size;
 
                     /* Mark free space header as dirty */
-                    if(H5AC_mark_entry_dirty(fspace) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
+                    if (H5AC_mark_entry_dirty(fspace) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL,
+                                    "unable to mark free space header as dirty")
                 } /* end if */
-            } /* end if */
-	    else
-		/* Sanity check that section info has address */
-		HDassert(H5F_addr_defined(fspace->sect_addr));
+            }     /* end if */
+            else
+                /* Sanity check that section info has address */
+                HDassert(H5F_addr_defined(fspace->sect_addr));
 
             /* Cache the free space section info */
-            if(H5AC_insert_entry(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, fspace->sinfo, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_insert_entry(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, fspace->sinfo,
+                                  H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, FAIL, "can't add free space sections to cache")
         } /* end if */
         else {
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: NOT storing section info in file\n", FUNC);
+            HDfprintf(stderr, "%s: NOT storing section info in file\n", FUNC);
 #endif /* H5FS_DEBUG */
             /* Check if space for the section info is allocated */
-            if(H5F_addr_defined(fspace->sect_addr)) {
+            if (H5F_addr_defined(fspace->sect_addr)) {
                 /* Sanity check */
                 /* (section info should only be in the file if the header is */
                 HDassert(H5F_addr_defined(fspace->addr));
 
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Section info allocated though\n", FUNC);
+                HDfprintf(stderr, "%s: Section info allocated though\n", FUNC);
 #endif /* H5FS_DEBUG */
                 /* Check if the section info is for the free space in the file */
                 /* (NOTE: This is the "bootstrapping" special case for the
@@ -421,59 +427,63 @@ HDfprintf(stderr, "%s: Section info allocated though\n", FUNC);
                  *      section info and re-creating it as a section in the
                  *      manager. -QAK)
                  */
-                if(fspace->client == H5FS_CLIENT_FILE_ID) {
-                    htri_t status;          /* "can absorb" status for section into */
+                if (fspace->client == H5FS_CLIENT_FILE_ID) {
+                    htri_t status; /* "can absorb" status for section into */
 
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Section info is for file free space\n", FUNC);
+                    HDfprintf(stderr, "%s: Section info is for file free space\n", FUNC);
 #endif /* H5FS_DEBUG */
                     /* Try to shrink the file or absorb the section info into a block aggregator */
-                    if((status = H5MF_try_shrink(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_addr, fspace->alloc_sect_size)) < 0)
+                    if ((status = H5MF_try_shrink(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_addr,
+                                                  fspace->alloc_sect_size)) < 0)
                         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't check for absorbing section info")
-                    else if(status == FALSE) {
+                    else if (status == FALSE) {
                         /* Section info can't "go away", but it's free.  Allow
                          *      header to record it
                          */
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Section info can't 'go away', header will own it\n", FUNC);
-#endif /* H5FS_DEBUG */
+                        HDfprintf(stderr, "%s: Section info can't 'go away', header will own it\n", FUNC);
+#endif                /* H5FS_DEBUG */
                     } /* end if */
                     else {
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Section info went 'go away'\n", FUNC);
+                        HDfprintf(stderr, "%s: Section info went 'go away'\n", FUNC);
 #endif /* H5FS_DEBUG */
                         /* Reset section info in header */
-                        fspace->sect_addr = HADDR_UNDEF;
+                        fspace->sect_addr       = HADDR_UNDEF;
                         fspace->alloc_sect_size = 0;
 
                         /* Mark free space header as dirty */
-                        if(H5AC_mark_entry_dirty(fspace) < 0)
-                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
+                        if (H5AC_mark_entry_dirty(fspace) < 0)
+                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL,
+                                        "unable to mark free space header as dirty")
                     } /* end else */
-                } /* end if */
+                }     /* end if */
                 else {
-                    haddr_t old_sect_addr = fspace->sect_addr;   /* Previous location of section info in file */
-                    hsize_t old_alloc_sect_size = fspace->alloc_sect_size;       /* Previous size of section info in file */
+                    haddr_t old_sect_addr = fspace->sect_addr; /* Previous location of section info in file */
+                    hsize_t old_alloc_sect_size =
+                        fspace->alloc_sect_size; /* Previous size of section info in file */
 
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Section info is NOT for file free space\n", FUNC);
+                    HDfprintf(stderr, "%s: Section info is NOT for file free space\n", FUNC);
 #endif /* H5FS_DEBUG */
                     /* Reset section info in header */
-                    fspace->sect_addr = HADDR_UNDEF;
+                    fspace->sect_addr       = HADDR_UNDEF;
                     fspace->alloc_sect_size = 0;
 
                     /* Mark free space header as dirty */
-                    if(H5AC_mark_entry_dirty(fspace) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
+                    if (H5AC_mark_entry_dirty(fspace) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL,
+                                    "unable to mark free space header as dirty")
 
                     /* Free previous serialized sections disk space */
-                    if(H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, old_sect_addr, old_alloc_sect_size) < 0)
+                    if (H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, old_sect_addr, old_alloc_sect_size) < 0)
                         HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to free free space sections")
                 } /* end if */
-            } /* end else */
+            }     /* end else */
 
             /* Destroy section info */
-            if(H5FS_sinfo_dest(fspace->sinfo) < 0)
+            if (H5FS_sinfo_dest(fspace->sinfo) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "unable to destroy free space section info")
         } /* end else */
 
@@ -482,7 +492,7 @@ HDfprintf(stderr, "%s: Section info is NOT for file free space\n", FUNC);
     } /* end if */
     else {
         /* Just sanity checks... */
-        if(fspace->serial_sect_count > 0)
+        if (fspace->serial_sect_count > 0)
             /* Sanity check that section info has address */
             HDassert(H5F_addr_defined(fspace->sect_addr));
         else
@@ -491,17 +501,16 @@ HDfprintf(stderr, "%s: Section info is NOT for file free space\n", FUNC);
     } /* end else */
 
     /* Decrement the reference count on the free space manager header */
-    if(H5FS_decr(fspace) < 0)
+    if (H5FS_decr(fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTDEC, FAIL, "unable to decrement ref. count on free space header")
 
 done:
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Leaving, ret_value = %d, fspace->rc = %u\n", FUNC, ret_value, fspace->rc);
+    HDfprintf(stderr, "%s: Leaving, ret_value = %d, fspace->rc = %u\n", FUNC, ret_value, fspace->rc);
 #endif /* H5FS_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_new
  *
@@ -516,12 +525,11 @@ HDfprintf(stderr, "%s: Leaving, ret_value = %d, fspace->rc = %u\n", FUNC, ret_va
  *-------------------------------------------------------------------------
  */
 H5FS_t *
-H5FS_new(const H5F_t *f, size_t nclasses, const H5FS_section_class_t *classes[],
-    void *cls_init_udata)
+H5FS_new(const H5F_t *f, size_t nclasses, const H5FS_section_class_t *classes[], void *cls_init_udata)
 {
-    H5FS_t *fspace = NULL;      /* Free space manager */
-    size_t u;                   /* Local index variable */
-    H5FS_t *ret_value;          /* Return value */
+    H5FS_t *fspace = NULL; /* Free space manager */
+    size_t  u;             /* Local index variable */
+    H5FS_t *ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -531,17 +539,18 @@ H5FS_new(const H5F_t *f, size_t nclasses, const H5FS_section_class_t *classes[],
     /*
      * Allocate free space structure
      */
-    if(NULL == (fspace = H5FL_CALLOC(H5FS_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space free list")
+    if (NULL == (fspace = H5FL_CALLOC(H5FS_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space free list")
 
     /* Set immutable free list parameters */
     fspace->nclasses = nclasses;
-    if(nclasses > 0) {
-        if(NULL == (fspace->sect_cls = H5FL_SEQ_MALLOC(H5FS_section_class_t, nclasses)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space section class array")
+    if (nclasses > 0) {
+        if (NULL == (fspace->sect_cls = H5FL_SEQ_MALLOC(H5FS_section_class_t, nclasses)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                        "memory allocation failed for free space section class array")
 
         /* Initialize the section classes for this free space list */
-        for(u = 0; u < nclasses; u++) {
+        for (u = 0; u < nclasses; u++) {
             /* Make certain that section class type can be used as an array index into this array */
             HDassert(u == classes[u]->type);
 
@@ -549,39 +558,39 @@ H5FS_new(const H5F_t *f, size_t nclasses, const H5FS_section_class_t *classes[],
             HDmemcpy(&fspace->sect_cls[u], classes[u], sizeof(H5FS_section_class_t));
 
             /* Call the class initialization routine, if there is one */
-            if(fspace->sect_cls[u].init_cls)
-                if((fspace->sect_cls[u].init_cls)(&fspace->sect_cls[u], cls_init_udata) < 0)
+            if (fspace->sect_cls[u].init_cls)
+                if ((fspace->sect_cls[u].init_cls)(&fspace->sect_cls[u], cls_init_udata) < 0)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "unable to initialize section class")
 
             /* Determine maximum class-specific serialization size for each section */
-            if(fspace->sect_cls[u].serial_size > fspace->max_cls_serial_size)
+            if (fspace->sect_cls[u].serial_size > fspace->max_cls_serial_size)
                 fspace->max_cls_serial_size = fspace->sect_cls[u].serial_size;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Initialize non-zero information for new free space manager */
-    fspace->addr = HADDR_UNDEF;
-    fspace->hdr_size = H5FS_HEADER_SIZE(f);
+    fspace->addr      = HADDR_UNDEF;
+    fspace->hdr_size  = H5FS_HEADER_SIZE(f);
     fspace->sect_addr = HADDR_UNDEF;
 
     /* Set return value */
     ret_value = fspace;
 
 done:
-    if(!ret_value)
-        if(fspace) {
+    if (!ret_value)
+        if (fspace) {
             /* Should probably call the class 'term' callback for all classes
              *  that have had their 'init' callback called... -QAK
              */
-            if(fspace->sect_cls)
-                fspace->sect_cls = (H5FS_section_class_t *)H5FL_SEQ_FREE(H5FS_section_class_t, fspace->sect_cls);
+            if (fspace->sect_cls)
+                fspace->sect_cls =
+                    (H5FS_section_class_t *)H5FL_SEQ_FREE(H5FS_section_class_t, fspace->sect_cls);
             fspace = H5FL_FREE(H5FS_t, fspace);
         } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FS_size
  *
@@ -613,7 +622,6 @@ H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FS_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FS_incr
  *
@@ -630,11 +638,11 @@ H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size)
 herr_t
 H5FS_incr(H5FS_t *fspace)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fspace->addr, fspace->rc);
+    HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fspace->addr, fspace->rc);
 #endif /* H5FS_DEBUG */
 
     /*
@@ -643,8 +651,8 @@ HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fsp
     HDassert(fspace);
 
     /* Check if we should pin the header in the cache */
-    if(fspace->rc == 0 && H5F_addr_defined(fspace->addr))
-        if(H5AC_pin_protected_entry(fspace) < 0)
+    if (fspace->rc == 0 && H5F_addr_defined(fspace->addr))
+        if (H5AC_pin_protected_entry(fspace) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTPIN, FAIL, "unable to pin free space header")
 
     /* Increment reference count on header */
@@ -654,7 +662,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_incr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FS_decr
  *
@@ -671,11 +678,11 @@ done:
 herr_t
 H5FS_decr(H5FS_t *fspace)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5FS_DEBUG
-HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fspace->addr, fspace->rc);
+    HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fspace->addr, fspace->rc);
 #endif /* H5FS_DEBUG */
 
     /*
@@ -687,22 +694,21 @@ HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fsp
     fspace->rc--;
 
     /* Check if we should unpin the header in the cache */
-    if(fspace->rc == 0) {
-        if(H5F_addr_defined(fspace->addr)) {
-            if(H5AC_unpin_entry(fspace) < 0)
+    if (fspace->rc == 0) {
+        if (H5F_addr_defined(fspace->addr)) {
+            if (H5AC_unpin_entry(fspace) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin free space header")
         } /* end if */
         else {
-            if(H5FS_hdr_dest(fspace) < 0)
+            if (H5FS_hdr_dest(fspace) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "unable to destroy free space header")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_dirty
  *
@@ -719,27 +725,26 @@ done:
 herr_t
 H5FS_dirty(H5FS_t *fspace)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef QAK
-HDfprintf(stderr, "%s: Marking free space header as dirty\n", FUNC);
+    HDfprintf(stderr, "%s: Marking free space header as dirty\n", FUNC);
 #endif /* QAK */
 
     /* Sanity check */
     HDassert(fspace);
 
     /* Check if the free space manager is persistent */
-    if(H5F_addr_defined(fspace->addr))
+    if (H5F_addr_defined(fspace->addr))
         /* Mark header as dirty in cache */
-        if(H5AC_mark_entry_dirty(fspace) < 0)
+        if (H5AC_mark_entry_dirty(fspace) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_dirty() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_hdr_dest
  *
@@ -756,8 +761,8 @@ done:
 herr_t
 H5FS_hdr_dest(H5FS_t *fspace)
 {
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -767,15 +772,15 @@ H5FS_hdr_dest(H5FS_t *fspace)
     HDassert(fspace);
 
     /* Terminate the section classes for this free space list */
-    for(u = 0; u < fspace->nclasses ; u++) {
+    for (u = 0; u < fspace->nclasses; u++) {
         /* Call the class termination routine, if there is one */
-        if(fspace->sect_cls[u].term_cls)
-            if((fspace->sect_cls[u].term_cls)(&fspace->sect_cls[u]) < 0)
+        if (fspace->sect_cls[u].term_cls)
+            if ((fspace->sect_cls[u].term_cls)(&fspace->sect_cls[u]) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "unable to finalize section class")
     } /* end for */
 
     /* Release the memory for the free space section classes */
-    if(fspace->sect_cls)
+    if (fspace->sect_cls)
         fspace->sect_cls = (H5FS_section_class_t *)H5FL_SEQ_FREE(H5FS_section_class_t, fspace->sect_cls);
 
     /* Free free space info */
@@ -785,7 +790,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_hdr_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sinfo_free_sect_cb
  *
@@ -802,8 +806,8 @@ done:
 static herr_t
 H5FS_sinfo_free_sect_cb(void *_sect, void H5_ATTR_UNUSED *key, void *op_data)
 {
-    H5FS_section_info_t *sect = (H5FS_section_info_t *)_sect;   /* Section to free */
-    const H5FS_sinfo_t *sinfo = (const H5FS_sinfo_t *)op_data;     /* Free space manager for section */
+    H5FS_section_info_t *sect  = (H5FS_section_info_t *)_sect;  /* Section to free */
+    const H5FS_sinfo_t * sinfo = (const H5FS_sinfo_t *)op_data; /* Free space manager for section */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -814,9 +818,8 @@ H5FS_sinfo_free_sect_cb(void *_sect, void H5_ATTR_UNUSED *key, void *op_data)
     (*sinfo->fspace->sect_cls[sect->type].free)(sect);
 
     FUNC_LEAVE_NOAPI(0)
-}   /* H5FS_sinfo_free_sect_cb() */
+} /* H5FS_sinfo_free_sect_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sinfo_free_node_cb
  *
@@ -834,7 +837,7 @@ H5FS_sinfo_free_sect_cb(void *_sect, void H5_ATTR_UNUSED *key, void *op_data)
 static herr_t
 H5FS_sinfo_free_node_cb(void *item, void H5_ATTR_UNUSED *key, void *op_data)
 {
-    H5FS_node_t *fspace_node = (H5FS_node_t *)item;       /* Temporary pointer to free space list node */
+    H5FS_node_t *fspace_node = (H5FS_node_t *)item; /* Temporary pointer to free space list node */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -848,9 +851,8 @@ H5FS_sinfo_free_node_cb(void *item, void H5_ATTR_UNUSED *key, void *op_data)
     fspace_node = H5FL_FREE(H5FS_node_t, fspace_node);
 
     FUNC_LEAVE_NOAPI(0)
-}   /* H5FS_sinfo_free_node_cb() */
+} /* H5FS_sinfo_free_node_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sinfo_dest
  *
@@ -867,8 +869,8 @@ H5FS_sinfo_free_node_cb(void *item, void H5_ATTR_UNUSED *key, void *op_data)
 herr_t
 H5FS_sinfo_dest(H5FS_sinfo_t *sinfo)
 {
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -880,8 +882,8 @@ H5FS_sinfo_dest(H5FS_sinfo_t *sinfo)
     HDassert(sinfo->bins);
 
     /* Clear out lists of nodes */
-    for(u = 0; u < sinfo->nbins; u++)
-        if(sinfo->bins[u].bin_list) {
+    for (u = 0; u < sinfo->nbins; u++)
+        if (sinfo->bins[u].bin_list) {
             H5SL_destroy(sinfo->bins[u].bin_list, H5FS_sinfo_free_node_cb, sinfo);
             sinfo->bins[u].bin_list = NULL;
         } /* end if */
@@ -890,8 +892,8 @@ H5FS_sinfo_dest(H5FS_sinfo_t *sinfo)
     sinfo->bins = H5FL_SEQ_FREE(H5FS_bin_t, sinfo->bins);
 
     /* Release skip list for merging sections */
-    if(sinfo->merge_list)
-        if(H5SL_close(sinfo->merge_list) < 0)
+    if (sinfo->merge_list)
+        if (H5SL_close(sinfo->merge_list) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "can't destroy section merging skip list")
 
     /* Decrement the reference count on free space header */
@@ -899,7 +901,7 @@ H5FS_sinfo_dest(H5FS_sinfo_t *sinfo)
      *  disappearing immediately)
      */
     sinfo->fspace->sinfo = NULL;
-    if(H5FS_decr(sinfo->fspace) < 0)
+    if (H5FS_decr(sinfo->fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTDEC, FAIL, "unable to decrement ref. count on free space header")
     sinfo->fspace = NULL;
 
@@ -911,7 +913,7 @@ done:
 } /* end H5FS_sinfo_dest() */
 
 #ifdef H5FS_DEBUG_ASSERT
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5FS_assert
  *
@@ -930,11 +932,11 @@ H5FS_assert(const H5FS_t *fspace)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 #ifndef QAK
-HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS_assert", fspace->tot_sect_count);
+    HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS_assert", fspace->tot_sect_count);
 #endif /* QAK */
 
     /* Checks for section info, if it's available */
-    if(fspace->sinfo) {
+    if (fspace->sinfo) {
         /* Sanity check sections */
         H5FS_sect_assert(fspace);
 
diff --git a/src/H5FScache.c b/src/H5FScache.c
index e3fd237..dcb19e3 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -26,30 +26,29 @@
 /* Module Setup */
 /****************/
 
-#define H5FS_PACKAGE		/*suppress error about including H5FSpkg  */
+#define H5FS_PACKAGE /*suppress error about including H5FSpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FSpkg.h"		/* File free space			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FSpkg.h"     /* File free space			*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* File free space format version #'s */
-#define H5FS_HDR_VERSION        0               /* Header */
-#define H5FS_SINFO_VERSION      0               /* Serialized sections */
+#define H5FS_HDR_VERSION   0 /* Header */
+#define H5FS_SINFO_VERSION 0 /* Serialized sections */
 
 /* Size of stack buffer for serialized headers */
-#define H5FS_HDR_BUF_SIZE               256
-
+#define H5FS_HDR_BUF_SIZE 256
 
 /******************/
 /* Local Typedefs */
@@ -57,17 +56,15 @@
 
 /* User data for skip list iterator callback for iterating over section size nodes when syncing */
 typedef struct {
-    H5FS_sinfo_t *sinfo;        /* Free space section info */
-    uint8_t **p;                /* Pointer to address of buffer pointer to serialize with */
-    unsigned sect_cnt_size;     /* # of bytes to encode section size counts in */
+    H5FS_sinfo_t *sinfo;         /* Free space section info */
+    uint8_t **    p;             /* Pointer to address of buffer pointer to serialize with */
+    unsigned      sect_cnt_size; /* # of bytes to encode section size counts in */
 } H5FS_iter_ud_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -78,16 +75,17 @@ static herr_t H5FS_sinfo_serialize_node_cb(void *_item, void H5_ATTR_UNUSED *key
 
 /* Metadata cache callbacks */
 static H5FS_t *H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_t *fspace, unsigned H5_ATTR_UNUSED * flags_ptr);
-static herr_t H5FS_cache_hdr_dest(H5F_t *f, H5FS_t *fspace);
-static herr_t H5FS_cache_hdr_clear(H5F_t *f, H5FS_t *fspace, hbool_t destroy);
-static herr_t H5FS_cache_hdr_size(const H5F_t *f, const H5FS_t *fspace, size_t *size_ptr);
+static herr_t  H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_t *fspace,
+                                    unsigned H5_ATTR_UNUSED *flags_ptr);
+static herr_t  H5FS_cache_hdr_dest(H5F_t *f, H5FS_t *fspace);
+static herr_t  H5FS_cache_hdr_clear(H5F_t *f, H5FS_t *fspace, hbool_t destroy);
+static herr_t  H5FS_cache_hdr_size(const H5F_t *f, const H5FS_t *fspace, size_t *size_ptr);
 static H5FS_sinfo_t *H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_sinfo_t *sinfo, unsigned H5_ATTR_UNUSED * flags_ptr);
-static herr_t H5FS_cache_sinfo_dest(H5F_t *f, H5FS_sinfo_t *sinfo);
-static herr_t H5FS_cache_sinfo_clear(H5F_t *f, H5FS_sinfo_t *sinfo, hbool_t destroy);
-static herr_t H5FS_cache_sinfo_size(const H5F_t *f, const H5FS_sinfo_t *sinfo, size_t *size_ptr);
-
+static herr_t        H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+                                            H5FS_sinfo_t *sinfo, unsigned H5_ATTR_UNUSED *flags_ptr);
+static herr_t        H5FS_cache_sinfo_dest(H5F_t *f, H5FS_sinfo_t *sinfo);
+static herr_t        H5FS_cache_sinfo_clear(H5F_t *f, H5FS_sinfo_t *sinfo, hbool_t destroy);
+static herr_t        H5FS_cache_sinfo_size(const H5F_t *f, const H5FS_sinfo_t *sinfo, size_t *size_ptr);
 
 /*********************/
 /* Package Variables */
@@ -113,12 +111,10 @@ const H5AC_class_t H5AC_FSPACE_SINFO[1] = {{
     (H5AC_size_func_t)H5FS_cache_sinfo_size,
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -126,8 +122,6 @@ const H5AC_class_t H5AC_FSPACE_SINFO[1] = {{
 /* Declare a free list to manage free space section data to/from disk */
 H5FL_BLK_DEFINE_STATIC(sect_block);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_hdr_load
  *
@@ -145,16 +139,16 @@ H5FL_BLK_DEFINE_STATIC(sect_block);
 static H5FS_t *
 H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5FS_t		*fspace = NULL; /* Free space header info */
-    H5FS_hdr_cache_ud_t *udata = (H5FS_hdr_cache_ud_t *)_udata; /* user data for callback */
-    H5WB_t              *wb = NULL;     /* Wrapped buffer for header data */
-    uint8_t             hdr_buf[H5FS_HDR_BUF_SIZE]; /* Buffer for header */
-    uint8_t		*hdr;           /* Pointer to header buffer */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
-    uint32_t            stored_chksum;  /* Stored metadata checksum value */
-    uint32_t            computed_chksum; /* Computed metadata checksum value */
-    unsigned            nclasses;       /* Number of section classes */
-    H5FS_t		*ret_value;     /* Return value */
+    H5FS_t *             fspace = NULL;                          /* Free space header info */
+    H5FS_hdr_cache_ud_t *udata  = (H5FS_hdr_cache_ud_t *)_udata; /* user data for callback */
+    H5WB_t *             wb     = NULL;                          /* Wrapped buffer for header data */
+    uint8_t              hdr_buf[H5FS_HDR_BUF_SIZE];             /* Buffer for header */
+    uint8_t *            hdr;                                    /* Pointer to header buffer */
+    const uint8_t *      p;                                      /* Pointer into raw data buffer */
+    uint32_t             stored_chksum;                          /* Stored metadata checksum value */
+    uint32_t             computed_chksum;                        /* Computed metadata checksum value */
+    unsigned             nclasses;                               /* Number of section classes */
+    H5FS_t *             ret_value;                              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -163,39 +157,39 @@ H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata);
 
     /* Allocate a new free space manager */
-    if(NULL == (fspace = H5FS_new(udata->f, udata->nclasses, udata->classes, udata->cls_init_udata)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (fspace = H5FS_new(udata->f, udata->nclasses, udata->classes, udata->cls_init_udata)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set free space manager's internal information */
     fspace->addr = udata->addr;
 
     /* Wrap the local buffer for serialized header info */
-    if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
+    if (NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't wrap buffer")
 
     /* Get a pointer to a buffer that's large enough for header */
-    if(NULL == (hdr = (uint8_t *)H5WB_actual(wb, fspace->hdr_size)))
+    if (NULL == (hdr = (uint8_t *)H5WB_actual(wb, fspace->hdr_size)))
         HGOTO_ERROR(H5E_FSPACE, H5E_NOSPACE, NULL, "can't get actual buffer")
 
     /* Read header from disk */
-    if(H5F_block_read(f, H5FD_MEM_FSPACE_HDR, addr, fspace->hdr_size, dxpl_id, hdr) < 0)
-	HGOTO_ERROR(H5E_FSPACE, H5E_READERROR, NULL, "can't read free space header")
+    if (H5F_block_read(f, H5FD_MEM_FSPACE_HDR, addr, fspace->hdr_size, dxpl_id, hdr) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_READERROR, NULL, "can't read free space header")
 
     p = hdr;
 
     /* Magic number */
-    if(HDmemcmp(p, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space header signature")
+    if (HDmemcmp(p, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space header signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5FS_HDR_VERSION)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space header version")
+    if (*p++ != H5FS_HDR_VERSION)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space header version")
 
     /* Client ID */
     fspace->client = (H5FS_client_t)*p++;
-    if(fspace->client >= H5FS_NUM_CLIENT_ID)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "unknown client ID in free space header")
+    if (fspace->client >= H5FS_NUM_CLIENT_ID)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "unknown client ID in free space header")
 
     /* Total space tracked */
     H5F_DECODE_LENGTH(udata->f, p, fspace->tot_space);
@@ -212,8 +206,8 @@ H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     /* # of section classes */
     /* (only check if we actually have some classes) */
     UINT16DECODE(p, nclasses);
-    if(fspace->nclasses > 0 && fspace->nclasses != nclasses)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "section class count mismatch")
+    if (fspace->nclasses > 0 && fspace->nclasses != nclasses)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "section class count mismatch")
 
     /* Shrink percent */
     UINT16DECODE(p, fspace->shrink_percent);
@@ -245,24 +239,24 @@ H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert((size_t)(p - (const uint8_t *)hdr) == fspace->hdr_size);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
-	HGOTO_ERROR(H5E_FSPACE, H5E_BADVALUE, NULL, "incorrect metadata checksum for fractal heap indirect block")
+    if (stored_chksum != computed_chksum)
+        HGOTO_ERROR(H5E_FSPACE, H5E_BADVALUE, NULL,
+                    "incorrect metadata checksum for fractal heap indirect block")
 
     /* Set return value */
     ret_value = fspace;
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
-    if(!ret_value && fspace)
-        if(H5FS_hdr_dest(fspace) < 0)
+    if (!ret_value && fspace)
+        if (H5FS_hdr_dest(fspace) < 0)
             HDONE_ERROR(H5E_FSPACE, H5E_CANTFREE, NULL, "unable to destroy free space header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_cache_hdr_load() */ /*lint !e818 Can't make udata a pointer to const */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_hdr_flush
  *
@@ -277,11 +271,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_t *fspace, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_t *fspace,
+                     unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    H5WB_t      *wb = NULL;             /* Wrapped buffer for header data */
-    uint8_t     hdr_buf[H5FS_HDR_BUF_SIZE]; /* Buffer for header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5WB_t *wb = NULL;                  /* Wrapped buffer for header data */
+    uint8_t hdr_buf[H5FS_HDR_BUF_SIZE]; /* Buffer for header */
+    herr_t  ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -292,23 +287,25 @@ H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F
     HDassert(H5F_addr_defined(fspace->addr));
 
     /* Check if the header "owns" the section info */
-    if(fspace->sinfo) {
+    if (fspace->sinfo) {
         /* Sanity check - should not be trying to destroy header if it still
          *      "owns" section info
          */
         HDassert(!destroy);
 
         /* Check if the section info is dirty */
-        if(fspace->sinfo->dirty) {
-            if(fspace->serial_sect_count > 0) {
+        if (fspace->sinfo->dirty) {
+            if (fspace->serial_sect_count > 0) {
                 /* Check if we need to allocate space for  section info */
-                if(!H5F_addr_defined(fspace->sect_addr)) {
+                if (!H5F_addr_defined(fspace->sect_addr)) {
                     /* Sanity check */
                     HDassert(fspace->sect_size > 0);
 
                     /* Allocate space for the section info in file */
-                    if(HADDR_UNDEF == (fspace->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_size)))
-                        HGOTO_ERROR(H5E_FSPACE, H5E_NOSPACE, FAIL, "file allocation failed for free space sections")
+                    if (HADDR_UNDEF == (fspace->sect_addr =
+                                            H5MF_alloc(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_size)))
+                        HGOTO_ERROR(H5E_FSPACE, H5E_NOSPACE, FAIL,
+                                    "file allocation failed for free space sections")
                     fspace->alloc_sect_size = (size_t)fspace->sect_size;
 
                     /* Mark header dirty */
@@ -317,8 +314,9 @@ H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F
                 } /* end if */
 
                 /* Write section info to file */
-                if(H5FS_cache_sinfo_flush(f, dxpl_id, FALSE, fspace->sect_addr, fspace->sinfo, NULL) < 0)
-                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFLUSH, FAIL, "unable to save free space section info to disk")
+                if (H5FS_cache_sinfo_flush(f, dxpl_id, FALSE, fspace->sect_addr, fspace->sinfo, NULL) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFLUSH, FAIL,
+                                "unable to save free space section info to disk")
             } /* end if */
             else {
                 /* Sanity check that section info doesn't have address */
@@ -327,10 +325,10 @@ H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F
             /* Mark section info clean */
             fspace->sinfo->dirty = FALSE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
         /* Just sanity checks... */
-        if(fspace->serial_sect_count > 0)
+        if (fspace->serial_sect_count > 0)
             /* Sanity check that section info has address */
             HDassert(H5F_addr_defined(fspace->sect_addr));
         else
@@ -338,17 +336,17 @@ H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F
             HDassert(!H5F_addr_defined(fspace->sect_addr));
     } /* end else */
 
-    if(fspace->cache_info.is_dirty) {
-        uint8_t	*hdr;                   /* Pointer to header buffer */
-        uint8_t *p;                     /* Pointer into raw data buffer */
-        uint32_t metadata_chksum;       /* Computed metadata checksum value */
+    if (fspace->cache_info.is_dirty) {
+        uint8_t *hdr;             /* Pointer to header buffer */
+        uint8_t *p;               /* Pointer into raw data buffer */
+        uint32_t metadata_chksum; /* Computed metadata checksum value */
 
         /* Wrap the local buffer for serialized header info */
-        if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
+        if (NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for header */
-        if(NULL == (hdr = (uint8_t *)H5WB_actual(wb, fspace->hdr_size)))
+        if (NULL == (hdr = (uint8_t *)H5WB_actual(wb, fspace->hdr_size)))
             HGOTO_ERROR(H5E_FSPACE, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Get temporary pointer to header */
@@ -406,27 +404,26 @@ H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F
         /* Metadata checksum */
         UINT32ENCODE(p, metadata_chksum);
 
-	/* Write the free space header. */
+        /* Write the free space header. */
         HDassert((size_t)(p - hdr) == fspace->hdr_size);
-	if(H5F_block_write(f, H5FD_MEM_FSPACE_HDR, addr, fspace->hdr_size, dxpl_id, hdr) < 0)
-	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFLUSH, FAIL, "unable to save free space header to disk")
+        if (H5F_block_write(f, H5FD_MEM_FSPACE_HDR, addr, fspace->hdr_size, dxpl_id, hdr) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFLUSH, FAIL, "unable to save free space header to disk")
 
-	fspace->cache_info.is_dirty = FALSE;
+        fspace->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5FS_cache_hdr_dest(f, fspace) < 0)
-	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space header")
+    if (destroy)
+        if (H5FS_cache_hdr_dest(f, fspace) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space header")
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_cache_hdr_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_hdr_dest
  *
@@ -457,25 +454,25 @@ H5FS_cache_hdr_dest(H5F_t *f, H5FS_t *fspace)
     HDassert(!fspace->cache_info.free_file_space_on_destroy || H5F_addr_defined(fspace->cache_info.addr));
 
     /* Check for freeing file space for free space header */
-    if(fspace->cache_info.free_file_space_on_destroy) {
+    if (fspace->cache_info.free_file_space_on_destroy) {
         /* Sanity check */
         HDassert(H5F_addr_defined(fspace->addr));
 
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_FSPACE_HDR, H5AC_dxpl_id, fspace->cache_info.addr, (hsize_t)fspace->hdr_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_FSPACE_HDR, H5AC_dxpl_id, fspace->cache_info.addr,
+                       (hsize_t)fspace->hdr_size) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to free free space header")
     } /* end if */
 
     /* Destroy free space header */
-    if(H5FS_hdr_dest(fspace) < 0)
+    if (H5FS_hdr_dest(fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_cache_hdr_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_hdr_clear
  *
@@ -492,7 +489,7 @@ done:
 static herr_t
 H5FS_cache_hdr_clear(H5F_t *f, H5FS_t *fspace, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -504,15 +501,14 @@ H5FS_cache_hdr_clear(H5F_t *f, H5FS_t *fspace, hbool_t destroy)
     /* Reset the dirty flag.  */
     fspace->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5FS_cache_hdr_dest(f, fspace) < 0)
-	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space header")
+    if (destroy)
+        if (H5FS_cache_hdr_dest(f, fspace) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_cache_hdr_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_hdr_size
  *
@@ -544,7 +540,6 @@ H5FS_cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5FS_t *fspace, size_t
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FS_cache_hdr_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_sinfo_load
  *
@@ -562,15 +557,15 @@ H5FS_cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5FS_t *fspace, size_t
 static H5FS_sinfo_t *
 H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_udata)
 {
-    H5FS_sinfo_t	*sinfo = NULL;  /* Free space section info */
+    H5FS_sinfo_t *         sinfo = NULL;                            /* Free space section info */
     H5FS_sinfo_cache_ud_t *udata = (H5FS_sinfo_cache_ud_t *)_udata; /* user data for callback */
-    haddr_t             fs_addr;        /* Free space header address */
-    size_t              old_sect_size;  /* Old section size */
-    uint8_t		*buf = NULL;    /* Temporary buffer */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
-    uint32_t            stored_chksum;  /* Stored metadata checksum value */
-    uint32_t            computed_chksum; /* Computed metadata checksum value */
-    H5FS_sinfo_t	*ret_value;     /* Return value */
+    haddr_t                fs_addr;                                 /* Free space header address */
+    size_t                 old_sect_size;                           /* Old section size */
+    uint8_t *              buf = NULL;                              /* Temporary buffer */
+    const uint8_t *        p;                                       /* Pointer into raw data buffer */
+    uint32_t               stored_chksum;                           /* Stored metadata checksum value */
+    uint32_t               computed_chksum;                         /* Computed metadata checksum value */
+    H5FS_sinfo_t *         ret_value;                               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -579,61 +574,62 @@ H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void
     HDassert(udata);
 
     /* Allocate a new free space section info */
-    if(NULL == (sinfo = H5FS_sinfo_new(udata->f, udata->fspace)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (sinfo = H5FS_sinfo_new(udata->f, udata->fspace)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Allocate space for the buffer to serialize the sections into */
     H5_CHECKED_ASSIGN(old_sect_size, size_t, udata->fspace->sect_size, hsize_t);
-    if(NULL == (buf = H5FL_BLK_MALLOC(sect_block, (size_t)udata->fspace->sect_size)))
+    if (NULL == (buf = H5FL_BLK_MALLOC(sect_block, (size_t)udata->fspace->sect_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Read buffer from disk */
-    if(H5F_block_read(f, H5FD_MEM_FSPACE_SINFO, udata->fspace->sect_addr, (size_t)udata->fspace->sect_size, dxpl_id, buf) < 0)
-	HGOTO_ERROR(H5E_FSPACE, H5E_READERROR, NULL, "can't read free space sections")
+    if (H5F_block_read(f, H5FD_MEM_FSPACE_SINFO, udata->fspace->sect_addr, (size_t)udata->fspace->sect_size,
+                       dxpl_id, buf) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_READERROR, NULL, "can't read free space sections")
 
     /* Deserialize free sections from buffer available */
     p = buf;
 
     /* Magic number */
-    if(HDmemcmp(p, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space sections signature")
+    if (HDmemcmp(p, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space sections signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5FS_SINFO_VERSION)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space sections version")
+    if (*p++ != H5FS_SINFO_VERSION)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space sections version")
 
     /* Address of free space header for these sections */
     H5F_addr_decode(udata->f, &p, &fs_addr);
-    if(H5F_addr_ne(fs_addr, udata->fspace->addr))
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "incorrect header address for free space sections")
+    if (H5F_addr_ne(fs_addr, udata->fspace->addr))
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "incorrect header address for free space sections")
 
     /* Check for any serialized sections */
-    if(udata->fspace->serial_sect_count > 0) {
-        hsize_t old_tot_sect_count;     /* Total section count from header */
-        hsize_t old_serial_sect_count;  /* Total serializable section count from header */
-        hsize_t old_ghost_sect_count;   /* Total ghost section count from header */
-        hsize_t old_tot_space;          /* Total space managed from header */
+    if (udata->fspace->serial_sect_count > 0) {
+        hsize_t  old_tot_sect_count;    /* Total section count from header */
+        hsize_t  old_serial_sect_count; /* Total serializable section count from header */
+        hsize_t  old_ghost_sect_count;  /* Total ghost section count from header */
+        hsize_t  old_tot_space;         /* Total space managed from header */
         unsigned sect_cnt_size;         /* The size of the section size counts */
 
         /* Compute the size of the section counts */
         sect_cnt_size = H5VM_limit_enc_size((uint64_t)udata->fspace->serial_sect_count);
 
         /* Reset the section count, the "add" routine will update it */
-        old_tot_sect_count = udata->fspace->tot_sect_count;
-        old_serial_sect_count = udata->fspace->serial_sect_count;
-        old_ghost_sect_count = udata->fspace->ghost_sect_count;
-        old_tot_space = udata->fspace->tot_space;
-        udata->fspace->tot_sect_count = 0;
+        old_tot_sect_count               = udata->fspace->tot_sect_count;
+        old_serial_sect_count            = udata->fspace->serial_sect_count;
+        old_ghost_sect_count             = udata->fspace->ghost_sect_count;
+        old_tot_space                    = udata->fspace->tot_space;
+        udata->fspace->tot_sect_count    = 0;
         udata->fspace->serial_sect_count = 0;
-        udata->fspace->ghost_sect_count = 0;
-        udata->fspace->tot_space = 0;
+        udata->fspace->ghost_sect_count  = 0;
+        udata->fspace->tot_space         = 0;
 
         /* Walk through the buffer, deserializing sections */
         do {
-            hsize_t sect_size = 0;      /* Current section size */
-            size_t node_count = 0;      /* # of sections of this size */
-            size_t u;               /* Local index variable */
+            hsize_t sect_size  = 0; /* Current section size */
+            size_t  node_count = 0; /* # of sections of this size */
+            size_t  u;              /* Local index variable */
 
             /* The number of sections of this node's size */
             UINT64DECODE_VAR(p, node_count, sect_cnt_size);
@@ -644,11 +640,11 @@ H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void
             HDassert(sect_size);
 
             /* Loop over nodes of this size */
-            for(u = 0; u < node_count; u++) {
-                H5FS_section_info_t *new_sect;  /* Section that was deserialized */
-                haddr_t sect_addr = 0;  /* Address of free space section in the address space */
-                unsigned sect_type;     /* Type of free space section */
-                unsigned des_flags;     /* Flags from deserialize callback */
+            for (u = 0; u < node_count; u++) {
+                H5FS_section_info_t *new_sect;      /* Section that was deserialized */
+                haddr_t              sect_addr = 0; /* Address of free space section in the address space */
+                unsigned             sect_type;     /* Type of free space section */
+                unsigned             des_flags;     /* Flags from deserialize callback */
 
                 /* The address of the section */
                 UINT64DECODE_VAR(p, sect_addr, sinfo->sect_off_size);
@@ -659,18 +655,22 @@ H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void
                 /* Call 'deserialize' callback for this section */
                 des_flags = 0;
                 HDassert(udata->fspace->sect_cls[sect_type].deserialize);
-                if(NULL == (new_sect = (*udata->fspace->sect_cls[sect_type].deserialize)(&udata->fspace->sect_cls[sect_type], udata->dxpl_id, p, sect_addr, sect_size, &des_flags)))
+                if (NULL == (new_sect = (*udata->fspace->sect_cls[sect_type].deserialize)(
+                                 &udata->fspace->sect_cls[sect_type], udata->dxpl_id, p, sect_addr, sect_size,
+                                 &des_flags)))
                     HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, NULL, "can't deserialize section")
 
                 /* Update offset in serialization buffer */
                 p += udata->fspace->sect_cls[sect_type].serial_size;
 
                 /* Insert section in free space manager, unless requested not to */
-                if(!(des_flags & H5FS_DESERIALIZE_NO_ADD))
-                    if(H5FS_sect_add(udata->f, udata->dxpl_id, udata->fspace, new_sect, H5FS_ADD_DESERIALIZING, NULL) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, NULL, "can't add section to free space manager")
+                if (!(des_flags & H5FS_DESERIALIZE_NO_ADD))
+                    if (H5FS_sect_add(udata->f, udata->dxpl_id, udata->fspace, new_sect,
+                                      H5FS_ADD_DESERIALIZING, NULL) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, NULL,
+                                    "can't add section to free space manager")
             } /* end for */
-        } while(p < ((buf + old_sect_size) - H5FS_SIZEOF_CHKSUM));
+        } while (p < ((buf + old_sect_size) - H5FS_SIZEOF_CHKSUM));
 
         /* Sanity check */
         HDassert((size_t)(p - buf) == (old_sect_size - H5FS_SIZEOF_CHKSUM));
@@ -688,8 +688,9 @@ H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void
     UINT32DECODE(p, stored_chksum);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
-	HGOTO_ERROR(H5E_FSPACE, H5E_BADVALUE, NULL, "incorrect metadata checksum for fractal heap indirect block")
+    if (stored_chksum != computed_chksum)
+        HGOTO_ERROR(H5E_FSPACE, H5E_BADVALUE, NULL,
+                    "incorrect metadata checksum for fractal heap indirect block")
 
     /* Sanity check */
     HDassert((size_t)(p - (const uint8_t *)buf) == old_sect_size);
@@ -698,16 +699,15 @@ H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void
     ret_value = sinfo;
 
 done:
-    if(buf)
+    if (buf)
         buf = H5FL_BLK_FREE(sect_block, buf);
-    if(!ret_value && sinfo)
-        if(H5FS_sinfo_dest(sinfo) < 0)
+    if (!ret_value && sinfo)
+        if (H5FS_sinfo_dest(sinfo) < 0)
             HDONE_ERROR(H5E_FSPACE, H5E_CANTFREE, NULL, "unable to destroy free space info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_cache_sinfo_load() */ /*lint !e818 Can't make udata a pointer to const */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sinfo_serialize_sect_cb
  *
@@ -724,10 +724,10 @@ done:
 static herr_t
 H5FS_sinfo_serialize_sect_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata)
 {
-    H5FS_section_class_t *sect_cls;     /* Class of section */
-    H5FS_section_info_t *sect= (H5FS_section_info_t *)_item;   /* Free space section to work on */
-    H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_section_class_t *sect_cls;                                 /* Class of section */
+    H5FS_section_info_t * sect      = (H5FS_section_info_t *)_item; /* Free space section to work on */
+    H5FS_iter_ud_t *      udata     = (H5FS_iter_ud_t *)_udata;     /* Callback info */
+    herr_t                ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -740,7 +740,7 @@ H5FS_sinfo_serialize_sect_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata
     sect_cls = &udata->sinfo->fspace->sect_cls[sect->type];
 
     /* Check if this section should be serialized (i.e. is not a ghost section) */
-    if(!(sect_cls->flags & H5FS_CLS_GHOST_OBJ)) {
+    if (!(sect_cls->flags & H5FS_CLS_GHOST_OBJ)) {
         /* The address of the section */
         UINT64ENCODE_VAR(*udata->p, sect->addr, udata->sinfo->sect_off_size);
 
@@ -748,8 +748,8 @@ H5FS_sinfo_serialize_sect_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata
         *(*udata->p)++ = (uint8_t)sect->type;
 
         /* Call 'serialize' callback for this section */
-        if(sect_cls->serialize) {
-            if((*sect_cls->serialize)(sect_cls, sect, *udata->p) < 0)
+        if (sect_cls->serialize) {
+            if ((*sect_cls->serialize)(sect_cls, sect, *udata->p) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTSERIALIZE, FAIL, "can't synchronize section")
 
             /* Update offset in serialization buffer */
@@ -763,7 +763,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sinfo_serialize_sect_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sinfo_serialize_node_cb
  *
@@ -780,9 +779,9 @@ done:
 static herr_t
 H5FS_sinfo_serialize_node_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata)
 {
-    H5FS_node_t *fspace_node = (H5FS_node_t *)_item;   /* Free space size node to work on */
-    H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_node_t *   fspace_node = (H5FS_node_t *)_item;     /* Free space size node to work on */
+    H5FS_iter_ud_t *udata       = (H5FS_iter_ud_t *)_udata; /* Callback info */
+    herr_t          ret_value   = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -792,7 +791,7 @@ H5FS_sinfo_serialize_node_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata
     HDassert(udata->p);
 
     /* Check if this node has any serializable sections */
-    if(fspace_node->serial_count > 0) {
+    if (fspace_node->serial_count > 0) {
         /* The number of serializable sections of this node's size */
         UINT64ENCODE_VAR(*udata->p, fspace_node->serial_count, udata->sect_cnt_size);
 
@@ -801,7 +800,7 @@ H5FS_sinfo_serialize_node_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata
 
         /* Iterate through all the sections of this size */
         HDassert(fspace_node->sect_list);
-        if(H5SL_iterate(fspace_node->sect_list, H5FS_sinfo_serialize_sect_cb, udata) < 0)
+        if (H5SL_iterate(fspace_node->sect_list, H5FS_sinfo_serialize_sect_cb, udata) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section nodes")
     } /* end if */
 
@@ -809,7 +808,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sinfo_serialize_node_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_sinfo_flush
  *
@@ -824,9 +822,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_sinfo_t *sinfo, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_sinfo_t *sinfo,
+                       unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -837,19 +836,19 @@ H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H
     HDassert(sinfo->fspace);
     HDassert(sinfo->fspace->sect_cls);
 
-    if(sinfo->cache_info.is_dirty || sinfo->dirty) {
-        H5FS_iter_ud_t udata;       /* User data for callbacks */
-        uint8_t	*buf = NULL;        /* Temporary raw data buffer */
-        uint8_t *p;                 /* Pointer into raw data buffer */
-        uint32_t metadata_chksum;   /* Computed metadata checksum value */
-        unsigned bin;               /* Current bin we are on */
+    if (sinfo->cache_info.is_dirty || sinfo->dirty) {
+        H5FS_iter_ud_t udata;           /* User data for callbacks */
+        uint8_t *      buf = NULL;      /* Temporary raw data buffer */
+        uint8_t *      p;               /* Pointer into raw data buffer */
+        uint32_t       metadata_chksum; /* Computed metadata checksum value */
+        unsigned       bin;             /* Current bin we are on */
 
         /* Sanity check address */
-        if(H5F_addr_ne(addr, sinfo->fspace->sect_addr))
+        if (H5F_addr_ne(addr, sinfo->fspace->sect_addr))
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "incorrect address for free space sections")
 
         /* Allocate temporary buffer */
-        if((buf = H5FL_BLK_MALLOC(sect_block, (size_t)sinfo->fspace->sect_size)) == NULL)
+        if ((buf = H5FL_BLK_MALLOC(sect_block, (size_t)sinfo->fspace->sect_size)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         p = buf;
@@ -865,19 +864,19 @@ H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H
         H5F_addr_encode(f, &p, sinfo->fspace->addr);
 
         /* Set up user data for iterator */
-        udata.sinfo = sinfo;
-        udata.p = &p;
+        udata.sinfo         = sinfo;
+        udata.p             = &p;
         udata.sect_cnt_size = H5VM_limit_enc_size((uint64_t)sinfo->fspace->serial_sect_count);
 
         /* Iterate over all the bins */
-        for(bin = 0; bin < sinfo->nbins; bin++) {
+        for (bin = 0; bin < sinfo->nbins; bin++) {
             /* Check if there are any sections in this bin */
-            if(sinfo->bins[bin].bin_list) {
+            if (sinfo->bins[bin].bin_list) {
                 /* Iterate over list of section size nodes for bin */
-                if(H5SL_iterate(sinfo->bins[bin].bin_list, H5FS_sinfo_serialize_node_cb, &udata) < 0)
+                if (H5SL_iterate(sinfo->bins[bin].bin_list, H5FS_sinfo_serialize_node_cb, &udata) < 0)
                     HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section size nodes")
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /* Compute checksum */
         metadata_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
@@ -890,24 +889,24 @@ H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H
         HDassert(sinfo->fspace->sect_size <= sinfo->fspace->alloc_sect_size);
 
         /* Write buffer to disk */
-        if(H5F_block_write(f, H5FD_MEM_FSPACE_SINFO, sinfo->fspace->sect_addr, (size_t)sinfo->fspace->sect_size, dxpl_id, buf) < 0)
+        if (H5F_block_write(f, H5FD_MEM_FSPACE_SINFO, sinfo->fspace->sect_addr,
+                            (size_t)sinfo->fspace->sect_size, dxpl_id, buf) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTFLUSH, FAIL, "unable to save free space sections to disk")
 
         buf = H5FL_BLK_FREE(sect_block, buf);
 
-	sinfo->cache_info.is_dirty = FALSE;
-        sinfo->dirty = FALSE;
+        sinfo->cache_info.is_dirty = FALSE;
+        sinfo->dirty               = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5FS_cache_sinfo_dest(f, sinfo) < 0)
-	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space section info")
+    if (destroy)
+        if (H5FS_cache_sinfo_dest(f, sinfo) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space section info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_cache_sinfo_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_sinfo_dest
  *
@@ -935,25 +934,25 @@ H5FS_cache_sinfo_dest(H5F_t *f, H5FS_sinfo_t *sinfo)
     HDassert(!sinfo->cache_info.free_file_space_on_destroy || H5F_addr_defined(sinfo->cache_info.addr));
 
     /* Check for freeing file space for free space section info */
-    if(sinfo->cache_info.free_file_space_on_destroy) {
+    if (sinfo->cache_info.free_file_space_on_destroy) {
         /* Sanity check */
         HDassert(sinfo->fspace->alloc_sect_size > 0);
 
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, H5AC_dxpl_id, sinfo->cache_info.addr, (hsize_t)sinfo->fspace->alloc_sect_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, H5AC_dxpl_id, sinfo->cache_info.addr,
+                       (hsize_t)sinfo->fspace->alloc_sect_size) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to free free space section info")
     } /* end if */
 
     /* Destroy free space info */
-    if(H5FS_sinfo_dest(sinfo) < 0)
+    if (H5FS_sinfo_dest(sinfo) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_cache_sinfo_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_sinfo_clear
  *
@@ -970,7 +969,7 @@ done:
 static herr_t
 H5FS_cache_sinfo_clear(H5F_t *f, H5FS_sinfo_t *sinfo, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -982,15 +981,14 @@ H5FS_cache_sinfo_clear(H5F_t *f, H5FS_sinfo_t *sinfo, hbool_t destroy)
     /* Reset the dirty flag.  */
     sinfo->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5FS_cache_sinfo_dest(f, sinfo) < 0)
-	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space section info")
+    if (destroy)
+        if (H5FS_cache_sinfo_dest(f, sinfo) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space section info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_cache_sinfo_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_sinfo_size
  *
@@ -1020,4 +1018,3 @@ H5FS_cache_sinfo_size(const H5F_t H5_ATTR_UNUSED *f, const H5FS_sinfo_t *sinfo,
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FS_cache_sinfo_size() */
-
diff --git a/src/H5FSdbg.c b/src/H5FSdbg.c
index a17a792..f7e02e4 100644
--- a/src/H5FSdbg.c
+++ b/src/H5FSdbg.c
@@ -26,54 +26,47 @@
 /* Module Setup */
 /****************/
 
-#define H5FS_PACKAGE		/*suppress error about including H5FSpkg  */
-#define H5HF_DEBUGGING          /* Need access to fractal heap debugging routines */
-#define H5MF_DEBUGGING          /* Need access to file space debugging routines */
+#define H5FS_PACKAGE   /*suppress error about including H5FSpkg  */
+#define H5HF_DEBUGGING /* Need access to fractal heap debugging routines */
+#define H5MF_DEBUGGING /* Need access to file space debugging routines */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FSpkg.h"		/* File free space			*/
-#include "H5HFprivate.h"	/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FSpkg.h"     /* File free space			*/
+#include "H5HFprivate.h" /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_debug
  *
@@ -94,9 +87,9 @@
 herr_t
 H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    H5FS_t	*fspace = NULL;         /* Free space header info */
-    H5FS_hdr_cache_ud_t cache_udata;    /* User-data for cache callback */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5FS_t *            fspace = NULL;       /* Free space header info */
+    H5FS_hdr_cache_ud_t cache_udata;         /* User-data for cache callback */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -110,17 +103,17 @@ H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int
     HDassert(fwidth >= 0);
 
     /* Initialize user data for protecting the free space manager */
-    cache_udata.f = f;
-    cache_udata.nclasses = 0;
-    cache_udata.classes = NULL;
+    cache_udata.f              = f;
+    cache_udata.nclasses       = 0;
+    cache_udata.classes        = NULL;
     cache_udata.cls_init_udata = NULL;
-    cache_udata.addr = addr;
+    cache_udata.addr           = addr;
 
     /*
      * Load the free space header.
      */
-    if(NULL == (fspace = (H5FS_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
+    if (NULL == (fspace = (H5FS_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
 
     /* Print opening message */
     HDfprintf(stream, "%*sFree Space Header...\n", indent, "");
@@ -128,55 +121,37 @@ H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Free space client:",
-	      (fspace->client == H5FS_CLIENT_FHEAP_ID ? "Fractal heap" :
-	      (fspace->client == H5FS_CLIENT_FILE_ID ? "File" : "Unknown")));
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Total free space tracked:",
-	      fspace->tot_space);
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Free space client:",
+              (fspace->client == H5FS_CLIENT_FHEAP_ID
+                   ? "Fractal heap"
+                   : (fspace->client == H5FS_CLIENT_FILE_ID ? "File" : "Unknown")));
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Total free space tracked:", fspace->tot_space);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Total number of free space sections tracked:",
-	      fspace->tot_sect_count);
+              "Total number of free space sections tracked:", fspace->tot_sect_count);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Number of serializable free space sections tracked:",
-	      fspace->serial_sect_count);
+              "Number of serializable free space sections tracked:", fspace->serial_sect_count);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Number of ghost free space sections tracked:",
-	      fspace->ghost_sect_count);
+              "Number of ghost free space sections tracked:", fspace->ghost_sect_count);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of free space section classes:",
-	      fspace->nclasses);
-    HDfprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth,
-	      "Shrink percent:",
-	      fspace->shrink_percent);
-    HDfprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth,
-	      "Expand percent:",
-	      fspace->expand_percent);
+              "Number of free space section classes:", fspace->nclasses);
+    HDfprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth, "Shrink percent:", fspace->shrink_percent);
+    HDfprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth, "Expand percent:", fspace->expand_percent);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "# of bits for section address space:",
-	      fspace->max_sect_addr);
+              "# of bits for section address space:", fspace->max_sect_addr);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Maximum section size:", fspace->max_sect_size);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Serialized sections address:", fspace->sect_addr);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Maximum section size:",
-	      fspace->max_sect_size);
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Serialized sections address:",
-	      fspace->sect_addr);
+              "Serialized sections size used:", fspace->sect_size);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Serialized sections size used:",
-	      fspace->sect_size);
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Serialized sections size allocated:",
-	      fspace->alloc_sect_size);
+              "Serialized sections size allocated:", fspace->alloc_sect_size);
 
 done:
-    if(fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, addr, fspace, H5AC__NO_FLAGS_SET) < 0)
+    if (fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, addr, fspace, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_debug
  *
@@ -193,7 +168,7 @@ done:
 herr_t
 H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect, FILE *stream, int indent, int fwidth)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -207,15 +182,14 @@ H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect, FILE *str
     HDassert(fwidth >= 0);
 
     /* Call the section's debugging routine */
-    if(fspace->sect_cls[sect->type].debug)
-        if((fspace->sect_cls[sect->type].debug)(sect, stream, indent, fwidth) < 0)
+    if (fspace->sect_cls[sect->type].debug)
+        if ((fspace->sect_cls[sect->type].debug)(sect, stream, indent, fwidth) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't dump section's debugging info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_sect_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sects_debug
  *
@@ -231,12 +205,12 @@ done:
  */
 herr_t
 H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int indent, int fwidth,
-    haddr_t fs_addr, haddr_t client_addr)
+                 haddr_t fs_addr, haddr_t client_addr)
 {
-    H5FS_t	*fspace = NULL;         /* Free space header info */
-    H5FS_client_t client;               /* The client of the free space */
-    H5FS_hdr_cache_ud_t cache_udata;    /* User-data for cache callback */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5FS_t *            fspace = NULL;       /* Free space header info */
+    H5FS_client_t       client;              /* The client of the free space */
+    H5FS_hdr_cache_ud_t cache_udata;         /* User-data for cache callback */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -252,17 +226,18 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, FILE *str
     HDassert(H5F_addr_defined(client_addr));
 
     /* Initialize user data for protecting the free space manager */
-    cache_udata.f = f;
-    cache_udata.nclasses = 0;
-    cache_udata.classes = NULL;
+    cache_udata.f              = f;
+    cache_udata.nclasses       = 0;
+    cache_udata.classes        = NULL;
     cache_udata.cls_init_udata = NULL;
-    cache_udata.addr = fs_addr;
+    cache_udata.addr           = fs_addr;
 
     /*
      * Load the free space header.
      */
-    if(NULL == (fspace = (H5FS_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
+    if (NULL ==
+        (fspace = (H5FS_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
 
     /* Retrieve the client id */
     client = fspace->client;
@@ -271,7 +246,7 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, FILE *str
     /* (set the "deleted" flag for the unprotect, so the cache entry is removed
      *  and reloaded later, with the correct client information -QAK)
      */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__DELETED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__DELETED_FLAG) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
     fspace = NULL;
 
@@ -281,15 +256,15 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, FILE *str
     /*
      * Print the values.
      */
-    switch(client) {
+    switch (client) {
         case H5FS_CLIENT_FHEAP_ID:
-            if(H5HF_sects_debug(f, dxpl_id, client_addr, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
+            if (H5HF_sects_debug(f, dxpl_id, client_addr, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_SYSTEM, FAIL, "unable to dump fractal heap free space sections")
             break;
 
         case H5FS_CLIENT_FILE_ID:
 #ifdef NOT_YET
-            if(H5MF_sects_debug(f, dxpl_id, fs_addr, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
+            if (H5MF_sects_debug(f, dxpl_id, fs_addr, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_SYSTEM, FAIL, "unable to dump file free space sections")
 #endif /* NOT_YET */
             break;
@@ -301,9 +276,8 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, FILE *str
     } /* end switch */
 
 done:
-    if(fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__NO_FLAGS_SET) < 0)
+    if (fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_sects_debug() */
-
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h
index 4f113d84..096a7ce 100644
--- a/src/H5FSpkg.h
+++ b/src/H5FSpkg.h
@@ -36,91 +36,90 @@
 /* #define H5FS_DEBUG_ASSERT */
 
 /* Get package's private header */
-#include "H5FSprivate.h"	/* File free space                      */
+#include "H5FSprivate.h" /* File free space                      */
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5SLprivate.h"	/* Skip lists				*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5SLprivate.h" /* Skip lists				*/
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
 /* Size of checksum information (on disk) */
-#define H5FS_SIZEOF_CHKSUM      4
+#define H5FS_SIZEOF_CHKSUM 4
 
 /* "Standard" size of prefix information for free space metadata */
-#define H5FS_METADATA_PREFIX_SIZE (                                           \
-    H5_SIZEOF_MAGIC   /* Signature */                                         \
-    + 1 /* Version */                                                         \
-    + H5FS_SIZEOF_CHKSUM /* Metadata checksum */                              \
+#define H5FS_METADATA_PREFIX_SIZE                                                                            \
+    (H5_SIZEOF_MAGIC      /* Signature */                                                                    \
+     + 1                  /* Version */                                                                      \
+     + H5FS_SIZEOF_CHKSUM /* Metadata checksum */                                                            \
     )
 
 /* Size of the fractal heap header on disk */
-#define H5FS_HEADER_SIZE(f) (                                                 \
-    /* General metadata fields */                                             \
-    H5FS_METADATA_PREFIX_SIZE                                                 \
-                                                                              \
-    /* Free space header specific fields */                                   \
-    + 1 /* Client ID */                                                       \
-    + H5F_SIZEOF_SIZE(f) /* Total free space tracked */                       \
-    + H5F_SIZEOF_SIZE(f) /* Total # of sections tracked */                    \
-    + H5F_SIZEOF_SIZE(f) /* # of serializable sections tracked */             \
-    + H5F_SIZEOF_SIZE(f) /* # of ghost sections tracked */                    \
-    + 2 /* Number of section classes */                                       \
-    + 2 /* Shrink percent */                                                  \
-    + 2 /* Expand percent */                                                  \
-    + 2 /* Size of address space for sections (log2 of value) */              \
-    + H5F_SIZEOF_SIZE(f) /* Max. size of section to track */                  \
-    + H5F_SIZEOF_ADDR(f) /* Address of serialized free space sections */      \
-    + H5F_SIZEOF_SIZE(f) /* Size of serialized free space sections used */    \
-    + H5F_SIZEOF_SIZE(f) /* Allocated size of serialized free space sections */ \
+#define H5FS_HEADER_SIZE(f)                                                                                  \
+    (/* General metadata fields */                                                                           \
+     H5FS_METADATA_PREFIX_SIZE                                                                               \
+                                                                                                             \
+     /* Free space header specific fields */                                                                 \
+     + 1                  /* Client ID */                                                                    \
+     + H5F_SIZEOF_SIZE(f) /* Total free space tracked */                                                     \
+     + H5F_SIZEOF_SIZE(f) /* Total # of sections tracked */                                                  \
+     + H5F_SIZEOF_SIZE(f) /* # of serializable sections tracked */                                           \
+     + H5F_SIZEOF_SIZE(f) /* # of ghost sections tracked */                                                  \
+     + 2                  /* Number of section classes */                                                    \
+     + 2                  /* Shrink percent */                                                               \
+     + 2                  /* Expand percent */                                                               \
+     + 2                  /* Size of address space for sections (log2 of value) */                           \
+     + H5F_SIZEOF_SIZE(f) /* Max. size of section to track */                                                \
+     + H5F_SIZEOF_ADDR(f) /* Address of serialized free space sections */                                    \
+     + H5F_SIZEOF_SIZE(f) /* Size of serialized free space sections used */                                  \
+     + H5F_SIZEOF_SIZE(f) /* Allocated size of serialized free space sections */                             \
     )
 
 /* Size of the free space serialized sections on disk */
-#define H5FS_SINFO_PREFIX_SIZE(f) (                                           \
-    /* General metadata fields */                                             \
-    H5FS_METADATA_PREFIX_SIZE                                                 \
-                                                                              \
-    /* Free space serialized sections specific fields */                      \
-    + H5F_SIZEOF_ADDR(f) /* Address of free space header for these sections */ \
+#define H5FS_SINFO_PREFIX_SIZE(f)                                                                            \
+    (/* General metadata fields */                                                                           \
+     H5FS_METADATA_PREFIX_SIZE                                                                               \
+                                                                                                             \
+     /* Free space serialized sections specific fields */                                                    \
+     + H5F_SIZEOF_ADDR(f) /* Address of free space header for these sections */                              \
     )
 
-
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
 /* Callback info for loading a free space header into the cache */
 typedef struct H5FS_hdr_cache_ud_t {
-    H5F_t *f;                  /* File that free space header is within */
-    size_t nclasses;                            /* Number of section classes */
-    const H5FS_section_class_t **classes;       /* Array of section class info */
-    void *cls_init_udata;                       /* Pointer to class init user data */
-    haddr_t addr;              /* Address of header */
+    H5F_t *                      f;              /* File that free space header is within */
+    size_t                       nclasses;       /* Number of section classes */
+    const H5FS_section_class_t **classes;        /* Array of section class info */
+    void *                       cls_init_udata; /* Pointer to class init user data */
+    haddr_t                      addr;           /* Address of header */
 } H5FS_hdr_cache_ud_t;
 
 /* Callback info for loading free space section info into the cache */
 typedef struct H5FS_sinfo_cache_ud_t {
-    H5F_t *f;                  /* File that free space section info is within */
-    H5FS_t *fspace;            /* free space manager */
-    hid_t dxpl_id;
+    H5F_t * f;      /* File that free space section info is within */
+    H5FS_t *fspace; /* free space manager */
+    hid_t   dxpl_id;
 } H5FS_sinfo_cache_ud_t;
 
 /* Free space section bin info */
 typedef struct H5FS_bin_t {
-    size_t tot_sect_count;      /* Total # of sections in this bin */
-    size_t serial_sect_count;   /* # of serializable sections in this bin */
-    size_t ghost_sect_count;    /* # of un-serializable sections in this bin */
-    H5SL_t *bin_list;           /* Skip list of differently sized sections */
+    size_t  tot_sect_count;    /* Total # of sections in this bin */
+    size_t  serial_sect_count; /* # of serializable sections in this bin */
+    size_t  ghost_sect_count;  /* # of un-serializable sections in this bin */
+    H5SL_t *bin_list;          /* Skip list of differently sized sections */
 } H5FS_bin_t;
 
 /* Free space node for free space sections of the same size */
 typedef struct H5FS_node_t {
-    hsize_t sect_size;          /* Size of all sections on list */
-    size_t serial_count;        /* # of serializable sections on list */
-    size_t ghost_count;         /* # of un-serializable sections on list */
-    H5SL_t *sect_list;          /* Skip list to hold pointers to actual free list section node */
+    hsize_t sect_size;    /* Size of all sections on list */
+    size_t  serial_count; /* # of serializable sections on list */
+    size_t  ghost_count;  /* # of un-serializable sections on list */
+    H5SL_t *sect_list;    /* Skip list to hold pointers to actual free list section node */
 } H5FS_node_t;
 
 /* Free space section info */
@@ -128,23 +127,23 @@ typedef struct H5FS_sinfo_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
     H5AC_info_t cache_info;
 
-/* Stored information */
-    H5FS_bin_t *bins;           /* Array of lists of lists of free sections   */
+    /* Stored information */
+    H5FS_bin_t *bins; /* Array of lists of lists of free sections   */
 
-/* Computed/cached values */
-    hbool_t dirty;              /* Whether this info in memory is out of sync w/info in file */
+    /* Computed/cached values */
+    hbool_t  dirty;             /* Whether this info in memory is out of sync w/info in file */
     unsigned nbins;             /* Number of bins                             */
-    size_t serial_size;         /* Total size of all serializable sections    */
-    size_t tot_size_count;      /* Total number of differently sized sections */
-    size_t serial_size_count;   /* Total number of differently sized serializable sections */
-    size_t ghost_size_count;    /* Total number of differently sized un-serializable sections */
+    size_t   serial_size;       /* Total size of all serializable sections    */
+    size_t   tot_size_count;    /* Total number of differently sized sections */
+    size_t   serial_size_count; /* Total number of differently sized serializable sections */
+    size_t   ghost_size_count;  /* Total number of differently sized un-serializable sections */
     unsigned sect_prefix_size;  /* Size of the section serialization prefix (in bytes) */
     unsigned sect_off_size;     /* Size of a section offset (in bytes)        */
     unsigned sect_len_size;     /* Size of a section length (in bytes)        */
-    H5FS_t *fspace;             /* Pointer to free space manager that owns sections */
+    H5FS_t * fspace;            /* Pointer to free space manager that owns sections */
 
-/* Memory data structures (not stored directly) */
-    H5SL_t *merge_list;         /* Skip list to hold sections for detecting merges */
+    /* Memory data structures (not stored directly) */
+    H5SL_t *merge_list; /* Skip list to hold sections for detecting merges */
 } H5FS_sinfo_t;
 
 /* Free space header info */
@@ -152,45 +151,43 @@ struct H5FS_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
     H5AC_info_t cache_info;
 
-/* Stored information */
+    /* Stored information */
     /* Statistics about sections managed */
-    hsize_t tot_space;          /* Total amount of space tracked              */
-    hsize_t tot_sect_count;     /* Total # of sections tracked                */
-    hsize_t serial_sect_count;  /* # of serializable sections tracked         */
-    hsize_t ghost_sect_count;   /* # of un-serializable sections tracked      */
+    hsize_t tot_space;         /* Total amount of space tracked              */
+    hsize_t tot_sect_count;    /* Total # of sections tracked                */
+    hsize_t serial_sect_count; /* # of serializable sections tracked         */
+    hsize_t ghost_sect_count;  /* # of un-serializable sections tracked      */
 
     /* Creation parameters */
-    H5FS_client_t client;       /* Type of user of this free space manager    */
-    unsigned nclasses;          /* Number of section classes handled          */
-    unsigned shrink_percent;    /* Percent of "normal" serialized size to shrink serialized space at */
-    unsigned expand_percent;    /* Percent of "normal" serialized size to expand serialized space at */
-    unsigned max_sect_addr;     /* Size of address space free sections are within (log2 of actual value) */
-    hsize_t max_sect_size;      /* Maximum size of section to track */
+    H5FS_client_t client;         /* Type of user of this free space manager    */
+    unsigned      nclasses;       /* Number of section classes handled          */
+    unsigned      shrink_percent; /* Percent of "normal" serialized size to shrink serialized space at */
+    unsigned      expand_percent; /* Percent of "normal" serialized size to expand serialized space at */
+    unsigned      max_sect_addr;  /* Size of address space free sections are within (log2 of actual value) */
+    hsize_t       max_sect_size;  /* Maximum size of section to track */
 
     /* Serialized section information */
-    haddr_t sect_addr;          /* Address of the section info in the file    */
-    hsize_t sect_size;          /* Size of the section info in the file       */
-    hsize_t alloc_sect_size;    /* Allocated size of the section info in the file */
-
-/* Computed/cached values */
-    unsigned rc;                /* Count of outstanding references to struct  */
-    haddr_t addr;               /* Address of free space header on disk       */
-    size_t hdr_size;            /* Size of free space header on disk          */
-    H5FS_sinfo_t *sinfo;        /* Section information                        */
-    unsigned sinfo_lock_count;  /* # of times the section info has been locked */
-    hbool_t sinfo_protected;    /* Whether the section info was protected when locked */
-    hbool_t sinfo_modified;     /* Whether the section info has been modified while locked */
-    H5AC_protect_t sinfo_accmode; /* Access mode for protecting the section info */
-    size_t max_cls_serial_size; /* Max. additional size of serialized form of section */
-    hsize_t    threshold;      	/* Threshold for alignment              */
-    hsize_t    alignment;      	/* Alignment                            */
-
-
-/* Memory data structures (not stored directly) */
+    haddr_t sect_addr;       /* Address of the section info in the file    */
+    hsize_t sect_size;       /* Size of the section info in the file       */
+    hsize_t alloc_sect_size; /* Allocated size of the section info in the file */
+
+    /* Computed/cached values */
+    unsigned       rc;                  /* Count of outstanding references to struct  */
+    haddr_t        addr;                /* Address of free space header on disk       */
+    size_t         hdr_size;            /* Size of free space header on disk          */
+    H5FS_sinfo_t * sinfo;               /* Section information                        */
+    unsigned       sinfo_lock_count;    /* # of times the section info has been locked */
+    hbool_t        sinfo_protected;     /* Whether the section info was protected when locked */
+    hbool_t        sinfo_modified;      /* Whether the section info has been modified while locked */
+    H5AC_protect_t sinfo_accmode;       /* Access mode for protecting the section info */
+    size_t         max_cls_serial_size; /* Max. additional size of serialized form of section */
+    hsize_t        threshold;           /* Threshold for alignment              */
+    hsize_t        alignment;           /* Alignment                            */
+
+    /* Memory data structures (not stored directly) */
     H5FS_section_class_t *sect_cls; /* Array of section classes for this free list */
 };
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -213,17 +210,16 @@ H5FL_EXTERN(H5FS_sinfo_t);
 /* Declare a free list to manage the H5FS_t struct */
 H5FL_EXTERN(H5FS_t);
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 
 /* Free space manager header routines */
-H5_DLL H5FS_t *H5FS_new(const H5F_t *f, size_t nclasses,
-    const H5FS_section_class_t *classes[], void *cls_init_udata);
-H5_DLL herr_t H5FS_incr(H5FS_t *fspace);
-H5_DLL herr_t H5FS_decr(H5FS_t *fspace);
-H5_DLL herr_t H5FS_dirty(H5FS_t *fspace);
+H5_DLL H5FS_t *H5FS_new(const H5F_t *f, size_t nclasses, const H5FS_section_class_t *classes[],
+                        void *cls_init_udata);
+H5_DLL herr_t  H5FS_incr(H5FS_t *fspace);
+H5_DLL herr_t  H5FS_decr(H5FS_t *fspace);
+H5_DLL herr_t  H5FS_dirty(H5FS_t *fspace);
 
 /* Free space section routines */
 H5_DLL H5FS_sinfo_t *H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace);
@@ -241,8 +237,7 @@ H5_DLL herr_t H5FS_sect_assert(const H5FS_t *fspace);
 /* Testing routines */
 #ifdef H5FS_TESTING
 H5_DLL herr_t H5FS_get_cparam_test(const H5FS_t *fh, H5FS_create_t *cparam);
-H5_DLL int H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2);
+H5_DLL int    H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2);
 #endif /* H5FS_TESTING */
 
 #endif /* _H5FSpkg_H */
-
diff --git a/src/H5FSprivate.h b/src/H5FSprivate.h
index 30c8173..e7e058f 100644
--- a/src/H5FSprivate.h
+++ b/src/H5FSprivate.h
@@ -29,49 +29,56 @@
 #include "H5FSpublic.h"
 
 /* Private headers needed by this file */
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5FLprivate.h" /* Free Lists                           */
 
 /**************************/
 /* Library Private Macros */
 /**************************/
 
 /* Flags for H5FS_section_class_t 'flags' field */
-#define H5FS_CLS_GHOST_OBJ      0x01    /* Objects in this class shouldn't be
-                                         *      serialized to the file.
-                                         */
-#define H5FS_CLS_SEPAR_OBJ      0x02    /* Objects in this class shouldn't
-                                         *      participate in merge operations.
-                                         */
-#define H5FS_CLS_MERGE_SYM      0x04    /* Objects in this class only merge
-                                         *      with other objects in this class.
-                                         */
-#define H5FS_CLS_ADJUST_OK      0x08    /* Objects in this class can be merged
-                                         *      without requiring a can_adjust/adjust
-                                         *      callback pair.
-                                         */
+#define H5FS_CLS_GHOST_OBJ                                                                                   \
+    0x01 /* Objects in this class shouldn't be                                                               \
+          *      serialized to the file.                                                                     \
+          */
+#define H5FS_CLS_SEPAR_OBJ                                                                                   \
+    0x02 /* Objects in this class shouldn't                                                                  \
+          *      participate in merge operations.                                                            \
+          */
+#define H5FS_CLS_MERGE_SYM                                                                                   \
+    0x04 /* Objects in this class only merge                                                                 \
+          *      with other objects in this class.                                                           \
+          */
+#define H5FS_CLS_ADJUST_OK                                                                                   \
+    0x08 /* Objects in this class can be merged                                                              \
+          *      without requiring a can_adjust/adjust                                                       \
+          *      callback pair.                                                                              \
+          */
 
 /* Flags for H5FS_add() */
-#define H5FS_ADD_DESERIALIZING  0x01    /* Free space is being deserialized
-                                         */
-#define H5FS_ADD_RETURNED_SPACE 0x02    /* Section was previously allocated
-                                         *      and is being returned to the
-                                         *      free space manager (usually
-                                         *      as a result of freeing an
-                                         *      object)
-                                         */
-#define H5FS_ADD_SKIP_VALID     0x04    /* Don't check validity after adding
-                                         *      this section.  (state of the
-                                         *      managed sections is in flux)
-                                         */
+#define H5FS_ADD_DESERIALIZING                                                                               \
+    0x01 /* Free space is being deserialized                                                                 \
+          */
+#define H5FS_ADD_RETURNED_SPACE                                                                              \
+    0x02 /* Section was previously allocated                                                                 \
+          *      and is being returned to the                                                                \
+          *      free space manager (usually                                                                 \
+          *      as a result of freeing an                                                                   \
+          *      object)                                                                                     \
+          */
+#define H5FS_ADD_SKIP_VALID                                                                                  \
+    0x04 /* Don't check validity after adding                                                                \
+          *      this section.  (state of the                                                                \
+          *      managed sections is in flux)                                                                \
+          */
 
 /* Flags for deserialize callback  */
-#define H5FS_DESERIALIZE_NO_ADD  0x01   /* Don't add section to free space
-                                         *      manager after it's deserialized
-                                         *      (its only here for it's side-
-                                         *      effects).
-                                         */
-
+#define H5FS_DESERIALIZE_NO_ADD                                                                              \
+    0x01 /* Don't add section to free space                                                                  \
+          *      manager after it's deserialized                                                             \
+          *      (its only here for it's side-                                                               \
+          *      effects).                                                                                   \
+          */
 
 /****************************/
 /* Library Private Typedefs */
@@ -86,76 +93,83 @@ typedef struct H5FS_section_info_t H5FS_section_info_t;
 /* Free space section class info */
 typedef struct H5FS_section_class_t {
     /* Class variables */
-    const unsigned type;                /* Type of free space section */
-    size_t serial_size;                 /* Size of serialized form of section */
-    unsigned flags;                     /* Class flags */
-    void *cls_private;                  /* Class private information */
+    const unsigned type;        /* Type of free space section */
+    size_t         serial_size; /* Size of serialized form of section */
+    unsigned       flags;       /* Class flags */
+    void *         cls_private; /* Class private information */
 
     /* Class methods */
-    herr_t (*init_cls)(struct H5FS_section_class_t *, void *);          /* Routine to initialize class-specific settings */
-    herr_t (*term_cls)(struct H5FS_section_class_t *);                  /* Routine to terminate class-specific settings */
+    herr_t (*init_cls)(struct H5FS_section_class_t *,
+                       void *);                        /* Routine to initialize class-specific settings */
+    herr_t (*term_cls)(struct H5FS_section_class_t *); /* Routine to terminate class-specific settings */
 
     /* Object methods */
-    herr_t (*add)(H5FS_section_info_t *, unsigned *, void *);       /* Routine called when section is about to be added to manager */
-    herr_t (*serialize)(const struct H5FS_section_class_t *, const H5FS_section_info_t *, uint8_t *);        /* Routine to serialize a "live" section into a buffer */
-    H5FS_section_info_t *(*deserialize)(const struct H5FS_section_class_t *, hid_t dxpl_id, const uint8_t *, haddr_t, hsize_t, unsigned *);     /* Routine to deserialize a buffer into a "live" section */
-    htri_t (*can_merge)(const H5FS_section_info_t *, const H5FS_section_info_t *, void *);  /* Routine to determine if two nodes are mergable */
-    herr_t (*merge)(H5FS_section_info_t *, H5FS_section_info_t *, void *);      /* Routine to merge two nodes */
-    htri_t (*can_shrink)(const H5FS_section_info_t *, void *);        /* Routine to determine if node can shrink container */
-    herr_t (*shrink)(H5FS_section_info_t **, void *);   /* Routine to shrink container */
-    herr_t (*free)(H5FS_section_info_t *);              /* Routine to free node */
-    herr_t (*valid)(const struct H5FS_section_class_t *, const H5FS_section_info_t *);   /* Routine to check if a section is valid */
-    H5FS_section_info_t *(*split)(H5FS_section_info_t *, hsize_t);     /* Routine to create the split section */
-    herr_t (*debug)(const H5FS_section_info_t *, FILE *, int , int );   /* Routine to dump debugging information about a section */
+    herr_t (*add)(H5FS_section_info_t *, unsigned *,
+                  void *); /* Routine called when section is about to be added to manager */
+    herr_t (*serialize)(const struct H5FS_section_class_t *, const H5FS_section_info_t *,
+                        uint8_t *); /* Routine to serialize a "live" section into a buffer */
+    H5FS_section_info_t *(*deserialize)(
+        const struct H5FS_section_class_t *, hid_t dxpl_id, const uint8_t *, haddr_t, hsize_t,
+        unsigned *); /* Routine to deserialize a buffer into a "live" section */
+    htri_t (*can_merge)(const H5FS_section_info_t *, const H5FS_section_info_t *,
+                        void *); /* Routine to determine if two nodes are mergable */
+    herr_t (*merge)(H5FS_section_info_t *, H5FS_section_info_t *, void *); /* Routine to merge two nodes */
+    htri_t (*can_shrink)(const H5FS_section_info_t *,
+                         void *);                     /* Routine to determine if node can shrink container */
+    herr_t (*shrink)(H5FS_section_info_t **, void *); /* Routine to shrink container */
+    herr_t (*free)(H5FS_section_info_t *);            /* Routine to free node */
+    herr_t (*valid)(const struct H5FS_section_class_t *,
+                    const H5FS_section_info_t *); /* Routine to check if a section is valid */
+    H5FS_section_info_t *(*split)(H5FS_section_info_t *, hsize_t); /* Routine to create the split section */
+    herr_t (*debug)(const H5FS_section_info_t *, FILE *, int,
+                    int); /* Routine to dump debugging information about a section */
 } H5FS_section_class_t;
 
 /* State of section ("live" or "serialized") */
 typedef enum H5FS_section_state_t {
-    H5FS_SECT_LIVE,             /* Section has "live" memory references */
-    H5FS_SECT_SERIALIZED        /* Section is in "serialized" form */
+    H5FS_SECT_LIVE,      /* Section has "live" memory references */
+    H5FS_SECT_SERIALIZED /* Section is in "serialized" form */
 } H5FS_section_state_t;
 
 /* Free space section info */
 struct H5FS_section_info_t {
-    haddr_t     addr;                   /* Offset of free space section in the address space */
-    hsize_t     size;                   /* Size of free space section */
-    unsigned    type;                   /* Type of free space section (i.e. class) */
-    H5FS_section_state_t state;         /* Whether the section is in "serialized" or "live" form */
+    haddr_t              addr;  /* Offset of free space section in the address space */
+    hsize_t              size;  /* Size of free space section */
+    unsigned             type;  /* Type of free space section (i.e. class) */
+    H5FS_section_state_t state; /* Whether the section is in "serialized" or "live" form */
 };
 
 /* Free space client IDs for identifying user of free space */
 typedef enum H5FS_client_t {
-    H5FS_CLIENT_FHEAP_ID = 0,	/* Free space is used by fractal heap */
-    H5FS_CLIENT_FILE_ID,	/* Free space is used by file */
-    H5FS_NUM_CLIENT_ID          /* Number of free space client IDs (must be last)   */
+    H5FS_CLIENT_FHEAP_ID = 0, /* Free space is used by fractal heap */
+    H5FS_CLIENT_FILE_ID,      /* Free space is used by file */
+    H5FS_NUM_CLIENT_ID        /* Number of free space client IDs (must be last)   */
 } H5FS_client_t;
 
 /* Free space creation parameters */
 typedef struct H5FS_create_t {
-    H5FS_client_t client;               /* Client's ID */
-    unsigned shrink_percent;            /* Percent of "normal" serialized size to shrink serialized space at */
-    unsigned expand_percent;            /* Percent of "normal" serialized size to expand serialized space at */
-    unsigned max_sect_addr;             /* Size of address space free sections are within (log2 of actual value) */
-    hsize_t max_sect_size;              /* Maximum size of section to track */
+    H5FS_client_t client;         /* Client's ID */
+    unsigned      shrink_percent; /* Percent of "normal" serialized size to shrink serialized space at */
+    unsigned      expand_percent; /* Percent of "normal" serialized size to expand serialized space at */
+    unsigned      max_sect_addr;  /* Size of address space free sections are within (log2 of actual value) */
+    hsize_t       max_sect_size;  /* Maximum size of section to track */
 } H5FS_create_t;
 
 /* Free space statistics info */
 typedef struct H5FS_stat_t {
-    hsize_t tot_space;          /* Total amount of space tracked              */
-    hsize_t tot_sect_count;     /* Total # of sections tracked                */
-    hsize_t serial_sect_count;  /* # of serializable sections tracked         */
-    hsize_t ghost_sect_count;   /* # of un-serializable sections tracked      */
-    haddr_t addr;		/* Address of free space header on disk       */
-    hsize_t hdr_size;		/* Size of the free-space header on disk      */
-    haddr_t sect_addr;          /* Address of the section info in the file    */
-    hsize_t alloc_sect_size;    /* Allocated size of the section info in the file */
-    hsize_t sect_size;    	/* Size of the section info in the file       */
+    hsize_t tot_space;         /* Total amount of space tracked              */
+    hsize_t tot_sect_count;    /* Total # of sections tracked                */
+    hsize_t serial_sect_count; /* # of serializable sections tracked         */
+    hsize_t ghost_sect_count;  /* # of un-serializable sections tracked      */
+    haddr_t addr;              /* Address of free space header on disk       */
+    hsize_t hdr_size;          /* Size of the free-space header on disk      */
+    haddr_t sect_addr;         /* Address of the section info in the file    */
+    hsize_t alloc_sect_size;   /* Allocated size of the section info in the file */
+    hsize_t sect_size;         /* Size of the section info in the file       */
 } H5FS_stat_t;
 
 /* Typedef for iteration operations */
-typedef herr_t (*H5FS_operator_t)(H5FS_section_info_t *sect,
-        void *operator_data/*in,out*/);
-
+typedef herr_t (*H5FS_operator_t)(H5FS_section_info_t *sect, void *operator_data /*in,out*/);
 
 /*****************************/
 /* Library-private Variables */
@@ -164,35 +178,33 @@ typedef herr_t (*H5FS_operator_t)(H5FS_section_info_t *sect,
 /* Declare a free list to manage the H5FS_section_class_t sequence information */
 H5FL_SEQ_EXTERN(H5FS_section_class_t);
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
 
 /* Free space manager routines */
-H5_DLL H5FS_t *H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr,
-    const H5FS_create_t *fs_create, size_t nclasses,
-    const H5FS_section_class_t *classes[], void *cls_init_udata, hsize_t alignment, hsize_t threshold);
-H5_DLL H5FS_t *H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr,
-    size_t nclasses, const H5FS_section_class_t *classes[], void *cls_init_udata, hsize_t alignment, hsize_t threshold);
-H5_DLL herr_t H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size);
-H5_DLL herr_t H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr);
-H5_DLL herr_t H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace);
+H5_DLL H5FS_t *H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr, const H5FS_create_t *fs_create,
+                           size_t nclasses, const H5FS_section_class_t *classes[], void *cls_init_udata,
+                           hsize_t alignment, hsize_t threshold);
+H5_DLL H5FS_t *H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, size_t nclasses,
+                         const H5FS_section_class_t *classes[], void *cls_init_udata, hsize_t alignment,
+                         hsize_t threshold);
+H5_DLL herr_t  H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size);
+H5_DLL herr_t  H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr);
+H5_DLL herr_t  H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace);
 
 /* Free space section routines */
-H5_DLL herr_t H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t *node, unsigned flags, void *op_data);
-H5_DLL htri_t H5FS_sect_try_extend(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    haddr_t addr, hsize_t size, hsize_t extra_requested);
-H5_DLL herr_t H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t *node);
-H5_DLL htri_t H5FS_sect_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    hsize_t request, H5FS_section_info_t **node);
+H5_DLL herr_t H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *node,
+                            unsigned flags, void *op_data);
+H5_DLL htri_t H5FS_sect_try_extend(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, haddr_t addr, hsize_t size,
+                                   hsize_t extra_requested);
+H5_DLL herr_t H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *node);
+H5_DLL htri_t H5FS_sect_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hsize_t request,
+                             H5FS_section_info_t **node);
 H5_DLL herr_t H5FS_sect_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, void *op_data);
-H5_DLL herr_t H5FS_sect_stats(const H5FS_t *fspace, hsize_t *tot_space,
-    hsize_t *nsects);
-H5_DLL herr_t H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t *sect, unsigned new_class);
+H5_DLL herr_t H5FS_sect_stats(const H5FS_t *fspace, hsize_t *tot_space, hsize_t *nsects);
+H5_DLL herr_t H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect,
+                                     unsigned new_class);
 H5_DLL htri_t H5FS_sect_try_shrink_eoa(const H5F_t *f, hid_t dxpl_id, const H5FS_t *fspace, void *op_data);
 H5_DLL herr_t H5FS_sect_query_last_sect(const H5FS_t *fspace, haddr_t *sect_addr, hsize_t *sect_size);
 
@@ -200,12 +212,10 @@ H5_DLL herr_t H5FS_sect_query_last_sect(const H5FS_t *fspace, haddr_t *sect_addr
 H5_DLL herr_t H5FS_stat_info(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *stats);
 
 /* Debugging routines for dumping file structures */
-H5_DLL herr_t H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth);
-H5_DLL herr_t H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth, haddr_t fs_addr, haddr_t client_addr);
-H5_DLL herr_t H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect,
-    FILE *stream, int indent, int fwidth);
+H5_DLL herr_t H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
+H5_DLL herr_t H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                               haddr_t fs_addr, haddr_t client_addr);
+H5_DLL herr_t H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect, FILE *stream, int indent,
+                              int fwidth);
 
 #endif /* _H5FSprivate_H */
-
diff --git a/src/H5FSpublic.h b/src/H5FSpublic.h
index a2f69ae..e2b744a 100644
--- a/src/H5FSpublic.h
+++ b/src/H5FSpublic.h
@@ -49,4 +49,3 @@ extern "C" {
 #endif
 
 #endif /* _H5FSpublic_H */
-
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index 432a36d..59be78c 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -23,66 +23,57 @@
 /* Module Setup */
 /****************/
 
-#define H5FS_PACKAGE		/*suppress error about including H5FSpkg  */
-
+#define H5FS_PACKAGE /*suppress error about including H5FSpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FSpkg.h"		/* File free space			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FSpkg.h"     /* File free space			*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for skip list iterator callback for iterating over section size nodes */
 typedef struct {
-    H5FS_t *fspace;             /* Free space manager info */
-    H5FS_operator_t op;         /* Operator for the iteration */
-    void *op_data;              /* Information to pass to the operator */
+    H5FS_t *        fspace;  /* Free space manager info */
+    H5FS_operator_t op;      /* Operator for the iteration */
+    void *          op_data; /* Information to pass to the operator */
 } H5FS_iter_ud_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    unsigned flags);
+static herr_t H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls, unsigned flags);
 static herr_t H5FS_sect_decrease(H5FS_t *fspace, const H5FS_section_class_t *cls);
 static herr_t H5FS_size_node_decr(H5FS_sinfo_t *sinfo, unsigned bin, H5FS_node_t *fspace_node,
-    const H5FS_section_class_t *cls);
+                                  const H5FS_section_class_t *cls);
 static herr_t H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect);
-static herr_t H5FS_sect_unlink_rest(H5FS_t *fspace,
-    const H5FS_section_class_t *cls, H5FS_section_info_t *sect);
+                                    H5FS_section_info_t *sect);
+static herr_t H5FS_sect_unlink_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
+                                    H5FS_section_info_t *sect);
 static herr_t H5FS_sect_remove_real(H5FS_t *fspace, H5FS_section_info_t *sect);
 static herr_t H5FS_sect_link_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect);
-static herr_t H5FS_sect_link_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect, unsigned flags);
-static herr_t H5FS_sect_link(H5FS_t *fspace, H5FS_section_info_t *sect,
-    unsigned flags);
-static herr_t H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect,
-    void *op_data);
+                                  H5FS_section_info_t *sect);
+static herr_t H5FS_sect_link_rest(H5FS_t *fspace, const H5FS_section_class_t *cls, H5FS_section_info_t *sect,
+                                  unsigned flags);
+static herr_t H5FS_sect_link(H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flags);
+static herr_t H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data);
 static htri_t H5FS_sect_find_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node);
 static herr_t H5FS_sect_serialize_size(H5FS_t *fspace);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -96,18 +87,14 @@ H5FL_SEQ_DEFINE(H5FS_bin_t);
 /* Declare a free list to manage the H5FS_sinfo_t struct */
 H5FL_DEFINE(H5FS_sinfo_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sinfo_new
  *
@@ -133,31 +120,33 @@ H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace)
     HDassert(f);
     HDassert(fspace);
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: fspace->addr = %a\n", FUNC, fspace->addr);
+    HDfprintf(stderr, "%s: fspace->addr = %a\n", FUNC, fspace->addr);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Allocate the free space header */
-    if(NULL == (sinfo = H5FL_CALLOC(H5FS_sinfo_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (sinfo = H5FL_CALLOC(H5FS_sinfo_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set non-zero values */
-    sinfo->nbins = H5VM_log2_gen(fspace->max_sect_size);
+    sinfo->nbins            = H5VM_log2_gen(fspace->max_sect_size);
     sinfo->sect_prefix_size = (size_t)H5FS_SINFO_PREFIX_SIZE(f);
-    sinfo->sect_off_size = (fspace->max_sect_addr + 7) / 8;
-    sinfo->sect_len_size = H5VM_limit_enc_size((uint64_t)fspace->max_sect_size);
+    sinfo->sect_off_size    = (fspace->max_sect_addr + 7) / 8;
+    sinfo->sect_len_size    = H5VM_limit_enc_size((uint64_t)fspace->max_sect_size);
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: fspace->max_sect_size = %Hu\n", FUNC, fspace->max_sect_size);
-HDfprintf(stderr, "%s: fspace->max_sect_addr = %u\n", FUNC, fspace->max_sect_addr);
-HDfprintf(stderr, "%s: sinfo->nbins = %u\n", FUNC, sinfo->nbins);
-HDfprintf(stderr, "%s: sinfo->sect_off_size = %u, sinfo->sect_len_size = %u\n", FUNC, sinfo->sect_off_size, sinfo->sect_len_size);
+    HDfprintf(stderr, "%s: fspace->max_sect_size = %Hu\n", FUNC, fspace->max_sect_size);
+    HDfprintf(stderr, "%s: fspace->max_sect_addr = %u\n", FUNC, fspace->max_sect_addr);
+    HDfprintf(stderr, "%s: sinfo->nbins = %u\n", FUNC, sinfo->nbins);
+    HDfprintf(stderr, "%s: sinfo->sect_off_size = %u, sinfo->sect_len_size = %u\n", FUNC,
+              sinfo->sect_off_size, sinfo->sect_len_size);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Allocate space for the section size bins */
-    if(NULL == (sinfo->bins = H5FL_SEQ_CALLOC(H5FS_bin_t, (size_t)sinfo->nbins)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space section bin array")
+    if (NULL == (sinfo->bins = H5FL_SEQ_CALLOC(H5FS_bin_t, (size_t)sinfo->nbins)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for free space section bin array")
 
     /* Increment the reference count on the free space manager header */
-    if(H5FS_incr(fspace) < 0)
+    if (H5FS_incr(fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTINC, NULL, "unable to increment ref. count on free space header")
     sinfo->fspace = fspace;
 
@@ -170,9 +159,9 @@ HDfprintf(stderr, "%s: sinfo->sect_off_size = %u, sinfo->sect_len_size = %u\n",
     ret_value = sinfo;
 
 done:
-    if(ret_value == NULL && sinfo) {
+    if (ret_value == NULL && sinfo) {
         /* Release bins for skip lists */
-        if(sinfo->bins)
+        if (sinfo->bins)
             sinfo->bins = H5FL_SEQ_FREE(H5FS_bin_t, sinfo->bins);
 
         /* Release free space section info */
@@ -182,7 +171,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sinfo_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sinfo_lock
  *
@@ -204,13 +192,15 @@ done:
 static herr_t
 H5FS_sinfo_lock(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5AC_protect_t accmode)
 {
-    H5FS_sinfo_cache_ud_t cache_udata; /* User-data for cache callback */
-    herr_t ret_value = SUCCEED;    /* Return value */
+    H5FS_sinfo_cache_ud_t cache_udata;         /* User-data for cache callback */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Called, fspace->addr = %a, fspace->sinfo = %p, fspace->sect_addr = %a\n", FUNC, fspace->addr, fspace->sinfo, fspace->sect_addr);
-HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC, fspace->alloc_sect_size, fspace->sect_size);
+    HDfprintf(stderr, "%s: Called, fspace->addr = %a, fspace->sinfo = %p, fspace->sect_addr = %a\n", FUNC,
+              fspace->addr, fspace->sinfo, fspace->sect_addr);
+    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC,
+              fspace->alloc_sect_size, fspace->sect_size);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Check arguments. */
@@ -220,51 +210,56 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
     /* If the free space header doesn't already "own" the section info, load
      *  section info or create it
      */
-    if(fspace->sinfo) {
+    if (fspace->sinfo) {
         /* Check if the section info was protected & we want a different access mode */
-        if(fspace->sinfo_protected && accmode != fspace->sinfo_accmode) {
+        if (fspace->sinfo_protected && accmode != fspace->sinfo_accmode) {
             /* Check if we need to switch from read-only access to read-write */
-            if(H5AC_WRITE == accmode) {
+            if (H5AC_WRITE == accmode) {
                 /* Unprotect the read-only section info */
-                if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, fspace->sinfo, H5AC__NO_FLAGS_SET) < 0)
-                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, FAIL, "unable to release free space section info")
+                if (H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, fspace->sinfo,
+                                   H5AC__NO_FLAGS_SET) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, FAIL,
+                                "unable to release free space section info")
 
                 /* Re-protect the section info with read-write access */
-                cache_udata.f = f;
+                cache_udata.f       = f;
                 cache_udata.dxpl_id = dxpl_id;
-                cache_udata.fspace = fspace;
-                if(NULL == (fspace->sinfo = (H5FS_sinfo_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, &cache_udata, H5AC_WRITE)))
+                cache_udata.fspace  = fspace;
+                if (NULL == (fspace->sinfo = (H5FS_sinfo_t *)H5AC_protect(
+                                 f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, &cache_udata, H5AC_WRITE)))
                     HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, FAIL, "unable to load free space sections")
 
                 /* Switch the access mode we have */
                 fspace->sinfo_accmode = H5AC_WRITE;
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
     else {
         /* If the section address is defined, load it from the file */
-        if(H5F_addr_defined(fspace->sect_addr)) {
+        if (H5F_addr_defined(fspace->sect_addr)) {
             /* Sanity check */
             HDassert(fspace->sinfo_protected == FALSE);
             HDassert(H5F_addr_defined(fspace->addr));
 
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Reading in existing sections, fspace->sect_addr = %a\n", FUNC, fspace->sect_addr);
+            HDfprintf(stderr, "%s: Reading in existing sections, fspace->sect_addr = %a\n", FUNC,
+                      fspace->sect_addr);
 #endif /* H5FS_SINFO_DEBUG */
             /* Protect the free space sections */
-            cache_udata.f = f;
+            cache_udata.f       = f;
             cache_udata.dxpl_id = dxpl_id;
-            cache_udata.fspace = fspace;
-            if(NULL == (fspace->sinfo = (H5FS_sinfo_t *)H5AC_protect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, &cache_udata, accmode)))
+            cache_udata.fspace  = fspace;
+            if (NULL == (fspace->sinfo = (H5FS_sinfo_t *)H5AC_protect(
+                             f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, &cache_udata, accmode)))
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, FAIL, "unable to load free space sections")
 
             /* Remember that we protected the section info & the access mode */
             fspace->sinfo_protected = TRUE;
-            fspace->sinfo_accmode = accmode;
+            fspace->sinfo_accmode   = accmode;
         } /* end if */
         else {
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Creating new section info\n", FUNC);
+            HDfprintf(stderr, "%s: Creating new section info\n", FUNC);
 #endif /* H5FS_SINFO_DEBUG */
             /* Sanity check */
             HDassert(fspace->tot_sect_count == 0);
@@ -272,13 +267,13 @@ HDfprintf(stderr, "%s: Creating new section info\n", FUNC);
             HDassert(fspace->ghost_sect_count == 0);
 
             /* Allocate and initialize free space section info */
-            if(NULL == (fspace->sinfo = H5FS_sinfo_new(f, fspace)))
+            if (NULL == (fspace->sinfo = H5FS_sinfo_new(f, fspace)))
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create section info")
 
             /* Set initial size of section info to 0 */
             fspace->sect_size = fspace->alloc_sect_size = 0;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     HDassert(fspace->rc == 2);
 
     /* Increment the section info lock count */
@@ -286,13 +281,14 @@ HDfprintf(stderr, "%s: Creating new section info\n", FUNC);
 
 done:
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Leaving, fspace->addr = %a, fspace->sinfo = %p, fspace->sect_addr = %a\n", FUNC, fspace->addr, fspace->sinfo, fspace->sect_addr);
-HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC, fspace->alloc_sect_size, fspace->sect_size);
+    HDfprintf(stderr, "%s: Leaving, fspace->addr = %a, fspace->sinfo = %p, fspace->sect_addr = %a\n", FUNC,
+              fspace->addr, fspace->sinfo, fspace->sect_addr);
+    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC,
+              fspace->alloc_sect_size, fspace->sect_size);
 #endif /* H5FS_SINFO_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sinfo_lock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sinfo_unlock
  *
@@ -310,13 +306,18 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
 static herr_t
 H5FS_sinfo_unlock(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hbool_t modified)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Called, modified = %t, fspace->addr = %a, fspace->sect_addr = %a\n", FUNC, modified, fspace->addr, fspace->sect_addr);
-HDfprintf(stderr, "%s: fspace->sinfo_lock_count = %u, fspace->sinfo_modified = %t, fspace->sinfo_protected = %t\n", FUNC, fspace->sinfo_lock_count, fspace->sinfo_modified, fspace->sinfo_protected);
-HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC, fspace->alloc_sect_size, fspace->sect_size);
+    HDfprintf(stderr, "%s: Called, modified = %t, fspace->addr = %a, fspace->sect_addr = %a\n", FUNC,
+              modified, fspace->addr, fspace->sect_addr);
+    HDfprintf(
+        stderr,
+        "%s: fspace->sinfo_lock_count = %u, fspace->sinfo_modified = %t, fspace->sinfo_protected = %t\n",
+        FUNC, fspace->sinfo_lock_count, fspace->sinfo_modified, fspace->sinfo_protected);
+    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC,
+              fspace->alloc_sect_size, fspace->sect_size);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Check arguments. */
@@ -326,9 +327,9 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
     HDassert(fspace->sinfo);
 
     /* Check if we modified any section */
-    if(modified) {
+    if (modified) {
         /* Check if the section info was protected with a different access mode */
-        if(fspace->sinfo_protected && fspace->sinfo_accmode != H5AC_WRITE)
+        if (fspace->sinfo_protected && fspace->sinfo_accmode != H5AC_WRITE)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTDIRTY, FAIL, "attempt to modify read-only section info")
 
         /* If we modified the section info, mark it dirty */
@@ -340,7 +341,7 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
         /* Assume that the modification will affect the statistics in the header
          *  and mark that dirty also
          */
-        if(H5FS_dirty(fspace) < 0)
+        if (H5FS_dirty(fspace) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
     } /* end if */
 
@@ -348,23 +349,24 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
     fspace->sinfo_lock_count--;
 
     /* Check if section info lock count dropped to zero */
-    if(fspace->sinfo_lock_count == 0) {
-        hbool_t release_sinfo_space = FALSE;    /* Flag to indicate section info space in file should be released */
+    if (fspace->sinfo_lock_count == 0) {
+        hbool_t release_sinfo_space =
+            FALSE; /* Flag to indicate section info space in file should be released */
 
         /* Check if we actually protected the section info */
-        if(fspace->sinfo_protected) {
-            unsigned    cache_flags = H5AC__NO_FLAGS_SET;       /* Flags for unprotecting heap */
+        if (fspace->sinfo_protected) {
+            unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting heap */
 
             /* Sanity check */
             HDassert(H5F_addr_defined(fspace->addr));
 
             /* Check if we've made new changes to the section info while locked */
-            if(fspace->sinfo_modified) {
+            if (fspace->sinfo_modified) {
                 /* Note that we've modified the section info */
                 cache_flags |= H5AC__DIRTIED_FLAG;
 
                 /* Check if the section info size in the file has changed */
-                if(fspace->sect_size != fspace->alloc_sect_size)
+                if (fspace->sect_size != fspace->alloc_sect_size)
                     cache_flags |= H5AC__DELETED_FLAG | H5AC__TAKE_OWNERSHIP_FLAG;
             } /* end if */
 
@@ -375,35 +377,36 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
             /* (Possibly dirty) */
             /* (Possibly taking ownership from the cache) */
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Unprotecting section info, cache_flags = %u\n", FUNC, cache_flags);
+            HDfprintf(stderr, "%s: Unprotecting section info, cache_flags = %u\n", FUNC, cache_flags);
 #endif /* H5FS_SINFO_DEBUG */
-            if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, fspace->sinfo, cache_flags) < 0)
+            if (H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, fspace->sinfo, cache_flags) <
+                0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, FAIL, "unable to release free space section info")
 
             /* Reset the protected flag on the section info */
             fspace->sinfo_protected = FALSE;
 
             /* Check if header is taking ownership of section info */
-            if((cache_flags & H5AC__TAKE_OWNERSHIP_FLAG)) {
+            if ((cache_flags & H5AC__TAKE_OWNERSHIP_FLAG)) {
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Taking ownership of section info\n", FUNC);
+                HDfprintf(stderr, "%s: Taking ownership of section info\n", FUNC);
 #endif /* H5FS_SINFO_DEBUG */
                 /* Set flag to release section info space in file */
                 release_sinfo_space = TRUE;
             } /* end if */
             else {
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Relinquishing section info ownership\n", FUNC);
+                HDfprintf(stderr, "%s: Relinquishing section info ownership\n", FUNC);
 #endif /* H5FS_SINFO_DEBUG */
                 /* Free space header relinquished ownership of section info */
                 fspace->sinfo = NULL;
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else {
             /* Check if the section info was modified */
-            if(fspace->sinfo_modified) {
+            if (fspace->sinfo_modified) {
                 /* Check if we need to release section info in the file */
-                if(H5F_addr_defined(fspace->sect_addr))
+                if (H5F_addr_defined(fspace->sect_addr))
                     /* Set flag to release section info space in file */
                     release_sinfo_space = TRUE;
                 else
@@ -411,50 +414,52 @@ HDfprintf(stderr, "%s: Relinquishing section info ownership\n", FUNC);
             } /* end if */
             else {
                 /* Sanity checks... */
-                if(H5F_addr_defined(fspace->sect_addr))
+                if (H5F_addr_defined(fspace->sect_addr))
                     HDassert(fspace->alloc_sect_size == fspace->sect_size);
                 else
                     HDassert(fspace->alloc_sect_size == 0);
             } /* end else */
-        } /* end else */
+        }     /* end else */
 
         /* Reset the "section info modified" flag */
         fspace->sinfo_modified = FALSE;
 
         /* Check if header needs to release section info in the file */
-        if(release_sinfo_space) {
-            haddr_t old_sect_addr = fspace->sect_addr;   /* Previous location of section info in file */
-            hsize_t old_alloc_sect_size = fspace->alloc_sect_size;       /* Previous size of section info in file */
+        if (release_sinfo_space) {
+            haddr_t old_sect_addr       = fspace->sect_addr; /* Previous location of section info in file */
+            hsize_t old_alloc_sect_size = fspace->alloc_sect_size; /* Previous size of section info in file */
 
             /* Sanity check */
             HDassert(H5F_addr_defined(fspace->addr));
 
             /* Reset section info in header */
-            fspace->sect_addr = HADDR_UNDEF;
+            fspace->sect_addr       = HADDR_UNDEF;
             fspace->alloc_sect_size = 0;
 
             /* If we haven't already marked the header dirty, do so now */
-            if(!modified)
-                if(H5FS_dirty(fspace) < 0)
-                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
+            if (!modified)
+                if (H5FS_dirty(fspace) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL,
+                                "unable to mark free space header as dirty")
 
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Freeing section info on disk, old_sect_addr = %a, old_alloc_sect_size = %Hu\n", FUNC, old_sect_addr, old_alloc_sect_size);
+            HDfprintf(stderr,
+                      "%s: Freeing section info on disk, old_sect_addr = %a, old_alloc_sect_size = %Hu\n",
+                      FUNC, old_sect_addr, old_alloc_sect_size);
 #endif /* H5FS_SINFO_DEBUG */
             /* Release space for section info in file */
-            if(H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, old_sect_addr, old_alloc_sect_size) < 0)
+            if (H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, old_sect_addr, old_alloc_sect_size) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to free free space sections")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
 #endif /* H5FS_SINFO_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sinfo_unlock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_serialize_size
  *
@@ -476,25 +481,32 @@ H5FS_sect_serialize_size(H5FS_t *fspace)
     /* Check arguments. */
     HDassert(fspace);
 #ifdef QAK
-HDfprintf(stderr, "%s: Check 1.0 - fspace->sect_size = %Hu\n", "H5FS_sect_serialize_size", fspace->sect_size);
-HDfprintf(stderr, "%s: fspace->serial_sect_count = %Zu\n", "H5FS_sect_serialize_size", fspace->serial_sect_count);
-HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu\n", "H5FS_sect_serialize_size", fspace->alloc_sect_size);
-HDfprintf(stderr, "%s: fspace->sinfo->serial_size_count = %Zu\n", "H5FS_sect_serialize_size", fspace->sinfo->serial_size_count);
+    HDfprintf(stderr, "%s: Check 1.0 - fspace->sect_size = %Hu\n", "H5FS_sect_serialize_size",
+              fspace->sect_size);
+    HDfprintf(stderr, "%s: fspace->serial_sect_count = %Zu\n", "H5FS_sect_serialize_size",
+              fspace->serial_sect_count);
+    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu\n", "H5FS_sect_serialize_size",
+              fspace->alloc_sect_size);
+    HDfprintf(stderr, "%s: fspace->sinfo->serial_size_count = %Zu\n", "H5FS_sect_serialize_size",
+              fspace->sinfo->serial_size_count);
 #endif /* QAK */
 
     /* Compute the size of the buffer required to serialize all the sections */
-    if(fspace->serial_sect_count > 0) {
-        size_t sect_buf_size;               /* Section buffer size */
+    if (fspace->serial_sect_count > 0) {
+        size_t sect_buf_size; /* Section buffer size */
 
         /* Serialized sections prefix */
         sect_buf_size = fspace->sinfo->sect_prefix_size;
 
         /* Count for each differently sized serializable section */
 #ifdef QAK
-HDfprintf(stderr, "%s: fspace->sinfo->serial_size_count = %Zu\n", "H5FS_sect_serialize_size", fspace->sinfo->serial_size_count);
-HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", "H5FS_sect_serialize_size", fspace->serial_sect_count);
+        HDfprintf(stderr, "%s: fspace->sinfo->serial_size_count = %Zu\n", "H5FS_sect_serialize_size",
+                  fspace->sinfo->serial_size_count);
+        HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", "H5FS_sect_serialize_size",
+                  fspace->serial_sect_count);
 #endif /* QAK */
-        sect_buf_size += fspace->sinfo->serial_size_count * H5VM_limit_enc_size((uint64_t)fspace->serial_sect_count);
+        sect_buf_size +=
+            fspace->sinfo->serial_size_count * H5VM_limit_enc_size((uint64_t)fspace->serial_sect_count);
 
         /* Size for each differently sized serializable section */
         sect_buf_size += fspace->sinfo->serial_size_count * fspace->sinfo->sect_len_size;
@@ -518,7 +530,6 @@ HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", "H5FS_sect_serialize_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FS_sect_serialize_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_increase
  *
@@ -534,10 +545,9 @@ HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", "H5FS_sect_serialize_
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    unsigned flags)
+H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls, unsigned flags)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -550,7 +560,7 @@ H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls,
     fspace->tot_sect_count++;
 
     /* Check for serializable or 'ghost' section */
-    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
+    if (cls->flags & H5FS_CLS_GHOST_OBJ) {
         /* Sanity check */
         HDassert(cls->serial_size == 0);
 
@@ -563,24 +573,23 @@ H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls,
 
         /* Increment amount of space required to serialize all sections */
 #ifdef QAK
-HDfprintf(stderr, "%s: sinfo->serial_size = %Zu\n", FUNC, fspace->sinfo->serial_size);
-HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
+        HDfprintf(stderr, "%s: sinfo->serial_size = %Zu\n", FUNC, fspace->sinfo->serial_size);
+        HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
 #endif /* QAK */
         fspace->sinfo->serial_size += cls->serial_size;
 
         /* Update the free space sections' serialized size */
         /* (if we're not deserializing the sections from disk) */
-        if(!(flags & H5FS_ADD_DESERIALIZING)) {
-            if(H5FS_sect_serialize_size(fspace) < 0)
+        if (!(flags & H5FS_ADD_DESERIALIZING)) {
+            if (H5FS_sect_serialize_size(fspace) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_increase() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_decrease
  *
@@ -599,7 +608,7 @@ done:
 static herr_t
 H5FS_sect_decrease(H5FS_t *fspace, const H5FS_section_class_t *cls)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -612,7 +621,7 @@ H5FS_sect_decrease(H5FS_t *fspace, const H5FS_section_class_t *cls)
     fspace->tot_sect_count--;
 
     /* Check for serializable or 'ghost' section */
-    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
+    if (cls->flags & H5FS_CLS_GHOST_OBJ) {
         /* Sanity check */
         HDassert(cls->serial_size == 0);
 
@@ -625,13 +634,13 @@ H5FS_sect_decrease(H5FS_t *fspace, const H5FS_section_class_t *cls)
 
         /* Decrement amount of space required to serialize all sections */
 #ifdef QAK
-HDfprintf(stderr, "%s: fspace->serial_size = %Zu\n", FUNC, fspace->sinfo->serial_size);
-HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
+        HDfprintf(stderr, "%s: fspace->serial_size = %Zu\n", FUNC, fspace->sinfo->serial_size);
+        HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
 #endif /* QAK */
         fspace->sinfo->serial_size -= cls->serial_size;
 
         /* Update the free space sections' serialized size */
-        if(H5FS_sect_serialize_size(fspace) < 0)
+        if (H5FS_sect_serialize_size(fspace) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
     } /* end else */
 
@@ -639,7 +648,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_decrease() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_size_node_decr
  *
@@ -655,9 +663,9 @@ done:
  */
 static herr_t
 H5FS_size_node_decr(H5FS_sinfo_t *sinfo, unsigned bin, H5FS_node_t *fspace_node,
-    const H5FS_section_class_t *cls)
+                    const H5FS_section_class_t *cls)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -672,11 +680,11 @@ H5FS_size_node_decr(H5FS_sinfo_t *sinfo, unsigned bin, H5FS_node_t *fspace_node,
      */
     sinfo->bins[bin].tot_sect_count--;
 #ifdef QAK
-HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bins[bin].sect_count);
+    HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bins[bin].sect_count);
 #endif /* QAK */
 
     /* Check for 'ghost' or 'serializable' section */
-    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
+    if (cls->flags & H5FS_CLS_GHOST_OBJ) {
         /* Decrement node's ghost section count */
         fspace_node->ghost_count--;
 
@@ -684,7 +692,7 @@ HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bi
         sinfo->bins[bin].ghost_sect_count--;
 
         /* If the node has no more ghost sections, decrement number of ghost section sizes managed */
-        if(fspace_node->ghost_count == 0)
+        if (fspace_node->ghost_count == 0)
             sinfo->ghost_size_count--;
     } /* end if */
     else {
@@ -694,14 +702,15 @@ HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bi
         /* Decrement bin's serializable section count */
         sinfo->bins[bin].serial_sect_count--;
 
-        /* If the node has no more serializable sections, decrement number of serializable section sizes managed */
-        if(fspace_node->serial_count == 0)
+        /* If the node has no more serializable sections, decrement number of serializable section sizes
+         * managed */
+        if (fspace_node->serial_count == 0)
             sinfo->serial_size_count--;
     } /* end else */
 
     /* Check for no more nodes on list of that size */
-    if(H5SL_count(fspace_node->sect_list) == 0) {
-        H5FS_node_t *tmp_fspace_node;       /* Free space list size node */
+    if (H5SL_count(fspace_node->sect_list) == 0) {
+        H5FS_node_t *tmp_fspace_node; /* Free space list size node */
 
         /* Sanity checks */
         HDassert(fspace_node->ghost_count == 0);
@@ -709,11 +718,11 @@ HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bi
 
         /* Remove size tracking list from bin */
         tmp_fspace_node = (H5FS_node_t *)H5SL_remove(sinfo->bins[bin].bin_list, &fspace_node->sect_size);
-        if(tmp_fspace_node == NULL || tmp_fspace_node != fspace_node)
+        if (tmp_fspace_node == NULL || tmp_fspace_node != fspace_node)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space node from skip list")
 
         /* Destroy skip list for size tracking node */
-        if(H5SL_close(fspace_node->sect_list) < 0)
+        if (H5SL_close(fspace_node->sect_list) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "can't destroy size tracking node's skip list")
 
         /* Release free space list node */
@@ -727,7 +736,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_size_node_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_unlink_size
  *
@@ -743,13 +751,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect)
+H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls, H5FS_section_info_t *sect)
 {
-    H5FS_node_t *fspace_node;       /* Free list size node */
-    H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
-    unsigned bin;                   /* Bin to put the free space section in */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5FS_node_t *        fspace_node;         /* Free list size node */
+    H5FS_section_info_t *tmp_sect_node;       /* Temporary section node */
+    unsigned             bin;                 /* Bin to put the free space section in */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -762,27 +769,26 @@ H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
     /* Determine correct bin which holds items of at least the section's size */
     bin = H5VM_log2_gen(sect->size);
     HDassert(bin < sinfo->nbins);
-    if(sinfo->bins[bin].bin_list == NULL)
+    if (sinfo->bins[bin].bin_list == NULL)
         HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "node's bin is empty?")
 
     /* Find space node for section's size */
-    if((fspace_node = (H5FS_node_t *)H5SL_search(sinfo->bins[bin].bin_list, &sect->size)) == NULL)
+    if ((fspace_node = (H5FS_node_t *)H5SL_search(sinfo->bins[bin].bin_list, &sect->size)) == NULL)
         HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section size node")
 
     /* Remove the section's node from the list */
     tmp_sect_node = (H5FS_section_info_t *)H5SL_remove(fspace_node->sect_list, &sect->addr);
-    if(tmp_sect_node == NULL || tmp_sect_node != sect)
+    if (tmp_sect_node == NULL || tmp_sect_node != sect)
         HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
 
     /* Decrement # of sections in section size node */
-    if(H5FS_size_node_decr(sinfo, bin, fspace_node, cls) < 0)
+    if (H5FS_size_node_decr(sinfo, bin, fspace_node, cls) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space size node from skip list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_unlink_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_unlink_rest
  *
@@ -800,10 +806,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_sect_unlink_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect)
+H5FS_sect_unlink_rest(H5FS_t *fspace, const H5FS_section_class_t *cls, H5FS_section_info_t *sect)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -814,24 +819,25 @@ H5FS_sect_unlink_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
     HDassert(sect);
 
     /* Remove node from merge list, if it was entered there */
-    if(!(cls->flags & H5FS_CLS_SEPAR_OBJ)) {
+    if (!(cls->flags & H5FS_CLS_SEPAR_OBJ)) {
         H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
 
 #ifdef QAK
-HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
+        HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC,
+                  (unsigned)sect->type);
 #endif /* QAK */
         tmp_sect_node = (H5FS_section_info_t *)H5SL_remove(fspace->sinfo->merge_list, &sect->addr);
-        if(tmp_sect_node == NULL || tmp_sect_node != sect)
+        if (tmp_sect_node == NULL || tmp_sect_node != sect)
             HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
     } /* end if */
 
     /* Update section info & check if we need less room for the serialized free space sections */
-    if(H5FS_sect_decrease(fspace, cls) < 0)
+    if (H5FS_sect_decrease(fspace, cls) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't increase free space section size on disk")
 
-    /* Decrement amount of free space managed */
+        /* Decrement amount of free space managed */
 #ifdef QAK
-HDfprintf(stderr, "%s: fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+    HDfprintf(stderr, "%s: fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
 #endif /* QAK */
     fspace->tot_space -= sect->size;
 
@@ -839,7 +845,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_unlink_rest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_remove_real
  *
@@ -856,8 +861,8 @@ done:
 static herr_t
 H5FS_sect_remove_real(H5FS_t *fspace, H5FS_section_info_t *sect)
 {
-    const H5FS_section_class_t *cls;    /* Class of section */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5FS_section_class_t *cls;                 /* Class of section */
+    herr_t                      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -870,18 +875,18 @@ H5FS_sect_remove_real(H5FS_t *fspace, H5FS_section_info_t *sect)
     cls = &fspace->sect_cls[sect->type];
 
     /* Remove node from size tracked data structures */
-    if(H5FS_sect_unlink_size(fspace->sinfo, cls, sect) < 0)
+    if (H5FS_sect_unlink_size(fspace->sinfo, cls, sect) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from size tracking data structures")
 
     /* Update rest of free space manager data structures for node removal */
-    if(H5FS_sect_unlink_rest(fspace, cls, sect) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from non-size tracking data structures")
+    if (H5FS_sect_unlink_rest(fspace, cls, sect) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL,
+                    "can't remove section from non-size tracking data structures")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_remove_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_remove
  *
@@ -896,11 +901,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t *sect)
+H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect)
 {
-    hbool_t sinfo_valid = FALSE;        /* Whether the section info is valid */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hbool_t sinfo_valid = FALSE;   /* Whether the section info is valid */
+    herr_t  ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -910,23 +914,22 @@ H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
     HDassert(sect);
 
     /* Get a pointer to the section info */
-    if(H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
+    if (H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't get section info")
     sinfo_valid = TRUE;
 
     /* Perform actual section removal */
-    if(H5FS_sect_remove_real(fspace, sect) < 0)
+    if (H5FS_sect_remove_real(fspace, sect) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove section")
 
 done:
     /* Release the section info */
-    if(sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, TRUE) < 0)
+    if (sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, TRUE) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release section info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_link_size
  *
@@ -941,17 +944,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_sect_link_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect)
+H5FS_sect_link_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls, H5FS_section_info_t *sect)
 {
-    H5FS_node_t *fspace_node = NULL;    /* Pointer to free space node of the correct size */
-    hbool_t fspace_node_alloc = FALSE;  /* Whether the free space node was allocated */
-    unsigned bin;                       /* Bin to put the free space section in */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_node_t *fspace_node       = NULL;  /* Pointer to free space node of the correct size */
+    hbool_t      fspace_node_alloc = FALSE; /* Whether the free space node was allocated */
+    unsigned     bin;                       /* Bin to put the free space section in */
+    herr_t       ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef QAK
-HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, sect->addr);
+    HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, sect->addr);
 #endif /* QAK */
 
     /* Check arguments. */
@@ -963,8 +965,8 @@ HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, s
     /* Determine correct bin which holds items of the section's size */
     bin = H5VM_log2_gen(sect->size);
     HDassert(bin < sinfo->nbins);
-    if(sinfo->bins[bin].bin_list == NULL) {
-        if(NULL == (sinfo->bins[bin].bin_list = H5SL_create(H5SL_TYPE_HSIZE, NULL)))
+    if (sinfo->bins[bin].bin_list == NULL) {
+        if (NULL == (sinfo->bins[bin].bin_list = H5SL_create(H5SL_TYPE_HSIZE, NULL)))
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for free space nodes")
     } /* end if */
     else {
@@ -973,20 +975,20 @@ HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, s
     } /* end else */
 
     /* Check if we need to create a new skip list for nodes of this size */
-    if(fspace_node == NULL) {
+    if (fspace_node == NULL) {
         /* Allocate new free list size node */
-        if(NULL == (fspace_node = H5FL_MALLOC(H5FS_node_t)))
+        if (NULL == (fspace_node = H5FL_MALLOC(H5FS_node_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for free space node")
         fspace_node_alloc = TRUE;
 
         /* Initialize the free list size node */
-        fspace_node->sect_size = sect->size;
+        fspace_node->sect_size    = sect->size;
         fspace_node->serial_count = fspace_node->ghost_count = 0;
-        if(NULL == (fspace_node->sect_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
+        if (NULL == (fspace_node->sect_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for free space nodes")
 
         /* Insert new free space size node into bin's list */
-        if(H5SL_insert(sinfo->bins[bin].bin_list, fspace_node, &fspace_node->sect_size) < 0)
+        if (H5SL_insert(sinfo->bins[bin].bin_list, fspace_node, &fspace_node->sect_size) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into skip list")
         fspace_node_alloc = FALSE; /* (owned by the bin skip list now, don't need to free on error) */
 
@@ -999,15 +1001,15 @@ HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, s
      *  the bin's skiplist is also a skiplist...)
      */
 #ifdef QAK
-HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bins[bin].sect_count);
+    HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bins[bin].sect_count);
 #endif /* QAK */
     sinfo->bins[bin].tot_sect_count++;
-    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
+    if (cls->flags & H5FS_CLS_GHOST_OBJ) {
         sinfo->bins[bin].ghost_sect_count++;
         fspace_node->ghost_count++;
 
         /* Check for first ghost section in node */
-        if(fspace_node->ghost_count == 1)
+        if (fspace_node->ghost_count == 1)
             sinfo->ghost_size_count++;
     } /* end if */
     else {
@@ -1015,26 +1017,26 @@ HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bi
         fspace_node->serial_count++;
 
         /* Check for first serializable section in node */
-        if(fspace_node->serial_count == 1)
+        if (fspace_node->serial_count == 1)
             sinfo->serial_size_count++;
     } /* end else */
 
     /* Insert free space node into correct skip list */
-    if(H5SL_insert(fspace_node->sect_list, sect, &sect->addr) < 0)
+    if (H5SL_insert(fspace_node->sect_list, sect, &sect->addr) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into skip list")
 
 done:
-    if(ret_value < 0)
-        if(fspace_node && fspace_node_alloc) {
-            if(fspace_node->sect_list && H5SL_close(fspace_node->sect_list) < 0)
-                HDONE_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "can't destroy size free space node's skip list")
+    if (ret_value < 0)
+        if (fspace_node && fspace_node_alloc) {
+            if (fspace_node->sect_list && H5SL_close(fspace_node->sect_list) < 0)
+                HDONE_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL,
+                            "can't destroy size free space node's skip list")
             fspace_node = H5FL_FREE(H5FS_node_t, fspace_node);
         } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_link_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_link_rest
  *
@@ -1051,10 +1053,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_sect_link_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect, unsigned flags)
+H5FS_sect_link_rest(H5FS_t *fspace, const H5FS_section_class_t *cls, H5FS_section_info_t *sect,
+                    unsigned flags)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1064,19 +1066,22 @@ H5FS_sect_link_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
     HDassert(sect);
 
     /* Add section to the address-ordered list of sections, if allowed */
-    if(!(cls->flags & H5FS_CLS_SEPAR_OBJ)) {
+    if (!(cls->flags & H5FS_CLS_SEPAR_OBJ)) {
 #ifdef QAK
-HDfprintf(stderr, "%s: inserting object into merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
+        HDfprintf(stderr, "%s: inserting object into merge list, sect->type = %u\n", FUNC,
+                  (unsigned)sect->type);
 #endif /* QAK */
-        if(fspace->sinfo->merge_list == NULL)
-            if(NULL == (fspace->sinfo->merge_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for merging free space sections")
-        if(H5SL_insert(fspace->sinfo->merge_list, sect, &sect->addr) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into merging skip list")
+        if (fspace->sinfo->merge_list == NULL)
+            if (NULL == (fspace->sinfo->merge_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL,
+                            "can't create skip list for merging free space sections")
+        if (H5SL_insert(fspace->sinfo->merge_list, sect, &sect->addr) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL,
+                        "can't insert free space node into merging skip list")
     } /* end if */
 
     /* Update section info & check if we need more room for the serialized free space sections */
-    if(H5FS_sect_increase(fspace, cls, flags) < 0)
+    if (H5FS_sect_increase(fspace, cls, flags) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't increase free space section size on disk")
 
     /* Increment amount of free space managed */
@@ -1086,7 +1091,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_link_rest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_link
  *
@@ -1104,8 +1108,8 @@ done:
 static herr_t
 H5FS_sect_link(H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flags)
 {
-    const H5FS_section_class_t *cls;    /* Class of section */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5FS_section_class_t *cls;                 /* Class of section */
+    herr_t                      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1119,26 +1123,26 @@ H5FS_sect_link(H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flags)
 
     /* Add section to size tracked data structures */
 #ifdef QAK
-HDfprintf(stderr, "%s: Check 1.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+    HDfprintf(stderr, "%s: Check 1.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
 #endif /* QAK */
-    if(H5FS_sect_link_size(fspace->sinfo, cls, sect) < 0)
+    if (H5FS_sect_link_size(fspace->sinfo, cls, sect) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't add section to size tracking data structures")
 
 #ifdef QAK
-HDfprintf(stderr, "%s: Check 2.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+    HDfprintf(stderr, "%s: Check 2.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
 #endif /* QAK */
     /* Update rest of free space manager data structures for section addition */
-    if(H5FS_sect_link_rest(fspace, cls, sect, flags) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't add section to non-size tracking data structures")
+    if (H5FS_sect_link_rest(fspace, cls, sect, flags) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL,
+                    "can't add section to non-size tracking data structures")
 #ifdef QAK
-HDfprintf(stderr, "%s: Check 3.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+    HDfprintf(stderr, "%s: Check 3.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
 #endif /* QAK */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_merge
  *
@@ -1163,11 +1167,11 @@ done:
 static herr_t
 H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
 {
-    H5FS_section_class_t *sect_cls;     /* Section's class */
-    hbool_t modified;                   /* Flag to indicate merge or shrink occurred */
-    hbool_t remove_sect = FALSE;       /* Whether a section should be removed before shrinking */
-    htri_t status;                      /* Status value */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_section_class_t *sect_cls;            /* Section's class */
+    hbool_t               modified;            /* Flag to indicate merge or shrink occurred */
+    hbool_t               remove_sect = FALSE; /* Whether a section should be removed before shrinking */
+    htri_t                status;              /* Status value */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1178,13 +1182,13 @@ H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
     HDassert((*sect)->size);
 
     /* Loop until no more merging */
-    if(fspace->sinfo->merge_list) {
+    if (fspace->sinfo->merge_list) {
         do {
-            H5SL_node_t *less_sect_node;    /* Skip list node for section less than new section */
-            H5SL_node_t *greater_sect_node; /* Skip list node for section greater than new section */
-            H5FS_section_info_t *tmp_sect;  /* Temporary free space section */
-            H5FS_section_class_t *tmp_sect_cls;     /* Temporary section's class */
-            hbool_t greater_sect_node_valid = FALSE;    /* Indicate if 'greater than' section node is valid */
+            H5SL_node_t *         less_sect_node;    /* Skip list node for section less than new section */
+            H5SL_node_t *         greater_sect_node; /* Skip list node for section greater than new section */
+            H5FS_section_info_t * tmp_sect;          /* Temporary free space section */
+            H5FS_section_class_t *tmp_sect_cls;      /* Temporary section's class */
+            hbool_t greater_sect_node_valid = FALSE; /* Indicate if 'greater than' section node is valid */
 
             /* Reset 'modification occurred' flag */
             modified = FALSE;
@@ -1193,9 +1197,9 @@ H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
             less_sect_node = H5SL_below(fspace->sinfo->merge_list, &(*sect)->addr);
 
             /* Check for node before new node able to merge with new node */
-            if(less_sect_node) {
+            if (less_sect_node) {
                 /* Check for node greater than section */
-                greater_sect_node = H5SL_next(less_sect_node);
+                greater_sect_node       = H5SL_next(less_sect_node);
                 greater_sect_node_valid = TRUE;
 
                 /* Get section for 'less than' skip list node */
@@ -1203,27 +1207,28 @@ H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
 
                 /* Get classes for right & left sections */
                 tmp_sect_cls = &fspace->sect_cls[tmp_sect->type];
-                sect_cls = &fspace->sect_cls[(*sect)->type];
+                sect_cls     = &fspace->sect_cls[(*sect)->type];
 
                 /* Check if sections of the left most class can merge with sections
                  *  of another class & whether the sections are the same type,
                  *  then check for 'can merge' callback
                  */
-                if((!(tmp_sect_cls->flags & H5FS_CLS_MERGE_SYM) || (tmp_sect->type == (*sect)->type))
-                        && tmp_sect_cls->can_merge) {
+                if ((!(tmp_sect_cls->flags & H5FS_CLS_MERGE_SYM) || (tmp_sect->type == (*sect)->type)) &&
+                    tmp_sect_cls->can_merge) {
                     /* Determine if the sections can merge */
-                    if((status = (*tmp_sect_cls->can_merge)(tmp_sect, *sect, op_data)) < 0)
+                    if ((status = (*tmp_sect_cls->can_merge)(tmp_sect, *sect, op_data)) < 0)
                         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't check for merging sections")
-                    if(status > 0) {
+                    if (status > 0) {
                         /* Sanity check */
                         HDassert(tmp_sect_cls->merge);
 
                         /* Remove 'less than' node from data structures */
-                        if(H5FS_sect_remove_real(fspace, tmp_sect) < 0)
-                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
+                        if (H5FS_sect_remove_real(fspace, tmp_sect) < 0)
+                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL,
+                                        "can't remove section from internal data structures")
 
                         /* Merge the two sections together */
-                        if((*tmp_sect_cls->merge)(tmp_sect, *sect, op_data) < 0)
+                        if ((*tmp_sect_cls->merge)(tmp_sect, *sect, op_data) < 0)
                             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't merge two sections")
 
                         /* Retarget section pointer to 'less than' node that was merged into */
@@ -1232,54 +1237,56 @@ H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
                         /* Indicate successful merge occurred */
                         modified = TRUE;
                     } /* end if */
-                } /* end if */
-            } /* end if */
+                }     /* end if */
+            }         /* end if */
 
             /* Look for section after new (or merged) section, if not already determined */
-            if(!greater_sect_node_valid)
+            if (!greater_sect_node_valid)
                 greater_sect_node = H5SL_above(fspace->sinfo->merge_list, &(*sect)->addr);
 
             /* Check for node after new node able to merge with new node */
-            if(greater_sect_node) {
+            if (greater_sect_node) {
                 /* Get section for 'greater than' skip list node */
                 tmp_sect = (H5FS_section_info_t *)H5SL_item(greater_sect_node);
 
                 /* Get classes for right & left sections */
-                sect_cls = &fspace->sect_cls[(*sect)->type];
+                sect_cls     = &fspace->sect_cls[(*sect)->type];
                 tmp_sect_cls = &fspace->sect_cls[tmp_sect->type];
 
                 /* Check if sections of the left most class can merge with sections
                  *  of another class & whether the sections are the same type,
                  *  then check for 'can merge' callback
                  */
-                if((!(sect_cls->flags & H5FS_CLS_MERGE_SYM) || ((*sect)->type == tmp_sect->type))
-                        && sect_cls->can_merge) {
+                if ((!(sect_cls->flags & H5FS_CLS_MERGE_SYM) || ((*sect)->type == tmp_sect->type)) &&
+                    sect_cls->can_merge) {
 
                     /* Determine if the sections can merge */
-                    if((status = (*sect_cls->can_merge)(*sect, tmp_sect, op_data)) < 0)
+                    if ((status = (*sect_cls->can_merge)(*sect, tmp_sect, op_data)) < 0)
                         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't check for merging sections")
-                    if(status > 0) {
+                    if (status > 0) {
                         /* Sanity check */
                         HDassert(sect_cls->merge);
 
                         /* Remove 'greater than' node from data structures */
-                        if(H5FS_sect_remove_real(fspace, tmp_sect) < 0)
-                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
+                        if (H5FS_sect_remove_real(fspace, tmp_sect) < 0)
+                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL,
+                                        "can't remove section from internal data structures")
 
                         /* Merge the two sections together */
-                        if((*sect_cls->merge)(*sect, tmp_sect, op_data) < 0)
+                        if ((*sect_cls->merge)(*sect, tmp_sect, op_data) < 0)
                             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't merge two sections")
 
                         /* Indicate successful merge occurred */
                         modified = TRUE;
                     } /* end if */
-                } /* end if */
-            } /* end if */
-	} while(modified);
+                }     /* end if */
+            }         /* end if */
+        } while (modified);
     } /* end if */
     HDassert(*sect);
 #ifdef QAK
-HDfprintf(stderr, "%s: Done merging, (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sect)->addr, (*sect)->size, (*sect)->type, ((*sect)->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
+    HDfprintf(stderr, "%s: Done merging, (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sect)->addr, (*sect)->size,
+              (*sect)->type, ((*sect)->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
 #endif /* QAK */
 
     /* Loop until no more shrinking */
@@ -1289,36 +1296,37 @@ HDfprintf(stderr, "%s: Done merging, (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sec
 
         /* Check for (possibly merged) section able to shrink the size of the container */
         sect_cls = &fspace->sect_cls[(*sect)->type];
-        if(sect_cls->can_shrink) {
-            if((status = (*sect_cls->can_shrink)(*sect, op_data)) < 0)
+        if (sect_cls->can_shrink) {
+            if ((status = (*sect_cls->can_shrink)(*sect, op_data)) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTSHRINK, FAIL, "can't check for shrinking container")
-            if(status > 0) {
+            if (status > 0) {
 #ifdef QAK
-HDfprintf(stderr, "%s: Can shrink!\n", FUNC);
+                HDfprintf(stderr, "%s: Can shrink!\n", FUNC);
 #endif /* QAK */
 
-		/* Remove SECT from free-space manager */
+                /* Remove SECT from free-space manager */
                 /* (only possible to happen on second+ pass through loop) */
-		if(remove_sect) {
-		    if(H5FS_sect_remove_real(fspace, *sect) < 0)
-			HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
-		    remove_sect = FALSE;
-		} /* end if */
+                if (remove_sect) {
+                    if (H5FS_sect_remove_real(fspace, *sect) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL,
+                                    "can't remove section from internal data structures")
+                    remove_sect = FALSE;
+                } /* end if */
 
                 /* Shrink the container */
                 /* (callback can indicate that it has discarded the section by setting *sect to NULL) */
                 HDassert(sect_cls->shrink);
-                if((*sect_cls->shrink)(sect, op_data) < 0)
+                if ((*sect_cls->shrink)(sect, op_data) < 0)
                     HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't shrink free space container")
 
                 /* If this section was shrunk away, we may need to shrink another section */
-                if(*sect == NULL) {
+                if (*sect == NULL) {
                     /* Check for sections on merge list */
-                    if(fspace->sinfo->merge_list)  {
-                        H5SL_node_t *last_node;         /* Last node in merge list */
+                    if (fspace->sinfo->merge_list) {
+                        H5SL_node_t *last_node; /* Last node in merge list */
 
                         /* Check for last node in the merge list */
-                        if(NULL != (last_node = H5SL_last(fspace->sinfo->merge_list))) {
+                        if (NULL != (last_node = H5SL_last(fspace->sinfo->merge_list))) {
                             /* Get the pointer to the last section, from the last node */
                             *sect = (H5FS_section_info_t *)H5SL_item(last_node);
                             HDassert(*sect);
@@ -1326,35 +1334,36 @@ HDfprintf(stderr, "%s: Can shrink!\n", FUNC);
                             /* Indicate that this section needs to be removed if it causes a shrink */
                             remove_sect = TRUE;
                         } /* end if */
-                    } /* end if */
-		} /* end if */
+                    }     /* end if */
+                }         /* end if */
 
                 /* Indicate successful merge occurred */
                 modified = TRUE;
             } /* end if */
-        } /* end if */
-    } while(modified && *sect);
+        }     /* end if */
+    } while (modified && *sect);
 
     /* Check for section that was shrunk away and next section not shrinking */
-    if(remove_sect && (*sect != NULL))
-	*sect = NULL;
+    if (remove_sect && (*sect != NULL))
+        *sect = NULL;
 
 #ifdef QAK
-HDfprintf(stderr, "%s: Done shrinking\n", FUNC);
-if(*sect)
-    HDfprintf(stderr, "%s: (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sect)->addr, (*sect)->size, (*sect)->type, ((*sect)->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
-else
-    HDfprintf(stderr, "%s: *sect = %p\n", FUNC, *sect);
+    HDfprintf(stderr, "%s: Done shrinking\n", FUNC);
+    if (*sect)
+        HDfprintf(stderr, "%s: (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sect)->addr, (*sect)->size,
+                  (*sect)->type,
+                  ((*sect)->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
+    else
+        HDfprintf(stderr, "%s: *sect = %p\n", FUNC, *sect);
 #endif /* QAK */
 
 done:
 #ifdef QAK
-HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
 #endif /* QAK */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_merge() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_add
  *
@@ -1370,18 +1379,19 @@ HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect,
-    unsigned flags, void *op_data)
+H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flags,
+              void *op_data)
 {
-    H5FS_section_class_t *cls;          /* Section's class */
-    hbool_t sinfo_valid = FALSE;        /* Whether the section info is valid */
-    hbool_t sinfo_modified = FALSE;     /* Whether the section info was modified */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_section_class_t *cls;                      /* Section's class */
+    hbool_t               sinfo_valid    = FALSE;   /* Whether the section info is valid */
+    hbool_t               sinfo_modified = FALSE;   /* Whether the section info was modified */
+    herr_t                ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: *sect = {%a, %Hu, %u, %s}\n", FUNC, sect->addr, sect->size, sect->type, (sect->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
+    HDfprintf(stderr, "%s: *sect = {%a, %Hu, %u, %s}\n", FUNC, sect->addr, sect->size, sect->type,
+              (sect->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Check arguments. */
@@ -1391,25 +1401,25 @@ HDfprintf(stderr, "%s: *sect = {%a, %Hu, %u, %s}\n", FUNC, sect->addr, sect->siz
     HDassert(sect->size);
 
     /* Get a pointer to the section info */
-    if(H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
+    if (H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't get section info")
     sinfo_valid = TRUE;
 
     /* Call "add" section class callback, if there is one */
     cls = &fspace->sect_cls[sect->type];
-    if(cls->add) {
-        if((*cls->add)(sect, &flags, op_data) < 0)
+    if (cls->add) {
+        if ((*cls->add)(sect, &flags, op_data) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "'add' section class callback failed")
     } /* end if */
 
     /* Check for merging returned space with existing section node */
-    if(flags & H5FS_ADD_RETURNED_SPACE) {
+    if (flags & H5FS_ADD_RETURNED_SPACE) {
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Returning space\n", FUNC);
+        HDfprintf(stderr, "%s: Returning space\n", FUNC);
 #endif /* H5FS_SINFO_DEBUG */
 
         /* Attempt to merge returned section with existing sections */
-        if(H5FS_sect_merge(fspace, &sect, op_data) < 0)
+        if (H5FS_sect_merge(fspace, &sect, op_data) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't merge sections")
     } /* end if */
 
@@ -1417,34 +1427,33 @@ HDfprintf(stderr, "%s: Returning space\n", FUNC);
     /* (If section has been completely merged or shrunk away, 'sect' will
      *  be NULL at this point - QAK)
      */
-    if(sect)
-        if(H5FS_sect_link(fspace, sect, flags) < 0)
+    if (sect)
+        if (H5FS_sect_link(fspace, sect, flags) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space section into skip list")
 
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+    HDfprintf(stderr, "%s: fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
 #endif /* H5FS_SINFO_DEBUG */
     /* Mark free space sections as changed */
     /* (if adding sections while deserializing sections, don't set the flag) */
-    if(!(flags & H5FS_ADD_DESERIALIZING))
+    if (!(flags & H5FS_ADD_DESERIALIZING))
         sinfo_modified = TRUE;
 
 done:
     /* Release the section info */
-    if(sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, sinfo_modified) < 0)
+    if (sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, sinfo_modified) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release section info")
 
 #ifdef H5FS_DEBUG_ASSERT
-if(!(flags & (H5FS_ADD_DESERIALIZING | H5FS_ADD_SKIP_VALID)))
-    H5FS_assert(fspace);
+    if (!(flags & (H5FS_ADD_DESERIALIZING | H5FS_ADD_SKIP_VALID)))
+        H5FS_assert(fspace);
 #endif /* H5FS_DEBUG_ASSERT */
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
 #endif /* H5FS_SINFO_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_add() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_try_extend
  *
@@ -1459,17 +1468,18 @@ HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
  *-------------------------------------------------------------------------
  */
 htri_t
-H5FS_sect_try_extend(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, haddr_t addr,
-    hsize_t size, hsize_t extra_requested)
+H5FS_sect_try_extend(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, haddr_t addr, hsize_t size,
+                     hsize_t extra_requested)
 {
-    hbool_t sinfo_valid = FALSE;        /* Whether the section info is valid */
-    hbool_t sinfo_modified = FALSE;     /* Whether the section info was modified */
-    htri_t ret_value = FALSE;           /* Return value */
+    hbool_t sinfo_valid    = FALSE; /* Whether the section info is valid */
+    hbool_t sinfo_modified = FALSE; /* Whether the section info was modified */
+    htri_t  ret_value      = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: addr = %a, size = %Hu, extra_requested = %hu\n", FUNC, addr, size, extra_requested);
+    HDfprintf(stderr, "%s: addr = %a, size = %Hu, extra_requested = %hu\n", FUNC, addr, size,
+              extra_requested);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Check arguments. */
@@ -1481,39 +1491,38 @@ HDfprintf(stderr, "%s: addr = %a, size = %Hu, extra_requested = %hu\n", FUNC, ad
 
     /* Check for any sections on free space list */
 #ifdef H5FS_SINFO_DEBUG
-HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
-HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_sect_count);
-HDfprintf(stderr, "%s: fspace->ghost_sect_count = %Hu\n", FUNC, fspace->ghost_sect_count);
+    HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
+    HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_sect_count);
+    HDfprintf(stderr, "%s: fspace->ghost_sect_count = %Hu\n", FUNC, fspace->ghost_sect_count);
 #endif /* H5FS_SINFO_DEBUG */
-    if(fspace->tot_sect_count > 0) {
-        H5FS_section_info_t *sect;      /* Temporary free space section */
+    if (fspace->tot_sect_count > 0) {
+        H5FS_section_info_t *sect; /* Temporary free space section */
 
         /* Get a pointer to the section info */
-        if(H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
+        if (H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't get section info")
         sinfo_valid = TRUE;
 
+        /*
 
-/*
+        Pseudo-code for algorithm:
+
+        _section_ = <Get pointer to section with address > _region.addr_>
+        if(_section_)
+            if(_section_ adjoins _region_ && _section.size_ >= _extra_requested_)
+                <remove section from data structures>
+                if(_section.size_ > _extra_requested_)
+                    if(<can adjust _section_>)
+                        <adjust _section_ by _extra_requested_>
+                        <add adjusted section back to data structures>
+                    else
+                        <re-add UNadjusted section back to data structures>
+                        <error>
+                <mark free space sections as changed in metadata cache>
 
-Pseudo-code for algorithm:
-
-_section_ = <Get pointer to section with address > _region.addr_>
-if(_section_)
-    if(_section_ adjoins _region_ && _section.size_ >= _extra_requested_)
-        <remove section from data structures>
-        if(_section.size_ > _extra_requested_)
-            if(<can adjust _section_>)
-                <adjust _section_ by _extra_requested_>
-                <add adjusted section back to data structures>
-            else
-                <re-add UNadjusted section back to data structures>
-                <error>
-        <mark free space sections as changed in metadata cache>
-
-*/
+        */
         /* Look for a section after block to extend */
-        if((sect = (H5FS_section_info_t *)H5SL_greater(fspace->sinfo->merge_list, &addr))) {
+        if ((sect = (H5FS_section_info_t *)H5SL_greater(fspace->sinfo->merge_list, &addr))) {
             /* Check if this section adjoins the block and is large enough to
              *  fulfill extension request.
              *
@@ -1521,12 +1530,13 @@ if(_section_)
              *  possible neighboring nodes and is not at the end of the file
              *  (or it would have been eliminated), etc)
              */
-            if(sect->size >= extra_requested && (addr + size) == sect->addr) {
-                H5FS_section_class_t *cls;          /* Section's class */
+            if (sect->size >= extra_requested && (addr + size) == sect->addr) {
+                H5FS_section_class_t *cls; /* Section's class */
 
                 /* Remove section from data structures */
-                if(H5FS_sect_remove_real(fspace, sect) < 0)
-                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
+                if (H5FS_sect_remove_real(fspace, sect) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL,
+                                "can't remove section from internal data structures")
 
                 /* Get class for section */
                 cls = &fspace->sect_cls[sect->type];
@@ -1537,7 +1547,7 @@ if(_section_)
                  *      for the current usage, so I've deferred messing with
                  *      it. - QAK - 2008/01/08)
                  */
-                if(sect->size > extra_requested) {
+                if (sect->size > extra_requested) {
                     /* Sanity check (for now) */
                     HDassert(cls->flags & H5FS_CLS_ADJUST_OK);
 
@@ -1546,15 +1556,16 @@ if(_section_)
                     sect->size -= extra_requested;
 
                     /* Re-add adjusted section to free sections data structures */
-                    if(H5FS_sect_link(fspace, sect, 0) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space section into skip list")
+                    if (H5FS_sect_link(fspace, sect, 0) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL,
+                                    "can't insert free space section into skip list")
                 } /* end if */
                 else {
                     /* Sanity check */
                     HDassert(sect->size == extra_requested);
 
                     /* Exact match, so just free section */
-                    if((*cls->free)(sect) < 0)
+                    if ((*cls->free)(sect) < 0)
                         HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't free section")
                 } /* end else */
 
@@ -1564,18 +1575,17 @@ if(_section_)
                 /* Indicate success */
                 HGOTO_DONE(TRUE);
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
 done:
     /* Release the section info */
-    if(sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, sinfo_modified) < 0)
+    if (sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, sinfo_modified) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release section info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_try_extend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_find_node
  *
@@ -1599,13 +1609,13 @@ done:
 static htri_t
 H5FS_sect_find_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node)
 {
-    H5FS_node_t *fspace_node;        /* Free list size node */
-    unsigned bin;                   /* Bin to put the free space section in */
-    htri_t ret_value = FALSE;       /* Return value */
+    H5FS_node_t *fspace_node;       /* Free list size node */
+    unsigned     bin;               /* Bin to put the free space section in */
+    htri_t       ret_value = FALSE; /* Return value */
 
-    H5SL_node_t *curr_size_node=NULL;
-    const H5FS_section_class_t *cls;    /* Class of section */
-    hsize_t alignment;
+    H5SL_node_t *               curr_size_node = NULL;
+    const H5FS_section_class_t *cls; /* Class of section */
+    hsize_t                     alignment;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1620,45 +1630,49 @@ H5FS_sect_find_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node)
     bin = H5VM_log2_gen(request);
     HDassert(bin < fspace->sinfo->nbins);
 #ifdef QAK
-HDfprintf(stderr, "%s: fspace->sinfo->nbins = %u\n", FUNC, fspace->sinfo->nbins);
-HDfprintf(stderr, "%s: bin = %u\n", FUNC, bin);
+    HDfprintf(stderr, "%s: fspace->sinfo->nbins = %u\n", FUNC, fspace->sinfo->nbins);
+    HDfprintf(stderr, "%s: bin = %u\n", FUNC, bin);
 #endif /* QAK */
     alignment = fspace->alignment;
-    if(!((alignment > 1) && (request >= fspace->threshold)))
-	alignment = 0; /* no alignment */
+    if (!((alignment > 1) && (request >= fspace->threshold)))
+        alignment = 0; /* no alignment */
 
     do {
         /* Check if there's any sections in this bin */
-	if(fspace->sinfo->bins[bin].bin_list) {
-
-	    if (!alignment) { /* no alignment */
-		/* Find the first free space section that is large enough to fulfill request */
-		/* (Since the bins use skip lists to track the sizes of the address-ordered
-		 *  lists, this is actually a "best fit" algorithm)
-		 */
-		/* Look for large enough free space section in this bin */
-		if((fspace_node = (H5FS_node_t *)H5SL_greater(fspace->sinfo->bins[bin].bin_list, &request))) {
-		    /* Take first node off of the list (ie. node w/lowest address) */
-		    if(NULL == (*node = (H5FS_section_info_t *)H5SL_remove_first(fspace_node->sect_list)))
-			HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space node from skip list")
-
-		    /* Get section's class */
-		    cls = &fspace->sect_cls[(*node)->type];
-		    /* Decrement # of sections in section size node */
-		    if(H5FS_size_node_decr(fspace->sinfo, bin, fspace_node, cls) < 0)
-			HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space size node from skip list")
-		    if(H5FS_sect_unlink_rest(fspace, cls, *node) < 0)
-			HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from non-size tracking data structures")
-		    /* Indicate that we found a node for the request */
-		    HGOTO_DONE(TRUE)
-		} /* end if */
-	    }  /* end if */
+        if (fspace->sinfo->bins[bin].bin_list) {
+
+            if (!alignment) { /* no alignment */
+                /* Find the first free space section that is large enough to fulfill request */
+                /* (Since the bins use skip lists to track the sizes of the address-ordered
+                 *  lists, this is actually a "best fit" algorithm)
+                 */
+                /* Look for large enough free space section in this bin */
+                if ((fspace_node =
+                         (H5FS_node_t *)H5SL_greater(fspace->sinfo->bins[bin].bin_list, &request))) {
+                    /* Take first node off of the list (ie. node w/lowest address) */
+                    if (NULL == (*node = (H5FS_section_info_t *)H5SL_remove_first(fspace_node->sect_list)))
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL,
+                                    "can't remove free space node from skip list")
+
+                    /* Get section's class */
+                    cls = &fspace->sect_cls[(*node)->type];
+                    /* Decrement # of sections in section size node */
+                    if (H5FS_size_node_decr(fspace->sinfo, bin, fspace_node, cls) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL,
+                                    "can't remove free space size node from skip list")
+                    if (H5FS_sect_unlink_rest(fspace, cls, *node) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL,
+                                    "can't remove section from non-size tracking data structures")
+                    /* Indicate that we found a node for the request */
+                    HGOTO_DONE(TRUE)
+                }  /* end if */
+            }      /* end if */
             else { /* alignment is set */
                 /* get the first node of a certain size in this bin */
                 curr_size_node = H5SL_first(fspace->sinfo->bins[bin].bin_list);
                 while (curr_size_node != NULL) {
-                    H5FS_node_t *curr_fspace_node=NULL;
-                    H5SL_node_t *curr_sect_node=NULL;
+                    H5FS_node_t *curr_fspace_node = NULL;
+                    H5SL_node_t *curr_sect_node   = NULL;
 
                     /* Get the free space node for free space sections of the same size */
                     curr_fspace_node = (H5FS_node_t *)H5SL_item(curr_size_node);
@@ -1666,10 +1680,10 @@ HDfprintf(stderr, "%s: bin = %u\n", FUNC, bin);
                     /* Get the Skip list which holds  pointers to actual free list sections */
                     curr_sect_node = (H5SL_node_t *)H5SL_first(curr_fspace_node->sect_list);
 
-                    while(curr_sect_node != NULL) {
-                        H5FS_section_info_t *curr_sect=NULL;
-                        hsize_t mis_align=0, frag_size=0;
-                        H5FS_section_info_t *split_sect=NULL;
+                    while (curr_sect_node != NULL) {
+                        H5FS_section_info_t *curr_sect = NULL;
+                        hsize_t              mis_align = 0, frag_size = 0;
+                        H5FS_section_info_t *split_sect = NULL;
 
                         /* Get section node */
                         curr_sect = (H5FS_section_info_t *)H5SL_item(curr_sect_node);
@@ -1687,14 +1701,18 @@ HDfprintf(stderr, "%s: bin = %u\n", FUNC, bin);
 
                         if ((curr_sect->size >= (request + frag_size)) && (cls->split)) {
                             /* remove the section with aligned address */
-                            if(NULL == (*node = (H5FS_section_info_t *)H5SL_remove(curr_fspace_node->sect_list, &curr_sect->addr)))
-                                HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space node from skip list")
+                            if (NULL == (*node = (H5FS_section_info_t *)H5SL_remove(
+                                             curr_fspace_node->sect_list, &curr_sect->addr)))
+                                HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL,
+                                            "can't remove free space node from skip list")
                             /* Decrement # of sections in section size node */
-                            if(H5FS_size_node_decr(fspace->sinfo, bin, curr_fspace_node, cls) < 0)
-                                HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space size node from skip list")
+                            if (H5FS_size_node_decr(fspace->sinfo, bin, curr_fspace_node, cls) < 0)
+                                HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL,
+                                            "can't remove free space size node from skip list")
 
-                            if(H5FS_sect_unlink_rest(fspace, cls, *node) < 0)
-                                HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from non-size tracking data structures")
+                            if (H5FS_sect_unlink_rest(fspace, cls, *node) < 0)
+                                HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL,
+                                            "can't remove section from non-size tracking data structures")
 
                             /*
                              * The split() callback splits NODE into 2 sections:
@@ -1704,8 +1722,9 @@ HDfprintf(stderr, "%s: bin = %u\n", FUNC, bin);
                              */
                             if (mis_align) {
                                 split_sect = cls->split(*node, frag_size);
-                                if((H5FS_sect_link(fspace, split_sect, 0) < 0))
-                                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space section into skip list")
+                                if ((H5FS_sect_link(fspace, split_sect, 0) < 0))
+                                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL,
+                                                "can't insert free space section into skip list")
                                 /* sanity check */
                                 HDassert(split_sect->addr < (*node)->addr);
                                 HDassert(request <= (*node)->size);
@@ -1721,17 +1740,16 @@ HDfprintf(stderr, "%s: bin = %u\n", FUNC, bin);
                     /* Get the next size node in the bin */
                     curr_size_node = H5SL_next(curr_size_node);
                 } /* end while of curr_size_node */
-	    }  /* else of alignment */
-	} /* if bin_list */
-	/* Advance to next larger bin */
+            }     /* else of alignment */
+        }         /* if bin_list */
+                  /* Advance to next larger bin */
         bin++;
-    } while(bin < fspace->sinfo->nbins);
+    } while (bin < fspace->sinfo->nbins);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_find_node() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_find
  *
@@ -1752,17 +1770,16 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5FS_sect_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hsize_t request,
-    H5FS_section_info_t **node)
+H5FS_sect_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node)
 {
-    hbool_t sinfo_valid = FALSE;        /* Whether the section info is valid */
-    hbool_t sinfo_modified = FALSE;     /* Whether the section info was modified */
-    htri_t ret_value = FALSE;           /* Return value */
+    hbool_t sinfo_valid    = FALSE; /* Whether the section info is valid */
+    hbool_t sinfo_modified = FALSE; /* Whether the section info was modified */
+    htri_t  ret_value      = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
 #ifdef QAK
-HDfprintf(stderr, "%s: request = %Hu\n", FUNC, request);
+    HDfprintf(stderr, "%s: request = %Hu\n", FUNC, request);
 #endif /* QAK */
 
     /* Check arguments. */
@@ -1773,33 +1790,34 @@ HDfprintf(stderr, "%s: request = %Hu\n", FUNC, request);
 
     /* Check for any sections on free space list */
 #ifdef QAK
-HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
-HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_sect_count);
-HDfprintf(stderr, "%s: fspace->ghost_sect_count = %Hu\n", FUNC, fspace->ghost_sect_count);
+    HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
+    HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_sect_count);
+    HDfprintf(stderr, "%s: fspace->ghost_sect_count = %Hu\n", FUNC, fspace->ghost_sect_count);
 #endif /* QAK */
-    if(fspace->tot_sect_count > 0) {
+    if (fspace->tot_sect_count > 0) {
         /* Get a pointer to the section info */
-        if(H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
+        if (H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't get section info")
         sinfo_valid = TRUE;
 
         /* Look for node in bins */
-        if((ret_value = H5FS_sect_find_node(fspace, request, node)) < 0)
+        if ((ret_value = H5FS_sect_find_node(fspace, request, node)) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from bins")
 
         /* Decrement # of sections on free list, if we found an object */
-        if(ret_value > 0) {
+        if (ret_value > 0) {
             /* Note that we've modified the section info */
             sinfo_modified = TRUE;
 #ifdef QAK
-HDfprintf(stderr, "%s: (*node)->size = %Hu, (*node)->addr = %a, (*node)->type = %u\n", FUNC, (*node)->size, (*node)->addr, (*node)->type);
+            HDfprintf(stderr, "%s: (*node)->size = %Hu, (*node)->addr = %a, (*node)->type = %u\n", FUNC,
+                      (*node)->size, (*node)->addr, (*node)->type);
 #endif /* QAK */
-	}
+        }
     } /* end if */
 
 done:
     /* Release the section info */
-    if(sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, sinfo_modified) < 0)
+    if (sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, sinfo_modified) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release section info")
 
 #ifdef H5FS_DEBUG_ASSERT
@@ -1808,7 +1826,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_find() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_iterate_sect_cb
  *
@@ -1827,9 +1844,9 @@ done:
 static herr_t
 H5FS_iterate_sect_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata)
 {
-    H5FS_section_info_t *sect_info = (H5FS_section_info_t *)_item;   /* Free space section to work on */
-    H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_section_info_t *sect_info = (H5FS_section_info_t *)_item; /* Free space section to work on */
+    H5FS_iter_ud_t *     udata     = (H5FS_iter_ud_t *)_udata;     /* Callback info */
+    herr_t               ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1839,14 +1856,13 @@ H5FS_iterate_sect_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata)
     HDassert(udata->op);
 
     /* Make callback for this section */
-    if((*udata->op)(sect_info, udata->op_data) < 0)
+    if ((*udata->op)(sect_info, udata->op_data) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "iteration callback failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_iterate_sect_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_iterate_node_cb
  *
@@ -1865,9 +1881,9 @@ done:
 static herr_t
 H5FS_iterate_node_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata)
 {
-    H5FS_node_t *fspace_node = (H5FS_node_t *)_item;   /* Free space size node to work on */
-    H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_node_t *   fspace_node = (H5FS_node_t *)_item;     /* Free space size node to work on */
+    H5FS_iter_ud_t *udata       = (H5FS_iter_ud_t *)_udata; /* Callback info */
+    herr_t          ret_value   = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1878,14 +1894,13 @@ H5FS_iterate_node_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata)
 
     /* Iterate through all the sections of this size */
     HDassert(fspace_node->sect_list);
-    if(H5SL_iterate(fspace_node->sect_list, H5FS_iterate_sect_cb, udata) < 0)
+    if (H5SL_iterate(fspace_node->sect_list, H5FS_iterate_sect_cb, udata) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section nodes")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_iterate_node_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_iterate
  *
@@ -1903,9 +1918,9 @@ done:
 herr_t
 H5FS_sect_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, void *op_data)
 {
-    H5FS_iter_ud_t udata;               /* User data for callbacks */
-    hbool_t sinfo_valid = FALSE;        /* Whether the section info is valid */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_iter_ud_t udata;                 /* User data for callbacks */
+    hbool_t        sinfo_valid = FALSE;   /* Whether the section info is valid */
+    herr_t         ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1914,46 +1929,45 @@ H5FS_sect_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, v
     HDassert(op);
 
 #ifdef QAK
-HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
+    HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
 #endif /* QAK */
 
     /* Set up user data for iterator */
-    udata.fspace = fspace;
-    udata.op = op;
+    udata.fspace  = fspace;
+    udata.op      = op;
     udata.op_data = op_data;
 
     /* Iterate over sections, if there are any */
-    if(fspace->tot_sect_count) {
-        unsigned bin;           /* Current bin we are on */
+    if (fspace->tot_sect_count) {
+        unsigned bin; /* Current bin we are on */
 
         /* Get a pointer to the section info */
-        if(H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_READ) < 0)
+        if (H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_READ) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't get section info")
         sinfo_valid = TRUE;
 
         /* Iterate over all the bins */
 #ifdef QAK
-HDfprintf(stderr, "%s: Iterate over section bins\n", FUNC);
+        HDfprintf(stderr, "%s: Iterate over section bins\n", FUNC);
 #endif /* QAK */
-        for(bin = 0; bin < fspace->sinfo->nbins; bin++) {
+        for (bin = 0; bin < fspace->sinfo->nbins; bin++) {
             /* Check if there are any sections in this bin */
-            if(fspace->sinfo->bins[bin].bin_list) {
+            if (fspace->sinfo->bins[bin].bin_list) {
                 /* Iterate over list of section size nodes for bin */
-                if(H5SL_iterate(fspace->sinfo->bins[bin].bin_list, H5FS_iterate_node_cb, &udata) < 0)
+                if (H5SL_iterate(fspace->sinfo->bins[bin].bin_list, H5FS_iterate_node_cb, &udata) < 0)
                     HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section size nodes")
             } /* end if */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
 
 done:
     /* Release the section info */
-    if(sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, FALSE) < 0)
+    if (sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, FALSE) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release section info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_stats
  *
@@ -1976,15 +1990,14 @@ H5FS_sect_stats(const H5FS_t *fspace, hsize_t *tot_space, hsize_t *nsects)
     HDassert(fspace);
 
     /* Get the stats desired */
-    if(tot_space)
+    if (tot_space)
         *tot_space = fspace->tot_space;
-    if(nsects)
+    if (nsects)
         *nsects = fspace->tot_sect_count;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FS_sect_stats() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_change_class
  *
@@ -2001,14 +2014,13 @@ H5FS_sect_stats(const H5FS_t *fspace, hsize_t *tot_space, hsize_t *nsects)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t *sect, unsigned new_class)
+H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect, unsigned new_class)
 {
-    const H5FS_section_class_t *old_cls;        /* Old class of section */
-    const H5FS_section_class_t *new_cls;        /* New class of section */
-    unsigned old_class;                         /* Old class ID of section */
-    hbool_t sinfo_valid = FALSE;                /* Whether the section info is valid */
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    const H5FS_section_class_t *old_cls;               /* Old class of section */
+    const H5FS_section_class_t *new_cls;               /* New class of section */
+    unsigned                    old_class;             /* Old class ID of section */
+    hbool_t                     sinfo_valid = FALSE;   /* Whether the section info is valid */
+    herr_t                      ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2019,32 +2031,32 @@ H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
     HDassert(new_class < fspace->nclasses);
 
     /* Get a pointer to the section info */
-    if(H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
+    if (H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't get section info")
     sinfo_valid = TRUE;
 
     /* Get class info */
     old_class = sect->type;
-    old_cls = &fspace->sect_cls[sect->type];
-    new_cls = &fspace->sect_cls[new_class];
+    old_cls   = &fspace->sect_cls[sect->type];
+    new_cls   = &fspace->sect_cls[new_class];
 #ifdef QAK
-HDfprintf(stderr, "%s: old_cls->flags = %x\n", FUNC, old_cls->flags);
-HDfprintf(stderr, "%s: new_cls->flags = %x\n", FUNC, new_cls->flags);
+    HDfprintf(stderr, "%s: old_cls->flags = %x\n", FUNC, old_cls->flags);
+    HDfprintf(stderr, "%s: new_cls->flags = %x\n", FUNC, new_cls->flags);
 #endif /* QAK */
 
     /* Check if the section's class change will affect the # of serializable or ghost sections */
-    if((old_cls->flags & H5FS_CLS_GHOST_OBJ) != (new_cls->flags & H5FS_CLS_GHOST_OBJ)) {
-        H5FS_node_t *fspace_node;       /* Free list size node */
-        unsigned bin;                   /* Bin to put the free space section in */
-        hbool_t to_ghost;       /* Flag if the section is changing to a ghost section */
+    if ((old_cls->flags & H5FS_CLS_GHOST_OBJ) != (new_cls->flags & H5FS_CLS_GHOST_OBJ)) {
+        H5FS_node_t *fspace_node; /* Free list size node */
+        unsigned     bin;         /* Bin to put the free space section in */
+        hbool_t      to_ghost;    /* Flag if the section is changing to a ghost section */
 
         /* Determine if this section is becoming a ghost or is becoming serializable */
-        if(old_cls->flags & H5FS_CLS_GHOST_OBJ)
+        if (old_cls->flags & H5FS_CLS_GHOST_OBJ)
             to_ghost = FALSE;
         else
             to_ghost = TRUE;
 #ifdef QAK
-HDfprintf(stderr, "%s: to_ghost = %u\n", FUNC, to_ghost);
+        HDfprintf(stderr, "%s: to_ghost = %u\n", FUNC, to_ghost);
 #endif /* QAK */
 
         /* Sanity check */
@@ -2060,7 +2072,7 @@ HDfprintf(stderr, "%s: to_ghost = %u\n", FUNC, to_ghost);
         HDassert(fspace_node);
 
         /* Adjust serializable/ghost counts */
-        if(to_ghost) {
+        if (to_ghost) {
             /* Adjust global section count totals */
             fspace->serial_sect_count--;
             fspace->ghost_sect_count++;
@@ -2074,9 +2086,9 @@ HDfprintf(stderr, "%s: to_ghost = %u\n", FUNC, to_ghost);
             fspace_node->ghost_count++;
 
             /* Check if we switched a section size node's status */
-            if(fspace_node->serial_count == 0)
+            if (fspace_node->serial_count == 0)
                 fspace->sinfo->serial_size_count--;
-            if(fspace_node->ghost_count == 1)
+            if (fspace_node->ghost_count == 1)
                 fspace->sinfo->ghost_size_count++;
         } /* end if */
         else {
@@ -2093,48 +2105,52 @@ HDfprintf(stderr, "%s: to_ghost = %u\n", FUNC, to_ghost);
             fspace_node->ghost_count--;
 
             /* Check if we switched a section size node's status */
-            if(fspace_node->serial_count == 1)
+            if (fspace_node->serial_count == 1)
                 fspace->sinfo->serial_size_count++;
-            if(fspace_node->ghost_count == 0)
+            if (fspace_node->ghost_count == 0)
                 fspace->sinfo->ghost_size_count--;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Check if the section's class change will affect the mergable list */
-    if((old_cls->flags & H5FS_CLS_SEPAR_OBJ) != (new_cls->flags & H5FS_CLS_SEPAR_OBJ)) {
-        hbool_t to_mergable;       /* Flag if the section is changing to a mergable section */
+    if ((old_cls->flags & H5FS_CLS_SEPAR_OBJ) != (new_cls->flags & H5FS_CLS_SEPAR_OBJ)) {
+        hbool_t to_mergable; /* Flag if the section is changing to a mergable section */
 
         /* Determine if this section is becoming mergable or is becoming separate */
-        if(old_cls->flags & H5FS_CLS_SEPAR_OBJ)
+        if (old_cls->flags & H5FS_CLS_SEPAR_OBJ)
             to_mergable = TRUE;
         else
             to_mergable = FALSE;
 #ifdef QAK
-HDfprintf(stderr, "%s: to_mergable = %u\n", FUNC, to_mergable);
+        HDfprintf(stderr, "%s: to_mergable = %u\n", FUNC, to_mergable);
 #endif /* QAK */
 
         /* Add or remove section from merge list, as appropriate */
-        if(to_mergable) {
+        if (to_mergable) {
 #ifdef QAK
-HDfprintf(stderr, "%s: inserting object into merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
+            HDfprintf(stderr, "%s: inserting object into merge list, sect->type = %u\n", FUNC,
+                      (unsigned)sect->type);
 #endif /* QAK */
-            if(fspace->sinfo->merge_list == NULL)
-                if(NULL == (fspace->sinfo->merge_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
-                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for merging free space sections")
-            if(H5SL_insert(fspace->sinfo->merge_list, sect, &sect->addr) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into merging skip list")
+            if (fspace->sinfo->merge_list == NULL)
+                if (NULL == (fspace->sinfo->merge_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL,
+                                "can't create skip list for merging free space sections")
+            if (H5SL_insert(fspace->sinfo->merge_list, sect, &sect->addr) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL,
+                            "can't insert free space node into merging skip list")
         } /* end if */
         else {
             H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
 
 #ifdef QAK
-HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
+            HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC,
+                      (unsigned)sect->type);
 #endif /* QAK */
             tmp_sect_node = (H5FS_section_info_t *)H5SL_remove(fspace->sinfo->merge_list, &sect->addr);
-            if(tmp_sect_node == NULL || tmp_sect_node != sect)
+            if (tmp_sect_node == NULL || tmp_sect_node != sect)
                 HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Change the section's class */
     sect->type = new_class;
@@ -2144,19 +2160,19 @@ HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC
     fspace->sinfo->serial_size += fspace->sect_cls[new_class].serial_size;
 
     /* Update current space used for free space sections */
-    if(H5FS_sect_serialize_size(fspace) < 0)
+    if (H5FS_sect_serialize_size(fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
 
 done:
     /* Release the section info */
-    if(sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, TRUE) < 0)
+    if (sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, TRUE) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release section info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_change_class() */
 
 #ifdef H5FS_DEBUG_ASSERT
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_assert
  *
@@ -2173,86 +2189,87 @@ done:
 herr_t
 H5FS_sect_assert(const H5FS_t *fspace)
 {
-    hsize_t separate_obj;       /* The number of separate objects managed */
+    hsize_t separate_obj; /* The number of separate objects managed */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 #ifdef QAK
-HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS_sect_assert", fspace->tot_sect_count);
+    HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS_sect_assert", fspace->tot_sect_count);
 #endif /* QAK */
 
     /* Initialize state */
     separate_obj = 0;
 
     /* Check for bins to work on */
-    if(fspace->sinfo->bins) {
-        hsize_t acc_tot_sect_count;     /* Accumulated total section count from bins */
-        hsize_t acc_serial_sect_count;  /* Accumulated serializable section count from bins */
-        hsize_t acc_ghost_sect_count;   /* Accumulated ghost section count from bins */
-        size_t acc_tot_size_count;      /* Accumulated total section size count from bins */
-        size_t acc_serial_size_count;   /* Accumulated serializable section size count from bins */
-        size_t acc_ghost_size_count;    /* Accumulated ghost section size count from bins */
-        unsigned u;             /* Local index variable */
+    if (fspace->sinfo->bins) {
+        hsize_t  acc_tot_sect_count;    /* Accumulated total section count from bins */
+        hsize_t  acc_serial_sect_count; /* Accumulated serializable section count from bins */
+        hsize_t  acc_ghost_sect_count;  /* Accumulated ghost section count from bins */
+        size_t   acc_tot_size_count;    /* Accumulated total section size count from bins */
+        size_t   acc_serial_size_count; /* Accumulated serializable section size count from bins */
+        size_t   acc_ghost_size_count;  /* Accumulated ghost section size count from bins */
+        unsigned u;                     /* Local index variable */
 
         /* Walk through all sections in bins */
-        acc_tot_sect_count = 0;
+        acc_tot_sect_count    = 0;
         acc_serial_sect_count = 0;
-        acc_ghost_sect_count = 0;
-        acc_tot_size_count = 0;
+        acc_ghost_sect_count  = 0;
+        acc_tot_size_count    = 0;
         acc_serial_size_count = 0;
-        acc_ghost_size_count = 0;
-        for(u = 0; u < fspace->sinfo->nbins; u++) {
+        acc_ghost_size_count  = 0;
+        for (u = 0; u < fspace->sinfo->nbins; u++) {
             acc_tot_sect_count += fspace->sinfo->bins[u].tot_sect_count;
             acc_serial_sect_count += fspace->sinfo->bins[u].serial_sect_count;
             acc_ghost_sect_count += fspace->sinfo->bins[u].ghost_sect_count;
-            if(fspace->sinfo->bins[u].bin_list) {
-                H5SL_node_t *curr_size_node;    /* Current section size node in skip list */
-                size_t bin_serial_count;        /* # of serializable sections in this bin */
-                size_t bin_ghost_count;         /* # of ghost sections in this bin */
+            if (fspace->sinfo->bins[u].bin_list) {
+                H5SL_node_t *curr_size_node;   /* Current section size node in skip list */
+                size_t       bin_serial_count; /* # of serializable sections in this bin */
+                size_t       bin_ghost_count;  /* # of ghost sections in this bin */
 
                 acc_tot_size_count += H5SL_count(fspace->sinfo->bins[u].bin_list);
 
                 /* Walk through the sections in this bin */
-                curr_size_node = H5SL_first(fspace->sinfo->bins[u].bin_list);
+                curr_size_node   = H5SL_first(fspace->sinfo->bins[u].bin_list);
                 bin_serial_count = 0;
-                bin_ghost_count = 0;
-                while(curr_size_node != NULL) {
+                bin_ghost_count  = 0;
+                while (curr_size_node != NULL) {
                     H5FS_node_t *fspace_node;       /* Section size node */
                     H5SL_node_t *curr_sect_node;    /* Current section node in skip list */
-                    size_t size_serial_count;       /* # of serializable sections of this size */
-                    size_t size_ghost_count;        /* # of ghost sections of this size */
+                    size_t       size_serial_count; /* # of serializable sections of this size */
+                    size_t       size_ghost_count;  /* # of ghost sections of this size */
 
                     /* Get section size node */
                     fspace_node = H5SL_item(curr_size_node);
 
                     /* Check sections on list */
-                    curr_sect_node = H5SL_first(fspace_node->sect_list);
+                    curr_sect_node    = H5SL_first(fspace_node->sect_list);
                     size_serial_count = 0;
-                    size_ghost_count = 0;
-                    while(curr_sect_node != NULL) {
-                        H5FS_section_class_t *cls;      /* Class of section */
-                        H5FS_section_info_t *sect;      /* Section */
+                    size_ghost_count  = 0;
+                    while (curr_sect_node != NULL) {
+                        H5FS_section_class_t *cls;  /* Class of section */
+                        H5FS_section_info_t * sect; /* Section */
 
                         /* Get section node & it's class */
                         sect = H5SL_item(curr_sect_node);
-                        cls = &fspace->sect_cls[sect->type];
+                        cls  = &fspace->sect_cls[sect->type];
 #ifdef QAK
-HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H5FS_assert", sect->size, sect->addr, sect->type);
+                        HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n",
+                                  "H5FS_assert", sect->size, sect->addr, sect->type);
 #endif /* QAK */
 
                         /* Sanity check section */
                         HDassert(H5F_addr_defined(sect->addr));
                         HDassert(fspace_node->sect_size == sect->size);
-                        if(cls->valid)
+                        if (cls->valid)
                             (*cls->valid)(cls, sect);
 
                         /* Add to correct count */
-                        if(cls->flags & H5FS_CLS_GHOST_OBJ)
+                        if (cls->flags & H5FS_CLS_GHOST_OBJ)
                             size_ghost_count++;
                         else
                             size_serial_count++;
 
                         /* Count node, if separate */
-                        if(cls->flags & H5FS_CLS_SEPAR_OBJ)
+                        if (cls->flags & H5FS_CLS_SEPAR_OBJ)
                             separate_obj++;
 
                         /* Get the next section node in the list */
@@ -2264,9 +2281,9 @@ HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H
                     HDassert(fspace_node->ghost_count == size_ghost_count);
 
                     /* Add to global count of serializable & ghost section sizes */
-                    if(fspace_node->serial_count > 0)
+                    if (fspace_node->serial_count > 0)
                         acc_serial_size_count++;
-                    if(fspace_node->ghost_count > 0)
+                    if (fspace_node->ghost_count > 0)
                         acc_ghost_size_count++;
 
                     /* Add to bin's serializable & ghost counts */
@@ -2282,7 +2299,7 @@ HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H
                 HDassert(fspace->sinfo->bins[u].serial_sect_count == bin_serial_count);
                 HDassert(fspace->sinfo->bins[u].ghost_sect_count == bin_ghost_count);
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /* Check counts from bins vs. global counts */
         HDassert(fspace->sinfo->tot_size_count == acc_tot_size_count);
@@ -2300,14 +2317,13 @@ HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H
     } /* end else */
 
     /* Make certain that the number of sections on the address list is correct */
-    if(fspace->sinfo->merge_list)
+    if (fspace->sinfo->merge_list)
         HDassert(fspace->tot_sect_count == (separate_obj + H5SL_count(fspace->sinfo->merge_list)));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FS_sect_assert() */
 #endif /* H5FS_DEBUG_ASSERT */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_try_shrink_eoa
  *
@@ -2324,60 +2340,60 @@ HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H
 htri_t
 H5FS_sect_try_shrink_eoa(const H5F_t *f, hid_t dxpl_id, const H5FS_t *fspace, void *op_data)
 {
-    hbool_t sinfo_valid = FALSE;        /* Whether the section info is valid */
-    hbool_t section_removed = FALSE;    /* Whether a section was removed */
-    htri_t ret_value = FALSE;          	/* Return value */
+    hbool_t sinfo_valid     = FALSE; /* Whether the section info is valid */
+    hbool_t section_removed = FALSE; /* Whether a section was removed */
+    htri_t  ret_value       = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments. */
     HDassert(fspace);
 
-    if(H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
+    if (H5FS_sinfo_lock(f, dxpl_id, fspace, H5AC_WRITE) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't get section info")
     sinfo_valid = TRUE;
 
-    if(fspace->sinfo && fspace->sinfo->merge_list) {
-        H5SL_node_t *last_node;         	/* Last node in merge list */
+    if (fspace->sinfo && fspace->sinfo->merge_list) {
+        H5SL_node_t *last_node; /* Last node in merge list */
 
         /* Check for last node in the merge list */
-        if(NULL != (last_node = H5SL_last(fspace->sinfo->merge_list))) {
-            H5FS_section_info_t *tmp_sect;  	/* Temporary free space section */
-            H5FS_section_class_t *tmp_sect_cls;	/* Temporary section's class */
+        if (NULL != (last_node = H5SL_last(fspace->sinfo->merge_list))) {
+            H5FS_section_info_t * tmp_sect;     /* Temporary free space section */
+            H5FS_section_class_t *tmp_sect_cls; /* Temporary section's class */
 
             /* Get the pointer to the last section, from the last node */
             tmp_sect = (H5FS_section_info_t *)H5SL_item(last_node);
             HDassert(tmp_sect);
-	    tmp_sect_cls = &fspace->sect_cls[tmp_sect->type];
-	    if(tmp_sect_cls->can_shrink) {
+            tmp_sect_cls = &fspace->sect_cls[tmp_sect->type];
+            if (tmp_sect_cls->can_shrink) {
                 /* Check if the section can be shrunk away */
-		if((ret_value = (*tmp_sect_cls->can_shrink)(tmp_sect, op_data)) < 0)
-		    HGOTO_ERROR(H5E_FSPACE, H5E_CANTSHRINK, FAIL, "can't check for shrinking container")
-		if(ret_value > 0) {
-		    HDassert(tmp_sect_cls->shrink);
+                if ((ret_value = (*tmp_sect_cls->can_shrink)(tmp_sect, op_data)) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTSHRINK, FAIL, "can't check for shrinking container")
+                if (ret_value > 0) {
+                    HDassert(tmp_sect_cls->shrink);
 
                     /* Remove section from free space manager */
-		    if(H5FS_sect_remove_real(fspace, tmp_sect) < 0)
-			HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
+                    if (H5FS_sect_remove_real(fspace, tmp_sect) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL,
+                                    "can't remove section from internal data structures")
                     section_removed = TRUE;
 
                     /* Shrink away section */
-		    if((*tmp_sect_cls->shrink)(&tmp_sect, op_data) < 0)
-			HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't shrink free space container")
-		} /* end if */
-	    } /* end if */
-	} /* end if */
-    } /* end if */
+                    if ((*tmp_sect_cls->shrink)(&tmp_sect, op_data) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't shrink free space container")
+                } /* end if */
+            }     /* end if */
+        }         /* end if */
+    }             /* end if */
 
 done:
     /* Release the section info */
-    if(sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, section_removed) < 0)
+    if (sinfo_valid && H5FS_sinfo_unlock(f, dxpl_id, fspace, section_removed) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release section info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_try_shrink_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FS_sect_query_last_sect
  *
@@ -2398,23 +2414,22 @@ H5FS_sect_query_last_sect(const H5FS_t *fspace, haddr_t *sect_addr, hsize_t *sec
     /* Check arguments. */
     HDassert(fspace);
 
-    if(fspace->sinfo && fspace->sinfo->merge_list) {
-        H5SL_node_t *last_node;             /* Last node in merge list */
+    if (fspace->sinfo && fspace->sinfo->merge_list) {
+        H5SL_node_t *last_node; /* Last node in merge list */
 
         /* Check for last node in the merge list */
-        if(NULL != (last_node = H5SL_last(fspace->sinfo->merge_list))) {
-            H5FS_section_info_t *tmp_sect;      /* Temporary free space section */
+        if (NULL != (last_node = H5SL_last(fspace->sinfo->merge_list))) {
+            H5FS_section_info_t *tmp_sect; /* Temporary free space section */
 
             /* Get the pointer to the last section, from the last node */
             tmp_sect = (H5FS_section_info_t *)H5SL_item(last_node);
             HDassert(tmp_sect);
-	    if(sect_addr)
+            if (sect_addr)
                 *sect_addr = tmp_sect->addr;
-	    if(sect_size)
+            if (sect_size)
                 *sect_size = tmp_sect->size;
-	} /* end if */
-    } /* end if */
+        } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FS_sect_query_last_sect() */
-
diff --git a/src/H5FSstat.c b/src/H5FSstat.c
index 6242b54..9bf735f 100644
--- a/src/H5FSstat.c
+++ b/src/H5FSstat.c
@@ -20,51 +20,43 @@
 /* Module Setup */
 /****************/
 
-#define H5FS_PACKAGE		/*suppress error about including H5FSpkg  */
+#define H5FS_PACKAGE /*suppress error about including H5FSpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FSpkg.h"		/* Free-space manager 			*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5FSpkg.h"    /* Free-space manager 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5FS_stat_info
  *
@@ -89,16 +81,15 @@ H5FS_stat_info(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *stats)
     HDassert(stats);
 
     /* Report statistics for free space */
-    stats->tot_space = frsp->tot_space;
-    stats->tot_sect_count = frsp->tot_sect_count;
+    stats->tot_space         = frsp->tot_space;
+    stats->tot_sect_count    = frsp->tot_sect_count;
     stats->serial_sect_count = frsp->serial_sect_count;
-    stats->ghost_sect_count = frsp->ghost_sect_count;
-    stats->addr = frsp->addr;
-    stats->hdr_size = (size_t)H5FS_HEADER_SIZE(f);
-    stats->sect_addr = frsp->sect_addr;
-    stats->alloc_sect_size = frsp->alloc_sect_size;
-    stats->sect_size = frsp->sect_size;
+    stats->ghost_sect_count  = frsp->ghost_sect_count;
+    stats->addr              = frsp->addr;
+    stats->hdr_size          = (size_t)H5FS_HEADER_SIZE(f);
+    stats->sect_addr         = frsp->sect_addr;
+    stats->alloc_sect_size   = frsp->alloc_sect_size;
+    stats->sect_size         = frsp->sect_size;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FS_stat_info() */
-
diff --git a/src/H5FStest.c b/src/H5FStest.c
index 7ea9a4a..a165e18 100644
--- a/src/H5FStest.c
+++ b/src/H5FStest.c
@@ -20,52 +20,44 @@
 /* Module Setup */
 /****************/
 
-#define H5FS_PACKAGE		/*suppress error about including H5FSpkg  */
-#define H5FS_TESTING		/*suppress warning about H5FS testing funcs */
+#define H5FS_PACKAGE /*suppress error about including H5FSpkg  */
+#define H5FS_TESTING /*suppress warning about H5FS testing funcs */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FSpkg.h"		/* Free-space manager			*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5FSpkg.h"    /* Free-space manager			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5FS_get_cparam_test
  *
@@ -89,16 +81,15 @@ H5FS_get_cparam_test(const H5FS_t *frsp, H5FS_create_t *cparam)
     HDassert(frsp);
     HDassert(cparam);
 
-    cparam->client = frsp->client;
+    cparam->client         = frsp->client;
     cparam->shrink_percent = frsp->shrink_percent;
     cparam->expand_percent = frsp->expand_percent;
-    cparam->max_sect_addr = frsp->max_sect_addr;
-    cparam->max_sect_size = frsp->max_sect_size;
+    cparam->max_sect_addr  = frsp->max_sect_addr;
+    cparam->max_sect_size  = frsp->max_sect_size;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FS_get_cparam_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FS_cmp_cparam_test
  *
@@ -115,7 +106,7 @@ H5FS_get_cparam_test(const H5FS_t *frsp, H5FS_create_t *cparam)
 int
 H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2)
 {
-    int ret_value = SUCCEED;         /* Return value */
+    int ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -123,32 +114,31 @@ H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2)
     HDassert(cparam1);
     HDassert(cparam2);
 
-    if(cparam1->client < cparam2->client)
+    if (cparam1->client < cparam2->client)
         HGOTO_DONE(-1)
-    else if(cparam1->client > cparam2->client)
+    else if (cparam1->client > cparam2->client)
         HGOTO_DONE(1)
 
-    if(cparam1->shrink_percent < cparam2->shrink_percent)
+    if (cparam1->shrink_percent < cparam2->shrink_percent)
         HGOTO_DONE(-1)
-    else if(cparam1->shrink_percent > cparam2->shrink_percent)
+    else if (cparam1->shrink_percent > cparam2->shrink_percent)
         HGOTO_DONE(1)
 
-    if(cparam1->expand_percent < cparam2->expand_percent)
+    if (cparam1->expand_percent < cparam2->expand_percent)
         HGOTO_DONE(-1)
-    else if(cparam1->expand_percent > cparam2->expand_percent)
+    else if (cparam1->expand_percent > cparam2->expand_percent)
         HGOTO_DONE(1)
 
-    if(cparam1->max_sect_size < cparam2->max_sect_size)
+    if (cparam1->max_sect_size < cparam2->max_sect_size)
         HGOTO_DONE(-1)
-    else if(cparam1->max_sect_size > cparam2->max_sect_size)
+    else if (cparam1->max_sect_size > cparam2->max_sect_size)
         HGOTO_DONE(1)
 
-    if(cparam1->max_sect_addr < cparam2->max_sect_addr)
+    if (cparam1->max_sect_addr < cparam2->max_sect_addr)
         HGOTO_DONE(-1)
-    else if(cparam1->max_sect_addr > cparam2->max_sect_addr)
+    else if (cparam1->max_sect_addr > cparam2->max_sect_addr)
         HGOTO_DONE(1)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_cmp_cparam_test */
-
diff --git a/src/H5Faccum.c b/src/H5Faccum.c
index 80f8d65..6fd4392 100644
--- a/src/H5Faccum.c
+++ b/src/H5Faccum.c
@@ -28,28 +28,25 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5VMprivate.h"	/* Vectors and arrays 			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Metadata accumulator controls */
-#define H5F_ACCUM_THROTTLE      8
-#define H5F_ACCUM_THRESHOLD     2048
-#define H5F_ACCUM_MAX_SIZE      (1024 *1024) /* Max. accum. buf size (max. I/Os will be 1/2 this size) */
-
+#define H5F_ACCUM_THROTTLE  8
+#define H5F_ACCUM_THRESHOLD 2048
+#define H5F_ACCUM_MAX_SIZE  (1024 * 1024) /* Max. accum. buf size (max. I/Os will be 1/2 this size) */
 
 /******************/
 /* Local Typedefs */
@@ -57,31 +54,26 @@
 
 /* Enumerated type to indicate how data will be added to accumulator */
 typedef enum {
-    H5F_ACCUM_PREPEND,          /* Data will be prepended to accumulator */
-    H5F_ACCUM_APPEND            /* Data will be appended to accumulator */
+    H5F_ACCUM_PREPEND, /* Data will be prepended to accumulator */
+    H5F_ACCUM_APPEND   /* Data will be appended to accumulator */
 } H5F_accum_adjust_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -89,8 +81,6 @@ typedef enum {
 /* Declare a PQ free list to manage the metadata accumulator buffer */
 H5FL_BLK_DEFINE_STATIC(meta_accum);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5F__accum_read
  *
@@ -110,11 +100,10 @@ H5FL_BLK_DEFINE_STATIC(meta_accum);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
-    size_t size, void *buf/*out*/)
+H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, size_t size, void *buf /*out*/)
 {
-    H5FD_mem_t  map_type;               /* Mapped memory type */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5FD_mem_t map_type;            /* Mapped memory type */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -127,48 +116,48 @@ H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
     /* Check if this information is in the metadata accumulator */
-    if((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && map_type != H5FD_MEM_DRAW) {
-        H5F_meta_accum_t *accum;     /* Alias for file's metadata accumulator */
+    if ((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && map_type != H5FD_MEM_DRAW) {
+        H5F_meta_accum_t *accum; /* Alias for file's metadata accumulator */
 
         /* Set up alias for file's metadata accumulator info */
         accum = &fio_info->f->shared->accum;
 
-        if(size < H5F_ACCUM_MAX_SIZE) {
+        if (size < H5F_ACCUM_MAX_SIZE) {
             /* Sanity check */
             HDassert(!accum->buf || (accum->alloc_size >= accum->size));
 
             /* Current read adjoins or overlaps with metadata accumulator */
-            if(H5F_addr_overlap(addr, size, accum->loc, accum->size)
-                    || ((addr + size) == accum->loc)
-                    || (accum->loc + accum->size) == addr) {
-                size_t amount_before;       /* Amount to read before current accumulator */
-                haddr_t new_addr;           /* New address of the accumulator buffer */
-                size_t new_size;            /* New size of the accumulator buffer */
+            if (H5F_addr_overlap(addr, size, accum->loc, accum->size) || ((addr + size) == accum->loc) ||
+                (accum->loc + accum->size) == addr) {
+                size_t  amount_before; /* Amount to read before current accumulator */
+                haddr_t new_addr;      /* New address of the accumulator buffer */
+                size_t  new_size;      /* New size of the accumulator buffer */
 
                 /* Compute new values for accumulator */
                 new_addr = MIN(addr, accum->loc);
                 new_size = (size_t)(MAX((addr + size), (accum->loc + accum->size)) - new_addr);
 
                 /* Check if we need more buffer space */
-                if(new_size > accum->alloc_size) {
-                    size_t new_alloc_size;        /* New size of accumulator */
+                if (new_size > accum->alloc_size) {
+                    size_t new_alloc_size; /* New size of accumulator */
 
                     /* Adjust the buffer size to be a power of 2 that is large enough to hold data */
                     new_alloc_size = (size_t)1 << (1 + H5VM_log2_gen((uint64_t)(new_size - 1)));
 
                     /* Reallocate the metadata accumulator buffer */
-                    if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_alloc_size)))
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
+                    if (NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_alloc_size)))
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                    "unable to allocate metadata accumulator buffer")
 
                     /* Note the new buffer size */
                     accum->alloc_size = new_alloc_size;
 #ifdef H5_CLEAR_MEMORY
-    HDmemset(accum->buf + accum->size, 0, (accum->alloc_size - accum->size));
-#endif /* H5_CLEAR_MEMORY */
+                    HDmemset(accum->buf + accum->size, 0, (accum->alloc_size - accum->size));
+#endif            /* H5_CLEAR_MEMORY */
                 } /* end if */
 
                 /* Read the part before the metadata accumulator */
-                if(addr < accum->loc) {
+                if (addr < accum->loc) {
                     /* Set the amount to read */
                     H5_CHECKED_ASSIGN(amount_before, size_t, (accum->loc - addr), hsize_t);
 
@@ -176,25 +165,29 @@ H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
                     HDmemmove(accum->buf + amount_before, accum->buf, accum->size);
 
                     /* Adjust dirty region tracking info, if present */
-                    if(accum->dirty)
+                    if (accum->dirty)
                         accum->dirty_off += amount_before;
 
                     /* Dispatch to driver */
-                    if(H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, amount_before, accum->buf) < 0)
+                    if (H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, amount_before,
+                                  accum->buf) < 0)
                         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "driver read request failed")
                 } /* end if */
                 else
                     amount_before = 0;
 
                 /* Read the part after the metadata accumulator */
-                if((addr + size) > (accum->loc + accum->size)) {
-                    size_t amount_after;         /* Amount to read at a time */
+                if ((addr + size) > (accum->loc + accum->size)) {
+                    size_t amount_after; /* Amount to read at a time */
 
                     /* Set the amount to read */
-                    H5_CHECKED_ASSIGN(amount_after, size_t, ((addr + size) - (accum->loc + accum->size)), hsize_t);
+                    H5_CHECKED_ASSIGN(amount_after, size_t, ((addr + size) - (accum->loc + accum->size)),
+                                      hsize_t);
 
                     /* Dispatch to driver */
-                    if(H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, (accum->loc + accum->size), amount_after, (accum->buf + accum->size + amount_before)) < 0)
+                    if (H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type,
+                                  (accum->loc + accum->size), amount_after,
+                                  (accum->buf + accum->size + amount_before)) < 0)
                         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "driver read request failed")
                 } /* end if */
 
@@ -202,19 +195,19 @@ H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
                 HDmemcpy(buf, accum->buf + (addr - new_addr), size);
 
                 /* Adjust the accumulator address & size */
-                accum->loc = new_addr;
+                accum->loc  = new_addr;
                 accum->size = new_size;
             } /* end if */
             /* Current read doesn't overlap with metadata accumulator, read it from file */
             else {
                 /* Dispatch to driver */
-                if(H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
+                if (H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
                     HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "driver read request failed")
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else {
             /* Read the data */
-            if(H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
+            if (H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "driver read request failed")
 
             /* Check for overlap w/dirty accumulator */
@@ -222,15 +215,15 @@ H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
              *  information in the accumulator with [some of] the information
              *  just read in. -QAK)
              */
-            if(accum->dirty &&
-                    H5F_addr_overlap(addr, size, accum->loc + accum->dirty_off, accum->dirty_len)) {
-                haddr_t dirty_loc = accum->loc + accum->dirty_off;  /* File offset of dirty information */
-                size_t buf_off;         /* Offset of dirty region in buffer */
-                size_t dirty_off;       /* Offset within dirty region */
-                size_t overlap_size;    /* Size of overlap with dirty region */
+            if (accum->dirty &&
+                H5F_addr_overlap(addr, size, accum->loc + accum->dirty_off, accum->dirty_len)) {
+                haddr_t dirty_loc = accum->loc + accum->dirty_off; /* File offset of dirty information */
+                size_t  buf_off;                                   /* Offset of dirty region in buffer */
+                size_t  dirty_off;                                 /* Offset within dirty region */
+                size_t  overlap_size;                              /* Size of overlap with dirty region */
 
                 /* Check for read starting before beginning dirty region */
-                if(H5F_addr_le(addr, dirty_loc)) {
+                if (H5F_addr_le(addr, dirty_loc)) {
                     /* Compute offset of dirty region within buffer */
                     buf_off = (size_t)(dirty_loc - addr);
 
@@ -238,26 +231,27 @@ H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
                     dirty_off = 0;
 
                     /* Check for read ending within dirty region */
-                    if(H5F_addr_lt(addr + size, dirty_loc + accum->dirty_len))
+                    if (H5F_addr_lt(addr + size, dirty_loc + accum->dirty_len))
                         overlap_size = (size_t)((addr + size) - buf_off);
-                    else        /* Access covers whole dirty region */
+                    else /* Access covers whole dirty region */
                         overlap_size = accum->dirty_len;
-                } /* end if */
+                }      /* end if */
                 else { /* Read starts after beginning of dirty region */
                     /* Compute dirty offset within buffer and overlap size */
-                    buf_off = 0;
-                    dirty_off = (size_t)(addr - dirty_loc);
+                    buf_off      = 0;
+                    dirty_off    = (size_t)(addr - dirty_loc);
                     overlap_size = (size_t)((dirty_loc + accum->dirty_len) - addr);
                 } /* end else */
 
                 /* Copy the dirty region to buffer */
-                HDmemcpy((unsigned char *)buf + buf_off, (unsigned char *)accum->buf + accum->dirty_off + dirty_off, overlap_size);
+                HDmemcpy((unsigned char *)buf + buf_off,
+                         (unsigned char *)accum->buf + accum->dirty_off + dirty_off, overlap_size);
             } /* end if */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
     else {
         /* Read the data */
-        if(H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
+        if (H5FD_read(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "driver read request failed")
     } /* end else */
 
@@ -265,7 +259,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F__accum_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F__accum_adjust
  *
@@ -280,10 +273,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F__accum_adjust(H5F_meta_accum_t *accum, const H5F_io_info_t *fio_info,
-    H5F_accum_adjust_t adjust, size_t size)
+H5F__accum_adjust(H5F_meta_accum_t *accum, const H5F_io_info_t *fio_info, H5F_accum_adjust_t adjust,
+                  size_t size)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -294,70 +287,77 @@ H5F__accum_adjust(H5F_meta_accum_t *accum, const H5F_io_info_t *fio_info,
     HDassert(size <= H5F_ACCUM_MAX_SIZE);
 
     /* Check if we need more buffer space */
-    if((size + accum->size) > accum->alloc_size) {
-        size_t new_size;        /* New size of accumulator */
+    if ((size + accum->size) > accum->alloc_size) {
+        size_t new_size; /* New size of accumulator */
 
         /* Adjust the buffer size to be a power of 2 that is large enough to hold data */
         new_size = (size_t)1 << (1 + H5VM_log2_gen((uint64_t)((size + accum->size) - 1)));
 
         /* Check for accumulator getting too big */
-        if(new_size > H5F_ACCUM_MAX_SIZE) {
-            size_t shrink_size;     /* Amount to shrink accumulator by */
-            size_t remnant_size;    /* Amount left in accumulator */
+        if (new_size > H5F_ACCUM_MAX_SIZE) {
+            size_t shrink_size;  /* Amount to shrink accumulator by */
+            size_t remnant_size; /* Amount left in accumulator */
 
             /* Cap the accumulator's growth, leaving some room */
 
             /* Determine the amounts to work with */
-            if(size > (H5F_ACCUM_MAX_SIZE / 2)) {
-                new_size = H5F_ACCUM_MAX_SIZE;
-                shrink_size = accum->size;
+            if (size > (H5F_ACCUM_MAX_SIZE / 2)) {
+                new_size     = H5F_ACCUM_MAX_SIZE;
+                shrink_size  = accum->size;
                 remnant_size = 0;
             } /* end if */
             else {
-                if(H5F_ACCUM_PREPEND == adjust) {
-                    new_size = (H5F_ACCUM_MAX_SIZE / 2);
-                    shrink_size = (H5F_ACCUM_MAX_SIZE / 2);
+                if (H5F_ACCUM_PREPEND == adjust) {
+                    new_size     = (H5F_ACCUM_MAX_SIZE / 2);
+                    shrink_size  = (H5F_ACCUM_MAX_SIZE / 2);
                     remnant_size = accum->size - shrink_size;
                 } /* end if */
                 else {
                     size_t adjust_size = size + accum->dirty_len;
 
                     /* Check if we can slide the dirty region down, to accommodate the request */
-                    if(accum->dirty && (adjust_size <= H5F_ACCUM_MAX_SIZE)) {
-                        if((ssize_t)(H5F_ACCUM_MAX_SIZE - (accum->dirty_off + adjust_size)) >= (ssize_t)(2 * size))
+                    if (accum->dirty && (adjust_size <= H5F_ACCUM_MAX_SIZE)) {
+                        if ((ssize_t)(H5F_ACCUM_MAX_SIZE - (accum->dirty_off + adjust_size)) >=
+                            (ssize_t)(2 * size))
                             shrink_size = accum->dirty_off / 2;
                         else
                             shrink_size = accum->dirty_off;
                         remnant_size = accum->size - shrink_size;
-                        new_size = remnant_size + size;
+                        new_size     = remnant_size + size;
                     } /* end if */
                     else {
-                        new_size = (H5F_ACCUM_MAX_SIZE / 2);
-                        shrink_size = (H5F_ACCUM_MAX_SIZE / 2);
+                        new_size     = (H5F_ACCUM_MAX_SIZE / 2);
+                        shrink_size  = (H5F_ACCUM_MAX_SIZE / 2);
                         remnant_size = accum->size - shrink_size;
                     } /* end else */
-                } /* end else */
-            } /* end else */
+                }     /* end else */
+            }         /* end else */
 
             /* Check if we need to flush accumulator data to file */
-            if(accum->dirty) {
+            if (accum->dirty) {
                 /* Check whether to accumulator will be prepended or appended */
-                if(H5F_ACCUM_PREPEND == adjust) {
+                if (H5F_ACCUM_PREPEND == adjust) {
                     /* Check if the dirty region overlaps the region to eliminate from the accumulator */
-                    if((accum->size - shrink_size) < (accum->dirty_off + accum->dirty_len)) {
-                        /* Write out the dirty region from the metadata accumulator, with dispatch to driver */
-                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, (accum->loc + accum->dirty_off), accum->dirty_len, (accum->buf + accum->dirty_off)) < 0)
+                    if ((accum->size - shrink_size) < (accum->dirty_off + accum->dirty_len)) {
+                        /* Write out the dirty region from the metadata accumulator, with dispatch to driver
+                         */
+                        if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT,
+                                       (accum->loc + accum->dirty_off), accum->dirty_len,
+                                       (accum->buf + accum->dirty_off)) < 0)
                             HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "file write failed")
 
                         /* Reset accumulator dirty flag */
                         accum->dirty = FALSE;
                     } /* end if */
-                } /* end if */
+                }     /* end if */
                 else {
                     /* Check if the dirty region overlaps the region to eliminate from the accumulator */
-                    if(shrink_size > accum->dirty_off) {
-                        /* Write out the dirty region from the metadata accumulator, with dispatch to driver */
-                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, (accum->loc + accum->dirty_off), accum->dirty_len, (accum->buf + accum->dirty_off)) < 0)
+                    if (shrink_size > accum->dirty_off) {
+                        /* Write out the dirty region from the metadata accumulator, with dispatch to driver
+                         */
+                        if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT,
+                                       (accum->loc + accum->dirty_off), accum->dirty_len,
+                                       (accum->buf + accum->dirty_off)) < 0)
                             HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "file write failed")
 
                         /* Reset accumulator dirty flag */
@@ -367,11 +367,11 @@ H5F__accum_adjust(H5F_meta_accum_t *accum, const H5F_io_info_t *fio_info,
                     /* Adjust dirty region tracking info */
                     accum->dirty_off -= shrink_size;
                 } /* end else */
-            } /* end if */
+            }     /* end if */
 
             /* Trim the accumulator's use of its buffer */
             accum->size = remnant_size;
-            
+
             /* When appending, need to adjust location of accumulator */
             if (H5F_ACCUM_APPEND == adjust) {
                 /* Move remnant of accumulator down */
@@ -380,30 +380,29 @@ H5F__accum_adjust(H5F_meta_accum_t *accum, const H5F_io_info_t *fio_info,
                 /* Adjust accumulator's location */
                 accum->loc += shrink_size;
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Check for accumulator needing to be reallocated */
-        if(new_size > accum->alloc_size) {
-            unsigned char      *new_buf;            /* New buffer to hold the accumulated metadata */
+        if (new_size > accum->alloc_size) {
+            unsigned char *new_buf; /* New buffer to hold the accumulated metadata */
 
             /* Reallocate the metadata accumulator buffer */
-            if(NULL == (new_buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_size)))
+            if (NULL == (new_buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_size)))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "unable to allocate metadata accumulator buffer")
 
             /* Update accumulator info */
-            accum->buf = new_buf;
+            accum->buf        = new_buf;
             accum->alloc_size = new_size;
 #ifdef H5_CLEAR_MEMORY
-HDmemset(accum->buf + accum->size, 0, (accum->alloc_size - (accum->size + size)));
-#endif /* H5_CLEAR_MEMORY */
+            HDmemset(accum->buf + accum->size, 0, (accum->alloc_size - (accum->size + size)));
+#endif    /* H5_CLEAR_MEMORY */
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F__accum_adjust() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F__accum_write
  *
@@ -419,11 +418,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
-    size_t size, const void *buf)
+H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, size_t size, const void *buf)
 {
-    H5FD_mem_t  map_type;               /* Mapped memory type */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5FD_mem_t map_type;            /* Mapped memory type */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -437,22 +435,22 @@ H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
     /* Check for accumulating metadata */
-    if((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && map_type != H5FD_MEM_DRAW) {
-        H5F_meta_accum_t *accum;     /* Alias for file's metadata accumulator */
+    if ((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && map_type != H5FD_MEM_DRAW) {
+        H5F_meta_accum_t *accum; /* Alias for file's metadata accumulator */
 
         /* Set up alias for file's metadata accumulator info */
         accum = &fio_info->f->shared->accum;
 
-        if(size < H5F_ACCUM_MAX_SIZE) {
+        if (size < H5F_ACCUM_MAX_SIZE) {
             /* Sanity check */
             HDassert(!accum->buf || (accum->alloc_size >= accum->size));
 
             /* Check if there is already metadata in the accumulator */
-            if(accum->size > 0) {
+            if (accum->size > 0) {
                 /* Check if the new metadata adjoins the beginning of the current accumulator */
-                if((addr + size) == accum->loc) {
+                if ((addr + size) == accum->loc) {
                     /* Check if we need to adjust accumulator size */
-                    if(H5F__accum_adjust(accum, fio_info, H5F_ACCUM_PREPEND, size) < 0)
+                    if (H5F__accum_adjust(accum, fio_info, H5F_ACCUM_PREPEND, size) < 0)
                         HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator")
 
                     /* Move the existing metadata to the proper location */
@@ -466,78 +464,79 @@ H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
                     accum->size += size;
 
                     /* Adjust the dirty region and mark accumulator dirty */
-                    if(accum->dirty)
+                    if (accum->dirty)
                         accum->dirty_len = size + accum->dirty_off + accum->dirty_len;
                     else {
                         accum->dirty_len = size;
-                        accum->dirty = TRUE;
+                        accum->dirty     = TRUE;
                     } /* end else */
                     accum->dirty_off = 0;
                 } /* end if */
                 /* Check if the new metadata adjoins the end of the current accumulator */
-                else if(addr == (accum->loc + accum->size)) {
+                else if (addr == (accum->loc + accum->size)) {
                     /* Check if we need to adjust accumulator size */
-                    if(H5F__accum_adjust(accum, fio_info, H5F_ACCUM_APPEND, size) < 0)
+                    if (H5F__accum_adjust(accum, fio_info, H5F_ACCUM_APPEND, size) < 0)
                         HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator")
 
                     /* Copy the new metadata to the end */
                     HDmemcpy(accum->buf + accum->size, buf, size);
 
                     /* Adjust the dirty region and mark accumulator dirty */
-                    if(accum->dirty)
+                    if (accum->dirty)
                         accum->dirty_len = size + (accum->size - accum->dirty_off);
                     else {
                         accum->dirty_off = accum->size;
                         accum->dirty_len = size;
-                        accum->dirty = TRUE;
+                        accum->dirty     = TRUE;
                     } /* end else */
 
                     /* Set the new size of the metadata accumulator */
                     accum->size += size;
                 } /* end if */
                 /* Check if the piece of metadata being written overlaps the metadata accumulator */
-                else if(H5F_addr_overlap(addr, size, accum->loc, accum->size)) {
-                    size_t add_size;    /* New size of the accumulator buffer */
+                else if (H5F_addr_overlap(addr, size, accum->loc, accum->size)) {
+                    size_t add_size; /* New size of the accumulator buffer */
 
                     /* Check if the new metadata is entirely within the current accumulator */
-                    if(addr >= accum->loc && (addr + size) <= (accum->loc + accum->size)) {
+                    if (addr >= accum->loc && (addr + size) <= (accum->loc + accum->size)) {
                         size_t dirty_off = (size_t)(addr - accum->loc);
 
                         /* Copy the new metadata to the proper location within the accumulator */
                         HDmemcpy(accum->buf + dirty_off, buf, size);
 
                         /* Adjust the dirty region and mark accumulator dirty */
-                        if(accum->dirty) {
+                        if (accum->dirty) {
                             /* Check for new metadata starting before current dirty region */
-                            if(dirty_off <= accum->dirty_off) {
-                                if((dirty_off + size) <= (accum->dirty_off + accum->dirty_len))
+                            if (dirty_off <= accum->dirty_off) {
+                                if ((dirty_off + size) <= (accum->dirty_off + accum->dirty_len))
                                     accum->dirty_len = (accum->dirty_off + accum->dirty_len) - dirty_off;
                                 else
                                     accum->dirty_len = size;
                                 accum->dirty_off = dirty_off;
                             } /* end if */
                             else {
-                                if((dirty_off + size) <= (accum->dirty_off + accum->dirty_len))
+                                if ((dirty_off + size) <= (accum->dirty_off + accum->dirty_len))
                                     ; /* accum->dirty_len doesn't change */
                                 else
                                     accum->dirty_len = (dirty_off + size) - accum->dirty_off;
                             } /* end else */
-                        } /* end if */
+                        }     /* end if */
                         else {
                             accum->dirty_off = dirty_off;
                             accum->dirty_len = size;
-                            accum->dirty = TRUE;
+                            accum->dirty     = TRUE;
                         } /* end else */
-                    } /* end if */
+                    }     /* end if */
                     /* Check if the new metadata overlaps the beginning of the current accumulator */
-                    else if(addr < accum->loc && (addr + size) <= (accum->loc + accum->size)) {
-                        size_t old_offset;  /* Offset of old data within the accumulator buffer */
+                    else if (addr < accum->loc && (addr + size) <= (accum->loc + accum->size)) {
+                        size_t old_offset; /* Offset of old data within the accumulator buffer */
 
-                        /* Calculate the amount we will need to add to the accumulator size, based on the amount of overlap */
+                        /* Calculate the amount we will need to add to the accumulator size, based on the
+                         * amount of overlap */
                         H5_CHECKED_ASSIGN(add_size, size_t, (accum->loc - addr), hsize_t);
 
                         /* Check if we need to adjust accumulator size */
-                        if(H5F__accum_adjust(accum, fio_info, H5F_ACCUM_PREPEND, add_size) < 0)
+                        if (H5F__accum_adjust(accum, fio_info, H5F_ACCUM_PREPEND, add_size) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator")
 
                         /* Calculate the proper offset of the existing metadata */
@@ -554,11 +553,11 @@ H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
                         accum->size += add_size;
 
                         /* Adjust the dirty region and mark accumulator dirty */
-                        if(accum->dirty) {
+                        if (accum->dirty) {
                             size_t curr_dirty_end = add_size + accum->dirty_off + accum->dirty_len;
 
                             accum->dirty_off = 0;
-                            if(size <= curr_dirty_end)
+                            if (size <= curr_dirty_end)
                                 accum->dirty_len = curr_dirty_end;
                             else
                                 accum->dirty_len = size;
@@ -566,18 +565,20 @@ H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
                         else {
                             accum->dirty_off = 0;
                             accum->dirty_len = size;
-                            accum->dirty = TRUE;
+                            accum->dirty     = TRUE;
                         } /* end else */
-                    } /* end if */
+                    }     /* end if */
                     /* Check if the new metadata overlaps the end of the current accumulator */
-                    else if(addr >= accum->loc && (addr + size) > (accum->loc + accum->size)) {
-                        size_t dirty_off;           /* Offset of dirty region */
+                    else if (addr >= accum->loc && (addr + size) > (accum->loc + accum->size)) {
+                        size_t dirty_off; /* Offset of dirty region */
 
-                        /* Calculate the amount we will need to add to the accumulator size, based on the amount of overlap */
-                        H5_CHECKED_ASSIGN(add_size, size_t, (addr + size) - (accum->loc + accum->size), hsize_t);
+                        /* Calculate the amount we will need to add to the accumulator size, based on the
+                         * amount of overlap */
+                        H5_CHECKED_ASSIGN(add_size, size_t, (addr + size) - (accum->loc + accum->size),
+                                          hsize_t);
 
                         /* Check if we need to adjust accumulator size */
-                        if(H5F__accum_adjust(accum, fio_info, H5F_ACCUM_APPEND, add_size) < 0)
+                        if (H5F__accum_adjust(accum, fio_info, H5F_ACCUM_APPEND, add_size) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator")
 
                         /* Compute offset of dirty region (after adjusting accumulator) */
@@ -590,60 +591,64 @@ H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
                         accum->size += add_size;
 
                         /* Adjust the dirty region and mark accumulator dirty */
-                        if(accum->dirty) {
+                        if (accum->dirty) {
                             /* Check for new metadata starting before current dirty region */
-                            if(dirty_off <= accum->dirty_off) {
+                            if (dirty_off <= accum->dirty_off) {
                                 accum->dirty_off = dirty_off;
                                 accum->dirty_len = size;
                             } /* end if */
                             else {
                                 accum->dirty_len = (dirty_off + size) - accum->dirty_off;
                             } /* end else */
-                        } /* end if */
+                        }     /* end if */
                         else {
                             accum->dirty_off = dirty_off;
                             accum->dirty_len = size;
-                            accum->dirty = TRUE;
+                            accum->dirty     = TRUE;
                         } /* end else */
-                    } /* end if */
+                    }     /* end if */
                     /* New metadata overlaps both ends of the current accumulator */
                     else {
                         /* Check if we need more buffer space */
-                        if(size > accum->alloc_size) {
-                            size_t new_alloc_size;        /* New size of accumulator */
+                        if (size > accum->alloc_size) {
+                            size_t new_alloc_size; /* New size of accumulator */
 
                             /* Adjust the buffer size to be a power of 2 that is large enough to hold data */
                             new_alloc_size = (size_t)1 << (1 + H5VM_log2_gen((uint64_t)(size - 1)));
 
                             /* Reallocate the metadata accumulator buffer */
-                            if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_alloc_size)))
-                                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
+                            if (NULL ==
+                                (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_alloc_size)))
+                                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                            "unable to allocate metadata accumulator buffer")
 
                             /* Note the new buffer size */
                             accum->alloc_size = new_alloc_size;
 #ifdef H5_CLEAR_MEMORY
-HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
-#endif /* H5_CLEAR_MEMORY */
+                            HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
+#endif                    /* H5_CLEAR_MEMORY */
                         } /* end if */
 
                         /* Copy the new metadata to the buffer */
                         HDmemcpy(accum->buf, buf, size);
 
                         /* Set the new size & location of the metadata accumulator */
-                        accum->loc = addr;
+                        accum->loc  = addr;
                         accum->size = size;
 
                         /* Adjust the dirty region and mark accumulator dirty */
                         accum->dirty_off = 0;
                         accum->dirty_len = size;
-                        accum->dirty = TRUE;
+                        accum->dirty     = TRUE;
                     } /* end else */
-                } /* end if */
+                }     /* end if */
                 /* New piece of metadata doesn't adjoin or overlap the existing accumulator */
                 else {
                     /* Write out the existing metadata accumulator, with dispatch to driver */
-                    if(accum->dirty) {
-                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, accum->loc + accum->dirty_off, accum->dirty_len, accum->buf + accum->dirty_off) < 0)
+                    if (accum->dirty) {
+                        if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT,
+                                       accum->loc + accum->dirty_off, accum->dirty_len,
+                                       accum->buf + accum->dirty_off) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
                         /* Reset accumulator dirty flag */
@@ -652,42 +657,45 @@ HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
 
                     /* Cache the new piece of metadata */
                     /* Check if we need to resize the buffer */
-                    if(size > accum->alloc_size) {
-                        size_t new_size;        /* New size of accumulator */
+                    if (size > accum->alloc_size) {
+                        size_t new_size; /* New size of accumulator */
 
                         /* Adjust the buffer size to be a power of 2 that is large enough to hold data */
                         new_size = (size_t)1 << (1 + H5VM_log2_gen((uint64_t)(size - 1)));
 
                         /* Grow the metadata accumulator buffer */
-                        if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_size)))
-                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
+                        if (NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_size)))
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                        "unable to allocate metadata accumulator buffer")
 
                         /* Note the new buffer size */
                         accum->alloc_size = new_size;
 #ifdef H5_CLEAR_MEMORY
-{
-size_t clear_size = MAX(accum->size, size);
-HDmemset(accum->buf + clear_size, 0, (accum->alloc_size - clear_size));
-}
-#endif /* H5_CLEAR_MEMORY */
+                        {
+                            size_t clear_size = MAX(accum->size, size);
+                            HDmemset(accum->buf + clear_size, 0, (accum->alloc_size - clear_size));
+                        }
+#endif                /* H5_CLEAR_MEMORY */
                     } /* end if */
                     else {
                         /* Check if we should shrink the accumulator buffer */
-                        if(size < (accum->alloc_size / H5F_ACCUM_THROTTLE) &&
-                                accum->alloc_size > H5F_ACCUM_THRESHOLD) {
-                            size_t tmp_size = (accum->alloc_size / H5F_ACCUM_THROTTLE); /* New size of accumulator buffer */
+                        if (size < (accum->alloc_size / H5F_ACCUM_THROTTLE) &&
+                            accum->alloc_size > H5F_ACCUM_THRESHOLD) {
+                            size_t tmp_size =
+                                (accum->alloc_size / H5F_ACCUM_THROTTLE); /* New size of accumulator buffer */
 
                             /* Shrink the accumulator buffer */
-                            if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, tmp_size)))
-                                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
+                            if (NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, tmp_size)))
+                                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                            "unable to allocate metadata accumulator buffer")
 
                             /* Note the new buffer size */
                             accum->alloc_size = tmp_size;
                         } /* end if */
-                    } /* end else */
+                    }     /* end else */
 
                     /* Update the metadata accumulator information */
-                    accum->loc = addr;
+                    accum->loc  = addr;
                     accum->size = size;
 
                     /* Store the piece of metadata in the accumulator */
@@ -696,31 +704,32 @@ HDmemset(accum->buf + clear_size, 0, (accum->alloc_size - clear_size));
                     /* Adjust the dirty region and mark accumulator dirty */
                     accum->dirty_off = 0;
                     accum->dirty_len = size;
-                    accum->dirty = TRUE;
+                    accum->dirty     = TRUE;
                 } /* end else */
-            } /* end if */
+            }     /* end if */
             /* No metadata in the accumulator, grab this piece and keep it */
             else {
                 /* Check if we need to reallocate the buffer */
-                if(size > accum->alloc_size) {
-                    size_t new_size;        /* New size of accumulator */
+                if (size > accum->alloc_size) {
+                    size_t new_size; /* New size of accumulator */
 
                     /* Adjust the buffer size to be a power of 2 that is large enough to hold data */
                     new_size = (size_t)1 << (1 + H5VM_log2_gen((uint64_t)(size - 1)));
 
                     /* Reallocate the metadata accumulator buffer */
-                    if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_size)))
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
+                    if (NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_size)))
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                    "unable to allocate metadata accumulator buffer")
 
                     /* Note the new buffer size */
                     accum->alloc_size = new_size;
 #ifdef H5_CLEAR_MEMORY
-HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
-#endif /* H5_CLEAR_MEMORY */
+                    HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
+#endif            /* H5_CLEAR_MEMORY */
                 } /* end if */
 
                 /* Update the metadata accumulator information */
-                accum->loc = addr;
+                accum->loc  = addr;
                 accum->size = size;
 
                 /* Store the piece of metadata in the accumulator */
@@ -729,62 +738,64 @@ HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
                 /* Adjust the dirty region and mark accumulator dirty */
                 accum->dirty_off = 0;
                 accum->dirty_len = size;
-                accum->dirty = TRUE;
+                accum->dirty     = TRUE;
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else {
             /* Write the data */
-            if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
+            if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
             /* Check for overlap w/accumulator */
             /* (Note that this could be improved by updating the accumulator
              *  with [some of] the information just read in. -QAK)
              */
-            if(H5F_addr_overlap(addr, size, accum->loc, accum->size)) {
+            if (H5F_addr_overlap(addr, size, accum->loc, accum->size)) {
                 /* Check for write starting before beginning of accumulator */
-                if(H5F_addr_le(addr, accum->loc)) {
+                if (H5F_addr_le(addr, accum->loc)) {
                     /* Check for write ending within accumulator */
-                    if(H5F_addr_le(addr + size, accum->loc + accum->size)) {
-                        size_t overlap_size;    /* Size of overlapping region */
+                    if (H5F_addr_le(addr + size, accum->loc + accum->size)) {
+                        size_t overlap_size; /* Size of overlapping region */
 
                         /* Compute overlap size */
                         overlap_size = (size_t)((addr + size) - accum->loc);
 
                         /* Check for dirty region */
-                        if(accum->dirty) {
-                            haddr_t dirty_start = accum->loc + accum->dirty_off;    /* File address of start of dirty region */
-                            haddr_t dirty_end = dirty_start + accum->dirty_len;               /* File address of end of dirty region */
+                        if (accum->dirty) {
+                            haddr_t dirty_start =
+                                accum->loc + accum->dirty_off; /* File address of start of dirty region */
+                            haddr_t dirty_end =
+                                dirty_start + accum->dirty_len; /* File address of end of dirty region */
 
                             /* Check if entire dirty region is overwritten */
-                            if(H5F_addr_le(dirty_end, addr + size)) {
-                                accum->dirty = FALSE;
+                            if (H5F_addr_le(dirty_end, addr + size)) {
+                                accum->dirty     = FALSE;
                                 accum->dirty_len = 0;
                             } /* end if */
                             else {
                                 /* Check for dirty region falling after write */
-                                if(H5F_addr_le(addr + size, dirty_start))
+                                if (H5F_addr_le(addr + size, dirty_start))
                                     accum->dirty_off = overlap_size;
-                                else {    /* Dirty region overlaps w/written region */
+                                else { /* Dirty region overlaps w/written region */
                                     accum->dirty_off = 0;
                                     accum->dirty_len -= (size_t)((addr + size) - dirty_start);
                                 } /* end else */
-                            } /* end if */
-                        } /* end if */
+                            }     /* end if */
+                        }         /* end if */
 
                         /* Trim bottom of accumulator off */
                         accum->loc += overlap_size;
                         accum->size -= overlap_size;
                         HDmemmove(accum->buf, accum->buf + overlap_size, accum->size);
-                    } /* end if */
-                    else {        /* Access covers whole accumulator */
+                    }      /* end if */
+                    else { /* Access covers whole accumulator */
                         /* Reset accumulator, but don't flush */
-                        if(H5F__accum_reset(fio_info, FALSE) < 0)
+                        if (H5F__accum_reset(fio_info, FALSE) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_CANTRESET, FAIL, "can't reset accumulator")
-                    } /* end else */
-                } /* end if */
-                else {  /* Write starts after beginning of accumulator */
-                    size_t overlap_size;    /* Size of overlapping region */
+                    }                    /* end else */
+                }                        /* end if */
+                else {                   /* Write starts after beginning of accumulator */
+                    size_t overlap_size; /* Size of overlapping region */
 
                     /* Sanity check */
                     HDassert(H5F_addr_gt(addr + size, accum->loc + accum->size));
@@ -793,33 +804,35 @@ HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
                     overlap_size = (size_t)((accum->loc + accum->size) - addr);
 
                     /* Check for dirty region */
-                    if(accum->dirty) {
-                        haddr_t dirty_start = accum->loc + accum->dirty_off;    /* File address of start of dirty region */
-                        haddr_t dirty_end = dirty_start + accum->dirty_len;               /* File address of end of dirty region */
+                    if (accum->dirty) {
+                        haddr_t dirty_start =
+                            accum->loc + accum->dirty_off; /* File address of start of dirty region */
+                        haddr_t dirty_end =
+                            dirty_start + accum->dirty_len; /* File address of end of dirty region */
 
                         /* Check if entire dirty region is overwritten */
-                        if(H5F_addr_ge(dirty_start, addr)) {
-                            accum->dirty = FALSE;
+                        if (H5F_addr_ge(dirty_start, addr)) {
+                            accum->dirty     = FALSE;
                             accum->dirty_len = 0;
                         } /* end if */
                         else {
                             /* Check for dirty region falling before write */
-                            if(H5F_addr_le(dirty_end, addr))
+                            if (H5F_addr_le(dirty_end, addr))
                                 ; /* noop */
-                            else    /* Dirty region overlaps w/written region */
+                            else  /* Dirty region overlaps w/written region */
                                 accum->dirty_len = (size_t)(addr - dirty_start);
                         } /* end if */
-                    } /* end if */
+                    }     /* end if */
 
                     /* Trim top of accumulator off */
                     accum->size -= overlap_size;
                 } /* end else */
-            } /* end if */
-        } /* end else */
-    } /* end if */
+            }     /* end if */
+        }         /* end else */
+    }             /* end if */
     else {
         /* Write the data */
-        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
+        if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
     } /* end else */
 
@@ -827,7 +840,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F__accum_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F__accum_free
  *
@@ -843,11 +855,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr,
-    hsize_t size)
+H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr, hsize_t size)
 {
-    H5F_meta_accum_t *accum;            /* Alias for file's metadata accumulator */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5F_meta_accum_t *accum;               /* Alias for file's metadata accumulator */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -860,9 +871,9 @@ H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t H5_ATTR_UNUSED type, h
     accum = &fio_info->f->shared->accum;
 
     /* Adjust the metadata accumulator to remove the freed block, if it overlaps */
-    if((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA)
-            && H5F_addr_overlap(addr, size, accum->loc, accum->size)) {
-        size_t overlap_size;        /* Size of overlap with accumulator */
+    if ((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
+        H5F_addr_overlap(addr, size, accum->loc, accum->size)) {
+        size_t overlap_size; /* Size of overlap with accumulator */
 
         /* Sanity check */
         /* (The metadata accumulator should not intersect w/raw data */
@@ -870,17 +881,17 @@ H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t H5_ATTR_UNUSED type, h
         HDassert(H5FD_MEM_GHEAP != type); /* (global heap data is being treated as raw data currently) */
 
         /* Check for overlapping the beginning of the accumulator */
-        if(H5F_addr_le(addr, accum->loc)) {
+        if (H5F_addr_le(addr, accum->loc)) {
             /* Check for completely overlapping the accumulator */
-            if(H5F_addr_ge(addr + size, accum->loc + accum->size)) {
+            if (H5F_addr_ge(addr + size, accum->loc + accum->size)) {
                 /* Reset the accumulator, but don't free buffer */
-                accum->loc = HADDR_UNDEF;
-                accum->size = 0;
+                accum->loc   = HADDR_UNDEF;
+                accum->size  = 0;
                 accum->dirty = FALSE;
             } /* end if */
             /* Block to free must end within the accumulator */
             else {
-                size_t new_accum_size;      /* Size of new accumulator buffer */
+                size_t new_accum_size; /* Size of new accumulator buffer */
 
                 /* Calculate the size of the overlap with the accumulator, etc. */
                 H5_CHECKED_ASSIGN(overlap_size, size_t, (addr + size) - accum->loc, haddr_t);
@@ -894,13 +905,13 @@ H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t H5_ATTR_UNUSED type, h
                 accum->size = new_accum_size;
 
                 /* Adjust the dirty region and possibly mark accumulator clean */
-                if(accum->dirty) {
+                if (accum->dirty) {
                     /* Check if block freed is entirely before dirty region */
-                    if(overlap_size < accum->dirty_off)
+                    if (overlap_size < accum->dirty_off)
                         accum->dirty_off -= overlap_size;
                     else {
                         /* Check if block freed ends within dirty region */
-                        if(overlap_size < (accum->dirty_off + accum->dirty_len)) {
+                        if (overlap_size < (accum->dirty_off + accum->dirty_len)) {
                             accum->dirty_len = (accum->dirty_off + accum->dirty_len) - overlap_size;
                             accum->dirty_off = 0;
                         } /* end if */
@@ -908,45 +919,48 @@ H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t H5_ATTR_UNUSED type, h
                         else
                             accum->dirty = FALSE;
                     } /* end else */
-                } /* end if */
-            } /* end else */
-        } /* end if */
+                }     /* end if */
+            }         /* end else */
+        }             /* end if */
         /* Block to free must start within the accumulator */
         else {
-            haddr_t dirty_end = accum->loc + accum->dirty_off + accum->dirty_len;
+            haddr_t dirty_end   = accum->loc + accum->dirty_off + accum->dirty_len;
             haddr_t dirty_start = accum->loc + accum->dirty_off;
 
             /* Calculate the size of the overlap with the accumulator */
             H5_CHECKED_ASSIGN(overlap_size, size_t, (accum->loc + accum->size) - addr, haddr_t);
 
             /* Check if block to free begins before end of dirty region */
-            if(accum->dirty && H5F_addr_lt(addr, dirty_end)) {
+            if (accum->dirty && H5F_addr_lt(addr, dirty_end)) {
                 haddr_t tail_addr;
 
                 /* Calculate the address of the tail to write */
                 tail_addr = addr + size;
 
                 /* Check if the block to free begins before dirty region */
-                if(H5F_addr_lt(addr, dirty_start)) {
+                if (H5F_addr_lt(addr, dirty_start)) {
                     /* Check if block to free is entirely before dirty region */
-                    if(H5F_addr_le(tail_addr, dirty_start)) {
+                    if (H5F_addr_le(tail_addr, dirty_start)) {
                         /* Write out the entire dirty region of the accumulator */
-                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, dirty_start, accum->dirty_len, accum->buf + accum->dirty_off) < 0)
+                        if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, dirty_start,
+                                       accum->dirty_len, accum->buf + accum->dirty_off) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
                     } /* end if */
                     /* Block to free overlaps with some/all of dirty region */
                     /* Check for unfreed dirty region to write */
-                    else if(H5F_addr_lt(tail_addr, dirty_end)) {
+                    else if (H5F_addr_lt(tail_addr, dirty_end)) {
                         size_t write_size;
                         size_t dirty_delta;
 
-                        write_size = (size_t)(dirty_end - tail_addr);
+                        write_size  = (size_t)(dirty_end - tail_addr);
                         dirty_delta = accum->dirty_len - write_size;
 
                         HDassert(write_size > 0);
 
                         /* Write out the unfreed dirty region of the accumulator */
-                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, dirty_start + dirty_delta, write_size, accum->buf + accum->dirty_off + dirty_delta) < 0)
+                        if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT,
+                                       dirty_start + dirty_delta, write_size,
+                                       accum->buf + accum->dirty_off + dirty_delta) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
                     } /* end if */
 
@@ -956,22 +970,24 @@ H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t H5_ATTR_UNUSED type, h
                 /* Block to free begins at beginning of or in middle of dirty region */
                 else {
                     /* Check if block to free ends before end of dirty region */
-                    if(H5F_addr_lt(tail_addr, dirty_end)) {
+                    if (H5F_addr_lt(tail_addr, dirty_end)) {
                         size_t write_size;
                         size_t dirty_delta;
 
-                        write_size = (size_t)(dirty_end - tail_addr);
+                        write_size  = (size_t)(dirty_end - tail_addr);
                         dirty_delta = accum->dirty_len - write_size;
 
                         HDassert(write_size > 0);
 
                         /* Write out the unfreed end of the dirty region of the accumulator */
-                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, dirty_start + dirty_delta, write_size, accum->buf + accum->dirty_off + dirty_delta) < 0)
+                        if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT,
+                                       dirty_start + dirty_delta, write_size,
+                                       accum->buf + accum->dirty_off + dirty_delta) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
                     } /* end if */
 
                     /* Check for block to free beginning at same location as dirty region */
-                    if(H5F_addr_eq(addr, dirty_start)) {
+                    if (H5F_addr_eq(addr, dirty_start)) {
                         /* Reset dirty flag */
                         accum->dirty = FALSE;
                     } /* end if */
@@ -979,20 +995,19 @@ H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t H5_ATTR_UNUSED type, h
                     else {
                         accum->dirty_len = (size_t)(addr - dirty_start);
                     } /* end else */
-                } /* end else */
+                }     /* end else */
 
             } /* end if */
 
             /* Adjust the accumulator information */
             accum->size = accum->size - overlap_size;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F__accum_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F__accum_flush
  *
@@ -1009,7 +1024,7 @@ done:
 herr_t
 H5F__accum_flush(const H5F_io_info_t *fio_info)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1018,9 +1033,13 @@ H5F__accum_flush(const H5F_io_info_t *fio_info)
     HDassert(fio_info->dxpl);
 
     /* Check if we need to flush out the metadata accumulator */
-    if((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && fio_info->f->shared->accum.dirty) {
+    if ((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
+        fio_info->f->shared->accum.dirty) {
         /* Flush the metadata contents */
-        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, fio_info->f->shared->accum.loc + fio_info->f->shared->accum.dirty_off, fio_info->f->shared->accum.dirty_len, fio_info->f->shared->accum.buf + fio_info->f->shared->accum.dirty_off) < 0)
+        if (H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT,
+                       fio_info->f->shared->accum.loc + fio_info->f->shared->accum.dirty_off,
+                       fio_info->f->shared->accum.dirty_len,
+                       fio_info->f->shared->accum.buf + fio_info->f->shared->accum.dirty_off) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
         /* Reset the dirty flag */
@@ -1031,7 +1050,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F__accum_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F__accum_reset
  *
@@ -1048,7 +1066,7 @@ done:
 herr_t
 H5F__accum_reset(const H5F_io_info_t *fio_info, hbool_t flush)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1057,27 +1075,26 @@ H5F__accum_reset(const H5F_io_info_t *fio_info, hbool_t flush)
     HDassert(fio_info->dxpl);
 
     /* Flush any dirty data in accumulator, if requested */
-    if(flush)
-        if(H5F__accum_flush(fio_info) < 0)
+    if (flush)
+        if (H5F__accum_flush(fio_info) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "can't flush metadata accumulator")
 
     /* Check if we need to reset the metadata accumulator information */
-    if(fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) {
+    if (fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) {
         /* Sanity check */
         HDassert(!fio_info->f->closing || FALSE == fio_info->f->shared->accum.dirty);
 
         /* Free the buffer */
-        if(fio_info->f->shared->accum.buf)
+        if (fio_info->f->shared->accum.buf)
             fio_info->f->shared->accum.buf = H5FL_BLK_FREE(meta_accum, fio_info->f->shared->accum.buf);
 
         /* Reset the buffer sizes & location */
         fio_info->f->shared->accum.alloc_size = fio_info->f->shared->accum.size = 0;
-        fio_info->f->shared->accum.loc = HADDR_UNDEF;
-        fio_info->f->shared->accum.dirty = FALSE;
-        fio_info->f->shared->accum.dirty_len = 0;
+        fio_info->f->shared->accum.loc                                          = HADDR_UNDEF;
+        fio_info->f->shared->accum.dirty                                        = FALSE;
+        fio_info->f->shared->accum.dirty_len                                    = 0;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F__accum_reset() */
-
diff --git a/src/H5Fcwfs.c b/src/H5Fcwfs.c
index 8f50f26..7241430 100644
--- a/src/H5Fcwfs.c
+++ b/src/H5Fcwfs.c
@@ -33,19 +33,17 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"		/* File access				*/
-#include "H5HGprivate.h"	/* Global heaps				*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5HGprivate.h" /* Global heaps				*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
@@ -55,40 +53,32 @@
  * Maximum length of the CWFS list, the list of remembered collections that
  * have free space.
  */
-#define H5F_NCWFS	16
-
+#define H5F_NCWFS 16
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_cwfs_add
  *
@@ -105,7 +95,7 @@
 herr_t
 H5F_cwfs_add(H5F_t *f, H5HG_heap_t *heap)
 {
-    herr_t	ret_value = SUCCEED;        /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -119,23 +109,25 @@ H5F_cwfs_add(H5F_t *f, H5HG_heap_t *heap)
      * necessary to make room. We remove the right-most entry that has less
      * free space than this heap.
      */
-    if(NULL == f->shared->cwfs) {
-	if(NULL == (f->shared->cwfs = (H5HG_heap_t **)H5MM_malloc(H5F_NCWFS * sizeof(H5HG_heap_t *))))
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "can't allocate CWFS for file")
-	f->shared->cwfs[0] = heap;
-	f->shared->ncwfs = 1;
-    } else if(H5F_NCWFS == f->shared->ncwfs) {
-        int i;          /* Local index variable */
-
-        for(i = H5F_NCWFS - 1; i >= 0; --i)
-            if(H5HG_FREE_SIZE(f->shared->cwfs[i]) < H5HG_FREE_SIZE(heap)) {
+    if (NULL == f->shared->cwfs) {
+        if (NULL == (f->shared->cwfs = (H5HG_heap_t **)H5MM_malloc(H5F_NCWFS * sizeof(H5HG_heap_t *))))
+            HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "can't allocate CWFS for file")
+        f->shared->cwfs[0] = heap;
+        f->shared->ncwfs   = 1;
+    }
+    else if (H5F_NCWFS == f->shared->ncwfs) {
+        int i; /* Local index variable */
+
+        for (i = H5F_NCWFS - 1; i >= 0; --i)
+            if (H5HG_FREE_SIZE(f->shared->cwfs[i]) < H5HG_FREE_SIZE(heap)) {
                 HDmemmove(f->shared->cwfs + 1, f->shared->cwfs, (size_t)i * sizeof(H5HG_heap_t *));
                 f->shared->cwfs[0] = heap;
                 break;
             } /* end if */
-    } else {
+    }
+    else {
         HDmemmove(f->shared->cwfs + 1, f->shared->cwfs, f->shared->ncwfs * sizeof(H5HG_heap_t *));
-	f->shared->cwfs[0] = heap;
+        f->shared->cwfs[0] = heap;
         f->shared->ncwfs += 1;
     } /* end else */
 
@@ -143,7 +135,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_cwfs_add() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_cwfs_find_free_heap
  *
@@ -161,9 +152,9 @@ done:
 herr_t
 H5F_cwfs_find_free_heap(H5F_t *f, hid_t dxpl_id, size_t need, haddr_t *addr)
 {
-    unsigned    cwfsno;                 /* Local index for iterating over collections */
-    hbool_t     found = FALSE;          /* Flag to indicate a heap with enough space was found */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    unsigned cwfsno;              /* Local index for iterating over collections */
+    hbool_t  found     = FALSE;   /* Flag to indicate a heap with enough space was found */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -188,59 +179,60 @@ H5F_cwfs_find_free_heap(H5F_t *f, hid_t dxpl_id, size_t need, haddr_t *addr)
      *
      *                                        JRM - 5/24/04
      */
-    for(cwfsno = 0; cwfsno < f->shared->ncwfs; cwfsno++)
-	if(H5HG_FREE_SIZE(f->shared->cwfs[cwfsno]) >= need) {
-	    *addr = H5HG_ADDR(f->shared->cwfs[cwfsno]);
+    for (cwfsno = 0; cwfsno < f->shared->ncwfs; cwfsno++)
+        if (H5HG_FREE_SIZE(f->shared->cwfs[cwfsno]) >= need) {
+            *addr = H5HG_ADDR(f->shared->cwfs[cwfsno]);
             found = TRUE;
-	    break;
-	} /* end if */
+            break;
+        } /* end if */
 
     /*
      * If we didn't find any collection with enough free space the check if
      * we can extend any of the collections to make enough room.
      */
-    if(!found) {
+    if (!found) {
         size_t new_need;
 
-        for(cwfsno = 0; cwfsno < f->shared->ncwfs; cwfsno++) {
+        for (cwfsno = 0; cwfsno < f->shared->ncwfs; cwfsno++) {
             new_need = need;
             new_need -= H5HG_FREE_SIZE(f->shared->cwfs[cwfsno]);
             new_need = MAX(H5HG_SIZE(f->shared->cwfs[cwfsno]), new_need);
 
-            if((H5HG_SIZE(f->shared->cwfs[cwfsno]) + new_need) <= H5HG_MAXSIZE) {
-                htri_t was_extended;        /* Whether the heap was extended */
+            if ((H5HG_SIZE(f->shared->cwfs[cwfsno]) + new_need) <= H5HG_MAXSIZE) {
+                htri_t was_extended; /* Whether the heap was extended */
 
-                was_extended = H5MF_try_extend(f, dxpl_id, H5FD_MEM_GHEAP, H5HG_ADDR(f->shared->cwfs[cwfsno]), (hsize_t)H5HG_SIZE(f->shared->cwfs[cwfsno]), (hsize_t)new_need);
-                if(was_extended < 0)
+                was_extended =
+                    H5MF_try_extend(f, dxpl_id, H5FD_MEM_GHEAP, H5HG_ADDR(f->shared->cwfs[cwfsno]),
+                                    (hsize_t)H5HG_SIZE(f->shared->cwfs[cwfsno]), (hsize_t)new_need);
+                if (was_extended < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "error trying to extend heap")
-                else if(was_extended == TRUE) {
-                    if(H5HG_extend(f, dxpl_id, H5HG_ADDR(f->shared->cwfs[cwfsno]), new_need) < 0)
+                else if (was_extended == TRUE) {
+                    if (H5HG_extend(f, dxpl_id, H5HG_ADDR(f->shared->cwfs[cwfsno]), new_need) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to extend global heap collection")
                     *addr = H5HG_ADDR(f->shared->cwfs[cwfsno]);
                     found = TRUE;
                     break;
                 } /* end if */
-            } /* end if */
-        } /* end for */
-    } /* end if */
+            }     /* end if */
+        }         /* end for */
+    }             /* end if */
 
-    if(found) {
+    if (found) {
         /* Move the collection forward in the CWFS list, if it's not
          * already at the front
          */
-        if(cwfsno > 0) {
+        if (cwfsno > 0) {
             H5HG_heap_t *tmp = f->shared->cwfs[cwfsno];
 
-            f->shared->cwfs[cwfsno] = f->shared->cwfs[cwfsno - 1];
+            f->shared->cwfs[cwfsno]     = f->shared->cwfs[cwfsno - 1];
             f->shared->cwfs[cwfsno - 1] = tmp;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_cwfs_find_free_heap() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_cwfs_advance_heap
  *
@@ -257,7 +249,7 @@ done:
 herr_t
 H5F_cwfs_advance_heap(H5F_t *f, H5HG_heap_t *heap, hbool_t add_heap)
 {
-    unsigned u;                         /* Local index variable */
+    unsigned u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -266,23 +258,22 @@ H5F_cwfs_advance_heap(H5F_t *f, H5HG_heap_t *heap, hbool_t add_heap)
     HDassert(f->shared);
     HDassert(heap);
 
-    for(u = 0; u < f->shared->ncwfs; u++)
-        if(f->shared->cwfs[u] == heap) {
-            if(u) {
-                f->shared->cwfs[u] = f->shared->cwfs[u - 1];
+    for (u = 0; u < f->shared->ncwfs; u++)
+        if (f->shared->cwfs[u] == heap) {
+            if (u) {
+                f->shared->cwfs[u]     = f->shared->cwfs[u - 1];
                 f->shared->cwfs[u - 1] = heap;
             } /* end if */
             break;
         } /* end if */
-    if(add_heap && u >= f->shared->ncwfs) {
-        f->shared->ncwfs = MIN(f->shared->ncwfs + 1, H5F_NCWFS);
+    if (add_heap && u >= f->shared->ncwfs) {
+        f->shared->ncwfs                      = MIN(f->shared->ncwfs + 1, H5F_NCWFS);
         f->shared->cwfs[f->shared->ncwfs - 1] = heap;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F_cwfs_advance_heap() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_cwfs_remove_heap
  *
@@ -299,7 +290,7 @@ H5F_cwfs_advance_heap(H5F_t *f, H5HG_heap_t *heap, hbool_t add_heap)
 herr_t
 H5F_cwfs_remove_heap(H5F_file_t *shared, H5HG_heap_t *heap)
 {
-    unsigned u;                         /* Local index variable */
+    unsigned u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -308,14 +299,13 @@ H5F_cwfs_remove_heap(H5F_file_t *shared, H5HG_heap_t *heap)
     HDassert(heap);
 
     /* Remove the heap from the CWFS list */
-    for(u = 0; u < shared->ncwfs; u++) {
-        if(shared->cwfs[u] == heap) {
+    for (u = 0; u < shared->ncwfs; u++) {
+        if (shared->cwfs[u] == heap) {
             shared->ncwfs -= 1;
             HDmemmove(shared->cwfs + u, shared->cwfs + u + 1, (shared->ncwfs - u) * sizeof(H5HG_heap_t *));
             break;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F_cwfs_remove_heap() */
-
diff --git a/src/H5Fdbg.c b/src/H5Fdbg.c
index fc4aafd4..b437352 100644
--- a/src/H5Fdbg.c
+++ b/src/H5Fdbg.c
@@ -17,18 +17,16 @@
  * Purpose:	File object debugging functions.
  */
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg   */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg   */
 
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		        */
+#include "H5Fpkg.h"     /* File access				*/
+#include "H5Gpkg.h"     /* Groups		  		*/
+#include "H5Iprivate.h" /* ID Functions		                */
+#include "H5Pprivate.h" /* Property lists			*/
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		        */
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* ID Functions		                */
-#include "H5Pprivate.h"		/* Property lists			*/
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_debug
  *
@@ -47,9 +45,9 @@
 herr_t
 H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
 {
-    H5P_genplist_t *plist;              /* File creation property list */
-    hsize_t userblock_size;             /* Userblock size */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* File creation property list */
+    hsize_t         userblock_size;      /* Userblock size */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -60,71 +58,66 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
     HDassert(fwidth >= 0);
 
     /* Get property list */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(f->shared->fcpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(f->shared->fcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Retrieve file creation properties */
-    if(H5P_get(plist, H5F_CRT_USER_BLOCK_NAME, &userblock_size) < 0)
+    if (H5P_get(plist, H5F_CRT_USER_BLOCK_NAME, &userblock_size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get userblock size")
 
     /* debug */
     HDfprintf(stream, "%*sFile Super Block...\n", indent, "");
 
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "File name (as opened):", H5F_OPEN_NAME(f));
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "File name (as opened):", H5F_OPEN_NAME(f));
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "File name (after resolving symlinks):", H5F_ACTUAL_NAME(f));
-    HDfprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth,
-	      "File access flags", f->shared->flags);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "File open reference count:", f->shared->nrefs);
+              "File name (after resolving symlinks):", H5F_ACTUAL_NAME(f));
+    HDfprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth, "File access flags", f->shared->flags);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "File open reference count:", f->shared->nrefs);
     HDfprintf(stream, "%*s%-*s %a (abs)\n", indent, "", fwidth,
-	      "Address of super block:", f->shared->sblock->base_addr);
-    HDfprintf(stream, "%*s%-*s %Hu bytes\n", indent, "", fwidth,
-	      "Size of userblock:", userblock_size);
+              "Address of super block:", f->shared->sblock->base_addr);
+    HDfprintf(stream, "%*s%-*s %Hu bytes\n", indent, "", fwidth, "Size of userblock:", userblock_size);
 
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Superblock version number:", f->shared->sblock->super_vers);
+              "Superblock version number:", f->shared->sblock->super_vers);
 
     /* Hard-wired versions */
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Free list version number:", (unsigned)HDF5_FREESPACE_VERSION);
+              "Free list version number:", (unsigned)HDF5_FREESPACE_VERSION);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Root group symbol table entry version number:", (unsigned)HDF5_OBJECTDIR_VERSION);
+              "Root group symbol table entry version number:", (unsigned)HDF5_OBJECTDIR_VERSION);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Shared header version number:", (unsigned)HDF5_SHAREDHEADER_VERSION);
+              "Shared header version number:", (unsigned)HDF5_SHAREDHEADER_VERSION);
 
     HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
-	      "Size of file offsets (haddr_t type):", (unsigned) f->shared->sizeof_addr);
+              "Size of file offsets (haddr_t type):", (unsigned)f->shared->sizeof_addr);
     HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
-	      "Size of file lengths (hsize_t type):", (unsigned) f->shared->sizeof_size);
+              "Size of file lengths (hsize_t type):", (unsigned)f->shared->sizeof_size);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Symbol table leaf node 1/2 rank:", f->shared->sblock->sym_leaf_k);
+              "Symbol table leaf node 1/2 rank:", f->shared->sblock->sym_leaf_k);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Symbol table internal node 1/2 rank:", f->shared->sblock->btree_k[H5B_SNODE_ID]);
+              "Symbol table internal node 1/2 rank:", f->shared->sblock->btree_k[H5B_SNODE_ID]);
     HDfprintf(stream, "%*s%-*s 0x%02x\n", indent, "", fwidth,
-	      "File status flags:", (unsigned)(f->shared->sblock->status_flags));
+              "File status flags:", (unsigned)(f->shared->sblock->status_flags));
     HDfprintf(stream, "%*s%-*s %a (rel)\n", indent, "", fwidth,
-	      "Superblock extension address:", f->shared->sblock->ext_addr);
+              "Superblock extension address:", f->shared->sblock->ext_addr);
     HDfprintf(stream, "%*s%-*s %a (rel)\n", indent, "", fwidth,
-	      "Shared object header message table address:", f->shared->sohm_addr);
+              "Shared object header message table address:", f->shared->sohm_addr);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Shared object header message version number:", (unsigned) f->shared->sohm_vers);
+              "Shared object header message version number:", (unsigned)f->shared->sohm_vers);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of shared object header message indexes:", (unsigned) f->shared->sohm_nindexes);
+              "Number of shared object header message indexes:", (unsigned)f->shared->sohm_nindexes);
 
     HDfprintf(stream, "%*s%-*s %a (rel)\n", indent, "", fwidth,
-	      "Address of driver information block:", f->shared->sblock->driver_addr);
+              "Address of driver information block:", f->shared->sblock->driver_addr);
 
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Root group symbol table entry:",
-	      f->shared->root_grp ? "" : "(none)");
-    if(f->shared->root_grp) {
-        if(f->shared->sblock->root_ent) /* Use real root group symbol table entry */
+              "Root group symbol table entry:", f->shared->root_grp ? "" : "(none)");
+    if (f->shared->root_grp) {
+        if (f->shared->sblock->root_ent) /* Use real root group symbol table entry */
             H5G__ent_debug(f->shared->sblock->root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
         else {
-            H5O_loc_t *root_oloc;   /* Root object location */
-            H5G_entry_t root_ent;   /* Constructed root symbol table entry */
+            H5O_loc_t * root_oloc; /* Root object location */
+            H5G_entry_t root_ent;  /* Constructed root symbol table entry */
 
             /* Reset the root group entry */
             H5G__ent_reset(&root_ent);
@@ -132,15 +125,14 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
             /* Build up a simulated root group symbol table entry */
             root_oloc = H5G_oloc(f->shared->root_grp);
             HDassert(root_oloc);
-            root_ent.type = H5G_NOTHING_CACHED;
+            root_ent.type   = H5G_NOTHING_CACHED;
             root_ent.header = root_oloc->addr;
 
             /* Display root group symbol table entry info */
             H5G__ent_debug(&root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_debug() */
-
diff --git a/src/H5Fefc.c b/src/H5Fefc.c
index a3c53c9..b000317 100644
--- a/src/H5Fefc.c
+++ b/src/H5Fefc.c
@@ -24,53 +24,51 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5F_PACKAGE             /*suppress error about including H5Fpkg   */
-
+#define H5F_PACKAGE /*suppress error about including H5Fpkg   */
 
 /* Packages needed by this file... */
-#include "H5private.h"          /* Generic Functions                    */
-#include "H5Eprivate.h"         /* Error handling                       */
-#include "H5Fpkg.h"             /* File access                          */
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Pprivate.h"         /* Property lists                       */
+#include "H5private.h"   /* Generic Functions                    */
+#include "H5Eprivate.h"  /* Error handling                       */
+#include "H5Fpkg.h"      /* File access                          */
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Pprivate.h"  /* Property lists                       */
 
 /* Special values for the "tag" field below */
-#define H5F_EFC_TAG_DEFAULT     -1
-#define H5F_EFC_TAG_LOCK        -2
-#define H5F_EFC_TAG_CLOSE       -3
-#define H5F_EFC_TAG_DONTCLOSE   -4
+#define H5F_EFC_TAG_DEFAULT   -1
+#define H5F_EFC_TAG_LOCK      -2
+#define H5F_EFC_TAG_CLOSE     -3
+#define H5F_EFC_TAG_DONTCLOSE -4
 
 /* Structure for each entry in a file's external file cache */
 typedef struct H5F_efc_ent_t {
-    char                *name;          /* Name of the file */
-    H5F_t               *file;          /* File object */
-    struct H5F_efc_ent_t *LRU_next;     /* Next item in LRU list */
-    struct H5F_efc_ent_t *LRU_prev;     /* Previous item in LRU list */
-    unsigned            nopen;          /* Number of times this file is currently opened by an EFC client */
+    char *                name;     /* Name of the file */
+    H5F_t *               file;     /* File object */
+    struct H5F_efc_ent_t *LRU_next; /* Next item in LRU list */
+    struct H5F_efc_ent_t *LRU_prev; /* Previous item in LRU list */
+    unsigned              nopen;    /* Number of times this file is currently opened by an EFC client */
 } H5F_efc_ent_t;
 
 /* Structure for a shared file struct's external file cache */
 struct H5F_efc_t {
-    H5SL_t              *slist;         /* Skip list of cached external files */
-    H5F_efc_ent_t       *LRU_head;      /* Head of LRU list.  This is the least recently used file */
-    H5F_efc_ent_t       *LRU_tail;      /* Tail of LRU list.  This is the most recently used file */
-    unsigned            nfiles;         /* Size of the external file cache */
-    unsigned            max_nfiles;     /* Maximum size of the external file cache */
-    unsigned            nrefs;          /* Number of times this file appears in another file's EFC */
-    int                 tag;            /* Temporary variable used by H5F_efc_try_close() */
-    H5F_file_t          *tmp_next;      /* Next file in temporary list used by H5F_efc_try_close() */
+    H5SL_t *       slist;      /* Skip list of cached external files */
+    H5F_efc_ent_t *LRU_head;   /* Head of LRU list.  This is the least recently used file */
+    H5F_efc_ent_t *LRU_tail;   /* Tail of LRU list.  This is the most recently used file */
+    unsigned       nfiles;     /* Size of the external file cache */
+    unsigned       max_nfiles; /* Maximum size of the external file cache */
+    unsigned       nrefs;      /* Number of times this file appears in another file's EFC */
+    int            tag;        /* Temporary variable used by H5F_efc_try_close() */
+    H5F_file_t *   tmp_next;   /* Next file in temporary list used by H5F_efc_try_close() */
 };
 
 /* Private prototypes */
 static herr_t H5F_efc_remove_ent(H5F_efc_t *efc, H5F_efc_ent_t *ent);
-static void H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail);
-static void H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail);
+static void   H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail);
+static void   H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail);
 
 /* Free lists */
 H5FL_DEFINE_STATIC(H5F_efc_ent_t);
 H5FL_DEFINE_STATIC(H5F_efc_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_create
  *
@@ -89,8 +87,8 @@ H5FL_DEFINE_STATIC(H5F_efc_t);
 H5F_efc_t *
 H5F_efc_create(unsigned max_nfiles)
 {
-    H5F_efc_t   *efc = NULL;            /* EFC object */
-    H5F_efc_t   *ret_value;             /* Return value */
+    H5F_efc_t *efc = NULL; /* EFC object */
+    H5F_efc_t *ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -98,7 +96,7 @@ H5F_efc_create(unsigned max_nfiles)
     HDassert(max_nfiles > 0);
 
     /* Allocate EFC struct */
-    if(NULL == (efc = H5FL_CALLOC(H5F_efc_t)))
+    if (NULL == (efc = H5FL_CALLOC(H5F_efc_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Initialize maximum number of files */
@@ -111,13 +109,12 @@ H5F_efc_create(unsigned max_nfiles)
     ret_value = efc;
 
 done:
-    if(ret_value == NULL && efc)
+    if (ret_value == NULL && efc)
         efc = H5FL_FREE(H5F_efc_t, efc);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_efc_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_open
  *
@@ -138,13 +135,12 @@ done:
  *-------------------------------------------------------------------------
  */
 H5F_t *
-H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
-    hid_t fapl_id, hid_t dxpl_id)
+H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id)
 {
-    H5F_efc_t   *efc = NULL;    /* External file cache for parent file */
-    H5F_efc_ent_t *ent = NULL;  /* Entry for target file in efc */
-    hbool_t     open_file = FALSE; /* Whether ent->file needs to be closed in case of error */
-    H5F_t       *ret_value = NULL; /* Return value */
+    H5F_efc_t *    efc       = NULL;  /* External file cache for parent file */
+    H5F_efc_ent_t *ent       = NULL;  /* Entry for target file in efc */
+    hbool_t        open_file = FALSE; /* Whether ent->file needs to be closed in case of error */
+    H5F_t *        ret_value = NULL;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -159,9 +155,8 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
     /* Check if the EFC exists.  If it does not, just call H5F_open().  We
      * support this so clients do not have to make 2 different calls depending
      * on the state of the efc. */
-    if(!efc) {
-        if(NULL == (ret_value = H5F_open(name, flags, fcpl_id, fapl_id,
-                                         dxpl_id)))
+    if (!efc) {
+        if (NULL == (ret_value = H5F_open(name, flags, fcpl_id, fapl_id, dxpl_id)))
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file")
 
         /* Increment the number of open objects to prevent the file from being
@@ -175,31 +170,31 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
 
     /* Search the skip list for name if the skip list exists, create the skip
      * list otherwise */
-    if(efc->slist) {
-        if(efc->nfiles > 0)
+    if (efc->slist) {
+        if (efc->nfiles > 0)
             ent = (H5F_efc_ent_t *)H5SL_search(efc->slist, name);
     } /* end if */
     else {
         HDassert(efc->nfiles == 0);
-        if(NULL == (efc->slist = H5SL_create(H5SL_TYPE_STR, NULL)))
+        if (NULL == (efc->slist = H5SL_create(H5SL_TYPE_STR, NULL)))
             HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, NULL, "can't create skip list")
     } /* end else */
 
     /* If we found the file update the LRU list and return the cached file,
      * otherwise open the file and cache it */
-    if(ent) {
+    if (ent) {
         HDassert(efc->LRU_head);
         HDassert(efc->LRU_tail);
 
         /* Move ent to the head of the LRU list, if it is not already there */
-        if(ent->LRU_prev) {
+        if (ent->LRU_prev) {
             HDassert(efc->LRU_head != ent);
 
             /* Remove from current position.  Note that once we touch the LRU
              * list we cannot revert to the previous state.  Make sure there can
              * be no errors between when we first touch the LRU list and when
              * the cache is in a consistent state! */
-            if(ent->LRU_next)
+            if (ent->LRU_next)
                 ent->LRU_next->LRU_prev = ent->LRU_prev;
             else {
                 HDassert(efc->LRU_tail == ent);
@@ -208,10 +203,10 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
             ent->LRU_prev->LRU_next = ent->LRU_next;
 
             /* Add to head of LRU list */
-            ent->LRU_next = efc->LRU_head;
+            ent->LRU_next           = efc->LRU_head;
             ent->LRU_next->LRU_prev = ent;
-            ent->LRU_prev = NULL;
-            efc->LRU_head = ent;
+            ent->LRU_prev           = NULL;
+            efc->LRU_head           = ent;
         } /* end if */
 
         /* Mark the file as open */
@@ -219,22 +214,22 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
     } /* end if */
     else {
         /* Check if we need to evict something */
-        if(efc->nfiles == efc->max_nfiles) {
+        if (efc->nfiles == efc->max_nfiles) {
             /* Search for an unopened file from the tail */
-            for(ent = efc->LRU_tail; ent && ent->nopen; ent = ent->LRU_prev);
+            for (ent = efc->LRU_tail; ent && ent->nopen; ent = ent->LRU_prev)
+                ;
 
             /* Evict the file if found, otherwise just open the target file and
              * do not add it to cache */
-            if(ent) {
-                if(H5F_efc_remove_ent(efc, ent) < 0)
+            if (ent) {
+                if (H5F_efc_remove_ent(efc, ent) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_CANTREMOVE, NULL, "can't remove entry from external file cache")
 
                 /* Do not free ent, we will recycle it below */
             } /* end if */
             else {
                 /* Cannot cache file, just open file and return */
-                if(NULL == (ret_value = H5F_open(name, flags, fcpl_id, fapl_id,
-                                                 dxpl_id)))
+                if (NULL == (ret_value = H5F_open(name, flags, fcpl_id, fapl_id, dxpl_id)))
                     HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file")
 
                 /* Increment the number of open objects to prevent the file from
@@ -244,19 +239,18 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
 
                 HGOTO_DONE(ret_value)
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else
             /* Allocate new entry */
-            if(NULL == (ent = H5FL_MALLOC(H5F_efc_ent_t)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+            if (NULL == (ent = H5FL_MALLOC(H5F_efc_ent_t)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* Build new entry */
-        if(NULL == (ent->name = H5MM_strdup(name)))
+        if (NULL == (ent->name = H5MM_strdup(name)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* Open the file */
-        if(NULL == (ent->file = H5F_open(name, flags, fcpl_id, fapl_id,
-                                         dxpl_id)))
+        if (NULL == (ent->file = H5F_open(name, flags, fcpl_id, fapl_id, dxpl_id)))
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file")
         open_file = TRUE;
 
@@ -266,16 +260,16 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
 
         /* Add the file to the cache */
         /* Skip list */
-        if(H5SL_insert(efc->slist, ent, ent->name) < 0)
+        if (H5SL_insert(efc->slist, ent, ent->name) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, NULL, "can't insert entry into skip list")
 
         /* Add to head of LRU list and update tail if necessary */
         ent->LRU_next = efc->LRU_head;
-        if(ent->LRU_next)
+        if (ent->LRU_next)
             ent->LRU_next->LRU_prev = ent;
         ent->LRU_prev = NULL;
         efc->LRU_head = ent;
-        if(!efc->LRU_tail) {
+        if (!efc->LRU_tail) {
             HDassert(!ent->LRU_next);
             efc->LRU_tail = ent;
         } /* end if */
@@ -285,7 +279,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
 
         /* Update nfiles and nrefs */
         efc->nfiles++;
-        if(ent->file->shared->efc)
+        if (ent->file->shared->efc)
             ent->file->shared->efc->nrefs++;
     } /* end else */
 
@@ -298,21 +292,20 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
     ret_value = ent->file;
 
 done:
-    if(!ret_value)
-        if(ent) {
-            if(open_file) {
+    if (!ret_value)
+        if (ent) {
+            if (open_file) {
                 ent->file->nopen_objs--;
-                if(H5F_try_close(ent->file) < 0)
+                if (H5F_try_close(ent->file) < 0)
                     HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, NULL, "can't close external file")
             } /* end if */
             ent->name = (char *)H5MM_xfree(ent->name);
-            ent = H5FL_FREE(H5F_efc_ent_t, ent);
+            ent       = H5FL_FREE(H5F_efc_ent_t, ent);
         } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_efc_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_close
  *
@@ -331,9 +324,9 @@ done:
 herr_t
 H5F_efc_close(H5F_t *parent, H5F_t *file)
 {
-    H5F_efc_t   *efc = NULL;    /* External file cache for parent file */
-    H5F_efc_ent_t *ent = NULL;  /* Entry for target file in efc */
-    herr_t      ret_value = SUCCEED; /* Return value */
+    H5F_efc_t *    efc       = NULL;    /* External file cache for parent file */
+    H5F_efc_ent_t *ent       = NULL;    /* Entry for target file in efc */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -349,9 +342,9 @@ H5F_efc_close(H5F_t *parent, H5F_t *file)
     /* Check if the EFC exists.  If it does not, just call H5F_try_close().  We
      * support this so clients do not have to make 2 different calls depending
      * on the state of the efc. */
-    if(!efc) {
+    if (!efc) {
         file->nopen_objs--;
-        if(H5F_try_close(file) < 0)
+        if (H5F_try_close(file) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close external file")
 
         HGOTO_DONE(SUCCEED)
@@ -362,10 +355,11 @@ H5F_efc_close(H5F_t *parent, H5F_t *file)
      * the head.  In the unlikely case that the file is not found, just call
      * H5F_try_close().  This could happen if the EFC was full of open files
      * when the file was opened. */
-    for(ent = efc->LRU_head; ent && ent->file != file; ent = ent->LRU_next);
-    if(!ent) {
+    for (ent = efc->LRU_head; ent && ent->file != file; ent = ent->LRU_next)
+        ;
+    if (!ent) {
         file->nopen_objs--;
-        if(H5F_try_close(file) < 0)
+        if (H5F_try_close(file) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close external file")
     } /* end if */
     else
@@ -376,7 +370,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_efc_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_max_nfiles
  *
@@ -401,7 +394,6 @@ H5F_efc_max_nfiles(H5F_efc_t *efc)
     FUNC_LEAVE_NOAPI(efc->max_nfiles)
 } /* end H5F_efc_max_nfiles */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_release
  *
@@ -420,9 +412,9 @@ H5F_efc_max_nfiles(H5F_efc_t *efc)
 herr_t
 H5F_efc_release(H5F_efc_t *efc)
 {
-    H5F_efc_ent_t *ent = NULL;          /* EFC entry */
-    H5F_efc_ent_t *prev_ent = NULL;     /* Previous EFC entry */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5F_efc_ent_t *ent       = NULL;    /* EFC entry */
+    H5F_efc_ent_t *prev_ent  = NULL;    /* Previous EFC entry */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -434,21 +426,20 @@ H5F_efc_release(H5F_efc_t *efc)
      * would require a cycle, a cycle would necessarily invoke
      * H5F_efc_try_close(), and that function checks the status of the lock
      * before calling this one. */
-    HDassert((efc->tag == H5F_EFC_TAG_DEFAULT)
-            || (efc->tag == H5F_EFC_TAG_CLOSE));
+    HDassert((efc->tag == H5F_EFC_TAG_DEFAULT) || (efc->tag == H5F_EFC_TAG_CLOSE));
     efc->tag = H5F_EFC_TAG_LOCK;
 
     /* Walk down the LRU list, releasing any files that are not opened by an EFC
      * client */
     ent = efc->LRU_head;
-    while(ent)
-        if(!ent->nopen) {
-            if(H5F_efc_remove_ent(efc, ent) < 0)
+    while (ent)
+        if (!ent->nopen) {
+            if (H5F_efc_remove_ent(efc, ent) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTREMOVE, FAIL, "can't remove entry from external file cache")
 
             /* Free the entry and move to next entry in LRU list */
             prev_ent = ent;
-            ent = ent->LRU_next;
+            ent      = ent->LRU_next;
             prev_ent = H5FL_FREE(H5F_efc_ent_t, prev_ent);
         } /* end if */
         else
@@ -463,7 +454,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5F_efc_release() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_destroy
  *
@@ -482,20 +472,20 @@ done:
 herr_t
 H5F_efc_destroy(H5F_efc_t *efc)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity checks */
     HDassert(efc);
 
-    if(efc->nfiles > 0) {
+    if (efc->nfiles > 0) {
         /* Release (clear) the efc */
-        if(H5F_efc_release(efc) < 0)
+        if (H5F_efc_release(efc) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't release external file cache")
 
         /* If there are still cached files, return an error */
-        if(efc->nfiles > 0)
+        if (efc->nfiles > 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "can't destroy EFC after incomplete release")
     } /* end if */
 
@@ -504,8 +494,8 @@ H5F_efc_destroy(H5F_efc_t *efc)
     HDassert(efc->LRU_tail == NULL);
 
     /* Close skip list */
-    if(efc->slist)
-        if(H5SL_close(efc->slist) < 0)
+    if (efc->slist)
+        if (H5SL_close(efc->slist) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "can't close skip list")
 
     /* Free EFC object */
@@ -515,7 +505,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5F_efc_destroy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_remove_ent
  *
@@ -533,7 +522,7 @@ done:
 static herr_t
 H5F_efc_remove_ent(H5F_efc_t *efc, H5F_efc_ent_t *ent)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -543,17 +532,17 @@ H5F_efc_remove_ent(H5F_efc_t *efc, H5F_efc_ent_t *ent)
     HDassert(ent);
 
     /* Remove from skip list */
-    if(ent != H5SL_remove(efc->slist, ent->name))
+    if (ent != H5SL_remove(efc->slist, ent->name))
         HGOTO_ERROR(H5E_FILE, H5E_CANTDELETE, FAIL, "can't delete entry from skip list")
 
     /* Remove from LRU list */
-    if(ent->LRU_next)
+    if (ent->LRU_next)
         ent->LRU_next->LRU_prev = ent->LRU_prev;
     else {
         HDassert(efc->LRU_tail == ent);
         efc->LRU_tail = ent->LRU_prev;
     } /* end else */
-    if(ent->LRU_prev)
+    if (ent->LRU_prev)
         ent->LRU_prev->LRU_next = ent->LRU_next;
     else {
         HDassert(efc->LRU_head == ent);
@@ -562,7 +551,7 @@ H5F_efc_remove_ent(H5F_efc_t *efc, H5F_efc_ent_t *ent)
 
     /* Update nfiles and nrefs */
     efc->nfiles--;
-    if(ent->file->shared->efc)
+    if (ent->file->shared->efc)
         ent->file->shared->efc->nrefs--;
 
     /* Free the name */
@@ -573,7 +562,7 @@ H5F_efc_remove_ent(H5F_efc_t *efc, H5F_efc_ent_t *ent)
      * However we must still manipulate the nopen_objs field to prevent the file
      * from being closed out from under us. */
     ent->file->nopen_objs--;
-    if(H5F_try_close(ent->file) < 0)
+    if (H5F_try_close(ent->file) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close external file")
     ent->file = NULL;
 
@@ -581,7 +570,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_efc_remove_ent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_try_close_tag1
  *
@@ -599,8 +587,8 @@ done:
 static void
 H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail)
 {
-    H5F_efc_ent_t       *ent = NULL;    /* EFC entry */
-    H5F_file_t          *esf;           /* Convenience pointer to ent->file->shared */
+    H5F_efc_ent_t *ent = NULL; /* EFC entry */
+    H5F_file_t *   esf;        /* Convenience pointer to ent->file->shared */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -613,17 +601,17 @@ H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail)
     HDassert(*tail);
 
     /* Recurse into this file's cached files */
-    for(ent = sf->efc->LRU_head; ent; ent = ent->LRU_next) {
+    for (ent = sf->efc->LRU_head; ent; ent = ent->LRU_next) {
         esf = ent->file->shared;
 
-        if(esf->efc) {
+        if (esf->efc) {
             /* If tag were 0, that would mean there are more actual references
              * than are counted by nrefs */
             HDassert(esf->efc->tag != 0);
 
             /* If tag has been set, we have already visited this file so just
              * decrement tag and continue */
-            if(esf->efc->tag > 0)
+            if (esf->efc->tag > 0)
                 esf->efc->tag--;
             /* If there are references that are not from an EFC, it will never
              * be possible to close the file.  Just continue.  Also continue if
@@ -631,8 +619,8 @@ H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail)
              * that the reference counts will never match for the root file, but
              * that's ok because the root file will always have a tag and enter
              * the branch above. */
-            else if((esf->nrefs == esf->efc->nrefs)
-                    && (esf->efc->tag != H5F_EFC_TAG_LOCK) && !(ent->nopen)) {
+            else if ((esf->nrefs == esf->efc->nrefs) && (esf->efc->tag != H5F_EFC_TAG_LOCK) &&
+                     !(ent->nopen)) {
                 /* If we get here, this file's "tmp_next" pointer must be NULL
                  */
                 HDassert(esf->efc->tmp_next == NULL);
@@ -640,22 +628,21 @@ H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail)
                 /* If nrefs > 1, Add this file to the list of files with nrefs >
                  * 1 and initialize tag to the number of references (except this
                  * one) */
-                if(esf->nrefs > 1) {
+                if (esf->nrefs > 1) {
                     (*tail)->efc->tmp_next = esf;
-                    *tail = esf;
-                    esf->efc->tag = (int)esf->nrefs - 1;
+                    *tail                  = esf;
+                    esf->efc->tag          = (int)esf->nrefs - 1;
                 } /* end if */
 
                 /* Recurse into the entry */
                 H5F_efc_try_close_tag1(ent->file->shared, tail);
             } /* end if */
-        } /* end if */
-    } /* end for */
+        }     /* end if */
+    }         /* end for */
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5F_efc_try_close_tag1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_try_close_tag2
  *
@@ -673,8 +660,8 @@ H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail)
 static void
 H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail)
 {
-    H5F_efc_ent_t       *ent = NULL;    /* EFC entry */
-    H5F_file_t          *esf;           /* Convenience pointer to ent->file->shared */
+    H5F_efc_ent_t *ent = NULL; /* EFC entry */
+    H5F_file_t *   esf;        /* Convenience pointer to ent->file->shared */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -683,7 +670,7 @@ H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail)
     HDassert(sf->efc);
 
     /* Recurse into this file's cached files */
-    for(ent = sf->efc->LRU_head; ent; ent = ent->LRU_next) {
+    for (ent = sf->efc->LRU_head; ent; ent = ent->LRU_next) {
         esf = ent->file->shared;
 
         /* Only recurse if the file is tagged CLOSE or DEFAULT.  If it is tagged
@@ -694,39 +681,36 @@ H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail)
          * make sure  we do not go off into somewhere cb1 didn't touch.  The
          * root file should never be tagged DEFAULT here, so the reference check
          * is still appropriate. */
-        if((esf->efc) && ((esf->efc->tag == H5F_EFC_TAG_CLOSE)
-                || ((esf->efc->tag == H5F_EFC_TAG_DEFAULT)
-                && (esf->nrefs == esf->efc->nrefs) && !(ent->nopen)))) {
+        if ((esf->efc) &&
+            ((esf->efc->tag == H5F_EFC_TAG_CLOSE) ||
+             ((esf->efc->tag == H5F_EFC_TAG_DEFAULT) && (esf->nrefs == esf->efc->nrefs) && !(ent->nopen)))) {
             /* tag should always be CLOSE is nrefs > 1 or DEFAULT if nrefs == 1
              * here */
-            HDassert(((esf->nrefs > 1)
-                    && ((esf->efc->tag == H5F_EFC_TAG_CLOSE)))
-                    || ((esf->nrefs == 1)
-                    && (esf->efc->tag == H5F_EFC_TAG_DEFAULT)));
+            HDassert(((esf->nrefs > 1) && ((esf->efc->tag == H5F_EFC_TAG_CLOSE))) ||
+                     ((esf->nrefs == 1) && (esf->efc->tag == H5F_EFC_TAG_DEFAULT)));
 
             /* If tag is set to DONTCLOSE, we have already visited this file
              * *or* it will be the start point of another iteration so just
              * continue */
-            if(esf->efc->tag != H5F_EFC_TAG_DONTCLOSE) {
+            if (esf->efc->tag != H5F_EFC_TAG_DONTCLOSE) {
                 /* If tag is CLOSE, set to DONTCLOSE and add to the list of
                  * uncloseable files. */
-                if(esf->efc->tag == H5F_EFC_TAG_CLOSE) {
-                    esf->efc->tag = H5F_EFC_TAG_DONTCLOSE;
-                    esf->efc->tmp_next = NULL;
+                if (esf->efc->tag == H5F_EFC_TAG_CLOSE) {
+                    esf->efc->tag          = H5F_EFC_TAG_DONTCLOSE;
+                    esf->efc->tmp_next     = NULL;
                     (*tail)->efc->tmp_next = esf;
-                    *tail = esf;
+                    *tail                  = esf;
                 } /* end if */
 
                 /* Recurse into the entry */
                 H5F_efc_try_close_tag2(esf, tail);
             } /* end if */
-        } /* end if */
-    } /* end for */
+        }     /* end if */
+    }         /* end for */
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5F_efc_try_close_tag2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_efc_try_close
  *
@@ -780,12 +764,14 @@ H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail)
 herr_t
 H5F_efc_try_close(H5F_t *f)
 {
-    H5F_file_t  *tail;                  /* Tail of linked list of found files.  Head will be f->shared. */
-    H5F_file_t  *uncloseable_head = NULL; /* Head of linked list of files found to be uncloseable by the first pass */
-    H5F_file_t  *uncloseable_tail = NULL; /* Tail of linked list of files found to be uncloseable by the first pass */
-    H5F_file_t  *sf;                    /* Temporary file pointer */
-    H5F_file_t  *next;                  /* Temporary file pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5F_file_t *tail; /* Tail of linked list of found files.  Head will be f->shared. */
+    H5F_file_t *uncloseable_head =
+        NULL; /* Head of linked list of files found to be uncloseable by the first pass */
+    H5F_file_t *uncloseable_tail =
+        NULL;         /* Tail of linked list of files found to be uncloseable by the first pass */
+    H5F_file_t *sf;   /* Temporary file pointer */
+    H5F_file_t *next; /* Temporary file pointer */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -797,12 +783,12 @@ H5F_efc_try_close(H5F_t *f)
     HDassert(f->shared->nrefs > 1);
     HDassert(f->shared->efc->tag < 0);
 
-    if(f->shared->efc->tag == H5F_EFC_TAG_CLOSE) {
+    if (f->shared->efc->tag == H5F_EFC_TAG_CLOSE) {
         /* We must have reentered this function, and we should close this file.
          * In actuality, we just release the EFC, the recursion should
          * eventually reduce this file's reference count to 1 (though possibly
          * not from this call to H5F_efc_release()). */
-        if(H5F_efc_release(f->shared->efc) < 0)
+        if (H5F_efc_release(f->shared->efc) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't release external file cache")
 
         /* If we marked the file as closeable, there must be no open files in
@@ -828,15 +814,14 @@ H5F_efc_try_close(H5F_t *f)
      * not close/release it */
     /* If nfiles is 0, then there is nothing to do.  Just return.  This may also
      * occur on reentry (for example if this file was previously released). */
-    if((f->shared->nrefs != f->shared->efc->nrefs + 1)
-            || (f->shared->efc->tag == H5F_EFC_TAG_DONTCLOSE)
-            || (f->shared->efc->nfiles == 0))
+    if ((f->shared->nrefs != f->shared->efc->nrefs + 1) || (f->shared->efc->tag == H5F_EFC_TAG_DONTCLOSE) ||
+        (f->shared->efc->nfiles == 0))
         /* We must have reentered this function, and we should not close this
          * file.  Just return. */
         HGOTO_DONE(SUCCEED)
 
     /* If the file EFC were locked, that should always mean that there exists
-     * a reference to this file that is not in an EFC (it may have just been 
+     * a reference to this file that is not in an EFC (it may have just been
      * removed from an EFC), and should have been caught by the above check */
     /* If we get here then we must be beginning a new run.  Make sure that the
      * temporary variables in f->shared->efc are at the default value */
@@ -858,13 +843,13 @@ H5F_efc_try_close(H5F_t *f)
 
     /* Check if f->shared->efc->tag dropped to 0.  If it did not,
      * we cannot close anything.  Just reset temporary values and return. */
-    if(f->shared->efc->tag > 0) {
+    if (f->shared->efc->tag > 0) {
         sf = f->shared;
-        while(sf) {
-            next = sf->efc->tmp_next;
-            sf->efc->tag = H5F_EFC_TAG_DEFAULT;
+        while (sf) {
+            next              = sf->efc->tmp_next;
+            sf->efc->tag      = H5F_EFC_TAG_DEFAULT;
             sf->efc->tmp_next = NULL;
-            sf = next;
+            sf                = next;
         } /* end while */
         HGOTO_DONE(SUCCEED)
     } /* end if */
@@ -872,19 +857,19 @@ H5F_efc_try_close(H5F_t *f)
     /* Run through the linked list , separating into two lists, one with tag ==
      * 0 and one with tag > 0.  Mark them as either H5F_EFC_TAG_CLOSE or
      * H5F_EFC_TAG_DONTCLOSE as appropriate. */
-    sf = f->shared;
+    sf   = f->shared;
     tail = NULL;
-    while(sf) {
+    while (sf) {
         HDassert(sf->efc->tag >= 0);
         next = sf->efc->tmp_next;
-        if(sf->efc->tag > 0) {
+        if (sf->efc->tag > 0) {
             /* Remove from main list */
             HDassert(tail);
             tail->efc->tmp_next = sf->efc->tmp_next;
-            sf->efc->tmp_next = NULL;
+            sf->efc->tmp_next   = NULL;
 
             /* Add to uncloseable list */
-            if(!uncloseable_head)
+            if (!uncloseable_head)
                 uncloseable_head = sf;
             else
                 uncloseable_tail->efc->tmp_next = sf;
@@ -895,7 +880,7 @@ H5F_efc_try_close(H5F_t *f)
         } /* end if */
         else {
             sf->efc->tag = H5F_EFC_TAG_CLOSE;
-            tail = sf;
+            tail         = sf;
         } /* end else */
         sf = next;
     } /* end while */
@@ -908,20 +893,20 @@ H5F_efc_try_close(H5F_t *f)
      * so we know when to stop.  We do not need to keep track of the closeable
      * list any more. */
     sf = uncloseable_head;
-    if(sf) {
+    if (sf) {
         tail = uncloseable_tail;
         HDassert(tail);
-        while(sf != tail->efc->tmp_next) {
+        while (sf != tail->efc->tmp_next) {
             H5F_efc_try_close_tag2(sf, &uncloseable_tail);
             sf = sf->efc->tmp_next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     /* If the root file's tag is still H5F_EFC_TAG_CLOSE, release its EFC.  This
      * should start the recursive release that should close all closeable files.
      * Also, see the top of this function. */
-    if(f->shared->efc->tag == H5F_EFC_TAG_CLOSE) {
-        if(H5F_efc_release(f->shared->efc) < 0)
+    if (f->shared->efc->tag == H5F_EFC_TAG_CLOSE) {
+        if (H5F_efc_release(f->shared->efc) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't release external file cache")
 
         /* Make sure the file's reference count is now 1 and will be closed by
@@ -931,18 +916,17 @@ H5F_efc_try_close(H5F_t *f)
 
     /* Clean up uncloseable files (reset tag and tmp_next).  All closeable files
      * should have been closed, and therefore do not need to be cleaned up. */
-    if(uncloseable_head) {
+    if (uncloseable_head) {
         sf = uncloseable_head;
-        while(sf) {
+        while (sf) {
             next = sf->efc->tmp_next;
             HDassert(sf->efc->tag == H5F_EFC_TAG_DONTCLOSE);
-            sf->efc->tag = H5F_EFC_TAG_DEFAULT;
+            sf->efc->tag      = H5F_EFC_TAG_DEFAULT;
             sf->efc->tmp_next = NULL;
-            sf = next;
+            sf                = next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_efc_try_close() */
-
diff --git a/src/H5Ffake.c b/src/H5Ffake.c
index 2d25ba1..7077c57 100644
--- a/src/H5Ffake.c
+++ b/src/H5Ffake.c
@@ -11,20 +11,18 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5F_init_fake_interface
-
+#define H5_INTERFACE_INIT_FUNC H5F_init_fake_interface
 
 /* Packages needed by this file... */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fpkg.h"     /* File access				*/
 
 /* PRIVATE PROTOTYPES */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5F_init_fake_interface -- Initialize interface-specific information
@@ -46,7 +44,6 @@ H5F_init_fake_interface(void)
     FUNC_LEAVE_NOAPI(H5F_init())
 } /* H5F_init_fake_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_fake_alloc
  *
@@ -67,19 +64,19 @@ H5F_init_fake_interface(void)
 H5F_t *
 H5F_fake_alloc(uint8_t sizeof_size)
 {
-    H5F_t *f = NULL;            /* Pointer to fake file struct */
-    H5F_t *ret_value;           /* Return value */
+    H5F_t *f = NULL;  /* Pointer to fake file struct */
+    H5F_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Allocate faked file struct */
-    if(NULL == (f = H5FL_CALLOC(H5F_t)))
-	HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate top file structure")
-    if(NULL == (f->shared = H5FL_CALLOC(H5F_file_t)))
-	HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate shared file structure")
+    if (NULL == (f = H5FL_CALLOC(H5F_t)))
+        HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate top file structure")
+    if (NULL == (f->shared = H5FL_CALLOC(H5F_file_t)))
+        HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate shared file structure")
 
     /* Only set fields necessary for clients */
-    if(sizeof_size == 0)
+    if (sizeof_size == 0)
         f->shared->sizeof_size = H5F_OBJ_SIZE_SIZE;
     else
         f->shared->sizeof_size = sizeof_size;
@@ -88,13 +85,12 @@ H5F_fake_alloc(uint8_t sizeof_size)
     ret_value = f;
 
 done:
-    if(!ret_value)
+    if (!ret_value)
         H5F_fake_free(f);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_fake_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_fake_free
  *
@@ -115,13 +111,12 @@ H5F_fake_free(H5F_t *f)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Free faked file struct */
-    if(f) {
+    if (f) {
         /* Destroy shared file struct */
-        if(f->shared)
+        if (f->shared)
             f->shared = H5FL_FREE(H5F_file_t, f->shared);
         f = H5FL_FREE(H5F_t, f);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5F_fake_free() */
-
diff --git a/src/H5Fint.c b/src/H5Fint.c
index a92fa46..761c387 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -15,42 +15,41 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5F_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5F_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Aprivate.h"		/* Attributes				*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"		/* Property lists			*/
-#include "H5SMprivate.h"	/* Shared Object Header Messages	*/
-#include "H5Tprivate.h"		/* Datatypes				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Aprivate.h"  /* Attributes				*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Gprivate.h"  /* Groups				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Pprivate.h"  /* Property lists			*/
+#include "H5SMprivate.h" /* Shared Object Header Messages	*/
+#include "H5Tprivate.h"  /* Datatypes				*/
 
 /* Predefined file drivers */
-#include "H5FDcore.h"		/*temporary in-memory files		*/
-#include "H5FDfamily.h"		/*family of files			*/
-#include "H5FDlog.h"            /* sec2 driver with logging, for debugging */
-#include "H5FDmpi.h"            /* MPI-based file drivers		*/
-#include "H5FDmulti.h"		/*multiple files partitioned by mem usage */
-#include "H5FDsec2.h"		/*Posix unbuffered I/O			*/
-#include "H5FDstdio.h"		/* Standard C buffered I/O		*/
+#include "H5FDcore.h"   /*temporary in-memory files		*/
+#include "H5FDfamily.h" /*family of files			*/
+#include "H5FDlog.h"    /* sec2 driver with logging, for debugging */
+#include "H5FDmpi.h"    /* MPI-based file drivers		*/
+#include "H5FDmulti.h"  /*multiple files partitioned by mem usage */
+#include "H5FDsec2.h"   /*Posix unbuffered I/O			*/
+#include "H5FDstdio.h"  /* Standard C buffered I/O		*/
 #ifdef H5_HAVE_WINDOWS
-#include "H5FDwindows.h"        /* Windows buffered I/O     */
+#include "H5FDwindows.h" /* Windows buffered I/O     */
 #endif
-#include "H5FDdirect.h"         /*Linux direct I/O			*/
+#include "H5FDdirect.h" /*Linux direct I/O			*/
 
 /****************/
 /* Local Macros */
@@ -62,45 +61,41 @@
 
 /* Struct only used by functions H5F_get_objects and H5F_get_objects_cb */
 typedef struct H5F_olist_t {
-    H5I_type_t obj_type;        /* Type of object to look for */
-    hid_t      *obj_id_list;    /* Pointer to the list of open IDs to return */
-    size_t     *obj_id_count;   /* Number of open IDs */
+    H5I_type_t obj_type;     /* Type of object to look for */
+    hid_t *    obj_id_list;  /* Pointer to the list of open IDs to return */
+    size_t *   obj_id_count; /* Number of open IDs */
     struct {
-        hbool_t local;          /* Set flag for "local" file searches */
+        hbool_t local; /* Set flag for "local" file searches */
         union {
-            H5F_file_t *shared; /* Pointer to shared file to look inside */
-            const H5F_t *file;  /* Pointer to file to look inside */
+            H5F_file_t * shared; /* Pointer to shared file to look inside */
+            const H5F_t *file;   /* Pointer to file to look inside */
         } ptr;
     } file_info;
-    size_t     list_index;      /* Current index in open ID array */
-    size_t     max_nobjs;       /* Maximum # of IDs to put into array */
+    size_t list_index; /* Current index in open ID array */
+    size_t max_nobjs;  /* Maximum # of IDs to put into array */
 } H5F_olist_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static int H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key);
-static herr_t H5F_build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl,
-    const char *name, char ** /*out*/ actual_name);/* Declare a free list to manage the H5F_t struct */
-
+static herr_t
+H5F_build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *name,
+                      char ** /*out*/ actual_name); /* Declare a free list to manage the H5F_t struct */
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -111,7 +106,6 @@ H5FL_DEFINE(H5F_t);
 /* Declare a free list to manage the H5F_file_t struct */
 H5FL_DEFINE(H5F_file_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_init_interface
  *
@@ -128,14 +122,13 @@ H5FL_DEFINE(H5F_file_t);
 static herr_t
 H5F_init_interface(void)
 {
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_access_plist
  *
@@ -162,11 +155,11 @@ H5F_init_interface(void)
 hid_t
 H5F_get_access_plist(H5F_t *f, hbool_t app_ref)
 {
-    H5P_genplist_t *new_plist;              /* New property list */
-    H5P_genplist_t *old_plist;              /* Old property list */
-    void		*driver_info=NULL;
-    unsigned            efc_size = 0;
-    hid_t		ret_value = SUCCEED;
+    H5P_genplist_t *new_plist; /* New property list */
+    H5P_genplist_t *old_plist; /* Old property list */
+    void *          driver_info = NULL;
+    unsigned        efc_size    = 0;
+    hid_t           ret_value   = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -174,63 +167,66 @@ H5F_get_access_plist(H5F_t *f, hbool_t app_ref)
     HDassert(f);
 
     /* Make a copy of the default file access property list */
-    if(NULL == (old_plist = (H5P_genplist_t *)H5I_object(H5P_LST_FILE_ACCESS_ID_g)))
+    if (NULL == (old_plist = (H5P_genplist_t *)H5I_object(H5P_LST_FILE_ACCESS_ID_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
-    if((ret_value = H5P_copy_plist(old_plist, app_ref)) < 0)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "can't copy file access property list")
-    if(NULL == (new_plist = (H5P_genplist_t *)H5I_object(ret_value)))
+    if ((ret_value = H5P_copy_plist(old_plist, app_ref)) < 0)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "can't copy file access property list")
+    if (NULL == (new_plist = (H5P_genplist_t *)H5I_object(ret_value)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Copy properties of the file access property list */
-    if(H5P_set(new_plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, &(f->shared->mdc_initCacheCfg)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, &(f->shared->mdc_initCacheCfg)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set initial metadata cache resize config.")
-    if(H5P_set(new_plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, &(f->shared->rdcc_nslots)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, &(f->shared->rdcc_nslots)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache number of slots")
-    if(H5P_set(new_plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &(f->shared->rdcc_nbytes)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &(f->shared->rdcc_nbytes)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache byte size")
-    if(H5P_set(new_plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, &(f->shared->rdcc_w0)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, &(f->shared->rdcc_w0)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set preempt read chunks")
-    if(H5P_set(new_plist, H5F_ACS_ALIGN_THRHD_NAME, &(f->shared->threshold)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_ALIGN_THRHD_NAME, &(f->shared->threshold)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set alignment threshold")
-    if(H5P_set(new_plist, H5F_ACS_ALIGN_NAME, &(f->shared->alignment)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_ALIGN_NAME, &(f->shared->alignment)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set alignment")
-    if(H5P_set(new_plist, H5F_ACS_GARBG_COLCT_REF_NAME, &(f->shared->gc_ref)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_GARBG_COLCT_REF_NAME, &(f->shared->gc_ref)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set garbage collect reference")
-    if(H5P_set(new_plist, H5F_ACS_META_BLOCK_SIZE_NAME, &(f->shared->meta_aggr.alloc_size)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_META_BLOCK_SIZE_NAME, &(f->shared->meta_aggr.alloc_size)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set metadata cache size")
-    if(H5P_set(new_plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &(f->shared->sieve_buf_size)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &(f->shared->sieve_buf_size)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't sieve buffer size")
-    if(H5P_set(new_plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &(f->shared->sdata_aggr.alloc_size)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &(f->shared->sdata_aggr.alloc_size)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'small data' cache size")
-    if(H5P_set(new_plist, H5F_ACS_LATEST_FORMAT_NAME, &(f->shared->latest_format)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_LATEST_FORMAT_NAME, &(f->shared->latest_format)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'latest format' flag")
-    if(f->shared->efc)
+    if (f->shared->efc)
         efc_size = H5F_efc_max_nfiles(f->shared->efc);
-    if(H5P_set(new_plist, H5F_ACS_EFC_SIZE_NAME, &efc_size) < 0)
+    if (H5P_set(new_plist, H5F_ACS_EFC_SIZE_NAME, &efc_size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set elink file cache size")
 
     /*
      * Since we're resetting the driver ID and info, close them if they
      * exist in this new property list.
      */
-    if(H5P_facc_close(ret_value, NULL) < 0)
+    if (H5P_facc_close(ret_value, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't free the old driver information")
 
     /* Increment the reference count on the driver ID and insert it into the property list */
-    if(H5I_inc_ref(f->shared->lf->driver_id, FALSE) < 0)
+    if (H5I_inc_ref(f->shared->lf->driver_id, FALSE) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINC, FAIL, "unable to increment ref count on VFL driver")
-    if(H5P_set(new_plist, H5F_ACS_FILE_DRV_ID_NAME, &(f->shared->lf->driver_id)) < 0)
+    if (H5P_set(new_plist, H5F_ACS_FILE_DRV_ID_NAME, &(f->shared->lf->driver_id)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file driver ID")
 
     /* Set the driver "info" in the property list */
     driver_info = H5FD_fapl_get(f->shared->lf);
-    if(driver_info != NULL && H5P_set(new_plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
+    if (driver_info != NULL && H5P_set(new_plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file driver info")
 
     /* Set the file close degree appropriately */
-    if(f->shared->fc_degree == H5F_CLOSE_DEFAULT && H5P_set(new_plist, H5F_ACS_CLOSE_DEGREE_NAME, &(f->shared->lf->cls->fc_degree)) < 0) {
+    if (f->shared->fc_degree == H5F_CLOSE_DEFAULT &&
+        H5P_set(new_plist, H5F_ACS_CLOSE_DEGREE_NAME, &(f->shared->lf->cls->fc_degree)) < 0) {
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file close degree")
-    } else if(f->shared->fc_degree != H5F_CLOSE_DEFAULT && H5P_set(new_plist, H5F_ACS_CLOSE_DEGREE_NAME, &(f->shared->fc_degree)) < 0) {
+    }
+    else if (f->shared->fc_degree != H5F_CLOSE_DEFAULT &&
+             H5P_set(new_plist, H5F_ACS_CLOSE_DEGREE_NAME, &(f->shared->fc_degree)) < 0) {
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file close degree")
     }
 
@@ -238,7 +234,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_access_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_get_obj_count
  *
@@ -255,7 +250,7 @@ done:
 herr_t
 H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref, size_t *obj_id_count_ptr)
 {
-    herr_t   ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -263,14 +258,13 @@ H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref, size_t *obj_i
     HDassert(obj_id_count_ptr);
 
     /* Perform the query */
-    if((ret_value = H5F_get_objects(f, types, 0, NULL, app_ref, obj_id_count_ptr)) < 0)
+    if ((ret_value = H5F_get_objects(f, types, 0, NULL, app_ref, obj_id_count_ptr)) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADITER, FAIL, "H5F_get_objects failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_obj_count() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_get_obj_ids
  *
@@ -284,9 +278,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list, hbool_t app_ref, size_t *obj_id_count_ptr)
+H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list, hbool_t app_ref,
+                size_t *obj_id_count_ptr)
 {
-    herr_t ret_value = SUCCEED;              /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -294,14 +289,13 @@ H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list
     HDassert(obj_id_count_ptr);
 
     /* Perform the query */
-    if((ret_value = H5F_get_objects(f, types, max_objs, oid_list, app_ref, obj_id_count_ptr)) < 0)
+    if ((ret_value = H5F_get_objects(f, types, max_objs, oid_list, app_ref, obj_id_count_ptr)) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADITER, FAIL, "H5F_get_objects failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_obj_ids() */
 
-
 /*---------------------------------------------------------------------------
  * Function:	H5F_get_objects
  *
@@ -316,11 +310,12 @@ done:
  *---------------------------------------------------------------------------
  */
 herr_t
-H5F_get_objects(const H5F_t *f, unsigned types, size_t max_nobjs, hid_t *obj_id_list, hbool_t app_ref, size_t *obj_id_count_ptr)
+H5F_get_objects(const H5F_t *f, unsigned types, size_t max_nobjs, hid_t *obj_id_list, hbool_t app_ref,
+                size_t *obj_id_count_ptr)
 {
-    size_t obj_id_count=0;      /* Number of open IDs */
-    H5F_olist_t olist;          /* Structure to hold search results */
-    herr_t ret_value = SUCCEED; /* Return value */
+    size_t      obj_id_count = 0;    /* Number of open IDs */
+    H5F_olist_t olist;               /* Structure to hold search results */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -328,26 +323,26 @@ H5F_get_objects(const H5F_t *f, unsigned types, size_t max_nobjs, hid_t *obj_id_
     HDassert(obj_id_count_ptr);
 
     /* Set up search information */
-    olist.obj_id_list  = (max_nobjs==0 ? NULL : obj_id_list);
+    olist.obj_id_list  = (max_nobjs == 0 ? NULL : obj_id_list);
     olist.obj_id_count = &obj_id_count;
     olist.list_index   = 0;
-    olist.max_nobjs   = max_nobjs;
+    olist.max_nobjs    = max_nobjs;
 
     /* Determine if we are searching for local or global objects */
-    if(types & H5F_OBJ_LOCAL) {
-        olist.file_info.local = TRUE;
+    if (types & H5F_OBJ_LOCAL) {
+        olist.file_info.local    = TRUE;
         olist.file_info.ptr.file = f;
     } /* end if */
     else {
-        olist.file_info.local = FALSE;
+        olist.file_info.local      = FALSE;
         olist.file_info.ptr.shared = f ? f->shared : NULL;
     } /* end else */
 
     /* Iterate through file IDs to count the number, and put their
      * IDs on the object list.  */
-    if(types & H5F_OBJ_FILE) {
+    if (types & H5F_OBJ_FILE) {
         olist.obj_type = H5I_FILE;
-        if(H5I_iterate(H5I_FILE, H5F_get_objects_cb, &olist, app_ref) < 0)
+        if (H5I_iterate(H5I_FILE, H5F_get_objects_cb, &olist, app_ref) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_BADITER, FAIL, "iteration failed(1)")
     } /* end if */
 
@@ -355,50 +350,50 @@ H5F_get_objects(const H5F_t *f, unsigned types, size_t max_nobjs, hid_t *obj_id_
      * or the caller wants to get the list of IDs and the list isn't full,
      * search through dataset IDs to count number of datasets, and put their
      * IDs on the object list */
-    if(!olist.max_nobjs || (olist.max_nobjs && olist.list_index<olist.max_nobjs)) { 
+    if (!olist.max_nobjs || (olist.max_nobjs && olist.list_index < olist.max_nobjs)) {
         if (types & H5F_OBJ_DATASET) {
             olist.obj_type = H5I_DATASET;
-            if(H5I_iterate(H5I_DATASET, H5F_get_objects_cb, &olist, app_ref) < 0)
+            if (H5I_iterate(H5I_DATASET, H5F_get_objects_cb, &olist, app_ref) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_BADITER, FAIL, "iteration failed(2)")
         } /* end if */
-    } 
+    }
 
     /* If the caller just wants to count the number of objects (OLIST.MAX_NOBJS is zero),
      * or the caller wants to get the list of IDs and the list isn't full,
      * search through group IDs to count number of groups, and put their
      * IDs on the object list */
-    if(!olist.max_nobjs || (olist.max_nobjs && olist.list_index<olist.max_nobjs)) { 
-        if(types & H5F_OBJ_GROUP) {
+    if (!olist.max_nobjs || (olist.max_nobjs && olist.list_index < olist.max_nobjs)) {
+        if (types & H5F_OBJ_GROUP) {
             olist.obj_type = H5I_GROUP;
-            if(H5I_iterate(H5I_GROUP, H5F_get_objects_cb, &olist, app_ref) < 0)
+            if (H5I_iterate(H5I_GROUP, H5F_get_objects_cb, &olist, app_ref) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_BADITER, FAIL, "iteration failed(3)")
         } /* end if */
-    } 
+    }
 
     /* If the caller just wants to count the number of objects (OLIST.MAX_NOBJS is zero),
      * or the caller wants to get the list of IDs and the list isn't full,
      * search through datatype IDs to count number of named datatypes, and put their
      * IDs on the object list */
-    if(!olist.max_nobjs || (olist.max_nobjs && olist.list_index<olist.max_nobjs)) { 
-        if(types & H5F_OBJ_DATATYPE) {
+    if (!olist.max_nobjs || (olist.max_nobjs && olist.list_index < olist.max_nobjs)) {
+        if (types & H5F_OBJ_DATATYPE) {
             olist.obj_type = H5I_DATATYPE;
-            if(H5I_iterate(H5I_DATATYPE, H5F_get_objects_cb, &olist, app_ref) < 0)
+            if (H5I_iterate(H5I_DATATYPE, H5F_get_objects_cb, &olist, app_ref) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_BADITER, FAIL, "iteration failed(4)")
         } /* end if */
-    } 
+    }
 
     /* If the caller just wants to count the number of objects (OLIST.MAX_NOBJS is zero),
      * or the caller wants to get the list of IDs and the list isn't full,
      * search through attribute IDs to count number of attributes, and put their
      * IDs on the object list */
-    if(!olist.max_nobjs || (olist.max_nobjs && olist.list_index<olist.max_nobjs)) {
-        if(types & H5F_OBJ_ATTR) {
+    if (!olist.max_nobjs || (olist.max_nobjs && olist.list_index < olist.max_nobjs)) {
+        if (types & H5F_OBJ_ATTR) {
             olist.obj_type = H5I_ATTR;
-            if(H5I_iterate(H5I_ATTR, H5F_get_objects_cb, &olist, app_ref) < 0)
+            if (H5I_iterate(H5I_ATTR, H5F_get_objects_cb, &olist, app_ref) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_BADITER, FAIL, "iteration failed(5)")
         } /* end if */
     }
- 
+
     /* Set the number of objects currently open */
     *obj_id_count_ptr = obj_id_count;
 
@@ -406,7 +401,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_objects() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_objects_cb
  *
@@ -425,9 +419,9 @@ done:
 static int
 H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
 {
-    H5F_olist_t *olist = (H5F_olist_t *)key;    /* Alias for search info */
-    int         ret_value = H5_ITER_CONT;    /* Return value */
-    hbool_t     add_obj = FALSE;
+    H5F_olist_t *olist     = (H5F_olist_t *)key; /* Alias for search info */
+    int          ret_value = H5_ITER_CONT;       /* Return value */
+    hbool_t      add_obj   = FALSE;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -435,89 +429,91 @@ H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
     HDassert(olist);
 
     /* Count file IDs */
-    if(olist->obj_type == H5I_FILE) {
-        if((olist->file_info.local &&
-                        (!olist->file_info.ptr.file || (olist->file_info.ptr.file && (H5F_t*)obj_ptr == olist->file_info.ptr.file) ))
-                ||  (!olist->file_info.local &&
-                        ( !olist->file_info.ptr.shared || (olist->file_info.ptr.shared && ((H5F_t*)obj_ptr)->shared == olist->file_info.ptr.shared) ))) {
+    if (olist->obj_type == H5I_FILE) {
+        if ((olist->file_info.local &&
+             (!olist->file_info.ptr.file ||
+              (olist->file_info.ptr.file && (H5F_t *)obj_ptr == olist->file_info.ptr.file))) ||
+            (!olist->file_info.local &&
+             (!olist->file_info.ptr.shared ||
+              (olist->file_info.ptr.shared && ((H5F_t *)obj_ptr)->shared == olist->file_info.ptr.shared)))) {
             add_obj = TRUE;
-	}
-    } /* end if */
-    else { /* either count opened object IDs or put the IDs on the list */
-        H5O_loc_t *oloc;        /* Group entry info for object */
-
-    	switch(olist->obj_type) {
-	    case H5I_ATTR:
-	        oloc = H5A_oloc((H5A_t *)obj_ptr);
+        }
+    }                    /* end if */
+    else {               /* either count opened object IDs or put the IDs on the list */
+        H5O_loc_t *oloc; /* Group entry info for object */
+
+        switch (olist->obj_type) {
+            case H5I_ATTR:
+                oloc = H5A_oloc((H5A_t *)obj_ptr);
                 break;
 
-	    case H5I_GROUP:
-	        oloc = H5G_oloc((H5G_t *)obj_ptr);
+            case H5I_GROUP:
+                oloc = H5G_oloc((H5G_t *)obj_ptr);
                 break;
 
-	    case H5I_DATASET:
-	        oloc = H5D_oloc((H5D_t *)obj_ptr);
-		break;
+            case H5I_DATASET:
+                oloc = H5D_oloc((H5D_t *)obj_ptr);
+                break;
 
-	    case H5I_DATATYPE:
-                if(H5T_is_named((H5T_t*)obj_ptr)==TRUE)
-                    oloc = H5T_oloc((H5T_t*)obj_ptr);
+            case H5I_DATATYPE:
+                if (H5T_is_named((H5T_t *)obj_ptr) == TRUE)
+                    oloc = H5T_oloc((H5T_t *)obj_ptr);
                 else
                     oloc = NULL;
-		break;
-
-	    case H5I_UNINIT:
-	    case H5I_BADID:
-	    case H5I_FILE:
-	    case H5I_DATASPACE:
-	    case H5I_REFERENCE:
-	    case H5I_VFL:
-	    case H5I_GENPROP_CLS:
-	    case H5I_GENPROP_LST:
-	    case H5I_ERROR_CLASS:
-	    case H5I_ERROR_MSG:
-	    case H5I_ERROR_STACK:
-	    case H5I_NTYPES:
+                break;
+
+            case H5I_UNINIT:
+            case H5I_BADID:
+            case H5I_FILE:
+            case H5I_DATASPACE:
+            case H5I_REFERENCE:
+            case H5I_VFL:
+            case H5I_GENPROP_CLS:
+            case H5I_GENPROP_LST:
+            case H5I_ERROR_CLASS:
+            case H5I_ERROR_MSG:
+            case H5I_ERROR_STACK:
+            case H5I_NTYPES:
             default:
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5_ITER_ERROR, "unknown data object")
-	} /* end switch */
-
-        if((olist->file_info.local &&
-                    ( (!olist->file_info.ptr.file && olist->obj_type == H5I_DATATYPE && H5T_is_immutable((H5T_t *)obj_ptr) == FALSE)
-                            || (!olist->file_info.ptr.file && olist->obj_type != H5I_DATATYPE)
-                            || (oloc && oloc->file == olist->file_info.ptr.file)))
-                || (!olist->file_info.local &&
-                    ((!olist->file_info.ptr.shared && olist->obj_type == H5I_DATATYPE && H5T_is_immutable((H5T_t *)obj_ptr) == FALSE)
-                            || (!olist->file_info.ptr.shared && olist->obj_type != H5I_DATATYPE)
-                            || (oloc && oloc->file && oloc->file->shared == olist->file_info.ptr.shared)))) {
+        } /* end switch */
+
+        if ((olist->file_info.local && ((!olist->file_info.ptr.file && olist->obj_type == H5I_DATATYPE &&
+                                         H5T_is_immutable((H5T_t *)obj_ptr) == FALSE) ||
+                                        (!olist->file_info.ptr.file && olist->obj_type != H5I_DATATYPE) ||
+                                        (oloc && oloc->file == olist->file_info.ptr.file))) ||
+            (!olist->file_info.local &&
+             ((!olist->file_info.ptr.shared && olist->obj_type == H5I_DATATYPE &&
+               H5T_is_immutable((H5T_t *)obj_ptr) == FALSE) ||
+              (!olist->file_info.ptr.shared && olist->obj_type != H5I_DATATYPE) ||
+              (oloc && oloc->file && oloc->file->shared == olist->file_info.ptr.shared)))) {
             add_obj = TRUE;
-    	} /* end if */
-    } /* end else */
+        } /* end if */
+    }     /* end else */
 
-    if(TRUE==add_obj) {
+    if (TRUE == add_obj) {
         /* Add the object's ID to the ID list, if appropriate */
-        if(olist->obj_id_list) {
+        if (olist->obj_id_list) {
             olist->obj_id_list[olist->list_index] = obj_id;
-	    olist->list_index++;
-	} /* end if */
+            olist->list_index++;
+        } /* end if */
 
         /* Increment the number of open objects */
-	if(olist->obj_id_count)
+        if (olist->obj_id_count)
             (*olist->obj_id_count)++;
 
         /* Check if we've filled up the array.  Return H5_ITER_STOP only if
          * we have filled up the array. Otherwise return H5_ITER_CONT(RET_VALUE is
-         * preset to H5_ITER_CONT) because H5I_iterate needs the return value of 
+         * preset to H5_ITER_CONT) because H5I_iterate needs the return value of
          * H5_ITER_CONT to continue the iteration. */
-        if(olist->max_nobjs>0 && olist->list_index>=olist->max_nobjs)
-            HGOTO_DONE(H5_ITER_STOP)  /* Indicate that the iterator should stop */
+        if (olist->max_nobjs > 0 && olist->list_index >= olist->max_nobjs)
+            HGOTO_DONE(H5_ITER_STOP) /* Indicate that the iterator should stop */
     }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_objects_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_is_hdf5
  *
@@ -541,31 +537,30 @@ done:
 htri_t
 H5F_is_hdf5(const char *name)
 {
-    H5FD_t	*file = NULL;           /* Low-level file struct */
-    haddr_t     sig_addr;               /* Addess of hdf5 file signature */
-    htri_t	ret_value;              /* Return value */
+    H5FD_t *file = NULL; /* Low-level file struct */
+    haddr_t sig_addr;    /* Addess of hdf5 file signature */
+    htri_t  ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Open the file at the virtual file layer */
-    if(NULL == (file = H5FD_open(name, H5F_ACC_RDONLY, H5P_FILE_ACCESS_DEFAULT, HADDR_UNDEF)))
-	HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to open file")
+    if (NULL == (file = H5FD_open(name, H5F_ACC_RDONLY, H5P_FILE_ACCESS_DEFAULT, HADDR_UNDEF)))
+        HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to open file")
 
     /* The file is an hdf5 file if the hdf5 file signature can be found */
-    if(H5FD_locate_signature(file, H5AC_ind_dxpl_g, &sig_addr) < 0)
+    if (H5FD_locate_signature(file, H5AC_ind_dxpl_g, &sig_addr) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_NOTHDF5, FAIL, "unable to locate file signature")
     ret_value = (HADDR_UNDEF != sig_addr);
 
 done:
     /* Close the file */
-    if(file)
-        if(H5FD_close(file) < 0 && ret_value >= 0)
+    if (file)
+        if (H5FD_close(file) < 0 && ret_value >= 0)
             HDONE_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_is_hdf5() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_new
  *
@@ -591,95 +586,95 @@ done:
 H5F_t *
 H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
 {
-    H5F_t	*f = NULL, *ret_value;
+    H5F_t *f = NULL, *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(NULL == (f = H5FL_CALLOC(H5F_t)))
-	HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate top file structure")
+    if (NULL == (f = H5FL_CALLOC(H5F_t)))
+        HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate top file structure")
     f->file_id = -1;
 
-    if(shared) {
+    if (shared) {
         HDassert(lf == NULL);
-	f->shared = shared;
+        f->shared = shared;
     } /* end if */
     else {
-        H5P_genplist_t *plist;          /* Property list */
-        unsigned        efc_size;       /* External file cache size */
-        size_t u;                       /* Local index variable */
+        H5P_genplist_t *plist;    /* Property list */
+        unsigned        efc_size; /* External file cache size */
+        size_t          u;        /* Local index variable */
 
         HDassert(lf != NULL);
-        if(NULL == (f->shared = H5FL_CALLOC(H5F_file_t)))
+        if (NULL == (f->shared = H5FL_CALLOC(H5F_file_t)))
             HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate shared file structure")
 
-        f->shared->flags = flags;
-	f->shared->sohm_addr = HADDR_UNDEF;
-	f->shared->sohm_vers = HDF5_SHAREDHEADER_VERSION;
-        for(u = 0; u < NELMTS(f->shared->fs_addr); u++)
+        f->shared->flags     = flags;
+        f->shared->sohm_addr = HADDR_UNDEF;
+        f->shared->sohm_vers = HDF5_SHAREDHEADER_VERSION;
+        for (u = 0; u < NELMTS(f->shared->fs_addr); u++)
             f->shared->fs_addr[u] = HADDR_UNDEF;
-	f->shared->accum.loc = HADDR_UNDEF;
-        f->shared->lf = lf;
-
-	/*
-	 * Copy the file creation and file access property lists into the
-	 * new file handle.  We do this early because some values might need
-	 * to change as the file is being opened.
-	 */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(fcpl_id)))
+        f->shared->accum.loc = HADDR_UNDEF;
+        f->shared->lf        = lf;
+
+        /*
+         * Copy the file creation and file access property lists into the
+         * new file handle.  We do this early because some values might need
+         * to change as the file is being opened.
+         */
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(fcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not property list")
         f->shared->fcpl_id = H5P_copy_plist(plist, FALSE);
 
         /* Get the FCPL values to cache */
-        if(H5P_get(plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &f->shared->sizeof_addr) < 0)
+        if (H5P_get(plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &f->shared->sizeof_addr) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get byte number for address")
-        if(H5P_get(plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &f->shared->sizeof_size) < 0)
+        if (H5P_get(plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &f->shared->sizeof_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get byte number for object size")
-        if(H5P_get(plist, H5F_CRT_SHMSG_NINDEXES_NAME, &f->shared->sohm_nindexes) < 0)
+        if (H5P_get(plist, H5F_CRT_SHMSG_NINDEXES_NAME, &f->shared->sohm_nindexes) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get number of SOHM indexes")
         HDassert(f->shared->sohm_nindexes < 255);
 
         /* Get the FAPL values to cache */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not file access property list")
-        if(H5P_get(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, &(f->shared->mdc_initCacheCfg)) < 0)
+        if (H5P_get(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, &(f->shared->mdc_initCacheCfg)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get initial metadata cache resize config")
-        if(H5P_get(plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, &(f->shared->rdcc_nslots)) < 0)
+        if (H5P_get(plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, &(f->shared->rdcc_nslots)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get data cache number of slots")
-        if(H5P_get(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &(f->shared->rdcc_nbytes)) < 0)
+        if (H5P_get(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &(f->shared->rdcc_nbytes)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get data cache byte size")
-        if(H5P_get(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, &(f->shared->rdcc_w0)) < 0)
+        if (H5P_get(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, &(f->shared->rdcc_w0)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get preempt read chunk")
-        if(H5P_get(plist, H5F_ACS_ALIGN_THRHD_NAME, &(f->shared->threshold)) < 0)
+        if (H5P_get(plist, H5F_ACS_ALIGN_THRHD_NAME, &(f->shared->threshold)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get alignment threshold")
-        if(H5P_get(plist, H5F_ACS_ALIGN_NAME, &(f->shared->alignment)) < 0)
+        if (H5P_get(plist, H5F_ACS_ALIGN_NAME, &(f->shared->alignment)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get alignment")
-        if(H5P_get(plist, H5F_ACS_GARBG_COLCT_REF_NAME,&(f->shared->gc_ref)) < 0)
+        if (H5P_get(plist, H5F_ACS_GARBG_COLCT_REF_NAME, &(f->shared->gc_ref)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get garbage collect reference")
-        if(H5P_get(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &(f->shared->sieve_buf_size)) < 0)
+        if (H5P_get(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &(f->shared->sieve_buf_size)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get sieve buffer size")
-        if(H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &(f->shared->latest_format)) < 0)
+        if (H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &(f->shared->latest_format)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get 'latest format' flag")
-        if(H5P_get(plist, H5F_ACS_META_BLOCK_SIZE_NAME, &(f->shared->meta_aggr.alloc_size)) < 0)
+        if (H5P_get(plist, H5F_ACS_META_BLOCK_SIZE_NAME, &(f->shared->meta_aggr.alloc_size)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get metadata cache size")
         f->shared->meta_aggr.feature_flag = H5FD_FEAT_AGGREGATE_METADATA;
-        if(H5P_get(plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &(f->shared->sdata_aggr.alloc_size)) < 0)
+        if (H5P_get(plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &(f->shared->sdata_aggr.alloc_size)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get 'small data' cache size")
         f->shared->sdata_aggr.feature_flag = H5FD_FEAT_AGGREGATE_SMALLDATA;
-        if(H5P_get(plist, H5F_ACS_EFC_SIZE_NAME, &efc_size) < 0)
+        if (H5P_get(plist, H5F_ACS_EFC_SIZE_NAME, &efc_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get elink file cache size")
-        if(efc_size > 0)
-            if(NULL == (f->shared->efc = H5F_efc_create(efc_size)))
+        if (efc_size > 0)
+            if (NULL == (f->shared->efc = H5F_efc_create(efc_size)))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "can't create external file cache")
 
         /* Get the VFD values to cache */
         f->shared->maxaddr = H5FD_get_maxaddr(lf);
-        if(!H5F_addr_defined(f->shared->maxaddr))
+        if (!H5F_addr_defined(f->shared->maxaddr))
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad maximum address from VFD")
-        if(H5FD_get_feature_flags(lf, &f->shared->feature_flags) < 0)
+        if (H5FD_get_feature_flags(lf, &f->shared->feature_flags) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get feature flags from VFD")
-        if(H5FD_get_fs_type_map(lf, f->shared->fs_type_map) < 0)
+        if (H5FD_get_fs_type_map(lf, f->shared->fs_type_map) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get free space type mapping from VFD")
-        if(H5MF_init_merge_flags(f) < 0)
+        if (H5MF_init_merge_flags(f) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "problem initializing free space merge flags")
         f->shared->tmp_addr = f->shared->maxaddr;
         /* Disable temp. space allocation for parallel I/O (for now) */
@@ -693,52 +688,51 @@ H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id, hid_t fapl_id, H5FD_t
          */
         f->shared->use_tmp_space = !H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI);
 
-	/*
-	 * Create a metadata cache with the specified number of elements.
-	 * The cache might be created with a different number of elements and
-	 * the access property list should be updated to reflect that.
-	 */
-	if(H5AC_create(f, &(f->shared->mdc_initCacheCfg)) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create metadata cache")
+        /*
+         * Create a metadata cache with the specified number of elements.
+         * The cache might be created with a different number of elements and
+         * the access property list should be updated to reflect that.
+         */
+        if (H5AC_create(f, &(f->shared->mdc_initCacheCfg)) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create metadata cache")
 
         /* Create the file's "open object" information */
-        if(H5FO_create(f) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create open object data structure")
+        if (H5FO_create(f) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create open object data structure")
 
         /* Add new "shared" struct to list of open files */
-        if(H5F_sfile_add(f->shared) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to append to list of open files")
+        if (H5F_sfile_add(f->shared) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to append to list of open files")
     } /* end else */
 
     f->shared->nrefs++;
 
     /* Create the file's "top open object" information */
-    if(H5FO_top_create(f) < 0)
+    if (H5FO_top_create(f) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create open object data structure")
 
     /* Set return value */
     ret_value = f;
 
 done:
-    if(!ret_value && f) {
-	if(!shared) {
+    if (!ret_value && f) {
+        if (!shared) {
             /* Attempt to clean up some of the shared file structures */
-            if(f->shared->efc)
-                if(H5F_efc_destroy(f->shared->efc) < 0)
+            if (f->shared->efc)
+                if (H5F_efc_destroy(f->shared->efc) < 0)
                     HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, NULL, "can't destroy external file cache")
-            if(f->shared->fcpl_id > 0)
-                if(H5I_dec_ref(f->shared->fcpl_id) < 0)
+            if (f->shared->fcpl_id > 0)
+                if (H5I_dec_ref(f->shared->fcpl_id) < 0)
                     HDONE_ERROR(H5E_FILE, H5E_CANTDEC, NULL, "can't close property list")
 
             f->shared = H5FL_FREE(H5F_file_t, f->shared);
         } /* end if */
-	f = H5FL_FREE(H5F_t, f);
+        f = H5FL_FREE(H5F_t, f);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_dest
  *
@@ -758,7 +752,7 @@ done:
 herr_t
 H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
 {
-    herr_t	   ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -766,26 +760,26 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
     HDassert(f);
     HDassert(f->shared);
 
-    if(1 == f->shared->nrefs) {
-        H5F_io_info_t fio_info;             /* I/O info for operation */
+    if (1 == f->shared->nrefs) {
+        H5F_io_info_t fio_info; /* I/O info for operation */
 
         /* Flush at this point since the file will be closed.
          * Only try to flush the file if it was opened with write access, and if
          * the caller requested a flush.
          */
-        if((f->shared->flags & H5F_ACC_RDWR) && flush)
-            if(H5F_flush(f, dxpl_id, TRUE) < 0)
+        if ((f->shared->flags & H5F_ACC_RDWR) && flush)
+            if (H5F_flush(f, dxpl_id, TRUE) < 0)
                 HDONE_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache")
 
         /* Release the external file cache */
-        if(f->shared->efc) {
-            if(H5F_efc_destroy(f->shared->efc) < 0)
+        if (f->shared->efc) {
+            if (H5F_efc_destroy(f->shared->efc) < 0)
                 HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't destroy external file cache")
             f->shared->efc = NULL;
         } /* end if */
 
         /* Release objects that depend on the superblock being initialized */
-        if(f->shared->sblock) {
+        if (f->shared->sblock) {
             /* Shutdown file free space manager(s) */
             /* (We should release the free space information now (before truncating
              *      the file and before the metadata cache is shut down) since the
@@ -793,34 +787,34 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
              *      and also because releasing free space can shrink the file's
              *      'eoa' value)
              */
-            if(H5F_ACC_RDWR & H5F_INTENT(f)) {
-                if(H5MF_close(f, dxpl_id) < 0)
+            if (H5F_ACC_RDWR & H5F_INTENT(f)) {
+                if (H5MF_close(f, dxpl_id) < 0)
                     /* Push error, but keep going*/
                     HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't release file free space info")
 
                 /* Flush the file again (if requested), as shutting down the
                  * free space manager may dirty some data structures again.
                  */
-                if(flush)
-                    if(H5F_flush(f, dxpl_id, TRUE) < 0)
+                if (flush)
+                    if (H5F_flush(f, dxpl_id, TRUE) < 0)
                         /* Push error, but keep going*/
                         HDONE_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache")
             } /* end if */
 
             /* Unpin the superblock, since we're about to destroy the cache */
-            if(H5AC_unpin_entry(f->shared->sblock) < 0)
+            if (H5AC_unpin_entry(f->shared->sblock) < 0)
                 /* Push error, but keep going*/
                 HDONE_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin superblock")
             f->shared->sblock = NULL;
         } /* end if */
- 
+
         /* Remove shared file struct from list of open files */
-        if(H5F_sfile_remove(f->shared) < 0)
+        if (H5F_sfile_remove(f->shared) < 0)
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
 
         /* Shutdown the metadata cache */
-        if(H5AC_dest(f, dxpl_id))
+        if (H5AC_dest(f, dxpl_id))
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
 
@@ -828,9 +822,9 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
          * Do not close the root group since we didn't count it, but free
          * the memory associated with it.
          */
-        if(f->shared->root_grp) {
+        if (f->shared->root_grp) {
             /* Free the root group */
-            if(H5G_root_free(f->shared->root_grp) < 0)
+            if (H5G_root_free(f->shared->root_grp) < 0)
                 /* Push error, but keep going*/
                 HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
             f->shared->root_grp = NULL;
@@ -838,42 +832,42 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
 
         /* Set up I/O info for operation */
         fio_info.f = f;
-        if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+        if (NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
             HDONE_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
         /* Destroy other components of the file */
-        if(H5F__accum_reset(&fio_info, TRUE) < 0)
+        if (H5F__accum_reset(&fio_info, TRUE) < 0)
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
-        if(H5FO_dest(f) < 0)
+        if (H5FO_dest(f) < 0)
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
         f->shared->cwfs = (struct H5HG_heap_t **)H5MM_xfree(f->shared->cwfs);
-        if(H5G_node_close(f) < 0)
+        if (H5G_node_close(f) < 0)
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
 
         /* Destroy file creation properties */
-        if(H5I_GENPROP_LST != H5I_get_type(f->shared->fcpl_id))
+        if (H5I_GENPROP_LST != H5I_get_type(f->shared->fcpl_id))
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_BADTYPE, FAIL, "not a property list")
-        if(H5I_dec_ref(f->shared->fcpl_id) < 0)
+        if (H5I_dec_ref(f->shared->fcpl_id) < 0)
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTDEC, FAIL, "can't close property list")
 
         /* Close the file */
-        if(H5FD_close(f->shared->lf) < 0)
+        if (H5FD_close(f->shared->lf) < 0)
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
 
         /* Free mount table */
-        f->shared->mtab.child = (H5F_mount_t *)H5MM_xfree(f->shared->mtab.child);
+        f->shared->mtab.child  = (H5F_mount_t *)H5MM_xfree(f->shared->mtab.child);
         f->shared->mtab.nalloc = 0;
 
         /* Destroy shared file struct */
         f->shared = (H5F_file_t *)H5FL_FREE(H5F_file_t, f->shared);
-
-    } else if(f->shared->nrefs > 0) {
+    }
+    else if (f->shared->nrefs > 0) {
         /*
          * There are other references to the shared part of the file.
          * Only decrement the reference count.
@@ -882,18 +876,17 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
     }
 
     /* Free the non-shared part of the file */
-    f->open_name = (char *)H5MM_xfree(f->open_name);
+    f->open_name   = (char *)H5MM_xfree(f->open_name);
     f->actual_name = (char *)H5MM_xfree(f->actual_name);
-    f->extpath = (char *)H5MM_xfree(f->extpath);
-    if(H5FO_top_dest(f) < 0)
+    f->extpath     = (char *)H5MM_xfree(f->extpath);
+    if (H5FO_top_dest(f) < 0)
         HDONE_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "problems closing file")
     f->shared = NULL;
-    f = H5FL_FREE(H5F_t, f);
+    f         = H5FL_FREE(H5F_t, f);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_open
  *
@@ -941,17 +934,16 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
  *-------------------------------------------------------------------------
  */
 H5F_t *
-H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
-    hid_t dxpl_id)
+H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id)
 {
-    H5F_t              *file = NULL;        /*the success return value      */
-    H5F_file_t         *shared = NULL;      /*shared part of `file'         */
-    H5FD_t             *lf = NULL;          /*file driver part of `shared'  */
-    unsigned            tent_flags;         /*tentative flags               */
-    H5FD_class_t       *drvr;               /*file driver class info        */
-    H5P_genplist_t     *a_plist;            /*file access property list     */
-    H5F_close_degree_t  fc_degree;          /*file close degree             */
-    H5F_t              *ret_value;          /*actual return value           */
+    H5F_t *            file   = NULL; /*the success return value      */
+    H5F_file_t *       shared = NULL; /*shared part of `file'         */
+    H5FD_t *           lf     = NULL; /*file driver part of `shared'  */
+    unsigned           tent_flags;    /*tentative flags               */
+    H5FD_class_t *     drvr;          /*file driver class info        */
+    H5P_genplist_t *   a_plist;       /*file access property list     */
+    H5F_close_degree_t fc_degree;     /*file close degree             */
+    H5F_t *            ret_value;     /*actual return value           */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -963,7 +955,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
      * Otherwise it is the application's responsibility to never open the
      * same file more than once at a time.
      */
-    if(NULL == (drvr = H5FD_get_class(fapl_id)))
+    if (NULL == (drvr = H5FD_get_class(fapl_id)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "unable to retrieve VFL class")
 
     /*
@@ -977,77 +969,83 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
      * application's responsibility to prevent this situation (there's no
      * way for us to detect it here anyway).
      */
-    if(drvr->cmp)
-	tent_flags = flags & ~(H5F_ACC_CREAT|H5F_ACC_TRUNC|H5F_ACC_EXCL);
+    if (drvr->cmp)
+        tent_flags = flags & ~(H5F_ACC_CREAT | H5F_ACC_TRUNC | H5F_ACC_EXCL);
     else
-	tent_flags = flags;
+        tent_flags = flags;
 
-    if(NULL == (lf = H5FD_open(name, tent_flags, fapl_id, HADDR_UNDEF))) {
-	if(tent_flags == flags) {
+    if (NULL == (lf = H5FD_open(name, tent_flags, fapl_id, HADDR_UNDEF))) {
+        if (tent_flags == flags) {
 #ifndef H5_USING_MEMCHECKER
             time_t mytime = HDtime(NULL);
 
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: time = %s, name = '%s', tent_flags = %x", HDctime(&mytime), name, tent_flags)
-#else /* H5_USING_MEMCHECKER */
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: name = '%s', tent_flags = %x", name, tent_flags)
-#endif /* H5_USING_MEMCHECKER */
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL,
+                        "unable to open file: time = %s, name = '%s', tent_flags = %x", HDctime(&mytime),
+                        name, tent_flags)
+#else     /* H5_USING_MEMCHECKER */
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: name = '%s', tent_flags = %x",
+                        name, tent_flags)
+#endif    /* H5_USING_MEMCHECKER */
         } /* end if */
         H5E_clear_stack(NULL);
-	tent_flags = flags;
-	if(NULL == (lf = H5FD_open(name, tent_flags, fapl_id, HADDR_UNDEF))) {
+        tent_flags = flags;
+        if (NULL == (lf = H5FD_open(name, tent_flags, fapl_id, HADDR_UNDEF))) {
 #ifndef H5_USING_MEMCHECKER
             time_t mytime = HDtime(NULL);
 
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: time = %s, name = '%s', tent_flags = %x", HDctime(&mytime), name, tent_flags)
-#else /* H5_USING_MEMCHECKER */
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: name = '%s', tent_flags = %x", name, tent_flags)
-#endif /* H5_USING_MEMCHECKER */
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL,
+                        "unable to open file: time = %s, name = '%s', tent_flags = %x", HDctime(&mytime),
+                        name, tent_flags)
+#else     /* H5_USING_MEMCHECKER */
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: name = '%s', tent_flags = %x",
+                        name, tent_flags)
+#endif    /* H5_USING_MEMCHECKER */
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Is the file already open? */
-    if((shared = H5F_sfile_search(lf)) != NULL) {
-	/*
-	 * The file is already open, so use that one instead of the one we
-	 * just opened. We only one one H5FD_t* per file so one doesn't
-	 * confuse the other.  But fail if this request was to truncate the
-	 * file (since we can't do that while the file is open), or if the
-	 * request was to create a non-existent file (since the file already
-	 * exists), or if the new request adds write access (since the
-	 * readers don't expect the file to change under them).
-	 */
-	if(H5FD_close(lf) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to close low-level file info")
-	if(flags & H5F_ACC_TRUNC)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to truncate a file which is already open")
-	if(flags & H5F_ACC_EXCL)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "file exists")
-	if((flags & H5F_ACC_RDWR) && 0 == (shared->flags & H5F_ACC_RDWR))
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "file is already open for read-only")
+    if ((shared = H5F_sfile_search(lf)) != NULL) {
+        /*
+         * The file is already open, so use that one instead of the one we
+         * just opened. We only one one H5FD_t* per file so one doesn't
+         * confuse the other.  But fail if this request was to truncate the
+         * file (since we can't do that while the file is open), or if the
+         * request was to create a non-existent file (since the file already
+         * exists), or if the new request adds write access (since the
+         * readers don't expect the file to change under them).
+         */
+        if (H5FD_close(lf) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to close low-level file info")
+        if (flags & H5F_ACC_TRUNC)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to truncate a file which is already open")
+        if (flags & H5F_ACC_EXCL)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "file exists")
+        if ((flags & H5F_ACC_RDWR) && 0 == (shared->flags & H5F_ACC_RDWR))
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "file is already open for read-only")
 
         /* Allocate new "high-level" file struct */
-        if((file = H5F_new(shared, flags, fcpl_id, fapl_id, NULL)) == NULL)
+        if ((file = H5F_new(shared, flags, fcpl_id, fapl_id, NULL)) == NULL)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to create new file object")
     } /* end if */
     else {
         /* Check if tentative open was good enough */
-        if(flags != tent_flags) {
+        if (flags != tent_flags) {
             /*
              * This file is not yet open by the library and the flags we used to
              * open it are different than the desired flags. Close the tentative
              * file and open it for real.
              */
-            if(H5FD_close(lf) < 0) {
+            if (H5FD_close(lf) < 0) {
                 file = NULL; /*to prevent destruction of wrong file*/
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to close low-level file info")
             } /* end if */
-            if(NULL == (lf = H5FD_open(name, flags, fapl_id, HADDR_UNDEF))) {
+            if (NULL == (lf = H5FD_open(name, flags, fapl_id, HADDR_UNDEF))) {
                 file = NULL; /*to prevent destruction of wrong file*/
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file")
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
-        if(NULL == (file = H5F_new(NULL, flags, fcpl_id, fapl_id, lf)))
+        if (NULL == (file = H5F_new(NULL, flags, fcpl_id, fapl_id, lf)))
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to create new file object")
     } /* end else */
 
@@ -1056,13 +1054,13 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
 
     /* Short cuts */
     shared = file->shared;
-    lf = shared->lf;
+    lf     = shared->lf;
 
     /*
      * Read or write the file superblock, depending on whether the file is
      * empty or not.
      */
-    if(0 == H5FD_get_eof(lf) && (flags & H5F_ACC_RDWR)) {
+    if (0 == H5FD_get_eof(lf) && (flags & H5F_ACC_RDWR)) {
         /*
          * We've just opened a fresh new file (or truncated one). We need
          * to create & write the superblock.
@@ -1070,27 +1068,28 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
 
         /* Initialize information about the superblock and allocate space for it */
         /* (Writes superblock extension messages, if there are any) */
-        if(H5F_super_init(file, dxpl_id) < 0)
+        if (H5F_super_init(file, dxpl_id) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to allocate file superblock")
 
         /* Create and open the root group */
         /* (This must be after the space for the superblock is allocated in
          *      the file, since the superblock must be at offset 0)
          */
-        if(H5G_mkroot(file, dxpl_id, TRUE) < 0)
+        if (H5G_mkroot(file, dxpl_id, TRUE) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create/open root group")
-    } else if (1 == shared->nrefs) {
-	/* Read the superblock if it hasn't been read before. */
-        if(H5F_super_read(file, dxpl_id) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "unable to read superblock")
-
-	/* Open the root group */
-	if(H5G_mkroot(file, dxpl_id, FALSE) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to read root group")
+    }
+    else if (1 == shared->nrefs) {
+        /* Read the superblock if it hasn't been read before. */
+        if (H5F_super_read(file, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "unable to read superblock")
+
+        /* Open the root group */
+        if (H5G_mkroot(file, dxpl_id, FALSE) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to read root group")
     } /* end if */
 
     /* Get the file access property list, for future queries */
-    if(NULL == (a_plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+    if (NULL == (a_plist = (H5P_genplist_t *)H5I_object(fapl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not file access property list")
 
     /*
@@ -1099,41 +1098,41 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
      * second time or later, verify the access property list value matches
      * the degree in shared file structure.
      */
-    if(H5P_get(a_plist, H5F_ACS_CLOSE_DEGREE_NAME, &fc_degree) < 0)
+    if (H5P_get(a_plist, H5F_ACS_CLOSE_DEGREE_NAME, &fc_degree) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get file close degree")
 
-    if(shared->nrefs == 1) {
-        if(fc_degree == H5F_CLOSE_DEFAULT)
+    if (shared->nrefs == 1) {
+        if (fc_degree == H5F_CLOSE_DEFAULT)
             shared->fc_degree = lf->cls->fc_degree;
         else
             shared->fc_degree = fc_degree;
-    } else if(shared->nrefs > 1) {
-        if(fc_degree == H5F_CLOSE_DEFAULT && shared->fc_degree != lf->cls->fc_degree)
+    }
+    else if (shared->nrefs > 1) {
+        if (fc_degree == H5F_CLOSE_DEFAULT && shared->fc_degree != lf->cls->fc_degree)
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "file close degree doesn't match")
-        if(fc_degree != H5F_CLOSE_DEFAULT && fc_degree != shared->fc_degree)
+        if (fc_degree != H5F_CLOSE_DEFAULT && fc_degree != shared->fc_degree)
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "file close degree doesn't match")
     } /* end if */
 
     /* Formulate the absolute path for later search of target file for external links */
-    if(H5_build_extpath(name, &file->extpath) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to build extpath")
+    if (H5_build_extpath(name, &file->extpath) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to build extpath")
 
     /* Formulate the actual file name, after following symlinks, etc. */
-    if(H5F_build_actual_name(file, a_plist, name, &file->actual_name) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to build actual name")
+    if (H5F_build_actual_name(file, a_plist, name, &file->actual_name) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to build actual name")
 
     /* Success */
     ret_value = file;
 
 done:
-    if(!ret_value && file)
-        if(H5F_dest(file, dxpl_id, FALSE) < 0)
+    if (!ret_value && file)
+        if (H5F_dest(file, dxpl_id, FALSE) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, NULL, "problems closing file")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_flush
  *
@@ -1150,8 +1149,8 @@ done:
 herr_t
 H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing)
 {
-    H5F_io_info_t fio_info;             /* I/O info for operation */
-    herr_t   ret_value = SUCCEED;       /* Return value */
+    H5F_io_info_t fio_info;            /* I/O info for operation */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1159,7 +1158,7 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing)
     HDassert(f);
 
     /* Flush any cached dataset storage raw data */
-    if(H5D_flush(f, dxpl_id) < 0)
+    if (H5D_flush(f, dxpl_id) < 0)
         /* Push error, but keep going*/
         HDONE_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush dataset cache")
 
@@ -1169,36 +1168,36 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing)
     /* (needs to happen before cache flush, with superblock write, since the
      *  'eoa' value is written in superblock -QAK)
      */
-    if(H5MF_free_aggrs(f, dxpl_id) < 0)
+    if (H5MF_free_aggrs(f, dxpl_id) < 0)
         /* Push error, but keep going*/
         HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't release file space")
 
     /* Flush the entire metadata cache */
-    if(H5AC_flush(f, dxpl_id) < 0)
+    if (H5AC_flush(f, dxpl_id) < 0)
         /* Push error, but keep going*/
         HDONE_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush metadata cache")
 
     /* Truncate the file to the current allocated size */
-    if(H5FD_truncate(f->shared->lf, dxpl_id, closing) < 0)
+    if (H5FD_truncate(f->shared->lf, dxpl_id, closing) < 0)
         HDONE_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "low level truncate failed")
 
     /* Flush the entire metadata cache again since the EOA could have changed in the truncate call. */
-    if(H5AC_flush(f, dxpl_id) < 0)
+    if (H5AC_flush(f, dxpl_id) < 0)
         /* Push error, but keep going*/
         HDONE_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush metadata cache")
 
     /* Set up I/O info for operation */
     fio_info.f = f;
-    if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HDONE_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Flush out the metadata accumulator */
-    if(H5F__accum_flush(&fio_info) < 0)
+    if (H5F__accum_flush(&fio_info) < 0)
         /* Push error, but keep going*/
         HDONE_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "unable to flush metadata accumulator")
 
     /* Flush file buffers to disk. */
-    if(H5FD_flush(f->shared->lf, dxpl_id, closing) < 0)
+    if (H5FD_flush(f->shared->lf, dxpl_id, closing) < 0)
         /* Push error, but keep going*/
         HDONE_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "low level flush failed")
 
@@ -1206,7 +1205,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_close
  *
@@ -1234,29 +1232,30 @@ done:
 herr_t
 H5F_close(H5F_t *f)
 {
-    herr_t	        ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert(f);
-    HDassert(f->file_id > 0);   /* This routine should only be called when a file ID's ref count drops to zero */
+    HDassert(f->file_id >
+             0); /* This routine should only be called when a file ID's ref count drops to zero */
 
     /* Perform checks for "semi" file close degree here, since closing the
      * file is not allowed if there are objects still open */
-    if(f->shared->fc_degree == H5F_CLOSE_SEMI) {
-        unsigned nopen_files = 0;       /* Number of open files in file/mount hierarchy */
-        unsigned nopen_objs = 0;        /* Number of open objects in file/mount hierarchy */
+    if (f->shared->fc_degree == H5F_CLOSE_SEMI) {
+        unsigned nopen_files = 0; /* Number of open files in file/mount hierarchy */
+        unsigned nopen_objs  = 0; /* Number of open objects in file/mount hierarchy */
 
         /* Get the number of open objects and open files on this file/mount hierarchy */
-        if(H5F_mount_count_ids(f, &nopen_files, &nopen_objs) < 0)
+        if (H5F_mount_count_ids(f, &nopen_files, &nopen_objs) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_MOUNT, FAIL, "problem checking mount hierarchy")
 
         /* If there are no other file IDs open on this file/mount hier., but
          * there are still open objects, issue an error and bail out now,
          * without decrementing the file ID's reference count and triggering
          * a "real" attempt at closing the file */
-        if(nopen_files == 1 && nopen_objs > 0)
+        if (nopen_files == 1 && nopen_objs > 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close file, there are objects still open")
     } /* end if */
 
@@ -1264,14 +1263,13 @@ H5F_close(H5F_t *f)
     f->file_id = -1;
 
     /* Attempt to close the file/mount hierarchy */
-    if(H5F_try_close(f) < 0)
+    if (H5F_try_close(f) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close file")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_try_close
  *
@@ -1290,9 +1288,9 @@ done:
 herr_t
 H5F_try_close(H5F_t *f)
 {
-    unsigned            nopen_files = 0;        /* Number of open files in file/mount hierarchy */
-    unsigned            nopen_objs = 0;         /* Number of open objects in file/mount hierarchy */
-    herr_t	        ret_value = SUCCEED;    /* Return value */
+    unsigned nopen_files = 0;       /* Number of open files in file/mount hierarchy */
+    unsigned nopen_objs  = 0;       /* Number of open objects in file/mount hierarchy */
+    herr_t   ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1301,11 +1299,11 @@ H5F_try_close(H5F_t *f)
     HDassert(f->shared);
 
     /* Check if this file is already in the process of closing */
-    if(f->closing)
+    if (f->closing)
         HGOTO_DONE(SUCCEED)
 
     /* Get the number of open objects and open files on this file/mount hierarchy */
-    if(H5F_mount_count_ids(f, &nopen_files, &nopen_objs) < 0)
+    if (H5F_mount_count_ids(f, &nopen_files, &nopen_objs) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_MOUNT, FAIL, "problem checking mount hierarchy")
 
     /*
@@ -1318,7 +1316,7 @@ H5F_try_close(H5F_t *f)
      *  H5F_CLOSE_STRONG:	if there are still objects open, close them
      *			first, then close file.
      */
-    switch(f->shared->fc_degree) {
+    switch (f->shared->fc_degree) {
         case H5F_CLOSE_WEAK:
             /*
              * If file or object IDS are still open then delay deletion of
@@ -1326,28 +1324,30 @@ H5F_try_close(H5F_t *f)
              * caches and update the object header anyway so that failing to
              * close all objects isn't a major problem.
              */
-            if((nopen_files + nopen_objs) > 0)
+            if ((nopen_files + nopen_objs) > 0)
                 HGOTO_DONE(SUCCEED)
             break;
 
         case H5F_CLOSE_SEMI:
             /* Can leave safely if file IDs are still open on this file */
-            if(nopen_files > 0)
+            if (nopen_files > 0)
                 HGOTO_DONE(SUCCEED)
 
             /* Sanity check: If close degree if "semi" and we have gotten this
              * far and there are objects left open, bail out now */
             HDassert(nopen_files == 0 && nopen_objs == 0);
 
-            /* If we've gotten this far (ie. there are no open objects in the file), fall through to flush & close */
+            /* If we've gotten this far (ie. there are no open objects in the file), fall through to flush &
+             * close */
             break;
 
         case H5F_CLOSE_STRONG:
             /* If there are other open files in the hierarchy, we can leave now */
-            if(nopen_files > 0)
+            if (nopen_files > 0)
                 HGOTO_DONE(SUCCEED)
 
-            /* If we've gotten this far (ie. there are no open file IDs in the file/mount hierarchy), fall through to flush & close */
+            /* If we've gotten this far (ie. there are no open file IDs in the file/mount hierarchy), fall
+             * through to flush & close */
             break;
 
         case H5F_CLOSE_DEFAULT:
@@ -1359,26 +1359,28 @@ H5F_try_close(H5F_t *f)
     f->closing = TRUE;
 
     /* If the file close degree is "strong", close all the open objects in this file */
-    if(f->shared->fc_degree == H5F_CLOSE_STRONG) {
-        HDassert(nopen_files ==  0);
+    if (f->shared->fc_degree == H5F_CLOSE_STRONG) {
+        HDassert(nopen_files == 0);
 
         /* Forced close of all opened objects in this file */
-        if(f->nopen_objs > 0) {
-            size_t obj_count;       /* # of open objects */
-            hid_t objs[128];        /* Array of objects to close */
-            herr_t result;          /* Local result from obj ID query */
-            size_t u;               /* Local index variable */
+        if (f->nopen_objs > 0) {
+            size_t obj_count; /* # of open objects */
+            hid_t  objs[128]; /* Array of objects to close */
+            herr_t result;    /* Local result from obj ID query */
+            size_t u;         /* Local index variable */
 
             /* Get the list of IDs of open dataset, group, & attribute objects */
-            while((result = H5F_get_obj_ids(f, H5F_OBJ_LOCAL | H5F_OBJ_DATASET | H5F_OBJ_GROUP | H5F_OBJ_ATTR, (int)(sizeof(objs) / sizeof(objs[0])), objs, FALSE, &obj_count)) <= 0
-                    && obj_count != 0 ) {
+            while ((result = H5F_get_obj_ids(
+                        f, H5F_OBJ_LOCAL | H5F_OBJ_DATASET | H5F_OBJ_GROUP | H5F_OBJ_ATTR,
+                        (int)(sizeof(objs) / sizeof(objs[0])), objs, FALSE, &obj_count)) <= 0 &&
+                   obj_count != 0) {
 
                 /* Try to close all the open objects in this file */
-                for(u = 0; u < obj_count; u++)
-                    if(H5I_dec_ref(objs[u]) < 0)
+                for (u = 0; u < obj_count; u++)
+                    if (H5I_dec_ref(objs[u]) < 0)
                         HGOTO_ERROR(H5E_ATOM, H5E_CLOSEERROR, FAIL, "can't close object")
             } /* end while */
-            if(result < 0)
+            if (result < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_BADITER, FAIL, "H5F_get_obj_ids failed(1)")
 
             /* Get the list of IDs of open named datatype objects */
@@ -1386,35 +1388,37 @@ H5F_try_close(H5F_t *f)
              * they could be using one of the named datatypes and then the
              * open named datatype ID will get closed twice)
              */
-            while((result = H5F_get_obj_ids(f, H5F_OBJ_LOCAL | H5F_OBJ_DATATYPE, (int)(sizeof(objs) / sizeof(objs[0])), objs, FALSE, &obj_count)) <= 0
-                    && obj_count != 0) {
+            while ((result = H5F_get_obj_ids(f, H5F_OBJ_LOCAL | H5F_OBJ_DATATYPE,
+                                             (int)(sizeof(objs) / sizeof(objs[0])), objs, FALSE,
+                                             &obj_count)) <= 0 &&
+                   obj_count != 0) {
 
                 /* Try to close all the open objects in this file */
-                for(u = 0; u < obj_count; u++)
-                    if(H5I_dec_ref(objs[u]) < 0)
+                for (u = 0; u < obj_count; u++)
+                    if (H5I_dec_ref(objs[u]) < 0)
                         HGOTO_ERROR(H5E_ATOM, H5E_CLOSEERROR, FAIL, "can't close object")
             } /* end while */
-            if(result < 0)
+            if (result < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_BADITER, FAIL, "H5F_get_obj_ids failed(2)")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Check if this is a child file in a mounting hierarchy & proceed up the
      * hierarchy if so.
      */
-    if(f->parent)
-        if(H5F_try_close(f->parent) < 0)
+    if (f->parent)
+        if (H5F_try_close(f->parent) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close parent file")
 
     /* Unmount and close each child before closing the current file. */
-    if(H5F_close_mounts(f) < 0)
+    if (H5F_close_mounts(f) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't unmount child files")
 
     /* If there is more than one reference to the shared file struct and the
      * file has an external file cache, we should see if it can be closed.  This
      * can happen if a cycle is formed with external file caches */
-    if(f->shared->efc && (f->shared->nrefs > 1))
-        if(H5F_efc_try_close(f) < 0)
+    if (f->shared->efc && (f->shared->nrefs > 1))
+        if (H5F_efc_try_close(f) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't attempt to close EFC")
 
     /* Delay flush until the shared file struct is closed, in H5F_dest.  If the
@@ -1426,14 +1430,13 @@ H5F_try_close(H5F_t *f)
      * shared H5F_file_t struct. If the reference count for the H5F_file_t
      * struct reaches zero then destroy it also.
      */
-    if(H5F_dest(f, H5AC_dxpl_id, TRUE) < 0)
+    if (H5F_dest(f, H5AC_dxpl_id, TRUE) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_try_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_id
  *
@@ -1450,19 +1453,20 @@ done:
 hid_t
 H5F_get_id(H5F_t *file, hbool_t app_ref)
 {
-    hid_t       ret_value;
+    hid_t ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(file);
 
-    if(file->file_id == -1) {
+    if (file->file_id == -1) {
         /* Get an atom for the file */
-        if((file->file_id = H5I_register(H5I_FILE, file, app_ref)) < 0)
-	    HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize file")
-    } else {
+        if ((file->file_id = H5I_register(H5I_FILE, file, app_ref)) < 0)
+            HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize file")
+    }
+    else {
         /* Increment reference count on atom. */
-        if(H5I_inc_ref(file->file_id, app_ref) < 0)
+        if (H5I_inc_ref(file->file_id, app_ref) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTSET, FAIL, "incrementing file ID failed")
     } /* end else */
 
@@ -1472,7 +1476,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_incr_nopen_objs
  *
@@ -1499,7 +1502,6 @@ H5F_incr_nopen_objs(H5F_t *f)
     FUNC_LEAVE_NOAPI(++f->nopen_objs)
 } /* end H5F_incr_nopen_objs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_decr_nopen_objs
  *
@@ -1526,7 +1528,6 @@ H5F_decr_nopen_objs(H5F_t *f)
     FUNC_LEAVE_NOAPI(--f->nopen_objs)
 } /* end H5F_decr_nopen_objs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_build_actual_name
  *
@@ -1544,10 +1545,10 @@ H5F_decr_nopen_objs(H5F_t *f)
  */
 static herr_t
 H5F_build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *name,
-    char **actual_name/*out*/)
+                      char **actual_name /*out*/)
 {
-    hid_t       new_fapl_id = -1;       /* ID for duplicated FAPL */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    hid_t  new_fapl_id = -1;      /* ID for duplicated FAPL */
+    herr_t ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1565,83 +1566,83 @@ H5F_build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *na
  */
 #ifdef H5_HAVE_SYMLINK
     /* Check for POSIX I/O compatible file handle */
-    if(H5F_HAS_FEATURE(f, H5FD_FEAT_POSIX_COMPAT_HANDLE)) {
-        h5_stat_t lst;   /* Stat info from lstat() call */
+    if (H5F_HAS_FEATURE(f, H5FD_FEAT_POSIX_COMPAT_HANDLE)) {
+        h5_stat_t lst; /* Stat info from lstat() call */
 
         /* Call lstat() on the file's name */
-        if(HDlstat(name, &lst) < 0)
+        if (HDlstat(name, &lst) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't retrieve stat info for file")
 
         /* Check for symbolic link */
-        if(S_IFLNK == (lst.st_mode & S_IFMT)) {
-            H5P_genplist_t *new_fapl;   /* Duplicated FAPL */
-            int *fd;                    /* POSIX I/O file descriptor */
-            h5_stat_t st;               /* Stat info from stat() call */
-            h5_stat_t fst;              /* Stat info from fstat() call */
-            char realname[PATH_MAX];    /* Fully resolved path name of file */
-            hbool_t want_posix_fd;      /* Flag for retrieving file descriptor from VFD */
+        if (S_IFLNK == (lst.st_mode & S_IFMT)) {
+            H5P_genplist_t *new_fapl;           /* Duplicated FAPL */
+            int *           fd;                 /* POSIX I/O file descriptor */
+            h5_stat_t       st;                 /* Stat info from stat() call */
+            h5_stat_t       fst;                /* Stat info from fstat() call */
+            char            realname[PATH_MAX]; /* Fully resolved path name of file */
+            hbool_t         want_posix_fd;      /* Flag for retrieving file descriptor from VFD */
 
             /* Perform a sanity check that the file or link wasn't switched
              * between when we opened it and when we called lstat().  This is
              * according to the security best practices for lstat() documented
-             * here: https://www.securecoding.cert.org/confluence/display/seccode/POS35-C.+Avoid+race+conditions+while+checking+for+the+existence+of+a+symbolic+link
+             * here:
+             * https://www.securecoding.cert.org/confluence/display/seccode/POS35-C.+Avoid+race+conditions+while+checking+for+the+existence+of+a+symbolic+link
              */
 
             /* Copy the FAPL object to modify */
-            if((new_fapl_id = H5P_copy_plist(fapl, FALSE)) < 0)
+            if ((new_fapl_id = H5P_copy_plist(fapl, FALSE)) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "unable to copy file access property list")
-            if(NULL == (new_fapl = (H5P_genplist_t *)H5I_object(new_fapl_id)))
+            if (NULL == (new_fapl = (H5P_genplist_t *)H5I_object(new_fapl_id)))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "can't get property list")
 
             /* Set the character encoding on the new property list */
             want_posix_fd = TRUE;
-            if(H5P_set(new_fapl, H5F_ACS_WANT_POSIX_FD_NAME, &want_posix_fd) < 0)
+            if (H5P_set(new_fapl, H5F_ACS_WANT_POSIX_FD_NAME, &want_posix_fd) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set character encoding")
 
             /* Retrieve the file handle */
-            if(H5F_get_vfd_handle(f, new_fapl_id, (void **)&fd) < 0)
+            if (H5F_get_vfd_handle(f, new_fapl_id, (void **)&fd) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't retrieve POSIX file descriptor")
 
             /* Stat the filename we're resolving */
-            if(HDstat(name, &st) < 0)
+            if (HDstat(name, &st) < 0)
                 HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, FAIL, "unable to stat file")
 
             /* Stat the file we opened */
-            if(HDfstat(*fd, &fst) < 0)
+            if (HDfstat(*fd, &fst) < 0)
                 HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, FAIL, "unable to fstat file")
 
             /* Verify that the files are really the same */
-            if(st.st_mode != fst.st_mode || st.st_ino != fst.st_ino || st.st_dev != fst.st_dev)
+            if (st.st_mode != fst.st_mode || st.st_ino != fst.st_ino || st.st_dev != fst.st_dev)
                 HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "files' st_ino or st_dev fields changed!")
 
             /* Get the resolved path for the file name */
-            if(NULL == HDrealpath(name, realname))
+            if (NULL == HDrealpath(name, realname))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't retrieve real path for file")
 
             /* Duplicate the resolved path for the file name */
-            if(NULL == (*actual_name = (char *)H5MM_strdup(realname)))
+            if (NULL == (*actual_name = (char *)H5MM_strdup(realname)))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "can't duplicate real path")
         } /* end if */
-    } /* end if */
-#endif /* H5_HAVE_SYMLINK */
+    }     /* end if */
+#endif    /* H5_HAVE_SYMLINK */
 
     /* Check if we've resolved the file's name */
-    if(NULL == *actual_name) {
+    if (NULL == *actual_name) {
         /* Just duplicate the name used to open the file */
-        if(NULL == (*actual_name = (char *)H5MM_strdup(name)))
+        if (NULL == (*actual_name = (char *)H5MM_strdup(name)))
             HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "can't duplicate open name")
     } /* end else */
 
 done:
     /* Close the property list */
-    if(new_fapl_id > 0)
-        if(H5I_dec_app_ref(new_fapl_id) < 0)
+    if (new_fapl_id > 0)
+        if (H5I_dec_app_ref(new_fapl_id) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "can't close duplicated FAPL")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_build_actual_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_addr_encode_len
  *
@@ -1657,9 +1658,9 @@ done:
  *-------------------------------------------------------------------------
  */
 void
-H5F_addr_encode_len(size_t addr_len, uint8_t **pp/*in,out*/, haddr_t addr)
+H5F_addr_encode_len(size_t addr_len, uint8_t **pp /*in,out*/, haddr_t addr)
 {
-    unsigned    u;              /* Local index variable */
+    unsigned u; /* Local index variable */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -1667,22 +1668,21 @@ H5F_addr_encode_len(size_t addr_len, uint8_t **pp/*in,out*/, haddr_t addr)
     HDassert(addr_len);
     HDassert(pp && *pp);
 
-    if(H5F_addr_defined(addr)) {
-	for(u = 0; u < addr_len; u++) {
-	    *(*pp)++ = (uint8_t)(addr & 0xff);
-	    addr >>= 8;
-	} /* end for */
-	HDassert("overflow" && 0 == addr);
+    if (H5F_addr_defined(addr)) {
+        for (u = 0; u < addr_len; u++) {
+            *(*pp)++ = (uint8_t)(addr & 0xff);
+            addr >>= 8;
+        } /* end for */
+        HDassert("overflow" && 0 == addr);
     } /* end if */
     else {
-	for(u = 0; u < addr_len; u++)
-	    *(*pp)++ = 0xff;
+        for (u = 0; u < addr_len; u++)
+            *(*pp)++ = 0xff;
     } /* end else */
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5F_addr_encode_len() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_addr_encode
  *
@@ -1698,7 +1698,7 @@ H5F_addr_encode_len(size_t addr_len, uint8_t **pp/*in,out*/, haddr_t addr)
  *-------------------------------------------------------------------------
  */
 void
-H5F_addr_encode(const H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr)
+H5F_addr_encode(const H5F_t *f, uint8_t **pp /*in,out*/, haddr_t addr)
 {
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -1710,7 +1710,6 @@ H5F_addr_encode(const H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5F_addr_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_addr_decode_len
  *
@@ -1729,10 +1728,10 @@ H5F_addr_encode(const H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr)
  *-------------------------------------------------------------------------
  */
 void
-H5F_addr_decode_len(size_t addr_len, const uint8_t **pp/*in,out*/, haddr_t *addr_p/*out*/)
+H5F_addr_decode_len(size_t addr_len, const uint8_t **pp /*in,out*/, haddr_t *addr_p /*out*/)
 {
-    hbool_t	    all_zero = TRUE;    /* True if address was all zeroes */
-    unsigned	    u;          /* Local index variable */
+    hbool_t  all_zero = TRUE; /* True if address was all zeroes */
+    unsigned u;               /* Local index variable */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -1745,40 +1744,38 @@ H5F_addr_decode_len(size_t addr_len, const uint8_t **pp/*in,out*/, haddr_t *addr
     *addr_p = 0;
 
     /* Decode bytes from address */
-    for(u = 0; u < addr_len; u++) {
-        uint8_t	    c;          /* Local decoded byte */
+    for (u = 0; u < addr_len; u++) {
+        uint8_t c; /* Local decoded byte */
 
         /* Get decoded byte (and advance pointer) */
-	c = *(*pp)++;
+        c = *(*pp)++;
 
         /* Check for non-undefined address byte value */
-	if(c != 0xff)
+        if (c != 0xff)
             all_zero = FALSE;
 
-	if(u < sizeof(*addr_p)) {
-            haddr_t	    tmp = c;    /* Local copy of address, for casting */
+        if (u < sizeof(*addr_p)) {
+            haddr_t tmp = c; /* Local copy of address, for casting */
 
             /* Shift decoded byte to correct position */
-	    tmp <<= (u * 8);	/*use tmp to get casting right */
+            tmp <<= (u * 8); /*use tmp to get casting right */
 
             /* Merge into already decoded bytes */
-	    *addr_p |= tmp;
-	} /* end if */
-        else
-            if(!all_zero)
-                HDassert(0 == **pp);	/*overflow */
-    } /* end for */
+            *addr_p |= tmp;
+        } /* end if */
+        else if (!all_zero)
+            HDassert(0 == **pp); /*overflow */
+    }                            /* end for */
 
     /* If 'all_zero' is still TRUE, the address was entirely composed of '0xff'
      *  bytes, which is the encoded form of 'HADDR_UNDEF', so set the destination
      *  to that value */
-    if(all_zero)
+    if (all_zero)
         *addr_p = HADDR_UNDEF;
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5F_addr_decode_len() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_addr_decode
  *
@@ -1797,7 +1794,7 @@ H5F_addr_decode_len(size_t addr_len, const uint8_t **pp/*in,out*/, haddr_t *addr
  *-------------------------------------------------------------------------
  */
 void
-H5F_addr_decode(const H5F_t *f, const uint8_t **pp/*in,out*/, haddr_t *addr_p/*out*/)
+H5F_addr_decode(const H5F_t *f, const uint8_t **pp /*in,out*/, haddr_t *addr_p /*out*/)
 {
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -1809,7 +1806,6 @@ H5F_addr_decode(const H5F_t *f, const uint8_t **pp/*in,out*/, haddr_t *addr_p/*o
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5F_addr_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_set_grp_btree_shared
  *
@@ -1839,7 +1835,6 @@ H5F_set_grp_btree_shared(H5F_t *f, H5RC_t *rc)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F_set_grp_btree_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_set_sohm_addr
  *
@@ -1868,7 +1863,6 @@ H5F_set_sohm_addr(H5F_t *f, haddr_t addr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F_set_sohm_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_set_sohm_vers
  *
@@ -1897,7 +1891,6 @@ H5F_set_sohm_vers(H5F_t *f, unsigned vers)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F_set_sohm_vers() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_set_sohm_nindexes
  *
@@ -1926,7 +1919,6 @@ H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F_set_sohm_nindexes() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_set_store_msg_crt_idx
  *
@@ -1955,7 +1947,6 @@ H5F_set_store_msg_crt_idx(H5F_t *f, hbool_t flag)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F_set_store_msg_crt_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_get_file_image
  *
@@ -1972,17 +1963,17 @@ H5F_set_store_msg_crt_idx(H5F_t *f, hbool_t flag)
 ssize_t
 H5F_get_file_image(H5F_t *file, void *buf_ptr, size_t buf_len)
 {
-    H5FD_t     *fd_ptr;                 /* file driver */
-    haddr_t     eoa;                    /* End of file address */
-    ssize_t     ret_value;              /* Return value */
+    H5FD_t *fd_ptr;    /* file driver */
+    haddr_t eoa;       /* End of file address */
+    ssize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
-    if(!file || !file->shared || !file->shared->lf)
+    if (!file || !file->shared || !file->shared->lf)
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "file_id yields invalid file pointer")
     fd_ptr = file->shared->lf;
-    if(!fd_ptr->cls)
+    if (!fd_ptr->cls)
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "fd_ptr yields invalid class pointer")
 
     /* the address space used by the split and multi file drivers is not
@@ -2003,54 +1994,54 @@ H5F_get_file_image(H5F_t *file, void *buf_ptr, size_t buf_len)
      *
      *                                          JRM -- 11/11/22
      */
-    if(HDstrcmp(fd_ptr->cls->name, "multi") == 0)
+    if (HDstrcmp(fd_ptr->cls->name, "multi") == 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Not supported for multi file driver.")
 
-    /* While the family file driver is conceptually fully compatible 
+    /* While the family file driver is conceptually fully compatible
      * with the get file image operation, it sets a file driver message
      * in the super block that prevents the image being opened with any
      * driver other than the family file driver.  Needless to say, this
      * rather defeats the purpose of the get file image operation.
      *
-     * While this problem is quire solvable, the required time and 
+     * While this problem is quire solvable, the required time and
      * resources are lacking at present.  Hence, for now, we don't
-     * allow the get file image operation to be performed on files 
+     * allow the get file image operation to be performed on files
      * opened with the family file driver.
      *
-     * Observe that the following test only looks at the top level 
+     * Observe that the following test only looks at the top level
      * driver, and fails if there is some other driver sitting on to
-     * of the family file driver.  
+     * of the family file driver.
      *
      * I don't think this can happen at present, but that may change
      * in the future.
      *                                   JRM -- 12/21/11
      */
-    if(HDstrcmp(fd_ptr->cls->name, "family") == 0)
+    if (HDstrcmp(fd_ptr->cls->name, "family") == 0)
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "Not supported for family file driver.")
 
     /* Go get the actual file size */
-    if(HADDR_UNDEF == (eoa = H5FD_get_eoa(file->shared->lf, H5FD_MEM_DEFAULT)))
+    if (HADDR_UNDEF == (eoa = H5FD_get_eoa(file->shared->lf, H5FD_MEM_DEFAULT)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get file size")
 
     /* set ret_value = to eoa -- will overwrite this if appropriate */
     ret_value = (ssize_t)eoa;
 
     /* test to see if a buffer was provided -- if not, we are done */
-    if(buf_ptr != NULL) {
-        size_t	space_needed;		/* size of file image */
+    if (buf_ptr != NULL) {
+        size_t space_needed; /* size of file image */
 
         /* Check for buffer too small */
-        if((haddr_t)buf_len < eoa)
+        if ((haddr_t)buf_len < eoa)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "supplied buffer too small")
 
         space_needed = (size_t)eoa;
 
         /* read in the file image */
         /* (Note compensation for base address addition in internal routine) */
-        if(H5FD_read(fd_ptr, H5AC_ind_dxpl_g, H5FD_MEM_DEFAULT, 0, space_needed, buf_ptr) < 0)
+        if (H5FD_read(fd_ptr, H5AC_ind_dxpl_g, H5FD_MEM_DEFAULT, 0, space_needed, buf_ptr) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_READERROR, FAIL, "file image read request failed")
     } /* end if */
-    
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_get_file_image() */
diff --git a/src/H5Fio.c b/src/H5Fio.c
index 4af825b..8e5c0e9 100644
--- a/src/H5Fio.c
+++ b/src/H5Fio.c
@@ -26,55 +26,45 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_block_read
  *
@@ -91,11 +81,10 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size,
-    hid_t dxpl_id, void *buf/*out*/)
+H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id, void *buf /*out*/)
 {
-    H5F_io_info_t fio_info;             /* I/O info for operation */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5F_io_info_t fio_info;            /* I/O info for operation */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -105,23 +94,22 @@ H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size,
     HDassert(H5F_addr_defined(addr));
 
     /* Check for attempting I/O on 'temporary' file address */
-    if(H5F_addr_le(f->shared->tmp_addr, (addr + size)))
+    if (H5F_addr_le(f->shared->tmp_addr, (addr + size)))
         HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space")
 
     /* Set up I/O info for operation */
     fio_info.f = f;
-    if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Pass through metadata accumulator layer */
-    if(H5F__accum_read(&fio_info, type, addr, size, buf) < 0)
+    if (H5F__accum_read(&fio_info, type, addr, size, buf) < 0)
         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "read through metadata accumulator failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_block_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_block_write
  *
@@ -138,15 +126,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_block_write(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size,
-    hid_t dxpl_id, const void *buf)
+H5F_block_write(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id, const void *buf)
 {
-    H5F_io_info_t fio_info;             /* I/O info for operation */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5F_io_info_t fio_info;            /* I/O info for operation */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef QAK
-HDfprintf(stderr, "%s: write to addr = %a, size = %Zu\n", FUNC, addr, size);
+    HDfprintf(stderr, "%s: write to addr = %a, size = %Zu\n", FUNC, addr, size);
 #endif /* QAK */
 
     HDassert(f);
@@ -156,19 +143,18 @@ HDfprintf(stderr, "%s: write to addr = %a, size = %Zu\n", FUNC, addr, size);
     HDassert(H5F_addr_defined(addr));
 
     /* Check for attempting I/O on 'temporary' file address */
-    if(H5F_addr_le(f->shared->tmp_addr, (addr + size)))
+    if (H5F_addr_le(f->shared->tmp_addr, (addr + size)))
         HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space")
 
     /* Set up I/O info for operation */
     fio_info.f = f;
-    if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Pass through metadata accumulator layer */
-    if(H5F__accum_write(&fio_info, type, addr, size, buf) < 0)
+    if (H5F__accum_write(&fio_info, type, addr, size, buf) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write through metadata accumulator failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_block_write() */
-
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index 7cbaa72..28ae3f6 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -11,29 +11,26 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5F_init_mount_interface
-
+#define H5_INTERFACE_INIT_FUNC H5F_init_mount_interface
 
 /* Packages needed by this file... */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Pprivate.h"		/* Property lists			*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5Gprivate.h"  /* Groups				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Pprivate.h"  /* Property lists			*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 /* PRIVATE PROTOTYPES */
-static herr_t H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
-    hid_t plist_id, hid_t dxpl_id);
+static herr_t H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child, hid_t plist_id, hid_t dxpl_id);
 static herr_t H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id);
-static void H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs);
+static void   H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs);
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5F_init_mount_interface -- Initialize interface-specific information
@@ -55,7 +52,6 @@ H5F_init_mount_interface(void)
     FUNC_LEAVE_NOAPI(H5F_init())
 } /* H5F_init_mount_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_close_mounts
  *
@@ -71,8 +67,8 @@ H5F_init_mount_interface(void)
 herr_t
 H5F_close_mounts(H5F_t *f)
 {
-    unsigned u;                 /* Local index */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    unsigned u;                   /* Local index */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -83,21 +79,21 @@ H5F_close_mounts(H5F_t *f)
      * to terminate the loop. */
     for (u = f->shared->mtab.nmounts - 1; u < f->shared->mtab.nmounts; u--) {
         /* Only unmount children mounted to this top level file structure */
-        if(f->shared->mtab.child[u].file->parent == f) {
+        if (f->shared->mtab.child[u].file->parent == f) {
             /* Detach the child file from the parent file */
             f->shared->mtab.child[u].file->parent = NULL;
 
             /* Close the internal group maintaining the mount point */
-            if(H5G_close(f->shared->mtab.child[u].group) < 0)
-            HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "can't close child group")
+            if (H5G_close(f->shared->mtab.child[u].group) < 0)
+                HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "can't close child group")
 
             /* Close the child file */
-            if(H5F_try_close(f->shared->mtab.child[u].file) < 0)
+            if (H5F_try_close(f->shared->mtab.child[u].file) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close child file")
 
             /* Eliminate the mount point from the table */
             HDmemmove(f->shared->mtab.child + u, f->shared->mtab.child + u + 1,
-                (f->shared->mtab.nmounts - u - 1) * sizeof(f->shared->mtab.child[0]));
+                      (f->shared->mtab.nmounts - u - 1) * sizeof(f->shared->mtab.child[0]));
             f->shared->mtab.nmounts--;
             f->nmounts--;
         }
@@ -109,7 +105,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_close_mounts() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_mount
  *
@@ -125,19 +120,18 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
-	  hid_t H5_ATTR_UNUSED plist_id, hid_t dxpl_id)
+H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child, hid_t H5_ATTR_UNUSED plist_id, hid_t dxpl_id)
 {
-    H5G_t	*mount_point = NULL;	/*mount point group		*/
-    H5F_t	*ancestor = NULL;	/*ancestor files		*/
-    H5F_t	*parent = NULL;		/*file containing mount point	*/
-    unsigned	lt, rt, md;		/*binary search indices		*/
-    int		cmp;			/*binary search comparison value*/
-    H5G_loc_t   mp_loc;                 /* entry of moint point to be opened */
-    H5G_name_t  mp_path;            	/* Mount point group hier. path */
-    H5O_loc_t   mp_oloc;            	/* Mount point object location */
-    H5G_loc_t   root_loc;               /* Group location of root of file to mount */
-    herr_t	ret_value = SUCCEED;	/*return value			*/
+    H5G_t *    mount_point = NULL;  /*mount point group		*/
+    H5F_t *    ancestor    = NULL;  /*ancestor files		*/
+    H5F_t *    parent      = NULL;  /*file containing mount point	*/
+    unsigned   lt, rt, md;          /*binary search indices		*/
+    int        cmp;                 /*binary search comparison value*/
+    H5G_loc_t  mp_loc;              /* entry of moint point to be opened */
+    H5G_name_t mp_path;             /* Mount point group hier. path */
+    H5O_loc_t  mp_oloc;             /* Mount point object location */
+    H5G_loc_t  root_loc;            /* Group location of root of file to mount */
+    herr_t     ret_value = SUCCEED; /*return value			*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -157,24 +151,24 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
      * the parent & child files have the same file close degree, and
      * that the mount wouldn't introduce a cycle in the mount tree.
      */
-    if(child->parent)
+    if (child->parent)
         HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "file is already mounted")
-    if(H5G_loc_find(loc, name, &mp_loc/*out*/, H5P_DEFAULT, dxpl_id) < 0)
+    if (H5G_loc_find(loc, name, &mp_loc /*out*/, H5P_DEFAULT, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     /* If the mount location is holding its file open, that file will close
      * and remove the mount as soon as we exit this function.  Prevent the
      * user from doing this.
      */
-    if(mp_loc.oloc->holding_file != FALSE)
+    if (mp_loc.oloc->holding_file != FALSE)
         HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount path cannot contain links to external files")
 
     /* Open the mount point group */
-    if(NULL == (mount_point = H5G_open(&mp_loc, dxpl_id)))
+    if (NULL == (mount_point = H5G_open(&mp_loc, dxpl_id)))
         HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount point not found")
 
     /* Check if the proposed mount point group is already a mount point */
-    if(H5G_MOUNTED(mount_point))
-	HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount point is already in use")
+    if (H5G_MOUNTED(mount_point))
+        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount point is already in use")
 
     /* Retrieve information from the mount point group */
     /* (Some of which we had before but was reset in mp_loc when the group
@@ -186,13 +180,13 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
     HDassert(mp_loc.oloc);
     mp_loc.path = H5G_nameof(mount_point);
     HDassert(mp_loc.path);
-    for(ancestor = parent; ancestor; ancestor = ancestor->parent) {
-	if(ancestor->shared == child->shared)
-	    HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount would introduce a cycle")
+    for (ancestor = parent; ancestor; ancestor = ancestor->parent) {
+        if (ancestor->shared == child->shared)
+            HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount would introduce a cycle")
     } /* end for */
 
     /* Make certain that the parent & child files have the same "file close degree" */
-    if(parent->shared->fc_degree != child->shared->fc_degree)
+    if (parent->shared->fc_degree != child->shared->fc_degree)
         HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mounted file has different file close degree than parent")
 
     /*
@@ -201,77 +195,76 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
      * `md' will be the index where the child should be inserted.
      */
     lt = md = 0;
-    rt = parent->shared->mtab.nmounts;
-    cmp = -1;
-    while(lt < rt && cmp) {
-        H5O_loc_t	*oloc;		/*temporary symbol table entry	*/
-
-	md = (lt + rt) / 2;
-	oloc = H5G_oloc(parent->shared->mtab.child[md].group);
-	cmp = H5F_addr_cmp(mp_loc.oloc->addr, oloc->addr);
-	if(cmp < 0)
-	    rt = md;
-	else if(cmp > 0)
-	    lt = md + 1;
+    rt      = parent->shared->mtab.nmounts;
+    cmp     = -1;
+    while (lt < rt && cmp) {
+        H5O_loc_t *oloc; /*temporary symbol table entry	*/
+
+        md   = (lt + rt) / 2;
+        oloc = H5G_oloc(parent->shared->mtab.child[md].group);
+        cmp  = H5F_addr_cmp(mp_loc.oloc->addr, oloc->addr);
+        if (cmp < 0)
+            rt = md;
+        else if (cmp > 0)
+            lt = md + 1;
     } /* end while */
-    if(cmp > 0)
+    if (cmp > 0)
         md++;
-    if(!cmp)
-	HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount point is already in use")
+    if (!cmp)
+        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount point is already in use")
 
     /* Make room in the table */
-    if(parent->shared->mtab.nmounts >= parent->shared->mtab.nalloc) {
-	unsigned n = MAX(16, 2 * parent->shared->mtab.nalloc);
-	H5F_mount_t *x = (H5F_mount_t *)H5MM_realloc(parent->shared->mtab.child, n * sizeof(parent->shared->mtab.child[0]));
-
-	if(!x)
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for mount table")
-	parent->shared->mtab.child = x;
-	parent->shared->mtab.nalloc = n;
+    if (parent->shared->mtab.nmounts >= parent->shared->mtab.nalloc) {
+        unsigned     n = MAX(16, 2 * parent->shared->mtab.nalloc);
+        H5F_mount_t *x = (H5F_mount_t *)H5MM_realloc(parent->shared->mtab.child,
+                                                     n * sizeof(parent->shared->mtab.child[0]));
+
+        if (!x)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for mount table")
+        parent->shared->mtab.child  = x;
+        parent->shared->mtab.nalloc = n;
     } /* end if */
 
     /* Insert into table */
     HDmemmove(parent->shared->mtab.child + md + 1, parent->shared->mtab.child + md,
-            (parent->shared->mtab.nmounts-md) * sizeof(parent->shared->mtab.child[0]));
+              (parent->shared->mtab.nmounts - md) * sizeof(parent->shared->mtab.child[0]));
     parent->shared->mtab.nmounts++;
     parent->nmounts++;
     parent->shared->mtab.child[md].group = mount_point;
-    parent->shared->mtab.child[md].file = child;
-    child->parent = parent;
+    parent->shared->mtab.child[md].file  = child;
+    child->parent                        = parent;
 
     /* Set the group's mountpoint flag */
-    if(H5G_mount(parent->shared->mtab.child[md].group) < 0)
+    if (H5G_mount(parent->shared->mtab.child[md].group) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "unable to set group mounted flag")
 
     /* Get the group location for the root group in the file to unmount */
-    if(NULL == (root_loc.oloc = H5G_oloc(child->shared->root_grp)))
+    if (NULL == (root_loc.oloc = H5G_oloc(child->shared->root_grp)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location for root group")
-    if(NULL == (root_loc.path = H5G_nameof(child->shared->root_grp)))
+    if (NULL == (root_loc.path = H5G_nameof(child->shared->root_grp)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path for root group")
 
     /* Search the open IDs and replace names for mount operation */
     /* We pass H5G_UNKNOWN as object type; search all IDs */
-    if(H5G_name_replace(NULL, H5G_NAME_MOUNT, mp_loc.oloc->file,
-            mp_loc.path->full_path_r, root_loc.oloc->file, root_loc.path->full_path_r,
-            dxpl_id) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to replace name")
+    if (H5G_name_replace(NULL, H5G_NAME_MOUNT, mp_loc.oloc->file, mp_loc.path->full_path_r,
+                         root_loc.oloc->file, root_loc.path->full_path_r, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to replace name")
 
 done:
-    if(ret_value < 0) {
-        if(mount_point) {
-            if(H5G_close(mount_point) < 0)
+    if (ret_value < 0) {
+        if (mount_point) {
+            if (H5G_close(mount_point) < 0)
                 HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "unable to close mounted group")
         } /* end if */
         else {
-            if(H5G_loc_free(&mp_loc) < 0)
+            if (H5G_loc_free(&mp_loc) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to free mount location")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_mount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_unmount
  *
@@ -293,17 +286,17 @@ done:
 static herr_t
 H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
 {
-    H5G_t	*child_group = NULL;	/* Child's group in parent mtab	*/
-    H5F_t	*child = NULL;		/*mounted file			*/
-    H5F_t	*parent = NULL;		/*file where mounted		*/
-    H5O_loc_t   *mnt_oloc;            	/* symbol table entry for root of mounted file */
-    H5G_name_t  mp_path;            	/* Mount point group hier. path */
-    H5O_loc_t   mp_oloc;            	/* Mount point object location  */
-    H5G_loc_t   mp_loc;                 /* entry used to open mount point*/
-    hbool_t     mp_loc_setup = FALSE;   /* Whether mount point location is set up */
-    H5G_loc_t   root_loc;               /* Group location of root of file to unmount */
-    int         child_idx;              /* Index of child in parent's mtab */
-    herr_t	ret_value = SUCCEED;	/*return value			*/
+    H5G_t *    child_group = NULL;   /* Child's group in parent mtab	*/
+    H5F_t *    child       = NULL;   /*mounted file			*/
+    H5F_t *    parent      = NULL;   /*file where mounted		*/
+    H5O_loc_t *mnt_oloc;             /* symbol table entry for root of mounted file */
+    H5G_name_t mp_path;              /* Mount point group hier. path */
+    H5O_loc_t  mp_oloc;              /* Mount point object location  */
+    H5G_loc_t  mp_loc;               /* entry used to open mount point*/
+    hbool_t    mp_loc_setup = FALSE; /* Whether mount point location is set up */
+    H5G_loc_t  root_loc;             /* Group location of root of file to unmount */
+    int        child_idx;            /* Index of child in parent's mtab */
+    herr_t     ret_value = SUCCEED;  /*return value			*/
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -320,59 +313,60 @@ H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
      * If we get the root group and the file has a parent in the mount tree,
      * then we must have found the mount point.
      */
-    if(H5G_loc_find(loc, name, &mp_loc/*out*/, H5P_DEFAULT, dxpl_id) < 0)
+    if (H5G_loc_find(loc, name, &mp_loc /*out*/, H5P_DEFAULT, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     mp_loc_setup = TRUE;
-    child = mp_loc.oloc->file;
-    mnt_oloc = H5G_oloc(child->shared->root_grp);
-    child_idx = -1;
-
-    if(child->parent && H5F_addr_eq(mp_oloc.addr, mnt_oloc->addr)) {
-        unsigned	u;		/*counters			*/
-
-	/*
-	 * We've been given the root group of the child.  We do a reverse
-	 * lookup in the parent's mount table to find the correct entry.
-	 */
-	parent = child->parent;
-	for(u = 0; u < parent->shared->mtab.nmounts; u++) {
-	    if(parent->shared->mtab.child[u].file->shared == child->shared) {
+    child        = mp_loc.oloc->file;
+    mnt_oloc     = H5G_oloc(child->shared->root_grp);
+    child_idx    = -1;
+
+    if (child->parent && H5F_addr_eq(mp_oloc.addr, mnt_oloc->addr)) {
+        unsigned u; /*counters			*/
+
+        /*
+         * We've been given the root group of the child.  We do a reverse
+         * lookup in the parent's mount table to find the correct entry.
+         */
+        parent = child->parent;
+        for (u = 0; u < parent->shared->mtab.nmounts; u++) {
+            if (parent->shared->mtab.child[u].file->shared == child->shared) {
                 /* Found the correct index */
                 child_idx = (int)u;
                 break;
-	    } /* end if */
-	} /* end for */
-    } else {
-        unsigned lt, rt, md = 0;        /*binary search indices		*/
-        int 	cmp;		        /*binary search comparison value*/
-
-	/*
-	 * We've been given the mount point in the parent.  We use a binary
-	 * search in the parent to locate the mounted file, if any.
-	 */
-	parent = child; /*we guessed wrong*/
-	lt = 0;
-	rt = parent->shared->mtab.nmounts;
-	cmp = -1;
-	while(lt < rt && cmp) {
-	    md = (lt + rt) / 2;
-	    mnt_oloc = H5G_oloc(parent->shared->mtab.child[md].group);
-	    cmp = H5F_addr_cmp(mp_oloc.addr, mnt_oloc->addr);
-	    if (cmp<0)
-		rt = md;
-	    else
-		lt = md + 1;
-	} /* end while */
-	if(cmp)
-	    HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "not a mount point")
+            } /* end if */
+        }     /* end for */
+    }
+    else {
+        unsigned lt, rt, md = 0; /*binary search indices		*/
+        int      cmp;            /*binary search comparison value*/
+
+        /*
+         * We've been given the mount point in the parent.  We use a binary
+         * search in the parent to locate the mounted file, if any.
+         */
+        parent = child; /*we guessed wrong*/
+        lt     = 0;
+        rt     = parent->shared->mtab.nmounts;
+        cmp    = -1;
+        while (lt < rt && cmp) {
+            md       = (lt + rt) / 2;
+            mnt_oloc = H5G_oloc(parent->shared->mtab.child[md].group);
+            cmp      = H5F_addr_cmp(mp_oloc.addr, mnt_oloc->addr);
+            if (cmp < 0)
+                rt = md;
+            else
+                lt = md + 1;
+        } /* end while */
+        if (cmp)
+            HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "not a mount point")
 
         /* Found the correct index, set the info about the child */
         child_idx = (int)md;
         H5G_loc_free(&mp_loc);
         mp_loc_setup = FALSE;
-        mp_loc.oloc = mnt_oloc;
-        mp_loc.path = H5G_nameof(parent->shared->mtab.child[md].group);
-        child = parent->shared->mtab.child[child_idx].file;
+        mp_loc.oloc  = mnt_oloc;
+        mp_loc.path  = H5G_nameof(parent->shared->mtab.child[md].group);
+        child        = parent->shared->mtab.child[child_idx].file;
 
         /* Set the parent to be the actual parent of the discovered child.
          * Could be different due to the shared mount table. */
@@ -384,43 +378,43 @@ H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
     child_group = parent->shared->mtab.child[child_idx].group;
 
     /* Get the group location for the root group in the file to unmount */
-    if(NULL == (root_loc.oloc = H5G_oloc(child->shared->root_grp)))
+    if (NULL == (root_loc.oloc = H5G_oloc(child->shared->root_grp)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location for root group")
-    if(NULL == (root_loc.path = H5G_nameof(child->shared->root_grp)))
+    if (NULL == (root_loc.path = H5G_nameof(child->shared->root_grp)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path for root group")
 
     /* Search the open IDs replace names to reflect unmount operation */
-    if(H5G_name_replace(NULL, H5G_NAME_UNMOUNT, mp_loc.oloc->file,
-            mp_loc.path->full_path_r, root_loc.oloc->file, root_loc.path->full_path_r,
-            dxpl_id) < 0)
+    if (H5G_name_replace(NULL, H5G_NAME_UNMOUNT, mp_loc.oloc->file, mp_loc.path->full_path_r,
+                         root_loc.oloc->file, root_loc.path->full_path_r, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to replace name")
 
     /* Eliminate the mount point from the table */
-    HDmemmove(parent->shared->mtab.child + (unsigned)child_idx, (parent->shared->mtab.child + (unsigned)child_idx) + 1,
-            ((parent->shared->mtab.nmounts - (unsigned)child_idx) - 1) * sizeof(parent->shared->mtab.child[0]));
+    HDmemmove(parent->shared->mtab.child + (unsigned)child_idx,
+              (parent->shared->mtab.child + (unsigned)child_idx) + 1,
+              ((parent->shared->mtab.nmounts - (unsigned)child_idx) - 1) *
+                  sizeof(parent->shared->mtab.child[0]));
     parent->shared->mtab.nmounts -= 1;
     parent->nmounts -= 1;
 
     /* Unmount the child file from the parent file */
-    if(H5G_unmount(child_group) < 0)
+    if (H5G_unmount(child_group) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "unable to reset group mounted flag")
-    if(H5G_close(child_group) < 0)
+    if (H5G_close(child_group) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "unable to close unmounted group")
 
     /* Detach child file from parent & see if it should close */
     child->parent = NULL;
-    if(H5F_try_close(child) < 0)
+    if (H5F_try_close(child) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close unmounted file")
 
 done:
     /* Free the mount point location's information, if it's been set up */
-    if(mp_loc_setup)
+    if (mp_loc_setup)
         H5G_loc_free(&mp_loc);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_unmount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_is_mount
  *
@@ -437,13 +431,13 @@ done:
 hbool_t
 H5F_is_mount(const H5F_t *file)
 {
-    hbool_t ret_value;   /* Return value */
+    hbool_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(file);
 
-    if(file->parent != NULL)
+    if (file->parent != NULL)
         ret_value = TRUE;
     else
         ret_value = FALSE;
@@ -451,7 +445,6 @@ H5F_is_mount(const H5F_t *file)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_is_mount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fmount
  *
@@ -468,35 +461,33 @@ H5F_is_mount(const H5F_t *file)
 herr_t
 H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id)
 {
-    H5G_loc_t	loc;
-    H5F_t	*child = NULL;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5G_loc_t loc;
+    H5F_t *   child     = NULL;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(NULL == (child = (H5F_t *)H5I_object_verify(child_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
-    if(H5P_DEFAULT == plist_id)
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (NULL == (child = (H5F_t *)H5I_object_verify(child_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+    if (H5P_DEFAULT == plist_id)
         plist_id = H5P_FILE_MOUNT_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(plist_id, H5P_FILE_MOUNT))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not property list")
+    else if (TRUE != H5P_isa_class(plist_id, H5P_FILE_MOUNT))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not property list")
 
     /* Do the mount */
-    if(H5F_mount(&loc, name, child, plist_id, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to mount file")
+    if (H5F_mount(&loc, name, child, plist_id, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to mount file")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fmount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Funmount
  *
@@ -519,27 +510,26 @@ done:
 herr_t
 H5Funmount(hid_t loc_id, const char *name)
 {
-    H5G_loc_t	loc;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5G_loc_t loc;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", loc_id, name);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Unmount */
     if (H5F_unmount(&loc, name, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to unmount file")
+        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to unmount file")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Funmount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_mount_count_ids_recurse
  *
@@ -556,7 +546,7 @@ done:
 static void
 H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs)
 {
-    unsigned u;                         /* Local index value */
+    unsigned u; /* Local index value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -566,7 +556,7 @@ H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_obj
     HDassert(nopen_objs);
 
     /* If this file is still open, increment number of file IDs open */
-    if(f->file_id > 0)
+    if (f->file_id > 0)
         *nopen_files += 1;
 
     /* Increment number of open objects in file
@@ -576,11 +566,11 @@ H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_obj
     *nopen_objs += (f->nopen_objs - f->nmounts);
 
     /* Iterate over files mounted in this file and add in their open ID counts also */
-    for(u = 0; u < f->shared->mtab.nmounts; u++) {
+    for (u = 0; u < f->shared->mtab.nmounts; u++) {
         /* Only recurse on children mounted to this top level file structure */
-        if(f->shared->mtab.child[u].file->parent == f) {
+        if (f->shared->mtab.child[u].file->parent == f) {
             /* Increment the open object count if the mount point group has an open ID */
-            if(H5G_get_shared_count(f->shared->mtab.child[u].group) > 1)
+            if (H5G_get_shared_count(f->shared->mtab.child[u].group) > 1)
                 *nopen_objs += 1;
 
             H5F_mount_count_ids_recurse(f->shared->mtab.child[u].file, nopen_files, nopen_objs);
@@ -590,7 +580,6 @@ H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_obj
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5F_mount_count_ids_recurse() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_mount_count_ids
  *
@@ -614,7 +603,7 @@ H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs)
     HDassert(nopen_objs);
 
     /* Find the top file in the mounting hierarchy */
-    while(f->parent)
+    while (f->parent)
         f = f->parent;
 
     /* Count open IDs in the hierarchy */
@@ -623,7 +612,6 @@ H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5F_mount_count_ids() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_flush_mounts_recurse
  *
@@ -639,9 +627,9 @@ H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs)
 static herr_t
 H5F_flush_mounts_recurse(H5F_t *f, hid_t dxpl_id)
 {
-    unsigned	nerrors = 0;            /* Errors from recursive flushes */
-    unsigned    u;                      /* Index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned nerrors = 0;         /* Errors from recursive flushes */
+    unsigned u;                   /* Index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -649,23 +637,22 @@ H5F_flush_mounts_recurse(H5F_t *f, hid_t dxpl_id)
     HDassert(f);
 
     /* Flush all child files, not stopping for errors */
-    for(u = 0; u < f->shared->mtab.nmounts; u++)
-        if(H5F_flush_mounts_recurse(f->shared->mtab.child[u].file, dxpl_id) < 0)
+    for (u = 0; u < f->shared->mtab.nmounts; u++)
+        if (H5F_flush_mounts_recurse(f->shared->mtab.child[u].file, dxpl_id) < 0)
             nerrors++;
 
     /* Call the "real" flush routine, for this file */
-    if(H5F_flush(f, dxpl_id, FALSE) < 0)
+    if (H5F_flush(f, dxpl_id, FALSE) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's cached information")
 
     /* Check flush errors for children - errors are already on the stack */
-    if(nerrors)
+    if (nerrors)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's child mounts")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_flush_mounts_recurse() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_flush_mounts
  *
@@ -681,7 +668,7 @@ done:
 herr_t
 H5F_flush_mounts(H5F_t *f, hid_t dxpl_id)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -689,18 +676,17 @@ H5F_flush_mounts(H5F_t *f, hid_t dxpl_id)
     HDassert(f);
 
     /* Find the top file in the mount hierarchy */
-    while(f->parent)
+    while (f->parent)
         f = f->parent;
 
     /* Flush the mounted file hierarchy */
-    if(H5F_flush_mounts_recurse(f, dxpl_id) < 0)
+    if (H5F_flush_mounts_recurse(f, dxpl_id) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush mounted file hierarchy")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_flush_mounts() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_traverse_mount
  *
@@ -715,14 +701,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_traverse_mount(H5O_loc_t *oloc/*in,out*/)
+H5F_traverse_mount(H5O_loc_t *oloc /*in,out*/)
 {
-    H5F_t *parent = oloc->file,         /* File of object */
-        *child = NULL;                  /* Child file */
-    unsigned	lt, rt, md = 0;         /* Binary search indices */
-    int cmp;
-    H5O_loc_t	*mnt_oloc = NULL;       /* Object location for mount points */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5F_t *parent = oloc->file, /* File of object */
+        *child    = NULL;       /* Child file */
+    unsigned   lt, rt, md = 0;  /* Binary search indices */
+    int        cmp;
+    H5O_loc_t *mnt_oloc  = NULL;    /* Object location for mount points */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -734,25 +720,25 @@ H5F_traverse_mount(H5O_loc_t *oloc/*in,out*/)
      * of file2, which is mounted somewhere in file3.
      */
     do {
-	/*
-	 * Use a binary search to find the potential mount point in the mount
-	 * table for the parent
-	 */
-	lt = 0;
-	rt = parent->shared->mtab.nmounts;
-	cmp = -1;
-	while(lt < rt && cmp) {
-	    md = (lt + rt) / 2;
-	    mnt_oloc = H5G_oloc(parent->shared->mtab.child[md].group);
-	    cmp = H5F_addr_cmp(oloc->addr, mnt_oloc->addr);
-	    if(cmp < 0)
-		rt = md;
-	    else
-		lt = md + 1;
-	} /* end while */
+        /*
+         * Use a binary search to find the potential mount point in the mount
+         * table for the parent
+         */
+        lt  = 0;
+        rt  = parent->shared->mtab.nmounts;
+        cmp = -1;
+        while (lt < rt && cmp) {
+            md       = (lt + rt) / 2;
+            mnt_oloc = H5G_oloc(parent->shared->mtab.child[md].group);
+            cmp      = H5F_addr_cmp(oloc->addr, mnt_oloc->addr);
+            if (cmp < 0)
+                rt = md;
+            else
+                lt = md + 1;
+        } /* end while */
 
         /* Copy root info over to ENT */
-        if(0 == cmp) {
+        if (0 == cmp) {
             /* Get the child file */
             child = parent->shared->mtab.child[md].file;
 
@@ -760,11 +746,11 @@ H5F_traverse_mount(H5O_loc_t *oloc/*in,out*/)
             mnt_oloc = H5G_oloc(child->shared->root_grp);
 
             /* Release the mount point */
-            if(H5O_loc_free(oloc) < 0)
+            if (H5O_loc_free(oloc) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to free object location")
 
             /* Copy the entry for the root group */
-            if(H5O_loc_copy(oloc, mnt_oloc, H5_COPY_DEEP) < 0)
+            if (H5O_loc_copy(oloc, mnt_oloc, H5_COPY_DEEP) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "unable to copy object location")
 
             /* In case the shared root group info points to a different file handle
@@ -774,9 +760,8 @@ H5F_traverse_mount(H5O_loc_t *oloc/*in,out*/)
             /* Switch to child's file */
             parent = child;
         } /* end if */
-    } while(!cmp);
+    } while (!cmp);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_traverse_mount() */
-
diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c
index 3d6ef49..9c7c33e 100644
--- a/src/H5Fmpi.c
+++ b/src/H5Fmpi.c
@@ -26,56 +26,47 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 #ifdef H5_HAVE_PARALLEL
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5F_mpi_get_rank
  *
@@ -95,21 +86,20 @@
 int
 H5F_mpi_get_rank(const H5F_t *f)
 {
-    int	ret_value;
+    int ret_value;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f && f->shared);
 
     /* Dispatch to driver */
-    if ((ret_value=H5FD_mpi_get_rank(f->shared->lf)) < 0)
+    if ((ret_value = H5FD_mpi_get_rank(f->shared->lf)) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_rank request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_mpi_get_rank() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_mpi_get_comm
  *
@@ -129,21 +119,20 @@ done:
 MPI_Comm
 H5F_mpi_get_comm(const H5F_t *f)
 {
-    MPI_Comm	ret_value;
+    MPI_Comm ret_value;
 
     FUNC_ENTER_NOAPI(MPI_COMM_NULL)
 
     HDassert(f && f->shared);
 
     /* Dispatch to driver */
-    if ((ret_value=H5FD_mpi_get_comm(f->shared->lf))==MPI_COMM_NULL)
+    if ((ret_value = H5FD_mpi_get_comm(f->shared->lf)) == MPI_COMM_NULL)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, MPI_COMM_NULL, "driver get_comm request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_mpi_get_comm() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_mpi_get_size
  *
@@ -170,14 +159,13 @@ H5F_mpi_get_size(const H5F_t *f)
     HDassert(f && f->shared);
 
     /* Dispatch to driver */
-    if ((ret_value=H5FD_mpi_get_size(f->shared->lf)) < 0)
+    if ((ret_value = H5FD_mpi_get_size(f->shared->lf)) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_size request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_mpi_get_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fset_mpi_atomicity
  *
@@ -195,29 +183,28 @@ done:
 herr_t
 H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag)
 {
-    H5F_t       *file;
-    herr_t       ret_value = SUCCEED;
+    H5F_t *file;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ib", file_id, flag);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Check VFD */
-    if(!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI))
+    if (!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI))
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect VFL driver, does not support MPI atomicity mode")
 
     /* set atomicity value */
-    if (H5FD_set_mpio_atomicity (file->shared->lf, flag) < 0)
+    if (H5FD_set_mpio_atomicity(file->shared->lf, flag) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "can't set atomicity flag")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Fget_mpi_atomicity
  *
@@ -235,26 +222,25 @@ done:
 herr_t
 H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag)
 {
-    H5F_t      *file;
-    herr_t     ret_value = SUCCEED;
+    H5F_t *file;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*b", file_id, flag);
 
     /* Check args */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Check VFD */
-    if(!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI))
+    if (!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI))
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect VFL driver, does not support MPI atomicity mode")
 
     /* get atomicity value */
-    if (H5FD_get_mpio_atomicity (file->shared->lf, flag) < 0)
+    if (H5FD_get_mpio_atomicity(file->shared->lf, flag) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get atomicity flag")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 #endif /* H5_HAVE_PARALLEL */
-
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index e90123f..1a6a502 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -30,94 +30,89 @@
 #include "H5Fprivate.h"
 
 /* Other public headers needed by this file */
-#include "H5Bpublic.h"          /* B-tree header, for H5B_NUM_BTREE_ID */
+#include "H5Bpublic.h" /* B-tree header, for H5B_NUM_BTREE_ID */
 
 /* Other private headers needed by this file */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5FOprivate.h"        /* File objects                         */
-#include "H5FSprivate.h"	/* File free space                      */
-#include "H5Gprivate.h"		/* Groups 			  	*/
-#include "H5Oprivate.h"         /* Object header messages               */
-#include "H5RCprivate.h"	/* Reference counted object functions	*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5FOprivate.h" /* File objects                         */
+#include "H5FSprivate.h" /* File free space                      */
+#include "H5Gprivate.h"  /* Groups 			  	*/
+#include "H5Oprivate.h"  /* Object header messages               */
+#include "H5RCprivate.h" /* Reference counted object functions	*/
 
 /*
  * Feature: Define this constant on the compiler command-line if you want to
  *	    see some debugging messages on the debug stream.
  */
 #ifdef NDEBUG
-#  undef H5F_DEBUG
+#undef H5F_DEBUG
 #endif
 
 /* Superblock status flags */
-#define H5F_SUPER_WRITE_ACCESS          0x01
-#define H5F_SUPER_FILE_OK               0x02
-#define H5F_SUPER_ALL_FLAGS             (H5F_SUPER_WRITE_ACCESS | H5F_SUPER_FILE_OK)
+#define H5F_SUPER_WRITE_ACCESS 0x01
+#define H5F_SUPER_FILE_OK      0x02
+#define H5F_SUPER_ALL_FLAGS    (H5F_SUPER_WRITE_ACCESS | H5F_SUPER_FILE_OK)
 
 /* Mask for removing private file access flags */
-#define H5F_ACC_PUBLIC_FLAGS 	        0x001fu
+#define H5F_ACC_PUBLIC_FLAGS 0x001fu
 
 /* Free space section+aggregator merge flags */
-#define H5F_FS_MERGE_METADATA           0x01    /* Section can merge with metadata aggregator */
-#define H5F_FS_MERGE_RAWDATA            0x02    /* Section can merge with small 'raw' data aggregator */
+#define H5F_FS_MERGE_METADATA 0x01 /* Section can merge with metadata aggregator */
+#define H5F_FS_MERGE_RAWDATA  0x02 /* Section can merge with small 'raw' data aggregator */
 
 /* Macro to abstract checking whether file is using a free space manager */
-#define H5F_HAVE_FREE_SPACE_MANAGER(F)  TRUE    /* Currently always have a free space manager */
+#define H5F_HAVE_FREE_SPACE_MANAGER(F) TRUE /* Currently always have a free space manager */
 
 /* Macros for encoding/decoding superblock */
-#define H5F_MAX_DRVINFOBLOCK_SIZE  1024         /* Maximum size of superblock driver info buffer */
-#define H5F_DRVINFOBLOCK_HDR_SIZE 16            /* Size of superblock driver info header */
+#define H5F_MAX_DRVINFOBLOCK_SIZE 1024 /* Maximum size of superblock driver info buffer */
+#define H5F_DRVINFOBLOCK_HDR_SIZE 16   /* Size of superblock driver info header */
 
 /* Superblock sizes for various versions */
-#define H5F_SIZEOF_CHKSUM 4     /* Checksum size in the file */
+#define H5F_SIZEOF_CHKSUM 4 /* Checksum size in the file */
 
 /* Fixed-size portion at the beginning of all superblocks */
-#define H5F_SUPERBLOCK_FIXED_SIZE ( H5F_SIGNATURE_LEN                   \
-        + 1) /* superblock version */
+#define H5F_SUPERBLOCK_FIXED_SIZE (H5F_SIGNATURE_LEN + 1) /* superblock version */
 
 /* Macros for computing variable-size superblock size */
-#define H5F_SUPERBLOCK_VARLEN_SIZE_COMMON                               \
-        (2  /* freespace, and root group versions */			\
-        + 1 /* reserved */                                              \
-        + 3 /* shared header vers, size of address, size of lengths */  \
-        + 1 /* reserved */                                              \
-        + 4 /* group leaf k, group internal k */                        \
-        + 4) /* consistency flags */
-#define H5F_SUPERBLOCK_VARLEN_SIZE_V0(f)                                \
-        ( H5F_SUPERBLOCK_VARLEN_SIZE_COMMON /* Common variable-length info */ \
-        + H5F_SIZEOF_ADDR(f) /* base address */                         \
-        + H5F_SIZEOF_ADDR(f) /* <unused> */				\
-        + H5F_SIZEOF_ADDR(f) /* EOF address */                          \
-        + H5F_SIZEOF_ADDR(f) /* driver block address */                 \
-        + H5G_SIZEOF_ENTRY(f)) /* root group ptr */
-#define H5F_SUPERBLOCK_VARLEN_SIZE_V1(f)                                \
-        ( H5F_SUPERBLOCK_VARLEN_SIZE_COMMON /* Common variable-length info */ \
-        + 2 /* indexed B-tree internal k */                             \
-        + 2 /* reserved */                                              \
-        + H5F_SIZEOF_ADDR(f) /* base address */                         \
-        + H5F_SIZEOF_ADDR(f) /* <unused> */				\
-        + H5F_SIZEOF_ADDR(f) /* EOF address */                          \
-        + H5F_SIZEOF_ADDR(f) /* driver block address */                 \
-        + H5G_SIZEOF_ENTRY(f)) /* root group ptr */
-#define H5F_SUPERBLOCK_VARLEN_SIZE_V2(f)                                \
-        ( 2 /* size of address, size of lengths */                      \
-        + 1 /* consistency flags */                                     \
-        + H5F_SIZEOF_ADDR(f) /* base address */                         \
-        + H5F_SIZEOF_ADDR(f) /* superblock extension address */         \
-        + H5F_SIZEOF_ADDR(f) /* EOF address */                          \
-        + H5F_SIZEOF_ADDR(f) /* root group object header address */     \
-        + H5F_SIZEOF_CHKSUM) /* superblock checksum (keep this last) */
-#define H5F_SUPERBLOCK_VARLEN_SIZE(v, f) (				\
-        (v == 0 ? H5F_SUPERBLOCK_VARLEN_SIZE_V0(f) : 0)			\
-        + (v == 1 ? H5F_SUPERBLOCK_VARLEN_SIZE_V1(f) : 0)               \
-        + (v == 2 ? H5F_SUPERBLOCK_VARLEN_SIZE_V2(f) : 0))
+#define H5F_SUPERBLOCK_VARLEN_SIZE_COMMON                                                                    \
+    (2    /* freespace, and root group versions */                                                           \
+     + 1  /* reserved */                                                                                     \
+     + 3  /* shared header vers, size of address, size of lengths */                                         \
+     + 1  /* reserved */                                                                                     \
+     + 4  /* group leaf k, group internal k */                                                               \
+     + 4) /* consistency flags */
+#define H5F_SUPERBLOCK_VARLEN_SIZE_V0(f)                                                                     \
+    (H5F_SUPERBLOCK_VARLEN_SIZE_COMMON /* Common variable-length info */                                     \
+     + H5F_SIZEOF_ADDR(f)              /* base address */                                                    \
+     + H5F_SIZEOF_ADDR(f)              /* <unused> */                                                        \
+     + H5F_SIZEOF_ADDR(f)              /* EOF address */                                                     \
+     + H5F_SIZEOF_ADDR(f)              /* driver block address */                                            \
+     + H5G_SIZEOF_ENTRY(f))            /* root group ptr */
+#define H5F_SUPERBLOCK_VARLEN_SIZE_V1(f)                                                                     \
+    (H5F_SUPERBLOCK_VARLEN_SIZE_COMMON /* Common variable-length info */                                     \
+     + 2                               /* indexed B-tree internal k */                                       \
+     + 2                               /* reserved */                                                        \
+     + H5F_SIZEOF_ADDR(f)              /* base address */                                                    \
+     + H5F_SIZEOF_ADDR(f)              /* <unused> */                                                        \
+     + H5F_SIZEOF_ADDR(f)              /* EOF address */                                                     \
+     + H5F_SIZEOF_ADDR(f)              /* driver block address */                                            \
+     + H5G_SIZEOF_ENTRY(f))            /* root group ptr */
+#define H5F_SUPERBLOCK_VARLEN_SIZE_V2(f)                                                                     \
+    (2                    /* size of address, size of lengths */                                             \
+     + 1                  /* consistency flags */                                                            \
+     + H5F_SIZEOF_ADDR(f) /* base address */                                                                 \
+     + H5F_SIZEOF_ADDR(f) /* superblock extension address */                                                 \
+     + H5F_SIZEOF_ADDR(f) /* EOF address */                                                                  \
+     + H5F_SIZEOF_ADDR(f) /* root group object header address */                                             \
+     + H5F_SIZEOF_CHKSUM) /* superblock checksum (keep this last) */
+#define H5F_SUPERBLOCK_VARLEN_SIZE(v, f)                                                                     \
+    ((v == 0 ? H5F_SUPERBLOCK_VARLEN_SIZE_V0(f) : 0) + (v == 1 ? H5F_SUPERBLOCK_VARLEN_SIZE_V1(f) : 0) +     \
+     (v == 2 ? H5F_SUPERBLOCK_VARLEN_SIZE_V2(f) : 0))
 
 /* Total size of superblock, depends on superblock version */
-#define H5F_SUPERBLOCK_SIZE(v, f) ( H5F_SUPERBLOCK_FIXED_SIZE           \
-        + H5F_SUPERBLOCK_VARLEN_SIZE(v, f))
-
+#define H5F_SUPERBLOCK_SIZE(v, f) (H5F_SUPERBLOCK_FIXED_SIZE + H5F_SUPERBLOCK_VARLEN_SIZE(v, f))
 
 /* Forward declaration external file cache struct used below (defined in
  * H5Fefc.c) */
@@ -125,35 +120,35 @@ typedef struct H5F_efc_t H5F_efc_t;
 
 /* Structure for metadata & "small [raw] data" block aggregation fields */
 struct H5F_blk_aggr_t {
-    unsigned long       feature_flag;   /* Feature flag type */
-    hsize_t             alloc_size;     /* Size for allocating new blocks */
-    hsize_t             tot_size;       /* Total amount of bytes aggregated into block */
-    hsize_t             size;           /* Current size of block left */
-    haddr_t             addr;           /* Location of block left */
+    unsigned long feature_flag; /* Feature flag type */
+    hsize_t       alloc_size;   /* Size for allocating new blocks */
+    hsize_t       tot_size;     /* Total amount of bytes aggregated into block */
+    hsize_t       size;         /* Current size of block left */
+    haddr_t       addr;         /* Location of block left */
 };
 
 /* Structure for metadata accumulator fields */
 typedef struct H5F_meta_accum_t {
-    unsigned char      *buf;            /* Buffer to hold the accumulated metadata */
-    haddr_t             loc;            /* File location (offset) of the accumulated metadata */
-    size_t              size;           /* Size of the accumulated metadata buffer used (in bytes) */
-    size_t              alloc_size;     /* Size of the accumulated metadata buffer allocated (in bytes) */
-    size_t              dirty_off;      /* Offset of the dirty region in the accumulator buffer */
-    size_t              dirty_len;      /* Length of the dirty region in the accumulator buffer */
-    hbool_t             dirty;          /* Flag to indicate that the accumulated metadata is dirty */
+    unsigned char *buf;        /* Buffer to hold the accumulated metadata */
+    haddr_t        loc;        /* File location (offset) of the accumulated metadata */
+    size_t         size;       /* Size of the accumulated metadata buffer used (in bytes) */
+    size_t         alloc_size; /* Size of the accumulated metadata buffer allocated (in bytes) */
+    size_t         dirty_off;  /* Offset of the dirty region in the accumulator buffer */
+    size_t         dirty_len;  /* Length of the dirty region in the accumulator buffer */
+    hbool_t        dirty;      /* Flag to indicate that the accumulated metadata is dirty */
 } H5F_meta_accum_t;
 
 /* Enum for free space manager state */
 typedef enum H5F_fs_state_t {
-    H5F_FS_STATE_CLOSED,                /* Free space manager is closed */
-    H5F_FS_STATE_OPEN,                  /* Free space manager has been opened */
-    H5F_FS_STATE_DELETING               /* Free space manager is being deleted */
+    H5F_FS_STATE_CLOSED,  /* Free space manager is closed */
+    H5F_FS_STATE_OPEN,    /* Free space manager has been opened */
+    H5F_FS_STATE_DELETING /* Free space manager is being deleted */
 } H5F_fs_state_t;
 
 /* A record of the mount table */
 typedef struct H5F_mount_t {
-    struct H5G_t	*group;	/* Mount point group held open		*/
-    struct H5F_t	*file;	/* File mounted at that point		*/
+    struct H5G_t *group; /* Mount point group held open		*/
+    struct H5F_t *file;  /* File mounted at that point		*/
 } H5F_mount_t;
 
 /*
@@ -161,26 +156,26 @@ typedef struct H5F_mount_t {
  * to which this table belongs.
  */
 typedef struct H5F_mtab_t {
-    unsigned		nmounts;/* Number of children which are mounted	*/
-    unsigned		nalloc;	/* Number of mount slots allocated	*/
-    H5F_mount_t		*child;	/* An array of mount records		*/
+    unsigned     nmounts; /* Number of children which are mounted	*/
+    unsigned     nalloc;  /* Number of mount slots allocated	*/
+    H5F_mount_t *child;   /* An array of mount records		*/
 } H5F_mtab_t;
 
 /* Structure specifically to store superblock. This was originally
  * maintained entirely within H5F_file_t, but is now extracted
  * here because the superblock is now handled by the cache */
 typedef struct H5F_super_t {
-    H5AC_info_t cache_info;     /* Cache entry information structure          */
-    unsigned    super_vers;     /* Superblock version                         */
-    uint8_t     status_flags;   /* File status flags                          */
-    unsigned    sym_leaf_k;     /* Size of leaves in symbol tables            */
+    H5AC_info_t cache_info;                /* Cache entry information structure          */
+    unsigned    super_vers;                /* Superblock version                         */
+    uint8_t     status_flags;              /* File status flags                          */
+    unsigned    sym_leaf_k;                /* Size of leaves in symbol tables            */
     unsigned    btree_k[H5B_NUM_BTREE_ID]; /* B-tree key values for each type */
-    haddr_t     base_addr;      /* Absolute base address for rel.addrs.       */
-                                /* (superblock for file is at this offset)    */
-    haddr_t     ext_addr;       /* Relative address of superblock extension   */
-    haddr_t     driver_addr;    /* File driver information block address      */
-    haddr_t     root_addr;      /* Root group address                         */
-    H5G_entry_t *root_ent;      /* Root group symbol table entry              */
+    haddr_t     base_addr;                 /* Absolute base address for rel.addrs.       */
+                                           /* (superblock for file is at this offset)    */
+    haddr_t      ext_addr;                 /* Relative address of superblock extension   */
+    haddr_t      driver_addr;              /* File driver information block address      */
+    haddr_t      root_addr;                /* Root group address                         */
+    H5G_entry_t *root_ent;                 /* Root group symbol table entry              */
 } H5F_super_t;
 
 /*
@@ -191,60 +186,59 @@ typedef struct H5F_super_t {
  * pointing to this struct.
  */
 struct H5F_file_t {
-    H5FD_t	*lf; 		/* Lower level file handle for I/O	*/
-    H5F_super_t *sblock;        /* Pointer to (pinned) superblock for file */
-    unsigned	nrefs;		/* Ref count for times file is opened	*/
-    unsigned	flags;		/* Access Permissions for file          */
-    H5F_mtab_t	mtab;		/* File mount table                     */
-    H5F_efc_t   *efc;           /* External file cache                  */
+    H5FD_t *     lf;     /* Lower level file handle for I/O	*/
+    H5F_super_t *sblock; /* Pointer to (pinned) superblock for file */
+    unsigned     nrefs;  /* Ref count for times file is opened	*/
+    unsigned     flags;  /* Access Permissions for file          */
+    H5F_mtab_t   mtab;   /* File mount table                     */
+    H5F_efc_t *  efc;    /* External file cache                  */
 
     /* Cached values from FCPL/superblock */
-    uint8_t	sizeof_addr;	/* Size of addresses in file            */
-    uint8_t	sizeof_size;	/* Size of offsets in file              */
-    haddr_t	sohm_addr;	/* Relative address of shared object header message table */
-    unsigned	sohm_vers;	/* Version of shared message table on disk */
-    unsigned	sohm_nindexes;	/* Number of shared messages indexes in the table */
+    uint8_t       sizeof_addr;   /* Size of addresses in file            */
+    uint8_t       sizeof_size;   /* Size of offsets in file              */
+    haddr_t       sohm_addr;     /* Relative address of shared object header message table */
+    unsigned      sohm_vers;     /* Version of shared message table on disk */
+    unsigned      sohm_nindexes; /* Number of shared messages indexes in the table */
     unsigned long feature_flags; /* VFL Driver feature Flags            */
-    haddr_t	maxaddr;	/* Maximum address for file             */
-
-    H5AC_t      *cache;		/* The object cache	 		*/
-    H5AC_cache_config_t
-		mdc_initCacheCfg; /* initial configuration for the      */
-                                /* metadata cache.  This structure is   */
-                                /* fixed at creation time and should    */
-                                /* not change thereafter.               */
-    hid_t       fcpl_id;	/* File creation property list ID 	*/
-    H5F_close_degree_t fc_degree;   /* File close behavior degree	*/
-    size_t	rdcc_nslots;	/* Size of raw data chunk cache (slots)	*/
-    size_t	rdcc_nbytes;	/* Size of raw data chunk cache	(bytes)	*/
-    double	rdcc_w0;	/* Preempt read chunks first? [0.0..1.0]*/
-    size_t      sieve_buf_size; /* Size of the data sieve buffer allocated (in bytes) */
-    hsize_t	threshold;	/* Threshold for alignment		*/
-    hsize_t	alignment;	/* Alignment				*/
-    unsigned	gc_ref;		/* Garbage-collect references?		*/
-    hbool_t	latest_format;	/* Always use the latest format?	*/
-    hbool_t	store_msg_crt_idx;  /* Store creation index for object header messages?	*/
-    unsigned	ncwfs;		/* Num entries on cwfs list		*/
-    struct H5HG_heap_t **cwfs;	/* Global heap cache			*/
-    struct H5G_t *root_grp;	/* Open root group			*/
-    H5FO_t *open_objs;          /* Open objects in file                 */
-    H5RC_t *grp_btree_shared;   /* Ref-counted group B-tree node info   */
+    haddr_t       maxaddr;       /* Maximum address for file             */
+
+    H5AC_t *            cache;              /* The object cache	 		*/
+    H5AC_cache_config_t mdc_initCacheCfg;   /* initial configuration for the      */
+                                            /* metadata cache.  This structure is   */
+                                            /* fixed at creation time and should    */
+                                            /* not change thereafter.               */
+    hid_t                fcpl_id;           /* File creation property list ID 	*/
+    H5F_close_degree_t   fc_degree;         /* File close behavior degree	*/
+    size_t               rdcc_nslots;       /* Size of raw data chunk cache (slots)	*/
+    size_t               rdcc_nbytes;       /* Size of raw data chunk cache	(bytes)	*/
+    double               rdcc_w0;           /* Preempt read chunks first? [0.0..1.0]*/
+    size_t               sieve_buf_size;    /* Size of the data sieve buffer allocated (in bytes) */
+    hsize_t              threshold;         /* Threshold for alignment		*/
+    hsize_t              alignment;         /* Alignment				*/
+    unsigned             gc_ref;            /* Garbage-collect references?		*/
+    hbool_t              latest_format;     /* Always use the latest format?	*/
+    hbool_t              store_msg_crt_idx; /* Store creation index for object header messages?	*/
+    unsigned             ncwfs;             /* Num entries on cwfs list		*/
+    struct H5HG_heap_t **cwfs;              /* Global heap cache			*/
+    struct H5G_t *       root_grp;          /* Open root group			*/
+    H5FO_t *             open_objs;         /* Open objects in file                 */
+    H5RC_t *             grp_btree_shared;  /* Ref-counted group B-tree node info   */
 
     /* File space allocation information */
-    hbool_t     use_tmp_space;  /* Whether temp. file space allocation is allowed */
-    haddr_t	tmp_addr;       /* Next address to use for temp. space in the file */
-    unsigned fs_aggr_merge[H5FD_MEM_NTYPES];    /* Flags for whether free space can merge with aggregator(s) */
-    H5F_fs_state_t fs_state[H5FD_MEM_NTYPES];   /* State of free space manager for each type */
-    haddr_t fs_addr[H5FD_MEM_NTYPES];   /* Address of free space manager info for each type */
-    H5FS_t *fs_man[H5FD_MEM_NTYPES];    /* Free space manager for each file space type */
-    H5FD_mem_t fs_type_map[H5FD_MEM_NTYPES]; /* Mapping of "real" file space type into tracked type */
-    H5F_blk_aggr_t meta_aggr;   /* Metadata aggregation info */
-                                /* (if aggregating metadata allocations) */
-    H5F_blk_aggr_t sdata_aggr;  /* "Small data" aggregation info */
-                                /* (if aggregating "small data" allocations) */
+    hbool_t  use_tmp_space;                   /* Whether temp. file space allocation is allowed */
+    haddr_t  tmp_addr;                        /* Next address to use for temp. space in the file */
+    unsigned fs_aggr_merge[H5FD_MEM_NTYPES];  /* Flags for whether free space can merge with aggregator(s) */
+    H5F_fs_state_t fs_state[H5FD_MEM_NTYPES]; /* State of free space manager for each type */
+    haddr_t        fs_addr[H5FD_MEM_NTYPES];  /* Address of free space manager info for each type */
+    H5FS_t *       fs_man[H5FD_MEM_NTYPES];   /* Free space manager for each file space type */
+    H5FD_mem_t     fs_type_map[H5FD_MEM_NTYPES]; /* Mapping of "real" file space type into tracked type */
+    H5F_blk_aggr_t meta_aggr;                    /* Metadata aggregation info */
+                                                 /* (if aggregating metadata allocations) */
+    H5F_blk_aggr_t sdata_aggr;                   /* "Small data" aggregation info */
+                                                 /* (if aggregating "small data" allocations) */
 
     /* Metadata accumulator information */
-    H5F_meta_accum_t accum;     /* Metadata accumulator info           	*/
+    H5F_meta_accum_t accum; /* Metadata accumulator info           	*/
 };
 
 /*
@@ -253,19 +247,18 @@ struct H5F_file_t {
  * to shared H5F_file_t structs.
  */
 struct H5F_t {
-    char		*open_name;	/* Name used to open file	*/
-    char		*actual_name;	/* Actual name of the file, after resolving symlinks, etc. */
-    char               	*extpath;       /* Path for searching target external link file */
-    H5F_file_t		*shared;	/* The shared file info		*/
-    unsigned		nopen_objs;	/* Number of open object headers*/
-    H5FO_t              *obj_count;     /* # of time each object is opened through top file structure */
-    hid_t               file_id;        /* ID of this file              */
-    hbool_t             closing;        /* File is in the process of being closed */
-    struct H5F_t        *parent;        /* Parent file that this file is mounted to */
-    unsigned            nmounts;        /* Number of children mounted to this file */
+    char *        open_name;   /* Name used to open file	*/
+    char *        actual_name; /* Actual name of the file, after resolving symlinks, etc. */
+    char *        extpath;     /* Path for searching target external link file */
+    H5F_file_t *  shared;      /* The shared file info		*/
+    unsigned      nopen_objs;  /* Number of open object headers*/
+    H5FO_t *      obj_count;   /* # of time each object is opened through top file structure */
+    hid_t         file_id;     /* ID of this file              */
+    hbool_t       closing;     /* File is in the process of being closed */
+    struct H5F_t *parent;      /* Parent file that this file is mounted to */
+    unsigned      nmounts;     /* Number of children mounted to this file */
 };
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -278,7 +271,6 @@ H5FL_EXTERN(H5F_file_t);
 
 H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1];
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
@@ -286,61 +278,56 @@ H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1];
 /* General routines */
 H5_DLL herr_t H5F_init(void);
 H5_DLL herr_t H5F__term_deprec_interface(void);
-H5F_t *H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id,
-    hid_t fapl_id, H5FD_t *lf);
-herr_t H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush);
+H5F_t *       H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf);
+herr_t        H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush);
 H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing);
 H5_DLL htri_t H5F_is_hdf5(const char *name);
-H5_DLL herr_t H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_list, hbool_t app_ref, size_t *obj_id_count_ptr);
+H5_DLL herr_t H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_list,
+                              hbool_t app_ref, size_t *obj_id_count_ptr);
 H5_DLL herr_t H5F_close(H5F_t *f);
 
 /* File mount related routines */
 H5_DLL herr_t H5F_close_mounts(H5F_t *f);
-H5_DLL int H5F_term_unmount_cb(void *obj_ptr, hid_t obj_id, void *key);
+H5_DLL int    H5F_term_unmount_cb(void *obj_ptr, hid_t obj_id, void *key);
 H5_DLL herr_t H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs);
 
 /* Superblock related routines */
 H5_DLL herr_t H5F_super_init(H5F_t *f, hid_t dxpl_id);
 H5_DLL herr_t H5F_super_read(H5F_t *f, hid_t dxpl_id);
-H5_DLL herr_t H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size,
-    hsize_t *super_ext_info);
+H5_DLL herr_t H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_info);
 H5_DLL herr_t H5F_super_free(H5F_super_t *sblock);
 
 /* Superblock extension related routines */
 H5_DLL herr_t H5F_super_ext_open(H5F_t *f, haddr_t ext_addr, H5O_loc_t *ext_ptr);
 H5_DLL herr_t H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, unsigned id, void *mesg, hbool_t may_create);
-H5_DLL herr_t H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id,
-    hbool_t was_created);
+H5_DLL herr_t H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id, hbool_t was_created);
 
 /* Metadata accumulator routines */
-H5_DLL herr_t H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type,
-    haddr_t addr, size_t size, void *buf);
-H5_DLL herr_t H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type,
-    haddr_t addr, size_t size, const void *buf);
-H5_DLL herr_t H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t type,
-    haddr_t addr, hsize_t size);
+H5_DLL herr_t H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, size_t size,
+                              void *buf);
+H5_DLL herr_t H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, size_t size,
+                               const void *buf);
+H5_DLL herr_t H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, hsize_t size);
 H5_DLL herr_t H5F__accum_flush(const H5F_io_info_t *fio_info);
 H5_DLL herr_t H5F__accum_reset(const H5F_io_info_t *fio_info, hbool_t flush);
 
 /* Shared file list related routines */
 H5_DLL herr_t H5F_sfile_add(H5F_file_t *shared);
-H5_DLL H5F_file_t * H5F_sfile_search(H5FD_t *lf);
-H5_DLL herr_t H5F_sfile_remove(H5F_file_t *shared);
+H5_DLL H5F_file_t *H5F_sfile_search(H5FD_t *lf);
+H5_DLL herr_t      H5F_sfile_remove(H5F_file_t *shared);
 
 /* External file cache routines */
 H5_DLL H5F_efc_t *H5F_efc_create(unsigned max_nfiles);
-H5_DLL unsigned H5F_efc_max_nfiles(H5F_efc_t *efc);
-H5_DLL herr_t H5F_efc_release(H5F_efc_t *efc);
-H5_DLL herr_t H5F_efc_destroy(H5F_efc_t *efc);
-H5_DLL herr_t H5F_efc_try_close(H5F_t *f);
+H5_DLL unsigned   H5F_efc_max_nfiles(H5F_efc_t *efc);
+H5_DLL herr_t     H5F_efc_release(H5F_efc_t *efc);
+H5_DLL herr_t     H5F_efc_destroy(H5F_efc_t *efc);
+H5_DLL herr_t     H5F_efc_try_close(H5F_t *f);
 
 /* Testing functions */
 #ifdef H5F_TESTING
-H5_DLL herr_t H5F_get_sohm_mesg_count_test(hid_t fid, unsigned type_id,
-    size_t *mesg_count);
+H5_DLL herr_t H5F_get_sohm_mesg_count_test(hid_t fid, unsigned type_id, size_t *mesg_count);
 H5_DLL herr_t H5F_check_cached_stab_test(hid_t file_id);
 H5_DLL herr_t H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr);
 #endif /* H5F_TESTING */
 
 #endif /* _H5Fpkg_H */
-
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 4477753..fe510bb 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -22,11 +22,10 @@
 #include "H5Fpublic.h"
 
 /* Public headers needed by this file */
-#include "H5FDpublic.h"        /* File drivers                */
+#include "H5FDpublic.h" /* File drivers                */
 
 /* Private headers needed by this file */
 
-
 /**************************/
 /* Library Private Macros */
 /**************************/
@@ -36,73 +35,92 @@
  * Currently, all file meta-data is little-endian.
  */
 
-#  define INT16ENCODE(p, i) {                              \
-   *(p) = (uint8_t)( (unsigned)(i)     & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); (p)++;              \
-}
-
-#  define UINT16ENCODE(p, i) {                              \
-   *(p) = (uint8_t)( (unsigned)(i)     & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); (p)++;              \
-}
-
-#  define INT32ENCODE(p, i) {                              \
-   *(p) = (uint8_t)( (uint32_t)(i)      & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((uint32_t)(i) >>  8) & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((uint32_t)(i) >> 16) & 0xff); (p)++;              \
-   *(p) = (uint8_t)(((uint32_t)(i) >> 24) & 0xff); (p)++;              \
-}
-
-#  define UINT32ENCODE(p, i) {                              \
-   *(p) = (uint8_t)( (i)        & 0xff); (p)++;                      \
-   *(p) = (uint8_t)(((i) >>  8) & 0xff); (p)++;                      \
-   *(p) = (uint8_t)(((i) >> 16) & 0xff); (p)++;                      \
-   *(p) = (uint8_t)(((i) >> 24) & 0xff); (p)++;                      \
-}
+#define INT16ENCODE(p, i)                                                                                    \
+    {                                                                                                        \
+        *(p) = (uint8_t)((unsigned)(i)&0xff);                                                                \
+        (p)++;                                                                                               \
+        *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff);                                                       \
+        (p)++;                                                                                               \
+    }
+
+#define UINT16ENCODE(p, i)                                                                                   \
+    {                                                                                                        \
+        *(p) = (uint8_t)((unsigned)(i)&0xff);                                                                \
+        (p)++;                                                                                               \
+        *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff);                                                       \
+        (p)++;                                                                                               \
+    }
+
+#define INT32ENCODE(p, i)                                                                                    \
+    {                                                                                                        \
+        *(p) = (uint8_t)((uint32_t)(i)&0xff);                                                                \
+        (p)++;                                                                                               \
+        *(p) = (uint8_t)(((uint32_t)(i) >> 8) & 0xff);                                                       \
+        (p)++;                                                                                               \
+        *(p) = (uint8_t)(((uint32_t)(i) >> 16) & 0xff);                                                      \
+        (p)++;                                                                                               \
+        *(p) = (uint8_t)(((uint32_t)(i) >> 24) & 0xff);                                                      \
+        (p)++;                                                                                               \
+    }
+
+#define UINT32ENCODE(p, i)                                                                                   \
+    {                                                                                                        \
+        *(p) = (uint8_t)((i)&0xff);                                                                          \
+        (p)++;                                                                                               \
+        *(p) = (uint8_t)(((i) >> 8) & 0xff);                                                                 \
+        (p)++;                                                                                               \
+        *(p) = (uint8_t)(((i) >> 16) & 0xff);                                                                \
+        (p)++;                                                                                               \
+        *(p) = (uint8_t)(((i) >> 24) & 0xff);                                                                \
+        (p)++;                                                                                               \
+    }
 
 /* Encode an unsigned integer into a variable-sized buffer */
 /* (Assumes that the high bits of the integer are zero) */
-#  define ENCODE_VAR(p, typ, n, l) {                          \
-   typ _n = (n);                                  \
-   size_t _i;                                      \
-   uint8_t *_p = (uint8_t*)(p);                              \
-                                        \
-   for(_i = 0; _i < l; _i++, _n >>= 8)                          \
-      *_p++ = (uint8_t)(_n & 0xff);                          \
-   (p) = (uint8_t*)(p) + l;                              \
-}
+#define ENCODE_VAR(p, typ, n, l)                                                                             \
+    {                                                                                                        \
+        typ      _n = (n);                                                                                   \
+        size_t   _i;                                                                                         \
+        uint8_t *_p = (uint8_t *)(p);                                                                        \
+                                                                                                             \
+        for (_i = 0; _i < l; _i++, _n >>= 8)                                                                 \
+            *_p++ = (uint8_t)(_n & 0xff);                                                                    \
+        (p) = (uint8_t *)(p) + l;                                                                            \
+    }
 
 /* Encode a 32-bit unsigned integer into a variable-sized buffer */
 /* (Assumes that the high bits of the integer are zero) */
-#  define UINT32ENCODE_VAR(p, n, l)     ENCODE_VAR(p, uint32_t, n, l)
-
-#  define INT64ENCODE(p, n) {                              \
-   int64_t _n = (n);                                  \
-   size_t _i;                                      \
-   uint8_t *_p = (uint8_t*)(p);                              \
-                                        \
-   for (_i = 0; _i < sizeof(int64_t); _i++, _n >>= 8)                  \
-      *_p++ = (uint8_t)(_n & 0xff);                          \
-   for (/*void*/; _i < 8; _i++)                              \
-      *_p++ = (n) < 0 ? 0xff : 0;                          \
-   (p) = (uint8_t*)(p)+8;                              \
-}
-
-#  define UINT64ENCODE(p, n) {                              \
-   uint64_t _n = (n);                                  \
-   size_t _i;                                      \
-   uint8_t *_p = (uint8_t*)(p);                              \
-                                        \
-   for (_i = 0; _i < sizeof(uint64_t); _i++, _n >>= 8)                  \
-      *_p++ = (uint8_t)(_n & 0xff);                          \
-   for (/*void*/; _i < 8; _i++)                              \
-      *_p++ = 0;                                  \
-   (p) = (uint8_t*)(p) + 8;                              \
-}
+#define UINT32ENCODE_VAR(p, n, l) ENCODE_VAR(p, uint32_t, n, l)
+
+#define INT64ENCODE(p, n)                                                                                    \
+    {                                                                                                        \
+        int64_t  _n = (n);                                                                                   \
+        size_t   _i;                                                                                         \
+        uint8_t *_p = (uint8_t *)(p);                                                                        \
+                                                                                                             \
+        for (_i = 0; _i < sizeof(int64_t); _i++, _n >>= 8)                                                   \
+            *_p++ = (uint8_t)(_n & 0xff);                                                                    \
+        for (/*void*/; _i < 8; _i++)                                                                         \
+            *_p++ = (n) < 0 ? 0xff : 0;                                                                      \
+        (p) = (uint8_t *)(p) + 8;                                                                            \
+    }
+
+#define UINT64ENCODE(p, n)                                                                                   \
+    {                                                                                                        \
+        uint64_t _n = (n);                                                                                   \
+        size_t   _i;                                                                                         \
+        uint8_t *_p = (uint8_t *)(p);                                                                        \
+                                                                                                             \
+        for (_i = 0; _i < sizeof(uint64_t); _i++, _n >>= 8)                                                  \
+            *_p++ = (uint8_t)(_n & 0xff);                                                                    \
+        for (/*void*/; _i < 8; _i++)                                                                         \
+            *_p++ = 0;                                                                                       \
+        (p) = (uint8_t *)(p) + 8;                                                                            \
+    }
 
 /* Encode a 64-bit unsigned integer into a variable-sized buffer */
 /* (Assumes that the high bits of the integer are zero) */
-#  define UINT64ENCODE_VAR(p, n, l)     ENCODE_VAR(p, uint64_t, n, l)
+#define UINT64ENCODE_VAR(p, n, l) ENCODE_VAR(p, uint64_t, n, l)
 
 /* DECODE converts little endian bytes pointed by p to integer values and store
  * it in i.  For signed values, need to do sign-extension when converting
@@ -112,73 +130,90 @@
  * correctly even if i is actually a 64bit int like in a Cray.
  */
 
-#  define INT16DECODE(p, i) {                              \
-   (i)    = (int16_t)((*(p) & 0xff));      (p)++;                      \
-   (i) |= (int16_t)(((*(p) & 0xff) << 8) |                                    \
-                   ((*(p) & 0x80) ? ~0xffff : 0x0)); (p)++;              \
-}
-
-#  define UINT16DECODE(p, i) {                              \
-   (i)    = (uint16_t) (*(p) & 0xff);      (p)++;                  \
-   (i) |= (uint16_t)((*(p) & 0xff) << 8); (p)++;                  \
-}
-
-#  define INT32DECODE(p, i) {                              \
-   (i)    = (         *(p) & 0xff);      (p)++;                  \
-   (i) |= ((int32_t)(*(p) & 0xff) <<  8); (p)++;                  \
-   (i) |= ((int32_t)(*(p) & 0xff) << 16); (p)++;                  \
-   (i) |= ((int32_t)(((*(p) & 0xff) << 24) |                                  \
-                   ((*(p) & 0x80) ? ~0xffffffff : 0x0))); (p)++;          \
-}
-
-#  define UINT32DECODE(p, i) {                              \
-   (i)    =  (uint32_t)(*(p) & 0xff);       (p)++;                  \
-   (i) |= ((uint32_t)(*(p) & 0xff) <<  8); (p)++;                  \
-   (i) |= ((uint32_t)(*(p) & 0xff) << 16); (p)++;                  \
-   (i) |= ((uint32_t)(*(p) & 0xff) << 24); (p)++;                  \
-}
+#define INT16DECODE(p, i)                                                                                    \
+    {                                                                                                        \
+        (i) = (int16_t)((*(p)&0xff));                                                                        \
+        (p)++;                                                                                               \
+        (i) |= (int16_t)(((*(p)&0xff) << 8) | ((*(p)&0x80) ? ~0xffff : 0x0));                                \
+        (p)++;                                                                                               \
+    }
+
+#define UINT16DECODE(p, i)                                                                                   \
+    {                                                                                                        \
+        (i) = (uint16_t)(*(p)&0xff);                                                                         \
+        (p)++;                                                                                               \
+        (i) |= (uint16_t)((*(p)&0xff) << 8);                                                                 \
+        (p)++;                                                                                               \
+    }
+
+#define INT32DECODE(p, i)                                                                                    \
+    {                                                                                                        \
+        (i) = (*(p)&0xff);                                                                                   \
+        (p)++;                                                                                               \
+        (i) |= ((int32_t)(*(p)&0xff) << 8);                                                                  \
+        (p)++;                                                                                               \
+        (i) |= ((int32_t)(*(p)&0xff) << 16);                                                                 \
+        (p)++;                                                                                               \
+        (i) |= ((int32_t)(((*(p)&0xff) << 24) | ((*(p)&0x80) ? ~0xffffffff : 0x0)));                         \
+        (p)++;                                                                                               \
+    }
+
+#define UINT32DECODE(p, i)                                                                                   \
+    {                                                                                                        \
+        (i) = (uint32_t)(*(p)&0xff);                                                                         \
+        (p)++;                                                                                               \
+        (i) |= ((uint32_t)(*(p)&0xff) << 8);                                                                 \
+        (p)++;                                                                                               \
+        (i) |= ((uint32_t)(*(p)&0xff) << 16);                                                                \
+        (p)++;                                                                                               \
+        (i) |= ((uint32_t)(*(p)&0xff) << 24);                                                                \
+        (p)++;                                                                                               \
+    }
 
 /* Decode a variable-sized buffer */
 /* (Assumes that the high bits of the integer will be zero) */
-#  define DECODE_VAR(p, n, l) {                              \
-   size_t _i;                                      \
-                                        \
-   n = 0;                                      \
-   (p) += l;                                      \
-   for (_i = 0; _i < l; _i++)                              \
-      n = (n << 8) | *(--p);                              \
-   (p) += l;                                      \
-}
+#define DECODE_VAR(p, n, l)                                                                                  \
+    {                                                                                                        \
+        size_t _i;                                                                                           \
+                                                                                                             \
+        n = 0;                                                                                               \
+        (p) += l;                                                                                            \
+        for (_i = 0; _i < l; _i++)                                                                           \
+            n = (n << 8) | *(--p);                                                                           \
+        (p) += l;                                                                                            \
+    }
 
 /* Decode a variable-sized buffer into a 32-bit unsigned integer */
 /* (Assumes that the high bits of the integer will be zero) */
-#  define UINT32DECODE_VAR(p, n, l)     DECODE_VAR(p, n, l)
-
-#  define INT64DECODE(p, n) {                              \
-   /* WE DON'T CHECK FOR OVERFLOW! */                          \
-   size_t _i;                                      \
-                                        \
-   n = 0;                                      \
-   (p) += 8;                                      \
-   for (_i = 0; _i < sizeof(int64_t); _i++)                          \
-      n = (n << 8) | *(--p);                              \
-   (p) += 8;                                      \
-}
-
-#  define UINT64DECODE(p, n) {                              \
-   /* WE DON'T CHECK FOR OVERFLOW! */                          \
-   size_t _i;                                      \
-                                        \
-   n = 0;                                      \
-   (p) += 8;                                      \
-   for (_i = 0; _i < sizeof(uint64_t); _i++)                      \
-      n = (n << 8) | *(--p);                              \
-   (p) += 8;                                      \
-}
+#define UINT32DECODE_VAR(p, n, l) DECODE_VAR(p, n, l)
+
+#define INT64DECODE(p, n)                                                                                    \
+    {                                                                                                        \
+        /* WE DON'T CHECK FOR OVERFLOW! */                                                                   \
+        size_t _i;                                                                                           \
+                                                                                                             \
+        n = 0;                                                                                               \
+        (p) += 8;                                                                                            \
+        for (_i = 0; _i < sizeof(int64_t); _i++)                                                             \
+            n = (n << 8) | *(--p);                                                                           \
+        (p) += 8;                                                                                            \
+    }
+
+#define UINT64DECODE(p, n)                                                                                   \
+    {                                                                                                        \
+        /* WE DON'T CHECK FOR OVERFLOW! */                                                                   \
+        size_t _i;                                                                                           \
+                                                                                                             \
+        n = 0;                                                                                               \
+        (p) += 8;                                                                                            \
+        for (_i = 0; _i < sizeof(uint64_t); _i++)                                                            \
+            n = (n << 8) | *(--p);                                                                           \
+        (p) += 8;                                                                                            \
+    }
 
 /* Decode a variable-sized buffer into a 64-bit unsigned integer */
 /* (Assumes that the high bits of the integer will be zero) */
-#  define UINT64DECODE_VAR(p, n, l)     DECODE_VAR(p, n, l)
+#define UINT64DECODE_VAR(p, n, l) DECODE_VAR(p, n, l)
 
 /* clang-format off */
 /* Address-related macros */
@@ -214,194 +249,231 @@
 
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5F_PACKAGE
-#define H5F_INTENT(F)           ((F)->shared->flags)
-#define H5F_OPEN_NAME(F)        ((F)->open_name)
-#define H5F_ACTUAL_NAME(F)      ((F)->actual_name)
-#define H5F_EXTPATH(F)          ((F)->extpath)
-#define H5F_SHARED(F)           ((F)->shared)
+#define H5F_INTENT(F)      ((F)->shared->flags)
+#define H5F_OPEN_NAME(F)   ((F)->open_name)
+#define H5F_ACTUAL_NAME(F) ((F)->actual_name)
+#define H5F_EXTPATH(F)     ((F)->extpath)
+#define H5F_SHARED(F)      ((F)->shared)
 #define H5F_SAME_SHARED(F1, F2) ((F1)->shared == (F2)->shared))
-#define H5F_NOPEN_OBJS(F)       ((F)->nopen_objs)
-#define H5F_INCR_NOPEN_OBJS(F)  ((F)->nopen_objs++)
-#define H5F_DECR_NOPEN_OBJS(F)  ((F)->nopen_objs--)
-#define H5F_FILE_ID(F)          ((F)->file_id)
-#define H5F_PARENT(F)           ((F)->parent)
-#define H5F_NMOUNTS(F)          ((F)->nmounts)
-#define H5F_DRIVER_ID(F)        ((F)->shared->lf->driver_id)
-#define H5F_GET_FILENO(F,FILENUM) ((FILENUM) = (F)->shared->lf->fileno)
-#define H5F_HAS_FEATURE(F,FL)   ((F)->shared->lf->feature_flags & (FL))
-#define H5F_BASE_ADDR(F)        ((F)->shared->sblock->base_addr)
-#define H5F_SYM_LEAF_K(F)       ((F)->shared->sblock->sym_leaf_k)
-#define H5F_KVALUE(F,T)         ((F)->shared->sblock->btree_k[(T)->id])
-#define H5F_NREFS(F)        ((F)->shared->nrefs)
-#define H5F_SIZEOF_ADDR(F)      ((F)->shared->sizeof_addr)
-#define H5F_SIZEOF_SIZE(F)      ((F)->shared->sizeof_size)
-#define H5F_SOHM_ADDR(F)        ((F)->shared->sohm_addr)
-#define H5F_SET_SOHM_ADDR(F, A) ((F)->shared->sohm_addr = (A))
-#define H5F_SOHM_VERS(F)        ((F)->shared->sohm_vers)
-#define H5F_SET_SOHM_VERS(F, V) ((F)->shared->sohm_vers = (V))
-#define H5F_SOHM_NINDEXES(F)    ((F)->shared->sohm_nindexes)
-#define H5F_SET_SOHM_NINDEXES(F, N) ((F)->shared->sohm_nindexes = (N))
-#define H5F_FCPL(F)             ((F)->shared->fcpl_id)
-#define H5F_GET_FC_DEGREE(F)    ((F)->shared->fc_degree)
-#define H5F_RDCC_NSLOTS(F)      ((F)->shared->rdcc_nslots)
-#define H5F_RDCC_NBYTES(F)      ((F)->shared->rdcc_nbytes)
-#define H5F_RDCC_W0(F)          ((F)->shared->rdcc_w0)
-#define H5F_SIEVE_BUF_SIZE(F)   ((F)->shared->sieve_buf_size)
-#define H5F_GC_REF(F)           ((F)->shared->gc_ref)
-#define H5F_USE_LATEST_FORMAT(F) ((F)->shared->latest_format)
-#define H5F_STORE_MSG_CRT_IDX(F)    ((F)->shared->store_msg_crt_idx)
-#define H5F_SET_STORE_MSG_CRT_IDX(F, FL)    ((F)->shared->store_msg_crt_idx = (FL))
-#define H5F_GRP_BTREE_SHARED(F) ((F)->shared->grp_btree_shared)
-#define H5F_SET_GRP_BTREE_SHARED(F, RC) (((F)->shared->grp_btree_shared = (RC)) ? SUCCEED : FAIL)
-#define H5F_USE_TMP_SPACE(F)    ((F)->shared->use_tmp_space)
-#define H5F_IS_TMP_ADDR(F, ADDR) (H5F_addr_le((F)->shared->tmp_addr, (ADDR)))
+#define H5F_NOPEN_OBJS(F)                ((F)->nopen_objs)
+#define H5F_INCR_NOPEN_OBJS(F)           ((F)->nopen_objs++)
+#define H5F_DECR_NOPEN_OBJS(F)           ((F)->nopen_objs--)
+#define H5F_FILE_ID(F)                   ((F)->file_id)
+#define H5F_PARENT(F)                    ((F)->parent)
+#define H5F_NMOUNTS(F)                   ((F)->nmounts)
+#define H5F_DRIVER_ID(F)                 ((F)->shared->lf->driver_id)
+#define H5F_GET_FILENO(F, FILENUM)       ((FILENUM) = (F)->shared->lf->fileno)
+#define H5F_HAS_FEATURE(F, FL)           ((F)->shared->lf->feature_flags & (FL))
+#define H5F_BASE_ADDR(F)                 ((F)->shared->sblock->base_addr)
+#define H5F_SYM_LEAF_K(F)                ((F)->shared->sblock->sym_leaf_k)
+#define H5F_KVALUE(F, T)                 ((F)->shared->sblock->btree_k[(T)->id])
+#define H5F_NREFS(F)                     ((F)->shared->nrefs)
+#define H5F_SIZEOF_ADDR(F)               ((F)->shared->sizeof_addr)
+#define H5F_SIZEOF_SIZE(F)               ((F)->shared->sizeof_size)
+#define H5F_SOHM_ADDR(F)                 ((F)->shared->sohm_addr)
+#define H5F_SET_SOHM_ADDR(F, A)          ((F)->shared->sohm_addr = (A))
+#define H5F_SOHM_VERS(F)                 ((F)->shared->sohm_vers)
+#define H5F_SET_SOHM_VERS(F, V)          ((F)->shared->sohm_vers = (V))
+#define H5F_SOHM_NINDEXES(F)             ((F)->shared->sohm_nindexes)
+#define H5F_SET_SOHM_NINDEXES(F, N)      ((F)->shared->sohm_nindexes = (N))
+#define H5F_FCPL(F)                      ((F)->shared->fcpl_id)
+#define H5F_GET_FC_DEGREE(F)             ((F)->shared->fc_degree)
+#define H5F_RDCC_NSLOTS(F)               ((F)->shared->rdcc_nslots)
+#define H5F_RDCC_NBYTES(F)               ((F)->shared->rdcc_nbytes)
+#define H5F_RDCC_W0(F)                   ((F)->shared->rdcc_w0)
+#define H5F_SIEVE_BUF_SIZE(F)            ((F)->shared->sieve_buf_size)
+#define H5F_GC_REF(F)                    ((F)->shared->gc_ref)
+#define H5F_USE_LATEST_FORMAT(F)         ((F)->shared->latest_format)
+#define H5F_STORE_MSG_CRT_IDX(F)         ((F)->shared->store_msg_crt_idx)
+#define H5F_SET_STORE_MSG_CRT_IDX(F, FL) ((F)->shared->store_msg_crt_idx = (FL))
+#define H5F_GRP_BTREE_SHARED(F)          ((F)->shared->grp_btree_shared)
+#define H5F_SET_GRP_BTREE_SHARED(F, RC)  (((F)->shared->grp_btree_shared = (RC)) ? SUCCEED : FAIL)
+#define H5F_USE_TMP_SPACE(F)             ((F)->shared->use_tmp_space)
+#define H5F_IS_TMP_ADDR(F, ADDR)         (H5F_addr_le((F)->shared->tmp_addr, (ADDR)))
 #else /* H5F_PACKAGE */
-#define H5F_INTENT(F)           (H5F_get_intent(F))
-#define H5F_OPEN_NAME(F)        (H5F_get_open_name(F))
-#define H5F_ACTUAL_NAME(F)      (H5F_get_actual_name(F))
-#define H5F_EXTPATH(F)          (H5F_get_extpath(F))
-#define H5F_SHARED(F)           (H5F_get_shared(F))
-#define H5F_SAME_SHARED(F1, F2) (H5F_same_shared((F1), (F2)))
-#define H5F_NOPEN_OBJS(F)       (H5F_get_nopen_objs(F))
-#define H5F_INCR_NOPEN_OBJS(F)  (H5F_incr_nopen_objs(F))
-#define H5F_DECR_NOPEN_OBJS(F)  (H5F_decr_nopen_objs(F))
-#define H5F_FILE_ID(F)          (H5F_get_file_id(F))
-#define H5F_PARENT(F)           (H5F_get_parent(F))
-#define H5F_NMOUNTS(F)          (H5F_get_nmounts(F))
-#define H5F_DRIVER_ID(F)        (H5F_get_driver_id(F))
-#define H5F_GET_FILENO(F,FILENUM) (H5F_get_fileno((F), &(FILENUM)))
-#define H5F_HAS_FEATURE(F,FL)   (H5F_has_feature(F,FL))
-#define H5F_BASE_ADDR(F)        (H5F_get_base_addr(F))
-#define H5F_SYM_LEAF_K(F)       (H5F_sym_leaf_k(F))
-#define H5F_KVALUE(F,T)         (H5F_Kvalue(F,T))
-#define H5F_NREFS(F)        (H5F_get_nrefs(F))
-#define H5F_SIZEOF_ADDR(F)      (H5F_sizeof_addr(F))
-#define H5F_SIZEOF_SIZE(F)      (H5F_sizeof_size(F))
-#define H5F_SOHM_ADDR(F)        (H5F_get_sohm_addr(F))
-#define H5F_SET_SOHM_ADDR(F, A) (H5F_set_sohm_addr((F), (A)))
-#define H5F_SOHM_VERS(F)        (H5F_get_sohm_vers(F))
-#define H5F_SET_SOHM_VERS(F, V) (H5F_set_sohm_vers((F), (V)))
-#define H5F_SOHM_NINDEXES(F)    (H5F_get_sohm_nindexes(F))
-#define H5F_SET_SOHM_NINDEXES(F, N) (H5F_set_sohm_nindexes((F), (N)))
-#define H5F_FCPL(F)             (H5F_get_fcpl(F))
-#define H5F_GET_FC_DEGREE(F)    (H5F_get_fc_degree(F))
-#define H5F_RDCC_NSLOTS(F)      (H5F_rdcc_nslots(F))
-#define H5F_RDCC_NBYTES(F)      (H5F_rdcc_nbytes(F))
-#define H5F_RDCC_W0(F)          (H5F_rdcc_w0(F))
-#define H5F_SIEVE_BUF_SIZE(F)   (H5F_sieve_buf_size(F))
-#define H5F_GC_REF(F)           (H5F_gc_ref(F))
-#define H5F_USE_LATEST_FORMAT(F) (H5F_use_latest_format(F))
-#define H5F_STORE_MSG_CRT_IDX(F) (H5F_store_msg_crt_idx(F))
-#define H5F_SET_STORE_MSG_CRT_IDX(F, FL)    (H5F_set_store_msg_crt_idx((F), (FL)))
-#define H5F_GRP_BTREE_SHARED(F) (H5F_grp_btree_shared(F))
-#define H5F_SET_GRP_BTREE_SHARED(F, RC) (H5F_set_grp_btree_shared((F), (RC)))
-#define H5F_USE_TMP_SPACE(F)    (H5F_use_tmp_space(F))
-#define H5F_IS_TMP_ADDR(F, ADDR) (H5F_is_tmp_addr((F), (ADDR)))
+#define H5F_INTENT(F)                    (H5F_get_intent(F))
+#define H5F_OPEN_NAME(F)                 (H5F_get_open_name(F))
+#define H5F_ACTUAL_NAME(F)               (H5F_get_actual_name(F))
+#define H5F_EXTPATH(F)                   (H5F_get_extpath(F))
+#define H5F_SHARED(F)                    (H5F_get_shared(F))
+#define H5F_SAME_SHARED(F1, F2)          (H5F_same_shared((F1), (F2)))
+#define H5F_NOPEN_OBJS(F)                (H5F_get_nopen_objs(F))
+#define H5F_INCR_NOPEN_OBJS(F)           (H5F_incr_nopen_objs(F))
+#define H5F_DECR_NOPEN_OBJS(F)           (H5F_decr_nopen_objs(F))
+#define H5F_FILE_ID(F)                   (H5F_get_file_id(F))
+#define H5F_PARENT(F)                    (H5F_get_parent(F))
+#define H5F_NMOUNTS(F)                   (H5F_get_nmounts(F))
+#define H5F_DRIVER_ID(F)                 (H5F_get_driver_id(F))
+#define H5F_GET_FILENO(F, FILENUM)       (H5F_get_fileno((F), &(FILENUM)))
+#define H5F_HAS_FEATURE(F, FL)           (H5F_has_feature(F, FL))
+#define H5F_BASE_ADDR(F)                 (H5F_get_base_addr(F))
+#define H5F_SYM_LEAF_K(F)                (H5F_sym_leaf_k(F))
+#define H5F_KVALUE(F, T)                 (H5F_Kvalue(F, T))
+#define H5F_NREFS(F)                     (H5F_get_nrefs(F))
+#define H5F_SIZEOF_ADDR(F)               (H5F_sizeof_addr(F))
+#define H5F_SIZEOF_SIZE(F)               (H5F_sizeof_size(F))
+#define H5F_SOHM_ADDR(F)                 (H5F_get_sohm_addr(F))
+#define H5F_SET_SOHM_ADDR(F, A)          (H5F_set_sohm_addr((F), (A)))
+#define H5F_SOHM_VERS(F)                 (H5F_get_sohm_vers(F))
+#define H5F_SET_SOHM_VERS(F, V)          (H5F_set_sohm_vers((F), (V)))
+#define H5F_SOHM_NINDEXES(F)             (H5F_get_sohm_nindexes(F))
+#define H5F_SET_SOHM_NINDEXES(F, N)      (H5F_set_sohm_nindexes((F), (N)))
+#define H5F_FCPL(F)                      (H5F_get_fcpl(F))
+#define H5F_GET_FC_DEGREE(F)             (H5F_get_fc_degree(F))
+#define H5F_RDCC_NSLOTS(F)               (H5F_rdcc_nslots(F))
+#define H5F_RDCC_NBYTES(F)               (H5F_rdcc_nbytes(F))
+#define H5F_RDCC_W0(F)                   (H5F_rdcc_w0(F))
+#define H5F_SIEVE_BUF_SIZE(F)            (H5F_sieve_buf_size(F))
+#define H5F_GC_REF(F)                    (H5F_gc_ref(F))
+#define H5F_USE_LATEST_FORMAT(F)         (H5F_use_latest_format(F))
+#define H5F_STORE_MSG_CRT_IDX(F)         (H5F_store_msg_crt_idx(F))
+#define H5F_SET_STORE_MSG_CRT_IDX(F, FL) (H5F_set_store_msg_crt_idx((F), (FL)))
+#define H5F_GRP_BTREE_SHARED(F)          (H5F_grp_btree_shared(F))
+#define H5F_SET_GRP_BTREE_SHARED(F, RC)  (H5F_set_grp_btree_shared((F), (RC)))
+#define H5F_USE_TMP_SPACE(F)             (H5F_use_tmp_space(F))
+#define H5F_IS_TMP_ADDR(F, ADDR)         (H5F_is_tmp_addr((F), (ADDR)))
 #endif /* H5F_PACKAGE */
 
-
 /* Macros to encode/decode offset/length's for storing in the file */
-#define H5F_ENCODE_OFFSET(f,p,o) switch(H5F_SIZEOF_ADDR(f)) {              \
-    case 4: UINT32ENCODE(p,o); break;                          \
-    case 8: UINT64ENCODE(p,o); break;                          \
-    case 2: UINT16ENCODE(p,o); break;                          \
-}
-
-#define H5F_DECODE_OFFSET(f,p,o) switch (H5F_SIZEOF_ADDR (f)) {              \
-    case 4: UINT32DECODE(p, o); break;                          \
-    case 8: UINT64DECODE(p, o); break;                          \
-    case 2: UINT16DECODE(p, o); break;                          \
-}
-
-#define H5F_ENCODE_LENGTH_LEN(p,l,s) switch(s) {                        \
-    case 4: UINT32ENCODE(p,l); break;                          \
-    case 8: UINT64ENCODE(p,l); break;                          \
-    case 2: UINT16ENCODE(p,l); break;                          \
-    default: HDassert("bad sizeof size" && 0);                      \
-}
-
-#define H5F_ENCODE_LENGTH(f,p,l) H5F_ENCODE_LENGTH_LEN(p,l,H5F_SIZEOF_SIZE(f))
-
-#define H5F_DECODE_LENGTH_LEN(p,l,s) switch(s) {                      \
-    case 4: UINT32DECODE(p,l); break;                          \
-    case 8: UINT64DECODE(p,l); break;                          \
-    case 2: UINT16DECODE(p,l); break;                          \
-    default: HDassert("bad sizeof size" && 0);                      \
-}
-
-#define H5F_DECODE_LENGTH(f,p,l) H5F_DECODE_LENGTH_LEN(p,l,H5F_SIZEOF_SIZE(f))
+#define H5F_ENCODE_OFFSET(f, p, o)                                                                           \
+    switch (H5F_SIZEOF_ADDR(f)) {                                                                            \
+        case 4:                                                                                              \
+            UINT32ENCODE(p, o);                                                                              \
+            break;                                                                                           \
+        case 8:                                                                                              \
+            UINT64ENCODE(p, o);                                                                              \
+            break;                                                                                           \
+        case 2:                                                                                              \
+            UINT16ENCODE(p, o);                                                                              \
+            break;                                                                                           \
+    }
+
+#define H5F_DECODE_OFFSET(f, p, o)                                                                           \
+    switch (H5F_SIZEOF_ADDR(f)) {                                                                            \
+        case 4:                                                                                              \
+            UINT32DECODE(p, o);                                                                              \
+            break;                                                                                           \
+        case 8:                                                                                              \
+            UINT64DECODE(p, o);                                                                              \
+            break;                                                                                           \
+        case 2:                                                                                              \
+            UINT16DECODE(p, o);                                                                              \
+            break;                                                                                           \
+    }
+
+#define H5F_ENCODE_LENGTH_LEN(p, l, s)                                                                       \
+    switch (s) {                                                                                             \
+        case 4:                                                                                              \
+            UINT32ENCODE(p, l);                                                                              \
+            break;                                                                                           \
+        case 8:                                                                                              \
+            UINT64ENCODE(p, l);                                                                              \
+            break;                                                                                           \
+        case 2:                                                                                              \
+            UINT16ENCODE(p, l);                                                                              \
+            break;                                                                                           \
+        default:                                                                                             \
+            HDassert("bad sizeof size" && 0);                                                                \
+    }
+
+#define H5F_ENCODE_LENGTH(f, p, l) H5F_ENCODE_LENGTH_LEN(p, l, H5F_SIZEOF_SIZE(f))
+
+#define H5F_DECODE_LENGTH_LEN(p, l, s)                                                                       \
+    switch (s) {                                                                                             \
+        case 4:                                                                                              \
+            UINT32DECODE(p, l);                                                                              \
+            break;                                                                                           \
+        case 8:                                                                                              \
+            UINT64DECODE(p, l);                                                                              \
+            break;                                                                                           \
+        case 2:                                                                                              \
+            UINT16DECODE(p, l);                                                                              \
+            break;                                                                                           \
+        default:                                                                                             \
+            HDassert("bad sizeof size" && 0);                                                                \
+    }
+
+#define H5F_DECODE_LENGTH(f, p, l) H5F_DECODE_LENGTH_LEN(p, l, H5F_SIZEOF_SIZE(f))
 
 /*
  * Macros that check for overflows.  These are somewhat dangerous to fiddle
  * with.
  */
 #if (H5_SIZEOF_SIZE_T >= H5_SIZEOF_OFF_T)
-#   define H5F_OVERFLOW_SIZET2OFFT(X)                          \
-    ((size_t)(X)>=(size_t)((size_t)1<<(8*sizeof(off_t)-1)))
+#define H5F_OVERFLOW_SIZET2OFFT(X) ((size_t)(X) >= (size_t)((size_t)1 << (8 * sizeof(off_t) - 1)))
 #else
-#   define H5F_OVERFLOW_SIZET2OFFT(X) 0
+#define H5F_OVERFLOW_SIZET2OFFT(X) 0
 #endif
 #if (H5_SIZEOF_HSIZE_T >= H5_SIZEOF_OFF_T)
-#   define H5F_OVERFLOW_HSIZET2OFFT(X)                          \
-    ((hsize_t)(X)>=(hsize_t)((hsize_t)1<<(8*sizeof(off_t)-1)))
+#define H5F_OVERFLOW_HSIZET2OFFT(X) ((hsize_t)(X) >= (hsize_t)((hsize_t)1 << (8 * sizeof(off_t) - 1)))
 #else
-#   define H5F_OVERFLOW_HSIZET2OFFT(X) 0
+#define H5F_OVERFLOW_HSIZET2OFFT(X) 0
 #endif
 
 /* Sizes of object addresses & sizes in the file (in bytes) */
-#define H5F_OBJ_ADDR_SIZE   sizeof(haddr_t)
-#define H5F_OBJ_SIZE_SIZE   sizeof(hsize_t)
+#define H5F_OBJ_ADDR_SIZE sizeof(haddr_t)
+#define H5F_OBJ_SIZE_SIZE sizeof(hsize_t)
 
 /* File-wide default character encoding can not yet be set via the file
  * creation property list and is always ASCII. */
 #define H5F_DEFAULT_CSET H5T_CSET_ASCII
 
 /* ========= File Creation properties ============ */
-#define H5F_CRT_USER_BLOCK_NAME      "block_size"       /* Size of the file user block in bytes */
-#define H5F_CRT_SYM_LEAF_NAME        "symbol_leaf"      /* 1/2 rank for symbol table leaf nodes */
-#define H5F_CRT_SYM_LEAF_DEF         4
-#define H5F_CRT_BTREE_RANK_NAME      "btree_rank"       /* 1/2 rank for btree internal nodes    */
-#define H5F_CRT_ADDR_BYTE_NUM_NAME   "addr_byte_num"    /* Byte number in an address            */
-#define H5F_CRT_OBJ_BYTE_NUM_NAME    "obj_byte_num"     /* Byte number for object size          */
-#define H5F_CRT_SUPER_VERS_NAME      "super_version"    /* Version number of the superblock     */
+#define H5F_CRT_USER_BLOCK_NAME    "block_size"  /* Size of the file user block in bytes */
+#define H5F_CRT_SYM_LEAF_NAME      "symbol_leaf" /* 1/2 rank for symbol table leaf nodes */
+#define H5F_CRT_SYM_LEAF_DEF       4
+#define H5F_CRT_BTREE_RANK_NAME    "btree_rank"    /* 1/2 rank for btree internal nodes    */
+#define H5F_CRT_ADDR_BYTE_NUM_NAME "addr_byte_num" /* Byte number in an address            */
+#define H5F_CRT_OBJ_BYTE_NUM_NAME  "obj_byte_num"  /* Byte number for object size          */
+#define H5F_CRT_SUPER_VERS_NAME    "super_version" /* Version number of the superblock     */
 /* Number of shared object header message indexes */
-#define H5F_CRT_SHMSG_NINDEXES_NAME  "num_shmsg_indexes"
+#define H5F_CRT_SHMSG_NINDEXES_NAME    "num_shmsg_indexes"
 #define H5F_CRT_SHMSG_INDEX_TYPES_NAME "shmsg_message_types" /* Types of message in each index */
 /* Minimum size of messages in each index */
 #define H5F_CRT_SHMSG_INDEX_MINSIZE_NAME "shmsg_message_minsize"
-#define H5F_CRT_SHMSG_LIST_MAX_NAME  "shmsg_list_max"   /* Shared message list maximum size */
-#define H5F_CRT_SHMSG_BTREE_MIN_NAME "shmsg_btree_min"  /* Shared message B-tree minimum size */
-
-
+#define H5F_CRT_SHMSG_LIST_MAX_NAME      "shmsg_list_max"  /* Shared message list maximum size */
+#define H5F_CRT_SHMSG_BTREE_MIN_NAME     "shmsg_btree_min" /* Shared message B-tree minimum size */
 
 /* ========= File Access properties ============ */
-#define H5F_ACS_META_CACHE_INIT_CONFIG_NAME    "mdc_initCacheCfg" /* Initial metadata cache resize configuration */
-#define H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME       "rdcc_nslots"   /* Size of raw data chunk cache(slots) */
-#define H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME       "rdcc_nbytes"   /* Size of raw data chunk cache(bytes) */
-#define H5F_ACS_PREEMPT_READ_CHUNKS_NAME        "rdcc_w0"       /* Preemption read chunks first */
-#define H5F_ACS_ALIGN_THRHD_NAME                "threshold"     /* Threshold for alignment */
-#define H5F_ACS_ALIGN_NAME                      "align"         /* Alignment */
-#define H5F_ACS_META_BLOCK_SIZE_NAME            "meta_block_size" /* Minimum metadata allocation block size (when aggregating metadata allocations) */
-#define H5F_ACS_SIEVE_BUF_SIZE_NAME             "sieve_buf_size" /* Maximum sieve buffer size (when data sieving is allowed by file driver) */
-#define H5F_ACS_SDATA_BLOCK_SIZE_NAME           "sdata_block_size" /* Minimum "small data" allocation block size (when aggregating "small" raw data allocations) */
-#define H5F_ACS_GARBG_COLCT_REF_NAME            "gc_ref"        /* Garbage-collect references */
-#define H5F_ACS_FILE_DRV_ID_NAME                "driver_id"     /* File driver ID */
-#define H5F_ACS_FILE_DRV_INFO_NAME              "driver_info"   /* File driver info */
-#define H5F_ACS_CLOSE_DEGREE_NAME        "close_degree"  /* File close degree */
-#define H5F_ACS_FAMILY_OFFSET_NAME              "family_offset" /* Offset position in file for family file driver */
-#define H5F_ACS_FAMILY_NEWSIZE_NAME             "family_newsize" /* New member size of family driver.  (private property only used by h5repart) */
-#define H5F_ACS_FAMILY_TO_SEC2_NAME             "family_to_sec2" /* Whether to convert family to sec2 driver.  (private property only used by h5repart) */
-#define H5F_ACS_MULTI_TYPE_NAME                 "multi_type"    /* Data type in multi file driver */
-#define H5F_ACS_LATEST_FORMAT_NAME              "latest_format" /* 'Use latest format version' flag */
-#define H5F_ACS_WANT_POSIX_FD_NAME              "want_posix_fd" /* Internal: query the file descriptor from the core VFD, instead of the memory address */
-#define H5F_ACS_EFC_SIZE_NAME                   "efc_size"      /* Size of external file cache */
-#define H5F_ACS_FILE_IMAGE_INFO_NAME            "file_image_info" /* struct containing initial file image and callback info */
-#define H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME       "core_write_tracking_flag" /* Whether or not core VFD backing store write tracking is enabled */
-#define H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME  "core_write_tracking_page_size" /* The page size in kiB when core VFD write tracking is enabled */
+#define H5F_ACS_META_CACHE_INIT_CONFIG_NAME                                                                  \
+    "mdc_initCacheCfg"                                  /* Initial metadata cache resize configuration */
+#define H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME "rdcc_nslots" /* Size of raw data chunk cache(slots) */
+#define H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME "rdcc_nbytes" /* Size of raw data chunk cache(bytes) */
+#define H5F_ACS_PREEMPT_READ_CHUNKS_NAME  "rdcc_w0"     /* Preemption read chunks first */
+#define H5F_ACS_ALIGN_THRHD_NAME          "threshold"   /* Threshold for alignment */
+#define H5F_ACS_ALIGN_NAME                "align"       /* Alignment */
+#define H5F_ACS_META_BLOCK_SIZE_NAME                                                                         \
+    "meta_block_size" /* Minimum metadata allocation block size (when aggregating metadata allocations) */
+#define H5F_ACS_SIEVE_BUF_SIZE_NAME                                                                          \
+    "sieve_buf_size" /* Maximum sieve buffer size (when data sieving is allowed by file driver) */
+#define H5F_ACS_SDATA_BLOCK_SIZE_NAME                                                                        \
+    "sdata_block_size" /* Minimum "small data" allocation block size (when aggregating "small" raw data      \
+                          allocations) */
+#define H5F_ACS_GARBG_COLCT_REF_NAME "gc_ref"        /* Garbage-collect references */
+#define H5F_ACS_FILE_DRV_ID_NAME     "driver_id"     /* File driver ID */
+#define H5F_ACS_FILE_DRV_INFO_NAME   "driver_info"   /* File driver info */
+#define H5F_ACS_CLOSE_DEGREE_NAME    "close_degree"  /* File close degree */
+#define H5F_ACS_FAMILY_OFFSET_NAME   "family_offset" /* Offset position in file for family file driver */
+#define H5F_ACS_FAMILY_NEWSIZE_NAME                                                                          \
+    "family_newsize" /* New member size of family driver.  (private property only used by h5repart) */
+#define H5F_ACS_FAMILY_TO_SEC2_NAME                                                                          \
+    "family_to_sec2" /* Whether to convert family to sec2 driver.  (private property only used by h5repart)  \
+                      */
+#define H5F_ACS_MULTI_TYPE_NAME    "multi_type"    /* Data type in multi file driver */
+#define H5F_ACS_LATEST_FORMAT_NAME "latest_format" /* 'Use latest format version' flag */
+#define H5F_ACS_WANT_POSIX_FD_NAME                                                                           \
+    "want_posix_fd" /* Internal: query the file descriptor from the core VFD, instead of the memory address  \
+                     */
+#define H5F_ACS_EFC_SIZE_NAME "efc_size" /* Size of external file cache */
+#define H5F_ACS_FILE_IMAGE_INFO_NAME                                                                         \
+    "file_image_info" /* struct containing initial file image and callback info */
+#define H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME                                                                \
+    "core_write_tracking_flag" /* Whether or not core VFD backing store write tracking is enabled */
+#define H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME                                                           \
+    "core_write_tracking_page_size" /* The page size in kiB when core VFD write tracking is enabled */
 
 /* ======================== File Mount properties ====================*/
-#define H5F_MNT_SYM_LOCAL_NAME         "local"                 /* Whether absolute symlinks local to file. */
-
+#define H5F_MNT_SYM_LOCAL_NAME "local" /* Whether absolute symlinks local to file. */
 
 #ifdef H5_HAVE_PARALLEL
 /* Which process writes metadata */
@@ -409,75 +481,75 @@
 #endif /* H5_HAVE_PARALLEL */
 
 /* Define the HDF5 file signature */
-#define H5F_SIGNATURE      "\211HDF\r\n\032\n"
+#define H5F_SIGNATURE     "\211HDF\r\n\032\n"
 #define H5F_SIGNATURE_LEN 8
 
 /* Version #'s of the major components of the file format */
-#define HDF5_SUPERBLOCK_VERSION_DEF    0    /* The default super block format      */
-#define HDF5_SUPERBLOCK_VERSION_1    1    /* Version with non-default B-tree 'K' value */
-#define HDF5_SUPERBLOCK_VERSION_2    2    /* Revised version with superblock extension and checksum */
-#define HDF5_SUPERBLOCK_VERSION_LATEST    HDF5_SUPERBLOCK_VERSION_2    /* The maximum super block format    */
-#define HDF5_FREESPACE_VERSION            0    /* of the Free-Space Info      */
-#define HDF5_OBJECTDIR_VERSION            0    /* of the Object Directory format */
-#define HDF5_SHAREDHEADER_VERSION       0    /* of the Shared-Header Info      */
-#define HDF5_DRIVERINFO_VERSION_0       0    /* of the Driver Information Block*/
+#define HDF5_SUPERBLOCK_VERSION_DEF    0 /* The default super block format      */
+#define HDF5_SUPERBLOCK_VERSION_1      1 /* Version with non-default B-tree 'K' value */
+#define HDF5_SUPERBLOCK_VERSION_2      2 /* Revised version with superblock extension and checksum */
+#define HDF5_SUPERBLOCK_VERSION_LATEST HDF5_SUPERBLOCK_VERSION_2 /* The maximum super block format    */
+#define HDF5_FREESPACE_VERSION         0                         /* of the Free-Space Info      */
+#define HDF5_OBJECTDIR_VERSION         0                         /* of the Object Directory format */
+#define HDF5_SHAREDHEADER_VERSION      0                         /* of the Shared-Header Info      */
+#define HDF5_DRIVERINFO_VERSION_0      0                         /* of the Driver Information Block*/
 
 /* B-tree internal 'K' values */
-#define HDF5_BTREE_SNODE_IK_DEF         16
-#define HDF5_BTREE_CHUNK_IK_DEF         32      /* Note! this value is assumed
-                                                    to be 32 for version 0
-                                                    of the superblock and
-                                                    if it is changed, the code
-                                                    must compensate. -QAK
-                                                 */
-#define HDF5_BTREE_IK_MAX_ENTRIES       65536     /* 2^16 - 2 bytes for storing entries (children) */
-                        /* See format specification on version 1 B-trees */
+#define HDF5_BTREE_SNODE_IK_DEF 16
+#define HDF5_BTREE_CHUNK_IK_DEF                                                                              \
+    32                                  /* Note! this value is assumed                                       \
+                                            to be 32 for version 0                                           \
+                                            of the superblock and                                            \
+                                            if it is changed, the code                                       \
+                                            must compensate. -QAK                                            \
+                                         */
+#define HDF5_BTREE_IK_MAX_ENTRIES 65536 /* 2^16 - 2 bytes for storing entries (children) */
+                                        /* See format specification on version 1 B-trees */
 
 /* Macros to define signatures of all objects in the file */
 
 /* Size of signature information (on disk) */
 /* (all on-disk signatures should be this length) */
-#define H5_SIZEOF_MAGIC               4
+#define H5_SIZEOF_MAGIC 4
 
 /* v1 B-tree node signature */
-#define H5B_MAGIC                    "TREE"
+#define H5B_MAGIC "TREE"
 
 /* v2 B-tree signatures */
-#define H5B2_HDR_MAGIC                  "BTHD"          /* Header */
-#define H5B2_INT_MAGIC                  "BTIN"          /* Internal node */
-#define H5B2_LEAF_MAGIC                 "BTLF"          /* Leaf node */
+#define H5B2_HDR_MAGIC  "BTHD" /* Header */
+#define H5B2_INT_MAGIC  "BTIN" /* Internal node */
+#define H5B2_LEAF_MAGIC "BTLF" /* Leaf node */
 
 /* Extensible array signatures */
-#define H5EA_HDR_MAGIC                  "EAHD"          /* Header */
-#define H5EA_IBLOCK_MAGIC               "EAIB"          /* Index block */
-#define H5EA_DBLOCK_MAGIC               "EADB"          /* Data block */
+#define H5EA_HDR_MAGIC    "EAHD" /* Header */
+#define H5EA_IBLOCK_MAGIC "EAIB" /* Index block */
+#define H5EA_DBLOCK_MAGIC "EADB" /* Data block */
 
 /* Free space signatures */
-#define H5FS_HDR_MAGIC                  "FSHD"          /* Header */
-#define H5FS_SINFO_MAGIC                "FSSE"          /* Serialized sections */
+#define H5FS_HDR_MAGIC   "FSHD" /* Header */
+#define H5FS_SINFO_MAGIC "FSSE" /* Serialized sections */
 
 /* Symbol table node signature */
-#define H5G_NODE_MAGIC                  "SNOD"
+#define H5G_NODE_MAGIC "SNOD"
 
 /* Fractal heap signatures */
-#define H5HF_HDR_MAGIC                  "FRHP"          /* Header */
-#define H5HF_IBLOCK_MAGIC               "FHIB"          /* Indirect block */
-#define H5HF_DBLOCK_MAGIC               "FHDB"          /* Direct block */
+#define H5HF_HDR_MAGIC    "FRHP" /* Header */
+#define H5HF_IBLOCK_MAGIC "FHIB" /* Indirect block */
+#define H5HF_DBLOCK_MAGIC "FHDB" /* Direct block */
 
 /* Global heap signature */
-#define H5HG_MAGIC                    "GCOL"
+#define H5HG_MAGIC "GCOL"
 
 /* Local heap signature */
-#define H5HL_MAGIC                      "HEAP"
+#define H5HL_MAGIC "HEAP"
 
 /* Object header signatures */
-#define H5O_HDR_MAGIC                   "OHDR"          /* Header */
-#define H5O_CHK_MAGIC                   "OCHK"          /* Continuation chunk */
+#define H5O_HDR_MAGIC "OHDR" /* Header */
+#define H5O_CHK_MAGIC "OCHK" /* Continuation chunk */
 
 /* Shared Message signatures */
-#define H5SM_TABLE_MAGIC                "SMTB"          /* Shared Message Table */
-#define H5SM_LIST_MAGIC                 "SMLI"          /* Shared Message List */
-
+#define H5SM_TABLE_MAGIC "SMTB" /* Shared Message Table */
+#define H5SM_LIST_MAGIC  "SMLI" /* Shared Message List */
 
 /****************************/
 /* Library Private Typedefs */
@@ -493,7 +565,7 @@ struct H5P_genplist_t;
 /* Forward declarations for anonymous H5F objects */
 
 /* Main file structures */
-typedef struct H5F_t H5F_t;
+typedef struct H5F_t      H5F_t;
 typedef struct H5F_file_t H5F_file_t;
 
 /* Block aggregation structure */
@@ -501,92 +573,88 @@ typedef struct H5F_blk_aggr_t H5F_blk_aggr_t;
 
 /* I/O Info for an operation */
 typedef struct H5F_io_info_t {
-    const H5F_t *f;                     /* File object */
-    const struct H5P_genplist_t *dxpl;         /* DXPL object */
+    const H5F_t *                f;    /* File object */
+    const struct H5P_genplist_t *dxpl; /* DXPL object */
 } H5F_io_info_t;
 
-
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
 
-
 /* Private functions */
-H5_DLL H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id,
-    hid_t fapl_id, hid_t dxpl_id);
+H5_DLL H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id);
 H5_DLL herr_t H5F_try_close(H5F_t *f);
 
 /* Functions than retrieve values from the file struct */
 H5_DLL unsigned H5F_get_intent(const H5F_t *f);
-H5_DLL char *H5F_get_open_name(const H5F_t *f);
-H5_DLL char *H5F_get_actual_name(const H5F_t *f);
-H5_DLL char *H5F_get_extpath(const H5F_t *f);
+H5_DLL char *   H5F_get_open_name(const H5F_t *f);
+H5_DLL char *   H5F_get_actual_name(const H5F_t *f);
+H5_DLL char *   H5F_get_extpath(const H5F_t *f);
 H5_DLL H5F_file_t *H5F_get_shared(const H5F_t *f);
-H5_DLL hbool_t H5F_same_shared(const H5F_t *f1, const H5F_t *f2);
-H5_DLL unsigned H5F_get_nopen_objs(const H5F_t *f);
-H5_DLL unsigned H5F_incr_nopen_objs(H5F_t *f);
-H5_DLL unsigned H5F_decr_nopen_objs(H5F_t *f);
-H5_DLL hid_t H5F_get_file_id(const H5F_t *f);
-H5_DLL ssize_t H5F_get_file_image(H5F_t *f, void *buf_ptr, size_t buf_len);
-H5_DLL H5F_t *H5F_get_parent(const H5F_t *f);
+H5_DLL hbool_t     H5F_same_shared(const H5F_t *f1, const H5F_t *f2);
+H5_DLL unsigned    H5F_get_nopen_objs(const H5F_t *f);
+H5_DLL unsigned    H5F_incr_nopen_objs(H5F_t *f);
+H5_DLL unsigned    H5F_decr_nopen_objs(H5F_t *f);
+H5_DLL hid_t       H5F_get_file_id(const H5F_t *f);
+H5_DLL ssize_t     H5F_get_file_image(H5F_t *f, void *buf_ptr, size_t buf_len);
+H5_DLL H5F_t *  H5F_get_parent(const H5F_t *f);
 H5_DLL unsigned H5F_get_nmounts(const H5F_t *f);
-H5_DLL hid_t H5F_get_access_plist(H5F_t *f, hbool_t app_ref);
-H5_DLL hid_t H5F_get_id(H5F_t *file, hbool_t app_ref);
-H5_DLL herr_t H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref, size_t *obj_id_count_ptr);
-H5_DLL herr_t H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list, hbool_t app_ref, size_t *obj_id_count_ptr);
+H5_DLL hid_t    H5F_get_access_plist(H5F_t *f, hbool_t app_ref);
+H5_DLL hid_t    H5F_get_id(H5F_t *file, hbool_t app_ref);
+H5_DLL herr_t   H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref, size_t *obj_id_count_ptr);
+H5_DLL herr_t   H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list,
+                                hbool_t app_ref, size_t *obj_id_count_ptr);
 
 /* Functions than retrieve values set/cached from the superblock/FCPL */
-H5_DLL haddr_t H5F_get_base_addr(const H5F_t *f);
-H5_DLL unsigned H5F_sym_leaf_k(const H5F_t *f);
-H5_DLL unsigned H5F_Kvalue(const H5F_t *f, const struct H5B_class_t *type);
-H5_DLL unsigned H5F_get_nrefs(const H5F_t *f);
-H5_DLL uint8_t H5F_sizeof_addr(const H5F_t *f);
-H5_DLL uint8_t H5F_sizeof_size(const H5F_t *f);
-H5_DLL haddr_t H5F_get_sohm_addr(const H5F_t *f);
-H5_DLL herr_t H5F_set_sohm_addr(H5F_t *f, haddr_t addr);
-H5_DLL unsigned H5F_get_sohm_vers(const H5F_t *f);
-H5_DLL herr_t H5F_set_sohm_vers(H5F_t *f, unsigned vers);
-H5_DLL unsigned H5F_get_sohm_nindexes(const H5F_t *f);
-H5_DLL herr_t H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes);
-H5_DLL hid_t H5F_get_fcpl(const H5F_t *f);
+H5_DLL haddr_t            H5F_get_base_addr(const H5F_t *f);
+H5_DLL unsigned           H5F_sym_leaf_k(const H5F_t *f);
+H5_DLL unsigned           H5F_Kvalue(const H5F_t *f, const struct H5B_class_t *type);
+H5_DLL unsigned           H5F_get_nrefs(const H5F_t *f);
+H5_DLL uint8_t            H5F_sizeof_addr(const H5F_t *f);
+H5_DLL uint8_t            H5F_sizeof_size(const H5F_t *f);
+H5_DLL haddr_t            H5F_get_sohm_addr(const H5F_t *f);
+H5_DLL herr_t             H5F_set_sohm_addr(H5F_t *f, haddr_t addr);
+H5_DLL unsigned           H5F_get_sohm_vers(const H5F_t *f);
+H5_DLL herr_t             H5F_set_sohm_vers(H5F_t *f, unsigned vers);
+H5_DLL unsigned           H5F_get_sohm_nindexes(const H5F_t *f);
+H5_DLL herr_t             H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes);
+H5_DLL hid_t              H5F_get_fcpl(const H5F_t *f);
 H5_DLL H5F_close_degree_t H5F_get_fc_degree(const H5F_t *f);
-H5_DLL size_t H5F_rdcc_nbytes(const H5F_t *f);
-H5_DLL size_t H5F_rdcc_nslots(const H5F_t *f);
-H5_DLL double H5F_rdcc_w0(const H5F_t *f);
-H5_DLL size_t H5F_sieve_buf_size(const H5F_t *f);
-H5_DLL unsigned H5F_gc_ref(const H5F_t *f);
-H5_DLL hbool_t H5F_use_latest_format(const H5F_t *f);
-H5_DLL hbool_t H5F_store_msg_crt_idx(const H5F_t *f);
-H5_DLL herr_t H5F_set_store_msg_crt_idx(H5F_t *f, hbool_t flag);
-H5_DLL struct H5RC_t *H5F_grp_btree_shared(const H5F_t *f);
-H5_DLL herr_t H5F_set_grp_btree_shared(H5F_t *f, struct H5RC_t *rc);
-H5_DLL hbool_t H5F_use_tmp_space(const H5F_t *f);
-H5_DLL hbool_t H5F_is_tmp_addr(const H5F_t *f, haddr_t addr);
+H5_DLL size_t             H5F_rdcc_nbytes(const H5F_t *f);
+H5_DLL size_t             H5F_rdcc_nslots(const H5F_t *f);
+H5_DLL double             H5F_rdcc_w0(const H5F_t *f);
+H5_DLL size_t             H5F_sieve_buf_size(const H5F_t *f);
+H5_DLL unsigned           H5F_gc_ref(const H5F_t *f);
+H5_DLL hbool_t            H5F_use_latest_format(const H5F_t *f);
+H5_DLL hbool_t            H5F_store_msg_crt_idx(const H5F_t *f);
+H5_DLL herr_t             H5F_set_store_msg_crt_idx(H5F_t *f, hbool_t flag);
+H5_DLL struct H5RC_t *    H5F_grp_btree_shared(const H5F_t *f);
+H5_DLL herr_t             H5F_set_grp_btree_shared(H5F_t *f, struct H5RC_t *rc);
+H5_DLL hbool_t            H5F_use_tmp_space(const H5F_t *f);
+H5_DLL hbool_t            H5F_is_tmp_addr(const H5F_t *f, haddr_t addr);
 
 /* Functions that retrieve values from VFD layer */
-H5_DLL hid_t H5F_get_driver_id(const H5F_t *f);
-H5_DLL herr_t H5F_get_fileno(const H5F_t *f, unsigned long *filenum);
+H5_DLL hid_t   H5F_get_driver_id(const H5F_t *f);
+H5_DLL herr_t  H5F_get_fileno(const H5F_t *f, unsigned long *filenum);
 H5_DLL hbool_t H5F_has_feature(const H5F_t *f, unsigned feature);
 H5_DLL haddr_t H5F_get_eoa(const H5F_t *f, H5FD_mem_t type);
-H5_DLL herr_t H5F_get_vfd_handle(const H5F_t *file, hid_t fapl,
-    void **file_handle);
+H5_DLL herr_t  H5F_get_vfd_handle(const H5F_t *file, hid_t fapl, void **file_handle);
 
 /* Functions that check file mounting information */
 H5_DLL hbool_t H5F_is_mount(const H5F_t *file);
 H5_DLL hbool_t H5F_has_mount(const H5F_t *file);
-H5_DLL herr_t H5F_traverse_mount(struct H5O_loc_t *oloc/*in,out*/);
-H5_DLL herr_t H5F_flush_mounts(H5F_t *f, hid_t dxpl_id);
+H5_DLL herr_t  H5F_traverse_mount(struct H5O_loc_t *oloc /*in,out*/);
+H5_DLL herr_t  H5F_flush_mounts(H5F_t *f, hid_t dxpl_id);
 
 /* Functions that operate on blocks of bytes wrt super block */
-H5_DLL herr_t H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr,
-                size_t size, hid_t dxpl_id, void *buf/*out*/);
-H5_DLL herr_t H5F_block_write(const H5F_t *f, H5FD_mem_t type, haddr_t addr,
-                size_t size, hid_t dxpl_id, const void *buf);
+H5_DLL herr_t H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id,
+                             void *buf /*out*/);
+H5_DLL herr_t H5F_block_write(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id,
+                              const void *buf);
 
 /* Address-related functions */
 H5_DLL void H5F_addr_encode(const H5F_t *f, uint8_t **pp, haddr_t addr);
@@ -609,25 +677,23 @@ H5_DLL herr_t H5F_super_dirty(H5F_t *f);
 
 /* Parallel I/O (i.e. MPI) related routines */
 #ifdef H5_HAVE_PARALLEL
-H5_DLL int H5F_mpi_get_rank(const H5F_t *f);
+H5_DLL int      H5F_mpi_get_rank(const H5F_t *f);
 H5_DLL MPI_Comm H5F_mpi_get_comm(const H5F_t *f);
-H5_DLL int H5F_mpi_get_size(const H5F_t *f);
+H5_DLL int      H5F_mpi_get_size(const H5F_t *f);
 #endif /* H5_HAVE_PARALLEL */
 
 /* External file cache routines */
-H5_DLL H5F_t *H5F_efc_open(H5F_t *parent, const char *name, unsigned flags,
-    hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id);
+H5_DLL H5F_t *H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
+                           hid_t dxpl_id);
 H5_DLL herr_t H5F_efc_close(H5F_t *parent, H5F_t *file);
 
 /* Global heap CWFS routines */
 H5_DLL herr_t H5F_cwfs_add(H5F_t *f, struct H5HG_heap_t *heap);
 H5_DLL herr_t H5F_cwfs_find_free_heap(H5F_t *f, hid_t dxpl_id, size_t need, haddr_t *addr);
-H5_DLL herr_t H5F_cwfs_advance_heap(H5F_t *f, struct H5HG_heap_t *heap,
-    hbool_t add_heap);
+H5_DLL herr_t H5F_cwfs_advance_heap(H5F_t *f, struct H5HG_heap_t *heap, hbool_t add_heap);
 H5_DLL herr_t H5F_cwfs_remove_heap(H5F_file_t *shared, struct H5HG_heap_t *heap);
 
 /* Debugging functions */
-H5_DLL herr_t H5F_debug(H5F_t *f, FILE * stream, int indent, int fwidth);
+H5_DLL herr_t H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth);
 
 #endif /* _H5Fprivate_H */
-
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 11d731f..011ee28 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -25,10 +25,10 @@
 /* When this header is included from a private header, don't make calls to H5check() */
 #undef H5CHECK
 #ifndef _H5private_H
-#define H5CHECK          H5check(),
-#else   /* _H5private_H */
+#define H5CHECK H5check(),
+#else /* _H5private_H */
 #define H5CHECK
-#endif  /* _H5private_H */
+#endif /* _H5private_H */
 
 /*
  * These are the bits that can be passed to the `flags' argument of
@@ -42,26 +42,26 @@
  * H5F_ACC_DEBUG no longer has any prints any special debug info. The symbol is
  * being retained and will be listed as deprecated in HDF5 1.10.0.
  */
-#define H5F_ACC_RDONLY	(H5CHECK 0x0000u)	/*absence of rdwr => rd-only        */
-#define H5F_ACC_RDWR	(H5CHECK 0x0001u)	/*open for read and write           */
-#define H5F_ACC_TRUNC	(H5CHECK 0x0002u)	/*overwrite existing files          */
-#define H5F_ACC_EXCL	(H5CHECK 0x0004u)	/*fail if file already exists       */
-#define H5F_ACC_DEBUG	(H5CHECK 0x0000u)	/*print debug info (no longer used) */
-#define H5F_ACC_CREAT	(H5CHECK 0x0010u)	/*create non-existing files         */
+#define H5F_ACC_RDONLY (H5CHECK 0x0000u) /*absence of rdwr => rd-only        */
+#define H5F_ACC_RDWR   (H5CHECK 0x0001u) /*open for read and write           */
+#define H5F_ACC_TRUNC  (H5CHECK 0x0002u) /*overwrite existing files          */
+#define H5F_ACC_EXCL   (H5CHECK 0x0004u) /*fail if file already exists       */
+#define H5F_ACC_DEBUG  (H5CHECK 0x0000u) /*print debug info (no longer used) */
+#define H5F_ACC_CREAT  (H5CHECK 0x0010u) /*create non-existing files         */
 
 /* Value passed to H5Pset_elink_acc_flags to cause flags to be taken from the
  * parent file. */
-#define H5F_ACC_DEFAULT (H5CHECK 0xffffu)	/*ignore setting on lapl     */
+#define H5F_ACC_DEFAULT (H5CHECK 0xffffu) /*ignore setting on lapl     */
 
 /* Flags for H5Fget_obj_count() & H5Fget_obj_ids() calls */
-#define H5F_OBJ_FILE	(0x0001u)       /* File objects */
-#define H5F_OBJ_DATASET	(0x0002u)       /* Dataset objects */
-#define H5F_OBJ_GROUP	(0x0004u)       /* Group objects */
-#define H5F_OBJ_DATATYPE (0x0008u)      /* Named datatype objects */
-#define H5F_OBJ_ATTR    (0x0010u)       /* Attribute objects */
-#define H5F_OBJ_ALL 	(H5F_OBJ_FILE|H5F_OBJ_DATASET|H5F_OBJ_GROUP|H5F_OBJ_DATATYPE|H5F_OBJ_ATTR)
-#define H5F_OBJ_LOCAL   (0x0020u)       /* Restrict search to objects opened through current file ID */
-                                        /* (as opposed to objects opened through any file ID accessing this file) */
+#define H5F_OBJ_FILE     (0x0001u) /* File objects */
+#define H5F_OBJ_DATASET  (0x0002u) /* Dataset objects */
+#define H5F_OBJ_GROUP    (0x0004u) /* Group objects */
+#define H5F_OBJ_DATATYPE (0x0008u) /* Named datatype objects */
+#define H5F_OBJ_ATTR     (0x0010u) /* Attribute objects */
+#define H5F_OBJ_ALL      (H5F_OBJ_FILE | H5F_OBJ_DATASET | H5F_OBJ_GROUP | H5F_OBJ_DATATYPE | H5F_OBJ_ATTR)
+#define H5F_OBJ_LOCAL    (0x0020u) /* Restrict search to objects opened through current file ID */
+/* (as opposed to objects opened through any file ID accessing this file) */
 
 #define H5F_FAMILY_DEFAULT (hsize_t)0
 
@@ -77,35 +77,35 @@
 
 /* The difference between a single file and a set of mounted files */
 typedef enum H5F_scope_t {
-    H5F_SCOPE_LOCAL	= 0,	/*specified file handle only		*/
-    H5F_SCOPE_GLOBAL	= 1 	/*entire virtual file			*/
+    H5F_SCOPE_LOCAL  = 0, /*specified file handle only		*/
+    H5F_SCOPE_GLOBAL = 1  /*entire virtual file			*/
 } H5F_scope_t;
 
 /* Unlimited file size for H5Pset_external() */
-#define H5F_UNLIMITED	((hsize_t)(-1L))
+#define H5F_UNLIMITED ((hsize_t)(-1L))
 
 /* How does file close behave?
  * H5F_CLOSE_DEFAULT - Use the degree pre-defined by underlining VFL
  * H5F_CLOSE_WEAK    - file closes only after all opened objects are closed
  * H5F_CLOSE_SEMI    - if no opened objects, file is close; otherwise, file
-		       close fails
+                       close fails
  * H5F_CLOSE_STRONG  - if there are opened objects, close them first, then
-		       close file
+                       close file
  */
 typedef enum H5F_close_degree_t {
-    H5F_CLOSE_DEFAULT   = 0,
-    H5F_CLOSE_WEAK      = 1,
-    H5F_CLOSE_SEMI      = 2,
-    H5F_CLOSE_STRONG    = 3
+    H5F_CLOSE_DEFAULT = 0,
+    H5F_CLOSE_WEAK    = 1,
+    H5F_CLOSE_SEMI    = 2,
+    H5F_CLOSE_STRONG  = 3
 } H5F_close_degree_t;
 
 /* Current "global" information about file */
 /* (just size info currently) */
 typedef struct H5F_info_t {
-    hsize_t		super_ext_size;	/* Superblock extension size */
+    hsize_t super_ext_size; /* Superblock extension size */
     struct {
-	hsize_t		hdr_size;       /* Shared object header message header size */
-	H5_ih_info_t	msgs_info;      /* Shared object header message index & heap size */
+        hsize_t      hdr_size;  /* Shared object header message header size */
+        H5_ih_info_t msgs_info; /* Shared object header message index & heap size */
     } sohm;
 } H5F_info_t;
 
@@ -118,31 +118,31 @@ typedef struct H5F_info_t {
  * enumeration.
  */
 typedef enum H5F_mem_t {
-    H5FD_MEM_NOLIST     = -1,   /* Data should not appear in the free list.
-                                 * Must be negative.
-                                 */
-    H5FD_MEM_DEFAULT    = 0,    /* Value not yet set.  Can also be the
-                                 * datatype set in a larger allocation
-                                 * that will be suballocated by the library.
-                                 * Must be zero.
-                                 */
-    H5FD_MEM_SUPER      = 1,    /* Superblock data */
-    H5FD_MEM_BTREE      = 2,    /* B-tree data */
-    H5FD_MEM_DRAW       = 3,    /* Raw data (content of datasets, etc.) */
-    H5FD_MEM_GHEAP      = 4,    /* Global heap data */
-    H5FD_MEM_LHEAP      = 5,    /* Local heap data */
-    H5FD_MEM_OHDR       = 6,    /* Object header data */
-
-    H5FD_MEM_NTYPES             /* Sentinel value - must be last */
+    H5FD_MEM_NOLIST = -1, /* Data should not appear in the free list.
+                           * Must be negative.
+                           */
+    H5FD_MEM_DEFAULT = 0, /* Value not yet set.  Can also be the
+                           * datatype set in a larger allocation
+                           * that will be suballocated by the library.
+                           * Must be zero.
+                           */
+    H5FD_MEM_SUPER = 1,   /* Superblock data */
+    H5FD_MEM_BTREE = 2,   /* B-tree data */
+    H5FD_MEM_DRAW  = 3,   /* Raw data (content of datasets, etc.) */
+    H5FD_MEM_GHEAP = 4,   /* Global heap data */
+    H5FD_MEM_LHEAP = 5,   /* Local heap data */
+    H5FD_MEM_OHDR  = 6,   /* Object header data */
+
+    H5FD_MEM_NTYPES /* Sentinel value - must be last */
 } H5F_mem_t;
 
 /* Library's file format versions */
 typedef enum H5F_libver_t {
-    H5F_LIBVER_EARLIEST,        /* Use the earliest possible format for storing objects */
-    H5F_LIBVER_LATEST           /* Use the latest possible format available for storing objects*/
+    H5F_LIBVER_EARLIEST, /* Use the earliest possible format for storing objects */
+    H5F_LIBVER_LATEST    /* Use the latest possible format available for storing objects*/
 } H5F_libver_t;
 
-/* Define file format version for 1.8 to prepare for 1.10 release.  
+/* Define file format version for 1.8 to prepare for 1.10 release.
  * (Not used anywhere now)*/
 #define H5F_LIBVER_18 H5F_LIBVER_LATEST
 
@@ -151,39 +151,32 @@ extern "C" {
 #endif
 
 /* Functions in H5F.c */
-H5_DLL htri_t H5Fis_hdf5(const char *filename);
-H5_DLL hid_t  H5Fcreate(const char *filename, unsigned flags,
-		  	  hid_t create_plist, hid_t access_plist);
-H5_DLL hid_t  H5Fopen(const char *filename, unsigned flags,
-		        hid_t access_plist);
-H5_DLL hid_t  H5Freopen(hid_t file_id);
-H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope);
-H5_DLL herr_t H5Fclose(hid_t file_id);
-H5_DLL hid_t  H5Fget_create_plist(hid_t file_id);
-H5_DLL hid_t  H5Fget_access_plist(hid_t file_id);
-H5_DLL herr_t H5Fget_intent(hid_t file_id, unsigned * intent);
-H5_DLL ssize_t H5Fget_obj_count(hid_t file_id, unsigned types);
-H5_DLL ssize_t H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *obj_id_list);
-H5_DLL herr_t H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle);
-H5_DLL herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist);
-H5_DLL herr_t H5Funmount(hid_t loc, const char *name);
+H5_DLL htri_t   H5Fis_hdf5(const char *filename);
+H5_DLL hid_t    H5Fcreate(const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist);
+H5_DLL hid_t    H5Fopen(const char *filename, unsigned flags, hid_t access_plist);
+H5_DLL hid_t    H5Freopen(hid_t file_id);
+H5_DLL herr_t   H5Fflush(hid_t object_id, H5F_scope_t scope);
+H5_DLL herr_t   H5Fclose(hid_t file_id);
+H5_DLL hid_t    H5Fget_create_plist(hid_t file_id);
+H5_DLL hid_t    H5Fget_access_plist(hid_t file_id);
+H5_DLL herr_t   H5Fget_intent(hid_t file_id, unsigned *intent);
+H5_DLL ssize_t  H5Fget_obj_count(hid_t file_id, unsigned types);
+H5_DLL ssize_t  H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *obj_id_list);
+H5_DLL herr_t   H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle);
+H5_DLL herr_t   H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist);
+H5_DLL herr_t   H5Funmount(hid_t loc, const char *name);
 H5_DLL hssize_t H5Fget_freespace(hid_t file_id);
-H5_DLL herr_t H5Fget_filesize(hid_t file_id, hsize_t *size);
-H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void * buf_ptr, size_t buf_len);
-H5_DLL herr_t H5Fget_mdc_config(hid_t file_id,
-				H5AC_cache_config_t * config_ptr);
-H5_DLL herr_t H5Fset_mdc_config(hid_t file_id,
-				H5AC_cache_config_t * config_ptr);
-H5_DLL herr_t H5Fget_mdc_hit_rate(hid_t file_id, double * hit_rate_ptr);
-H5_DLL herr_t H5Fget_mdc_size(hid_t file_id,
-                              size_t * max_size_ptr,
-                              size_t * min_clean_size_ptr,
-                              size_t * cur_size_ptr,
-                              int * cur_num_entries_ptr);
-H5_DLL herr_t H5Freset_mdc_hit_rate_stats(hid_t file_id);
-H5_DLL ssize_t H5Fget_name(hid_t obj_id, char *name, size_t size);
-H5_DLL herr_t H5Fget_info(hid_t obj_id, H5F_info_t *bh_info);
-H5_DLL herr_t H5Fclear_elink_file_cache(hid_t file_id);
+H5_DLL herr_t   H5Fget_filesize(hid_t file_id, hsize_t *size);
+H5_DLL ssize_t  H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
+H5_DLL herr_t   H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
+H5_DLL herr_t   H5Fset_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
+H5_DLL herr_t   H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr);
+H5_DLL herr_t   H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
+                                size_t *cur_size_ptr, int *cur_num_entries_ptr);
+H5_DLL herr_t   H5Freset_mdc_hit_rate_stats(hid_t file_id);
+H5_DLL ssize_t  H5Fget_name(hid_t obj_id, char *name, size_t size);
+H5_DLL herr_t   H5Fget_info(hid_t obj_id, H5F_info_t *bh_info);
+H5_DLL herr_t   H5Fclear_elink_file_cache(hid_t file_id);
 #ifdef H5_HAVE_PARALLEL
 H5_DLL herr_t H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag);
 H5_DLL herr_t H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag);
@@ -193,4 +186,3 @@ H5_DLL herr_t H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag);
 }
 #endif
 #endif /* _H5Fpublic_H */
-
diff --git a/src/H5Fquery.c b/src/H5Fquery.c
index 5bf28eb..42f7c3a 100644
--- a/src/H5Fquery.c
+++ b/src/H5Fquery.c
@@ -26,54 +26,44 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_intent
  *
@@ -99,7 +89,6 @@ H5F_get_intent(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->flags)
 } /* end H5F_get_intent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_open_name
  *
@@ -125,7 +114,6 @@ H5F_get_open_name(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->open_name)
 } /* end H5F_get_open_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_actual_name
  *
@@ -151,13 +139,12 @@ H5F_get_actual_name(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->actual_name)
 } /* end H5F_get_actual_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_extpath
  *
  * Purpose:	Retrieve the file's 'extpath' flags
- *		This is used by H5L_extern_traverse() and H5D_build_extfile_prefix() to retrieve the main file's location
- *		when searching the target file.
+ *		This is used by H5L_extern_traverse() and H5D_build_extfile_prefix() to retrieve the main file's
+ *location when searching the target file.
  *
  * Return:	'extpath' on success/abort on failure (shouldn't fail)
  *
@@ -177,7 +164,6 @@ H5F_get_extpath(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->extpath)
 } /* end H5F_get_extpath() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_shared
  *
@@ -200,7 +186,6 @@ H5F_get_shared(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared)
 } /* end H5F_get_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_same_shared
  *
@@ -226,7 +211,6 @@ H5F_same_shared(const H5F_t *f1, const H5F_t *f2)
     FUNC_LEAVE_NOAPI(f1->shared == f2->shared)
 } /* end H5F_same_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_nopen_objs
  *
@@ -249,7 +233,6 @@ H5F_get_nopen_objs(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->nopen_objs)
 } /* end H5F_get_nopen_objs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_file_id
  *
@@ -272,7 +255,6 @@ H5F_get_file_id(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->file_id)
 } /* end H5F_get_file_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_parent
  *
@@ -295,7 +277,6 @@ H5F_get_parent(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->parent)
 } /* end H5F_get_parent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_nmounts
  *
@@ -318,7 +299,6 @@ H5F_get_nmounts(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->nmounts)
 } /* end H5F_get_nmounts() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_fcpl
  *
@@ -346,7 +326,6 @@ H5F_get_fcpl(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->fcpl_id)
 } /* end H5F_get_fcpl() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_sizeof_addr
  *
@@ -373,7 +352,6 @@ H5F_sizeof_addr(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->sizeof_addr)
 } /* end H5F_sizeof_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_sizeof_size
  *
@@ -400,7 +378,6 @@ H5F_sizeof_size(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->sizeof_size)
 } /* H5F_sizeof_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_sohm_addr
  *
@@ -424,7 +401,6 @@ H5F_get_sohm_addr(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->sohm_addr)
 } /* end H5F_get_sohm_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_sohm_vers
  *
@@ -448,7 +424,6 @@ H5F_get_sohm_vers(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->sohm_vers)
 } /* end H5F_get_sohm_vers() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_sohm_nindexes
  *
@@ -472,7 +447,6 @@ H5F_get_sohm_nindexes(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->sohm_nindexes)
 } /* end H5F_get_sohm_nindexes() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_sym_leaf_k
  *
@@ -504,7 +478,6 @@ H5F_sym_leaf_k(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->sblock->sym_leaf_k)
 } /* end H5F_sym_leaf_k() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_Kvalue
  *
@@ -537,7 +510,6 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
     FUNC_LEAVE_NOAPI(f->shared->sblock->btree_k[type->id])
 } /* end H5F_Kvalue() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_nrefs
  *
@@ -561,7 +533,6 @@ H5F_get_nrefs(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->nrefs)
 } /* end H5F_get_nrefs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_rdcc_nslots
  *
@@ -592,7 +563,6 @@ H5F_rdcc_nslots(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->rdcc_nslots)
 } /* end H5F_rdcc_nelmts() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_rdcc_nbytes
  *
@@ -623,7 +593,6 @@ H5F_rdcc_nbytes(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->rdcc_nbytes)
 } /* end H5F_rdcc_nbytes() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_rdcc_w0
  *
@@ -654,7 +623,6 @@ H5F_rdcc_w0(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->rdcc_w0)
 } /* end H5F_rdcc_w0() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_base_addr
  *
@@ -682,7 +650,6 @@ H5F_get_base_addr(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->sblock->base_addr)
 } /* end H5F_get_base_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_grp_btree_shared
  *
@@ -713,7 +680,6 @@ H5F_grp_btree_shared(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->grp_btree_shared)
 } /* end H5F_grp_btree_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_sieve_buf_size
  *
@@ -744,7 +710,6 @@ H5F_sieve_buf_size(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->sieve_buf_size)
 } /* end H5F_sieve_buf_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_gc_ref
  *
@@ -775,7 +740,6 @@ H5F_gc_ref(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->gc_ref)
 } /* end H5F_gc_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_use_latest_format
  *
@@ -804,7 +768,6 @@ H5F_use_latest_format(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->latest_format)
 } /* end H5F_use_latest_format() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_fc_degree
  *
@@ -832,7 +795,6 @@ H5F_get_fc_degree(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->fc_degree)
 } /* end H5F_get_fc_degree() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_store_msg_crt_idx
  *
@@ -860,7 +822,6 @@ H5F_store_msg_crt_idx(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->store_msg_crt_idx)
 } /* end H5F_store_msg_crt_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_has_feature
  *
@@ -884,10 +845,9 @@ H5F_has_feature(const H5F_t *f, unsigned feature)
     HDassert(f);
     HDassert(f->shared);
 
-    FUNC_LEAVE_NOAPI((hbool_t)(f->shared->lf->feature_flags&feature))
+    FUNC_LEAVE_NOAPI((hbool_t)(f->shared->lf->feature_flags & feature))
 } /* end H5F_has_feature() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_driver_id
  *
@@ -915,7 +875,6 @@ H5F_get_driver_id(const H5F_t *f)
     FUNC_LEAVE_NOAPI(f->shared->lf->driver_id)
 } /* end H5F_get_driver_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_fileno
  *
@@ -933,7 +892,7 @@ H5F_get_driver_id(const H5F_t *f)
 herr_t
 H5F_get_fileno(const H5F_t *f, unsigned long *filenum)
 {
-    herr_t	ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -943,14 +902,13 @@ H5F_get_fileno(const H5F_t *f, unsigned long *filenum)
     HDassert(filenum);
 
     /* Retrieve the file's serial number */
-    if(H5FD_get_fileno(f->shared->lf, filenum) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_BADRANGE, FAIL, "can't retrieve fileno")
+    if (H5FD_get_fileno(f->shared->lf, filenum) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_BADRANGE, FAIL, "can't retrieve fileno")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_fileno() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_eoa
  *
@@ -966,7 +924,7 @@ done:
 haddr_t
 H5F_get_eoa(const H5F_t *f, H5FD_mem_t type)
 {
-    haddr_t	ret_value;
+    haddr_t ret_value;
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
@@ -974,14 +932,13 @@ H5F_get_eoa(const H5F_t *f, H5FD_mem_t type)
     HDassert(f->shared);
 
     /* Dispatch to driver */
-    if(HADDR_UNDEF == (ret_value = H5FD_get_eoa(f->shared->lf, type)))
-	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "driver get_eoa request failed")
+    if (HADDR_UNDEF == (ret_value = H5FD_get_eoa(f->shared->lf, type)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "driver get_eoa request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_get_vfd_handle
  *
@@ -999,7 +956,7 @@ done:
 herr_t
 H5F_get_vfd_handle(const H5F_t *file, hid_t fapl, void **file_handle)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1008,14 +965,13 @@ H5F_get_vfd_handle(const H5F_t *file, hid_t fapl, void **file_handle)
     HDassert(file_handle);
 
     /* Get the VFD handle */
-    if(H5FD_get_vfd_handle(file->shared->lf, fapl, file_handle) < 0)
+    if (H5FD_get_vfd_handle(file->shared->lf, fapl, file_handle) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get file handle for file driver")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_vfd_handle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_is_tmp_addr
  *
@@ -1043,7 +999,6 @@ H5F_is_tmp_addr(const H5F_t *f, haddr_t addr)
     FUNC_LEAVE_NOAPI(H5F_addr_le(f->shared->tmp_addr, addr))
 } /* end H5F_is_tmp_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_use_tmp_space
  *
@@ -1070,4 +1025,3 @@ H5F_use_tmp_space(const H5F_t *f)
 
     FUNC_LEAVE_NOAPI(f->shared->use_tmp_space)
 } /* end H5F_use_tmp_space() */
-
diff --git a/src/H5Fsfile.c b/src/H5Fsfile.c
index 45f0e61..6eec44a 100644
--- a/src/H5Fsfile.c
+++ b/src/H5Fsfile.c
@@ -11,21 +11,21 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /* Packages needed by this file... */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5FLprivate.h"	/* Free lists                           */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5FLprivate.h" /* Free lists                           */
 
 /* PRIVATE TYPEDEFS */
 
 /* Struct for tracking "shared" file structs */
 typedef struct H5F_sfile_node_t {
-    H5F_file_t *shared;                 /* Pointer to "shared" file struct */
-    struct H5F_sfile_node_t *next;      /* Pointer to next node */
+    H5F_file_t *             shared; /* Pointer to "shared" file struct */
+    struct H5F_sfile_node_t *next;   /* Pointer to next node */
 } H5F_sfile_node_t;
 
 /* PRIVATE PROTOTYPES */
@@ -38,7 +38,6 @@ H5FL_DEFINE_STATIC(H5F_sfile_node_t);
 /* Declare a local variable to track the shared file information */
 H5F_sfile_node_t *H5F_sfile_head_g = NULL;
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_sfile_assert_num
  *
@@ -56,18 +55,18 @@ H5F_sfile_assert_num(unsigned n)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(n == 0) {
+    if (n == 0) {
         /* Sanity checking */
         HDassert(H5F_sfile_head_g == NULL);
     } /* end if */
     else {
-        unsigned count;                 /* Number of open shared files */
-        H5F_sfile_node_t *curr;         /* Current shared file node */
+        unsigned          count; /* Number of open shared files */
+        H5F_sfile_node_t *curr;  /* Current shared file node */
 
         /* Iterate through low-level files for matching low-level file info */
-        curr = H5F_sfile_head_g;
+        curr  = H5F_sfile_head_g;
         count = 0;
-        while(curr) {
+        while (curr) {
             /* Increment # of open shared file structs */
             count++;
 
@@ -82,7 +81,6 @@ H5F_sfile_assert_num(unsigned n)
     FUNC_LEAVE_NOAPI_VOID
 } /* H5F_sfile_assert_num() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_sfile_add
  *
@@ -100,8 +98,8 @@ H5F_sfile_assert_num(unsigned n)
 herr_t
 H5F_sfile_add(H5F_file_t *shared)
 {
-    H5F_sfile_node_t *new_shared;              /* New shared file node */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5F_sfile_node_t *new_shared;          /* New shared file node */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -110,7 +108,7 @@ H5F_sfile_add(H5F_file_t *shared)
 
     /* Allocate new shared file node */
     if (NULL == (new_shared = H5FL_CALLOC(H5F_sfile_node_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Set shared file value */
     new_shared->shared = shared;
@@ -123,7 +121,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_sfile_add() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_sfile_search
  *
@@ -143,7 +140,7 @@ H5F_file_t *
 H5F_sfile_search(H5FD_t *lf)
 {
     H5F_sfile_node_t *curr;             /* Current shared file node */
-    H5F_file_t *ret_value = NULL;       /* Return value */
+    H5F_file_t *      ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -152,9 +149,9 @@ H5F_sfile_search(H5FD_t *lf)
 
     /* Iterate through low-level files for matching low-level file info */
     curr = H5F_sfile_head_g;
-    while(curr) {
+    while (curr) {
         /* Check for match */
-        if(0==H5FD_cmp(curr->shared->lf, lf))
+        if (0 == H5FD_cmp(curr->shared->lf, lf))
             HGOTO_DONE(curr->shared)
 
         /* Advance to next shared file node */
@@ -165,7 +162,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_sfile_search() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_sfile_remove
  *
@@ -183,9 +179,9 @@ done:
 herr_t
 H5F_sfile_remove(H5F_file_t *shared)
 {
-    H5F_sfile_node_t *curr;             /* Current shared file node */
-    H5F_sfile_node_t *last;             /* Last shared file node */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5F_sfile_node_t *curr;                /* Current shared file node */
+    H5F_sfile_node_t *last;                /* Last shared file node */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -195,18 +191,18 @@ H5F_sfile_remove(H5F_file_t *shared)
     /* Locate shared file node with correct shared file */
     last = NULL;
     curr = H5F_sfile_head_g;
-    while(curr && curr->shared != shared) {
+    while (curr && curr->shared != shared) {
         /* Advance to next node */
         last = curr;
         curr = curr->next;
     } /* end while */
 
     /* Indicate error if the node wasn't found */
-    if(curr == NULL)
-	HGOTO_ERROR(H5E_FILE, H5E_NOTFOUND, FAIL, "can't find shared file info")
+    if (curr == NULL)
+        HGOTO_ERROR(H5E_FILE, H5E_NOTFOUND, FAIL, "can't find shared file info")
 
     /* Remove node found from list */
-    if(last != NULL)
+    if (last != NULL)
         /* Removing middle or tail node in list */
         last->next = curr->next;
     else
@@ -220,4 +216,3 @@ H5F_sfile_remove(H5F_file_t *shared)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_sfile_remove() */
-
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index b032ca9..cb331d0 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -15,52 +15,45 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5F_init_super_interface
-
+#define H5_INTERFACE_INIT_FUNC H5F_init_super_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions                    */
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"		/* Error handling                       */
-#include "H5Fpkg.h"             /* File access                          */
-#include "H5FDprivate.h"	/* File drivers                         */
-#include "H5Iprivate.h"		/* IDs                                  */
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"		/* Property lists                       */
-#include "H5SMprivate.h"        /* Shared Object Header Messages        */
-
+#include "H5private.h"   /* Generic Functions                    */
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling                       */
+#include "H5Fpkg.h"      /* File access                          */
+#include "H5FDprivate.h" /* File drivers                         */
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Pprivate.h"  /* Property lists                       */
+#include "H5SMprivate.h" /* Shared Object Header Messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 static herr_t H5F_super_ext_create(H5F_t *f, hid_t dxpl_id, H5O_loc_t *ext_ptr);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
@@ -68,13 +61,10 @@ static herr_t H5F_super_ext_create(H5F_t *f, hid_t dxpl_id, H5O_loc_t *ext_ptr);
 /* Declare a free list to manage the H5F_super_t struct */
 H5FL_DEFINE(H5F_super_t);
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5F_init_super_interface -- Initialize interface-specific information
@@ -96,7 +86,6 @@ H5F_init_super_interface(void)
     FUNC_LEAVE_NOAPI(H5F_init())
 } /* H5F_init_super_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_ext_create
  *
@@ -112,7 +101,7 @@ H5F_init_super_interface(void)
 static herr_t
 H5F_super_ext_create(H5F_t *f, hid_t dxpl_id, H5O_loc_t *ext_ptr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -124,9 +113,11 @@ H5F_super_ext_create(H5F_t *f, hid_t dxpl_id, H5O_loc_t *ext_ptr)
     HDassert(ext_ptr);
 
     /* Check for older version of superblock format that can't support superblock extensions */
-    if(f->shared->sblock->super_vers < HDF5_SUPERBLOCK_VERSION_2)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "superblock extension not permitted with version %u of superblock", f->shared->sblock->super_vers)
-    else if(H5F_addr_defined(f->shared->sblock->ext_addr))
+    if (f->shared->sblock->super_vers < HDF5_SUPERBLOCK_VERSION_2)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL,
+                    "superblock extension not permitted with version %u of superblock",
+                    f->shared->sblock->super_vers)
+    else if (H5F_addr_defined(f->shared->sblock->ext_addr))
         HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "superblock extension already exists?!?!")
     else {
         /* The superblock extension isn't actually a group, but the
@@ -138,7 +129,7 @@ H5F_super_ext_create(H5F_t *f, hid_t dxpl_id, H5O_loc_t *ext_ptr)
          * extension.
          */
         H5O_loc_reset(ext_ptr);
-        if(H5O_create(f, dxpl_id, 0, (size_t)1, H5P_GROUP_CREATE_DEFAULT, ext_ptr) < 0)
+        if (H5O_create(f, dxpl_id, 0, (size_t)1, H5P_GROUP_CREATE_DEFAULT, ext_ptr) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "unable to create superblock extension")
 
         /* Record the address of the superblock extension */
@@ -149,7 +140,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_super_ext_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_ext_open
  *
@@ -165,7 +155,7 @@ done:
 herr_t
 H5F_super_ext_open(H5F_t *f, haddr_t ext_addr, H5O_loc_t *ext_ptr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -180,14 +170,13 @@ H5F_super_ext_open(H5F_t *f, haddr_t ext_addr, H5O_loc_t *ext_ptr)
     ext_ptr->addr = ext_addr;
 
     /* Open the superblock extension object header */
-    if(H5O_open(ext_ptr) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open superblock extension")
+    if (H5O_open(ext_ptr) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open superblock extension")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_super_ext_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5F_super_ext_close
  *
@@ -201,10 +190,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id,
-    hbool_t was_created)
+H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id, hbool_t was_created)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -213,19 +201,19 @@ H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id,
     HDassert(ext_ptr);
 
     /* Check if extension was created */
-    if(was_created) {
+    if (was_created) {
         /* Increment link count on superblock extension's object header */
-        if(H5O_link(ext_ptr, 1, dxpl_id) < 0)
+        if (H5O_link(ext_ptr, 1, dxpl_id) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_LINKCOUNT, FAIL, "unable to increment hard link count")
 
         /* Decrement refcount on superblock extension's object header in memory */
-        if(H5O_dec_rc_by_loc(ext_ptr, dxpl_id) < 0)
-           HDONE_ERROR(H5E_FILE, H5E_CANTDEC, FAIL, "unable to decrement refcount on superblock extension")
+        if (H5O_dec_rc_by_loc(ext_ptr, dxpl_id) < 0)
+            HDONE_ERROR(H5E_FILE, H5E_CANTDEC, FAIL, "unable to decrement refcount on superblock extension")
     } /* end if */
 
     /* Twiddle the number of open objects to avoid closing the file. */
     f->nopen_objs++;
-    if(H5O_close(ext_ptr) < 0)
+    if (H5O_close(ext_ptr) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "unable to close superblock extension")
     f->nopen_objs--;
 
@@ -233,7 +221,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_super_ext_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_read
  *
@@ -254,49 +241,49 @@ done:
 herr_t
 H5F_super_read(H5F_t *f, hid_t dxpl_id)
 {
-    H5P_genplist_t     *dxpl;               /* DXPL object */
-    H5F_super_t *       sblock = NULL;      /* superblock structure                         */
-    unsigned            sblock_flags = H5AC__NO_FLAGS_SET;       /* flags used in superblock unprotect call      */
-    haddr_t             super_addr;         /* Absolute address of superblock */
-    H5AC_protect_t      rw;                 /* read/write permissions for file              */
-    hbool_t             dirtied = FALSE;    /* Bool for sblock protect call                 */
-    herr_t              ret_value = SUCCEED; /* return value                                */
+    H5P_genplist_t *dxpl;                              /* DXPL object */
+    H5F_super_t *   sblock       = NULL;               /* superblock structure                         */
+    unsigned        sblock_flags = H5AC__NO_FLAGS_SET; /* flags used in superblock unprotect call      */
+    haddr_t         super_addr;                        /* Absolute address of superblock */
+    H5AC_protect_t  rw;                                /* read/write permissions for file              */
+    hbool_t         dirtied   = FALSE;                 /* Bool for sblock protect call                 */
+    herr_t          ret_value = SUCCEED;               /* return value                                */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the DXPL plist object for DXPL ID */
-    if(NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Find the superblock */
-    if(H5FD_locate_signature(f->shared->lf, dxpl, &super_addr) < 0)
+    if (H5FD_locate_signature(f->shared->lf, dxpl, &super_addr) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_NOTHDF5, FAIL, "unable to locate file signature")
-    if(HADDR_UNDEF == super_addr)
+    if (HADDR_UNDEF == super_addr)
         HGOTO_ERROR(H5E_FILE, H5E_NOTHDF5, FAIL, "file signature not found")
 
     /* Check for userblock present */
-    if(H5F_addr_gt(super_addr, 0)) {
+    if (H5F_addr_gt(super_addr, 0)) {
         /* Set the base address for the file in the VFD now */
-        if(H5FD_set_base_addr(f->shared->lf, super_addr) < 0)
+        if (H5FD_set_base_addr(f->shared->lf, super_addr) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "failed to set base address for file driver")
     } /* end if */
 
     /* Determine file intent for superblock protect */
-    if(H5F_INTENT(f) & H5F_ACC_RDWR)
+    if (H5F_INTENT(f) & H5F_ACC_RDWR)
         rw = H5AC_WRITE;
     else
         rw = H5AC_READ;
 
     /* Look up the superblock */
-    if(NULL == (sblock = (H5F_super_t *)H5AC_protect(f, dxpl_id, H5AC_SUPERBLOCK, (haddr_t)0, &dirtied, rw)))
+    if (NULL == (sblock = (H5F_super_t *)H5AC_protect(f, dxpl_id, H5AC_SUPERBLOCK, (haddr_t)0, &dirtied, rw)))
         HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load superblock")
 
     /* Mark the superblock dirty if it was modified during loading or VFD indicated to do so */
-    if((H5AC_WRITE == rw) && (dirtied || H5F_HAS_FEATURE(f, H5FD_FEAT_DIRTY_SBLK_LOAD)))
+    if ((H5AC_WRITE == rw) && (dirtied || H5F_HAS_FEATURE(f, H5FD_FEAT_DIRTY_SBLK_LOAD)))
         sblock_flags |= H5AC__DIRTIED_FLAG;
 
     /* Pin the superblock in the cache */
-    if(H5AC_pin_protected_entry(sblock) < 0)
+    if (H5AC_pin_protected_entry(sblock) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPIN, FAIL, "unable to pin superblock")
 
     /* Set the pointer to the pinned superblock */
@@ -304,13 +291,12 @@ H5F_super_read(H5F_t *f, hid_t dxpl_id)
 
 done:
     /* Release the superblock */
-    if(sblock && H5AC_unprotect(f, dxpl_id, H5AC_SUPERBLOCK, (haddr_t)0, sblock, sblock_flags) < 0)
+    if (sblock && H5AC_unprotect(f, dxpl_id, H5AC_SUPERBLOCK, (haddr_t)0, sblock, sblock_flags) < 0)
         HDONE_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to close superblock")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_super_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_init
  *
@@ -330,62 +316,62 @@ done:
 herr_t
 H5F_super_init(H5F_t *f, hid_t dxpl_id)
 {
-    H5F_super_t    *sblock = NULL;      /* Superblock cache structure                 */
-    hbool_t         sblock_in_cache = FALSE;    /* Whether the superblock has been inserted into the metadata cache */
-    H5P_genplist_t *plist;              /* File creation property list                */
-    hsize_t         userblock_size;     /* Size of userblock, in bytes                */
-    hsize_t         superblock_size;    /* Size of superblock, in bytes               */
-    size_t          driver_size;        /* Size of driver info block (bytes)          */
-    unsigned super_vers = HDF5_SUPERBLOCK_VERSION_DEF; /* Superblock version for file */
-    H5O_loc_t       ext_loc;            /* Superblock extension object location */
-    hbool_t         need_ext;           /* Whether the superblock extension is needed */
-    hbool_t         ext_created = FALSE; /* Whether the extension has been created */
-    herr_t          ret_value = SUCCEED; /* Return Value                              */
+    H5F_super_t *sblock     = NULL;  /* Superblock cache structure                 */
+    hbool_t sblock_in_cache = FALSE; /* Whether the superblock has been inserted into the metadata cache */
+    H5P_genplist_t *plist;           /* File creation property list                */
+    hsize_t         userblock_size;  /* Size of userblock, in bytes                */
+    hsize_t         superblock_size; /* Size of superblock, in bytes               */
+    size_t          driver_size;     /* Size of driver info block (bytes)          */
+    unsigned        super_vers = HDF5_SUPERBLOCK_VERSION_DEF; /* Superblock version for file */
+    H5O_loc_t       ext_loc;                                  /* Superblock extension object location */
+    hbool_t         need_ext;                                 /* Whether the superblock extension is needed */
+    hbool_t         ext_created = FALSE;                      /* Whether the extension has been created */
+    herr_t          ret_value   = SUCCEED;                    /* Return Value                              */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Allocate space for the superblock */
-    if(NULL == (sblock = H5FL_CALLOC(H5F_super_t)))
+    if (NULL == (sblock = H5FL_CALLOC(H5F_super_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize various address information */
-    sblock->base_addr = HADDR_UNDEF;
-    sblock->ext_addr = HADDR_UNDEF;
+    sblock->base_addr   = HADDR_UNDEF;
+    sblock->ext_addr    = HADDR_UNDEF;
     sblock->driver_addr = HADDR_UNDEF;
-    sblock->root_addr = HADDR_UNDEF;
+    sblock->root_addr   = HADDR_UNDEF;
 
     /* Get the shared file creation property list */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(f->shared->fcpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(f->shared->fcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Initialize sym_leaf_k */
-    if(H5P_get(plist, H5F_CRT_SYM_LEAF_NAME, &sblock->sym_leaf_k) < 0)
+    if (H5P_get(plist, H5F_CRT_SYM_LEAF_NAME, &sblock->sym_leaf_k) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get byte number for object size")
 
     /* Initialize btree_k */
-    if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, &sblock->btree_k[0]) < 0)
+    if (H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, &sblock->btree_k[0]) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get rank for btree internal nodes")
 
     /* Bump superblock version if we are to use the latest version of the format */
-    if(f->shared->latest_format)
+    if (f->shared->latest_format)
         super_vers = HDF5_SUPERBLOCK_VERSION_LATEST;
     /* Bump superblock version to create superblock extension for SOHM info */
-    else if(f->shared->sohm_nindexes > 0)
+    else if (f->shared->sohm_nindexes > 0)
         super_vers = HDF5_SUPERBLOCK_VERSION_2;
     /* Check for non-default indexed storage B-tree internal 'K' value
      * and set the version # of the superblock to 1 if it is a non-default
      * value.
      */
-    else if(sblock->btree_k[H5B_CHUNK_ID] != HDF5_BTREE_CHUNK_IK_DEF)
+    else if (sblock->btree_k[H5B_CHUNK_ID] != HDF5_BTREE_CHUNK_IK_DEF)
         super_vers = HDF5_SUPERBLOCK_VERSION_1;
 
     /* If a newer superblock version is required, set it here */
-    if(super_vers != HDF5_SUPERBLOCK_VERSION_DEF) {
-        H5P_genplist_t *c_plist;              /* Property list */
+    if (super_vers != HDF5_SUPERBLOCK_VERSION_DEF) {
+        H5P_genplist_t *c_plist; /* Property list */
 
-        if(NULL == (c_plist = (H5P_genplist_t *)H5I_object(f->shared->fcpl_id)))
+        if (NULL == (c_plist = (H5P_genplist_t *)H5I_object(f->shared->fcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not property list")
-        if(H5P_set(c_plist, H5F_CRT_SUPER_VERS_NAME, &super_vers) < 0)
+        if (H5P_set(c_plist, H5F_CRT_SUPER_VERS_NAME, &super_vers) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set superblock version")
     } /* end if */
 
@@ -395,28 +381,29 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
      * base address is set to the same thing as the superblock for
      * now.
      */
-    if(H5P_get(plist, H5F_CRT_USER_BLOCK_NAME, &userblock_size) < 0)
+    if (H5P_get(plist, H5F_CRT_USER_BLOCK_NAME, &userblock_size) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get userblock size")
 
     /* Sanity check the userblock size vs. the file's allocation alignment */
-    if(userblock_size > 0) {
-        if(userblock_size < f->shared->alignment)
+    if (userblock_size > 0) {
+        if (userblock_size < f->shared->alignment)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "userblock size must be > file object alignment")
-        if(0 != (userblock_size % f->shared->alignment))
-            HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "userblock size must be an integral multiple of file object alignment")
+        if (0 != (userblock_size % f->shared->alignment))
+            HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL,
+                        "userblock size must be an integral multiple of file object alignment")
     } /* end if */
 
-    sblock->base_addr = userblock_size;
+    sblock->base_addr    = userblock_size;
     sblock->status_flags = 0;
 
     /* Reserve space for the userblock */
-    if(H5FD_set_eoa(f->shared->lf, H5FD_MEM_SUPER, userblock_size) < 0)
+    if (H5FD_set_eoa(f->shared->lf, H5FD_MEM_SUPER, userblock_size) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to set EOA value for userblock")
 
     /* Set the base address for the file in the VFD now, after allocating
      *  space for userblock.
      */
-    if(H5FD_set_base_addr(f->shared->lf, sblock->base_addr) < 0)
+    if (H5FD_set_base_addr(f->shared->lf, sblock->base_addr) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "failed to set base address for file driver")
 
     /* Save a local copy of the superblock version number */
@@ -427,7 +414,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
 
     /* Compute the size of the driver information block */
     H5_CHECKED_ASSIGN(driver_size, size_t, H5FD_sb_size(f->shared->lf), hsize_t);
-    if(driver_size > 0) {
+    if (driver_size > 0) {
         driver_size += H5F_DRVINFOBLOCK_HDR_SIZE;
 
         /*
@@ -443,15 +430,15 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
      * superblock need to be at the beginning of the file and only the first
      * allocation request is required to return memory at format address zero.
      */
-    if(super_vers < HDF5_SUPERBLOCK_VERSION_2)
+    if (super_vers < HDF5_SUPERBLOCK_VERSION_2)
         superblock_size += driver_size;
 
     /* Reserve space in the file for the superblock, instead of allocating it */
-    if(H5FD_set_eoa(f->shared->lf, H5FD_MEM_SUPER, superblock_size) < 0)
+    if (H5FD_set_eoa(f->shared->lf, H5FD_MEM_SUPER, superblock_size) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to set EOA value for superblock")
 
     /* Insert superblock into cache, pinned */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_SUPERBLOCK, (haddr_t)0, sblock, H5AC__PIN_ENTRY_FLAG) < 0)
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_SUPERBLOCK, (haddr_t)0, sblock, H5AC__PIN_ENTRY_FLAG) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "can't add superblock to cache")
     sblock_in_cache = TRUE;
 
@@ -463,7 +450,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
      */
 
     /* Files with SOHM indices always need the superblock extension */
-    if(f->shared->sohm_nindexes > 0) {
+    if (f->shared->sohm_nindexes > 0) {
         HDassert(super_vers >= HDF5_SUPERBLOCK_VERSION_2);
         need_ext = TRUE;
     } /* end if */
@@ -471,14 +458,14 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
      *  for the superblock extension, check for non-default values to store
      *  in it.
      */
-    else if(super_vers >= HDF5_SUPERBLOCK_VERSION_2) {
+    else if (super_vers >= HDF5_SUPERBLOCK_VERSION_2) {
         /* Check for non-default v1 B-tree 'K' values to store */
-        if(sblock->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF ||
-                sblock->btree_k[H5B_CHUNK_ID] != HDF5_BTREE_CHUNK_IK_DEF ||
-                sblock->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF)
+        if (sblock->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF ||
+            sblock->btree_k[H5B_CHUNK_ID] != HDF5_BTREE_CHUNK_IK_DEF ||
+            sblock->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF)
             need_ext = TRUE;
         /* Check for driver info to store */
-        else if(driver_size > 0)
+        else if (driver_size > 0)
             need_ext = TRUE;
         else
             need_ext = FALSE;
@@ -487,7 +474,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
         need_ext = FALSE;
 
     /* Create the superblock extension for "extra" superblock data, if necessary. */
-    if(need_ext) {
+    if (need_ext) {
         /* The superblock extension isn't actually a group, but the
          * default group creation list should work fine.
          * If we don't supply a size for the object header, HDF5 will
@@ -496,86 +483,88 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
          * be tuned if more information is added to the superblock
          * extension.
          */
-	if(H5F_super_ext_create(f, dxpl_id, &ext_loc) < 0)
+        if (H5F_super_ext_create(f, dxpl_id, &ext_loc) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "unable to create superblock extension")
         ext_created = TRUE;
 
         /* Create the Shared Object Header Message table and register it with
          *      the metadata cache, if this file supports shared messages.
          */
-        if(f->shared->sohm_nindexes > 0) {
+        if (f->shared->sohm_nindexes > 0) {
             /* Initialize the shared message code & write the SOHM message to the extension */
-            if(H5SM_init(f, plist, &ext_loc, dxpl_id) < 0)
+            if (H5SM_init(f, plist, &ext_loc, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to create SOHM table")
         } /* end if */
 
         /* Check for non-default v1 B-tree 'K' values to store */
-        if(sblock->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF ||
-                sblock->btree_k[H5B_CHUNK_ID] != HDF5_BTREE_CHUNK_IK_DEF ||
-                sblock->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF) {
-            H5O_btreek_t btreek;        /* v1 B-tree 'K' value message for superblock extension */
+        if (sblock->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF ||
+            sblock->btree_k[H5B_CHUNK_ID] != HDF5_BTREE_CHUNK_IK_DEF ||
+            sblock->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF) {
+            H5O_btreek_t btreek; /* v1 B-tree 'K' value message for superblock extension */
 
             /* Write v1 B-tree 'K' value information to the superblock extension */
             btreek.btree_k[H5B_CHUNK_ID] = sblock->btree_k[H5B_CHUNK_ID];
             btreek.btree_k[H5B_SNODE_ID] = sblock->btree_k[H5B_SNODE_ID];
-            btreek.sym_leaf_k = sblock->sym_leaf_k;
-            if(H5O_msg_create(&ext_loc, H5O_BTREEK_ID, H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, &btreek, dxpl_id) < 0)
-                HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update v1 B-tree 'K' value header message")
+            btreek.sym_leaf_k            = sblock->sym_leaf_k;
+            if (H5O_msg_create(&ext_loc, H5O_BTREEK_ID, H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_DONTSHARE,
+                               H5O_UPDATE_TIME, &btreek, dxpl_id) < 0)
+                HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL,
+                            "unable to update v1 B-tree 'K' value header message")
         } /* end if */
 
         /* Check for driver info to store */
-        if(driver_size > 0) {
-            H5O_drvinfo_t drvinfo;      /* Driver info */
-            uint8_t dbuf[H5F_MAX_DRVINFOBLOCK_SIZE];  /* Driver info block encoding buffer */
+        if (driver_size > 0) {
+            H5O_drvinfo_t drvinfo;                         /* Driver info */
+            uint8_t       dbuf[H5F_MAX_DRVINFOBLOCK_SIZE]; /* Driver info block encoding buffer */
 
             /* Sanity check */
             HDassert(driver_size <= H5F_MAX_DRVINFOBLOCK_SIZE);
 
             /* Encode driver-specific data */
-            if(H5FD_sb_encode(f->shared->lf, drvinfo.name, dbuf) < 0)
+            if (H5FD_sb_encode(f->shared->lf, drvinfo.name, dbuf) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to encode driver information")
 
             /* Write driver info information to the superblock extension */
             drvinfo.len = driver_size;
             drvinfo.buf = dbuf;
-            if(H5O_msg_create(&ext_loc, H5O_DRVINFO_ID, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, &drvinfo, dxpl_id) < 0)
+            if (H5O_msg_create(&ext_loc, H5O_DRVINFO_ID, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, &drvinfo,
+                               dxpl_id) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update driver info header message")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Close superblock extension, if it was created */
-    if(ext_created && H5F_super_ext_close(f, &ext_loc, dxpl_id, ext_created) < 0)
+    if (ext_created && H5F_super_ext_close(f, &ext_loc, dxpl_id, ext_created) < 0)
         HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "unable to close file's superblock extension")
 
     /* Cleanup on failure */
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Check if the superblock has been allocated yet */
-        if(sblock) {
+        if (sblock) {
             /* Check if we've cached it already */
-            if(sblock_in_cache) {
+            if (sblock_in_cache) {
                 /* Unpin superblock in cache */
-                if(H5AC_unpin_entry(sblock) < 0)
+                if (H5AC_unpin_entry(sblock) < 0)
                     HDONE_ERROR(H5E_FILE, H5E_CANTUNPIN, FAIL, "unable to unpin superblock")
 
                 /* Evict the superblock from the cache */
-                if(H5AC_expunge_entry(f, dxpl_id, H5AC_SUPERBLOCK, (haddr_t)0, H5AC__NO_FLAGS_SET) < 0)
+                if (H5AC_expunge_entry(f, dxpl_id, H5AC_SUPERBLOCK, (haddr_t)0, H5AC__NO_FLAGS_SET) < 0)
                     HDONE_ERROR(H5E_FILE, H5E_CANTEXPUNGE, FAIL, "unable to expunge superblock")
             } /* end if */
             else
                 /* Free superblock */
-                if(H5F_super_free(sblock) < 0)
-                    HDONE_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock")
+                if (H5F_super_free(sblock) < 0)
+                HDONE_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock")
 
             /* Reset variables in file structure */
             f->shared->sblock = NULL;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_super_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_dirty
  *
@@ -592,7 +581,7 @@ done:
 herr_t
 H5F_super_dirty(H5F_t *f)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -602,14 +591,13 @@ H5F_super_dirty(H5F_t *f)
     HDassert(f->shared->sblock);
 
     /* Mark superblock dirty in cache, so change to EOA will get encoded */
-    if(H5AC_mark_entry_dirty(f->shared->sblock) < 0)
+    if (H5AC_mark_entry_dirty(f->shared->sblock) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, FAIL, "unable to mark superblock as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_super_dirty() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_free
  *
@@ -640,7 +628,6 @@ H5F_super_free(H5F_super_t *sblock)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F_super_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_size
  *
@@ -657,7 +644,7 @@ H5F_super_free(H5F_super_t *sblock)
 herr_t
 H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_size)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -667,14 +654,14 @@ H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_
     HDassert(f->shared->sblock);
 
     /* Set the superblock size */
-    if(super_size)
-	*super_size = (hsize_t)H5F_SUPERBLOCK_SIZE(f->shared->sblock->super_vers, f);
+    if (super_size)
+        *super_size = (hsize_t)H5F_SUPERBLOCK_SIZE(f->shared->sblock->super_vers, f);
 
     /* Set the superblock extension size */
-    if(super_ext_size) {
-        if(H5F_addr_defined(f->shared->sblock->ext_addr)) {
-            H5O_loc_t ext_loc;          /* "Object location" for superblock extension */
-            H5O_hdr_info_t hdr_info;    /* Object info for superblock extension */
+    if (super_ext_size) {
+        if (H5F_addr_defined(f->shared->sblock->ext_addr)) {
+            H5O_loc_t      ext_loc;  /* "Object location" for superblock extension */
+            H5O_hdr_info_t hdr_info; /* Object info for superblock extension */
 
             /* Set up "fake" object location for superblock extension */
             H5O_loc_reset(&ext_loc);
@@ -682,7 +669,7 @@ H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_
             ext_loc.addr = f->shared->sblock->ext_addr;
 
             /* Get object header info for superblock extension */
-            if(H5O_get_hdr_info(&ext_loc, dxpl_id, &hdr_info) < 0)
+            if (H5O_get_hdr_info(&ext_loc, dxpl_id, &hdr_info) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to retrieve superblock extension info")
 
             /* Set the superblock extension size */
@@ -697,7 +684,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_super_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_ext_write_msg()
  *
@@ -712,11 +698,11 @@ done:
 herr_t
 H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, unsigned id, void *mesg, hbool_t may_create)
 {
-    hbool_t     ext_created = FALSE;   /* Whether superblock extension was created */
-    hbool_t     ext_opened = FALSE;    /* Whether superblock extension was opened */
-    H5O_loc_t 	ext_loc; 	/* "Object location" for superblock extension */
-    htri_t 	status;       	/* Indicate whether the message exists or not */
-    herr_t 	ret_value = SUCCEED;         /* Return value */
+    hbool_t   ext_created = FALSE; /* Whether superblock extension was created */
+    hbool_t   ext_opened  = FALSE; /* Whether superblock extension was opened */
+    H5O_loc_t ext_loc;             /* "Object location" for superblock extension */
+    htri_t    status;              /* Indicate whether the message exists or not */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -726,50 +712,50 @@ H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, unsigned id, void *mesg, hbool_
     HDassert(f->shared->sblock);
 
     /* Open/create the superblock extension object header */
-    if(H5F_addr_defined(f->shared->sblock->ext_addr)) {
-	if(H5F_super_ext_open(f, f->shared->sblock->ext_addr, &ext_loc) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENOBJ, FAIL, "unable to open file's superblock extension")
+    if (H5F_addr_defined(f->shared->sblock->ext_addr)) {
+        if (H5F_super_ext_open(f, f->shared->sblock->ext_addr, &ext_loc) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTOPENOBJ, FAIL, "unable to open file's superblock extension")
     } /* end if */
     else {
         HDassert(may_create);
-	if(H5F_super_ext_create(f, dxpl_id, &ext_loc) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "unable to create file's superblock extension")
+        if (H5F_super_ext_create(f, dxpl_id, &ext_loc) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "unable to create file's superblock extension")
         ext_created = TRUE;
     } /* end else */
     HDassert(H5F_addr_defined(ext_loc.addr));
     ext_opened = TRUE;
 
     /* Check if message with ID does not exist in the object header */
-    if((status = H5O_msg_exists(&ext_loc, id, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to check object header for message or message exists")
+    if ((status = H5O_msg_exists(&ext_loc, id, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL,
+                    "unable to check object header for message or message exists")
 
     /* Check for creating vs. writing */
-    if(may_create) {
-	if(status)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "Message should not exist")
+    if (may_create) {
+        if (status)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "Message should not exist")
 
-	/* Create the message with ID in the superblock extension */
-	if(H5O_msg_create(&ext_loc, id, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, mesg, dxpl_id) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to create the message in object header")
+        /* Create the message with ID in the superblock extension */
+        if (H5O_msg_create(&ext_loc, id, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, mesg, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to create the message in object header")
     } /* end if */
     else {
-	if(!status)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "Message should exist")
+        if (!status)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "Message should exist")
 
-	/* Update the message with ID in the superblock extension */
-	if(H5O_msg_write(&ext_loc, id, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, mesg, dxpl_id) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to write the message in object header")
+        /* Update the message with ID in the superblock extension */
+        if (H5O_msg_write(&ext_loc, id, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, mesg, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to write the message in object header")
     } /* end else */
 
 done:
     /* Close the superblock extension, if it was opened */
-    if(ext_opened && H5F_super_ext_close(f, &ext_loc, dxpl_id, ext_created) < 0)
+    if (ext_opened && H5F_super_ext_close(f, &ext_loc, dxpl_id, ext_created) < 0)
         HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "unable to close file's superblock extension")
 
     /* Mark superblock dirty in cache, if superblock extension was created */
-    if(ext_created && H5AC_mark_entry_dirty(f->shared->sblock) < 0)
+    if (ext_created && H5AC_mark_entry_dirty(f->shared->sblock) < 0)
         HDONE_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, FAIL, "unable to mark superblock as dirty")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_super_ext_write_msg() */
-
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index c6f7a46..73f4925 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -15,43 +15,38 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5FLprivate.h"        /* Free Lists                           */
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Pprivate.h"		/* Property lists			*/
-#include "H5SMprivate.h"        /* Shared Object Header Messages        */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Pprivate.h"  /* Property lists			*/
+#include "H5SMprivate.h" /* Shared Object Header Messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Maximum size of super-block buffers */
-#define H5F_MAX_SUPERBLOCK_SIZE  134
-
+#define H5F_MAX_SUPERBLOCK_SIZE 134
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -59,11 +54,10 @@
 /* Metadata cache (H5AC) callbacks */
 static H5F_super_t *H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
 static herr_t H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F_super_t *sblock);
-static herr_t H5F_sblock_dest(H5F_t *f, H5F_super_t * sblock);
+static herr_t H5F_sblock_dest(H5F_t *f, H5F_super_t *sblock);
 static herr_t H5F_sblock_clear(H5F_t *f, H5F_super_t *sblock, hbool_t destroy);
 static herr_t H5F_sblock_size(const H5F_t *f, const H5F_super_t *sblock, size_t *size_ptr);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -85,13 +79,10 @@ const H5AC_class_t H5AC_SUPERBLOCK[1] = {{
 /* Declare extern the free list to manage the H5F_super_t struct */
 H5FL_EXTERN(H5F_super_t);
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_sblock_load
  *
@@ -110,23 +101,23 @@ H5FL_EXTERN(H5F_super_t);
 static H5F_super_t *
 H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_udata)
 {
-    H5F_super_t        *sblock = NULL;      /* File's superblock */
-    haddr_t             base_addr = HADDR_UNDEF;        /* Base address of file */
-    uint8_t             sbuf[H5F_MAX_SUPERBLOCK_SIZE];     /* Buffer for superblock */
-    H5P_genplist_t     *dxpl;               /* DXPL object */
-    H5P_genplist_t     *c_plist;            /* File creation property list  */
-    H5F_file_t         *shared;             /* shared part of `file'        */
-    H5FD_t             *lf;                 /* file driver part of `shared' */
-    haddr_t             stored_eoa;         /*relative end-of-addr in file  */
-    haddr_t             eof;                /*end of file address           */
-    uint8_t             sizeof_addr;        /* Size of offsets in the file (in bytes) */
-    uint8_t             sizeof_size;        /* Size of lengths in the file (in bytes) */
-    const size_t        fixed_size = H5F_SUPERBLOCK_FIXED_SIZE; /*fixed sizeof superblock   */
-    size_t              variable_size;      /*variable sizeof superblock    */
-    uint8_t            *p;                  /* Temporary pointer into encoding buffer */
-    unsigned            super_vers;         /* Superblock version          */
-    hbool_t            *dirtied = (hbool_t *)_udata;  /* Set up dirtied out value */
-    H5F_super_t        *ret_value;          /* Return value */
+    H5F_super_t *   sblock    = NULL;                       /* File's superblock */
+    haddr_t         base_addr = HADDR_UNDEF;                /* Base address of file */
+    uint8_t         sbuf[H5F_MAX_SUPERBLOCK_SIZE];          /* Buffer for superblock */
+    H5P_genplist_t *dxpl;                                   /* DXPL object */
+    H5P_genplist_t *c_plist;                                /* File creation property list  */
+    H5F_file_t *    shared;                                 /* shared part of `file'        */
+    H5FD_t *        lf;                                     /* file driver part of `shared' */
+    haddr_t         stored_eoa;                             /*relative end-of-addr in file  */
+    haddr_t         eof;                                    /*end of file address           */
+    uint8_t         sizeof_addr;                            /* Size of offsets in the file (in bytes) */
+    uint8_t         sizeof_size;                            /* Size of lengths in the file (in bytes) */
+    const size_t    fixed_size = H5F_SUPERBLOCK_FIXED_SIZE; /*fixed sizeof superblock   */
+    size_t          variable_size;                          /*variable sizeof superblock    */
+    uint8_t *       p;                                      /* Temporary pointer into encoding buffer */
+    unsigned        super_vers;                             /* Superblock version          */
+    hbool_t *       dirtied = (hbool_t *)_udata;            /* Set up dirtied out value */
+    H5F_super_t *   ret_value;                              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -137,30 +128,30 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
 
     /* Short cuts */
     shared = f->shared;
-    lf = shared->lf;
+    lf     = shared->lf;
 
     /* Get the shared file creation property list */
-    if(NULL == (c_plist = (H5P_genplist_t *)H5I_object(shared->fcpl_id)))
+    if (NULL == (c_plist = (H5P_genplist_t *)H5I_object(shared->fcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "can't get property list")
 
     /* Get the base address for the file in the VFD */
-    if(HADDR_UNDEF == (base_addr = H5FD_get_base_addr(lf)))
+    if (HADDR_UNDEF == (base_addr = H5FD_get_base_addr(lf)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "failed to get base address for file driver")
 
     /* Allocate space for the superblock */
-    if(NULL == (sblock = H5FL_CALLOC(H5F_super_t)))
+    if (NULL == (sblock = H5FL_CALLOC(H5F_super_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Get the DXPL plist object for DXPL ID */
-    if(NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "can't get property list")
 
     /* Read fixed-size portion of the superblock */
     p = sbuf;
     H5_CHECK_OVERFLOW(fixed_size, size_t, haddr_t);
-    if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, (haddr_t)fixed_size) < 0)
+    if (H5FD_set_eoa(lf, H5FD_MEM_SUPER, (haddr_t)fixed_size) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "set end of space allocation request failed")
-    if(H5FD_read(lf, dxpl, H5FD_MEM_SUPER, (haddr_t)0, fixed_size, p) < 0)
+    if (H5FD_read(lf, dxpl, H5FD_MEM_SUPER, (haddr_t)0, fixed_size, p) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "unable to read superblock")
 
     /* Skip over signature (already checked when locating the superblock) */
@@ -168,9 +159,9 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
 
     /* Superblock version */
     super_vers = *p++;
-    if(super_vers > HDF5_SUPERBLOCK_VERSION_LATEST)
+    if (super_vers > HDF5_SUPERBLOCK_VERSION_LATEST)
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad superblock version number")
-    if(H5P_set(c_plist, H5F_CRT_SUPER_VERS_NAME, &super_vers) < 0)
+    if (H5P_set(c_plist, H5F_CRT_SUPER_VERS_NAME, &super_vers) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set superblock version")
 
     /* Record the superblock version */
@@ -185,66 +176,66 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
     HDassert(fixed_size + variable_size <= sizeof(sbuf));
 
     /* Read in variable-sized portion of superblock */
-    if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, (haddr_t)(fixed_size + variable_size)) < 0)
+    if (H5FD_set_eoa(lf, H5FD_MEM_SUPER, (haddr_t)(fixed_size + variable_size)) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "set end of space allocation request failed")
-    if(H5FD_read(lf, dxpl, H5FD_MEM_SUPER, (haddr_t)fixed_size, variable_size, p) < 0)
+    if (H5FD_read(lf, dxpl, H5FD_MEM_SUPER, (haddr_t)fixed_size, variable_size, p) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to read superblock")
 
     /* Check for older version of superblock format */
-    if(super_vers < HDF5_SUPERBLOCK_VERSION_2) {
-        uint32_t	status_flags;	    /* File status flags	   */
-        unsigned        btree_k[H5B_NUM_BTREE_ID];  /* B-tree internal node 'K' values */
-        unsigned        sym_leaf_k;         /* Symbol table leaf node's 'K' value */
+    if (super_vers < HDF5_SUPERBLOCK_VERSION_2) {
+        uint32_t status_flags;              /* File status flags	   */
+        unsigned btree_k[H5B_NUM_BTREE_ID]; /* B-tree internal node 'K' values */
+        unsigned sym_leaf_k;                /* Symbol table leaf node's 'K' value */
 
         /* Freespace version (hard-wired) */
-        if(HDF5_FREESPACE_VERSION != *p++)
+        if (HDF5_FREESPACE_VERSION != *p++)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad free space version number")
 
         /* Root group version number (hard-wired) */
-        if(HDF5_OBJECTDIR_VERSION != *p++)
+        if (HDF5_OBJECTDIR_VERSION != *p++)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad object directory version number")
 
         /* Skip over reserved byte */
         p++;
 
         /* Shared header version number (hard-wired) */
-        if(HDF5_SHAREDHEADER_VERSION != *p++)
+        if (HDF5_SHAREDHEADER_VERSION != *p++)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad shared-header format version number")
 
         /* Size of file addresses */
         sizeof_addr = *p++;
-        if(sizeof_addr != 2 && sizeof_addr != 4 &&
-                sizeof_addr != 8 && sizeof_addr != 16 && sizeof_addr != 32)
+        if (sizeof_addr != 2 && sizeof_addr != 4 && sizeof_addr != 8 && sizeof_addr != 16 &&
+            sizeof_addr != 32)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad byte number in an address")
-        if(H5P_set(c_plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &sizeof_addr) < 0)
+        if (H5P_set(c_plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &sizeof_addr) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set byte number in an address")
-        shared->sizeof_addr = sizeof_addr;  /* Keep a local copy also */
+        shared->sizeof_addr = sizeof_addr; /* Keep a local copy also */
 
         /* Size of file sizes */
         sizeof_size = *p++;
-        if(sizeof_size != 2 && sizeof_size != 4 &&
-                sizeof_size != 8 && sizeof_size != 16 && sizeof_size != 32)
+        if (sizeof_size != 2 && sizeof_size != 4 && sizeof_size != 8 && sizeof_size != 16 &&
+            sizeof_size != 32)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad byte number for object size")
-        if(H5P_set(c_plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &sizeof_size) < 0)
+        if (H5P_set(c_plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &sizeof_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set byte number for object size")
-        shared->sizeof_size = sizeof_size;  /* Keep a local copy also */
+        shared->sizeof_size = sizeof_size; /* Keep a local copy also */
 
         /* Skip over reserved byte */
         p++;
 
         /* Various B-tree sizes */
         UINT16DECODE(p, sym_leaf_k);
-        if(sym_leaf_k == 0)
+        if (sym_leaf_k == 0)
             HGOTO_ERROR(H5E_FILE, H5E_BADRANGE, NULL, "bad symbol table leaf node 1/2 rank")
-        if(H5P_set(c_plist, H5F_CRT_SYM_LEAF_NAME, &sym_leaf_k) < 0)
+        if (H5P_set(c_plist, H5F_CRT_SYM_LEAF_NAME, &sym_leaf_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set rank for symbol table leaf nodes")
-        sblock->sym_leaf_k = sym_leaf_k;    /* Keep a local copy also */
+        sblock->sym_leaf_k = sym_leaf_k; /* Keep a local copy also */
 
         /* Need 'get' call to set other array values */
-        if(H5P_get(c_plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
+        if (H5P_get(c_plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "unable to get rank for btree internal nodes")
         UINT16DECODE(p, btree_k[H5B_SNODE_ID]);
-        if(btree_k[H5B_SNODE_ID] == 0)
+        if (btree_k[H5B_SNODE_ID] == 0)
             HGOTO_ERROR(H5E_FILE, H5E_BADRANGE, NULL, "bad 1/2 rank for btree internal nodes")
         /*
          * Delay setting the value in the property list until we've checked
@@ -255,40 +246,42 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
         UINT32DECODE(p, status_flags);
         HDassert(status_flags <= 255);
         sblock->status_flags = (uint8_t)status_flags;
-        if(sblock->status_flags & ~H5F_SUPER_ALL_FLAGS)
+        if (sblock->status_flags & ~H5F_SUPER_ALL_FLAGS)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad flag value for superblock")
 
         /*
          * If the superblock version # is greater than 0, read in the indexed
          * storage B-tree internal 'K' value
          */
-        if(super_vers > HDF5_SUPERBLOCK_VERSION_DEF) {
+        if (super_vers > HDF5_SUPERBLOCK_VERSION_DEF) {
             UINT16DECODE(p, btree_k[H5B_CHUNK_ID]);
             /* Reserved bytes are present only in version 1 */
-            if(super_vers == HDF5_SUPERBLOCK_VERSION_1)
-                p += 2;   /* reserved */
-        } /* end if */
+            if (super_vers == HDF5_SUPERBLOCK_VERSION_1)
+                p += 2; /* reserved */
+        }               /* end if */
         else
             btree_k[H5B_CHUNK_ID] = HDF5_BTREE_CHUNK_IK_DEF;
 
         /* Set the B-tree internal node values, etc */
-        if(H5P_set(c_plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
+        if (H5P_set(c_plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set rank for btree internal nodes")
-        HDmemcpy(sblock->btree_k, btree_k, sizeof(unsigned) * (size_t)H5B_NUM_BTREE_ID);    /* Keep a local copy also */
+        HDmemcpy(sblock->btree_k, btree_k,
+                 sizeof(unsigned) * (size_t)H5B_NUM_BTREE_ID); /* Keep a local copy also */
 
         /* Remainder of "variable-sized" portion of superblock */
-        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->base_addr/*out*/);
-        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->ext_addr/*out*/);
-        H5F_addr_decode(f, (const uint8_t **)&p, &stored_eoa/*out*/);
-        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->driver_addr/*out*/);
+        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->base_addr /*out*/);
+        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->ext_addr /*out*/);
+        H5F_addr_decode(f, (const uint8_t **)&p, &stored_eoa /*out*/);
+        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->driver_addr /*out*/);
 
         /* Allocate space for the root group symbol table entry */
         HDassert(!sblock->root_ent);
-        if(NULL == (sblock->root_ent = (H5G_entry_t *)H5MM_calloc(sizeof(H5G_entry_t))))
-            HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, NULL, "can't allocate space for root group symbol table entry")
+        if (NULL == (sblock->root_ent = (H5G_entry_t *)H5MM_calloc(sizeof(H5G_entry_t))))
+            HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, NULL,
+                        "can't allocate space for root group symbol table entry")
 
         /* decode the root group symbol table entry */
-        if(H5G_ent_decode(f, (const uint8_t **)&p, sblock->root_ent) < 0)
+        if (H5G_ent_decode(f, (const uint8_t **)&p, sblock->root_ent) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTDECODE, NULL, "can't decode root group symbol table entry")
 
         /* Set the root group address to the correct value */
@@ -298,9 +291,9 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
          * Check if superblock address is different from base address and
          * adjust base address and "end of address" address if so.
          */
-        if(!H5F_addr_eq(base_addr, sblock->base_addr)) {
+        if (!H5F_addr_eq(base_addr, sblock->base_addr)) {
             /* Check if the superblock moved earlier in the file */
-            if(H5F_addr_lt(base_addr, sblock->base_addr))
+            if (H5F_addr_lt(base_addr, sblock->base_addr))
                 stored_eoa -= (sblock->base_addr - base_addr);
             else
                 /* The superblock moved later in the file */
@@ -310,7 +303,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
             sblock->base_addr = base_addr;
 
             /* Set the base address for the file in the VFD now */
-            if(H5FD_set_base_addr(lf, sblock->base_addr) < 0)
+            if (H5FD_set_base_addr(lf, sblock->base_addr) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTSET, NULL, "failed to set base address for file driver")
 
             /* Indicate that the superblock should be marked dirty */
@@ -322,7 +315,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
          *  undefined to let the library ignore the family driver information saved
          *  in the superblock.
          */
-        if(H5F_HAS_FEATURE(f, H5FD_FEAT_IGNORE_DRVRINFO)) {
+        if (H5F_HAS_FEATURE(f, H5FD_FEAT_IGNORE_DRVRINFO)) {
             /* Eliminate the driver info */
             sblock->driver_addr = HADDR_UNDEF;
 
@@ -331,22 +324,23 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
         } /* end if */
 
         /* Decode the optional driver information block */
-        if(H5F_addr_defined(sblock->driver_addr)) {
-            uint8_t dbuf[H5F_MAX_DRVINFOBLOCK_SIZE];     /* Buffer for driver info block */
-            char drv_name[9];       /* Name of driver */
-            unsigned drv_vers;      /* Version of driver info block */
-            size_t drv_variable_size; /* Size of variable-length portion of driver info block, in bytes */
+        if (H5F_addr_defined(sblock->driver_addr)) {
+            uint8_t  dbuf[H5F_MAX_DRVINFOBLOCK_SIZE]; /* Buffer for driver info block */
+            char     drv_name[9];                     /* Name of driver */
+            unsigned drv_vers;                        /* Version of driver info block */
+            size_t   drv_variable_size; /* Size of variable-length portion of driver info block, in bytes */
 
             /* Read in fixed-sized portion of driver info block */
             p = dbuf;
-            if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, sblock->driver_addr + H5F_DRVINFOBLOCK_HDR_SIZE) < 0)
+            if (H5FD_set_eoa(lf, H5FD_MEM_SUPER, sblock->driver_addr + H5F_DRVINFOBLOCK_HDR_SIZE) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "set end of space allocation request failed")
-            if(H5FD_read(lf, dxpl, H5FD_MEM_SUPER, sblock->driver_addr, (size_t)H5F_DRVINFOBLOCK_HDR_SIZE, p) < 0)
+            if (H5FD_read(lf, dxpl, H5FD_MEM_SUPER, sblock->driver_addr, (size_t)H5F_DRVINFOBLOCK_HDR_SIZE,
+                          p) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to read driver information block")
 
             /* Version number */
             drv_vers = *p++;
-            if(drv_vers != HDF5_DRIVERINFO_VERSION_0)
+            if (drv_vers != HDF5_DRIVERINFO_VERSION_0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "bad driver information block version number")
 
             p += 3; /* reserved bytes */
@@ -365,54 +359,56 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
             /* Check if driver matches driver information saved. Unfortunately, we can't push this
              * function to each specific driver because we're checking if the driver is correct.
              */
-            if(!HDstrncmp(drv_name, "NCSAfami", (size_t)8) && HDstrcmp(lf->cls->name, "family"))
+            if (!HDstrncmp(drv_name, "NCSAfami", (size_t)8) && HDstrcmp(lf->cls->name, "family"))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "family driver should be used")
-            if(!HDstrncmp(drv_name, "NCSAmult", (size_t)8) && HDstrcmp(lf->cls->name, "multi"))
+            if (!HDstrncmp(drv_name, "NCSAmult", (size_t)8) && HDstrcmp(lf->cls->name, "multi"))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "multi driver should be used")
 
             /* Read in variable-sized portion of driver info block */
-            if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, sblock->driver_addr + H5F_DRVINFOBLOCK_HDR_SIZE + drv_variable_size) < 0)
+            if (H5FD_set_eoa(lf, H5FD_MEM_SUPER,
+                             sblock->driver_addr + H5F_DRVINFOBLOCK_HDR_SIZE + drv_variable_size) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "set end of space allocation request failed")
-            if(H5FD_read(lf, dxpl, H5FD_MEM_SUPER, sblock->driver_addr + H5F_DRVINFOBLOCK_HDR_SIZE, drv_variable_size, p) < 0)
+            if (H5FD_read(lf, dxpl, H5FD_MEM_SUPER, sblock->driver_addr + H5F_DRVINFOBLOCK_HDR_SIZE,
+                          drv_variable_size, p) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to read file driver information")
 
             /* Decode driver information */
-            if(H5FD_sb_decode(lf, drv_name, p) < 0)
+            if (H5FD_sb_decode(lf, drv_name, p) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to decode driver information")
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
-        uint32_t computed_chksum;       /* Computed checksum  */
-        uint32_t read_chksum;           /* Checksum read from file  */
+        uint32_t computed_chksum; /* Computed checksum  */
+        uint32_t read_chksum;     /* Checksum read from file  */
 
         /* Size of file addresses */
         sizeof_addr = *p++;
-        if(sizeof_addr != 2 && sizeof_addr != 4 &&
-                sizeof_addr != 8 && sizeof_addr != 16 && sizeof_addr != 32)
+        if (sizeof_addr != 2 && sizeof_addr != 4 && sizeof_addr != 8 && sizeof_addr != 16 &&
+            sizeof_addr != 32)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad byte number in an address")
-        if(H5P_set(c_plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &sizeof_addr) < 0)
+        if (H5P_set(c_plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &sizeof_addr) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set byte number in an address")
-        shared->sizeof_addr = sizeof_addr;  /* Keep a local copy also */
+        shared->sizeof_addr = sizeof_addr; /* Keep a local copy also */
 
         /* Size of file sizes */
         sizeof_size = *p++;
-        if(sizeof_size != 2 && sizeof_size != 4 &&
-                sizeof_size != 8 && sizeof_size != 16 && sizeof_size != 32)
+        if (sizeof_size != 2 && sizeof_size != 4 && sizeof_size != 8 && sizeof_size != 16 &&
+            sizeof_size != 32)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad byte number for object size")
-        if(H5P_set(c_plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &sizeof_size) < 0)
+        if (H5P_set(c_plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &sizeof_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set byte number for object size")
-        shared->sizeof_size = sizeof_size;  /* Keep a local copy also */
+        shared->sizeof_size = sizeof_size; /* Keep a local copy also */
 
         /* File status flags (not really used yet) */
         sblock->status_flags = *p++;
-        if(sblock->status_flags & ~H5F_SUPER_ALL_FLAGS)
+        if (sblock->status_flags & ~H5F_SUPER_ALL_FLAGS)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad flag value for superblock")
 
         /* Base, superblock extension, end of file & root group object header addresses */
-        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->base_addr/*out*/);
-        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->ext_addr/*out*/);
-        H5F_addr_decode(f, (const uint8_t **)&p, &stored_eoa/*out*/);
-        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->root_addr/*out*/);
+        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->base_addr /*out*/);
+        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->ext_addr /*out*/);
+        H5F_addr_decode(f, (const uint8_t **)&p, &stored_eoa /*out*/);
+        H5F_addr_decode(f, (const uint8_t **)&p, &sblock->root_addr /*out*/);
 
         /* Compute checksum for superblock */
         computed_chksum = H5_checksum_metadata(sbuf, (size_t)(p - sbuf), 0);
@@ -421,16 +417,16 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
         UINT32DECODE(p, read_chksum);
 
         /* Verify correct checksum */
-        if(read_chksum != computed_chksum)
+        if (read_chksum != computed_chksum)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "bad checksum on driver information block")
 
         /*
          * Check if superblock address is different from base address and
          * adjust base address and "end of address" address if so.
          */
-        if(!H5F_addr_eq(base_addr, sblock->base_addr)) {
+        if (!H5F_addr_eq(base_addr, sblock->base_addr)) {
             /* Check if the superblock moved earlier in the file */
-            if(H5F_addr_lt(base_addr, sblock->base_addr))
+            if (H5F_addr_lt(base_addr, sblock->base_addr))
                 stored_eoa -= (sblock->base_addr - base_addr);
             else
                 /* The superblock moved later in the file */
@@ -440,7 +436,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
             sblock->base_addr = base_addr;
 
             /* Set the base address for the file in the VFD now */
-            if(H5FD_set_base_addr(lf, sblock->base_addr) < 0)
+            if (H5FD_set_base_addr(lf, sblock->base_addr) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTSET, NULL, "failed to set base address for file driver")
 
             /* Indicate that the superblock should be marked dirty */
@@ -448,9 +444,9 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
         } /* end if */
 
         /* Get the B-tree internal node values, etc */
-        if(H5P_get(c_plist, H5F_CRT_BTREE_RANK_NAME, sblock->btree_k) < 0)
+        if (H5P_get(c_plist, H5F_CRT_BTREE_RANK_NAME, sblock->btree_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "unable to get rank for btree internal nodes")
-        if(H5P_get(c_plist, H5F_CRT_SYM_LEAF_NAME, &sblock->sym_leaf_k) < 0)
+        if (H5P_get(c_plist, H5F_CRT_SYM_LEAF_NAME, &sblock->sym_leaf_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "unable to get rank for btree internal nodes")
     } /* end else */
 
@@ -458,7 +454,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
      * The user-defined data is the area of the file before the base
      * address.
      */
-    if(H5P_set(c_plist, H5F_CRT_USER_BLOCK_NAME, &sblock->base_addr) < 0)
+    if (H5P_set(c_plist, H5F_CRT_USER_BLOCK_NAME, &sblock->base_addr) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set userblock size")
 
     /*
@@ -466,27 +462,30 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
      * possible is if the first file of a family of files was opened
      * individually.
      */
-    if(HADDR_UNDEF == (eof = H5FD_get_eof(lf)))
+    if (HADDR_UNDEF == (eof = H5FD_get_eof(lf)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to determine file size")
 
     /* (Account for the stored EOA being absolute offset -QAK) */
-    if((eof + sblock->base_addr) < stored_eoa)
-        HGOTO_ERROR(H5E_FILE, H5E_TRUNCATED, NULL, "truncated file: eof = %llu, sblock->base_addr = %llu, stored_eoa = %llu", (unsigned long long)eof, (unsigned long long)sblock->base_addr, (unsigned long long)stored_eoa)
+    if ((eof + sblock->base_addr) < stored_eoa)
+        HGOTO_ERROR(H5E_FILE, H5E_TRUNCATED, NULL,
+                    "truncated file: eof = %llu, sblock->base_addr = %llu, stored_eoa = %llu",
+                    (unsigned long long)eof, (unsigned long long)sblock->base_addr,
+                    (unsigned long long)stored_eoa)
 
     /*
      * Tell the file driver how much address space has already been
      * allocated so that it knows how to allocate additional memory.
      */
     /* (Account for the stored EOA being absolute offset -NAF) */
-    if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, stored_eoa - sblock->base_addr) < 0)
+    if (H5FD_set_eoa(lf, H5FD_MEM_SUPER, stored_eoa - sblock->base_addr) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to set end-of-address marker for file")
 
     /* Read the file's superblock extension, if there is one. */
-    if(H5F_addr_defined(sblock->ext_addr)) {
-        H5O_loc_t ext_loc;      /* "Object location" for superblock extension */
-        H5O_btreek_t btreek;    /* v1 B-tree 'K' value message from superblock extension */
-        H5O_drvinfo_t drvinfo;  /* Driver info message from superblock extension */
-        htri_t status;          /* Status for message existing */
+    if (H5F_addr_defined(sblock->ext_addr)) {
+        H5O_loc_t     ext_loc; /* "Object location" for superblock extension */
+        H5O_btreek_t  btreek;  /* v1 B-tree 'K' value message from superblock extension */
+        H5O_drvinfo_t drvinfo; /* Driver info message from superblock extension */
+        htri_t        status;  /* Status for message existing */
 
         /* Sanity check - superblock extension should only be defined for
          *      superblock version >= 2.
@@ -496,77 +495,77 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
         /* Check for superblock extension being located "outside" the stored
          *      'eoa' value, which can occur with the split/multi VFD.
          */
-        if(H5F_addr_gt(sblock->ext_addr, stored_eoa)) {
+        if (H5F_addr_gt(sblock->ext_addr, stored_eoa)) {
             /* Set the 'eoa' for the object header memory type large enough
              *  to give some room for a reasonably sized superblock extension.
              *  (This is _rather_ a kludge -QAK)
              */
-            if(H5FD_set_eoa(lf, H5FD_MEM_OHDR, (haddr_t)(sblock->ext_addr + 1024)) < 0)
+            if (H5FD_set_eoa(lf, H5FD_MEM_OHDR, (haddr_t)(sblock->ext_addr + 1024)) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to set end-of-address marker for file")
         } /* end if */
 
         /* Open the superblock extension */
-	if(H5F_super_ext_open(f, sblock->ext_addr, &ext_loc) < 0)
+        if (H5F_super_ext_open(f, sblock->ext_addr, &ext_loc) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENOBJ, NULL, "unable to open file's superblock extension")
 
         /* Check for the extension having a 'driver info' message */
-        if((status = H5O_msg_exists(&ext_loc, H5O_DRVINFO_ID, dxpl_id)) < 0)
+        if ((status = H5O_msg_exists(&ext_loc, H5O_DRVINFO_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "unable to read object header")
-        if(status) {
+        if (status) {
             /* Check for ignoring the driver info for this file */
-            if(H5F_HAS_FEATURE(f, H5FD_FEAT_IGNORE_DRVRINFO)) {
+            if (H5F_HAS_FEATURE(f, H5FD_FEAT_IGNORE_DRVRINFO)) {
                 /* Indicate that the superblock should be marked dirty */
                 *dirtied = TRUE;
             } /* end if */
             else {
                 /* Retrieve the 'driver info' structure */
-                if(NULL == H5O_msg_read(&ext_loc, H5O_DRVINFO_ID, &drvinfo, dxpl_id))
+                if (NULL == H5O_msg_read(&ext_loc, H5O_DRVINFO_ID, &drvinfo, dxpl_id))
                     HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "driver info message not present")
 
                 /* Check if driver matches driver information saved. Unfortunately, we can't push this
                  * function to each specific driver because we're checking if the driver is correct.
                  */
-                if(!HDstrncmp(drvinfo.name, "NCSAfami", (size_t)8) && HDstrcmp(lf->cls->name, "family"))
+                if (!HDstrncmp(drvinfo.name, "NCSAfami", (size_t)8) && HDstrcmp(lf->cls->name, "family"))
                     HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "family driver should be used")
-                if(!HDstrncmp(drvinfo.name, "NCSAmult", (size_t)8) && HDstrcmp(lf->cls->name, "multi"))
+                if (!HDstrncmp(drvinfo.name, "NCSAmult", (size_t)8) && HDstrcmp(lf->cls->name, "multi"))
                     HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "multi driver should be used")
 
                 /* Decode driver information */
-                if(H5FD_sb_decode(lf, drvinfo.name, drvinfo.buf) < 0)
+                if (H5FD_sb_decode(lf, drvinfo.name, drvinfo.buf) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to decode driver information")
 
                 /* Reset driver info message */
                 H5O_msg_reset(H5O_DRVINFO_ID, &drvinfo);
             } /* end else */
-        } /* end if */
+        }     /* end if */
 
         /* Read in the shared OH message information if there is any */
-        if(H5SM_get_info(&ext_loc, c_plist, dxpl_id) < 0)
+        if (H5SM_get_info(&ext_loc, c_plist, dxpl_id) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to read SOHM table information")
 
         /* Check for the extension having a 'v1 B-tree "K"' message */
-        if((status = H5O_msg_exists(&ext_loc, H5O_BTREEK_ID, dxpl_id)) < 0)
+        if ((status = H5O_msg_exists(&ext_loc, H5O_BTREEK_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "unable to read object header")
-        if(status) {
+        if (status) {
             /* Retrieve the 'v1 B-tree "K"' structure */
-            if(NULL == H5O_msg_read(&ext_loc, H5O_BTREEK_ID, &btreek, dxpl_id))
+            if (NULL == H5O_msg_read(&ext_loc, H5O_BTREEK_ID, &btreek, dxpl_id))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "v1 B-tree 'K' info message not present")
 
             /* Set non-default v1 B-tree 'K' value info from file */
             sblock->btree_k[H5B_CHUNK_ID] = btreek.btree_k[H5B_CHUNK_ID];
             sblock->btree_k[H5B_SNODE_ID] = btreek.btree_k[H5B_SNODE_ID];
-            sblock->sym_leaf_k = btreek.sym_leaf_k;
+            sblock->sym_leaf_k            = btreek.sym_leaf_k;
 
             /* Set non-default v1 B-tree 'K' values in the property list */
-            if(H5P_set(c_plist, H5F_CRT_BTREE_RANK_NAME, btreek.btree_k) < 0)
+            if (H5P_set(c_plist, H5F_CRT_BTREE_RANK_NAME, btreek.btree_k) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set rank for btree internal nodes")
-            if(H5P_set(c_plist, H5F_CRT_SYM_LEAF_NAME, &btreek.sym_leaf_k) < 0)
+            if (H5P_set(c_plist, H5F_CRT_SYM_LEAF_NAME, &btreek.sym_leaf_k) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set rank for symbol table leaf nodes")
         } /* end if */
 
         /* Close superblock extension */
-        if(H5F_super_ext_close(f, &ext_loc, dxpl_id, FALSE) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, NULL, "unable to close file's superblock extension")
+        if (H5F_super_ext_close(f, &ext_loc, dxpl_id, FALSE) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, NULL, "unable to close file's superblock extension")
     } /* end if */
 
     /* Set return value */
@@ -574,14 +573,13 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_uda
 
 done:
     /* Release the [possibly partially initialized] superblock on errors */
-    if(!ret_value && sblock)
-        if(H5F_super_free(sblock) < 0)
+    if (!ret_value && sblock)
+        if (H5F_super_free(sblock) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTFREE, NULL, "unable to destroy superblock data")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_sblock_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_sblock_flush
  *
@@ -597,10 +595,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSED addr,
-    H5F_super_t *sblock)
+H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSED addr, H5F_super_t *sblock)
 {
-    herr_t          ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -609,13 +606,14 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE
     HDassert(H5F_addr_eq(addr, 0));
     HDassert(sblock);
 
-    if(sblock->cache_info.is_dirty) {
-        H5P_genplist_t *dxpl;               /* DXPL object */
-        uint8_t         buf[H5F_MAX_SUPERBLOCK_SIZE + H5F_MAX_DRVINFOBLOCK_SIZE];  /* Superblock & driver info blockencoding buffer */
-        uint8_t        *p;                  /* Ptr into encoding buffer */
-        haddr_t         rel_eoa;            /* Relative EOA for file */
-        size_t          superblock_size;    /* Size of superblock, in bytes */
-        size_t          driver_size;        /* Size of driver info block (bytes)*/
+    if (sblock->cache_info.is_dirty) {
+        H5P_genplist_t *dxpl; /* DXPL object */
+        uint8_t         buf[H5F_MAX_SUPERBLOCK_SIZE +
+                    H5F_MAX_DRVINFOBLOCK_SIZE]; /* Superblock & driver info blockencoding buffer */
+        uint8_t *       p;                              /* Ptr into encoding buffer */
+        haddr_t         rel_eoa;                        /* Relative EOA for file */
+        size_t          superblock_size;                /* Size of superblock, in bytes */
+        size_t          driver_size;                    /* Size of driver info block (bytes)*/
 
         /* Encode the common portion of the file superblock for all versions */
         p = buf;
@@ -624,15 +622,15 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE
         *p++ = (uint8_t)sblock->super_vers;
 
         /* Check for older version of superblock format */
-        if(sblock->super_vers < HDF5_SUPERBLOCK_VERSION_2) {
-            *p++ = (uint8_t)HDF5_FREESPACE_VERSION;     /* (hard-wired) */
-            *p++ = (uint8_t)HDF5_OBJECTDIR_VERSION;     /* (hard-wired) */
-            *p++ = 0;   /* reserved*/
+        if (sblock->super_vers < HDF5_SUPERBLOCK_VERSION_2) {
+            *p++ = (uint8_t)HDF5_FREESPACE_VERSION; /* (hard-wired) */
+            *p++ = (uint8_t)HDF5_OBJECTDIR_VERSION; /* (hard-wired) */
+            *p++ = 0;                               /* reserved*/
 
-            *p++ = (uint8_t)HDF5_SHAREDHEADER_VERSION;  /* (hard-wired) */
+            *p++ = (uint8_t)HDF5_SHAREDHEADER_VERSION; /* (hard-wired) */
             *p++ = (uint8_t)H5F_SIZEOF_ADDR(f);
             *p++ = (uint8_t)H5F_SIZEOF_SIZE(f);
-            *p++ = 0;   /* reserved */
+            *p++ = 0; /* reserved */
 
             UINT16ENCODE(p, sblock->sym_leaf_k);
             UINT16ENCODE(p, sblock->btree_k[H5B_SNODE_ID]);
@@ -642,11 +640,11 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE
              * Versions of the superblock >0 have the indexed storage B-tree
              * internal 'K' value stored
              */
-            if(sblock->super_vers > HDF5_SUPERBLOCK_VERSION_DEF) {
+            if (sblock->super_vers > HDF5_SUPERBLOCK_VERSION_DEF) {
                 UINT16ENCODE(p, sblock->btree_k[H5B_CHUNK_ID]);
-                *p++ = 0;   /*reserved */
-                *p++ = 0;   /*reserved */
-            } /* end if */
+                *p++ = 0; /*reserved */
+                *p++ = 0; /*reserved */
+            }             /* end if */
 
             H5F_addr_encode(f, &p, sblock->base_addr);
             H5F_addr_encode(f, &p, sblock->ext_addr);
@@ -655,7 +653,7 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE
             H5F_addr_encode(f, &p, sblock->driver_addr);
 
             /* Encode the root group object entry, including the cached stab info */
-            if(H5G_ent_encode(f, &p, sblock->root_ent) < 0)
+            if (H5G_ent_encode(f, &p, sblock->root_ent) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTENCODE, FAIL, "can't encode root group symbol table entry")
 
             /* Encode the driver information block. */
@@ -668,21 +666,21 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE
              * overwrite the (meta)data right after the superblock. This situation happens to
              * the family driver particularly.  SLU - 2009/3/24
              */
-            if(driver_size > 0 && H5F_addr_defined(sblock->driver_addr)) {
-                char driver_name[9];    /* Name of driver, for driver info block */
-                uint8_t *dbuf = p;      /* Pointer to beginning of driver info */
+            if (driver_size > 0 && H5F_addr_defined(sblock->driver_addr)) {
+                char     driver_name[9]; /* Name of driver, for driver info block */
+                uint8_t *dbuf = p;       /* Pointer to beginning of driver info */
 
                 /* Encode the driver information block */
                 *p++ = HDF5_DRIVERINFO_VERSION_0; /* Version */
-                *p++ = 0; /* reserved */
-                *p++ = 0; /* reserved */
-                *p++ = 0; /* reserved */
+                *p++ = 0;                         /* reserved */
+                *p++ = 0;                         /* reserved */
+                *p++ = 0;                         /* reserved */
 
                 /* Driver info size, excluding header */
                 UINT32ENCODE(p, driver_size);
 
                 /* Encode driver-specific data */
-                if(H5FD_sb_encode(f->shared->lf, driver_name, dbuf + H5F_DRVINFOBLOCK_HDR_SIZE) < 0)
+                if (H5FD_sb_encode(f->shared->lf, driver_name, dbuf + H5F_DRVINFOBLOCK_HDR_SIZE) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to encode driver information")
 
                 /* Store driver name (set in 'H5FD_sb_encode' call above) */
@@ -692,10 +690,10 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE
                 /* (for later use in computing the superblock size) */
                 p += 8 + driver_size;
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else {
-            uint32_t        chksum;                 /* Checksum temporary variable      */
-            H5O_loc_t       *root_oloc;             /* Pointer to root group's object location */
+            uint32_t   chksum;    /* Checksum temporary variable      */
+            H5O_loc_t *root_oloc; /* Pointer to root group's object location */
 
             /* Size of file addresses & offsets, and status flags */
             *p++ = (uint8_t)H5F_SIZEOF_ADDR(f);
@@ -709,14 +707,15 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE
             H5F_addr_encode(f, &p, (rel_eoa + sblock->base_addr));
 
             /* Retrieve information for root group */
-            if(NULL == (root_oloc = H5G_oloc(f->shared->root_grp)))
+            if (NULL == (root_oloc = H5G_oloc(f->shared->root_grp)))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to retrieve root group information")
 
             /* Encode address of root group's object header */
             H5F_addr_encode(f, &p, root_oloc->addr);
 
             /* Compute superblock checksum */
-            chksum = H5_checksum_metadata(buf, ((size_t)H5F_SUPERBLOCK_SIZE(sblock->super_vers, f) - H5F_SIZEOF_CHKSUM), 0);
+            chksum = H5_checksum_metadata(
+                buf, ((size_t)H5F_SUPERBLOCK_SIZE(sblock->super_vers, f) - H5F_SIZEOF_CHKSUM), 0);
 
             /* Superblock checksum */
             UINT32ENCODE(p, chksum);
@@ -732,62 +731,65 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE
         HDassert(superblock_size <= sizeof(buf));
 
         /* Get the DXPL plist object for DXPL ID */
-        if(NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+        if (NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
         /* Write superblock */
         /* (always at relative address 0) */
-        if(H5FD_write(f->shared->lf, dxpl, H5FD_MEM_SUPER, (haddr_t)0, superblock_size, buf) < 0)
+        if (H5FD_write(f->shared->lf, dxpl, H5FD_MEM_SUPER, (haddr_t)0, superblock_size, buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write superblock")
 
         /* Check for newer version of superblock format & superblock extension */
-        if(sblock->super_vers >= HDF5_SUPERBLOCK_VERSION_2 && H5F_addr_defined(sblock->ext_addr)) {
+        if (sblock->super_vers >= HDF5_SUPERBLOCK_VERSION_2 && H5F_addr_defined(sblock->ext_addr)) {
             /* Check for ignoring the driver info for this file */
-            if(!H5F_HAS_FEATURE(f, H5FD_FEAT_IGNORE_DRVRINFO)) {
+            if (!H5F_HAS_FEATURE(f, H5FD_FEAT_IGNORE_DRVRINFO)) {
                 /* Check for driver info message */
                 H5_CHECKED_ASSIGN(driver_size, size_t, H5FD_sb_size(f->shared->lf), hsize_t);
-                if(driver_size > 0) {
-                    H5O_drvinfo_t drvinfo;      /* Driver info */
-                    H5O_loc_t 	ext_loc; 	/* "Object location" for superblock extension */
-                    uint8_t dbuf[H5F_MAX_DRVINFOBLOCK_SIZE];  /* Driver info block encoding buffer */
+                if (driver_size > 0) {
+                    H5O_drvinfo_t drvinfo; /* Driver info */
+                    H5O_loc_t     ext_loc; /* "Object location" for superblock extension */
+                    uint8_t       dbuf[H5F_MAX_DRVINFOBLOCK_SIZE]; /* Driver info block encoding buffer */
 
                     /* Sanity check */
                     HDassert(driver_size <= H5F_MAX_DRVINFOBLOCK_SIZE);
 
                     /* Encode driver-specific data */
-                    if(H5FD_sb_encode(f->shared->lf, drvinfo.name, dbuf) < 0)
+                    if (H5FD_sb_encode(f->shared->lf, drvinfo.name, dbuf) < 0)
                         HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to encode driver information")
 
                     /* Open the superblock extension's object header */
-                    if(H5F_super_ext_open(f, sblock->ext_addr, &ext_loc) < 0)
-                        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENOBJ, FAIL, "unable to open file's superblock extension")
+                    if (H5F_super_ext_open(f, sblock->ext_addr, &ext_loc) < 0)
+                        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENOBJ, FAIL,
+                                    "unable to open file's superblock extension")
 
                     /* Write driver info information to the superblock extension */
                     drvinfo.len = driver_size;
                     drvinfo.buf = dbuf;
-                    if(H5O_msg_write(&ext_loc, H5O_DRVINFO_ID, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, &drvinfo, dxpl_id) < 0)
-                        HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "unable to update driver info header message")
+                    if (H5O_msg_write(&ext_loc, H5O_DRVINFO_ID, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME,
+                                      &drvinfo, dxpl_id) < 0)
+                        HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL,
+                                    "unable to update driver info header message")
 
                     /* Close the superblock extension object header */
-                    if(H5F_super_ext_close(f, &ext_loc, dxpl_id, FALSE) < 0)
-                        HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "unable to close file's superblock extension")
+                    if (H5F_super_ext_close(f, &ext_loc, dxpl_id, FALSE) < 0)
+                        HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL,
+                                    "unable to close file's superblock extension")
                 } /* end if */
-            } /* end if */
-        } /* end if */
+            }     /* end if */
+        }         /* end if */
 
         /* Reset the dirty flag.  */
         sblock->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5F_sblock_dest(f, sblock) < 0)
+    if (destroy)
+        if (H5F_sblock_dest(f, sblock) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CLOSEERROR, FAIL, "can't close superblock")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_sblock_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_sblock_dest
  *
@@ -801,9 +803,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_sblock_dest(H5F_t H5_ATTR_UNUSED *f, H5F_super_t* sblock)
+H5F_sblock_dest(H5F_t H5_ATTR_UNUSED *f, H5F_super_t *sblock)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -811,14 +813,13 @@ H5F_sblock_dest(H5F_t H5_ATTR_UNUSED *f, H5F_super_t* sblock)
     HDassert(sblock);
 
     /* Free superblock */
-    if(H5F_super_free(sblock) < 0)
+    if (H5F_super_free(sblock) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_sblock_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_sblock_clear
  *
@@ -834,7 +835,7 @@ done:
 static herr_t
 H5F_sblock_clear(H5F_t *f, H5F_super_t *sblock, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -846,15 +847,14 @@ H5F_sblock_clear(H5F_t *f, H5F_super_t *sblock, hbool_t destroy)
     /* Reset the dirty flag.  */
     sblock->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5F_sblock_dest(f, sblock) < 0)
+    if (destroy)
+        if (H5F_sblock_dest(f, sblock) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to delete superblock")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_sblock_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_sblock_size
  *
@@ -882,4 +882,3 @@ H5F_sblock_size(const H5F_t *f, const H5F_super_t *sblock, size_t *size_ptr)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5F_sblock_size() */
-
diff --git a/src/H5Ftest.c b/src/H5Ftest.c
index dc85036..957d089 100644
--- a/src/H5Ftest.c
+++ b/src/H5Ftest.c
@@ -26,60 +26,51 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg  */
-#define H5F_TESTING		/*suppress warning about H5F testing funcs*/
-#define H5SM_PACKAGE		/*suppress error about including H5SMpkg  */
-#define H5SM_TESTING		/*suppress warning about H5SM testing funcs*/
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg  */
-#define H5G_TESTING		/*suppress warning about H5G testing funcs*/
-
+#define H5F_PACKAGE  /*suppress error about including H5Fpkg  */
+#define H5F_TESTING  /*suppress warning about H5F testing funcs*/
+#define H5SM_PACKAGE /*suppress error about including H5SMpkg  */
+#define H5SM_TESTING /*suppress warning about H5SM testing funcs*/
+#define H5G_PACKAGE  /*suppress error about including H5Gpkg  */
+#define H5G_TESTING  /*suppress warning about H5G testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5SMpkg.h"            /* Shared object header messages        */
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fpkg.h"     /* File access				*/
+#include "H5Gpkg.h"     /* Groups		  		*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5SMpkg.h"    /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_sohm_mesg_count_test
  *
@@ -94,27 +85,25 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_get_sohm_mesg_count_test(hid_t file_id, unsigned type_id,
-    size_t *mesg_count)
+H5F_get_sohm_mesg_count_test(hid_t file_id, unsigned type_id, size_t *mesg_count)
 {
-    H5F_t	*file;                  /* File info */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5F_t *file;                /* File info */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check arguments */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Retrieve count for message type */
-    if(H5SM_get_mesg_count_test(file, H5AC_ind_dxpl_id, type_id, mesg_count) < 0)
+    if (H5SM_get_mesg_count_test(file, H5AC_ind_dxpl_id, type_id, mesg_count) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't retrieve shared message count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_sohm_mesg_count_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_check_cached_stab_test
  *
@@ -134,24 +123,23 @@ done:
 herr_t
 H5F_check_cached_stab_test(hid_t file_id)
 {
-    H5F_t	*file;                  /* File info */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5F_t *file;                /* File info */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check arguments */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Verify the cached stab info */
-    if(H5G__verify_cached_stab_test(H5G_oloc(file->shared->root_grp), file->shared->sblock->root_ent) < 0)
+    if (H5G__verify_cached_stab_test(H5G_oloc(file->shared->root_grp), file->shared->sblock->root_ent) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to verify cached symbol table info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_check_cached_stab_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_get_maxaddr_test
  *
@@ -168,14 +156,14 @@ done:
 herr_t
 H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr)
 {
-    H5F_t	*file;                  /* File info */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5F_t *file;                /* File info */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check arguments */
-    if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+    if (NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Retrieve maxaddr for file */
     *maxaddr = file->shared->maxaddr;
@@ -183,4 +171,3 @@ H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_get_maxaddr_test() */
-
diff --git a/src/H5G.c b/src/H5G.c
index 3fcf151..599caf7 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -77,67 +77,57 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg   */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5G_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5G_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Pprivate.h"         /* Property lists                       */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Pprivate.h"  /* Property lists                       */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Group ID class */
 static const H5I_class_t H5I_GROUP_CLS[1] = {{
-    H5I_GROUP,			/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,				/* # of reserved IDs for class */
-    (H5I_free_t)H5G_close	/* Callback routine for closing objects of this class */
+    H5I_GROUP,            /* ID class value */
+    H5I_CLASS_REUSE_IDS,  /* Class flags */
+    0,                    /* # of reserved IDs for class */
+    (H5I_free_t)H5G_close /* Callback routine for closing objects of this class */
 }};
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__init
  *
@@ -154,7 +144,7 @@ static const H5I_class_t H5I_GROUP_CLS[1] = {{
 herr_t
 H5G__init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -163,7 +153,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_init_interface
  *
@@ -186,19 +175,18 @@ done:
 static herr_t
 H5G_init_interface(void)
 {
-    herr_t          ret_value = SUCCEED;  /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Initialize the atom group for the group IDs */
-    if(H5I_register_type(H5I_GROUP_CLS) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to initialize interface")
+    if (H5I_register_type(H5I_GROUP_CLS) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_term_interface
  *
@@ -217,15 +205,15 @@ done:
 int
 H5G_term_interface(void)
 {
-    int	n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
-        if(H5I_nmembers(H5I_GROUP) > 0) {
+    if (H5_interface_initialize_g) {
+        if (H5I_nmembers(H5I_GROUP) > 0) {
             (void)H5I_clear_type(H5I_GROUP, FALSE, FALSE);
             n++; /*H5I*/
-        } /* end if */
+        }        /* end if */
         else {
             /* Close deprecated interface */
             n += H5G__term_deprec_interface();
@@ -237,12 +225,11 @@ H5G_term_interface(void)
             /* Mark closed */
             H5_interface_initialize_g = 0;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5G_term_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gcreate2
  *
@@ -270,58 +257,53 @@ H5G_term_interface(void)
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id,
-    hid_t gapl_id)
+H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id)
 {
-    H5G_loc_t	    loc;                /* Location to create group */
-    H5G_t	   *grp = NULL;         /* New group created */
-    hid_t	    ret_value;          /* Return value */
+    H5G_loc_t loc;        /* Location to create group */
+    H5G_t *   grp = NULL; /* New group created */
+    hid_t     ret_value;  /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("i", "i*siii", loc_id, name, lcpl_id, gcpl_id, gapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == lcpl_id)
+    if (H5P_DEFAULT == lcpl_id)
         lcpl_id = H5P_LINK_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
+    else if (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
 
     /* Check group creation property list */
-    if(H5P_DEFAULT == gcpl_id)
+    if (H5P_DEFAULT == gcpl_id)
         gcpl_id = H5P_GROUP_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(gcpl_id, H5P_GROUP_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group create property list")
+    else if (TRUE != H5P_isa_class(gcpl_id, H5P_GROUP_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group create property list")
 
     /* Check the group access property list */
-    if(H5P_DEFAULT == gapl_id)
+    if (H5P_DEFAULT == gapl_id)
         gapl_id = H5P_GROUP_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
+    else if (TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
 
     /* Create the new group & get its ID */
-    if(NULL == (grp = H5G__create_named(&loc, name, lcpl_id, gcpl_id, gapl_id, H5AC_dxpl_id)))
+    if (NULL == (grp = H5G__create_named(&loc, name, lcpl_id, gcpl_id, gapl_id, H5AC_dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
-    if((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
+    if ((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
 done:
-    if(ret_value < 0)
-        if(grp && H5G_close(grp) < 0)
+    if (ret_value < 0)
+        if (grp && H5G_close(grp) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gcreate2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gcreate_anon
  *
@@ -360,66 +342,63 @@ done:
 hid_t
 H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id)
 {
-    H5G_loc_t	    loc;
-    H5G_t	   *grp = NULL;
-    H5G_obj_create_t gcrt_info;         /* Information for group creation */
-    hid_t	    ret_value;
+    H5G_loc_t        loc;
+    H5G_t *          grp = NULL;
+    H5G_obj_create_t gcrt_info; /* Information for group creation */
+    hid_t            ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "iii", loc_id, gcpl_id, gapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Check group creation property list */
-    if(H5P_DEFAULT == gcpl_id)
+    if (H5P_DEFAULT == gcpl_id)
         gcpl_id = H5P_GROUP_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(gcpl_id, H5P_GROUP_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group create property list")
+    else if (TRUE != H5P_isa_class(gcpl_id, H5P_GROUP_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group create property list")
 
     /* Check the group access property list */
-    if(H5P_DEFAULT == gapl_id)
+    if (H5P_DEFAULT == gapl_id)
         gapl_id = H5P_GROUP_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
+    else if (TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
 
     /* Set up group creation info */
-    gcrt_info.gcpl_id = gcpl_id;
+    gcrt_info.gcpl_id    = gcpl_id;
     gcrt_info.cache_type = H5G_NOTHING_CACHED;
     HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache));
 
     /* Create the new group & get its ID */
-    if(NULL == (grp = H5G__create(loc.oloc->file, &gcrt_info, H5AC_dxpl_id)))
+    if (NULL == (grp = H5G__create(loc.oloc->file, &gcrt_info, H5AC_dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
-    if((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
+    if ((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
 done:
     /* Release the group's object header, if it was created */
-    if(grp) {
-        H5O_loc_t *oloc;         /* Object location for group */
+    if (grp) {
+        H5O_loc_t *oloc; /* Object location for group */
 
         /* Get the new group's object location */
-        if(NULL == (oloc = H5G_oloc(grp)))
+        if (NULL == (oloc = H5G_oloc(grp)))
             HDONE_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object location of group")
 
         /* Decrement refcount on group's object header in memory */
-        if(H5O_dec_rc_by_loc(oloc, H5AC_dxpl_id) < 0)
-           HDONE_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
+        if (H5O_dec_rc_by_loc(oloc, H5AC_dxpl_id) < 0)
+            HDONE_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
     } /* end if */
 
     /* Cleanup on failure */
-    if(ret_value < 0)
-        if(grp && H5G_close(grp) < 0)
+    if (ret_value < 0)
+        if (grp && H5G_close(grp) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gcreate_anon() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gopen2
  *
@@ -440,44 +419,42 @@ done:
 hid_t
 H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id)
 {
-    H5G_t       *grp = NULL;            /* Group opened */
-    H5G_loc_t	loc;                    /* Location of parent for group */
-    hid_t       ret_value;              /* Return value */
+    H5G_t *   grp = NULL; /* Group opened */
+    H5G_loc_t loc;        /* Location of parent for group */
+    hid_t     ret_value;  /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "i*si", loc_id, name, gapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Check the group access property list */
-    if(H5P_DEFAULT == gapl_id)
+    if (H5P_DEFAULT == gapl_id)
         gapl_id = H5P_GROUP_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
+    else if (TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
 
     /* Open the group */
-    if((grp = H5G__open_name(&loc, name, gapl_id, H5AC_ind_dxpl_id)) == NULL)
+    if ((grp = H5G__open_name(&loc, name, gapl_id, H5AC_ind_dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
 
     /* Register an ID for the group */
-    if((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
 done:
-    if(ret_value < 0) {
-        if(grp && H5G_close(grp) < 0)
+    if (ret_value < 0) {
+        if (grp && H5G_close(grp) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gopen2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_create_plist
  *
@@ -497,24 +474,23 @@ done:
 hid_t
 H5Gget_create_plist(hid_t group_id)
 {
-    H5G_t		*group = NULL;
-    hid_t		ret_value = FAIL;
+    H5G_t *group     = NULL;
+    hid_t  ret_value = FAIL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", group_id);
 
     /* Check args */
-    if(NULL == (group = (H5G_t *)H5I_object_verify(group_id, H5I_GROUP)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
+    if (NULL == (group = (H5G_t *)H5I_object_verify(group_id, H5I_GROUP)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
-    if((ret_value = H5G_get_create_plist(group)) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
+    if ((ret_value = H5G_get_create_plist(group)) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_get_create_plist
  *
@@ -534,65 +510,65 @@ done:
 hid_t
 H5G_get_create_plist(H5G_t *grp)
 {
-    H5O_linfo_t         linfo;		        /* Link info message            */
-    htri_t	        ginfo_exists;
-    htri_t	        linfo_exists;
-    htri_t              pline_exists;
-    H5P_genplist_t      *gcpl_plist;
-    H5P_genplist_t      *new_plist;
-    hid_t		new_gcpl_id = FAIL;
-    hid_t		ret_value = FAIL;
+    H5O_linfo_t     linfo; /* Link info message            */
+    htri_t          ginfo_exists;
+    htri_t          linfo_exists;
+    htri_t          pline_exists;
+    H5P_genplist_t *gcpl_plist;
+    H5P_genplist_t *new_plist;
+    hid_t           new_gcpl_id = FAIL;
+    hid_t           ret_value   = FAIL;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Copy the default group creation property list */
-    if(NULL == (gcpl_plist = (H5P_genplist_t *)H5I_object(H5P_LST_GROUP_CREATE_ID_g)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get default group creation property list")
-    if((new_gcpl_id = H5P_copy_plist(gcpl_plist, TRUE)) < 0)
+    if (NULL == (gcpl_plist = (H5P_genplist_t *)H5I_object(H5P_LST_GROUP_CREATE_ID_g)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get default group creation property list")
+    if ((new_gcpl_id = H5P_copy_plist(gcpl_plist, TRUE)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to copy the creation property list")
-    if(NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_gcpl_id)))
+    if (NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_gcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Retrieve any object creation properties */
-    if(H5O_get_create_plist(&grp->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
+    if (H5O_get_create_plist(&grp->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object creation info")
 
     /* Check for the group having a group info message */
-    if((ginfo_exists = H5O_msg_exists(&(grp->oloc), H5O_GINFO_ID, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(ginfo_exists) {
-        H5O_ginfo_t ginfo;		/* Group info message            */
+    if ((ginfo_exists = H5O_msg_exists(&(grp->oloc), H5O_GINFO_ID, H5AC_ind_dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (ginfo_exists) {
+        H5O_ginfo_t ginfo; /* Group info message            */
 
         /* Read the group info */
-        if(NULL == H5O_msg_read(&(grp->oloc), H5O_GINFO_ID, &ginfo, H5AC_ind_dxpl_id))
+        if (NULL == H5O_msg_read(&(grp->oloc), H5O_GINFO_ID, &ginfo, H5AC_ind_dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get group info")
 
         /* Set the group info for the property list */
-        if(H5P_set(new_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+        if (H5P_set(new_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set group info")
     } /* end if */
 
     /* Check for the group having a link info message */
-    if((linfo_exists = H5G__obj_get_linfo(&(grp->oloc), &linfo, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(linfo_exists) {
+    if ((linfo_exists = H5G__obj_get_linfo(&(grp->oloc), &linfo, H5AC_ind_dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (linfo_exists) {
         /* Set the link info for the property list */
-        if(H5P_set(new_plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
+        if (H5P_set(new_plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set link info")
     } /* end if */
 
     /* Check for the group having a pipeline message */
-    if((pline_exists = H5O_msg_exists(&(grp->oloc), H5O_PLINE_ID, H5AC_ind_dxpl_id)) < 0)
+    if ((pline_exists = H5O_msg_exists(&(grp->oloc), H5O_PLINE_ID, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read object header")
-    if(pline_exists) {
-        H5O_pline_t pline;      /* Pipeline message */
+    if (pline_exists) {
+        H5O_pline_t pline; /* Pipeline message */
 
         /* Read the pipeline */
-        if(NULL == H5O_msg_read(&(grp->oloc), H5O_PLINE_ID, &pline, H5AC_ind_dxpl_id))
+        if (NULL == H5O_msg_read(&(grp->oloc), H5O_PLINE_ID, &pline, H5AC_ind_dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link pipeline")
 
         /* Set the pipeline for the property list */
-        if(H5P_set(new_plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+        if (H5P_set(new_plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set link pipeline")
     } /* end if */
 
@@ -600,16 +576,15 @@ H5G_get_create_plist(H5G_t *grp)
     ret_value = new_gcpl_id;
 
 done:
-    if(ret_value < 0) {
-        if(new_gcpl_id > 0)
-            if(H5I_dec_app_ref(new_gcpl_id) < 0)
+    if (ret_value < 0) {
+        if (new_gcpl_id > 0)
+            if (H5I_dec_app_ref(new_gcpl_id) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "can't free")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_info
  *
@@ -626,33 +601,32 @@ done:
 herr_t
 H5Gget_info(hid_t grp_id, H5G_info_t *grp_info)
 {
-    H5I_type_t  id_type;                /* Type of ID */
-    H5G_loc_t	loc;                    /* Location of group */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5I_type_t id_type;             /* Type of ID */
+    H5G_loc_t  loc;                 /* Location of group */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", grp_id, grp_info);
 
     /* Check args */
     id_type = H5I_get_type(grp_id);
-    if(!(H5I_GROUP == id_type || H5I_FILE == id_type))
+    if (!(H5I_GROUP == id_type || H5I_FILE == id_type))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument")
-    if(!grp_info)
+    if (!grp_info)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
 
     /* Get group location */
-    if(H5G_loc(grp_id, &loc) < 0)
+    if (H5G_loc(grp_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Retrieve the group's information */
-    if(H5G__obj_info(loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
+    if (H5G__obj_info(loc.oloc, grp_info /*out*/, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_info_by_name
  *
@@ -667,31 +641,29 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info,
-    hid_t lapl_id)
+H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info, hid_t lapl_id)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    H5G_loc_t   grp_loc;                /* Location used to open group */
-    H5G_name_t  grp_path;            	/* Opened object group hier. path */
-    H5O_loc_t   grp_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Location at 'name' found */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t  loc;                 /* Location of group */
+    H5G_loc_t  grp_loc;             /* Location used to open group */
+    H5G_name_t grp_path;            /* Opened object group hier. path */
+    H5O_loc_t  grp_oloc;            /* Opened object object location */
+    hbool_t    loc_found = FALSE;   /* Location at 'name' found */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*s*xi", loc_id, name, grp_info, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(!grp_info)
+    if (!grp_info)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up opened group location to fill in */
     grp_loc.oloc = &grp_oloc;
@@ -699,22 +671,21 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info,
     H5G_loc_reset(&grp_loc);
 
     /* Find the group object */
-    if(H5G_loc_find(&loc, name, &grp_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find(&loc, name, &grp_loc /*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     loc_found = TRUE;
 
     /* Retrieve the group's information */
-    if(H5G__obj_info(grp_loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
+    if (H5G__obj_info(grp_loc.oloc, grp_info /*out*/, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
 
 done:
-    if(loc_found && H5G_loc_free(&grp_loc) < 0)
+    if (loc_found && H5G_loc_free(&grp_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_info_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_info_by_idx
  *
@@ -730,36 +701,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, H5G_info_t *grp_info, hid_t lapl_id)
+H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                   hsize_t n, H5G_info_t *grp_info, hid_t lapl_id)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    H5G_loc_t   grp_loc;                /* Location used to open group */
-    H5G_name_t  grp_path;            	/* Opened object group hier. path */
-    H5O_loc_t   grp_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t  loc;                 /* Location of group */
+    H5G_loc_t  grp_loc;             /* Location used to open group */
+    H5G_name_t grp_path;            /* Opened object group hier. path */
+    H5O_loc_t  grp_oloc;            /* Opened object object location */
+    hbool_t    loc_found = FALSE;   /* Entry at 'name' found */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, grp_info,
-             lapl_id);
+    H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, grp_info, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!group_name || !*group_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(!grp_info)
+    if (!group_name || !*group_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (!grp_info)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up opened group location to fill in */
     grp_loc.oloc = &grp_oloc;
@@ -767,23 +736,23 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     H5G_loc_reset(&grp_loc);
 
     /* Find the object's location, according to the order in the index */
-    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &grp_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &grp_loc /*out*/, lapl_id,
+                            H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     loc_found = TRUE;
 
     /* Retrieve the group's information */
-    if(H5G__obj_info(grp_loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
+    if (H5G__obj_info(grp_loc.oloc, grp_info /*out*/, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
 
 done:
     /* Release the object location */
-    if(loc_found && H5G_loc_free(&grp_loc) < 0)
+    if (loc_found && H5G_loc_free(&grp_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_info_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gclose
  *
@@ -800,23 +769,22 @@ done:
 herr_t
 H5Gclose(hid_t group_id)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", group_id);
 
     /* Check args */
-    if(NULL == H5I_object_verify(group_id,H5I_GROUP))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
+    if (NULL == H5I_object_verify(group_id, H5I_GROUP))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /*
      * Decrement the counter on the group atom.	 It will be freed if the count
      * reaches zero.
      */
-    if(H5I_dec_app_ref(group_id) < 0)
-    	HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
+    if (H5I_dec_app_ref(group_id) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gclose() */
-
diff --git a/src/H5Gbtree2.c b/src/H5Gbtree2.c
index d520484..333bca0 100644
--- a/src/H5Gbtree2.c
+++ b/src/H5Gbtree2.c
@@ -26,22 +26,19 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Gpkg.h"     /* Groups		  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -52,22 +49,20 @@
  */
 typedef struct H5G_fh_ud_cmp_t {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    const char  *name;                  /* Name of link to compare           */
-    H5B2_found_t found_op;              /* Callback when correct link is found */
-    void        *found_op_data;         /* Callback data when correct link is found */
+    H5F_t *      f;             /* Pointer to file that fractal heap is in */
+    hid_t        dxpl_id;       /* DXPL for operation                */
+    const char * name;          /* Name of link to compare           */
+    H5B2_found_t found_op;      /* Callback when correct link is found */
+    void *       found_op_data; /* Callback data when correct link is found */
 
     /* upward */
-    int         cmp;                    /* Comparison of two link names      */
+    int cmp; /* Comparison of two link names      */
 } H5G_fh_ud_cmp_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -77,48 +72,45 @@ typedef struct H5G_fh_ud_cmp_t {
 /* v2 B-tree driver callbacks for 'creation order' index */
 static herr_t H5G_dense_btree2_corder_store(void *native, const void *udata);
 static herr_t H5G_dense_btree2_corder_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5G_dense_btree2_corder_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5G_dense_btree2_corder_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5G_dense_btree2_corder_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5G_dense_btree2_corder_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5G_dense_btree2_corder_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5G_dense_btree2_corder_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent,
+                                            int fwidth, const void *record, const void *_udata);
 
 /* v2 B-tree driver callbacks for 'name' index */
 static herr_t H5G_dense_btree2_name_store(void *native, const void *udata);
 static herr_t H5G_dense_btree2_name_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5G_dense_btree2_name_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5G_dense_btree2_name_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5G_dense_btree2_name_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5G_dense_btree2_name_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5G_dense_btree2_name_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5G_dense_btree2_name_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth,
+                                          const void *record, const void *_udata);
 
 /* Fractal heap function callbacks */
 static herr_t H5G_dense_fh_name_cmp(const void *obj, size_t obj_len, void *op_data);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 /* v2 B-tree class for indexing 'name' field of links */
-const H5B2_class_t H5G_BT2_NAME[1]={{   /* B-tree class information */
-    H5B2_GRP_DENSE_NAME_ID,             /* Type of B-tree */
-    "H5B2_GRP_DENSE_NAME_ID",           /* Name of B-tree class */
-    sizeof(H5G_dense_bt2_name_rec_t),   /* Size of native record */
-    NULL,                               /* Create client callback context */
-    NULL,                               /* Destroy client callback context */
-    H5G_dense_btree2_name_store,        /* Record storage callback */
-    H5G_dense_btree2_name_compare,      /* Record comparison callback */
-    H5G_dense_btree2_name_encode,       /* Record encoding callback */
-    H5G_dense_btree2_name_decode,       /* Record decoding callback */
-    H5G_dense_btree2_name_debug,        /* Record debugging callback */
-    NULL,                               /* Create debugging context */
-    NULL                                /* Destroy debugging context */
+const H5B2_class_t H5G_BT2_NAME[1] = {{
+    /* B-tree class information */
+    H5B2_GRP_DENSE_NAME_ID,           /* Type of B-tree */
+    "H5B2_GRP_DENSE_NAME_ID",         /* Name of B-tree class */
+    sizeof(H5G_dense_bt2_name_rec_t), /* Size of native record */
+    NULL,                             /* Create client callback context */
+    NULL,                             /* Destroy client callback context */
+    H5G_dense_btree2_name_store,      /* Record storage callback */
+    H5G_dense_btree2_name_compare,    /* Record comparison callback */
+    H5G_dense_btree2_name_encode,     /* Record encoding callback */
+    H5G_dense_btree2_name_decode,     /* Record decoding callback */
+    H5G_dense_btree2_name_debug,      /* Record debugging callback */
+    NULL,                             /* Create debugging context */
+    NULL                              /* Destroy debugging context */
 }};
 
 /* v2 B-tree class for indexing 'creation order' field of links */
-const H5B2_class_t H5G_BT2_CORDER[1]={{ /* B-tree class information */
+const H5B2_class_t H5G_BT2_CORDER[1] = {{
+    /* B-tree class information */
     H5B2_GRP_DENSE_CORDER_ID,           /* Type of B-tree */
     "H5B2_GRP_DENSE_CORDER_ID",         /* Name of B-tree class */
     sizeof(H5G_dense_bt2_corder_rec_t), /* Size of native record */
@@ -137,13 +129,10 @@ const H5B2_class_t H5G_BT2_CORDER[1]={{ /* B-tree class information */
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_fh_name_cmp
  *
@@ -161,22 +150,23 @@ const H5B2_class_t H5G_BT2_CORDER[1]={{ /* B-tree class information */
 static herr_t
 H5G_dense_fh_name_cmp(const void *obj, size_t obj_len, void *_udata)
 {
-    H5G_fh_ud_cmp_t *udata = (H5G_fh_ud_cmp_t *)_udata;         /* User data for 'op' callback */
-    H5O_link_t *lnk;    /* Pointer to link created from heap object */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_fh_ud_cmp_t *udata = (H5G_fh_ud_cmp_t *)_udata; /* User data for 'op' callback */
+    H5O_link_t *     lnk;                               /* Pointer to link created from heap object */
+    herr_t           ret_value = SUCCEED;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Decode link information */
-    if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len,
+                                                    (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "can't decode link")
 
     /* Compare the string values */
     udata->cmp = HDstrcmp(udata->name, lnk->name);
 
     /* Check for correct link & callback to make */
-    if(udata->cmp == 0 && udata->found_op) {
-        if((udata->found_op)(lnk, udata->found_op_data) < 0)
+    if (udata->cmp == 0 && udata->found_op) {
+        if ((udata->found_op)(lnk, udata->found_op_data) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPERATE, FAIL, "link found callback failed")
     } /* end if */
 
@@ -187,7 +177,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_fh_name_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_name_store
  *
@@ -204,7 +193,7 @@ done:
 static herr_t
 H5G_dense_btree2_name_store(void *_nrecord, const void *_udata)
 {
-    const H5G_bt2_ud_ins_t *udata = (const H5G_bt2_ud_ins_t *)_udata;
+    const H5G_bt2_ud_ins_t *  udata   = (const H5G_bt2_ud_ins_t *)_udata;
     H5G_dense_bt2_name_rec_t *nrecord = (H5G_dense_bt2_name_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -216,7 +205,6 @@ H5G_dense_btree2_name_store(void *_nrecord, const void *_udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_name_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_name_compare
  *
@@ -234,9 +222,9 @@ H5G_dense_btree2_name_store(void *_nrecord, const void *_udata)
 static herr_t
 H5G_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int *result)
 {
-    const H5G_bt2_ud_common_t *bt2_udata = (const H5G_bt2_ud_common_t *)_bt2_udata;
-    const H5G_dense_bt2_name_rec_t *bt2_rec = (const H5G_dense_bt2_name_rec_t *)_bt2_rec;
-    herr_t ret_value = SUCCEED;    /* Return value */
+    const H5G_bt2_ud_common_t *     bt2_udata = (const H5G_bt2_ud_common_t *)_bt2_udata;
+    const H5G_dense_bt2_name_rec_t *bt2_rec   = (const H5G_dense_bt2_name_rec_t *)_bt2_rec;
+    herr_t                          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -245,30 +233,29 @@ H5G_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int
     HDassert(bt2_rec);
 
     /* Check hash value */
-    if(bt2_udata->name_hash < bt2_rec->hash)
+    if (bt2_udata->name_hash < bt2_rec->hash)
         *result = (-1);
-    else if(bt2_udata->name_hash > bt2_rec->hash)
+    else if (bt2_udata->name_hash > bt2_rec->hash)
         *result = 1;
     else {
-        H5G_fh_ud_cmp_t fh_udata;       /* User data for fractal heap 'op' callback */
+        H5G_fh_ud_cmp_t fh_udata; /* User data for fractal heap 'op' callback */
 
         /* Sanity check */
         HDassert(bt2_udata->name_hash == bt2_rec->hash);
 
         /* Prepare user data for callback */
         /* down */
-        fh_udata.f = bt2_udata->f;
-        fh_udata.dxpl_id = bt2_udata->dxpl_id;
-        fh_udata.name = bt2_udata->name;
-        fh_udata.found_op = bt2_udata->found_op;
+        fh_udata.f             = bt2_udata->f;
+        fh_udata.dxpl_id       = bt2_udata->dxpl_id;
+        fh_udata.name          = bt2_udata->name;
+        fh_udata.found_op      = bt2_udata->found_op;
         fh_udata.found_op_data = bt2_udata->found_op_data;
 
         /* up */
         fh_udata.cmp = 0;
 
         /* Check if the user's link and the B-tree's link have the same name */
-        if(H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, bt2_rec->id,
-                   H5G_dense_fh_name_cmp, &fh_udata) < 0)
+        if (H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, bt2_rec->id, H5G_dense_fh_name_cmp, &fh_udata) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
 
         /* Callback will set comparison value */
@@ -279,7 +266,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5G_dense_btree2_name_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_name_encode
  *
@@ -307,7 +293,6 @@ H5G_dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR_UN
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_name_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_name_decode
  *
@@ -335,7 +320,6 @@ H5G_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_UN
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_name_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_name_debug
  *
@@ -351,23 +335,20 @@ H5G_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_UN
  */
 static herr_t
 H5G_dense_btree2_name_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord,
-    const void H5_ATTR_UNUSED *_udata)
+                            int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5G_dense_bt2_name_rec_t *nrecord = (const H5G_dense_bt2_name_rec_t *)_nrecord;
-    unsigned u;                 /* Local index variable */
+    unsigned                        u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%lx, ", indent, "", fwidth, "Record:",
-        nrecord->hash);
-    for(u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
+    HDfprintf(stream, "%*s%-*s {%lx, ", indent, "", fwidth, "Record:", nrecord->hash);
+    for (u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
         HDfprintf(stderr, "%02x%s", nrecord->id[u], (u < (H5G_DENSE_FHEAP_ID_LEN - 1) ? " " : "}\n"));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_name_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_corder_store
  *
@@ -384,7 +365,7 @@ H5G_dense_btree2_name_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H
 static herr_t
 H5G_dense_btree2_corder_store(void *_nrecord, const void *_udata)
 {
-    const H5G_bt2_ud_ins_t *udata = (const H5G_bt2_ud_ins_t *)_udata;
+    const H5G_bt2_ud_ins_t *    udata   = (const H5G_bt2_ud_ins_t *)_udata;
     H5G_dense_bt2_corder_rec_t *nrecord = (H5G_dense_bt2_corder_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -396,7 +377,6 @@ H5G_dense_btree2_corder_store(void *_nrecord, const void *_udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_corder_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_corder_compare
  *
@@ -414,8 +394,8 @@ H5G_dense_btree2_corder_store(void *_nrecord, const void *_udata)
 static herr_t
 H5G_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, int *result)
 {
-    const H5G_bt2_ud_common_t *bt2_udata = (const H5G_bt2_ud_common_t *)_bt2_udata;
-    const H5G_dense_bt2_corder_rec_t *bt2_rec = (const H5G_dense_bt2_corder_rec_t *)_bt2_rec;
+    const H5G_bt2_ud_common_t *       bt2_udata = (const H5G_bt2_ud_common_t *)_bt2_udata;
+    const H5G_dense_bt2_corder_rec_t *bt2_rec   = (const H5G_dense_bt2_corder_rec_t *)_bt2_rec;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -424,19 +404,21 @@ H5G_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, in
     HDassert(bt2_rec);
 
 #ifdef QAK
-{
-unsigned u;
-
-HDfprintf(stderr, "%s: bt2_udata->corder = %Hd\n", "H5G_dense_btree2_corder_compare", (hsize_t)bt2_udata->corder);
-HDfprintf(stderr, "%s: bt2_rec = {%Hu, ", "H5G_dense_btree2_corder_compare", (hsize_t)bt2_rec->corder);
-for(u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
-    HDfprintf(stderr, "%02x%s", bt2_rec->id[u], (u < (H5G_DENSE_FHEAP_ID_LEN - 1) ? " " : "}\n"));
-}
+    {
+        unsigned u;
+
+        HDfprintf(stderr, "%s: bt2_udata->corder = %Hd\n", "H5G_dense_btree2_corder_compare",
+                  (hsize_t)bt2_udata->corder);
+        HDfprintf(stderr, "%s: bt2_rec = {%Hu, ", "H5G_dense_btree2_corder_compare",
+                  (hsize_t)bt2_rec->corder);
+        for (u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
+            HDfprintf(stderr, "%02x%s", bt2_rec->id[u], (u < (H5G_DENSE_FHEAP_ID_LEN - 1) ? " " : "}\n"));
+    }
 #endif /* QAK */
     /* Check creation order value */
-    if(bt2_udata->corder < bt2_rec->corder)
+    if (bt2_udata->corder < bt2_rec->corder)
         *result = -1;
-    else if(bt2_udata->corder > bt2_rec->corder)
+    else if (bt2_udata->corder > bt2_rec->corder)
         *result = 1;
     else
         *result = 0;
@@ -444,7 +426,6 @@ for(u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_corder_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_corder_encode
  *
@@ -472,7 +453,6 @@ H5G_dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_corder_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_corder_decode
  *
@@ -500,7 +480,6 @@ H5G_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_corder_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_corder_debug
  *
@@ -516,19 +495,16 @@ H5G_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_
  */
 static herr_t
 H5G_dense_btree2_corder_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord,
-    const void H5_ATTR_UNUSED *_udata)
+                              int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5G_dense_bt2_corder_rec_t *nrecord = (const H5G_dense_bt2_corder_rec_t *)_nrecord;
-    unsigned u;                 /* Local index variable */
+    unsigned                          u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%Hu, ", indent, "", fwidth, "Record:",
-        nrecord->corder);
-    for(u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
+    HDfprintf(stream, "%*s%-*s {%Hu, ", indent, "", fwidth, "Record:", nrecord->corder);
+    for (u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
         HDfprintf(stderr, "%02x%s", nrecord->id[u], (u < (H5G_DENSE_FHEAP_ID_LEN - 1) ? " " : "}\n"));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_dense_btree2_corder_debug() */
-
diff --git a/src/H5Gcache.c b/src/H5Gcache.c
index 994c5bf..d03f6c9 100644
--- a/src/H5Gcache.c
+++ b/src/H5Gcache.c
@@ -26,60 +26,52 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg   */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg   */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
-#define H5G_NODE_VERS           1       /* Symbol table node version number   */
-#define H5G_NODE_BUF_SIZE       512     /* Size of stack buffer for serialized nodes */
-
+#define H5G_NODE_VERS     1   /* Symbol table node version number   */
+#define H5G_NODE_BUF_SIZE 512 /* Size of stack buffer for serialized nodes */
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Metadata cache (H5AC) callbacks */
 static H5G_node_t *H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
-			     H5G_node_t *sym, unsigned *flags_ptr);
-static herr_t H5G_node_dest(H5F_t *f, H5G_node_t *sym);
-static herr_t H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy);
-static herr_t H5G_node_size(const H5F_t *f, const H5G_node_t *sym, size_t *size_ptr);
-
+static herr_t      H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_t *sym,
+                                  unsigned *flags_ptr);
+static herr_t      H5G_node_dest(H5F_t *f, H5G_node_t *sym);
+static herr_t      H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy);
+static herr_t      H5G_node_size(const H5F_t *f, const H5G_node_t *sym, size_t *size_ptr);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -94,14 +86,12 @@ const H5AC_class_t H5AC_SNODE[1] = {{
     (H5AC_size_func_t)H5G_node_size,
 }};
 
-
 /* Declare extern the free list to manage the H5G_node_t struct */
 H5FL_EXTERN(H5G_node_t);
 
 /* Declare extern the free list to manage sequences of H5G_entry_t's */
 H5FL_SEQ_EXTERN(H5G_entry_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_load
  *
@@ -119,13 +109,13 @@ H5FL_SEQ_EXTERN(H5G_entry_t);
 static H5G_node_t *
 H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
 {
-    H5G_node_t         *sym = NULL;
-    H5WB_t             *wb = NULL;                      /* Wrapped buffer for node data */
-    uint8_t             node_buf[H5G_NODE_BUF_SIZE];    /* Buffer for node */
-    uint8_t            *node;                           /* Pointer to node buffer */
-    const uint8_t	   *p;
-    const uint8_t	   *p_end;
-    H5G_node_t         *ret_value;                      /* Return value */
+    H5G_node_t *   sym = NULL;
+    H5WB_t *       wb  = NULL;                  /* Wrapped buffer for node data */
+    uint8_t        node_buf[H5G_NODE_BUF_SIZE]; /* Buffer for node */
+    uint8_t *      node;                        /* Pointer to node buffer */
+    const uint8_t *p;
+    const uint8_t *p_end;
+    H5G_node_t *   ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -135,22 +125,22 @@ H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
     HDassert(udata);
 
     /* Allocate symbol table data structures */
-    if(NULL == (sym = H5FL_CALLOC(H5G_node_t)))
+    if (NULL == (sym = H5FL_CALLOC(H5G_node_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     sym->node_size = H5G_NODE_SIZE(f);
-    if(NULL == (sym->entry = H5FL_SEQ_CALLOC(H5G_entry_t, (size_t)(2 * H5F_SYM_LEAF_K(f)))))
+    if (NULL == (sym->entry = H5FL_SEQ_CALLOC(H5G_entry_t, (size_t)(2 * H5F_SYM_LEAF_K(f)))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Wrap the local buffer for serialized node info */
-    if(NULL == (wb = H5WB_wrap(node_buf, sizeof(node_buf))))
+    if (NULL == (wb = H5WB_wrap(node_buf, sizeof(node_buf))))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "can't wrap buffer")
 
     /* Get a pointer to a buffer that's large enough for node */
-    if(NULL == (node = (uint8_t *)H5WB_actual(wb, sym->node_size)))
+    if (NULL == (node = (uint8_t *)H5WB_actual(wb, sym->node_size)))
         HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, NULL, "can't get actual buffer")
 
     /* Read the serialized symbol table node. */
-    if(H5F_block_read(f, H5FD_MEM_BTREE, addr, sym->node_size, dxpl_id, node) < 0)
+    if (H5F_block_read(f, H5FD_MEM_BTREE, addr, sym->node_size, dxpl_id, node) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_READERROR, NULL, "unable to read symbol table node")
 
     /* Get temporary pointer to serialized node */
@@ -162,12 +152,12 @@ H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
     p_end = p + sym->node_size - 1;
 
     /* magic */
-    if(HDmemcmp(p, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+    if (HDmemcmp(p, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, NULL, "bad symbol table node signature")
     p += 4;
 
     /* version */
-    if(H5G_NODE_VERS != *p++)
+    if (H5G_NODE_VERS != *p++)
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, NULL, "bad symbol table node version")
 
     /* reserved */
@@ -177,7 +167,7 @@ H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
     UINT16DECODE(p, sym->nsyms);
 
     /* entries */
-    if(H5G__ent_decode_vec(f, &p, p_end, sym->entry, sym->nsyms) < 0)
+    if (H5G__ent_decode_vec(f, &p, p_end, sym->entry, sym->nsyms) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, NULL, "unable to decode symbol table entries")
 
     /* Set return value */
@@ -185,16 +175,15 @@ H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
-    if(!ret_value)
-        if(sym && H5G__node_free(sym) < 0)
+    if (!ret_value)
+        if (sym && H5G__node_free(sym) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTFREE, NULL, "unable to destroy symbol table node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_node_flush
  *
@@ -209,11 +198,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_t *sym, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_t *sym,
+               unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    H5WB_t     *wb = NULL;     /* Wrapped buffer for node data */
-    uint8_t     node_buf[H5G_NODE_BUF_SIZE]; /* Buffer for node */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5WB_t *wb = NULL;                   /* Wrapped buffer for node data */
+    uint8_t node_buf[H5G_NODE_BUF_SIZE]; /* Buffer for node */
+    herr_t  ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -227,16 +217,16 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
     /*
      * Write the symbol node to disk.
      */
-    if(sym->cache_info.is_dirty) {
-        uint8_t	*node;          /* Pointer to node buffer */
-        uint8_t	*p;             /* Pointer into raw data buffer */
+    if (sym->cache_info.is_dirty) {
+        uint8_t *node; /* Pointer to node buffer */
+        uint8_t *p;    /* Pointer into raw data buffer */
 
         /* Wrap the local buffer for serialized node info */
-        if(NULL == (wb = H5WB_wrap(node_buf, sizeof(node_buf))))
+        if (NULL == (wb = H5WB_wrap(node_buf, sizeof(node_buf))))
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for node */
-        if(NULL == (node = (uint8_t *)H5WB_actual(wb, sym->node_size)))
+        if (NULL == (node = (uint8_t *)H5WB_actual(wb, sym->node_size)))
             HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Get temporary pointer to serialized symbol table node */
@@ -256,12 +246,12 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
         UINT16ENCODE(p, sym->nsyms);
 
         /* entries */
-        if(H5G__ent_encode_vec(f, &p, sym->entry, sym->nsyms) < 0)
+        if (H5G__ent_encode_vec(f, &p, sym->entry, sym->nsyms) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTENCODE, FAIL, "can't serialize")
         HDmemset(p, 0, sym->node_size - (size_t)(p - node));
 
-	/* Write the serialized symbol table node. */
-        if(H5F_block_write(f, H5FD_MEM_BTREE, addr, sym->node_size, dxpl_id, node) < 0)
+        /* Write the serialized symbol table node. */
+        if (H5F_block_write(f, H5FD_MEM_BTREE, addr, sym->node_size, dxpl_id, node) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "unable to write symbol table node to the file")
 
         /* Reset the node's dirty flag */
@@ -272,19 +262,18 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
      * Destroy the symbol node?	 This might happen if the node is being
      * preempted from the cache.
      */
-    if(destroy)
-        if(H5G_node_dest(f, sym) < 0)
-	    HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node")
+    if (destroy)
+        if (H5G_node_dest(f, sym) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node")
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_node_dest
  *
@@ -301,7 +290,7 @@ done:
 static herr_t
 H5G_node_dest(H5F_t *f, H5G_node_t *sym)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -318,22 +307,21 @@ H5G_node_dest(H5F_t *f, H5G_node_t *sym)
     HDassert(!sym->cache_info.free_file_space_on_destroy || H5F_addr_defined(sym->cache_info.addr));
 
     /* Check for freeing file space for symbol table node */
-    if(sym->cache_info.free_file_space_on_destroy) {
+    if (sym->cache_info.free_file_space_on_destroy) {
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, sym->cache_info.addr, (hsize_t)sym->node_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_BTREE, H5AC_dxpl_id, sym->cache_info.addr, (hsize_t)sym->node_size) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to free symbol table node")
     } /* end if */
 
     /* Destroy symbol table node */
-    if(H5G__node_free(sym) < 0)
+    if (H5G__node_free(sym) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_node_clear
  *
@@ -366,15 +354,14 @@ H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy)
      * Destroy the symbol node?	 This might happen if the node is being
      * preempted from the cache.
      */
-    if(destroy)
-        if(H5G_node_dest(f, sym) < 0)
-	    HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node")
+    if (destroy)
+        if (H5G_node_dest(f, sym) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_node_size
  *
@@ -404,4 +391,3 @@ H5G_node_size(const H5F_t H5_ATTR_UNUSED *f, const H5G_node_t *sym, size_t *size
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_node_size() */
-
diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c
index 6577d0c..8dc0663 100644
--- a/src/H5Gcompact.c
+++ b/src/H5Gcompact.c
@@ -21,51 +21,48 @@
  *
  *-------------------------------------------------------------------------
  */
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /* Packages needed by this file... */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 /* Private typedefs */
 
 /* User data for link message iteration when building link table */
 typedef struct {
     H5G_link_table_t *ltable;   /* Pointer to link table to build */
-    size_t curr_lnk;            /* Current link to operate on */
+    size_t            curr_lnk; /* Current link to operate on */
 } H5G_iter_bt_t;
 
 /* User data for deleting a link in the link messages */
 typedef struct {
     /* downward */
-    H5F_t       *file;          /* File that object header is located within */
-    hid_t       dxpl_id;        /* DXPL during insertion */
-    H5RS_str_t *grp_full_path_r;/* Full path for group of link */
-    const char *name;           /* Link name to search for */
+    H5F_t *     file;            /* File that object header is located within */
+    hid_t       dxpl_id;         /* DXPL during insertion */
+    H5RS_str_t *grp_full_path_r; /* Full path for group of link */
+    const char *name;            /* Link name to search for */
 } H5G_iter_rm_t;
 
 /* User data for link message iteration when querying link info */
 typedef struct {
     /* downward */
-    const char *name;           /* Name to search for */
+    const char *name; /* Name to search for */
 
     /* upward */
-    H5O_link_t *lnk;            /* Link struct to fill in */
-    hbool_t found;              /* Flag to indicate that the object was found */
+    H5O_link_t *lnk;   /* Link struct to fill in */
+    hbool_t     found; /* Flag to indicate that the object was found */
 } H5G_iter_lkp_t;
 
 /* Private macros */
 
 /* PRIVATE PROTOTYPES */
 static herr_t H5G_compact_build_table_cb(const void *_mesg, unsigned idx, void *_udata);
-static herr_t H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
-    H5G_link_table_t *ltable);
+static herr_t H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                                      H5_index_t idx_type, H5_iter_order_t order, H5G_link_table_t *ltable);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_compact_build_table_cb
  *
@@ -83,9 +80,9 @@ static herr_t H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id,
 static herr_t
 H5G_compact_build_table_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata)
 {
-    const H5O_link_t *lnk = (const H5O_link_t *)_mesg;  /* Pointer to link */
-    H5G_iter_bt_t *udata = (H5G_iter_bt_t *)_udata;     /* 'User data' passed in */
-    herr_t ret_value=H5_ITER_CONT;             /* Return value */
+    const H5O_link_t *lnk       = (const H5O_link_t *)_mesg; /* Pointer to link */
+    H5G_iter_bt_t *   udata     = (H5G_iter_bt_t *)_udata;   /* 'User data' passed in */
+    herr_t            ret_value = H5_ITER_CONT;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -95,7 +92,7 @@ H5G_compact_build_table_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void
     HDassert(udata->curr_lnk < udata->ltable->nlinks);
 
     /* Copy link message into table */
-    if(NULL == H5O_msg_copy(H5O_LINK_ID, lnk, &(udata->ltable->lnks[udata->curr_lnk])))
+    if (NULL == H5O_msg_copy(H5O_LINK_ID, lnk, &(udata->ltable->lnks[udata->curr_lnk])))
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy link message")
 
     /* Increment current link entry to operate on */
@@ -105,7 +102,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_compact_build_table_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_compact_build_table
  *
@@ -121,10 +117,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, H5G_link_table_t *ltable)
+H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type,
+                        H5_iter_order_t order, H5G_link_table_t *ltable)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -138,26 +134,26 @@ H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t
     ltable->nlinks = (size_t)linfo->nlinks;
 
     /* Allocate space for the table entries */
-    if(ltable->nlinks > 0) {
-        H5G_iter_bt_t udata;               /* User data for iteration callback */
-        H5O_mesg_operator_t op;             /* Message operator */
+    if (ltable->nlinks > 0) {
+        H5G_iter_bt_t       udata; /* User data for iteration callback */
+        H5O_mesg_operator_t op;    /* Message operator */
 
         /* Allocate the link table */
-        if((ltable->lnks = (H5O_link_t *)H5MM_malloc(sizeof(H5O_link_t) * ltable->nlinks)) == NULL)
+        if ((ltable->lnks = (H5O_link_t *)H5MM_malloc(sizeof(H5O_link_t) * ltable->nlinks)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Set up user data for iteration */
-        udata.ltable = ltable;
+        udata.ltable   = ltable;
         udata.curr_lnk = 0;
 
         /* Iterate through the link messages, adding them to the table */
-        op.op_type = H5O_MESG_OP_APP;
+        op.op_type  = H5O_MESG_OP_APP;
         op.u.app_op = H5G_compact_build_table_cb;
-        if(H5O_msg_iterate(oloc, H5O_LINK_ID, &op, &udata, dxpl_id) < 0)
+        if (H5O_msg_iterate(oloc, H5O_LINK_ID, &op, &udata, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "error iterating over link messages")
 
         /* Sort link table in correct iteration order */
-        if(H5G__link_sort_table(ltable, idx_type, order) < 0)
+        if (H5G__link_sort_table(ltable, idx_type, order) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTSORT, FAIL, "error sorting link messages")
     } /* end if */
     else
@@ -167,7 +163,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_compact_build_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__compact_insert
  *
@@ -184,10 +179,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
-    hid_t dxpl_id)
+H5G__compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk, hid_t dxpl_id)
 {
-    herr_t     ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -196,14 +190,13 @@ H5G__compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
     HDassert(obj_lnk);
 
     /* Insert link message into group */
-    if(H5O_msg_create(grp_oloc, H5O_LINK_ID, 0, H5O_UPDATE_TIME, obj_lnk, dxpl_id) < 0)
+    if (H5O_msg_create(grp_oloc, H5O_LINK_ID, 0, H5O_UPDATE_TIME, obj_lnk, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__compact_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__compact_get_name_by_idx
  *
@@ -218,12 +211,11 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5G__compact_get_name_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t idx, char* name, size_t size)
+H5G__compact_get_name_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                             H5_index_t idx_type, H5_iter_order_t order, hsize_t idx, char *name, size_t size)
 {
-    H5G_link_table_t    ltable = {0, NULL};         /* Link table */
-    ssize_t		ret_value;      /* Return value */
+    H5G_link_table_t ltable = {0, NULL}; /* Link table */
+    ssize_t          ret_value;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -231,32 +223,31 @@ H5G__compact_get_name_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
     HDassert(oloc);
 
     /* Build table of all link messages */
-    if(H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+    if (H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, &ltable) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create link message table")
 
     /* Check for going out of bounds */
-    if(idx >= ltable.nlinks)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
+    if (idx >= ltable.nlinks)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
 
     /* Get the length of the name */
     ret_value = (ssize_t)HDstrlen(ltable.lnks[idx].name);
 
     /* Copy the name into the user's buffer, if given */
-    if(name) {
+    if (name) {
         HDstrncpy(name, ltable.lnks[idx].name, MIN((size_t)(ret_value + 1), size));
-        if((size_t)ret_value >= size)
-            name[size - 1]='\0';
+        if ((size_t)ret_value >= size)
+            name[size - 1] = '\0';
     } /* end if */
 
 done:
     /* Release link table */
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__compact_get_name_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_compact_remove_common_cb
  *
@@ -274,9 +265,9 @@ done:
 static herr_t
 H5G_compact_remove_common_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata)
 {
-    const H5O_link_t *lnk = (const H5O_link_t *)_mesg;  /* Pointer to link */
-    H5G_iter_rm_t *udata = (H5G_iter_rm_t *)_udata;     /* 'User data' passed in */
-    herr_t ret_value = H5_ITER_CONT;           /* Return value */
+    const H5O_link_t *lnk       = (const H5O_link_t *)_mesg; /* Pointer to link */
+    H5G_iter_rm_t *   udata     = (H5G_iter_rm_t *)_udata;   /* 'User data' passed in */
+    herr_t            ret_value = H5_ITER_CONT;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -285,9 +276,9 @@ H5G_compact_remove_common_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, voi
     HDassert(udata);
 
     /* If we've found the right link, get the object type */
-    if(HDstrcmp(lnk->name, udata->name) == 0) {
+    if (HDstrcmp(lnk->name, udata->name) == 0) {
         /* Replace path names for link being removed */
-        if(H5G__link_name_replace(udata->file, udata->dxpl_id, udata->grp_full_path_r, lnk) < 0)
+        if (H5G__link_name_replace(udata->file, udata->dxpl_id, udata->grp_full_path_r, lnk) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get object type")
 
         /* Stop the iteration, we found the correct link */
@@ -298,7 +289,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_compact_remove_common_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__compact_remove
  *
@@ -312,11 +302,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
-    const char *name)
+H5G__compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r, const char *name)
 {
     H5G_iter_rm_t udata;               /* Data to pass through OH iteration */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -324,20 +313,20 @@ H5G__compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_p
     HDassert(name && *name);
 
     /* Initialize data to pass through object header iteration */
-    udata.file = oloc->file;
-    udata.dxpl_id = dxpl_id;
+    udata.file            = oloc->file;
+    udata.dxpl_id         = dxpl_id;
     udata.grp_full_path_r = grp_full_path_r;
-    udata.name = name;
+    udata.name            = name;
 
     /* Iterate over the link messages to delete the right one */
-    if(H5O_msg_remove_op(oloc, H5O_LINK_ID, H5O_FIRST, H5G_compact_remove_common_cb, &udata, TRUE, dxpl_id) < 0)
+    if (H5O_msg_remove_op(oloc, H5O_LINK_ID, H5O_FIRST, H5G_compact_remove_common_cb, &udata, TRUE, dxpl_id) <
+        0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete link message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__compact_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__compact_remove_by_idx
  *
@@ -351,13 +340,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n)
+H5G__compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                           H5RS_str_t *grp_full_path_r, H5_index_t idx_type, H5_iter_order_t order, hsize_t n)
 {
-    H5G_link_table_t ltable = {0, NULL};/* Link table */
-    H5G_iter_rm_t udata;                /* Data to pass through OH iteration */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_link_table_t ltable = {0, NULL};  /* Link table */
+    H5G_iter_rm_t    udata;               /* Data to pass through OH iteration */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -365,32 +353,32 @@ H5G__compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
     HDassert(linfo);
 
     /* Build table of all link messages, sorted according to desired order */
-    if(H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+    if (H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, &ltable) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create link message table")
 
     /* Check for going out of bounds */
-    if(n >= ltable.nlinks)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index out of bound")
+    if (n >= ltable.nlinks)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index out of bound")
 
     /* Initialize data to pass through object header iteration */
-    udata.file = oloc->file;
-    udata.dxpl_id = dxpl_id;
+    udata.file            = oloc->file;
+    udata.dxpl_id         = dxpl_id;
     udata.grp_full_path_r = grp_full_path_r;
-    udata.name = ltable.lnks[n].name;
+    udata.name            = ltable.lnks[n].name;
 
     /* Iterate over the link messages to delete the right one */
-    if(H5O_msg_remove_op(oloc, H5O_LINK_ID, H5O_FIRST, H5G_compact_remove_common_cb, &udata, TRUE, dxpl_id) < 0)
+    if (H5O_msg_remove_op(oloc, H5O_LINK_ID, H5O_FIRST, H5G_compact_remove_common_cb, &udata, TRUE, dxpl_id) <
+        0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete link message")
 
 done:
     /* Release link table */
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__compact_remove_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__compact_iterate
  *
@@ -404,12 +392,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    H5G_lib_iterate_t op, void *op_data)
+H5G__compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type,
+                     H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op,
+                     void *op_data)
 {
-    H5G_link_table_t    ltable = {0, NULL};     /* Link table */
-    herr_t		ret_value;              /* Return value */
+    H5G_link_table_t ltable = {0, NULL}; /* Link table */
+    herr_t           ret_value;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -419,22 +407,21 @@ H5G__compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *li
     HDassert(op);
 
     /* Build table of all link messages */
-    if(H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+    if (H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, &ltable) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create link message table")
 
     /* Iterate over links in table */
-    if((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
+    if ((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
         HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
 
 done:
     /* Release link table */
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__compact_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_compact_lookup_cb
  *
@@ -452,9 +439,9 @@ done:
 static herr_t
 H5G_compact_lookup_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata)
 {
-    const H5O_link_t *lnk = (const H5O_link_t *)_mesg;  /* Pointer to link */
-    H5G_iter_lkp_t *udata = (H5G_iter_lkp_t *)_udata;     /* 'User data' passed in */
-    herr_t ret_value = H5_ITER_CONT;           /* Return value */
+    const H5O_link_t *lnk       = (const H5O_link_t *)_mesg; /* Pointer to link */
+    H5G_iter_lkp_t *  udata     = (H5G_iter_lkp_t *)_udata;  /* 'User data' passed in */
+    herr_t            ret_value = H5_ITER_CONT;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -463,10 +450,10 @@ H5G_compact_lookup_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_uda
     HDassert(udata);
 
     /* Check for name to get information */
-    if(HDstrcmp(lnk->name, udata->name) == 0) {
-        if(udata->lnk) {
+    if (HDstrcmp(lnk->name, udata->name) == 0) {
+        if (udata->lnk) {
             /* Copy link information */
-            if(NULL == H5O_msg_copy(H5O_LINK_ID, lnk, udata->lnk))
+            if (NULL == H5O_msg_copy(H5O_LINK_ID, lnk, udata->lnk))
                 HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy link message")
         } /* end if */
 
@@ -481,7 +468,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_compact_lookup_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__compact_lookup
  *
@@ -496,12 +482,11 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5G__compact_lookup(const H5O_loc_t *oloc, const char *name, H5O_link_t *lnk,
-    hid_t dxpl_id)
+H5G__compact_lookup(const H5O_loc_t *oloc, const char *name, H5O_link_t *lnk, hid_t dxpl_id)
 {
-    H5G_iter_lkp_t udata;               /* User data for iteration callback */
-    H5O_mesg_operator_t op;             /* Message operator */
-    htri_t     ret_value;               /* Return value */
+    H5G_iter_lkp_t      udata;     /* User data for iteration callback */
+    H5O_mesg_operator_t op;        /* Message operator */
+    htri_t              ret_value; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -510,14 +495,14 @@ H5G__compact_lookup(const H5O_loc_t *oloc, const char *name, H5O_link_t *lnk,
     HDassert(name && *name);
 
     /* Set up user data for iteration */
-    udata.name = name;
-    udata.lnk = lnk;
+    udata.name  = name;
+    udata.lnk   = lnk;
     udata.found = FALSE;
 
     /* Iterate through the link messages, adding them to the table */
-    op.op_type = H5O_MESG_OP_APP;
+    op.op_type  = H5O_MESG_OP_APP;
     op.u.app_op = H5G_compact_lookup_cb;
-    if(H5O_msg_iterate(oloc, H5O_LINK_ID, &op, &udata, dxpl_id) < 0)
+    if (H5O_msg_iterate(oloc, H5O_LINK_ID, &op, &udata, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "error iterating over link messages")
 
     /* Determine if we found the link we were looking for */
@@ -527,7 +512,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__compact_lookup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__compact_lookup_by_idx
  *
@@ -544,10 +528,10 @@ done:
  */
 herr_t
 H5G__compact_lookup_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_link_t *lnk)
+                           H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_link_t *lnk)
 {
-    H5G_link_table_t ltable = {0, NULL};/* Link table */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_link_table_t ltable    = {0, NULL}; /* Link table */
+    herr_t           ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -557,27 +541,27 @@ H5G__compact_lookup_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo
     HDassert(lnk);
 
     /* Build table of all link messages, sorted according to desired order */
-    if(H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+    if (H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, &ltable) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create link message table")
 
     /* Check for going out of bounds */
-    if(n >= ltable.nlinks)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index out of bound")
+    if (n >= ltable.nlinks)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index out of bound")
 
     /* Copy link information */
-    if(NULL == H5O_msg_copy(H5O_LINK_ID, &ltable.lnks[n], lnk))
+    if (NULL == H5O_msg_copy(H5O_LINK_ID, &ltable.lnks[n], lnk))
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy link message")
 
 done:
     /* Release link table */
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__compact_lookup_by_idx() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5G__compact_get_type_by_idx
  *
@@ -592,11 +576,10 @@ done:
  *-------------------------------------------------------------------------
  */
 H5G_obj_t
-H5G__compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    hsize_t idx)
+H5G__compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, hsize_t idx)
 {
-    H5G_link_table_t    ltable = {0, NULL};         /* Link table */
-    H5G_obj_t		ret_value;      /* Return value */
+    H5G_link_table_t ltable = {0, NULL}; /* Link table */
+    H5G_obj_t        ret_value;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -604,43 +587,43 @@ H5G__compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *
     HDassert(oloc);
 
     /* Build table of all link messages */
-    if(H5G_compact_build_table(oloc, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_INC, &ltable) < 0)
+    if (H5G_compact_build_table(oloc, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_INC, &ltable) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5G_UNKNOWN, "can't create link message table")
 
     /* Check for going out of bounds */
-    if(idx >= ltable.nlinks)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, H5G_UNKNOWN, "index out of bound")
+    if (idx >= ltable.nlinks)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, H5G_UNKNOWN, "index out of bound")
 
     /* Determine type of object */
-    if(ltable.lnks[idx].type == H5L_TYPE_SOFT)
+    if (ltable.lnks[idx].type == H5L_TYPE_SOFT)
         ret_value = H5G_LINK;
-    else if(ltable.lnks[idx].type >= H5L_TYPE_UD_MIN)
+    else if (ltable.lnks[idx].type >= H5L_TYPE_UD_MIN)
         ret_value = H5G_UDLINK;
-    else if(ltable.lnks[idx].type == H5L_TYPE_HARD){
-        H5O_loc_t tmp_oloc;             /* Temporary object location */
-        H5O_type_t obj_type;            /* Type of object at location */
+    else if (ltable.lnks[idx].type == H5L_TYPE_HARD) {
+        H5O_loc_t  tmp_oloc; /* Temporary object location */
+        H5O_type_t obj_type; /* Type of object at location */
 
         /* Build temporary object location */
         tmp_oloc.file = oloc->file;
         tmp_oloc.addr = ltable.lnks[idx].u.hard.addr;
 
         /* Get the type of the object */
-        if(H5O_obj_type(&tmp_oloc, &obj_type, dxpl_id) < 0)
+        if (H5O_obj_type(&tmp_oloc, &obj_type, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5G_UNKNOWN, "can't get object type")
 
         /* Map to group object type */
-        if(H5G_UNKNOWN == (ret_value = H5G_map_obj_type(obj_type)))
+        if (H5G_UNKNOWN == (ret_value = H5G_map_obj_type(obj_type)))
             HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "can't determine object type")
-    } else {
+    }
+    else {
         HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "unknown link type")
     } /* end else */
 
 done:
     /* Release link table */
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, H5G_UNKNOWN, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__compact_get_type_by_idx() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Gdense.c b/src/H5Gdense.c
index a43939e..41b3185 100644
--- a/src/H5Gdense.c
+++ b/src/H5Gdense.c
@@ -27,44 +27,42 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg  */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Fractal heap creation parameters for "dense" link storage */
-#define H5G_FHEAP_MAN_WIDTH                     4
-#define H5G_FHEAP_MAN_START_BLOCK_SIZE          512
-#define H5G_FHEAP_MAN_MAX_DIRECT_SIZE           (64 * 1024)
-#define H5G_FHEAP_MAN_MAX_INDEX                 32
-#define H5G_FHEAP_MAN_START_ROOT_ROWS           1
-#define H5G_FHEAP_CHECKSUM_DBLOCKS              TRUE
-#define H5G_FHEAP_MAX_MAN_SIZE                  (4 * 1024)
+#define H5G_FHEAP_MAN_WIDTH            4
+#define H5G_FHEAP_MAN_START_BLOCK_SIZE 512
+#define H5G_FHEAP_MAN_MAX_DIRECT_SIZE  (64 * 1024)
+#define H5G_FHEAP_MAN_MAX_INDEX        32
+#define H5G_FHEAP_MAN_START_ROOT_ROWS  1
+#define H5G_FHEAP_CHECKSUM_DBLOCKS     TRUE
+#define H5G_FHEAP_MAX_MAN_SIZE         (4 * 1024)
 
 /* v2 B-tree creation macros for 'name' field index */
-#define H5G_NAME_BT2_NODE_SIZE          512
-#define H5G_NAME_BT2_MERGE_PERC         40
-#define H5G_NAME_BT2_SPLIT_PERC         100
+#define H5G_NAME_BT2_NODE_SIZE  512
+#define H5G_NAME_BT2_MERGE_PERC 40
+#define H5G_NAME_BT2_SPLIT_PERC 100
 
 /* v2 B-tree creation macros for 'corder' field index */
-#define H5G_CORDER_BT2_NODE_SIZE        512
-#define H5G_CORDER_BT2_MERGE_PERC       40
-#define H5G_CORDER_BT2_SPLIT_PERC       100
+#define H5G_CORDER_BT2_NODE_SIZE  512
+#define H5G_CORDER_BT2_MERGE_PERC 40
+#define H5G_CORDER_BT2_SPLIT_PERC 100
 
 /* Size of stack buffer for serialized link */
-#define H5G_LINK_BUF_SIZE               128
-
+#define H5G_LINK_BUF_SIZE 128
 
 /******************/
 /* Local Typedefs */
@@ -73,7 +71,7 @@
 /* Data exchange structure to use when building table of links in group */
 typedef struct {
     H5G_link_table_t *ltable;   /* Pointer to link table to build */
-    size_t curr_lnk;            /* Current link to operate on */
+    size_t            curr_lnk; /* Current link to operate on */
 } H5G_dense_bt_ud_t;
 
 /*
@@ -82,18 +80,18 @@ typedef struct {
  */
 typedef struct {
     /* downward (internal) */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    H5HF_t      *fheap;                 /* Fractal heap handle               */
-    hsize_t     count;                  /* # of links examined               */
+    H5F_t * f;       /* Pointer to file that fractal heap is in */
+    hid_t   dxpl_id; /* DXPL for operation                */
+    H5HF_t *fheap;   /* Fractal heap handle               */
+    hsize_t count;   /* # of links examined               */
 
     /* downward (from application) */
-    hsize_t     skip;                   /* Number of links to skip           */
-    H5G_lib_iterate_t op;               /* Callback for each link            */
-    void        *op_data;               /* Callback data for each link       */
+    hsize_t           skip;    /* Number of links to skip           */
+    H5G_lib_iterate_t op;      /* Callback for each link            */
+    void *            op_data; /* Callback data for each link       */
 
     /* upward */
-    int         op_ret;                 /* Return value from callback        */
+    int op_ret; /* Return value from callback        */
 } H5G_bt2_ud_it_t;
 
 /*
@@ -102,11 +100,11 @@ typedef struct {
  */
 typedef struct {
     /* downward (internal) */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
+    H5F_t *f;       /* Pointer to file that fractal heap is in */
+    hid_t  dxpl_id; /* DXPL for operation                */
 
     /* upward */
-    H5O_link_t  *lnk;                   /* Copy of link                      */
+    H5O_link_t *lnk; /* Copy of link                      */
 } H5G_fh_ud_it_t;
 
 /*
@@ -115,11 +113,11 @@ typedef struct {
  */
 typedef struct {
     /* downward */
-    H5G_bt2_ud_common_t common;         /* Common info for B-tree user data (must be first) */
-    hbool_t     rem_from_fheap;         /* Whether to remove the link from the fractal heap */
-    haddr_t     corder_bt2_addr;        /* Address of v2 B-tree indexing creation order */
-    H5RS_str_t *grp_full_path_r;        /* Full path of group where link is removed */
-    hbool_t     replace_names;          /* Whether to replace the names of open objects */
+    H5G_bt2_ud_common_t common;          /* Common info for B-tree user data (must be first) */
+    hbool_t             rem_from_fheap;  /* Whether to remove the link from the fractal heap */
+    haddr_t             corder_bt2_addr; /* Address of v2 B-tree indexing creation order */
+    H5RS_str_t *        grp_full_path_r; /* Full path of group where link is removed */
+    hbool_t             replace_names;   /* Whether to replace the names of open objects */
 } H5G_bt2_ud_rm_t;
 
 /*
@@ -128,11 +126,11 @@ typedef struct {
  */
 typedef struct {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    haddr_t     corder_bt2_addr;        /* Address of v2 B-tree indexing creation order */
-    H5RS_str_t *grp_full_path_r;        /* Full path of group where link is removed */
-    hbool_t     replace_names;          /* Whether to replace the names of open objects */
+    H5F_t *     f;               /* Pointer to file that fractal heap is in */
+    hid_t       dxpl_id;         /* DXPL for operation                */
+    haddr_t     corder_bt2_addr; /* Address of v2 B-tree indexing creation order */
+    H5RS_str_t *grp_full_path_r; /* Full path of group where link is removed */
+    hbool_t     replace_names;   /* Whether to replace the names of open objects */
 } H5G_fh_ud_rm_t;
 
 /*
@@ -141,12 +139,12 @@ typedef struct {
  */
 typedef struct {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    H5HF_t      *fheap;                 /* Fractal heap handle               */
-    H5_index_t idx_type;                /* Primary index for removing link */
-    haddr_t     other_bt2_addr;         /* Address of "other" v2 B-tree indexing link */
-    H5RS_str_t *grp_full_path_r;        /* Full path of group where link is removed */
+    H5F_t *     f;               /* Pointer to file that fractal heap is in */
+    hid_t       dxpl_id;         /* DXPL for operation                */
+    H5HF_t *    fheap;           /* Fractal heap handle               */
+    H5_index_t  idx_type;        /* Primary index for removing link */
+    haddr_t     other_bt2_addr;  /* Address of "other" v2 B-tree indexing link */
+    H5RS_str_t *grp_full_path_r; /* Full path of group where link is removed */
 } H5G_bt2_ud_rmbi_t;
 
 /*
@@ -155,11 +153,11 @@ typedef struct {
  */
 typedef struct {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
+    H5F_t *f;       /* Pointer to file that fractal heap is in */
+    hid_t  dxpl_id; /* DXPL for operation                */
 
     /* upward */
-    H5O_link_t *lnk;                    /* Pointer to link to remove */
+    H5O_link_t *lnk; /* Pointer to link to remove */
 } H5G_fh_ud_rmbi_t;
 
 /*
@@ -168,16 +166,16 @@ typedef struct {
  */
 typedef struct {
     /* downward (internal) */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    H5HF_t      *fheap;                 /* Fractal heap handle               */
+    H5F_t * f;       /* Pointer to file that fractal heap is in */
+    hid_t   dxpl_id; /* DXPL for operation                */
+    H5HF_t *fheap;   /* Fractal heap handle               */
 
     /* downward (from application) */
-    char        *name;                  /* Name buffer to fill               */
-    size_t      name_size;              /* Size of name buffer to fill       */
+    char * name;      /* Name buffer to fill               */
+    size_t name_size; /* Size of name buffer to fill       */
 
     /* upward */
-    ssize_t     name_len;               /* Full length of name               */
+    ssize_t name_len; /* Full length of name               */
 } H5G_bt2_ud_gnbi_t;
 
 /*
@@ -186,15 +184,15 @@ typedef struct {
  */
 typedef struct {
     /* downward (internal) */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
+    H5F_t *f;       /* Pointer to file that fractal heap is in */
+    hid_t  dxpl_id; /* DXPL for operation                */
 
     /* downward (from application) */
-    char        *name;                  /* Name buffer to fill               */
-    size_t      name_size;              /* Size of name buffer to fill       */
+    char * name;      /* Name buffer to fill               */
+    size_t name_size; /* Size of name buffer to fill       */
 
     /* upward */
-    ssize_t     name_len;               /* Full length of name               */
+    ssize_t name_len; /* Full length of name               */
 } H5G_fh_ud_gnbi_t;
 
 /*
@@ -203,12 +201,12 @@ typedef struct {
  */
 typedef struct {
     /* downward (internal) */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    H5HF_t      *fheap;                 /* Fractal heap handle               */
+    H5F_t * f;       /* Pointer to file that fractal heap is in */
+    hid_t   dxpl_id; /* DXPL for operation                */
+    H5HF_t *fheap;   /* Fractal heap handle               */
 
     /* upward */
-    H5O_link_t  *lnk;                   /* Pointer to link                   */
+    H5O_link_t *lnk; /* Pointer to link                   */
 } H5G_bt2_ud_lbi_t;
 
 /*
@@ -217,40 +215,33 @@ typedef struct {
  */
 typedef struct {
     /* downward (internal) */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
+    H5F_t *f;       /* Pointer to file that fractal heap is in */
+    hid_t  dxpl_id; /* DXPL for operation                */
 
     /* upward */
-    H5O_link_t  *lnk;                   /* Pointer to link                   */
+    H5O_link_t *lnk; /* Pointer to link                   */
 } H5G_fh_ud_lbi_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_create
  *
@@ -265,16 +256,15 @@ typedef struct {
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
-    const H5O_pline_t *pline)
+H5G__dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, const H5O_pline_t *pline)
 {
-    H5HF_create_t fheap_cparam;         /* Fractal heap creation parameters */
-    H5B2_create_t bt2_cparam;           /* v2 B-tree creation parameters */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for names */
-    H5B2_t *bt2_corder = NULL;          /* v2 B-tree handle for creation order */
-    size_t fheap_id_len;                /* Fractal heap ID length */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_create_t fheap_cparam;        /* Fractal heap creation parameters */
+    H5B2_create_t bt2_cparam;          /* v2 B-tree creation parameters */
+    H5HF_t *      fheap      = NULL;   /* Fractal heap handle */
+    H5B2_t *      bt2_name   = NULL;   /* v2 B-tree handle for names */
+    H5B2_t *      bt2_corder = NULL;   /* v2 B-tree handle for creation order */
+    size_t        fheap_id_len;        /* Fractal heap ID length */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -285,89 +275,88 @@ H5G__dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
     HDassert(linfo);
 
     /* Set fractal heap creation parameters */
-/* XXX: Give some control of these to applications? */
+    /* XXX: Give some control of these to applications? */
     HDmemset(&fheap_cparam, 0, sizeof(fheap_cparam));
-    fheap_cparam.managed.width = H5G_FHEAP_MAN_WIDTH;
+    fheap_cparam.managed.width            = H5G_FHEAP_MAN_WIDTH;
     fheap_cparam.managed.start_block_size = H5G_FHEAP_MAN_START_BLOCK_SIZE;
-    fheap_cparam.managed.max_direct_size = H5G_FHEAP_MAN_MAX_DIRECT_SIZE;
-    fheap_cparam.managed.max_index = H5G_FHEAP_MAN_MAX_INDEX;
-    fheap_cparam.managed.start_root_rows = H5G_FHEAP_MAN_START_ROOT_ROWS;
-    fheap_cparam.checksum_dblocks = H5G_FHEAP_CHECKSUM_DBLOCKS;
-    fheap_cparam.max_man_size = H5G_FHEAP_MAX_MAN_SIZE;
-    if(pline)
+    fheap_cparam.managed.max_direct_size  = H5G_FHEAP_MAN_MAX_DIRECT_SIZE;
+    fheap_cparam.managed.max_index        = H5G_FHEAP_MAN_MAX_INDEX;
+    fheap_cparam.managed.start_root_rows  = H5G_FHEAP_MAN_START_ROOT_ROWS;
+    fheap_cparam.checksum_dblocks         = H5G_FHEAP_CHECKSUM_DBLOCKS;
+    fheap_cparam.max_man_size             = H5G_FHEAP_MAX_MAN_SIZE;
+    if (pline)
         fheap_cparam.pline = *pline;
 
     /* Create fractal heap for storing links */
-    if(NULL == (fheap = H5HF_create(f, dxpl_id, &fheap_cparam)))
+    if (NULL == (fheap = H5HF_create(f, dxpl_id, &fheap_cparam)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create fractal heap")
 
     /* Retrieve the heap's address in the file */
-    if(H5HF_get_heap_addr(fheap, &(linfo->fheap_addr)) < 0)
+    if (H5HF_get_heap_addr(fheap, &(linfo->fheap_addr)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get fractal heap address")
 #ifdef QAK
-HDfprintf(stderr, "%s: linfo->fheap_addr = %a\n", FUNC, linfo->fheap_addr);
+    HDfprintf(stderr, "%s: linfo->fheap_addr = %a\n", FUNC, linfo->fheap_addr);
 #endif /* QAK */
 
     /* Retrieve the heap's ID length in the file */
-    if(H5HF_get_id_len(fheap, &fheap_id_len) < 0)
+    if (H5HF_get_id_len(fheap, &fheap_id_len) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, FAIL, "can't get fractal heap ID length")
     HDassert(fheap_id_len == H5G_DENSE_FHEAP_ID_LEN);
 #ifdef QAK
-HDfprintf(stderr, "%s: fheap_id_len = %Zu\n", FUNC, fheap_id_len);
+    HDfprintf(stderr, "%s: fheap_id_len = %Zu\n", FUNC, fheap_id_len);
 #endif /* QAK */
 
     /* Create the name index v2 B-tree */
     HDmemset(&bt2_cparam, 0, sizeof(bt2_cparam));
-    bt2_cparam.cls = H5G_BT2_NAME;
+    bt2_cparam.cls       = H5G_BT2_NAME;
     bt2_cparam.node_size = (size_t)H5G_NAME_BT2_NODE_SIZE;
-    bt2_cparam.rrec_size = 4 +          /* Name's hash value */
-            fheap_id_len;               /* Fractal heap ID */
+    bt2_cparam.rrec_size = 4 +           /* Name's hash value */
+                           fheap_id_len; /* Fractal heap ID */
     bt2_cparam.split_percent = H5G_NAME_BT2_SPLIT_PERC;
     bt2_cparam.merge_percent = H5G_NAME_BT2_MERGE_PERC;
-    if(NULL == (bt2_name = H5B2_create(f, dxpl_id, &bt2_cparam, NULL)))
+    if (NULL == (bt2_name = H5B2_create(f, dxpl_id, &bt2_cparam, NULL)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create v2 B-tree for name index")
 
     /* Retrieve the v2 B-tree's address in the file */
-    if(H5B2_get_addr(bt2_name, &(linfo->name_bt2_addr)) < 0)
+    if (H5B2_get_addr(bt2_name, &(linfo->name_bt2_addr)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get v2 B-tree address for name index")
 #ifdef QAK
-HDfprintf(stderr, "%s: linfo->name_bt2_addr = %a\n", FUNC, linfo->name_bt2_addr);
+    HDfprintf(stderr, "%s: linfo->name_bt2_addr = %a\n", FUNC, linfo->name_bt2_addr);
 #endif /* QAK */
 
     /* Check if we should create a creation order index v2 B-tree */
-    if(linfo->index_corder) {
+    if (linfo->index_corder) {
         /* Create the creation order index v2 B-tree */
         HDmemset(&bt2_cparam, 0, sizeof(bt2_cparam));
-        bt2_cparam.cls = H5G_BT2_CORDER;
+        bt2_cparam.cls       = H5G_BT2_CORDER;
         bt2_cparam.node_size = (size_t)H5G_CORDER_BT2_NODE_SIZE;
-        bt2_cparam.rrec_size = 8 +      /* Creation order value */
-                fheap_id_len;           /* Fractal heap ID */
+        bt2_cparam.rrec_size = 8 +           /* Creation order value */
+                               fheap_id_len; /* Fractal heap ID */
         bt2_cparam.split_percent = H5G_CORDER_BT2_SPLIT_PERC;
         bt2_cparam.merge_percent = H5G_CORDER_BT2_MERGE_PERC;
-        if(NULL == (bt2_corder = H5B2_create(f, dxpl_id, &bt2_cparam, NULL)))
+        if (NULL == (bt2_corder = H5B2_create(f, dxpl_id, &bt2_cparam, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create v2 B-tree for creation order index")
 
         /* Retrieve the v2 B-tree's address in the file */
-        if(H5B2_get_addr(bt2_corder, &(linfo->corder_bt2_addr)) < 0)
+        if (H5B2_get_addr(bt2_corder, &(linfo->corder_bt2_addr)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get v2 B-tree address for creation order index")
 #ifdef QAK
-HDfprintf(stderr, "%s: linfo->corder_bt2_addr = %a\n", FUNC, linfo->corder_bt2_addr);
+        HDfprintf(stderr, "%s: linfo->corder_bt2_addr = %a\n", FUNC, linfo->corder_bt2_addr);
 #endif /* QAK */
-    } /* end if */
+    }  /* end if */
 
 done:
     /* Close the open objects */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_insert
  *
@@ -382,18 +371,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    const H5O_link_t *lnk)
+H5G__dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, const H5O_link_t *lnk)
 {
-    H5G_bt2_ud_ins_t udata;             /* User data for v2 B-tree insertion */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    H5B2_t *bt2_corder = NULL;          /* v2 B-tree handle for creation order index */
-    size_t link_size;                   /* Size of serialized link in the heap */
-    H5WB_t *wb = NULL;                  /* Wrapped buffer for link data */
-    uint8_t link_buf[H5G_LINK_BUF_SIZE];        /* Buffer for serializing link */
-    void *link_ptr = NULL;              /* Pointer to serialized link */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_bt2_ud_ins_t udata;                       /* User data for v2 B-tree insertion */
+    H5HF_t *         fheap      = NULL;           /* Fractal heap handle */
+    H5B2_t *         bt2_name   = NULL;           /* v2 B-tree handle for name index */
+    H5B2_t *         bt2_corder = NULL;           /* v2 B-tree handle for creation order index */
+    size_t           link_size;                   /* Size of serialized link in the heap */
+    H5WB_t *         wb = NULL;                   /* Wrapped buffer for link data */
+    uint8_t          link_buf[H5G_LINK_BUF_SIZE]; /* Buffer for serializing link */
+    void *           link_ptr  = NULL;            /* Pointer to serialized link */
+    herr_t           ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -404,83 +392,83 @@ H5G__dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     HDassert(linfo);
     HDassert(lnk);
 #ifdef QAK
-HDfprintf(stderr, "%s: linfo->fheap_addr = %a\n", FUNC, linfo->fheap_addr);
-HDfprintf(stderr, "%s: linfo->name_bt2_addr = %a\n", FUNC, linfo->name_bt2_addr);
+    HDfprintf(stderr, "%s: linfo->fheap_addr = %a\n", FUNC, linfo->fheap_addr);
+    HDfprintf(stderr, "%s: linfo->name_bt2_addr = %a\n", FUNC, linfo->name_bt2_addr);
 #endif /* QAK */
 
     /* Find out the size of buffer needed for serialized link */
-    if((link_size = H5O_msg_raw_size(f, H5O_LINK_ID, FALSE, lnk)) == 0)
+    if ((link_size = H5O_msg_raw_size(f, H5O_LINK_ID, FALSE, lnk)) == 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, FAIL, "can't get link size")
 #ifdef QAK
-HDfprintf(stderr, "%s: HDstrlen(lnk->name) = %Zu, link_size = %Zu\n", FUNC, HDstrlen(lnk->name), link_size);
+    HDfprintf(stderr, "%s: HDstrlen(lnk->name) = %Zu, link_size = %Zu\n", FUNC, HDstrlen(lnk->name),
+              link_size);
 #endif /* QAK */
 
     /* Wrap the local buffer for serialized link */
-    if(NULL == (wb = H5WB_wrap(link_buf, sizeof(link_buf))))
+    if (NULL == (wb = H5WB_wrap(link_buf, sizeof(link_buf))))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
     /* Get a pointer to a buffer that's large enough for link */
-    if(NULL == (link_ptr = H5WB_actual(wb, link_size)))
+    if (NULL == (link_ptr = H5WB_actual(wb, link_size)))
         HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
     /* Create serialized form of link */
-    if(H5O_msg_encode(f, H5O_LINK_ID, FALSE, (unsigned char *)link_ptr, lnk) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTENCODE, FAIL, "can't encode link")
+    if (H5O_msg_encode(f, H5O_LINK_ID, FALSE, (unsigned char *)link_ptr, lnk) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTENCODE, FAIL, "can't encode link")
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Insert the serialized link into the fractal heap */
-    if(H5HF_insert(fheap, dxpl_id, link_size, link_ptr, udata.id) < 0)
+    if (H5HF_insert(fheap, dxpl_id, link_size, link_ptr, udata.id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert link into fractal heap")
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, linfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, linfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Create the callback information for v2 B-tree record insertion */
-    udata.common.f = f;
-    udata.common.dxpl_id = dxpl_id;
-    udata.common.fheap = fheap;
-    udata.common.name = lnk->name;
-    udata.common.name_hash = H5_checksum_lookup3(lnk->name, HDstrlen(lnk->name), 0);
-    udata.common.corder = lnk->corder;
-    udata.common.found_op = NULL;
+    udata.common.f             = f;
+    udata.common.dxpl_id       = dxpl_id;
+    udata.common.fheap         = fheap;
+    udata.common.name          = lnk->name;
+    udata.common.name_hash     = H5_checksum_lookup3(lnk->name, HDstrlen(lnk->name), 0);
+    udata.common.corder        = lnk->corder;
+    udata.common.found_op      = NULL;
     udata.common.found_op_data = NULL;
     /* udata.id already set in H5HF_insert() call */
 
     /* Insert link into 'name' tracking v2 B-tree */
-    if(H5B2_insert(bt2_name, dxpl_id, &udata) < 0)
+    if (H5B2_insert(bt2_name, dxpl_id, &udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert record into v2 B-tree")
 
     /* Check if we should create a creation order index v2 B-tree record */
-    if(linfo->index_corder) {
+    if (linfo->index_corder) {
         /* Open the creation order index v2 B-tree */
         HDassert(H5F_addr_defined(linfo->corder_bt2_addr));
-        if(NULL == (bt2_corder = H5B2_open(f, dxpl_id, linfo->corder_bt2_addr, NULL)))
+        if (NULL == (bt2_corder = H5B2_open(f, dxpl_id, linfo->corder_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
 
         /* Insert the record into the creation order index v2 B-tree */
-        if(H5B2_insert(bt2_corder, dxpl_id, &udata) < 0)
+        if (H5B2_insert(bt2_corder, dxpl_id, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert record into v2 B-tree")
     } /* end if */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_lookup_cb
  *
@@ -497,9 +485,9 @@ done:
 static herr_t
 H5G_dense_lookup_cb(const void *_lnk, void *_user_lnk)
 {
-    const H5O_link_t *lnk = (const H5O_link_t *)_lnk; /* Record from B-tree */
-    H5O_link_t *user_lnk = (H5O_link_t *)_user_lnk;       /* User data from v2 B-tree link lookup */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_link_t *lnk       = (const H5O_link_t *)_lnk; /* Record from B-tree */
+    H5O_link_t *      user_lnk  = (H5O_link_t *)_user_lnk;  /* User data from v2 B-tree link lookup */
+    herr_t            ret_value = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -510,14 +498,13 @@ H5G_dense_lookup_cb(const void *_lnk, void *_user_lnk)
     HDassert(user_lnk);
 
     /* Copy link information */
-    if(H5O_msg_copy(H5O_LINK_ID, lnk, user_lnk) == NULL)
+    if (H5O_msg_copy(H5O_LINK_ID, lnk, user_lnk) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy link message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_lookup_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_lookup
  *
@@ -532,13 +519,12 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5G__dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    const char *name, H5O_link_t *lnk)
+H5G__dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, const char *name, H5O_link_t *lnk)
 {
-    H5G_bt2_ud_common_t udata;          /* User data for v2 B-tree link lookup */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    htri_t ret_value;                   /* Return value */
+    H5G_bt2_ud_common_t udata;           /* User data for v2 B-tree link lookup */
+    H5HF_t *            fheap    = NULL; /* Fractal heap handle */
+    H5B2_t *            bt2_name = NULL; /* v2 B-tree handle for name index */
+    htri_t              ret_value;       /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -551,37 +537,36 @@ H5G__dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     HDassert(lnk);
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(f, dxpl_id, linfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(f, dxpl_id, linfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Construct the user data for v2 B-tree callback */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.fheap = fheap;
-    udata.name = name;
-    udata.name_hash = H5_checksum_lookup3(name, HDstrlen(name), 0);
-    udata.found_op = H5G_dense_lookup_cb;       /* v2 B-tree comparison callback */
+    udata.f             = f;
+    udata.dxpl_id       = dxpl_id;
+    udata.fheap         = fheap;
+    udata.name          = name;
+    udata.name_hash     = H5_checksum_lookup3(name, HDstrlen(name), 0);
+    udata.found_op      = H5G_dense_lookup_cb; /* v2 B-tree comparison callback */
     udata.found_op_data = lnk;
 
     /* Find & copy the named link in the 'name' index */
-    if((ret_value = H5B2_find(bt2_name, dxpl_id, &udata, NULL, NULL)) < 0)
+    if ((ret_value = H5B2_find(bt2_name, dxpl_id, &udata, NULL, NULL)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to locate link in name index")
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_lookup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_lookup_by_idx_fh_cb
  *
@@ -599,29 +584,29 @@ done:
 static herr_t
 H5G_dense_lookup_by_idx_fh_cb(const void *obj, size_t obj_len, void *_udata)
 {
-    H5G_fh_ud_lbi_t *udata = (H5G_fh_ud_lbi_t *)_udata;       /* User data for fractal heap 'op' callback */
-    H5O_link_t *tmp_lnk = NULL;         /* Temporary pointer to link */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_fh_ud_lbi_t *udata     = (H5G_fh_ud_lbi_t *)_udata; /* User data for fractal heap 'op' callback */
+    H5O_link_t *     tmp_lnk   = NULL;                      /* Temporary pointer to link */
+    herr_t           ret_value = SUCCEED;                   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Decode link information & keep a copy */
-    if(NULL == (tmp_lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (tmp_lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len,
+                                                        (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "can't decode link")
 
     /* Copy link information */
-    if(NULL == H5O_msg_copy(H5O_LINK_ID, tmp_lnk, udata->lnk))
+    if (NULL == H5O_msg_copy(H5O_LINK_ID, tmp_lnk, udata->lnk))
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy link message")
 
 done:
     /* Release the space allocated for the link */
-    if(tmp_lnk)
+    if (tmp_lnk)
         H5O_msg_free(H5O_LINK_ID, tmp_lnk);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_lookup_by_idx_fh_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_lookup_by_idx_bt2_cb
  *
@@ -638,29 +623,28 @@ done:
 static herr_t
 H5G_dense_lookup_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
 {
-    const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record;
-    H5G_bt2_ud_lbi_t *bt2_udata = (H5G_bt2_ud_lbi_t *)_bt2_udata;         /* User data for callback */
-    H5G_fh_ud_lbi_t fh_udata;          /* User data for fractal heap 'op' callback */
-    int ret_value = H5_ITER_CONT;     /* Return value */
+    const H5G_dense_bt2_name_rec_t *record    = (const H5G_dense_bt2_name_rec_t *)_record;
+    H5G_bt2_ud_lbi_t *              bt2_udata = (H5G_bt2_ud_lbi_t *)_bt2_udata; /* User data for callback */
+    H5G_fh_ud_lbi_t                 fh_udata;                 /* User data for fractal heap 'op' callback */
+    int                             ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Prepare user data for callback */
     /* down */
-    fh_udata.f = bt2_udata->f;
+    fh_udata.f       = bt2_udata->f;
     fh_udata.dxpl_id = bt2_udata->dxpl_id;
-    fh_udata.lnk = bt2_udata->lnk;
+    fh_udata.lnk     = bt2_udata->lnk;
 
     /* Call fractal heap 'op' routine, to copy the link information */
-    if(H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, record->id,
-            H5G_dense_lookup_by_idx_fh_cb, &fh_udata) < 0)
+    if (H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, record->id, H5G_dense_lookup_by_idx_fh_cb, &fh_udata) <
+        0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPERATE, H5_ITER_ERROR, "link found callback failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_lookup_by_idx_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_lookup_by_idx
  *
@@ -676,14 +660,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_link_t *lnk)
+H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type,
+                         H5_iter_order_t order, hsize_t n, H5O_link_t *lnk)
 {
-    H5HF_t *fheap = NULL;                     /* Fractal heap handle */
-    H5G_link_table_t ltable = {0, NULL};      /* Table of links */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    haddr_t bt2_addr;                   /* Address of v2 B-tree to use for lookup */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_t *         fheap  = NULL;       /* Fractal heap handle */
+    H5G_link_table_t ltable = {0, NULL};  /* Table of links */
+    H5B2_t *         bt2    = NULL;       /* v2 B-tree handle for index */
+    haddr_t          bt2_addr;            /* Address of v2 B-tree to use for lookup */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -695,7 +679,7 @@ H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     HDassert(lnk);
 
     /* Determine the address of the index to use */
-    if(idx_type == H5_INDEX_NAME) {
+    if (idx_type == H5_INDEX_NAME) {
         /* Since names are hashed, getting them in strictly increasing or
          *      decreasing order requires building a table and sorting it.
          *      If the order is native, use the B-tree for names.
@@ -717,60 +701,59 @@ H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
      * use the B-tree for names instead of building a table to speed up the
      * process.
      */
-    if(order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
+    if (order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
         bt2_addr = linfo->name_bt2_addr;
         HDassert(H5F_addr_defined(bt2_addr));
     } /* end if */
 
     /* If there is an index defined for the field, use it */
-    if(H5F_addr_defined(bt2_addr)) {
-        H5G_bt2_ud_lbi_t udata;        /* User data for v2 B-tree link lookup */
+    if (H5F_addr_defined(bt2_addr)) {
+        H5G_bt2_ud_lbi_t udata; /* User data for v2 B-tree link lookup */
 
         /* Open the fractal heap */
-        if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
+        if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for index")
 
         /* Construct the user data for v2 B-tree callback */
-        udata.f = f;
+        udata.f       = f;
         udata.dxpl_id = dxpl_id;
-        udata.fheap = fheap;
-        udata.lnk = lnk;
+        udata.fheap   = fheap;
+        udata.lnk     = lnk;
 
         /* Find & copy the link in the appropriate index */
-        if(H5B2_index(bt2, dxpl_id, order, n, H5G_dense_lookup_by_idx_bt2_cb, &udata) < 0)
+        if (H5B2_index(bt2, dxpl_id, order, n, H5G_dense_lookup_by_idx_bt2_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to locate link in index")
-    } /* end if */
-    else {      /* Otherwise, we need to build a table of the links and sort it */
+    }      /* end if */
+    else { /* Otherwise, we need to build a table of the links and sort it */
         /* Build the table of links for this group */
-        if(H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+        if (H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
 
         /* Check for going out of bounds */
-        if(n >= ltable.nlinks)
+        if (n >= ltable.nlinks)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
 
         /* Copy link information */
-        if(NULL == H5O_msg_copy(H5O_LINK_ID, &ltable.lnks[n], lnk))
+        if (NULL == H5O_msg_copy(H5O_LINK_ID, &ltable.lnks[n], lnk))
             HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy link message")
     } /* end else */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_lookup_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_build_table_cb
  *
@@ -789,8 +772,8 @@ done:
 static herr_t
 H5G_dense_build_table_cb(const H5O_link_t *lnk, void *_udata)
 {
-    H5G_dense_bt_ud_t *udata = (H5G_dense_bt_ud_t *)_udata;     /* 'User data' passed in */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    H5G_dense_bt_ud_t *udata     = (H5G_dense_bt_ud_t *)_udata; /* 'User data' passed in */
+    herr_t             ret_value = H5_ITER_CONT;                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -800,7 +783,7 @@ H5G_dense_build_table_cb(const H5O_link_t *lnk, void *_udata)
     HDassert(udata->curr_lnk < udata->ltable->nlinks);
 
     /* Copy link information */
-    if(H5O_msg_copy(H5O_LINK_ID, lnk, &(udata->ltable->lnks[udata->curr_lnk])) == NULL)
+    if (H5O_msg_copy(H5O_LINK_ID, lnk, &(udata->ltable->lnks[udata->curr_lnk])) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy link message")
 
     /* Increment number of links stored */
@@ -810,7 +793,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_build_table_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_build_table
  *
@@ -828,10 +810,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, H5G_link_table_t *ltable)
+H5G__dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type,
+                       H5_iter_order_t order, H5G_link_table_t *ltable)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -845,23 +827,24 @@ H5G__dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     ltable->nlinks = (size_t)linfo->nlinks;
 
     /* Allocate space for the table entries */
-    if(ltable->nlinks > 0) {
-        H5G_dense_bt_ud_t udata;       /* User data for iteration callback */
+    if (ltable->nlinks > 0) {
+        H5G_dense_bt_ud_t udata; /* User data for iteration callback */
 
         /* Allocate the table to store the links */
-        if((ltable->lnks = (H5O_link_t *)H5MM_malloc(sizeof(H5O_link_t) * ltable->nlinks)) == NULL)
+        if ((ltable->lnks = (H5O_link_t *)H5MM_malloc(sizeof(H5O_link_t) * ltable->nlinks)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Set up user data for iteration */
-        udata.ltable = ltable;
+        udata.ltable   = ltable;
         udata.curr_lnk = 0;
 
         /* Iterate over the links in the group, building a table of the link messages */
-        if(H5G__dense_iterate(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_dense_build_table_cb, &udata) < 0)
+        if (H5G__dense_iterate(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL,
+                               H5G_dense_build_table_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
 
         /* Sort link table in correct iteration order */
-        if(H5G__link_sort_table(ltable, idx_type, order) < 0)
+        if (H5G__link_sort_table(ltable, idx_type, order) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTSORT, FAIL, "error sorting link messages")
     } /* end if */
     else
@@ -871,7 +854,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_build_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_iterate_fh_cb
  *
@@ -889,8 +871,8 @@ done:
 static herr_t
 H5G_dense_iterate_fh_cb(const void *obj, size_t obj_len, void *_udata)
 {
-    H5G_fh_ud_it_t *udata = (H5G_fh_ud_it_t *)_udata;       /* User data for fractal heap 'op' callback */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5G_fh_ud_it_t *udata     = (H5G_fh_ud_it_t *)_udata; /* User data for fractal heap 'op' callback */
+    herr_t          ret_value = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -901,14 +883,14 @@ H5G_dense_iterate_fh_cb(const void *obj, size_t obj_len, void *_udata)
      *  HDF5 routine, it could attempt to re-protect that direct block for the
      *  heap, causing the HDF5 routine called to fail - QAK)
      */
-    if(NULL == (udata->lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (udata->lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID,
+                                                           obj_len, (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "can't decode link")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_iterate_fh_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_iterate_bt2_cb
  *
@@ -925,26 +907,25 @@ done:
 static herr_t
 H5G_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
 {
-    const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record;
-    H5G_bt2_ud_it_t *bt2_udata = (H5G_bt2_ud_it_t *)_bt2_udata;         /* User data for callback */
-    herr_t ret_value = H5_ITER_CONT;         /* Return value */
+    const H5G_dense_bt2_name_rec_t *record    = (const H5G_dense_bt2_name_rec_t *)_record;
+    H5G_bt2_ud_it_t *               bt2_udata = (H5G_bt2_ud_it_t *)_bt2_udata; /* User data for callback */
+    herr_t                          ret_value = H5_ITER_CONT;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check for skipping links */
-    if(bt2_udata->skip > 0)
+    if (bt2_udata->skip > 0)
         --bt2_udata->skip;
     else {
-        H5G_fh_ud_it_t fh_udata;       /* User data for fractal heap 'op' callback */
+        H5G_fh_ud_it_t fh_udata; /* User data for fractal heap 'op' callback */
 
         /* Prepare user data for callback */
         /* down */
-        fh_udata.f = bt2_udata->f;
+        fh_udata.f       = bt2_udata->f;
         fh_udata.dxpl_id = bt2_udata->dxpl_id;
 
         /* Call fractal heap 'op' routine, to copy the link information */
-        if(H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, record->id,
-                H5G_dense_iterate_fh_cb, &fh_udata) < 0)
+        if (H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, record->id, H5G_dense_iterate_fh_cb, &fh_udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPERATE, H5_ITER_ERROR, "heap op callback failed")
 
         /* Make the callback */
@@ -959,14 +940,13 @@ H5G_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
     bt2_udata->count++;
 
     /* Check for callback failure and pass along return value */
-    if(ret_value < 0)
+    if (ret_value < 0)
         HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_iterate_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_iterate
  *
@@ -981,15 +961,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    H5G_lib_iterate_t op, void *op_data)
+H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type,
+                   H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op,
+                   void *op_data)
 {
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5G_link_table_t ltable = {0, NULL};      /* Table of links */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    haddr_t bt2_addr;                   /* Address of v2 B-tree to use for lookup */
-    herr_t ret_value;                   /* Return value */
+    H5HF_t *         fheap  = NULL;      /* Fractal heap handle */
+    H5G_link_table_t ltable = {0, NULL}; /* Table of links */
+    H5B2_t *         bt2    = NULL;      /* v2 B-tree handle for index */
+    haddr_t          bt2_addr;           /* Address of v2 B-tree to use for lookup */
+    herr_t           ret_value;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1001,7 +981,7 @@ H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     HDassert(op);
 
     /* Determine the address of the index to use */
-    if(idx_type == H5_INDEX_NAME) {
+    if (idx_type == H5_INDEX_NAME) {
         /* Since names are hashed, getting them in strictly increasing or
          * decreasing order requires building a table and sorting it. If
          * the order is native, use the B-tree for names.
@@ -1023,67 +1003,66 @@ H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
      * use the B-tree for names instead of building a table to speed up the
      * process.
      */
-    if(order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
+    if (order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
         HDassert(H5F_addr_defined(linfo->name_bt2_addr));
         bt2_addr = linfo->name_bt2_addr;
     } /* end if */
 
     /* Check on iteration order */
-    if(order == H5_ITER_NATIVE) {
-        H5G_bt2_ud_it_t udata;              /* User data for iterator callback */
+    if (order == H5_ITER_NATIVE) {
+        H5G_bt2_ud_it_t udata; /* User data for iterator callback */
 
         /* Sanity check */
         HDassert(H5F_addr_defined(bt2_addr));
 
         /* Open the fractal heap */
-        if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
+        if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for index")
 
         /* Construct the user data for v2 B-tree iterator callback */
-        udata.f = f;
+        udata.f       = f;
         udata.dxpl_id = dxpl_id;
-        udata.fheap = fheap;
-        udata.skip = skip;
-        udata.count = 0;
-        udata.op = op;
+        udata.fheap   = fheap;
+        udata.skip    = skip;
+        udata.count   = 0;
+        udata.op      = op;
         udata.op_data = op_data;
 
         /* Iterate over the records in the v2 B-tree's "native" order */
         /* (by hash of name) */
-        if((ret_value = H5B2_iterate(bt2, dxpl_id, H5G_dense_iterate_bt2_cb, &udata)) < 0)
+        if ((ret_value = H5B2_iterate(bt2, dxpl_id, H5G_dense_iterate_bt2_cb, &udata)) < 0)
             HERROR(H5E_SYM, H5E_BADITER, "link iteration failed");
 
         /* Update the last link examined, if requested */
-        if(last_lnk)
+        if (last_lnk)
             *last_lnk = udata.count;
     } /* end if */
     else {
         /* Build the table of links for this group */
-        if(H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+        if (H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
 
         /* Iterate over links in table */
-        if((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
+        if ((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
             HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
     } /* end else */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_get_name_by_idx_fh_cb
  *
@@ -1101,23 +1080,24 @@ done:
 static herr_t
 H5G_dense_get_name_by_idx_fh_cb(const void *obj, size_t obj_len, void *_udata)
 {
-    H5G_fh_ud_gnbi_t *udata = (H5G_fh_ud_gnbi_t *)_udata;       /* User data for fractal heap 'op' callback */
-    H5O_link_t *lnk;            /* Pointer to link created from heap object */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5G_fh_ud_gnbi_t *udata = (H5G_fh_ud_gnbi_t *)_udata; /* User data for fractal heap 'op' callback */
+    H5O_link_t *      lnk;                                /* Pointer to link created from heap object */
+    herr_t            ret_value = SUCCEED;                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Decode link information */
-    if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len,
+                                                    (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "can't decode link")
 
     /* Get the length of the name */
     udata->name_len = (ssize_t)HDstrlen(lnk->name);
 
     /* Copy the name into the user's buffer, if given */
-    if(udata->name) {
+    if (udata->name) {
         HDstrncpy(udata->name, lnk->name, MIN((size_t)(udata->name_len + 1), udata->name_size));
-        if((size_t)udata->name_len >= udata->name_size)
+        if ((size_t)udata->name_len >= udata->name_size)
             udata->name[udata->name_size - 1] = '\0';
     } /* end if */
 
@@ -1128,7 +1108,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_get_name_by_idx_fh_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_get_name_by_idx_bt2_cb
  *
@@ -1145,23 +1124,23 @@ done:
 static herr_t
 H5G_dense_get_name_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
 {
-    const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record;
-    H5G_bt2_ud_gnbi_t *bt2_udata = (H5G_bt2_ud_gnbi_t *)_bt2_udata;         /* User data for callback */
-    H5G_fh_ud_gnbi_t fh_udata;         /* User data for fractal heap 'op' callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5G_dense_bt2_name_rec_t *record    = (const H5G_dense_bt2_name_rec_t *)_record;
+    H5G_bt2_ud_gnbi_t *             bt2_udata = (H5G_bt2_ud_gnbi_t *)_bt2_udata; /* User data for callback */
+    H5G_fh_ud_gnbi_t                fh_udata;            /* User data for fractal heap 'op' callback */
+    herr_t                          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Prepare user data for callback */
     /* down */
-    fh_udata.f = bt2_udata->f;
-    fh_udata.dxpl_id = bt2_udata->dxpl_id;
-    fh_udata.name = bt2_udata->name;
+    fh_udata.f         = bt2_udata->f;
+    fh_udata.dxpl_id   = bt2_udata->dxpl_id;
+    fh_udata.name      = bt2_udata->name;
     fh_udata.name_size = bt2_udata->name_size;
 
     /* Call fractal heap 'op' routine, to perform user callback */
-    if(H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, record->id,
-            H5G_dense_get_name_by_idx_fh_cb, &fh_udata) < 0)
+    if (H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, record->id, H5G_dense_get_name_by_idx_fh_cb,
+                &fh_udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPERATE, FAIL, "link found callback failed")
 
     /* Set the name's full length to return */
@@ -1171,7 +1150,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_get_name_by_idx_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_get_name_by_idx
  *
@@ -1187,15 +1165,14 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5G__dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, char *name,
-    size_t size)
+H5G__dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, H5_index_t idx_type,
+                           H5_iter_order_t order, hsize_t n, char *name, size_t size)
 {
-    H5HF_t *fheap = NULL;       /* Fractal heap handle */
-    H5G_link_table_t ltable = {0, NULL};      /* Table of links */
-    H5B2_t *bt2 = NULL;         /* v2 B-tree handle for index */
-    haddr_t bt2_addr;           /* Address of v2 B-tree to use for lookup */
-    ssize_t ret_value;          /* Return value */
+    H5HF_t *         fheap  = NULL;      /* Fractal heap handle */
+    H5G_link_table_t ltable = {0, NULL}; /* Table of links */
+    H5B2_t *         bt2    = NULL;      /* v2 B-tree handle for index */
+    haddr_t          bt2_addr;           /* Address of v2 B-tree to use for lookup */
+    ssize_t          ret_value;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1206,7 +1183,7 @@ H5G__dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
     HDassert(linfo);
 
     /* Determine the address of the index to use */
-    if(idx_type == H5_INDEX_NAME) {
+    if (idx_type == H5_INDEX_NAME) {
         /* Since names are hashed, getting them in strictly increasing or
          * decreasing order requires building a table and sorting it.  If
          * the order is native, use the B-tree for names.
@@ -1228,70 +1205,69 @@ H5G__dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
      * use the B-tree for names instead of building a table to speed up the
      * process.
      */
-    if(order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
+    if (order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
         bt2_addr = linfo->name_bt2_addr;
         HDassert(H5F_addr_defined(bt2_addr));
     } /* end if */
 
     /* If there is an index defined for the field, use it */
-    if(H5F_addr_defined(bt2_addr)) {
-        H5G_bt2_ud_gnbi_t udata;       /* User data for v2 B-tree callback */
+    if (H5F_addr_defined(bt2_addr)) {
+        H5G_bt2_ud_gnbi_t udata; /* User data for v2 B-tree callback */
 
         /* Open the fractal heap */
-        if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
+        if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for index")
 
         /* Set up the user data for the v2 B-tree 'record remove' callback */
-        udata.f = f;
-        udata.dxpl_id = dxpl_id;
-        udata.fheap = fheap;
-        udata.name = name;
+        udata.f         = f;
+        udata.dxpl_id   = dxpl_id;
+        udata.fheap     = fheap;
+        udata.name      = name;
         udata.name_size = size;
 
         /* Retrieve the name according to the v2 B-tree's index order */
-        if(H5B2_index(bt2, dxpl_id, order, n, H5G_dense_get_name_by_idx_bt2_cb, &udata) < 0)
+        if (H5B2_index(bt2, dxpl_id, order, n, H5G_dense_get_name_by_idx_bt2_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTLIST, FAIL, "can't locate object in v2 B-tree")
 
         /* Set return value */
         ret_value = udata.name_len;
-    } /* end if */
-    else {      /* Otherwise, we need to build a table of the links and sort it */
+    }      /* end if */
+    else { /* Otherwise, we need to build a table of the links and sort it */
         /* Build the table of links for this group */
-        if(H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+        if (H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
 
         /* Check for going out of bounds */
-        if(n >= ltable.nlinks)
+        if (n >= ltable.nlinks)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
 
         /* Get the length of the name */
         ret_value = (ssize_t)HDstrlen(ltable.lnks[n].name);
 
         /* Copy the name into the user's buffer, if given */
-        if(name) {
+        if (name) {
             HDstrncpy(name, ltable.lnks[n].name, MIN((size_t)(ret_value + 1), size));
-            if((size_t)ret_value >= size)
-                name[size - 1]='\0';
+            if ((size_t)ret_value >= size)
+                name[size - 1] = '\0';
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_get_name_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_remove_fh_cb
  *
@@ -1308,23 +1284,24 @@ done:
 static herr_t
 H5G_dense_remove_fh_cb(const void *obj, size_t obj_len, void *_udata)
 {
-    H5G_fh_ud_rm_t *udata = (H5G_fh_ud_rm_t *)_udata;       /* User data for fractal heap 'op' callback */
-    H5O_link_t *lnk = NULL;             /* Pointer to link created from heap object */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_fh_ud_rm_t *udata     = (H5G_fh_ud_rm_t *)_udata; /* User data for fractal heap 'op' callback */
+    H5O_link_t *    lnk       = NULL;                     /* Pointer to link created from heap object */
+    H5B2_t *        bt2       = NULL;                     /* v2 B-tree handle for index */
+    herr_t          ret_value = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Decode link information */
-    if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len,
+                                                    (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "can't decode link")
 
     /* Check for removing the link from the creation order index */
-    if(H5F_addr_defined(udata->corder_bt2_addr)) {
-        H5G_bt2_ud_common_t bt2_udata;         /* Info for B-tree callbacks */
+    if (H5F_addr_defined(udata->corder_bt2_addr)) {
+        H5G_bt2_ud_common_t bt2_udata; /* Info for B-tree callbacks */
 
         /* Open the creation order index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(udata->f, udata->dxpl_id, udata->corder_bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(udata->f, udata->dxpl_id, udata->corder_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
 
         /* Set up the user data for the v2 B-tree 'record remove' callback */
@@ -1332,31 +1309,31 @@ H5G_dense_remove_fh_cb(const void *obj, size_t obj_len, void *_udata)
         bt2_udata.corder = lnk->corder;
 
         /* Remove the record from the name index v2 B-tree */
-        if(H5B2_remove(bt2, udata->dxpl_id, &bt2_udata, NULL, NULL) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL, "unable to remove link from creation order index v2 B-tree")
+        if (H5B2_remove(bt2, udata->dxpl_id, &bt2_udata, NULL, NULL) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL,
+                        "unable to remove link from creation order index v2 B-tree")
     } /* end if */
 
     /* Replace open objects' names, if requested */
-    if(udata->replace_names)
-        if(H5G__link_name_replace(udata->f, udata->dxpl_id, udata->grp_full_path_r, lnk) < 0)
+    if (udata->replace_names)
+        if (H5G__link_name_replace(udata->f, udata->dxpl_id, udata->grp_full_path_r, lnk) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTRENAME, FAIL, "unable to rename open objects")
 
     /* Perform the deletion action on the link, if requested */
     /* (call message "delete" callback directly: *ick* - QAK) */
-    if(H5O_link_delete(udata->f, udata->dxpl_id, NULL, lnk) < 0)
+    if (H5O_link_delete(udata->f, udata->dxpl_id, NULL, lnk) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete link")
 
 done:
     /* Release resources */
-    if(bt2 && H5B2_close(bt2, udata->dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, udata->dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
-    if(lnk)
+    if (lnk)
         H5O_msg_free(H5O_LINK_ID, lnk);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_remove_fh_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_remove_bt2_cb
  *
@@ -1373,35 +1350,34 @@ done:
 static herr_t
 H5G_dense_remove_bt2_cb(const void *_record, void *_bt2_udata)
 {
-    const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record;
-    H5G_bt2_ud_rm_t *bt2_udata = (H5G_bt2_ud_rm_t *)_bt2_udata;         /* User data for callback */
-    H5G_fh_ud_rm_t fh_udata;          /* User data for fractal heap 'op' callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5G_dense_bt2_name_rec_t *record    = (const H5G_dense_bt2_name_rec_t *)_record;
+    H5G_bt2_ud_rm_t *               bt2_udata = (H5G_bt2_ud_rm_t *)_bt2_udata; /* User data for callback */
+    H5G_fh_ud_rm_t                  fh_udata;            /* User data for fractal heap 'op' callback */
+    herr_t                          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Set up the user data for fractal heap 'op' callback */
-    fh_udata.f = bt2_udata->common.f;
-    fh_udata.dxpl_id = bt2_udata->common.dxpl_id;
+    fh_udata.f               = bt2_udata->common.f;
+    fh_udata.dxpl_id         = bt2_udata->common.dxpl_id;
     fh_udata.corder_bt2_addr = bt2_udata->corder_bt2_addr;
     fh_udata.grp_full_path_r = bt2_udata->grp_full_path_r;
-    fh_udata.replace_names = bt2_udata->replace_names;
+    fh_udata.replace_names   = bt2_udata->replace_names;
 
     /* Call fractal heap 'op' routine, to perform user callback */
-    if(H5HF_op(bt2_udata->common.fheap, bt2_udata->common.dxpl_id, record->id,
-            H5G_dense_remove_fh_cb, &fh_udata) < 0)
+    if (H5HF_op(bt2_udata->common.fheap, bt2_udata->common.dxpl_id, record->id, H5G_dense_remove_fh_cb,
+                &fh_udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPERATE, FAIL, "link removal callback failed")
 
     /* Remove record from fractal heap, if requested */
-    if(bt2_udata->rem_from_fheap)
-        if(H5HF_remove(bt2_udata->common.fheap, bt2_udata->common.dxpl_id, record->id) < 0)
+    if (bt2_udata->rem_from_fheap)
+        if (H5HF_remove(bt2_udata->common.fheap, bt2_udata->common.dxpl_id, record->id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL, "unable to remove link from fractal heap")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_remove_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_remove
  *
@@ -1416,13 +1392,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5RS_str_t *grp_full_path_r, const char *name)
+H5G__dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r,
+                  const char *name)
 {
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5G_bt2_ud_rm_t udata;              /* User data for v2 B-tree record removal */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_t *        fheap = NULL;        /* Fractal heap handle */
+    H5G_bt2_ud_rm_t udata;               /* User data for v2 B-tree record removal */
+    H5B2_t *        bt2       = NULL;    /* v2 B-tree handle for index */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1434,41 +1410,40 @@ H5G__dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     HDassert(name && *name);
 
     /* Open the fractal heap */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2 = H5B2_open(f, dxpl_id, linfo->name_bt2_addr, NULL)))
+    if (NULL == (bt2 = H5B2_open(f, dxpl_id, linfo->name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Set up the user data for the v2 B-tree 'record remove' callback */
-    udata.common.f = f;
-    udata.common.dxpl_id = dxpl_id;
-    udata.common.fheap = fheap;
-    udata.common.name = name;
-    udata.common.name_hash = H5_checksum_lookup3(name, HDstrlen(name), 0);
-    udata.common.found_op = NULL;
+    udata.common.f             = f;
+    udata.common.dxpl_id       = dxpl_id;
+    udata.common.fheap         = fheap;
+    udata.common.name          = name;
+    udata.common.name_hash     = H5_checksum_lookup3(name, HDstrlen(name), 0);
+    udata.common.found_op      = NULL;
     udata.common.found_op_data = NULL;
-    udata.rem_from_fheap = TRUE;
-    udata.corder_bt2_addr = linfo->corder_bt2_addr;
-    udata.grp_full_path_r = grp_full_path_r;
-    udata.replace_names = TRUE;
+    udata.rem_from_fheap       = TRUE;
+    udata.corder_bt2_addr      = linfo->corder_bt2_addr;
+    udata.grp_full_path_r      = grp_full_path_r;
+    udata.replace_names        = TRUE;
 
     /* Remove the record from the name index v2 B-tree */
-    if(H5B2_remove(bt2, dxpl_id, &udata, H5G_dense_remove_bt2_cb, &udata) < 0)
+    if (H5B2_remove(bt2, dxpl_id, &udata, H5G_dense_remove_bt2_cb, &udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL, "unable to remove link from name index v2 B-tree")
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_remove_by_idx_fh_cb
  *
@@ -1485,13 +1460,14 @@ done:
 static herr_t
 H5G_dense_remove_by_idx_fh_cb(const void *obj, size_t obj_len, void *_udata)
 {
-    H5G_fh_ud_rmbi_t *udata = (H5G_fh_ud_rmbi_t *)_udata;       /* User data for fractal heap 'op' callback */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5G_fh_ud_rmbi_t *udata     = (H5G_fh_ud_rmbi_t *)_udata; /* User data for fractal heap 'op' callback */
+    herr_t            ret_value = SUCCEED;                    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Decode link information */
-    if(NULL == (udata->lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (udata->lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID,
+                                                           obj_len, (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, H5_ITER_ERROR, "can't decode link")
 
     /* Can't operate on link here because the fractal heap block is locked */
@@ -1500,7 +1476,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_remove_by_idx_fh_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_dense_remove_by_idx_bt2_cb
  *
@@ -1517,16 +1492,16 @@ done:
 static herr_t
 H5G_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
 {
-    H5G_bt2_ud_rmbi_t *bt2_udata = (H5G_bt2_ud_rmbi_t *)_bt2_udata;         /* User data for callback */
-    H5G_fh_ud_rmbi_t fh_udata;          /* User data for fractal heap 'op' callback */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    const uint8_t *heap_id;             /* Heap ID for link */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_bt2_ud_rmbi_t *bt2_udata = (H5G_bt2_ud_rmbi_t *)_bt2_udata; /* User data for callback */
+    H5G_fh_ud_rmbi_t   fh_udata;            /* User data for fractal heap 'op' callback */
+    H5B2_t *           bt2 = NULL;          /* v2 B-tree handle for index */
+    const uint8_t *    heap_id;             /* Heap ID for link */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Determine the index being used */
-    if(bt2_udata->idx_type == H5_INDEX_NAME) {
+    if (bt2_udata->idx_type == H5_INDEX_NAME) {
         const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record;
 
         /* Set the heap ID to operate on */
@@ -1542,22 +1517,21 @@ H5G_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
     } /* end else */
 
     /* Set up the user data for fractal heap 'op' callback */
-    fh_udata.f = bt2_udata->f;
+    fh_udata.f       = bt2_udata->f;
     fh_udata.dxpl_id = bt2_udata->dxpl_id;
-    fh_udata.lnk = NULL;
+    fh_udata.lnk     = NULL;
 
     /* Call fractal heap 'op' routine, to perform user callback */
-    if(H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, heap_id,
-            H5G_dense_remove_by_idx_fh_cb, &fh_udata) < 0)
+    if (H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, heap_id, H5G_dense_remove_by_idx_fh_cb, &fh_udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPERATE, FAIL, "link removal callback failed")
     HDassert(fh_udata.lnk);
 
     /* Check for removing the link from the "other" index (creation order, when name used and vice versa) */
-    if(H5F_addr_defined(bt2_udata->other_bt2_addr)) {
-        H5G_bt2_ud_common_t other_bt2_udata;    /* Info for B-tree callbacks */
+    if (H5F_addr_defined(bt2_udata->other_bt2_addr)) {
+        H5G_bt2_ud_common_t other_bt2_udata; /* Info for B-tree callbacks */
 
         /* Determine the index being used */
-        if(bt2_udata->idx_type == H5_INDEX_NAME) {
+        if (bt2_udata->idx_type == H5_INDEX_NAME) {
             /* Set up the user data for the v2 B-tree 'record remove' callback */
             other_bt2_udata.corder = fh_udata.lnk->corder;
         } /* end if */
@@ -1565,51 +1539,53 @@ H5G_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
             HDassert(bt2_udata->idx_type == H5_INDEX_CRT_ORDER);
 
             /* Set up the user data for the v2 B-tree 'record remove' callback */
-            other_bt2_udata.f = bt2_udata->f;
+            other_bt2_udata.f       = bt2_udata->f;
             other_bt2_udata.dxpl_id = bt2_udata->dxpl_id;
-            other_bt2_udata.fheap = bt2_udata->fheap;
-            other_bt2_udata.name = fh_udata.lnk->name;
-            other_bt2_udata.name_hash = H5_checksum_lookup3(fh_udata.lnk->name, HDstrlen(fh_udata.lnk->name), 0);
-            other_bt2_udata.found_op = NULL;
+            other_bt2_udata.fheap   = bt2_udata->fheap;
+            other_bt2_udata.name    = fh_udata.lnk->name;
+            other_bt2_udata.name_hash =
+                H5_checksum_lookup3(fh_udata.lnk->name, HDstrlen(fh_udata.lnk->name), 0);
+            other_bt2_udata.found_op      = NULL;
             other_bt2_udata.found_op_data = NULL;
         } /* end else */
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(bt2_udata->f, bt2_udata->dxpl_id, bt2_udata->other_bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(bt2_udata->f, bt2_udata->dxpl_id, bt2_udata->other_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for 'other' index")
 
         /* Set the common information for the v2 B-tree remove operation */
 
         /* Remove the record from the name index v2 B-tree */
-        if(H5B2_remove(bt2, bt2_udata->dxpl_id, &other_bt2_udata, NULL, NULL) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, H5_ITER_ERROR, "unable to remove link from 'other' index v2 B-tree")
+        if (H5B2_remove(bt2, bt2_udata->dxpl_id, &other_bt2_udata, NULL, NULL) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, H5_ITER_ERROR,
+                        "unable to remove link from 'other' index v2 B-tree")
     } /* end if */
 
     /* Replace open objects' names */
-    if(H5G__link_name_replace(bt2_udata->f, bt2_udata->dxpl_id, bt2_udata->grp_full_path_r, fh_udata.lnk) < 0)
+    if (H5G__link_name_replace(bt2_udata->f, bt2_udata->dxpl_id, bt2_udata->grp_full_path_r, fh_udata.lnk) <
+        0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTRENAME, FAIL, "unable to rename open objects")
 
     /* Perform the deletion action on the link */
     /* (call link message "delete" callback directly: *ick* - QAK) */
-    if(H5O_link_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, fh_udata.lnk) < 0)
+    if (H5O_link_delete(bt2_udata->f, bt2_udata->dxpl_id, NULL, fh_udata.lnk) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete link")
 
     /* Release the space allocated for the link */
     H5O_msg_free(H5O_LINK_ID, fh_udata.lnk);
 
     /* Remove record from fractal heap */
-    if(H5HF_remove(bt2_udata->fheap, bt2_udata->dxpl_id, heap_id) < 0)
+    if (H5HF_remove(bt2_udata->fheap, bt2_udata->dxpl_id, heap_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL, "unable to remove link from fractal heap")
 
 done:
     /* Release resources */
-    if(bt2 && H5B2_close(bt2, bt2_udata->dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, bt2_udata->dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for 'other' index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_dense_remove_by_idx_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_remove_by_idx
  *
@@ -1625,15 +1601,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5RS_str_t *grp_full_path_r, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t n)
+H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r,
+                         H5_index_t idx_type, H5_iter_order_t order, hsize_t n)
 {
-    H5HF_t *fheap = NULL;                     /* Fractal heap handle */
-    H5G_link_table_t ltable = {0, NULL};      /* Table of links */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    haddr_t bt2_addr;                   /* Address of v2 B-tree to use for lookup */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_t *         fheap  = NULL;       /* Fractal heap handle */
+    H5G_link_table_t ltable = {0, NULL};  /* Table of links */
+    H5B2_t *         bt2    = NULL;       /* v2 B-tree handle for index */
+    haddr_t          bt2_addr;            /* Address of v2 B-tree to use for lookup */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1644,7 +1619,7 @@ H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     HDassert(linfo);
 
     /* Determine the address of the index to use */
-    if(idx_type == H5_INDEX_NAME) {
+    if (idx_type == H5_INDEX_NAME) {
         /* Since names are hashed, getting them in strictly increasing or
          * decreasing order requires building a table and sorting it.  If
          * the order is native, use the B-tree for names.
@@ -1666,62 +1641,61 @@ H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
      * use the B-tree for names instead of building a table to speed up the
      * process.
      */
-    if(order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
+    if (order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
         bt2_addr = linfo->name_bt2_addr;
         HDassert(H5F_addr_defined(bt2_addr));
     } /* end if */
 
     /* If there is an index defined for the field, use it */
-    if(H5F_addr_defined(bt2_addr)) {
-        H5G_bt2_ud_rmbi_t udata;            /* User data for v2 B-tree record removal */
+    if (H5F_addr_defined(bt2_addr)) {
+        H5G_bt2_ud_rmbi_t udata; /* User data for v2 B-tree record removal */
 
         /* Open the fractal heap */
-        if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
+        if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, bt2_addr, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for index")
 
         /* Set up the user data for the v2 B-tree 'remove by index' callback */
-        udata.f = f;
-        udata.dxpl_id = dxpl_id;
-        udata.fheap = fheap;
-        udata.idx_type = idx_type;
-        udata.other_bt2_addr = idx_type == H5_INDEX_NAME ? linfo->corder_bt2_addr : linfo->name_bt2_addr;
+        udata.f               = f;
+        udata.dxpl_id         = dxpl_id;
+        udata.fheap           = fheap;
+        udata.idx_type        = idx_type;
+        udata.other_bt2_addr  = idx_type == H5_INDEX_NAME ? linfo->corder_bt2_addr : linfo->name_bt2_addr;
         udata.grp_full_path_r = grp_full_path_r;
 
         /* Remove the record from the name index v2 B-tree */
-        if(H5B2_remove_by_idx(bt2, dxpl_id, order, n, H5G_dense_remove_by_idx_bt2_cb, &udata) < 0)
+        if (H5B2_remove_by_idx(bt2, dxpl_id, order, n, H5G_dense_remove_by_idx_bt2_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL, "unable to remove link from indexed v2 B-tree")
-    } /* end if */
-    else {      /* Otherwise, we need to build a table of the links and sort it */
+    }      /* end if */
+    else { /* Otherwise, we need to build a table of the links and sort it */
         /* Build the table of links for this group */
-        if(H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+        if (H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
 
         /* Check for going out of bounds */
-        if(n >= ltable.nlinks)
+        if (n >= ltable.nlinks)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
 
         /* Remove the appropriate link from the dense storage */
-        if(H5G__dense_remove(f, dxpl_id, linfo, grp_full_path_r, ltable.lnks[n].name) < 0)
+        if (H5G__dense_remove(f, dxpl_id, linfo, grp_full_path_r, ltable.lnks[n].name) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL, "unable to remove link from dense storage")
     } /* end else */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_remove_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_delete
  *
@@ -1738,7 +1712,7 @@ done:
 herr_t
 H5G__dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1751,48 +1725,48 @@ H5G__dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link)
     /* Check if we are to adjust the ref. count for all the links */
     /* (we adjust the ref. count when deleting a group and we _don't_ adjust
      *  the ref. count when transitioning back to compact storage)
-    */
-    if(adj_link) {
-        H5HF_t *fheap = NULL;               /* Fractal heap handle */
-        H5G_bt2_ud_rm_t udata;          /* User data for v2 B-tree record removal */
+     */
+    if (adj_link) {
+        H5HF_t *        fheap = NULL; /* Fractal heap handle */
+        H5G_bt2_ud_rm_t udata;        /* User data for v2 B-tree record removal */
 
         /* Open the fractal heap */
-        if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
+        if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo->fheap_addr)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
         /* Set up the user data for the v2 B-tree 'record remove' callback */
-        udata.common.f = f;
-        udata.common.dxpl_id = dxpl_id;
-        udata.common.fheap = fheap;
-        udata.common.name = NULL;
-        udata.common.name_hash = 0;
-        udata.common.found_op = NULL;
+        udata.common.f             = f;
+        udata.common.dxpl_id       = dxpl_id;
+        udata.common.fheap         = fheap;
+        udata.common.name          = NULL;
+        udata.common.name_hash     = 0;
+        udata.common.found_op      = NULL;
         udata.common.found_op_data = NULL;
-        udata.rem_from_fheap = FALSE;           /* handled in "bulk" below by deleting entire heap */
-        udata.corder_bt2_addr = linfo->corder_bt2_addr;
-        udata.grp_full_path_r = NULL;
-        udata.replace_names = FALSE;
+        udata.rem_from_fheap       = FALSE; /* handled in "bulk" below by deleting entire heap */
+        udata.corder_bt2_addr      = linfo->corder_bt2_addr;
+        udata.grp_full_path_r      = NULL;
+        udata.replace_names        = FALSE;
 
         /* Delete the name index, adjusting the ref. count on links removed */
-        if(H5B2_delete(f, dxpl_id, linfo->name_bt2_addr, NULL, H5G_dense_remove_bt2_cb, &udata) < 0)
+        if (H5B2_delete(f, dxpl_id, linfo->name_bt2_addr, NULL, H5G_dense_remove_bt2_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete v2 B-tree for name index")
 
         /* Close the fractal heap */
-        if(H5HF_close(fheap, dxpl_id) < 0)
+        if (H5HF_close(fheap, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
     } /* end if */
     else {
         /* Delete the name index, without adjusting the ref. count on the links  */
-        if(H5B2_delete(f, dxpl_id, linfo->name_bt2_addr, NULL, NULL, NULL) < 0)
+        if (H5B2_delete(f, dxpl_id, linfo->name_bt2_addr, NULL, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete v2 B-tree for name index")
     } /* end else */
     linfo->name_bt2_addr = HADDR_UNDEF;
 
     /* Check if we should delete the creation order index v2 B-tree */
-    if(linfo->index_corder) {
+    if (linfo->index_corder) {
         /* Delete the creation order index, without adjusting the ref. count on the links  */
         HDassert(H5F_addr_defined(linfo->corder_bt2_addr));
-        if(H5B2_delete(f, dxpl_id, linfo->corder_bt2_addr, NULL, NULL, NULL) < 0)
+        if (H5B2_delete(f, dxpl_id, linfo->corder_bt2_addr, NULL, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete v2 B-tree for creation order index")
         linfo->corder_bt2_addr = HADDR_UNDEF;
     } /* end if */
@@ -1800,7 +1774,7 @@ H5G__dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link)
         HDassert(!H5F_addr_defined(linfo->corder_bt2_addr));
 
     /* Delete the fractal heap */
-    if(H5HF_delete(f, dxpl_id, linfo->fheap_addr) < 0)
+    if (H5HF_delete(f, dxpl_id, linfo->fheap_addr) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete fractal heap")
     linfo->fheap_addr = HADDR_UNDEF;
 
@@ -1809,7 +1783,7 @@ done:
 } /* end H5G__dense_delete() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5G__dense_get_type_by_idx
  *
@@ -1831,11 +1805,10 @@ done:
  *-------------------------------------------------------------------------
  */
 H5G_obj_t
-H5G__dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
-    hsize_t idx)
+H5G__dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hsize_t idx)
 {
-    H5G_link_table_t ltable = {0, NULL};         /* Table of links */
-    H5G_obj_t ret_value;        /* Return value */
+    H5G_link_table_t ltable = {0, NULL}; /* Table of links */
+    H5G_obj_t        ret_value;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1846,43 +1819,43 @@ H5G__dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
     HDassert(linfo);
 
     /* Build the table of links for this group */
-    if(H5G__dense_build_table(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_INC, &ltable) < 0)
+    if (H5G__dense_build_table(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_INC, &ltable) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5G_UNKNOWN, "error building table of links")
 
     /* Check for going out of bounds */
-    if(idx >= ltable.nlinks)
+    if (idx >= ltable.nlinks)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "index out of bound")
 
     /* Determine type of object */
-    if(ltable.lnks[idx].type == H5L_TYPE_SOFT)
+    if (ltable.lnks[idx].type == H5L_TYPE_SOFT)
         ret_value = H5G_LINK;
-    else if(ltable.lnks[idx].type >= H5L_TYPE_UD_MIN)
+    else if (ltable.lnks[idx].type >= H5L_TYPE_UD_MIN)
         ret_value = H5G_UDLINK;
-    else if(ltable.lnks[idx].type == H5L_TYPE_HARD) {
-        H5O_loc_t tmp_oloc;             /* Temporary object location */
-        H5O_type_t obj_type;            /* Type of object at location */
+    else if (ltable.lnks[idx].type == H5L_TYPE_HARD) {
+        H5O_loc_t  tmp_oloc; /* Temporary object location */
+        H5O_type_t obj_type; /* Type of object at location */
 
         /* Build temporary object location */
         tmp_oloc.file = f;
         tmp_oloc.addr = ltable.lnks[idx].u.hard.addr;
 
         /* Get the type of the object */
-        if(H5O_obj_type(&tmp_oloc, &obj_type, dxpl_id) < 0)
+        if (H5O_obj_type(&tmp_oloc, &obj_type, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5G_UNKNOWN, "can't get object type")
 
         /* Map to group object type */
-        if(H5G_UNKNOWN == (ret_value = H5G_map_obj_type(obj_type)))
+        if (H5G_UNKNOWN == (ret_value = H5G_map_obj_type(obj_type)))
             HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "can't determine object type")
-    } else {
+    }
+    else {
         HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "unknown link type")
     } /* end else */
 
 done:
     /* Release link table */
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, H5G_UNKNOWN, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__dense_get_type_by_idx() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 9dc1703..e770bc1 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -29,29 +29,26 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg   */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5G__init_deprec_interface
-
+#define H5_INTERFACE_INIT_FUNC H5G__init_deprec_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Lprivate.h"         /* Links                                */
-#include "H5Pprivate.h"         /* Property lists                       */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Lprivate.h"  /* Links                                */
+#include "H5Pprivate.h"  /* Property lists                       */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -59,52 +56,41 @@
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 /* User data for path traversal routine for getting object info */
 typedef struct {
-    H5G_stat_t  *statbuf;			/* Stat buffer about object */
-    hbool_t follow_link;                        /* Whether we are following a link or not */
-    H5F_t *loc_file;                            /* Pointer to the file the location is in */
-    hid_t dxpl_id;                              /* Dataset transfer property list */
+    H5G_stat_t *statbuf;     /* Stat buffer about object */
+    hbool_t     follow_link; /* Whether we are following a link or not */
+    H5F_t *     loc_file;    /* Pointer to the file the location is in */
+    hid_t       dxpl_id;     /* Dataset transfer property list */
 } H5G_trav_goi_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static herr_t H5G_link_hard(hid_t cur_loc_id, const char *cur_name,
-    hid_t new_loc_id, const char *new_name);
-static herr_t H5G_move(hid_t src_loc_id, const char *src_name,
-    hid_t dst_loc_id, const char *dst_name);
-static herr_t H5G_get_objinfo_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5G_get_objinfo(const H5G_loc_t *loc, const char *name,
-    hbool_t follow_link, H5G_stat_t *statbuf/*out*/, hid_t dxpl_id);
-static H5G_obj_t H5G_obj_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx,
-    hid_t dxpl_id);
+static herr_t H5G_link_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name);
+static herr_t H5G_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name);
+static herr_t H5G_get_objinfo_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                                 H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5G_get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link,
+                              H5G_stat_t *statbuf /*out*/, hid_t dxpl_id);
+static H5G_obj_t H5G_obj_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5G__init_deprec_interface -- Initialize interface-specific information
@@ -125,7 +111,6 @@ H5G__init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5G__init())
 } /* H5G__init_deprec_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5G__term_deprec_interface -- Terminate interface
@@ -150,7 +135,7 @@ H5G__term_deprec_interface(void)
 } /* H5G__term_deprec_interface() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5G_map_obj_type
  *
@@ -166,13 +151,13 @@ H5G__term_deprec_interface(void)
 H5G_obj_t
 H5G_map_obj_type(H5O_type_t obj_type)
 {
-    H5G_obj_t ret_value;        /* Return value */
+    H5G_obj_t ret_value; /* Return value */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Map object type to older "group" object type */
-    switch(obj_type) {
+    switch (obj_type) {
         case H5O_TYPE_GROUP:
             ret_value = H5G_GROUP;
             break;
@@ -194,7 +179,6 @@ H5G_map_obj_type(H5O_type_t obj_type)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_map_obj_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gcreate1
  *
@@ -223,69 +207,68 @@ H5G_map_obj_type(H5O_type_t obj_type)
 hid_t
 H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
 {
-    H5G_loc_t	    loc;                /* Location to create group */
-    H5G_t	   *grp = NULL;         /* New group created */
-    hid_t           tmp_gcpl = (-1);    /* Temporary group creation property list */
-    hid_t	    ret_value;          /* Return value */
+    H5G_loc_t loc;             /* Location to create group */
+    H5G_t *   grp      = NULL; /* New group created */
+    hid_t     tmp_gcpl = (-1); /* Temporary group creation property list */
+    hid_t     ret_value;       /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "i*sz", loc_id, name, size_hint);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name given")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name given")
 
     /* Check if we need to create a non-standard GCPL */
-    if(size_hint > 0) {
-        H5P_genplist_t  *gc_plist;  /* Property list created */
-        H5O_ginfo_t     ginfo;          /* Group info property */
+    if (size_hint > 0) {
+        H5P_genplist_t *gc_plist; /* Property list created */
+        H5O_ginfo_t     ginfo;    /* Group info property */
 
         /* Get the default property list */
-        if(NULL == (gc_plist = (H5P_genplist_t *)H5I_object(H5P_GROUP_CREATE_DEFAULT)))
+        if (NULL == (gc_plist = (H5P_genplist_t *)H5I_object(H5P_GROUP_CREATE_DEFAULT)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
         /* Make a copy of the default property list */
-        if((tmp_gcpl = H5P_copy_plist(gc_plist, FALSE)) < 0)
+        if ((tmp_gcpl = H5P_copy_plist(gc_plist, FALSE)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to copy the creation property list")
 
         /* Get pointer to the copied property list */
-        if(NULL == (gc_plist = (H5P_genplist_t *)H5I_object(tmp_gcpl)))
+        if (NULL == (gc_plist = (H5P_genplist_t *)H5I_object(tmp_gcpl)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
         /* Get the group info property */
-        if(H5P_get(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+        if (H5P_get(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
 
         /* Set the non-default local heap size hint */
         H5_CHECKED_ASSIGN(ginfo.lheap_size_hint, uint32_t, size_hint, size_t);
-        if(H5P_set(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+        if (H5P_set(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set group info")
     } /* end if */
     else
         tmp_gcpl = H5P_GROUP_CREATE_DEFAULT;
 
     /* Create the new group & get its ID */
-    if(NULL == (grp = H5G__create_named(&loc, name, H5P_LINK_CREATE_DEFAULT,
-            tmp_gcpl, H5P_GROUP_ACCESS_DEFAULT, H5AC_dxpl_id)))
+    if (NULL == (grp = H5G__create_named(&loc, name, H5P_LINK_CREATE_DEFAULT, tmp_gcpl,
+                                         H5P_GROUP_ACCESS_DEFAULT, H5AC_dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
-    if((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
+    if ((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
 done:
-    if(tmp_gcpl > 0 && tmp_gcpl != H5P_GROUP_CREATE_DEFAULT)
-        if(H5I_dec_ref(tmp_gcpl) < 0)
+    if (tmp_gcpl > 0 && tmp_gcpl != H5P_GROUP_CREATE_DEFAULT)
+        if (H5I_dec_ref(tmp_gcpl) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release property list")
 
-    if(ret_value < 0)
-        if(grp && H5G_close(grp) < 0)
+    if (ret_value < 0)
+        if (grp && H5G_close(grp) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gcreate1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gopen1
  *
@@ -306,37 +289,36 @@ done:
 hid_t
 H5Gopen1(hid_t loc_id, const char *name)
 {
-    H5G_t       *grp = NULL;            /* Group opened */
-    H5G_loc_t	loc;                    /* Location of parent for group */
-    hid_t       ret_value;              /* Return value */
+    H5G_t *   grp = NULL; /* Group opened */
+    H5G_loc_t loc;        /* Location of parent for group */
+    hid_t     ret_value;  /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "i*s", loc_id, name);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Open the group */
-    if((grp = H5G__open_name(&loc, name, H5P_DEFAULT, H5AC_ind_dxpl_id)) == NULL)
+    if ((grp = H5G__open_name(&loc, name, H5P_DEFAULT, H5AC_ind_dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
 
     /* Register an atom for the group */
-    if((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
 done:
-    if(ret_value < 0) {
-        if(grp && H5G_close(grp) < 0)
+    if (ret_value < 0) {
+        if (grp && H5G_close(grp) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gopen1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Glink
  *
@@ -348,30 +330,30 @@ done:
 herr_t
 H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new_name)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iLl*s*s", cur_loc_id, type, cur_name, new_name);
 
     /* Check arguments */
-    if(!cur_name || !*cur_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
-    if(!new_name || !*new_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified")
+    if (!cur_name || !*cur_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
+    if (!new_name || !*new_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified")
 
-    if(type == H5L_TYPE_HARD) {
-        if((ret_value = H5G_link_hard(cur_loc_id, cur_name, H5L_SAME_LOC, new_name)) < 0)
+    if (type == H5L_TYPE_HARD) {
+        if ((ret_value = H5G_link_hard(cur_loc_id, cur_name, H5L_SAME_LOC, new_name)) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't create link")
     } /* end if */
-    else if(type == H5L_TYPE_SOFT) {
-        H5G_loc_t	cur_loc;                /* Group location for new link */
+    else if (type == H5L_TYPE_SOFT) {
+        H5G_loc_t cur_loc; /* Group location for new link */
 
         /* Finish checking arguments */
-        if(H5G_loc(cur_loc_id, &cur_loc) < 0)
+        if (H5G_loc(cur_loc_id, &cur_loc) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Create the link */
-        if(H5L_create_soft(cur_name, &cur_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+        if (H5L_create_soft(cur_name, &cur_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end else if */
     else
@@ -381,7 +363,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Glink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Glink2
  *
@@ -391,38 +372,37 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
-    hid_t new_loc_id, const char *new_name)
+H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, hid_t new_loc_id, const char *new_name)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "i*sLli*s", cur_loc_id, cur_name, type, new_loc_id, new_name);
 
     /* Check arguments */
-    if(!cur_name || !*cur_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
-    if(!new_name || !*new_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified")
+    if (!cur_name || !*cur_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
+    if (!new_name || !*new_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified")
 
-    if(type == H5L_TYPE_HARD) {
-        if((ret_value = H5G_link_hard(cur_loc_id, cur_name, new_loc_id, new_name)) < 0)
+    if (type == H5L_TYPE_HARD) {
+        if ((ret_value = H5G_link_hard(cur_loc_id, cur_name, new_loc_id, new_name)) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't create link")
     } /* end if */
-    else if(type == H5L_TYPE_SOFT) {
-        H5G_loc_t	new_loc;                /* Group location for new link */
+    else if (type == H5L_TYPE_SOFT) {
+        H5G_loc_t new_loc; /* Group location for new link */
 
         /* Soft links only need one location, the new_loc_id, but it's possible that
          * new_loc_id is H5L_SAME_LOC */
-        if(new_loc_id == H5L_SAME_LOC)
+        if (new_loc_id == H5L_SAME_LOC)
             new_loc_id = cur_loc_id;
 
         /* Finish checking arguments */
-        if(H5G_loc(new_loc_id, &new_loc) < 0)
+        if (H5G_loc(new_loc_id, &new_loc) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Create the link */
-        if(H5L_create_soft(cur_name, &new_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+        if (H5L_create_soft(cur_name, &new_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end else if */
     else
@@ -432,7 +412,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Glink2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_hard
  *
@@ -450,43 +429,40 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_link_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id,
-    const char *new_name)
+H5G_link_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name)
 {
-    H5G_loc_t	cur_loc, *cur_loc_p;    /* Information about current link's group */
-    H5G_loc_t	new_loc, *new_loc_p;    /* Information about new link's group */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5G_loc_t cur_loc, *cur_loc_p; /* Information about current link's group */
+    H5G_loc_t new_loc, *new_loc_p; /* Information about new link's group */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Finish checking arguments */
-    if(cur_loc_id == H5L_SAME_LOC && new_loc_id == H5L_SAME_LOC)
+    if (cur_loc_id == H5L_SAME_LOC && new_loc_id == H5L_SAME_LOC)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not be both H5L_SAME_LOC")
-    if(cur_loc_id != H5L_SAME_LOC && H5G_loc(cur_loc_id, &cur_loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(new_loc_id != H5L_SAME_LOC && H5G_loc(new_loc_id, &new_loc) < 0)
+    if (cur_loc_id != H5L_SAME_LOC && H5G_loc(cur_loc_id, &cur_loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (new_loc_id != H5L_SAME_LOC && H5G_loc(new_loc_id, &new_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Set up current & new location pointers */
     cur_loc_p = &cur_loc;
     new_loc_p = &new_loc;
-    if(cur_loc_id == H5L_SAME_LOC)
+    if (cur_loc_id == H5L_SAME_LOC)
         cur_loc_p = new_loc_p;
-    else if(new_loc_id == H5L_SAME_LOC)
-   	new_loc_p = cur_loc_p;
-    else if(cur_loc_p->oloc->file != new_loc_p->oloc->file)
+    else if (new_loc_id == H5L_SAME_LOC)
+        new_loc_p = cur_loc_p;
+    else if (cur_loc_p->oloc->file != new_loc_p->oloc->file)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should be in the same file.")
 
     /* Create the link */
-    if(H5L_create_hard(cur_loc_p, cur_name, new_loc_p, new_name,
-                H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
+    if (H5L_create_hard(cur_loc_p, cur_name, new_loc_p, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_link_hard() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gmove
  *
@@ -497,20 +473,19 @@ done:
 herr_t
 H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*s*s", src_loc_id, src_name, dst_name);
 
     /* Call common routine to move the link */
-    if(H5G_move(src_loc_id, src_name, H5L_SAME_LOC, dst_name) < 0)
-      HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't move link")
+    if (H5G_move(src_loc_id, src_name, H5L_SAME_LOC, dst_name) < 0)
+        HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't move link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gmove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gmove2
  *
@@ -519,23 +494,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
-    const char *dst_name)
+H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*si*s", src_loc_id, src_name, dst_loc_id, dst_name);
 
     /* Call common routine to move the link */
-    if(H5G_move(src_loc_id, src_name, dst_loc_id, dst_name) < 0)
-      HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't move link")
+    if (H5G_move(src_loc_id, src_name, dst_loc_id, dst_name) < 0)
+        HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't move link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gmove2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_move
  *
@@ -554,45 +527,42 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
-    const char *dst_name)
+H5G_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name)
 {
-    H5G_loc_t	src_loc, *src_loc_p;    /* Group info for source location */
-    H5G_loc_t	dst_loc, *dst_loc_p;    /* Group info for destination location */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t src_loc, *src_loc_p; /* Group info for source location */
+    H5G_loc_t dst_loc, *dst_loc_p; /* Group info for destination location */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check arguments */
-    if(src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
+    if (src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not both be H5L_SAME_LOC")
-    if(src_loc_id != H5L_SAME_LOC && H5G_loc(src_loc_id, &src_loc) < 0)
+    if (src_loc_id != H5L_SAME_LOC && H5G_loc(src_loc_id, &src_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(dst_loc_id != H5L_SAME_LOC && H5G_loc(dst_loc_id, &dst_loc) < 0)
+    if (dst_loc_id != H5L_SAME_LOC && H5G_loc(dst_loc_id, &dst_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!src_name || !*src_name)
+    if (!src_name || !*src_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
-    if(!dst_name || !*dst_name)
+    if (!dst_name || !*dst_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination name specified")
 
     /* Set up src & dst location pointers */
     src_loc_p = &src_loc;
     dst_loc_p = &dst_loc;
-    if(src_loc_id == H5L_SAME_LOC)
+    if (src_loc_id == H5L_SAME_LOC)
         src_loc_p = dst_loc_p;
-    else if(dst_loc_id == H5L_SAME_LOC)
+    else if (dst_loc_id == H5L_SAME_LOC)
         dst_loc_p = src_loc_p;
 
     /* Move the link */
-    if(H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, FALSE, H5P_DEFAULT,
-            H5P_DEFAULT, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
+    if (H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, FALSE, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_move() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gunlink
  *
@@ -603,27 +573,26 @@ done:
 herr_t
 H5Gunlink(hid_t loc_id, const char *name)
 {
-    H5G_loc_t	loc;                    /* Group's location */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_t loc;                 /* Group's location */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", loc_id, name);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Call H5L routine... */
-    if(H5L_delete(&loc, name, H5P_DEFAULT, H5AC_dxpl_id) < 0)
-      HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "couldn't delete link")
+    if (H5L_delete(&loc, name, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "couldn't delete link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gunlink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_linkval
  *
@@ -633,29 +602,28 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
+H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf /*out*/)
 {
-    H5G_loc_t	loc;                    /* Group's location */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_t loc;                 /* Group's location */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*szx", loc_id, name, size, buf);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if (H5G_loc(loc_id, &loc))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
 
     /* Call the new link routine which provides this capability */
-    if(H5L_get_val(&loc, name, buf, size, H5P_DEFAULT, H5AC_ind_dxpl_id) < 0)
-      HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "couldn't get link info")
+    if (H5L_get_val(&loc, name, buf, size, H5P_DEFAULT, H5AC_ind_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "couldn't get link info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_linkval() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gset_comment
  *
@@ -676,25 +644,24 @@ done:
 herr_t
 H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
 {
-    H5G_loc_t	loc;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5G_loc_t loc;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*s*s", loc_id, name, comment);
 
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
 
-    if(H5G_loc_set_comment(&loc, name, comment, H5P_DEFAULT, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to set comment value")
+    if (H5G_loc_set_comment(&loc, name, comment, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to set comment value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gset_comment() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_comment
  *
@@ -721,27 +688,26 @@ done:
 int
 H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
 {
-    H5G_loc_t	loc;
-    int	ret_value;
+    H5G_loc_t loc;
+    int       ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("Is", "i*sz*s", loc_id, name, bufsize, buf);
 
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(bufsize > 0 && !buf)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no buffer specified")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if (bufsize > 0 && !buf)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no buffer specified")
 
-    if((ret_value = (int)H5G_loc_get_comment(&loc, name, buf, bufsize, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get comment value")
+    if ((ret_value = (int)H5G_loc_get_comment(&loc, name, buf, bufsize, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get comment value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_comment() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Giterate
  *
@@ -770,46 +736,45 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op,
-    void *op_data)
+H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op, void *op_data)
 {
-    H5G_link_iterate_t lnk_op;          /* Link operator */
-    hsize_t     last_obj;               /* Index of last object looked at */
-    hsize_t	idx;                    /* Internal location to hold index */
-    herr_t	ret_value;
+    H5G_link_iterate_t lnk_op;   /* Link operator */
+    hsize_t            last_obj; /* Index of last object looked at */
+    hsize_t            idx;      /* Internal location to hold index */
+    herr_t             ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "i*s*Isx*x", loc_id, name, idx_p, op, op_data);
 
     /* Check args */
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_p && *idx_p < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
-    if(!op)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no operator specified")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if (idx_p && *idx_p < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
+    if (!op)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no operator specified")
 
     /* Set number of objects looked at to zero */
     last_obj = 0;
-    idx = (hsize_t)(idx_p == NULL ? 0 : *idx_p);
+    idx      = (hsize_t)(idx_p == NULL ? 0 : *idx_p);
 
     /* Build link operator info */
-    lnk_op.op_type = H5G_LINK_OP_OLD;
+    lnk_op.op_type        = H5G_LINK_OP_OLD;
     lnk_op.op_func.op_old = op;
 
     /* Call private function. */
-    if((ret_value = H5G_iterate(loc_id, name, H5_INDEX_NAME, H5_ITER_INC, idx, &last_obj, &lnk_op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group iteration failed")
+    if ((ret_value = H5G_iterate(loc_id, name, H5_INDEX_NAME, H5_ITER_INC, idx, &last_obj, &lnk_op, op_data,
+                                 H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group iteration failed")
 
     /* Set the index we stopped at */
-    if(idx_p)
+    if (idx_p)
         *idx_p = (int)last_obj;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Giterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_num_objs
  *
@@ -829,27 +794,27 @@ done:
 herr_t
 H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs)
 {
-    H5G_loc_t		loc;            /* Location of object */
-    H5G_info_t          grp_info;       /* Group information */
-    H5O_type_t          obj_type;       /* Type of object at location */
-    herr_t		ret_value = SUCCEED;
+    H5G_loc_t  loc;      /* Location of object */
+    H5G_info_t grp_info; /* Group information */
+    H5O_type_t obj_type; /* Type of object at location */
+    herr_t     ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*h", loc_id, num_objs);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
-    if(H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
+    if (H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object type")
-    if(obj_type != H5O_TYPE_GROUP)
+    if (obj_type != H5O_TYPE_GROUP)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
-    if(!num_objs)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad pointer to # of objects")
+    if (!num_objs)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad pointer to # of objects")
 
     /* Retrieve information about the group */
-    if(H5G__obj_info(loc.oloc, &grp_info, H5AC_ind_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "can't determine")
+    if (H5G__obj_info(loc.oloc, &grp_info, H5AC_ind_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "can't determine")
 
     /* Set the number of objects [sic: links] in the group */
     *num_objs = grp_info.nlinks;
@@ -858,7 +823,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_num_objs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_objinfo
  *
@@ -877,30 +841,28 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
-	       H5G_stat_t *statbuf/*out*/)
+H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, H5G_stat_t *statbuf /*out*/)
 {
-    H5G_loc_t	loc;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5G_loc_t loc;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*sbx", loc_id, name, follow_link, statbuf);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
 
     /* Get info */
-    if(H5G_get_objinfo(&loc, name, follow_link, statbuf, H5AC_ind_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "cannot stat object")
+    if (H5G_get_objinfo(&loc, name, follow_link, statbuf, H5AC_ind_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "cannot stat object")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_objinfo() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_get_objinfo_cb
  *
@@ -915,61 +877,61 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_get_objinfo_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
-    H5G_loc_t *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/)
+H5G_get_objinfo_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                   H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/)
 {
-    H5G_trav_goi_t *udata = (H5G_trav_goi_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_trav_goi_t *udata     = (H5G_trav_goi_t *)_udata; /* User data passed in */
+    herr_t          ret_value = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
-    if(lnk == NULL && obj_loc == NULL)
+    if (lnk == NULL && obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "'%s' doesn't exist", name)
 
     /* Only modify user's buffer if it's available */
-    if(udata->statbuf) {
-        H5G_stat_t *statbuf = udata->statbuf;   /* Convenience pointer for statbuf */
+    if (udata->statbuf) {
+        H5G_stat_t *statbuf = udata->statbuf; /* Convenience pointer for statbuf */
 
         /* Common code to retrieve the file's fileno */
-        if(H5F_get_fileno((obj_loc ? obj_loc : grp_loc)->oloc->file, &statbuf->fileno[0]) < 0)
+        if (H5F_get_fileno((obj_loc ? obj_loc : grp_loc)->oloc->file, &statbuf->fileno[0]) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "unable to read fileno")
 
         /* Info for soft and UD links is gotten by H5L_get_info. If we have
          *      a hard link, follow it and get info on the object
          */
-        if(udata->follow_link || !lnk || (lnk->type == H5L_TYPE_HARD)) {
-            H5O_info_t oinfo;           /* Object information */
+        if (udata->follow_link || !lnk || (lnk->type == H5L_TYPE_HARD)) {
+            H5O_info_t oinfo; /* Object information */
 
             /* Go retrieve the object information */
             /* (don't need index & heap info) */
             HDassert(obj_loc);
-            if(H5O_get_info(obj_loc->oloc, udata->dxpl_id, FALSE, &oinfo) < 0)
+            if (H5O_get_info(obj_loc->oloc, udata->dxpl_id, FALSE, &oinfo) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to get object info")
 
             /* Get mapped object type */
             statbuf->type = H5G_map_obj_type(oinfo.type);
 
-	    /* Get object number (i.e. address) for object */
-	    statbuf->objno[0] = (unsigned long)(oinfo.addr);
+            /* Get object number (i.e. address) for object */
+            statbuf->objno[0] = (unsigned long)(oinfo.addr);
 #if H5_SIZEOF_UINT64_T > H5_SIZEOF_LONG
-	    statbuf->objno[1] = (unsigned long)(oinfo.addr >> 8 * sizeof(long));
+            statbuf->objno[1] = (unsigned long)(oinfo.addr >> 8 * sizeof(long));
 #else
-	    statbuf->objno[1] = 0;
+            statbuf->objno[1] = 0;
 #endif
             /* Get # of hard links pointing to object */
-	    statbuf->nlink = oinfo.rc;
+            statbuf->nlink = oinfo.rc;
 
             /* Get modification time for object */
             statbuf->mtime = oinfo.ctime;
 
             /* Retrieve the object header information */
-            statbuf->ohdr.size = oinfo.hdr.space.total;
-            statbuf->ohdr.free = oinfo.hdr.space.free;
-            statbuf->ohdr.nmesgs = oinfo.hdr.nmesgs;
+            statbuf->ohdr.size    = oinfo.hdr.space.total;
+            statbuf->ohdr.free    = oinfo.hdr.space.free;
+            statbuf->ohdr.nmesgs  = oinfo.hdr.nmesgs;
             statbuf->ohdr.nchunks = oinfo.hdr.nchunks;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Indicate that this callback didn't take ownership of the group *
@@ -979,7 +941,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_objinfo_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_get_objinfo
  *
@@ -997,11 +958,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link,
-    H5G_stat_t *statbuf/*out*/, hid_t dxpl_id)
+H5G_get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link, H5G_stat_t *statbuf /*out*/,
+                hid_t dxpl_id)
 {
-    H5G_trav_goi_t udata;           /* User data for callback */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5G_trav_goi_t udata;               /* User data for callback */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1009,47 +970,46 @@ H5G_get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link,
     HDassert(name && *name);
 
     /* Reset stat buffer, if one was given */
-    if(statbuf)
+    if (statbuf)
         HDmemset(statbuf, 0, sizeof(H5G_stat_t));
 
     /* Set up user data for retrieving information */
-    udata.statbuf = statbuf;
+    udata.statbuf     = statbuf;
     udata.follow_link = follow_link;
-    udata.loc_file = loc->oloc->file;
-    udata.dxpl_id = dxpl_id;
+    udata.loc_file    = loc->oloc->file;
+    udata.dxpl_id     = dxpl_id;
 
     /* Traverse the group hierarchy to locate the object to get info about */
-    if(H5G_traverse(loc, name, (unsigned)(follow_link ? H5G_TARGET_NORMAL : H5G_TARGET_SLINK|H5G_TARGET_UDLINK),
-            H5G_get_objinfo_cb, &udata, H5P_DEFAULT, dxpl_id) < 0)
+    if (H5G_traverse(loc, name,
+                     (unsigned)(follow_link ? H5G_TARGET_NORMAL : H5G_TARGET_SLINK | H5G_TARGET_UDLINK),
+                     H5G_get_objinfo_cb, &udata, H5P_DEFAULT, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
 
     /* If we're pointing at a soft or UD link, get the real link length and type */
-    if(statbuf && follow_link == 0) {
-        H5L_info_t linfo;           /* Link information buffer */
-        herr_t ret;
+    if (statbuf && follow_link == 0) {
+        H5L_info_t linfo; /* Link information buffer */
+        herr_t     ret;
 
         /* Get information about link to the object. If this fails, e.g.
          * because the object is ".", just treat the object as a hard link. */
-        H5E_BEGIN_TRY {
-            ret = H5L_get_info(loc, name, &linfo, H5P_DEFAULT, dxpl_id);
-        } H5E_END_TRY
+        H5E_BEGIN_TRY { ret = H5L_get_info(loc, name, &linfo, H5P_DEFAULT, dxpl_id); }
+        H5E_END_TRY
 
-        if(ret >= 0 && linfo.type != H5L_TYPE_HARD) {
+        if (ret >= 0 && linfo.type != H5L_TYPE_HARD) {
             statbuf->linklen = linfo.u.val_size;
-            if(linfo.type == H5L_TYPE_SOFT)
+            if (linfo.type == H5L_TYPE_SOFT)
                 statbuf->type = H5G_LINK;
-            else {  /* UD link. H5L_get_info checked for invalid link classes */
+            else { /* UD link. H5L_get_info checked for invalid link classes */
                 HDassert(linfo.type >= H5L_TYPE_UD_MIN && linfo.type <= H5L_TYPE_MAX);
                 statbuf->type = H5G_UDLINK;
             } /* end else */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_objinfo() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_objname_by_idx
  *
@@ -1076,30 +1036,30 @@ done:
 ssize_t
 H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name, size_t size)
 {
-    H5G_loc_t		loc;            /* Object location */
-    H5O_type_t          obj_type;       /* Type of object at location */
-    ssize_t		ret_value;
+    H5G_loc_t  loc;      /* Object location */
+    H5O_type_t obj_type; /* Type of object at location */
+    ssize_t    ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("Zs", "ih*sz", loc_id, idx, name, size);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
-    if(H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
+    if (H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object type")
-    if(obj_type != H5O_TYPE_GROUP)
+    if (obj_type != H5O_TYPE_GROUP)
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a group")
 
     /* Call internal function */
-    if((ret_value = H5G_obj_get_name_by_idx(loc.oloc, H5_INDEX_NAME, H5_ITER_INC, idx, name, size, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "can't get object name")
+    if ((ret_value = H5G_obj_get_name_by_idx(loc.oloc, H5_INDEX_NAME, H5_ITER_INC, idx, name, size,
+                                             H5AC_ind_dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "can't get object name")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_objname_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Gget_objtype_by_idx
  *
@@ -1118,30 +1078,29 @@ done:
 H5G_obj_t
 H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx)
 {
-    H5G_loc_t		loc;            /* Object location */
-    H5O_type_t          obj_type;       /* Type of object at location */
-    H5G_obj_t		ret_value;
+    H5G_loc_t  loc;      /* Object location */
+    H5O_type_t obj_type; /* Type of object at location */
+    H5G_obj_t  ret_value;
 
     FUNC_ENTER_API(H5G_UNKNOWN)
     H5TRACE2("Go", "ih", loc_id, idx);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a location ID")
-    if(H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a location ID")
+    if (H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5G_UNKNOWN, "can't get object type")
-    if(obj_type != H5O_TYPE_GROUP)
+    if (obj_type != H5O_TYPE_GROUP)
         HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "not a group")
 
     /* Call internal function*/
-    if((ret_value = H5G_obj_get_type_by_idx(loc.oloc, idx, H5AC_ind_dxpl_id)) == H5G_UNKNOWN)
-	HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "can't get object type")
+    if ((ret_value = H5G_obj_get_type_by_idx(loc.oloc, idx, H5AC_ind_dxpl_id)) == H5G_UNKNOWN)
+        HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "can't get object type")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_objtype_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_get_type_by_idx
  *
@@ -1160,9 +1119,9 @@ done:
 static H5G_obj_t
 H5G_obj_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
 {
-    H5O_linfo_t	linfo;		/* Link info message */
-    htri_t linfo_exists;        /* Whether the link info message exists */
-    H5G_obj_t ret_value;        /* Return value */
+    H5O_linfo_t linfo;        /* Link info message */
+    htri_t      linfo_exists; /* Whether the link info message exists */
+    H5G_obj_t   ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI(H5G_UNKNOWN)
 
@@ -1170,23 +1129,23 @@ H5G_obj_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
     HDassert(oloc);
 
     /* Attempt to get the link info for this group */
-    if((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5G_UNKNOWN, "can't check for link info message")
-    if(linfo_exists) {
-        if(H5F_addr_defined(linfo.fheap_addr)) {
+    if (linfo_exists) {
+        if (H5F_addr_defined(linfo.fheap_addr)) {
             /* Get the object's name from the dense link storage */
-            if((ret_value = H5G__dense_get_type_by_idx(oloc->file, dxpl_id, &linfo, idx)) < 0)
+            if ((ret_value = H5G__dense_get_type_by_idx(oloc->file, dxpl_id, &linfo, idx)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "can't locate type")
         } /* end if */
         else {
             /* Get the object's type from the link messages */
-            if((ret_value = H5G__compact_get_type_by_idx(oloc, dxpl_id, &linfo, idx)) < 0)
+            if ((ret_value = H5G__compact_get_type_by_idx(oloc, dxpl_id, &linfo, idx)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "can't locate type")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Get the object's type from the symbol table */
-        if((ret_value = H5G__stab_get_type_by_idx(oloc, idx, dxpl_id)) < 0)
+        if ((ret_value = H5G__stab_get_type_by_idx(oloc, idx, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "can't locate type")
     } /* end else */
 
@@ -1194,4 +1153,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_get_type_by_idx() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 1bd8e63..641e9ef 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -20,40 +20,34 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"         /* File access				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5HLprivate.h" /* Local Heaps				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -61,18 +55,14 @@
 /* Declare extern the PQ free list for the wrapped strings */
 H5FL_BLK_EXTERN(str_buf);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_decode_vec
  *
@@ -91,11 +81,10 @@ H5FL_BLK_EXTERN(str_buf);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, const uint8_t *p_end,
-        H5G_entry_t *ent, unsigned n)
+H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, const uint8_t *p_end, H5G_entry_t *ent, unsigned n)
 {
-    unsigned    u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -105,10 +94,10 @@ H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, const uint8_t *p_end,
     HDassert(ent);
 
     /* decode entries */
-    for(u = 0; u < n; u++) {
-        if(*pp > p_end)
+    for (u = 0; u < n; u++) {
+        if (*pp > p_end)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "ran off the end of the buffer")
-        if(H5G_ent_decode(f, pp, ent + u) < 0)
+        if (H5G_ent_decode(f, pp, ent + u) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "can't decode")
     }
 
@@ -116,7 +105,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__ent_decode_vec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_ent_decode
  *
@@ -136,9 +124,9 @@ done:
 herr_t
 H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
 {
-    const uint8_t	*p_ret = *pp;
-    uint32_t		tmp;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    const uint8_t *p_ret = *pp;
+    uint32_t       tmp;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -155,7 +143,7 @@ H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
     ent->type = (H5G_cache_type_t)tmp;
 
     /* decode scratch-pad */
-    switch(ent->type) {
+    switch (ent->type) {
         case H5G_NOTHING_CACHED:
             break;
 
@@ -181,7 +169,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_ent_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_encode_vec
  *
@@ -202,8 +189,8 @@ done:
 herr_t
 H5G__ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsigned n)
 {
-    unsigned    u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -213,15 +200,14 @@ H5G__ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsign
     HDassert(ent);
 
     /* encode entries */
-    for(u = 0; u < n; u++)
-        if(H5G_ent_encode(f, pp, ent + u) < 0)
+    for (u = 0; u < n; u++)
+        if (H5G_ent_encode(f, pp, ent + u) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTENCODE, FAIL, "can't encode")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5G__ent_encode_vec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_ent_encode
  *
@@ -242,8 +228,8 @@ done:
 herr_t
 H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
 {
-    uint8_t	*p_ret = *pp + H5G_SIZEOF_ENTRY(f);
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    uint8_t *p_ret     = *pp + H5G_SIZEOF_ENTRY(f);
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -252,15 +238,15 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
     HDassert(pp);
 
     /* Check for actual entry to encode */
-    if(ent) {
+    if (ent) {
         /* encode header */
         H5F_ENCODE_LENGTH(f, *pp, ent->name_off);
         H5F_addr_encode(f, pp, ent->header);
         UINT32ENCODE(*pp, ent->type);
-	UINT32ENCODE(*pp, 0); /*reserved*/
+        UINT32ENCODE(*pp, 0); /*reserved*/
 
         /* encode scratch-pad */
-        switch(ent->type) {
+        switch (ent->type) {
             case H5G_NOTHING_CACHED:
                 break;
 
@@ -279,16 +265,16 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
             default:
                 HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unknown symbol table entry cache type")
         } /* end switch */
-    } /* end if */
+    }     /* end if */
     else {
         H5F_ENCODE_LENGTH(f, *pp, 0);
         H5F_addr_encode(f, pp, HADDR_UNDEF);
         UINT32ENCODE(*pp, H5G_NOTHING_CACHED);
-	UINT32ENCODE(*pp, 0); /*reserved*/
-    } /* end else */
+        UINT32ENCODE(*pp, 0); /*reserved*/
+    }                         /* end else */
 
     /* fill with zero */
-    if(*pp < p_ret)
+    if (*pp < p_ret)
         HDmemset(*pp, 0, (size_t)(p_ret - *pp));
     *pp = p_ret;
 
@@ -296,7 +282,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_ent_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_copy
  *
@@ -335,10 +320,11 @@ H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
     HDmemcpy(dst, src, sizeof(H5G_entry_t));
 
     /* Deep copy the names */
-    if(depth == H5_COPY_DEEP) {
+    if (depth == H5_COPY_DEEP) {
         /* Nothing currently */
         ;
-    } else if(depth == H5_COPY_SHALLOW) {
+    }
+    else if (depth == H5_COPY_SHALLOW) {
         /* Discarding 'const' qualifier OK - QAK */
         H5G__ent_reset((H5G_entry_t *)src);
     } /* end if */
@@ -346,7 +332,6 @@ H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5G__ent_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__ent_reset
  *
@@ -375,7 +360,6 @@ H5G__ent_reset(H5G_entry_t *ent)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5G__ent_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_convert
  *
@@ -391,12 +375,11 @@ H5G__ent_reset(H5G_entry_t *ent)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
-    const H5O_link_t *lnk, H5O_type_t obj_type, const void *crt_info,
-    H5G_entry_t *ent)
+H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name, const H5O_link_t *lnk,
+                 H5O_type_t obj_type, const void *crt_info, H5G_entry_t *ent)
 {
-    size_t	name_offset;            /* Offset of name in heap */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    size_t name_offset;         /* Offset of name in heap */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -413,87 +396,82 @@ H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
      * Add the new name to the heap.
      */
     name_offset = H5HL_insert(f, dxpl_id, heap, HDstrlen(name) + 1, name);
-    if(0 == name_offset || (size_t)(-1) == name_offset)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert symbol name into heap")
+    if (0 == name_offset || (size_t)(-1) == name_offset)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert symbol name into heap")
     ent->name_off = name_offset;
 
     /* Build correct information for symbol table entry based on link type */
-    switch(lnk->type) {
+    switch (lnk->type) {
         case H5L_TYPE_HARD:
-            if(obj_type == H5O_TYPE_GROUP) {
+            if (obj_type == H5O_TYPE_GROUP) {
                 const H5G_obj_create_t *gcrt_info = (const H5G_obj_create_t *)crt_info;
 
                 ent->type = gcrt_info->cache_type;
-                if(ent->type != H5G_NOTHING_CACHED)
+                if (ent->type != H5G_NOTHING_CACHED)
                     ent->cache = gcrt_info->cache;
 #ifndef NDEBUG
                 else {
                     /* Make sure there is no stab message in the target object
                      */
-                    H5O_loc_t   targ_oloc;      /* Location of link target */
-                    htri_t      stab_exists;    /* Whether the target symbol table exists */
+                    H5O_loc_t targ_oloc;   /* Location of link target */
+                    htri_t    stab_exists; /* Whether the target symbol table exists */
 
                     /* Build target object location */
-                    if(H5O_loc_reset(&targ_oloc) < 0)
+                    if (H5O_loc_reset(&targ_oloc) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize target location")
                     targ_oloc.file = f;
                     targ_oloc.addr = lnk->u.hard.addr;
 
                     /* Check if a symbol table message exists */
-                    if((stab_exists = H5O_msg_exists(&targ_oloc, H5O_STAB_ID,
-                            dxpl_id)) < 0)
+                    if ((stab_exists = H5O_msg_exists(&targ_oloc, H5O_STAB_ID, dxpl_id)) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to check for STAB message")
 
                     HDassert(!stab_exists);
                 } /* end else */
-#endif /* NDEBUG */
-            } /* end if */
-            else if(obj_type == H5O_TYPE_UNKNOWN){
+#endif            /* NDEBUG */
+            }     /* end if */
+            else if (obj_type == H5O_TYPE_UNKNOWN) {
                 /* Try to retrieve symbol table information for caching */
-                H5O_loc_t       targ_oloc;      /* Location of link target */
-                H5O_t           *oh;            /* Link target object header */
-                H5O_stab_t      stab;           /* Link target symbol table */
-                htri_t          stab_exists;    /* Whether the target symbol table exists */
+                H5O_loc_t  targ_oloc;   /* Location of link target */
+                H5O_t *    oh;          /* Link target object header */
+                H5O_stab_t stab;        /* Link target symbol table */
+                htri_t     stab_exists; /* Whether the target symbol table exists */
 
                 /* Build target object location */
-                if(H5O_loc_reset(&targ_oloc) < 0)
+                if (H5O_loc_reset(&targ_oloc) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize target location")
                 targ_oloc.file = f;
                 targ_oloc.addr = lnk->u.hard.addr;
 
                 /* Get the object header */
-                if(NULL == (oh = H5O_protect(&targ_oloc, dxpl_id, H5AC_READ)))
+                if (NULL == (oh = H5O_protect(&targ_oloc, dxpl_id, H5AC_READ)))
                     HGOTO_ERROR(H5E_SYM, H5E_CANTPROTECT, FAIL, "unable to protect target object header")
 
                 /* Check if a symbol table message exists */
-                if((stab_exists = H5O_msg_exists_oh(oh, H5O_STAB_ID)) < 0) {
-                    if(H5O_unprotect(&targ_oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET)
-                            < 0)
+                if ((stab_exists = H5O_msg_exists_oh(oh, H5O_STAB_ID)) < 0) {
+                    if (H5O_unprotect(&targ_oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
                         HERROR(H5E_SYM, H5E_CANTUNPROTECT, "unable to release object header");
                     HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to check for STAB message")
                 } /* end if */
 
-                if(stab_exists) {
+                if (stab_exists) {
                     /* Read symbol table message */
-                    if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_STAB_ID,
-                            &stab)) {
-                        if(H5O_unprotect(&targ_oloc, dxpl_id, oh,
-                                H5AC__NO_FLAGS_SET) < 0)
+                    if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_STAB_ID, &stab)) {
+                        if (H5O_unprotect(&targ_oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
                             HERROR(H5E_SYM, H5E_CANTUNPROTECT, "unable to release object header");
                         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read STAB message")
                     } /* end if */
 
                     /* Cache symbol table message */
-                    ent->type = H5G_CACHED_STAB;
+                    ent->type                  = H5G_CACHED_STAB;
                     ent->cache.stab.btree_addr = stab.btree_addr;
-                    ent->cache.stab.heap_addr = stab.heap_addr;
+                    ent->cache.stab.heap_addr  = stab.heap_addr;
                 } /* end if */
                 else
                     /* No symbol table message, don't cache anything */
                     ent->type = H5G_NOTHING_CACHED;
 
-                if(H5O_unprotect(&targ_oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET)
-                        < 0)
+                if (H5O_unprotect(&targ_oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
             } /* end else */
             else
@@ -502,32 +480,30 @@ H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
             ent->header = lnk->u.hard.addr;
             break;
 
-        case H5L_TYPE_SOFT:
-            {
-                size_t	lnk_offset;		/* Offset to sym-link value	*/
+        case H5L_TYPE_SOFT: {
+            size_t lnk_offset; /* Offset to sym-link value	*/
 
-                /* Insert link value into local heap */
-                if((size_t)(-1) == (lnk_offset = H5HL_insert(f, dxpl_id, heap,
-                        HDstrlen(lnk->u.soft.name) + 1, lnk->u.soft.name)))
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to write link value to local heap")
+            /* Insert link value into local heap */
+            if ((size_t)(-1) == (lnk_offset = H5HL_insert(f, dxpl_id, heap, HDstrlen(lnk->u.soft.name) + 1,
+                                                          lnk->u.soft.name)))
+                HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to write link value to local heap")
 
-                ent->type = H5G_CACHED_SLINK;
-                ent->cache.slink.lval_offset = lnk_offset;
-            } /* end case */
-            break;
+            ent->type                    = H5G_CACHED_SLINK;
+            ent->cache.slink.lval_offset = lnk_offset;
+        } /* end case */
+        break;
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_EXTERNAL:
         case H5L_TYPE_MAX:
         default:
-          HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type")
+            HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type")
     } /* end switch */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__ent_convert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_debug
  *
@@ -542,10 +518,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
-    const H5HL_t *heap)
+H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth, const H5HL_t *heap)
 {
-    const char  *lval = NULL;
+    const char *lval = NULL;
     int         nested_indent, nested_fwidth;
 
     FUNC_ENTER_PACKAGE_NOERR
@@ -555,15 +530,12 @@ H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
     nested_fwidth = MAX(0, fwidth - 3);
 
     HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-              "Name offset into private heap:",
-	          (unsigned long) (ent->name_off));
+              "Name offset into private heap:", (unsigned long)(ent->name_off));
 
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-              "Object header address:", ent->header);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Object header address:", ent->header);
 
-    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth,
-              "Cache info type:");
-    switch(ent->type) {
+    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Cache info type:");
+    switch (ent->type) {
         case H5G_NOTHING_CACHED:
             HDfprintf(stream, "Nothing Cached\n");
             break;
@@ -571,8 +543,7 @@ H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
         case H5G_CACHED_STAB:
             HDfprintf(stream, "Symbol Table\n");
 
-            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
-                      "Cached entry information:");
+            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Cached entry information:");
             HDfprintf(stream, "%*s%-*s %a\n", nested_indent, "", nested_fwidth,
                       "B-tree address:", ent->cache.stab.btree_addr);
 
@@ -582,19 +553,17 @@ H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
 
         case H5G_CACHED_SLINK:
             HDfprintf(stream, "Symbolic Link\n");
-            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
-                      "Cached information:");
+            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Cached information:");
             HDfprintf(stream, "%*s%-*s %lu\n", nested_indent, "", nested_fwidth,
-                      "Link value offset:",
-                      (unsigned long)(ent->cache.slink.lval_offset));
-            if(heap) {
+                      "Link value offset:", (unsigned long)(ent->cache.slink.lval_offset));
+            if (heap) {
                 lval = (const char *)H5HL_offset_into(heap, ent->cache.slink.lval_offset);
                 HDfprintf(stream, "%*s%-*s %s\n", nested_indent, "", nested_fwidth,
-                          "Link value:",
-                          (lval == NULL) ? "" : lval);
+                          "Link value:", (lval == NULL) ? "" : lval);
             } /* end if */
             else
-                HDfprintf(stream, "%*s%-*s\n", nested_indent, "", nested_fwidth, "Warning: Invalid heap address given, name not displayed!");
+                HDfprintf(stream, "%*s%-*s\n", nested_indent, "", nested_fwidth,
+                          "Warning: Invalid heap address given, name not displayed!");
             break;
 
         case H5G_CACHED_ERROR:
@@ -606,4 +575,3 @@ H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G__ent_debug() */
-
diff --git a/src/H5Gint.c b/src/H5Gint.c
index a9762b3..b863e67 100644
--- a/src/H5Gint.c
+++ b/src/H5Gint.c
@@ -26,74 +26,68 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg   */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5G_init_int_interface
-
+#define H5_INTERFACE_INIT_FUNC H5G_init_int_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FOprivate.h"        /* File objects                         */
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Lprivate.h"         /* Links                                */
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FOprivate.h" /* File objects                         */
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Lprivate.h"  /* Links                                */
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for path traversal routine for "insertion file" routine */
 typedef struct {
-    H5G_loc_t *loc;         /* Pointer to the location for insertion */
+    H5G_loc_t *loc; /* Pointer to the location for insertion */
 } H5G_trav_ins_t;
 
 /* User data for application-style iteration over links in a group */
 typedef struct {
-    hid_t       gid;            /* The group ID for the application callback */
+    hid_t              gid;     /* The group ID for the application callback */
     H5G_link_iterate_t lnk_op;  /* Application callback */
-    void *op_data;              /* Application's op data */
+    void *             op_data; /* Application's op data */
 } H5G_iter_appcall_ud_t;
 
 /* User data for recursive traversal over links from a group */
 typedef struct {
-    hid_t       gid;            /* The group ID for the starting group */
-    H5G_loc_t	*curr_loc;      /* Location of starting group */
-    hid_t       lapl_id;        /* LAPL for walking across links */
-    hid_t       dxpl_id; 	/* DXPL for operations */
-    H5_index_t  idx_type;       /* Index to use */
-    H5_iter_order_t order;      /* Iteration order within index */
-    H5SL_t     *visited;        /* Skip list for tracking visited nodes */
-    char       *path;           /* Path name of the link */
-    size_t      curr_path_len;  /* Current length of the path in the buffer */
-    size_t      path_buf_size;  /* Size of path buffer */
-    H5L_iterate_t op;           /* Application callback */
-    void       *op_data;        /* Application's op data */
+    hid_t           gid;           /* The group ID for the starting group */
+    H5G_loc_t *     curr_loc;      /* Location of starting group */
+    hid_t           lapl_id;       /* LAPL for walking across links */
+    hid_t           dxpl_id;       /* DXPL for operations */
+    H5_index_t      idx_type;      /* Index to use */
+    H5_iter_order_t order;         /* Iteration order within index */
+    H5SL_t *        visited;       /* Skip list for tracking visited nodes */
+    char *          path;          /* Path name of the link */
+    size_t          curr_path_len; /* Current length of the path in the buffer */
+    size_t          path_buf_size; /* Size of path buffer */
+    H5L_iterate_t   op;            /* Application callback */
+    void *          op_data;       /* Application's op data */
 } H5G_iter_visit_ud_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static herr_t H5G_open_oid(H5G_t *grp, hid_t dxpl_id);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -105,18 +99,14 @@ H5FL_DEFINE(H5G_shared_t);
 /* Declare the free list to manage H5_obj_t's */
 H5FL_DEFINE(H5_obj_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5G_init_int_interface -- Initialize interface-specific information
@@ -132,19 +122,18 @@ DESCRIPTION
 static herr_t
 H5G_init_int_interface(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Funnel all work to H5G__init() */
-    if(H5G__init() < 0)
+    if (H5G__init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "interface initialization failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5G_init_int_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__create_named
  *
@@ -160,12 +149,12 @@ done:
  *-------------------------------------------------------------------------
  */
 H5G_t *
-H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id,
-    hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id)
+H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id,
+                  hid_t dxpl_id)
 {
-    H5O_obj_create_t ocrt_info;         /* Information for object creation */
-    H5G_obj_create_t gcrt_info;         /* Information for group creation */
-    H5G_t	   *ret_value;          /* Return value */
+    H5O_obj_create_t ocrt_info; /* Information for object creation */
+    H5G_obj_create_t gcrt_info; /* Information for group creation */
+    H5G_t *          ret_value; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -178,17 +167,17 @@ H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id,
     HDassert(dxpl_id != H5P_DEFAULT);
 
     /* Set up group creation info */
-    gcrt_info.gcpl_id = gcpl_id;
+    gcrt_info.gcpl_id    = gcpl_id;
     gcrt_info.cache_type = H5G_NOTHING_CACHED;
     HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache));
 
     /* Set up object creation information */
     ocrt_info.obj_type = H5O_TYPE_GROUP;
     ocrt_info.crt_info = &gcrt_info;
-    ocrt_info.new_obj = NULL;
+    ocrt_info.new_obj  = NULL;
 
     /* Create the new group and link it to its parent group */
-    if(H5L_link_object(loc, name, &ocrt_info, lcpl_id, gapl_id, dxpl_id) < 0)
+    if (H5L_link_object(loc, name, &ocrt_info, lcpl_id, gapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create and link to group")
     HDassert(ocrt_info.new_obj);
 
@@ -199,7 +188,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__create_named() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__create
  *
@@ -221,9 +209,9 @@ done:
 H5G_t *
 H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info, hid_t dxpl_id)
 {
-    H5G_t	*grp = NULL;	/*new group			*/
-    unsigned    oloc_init = 0;  /* Flag to indicate that the group object location was created successfully */
-    H5G_t	*ret_value;	/* Return value */
+    H5G_t *  grp       = NULL; /*new group			*/
+    unsigned oloc_init = 0;    /* Flag to indicate that the group object location was created successfully */
+    H5G_t *  ret_value;        /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -233,20 +221,20 @@ H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info, hid_t dxpl_id)
     HDassert(dxpl_id != H5P_DEFAULT);
 
     /* create an open group */
-    if(NULL == (grp = H5FL_CALLOC(H5G_t)))
+    if (NULL == (grp = H5FL_CALLOC(H5G_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    if(NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
+    if (NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Create the group object header */
-    if(H5G__obj_create(file, dxpl_id, gcrt_info, &(grp->oloc)/*out*/) < 0)
+    if (H5G__obj_create(file, dxpl_id, gcrt_info, &(grp->oloc) /*out*/) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group object header")
-    oloc_init = 1;    /* Indicate that the object location information is valid */
+    oloc_init = 1; /* Indicate that the object location information is valid */
 
     /* Add group to list of open objects in file */
-    if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
+    if (H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't incr object ref. count")
-    if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, TRUE) < 0)
+    if (H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, TRUE) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
 
     /* Set the count of times the object is opened */
@@ -256,27 +244,27 @@ H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info, hid_t dxpl_id)
     ret_value = grp;
 
 done:
-    if(ret_value == NULL) {
+    if (ret_value == NULL) {
         /* Check if we need to release the file-oriented symbol table info */
-        if(oloc_init) {
-            if(H5O_dec_rc_by_loc(&(grp->oloc), dxpl_id) < 0)
-                HDONE_ERROR(H5E_SYM, H5E_CANTDEC, NULL, "unable to decrement refcount on newly created object")
-            if(H5O_close(&(grp->oloc)) < 0)
+        if (oloc_init) {
+            if (H5O_dec_rc_by_loc(&(grp->oloc), dxpl_id) < 0)
+                HDONE_ERROR(H5E_SYM, H5E_CANTDEC, NULL,
+                            "unable to decrement refcount on newly created object")
+            if (H5O_close(&(grp->oloc)) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "unable to release object header")
-            if(H5O_delete(file, dxpl_id, grp->oloc.addr) < 0)
+            if (H5O_delete(file, dxpl_id, grp->oloc.addr) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CANTDELETE, NULL, "unable to delete object header")
         } /* end if */
-        if(grp != NULL) {
-            if(grp->shared != NULL)
+        if (grp != NULL) {
+            if (grp->shared != NULL)
                 grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
             grp = H5FL_FREE(H5G_t, grp);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__open_name
  *
@@ -291,16 +279,15 @@ done:
  *-------------------------------------------------------------------------
  */
 H5G_t *
-H5G__open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id,
-    hid_t dxpl_id)
+H5G__open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id, hid_t dxpl_id)
 {
-    H5G_t      *grp = NULL;             /* Group to open */
-    H5G_loc_t   grp_loc;                /* Location used to open group */
-    H5G_name_t  grp_path;            	/* Opened object group hier. path */
-    H5O_loc_t   grp_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Location at 'name' found */
-    H5O_type_t  obj_type;               /* Type of object at location */
-    H5G_t      *ret_value;              /* Return value */
+    H5G_t *    grp = NULL;        /* Group to open */
+    H5G_loc_t  grp_loc;           /* Location used to open group */
+    H5G_name_t grp_path;          /* Opened object group hier. path */
+    H5O_loc_t  grp_oloc;          /* Opened object object location */
+    hbool_t    loc_found = FALSE; /* Location at 'name' found */
+    H5O_type_t obj_type;          /* Type of object at location */
+    H5G_t *    ret_value;         /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -314,33 +301,32 @@ H5G__open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id,
     H5G_loc_reset(&grp_loc);
 
     /* Find the group object using the gapl passed in */
-    if(H5G_loc_find(loc, name, &grp_loc/*out*/, gapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(loc, name, &grp_loc /*out*/, gapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "group not found")
     loc_found = TRUE;
 
     /* Check that the object found is the correct type */
-    if(H5O_obj_type(&grp_oloc, &obj_type, dxpl_id) < 0)
+    if (H5O_obj_type(&grp_oloc, &obj_type, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "can't get object type")
-    if(obj_type != H5O_TYPE_GROUP)
+    if (obj_type != H5O_TYPE_GROUP)
         HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, NULL, "not a group")
 
     /* Open the group */
-    if((grp = H5G_open(&grp_loc, dxpl_id)) == NULL)
+    if ((grp = H5G_open(&grp_loc, dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open group")
 
     /* Set return value */
     ret_value = grp;
 
 done:
-    if(!ret_value) {
-        if(loc_found && H5G_loc_free(&grp_loc) < 0)
+    if (!ret_value) {
+        if (loc_found && H5G_loc_free(&grp_loc) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, NULL, "can't free location")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__open_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_open
  *
@@ -359,9 +345,9 @@ done:
 H5G_t *
 H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
 {
-    H5G_t           *grp = NULL;        /* Group opened */
-    H5G_shared_t    *shared_fo;         /* Shared group object */
-    H5G_t           *ret_value;         /* Return value */
+    H5G_t *       grp = NULL; /* Group opened */
+    H5G_shared_t *shared_fo;  /* Shared group object */
+    H5G_t *       ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -369,33 +355,33 @@ H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
     HDassert(loc);
 
     /* Allocate the group structure */
-    if(NULL == (grp = H5FL_CALLOC(H5G_t)))
+    if (NULL == (grp = H5FL_CALLOC(H5G_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for group")
 
     /* Shallow copy (take ownership) of the group location object */
-    if(H5O_loc_copy(&(grp->oloc), loc->oloc, H5_COPY_SHALLOW) < 0)
+    if (H5O_loc_copy(&(grp->oloc), loc->oloc, H5_COPY_SHALLOW) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "can't copy object location")
-    if(H5G_name_copy(&(grp->path), loc->path, H5_COPY_SHALLOW) < 0)
+    if (H5G_name_copy(&(grp->path), loc->path, H5_COPY_SHALLOW) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "can't copy path")
 
     /* Check if group was already open */
-    if((shared_fo = (H5G_shared_t *)H5FO_opened(grp->oloc.file, grp->oloc.addr)) == NULL) {
+    if ((shared_fo = (H5G_shared_t *)H5FO_opened(grp->oloc.file, grp->oloc.addr)) == NULL) {
 
         /* Clear any errors from H5FO_opened() */
         H5E_clear_stack(NULL);
 
         /* Open the group object */
-        if(H5G_open_oid(grp, dxpl_id) < 0)
+        if (H5G_open_oid(grp, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "not found")
 
         /* Add group to list of open objects in file */
-        if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, FALSE) < 0) {
+        if (H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, FALSE) < 0) {
             grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
         } /* end if */
 
         /* Increment object count for the object in the top file */
-        if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
+        if (H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't increment object count")
 
         /* Set open object count */
@@ -409,14 +395,14 @@ H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
         shared_fo->fo_count++;
 
         /* Check if the object has been opened through the top file yet */
-        if(H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
+        if (H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
             /* Open the object through this top file */
-            if(H5O_open(&(grp->oloc)) < 0)
+            if (H5O_open(&(grp->oloc)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object header")
         } /* end if */
 
         /* Increment object count for the object in the top file */
-        if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
+        if (H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't increment object count")
     } /* end else */
 
@@ -424,7 +410,7 @@ H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
     ret_value = grp;
 
 done:
-    if(!ret_value && grp) {
+    if (!ret_value && grp) {
         H5O_loc_free(&(grp->oloc));
         H5G_name_free(&(grp->path));
         grp = H5FL_FREE(H5G_t, grp);
@@ -433,7 +419,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_open_oid
  *
@@ -452,8 +437,8 @@ done:
 static herr_t
 H5G_open_oid(H5G_t *grp, hid_t dxpl_id)
 {
-    hbool_t             obj_opened = FALSE;
-    herr_t		ret_value = SUCCEED;
+    hbool_t obj_opened = FALSE;
+    herr_t  ret_value  = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -461,31 +446,30 @@ H5G_open_oid(H5G_t *grp, hid_t dxpl_id)
     HDassert(grp);
 
     /* Allocate the shared information for the group */
-    if(NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
+    if (NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Grab the object header */
-    if(H5O_open(&(grp->oloc)) < 0)
+    if (H5O_open(&(grp->oloc)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
     obj_opened = TRUE;
 
     /* Check if this object has the right message(s) to be treated as a group */
-    if((H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id) <= 0)
-            && (H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, dxpl_id) <= 0))
+    if ((H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id) <= 0) &&
+        (H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, dxpl_id) <= 0))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "not a group")
 
 done:
-    if(ret_value < 0) {
-        if(obj_opened)
+    if (ret_value < 0) {
+        if (obj_opened)
             H5O_close(&(grp->oloc));
-        if(grp->shared)
+        if (grp->shared)
             grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_open_oid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_close
  *
@@ -501,7 +485,7 @@ done:
 herr_t
 H5G_close(H5G_t *grp)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -511,43 +495,44 @@ H5G_close(H5G_t *grp)
 
     --grp->shared->fo_count;
 
-    if(0 == grp->shared->fo_count) {
+    if (0 == grp->shared->fo_count) {
         HDassert(grp != H5G_rootof(H5G_fileof(grp)));
 
         /* Remove the group from the list of opened objects in the file */
-        if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
+        if (H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-        if(H5FO_delete(grp->oloc.file, H5AC_dxpl_id, grp->oloc.addr) < 0)
+        if (H5FO_delete(grp->oloc.file, H5AC_dxpl_id, grp->oloc.addr) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't remove group from list of open objects")
-        if(H5O_close(&(grp->oloc)) < 0)
+        if (H5O_close(&(grp->oloc)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
         grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
-    } else {
+    }
+    else {
         /* Decrement the ref. count for this object in the top file */
-        if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
+        if (H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
 
         /* Check reference count for this object in the top file */
-        if(H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
-            if(H5O_close(&(grp->oloc)) < 0)
+        if (H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
+            if (H5O_close(&(grp->oloc)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
         } /* end if */
         else
             /* Free object location (i.e. "unhold" the file if appropriate) */
-            if(H5O_loc_free(&(grp->oloc)) < 0)
-                HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
+            if (H5O_loc_free(&(grp->oloc)) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
 
         /* If this group is a mount point and the mount point is the last open
          * reference to the group, then attempt to close down the file hierarchy
          */
-        if(grp->shared->mounted && grp->shared->fo_count == 1) {
+        if (grp->shared->mounted && grp->shared->fo_count == 1) {
             /* Attempt to close down the file hierarchy */
-            if(H5F_try_close(grp->oloc.file) < 0)
+            if (H5F_try_close(grp->oloc.file) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problem attempting file close")
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
-    if(H5G_name_free(&(grp->path)) < 0) {
+    if (H5G_name_free(&(grp->path)) < 0) {
         grp = H5FL_FREE(H5G_t, grp);
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't free group entry name")
     } /* end if */
@@ -558,7 +543,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_oloc
  *
@@ -581,7 +565,6 @@ H5G_oloc(H5G_t *grp)
     FUNC_LEAVE_NOAPI(grp ? &(grp->oloc) : NULL)
 } /* end H5G_oloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_nameof
  *
@@ -604,7 +587,6 @@ H5G_nameof(H5G_t *grp)
     FUNC_LEAVE_NOAPI(grp ? &(grp->path) : NULL)
 } /* end H5G_nameof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_fileof
  *
@@ -630,7 +612,6 @@ H5G_fileof(H5G_t *grp)
     FUNC_LEAVE_NOAPI(grp->oloc.file)
 } /* end H5G_fileof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_get_shared_count
  *
@@ -654,7 +635,6 @@ H5G_get_shared_count(H5G_t *grp)
     FUNC_LEAVE_NOAPI(grp->shared->fo_count)
 } /* end H5G_get_shared_count() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_mount
  *
@@ -682,7 +662,6 @@ H5G_mount(H5G_t *grp)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_mount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_mounted
  *
@@ -706,7 +685,6 @@ H5G_mounted(H5G_t *grp)
     FUNC_LEAVE_NOAPI(grp->shared->mounted)
 } /* end H5G_mounted() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_unmount
  *
@@ -734,7 +712,6 @@ H5G_unmount(H5G_t *grp)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_unmount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_iterate_cb
  *
@@ -751,8 +728,8 @@ H5G_unmount(H5G_t *grp)
 static herr_t
 H5G_iterate_cb(const H5O_link_t *lnk, void *_udata)
 {
-    H5G_iter_appcall_ud_t *udata = (H5G_iter_appcall_ud_t *)_udata;     /* User data for callback */
-    herr_t ret_value = H5_ITER_ERROR;   /* Return value */
+    H5G_iter_appcall_ud_t *udata     = (H5G_iter_appcall_ud_t *)_udata; /* User data for callback */
+    herr_t                 ret_value = H5_ITER_ERROR;                   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -760,7 +737,7 @@ H5G_iterate_cb(const H5O_link_t *lnk, void *_udata)
     HDassert(lnk);
     HDassert(udata);
 
-    switch(udata->lnk_op.op_type) {
+    switch (udata->lnk_op.op_type) {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
         case H5G_LINK_OP_OLD:
             /* Make the old-type application callback */
@@ -768,18 +745,16 @@ H5G_iterate_cb(const H5O_link_t *lnk, void *_udata)
             break;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-        case H5G_LINK_OP_NEW:
-            {
-                H5L_info_t info;    /* Link info */
+        case H5G_LINK_OP_NEW: {
+            H5L_info_t info; /* Link info */
 
-                /* Retrieve the info for the link */
-                if(H5G_link_to_info(lnk, &info) < 0)
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
+            /* Retrieve the info for the link */
+            if (H5G_link_to_info(lnk, &info) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
 
-                /* Make the application callback */
-                ret_value = (udata->lnk_op.op_func.op_new)(udata->gid, lnk->name, &info, udata->op_data);
-            }
-            break;
+            /* Make the application callback */
+            ret_value = (udata->lnk_op.op_func.op_new)(udata->gid, lnk->name, &info, udata->op_data);
+        } break;
 
         default:
             HDassert(0 && "Unknown link op type?!?");
@@ -789,7 +764,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_iterate_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_iterate
  *
@@ -804,15 +778,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_iterate(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id)
+H5G_iterate(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
+            hsize_t *last_lnk, const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_loc_t	loc;            /* Location of parent for group */
-    hid_t gid = -1;             /* ID of group to iterate over */
-    H5G_t *grp = NULL;          /* Pointer to group data structure to iterate over */
-    H5G_iter_appcall_ud_t udata; /* User data for callback */
-    herr_t ret_value;           /* Return value */
+    H5G_loc_t             loc;        /* Location of parent for group */
+    hid_t                 gid = -1;   /* ID of group to iterate over */
+    H5G_t *               grp = NULL; /* Pointer to group data structure to iterate over */
+    H5G_iter_appcall_ud_t udata;      /* User data for callback */
+    herr_t                ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -825,35 +798,35 @@ H5G_iterate(hid_t loc_id, const char *group_name,
      * Open the group on which to operate.  We also create a group ID which
      * we can pass to the application-defined operator.
      */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(NULL == (grp = H5G__open_name(&loc, group_name, lapl_id, dxpl_id)))
+    if (NULL == (grp = H5G__open_name(&loc, group_name, lapl_id, dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
-    if((gid = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+    if ((gid = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
     /* Set up user data for callback */
-    udata.gid = gid;
-    udata.lnk_op = *lnk_op;
+    udata.gid     = gid;
+    udata.lnk_op  = *lnk_op;
     udata.op_data = op_data;
 
     /* Call the real group iteration routine */
-    if((ret_value = H5G__obj_iterate(&(grp->oloc), idx_type, order, skip, last_lnk, H5G_iterate_cb, &udata, dxpl_id)) < 0)
+    if ((ret_value = H5G__obj_iterate(&(grp->oloc), idx_type, order, skip, last_lnk, H5G_iterate_cb, &udata,
+                                      dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "error iterating over links")
 
 done:
     /* Release the group opened */
-    if(gid > 0) {
-        if(H5I_dec_app_ref(gid) < 0)
+    if (gid > 0) {
+        if (H5I_dec_app_ref(gid) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
     } /* end if */
-    else if(grp && H5G_close(grp) < 0)
+    else if (grp && H5G_close(grp) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_free_visit_visited
  *
@@ -867,7 +840,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *operator_data/*in,out*/)
+H5G_free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *operator_data /*in,out*/)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -876,7 +849,6 @@ H5G_free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_free_visit_visited() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_visit_cb
  *
@@ -893,16 +865,16 @@ H5G_free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED
 static herr_t
 H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
 {
-    H5G_iter_visit_ud_t *udata = (H5G_iter_visit_ud_t *)_udata;     /* User data for callback */
-    H5L_info_t info;                    /* Link info */
-    H5G_loc_t   obj_loc;                /* Location of object */
-    H5G_name_t  obj_path;            	/* Object's group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Object's object location */
-    hbool_t     obj_found = FALSE;      /* Object at 'name' found */
+    H5G_iter_visit_ud_t *udata = (H5G_iter_visit_ud_t *)_udata; /* User data for callback */
+    H5L_info_t           info;                                  /* Link info */
+    H5G_loc_t            obj_loc;                               /* Location of object */
+    H5G_name_t           obj_path;                              /* Object's group hier. path */
+    H5O_loc_t            obj_oloc;                              /* Object's object location */
+    hbool_t              obj_found = FALSE;                     /* Object at 'name' found */
     size_t old_path_len = udata->curr_path_len; /* Length of path before appending this link's name */
-    size_t link_name_len;               /* Length of link's name */
-    size_t len_needed;                  /* Length of path string needed */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    size_t link_name_len;                       /* Length of link's name */
+    size_t len_needed;                          /* Length of path string needed */
+    herr_t ret_value = H5_ITER_CONT;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -913,14 +885,14 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
     /* Check if we will need more space to store this link's relative path */
     /* ("+2" is for string terminator and possible '/' for group separator later) */
     link_name_len = HDstrlen(lnk->name);
-    len_needed = udata->curr_path_len + link_name_len + 2;
-    if(len_needed > udata->path_buf_size) {
-        void *new_path;         /* Pointer to new path buffer */
+    len_needed    = udata->curr_path_len + link_name_len + 2;
+    if (len_needed > udata->path_buf_size) {
+        void *new_path; /* Pointer to new path buffer */
 
         /* Attempt to allocate larger buffer for path */
-        if(NULL == (new_path = H5MM_realloc(udata->path, len_needed)))
+        if (NULL == (new_path = H5MM_realloc(udata->path, len_needed)))
             HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate path string")
-        udata->path = (char *)new_path;
+        udata->path          = (char *)new_path;
         udata->path_buf_size = len_needed;
     } /* end if */
 
@@ -930,15 +902,15 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
     udata->curr_path_len += link_name_len;
 
     /* Construct the link info from the link message */
-    if(H5G_link_to_info(lnk, &info) < 0)
+    if (H5G_link_to_info(lnk, &info) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
 
     /* Make the application callback */
     ret_value = (udata->op)(udata->gid, udata->path, &info, udata->op_data);
 
     /* Check for doing more work */
-    if(ret_value == H5_ITER_CONT && lnk->type == H5L_TYPE_HARD) {
-        H5_obj_t obj_pos;       /* Object "position" for this object */
+    if (ret_value == H5_ITER_CONT && lnk->type == H5L_TYPE_HARD) {
+        H5_obj_t obj_pos; /* Object "position" for this object */
 
         /* Set up opened group location to fill in */
         obj_loc.oloc = &obj_oloc;
@@ -947,7 +919,7 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
 
         /* Find the object using the LAPL passed in */
         /* (Correctly handles mounted files) */
-        if(H5G_loc_find(udata->curr_loc, lnk->name, &obj_loc/*out*/, udata->lapl_id, udata->dxpl_id) < 0)
+        if (H5G_loc_find(udata->curr_loc, lnk->name, &obj_loc /*out*/, udata->lapl_id, udata->dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
         obj_found = TRUE;
 
@@ -956,37 +928,38 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
         obj_pos.addr = obj_oloc.addr;
 
         /* Check if we've seen the object the link references before */
-        if(NULL == H5SL_search(udata->visited, &obj_pos)) {
-            H5O_type_t otype;       /* Basic object type (group, dataset, etc.) */
-            unsigned rc;		/* Reference count of object    */
+        if (NULL == H5SL_search(udata->visited, &obj_pos)) {
+            H5O_type_t otype; /* Basic object type (group, dataset, etc.) */
+            unsigned   rc;    /* Reference count of object    */
 
             /* Get the object's reference count and type */
-            if(H5O_get_rc_and_type(&obj_oloc, udata->dxpl_id, &rc, &otype) < 0)
+            if (H5O_get_rc_and_type(&obj_oloc, udata->dxpl_id, &rc, &otype) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get object info")
 
             /* If its ref count is > 1, we add it to the list of visited objects */
             /* (because it could come up again during traversal) */
-            if(rc > 1) {
-                H5_obj_t *new_node;                  /* New object node for visited list */
+            if (rc > 1) {
+                H5_obj_t *new_node; /* New object node for visited list */
 
                 /* Allocate new object "position" node */
-                if((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
+                if ((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
                     HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate object node")
 
                 /* Set node information */
                 *new_node = obj_pos;
 
                 /* Add to list of visited objects */
-                if(H5SL_insert(udata->visited, new_node, new_node) < 0)
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert object node into visited list")
+                if (H5SL_insert(udata->visited, new_node, new_node) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5_ITER_ERROR,
+                                "can't insert object node into visited list")
             } /* end if */
 
             /* If it's a group, we recurse into it */
-            if(otype == H5O_TYPE_GROUP) {
-                H5G_loc_t *old_loc = udata->curr_loc;       /* Pointer to previous group location info */
-                H5_index_t idx_type = udata->idx_type;      /* Type of index to use */
-                H5O_linfo_t	linfo;		        /* Link info message */
-                htri_t linfo_exists;                    /* Whether the link info message exists */
+            if (otype == H5O_TYPE_GROUP) {
+                H5G_loc_t * old_loc  = udata->curr_loc; /* Pointer to previous group location info */
+                H5_index_t  idx_type = udata->idx_type; /* Type of index to use */
+                H5O_linfo_t linfo;                      /* Link info message */
+                htri_t      linfo_exists;               /* Whether the link info message exists */
 
                 /* Add the path separator to the current path */
                 HDassert(udata->path[udata->curr_path_len] == '\0');
@@ -994,13 +967,13 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
                 udata->curr_path_len++;
 
                 /* Attempt to get the link info for this group */
-                if((linfo_exists = H5G__obj_get_linfo(&obj_oloc, &linfo, udata->dxpl_id)) < 0)
+                if ((linfo_exists = H5G__obj_get_linfo(&obj_oloc, &linfo, udata->dxpl_id)) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "can't check for link info message")
-                if(linfo_exists) {
+                if (linfo_exists) {
                     /* Check for creation order tracking, if creation order index lookup requested */
-                    if(idx_type == H5_INDEX_CRT_ORDER) {
+                    if (idx_type == H5_INDEX_CRT_ORDER) {
                         /* Check if creation order is tracked */
-                        if(!linfo.track_corder)
+                        if (!linfo.track_corder)
                             /* Switch to name order for this group */
                             idx_type = H5_INDEX_NAME;
                     } /* end if */
@@ -1009,7 +982,7 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
                 } /* end if */
                 else {
                     /* Can only perform name lookups on groups with symbol tables */
-                    if(idx_type != H5_INDEX_NAME)
+                    if (idx_type != H5_INDEX_NAME)
                         /* Switch to name order for this group */
                         idx_type = H5_INDEX_NAME;
                 } /* end if */
@@ -1018,27 +991,27 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
                 udata->curr_loc = &obj_loc;
 
                 /* Iterate over links in group */
-                ret_value = H5G__obj_iterate(&obj_oloc, idx_type, udata->order, (hsize_t)0, NULL, H5G_visit_cb, udata, udata->dxpl_id);
+                ret_value = H5G__obj_iterate(&obj_oloc, idx_type, udata->order, (hsize_t)0, NULL,
+                                             H5G_visit_cb, udata, udata->dxpl_id);
 
                 /* Restore location */
                 udata->curr_loc = old_loc;
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
 done:
     /* Reset path back to incoming path */
     udata->path[old_path_len] = '\0';
-    udata->curr_path_len = old_path_len;
+    udata->curr_path_len      = old_path_len;
 
     /* Release resources */
-    if(obj_found && H5G_loc_free(&obj_loc) < 0)
+    if (obj_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_visit_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_visit
  *
@@ -1070,19 +1043,18 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, H5L_iterate_t op, void *op_data, hid_t lapl_id,
-    hid_t dxpl_id)
+H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op,
+          void *op_data, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_iter_visit_ud_t udata;      /* User data for callback */
-    H5O_linfo_t	linfo;		    /* Link info message */
-    htri_t linfo_exists;            /* Whether the link info message exists */
-    hid_t       gid = (-1);         /* Group ID */
-    H5G_t      *grp = NULL;         /* Group opened */
-    H5G_loc_t	loc;                /* Location of group passed in */
-    H5G_loc_t	start_loc;          /* Location of starting group */
-    unsigned    rc;		    /* Reference count of object    */
-    herr_t      ret_value;          /* Return value */
+    H5G_iter_visit_ud_t udata;        /* User data for callback */
+    H5O_linfo_t         linfo;        /* Link info message */
+    htri_t              linfo_exists; /* Whether the link info message exists */
+    hid_t               gid = (-1);   /* Group ID */
+    H5G_t *             grp = NULL;   /* Group opened */
+    H5G_loc_t           loc;          /* Location of group passed in */
+    H5G_loc_t           start_loc;    /* Location of starting group */
+    unsigned            rc;           /* Reference count of object    */
+    herr_t              ret_value;    /* Return value */
 
     /* Portably clear udata struct (before FUNC_ENTER) */
     HDmemset(&udata, 0, sizeof(udata));
@@ -1090,52 +1062,52 @@ H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Open the group to begin visiting within */
-    if((grp = H5G__open_name(&loc, group_name, lapl_id, dxpl_id)) == NULL)
+    if ((grp = H5G__open_name(&loc, group_name, lapl_id, dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
 
     /* Register an ID for the starting group */
-    if((gid = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+    if ((gid = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
     /* Get the location of the starting group */
-    if(H5G_loc(gid, &start_loc) < 0)
+    if (H5G_loc(gid, &start_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Set up user data */
-    udata.gid = gid;
+    udata.gid      = gid;
     udata.curr_loc = &start_loc;
-    udata.lapl_id = lapl_id;
-    udata.dxpl_id = dxpl_id;
+    udata.lapl_id  = lapl_id;
+    udata.dxpl_id  = dxpl_id;
     udata.idx_type = idx_type;
-    udata.order = order;
-    udata.op = op;
-    udata.op_data = op_data;
+    udata.order    = order;
+    udata.op       = op;
+    udata.op_data  = op_data;
 
     /* Allocate space for the path name */
-    if(NULL == (udata.path = H5MM_strdup("")))
+    if (NULL == (udata.path = H5MM_strdup("")))
         HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate path name buffer")
     udata.path_buf_size = 1;
     udata.curr_path_len = 0;
 
     /* Create skip list to store visited object information */
-    if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL)
+    if ((udata.visited = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
 
     /* Get the group's reference count */
-    if(H5O_get_rc_and_type(&grp->oloc, dxpl_id, &rc, NULL) < 0)
+    if (H5O_get_rc_and_type(&grp->oloc, dxpl_id, &rc, NULL) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object info")
 
     /* If its ref count is > 1, we add it to the list of visited objects */
     /* (because it could come up again during traversal) */
-    if(rc > 1) {
-        H5_obj_t *obj_pos;                  /* New object node for visited list */
+    if (rc > 1) {
+        H5_obj_t *obj_pos; /* New object node for visited list */
 
         /* Allocate new object "position" node */
-        if((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
+        if ((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate object node")
 
         /* Construct unique "position" for this object */
@@ -1143,18 +1115,18 @@ H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type,
         obj_pos->addr = grp->oloc.addr;
 
         /* Add to list of visited objects */
-        if(H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
+        if (H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert object node into visited list")
     } /* end if */
 
     /* Attempt to get the link info for this group */
-    if((linfo_exists = H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
+    if (linfo_exists) {
         /* Check for creation order tracking, if creation order index lookup requested */
-        if(idx_type == H5_INDEX_CRT_ORDER) {
+        if (idx_type == H5_INDEX_CRT_ORDER) {
             /* Check if creation order is tracked */
-            if(!linfo.track_corder)
+            if (!linfo.track_corder)
                 /* Switch to name order for this group */
                 idx_type = H5_INDEX_NAME;
         } /* end if */
@@ -1163,29 +1135,29 @@ H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     } /* end if */
     else {
         /* Can only perform name lookups on groups with symbol tables */
-        if(idx_type != H5_INDEX_NAME)
+        if (idx_type != H5_INDEX_NAME)
             /* Switch to name order for this group */
             idx_type = H5_INDEX_NAME;
     } /* end if */
 
     /* Call the link iteration routine */
-    if((ret_value = H5G__obj_iterate(&(grp->oloc), idx_type, order, (hsize_t)0, NULL, H5G_visit_cb, &udata, dxpl_id)) < 0)
+    if ((ret_value = H5G__obj_iterate(&(grp->oloc), idx_type, order, (hsize_t)0, NULL, H5G_visit_cb, &udata,
+                                      dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't visit links")
 
 done:
     /* Release user data resources */
     H5MM_xfree(udata.path);
-    if(udata.visited)
+    if (udata.visited)
         H5SL_destroy(udata.visited, H5G_free_visit_visited, NULL);
 
     /* Release the group opened */
-    if(gid > 0) {
-        if(H5I_dec_app_ref(gid) < 0)
+    if (gid > 0) {
+        if (H5I_dec_app_ref(gid) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
     } /* end if */
-    else if(grp && H5G_close(grp) < 0)
+    else if (grp && H5G_close(grp) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_visit() */
-
diff --git a/src/H5Glink.c b/src/H5Glink.c
index 255add0..5892516 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -26,37 +26,32 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5Iprivate.h"         /* IDs                                  */
-#include "H5Lprivate.h"		/* Links                                */
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Ppublic.h"		/* Property Lists                       */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5HLprivate.h" /* Local Heaps				*/
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5Lprivate.h"  /* Links                                */
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Ppublic.h"   /* Property Lists                       */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -66,23 +61,18 @@ static int H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2);
 static int H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2);
 static int H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_cmp_name_inc
  *
@@ -109,7 +99,6 @@ H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
     FUNC_LEAVE_NOAPI(HDstrcmp(((const H5O_link_t *)lnk1)->name, ((const H5O_link_t *)lnk2)->name))
 } /* end H5G_link_cmp_name_inc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_cmp_name_dec
  *
@@ -136,7 +125,6 @@ H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
     FUNC_LEAVE_NOAPI(HDstrcmp(((const H5O_link_t *)lnk2)->name, ((const H5O_link_t *)lnk1)->name))
 } /* end H5G_link_cmp_name_dec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_cmp_corder_inc
  *
@@ -157,13 +145,13 @@ H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
 static int
 H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
 {
-    int ret_value;              /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
+    if (((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
         ret_value = -1;
-    else if(((const H5O_link_t *)lnk1)->corder > ((const H5O_link_t *)lnk2)->corder)
+    else if (((const H5O_link_t *)lnk1)->corder > ((const H5O_link_t *)lnk2)->corder)
         ret_value = 1;
     else
         ret_value = 0;
@@ -171,7 +159,6 @@ H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_link_cmp_corder_inc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_cmp_corder_dec
  *
@@ -192,13 +179,13 @@ H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
 static int
 H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
 {
-    int ret_value;              /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
+    if (((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
         ret_value = 1;
-    else if(((const H5O_link_t *)lnk1)->corder > ((const H5O_link_t *)lnk2)->corder)
+    else if (((const H5O_link_t *)lnk1)->corder > ((const H5O_link_t *)lnk2)->corder)
         ret_value = -1;
     else
         ret_value = 0;
@@ -206,7 +193,6 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_link_cmp_corder_dec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__ent_to_link
  *
@@ -221,11 +207,10 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
-    const H5G_entry_t *ent, const char *name)
+H5G__ent_to_link(H5O_link_t *lnk, const H5HL_t *heap, const H5G_entry_t *ent, const char *name)
 {
-    hbool_t dup_soft = FALSE;           /* xstrdup the symbolic link name or not */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hbool_t dup_soft  = FALSE;   /* xstrdup the symbolic link name or not */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -236,21 +221,21 @@ H5G__ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
     HDassert(name);
 
     /* Set (default) common info for link */
-    lnk->cset = H5F_DEFAULT_CSET;
-    lnk->corder = 0;
-    lnk->corder_valid = FALSE;       /* Creation order not valid for this link */
-    if((lnk->name = H5MM_xstrdup(name)) == NULL)
+    lnk->cset         = H5F_DEFAULT_CSET;
+    lnk->corder       = 0;
+    lnk->corder_valid = FALSE; /* Creation order not valid for this link */
+    if ((lnk->name = H5MM_xstrdup(name)) == NULL)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to duplicate link name")
 
     /* Object is a symbolic or hard link */
-    if(ent->type == H5G_CACHED_SLINK) {
-        const char *s;          /* Pointer to link value */
+    if (ent->type == H5G_CACHED_SLINK) {
+        const char *s; /* Pointer to link value */
 
-        if((s = (const char *)H5HL_offset_into(heap, ent->cache.slink.lval_offset)) == NULL)
+        if ((s = (const char *)H5HL_offset_into(heap, ent->cache.slink.lval_offset)) == NULL)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to get symbolic link name")
 
         /* Copy the link value */
-        if((lnk->u.soft.name = H5MM_xstrdup(s)) == NULL)
+        if ((lnk->u.soft.name = H5MM_xstrdup(s)) == NULL)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to duplicate symbolic link name")
 
         dup_soft = TRUE;
@@ -267,16 +252,15 @@ H5G__ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
     } /* end else */
 
 done:
-    if(ret_value < 0) {
-        if(lnk->name)
+    if (ret_value < 0) {
+        if (lnk->name)
             H5MM_xfree(lnk->name);
-        if(ent->type == H5G_CACHED_SLINK && dup_soft)
+        if (ent->type == H5G_CACHED_SLINK && dup_soft)
             H5MM_xfree(lnk->u.soft.name);
     }
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__ent_to_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_to_info
  *
@@ -292,7 +276,7 @@ done:
 herr_t
 H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *info)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -300,13 +284,13 @@ H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *info)
     HDassert(lnk);
 
     /* Get information from the link */
-    if(info) {
-        info->cset = lnk->cset;
-        info->corder = lnk->corder;
+    if (info) {
+        info->cset         = lnk->cset;
+        info->corder       = lnk->corder;
         info->corder_valid = lnk->corder_valid;
-        info->type = lnk->type;
+        info->type         = lnk->type;
 
-        switch(lnk->type) {
+        switch (lnk->type) {
             case H5L_TYPE_HARD:
                 info->u.address = lnk->u.hard.addr;
                 break;
@@ -318,11 +302,10 @@ H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *info)
             case H5L_TYPE_ERROR:
             case H5L_TYPE_EXTERNAL:
             case H5L_TYPE_MAX:
-            default:
-            {
-                const H5L_class_t *link_class;      /* User-defined link class */
+            default: {
+                const H5L_class_t *link_class; /* User-defined link class */
 
-                if(lnk->type < H5L_TYPE_UD_MIN || lnk->type > H5L_TYPE_MAX)
+                if (lnk->type < H5L_TYPE_UD_MIN || lnk->type > H5L_TYPE_MAX)
                     HGOTO_ERROR(H5E_LINK, H5E_BADTYPE, FAIL, "unknown link class")
 
                 /* User-defined link; call its query function to get the link udata size. */
@@ -332,27 +315,29 @@ H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *info)
                  */
                 link_class = H5L_find_class(lnk->type);
 
-                if(link_class != NULL && link_class->query_func != NULL) {
-                    ssize_t cb_ret;             /* Return value from UD callback */
+                if (link_class != NULL && link_class->query_func != NULL) {
+                    ssize_t cb_ret; /* Return value from UD callback */
 
                     /* Call the link's query routine to retrieve the user-defined link's value size */
-                    /* (in case the query routine packs/unpacks the link value in some way that changes its size) */
-                    if((cb_ret = (link_class->query_func)(lnk->name, lnk->u.ud.udata, lnk->u.ud.size, NULL, (size_t)0)) < 0)
-                        HGOTO_ERROR(H5E_LINK, H5E_CALLBACK, FAIL, "query buffer size callback returned failure")
+                    /* (in case the query routine packs/unpacks the link value in some way that changes its
+                     * size) */
+                    if ((cb_ret = (link_class->query_func)(lnk->name, lnk->u.ud.udata, lnk->u.ud.size, NULL,
+                                                           (size_t)0)) < 0)
+                        HGOTO_ERROR(H5E_LINK, H5E_CALLBACK, FAIL,
+                                    "query buffer size callback returned failure")
 
                     info->u.val_size = (size_t)cb_ret;
                 } /* end if */
                 else
                     info->u.val_size = 0;
             } /* end case */
-        } /* end switch */
-    } /* end if */
+        }     /* end switch */
+    }         /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_link_to_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__link_to_loc
  *
@@ -366,10 +351,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
-    H5G_loc_t *obj_loc)
+H5G__link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk, H5G_loc_t *obj_loc)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -383,24 +367,23 @@ H5G__link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
      */
 
     /* Check for unknown library-internal link */
-    if(lnk->type > H5L_TYPE_BUILTIN_MAX && lnk->type < H5L_TYPE_UD_MIN)
+    if (lnk->type > H5L_TYPE_BUILTIN_MAX && lnk->type < H5L_TYPE_UD_MIN)
         HGOTO_ERROR(H5E_SYM, H5E_UNSUPPORTED, FAIL, "unknown link type")
 
     /* Build object's group hier. location */
-    if(H5G_name_set(grp_loc->path, obj_loc->path, lnk->name) < 0)
+    if (H5G_name_set(grp_loc->path, obj_loc->path, lnk->name) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot set name")
 
     /* Set the object location, if it's a hard link set the address also */
-    obj_loc->oloc->file = grp_loc->oloc->file;
+    obj_loc->oloc->file         = grp_loc->oloc->file;
     obj_loc->oloc->holding_file = FALSE;
-    if(lnk->type == H5L_TYPE_HARD)
+    if (lnk->type == H5L_TYPE_HARD)
         obj_loc->oloc->addr = lnk->u.hard.addr;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__link_to_loc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__link_sort_table
  *
@@ -415,8 +398,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
-    H5_iter_order_t order)
+H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type, H5_iter_order_t order)
 {
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -424,19 +406,19 @@ H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
     HDassert(ltable);
 
     /* Pick appropriate sorting routine */
-    if(idx_type == H5_INDEX_NAME) {
-        if(order == H5_ITER_INC)
+    if (idx_type == H5_INDEX_NAME) {
+        if (order == H5_ITER_INC)
             HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G_link_cmp_name_inc);
-        else if(order == H5_ITER_DEC)
+        else if (order == H5_ITER_DEC)
             HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G_link_cmp_name_dec);
         else
             HDassert(order == H5_ITER_NATIVE);
     } /* end if */
     else {
         HDassert(idx_type == H5_INDEX_CRT_ORDER);
-        if(order == H5_ITER_INC)
+        if (order == H5_ITER_INC)
             HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G_link_cmp_corder_inc);
-        else if(order == H5_ITER_DEC)
+        else if (order == H5_ITER_DEC)
             HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G_link_cmp_corder_dec);
         else
             HDassert(order == H5_ITER_NATIVE);
@@ -445,7 +427,6 @@ H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G__link_sort_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__link_iterate_table
  *
@@ -461,11 +442,11 @@ H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
-    hsize_t *last_lnk, const H5G_lib_iterate_t op, void *op_data)
+H5G__link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip, hsize_t *last_lnk,
+                        const H5G_lib_iterate_t op, void *op_data)
 {
-    size_t u;                           /* Local index variable */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    size_t u;                        /* Local index variable */
+    herr_t ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -474,28 +455,27 @@ H5G__link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
     HDassert(op);
 
     /* Skip over links, if requested */
-    if(last_lnk)
+    if (last_lnk)
         *last_lnk += skip;
 
     /* Iterate over link messages */
     H5_CHECKED_ASSIGN(u, size_t, skip, hsize_t)
-    for(; u < ltable->nlinks && !ret_value; u++) {
+    for (; u < ltable->nlinks && !ret_value; u++) {
         /* Make the callback */
         ret_value = (op)(&(ltable->lnks[u]), op_data);
 
         /* Increment the number of entries passed through */
-        if(last_lnk)
+        if (last_lnk)
             (*last_lnk)++;
     } /* end for */
 
     /* Check for callback failure and pass along return value */
-    if(ret_value < 0)
+    if (ret_value < 0)
         HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__link_iterate_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__link_release_table
  *
@@ -512,8 +492,8 @@ H5G__link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
 herr_t
 H5G__link_release_table(H5G_link_table_t *ltable)
 {
-    size_t      u;                      /* Local index variable */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    size_t u;                   /* Local index variable */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -521,10 +501,10 @@ H5G__link_release_table(H5G_link_table_t *ltable)
     HDassert(ltable);
 
     /* Release link info, if any */
-    if(ltable->nlinks > 0) {
+    if (ltable->nlinks > 0) {
         /* Free link message information */
-        for(u = 0; u < ltable->nlinks; u++)
-            if(H5O_msg_reset(H5O_LINK_ID, &(ltable->lnks[u])) < 0)
+        for (u = 0; u < ltable->nlinks; u++)
+            if (H5O_msg_reset(H5O_LINK_ID, &(ltable->lnks[u])) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link message")
 
         /* Free table of links */
@@ -537,7 +517,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__link_release_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__link_name_replace
  *
@@ -553,11 +532,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__link_name_replace(H5F_t *file, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
-    const H5O_link_t *lnk)
+H5G__link_name_replace(H5F_t *file, hid_t dxpl_id, H5RS_str_t *grp_full_path_r, const H5O_link_t *lnk)
 {
-    H5RS_str_t *obj_path_r = NULL;      /* Full path for link being removed */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5RS_str_t *obj_path_r = NULL;    /* Full path for link being removed */
+    herr_t      ret_value  = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -565,16 +543,15 @@ H5G__link_name_replace(H5F_t *file, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
     HDassert(file);
 
     /* Search the open IDs and replace names for unlinked object */
-    if(grp_full_path_r) {
+    if (grp_full_path_r) {
         obj_path_r = H5G_build_fullpath_refstr_str(grp_full_path_r, lnk->name);
-        if(H5G_name_replace(lnk, H5G_NAME_DELETE, file, obj_path_r, NULL, NULL, dxpl_id) < 0)
+        if (H5G_name_replace(lnk, H5G_NAME_DELETE, file, obj_path_r, NULL, NULL, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to replace name")
     } /* end if */
 
 done:
-    if(obj_path_r)
+    if (obj_path_r)
         H5RS_decr(obj_path_r);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__link_name_replace() */
-
diff --git a/src/H5Gloc.c b/src/H5Gloc.c
index 1f0f157..066590c 100644
--- a/src/H5Gloc.c
+++ b/src/H5Gloc.c
@@ -26,26 +26,23 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Aprivate.h"		/* Attributes				*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Lprivate.h"		/* Links				*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Aprivate.h" /* Attributes				*/
+#include "H5Dprivate.h" /* Datasets				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Gpkg.h"     /* Groups		  		*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Lprivate.h" /* Links				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -53,43 +50,43 @@
 /* User data for looking up an object in a group */
 typedef struct {
     /* upward */
-    H5G_loc_t  *loc;            /* Group location to set */
+    H5G_loc_t *loc; /* Group location to set */
 } H5G_loc_fnd_t;
 
 /* User data for checking if an object exists */
 typedef struct {
     /* upward */
-    htri_t exists;              /* Whether the object exists */
+    htri_t exists; /* Whether the object exists */
 } H5G_loc_exists_t;
 
 /* User data for looking up an object in a group by index */
 typedef struct {
     /* downward */
-    hid_t lapl_id;              /* LAPL to use for operation */
-    hid_t dxpl_id;              /* DXPL to use for operation */
-    H5_index_t idx_type;        /* Index to use */
-    H5_iter_order_t order;      /* Iteration order within index */
-    hsize_t n;                  /* Offset within index */
+    hid_t           lapl_id;  /* LAPL to use for operation */
+    hid_t           dxpl_id;  /* DXPL to use for operation */
+    H5_index_t      idx_type; /* Index to use */
+    H5_iter_order_t order;    /* Iteration order within index */
+    hsize_t         n;        /* Offset within index */
 
     /* upward */
-    H5G_loc_t  *loc;            /* Group location to set */
+    H5G_loc_t *loc; /* Group location to set */
 } H5G_loc_fbi_t;
 
 /* User data for getting an object's info in a group */
 typedef struct {
     /* downward */
-    hid_t dxpl_id;              /* DXPL to use for operation */
-    hbool_t want_ih_info;       /* Whether to retrieve the index & heap info */
+    hid_t   dxpl_id;      /* DXPL to use for operation */
+    hbool_t want_ih_info; /* Whether to retrieve the index & heap info */
 
     /* upward */
-    H5O_info_t  *oinfo;         /* Object information to retrieve */
+    H5O_info_t *oinfo; /* Object information to retrieve */
 } H5G_loc_info_t;
 
 /* User data for setting an object's comment in a group */
 typedef struct {
     /* downward */
-    hid_t dxpl_id;              /* DXPL to use for operation */
-    const char *comment;        /* Object comment buffer */
+    hid_t       dxpl_id; /* DXPL to use for operation */
+    const char *comment; /* Object comment buffer */
 
     /* upward */
 } H5G_loc_sc_t;
@@ -97,50 +94,40 @@ typedef struct {
 /* User data for getting an object's comment in a group */
 typedef struct {
     /* downward */
-    hid_t dxpl_id;              /* DXPL to use for operation */
-    char  *comment;             /* Object comment buffer */
-    size_t bufsize;             /* Size of object comment buffer */
+    hid_t  dxpl_id; /* DXPL to use for operation */
+    char * comment; /* Object comment buffer */
+    size_t bufsize; /* Size of object comment buffer */
 
     /* upward */
-    ssize_t comment_size;       /* Actual size of object comment */
+    ssize_t comment_size; /* Actual size of object comment */
 } H5G_loc_gc_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Group traversal callbacks */
-static herr_t H5G_loc_find_cb(H5G_loc_t *grp_loc, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata,
-    H5G_own_loc_t *own_loc);
-static herr_t H5G_loc_find_by_idx_cb(H5G_loc_t *grp_loc, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata,
-    H5G_own_loc_t *own_loc);
-static herr_t H5G_loc_set_comment_cb(H5G_loc_t *grp_loc, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata,
-    H5G_own_loc_t *own_loc);
-static herr_t H5G_loc_get_comment_cb(H5G_loc_t *grp_loc, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata,
-    H5G_own_loc_t *own_loc);
-
+static herr_t H5G_loc_find_cb(H5G_loc_t *grp_loc, const char *name, const H5O_link_t *lnk, H5G_loc_t *obj_loc,
+                              void *_udata, H5G_own_loc_t *own_loc);
+static herr_t H5G_loc_find_by_idx_cb(H5G_loc_t *grp_loc, const char *name, const H5O_link_t *lnk,
+                                     H5G_loc_t *obj_loc, void *_udata, H5G_own_loc_t *own_loc);
+static herr_t H5G_loc_set_comment_cb(H5G_loc_t *grp_loc, const char *name, const H5O_link_t *lnk,
+                                     H5G_loc_t *obj_loc, void *_udata, H5G_own_loc_t *own_loc);
+static herr_t H5G_loc_get_comment_cb(H5G_loc_t *grp_loc, const char *name, const H5O_link_t *lnk,
+                                     H5G_loc_t *obj_loc, void *_udata, H5G_own_loc_t *own_loc);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc
  *
@@ -157,24 +144,23 @@ static herr_t H5G_loc_get_comment_cb(H5G_loc_t *grp_loc, const char *name,
 herr_t
 H5G_loc(hid_t loc_id, H5G_loc_t *loc)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    switch(H5I_get_type(loc_id)) {
-        case H5I_FILE:
-            {
-                H5F_t	*f;
+    switch (H5I_get_type(loc_id)) {
+        case H5I_FILE: {
+            H5F_t *f;
 
-                /* Get the file struct */
-                if(NULL == (f = (H5F_t *)H5I_object(loc_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file ID")
+            /* Get the file struct */
+            if (NULL == (f = (H5F_t *)H5I_object(loc_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file ID")
 
-                /* Construct a group location for root group of the file */
-                if(H5G_root_loc(f, loc) < 0)
-                    HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unable to create location for file")
-            } /* end case */
-            break;
+            /* Construct a group location for root group of the file */
+            if (H5G_root_loc(f, loc) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unable to create location for file")
+        } /* end case */
+        break;
 
         case H5I_GENPROP_CLS:
         case H5I_GENPROP_LST:
@@ -183,62 +169,59 @@ H5G_loc(hid_t loc_id, H5G_loc_t *loc)
         case H5I_ERROR_CLASS:
         case H5I_ERROR_MSG:
         case H5I_ERROR_STACK:
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get group location of error class, message or stack")
-
-        case H5I_GROUP:
-            {
-                H5G_t	*group;
-
-                if(NULL == (group = (H5G_t *)H5I_object(loc_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid group ID")
-                if(NULL == (loc->oloc = H5G_oloc(group)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location of group")
-                if(NULL == (loc->path = H5G_nameof(group)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path of group")
-            } /* end case */
-            break;
-
-        case H5I_DATATYPE:
-            {
-                H5T_t	*dt;
-
-                if(NULL == (dt = (H5T_t *)H5I_object(loc_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid type ID")
-                if(NULL == (loc->oloc = H5T_oloc(dt)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location of datatype")
-                if(NULL == (loc->path = H5T_nameof(dt)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path of datatype")
-            } /* end case */
-            break;
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "unable to get group location of error class, message or stack")
+
+        case H5I_GROUP: {
+            H5G_t *group;
+
+            if (NULL == (group = (H5G_t *)H5I_object(loc_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid group ID")
+            if (NULL == (loc->oloc = H5G_oloc(group)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location of group")
+            if (NULL == (loc->path = H5G_nameof(group)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path of group")
+        } /* end case */
+        break;
+
+        case H5I_DATATYPE: {
+            H5T_t *dt;
+
+            if (NULL == (dt = (H5T_t *)H5I_object(loc_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid type ID")
+            if (NULL == (loc->oloc = H5T_oloc(dt)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location of datatype")
+            if (NULL == (loc->path = H5T_nameof(dt)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path of datatype")
+        } /* end case */
+        break;
 
         case H5I_DATASPACE:
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get group location of dataspace")
 
-        case H5I_DATASET:
-            {
-                H5D_t	*dset;
-
-                if(NULL == (dset = (H5D_t *)H5I_object(loc_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid data ID")
-                if(NULL == (loc->oloc = H5D_oloc(dset)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location of dataset")
-                if(NULL == (loc->path = H5D_nameof(dset)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path of dataset")
-            } /* end case */
-            break;
-
-        case H5I_ATTR:
-            {
-                H5A_t	*attr;
-
-                if(NULL == (attr = (H5A_t *)H5I_object(loc_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid attribute ID")
-                if(NULL == (loc->oloc = H5A_oloc(attr)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location of attribute")
-                if(NULL == (loc->path = H5A_nameof(attr)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path of attribute")
-            } /* end case */
-            break;
+        case H5I_DATASET: {
+            H5D_t *dset;
+
+            if (NULL == (dset = (H5D_t *)H5I_object(loc_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid data ID")
+            if (NULL == (loc->oloc = H5D_oloc(dset)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location of dataset")
+            if (NULL == (loc->path = H5D_nameof(dset)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path of dataset")
+        } /* end case */
+        break;
+
+        case H5I_ATTR: {
+            H5A_t *attr;
+
+            if (NULL == (attr = (H5A_t *)H5I_object(loc_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid attribute ID")
+            if (NULL == (loc->oloc = H5A_oloc(attr)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location of attribute")
+            if (NULL == (loc->path = H5A_nameof(attr)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path of attribute")
+        } /* end case */
+        break;
 
         case H5I_REFERENCE:
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get group location of reference")
@@ -255,7 +238,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__loc_copy
  *
@@ -271,7 +253,7 @@ done:
 herr_t
 H5G__loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -280,16 +262,15 @@ H5G__loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth)
     HDassert(src);
 
     /* Copy components of the location */
-    if(H5O_loc_copy(dst->oloc, src->oloc, depth) < 0)
+    if (H5O_loc_copy(dst->oloc, src->oloc, depth) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to copy entry")
-    if(H5G_name_copy(dst->path, src->path, depth) < 0)
+    if (H5G_name_copy(dst->path, src->path, depth) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to copy path")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__loc_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_reset
  *
@@ -305,7 +286,7 @@ done:
 herr_t
 H5G_loc_reset(H5G_loc_t *loc)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -313,16 +294,15 @@ H5G_loc_reset(H5G_loc_t *loc)
     HDassert(loc);
 
     /* Reset components of the location */
-    if(H5O_loc_reset(loc->oloc) < 0)
+    if (H5O_loc_reset(loc->oloc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to reset entry")
-    if(H5G_name_reset(loc->path) < 0)
+    if (H5G_name_reset(loc->path) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to reset path")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_free
  *
@@ -338,7 +318,7 @@ done:
 herr_t
 H5G_loc_free(H5G_loc_t *loc)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -346,16 +326,15 @@ H5G_loc_free(H5G_loc_t *loc)
     HDassert(loc);
 
     /* Reset components of the location */
-    if(H5G_name_free(loc->path) < 0)
+    if (H5G_name_free(loc->path) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to free path")
-    if(H5O_loc_free(loc->oloc) < 0)
+    if (H5O_loc_free(loc->oloc) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "unable to free object header location")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_find_cb
  *
@@ -369,17 +348,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_loc_find_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5G_loc_find_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char *name,
+                const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                H5G_own_loc_t *own_loc /*out*/)
 {
-    H5G_loc_fnd_t *udata = (H5G_loc_fnd_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_fnd_t *udata     = (H5G_loc_fnd_t *)_udata; /* User data passed in */
+    herr_t         ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid object */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object '%s' doesn't exist", name)
 
     /* Take ownership of the object's group location */
@@ -393,7 +372,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_find_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_find
  *
@@ -407,11 +385,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_loc_find(const H5G_loc_t *loc, const char *name, H5G_loc_t *obj_loc/*out*/,
-    hid_t lapl_id, hid_t dxpl_id)
+H5G_loc_find(const H5G_loc_t *loc, const char *name, H5G_loc_t *obj_loc /*out*/, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_loc_fnd_t udata;                /* User data for traversal callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_fnd_t udata;               /* User data for traversal callback */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -424,14 +401,13 @@ H5G_loc_find(const H5G_loc_t *loc, const char *name, H5G_loc_t *obj_loc/*out*/,
     udata.loc = obj_loc;
 
     /* Traverse group hierarchy to locate object */
-    if(H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_loc_find_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_loc_find_cb, &udata, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't find object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_find() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_find_by_idx_cb
  *
@@ -446,49 +422,50 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_loc_find_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5G_loc_find_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                       const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                       H5G_own_loc_t *own_loc /*out*/)
 {
-    H5G_loc_fbi_t *udata = (H5G_loc_fbi_t *)_udata;   /* User data passed in */
-    H5O_link_t fnd_lnk;                 /* Link within group */
-    hbool_t lnk_copied = FALSE;         /* Whether the link was copied */
-    size_t links_left = H5L_NUM_LINKS;  /* # of links left to traverse */
-    hbool_t obj_loc_valid = FALSE;      /* Flag to indicate that the object location is valid */
-    hbool_t obj_exists = FALSE;         /* Whether the object exists (unused) */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_fbi_t *udata = (H5G_loc_fbi_t *)_udata; /* User data passed in */
+    H5O_link_t     fnd_lnk;                         /* Link within group */
+    hbool_t        lnk_copied    = FALSE;           /* Whether the link was copied */
+    size_t         links_left    = H5L_NUM_LINKS;   /* # of links left to traverse */
+    hbool_t        obj_loc_valid = FALSE;           /* Flag to indicate that the object location is valid */
+    hbool_t        obj_exists    = FALSE;           /* Whether the object exists (unused) */
+    herr_t         ret_value     = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group doesn't exist")
 
     /* Query link */
-    if(H5G_obj_lookup_by_idx(obj_loc->oloc, udata->idx_type, udata->order,
-                udata->n, &fnd_lnk, udata->dxpl_id) < 0)
+    if (H5G_obj_lookup_by_idx(obj_loc->oloc, udata->idx_type, udata->order, udata->n, &fnd_lnk,
+                              udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "link not found")
     lnk_copied = TRUE;
 
     /* Build the initial object location for the link */
-    if(H5G__link_to_loc(obj_loc, &fnd_lnk, udata->loc) < 0)
+    if (H5G__link_to_loc(obj_loc, &fnd_lnk, udata->loc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot initialize object location")
     obj_loc_valid = TRUE;
 
     /* Perform any special traversals that the link needs */
     /* (soft links, user-defined links, file mounting, etc.) */
     /* (may modify the object location) */
-    if(H5G__traverse_special(obj_loc, &fnd_lnk, H5G_TARGET_NORMAL, &links_left, TRUE, udata->loc, &obj_exists, udata->lapl_id, udata->dxpl_id) < 0)
+    if (H5G__traverse_special(obj_loc, &fnd_lnk, H5G_TARGET_NORMAL, &links_left, TRUE, udata->loc,
+                              &obj_exists, udata->lapl_id, udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_TRAVERSE, FAIL, "special link traversal failed")
 
 done:
     /* Reset the link information, if we have a copy */
-    if(lnk_copied)
+    if (lnk_copied)
         H5O_msg_reset(H5O_LINK_ID, &fnd_lnk);
 
     /* Release the object location if we failed after copying it */
-    if(ret_value < 0 && obj_loc_valid)
-        if(H5G_loc_free(udata->loc) < 0)
+    if (ret_value < 0 && obj_loc_valid)
+        if (H5G_loc_free(udata->loc) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
 
     /* Indicate that this callback didn't take ownership of the group *
@@ -498,7 +475,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_find_by_idx_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_find_by_idx
  *
@@ -512,12 +488,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_loc_find_by_idx(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, H5G_loc_t *obj_loc/*out*/, hid_t lapl_id,
-    hid_t dxpl_id)
+H5G_loc_find_by_idx(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                    hsize_t n, H5G_loc_t *obj_loc /*out*/, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_loc_fbi_t udata;                /* User data for traversal callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_fbi_t udata;               /* User data for traversal callback */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -527,22 +502,22 @@ H5G_loc_find_by_idx(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type,
     HDassert(obj_loc);
 
     /* Set up user data for locating object */
-    udata.dxpl_id = dxpl_id;
-    udata.lapl_id = lapl_id;
+    udata.dxpl_id  = dxpl_id;
+    udata.lapl_id  = lapl_id;
     udata.idx_type = idx_type;
-    udata.order = order;
-    udata.n = n;
-    udata.loc = obj_loc;
+    udata.order    = order;
+    udata.n        = n;
+    udata.loc      = obj_loc;
 
     /* Traverse group hierarchy to locate object */
-    if(H5G_traverse(loc, group_name, H5G_TARGET_NORMAL, H5G_loc_find_by_idx_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, group_name, H5G_TARGET_NORMAL, H5G_loc_find_by_idx_cb, &udata, lapl_id, dxpl_id) <
+        0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't find object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_find_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__loc_insert
  *
@@ -556,11 +531,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc,
-    H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id)
+H5G__loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc, H5O_type_t obj_type,
+                const void *crt_info, hid_t dxpl_id)
 {
-    H5O_link_t  lnk;                    /* Link for object to insert */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_link_t lnk;                 /* Link for object to insert */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -570,28 +545,26 @@ H5G__loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc,
     HDassert(obj_loc);
 
     /* Create link object for the object location */
-    lnk.type = H5L_TYPE_HARD;
-    lnk.cset = H5F_DEFAULT_CSET;
-    lnk.corder = 0;     /* Will be reset if the group is tracking creation order */
-    lnk.corder_valid = FALSE;   /* Indicate that the creation order isn't valid (yet) */
+    lnk.type         = H5L_TYPE_HARD;
+    lnk.cset         = H5F_DEFAULT_CSET;
+    lnk.corder       = 0;     /* Will be reset if the group is tracking creation order */
+    lnk.corder_valid = FALSE; /* Indicate that the creation order isn't valid (yet) */
     /* Casting away const OK -QAK */
-    lnk.name = (char *)name;
+    lnk.name        = (char *)name;
     lnk.u.hard.addr = obj_loc->oloc->addr;
 
     /* Insert new group into current group's symbol table */
-    if(H5G_obj_insert(grp_loc->oloc, name, &lnk, TRUE, obj_type, crt_info,
-            dxpl_id) < 0)
+    if (H5G_obj_insert(grp_loc->oloc, name, &lnk, TRUE, obj_type, crt_info, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert object")
 
     /* Set the name of the object location */
-    if(H5G_name_set(grp_loc->path, obj_loc->path, name) < 0)
-       HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot set name")
+    if (H5G_name_set(grp_loc->path, obj_loc->path, name) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot set name")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__loc_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_exists_cb
  *
@@ -605,17 +578,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_loc_exists_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5G_loc_exists_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                  const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                  H5G_own_loc_t *own_loc /*out*/)
 {
-    H5G_loc_exists_t *udata = (H5G_loc_exists_t *)_udata;   /* User data passed in */
+    H5G_loc_exists_t *udata = (H5G_loc_exists_t *)_udata; /* User data passed in */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check if the name in this group resolved to a valid object */
-    if(obj_loc == NULL)
-        if(lnk)
+    if (obj_loc == NULL)
+        if (lnk)
             udata->exists = FALSE;
         else
             udata->exists = FAIL;
@@ -629,7 +602,6 @@ H5G_loc_exists_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UN
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_loc_exists_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_exists
  *
@@ -647,7 +619,7 @@ htri_t
 H5G_loc_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id)
 {
     H5G_loc_exists_t udata;     /* User data for traversal callback */
-    htri_t ret_value;           /* Return value */
+    htri_t           ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -659,7 +631,7 @@ H5G_loc_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl
     udata.exists = FALSE;
 
     /* Traverse group hierarchy to locate object */
-    if(H5G_traverse(loc, name, H5G_TARGET_EXISTS, H5G_loc_exists_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, name, H5G_TARGET_EXISTS, H5G_loc_exists_cb, &udata, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't check if object exists")
 
     /* Set return value */
@@ -669,7 +641,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_exists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_info_cb
  *
@@ -683,20 +654,21 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_loc_info_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name, const H5O_link_t H5_ATTR_UNUSED *lnk,
-    H5G_loc_t *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/)
+H5G_loc_info_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                H5G_own_loc_t *own_loc /*out*/)
 {
-    H5G_loc_info_t *udata = (H5G_loc_info_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_info_t *udata     = (H5G_loc_info_t *)_udata; /* User data passed in */
+    herr_t          ret_value = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
     /* Query object information */
-    if(H5O_get_info(obj_loc->oloc, udata->dxpl_id, udata->want_ih_info, udata->oinfo) < 0)
+    if (H5O_get_info(obj_loc->oloc, udata->dxpl_id, udata->want_ih_info, udata->oinfo) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object info")
 
 done:
@@ -707,7 +679,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_info_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_info
  *
@@ -722,11 +693,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_loc_info(H5G_loc_t *loc, const char *name, hbool_t want_ih_info, H5O_info_t *oinfo/*out*/,
-    hid_t lapl_id, hid_t dxpl_id)
+H5G_loc_info(H5G_loc_t *loc, const char *name, hbool_t want_ih_info, H5O_info_t *oinfo /*out*/, hid_t lapl_id,
+             hid_t dxpl_id)
 {
     H5G_loc_info_t udata;               /* User data for traversal callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -736,19 +707,18 @@ H5G_loc_info(H5G_loc_t *loc, const char *name, hbool_t want_ih_info, H5O_info_t
     HDassert(oinfo);
 
     /* Set up user data for locating object */
-    udata.dxpl_id = dxpl_id;
+    udata.dxpl_id      = dxpl_id;
     udata.want_ih_info = want_ih_info;
-    udata.oinfo = oinfo;
+    udata.oinfo        = oinfo;
 
     /* Traverse group hierarchy to locate object */
-    if(H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_loc_info_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_loc_info_cb, &udata, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't find object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_set_comment_cb
  *
@@ -762,35 +732,37 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_loc_set_comment_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name, const H5O_link_t H5_ATTR_UNUSED *lnk,
-    H5G_loc_t *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/)
+H5G_loc_set_comment_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                       const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                       H5G_own_loc_t *own_loc /*out*/)
 {
-    H5G_loc_sc_t *udata = (H5G_loc_sc_t *)_udata;   /* User data passed in */
-    H5O_name_t comment;                 /* Object header "comment" message */
-    htri_t exists;                      /* Whether a "comment" message already exists */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_sc_t *udata = (H5G_loc_sc_t *)_udata; /* User data passed in */
+    H5O_name_t    comment;                        /* Object header "comment" message */
+    htri_t        exists;                         /* Whether a "comment" message already exists */
+    herr_t        ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
     /* Check for existing comment message */
-    if((exists = H5O_msg_exists(obj_loc->oloc, H5O_NAME_ID, udata->dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read object header")
+    if ((exists = H5O_msg_exists(obj_loc->oloc, H5O_NAME_ID, udata->dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read object header")
 
     /* Remove the previous comment message if any */
-    if(exists)
-        if(H5O_msg_remove(obj_loc->oloc, H5O_NAME_ID, 0, TRUE, udata->dxpl_id) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete existing comment object header message")
+    if (exists)
+        if (H5O_msg_remove(obj_loc->oloc, H5O_NAME_ID, 0, TRUE, udata->dxpl_id) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL,
+                        "unable to delete existing comment object header message")
 
     /* Add the new message */
-    if(udata->comment && *udata->comment) {
+    if (udata->comment && *udata->comment) {
         /* Casting away const OK -QAK */
-	comment.s = (char *)udata->comment;
-	if(H5O_msg_create(obj_loc->oloc, H5O_NAME_ID, 0, H5O_UPDATE_TIME, &comment, udata->dxpl_id) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to set comment object header message")
+        comment.s = (char *)udata->comment;
+        if (H5O_msg_create(obj_loc->oloc, H5O_NAME_ID, 0, H5O_UPDATE_TIME, &comment, udata->dxpl_id) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to set comment object header message")
     } /* end if */
 
 done:
@@ -801,7 +773,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_set_comment_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_set_comment
  *
@@ -816,11 +787,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_loc_set_comment(H5G_loc_t *loc, const char *name, const char *comment,
-    hid_t lapl_id, hid_t dxpl_id)
+H5G_loc_set_comment(H5G_loc_t *loc, const char *name, const char *comment, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_loc_sc_t udata;         /* User data for traversal callback */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5G_loc_sc_t udata;               /* User data for traversal callback */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -833,14 +803,13 @@ H5G_loc_set_comment(H5G_loc_t *loc, const char *name, const char *comment,
     udata.comment = comment;
 
     /* Traverse group hierarchy to locate object */
-    if(H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_loc_set_comment_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_loc_set_comment_cb, &udata, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't find object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_set_comment() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_get_comment_cb
  *
@@ -854,30 +823,32 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_loc_get_comment_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name, const H5O_link_t H5_ATTR_UNUSED *lnk,
-    H5G_loc_t *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/)
+H5G_loc_get_comment_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                       const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                       H5G_own_loc_t *own_loc /*out*/)
 {
-    H5G_loc_gc_t *udata = (H5G_loc_gc_t *)_udata;   /* User data passed in */
-    H5O_name_t comment;                 /* Object header "comment" message */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_gc_t *udata = (H5G_loc_gc_t *)_udata; /* User data passed in */
+    H5O_name_t    comment;                        /* Object header "comment" message */
+    herr_t        ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
     /* Query object comment */
     comment.s = NULL;
-    if(NULL == H5O_msg_read(obj_loc->oloc, H5O_NAME_ID, &comment, udata->dxpl_id)) {
-	if(udata->comment && udata->bufsize > 0)
+    if (NULL == H5O_msg_read(obj_loc->oloc, H5O_NAME_ID, &comment, udata->dxpl_id)) {
+        if (udata->comment && udata->bufsize > 0)
             udata->comment[0] = '\0';
-	udata->comment_size = 0;
-    } else {
-        if(udata->comment && udata->bufsize)
-	   HDstrncpy(udata->comment, comment.s, udata->bufsize);
-	udata->comment_size = (ssize_t)HDstrlen(comment.s);
-	H5O_msg_reset(H5O_NAME_ID, &comment);
+        udata->comment_size = 0;
+    }
+    else {
+        if (udata->comment && udata->bufsize)
+            HDstrncpy(udata->comment, comment.s, udata->bufsize);
+        udata->comment_size = (ssize_t)HDstrlen(comment.s);
+        H5O_msg_reset(H5O_NAME_ID, &comment);
     } /* end else */
 
 done:
@@ -888,7 +859,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_get_comment_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_loc_get_comment
  *
@@ -907,11 +877,11 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5G_loc_get_comment(H5G_loc_t *loc, const char *name, char *comment/*out*/,
-    size_t bufsize, hid_t lapl_id, hid_t dxpl_id)
+H5G_loc_get_comment(H5G_loc_t *loc, const char *name, char *comment /*out*/, size_t bufsize, hid_t lapl_id,
+                    hid_t dxpl_id)
 {
-    H5G_loc_gc_t udata;         /* User data for traversal callback */
-    ssize_t ret_value;          /* Return value */
+    H5G_loc_gc_t udata;     /* User data for traversal callback */
+    ssize_t      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -920,13 +890,13 @@ H5G_loc_get_comment(H5G_loc_t *loc, const char *name, char *comment/*out*/,
     HDassert(name && *name);
 
     /* Set up user data for locating object */
-    udata.dxpl_id = dxpl_id;
-    udata.comment = comment;
-    udata.bufsize = bufsize;
+    udata.dxpl_id      = dxpl_id;
+    udata.comment      = comment;
+    udata.bufsize      = bufsize;
     udata.comment_size = (-1);
 
     /* Traverse group hierarchy to locate object */
-    if(H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_loc_get_comment_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_loc_get_comment_cb, &udata, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't find object")
 
     /* Set the return value */
@@ -935,4 +905,3 @@ H5G_loc_get_comment(H5G_loc_t *loc, const char *name, char *comment/*out*/,
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_loc_get_comment() */
-
diff --git a/src/H5Gname.c b/src/H5Gname.c
index 6db4b48..5f8c2d8 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -26,70 +26,65 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Lprivate.h"		/* Links                                */
-#include "H5MMprivate.h"	/* Memory wrappers			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Lprivate.h"  /* Links                                */
+#include "H5MMprivate.h" /* Memory wrappers			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Struct used by change name callback function */
 typedef struct H5G_names_t {
-    H5G_names_op_t op;                  /* Operation performed on file */
-    H5F_t       *src_file;              /* Top file in src location's mounted file hier. */
-    H5RS_str_t  *src_full_path_r;       /* Source location's full path */
-    H5F_t       *dst_file;              /* Destination location's file */
-    H5RS_str_t  *dst_full_path_r;       /* Destination location's full path */
+    H5G_names_op_t op;              /* Operation performed on file */
+    H5F_t *        src_file;        /* Top file in src location's mounted file hier. */
+    H5RS_str_t *   src_full_path_r; /* Source location's full path */
+    H5F_t *        dst_file;        /* Destination location's file */
+    H5RS_str_t *   dst_full_path_r; /* Destination location's full path */
 } H5G_names_t;
 
 /* Info to pass to the iteration function when building name */
 typedef struct H5G_gnba_iter_t {
     /* In */
-    const H5O_loc_t *loc; 	/* The location of the object we're looking for */
-    hid_t lapl_id; 		/* LAPL for operations */
-    hid_t dxpl_id; 		/* DXPL for operations */
+    const H5O_loc_t *loc;     /* The location of the object we're looking for */
+    hid_t            lapl_id; /* LAPL for operations */
+    hid_t            dxpl_id; /* DXPL for operations */
 
     /* Out */
-    char *path;                 /* Name of the object */
+    char *path; /* Name of the object */
 } H5G_gnba_iter_t;
 
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static htri_t H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r);
+static htri_t      H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r);
 static H5RS_str_t *H5G_build_fullpath(const char *prefix, const char *name);
 #ifdef NOT_YET
 static H5RS_str_t *H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *name_r);
 #endif /* NOT_YET */
-static herr_t H5G_name_move_path(H5RS_str_t **path_r_ptr,
-    const char *full_suffix, const char *src_path, const char *dst_path);
-static int H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key);
-
+static herr_t H5G_name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char *src_path,
+                                 const char *dst_path);
+static int    H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key);
 
 /*********************/
 /* Package Variables */
@@ -98,18 +93,14 @@ static int H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key);
 /* Declare extern the PQ free list for the wrapped strings */
 H5FL_BLK_EXTERN(str_buf);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__component
  *
@@ -143,7 +134,6 @@ H5G__component(const char *name, size_t *size_p)
     FUNC_LEAVE_NOAPI(name)
 } /* end H5G__component() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_normalize
  *
@@ -161,10 +151,10 @@ H5G__component(const char *name, size_t *size_p)
 char *
 H5G_normalize(const char *name)
 {
-    char *norm;         /* Pointer to the normalized string */
-    size_t	s,d;    /* Positions within the strings */
-    unsigned    last_slash;     /* Flag to indicate last character was a slash */
-    char *ret_value;    /* Return value */
+    char *   norm;       /* Pointer to the normalized string */
+    size_t   s, d;       /* Positions within the strings */
+    unsigned last_slash; /* Flag to indicate last character was a slash */
+    char *   ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -172,22 +162,22 @@ H5G_normalize(const char *name)
     HDassert(name);
 
     /* Duplicate the name, to return */
-    if(NULL == (norm = H5MM_strdup(name)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for normalized string")
+    if (NULL == (norm = H5MM_strdup(name)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for normalized string")
 
     /* Walk through the characters, omitting duplicated '/'s */
-    s = d = 0;
+    s = d      = 0;
     last_slash = 0;
-    while(name[s] != '\0') {
-        if(name[s] == '/')
-            if(last_slash)
+    while (name[s] != '\0') {
+        if (name[s] == '/')
+            if (last_slash)
                 ;
             else {
-                norm[d++] = name[s];
+                norm[d++]  = name[s];
                 last_slash = 1;
             } /* end else */
         else {
-            norm[d++] = name[s];
+            norm[d++]  = name[s];
             last_slash = 0;
         } /* end else */
         s++;
@@ -197,7 +187,7 @@ H5G_normalize(const char *name)
     norm[d] = '\0';
 
     /* Check for final '/' on normalized name & eliminate it */
-    if(d > 1 && last_slash)
+    if (d > 1 && last_slash)
         norm[d - 1] = '\0';
 
     /* Set return value */
@@ -207,7 +197,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_normalize() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5G_common_path
  *
@@ -225,37 +214,37 @@ done:
 static htri_t
 H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r)
 {
-    const char *fullpath;       /* Pointer to actual fullpath string */
-    const char *prefix;         /* Pointer to actual prefix string */
-    size_t  nchars1,nchars2;    /* Number of characters in components */
-    htri_t ret_value=FALSE;     /* Return value */
+    const char *fullpath;          /* Pointer to actual fullpath string */
+    const char *prefix;            /* Pointer to actual prefix string */
+    size_t      nchars1, nchars2;  /* Number of characters in components */
+    htri_t      ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Get component of each name */
-    fullpath=H5RS_get_str(fullpath_r);
+    fullpath = H5RS_get_str(fullpath_r);
     HDassert(fullpath);
-    fullpath=H5G__component(fullpath,&nchars1);
+    fullpath = H5G__component(fullpath, &nchars1);
     HDassert(fullpath);
-    prefix=H5RS_get_str(prefix_r);
+    prefix = H5RS_get_str(prefix_r);
     HDassert(prefix);
-    prefix=H5G__component(prefix,&nchars2);
+    prefix = H5G__component(prefix, &nchars2);
     HDassert(prefix);
 
     /* Check if we have a real string for each component */
-    while(*fullpath && *prefix) {
+    while (*fullpath && *prefix) {
         /* Check that the components we found are the same length */
-        if(nchars1==nchars2) {
+        if (nchars1 == nchars2) {
             /* Check that the two components are equal */
-            if(HDstrncmp(fullpath,prefix,nchars1)==0) {
+            if (HDstrncmp(fullpath, prefix, nchars1) == 0) {
                 /* Advance the pointers in the names */
-                fullpath+=nchars1;
-                prefix+=nchars2;
+                fullpath += nchars1;
+                prefix += nchars2;
 
                 /* Get next component of each name */
-                fullpath=H5G__component(fullpath,&nchars1);
+                fullpath = H5G__component(fullpath, &nchars1);
                 HDassert(fullpath);
-                prefix=H5G__component(prefix,&nchars2);
+                prefix = H5G__component(prefix, &nchars2);
                 HDassert(prefix);
             } /* end if */
             else
@@ -266,14 +255,13 @@ H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r)
     } /* end while */
 
     /* If we reached the end of the prefix path to check, it must be a valid prefix */
-    if(*prefix=='\0')
-        ret_value=TRUE;
+    if (*prefix == '\0')
+        ret_value = TRUE;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_common_path() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5G_build_fullpath
  *
@@ -290,12 +278,12 @@ done:
 static H5RS_str_t *
 H5G_build_fullpath(const char *prefix, const char *name)
 {
-    char *full_path;            /* Full user path built */
-    size_t orig_path_len;       /* Original length of the path */
-    size_t path_len;            /* Length of the path */
-    size_t name_len;            /* Length of the name */
-    unsigned need_sep;          /* Flag to indicate if separator is needed */
-    H5RS_str_t *ret_value;      /* Return value */
+    char *      full_path;     /* Full user path built */
+    size_t      orig_path_len; /* Original length of the path */
+    size_t      path_len;      /* Length of the path */
+    size_t      name_len;      /* Length of the name */
+    unsigned    need_sep;      /* Flag to indicate if separator is needed */
+    H5RS_str_t *ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -307,7 +295,7 @@ H5G_build_fullpath(const char *prefix, const char *name)
     orig_path_len = path_len = HDstrlen(prefix);
 
     /* Determine if there is a trailing separator in the name */
-    if(prefix[path_len - 1] == '/')
+    if (prefix[path_len - 1] == '/')
         need_sep = 0;
     else
         need_sep = 1;
@@ -317,24 +305,23 @@ H5G_build_fullpath(const char *prefix, const char *name)
     path_len += name_len + need_sep;
 
     /* Allocate space for the path */
-    if(NULL == (full_path = (char *)H5FL_BLK_MALLOC(str_buf, path_len + 1)))
+    if (NULL == (full_path = (char *)H5FL_BLK_MALLOC(str_buf, path_len + 1)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Build full path */
     HDstrncpy(full_path, prefix, orig_path_len + 1);
-    if(need_sep)
+    if (need_sep)
         HDstrncat(full_path, "/", (size_t)1);
     HDstrncat(full_path, name, name_len);
 
     /* Create reference counted string for path */
-    if(NULL == (ret_value = H5RS_own(full_path)))
+    if (NULL == (ret_value = H5RS_own(full_path)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_build_fullpath() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_build_fullpath_refstr_str
  *
@@ -351,7 +338,7 @@ done:
 H5RS_str_t *
 H5G_build_fullpath_refstr_str(H5RS_str_t *prefix_r, const char *name)
 {
-    const char *prefix;         /* Pointer to raw string for path */
+    const char *prefix; /* Pointer to raw string for path */
     H5RS_str_t *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -370,7 +357,7 @@ H5G_build_fullpath_refstr_str(H5RS_str_t *prefix_r, const char *name)
 } /* end H5G_build_fullpath_refstr_str() */
 
 #ifdef NOT_YET
-
+
 /*-------------------------------------------------------------------------
  * Function: H5G_name_build_refstr_refstr
  *
@@ -388,9 +375,9 @@ H5G_build_fullpath_refstr_str(H5RS_str_t *prefix_r, const char *name)
 static H5RS_str_t *
 H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *name_r)
 {
-    const char *prefix;         /* Pointer to raw string of prefix */
-    const char *name;           /* Pointer to raw string of name */
-    H5RS_str_t *ret_value;      /* Return value */
+    const char *prefix;    /* Pointer to raw string of prefix */
+    const char *name;      /* Pointer to raw string of name */
+    H5RS_str_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -407,7 +394,6 @@ H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *n
 } /* end H5G_build_fullpath_refstr_refstr() */
 #endif /* NOT_YET */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__name_init
  *
@@ -439,7 +425,6 @@ H5G__name_init(H5G_name_t *name, const char *path)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G__name_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_name_set
  *
@@ -456,7 +441,7 @@ H5G__name_init(H5G_name_t *name, const char *path)
 herr_t
 H5G_name_set(const H5G_name_t *loc, H5G_name_t *obj, const char *name)
 {
-    herr_t  ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -468,16 +453,16 @@ H5G_name_set(const H5G_name_t *loc, H5G_name_t *obj, const char *name)
     H5G_name_free(obj);
 
     /* Create the object's full path, if a full path exists in the location */
-    if(loc->full_path_r) {
+    if (loc->full_path_r) {
         /* Go build the new full path */
-        if((obj->full_path_r = H5G_build_fullpath_refstr_str(loc->full_path_r, name)) == NULL)
+        if ((obj->full_path_r = H5G_build_fullpath_refstr_str(loc->full_path_r, name)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_PATH, FAIL, "can't build user path name")
     } /* end if */
 
     /* Create the object's user path, if a user path exists in the location */
-    if(loc->user_path_r) {
+    if (loc->user_path_r) {
         /* Go build the new user path */
-        if((obj->user_path_r = H5G_build_fullpath_refstr_str(loc->user_path_r, name)) == NULL)
+        if ((obj->user_path_r = H5G_build_fullpath_refstr_str(loc->user_path_r, name)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_PATH, FAIL, "can't build user path name")
     } /* end if */
 
@@ -485,7 +470,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_name_set() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_name_copy
  *
@@ -527,10 +511,11 @@ H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth)
     HDmemcpy(dst, src, sizeof(H5G_name_t));
 
     /* Deep copy the names */
-    if(depth == H5_COPY_DEEP) {
+    if (depth == H5_COPY_DEEP) {
         dst->full_path_r = H5RS_dup(src->full_path_r);
         dst->user_path_r = H5RS_dup(src->user_path_r);
-    } else {
+    }
+    else {
         /* Discarding 'const' qualifier OK - QAK */
         H5G_name_reset((H5G_name_t *)src);
     } /* end if */
@@ -538,7 +523,6 @@ H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_name_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_get_name
  *
@@ -559,11 +543,11 @@ H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth)
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5G_get_name(const H5G_loc_t *loc, char *name/*out*/, size_t size,
-    hbool_t *cached, hid_t lapl_id, hid_t dxpl_id)
+H5G_get_name(const H5G_loc_t *loc, char *name /*out*/, size_t size, hbool_t *cached, hid_t lapl_id,
+             hid_t dxpl_id)
 {
-    ssize_t len = 0;            /* Length of object's name */
-    ssize_t ret_value;          /* Return value */
+    ssize_t len = 0;   /* Length of object's name */
+    ssize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -571,40 +555,40 @@ H5G_get_name(const H5G_loc_t *loc, char *name/*out*/, size_t size,
     HDassert(loc);
 
     /* If the user path is available and it's not "hidden", use it */
-    if(loc->path->user_path_r != NULL && loc->path->obj_hidden == 0) {
+    if (loc->path->user_path_r != NULL && loc->path->obj_hidden == 0) {
         len = H5RS_len(loc->path->user_path_r);
 
-        if(name) {
+        if (name) {
             HDstrncpy(name, H5RS_get_str(loc->path->user_path_r), MIN((size_t)(len + 1), size));
-            if((size_t)len >= size)
+            if ((size_t)len >= size)
                 name[size - 1] = '\0';
         } /* end if */
 
         /* Indicate that the name is cached, if requested */
         /* (Currently only used for testing - QAK, 2010/07/26) */
-        if(cached)
+        if (cached)
             *cached = TRUE;
     } /* end if */
-    else if(!loc->path->obj_hidden) {
-        hid_t	  file;
+    else if (!loc->path->obj_hidden) {
+        hid_t file;
 
         /* Retrieve file ID for name search */
-        if((file = H5F_get_id(loc->oloc->file, FALSE)) < 0)
+        if ((file = H5F_get_id(loc->oloc->file, FALSE)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get file ID")
 
         /* Search for name of object */
-        if((len = H5G_get_name_by_addr(file, lapl_id, dxpl_id, loc->oloc, name, size)) < 0) {
+        if ((len = H5G_get_name_by_addr(file, lapl_id, dxpl_id, loc->oloc, name, size)) < 0) {
             H5I_dec_ref(file);
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't determine name")
         } /* end if */
 
         /* Close file ID used for search */
-        if(H5I_dec_ref(file) < 0)
+        if (H5I_dec_ref(file) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTCLOSEFILE, FAIL, "can't determine name")
 
         /* Indicate that the name is _not_ cached, if requested */
         /* (Currently only used for testing - QAK, 2010/07/26) */
-        if(cached)
+        if (cached)
             *cached = FALSE;
     } /* end else */
 
@@ -615,7 +599,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_name_reset
  *
@@ -643,7 +626,6 @@ H5G_name_reset(H5G_name_t *name)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_name_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_name_free
  *
@@ -665,11 +647,11 @@ H5G_name_free(H5G_name_t *name)
     /* Check args */
     HDassert(name);
 
-    if(name->full_path_r) {
+    if (name->full_path_r) {
         H5RS_decr(name->full_path_r);
         name->full_path_r = NULL;
     } /* end if */
-    if(name->user_path_r) {
+    if (name->user_path_r) {
         H5RS_decr(name->user_path_r);
         name->user_path_r = NULL;
     } /* end if */
@@ -678,7 +660,6 @@ H5G_name_free(H5G_name_t *name)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_name_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_name_move_path
  *
@@ -694,12 +675,12 @@ H5G_name_free(H5G_name_t *name)
  */
 static herr_t
 H5G_name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char *src_path,
-    const char *dst_path)
+                   const char *dst_path)
 {
-    const char *path;                   /* Path to update */
-    size_t path_len;                    /* Length of path */
-    size_t full_suffix_len;             /* Length of full suffix */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const char *path;                /* Path to update */
+    size_t      path_len;            /* Length of path */
+    size_t      full_suffix_len;     /* Length of full suffix */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -715,31 +696,30 @@ H5G_name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char
 
     /* Check if path needs to be updated */
     full_suffix_len = HDstrlen(full_suffix);
-    path_len = HDstrlen(path);
-    if(full_suffix_len < path_len) {
-        const char *dst_suffix;         /* Destination suffix that changes */
-        size_t dst_suffix_len;          /* Length of destination suffix */
-        const char *src_suffix;         /* Source suffix that changes */
-        size_t path_prefix_len;         /* Length of path prefix */
-        const char *path_prefix2;       /* 2nd prefix for path */
-        size_t path_prefix2_len;        /* Length of 2nd path prefix */
-        const char *common_prefix;      /* Common prefix for src & dst paths */
-        size_t common_prefix_len;       /* Length of common prefix */
-        char *new_path;                 /* Pointer to new path */
-        size_t new_path_len;            /* Length of new path */
-
+    path_len        = HDstrlen(path);
+    if (full_suffix_len < path_len) {
+        const char *dst_suffix;        /* Destination suffix that changes */
+        size_t      dst_suffix_len;    /* Length of destination suffix */
+        const char *src_suffix;        /* Source suffix that changes */
+        size_t      path_prefix_len;   /* Length of path prefix */
+        const char *path_prefix2;      /* 2nd prefix for path */
+        size_t      path_prefix2_len;  /* Length of 2nd path prefix */
+        const char *common_prefix;     /* Common prefix for src & dst paths */
+        size_t      common_prefix_len; /* Length of common prefix */
+        char *      new_path;          /* Pointer to new path */
+        size_t      new_path_len;      /* Length of new path */
 
         /* Compute path prefix before full suffix*/
         path_prefix_len = path_len - full_suffix_len;
 
         /* Determine the common prefix for src & dst paths */
-        common_prefix = src_path;
+        common_prefix     = src_path;
         common_prefix_len = 0;
         /* Find first character that is different */
-        while(*(src_path + common_prefix_len) == *(dst_path + common_prefix_len))
+        while (*(src_path + common_prefix_len) == *(dst_path + common_prefix_len))
             common_prefix_len++;
         /* Back up to previous '/' */
-        while(*(common_prefix + common_prefix_len) != '/')
+        while (*(common_prefix + common_prefix_len) != '/')
             common_prefix_len--;
         /* Include '/' */
         common_prefix_len++;
@@ -748,26 +728,26 @@ H5G_name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char
         src_suffix = src_path + (common_prefix_len - 1);
 
         /* Determine destination suffix */
-        dst_suffix = dst_path + (common_prefix_len - 1);
+        dst_suffix     = dst_path + (common_prefix_len - 1);
         dst_suffix_len = HDstrlen(dst_suffix);
 
         /* Compute path prefix before src suffix*/
-        path_prefix2 = path;
+        path_prefix2     = path;
         path_prefix2_len = path_prefix_len - HDstrlen(src_suffix);
 
         /* Allocate space for the new path */
         new_path_len = path_prefix2_len + dst_suffix_len + full_suffix_len;
-        if(NULL == (new_path = (char *)H5FL_BLK_MALLOC(str_buf, new_path_len + 1)))
+        if (NULL == (new_path = (char *)H5FL_BLK_MALLOC(str_buf, new_path_len + 1)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Create the new path */
-        if(path_prefix2_len > 0) {
+        if (path_prefix2_len > 0) {
             HDstrncpy(new_path, path_prefix2, path_prefix2_len + 1);
             HDstrncpy(new_path + path_prefix2_len, dst_suffix, dst_suffix_len + 1);
         } /* end if */
         else
             HDstrncpy(new_path, dst_suffix, dst_suffix_len + 1);
-        if(full_suffix_len > 0)
+        if (full_suffix_len > 0)
             HDstrncat(new_path, full_suffix, full_suffix_len);
 
         /* Release previous path */
@@ -781,7 +761,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_name_move_path() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5G_name_replace_cb
  *
@@ -798,35 +777,35 @@ done:
 static int
 H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
 {
-    const H5G_names_t *names = (const H5G_names_t *)key;        /* Get operation's information */
-    H5O_loc_t *oloc;            /* Object location for object that the ID refers to */
-    H5G_name_t *obj_path;       /* Pointer to group hier. path for obj */
-    H5F_t *top_obj_file;        /* Top file in object's mounted file hier. */
-    hbool_t obj_in_child = FALSE;   /* Flag to indicate that the object is in the child mount hier. */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    const H5G_names_t *names = (const H5G_names_t *)key; /* Get operation's information */
+    H5O_loc_t *        oloc;         /* Object location for object that the ID refers to */
+    H5G_name_t *       obj_path;     /* Pointer to group hier. path for obj */
+    H5F_t *            top_obj_file; /* Top file in object's mounted file hier. */
+    hbool_t obj_in_child = FALSE;    /* Flag to indicate that the object is in the child mount hier. */
+    herr_t  ret_value    = SUCCEED;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(obj_ptr);
 
     /* Get the symbol table entry */
-    switch(H5I_get_type(obj_id)) {
+    switch (H5I_get_type(obj_id)) {
         case H5I_GROUP:
-            oloc = H5G_oloc((H5G_t *)obj_ptr);
+            oloc     = H5G_oloc((H5G_t *)obj_ptr);
             obj_path = H5G_nameof((H5G_t *)obj_ptr);
             break;
 
         case H5I_DATASET:
-            oloc = H5D_oloc((H5D_t *)obj_ptr);
+            oloc     = H5D_oloc((H5D_t *)obj_ptr);
             obj_path = H5D_nameof((H5D_t *)obj_ptr);
             break;
 
         case H5I_DATATYPE:
             /* Avoid non-named datatypes */
-            if(!H5T_is_named((H5T_t *)obj_ptr))
-                HGOTO_DONE(SUCCEED)     /* Do not exit search over IDs */
+            if (!H5T_is_named((H5T_t *)obj_ptr))
+                HGOTO_DONE(SUCCEED) /* Do not exit search over IDs */
 
-            oloc = H5T_oloc((H5T_t *)obj_ptr);
+            oloc     = H5T_oloc((H5T_t *)obj_ptr);
             obj_path = H5T_nameof((H5T_t *)obj_ptr);
             break;
 
@@ -850,60 +829,60 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
     HDassert(obj_path);
 
     /* Check if the object has a full path still */
-    if(!obj_path->full_path_r)
-        HGOTO_DONE(SUCCEED)     /* No need to look at object, it's path is already invalid */
+    if (!obj_path->full_path_r)
+        HGOTO_DONE(SUCCEED) /* No need to look at object, it's path is already invalid */
 
     /* Find the top file in object's mount hier. */
-    if(H5F_PARENT(oloc->file)) {
+    if (H5F_PARENT(oloc->file)) {
         /* Check if object is in child file (for mount & unmount operations) */
-        if(names->dst_file && H5F_SAME_SHARED(oloc->file, names->dst_file))
+        if (names->dst_file && H5F_SAME_SHARED(oloc->file, names->dst_file))
             obj_in_child = TRUE;
 
         /* Find the "top" file in the chain of mounted files */
         top_obj_file = H5F_PARENT(oloc->file);
-        while(H5F_PARENT(top_obj_file) != NULL) {
+        while (H5F_PARENT(top_obj_file) != NULL) {
             /* Check if object is in child mount hier. (for mount & unmount operations) */
-            if(names->dst_file && H5F_SAME_SHARED(top_obj_file, names->dst_file))
+            if (names->dst_file && H5F_SAME_SHARED(top_obj_file, names->dst_file))
                 obj_in_child = TRUE;
 
             top_obj_file = H5F_PARENT(top_obj_file);
         } /* end while */
-    } /* end if */
+    }     /* end if */
     else
         top_obj_file = oloc->file;
 
     /* Check if object is in top of child mount hier. (for mount & unmount operations) */
-    if(names->dst_file && H5F_SAME_SHARED(top_obj_file, names->dst_file))
+    if (names->dst_file && H5F_SAME_SHARED(top_obj_file, names->dst_file))
         obj_in_child = TRUE;
 
     /* Check if the object is in same file mount hier. */
-    if(!H5F_SAME_SHARED(top_obj_file, names->src_file))
-        HGOTO_DONE(SUCCEED)     /* No need to look at object, it's path is already invalid */
+    if (!H5F_SAME_SHARED(top_obj_file, names->src_file))
+        HGOTO_DONE(SUCCEED) /* No need to look at object, it's path is already invalid */
 
-    switch(names->op) {
+    switch (names->op) {
         /*-------------------------------------------------------------------------
          * H5G_NAME_MOUNT
          *-------------------------------------------------------------------------
          */
         case H5G_NAME_MOUNT:
             /* Check if object is in child mount hier. */
-            if(obj_in_child) {
-                const char *full_path;      /* Full path of current object */
-                const char *src_path;       /* Full path of source object */
-                size_t src_path_len;        /* Length of source full path */
-                char *new_full_path;        /* New full path of object */
-                size_t new_full_len;        /* Length of new full path */
+            if (obj_in_child) {
+                const char *full_path;     /* Full path of current object */
+                const char *src_path;      /* Full path of source object */
+                size_t      src_path_len;  /* Length of source full path */
+                char *      new_full_path; /* New full path of object */
+                size_t      new_full_len;  /* Length of new full path */
 
                 /* Get pointers to paths of interest */
-                full_path = H5RS_get_str(obj_path->full_path_r);
-                src_path = H5RS_get_str(names->src_full_path_r);
+                full_path    = H5RS_get_str(obj_path->full_path_r);
+                src_path     = H5RS_get_str(names->src_full_path_r);
                 src_path_len = HDstrlen(src_path);
 
                 /* Build new full path */
 
                 /* Allocate space for the new full path */
                 new_full_len = src_path_len + HDstrlen(full_path);
-                if(NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, new_full_len + 1)))
+                if (NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, new_full_len + 1)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
                 /* Create the new full path */
@@ -920,12 +899,12 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
             else {
                 /* Check if the source is along the entry's path */
                 /* (But not actually the entry itself) */
-                if(H5G_common_path(obj_path->full_path_r, names->src_full_path_r) &&
-                        H5RS_cmp(obj_path->full_path_r, names->src_full_path_r)) {
+                if (H5G_common_path(obj_path->full_path_r, names->src_full_path_r) &&
+                    H5RS_cmp(obj_path->full_path_r, names->src_full_path_r)) {
                     /* Hide the user path */
                     (obj_path->obj_hidden)++;
                 } /* end if */
-            } /* end else */
+            }     /* end else */
             break;
 
         /*-------------------------------------------------------------------------
@@ -933,25 +912,25 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
          *-------------------------------------------------------------------------
          */
         case H5G_NAME_UNMOUNT:
-            if(obj_in_child) {
-                const char *full_path;      /* Full path of current object */
-                const char *full_suffix;    /* Full path after source path */
-                size_t full_suffix_len;     /* Length of full path after source path */
-                const char *src_path;       /* Full path of source object */
-                char *new_full_path;        /* New full path of object */
+            if (obj_in_child) {
+                const char *full_path;       /* Full path of current object */
+                const char *full_suffix;     /* Full path after source path */
+                size_t      full_suffix_len; /* Length of full path after source path */
+                const char *src_path;        /* Full path of source object */
+                char *      new_full_path;   /* New full path of object */
 
                 /* Get pointers to paths of interest */
                 full_path = H5RS_get_str(obj_path->full_path_r);
-                src_path = H5RS_get_str(names->src_full_path_r);
+                src_path  = H5RS_get_str(names->src_full_path_r);
 
                 /* Construct full path suffix */
-                full_suffix = full_path + HDstrlen(src_path);
+                full_suffix     = full_path + HDstrlen(src_path);
                 full_suffix_len = HDstrlen(full_suffix);
 
                 /* Build new full path */
 
                 /* Create the new full path */
-                if(NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, full_suffix_len + 1)))
+                if (NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, full_suffix_len + 1)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
                 HDstrncpy(new_full_path, full_suffix, full_suffix_len + 1);
 
@@ -962,20 +941,21 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
                 obj_path->full_path_r = H5RS_own(new_full_path);
 
                 /* Check if the object's user path should be invalidated */
-                if(obj_path->user_path_r && HDstrlen(new_full_path) < (size_t)H5RS_len(obj_path->user_path_r)) {
+                if (obj_path->user_path_r &&
+                    HDstrlen(new_full_path) < (size_t)H5RS_len(obj_path->user_path_r)) {
                     /* Free user path */
                     H5RS_decr(obj_path->user_path_r);
                     obj_path->user_path_r = NULL;
                 } /* end if */
-            } /* end if */
+            }     /* end if */
             else {
                 /* Check if file being unmounted was hiding the object */
-                if(H5G_common_path(obj_path->full_path_r, names->src_full_path_r) &&
-                        H5RS_cmp(obj_path->full_path_r, names->src_full_path_r)) {
+                if (H5G_common_path(obj_path->full_path_r, names->src_full_path_r) &&
+                    H5RS_cmp(obj_path->full_path_r, names->src_full_path_r)) {
                     /* Un-hide the user path */
                     (obj_path->obj_hidden)--;
                 } /* end if */
-            } /* end else */
+            }     /* end else */
             break;
 
         /*-------------------------------------------------------------------------
@@ -984,7 +964,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
          */
         case H5G_NAME_DELETE:
             /* Check if the location being unlinked is in the path for the current object */
-            if(H5G_common_path(obj_path->full_path_r, names->src_full_path_r)) {
+            if (H5G_common_path(obj_path->full_path_r, names->src_full_path_r)) {
                 /* Free paths for object */
                 H5G_name_free(obj_path);
             } /* end if */
@@ -996,23 +976,23 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
          */
         case H5G_NAME_MOVE: /* Link move case, check for relative names case */
             /* Check if the src object moved is in the current object's path */
-            if(H5G_common_path(obj_path->full_path_r, names->src_full_path_r)) {
-                const char *full_path;      /* Full path of current object */
-                const char *full_suffix;    /* Suffix of full path, after src_path */
-                size_t full_suffix_len;     /* Length of suffix of full path after src_path*/
-                char *new_full_path;        /* New full path of object */
-                size_t new_full_len;        /* Length of new full path */
-                const char *src_path;       /* Full path of source object */
-                const char *dst_path;       /* Full path of destination object */
-                size_t dst_path_len;        /* Length of destination's full path */
+            if (H5G_common_path(obj_path->full_path_r, names->src_full_path_r)) {
+                const char *full_path;       /* Full path of current object */
+                const char *full_suffix;     /* Suffix of full path, after src_path */
+                size_t      full_suffix_len; /* Length of suffix of full path after src_path*/
+                char *      new_full_path;   /* New full path of object */
+                size_t      new_full_len;    /* Length of new full path */
+                const char *src_path;        /* Full path of source object */
+                const char *dst_path;        /* Full path of destination object */
+                size_t      dst_path_len;    /* Length of destination's full path */
 
                 /* Sanity check */
                 HDassert(names->dst_full_path_r);
 
                 /* Get pointers to paths of interest */
-                full_path = H5RS_get_str(obj_path->full_path_r);
-                src_path = H5RS_get_str(names->src_full_path_r);
-                dst_path = H5RS_get_str(names->dst_full_path_r);
+                full_path    = H5RS_get_str(obj_path->full_path_r);
+                src_path     = H5RS_get_str(names->src_full_path_r);
+                dst_path     = H5RS_get_str(names->dst_full_path_r);
                 dst_path_len = HDstrlen(dst_path);
 
                 /* Make certain that the source and destination names are full (not relative) paths */
@@ -1020,19 +1000,19 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
                 HDassert(*dst_path == '/');
 
                 /* Get pointer to "full suffix" */
-                full_suffix = full_path + HDstrlen(src_path);
+                full_suffix     = full_path + HDstrlen(src_path);
                 full_suffix_len = HDstrlen(full_suffix);
 
                 /* Update the user path, if one exists */
-                if(obj_path->user_path_r)
-                    if(H5G_name_move_path(&(obj_path->user_path_r), full_suffix, src_path, dst_path) < 0)
+                if (obj_path->user_path_r)
+                    if (H5G_name_move_path(&(obj_path->user_path_r), full_suffix, src_path, dst_path) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_PATH, FAIL, "can't build user path name")
 
                 /* Build new full path */
 
                 /* Allocate space for the new full path */
                 new_full_len = dst_path_len + full_suffix_len;
-                if(NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, new_full_len + 1)))
+                if (NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, new_full_len + 1)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
                 /* Create the new full path */
@@ -1055,7 +1035,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5G_name_replace_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5G_name_replace
  *
@@ -1075,9 +1054,8 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
-    H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r,
-    hid_t dxpl_id)
+H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file, H5RS_str_t *src_full_path_r,
+                 H5F_t *dst_file, H5RS_str_t *dst_full_path_r, hid_t dxpl_id)
 {
     herr_t ret_value = SUCCEED;
 
@@ -1087,53 +1065,52 @@ H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
     HDassert(src_file);
 
     /* Check if the object we are manipulating has a path */
-    if(src_full_path_r) {
-        hbool_t search_group = FALSE;  /* Flag to indicate that groups are to be searched */
-        hbool_t search_dataset = FALSE;  /* Flag to indicate that datasets are to be searched */
+    if (src_full_path_r) {
+        hbool_t search_group    = FALSE; /* Flag to indicate that groups are to be searched */
+        hbool_t search_dataset  = FALSE; /* Flag to indicate that datasets are to be searched */
         hbool_t search_datatype = FALSE; /* Flag to indicate that datatypes are to be searched */
 
         /* Check for particular link to operate on */
-        if(lnk) {
+        if (lnk) {
             /* Look up the object type for each type of link */
-            switch(lnk->type) {
-                case H5L_TYPE_HARD:
-                    {
-                        H5O_loc_t tmp_oloc;             /* Temporary object location */
-                        H5O_type_t obj_type;            /* Type of object at location */
-
-                        /* Build temporary object location */
-                        tmp_oloc.file = src_file;
-                        tmp_oloc.addr = lnk->u.hard.addr;
-
-                        /* Get the type of the object */
-                        if(H5O_obj_type(&tmp_oloc, &obj_type, dxpl_id) < 0)
-                            HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object type")
-
-                        /* Determine which type of objects to operate on */
-                        switch(obj_type) {
-                            case H5O_TYPE_GROUP:
-                                /* Search and replace names through group IDs */
-                                search_group = TRUE;
-                                break;
-
-                            case H5O_TYPE_DATASET:
-                                /* Search and replace names through dataset IDs */
-                                search_dataset = TRUE;
-                                break;
-
-                            case H5O_TYPE_NAMED_DATATYPE:
-                                /* Search and replace names through datatype IDs */
-                                search_datatype = TRUE;
-                                break;
-
-                            case H5O_TYPE_UNKNOWN:
-                            case H5O_TYPE_NTYPES:
-                                /* Search and replace names through datatype IDs */
-                            default:
-                                HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "not valid object type")
-                        } /* end switch */
-                    } /* end case */
-                    break;
+            switch (lnk->type) {
+                case H5L_TYPE_HARD: {
+                    H5O_loc_t  tmp_oloc; /* Temporary object location */
+                    H5O_type_t obj_type; /* Type of object at location */
+
+                    /* Build temporary object location */
+                    tmp_oloc.file = src_file;
+                    tmp_oloc.addr = lnk->u.hard.addr;
+
+                    /* Get the type of the object */
+                    if (H5O_obj_type(&tmp_oloc, &obj_type, dxpl_id) < 0)
+                        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object type")
+
+                    /* Determine which type of objects to operate on */
+                    switch (obj_type) {
+                        case H5O_TYPE_GROUP:
+                            /* Search and replace names through group IDs */
+                            search_group = TRUE;
+                            break;
+
+                        case H5O_TYPE_DATASET:
+                            /* Search and replace names through dataset IDs */
+                            search_dataset = TRUE;
+                            break;
+
+                        case H5O_TYPE_NAMED_DATATYPE:
+                            /* Search and replace names through datatype IDs */
+                            search_datatype = TRUE;
+                            break;
+
+                        case H5O_TYPE_UNKNOWN:
+                        case H5O_TYPE_NTYPES:
+                            /* Search and replace names through datatype IDs */
+                        default:
+                            HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "not valid object type")
+                    } /* end switch */
+                }     /* end case */
+                break;
 
                 case H5L_TYPE_SOFT:
                     /* Symbolic links might resolve to any object, so we need to search all IDs */
@@ -1143,10 +1120,10 @@ H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
                 case H5L_TYPE_ERROR:
                 case H5L_TYPE_EXTERNAL:
                 case H5L_TYPE_MAX:
-                default:  /* User-defined link */
+                default: /* User-defined link */
                     /* Check for unknown library-defined link type */
-                    if(lnk->type < H5L_TYPE_UD_MIN)
-                       HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unknown link type")
+                    if (lnk->type < H5L_TYPE_UD_MIN)
+                        HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unknown link type")
 
                     /* User-defined & external links automatically wipe out
                      * names (because it would be too much work to track them),
@@ -1154,49 +1131,48 @@ H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
                      */
                     break;
             } /* end switch */
-        } /* end if */
+        }     /* end if */
         else {
             /* We pass NULL as link pointer when we need to search all IDs */
             search_group = search_dataset = search_datatype = TRUE;
         } /* end else */
 
         /* Check if we need to operate on the objects affected */
-        if(search_group || search_dataset || search_datatype) {
-            H5G_names_t names;          /* Structure to hold operation information for callback */
+        if (search_group || search_dataset || search_datatype) {
+            H5G_names_t names; /* Structure to hold operation information for callback */
 
             /* Find top file in src location's mount hierarchy */
-            while(H5F_PARENT(src_file))
+            while (H5F_PARENT(src_file))
                 src_file = H5F_PARENT(src_file);
 
             /* Set up common information for callback */
-            names.src_file = src_file;
+            names.src_file        = src_file;
             names.src_full_path_r = src_full_path_r;
-            names.dst_file = dst_file;
+            names.dst_file        = dst_file;
             names.dst_full_path_r = dst_full_path_r;
-            names.op = op;
+            names.op              = op;
 
             /* Search through group IDs */
-            if(search_group)
-                if(H5I_iterate(H5I_GROUP, H5G_name_replace_cb, &names, FALSE) < 0)
-		    HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over groups")
+            if (search_group)
+                if (H5I_iterate(H5I_GROUP, H5G_name_replace_cb, &names, FALSE) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over groups")
 
             /* Search through dataset IDs */
-            if(search_dataset)
-                if(H5I_iterate(H5I_DATASET, H5G_name_replace_cb, &names, FALSE) < 0)
-		    HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over datasets")
+            if (search_dataset)
+                if (H5I_iterate(H5I_DATASET, H5G_name_replace_cb, &names, FALSE) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over datasets")
 
             /* Search through datatype IDs */
-            if(search_datatype)
-                if(H5I_iterate(H5I_DATATYPE, H5G_name_replace_cb, &names, FALSE) < 0)
-		    HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over datatypes")
+            if (search_datatype)
+                if (H5I_iterate(H5I_DATATYPE, H5G_name_replace_cb, &names, FALSE) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over datatypes")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_name_replace() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_get_name_by_addr_cb
  *
@@ -1212,15 +1188,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo,
-    void *_udata)
+H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo, void *_udata)
 {
     H5G_gnba_iter_t *udata = (H5G_gnba_iter_t *)_udata; /* User data for iteration */
-    H5G_loc_t   obj_loc;                /* Location of object */
-    H5G_name_t  obj_path;            	/* Object's group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Object's object location */
-    hbool_t     obj_found = FALSE;      /* Object at 'path' found */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    H5G_loc_t        obj_loc;                           /* Location of object */
+    H5G_name_t       obj_path;                          /* Object's group hier. path */
+    H5O_loc_t        obj_oloc;                          /* Object's object location */
+    hbool_t          obj_found = FALSE;                 /* Object at 'path' found */
+    herr_t           ret_value = H5_ITER_CONT;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1231,11 +1206,11 @@ H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo,
     HDassert(udata->path == NULL);
 
     /* Check for hard link with correct address */
-    if(linfo->type == H5L_TYPE_HARD && udata->loc->addr == linfo->u.address) {
-        H5G_loc_t	grp_loc;                /* Location of group */
+    if (linfo->type == H5L_TYPE_HARD && udata->loc->addr == linfo->u.address) {
+        H5G_loc_t grp_loc; /* Location of group */
 
         /* Get group's location */
-        if(H5G_loc(gid, &grp_loc) < 0)
+        if (H5G_loc(gid, &grp_loc) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5_ITER_ERROR, "bad group location")
 
         /* Set up opened object location to fill in */
@@ -1244,29 +1219,28 @@ H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo,
         H5G_loc_reset(&obj_loc);
 
         /* Find the object */
-        if(H5G_loc_find(&grp_loc, path, &obj_loc/*out*/, udata->lapl_id, udata->dxpl_id) < 0)
+        if (H5G_loc_find(&grp_loc, path, &obj_loc /*out*/, udata->lapl_id, udata->dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
         obj_found = TRUE;
 
         /* Check for object in same file (handles mounted files) */
         /* (re-verify address, in case we traversed a file mount) */
-        if(udata->loc->addr == obj_loc.oloc->addr && udata->loc->file == obj_loc.oloc->file) {
-            if(NULL == (udata->path = H5MM_strdup(path)))
+        if (udata->loc->addr == obj_loc.oloc->addr && udata->loc->file == obj_loc.oloc->file) {
+            if (NULL == (udata->path = H5MM_strdup(path)))
                 HGOTO_ERROR(H5E_SYM, H5E_CANTALLOC, H5_ITER_ERROR, "can't duplicate path string")
 
             /* We found a match so we return immediately */
             HGOTO_DONE(H5_ITER_STOP)
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
-    if(obj_found && H5G_loc_free(&obj_loc) < 0)
+    if (obj_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_name_by_addr_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_get_name_by_addr
  *
@@ -1283,14 +1257,13 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *loc,
-    char *name, size_t size)
+H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *loc, char *name, size_t size)
 {
-    H5G_gnba_iter_t udata;      /* User data for iteration */
-    H5G_loc_t root_loc;         /* Root group's location */
-    hbool_t found_obj = FALSE;  /* If we found the object */
-    herr_t status;              /* Status from iteration */
-    ssize_t ret_value;          /* Return value */
+    H5G_gnba_iter_t udata;             /* User data for iteration */
+    H5G_loc_t       root_loc;          /* Root group's location */
+    hbool_t         found_obj = FALSE; /* If we found the object */
+    herr_t          status;            /* Status from iteration */
+    ssize_t         ret_value;         /* Return value */
 
     /* Portably clear udata struct (before FUNC_ENTER) */
     HDmemset(&udata, 0, sizeof(udata));
@@ -1298,46 +1271,47 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Construct the link info for the file's root group */
-    if(H5G_loc(file, &root_loc) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get root group's location")
+    if (H5G_loc(file, &root_loc) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get root group's location")
 
     /* Check for root group being the object looked for */
-    if(root_loc.oloc->addr == loc->addr && root_loc.oloc->file == loc->file) {
-        if(NULL == (udata.path = H5MM_strdup("")))
+    if (root_loc.oloc->addr == loc->addr && root_loc.oloc->file == loc->file) {
+        if (NULL == (udata.path = H5MM_strdup("")))
             HGOTO_ERROR(H5E_SYM, H5E_CANTALLOC, FAIL, "can't duplicate path string")
         found_obj = TRUE;
     } /* end if */
     else {
         /* Set up user data for iterator */
-        udata.loc = loc;
+        udata.loc     = loc;
         udata.lapl_id = lapl_id;
         udata.dxpl_id = dxpl_id;
-        udata.path = NULL;
+        udata.path    = NULL;
 
         /* Visit all the links in the file */
-        if((status = H5G_visit(file, "/", H5_INDEX_NAME, H5_ITER_NATIVE, H5G_get_name_by_addr_cb, &udata, lapl_id, dxpl_id)) < 0)
+        if ((status = H5G_visit(file, "/", H5_INDEX_NAME, H5_ITER_NATIVE, H5G_get_name_by_addr_cb, &udata,
+                                lapl_id, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group traversal failed while looking for object name")
-        else if(status > 0)
+        else if (status > 0)
             found_obj = TRUE;
     } /* end else */
 
     /* Check for finding the object */
-    if(found_obj) {
+    if (found_obj) {
         /* Set the length of the full path */
-        ret_value = (ssize_t)(HDstrlen(udata.path) + 1);        /* Length of path + 1 (for "/") */
+        ret_value = (ssize_t)(HDstrlen(udata.path) + 1); /* Length of path + 1 (for "/") */
 
         /* If there's a buffer provided, copy into it, up to the limit of its size */
-        if(name) {
+        if (name) {
             /* Copy the initial path separator */
             HDstrncpy(name, "/", (size_t)2);
 
             /* Append the rest of the path */
             /* (less one character, for the initial path separator) */
             HDstrncat(name, udata.path, (size - 2));
-            if((size_t)ret_value >= size)
+            if ((size_t)ret_value >= size)
                 name[size - 1] = '\0';
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else
         ret_value = 0;
 
@@ -1347,4 +1321,3 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_name_by_addr() */
-
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 2c4b840..92e1dfd 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -29,29 +29,26 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg   */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg   */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions        */
-#include "H5ACprivate.h"    /* Metadata cache           */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5Fprivate.h"     /* File access              */
-#include "H5FLprivate.h"    /* Free Lists               */
-#include "H5Gpkg.h"         /* Groups                   */
-#include "H5HLprivate.h"    /* Local Heaps              */
-#include "H5MFprivate.h"    /* File memory management   */
-#include "H5MMprivate.h"    /* Memory management        */
-#include "H5Ppublic.h"      /* Property Lists           */
-
+#include "H5private.h"   /* Generic Functions        */
+#include "H5ACprivate.h" /* Metadata cache           */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5Fprivate.h"  /* File access              */
+#include "H5FLprivate.h" /* Free Lists               */
+#include "H5Gpkg.h"      /* Groups                   */
+#include "H5HLprivate.h" /* Local Heaps              */
+#include "H5MFprivate.h" /* File memory management   */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Ppublic.h"   /* Property Lists           */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -61,37 +58,32 @@
  * nodes consists of this structure...
  */
 typedef struct H5G_node_key_t {
-    size_t      offset;                 /*offset into heap for name          */
+    size_t offset; /*offset into heap for name          */
 } H5G_node_key_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* B-tree callbacks */
-static H5RC_t *H5G_node_get_shared(const H5F_t *f, const void *_udata);
-static herr_t H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t op, void *_lt_key,
-    void *_udata, void *_rt_key, haddr_t *addr_p/*out*/);
-static int H5G_node_cmp2(void *_lt_key, void *_udata, void *_rt_key);
-static int H5G_node_cmp3(void *_lt_key, void *_udata, void *_rt_key);
-static htri_t H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_lt_key,
-    void *_udata);
+static H5RC_t *  H5G_node_get_shared(const H5F_t *f, const void *_udata);
+static herr_t    H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t op, void *_lt_key, void *_udata,
+                                 void *_rt_key, haddr_t *addr_p /*out*/);
+static int       H5G_node_cmp2(void *_lt_key, void *_udata, void *_rt_key);
+static int       H5G_node_cmp3(void *_lt_key, void *_udata, void *_rt_key);
+static htri_t    H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_lt_key, void *_udata);
 static H5B_ins_t H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
-    hbool_t *lt_key_changed, void *_md_key, void *_udata, void *_rt_key,
-	hbool_t *rt_key_changed, haddr_t *new_node_p/*out*/);
-static H5B_ins_t H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *lt_key,
-    hbool_t *lt_key_changed, void *udata, void *rt_key, hbool_t *rt_key_changed);
-static herr_t H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key);
-static herr_t H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key);
-static herr_t H5G_node_debug_key(FILE *stream, int indent, int fwidth,
-    const void *key, const void *udata);
-
+                                 hbool_t *lt_key_changed, void *_md_key, void *_udata, void *_rt_key,
+                                 hbool_t *rt_key_changed, haddr_t *new_node_p /*out*/);
+static H5B_ins_t H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *lt_key, hbool_t *lt_key_changed,
+                                 void *udata, void *rt_key, hbool_t *rt_key_changed);
+static herr_t    H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key);
+static herr_t    H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key);
+static herr_t    H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *key, const void *udata);
 
 /*********************/
 /* Package Variables */
@@ -99,21 +91,21 @@ static herr_t H5G_node_debug_key(FILE *stream, int indent, int fwidth,
 
 /* H5G inherits B-tree like properties from H5B */
 H5B_class_t H5B_SNODE[1] = {{
-    H5B_SNODE_ID,               /*id            */
-    sizeof(H5G_node_key_t),     /*sizeof_nkey   */
-    H5G_node_get_shared,        /*get_shared    */
-    H5G_node_create,            /*new           */
-    H5G_node_cmp2,              /*cmp2          */
-    H5G_node_cmp3,              /*cmp3          */
-    H5G_node_found,             /*found	        */
-    H5G_node_insert,            /*insert        */
-    TRUE,                       /*follow min branch?    */
-    TRUE,                       /*follow max branch?    */
-    H5B_RIGHT,                  /*critical key  */
-    H5G_node_remove,            /*remove        */
-    H5G_node_decode_key,        /*decode        */
-    H5G_node_encode_key,        /*encode        */
-    H5G_node_debug_key          /*debug         */
+    H5B_SNODE_ID,           /*id            */
+    sizeof(H5G_node_key_t), /*sizeof_nkey   */
+    H5G_node_get_shared,    /*get_shared    */
+    H5G_node_create,        /*new           */
+    H5G_node_cmp2,          /*cmp2          */
+    H5G_node_cmp3,          /*cmp3          */
+    H5G_node_found,         /*found	        */
+    H5G_node_insert,        /*insert        */
+    TRUE,                   /*follow min branch?    */
+    TRUE,                   /*follow max branch?    */
+    H5B_RIGHT,              /*critical key  */
+    H5G_node_remove,        /*remove        */
+    H5G_node_decode_key,    /*decode        */
+    H5G_node_encode_key,    /*encode        */
+    H5G_node_debug_key      /*debug         */
 }};
 
 /* Declare a free list to manage the H5G_node_t struct */
@@ -122,17 +114,14 @@ H5FL_DEFINE(H5G_node_t);
 /* Declare a free list to manage sequences of H5G_entry_t's */
 H5FL_SEQ_DEFINE(H5G_entry_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_get_shared
  *
@@ -160,7 +149,6 @@ H5G_node_get_shared(const H5F_t *f, const void H5_ATTR_UNUSED *_udata)
     FUNC_LEAVE_NOAPI(H5F_GRP_BTREE_SHARED(f))
 } /* end H5G_node_get_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_decode_key
  *
@@ -177,7 +165,7 @@ H5G_node_get_shared(const H5F_t *f, const void H5_ATTR_UNUSED *_udata)
 static herr_t
 H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
 {
-    H5G_node_key_t  *key = (H5G_node_key_t *) _key;
+    H5G_node_key_t *key = (H5G_node_key_t *)_key;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -190,7 +178,6 @@ H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_node_decode_key() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_node_encode_key
  *
@@ -207,7 +194,7 @@ H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
 static herr_t
 H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
 {
-    const H5G_node_key_t *key = (const H5G_node_key_t *) _key;
+    const H5G_node_key_t *key = (const H5G_node_key_t *)_key;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -220,7 +207,6 @@ H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_node_encode_key() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_debug_key
  *
@@ -234,25 +220,23 @@ H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
-    const void *_udata)
+H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key, const void *_udata)
 {
-    const H5G_node_key_t    *key = (const H5G_node_key_t *) _key;
-    const H5G_bt_common_t   *udata = (const H5G_bt_common_t *) _udata;
+    const H5G_node_key_t * key   = (const H5G_node_key_t *)_key;
+    const H5G_bt_common_t *udata = (const H5G_bt_common_t *)_udata;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(key);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Heap offset:",
-              (unsigned)key->offset);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Heap offset:", (unsigned)key->offset);
 
-    if(udata->heap) {
+    if (udata->heap) {
         const char *s;
 
         HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Name:");
 
-        if((s = (const char *)H5HL_offset_into(udata->heap, key->offset)) != NULL)
+        if ((s = (const char *)H5HL_offset_into(udata->heap, key->offset)) != NULL)
             HDfprintf(stream, "%s\n", s);
     } /* end if */
     else
@@ -261,7 +245,6 @@ H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_node_debug_key() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__node_free
  *
@@ -288,14 +271,13 @@ H5G__node_free(H5G_node_t *sym)
     /* Verify that node is clean */
     HDassert(sym->cache_info.is_dirty == FALSE);
 
-    if(sym->entry)
+    if (sym->entry)
         sym->entry = H5FL_SEQ_FREE(H5G_entry_t, sym->entry);
     sym = H5FL_FREE(H5G_node_t, sym);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G__node_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_node_create
  *
@@ -317,12 +299,12 @@ H5G__node_free(H5G_node_t *sym)
  */
 static herr_t
 H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t H5_ATTR_UNUSED op, void *_lt_key,
-    void H5_ATTR_UNUSED *_udata, void *_rt_key, haddr_t *addr_p/*out*/)
+                void H5_ATTR_UNUSED *_udata, void *_rt_key, haddr_t *addr_p /*out*/)
 {
-    H5G_node_key_t  *lt_key = (H5G_node_key_t *)_lt_key;
-    H5G_node_key_t  *rt_key = (H5G_node_key_t *)_rt_key;
-    H5G_node_t      *sym = NULL;
-    herr_t          ret_value = SUCCEED;       /* Return value */
+    H5G_node_key_t *lt_key    = (H5G_node_key_t *)_lt_key;
+    H5G_node_key_t *rt_key    = (H5G_node_key_t *)_rt_key;
+    H5G_node_t *    sym       = NULL;
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -332,15 +314,15 @@ H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t H5_ATTR_UNUSED op, void *_lt_
     HDassert(f);
     HDassert(H5B_INS_FIRST == op);
 
-    if(NULL == (sym = H5FL_CALLOC(H5G_node_t)))
+    if (NULL == (sym = H5FL_CALLOC(H5G_node_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     sym->node_size = H5G_NODE_SIZE(f);
-    if(HADDR_UNDEF == (*addr_p = H5MF_alloc(f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)sym->node_size)))
+    if (HADDR_UNDEF == (*addr_p = H5MF_alloc(f, H5FD_MEM_BTREE, dxpl_id, (hsize_t)sym->node_size)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to allocate file space")
-    if(NULL == (sym->entry = H5FL_SEQ_CALLOC(H5G_entry_t, (size_t)(2 * H5F_SYM_LEAF_K(f)))))
+    if (NULL == (sym->entry = H5FL_SEQ_CALLOC(H5G_entry_t, (size_t)(2 * H5F_SYM_LEAF_K(f)))))
         HGOTO_ERROR(H5E_SYM, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_SNODE, *addr_p, sym, H5AC__NO_FLAGS_SET) < 0)
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_SNODE, *addr_p, sym, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to cache symbol table leaf node")
     /*
      * The left and right symbols in an empty tree are both the
@@ -348,24 +330,23 @@ H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t H5_ATTR_UNUSED op, void *_lt_
      * allows the comparison functions to work correctly without knowing
      * that there are no symbols.
      */
-    if(lt_key)
+    if (lt_key)
         lt_key->offset = 0;
-    if(rt_key)
+    if (rt_key)
         rt_key->offset = 0;
 
 done:
-    if(ret_value < 0) {
-        if(sym != NULL) {
-            if(sym->entry != NULL)
+    if (ret_value < 0) {
+        if (sym != NULL) {
+            if (sym->entry != NULL)
                 sym->entry = H5FL_SEQ_FREE(H5G_entry_t, sym->entry);
             sym = H5FL_FREE(H5G_node_t, sym);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_node_cmp2
  *
@@ -392,11 +373,11 @@ done:
 static herr_t
 H5G_node_cmp2(void *_lt_key, void *_udata, void *_rt_key)
 {
-    H5G_bt_common_t     *udata = (H5G_bt_common_t *) _udata;
-    H5G_node_key_t      *lt_key = (H5G_node_key_t *) _lt_key;
-    H5G_node_key_t      *rt_key = (H5G_node_key_t *) _rt_key;
-    const char          *s1, *s2;
-    int                 ret_value = SUCCEED; /* Return value */
+    H5G_bt_common_t *udata  = (H5G_bt_common_t *)_udata;
+    H5G_node_key_t * lt_key = (H5G_node_key_t *)_lt_key;
+    H5G_node_key_t * rt_key = (H5G_node_key_t *)_rt_key;
+    const char *     s1, *s2;
+    int              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -406,9 +387,9 @@ H5G_node_cmp2(void *_lt_key, void *_udata, void *_rt_key)
     HDassert(rt_key);
 
     /* Get pointers to string names */
-    if((s1 = (const char *)H5HL_offset_into(udata->heap, lt_key->offset)) == NULL)
+    if ((s1 = (const char *)H5HL_offset_into(udata->heap, lt_key->offset)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get key name")
-    if((s2 = (const char *)H5HL_offset_into(udata->heap, rt_key->offset)) == NULL)
+    if ((s2 = (const char *)H5HL_offset_into(udata->heap, rt_key->offset)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get key name")
 
     /* Set return value */
@@ -418,7 +399,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5G_node_cmp2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_node_cmp3
  *
@@ -449,11 +429,11 @@ done:
 static herr_t
 H5G_node_cmp3(void *_lt_key, void *_udata, void *_rt_key)
 {
-    H5G_bt_common_t *udata = (H5G_bt_common_t *) _udata;
-    H5G_node_key_t  *lt_key = (H5G_node_key_t *) _lt_key;
-    H5G_node_key_t  *rt_key = (H5G_node_key_t *) _rt_key;
-    const char      *s;
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    H5G_bt_common_t *udata  = (H5G_bt_common_t *)_udata;
+    H5G_node_key_t * lt_key = (H5G_node_key_t *)_lt_key;
+    H5G_node_key_t * rt_key = (H5G_node_key_t *)_rt_key;
+    const char *     s;
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -463,15 +443,15 @@ H5G_node_cmp3(void *_lt_key, void *_udata, void *_rt_key)
     HDassert(rt_key);
 
     /* left side */
-    if((s = (const char *)H5HL_offset_into(udata->heap, lt_key->offset)) == NULL)
+    if ((s = (const char *)H5HL_offset_into(udata->heap, lt_key->offset)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get key name")
-    if(HDstrcmp(udata->name, s) <= 0)
+    if (HDstrcmp(udata->name, s) <= 0)
         ret_value = (-1);
     else {
         /* right side */
-        if((s = (const char *)H5HL_offset_into(udata->heap, rt_key->offset)) == NULL)
+        if ((s = (const char *)H5HL_offset_into(udata->heap, rt_key->offset)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get key name")
-        if(HDstrcmp(udata->name, s) > 0)
+        if (HDstrcmp(udata->name, s) > 0)
             ret_value = 1;
     } /* end else */
 
@@ -479,7 +459,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_cmp3() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_found
  *
@@ -507,15 +486,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void H5_ATTR_UNUSED *_lt_key,
-    void *_udata)
+H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void H5_ATTR_UNUSED *_lt_key, void *_udata)
 {
-    H5G_bt_lkp_t    *udata = (H5G_bt_lkp_t *)_udata;
-    H5G_node_t      *sn = NULL;
-    unsigned        lt = 0, idx = 0, rt;
-    int             cmp = 1;
-    const char      *s;
-    htri_t          ret_value = TRUE;   /* Return value */
+    H5G_bt_lkp_t *udata = (H5G_bt_lkp_t *)_udata;
+    H5G_node_t *  sn    = NULL;
+    unsigned      lt = 0, idx = 0, rt;
+    int           cmp = 1;
+    const char *  s;
+    htri_t        ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -529,17 +507,17 @@ H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void H5_ATTR_UNUSED
     /*
      * Load the symbol table node for exclusive access.
      */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, FAIL, "unable to protect symbol table node")
 
     /*
      * Binary search.
      */
     rt = sn->nsyms;
-    while(lt < rt && cmp) {
+    while (lt < rt && cmp) {
         idx = (lt + rt) / 2;
-        
-        if((s = (const char *)H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)) == NULL)
+
+        if ((s = (const char *)H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get symbol table name")
         cmp = HDstrcmp(udata->common.name, s);
 
@@ -549,21 +527,20 @@ H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void H5_ATTR_UNUSED
             lt = idx + 1;
     } /* end while */
 
-    if(cmp)
+    if (cmp)
         HGOTO_DONE(FALSE)
 
     /* Call user's callback operator */
-    if((udata->op)(&sn->entry[idx], udata->op_data) < 0)
+    if ((udata->op)(&sn->entry[idx], udata->op_data) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "iterator callback failed")
 
 done:
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to release symbol table node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_found() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_insert
  *
@@ -597,22 +574,20 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5B_ins_t
-H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    void H5_ATTR_UNUSED *_lt_key, hbool_t H5_ATTR_UNUSED *lt_key_changed,
-    void *_md_key, void *_udata,
-    void *_rt_key, hbool_t *rt_key_changed,
-    haddr_t *new_node_p)
+H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *_lt_key,
+                hbool_t H5_ATTR_UNUSED *lt_key_changed, void *_md_key, void *_udata, void *_rt_key,
+                hbool_t *rt_key_changed, haddr_t *new_node_p)
 {
-    H5G_node_key_t  *md_key = (H5G_node_key_t *) _md_key;
-    H5G_node_key_t  *rt_key = (H5G_node_key_t *) _rt_key;
-    H5G_bt_ins_t    *udata = (H5G_bt_ins_t *) _udata;
-    H5G_node_t      *sn = NULL, *snrt = NULL;
+    H5G_node_key_t *md_key = (H5G_node_key_t *)_md_key;
+    H5G_node_key_t *rt_key = (H5G_node_key_t *)_rt_key;
+    H5G_bt_ins_t *  udata  = (H5G_bt_ins_t *)_udata;
+    H5G_node_t *    sn = NULL, *snrt = NULL;
     unsigned        sn_flags = H5AC__NO_FLAGS_SET, snrt_flags = H5AC__NO_FLAGS_SET;
-    const char      *s;
-    unsigned        lt = 0, rt;             /* Binary search cntrs	*/
+    const char *    s;
+    unsigned        lt  = 0, rt; /* Binary search cntrs	*/
     int             cmp = 1, idx = -1;
-    H5G_node_t      *insert_into = NULL;    /*node that gets new entry*/
-    H5G_entry_t     ent;                    /* Entry to insert in node */
+    H5G_node_t *    insert_into = NULL; /*node that gets new entry*/
+    H5G_entry_t     ent;                /* Entry to insert in node */
     H5B_ins_t       ret_value = H5B_INS_ERROR;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -630,20 +605,20 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     /*
      * Load the symbol node.
      */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_WRITE)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5B_INS_ERROR, "unable to protect symbol table node")
 
     /*
      * Where does the new symbol get inserted?	We use a binary search.
      */
     rt = sn->nsyms;
-    while(lt < rt) {
+    while (lt < rt) {
         idx = (int)((lt + rt) / 2);
-        if((s = (const char *)H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)) == NULL)
+        if ((s = (const char *)H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get symbol table name")
 
         /* Check if symbol is already present */
-        if(0 == (cmp = HDstrcmp(udata->common.name, s)))
+        if (0 == (cmp = HDstrcmp(udata->common.name, s)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5B_INS_ERROR, "symbol is already present in symbol table")
 
         if (cmp < 0)
@@ -654,12 +629,12 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     idx += cmp > 0 ? 1 : 0;
 
     /* Convert link information & name to symbol table entry */
-    if(H5G__ent_convert(f, dxpl_id, udata->common.heap, udata->common.name,
-            udata->lnk, udata->obj_type, udata->crt_info, &ent) < 0)
+    if (H5G__ent_convert(f, dxpl_id, udata->common.heap, udata->common.name, udata->lnk, udata->obj_type,
+                         udata->crt_info, &ent) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5B_INS_ERROR, "unable to convert link")
 
     /* Determine where to place entry in node */
-    if(sn->nsyms >= 2 * H5F_SYM_LEAF_K(f)) {
+    if (sn->nsyms >= 2 * H5F_SYM_LEAF_K(f)) {
         /*
          * The node is full.  Split it into a left and right
          * node and return the address of the new right node (the
@@ -668,20 +643,18 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
         ret_value = H5B_INS_RIGHT;
 
         /* The right node */
-        if(H5G_node_create(f, dxpl_id, H5B_INS_FIRST, NULL, NULL, NULL, new_node_p/*out*/) < 0)
+        if (H5G_node_create(f, dxpl_id, H5B_INS_FIRST, NULL, NULL, NULL, new_node_p /*out*/) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5B_INS_ERROR, "unable to split symbol table node")
 
-        if(NULL == (snrt = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, *new_node_p, f, H5AC_WRITE)))
+        if (NULL == (snrt = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, *new_node_p, f, H5AC_WRITE)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5B_INS_ERROR, "unable to split symbol table node")
 
-        HDmemcpy(snrt->entry, sn->entry + H5F_SYM_LEAF_K(f),
-            H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t));
+        HDmemcpy(snrt->entry, sn->entry + H5F_SYM_LEAF_K(f), H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t));
         snrt->nsyms = H5F_SYM_LEAF_K(f);
         snrt_flags |= H5AC__DIRTIED_FLAG;
 
         /* The left node */
-        HDmemset(sn->entry + H5F_SYM_LEAF_K(f), 0,
-            H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t));
+        HDmemset(sn->entry + H5F_SYM_LEAF_K(f), 0, H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t));
         sn->nsyms = H5F_SYM_LEAF_K(f);
         sn_flags |= H5AC__DIRTIED_FLAG;
 
@@ -689,35 +662,35 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
         md_key->offset = sn->entry[sn->nsyms - 1].name_off;
 
         /* Where to insert the new entry? */
-        if(idx <= (int)H5F_SYM_LEAF_K(f)) {
+        if (idx <= (int)H5F_SYM_LEAF_K(f)) {
             insert_into = sn;
-            if(idx == (int)H5F_SYM_LEAF_K(f))
+            if (idx == (int)H5F_SYM_LEAF_K(f))
                 md_key->offset = ent.name_off;
         } /* end if */
         else {
             idx -= H5F_SYM_LEAF_K(f);
             insert_into = snrt;
-            if(idx == (int)H5F_SYM_LEAF_K(f)) {
-                rt_key->offset = ent.name_off;
+            if (idx == (int)H5F_SYM_LEAF_K(f)) {
+                rt_key->offset  = ent.name_off;
                 *rt_key_changed = TRUE;
             } /* end if */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
     else {
         /* Where to insert the new entry? */
         ret_value = H5B_INS_NOOP;
         sn_flags |= H5AC__DIRTIED_FLAG;
         insert_into = sn;
-        if(idx == (int)sn->nsyms) {
-            rt_key->offset = ent.name_off;
+        if (idx == (int)sn->nsyms) {
+            rt_key->offset  = ent.name_off;
             *rt_key_changed = TRUE;
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     /* Move entries down to make room for new entry */
     HDassert(idx >= 0);
     HDmemmove(insert_into->entry + idx + 1, insert_into->entry + idx,
-        (insert_into->nsyms - (unsigned)idx) * sizeof(H5G_entry_t));
+              (insert_into->nsyms - (unsigned)idx) * sizeof(H5G_entry_t));
 
     /* Copy new entry into table */
     H5G__ent_copy(&(insert_into->entry[idx]), &ent, H5_COPY_SHALLOW);
@@ -726,15 +699,14 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     insert_into->nsyms += 1;
 
 done:
-    if(snrt && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, *new_node_p, snrt, snrt_flags) < 0)
+    if (snrt && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, *new_node_p, snrt, snrt_flags) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5B_INS_ERROR, "unable to release symbol table node")
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, sn_flags) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, sn_flags) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5B_INS_ERROR, "unable to release symbol table node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_remove
  *
@@ -764,18 +736,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5B_ins_t
-H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
-    hbool_t H5_ATTR_UNUSED *lt_key_changed/*out*/,
-    void *_udata/*in,out*/, void *_rt_key/*in,out*/,
-    hbool_t *rt_key_changed/*out*/)
+H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out*/,
+                hbool_t H5_ATTR_UNUSED *lt_key_changed /*out*/, void *_udata /*in,out*/,
+                void *_rt_key /*in,out*/, hbool_t *rt_key_changed /*out*/)
 {
-    H5G_node_key_t  *lt_key = (H5G_node_key_t *)_lt_key;
-    H5G_node_key_t  *rt_key = (H5G_node_key_t *)_rt_key;
-    H5G_bt_rm_t     *udata = (H5G_bt_rm_t *)_udata;
-    H5G_node_t      *sn = NULL;
+    H5G_node_key_t *lt_key   = (H5G_node_key_t *)_lt_key;
+    H5G_node_key_t *rt_key   = (H5G_node_key_t *)_rt_key;
+    H5G_bt_rm_t *   udata    = (H5G_bt_rm_t *)_udata;
+    H5G_node_t *    sn       = NULL;
     unsigned        sn_flags = H5AC__NO_FLAGS_SET;
     unsigned        lt = 0, rt, idx = 0;
-    int             cmp = 1;
+    int             cmp       = 1;
     H5B_ins_t       ret_value = H5B_INS_ERROR;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -788,44 +759,45 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
     HDassert(udata && udata->common.heap);
 
     /* Load the symbol table */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_WRITE)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5B_INS_ERROR, "unable to protect symbol table node")
 
     /* "Normal" removal of a single entry from the symbol table node */
-    if(udata->common.name != NULL) {
-        H5O_link_t lnk;         /* Constructed link for replacement */
-        size_t link_name_len;   /* Length of string in local heap */
+    if (udata->common.name != NULL) {
+        H5O_link_t lnk;           /* Constructed link for replacement */
+        size_t     link_name_len; /* Length of string in local heap */
 
         /* Find the name with a binary search */
         rt = sn->nsyms;
-        while(lt < rt && cmp) {
-            const char *s;          /* Pointer to string in local heap */
+        while (lt < rt && cmp) {
+            const char *s; /* Pointer to string in local heap */
 
             idx = (lt + rt) / 2;
-            if((s = H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)) == NULL)
+            if ((s = H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)) == NULL)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get symbol table name")
             cmp = HDstrcmp(udata->common.name, s);
-            if(cmp < 0)
+            if (cmp < 0)
                 rt = idx;
             else
                 lt = idx + 1;
         } /* end while */
 
-        if(cmp)
+        if (cmp)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5B_INS_ERROR, "name not found")
 
         /* Get a pointer to the name of the link */
-        if(NULL == (lnk.name = (char *)H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)))
+        if (NULL == (lnk.name = (char *)H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5B_INS_ERROR, "unable to get link name")
         link_name_len = HDstrlen(lnk.name) + 1;
 
         /* Set up rest of link structure */
         lnk.corder_valid = FALSE;
-        lnk.corder = 0;
-        lnk.cset = H5T_CSET_ASCII;
-        if(sn->entry[idx].type == H5G_CACHED_SLINK) {
+        lnk.corder       = 0;
+        lnk.cset         = H5T_CSET_ASCII;
+        if (sn->entry[idx].type == H5G_CACHED_SLINK) {
             lnk.type = H5L_TYPE_SOFT;
-            if(NULL == (lnk.u.soft.name = (char *)H5HL_offset_into(udata->common.heap, sn->entry[idx].cache.slink.lval_offset)))
+            if (NULL == (lnk.u.soft.name = (char *)H5HL_offset_into(udata->common.heap,
+                                                                    sn->entry[idx].cache.slink.lval_offset)))
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5B_INS_ERROR, "unable to get link name")
         } /* end if */
         else {
@@ -835,37 +807,39 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
         } /* end else */
 
         /* Replace any object names */
-        if(H5G__link_name_replace(f, dxpl_id, udata->grp_full_path_r, &lnk) < 0)
+        if (H5G__link_name_replace(f, dxpl_id, udata->grp_full_path_r, &lnk) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5B_INS_ERROR, "unable to get object type")
 
         /* Decrement the ref. count for hard links */
-        if(lnk.type == H5L_TYPE_HARD) {
-            H5O_loc_t tmp_oloc;             /* Temporary object location */
+        if (lnk.type == H5L_TYPE_HARD) {
+            H5O_loc_t tmp_oloc; /* Temporary object location */
 
             /* Build temporary object location */
             tmp_oloc.file = f;
             tmp_oloc.addr = lnk.u.hard.addr;
 
-            if(H5O_link(&tmp_oloc, -1, dxpl_id) < 0)
+            if (H5O_link(&tmp_oloc, -1, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5B_INS_ERROR, "unable to decrement object link count")
         } /* end if */
         else {
             /* Remove the soft link's value from the local heap */
-            if(lnk.u.soft.name) {
-                size_t soft_link_len;   /* Length of string in local heap */
+            if (lnk.u.soft.name) {
+                size_t soft_link_len; /* Length of string in local heap */
 
                 soft_link_len = HDstrlen(lnk.u.soft.name) + 1;
-                if(H5HL_remove(f, dxpl_id, udata->common.heap, sn->entry[idx].cache.slink.lval_offset, soft_link_len) < 0)
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, H5B_INS_ERROR, "unable to remove soft link from local heap")
+                if (H5HL_remove(f, dxpl_id, udata->common.heap, sn->entry[idx].cache.slink.lval_offset,
+                                soft_link_len) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, H5B_INS_ERROR,
+                                "unable to remove soft link from local heap")
             } /* end if */
-        } /* end else */
+        }     /* end else */
 
         /* Remove the link's name from the local heap */
-        if(H5HL_remove(f, dxpl_id, udata->common.heap, sn->entry[idx].name_off, link_name_len) < 0)
+        if (H5HL_remove(f, dxpl_id, udata->common.heap, sn->entry[idx].name_off, link_name_len) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, H5B_INS_ERROR, "unable to remove link name from local heap")
 
         /* Remove the entry from the symbol table node */
-        if(1 == sn->nsyms) {
+        if (1 == sn->nsyms) {
             /*
              * We are about to remove the only symbol in this node.  Free this
              * node and indicate that the pointer to this node in the B-tree
@@ -875,7 +849,8 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
             sn->nsyms = 0;
             sn_flags |= H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
             ret_value = H5B_INS_REMOVE;
-        } else if(0 == idx) {
+        }
+        else if (0 == idx) {
             /*
              * We are about to remove the left-most entry from the symbol table
              * node but there are other entries to the right.  No key values
@@ -883,10 +858,10 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
              */
             sn->nsyms -= 1;
             sn_flags |= H5AC__DIRTIED_FLAG;
-            HDmemmove(sn->entry + idx, sn->entry + idx + 1,
-                      (sn->nsyms-idx) * sizeof(H5G_entry_t));
+            HDmemmove(sn->entry + idx, sn->entry + idx + 1, (sn->nsyms - idx) * sizeof(H5G_entry_t));
             ret_value = H5B_INS_NOOP;
-        } else if (idx + 1 == sn->nsyms) {
+        }
+        else if (idx + 1 == sn->nsyms) {
             /*
              * We are about to remove the right-most entry from the symbol table
              * node but there are other entries to the left.  The right key
@@ -894,39 +869,40 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
              */
             sn->nsyms -= 1;
             sn_flags |= H5AC__DIRTIED_FLAG;
-            rt_key->offset = sn->entry[sn->nsyms - 1].name_off;
+            rt_key->offset  = sn->entry[sn->nsyms - 1].name_off;
             *rt_key_changed = TRUE;
-            ret_value = H5B_INS_NOOP;
-        } else {
+            ret_value       = H5B_INS_NOOP;
+        }
+        else {
             /*
              * We are about to remove an entry from the middle of a symbol table
              * node.
              */
             sn->nsyms -= 1;
             sn_flags |= H5AC__DIRTIED_FLAG;
-            HDmemmove(sn->entry + idx, sn->entry + idx + 1,
-                      (sn->nsyms - idx) * sizeof(H5G_entry_t));
+            HDmemmove(sn->entry + idx, sn->entry + idx + 1, (sn->nsyms - idx) * sizeof(H5G_entry_t));
             ret_value = H5B_INS_NOOP;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     /* Remove all entries from node, during B-tree deletion */
     else {
-        H5O_loc_t tmp_oloc;             /* Temporary object location */
+        H5O_loc_t tmp_oloc; /* Temporary object location */
 
         /* Build temporary object location */
         tmp_oloc.file = f;
 
         /* Reduce the link count for all entries in this node */
-        for(idx = 0; idx < sn->nsyms; idx++) {
-            if(!(H5G_CACHED_SLINK == sn->entry[idx].type)) {
+        for (idx = 0; idx < sn->nsyms; idx++) {
+            if (!(H5G_CACHED_SLINK == sn->entry[idx].type)) {
                 /* Decrement the reference count */
                 HDassert(H5F_addr_defined(sn->entry[idx].header));
                 tmp_oloc.addr = sn->entry[idx].header;
 
-                if(H5O_link(&tmp_oloc, -1, dxpl_id) < 0)
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, H5B_INS_ERROR, "unable to decrement object link count")
+                if (H5O_link(&tmp_oloc, -1, dxpl_id) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, H5B_INS_ERROR,
+                                "unable to decrement object link count")
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /*
          * We are about to remove all the symbols in this node.  Free this
@@ -939,13 +915,12 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
     } /* end else */
 
 done:
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, sn_flags) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, sn_flags) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release symbol table node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__node_iterate
  *
@@ -961,12 +936,12 @@ done:
  */
 int
 H5G__node_iterate(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr,
-    const void H5_ATTR_UNUSED *_rt_key, void *_udata)
+                  const void H5_ATTR_UNUSED *_rt_key, void *_udata)
 {
-    H5G_bt_it_it_t  *udata = (H5G_bt_it_it_t *)_udata;
-    H5G_node_t      *sn = NULL;
-    H5G_entry_t     *ents;              /* Pointer to entries in this node */
-    unsigned        u;                  /* Local index variable */
+    H5G_bt_it_it_t *udata = (H5G_bt_it_it_t *)_udata;
+    H5G_node_t *    sn    = NULL;
+    H5G_entry_t *   ents; /* Pointer to entries in this node */
+    unsigned        u;    /* Local index variable */
     int             ret_value = H5_ITER_CONT;
 
     FUNC_ENTER_PACKAGE
@@ -979,51 +954,52 @@ H5G__node_iterate(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, h
     HDassert(udata && udata->heap);
 
     /* Protect the symbol table node & local heap while we iterate over entries */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     /*
      * Iterate over the symbol table node entries.
      */
-    for(u = 0, ents = sn->entry; u < sn->nsyms && ret_value == H5_ITER_CONT; u++) {
-        if(udata->skip > 0)
+    for (u = 0, ents = sn->entry; u < sn->nsyms && ret_value == H5_ITER_CONT; u++) {
+        if (udata->skip > 0)
             --udata->skip;
         else {
-            H5O_link_t lnk;     /* Link for entry */
-            const char *name;   /* Pointer to link name in heap */
+            H5O_link_t  lnk;  /* Link for entry */
+            const char *name; /* Pointer to link name in heap */
 
             /* Get the pointer to the name of the link in the heap */
-            if((name = (const char *)H5HL_offset_into(udata->heap, ents[u].name_off)) == NULL)
+            if ((name = (const char *)H5HL_offset_into(udata->heap, ents[u].name_off)) == NULL)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get symbol table node name")
 
             /* Convert the entry to a link */
-            if(H5G__ent_to_link(&lnk, udata->heap, &ents[u], name) < 0)
-                HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5_ITER_ERROR, "unable to convert symbol table entry to link")
+            if (H5G__ent_to_link(&lnk, udata->heap, &ents[u], name) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5_ITER_ERROR,
+                            "unable to convert symbol table entry to link")
 
             /* Make the callback */
             ret_value = (udata->op)(&lnk, udata->op_data);
 
             /* Release memory for link object */
-            if(H5O_msg_reset(H5O_LINK_ID, &lnk) < 0)
+            if (H5O_msg_reset(H5O_LINK_ID, &lnk) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, H5_ITER_ERROR, "unable to release link message")
         } /* end else */
 
         /* Increment the number of entries passed through */
         /* (whether we skipped them or not) */
-        if(udata->final_ent)
+        if (udata->final_ent)
             (*udata->final_ent)++;
     } /* end for */
-    if(ret_value < 0)
+    if (ret_value < 0)
         HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
 
 done:
     /* Release resources */
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__node_iterate() */
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5G__node_sumup
  *
@@ -1039,11 +1015,11 @@ done:
  */
 int
 H5G__node_sumup(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr,
-    const void H5_ATTR_UNUSED *_rt_key, void *_udata)
+                const void H5_ATTR_UNUSED *_rt_key, void *_udata)
 {
-    hsize_t	        *num_objs = (hsize_t *)_udata;
-    H5G_node_t      *sn = NULL;
-    int             ret_value = H5_ITER_CONT;
+    hsize_t *   num_objs  = (hsize_t *)_udata;
+    H5G_node_t *sn        = NULL;
+    int         ret_value = H5_ITER_CONT;
 
     FUNC_ENTER_PACKAGE
 
@@ -1055,19 +1031,18 @@ H5G__node_sumup(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, had
     HDassert(num_objs);
 
     /* Find the object node and add the number of symbol entries. */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     *num_objs += sn->nsyms;
 
 done:
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__node_sumup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__node_by_idx
  *
@@ -1084,10 +1059,10 @@ done:
  */
 int
 H5G__node_by_idx(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr,
-    const void H5_ATTR_UNUSED *_rt_key, void *_udata)
+                 const void H5_ATTR_UNUSED *_rt_key, void *_udata)
 {
-    H5G_bt_it_idx_common_t  *udata = (H5G_bt_it_idx_common_t *)_udata;
-    H5G_node_t              *sn = NULL;
+    H5G_bt_it_idx_common_t *udata     = (H5G_bt_it_idx_common_t *)_udata;
+    H5G_node_t *            sn        = NULL;
     int                     ret_value = H5_ITER_CONT;
 
     FUNC_ENTER_PACKAGE
@@ -1100,19 +1075,19 @@ H5G__node_by_idx(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, ha
     HDassert(udata);
 
     /* Get a pointer to the symbol table node */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node");
 
     /* Find the node, locate the object symbol table entry and retrieve the name */
-    if(udata->idx >= udata->num_objs && udata->idx < (udata->num_objs + sn->nsyms)) {
-        hsize_t ent_idx;                /* Entry index in this node */
+    if (udata->idx >= udata->num_objs && udata->idx < (udata->num_objs + sn->nsyms)) {
+        hsize_t ent_idx; /* Entry index in this node */
 
         /* Compute index of entry */
         ent_idx = udata->idx - udata->num_objs;
 
         /* Call 'by index' callback */
         HDassert(udata->op);
-        if((udata->op)(&sn->entry[ent_idx], udata) < 0)
+        if ((udata->op)(&sn->entry[ent_idx], udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5B_INS_ERROR, "'by index' callback failed")
 
         /* Indicate that we found the entry we are interested in */
@@ -1122,13 +1097,12 @@ H5G__node_by_idx(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, ha
         udata->num_objs += sn->nsyms;
 
 done:
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__node_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__node_init
  *
@@ -1146,9 +1120,9 @@ done:
 herr_t
 H5G__node_init(H5F_t *f)
 {
-    H5B_shared_t    *shared;                /* Shared B-tree node info  */
-    size_t          sizeof_rkey;            /* Size of raw (disk) key   */
-    herr_t          ret_value = SUCCEED;    /* Return value             */
+    H5B_shared_t *shared;              /* Shared B-tree node info  */
+    size_t        sizeof_rkey;         /* Size of raw (disk) key   */
+    herr_t        ret_value = SUCCEED; /* Return value             */
 
     FUNC_ENTER_PACKAGE
 
@@ -1156,24 +1130,23 @@ H5G__node_init(H5F_t *f)
     HDassert(f);
 
     /* Set the raw key size */
-    sizeof_rkey = H5F_SIZEOF_SIZE(f);	/*name offset */
+    sizeof_rkey = H5F_SIZEOF_SIZE(f); /*name offset */
 
     /* Allocate & initialize global info for the shared structure */
-    if(NULL == (shared = H5B_shared_new(f, H5B_SNODE, sizeof_rkey)))
+    if (NULL == (shared = H5B_shared_new(f, H5B_SNODE, sizeof_rkey)))
         HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, FAIL, "memory allocation failed for shared B-tree info")
 
     /* Set up the "local" information for this file's groups */
     /* <none> */
 
     /* Make shared B-tree info reference counted */
-    if(H5F_SET_GRP_BTREE_SHARED(f, H5RC_create(shared, H5B_shared_free)) < 0)
+    if (H5F_SET_GRP_BTREE_SHARED(f, H5RC_create(shared, H5B_shared_free)) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create ref-count wrapper for shared B-tree info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__node_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_close
  *
@@ -1198,13 +1171,12 @@ H5G_node_close(const H5F_t *f)
     HDassert(f);
 
     /* Free the raw B-tree node buffer */
-    if(H5F_GRP_BTREE_SHARED(f))
+    if (H5F_GRP_BTREE_SHARED(f))
         H5RC_DEC(H5F_GRP_BTREE_SHARED(f));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_node_close */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__node_copy
  *
@@ -1220,15 +1192,15 @@ H5G_node_close(const H5F_t *f)
  */
 int
 H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr,
-    const void H5_ATTR_UNUSED *_rt_key, void *_udata)
+               const void H5_ATTR_UNUSED *_rt_key, void *_udata)
 {
-    H5G_bt_it_cpy_t     *udata = (H5G_bt_it_cpy_t *)_udata;
-    const H5O_loc_t     *src_oloc = udata->src_oloc;
-    H5O_copy_t          *cpy_info = udata->cpy_info;
-    H5HL_t              *heap = NULL;
-    H5G_node_t	        *sn = NULL;
-    unsigned int        i;                   /* Local index variable */
-    int                 ret_value = H5_ITER_CONT;
+    H5G_bt_it_cpy_t *udata    = (H5G_bt_it_cpy_t *)_udata;
+    const H5O_loc_t *src_oloc = udata->src_oloc;
+    H5O_copy_t *     cpy_info = udata->cpy_info;
+    H5HL_t *         heap     = NULL;
+    H5G_node_t *     sn       = NULL;
+    unsigned int     i; /* Local index variable */
+    int              ret_value = H5_ITER_CONT;
 
     FUNC_ENTER_PACKAGE
 
@@ -1238,29 +1210,30 @@ H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, hadd
     HDassert(udata);
 
     /* load the symbol table into memory from the source file */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     /* get the base address of the heap */
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, udata->src_heap_addr, H5AC_READ)))
-       HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "unable to protect symbol name")
+    if (NULL == (heap = H5HL_protect(f, dxpl_id, udata->src_heap_addr, H5AC_READ)))
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "unable to protect symbol name")
 
     /* copy object in this node one by one */
-    for(i = 0; i < sn->nsyms; i++) {
-        H5G_entry_t *src_ent = &(sn->entry[i]); /* Convenience variable to refer to current source group entry */
-        H5O_link_t  lnk;                /* Link to insert */
-        const char  *name;              /* Name of source object */
-        H5G_entry_t tmp_src_ent;        /* Temperary copy. Change will not affect the cache */
-        H5O_type_t  obj_type = H5O_TYPE_UNKNOWN; /* Target object type */
-        H5G_copy_file_ud_t *cpy_udata;  /* Copy file udata */
-        H5G_obj_create_t gcrt_info;     /* Group creation info */
+    for (i = 0; i < sn->nsyms; i++) {
+        H5G_entry_t *src_ent =
+            &(sn->entry[i]);             /* Convenience variable to refer to current source group entry */
+        H5O_link_t          lnk;         /* Link to insert */
+        const char *        name;        /* Name of source object */
+        H5G_entry_t         tmp_src_ent; /* Temperary copy. Change will not affect the cache */
+        H5O_type_t          obj_type = H5O_TYPE_UNKNOWN; /* Target object type */
+        H5G_copy_file_ud_t *cpy_udata;                   /* Copy file udata */
+        H5G_obj_create_t    gcrt_info;                   /* Group creation info */
 
         /* expand soft link */
-        if(H5G_CACHED_SLINK == src_ent->type && cpy_info->expand_soft_link) {
-            H5O_info_t  oinfo;          /* Information about object pointed to by soft link */
-            H5G_loc_t   grp_loc;        /* Group location holding soft link */
-            H5G_name_t  grp_path;       /* Path for group holding soft link */
-            char *link_name;            /* Pointer to value of soft link */
+        if (H5G_CACHED_SLINK == src_ent->type && cpy_info->expand_soft_link) {
+            H5O_info_t oinfo;     /* Information about object pointed to by soft link */
+            H5G_loc_t  grp_loc;   /* Group location holding soft link */
+            H5G_name_t grp_path;  /* Path for group holding soft link */
+            char *     link_name; /* Pointer to value of soft link */
 
             /* Make a temporary copy, so that it will not change the info in the cache */
             HDmemcpy(&tmp_src_ent, src_ent, sizeof(H5G_entry_t));
@@ -1271,22 +1244,22 @@ H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, hadd
             grp_loc.oloc = (H5O_loc_t *)src_oloc;
 
             /* Get pointer to link value in local heap */
-            if((link_name = (char *)H5HL_offset_into(heap, tmp_src_ent.cache.slink.lval_offset)) == NULL)
+            if ((link_name = (char *)H5HL_offset_into(heap, tmp_src_ent.cache.slink.lval_offset)) == NULL)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get link name")
 
             /* Check if the object pointed by the soft link exists in the source file */
-            if(H5G_loc_info(&grp_loc, link_name, FALSE, &oinfo, H5P_DEFAULT, dxpl_id) >= 0) {
+            if (H5G_loc_info(&grp_loc, link_name, FALSE, &oinfo, H5P_DEFAULT, dxpl_id) >= 0) {
                 tmp_src_ent.header = oinfo.addr;
-                src_ent = &tmp_src_ent;
+                src_ent            = &tmp_src_ent;
             } /* end if */
             else
                 H5E_clear_stack(NULL); /* discard any errors from a dangling soft link */
-        } /* if ((H5G_CACHED_SLINK == src_ent->type)... */
+        }                              /* if ((H5G_CACHED_SLINK == src_ent->type)... */
 
         /* Check if object in source group is a hard link */
-        if(H5F_addr_defined(src_ent->header)) {
-            H5O_loc_t new_dst_oloc;     /* Copied object location in destination */
-            H5O_loc_t tmp_src_oloc;     /* Temporary object location for source object */
+        if (H5F_addr_defined(src_ent->header)) {
+            H5O_loc_t new_dst_oloc; /* Copied object location in destination */
+            H5O_loc_t tmp_src_oloc; /* Temporary object location for source object */
 
             /* Set up copied object location to fill in */
             H5O_loc_reset(&new_dst_oloc);
@@ -1298,65 +1271,63 @@ H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, hadd
             tmp_src_oloc.addr = src_ent->header;
 
             /* Copy the shared object from source to destination */
-            if(H5O_copy_header_map(&tmp_src_oloc, &new_dst_oloc, dxpl_id,
-                    cpy_info, TRUE, &obj_type, (void **)&cpy_udata) < 0)
+            if (H5O_copy_header_map(&tmp_src_oloc, &new_dst_oloc, dxpl_id, cpy_info, TRUE, &obj_type,
+                                    (void **)&cpy_udata) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, H5_ITER_ERROR, "unable to copy object")
 
             /* Set up object creation info for symbol table insertion.  Only
              * case so far is for inserting old-style groups (for caching stab
              * info). */
-            if(obj_type == H5O_TYPE_GROUP) {
-                gcrt_info.gcpl_id = H5P_DEFAULT;
+            if (obj_type == H5O_TYPE_GROUP) {
+                gcrt_info.gcpl_id    = H5P_DEFAULT;
                 gcrt_info.cache_type = cpy_udata->cache_type;
-                gcrt_info.cache = cpy_udata->cache;
+                gcrt_info.cache      = cpy_udata->cache;
             } /* end if */
 
             /* Construct link information for eventual insertion */
-            lnk.type = H5L_TYPE_HARD;
+            lnk.type        = H5L_TYPE_HARD;
             lnk.u.hard.addr = new_dst_oloc.addr;
         } /* ( H5F_addr_defined(src_ent->header)) */
-        else if(H5G_CACHED_SLINK == src_ent->type) {
+        else if (H5G_CACHED_SLINK == src_ent->type) {
             /* it is a soft link */
             /* Set object type to unknown */
             obj_type = H5O_TYPE_UNKNOWN;
 
             /* Construct link information for eventual insertion */
             lnk.type = H5L_TYPE_SOFT;
-            if((lnk.u.soft.name = (char *)H5HL_offset_into(heap, src_ent->cache.slink.lval_offset)) == NULL)
+            if ((lnk.u.soft.name = (char *)H5HL_offset_into(heap, src_ent->cache.slink.lval_offset)) == NULL)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get link name")
         } /* else if */
         else
             HDassert(0 && "Unknown entry type");
 
         /* Set up common link data */
-        lnk.cset = H5F_DEFAULT_CSET;          /* XXX: Allow user to set this */
-        lnk.corder = 0;                     /* Creation order is not tracked for old-style links */
+        lnk.cset         = H5F_DEFAULT_CSET; /* XXX: Allow user to set this */
+        lnk.corder       = 0;                /* Creation order is not tracked for old-style links */
         lnk.corder_valid = FALSE;            /* Creation order is not valid */
-        /* lnk.name = name; */              /* This will be set in callback */
+        /* lnk.name = name; */               /* This will be set in callback */
 
         /* Determine name of source object */
-        if((name = (const char *)H5HL_offset_into(heap, src_ent->name_off)) == NULL)
+        if ((name = (const char *)H5HL_offset_into(heap, src_ent->name_off)) == NULL)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get source object name")
 
         /* Insert the new object in the destination file's group */
         /* (Don't increment the link count - that's already done above for hard links) */
-        if(H5G__stab_insert_real(udata->dst_file, udata->dst_stab, name, &lnk,
-                obj_type, (obj_type == H5O_TYPE_GROUP ? &gcrt_info : NULL),
-                dxpl_id) < 0)
+        if (H5G__stab_insert_real(udata->dst_file, udata->dst_stab, name, &lnk, obj_type,
+                                  (obj_type == H5O_TYPE_GROUP ? &gcrt_info : NULL), dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5_ITER_ERROR, "unable to insert the name")
     } /* end of for (i=0; i<sn->nsyms; i++) */
 
 done:
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to unprotect symbol name")
 
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__node_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__node_build_table
  *
@@ -1372,11 +1343,11 @@ done:
  */
 int
 H5G__node_build_table(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr,
-    const void H5_ATTR_UNUSED *_rt_key, void *_udata)
+                      const void H5_ATTR_UNUSED *_rt_key, void *_udata)
 {
-    H5G_bt_it_bt_t  *udata = (H5G_bt_it_bt_t *)_udata;
-    H5G_node_t      *sn = NULL;             /* Symbol table node */
-    unsigned        u;                      /* Local index variable */
+    H5G_bt_it_bt_t *udata = (H5G_bt_it_bt_t *)_udata;
+    H5G_node_t *    sn    = NULL; /* Symbol table node */
+    unsigned        u;            /* Local index variable */
     int             ret_value = H5_ITER_CONT;
 
     FUNC_ENTER_PACKAGE
@@ -1392,46 +1363,47 @@ H5G__node_build_table(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_ke
      * Save information about the symbol table node since we can't lock it
      * because we're about to call an application function.
      */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     /* Check if the link table needs to be extended */
-    if((udata->ltable->nlinks + sn->nsyms) >= udata->alloc_nlinks) {
-        size_t na = MAX((udata->ltable->nlinks + sn->nsyms), (udata->alloc_nlinks * 2));        /* Double # of links allocated */
-        H5O_link_t *x;              /* Pointer to larger array of links */
+    if ((udata->ltable->nlinks + sn->nsyms) >= udata->alloc_nlinks) {
+        size_t      na = MAX((udata->ltable->nlinks + sn->nsyms),
+                        (udata->alloc_nlinks * 2)); /* Double # of links allocated */
+        H5O_link_t *x;                                   /* Pointer to larger array of links */
 
         /* Re-allocate the link table */
-        if(NULL == (x = (H5O_link_t *)H5MM_realloc(udata->ltable->lnks, sizeof(H5O_link_t) * na)))
+        if (NULL == (x = (H5O_link_t *)H5MM_realloc(udata->ltable->lnks, sizeof(H5O_link_t) * na)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, H5_ITER_ERROR, "memory allocation failed")
         udata->ltable->lnks = x;
     } /* end if */
 
     /* Iterate over the symbol table node entries, adding to link table */
-    for(u = 0; u < sn->nsyms; u++) {
-        const char	*name;          /* Pointer to link name in heap */
-        size_t          linkno;         /* Link allocated */
+    for (u = 0; u < sn->nsyms; u++) {
+        const char *name;   /* Pointer to link name in heap */
+        size_t      linkno; /* Link allocated */
 
         /* Get pointer to link's name in the heap */
-        if((name = (const char *)H5HL_offset_into(udata->heap, sn->entry[u].name_off)) == NULL)
+        if ((name = (const char *)H5HL_offset_into(udata->heap, sn->entry[u].name_off)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get symbol table link name")
 
         /* Determine the link to operate on in the table */
         linkno = udata->ltable->nlinks++;
 
         /* Convert the entry to a link */
-        if(H5G__ent_to_link(&udata->ltable->lnks[linkno], udata->heap, &sn->entry[u], name) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5_ITER_ERROR, "unable to convert symbol table entry to link")
+        if (H5G__ent_to_link(&udata->ltable->lnks[linkno], udata->heap, &sn->entry[u], name) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5_ITER_ERROR,
+                        "unable to convert symbol table entry to link")
     } /* end for */
 
 done:
     /* Release the locked items */
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__node_build_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__node_iterate_size
  *
@@ -1446,10 +1418,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__node_iterate_size(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, const void H5_ATTR_UNUSED *_lt_key, 
-    haddr_t H5_ATTR_UNUSED addr, const void H5_ATTR_UNUSED *_rt_key, void *_udata)
+H5G__node_iterate_size(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, const void H5_ATTR_UNUSED *_lt_key,
+                       haddr_t H5_ATTR_UNUSED addr, const void H5_ATTR_UNUSED *_rt_key, void *_udata)
 {
-    hsize_t     *stab_size = (hsize_t *)_udata;         /* User data */
+    hsize_t *stab_size = (hsize_t *)_udata; /* User data */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -1462,7 +1434,6 @@ H5G__node_iterate_size(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, const void H5_ATT
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G__node_iterate_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_node_debug
  *
@@ -1478,13 +1449,12 @@ H5G__node_iterate_size(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, const void H5_ATT
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
-    int fwidth, haddr_t heap_addr)
+H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, haddr_t heap_addr)
 {
-    H5G_node_t *sn = NULL;
-    H5HL_t     *heap = NULL;
-    unsigned    u;                      /* Local index variable */
-    herr_t     ret_value = SUCCEED;     /* Return value */
+    H5G_node_t *sn   = NULL;
+    H5HL_t *    heap = NULL;
+    unsigned    u;                   /* Local index variable */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1498,57 +1468,55 @@ H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
     HDassert(fwidth >= 0);
 
     /* Pin the heap down in memory */
-    if(heap_addr > 0 && H5F_addr_defined(heap_addr))
-        if(NULL == (heap = H5HL_protect(f, dxpl_id, heap_addr, H5AC_READ)))
+    if (heap_addr > 0 && H5F_addr_defined(heap_addr))
+        if (NULL == (heap = H5HL_protect(f, dxpl_id, heap_addr, H5AC_READ)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, FAIL, "unable to protect symbol table heap")
 
     /*
      * If we couldn't load the symbol table node, then try loading the
      * B-tree node.
      */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ))) {
-        H5G_bt_common_t	udata;		/*data to pass through B-tree	*/
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ))) {
+        H5G_bt_common_t udata; /*data to pass through B-tree	*/
 
         H5E_clear_stack(NULL); /* discard that error */
         udata.heap = heap;
-        if(H5B_debug(f, dxpl_id, addr, stream, indent, fwidth, H5B_SNODE, &udata) < 0)
+        if (H5B_debug(f, dxpl_id, addr, stream, indent, fwidth, H5B_SNODE, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, FAIL, "unable to debug B-tree node");
     } /* end if */
     else {
         HDfprintf(stream, "%*sSymbol Table Node...\n", indent, "");
         HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                "Dirty:",
-                sn->cache_info.is_dirty ? "Yes" : "No");
+                  "Dirty:", sn->cache_info.is_dirty ? "Yes" : "No");
         HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                "Size of Node (in bytes):", (unsigned)sn->node_size);
-        HDfprintf(stream, "%*s%-*s %u of %u\n", indent, "", fwidth,
-                "Number of Symbols:",
-                sn->nsyms, (unsigned)(2 * H5F_SYM_LEAF_K(f)));
+                  "Size of Node (in bytes):", (unsigned)sn->node_size);
+        HDfprintf(stream, "%*s%-*s %u of %u\n", indent, "", fwidth, "Number of Symbols:", sn->nsyms,
+                  (unsigned)(2 * H5F_SYM_LEAF_K(f)));
 
         indent += 3;
         fwidth = MAX(0, fwidth - 3);
-        for(u = 0; u < sn->nsyms; u++) {
+        for (u = 0; u < sn->nsyms; u++) {
             HDfprintf(stream, "%*sSymbol %u:\n", indent - 3, "", u);
 
-            if(heap) {
+            if (heap) {
                 const char *s = (const char *)H5HL_offset_into(heap, sn->entry[u].name_off);
 
-                if(s)
+                if (s)
                     HDfprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth, "Name:", s);
             } /* end if */
             else
-                HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Warning: Invalid heap address given, name not displayed!");
+                HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
+                          "Warning: Invalid heap address given, name not displayed!");
 
             H5G__ent_debug(sn->entry + u, stream, indent, fwidth, heap);
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
 done:
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to release symbol table node")
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_debug() */
-
diff --git a/src/H5Gobj.c b/src/H5Gobj.c
index 97c9a76..62832b5 100644
--- a/src/H5Gobj.c
+++ b/src/H5Gobj.c
@@ -26,28 +26,25 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Lprivate.h"         /* Links			  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"         /* Property Lists			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5HLprivate.h" /* Local Heaps				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Lprivate.h"  /* Links			  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Pprivate.h"  /* Property Lists			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -56,59 +53,50 @@
  * link storage
  */
 typedef struct {
-    H5F_t      *f;              /* Pointer to file for insertion */
-    hid_t       dxpl_id;        /* DXPL during insertion */
-    H5O_linfo_t *linfo;         /* Pointer to link info */
+    H5F_t *      f;       /* Pointer to file for insertion */
+    hid_t        dxpl_id; /* DXPL during insertion */
+    H5O_linfo_t *linfo;   /* Pointer to link info */
 } H5G_obj_oh_it_ud1_t;
 
 /* User data for link iterator when converting dense link storage to link
  * messages
  */
 typedef struct {
-    H5O_link_t *lnk_table;              /* Array of links to convert */
-    size_t nlinks;                      /* Number of links converted */
-    size_t alloc_links;                 /* Size of link table        */
+    H5O_link_t *lnk_table;   /* Array of links to convert */
+    size_t      nlinks;      /* Number of links converted */
+    size_t      alloc_links; /* Size of link table        */
 } H5G_obj_lnk_it_ud1_t;
 
 /* User data for symbol table iterator when converting old-format group to
  * a new-format group
  */
 typedef struct {
-    const H5O_loc_t   *grp_oloc;              /* Pointer to group for insertion */
-    hid_t       dxpl_id;                /* DXPL during insertion */
+    const H5O_loc_t *grp_oloc; /* Pointer to group for insertion */
+    hid_t            dxpl_id;  /* DXPL during insertion */
 } H5G_obj_stab_it_ud1_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5G_obj_compact_to_dense_cb(const void *_mesg, unsigned idx,
-    void *_udata);
-static herr_t H5G_obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *linfo,
-    hid_t dxpl_id);
-
+static herr_t H5G_obj_compact_to_dense_cb(const void *_mesg, unsigned idx, void *_udata);
+static herr_t H5G_obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__obj_create
  *
@@ -123,14 +111,13 @@ static herr_t H5G_obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *li
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info,
-    H5O_loc_t *oloc/*out*/)
+H5G__obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info, H5O_loc_t *oloc /*out*/)
 {
-    H5P_genplist_t  *gc_plist;          /* Group creation property list */
-    H5O_ginfo_t ginfo;                  /* Group info */
-    H5O_linfo_t linfo;                  /* Link info */
-    H5O_pline_t pline;                  /* Pipeline */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *gc_plist;            /* Group creation property list */
+    H5O_ginfo_t     ginfo;               /* Group info */
+    H5O_linfo_t     linfo;               /* Link info */
+    H5O_pline_t     pline;               /* Pipeline */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -141,30 +128,29 @@ H5G__obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info,
     HDassert(oloc);
 
     /* Get the property list */
-    if(NULL == (gc_plist = (H5P_genplist_t *)H5I_object(gcrt_info->gcpl_id)))
+    if (NULL == (gc_plist = (H5P_genplist_t *)H5I_object(gcrt_info->gcpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Get the group info property */
-    if(H5P_get(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+    if (H5P_get(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get group info")
 
     /* Get the link info property */
-    if(H5P_get(gc_plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
+    if (H5P_get(gc_plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get group info")
 
     /* Get the pipeline property */
-    if(H5P_get(gc_plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(gc_plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get group info")
 
     /* Call the "real" group creation routine now */
-    if(H5G__obj_create_real(f, dxpl_id, &ginfo, &linfo, &pline, gcrt_info, oloc) < 0)
+    if (H5G__obj_create_real(f, dxpl_id, &ginfo, &linfo, &pline, gcrt_info, oloc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCREATE, FAIL, "unable to create group")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__obj_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__obj_create_real
  *
@@ -179,14 +165,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
-    const H5O_linfo_t *linfo, const H5O_pline_t *pline,
-    H5G_obj_create_t *gcrt_info, H5O_loc_t *oloc/*out*/)
+H5G__obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo, const H5O_linfo_t *linfo,
+                     const H5O_pline_t *pline, H5G_obj_create_t *gcrt_info, H5O_loc_t *oloc /*out*/)
 {
-    size_t hdr_size;                    /* Size of object header to request */
-    hbool_t use_latest_format;          /* Flag indicating the new group format should be used */
-    hid_t gcpl_id = gcrt_info->gcpl_id; /* Group creation property list ID */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t  hdr_size;                       /* Size of object header to request */
+    hbool_t use_latest_format;              /* Flag indicating the new group format should be used */
+    hid_t   gcpl_id   = gcrt_info->gcpl_id; /* Group creation property list ID */
+    herr_t  ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -200,13 +185,12 @@ H5G__obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
     HDassert(oloc);
 
     /* Check for invalid access request */
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file")
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file")
 
     /* Check for using the latest version of the group format */
     /* (add more checks for creating "new format" groups when needed) */
-    if(H5F_USE_LATEST_FORMAT(f) || linfo->track_corder
-            || (pline && pline->nused))
+    if (H5F_USE_LATEST_FORMAT(f) || linfo->track_corder || (pline && pline->nused))
         use_latest_format = TRUE;
     else
         use_latest_format = FALSE;
@@ -214,17 +198,17 @@ H5G__obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
     /* Make certain that the creation order is being tracked if an index is
      *  going to be built on it.
      */
-    if(linfo->index_corder && !linfo->track_corder)
-	HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "must track creation order to create index for it")
+    if (linfo->index_corder && !linfo->track_corder)
+        HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "must track creation order to create index for it")
 
     /* Check if we should be using the latest version of the group format */
-    if(use_latest_format) {
-        H5O_link_t lnk;                     /* Temporary link message info for computing message size */
-        char null_char = '\0';              /* Character for creating null string */
-        size_t ginfo_size;                  /* Size of the group info message */
-        size_t linfo_size;                  /* Size of the link info message */
-        size_t pline_size = 0;              /* Size of the pipeline message */
-        size_t link_size;                   /* Size of a link message */
+    if (use_latest_format) {
+        H5O_link_t lnk;              /* Temporary link message info for computing message size */
+        char       null_char = '\0'; /* Character for creating null string */
+        size_t     ginfo_size;       /* Size of the group info message */
+        size_t     linfo_size;       /* Size of the link info message */
+        size_t     pline_size = 0;   /* Size of the pipeline message */
+        size_t     link_size;        /* Size of a link message */
 
         /* Calculate message size information, for creating group's object header */
         linfo_size = H5O_msg_size_f(f, gcpl_id, H5O_LINFO_ID, linfo, (size_t)0);
@@ -233,24 +217,21 @@ H5G__obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
         ginfo_size = H5O_msg_size_f(f, gcpl_id, H5O_GINFO_ID, ginfo, (size_t)0);
         HDassert(ginfo_size);
 
-        if(pline && pline->nused) {
+        if (pline && pline->nused) {
             pline_size = H5O_msg_size_f(f, gcpl_id, H5O_PLINE_ID, pline, (size_t)0);
             HDassert(pline_size);
         } /* end if */
 
-        lnk.type = H5L_TYPE_HARD;
-        lnk.corder = 0;
+        lnk.type         = H5L_TYPE_HARD;
+        lnk.corder       = 0;
         lnk.corder_valid = linfo->track_corder;
-        lnk.cset = H5T_CSET_ASCII;
-        lnk.name = &null_char;
-        link_size = H5O_msg_size_f(f, gcpl_id, H5O_LINK_ID, &lnk, (size_t)ginfo->est_name_len);
+        lnk.cset         = H5T_CSET_ASCII;
+        lnk.name         = &null_char;
+        link_size        = H5O_msg_size_f(f, gcpl_id, H5O_LINK_ID, &lnk, (size_t)ginfo->est_name_len);
         HDassert(link_size);
 
         /* Compute size of header to use for creation */
-        hdr_size = linfo_size +
-                    ginfo_size +
-                    pline_size +
-                    (ginfo->est_num_entries * link_size);
+        hdr_size = linfo_size + ginfo_size + pline_size + (ginfo->est_num_entries * link_size);
     } /* end if */
     else
         hdr_size = (size_t)(4 + 2 * H5F_SIZEOF_ADDR(f));
@@ -260,45 +241,44 @@ H5G__obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
      * since nothing refers to it yet.	The link count will be
      * incremented if the object is added to the group directed graph.
      */
-    if(H5O_create(f, dxpl_id, hdr_size, (size_t)1, gcpl_id, oloc/*out*/) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create header")
+    if (H5O_create(f, dxpl_id, hdr_size, (size_t)1, gcpl_id, oloc /*out*/) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create header")
 
     /* Check for format of group to create */
-    if(use_latest_format) {
+    if (use_latest_format) {
         /* Insert link info message */
         /* (Casting away const OK - QAK) */
-        if(H5O_msg_create(oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, (void *)linfo, dxpl_id) < 0)
+        if (H5O_msg_create(oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, (void *)linfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
 
         /* Insert group info message */
         /* (Casting away const OK - QAK) */
-        if(H5O_msg_create(oloc, H5O_GINFO_ID, H5O_MSG_FLAG_CONSTANT, 0, (void *)ginfo, dxpl_id) < 0)
+        if (H5O_msg_create(oloc, H5O_GINFO_ID, H5O_MSG_FLAG_CONSTANT, 0, (void *)ginfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
 
         /* Insert pipeline message */
-        if(pline && pline->nused)
+        if (pline && pline->nused)
             /* (Casting away const OK - QAK) */
-            if(H5O_msg_create(oloc, H5O_PLINE_ID, H5O_MSG_FLAG_CONSTANT, 0, (void *)pline, dxpl_id) < 0)
+            if (H5O_msg_create(oloc, H5O_PLINE_ID, H5O_MSG_FLAG_CONSTANT, 0, (void *)pline, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
     } /* end if */
     else {
-        H5O_stab_t	stab;		/* Symbol table message	*/
+        H5O_stab_t stab; /* Symbol table message	*/
 
         /* The group doesn't currently have a 'stab' message, go create one */
-        if(H5G__stab_create(oloc, dxpl_id, ginfo, &stab) < 0)
+        if (H5G__stab_create(oloc, dxpl_id, ginfo, &stab) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create symbol table")
 
         /* Cache the symbol table information */
-        gcrt_info->cache_type = H5G_CACHED_STAB;
+        gcrt_info->cache_type            = H5G_CACHED_STAB;
         gcrt_info->cache.stab.btree_addr = stab.btree_addr;
-        gcrt_info->cache.stab.heap_addr = stab.heap_addr;
+        gcrt_info->cache.stab.heap_addr  = stab.heap_addr;
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__obj_create_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__obj_get_linfo
  *
@@ -317,8 +297,8 @@ done:
 htri_t
 H5G__obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
 {
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    htri_t ret_value;           /* Return value */
+    H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
+    htri_t  ret_value;       /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -327,43 +307,42 @@ H5G__obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
     HDassert(linfo);
 
     /* Check for the group having a link info message */
-    if((ret_value = H5O_msg_exists(grp_oloc, H5O_LINFO_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read object header")
-    if(ret_value) {
+    if ((ret_value = H5O_msg_exists(grp_oloc, H5O_LINFO_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read object header")
+    if (ret_value) {
         /* Retrieve the "link info" structure */
-        if(NULL == H5O_msg_read(grp_oloc, H5O_LINFO_ID, linfo, dxpl_id))
+        if (NULL == H5O_msg_read(grp_oloc, H5O_LINFO_ID, linfo, dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "link info message not present")
 
         /* Check if we don't know how many links there are */
-        if(linfo->nlinks == HSIZET_MAX) {
+        if (linfo->nlinks == HSIZET_MAX) {
             /* Check if we are using "dense" link storage */
-            if(H5F_addr_defined(linfo->fheap_addr)) {
+            if (H5F_addr_defined(linfo->fheap_addr)) {
                 /* Open the name index v2 B-tree */
-                if(NULL == (bt2_name = H5B2_open(grp_oloc->file, dxpl_id, linfo->name_bt2_addr, NULL)))
+                if (NULL == (bt2_name = H5B2_open(grp_oloc->file, dxpl_id, linfo->name_bt2_addr, NULL)))
                     HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
                 /* Retrieve # of records in "name" B-tree */
                 /* (should be same # of records in all indices) */
-                if(H5B2_get_nrec(bt2_name, &linfo->nlinks) < 0)
+                if (H5B2_get_nrec(bt2_name, &linfo->nlinks) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve # of records in index")
             } /* end if */
             else {
                 /* Retrieve # of links from object header */
-                if(H5O_get_nlinks(grp_oloc, dxpl_id, &linfo->nlinks) < 0)
+                if (H5O_get_nlinks(grp_oloc, dxpl_id, &linfo->nlinks) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve # of links for object")
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__obj_get_linfo() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_compact_to_dense_cb
  *
@@ -381,9 +360,9 @@ done:
 static herr_t
 H5G_obj_compact_to_dense_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata)
 {
-    const H5O_link_t *lnk = (const H5O_link_t *)_mesg;  /* Pointer to link */
-    H5G_obj_oh_it_ud1_t *udata = (H5G_obj_oh_it_ud1_t *)_udata;     /* 'User data' passed in */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    const H5O_link_t *   lnk       = (const H5O_link_t *)_mesg;     /* Pointer to link */
+    H5G_obj_oh_it_ud1_t *udata     = (H5G_obj_oh_it_ud1_t *)_udata; /* 'User data' passed in */
+    herr_t               ret_value = H5_ITER_CONT;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -392,14 +371,13 @@ H5G_obj_compact_to_dense_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void
     HDassert(udata);
 
     /* Insert link into dense link storage */
-    if(H5G__dense_insert(udata->f, udata->dxpl_id, udata->linfo, lnk) < 0)
+    if (H5G__dense_insert(udata->f, udata->dxpl_id, udata->linfo, lnk) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert link into dense storage")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_compact_to_dense_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_stab_to_new_cb
  *
@@ -417,8 +395,8 @@ done:
 static herr_t
 H5G_obj_stab_to_new_cb(const H5O_link_t *lnk, void *_udata)
 {
-    H5G_obj_stab_it_ud1_t *udata = (H5G_obj_stab_it_ud1_t *)_udata;     /* 'User data' passed in */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    H5G_obj_stab_it_ud1_t *udata     = (H5G_obj_stab_it_ud1_t *)_udata; /* 'User data' passed in */
+    herr_t                 ret_value = H5_ITER_CONT;                    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -428,15 +406,14 @@ H5G_obj_stab_to_new_cb(const H5O_link_t *lnk, void *_udata)
 
     /* Insert link into group */
     /* (Casting away const OK - QAK) */
-    if(H5G_obj_insert(udata->grp_oloc, lnk->name, (H5O_link_t *)lnk, FALSE,
-            H5O_TYPE_UNKNOWN, NULL, udata->dxpl_id) < 0)
+    if (H5G_obj_insert(udata->grp_oloc, lnk->name, (H5O_link_t *)lnk, FALSE, H5O_TYPE_UNKNOWN, NULL,
+                       udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert link into group")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_stab_to_new_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_insert
  *
@@ -455,16 +432,16 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
-    hbool_t adj_link, H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id)
+H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk, hbool_t adj_link,
+               H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id)
 {
-    H5O_pline_t tmp_pline;      /* Pipeline message */
-    H5O_pline_t *pline = NULL;  /* Pointer to pipeline message */
-    H5O_linfo_t linfo;		/* Link info message */
-    htri_t linfo_exists;        /* Whether the link info message exists */
-    hbool_t use_old_format;     /* Whether to use 'old format' (symbol table) for insertions or not */
-    hbool_t use_new_dense = FALSE;      /* Whether to use "dense" form of 'new format' group */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_pline_t  tmp_pline;             /* Pipeline message */
+    H5O_pline_t *pline = NULL;          /* Pointer to pipeline message */
+    H5O_linfo_t  linfo;                 /* Link info message */
+    htri_t       linfo_exists;          /* Whether the link info message exists */
+    hbool_t      use_old_format;        /* Whether to use 'old format' (symbol table) for insertions or not */
+    hbool_t      use_new_dense = FALSE; /* Whether to use "dense" form of 'new format' group */
+    herr_t       ret_value     = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -475,19 +452,19 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
 
     /* Check if we have information about the number of objects in this group */
     /* (by attempting to get the link info message for this group) */
-    if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
-        H5O_ginfo_t ginfo;	/* Group info message */
-        size_t link_msg_size;   /* Size of new link message in the file */
+    if (linfo_exists) {
+        H5O_ginfo_t ginfo;         /* Group info message */
+        size_t      link_msg_size; /* Size of new link message in the file */
 
         /* Using the new format for groups */
         use_old_format = FALSE;
 
         /* Check for tracking creation order on this group's links */
-        if(linfo.track_corder) {
+        if (linfo.track_corder) {
             /* Set the creation order for the new link & indicate that it's valid */
-            obj_lnk->corder = linfo.max_corder;
+            obj_lnk->corder       = linfo.max_corder;
             obj_lnk->corder_valid = TRUE;
 
             /* Increment the max. creation order used in the group */
@@ -495,92 +472,93 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
         } /* end if */
 
         /* Get the link's message size */
-        if((link_msg_size = H5O_msg_raw_size(grp_oloc->file, H5O_LINK_ID, FALSE, obj_lnk)) == 0)
+        if ((link_msg_size = H5O_msg_raw_size(grp_oloc->file, H5O_LINK_ID, FALSE, obj_lnk)) == 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, FAIL, "can't get link size")
 
         /* Get the group info */
-        if(NULL == H5O_msg_read(grp_oloc, H5O_GINFO_ID, &ginfo, dxpl_id))
+        if (NULL == H5O_msg_read(grp_oloc, H5O_GINFO_ID, &ginfo, dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get group info")
 
         /* If there's still a small enough number of links, use the 'link' message */
         /* (If the encoded form of the link is too large to fit into an object
          *  header message, convert to using dense link storage instead of link messages)
          */
-        if(H5F_addr_defined(linfo.fheap_addr))
+        if (H5F_addr_defined(linfo.fheap_addr))
             use_new_dense = TRUE;
-        else if(linfo.nlinks < ginfo.max_compact && link_msg_size < H5O_MESG_MAX_SIZE)
+        else if (linfo.nlinks < ginfo.max_compact && link_msg_size < H5O_MESG_MAX_SIZE)
             use_new_dense = FALSE;
         else {
-            htri_t              pline_exists;   /* Whether the pipeline message exists */
-            H5G_obj_oh_it_ud1_t	udata;          /* User data for iteration */
-            H5O_mesg_operator_t op;             /* Message operator */
+            htri_t              pline_exists; /* Whether the pipeline message exists */
+            H5G_obj_oh_it_ud1_t udata;        /* User data for iteration */
+            H5O_mesg_operator_t op;           /* Message operator */
 
             /* Get the pipeline message, if it exists */
-            if((pline_exists = H5O_msg_exists(grp_oloc, H5O_PLINE_ID, dxpl_id)) < 0)
+            if ((pline_exists = H5O_msg_exists(grp_oloc, H5O_PLINE_ID, dxpl_id)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read object header")
-            if(pline_exists) {
-                if(NULL == H5O_msg_read(grp_oloc, H5O_PLINE_ID, &tmp_pline, dxpl_id))
+            if (pline_exists) {
+                if (NULL == H5O_msg_read(grp_oloc, H5O_PLINE_ID, &tmp_pline, dxpl_id))
                     HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link pipeline")
                 pline = &tmp_pline;
             } /* end if */
 
             /* The group doesn't currently have "dense" storage for links */
-            if(H5G__dense_create(grp_oloc->file, dxpl_id, &linfo, pline) < 0)
+            if (H5G__dense_create(grp_oloc->file, dxpl_id, &linfo, pline) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create 'dense' form of new format group")
 
             /* Set up user data for object header message iteration */
-            udata.f = grp_oloc->file;
+            udata.f       = grp_oloc->file;
             udata.dxpl_id = dxpl_id;
-            udata.linfo = &linfo;
+            udata.linfo   = &linfo;
 
             /* Iterate over the 'link' messages, inserting them into the dense link storage  */
-            op.op_type = H5O_MESG_OP_APP;
+            op.op_type  = H5O_MESG_OP_APP;
             op.u.app_op = H5G_obj_compact_to_dense_cb;
-            if(H5O_msg_iterate(grp_oloc, H5O_LINK_ID, &op, &udata, dxpl_id) < 0)
+            if (H5O_msg_iterate(grp_oloc, H5O_LINK_ID, &op, &udata, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "error iterating over links")
 
             /* Remove all the 'link' messages */
-            if(H5O_msg_remove(grp_oloc, H5O_LINK_ID, H5O_ALL, FALSE, dxpl_id) < 0)
+            if (H5O_msg_remove(grp_oloc, H5O_LINK_ID, H5O_ALL, FALSE, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete link messages")
 
             use_new_dense = TRUE;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Check for new-style link information */
-        if(obj_lnk->cset != H5T_CSET_ASCII || obj_lnk->type > H5L_TYPE_BUILTIN_MAX) {
-            H5O_linfo_t new_linfo = H5G_CRT_LINK_INFO_DEF;  /* Link information */
-            H5O_ginfo_t new_ginfo = H5G_CRT_GROUP_INFO_DEF; /* Group information */
-            H5G_obj_stab_it_ud1_t udata;        /* User data for iteration */
+        if (obj_lnk->cset != H5T_CSET_ASCII || obj_lnk->type > H5L_TYPE_BUILTIN_MAX) {
+            H5O_linfo_t           new_linfo = H5G_CRT_LINK_INFO_DEF;  /* Link information */
+            H5O_ginfo_t           new_ginfo = H5G_CRT_GROUP_INFO_DEF; /* Group information */
+            H5G_obj_stab_it_ud1_t udata;                              /* User data for iteration */
 
             /* Convert group to "new format" group, in order to hold the information */
 
             /* Insert link info message */
-            if(H5O_msg_create(grp_oloc, H5O_LINFO_ID, 0, 0, &new_linfo, dxpl_id) < 0)
+            if (H5O_msg_create(grp_oloc, H5O_LINFO_ID, 0, 0, &new_linfo, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
 
             /* Insert group info message */
-            if(H5O_msg_create(grp_oloc, H5O_GINFO_ID, H5O_MSG_FLAG_CONSTANT, H5O_UPDATE_TIME, &new_ginfo, dxpl_id) < 0)
+            if (H5O_msg_create(grp_oloc, H5O_GINFO_ID, H5O_MSG_FLAG_CONSTANT, H5O_UPDATE_TIME, &new_ginfo,
+                               dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
 
             /* Set up user data for iteration */
             udata.grp_oloc = grp_oloc;
-            udata.dxpl_id = dxpl_id;
+            udata.dxpl_id  = dxpl_id;
 
             /* Iterate through all links in "old format" group and insert them into new format */
-            if(H5G__stab_iterate(grp_oloc, dxpl_id, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_obj_stab_to_new_cb, &udata) < 0)
+            if (H5G__stab_iterate(grp_oloc, dxpl_id, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_obj_stab_to_new_cb,
+                                  &udata) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over old format links")
 
             /* Remove the symbol table message from the group */
-            if(H5O_msg_remove(grp_oloc, H5O_STAB_ID, 0, FALSE, dxpl_id) < 0)
+            if (H5O_msg_remove(grp_oloc, H5O_STAB_ID, 0, FALSE, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete old format link storage")
 
             /* Recursively call this routine to insert the new link, since the
              *  group is in the "new format" now and the link info should be
              *  set up, etc.
              */
-            if(H5G_obj_insert(grp_oloc, name, obj_lnk, adj_link, obj_type,
-                    crt_info, dxpl_id) < 0)
+            if (H5G_obj_insert(grp_oloc, name, obj_lnk, adj_link, obj_type, crt_info, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert link into group")
 
             /* Done with insertion now */
@@ -591,35 +569,34 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
     } /* end if */
 
     /* Insert into symbol table or "dense" storage */
-    if(use_old_format) {
+    if (use_old_format) {
         /* Insert into symbol table */
-        if(H5G__stab_insert(grp_oloc, name, obj_lnk, obj_type, crt_info, dxpl_id)
-                < 0)
+        if (H5G__stab_insert(grp_oloc, name, obj_lnk, obj_type, crt_info, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert entry into symbol table")
     } /* end if */
     else {
-        if(use_new_dense) {
+        if (use_new_dense) {
             /* Insert into dense link storage */
-            if(H5G__dense_insert(grp_oloc->file, dxpl_id, &linfo, obj_lnk) < 0)
+            if (H5G__dense_insert(grp_oloc->file, dxpl_id, &linfo, obj_lnk) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert link into dense storage")
         } /* end if */
         else {
             /* Insert with link message */
-            if(H5G__compact_insert(grp_oloc, obj_lnk, dxpl_id) < 0)
+            if (H5G__compact_insert(grp_oloc, obj_lnk, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert link as link message")
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
     /* Increment the number of objects in this group */
-    if(!use_old_format) {
+    if (!use_old_format) {
         linfo.nlinks++;
-        if(H5O_msg_write(grp_oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, &linfo, dxpl_id) < 0)
+        if (H5O_msg_write(grp_oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, &linfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't update link info message")
     } /* end if */
 
     /* Increment link count on object, if requested and it's a hard link */
-    if(adj_link && obj_lnk->type == H5L_TYPE_HARD) {
-        H5O_loc_t obj_oloc;             /* Object location */
+    if (adj_link && obj_lnk->type == H5L_TYPE_HARD) {
+        H5O_loc_t obj_oloc; /* Object location */
         H5O_loc_reset(&obj_oloc);
 
         /* Create temporary object location */
@@ -627,19 +604,18 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
         obj_oloc.addr = obj_lnk->u.hard.addr;
 
         /* Increment reference count for object */
-        if(H5O_link(&obj_oloc, 1, dxpl_id) < 0)
+        if (H5O_link(&obj_oloc, 1, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_LINKCOUNT, FAIL, "unable to increment hard link count")
     } /* end if */
 
 done:
     /* Free any space used by the pipeline message */
-    if(pline && H5O_msg_reset(H5O_PLINE_ID, pline) < 0)
+    if (pline && H5O_msg_reset(H5O_PLINE_ID, pline) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "can't release pipeline")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__obj_iterate
  *
@@ -656,13 +632,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__obj_iterate(const H5O_loc_t *grp_oloc,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    H5G_lib_iterate_t op, void *op_data, hid_t dxpl_id)
+H5G__obj_iterate(const H5O_loc_t *grp_oloc, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
+                 hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data, hid_t dxpl_id)
 {
-    H5O_linfo_t	linfo;		/* Link info message */
-    htri_t linfo_exists;        /* Whether the link info message exists */
-    herr_t ret_value;           /* Return value */
+    H5O_linfo_t linfo;        /* Link info message */
+    htri_t      linfo_exists; /* Whether the link info message exists */
+    herr_t      ret_value;    /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -671,38 +646,40 @@ H5G__obj_iterate(const H5O_loc_t *grp_oloc,
     HDassert(op);
 
     /* Attempt to get the link info for this group */
-    if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
+    if (linfo_exists) {
         /* Check for going out of bounds */
-        if(skip > 0 && (size_t)skip >= linfo.nlinks)
+        if (skip > 0 && (size_t)skip >= linfo.nlinks)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
 
         /* Check for creation order tracking, if creation order index lookup requested */
-        if(idx_type == H5_INDEX_CRT_ORDER) {
+        if (idx_type == H5_INDEX_CRT_ORDER) {
             /* Check if creation order is tracked */
-            if(!linfo.track_corder)
+            if (!linfo.track_corder)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "creation order not tracked for links in group")
         } /* end if */
 
-        if(H5F_addr_defined(linfo.fheap_addr)) {
+        if (H5F_addr_defined(linfo.fheap_addr)) {
             /* Iterate over the links in the group, building a table of the link messages */
-            if((ret_value = H5G__dense_iterate(grp_oloc->file, dxpl_id, &linfo, idx_type, order, skip, last_lnk, op, op_data)) < 0)
+            if ((ret_value = H5G__dense_iterate(grp_oloc->file, dxpl_id, &linfo, idx_type, order, skip,
+                                                last_lnk, op, op_data)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over dense links")
         } /* end if */
         else {
             /* Get the object's name from the link messages */
-            if((ret_value = H5G__compact_iterate(grp_oloc, dxpl_id, &linfo, idx_type, order, skip, last_lnk, op, op_data)) < 0)
+            if ((ret_value = H5G__compact_iterate(grp_oloc, dxpl_id, &linfo, idx_type, order, skip, last_lnk,
+                                                  op, op_data)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over compact links")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Can only perform name lookups on groups with symbol tables */
-        if(idx_type != H5_INDEX_NAME)
+        if (idx_type != H5_INDEX_NAME)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "no creation order index to query")
 
         /* Iterate over symbol table */
-        if((ret_value = H5G__stab_iterate(grp_oloc, dxpl_id, order, skip, last_lnk, op, op_data)) < 0)
+        if ((ret_value = H5G__stab_iterate(grp_oloc, dxpl_id, order, skip, last_lnk, op, op_data)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over symbol table")
     } /* end else */
 
@@ -710,7 +687,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__obj_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__obj_info
  *
@@ -727,13 +703,13 @@ done:
 herr_t
 H5G__obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
 {
-    H5G_t *grp = NULL;                  /* Group to query */
-    H5G_loc_t   grp_loc;                /* Entry of group to be queried */
-    H5G_name_t  grp_path;            	/* Group hier. path */
-    H5O_loc_t   grp_oloc;            	/* Group object location */
-    H5O_linfo_t	linfo;		        /* Link info message */
-    htri_t linfo_exists;                /* Whether the link info message exists */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_t *     grp = NULL;          /* Group to query */
+    H5G_loc_t   grp_loc;             /* Entry of group to be queried */
+    H5G_name_t  grp_path;            /* Group hier. path */
+    H5O_loc_t   grp_oloc;            /* Group object location */
+    H5O_linfo_t linfo;               /* Link info message */
+    htri_t      linfo_exists;        /* Whether the link info message exists */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -747,49 +723,48 @@ H5G__obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
     H5G_loc_reset(&grp_loc);
 
     /* Deep copy (duplicate) of the group location object */
-    if(H5O_loc_copy(&grp_oloc, oloc, H5_COPY_DEEP) < 0)
+    if (H5O_loc_copy(&grp_oloc, oloc, H5_COPY_DEEP) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, FAIL, "can't copy object location")
 
     /* Open the group */
-    if(NULL == (grp = H5G_open(&grp_loc, dxpl_id)))
+    if (NULL == (grp = H5G_open(&grp_loc, dxpl_id)))
         HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount point not found")
 
     /* Get information from the group */
     grp_info->mounted = H5G_MOUNTED(grp);
 
     /* Attempt to get the link info for this group */
-    if((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
+    if (linfo_exists) {
         /* Retrieve the information about the links */
-        grp_info->nlinks = linfo.nlinks;
+        grp_info->nlinks     = linfo.nlinks;
         grp_info->max_corder = linfo.max_corder;
 
         /* Check if the group is using compact or dense storage for its links */
-        if(H5F_addr_defined(linfo.fheap_addr))
+        if (H5F_addr_defined(linfo.fheap_addr))
             grp_info->storage_type = H5G_STORAGE_TYPE_DENSE;
         else
             grp_info->storage_type = H5G_STORAGE_TYPE_COMPACT;
     } /* end if */
     else {
         /* Get the number of objects in this group by iterating over symbol table */
-        if(H5G__stab_count(oloc, &grp_info->nlinks, dxpl_id) < 0)
+        if (H5G__stab_count(oloc, &grp_info->nlinks, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "can't count objects")
 
         /* Set the other information about the group */
         grp_info->storage_type = H5G_STORAGE_TYPE_SYMBOL_TABLE;
-        grp_info->max_corder = 0;
+        grp_info->max_corder   = 0;
     } /* end else */
 
 done:
     /* Clean up resources */
-    if(grp && H5G_close(grp) < 0)
+    if (grp && H5G_close(grp) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTCLOSEOBJ, FAIL, "unable to close queried group")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__obj_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_get_name_by_idx
  *
@@ -804,12 +779,12 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5G_obj_get_name_by_idx(const H5O_loc_t *oloc, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, char* name, size_t size, hid_t dxpl_id)
+H5G_obj_get_name_by_idx(const H5O_loc_t *oloc, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                        char *name, size_t size, hid_t dxpl_id)
 {
-    H5O_linfo_t	linfo;		/* Link info message */
-    htri_t linfo_exists;        /* Whether the link info message exists */
-    ssize_t ret_value;          /* Return value */
+    H5O_linfo_t linfo;        /* Link info message */
+    htri_t      linfo_exists; /* Whether the link info message exists */
+    ssize_t     ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -817,35 +792,37 @@ H5G_obj_get_name_by_idx(const H5O_loc_t *oloc, H5_index_t idx_type,
     HDassert(oloc && oloc->file);
 
     /* Attempt to get the link info for this group */
-    if((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
+    if (linfo_exists) {
         /* Check for creation order tracking, if creation order index lookup requested */
-        if(idx_type == H5_INDEX_CRT_ORDER) {
+        if (idx_type == H5_INDEX_CRT_ORDER) {
             /* Check if creation order is tracked */
-            if(!linfo.track_corder)
+            if (!linfo.track_corder)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "creation order not tracked for links in group")
         } /* end if */
 
         /* Check for dense link storage */
-        if(H5F_addr_defined(linfo.fheap_addr)) {
+        if (H5F_addr_defined(linfo.fheap_addr)) {
             /* Get the object's name from the dense link storage */
-            if((ret_value = H5G__dense_get_name_by_idx(oloc->file, dxpl_id, &linfo, idx_type, order, n, name, size)) < 0)
+            if ((ret_value = H5G__dense_get_name_by_idx(oloc->file, dxpl_id, &linfo, idx_type, order, n, name,
+                                                        size)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate name")
         } /* end if */
         else {
             /* Get the object's name from the link messages */
-            if((ret_value = H5G__compact_get_name_by_idx(oloc, dxpl_id, &linfo, idx_type, order, n, name, size)) < 0)
+            if ((ret_value =
+                     H5G__compact_get_name_by_idx(oloc, dxpl_id, &linfo, idx_type, order, n, name, size)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate name")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Can only perform name lookups on groups with symbol tables */
-        if(idx_type != H5_INDEX_NAME)
+        if (idx_type != H5_INDEX_NAME)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "no creation order index to query")
 
         /* Get the object's name from the symbol table */
-        if((ret_value = H5G__stab_get_name_by_idx(oloc, order, n, name, size, dxpl_id)) < 0)
+        if ((ret_value = H5G__stab_get_name_by_idx(oloc, order, n, name, size, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate name")
     } /* end else */
 
@@ -853,7 +830,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_get_name_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_remove_update_linfo
  *
@@ -870,7 +846,7 @@ done:
 static herr_t
 H5G_obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -882,87 +858,90 @@ H5G_obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxp
     linfo->nlinks--;
 
     /* Reset the creation order min/max if there's no more links in group */
-    if(linfo->nlinks == 0)
+    if (linfo->nlinks == 0)
         linfo->max_corder = 0;
 
     /* Check for transitioning out of dense storage, if we are using it */
-    if(H5F_addr_defined(linfo->fheap_addr)) {
+    if (H5F_addr_defined(linfo->fheap_addr)) {
         /* Check if there's no more links */
-        if(linfo->nlinks == 0) {
+        if (linfo->nlinks == 0) {
             /* Delete the dense storage */
-            if(H5G__dense_delete(oloc->file, dxpl_id, linfo, FALSE) < 0)
+            if (H5G__dense_delete(oloc->file, dxpl_id, linfo, FALSE) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete dense link storage")
         } /* end if */
         /* Check for switching back to compact storage */
         else {
-            H5O_ginfo_t ginfo;		/* Group info message            */
+            H5O_ginfo_t ginfo; /* Group info message            */
 
             /* Get the group info */
-            if(NULL == H5O_msg_read(oloc, H5O_GINFO_ID, &ginfo, dxpl_id))
+            if (NULL == H5O_msg_read(oloc, H5O_GINFO_ID, &ginfo, dxpl_id))
                 HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get group info")
 
             /* Check if we should switch from dense storage back to link messages */
-            if(linfo->nlinks < ginfo.min_dense) {
-                struct H5O_t *oh = NULL;      /* Pointer to group's object header */
-                H5G_link_table_t ltable;        /* Table of links */
-                hbool_t can_convert = TRUE;     /* Whether converting to link messages is possible */
-                size_t u;                       /* Local index */
+            if (linfo->nlinks < ginfo.min_dense) {
+                struct H5O_t *   oh = NULL;          /* Pointer to group's object header */
+                H5G_link_table_t ltable;             /* Table of links */
+                hbool_t          can_convert = TRUE; /* Whether converting to link messages is possible */
+                size_t           u;                  /* Local index */
 
                 /* Build the table of links for this group */
-                if(H5G__dense_build_table(oloc->file, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, &ltable) < 0)
+                if (H5G__dense_build_table(oloc->file, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE,
+                                           &ltable) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
 
                 /* Pin the object header */
-                if(NULL == (oh = H5O_pin(oloc, dxpl_id)))
+                if (NULL == (oh = H5O_pin(oloc, dxpl_id)))
                     HGOTO_ERROR(H5E_SYM, H5E_CANTPIN, FAIL, "unable to pin group object header")
 
                 /* Inspect links in table for ones that can't be converted back
                  * into link message form (currently only links which can't fit
                  * into an object header message)
                  */
-                for(u = 0; u < linfo->nlinks; u++)
-                    if(H5O_msg_size_oh(oloc->file, oh, H5O_LINK_ID, &(ltable.lnks[u]), (size_t)0) >= H5O_MESG_MAX_SIZE) {
+                for (u = 0; u < linfo->nlinks; u++)
+                    if (H5O_msg_size_oh(oloc->file, oh, H5O_LINK_ID, &(ltable.lnks[u]), (size_t)0) >=
+                        H5O_MESG_MAX_SIZE) {
                         can_convert = FALSE;
                         break;
                     } /* end if */
 
                 /* If ok, insert links as link messages */
-                if(can_convert) {
+                if (can_convert) {
                     /* Insert link messages into group */
-                    for(u = 0; u < linfo->nlinks; u++)
-                        if(H5O_msg_append_oh(oloc->file, dxpl_id, oh, H5O_LINK_ID, 0, H5O_UPDATE_TIME, &(ltable.lnks[u])) < 0) {
+                    for (u = 0; u < linfo->nlinks; u++)
+                        if (H5O_msg_append_oh(oloc->file, dxpl_id, oh, H5O_LINK_ID, 0, H5O_UPDATE_TIME,
+                                              &(ltable.lnks[u])) < 0) {
                             /* Release object header */
-                            if(H5O_unpin(oh) < 0)
-                                HDONE_ERROR(H5E_SYM, H5E_CANTUNPIN, FAIL, "unable to unpin group object header")
+                            if (H5O_unpin(oh) < 0)
+                                HDONE_ERROR(H5E_SYM, H5E_CANTUNPIN, FAIL,
+                                            "unable to unpin group object header")
 
                             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
                         } /* end if */
 
                     /* Remove the dense storage */
-                    if(H5G__dense_delete(oloc->file, dxpl_id, linfo, FALSE) < 0)
+                    if (H5G__dense_delete(oloc->file, dxpl_id, linfo, FALSE) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete dense link storage")
                 } /* end if */
 
                 /* Release object header */
-                if(H5O_unpin(oh) < 0)
+                if (H5O_unpin(oh) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTUNPIN, FAIL, "unable to unpin group object header")
 
                 /* Free link table information */
-                if(H5G__link_release_table(&ltable) < 0)
+                if (H5G__link_release_table(&ltable) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
             } /* end if */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
 
     /* Update link info in the object header */
-    if(H5O_msg_write(oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, linfo, dxpl_id) < 0)
+    if (H5O_msg_write(oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, linfo, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't update link info message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_remove_update_linfo() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_remove
  *
@@ -979,10 +958,10 @@ done:
 herr_t
 H5G_obj_remove(const H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *name, hid_t dxpl_id)
 {
-    H5O_linfo_t	linfo;		/* Link info message            */
-    htri_t linfo_exists;        /* Whether the link info message exists */
-    hbool_t     use_old_format; /* Whether to use 'old format' (symbol table) for deletion or not */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5O_linfo_t linfo;               /* Link info message            */
+    htri_t      linfo_exists;        /* Whether the link info message exists */
+    hbool_t     use_old_format;      /* Whether to use 'old format' (symbol table) for deletion or not */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -991,43 +970,42 @@ H5G_obj_remove(const H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *n
     HDassert(name && *name);
 
     /* Attempt to get the link info for this group */
-    if((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
+    if (linfo_exists) {
         /* Using the new format for groups */
         use_old_format = FALSE;
 
         /* Check for dense or compact storage */
-        if(H5F_addr_defined(linfo.fheap_addr)) {
+        if (H5F_addr_defined(linfo.fheap_addr)) {
             /* Remove object from the dense link storage */
-            if(H5G__dense_remove(oloc->file, dxpl_id, &linfo, grp_full_path_r, name) < 0)
+            if (H5G__dense_remove(oloc->file, dxpl_id, &linfo, grp_full_path_r, name) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
         } /* end if */
         else {
             /* Remove object from the link messages */
-            if(H5G__compact_remove(oloc, dxpl_id, grp_full_path_r, name) < 0)
+            if (H5G__compact_remove(oloc, dxpl_id, grp_full_path_r, name) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Using the old format for groups */
         use_old_format = TRUE;
 
         /* Remove object from the symbol table */
-        if(H5G__stab_remove(oloc, dxpl_id, grp_full_path_r, name) < 0)
+        if (H5G__stab_remove(oloc, dxpl_id, grp_full_path_r, name) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
     } /* end else */
 
     /* Update link info for a new-style group */
-    if(!use_old_format)
-        if(H5G_obj_remove_update_linfo(oloc, &linfo, dxpl_id) < 0)
+    if (!use_old_format)
+        if (H5G_obj_remove_update_linfo(oloc, &linfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTUPDATE, FAIL, "unable to update link info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_remove_by_idx
  *
@@ -1042,13 +1020,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_obj_remove_by_idx(const H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t dxpl_id)
+H5G_obj_remove_by_idx(const H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
+                      H5_iter_order_t order, hsize_t n, hid_t dxpl_id)
 {
-    H5O_linfo_t	linfo;		/* Link info message            */
-    htri_t linfo_exists;        /* Whether the link info message exists */
-    hbool_t     use_old_format; /* Whether to use 'old format' (symbol table) for deletion or not */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5O_linfo_t linfo;               /* Link info message            */
+    htri_t      linfo_exists;        /* Whether the link info message exists */
+    hbool_t     use_old_format;      /* Whether to use 'old format' (symbol table) for deletion or not */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1056,13 +1034,13 @@ H5G_obj_remove_by_idx(const H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
     HDassert(grp_oloc && grp_oloc->file);
 
     /* Attempt to get the link info for this group */
-    if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
+    if (linfo_exists) {
         /* Check for creation order tracking, if creation order index lookup requested */
-        if(idx_type == H5_INDEX_CRT_ORDER) {
+        if (idx_type == H5_INDEX_CRT_ORDER) {
             /* Check if creation order is tracked */
-            if(!linfo.track_corder)
+            if (!linfo.track_corder)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "creation order not tracked for links in group")
         } /* end if */
 
@@ -1070,33 +1048,35 @@ H5G_obj_remove_by_idx(const H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
         use_old_format = FALSE;
 
         /* Check for dense or compact storage */
-        if(H5F_addr_defined(linfo.fheap_addr)) {
+        if (H5F_addr_defined(linfo.fheap_addr)) {
             /* Remove object from the dense link storage */
-            if(H5G__dense_remove_by_idx(grp_oloc->file, dxpl_id, &linfo, grp_full_path_r, idx_type, order, n) < 0)
+            if (H5G__dense_remove_by_idx(grp_oloc->file, dxpl_id, &linfo, grp_full_path_r, idx_type, order,
+                                         n) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
         } /* end if */
         else {
             /* Remove object from compact link storage */
-            if(H5G__compact_remove_by_idx(grp_oloc, dxpl_id, &linfo, grp_full_path_r, idx_type, order, n) < 0)
+            if (H5G__compact_remove_by_idx(grp_oloc, dxpl_id, &linfo, grp_full_path_r, idx_type, order, n) <
+                0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Can only perform name lookups on groups with symbol tables */
-        if(idx_type != H5_INDEX_NAME)
+        if (idx_type != H5_INDEX_NAME)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "no creation order index to query")
 
         /* Using the old format for groups */
         use_old_format = TRUE;
 
         /* Remove object from the symbol table */
-        if(H5G__stab_remove_by_idx(grp_oloc, dxpl_id, grp_full_path_r, order, n) < 0)
+        if (H5G__stab_remove_by_idx(grp_oloc, dxpl_id, grp_full_path_r, order, n) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
     } /* end else */
 
     /* Update link info for a new-style group */
-    if(!use_old_format) {
-        if(H5G_obj_remove_update_linfo(grp_oloc, &linfo, dxpl_id) < 0)
+    if (!use_old_format) {
+        if (H5G_obj_remove_update_linfo(grp_oloc, &linfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTUPDATE, FAIL, "unable to update link info")
     } /* end if */
 
@@ -1104,7 +1084,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__obj_lookup
  *
@@ -1119,12 +1098,11 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
-    hid_t dxpl_id)
+H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk, hid_t dxpl_id)
 {
-    H5O_linfo_t linfo;		        /* Link info message */
-    htri_t linfo_exists;                /* Whether the link info message exists */
-    htri_t     ret_value = FALSE;       /* Return value */
+    H5O_linfo_t linfo;             /* Link info message */
+    htri_t      linfo_exists;      /* Whether the link info message exists */
+    htri_t      ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1133,24 +1111,24 @@ H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
     HDassert(name && *name);
 
     /* Attempt to get the link info message for this group */
-    if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
+    if (linfo_exists) {
         /* Check for dense link storage */
-        if(H5F_addr_defined(linfo.fheap_addr)) {
+        if (H5F_addr_defined(linfo.fheap_addr)) {
             /* Get the object's info from the dense link storage */
-            if((ret_value = H5G__dense_lookup(grp_oloc->file, dxpl_id, &linfo, name, lnk)) < 0)
+            if ((ret_value = H5G__dense_lookup(grp_oloc->file, dxpl_id, &linfo, name, lnk)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
         } /* end if */
         else {
             /* Get the object's info from the link messages */
-            if((ret_value = H5G__compact_lookup(grp_oloc, name, lnk, dxpl_id)) < 0)
+            if ((ret_value = H5G__compact_lookup(grp_oloc, name, lnk, dxpl_id)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Get the object's info from the symbol table */
-        if((ret_value = H5G__stab_lookup(grp_oloc, name, lnk, dxpl_id)) < 0)
+        if ((ret_value = H5G__stab_lookup(grp_oloc, name, lnk, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
     } /* end else */
 
@@ -1158,7 +1136,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__obj_lookup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_obj_lookup_by_idx
  *
@@ -1174,12 +1151,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_obj_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, H5O_link_t *lnk, hid_t dxpl_id)
+H5G_obj_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                      H5O_link_t *lnk, hid_t dxpl_id)
 {
-    H5O_linfo_t linfo;		        /* Link info message */
-    htri_t linfo_exists;                /* Whether the link info message exists */
-    herr_t     ret_value = SUCCEED;     /* Return value */
+    H5O_linfo_t linfo;               /* Link info message */
+    htri_t      linfo_exists;        /* Whether the link info message exists */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1187,39 +1164,38 @@ H5G_obj_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_index_t idx_type,
     HDassert(grp_oloc && grp_oloc->file);
 
     /* Attempt to get the link info message for this group */
-    if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+    if ((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
-    if(linfo_exists) {
+    if (linfo_exists) {
         /* Check for creation order tracking, if creation order index lookup requested */
-        if(idx_type == H5_INDEX_CRT_ORDER) {
+        if (idx_type == H5_INDEX_CRT_ORDER) {
             /* Check if creation order is tracked */
-            if(!linfo.track_corder)
+            if (!linfo.track_corder)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "creation order not tracked for links in group")
         } /* end if */
 
         /* Check for dense link storage */
-        if(H5F_addr_defined(linfo.fheap_addr)) {
+        if (H5F_addr_defined(linfo.fheap_addr)) {
             /* Get the link from the dense storage */
-            if(H5G__dense_lookup_by_idx(grp_oloc->file, dxpl_id, &linfo, idx_type, order, n, lnk) < 0)
+            if (H5G__dense_lookup_by_idx(grp_oloc->file, dxpl_id, &linfo, idx_type, order, n, lnk) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
         } /* end if */
         else {
             /* Get the link from the link messages */
-            if(H5G__compact_lookup_by_idx(grp_oloc, dxpl_id, &linfo, idx_type, order, n, lnk) < 0)
+            if (H5G__compact_lookup_by_idx(grp_oloc, dxpl_id, &linfo, idx_type, order, n, lnk) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Can only perform name lookups on groups with symbol tables */
-        if(idx_type != H5_INDEX_NAME)
+        if (idx_type != H5_INDEX_NAME)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "no creation order index to query")
 
         /* Get the object's info from the symbol table */
-        if(H5G__stab_lookup_by_idx(grp_oloc, order, n, lnk, dxpl_id) < 0)
+        if (H5G__stab_lookup_by_idx(grp_oloc, order, n, lnk, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_lookup_by_idx() */
-
diff --git a/src/H5Goh.c b/src/H5Goh.c
index 11cca01..0d51219 100644
--- a/src/H5Goh.c
+++ b/src/H5Goh.c
@@ -15,78 +15,67 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"             /* Groups				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Opkg.h"             /* Object headers			*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Gpkg.h"     /* Groups				*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Opkg.h"     /* Object headers			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static void *H5O_group_get_copy_file_udata(void);
-static void H5O_group_free_copy_file_udata(void *udata);
-static htri_t H5O_group_isa(H5O_t *loc);
-static hid_t H5O_group_open(const H5G_loc_t *obj_loc, hid_t lapl_id,
-    hid_t dxpl_id, hbool_t app_ref);
-static void *H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc,
-    hid_t dxpl_id);
+static void *     H5O_group_get_copy_file_udata(void);
+static void       H5O_group_free_copy_file_udata(void *udata);
+static htri_t     H5O_group_isa(H5O_t *loc);
+static hid_t      H5O_group_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref);
+static void *     H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id);
 static H5O_loc_t *H5O_group_get_oloc(hid_t obj_id);
-static herr_t H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    H5_ih_info_t *bh_info);
-
+static herr_t     H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* This message derives from H5O object class */
 const H5O_obj_class_t H5O_OBJ_GROUP[1] = {{
-    H5O_TYPE_GROUP,		/* object type			*/
-    "group",			/* object name, for debugging	*/
-    H5O_group_get_copy_file_udata, /* get 'copy file' user data	*/
+    H5O_TYPE_GROUP,                 /* object type			*/
+    "group",                        /* object name, for debugging	*/
+    H5O_group_get_copy_file_udata,  /* get 'copy file' user data	*/
     H5O_group_free_copy_file_udata, /* free 'copy file' user data */
-    H5O_group_isa, 		/* "isa" message		*/
-    H5O_group_open, 		/* open an object of this class */
-    H5O_group_create, 		/* create an object of this class */
-    H5O_group_get_oloc,		/* get an object header location for an object */
-    H5O_group_bh_info, 		/* get the index & heap info for an object */
-    NULL 			/* flush an opened object of this class */
+    H5O_group_isa,                  /* "isa" message		*/
+    H5O_group_open,                 /* open an object of this class */
+    H5O_group_create,               /* create an object of this class */
+    H5O_group_get_oloc,             /* get an object header location for an object */
+    H5O_group_bh_info,              /* get the index & heap info for an object */
+    NULL                            /* flush an opened object of this class */
 }};
 
 /* Declare the external free list to manage the H5O_ginfo_t struct */
 H5FL_DEFINE(H5G_copy_file_ud_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_group_get_copy_file_udata
  *
@@ -105,21 +94,20 @@ H5FL_DEFINE(H5G_copy_file_ud_t);
 static void *
 H5O_group_get_copy_file_udata(void)
 {
-    void *ret_value;       /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate space for the 'copy file' user data for copying groups.
      * Currently this is only a ginfo, so there is no specific struct type for
      * this operation. */
-    if(NULL == (ret_value = H5FL_CALLOC(H5G_copy_file_ud_t)))
+    if (NULL == (ret_value = H5FL_CALLOC(H5G_copy_file_ud_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_group_get_copy_file_udata() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_group_free_copy_file_udata
  *
@@ -152,7 +140,6 @@ H5O_group_free_copy_file_udata(void *_udata)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5O_group_free_copy_file_udata() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_group_isa
  *
@@ -173,19 +160,19 @@ H5O_group_free_copy_file_udata(void *_udata)
 static htri_t
 H5O_group_isa(struct H5O_t *oh)
 {
-    htri_t	stab_exists;            /* Whether the 'stab' message is in the object header */
-    htri_t	linfo_exists;           /* Whether the 'linfo' message is in the object header */
-    htri_t	ret_value;              /* Return value */
+    htri_t stab_exists;  /* Whether the 'stab' message is in the object header */
+    htri_t linfo_exists; /* Whether the 'linfo' message is in the object header */
+    htri_t ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(oh);
 
     /* Check for any of the messages that indicate a group */
-    if((stab_exists = H5O_msg_exists_oh(oh, H5O_STAB_ID)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read object header")
-    if((linfo_exists = H5O_msg_exists_oh(oh, H5O_LINFO_ID)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read object header")
+    if ((stab_exists = H5O_msg_exists_oh(oh, H5O_STAB_ID)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read object header")
+    if ((linfo_exists = H5O_msg_exists_oh(oh, H5O_LINFO_ID)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read object header")
 
     ret_value = (stab_exists > 0 || linfo_exists > 0);
 
@@ -193,7 +180,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_group_isa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_group_open
  *
@@ -210,30 +196,29 @@ done:
 static hid_t
 H5O_group_open(const H5G_loc_t *obj_loc, hid_t H5_ATTR_UNUSED lapl_id, hid_t dxpl_id, hbool_t app_ref)
 {
-    H5G_t       *grp = NULL;            /* Group opened */
-    hid_t	ret_value;              /* Return value */
+    H5G_t *grp = NULL; /* Group opened */
+    hid_t  ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(obj_loc);
 
     /* Open the group */
-    if(NULL == (grp = H5G_open(obj_loc, dxpl_id)))
+    if (NULL == (grp = H5G_open(obj_loc, dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
 
     /* Register an ID for the group */
-    if((ret_value = H5I_register(H5I_GROUP, grp, app_ref)) < 0)
+    if ((ret_value = H5I_register(H5I_GROUP, grp, app_ref)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
 done:
-    if(ret_value < 0)
-        if(grp && H5G_close(grp) < 0)
+    if (ret_value < 0)
+        if (grp && H5G_close(grp) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_group_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_group_create
  *
@@ -251,8 +236,8 @@ static void *
 H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
 {
     H5G_obj_create_t *crt_info = (H5G_obj_create_t *)_crt_info; /* Group creation parameters */
-    H5G_t *grp = NULL;          /* New group created */
-    void *ret_value;            /* Return value */
+    H5G_t *           grp      = NULL;                          /* New group created */
+    void *            ret_value;                                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -262,27 +247,26 @@ H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
     HDassert(obj_loc);
 
     /* Create the the group */
-    if(NULL == (grp = H5G__create(f, crt_info, dxpl_id)))
+    if (NULL == (grp = H5G__create(f, crt_info, dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group")
 
     /* Set up the new group's location */
-    if(NULL == (obj_loc->oloc = H5G_oloc(grp)))
+    if (NULL == (obj_loc->oloc = H5G_oloc(grp)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get object location of group")
-    if(NULL == (obj_loc->path = H5G_nameof(grp)))
+    if (NULL == (obj_loc->path = H5G_nameof(grp)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get path of group")
 
     /* Set the return value */
     ret_value = grp;
 
 done:
-    if(ret_value == NULL)
-        if(grp && H5G_close(grp) < 0)
+    if (ret_value == NULL)
+        if (grp && H5G_close(grp) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "unable to release group")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_group_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_group_get_oloc
  *
@@ -299,24 +283,23 @@ done:
 static H5O_loc_t *
 H5O_group_get_oloc(hid_t obj_id)
 {
-    H5G_t       *grp;                   /* Group opened */
-    H5O_loc_t	*ret_value;             /* Return value */
+    H5G_t *    grp;       /* Group opened */
+    H5O_loc_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get the group */
-    if(NULL ==  (grp = (H5G_t *)H5I_object(obj_id)))
+    if (NULL == (grp = (H5G_t *)H5I_object(obj_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_BADATOM, NULL, "couldn't get object from ID")
 
     /* Get the group's object header location */
-    if(NULL == (ret_value = H5G_oloc(grp)))
+    if (NULL == (ret_value = H5G_oloc(grp)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_group_get_oloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_group_bh_info
  *
@@ -333,11 +316,11 @@ done:
 static herr_t
 H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
 {
-    htri_t	exists;                 /* Flag if header message of interest exists */
-    H5HF_t      *fheap = NULL;          /* Fractal heap handle */
-    H5B2_t      *bt2_name = NULL;       /* v2 B-tree handle for name index */
-    H5B2_t      *bt2_corder = NULL;     /* v2 B-tree handle for creation order index */
-    herr_t      ret_value = SUCCEED;  	/* Return value */
+    htri_t  exists;               /* Flag if header message of interest exists */
+    H5HF_t *fheap      = NULL;    /* Fractal heap handle */
+    H5B2_t *bt2_name   = NULL;    /* v2 B-tree handle for name index */
+    H5B2_t *bt2_corder = NULL;    /* v2 B-tree handle for creation order index */
+    herr_t  ret_value  = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -347,69 +330,70 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
     HDassert(bh_info);
 
     /* Check for "new style" group info */
-    if((exists = H5O_msg_exists_oh(oh, H5O_LINFO_ID)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read object header")
-    if(exists > 0) {
-        H5O_linfo_t linfo;          	/* Link info message */
+    if ((exists = H5O_msg_exists_oh(oh, H5O_LINFO_ID)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read object header")
+    if (exists > 0) {
+        H5O_linfo_t linfo; /* Link info message */
 
         /* Get "new style" group info */
-        if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_LINFO_ID, &linfo))
-	    HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't read LINFO message")
+        if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_LINFO_ID, &linfo))
+            HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't read LINFO message")
 
         /* Check if name index available */
-        if(H5F_addr_defined(linfo.name_bt2_addr)) {
+        if (H5F_addr_defined(linfo.name_bt2_addr)) {
             /* Open the name index v2 B-tree */
-            if(NULL == (bt2_name = H5B2_open(f, dxpl_id, linfo.name_bt2_addr, NULL)))
+            if (NULL == (bt2_name = H5B2_open(f, dxpl_id, linfo.name_bt2_addr, NULL)))
                 HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
             /* Get name index B-tree size */
-            if(H5B2_size(bt2_name, dxpl_id, &bh_info->index_size) < 0)
+            if (H5B2_size(bt2_name, dxpl_id, &bh_info->index_size) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve B-tree storage info for name index")
         } /* end if */
 
         /* Check if creation order index available */
-	if(H5F_addr_defined(linfo.corder_bt2_addr)) {
+        if (H5F_addr_defined(linfo.corder_bt2_addr)) {
             /* Open the creation order index v2 B-tree */
-            if(NULL == (bt2_corder = H5B2_open(f, dxpl_id, linfo.corder_bt2_addr, NULL)))
-                HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
+            if (NULL == (bt2_corder = H5B2_open(f, dxpl_id, linfo.corder_bt2_addr, NULL)))
+                HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL,
+                            "unable to open v2 B-tree for creation order index")
 
             /* Get creation order index B-tree size */
-            if(H5B2_size(bt2_corder, dxpl_id, &bh_info->index_size) < 0)
-                HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve B-tree storage info for creation order index")
+            if (H5B2_size(bt2_corder, dxpl_id, &bh_info->index_size) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL,
+                            "can't retrieve B-tree storage info for creation order index")
         } /* end if */
 
         /* Get fractal heap size, if available */
-        if(H5F_addr_defined(linfo.fheap_addr)) {
+        if (H5F_addr_defined(linfo.fheap_addr)) {
             /* Open the fractal heap for links */
-            if(NULL == (fheap = H5HF_open(f, dxpl_id, linfo.fheap_addr)))
+            if (NULL == (fheap = H5HF_open(f, dxpl_id, linfo.fheap_addr)))
                 HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
             /* Get heap storage size */
-            if(H5HF_size(fheap, dxpl_id, &bh_info->heap_size) < 0)
+            if (H5HF_size(fheap, dxpl_id, &bh_info->heap_size) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve fractal heap storage info")
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
-        H5O_stab_t          stab;       	/* Info about symbol table */
+        H5O_stab_t stab; /* Info about symbol table */
 
         /* Must be "old style" group, get symbol table message */
-        if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_STAB_ID, &stab))
-	    HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't find LINFO nor STAB messages")
+        if (NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_STAB_ID, &stab))
+            HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't find LINFO nor STAB messages")
 
         /* Get symbol table size info */
-        if(H5G__stab_bh_size(f, dxpl_id, &stab, bh_info) < 0)
+        if (H5G__stab_bh_size(f, dxpl_id, &stab, bh_info) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve symbol table size info")
     } /* end else */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for creation order index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_group_bh_info() */
-
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index 584811e..1547292 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -30,32 +30,30 @@
 #include "H5Gprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5B2private.h"    /* v2 B-trees                */
-#include "H5FLprivate.h"    /* Free Lists                           */
-#include "H5HFprivate.h"    /* Fractal heaps            */
-#include "H5HLprivate.h"    /* Local Heaps                */
-#include "H5Oprivate.h"        /* Object headers              */
-#include "H5SLprivate.h"    /* Skip lists                */
+#include "H5B2private.h" /* v2 B-trees                */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5HFprivate.h" /* Fractal heaps            */
+#include "H5HLprivate.h" /* Local Heaps                */
+#include "H5Oprivate.h"  /* Object headers              */
+#include "H5SLprivate.h" /* Skip lists                */
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
 /* Standard length of fractal heap ID for link */
-#define H5G_DENSE_FHEAP_ID_LEN  7
+#define H5G_DENSE_FHEAP_ID_LEN 7
 
 /* Size of a symbol table node on disk */
-#define H5G_NODE_SIZE(f)     (                                                \
-    /* General metadata fields */                                             \
-    H5_SIZEOF_MAGIC /*magic number */                                         \
-    + 1         /* Version */                                                 \
-    + 1         /* Reserved */                                                \
-    + 2         /* Number of symbols */                                       \
-                                                                              \
-    /* Entries */                                                             \
-    + ((2 * H5F_SYM_LEAF_K(f)) * H5G_SIZEOF_ENTRY(f))                         \
-    )
-
+#define H5G_NODE_SIZE(f)                                                                                     \
+    (                /* General metadata fields */                                                           \
+     H5_SIZEOF_MAGIC /*magic number */                                                                       \
+     + 1             /* Version */                                                                           \
+     + 1             /* Reserved */                                                                          \
+     + 2             /* Number of symbols */                                                                 \
+                                                                                                             \
+     /* Entries */                                                                                           \
+     + ((2 * H5F_SYM_LEAF_K(f)) * H5G_SIZEOF_ENTRY(f)))
 
 /****************************/
 /* Package Private Typedefs */
@@ -68,12 +66,12 @@
  * symbol table entry.
  */
 typedef enum H5G_cache_type_t {
-    H5G_CACHED_ERROR    = -1,     /*force enum to be signed             */
-    H5G_NOTHING_CACHED  = 0,    /*nothing is cached, must be 0               */
-    H5G_CACHED_STAB     = 1,    /*symbol table, `stab'                       */
-    H5G_CACHED_SLINK    = 2,     /*symbolic link                     */
+    H5G_CACHED_ERROR   = -1, /*force enum to be signed             */
+    H5G_NOTHING_CACHED = 0,  /*nothing is cached, must be 0               */
+    H5G_CACHED_STAB    = 1,  /*symbol table, `stab'                       */
+    H5G_CACHED_SLINK   = 2,  /*symbolic link                     */
 
-    H5G_NCACHED                 /*THIS MUST BE LAST                          */
+    H5G_NCACHED /*THIS MUST BE LAST                          */
 } H5G_cache_type_t;
 
 /*
@@ -85,12 +83,12 @@ typedef enum H5G_cache_type_t {
  */
 typedef union H5G_cache_t {
     struct {
-        haddr_t btree_addr;             /*file address of symbol table B-tree*/
-        haddr_t heap_addr;              /*file address of stab name heap     */
+        haddr_t btree_addr; /*file address of symbol table B-tree*/
+        haddr_t heap_addr;  /*file address of stab name heap     */
     } stab;
 
     struct {
-    size_t    lval_offset;        /*link value offset             */
+        size_t lval_offset; /*link value offset             */
     } slink;
 } H5G_cache_t;
 
@@ -101,10 +99,10 @@ typedef union H5G_cache_t {
  * points.
  */
 struct H5G_entry_t {
-    H5G_cache_type_t type;              /*type of information cached         */
-    H5G_cache_t cache;                  /*cached data from object header     */
-    size_t      name_off;               /*offset of name within name heap    */
-    haddr_t     header;                 /*file address of object header      */
+    H5G_cache_type_t type;     /*type of information cached         */
+    H5G_cache_t      cache;    /*cached data from object header     */
+    size_t           name_off; /*offset of name within name heap    */
+    haddr_t          header;   /*file address of object header      */
 };
 
 /*
@@ -114,19 +112,19 @@ struct H5G_entry_t {
  * table or group.
  */
 typedef struct H5G_node_t {
-    H5AC_info_t cache_info;     /* Information for H5AC cache functions, _must_ be */
-                                /* first field in structure */
-    size_t node_size;           /* Size of node on disk              */
-    unsigned nsyms;             /* Number of symbols                 */
-    H5G_entry_t *entry;         /* Array of symbol table entries     */
+    H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
+                            /* first field in structure */
+    size_t       node_size; /* Size of node on disk              */
+    unsigned     nsyms;     /* Number of symbols                 */
+    H5G_entry_t *entry;     /* Array of symbol table entries     */
 } H5G_node_t;
 
 /*
  * Shared information for all open group objects
  */
 struct H5G_shared_t {
-    int fo_count;                   /* open file object count */
-    hbool_t mounted;                /* Group is mount point */
+    int     fo_count; /* open file object count */
+    hbool_t mounted;  /* Group is mount point */
 };
 
 /*
@@ -134,9 +132,9 @@ struct H5G_shared_t {
  * above the H5G layer.
  */
 struct H5G_t {
-    H5G_shared_t *shared;               /* Shared file object data */
-    H5O_loc_t oloc;                     /* Object location for group */
-    H5G_name_t path;                    /* Group hierarchy path   */
+    H5G_shared_t *shared; /* Shared file object data */
+    H5O_loc_t     oloc;   /* Object location for group */
+    H5G_name_t    path;   /* Group hierarchy path   */
 };
 
 /* Link iteration operator for internal library callbacks */
@@ -144,8 +142,8 @@ typedef herr_t (*H5G_lib_iterate_t)(const H5O_link_t *lnk, void *op_data);
 
 /* Data structure to hold table of links for a group */
 typedef struct {
-    size_t      nlinks;         /* # of links in table */
-    H5O_link_t *lnks;           /* Pointer to array of links */
+    size_t      nlinks; /* # of links in table */
+    H5O_link_t *lnks;   /* Pointer to array of links */
 } H5G_link_table_t;
 
 /*
@@ -158,8 +156,8 @@ typedef struct {
  */
 typedef struct H5G_bt_common_t {
     /* downward */
-    const char  *name;                  /*points to temporary memory         */
-    H5HL_t *heap;                       /*symbol table heap             */
+    const char *name; /*points to temporary memory         */
+    H5HL_t *    heap; /*symbol table heap             */
 } H5G_bt_common_t;
 
 /*
@@ -168,10 +166,10 @@ typedef struct H5G_bt_common_t {
  */
 typedef struct H5G_bt_ins_t {
     /* downward */
-    H5G_bt_common_t common;             /* Common info for B-tree user data (must be first) */
-    const H5O_link_t *lnk;              /* Link to insert into table         */
-    H5O_type_t obj_type;                /* Type of object being inserted */
-    const void *crt_info;               /* Creation info for object being inserted */
+    H5G_bt_common_t   common;   /* Common info for B-tree user data (must be first) */
+    const H5O_link_t *lnk;      /* Link to insert into table         */
+    H5O_type_t        obj_type; /* Type of object being inserted */
+    const void *      crt_info; /* Creation info for object being inserted */
 } H5G_bt_ins_t;
 
 /*
@@ -180,12 +178,12 @@ typedef struct H5G_bt_ins_t {
  */
 typedef struct H5G_bt_rm_t {
     /* downward */
-    H5G_bt_common_t common;         /* Common info for B-tree user data (must be first) */
-    H5RS_str_t *grp_full_path_r;    /* Full path of group where link is removed */
+    H5G_bt_common_t common;          /* Common info for B-tree user data (must be first) */
+    H5RS_str_t *    grp_full_path_r; /* Full path of group where link is removed */
 } H5G_bt_rm_t;
 
 /* Typedef for B-tree 'find' operation */
-typedef herr_t (*H5G_bt_find_op_t)(const H5G_entry_t *ent/*in*/, void *operator_data/*in,out*/);
+typedef herr_t (*H5G_bt_find_op_t)(const H5G_entry_t *ent /*in*/, void *operator_data /*in,out*/);
 
 /*
  * Data exchange structure for symbol table nodes.  This structure is
@@ -193,9 +191,9 @@ typedef herr_t (*H5G_bt_find_op_t)(const H5G_entry_t *ent/*in*/, void *operator_
  */
 typedef struct H5G_bt_lkp_t {
     /* downward */
-    H5G_bt_common_t common;         /* Common info for B-tree user data (must be first) */
-    H5G_bt_find_op_t op;            /* Operator to call when correct entry is found */
-    void *op_data;                  /* Data to pass to operator */
+    H5G_bt_common_t  common;  /* Common info for B-tree user data (must be first) */
+    H5G_bt_find_op_t op;      /* Operator to call when correct entry is found */
+    void *           op_data; /* Data to pass to operator */
 
     /* upward */
 } H5G_bt_lkp_t;
@@ -206,40 +204,40 @@ typedef struct H5G_bt_lkp_t {
  */
 typedef struct H5G_bt_it_it_t {
     /* downward */
-    H5HL_t      *heap;          /*symbol table heap                  */
-    hsize_t    skip;        /*initial entries to skip             */
-    H5G_lib_iterate_t op;    /*iteration operator                 */
-    void    *op_data;    /*user-defined operator data             */
+    H5HL_t *          heap;    /*symbol table heap                  */
+    hsize_t           skip;    /*initial entries to skip             */
+    H5G_lib_iterate_t op;      /*iteration operator                 */
+    void *            op_data; /*user-defined operator data             */
 
     /* upward */
-    hsize_t    *final_ent;    /*final entry looked at                      */
+    hsize_t *final_ent; /*final entry looked at                      */
 } H5G_bt_it_it_t;
 
 /* Data passed through B-tree iteration for copying copy symbol table content */
 typedef struct H5G_bt_it_cpy_t {
-    const H5O_loc_t *src_oloc;  /* Source object location */
-    haddr_t     src_heap_addr;  /* Heap address of the source symbol table  */
-    H5F_t       *dst_file;      /* File of destination group */
-    const H5O_stab_t *dst_stab; /* Symbol table message for destination group */
-    H5O_copy_t  *cpy_info;      /* Information for copy operation */
+    const H5O_loc_t * src_oloc;      /* Source object location */
+    haddr_t           src_heap_addr; /* Heap address of the source symbol table  */
+    H5F_t *           dst_file;      /* File of destination group */
+    const H5O_stab_t *dst_stab;      /* Symbol table message for destination group */
+    H5O_copy_t *      cpy_info;      /* Information for copy operation */
 } H5G_bt_it_cpy_t;
 
 /* Common information for "by index" lookups in symbol tables */
 typedef struct H5G_bt_it_idx_common_t {
     /* downward */
-    hsize_t     idx;            /* Index of group member to be queried */
-    hsize_t     num_objs;       /* The number of objects having been traversed */
-    H5G_bt_find_op_t op;        /* Operator to call when correct entry is found */
+    hsize_t          idx;      /* Index of group member to be queried */
+    hsize_t          num_objs; /* The number of objects having been traversed */
+    H5G_bt_find_op_t op;       /* Operator to call when correct entry is found */
 } H5G_bt_it_idx_common_t;
 
 /* Data passed through B-tree iteration for building a table of the links */
 typedef struct H5G_bt_it_bt_t {
     /* downward */
-    size_t alloc_nlinks;        /* Number of links allocated in table */
-    H5HL_t *heap;               /* Symbol table heap */
+    size_t  alloc_nlinks; /* Number of links allocated in table */
+    H5HL_t *heap;         /* Symbol table heap */
 
     /* upward */
-    H5G_link_table_t *ltable;   /* Link table to add information to */
+    H5G_link_table_t *ltable; /* Link table to add information to */
 } H5G_bt_it_bt_t;
 
 /* Typedefs for "new format" groups */
@@ -248,8 +246,8 @@ typedef struct H5G_bt_it_bt_t {
 /* Typedef for native 'name' field index records in the v2 B-tree */
 /* (Keep 'id' field first so generic record handling in callbacks works) */
 typedef struct H5G_dense_bt2_name_rec_t {
-    uint8_t id[H5G_DENSE_FHEAP_ID_LEN]; /* Heap ID for link */
-    uint32_t hash;                      /* Hash of 'name' field value */
+    uint8_t  id[H5G_DENSE_FHEAP_ID_LEN]; /* Heap ID for link */
+    uint32_t hash;                       /* Hash of 'name' field value */
 } H5G_dense_bt2_name_rec_t;
 
 /* Typedef for native 'creation order' field index records in the v2 B-tree */
@@ -266,14 +264,14 @@ typedef struct H5G_dense_bt2_corder_rec_t {
  */
 typedef struct H5G_bt2_ud_common_t {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    H5HF_t      *fheap;                 /* Fractal heap handle               */
-    const char  *name;                  /* Name of link to compare           */
-    uint32_t    name_hash;              /* Hash of name of link to compare   */
-    int64_t     corder;                 /* Creation order value of link to compare   */
-    H5B2_found_t found_op;              /* Callback when correct link is found */
-    void        *found_op_data;         /* Callback data when correct link is found */
+    H5F_t *      f;             /* Pointer to file that fractal heap is in */
+    hid_t        dxpl_id;       /* DXPL for operation                */
+    H5HF_t *     fheap;         /* Fractal heap handle               */
+    const char * name;          /* Name of link to compare           */
+    uint32_t     name_hash;     /* Hash of name of link to compare   */
+    int64_t      corder;        /* Creation order value of link to compare   */
+    H5B2_found_t found_op;      /* Callback when correct link is found */
+    void *       found_op_data; /* Callback data when correct link is found */
 } H5G_bt2_ud_common_t;
 
 /*
@@ -282,25 +280,24 @@ typedef struct H5G_bt2_ud_common_t {
  */
 typedef struct H5G_bt2_ud_ins_t {
     /* downward */
-    H5G_bt2_ud_common_t common;         /* Common info for B-tree user data (must be first) */
-    uint8_t id[H5G_DENSE_FHEAP_ID_LEN]; /* Heap ID of link to insert         */
+    H5G_bt2_ud_common_t common;                     /* Common info for B-tree user data (must be first) */
+    uint8_t             id[H5G_DENSE_FHEAP_ID_LEN]; /* Heap ID of link to insert         */
 } H5G_bt2_ud_ins_t;
 
 /* Typedef for group creation operation */
-typedef struct H5G_obj_create_t{
-    hid_t gcpl_id;              /* Group creation property list */
+typedef struct H5G_obj_create_t {
+    hid_t            gcpl_id;    /* Group creation property list */
     H5G_cache_type_t cache_type; /* Type of symbol table entry cache */
-    H5G_cache_t cache;          /* Cached data for symbol table entry */
+    H5G_cache_t      cache;      /* Cached data for symbol table entry */
 } H5G_obj_create_t;
 
 /* Callback information for copying groups */
 typedef struct H5G_copy_file_ud_t {
-    H5O_copy_file_ud_common_t common;   /* Shared information (must be first) */
-    H5G_cache_type_t cache_type;        /* Type of symbol table entry cache */
-    H5G_cache_t cache;                  /* Cached data for symbol table entry */
+    H5O_copy_file_ud_common_t common;     /* Shared information (must be first) */
+    H5G_cache_type_t          cache_type; /* Type of symbol table entry cache */
+    H5G_cache_t               cache;      /* Cached data for symbol table entry */
 } H5G_copy_file_ud_t;
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -332,25 +329,23 @@ H5FL_EXTERN(H5G_shared_t);
 /*
  * General group routines
  */
-H5_DLL H5G_t *H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info,
-    hid_t dxpl_id);
-H5_DLL H5G_t *H5G__create_named(const H5G_loc_t *loc, const char *name,
-    hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id);
-H5_DLL H5G_t *H5G__open_name(const H5G_loc_t *loc, const char *name,
-    hid_t gapl_id, hid_t dxpl_id);
+H5_DLL H5G_t *H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info, hid_t dxpl_id);
+H5_DLL H5G_t *H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id, hid_t gcpl_id,
+                                hid_t gapl_id, hid_t dxpl_id);
+H5_DLL H5G_t *H5G__open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id, hid_t dxpl_id);
 
 /*
  * Group hierarchy traversal routines
  */
-H5_DLL herr_t H5G__traverse_special(const H5G_loc_t *grp_loc,
-    const H5O_link_t *lnk, unsigned target, size_t *nlinks, hbool_t last_comp,
-    H5G_loc_t *obj_loc, hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk, unsigned target,
+                                    size_t *nlinks, hbool_t last_comp, H5G_loc_t *obj_loc,
+                                    hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id);
 
 /*
  * Utility functions
  */
-H5_DLL herr_t H5G__init(void);
-H5_DLL herr_t H5G__term_deprec_interface(void);
+H5_DLL herr_t      H5G__init(void);
+H5_DLL herr_t      H5G__term_deprec_interface(void);
 H5_DLL const char *H5G__component(const char *name, size_t *size_p);
 
 /*
@@ -358,155 +353,131 @@ H5_DLL const char *H5G__component(const char *name, size_t *size_p);
  * functions that understand names are exported to the rest of
  * the library and appear in H5Gprivate.h.
  */
-H5_DLL herr_t H5G__stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id,
-    const H5O_ginfo_t *ginfo, H5O_stab_t *stab);
-H5_DLL herr_t H5G__stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t dxpl_id);
-H5_DLL herr_t H5G__stab_insert(const H5O_loc_t *grp_oloc, const char *name,
-    H5O_link_t *obj_lnk, H5O_type_t obj_type, const void *crt_info,
-    hid_t dxpl_id);
-H5_DLL herr_t H5G__stab_insert_real(H5F_t *f, const H5O_stab_t *stab,
-    const char *name, H5O_link_t *obj_lnk, H5O_type_t obj_type,
-    const void *crt_info, hid_t dxpl_id);
-H5_DLL herr_t H5G__stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab);
-H5_DLL herr_t H5G__stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
-    hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data);
-H5_DLL herr_t H5G__stab_count(struct H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id);
-H5_DLL herr_t H5G__stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
-    H5_ih_info_t *bh_info);
-H5_DLL ssize_t H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order,
-    hsize_t n, char* name, size_t size, hid_t dxpl_id);
-H5_DLL herr_t H5G__stab_remove(const H5O_loc_t *oloc, hid_t dxpl_id,
-    H5RS_str_t *grp_full_path_r, const char *name);
-H5_DLL herr_t H5G__stab_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
-    H5RS_str_t *grp_full_path_r, H5_iter_order_t order, hsize_t n);
-H5_DLL herr_t H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name,
-    H5O_link_t *lnk, hid_t dxpl_id);
-H5_DLL herr_t H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order,
-    hsize_t n, H5O_link_t *lnk, hid_t dxpl_id);
+H5_DLL herr_t  H5G__stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
+                                H5O_stab_t *stab);
+H5_DLL herr_t  H5G__stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t dxpl_id);
+H5_DLL herr_t  H5G__stab_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
+                                H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id);
+H5_DLL herr_t  H5G__stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name, H5O_link_t *obj_lnk,
+                                     H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id);
+H5_DLL herr_t  H5G__stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab);
+H5_DLL herr_t  H5G__stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order, hsize_t skip,
+                                 hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data);
+H5_DLL herr_t  H5G__stab_count(struct H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id);
+H5_DLL herr_t  H5G__stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab, H5_ih_info_t *bh_info);
+H5_DLL ssize_t H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n, char *name,
+                                         size_t size, hid_t dxpl_id);
+H5_DLL herr_t  H5G__stab_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
+                                const char *name);
+H5_DLL herr_t  H5G__stab_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
+                                       H5_iter_order_t order, hsize_t n);
+H5_DLL herr_t  H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk, hid_t dxpl_id);
+H5_DLL herr_t  H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
+                                       H5O_link_t *lnk, hid_t dxpl_id);
 #ifndef H5_STRICT_FORMAT_CHECKS
-H5_DLL herr_t H5G__stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id,
-    H5O_stab_t *alt_stab);
+H5_DLL herr_t H5G__stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5O_stab_t *alt_stab);
 #endif /* H5_STRICT_FORMAT_CHECKS */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-H5_DLL H5G_obj_t H5G__stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx,
-    hid_t dxpl_id);
+H5_DLL H5G_obj_t H5G__stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
 /*
  * Functions that understand symbol table entries.
  */
-H5_DLL void H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src,
-            H5_copy_depth_t depth);
-H5_DLL void H5G__ent_reset(H5G_entry_t *ent);
-H5_DLL herr_t H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp,
-                    const uint8_t *p_end, H5G_entry_t *ent, unsigned n);
-H5_DLL herr_t H5G__ent_encode_vec(const H5F_t *f, uint8_t **pp,
-                    const H5G_entry_t *ent, unsigned n);
-H5_DLL herr_t H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap,
-    const char *name, const H5O_link_t *lnk, H5O_type_t obj_type,
-    const void *crt_info, H5G_entry_t *ent);
-H5_DLL herr_t H5G__ent_debug(const H5G_entry_t *ent, FILE * stream, int indent,
-    int fwidth, const H5HL_t *heap);
+H5_DLL void   H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth);
+H5_DLL void   H5G__ent_reset(H5G_entry_t *ent);
+H5_DLL herr_t H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, const uint8_t *p_end, H5G_entry_t *ent,
+                                  unsigned n);
+H5_DLL herr_t H5G__ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsigned n);
+H5_DLL herr_t H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name, const H5O_link_t *lnk,
+                               H5O_type_t obj_type, const void *crt_info, H5G_entry_t *ent);
+H5_DLL herr_t H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
+                             const H5HL_t *heap);
 
 /* Functions that understand symbol table nodes */
 H5_DLL herr_t H5G__node_init(H5F_t *f);
-H5_DLL int H5G__node_iterate(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
-            const void *_rt_key, void *_udata);
-H5_DLL int H5G__node_sumup(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
-            const void *_rt_key, void *_udata);
-H5_DLL int H5G__node_by_idx(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
-            const void *_rt_key, void *_udata);
-H5_DLL int H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
-            const void *_rt_key, void *_udata);
+H5_DLL int H5G__node_iterate(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr, const void *_rt_key,
+                             void *_udata);
+H5_DLL int H5G__node_sumup(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr, const void *_rt_key,
+                           void *_udata);
+H5_DLL int H5G__node_by_idx(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr, const void *_rt_key,
+                            void *_udata);
+H5_DLL int H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr, const void *_rt_key,
+                          void *_udata);
 H5_DLL int H5G__node_build_table(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
-            const void *_rt_key, void *_udata);
+                                 const void *_rt_key, void *_udata);
 H5_DLL herr_t H5G__node_iterate_size(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
-                     const void *_rt_key, void *_udata);
+                                     const void *_rt_key, void *_udata);
 H5_DLL herr_t H5G__node_free(H5G_node_t *sym);
 
 /* Functions that understand links in groups */
-H5_DLL herr_t H5G__ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
-    const H5G_entry_t *ent, const char *name);
-H5_DLL herr_t H5G__link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
-    H5G_loc_t *obj_loc);
-H5_DLL herr_t H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
-    H5_iter_order_t order);
-H5_DLL herr_t H5G__link_iterate_table(const H5G_link_table_t *ltable,
-    hsize_t skip, hsize_t *last_lnk, const H5G_lib_iterate_t op, void *op_data);
+H5_DLL herr_t H5G__ent_to_link(H5O_link_t *lnk, const H5HL_t *heap, const H5G_entry_t *ent, const char *name);
+H5_DLL herr_t H5G__link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk, H5G_loc_t *obj_loc);
+H5_DLL herr_t H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type, H5_iter_order_t order);
+H5_DLL herr_t H5G__link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip, hsize_t *last_lnk,
+                                      const H5G_lib_iterate_t op, void *op_data);
 H5_DLL herr_t H5G__link_release_table(H5G_link_table_t *ltable);
-H5_DLL herr_t H5G__link_name_replace(H5F_t *file, hid_t dxpl_id,
-    H5RS_str_t *grp_full_path_r, const H5O_link_t *lnk);
+H5_DLL herr_t H5G__link_name_replace(H5F_t *file, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
+                                     const H5O_link_t *lnk);
 
 /* Functions that understand "compact" link storage */
-H5_DLL herr_t H5G__compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
-    hid_t dxpl_id);
-H5_DLL ssize_t H5G__compact_get_name_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t idx, char *name, size_t size);
-H5_DLL herr_t H5G__compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id,
-    H5RS_str_t *grp_full_path_r, const char *name);
-H5_DLL herr_t H5G__compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n);
-H5_DLL herr_t H5G__compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data);
-H5_DLL htri_t H5G__compact_lookup(const H5O_loc_t *grp_oloc, const char *name,
-    H5O_link_t *lnk, hid_t dxpl_id);
-H5_DLL herr_t H5G__compact_lookup_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t n, H5O_link_t *lnk);
+H5_DLL herr_t  H5G__compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk, hid_t dxpl_id);
+H5_DLL ssize_t H5G__compact_get_name_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                                            H5_index_t idx_type, H5_iter_order_t order, hsize_t idx,
+                                            char *name, size_t size);
+H5_DLL herr_t  H5G__compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
+                                   const char *name);
+H5_DLL herr_t  H5G__compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                                          H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
+                                          H5_iter_order_t order, hsize_t n);
+H5_DLL herr_t  H5G__compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                                    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
+                                    hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data);
+H5_DLL htri_t  H5G__compact_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
+                                   hid_t dxpl_id);
+H5_DLL herr_t  H5G__compact_lookup_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                                          H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                                          H5O_link_t *lnk);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-H5_DLL H5G_obj_t H5G__compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, hsize_t idx);
+H5_DLL H5G_obj_t H5G__compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                                              hsize_t idx);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /* Functions that understand "dense" link storage */
-H5_DLL herr_t H5G__dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, H5G_link_table_t *ltable);
-H5_DLL herr_t H5G__dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
-    const H5O_pline_t *pline);
-H5_DLL herr_t H5G__dense_insert(H5F_t *f, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, const H5O_link_t *lnk);
-H5_DLL htri_t H5G__dense_lookup(H5F_t *f, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, const char *name, H5O_link_t *lnk);
-H5_DLL herr_t H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t n, H5O_link_t *lnk);
-H5_DLL herr_t H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    H5G_lib_iterate_t op, void *op_data);
-H5_DLL ssize_t H5G__dense_get_name_by_idx(H5F_t  *f, hid_t dxpl_id,
-    H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    char *name, size_t size);
-H5_DLL herr_t H5G__dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
-    H5RS_str_t *grp_full_path_r, const char *name);
-H5_DLL herr_t H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id,
-    const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n);
-H5_DLL herr_t H5G__dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
-    hbool_t adj_link);
+H5_DLL herr_t H5G__dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type,
+                                     H5_iter_order_t order, H5G_link_table_t *ltable);
+H5_DLL herr_t H5G__dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, const H5O_pline_t *pline);
+H5_DLL herr_t H5G__dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, const H5O_link_t *lnk);
+H5_DLL htri_t H5G__dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, const char *name,
+                                H5O_link_t *lnk);
+H5_DLL herr_t H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type,
+                                       H5_iter_order_t order, hsize_t n, H5O_link_t *lnk);
+H5_DLL herr_t H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type,
+                                 H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op,
+                                 void *op_data);
+H5_DLL ssize_t H5G__dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, H5_index_t idx_type,
+                                          H5_iter_order_t order, hsize_t n, char *name, size_t size);
+H5_DLL herr_t  H5G__dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                                 H5RS_str_t *grp_full_path_r, const char *name);
+H5_DLL herr_t  H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+                                        H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
+                                        H5_iter_order_t order, hsize_t n);
+H5_DLL herr_t  H5G__dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-H5_DLL H5G_obj_t H5G__dense_get_type_by_idx(H5F_t  *f, hid_t dxpl_id,
-    H5O_linfo_t *linfo, hsize_t idx);
+H5_DLL H5G_obj_t H5G__dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hsize_t idx);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /* Functions that understand group objects */
-H5_DLL herr_t H5G__obj_create(H5F_t *f, hid_t dxpl_id,
-    H5G_obj_create_t *gcrt_info, H5O_loc_t *oloc/*out*/);
-H5_DLL herr_t H5G__obj_create_real(H5F_t *f, hid_t dxpl_id,
-    const H5O_ginfo_t *ginfo, const H5O_linfo_t *linfo,
-    const H5O_pline_t *pline, H5G_obj_create_t *gcrt_info,
-    H5O_loc_t *oloc/*out*/);
-H5_DLL htri_t H5G__obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo,
-    hid_t dxpl_id);
-H5_DLL herr_t H5G__obj_iterate(const H5O_loc_t *grp_oloc,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    H5G_lib_iterate_t op, void *op_data, hid_t dxpl_id);
+H5_DLL herr_t H5G__obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info, H5O_loc_t *oloc /*out*/);
+H5_DLL herr_t H5G__obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
+                                   const H5O_linfo_t *linfo, const H5O_pline_t *pline,
+                                   H5G_obj_create_t *gcrt_info, H5O_loc_t *oloc /*out*/);
+H5_DLL htri_t H5G__obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id);
+H5_DLL herr_t H5G__obj_iterate(const H5O_loc_t *grp_oloc, H5_index_t idx_type, H5_iter_order_t order,
+                               hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data,
+                               hid_t dxpl_id);
 H5_DLL herr_t H5G__obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id);
-H5_DLL htri_t H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name,
-    H5O_link_t *lnk, hid_t dxpl_id);
+H5_DLL htri_t H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk, hid_t dxpl_id);
 
 /*
  * These functions operate on group hierarchy names.
@@ -517,8 +488,8 @@ H5_DLL herr_t H5G__name_init(H5G_name_t *name, const char *path);
  * These functions operate on group "locations"
  */
 H5_DLL herr_t H5G__loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth);
-H5_DLL herr_t H5G__loc_insert(H5G_loc_t *grp_loc, const char *name,
-    H5G_loc_t *obj_loc, H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id);
+H5_DLL herr_t H5G__loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc, H5O_type_t obj_type,
+                              const void *crt_info, hid_t dxpl_id);
 
 /* Testing functions */
 #ifdef H5G_TESTING
@@ -528,10 +499,10 @@ H5_DLL htri_t H5G__has_stab_test(hid_t gid);
 H5_DLL htri_t H5G__is_new_dense_test(hid_t gid);
 H5_DLL herr_t H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count);
 H5_DLL herr_t H5G__lheap_size_test(hid_t gid, size_t *lheap_size);
-H5_DLL herr_t H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigned *user_path_hidden);
+H5_DLL herr_t H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len,
+                                  unsigned *user_path_hidden);
 H5_DLL herr_t H5G__verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent);
 H5_DLL herr_t H5G__verify_cached_stabs_test(hid_t gid);
 #endif /* H5G_TESTING */
 
 #endif /* _H5Gpkg_H */
-
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 25252bd..6e37296 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -29,43 +29,43 @@
 #include "H5Gpublic.h"
 
 /* Private headers needed by this file */
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Bprivate.h"        /* B-trees                */
-#include "H5Fprivate.h"        /* File access                */
-#include "H5RSprivate.h"        /* Reference-counted strings            */
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Bprivate.h"  /* B-trees                */
+#include "H5Fprivate.h"  /* File access                */
+#include "H5RSprivate.h" /* Reference-counted strings            */
 
 /*
  * Define this to enable debugging.
  */
 #ifdef NDEBUG
-#  undef H5G_DEBUG
+#undef H5G_DEBUG
 #endif
 
 /*
  * The disk size for a symbol table entry...
  */
-#define H5G_SIZEOF_SCRATCH      16
-#define H5G_SIZEOF_ENTRY(F)                                                   \
-   (H5F_SIZEOF_SIZE(F) +        /*offset of name into heap              */    \
-    H5F_SIZEOF_ADDR(F) +        /*address of object header              */    \
-    4 +                         /*entry type                            */    \
-    4 +                /*reserved                */    \
-    H5G_SIZEOF_SCRATCH)         /*scratch pad space                     */
+#define H5G_SIZEOF_SCRATCH 16
+#define H5G_SIZEOF_ENTRY(F)                                                                                  \
+    (H5F_SIZEOF_SIZE(F) + /*offset of name into heap              */                                         \
+     H5F_SIZEOF_ADDR(F) + /*address of object header              */                                         \
+     4 +                  /*entry type                            */                                         \
+     4 +                  /*reserved                */                                                       \
+     H5G_SIZEOF_SCRATCH)  /*scratch pad space                     */
 
 /* ========= Group Creation properties ============ */
 
 /* Defaults for link info values */
-#define H5G_CRT_LINFO_TRACK_CORDER              FALSE
-#define H5G_CRT_LINFO_INDEX_CORDER              FALSE
-#define H5G_CRT_LINFO_NLINKS                    0
-#define H5G_CRT_LINFO_MAX_CORDER                0
-#define H5G_CRT_LINFO_LINK_FHEAP_ADDR           HADDR_UNDEF
-#define H5G_CRT_LINFO_NAME_BT2_ADDR             HADDR_UNDEF
-#define H5G_CRT_LINFO_CORDER_BT2_ADDR           HADDR_UNDEF
+#define H5G_CRT_LINFO_TRACK_CORDER    FALSE
+#define H5G_CRT_LINFO_INDEX_CORDER    FALSE
+#define H5G_CRT_LINFO_NLINKS          0
+#define H5G_CRT_LINFO_MAX_CORDER      0
+#define H5G_CRT_LINFO_LINK_FHEAP_ADDR HADDR_UNDEF
+#define H5G_CRT_LINFO_NAME_BT2_ADDR   HADDR_UNDEF
+#define H5G_CRT_LINFO_CORDER_BT2_ADDR HADDR_UNDEF
 
 /* Definitions for link info settings */
-#define H5G_CRT_LINK_INFO_NAME                  "link info"
-#define H5G_CRT_LINK_INFO_SIZE                  sizeof(H5O_linfo_t)
+#define H5G_CRT_LINK_INFO_NAME "link info"
+#define H5G_CRT_LINK_INFO_SIZE sizeof(H5O_linfo_t)
 /* clang-format off */
 #define H5G_CRT_LINK_INFO_DEF                   {H5G_CRT_LINFO_TRACK_CORDER, \
                                                     H5G_CRT_LINFO_INDEX_CORDER, \
@@ -78,17 +78,17 @@
 /* clang-format on */
 
 /* Defaults for group info values */
-#define H5G_CRT_GINFO_LHEAP_SIZE_HINT           0
-#define H5G_CRT_GINFO_STORE_LINK_PHASE_CHANGE   FALSE
-#define H5G_CRT_GINFO_MAX_COMPACT               8
-#define H5G_CRT_GINFO_MIN_DENSE                 6
-#define H5G_CRT_GINFO_STORE_EST_ENTRY_INFO      FALSE
-#define H5G_CRT_GINFO_EST_NUM_ENTRIES           4
-#define H5G_CRT_GINFO_EST_NAME_LEN              8
+#define H5G_CRT_GINFO_LHEAP_SIZE_HINT         0
+#define H5G_CRT_GINFO_STORE_LINK_PHASE_CHANGE FALSE
+#define H5G_CRT_GINFO_MAX_COMPACT             8
+#define H5G_CRT_GINFO_MIN_DENSE               6
+#define H5G_CRT_GINFO_STORE_EST_ENTRY_INFO    FALSE
+#define H5G_CRT_GINFO_EST_NUM_ENTRIES         4
+#define H5G_CRT_GINFO_EST_NAME_LEN            8
 
 /* Definitions for group info settings */
-#define H5G_CRT_GROUP_INFO_NAME                 "group info"
-#define H5G_CRT_GROUP_INFO_SIZE                 sizeof(H5O_ginfo_t)
+#define H5G_CRT_GROUP_INFO_NAME "group info"
+#define H5G_CRT_GROUP_INFO_SIZE sizeof(H5O_ginfo_t)
 /* clang-format off */
 #define H5G_CRT_GROUP_INFO_DEF                  {H5G_CRT_GINFO_LHEAP_SIZE_HINT, \
                                                     H5G_CRT_GINFO_STORE_LINK_PHASE_CHANGE, \
@@ -102,9 +102,9 @@
 
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5G_PACKAGE
-#define H5G_MOUNTED(G)              ((G)->shared->mounted)
+#define H5G_MOUNTED(G) ((G)->shared->mounted)
 #else /* H5G_PACKAGE */
-#define H5G_MOUNTED(G)              (H5G_mounted(G))
+#define H5G_MOUNTED(G) (H5G_mounted(G))
 #endif /* H5G_PACKAGE */
 
 /*
@@ -112,34 +112,34 @@
  * a symbolic link or a mount point.  The normal operation is to follow the
  * symbolic link or mount point and return information about its target.
  */
-#define H5G_TARGET_NORMAL    0x0000
+#define H5G_TARGET_NORMAL   0x0000
 #define H5G_TARGET_SLINK    0x0001
 #define H5G_TARGET_MOUNT    0x0002
-#define H5G_TARGET_UDLINK    0x0004
-#define H5G_TARGET_EXISTS    0x0008
-#define H5G_CRT_INTMD_GROUP    0x0010
+#define H5G_TARGET_UDLINK   0x0004
+#define H5G_TARGET_EXISTS   0x0008
+#define H5G_CRT_INTMD_GROUP 0x0010
 
 /* Type of operation being performed for call to H5G_name_replace() */
 typedef enum {
-    H5G_NAME_MOVE = 0,          /* H5*move call    */
-    H5G_NAME_DELETE,            /* H5Ldelete call  */
-    H5G_NAME_MOUNT,             /* H5Fmount call   */
-    H5G_NAME_UNMOUNT            /* H5Funmount call */
+    H5G_NAME_MOVE = 0, /* H5*move call    */
+    H5G_NAME_DELETE,   /* H5Ldelete call  */
+    H5G_NAME_MOUNT,    /* H5Fmount call   */
+    H5G_NAME_UNMOUNT   /* H5Funmount call */
 } H5G_names_op_t;
 
 /* Status returned from traversal callbacks; whether the object location
  * or group location need to be closed */
-#define H5G_OWN_NONE 0
+#define H5G_OWN_NONE    0
 #define H5G_OWN_OBJ_LOC 1
 #define H5G_OWN_GRP_LOC 2
-#define H5G_OWN_BOTH 3
+#define H5G_OWN_BOTH    3
 typedef int H5G_own_loc_t;
 
 /* Structure to store information about the name an object was opened with */
 typedef struct {
-    H5RS_str_t  *full_path_r;           /* Path to object, as seen from root of current file mounting hierarchy */
-    H5RS_str_t  *user_path_r;           /* Path to object, as opened by user */
-    unsigned    obj_hidden;             /* Whether the object is visible in group hier. */
+    H5RS_str_t *full_path_r; /* Path to object, as seen from root of current file mounting hierarchy */
+    H5RS_str_t *user_path_r; /* Path to object, as opened by user */
+    unsigned    obj_hidden;  /* Whether the object is visible in group hier. */
 } H5G_name_t;
 
 /* Forward declarations (for prototypes & struct definitions) */
@@ -151,8 +151,8 @@ struct H5O_link_t;
  * location and a group hierarchy path for the object.
  */
 typedef struct {
-    struct H5O_loc_t *oloc;             /* Object header location            */
-    H5G_name_t *path;                   /* Group hierarchy path              */
+    struct H5O_loc_t *oloc; /* Object header location            */
+    H5G_name_t *      path; /* Group hierarchy path              */
 } H5G_loc_t;
 
 /* Typedef for path traversal operations */
@@ -165,45 +165,45 @@ typedef struct {
  * H5G_OWN_GRP_LOC if it takes ownership of grp_loc, and H5G_OWN_NONE if obj_loc and
  * grp_loc need to be deleted.
  */
-typedef herr_t (*H5G_traverse_t)(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const struct H5O_link_t *lnk/*in*/, H5G_loc_t *obj_loc/*out*/, void *operator_data/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
+typedef herr_t (*H5G_traverse_t)(H5G_loc_t *grp_loc /*in*/, const char *name,
+                                 const struct H5O_link_t *lnk /*in*/, H5G_loc_t *obj_loc /*out*/,
+                                 void *operator_data /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
 
 /* Describe kind of callback to make for each link */
 typedef enum H5G_link_iterate_op_type_t {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-    H5G_LINK_OP_OLD,                /* "Old" application callback */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-    H5G_LINK_OP_NEW                 /* "New" application callback */
+    H5G_LINK_OP_OLD, /* "Old" application callback */
+#endif               /* H5_NO_DEPRECATED_SYMBOLS */
+    H5G_LINK_OP_NEW  /* "New" application callback */
 } H5G_link_iterate_op_type_t;
 
 typedef struct {
     H5G_link_iterate_op_type_t op_type;
     union {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        H5G_iterate_t op_old;           /* "Old" application callback for each link */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-        H5L_iterate_t op_new;           /* "New" application callback for each link */
+        H5G_iterate_t op_old; /* "Old" application callback for each link */
+#endif                        /* H5_NO_DEPRECATED_SYMBOLS */
+        H5L_iterate_t op_new; /* "New" application callback for each link */
     } op_func;
 } H5G_link_iterate_t;
 
-typedef struct H5G_t H5G_t;
+typedef struct H5G_t        H5G_t;
 typedef struct H5G_shared_t H5G_shared_t;
-typedef struct H5G_entry_t H5G_entry_t;
+typedef struct H5G_entry_t  H5G_entry_t;
 
 /*
  * Library prototypes...  These are the ones that other packages routinely
  * call.
  */
 H5_DLL struct H5O_loc_t *H5G_oloc(H5G_t *grp);
-H5_DLL H5G_name_t * H5G_nameof(H5G_t *grp);
+H5_DLL H5G_name_t *H5G_nameof(H5G_t *grp);
 H5_DLL H5F_t *H5G_fileof(H5G_t *grp);
-H5_DLL H5G_t *H5G_open(const H5G_loc_t *loc, hid_t dxpl_id);
-H5_DLL herr_t H5G_close(H5G_t *grp);
-H5_DLL herr_t H5G_get_shared_count(H5G_t *grp);
-H5_DLL herr_t H5G_mount(H5G_t *grp);
+H5_DLL H5G_t * H5G_open(const H5G_loc_t *loc, hid_t dxpl_id);
+H5_DLL herr_t  H5G_close(H5G_t *grp);
+H5_DLL herr_t  H5G_get_shared_count(H5G_t *grp);
+H5_DLL herr_t  H5G_mount(H5G_t *grp);
 H5_DLL hbool_t H5G_mounted(H5G_t *grp);
-H5_DLL herr_t H5G_unmount(H5G_t *grp);
+H5_DLL herr_t  H5G_unmount(H5G_t *grp);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 H5_DLL H5G_obj_t H5G_map_obj_type(H5O_type_t obj_type);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -216,15 +216,13 @@ H5_DLL char *H5G_normalize(const char *name);
 /*
  * Group hierarchy traversal routines
  */
-H5_DLL herr_t H5G_traverse(const H5G_loc_t *loc, const char *name,
-    unsigned target, H5G_traverse_t op, void *op_data, hid_t lapl_id,
-    hid_t dxpl_id);
-H5_DLL herr_t H5G_iterate(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5G_visit(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op, void *op_data,
-    hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5G_traverse(const H5G_loc_t *loc, const char *name, unsigned target, H5G_traverse_t op,
+                           void *op_data, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5G_iterate(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                          hsize_t skip, hsize_t *last_lnk, const H5G_link_iterate_t *lnk_op, void *op_data,
+                          hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                        H5L_iterate_t op, void *op_data, hid_t lapl_id, hid_t dxpl_id);
 
 /*
  * Functions that understand links in groups
@@ -234,25 +232,25 @@ H5_DLL herr_t H5G_link_to_info(const struct H5O_link_t *lnk, H5L_info_t *linfo);
 /*
  * Functions that understand group objects
  */
-H5_DLL herr_t H5G_obj_insert(const struct H5O_loc_t *grp_oloc, const char *name,
-    struct H5O_link_t *obj_lnk, hbool_t adj_link, H5O_type_t obj_type,
-    const void *crt_info, hid_t dxpl_id);
+H5_DLL herr_t  H5G_obj_insert(const struct H5O_loc_t *grp_oloc, const char *name, struct H5O_link_t *obj_lnk,
+                              hbool_t adj_link, H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id);
 H5_DLL ssize_t H5G_obj_get_name_by_idx(const struct H5O_loc_t *oloc, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, char* name, size_t size, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_remove(const struct H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r,
-    const char *name, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_remove_by_idx(const struct H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_lookup_by_idx(const struct H5O_loc_t *grp_oloc, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, struct H5O_link_t *lnk, hid_t dxpl_id);
-H5_DLL hid_t H5G_get_create_plist(H5G_t *grp);
+                                       H5_iter_order_t order, hsize_t n, char *name, size_t size,
+                                       hid_t dxpl_id);
+H5_DLL herr_t  H5G_obj_remove(const struct H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *name,
+                              hid_t dxpl_id);
+H5_DLL herr_t  H5G_obj_remove_by_idx(const struct H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
+                                     H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t dxpl_id);
+H5_DLL herr_t  H5G_obj_lookup_by_idx(const struct H5O_loc_t *grp_oloc, H5_index_t idx_type,
+                                     H5_iter_order_t order, hsize_t n, struct H5O_link_t *lnk, hid_t dxpl_id);
+H5_DLL hid_t   H5G_get_create_plist(H5G_t *grp);
 
 /*
  * These functions operate on symbol table nodes.
  */
 H5_DLL herr_t H5G_node_close(const H5F_t *f);
-H5_DLL herr_t H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
-                int indent, int fwidth, haddr_t heap);
+H5_DLL herr_t H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                             haddr_t heap);
 
 /*
  * These functions operate on group object locations.
@@ -263,39 +261,37 @@ H5_DLL herr_t H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *en
 /*
  * These functions operate on group hierarchy names.
  */
-H5_DLL herr_t H5G_name_set(const H5G_name_t *loc, H5G_name_t *obj, const char *name);
-H5_DLL herr_t H5G_name_replace(const struct H5O_link_t *lnk, H5G_names_op_t op,
-    H5F_t *src_file, H5RS_str_t *src_full_path_r, H5F_t *dst_file,
-    H5RS_str_t *dst_full_path_r, hid_t dxpl_id);
-H5_DLL herr_t H5G_name_reset(H5G_name_t *name);
-H5_DLL herr_t H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth);
-H5_DLL herr_t H5G_name_free(H5G_name_t *name);
-H5_DLL ssize_t H5G_get_name(const H5G_loc_t *loc, char *name/*out*/, size_t size,
-    hbool_t *cached, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL ssize_t H5G_get_name_by_addr(hid_t fid, hid_t lapl_id, hid_t dxpl_id,
-    const struct H5O_loc_t *loc, char* name, size_t size);
+H5_DLL herr_t  H5G_name_set(const H5G_name_t *loc, H5G_name_t *obj, const char *name);
+H5_DLL herr_t  H5G_name_replace(const struct H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
+                                H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r,
+                                hid_t dxpl_id);
+H5_DLL herr_t  H5G_name_reset(H5G_name_t *name);
+H5_DLL herr_t  H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth);
+H5_DLL herr_t  H5G_name_free(H5G_name_t *name);
+H5_DLL ssize_t H5G_get_name(const H5G_loc_t *loc, char *name /*out*/, size_t size, hbool_t *cached,
+                            hid_t lapl_id, hid_t dxpl_id);
+H5_DLL ssize_t H5G_get_name_by_addr(hid_t fid, hid_t lapl_id, hid_t dxpl_id, const struct H5O_loc_t *loc,
+                                    char *name, size_t size);
 H5_DLL H5RS_str_t *H5G_build_fullpath_refstr_str(H5RS_str_t *path_r, const char *name);
 
 /*
  * These functions operate on group "locations"
  */
-H5_DLL herr_t H5G_loc(hid_t loc_id, H5G_loc_t *loc);
-H5_DLL herr_t H5G_loc_find(const H5G_loc_t *loc, const char *name,
-    H5G_loc_t *obj_loc/*out*/, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5G_loc_find_by_idx(H5G_loc_t *loc, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    H5G_loc_t *obj_loc/*out*/, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL htri_t H5G_loc_exists(const H5G_loc_t *loc, const char *name,
-    hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5G_loc_info(H5G_loc_t *loc, const char *name,
-    hbool_t want_ih_info, H5O_info_t *oinfo/*out*/, hid_t lapl_id,
-    hid_t dxpl_id);
-H5_DLL herr_t H5G_loc_set_comment(H5G_loc_t *loc, const char *name,
-    const char *comment, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL ssize_t H5G_loc_get_comment(H5G_loc_t *loc, const char *name,
-    char *comment/*out*/, size_t bufsize, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5G_loc_reset(H5G_loc_t *loc);
-H5_DLL herr_t H5G_loc_free(H5G_loc_t *loc);
+H5_DLL herr_t  H5G_loc(hid_t loc_id, H5G_loc_t *loc);
+H5_DLL herr_t  H5G_loc_find(const H5G_loc_t *loc, const char *name, H5G_loc_t *obj_loc /*out*/, hid_t lapl_id,
+                            hid_t dxpl_id);
+H5_DLL herr_t  H5G_loc_find_by_idx(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type,
+                                   H5_iter_order_t order, hsize_t n, H5G_loc_t *obj_loc /*out*/, hid_t lapl_id,
+                                   hid_t dxpl_id);
+H5_DLL htri_t  H5G_loc_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t  H5G_loc_info(H5G_loc_t *loc, const char *name, hbool_t want_ih_info, H5O_info_t *oinfo /*out*/,
+                            hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t  H5G_loc_set_comment(H5G_loc_t *loc, const char *name, const char *comment, hid_t lapl_id,
+                                   hid_t dxpl_id);
+H5_DLL ssize_t H5G_loc_get_comment(H5G_loc_t *loc, const char *name, char *comment /*out*/, size_t bufsize,
+                                   hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t  H5G_loc_reset(H5G_loc_t *loc);
+H5_DLL herr_t  H5G_loc_free(H5G_loc_t *loc);
 
 /*
  * These functions operate on the root group
@@ -306,4 +302,3 @@ H5_DLL herr_t H5G_root_free(H5G_t *grp);
 H5_DLL H5G_t *H5G_rootof(H5F_t *f);
 
 #endif /* _H5Gprivate_H */
-
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 9c5803c..a9d44cc 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -28,10 +28,10 @@
 #include <sys/types.h>
 
 /* Public headers needed by this file */
-#include "H5public.h"		/* Generic Functions			*/
-#include "H5Lpublic.h"		/* Links                                */
-#include "H5Opublic.h"		/* Object headers			*/
-#include "H5Tpublic.h"		/* Datatypes				*/
+#include "H5public.h"  /* Generic Functions			*/
+#include "H5Lpublic.h" /* Links                                */
+#include "H5Opublic.h" /* Object headers			*/
+#include "H5Tpublic.h" /* Datatypes				*/
 
 /*****************/
 /* Public Macros */
@@ -47,40 +47,36 @@ extern "C" {
 
 /* Types of link storage for groups */
 typedef enum H5G_storage_type_t {
-    H5G_STORAGE_TYPE_UNKNOWN = -1,	/* Unknown link storage type	*/
-    H5G_STORAGE_TYPE_SYMBOL_TABLE,      /* Links in group are stored with a "symbol table" */
-                                        /* (this is sometimes called "old-style" groups) */
-    H5G_STORAGE_TYPE_COMPACT,		/* Links are stored in object header */
-    H5G_STORAGE_TYPE_DENSE 		/* Links are stored in fractal heap & indexed with v2 B-tree */
+    H5G_STORAGE_TYPE_UNKNOWN = -1, /* Unknown link storage type	*/
+    H5G_STORAGE_TYPE_SYMBOL_TABLE, /* Links in group are stored with a "symbol table" */
+                                   /* (this is sometimes called "old-style" groups) */
+    H5G_STORAGE_TYPE_COMPACT,      /* Links are stored in object header */
+    H5G_STORAGE_TYPE_DENSE         /* Links are stored in fractal heap & indexed with v2 B-tree */
 } H5G_storage_type_t;
 
 /* Information struct for group (for H5Gget_info/H5Gget_info_by_name/H5Gget_info_by_idx) */
 typedef struct H5G_info_t {
-    H5G_storage_type_t 	storage_type;	/* Type of storage for links in group */
-    hsize_t 	nlinks;		        /* Number of links in group */
-    int64_t     max_corder;             /* Current max. creation order value for group */
-    hbool_t     mounted;                /* Whether group has a file mounted on it */
+    H5G_storage_type_t storage_type; /* Type of storage for links in group */
+    hsize_t            nlinks;       /* Number of links in group */
+    int64_t            max_corder;   /* Current max. creation order value for group */
+    hbool_t            mounted;      /* Whether group has a file mounted on it */
 } H5G_info_t;
 
 /********************/
 /* Public Variables */
 /********************/
 
-
 /*********************/
 /* Public Prototypes */
 /*********************/
-H5_DLL hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id,
-    hid_t gcpl_id, hid_t gapl_id);
-H5_DLL hid_t H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id);
-H5_DLL hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id);
-H5_DLL hid_t H5Gget_create_plist(hid_t group_id);
+H5_DLL hid_t  H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id);
+H5_DLL hid_t  H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id);
+H5_DLL hid_t  H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id);
+H5_DLL hid_t  H5Gget_create_plist(hid_t group_id);
 H5_DLL herr_t H5Gget_info(hid_t loc_id, H5G_info_t *ginfo);
-H5_DLL herr_t H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *ginfo,
-    hid_t lapl_id);
-H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo,
-    hid_t lapl_id);
+H5_DLL herr_t H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *ginfo, hid_t lapl_id);
+H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                 H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo, hid_t lapl_id);
 H5_DLL herr_t H5Gclose(hid_t group_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
@@ -92,18 +88,17 @@ H5_DLL herr_t H5Gclose(hid_t group_id);
 /* Macros */
 
 /* Link definitions */
-#define H5G_SAME_LOC H5L_SAME_LOC
+#define H5G_SAME_LOC   H5L_SAME_LOC
 #define H5G_LINK_ERROR H5L_TYPE_ERROR
-#define H5G_LINK_HARD H5L_TYPE_HARD
-#define H5G_LINK_SOFT H5L_TYPE_SOFT
-#define H5G_link_t H5L_type_t
+#define H5G_LINK_HARD  H5L_TYPE_HARD
+#define H5G_LINK_SOFT  H5L_TYPE_SOFT
+#define H5G_link_t     H5L_type_t
 
 /* Macros for types of objects in a group (see H5G_obj_t definition) */
-#define H5G_NTYPES	256		/* Max possible number of types	*/
-#define H5G_NLIBTYPES	8		/* Number of internal types	*/
-#define H5G_NUSERTYPES	(H5G_NTYPES - H5G_NLIBTYPES)
-#define H5G_USERTYPE(X)	(8 + (X))	/* User defined types		*/
-
+#define H5G_NTYPES      256 /* Max possible number of types	*/
+#define H5G_NLIBTYPES   8   /* Number of internal types	*/
+#define H5G_NUSERTYPES  (H5G_NTYPES - H5G_NLIBTYPES)
+#define H5G_USERTYPE(X) (8 + (X)) /* User defined types		*/
 
 /* Typedefs */
 
@@ -115,15 +110,15 @@ H5_DLL herr_t H5Gclose(hid_t group_id);
  * than one type.
  */
 typedef enum H5G_obj_t {
-    H5G_UNKNOWN = -1,		/* Unknown object type		*/
-    H5G_GROUP,		        /* Object is a group		*/
-    H5G_DATASET,		/* Object is a dataset		*/
-    H5G_TYPE,			/* Object is a named data type	*/
-    H5G_LINK,		        /* Object is a symbolic link	*/
-    H5G_UDLINK,		        /* Object is a user-defined link */
-    H5G_RESERVED_5,		/* Reserved for future use	*/
-    H5G_RESERVED_6,		/* Reserved for future use	*/
-    H5G_RESERVED_7		/* Reserved for future use	*/
+    H5G_UNKNOWN = -1, /* Unknown object type		*/
+    H5G_GROUP,        /* Object is a group		*/
+    H5G_DATASET,      /* Object is a dataset		*/
+    H5G_TYPE,         /* Object is a named data type	*/
+    H5G_LINK,         /* Object is a symbolic link	*/
+    H5G_UDLINK,       /* Object is a user-defined link */
+    H5G_RESERVED_5,   /* Reserved for future use	*/
+    H5G_RESERVED_6,   /* Reserved for future use	*/
+    H5G_RESERVED_7    /* Reserved for future use	*/
 } H5G_obj_t;
 
 /* Prototype for H5Giterate() operator */
@@ -131,40 +126,32 @@ typedef herr_t (*H5G_iterate_t)(hid_t group, const char *name, void *op_data);
 
 /* Information about an object */
 typedef struct H5G_stat_t {
-    unsigned long 	fileno[2];	/*file number			*/
-    unsigned long 	objno[2];	/*object number			*/
-    unsigned 		nlink;		/*number of hard links to object*/
-    H5G_obj_t 		type;		/*basic object type		*/
-    time_t		mtime;		/*modification time		*/
-    size_t		linklen;	/*symbolic link value length	*/
-    H5O_stat_t          ohdr;           /* Object header information    */
+    unsigned long fileno[2]; /*file number			*/
+    unsigned long objno[2];  /*object number			*/
+    unsigned      nlink;     /*number of hard links to object*/
+    H5G_obj_t     type;      /*basic object type		*/
+    time_t        mtime;     /*modification time		*/
+    size_t        linklen;   /*symbolic link value length	*/
+    H5O_stat_t    ohdr;      /* Object header information    */
 } H5G_stat_t;
 
-
 /* Function prototypes */
-H5_DLL hid_t H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint);
-H5_DLL hid_t H5Gopen1(hid_t loc_id, const char *name);
-H5_DLL herr_t H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name,
-    const char *new_name);
-H5_DLL herr_t H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
-    hid_t new_loc_id, const char *new_name);
-H5_DLL herr_t H5Gmove(hid_t src_loc_id, const char *src_name,
-    const char *dst_name);
-H5_DLL herr_t H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
-    const char *dst_name);
-H5_DLL herr_t H5Gunlink(hid_t loc_id, const char *name);
-H5_DLL herr_t H5Gget_linkval(hid_t loc_id, const char *name, size_t size,
-    char *buf/*out*/);
-H5_DLL herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment);
-H5_DLL int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize,
-    char *buf);
-H5_DLL herr_t H5Giterate(hid_t loc_id, const char *name, int *idx,
-        H5G_iterate_t op, void *op_data);
-H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs);
-H5_DLL herr_t H5Gget_objinfo(hid_t loc_id, const char *name,
-    hbool_t follow_link, H5G_stat_t *statbuf/*out*/);
-H5_DLL ssize_t H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char* name,
-    size_t size);
+H5_DLL hid_t     H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint);
+H5_DLL hid_t     H5Gopen1(hid_t loc_id, const char *name);
+H5_DLL herr_t    H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new_name);
+H5_DLL herr_t    H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, hid_t new_loc_id,
+                          const char *new_name);
+H5_DLL herr_t    H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name);
+H5_DLL herr_t    H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name);
+H5_DLL herr_t    H5Gunlink(hid_t loc_id, const char *name);
+H5_DLL herr_t    H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf /*out*/);
+H5_DLL herr_t    H5Gset_comment(hid_t loc_id, const char *name, const char *comment);
+H5_DLL int       H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf);
+H5_DLL herr_t    H5Giterate(hid_t loc_id, const char *name, int *idx, H5G_iterate_t op, void *op_data);
+H5_DLL herr_t    H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs);
+H5_DLL herr_t    H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
+                                H5G_stat_t *statbuf /*out*/);
+H5_DLL ssize_t   H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name, size_t size);
 H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -173,4 +160,3 @@ H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx);
 }
 #endif
 #endif /* _H5Gpublic_H */
-
diff --git a/src/H5Groot.c b/src/H5Groot.c
index 66e7dea..05c9141 100644
--- a/src/H5Groot.c
+++ b/src/H5Groot.c
@@ -26,58 +26,48 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg  */
-
+#define H5F_PACKAGE /*suppress error about including H5Fpkg	  */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"		/* File access				*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"         /* Property Lists			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Pprivate.h"  /* Property Lists			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_rootof
  *
@@ -106,7 +96,7 @@ H5G_rootof(H5F_t *f)
     HDassert(f->shared);
 
     /* Walk to top of mounted files */
-    while(f->parent)
+    while (f->parent)
         f = f->parent;
 
     /* Sanity check */
@@ -115,15 +105,14 @@ H5G_rootof(H5F_t *f)
     HDassert(f->shared->root_grp);
 
     /* Check to see if the root group was opened through a different
-    * "top" file, and switch it to point at the current "top" file.
-    */
-    if(f->shared->root_grp->oloc.file != f)
+     * "top" file, and switch it to point at the current "top" file.
+     */
+    if (f->shared->root_grp->oloc.file != f)
         f->shared->root_grp->oloc.file = f;
 
     FUNC_LEAVE_NOAPI(f->shared->root_grp)
 } /* end H5G_rootof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_mkroot
  *
@@ -145,12 +134,12 @@ H5G_rootof(H5F_t *f)
 herr_t
 H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
 {
-    H5G_loc_t   root_loc;               /* Root location information */
-    H5G_obj_create_t gcrt_info;         /* Root group object creation info */
-    htri_t      stab_exists = -1;       /* Whether the symbol table exists */
-    hbool_t     sblock_dirty = FALSE;   /* Whether superblock was dirtied */
-    hbool_t     path_init = FALSE;      /* Whether path was initialized */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t        root_loc;               /* Root location information */
+    H5G_obj_create_t gcrt_info;              /* Root group object creation info */
+    htri_t           stab_exists  = -1;      /* Whether the symbol table exists */
+    hbool_t          sblock_dirty = FALSE;   /* Whether superblock was dirtied */
+    hbool_t          path_init    = FALSE;   /* Whether path was initialized */
+    herr_t           ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -160,19 +149,19 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
     HDassert(f->shared->sblock);
 
     /* Check if the root group is already initialized */
-    if(f->shared->root_grp)
+    if (f->shared->root_grp)
         HGOTO_DONE(SUCCEED)
 
     /* Create information needed for group nodes */
-    if(H5G__node_init(f) < 0)
+    if (H5G__node_init(f) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group node info")
 
     /*
      * Create the group pointer
      */
-    if(NULL == (f->shared->root_grp = H5FL_CALLOC(H5G_t)))
+    if (NULL == (f->shared->root_grp = H5FL_CALLOC(H5G_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    if(NULL == (f->shared->root_grp->shared = H5FL_CALLOC(H5G_shared_t))) {
+    if (NULL == (f->shared->root_grp->shared = H5FL_CALLOC(H5G_shared_t))) {
         f->shared->root_grp = H5FL_FREE(H5G_t, f->shared->root_grp);
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     } /* end if */
@@ -187,108 +176,109 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
      * If there is no root object then create one. The root group always starts
      * with a hard link count of one since it's pointed to by the superblock.
      */
-    if(create_root) {
+    if (create_root) {
         /* Create root group */
         /* (Pass the FCPL which is a sub-class of the group creation property class) */
-        gcrt_info.gcpl_id = f->shared->fcpl_id;
+        gcrt_info.gcpl_id    = f->shared->fcpl_id;
         gcrt_info.cache_type = H5G_NOTHING_CACHED;
-	if(H5G__obj_create(f, dxpl_id, &gcrt_info, root_loc.oloc/*out*/) < 0)
-	    HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group entry")
-	if(1 != H5O_link(root_loc.oloc, 1, dxpl_id))
-	    HGOTO_ERROR(H5E_SYM, H5E_LINKCOUNT, FAIL, "internal error (wrong link count)")
+        if (H5G__obj_create(f, dxpl_id, &gcrt_info, root_loc.oloc /*out*/) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group entry")
+        if (1 != H5O_link(root_loc.oloc, 1, dxpl_id))
+            HGOTO_ERROR(H5E_SYM, H5E_LINKCOUNT, FAIL, "internal error (wrong link count)")
 
         /* Decrement refcount on root group's object header in memory */
-        if(H5O_dec_rc_by_loc(root_loc.oloc, dxpl_id) < 0)
-           HGOTO_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "unable to decrement refcount on root group's object header")
+        if (H5O_dec_rc_by_loc(root_loc.oloc, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTDEC, FAIL,
+                        "unable to decrement refcount on root group's object header")
 
         /* Mark superblock dirty, so root group info is flushed */
         sblock_dirty = TRUE;
 
         /* Create the root group symbol table entry */
         HDassert(!f->shared->sblock->root_ent);
-        if(f->shared->sblock->super_vers < HDF5_SUPERBLOCK_VERSION_2) {
+        if (f->shared->sblock->super_vers < HDF5_SUPERBLOCK_VERSION_2) {
             /* Allocate space for the root group symbol table entry */
-            if(NULL == (f->shared->sblock->root_ent = (H5G_entry_t *)H5MM_calloc(sizeof(H5G_entry_t))))
+            if (NULL == (f->shared->sblock->root_ent = (H5G_entry_t *)H5MM_calloc(sizeof(H5G_entry_t))))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate space for symbol table entry")
 
             /* Initialize the root group symbol table entry */
             f->shared->sblock->root_ent->type = gcrt_info.cache_type;
-            if(gcrt_info.cache_type != H5G_NOTHING_CACHED)
+            if (gcrt_info.cache_type != H5G_NOTHING_CACHED)
                 f->shared->sblock->root_ent->cache = gcrt_info.cache;
-            f->shared->sblock->root_ent->name_off = 0;  /* No name (yet) */
-            f->shared->sblock->root_ent->header = root_loc.oloc->addr;
+            f->shared->sblock->root_ent->name_off = 0; /* No name (yet) */
+            f->shared->sblock->root_ent->header   = root_loc.oloc->addr;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
         /* Create root group object location from f */
         root_loc.oloc->addr = f->shared->sblock->root_addr;
         root_loc.oloc->file = f;
 
-	/*
-	 * Open the root object as a group.
-	 */
-	if(H5O_open(root_loc.oloc) < 0)
-	    HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open root group")
+        /*
+         * Open the root object as a group.
+         */
+        if (H5O_open(root_loc.oloc) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open root group")
 
         /* Actions to take if the symbol table information is cached */
-        if(f->shared->sblock->root_ent && f->shared->sblock->root_ent->type == H5G_CACHED_STAB) {
+        if (f->shared->sblock->root_ent && f->shared->sblock->root_ent->type == H5G_CACHED_STAB) {
             /* Check for the situation where the symbol table is cached but does
              * not exist.  This can happen if, for example, an external link is
              * added to the root group. */
-            if((stab_exists = H5O_msg_exists(root_loc.oloc, H5O_STAB_ID, dxpl_id)) < 0)
+            if ((stab_exists = H5O_msg_exists(root_loc.oloc, H5O_STAB_ID, dxpl_id)) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check if symbol table message exists")
 
             /* Remove the cache if the stab does not exist */
-            if(!stab_exists)
+            if (!stab_exists)
                 f->shared->sblock->root_ent->type = H5G_NOTHING_CACHED;
 #ifndef H5_STRICT_FORMAT_CHECKS
             /* If symbol table information is cached, check if we should replace the
-            * symbol table message with the cached symbol table information */
-            else if(H5F_INTENT(f) & H5F_ACC_RDWR) {
-                H5O_stab_t      cached_stab;
+             * symbol table message with the cached symbol table information */
+            else if (H5F_INTENT(f) & H5F_ACC_RDWR) {
+                H5O_stab_t cached_stab;
 
                 /* Retrieve the cached symbol table information */
                 cached_stab.btree_addr = f->shared->sblock->root_ent->cache.stab.btree_addr;
-                cached_stab.heap_addr = f->shared->sblock->root_ent->cache.stab.heap_addr;
+                cached_stab.heap_addr  = f->shared->sblock->root_ent->cache.stab.heap_addr;
 
                 /* Check if the symbol table message is valid, and replace with the
-                * cached symbol table if necessary */
-                if(H5G__stab_valid(root_loc.oloc, dxpl_id, &cached_stab) < 0)
+                 * cached symbol table if necessary */
+                if (H5G__stab_valid(root_loc.oloc, dxpl_id, &cached_stab) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to verify symbol table")
             } /* end if */
-#endif /* H5_STRICT_FORMAT_CHECKS */
-        } /* end if */
-    } /* end else */
+#endif        /* H5_STRICT_FORMAT_CHECKS */
+        }     /* end if */
+    }         /* end else */
 
     /* Cache the root group's symbol table information in the root group symbol
      * table entry.  It will have been allocated by now if it needs to be
      * present, so we don't need to check the superblock version.  We do this if
      * we have write access, the root entry has been allocated (i.e.
      * super_vers < 2) and the stab info is not already cached. */
-    if((H5F_INTENT(f) & H5F_ACC_RDWR) && stab_exists != FALSE && f->shared->sblock->root_ent
-            && f->shared->sblock->root_ent->type != H5G_CACHED_STAB) {
-        H5O_stab_t      stab;           /* Symbol table */
+    if ((H5F_INTENT(f) & H5F_ACC_RDWR) && stab_exists != FALSE && f->shared->sblock->root_ent &&
+        f->shared->sblock->root_ent->type != H5G_CACHED_STAB) {
+        H5O_stab_t stab; /* Symbol table */
 
         /* Check if the stab message exists.  It's possible for the root group
          * to use the latest version while the superblock is an old version.
          * If stab_exists is not -1 then we have already checked. */
-        if(stab_exists == -1 && (stab_exists = H5O_msg_exists(root_loc.oloc, H5O_STAB_ID, dxpl_id)) < 0)
+        if (stab_exists == -1 && (stab_exists = H5O_msg_exists(root_loc.oloc, H5O_STAB_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check if symbol table message exists")
 
-        if(stab_exists) {
+        if (stab_exists) {
             /* Read the root group's symbol table message */
-            if(NULL == H5O_msg_read(root_loc.oloc, H5O_STAB_ID, &stab, dxpl_id))
+            if (NULL == H5O_msg_read(root_loc.oloc, H5O_STAB_ID, &stab, dxpl_id))
                 HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "unable to read symbol table message")
 
             /* Update the root group symbol table entry */
-            f->shared->sblock->root_ent->type = H5G_CACHED_STAB;
+            f->shared->sblock->root_ent->type                  = H5G_CACHED_STAB;
             f->shared->sblock->root_ent->cache.stab.btree_addr = stab.btree_addr;
-            f->shared->sblock->root_ent->cache.stab.heap_addr = stab.heap_addr;
+            f->shared->sblock->root_ent->cache.stab.heap_addr  = stab.heap_addr;
 
             /* Mark superblock dirty, so root group info is flushed */
             sblock_dirty = TRUE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Create the path names for the root group's entry */
     H5G__name_init(root_loc.path, "/");
@@ -299,49 +289,47 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
      * exists.  Don't count either the superblock extension or the root group
      * in the number of open objects in the file.
      */
-    HDassert((1 == f->nopen_objs) ||
-            (2 == f->nopen_objs && HADDR_UNDEF != f->shared->sblock->ext_addr));
+    HDassert((1 == f->nopen_objs) || (2 == f->nopen_objs && HADDR_UNDEF != f->shared->sblock->ext_addr));
     f->nopen_objs--;
 
 done:
     /* In case of error, free various memory locations that may have been
      * allocated */
-    if(ret_value < 0) {
-        if(f->shared->root_grp) {
-            if(path_init)
+    if (ret_value < 0) {
+        if (f->shared->root_grp) {
+            if (path_init)
                 H5G_name_free(root_loc.path);
-            if(f->shared->root_grp->shared)
+            if (f->shared->root_grp->shared)
                 f->shared->root_grp->shared = H5FL_FREE(H5G_shared_t, f->shared->root_grp->shared);
             f->shared->root_grp = H5FL_FREE(H5G_t, f->shared->root_grp);
         } /* end if */
-        if(f->shared->sblock)
+        if (f->shared->sblock)
             f->shared->sblock->root_ent = (H5G_entry_t *)H5MM_xfree(f->shared->sblock->root_ent);
     } /* end if */
 
     /* Mark superblock dirty in cache, if necessary */
-    if(sblock_dirty)
-        if(H5AC_mark_entry_dirty(f->shared->sblock) < 0)
+    if (sblock_dirty)
+        if (H5AC_mark_entry_dirty(f->shared->sblock) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, FAIL, "unable to mark superblock as dirty")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_mkroot() */
 
-
 /*-------------------------------------------------------------------------
-* Function:    H5G_root_free
-*
-* Purpose:	Free memory used by an H5G_t struct (and its H5G_shared_t).
-*		Does not close the group or decrement the reference count.
-*		Used to free memory used by the root group.
-*
-* Return:	Success:    Non-negative
-*		Failure:    Negative
-*
-* Programmer:	James Laird
-*		Tuesday, September 7, 2004
-*
-*-------------------------------------------------------------------------
-*/
+ * Function:    H5G_root_free
+ *
+ * Purpose:	Free memory used by an H5G_t struct (and its H5G_shared_t).
+ *		Does not close the group or decrement the reference count.
+ *		Used to free memory used by the root group.
+ *
+ * Return:	Success:    Non-negative
+ *		Failure:    Negative
+ *
+ * Programmer:	James Laird
+ *		Tuesday, September 7, 2004
+ *
+ *-------------------------------------------------------------------------
+ */
 herr_t
 H5G_root_free(H5G_t *grp)
 {
@@ -355,12 +343,11 @@ H5G_root_free(H5G_t *grp)
     H5G_name_free(&(grp->path));
 
     grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
-    grp = H5FL_FREE(H5G_t, grp);
+    grp         = H5FL_FREE(H5G_t, grp);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_root_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_root_loc
  *
@@ -378,8 +365,8 @@ H5G_root_free(H5G_t *grp)
 herr_t
 H5G_root_loc(H5F_t *f, H5G_loc_t *loc)
 {
-    H5G_t *root_grp;                    /* Pointer to root group's info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_t *root_grp;            /* Pointer to root group's info */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -391,9 +378,9 @@ H5G_root_loc(H5F_t *f, H5G_loc_t *loc)
     HDassert(root_grp);
 
     /* Build the group location for the root group */
-    if(NULL == (loc->oloc = H5G_oloc(root_grp)))
+    if (NULL == (loc->oloc = H5G_oloc(root_grp)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location for root group")
-    if(NULL == (loc->path = H5G_nameof(root_grp)))
+    if (NULL == (loc->path = H5G_nameof(root_grp)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path for root group")
 
     /* Patch up root group's object location to reflect this file */
@@ -401,12 +388,11 @@ H5G_root_loc(H5F_t *f, H5G_loc_t *loc)
      *  share an underlying low-level file)
      */
     /* (but only for non-mounted files) */
-    if(!H5F_is_mount(f)) {
-        loc->oloc->file = f;
+    if (!H5F_is_mount(f)) {
+        loc->oloc->file         = f;
         loc->oloc->holding_file = FALSE;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_root_loc() */
-
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index 0eb7b0b..e8e7526 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -20,25 +20,22 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5HLprivate.h" /* Local Heaps				*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -46,33 +43,33 @@
 /* User data for finding link information from B-tree */
 typedef struct {
     /* downward */
-    const char *name;           /* Name to search for */
-    H5HL_t *heap;               /* Local heap for group */
+    const char *name; /* Name to search for */
+    H5HL_t *    heap; /* Local heap for group */
 
     /* upward */
-    H5O_link_t *lnk;            /* Caller's link location */
+    H5O_link_t *lnk; /* Caller's link location */
 } H5G_stab_fnd_ud_t;
 
 /* Data passed through B-tree iteration for looking up a name by index */
 typedef struct H5G_bt_it_gnbi_t {
     /* downward */
     H5G_bt_it_idx_common_t common; /* Common information for "by index" lookup  */
-    H5HL_t *heap;               /*symbol table heap 			     */
+    H5HL_t *               heap;   /*symbol table heap 			     */
 
     /* upward */
-    char         *name;         /*member name to be returned                 */
+    char *name; /*member name to be returned                 */
 } H5G_bt_it_gnbi_t;
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 /* Data passed through B-tree iteration for looking up a type by index */
 typedef struct H5G_bt_it_gtbi_t {
     /* downward */
-    H5G_bt_it_idx_common_t common; /* Common information for "by index" lookup  */
-    H5F_t       *f;             /* Pointer to file that symbol table is in */
-    hid_t       dxpl_id;        /* DXPL for operation */
+    H5G_bt_it_idx_common_t common;  /* Common information for "by index" lookup  */
+    H5F_t *                f;       /* Pointer to file that symbol table is in */
+    hid_t                  dxpl_id; /* DXPL for operation */
 
     /* upward */
-    H5G_obj_t    type;          /*member type to be returned                 */
+    H5G_obj_t type; /*member type to be returned                 */
 } H5G_bt_it_gtbi_t;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
@@ -80,40 +77,33 @@ typedef struct H5G_bt_it_gtbi_t {
 typedef struct H5G_bt_it_lbi_t {
     /* downward */
     H5G_bt_it_idx_common_t common; /* Common information for "by index" lookup  */
-    H5HL_t *heap;               /*symbol table heap 			     */
+    H5HL_t *               heap;   /*symbol table heap 			     */
 
     /* upward */
-    H5O_link_t *lnk;            /*link to be returned                        */
-    hbool_t     found;      	/*whether we found the link                  */
+    H5O_link_t *lnk;   /*link to be returned                        */
+    hbool_t     found; /*whether we found the link                  */
 } H5G_bt_it_lbi_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_create_components
  *
@@ -136,9 +126,9 @@ typedef struct H5G_bt_it_lbi_t {
 herr_t
 H5G__stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t dxpl_id)
 {
-    H5HL_t *heap = NULL;            /* Pointer to local heap */
-    size_t name_offset;	            /* Offset of "" name */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5HL_t *heap = NULL;         /* Pointer to local heap */
+    size_t  name_offset;         /* Offset of "" name */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -150,20 +140,20 @@ H5G__stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t
     HDassert(size_hint > 0);
 
     /* Create the B-tree */
-    if(H5B_create(f, dxpl_id, H5B_SNODE, NULL, &(stab->btree_addr)/*out*/) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create B-tree")
+    if (H5B_create(f, dxpl_id, H5B_SNODE, NULL, &(stab->btree_addr) /*out*/) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create B-tree")
 
     /* Create symbol table private heap */
-    if(H5HL_create(f, dxpl_id, size_hint, &(stab->heap_addr)/*out*/) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create heap")
+    if (H5HL_create(f, dxpl_id, size_hint, &(stab->heap_addr) /*out*/) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create heap")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Insert name into the heap */
-    if((size_t)(-1) == (name_offset = H5HL_insert(f, dxpl_id, heap, (size_t)1, "")))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert name into heap")
+    if ((size_t)(-1) == (name_offset = H5HL_insert(f, dxpl_id, heap, (size_t)1, "")))
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert name into heap")
 
     /*
      * B-tree's won't work if the first name isn't at the beginning
@@ -173,13 +163,12 @@ H5G__stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_create_components() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_create
  *
@@ -201,12 +190,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
-    H5O_stab_t *stab)
+H5G__stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo, H5O_stab_t *stab)
 {
-    size_t      heap_hint;              /* Local heap size hint */
-    size_t      size_hint;              /* Local heap size hint */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    size_t heap_hint;           /* Local heap size hint */
+    size_t size_hint;           /* Local heap size hint */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -217,30 +205,32 @@ H5G__stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
     HDassert(stab);
 
     /* Adjust the size hint, if necessary */
-    if(ginfo->lheap_size_hint == 0)
-        heap_hint = 8 +         /* "null" name inserted for B-tree */
-                (ginfo->est_num_entries * H5HL_ALIGN(ginfo->est_name_len + 1)) +    /* estimated size of names for links, aligned for inserting into local heap */
-                H5HL_SIZEOF_FREE(grp_oloc->file);       /* Free list entry in local heap */
+    if (ginfo->lheap_size_hint == 0)
+        heap_hint =
+            8 + /* "null" name inserted for B-tree */
+            (ginfo->est_num_entries *
+             H5HL_ALIGN(ginfo->est_name_len +
+                        1)) + /* estimated size of names for links, aligned for inserting into local heap */
+            H5HL_SIZEOF_FREE(grp_oloc->file); /* Free list entry in local heap */
     else
         heap_hint = ginfo->lheap_size_hint;
     size_hint = MAX(heap_hint, H5HL_SIZEOF_FREE(grp_oloc->file) + 2);
 
     /* Go create the B-tree & local heap */
-    if(H5G__stab_create_components(grp_oloc->file, stab, size_hint, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create symbol table components")
+    if (H5G__stab_create_components(grp_oloc->file, stab, size_hint, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create symbol table components")
 
     /*
      * Insert the symbol table message into the object header and the symbol
      * table entry.
      */
-    if(H5O_msg_create(grp_oloc, H5O_STAB_ID, 0, H5O_UPDATE_TIME, stab, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
+    if (H5O_msg_create(grp_oloc, H5O_STAB_ID, 0, H5O_UPDATE_TIME, stab, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_insert_real
  *
@@ -257,13 +247,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name,
-    H5O_link_t *obj_lnk, H5O_type_t obj_type, const void *crt_info,
-    hid_t dxpl_id)
+H5G__stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name, H5O_link_t *obj_lnk,
+                      H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id)
 {
-    H5HL_t       *heap = NULL;          /* Pointer to local heap */
-    H5G_bt_ins_t udata;		        /* Data to pass through B-tree	*/
-    herr_t       ret_value = SUCCEED;   /* Return value */
+    H5HL_t *     heap = NULL;         /* Pointer to local heap */
+    H5G_bt_ins_t udata;               /* Data to pass through B-tree	*/
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -274,29 +263,28 @@ H5G__stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name,
     HDassert(obj_lnk);
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Initialize data to pass through B-tree */
     udata.common.name = name;
     udata.common.heap = heap;
-    udata.lnk = obj_lnk;
-    udata.obj_type = obj_type;
-    udata.crt_info = crt_info;
+    udata.lnk         = obj_lnk;
+    udata.obj_type    = obj_type;
+    udata.crt_info    = crt_info;
 
     /* Insert into symbol table */
-    if(H5B_insert(f, dxpl_id, H5B_SNODE, stab->btree_addr, &udata) < 0)
+    if (H5B_insert(f, dxpl_id, H5B_SNODE, stab->btree_addr, &udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert entry")
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_insert_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_insert
  *
@@ -313,12 +301,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__stab_insert(const H5O_loc_t *grp_oloc, const char *name,
-    H5O_link_t *obj_lnk, H5O_type_t obj_type, const void *crt_info,
-    hid_t dxpl_id)
+H5G__stab_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk, H5O_type_t obj_type,
+                 const void *crt_info, hid_t dxpl_id)
 {
-    H5O_stab_t		stab;		/* Symbol table message		*/
-    herr_t              ret_value = SUCCEED;       /* Return value */
+    H5O_stab_t stab;                /* Symbol table message		*/
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -328,18 +315,16 @@ H5G__stab_insert(const H5O_loc_t *grp_oloc, const char *name,
     HDassert(obj_lnk);
 
     /* Retrieve symbol table message */
-    if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
+    if (NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "not a symbol table")
 
-    if(H5G__stab_insert_real(grp_oloc->file, &stab, name, obj_lnk, obj_type,
-            crt_info, dxpl_id) < 0)
+    if (H5G__stab_insert_real(grp_oloc->file, &stab, name, obj_lnk, obj_type, crt_info, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5_ITER_ERROR, "unable to insert the name")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_remove
  *
@@ -353,13 +338,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__stab_remove(const H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
-    const char *name)
+H5G__stab_remove(const H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r, const char *name)
 {
-    H5HL_t      *heap = NULL;           /* Pointer to local heap */
-    H5O_stab_t	stab;		        /*symbol table message		*/
-    H5G_bt_rm_t	udata;		        /*data to pass through B-tree	*/
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HL_t *    heap = NULL;         /* Pointer to local heap */
+    H5O_stab_t  stab;                /*symbol table message		*/
+    H5G_bt_rm_t udata;               /*data to pass through B-tree	*/
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -367,31 +351,30 @@ H5G__stab_remove(const H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_
     HDassert(name && *name);
 
     /* Read in symbol table message */
-    if(NULL == H5O_msg_read(loc, H5O_STAB_ID, &stab, dxpl_id))
+    if (NULL == H5O_msg_read(loc, H5O_STAB_ID, &stab, dxpl_id))
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "not a symbol table")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(loc->file, dxpl_id, stab.heap_addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HL_protect(loc->file, dxpl_id, stab.heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Initialize data to pass through B-tree */
-    udata.common.name = name;
-    udata.common.heap = heap;
+    udata.common.name     = name;
+    udata.common.heap     = heap;
     udata.grp_full_path_r = grp_full_path_r;
 
     /* Remove from symbol table */
-    if(H5B_remove(loc->file, dxpl_id, H5B_SNODE, stab.btree_addr, &udata) < 0)
+    if (H5B_remove(loc->file, dxpl_id, H5B_SNODE, stab.btree_addr, &udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to remove entry")
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_remove_by_idx
  *
@@ -406,54 +389,53 @@ done:
  */
 herr_t
 H5G__stab_remove_by_idx(const H5O_loc_t *grp_oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
-    H5_iter_order_t order, hsize_t n)
+                        H5_iter_order_t order, hsize_t n)
 {
-    H5HL_t      *heap = NULL;           /* Pointer to local heap */
-    H5O_stab_t	stab;		        /* Symbol table message		*/
-    H5G_bt_rm_t udata;		        /* Data to pass through B-tree	*/
-    H5O_link_t  obj_lnk;                /* Object's link within group */
-    hbool_t     lnk_copied = FALSE;     /* Whether the link was copied */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HL_t *    heap = NULL;          /* Pointer to local heap */
+    H5O_stab_t  stab;                 /* Symbol table message		*/
+    H5G_bt_rm_t udata;                /* Data to pass through B-tree	*/
+    H5O_link_t  obj_lnk;              /* Object's link within group */
+    hbool_t     lnk_copied = FALSE;   /* Whether the link was copied */
+    herr_t      ret_value  = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     HDassert(grp_oloc && grp_oloc->file);
 
     /* Look up name of link to remove, by index */
-    if(H5G__stab_lookup_by_idx(grp_oloc, order, n, &obj_lnk, dxpl_id) < 0)
+    if (H5G__stab_lookup_by_idx(grp_oloc, order, n, &obj_lnk, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get link information")
     lnk_copied = TRUE;
 
     /* Read in symbol table message */
-    if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
+    if (NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "not a symbol table")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Initialize data to pass through B-tree */
-    udata.common.name = obj_lnk.name;
-    udata.common.heap = heap;
+    udata.common.name     = obj_lnk.name;
+    udata.common.heap     = heap;
     udata.grp_full_path_r = grp_full_path_r;
 
     /* Remove link from symbol table */
-    if(H5B_remove(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, &udata) < 0)
+    if (H5B_remove(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, &udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to remove entry")
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     /* Reset the link information, if we have a copy */
-    if(lnk_copied)
+    if (lnk_copied)
         H5O_msg_reset(H5O_LINK_ID, &obj_lnk);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_remove_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_delete
  *
@@ -471,9 +453,9 @@ done:
 herr_t
 H5G__stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab)
 {
-    H5HL_t *heap = NULL;                /* Pointer to local heap */
-    H5G_bt_rm_t	udata;		        /*data to pass through B-tree	*/
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_t *    heap = NULL;         /* Pointer to local heap */
+    H5G_bt_rm_t udata;               /*data to pass through B-tree	*/
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -483,7 +465,7 @@ H5G__stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab)
     HDassert(H5F_addr_defined(stab->heap_addr));
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Set up user data for B-tree deletion */
@@ -491,27 +473,26 @@ H5G__stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab)
     udata.common.heap = heap;
 
     /* Delete entire B-tree */
-    if(H5B_delete(f, dxpl_id, H5B_SNODE, stab->btree_addr, &udata) < 0)
+    if (H5B_delete(f, dxpl_id, H5B_SNODE, stab->btree_addr, &udata) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete symbol table B-tree")
 
     /* Release resources */
-    if(H5HL_unprotect(heap) < 0)
+    if (H5HL_unprotect(heap) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
     heap = NULL;
 
     /* Delete local heap for names */
-    if(H5HL_delete(f, dxpl_id, stab->heap_addr) < 0)
+    if (H5HL_delete(f, dxpl_id, stab->heap_addr) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete symbol table heap")
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_iterate
  *
@@ -525,13 +506,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
-    hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data)
+H5G__stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order, hsize_t skip,
+                  hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data)
 {
-    H5HL_t *heap = NULL;                        /* Local heap for group */
-    H5O_stab_t stab;		                /* Info about symbol table */
-    H5G_link_table_t ltable = {0, NULL};        /* Link table */
-    herr_t ret_value;                           /* Return value */
+    H5HL_t *         heap = NULL;        /* Local heap for group */
+    H5O_stab_t       stab;               /* Info about symbol table */
+    H5G_link_table_t ltable = {0, NULL}; /* Link table */
+    herr_t           ret_value;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -540,70 +521,70 @@ H5G__stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
     HDassert(op);
 
     /* Get the B-tree info */
-    if(NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
+    if (NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
+    if (NULL == (heap = H5HL_protect(oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Check on iteration order */
     /* ("native" iteration order is increasing for this link storage mechanism) */
-    if(order != H5_ITER_DEC) {
-        H5G_bt_it_it_t	udata;                  /* User data to pass to B-tree callback */
+    if (order != H5_ITER_DEC) {
+        H5G_bt_it_it_t udata; /* User data to pass to B-tree callback */
 
         /* Build udata to pass through H5B_iterate() to H5G__node_iterate() */
-        udata.heap = heap;
-        udata.skip = skip;
+        udata.heap      = heap;
+        udata.skip      = skip;
         udata.final_ent = last_lnk;
-        udata.op = op;
-        udata.op_data = op_data;
+        udata.op        = op;
+        udata.op_data   = op_data;
 
         /* Iterate over the group members */
-        if((ret_value = H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_iterate, &udata)) < 0)
+        if ((ret_value =
+                 H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_iterate, &udata)) < 0)
             HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
 
         /* Check for too high of a starting index (ex post facto :-) */
         /* (Skipping exactly as many entries as are in the group is currently an error) */
-        if(skip > 0 && skip >= *last_lnk)
+        if (skip > 0 && skip >= *last_lnk)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
     } /* end if */
     else {
-        H5G_bt_it_bt_t udata;                   /* User data to pass to B-tree callback */
+        H5G_bt_it_bt_t udata; /* User data to pass to B-tree callback */
 
         /* Build udata to pass through H5B_iterate() to H5G__node_build_table() */
         udata.alloc_nlinks = 0;
-        udata.heap = heap;
-        udata.ltable = &ltable;
+        udata.heap         = heap;
+        udata.ltable       = &ltable;
 
         /* Iterate over the group members */
-        if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_build_table, &udata) < 0)
+        if (H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_build_table, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to build link table")
 
         /* Check for skipping out of bounds */
-        if(skip > 0 && (size_t)skip >= ltable.nlinks)
+        if (skip > 0 && (size_t)skip >= ltable.nlinks)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
 
         /* Sort link table in correct iteration order */
-        if(H5G__link_sort_table(&ltable, H5_INDEX_NAME, order) < 0)
+        if (H5G__link_sort_table(&ltable, H5_INDEX_NAME, order) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTSORT, FAIL, "error sorting link messages")
 
         /* Iterate over links in table */
-        if((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
+        if ((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
             HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
     } /* end else */
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
-    if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
+    if (ltable.lnks && H5G__link_release_table(&ltable) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_count
  *
@@ -619,8 +600,8 @@ done:
 herr_t
 H5G__stab_count(H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id)
 {
-    H5O_stab_t		stab;		        /* Info about symbol table */
-    herr_t		ret_value = SUCCEED;
+    H5O_stab_t stab; /* Info about symbol table */
+    herr_t     ret_value = SUCCEED;
 
     FUNC_ENTER_PACKAGE
 
@@ -632,18 +613,17 @@ H5G__stab_count(H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id)
     *num_objs = 0;
 
     /* Get the B-tree info */
-    if(NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
+    if (NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
 
     /* Iterate over the group members */
-    if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, num_objs) < 0)
+    if (H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, num_objs) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "iteration operator failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_count() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_bh_size
  *
@@ -657,12 +637,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
-    H5_ih_info_t *bh_info)
+H5G__stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab, H5_ih_info_t *bh_info)
 {
-    hsize_t     snode_size;             /* Symbol table node size */
-    H5B_info_t  bt_info;                /* B-tree node info */
-    herr_t      ret_value = SUCCEED;
+    hsize_t    snode_size; /* Symbol table node size */
+    H5B_info_t bt_info;    /* B-tree node info */
+    herr_t     ret_value = SUCCEED;
 
     FUNC_ENTER_PACKAGE
 
@@ -675,21 +654,21 @@ H5G__stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
     snode_size = 0;
 
     /* Get the B-tree & symbol table node size info */
-    if(H5B_get_info(f, dxpl_id, H5B_SNODE, stab->btree_addr, &bt_info, H5G__node_iterate_size, &snode_size) < 0)
+    if (H5B_get_info(f, dxpl_id, H5B_SNODE, stab->btree_addr, &bt_info, H5G__node_iterate_size, &snode_size) <
+        0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "iteration operator failed")
 
     /* Add symbol table & B-tree node sizes to index info */
     bh_info->index_size += snode_size + bt_info.size;
 
     /* Get the size of the local heap for the group */
-    if(H5HL_heapsize(f, dxpl_id, stab->heap_addr, &(bh_info->heap_size)) < 0)
+    if (H5HL_heapsize(f, dxpl_id, stab->heap_addr, &(bh_info->heap_size)) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "iteration operator failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_bh_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_get_name_by_idx_cb
  *
@@ -707,10 +686,10 @@ done:
 static herr_t
 H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
 {
-    H5G_bt_it_gnbi_t    *udata = (H5G_bt_it_gnbi_t *)_udata;
-    size_t name_off;                    /* Offset of name in heap */
-    const char *name;                   /* Pointer to name string in heap */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_bt_it_gnbi_t *udata = (H5G_bt_it_gnbi_t *)_udata;
+    size_t            name_off;            /* Offset of name in heap */
+    const char *      name;                /* Pointer to name string in heap */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -721,17 +700,16 @@ H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
     /* Get name offset in heap */
     name_off = ent->name_off;
 
-    if((name = (const char *)H5HL_offset_into(udata->heap, name_off)) == NULL)
+    if ((name = (const char *)H5HL_offset_into(udata->heap, name_off)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get symbol table link name")
 
-    if((udata->name = H5MM_strdup(name)) == NULL)
+    if ((udata->name = H5MM_strdup(name)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to duplicate symbol table link name")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_stab_get_name_by_idx_cb */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_get_name_by_idx
  *
@@ -746,14 +724,14 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
-    char* name, size_t size, hid_t dxpl_id)
+H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n, char *name, size_t size,
+                          hid_t dxpl_id)
 {
-    H5HL_t *heap = NULL;        /* Pointer to local heap */
-    H5O_stab_t	stab;	        /* Info about local heap & B-tree */
-    H5G_bt_it_gnbi_t udata;     /* Iteration information */
-    hbool_t udata_valid = FALSE;        /* Whether iteration information is valid */
-    ssize_t ret_value;          /* Return value */
+    H5HL_t *         heap = NULL;         /* Pointer to local heap */
+    H5O_stab_t       stab;                /* Info about local heap & B-tree */
+    H5G_bt_it_gnbi_t udata;               /* Iteration information */
+    hbool_t          udata_valid = FALSE; /* Whether iteration information is valid */
+    ssize_t          ret_value;           /* Return value */
 
     /* Portably clear udata struct (before FUNC_ENTER) */
     HDmemset(&udata, 0, sizeof(udata));
@@ -764,19 +742,19 @@ H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t
     HDassert(oloc);
 
     /* Get the B-tree & local heap info */
-    if(NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
+    if (NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
+    if (NULL == (heap = H5HL_protect(oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Remap index for decreasing iteration order */
-    if(order == H5_ITER_DEC) {
-        hsize_t nlinks = 0;           /* Number of links in group */
+    if (order == H5_ITER_DEC) {
+        hsize_t nlinks = 0; /* Number of links in group */
 
         /* Iterate over the symbol table nodes, to count the links */
-        if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, &nlinks) < 0)
+        if (H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, &nlinks) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "iteration operator failed")
 
         /* Map decreasing iteration order index to increasing iteration order index */
@@ -784,44 +762,43 @@ H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t
     } /* end if */
 
     /* Set iteration information */
-    udata.common.idx = n;
+    udata.common.idx      = n;
     udata.common.num_objs = 0;
-    udata.common.op = H5G_stab_get_name_by_idx_cb;
-    udata.heap = heap;
-    udata.name = NULL;
-    udata_valid = TRUE;
+    udata.common.op       = H5G_stab_get_name_by_idx_cb;
+    udata.heap            = heap;
+    udata.name            = NULL;
+    udata_valid           = TRUE;
 
     /* Iterate over the group members */
-    if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed")
+    if (H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed")
 
     /* If we don't know the name now, we almost certainly went out of bounds */
-    if(udata.name == NULL)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound")
+    if (udata.name == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound")
 
     /* Get the length of the name */
     ret_value = (ssize_t)HDstrlen(udata.name);
 
     /* Copy the name into the user's buffer, if given */
-    if(name) {
+    if (name) {
         HDstrncpy(name, udata.name, MIN((size_t)(ret_value + 1), size));
-        if((size_t)ret_value >= size)
-            name[size - 1]='\0';
+        if ((size_t)ret_value >= size)
+            name[size - 1] = '\0';
     } /* end if */
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     /* Free the duplicated name */
-    if(udata_valid && udata.name != NULL)
+    if (udata_valid && udata.name != NULL)
         H5MM_xfree(udata.name);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_get_name_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_lookup_cb
  *
@@ -839,22 +816,21 @@ done:
 static herr_t
 H5G_stab_lookup_cb(const H5G_entry_t *ent, void *_udata)
 {
-    H5G_stab_fnd_ud_t *udata = (H5G_stab_fnd_ud_t *)_udata;   /* 'User data' passed in */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5G_stab_fnd_ud_t *udata     = (H5G_stab_fnd_ud_t *)_udata; /* 'User data' passed in */
+    herr_t             ret_value = SUCCEED;                     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check for setting link info */
-    if(udata->lnk)
+    if (udata->lnk)
         /* Convert the entry to a link */
-        if(H5G__ent_to_link(udata->lnk, udata->heap, ent, udata->name) < 0)
+        if (H5G__ent_to_link(udata->lnk, udata->heap, ent, udata->name) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, FAIL, "unable to convert symbol table entry to link")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_stab_lookup_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_lookup
  *
@@ -869,14 +845,13 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
-    hid_t dxpl_id)
+H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk, hid_t dxpl_id)
 {
-    H5HL_t *heap = NULL;                /* Pointer to local heap */
-    H5G_bt_lkp_t bt_udata;              /* Data to pass through B-tree	*/
-    H5G_stab_fnd_ud_t udata;            /* 'User data' to give to callback */
-    H5O_stab_t stab;		        /* Symbol table message		*/
-    htri_t     ret_value;       /* Return value */
+    H5HL_t *          heap = NULL; /* Pointer to local heap */
+    H5G_bt_lkp_t      bt_udata;    /* Data to pass through B-tree	*/
+    H5G_stab_fnd_ud_t udata;       /* 'User data' to give to callback */
+    H5O_stab_t        stab;        /* Symbol table message		*/
+    htri_t            ret_value;   /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -886,37 +861,36 @@ H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
     HDassert(lnk);
 
     /* Retrieve the symbol table message for the group */
-    if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
+    if (NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't read message")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
+    if (NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Set up user data to pass to 'find' operation callback */
     udata.name = name;
-    udata.lnk = lnk;
+    udata.lnk  = lnk;
     udata.heap = heap;
 
     /* Set up the user data for actual B-tree find operation */
     bt_udata.common.name = name;
     bt_udata.common.heap = heap;
-    bt_udata.op = H5G_stab_lookup_cb;
-    bt_udata.op_data = &udata;
+    bt_udata.op          = H5G_stab_lookup_cb;
+    bt_udata.op_data     = &udata;
 
     /* Search the B-tree */
-    if((ret_value = H5B_find(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, &bt_udata)) < 0)
+    if ((ret_value = H5B_find(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, &bt_udata)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "not found")
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_lookup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_lookup_by_idx_cb
  *
@@ -935,8 +909,8 @@ static herr_t
 H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata)
 {
     H5G_bt_it_lbi_t *udata = (H5G_bt_it_lbi_t *)_udata;
-    const char *name;                   /* Pointer to name string in heap */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const char *     name;                /* Pointer to name string in heap */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -945,11 +919,11 @@ H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata)
     HDassert(udata && udata->heap);
 
     /* Get a pointer to the link name */
-    if((name = (const char *)H5HL_offset_into(udata->heap, ent->name_off)) == NULL)
+    if ((name = (const char *)H5HL_offset_into(udata->heap, ent->name_off)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get symbol table link name")
 
     /* Convert the entry to a link */
-    if(H5G__ent_to_link(udata->lnk, udata->heap, ent, name) < 0)
+    if (H5G__ent_to_link(udata->lnk, udata->heap, ent, name) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, FAIL, "unable to convert symbol table entry to link")
     udata->found = TRUE;
 
@@ -957,7 +931,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_stab_lookup_by_idx_cb */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_lookup_by_idx
  *
@@ -972,13 +945,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
-    H5O_link_t *lnk, hid_t dxpl_id)
+H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n, H5O_link_t *lnk,
+                        hid_t dxpl_id)
 {
-    H5HL_t *heap = NULL;                /* Pointer to local heap */
-    H5G_bt_it_lbi_t udata;              /* Iteration information */
-    H5O_stab_t stab;		        /* Symbol table message */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_t *        heap = NULL;         /* Pointer to local heap */
+    H5G_bt_it_lbi_t udata;               /* Iteration information */
+    H5O_stab_t      stab;                /* Symbol table message */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -987,19 +960,19 @@ H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_
     HDassert(lnk);
 
     /* Get the B-tree & local heap info */
-    if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
+    if (NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
+    if (NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Remap index for decreasing iteration order */
-    if(order == H5_ITER_DEC) {
-        hsize_t nlinks = 0;           /* Number of links in group */
+    if (order == H5_ITER_DEC) {
+        hsize_t nlinks = 0; /* Number of links in group */
 
         /* Iterate over the symbol table nodes, to count the links */
-        if(H5B_iterate(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, &nlinks) < 0)
+        if (H5B_iterate(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, &nlinks) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "iteration operator failed")
 
         /* Map decreasing iteration order index to increasing iteration order index */
@@ -1007,31 +980,31 @@ H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_
     } /* end if */
 
     /* Set iteration information */
-    udata.common.idx = n;
+    udata.common.idx      = n;
     udata.common.num_objs = 0;
-    udata.common.op = H5G_stab_lookup_by_idx_cb;
-    udata.heap = heap;
-    udata.lnk = lnk;
-    udata.found = FALSE;
+    udata.common.op       = H5G_stab_lookup_by_idx_cb;
+    udata.heap            = heap;
+    udata.lnk             = lnk;
+    udata.found           = FALSE;
 
     /* Iterate over the group members */
-    if(H5B_iterate(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed")
+    if (H5B_iterate(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed")
 
     /* If we didn't find the link, we almost certainly went out of bounds */
-    if(!udata.found)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound")
+    if (!udata.found)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound")
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_lookup_by_idx() */
 
 #ifndef H5_STRICT_FORMAT_CHECKS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_valid
  *
@@ -1057,55 +1030,56 @@ done:
 herr_t
 H5G__stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5O_stab_t *alt_stab)
 {
-    H5O_stab_t  stab;                   /* Current symbol table */
-    H5HL_t      *heap = NULL;           /* Pointer to local heap */
-    hbool_t     changed = FALSE;        /* Whether stab has been modified */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_stab_t stab;                /* Current symbol table */
+    H5HL_t *   heap      = NULL;    /* Pointer to local heap */
+    hbool_t    changed   = FALSE;   /* Whether stab has been modified */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Read the symbol table message */
-    if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
+    if (NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "unable to read symbol table message");
 
     /* Check if the symbol table message's b-tree address is valid */
-    if(H5B_valid(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr) < 0) {
+    if (H5B_valid(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr) < 0) {
         /* Address is invalid, try the b-tree address in the alternate symbol
          * table message */
-        if(!alt_stab || H5B_valid(grp_oloc->file, dxpl_id, H5B_SNODE, alt_stab->btree_addr) < 0)
+        if (!alt_stab || H5B_valid(grp_oloc->file, dxpl_id, H5B_SNODE, alt_stab->btree_addr) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "unable to locate b-tree")
         else {
             /* The alternate symbol table's b-tree address is valid.  Adjust the
              * symbol table message in the group. */
             stab.btree_addr = alt_stab->btree_addr;
-            changed = TRUE;
+            changed         = TRUE;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Check if the symbol table message's heap address is valid */
-    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ))) {
+    if (NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ))) {
         /* Address is invalid, try the heap address in the alternate symbol
          * table message */
-        if(!alt_stab || NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, alt_stab->heap_addr, H5AC_READ)))
+        if (!alt_stab ||
+            NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, alt_stab->heap_addr, H5AC_READ)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "unable to locate heap")
         else {
             /* The alternate symbol table's heap address is valid.  Adjust the
              * symbol table message in the group. */
             stab.heap_addr = alt_stab->heap_addr;
-            changed = TRUE;
+            changed        = TRUE;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Update the symbol table message and clear errors if necessary */
-    if(changed) {
+    if (changed) {
         H5E_clear_stack(NULL);
-        if(H5O_msg_write(grp_oloc, H5O_STAB_ID, 0, H5O_UPDATE_TIME | H5O_UPDATE_FORCE, &stab, dxpl_id) < 0)
+        if (H5O_msg_write(grp_oloc, H5O_STAB_ID, 0, H5O_UPDATE_TIME | H5O_UPDATE_FORCE, &stab, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to correct symbol table message")
     } /* end if */
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1113,7 +1087,7 @@ done:
 #endif /* H5_STRICT_FORMAT_CHECKS */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_get_type_by_idx_cb
  *
@@ -1131,8 +1105,8 @@ done:
 static herr_t
 H5G_stab_get_type_by_idx_cb(const H5G_entry_t *ent, void *_udata)
 {
-    H5G_bt_it_gtbi_t	*udata = (H5G_bt_it_gtbi_t *)_udata;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_bt_it_gtbi_t *udata     = (H5G_bt_it_gtbi_t *)_udata;
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1141,7 +1115,7 @@ H5G_stab_get_type_by_idx_cb(const H5G_entry_t *ent, void *_udata)
     HDassert(udata);
 
     /* Check for a soft link */
-    switch(ent->type) {
+    switch (ent->type) {
         case H5G_CACHED_SLINK:
             udata->type = H5G_LINK;
             break;
@@ -1150,29 +1124,26 @@ H5G_stab_get_type_by_idx_cb(const H5G_entry_t *ent, void *_udata)
         case H5G_NOTHING_CACHED:
         case H5G_CACHED_STAB:
         case H5G_NCACHED:
-        default:
-            {
-                H5O_loc_t tmp_oloc;             /* Temporary object location */
-                H5O_type_t obj_type;            /* Type of object at location */
-
-                /* Build temporary object location */
-                tmp_oloc.file = udata->f;
-                HDassert(H5F_addr_defined(ent->header));
-                tmp_oloc.addr = ent->header;
-
-                /* Get the type of the object */
-                if(H5O_obj_type(&tmp_oloc, &obj_type, udata->dxpl_id) < 0)
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object type")
-                udata->type = H5G_map_obj_type(obj_type);
-            }
-            break;
+        default: {
+            H5O_loc_t  tmp_oloc; /* Temporary object location */
+            H5O_type_t obj_type; /* Type of object at location */
+
+            /* Build temporary object location */
+            tmp_oloc.file = udata->f;
+            HDassert(H5F_addr_defined(ent->header));
+            tmp_oloc.addr = ent->header;
+
+            /* Get the type of the object */
+            if (H5O_obj_type(&tmp_oloc, &obj_type, udata->dxpl_id) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object type")
+            udata->type = H5G_map_obj_type(obj_type);
+        } break;
     } /* end switch */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_stab_get_type_by_idx_cb */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_get_type_by_idx
  *
@@ -1191,9 +1162,9 @@ done:
 H5G_obj_t
 H5G__stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
 {
-    H5O_stab_t		stab;	        /* Info about local heap & B-tree */
-    H5G_bt_it_gtbi_t	udata;          /* User data for B-tree callback */
-    H5G_obj_t		ret_value;      /* Return value */
+    H5O_stab_t       stab;      /* Info about local heap & B-tree */
+    H5G_bt_it_gtbi_t udata;     /* User data for B-tree callback */
+    H5G_obj_t        ret_value; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1201,24 +1172,24 @@ H5G__stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
     HDassert(oloc);
 
     /* Get the B-tree & local heap info */
-    if(NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "unable to determine local heap address")
+    if (NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "unable to determine local heap address")
 
     /* Set iteration information */
-    udata.common.idx = idx;
+    udata.common.idx      = idx;
     udata.common.num_objs = 0;
-    udata.common.op = H5G_stab_get_type_by_idx_cb;
-    udata.f = oloc->file;
-    udata.dxpl_id = dxpl_id;
-    udata.type = H5G_UNKNOWN;
+    udata.common.op       = H5G_stab_get_type_by_idx_cb;
+    udata.f               = oloc->file;
+    udata.dxpl_id         = dxpl_id;
+    udata.type            = H5G_UNKNOWN;
 
     /* Iterate over the group members */
-    if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "iteration operator failed")
+    if (H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "iteration operator failed")
 
     /* If we don't know the type now, we almost certainly went out of bounds */
-    if(udata.type == H5G_UNKNOWN)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "index out of bound")
+    if (udata.type == H5G_UNKNOWN)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "index out of bound")
 
     /* Set the return value */
     ret_value = udata.type;
@@ -1227,4 +1198,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__stab_get_type_by_idx() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Gtest.c b/src/H5Gtest.c
index 6c477e2..9422f26 100644
--- a/src/H5Gtest.c
+++ b/src/H5Gtest.c
@@ -21,55 +21,47 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-#define H5G_TESTING		/*suppress warning about H5G testing funcs*/
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
+#define H5G_TESTING /*suppress warning about H5G testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5HLprivate.h" /* Local Heaps				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5G__is_empty_test
@@ -92,97 +84,96 @@
 htri_t
 H5G__is_empty_test(hid_t gid)
 {
-    H5G_t *grp = NULL;          /* Pointer to group */
-    htri_t msg_exists = FALSE;  /* Indicate that a header message is present */
-    htri_t linfo_exists = FALSE;/* Indicate that the 'link info' message is present */
-    hid_t dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    htri_t ret_value = TRUE;    /* Return value */
+    H5G_t *grp          = NULL;             /* Pointer to group */
+    htri_t msg_exists   = FALSE;            /* Indicate that a header message is present */
+    htri_t linfo_exists = FALSE;            /* Indicate that the 'link info' message is present */
+    hid_t  dxpl_id      = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    htri_t ret_value    = TRUE;             /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get group structure */
-    if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
+    if (NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* "New format" checks */
 
     /* Check if the group has any link messages */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists > 0) {
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists > 0) {
         /* Sanity check that new group format shouldn't have old messages */
-        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
+        if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-        if(msg_exists > 0)
+        if (msg_exists > 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link messages found")
 
         HGOTO_DONE(FALSE)
     } /* end if */
 
     /* Check for a link info message */
-    if((linfo_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(linfo_exists > 0) {
-        H5O_linfo_t linfo;		/* Link info message */
+    if ((linfo_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (linfo_exists > 0) {
+        H5O_linfo_t linfo; /* Link info message */
 
         /* Sanity check that new group format shouldn't have old messages */
-        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
+        if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-        if(msg_exists > 0)
+        if (msg_exists > 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link info messages found")
 
         /* Get the link info */
-        if(H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id) < 0)
+        if (H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
 
         /* Check for 'dense' link storage file addresses being defined */
-        if(H5F_addr_defined(linfo.fheap_addr))
+        if (H5F_addr_defined(linfo.fheap_addr))
             HGOTO_DONE(FALSE)
-        if(H5F_addr_defined(linfo.name_bt2_addr))
+        if (H5F_addr_defined(linfo.name_bt2_addr))
             HGOTO_DONE(FALSE)
-        if(H5F_addr_defined(linfo.corder_bt2_addr))
+        if (H5F_addr_defined(linfo.corder_bt2_addr))
             HGOTO_DONE(FALSE)
 
         /* Check for link count */
-        if(linfo.nlinks > 0)
+        if (linfo.nlinks > 0)
             HGOTO_DONE(FALSE)
     } /* end if */
 
     /* "Old format" checks */
 
     /* Check if the group has a symbol table message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists > 0) {
-        H5O_stab_t stab;        /* Info about local heap & B-tree */
-        hsize_t nlinks;         /* Number of links in the group */
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists > 0) {
+        H5O_stab_t stab;   /* Info about local heap & B-tree */
+        hsize_t    nlinks; /* Number of links in the group */
 
         /* Sanity check that old group format shouldn't have new messages */
-        if(linfo_exists > 0)
+        if (linfo_exists > 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link info messages found")
-        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_GINFO_ID, dxpl_id)) < 0)
+        if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_GINFO_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-        if(msg_exists > 0)
+        if (msg_exists > 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and group info messages found")
 
         /* Get the B-tree & local heap info */
-        if(NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, dxpl_id))
+        if (NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read symbol table message")
 
         /* Get the count of links in the group */
-        if(H5G__stab_count(&(grp->oloc), &nlinks, dxpl_id) < 0)
+        if (H5G__stab_count(&(grp->oloc), &nlinks, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to count links")
 
         /* Check for link count */
-        if(nlinks > 0)
+        if (nlinks > 0)
             HGOTO_DONE(FALSE)
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5G__is_empty_test() */
+} /* H5G__is_empty_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5G__has_links_test
@@ -205,44 +196,43 @@ done:
 htri_t
 H5G__has_links_test(hid_t gid, unsigned *nmsgs)
 {
-    H5G_t *grp = NULL;          /* Pointer to group */
-    htri_t msg_exists = 0;      /* Indicate that a header message is present */
-    hid_t dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    htri_t ret_value = TRUE;    /* Return value */
+    H5G_t *grp        = NULL;             /* Pointer to group */
+    htri_t msg_exists = 0;                /* Indicate that a header message is present */
+    hid_t  dxpl_id    = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    htri_t ret_value  = TRUE;             /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get group structure */
-    if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
+    if (NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Check if the group has any link messages */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists == 0)
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists == 0)
         HGOTO_DONE(FALSE)
 
     /* Check if the group has a symbol table message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists > 0)
-	HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link messages found")
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists > 0)
+        HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link messages found")
 
     /* Check if we should retrieve the number of link messages */
-    if(nmsgs) {
-        int msg_count;     /* Number of messages of a type */
+    if (nmsgs) {
+        int msg_count; /* Number of messages of a type */
 
         /* Check how many link messages there are */
-        if((msg_count = H5O_msg_count(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
+        if ((msg_count = H5O_msg_count(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to count link messages")
         *nmsgs = (unsigned)msg_count;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5G__has_links_test() */
+} /* H5G__has_links_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5G__has_stab_test
@@ -264,34 +254,33 @@ done:
 htri_t
 H5G__has_stab_test(hid_t gid)
 {
-    H5G_t *grp = NULL;          /* Pointer to group */
-    htri_t msg_exists = 0;      /* Indicate that a header message is present */
-    hid_t dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    htri_t ret_value = TRUE;    /* Return value */
+    H5G_t *grp        = NULL;             /* Pointer to group */
+    htri_t msg_exists = 0;                /* Indicate that a header message is present */
+    hid_t  dxpl_id    = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    htri_t ret_value  = TRUE;             /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get group structure */
-    if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
+    if (NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Check if the group has a symbol table message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists == 0)
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists == 0)
         HGOTO_DONE(FALSE)
 
     /* Check if the group has any link messages */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists > 0)
-	HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link messages found")
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists > 0)
+        HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link messages found")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5G__has_stab_test() */
+} /* H5G__has_stab_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5G__is_new_dense_test
@@ -315,51 +304,50 @@ done:
 htri_t
 H5G__is_new_dense_test(hid_t gid)
 {
-    H5G_t *grp = NULL;          /* Pointer to group */
-    htri_t msg_exists = 0;      /* Indicate that a header message is present */
-    hid_t dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    htri_t ret_value = TRUE;    /* Return value */
+    H5G_t *grp        = NULL;             /* Pointer to group */
+    htri_t msg_exists = 0;                /* Indicate that a header message is present */
+    hid_t  dxpl_id    = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    htri_t ret_value  = TRUE;             /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get group structure */
-    if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
+    if (NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Check if the group has a symbol table message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists > 0)
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists > 0)
         HGOTO_DONE(FALSE)
 
     /* Check if the group has any link messages */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists > 0)
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists > 0)
         HGOTO_DONE(FALSE)
 
     /* Check if the group has link info message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
-    if(msg_exists > 0) {
-        H5O_linfo_t linfo;		/* Link info message */
+    if ((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
+    if (msg_exists > 0) {
+        H5O_linfo_t linfo; /* Link info message */
 
         /* Get the link info */
-        if(H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id) < 0)
+        if (H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
 
         /* Check for 'dense' link storage file addresses being defined */
-        if(!H5F_addr_defined(linfo.fheap_addr))
+        if (!H5F_addr_defined(linfo.fheap_addr))
             HGOTO_DONE(FALSE)
-        if(!H5F_addr_defined(linfo.name_bt2_addr))
+        if (!H5F_addr_defined(linfo.name_bt2_addr))
             HGOTO_DONE(FALSE)
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5G__is_new_dense_test() */
+} /* H5G__is_new_dense_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5G__new_dense_info_test
@@ -384,61 +372,61 @@ done:
 herr_t
 H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count)
 {
-    H5B2_t *bt2_name = NULL;    /* v2 B-tree handle for name index */
-    H5B2_t *bt2_corder = NULL;  /* v2 B-tree handle for creation order index */
-    H5O_linfo_t linfo;		/* Link info message */
-    H5G_t *grp = NULL;          /* Pointer to group */
-    hid_t dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5B2_t *    bt2_name   = NULL;            /* v2 B-tree handle for name index */
+    H5B2_t *    bt2_corder = NULL;            /* v2 B-tree handle for creation order index */
+    H5O_linfo_t linfo;                        /* Link info message */
+    H5G_t *     grp       = NULL;             /* Pointer to group */
+    hid_t       dxpl_id   = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    herr_t      ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get group structure */
-    if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
+    if (NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Get the link info */
-    if(H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id) < 0)
+    if (H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
 
     /* Check for 'dense' link storage file addresses being defined */
-    if(!H5F_addr_defined(linfo.fheap_addr))
+    if (!H5F_addr_defined(linfo.fheap_addr))
         HGOTO_DONE(FAIL)
-    if(!H5F_addr_defined(linfo.name_bt2_addr))
+    if (!H5F_addr_defined(linfo.name_bt2_addr))
         HGOTO_DONE(FAIL)
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(grp->oloc.file, dxpl_id, linfo.name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(grp->oloc.file, dxpl_id, linfo.name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Retrieve # of records in name index */
-    if(H5B2_get_nrec(bt2_name, name_count) < 0)
+    if (H5B2_get_nrec(bt2_name, name_count) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
 
     /* Check if there is a creation order index */
-    if(H5F_addr_defined(linfo.corder_bt2_addr)) {
+    if (H5F_addr_defined(linfo.corder_bt2_addr)) {
         /* Open the creation order index v2 B-tree */
-        if(NULL == (bt2_corder = H5B2_open(grp->oloc.file, dxpl_id, linfo.corder_bt2_addr, NULL)))
+        if (NULL == (bt2_corder = H5B2_open(grp->oloc.file, dxpl_id, linfo.corder_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
 
         /* Retrieve # of records in creation order index */
-        if(H5B2_get_nrec(bt2_corder, corder_count) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from creation order index")
+        if (H5B2_get_nrec(bt2_corder, corder_count) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL,
+                        "unable to retrieve # of records from creation order index")
     } /* end if */
     else
         *corder_count = 0;
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for creation order index")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5G__new_dense_info_test() */
+} /* H5G__new_dense_info_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5G__lheap_size_test
@@ -461,30 +449,29 @@ done:
 herr_t
 H5G__lheap_size_test(hid_t gid, size_t *lheap_size)
 {
-    H5G_t *grp = NULL;          /* Pointer to group */
-    H5O_stab_t stab;		/* Symbol table message	*/
-    hid_t dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5G_t *    grp = NULL;                   /* Pointer to group */
+    H5O_stab_t stab;                         /* Symbol table message	*/
+    hid_t      dxpl_id   = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    herr_t     ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get group structure */
-    if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
+    if (NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Make certain the group has a symbol table message */
-    if(NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, dxpl_id))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read symbol table message")
+    if (NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, dxpl_id))
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read symbol table message")
 
     /* Check the size of the local heap for the group */
-    if(H5HL_get_size(grp->oloc.file, dxpl_id, stab.heap_addr, lheap_size) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, FAIL, "can't query local heap size")
+    if (H5HL_get_size(grp->oloc.file, dxpl_id, stab.heap_addr, lheap_size) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, FAIL, "can't query local heap size")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5G__lheap_size_test() */
+} /* H5G__lheap_size_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5G__user_path_test
@@ -510,9 +497,9 @@ done:
 herr_t
 H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigned *obj_hidden)
 {
-    void *obj_ptr;              /* Pointer to object for ID */
-    H5G_name_t *obj_path;       /* Pointer to group hier. path for obj */
-    herr_t ret_value = SUCCEED; /* Return value */
+    void *      obj_ptr;             /* Pointer to object for ID */
+    H5G_name_t *obj_path;            /* Pointer to group hier. path for obj */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -521,11 +508,11 @@ H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsign
     HDassert(obj_hidden);
 
     /* Get pointer to object for ID */
-    if(NULL == (obj_ptr = H5I_object(obj_id)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get object for ID")
+    if (NULL == (obj_ptr = H5I_object(obj_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get object for ID")
 
     /* Get the symbol table entry */
-    switch(H5I_get_type(obj_id)) {
+    switch (H5I_get_type(obj_id)) {
         case H5I_GROUP:
             obj_path = H5G_nameof((H5G_t *)obj_ptr);
             break;
@@ -536,7 +523,7 @@ H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsign
 
         case H5I_DATATYPE:
             /* Avoid non-named datatypes */
-            if(!H5T_is_named((H5T_t *)obj_ptr))
+            if (!H5T_is_named((H5T_t *)obj_ptr))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a named datatype")
 
             obj_path = H5T_nameof((H5T_t *)obj_ptr);
@@ -561,11 +548,11 @@ H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsign
     HDassert(obj_path);
 
     /* Retrieve a copy of the user path and put it into the buffer */
-    if(obj_path->user_path_r) {
+    if (obj_path->user_path_r) {
         ssize_t len = H5RS_len(obj_path->user_path_r);
 
         /* Set the user path, if given */
-        if(user_path)
+        if (user_path)
             HDstrncpy(user_path, H5RS_get_str(obj_path->user_path_r), (size_t)(len + 1));
 
         /* Set the length of the path */
@@ -576,14 +563,13 @@ H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsign
     } /* end if */
     else {
         *user_path_len = 0;
-        *obj_hidden = 0;
+        *obj_hidden    = 0;
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5G__user_path_test() */
+} /* H5G__user_path_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__verify_cached_stab_test
  *
@@ -603,44 +589,42 @@ done:
 herr_t
 H5G__verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent)
 {
-    H5O_stab_t  stab;                   /* Symbol table */
-    H5HL_t      *heap = NULL;           /* Pointer to local heap */
-    hid_t dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5O_stab_t stab;                         /* Symbol table */
+    H5HL_t *   heap      = NULL;             /* Pointer to local heap */
+    hid_t      dxpl_id   = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    herr_t     ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Verify that stab info is cached in ent */
-    if(ent->type != H5G_CACHED_STAB)
+    if (ent->type != H5G_CACHED_STAB)
         HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "symbol table information is not cached")
 
     /* Read the symbol table message from the group */
-    if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
+    if (NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "unable to read symbol table message")
 
     /* Verify that the cached symbol table info matches the symbol table message
      * in the object header */
-    if((ent->cache.stab.btree_addr != stab.btree_addr)
-            || (ent->cache.stab.heap_addr != stab.heap_addr))
+    if ((ent->cache.stab.btree_addr != stab.btree_addr) || (ent->cache.stab.heap_addr != stab.heap_addr))
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "cached stab info does not match object header")
 
     /* Verify that the btree address is valid */
-    if(H5B_valid(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr) < 0)
+    if (H5B_valid(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "b-tree address is invalid")
 
     /* Verify that the heap address is valid */
-    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
+    if (NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "heap address is invalid")
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__verify_cached_stab_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_verify_cached_stabs_test_cb
  *
@@ -657,17 +641,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5G_verify_cached_stabs_test_cb(H5F_t *f, hid_t dxpl_id,
-    const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, const void H5_ATTR_UNUSED *_rt_key,
-    void H5_ATTR_UNUSED *udata)
+H5G_verify_cached_stabs_test_cb(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr,
+                                const void H5_ATTR_UNUSED *_rt_key, void H5_ATTR_UNUSED *udata)
 {
-    H5G_node_t          *sn = NULL;
-    H5O_loc_t           targ_oloc;
-    H5O_t               *targ_oh = NULL;
-    htri_t              stab_exists;
-    H5O_stab_t          stab;
-    unsigned            i;
-    int                 ret_value = H5_ITER_CONT;
+    H5G_node_t *sn = NULL;
+    H5O_loc_t   targ_oloc;
+    H5O_t *     targ_oh = NULL;
+    htri_t      stab_exists;
+    H5O_stab_t  stab;
+    unsigned    i;
+    int         ret_value = H5_ITER_CONT;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -678,64 +661,64 @@ H5G_verify_cached_stabs_test_cb(H5F_t *f, hid_t dxpl_id,
     HDassert(H5F_addr_defined(addr));
 
     /* Load the node */
-    if(NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
+    if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, f, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     /* Check each target object to see if its stab message (if present) matches
      * the cached stab (if present).  If one exists, both must exist. */
     /* Initialize constant fields in target oloc */
-    targ_oloc.file = f;
+    targ_oloc.file         = f;
     targ_oloc.holding_file = FALSE;
 
     /* Iterate over entries */
-    for(i=0; i<sn->nsyms; i++) {
+    for (i = 0; i < sn->nsyms; i++) {
         /* Update oloc address */
         targ_oloc.addr = sn->entry[i].header;
 
         /* Load target object header */
-        if(NULL == (targ_oh = H5O_protect(&targ_oloc, dxpl_id, H5AC_READ)))
+        if (NULL == (targ_oh = H5O_protect(&targ_oloc, dxpl_id, H5AC_READ)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTPROTECT, H5_ITER_ERROR, "unable to protect target object header")
 
         /* Check if a symbol table message exists */
-        if((stab_exists = H5O_msg_exists_oh(targ_oh, H5O_STAB_ID)) < 0)
+        if ((stab_exists = H5O_msg_exists_oh(targ_oh, H5O_STAB_ID)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "unable to check for STAB message")
 
-        if(stab_exists) {
+        if (stab_exists) {
             /* Read symbol table message */
-            if(NULL == H5O_msg_read_oh(f, dxpl_id, targ_oh, H5O_STAB_ID, &stab))
+            if (NULL == H5O_msg_read_oh(f, dxpl_id, targ_oh, H5O_STAB_ID, &stab))
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to read STAB message")
 
             /* Check if the stab matches the cached stab info */
-            if(sn->entry[i].type != H5G_CACHED_STAB)
+            if (sn->entry[i].type != H5G_CACHED_STAB)
                 HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, H5_ITER_ERROR, "STAB message is not cached in group node")
 
-            if((sn->entry[i].cache.stab.btree_addr != stab.btree_addr)
-                    || (sn->entry[i].cache.stab.heap_addr != stab.heap_addr))
-                HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, H5_ITER_ERROR, "cached symbol table information is incorrect")
+            if ((sn->entry[i].cache.stab.btree_addr != stab.btree_addr) ||
+                (sn->entry[i].cache.stab.heap_addr != stab.heap_addr))
+                HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, H5_ITER_ERROR,
+                            "cached symbol table information is incorrect")
         } /* end if */
-        else if(sn->entry[i].type == H5G_CACHED_STAB)
+        else if (sn->entry[i].type == H5G_CACHED_STAB)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, H5_ITER_ERROR, "nonexistent STAB message is cached")
 
         /* Unprotect target object */
-        if(H5O_unprotect(&targ_oloc, dxpl_id, targ_oh, H5AC__NO_FLAGS_SET) < 0)
+        if (H5O_unprotect(&targ_oloc, dxpl_id, targ_oh, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to release object header");
         targ_oh = NULL;
     } /* end for */
 
 done:
-    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
+    if (sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
-    if(targ_oh) {
+    if (targ_oh) {
         HDassert(ret_value == H5_ITER_ERROR);
-        if(H5O_unprotect(&targ_oloc, dxpl_id, targ_oh, H5AC__NO_FLAGS_SET) < 0)
+        if (H5O_unprotect(&targ_oloc, dxpl_id, targ_oh, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to release object header");
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_verify_cached_stabs_test_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__verify_cached_stabs_test
  *
@@ -757,12 +740,12 @@ done:
 herr_t
 H5G__verify_cached_stabs_test(hid_t gid)
 {
-    H5G_t               *grp = NULL;            /* Group */
-    htri_t              stab_exists;
-    H5O_stab_t          stab;                   /* Symbol table message */
-    H5G_bt_common_t     udata = {NULL, NULL};   /* Dummy udata so H5B_iterate doesn't freak out */
-    hid_t               dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5G_t *         grp = NULL; /* Group */
+    htri_t          stab_exists;
+    H5O_stab_t      stab;                         /* Symbol table message */
+    H5G_bt_common_t udata     = {NULL, NULL};     /* Dummy udata so H5B_iterate doesn't freak out */
+    hid_t           dxpl_id   = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    herr_t          ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -770,29 +753,27 @@ H5G__verify_cached_stabs_test(hid_t gid)
     HDassert(gid >= 0);
 
     /* Check args */
-    if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
+    if (NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Check for group having a symbol table message */
     /* Check for the group having a group info message */
-    if((stab_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID,
-            dxpl_id)) < 0)
+    if ((stab_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
 
     /* No need to check anything if the symbol table doesn't exist */
-    if(!stab_exists)
+    if (!stab_exists)
         HGOTO_DONE(SUCCEED);
 
     /* Read the stab */
-    if(NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, dxpl_id))
+    if (NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, dxpl_id))
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get symbol table info")
 
     /* Iterate over the b-tree, checking validity of cached information */
-    if((ret_value = H5B_iterate(grp->oloc.file, dxpl_id, H5B_SNODE,
-            stab.btree_addr, H5G_verify_cached_stabs_test_cb, &udata)) < 0)
+    if ((ret_value = H5B_iterate(grp->oloc.file, dxpl_id, H5B_SNODE, stab.btree_addr,
+                                 H5G_verify_cached_stabs_test_cb, &udata)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "iteration operator failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__verify_cached_stabs_test() */
-
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index 94b8716..043569d 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -26,30 +26,27 @@
 /* Module Setup */
 /****************/
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"         /* Datasets                             */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5Iprivate.h"		/* IDs					*/
-#include "H5Lprivate.h"		/* Links				*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Ppublic.h"		/* Property Lists			*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets                             */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5HLprivate.h" /* Local Heaps				*/
+#include "H5Iprivate.h"  /* IDs					*/
+#include "H5Lprivate.h"  /* Links				*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Ppublic.h"   /* Property Lists			*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -57,52 +54,44 @@
 /* User data for path traversal routine */
 typedef struct {
     /* down */
-    hbool_t chk_exists;         /* Flag to indicate we are checking if object exists */
+    hbool_t chk_exists; /* Flag to indicate we are checking if object exists */
 
     /* up */
-    H5G_loc_t *obj_loc;         /* Object location */
-    hbool_t exists;             /* Indicate if object exists */
+    H5G_loc_t *obj_loc; /* Object location */
+    hbool_t    exists;  /* Indicate if object exists */
 } H5G_trav_slink_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5G_traverse_slink_cb(H5G_loc_t *grp_loc, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5G_traverse_ud(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
-    H5G_loc_t *obj_loc/*in,out*/, unsigned target, size_t *nlinks/*in,out*/,
-    hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id);
+static herr_t H5G_traverse_slink_cb(H5G_loc_t *grp_loc, const char *name, const H5O_link_t *lnk,
+                                    H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                                    H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5G_traverse_ud(const H5G_loc_t *grp_loc, const H5O_link_t *lnk, H5G_loc_t *obj_loc /*in,out*/,
+                              unsigned target, size_t *nlinks /*in,out*/, hbool_t *obj_exists, hid_t lapl_id,
+                              hid_t dxpl_id);
 static herr_t H5G_traverse_slink(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
-    H5G_loc_t *obj_loc/*in,out*/, unsigned target, size_t *nlinks/*in,out*/,
-    hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id);
-static herr_t H5G_traverse_real(const H5G_loc_t *loc, const char *name,
-    unsigned target, size_t *nlinks, H5G_traverse_t op, void *op_data,
-    hid_t lapl_id, hid_t dxpl_id);
-
+                                 H5G_loc_t *obj_loc /*in,out*/, unsigned target, size_t *nlinks /*in,out*/,
+                                 hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id);
+static herr_t H5G_traverse_real(const H5G_loc_t *loc, const char *name, unsigned target, size_t *nlinks,
+                                H5G_traverse_t op, void *op_data, hid_t lapl_id, hid_t dxpl_id);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_traverse_slink_cb
  *
@@ -118,17 +107,17 @@ static herr_t H5G_traverse_real(const H5G_loc_t *loc, const char *name,
  */
 static herr_t
 H5G_traverse_slink_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+                      const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                      H5G_own_loc_t *own_loc /*out*/)
 {
-    H5G_trav_slink_t *udata = (H5G_trav_slink_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_trav_slink_t *udata     = (H5G_trav_slink_t *)_udata; /* User data passed in */
+    herr_t            ret_value = SUCCEED;                    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check for dangling soft link */
-    if(obj_loc == NULL) {
-        if(udata->chk_exists)
+    if (obj_loc == NULL) {
+        if (udata->chk_exists)
             udata->exists = FALSE;
         else
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "component not found")
@@ -149,7 +138,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_traverse_slink_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_traverse_link_ud
  *
@@ -164,21 +152,21 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
-    H5G_loc_t *obj_loc/*in,out*/, unsigned target, size_t *nlinks/*in,out*/,
-    hbool_t *obj_exists, hid_t _lapl_id, hid_t dxpl_id)
+H5G_traverse_ud(const H5G_loc_t *grp_loc /*in,out*/, const H5O_link_t *lnk, H5G_loc_t *obj_loc /*in,out*/,
+                unsigned target, size_t *nlinks /*in,out*/, hbool_t *obj_exists, hid_t _lapl_id,
+                hid_t dxpl_id)
 {
-    const H5L_class_t   *link_class;       /* User-defined link class */
-    hid_t               cb_return = -1;         /* The ID the user-defined callback returned */
-    H5G_loc_t           grp_loc_copy;
-    H5G_name_t          grp_path_copy;
-    H5O_loc_t           grp_oloc_copy;
-    H5G_loc_t           new_loc;                /* Group location for newly opened external object */
-    H5G_t              *grp;
-    hid_t               lapl_id = (-1);         /* LAPL local to this routine */
-    H5P_genplist_t     *lapl;                   /* LAPL with nlinks set */
-    hid_t               cur_grp = (-1);
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    const H5L_class_t *link_class;     /* User-defined link class */
+    hid_t              cb_return = -1; /* The ID the user-defined callback returned */
+    H5G_loc_t          grp_loc_copy;
+    H5G_name_t         grp_path_copy;
+    H5O_loc_t          grp_oloc_copy;
+    H5G_loc_t          new_loc; /* Group location for newly opened external object */
+    H5G_t *            grp;
+    hid_t              lapl_id = (-1); /* LAPL local to this routine */
+    H5P_genplist_t *   lapl;           /* LAPL with nlinks set */
+    hid_t              cur_grp   = (-1);
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -191,7 +179,7 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
     HDassert(_lapl_id >= 0);
 
     /* Get the link class for this type of link. */
-    if(NULL == (link_class = H5L_find_class(lnk->type)))
+    if (NULL == (link_class = H5L_find_class(lnk->type)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTREGISTERED, FAIL, "unable to get UD link class")
 
     /* Set up location for user-defined callback.  Use a copy of our current
@@ -199,46 +187,46 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
     grp_loc_copy.path = &grp_path_copy;
     grp_loc_copy.oloc = &grp_oloc_copy;
     H5G_loc_reset(&grp_loc_copy);
-    if(H5G__loc_copy(&grp_loc_copy, grp_loc, H5_COPY_DEEP) < 0)
+    if (H5G__loc_copy(&grp_loc_copy, grp_loc, H5_COPY_DEEP) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, FAIL, "unable to copy object location")
 
     /* Create a group ID to pass to the user-defined callback */
-    if(NULL == (grp = H5G_open(&grp_loc_copy, dxpl_id)))
+    if (NULL == (grp = H5G_open(&grp_loc_copy, dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
-    if((cur_grp = H5I_register(H5I_GROUP, grp, FALSE)) < 0)
+    if ((cur_grp = H5I_register(H5I_GROUP, grp, FALSE)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
     /* Check for generic default property list and use link access default if so */
-    if(_lapl_id == H5P_DEFAULT) {
+    if (_lapl_id == H5P_DEFAULT) {
         HDassert(H5P_LINK_ACCESS_DEFAULT != -1);
-        if(NULL == (lapl = (H5P_genplist_t *)H5I_object(H5P_LINK_ACCESS_DEFAULT)))
+        if (NULL == (lapl = (H5P_genplist_t *)H5I_object(H5P_LINK_ACCESS_DEFAULT)))
             HGOTO_ERROR(H5E_SYM, H5E_BADATOM, FAIL, "unable to get default property list")
     } /* end if */
     else {
         /* Get the underlying property list passed in */
-        if(NULL == (lapl = (H5P_genplist_t *)H5I_object(_lapl_id)))
+        if (NULL == (lapl = (H5P_genplist_t *)H5I_object(_lapl_id)))
             HGOTO_ERROR(H5E_SYM, H5E_BADATOM, FAIL, "unable to get property list from ID")
     } /* end else */
 
     /* Copy the property list passed in */
-    if((lapl_id = H5P_copy_plist(lapl, FALSE)) < 0)
+    if ((lapl_id = H5P_copy_plist(lapl, FALSE)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, FAIL, "unable to copy property list")
 
     /* Get the underlying property list copy */
-    if(NULL == (lapl = (H5P_genplist_t *)H5I_object(lapl_id)))
+    if (NULL == (lapl = (H5P_genplist_t *)H5I_object(lapl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_BADATOM, FAIL, "unable to get property list from ID")
 
     /* Record number of soft links left to traverse in the property list. */
-    if(H5P_set(lapl, H5L_ACS_NLINKS_NAME, nlinks) < 0)
+    if (H5P_set(lapl, H5L_ACS_NLINKS_NAME, nlinks) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTSET, FAIL, "can't set nlink info")
 
     /* User-defined callback function */
     cb_return = (link_class->trav_func)(lnk->name, cur_grp, lnk->u.ud.udata, lnk->u.ud.size, lapl_id);
 
     /* Check for failing to locate the object */
-    if(cb_return < 0) {
+    if (cb_return < 0) {
         /* Check if we just needed to know if the object exists */
-        if(target & H5G_TARGET_EXISTS) {
+        if (target & H5G_TARGET_EXISTS) {
             /* Clear any errors from the stack */
             H5E_clear_stack(NULL);
 
@@ -254,7 +242,7 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
     } /* end if */
 
     /* Get the object location information from the ID the user callback returned */
-    if(H5G_loc(cb_return, &new_loc) < 0)
+    if (H5G_loc(cb_return, &new_loc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unable to get object location from ID")
 
     /* Release any previous location information for the object */
@@ -266,32 +254,31 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
     /* Hold the file open until we free this object header (otherwise the
      * object location will be invalidated when the file closes).
      */
-    if(H5O_loc_hold_file(obj_loc->oloc) < 0)
+    if (H5O_loc_hold_file(obj_loc->oloc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to hold file open")
 
     /* We have a copy of the location and we're holding the file open.
      * Close the open ID the user passed back.
      */
-    if(H5I_dec_ref(cb_return) < 0)
+    if (H5I_dec_ref(cb_return) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close atom from UD callback")
     cb_return = (hid_t)(-1);
 
 done:
     /* Close location given to callback. */
-    if(cur_grp > 0 && H5I_dec_ref(cur_grp) < 0)
+    if (cur_grp > 0 && H5I_dec_ref(cur_grp) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close atom for current location")
 
-    if(ret_value < 0 && cb_return > 0 && H5I_dec_ref(cb_return) < 0)
+    if (ret_value < 0 && cb_return > 0 && H5I_dec_ref(cb_return) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close atom from UD callback")
 
     /* Close the LAPL, if we copied one */
-    if(lapl_id > 0 && H5I_dec_ref(lapl_id) < 0)
+    if (lapl_id > 0 && H5I_dec_ref(lapl_id) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close copied link access property list")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_traverse_ud() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_traverse_slink
  *
@@ -309,18 +296,18 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_traverse_slink(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
-    H5G_loc_t *obj_loc/*in,out*/, unsigned target, size_t *nlinks/*in,out*/,
-    hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id)
+H5G_traverse_slink(const H5G_loc_t *grp_loc, const H5O_link_t *lnk, H5G_loc_t *obj_loc /*in,out*/,
+                   unsigned target, size_t *nlinks /*in,out*/, hbool_t *obj_exists, hid_t lapl_id,
+                   hid_t dxpl_id)
 {
-    H5G_trav_slink_t      udata;                  /* User data to pass to link traversal callback */
-    H5G_name_t          tmp_obj_path;           /* Temporary copy of object's path */
-    hbool_t             tmp_obj_path_set = FALSE;       /* Flag to indicate that tmp object path is initialized */
-    H5O_loc_t           tmp_grp_oloc;           /* Temporary copy of group entry */
-    H5G_name_t          tmp_grp_path;           /* Temporary copy of group's path */
-    H5G_loc_t           tmp_grp_loc;            /* Temporary copy of group's location */
-    hbool_t             tmp_grp_loc_set = FALSE;       /* Flag to indicate that tmp group location is initialized */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5G_trav_slink_t udata;                     /* User data to pass to link traversal callback */
+    H5G_name_t       tmp_obj_path;              /* Temporary copy of object's path */
+    hbool_t          tmp_obj_path_set = FALSE;  /* Flag to indicate that tmp object path is initialized */
+    H5O_loc_t        tmp_grp_oloc;              /* Temporary copy of group entry */
+    H5G_name_t       tmp_grp_path;              /* Temporary copy of group's path */
+    H5G_loc_t        tmp_grp_loc;               /* Temporary copy of group's location */
+    hbool_t          tmp_grp_loc_set = FALSE;   /* Flag to indicate that tmp group location is initialized */
+    herr_t           ret_value       = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -352,31 +339,31 @@ H5G_traverse_slink(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
 
     /* Set up user data for traversal callback */
     udata.chk_exists = (target & H5G_TARGET_EXISTS) ? TRUE : FALSE;
-    udata.exists = FALSE;
-    udata.obj_loc = obj_loc;
+    udata.exists     = FALSE;
+    udata.obj_loc    = obj_loc;
 
     /* Traverse the link */
-    if(H5G_traverse_real(&tmp_grp_loc, lnk->u.soft.name, target, nlinks, H5G_traverse_slink_cb, &udata, lapl_id, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to follow symbolic link")
+    if (H5G_traverse_real(&tmp_grp_loc, lnk->u.soft.name, target, nlinks, H5G_traverse_slink_cb, &udata,
+                          lapl_id, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to follow symbolic link")
 
     /* Pass back information about whether the object exists */
     *obj_exists = udata.exists;
 
 done:
     /* Restore object's group hier. path */
-    if(tmp_obj_path_set) {
+    if (tmp_obj_path_set) {
         H5G_name_free(obj_loc->path);
         H5G_name_copy(obj_loc->path, &tmp_obj_path, H5_COPY_SHALLOW);
     } /* end if */
 
     /* Release cloned copy of group location */
-    if(tmp_grp_loc_set)
+    if (tmp_grp_loc_set)
         H5G_loc_free(&tmp_grp_loc);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_traverse_slink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__traverse_special
  *
@@ -391,11 +378,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
-    unsigned target, size_t *nlinks, hbool_t last_comp,
-    H5G_loc_t *obj_loc, hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id)
+H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk, unsigned target, size_t *nlinks,
+                      hbool_t last_comp, H5G_loc_t *obj_loc, hbool_t *obj_exists, hid_t lapl_id,
+                      hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -410,11 +397,11 @@ H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
      * is the last component of the name and the H5G_TARGET_SLINK bit of
      * TARGET is set then we don't follow it.
      */
-    if(H5L_TYPE_SOFT == lnk->type &&
-            (0 == (target & H5G_TARGET_SLINK) || !last_comp)) {
-        if((*nlinks)-- <= 0)
+    if (H5L_TYPE_SOFT == lnk->type && (0 == (target & H5G_TARGET_SLINK) || !last_comp)) {
+        if ((*nlinks)-- <= 0)
             HGOTO_ERROR(H5E_LINK, H5E_NLINKS, FAIL, "too many links")
-        if(H5G_traverse_slink(grp_loc, lnk, obj_loc, (target & H5G_TARGET_EXISTS), nlinks, obj_exists, lapl_id, dxpl_id) < 0)
+        if (H5G_traverse_slink(grp_loc, lnk, obj_loc, (target & H5G_TARGET_EXISTS), nlinks, obj_exists,
+                               lapl_id, dxpl_id) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_TRAVERSE, FAIL, "symbolic link traversal failed")
     } /* end if */
 
@@ -423,11 +410,11 @@ H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
      * is the last component of the name and the H5G_TARGET_UDLINK bit of
      * TARGET is set then we don't follow it.
      */
-    if(lnk->type >= H5L_TYPE_UD_MIN &&
-            (0 == (target & H5G_TARGET_UDLINK) || !last_comp) ) {
-        if((*nlinks)-- <= 0)
+    if (lnk->type >= H5L_TYPE_UD_MIN && (0 == (target & H5G_TARGET_UDLINK) || !last_comp)) {
+        if ((*nlinks)-- <= 0)
             HGOTO_ERROR(H5E_LINK, H5E_NLINKS, FAIL, "too many links")
-        if(H5G_traverse_ud(grp_loc, lnk, obj_loc, (target & H5G_TARGET_EXISTS), nlinks, obj_exists, lapl_id, dxpl_id) < 0)
+        if (H5G_traverse_ud(grp_loc, lnk, obj_loc, (target & H5G_TARGET_EXISTS), nlinks, obj_exists, lapl_id,
+                            dxpl_id) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_TRAVERSE, FAIL, "user-defined link traversal failed")
     } /* end if */
 
@@ -442,9 +429,8 @@ H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
      *  the status of the object (into a hard link), so don't use an 'else'
      *  statement here. -QAK)
      */
-    if(H5F_addr_defined(obj_loc->oloc->addr) &&
-            (0 == (target & H5G_TARGET_MOUNT) || !last_comp)) {
-        if(H5F_traverse_mount(obj_loc->oloc/*in,out*/) < 0)
+    if (H5F_addr_defined(obj_loc->oloc->addr) && (0 == (target & H5G_TARGET_MOUNT) || !last_comp)) {
+        if (H5F_traverse_mount(obj_loc->oloc /*in,out*/) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "mount point traversal failed")
     } /* end if */
 
@@ -452,15 +438,14 @@ H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
      * and obj_loc is in the same file, obj_loc should also hold the
      * file open so that closing the grp_loc doesn't close the file.
      */
-    if(grp_loc->oloc->holding_file && grp_loc->oloc->file == obj_loc->oloc->file)
-        if(H5O_loc_hold_file(obj_loc->oloc) < 0)
+    if (grp_loc->oloc->holding_file && grp_loc->oloc->file == obj_loc->oloc->file)
+        if (H5O_loc_hold_file(obj_loc->oloc) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to hold file open")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__traverse_special() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_traverse_real
  *
@@ -478,27 +463,27 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
-    size_t *nlinks, H5G_traverse_t op, void *op_data, hid_t lapl_id, hid_t dxpl_id)
+H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target, size_t *nlinks, H5G_traverse_t op,
+                  void *op_data, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5G_loc_t           loc;            /* Location of start object     */
-    H5O_loc_t           grp_oloc;	/* Object loc. for current group */
-    H5G_name_t		grp_path;	/* Path for current group	*/
-    H5G_loc_t           grp_loc;        /* Location of group            */
-    H5O_loc_t		obj_oloc;	/* Object found			*/
-    H5G_name_t		obj_path;	/* Path for object found	*/
-    H5G_loc_t           obj_loc;        /* Location of object           */
-    size_t		nchars;		/* component name length	*/
-    H5O_link_t          lnk;            /* Link information for object  */
-    hbool_t link_valid = FALSE;         /* Flag to indicate that the link information is valid */
-    hbool_t obj_loc_valid = FALSE;      /* Flag to indicate that the object location is valid */
+    H5G_loc_t     loc;                    /* Location of start object     */
+    H5O_loc_t     grp_oloc;               /* Object loc. for current group */
+    H5G_name_t    grp_path;               /* Path for current group	*/
+    H5G_loc_t     grp_loc;                /* Location of group            */
+    H5O_loc_t     obj_oloc;               /* Object found			*/
+    H5G_name_t    obj_path;               /* Path for object found	*/
+    H5G_loc_t     obj_loc;                /* Location of object           */
+    size_t        nchars;                 /* component name length	*/
+    H5O_link_t    lnk;                    /* Link information for object  */
+    hbool_t       link_valid    = FALSE;  /* Flag to indicate that the link information is valid */
+    hbool_t       obj_loc_valid = FALSE;  /* Flag to indicate that the object location is valid */
     H5G_own_loc_t own_loc = H5G_OWN_NONE; /* Enum to indicate whether callback took ownership of locations*/
-    hbool_t group_copy = FALSE;         /* Flag to indicate that the group entry is copied */
-    char                comp_buf[1024];     /* Temporary buffer for path components */
-    char                *comp;          /* Pointer to buffer for path components */
-    H5WB_t              *wb = NULL;     /* Wrapped buffer for temporary buffer */
-    hbool_t last_comp = FALSE;          /* Flag to indicate that a component is the last component in the name */
-    herr_t              ret_value = SUCCEED;       /* Return value */
+    hbool_t       group_copy = FALSE;     /* Flag to indicate that the group entry is copied */
+    char          comp_buf[1024];         /* Temporary buffer for path components */
+    char *        comp;                   /* Pointer to buffer for path components */
+    H5WB_t *      wb        = NULL;       /* Wrapped buffer for temporary buffer */
+    hbool_t       last_comp = FALSE; /* Flag to indicate that a component is the last component in the name */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -513,8 +498,8 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
      * root of the file; for relative names it starts at CWG.
      */
     /* Check if we need to get the root group's entry */
-    if('/' == *name) {
-        H5G_t *root_grp;         /* Temporary pointer to root group of file */
+    if ('/' == *name) {
+        H5G_t *root_grp; /* Temporary pointer to root group of file */
 
         /* Look up root group for starting location */
         root_grp = H5G_rootof(_loc->oloc->file);
@@ -537,72 +522,72 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
 
 #if defined(H5_USING_MEMCHECKER) || !defined(NDEBUG)
     /* Clear group location */
-    if(H5G_loc_reset(&grp_loc) < 0)
+    if (H5G_loc_reset(&grp_loc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to reset location")
 #endif /* H5_USING_MEMCHECKER */
 
     /* Deep copy of the starting location to group location */
-    if(H5G__loc_copy(&grp_loc, &loc, H5_COPY_DEEP) < 0)
+    if (H5G__loc_copy(&grp_loc, &loc, H5_COPY_DEEP) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to copy location")
     group_copy = TRUE;
 
     /* Clear object location */
-    if(H5G_loc_reset(&obj_loc) < 0)
+    if (H5G_loc_reset(&obj_loc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to reset location")
 
     /* Wrap the local buffer for serialized header info */
-    if(NULL == (wb = H5WB_wrap(comp_buf, sizeof(comp_buf))))
+    if (NULL == (wb = H5WB_wrap(comp_buf, sizeof(comp_buf))))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
     /* Get a pointer to a buffer that's large enough  */
-    if(NULL == (comp = (char *)H5WB_actual(wb, (HDstrlen(name) + 1))))
+    if (NULL == (comp = (char *)H5WB_actual(wb, (HDstrlen(name) + 1))))
         HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
     /* Traverse the path */
-    while((name = H5G__component(name, &nchars)) && *name) {
-        const char *s;                  /* Temporary string pointer */
-        htri_t lookup_status;           /* Status from object lookup */
-        hbool_t obj_exists;             /* Whether the object exists */
-
-	/*
-	 * Copy the component name into a null-terminated buffer so
-	 * we can pass it down to the other symbol table functions.
-	 */
-	HDmemcpy(comp, name, nchars);
-	comp[nchars] = '\0';
-
-	/*
-	 * The special name `.' is a no-op.
-	 */
-	if('.' == comp[0] && !comp[1]) {
-	    name += nchars;
-	    continue;
-	} /* end if */
+    while ((name = H5G__component(name, &nchars)) && *name) {
+        const char *s;             /* Temporary string pointer */
+        htri_t      lookup_status; /* Status from object lookup */
+        hbool_t     obj_exists;    /* Whether the object exists */
+
+        /*
+         * Copy the component name into a null-terminated buffer so
+         * we can pass it down to the other symbol table functions.
+         */
+        HDmemcpy(comp, name, nchars);
+        comp[nchars] = '\0';
+
+        /*
+         * The special name `.' is a no-op.
+         */
+        if ('.' == comp[0] && !comp[1]) {
+            name += nchars;
+            continue;
+        } /* end if */
 
         /* Check if this is the last component of the name */
-        if(!((s = H5G__component(name + nchars, NULL)) && *s))
+        if (!((s = H5G__component(name + nchars, NULL)) && *s))
             last_comp = TRUE;
 
         /* If there's valid information in the link, reset it */
-        if(link_valid) {
+        if (link_valid) {
             H5O_msg_reset(H5O_LINK_ID, &lnk);
             link_valid = FALSE;
         } /* end if */
 
         /* Get information for object in current group */
-        if((lookup_status = H5G__obj_lookup(grp_loc.oloc, comp, &lnk/*out*/, dxpl_id)) < 0)
+        if ((lookup_status = H5G__obj_lookup(grp_loc.oloc, comp, &lnk /*out*/, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't look up component")
         obj_exists = FALSE;
 
         /* If the lookup was OK, build object location and traverse special links, etc. */
-        if(lookup_status) {
+        if (lookup_status) {
             /* Sanity check link and indicate it's valid */
             HDassert(lnk.type >= H5L_TYPE_HARD);
             HDassert(!HDstrcmp(comp, lnk.name));
             link_valid = TRUE;
 
             /* Build object location from the link */
-            if(H5G__link_to_loc(&grp_loc, &lnk, &obj_loc) < 0)
+            if (H5G__link_to_loc(&grp_loc, &lnk, &obj_loc) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot initialize object location")
             obj_loc_valid = TRUE;
 
@@ -611,19 +596,20 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
 
             /* Perform any special traversals that the link needs */
             /* (soft links, user-defined links, file mounting, etc.) */
-            if(H5G__traverse_special(&grp_loc, &lnk, target, nlinks, last_comp, &obj_loc, &obj_exists, lapl_id, dxpl_id) < 0)
+            if (H5G__traverse_special(&grp_loc, &lnk, target, nlinks, last_comp, &obj_loc, &obj_exists,
+                                      lapl_id, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_LINK, H5E_TRAVERSE, FAIL, "special link traversal failed")
         } /* end if */
 
         /* Check for last component in name provided */
-        if(last_comp) {
-            H5O_link_t         *cb_lnk;    /* Pointer to link info for callback */
-            H5G_loc_t          *cb_loc;    /* Pointer to object location for callback */
+        if (last_comp) {
+            H5O_link_t *cb_lnk; /* Pointer to link info for callback */
+            H5G_loc_t * cb_loc; /* Pointer to object location for callback */
 
             /* Set callback parameters appropriately, based on link being found */
-            if(lookup_status) {
+            if (lookup_status) {
                 cb_lnk = &lnk;
-                if(obj_exists)
+                if (obj_exists)
                     cb_loc = &obj_loc;
                 else
                     cb_loc = NULL;
@@ -635,36 +621,36 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
             } /* end else */
 
             /* Call 'operator' routine */
-            if((op)(&grp_loc, comp, cb_lnk, cb_loc, op_data, &own_loc) < 0)
+            if ((op)(&grp_loc, comp, cb_lnk, cb_loc, op_data, &own_loc) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CALLBACK, FAIL, "traversal operator failed")
 
             HGOTO_DONE(SUCCEED)
         } /* end if */
 
         /* Handle lookup failures now */
-        if(!lookup_status) {
+        if (!lookup_status) {
             /* If an intermediate group doesn't exist & flag is set, create the group */
-            if(target & H5G_CRT_INTMD_GROUP) {
-                const H5O_ginfo_t def_ginfo = H5G_CRT_GROUP_INFO_DEF;   /* Default group info settings */
-                const H5O_linfo_t def_linfo = H5G_CRT_LINK_INFO_DEF;    /* Default link info settings */
-                const H5O_pline_t def_pline = H5O_CRT_PIPELINE_DEF;     /* Default filter pipeline settings */
-                H5O_ginfo_t	par_ginfo;	/* Group info settings for parent group */
-                H5O_linfo_t	par_linfo;	/* Link info settings for parent group */
-                H5O_pline_t	par_pline;	/* Filter pipeline settings for parent group */
-                H5O_linfo_t	tmp_linfo;	/* Temporary link info settings */
-                htri_t          exists;         /* Whether a group or link info message exists */
-                const H5O_ginfo_t *ginfo;	/* Group info settings for new group */
-                const H5O_linfo_t *linfo;	/* Link info settings for new group */
-                const H5O_pline_t *pline;	/* Filter pipeline settings for new group */
-                H5G_obj_create_t gcrt_info;     /* Group creation info */
+            if (target & H5G_CRT_INTMD_GROUP) {
+                const H5O_ginfo_t  def_ginfo = H5G_CRT_GROUP_INFO_DEF; /* Default group info settings */
+                const H5O_linfo_t  def_linfo = H5G_CRT_LINK_INFO_DEF;  /* Default link info settings */
+                const H5O_pline_t  def_pline = H5O_CRT_PIPELINE_DEF;   /* Default filter pipeline settings */
+                H5O_ginfo_t        par_ginfo; /* Group info settings for parent group */
+                H5O_linfo_t        par_linfo; /* Link info settings for parent group */
+                H5O_pline_t        par_pline; /* Filter pipeline settings for parent group */
+                H5O_linfo_t        tmp_linfo; /* Temporary link info settings */
+                htri_t             exists;    /* Whether a group or link info message exists */
+                const H5O_ginfo_t *ginfo;     /* Group info settings for new group */
+                const H5O_linfo_t *linfo;     /* Link info settings for new group */
+                const H5O_pline_t *pline;     /* Filter pipeline settings for new group */
+                H5G_obj_create_t   gcrt_info; /* Group creation info */
 
                 /* Check for the parent group having a group info message */
                 /* (OK if not found) */
-                if((exists = H5O_msg_exists(grp_loc.oloc, H5O_GINFO_ID, dxpl_id)) < 0)
+                if ((exists = H5O_msg_exists(grp_loc.oloc, H5O_GINFO_ID, dxpl_id)) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read object header")
-                if(exists) {
+                if (exists) {
                     /* Get the group info for parent group */
-                    if(NULL == H5O_msg_read(grp_loc.oloc, H5O_GINFO_ID, &par_ginfo, dxpl_id))
+                    if (NULL == H5O_msg_read(grp_loc.oloc, H5O_GINFO_ID, &par_ginfo, dxpl_id))
                         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "group info message not present")
 
                     /* Use parent group info settings */
@@ -677,16 +663,16 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
                 /* Check for the parent group having a link info message */
                 /* (OK if not found) */
                 /* Get the link info for parent group */
-                if((exists = H5G__obj_get_linfo(grp_loc.oloc, &par_linfo, dxpl_id)) < 0)
+                if ((exists = H5G__obj_get_linfo(grp_loc.oloc, &par_linfo, dxpl_id)) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read object header")
-                if(exists) {
+                if (exists) {
                     /* Only keep the creation order information from the parent
                      *  group's link info
                      */
                     HDmemcpy(&tmp_linfo, &def_linfo, sizeof(H5O_linfo_t));
                     tmp_linfo.track_corder = par_linfo.track_corder;
                     tmp_linfo.index_corder = par_linfo.index_corder;
-                    linfo = &tmp_linfo;
+                    linfo                  = &tmp_linfo;
                 } /* end if */
                 else
                     /* Use default link info settings */
@@ -694,11 +680,11 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
 
                 /* Check for the parent group having a filter pipeline message */
                 /* (OK if not found) */
-                if((exists = H5O_msg_exists(grp_loc.oloc, H5O_PLINE_ID, dxpl_id)) < 0)
+                if ((exists = H5O_msg_exists(grp_loc.oloc, H5O_PLINE_ID, dxpl_id)) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read object header")
-                if(exists) {
+                if (exists) {
                     /* Get the filter pipeline for parent group */
-                    if(NULL == H5O_msg_read(grp_loc.oloc, H5O_PLINE_ID, &par_pline, dxpl_id))
+                    if (NULL == H5O_msg_read(grp_loc.oloc, H5O_PLINE_ID, &par_pline, dxpl_id))
                         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "filter pipeline message not present")
 
                     /* Use parent filter pipeline settings */
@@ -709,53 +695,55 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
                     pline = &def_pline;
 
                 /* Create the intermediate group */
-/* XXX: Should we allow user to control the group creation params here? -QAK */
-                gcrt_info.gcpl_id = H5P_GROUP_CREATE_DEFAULT;
+                /* XXX: Should we allow user to control the group creation params here? -QAK */
+                gcrt_info.gcpl_id    = H5P_GROUP_CREATE_DEFAULT;
                 gcrt_info.cache_type = H5G_NOTHING_CACHED;
                 HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache));
-                if(H5G__obj_create_real(grp_oloc.file, dxpl_id, ginfo, linfo, pline, &gcrt_info, obj_loc.oloc/*out*/) < 0)
+                if (H5G__obj_create_real(grp_oloc.file, dxpl_id, ginfo, linfo, pline, &gcrt_info,
+                                         obj_loc.oloc /*out*/) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group entry")
 
                 /* Insert new group into current group's symbol table */
-                if(H5G__loc_insert(&grp_loc, comp, &obj_loc, H5O_TYPE_GROUP, &gcrt_info, dxpl_id) < 0)
+                if (H5G__loc_insert(&grp_loc, comp, &obj_loc, H5O_TYPE_GROUP, &gcrt_info, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert intermediate group")
 
                 /* Decrement refcount on intermediate group's object header in memory */
-                if(H5O_dec_rc_by_loc(obj_loc.oloc, dxpl_id) < 0)
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
+                if (H5O_dec_rc_by_loc(obj_loc.oloc, dxpl_id) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_CANTDEC, FAIL,
+                                "unable to decrement refcount on newly created object")
 
                 /* Close new group */
-                if(H5O_close(obj_loc.oloc) < 0)
+                if (H5O_close(obj_loc.oloc) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
 
                 /* If the parent group was holding the file open, the
                  * newly-created group should, as well.
                  */
-                if(grp_loc.oloc->holding_file)
-                    if(H5O_loc_hold_file(obj_loc.oloc) < 0)
+                if (grp_loc.oloc->holding_file)
+                    if (H5O_loc_hold_file(obj_loc.oloc) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to hold file open")
 
                 /* Reset any non-default object header messages */
-                if(ginfo != &def_ginfo)
+                if (ginfo != &def_ginfo)
                     /* (Casting away const OK - QAK) */
-                    if(H5O_msg_reset(H5O_GINFO_ID, (void *)ginfo) < 0)
+                    if (H5O_msg_reset(H5O_GINFO_ID, (void *)ginfo) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to reset group info message")
-                if(linfo != &def_linfo)
+                if (linfo != &def_linfo)
                     /* (Casting away const OK - QAK) */
-                    if(H5O_msg_reset(H5O_LINFO_ID, (void *)linfo) < 0)
+                    if (H5O_msg_reset(H5O_LINFO_ID, (void *)linfo) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to reset link info message")
-                if(pline != &def_pline)
+                if (pline != &def_pline)
                     /* (Casting away const OK - QAK) */
-                    if(H5O_msg_reset(H5O_PLINE_ID, (void *)pline) < 0)
+                    if (H5O_msg_reset(H5O_PLINE_ID, (void *)pline) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to reset I/O pipeline message")
             } /* end if */
             else
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "component not found")
         } /* end if */
 
-	/*
-	 * Advance to the next component of the path.
-	 */
+        /*
+         * Advance to the next component of the path.
+         */
 
         /* Transfer "ownership" of the object's information to the group object */
         H5G_loc_free(&grp_loc);
@@ -763,8 +751,8 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
         H5G_loc_reset(&obj_loc);
         obj_loc_valid = FALSE;
 
-	/* Advance to next component in string */
-	name += nchars;
+        /* Advance to next component in string */
+        name += nchars;
     } /* end while */
 
     /* Call 'operator' routine */
@@ -774,41 +762,40 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
      * NULL.
      */
     HDassert(group_copy);
-    if((op)(NULL, ".", NULL, &grp_loc, op_data, &own_loc) < 0)
+    if ((op)(NULL, ".", NULL, &grp_loc, op_data, &own_loc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "traversal operator failed")
 
     /* If the callback took ownership of the object location, it actually has
      * ownership of grp_loc.  It shouldn't have tried to take ownership of
      * the "group location", which was NULL. */
-     HDassert(!(own_loc & H5G_OWN_GRP_LOC));
-     if(own_loc & H5G_OWN_OBJ_LOC)
-         own_loc |= H5G_OWN_GRP_LOC;
+    HDassert(!(own_loc & H5G_OWN_GRP_LOC));
+    if (own_loc & H5G_OWN_OBJ_LOC)
+        own_loc |= H5G_OWN_GRP_LOC;
 
 done:
     /* If there's been an error, the callback doesn't really get ownership of
      * any location and we should close them both */
-    if(ret_value < 0)
+    if (ret_value < 0)
         own_loc = H5G_OWN_NONE;
 
     /* Free all open locations.  This also closes any open external files. */
-    if(obj_loc_valid && !(own_loc & H5G_OWN_OBJ_LOC))
+    if (obj_loc_valid && !(own_loc & H5G_OWN_OBJ_LOC))
         H5G_loc_free(&obj_loc);
-    if(group_copy && !(own_loc & H5G_OWN_GRP_LOC))
+    if (group_copy && !(own_loc & H5G_OWN_GRP_LOC))
         H5G_loc_free(&grp_loc);
 
     /* If there's valid information in the link, reset it */
-    if(link_valid)
-        if(H5O_msg_reset(H5O_LINK_ID, &lnk) < 0)
+    if (link_valid)
+        if (H5O_msg_reset(H5O_LINK_ID, &lnk) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to reset link message")
 
     /* Release temporary component buffer */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't release wrapped buffer")
 
-   FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_traverse_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G_traverse
  *
@@ -826,39 +813,38 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_traverse(const H5G_loc_t *loc, const char *name, unsigned target, H5G_traverse_t op,
-    void *op_data, hid_t lapl_id, hid_t dxpl_id)
+H5G_traverse(const H5G_loc_t *loc, const char *name, unsigned target, H5G_traverse_t op, void *op_data,
+             hid_t lapl_id, hid_t dxpl_id)
 {
-    size_t	    nlinks;                 /* Link countdown value */
-    H5P_genplist_t *lapl;                   /* Property list with value for nlinks */
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    size_t          nlinks;              /* Link countdown value */
+    H5P_genplist_t *lapl;                /* Property list with value for nlinks */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "no name given")
-    if(!loc)
+    if (!loc)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "no starting location")
-    if(!op)
+    if (!op)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "no operation provided")
     HDassert(lapl_id >= 0);
 
     /* Set nlinks value from property list, if it exists */
-    if(lapl_id == H5P_DEFAULT)
+    if (lapl_id == H5P_DEFAULT)
         nlinks = H5L_NUM_LINKS;
     else {
-        if(NULL == (lapl = (H5P_genplist_t *)H5I_object(lapl_id)))
+        if (NULL == (lapl = (H5P_genplist_t *)H5I_object(lapl_id)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-        if(H5P_get(lapl, H5L_ACS_NLINKS_NAME, &nlinks) < 0)
+        if (H5P_get(lapl, H5L_ACS_NLINKS_NAME, &nlinks) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get number of links")
     } /* end else */
 
     /* Go perform "real" traversal */
-    if(H5G_traverse_real(loc, name, target, &nlinks, op, op_data, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse_real(loc, name, target, &nlinks, op, op_data, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "internal path traversal failed")
 
 done:
-   FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_traverse() */
-
diff --git a/src/H5HF.c b/src/H5HF.c
index 6940826..0826a51 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -31,47 +31,41 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FOprivate.h"        /* File objects                         */
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FOprivate.h" /* File objects                         */
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -79,8 +73,6 @@
 /* Declare a free list to manage the H5HF_t struct */
 H5FL_DEFINE_STATIC(H5HF_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_op_read
  *
@@ -105,7 +97,6 @@ H5HF_op_read(const void *obj, size_t obj_len, void *op_data)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_op_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_op_write
  *
@@ -125,12 +116,11 @@ H5HF_op_write(const void *obj, size_t obj_len, void *op_data)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Perform "write", using memcpy() */
-    HDmemcpy((void *)obj, op_data, obj_len);    /* Casting away const OK -QAK */
+    HDmemcpy((void *)obj, op_data, obj_len); /* Casting away const OK -QAK */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_op_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_create
  *
@@ -148,10 +138,10 @@ H5HF_op_write(const void *obj, size_t obj_len, void *op_data)
 H5HF_t *
 H5HF_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
 {
-    H5HF_t *fh = NULL;          /* Pointer to new fractal heap */
-    H5HF_hdr_t *hdr = NULL;     /* The fractal heap header information */
-    haddr_t fh_addr;            /* Heap header address */
-    H5HF_t *ret_value;          /* Return value */
+    H5HF_t *    fh  = NULL; /* Pointer to new fractal heap */
+    H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */
+    haddr_t     fh_addr;    /* Heap header address */
+    H5HF_t *    ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -162,25 +152,25 @@ H5HF_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
     HDassert(cparam);
 
     /* Create shared fractal heap header */
-    if(HADDR_UNDEF == (fh_addr = H5HF_hdr_create(f, dxpl_id, cparam)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't create fractal heap header")
+    if (HADDR_UNDEF == (fh_addr = H5HF_hdr_create(f, dxpl_id, cparam)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't create fractal heap header")
 
     /* Allocate fractal heap wrapper */
-    if(NULL == (fh = H5FL_MALLOC(H5HF_t)))
+    if (NULL == (fh = H5FL_MALLOC(H5HF_t)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed for fractal heap info")
 
     /* Lock the heap header into memory */
-    if(NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, fh_addr, H5AC_WRITE)))
+    if (NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, fh_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap header")
 
     /* Point fractal heap wrapper at header and bump it's ref count */
     fh->hdr = hdr;
-    if(H5HF_hdr_incr(fh->hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared heap header")
+    if (H5HF_hdr_incr(fh->hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared heap header")
 
     /* Increment # of files using this heap header */
-    if(H5HF_hdr_fuse_incr(fh->hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment file reference count on shared heap header")
+    if (H5HF_hdr_fuse_incr(fh->hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment file reference count on shared heap header")
 
     /* Set file pointer for this heap open context */
     fh->f = f;
@@ -189,16 +179,15 @@ H5HF_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
     ret_value = fh;
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release fractal heap header")
-    if(!ret_value && fh)
-        if(H5HF_close(fh, dxpl_id) < 0)
+    if (!ret_value && fh)
+        if (H5HF_close(fh, dxpl_id) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTCLOSEOBJ, NULL, "unable to close fractal heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_open
  *
@@ -216,9 +205,9 @@ done:
 H5HF_t *
 H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
 {
-    H5HF_t *fh = NULL;          /* Pointer to new fractal heap */
-    H5HF_hdr_t *hdr = NULL;     /* The fractal heap header information */
-    H5HF_t *ret_value;          /* Return value */
+    H5HF_t *    fh  = NULL; /* Pointer to new fractal heap */
+    H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */
+    H5HF_t *    ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -229,25 +218,25 @@ H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
     HDassert(H5F_addr_defined(fh_addr));
 
     /* Load the heap header into memory */
-    if(NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, fh_addr, H5AC_READ)))
+    if (NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, fh_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap header")
 
     /* Check for pending heap deletion */
-    if(hdr->pending_delete)
+    if (hdr->pending_delete)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, NULL, "can't open fractal heap pending deletion")
 
     /* Create fractal heap info */
-    if(NULL == (fh = H5FL_MALLOC(H5HF_t)))
+    if (NULL == (fh = H5FL_MALLOC(H5HF_t)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed for fractal heap info")
 
     /* Point fractal heap wrapper at header */
     fh->hdr = hdr;
-    if(H5HF_hdr_incr(fh->hdr) < 0)
+    if (H5HF_hdr_incr(fh->hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared heap header")
 
     /* Increment # of files using this heap header */
-    if(H5HF_hdr_fuse_incr(fh->hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment file reference count on shared heap header")
+    if (H5HF_hdr_fuse_incr(fh->hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment file reference count on shared heap header")
 
     /* Set file pointer for this heap open context */
     fh->f = f;
@@ -256,16 +245,15 @@ H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
     ret_value = fh;
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release fractal heap header")
-    if(!ret_value && fh)
-        if(H5HF_close(fh, dxpl_id) < 0)
+    if (!ret_value && fh)
+        if (H5HF_close(fh, dxpl_id) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTCLOSEOBJ, NULL, "unable to close fractal heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_id_len
  *
@@ -296,7 +284,6 @@ H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_get_id_len() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_heap_addr
  *
@@ -327,7 +314,6 @@ H5HF_get_heap_addr(const H5HF_t *fh, haddr_t *heap_addr_p)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_get_heap_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_insert
  *
@@ -343,11 +329,10 @@ H5HF_get_heap_addr(const H5HF_t *fh, haddr_t *heap_addr_p)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size, const void *obj,
-    void *id/*out*/)
+H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size, const void *obj, void *id /*out*/)
 {
-    H5HF_hdr_t *hdr = NULL;                  /* The fractal heap header information */
-    herr_t ret_value = SUCCEED;
+    H5HF_hdr_t *hdr       = NULL; /* The fractal heap header information */
+    herr_t      ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -357,7 +342,7 @@ H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size, const void *obj,
     HDassert(id);
 
     /* Check arguments */
-    if(size == 0)
+    if (size == 0)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "can't insert 0-sized objects")
 
     /* Set the shared heap header's file context for this operation */
@@ -367,35 +352,34 @@ H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size, const void *obj,
     hdr = fh->hdr;
 
     /* Check for 'huge' object */
-    if(size > hdr->max_man_size) {
+    if (size > hdr->max_man_size) {
         /* Store 'huge' object in heap */
         /* (Casting away const OK - QAK) */
-        if(H5HF_huge_insert(hdr, dxpl_id, size, (void *)obj, id) < 0)
+        if (H5HF_huge_insert(hdr, dxpl_id, size, (void *)obj, id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "can't store 'huge' object in fractal heap")
     } /* end if */
     /* Check for 'tiny' object */
-    else if(size <= hdr->tiny_max_len) {
+    else if (size <= hdr->tiny_max_len) {
         /* Store 'tiny' object in heap */
-        if(H5HF_tiny_insert(hdr, size, obj, id) < 0)
+        if (H5HF_tiny_insert(hdr, size, obj, id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "can't store 'tiny' object in fractal heap")
     } /* end if */
     else {
         /* Check if we are in "append only" mode, or if there's enough room for the object */
-        if(hdr->write_once) {
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "'write once' managed blocks not supported yet")
+        if (hdr->write_once) {
+            HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "'write once' managed blocks not supported yet")
         } /* end if */
         else {
             /* Allocate space for object in 'managed' heap */
-            if(H5HF_man_insert(hdr, dxpl_id, size, obj, id) < 0)
+            if (H5HF_man_insert(hdr, dxpl_id, size, obj, id) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "can't store 'managed' object in fractal heap")
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_obj_len
  *
@@ -412,9 +396,9 @@ done:
 herr_t
 H5HF_get_obj_len(H5HF_t *fh, hid_t dxpl_id, const void *_id, size_t *obj_len_p)
 {
-    const uint8_t *id = (const uint8_t *)_id;   /* Object ID */
-    uint8_t id_flags;                   /* Heap ID flag bits */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const uint8_t *id = (const uint8_t *)_id; /* Object ID */
+    uint8_t        id_flags;                  /* Heap ID flag bits */
+    herr_t         ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -429,14 +413,14 @@ H5HF_get_obj_len(H5HF_t *fh, hid_t dxpl_id, const void *_id, size_t *obj_len_p)
     id_flags = *id;
 
     /* Check for correct heap ID version */
-    if((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
+    if ((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
         HGOTO_ERROR(H5E_HEAP, H5E_VERSION, FAIL, "incorrect heap ID version")
 
     /* Set the shared heap header's file context for this operation */
     fh->hdr->f = fh->f;
 
     /* Check type of object in heap */
-    if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
+    if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
         /* Skip over the flag byte */
         id++;
 
@@ -446,24 +430,23 @@ H5HF_get_obj_len(H5HF_t *fh, hid_t dxpl_id, const void *_id, size_t *obj_len_p)
         /* Retrieve the entry length */
         UINT64DECODE_VAR(id, *obj_len_p, fh->hdr->heap_len_size);
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
-        if(H5HF_huge_get_obj_len(fh->hdr, dxpl_id, id, obj_len_p) < 0)
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
+        if (H5HF_huge_get_obj_len(fh->hdr, dxpl_id, id, obj_len_p) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't get 'huge' object's length")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
-        if(H5HF_tiny_get_obj_len(fh->hdr, id, obj_len_p) < 0)
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
+        if (H5HF_tiny_get_obj_len(fh->hdr, id, obj_len_p) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't get 'tiny' object's length")
     } /* end if */
     else {
-HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
+        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
+        HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_get_obj_len() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_read
  *
@@ -478,11 +461,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_read(H5HF_t *fh, hid_t dxpl_id, const void *_id, void *obj/*out*/)
+H5HF_read(H5HF_t *fh, hid_t dxpl_id, const void *_id, void *obj /*out*/)
 {
-    const uint8_t *id = (const uint8_t *)_id;   /* Object ID */
-    uint8_t id_flags;                   /* Heap ID flag bits */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const uint8_t *id = (const uint8_t *)_id; /* Object ID */
+    uint8_t        id_flags;                  /* Heap ID flag bits */
+    herr_t         ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -497,38 +480,37 @@ H5HF_read(H5HF_t *fh, hid_t dxpl_id, const void *_id, void *obj/*out*/)
     id_flags = *id;
 
     /* Check for correct heap ID version */
-    if((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
+    if ((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
         HGOTO_ERROR(H5E_HEAP, H5E_VERSION, FAIL, "incorrect heap ID version")
 
     /* Set the shared heap header's file context for this operation */
     fh->hdr->f = fh->f;
 
     /* Check type of object in heap */
-    if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
+    if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
         /* Read object from managed heap blocks */
-        if(H5HF_man_read(fh->hdr, dxpl_id, id, obj) < 0)
+        if (H5HF_man_read(fh->hdr, dxpl_id, id, obj) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't read object from fractal heap")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
         /* Read 'huge' object from file */
-        if(H5HF_huge_read(fh->hdr, dxpl_id, id, obj) < 0)
+        if (H5HF_huge_read(fh->hdr, dxpl_id, id, obj) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't read 'huge' object from fractal heap")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
         /* Read 'tiny' object from file */
-        if(H5HF_tiny_read(fh->hdr, id, obj) < 0)
+        if (H5HF_tiny_read(fh->hdr, id, obj) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't read 'tiny' object from fractal heap")
     } /* end if */
     else {
-HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
+        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
+        HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_write
  *
@@ -555,12 +537,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_write(H5HF_t *fh, hid_t dxpl_id, void *_id, hbool_t H5_ATTR_UNUSED *id_changed,
-    const void *obj)
+H5HF_write(H5HF_t *fh, hid_t dxpl_id, void *_id, hbool_t H5_ATTR_UNUSED *id_changed, const void *obj)
 {
-    uint8_t *id = (uint8_t *)_id;       /* Object ID */
-    uint8_t id_flags;                   /* Heap ID flag bits */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    uint8_t *id = (uint8_t *)_id; /* Object ID */
+    uint8_t  id_flags;            /* Heap ID flag bits */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -575,39 +556,38 @@ H5HF_write(H5HF_t *fh, hid_t dxpl_id, void *_id, hbool_t H5_ATTR_UNUSED *id_chan
     id_flags = *id;
 
     /* Check for correct heap ID version */
-    if((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
+    if ((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
         HGOTO_ERROR(H5E_HEAP, H5E_VERSION, FAIL, "incorrect heap ID version")
 
     /* Set the shared heap header's file context for this operation */
     fh->hdr->f = fh->f;
 
     /* Check type of object in heap */
-    if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
+    if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
         /* Operate on object from managed heap blocks */
         /* (ID can't change and modifying object is "easy" to manage) */
-        if(H5HF_man_write(fh->hdr, dxpl_id, id, obj) < 0)
+        if (H5HF_man_write(fh->hdr, dxpl_id, id, obj) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "can't write to 'managed' heap object")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
         /* Operate on "huge" object */
-        if(H5HF_huge_write(fh->hdr, dxpl_id, id, obj) < 0)
+        if (H5HF_huge_write(fh->hdr, dxpl_id, id, obj) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "can't write to 'huge' heap object")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
         /* Check for writing a 'tiny' object */
         /* (which isn't supported yet - ID will change) */
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "modifying 'tiny' object not supported yet")
     } /* end if */
     else {
-HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
+        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
+        HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_op
  *
@@ -627,12 +607,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_op(H5HF_t *fh, hid_t dxpl_id, const void *_id, H5HF_operator_t op,
-    void *op_data)
+H5HF_op(H5HF_t *fh, hid_t dxpl_id, const void *_id, H5HF_operator_t op, void *op_data)
 {
-    const uint8_t *id = (const uint8_t *)_id;   /* Object ID */
-    uint8_t id_flags;                   /* Heap ID flag bits */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const uint8_t *id = (const uint8_t *)_id; /* Object ID */
+    uint8_t        id_flags;                  /* Heap ID flag bits */
+    herr_t         ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -647,38 +626,37 @@ H5HF_op(H5HF_t *fh, hid_t dxpl_id, const void *_id, H5HF_operator_t op,
     id_flags = *id;
 
     /* Check for correct heap ID version */
-    if((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
+    if ((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
         HGOTO_ERROR(H5E_HEAP, H5E_VERSION, FAIL, "incorrect heap ID version")
 
     /* Set the shared heap header's file context for this operation */
     fh->hdr->f = fh->f;
 
     /* Check type of object in heap */
-    if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
+    if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
         /* Operate on object from managed heap blocks */
-        if(H5HF_man_op(fh->hdr, dxpl_id, id, op, op_data) < 0)
+        if (H5HF_man_op(fh->hdr, dxpl_id, id, op, op_data) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "can't operate on object from fractal heap")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
         /* Operate on 'huge' object from file */
-        if(H5HF_huge_op(fh->hdr, dxpl_id, id, op, op_data) < 0)
+        if (H5HF_huge_op(fh->hdr, dxpl_id, id, op, op_data) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "can't operate on 'huge' object from fractal heap")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
         /* Operate on 'tiny' object from file */
-        if(H5HF_tiny_op(fh->hdr, id, op, op_data) < 0)
+        if (H5HF_tiny_op(fh->hdr, id, op, op_data) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "can't operate on 'tiny' object from fractal heap")
     } /* end if */
     else {
-HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
+        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
+        HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_op() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_remove
  *
@@ -695,9 +673,9 @@ done:
 herr_t
 H5HF_remove(H5HF_t *fh, hid_t dxpl_id, const void *_id)
 {
-    const uint8_t *id = (const uint8_t *)_id;   /* Object ID */
-    uint8_t id_flags;                   /* Heap ID flag bits */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const uint8_t *id = (const uint8_t *)_id; /* Object ID */
+    uint8_t        id_flags;                  /* Heap ID flag bits */
+    herr_t         ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -712,38 +690,37 @@ H5HF_remove(H5HF_t *fh, hid_t dxpl_id, const void *_id)
     id_flags = *id;
 
     /* Check for correct heap ID version */
-    if((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
+    if ((id_flags & H5HF_ID_VERS_MASK) != H5HF_ID_VERS_CURR)
         HGOTO_ERROR(H5E_HEAP, H5E_VERSION, FAIL, "incorrect heap ID version")
 
     /* Set the shared heap header's file context for this operation */
     fh->hdr->f = fh->f;
 
     /* Check type of object in heap */
-    if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
+    if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_MAN) {
         /* Remove object from managed heap blocks */
-        if(H5HF_man_remove(fh->hdr, dxpl_id, id) < 0)
+        if (H5HF_man_remove(fh->hdr, dxpl_id, id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove object from fractal heap")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_HUGE) {
         /* Remove 'huge' object from file & v2 B-tree tracker */
-        if(H5HF_huge_remove(fh->hdr, dxpl_id, id) < 0)
+        if (H5HF_huge_remove(fh->hdr, dxpl_id, id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove 'huge' object from fractal heap")
     } /* end if */
-    else if((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
+    else if ((id_flags & H5HF_ID_TYPE_MASK) == H5HF_ID_TYPE_TINY) {
         /* Remove 'tiny' object from heap statistics */
-        if(H5HF_tiny_remove(fh->hdr, id) < 0)
+        if (H5HF_tiny_remove(fh->hdr, id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove 'tiny' object from fractal heap")
     } /* end if */
     else {
-HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
+        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", FUNC);
+        HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_close
  *
@@ -760,9 +737,9 @@ done:
 herr_t
 H5HF_close(H5HF_t *fh, hid_t dxpl_id)
 {
-    hbool_t pending_delete = FALSE;     /* Whether the heap is pending deletion */
-    haddr_t heap_addr = HADDR_UNDEF;    /* Address of heap (for deletion) */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hbool_t pending_delete = FALSE;       /* Whether the heap is pending deletion */
+    haddr_t heap_addr      = HADDR_UNDEF; /* Address of heap (for deletion) */
+    herr_t  ret_value      = SUCCEED;     /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -772,7 +749,7 @@ H5HF_close(H5HF_t *fh, hid_t dxpl_id)
     HDassert(fh);
 
     /* Decrement file reference & check if this is the last open fractal heap using the shared heap header */
-    if(0 == H5HF_hdr_fuse_decr(fh->hdr)) {
+    if (0 == H5HF_hdr_fuse_decr(fh->hdr)) {
         /* Set the shared heap header's file context for this operation */
         fh->hdr->f = fh->f;
 
@@ -782,7 +759,7 @@ H5HF_close(H5HF_t *fh, hid_t dxpl_id)
          *      a reference loop and the objects couldn't be removed from
          *      the metadata cache - QAK)
          */
-        if(H5HF_space_close(fh->hdr, dxpl_id) < 0)
+        if (H5HF_space_close(fh->hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
 
         /* Reset the block iterator, if necessary */
@@ -791,8 +768,8 @@ H5HF_close(H5HF_t *fh, hid_t dxpl_id)
          *      a reference loop and the objects couldn't be removed from
          *      the metadata cache - QAK)
          */
-        if(H5HF_man_iter_ready(&fh->hdr->next_block))
-            if(H5HF_man_iter_reset(&fh->hdr->next_block) < 0)
+        if (H5HF_man_iter_ready(&fh->hdr->next_block))
+            if (H5HF_man_iter_reset(&fh->hdr->next_block) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reset block iterator")
 
         /* Shut down the huge object information */
@@ -800,33 +777,33 @@ H5HF_close(H5HF_t *fh, hid_t dxpl_id)
          *      has the address of an object in the file, which might be
          *      modified by the shutdown routine - QAK)
          */
-        if(H5HF_huge_term(fh->hdr, dxpl_id) < 0)
+        if (H5HF_huge_term(fh->hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release 'huge' object info")
 
         /* Check for pending heap deletion */
-        if(fh->hdr->pending_delete) {
+        if (fh->hdr->pending_delete) {
             /* Set local info, so heap deletion can occur after decrementing the
              *  header's ref count
              */
             pending_delete = TRUE;
-            heap_addr = fh->hdr->heap_addr;
+            heap_addr      = fh->hdr->heap_addr;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Decrement the reference count on the heap header */
-    if(H5HF_hdr_decr(fh->hdr) < 0)
+    if (H5HF_hdr_decr(fh->hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header")
 
     /* Check for pending heap deletion */
-    if(pending_delete) {
-        H5HF_hdr_t *hdr;            /* Another pointer to fractal heap header */
+    if (pending_delete) {
+        H5HF_hdr_t *hdr; /* Another pointer to fractal heap header */
 
         /* Lock the heap header into memory */
-        if(NULL == (hdr = H5HF_hdr_protect(fh->f, dxpl_id, heap_addr, H5AC_WRITE)))
+        if (NULL == (hdr = H5HF_hdr_protect(fh->f, dxpl_id, heap_addr, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
 
         /* Delete heap, starting with header (unprotects header) */
-        if(H5HF_hdr_delete(hdr, dxpl_id) < 0)
+        if (H5HF_hdr_delete(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "unable to delete fractal heap")
     } /* end if */
 
@@ -837,7 +814,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_delete
  *
@@ -854,8 +830,8 @@ done:
 herr_t
 H5HF_delete(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
 {
-    H5HF_hdr_t *hdr = NULL;             /* The fractal heap header information */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_hdr_t *hdr       = NULL;    /* The fractal heap header information */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -866,24 +842,23 @@ H5HF_delete(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
     HDassert(H5F_addr_defined(fh_addr));
 
     /* Lock the heap header into memory */
-    if(NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, fh_addr, H5AC_WRITE)))
+    if (NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, fh_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
 
     /* Check for files using shared heap header */
-    if(hdr->file_rc)
+    if (hdr->file_rc)
         hdr->pending_delete = TRUE;
     else {
         /* Delete heap now, starting with header (unprotects header) */
-        if(H5HF_hdr_delete(hdr, dxpl_id) < 0)
+        if (H5HF_hdr_delete(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "unable to delete fractal heap")
         hdr = NULL;
     } /* end if */
 
 done:
     /* Unprotect the header, if an error occurred */
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_delete() */
-
diff --git a/src/H5HFbtree2.c b/src/H5HFbtree2.c
index a34b792..261acab 100644
--- a/src/H5HFbtree2.c
+++ b/src/H5HFbtree2.c
@@ -26,107 +26,95 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
-
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* v2 B-tree client callback context */
 typedef struct H5HF_huge_bt2_ctx_t {
-    uint8_t     sizeof_size;    /* Size of file sizes */
-    uint8_t     sizeof_addr;    /* Size of file addresses */
+    uint8_t sizeof_size; /* Size of file sizes */
+    uint8_t sizeof_addr; /* Size of file addresses */
 } H5HF_huge_bt2_ctx_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /* v2 B-tree driver callbacks */
 
-static void *H5HF_huge_bt2_crt_context(void *udata);
+static void * H5HF_huge_bt2_crt_context(void *udata);
 static herr_t H5HF_huge_bt2_dst_context(void *ctx);
-static void *H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
+static void * H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 
 static herr_t H5HF_huge_bt2_indir_store(void *native, const void *udata);
 static herr_t H5HF_huge_bt2_indir_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5HF_huge_bt2_indir_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5HF_huge_bt2_indir_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5HF_huge_bt2_indir_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5HF_huge_bt2_indir_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth,
+                                        const void *record, const void *_udata);
 
 static herr_t H5HF_huge_bt2_filt_indir_store(void *native, const void *udata);
 static herr_t H5HF_huge_bt2_filt_indir_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5HF_huge_bt2_filt_indir_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5HF_huge_bt2_filt_indir_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5HF_huge_bt2_filt_indir_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5HF_huge_bt2_filt_indir_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent,
+                                             int fwidth, const void *record, const void *_udata);
 
 static herr_t H5HF_huge_bt2_dir_store(void *native, const void *udata);
 static herr_t H5HF_huge_bt2_dir_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5HF_huge_bt2_dir_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5HF_huge_bt2_dir_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5HF_huge_bt2_dir_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5HF_huge_bt2_dir_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth,
+                                      const void *record, const void *_udata);
 
 static herr_t H5HF_huge_bt2_filt_dir_store(void *native, const void *udata);
 static herr_t H5HF_huge_bt2_filt_dir_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5HF_huge_bt2_filt_dir_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5HF_huge_bt2_filt_dir_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5HF_huge_bt2_filt_dir_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5HF_huge_bt2_filt_dir_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent,
+                                           int fwidth, const void *record, const void *_udata);
 
 /*********************/
 /* Package Variables */
 /*********************/
 /* v2 B-tree class for indirectly accessed 'huge' objects */
-const H5B2_class_t H5HF_HUGE_BT2_INDIR[1]={{ /* B-tree class information */
-    H5B2_FHEAP_HUGE_INDIR_ID,               /* Type of B-tree */
-    "H5B2_FHEAP_HUGE_INDIR_ID",             /* Name of B-tree class */
-    sizeof(H5HF_huge_bt2_indir_rec_t),      /* Size of native record */
-    H5HF_huge_bt2_crt_context,              /* Create client callback context */
-    H5HF_huge_bt2_dst_context,              /* Destroy client callback context */
-    H5HF_huge_bt2_indir_store,              /* Record storage callback */
-    H5HF_huge_bt2_indir_compare,            /* Record comparison callback */
-    H5HF_huge_bt2_indir_encode,             /* Record encoding callback */
-    H5HF_huge_bt2_indir_decode,             /* Record decoding callback */
-    H5HF_huge_bt2_indir_debug,              /* Record debugging callback */
-    H5HF_huge_bt2_crt_dbg_context,          /* Create debugging context */
-    H5HF_huge_bt2_dst_context               /* Destroy debugging context */
+const H5B2_class_t H5HF_HUGE_BT2_INDIR[1] = {{
+    /* B-tree class information */
+    H5B2_FHEAP_HUGE_INDIR_ID,          /* Type of B-tree */
+    "H5B2_FHEAP_HUGE_INDIR_ID",        /* Name of B-tree class */
+    sizeof(H5HF_huge_bt2_indir_rec_t), /* Size of native record */
+    H5HF_huge_bt2_crt_context,         /* Create client callback context */
+    H5HF_huge_bt2_dst_context,         /* Destroy client callback context */
+    H5HF_huge_bt2_indir_store,         /* Record storage callback */
+    H5HF_huge_bt2_indir_compare,       /* Record comparison callback */
+    H5HF_huge_bt2_indir_encode,        /* Record encoding callback */
+    H5HF_huge_bt2_indir_decode,        /* Record decoding callback */
+    H5HF_huge_bt2_indir_debug,         /* Record debugging callback */
+    H5HF_huge_bt2_crt_dbg_context,     /* Create debugging context */
+    H5HF_huge_bt2_dst_context          /* Destroy debugging context */
 }};
 
 /* v2 B-tree class for indirectly accessed, filtered 'huge' objects */
-const H5B2_class_t H5HF_HUGE_BT2_FILT_INDIR[1]={{ /* B-tree class information */
+const H5B2_class_t H5HF_HUGE_BT2_FILT_INDIR[1] = {{
+    /* B-tree class information */
     H5B2_FHEAP_HUGE_FILT_INDIR_ID,          /* Type of B-tree */
     "H5B2_FHEAP_HUGE_FILT_INDIR_ID",        /* Name of B-tree class */
     sizeof(H5HF_huge_bt2_filt_indir_rec_t), /* Size of native record */
@@ -142,42 +130,43 @@ const H5B2_class_t H5HF_HUGE_BT2_FILT_INDIR[1]={{ /* B-tree class information */
 }};
 
 /* v2 B-tree class for directly accessed 'huge' objects */
-const H5B2_class_t H5HF_HUGE_BT2_DIR[1]={{  /* B-tree class information */
-    H5B2_FHEAP_HUGE_DIR_ID,                 /* Type of B-tree */
-    "H5B2_FHEAP_HUGE_DIR_ID",               /* Name of B-tree class */
-    sizeof(H5HF_huge_bt2_dir_rec_t),        /* Size of native record */
-    H5HF_huge_bt2_crt_context,              /* Create client callback context */
-    H5HF_huge_bt2_dst_context,              /* Destroy client callback context */
-    H5HF_huge_bt2_dir_store,                /* Record storage callback */
-    H5HF_huge_bt2_dir_compare,              /* Record comparison callback */
-    H5HF_huge_bt2_dir_encode,               /* Record encoding callback */
-    H5HF_huge_bt2_dir_decode,               /* Record decoding callback */
-    H5HF_huge_bt2_dir_debug,                /* Record debugging callback */
-    H5HF_huge_bt2_crt_dbg_context,          /* Create debugging context */
-    H5HF_huge_bt2_dst_context               /* Destroy debugging context */
+const H5B2_class_t H5HF_HUGE_BT2_DIR[1] = {{
+    /* B-tree class information */
+    H5B2_FHEAP_HUGE_DIR_ID,          /* Type of B-tree */
+    "H5B2_FHEAP_HUGE_DIR_ID",        /* Name of B-tree class */
+    sizeof(H5HF_huge_bt2_dir_rec_t), /* Size of native record */
+    H5HF_huge_bt2_crt_context,       /* Create client callback context */
+    H5HF_huge_bt2_dst_context,       /* Destroy client callback context */
+    H5HF_huge_bt2_dir_store,         /* Record storage callback */
+    H5HF_huge_bt2_dir_compare,       /* Record comparison callback */
+    H5HF_huge_bt2_dir_encode,        /* Record encoding callback */
+    H5HF_huge_bt2_dir_decode,        /* Record decoding callback */
+    H5HF_huge_bt2_dir_debug,         /* Record debugging callback */
+    H5HF_huge_bt2_crt_dbg_context,   /* Create debugging context */
+    H5HF_huge_bt2_dst_context        /* Destroy debugging context */
 }};
 
 /* v2 B-tree class for directly accessed, filtered 'huge' objects */
-const H5B2_class_t H5HF_HUGE_BT2_FILT_DIR[1]={{ /* B-tree class information */
-    H5B2_FHEAP_HUGE_FILT_DIR_ID,            /* Type of B-tree */
-    "H5B2_FHEAP_HUGE_FILT_DIR_ID",          /* Name of B-tree class */
-    sizeof(H5HF_huge_bt2_filt_dir_rec_t),   /* Size of native record */
-    H5HF_huge_bt2_crt_context,              /* Create client callback context */
-    H5HF_huge_bt2_dst_context,              /* Destroy client callback context */
-    H5HF_huge_bt2_filt_dir_store,           /* Record storage callback */
-    H5HF_huge_bt2_filt_dir_compare,         /* Record comparison callback */
-    H5HF_huge_bt2_filt_dir_encode,          /* Record encoding callback */
-    H5HF_huge_bt2_filt_dir_decode,          /* Record decoding callback */
-    H5HF_huge_bt2_filt_dir_debug,           /* Record debugging callback */
-    H5HF_huge_bt2_crt_dbg_context,          /* Create debugging context */
-    H5HF_huge_bt2_dst_context               /* Destroy debugging context */
+const H5B2_class_t H5HF_HUGE_BT2_FILT_DIR[1] = {{
+    /* B-tree class information */
+    H5B2_FHEAP_HUGE_FILT_DIR_ID,          /* Type of B-tree */
+    "H5B2_FHEAP_HUGE_FILT_DIR_ID",        /* Name of B-tree class */
+    sizeof(H5HF_huge_bt2_filt_dir_rec_t), /* Size of native record */
+    H5HF_huge_bt2_crt_context,            /* Create client callback context */
+    H5HF_huge_bt2_dst_context,            /* Destroy client callback context */
+    H5HF_huge_bt2_filt_dir_store,         /* Record storage callback */
+    H5HF_huge_bt2_filt_dir_compare,       /* Record comparison callback */
+    H5HF_huge_bt2_filt_dir_encode,        /* Record encoding callback */
+    H5HF_huge_bt2_filt_dir_decode,        /* Record decoding callback */
+    H5HF_huge_bt2_filt_dir_debug,         /* Record debugging callback */
+    H5HF_huge_bt2_crt_dbg_context,        /* Create debugging context */
+    H5HF_huge_bt2_dst_context             /* Destroy debugging context */
 }};
 
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -185,8 +174,6 @@ const H5B2_class_t H5HF_HUGE_BT2_FILT_DIR[1]={{ /* B-tree class information */
 /* Declare a free list to manage the H5HF_huge_bt2_ctx_t struct */
 H5FL_DEFINE_STATIC(H5HF_huge_bt2_ctx_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_crt_context
  *
@@ -205,9 +192,9 @@ H5FL_DEFINE_STATIC(H5HF_huge_bt2_ctx_t);
 static void *
 H5HF_huge_bt2_crt_context(void *_f)
 {
-    H5F_t *f = (H5F_t *)_f;     /* User data for building callback context */
-    H5HF_huge_bt2_ctx_t *ctx;   /* Callback context structure */
-    void *ret_value;            /* Return value */
+    H5F_t *              f = (H5F_t *)_f; /* User data for building callback context */
+    H5HF_huge_bt2_ctx_t *ctx;             /* Callback context structure */
+    void *               ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -215,7 +202,7 @@ H5HF_huge_bt2_crt_context(void *_f)
     HDassert(f);
 
     /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5HF_huge_bt2_ctx_t)))
+    if (NULL == (ctx = H5FL_MALLOC(H5HF_huge_bt2_ctx_t)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate callback context")
 
     /* Determine the size of addresses & lengths in the file */
@@ -229,7 +216,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_huge_bt2_crt_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_dst_context
  *
@@ -248,7 +234,7 @@ done:
 static herr_t
 H5HF_huge_bt2_dst_context(void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -261,7 +247,6 @@ H5HF_huge_bt2_dst_context(void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_dst_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_crt_dbg_context
  *
@@ -278,8 +263,8 @@ H5HF_huge_bt2_dst_context(void *_ctx)
 static void *
 H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr)
 {
-    H5HF_huge_bt2_ctx_t *ctx;   /* Callback context structure */
-    void *ret_value;            /* Return value */
+    H5HF_huge_bt2_ctx_t *ctx;       /* Callback context structure */
+    void *               ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -287,7 +272,7 @@ H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5
     HDassert(f);
 
     /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5HF_huge_bt2_ctx_t)))
+    if (NULL == (ctx = H5FL_MALLOC(H5HF_huge_bt2_ctx_t)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate callback context")
 
     /* Determine the size of addresses & lengths in the file */
@@ -301,7 +286,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_huge_bt2_crt_dbg_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_indir_found
  *
@@ -322,17 +306,16 @@ H5HF_huge_bt2_indir_found(const void *nrecord, void *op_data)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #ifdef QAK
-HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %Hu}\n", "H5HF_huge_bt2_indir_found",
-        ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr,
-        ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len,
-        ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->id);
+    HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %Hu}\n", "H5HF_huge_bt2_indir_found",
+              ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr,
+              ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len,
+              ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->id);
 #endif /* QAK */
     *(H5HF_huge_bt2_indir_rec_t *)op_data = *(const H5HF_huge_bt2_indir_rec_t *)nrecord;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_indir_found() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_indir_remove
  *
@@ -350,13 +333,15 @@ HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %Hu}\n", "H5HF_huge_bt2_indir_found",
 herr_t
 H5HF_huge_bt2_indir_remove(const void *nrecord, void *_udata)
 {
-    H5HF_huge_remove_ud_t *udata = (H5HF_huge_remove_ud_t *)_udata;   /* User callback data */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_huge_remove_ud_t *udata     = (H5HF_huge_remove_ud_t *)_udata; /* User callback data */
+    herr_t                 ret_value = SUCCEED;                         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Free the space in the file for the object being removed */
-    if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len) < 0)
+    if (H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id,
+                   ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr,
+                   ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free space for huge object on disk")
 
     /* Set the length of the object removed */
@@ -366,7 +351,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_huge_bt2_indir_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_indir_store
  *
@@ -390,7 +374,6 @@ H5HF_huge_bt2_indir_store(void *nrecord, const void *udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_indir_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_indir_compare
  *
@@ -410,13 +393,12 @@ H5HF_huge_bt2_indir_compare(const void *_rec1, const void *_rec2, int *result)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    *result = (int)(((const H5HF_huge_bt2_indir_rec_t *)_rec1)->id - 
+    *result = (int)(((const H5HF_huge_bt2_indir_rec_t *)_rec1)->id -
                     ((const H5HF_huge_bt2_indir_rec_t *)_rec2)->id);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_indir_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_indir_encode
  *
@@ -433,7 +415,7 @@ H5HF_huge_bt2_indir_compare(const void *_rec1, const void *_rec2, int *result)
 static herr_t
 H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *            ctx     = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
     const H5HF_huge_bt2_indir_rec_t *nrecord = (const H5HF_huge_bt2_indir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -449,7 +431,6 @@ H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_indir_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_indir_decode
  *
@@ -466,7 +447,7 @@ H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 static herr_t
 H5HF_huge_bt2_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *      ctx     = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
     H5HF_huge_bt2_indir_rec_t *nrecord = (H5HF_huge_bt2_indir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -482,7 +463,6 @@ H5HF_huge_bt2_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_indir_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_indir_debug
  *
@@ -498,20 +478,18 @@ H5HF_huge_bt2_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
  */
 static herr_t
 H5HF_huge_bt2_indir_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord,
-    const void H5_ATTR_UNUSED *_udata)
+                          int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5HF_huge_bt2_indir_rec_t *nrecord = (const H5HF_huge_bt2_indir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%a, %Hu, %Hu}\n", indent, "", fwidth, "Record:",
-        nrecord->addr, nrecord->len, nrecord->id);
+    HDfprintf(stream, "%*s%-*s {%a, %Hu, %Hu}\n", indent, "", fwidth, "Record:", nrecord->addr, nrecord->len,
+              nrecord->id);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_indir_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_indir_found
  *
@@ -532,19 +510,18 @@ H5HF_huge_bt2_filt_indir_found(const void *nrecord, void *op_data)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #ifdef QAK
-HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu, %Hu}\n", "H5HF_huge_bt2_filt_indir_found",
-        ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->addr,
-        ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->len,
-        ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->filter_mask,
-        ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->obj_size,
-        ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->id);
+    HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu, %Hu}\n", "H5HF_huge_bt2_filt_indir_found",
+              ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->addr,
+              ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->len,
+              ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->filter_mask,
+              ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->obj_size,
+              ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->id);
 #endif /* QAK */
     *(H5HF_huge_bt2_filt_indir_rec_t *)op_data = *(const H5HF_huge_bt2_filt_indir_rec_t *)nrecord;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_indir_found() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_indir_remove
  *
@@ -562,13 +539,15 @@ HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu, %Hu}\n", "H5HF_huge_bt2_filt
 herr_t
 H5HF_huge_bt2_filt_indir_remove(const void *nrecord, void *_udata)
 {
-    H5HF_huge_remove_ud_t *udata = (H5HF_huge_remove_ud_t *)_udata;   /* User callback data */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_huge_remove_ud_t *udata     = (H5HF_huge_remove_ud_t *)_udata; /* User callback data */
+    herr_t                 ret_value = SUCCEED;                         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Free the space in the file for the object being removed */
-    if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->len) < 0)
+    if (H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id,
+                   ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->addr,
+                   ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->len) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free space for huge object on disk")
 
     /* Set the length of the object removed */
@@ -578,7 +557,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_huge_bt2_filt_indir_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_indir_store
  *
@@ -602,7 +580,6 @@ H5HF_huge_bt2_filt_indir_store(void *nrecord, const void *udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_indir_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_indir_compare
  *
@@ -622,13 +599,12 @@ H5HF_huge_bt2_filt_indir_compare(const void *_rec1, const void *_rec2, int *resu
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    *result = (int)(((const H5HF_huge_bt2_filt_indir_rec_t *)_rec1)->id - 
+    *result = (int)(((const H5HF_huge_bt2_filt_indir_rec_t *)_rec1)->id -
                     ((const H5HF_huge_bt2_filt_indir_rec_t *)_rec2)->id);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_indir_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_indir_encode
  *
@@ -645,7 +621,7 @@ H5HF_huge_bt2_filt_indir_compare(const void *_rec1, const void *_rec2, int *resu
 static herr_t
 H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *                 ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
     const H5HF_huge_bt2_filt_indir_rec_t *nrecord = (const H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -663,7 +639,6 @@ H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_indir_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_indir_decode
  *
@@ -680,7 +655,7 @@ H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 static herr_t
 H5HF_huge_bt2_filt_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *           ctx     = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
     H5HF_huge_bt2_filt_indir_rec_t *nrecord = (H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -698,7 +673,6 @@ H5HF_huge_bt2_filt_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_indir_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_indir_debug
  *
@@ -714,20 +688,19 @@ H5HF_huge_bt2_filt_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
  */
 static herr_t
 H5HF_huge_bt2_filt_indir_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord,
-    const void H5_ATTR_UNUSED *_udata)
+                               int indent, int fwidth, const void *_nrecord,
+                               const void H5_ATTR_UNUSED *_udata)
 {
     const H5HF_huge_bt2_filt_indir_rec_t *nrecord = (const H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%a, %Hu, %x, %Hu, %Hu}\n", indent, "", fwidth, "Record:",
-        nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size, nrecord->id);
+    HDfprintf(stream, "%*s%-*s {%a, %Hu, %x, %Hu, %Hu}\n", indent, "", fwidth, "Record:", nrecord->addr,
+              nrecord->len, nrecord->filter_mask, nrecord->obj_size, nrecord->id);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_indir_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_dir_remove
  *
@@ -745,13 +718,15 @@ H5HF_huge_bt2_filt_indir_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_
 herr_t
 H5HF_huge_bt2_dir_remove(const void *nrecord, void *_udata)
 {
-    H5HF_huge_remove_ud_t *udata = (H5HF_huge_remove_ud_t *)_udata;   /* User callback data */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_huge_remove_ud_t *udata     = (H5HF_huge_remove_ud_t *)_udata; /* User callback data */
+    herr_t                 ret_value = SUCCEED;                         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Free the space in the file for the object being removed */
-    if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len) < 0)
+    if (H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id,
+                   ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr,
+                   ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free space for huge object on disk")
 
     /* Set the length of the object removed */
@@ -761,7 +736,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_huge_bt2_dir_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_dir_store
  *
@@ -785,7 +759,6 @@ H5HF_huge_bt2_dir_store(void *nrecord, const void *udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_dir_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_dir_compare
  *
@@ -809,16 +782,16 @@ H5HF_huge_bt2_dir_compare(const void *_rec1, const void *_rec2, int *result)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #ifdef QAK
-HDfprintf(stderr, "%s: rec1 = {%a, %Hu}\n", "H5HF_huge_bt2_dir_compare", rec1->addr, rec1->len);
-HDfprintf(stderr, "%s: rec2 = {%a, %Hu}\n", "H5HF_huge_bt2_dir_compare", rec2->addr, rec2->len);
+    HDfprintf(stderr, "%s: rec1 = {%a, %Hu}\n", "H5HF_huge_bt2_dir_compare", rec1->addr, rec1->len);
+    HDfprintf(stderr, "%s: rec2 = {%a, %Hu}\n", "H5HF_huge_bt2_dir_compare", rec2->addr, rec2->len);
 #endif /* QAK */
-    if(rec1->addr < rec2->addr)
+    if (rec1->addr < rec2->addr)
         *result = -1;
-    else if(rec1->addr > rec2->addr)
+    else if (rec1->addr > rec2->addr)
         *result = 1;
-    else if(rec1->len < rec2->len)
+    else if (rec1->len < rec2->len)
         *result = -1;
-    else if(rec1->len > rec2->len)
+    else if (rec1->len > rec2->len)
         *result = 1;
     else
         *result = 0;
@@ -826,7 +799,6 @@ HDfprintf(stderr, "%s: rec2 = {%a, %Hu}\n", "H5HF_huge_bt2_dir_compare", rec2->a
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_dir_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_dir_encode
  *
@@ -843,7 +815,7 @@ HDfprintf(stderr, "%s: rec2 = {%a, %Hu}\n", "H5HF_huge_bt2_dir_compare", rec2->a
 static herr_t
 H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *          ctx     = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
     const H5HF_huge_bt2_dir_rec_t *nrecord = (const H5HF_huge_bt2_dir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -858,7 +830,6 @@ H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_dir_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_dir_decode
  *
@@ -875,7 +846,7 @@ H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 static herr_t
 H5HF_huge_bt2_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *    ctx     = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
     H5HF_huge_bt2_dir_rec_t *nrecord = (H5HF_huge_bt2_dir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -890,7 +861,6 @@ H5HF_huge_bt2_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_dir_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_dir_debug
  *
@@ -905,21 +875,18 @@ H5HF_huge_bt2_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_huge_bt2_dir_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord,
-    const void H5_ATTR_UNUSED *_udata)
+H5HF_huge_bt2_dir_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, int indent,
+                        int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5HF_huge_bt2_dir_rec_t *nrecord = (const H5HF_huge_bt2_dir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%a, %Hu}\n", indent, "", fwidth, "Record:",
-        nrecord->addr, nrecord->len);
+    HDfprintf(stream, "%*s%-*s {%a, %Hu}\n", indent, "", fwidth, "Record:", nrecord->addr, nrecord->len);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_dir_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_dir_found
  *
@@ -940,18 +907,17 @@ H5HF_huge_bt2_filt_dir_found(const void *nrecord, void *op_data)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #ifdef QAK
-HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_found",
-        ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->addr,
-        ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->len,
-        ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->filter_mask,
-        ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->obj_size);
+    HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_found",
+              ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->addr,
+              ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->len,
+              ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->filter_mask,
+              ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->obj_size);
 #endif /* QAK */
     *(H5HF_huge_bt2_filt_dir_rec_t *)op_data = *(const H5HF_huge_bt2_filt_dir_rec_t *)nrecord;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_dir_found() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_dir_remove
  *
@@ -969,13 +935,15 @@ HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_
 herr_t
 H5HF_huge_bt2_filt_dir_remove(const void *nrecord, void *_udata)
 {
-    H5HF_huge_remove_ud_t *udata = (H5HF_huge_remove_ud_t *)_udata;   /* User callback data */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_huge_remove_ud_t *udata     = (H5HF_huge_remove_ud_t *)_udata; /* User callback data */
+    herr_t                 ret_value = SUCCEED;                         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Free the space in the file for the object being removed */
-    if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->len) < 0)
+    if (H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id,
+                   ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->addr,
+                   ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->len) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free space for huge object on disk")
 
     /* Set the length of the object removed */
@@ -985,7 +953,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_huge_bt2_filt_dir_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_dir_store
  *
@@ -1009,7 +976,6 @@ H5HF_huge_bt2_filt_dir_store(void *nrecord, const void *udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_dir_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_dir_compare
  *
@@ -1033,16 +999,18 @@ H5HF_huge_bt2_filt_dir_compare(const void *_rec1, const void *_rec2, int *result
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #ifdef QAK
-HDfprintf(stderr, "%s: rec1 = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_compare", rec1->addr, rec1->len, rec1->filter_mask, rec1->obj_size);
-HDfprintf(stderr, "%s: rec2 = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_compare", rec2->addr, rec2->len, rec2->filter_mask, rec2->obj_size);
+    HDfprintf(stderr, "%s: rec1 = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_compare", rec1->addr,
+              rec1->len, rec1->filter_mask, rec1->obj_size);
+    HDfprintf(stderr, "%s: rec2 = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_compare", rec2->addr,
+              rec2->len, rec2->filter_mask, rec2->obj_size);
 #endif /* QAK */
-    if(rec1->addr < rec2->addr)
+    if (rec1->addr < rec2->addr)
         *result = -1;
-    else if(rec1->addr > rec2->addr)
+    else if (rec1->addr > rec2->addr)
         *result = 1;
-    else if(rec1->len < rec2->len)
+    else if (rec1->len < rec2->len)
         *result = -1;
-    else if(rec1->len > rec2->len)
+    else if (rec1->len > rec2->len)
         *result = 1;
     else
         *result = 0;
@@ -1050,7 +1018,6 @@ HDfprintf(stderr, "%s: rec2 = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_com
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_dir_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_dir_encode
  *
@@ -1067,7 +1034,7 @@ HDfprintf(stderr, "%s: rec2 = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_com
 static herr_t
 H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *               ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
     const H5HF_huge_bt2_filt_dir_rec_t *nrecord = (const H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -1084,7 +1051,6 @@ H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_dir_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_dir_decode
  *
@@ -1101,7 +1067,7 @@ H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 static herr_t
 H5HF_huge_bt2_filt_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
 {
-    H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5HF_huge_bt2_ctx_t *         ctx     = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
     H5HF_huge_bt2_filt_dir_rec_t *nrecord = (H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -1118,7 +1084,6 @@ H5HF_huge_bt2_filt_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_dir_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_filt_dir_debug
  *
@@ -1134,15 +1099,14 @@ H5HF_huge_bt2_filt_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
  */
 static herr_t
 H5HF_huge_bt2_filt_dir_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
+                             int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5HF_huge_bt2_filt_dir_rec_t *nrecord = (const H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%a, %Hu, %x, %Hu}\n", indent, "", fwidth, "Record:",
-        nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size);
+    HDfprintf(stream, "%*s%-*s {%a, %Hu, %x, %Hu}\n", indent, "", fwidth, "Record:", nrecord->addr,
+              nrecord->len, nrecord->filter_mask, nrecord->obj_size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_huge_bt2_filt_dir_debug() */
-
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 0d25dbf..a648e84 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -26,48 +26,43 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
-
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Fractal heap format version #'s */
-#define H5HF_HDR_VERSION        0               /* Header */
-#define H5HF_DBLOCK_VERSION     0               /* Direct block */
-#define H5HF_IBLOCK_VERSION     0               /* Indirect block */
+#define H5HF_HDR_VERSION    0 /* Header */
+#define H5HF_DBLOCK_VERSION 0 /* Direct block */
+#define H5HF_IBLOCK_VERSION 0 /* Indirect block */
 
 /* Size of stack buffer for serialized headers */
-#define H5HF_HDR_BUF_SIZE       512
+#define H5HF_HDR_BUF_SIZE 512
 
 /* Size of stack buffer for serialized indirect blocks */
-#define H5HF_IBLOCK_BUF_SIZE    4096
-
+#define H5HF_IBLOCK_BUF_SIZE 4096
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -78,21 +73,23 @@ static herr_t H5HF_dtable_decode(H5F_t *f, const uint8_t **pp, H5HF_dtable_t *dt
 
 /* Metadata cache (H5AC) callbacks */
 static H5HF_hdr_t *H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_hdr_t *hdr, unsigned H5_ATTR_UNUSED * flags_ptr);
+static herr_t H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_hdr_t *hdr,
+                                   unsigned H5_ATTR_UNUSED *flags_ptr);
 static herr_t H5HF_cache_hdr_dest(H5F_t *f, H5HF_hdr_t *hdr);
 static herr_t H5HF_cache_hdr_clear(H5F_t *f, H5HF_hdr_t *hdr, hbool_t destroy);
 static herr_t H5HF_cache_hdr_size(const H5F_t *f, const H5HF_hdr_t *hdr, size_t *size_ptr);
 static H5HF_indirect_t *H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_indirect_t *iblock, unsigned H5_ATTR_UNUSED * flags_ptr);
-static herr_t H5HF_cache_iblock_dest(H5F_t *f, H5HF_indirect_t *iblock);
-static herr_t H5HF_cache_iblock_clear(H5F_t *f, H5HF_indirect_t *iblock, hbool_t destroy);
-static herr_t H5HF_cache_iblock_size(const H5F_t *f, const H5HF_indirect_t *iblock, size_t *size_ptr);
+static herr_t           H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+                                                H5HF_indirect_t *iblock, unsigned H5_ATTR_UNUSED *flags_ptr);
+static herr_t           H5HF_cache_iblock_dest(H5F_t *f, H5HF_indirect_t *iblock);
+static herr_t           H5HF_cache_iblock_clear(H5F_t *f, H5HF_indirect_t *iblock, hbool_t destroy);
+static herr_t         H5HF_cache_iblock_size(const H5F_t *f, const H5HF_indirect_t *iblock, size_t *size_ptr);
 static H5HF_direct_t *H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_direct_t *dblock, unsigned H5_ATTR_UNUSED * flags_ptr);
-static herr_t H5HF_cache_dblock_dest(H5F_t *f, H5HF_direct_t *dblock);
-static herr_t H5HF_cache_dblock_clear(H5F_t *f, H5HF_direct_t *dblock, hbool_t destroy);
-static herr_t H5HF_cache_dblock_size(const H5F_t *f, const H5HF_direct_t *dblock, size_t *size_ptr);
-
+static herr_t         H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+                                              H5HF_direct_t *dblock, unsigned H5_ATTR_UNUSED *flags_ptr);
+static herr_t         H5HF_cache_dblock_dest(H5F_t *f, H5HF_direct_t *dblock);
+static herr_t         H5HF_cache_dblock_clear(H5F_t *f, H5HF_direct_t *dblock, hbool_t destroy);
+static herr_t         H5HF_cache_dblock_size(const H5F_t *f, const H5HF_direct_t *dblock, size_t *size_ptr);
 
 /*********************/
 /* Package Variables */
@@ -128,12 +125,10 @@ const H5AC_class_t H5AC_FHEAP_DBLOCK[1] = {{
     (H5AC_size_func_t)H5HF_cache_dblock_size,
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -141,8 +136,6 @@ const H5AC_class_t H5AC_FHEAP_DBLOCK[1] = {{
 /* Declare a free list to manage heap direct block data to/from disk */
 H5FL_BLK_DEFINE(direct_block);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_decode
  *
@@ -192,7 +185,6 @@ H5HF_dtable_decode(H5F_t *f, const uint8_t **pp, H5HF_dtable_t *dtable)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_dtable_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_encode
  *
@@ -242,7 +234,6 @@ H5HF_dtable_encode(H5F_t *f, uint8_t **pp, const H5HF_dtable_t *dtable)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_dtable_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_hdr_load
  *
@@ -260,17 +251,17 @@ H5HF_dtable_encode(H5F_t *f, uint8_t **pp, const H5HF_dtable_t *dtable)
 static H5HF_hdr_t *
 H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5HF_hdr_t		*hdr = NULL;     /* Fractal heap info */
+    H5HF_hdr_t *         hdr   = NULL; /* Fractal heap info */
     H5HF_hdr_cache_ud_t *udata = (H5HF_hdr_cache_ud_t *)_udata;
-    size_t		size;           /* Header size */
-    H5WB_t              *wb = NULL;     /* Wrapped buffer for header data */
-    uint8_t             hdr_buf[H5HF_HDR_BUF_SIZE]; /* Buffer for header */
-    uint8_t		*buf;           /* Pointer to header buffer */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
-    uint32_t            stored_chksum;  /* Stored metadata checksum value */
-    uint32_t            computed_chksum; /* Computed metadata checksum value */
-    uint8_t             heap_flags;     /* Status flags for heap */
-    H5HF_hdr_t		*ret_value;     /* Return value */
+    size_t               size;                       /* Header size */
+    H5WB_t *             wb = NULL;                  /* Wrapped buffer for header data */
+    uint8_t              hdr_buf[H5HF_HDR_BUF_SIZE]; /* Buffer for header */
+    uint8_t *            buf;                        /* Pointer to header buffer */
+    const uint8_t *      p;                          /* Pointer into raw data buffer */
+    uint32_t             stored_chksum;              /* Stored metadata checksum value */
+    uint32_t             computed_chksum;            /* Computed metadata checksum value */
+    uint8_t              heap_flags;                 /* Status flags for heap */
+    H5HF_hdr_t *         ret_value;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -280,55 +271,55 @@ H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata);
 
     /* Allocate space for the fractal heap data structure */
-    if(NULL == (hdr = H5HF_hdr_alloc(udata->f)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (hdr = H5HF_hdr_alloc(udata->f)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Wrap the local buffer for serialized header info */
-    if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
+    if (NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't wrap buffer")
 
     /* Compute the 'base' size of the fractal heap header on disk */
     size = (size_t)H5HF_HEADER_SIZE(hdr);
 
     /* Get a pointer to a buffer that's large enough for serialized header */
-    if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
+    if (NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
         HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, NULL, "can't get actual buffer")
 
     /* Read header from disk */
-    if(H5F_block_read(f, H5FD_MEM_FHEAP_HDR, addr, size, dxpl_id, buf) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "can't read fractal heap header")
+    if (H5F_block_read(f, H5FD_MEM_FHEAP_HDR, addr, size, dxpl_id, buf) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "can't read fractal heap header")
 
     /* Get temporary pointer to serialized header */
     p = buf;
 
     /* Magic number */
-    if(HDmemcmp(p, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap header signature")
+    if (HDmemcmp(p, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap header signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5HF_HDR_VERSION)
-	HGOTO_ERROR(H5E_HEAP, H5E_VERSION, NULL, "wrong fractal heap header version")
+    if (*p++ != H5HF_HDR_VERSION)
+        HGOTO_ERROR(H5E_HEAP, H5E_VERSION, NULL, "wrong fractal heap header version")
 
     /* General heap information */
-    UINT16DECODE(p, hdr->id_len);               /* Heap ID length */
-    UINT16DECODE(p, hdr->filter_len);           /* I/O filters' encoded length */
+    UINT16DECODE(p, hdr->id_len);     /* Heap ID length */
+    UINT16DECODE(p, hdr->filter_len); /* I/O filters' encoded length */
 
     /* Heap status flags */
     /* (bit 0: "huge" object IDs have wrapped) */
     /* (bit 1: checksum direct blocks) */
-    heap_flags = *p++;
+    heap_flags            = *p++;
     hdr->huge_ids_wrapped = heap_flags & H5HF_HDR_FLAGS_HUGE_ID_WRAPPED;
     hdr->checksum_dblocks = heap_flags & H5HF_HDR_FLAGS_CHECKSUM_DBLOCKS;
 
     /* "Huge" object information */
-    UINT32DECODE(p, hdr->max_man_size);         /* Max. size of "managed" objects */
-    H5F_DECODE_LENGTH(udata->f, p, hdr->huge_next_id); /* Next ID to use for "huge" object */
+    UINT32DECODE(p, hdr->max_man_size);                 /* Max. size of "managed" objects */
+    H5F_DECODE_LENGTH(udata->f, p, hdr->huge_next_id);  /* Next ID to use for "huge" object */
     H5F_addr_decode(udata->f, &p, &hdr->huge_bt2_addr); /* Address of "huge" object tracker B-tree */
 
     /* "Managed" object free space information */
     H5F_DECODE_LENGTH(udata->f, p, hdr->total_man_free); /* Internal free space in managed direct blocks */
-    H5F_addr_decode(udata->f, &p, &hdr->fs_addr);      /* Address of free section header */
+    H5F_addr_decode(udata->f, &p, &hdr->fs_addr);        /* Address of free section header */
 
     /* Heap statistics */
     H5F_DECODE_LENGTH(udata->f, p, hdr->man_size);
@@ -341,7 +332,7 @@ H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     H5F_DECODE_LENGTH(udata->f, p, hdr->tiny_nobjs);
 
     /* Managed objects' doubling-table info */
-    if(H5HF_dtable_decode(hdr->f, &p, &(hdr->man_dtable)) < 0)
+    if (H5HF_dtable_decode(hdr->f, &p, &(hdr->man_dtable)) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTENCODE, NULL, "unable to encode managed obj. doubling table info")
 
     /* Sanity check */
@@ -349,30 +340,32 @@ H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert((size_t)(p - (const uint8_t *)buf) == (size - H5HF_SIZEOF_CHKSUM));
 
     /* Check for I/O filter information to decode */
-    if(hdr->filter_len > 0) {
-        size_t filter_info_off;     /* Offset in header of filter information */
-        size_t filter_info_size;    /* Size of filter information */
-        H5O_pline_t *pline;         /* Pipeline information from the header on disk */
+    if (hdr->filter_len > 0) {
+        size_t       filter_info_off;  /* Offset in header of filter information */
+        size_t       filter_info_size; /* Size of filter information */
+        H5O_pline_t *pline;            /* Pipeline information from the header on disk */
 
         /* Compute the offset of the filter info in the header */
         filter_info_off = (size_t)(p - (const uint8_t *)buf);
 
         /* Compute the size of the extra filter information */
-        filter_info_size = (size_t)(hdr->sizeof_size     /* Size of size for filtered root direct block */
-            + (unsigned)4                       /* Size of filter mask for filtered root direct block */
-            + hdr->filter_len);                 /* Size of encoded I/O filter info */
+        filter_info_size = (size_t)(hdr->sizeof_size /* Size of size for filtered root direct block */
+                                    + (unsigned)4    /* Size of filter mask for filtered root direct block */
+                                    + hdr->filter_len); /* Size of encoded I/O filter info */
 
         /* Compute the heap header's size */
         hdr->heap_size = size + filter_info_size;
 
         /* Re-size current buffer */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, hdr->heap_size)))
+        if (NULL == (buf = (uint8_t *)H5WB_actual(wb, hdr->heap_size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, NULL, "can't get actual buffer")
 
         /* Read in I/O filter information */
         /* (and the checksum) */
-        if(H5F_block_read(f, H5FD_MEM_FHEAP_HDR, (addr + filter_info_off), (filter_info_size + H5HF_SIZEOF_CHKSUM), dxpl_id, (buf + filter_info_off)) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "can't read fractal heap header's I/O pipeline filter info")
+        if (H5F_block_read(f, H5FD_MEM_FHEAP_HDR, (addr + filter_info_off),
+                           (filter_info_size + H5HF_SIZEOF_CHKSUM), dxpl_id, (buf + filter_info_off)) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL,
+                        "can't read fractal heap header's I/O pipeline filter info")
 
         /* Point at correct offset in header for the filter information */
         p = buf + filter_info_off;
@@ -384,12 +377,13 @@ H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
         UINT32DECODE(p, hdr->pline_root_direct_filter_mask);
 
         /* Decode I/O filter information */
-        if(NULL == (pline = (H5O_pline_t *)H5O_msg_decode(hdr->f, udata->dxpl_id, NULL, H5O_PLINE_ID, hdr->filter_len, p)))
+        if (NULL == (pline = (H5O_pline_t *)H5O_msg_decode(hdr->f, udata->dxpl_id, NULL, H5O_PLINE_ID,
+                                                           hdr->filter_len, p)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDECODE, NULL, "can't decode I/O pipeline filters")
         p += hdr->filter_len;
 
         /* Copy the information into the header's I/O pipeline structure */
-        if(NULL == H5O_msg_copy(H5O_PLINE_ID, pline, &(hdr->pline)))
+        if (NULL == H5O_msg_copy(H5O_PLINE_ID, pline, &(hdr->pline)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOPY, NULL, "can't copy I/O filter pipeline")
 
         /* Release the space allocated for the I/O pipeline filters */
@@ -410,28 +404,27 @@ H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert((size_t)(p - (const uint8_t *)buf) == hdr->heap_size);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "incorrect metadata checksum for fractal heap header")
+    if (stored_chksum != computed_chksum)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "incorrect metadata checksum for fractal heap header")
 
     /* Finish initialization of heap header */
-    if(H5HF_hdr_finish_init(hdr) < 0)
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "can't finish initializing shared fractal heap header")
+    if (H5HF_hdr_finish_init(hdr) < 0)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "can't finish initializing shared fractal heap header")
 
     /* Set return value */
     ret_value = hdr;
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
-    if(!ret_value && hdr)
-        if(H5HF_hdr_free(hdr) < 0)
+    if (!ret_value && hdr)
+        if (H5HF_hdr_free(hdr) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, NULL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_hdr_load() */ /*lint !e818 Can't make udata a pointer to const */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_hdr_flush
  *
@@ -446,11 +439,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_hdr_t *hdr, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_hdr_t *hdr,
+                     unsigned H5_ATTR_UNUSED *flags_ptr)
 {
     H5WB_t *wb = NULL;                  /* Wrapped buffer for header data */
     uint8_t hdr_buf[H5HF_HDR_BUF_SIZE]; /* Buffer for header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t  ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -459,25 +453,25 @@ H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5H
     HDassert(H5F_addr_defined(addr));
     HDassert(hdr);
 
-    if(hdr->cache_info.is_dirty) {
-        uint8_t	*buf;           /* Temporary raw data buffer */
-        uint8_t *p;             /* Pointer into raw data buffer */
-        size_t	size;           /* Header size on disk */
-        uint8_t heap_flags;     /* Status flags for heap */
+    if (hdr->cache_info.is_dirty) {
+        uint8_t *buf;             /* Temporary raw data buffer */
+        uint8_t *p;               /* Pointer into raw data buffer */
+        size_t   size;            /* Header size on disk */
+        uint8_t  heap_flags;      /* Status flags for heap */
         uint32_t metadata_chksum; /* Computed metadata checksum value */
 
         /* Set the shared heap header's file context for this operation */
         hdr->f = f;
 
         /* Wrap the local buffer for serialized header info */
-        if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
+        if (NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Compute the size of the heap header on disk */
         size = hdr->heap_size;
 
         /* Get a pointer to a buffer that's large enough for serialized header */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
+        if (NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Get temporary pointer to serialized header */
@@ -491,25 +485,25 @@ H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5H
         *p++ = H5HF_HDR_VERSION;
 
         /* General heap information */
-        UINT16ENCODE(p, hdr->id_len);           /* Heap ID length */
-        UINT16ENCODE(p, hdr->filter_len);       /* I/O filters' encoded length */
+        UINT16ENCODE(p, hdr->id_len);     /* Heap ID length */
+        UINT16ENCODE(p, hdr->filter_len); /* I/O filters' encoded length */
 
         /* Heap status flags */
         /* (bit 0: "huge" object IDs have wrapped) */
         /* (bit 1: checksum direct blocks) */
         heap_flags = 0;
-        heap_flags |= (hdr->huge_ids_wrapped ?  H5HF_HDR_FLAGS_HUGE_ID_WRAPPED : 0);
-        heap_flags |= (hdr->checksum_dblocks ?  H5HF_HDR_FLAGS_CHECKSUM_DBLOCKS : 0);
+        heap_flags |= (hdr->huge_ids_wrapped ? H5HF_HDR_FLAGS_HUGE_ID_WRAPPED : 0);
+        heap_flags |= (hdr->checksum_dblocks ? H5HF_HDR_FLAGS_CHECKSUM_DBLOCKS : 0);
         *p++ = heap_flags;
 
         /* "Huge" object information */
-        UINT32ENCODE(p, hdr->max_man_size);             /* Max. size of "managed" objects */
-        H5F_ENCODE_LENGTH(f, p, hdr->huge_next_id);     /* Next ID to use for "huge" object */
-        H5F_addr_encode(f, &p, hdr->huge_bt2_addr);     /* Address of "huge" object tracker B-tree */
+        UINT32ENCODE(p, hdr->max_man_size);         /* Max. size of "managed" objects */
+        H5F_ENCODE_LENGTH(f, p, hdr->huge_next_id); /* Next ID to use for "huge" object */
+        H5F_addr_encode(f, &p, hdr->huge_bt2_addr); /* Address of "huge" object tracker B-tree */
 
         /* "Managed" object free space information */
-        H5F_ENCODE_LENGTH(f, p, hdr->total_man_free);   /* Internal free space in managed direct blocks */
-        H5F_addr_encode(f, &p, hdr->fs_addr);           /* Address of free section header */
+        H5F_ENCODE_LENGTH(f, p, hdr->total_man_free); /* Internal free space in managed direct blocks */
+        H5F_addr_encode(f, &p, hdr->fs_addr);         /* Address of free section header */
 
         /* Heap statistics */
         H5F_ENCODE_LENGTH(f, p, hdr->man_size);
@@ -522,11 +516,11 @@ H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5H
         H5F_ENCODE_LENGTH(f, p, hdr->tiny_nobjs);
 
         /* Managed objects' doubling-table info */
-        if(H5HF_dtable_encode(hdr->f, &p, &(hdr->man_dtable)) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTENCODE, FAIL, "unable to encode managed obj. doubling table info")
+        if (H5HF_dtable_encode(hdr->f, &p, &(hdr->man_dtable)) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTENCODE, FAIL, "unable to encode managed obj. doubling table info")
 
         /* Check for I/O filter information to encode */
-        if(hdr->filter_len > 0) {
+        if (hdr->filter_len > 0) {
             /* Encode the size of a filtered root direct block */
             H5F_ENCODE_LENGTH(f, p, hdr->pline_root_direct_size);
 
@@ -534,7 +528,7 @@ H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5H
             UINT32ENCODE(p, hdr->pline_root_direct_filter_mask);
 
             /* Encode I/O filter information */
-            if(H5O_msg_encode(hdr->f, H5O_PLINE_ID, FALSE, p, &(hdr->pline)) < 0)
+            if (H5O_msg_encode(hdr->f, H5O_PLINE_ID, FALSE, p, &(hdr->pline)) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTENCODE, FAIL, "can't encode I/O pipeline fiters")
             p += hdr->filter_len;
         } /* end if */
@@ -545,27 +539,26 @@ H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5H
         /* Metadata checksum */
         UINT32ENCODE(p, metadata_chksum);
 
-	/* Write the heap header. */
+        /* Write the heap header. */
         HDassert((size_t)(p - buf) == size);
-	if(H5F_block_write(f, H5FD_MEM_FHEAP_HDR, addr, size, dxpl_id, buf) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFLUSH, FAIL, "unable to save fractal heap header to disk")
+        if (H5F_block_write(f, H5FD_MEM_FHEAP_HDR, addr, size, dxpl_id, buf) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFLUSH, FAIL, "unable to save fractal heap header to disk")
 
-	hdr->cache_info.is_dirty = FALSE;
+        hdr->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5HF_cache_hdr_dest(f, hdr) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap header")
+    if (destroy)
+        if (H5HF_cache_hdr_dest(f, hdr) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap header")
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_cache_hdr_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_hdr_dest
  *
@@ -582,7 +575,7 @@ done:
 static herr_t
 H5HF_cache_hdr_dest(H5F_t *f, H5HF_hdr_t *hdr)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -596,22 +589,22 @@ H5HF_cache_hdr_dest(H5F_t *f, H5HF_hdr_t *hdr)
     HDassert(!hdr->cache_info.free_file_space_on_destroy || H5F_addr_defined(hdr->cache_info.addr));
 
     /* Check for freeing file space for heap header */
-    if(hdr->cache_info.free_file_space_on_destroy) {
+    if (hdr->cache_info.free_file_space_on_destroy) {
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_FHEAP_HDR, H5AC_dxpl_id, hdr->cache_info.addr, (hsize_t)hdr->heap_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_FHEAP_HDR, H5AC_dxpl_id, hdr->cache_info.addr, (hsize_t)hdr->heap_size) <
+            0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap header")
     } /* end if */
 
     /* Free the shared info itself */
-    if(H5HF_hdr_free(hdr) < 0)
+    if (H5HF_hdr_free(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "unable to release fractal heap header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_hdr_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_hdr_clear
  *
@@ -628,7 +621,7 @@ done:
 static herr_t
 H5HF_cache_hdr_clear(H5F_t *f, H5HF_hdr_t *hdr, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -640,15 +633,14 @@ H5HF_cache_hdr_clear(H5F_t *f, H5HF_hdr_t *hdr, hbool_t destroy)
     /* Reset the dirty flag.  */
     hdr->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5HF_cache_hdr_dest(f, hdr) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap header")
+    if (destroy)
+        if (H5HF_cache_hdr_dest(f, hdr) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_hdr_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_hdr_size
  *
@@ -680,7 +672,6 @@ H5HF_cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5HF_hdr_t *hdr, size_t
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_cache_hdr_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_iblock_load
  *
@@ -699,18 +690,18 @@ H5HF_cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5HF_hdr_t *hdr, size_t
 static H5HF_indirect_t *
 H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5HF_hdr_t          *hdr;           /* Shared fractal heap information */
-    H5HF_iblock_cache_ud_t *udata = (H5HF_iblock_cache_ud_t *)_udata; /* user data for callback */
-    H5HF_indirect_t	*iblock = NULL; /* Indirect block info */
-    H5WB_t              *wb = NULL;     /* Wrapped buffer for indirect block data */
-    uint8_t             iblock_buf[H5HF_IBLOCK_BUF_SIZE]; /* Buffer for indirect block */
-    uint8_t		*buf;           /* Temporary buffer */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
-    haddr_t             heap_addr;      /* Address of heap header in the file */
-    uint32_t            stored_chksum;  /* Stored metadata checksum value */
-    uint32_t            computed_chksum; /* Computed metadata checksum value */
-    unsigned            u;              /* Local index variable */
-    H5HF_indirect_t	*ret_value;     /* Return value */
+    H5HF_hdr_t *            hdr;                                       /* Shared fractal heap information */
+    H5HF_iblock_cache_ud_t *udata  = (H5HF_iblock_cache_ud_t *)_udata; /* user data for callback */
+    H5HF_indirect_t *       iblock = NULL;                             /* Indirect block info */
+    H5WB_t *                wb     = NULL;                    /* Wrapped buffer for indirect block data */
+    uint8_t                 iblock_buf[H5HF_IBLOCK_BUF_SIZE]; /* Buffer for indirect block */
+    uint8_t *               buf;                              /* Temporary buffer */
+    const uint8_t *         p;                                /* Pointer into raw data buffer */
+    haddr_t                 heap_addr;                        /* Address of heap header in the file */
+    uint32_t                stored_chksum;                    /* Stored metadata checksum value */
+    uint32_t                computed_chksum;                  /* Computed metadata checksum value */
+    unsigned                u;                                /* Local index variable */
+    H5HF_indirect_t *       ret_value;                        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -720,8 +711,8 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata);
 
     /* Allocate space for the fractal heap indirect block */
-    if(NULL == (iblock = H5FL_CALLOC(H5HF_indirect_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (iblock = H5FL_CALLOC(H5HF_indirect_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Get the pointer to the shared heap header */
     hdr = udata->par_info->hdr;
@@ -731,53 +722,54 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
     /* Share common heap information */
     iblock->hdr = hdr;
-    if(H5HF_hdr_incr(hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared heap header")
+    if (H5HF_hdr_incr(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared heap header")
 
     /* Set block's internal information */
-    iblock->rc = 0;
-    iblock->nrows = *udata->nrows;
+    iblock->rc        = 0;
+    iblock->nrows     = *udata->nrows;
     iblock->nchildren = 0;
 
     /* Wrap the local buffer for serialized indirect block */
-    if(NULL == (wb = H5WB_wrap(iblock_buf, sizeof(iblock_buf))))
+    if (NULL == (wb = H5WB_wrap(iblock_buf, sizeof(iblock_buf))))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't wrap buffer")
 
     /* Compute size of indirect block */
     iblock->size = H5HF_MAN_INDIRECT_SIZE(hdr, iblock->nrows);
 
     /* Get a pointer to a buffer that's large enough for serialized indirect block */
-    if(NULL == (buf = (uint8_t *)H5WB_actual(wb, iblock->size)))
+    if (NULL == (buf = (uint8_t *)H5WB_actual(wb, iblock->size)))
         HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, NULL, "can't get actual buffer")
 
     /* Read indirect block from disk */
-    if(H5F_block_read(f, H5FD_MEM_FHEAP_IBLOCK, addr, iblock->size, dxpl_id, buf) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "can't read fractal heap indirect block")
+    if (H5F_block_read(f, H5FD_MEM_FHEAP_IBLOCK, addr, iblock->size, dxpl_id, buf) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "can't read fractal heap indirect block")
 
     /* Get temporary pointer to serialized indirect block */
     p = buf;
 
     /* Magic number */
-    if(HDmemcmp(p, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap indirect block signature")
+    if (HDmemcmp(p, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap indirect block signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5HF_IBLOCK_VERSION)
-	HGOTO_ERROR(H5E_HEAP, H5E_VERSION, NULL, "wrong fractal heap direct block version")
+    if (*p++ != H5HF_IBLOCK_VERSION)
+        HGOTO_ERROR(H5E_HEAP, H5E_VERSION, NULL, "wrong fractal heap direct block version")
 
     /* Address of heap that owns this block */
     H5F_addr_decode(udata->f, &p, &heap_addr);
-    if(H5F_addr_ne(heap_addr, hdr->heap_addr))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "incorrect heap header address for direct block")
+    if (H5F_addr_ne(heap_addr, hdr->heap_addr))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "incorrect heap header address for direct block")
 
     /* Address of parent block */
-    iblock->parent = udata->par_info->iblock;
+    iblock->parent    = udata->par_info->iblock;
     iblock->par_entry = udata->par_info->entry;
-    if(iblock->parent) {
+    if (iblock->parent) {
         /* Share parent block */
-        if(H5HF_iblock_incr(iblock->parent) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared indirect block")
+        if (H5HF_iblock_incr(iblock->parent) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL,
+                        "can't increment reference count on shared indirect block")
 
         /* Set max. # of rows in this block */
         iblock->max_rows = iblock->nrows;
@@ -792,31 +784,33 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
     /* Allocate & decode child block entry tables */
     HDassert(iblock->nrows > 0);
-    if(NULL == (iblock->ents = H5FL_SEQ_MALLOC(H5HF_indirect_ent_t, (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for direct entries")
-    if(hdr->filter_len > 0) {
-        unsigned dir_rows;      /* Number of direct rows in this indirect block */
+    if (NULL == (iblock->ents = H5FL_SEQ_MALLOC(H5HF_indirect_ent_t,
+                                                (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for direct entries")
+    if (hdr->filter_len > 0) {
+        unsigned dir_rows; /* Number of direct rows in this indirect block */
 
         /* Compute the number of direct rows for this indirect block */
         dir_rows = MIN(iblock->nrows, hdr->man_dtable.max_direct_rows);
 
         /* Allocate indirect block filtered entry array */
-        if(NULL == (iblock->filt_ents = H5FL_SEQ_MALLOC(H5HF_indirect_filt_ent_t, (size_t)(dir_rows * hdr->man_dtable.cparam.width))))
+        if (NULL == (iblock->filt_ents = H5FL_SEQ_MALLOC(H5HF_indirect_filt_ent_t,
+                                                         (size_t)(dir_rows * hdr->man_dtable.cparam.width))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for block entries")
     } /* end if */
     else
         iblock->filt_ents = NULL;
-    for(u = 0; u < (iblock->nrows * hdr->man_dtable.cparam.width); u++) {
+    for (u = 0; u < (iblock->nrows * hdr->man_dtable.cparam.width); u++) {
         /* Decode child block address */
         H5F_addr_decode(udata->f, &p, &(iblock->ents[u].addr));
 
         /* Check for heap with I/O filters */
-        if(hdr->filter_len > 0) {
+        if (hdr->filter_len > 0) {
             /* Sanity check */
             HDassert(iblock->filt_ents);
 
             /* Decode extra information for direct blocks */
-            if(u < (hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width)) {
+            if (u < (hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width)) {
                 /* Size of filtered direct block */
                 H5F_DECODE_LENGTH(udata->f, p, iblock->filt_ents[u].size);
 
@@ -824,23 +818,23 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
                 /* (either both the address & size are defined or both are
                  *  not defined)
                  */
-                HDassert((H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size)
-                    || (!H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size == 0));
+                HDassert((H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size) ||
+                         (!H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size == 0));
 
                 /* I/O filter mask for filtered direct block */
                 UINT32DECODE(p, iblock->filt_ents[u].filter_mask);
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Count child blocks */
-        if(H5F_addr_defined(iblock->ents[u].addr)) {
+        if (H5F_addr_defined(iblock->ents[u].addr)) {
             iblock->nchildren++;
             iblock->max_child = u;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Sanity check */
-    HDassert(iblock->nchildren);        /* indirect blocks w/no children should have been deleted */
+    HDassert(iblock->nchildren); /* indirect blocks w/no children should have been deleted */
 
     /* Compute checksum on indirect block */
     computed_chksum = H5_checksum_metadata(buf, (size_t)(p - (const uint8_t *)buf), 0);
@@ -852,18 +846,20 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert((size_t)(p - (const uint8_t *)buf) == iblock->size);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "incorrect metadata checksum for fractal heap indirect block")
+    if (stored_chksum != computed_chksum)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL,
+                    "incorrect metadata checksum for fractal heap indirect block")
 
     /* Check if we have any indirect block children */
-    if(iblock->nrows > hdr->man_dtable.max_direct_rows) {
-        unsigned indir_rows;      /* Number of indirect rows in this indirect block */
+    if (iblock->nrows > hdr->man_dtable.max_direct_rows) {
+        unsigned indir_rows; /* Number of indirect rows in this indirect block */
 
         /* Compute the number of indirect rows for this indirect block */
         indir_rows = iblock->nrows - hdr->man_dtable.max_direct_rows;
 
         /* Allocate & initialize child indirect block pointer array */
-        if(NULL == (iblock->child_iblocks = H5FL_SEQ_CALLOC(H5HF_indirect_ptr_t, (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
+        if (NULL == (iblock->child_iblocks = H5FL_SEQ_CALLOC(
+                         H5HF_indirect_ptr_t, (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, NULL, "memory allocation failed for block entries")
     } /* end if */
     else
@@ -874,16 +870,15 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
-    if(!ret_value && iblock)
-        if(H5HF_man_iblock_dest(iblock) < 0)
+    if (!ret_value && iblock)
+        if (H5HF_man_iblock_dest(iblock) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, NULL, "unable to destroy fractal heap indirect block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_iblock_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_iblock_flush
  *
@@ -898,11 +893,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_indirect_t *iblock, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_indirect_t *iblock,
+                        unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    H5WB_t      *wb = NULL;             /* Wrapped buffer for indirect block data */
-    uint8_t     iblock_buf[H5HF_IBLOCK_BUF_SIZE]; /* Buffer for indirect block */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5WB_t *wb = NULL;                        /* Wrapped buffer for indirect block data */
+    uint8_t iblock_buf[H5HF_IBLOCK_BUF_SIZE]; /* Buffer for indirect block */
+    herr_t  ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -911,16 +907,16 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
     HDassert(H5F_addr_defined(addr));
     HDassert(iblock);
 
-    if(iblock->cache_info.is_dirty) {
-        H5HF_hdr_t *hdr;                /* Shared fractal heap information */
-        uint8_t	*buf;                   /* Temporary buffer */
-        uint8_t *p;                     /* Pointer into raw data buffer */
+    if (iblock->cache_info.is_dirty) {
+        H5HF_hdr_t *hdr; /* Shared fractal heap information */
+        uint8_t *   buf; /* Temporary buffer */
+        uint8_t *   p;   /* Pointer into raw data buffer */
 #ifndef NDEBUG
-        unsigned nchildren = 0;         /* Track # of children */
-        unsigned max_child = 0;         /* Track max. child entry used */
-#endif /* NDEBUG */
-        uint32_t metadata_chksum;       /* Computed metadata checksum value */
-        size_t u;                       /* Local index variable */
+        unsigned nchildren = 0;   /* Track # of children */
+        unsigned max_child = 0;   /* Track max. child entry used */
+#endif                            /* NDEBUG */
+        uint32_t metadata_chksum; /* Computed metadata checksum value */
+        size_t   u;               /* Local index variable */
 
         /* Get the pointer to the shared heap header */
         hdr = iblock->hdr;
@@ -929,11 +925,11 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
         hdr->f = f;
 
         /* Wrap the local buffer for serialized indirect block */
-        if(NULL == (wb = H5WB_wrap(iblock_buf, sizeof(iblock_buf))))
+        if (NULL == (wb = H5WB_wrap(iblock_buf, sizeof(iblock_buf))))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for serialized indirect block */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, iblock->size)))
+        if (NULL == (buf = (uint8_t *)H5WB_actual(wb, iblock->size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Get temporary pointer to buffer for serialized indirect block */
@@ -953,23 +949,23 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
         UINT64ENCODE_VAR(p, iblock->block_off, hdr->heap_off_size);
 
         /* Encode indirect block-specific fields */
-        for(u = 0; u < (iblock->nrows * hdr->man_dtable.cparam.width); u++) {
+        for (u = 0; u < (iblock->nrows * hdr->man_dtable.cparam.width); u++) {
             /* Encode child block address */
             H5F_addr_encode(f, &p, iblock->ents[u].addr);
 
             /* Check for heap with I/O filters */
-            if(hdr->filter_len > 0) {
+            if (hdr->filter_len > 0) {
                 /* Sanity check */
                 HDassert(iblock->filt_ents);
 
                 /* Encode extra information for direct blocks */
-                if(u < (hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width)) {
+                if (u < (hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width)) {
                     /* Sanity check */
                     /* (either both the address & size are defined or both are
                      *  not defined)
                      */
-                    HDassert((H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size)
-                        || (!H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size == 0));
+                    HDassert((H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size) ||
+                             (!H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size == 0));
 
                     /* Size of filtered direct block */
                     H5F_ENCODE_LENGTH(f, p, iblock->filt_ents[u].size);
@@ -977,17 +973,17 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
                     /* I/O filter mask for filtered direct block */
                     UINT32ENCODE(p, iblock->filt_ents[u].filter_mask);
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
 #ifndef NDEBUG
             /* Count child blocks */
-            if(H5F_addr_defined(iblock->ents[u].addr)) {
+            if (H5F_addr_defined(iblock->ents[u].addr)) {
                 nchildren++;
-                if(u > max_child)
+                if (u > max_child)
                     max_child = u;
             } /* end if */
-#endif /* NDEBUG */
-        } /* end for */
+#endif        /* NDEBUG */
+        }     /* end for */
 
         /* Compute checksum */
         metadata_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
@@ -1003,74 +999,74 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
 #endif /* NDEBUG */
 
         /* Check for needing to re-allocate indirect block from 'temp.' to 'normal' file space */
-        if(H5F_IS_TMP_ADDR(f, addr)) {
+        if (H5F_IS_TMP_ADDR(f, addr)) {
             /* Sanity check */
             HDassert(H5F_addr_eq(iblock->addr, addr));
 
             /* Allocate 'normal' space for the new indirect block on disk */
-            if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
-                HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
+            if (HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
+                HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                            "file allocation failed for fractal heap indirect block")
 
             /* Sanity check */
             HDassert(!H5F_addr_eq(iblock->addr, addr));
 
             /* Let the metadata cache know the block moved */
-            if(H5AC_move_entry(f, H5AC_FHEAP_IBLOCK, iblock->addr, addr) < 0)
+            if (H5AC_move_entry(f, H5AC_FHEAP_IBLOCK, iblock->addr, addr) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move indirect block")
 
             /* Update the internal address for the block */
             iblock->addr = addr;
 
             /* Check for root indirect block */
-            if(NULL == iblock->parent) {
+            if (NULL == iblock->parent) {
                 /* Update information about indirect block's location */
                 hdr->man_dtable.table_addr = addr;
 
                 /* Mark that heap header was modified */
-                if(H5HF_hdr_dirty(hdr) < 0)
+                if (H5HF_hdr_dirty(hdr) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
             } /* end if */
             else {
-                H5HF_indirect_t *par_iblock;    /* Parent indirect block */
-                unsigned par_entry;             /* Entry in parent indirect block */
+                H5HF_indirect_t *par_iblock; /* Parent indirect block */
+                unsigned         par_entry;  /* Entry in parent indirect block */
 
                 /* Get parent information */
                 par_iblock = iblock->parent;
-                par_entry = iblock->par_entry;
+                par_entry  = iblock->par_entry;
 
                 /* Update information about indirect block's location */
                 par_iblock->ents[par_entry].addr = addr;
 
                 /* Mark that parent was modified */
-                if(H5HF_iblock_dirty(par_iblock) < 0)
+                if (H5HF_iblock_dirty(par_iblock) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Indirect block must be in 'normal' file space now */
         HDassert(!H5F_IS_TMP_ADDR(f, addr));
 
-	/* Write the indirect block */
-	if(H5F_block_write(f, H5FD_MEM_FHEAP_IBLOCK, addr, iblock->size, dxpl_id, buf) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFLUSH, FAIL, "unable to save fractal heap indirect block to disk")
+        /* Write the indirect block */
+        if (H5F_block_write(f, H5FD_MEM_FHEAP_IBLOCK, addr, iblock->size, dxpl_id, buf) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFLUSH, FAIL, "unable to save fractal heap indirect block to disk")
 
         /* Reset dirty flags */
-	iblock->cache_info.is_dirty = FALSE;
+        iblock->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5HF_cache_iblock_dest(f, iblock) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap indirect block")
+    if (destroy)
+        if (H5HF_cache_iblock_dest(f, iblock) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap indirect block")
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_cache_iblock_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_iblock_dest
  *
@@ -1087,7 +1083,7 @@ done:
 static herr_t
 H5HF_cache_iblock_dest(H5F_t *f, H5HF_indirect_t *iblock)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1102,26 +1098,26 @@ H5HF_cache_iblock_dest(H5F_t *f, H5HF_indirect_t *iblock)
     HDassert(!iblock->cache_info.free_file_space_on_destroy || H5F_addr_defined(iblock->cache_info.addr));
 
     /* Check for freeing file space for indirect block */
-    if(iblock->cache_info.free_file_space_on_destroy) {
+    if (iblock->cache_info.free_file_space_on_destroy) {
         /* Check if the indirect block is NOT currently allocated in temp. file space */
         /* (temp. file space does not need to be freed) */
-        if(!H5F_IS_TMP_ADDR(f, iblock->cache_info.addr)) {
+        if (!H5F_IS_TMP_ADDR(f, iblock->cache_info.addr)) {
             /* Release the space on disk */
             /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-            if(H5MF_xfree(f, H5FD_MEM_FHEAP_IBLOCK, H5AC_dxpl_id, iblock->cache_info.addr, (hsize_t)iblock->size) < 0)
+            if (H5MF_xfree(f, H5FD_MEM_FHEAP_IBLOCK, H5AC_dxpl_id, iblock->cache_info.addr,
+                           (hsize_t)iblock->size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap indirect block")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Destroy fractal heap indirect block */
-    if(H5HF_man_iblock_dest(iblock) < 0)
+    if (H5HF_man_iblock_dest(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap indirect block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_iblock_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_iblock_clear
  *
@@ -1138,7 +1134,7 @@ done:
 static herr_t
 H5HF_cache_iblock_clear(H5F_t *f, H5HF_indirect_t *iblock, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1150,15 +1146,14 @@ H5HF_cache_iblock_clear(H5F_t *f, H5HF_indirect_t *iblock, hbool_t destroy)
     /* Reset the dirty flag.  */
     iblock->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5HF_cache_iblock_dest(f, iblock) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap indirect block")
+    if (destroy)
+        if (H5HF_cache_iblock_dest(f, iblock) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap indirect block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_iblock_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_iblock_size
  *
@@ -1189,7 +1184,6 @@ H5HF_cache_iblock_size(const H5F_t H5_ATTR_UNUSED *f, const H5HF_indirect_t *ibl
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_cache_iblock_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_dblock_load
  *
@@ -1209,12 +1203,12 @@ static H5HF_direct_t *
 H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
     H5HF_dblock_cache_ud_t *udata = (H5HF_dblock_cache_ud_t *)_udata; /* pointer to user data */
-    H5HF_hdr_t          *hdr;           /* Shared fractal heap information */
-    H5HF_parent_t       *par_info;      /* Pointer to parent information */
-    H5HF_direct_t	*dblock = NULL; /* Direct block info */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
-    haddr_t             heap_addr;      /* Address of heap header in the file */
-    H5HF_direct_t	*ret_value;     /* Return value */
+    H5HF_hdr_t *            hdr;                                      /* Shared fractal heap information */
+    H5HF_parent_t *         par_info;                                 /* Pointer to parent information */
+    H5HF_direct_t *         dblock = NULL;                            /* Direct block info */
+    const uint8_t *         p;                                        /* Pointer into raw data buffer */
+    haddr_t                 heap_addr;                                /* Address of heap header in the file */
+    H5HF_direct_t *         ret_value;                                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1226,42 +1220,42 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata->dblock_size > 0);
 
     /* Allocate space for the fractal heap direct block */
-    if(NULL == (dblock = H5FL_MALLOC(H5HF_direct_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (dblock = H5FL_MALLOC(H5HF_direct_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     HDmemset(&dblock->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Get the pointer to the shared heap header */
     par_info = (H5HF_parent_t *)(&(udata->par_info));
-    hdr = par_info->hdr;
+    hdr      = par_info->hdr;
 
     /* Set the shared heap header's file context for this operation */
     hdr->f = udata->f;
 
     /* Share common heap information */
     dblock->hdr = hdr;
-    if(H5HF_hdr_incr(hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared heap header")
+    if (H5HF_hdr_incr(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared heap header")
 
     /* Set block's internal information */
-    dblock->size = udata->dblock_size;
-    dblock->file_size = 0;
+    dblock->size         = udata->dblock_size;
+    dblock->file_size    = 0;
     dblock->blk_off_size = H5HF_SIZEOF_OFFSET_LEN(dblock->size);
 
     /* Allocate block buffer */
-/* XXX: Change to using free-list factories */
-    if(NULL == (dblock->blk = H5FL_BLK_MALLOC(direct_block, (size_t)dblock->size)))
+    /* XXX: Change to using free-list factories */
+    if (NULL == (dblock->blk = H5FL_BLK_MALLOC(direct_block, (size_t)dblock->size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Check for I/O filters on this heap */
-    if(hdr->filter_len > 0) {
-        H5Z_cb_t filter_cb = {NULL, NULL};  /* Filter callback structure */
-        size_t nbytes;          /* Number of bytes used in buffer, after applying reverse filters */
-        void *read_buf;         /* Pointer to buffer to read in */
-        size_t read_size;       /* Size of filtered direct block to read */
-        unsigned filter_mask;	/* Excluded filters for direct block */
+    if (hdr->filter_len > 0) {
+        H5Z_cb_t filter_cb = {NULL, NULL}; /* Filter callback structure */
+        size_t   nbytes;      /* Number of bytes used in buffer, after applying reverse filters */
+        void *   read_buf;    /* Pointer to buffer to read in */
+        size_t   read_size;   /* Size of filtered direct block to read */
+        unsigned filter_mask; /* Excluded filters for direct block */
 
         /* Check for root direct block */
-        if(par_info->iblock == NULL) {
+        if (par_info->iblock == NULL) {
             /* Sanity check */
             HDassert(H5F_addr_eq(hdr->man_dtable.table_addr, addr));
 
@@ -1277,17 +1271,18 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
         } /* end else */
 
         /* Allocate buffer to perform I/O filtering on */
-        if(NULL == (read_buf = H5MM_malloc(read_size)))
+        if (NULL == (read_buf = H5MM_malloc(read_size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, NULL, "memory allocation failed for pipeline buffer")
 
         /* Read filtered direct block from disk */
-        if(H5F_block_read(f, H5FD_MEM_FHEAP_DBLOCK, addr, read_size, dxpl_id, read_buf) < 0)
+        if (H5F_block_read(f, H5FD_MEM_FHEAP_DBLOCK, addr, read_size, dxpl_id, read_buf) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "can't read fractal heap direct block")
 
         /* Push direct block data through I/O filter pipeline */
-        nbytes = read_size;
+        nbytes      = read_size;
         filter_mask = udata->filter_mask;
-        if(H5Z_pipeline(&(hdr->pline), H5Z_FLAG_REVERSE, &filter_mask, H5Z_ENABLE_EDC, filter_cb, &nbytes, &read_size, &read_buf) < 0)
+        if (H5Z_pipeline(&(hdr->pline), H5Z_FLAG_REVERSE, &filter_mask, H5Z_ENABLE_EDC, filter_cb, &nbytes,
+                         &read_size, &read_buf) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFILTER, NULL, "output pipeline failed")
 
         /* Sanity check */
@@ -1301,7 +1296,7 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     } /* end if */
     else {
         /* Read direct block from disk */
-        if(H5F_block_read(f, H5FD_MEM_FHEAP_DBLOCK, addr, dblock->size, dxpl_id, dblock->blk) < 0)
+        if (H5F_block_read(f, H5FD_MEM_FHEAP_DBLOCK, addr, dblock->size, dxpl_id, dblock->blk) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "can't read fractal heap direct block")
     } /* end else */
 
@@ -1309,35 +1304,36 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     p = dblock->blk;
 
     /* Magic number */
-    if(HDmemcmp(p, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap direct block signature")
+    if (HDmemcmp(p, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap direct block signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5HF_DBLOCK_VERSION)
-	HGOTO_ERROR(H5E_HEAP, H5E_VERSION, NULL, "wrong fractal heap direct block version")
+    if (*p++ != H5HF_DBLOCK_VERSION)
+        HGOTO_ERROR(H5E_HEAP, H5E_VERSION, NULL, "wrong fractal heap direct block version")
 
     /* Address of heap that owns this block (just for file integrity checks) */
     H5F_addr_decode(udata->f, &p, &heap_addr);
-    if(H5F_addr_ne(heap_addr, hdr->heap_addr))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "incorrect heap header address for direct block")
+    if (H5F_addr_ne(heap_addr, hdr->heap_addr))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "incorrect heap header address for direct block")
 
     /* Address of parent block */
-    dblock->parent = par_info->iblock;
+    dblock->parent    = par_info->iblock;
     dblock->par_entry = par_info->entry;
-    if(dblock->parent) {
+    if (dblock->parent) {
         /* Share parent block */
-        if(H5HF_iblock_incr(dblock->parent) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared indirect block")
+        if (H5HF_iblock_incr(dblock->parent) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL,
+                        "can't increment reference count on shared indirect block")
     } /* end if */
 
     /* Offset of heap within the heap's address space */
     UINT64DECODE_VAR(p, dblock->block_off, hdr->heap_off_size);
 
     /* Decode checksum on direct block, if requested */
-    if(hdr->checksum_dblocks) {
-        uint32_t stored_chksum;         /* Metadata checksum value */
-        uint32_t computed_chksum;       /* Computed metadata checksum value */
+    if (hdr->checksum_dblocks) {
+        uint32_t stored_chksum;   /* Metadata checksum value */
+        uint32_t computed_chksum; /* Computed metadata checksum value */
 
         /* Metadata checksum */
         UINT32DECODE(p, stored_chksum);
@@ -1350,8 +1346,9 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
         computed_chksum = H5_checksum_metadata(dblock->blk, dblock->size, 0);
 
         /* Verify checksum */
-        if(stored_chksum != computed_chksum)
-            HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "incorrect metadata checksum for fractal heap direct block")
+        if (stored_chksum != computed_chksum)
+            HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL,
+                        "incorrect metadata checksum for fractal heap direct block")
     } /* end if */
 
     /* Sanity check */
@@ -1361,14 +1358,13 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     ret_value = dblock;
 
 done:
-    if(!ret_value && dblock)
-        if(H5HF_man_dblock_dest(dblock) < 0)
+    if (!ret_value && dblock)
+        if (H5HF_man_dblock_dest(dblock) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, NULL, "unable to destroy fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_dblock_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_dblock_flush
  *
@@ -1383,9 +1379,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_direct_t *dblock, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_direct_t *dblock,
+                        unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1394,12 +1391,13 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
     HDassert(H5F_addr_defined(addr));
     HDassert(dblock);
 
-    if(dblock->cache_info.is_dirty) {
-        H5HF_hdr_t *hdr;        /* Shared fractal heap information */
-        hbool_t at_tmp_addr = H5F_IS_TMP_ADDR(f, addr);     /* Flag to indicate direct block is at temporary address */
-        void *write_buf;        /* Pointer to buffer to write out */
-        size_t write_size;      /* Size of buffer to write out */
-        uint8_t *p;             /* Pointer into raw data buffer */
+    if (dblock->cache_info.is_dirty) {
+        H5HF_hdr_t *hdr; /* Shared fractal heap information */
+        hbool_t     at_tmp_addr =
+            H5F_IS_TMP_ADDR(f, addr); /* Flag to indicate direct block is at temporary address */
+        void *   write_buf;           /* Pointer to buffer to write out */
+        size_t   write_size;          /* Size of buffer to write out */
+        uint8_t *p;                   /* Pointer into raw data buffer */
 
         /* Get the pointer to the shared heap header */
         hdr = dblock->hdr;
@@ -1424,8 +1422,8 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
         UINT64ENCODE_VAR(p, dblock->block_off, hdr->heap_off_size);
 
         /* Metadata checksum */
-        if(hdr->checksum_dblocks) {
-            uint32_t metadata_chksum;       /* Computed metadata checksum value */
+        if (hdr->checksum_dblocks) {
+            uint32_t metadata_chksum; /* Computed metadata checksum value */
 
             /* Clear the checksum field, to compute the checksum */
             HDmemset(p, 0, (size_t)H5HF_SIZEOF_CHKSUM);
@@ -1441,60 +1439,65 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
         HDassert((size_t)(p - dblock->blk) == (size_t)H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr));
 
         /* Check for I/O filters on this heap */
-        if(hdr->filter_len > 0) {
-            H5Z_cb_t filter_cb = {NULL, NULL};  /* Filter callback structure */
-            size_t nbytes;                      /* Number of bytes used */
-            unsigned filter_mask = 0;           /* Filter mask for block */
+        if (hdr->filter_len > 0) {
+            H5Z_cb_t filter_cb = {NULL, NULL}; /* Filter callback structure */
+            size_t   nbytes;                   /* Number of bytes used */
+            unsigned filter_mask = 0;          /* Filter mask for block */
 
             /* Allocate buffer to perform I/O filtering on */
             write_size = dblock->size;
-            if(NULL == (write_buf = H5MM_malloc(write_size)))
+            if (NULL == (write_buf = H5MM_malloc(write_size)))
                 HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for pipeline buffer")
             HDmemcpy(write_buf, dblock->blk, write_size);
 
             /* Push direct block data through I/O filter pipeline */
             nbytes = write_size;
-            if(H5Z_pipeline(&(hdr->pline), 0, &filter_mask, H5Z_ENABLE_EDC, filter_cb, &nbytes, &write_size, &write_buf) < 0)
+            if (H5Z_pipeline(&(hdr->pline), 0, &filter_mask, H5Z_ENABLE_EDC, filter_cb, &nbytes, &write_size,
+                             &write_buf) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "output pipeline failed")
 
             /* Use the compressed number of bytes as the size to write */
             write_size = nbytes;
 
             /* Check for root direct block */
-            if(dblock->parent == NULL) {
-                hbool_t hdr_changed = FALSE;    /* Whether the header information changed */
+            if (dblock->parent == NULL) {
+                hbool_t hdr_changed = FALSE; /* Whether the header information changed */
 
                 /* Sanity check */
                 HDassert(H5F_addr_eq(hdr->man_dtable.table_addr, addr));
                 HDassert(hdr->pline_root_direct_size > 0);
 
                 /* Check if the filter mask changed */
-                if(hdr->pline_root_direct_filter_mask != filter_mask) {
+                if (hdr->pline_root_direct_filter_mask != filter_mask) {
                     hdr->pline_root_direct_filter_mask = filter_mask;
-                    hdr_changed = TRUE;
+                    hdr_changed                        = TRUE;
                 } /* end if */
 
                 /* Check if we need to re-size the block on disk */
-                if(hdr->pline_root_direct_size != write_size || at_tmp_addr) {
+                if (hdr->pline_root_direct_size != write_size || at_tmp_addr) {
                     /* Check if the direct block is NOT currently allocated in temp. file space */
                     /* (temp. file space does not need to be freed) */
-                    if(!at_tmp_addr) {
+                    if (!at_tmp_addr) {
                         /* Release direct block's current disk space */
-                        if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, addr, (hsize_t)hdr->pline_root_direct_size) < 0)
-                            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
+                        if (H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, addr,
+                                       (hsize_t)hdr->pline_root_direct_size) < 0)
+                            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
+                                        "unable to free fractal heap direct block")
                     } /* end if */
 
                     /* Allocate space for the compressed direct block */
-                    if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
-                        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
+                    if (HADDR_UNDEF ==
+                        (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
+                        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                                    "file allocation failed for fractal heap direct block")
 
                     /* Let the metadata cache know, if the block moved */
-                    if(!H5F_addr_eq(hdr->man_dtable.table_addr, addr))
-                        if(H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
+                    if (!H5F_addr_eq(hdr->man_dtable.table_addr, addr))
+                        if (H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
                             HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move direct block")
 
                     /* Update information about compressed direct block's location & size */
-                    hdr->man_dtable.table_addr = addr;
+                    hdr->man_dtable.table_addr  = addr;
                     hdr->pline_root_direct_size = write_size;
 
                     /* Note that heap header was modified */
@@ -1502,50 +1505,54 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
                 } /* end if */
 
                 /* Check if heap header was modified */
-                if(hdr_changed)
-                    if(H5HF_hdr_dirty(hdr) < 0)
+                if (hdr_changed)
+                    if (H5HF_hdr_dirty(hdr) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
             } /* end if */
             else {
-                hbool_t par_changed = FALSE;    /* Whether the parent's information changed */
-                H5HF_indirect_t *par_iblock;    /* Parent indirect block */
-                unsigned par_entry;             /* Entry in parent indirect block */
+                hbool_t          par_changed = FALSE; /* Whether the parent's information changed */
+                H5HF_indirect_t *par_iblock;          /* Parent indirect block */
+                unsigned         par_entry;           /* Entry in parent indirect block */
 
                 /* Get parent information */
                 par_iblock = dblock->parent;
-                par_entry = dblock->par_entry;
+                par_entry  = dblock->par_entry;
 
                 /* Sanity check */
                 HDassert(H5F_addr_eq(par_iblock->ents[par_entry].addr, addr));
                 HDassert(par_iblock->filt_ents[par_entry].size > 0);
 
                 /* Check if the filter mask changed */
-                if(par_iblock->filt_ents[par_entry].filter_mask != filter_mask) {
+                if (par_iblock->filt_ents[par_entry].filter_mask != filter_mask) {
                     par_iblock->filt_ents[par_entry].filter_mask = filter_mask;
-                    par_changed = TRUE;
+                    par_changed                                  = TRUE;
                 } /* end if */
 
                 /* Check if we need to re-size the block on disk */
-                if(par_iblock->filt_ents[par_entry].size != write_size || at_tmp_addr) {
+                if (par_iblock->filt_ents[par_entry].size != write_size || at_tmp_addr) {
                     /* Check if the direct block is NOT currently allocated in temp. file space */
                     /* (temp. file space does not need to be freed) */
-                    if(!at_tmp_addr) {
+                    if (!at_tmp_addr) {
                         /* Release direct block's current disk space */
-                        if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, addr, (hsize_t)par_iblock->filt_ents[par_entry].size) < 0)
-                            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
+                        if (H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, addr,
+                                       (hsize_t)par_iblock->filt_ents[par_entry].size) < 0)
+                            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
+                                        "unable to free fractal heap direct block")
                     } /* end if */
 
                     /* Allocate space for the compressed direct block */
-                    if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
-                        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
+                    if (HADDR_UNDEF ==
+                        (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
+                        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                                    "file allocation failed for fractal heap direct block")
 
                     /* Let the metadata cache know, if the block moved */
-                    if(!H5F_addr_eq(par_iblock->ents[par_entry].addr, addr))
-                        if(H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
+                    if (!H5F_addr_eq(par_iblock->ents[par_entry].addr, addr))
+                        if (H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
                             HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move direct block")
 
                     /* Update information about compressed direct block's location & size */
-                    par_iblock->ents[par_entry].addr = addr;
+                    par_iblock->ents[par_entry].addr      = addr;
                     par_iblock->filt_ents[par_entry].size = write_size;
 
                     /* Note that parent was modified */
@@ -1553,95 +1560,98 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
                 } /* end if */
 
                 /* Check if parent was modified */
-                if(par_changed)
-                    if(H5HF_iblock_dirty(par_iblock) < 0)
+                if (par_changed)
+                    if (H5HF_iblock_dirty(par_iblock) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else {
-            write_buf = dblock->blk;
+            write_buf  = dblock->blk;
             write_size = dblock->size;
 
             /* Check for needing to re-allocate direct block from 'temp.' to 'normal' file space */
-            if(at_tmp_addr) {
+            if (at_tmp_addr) {
                 /* Check for root direct block */
-                if(NULL == dblock->parent) {
+                if (NULL == dblock->parent) {
                     /* Sanity check */
                     HDassert(H5F_addr_eq(hdr->man_dtable.table_addr, addr));
 
                     /* Allocate 'normal' space for the direct block */
-                    if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
-                        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
+                    if (HADDR_UNDEF ==
+                        (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
+                        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                                    "file allocation failed for fractal heap direct block")
 
                     /* Sanity check */
                     HDassert(!H5F_addr_eq(hdr->man_dtable.table_addr, addr));
 
                     /* Let the metadata cache know the block moved */
-                    if(H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
+                    if (H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move direct block")
 
                     /* Update information about direct block's location */
                     hdr->man_dtable.table_addr = addr;
 
                     /* Mark that heap header was modified */
-                    if(H5HF_hdr_dirty(hdr) < 0)
+                    if (H5HF_hdr_dirty(hdr) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
                 } /* end if */
                 else {
-                    H5HF_indirect_t *par_iblock;    /* Parent indirect block */
-                    unsigned par_entry;             /* Entry in parent indirect block */
+                    H5HF_indirect_t *par_iblock; /* Parent indirect block */
+                    unsigned         par_entry;  /* Entry in parent indirect block */
 
                     /* Get parent information */
                     par_iblock = dblock->parent;
-                    par_entry = dblock->par_entry;
+                    par_entry  = dblock->par_entry;
 
                     /* Sanity check */
                     HDassert(H5F_addr_eq(par_iblock->ents[par_entry].addr, addr));
 
                     /* Allocate 'normal' space for the direct block */
-                    if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
-                        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
+                    if (HADDR_UNDEF ==
+                        (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
+                        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                                    "file allocation failed for fractal heap direct block")
 
                     /* Sanity check */
                     HDassert(!H5F_addr_eq(par_iblock->ents[par_entry].addr, addr));
 
                     /* Let the metadata cache know the block moved */
-                    if(H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
+                    if (H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move direct block")
 
                     /* Update information about direct block's location */
                     par_iblock->ents[par_entry].addr = addr;
 
                     /* Mark that parent was modified */
-                    if(H5HF_iblock_dirty(par_iblock) < 0)
+                    if (H5HF_iblock_dirty(par_iblock) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
                 } /* end else */
-            } /* end if */
-        } /* end else */
+            }     /* end if */
+        }         /* end else */
 
         /* Direct block must be in 'normal' file space now */
         HDassert(!H5F_IS_TMP_ADDR(f, addr));
 
-	/* Write the direct block */
-	if(H5F_block_write(f, H5FD_MEM_FHEAP_DBLOCK, addr, write_size, dxpl_id, write_buf) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFLUSH, FAIL, "unable to save fractal heap direct block to disk")
+        /* Write the direct block */
+        if (H5F_block_write(f, H5FD_MEM_FHEAP_DBLOCK, addr, write_size, dxpl_id, write_buf) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFLUSH, FAIL, "unable to save fractal heap direct block to disk")
 
         /* Release the write buffer, if it was allocated */
-        if(write_buf != dblock->blk)
+        if (write_buf != dblock->blk)
             H5MM_xfree(write_buf);
 
-	dblock->cache_info.is_dirty = FALSE;
+        dblock->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5HF_cache_dblock_dest(f, dblock) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap direct block")
+    if (destroy)
+        if (H5HF_cache_dblock_dest(f, dblock) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap direct block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_cache_dblock_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_dblock_dest
  *
@@ -1658,7 +1668,7 @@ done:
 static herr_t
 H5HF_cache_dblock_dest(H5F_t *f, H5HF_direct_t *dblock)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1671,29 +1681,29 @@ H5HF_cache_dblock_dest(H5F_t *f, H5HF_direct_t *dblock)
     HDassert(!dblock->cache_info.free_file_space_on_destroy || H5F_addr_defined(dblock->cache_info.addr));
 
     /* Check for freeing file space for direct block */
-    if(dblock->cache_info.free_file_space_on_destroy) {
+    if (dblock->cache_info.free_file_space_on_destroy) {
         /* Sanity check */
         HDassert(dblock->file_size > 0);
 
         /* Check if the direct block is NOT currently allocated in temp. file space */
         /* (temp. file space does not need to be freed) */
-        if(!H5F_IS_TMP_ADDR(f, dblock->cache_info.addr)) {
+        if (!H5F_IS_TMP_ADDR(f, dblock->cache_info.addr)) {
             /* Release the space on disk */
             /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-            if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, H5AC_dxpl_id, dblock->cache_info.addr, dblock->file_size) < 0)
+            if (H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, H5AC_dxpl_id, dblock->cache_info.addr,
+                           dblock->file_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Destroy fractal heap direct block */
-    if(H5HF_man_dblock_dest(dblock) < 0)
+    if (H5HF_man_dblock_dest(dblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap direct block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_dblock_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_dblock_clear
  *
@@ -1710,7 +1720,7 @@ done:
 static herr_t
 H5HF_cache_dblock_clear(H5F_t *f, H5HF_direct_t *dblock, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1722,15 +1732,14 @@ H5HF_cache_dblock_clear(H5F_t *f, H5HF_direct_t *dblock, hbool_t destroy)
     /* Reset the dirty flag.  */
     dblock->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5HF_cache_dblock_dest(f, dblock) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap direct block")
+    if (destroy)
+        if (H5HF_cache_dblock_dest(f, dblock) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap direct block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_cache_dblock_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cache_dblock_size
  *
@@ -1760,4 +1769,3 @@ H5HF_cache_dblock_size(const H5F_t H5_ATTR_UNUSED *f, const H5HF_direct_t *dbloc
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_cache_dblock_size() */
-
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index fecf0b0..ad041f1 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -26,77 +26,69 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
-#define H5HF_DEBUGGING          /* Need access to fractal heap debugging routines */
+#define H5HF_PACKAGE   /*suppress error about including H5HFpkg  */
+#define H5HF_DEBUGGING /* Need access to fractal heap debugging routines */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for direct block debugging iterator callback */
 typedef struct {
-    FILE *stream;               /* Stream for output */
-    int indent;                 /* Indention amount */
-    int fwidth;                 /* Field width mount */
-    haddr_t dblock_addr;        /* Direct block's address */
-    hsize_t dblock_size;        /* Direct block's size */
-    uint8_t *marker;            /* 'Marker' array for free space */
-    size_t sect_count;          /* Number of free space sections in block */
-    size_t amount_free;         /* Amount of free space in block */
+    FILE *   stream;      /* Stream for output */
+    int      indent;      /* Indention amount */
+    int      fwidth;      /* Field width mount */
+    haddr_t  dblock_addr; /* Direct block's address */
+    hsize_t  dblock_size; /* Direct block's size */
+    uint8_t *marker;      /* 'Marker' array for free space */
+    size_t   sect_count;  /* Number of free space sections in block */
+    size_t   amount_free; /* Amount of free space in block */
 } H5HF_debug_iter_ud1_t;
 
 /* User data for free space section iterator callback */
 typedef struct {
-    H5FS_t *fspace;             /* Free space manager */
-    FILE *stream;               /* Stream for output */
-    int indent;                 /* Indention amount */
-    int fwidth;                 /* Field width mount */
+    H5FS_t *fspace; /* Free space manager */
+    FILE *  stream; /* Stream for output */
+    int     indent; /* Indention amount */
+    int     fwidth; /* Field width mount */
 } H5HF_debug_iter_ud2_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static herr_t H5HF_dtable_debug(const H5HF_dtable_t *dtable, FILE *stream,
-    int indent, int fwidth);
-
+static herr_t H5HF_dtable_debug(const H5HF_dtable_t *dtable, FILE *stream, int indent, int fwidth);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_debug
  *
@@ -127,48 +119,34 @@ H5HF_dtable_debug(const H5HF_dtable_t *dtable, FILE *stream, int indent, int fwi
      * Print the values.
      */
     /* Creation parameter values */
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Doubling table width:",
-	      dtable->cparam.width);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Doubling table width:", dtable->cparam.width);
     HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Starting block size:",
-	      dtable->cparam.start_block_size);
+              "Starting block size:", dtable->cparam.start_block_size);
     HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Max. direct block size:",
-	      dtable->cparam.max_direct_size);
+              "Max. direct block size:", dtable->cparam.max_direct_size);
     HDfprintf(stream, "%*s%-*s %u (bits)\n", indent, "", fwidth,
-	      "Max. index size:",
-	      dtable->cparam.max_index);
+              "Max. index size:", dtable->cparam.max_index);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Starting # of rows in root indirect block:",
-	      dtable->cparam.start_root_rows);
+              "Starting # of rows in root indirect block:", dtable->cparam.start_root_rows);
 
     /* Run-time varying parameter values */
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Table's root address:",
-	      dtable->table_addr);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Table's root address:", dtable->table_addr);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Current # of rows in root indirect block:",
-	      dtable->curr_root_rows);
+              "Current # of rows in root indirect block:", dtable->curr_root_rows);
 
     /* Computed values */
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Max. # of rows in root indirect block:",
-	      dtable->max_root_rows);
+              "Max. # of rows in root indirect block:", dtable->max_root_rows);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Max. # of direct rows in any indirect block:",
-	      dtable->max_direct_rows);
+              "Max. # of direct rows in any indirect block:", dtable->max_direct_rows);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "# of bits for IDs in first row:",
-	      dtable->first_row_bits);
+              "# of bits for IDs in first row:", dtable->first_row_bits);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "# of IDs in first row:",
-	      dtable->num_id_first_row);
+              "# of IDs in first row:", dtable->num_id_first_row);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_dtable_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_print
  *
@@ -183,7 +161,8 @@ H5HF_dtable_debug(const H5HF_dtable_t *dtable, FILE *stream, int indent, int fwi
  *-------------------------------------------------------------------------
  */
 void
-H5HF_hdr_print(const H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t dump_internal, FILE *stream, int indent, int fwidth)
+H5HF_hdr_print(const H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t dump_internal, FILE *stream, int indent,
+               int fwidth)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -202,94 +181,66 @@ H5HF_hdr_print(const H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t dump_internal, FILE
      * Print the values.
      */
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Heap is:",
-	      hdr->man_dtable.curr_root_rows > 0 ? "Indirect" : "Direct");
-    HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "Objects stored in 'debugging' format:",
-	      hdr->debug_objs);
+              "Heap is:", hdr->man_dtable.curr_root_rows > 0 ? "Indirect" : "Direct");
     HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "'Write once' flag:",
-	      hdr->write_once);
+              "Objects stored in 'debugging' format:", hdr->debug_objs);
+    HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth, "'Write once' flag:", hdr->write_once);
     HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "'Huge' object IDs have wrapped:",
-	      hdr->huge_ids_wrapped);
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Free space in managed blocks:",
-	      hdr->total_man_free);
+              "'Huge' object IDs have wrapped:", hdr->huge_ids_wrapped);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Managed space data block size:",
-	      hdr->man_size);
+              "Free space in managed blocks:", hdr->total_man_free);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Managed space data block size:", hdr->man_size);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Total managed space allocated:",
-	      hdr->man_alloc_size);
+              "Total managed space allocated:", hdr->man_alloc_size);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Offset of managed space iterator:",
-	      hdr->man_iter_off);
+              "Offset of managed space iterator:", hdr->man_iter_off);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Number of managed objects in heap:",
-	      hdr->man_nobjs);
+              "Number of managed objects in heap:", hdr->man_nobjs);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Address of free space manager for managed blocks:",
-	      hdr->fs_addr);
+              "Address of free space manager for managed blocks:", hdr->fs_addr);
     HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-	      "Max. size of managed object:",
-	      (unsigned long)hdr->max_man_size);
+              "Max. size of managed object:", (unsigned long)hdr->max_man_size);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "'Huge' object space used:", hdr->huge_size);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "'Huge' object space used:",
-	      hdr->huge_size);
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Number of 'huge' objects in heap:",
-	      hdr->huge_nobjs);
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "ID of next 'huge' object:",
-	      hdr->huge_next_id);
+              "Number of 'huge' objects in heap:", hdr->huge_nobjs);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "ID of next 'huge' object:", hdr->huge_next_id);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Address of v2 B-tree for 'huge' objects:",
-	      hdr->huge_bt2_addr);
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "'Tiny' object space used:",
-	      hdr->tiny_size);
+              "Address of v2 B-tree for 'huge' objects:", hdr->huge_bt2_addr);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "'Tiny' object space used:", hdr->tiny_size);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Number of 'tiny' objects in heap:",
-	      hdr->tiny_nobjs);
+              "Number of 'tiny' objects in heap:", hdr->tiny_nobjs);
 
     HDfprintf(stream, "%*sManaged Objects Doubling-Table Info...\n", indent, "");
     H5HF_dtable_debug(&hdr->man_dtable, stream, indent + 3, MAX(0, fwidth - 3));
 
     /* Print information about I/O filters */
-    if(hdr->filter_len > 0) {
+    if (hdr->filter_len > 0) {
         HDfprintf(stream, "%*sI/O filter Info...\n", indent, "");
-        if(hdr->man_dtable.curr_root_rows == 0) {
+        if (hdr->man_dtable.curr_root_rows == 0) {
             HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "Compressed size of root direct block:",
-                      hdr->pline_root_direct_size);
+                      "Compressed size of root direct block:", hdr->pline_root_direct_size);
             HDfprintf(stream, "%*s%-*s %x\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "Filter mask for root direct block:",
-                      hdr->pline_root_direct_filter_mask);
+                      "Filter mask for root direct block:", hdr->pline_root_direct_filter_mask);
         } /* end if */
-        H5O_debug_id(H5O_PLINE_ID, hdr->f, dxpl_id, &(hdr->pline), stream,
-                             indent + 3, MAX(0, fwidth - 3));
+        H5O_debug_id(H5O_PLINE_ID, hdr->f, dxpl_id, &(hdr->pline), stream, indent + 3, MAX(0, fwidth - 3));
     } /* end if */
 
     /* Print internal (runtime) information, if requested */
-    if(dump_internal) {
+    if (dump_internal) {
         HDfprintf(stream, "%*sFractal Heap Header Internal Information:\n", indent, "");
 
         /* Dump root iblock, if there is one */
         HDfprintf(stream, "%*s%-*s %x\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Root indirect block flags:",
-                  hdr->root_iblock_flags);
+                  "Root indirect block flags:", hdr->root_iblock_flags);
         HDfprintf(stream, "%*s%-*s %p\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Root indirect block pointer:",
-                  hdr->root_iblock);
-        if(hdr->root_iblock)
+                  "Root indirect block pointer:", hdr->root_iblock);
+        if (hdr->root_iblock)
             H5HF_iblock_print(hdr->root_iblock, dump_internal, stream, indent + 3, fwidth);
     } /* end if */
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5HF_hdr_print() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_debug
  *
@@ -306,8 +257,8 @@ H5HF_hdr_print(const H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t dump_internal, FILE
 herr_t
 H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    H5HF_hdr_t	*hdr = NULL;             /* Fractal heap header info */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HF_hdr_t *hdr       = NULL;    /* Fractal heap header info */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -321,20 +272,19 @@ H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     HDassert(fwidth >= 0);
 
     /* Load the fractal heap header */
-    if(NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, addr, H5AC_READ)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
+    if (NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, addr, H5AC_READ)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
 
     /* Print the information about the heap's header */
     H5HF_hdr_print(hdr, dxpl_id, FALSE, stream, indent, fwidth);
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dblock_debug_cb
  *
@@ -351,10 +301,10 @@ done:
 static herr_t
 H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
 {
-    H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;       /* Section to dump info */
-    H5HF_debug_iter_ud1_t *udata = (H5HF_debug_iter_ud1_t *)_udata;         /* User data for callbacks */
-    haddr_t sect_start, sect_end;       /* Section's beginning and ending offsets */
-    haddr_t dblock_start, dblock_end;   /* Direct block's beginning and ending offsets */
+    H5HF_free_section_t *  sect  = (H5HF_free_section_t *)_sect;    /* Section to dump info */
+    H5HF_debug_iter_ud1_t *udata = (H5HF_debug_iter_ud1_t *)_udata; /* User data for callbacks */
+    haddr_t                sect_start, sect_end;     /* Section's beginning and ending offsets */
+    haddr_t                dblock_start, dblock_end; /* Direct block's beginning and ending offsets */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -366,27 +316,28 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
 
     /* Set up some local variables, for convenience */
     sect_start = sect->sect_info.addr;
-    sect_end = (sect->sect_info.addr + sect->sect_info.size) - 1;
+    sect_end   = (sect->sect_info.addr + sect->sect_info.size) - 1;
     HDassert(sect_end >= sect_start);
     dblock_start = udata->dblock_addr;
-    dblock_end = (udata->dblock_addr + udata->dblock_size) - 1;
+    dblock_end   = (udata->dblock_addr + udata->dblock_size) - 1;
     HDassert(dblock_end >= dblock_start);
 
     /* Check for overlap between free space section & direct block */
-    if((sect_start <= dblock_end && sect_end >=dblock_start) || /* section within or overlaps w/beginning of direct block*/
-            (sect_start <= dblock_end && sect_end >=dblock_end)) {  /* section overlaps w/end of direct block */
-        char temp_str[32];      /* Temporary string for formatting */
-        size_t start, end;      /* Start & end of the overlapping area */
-        size_t len;             /* Length of the overlapping area */
-        size_t overlap;         /* Track any overlaps */
-        size_t u;               /* Local index variable */
+    if ((sect_start <= dblock_end &&
+         sect_end >= dblock_start) || /* section within or overlaps w/beginning of direct block*/
+        (sect_start <= dblock_end && sect_end >= dblock_end)) { /* section overlaps w/end of direct block */
+        char   temp_str[32];                                    /* Temporary string for formatting */
+        size_t start, end;                                      /* Start & end of the overlapping area */
+        size_t len;                                             /* Length of the overlapping area */
+        size_t overlap;                                         /* Track any overlaps */
+        size_t u;                                               /* Local index variable */
 
         /* Calculate the starting & ending */
-        if(sect_start < dblock_start)
+        if (sect_start < dblock_start)
             start = 0;
         else
             H5_CHECKED_ASSIGN(start, size_t, (sect_start - dblock_start), hsize_t)
-        if(sect_end > dblock_end)
+        if (sect_end > dblock_end)
             H5_CHECKED_ASSIGN(end, size_t, udata->dblock_size, hsize_t)
         else
             H5_CHECKED_ASSIGN(end, size_t, ((sect_end - dblock_start) + 1), hsize_t)
@@ -395,15 +346,14 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
         len = end - start;
 
         HDsnprintf(temp_str, sizeof(temp_str), "Section #%u:", (unsigned)udata->sect_count);
-	HDfprintf(udata->stream, "%*s%-*s %8Zu, %8Zu\n", udata->indent + 3, "", MAX(0, udata->fwidth - 9),
-		temp_str,
-		start, len);
+        HDfprintf(udata->stream, "%*s%-*s %8Zu, %8Zu\n", udata->indent + 3, "", MAX(0, udata->fwidth - 9),
+                  temp_str, start, len);
         udata->sect_count++;
 
         /* Mark this node's free space & check for overlaps w/other sections */
         overlap = 0;
-        for(u = start; u < end; u++) {
-            if(udata->marker[u])
+        for (u = start; u < end; u++) {
+            if (udata->marker[u])
                 overlap++;
             udata->marker[u] = 1;
         } /* end for */
@@ -418,7 +368,6 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_dblock_debug_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dblock_debug
  *
@@ -433,15 +382,15 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
-    int indent, int fwidth, haddr_t hdr_addr, size_t block_size)
+H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                  haddr_t hdr_addr, size_t block_size)
 {
-    H5HF_hdr_t	*hdr = NULL;            /* Fractal heap header info */
+    H5HF_hdr_t *   hdr    = NULL;       /* Fractal heap header info */
     H5HF_direct_t *dblock = NULL;       /* Fractal heap direct block info */
-    size_t	blk_prefix_size;        /* Size of prefix for block */
-    size_t	amount_free;            /* Amount of free space in block */
-    uint8_t	*marker = NULL;         /* Track free space for block */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    size_t         blk_prefix_size;     /* Size of prefix for block */
+    size_t         amount_free;         /* Amount of free space in block */
+    uint8_t *      marker    = NULL;    /* Track free space for block */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -457,14 +406,14 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
     HDassert(block_size > 0);
 
     /* Load the fractal heap header */
-    if(NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, hdr_addr, H5AC_READ)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
+    if (NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, hdr_addr, H5AC_READ)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
 
     /*
      * Load the heap direct block
      */
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, addr, block_size, NULL, 0, H5AC_READ)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap direct block")
+    if (NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, addr, block_size, NULL, 0, H5AC_READ)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap direct block")
 
     /* Print opening message */
     HDfprintf(stream, "%*sFractal Heap Direct Block...\n", indent, "");
@@ -473,65 +422,59 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
      * Print the values.
      */
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Address of fractal heap that owns this block:",
-	      hdr->heap_addr);
+              "Address of fractal heap that owns this block:", hdr->heap_addr);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Offset of direct block in heap:",
-	      dblock->block_off);
+              "Offset of direct block in heap:", dblock->block_off);
     blk_prefix_size = H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of block header:",
-              blk_prefix_size);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of block offsets:",
-	      dblock->blk_off_size);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of block header:", blk_prefix_size);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of block offsets:", dblock->blk_off_size);
 
     /* Allocate space for the free space markers */
-    if(NULL == (marker = (uint8_t *)H5MM_calloc(dblock->size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    if (NULL == (marker = (uint8_t *)H5MM_calloc(dblock->size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the free space information for the heap */
-    if(H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
+    if (H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* If there is a free space manager for the heap, check for sections that overlap this block */
-    if(hdr->fspace) {
-        H5HF_debug_iter_ud1_t udata;        /* User data for callbacks */
+    if (hdr->fspace) {
+        H5HF_debug_iter_ud1_t udata; /* User data for callbacks */
 
         /* Prepare user data for section iteration callback */
-        udata.stream = stream;
-        udata.indent = indent;
-        udata.fwidth = fwidth;
+        udata.stream      = stream;
+        udata.indent      = indent;
+        udata.fwidth      = fwidth;
         udata.dblock_addr = dblock->block_off;
         udata.dblock_size = block_size;
-        udata.marker = marker;
-        udata.sect_count = 0;
+        udata.marker      = marker;
+        udata.sect_count  = 0;
         udata.amount_free = 0;
 
         /* Print header */
         HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
 
         /* Iterate over the free space sections, to detect overlaps with this block */
-        if(H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_dblock_debug_cb, &udata) < 0)
+        if (H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_dblock_debug_cb, &udata) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
 
         /* Close the free space information */
-        if(H5HF_space_close(hdr, dxpl_id) < 0)
+        if (H5HF_space_close(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
 
         /* Keep the amount of space free */
         amount_free = udata.amount_free;
 
         /* Check for no free space */
-        if(amount_free == 0)
+        if (amount_free == 0)
             HDfprintf(stream, "%*s<none>\n", indent + 3, "");
     } /* end if */
     else
         amount_free = 0;
 
-    HDfprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth,
-            "Percent of available space for data used:",
-            ((double)100.0f * (double)((dblock->size - blk_prefix_size) - amount_free) / (double)(dblock->size - blk_prefix_size)));
+    HDfprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth, "Percent of available space for data used:",
+              ((double)100.0f * (double)((dblock->size - blk_prefix_size) - amount_free) /
+               (double)(dblock->size - blk_prefix_size)));
 
     /*
      * Print the data in a VMS-style octal dump.
@@ -539,16 +482,15 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
     H5_buffer_dump(stream, indent, dblock->blk, marker, (size_t)0, dblock->size);
 
 done:
-    if(dblock && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_DBLOCK, addr, dblock, H5AC__NO_FLAGS_SET) < 0)
+    if (dblock && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_DBLOCK, addr, dblock, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap direct block")
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap header")
     H5MM_xfree(marker);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_dblock_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_iblock_print
  *
@@ -563,12 +505,11 @@ done:
  *-------------------------------------------------------------------------
  */
 void
-H5HF_iblock_print(const H5HF_indirect_t *iblock,
-    hbool_t dump_internal, FILE *stream, int indent, int fwidth)
+H5HF_iblock_print(const H5HF_indirect_t *iblock, hbool_t dump_internal, FILE *stream, int indent, int fwidth)
 {
-    const H5HF_hdr_t *hdr;              /* Pointer to heap's header */
-    char temp_str[64];                  /* Temporary string, for formatting */
-    size_t	u, v;                   /* Local index variable */
+    const H5HF_hdr_t *hdr;          /* Pointer to heap's header */
+    char              temp_str[64]; /* Temporary string, for formatting */
+    size_t            u, v;         /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -591,96 +532,79 @@ H5HF_iblock_print(const H5HF_indirect_t *iblock,
      * Print the values.
      */
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Address of fractal heap that owns this block:",
-	      hdr->heap_addr);
+              "Address of fractal heap that owns this block:", hdr->heap_addr);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Offset of indirect block in heap:",
-	      iblock->block_off);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Size of indirect block:",
-	      iblock->size);
+              "Offset of indirect block in heap:", iblock->block_off);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of indirect block:", iblock->size);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Current # of rows:", iblock->nrows);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Max. # of rows:", iblock->max_rows);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Current # of rows:",
-	      iblock->nrows);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Max. # of rows:",
-	      iblock->max_rows);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Max direct block rows:",
-	      hdr->man_dtable.max_direct_rows);
+              "Max direct block rows:", hdr->man_dtable.max_direct_rows);
 
     /* Print the entry tables */
-    if(hdr->filter_len > 0)
+    if (hdr->filter_len > 0)
         HDfprintf(stream, "%*sDirect Block Entries: (address/compressed size/filter mask)\n", indent, "");
     else
         HDfprintf(stream, "%*sDirect Block Entries: (address)\n", indent, "");
-    for(u = 0; u < hdr->man_dtable.max_direct_rows && u < iblock->nrows; u++) {
-        HDsnprintf(temp_str, sizeof(temp_str), "Row #%u: (block size: %lu)", (unsigned)u, (unsigned long)hdr->man_dtable.row_block_size[u]);
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-                temp_str);
-        for(v = 0; v < hdr->man_dtable.cparam.width; v++) {
+    for (u = 0; u < hdr->man_dtable.max_direct_rows && u < iblock->nrows; u++) {
+        HDsnprintf(temp_str, sizeof(temp_str), "Row #%u: (block size: %lu)", (unsigned)u,
+                   (unsigned long)hdr->man_dtable.row_block_size[u]);
+        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
+        for (v = 0; v < hdr->man_dtable.cparam.width; v++) {
             size_t off = (u * hdr->man_dtable.cparam.width) + v;
 
             HDsnprintf(temp_str, sizeof(temp_str), "Col #%u:", (unsigned)v);
-            if(hdr->filter_len > 0)
-                HDfprintf(stream, "%*s%-*s %9a/%6Zu/%x\n", indent + 6, "", MAX(0, fwidth - 6),
-                        temp_str,
-                        iblock->ents[off].addr,
-                        iblock->filt_ents[off].size,
-                        iblock->filt_ents[off].filter_mask);
+            if (hdr->filter_len > 0)
+                HDfprintf(stream, "%*s%-*s %9a/%6Zu/%x\n", indent + 6, "", MAX(0, fwidth - 6), temp_str,
+                          iblock->ents[off].addr, iblock->filt_ents[off].size,
+                          iblock->filt_ents[off].filter_mask);
             else
-                HDfprintf(stream, "%*s%-*s %9a\n", indent + 6, "", MAX(0, fwidth - 6),
-                        temp_str,
-                        iblock->ents[off].addr);
+                HDfprintf(stream, "%*s%-*s %9a\n", indent + 6, "", MAX(0, fwidth - 6), temp_str,
+                          iblock->ents[off].addr);
         } /* end for */
-    } /* end for */
+    }     /* end for */
     HDfprintf(stream, "%*sIndirect Block Entries:\n", indent, "");
-    if(iblock->nrows > hdr->man_dtable.max_direct_rows) {
-        unsigned    first_row_bits;         /* Number of bits used bit addresses in first row */
-        unsigned    num_indirect_rows;      /* Number of rows of blocks in each indirect block */
+    if (iblock->nrows > hdr->man_dtable.max_direct_rows) {
+        unsigned first_row_bits;    /* Number of bits used bit addresses in first row */
+        unsigned num_indirect_rows; /* Number of rows of blocks in each indirect block */
 
         first_row_bits = H5VM_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size) +
-                            H5VM_log2_of2(hdr->man_dtable.cparam.width);
-        for(u = hdr->man_dtable.max_direct_rows; u < iblock->nrows; u++) {
+                         H5VM_log2_of2(hdr->man_dtable.cparam.width);
+        for (u = hdr->man_dtable.max_direct_rows; u < iblock->nrows; u++) {
             num_indirect_rows = (H5VM_log2_gen(hdr->man_dtable.row_block_size[u]) - first_row_bits) + 1;
-            HDsnprintf(temp_str, sizeof(temp_str), "Row #%u: (# of rows: %u)", (unsigned)u, num_indirect_rows);
-            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-                    temp_str);
-            for(v = 0; v < hdr->man_dtable.cparam.width; v++) {
+            HDsnprintf(temp_str, sizeof(temp_str), "Row #%u: (# of rows: %u)", (unsigned)u,
+                       num_indirect_rows);
+            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
+            for (v = 0; v < hdr->man_dtable.cparam.width; v++) {
                 size_t off = (u * hdr->man_dtable.cparam.width) + v;
 
                 HDsnprintf(temp_str, sizeof(temp_str), "Col #%u:", (unsigned)v);
-                HDfprintf(stream, "%*s%-*s %9a\n", indent + 6, "", MAX(0, fwidth - 6),
-                        temp_str,
-                        iblock->ents[off].addr);
+                HDfprintf(stream, "%*s%-*s %9a\n", indent + 6, "", MAX(0, fwidth - 6), temp_str,
+                          iblock->ents[off].addr);
             } /* end for */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
     else
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "<none>");
+        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "<none>");
 
     /* Print internal (runtime) information, if requested */
-    if(dump_internal) {
+    if (dump_internal) {
         HDfprintf(stream, "%*sFractal Indirect Block Internal Information:\n", indent, "");
 
         /* Print general information */
         HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Reference count:",
-                  iblock->rc);
+                  "Reference count:", iblock->rc);
 
         /* Print parent's information */
         HDfprintf(stream, "%*s%-*s %p\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Parent indirect block address:",
-                  iblock->parent);
-        if(iblock->parent)
+                  "Parent indirect block address:", iblock->parent);
+        if (iblock->parent)
             H5HF_iblock_print(iblock->parent, TRUE, stream, indent + 6, fwidth);
     } /* end if */
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5HF_iblock_print() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_iblock_debug
  *
@@ -695,13 +619,13 @@ H5HF_iblock_print(const H5HF_indirect_t *iblock,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
-    int indent, int fwidth, haddr_t hdr_addr, unsigned nrows)
+H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                  haddr_t hdr_addr, unsigned nrows)
 {
-    H5HF_hdr_t	*hdr = NULL;            /* Fractal heap header info */
-    H5HF_indirect_t *iblock = NULL;     /* Fractal heap direct block info */
-    hbool_t did_protect;                /* Whether we protected the indirect block or not */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HF_hdr_t *     hdr    = NULL;       /* Fractal heap header info */
+    H5HF_indirect_t *iblock = NULL;       /* Fractal heap direct block info */
+    hbool_t          did_protect;         /* Whether we protected the indirect block or not */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -717,28 +641,28 @@ H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
     HDassert(nrows > 0);
 
     /* Load the fractal heap header */
-    if(NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, hdr_addr, H5AC_READ)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
+    if (NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, hdr_addr, H5AC_READ)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
 
     /*
      * Load the heap indirect block
      */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, addr, nrows, NULL, 0, FALSE, H5AC_READ, &did_protect)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap indirect block")
+    if (NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, addr, nrows, NULL, 0, FALSE, H5AC_READ,
+                                                  &did_protect)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap indirect block")
 
     /* Print the information about the heap's indirect block */
     H5HF_iblock_print(iblock, FALSE, stream, indent, fwidth);
 
 done:
-    if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+    if (iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap direct block")
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_iblock_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sects_debug_cb
  *
@@ -755,9 +679,9 @@ done:
 static herr_t
 H5HF_sects_debug_cb(H5FS_section_info_t *_sect, void *_udata)
 {
-    H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;       /* Section to dump info */
-    H5HF_debug_iter_ud2_t *udata = (H5HF_debug_iter_ud2_t *)_udata;         /* User data for callbacks */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HF_free_section_t *  sect      = (H5HF_free_section_t *)_sect;    /* Section to dump info */
+    H5HF_debug_iter_ud2_t *udata     = (H5HF_debug_iter_ud2_t *)_udata; /* User data for callbacks */
+    herr_t                 ret_value = SUCCEED;                         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -768,32 +692,31 @@ H5HF_sects_debug_cb(H5FS_section_info_t *_sect, void *_udata)
     HDassert(udata);
 
     /* Print generic section information */
-    HDfprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth,
-	      "Section type:",
-	      (sect->sect_info.type == H5HF_FSPACE_SECT_SINGLE ? "single" :
-                  (sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW ? "first row" :
-                  (sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW ? "normal row" : "unknown"))));
+    HDfprintf(
+        udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth, "Section type:",
+        (sect->sect_info.type == H5HF_FSPACE_SECT_SINGLE
+             ? "single"
+             : (sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW
+                    ? "first row"
+                    : (sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW ? "normal row" : "unknown"))));
     HDfprintf(udata->stream, "%*s%-*s %a\n", udata->indent, "", udata->fwidth,
-	      "Section address:",
-	      sect->sect_info.addr);
+              "Section address:", sect->sect_info.addr);
     HDfprintf(udata->stream, "%*s%-*s %Hu\n", udata->indent, "", udata->fwidth,
-	      "Section size:",
-	      sect->sect_info.size);
+              "Section size:", sect->sect_info.size);
 #ifdef QAK
     HDfprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth,
-	      "Section state:",
-	      (sect->sect_info.state == H5FS_SECT_LIVE ? "live" : "serialized"));
+              "Section state:", (sect->sect_info.state == H5FS_SECT_LIVE ? "live" : "serialized"));
 #endif /* QAK */
 
     /* Dump section-specific debugging information */
-    if(H5FS_sect_debug(udata->fspace, _sect, udata->stream, udata->indent + 3, MAX(0, udata->fwidth - 3)) < 0)
+    if (H5FS_sect_debug(udata->fspace, _sect, udata->stream, udata->indent + 3, MAX(0, udata->fwidth - 3)) <
+        0)
         HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't dump section's debugging info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sects_debug_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sects_debug
  *
@@ -808,11 +731,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
-    FILE *stream, int indent, int fwidth)
+H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr, FILE *stream, int indent, int fwidth)
 {
-    H5HF_hdr_t	*hdr = NULL;            /* Fractal heap header info */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HF_hdr_t *hdr       = NULL;    /* Fractal heap header info */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -826,16 +748,16 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
     HDassert(fwidth >= 0);
 
     /* Load the fractal heap header */
-    if(NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, fh_addr, H5AC_READ)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
+    if (NULL == (hdr = H5HF_hdr_protect(f, dxpl_id, fh_addr, H5AC_READ)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
 
     /* Initialize the free space information for the heap */
-    if(H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
+    if (H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* If there is a free space manager for the heap, iterate over them */
-    if(hdr->fspace) {
-        H5HF_debug_iter_ud2_t udata;        /* User data for callbacks */
+    if (hdr->fspace) {
+        H5HF_debug_iter_ud2_t udata; /* User data for callbacks */
 
         /* Prepare user data for section iteration callback */
         udata.fspace = hdr->fspace;
@@ -844,18 +766,17 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
         udata.fwidth = fwidth;
 
         /* Iterate over all the free space sections */
-        if(H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_sects_debug_cb, &udata) < 0)
+        if (H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_sects_debug_cb, &udata) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
 
         /* Close the free space information */
-        if(H5HF_space_close(hdr, dxpl_id) < 0)
+        if (H5HF_space_close(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
     } /* end if */
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if (hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sects_debug() */
-
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c
index 6ac59eb..46be310 100644
--- a/src/H5HFdblock.c
+++ b/src/H5HFdblock.c
@@ -26,38 +26,34 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -65,18 +61,14 @@
 /* Declare a free list to manage the H5HF_direct_t struct */
 H5FL_DEFINE(H5HF_direct_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_dblock_create
  *
@@ -91,14 +83,14 @@ H5FL_DEFINE(H5HF_direct_t);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock,
-    unsigned par_entry, haddr_t *addr_p, H5HF_free_section_t **ret_sec_node)
+H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned par_entry,
+                       haddr_t *addr_p, H5HF_free_section_t **ret_sec_node)
 {
-    H5HF_free_section_t *sec_node; /* Pointer to free space section for block */
-    H5HF_direct_t *dblock = NULL;       /* Pointer to direct block */
-    haddr_t dblock_addr;                /* Direct block's address */
-    size_t free_space;                  /* Free space in new block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sec_node;            /* Pointer to free space section for block */
+    H5HF_direct_t *      dblock = NULL;       /* Pointer to direct block */
+    haddr_t              dblock_addr;         /* Direct block's address */
+    size_t               free_space;          /* Free space in new block */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -110,98 +102,101 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo
     /*
      * Allocate file and memory data structures.
      */
-    if(NULL == (dblock = H5FL_MALLOC(H5HF_direct_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap direct block")
+    if (NULL == (dblock = H5FL_MALLOC(H5HF_direct_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap direct block")
 
     /* Reset the metadata cache info for the heap header */
     HDmemset(&dblock->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Share common heap information */
     dblock->hdr = hdr;
-    if(H5HF_hdr_incr(hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared heap header")
+    if (H5HF_hdr_incr(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared heap header")
 
     /* Set info for direct block */
-    if(par_iblock) {
-        unsigned par_row = par_entry / hdr->man_dtable.cparam.width;    /* Row for block */
+    if (par_iblock) {
+        unsigned par_row = par_entry / hdr->man_dtable.cparam.width; /* Row for block */
 
         /* Compute offset & size, based on parent's information */
         dblock->block_off = par_iblock->block_off;
         dblock->block_off += hdr->man_dtable.row_block_off[par_row];
-        dblock->block_off += hdr->man_dtable.row_block_size[par_row] * (par_entry % hdr->man_dtable.cparam.width);
+        dblock->block_off +=
+            hdr->man_dtable.row_block_size[par_row] * (par_entry % hdr->man_dtable.cparam.width);
         H5_CHECKED_ASSIGN(dblock->size, size_t, hdr->man_dtable.row_block_size[par_row], hsize_t);
     } /* end if */
     else {
         /* Must be the root direct block */
         dblock->block_off = 0;
-        dblock->size = hdr->man_dtable.cparam.start_block_size;
+        dblock->size      = hdr->man_dtable.cparam.start_block_size;
     } /* end else */
-    dblock->file_size = 0;
+    dblock->file_size    = 0;
     dblock->blk_off_size = H5HF_SIZEOF_OFFSET_LEN(dblock->size);
-    free_space = dblock->size - H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
+    free_space           = dblock->size - H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
 
     /* Allocate buffer for block */
-/* XXX: Change to using free-list factories */
-    if((dblock->blk = H5FL_BLK_MALLOC(direct_block, dblock->size)) == NULL)
+    /* XXX: Change to using free-list factories */
+    if ((dblock->blk = H5FL_BLK_MALLOC(direct_block, dblock->size)) == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 #ifdef H5_CLEAR_MEMORY
-HDmemset(dblock->blk, 0, dblock->size);
+    HDmemset(dblock->blk, 0, dblock->size);
 #endif /* H5_CLEAR_MEMORY */
 
     /* Allocate [temporary] space for the direct block on disk */
-    if(H5F_USE_TMP_SPACE(hdr->f)) {
-        if(HADDR_UNDEF == (dblock_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)dblock->size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
+    if (H5F_USE_TMP_SPACE(hdr->f)) {
+        if (HADDR_UNDEF == (dblock_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)dblock->size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                        "file allocation failed for fractal heap direct block")
     } /* end if */
     else {
-        if(HADDR_UNDEF == (dblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)dblock->size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
+        if (HADDR_UNDEF ==
+            (dblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)dblock->size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                        "file allocation failed for fractal heap direct block")
     } /* end else */
 
     /* Attach to parent indirect block, if there is one */
     dblock->parent = par_iblock;
-    if(dblock->parent)
-        if(H5HF_man_iblock_attach(dblock->parent, par_entry, dblock_addr) < 0)
+    if (dblock->parent)
+        if (H5HF_man_iblock_attach(dblock->parent, par_entry, dblock_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't attach direct block to parent indirect block")
     dblock->par_entry = par_entry;
 
     /* Create a new 'single' section for the free space in the block */
-    if(NULL == (sec_node = H5HF_sect_single_new((dblock->block_off + H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr)),
-            free_space, dblock->parent, dblock->par_entry)))
+    if (NULL == (sec_node = H5HF_sect_single_new((dblock->block_off + H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr)),
+                                                 free_space, dblock->parent, dblock->par_entry)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create section for new direct block's free space")
 
     /* Check what to do with section node */
-    if(ret_sec_node)
+    if (ret_sec_node)
         /* Pass back the pointer to the section instead of adding it to the free list */
         *ret_sec_node = sec_node;
     else {
         /* Add new free space to the heap's list of space */
-        if(H5HF_space_add(hdr, dxpl_id, sec_node, 0) < 0)
+        if (H5HF_space_add(hdr, dxpl_id, sec_node, 0) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add direct block free space to global list")
     } /* end else */
 
     /* Cache the new fractal heap direct block */
-    if(H5AC_insert_entry(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap direct block to cache")
+    if (H5AC_insert_entry(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap direct block to cache")
 
     /* Increase the allocated heap size */
-    if(H5HF_hdr_inc_alloc(hdr, dblock->size) < 0)
+    if (H5HF_hdr_inc_alloc(hdr, dblock->size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't increase allocated heap size")
 
     /* Set the address of of direct block, if requested */
-    if(addr_p)
+    if (addr_p)
         *addr_p = dblock_addr;
 
 done:
-    if(ret_value < 0)
-        if(dblock)
-            if(H5HF_man_dblock_dest(dblock) < 0)
+    if (ret_value < 0)
+        if (dblock)
+            if (H5HF_man_dblock_dest(dblock) < 0)
                 HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_dblock_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_dblock_destroy
  *
@@ -220,12 +215,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
-    haddr_t dblock_addr)
+H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock, haddr_t dblock_addr)
 {
-    hsize_t dblock_size;                /* Size of direct block on disk */
-    unsigned cache_flags = H5AC__NO_FLAGS_SET;      /* Flags for unprotecting indirect block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hsize_t  dblock_size;                      /* Size of direct block on disk */
+    unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting indirect block */
+    herr_t   ret_value   = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -236,28 +230,28 @@ H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
     HDassert(dblock);
 
     /* Check for I/O filters on this heap */
-    if(hdr->filter_len > 0) {
+    if (hdr->filter_len > 0) {
         /* Check for root direct block */
-        if(dblock->parent == NULL)
+        if (dblock->parent == NULL)
             /* Get direct block's actual size */
             dblock_size = (hsize_t)hdr->pline_root_direct_size;
         else {
-            H5HF_indirect_t *par_iblock;    /* Parent indirect block */
-            unsigned par_entry;             /* Entry in parent indirect block */
+            H5HF_indirect_t *par_iblock; /* Parent indirect block */
+            unsigned         par_entry;  /* Entry in parent indirect block */
 
             /* Get parent information */
             par_iblock = dblock->parent;
-            par_entry = dblock->par_entry;
+            par_entry  = dblock->par_entry;
 
             /* Get direct block's actual size */
             dblock_size = (hsize_t)par_iblock->filt_ents[par_entry].size;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else
         dblock_size = (hsize_t)dblock->size;
 
     /* Check for root direct block */
-    if(hdr->man_dtable.curr_root_rows == 0) {
+    if (hdr->man_dtable.curr_root_rows == 0) {
         /* Sanity check */
         HDassert(hdr->man_dtable.table_addr == dblock_addr);
         HDassert(hdr->man_dtable.cparam.start_block_size == dblock->size);
@@ -269,7 +263,7 @@ H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
         hdr->man_dtable.table_addr = HADDR_UNDEF;
 
         /* Reset header information back to "empty heap" state */
-        if(H5HF_hdr_empty(hdr) < 0)
+        if (H5HF_hdr_empty(hdr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't make heap empty")
     } /* end if */
     else {
@@ -277,9 +271,9 @@ H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
         hdr->man_alloc_size -= dblock->size;
 
         /* Check for this direct block being the highest in the heap */
-        if((dblock->block_off + dblock->size) == hdr->man_iter_off) {
+        if ((dblock->block_off + dblock->size) == hdr->man_iter_off) {
             /* Move 'next block' iterator backwards (may shrink heap) */
-            if(H5HF_hdr_reverse_iter(hdr, dxpl_id, dblock_addr) < 0)
+            if (H5HF_hdr_reverse_iter(hdr, dxpl_id, dblock_addr) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reverse 'next block' iterator")
         } /* end if */
 #if 0
@@ -298,13 +292,13 @@ H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
 #endif /* 0 */
 
         /* Detach from parent indirect block */
-        if(dblock->parent) {
-            if(H5HF_man_iblock_detach(dblock->parent, dxpl_id, dblock->par_entry) < 0)
+        if (dblock->parent) {
+            if (H5HF_man_iblock_detach(dblock->parent, dxpl_id, dblock->par_entry) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach from parent indirect block");
-            dblock->parent = NULL;
+            dblock->parent    = NULL;
             dblock->par_entry = 0;
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     /* Indicate that the indirect block should be deleted & file space freed */
     dblock->file_size = dblock_size;
@@ -312,13 +306,12 @@ H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
 
 done:
     /* Unprotect the indirect block, with appropriate flags */
-    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, cache_flags) < 0)
+    if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_dblock_destroy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_dblock_new
  *
@@ -334,12 +327,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_dblock_new(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t request,
-    H5HF_free_section_t **ret_sec_node)
+H5HF_man_dblock_new(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t request, H5HF_free_section_t **ret_sec_node)
 {
-    haddr_t dblock_addr;            /* Address of new direct block */
-    size_t min_dblock_size;         /* Min. size of direct block to allocate */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    haddr_t dblock_addr;         /* Address of new direct block */
+    size_t  min_dblock_size;     /* Min. size of direct block to allocate */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -350,7 +342,7 @@ H5HF_man_dblock_new(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t request,
     HDassert(request > 0);
 
     /* Compute the min. size of the direct block needed to fulfill the request */
-    if(request < hdr->man_dtable.cparam.start_block_size)
+    if (request < hdr->man_dtable.cparam.start_block_size)
         min_dblock_size = hdr->man_dtable.cparam.start_block_size;
     else {
         min_dblock_size = ((size_t)1) << (1 + H5VM_log2_gen((uint64_t)request));
@@ -358,57 +350,62 @@ H5HF_man_dblock_new(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t request,
     } /* end else */
 
     /* Adjust the size of block needed to fulfill request, with overhead */
-    if((min_dblock_size - request) < H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr))
+    if ((min_dblock_size - request) < H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr))
         min_dblock_size *= 2;
 
     /* Check if this is the first block in the heap */
-    if(!H5F_addr_defined(hdr->man_dtable.table_addr) &&
-            min_dblock_size == hdr->man_dtable.cparam.start_block_size) {
+    if (!H5F_addr_defined(hdr->man_dtable.table_addr) &&
+        min_dblock_size == hdr->man_dtable.cparam.start_block_size) {
         /* Create new direct block at starting offset */
-        if(H5HF_man_dblock_create(dxpl_id, hdr, NULL, 0, &dblock_addr, ret_sec_node) < 0)
+        if (H5HF_man_dblock_create(dxpl_id, hdr, NULL, 0, &dblock_addr, ret_sec_node) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap direct block")
 
         /* Point root at new direct block */
         hdr->man_dtable.curr_root_rows = 0;
-        hdr->man_dtable.table_addr = dblock_addr;
-        if(hdr->filter_len > 0) {
-            hdr->pline_root_direct_size = hdr->man_dtable.cparam.start_block_size;
+        hdr->man_dtable.table_addr     = dblock_addr;
+        if (hdr->filter_len > 0) {
+            hdr->pline_root_direct_size        = hdr->man_dtable.cparam.start_block_size;
             hdr->pline_root_direct_filter_mask = 0;
         } /* end if */
 
         /* Extend heap to cover new direct block */
-        if(H5HF_hdr_adjust_heap(hdr, (hsize_t)hdr->man_dtable.cparam.start_block_size, (hssize_t)hdr->man_dtable.row_tot_dblock_free[0]) < 0)
+        if (H5HF_hdr_adjust_heap(hdr, (hsize_t)hdr->man_dtable.cparam.start_block_size,
+                                 (hssize_t)hdr->man_dtable.row_tot_dblock_free[0]) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block")
     } /* end if */
     /* Root entry already exists, allocate direct block from root indirect block */
     else {
-        H5HF_indirect_t *iblock;    /* Pointer to indirect block to create */
-        unsigned next_row;          /* Iterator's next block row */
-        unsigned next_entry;        /* Iterator's next block entry */
-        size_t next_size;           /* Size of next direct block to create */
+        H5HF_indirect_t *iblock;     /* Pointer to indirect block to create */
+        unsigned         next_row;   /* Iterator's next block row */
+        unsigned         next_entry; /* Iterator's next block entry */
+        size_t           next_size;  /* Size of next direct block to create */
 
-        /* Update iterator to reflect any previous increments as well as allow for requested direct block size */
-        if(H5HF_hdr_update_iter(hdr, dxpl_id, min_dblock_size) < 0)
+        /* Update iterator to reflect any previous increments as well as allow for requested direct block size
+         */
+        if (H5HF_hdr_update_iter(hdr, dxpl_id, min_dblock_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUPDATE, FAIL, "unable to update block iterator")
 
         /* Retrieve information about current iterator position */
-        if(H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
+        if (H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location")
         HDassert(next_row < iblock->nrows);
         H5_CHECKED_ASSIGN(next_size, size_t, hdr->man_dtable.row_block_size[next_row], hsize_t);
 
         /* Check for skipping over blocks */
-        if(min_dblock_size > next_size) {
-HDfprintf(stderr, "%s: Skipping direct block sizes not supported, min_dblock_size = %Zu, next_size = %Zu\n", FUNC, min_dblock_size, next_size);
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "skipping direct block sizes not supported yet")
+        if (min_dblock_size > next_size) {
+            HDfprintf(
+                stderr,
+                "%s: Skipping direct block sizes not supported, min_dblock_size = %Zu, next_size = %Zu\n",
+                FUNC, min_dblock_size, next_size);
+            HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "skipping direct block sizes not supported yet")
         } /* end if */
 
         /* Advance "next block" iterator to next direct block entry */
-        if(H5HF_hdr_inc_iter(hdr, (hsize_t)next_size, 1) < 0)
+        if (H5HF_hdr_inc_iter(hdr, (hsize_t)next_size, 1) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment 'next block' iterator")
 
         /* Create new direct block at current location*/
-        if(H5HF_man_dblock_create(dxpl_id, hdr, iblock, next_entry, &dblock_addr, ret_sec_node) < 0)
+        if (H5HF_man_dblock_create(dxpl_id, hdr, iblock, next_entry, &dblock_addr, ret_sec_node) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap direct block")
     } /* end else */
 
@@ -416,7 +413,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_dblock_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_dblock_protect
  *
@@ -432,13 +428,12 @@ done:
  *-------------------------------------------------------------------------
  */
 H5HF_direct_t *
-H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
-    size_t dblock_size, H5HF_indirect_t *par_iblock, unsigned par_entry,
-    H5AC_protect_t rw)
+H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, size_t dblock_size,
+                        H5HF_indirect_t *par_iblock, unsigned par_entry, H5AC_protect_t rw)
 {
-    H5HF_direct_t *dblock;      /* Direct block from cache */
-    H5HF_dblock_cache_ud_t udata;	/* parent and other infor for deserializing direct block */
-    H5HF_direct_t *ret_value;   /* Return value */
+    H5HF_direct_t *        dblock;    /* Direct block from cache */
+    H5HF_dblock_cache_ud_t udata;     /* parent and other infor for deserializing direct block */
+    H5HF_direct_t *        ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -450,9 +445,9 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
     HDassert(dblock_size > 0);
 
     /* Set up parent info */
-    udata.par_info.hdr = hdr;
+    udata.par_info.hdr    = hdr;
     udata.par_info.iblock = par_iblock;
-    udata.par_info.entry = par_entry;
+    udata.par_info.entry  = par_entry;
 
     /* set up the file pointer in the user data */
     udata.f = hdr->f;
@@ -463,27 +458,28 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
     /* compute the on disk image size -- observe that odi_size and
      * dblock_size will be identical if there is no filtering.
      */
-    if(hdr->filter_len > 0) {
-        if(par_iblock == NULL) {
-	    udata.odi_size = hdr->pline_root_direct_size;
-	    udata.filter_mask = hdr->pline_root_direct_filter_mask;
-	} /* end if */
+    if (hdr->filter_len > 0) {
+        if (par_iblock == NULL) {
+            udata.odi_size    = hdr->pline_root_direct_size;
+            udata.filter_mask = hdr->pline_root_direct_filter_mask;
+        } /* end if */
         else {
-	    /* Sanity check */
-	    HDassert(H5F_addr_eq(par_iblock->ents[par_entry].addr, dblock_addr));
+            /* Sanity check */
+            HDassert(H5F_addr_eq(par_iblock->ents[par_entry].addr, dblock_addr));
 
-	    /* Set up parameters to read filtered direct block */
-	    udata.odi_size = par_iblock->filt_ents[par_entry].size;
+            /* Set up parameters to read filtered direct block */
+            udata.odi_size    = par_iblock->filt_ents[par_entry].size;
             udata.filter_mask = par_iblock->filt_ents[par_entry].filter_mask;
-	} /* end else */
-    } /* end if */
+        } /* end else */
+    }     /* end if */
     else {
-	udata.odi_size = dblock_size;
+        udata.odi_size    = dblock_size;
         udata.filter_mask = 0;
     } /* end else */
 
     /* Protect the direct block */
-    if(NULL == (dblock = (H5HF_direct_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, &udata, rw)))
+    if (NULL ==
+        (dblock = (H5HF_direct_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, &udata, rw)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap direct block")
 
     /* Set the return value */
@@ -493,7 +489,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_dblock_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_dblock_locate
  *
@@ -508,16 +503,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
-    H5HF_indirect_t **ret_iblock, unsigned *ret_entry, hbool_t *ret_did_protect,
-    H5AC_protect_t rw)
+H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off, H5HF_indirect_t **ret_iblock,
+                       unsigned *ret_entry, hbool_t *ret_did_protect, H5AC_protect_t rw)
 {
-    haddr_t iblock_addr;            /* Indirect block's address */
-    H5HF_indirect_t *iblock;        /* Pointer to indirect block */
-    hbool_t did_protect;            /* Whether we protected the indirect block or not */
-    unsigned row, col;              /* Row & column for object's block */
-    unsigned entry;                 /* Entry of block */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    haddr_t          iblock_addr;         /* Indirect block's address */
+    H5HF_indirect_t *iblock;              /* Pointer to indirect block */
+    hbool_t          did_protect;         /* Whether we protected the indirect block or not */
+    unsigned         row, col;            /* Row & column for object's block */
+    unsigned         entry;               /* Entry of block */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -525,31 +519,32 @@ H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
      * Check arguments.
      */
     HDassert(hdr);
-    HDassert(hdr->man_dtable.curr_root_rows);   /* Only works for heaps with indirect root block */
+    HDassert(hdr->man_dtable.curr_root_rows); /* Only works for heaps with indirect root block */
     HDassert(ret_iblock);
     HDassert(ret_did_protect);
 
     /* Look up row & column for object */
-    if(H5HF_dtable_lookup(&hdr->man_dtable, obj_off, &row, &col) < 0)
+    if (H5HF_dtable_lookup(&hdr->man_dtable, obj_off, &row, &col) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of object")
 
     /* Set initial indirect block info */
     iblock_addr = hdr->man_dtable.table_addr;
 
     /* Lock root indirect block */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, hdr->man_dtable.curr_root_rows, NULL, 0, FALSE, rw, &did_protect)))
+    if (NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, hdr->man_dtable.curr_root_rows,
+                                                  NULL, 0, FALSE, rw, &did_protect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
 
     /* Check for indirect block row */
-    while(row >= hdr->man_dtable.max_direct_rows) {
-        H5HF_indirect_t *new_iblock;   /* Pointer to new indirect block */
-        hbool_t new_did_protect;       /* Whether we protected the indirect block or not */
-        unsigned nrows;                /* Number of rows in new indirect block */
-        unsigned cache_flags = H5AC__NO_FLAGS_SET;      /* Flags for unprotecting parent indirect block */
+    while (row >= hdr->man_dtable.max_direct_rows) {
+        H5HF_indirect_t *new_iblock;      /* Pointer to new indirect block */
+        hbool_t          new_did_protect; /* Whether we protected the indirect block or not */
+        unsigned         nrows;           /* Number of rows in new indirect block */
+        unsigned         cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting parent indirect block */
 
         /* Compute # of rows in child indirect block */
         nrows = (H5VM_log2_gen(hdr->man_dtable.row_block_size[row]) - hdr->man_dtable.first_row_bits) + 1;
-        HDassert(nrows < iblock->nrows);        /* child must be smaller than parent */
+        HDassert(nrows < iblock->nrows); /* child must be smaller than parent */
 
         /* Compute indirect block's entry */
         entry = (row * hdr->man_dtable.cparam.width) + col;
@@ -558,8 +553,8 @@ H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
         iblock_addr = iblock->ents[entry].addr;
 
         /* Check if we need to (re-)create the child indirect block */
-        if(!H5F_addr_defined(iblock_addr)) {
-            if(H5HF_man_iblock_create(hdr, dxpl_id, iblock, entry, nrows, nrows, &iblock_addr) < 0)
+        if (!H5F_addr_defined(iblock_addr)) {
+            if (H5HF_man_iblock_create(hdr, dxpl_id, iblock, entry, nrows, nrows, &iblock_addr) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block")
 
             /* Indicate that the parent indirect block was modified */
@@ -567,34 +562,34 @@ H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
         } /* end if */
 
         /* Lock child indirect block */
-        if(NULL == (new_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, iblock, entry, FALSE, rw, &new_did_protect)))
+        if (NULL == (new_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, iblock, entry,
+                                                          FALSE, rw, &new_did_protect)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
 
         /* Release the current indirect block */
-        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, cache_flags, did_protect) < 0)
+        if (H5HF_man_iblock_unprotect(iblock, dxpl_id, cache_flags, did_protect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
 
         /* Switch variables to use new indirect block */
-        iblock = new_iblock;
+        iblock      = new_iblock;
         did_protect = new_did_protect;
 
         /* Look up row & column in new indirect block for object */
-        if(H5HF_dtable_lookup(&hdr->man_dtable, (obj_off - iblock->block_off), &row, &col) < 0)
+        if (H5HF_dtable_lookup(&hdr->man_dtable, (obj_off - iblock->block_off), &row, &col) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of object")
-        HDassert(row < iblock->nrows);        /* child must be smaller than parent */
-    } /* end while */
+        HDassert(row < iblock->nrows); /* child must be smaller than parent */
+    }                                  /* end while */
 
     /* Set return parameters */
-    if(ret_entry)
+    if (ret_entry)
         *ret_entry = (row * hdr->man_dtable.cparam.width) + col;
-    *ret_iblock = iblock;
+    *ret_iblock      = iblock;
     *ret_did_protect = did_protect;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_dblock_locate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_dblock_delete
  *
@@ -614,11 +609,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr,
-    hsize_t dblock_size)
+H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr, hsize_t dblock_size)
 {
-    unsigned dblock_status = 0;         /* Direct block's status in the metadata cache */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned dblock_status = 0;       /* Direct block's status in the metadata cache */
+    herr_t   ret_value     = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -629,23 +623,23 @@ H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr,
     HDassert(H5F_addr_defined(dblock_addr));
 
     /* Check the direct block's status in the metadata cache */
-    if(H5AC_get_entry_status(f, dblock_addr, &dblock_status) < 0)
+    if (H5AC_get_entry_status(f, dblock_addr, &dblock_status) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for direct block")
 
     /* If the direct block is in the cache, expunge it now */
-    if(dblock_status & H5AC_ES__IN_CACHE) {
+    if (dblock_status & H5AC_ES__IN_CACHE) {
         /* Sanity checks on direct block */
         HDassert(!(dblock_status & H5AC_ES__IS_PINNED));
         HDassert(!(dblock_status & H5AC_ES__IS_PROTECTED));
 
         /* Evict the direct block from the metadata cache */
-        if(H5AC_expunge_entry(f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_expunge_entry(f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "unable to remove direct block from cache")
     } /* end if */
 
     /* Check if the direct block is NOT currently allocated in temp. file space */
     /* (temp. file space does not need to be freed) */
-    if(!H5F_IS_TMP_ADDR(f, dblock_addr)) {
+    if (!H5F_IS_TMP_ADDR(f, dblock_addr)) {
         /* Release direct block's disk space */
         /* (XXX: Under the best of circumstances, this block's space in the file
          *          would be freed in the H5AC_expunge_entry() call above (and the
@@ -660,7 +654,7 @@ H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr,
          *          size of each entry in the cache and we can the the
          *          H5AC_expunge_entry() method.  -QAK)
          */
-        if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, dblock_addr, dblock_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, dblock_addr, dblock_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
     } /* end if */
 
@@ -668,7 +662,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_dblock_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_dblock_dest
  *
@@ -685,7 +678,7 @@ done:
 herr_t
 H5HF_man_dblock_dest(H5HF_direct_t *dblock)
 {
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -696,11 +689,12 @@ H5HF_man_dblock_dest(H5HF_direct_t *dblock)
 
     /* Decrement reference count on shared fractal heap info */
     HDassert(dblock->hdr != NULL);
-    if(H5HF_hdr_decr(dblock->hdr) < 0)
+    if (H5HF_hdr_decr(dblock->hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header")
-    if(dblock->parent)
-        if(H5HF_iblock_decr(dblock->parent) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
+    if (dblock->parent)
+        if (H5HF_iblock_decr(dblock->parent) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                        "can't decrement reference count on shared indirect block")
 
     /* Free block's buffer */
     dblock->blk = H5FL_BLK_FREE(direct_block, dblock->blk);
@@ -711,4 +705,3 @@ H5HF_man_dblock_dest(H5HF_direct_t *dblock)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_dblock_dest() */
-
diff --git a/src/H5HFdtable.c b/src/H5HFdtable.c
index 1952a30..8d01eab 100644
--- a/src/H5HFdtable.c
+++ b/src/H5HFdtable.c
@@ -26,53 +26,45 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_init
  *
@@ -89,10 +81,10 @@
 herr_t
 H5HF_dtable_init(H5HF_dtable_t *dtable)
 {
-    hsize_t tmp_block_size;             /* Temporary block size */
-    hsize_t acc_block_off;              /* Accumulated block offset */
-    size_t u;                           /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hsize_t tmp_block_size;      /* Temporary block size */
+    hsize_t acc_block_off;       /* Accumulated block offset */
+    size_t  u;                   /* Local index variable */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -102,30 +94,33 @@ H5HF_dtable_init(H5HF_dtable_t *dtable)
     HDassert(dtable);
 
     /* Compute/cache some values */
-    dtable->start_bits = H5VM_log2_of2((uint32_t)dtable->cparam.start_block_size);
-    dtable->first_row_bits = dtable->start_bits + H5VM_log2_of2(dtable->cparam.width);
-    dtable->max_root_rows = (dtable->cparam.max_index - dtable->first_row_bits) + 1;
-    dtable->max_direct_bits = H5VM_log2_of2((uint32_t)dtable->cparam.max_direct_size);
-    dtable->max_direct_rows = (dtable->max_direct_bits - dtable->start_bits) + 2;
-    dtable->num_id_first_row = dtable->cparam.start_block_size * dtable->cparam.width;
+    dtable->start_bits           = H5VM_log2_of2((uint32_t)dtable->cparam.start_block_size);
+    dtable->first_row_bits       = dtable->start_bits + H5VM_log2_of2(dtable->cparam.width);
+    dtable->max_root_rows        = (dtable->cparam.max_index - dtable->first_row_bits) + 1;
+    dtable->max_direct_bits      = H5VM_log2_of2((uint32_t)dtable->cparam.max_direct_size);
+    dtable->max_direct_rows      = (dtable->max_direct_bits - dtable->start_bits) + 2;
+    dtable->num_id_first_row     = dtable->cparam.start_block_size * dtable->cparam.width;
     dtable->max_dir_blk_off_size = H5HF_SIZEOF_OFFSET_LEN(dtable->cparam.max_direct_size);
 
     /* Build table of block sizes for each row */
-    if(NULL == (dtable->row_block_size = (hsize_t *)H5MM_malloc(dtable->max_root_rows * sizeof(hsize_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create doubling table block size table")
-    if(NULL == (dtable->row_block_off = (hsize_t *)H5MM_malloc(dtable->max_root_rows * sizeof(hsize_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create doubling table block offset table")
-    if(NULL == (dtable->row_tot_dblock_free = (hsize_t *)H5MM_malloc(dtable->max_root_rows * sizeof(hsize_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create doubling table total direct block free space table")
-    if(NULL == (dtable->row_max_dblock_free = (size_t *)H5MM_malloc(dtable->max_root_rows * sizeof(size_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create doubling table max. direct block free space table")
-    tmp_block_size = dtable->cparam.start_block_size;
-    acc_block_off = dtable->cparam.start_block_size * dtable->cparam.width;
+    if (NULL == (dtable->row_block_size = (hsize_t *)H5MM_malloc(dtable->max_root_rows * sizeof(hsize_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create doubling table block size table")
+    if (NULL == (dtable->row_block_off = (hsize_t *)H5MM_malloc(dtable->max_root_rows * sizeof(hsize_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create doubling table block offset table")
+    if (NULL ==
+        (dtable->row_tot_dblock_free = (hsize_t *)H5MM_malloc(dtable->max_root_rows * sizeof(hsize_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "can't create doubling table total direct block free space table")
+    if (NULL == (dtable->row_max_dblock_free = (size_t *)H5MM_malloc(dtable->max_root_rows * sizeof(size_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "can't create doubling table max. direct block free space table")
+    tmp_block_size            = dtable->cparam.start_block_size;
+    acc_block_off             = dtable->cparam.start_block_size * dtable->cparam.width;
     dtable->row_block_size[0] = dtable->cparam.start_block_size;
-    dtable->row_block_off[0] = 0;
-    for(u = 1; u < dtable->max_root_rows; u++) {
+    dtable->row_block_off[0]  = 0;
+    for (u = 1; u < dtable->max_root_rows; u++) {
         dtable->row_block_size[u] = tmp_block_size;
-        dtable->row_block_off[u] = acc_block_off;
+        dtable->row_block_off[u]  = acc_block_off;
         tmp_block_size *= 2;
         acc_block_off *= 2;
     } /* end for */
@@ -134,7 +129,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_dtable_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_lookup
  *
@@ -160,20 +154,20 @@ H5HF_dtable_lookup(const H5HF_dtable_t *dtable, hsize_t off, unsigned *row, unsi
     HDassert(row);
     HDassert(col);
 #ifdef QAK
-HDfprintf(stderr, "%s: off = %Hu\n", "H5HF_dtable_lookup", off);
+    HDfprintf(stderr, "%s: off = %Hu\n", "H5HF_dtable_lookup", off);
 #endif /* QAK */
 
     /* Check for offset in first row */
-    if(off < dtable->num_id_first_row) {
+    if (off < dtable->num_id_first_row) {
         *row = 0;
         H5_CHECKED_ASSIGN(*col, unsigned, (off / dtable->cparam.start_block_size), hsize_t);
     } /* end if */
     else {
-        unsigned high_bit = H5VM_log2_gen(off);  /* Determine the high bit in the offset */
-        hsize_t off_mask = ((hsize_t)1) << high_bit;       /* Compute mask for determining column */
+        unsigned high_bit = H5VM_log2_gen(off);       /* Determine the high bit in the offset */
+        hsize_t  off_mask = ((hsize_t)1) << high_bit; /* Compute mask for determining column */
 
 #ifdef QAK
-HDfprintf(stderr, "%s: high_bit = %u, off_mask = %Hu\n", "H5HF_dtable_lookup", high_bit, off_mask);
+        HDfprintf(stderr, "%s: high_bit = %u, off_mask = %Hu\n", "H5HF_dtable_lookup", high_bit, off_mask);
 #endif /* QAK */
         *row = (high_bit - dtable->first_row_bits) + 1;
         H5_CHECKED_ASSIGN(*col, unsigned, ((off - off_mask) / dtable->row_block_size[*row]), hsize_t);
@@ -182,7 +176,6 @@ HDfprintf(stderr, "%s: high_bit = %u, off_mask = %Hu\n", "H5HF_dtable_lookup", h
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_dtable_lookup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_dest
  *
@@ -221,7 +214,6 @@ H5HF_dtable_dest(H5HF_dtable_t *dtable)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_dtable_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_size_to_row
  *
@@ -238,7 +230,7 @@ H5HF_dtable_dest(H5HF_dtable_t *dtable)
 unsigned
 H5HF_dtable_size_to_row(const H5HF_dtable_t *dtable, size_t block_size)
 {
-    unsigned row;               /* Row where block will fit */
+    unsigned row; /* Row where block will fit */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -247,15 +239,16 @@ H5HF_dtable_size_to_row(const H5HF_dtable_t *dtable, size_t block_size)
      */
     HDassert(dtable);
 
-    if(block_size == dtable->cparam.start_block_size)
+    if (block_size == dtable->cparam.start_block_size)
         row = 0;
     else
-        row = (H5VM_log2_of2((uint32_t)block_size) - H5VM_log2_of2((uint32_t)dtable->cparam.start_block_size)) + 1;
+        row =
+            (H5VM_log2_of2((uint32_t)block_size) - H5VM_log2_of2((uint32_t)dtable->cparam.start_block_size)) +
+            1;
 
     FUNC_LEAVE_NOAPI(row)
 } /* end H5HF_dtable_size_to_row() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_size_to_rows
  *
@@ -272,7 +265,7 @@ H5HF_dtable_size_to_row(const H5HF_dtable_t *dtable, size_t block_size)
 unsigned
 H5HF_dtable_size_to_rows(const H5HF_dtable_t *dtable, hsize_t size)
 {
-    unsigned rows;              /* # of rows required for indirect block */
+    unsigned rows; /* # of rows required for indirect block */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -286,7 +279,6 @@ H5HF_dtable_size_to_rows(const H5HF_dtable_t *dtable, hsize_t size)
     FUNC_LEAVE_NOAPI(rows)
 } /* end H5HF_dtable_size_to_rows() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_dtable_span_size
  *
@@ -301,14 +293,14 @@ H5HF_dtable_size_to_rows(const H5HF_dtable_t *dtable, hsize_t size)
  *-------------------------------------------------------------------------
  */
 hsize_t
-H5HF_dtable_span_size(const H5HF_dtable_t *dtable, unsigned start_row,
-    unsigned start_col, unsigned num_entries)
+H5HF_dtable_span_size(const H5HF_dtable_t *dtable, unsigned start_row, unsigned start_col,
+                      unsigned num_entries)
 {
-    unsigned start_entry;       /* Entry for first block covered */
-    unsigned end_row;           /* Row for last block covered */
-    unsigned end_col;           /* Column for last block covered */
-    unsigned end_entry;         /* Entry for last block covered */
-    hsize_t acc_span_size;      /* Accumulated span size */
+    unsigned start_entry;   /* Entry for first block covered */
+    unsigned end_row;       /* Row for last block covered */
+    unsigned end_col;       /* Column for last block covered */
+    unsigned end_entry;     /* Entry for last block covered */
+    hsize_t  acc_span_size; /* Accumulated span size */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -323,11 +315,13 @@ H5HF_dtable_span_size(const H5HF_dtable_t *dtable, unsigned start_row,
 
     /* Compute ending entry, column & row */
     end_entry = (start_entry + num_entries) - 1;
-    end_row = end_entry / dtable->cparam.width;
-    end_col = end_entry % dtable->cparam.width;
+    end_row   = end_entry / dtable->cparam.width;
+    end_col   = end_entry % dtable->cparam.width;
 #ifdef QAK
-HDfprintf(stderr, "%s: start_row = %u, start_col = %u, start_entry = %u\n", "H5HF_sect_indirect_span_size", start_row, start_col, start_entry);
-HDfprintf(stderr, "%s: end_row = %u, end_col = %u, end_entry = %u\n", "H5HF_sect_indirect_span_size", end_row, end_col, end_entry);
+    HDfprintf(stderr, "%s: start_row = %u, start_col = %u, start_entry = %u\n",
+              "H5HF_sect_indirect_span_size", start_row, start_col, start_entry);
+    HDfprintf(stderr, "%s: end_row = %u, end_col = %u, end_entry = %u\n", "H5HF_sect_indirect_span_size",
+              end_row, end_col, end_entry);
 #endif /* QAK */
 
     /* Initialize accumulated span size */
@@ -336,34 +330,29 @@ HDfprintf(stderr, "%s: end_row = %u, end_col = %u, end_entry = %u\n", "H5HF_sect
     /* Compute span size covered */
 
     /* Check for multi-row span */
-    if(start_row != end_row) {
+    if (start_row != end_row) {
         /* Accomodate partial starting row */
-        if(start_col > 0) {
-            acc_span_size = dtable->row_block_size[start_row] *
-                    (dtable->cparam.width - start_col);
+        if (start_col > 0) {
+            acc_span_size = dtable->row_block_size[start_row] * (dtable->cparam.width - start_col);
             start_row++;
         } /* end if */
 
         /* Accumulate full rows */
-        while(start_row < end_row) {
-            acc_span_size += dtable->row_block_size[start_row] *
-                    dtable->cparam.width;
+        while (start_row < end_row) {
+            acc_span_size += dtable->row_block_size[start_row] * dtable->cparam.width;
             start_row++;
         } /* end while */
 
         /* Accomodate partial ending row */
-        acc_span_size += dtable->row_block_size[start_row] *
-                (end_col + 1);
+        acc_span_size += dtable->row_block_size[start_row] * (end_col + 1);
     } /* end if */
     else {
         /* Span is in same row */
-        acc_span_size = dtable->row_block_size[start_row] *
-                ((end_col - start_col) + 1);
+        acc_span_size = dtable->row_block_size[start_row] * ((end_col - start_col) + 1);
     } /* end else */
 
 #ifdef QAK
-HDfprintf(stderr, "%s: acc_span_size = %Hu\n", "H5HF_dtable_span_size", acc_span_size);
+    HDfprintf(stderr, "%s: acc_span_size = %Hu\n", "H5HF_dtable_span_size", acc_span_size);
 #endif /* QAK */
     FUNC_LEAVE_NOAPI(acc_span_size)
 } /* end H5HF_sect_indirect_span_size() */
-
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 5562d3a..0ddd072 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -26,16 +26,16 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
@@ -56,22 +56,18 @@
 #define H5HF_WIDTH_LIMIT (64 * 1024)
 #endif /* NDEBUG */
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -79,18 +75,14 @@
 /* Declare a free list to manage the H5HF_hdr_t struct */
 H5FL_DEFINE_STATIC(H5HF_hdr_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_alloc
  *
@@ -107,8 +99,8 @@ H5FL_DEFINE_STATIC(H5HF_hdr_t);
 H5HF_hdr_t *
 H5HF_hdr_alloc(H5F_t *f)
 {
-    H5HF_hdr_t *hdr = NULL;          /* Shared fractal heap header */
-    H5HF_hdr_t *ret_value;              /* Return value */
+    H5HF_hdr_t *hdr = NULL; /* Shared fractal heap header */
+    H5HF_hdr_t *ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -118,11 +110,11 @@ H5HF_hdr_alloc(H5F_t *f)
     HDassert(f);
 
     /* Allocate space for the shared information */
-    if(NULL == (hdr = H5FL_CALLOC(H5HF_hdr_t)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "allocation failed for fractal heap shared header")
+    if (NULL == (hdr = H5FL_CALLOC(H5HF_hdr_t)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "allocation failed for fractal heap shared header")
 
     /* Set the internal parameters for the heap */
-    hdr->f = f;
+    hdr->f           = f;
     hdr->sizeof_size = H5F_SIZEOF_SIZE(f);
     hdr->sizeof_addr = H5F_SIZEOF_ADDR(f);
 
@@ -133,7 +125,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_free_space
  *
@@ -151,12 +142,12 @@ done:
 static herr_t
 H5HF_hdr_compute_free_space(H5HF_hdr_t *hdr, unsigned iblock_row)
 {
-    hsize_t acc_heap_size;      /* Accumumated heap space */
-    hsize_t iblock_size;        /* Size of indirect block to calculate for */
-    hsize_t acc_dblock_free;    /* Accumumated direct block free space */
-    size_t max_dblock_free;     /* Max. direct block free space */
-    unsigned curr_row;          /* Current row in block */
-    herr_t ret_value = SUCCEED; /* Return value */
+    hsize_t  acc_heap_size;       /* Accumumated heap space */
+    hsize_t  iblock_size;         /* Size of indirect block to calculate for */
+    hsize_t  acc_dblock_free;     /* Accumumated direct block free space */
+    size_t   max_dblock_free;     /* Max. direct block free space */
+    unsigned curr_row;            /* Current row in block */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -167,17 +158,15 @@ H5HF_hdr_compute_free_space(H5HF_hdr_t *hdr, unsigned iblock_row)
     HDassert(iblock_row >= hdr->man_dtable.max_direct_rows);
 
     /* Set the free space in direct blocks */
-    acc_heap_size = 0;
+    acc_heap_size   = 0;
     acc_dblock_free = 0;
     max_dblock_free = 0;
-    iblock_size = hdr->man_dtable.row_block_size[iblock_row];
-    curr_row = 0;
-    while(acc_heap_size < iblock_size) {
-        acc_heap_size += hdr->man_dtable.row_block_size[curr_row] *
-                hdr->man_dtable.cparam.width;
-        acc_dblock_free += hdr->man_dtable.row_tot_dblock_free[curr_row] *
-                hdr->man_dtable.cparam.width;
-        if(hdr->man_dtable.row_max_dblock_free[curr_row] > max_dblock_free)
+    iblock_size     = hdr->man_dtable.row_block_size[iblock_row];
+    curr_row        = 0;
+    while (acc_heap_size < iblock_size) {
+        acc_heap_size += hdr->man_dtable.row_block_size[curr_row] * hdr->man_dtable.cparam.width;
+        acc_dblock_free += hdr->man_dtable.row_tot_dblock_free[curr_row] * hdr->man_dtable.cparam.width;
+        if (hdr->man_dtable.row_max_dblock_free[curr_row] > max_dblock_free)
             max_dblock_free = hdr->man_dtable.row_max_dblock_free[curr_row];
         curr_row++;
     } /* end while */
@@ -189,7 +178,6 @@ H5HF_hdr_compute_free_space(H5HF_hdr_t *hdr, unsigned iblock_row)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_compute_free_space() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_finish_init_phase1
  *
@@ -206,7 +194,7 @@ H5HF_hdr_compute_free_space(H5HF_hdr_t *hdr, unsigned iblock_row)
 herr_t
 H5HF_hdr_finish_init_phase1(H5HF_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -217,18 +205,17 @@ H5HF_hdr_finish_init_phase1(H5HF_hdr_t *hdr)
 
     /* Compute/cache some values */
     hdr->heap_off_size = (uint8_t)H5HF_SIZEOF_OFFSET_BITS(hdr->man_dtable.cparam.max_index);
-    if(H5HF_dtable_init(&hdr->man_dtable) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize doubling table info")
+    if (H5HF_dtable_init(&hdr->man_dtable) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize doubling table info")
 
     /* Set the size of heap IDs */
-    hdr->heap_len_size = MIN(hdr->man_dtable.max_dir_blk_off_size,
-            H5VM_limit_enc_size((uint64_t)hdr->max_man_size));
+    hdr->heap_len_size =
+        MIN(hdr->man_dtable.max_dir_blk_off_size, H5VM_limit_enc_size((uint64_t)hdr->max_man_size));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_finish_init_phase1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_finish_init_phase2
  *
@@ -245,8 +232,8 @@ done:
 herr_t
 H5HF_hdr_finish_init_phase2(H5HF_hdr_t *hdr)
 {
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -256,34 +243,34 @@ H5HF_hdr_finish_init_phase2(H5HF_hdr_t *hdr)
     HDassert(hdr);
 
     /* Set the free space in direct blocks */
-    for(u = 0; u < hdr->man_dtable.max_root_rows; u++) {
-        if(u < hdr->man_dtable.max_direct_rows) {
-            hdr->man_dtable.row_tot_dblock_free[u] = hdr->man_dtable.row_block_size[u] -
-                    H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
-            H5_CHECKED_ASSIGN(hdr->man_dtable.row_max_dblock_free[u], size_t, hdr->man_dtable.row_tot_dblock_free[u], hsize_t);
+    for (u = 0; u < hdr->man_dtable.max_root_rows; u++) {
+        if (u < hdr->man_dtable.max_direct_rows) {
+            hdr->man_dtable.row_tot_dblock_free[u] =
+                hdr->man_dtable.row_block_size[u] - H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
+            H5_CHECKED_ASSIGN(hdr->man_dtable.row_max_dblock_free[u], size_t,
+                              hdr->man_dtable.row_tot_dblock_free[u], hsize_t);
         } /* end if */
-        else
-            if(H5HF_hdr_compute_free_space(hdr, u) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize direct block free space for indirect block")
+        else if (H5HF_hdr_compute_free_space(hdr, u) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL,
+                        "can't initialize direct block free space for indirect block")
     } /* end for */
 
     /* Initialize the block iterator for searching for free space */
-    if(H5HF_man_iter_init(&hdr->next_block) < 0)
+    if (H5HF_man_iter_init(&hdr->next_block) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize space search block iterator")
 
     /* Initialize the information for tracking 'huge' objects */
-    if(H5HF_huge_init(hdr) < 0)
+    if (H5HF_huge_init(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize info for tracking huge objects")
 
     /* Initialize the information for tracking 'tiny' objects */
-    if(H5HF_tiny_init(hdr) < 0)
+    if (H5HF_tiny_init(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize info for tracking tiny objects")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_finish_init_phase2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_finish_init
  *
@@ -300,7 +287,7 @@ done:
 herr_t
 H5HF_hdr_finish_init(H5HF_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -310,18 +297,17 @@ H5HF_hdr_finish_init(H5HF_hdr_t *hdr)
     HDassert(hdr);
 
     /* First phase of header final initialization */
-    if(H5HF_hdr_finish_init_phase1(hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't finish phase #1 of header final initialization")
+    if (H5HF_hdr_finish_init_phase1(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't finish phase #1 of header final initialization")
 
     /* Second phase of header final initialization */
-    if(H5HF_hdr_finish_init_phase2(hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't finish phase #2 of header final initialization")
+    if (H5HF_hdr_finish_init_phase2(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't finish phase #2 of header final initialization")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_finish_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_create
  *
@@ -338,9 +324,9 @@ done:
 haddr_t
 H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
 {
-    H5HF_hdr_t *hdr = NULL;     /* The new fractal heap header information */
-    size_t dblock_overhead;     /* Direct block's overhead */
-    haddr_t ret_value;          /* Return value */
+    H5HF_hdr_t *hdr = NULL;      /* The new fractal heap header information */
+    size_t      dblock_overhead; /* Direct block's overhead */
+    haddr_t     ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -352,39 +338,40 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
 
 #ifndef NDEBUG
     /* Check for valid parameters */
-    if(cparam->managed.width == 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "width must be greater than zero")
-    if(cparam->managed.width > H5HF_WIDTH_LIMIT)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "width too large")
-    if(!POWER_OF_TWO(cparam->managed.width))
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "width not power of two")
-    if(cparam->managed.start_block_size == 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "starting block size must be greater than zero")
-    if(!POWER_OF_TWO(cparam->managed.start_block_size))
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "starting block size not power of two")
-    if(cparam->managed.max_direct_size == 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. direct block size must be greater than zero")
-    if(cparam->managed.max_direct_size > H5HF_MAX_DIRECT_SIZE_LIMIT)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. direct block size too large")
-    if(!POWER_OF_TWO(cparam->managed.max_direct_size))
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. direct block size not power of two")
-    if(cparam->managed.max_direct_size < cparam->max_man_size)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. direct block size not large enough to hold all managed blocks")
-    if(cparam->managed.max_index == 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. heap size must be greater than zero")
+    if (cparam->managed.width == 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "width must be greater than zero")
+    if (cparam->managed.width > H5HF_WIDTH_LIMIT)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "width too large")
+    if (!POWER_OF_TWO(cparam->managed.width))
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "width not power of two")
+    if (cparam->managed.start_block_size == 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "starting block size must be greater than zero")
+    if (!POWER_OF_TWO(cparam->managed.start_block_size))
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "starting block size not power of two")
+    if (cparam->managed.max_direct_size == 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. direct block size must be greater than zero")
+    if (cparam->managed.max_direct_size > H5HF_MAX_DIRECT_SIZE_LIMIT)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. direct block size too large")
+    if (!POWER_OF_TWO(cparam->managed.max_direct_size))
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. direct block size not power of two")
+    if (cparam->managed.max_direct_size < cparam->max_man_size)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF,
+                    "max. direct block size not large enough to hold all managed blocks")
+    if (cparam->managed.max_index == 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. heap size must be greater than zero")
 #endif /* NDEBUG */
 
     /* Allocate & basic initialization for the shared header */
-    if(NULL == (hdr = H5HF_hdr_alloc(f)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "can't allocate space for shared heap info")
+    if (NULL == (hdr = H5HF_hdr_alloc(f)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "can't allocate space for shared heap info")
 
 #ifndef NDEBUG
-    if(cparam->managed.max_index > (8 * hdr->sizeof_size))
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. heap size too large for file")
+    if (cparam->managed.max_index > (8 * hdr->sizeof_size))
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. heap size too large for file")
 #endif /* NDEBUG */
 
     /* Set the creation parameters for the heap */
-    hdr->max_man_size = cparam->max_man_size;
+    hdr->max_man_size     = cparam->max_man_size;
     hdr->checksum_dblocks = cparam->checksum_dblocks;
     HDmemcpy(&(hdr->man_dtable.cparam), &(cparam->managed), sizeof(H5HF_dtable_cparam_t));
 
@@ -399,46 +386,48 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
 
     /* First phase of header final initialization */
     /* (doesn't need ID length set up) */
-    if(H5HF_hdr_finish_init_phase1(hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "can't finish phase #1 of header final initialization")
+    if (H5HF_hdr_finish_init_phase1(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF,
+                    "can't finish phase #1 of header final initialization")
 
     /* Copy any I/O filter pipeline */
     /* (This code is not in the "finish init phase" routines because those
      *  routines are also called from the cache 'load' callback, and the filter
      *  length is already set in that case (its stored in the header on disk))
      */
-    if(cparam->pline.nused > 0) {
+    if (cparam->pline.nused > 0) {
         /* Check if the filters in the DCPL can be applied to this dataset */
-        if(H5Z_can_apply_direct(&(cparam->pline)) < 0)
+        if (H5Z_can_apply_direct(&(cparam->pline)) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "I/O filters can't operate on this heap")
 
         /* Mark the filters as checked */
         hdr->checked_filters = TRUE;
 
         /* Make the "set local" filter callbacks for this dataset */
-        if(H5Z_set_local_direct(&(cparam->pline)) < 0)
+        if (H5Z_set_local_direct(&(cparam->pline)) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "unable to set local filter parameters")
 
         /* Copy the I/O filter pipeline from the creation parameters to the header */
-        if(NULL == H5O_msg_copy(H5O_PLINE_ID, &(cparam->pline), &(hdr->pline)))
+        if (NULL == H5O_msg_copy(H5O_PLINE_ID, &(cparam->pline), &(hdr->pline)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOPY, HADDR_UNDEF, "can't copy I/O filter pipeline")
 
         /* Pay attention to the latest version flag for the file */
-        if(H5F_USE_LATEST_FORMAT(hdr->f))
+        if (H5F_USE_LATEST_FORMAT(hdr->f))
             /* Set the latest version for the I/O pipeline message */
-            if(H5O_pline_set_latest_version(&(hdr->pline)) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, HADDR_UNDEF, "can't set latest version of I/O filter pipeline")
+            if (H5O_pline_set_latest_version(&(hdr->pline)) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, HADDR_UNDEF,
+                            "can't set latest version of I/O filter pipeline")
 
         /* Compute the I/O filters' encoded size */
-        if(0 == (hdr->filter_len = H5O_msg_raw_size(hdr->f, H5O_PLINE_ID, FALSE, &(hdr->pline))))
+        if (0 == (hdr->filter_len = H5O_msg_raw_size(hdr->f, H5O_PLINE_ID, FALSE, &(hdr->pline))))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGETSIZE, HADDR_UNDEF, "can't get I/O filter pipeline size")
 
         /* Compute size of header on disk */
-        hdr->heap_size = H5HF_HEADER_SIZE(hdr)  /* Base header size */
-            + hdr->sizeof_size                  /* Size of size for filtered root direct block */
-            + 4                                 /* Size of filter mask for filtered root direct block */
-            + hdr->filter_len;                  /* Size of encoded I/O filter info */
-    } /* end if */
+        hdr->heap_size = H5HF_HEADER_SIZE(hdr) /* Base header size */
+                         + hdr->sizeof_size    /* Size of size for filtered root direct block */
+                         + 4                   /* Size of filter mask for filtered root direct block */
+                         + hdr->filter_len;    /* Size of encoded I/O filter info */
+    }                                          /* end if */
     else {
         /* Set size of header on disk */
         hdr->heap_size = H5HF_HEADER_SIZE(hdr);
@@ -452,30 +441,34 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
      *  routines are also called from the cache 'load' callback, and the ID
      *  length is already set in that case (its stored in the header on disk))
      */
-    switch(cparam->id_len) {
-        case 0: /* Set the length of heap IDs to just enough to hold the offset & length of 'normal' objects in the heap */
+    switch (cparam->id_len) {
+        case 0: /* Set the length of heap IDs to just enough to hold the offset & length of 'normal' objects
+                   in the heap */
             hdr->id_len = (unsigned)1 + hdr->heap_off_size + hdr->heap_len_size;
             break;
 
-        case 1: /* Set the length of heap IDs to just enough to hold the information needed to directly access 'huge' objects in the heap */
-            if(hdr->filter_len > 0)
-                hdr->id_len = 1         /* ID flags */
-                    + hdr->sizeof_addr  /* Address of filtered object */
-                    + hdr->sizeof_size  /* Length of filtered object */
-                    + 4                 /* Filter mask for filtered object */
-                    + hdr->sizeof_size; /* Size of de-filtered object in memory */
+        case 1: /* Set the length of heap IDs to just enough to hold the information needed to directly access
+                   'huge' objects in the heap */
+            if (hdr->filter_len > 0)
+                hdr->id_len = 1                   /* ID flags */
+                              + hdr->sizeof_addr  /* Address of filtered object */
+                              + hdr->sizeof_size  /* Length of filtered object */
+                              + 4                 /* Filter mask for filtered object */
+                              + hdr->sizeof_size; /* Size of de-filtered object in memory */
             else
-                hdr->id_len = 1         /* ID flags */
-                    + hdr->sizeof_addr  /* Address of object */
-                    + hdr->sizeof_size; /* Length of object */
+                hdr->id_len = 1                   /* ID flags */
+                              + hdr->sizeof_addr  /* Address of object */
+                              + hdr->sizeof_size; /* Length of object */
             break;
 
-        default:    /* Use the requested size for the heap ID */
+        default: /* Use the requested size for the heap ID */
             /* Check boundaries */
-            if(cparam->id_len < (1 + hdr->heap_off_size + hdr->heap_len_size))
-                HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, HADDR_UNDEF, "ID length not large enough to hold object IDs")
-            else if(cparam->id_len > H5HF_MAX_ID_LEN)
-                HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, HADDR_UNDEF, "ID length too large to store tiny object lengths")
+            if (cparam->id_len < (1 + hdr->heap_off_size + hdr->heap_len_size))
+                HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, HADDR_UNDEF,
+                            "ID length not large enough to hold object IDs")
+            else if (cparam->id_len > H5HF_MAX_ID_LEN)
+                HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, HADDR_UNDEF,
+                            "ID length too large to store tiny object lengths")
 
             /* Use the requested size for the heap ID */
             hdr->id_len = cparam->id_len;
@@ -484,35 +477,36 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
 
     /* Second phase of header final initialization */
     /* (needs ID and filter lengths set up) */
-    if(H5HF_hdr_finish_init_phase2(hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "can't finish phase #2 of header final initialization")
+    if (H5HF_hdr_finish_init_phase2(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF,
+                    "can't finish phase #2 of header final initialization")
 
     /* Extra checking for possible gap between max. direct block size minus
      * overhead and "huge" object size */
     dblock_overhead = H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
-    if((cparam->managed.max_direct_size - dblock_overhead) < cparam->max_man_size)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF, "max. direct block size not large enough to hold all managed blocks")
+    if ((cparam->managed.max_direct_size - dblock_overhead) < cparam->max_man_size)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, HADDR_UNDEF,
+                    "max. direct block size not large enough to hold all managed blocks")
 
     /* Allocate space for the header on disk */
-    if(HADDR_UNDEF == (hdr->heap_addr = H5MF_alloc(f, H5FD_MEM_FHEAP_HDR, dxpl_id, (hsize_t)hdr->heap_size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for fractal heap header")
+    if (HADDR_UNDEF == (hdr->heap_addr = H5MF_alloc(f, H5FD_MEM_FHEAP_HDR, dxpl_id, (hsize_t)hdr->heap_size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for fractal heap header")
 
     /* Cache the new fractal heap header */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, HADDR_UNDEF, "can't add fractal heap header to cache")
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, HADDR_UNDEF, "can't add fractal heap header to cache")
 
     /* Set address of heap header to return */
     ret_value = hdr->heap_addr;
 
 done:
-    if(!H5F_addr_defined(ret_value) && hdr)
-        if(H5HF_hdr_free(hdr) < 0)
+    if (!H5F_addr_defined(ret_value) && hdr)
+        if (H5HF_hdr_free(hdr) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, HADDR_UNDEF, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_protect
  *
@@ -529,9 +523,9 @@ done:
 H5HF_hdr_t *
 H5HF_hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
 {
-    H5HF_hdr_cache_ud_t cache_udata;    /* User-data for callback */
-    H5HF_hdr_t *hdr;                    /* Fractal heap header */
-    H5HF_hdr_t *ret_value;              /* Return value */
+    H5HF_hdr_cache_ud_t cache_udata; /* User-data for callback */
+    H5HF_hdr_t *        hdr;         /* Fractal heap header */
+    H5HF_hdr_t *        ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -540,11 +534,11 @@ H5HF_hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
     HDassert(H5F_addr_defined(addr));
 
     /* Set up userdata for protect call */
-    cache_udata.f = f;
+    cache_udata.f       = f;
     cache_udata.dxpl_id = dxpl_id;
 
     /* Lock the heap header into memory */
-    if(NULL == (hdr = (H5HF_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, addr, &cache_udata, rw)))
+    if (NULL == (hdr = (H5HF_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, addr, &cache_udata, rw)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap header")
 
     /* Set the header's address */
@@ -560,7 +554,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_incr
  *
@@ -577,7 +570,7 @@ done:
 herr_t
 H5HF_hdr_incr(H5HF_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -585,8 +578,8 @@ H5HF_hdr_incr(H5HF_hdr_t *hdr)
     HDassert(hdr);
 
     /* Mark header as un-evictable when a block is depending on it */
-    if(hdr->rc == 0)
-        if(H5AC_pin_protected_entry(hdr) < 0)
+    if (hdr->rc == 0)
+        if (H5AC_pin_protected_entry(hdr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap header")
 
     /* Increment reference count on shared header */
@@ -596,7 +589,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_incr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_decr
  *
@@ -613,7 +605,7 @@ done:
 herr_t
 H5HF_hdr_decr(H5HF_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -625,9 +617,9 @@ H5HF_hdr_decr(H5HF_hdr_t *hdr)
     hdr->rc--;
 
     /* Mark header as evictable again when no child blocks depend on it */
-    if(hdr->rc == 0) {
+    if (hdr->rc == 0) {
         HDassert(hdr->file_rc == 0);
-        if(H5AC_unpin_entry(hdr) < 0)
+        if (H5AC_unpin_entry(hdr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap header")
     } /* end if */
 
@@ -635,7 +627,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_fuse_incr
  *
@@ -663,7 +654,6 @@ H5HF_hdr_fuse_incr(H5HF_hdr_t *hdr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_hdr_fuse_incr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_fuse_decr
  *
@@ -692,7 +682,6 @@ H5HF_hdr_fuse_decr(H5HF_hdr_t *hdr)
     FUNC_LEAVE_NOAPI(hdr->file_rc)
 } /* end H5HF_hdr_fuse_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_dirty
  *
@@ -709,7 +698,7 @@ H5HF_hdr_fuse_decr(H5HF_hdr_t *hdr)
 herr_t
 H5HF_hdr_dirty(H5HF_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -717,20 +706,19 @@ H5HF_hdr_dirty(H5HF_hdr_t *hdr)
     HDassert(hdr);
 
     /* Resize pinned header in cache if I/O filter is present. */
-    if(hdr->filter_len > 0) {
-        if(H5AC_resize_entry(hdr, (size_t)hdr->heap_size) < 0)
+    if (hdr->filter_len > 0) {
+        if (H5AC_resize_entry(hdr, (size_t)hdr->heap_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap header")
     } /* end if */
 
     /* Mark header as dirty in cache */
-    if(H5AC_mark_entry_dirty(hdr) < 0)
+    if (H5AC_mark_entry_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark fractal heap header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_dirty() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_adj_free
  *
@@ -747,7 +735,7 @@ done:
 herr_t
 H5HF_hdr_adj_free(H5HF_hdr_t *hdr, ssize_t amt)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -761,14 +749,13 @@ H5HF_hdr_adj_free(H5HF_hdr_t *hdr, ssize_t amt)
     hdr->total_man_free += amt;
 
     /* Mark heap header as modified */
-    if(H5HF_hdr_dirty(hdr) < 0)
+    if (H5HF_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_adj_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_adjust_heap
  *
@@ -785,7 +772,7 @@ done:
 herr_t
 H5HF_hdr_adjust_heap(H5HF_hdr_t *hdr, hsize_t new_size, hssize_t extra_free)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -801,14 +788,13 @@ H5HF_hdr_adjust_heap(H5HF_hdr_t *hdr, hsize_t new_size, hssize_t extra_free)
     hdr->total_man_free += extra_free;
 
     /* Mark heap header as modified */
-    if(H5HF_hdr_dirty(hdr) < 0)
+    if (H5HF_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_adjust_heap() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_inc_alloc
  *
@@ -839,7 +825,6 @@ H5HF_hdr_inc_alloc(H5HF_hdr_t *hdr, size_t alloc_size)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_hdr_inc_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_start_iter
  *
@@ -856,7 +841,7 @@ H5HF_hdr_inc_alloc(H5HF_hdr_t *hdr, size_t alloc_size)
 herr_t
 H5HF_hdr_start_iter(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, hsize_t curr_off, unsigned curr_entry)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -867,7 +852,7 @@ H5HF_hdr_start_iter(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, hsize_t curr_off,
     HDassert(iblock);
 
     /* Set up "next block" iterator at correct location */
-    if(H5HF_man_iter_start_entry(hdr, &hdr->next_block, iblock, curr_entry) < 0)
+    if (H5HF_man_iter_start_entry(hdr, &hdr->next_block, iblock, curr_entry) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize block iterator")
 
     /* Set the offset of the iterator in the heap */
@@ -877,7 +862,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_start_iter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_reset_iter
  *
@@ -894,7 +878,7 @@ done:
 herr_t
 H5HF_hdr_reset_iter(H5HF_hdr_t *hdr, hsize_t curr_off)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -904,7 +888,7 @@ H5HF_hdr_reset_iter(H5HF_hdr_t *hdr, hsize_t curr_off)
     HDassert(hdr);
 
     /* Reset "next block" iterator */
-    if(H5HF_man_iter_reset(&hdr->next_block) < 0)
+    if (H5HF_man_iter_reset(&hdr->next_block) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reset block iterator")
 
     /* Set the offset of the iterator in the heap */
@@ -914,7 +898,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_reset_iter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_skip_blocks
  *
@@ -929,12 +912,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_hdr_skip_blocks(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *iblock,
-    unsigned start_entry, unsigned nentries)
+H5HF_hdr_skip_blocks(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *iblock, unsigned start_entry,
+                     unsigned nentries)
 {
-    unsigned row, col;                  /* Row & column of entry */
-    hsize_t sect_size;                  /* Size of section in heap space */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned row, col;            /* Row & column of entry */
+    hsize_t  sect_size;           /* Size of section in heap space */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -946,24 +929,24 @@ H5HF_hdr_skip_blocks(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *iblock,
     HDassert(nentries);
 
     /* Compute the span within the heap to skip */
-    row = start_entry / hdr->man_dtable.cparam.width;
-    col = start_entry % hdr->man_dtable.cparam.width;
+    row       = start_entry / hdr->man_dtable.cparam.width;
+    col       = start_entry % hdr->man_dtable.cparam.width;
     sect_size = H5HF_dtable_span_size(&hdr->man_dtable, row, col, nentries);
     HDassert(sect_size > 0);
 
     /* Advance the new block iterator */
-    if(H5HF_hdr_inc_iter(hdr, sect_size, nentries) < 0)
+    if (H5HF_hdr_inc_iter(hdr, sect_size, nentries) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't increase allocated heap size")
 
     /* Add 'indirect' section for blocks skipped in this row */
-    if(H5HF_sect_indirect_add(hdr, dxpl_id, iblock, start_entry, nentries) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section for indirect block's free space")
+    if (H5HF_sect_indirect_add(hdr, dxpl_id, iblock, start_entry, nentries) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL,
+                    "can't create indirect section for indirect block's free space")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_skip_blocks() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_update_iter
  *
@@ -983,7 +966,7 @@ done:
 herr_t
 H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -994,49 +977,49 @@ H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
     HDassert(min_dblock_size > 0);
 
     /* Check for creating first indirect block */
-    if(hdr->man_dtable.curr_root_rows == 0) {
-        if(H5HF_man_iblock_root_create(hdr, dxpl_id, min_dblock_size) < 0)
+    if (hdr->man_dtable.curr_root_rows == 0) {
+        if (H5HF_man_iblock_root_create(hdr, dxpl_id, min_dblock_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "unable to create root indirect block")
     } /* end if */
     else {
-        H5HF_indirect_t *iblock;        /* Pointer to indirect block */
-        hbool_t walked_up, walked_down; /* Condition variables for finding direct block location */
-        unsigned next_row;              /* Iterator's next block row */
-        unsigned next_entry;            /* Iterator's next block entry */
-        unsigned min_dblock_row;        /* Minimum row for direct block size request */
+        H5HF_indirect_t *iblock;                 /* Pointer to indirect block */
+        hbool_t          walked_up, walked_down; /* Condition variables for finding direct block location */
+        unsigned         next_row;               /* Iterator's next block row */
+        unsigned         next_entry;             /* Iterator's next block entry */
+        unsigned         min_dblock_row;         /* Minimum row for direct block size request */
 
         /* Compute min. row for direct block requested */
         min_dblock_row = H5HF_dtable_size_to_row(&hdr->man_dtable, min_dblock_size);
 
         /* Initialize block iterator, if necessary */
-        if(!H5HF_man_iter_ready(&hdr->next_block)) {
+        if (!H5HF_man_iter_ready(&hdr->next_block)) {
             /* Start iterator with previous offset of iterator */
-            if(H5HF_man_iter_start_offset(hdr, dxpl_id, &hdr->next_block, hdr->man_iter_off) < 0)
+            if (H5HF_man_iter_start_offset(hdr, dxpl_id, &hdr->next_block, hdr->man_iter_off) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to set block iterator location")
         } /* end if */
 
         /* Get information about current iterator location */
-        if(H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
+        if (H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location")
 
         /* Check for skipping over blocks in the current block */
-        if(min_dblock_row > next_row && next_row < iblock->nrows) {
-            unsigned min_entry;         /* Min entry for direct block requested */
-            unsigned skip_entries;      /* Number of entries to skip in the current block */
+        if (min_dblock_row > next_row && next_row < iblock->nrows) {
+            unsigned min_entry;    /* Min entry for direct block requested */
+            unsigned skip_entries; /* Number of entries to skip in the current block */
 
             /* Compute the number of entries to skip in the current block */
             min_entry = min_dblock_row * hdr->man_dtable.cparam.width;
-            if(min_dblock_row >= iblock->nrows)
+            if (min_dblock_row >= iblock->nrows)
                 skip_entries = (iblock->nrows * hdr->man_dtable.cparam.width) - next_entry;
             else
                 skip_entries = min_entry - next_entry;
 
             /* Add skipped direct blocks to heap's free space */
-            if(H5HF_hdr_skip_blocks(hdr, dxpl_id, iblock, next_entry, skip_entries) < 0)
+            if (H5HF_hdr_skip_blocks(hdr, dxpl_id, iblock, next_entry, skip_entries) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space")
 
             /* Get information about new iterator location */
-            if(H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
+            if (H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location")
         } /* end if */
 
@@ -1046,25 +1029,27 @@ H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
 
             /* Check for walking off end of indirect block */
             /* (walk up iterator) */
-            while(next_row >= iblock->nrows) {
+            while (next_row >= iblock->nrows) {
                 /* Check for needing to expand root indirect block */
-                if(iblock->parent == NULL) {
-                    if(H5HF_man_iblock_root_double(hdr, dxpl_id, min_dblock_size) < 0)
+                if (iblock->parent == NULL) {
+                    if (H5HF_man_iblock_root_double(hdr, dxpl_id, min_dblock_size) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "unable to double root indirect block")
                 } /* end if */
                 else {
                     /* Move iterator up one level */
-                    if(H5HF_man_iter_up(&hdr->next_block) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL, "unable to advance current block iterator location")
+                    if (H5HF_man_iter_up(&hdr->next_block) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL,
+                                    "unable to advance current block iterator location")
 
                     /* Increment location of next block at this level */
-                    if(H5HF_man_iter_next(hdr, &hdr->next_block, 1) < 0)
+                    if (H5HF_man_iter_next(hdr, &hdr->next_block, 1) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't advance fractal heap block location")
                 } /* end else */
 
                 /* Get information about new iterator location */
-                if(H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location")
+                if (H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
+                                "unable to retrieve current block iterator location")
 
                 /* Indicate that we walked up */
                 walked_up = TRUE;
@@ -1072,80 +1057,94 @@ H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
 
             /* Check for walking into child indirect block */
             /* (walk down iterator) */
-            if(next_row >= hdr->man_dtable.max_direct_rows) {
-                unsigned child_nrows;   /* Number of rows in new indirect block */
+            if (next_row >= hdr->man_dtable.max_direct_rows) {
+                unsigned child_nrows; /* Number of rows in new indirect block */
 
                 HDassert(!H5F_addr_defined(iblock->ents[next_entry].addr));
 
                 /* Compute # of rows in next child indirect block to use */
-                child_nrows = H5HF_dtable_size_to_rows(&hdr->man_dtable, hdr->man_dtable.row_block_size[next_row]);
+                child_nrows =
+                    H5HF_dtable_size_to_rows(&hdr->man_dtable, hdr->man_dtable.row_block_size[next_row]);
 
                 /* Check for skipping over indirect blocks */
                 /* (that don't have direct blocks large enough to hold direct block size requested) */
-                if(hdr->man_dtable.row_block_size[child_nrows - 1] < min_dblock_size) {
-                    unsigned child_rows_needed;     /* Number of rows needed to hold direct block */
-                    unsigned child_entry;           /* Entry of child indirect block */
+                if (hdr->man_dtable.row_block_size[child_nrows - 1] < min_dblock_size) {
+                    unsigned child_rows_needed; /* Number of rows needed to hold direct block */
+                    unsigned child_entry;       /* Entry of child indirect block */
 
                     /* Compute # of rows needed in child indirect block */
-                    child_rows_needed = (H5VM_log2_of2((uint32_t)min_dblock_size) - H5VM_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size)) + 2;
+                    child_rows_needed = (H5VM_log2_of2((uint32_t)min_dblock_size) -
+                                         H5VM_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size)) +
+                                        2;
                     HDassert(child_rows_needed > child_nrows);
-                    child_entry = (next_row + (child_rows_needed - child_nrows)) * hdr->man_dtable.cparam.width;
-                    if(child_entry > (iblock->nrows * hdr->man_dtable.cparam.width))
+                    child_entry =
+                        (next_row + (child_rows_needed - child_nrows)) * hdr->man_dtable.cparam.width;
+                    if (child_entry > (iblock->nrows * hdr->man_dtable.cparam.width))
                         child_entry = iblock->nrows * hdr->man_dtable.cparam.width;
 
                     /* Add skipped indirect blocks to heap's free space */
-                    if(H5HF_hdr_skip_blocks(hdr, dxpl_id, iblock, next_entry, (child_entry - next_entry)) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space")
+                    if (H5HF_hdr_skip_blocks(hdr, dxpl_id, iblock, next_entry, (child_entry - next_entry)) <
+                        0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                                    "can't add skipped blocks to heap's free space")
                 } /* end if */
                 else {
-                    H5HF_indirect_t *new_iblock;    /* Pointer to new indirect block */
-                    hbool_t did_protect;            /* Whether we protected the indirect block or not */
-                    haddr_t new_iblock_addr;        /* New indirect block's address */
+                    H5HF_indirect_t *new_iblock;      /* Pointer to new indirect block */
+                    hbool_t          did_protect;     /* Whether we protected the indirect block or not */
+                    haddr_t          new_iblock_addr; /* New indirect block's address */
 
                     /* Allocate new indirect block */
-                    if(H5HF_man_iblock_create(hdr, dxpl_id, iblock, next_entry, child_nrows, child_nrows, &new_iblock_addr) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block")
+                    if (H5HF_man_iblock_create(hdr, dxpl_id, iblock, next_entry, child_nrows, child_nrows,
+                                               &new_iblock_addr) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL,
+                                    "can't allocate fractal heap indirect block")
 
                     /* Lock new indirect block */
-                    if(NULL == (new_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, new_iblock_addr, child_nrows, iblock, next_entry, FALSE, H5AC_WRITE, &did_protect)))
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
+                    if (NULL == (new_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, new_iblock_addr,
+                                                                      child_nrows, iblock, next_entry, FALSE,
+                                                                      H5AC_WRITE, &did_protect)))
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL,
+                                    "unable to protect fractal heap indirect block")
 
                     /* Move iterator down one level (pins indirect block) */
-                    if(H5HF_man_iter_down(&hdr->next_block, new_iblock) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL, "unable to advance current block iterator location")
+                    if (H5HF_man_iter_down(&hdr->next_block, new_iblock) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL,
+                                    "unable to advance current block iterator location")
 
                     /* Check for skipping over rows and add free section for skipped rows */
-                    if(min_dblock_size > hdr->man_dtable.cparam.start_block_size) {
-                        unsigned new_entry;        /* Entry of direct block which is large enough */
+                    if (min_dblock_size > hdr->man_dtable.cparam.start_block_size) {
+                        unsigned new_entry; /* Entry of direct block which is large enough */
 
                         /* Compute entry for direct block size requested */
                         new_entry = hdr->man_dtable.cparam.width * min_dblock_row;
 
                         /* Add skipped blocks to heap's free space */
-                        if(H5HF_hdr_skip_blocks(hdr, dxpl_id, new_iblock, 0, new_entry) < 0)
-                            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space")
+                        if (H5HF_hdr_skip_blocks(hdr, dxpl_id, new_iblock, 0, new_entry) < 0)
+                            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                                        "can't add skipped blocks to heap's free space")
                     } /* end if */
 
                     /* Unprotect child indirect block */
-                    if(H5HF_man_iblock_unprotect(new_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+                    if (H5HF_man_iblock_unprotect(new_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL,
+                                    "unable to release fractal heap indirect block")
                 } /* end else */
 
                 /* Get information about new iterator location */
-                if(H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location")
+                if (H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
+                                "unable to retrieve current block iterator location")
 
                 /* Indicate that we walked down */
                 walked_down = TRUE;
             } /* end if */
-        } while(walked_down || walked_up);
+        } while (walked_down || walked_up);
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_update_iter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_inc_iter
  *
@@ -1162,7 +1161,7 @@ done:
 herr_t
 H5HF_hdr_inc_iter(H5HF_hdr_t *hdr, hsize_t adv_size, unsigned nentries)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1173,8 +1172,8 @@ H5HF_hdr_inc_iter(H5HF_hdr_t *hdr, hsize_t adv_size, unsigned nentries)
     HDassert(nentries);
 
     /* Advance the iterator for the current location within the indirect block */
-    if(hdr->next_block.curr)
-        if(H5HF_man_iter_next(hdr, &hdr->next_block, nentries) < 0)
+    if (hdr->next_block.curr)
+        if (H5HF_man_iter_next(hdr, &hdr->next_block, nentries) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL, "unable to advance current block iterator location")
 
     /* Increment the offset of the iterator in the heap */
@@ -1184,7 +1183,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_inc_iter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_reverse_iter
  *
@@ -1202,11 +1200,11 @@ done:
 herr_t
 H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
 {
-    H5HF_indirect_t *iblock;            /* Indirect block where iterator is located */
-    unsigned curr_entry;                /* Current entry for iterator */
-    hbool_t walked_down;                /* Loop flag */
-    hbool_t walked_up;                  /* Loop flag */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *iblock;              /* Indirect block where iterator is located */
+    unsigned         curr_entry;          /* Current entry for iterator */
+    hbool_t          walked_down;         /* Loop flag */
+    hbool_t          walked_up;           /* Loop flag */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1216,15 +1214,15 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
     HDassert(hdr);
 
     /* Initialize block iterator, if necessary */
-    if(!H5HF_man_iter_ready(&hdr->next_block))
+    if (!H5HF_man_iter_ready(&hdr->next_block))
         /* Start iterator with previous offset of iterator */
-        if(H5HF_man_iter_start_offset(hdr, dxpl_id, &hdr->next_block, hdr->man_iter_off) < 0)
+        if (H5HF_man_iter_start_offset(hdr, dxpl_id, &hdr->next_block, hdr->man_iter_off) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to set block iterator location")
 
     /* Walk backwards through heap, looking for direct block to place iterator after */
 
     /* Get information about current iterator location */
-    if(H5HF_man_iter_curr(&hdr->next_block, NULL, NULL, &curr_entry, &iblock) < 0)
+    if (H5HF_man_iter_curr(&hdr->next_block, NULL, NULL, &curr_entry, &iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator information")
 
     /* Move current iterator position backwards once */
@@ -1232,30 +1230,31 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
 
     /* Search backwards in the heap address space for direct block to latch onto */
     do {
-        int tmp_entry;     /* Temp. entry for iterator (use signed value to detect errors) */
+        int tmp_entry; /* Temp. entry for iterator (use signed value to detect errors) */
 
         /* Reset loop flags */
         walked_down = FALSE;
-        walked_up = FALSE;
+        walked_up   = FALSE;
 
         /* Walk backwards through entries, until we find one that has a child */
         /* (Skip direct block that will be deleted, if we find it) */
         tmp_entry = curr_entry;
-        while(tmp_entry >= 0 &&
-                (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) ||
-                    !H5F_addr_defined(iblock->ents[tmp_entry].addr)))
+        while (tmp_entry >= 0 && (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) ||
+                                  !H5F_addr_defined(iblock->ents[tmp_entry].addr)))
             tmp_entry--;
         /* Check for no earlier blocks in this indirect block */
-        if(tmp_entry < 0) {
+        if (tmp_entry < 0) {
             /* Check for parent of current indirect block */
-            if(iblock->parent) {
+            if (iblock->parent) {
                 /* Move iterator to parent of current block */
-                if(H5HF_man_iter_up(&hdr->next_block) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL, "unable to move current block iterator location up")
+                if (H5HF_man_iter_up(&hdr->next_block) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL,
+                                "unable to move current block iterator location up")
 
                 /* Get information about current iterator location */
-                if(H5HF_man_iter_curr(&hdr->next_block, NULL, NULL, &curr_entry, &iblock) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator information")
+                if (H5HF_man_iter_curr(&hdr->next_block, NULL, NULL, &curr_entry, &iblock) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
+                                "unable to retrieve current block iterator information")
 
                 /* Move current iterator position backwards once */
                 curr_entry--;
@@ -1268,69 +1267,75 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
                 hdr->man_iter_off = 0;
 
                 /* Reset 'next block' iterator */
-                if(H5HF_man_iter_reset(&hdr->next_block) < 0)
+                if (H5HF_man_iter_reset(&hdr->next_block) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reset block iterator")
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else {
-            unsigned row;           /* Row for entry */
+            unsigned row; /* Row for entry */
 
             curr_entry = tmp_entry;
 
             /* Check if entry is for a direct block */
             row = curr_entry / hdr->man_dtable.cparam.width;
-            if(row < hdr->man_dtable.max_direct_rows) {
+            if (row < hdr->man_dtable.max_direct_rows) {
                 /* Increment entry to empty location */
                 curr_entry++;
 
                 /* Set the current location of the iterator to next entry after the existing direct block */
-                if(H5HF_man_iter_set_entry(hdr, &hdr->next_block, curr_entry) < 0)
+                if (H5HF_man_iter_set_entry(hdr, &hdr->next_block, curr_entry) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "unable to set current block iterator location")
 
                 /* Update iterator offset */
                 hdr->man_iter_off = iblock->block_off;
                 hdr->man_iter_off += hdr->man_dtable.row_block_off[curr_entry / hdr->man_dtable.cparam.width];
-                hdr->man_iter_off += hdr->man_dtable.row_block_size[curr_entry / hdr->man_dtable.cparam.width] * (curr_entry % hdr->man_dtable.cparam.width);
+                hdr->man_iter_off +=
+                    hdr->man_dtable.row_block_size[curr_entry / hdr->man_dtable.cparam.width] *
+                    (curr_entry % hdr->man_dtable.cparam.width);
             } /* end if */
             else {
-                H5HF_indirect_t *child_iblock;  /* Pointer to child indirect block */
-                hbool_t did_protect;            /* Whether we protected the indirect block or not */
-                unsigned child_nrows;           /* # of rows in child block */
+                H5HF_indirect_t *child_iblock; /* Pointer to child indirect block */
+                hbool_t          did_protect;  /* Whether we protected the indirect block or not */
+                unsigned         child_nrows;  /* # of rows in child block */
 
                 /* Compute # of rows in next child indirect block to use */
                 child_nrows = H5HF_dtable_size_to_rows(&hdr->man_dtable, hdr->man_dtable.row_block_size[row]);
 
                 /* Lock child indirect block */
-                if(NULL == (child_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock->ents[curr_entry].addr, child_nrows, iblock, curr_entry, FALSE, H5AC_WRITE, &did_protect)))
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
+                if (NULL == (child_iblock = H5HF_man_iblock_protect(
+                                 hdr, dxpl_id, iblock->ents[curr_entry].addr, child_nrows, iblock, curr_entry,
+                                 FALSE, H5AC_WRITE, &did_protect)))
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL,
+                                "unable to protect fractal heap indirect block")
 
                 /* Set the current location of the iterator */
-                if(H5HF_man_iter_set_entry(hdr, &hdr->next_block, curr_entry) < 0)
+                if (H5HF_man_iter_set_entry(hdr, &hdr->next_block, curr_entry) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "unable to set current block iterator location")
 
                 /* Walk down into child indirect block (pins child block) */
-                if(H5HF_man_iter_down(&hdr->next_block, child_iblock) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL, "unable to advance current block iterator location")
+                if (H5HF_man_iter_down(&hdr->next_block, child_iblock) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTNEXT, FAIL,
+                                "unable to advance current block iterator location")
 
                 /* Update iterator location */
-                iblock = child_iblock;
+                iblock     = child_iblock;
                 curr_entry = (child_iblock->nrows * hdr->man_dtable.cparam.width) - 1;
 
                 /* Unprotect child indirect block */
-                if(H5HF_man_iblock_unprotect(child_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+                if (H5HF_man_iblock_unprotect(child_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL,
+                                "unable to release fractal heap indirect block")
 
                 /* Note that we walked down */
                 walked_down = TRUE;
             } /* end else */
-        } /* end else */
-    } while(walked_down || walked_up);
+        }     /* end else */
+    } while (walked_down || walked_up);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_reverse_iter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_empty
  *
@@ -1347,7 +1352,7 @@ done:
 herr_t
 H5HF_hdr_empty(H5HF_hdr_t *hdr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1355,13 +1360,13 @@ H5HF_hdr_empty(H5HF_hdr_t *hdr)
     HDassert(hdr);
 
     /* Reset block iterator, if necessary */
-    if(H5HF_man_iter_ready(&hdr->next_block)) {
-        if(H5HF_man_iter_reset(&hdr->next_block) < 0)
+    if (H5HF_man_iter_ready(&hdr->next_block)) {
+        if (H5HF_man_iter_reset(&hdr->next_block) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reset block iterator")
     } /* end if */
 
     /* Shrink managed heap size */
-    hdr->man_size = 0;
+    hdr->man_size       = 0;
     hdr->man_alloc_size = 0;
 
     /* Reset the 'next block' iterator location */
@@ -1371,14 +1376,13 @@ H5HF_hdr_empty(H5HF_hdr_t *hdr)
     hdr->total_man_free = 0;
 
     /* Mark heap header as modified */
-    if(H5HF_hdr_dirty(hdr) < 0)
+    if (H5HF_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_empty() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_free
  *
@@ -1395,7 +1399,7 @@ done:
 herr_t
 H5HF_hdr_free(H5HF_hdr_t *hdr)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1405,12 +1409,12 @@ H5HF_hdr_free(H5HF_hdr_t *hdr)
     HDassert(hdr);
 
     /* Free the block size lookup table for the doubling table */
-    if(H5HF_dtable_dest(&hdr->man_dtable) < 0)
+    if (H5HF_dtable_dest(&hdr->man_dtable) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap doubling table")
 
     /* Release any I/O pipeline filter information */
-    if(hdr->pline.nused)
-        if(H5O_msg_reset(H5O_PLINE_ID, &(hdr->pline)) < 0)
+    if (hdr->pline.nused)
+        if (H5O_msg_reset(H5O_PLINE_ID, &(hdr->pline)) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to reset I/O pipeline message")
 
     /* Free the shared info itself */
@@ -1420,7 +1424,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_hdr_delete
  *
@@ -1437,8 +1440,8 @@ done:
 herr_t
 H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
 {
-    unsigned cache_flags = H5AC__NO_FLAGS_SET;  /* Flags for unprotecting heap header */
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting heap header */
+    herr_t   ret_value   = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1449,61 +1452,64 @@ H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
     HDassert(!hdr->file_rc);
 
 #ifndef NDEBUG
-{
-    unsigned hdr_status = 0;         /* Heap header's status in the metadata cache */
+    {
+        unsigned hdr_status = 0; /* Heap header's status in the metadata cache */
 
-    /* Check the heap header's status in the metadata cache */
-    if(H5AC_get_entry_status(hdr->f, hdr->heap_addr, &hdr_status) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for heap header")
+        /* Check the heap header's status in the metadata cache */
+        if (H5AC_get_entry_status(hdr->f, hdr->heap_addr, &hdr_status) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for heap header")
 
-    /* Sanity checks on heap header */
-    HDassert(hdr_status & H5AC_ES__IN_CACHE);
-    HDassert(hdr_status & H5AC_ES__IS_PROTECTED);
-} /* end block */
+        /* Sanity checks on heap header */
+        HDassert(hdr_status & H5AC_ES__IN_CACHE);
+        HDassert(hdr_status & H5AC_ES__IS_PROTECTED);
+    }  /* end block */
 #endif /* NDEBUG */
 
     /* Check for free space manager for heap */
     /* (must occur before attempting to delete the heap, so indirect blocks
      *  will get unpinned)
      */
-    if(H5F_addr_defined(hdr->fs_addr)) {
+    if (H5F_addr_defined(hdr->fs_addr)) {
         /* Delete free space manager for heap */
-        if(H5HF_space_delete(hdr, dxpl_id) < 0)
+        if (H5HF_space_delete(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release fractal heap free space manager")
     } /* end if */
 
     /* Check for root direct/indirect block */
-    if(H5F_addr_defined(hdr->man_dtable.table_addr)) {
-        if(hdr->man_dtable.curr_root_rows == 0) {
-            hsize_t dblock_size;        /* Size of direct block */
+    if (H5F_addr_defined(hdr->man_dtable.table_addr)) {
+        if (hdr->man_dtable.curr_root_rows == 0) {
+            hsize_t dblock_size; /* Size of direct block */
 
             /* Check for I/O filters on this heap */
-            if(hdr->filter_len > 0) {
+            if (hdr->filter_len > 0) {
                 dblock_size = (hsize_t)hdr->pline_root_direct_size;
 
                 /* Reset the header's pipeline information */
-                hdr->pline_root_direct_size = 0;
+                hdr->pline_root_direct_size        = 0;
                 hdr->pline_root_direct_filter_mask = 0;
             } /* end else */
             else
                 dblock_size = (hsize_t)hdr->man_dtable.cparam.start_block_size;
 
             /* Delete root direct block */
-            if(H5HF_man_dblock_delete(hdr->f, dxpl_id, hdr->man_dtable.table_addr, dblock_size) < 0)
+            if (H5HF_man_dblock_delete(hdr->f, dxpl_id, hdr->man_dtable.table_addr, dblock_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release fractal heap root direct block")
         } /* end if */
         else {
             /* Delete root indirect block */
-            if(H5HF_man_iblock_delete(hdr, dxpl_id, hdr->man_dtable.table_addr, hdr->man_dtable.curr_root_rows, NULL, 0) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release fractal heap root indirect block")
+            if (H5HF_man_iblock_delete(hdr, dxpl_id, hdr->man_dtable.table_addr,
+                                       hdr->man_dtable.curr_root_rows, NULL, 0) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
+                            "unable to release fractal heap root indirect block")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Check for 'huge' objects in heap */
-    if(H5F_addr_defined(hdr->huge_bt2_addr)) {
+    if (H5F_addr_defined(hdr->huge_bt2_addr)) {
         /* Delete huge objects in heap and their tracker */
-        if(H5HF_huge_delete(hdr, dxpl_id) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release fractal heap 'huge' objects and tracker")
+        if (H5HF_huge_delete(hdr, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
+                        "unable to release fractal heap 'huge' objects and tracker")
     } /* end if */
 
     /* Indicate that the heap header should be deleted & file space freed */
@@ -1511,9 +1517,8 @@ H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
 
 done:
     /* Unprotect the header with appropriate flags */
-    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, hdr, cache_flags) < 0)
+    if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, hdr, cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_hdr_delete() */
-
diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c
index d6392ee..83634e8 100644
--- a/src/H5HFhuge.c
+++ b/src/H5HFhuge.c
@@ -26,39 +26,34 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
-
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* v2 B-tree creation macros */
-#define H5HF_HUGE_BT2_NODE_SIZE         512
-#define H5HF_HUGE_BT2_SPLIT_PERC        100
-#define H5HF_HUGE_BT2_MERGE_PERC         40
-
+#define H5HF_HUGE_BT2_NODE_SIZE  512
+#define H5HF_HUGE_BT2_SPLIT_PERC 100
+#define H5HF_HUGE_BT2_MERGE_PERC 40
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -68,25 +63,21 @@ static herr_t H5HF_huge_bt2_create(H5HF_hdr_t *hdr, hid_t dxpl_id);
 
 /* Local 'huge' object support routines */
 static hsize_t H5HF_huge_new_id(H5HF_hdr_t *hdr);
-static herr_t H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    const uint8_t *id, hbool_t is_read, H5HF_operator_t op, void *op_data);
-
+static herr_t  H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, hbool_t is_read,
+                                 H5HF_operator_t op, void *op_data);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_bt2_create
  *
@@ -103,8 +94,8 @@ static herr_t H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id,
 static herr_t
 H5HF_huge_bt2_create(H5HF_hdr_t *hdr, hid_t dxpl_id)
 {
-    H5B2_create_t bt2_cparam;           /* v2 B-tree creation parameters */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5B2_create_t bt2_cparam;          /* v2 B-tree creation parameters */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -120,53 +111,53 @@ H5HF_huge_bt2_create(H5HF_hdr_t *hdr, hid_t dxpl_id)
      *  difficult to write.  "Waste" an extra byte or for small heaps (where
      *  the 'huge_id_size' is < 'sizeof_size' in order to make this easier -QAK)
      */
-    if(hdr->huge_ids_direct) {
-        if(hdr->filter_len > 0) {
-            bt2_cparam.rrec_size = (size_t)(hdr->sizeof_addr    /* Address of object */
-                + hdr->sizeof_size          /* Length of object */
-                + 4                         /* Filter mask for filtered object */
-                + hdr->sizeof_size);        /* Size of de-filtered object in memory */
-            bt2_cparam.cls = H5HF_HUGE_BT2_FILT_DIR;
+    if (hdr->huge_ids_direct) {
+        if (hdr->filter_len > 0) {
+            bt2_cparam.rrec_size = (size_t)(hdr->sizeof_addr     /* Address of object */
+                                            + hdr->sizeof_size   /* Length of object */
+                                            + 4                  /* Filter mask for filtered object */
+                                            + hdr->sizeof_size); /* Size of de-filtered object in memory */
+            bt2_cparam.cls       = H5HF_HUGE_BT2_FILT_DIR;
         } /* end if */
         else {
-            bt2_cparam.rrec_size = (size_t)(hdr->sizeof_addr    /* Address of object */
-                + hdr->sizeof_size);         /* Length of object */
-            bt2_cparam.cls = H5HF_HUGE_BT2_DIR;
+            bt2_cparam.rrec_size = (size_t)(hdr->sizeof_addr     /* Address of object */
+                                            + hdr->sizeof_size); /* Length of object */
+            bt2_cparam.cls       = H5HF_HUGE_BT2_DIR;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
-        if(hdr->filter_len > 0) {
-            bt2_cparam.rrec_size = (size_t)(hdr->sizeof_addr    /* Address of filtered object */
-                + hdr->sizeof_size          /* Length of filtered object */
-                + 4                         /* Filter mask for filtered object */
-                + hdr->sizeof_size          /* Size of de-filtered object in memory */
-                + hdr->sizeof_size);        /* Unique ID for object */
-            bt2_cparam.cls = H5HF_HUGE_BT2_FILT_INDIR;
+        if (hdr->filter_len > 0) {
+            bt2_cparam.rrec_size = (size_t)(hdr->sizeof_addr     /* Address of filtered object */
+                                            + hdr->sizeof_size   /* Length of filtered object */
+                                            + 4                  /* Filter mask for filtered object */
+                                            + hdr->sizeof_size   /* Size of de-filtered object in memory */
+                                            + hdr->sizeof_size); /* Unique ID for object */
+            bt2_cparam.cls       = H5HF_HUGE_BT2_FILT_INDIR;
         } /* end if */
         else {
-            bt2_cparam.rrec_size = (size_t)(hdr->sizeof_addr    /* Address of object */
-                + hdr->sizeof_size          /* Length of object */
-                + hdr->sizeof_size);        /* Unique ID for object */
-            bt2_cparam.cls = H5HF_HUGE_BT2_INDIR;
+            bt2_cparam.rrec_size = (size_t)(hdr->sizeof_addr     /* Address of object */
+                                            + hdr->sizeof_size   /* Length of object */
+                                            + hdr->sizeof_size); /* Unique ID for object */
+            bt2_cparam.cls       = H5HF_HUGE_BT2_INDIR;
         } /* end else */
-    } /* end else */
-    bt2_cparam.node_size = (size_t)H5HF_HUGE_BT2_NODE_SIZE;
+    }     /* end else */
+    bt2_cparam.node_size     = (size_t)H5HF_HUGE_BT2_NODE_SIZE;
     bt2_cparam.split_percent = H5HF_HUGE_BT2_SPLIT_PERC;
     bt2_cparam.merge_percent = H5HF_HUGE_BT2_MERGE_PERC;
 
     /* Create v2 B-tree for tracking 'huge' objects */
-    if(NULL == (hdr->huge_bt2 = H5B2_create(hdr->f, dxpl_id, &bt2_cparam, hdr->f)))
+    if (NULL == (hdr->huge_bt2 = H5B2_create(hdr->f, dxpl_id, &bt2_cparam, hdr->f)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL, "can't create v2 B-tree for tracking 'huge' heap objects")
 
     /* Retrieve the v2 B-tree's address in the file */
-    if(H5B2_get_addr(hdr->huge_bt2, &hdr->huge_bt2_addr) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't get v2 B-tree address for tracking 'huge' heap objects")
+    if (H5B2_get_addr(hdr->huge_bt2, &hdr->huge_bt2_addr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
+                    "can't get v2 B-tree address for tracking 'huge' heap objects")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_bt2_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_init
  *
@@ -197,11 +188,11 @@ H5HF_huge_init(H5HF_hdr_t *hdr)
      *  have any I/O pipeline filters.
      */
 #ifdef QAK
-HDfprintf(stderr, "%s: hdr->id_len = %u\n", "H5HF_huge_init", (unsigned)hdr->id_len);
-HDfprintf(stderr, "%s: hdr->filter_len = %u\n", "H5HF_huge_init", (unsigned)hdr->filter_len);
+    HDfprintf(stderr, "%s: hdr->id_len = %u\n", "H5HF_huge_init", (unsigned)hdr->id_len);
+    HDfprintf(stderr, "%s: hdr->filter_len = %u\n", "H5HF_huge_init", (unsigned)hdr->filter_len);
 #endif /* QAK */
-    if(hdr->filter_len > 0) {
-        if((hdr->id_len - 1) >= (unsigned)(hdr->sizeof_addr + hdr->sizeof_size + 4 + hdr->sizeof_size)) {
+    if (hdr->filter_len > 0) {
+        if ((hdr->id_len - 1) >= (unsigned)(hdr->sizeof_addr + hdr->sizeof_size + 4 + hdr->sizeof_size)) {
             /* Indicate that v2 B-tree doesn't have to be used to locate object */
             hdr->huge_ids_direct = TRUE;
 
@@ -213,7 +204,7 @@ HDfprintf(stderr, "%s: hdr->filter_len = %u\n", "H5HF_huge_init", (unsigned)hdr-
             hdr->huge_ids_direct = FALSE;
     } /* end if */
     else {
-        if((hdr->sizeof_addr + hdr->sizeof_size) <= (hdr->id_len - 1)) {
+        if ((hdr->sizeof_addr + hdr->sizeof_size) <= (hdr->id_len - 1)) {
             /* Indicate that v2 B-tree doesn't have to be used to locate object */
             hdr->huge_ids_direct = TRUE;
 
@@ -224,23 +215,22 @@ HDfprintf(stderr, "%s: hdr->filter_len = %u\n", "H5HF_huge_init", (unsigned)hdr-
             /* Indicate that v2 B-tree must be used to locate object */
             hdr->huge_ids_direct = FALSE;
     } /* end else */
-    if(!hdr->huge_ids_direct) {
+    if (!hdr->huge_ids_direct) {
         /* Set the size and maximum value of 'huge' object ID */
-        if((hdr->id_len - 1) < sizeof(hsize_t)) {
+        if ((hdr->id_len - 1) < sizeof(hsize_t)) {
             hdr->huge_id_size = (uint8_t)(hdr->id_len - 1);
-            hdr->huge_max_id = ((hsize_t)1 << (hdr->huge_id_size * 8)) - 1;
+            hdr->huge_max_id  = ((hsize_t)1 << (hdr->huge_id_size * 8)) - 1;
         } /*end if */
         else {
             hdr->huge_id_size = sizeof(hsize_t);
-            hdr->huge_max_id = HSIZET_MAX;
+            hdr->huge_max_id  = HSIZET_MAX;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     hdr->huge_bt2 = NULL;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_huge_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_new_id
  *
@@ -258,8 +248,8 @@ HDfprintf(stderr, "%s: hdr->filter_len = %u\n", "H5HF_huge_init", (unsigned)hdr-
 static hsize_t
 H5HF_huge_new_id(H5HF_hdr_t *hdr)
 {
-    hsize_t new_id;             /* New object's ID */
-    hsize_t ret_value;          /* Return value */
+    hsize_t new_id;    /* New object's ID */
+    hsize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -269,7 +259,7 @@ H5HF_huge_new_id(H5HF_hdr_t *hdr)
     HDassert(hdr);
 
     /* Check for wrapping around 'huge' object ID space */
-    if(hdr->huge_ids_wrapped)
+    if (hdr->huge_ids_wrapped)
         /* Fail for now - eventually should iterate through v2 B-tree, looking for available ID */
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, 0, "wrapping 'huge' object IDs not supported yet")
     else {
@@ -278,7 +268,7 @@ H5HF_huge_new_id(H5HF_hdr_t *hdr)
         new_id = ++hdr->huge_next_id;
 
         /* Check for wrapping 'huge' object IDs around */
-        if(hdr->huge_next_id == hdr->huge_max_id)
+        if (hdr->huge_next_id == hdr->huge_max_id)
             hdr->huge_ids_wrapped = TRUE;
     } /* end else */
 
@@ -289,7 +279,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_new_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_insert
  *
@@ -304,19 +293,18 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj,
-    void *_id)
+H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, void *_id)
 {
-    uint8_t *id = (uint8_t *)_id;       /* Pointer to ID buffer */
-    haddr_t obj_addr;                   /* Address of object in the file */
-    void *write_buf;                    /* Pointer to buffer to write */
-    size_t write_size;                  /* Size of [possibly filtered] object written to file */
-    unsigned filter_mask = 0;           /* Filter mask for object (only used for filtered objects) */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    uint8_t *id = (uint8_t *)_id;   /* Pointer to ID buffer */
+    haddr_t  obj_addr;              /* Address of object in the file */
+    void *   write_buf;             /* Pointer to buffer to write */
+    size_t   write_size;            /* Size of [possibly filtered] object written to file */
+    unsigned filter_mask = 0;       /* Filter mask for object (only used for filtered objects) */
+    herr_t   ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef QAK
-HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
+    HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
 #endif /* QAK */
 
     /*
@@ -328,81 +316,86 @@ HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
     HDassert(id);
 
     /* Check if the v2 B-tree for tracking 'huge' heap objects has been created yet */
-    if(!H5F_addr_defined(hdr->huge_bt2_addr)) {
+    if (!H5F_addr_defined(hdr->huge_bt2_addr)) {
         /* Go create (& open) v2 B-tree */
-        if(H5HF_huge_bt2_create(hdr, dxpl_id) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL, "can't create v2 B-tree for tracking 'huge' heap objects")
+        if (H5HF_huge_bt2_create(hdr, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL,
+                        "can't create v2 B-tree for tracking 'huge' heap objects")
     } /* end if */
     else {
         /* Check if v2 B-tree is open yet */
-        if(NULL == hdr->huge_bt2) {
+        if (NULL == hdr->huge_bt2) {
             /* Open existing v2 B-tree */
-            if(NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for tracking 'huge' heap objects")
+            if (NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL,
+                            "unable to open v2 B-tree for tracking 'huge' heap objects")
         } /* end if */
-    } /* end else */
+    }     /* end else */
     HDassert(hdr->huge_bt2);
 
     /* Check for I/O pipeline filter on heap */
-    if(hdr->filter_len > 0) {
-        H5Z_cb_t filter_cb = {NULL, NULL};  /* Filter callback structure */
-        size_t nbytes;                      /* Number of bytes used */
+    if (hdr->filter_len > 0) {
+        H5Z_cb_t filter_cb = {NULL, NULL}; /* Filter callback structure */
+        size_t   nbytes;                   /* Number of bytes used */
 
         /* Allocate buffer to perform I/O filtering on */
         write_size = obj_size;
-        if(NULL == (write_buf = H5MM_malloc(write_size)))
+        if (NULL == (write_buf = H5MM_malloc(write_size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for pipeline buffer")
         HDmemcpy(write_buf, obj, write_size);
 
         /* Push direct block data through I/O filter pipeline */
         nbytes = write_size;
-        if(H5Z_pipeline(&(hdr->pline), 0, &filter_mask, H5Z_NO_EDC,
-                 filter_cb, &nbytes, &write_size, &write_buf) < 0)
+        if (H5Z_pipeline(&(hdr->pline), 0, &filter_mask, H5Z_NO_EDC, filter_cb, &nbytes, &write_size,
+                         &write_buf) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFILTER, FAIL, "output pipeline failed")
 #ifdef QAK
-HDfprintf(stderr, "%s: nbytes = %Zu, write_size = %Zu, write_buf = %p\n", FUNC, nbytes, write_size, write_buf);
-HDfprintf(stderr, "%s: obj_size = %Zu, obj = %p\n", FUNC, obj_size, obj);
+        HDfprintf(stderr, "%s: nbytes = %Zu, write_size = %Zu, write_buf = %p\n", FUNC, nbytes, write_size,
+                  write_buf);
+        HDfprintf(stderr, "%s: obj_size = %Zu, obj = %p\n", FUNC, obj_size, obj);
 #endif /* QAK */
 
         /* Update size of object on disk */
         write_size = nbytes;
     } /* end if */
     else {
-        write_buf = obj;
+        write_buf  = obj;
         write_size = obj_size;
     } /* end else */
 
     /* Allocate space in the file for storing the 'huge' object */
-    if(HADDR_UNDEF == (obj_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, dxpl_id, (hsize_t)write_size)))
+    if (HADDR_UNDEF == (obj_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, dxpl_id, (hsize_t)write_size)))
         HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap huge object")
 
     /* Write the object's data to disk */
-    if(H5F_block_write(hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, obj_addr, write_size, dxpl_id, write_buf) < 0)
+    if (H5F_block_write(hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, obj_addr, write_size, dxpl_id, write_buf) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "writing 'huge' object to file failed")
 
     /* Release buffer for writing, if we had one */
-    if(write_buf != obj) {
+    if (write_buf != obj) {
         HDassert(hdr->filter_len > 0);
         H5MM_xfree(write_buf);
     } /* end if */
 
     /* Perform different actions for directly & indirectly accessed 'huge' objects */
-    if(hdr->huge_ids_direct) {
-        if(hdr->filter_len > 0) {
-            H5HF_huge_bt2_filt_dir_rec_t obj_rec;        /* Record for tracking object */
+    if (hdr->huge_ids_direct) {
+        if (hdr->filter_len > 0) {
+            H5HF_huge_bt2_filt_dir_rec_t obj_rec; /* Record for tracking object */
 
             /* Initialize record for tracking object in v2 B-tree */
-            obj_rec.addr = obj_addr;
-            obj_rec.len = write_size;
+            obj_rec.addr        = obj_addr;
+            obj_rec.len         = write_size;
             obj_rec.filter_mask = filter_mask;
-            obj_rec.obj_size = obj_size;
+            obj_rec.obj_size    = obj_size;
 #ifdef QAK
-HDfprintf(stderr, "%s: obj_rec = {%a, %Hu, %x, %Hu}\n", FUNC, obj_rec.addr, obj_rec.len, obj_rec.filter_mask, obj_rec.obj_size);
+            HDfprintf(stderr, "%s: obj_rec = {%a, %Hu, %x, %Hu}\n", FUNC, obj_rec.addr, obj_rec.len,
+                      obj_rec.filter_mask, obj_rec.obj_size);
 #endif /* QAK */
 
             /* Insert record for object in v2 B-tree */
-            if(H5B2_insert(hdr->huge_bt2, dxpl_id, &obj_rec) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "couldn't insert object tracking record in v2 B-tree")
+            if (H5B2_insert(hdr->huge_bt2, dxpl_id, &obj_rec) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL,
+                            "couldn't insert object tracking record in v2 B-tree")
 
             /* Encode ID for user */
             *id++ = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_HUGE;
@@ -412,44 +405,47 @@ HDfprintf(stderr, "%s: obj_rec = {%a, %Hu, %x, %Hu}\n", FUNC, obj_rec.addr, obj_
             H5F_ENCODE_LENGTH(hdr->f, id, (hsize_t)obj_size);
         } /* end if */
         else {
-            H5HF_huge_bt2_dir_rec_t obj_rec;        /* Record for tracking object */
+            H5HF_huge_bt2_dir_rec_t obj_rec; /* Record for tracking object */
 
             /* Initialize record for tracking object in v2 B-tree */
             obj_rec.addr = obj_addr;
-            obj_rec.len = write_size;
+            obj_rec.len  = write_size;
 #ifdef QAK
-HDfprintf(stderr, "%s: obj_rec = {%a, %Hu}\n", FUNC, obj_rec.addr, obj_rec.len);
+            HDfprintf(stderr, "%s: obj_rec = {%a, %Hu}\n", FUNC, obj_rec.addr, obj_rec.len);
 #endif /* QAK */
 
             /* Insert record for object in v2 B-tree */
-            if(H5B2_insert(hdr->huge_bt2, dxpl_id, &obj_rec) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "couldn't insert object tracking record in v2 B-tree")
+            if (H5B2_insert(hdr->huge_bt2, dxpl_id, &obj_rec) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL,
+                            "couldn't insert object tracking record in v2 B-tree")
 
             /* Encode ID for user */
             *id++ = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_HUGE;
             H5F_addr_encode(hdr->f, &id, obj_addr);
             H5F_ENCODE_LENGTH(hdr->f, id, (hsize_t)write_size);
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
-        H5HF_huge_bt2_filt_indir_rec_t filt_indir_rec;      /* Record for tracking filtered object */
-        H5HF_huge_bt2_indir_rec_t indir_rec;    /* Record for tracking non-filtered object */
-        void *ins_rec;          /* Pointer to record to insert */
-        hsize_t new_id;         /* New ID for object */
+        H5HF_huge_bt2_filt_indir_rec_t filt_indir_rec; /* Record for tracking filtered object */
+        H5HF_huge_bt2_indir_rec_t      indir_rec;      /* Record for tracking non-filtered object */
+        void *                         ins_rec;        /* Pointer to record to insert */
+        hsize_t                        new_id;         /* New ID for object */
 
         /* Get new ID for object */
-        if(0 == (new_id = H5HF_huge_new_id(hdr)))
+        if (0 == (new_id = H5HF_huge_new_id(hdr)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't generate new ID for object")
 
-        if(hdr->filter_len > 0) {
+        if (hdr->filter_len > 0) {
             /* Initialize record for object in v2 B-tree */
-            filt_indir_rec.addr = obj_addr;
-            filt_indir_rec.len = write_size;
+            filt_indir_rec.addr        = obj_addr;
+            filt_indir_rec.len         = write_size;
             filt_indir_rec.filter_mask = filter_mask;
-            filt_indir_rec.obj_size = obj_size;
-            filt_indir_rec.id = new_id;
+            filt_indir_rec.obj_size    = obj_size;
+            filt_indir_rec.id          = new_id;
 #ifdef QAK
-HDfprintf(stderr, "%s: filt_indir_rec = {%a, %Hu, %x, %Hu, %Hu}\n", FUNC, filt_indir_rec.addr, filt_indir_rec.len, filt_indir_rec.filter_mask, filt_indir_rec.obj_size, filt_indir_rec.id);
+            HDfprintf(stderr, "%s: filt_indir_rec = {%a, %Hu, %x, %Hu, %Hu}\n", FUNC, filt_indir_rec.addr,
+                      filt_indir_rec.len, filt_indir_rec.filter_mask, filt_indir_rec.obj_size,
+                      filt_indir_rec.id);
 #endif /* QAK */
 
             /* Set pointer to record to insert */
@@ -458,10 +454,11 @@ HDfprintf(stderr, "%s: filt_indir_rec = {%a, %Hu, %x, %Hu, %Hu}\n", FUNC, filt_i
         else {
             /* Initialize record for object in v2 B-tree */
             indir_rec.addr = obj_addr;
-            indir_rec.len = write_size;
-            indir_rec.id = new_id;
+            indir_rec.len  = write_size;
+            indir_rec.id   = new_id;
 #ifdef QAK
-HDfprintf(stderr, "%s: indir_rec = {%a, %Hu, %Hu}\n", FUNC, indir_rec.addr, indir_rec.len, indir_rec.id);
+            HDfprintf(stderr, "%s: indir_rec = {%a, %Hu, %Hu}\n", FUNC, indir_rec.addr, indir_rec.len,
+                      indir_rec.id);
 #endif /* QAK */
 
             /* Set pointer to record to insert */
@@ -469,7 +466,7 @@ HDfprintf(stderr, "%s: indir_rec = {%a, %Hu, %Hu}\n", FUNC, indir_rec.addr, indi
         } /* end else */
 
         /* Insert record for tracking object in v2 B-tree */
-        if(H5B2_insert(hdr->huge_bt2, dxpl_id, ins_rec) < 0)
+        if (H5B2_insert(hdr->huge_bt2, dxpl_id, ins_rec) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "couldn't insert object tracking record in v2 B-tree")
 
         /* Encode ID for user */
@@ -482,14 +479,13 @@ HDfprintf(stderr, "%s: indir_rec = {%a, %Hu, %Hu}\n", FUNC, indir_rec.addr, indi
     hdr->huge_nobjs++;
 
     /* Mark heap header as modified */
-    if(H5HF_hdr_dirty(hdr) < 0)
+    if (H5HF_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_get_obj_len
  *
@@ -504,10 +500,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    size_t *obj_len_p)
+H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, size_t *obj_len_p)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -523,8 +518,8 @@ H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     id++;
 
     /* Check if 'huge' object ID encodes address & length directly */
-    if(hdr->huge_ids_direct) {
-        if(hdr->filter_len > 0) {
+    if (hdr->huge_ids_direct) {
+        if (hdr->filter_len > 0) {
             /* Skip over filtered object info */
             id += hdr->sizeof_addr + hdr->sizeof_size + 4;
 
@@ -538,16 +533,17 @@ H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
             /* Retrieve the object's length */
             H5F_DECODE_LENGTH(hdr->f, id, *obj_len_p);
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Check if v2 B-tree is open yet */
-        if(NULL == hdr->huge_bt2) {
+        if (NULL == hdr->huge_bt2) {
             /* Open existing v2 B-tree */
-            if(NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for tracking 'huge' heap objects")
+            if (NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL,
+                            "unable to open v2 B-tree for tracking 'huge' heap objects")
         } /* end if */
 
-        if(hdr->filter_len > 0) {
+        if (hdr->filter_len > 0) {
             H5HF_huge_bt2_filt_indir_rec_t found_rec;  /* Record found from tracking object */
             H5HF_huge_bt2_filt_indir_rec_t search_rec; /* Record for searching for object */
 
@@ -555,7 +551,8 @@ H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
             UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
 
             /* Look up object in v2 B-tree */
-            if(H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_filt_indir_found, &found_rec) != TRUE)
+            if (H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_filt_indir_found, &found_rec) !=
+                TRUE)
                 HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "can't find object in B-tree")
 
             /* Retrieve the object's length */
@@ -569,19 +566,18 @@ H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
             UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
 
             /* Look up object in v2 B-tree */
-            if(H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_indir_found, &found_rec) != TRUE)
+            if (H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_indir_found, &found_rec) != TRUE)
                 HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "can't find object in B-tree")
 
             /* Retrieve the object's length */
             *obj_len_p = (size_t)found_rec.len;
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_get_obj_len() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_op_real
  *
@@ -596,14 +592,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    hbool_t is_read, H5HF_operator_t op, void *op_data)
+H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, hbool_t is_read, H5HF_operator_t op,
+                  void *op_data)
 {
-    void *read_buf = NULL;              /* Pointer to buffer for reading */
-    haddr_t obj_addr;                   /* Object's address in the file */
-    size_t obj_size = 0;                /* Object's size in the file */
-    unsigned filter_mask = 0;           /* Filter mask for object (only used for filtered objects) */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    void *   read_buf = NULL;       /* Pointer to buffer for reading */
+    haddr_t  obj_addr;              /* Object's address in the file */
+    size_t   obj_size    = 0;       /* Object's size in the file */
+    unsigned filter_mask = 0;       /* Filter mask for object (only used for filtered objects) */
+    herr_t   ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -618,13 +614,13 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     id++;
 
     /* Check for 'huge' object ID that encodes address & length directly */
-    if(hdr->huge_ids_direct) {
+    if (hdr->huge_ids_direct) {
         /* Retrieve the object's address and length (common) */
         H5F_addr_decode(hdr->f, &id, &obj_addr);
         H5F_DECODE_LENGTH(hdr->f, id, obj_size);
 
         /* Retrieve extra information needed for filtered objects */
-        if(hdr->filter_len > 0)
+        if (hdr->filter_len > 0)
             UINT32DECODE(id, filter_mask);
     } /* end if */
     else {
@@ -632,13 +628,14 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
         HDassert(H5F_addr_defined(hdr->huge_bt2_addr));
 
         /* Check if v2 B-tree is open yet */
-        if(NULL == hdr->huge_bt2) {
+        if (NULL == hdr->huge_bt2) {
             /* Open existing v2 B-tree */
-            if(NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for tracking 'huge' heap objects")
+            if (NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL,
+                            "unable to open v2 B-tree for tracking 'huge' heap objects")
         } /* end if */
 
-        if(hdr->filter_len > 0) {
+        if (hdr->filter_len > 0) {
             H5HF_huge_bt2_filt_indir_rec_t found_rec;  /* Record found from tracking object */
             H5HF_huge_bt2_filt_indir_rec_t search_rec; /* Record for searching for object */
 
@@ -646,7 +643,8 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
             UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
 
             /* Look up object in v2 B-tree */
-            if(H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_filt_indir_found, &found_rec) != TRUE)
+            if (H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_filt_indir_found, &found_rec) !=
+                TRUE)
                 HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "can't find object in B-tree")
 
             /* Retrieve the object's address & length */
@@ -662,18 +660,18 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
             UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
 
             /* Look up object in v2 B-tree */
-            if(H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_indir_found, &found_rec) != TRUE)
+            if (H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_indir_found, &found_rec) != TRUE)
                 HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "can't find object in B-tree")
 
             /* Retrieve the object's address & length */
             obj_addr = found_rec.addr;
             H5_CHECKED_ASSIGN(obj_size, size_t, found_rec.len, hsize_t);
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
     /* Set up buffer for reading */
-    if(hdr->filter_len > 0 || !is_read) {
-        if(NULL == (read_buf = H5MM_malloc((size_t)obj_size)))
+    if (hdr->filter_len > 0 || !is_read) {
+        if (NULL == (read_buf = H5MM_malloc((size_t)obj_size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for pipeline buffer")
     } /* end if */
     else
@@ -681,49 +679,49 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
 
     /* Read the object's (possibly filtered) data from the file */
     /* (reads directly into application's buffer if no filters are present) */
-    if(H5F_block_read(hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, obj_addr, (size_t)obj_size, dxpl_id, read_buf) < 0)
+    if (H5F_block_read(hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, obj_addr, (size_t)obj_size, dxpl_id, read_buf) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_READERROR, FAIL, "can't read 'huge' object's data from the file")
 
     /* Check for I/O pipeline filter on heap */
-    if(hdr->filter_len > 0) {
-        H5Z_cb_t filter_cb = {NULL, NULL};  /* Filter callback structure */
-        size_t read_size;                   /* Object's size in the file */
-        size_t nbytes;                      /* Number of bytes used */
+    if (hdr->filter_len > 0) {
+        H5Z_cb_t filter_cb = {NULL, NULL}; /* Filter callback structure */
+        size_t   read_size;                /* Object's size in the file */
+        size_t   nbytes;                   /* Number of bytes used */
 
         /* De-filter the object */
         read_size = nbytes = obj_size;
-        if(H5Z_pipeline(&(hdr->pline), H5Z_FLAG_REVERSE, &filter_mask, H5Z_NO_EDC, filter_cb, &nbytes, &read_size, &read_buf) < 0)
+        if (H5Z_pipeline(&(hdr->pline), H5Z_FLAG_REVERSE, &filter_mask, H5Z_NO_EDC, filter_cb, &nbytes,
+                         &read_size, &read_buf) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFILTER, FAIL, "input filter failed")
         obj_size = nbytes;
     } /* end if */
 
     /* Perform correct operation on buffer read in */
-    if(is_read) {
+    if (is_read) {
         /* Copy object to user's buffer if there's filters on heap data */
         /* (if there's no filters, the object was read directly into the user's buffer) */
-        if(hdr->filter_len > 0)
+        if (hdr->filter_len > 0)
             HDmemcpy(op_data, read_buf, (size_t)obj_size);
     } /* end if */
     else {
         /* Call the user's 'op' callback */
-        if(op(read_buf, (size_t)obj_size, op_data) < 0) {
+        if (op(read_buf, (size_t)obj_size, op_data) < 0) {
             /* Release buffer */
             read_buf = H5MM_xfree(read_buf);
 
             /* Indicate error */
             HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "application's callback failed")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Release the buffer for reading */
-    if(read_buf && read_buf != op_data)
+    if (read_buf && read_buf != op_data)
         read_buf = H5MM_xfree(read_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_op_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_write
  *
@@ -743,12 +741,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    const void *obj)
+H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, const void *obj)
 {
-    haddr_t obj_addr;                   /* Object's address in the file */
-    size_t obj_size;                    /* Object's size in the file */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    haddr_t obj_addr;            /* Object's address in the file */
+    size_t  obj_size;            /* Object's size in the file */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -760,14 +757,14 @@ H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     HDassert(obj);
 
     /* Check for filters on the heap */
-    if(hdr->filter_len > 0)
+    if (hdr->filter_len > 0)
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "modifying 'huge' object with filters not supported yet")
 
     /* Skip over the flag byte */
     id++;
 
     /* Check for 'huge' object ID that encodes address & length directly */
-    if(hdr->huge_ids_direct) {
+    if (hdr->huge_ids_direct) {
         /* Retrieve the object's address and length (common) */
         H5F_addr_decode(hdr->f, &id, &obj_addr);
         H5F_DECODE_LENGTH(hdr->f, id, obj_size);
@@ -780,17 +777,18 @@ H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
         HDassert(H5F_addr_defined(hdr->huge_bt2_addr));
 
         /* Check if v2 B-tree is open yet */
-        if(NULL == hdr->huge_bt2) {
+        if (NULL == hdr->huge_bt2) {
             /* Open existing v2 B-tree */
-            if(NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for tracking 'huge' heap objects")
+            if (NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL,
+                            "unable to open v2 B-tree for tracking 'huge' heap objects")
         } /* end if */
 
         /* Get ID for looking up 'huge' object in v2 B-tree */
         UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
 
         /* Look up object in v2 B-tree */
-        if(H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_indir_found, &found_rec) != TRUE)
+        if (H5B2_find(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_indir_found, &found_rec) != TRUE)
             HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "can't find object in B-tree")
 
         /* Retrieve the object's address & length */
@@ -800,14 +798,13 @@ H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
 
     /* Write the object's data to the file */
     /* (writes directly from application's buffer) */
-    if(H5F_block_write(hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, obj_addr, obj_size, dxpl_id, obj) < 0)
+    if (H5F_block_write(hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, obj_addr, obj_size, dxpl_id, obj) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "writing 'huge' object to file failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_read
  *
@@ -824,7 +821,7 @@ done:
 herr_t
 H5HF_huge_read(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, void *obj)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -836,14 +833,13 @@ H5HF_huge_read(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, void *obj)
     HDassert(obj);
 
     /* Call the internal 'op' routine */
-    if(H5HF_huge_op_real(hdr, dxpl_id, id, TRUE, NULL, obj) < 0)
+    if (H5HF_huge_op_real(hdr, dxpl_id, id, TRUE, NULL, obj) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_op
  *
@@ -858,10 +854,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_huge_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    H5HF_operator_t op, void *op_data)
+H5HF_huge_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, H5HF_operator_t op, void *op_data)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -873,14 +868,13 @@ H5HF_huge_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     HDassert(op);
 
     /* Call the internal 'op' routine routine */
-    if(H5HF_huge_op_real(hdr, dxpl_id, id, FALSE, op, op_data) < 0)
+    if (H5HF_huge_op_real(hdr, dxpl_id, id, FALSE, op, op_data) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_op() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_remove
  *
@@ -897,8 +891,8 @@ done:
 herr_t
 H5HF_huge_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
 {
-    H5HF_huge_remove_ud_t udata;       /* User callback data for v2 B-tree remove call */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_huge_remove_ud_t udata;               /* User callback data for v2 B-tree remove call */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -910,23 +904,24 @@ H5HF_huge_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
     HDassert(id);
 
     /* Check if v2 B-tree is open yet */
-    if(NULL == hdr->huge_bt2) {
+    if (NULL == hdr->huge_bt2) {
         /* Open existing v2 B-tree */
-        if(NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for tracking 'huge' heap objects")
+        if (NULL == (hdr->huge_bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL,
+                        "unable to open v2 B-tree for tracking 'huge' heap objects")
     } /* end if */
 
     /* Skip over the flag byte */
     id++;
 
     /* Set up the common callback info */
-    udata.hdr = hdr;
+    udata.hdr     = hdr;
     udata.dxpl_id = dxpl_id;
 
     /* Check for 'huge' object ID that encodes address & length directly */
-    if(hdr->huge_ids_direct) {
-        if(hdr->filter_len > 0) {
-            H5HF_huge_bt2_filt_dir_rec_t search_rec;     /* Record for searching for object */
+    if (hdr->huge_ids_direct) {
+        if (hdr->filter_len > 0) {
+            H5HF_huge_bt2_filt_dir_rec_t search_rec; /* Record for searching for object */
 
             /* Retrieve the object's address and length */
             /* (used as key in v2 B-tree record) */
@@ -935,11 +930,11 @@ H5HF_huge_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
 
             /* Remove the record for tracking the 'huge' object from the v2 B-tree */
             /* (space in the file for the object is freed in the 'remove' callback) */
-            if(H5B2_remove(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_filt_dir_remove, &udata) < 0)
+            if (H5B2_remove(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_filt_dir_remove, &udata) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove object from B-tree")
         } /* end if */
         else {
-            H5HF_huge_bt2_dir_rec_t search_rec;     /* Record for searching for object */
+            H5HF_huge_bt2_dir_rec_t search_rec; /* Record for searching for object */
 
             /* Retrieve the object's address and length */
             /* (used as key in v2 B-tree record) */
@@ -948,48 +943,47 @@ H5HF_huge_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
 
             /* Remove the record for tracking the 'huge' object from the v2 B-tree */
             /* (space in the file for the object is freed in the 'remove' callback) */
-            if(H5B2_remove(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_dir_remove, &udata) < 0)
+            if (H5B2_remove(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_dir_remove, &udata) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove object from B-tree")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
-        if(hdr->filter_len > 0) {
-            H5HF_huge_bt2_filt_indir_rec_t search_rec;     /* Record for searching for object */
+        if (hdr->filter_len > 0) {
+            H5HF_huge_bt2_filt_indir_rec_t search_rec; /* Record for searching for object */
 
             /* Get ID for looking up 'huge' object in v2 B-tree */
             UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
 
             /* Remove the record for tracking the 'huge' object from the v2 B-tree */
             /* (space in the file for the object is freed in the 'remove' callback) */
-            if(H5B2_remove(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_filt_indir_remove, &udata) < 0)
+            if (H5B2_remove(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_filt_indir_remove, &udata) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove object from B-tree")
         } /* end if */
         else {
-            H5HF_huge_bt2_indir_rec_t search_rec;     /* Record for searching for object */
+            H5HF_huge_bt2_indir_rec_t search_rec; /* Record for searching for object */
 
             /* Get ID for looking up 'huge' object in v2 B-tree */
             UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
 
             /* Remove the record for tracking the 'huge' object from the v2 B-tree */
             /* (space in the file for the object is freed in the 'remove' callback) */
-            if(H5B2_remove(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_indir_remove, &udata) < 0)
+            if (H5B2_remove(hdr->huge_bt2, dxpl_id, &search_rec, H5HF_huge_bt2_indir_remove, &udata) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove object from B-tree")
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
     /* Update statistics about heap */
     hdr->huge_size -= udata.obj_len;
     hdr->huge_nobjs--;
 
     /* Mark heap header as modified */
-    if(H5HF_hdr_dirty(hdr) < 0)
+    if (H5HF_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_term
  *
@@ -1006,7 +1000,7 @@ done:
 herr_t
 H5HF_huge_term(H5HF_hdr_t *hdr, hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1016,12 +1010,12 @@ H5HF_huge_term(H5HF_hdr_t *hdr, hid_t dxpl_id)
     HDassert(hdr);
 
     /* Check if v2 B-tree index is open */
-    if(hdr->huge_bt2) {
+    if (hdr->huge_bt2) {
         /* Sanity check */
         HDassert(H5F_addr_defined(hdr->huge_bt2_addr));
 
         /* Close v2 B-tree index */
-        if(H5B2_close(hdr->huge_bt2, dxpl_id) < 0)
+        if (H5B2_close(hdr->huge_bt2, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree")
         hdr->huge_bt2 = NULL;
     } /* end if */
@@ -1029,22 +1023,22 @@ H5HF_huge_term(H5HF_hdr_t *hdr, hid_t dxpl_id)
     /* Check if there are no more 'huge' objects in the heap and delete the
      *  v2 B-tree that tracks them, if so
      */
-    if(H5F_addr_defined(hdr->huge_bt2_addr) && hdr->huge_nobjs == 0) {
+    if (H5F_addr_defined(hdr->huge_bt2_addr) && hdr->huge_nobjs == 0) {
         /* Sanity check */
         HDassert(hdr->huge_size == 0);
 
         /* Delete the v2 B-tree */
         /* (any v2 B-tree class will work here) */
-        if(H5B2_delete(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f, NULL, NULL) < 0)
+        if (H5B2_delete(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "can't delete v2 B-tree")
 
         /* Reset the information about 'huge' objects in the file */
-        hdr->huge_bt2_addr = HADDR_UNDEF;
-        hdr->huge_next_id = 0;
+        hdr->huge_bt2_addr    = HADDR_UNDEF;
+        hdr->huge_next_id     = 0;
         hdr->huge_ids_wrapped = FALSE;
 
         /* Mark heap header as modified */
-        if(H5HF_hdr_dirty(hdr) < 0)
+        if (H5HF_hdr_dirty(hdr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
     } /* end if */
 
@@ -1052,7 +1046,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_huge_delete
  *
@@ -1070,9 +1063,9 @@ done:
 herr_t
 H5HF_huge_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
 {
-    H5HF_huge_remove_ud_t udata;       /* User callback data for v2 B-tree remove call */
-    H5B2_remove_t op;                   /* Callback for v2 B-tree removal */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_huge_remove_ud_t udata;               /* User callback data for v2 B-tree remove call */
+    H5B2_remove_t         op;                  /* Callback for v2 B-tree removal */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1085,28 +1078,27 @@ H5HF_huge_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
     HDassert(hdr->huge_size);
 
     /* Set up the callback info */
-    udata.hdr = hdr;
+    udata.hdr     = hdr;
     udata.dxpl_id = dxpl_id;
 
     /* Set the v2 B-tree callback operator */
-    if(hdr->huge_ids_direct) {
-        if(hdr->filter_len > 0)
+    if (hdr->huge_ids_direct) {
+        if (hdr->filter_len > 0)
             op = H5HF_huge_bt2_filt_dir_remove;
         else
             op = H5HF_huge_bt2_dir_remove;
     } /* end if */
     else {
-        if(hdr->filter_len > 0)
+        if (hdr->filter_len > 0)
             op = H5HF_huge_bt2_filt_indir_remove;
         else
             op = H5HF_huge_bt2_indir_remove;
     } /* end else */
 
     /* Delete the v2 B-tree */
-    if(H5B2_delete(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f, op, &udata) < 0)
+    if (H5B2_delete(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f, op, &udata) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "can't delete v2 B-tree")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_huge_delete() */
-
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index 622d24d..261c190 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -26,33 +26,30 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -61,7 +58,6 @@ static herr_t H5HF_iblock_unpin(H5HF_indirect_t *iblock);
 static herr_t H5HF_man_iblock_root_halve(H5HF_indirect_t *root_iblock, hid_t dxpl_id);
 static herr_t H5HF_man_iblock_root_revert(H5HF_indirect_t *root_iblock, hid_t dxpl_id);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -78,18 +74,14 @@ H5FL_SEQ_DEFINE(H5HF_indirect_filt_ent_t);
 /* Declare a free list to manage the H5HF_indirect_t * sequence information */
 H5FL_SEQ_DEFINE(H5HF_indirect_ptr_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_iblock_pin
  *
@@ -106,7 +98,7 @@ H5FL_SEQ_DEFINE(H5HF_indirect_ptr_t);
 static herr_t
 H5HF_iblock_pin(H5HF_indirect_t *iblock)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -114,22 +106,22 @@ H5HF_iblock_pin(H5HF_indirect_t *iblock)
     HDassert(iblock);
 
     /* Mark block as un-evictable */
-    if(H5AC_pin_protected_entry(iblock) < 0)
+    if (H5AC_pin_protected_entry(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap indirect block")
 
     /* If this indirect block has a parent, update it's child iblock pointer */
-    if(iblock->parent) {
-        H5HF_indirect_t *par_iblock = iblock->parent;    /* Parent indirect block */
-        unsigned indir_idx;             /* Index in parent's child iblock pointer array */
+    if (iblock->parent) {
+        H5HF_indirect_t *par_iblock = iblock->parent; /* Parent indirect block */
+        unsigned         indir_idx;                   /* Index in parent's child iblock pointer array */
 
         /* Sanity check */
         HDassert(par_iblock->child_iblocks);
-        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows
-                * iblock->hdr->man_dtable.cparam.width));
+        HDassert(iblock->par_entry >=
+                 (iblock->hdr->man_dtable.max_direct_rows * iblock->hdr->man_dtable.cparam.width));
 
         /* Compute index in parent's child iblock pointer array */
-        indir_idx = iblock->par_entry - (iblock->hdr->man_dtable.max_direct_rows
-                * iblock->hdr->man_dtable.cparam.width);
+        indir_idx = iblock->par_entry -
+                    (iblock->hdr->man_dtable.max_direct_rows * iblock->hdr->man_dtable.cparam.width);
 
         /* Set pointer to pinned indirect block in parent */
         HDassert(par_iblock->child_iblocks[indir_idx] == NULL);
@@ -137,12 +129,12 @@ H5HF_iblock_pin(H5HF_indirect_t *iblock)
     } /* end if */
     else {
         /* Check for pinning the root indirect block */
-        if(iblock->block_off == 0) {
+        if (iblock->block_off == 0) {
             /* Sanity check - shouldn't be recursively pinning root indirect block */
             HDassert(0 == (iblock->hdr->root_iblock_flags & H5HF_ROOT_IBLOCK_PINNED));
 
             /* Check if we should set the root iblock pointer */
-            if(0 == iblock->hdr->root_iblock_flags) {
+            if (0 == iblock->hdr->root_iblock_flags) {
                 HDassert(NULL == iblock->hdr->root_iblock);
                 iblock->hdr->root_iblock = iblock;
             } /* end if */
@@ -150,13 +142,12 @@ H5HF_iblock_pin(H5HF_indirect_t *iblock)
             /* Indicate that the root indirect block is pinned */
             iblock->hdr->root_iblock_flags |= H5HF_ROOT_IBLOCK_PINNED;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_iblock_pin() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_iblock_unpin
  *
@@ -173,7 +164,7 @@ done:
 static herr_t
 H5HF_iblock_unpin(H5HF_indirect_t *iblock)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -181,18 +172,18 @@ H5HF_iblock_unpin(H5HF_indirect_t *iblock)
     HDassert(iblock);
 
     /* If this indirect block has a parent, reset it's child iblock pointer */
-    if(iblock->parent) {
-        H5HF_indirect_t *par_iblock = iblock->parent;    /* Parent indirect block */
-        unsigned indir_idx;             /* Index in parent's child iblock pointer array */
+    if (iblock->parent) {
+        H5HF_indirect_t *par_iblock = iblock->parent; /* Parent indirect block */
+        unsigned         indir_idx;                   /* Index in parent's child iblock pointer array */
 
         /* Sanity check */
         HDassert(par_iblock->child_iblocks);
-        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows
-                * iblock->hdr->man_dtable.cparam.width));
+        HDassert(iblock->par_entry >=
+                 (iblock->hdr->man_dtable.max_direct_rows * iblock->hdr->man_dtable.cparam.width));
 
         /* Compute index in parent's child iblock pointer array */
-        indir_idx = iblock->par_entry - (iblock->hdr->man_dtable.max_direct_rows
-                * iblock->hdr->man_dtable.cparam.width);
+        indir_idx = iblock->par_entry -
+                    (iblock->hdr->man_dtable.max_direct_rows * iblock->hdr->man_dtable.cparam.width);
 
         /* Reset pointer to pinned child indirect block in parent */
         HDassert(par_iblock->child_iblocks[indir_idx]);
@@ -200,12 +191,12 @@ H5HF_iblock_unpin(H5HF_indirect_t *iblock)
     } /* end if */
     else {
         /* Check for root indirect block */
-        if(iblock->block_off == 0) {
+        if (iblock->block_off == 0) {
             /* Sanity check - shouldn't be recursively unpinning root indirect block */
             HDassert(iblock->hdr->root_iblock_flags & H5HF_ROOT_IBLOCK_PINNED);
 
             /* Check if we should reset the root iblock pointer */
-            if(H5HF_ROOT_IBLOCK_PINNED == iblock->hdr->root_iblock_flags) {
+            if (H5HF_ROOT_IBLOCK_PINNED == iblock->hdr->root_iblock_flags) {
                 HDassert(NULL != iblock->hdr->root_iblock);
                 iblock->hdr->root_iblock = NULL;
             } /* end if */
@@ -213,17 +204,16 @@ H5HF_iblock_unpin(H5HF_indirect_t *iblock)
             /* Indicate that the root indirect block is unpinned */
             iblock->hdr->root_iblock_flags &= ~(H5HF_ROOT_IBLOCK_PINNED);
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     /* Mark block as evictable again */
-    if(H5AC_unpin_entry(iblock) < 0)
+    if (H5AC_unpin_entry(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap indirect block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_iblock_unpin() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_iblock_incr
  *
@@ -240,7 +230,7 @@ done:
 herr_t
 H5HF_iblock_incr(H5HF_indirect_t *iblock)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -249,8 +239,8 @@ H5HF_iblock_incr(H5HF_indirect_t *iblock)
     HDassert(iblock->block_off == 0 || iblock->parent);
 
     /* Mark block as un-evictable when a child block is depending on it */
-    if(iblock->rc == 0)
-        if(H5HF_iblock_pin(iblock) < 0)
+    if (iblock->rc == 0)
+        if (H5HF_iblock_pin(iblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap indirect block")
 
     /* Increment reference count on shared indirect block */
@@ -260,7 +250,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_iblock_incr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_iblock_decr
  *
@@ -277,7 +266,7 @@ done:
 herr_t
 H5HF_iblock_decr(H5HF_indirect_t *iblock)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -288,57 +277,57 @@ H5HF_iblock_decr(H5HF_indirect_t *iblock)
     iblock->rc--;
 
     /* Mark block as evictable again when no child blocks depend on it */
-    if(iblock->rc == 0) {
-        H5HF_hdr_t *hdr;			/* Fractal heap header */
-        haddr_t iblock_addr;		/* Address of fractal heap */
-        hbool_t expunge_iblock = FALSE;     /* Whether to expunge indirect block from heap */
+    if (iblock->rc == 0) {
+        H5HF_hdr_t *hdr;                    /* Fractal heap header */
+        haddr_t     iblock_addr;            /* Address of fractal heap */
+        hbool_t     expunge_iblock = FALSE; /* Whether to expunge indirect block from heap */
 
         /* Set up convenience variables */
-        hdr = iblock->hdr;
+        hdr         = iblock->hdr;
         iblock_addr = iblock->addr;
 
-        if(iblock->nchildren == 0) {
+        if (iblock->nchildren == 0) {
             /* Check for deleting root indirect block (and no root direct block) */
-            if(iblock->block_off == 0 && hdr->man_dtable.curr_root_rows > 0) {
+            if (iblock->block_off == 0 && hdr->man_dtable.curr_root_rows > 0) {
                 /* Reset root pointer information */
                 hdr->man_dtable.curr_root_rows = 0;
-                hdr->man_dtable.table_addr = HADDR_UNDEF;
+                hdr->man_dtable.table_addr     = HADDR_UNDEF;
 
                 /* Reset header information back to "empty heap" state */
-                if(H5HF_hdr_empty(hdr) < 0)
+                if (H5HF_hdr_empty(hdr) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't make heap empty")
             } /* end if */
 
             /* Detach from parent indirect block */
-            if(iblock->parent) {
+            if (iblock->parent) {
                 /* Detach from parent indirect block */
-                if(H5HF_man_iblock_detach(iblock->parent, H5AC_dxpl_id, iblock->par_entry) < 0)
+                if (H5HF_man_iblock_detach(iblock->parent, H5AC_dxpl_id, iblock->par_entry) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach from parent indirect block")
-                iblock->parent = NULL;
+                iblock->parent    = NULL;
                 iblock->par_entry = 0;
             } /* end if */
 
-	    /* Mark indirect block for removal from the metadata cache */
-	    expunge_iblock = TRUE;
+            /* Mark indirect block for removal from the metadata cache */
+            expunge_iblock = TRUE;
         } /* end if */
 
-	/* Unpin the indirect block */
-        if(H5HF_iblock_unpin(iblock) < 0)
+        /* Unpin the indirect block */
+        if (H5HF_iblock_unpin(iblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap indirect block")
 
-	/* Check for expunging the indirect block from the metadata cache */
-	if(expunge_iblock) {
+        /* Check for expunging the indirect block from the metadata cache */
+        if (expunge_iblock) {
             /* Evict the indirect block from the metadata cache */
-            if(H5AC_expunge_entry(hdr->f, H5AC_dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr, H5AC__FREE_FILE_SPACE_FLAG) < 0)
+            if (H5AC_expunge_entry(hdr->f, H5AC_dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr,
+                                   H5AC__FREE_FILE_SPACE_FLAG) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "unable to remove indirect block from cache")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_iblock_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_iblock_dirty
  *
@@ -355,7 +344,7 @@ done:
 herr_t
 H5HF_iblock_dirty(H5HF_indirect_t *iblock)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -363,14 +352,13 @@ H5HF_iblock_dirty(H5HF_indirect_t *iblock)
     HDassert(iblock);
 
     /* Mark indirect block as dirty in cache */
-    if(H5AC_mark_entry_dirty(iblock) < 0)
+    if (H5AC_mark_entry_dirty(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark fractal heap indirect block as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_iblock_dirty() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_root_create
  *
@@ -387,19 +375,19 @@ done:
 herr_t
 H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
 {
-    H5HF_indirect_t *iblock;        /* Pointer to indirect block */
-    haddr_t iblock_addr;            /* Indirect block's address */
-    hsize_t acc_dblock_free;        /* Accumulated free space in direct blocks */
-    hbool_t have_direct_block;      /* Flag to indicate a direct block already exists */
-    hbool_t did_protect;            /* Whether we protected the indirect block or not */
-    unsigned nrows;                 /* Number of rows for root indirect block */
-    unsigned u;                     /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *iblock;              /* Pointer to indirect block */
+    haddr_t          iblock_addr;         /* Indirect block's address */
+    hsize_t          acc_dblock_free;     /* Accumulated free space in direct blocks */
+    hbool_t          have_direct_block;   /* Flag to indicate a direct block already exists */
+    hbool_t          did_protect;         /* Whether we protected the indirect block or not */
+    unsigned         nrows;               /* Number of rows for root indirect block */
+    unsigned         u;                   /* Local index variable */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check for allocating entire root indirect block initially */
-    if(hdr->man_dtable.cparam.start_root_rows == 0)
+    if (hdr->man_dtable.cparam.start_root_rows == 0)
         nrows = hdr->man_dtable.max_root_rows;
     else {
         unsigned rows_needed;   /* Number of rows needed to get to direct block size */
@@ -407,103 +395,111 @@ H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
 
         nrows = hdr->man_dtable.cparam.start_root_rows;
 
-        block_row_off = H5VM_log2_of2((uint32_t)min_dblock_size) - H5VM_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size);
-        if(block_row_off > 0)
-            block_row_off++;        /* Account for the pair of initial rows of the initial block size */
+        block_row_off = H5VM_log2_of2((uint32_t)min_dblock_size) -
+                        H5VM_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size);
+        if (block_row_off > 0)
+            block_row_off++; /* Account for the pair of initial rows of the initial block size */
         rows_needed = 1 + block_row_off;
-        if(nrows < rows_needed)
+        if (nrows < rows_needed)
             nrows = rows_needed;
     } /* end else */
 
     /* Allocate root indirect block */
-    if(H5HF_man_iblock_create(hdr, dxpl_id, NULL, 0, nrows, hdr->man_dtable.max_root_rows, &iblock_addr) < 0)
+    if (H5HF_man_iblock_create(hdr, dxpl_id, NULL, 0, nrows, hdr->man_dtable.max_root_rows, &iblock_addr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block")
 
     /* Move current direct block (used as root) into new indirect block */
 
     /* Lock new indirect block */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, NULL, 0, FALSE, H5AC_WRITE, &did_protect)))
+    if (NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, NULL, 0, FALSE,
+                                                  H5AC_WRITE, &did_protect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
 
     /* Check if there's already a direct block as root) */
     have_direct_block = H5F_addr_defined(hdr->man_dtable.table_addr);
-    if(have_direct_block) {
-        H5HF_direct_t *dblock;          /* Pointer to direct block to query */
+    if (have_direct_block) {
+        H5HF_direct_t *dblock; /* Pointer to direct block to query */
 
         /* Lock first (root) direct block */
-        if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, hdr->man_dtable.table_addr, hdr->man_dtable.cparam.start_block_size, NULL, 0, H5AC_WRITE)))
+        if (NULL ==
+            (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, hdr->man_dtable.table_addr,
+                                              hdr->man_dtable.cparam.start_block_size, NULL, 0, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
 
         /* Attach direct block to new root indirect block */
-        dblock->parent = iblock;
+        dblock->parent    = iblock;
         dblock->par_entry = 0;
-        if(H5HF_man_iblock_attach(iblock, 0, hdr->man_dtable.table_addr) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't attach root direct block to parent indirect block")
+        if (H5HF_man_iblock_attach(iblock, 0, hdr->man_dtable.table_addr) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL,
+                        "can't attach root direct block to parent indirect block")
 
         /* Check for I/O filters on this heap */
-        if(hdr->filter_len > 0) {
+        if (hdr->filter_len > 0) {
             /* Set the pipeline filter information from the header */
-            iblock->filt_ents[0].size = hdr->pline_root_direct_size;
+            iblock->filt_ents[0].size        = hdr->pline_root_direct_size;
             iblock->filt_ents[0].filter_mask = hdr->pline_root_direct_filter_mask;
 
             /* Reset the header's pipeline information */
-            hdr->pline_root_direct_size = 0;
+            hdr->pline_root_direct_size        = 0;
             hdr->pline_root_direct_filter_mask = 0;
         } /* end if */
 
         /* Scan free space sections to set any 'parent' pointers to new indirect block */
-        if(H5HF_space_create_root(hdr, dxpl_id, iblock) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set free space section info to new root indirect block")
+        if (H5HF_space_create_root(hdr, dxpl_id, iblock) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL,
+                        "can't set free space section info to new root indirect block")
 
         /* Unlock first (previously the root) direct block */
-        if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
+        if (H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, dblock,
+                           H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
         dblock = NULL;
     } /* end if */
 
     /* Start iterator at correct location */
-    if(H5HF_hdr_start_iter(hdr, iblock, (hsize_t)(have_direct_block ? hdr->man_dtable.cparam.start_block_size : 0), have_direct_block) < 0)
+    if (H5HF_hdr_start_iter(hdr, iblock,
+                            (hsize_t)(have_direct_block ? hdr->man_dtable.cparam.start_block_size : 0),
+                            have_direct_block) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize block iterator")
 
     /* Check for skipping over direct blocks, in order to get to large enough block */
-    if(min_dblock_size > hdr->man_dtable.cparam.start_block_size) {
+    if (min_dblock_size > hdr->man_dtable.cparam.start_block_size) {
         /* Add skipped blocks to heap's free space */
-        if(H5HF_hdr_skip_blocks(hdr, dxpl_id, iblock, have_direct_block,
-                ((nrows - 1) * hdr->man_dtable.cparam.width) - have_direct_block) < 0)
+        if (H5HF_hdr_skip_blocks(hdr, dxpl_id, iblock, have_direct_block,
+                                 ((nrows - 1) * hdr->man_dtable.cparam.width) - have_direct_block) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space")
     } /* end if */
 
     /* Mark indirect block as modified */
-    if(H5HF_iblock_dirty(iblock) < 0)
+    if (H5HF_iblock_dirty(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
 
     /* Unprotect root indirect block (it's pinned by the iterator though) */
-    if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__DIRTIED_FLAG, did_protect) < 0)
+    if (H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__DIRTIED_FLAG, did_protect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     iblock = NULL;
 
     /* Point heap header at new indirect block */
     hdr->man_dtable.curr_root_rows = nrows;
-    hdr->man_dtable.table_addr = iblock_addr;
+    hdr->man_dtable.table_addr     = iblock_addr;
 
     /* Compute free space in direct blocks referenced from entries in root indirect block */
     acc_dblock_free = 0;
-    for(u = 0; u < nrows; u++)
+    for (u = 0; u < nrows; u++)
         acc_dblock_free += hdr->man_dtable.row_tot_dblock_free[u] * hdr->man_dtable.cparam.width;
 
     /* Account for potential initial direct block */
-    if(have_direct_block)
+    if (have_direct_block)
         acc_dblock_free -= hdr->man_dtable.row_tot_dblock_free[0];
 
     /* Extend heap to cover new root indirect block */
-    if(H5HF_hdr_adjust_heap(hdr, hdr->man_dtable.row_block_off[nrows], (hssize_t)acc_dblock_free) < 0)
+    if (H5HF_hdr_adjust_heap(hdr, hdr->man_dtable.row_block_off[nrows], (hssize_t)acc_dblock_free) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_root_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_root_double
  *
@@ -520,25 +516,25 @@ done:
 herr_t
 H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
 {
-    H5HF_indirect_t *iblock;    /* Pointer to root indirect block */
-    haddr_t new_addr;           /* New address of indirect block */
-    hsize_t acc_dblock_free;    /* Accumulated free space in direct blocks */
-    hsize_t next_size;          /* The previous value of the "next size" for the new block iterator */
-    hsize_t old_iblock_size;    /* Old size of indirect block */
-    unsigned next_row;          /* The next row to allocate block in */
-    unsigned next_entry;        /* The previous value of the "next entry" for the new block iterator */
-    unsigned new_next_entry = 0;/* The new value of the "next entry" for the new block iterator */
-    unsigned min_nrows = 0;     /* Min. # of direct rows */
-    unsigned old_nrows;         /* Old # of rows */
-    unsigned new_nrows;         /* New # of rows */
-    hbool_t skip_direct_rows = FALSE;   /* Whether we are skipping direct rows */
-    size_t u;                   /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5HF_indirect_t *iblock;          /* Pointer to root indirect block */
+    haddr_t          new_addr;        /* New address of indirect block */
+    hsize_t          acc_dblock_free; /* Accumulated free space in direct blocks */
+    hsize_t          next_size;       /* The previous value of the "next size" for the new block iterator */
+    hsize_t          old_iblock_size; /* Old size of indirect block */
+    unsigned         next_row;        /* The next row to allocate block in */
+    unsigned         next_entry;      /* The previous value of the "next entry" for the new block iterator */
+    unsigned         new_next_entry = 0; /* The new value of the "next entry" for the new block iterator */
+    unsigned         min_nrows      = 0; /* Min. # of direct rows */
+    unsigned         old_nrows;          /* Old # of rows */
+    unsigned         new_nrows;          /* New # of rows */
+    hbool_t          skip_direct_rows = FALSE; /* Whether we are skipping direct rows */
+    size_t           u;                        /* Local index variable */
+    herr_t           ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get "new block" iterator information */
-    if(H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
+    if (H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location")
     next_size = hdr->man_dtable.row_block_size[next_row];
 
@@ -550,7 +546,7 @@ H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
     old_nrows = iblock->nrows;
 
     /* Check for skipping over direct block rows */
-    if(iblock->nrows < hdr->man_dtable.max_direct_rows && min_dblock_size > next_size) {
+    if (iblock->nrows < hdr->man_dtable.max_direct_rows && min_dblock_size > next_size) {
         /* Sanity check */
         HDassert(min_dblock_size > hdr->man_dtable.cparam.start_block_size);
 
@@ -569,128 +565,136 @@ H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
 
     /* Check if the indirect block is NOT currently allocated in temp. file space */
     /* (temp. file space does not need to be freed) */
-    if(!H5F_IS_TMP_ADDR(hdr->f, iblock->addr)) {
-/* Currently, the old block data is "thrown away" after the space is reallocated,
-* to avoid data copy in H5MF_realloc() call by just free'ing the space and
-* allocating new space.
-*
-* This also keeps the file smaller, by freeing the space and then
-* allocating new space, instead of vice versa (in H5MF_realloc).
-*
-* QAK - 3/14/2006
-*/
+    if (!H5F_IS_TMP_ADDR(hdr->f, iblock->addr)) {
+        /* Currently, the old block data is "thrown away" after the space is reallocated,
+         * to avoid data copy in H5MF_realloc() call by just free'ing the space and
+         * allocating new space.
+         *
+         * This also keeps the file smaller, by freeing the space and then
+         * allocating new space, instead of vice versa (in H5MF_realloc).
+         *
+         * QAK - 3/14/2006
+         */
         /* Free previous indirect block disk space */
-        if(H5MF_xfree(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, iblock->addr, (hsize_t)iblock->size) < 0)
+        if (H5MF_xfree(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, iblock->addr, (hsize_t)iblock->size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap indirect block file space")
     } /* end if */
 
     /* Compute size of buffer needed for new indirect block */
-    iblock->nrows = new_nrows;
+    iblock->nrows   = new_nrows;
     old_iblock_size = iblock->size;
-    iblock->size = H5HF_MAN_INDIRECT_SIZE(hdr, iblock->nrows);
+    iblock->size    = H5HF_MAN_INDIRECT_SIZE(hdr, iblock->nrows);
 
     /* Allocate [temporary] space for the new indirect block on disk */
-    if(H5F_USE_TMP_SPACE(hdr->f)) {
-        if(HADDR_UNDEF == (new_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
+    if (H5F_USE_TMP_SPACE(hdr->f)) {
+        if (HADDR_UNDEF == (new_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
     } /* end if */
     else {
-        if(HADDR_UNDEF == (new_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
+        if (HADDR_UNDEF ==
+            (new_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
     } /* end else */
 
     /* Resize pinned indirect block in the cache, if its changed size */
-    if(old_iblock_size != iblock->size) {
-        if(H5AC_resize_entry(iblock, (size_t)iblock->size) < 0)
+    if (old_iblock_size != iblock->size) {
+        if (H5AC_resize_entry(iblock, (size_t)iblock->size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block")
     } /* end if */
 
     /* Move object in cache, if it actually was relocated */
-    if(H5F_addr_ne(iblock->addr, new_addr)) {
-        if(H5AC_move_entry(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
+    if (H5F_addr_ne(iblock->addr, new_addr)) {
+        if (H5AC_move_entry(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move fractal heap root indirect block")
         iblock->addr = new_addr;
     } /* end if */
 
     /* Re-allocate child block entry array */
-    if(NULL == (iblock->ents = H5FL_SEQ_REALLOC(H5HF_indirect_ent_t, iblock->ents, (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
+    if (NULL == (iblock->ents = H5FL_SEQ_REALLOC(H5HF_indirect_ent_t, iblock->ents,
+                                                 (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
         HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for direct entries")
 
     /* Check for skipping over rows and add free section for skipped rows */
-    if(skip_direct_rows) {
+    if (skip_direct_rows) {
         /* Add skipped blocks to heap's free space */
-        if(H5HF_hdr_skip_blocks(hdr, dxpl_id, iblock, next_entry, (new_next_entry - next_entry)) < 0)
+        if (H5HF_hdr_skip_blocks(hdr, dxpl_id, iblock, next_entry, (new_next_entry - next_entry)) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space")
     } /* end if */
 
     /* Initialize new direct block entries in rows added */
     acc_dblock_free = 0;
-    for(u = (old_nrows * hdr->man_dtable.cparam.width); u < (iblock->nrows * hdr->man_dtable.cparam.width); u++) {
-        unsigned row = u / hdr->man_dtable.cparam.width;        /* Row for current entry */
+    for (u = (old_nrows * hdr->man_dtable.cparam.width); u < (iblock->nrows * hdr->man_dtable.cparam.width);
+         u++) {
+        unsigned row = u / hdr->man_dtable.cparam.width; /* Row for current entry */
 
         iblock->ents[u].addr = HADDR_UNDEF;
         acc_dblock_free += hdr->man_dtable.row_tot_dblock_free[row];
     } /* end for */
 
     /* Check for needing to re-allocate filtered entry array */
-    if(hdr->filter_len > 0 && old_nrows < hdr->man_dtable.max_direct_rows) {
-        unsigned dir_rows;      /* Number of direct rows in this indirect block */
+    if (hdr->filter_len > 0 && old_nrows < hdr->man_dtable.max_direct_rows) {
+        unsigned dir_rows; /* Number of direct rows in this indirect block */
 
         /* Compute the number of direct rows for this indirect block */
         dir_rows = MIN(iblock->nrows, hdr->man_dtable.max_direct_rows);
         HDassert(dir_rows > old_nrows);
 
         /* Re-allocate filtered direct block entry array */
-        if(NULL == (iblock->filt_ents = H5FL_SEQ_REALLOC(H5HF_indirect_filt_ent_t, iblock->filt_ents, (size_t)(dir_rows * hdr->man_dtable.cparam.width))))
+        if (NULL == (iblock->filt_ents = H5FL_SEQ_REALLOC(H5HF_indirect_filt_ent_t, iblock->filt_ents,
+                                                          (size_t)(dir_rows * hdr->man_dtable.cparam.width))))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries")
 
         /* Initialize new entries allocated */
-        for(u = (old_nrows * hdr->man_dtable.cparam.width); u < (dir_rows * hdr->man_dtable.cparam.width); u++) {
-            iblock->filt_ents[u].size = 0;
+        for (u = (old_nrows * hdr->man_dtable.cparam.width); u < (dir_rows * hdr->man_dtable.cparam.width);
+             u++) {
+            iblock->filt_ents[u].size        = 0;
             iblock->filt_ents[u].filter_mask = 0;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Check for needing to re-allocate child iblock pointer array */
-    if(iblock->nrows > hdr->man_dtable.max_direct_rows) {
-        unsigned indir_rows;      /* Number of indirect rows in this indirect block */
-        unsigned old_indir_rows;  /* Previous number of indirect rows in this indirect block */
+    if (iblock->nrows > hdr->man_dtable.max_direct_rows) {
+        unsigned indir_rows;     /* Number of indirect rows in this indirect block */
+        unsigned old_indir_rows; /* Previous number of indirect rows in this indirect block */
 
         /* Compute the number of direct rows for this indirect block */
         indir_rows = iblock->nrows - hdr->man_dtable.max_direct_rows;
 
         /* Re-allocate child indirect block array */
-        if(NULL == (iblock->child_iblocks = H5FL_SEQ_REALLOC(H5HF_indirect_ptr_t, iblock->child_iblocks, (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
+        if (NULL ==
+            (iblock->child_iblocks = H5FL_SEQ_REALLOC(H5HF_indirect_ptr_t, iblock->child_iblocks,
+                                                      (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries")
 
         /* Compute the previous # of indirect rows in this block */
-        if(old_nrows < hdr->man_dtable.max_direct_rows)
+        if (old_nrows < hdr->man_dtable.max_direct_rows)
             old_indir_rows = 0;
         else
             old_indir_rows = old_nrows - hdr->man_dtable.max_direct_rows;
 
         /* Initialize new entries allocated */
-        for(u = (old_indir_rows * hdr->man_dtable.cparam.width); u < (indir_rows * hdr->man_dtable.cparam.width); u++)
+        for (u = (old_indir_rows * hdr->man_dtable.cparam.width);
+             u < (indir_rows * hdr->man_dtable.cparam.width); u++)
             iblock->child_iblocks[u] = NULL;
     } /* end if */
 
     /* Mark indirect block as dirty */
-    if(H5HF_iblock_dirty(iblock) < 0)
+    if (H5HF_iblock_dirty(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
 
     /* Update other shared header info */
     hdr->man_dtable.curr_root_rows = new_nrows;
-    hdr->man_dtable.table_addr = new_addr;
+    hdr->man_dtable.table_addr     = new_addr;
 
     /* Extend heap to cover new root indirect block */
-    if(H5HF_hdr_adjust_heap(hdr, 2 * hdr->man_dtable.row_block_off[new_nrows - 1], (hssize_t)acc_dblock_free) < 0)
+    if (H5HF_hdr_adjust_heap(hdr, 2 * hdr->man_dtable.row_block_off[new_nrows - 1],
+                             (hssize_t)acc_dblock_free) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_root_double() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_root_halve
  *
@@ -707,15 +711,15 @@ done:
 static herr_t
 H5HF_man_iblock_root_halve(H5HF_indirect_t *iblock, hid_t dxpl_id)
 {
-    H5HF_hdr_t *hdr = iblock->hdr;      /* Pointer to heap header */
-    haddr_t new_addr;                   /* New address of indirect block */
-    hsize_t acc_dblock_free;            /* Accumulated free space in direct blocks */
-    hsize_t old_size;                   /* Old size of indirect block */
-    unsigned max_child_row;             /* Row for max. child entry */
-    unsigned old_nrows;                 /* Old # of rows */
-    unsigned new_nrows;                 /* New # of rows */
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_hdr_t *hdr = iblock->hdr;   /* Pointer to heap header */
+    haddr_t     new_addr;            /* New address of indirect block */
+    hsize_t     acc_dblock_free;     /* Accumulated free space in direct blocks */
+    hsize_t     old_size;            /* Old size of indirect block */
+    unsigned    max_child_row;       /* Row for max. child entry */
+    unsigned    old_nrows;           /* Old # of rows */
+    unsigned    new_nrows;           /* New # of rows */
+    unsigned    u;                   /* Local index variable */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -732,100 +736,108 @@ H5HF_man_iblock_root_halve(H5HF_indirect_t *iblock, hid_t dxpl_id)
 
     /* Check if the indirect block is NOT currently allocated in temp. file space */
     /* (temp. file space does not need to be freed) */
-    if(!H5F_IS_TMP_ADDR(hdr->f, iblock->addr)) {
-/* Currently, the old block data is "thrown away" after the space is reallocated,
-* to avoid data copy in H5MF_realloc() call by just free'ing the space and
-* allocating new space.
-*
-* This also keeps the file smaller, by freeing the space and then
-* allocating new space, instead of vice versa (in H5MF_realloc).
-*
-* QAK - 6/12/2006
-*/
+    if (!H5F_IS_TMP_ADDR(hdr->f, iblock->addr)) {
+        /* Currently, the old block data is "thrown away" after the space is reallocated,
+         * to avoid data copy in H5MF_realloc() call by just free'ing the space and
+         * allocating new space.
+         *
+         * This also keeps the file smaller, by freeing the space and then
+         * allocating new space, instead of vice versa (in H5MF_realloc).
+         *
+         * QAK - 6/12/2006
+         */
         /* Free previous indirect block disk space */
-        if(H5MF_xfree(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, iblock->addr, (hsize_t)iblock->size) < 0)
+        if (H5MF_xfree(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, iblock->addr, (hsize_t)iblock->size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap indirect block file space")
     } /* end if */
 
     /* Compute free space in rows to delete */
     acc_dblock_free = 0;
-    for(u = new_nrows; u < iblock->nrows; u++)
+    for (u = new_nrows; u < iblock->nrows; u++)
         acc_dblock_free += hdr->man_dtable.row_tot_dblock_free[u] * hdr->man_dtable.cparam.width;
 
     /* Compute size of buffer needed for new indirect block */
-    old_nrows = iblock->nrows;
+    old_nrows     = iblock->nrows;
     iblock->nrows = new_nrows;
-    old_size = iblock->size;
-    iblock->size = H5HF_MAN_INDIRECT_SIZE(hdr, iblock->nrows);
+    old_size      = iblock->size;
+    iblock->size  = H5HF_MAN_INDIRECT_SIZE(hdr, iblock->nrows);
 
     /* Allocate [temporary] space for the new indirect block on disk */
-    if(H5F_USE_TMP_SPACE(hdr->f)) {
-        if(HADDR_UNDEF == (new_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
+    if (H5F_USE_TMP_SPACE(hdr->f)) {
+        if (HADDR_UNDEF == (new_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
     } /* end if */
     else {
-        if(HADDR_UNDEF == (new_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
+        if (HADDR_UNDEF ==
+            (new_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
     } /* end else */
 
     /* Resize pinned indirect block in the cache, if it has changed size */
-    if(old_size != iblock->size) {
-        if(H5AC_resize_entry(iblock, (size_t)iblock->size) < 0)
+    if (old_size != iblock->size) {
+        if (H5AC_resize_entry(iblock, (size_t)iblock->size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block")
     } /* end if */
 
     /* Move object in cache, if it actually was relocated */
-    if(H5F_addr_ne(iblock->addr, new_addr)) {
-        if(H5AC_move_entry(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
+    if (H5F_addr_ne(iblock->addr, new_addr)) {
+        if (H5AC_move_entry(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSPLIT, FAIL, "unable to move fractal heap root indirect block")
         iblock->addr = new_addr;
     } /* end if */
 
     /* Re-allocate child block entry array */
-    if(NULL == (iblock->ents = H5FL_SEQ_REALLOC(H5HF_indirect_ent_t, iblock->ents, (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
+    if (NULL == (iblock->ents = H5FL_SEQ_REALLOC(H5HF_indirect_ent_t, iblock->ents,
+                                                 (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct entries")
 
     /* Check for needing to re-allocate filtered entry array */
-    if(hdr->filter_len > 0 && new_nrows < hdr->man_dtable.max_direct_rows) {
+    if (hdr->filter_len > 0 && new_nrows < hdr->man_dtable.max_direct_rows) {
         /* Re-allocate filtered direct block entry array */
-        if(NULL == (iblock->filt_ents = H5FL_SEQ_REALLOC(H5HF_indirect_filt_ent_t, iblock->filt_ents, (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
+        if (NULL ==
+            (iblock->filt_ents = H5FL_SEQ_REALLOC(H5HF_indirect_filt_ent_t, iblock->filt_ents,
+                                                  (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries")
     } /* end if */
 
     /* Check for needing to re-allocate child iblock pointer array */
-    if(old_nrows > hdr->man_dtable.max_direct_rows) {
+    if (old_nrows > hdr->man_dtable.max_direct_rows) {
         /* Check for shrinking away child iblock pointer array */
-        if(iblock->nrows > hdr->man_dtable.max_direct_rows) {
-            unsigned indir_rows;      /* Number of indirect rows in this indirect block */
+        if (iblock->nrows > hdr->man_dtable.max_direct_rows) {
+            unsigned indir_rows; /* Number of indirect rows in this indirect block */
 
             /* Compute the number of direct rows for this indirect block */
             indir_rows = iblock->nrows - hdr->man_dtable.max_direct_rows;
 
             /* Re-allocate child indirect block array */
-            if(NULL == (iblock->child_iblocks = H5FL_SEQ_REALLOC(H5HF_indirect_ptr_t, iblock->child_iblocks, (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
-                HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries")
+            if (NULL == (iblock->child_iblocks =
+                             H5FL_SEQ_REALLOC(H5HF_indirect_ptr_t, iblock->child_iblocks,
+                                              (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
+                HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                            "memory allocation failed for filtered direct entries")
         } /* end if */
         else
-            iblock->child_iblocks = (H5HF_indirect_ptr_t *)H5FL_SEQ_FREE(H5HF_indirect_ptr_t, iblock->child_iblocks);
+            iblock->child_iblocks =
+                (H5HF_indirect_ptr_t *)H5FL_SEQ_FREE(H5HF_indirect_ptr_t, iblock->child_iblocks);
     } /* end if */
 
     /* Mark indirect block as dirty */
-    if(H5HF_iblock_dirty(iblock) < 0)
+    if (H5HF_iblock_dirty(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
 
     /* Update other shared header info */
     hdr->man_dtable.curr_root_rows = new_nrows;
-    hdr->man_dtable.table_addr = new_addr;
+    hdr->man_dtable.table_addr     = new_addr;
 
     /* Shrink heap to only cover new root indirect block */
-    if(H5HF_hdr_adjust_heap(hdr, 2 * hdr->man_dtable.row_block_off[new_nrows - 1], -(hssize_t)acc_dblock_free) < 0)
+    if (H5HF_hdr_adjust_heap(hdr, 2 * hdr->man_dtable.row_block_off[new_nrows - 1],
+                             -(hssize_t)acc_dblock_free) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce space to cover root direct block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_root_halve() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_root_revert
  *
@@ -845,11 +857,11 @@ done:
 static herr_t
 H5HF_man_iblock_root_revert(H5HF_indirect_t *root_iblock, hid_t dxpl_id)
 {
-    H5HF_hdr_t *hdr;                    /* Pointer to heap's header */
+    H5HF_hdr_t *   hdr;                 /* Pointer to heap's header */
     H5HF_direct_t *dblock = NULL;       /* Pointer to new root indirect block */
-    haddr_t dblock_addr;                /* Direct block's address in the file */
-    size_t dblock_size;                 /* Direct block's size */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    haddr_t        dblock_addr;         /* Direct block's address in the file */
+    size_t         dblock_size;         /* Direct block's size */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -859,54 +871,55 @@ H5HF_man_iblock_root_revert(H5HF_indirect_t *root_iblock, hid_t dxpl_id)
     HDassert(root_iblock);
 
     /* Set up local convenience variables */
-    hdr = root_iblock->hdr;
+    hdr         = root_iblock->hdr;
     dblock_addr = root_iblock->ents[0].addr;
     dblock_size = hdr->man_dtable.cparam.start_block_size;
 
     /* Get pointer to last direct block */
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, root_iblock, 0, H5AC_WRITE)))
+    if (NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, root_iblock, 0,
+                                                  H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
     HDassert(dblock->parent == root_iblock);
     HDassert(dblock->par_entry == 0);
 
     /* Check for I/O filters on this heap */
-    if(hdr->filter_len > 0) {
+    if (hdr->filter_len > 0) {
         /* Set the header's pipeline information from the indirect block */
-        hdr->pline_root_direct_size = root_iblock->filt_ents[0].size;
+        hdr->pline_root_direct_size        = root_iblock->filt_ents[0].size;
         hdr->pline_root_direct_filter_mask = root_iblock->filt_ents[0].filter_mask;
     } /* end if */
 
     /* Detach direct block from parent */
-    if(H5HF_man_iblock_detach(dblock->parent, dxpl_id, 0) < 0)
+    if (H5HF_man_iblock_detach(dblock->parent, dxpl_id, 0) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach direct block from parent indirect block")
-    dblock->parent = NULL;
+    dblock->parent    = NULL;
     dblock->par_entry = 0;
 
     /* Point root at direct block */
     hdr->man_dtable.curr_root_rows = 0;
-    hdr->man_dtable.table_addr = dblock_addr;
+    hdr->man_dtable.table_addr     = dblock_addr;
 
     /* Reset 'next block' iterator */
-    if(H5HF_hdr_reset_iter(hdr, (hsize_t)dblock_size) < 0)
+    if (H5HF_hdr_reset_iter(hdr, (hsize_t)dblock_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reset block iterator")
 
     /* Extend heap to just cover first direct block */
-    if(H5HF_hdr_adjust_heap(hdr, (hsize_t)hdr->man_dtable.cparam.start_block_size, (hssize_t)hdr->man_dtable.row_tot_dblock_free[0]) < 0)
+    if (H5HF_hdr_adjust_heap(hdr, (hsize_t)hdr->man_dtable.cparam.start_block_size,
+                             (hssize_t)hdr->man_dtable.row_tot_dblock_free[0]) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block")
 
     /* Scan free space sections to reset any 'parent' pointers */
-    if(H5HF_space_revert_root(hdr, dxpl_id) < 0)
+    if (H5HF_space_revert_root(hdr, dxpl_id) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRESET, FAIL, "can't reset free space section info")
 
-
 done:
-    if(dblock && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
+    if (dblock &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_root_revert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_alloc_row
  *
@@ -926,11 +939,11 @@ done:
 herr_t
 H5HF_man_iblock_alloc_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t **sec_node)
 {
-    H5HF_indirect_t *iblock = NULL;     /* Pointer to indirect block */
+    H5HF_indirect_t *    iblock       = NULL;      /* Pointer to indirect block */
     H5HF_free_section_t *old_sec_node = *sec_node; /* Pointer to old indirect section node */
-    unsigned dblock_entry;              /* Entry for direct block */
-    hbool_t iblock_held = FALSE;        /* Flag to indicate that indirect block is held */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned             dblock_entry;             /* Entry for direct block */
+    hbool_t              iblock_held = FALSE;      /* Flag to indicate that indirect block is held */
+    herr_t               ret_value   = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -942,39 +955,39 @@ H5HF_man_iblock_alloc_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t **
     HDassert(old_sec_node->u.row.row < hdr->man_dtable.max_direct_rows);
 
     /* Check for serialized section */
-    if(old_sec_node->sect_info.state == H5FS_SECT_SERIALIZED) {
+    if (old_sec_node->sect_info.state == H5FS_SECT_SERIALIZED) {
         /* Revive indirect section */
-        if(H5HF_sect_row_revive(hdr, dxpl_id, old_sec_node) < 0)
+        if (H5HF_sect_row_revive(hdr, dxpl_id, old_sec_node) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREVIVE, FAIL, "can't revive indirect section")
     } /* end if */
 
     /* Get a pointer to the indirect block covering the section */
-    if(NULL == (iblock = H5HF_sect_row_get_iblock(old_sec_node)))
+    if (NULL == (iblock = H5HF_sect_row_get_iblock(old_sec_node)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve indirect block for row section")
 
     /* Hold indirect block in memory, until direct block can point to it */
-    if(H5HF_iblock_incr(iblock) < 0)
+    if (H5HF_iblock_incr(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
     iblock_held = TRUE;
 
     /* Reduce (& possibly re-add) 'row' section */
-    if(H5HF_sect_row_reduce(hdr, dxpl_id, old_sec_node, &dblock_entry) < 0)
+    if (H5HF_sect_row_reduce(hdr, dxpl_id, old_sec_node, &dblock_entry) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce row section node")
 
     /* Create direct block & single section */
-    if(H5HF_man_dblock_create(dxpl_id, hdr, iblock, dblock_entry, NULL, sec_node) < 0)
+    if (H5HF_man_dblock_create(dxpl_id, hdr, iblock, dblock_entry, NULL, sec_node) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap direct block")
 
 done:
     /* Release hold on indirect block */
-    if(iblock_held)
-        if(H5HF_iblock_decr(iblock) < 0)
-            HDONE_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
+    if (iblock_held)
+        if (H5HF_iblock_decr(iblock) < 0)
+            HDONE_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                        "can't decrement reference count on shared indirect block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_alloc_row() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_create
  *
@@ -989,12 +1002,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *par_iblock,
-    unsigned par_entry, unsigned nrows, unsigned max_rows, haddr_t *addr_p)
+H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *par_iblock, unsigned par_entry,
+                       unsigned nrows, unsigned max_rows, haddr_t *addr_p)
 {
-    H5HF_indirect_t *iblock = NULL;     /* Pointer to indirect block */
-    size_t u;                           /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *iblock = NULL;       /* Pointer to indirect block */
+    size_t           u;                   /* Local index variable */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1008,107 +1021,115 @@ H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *par_iblo
     /*
      * Allocate file and memory data structures.
      */
-    if(NULL == (iblock = H5FL_MALLOC(H5HF_indirect_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap indirect block")
+    if (NULL == (iblock = H5FL_MALLOC(H5HF_indirect_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "memory allocation failed for fractal heap indirect block")
 
     /* Reset the metadata cache info for the heap header */
     HDmemset(&iblock->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Share common heap information */
     iblock->hdr = hdr;
-    if(H5HF_hdr_incr(hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared heap header")
+    if (H5HF_hdr_incr(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared heap header")
 
     /* Set info for direct block */
-    iblock->rc = 0;
-    iblock->nrows = nrows;
+    iblock->rc       = 0;
+    iblock->nrows    = nrows;
     iblock->max_rows = max_rows;
 
     /* Compute size of buffer needed for indirect block */
     iblock->size = H5HF_MAN_INDIRECT_SIZE(hdr, iblock->nrows);
 
     /* Allocate child block entry array */
-    if(NULL == (iblock->ents = H5FL_SEQ_MALLOC(H5HF_indirect_ent_t, (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries")
+    if (NULL == (iblock->ents = H5FL_SEQ_MALLOC(H5HF_indirect_ent_t,
+                                                (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries")
 
     /* Initialize indirect block entry tables */
-    for(u = 0; u < (iblock->nrows * hdr->man_dtable.cparam.width); u++)
+    for (u = 0; u < (iblock->nrows * hdr->man_dtable.cparam.width); u++)
         iblock->ents[u].addr = HADDR_UNDEF;
 
     /* Check for I/O filters to apply to this heap */
-    if(hdr->filter_len > 0) {
-        unsigned dir_rows;      /* Number of direct rows in this indirect block */
+    if (hdr->filter_len > 0) {
+        unsigned dir_rows; /* Number of direct rows in this indirect block */
 
         /* Compute the number of direct rows for this indirect block */
         dir_rows = MIN(iblock->nrows, hdr->man_dtable.max_direct_rows);
 
         /* Allocate & initialize indirect block filtered entry array */
-        if(NULL == (iblock->filt_ents = H5FL_SEQ_CALLOC(H5HF_indirect_filt_ent_t, (size_t)(dir_rows * hdr->man_dtable.cparam.width))))
+        if (NULL == (iblock->filt_ents = H5FL_SEQ_CALLOC(H5HF_indirect_filt_ent_t,
+                                                         (size_t)(dir_rows * hdr->man_dtable.cparam.width))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries")
     } /* end if */
     else
         iblock->filt_ents = NULL;
 
     /* Check if we have any indirect block children */
-    if(iblock->nrows > hdr->man_dtable.max_direct_rows) {
-        unsigned indir_rows;      /* Number of indirect rows in this indirect block */
+    if (iblock->nrows > hdr->man_dtable.max_direct_rows) {
+        unsigned indir_rows; /* Number of indirect rows in this indirect block */
 
         /* Compute the number of indirect rows for this indirect block */
         indir_rows = iblock->nrows - hdr->man_dtable.max_direct_rows;
 
         /* Allocate & initialize child indirect block pointer array */
-        if(NULL == (iblock->child_iblocks = H5FL_SEQ_CALLOC(H5HF_indirect_ptr_t, (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
+        if (NULL == (iblock->child_iblocks = H5FL_SEQ_CALLOC(
+                         H5HF_indirect_ptr_t, (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries")
     } /* end if */
     else
         iblock->child_iblocks = NULL;
 
     /* Allocate [temporary] space for the indirect block on disk */
-    if(H5F_USE_TMP_SPACE(hdr->f)) {
-        if(HADDR_UNDEF == (*addr_p = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
+    if (H5F_USE_TMP_SPACE(hdr->f)) {
+        if (HADDR_UNDEF == (*addr_p = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                        "file allocation failed for fractal heap indirect block")
     } /* end if */
     else {
-        if(HADDR_UNDEF == (*addr_p = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
+        if (HADDR_UNDEF ==
+            (*addr_p = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                        "file allocation failed for fractal heap indirect block")
     } /* end else */
     iblock->addr = *addr_p;
 
     /* Attach to parent indirect block, if there is one */
-    iblock->parent = par_iblock;
+    iblock->parent    = par_iblock;
     iblock->par_entry = par_entry;
-    if(iblock->parent) {
+    if (iblock->parent) {
         /* Attach new block to parent */
-        if(H5HF_man_iblock_attach(iblock->parent, par_entry, *addr_p) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't attach indirect block to parent indirect block")
+        if (H5HF_man_iblock_attach(iblock->parent, par_entry, *addr_p) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL,
+                        "can't attach indirect block to parent indirect block")
 
         /* Compute the indirect block's offset in the heap's address space */
         /* (based on parent's block offset) */
         iblock->block_off = par_iblock->block_off;
         iblock->block_off += hdr->man_dtable.row_block_off[par_entry / hdr->man_dtable.cparam.width];
-        iblock->block_off += hdr->man_dtable.row_block_size[par_entry / hdr->man_dtable.cparam.width] * (par_entry % hdr->man_dtable.cparam.width);
+        iblock->block_off += hdr->man_dtable.row_block_size[par_entry / hdr->man_dtable.cparam.width] *
+                             (par_entry % hdr->man_dtable.cparam.width);
     } /* end if */
     else
-        iblock->block_off = 0;  /* Must be the root indirect block... */
+        iblock->block_off = 0; /* Must be the root indirect block... */
 
     /* Update indirect block's statistics */
     iblock->nchildren = 0;
     iblock->max_child = 0;
 
     /* Cache the new indirect block */
-    if(H5AC_insert_entry(hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, *addr_p, iblock, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap indirect block to cache")
+    if (H5AC_insert_entry(hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, *addr_p, iblock, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap indirect block to cache")
 
 done:
-    if(ret_value < 0)
-        if(iblock)
-            if(H5HF_man_iblock_dest(iblock) < 0)
+    if (ret_value < 0)
+        if (iblock)
+            if (H5HF_man_iblock_dest(iblock) < 0)
                 HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap indirect block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_protect
  *
@@ -1123,14 +1144,14 @@ done:
  *-------------------------------------------------------------------------
  */
 H5HF_indirect_t *
-H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
-    unsigned iblock_nrows, H5HF_indirect_t *par_iblock, unsigned par_entry,
-    hbool_t must_protect, H5AC_protect_t rw, hbool_t *did_protect)
+H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr, unsigned iblock_nrows,
+                        H5HF_indirect_t *par_iblock, unsigned par_entry, hbool_t must_protect,
+                        H5AC_protect_t rw, hbool_t *did_protect)
 {
-    H5HF_parent_t par_info;             /* Parent info for loading block */
-    H5HF_indirect_t *iblock = NULL;     /* Indirect block from cache */
-    hbool_t should_protect = FALSE;     /* Whether we should protect the indirect block or not */
-    H5HF_indirect_t *ret_value;         /* Return value */
+    H5HF_parent_t    par_info;               /* Parent info for loading block */
+    H5HF_indirect_t *iblock         = NULL;  /* Indirect block from cache */
+    hbool_t          should_protect = FALSE; /* Whether we should protect the indirect block or not */
+    H5HF_indirect_t *ret_value;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1143,31 +1164,29 @@ H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
     HDassert(did_protect);
 
     /* Check if we are allowed to use existing pinned iblock pointer */
-    if(!must_protect) {
+    if (!must_protect) {
         /* Check for this block already being pinned */
-        if(par_iblock) {
-            unsigned indir_idx;             /* Index in parent's child iblock pointer array */
+        if (par_iblock) {
+            unsigned indir_idx; /* Index in parent's child iblock pointer array */
 
             /* Sanity check */
             HDassert(par_iblock->child_iblocks);
-            HDassert(par_entry >= (hdr->man_dtable.max_direct_rows
-                    * hdr->man_dtable.cparam.width));
+            HDassert(par_entry >= (hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width));
 
             /* Compute index in parent's child iblock pointer array */
-            indir_idx = par_entry - (hdr->man_dtable.max_direct_rows
-                    * hdr->man_dtable.cparam.width);
+            indir_idx = par_entry - (hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width);
 
             /* Check for pointer to pinned indirect block in parent */
-            if(par_iblock->child_iblocks[indir_idx])
+            if (par_iblock->child_iblocks[indir_idx])
                 iblock = par_iblock->child_iblocks[indir_idx];
             else
                 should_protect = TRUE;
         } /* end if */
         else {
             /* Check for root indirect block */
-            if(H5F_addr_eq(iblock_addr, hdr->man_dtable.table_addr)) {
+            if (H5F_addr_eq(iblock_addr, hdr->man_dtable.table_addr)) {
                 /* Check for valid pointer to pinned indirect block in root */
-                if(H5HF_ROOT_IBLOCK_PINNED == hdr->root_iblock_flags) {
+                if (H5HF_ROOT_IBLOCK_PINNED == hdr->root_iblock_flags) {
                     /* Sanity check */
                     HDassert(NULL != hdr->root_iblock);
 
@@ -1180,40 +1199,41 @@ H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
 
                     should_protect = TRUE;
                 } /* end else */
-            } /* end if */
+            }     /* end if */
             else
                 should_protect = TRUE;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Check for protecting indirect block */
-    if(must_protect || should_protect) {
+    if (must_protect || should_protect) {
         H5HF_iblock_cache_ud_t cache_udata; /* User-data for callback */
 
         /* Set up parent info */
-        par_info.hdr = hdr;
+        par_info.hdr    = hdr;
         par_info.iblock = par_iblock;
-        par_info.entry = par_entry;
+        par_info.entry  = par_entry;
 
         /* Set up user data for protect call */
-        cache_udata.f = hdr->f;
+        cache_udata.f        = hdr->f;
         cache_udata.par_info = &par_info;
-        cache_udata.nrows = &iblock_nrows;
+        cache_udata.nrows    = &iblock_nrows;
 
         /* Protect the indirect block */
-        if(NULL == (iblock = (H5HF_indirect_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr, &cache_udata, rw)))
+        if (NULL == (iblock = (H5HF_indirect_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr,
+                                                              &cache_udata, rw)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap indirect block")
 
         /* Set the indirect block's address */
         iblock->addr = iblock_addr;
 
         /* Check for root indirect block */
-        if(iblock->block_off == 0) {
+        if (iblock->block_off == 0) {
             /* Sanity check - shouldn't be recursively protecting root indirect block */
             HDassert(0 == (hdr->root_iblock_flags & H5HF_ROOT_IBLOCK_PROTECTED));
 
             /* Check if we should set the root iblock pointer */
-            if(0 == hdr->root_iblock_flags) {
+            if (0 == hdr->root_iblock_flags) {
                 HDassert(NULL == hdr->root_iblock);
                 hdr->root_iblock = iblock;
             } /* end if */
@@ -1236,7 +1256,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_unprotect
  *
@@ -1251,10 +1270,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id,
-    unsigned cache_flags, hbool_t did_protect)
+H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id, unsigned cache_flags, hbool_t did_protect)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1265,14 +1283,14 @@ H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id,
 
     /* Check if we previously protected this indirect block */
     /* (as opposed to using an existing pointer to a pinned child indirect block) */
-    if(did_protect) {
+    if (did_protect) {
         /* Check for root indirect block */
-        if(iblock->block_off == 0) {
+        if (iblock->block_off == 0) {
             /* Sanity check - shouldn't be recursively unprotecting root indirect block */
             HDassert(iblock->hdr->root_iblock_flags & H5HF_ROOT_IBLOCK_PROTECTED);
 
             /* Check if we should reset the root iblock pointer */
-            if(H5HF_ROOT_IBLOCK_PROTECTED == iblock->hdr->root_iblock_flags) {
+            if (H5HF_ROOT_IBLOCK_PROTECTED == iblock->hdr->root_iblock_flags) {
                 HDassert(NULL != iblock->hdr->root_iblock);
                 iblock->hdr->root_iblock = NULL;
             } /* end if */
@@ -1282,7 +1300,7 @@ H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id,
         } /* end if */
 
         /* Unprotect the indirect block */
-        if(H5AC_unprotect(iblock->hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, iblock->addr, iblock, cache_flags) < 0)
+        if (H5AC_unprotect(iblock->hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, iblock->addr, iblock, cache_flags) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     } /* end if */
 
@@ -1290,7 +1308,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_unprotect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_attach
  *
@@ -1307,7 +1324,7 @@ done:
 herr_t
 H5HF_man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry, haddr_t child_addr)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1319,15 +1336,15 @@ H5HF_man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry, haddr_t child_ad
     HDassert(!H5F_addr_defined(iblock->ents[entry].addr));
 
     /* Increment the reference count on this indirect block */
-    if(H5HF_iblock_incr(iblock) < 0)
+    if (H5HF_iblock_incr(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
 
     /* Point at the child block */
     iblock->ents[entry].addr = child_addr;
 
     /* Check for I/O filters on this heap */
-    if(iblock->hdr->filter_len > 0) {
-        unsigned row;           /* Row for entry */
+    if (iblock->hdr->filter_len > 0) {
+        unsigned row; /* Row for entry */
 
         /* Sanity check */
         HDassert(iblock->filt_ents);
@@ -1336,26 +1353,25 @@ H5HF_man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry, haddr_t child_ad
         row = entry / iblock->hdr->man_dtable.cparam.width;
 
         /* If this is a direct block, set its initial size */
-        if(row < iblock->hdr->man_dtable.max_direct_rows)
+        if (row < iblock->hdr->man_dtable.max_direct_rows)
             iblock->filt_ents[entry].size = iblock->hdr->man_dtable.row_block_size[row];
     } /* end if */
 
     /* Check for max. entry used */
-    if(entry > iblock->max_child)
+    if (entry > iblock->max_child)
         iblock->max_child = entry;
 
     /* Increment the # of child blocks */
     iblock->nchildren++;
 
     /* Mark indirect block as modified */
-    if(H5HF_iblock_dirty(iblock) < 0)
+    if (H5HF_iblock_dirty(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_attach() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_detach
  *
@@ -1372,8 +1388,8 @@ done:
 herr_t
 H5HF_man_iblock_detach(H5HF_indirect_t *iblock, hid_t dxpl_id, unsigned entry)
 {
-    unsigned row;                       /* Row for entry */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned row;                 /* Row for entry */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1390,27 +1406,26 @@ H5HF_man_iblock_detach(H5HF_indirect_t *iblock, hid_t dxpl_id, unsigned entry)
     row = entry / iblock->hdr->man_dtable.cparam.width;
 
     /* Check for I/O filters on this heap */
-    if(iblock->hdr->filter_len > 0) {
+    if (iblock->hdr->filter_len > 0) {
         /* Sanity check */
         HDassert(iblock->filt_ents);
 
         /* If this is a direct block, reset its initial size */
-        if(row < iblock->hdr->man_dtable.max_direct_rows) {
-            iblock->filt_ents[entry].size = 0;
+        if (row < iblock->hdr->man_dtable.max_direct_rows) {
+            iblock->filt_ents[entry].size        = 0;
             iblock->filt_ents[entry].filter_mask = 0;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Check for indirect block being detached */
-    if(row >= iblock->hdr->man_dtable.max_direct_rows) {
-        unsigned indir_idx;             /* Index in parent's child iblock pointer array */
+    if (row >= iblock->hdr->man_dtable.max_direct_rows) {
+        unsigned indir_idx; /* Index in parent's child iblock pointer array */
 
         /* Sanity check */
         HDassert(iblock->child_iblocks);
 
         /* Compute index in child iblock pointer array */
-        indir_idx = entry - (iblock->hdr->man_dtable.max_direct_rows
-                * iblock->hdr->man_dtable.cparam.width);
+        indir_idx = entry - (iblock->hdr->man_dtable.max_direct_rows * iblock->hdr->man_dtable.cparam.width);
 
         /* Sanity check */
         HDassert(iblock->child_iblocks[indir_idx]);
@@ -1427,55 +1442,55 @@ H5HF_man_iblock_detach(H5HF_indirect_t *iblock, hid_t dxpl_id, unsigned entry)
     iblock->nchildren--;
 
     /* Reduce the max. entry used, if necessary */
-    if(entry == iblock->max_child) {
-        if(iblock->nchildren > 0)
-            while(!H5F_addr_defined(iblock->ents[iblock->max_child].addr))
+    if (entry == iblock->max_child) {
+        if (iblock->nchildren > 0)
+            while (!H5F_addr_defined(iblock->ents[iblock->max_child].addr))
                 iblock->max_child--;
         else
             iblock->max_child = 0;
     } /* end if */
 
     /* If this is the root indirect block handle some special cases */
-    if(iblock->block_off == 0) {
+    if (iblock->block_off == 0) {
         /* If the number of children drops to 1, and that child is the first
          *      direct block in the heap, convert the heap back to using a root
          *      direct block
          */
-        if(iblock->nchildren == 1 && H5F_addr_defined(iblock->ents[0].addr))
-            if(H5HF_man_iblock_root_revert(iblock, dxpl_id) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't convert root indirect block back to root direct block")
+        if (iblock->nchildren == 1 && H5F_addr_defined(iblock->ents[0].addr))
+            if (H5HF_man_iblock_root_revert(iblock, dxpl_id) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL,
+                            "can't convert root indirect block back to root direct block")
 
         /* Check for reducing size of root indirect block */
-        if(iblock->nchildren > 0 && iblock->hdr->man_dtable.cparam.start_root_rows != 0
-                && entry > iblock->max_child) {
-            unsigned max_child_row;         /* Row for max. child entry */
+        if (iblock->nchildren > 0 && iblock->hdr->man_dtable.cparam.start_root_rows != 0 &&
+            entry > iblock->max_child) {
+            unsigned max_child_row; /* Row for max. child entry */
 
             /* Compute information needed for determining whether to reduce size of root indirect block */
             max_child_row = iblock->max_child / iblock->hdr->man_dtable.cparam.width;
 
             /* Check if the root indirect block should be reduced */
-            if(iblock->nrows > 1 && max_child_row <= (iblock->nrows / 2))
-                if(H5HF_man_iblock_root_halve(iblock, dxpl_id) < 0)
+            if (iblock->nrows > 1 && max_child_row <= (iblock->nrows / 2))
+                if (H5HF_man_iblock_root_halve(iblock, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce size of root indirect block")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Mark indirect block as modified */
-    if(H5HF_iblock_dirty(iblock) < 0)
+    if (H5HF_iblock_dirty(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
 
     /* Decrement the reference count on this indirect block */
     /* (should be last, so that potential 'unpin' on this indirect block
      *  doesn't invalidate the 'iblock' variable)
      */
-    if(H5HF_iblock_decr(iblock) < 0)
+    if (H5HF_iblock_decr(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_detach() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_entry_addr
  *
@@ -1506,7 +1521,6 @@ H5HF_man_iblock_entry_addr(H5HF_indirect_t *iblock, unsigned entry, haddr_t *chi
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_man_iblock_entry_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_delete
  *
@@ -1525,15 +1539,15 @@ H5HF_man_iblock_entry_addr(H5HF_indirect_t *iblock, unsigned entry, haddr_t *chi
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
-    unsigned iblock_nrows, H5HF_indirect_t *par_iblock, unsigned par_entry)
+H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr, unsigned iblock_nrows,
+                       H5HF_indirect_t *par_iblock, unsigned par_entry)
 {
-    H5HF_indirect_t *iblock;            /* Pointer to indirect block */
-    unsigned row, col;                  /* Current row & column in indirect block */
-    unsigned entry;                     /* Current entry in row */
-    unsigned cache_flags = H5AC__NO_FLAGS_SET;      /* Flags for unprotecting indirect block */
-    hbool_t did_protect;                /* Whether we protected the indirect block or not */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *iblock;                           /* Pointer to indirect block */
+    unsigned         row, col;                         /* Current row & column in indirect block */
+    unsigned         entry;                            /* Current entry in row */
+    unsigned         cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting indirect block */
+    hbool_t          did_protect;                      /* Whether we protected the indirect block or not */
+    herr_t           ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1545,62 +1559,67 @@ H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
     HDassert(iblock_nrows > 0);
 
     /* Lock indirect block */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, par_iblock, par_entry, TRUE, H5AC_WRITE, &did_protect)))
+    if (NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, par_iblock,
+                                                  par_entry, TRUE, H5AC_WRITE, &did_protect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
     HDassert(iblock->nchildren > 0);
     HDassert(did_protect == TRUE);
 
     /* Iterate over rows in this indirect block */
     entry = 0;
-    for(row = 0; row < iblock->nrows; row++) {
+    for (row = 0; row < iblock->nrows; row++) {
         /* Iterate over entries in this row */
-        for(col = 0; col < hdr->man_dtable.cparam.width; col++, entry++) {
+        for (col = 0; col < hdr->man_dtable.cparam.width; col++, entry++) {
             /* Check for child entry at this position */
-            if(H5F_addr_defined(iblock->ents[entry].addr)) {
-                hsize_t row_block_size;         /* The size of blocks in this row */
+            if (H5F_addr_defined(iblock->ents[entry].addr)) {
+                hsize_t row_block_size; /* The size of blocks in this row */
 
                 /* Get the row's block size */
                 row_block_size = (hsize_t)hdr->man_dtable.row_block_size[row];
 
                 /* Are we in a direct or indirect block row */
-                if(row < hdr->man_dtable.max_direct_rows) {
-                    hsize_t dblock_size;        /* Size of direct block on disk */
+                if (row < hdr->man_dtable.max_direct_rows) {
+                    hsize_t dblock_size; /* Size of direct block on disk */
 
                     /* Check for I/O filters on this heap */
-                    if(hdr->filter_len > 0)
+                    if (hdr->filter_len > 0)
                         dblock_size = iblock->filt_ents[entry].size;
                     else
                         dblock_size = row_block_size;
 
                     /* Delete child direct block */
-                    if(H5HF_man_dblock_delete(hdr->f, dxpl_id, iblock->ents[entry].addr, dblock_size) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release fractal heap child direct block")
+                    if (H5HF_man_dblock_delete(hdr->f, dxpl_id, iblock->ents[entry].addr, dblock_size) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
+                                    "unable to release fractal heap child direct block")
                 } /* end if */
                 else {
-                    unsigned child_nrows;   /* Number of rows in new indirect block */
+                    unsigned child_nrows; /* Number of rows in new indirect block */
 
                     /* Compute # of rows in next child indirect block to use */
                     child_nrows = H5HF_dtable_size_to_rows(&hdr->man_dtable, row_block_size);
 
                     /* Delete child indirect block */
-                    if(H5HF_man_iblock_delete(hdr, dxpl_id, iblock->ents[entry].addr, child_nrows, iblock, entry) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release fractal heap child indirect block")
+                    if (H5HF_man_iblock_delete(hdr, dxpl_id, iblock->ents[entry].addr, child_nrows, iblock,
+                                               entry) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
+                                    "unable to release fractal heap child indirect block")
                 } /* end else */
-            } /* end if */
-        } /* end for */
-    } /* end row */
+            }     /* end if */
+        }         /* end for */
+    }             /* end row */
 
 #ifndef NDEBUG
-{
-    unsigned iblock_status = 0;         /* Indirect block's status in the metadata cache */
+    {
+        unsigned iblock_status = 0; /* Indirect block's status in the metadata cache */
 
-    /* Check the indirect block's status in the metadata cache */
-    if(H5AC_get_entry_status(hdr->f, iblock_addr, &iblock_status) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for indirect block")
+        /* Check the indirect block's status in the metadata cache */
+        if (H5AC_get_entry_status(hdr->f, iblock_addr, &iblock_status) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
+                        "unable to check metadata cache status for indirect block")
 
-    /* Check if indirect block is pinned */
-    HDassert(!(iblock_status & H5AC_ES__IS_PINNED));
-}
+        /* Check if indirect block is pinned */
+        HDassert(!(iblock_status & H5AC_ES__IS_PINNED));
+    }
 #endif /* NDEBUG */
 
     /* Indicate that the indirect block should be deleted & file space freed */
@@ -1608,13 +1627,12 @@ H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
 
 done:
     /* Unprotect the indirect block, with appropriate flags */
-    if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, cache_flags, did_protect) < 0)
+    if (iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, cache_flags, did_protect) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_delete() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5HF_man_iblock_size
@@ -1628,12 +1646,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_addr,
-    unsigned nrows, H5HF_indirect_t *par_iblock, unsigned par_entry, hsize_t *heap_size)
+H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_addr, unsigned nrows,
+                     H5HF_indirect_t *par_iblock, unsigned par_entry, hsize_t *heap_size)
 {
-    H5HF_indirect_t     *iblock = NULL;         /* Pointer to indirect block */
-    hbool_t             did_protect;            /* Whether we protected the indirect block or not */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5HF_indirect_t *iblock = NULL;       /* Pointer to indirect block */
+    hbool_t          did_protect;         /* Whether we protected the indirect block or not */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1646,44 +1664,47 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad
     HDassert(heap_size);
 
     /* Protect the indirect block */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, par_iblock, par_entry, FALSE, H5AC_READ, &did_protect)))
+    if (NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, par_iblock, par_entry,
+                                                  FALSE, H5AC_READ, &did_protect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap indirect block")
 
     /* Accumulate size of this indirect block */
     *heap_size += iblock->size;
 
     /* Indirect entries in this indirect block */
-    if(iblock->nrows > hdr->man_dtable.max_direct_rows) {
-	unsigned    first_row_bits;     /* Number of bits used bit addresses in first row */
-        unsigned    num_indirect_rows;  /* Number of rows of blocks in each indirect block */
-        unsigned    entry;              /* Current entry in row */
-        size_t      u;                  /* Local index variable */
-
-        entry = hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width;
-	first_row_bits = H5VM_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size) +
-			    H5VM_log2_of2(hdr->man_dtable.cparam.width);
-        num_indirect_rows =
-	    (H5VM_log2_gen(hdr->man_dtable.row_block_size[hdr->man_dtable.max_direct_rows]) - first_row_bits) + 1;
-        for(u = hdr->man_dtable.max_direct_rows; u < iblock->nrows; u++, num_indirect_rows++) {
-            size_t      v;                      /* Local index variable */
-
-	    for(v = 0; v < hdr->man_dtable.cparam.width; v++, entry++)
-		if(H5F_addr_defined(iblock->ents[entry].addr))
-		    if(H5HF_man_iblock_size(f, dxpl_id, hdr, iblock->ents[entry].addr, num_indirect_rows, iblock, entry, heap_size) < 0)
-			HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to get fractal heap storage info for indirect block")
+    if (iblock->nrows > hdr->man_dtable.max_direct_rows) {
+        unsigned first_row_bits;    /* Number of bits used bit addresses in first row */
+        unsigned num_indirect_rows; /* Number of rows of blocks in each indirect block */
+        unsigned entry;             /* Current entry in row */
+        size_t   u;                 /* Local index variable */
+
+        entry          = hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width;
+        first_row_bits = H5VM_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size) +
+                         H5VM_log2_of2(hdr->man_dtable.cparam.width);
+        num_indirect_rows = (H5VM_log2_gen(hdr->man_dtable.row_block_size[hdr->man_dtable.max_direct_rows]) -
+                             first_row_bits) +
+                            1;
+        for (u = hdr->man_dtable.max_direct_rows; u < iblock->nrows; u++, num_indirect_rows++) {
+            size_t v; /* Local index variable */
+
+            for (v = 0; v < hdr->man_dtable.cparam.width; v++, entry++)
+                if (H5F_addr_defined(iblock->ents[entry].addr))
+                    if (H5HF_man_iblock_size(f, dxpl_id, hdr, iblock->ents[entry].addr, num_indirect_rows,
+                                             iblock, entry, heap_size) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL,
+                                    "unable to get fractal heap storage info for indirect block")
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Release the indirect block */
-    if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+    if (iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     iblock = NULL;
 
-   FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_dest
  *
@@ -1700,7 +1721,7 @@ done:
 herr_t
 H5HF_man_iblock_dest(H5HF_indirect_t *iblock)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1712,18 +1733,19 @@ H5HF_man_iblock_dest(H5HF_indirect_t *iblock)
 
     /* Decrement reference count on shared info */
     HDassert(iblock->hdr);
-    if(H5HF_hdr_decr(iblock->hdr) < 0)
+    if (H5HF_hdr_decr(iblock->hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header")
-    if(iblock->parent)
-        if(H5HF_iblock_decr(iblock->parent) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
+    if (iblock->parent)
+        if (H5HF_iblock_decr(iblock->parent) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                        "can't decrement reference count on shared indirect block")
 
     /* Release entry tables */
-    if(iblock->ents)
+    if (iblock->ents)
         iblock->ents = H5FL_SEQ_FREE(H5HF_indirect_ent_t, iblock->ents);
-    if(iblock->filt_ents)
+    if (iblock->filt_ents)
         iblock->filt_ents = H5FL_SEQ_FREE(H5HF_indirect_filt_ent_t, iblock->filt_ents);
-    if(iblock->child_iblocks)
+    if (iblock->child_iblocks)
         iblock->child_iblocks = H5FL_SEQ_FREE(H5HF_indirect_ptr_t, iblock->child_iblocks);
 
     /* Free fractal heap indirect block info */
@@ -1732,4 +1754,3 @@ H5HF_man_iblock_dest(H5HF_indirect_t *iblock)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_dest() */
-
diff --git a/src/H5HFiter.c b/src/H5HFiter.c
index b01c5e1..50d93c2 100644
--- a/src/H5HFiter.c
+++ b/src/H5HFiter.c
@@ -26,46 +26,40 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -73,8 +67,6 @@
 /* Declare a free list to manage the H5HF_block_loc_t struct */
 H5FL_DEFINE(H5HF_block_loc_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_init
  *
@@ -106,7 +98,6 @@ H5HF_man_iter_init(H5HF_block_iter_t *biter)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_man_iter_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_start_offset
  *
@@ -122,19 +113,18 @@ H5HF_man_iter_init(H5HF_block_iter_t *biter)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_block_iter_t *biter, hsize_t offset)
+H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_block_iter_t *biter, hsize_t offset)
 {
-    H5HF_indirect_t *iblock;        /* Indirect block for location context */
-    haddr_t iblock_addr;            /* Address of indirect block */
-    unsigned iblock_nrows;          /* # of rows in indirect block */
-    H5HF_indirect_t *iblock_parent; /* Parent indirect block of location context */
-    unsigned iblock_par_entry;      /* Entry within parent indirect block */
-    hsize_t curr_offset;        /* Current offset, as adjusted */
-    unsigned row;               /* Current row we are on */
-    unsigned col;               /* Column in row */
-    hbool_t root_block = TRUE;  /* Flag to indicate the current block is the root indirect block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *iblock;               /* Indirect block for location context */
+    haddr_t          iblock_addr;          /* Address of indirect block */
+    unsigned         iblock_nrows;         /* # of rows in indirect block */
+    H5HF_indirect_t *iblock_parent;        /* Parent indirect block of location context */
+    unsigned         iblock_par_entry;     /* Entry within parent indirect block */
+    hsize_t          curr_offset;          /* Current offset, as adjusted */
+    unsigned         row;                  /* Current row we are on */
+    unsigned         col;                  /* Column in row */
+    hbool_t          root_block = TRUE;    /* Flag to indicate the current block is the root indirect block */
+    herr_t           ret_value  = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -148,30 +138,31 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
     HDassert(offset >= hdr->man_dtable.cparam.start_block_size);
 
     /* Allocate level structure */
-    if(NULL == (biter->curr = H5FL_MALLOC(H5HF_block_loc_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct block free list section")
-
-/*
-1:  <Scan down block offsets for dtable rows until find a row >= offset>
-    <Set current location's row, col, entry & size>
-    <If row < max_direct_rows>
-        <Done>
-    <Else - row > max_direct_rows>
-        <Create new block level>
-        <Link new block level into iterator>
-        <Adjust offset for block offset for row>
-        <Make new block level the current context>
-        <Goto 1>
-
-*/
+    if (NULL == (biter->curr = H5FL_MALLOC(H5HF_block_loc_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "memory allocation failed for direct block free list section")
+
+    /*
+    1:  <Scan down block offsets for dtable rows until find a row >= offset>
+        <Set current location's row, col, entry & size>
+        <If row < max_direct_rows>
+            <Done>
+        <Else - row > max_direct_rows>
+            <Create new block level>
+            <Link new block level into iterator>
+            <Adjust offset for block offset for row>
+            <Make new block level the current context>
+            <Goto 1>
+
+    */
     do {
-        hbool_t did_protect;            /* Whether we protected the indirect block or not */
+        hbool_t did_protect; /* Whether we protected the indirect block or not */
 
         /* Walk down the rows in the doubling table until we've found the correct row for the next block */
-        for(row = 0; row < hdr->man_dtable.max_root_rows; row++)
-            if((offset >= hdr->man_dtable.row_block_off[row]) &&
-                    (offset < hdr->man_dtable.row_block_off[row] +
-                        (hdr->man_dtable.cparam.width * hdr->man_dtable.row_block_size[row])))
+        for (row = 0; row < hdr->man_dtable.max_root_rows; row++)
+            if ((offset >= hdr->man_dtable.row_block_off[row]) &&
+                (offset < hdr->man_dtable.row_block_off[row] +
+                              (hdr->man_dtable.cparam.width * hdr->man_dtable.row_block_size[row])))
                 break;
 
         /* Adjust offset by row offset */
@@ -182,15 +173,15 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
         col = (unsigned)(curr_offset / hdr->man_dtable.row_block_size[row]);
 
         /* Set the current level's context */
-        biter->curr->row = row;
-        biter->curr->col = col;
+        biter->curr->row   = row;
+        biter->curr->col   = col;
         biter->curr->entry = (row * hdr->man_dtable.cparam.width) + col;
 
         /* Get the context indirect block's information */
-        if(root_block) {
-            iblock_addr = hdr->man_dtable.table_addr;
-            iblock_nrows = hdr->man_dtable.curr_root_rows;
-            iblock_parent = NULL;
+        if (root_block) {
+            iblock_addr      = hdr->man_dtable.table_addr;
+            iblock_nrows     = hdr->man_dtable.curr_root_rows;
+            iblock_parent    = NULL;
             iblock_par_entry = 0;
 
             /* The root block can't go up further... */
@@ -200,49 +191,53 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
             root_block = FALSE;
         } /* end if */
         else {
-            hsize_t child_size;     /* Size of new indirect block to create */
+            hsize_t child_size; /* Size of new indirect block to create */
 
             /* Retrieve the parent information from the previous context location */
-            iblock_parent = biter->curr->up->context;
+            iblock_parent    = biter->curr->up->context;
             iblock_par_entry = biter->curr->up->entry;
 
             /* Look up the address of context indirect block */
             iblock_addr = iblock_parent->ents[iblock_par_entry].addr;
 
             /* Compute # of rows in context indirect block */
-            child_size = hdr->man_dtable.row_block_size[biter->curr->up->row];
+            child_size   = hdr->man_dtable.row_block_size[biter->curr->up->row];
             iblock_nrows = (H5VM_log2_gen(child_size) - hdr->man_dtable.first_row_bits) + 1;
         } /* end else */
 
         /* Load indirect block for this context location */
-        if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, iblock_parent, iblock_par_entry, FALSE, H5AC_WRITE, &did_protect)))
+        if (NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, iblock_parent,
+                                                      iblock_par_entry, FALSE, H5AC_WRITE, &did_protect)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
 
         /* Make indirect block the context for the current location */
         biter->curr->context = iblock;
 
         /* Hold the indirect block with the location */
-        if(H5HF_iblock_incr(biter->curr->context) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
+        if (H5HF_iblock_incr(biter->curr->context) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL,
+                        "can't increment reference count on shared indirect block")
 
         /* Release the current indirect block */
-        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+        if (H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
         iblock = NULL;
 
         /* See if the location falls in a direct block row */
         /* Or, if the offset has just filled up a direct or indirect block */
-        if(curr_offset == (col * hdr->man_dtable.row_block_size[row]) || row < hdr->man_dtable.max_direct_rows) {
+        if (curr_offset == (col * hdr->man_dtable.row_block_size[row]) ||
+            row < hdr->man_dtable.max_direct_rows) {
             HDassert(curr_offset - (col * hdr->man_dtable.row_block_size[row]) == 0);
-            break;      /* Done now */
-        } /* end if */
+            break; /* Done now */
+        }          /* end if */
         /* Indirect block row */
         else {
-            H5HF_block_loc_t *new_loc;      /* Pointer to new block location */
+            H5HF_block_loc_t *new_loc; /* Pointer to new block location */
 
             /* Allocate level structure */
-            if(NULL == (new_loc = H5FL_MALLOC(H5HF_block_loc_t)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct block free list section")
+            if (NULL == (new_loc = H5FL_MALLOC(H5HF_block_loc_t)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                            "memory allocation failed for direct block free list section")
 
             /* Link new level into iterator */
             new_loc->up = biter->curr;
@@ -252,8 +247,8 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
 
             /* Make new block the current context */
             biter->curr = new_loc;
-        } /* end else */
-    } while(1);       /* Breaks out in middle */
+        }        /* end else */
+    } while (1); /* Breaks out in middle */
 
     /* Set flag to indicate block iterator finished initializing */
     biter->ready = TRUE;
@@ -262,7 +257,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iter_start_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_set_entry
  *
@@ -288,13 +282,12 @@ H5HF_man_iter_set_entry(const H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigne
 
     /* Set location context */
     biter->curr->entry = entry;
-    biter->curr->row = entry / hdr->man_dtable.cparam.width;
-    biter->curr->col = entry % hdr->man_dtable.cparam.width;
+    biter->curr->row   = entry / hdr->man_dtable.cparam.width;
+    biter->curr->col   = entry % hdr->man_dtable.cparam.width;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_man_iter_set_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_start_entry
  *
@@ -310,11 +303,11 @@ H5HF_man_iter_set_entry(const H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigne
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter,
-    H5HF_indirect_t *iblock, unsigned start_entry)
+H5HF_man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, H5HF_indirect_t *iblock,
+                          unsigned start_entry)
 {
-    H5HF_block_loc_t *new_loc = NULL;   /* Pointer to new block location */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_block_loc_t *new_loc   = NULL;    /* Pointer to new block location */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -327,18 +320,19 @@ H5HF_man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter,
     HDassert(iblock);
 
     /* Create new location for iterator */
-    if(NULL == (new_loc = H5FL_MALLOC(H5HF_block_loc_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct block free list section")
+    if (NULL == (new_loc = H5FL_MALLOC(H5HF_block_loc_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "memory allocation failed for direct block free list section")
 
     /* Set up location context */
-    new_loc->entry = start_entry;
-    new_loc->row = start_entry / hdr->man_dtable.cparam.width;
-    new_loc->col = start_entry % hdr->man_dtable.cparam.width;
+    new_loc->entry   = start_entry;
+    new_loc->row     = start_entry / hdr->man_dtable.cparam.width;
+    new_loc->col     = start_entry % hdr->man_dtable.cparam.width;
     new_loc->context = iblock;
-    new_loc->up = NULL;
+    new_loc->up      = NULL;
 
     /* Increment reference count on indirect block */
-    if(H5HF_iblock_incr(new_loc->context) < 0)
+    if (H5HF_iblock_incr(new_loc->context) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
 
     /* Make new location the current location */
@@ -348,13 +342,12 @@ H5HF_man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter,
     biter->ready = TRUE;
 
 done:
-    if(ret_value < 0 && new_loc)
+    if (ret_value < 0 && new_loc)
         new_loc = H5FL_FREE(H5HF_block_loc_t, new_loc);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iter_start_entry() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_reset
  *
@@ -372,7 +365,7 @@ done:
 herr_t
 H5HF_man_iter_reset(H5HF_block_iter_t *biter)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -382,20 +375,21 @@ H5HF_man_iter_reset(H5HF_block_iter_t *biter)
     HDassert(biter);
 
     /* Free any location contexts that exist */
-    if(biter->curr) {
-        H5HF_block_loc_t *curr_loc;      /* Pointer to current block location */
-        H5HF_block_loc_t *next_loc;      /* Pointer to next block location */
+    if (biter->curr) {
+        H5HF_block_loc_t *curr_loc; /* Pointer to current block location */
+        H5HF_block_loc_t *next_loc; /* Pointer to next block location */
 
         /* Free location contexts */
         curr_loc = biter->curr;
-        while(curr_loc) {
+        while (curr_loc) {
             /* Get pointer to next node */
             next_loc = curr_loc->up;
 
             /* If this node is holding an indirect block, release the block */
-            if(curr_loc->context)
-                if(H5HF_iblock_decr(curr_loc->context) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
+            if (curr_loc->context)
+                if (H5HF_iblock_decr(curr_loc->context) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                                "can't decrement reference count on shared indirect block")
 
             /* Free the current location context */
             curr_loc = H5FL_FREE(H5HF_block_loc_t, curr_loc);
@@ -415,7 +409,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iter_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_next
  *
@@ -446,12 +439,11 @@ H5HF_man_iter_next(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned nentries)
     biter->curr->entry += nentries;
     biter->curr->row = biter->curr->entry / hdr->man_dtable.cparam.width;
     biter->curr->col = biter->curr->entry % hdr->man_dtable.cparam.width;
-/*    HDassert(biter->curr->row <= biter->curr->context->nrows); */
+    /*    HDassert(biter->curr->row <= biter->curr->context->nrows); */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_man_iter_next() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_up
  *
@@ -468,8 +460,8 @@ H5HF_man_iter_next(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned nentries)
 herr_t
 H5HF_man_iter_up(H5HF_block_iter_t *biter)
 {
-    H5HF_block_loc_t *up_loc;           /* Pointer to 'up' block location */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_block_loc_t *up_loc;              /* Pointer to 'up' block location */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -483,7 +475,7 @@ H5HF_man_iter_up(H5HF_block_iter_t *biter)
     HDassert(biter->curr->context);
 
     /* Release hold on current location's indirect block */
-    if(H5HF_iblock_decr(biter->curr->context) < 0)
+    if (H5HF_iblock_decr(biter->curr->context) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
 
     /* Get pointer to location context above this one */
@@ -499,7 +491,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iter_up() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_down
  *
@@ -516,8 +507,8 @@ done:
 herr_t
 H5HF_man_iter_down(H5HF_block_iter_t *biter, H5HF_indirect_t *iblock)
 {
-    H5HF_block_loc_t *down_loc = NULL;  /* Pointer to new 'down' block location */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_block_loc_t *down_loc  = NULL;    /* Pointer to new 'down' block location */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -530,31 +521,31 @@ H5HF_man_iter_down(H5HF_block_iter_t *biter, H5HF_indirect_t *iblock)
     HDassert(biter->curr->context);
 
     /* Create new location to move down to */
-    if(NULL == (down_loc = H5FL_MALLOC(H5HF_block_loc_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct block free list section")
+    if (NULL == (down_loc = H5FL_MALLOC(H5HF_block_loc_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                    "memory allocation failed for direct block free list section")
 
     /* Initialize down location */
-    down_loc->row = 0;
-    down_loc->col = 0;
-    down_loc->entry = 0;
+    down_loc->row     = 0;
+    down_loc->col     = 0;
+    down_loc->entry   = 0;
     down_loc->context = iblock;
-    down_loc->up = biter->curr;
+    down_loc->up      = biter->curr;
 
     /* Increment reference count on indirect block */
-    if(H5HF_iblock_incr(down_loc->context) < 0)
+    if (H5HF_iblock_incr(down_loc->context) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
 
     /* Make down location the current location */
     biter->curr = down_loc;
 
 done:
-    if(ret_value < 0 && down_loc)
+    if (ret_value < 0 && down_loc)
         down_loc = H5FL_FREE(H5HF_block_loc_t, down_loc);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iter_down() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_curr
  *
@@ -569,8 +560,8 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col,
-    unsigned *entry, H5HF_indirect_t **block)
+H5HF_man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col, unsigned *entry,
+                   H5HF_indirect_t **block)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -581,19 +572,18 @@ H5HF_man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col,
     HDassert(biter->ready);
 
     /* Retrieve the information asked for */
-    if(row)
+    if (row)
         *row = biter->curr->row;
-    if(col)
+    if (col)
         *col = biter->curr->col;
-    if(entry)
+    if (entry)
         *entry = biter->curr->entry;
-    if(block)
+    if (block)
         *block = biter->curr->context;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_man_iter_curr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_offset
  *
@@ -610,7 +600,7 @@ H5HF_man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col,
 herr_t
 H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t *offset)
 {
-    hsize_t curr_offset;        /* For computing offset in heap */
+    hsize_t curr_offset; /* For computing offset in heap */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -633,7 +623,6 @@ H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t *offset)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_man_iter_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iter_ready
  *
@@ -659,4 +648,3 @@ H5HF_man_iter_ready(H5HF_block_iter_t *biter)
 
     FUNC_LEAVE_NOAPI(biter->ready)
 } /* end H5HF_man_iter_ready() */
-
diff --git a/src/H5HFman.c b/src/H5HFman.c
index 9613cb0..e0293fb 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -26,17 +26,17 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
@@ -44,50 +44,43 @@
 
 /* Macro to check if we can apply all filters in the pipeline.  Use whenever
  * performing a modification operation */
- #define H5HF_MAN_WRITE_CHECK_PLINE(HDR)                                       \
-{                                                                              \
-    if(!((HDR)->checked_filters)) {                                            \
-        if((HDR)->pline.nused)                                                 \
-            if(H5Z_can_apply_direct(&((HDR)->pline)) < 0)                      \
-                HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "I/O filters can't operate on this heap") \
-                                                                               \
-        (HDR)->checked_filters = TRUE;                                         \
-    } /* end if */                                                             \
-}
-
+#define H5HF_MAN_WRITE_CHECK_PLINE(HDR)                                                                      \
+    {                                                                                                        \
+        if (!((HDR)->checked_filters)) {                                                                     \
+            if ((HDR)->pline.nused)                                                                          \
+                if (H5Z_can_apply_direct(&((HDR)->pline)) < 0)                                               \
+                    HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "I/O filters can't operate on this heap")      \
+                                                                                                             \
+            (HDR)->checked_filters = TRUE;                                                                   \
+        } /* end if */                                                                                       \
+    }
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    const uint8_t *id, H5HF_operator_t op, void *op_data, unsigned op_flags);
+static herr_t H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, H5HF_operator_t op,
+                               void *op_data, unsigned op_flags);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_insert
  *
@@ -102,17 +95,16 @@ static herr_t H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj,
-    void *_id)
+H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj, void *_id)
 {
-    H5HF_free_section_t *sec_node = NULL;   /* Pointer to free space section */
-    H5HF_direct_t *dblock = NULL;       /* Pointer to direct block to modify */
-    haddr_t dblock_addr = HADDR_UNDEF;  /* Direct block address */
-    size_t dblock_size;                 /* Direct block size */
-    uint8_t *id = (uint8_t *)_id;       /* Pointer to ID buffer */
-    size_t blk_off;                     /* Offset of object within block */
-    htri_t node_found;                  /* Whether an existing free list node was found */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sec_node    = NULL;        /* Pointer to free space section */
+    H5HF_direct_t *      dblock      = NULL;        /* Pointer to direct block to modify */
+    haddr_t              dblock_addr = HADDR_UNDEF; /* Direct block address */
+    size_t               dblock_size;               /* Direct block size */
+    uint8_t *            id = (uint8_t *)_id;       /* Pointer to ID buffer */
+    size_t               blk_off;                   /* Offset of object within block */
+    htri_t               node_found;                /* Whether an existing free list node was found */
+    herr_t               ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -128,38 +120,40 @@ H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj
     H5HF_MAN_WRITE_CHECK_PLINE(hdr)
 
     /* Look for free space */
-    if((node_found = H5HF_space_find(hdr, dxpl_id, (hsize_t)obj_size, &sec_node)) < 0)
+    if ((node_found = H5HF_space_find(hdr, dxpl_id, (hsize_t)obj_size, &sec_node)) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't locate free space in fractal heap")
 
     /* If we didn't find a node, go create a direct block big enough to hold the requested block */
-    if(!node_found)
+    if (!node_found)
         /* Allocate direct block big enough to hold requested size */
-        if(H5HF_man_dblock_new(hdr, dxpl_id, obj_size, &sec_node) < 0)
+        if (H5HF_man_dblock_new(hdr, dxpl_id, obj_size, &sec_node) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL, "can't create fractal heap direct block")
 
     /* Check for row section */
-    if(sec_node->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW ||
-            sec_node->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW) {
+    if (sec_node->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW ||
+        sec_node->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW) {
 
         /* Allocate 'single' selection out of 'row' selection */
-        if(H5HF_man_iblock_alloc_row(hdr, dxpl_id, &sec_node) < 0)
+        if (H5HF_man_iblock_alloc_row(hdr, dxpl_id, &sec_node) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't break up row section")
     } /* end if */
     HDassert(sec_node->sect_info.type == H5HF_FSPACE_SECT_SINGLE);
 
     /* Check for 'single' section being serialized */
-    if(sec_node->sect_info.state == H5FS_SECT_SERIALIZED) {
-        if(H5HF_sect_single_revive(hdr, dxpl_id, sec_node) < 0)
+    if (sec_node->sect_info.state == H5FS_SECT_SERIALIZED) {
+        if (H5HF_sect_single_revive(hdr, dxpl_id, sec_node) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't revive single free section")
     } /* end if */
     HDassert(sec_node->sect_info.state == H5FS_SECT_LIVE);
 
     /* Retrieve direct block address from section */
-    if(H5HF_sect_single_dblock_info(hdr, dxpl_id, sec_node, &dblock_addr, &dblock_size) < 0)
+    if (H5HF_sect_single_dblock_info(hdr, dxpl_id, sec_node, &dblock_addr, &dblock_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve direct block information")
 
     /* Lock direct block */
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, sec_node->u.single.parent, sec_node->u.single.par_entry, H5AC_WRITE)))
+    if (NULL ==
+        (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, sec_node->u.single.parent,
+                                          sec_node->u.single.par_entry, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
 
     /* Insert object into block */
@@ -172,13 +166,13 @@ H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj
     HDassert(sec_node->sect_info.size >= obj_size);
 
     /* Reduce (& possibly re-add) single section */
-    if(H5HF_sect_single_reduce(hdr, dxpl_id, sec_node, obj_size) < 0)
+    if (H5HF_sect_single_reduce(hdr, dxpl_id, sec_node, obj_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce single section node")
     sec_node = NULL;
 
     /* Encode the object in the block */
     {
-        uint8_t *p;                         /* Temporary pointer to obj info in block */
+        uint8_t *p; /* Temporary pointer to obj info in block */
 
         /* Point to location for object */
         p = dblock->blk + blk_off;
@@ -198,23 +192,23 @@ H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj
     hdr->man_nobjs++;
 
     /* Reduce space available in heap (marks header dirty) */
-    if(H5HF_hdr_adj_free(hdr, -(ssize_t)obj_size) < 0)
+    if (H5HF_hdr_adj_free(hdr, -(ssize_t)obj_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't adjust free space for heap")
 
 done:
     /* Release section node on error */
-    if(ret_value < 0)
-        if(sec_node && H5HF_sect_single_free((H5FS_section_info_t *)sec_node) < 0)
+    if (ret_value < 0)
+        if (sec_node && H5HF_sect_single_free((H5FS_section_info_t *)sec_node) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release section node")
 
     /* Release the direct block (marked as dirty) */
-    if(dblock && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__DIRTIED_FLAG) < 0)
+    if (dblock &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__DIRTIED_FLAG) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_op_real
  *
@@ -230,19 +224,19 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    H5HF_operator_t op, void *op_data, unsigned op_flags)
+H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, H5HF_operator_t op, void *op_data,
+                 unsigned op_flags)
 {
     H5HF_direct_t *dblock = NULL;       /* Pointer to direct block to query */
     H5AC_protect_t dblock_access;       /* Access method for direct block */
-    haddr_t dblock_addr;                /* Direct block address */
-    size_t dblock_size;                 /* Direct block size */
-    unsigned dblock_cache_flags;        /* Flags for unprotecting direct block */
-    hsize_t obj_off;                    /* Object's offset in heap */
-    size_t obj_len;                     /* Object's length in heap */
-    size_t blk_off;                     /* Offset of object in block */
-    uint8_t *p;                         /* Temporary pointer to obj info in block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    haddr_t        dblock_addr;         /* Direct block address */
+    size_t         dblock_size;         /* Direct block size */
+    unsigned       dblock_cache_flags;  /* Flags for unprotecting direct block */
+    hsize_t        obj_off;             /* Object's offset in heap */
+    size_t         obj_len;             /* Object's length in heap */
+    size_t         blk_off;             /* Offset of object in block */
+    uint8_t *      p;                   /* Temporary pointer to obj info in block */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -254,15 +248,15 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     HDassert(op);
 
     /* Set the access mode for the direct block */
-    if(op_flags & H5HF_OP_MODIFY) {
+    if (op_flags & H5HF_OP_MODIFY) {
         /* Check pipeline */
         H5HF_MAN_WRITE_CHECK_PLINE(hdr)
 
-        dblock_access = H5AC_WRITE;
+        dblock_access      = H5AC_WRITE;
         dblock_cache_flags = H5AC__DIRTIED_FLAG;
     } /* end if */
     else {
-        dblock_access = H5AC_READ;
+        dblock_access      = H5AC_READ;
         dblock_cache_flags = H5AC__NO_FLAGS_SET;
     } /* end else */
 
@@ -274,61 +268,66 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     UINT64DECODE_VAR(id, obj_len, hdr->heap_len_size);
 
     /* Check for bad offset or length */
-    if(obj_off == 0)
+    if (obj_off == 0)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "invalid fractal heap offset")
-    if(obj_off > hdr->man_size)
+    if (obj_off > hdr->man_size)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap object offset too large")
-    if(obj_len == 0)
+    if (obj_len == 0)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "invalid fractal heap object size")
-    if(obj_len > hdr->man_dtable.cparam.max_direct_size)
+    if (obj_len > hdr->man_dtable.cparam.max_direct_size)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap object size too large for direct block")
-    if(obj_len > hdr->max_man_size)
+    if (obj_len > hdr->max_man_size)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap object should be standalone")
 
     /* Check for root direct block */
-    if(hdr->man_dtable.curr_root_rows == 0) {
+    if (hdr->man_dtable.curr_root_rows == 0) {
         /* Set direct block info */
         dblock_addr = hdr->man_dtable.table_addr;
         dblock_size = hdr->man_dtable.cparam.start_block_size;
 
         /* Lock direct block */
-        if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, NULL, 0, dblock_access)))
+        if (NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, NULL, 0,
+                                                      dblock_access)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
     } /* end if */
     else {
-        H5HF_indirect_t *iblock;        /* Pointer to indirect block */
-        hbool_t did_protect;            /* Whether we protected the indirect block or not */
-        unsigned entry;                 /* Entry of block */
+        H5HF_indirect_t *iblock;      /* Pointer to indirect block */
+        hbool_t          did_protect; /* Whether we protected the indirect block or not */
+        unsigned         entry;       /* Entry of block */
 
         /* Look up indirect block containing direct block */
-        if(H5HF_man_dblock_locate(hdr, dxpl_id, obj_off, &iblock, &entry, &did_protect, H5AC_READ) < 0)
+        if (H5HF_man_dblock_locate(hdr, dxpl_id, obj_off, &iblock, &entry, &did_protect, H5AC_READ) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of section")
 
         /* Set direct block info */
-        dblock_addr =  iblock->ents[entry].addr;
-        H5_CHECK_OVERFLOW((hdr->man_dtable.row_block_size[entry / hdr->man_dtable.cparam.width]), hsize_t, size_t);
-        dblock_size =  (size_t)hdr->man_dtable.row_block_size[entry / hdr->man_dtable.cparam.width];
+        dblock_addr = iblock->ents[entry].addr;
+        H5_CHECK_OVERFLOW((hdr->man_dtable.row_block_size[entry / hdr->man_dtable.cparam.width]), hsize_t,
+                          size_t);
+        dblock_size = (size_t)hdr->man_dtable.row_block_size[entry / hdr->man_dtable.cparam.width];
 
         /* Check for offset of invalid direct block */
-        if(!H5F_addr_defined(dblock_addr)) {
+        if (!H5F_addr_defined(dblock_addr)) {
             /* Unlock indirect block */
-            if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+            if (H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL,
+                            "unable to release fractal heap indirect block")
 
             HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap ID not in allocated direct block")
         } /* end if */
 
         /* Lock direct block */
-        if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, iblock, entry, dblock_access))) {
+        if (NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, iblock, entry,
+                                                      dblock_access))) {
             /* Unlock indirect block */
-            if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+            if (H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL,
+                            "unable to release fractal heap indirect block")
 
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
         } /* end if */
 
         /* Unlock indirect block */
-        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+        if (H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
         iblock = NULL;
     } /* end else */
@@ -338,29 +337,29 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     blk_off = (size_t)(obj_off - dblock->block_off);
 
     /* Check for object's offset in the direct block prefix information */
-    if(blk_off < (size_t)H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr))
+    if (blk_off < (size_t)H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr))
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "object located in prefix of direct block")
 
     /* Check for object's length overrunning the end of the direct block */
-    if((blk_off + obj_len) > dblock_size)
+    if ((blk_off + obj_len) > dblock_size)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "object overruns end of direct block")
 
     /* Point to location for object */
     p = dblock->blk + blk_off;
 
     /* Call the user's 'op' callback */
-    if(op(p, obj_len, op_data) < 0)
+    if (op(p, obj_len, op_data) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "application's callback failed")
 
 done:
     /* Unlock direct block */
-    if(dblock && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, dblock_cache_flags) < 0)
+    if (dblock &&
+        H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, dblock_cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_op_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_read
  *
@@ -377,7 +376,7 @@ done:
 herr_t
 H5HF_man_read(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, void *obj)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -389,14 +388,13 @@ H5HF_man_read(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, void *obj)
     HDassert(obj);
 
     /* Call the internal 'op' routine routine */
-    if(H5HF_man_op_real(hdr, dxpl_id, id, H5HF_op_read, obj, 0) < 0)
+    if (H5HF_man_op_real(hdr, dxpl_id, id, H5HF_op_read, obj, 0) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_write
  *
@@ -411,10 +409,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    const void *obj)
+H5HF_man_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, const void *obj)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -427,14 +424,13 @@ H5HF_man_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
 
     /* Call the internal 'op' routine routine */
     /* (Casting away const OK - QAK) */
-    if(H5HF_man_op_real(hdr, dxpl_id, id, H5HF_op_write, (void *)obj, H5HF_OP_MODIFY) < 0)
+    if (H5HF_man_op_real(hdr, dxpl_id, id, H5HF_op_write, (void *)obj, H5HF_OP_MODIFY) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_op
  *
@@ -449,10 +445,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    H5HF_operator_t op, void *op_data)
+H5HF_man_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, H5HF_operator_t op, void *op_data)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -464,14 +459,13 @@ H5HF_man_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     HDassert(op);
 
     /* Call the internal 'op' routine routine */
-    if(H5HF_man_op_real(hdr, dxpl_id, id, op, op_data, 0) < 0)
+    if (H5HF_man_op_real(hdr, dxpl_id, id, op, op_data, 0) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_op() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_remove
  *
@@ -488,16 +482,16 @@ done:
 herr_t
 H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
 {
-    H5HF_free_section_t *sec_node = NULL; /* Pointer to free space section for block */
-    H5HF_indirect_t *iblock = NULL;     /* Pointer to indirect block */
-    hbool_t did_protect;                /* Whether we protected the indirect block or not */
-    hsize_t obj_off;                    /* Object's offset in heap */
-    size_t obj_len;                     /* Object's length in heap */
-    size_t dblock_size;                 /* Direct block size */
-    hsize_t dblock_block_off;           /* Offset of the direct block within the heap's address space */
-    unsigned dblock_entry;              /* Entry of direct block in parent indirect block */
-    size_t blk_off;                     /* Offset of object in block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sec_node = NULL;     /* Pointer to free space section for block */
+    H5HF_indirect_t *    iblock   = NULL;     /* Pointer to indirect block */
+    hbool_t              did_protect;         /* Whether we protected the indirect block or not */
+    hsize_t              obj_off;             /* Object's offset in heap */
+    size_t               obj_len;             /* Object's length in heap */
+    size_t               dblock_size;         /* Direct block size */
+    hsize_t              dblock_block_off;    /* Offset of the direct block within the heap's address space */
+    unsigned             dblock_entry;        /* Entry of direct block in parent indirect block */
+    size_t               blk_off;             /* Offset of object in block */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -518,42 +512,45 @@ H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
     UINT64DECODE_VAR(id, obj_len, hdr->heap_len_size);
 
     /* Check for bad offset or length */
-    if(obj_off == 0)
+    if (obj_off == 0)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "invalid fractal heap offset")
-    if(obj_off > hdr->man_size)
+    if (obj_off > hdr->man_size)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap object offset too large")
-    if(obj_len == 0)
+    if (obj_len == 0)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "invalid fractal heap object size")
-    if(obj_len > hdr->man_dtable.cparam.max_direct_size)
+    if (obj_len > hdr->man_dtable.cparam.max_direct_size)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap object size too large for direct block")
-    if(obj_len > hdr->max_man_size)
+    if (obj_len > hdr->max_man_size)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap object should be standalone")
 
     /* Check for root direct block */
-    if(hdr->man_dtable.curr_root_rows == 0) {
+    if (hdr->man_dtable.curr_root_rows == 0) {
         /* Set direct block info */
-        dblock_size = hdr->man_dtable.cparam.start_block_size;
+        dblock_size      = hdr->man_dtable.cparam.start_block_size;
         dblock_block_off = 0;
-        dblock_entry = 0;
+        dblock_entry     = 0;
     } /* end if */
     else {
         /* Look up indirect block containing direct block */
-        if(H5HF_man_dblock_locate(hdr, dxpl_id, obj_off, &iblock, &dblock_entry, &did_protect, H5AC_WRITE) < 0)
+        if (H5HF_man_dblock_locate(hdr, dxpl_id, obj_off, &iblock, &dblock_entry, &did_protect, H5AC_WRITE) <
+            0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of section")
 
         /* Check for offset of invalid direct block */
-        if(!H5F_addr_defined(iblock->ents[dblock_entry].addr))
+        if (!H5F_addr_defined(iblock->ents[dblock_entry].addr))
             HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap ID not in allocated direct block")
 
         /* Set direct block info */
-        H5_CHECK_OVERFLOW((hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width]), hsize_t, size_t);
-        dblock_size =  (size_t)(hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width]);
+        H5_CHECK_OVERFLOW((hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width]),
+                          hsize_t, size_t);
+        dblock_size = (size_t)(hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width]);
 
         /* Compute the direct block's offset in the heap's address space */
         /* (based on parent indirect block's block offset) */
         dblock_block_off = iblock->block_off;
         dblock_block_off += hdr->man_dtable.row_block_off[dblock_entry / hdr->man_dtable.cparam.width];
-        dblock_block_off += hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width] * (dblock_entry % hdr->man_dtable.cparam.width);
+        dblock_block_off += hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width] *
+                            (dblock_entry % hdr->man_dtable.cparam.width);
     } /* end else */
 
     /* Compute offset of object within block */
@@ -561,47 +558,46 @@ H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
     blk_off = (size_t)(obj_off - dblock_block_off);
 
     /* Check for object's offset in the direct block prefix information */
-    if(blk_off < (size_t)H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr))
+    if (blk_off < (size_t)H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr))
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "object located in prefix of direct block")
 
     /* Check for object's length overrunning the end of the direct block */
-    if((blk_off + obj_len) > dblock_size)
+    if ((blk_off + obj_len) > dblock_size)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "object overruns end of direct block")
 
     /* Create free space section node */
-    if(NULL == (sec_node = H5HF_sect_single_new(obj_off, obj_len, iblock, dblock_entry)))
+    if (NULL == (sec_node = H5HF_sect_single_new(obj_off, obj_len, iblock, dblock_entry)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create section for direct block's free space")
 
     /* Unlock indirect block */
-    if(iblock) {
-        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+    if (iblock) {
+        if (H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
         iblock = NULL;
     } /* end if */
 
     /* Increase space available in heap (marks header dirty) */
-    if(H5HF_hdr_adj_free(hdr, (ssize_t)obj_len) < 0)
+    if (H5HF_hdr_adj_free(hdr, (ssize_t)obj_len) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't adjust free space for heap")
 
     /* Update statistics about heap */
     hdr->man_nobjs--;
 
     /* Return free space to the heap's list of space */
-    if(H5HF_space_add(hdr, dxpl_id, sec_node, H5FS_ADD_RETURNED_SPACE) < 0)
+    if (H5HF_space_add(hdr, dxpl_id, sec_node, H5FS_ADD_RETURNED_SPACE) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add direct block free space to global list")
     sec_node = NULL;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Release section node */
-        if(sec_node && H5HF_sect_single_free((H5FS_section_info_t *)sec_node) < 0)
+        if (sec_node && H5HF_sect_single_free((H5FS_section_info_t *)sec_node) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release section node")
     } /* end if */
 
     /* Unlock indirect block */
-    if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+    if (iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_remove() */
-
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index ebd8a70..aa80c52 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -30,152 +30,153 @@
 #include "H5HFprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5B2private.h"	/* v2 B-trees				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5FSprivate.h"	/* Free space manager			*/
-#include "H5SLprivate.h"	/* Skip lists				*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5B2private.h" /* v2 B-trees				*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5FSprivate.h" /* Free space manager			*/
+#include "H5SLprivate.h" /* Skip lists				*/
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
 /* Size of checksum information (on disk) */
-#define H5HF_SIZEOF_CHKSUM      4
+#define H5HF_SIZEOF_CHKSUM 4
 
 /* "Standard" size of prefix information for fractal heap metadata */
-#define H5HF_METADATA_PREFIX_SIZE(c) (                                        \
-    H5_SIZEOF_MAGIC   /* Signature */                                         \
-    + 1 /* Version */                                                         \
-    + ((c) ? H5HF_SIZEOF_CHKSUM : 0) /* Metadata checksum */                  \
+#define H5HF_METADATA_PREFIX_SIZE(c)                                                                         \
+    (H5_SIZEOF_MAGIC                  /* Signature */                                                        \
+     + 1                              /* Version */                                                          \
+     + ((c) ? H5HF_SIZEOF_CHKSUM : 0) /* Metadata checksum */                                                \
     )
 
 /* Size of doubling-table information */
-#define H5HF_DTABLE_INFO_SIZE(h) (                                            \
-    2   /* Width of table (i.e. # of columns) */                              \
-    + (h)->sizeof_size /* Starting block size */                              \
-    + (h)->sizeof_size /* Maximum direct block size */                        \
-    + 2 /* Max. size of heap (log2 of actual value - i.e. the # of bits) */   \
-    + 2 /* Starting # of rows in root indirect block */                       \
-    + (h)->sizeof_addr /* File address of table managed */                    \
-    + 2 /* Current # of rows in root indirect block */                        \
+#define H5HF_DTABLE_INFO_SIZE(h)                                                                             \
+    (2                  /* Width of table (i.e. # of columns) */                                             \
+     + (h)->sizeof_size /* Starting block size */                                                            \
+     + (h)->sizeof_size /* Maximum direct block size */                                                      \
+     + 2                /* Max. size of heap (log2 of actual value - i.e. the # of bits) */                  \
+     + 2                /* Starting # of rows in root indirect block */                                      \
+     + (h)->sizeof_addr /* File address of table managed */                                                  \
+     + 2                /* Current # of rows in root indirect block */                                       \
     )
 
 /* Flags for status byte */
-#define H5HF_HDR_FLAGS_HUGE_ID_WRAPPED 0x01     /* "huge" object IDs have wrapped */
-#define H5HF_HDR_FLAGS_CHECKSUM_DBLOCKS 0x02    /* checksum direct blocks */
+#define H5HF_HDR_FLAGS_HUGE_ID_WRAPPED  0x01 /* "huge" object IDs have wrapped */
+#define H5HF_HDR_FLAGS_CHECKSUM_DBLOCKS 0x02 /* checksum direct blocks */
 
 /* Size of the fractal heap header on disk */
 /* (this is the fixed-len portion, the variable-len I/O filter information
  *      follows this information, if there are I/O filters for the heap)
  */
-#define H5HF_HEADER_SIZE(h)     (                                             \
-    /* General metadata fields */                                             \
-    H5HF_METADATA_PREFIX_SIZE(TRUE)                                           \
-                                                                              \
-    /* Fractal Heap Header specific fields */                                 \
-                                                                              \
-    /* General heap information */                                            \
-    + 2 /* Heap ID len */                                                     \
-    + 2 /* I/O filters' encoded len */                                        \
-    + 1 /* Status flags */                                                    \
-                                                                              \
-    /* "Huge" object fields */                                                \
-    + 4 /* Max. size of "managed" object */                                   \
-    + (h)->sizeof_size /* Next ID for "huge" object */                        \
-    + (h)->sizeof_addr /* File address of "huge" object tracker B-tree  */    \
-                                                                              \
-    /* "Managed" object free space fields */                                  \
-    + (h)->sizeof_size /* Total man. free space */                            \
-    + (h)->sizeof_addr /* File address of free section header */              \
-                                                                              \
-    /* Statistics fields */                                                   \
-    + (h)->sizeof_size /* Size of man. space in heap */                       \
-    + (h)->sizeof_size /* Size of man. space iterator offset in heap */       \
-    + (h)->sizeof_size /* Size of alloacted man. space in heap */             \
-    + (h)->sizeof_size /* Number of man. objects in heap */                   \
-    + (h)->sizeof_size /* Size of huge space in heap */                       \
-    + (h)->sizeof_size /* Number of huge objects in heap */                   \
-    + (h)->sizeof_size /* Size of tiny space in heap */                       \
-    + (h)->sizeof_size /* Number of tiny objects in heap */                   \
-                                                                              \
-    /* "Managed" object doubling table info */                                \
-    + H5HF_DTABLE_INFO_SIZE(h) /* Size of managed obj. doubling-table info */ \
+#define H5HF_HEADER_SIZE(h)                                                                                  \
+    (/* General metadata fields */                                                                           \
+     H5HF_METADATA_PREFIX_SIZE(TRUE)                                                                         \
+                                                                                                             \
+     /* Fractal Heap Header specific fields */                                                               \
+                                                                                                             \
+     /* General heap information */                                                                          \
+     + 2 /* Heap ID len */                                                                                   \
+     + 2 /* I/O filters' encoded len */                                                                      \
+     + 1 /* Status flags */                                                                                  \
+                                                                                                             \
+     /* "Huge" object fields */                                                                              \
+     + 4                /* Max. size of "managed" object */                                                  \
+     + (h)->sizeof_size /* Next ID for "huge" object */                                                      \
+     + (h)->sizeof_addr /* File address of "huge" object tracker B-tree  */                                  \
+                                                                                                             \
+     /* "Managed" object free space fields */                                                                \
+     + (h)->sizeof_size /* Total man. free space */                                                          \
+     + (h)->sizeof_addr /* File address of free section header */                                            \
+                                                                                                             \
+     /* Statistics fields */                                                                                 \
+     + (h)->sizeof_size /* Size of man. space in heap */                                                     \
+     + (h)->sizeof_size /* Size of man. space iterator offset in heap */                                     \
+     + (h)->sizeof_size /* Size of alloacted man. space in heap */                                           \
+     + (h)->sizeof_size /* Number of man. objects in heap */                                                 \
+     + (h)->sizeof_size /* Size of huge space in heap */                                                     \
+     + (h)->sizeof_size /* Number of huge objects in heap */                                                 \
+     + (h)->sizeof_size /* Size of tiny space in heap */                                                     \
+     + (h)->sizeof_size /* Number of tiny objects in heap */                                                 \
+                                                                                                             \
+     /* "Managed" object doubling table info */                                                              \
+     + H5HF_DTABLE_INFO_SIZE(h) /* Size of managed obj. doubling-table info */                               \
     )
 
 /* Size of overhead for a direct block */
-#define H5HF_MAN_ABS_DIRECT_OVERHEAD(h) (                                     \
-    /* General metadata fields */                                             \
-    H5HF_METADATA_PREFIX_SIZE(h->checksum_dblocks)                            \
-                                                                              \
-    /* Fractal heap managed, absolutely mapped direct block specific fields */ \
-    + (h)->sizeof_addr          /* File address of heap owning the block */   \
-    + (h)->heap_off_size        /* Offset of the block in the heap */         \
+#define H5HF_MAN_ABS_DIRECT_OVERHEAD(h)                                                                      \
+    (/* General metadata fields */                                                                           \
+     H5HF_METADATA_PREFIX_SIZE(h->checksum_dblocks)                                                          \
+                                                                                                             \
+     /* Fractal heap managed, absolutely mapped direct block specific fields */                              \
+     + (h)->sizeof_addr   /* File address of heap owning the block */                                        \
+     + (h)->heap_off_size /* Offset of the block in the heap */                                              \
     )
 
 /* Size of managed indirect block entry for a child direct block */
-#define H5HF_MAN_INDIRECT_CHILD_DIR_ENTRY_SIZE(h) (                           \
-    ((h)->filter_len > 0 ?                                                    \
-        ((h)->sizeof_addr + (h)->sizeof_size + 4) : /* Size of entries for filtered direct blocks */ \
-        (h)->sizeof_addr)             /* Size of entries for un-filtered direct blocks */ \
+#define H5HF_MAN_INDIRECT_CHILD_DIR_ENTRY_SIZE(h)                                                            \
+    (((h)->filter_len > 0 ? ((h)->sizeof_addr + (h)->sizeof_size + 4)                                        \
+                          : /* Size of entries for filtered direct blocks */                                 \
+          (h)->sizeof_addr) /* Size of entries for un-filtered direct blocks */                              \
     )
 
 /* Size of managed indirect block */
-#define H5HF_MAN_INDIRECT_SIZE(h, r) (                                        \
-    /* General metadata fields */                                             \
-    H5HF_METADATA_PREFIX_SIZE(TRUE)                                           \
-                                                                              \
-    /* Fractal heap managed, absolutely mapped indirect block specific fields */ \
-    + (h)->sizeof_addr          /* File address of heap owning the block */   \
-    + (h)->heap_off_size        /* Offset of the block in the heap */         \
-    + (MIN(r, (h)->man_dtable.max_direct_rows) * (h)->man_dtable.cparam.width * H5HF_MAN_INDIRECT_CHILD_DIR_ENTRY_SIZE(h)) /* Size of entries for direct blocks */ \
-    + (((r > (h)->man_dtable.max_direct_rows) ? (r - (h)->man_dtable.max_direct_rows) : 0)  * (h)->man_dtable.cparam.width * (h)->sizeof_addr) /* Size of entries for indirect blocks */ \
+#define H5HF_MAN_INDIRECT_SIZE(h, r)                                                                         \
+    (/* General metadata fields */                                                                           \
+     H5HF_METADATA_PREFIX_SIZE(TRUE)                                                                         \
+                                                                                                             \
+     /* Fractal heap managed, absolutely mapped indirect block specific fields */                            \
+     + (h)->sizeof_addr   /* File address of heap owning the block */                                        \
+     + (h)->heap_off_size /* Offset of the block in the heap */                                              \
+     + (MIN(r, (h)->man_dtable.max_direct_rows) * (h)->man_dtable.cparam.width *                             \
+        H5HF_MAN_INDIRECT_CHILD_DIR_ENTRY_SIZE(h)) /* Size of entries for direct blocks */                   \
+     + (((r > (h)->man_dtable.max_direct_rows) ? (r - (h)->man_dtable.max_direct_rows) : 0) *                \
+        (h)->man_dtable.cparam.width * (h)->sizeof_addr) /* Size of entries for indirect blocks */           \
     )
 
 /* Compute the # of bytes required to store an offset into a given buffer size */
-#define H5HF_SIZEOF_OFFSET_BITS(b)   (((b) + 7) / 8)
-#define H5HF_SIZEOF_OFFSET_LEN(l)   H5HF_SIZEOF_OFFSET_BITS(H5VM_log2_of2((unsigned)(l)))
+#define H5HF_SIZEOF_OFFSET_BITS(b) (((b) + 7) / 8)
+#define H5HF_SIZEOF_OFFSET_LEN(l)  H5HF_SIZEOF_OFFSET_BITS(H5VM_log2_of2((unsigned)(l)))
 
 /* Heap ID bit flags */
 /* Heap ID version (2 bits: 6-7) */
-#define H5HF_ID_VERS_CURR       0x00    /* Current version of ID format */
-#define H5HF_ID_VERS_MASK       0xC0    /* Mask for getting the ID version from flags */
+#define H5HF_ID_VERS_CURR 0x00 /* Current version of ID format */
+#define H5HF_ID_VERS_MASK 0xC0 /* Mask for getting the ID version from flags */
 /* Heap ID type (2 bits: 4-5) */
-#define H5HF_ID_TYPE_MAN        0x00    /* "Managed" object - stored in fractal heap blocks */
-#define H5HF_ID_TYPE_HUGE       0x10    /* "Huge" object - stored in file directly */
-#define H5HF_ID_TYPE_TINY       0x20    /* "Tiny" object - stored in heap ID directly */
-#define H5HF_ID_TYPE_RESERVED   0x30    /* "?" object - reserved for future use */
-#define H5HF_ID_TYPE_MASK       0x30    /* Mask for getting the ID type from flags */
+#define H5HF_ID_TYPE_MAN      0x00 /* "Managed" object - stored in fractal heap blocks */
+#define H5HF_ID_TYPE_HUGE     0x10 /* "Huge" object - stored in file directly */
+#define H5HF_ID_TYPE_TINY     0x20 /* "Tiny" object - stored in heap ID directly */
+#define H5HF_ID_TYPE_RESERVED 0x30 /* "?" object - reserved for future use */
+#define H5HF_ID_TYPE_MASK     0x30 /* Mask for getting the ID type from flags */
 /* Heap ID bits 0-3 reserved for future use */
 
 /* Encode a "managed" heap ID */
-#define H5HF_MAN_ID_ENCODE(i, h, o, l)                                        \
-    *(i) = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_MAN;                              \
-    (i)++;                                                                    \
-    UINT64ENCODE_VAR((i), (o), (h)->heap_off_size);                           \
+#define H5HF_MAN_ID_ENCODE(i, h, o, l)                                                                       \
+    *(i) = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_MAN;                                                             \
+    (i)++;                                                                                                   \
+    UINT64ENCODE_VAR((i), (o), (h)->heap_off_size);                                                          \
     UINT64ENCODE_VAR((i), (l), (h)->heap_len_size)
 
 /* Decode a "managed" heap ID */
-#define H5HF_MAN_ID_DECODE(i, h, f, o, l)                                     \
-    f = *(uint8_t *)i++;                                                      \
-    UINT64DECODE_VAR((i), (o), (h)->heap_off_size);                           \
+#define H5HF_MAN_ID_DECODE(i, h, f, o, l)                                                                    \
+    f = *(uint8_t *)i++;                                                                                     \
+    UINT64DECODE_VAR((i), (o), (h)->heap_off_size);                                                          \
     UINT64DECODE_VAR((i), (l), (h)->heap_len_size)
 
 /* Free space section types for fractal heap */
 /* (values stored in free space data structures in file) */
-#define H5HF_FSPACE_SECT_SINGLE         0       /* Section is a range of actual bytes in a direct block */
-#define H5HF_FSPACE_SECT_FIRST_ROW      1       /* Section is first range of blocks in an indirect block row */
-#define H5HF_FSPACE_SECT_NORMAL_ROW     2       /* Section is a range of blocks in an indirect block row */
-#define H5HF_FSPACE_SECT_INDIRECT       3       /* Section is a span of blocks in an indirect block */
+#define H5HF_FSPACE_SECT_SINGLE     0 /* Section is a range of actual bytes in a direct block */
+#define H5HF_FSPACE_SECT_FIRST_ROW  1 /* Section is first range of blocks in an indirect block row */
+#define H5HF_FSPACE_SECT_NORMAL_ROW 2 /* Section is a range of blocks in an indirect block row */
+#define H5HF_FSPACE_SECT_INDIRECT   3 /* Section is a span of blocks in an indirect block */
 
 /* Flags for 'op' operations */
-#define H5HF_OP_MODIFY          0x0001          /* Operation will modify object */
-#define H5HF_OP_FLAGS           (H5HF_OP_MODIFY)        /* Bit-wise OR of all op flags */
+#define H5HF_OP_MODIFY 0x0001           /* Operation will modify object */
+#define H5HF_OP_FLAGS  (H5HF_OP_MODIFY) /* Bit-wise OR of all op flags */
 
 /* Flags for 'root_iblock_flags' field in header */
-#define H5HF_ROOT_IBLOCK_PINNED         0x01
-#define H5HF_ROOT_IBLOCK_PROTECTED      0x02
-
+#define H5HF_ROOT_IBLOCK_PINNED    0x01
+#define H5HF_ROOT_IBLOCK_PROTECTED 0x02
 
 /****************************/
 /* Package Private Typedefs */
@@ -184,37 +185,37 @@
 /* Doubling-table info */
 typedef struct H5HF_dtable_t {
     /* Immutable, pre-set information for table */
-    H5HF_dtable_cparam_t    cparam;     /* Creation parameters for table */
+    H5HF_dtable_cparam_t cparam; /* Creation parameters for table */
 
     /* Derived information (stored, varies during lifetime of table) */
-    haddr_t     table_addr;     /* Address of first block for table */
-                                /* Undefined if no space allocated for table */
-    unsigned    curr_root_rows; /* Current number of rows in the root indirect block */
-                                /* 0 indicates that the TABLE_ADDR field points
-                                 * to direct block (of START_BLOCK_SIZE) instead
-                                 * of indirect root block.
-                                 */
+    haddr_t table_addr;      /* Address of first block for table */
+                             /* Undefined if no space allocated for table */
+    unsigned curr_root_rows; /* Current number of rows in the root indirect block */
+                             /* 0 indicates that the TABLE_ADDR field points
+                              * to direct block (of START_BLOCK_SIZE) instead
+                              * of indirect root block.
+                              */
 
     /* Computed information (not stored) */
-    unsigned    max_root_rows;      /* Maximum # of rows in root indirect block */
-    unsigned    max_direct_rows;    /* Maximum # of direct rows in any indirect block */
-    unsigned    start_bits;         /* # of bits for starting block size (i.e. log2(start_block_size)) */
-    unsigned    max_direct_bits;    /* # of bits for max. direct block size (i.e. log2(max_direct_size)) */
-    unsigned    max_dir_blk_off_size;   /* Max. size of offsets in direct blocks */
-    unsigned    first_row_bits;     /* # of bits in address of first row */
-    hsize_t     num_id_first_row;   /* Number of IDs in first row of table */
-    hsize_t     *row_block_size;    /* Block size per row of indirect block */
-    hsize_t     *row_block_off;     /* Cumulative offset per row of indirect block */
-    hsize_t     *row_tot_dblock_free;   /* Total free space in dblocks for this row */
-                                    /* (For indirect block rows, it's the total
-                                     * free space in all direct blocks referenced
-                                     * from the indirect block)
-                                     */
-    size_t      *row_max_dblock_free;   /* Max. free space in dblocks for this row */
-                                    /* (For indirect block rows, it's the maximum
-                                     * free space in a direct block referenced
-                                     * from the indirect block)
-                                     */
+    unsigned max_root_rows;        /* Maximum # of rows in root indirect block */
+    unsigned max_direct_rows;      /* Maximum # of direct rows in any indirect block */
+    unsigned start_bits;           /* # of bits for starting block size (i.e. log2(start_block_size)) */
+    unsigned max_direct_bits;      /* # of bits for max. direct block size (i.e. log2(max_direct_size)) */
+    unsigned max_dir_blk_off_size; /* Max. size of offsets in direct blocks */
+    unsigned first_row_bits;       /* # of bits in address of first row */
+    hsize_t  num_id_first_row;     /* Number of IDs in first row of table */
+    hsize_t *row_block_size;       /* Block size per row of indirect block */
+    hsize_t *row_block_off;        /* Cumulative offset per row of indirect block */
+    hsize_t *row_tot_dblock_free;  /* Total free space in dblocks for this row */
+                                   /* (For indirect block rows, it's the total
+                                    * free space in all direct blocks referenced
+                                    * from the indirect block)
+                                    */
+    size_t *row_max_dblock_free;   /* Max. free space in dblocks for this row */
+                                   /* (For indirect block rows, it's the maximum
+                                    * free space in a direct block referenced
+                                    * from the indirect block)
+                                    */
 } H5HF_dtable_t;
 
 /* Fractal heap free list info (forward decl - defined in H5HFflist.c) */
@@ -226,39 +227,40 @@ typedef struct H5HF_indirect_t H5HF_indirect_t;
 /* Fractal heap block location */
 typedef struct H5HF_block_loc_t {
     /* Necessary table fields */
-    unsigned    row;            /* Row of block in doubling table             */
-    unsigned    col;            /* Column of block in doubling table          */
+    unsigned row; /* Row of block in doubling table             */
+    unsigned col; /* Column of block in doubling table          */
 
     /* Derived/computed/cached table fields */
-    unsigned    entry;          /* Entry of block in doubling table           */
+    unsigned entry; /* Entry of block in doubling table           */
 
     /* Infrastructure */
-    H5HF_indirect_t *context;   /* Pointer to the indirect block containing the block */
-    struct H5HF_block_loc_t *up;  /* Pointer to next level up in the stack of levels */
+    H5HF_indirect_t *        context; /* Pointer to the indirect block containing the block */
+    struct H5HF_block_loc_t *up;      /* Pointer to next level up in the stack of levels */
 } H5HF_block_loc_t;
 
 /* Fractal heap block iterator info */
 typedef struct H5HF_block_iter_t {
-    hbool_t ready;              /* Set if iterator is finished initializing   */
-    H5HF_block_loc_t *curr;     /* Pointer to the current level information for iterator */
+    hbool_t           ready; /* Set if iterator is finished initializing   */
+    H5HF_block_loc_t *curr;  /* Pointer to the current level information for iterator */
 } H5HF_block_iter_t;
 
 /* Fractal heap free space section info */
 typedef struct H5HF_free_section_t {
-    H5FS_section_info_t sect_info;              /* Free space section information (must be first in struct) */
+    H5FS_section_info_t sect_info; /* Free space section information (must be first in struct) */
     union {
         struct {
-            H5HF_indirect_t *parent;            /* Indirect block parent for free section's direct block */
-            unsigned par_entry;                 /* Entry of free section's direct block in parent indirect block */
+            H5HF_indirect_t *parent;    /* Indirect block parent for free section's direct block */
+            unsigned         par_entry; /* Entry of free section's direct block in parent indirect block */
         } single;
         struct {
-            struct H5HF_free_section_t *under;  /* Pointer to indirect block underlying row section */
-            unsigned    row;                    /* Row for range of blocks */
-            unsigned    col;                    /* Column for range of blocks */
-            unsigned    num_entries;            /* Number of entries covered */
+            struct H5HF_free_section_t *under;       /* Pointer to indirect block underlying row section */
+            unsigned                    row;         /* Row for range of blocks */
+            unsigned                    col;         /* Column for range of blocks */
+            unsigned                    num_entries; /* Number of entries covered */
 
             /* Fields that aren't stored */
-            hbool_t     checked_out;            /* Flag to indicate that a row section is temporarily out of the free space manager */
+            hbool_t checked_out; /* Flag to indicate that a row section is temporarily out of the free space
+                                    manager */
         } row;
         struct {
             /* Holds either a pointer to an indirect block (if its "live") or
@@ -268,23 +270,24 @@ typedef struct H5HF_free_section_t {
              *          or not)
              */
             union {
-                H5HF_indirect_t *iblock;        /* Indirect block for free section */
-                hsize_t iblock_off;             /* Indirect block offset in "heap space" */
+                H5HF_indirect_t *iblock;     /* Indirect block for free section */
+                hsize_t          iblock_off; /* Indirect block offset in "heap space" */
             } u;
-            unsigned    row;                    /* Row for range of blocks */
-            unsigned    col;                    /* Column for range of blocks */
-            unsigned    num_entries;            /* Number of entries covered */
+            unsigned row;         /* Row for range of blocks */
+            unsigned col;         /* Column for range of blocks */
+            unsigned num_entries; /* Number of entries covered */
 
             /* Fields that aren't stored */
-            struct H5HF_free_section_t *parent; /* Pointer to "parent" indirect section */
-            unsigned    par_entry;              /* Entry within parent indirect section */
-            hsize_t     span_size;              /* Size of space tracked, in "heap space" */
-            unsigned    iblock_entries;         /* Number of entries in indirect block where section is located */
-            unsigned    rc;                     /* Reference count of outstanding row & child indirect sections */
-            unsigned    dir_nrows;              /* Number of direct rows in section */
-            struct H5HF_free_section_t **dir_rows;  /* Array of pointers to outstanding row sections */
-            unsigned    indir_nents;            /* Number of indirect entries in section */
-            struct H5HF_free_section_t **indir_ents; /* Array of pointers to outstanding child indirect sections */
+            struct H5HF_free_section_t *parent;    /* Pointer to "parent" indirect section */
+            unsigned                    par_entry; /* Entry within parent indirect section */
+            hsize_t                     span_size; /* Size of space tracked, in "heap space" */
+            unsigned iblock_entries; /* Number of entries in indirect block where section is located */
+            unsigned rc;             /* Reference count of outstanding row & child indirect sections */
+            unsigned dir_nrows;      /* Number of direct rows in section */
+            struct H5HF_free_section_t **dir_rows;    /* Array of pointers to outstanding row sections */
+            unsigned                     indir_nents; /* Number of indirect entries in section */
+            struct H5HF_free_section_t *
+                *indir_ents; /* Array of pointers to outstanding child indirect sections */
         } indirect;
     } u;
 } H5HF_free_section_t;
@@ -298,79 +301,81 @@ typedef struct H5HF_hdr_t {
     H5AC_info_t cache_info;
 
     /* General header information (stored in header) */
-    unsigned    id_len;         /* Size of heap IDs (in bytes) */
-    unsigned    filter_len;     /* Size of I/O filter information (in bytes) */
+    unsigned id_len;     /* Size of heap IDs (in bytes) */
+    unsigned filter_len; /* Size of I/O filter information (in bytes) */
 
     /* Flags for heap settings (stored in status byte in header) */
-    hbool_t     debug_objs;     /* Is the heap storing objects in 'debug' format */
-    hbool_t     write_once;     /* Is heap being written in "write once" mode? */
-    hbool_t     huge_ids_wrapped; /* Have "huge" object IDs wrapped around? */
-    hbool_t     checksum_dblocks; /* Should the direct blocks in the heap be checksummed? */
+    hbool_t debug_objs;       /* Is the heap storing objects in 'debug' format */
+    hbool_t write_once;       /* Is heap being written in "write once" mode? */
+    hbool_t huge_ids_wrapped; /* Have "huge" object IDs wrapped around? */
+    hbool_t checksum_dblocks; /* Should the direct blocks in the heap be checksummed? */
 
     /* Doubling table information (partially stored in header) */
     /* (Partially set by user, partially derived/updated internally) */
-    H5HF_dtable_t man_dtable;   /* Doubling-table info for managed objects */
+    H5HF_dtable_t man_dtable; /* Doubling-table info for managed objects */
 
     /* Free space information for managed objects (stored in header) */
-    hsize_t     total_man_free; /* Total amount of free space in managed blocks */
-    haddr_t     fs_addr;        /* Address of free space header on disk */
+    hsize_t total_man_free; /* Total amount of free space in managed blocks */
+    haddr_t fs_addr;        /* Address of free space header on disk */
 
     /* "Huge" object support (stored in header) */
-    uint32_t    max_man_size;   /* Max. size of object to manage in doubling table */
-    hsize_t     huge_next_id;   /* Next ID to use for indirectly tracked 'huge' object */
-    haddr_t     huge_bt2_addr;  /* Address of v2 B-tree for tracking "huge" object info */
+    uint32_t max_man_size;  /* Max. size of object to manage in doubling table */
+    hsize_t  huge_next_id;  /* Next ID to use for indirectly tracked 'huge' object */
+    haddr_t  huge_bt2_addr; /* Address of v2 B-tree for tracking "huge" object info */
 
     /* I/O filter support (stored in header, if any are used) */
-    H5O_pline_t pline;          /* I/O filter pipeline for heap objects */
-    size_t      pline_root_direct_size;    /* Size of filtered root direct block */
+    H5O_pline_t pline;                         /* I/O filter pipeline for heap objects */
+    size_t      pline_root_direct_size;        /* Size of filtered root direct block */
     unsigned    pline_root_direct_filter_mask; /* I/O filter mask for filtered root direct block */
 
     /* Statistics for heap (stored in header) */
-    hsize_t     man_size;       /* Total amount of 'managed' space in heap */
-    hsize_t     man_alloc_size; /* Total amount of allocated 'managed' space in heap */
-    hsize_t     man_iter_off;   /* Offset of iterator in 'managed' heap space */
-    hsize_t     man_nobjs;      /* Number of 'managed' objects in heap */
-    hsize_t     huge_size;      /* Total size of 'huge' objects in heap */
-    hsize_t     huge_nobjs;     /* Number of 'huge' objects in heap */
-    hsize_t     tiny_size;      /* Total size of 'tiny' objects in heap */
-    hsize_t     tiny_nobjs;     /* Number of 'tiny' objects in heap */
+    hsize_t man_size;       /* Total amount of 'managed' space in heap */
+    hsize_t man_alloc_size; /* Total amount of allocated 'managed' space in heap */
+    hsize_t man_iter_off;   /* Offset of iterator in 'managed' heap space */
+    hsize_t man_nobjs;      /* Number of 'managed' objects in heap */
+    hsize_t huge_size;      /* Total size of 'huge' objects in heap */
+    hsize_t huge_nobjs;     /* Number of 'huge' objects in heap */
+    hsize_t tiny_size;      /* Total size of 'tiny' objects in heap */
+    hsize_t tiny_nobjs;     /* Number of 'tiny' objects in heap */
 
     /* Cached/computed values (not stored in header) */
-    size_t      rc;             /* Reference count of heap's components using heap header */
-    haddr_t     heap_addr;      /* Address of heap header in the file */
-    size_t      heap_size;      /* Size of heap header in the file */
-    H5AC_protect_t mode;        /* Access mode for heap */
-    H5F_t      *f;              /* Pointer to file for heap */
-    size_t      file_rc;        /* Reference count of files using heap header */
-    hbool_t     pending_delete; /* Heap is pending deletion */
-    uint8_t     sizeof_size;    /* Size of file sizes */
-    uint8_t     sizeof_addr;    /* Size of file addresses */
+    size_t                  rc;             /* Reference count of heap's components using heap header */
+    haddr_t                 heap_addr;      /* Address of heap header in the file */
+    size_t                  heap_size;      /* Size of heap header in the file */
+    H5AC_protect_t          mode;           /* Access mode for heap */
+    H5F_t *                 f;              /* Pointer to file for heap */
+    size_t                  file_rc;        /* Reference count of files using heap header */
+    hbool_t                 pending_delete; /* Heap is pending deletion */
+    uint8_t                 sizeof_size;    /* Size of file sizes */
+    uint8_t                 sizeof_addr;    /* Size of file addresses */
     struct H5HF_indirect_t *root_iblock;    /* Pointer to root indirect block */
-    unsigned    root_iblock_flags;      /* Flags to indicate whether root indirect block is pinned/protected */
-    H5FS_t      *fspace;        /* Free space list for objects in heap */
+    unsigned root_iblock_flags;     /* Flags to indicate whether root indirect block is pinned/protected */
+    H5FS_t * fspace;                /* Free space list for objects in heap */
     H5HF_block_iter_t next_block;   /* Block iterator for searching for next block with space */
-    H5B2_t      *huge_bt2;      /* v2 B-tree handle for huge objects */
-    hsize_t     huge_max_id;    /* Max. 'huge' heap ID before rolling 'huge' heap IDs over */
-    uint8_t     huge_id_size;   /* Size of 'huge' heap IDs (in bytes) */
-    hbool_t     huge_ids_direct; /* Flag to indicate that 'huge' object's offset & length are stored directly in heap ID */
-    size_t      tiny_max_len;   /* Max. size of tiny objects for this heap */
-    hbool_t     tiny_len_extended; /* Flag to indicate that 'tiny' object's length is stored in extended form (i.e. w/extra byte) */
-    uint8_t     heap_off_size;  /* Size of heap offsets (in bytes) */
-    uint8_t     heap_len_size;  /* Size of heap ID lengths (in bytes) */
-    hbool_t     checked_filters; /* TRUE if pipeline passes can_apply checks */
+    H5B2_t *          huge_bt2;     /* v2 B-tree handle for huge objects */
+    hsize_t           huge_max_id;  /* Max. 'huge' heap ID before rolling 'huge' heap IDs over */
+    uint8_t           huge_id_size; /* Size of 'huge' heap IDs (in bytes) */
+    hbool_t huge_ids_direct;   /* Flag to indicate that 'huge' object's offset & length are stored directly in
+                                  heap ID */
+    size_t  tiny_max_len;      /* Max. size of tiny objects for this heap */
+    hbool_t tiny_len_extended; /* Flag to indicate that 'tiny' object's length is stored in extended form
+                                  (i.e. w/extra byte) */
+    uint8_t heap_off_size;     /* Size of heap offsets (in bytes) */
+    uint8_t heap_len_size;     /* Size of heap ID lengths (in bytes) */
+    hbool_t checked_filters;   /* TRUE if pipeline passes can_apply checks */
 } H5HF_hdr_t;
 
 /* Common indirect block doubling table entry */
 /* (common between entries pointing to direct & indirect child blocks) */
 typedef struct H5HF_indirect_ent_t {
-    haddr_t     addr;           /* Direct block's address                     */
+    haddr_t addr; /* Direct block's address                     */
 } H5HF_indirect_ent_t;
 
 /* Extern indirect block doubling table entry for compressed direct blocks */
 /* (only exists for indirect blocks in heaps that have I/O filters) */
 typedef struct H5HF_indirect_filt_ent_t {
-    size_t     size;            /* Size of child direct block, after passing though I/O filters */
-    unsigned	filter_mask;	/* Excluded filters for child direct block */
+    size_t   size;        /* Size of child direct block, after passing though I/O filters */
+    unsigned filter_mask; /* Excluded filters for child direct block */
 } H5HF_indirect_filt_ent_t;
 
 /* Fractal heap indirect block */
@@ -379,22 +384,22 @@ struct H5HF_indirect_t {
     H5AC_info_t cache_info;
 
     /* Internal heap information (not stored) */
-    size_t      rc;             /* Reference count of objects using this block */
-    H5HF_hdr_t	*hdr;	        /* Shared heap header info	              */
-    struct H5HF_indirect_t *parent;	/* Shared parent indirect block info  */
-    unsigned    par_entry;      /* Entry in parent's table                    */
-    haddr_t     addr;           /* Address of this indirect block on disk     */
-    size_t      size;           /* Size of indirect block on disk             */
-    unsigned    nrows;          /* Total # of rows in indirect block          */
-    unsigned    max_rows;       /* Max. # of rows in indirect block           */
-    unsigned    nchildren;      /* Number of child blocks                     */
-    unsigned    max_child;      /* Max. offset used in child entries          */
+    size_t                   rc;            /* Reference count of objects using this block */
+    H5HF_hdr_t *             hdr;           /* Shared heap header info	              */
+    struct H5HF_indirect_t * parent;        /* Shared parent indirect block info  */
+    unsigned                 par_entry;     /* Entry in parent's table                    */
+    haddr_t                  addr;          /* Address of this indirect block on disk     */
+    size_t                   size;          /* Size of indirect block on disk             */
+    unsigned                 nrows;         /* Total # of rows in indirect block          */
+    unsigned                 max_rows;      /* Max. # of rows in indirect block           */
+    unsigned                 nchildren;     /* Number of child blocks                     */
+    unsigned                 max_child;     /* Max. offset used in child entries          */
     struct H5HF_indirect_t **child_iblocks; /* Array of pointers to pinned child indirect blocks */
 
     /* Stored values */
-    hsize_t     block_off;      /* Offset of the block within the heap's address space */
-    H5HF_indirect_ent_t *ents;  /* Pointer to block entry table               */
-    H5HF_indirect_filt_ent_t *filt_ents;    /* Pointer to filtered information for direct blocks */
+    hsize_t                   block_off; /* Offset of the block within the heap's address space */
+    H5HF_indirect_ent_t *     ents;      /* Pointer to block entry table               */
+    H5HF_indirect_filt_ent_t *filt_ents; /* Pointer to filtered information for direct blocks */
 };
 
 /* A fractal heap direct block */
@@ -403,111 +408,110 @@ typedef struct H5HF_direct_t {
     H5AC_info_t cache_info;
 
     /* Internal heap information */
-    H5HF_hdr_t	*hdr;	        /* Shared heap header info	              */
-    H5HF_indirect_t *parent;	/* Shared parent indirect block info          */
-    unsigned    par_entry;      /* Entry in parent's table                    */
-    size_t      size;           /* Size of direct block                       */
-    hsize_t     file_size;      /* Size of direct block in file (only valid when block's space is being freed) */
-    unsigned    blk_off_size;   /* Size of offsets in the block               */
-    uint8_t     *blk;           /* Pointer to buffer containing block data    */
+    H5HF_hdr_t *     hdr;       /* Shared heap header info	              */
+    H5HF_indirect_t *parent;    /* Shared parent indirect block info          */
+    unsigned         par_entry; /* Entry in parent's table                    */
+    size_t           size;      /* Size of direct block                       */
+    hsize_t  file_size;    /* Size of direct block in file (only valid when block's space is being freed) */
+    unsigned blk_off_size; /* Size of offsets in the block               */
+    uint8_t *blk;          /* Pointer to buffer containing block data    */
 
     /* Stored values */
-    hsize_t     block_off;      /* Offset of the block within the heap's address space */
+    hsize_t block_off; /* Offset of the block within the heap's address space */
 } H5HF_direct_t;
 
 /* Fractal heap */
 struct H5HF_t {
-    H5HF_hdr_t  *hdr;           /* Pointer to internal fractal heap header info */
-    H5F_t      *f;              /* Pointer to file for heap */
+    H5HF_hdr_t *hdr; /* Pointer to internal fractal heap header info */
+    H5F_t *     f;   /* Pointer to file for heap */
 };
 
 /* Fractal heap "parent info" (for loading a block) */
 typedef struct H5HF_parent_t {
-    H5HF_hdr_t *hdr;                /* Pointer to heap header info */
-    H5HF_indirect_t *iblock;    /* Pointer to parent indirect block */
-    unsigned entry;             /* Location of block in parent's entry table */
+    H5HF_hdr_t *     hdr;    /* Pointer to heap header info */
+    H5HF_indirect_t *iblock; /* Pointer to parent indirect block */
+    unsigned         entry;  /* Location of block in parent's entry table */
 } H5HF_parent_t;
 
 /* Typedef for indirectly accessed 'huge' object's records in the v2 B-tree */
 typedef struct H5HF_huge_bt2_indir_rec_t {
-    haddr_t addr;       /* Address of the object in the file */
-    hsize_t len;        /* Length of the object in the file */
-    hsize_t id;         /* ID used for object (not used for 'huge' objects directly accessed) */
+    haddr_t addr; /* Address of the object in the file */
+    hsize_t len;  /* Length of the object in the file */
+    hsize_t id;   /* ID used for object (not used for 'huge' objects directly accessed) */
 } H5HF_huge_bt2_indir_rec_t;
 
 /* Typedef for indirectly accessed, filtered 'huge' object's records in the v2 B-tree */
 typedef struct H5HF_huge_bt2_filt_indir_rec_t {
-    haddr_t addr;       /* Address of the filtered object in the file */
-    hsize_t len;        /* Length of the filtered object in the file */
-    unsigned filter_mask;   /* I/O pipeline filter mask for filtered object in the file */
-    hsize_t obj_size;   /* Size of the de-filtered object in memory */
-    hsize_t id;         /* ID used for object (not used for 'huge' objects directly accessed) */
+    haddr_t  addr;        /* Address of the filtered object in the file */
+    hsize_t  len;         /* Length of the filtered object in the file */
+    unsigned filter_mask; /* I/O pipeline filter mask for filtered object in the file */
+    hsize_t  obj_size;    /* Size of the de-filtered object in memory */
+    hsize_t  id;          /* ID used for object (not used for 'huge' objects directly accessed) */
 } H5HF_huge_bt2_filt_indir_rec_t;
 
 /* Typedef for directly accessed 'huge' object's records in the v2 B-tree */
 typedef struct H5HF_huge_bt2_dir_rec_t {
-    haddr_t addr;       /* Address of the object in the file */
-    hsize_t len;        /* Length of the object in the file */
+    haddr_t addr; /* Address of the object in the file */
+    hsize_t len;  /* Length of the object in the file */
 } H5HF_huge_bt2_dir_rec_t;
 
 /* Typedef for directly accessed, filtered 'huge' object's records in the v2 B-tree */
 typedef struct H5HF_huge_bt2_filt_dir_rec_t {
-    haddr_t addr;       /* Address of the filtered object in the file */
-    hsize_t len;        /* Length of the filtered object in the file */
-    unsigned filter_mask;   /* I/O pipeline filter mask for filtered object in the file */
-    hsize_t obj_size;   /* Size of the de-filtered object in memory */
+    haddr_t  addr;        /* Address of the filtered object in the file */
+    hsize_t  len;         /* Length of the filtered object in the file */
+    unsigned filter_mask; /* I/O pipeline filter mask for filtered object in the file */
+    hsize_t  obj_size;    /* Size of the de-filtered object in memory */
 } H5HF_huge_bt2_filt_dir_rec_t;
 
 /* User data for free space section 'add' callback */
 typedef struct {
-    H5HF_hdr_t *hdr;            /* Fractal heap header */
-    hid_t dxpl_id;              /* DXPL ID for operation */
+    H5HF_hdr_t *hdr;     /* Fractal heap header */
+    hid_t       dxpl_id; /* DXPL ID for operation */
 } H5HF_sect_add_ud_t;
 
 /* User data for v2 B-tree 'remove' callback on 'huge' objects */
 typedef struct {
-    H5HF_hdr_t *hdr;            /* Fractal heap header (in) */
-    hid_t dxpl_id;              /* DXPL ID for operation (in) */
-    hsize_t obj_len;            /* Length of object removed (out) */
+    H5HF_hdr_t *hdr;     /* Fractal heap header (in) */
+    hid_t       dxpl_id; /* DXPL ID for operation (in) */
+    hsize_t     obj_len; /* Length of object removed (out) */
 } H5HF_huge_remove_ud_t;
 
 /* User data for fractal heap header cache client callback */
 typedef struct H5HF_hdr_cache_ud_t {
-    H5F_t *f;                   /* File pointer */
-    hid_t dxpl_id;              /* DXPL ID for operation (in) */
+    H5F_t *f;       /* File pointer */
+    hid_t  dxpl_id; /* DXPL ID for operation (in) */
 } H5HF_hdr_cache_ud_t;
 
 /* User data for fractal heap indirect block cache client callbacks */
 typedef struct H5HF_iblock_cache_ud_t {
-    H5HF_parent_t * par_info;   /* Parent info */
-    H5F_t * f;                  /* File pointer */
-    const unsigned *nrows;      /* Number of rows */
+    H5HF_parent_t * par_info; /* Parent info */
+    H5F_t *         f;        /* File pointer */
+    const unsigned *nrows;    /* Number of rows */
 } H5HF_iblock_cache_ud_t;
 
 /* User data for fractal heap direct block cache client callbacks */
 typedef struct H5HF_dblock_cache_ud_t {
-    H5HF_parent_t par_info;     /* Parent info */
-    H5F_t * f;                  /* File pointer */
-    size_t odi_size;		/* On disk image size of the direct block.
-				 * Note that there is no necessary relation
-				 * between this value, and the actual
-				 * direct block size, as conpression may
-				 * reduce the size of the on disk image,
-				 * and check sums may increase it.
-				 */
-    size_t dblock_size;		/* size of the direct block, which bears
-				 * no necessary relation to the block
-				 * odi_size -- the size of the on disk
-				 * image of the block.  Note that the
-				 * metadata cache is only interested
-				 * in the odi_size, and thus it is this
-				 * value that is passed to the cache in
-				 * calls to it.
-				 */
-    unsigned filter_mask;	/* Excluded filters for direct block */
+    H5HF_parent_t par_info; /* Parent info */
+    H5F_t *       f;        /* File pointer */
+    size_t        odi_size; /* On disk image size of the direct block.
+                             * Note that there is no necessary relation
+                             * between this value, and the actual
+                             * direct block size, as conpression may
+                             * reduce the size of the on disk image,
+                             * and check sums may increase it.
+                             */
+    size_t dblock_size;     /* size of the direct block, which bears
+                             * no necessary relation to the block
+                             * odi_size -- the size of the on disk
+                             * image of the block.  Note that the
+                             * metadata cache is only interested
+                             * in the odi_size, and thus it is this
+                             * value that is passed to the cache in
+                             * calls to it.
+                             */
+    unsigned filter_mask;   /* Excluded filters for direct block */
 } H5HF_dblock_cache_ud_t;
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -564,123 +568,104 @@ H5FL_EXTERN(H5HF_direct_t);
 /* Declare a free list to manage heap direct block data to/from disk */
 H5FL_BLK_EXTERN(direct_block);
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 
 /* Doubling table routines */
-H5_DLL herr_t H5HF_dtable_init(H5HF_dtable_t *dtable);
-H5_DLL herr_t H5HF_dtable_dest(H5HF_dtable_t *dtable);
-H5_DLL herr_t H5HF_dtable_lookup(const H5HF_dtable_t *dtable, hsize_t off,
-    unsigned *row, unsigned *col);
+H5_DLL herr_t   H5HF_dtable_init(H5HF_dtable_t *dtable);
+H5_DLL herr_t   H5HF_dtable_dest(H5HF_dtable_t *dtable);
+H5_DLL herr_t   H5HF_dtable_lookup(const H5HF_dtable_t *dtable, hsize_t off, unsigned *row, unsigned *col);
 H5_DLL unsigned H5HF_dtable_size_to_row(const H5HF_dtable_t *dtable, size_t block_size);
 H5_DLL unsigned H5HF_dtable_size_to_rows(const H5HF_dtable_t *dtable, hsize_t size);
-H5_DLL hsize_t H5HF_dtable_span_size(const H5HF_dtable_t *dtable, unsigned start_row,
-    unsigned start_col, unsigned num_entries);
+H5_DLL hsize_t  H5HF_dtable_span_size(const H5HF_dtable_t *dtable, unsigned start_row, unsigned start_col,
+                                      unsigned num_entries);
 
 /* Heap header routines */
-H5_DLL H5HF_hdr_t * H5HF_hdr_alloc(H5F_t *f);
-H5_DLL haddr_t H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam);
-H5_DLL H5HF_hdr_t *H5HF_hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    H5AC_protect_t rw);
-H5_DLL herr_t H5HF_hdr_finish_init_phase1(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_finish_init_phase2(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_finish_init(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_incr(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_decr(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_fuse_incr(H5HF_hdr_t *hdr);
-H5_DLL size_t H5HF_hdr_fuse_decr(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_dirty(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_adj_free(H5HF_hdr_t *hdr, ssize_t amt);
-H5_DLL herr_t H5HF_hdr_adjust_heap(H5HF_hdr_t *hdr, hsize_t new_size, hssize_t extra_free);
-H5_DLL herr_t H5HF_hdr_inc_alloc(H5HF_hdr_t *hdr, size_t alloc_size);
-H5_DLL herr_t H5HF_hdr_start_iter(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, hsize_t curr_off, unsigned curr_entry);
-H5_DLL herr_t H5HF_hdr_skip_blocks(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_indirect_t *iblock, unsigned start_entry, unsigned nentries);
-H5_DLL herr_t H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size);
-H5_DLL herr_t H5HF_hdr_inc_iter(H5HF_hdr_t *hdr, hsize_t adv_size, unsigned nentries);
-H5_DLL herr_t H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    haddr_t dblock_addr);
-H5_DLL herr_t H5HF_hdr_reset_iter(H5HF_hdr_t *hdr, hsize_t curr_off);
-H5_DLL herr_t H5HF_hdr_empty(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_free(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id);
-H5_DLL herr_t H5HF_hdr_dest(H5HF_hdr_t *hdr);
+H5_DLL H5HF_hdr_t *H5HF_hdr_alloc(H5F_t *f);
+H5_DLL haddr_t     H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam);
+H5_DLL H5HF_hdr_t *H5HF_hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw);
+H5_DLL herr_t      H5HF_hdr_finish_init_phase1(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_finish_init_phase2(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_finish_init(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_incr(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_decr(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_fuse_incr(H5HF_hdr_t *hdr);
+H5_DLL size_t      H5HF_hdr_fuse_decr(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_dirty(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_adj_free(H5HF_hdr_t *hdr, ssize_t amt);
+H5_DLL herr_t      H5HF_hdr_adjust_heap(H5HF_hdr_t *hdr, hsize_t new_size, hssize_t extra_free);
+H5_DLL herr_t      H5HF_hdr_inc_alloc(H5HF_hdr_t *hdr, size_t alloc_size);
+H5_DLL herr_t      H5HF_hdr_start_iter(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, hsize_t curr_off,
+                                       unsigned curr_entry);
+H5_DLL herr_t      H5HF_hdr_skip_blocks(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *iblock,
+                                        unsigned start_entry, unsigned nentries);
+H5_DLL herr_t      H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size);
+H5_DLL herr_t      H5HF_hdr_inc_iter(H5HF_hdr_t *hdr, hsize_t adv_size, unsigned nentries);
+H5_DLL herr_t      H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr);
+H5_DLL herr_t      H5HF_hdr_reset_iter(H5HF_hdr_t *hdr, hsize_t curr_off);
+H5_DLL herr_t      H5HF_hdr_empty(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_free(H5HF_hdr_t *hdr);
+H5_DLL herr_t      H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id);
+H5_DLL herr_t      H5HF_hdr_dest(H5HF_hdr_t *hdr);
 
 /* Indirect block routines */
 H5_DLL herr_t H5HF_iblock_incr(H5HF_indirect_t *iblock);
 H5_DLL herr_t H5HF_iblock_decr(H5HF_indirect_t *iblock);
 H5_DLL herr_t H5HF_iblock_dirty(H5HF_indirect_t *iblock);
-H5_DLL herr_t H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    size_t min_dblock_size);
-H5_DLL herr_t H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    size_t min_dblock_size);
-H5_DLL herr_t H5HF_man_iblock_alloc_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t **sec_node);
-H5_DLL herr_t H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_indirect_t *par_iblock, unsigned par_entry, unsigned nrows,
-    unsigned max_rows, haddr_t *addr_p);
-H5_DLL H5HF_indirect_t *H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    haddr_t iblock_addr, unsigned iblock_nrows,
-    H5HF_indirect_t *par_iblock, unsigned par_entry, hbool_t must_protect,
-    H5AC_protect_t rw, hbool_t *did_protect);
-H5_DLL herr_t H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id,
-    unsigned cache_flags, hbool_t did_protect);
-H5_DLL herr_t H5HF_man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry,
-    haddr_t dblock_addr);
+H5_DLL herr_t H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size);
+H5_DLL herr_t H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size);
+H5_DLL herr_t H5HF_man_iblock_alloc_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t **sec_node);
+H5_DLL herr_t H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *par_iblock,
+                                     unsigned par_entry, unsigned nrows, unsigned max_rows, haddr_t *addr_p);
+H5_DLL H5HF_indirect_t *H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
+                                                unsigned iblock_nrows, H5HF_indirect_t *par_iblock,
+                                                unsigned par_entry, hbool_t must_protect, H5AC_protect_t rw,
+                                                hbool_t *did_protect);
+H5_DLL herr_t H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id, unsigned cache_flags,
+                                        hbool_t did_protect);
+H5_DLL herr_t H5HF_man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry, haddr_t dblock_addr);
 H5_DLL herr_t H5HF_man_iblock_detach(H5HF_indirect_t *iblock, hid_t dxpl_id, unsigned entry);
-H5_DLL herr_t H5HF_man_iblock_entry_addr(H5HF_indirect_t *iblock, unsigned entry,
-    haddr_t *child_addr);
-H5_DLL herr_t H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    haddr_t iblock_addr, unsigned iblock_nrows, H5HF_indirect_t *par_iblock,
-    unsigned par_entry);
-H5_DLL herr_t H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr,
-    haddr_t iblock_addr, unsigned nrows, H5HF_indirect_t *par_iblock, unsigned par_entry, hsize_t *heap_size/*out*/);
+H5_DLL herr_t H5HF_man_iblock_entry_addr(H5HF_indirect_t *iblock, unsigned entry, haddr_t *child_addr);
+H5_DLL herr_t H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
+                                     unsigned iblock_nrows, H5HF_indirect_t *par_iblock, unsigned par_entry);
+H5_DLL herr_t H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_addr,
+                                   unsigned nrows, H5HF_indirect_t *par_iblock, unsigned par_entry,
+                                   hsize_t *heap_size /*out*/);
 H5_DLL herr_t H5HF_man_iblock_dest(H5HF_indirect_t *iblock);
 
 /* Direct block routines */
 H5_DLL herr_t H5HF_man_dblock_new(H5HF_hdr_t *fh, hid_t dxpl_id, size_t request,
-    H5HF_free_section_t **ret_sec_node);
-H5_DLL herr_t H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr,
-    H5HF_indirect_t *par_iblock, unsigned par_entry, haddr_t *addr_p,
-    H5HF_free_section_t **ret_sec_node);
-H5_DLL herr_t H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_direct_t *dblock, haddr_t dblock_addr);
-H5_DLL H5HF_direct_t *H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    haddr_t dblock_addr, size_t dblock_size,
-    H5HF_indirect_t *par_iblock, unsigned par_entry,
-    H5AC_protect_t rw);
-H5_DLL herr_t H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    hsize_t obj_off, H5HF_indirect_t **par_iblock,
-    unsigned *par_entry, hbool_t *par_did_protect, H5AC_protect_t rw);
-H5_DLL herr_t H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr,
-    hsize_t dblock_size);
+                                  H5HF_free_section_t **ret_sec_node);
+H5_DLL herr_t H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock,
+                                     unsigned par_entry, haddr_t *addr_p, H5HF_free_section_t **ret_sec_node);
+H5_DLL herr_t H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
+                                      haddr_t dblock_addr);
+H5_DLL H5HF_direct_t *H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
+                                              size_t dblock_size, H5HF_indirect_t *par_iblock,
+                                              unsigned par_entry, H5AC_protect_t rw);
+H5_DLL herr_t         H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
+                                             H5HF_indirect_t **par_iblock, unsigned *par_entry,
+                                             hbool_t *par_did_protect, H5AC_protect_t rw);
+H5_DLL herr_t H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr, hsize_t dblock_size);
 H5_DLL herr_t H5HF_man_dblock_dest(H5HF_direct_t *dblock);
 
 /* Managed object routines */
-H5_DLL herr_t H5HF_man_insert(H5HF_hdr_t *fh, hid_t dxpl_id, size_t obj_size,
-    const void *obj, void *id);
-H5_DLL herr_t H5HF_man_read(H5HF_hdr_t *fh, hid_t dxpl_id, const uint8_t *id,
-    void *obj);
-H5_DLL herr_t H5HF_man_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    const void *obj);
-H5_DLL herr_t H5HF_man_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    H5HF_operator_t op, void *op_data);
+H5_DLL herr_t H5HF_man_insert(H5HF_hdr_t *fh, hid_t dxpl_id, size_t obj_size, const void *obj, void *id);
+H5_DLL herr_t H5HF_man_read(H5HF_hdr_t *fh, hid_t dxpl_id, const uint8_t *id, void *obj);
+H5_DLL herr_t H5HF_man_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, const void *obj);
+H5_DLL herr_t H5HF_man_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, H5HF_operator_t op,
+                          void *op_data);
 H5_DLL herr_t H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id);
 
 /* 'Huge' object routines */
 H5_DLL herr_t H5HF_huge_init(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size,
-    void *obj, void *id);
-H5_DLL herr_t H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    const uint8_t *id, size_t *obj_len_p);
-H5_DLL herr_t H5HF_huge_read(H5HF_hdr_t *fh, hid_t dxpl_id, const uint8_t *id,
-    void *obj);
-H5_DLL herr_t H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    const void *obj);
-H5_DLL herr_t H5HF_huge_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
-    H5HF_operator_t op, void *op_data);
+H5_DLL herr_t H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, void *id);
+H5_DLL herr_t H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, size_t *obj_len_p);
+H5_DLL herr_t H5HF_huge_read(H5HF_hdr_t *fh, hid_t dxpl_id, const uint8_t *id, void *obj);
+H5_DLL herr_t H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, const void *obj);
+H5_DLL herr_t H5HF_huge_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, H5HF_operator_t op,
+                           void *op_data);
 H5_DLL herr_t H5HF_huge_remove(H5HF_hdr_t *fh, hid_t dxpl_id, const uint8_t *id);
 H5_DLL herr_t H5HF_huge_term(H5HF_hdr_t *hdr, hid_t dxpl_id);
 H5_DLL herr_t H5HF_huge_delete(H5HF_hdr_t *hdr, hid_t dxpl_id);
@@ -696,80 +681,66 @@ H5_DLL herr_t H5HF_huge_bt2_filt_dir_remove(const void *nrecord, void *op_data);
 
 /* 'Tiny' object routines */
 H5_DLL herr_t H5HF_tiny_init(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF_tiny_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj,
-    void *id);
-H5_DLL herr_t H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id,
-    size_t *obj_len_p);
+H5_DLL herr_t H5HF_tiny_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *id);
+H5_DLL herr_t H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p);
 H5_DLL herr_t H5HF_tiny_read(H5HF_hdr_t *fh, const uint8_t *id, void *obj);
-H5_DLL herr_t H5HF_tiny_op(H5HF_hdr_t *hdr, const uint8_t *id,
-    H5HF_operator_t op, void *op_data);
+H5_DLL herr_t H5HF_tiny_op(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, void *op_data);
 H5_DLL herr_t H5HF_tiny_remove(H5HF_hdr_t *fh, const uint8_t *id);
 
 /* Debugging routines for dumping file structures */
-H5_DLL void H5HF_hdr_print(const H5HF_hdr_t *hdr, hid_t dxpl_id,
-	hbool_t dump_internal, FILE *stream, int indent, int fwidth);
-H5_DLL herr_t H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth);
-H5_DLL herr_t H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth, haddr_t hdr_addr, size_t nrec);
-H5_DLL void H5HF_iblock_print(const H5HF_indirect_t *iblock, hbool_t dump_internal,
-    FILE *stream, int indent, int fwidth);
-H5_DLL herr_t H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth, haddr_t hdr_addr, unsigned nrows);
+H5_DLL void   H5HF_hdr_print(const H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t dump_internal, FILE *stream,
+                             int indent, int fwidth);
+H5_DLL herr_t H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
+H5_DLL herr_t H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                                haddr_t hdr_addr, size_t nrec);
+H5_DLL void H5HF_iblock_print(const H5HF_indirect_t *iblock, hbool_t dump_internal, FILE *stream, int indent,
+                              int fwidth);
+H5_DLL herr_t H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
+                                haddr_t hdr_addr, unsigned nrows);
 
 /* Block iteration routines */
-H5_DLL herr_t H5HF_man_iter_init(H5HF_block_iter_t *biter);
-H5_DLL herr_t H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_block_iter_t *biter, hsize_t offset);
-H5_DLL herr_t H5HF_man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter,
-    H5HF_indirect_t *iblock, unsigned start_entry);
-H5_DLL herr_t H5HF_man_iter_set_entry(const H5HF_hdr_t *hdr,
-    H5HF_block_iter_t *biter, unsigned entry);
-H5_DLL herr_t H5HF_man_iter_next(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter,
-    unsigned nentries);
-H5_DLL herr_t H5HF_man_iter_up(H5HF_block_iter_t *biter);
-H5_DLL herr_t H5HF_man_iter_down(H5HF_block_iter_t *biter, H5HF_indirect_t *iblock);
-H5_DLL herr_t H5HF_man_iter_reset(H5HF_block_iter_t *biter);
-H5_DLL herr_t H5HF_man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col,
-    unsigned *entry, H5HF_indirect_t **block);
-H5_DLL herr_t H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter,
-    hsize_t *offset);
+H5_DLL herr_t  H5HF_man_iter_init(H5HF_block_iter_t *biter);
+H5_DLL herr_t  H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_block_iter_t *biter,
+                                          hsize_t offset);
+H5_DLL herr_t  H5HF_man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, H5HF_indirect_t *iblock,
+                                         unsigned start_entry);
+H5_DLL herr_t  H5HF_man_iter_set_entry(const H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned entry);
+H5_DLL herr_t  H5HF_man_iter_next(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned nentries);
+H5_DLL herr_t  H5HF_man_iter_up(H5HF_block_iter_t *biter);
+H5_DLL herr_t  H5HF_man_iter_down(H5HF_block_iter_t *biter, H5HF_indirect_t *iblock);
+H5_DLL herr_t  H5HF_man_iter_reset(H5HF_block_iter_t *biter);
+H5_DLL herr_t  H5HF_man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col, unsigned *entry,
+                                  H5HF_indirect_t **block);
+H5_DLL herr_t  H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t *offset);
 H5_DLL hbool_t H5HF_man_iter_ready(H5HF_block_iter_t *biter);
 
 /* Free space manipulation routines */
 H5_DLL herr_t H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t may_create);
-H5_DLL herr_t H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *node, unsigned flags);
-H5_DLL htri_t H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request,
-    H5HF_free_section_t **node);
+H5_DLL herr_t H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node, unsigned flags);
+H5_DLL htri_t H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request, H5HF_free_section_t **node);
 H5_DLL herr_t H5HF_space_revert_root(const H5HF_hdr_t *hdr, hid_t dxpl_id);
-H5_DLL herr_t H5HF_space_create_root(const H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_indirect_t *root_iblock);
+H5_DLL herr_t H5HF_space_create_root(const H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *root_iblock);
 H5_DLL herr_t H5HF_space_size(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t *fs_size);
-H5_DLL herr_t H5HF_space_remove(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *node);
+H5_DLL herr_t H5HF_space_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node);
 H5_DLL herr_t H5HF_space_close(H5HF_hdr_t *hdr, hid_t dxpl_id);
 H5_DLL herr_t H5HF_space_delete(H5HF_hdr_t *hdr, hid_t dxpl_id);
-H5_DLL herr_t H5HF_space_sect_change_class(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, unsigned new_class);
+H5_DLL herr_t H5HF_space_sect_change_class(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
+                                           unsigned new_class);
 
 /* Free space section routines */
-H5_DLL H5HF_free_section_t *H5HF_sect_single_new(hsize_t sect_off,
-    size_t sect_size, H5HF_indirect_t *parent, unsigned par_entry);
-H5_DLL herr_t H5HF_sect_single_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect);
-H5_DLL herr_t H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, haddr_t *dblock_addr, size_t *dblock_size);
-H5_DLL herr_t H5HF_sect_single_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, size_t amt);
-H5_DLL herr_t H5HF_sect_row_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect);
-H5_DLL herr_t H5HF_sect_row_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, unsigned *entry_p);
+H5_DLL H5HF_free_section_t *H5HF_sect_single_new(hsize_t sect_off, size_t sect_size, H5HF_indirect_t *parent,
+                                                 unsigned par_entry);
+H5_DLL herr_t H5HF_sect_single_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect);
+H5_DLL herr_t H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
+                                           haddr_t *dblock_addr, size_t *dblock_size);
+H5_DLL herr_t H5HF_sect_single_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect, size_t amt);
+H5_DLL herr_t H5HF_sect_row_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect);
+H5_DLL herr_t H5HF_sect_row_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
+                                   unsigned *entry_p);
 H5_DLL H5HF_indirect_t *H5HF_sect_row_get_iblock(H5HF_free_section_t *sect);
-H5_DLL herr_t H5HF_sect_indirect_add(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_indirect_t *iblock, unsigned start_entry, unsigned nentries);
-H5_DLL herr_t H5HF_sect_single_free(H5FS_section_info_t *sect);
+H5_DLL herr_t           H5HF_sect_indirect_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *iblock,
+                                               unsigned start_entry, unsigned nentries);
+H5_DLL herr_t           H5HF_sect_single_free(H5FS_section_info_t *sect);
 
 /* Internal operator callbacks */
 H5_DLL herr_t H5HF_op_read(const void *obj, size_t obj_len, void *op_data);
@@ -777,21 +748,18 @@ H5_DLL herr_t H5HF_op_write(const void *obj, size_t obj_len, void *op_data);
 
 /* Testing routines */
 #ifdef H5HF_TESTING
-H5_DLL herr_t H5HF_get_cparam_test(const H5HF_t *fh, H5HF_create_t *cparam);
-H5_DLL int H5HF_cmp_cparam_test(const H5HF_create_t *cparam1, const H5HF_create_t *cparam2);
+H5_DLL herr_t   H5HF_get_cparam_test(const H5HF_t *fh, H5HF_create_t *cparam);
+H5_DLL int      H5HF_cmp_cparam_test(const H5HF_create_t *cparam1, const H5HF_create_t *cparam2);
 H5_DLL unsigned H5HF_get_max_root_rows(const H5HF_t *fh);
 H5_DLL unsigned H5HF_get_dtable_width_test(const H5HF_t *fh);
 H5_DLL unsigned H5HF_get_dtable_max_drows_test(const H5HF_t *fh);
 H5_DLL unsigned H5HF_get_iblock_max_drows_test(const H5HF_t *fh, unsigned pos);
-H5_DLL hsize_t H5HF_get_dblock_size_test(const H5HF_t *fh, unsigned row);
-H5_DLL hsize_t H5HF_get_dblock_free_test(const H5HF_t *fh, unsigned row);
-H5_DLL herr_t H5HF_get_id_off_test(const H5HF_t *fh, const void *id, hsize_t *obj_off);
-H5_DLL herr_t H5HF_get_id_type_test(const void *id, unsigned char *obj_type);
-H5_DLL herr_t H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len,
-    hbool_t *len_extended);
-H5_DLL herr_t H5HF_get_huge_info_test(const H5HF_t *fh, hsize_t *next_id,
-    hbool_t *ids_direct);
+H5_DLL hsize_t  H5HF_get_dblock_size_test(const H5HF_t *fh, unsigned row);
+H5_DLL hsize_t  H5HF_get_dblock_free_test(const H5HF_t *fh, unsigned row);
+H5_DLL herr_t   H5HF_get_id_off_test(const H5HF_t *fh, const void *id, hsize_t *obj_off);
+H5_DLL herr_t   H5HF_get_id_type_test(const void *id, unsigned char *obj_type);
+H5_DLL herr_t   H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len, hbool_t *len_extended);
+H5_DLL herr_t   H5HF_get_huge_info_test(const H5HF_t *fh, hsize_t *next_id, hbool_t *ids_direct);
 #endif /* H5HF_TESTING */
 
 #endif /* _H5HFpkg_H */
-
diff --git a/src/H5HFprivate.h b/src/H5HFprivate.h
index 09bbdbe..4b0edf8 100644
--- a/src/H5HFprivate.h
+++ b/src/H5HFprivate.h
@@ -29,8 +29,8 @@
 #include "H5HFpublic.h"
 
 /* Private headers needed by this file */
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
+#include "H5Fprivate.h" /* File access				*/
+#include "H5Oprivate.h" /* Object headers		  	*/
 
 /**************************/
 /* Library Private Macros */
@@ -39,8 +39,7 @@
 /* Limit heap ID length to 4096 + 1, due to # of bits required to store
  *      length of 'tiny' objects (12 bits)
  */
-#define H5HF_MAX_ID_LEN         (4096 + 1)
-
+#define H5HF_MAX_ID_LEN (4096 + 1)
 
 /****************************/
 /* Library Private Typedefs */
@@ -48,59 +47,58 @@
 
 /* Creation parameters for doubling-tables */
 typedef struct H5HF_dtable_cparam_t {
-    unsigned    width;          /* Number of columns in the table (must be power of 2) */
-    size_t      start_block_size; /* Starting block size for table (must be power of 2) */
-    size_t      max_direct_size; /* Maximum size of a direct block (must be power of 2) */
-    unsigned    max_index;      /* Maximum ID/offset for table (integer log2 of actual value, ie. the # of bits required) */
-    unsigned    start_root_rows;        /* Starting number of rows for root indirect block */
-                                /* 0 indicates to create the full indirect block for the root,
-                                 * right from the start.  Doesn't have to be power of 2
-                                 */
+    unsigned width;            /* Number of columns in the table (must be power of 2) */
+    size_t   start_block_size; /* Starting block size for table (must be power of 2) */
+    size_t   max_direct_size;  /* Maximum size of a direct block (must be power of 2) */
+    unsigned max_index;        /* Maximum ID/offset for table (integer log2 of actual value, ie. the # of bits
+                                  required) */
+    unsigned start_root_rows;  /* Starting number of rows for root indirect block */
+                               /* 0 indicates to create the full indirect block for the root,
+                                * right from the start.  Doesn't have to be power of 2
+                                */
 } H5HF_dtable_cparam_t;
 
 /* Fractal heap creation parameters */
 typedef struct H5HF_create_t {
-    H5HF_dtable_cparam_t managed;/* Mapped object doubling-table creation parameters */
-    hbool_t checksum_dblocks;   /* Whether the direct blocks should be checksummed */
-    uint32_t max_man_size;      /* Max. size of object to manage in doubling table */
-                                /* (i.e.  min. size of object to store standalone) */
-    uint16_t id_len;            /* Length of IDs to use for heap objects */
-                                /* (0 - make ID just large enough to hold length & offset of object in the heap) */
-                                /* (1 - make ID just large enough to allow 'huge' objects to be accessed directly) */
-                                /* (n - make ID 'n' bytes in size) */
-    H5O_pline_t pline;          /* I/O filter pipeline to apply to direct blocks & 'huge' objects */
+    H5HF_dtable_cparam_t managed;          /* Mapped object doubling-table creation parameters */
+    hbool_t              checksum_dblocks; /* Whether the direct blocks should be checksummed */
+    uint32_t             max_man_size;     /* Max. size of object to manage in doubling table */
+                                           /* (i.e.  min. size of object to store standalone) */
+    uint16_t id_len;                       /* Length of IDs to use for heap objects */
+    /* (0 - make ID just large enough to hold length & offset of object in the heap) */
+    /* (1 - make ID just large enough to allow 'huge' objects to be accessed directly) */
+    /* (n - make ID 'n' bytes in size) */
+    H5O_pline_t pline; /* I/O filter pipeline to apply to direct blocks & 'huge' objects */
 } H5HF_create_t;
 
 /* Fractal heap metadata statistics info */
 typedef struct H5HF_stat_t {
     /* 'Managed' object info */
-    hsize_t man_size;           /* Size of 'managed' space in heap            */
-    hsize_t man_alloc_size;     /* Size of 'managed' space allocated in heap  */
-    hsize_t man_iter_off;       /* Offset of "new block" iterator in 'managed' heap space */
-    hsize_t man_free_space;     /* Free space within 'managed' heap blocks    */
-    hsize_t man_nobjs;          /* Number of 'managed' objects in heap        */
+    hsize_t man_size;       /* Size of 'managed' space in heap            */
+    hsize_t man_alloc_size; /* Size of 'managed' space allocated in heap  */
+    hsize_t man_iter_off;   /* Offset of "new block" iterator in 'managed' heap space */
+    hsize_t man_free_space; /* Free space within 'managed' heap blocks    */
+    hsize_t man_nobjs;      /* Number of 'managed' objects in heap        */
 
     /* 'Huge' object info */
-    hsize_t huge_size;          /* Size of 'huge' objects in heap             */
-    hsize_t huge_nobjs;         /* Number of 'huge' objects in heap           */
+    hsize_t huge_size;  /* Size of 'huge' objects in heap             */
+    hsize_t huge_nobjs; /* Number of 'huge' objects in heap           */
 
     /* 'Tiny' object info */
-    hsize_t tiny_size;          /* Size of 'tiny' objects in heap             */
-    hsize_t tiny_nobjs;         /* Number of 'tiny' objects in heap           */
+    hsize_t tiny_size;  /* Size of 'tiny' objects in heap             */
+    hsize_t tiny_nobjs; /* Number of 'tiny' objects in heap           */
 } H5HF_stat_t;
 
 /* Fractal heap info (forward decl - defined in H5HFpkg.h) */
 typedef struct H5HF_t H5HF_t;
 
 /* Typedef for 'op' operations */
-typedef herr_t (*H5HF_operator_t)(const void *obj/*in*/, size_t obj_len,
-        void *op_data/*in,out*/);
+typedef herr_t (*H5HF_operator_t)(const void *obj /*in*/, size_t obj_len, void *op_data /*in,out*/);
 
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
@@ -108,31 +106,24 @@ typedef herr_t (*H5HF_operator_t)(const void *obj/*in*/, size_t obj_len,
 /* General routines for fractal heap operations */
 H5_DLL H5HF_t *H5HF_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam);
 H5_DLL H5HF_t *H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr);
-H5_DLL herr_t H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p/*out*/);
-H5_DLL herr_t H5HF_get_heap_addr(const H5HF_t *fh, haddr_t *heap_addr/*out*/);
-H5_DLL herr_t H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size,
-    const void *obj, void *id/*out*/);
-H5_DLL herr_t H5HF_get_obj_len(H5HF_t *fh, hid_t dxpl_id, const void *id,
-    size_t *obj_len_p/*out*/);
-H5_DLL herr_t H5HF_read(H5HF_t *fh, hid_t dxpl_id, const void *id,
-    void *obj/*out*/);
-H5_DLL herr_t H5HF_write(H5HF_t *fh, hid_t dxpl_id, void *id, hbool_t *id_changed,
-    const void *obj);
-H5_DLL herr_t H5HF_op(H5HF_t *fh, hid_t dxpl_id, const void *id,
-    H5HF_operator_t op, void *op_data);
-H5_DLL herr_t H5HF_remove(H5HF_t *fh, hid_t dxpl_id, const void *id);
-H5_DLL herr_t H5HF_close(H5HF_t *fh, hid_t dxpl_id);
-H5_DLL herr_t H5HF_delete(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr);
+H5_DLL herr_t  H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p /*out*/);
+H5_DLL herr_t  H5HF_get_heap_addr(const H5HF_t *fh, haddr_t *heap_addr /*out*/);
+H5_DLL herr_t  H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size, const void *obj, void *id /*out*/);
+H5_DLL herr_t  H5HF_get_obj_len(H5HF_t *fh, hid_t dxpl_id, const void *id, size_t *obj_len_p /*out*/);
+H5_DLL herr_t  H5HF_read(H5HF_t *fh, hid_t dxpl_id, const void *id, void *obj /*out*/);
+H5_DLL herr_t  H5HF_write(H5HF_t *fh, hid_t dxpl_id, void *id, hbool_t *id_changed, const void *obj);
+H5_DLL herr_t  H5HF_op(H5HF_t *fh, hid_t dxpl_id, const void *id, H5HF_operator_t op, void *op_data);
+H5_DLL herr_t  H5HF_remove(H5HF_t *fh, hid_t dxpl_id, const void *id);
+H5_DLL herr_t  H5HF_close(H5HF_t *fh, hid_t dxpl_id);
+H5_DLL herr_t  H5HF_delete(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr);
 
 /* Statistics routines */
 H5_DLL herr_t H5HF_stat_info(const H5HF_t *fh, H5HF_stat_t *stats);
-H5_DLL herr_t H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size/*out*/);
+H5_DLL herr_t H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size /*out*/);
 
 /* Debugging routines */
 #ifdef H5HF_DEBUGGING
-H5_DLL herr_t H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth);
+H5_DLL herr_t H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
 #endif /* H5HF_DEBUGGING */
 
 #endif /* _H5HFprivate_H */
-
diff --git a/src/H5HFpublic.h b/src/H5HFpublic.h
index 82cfc21..aa7903d 100644
--- a/src/H5HFpublic.h
+++ b/src/H5HFpublic.h
@@ -49,4 +49,3 @@ extern "C" {
 #endif
 
 #endif /* _H5HFpublic_H */
-
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index a3ccd46..2d4234f 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -23,160 +23,134 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HFpkg.h"     /* Fractal heaps			*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Size of serialized indirect section information */
-#define H5HF_SECT_INDIRECT_SERIAL_SIZE(h) (                                   \
-    (h)->heap_off_size  /* Indirect block's offset in "heap space" */         \
-        + 2             /* Row */                                             \
-        + 2             /* Column */                                          \
-        + 2             /* # of entries */                                    \
+#define H5HF_SECT_INDIRECT_SERIAL_SIZE(h)                                                                    \
+    ((h)->heap_off_size /* Indirect block's offset in "heap space" */                                        \
+     + 2                /* Row */                                                                            \
+     + 2                /* Column */                                                                         \
+     + 2                /* # of entries */                                                                   \
     )
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Typedef for "class private" information for sections */
 typedef struct {
-    H5HF_hdr_t *hdr;            /* Pointer to fractal heap header */
+    H5HF_hdr_t *hdr; /* Pointer to fractal heap header */
 } H5HF_sect_private_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Shared routines */
-static herr_t H5HF_sect_init_cls(H5FS_section_class_t *cls,
-    H5HF_hdr_t *hdr);
-static herr_t H5HF_sect_term_cls(H5FS_section_class_t *cls);
-static H5HF_free_section_t *H5HF_sect_node_new(unsigned sect_type,
-    haddr_t sect_addr, hsize_t sect_size, H5FS_section_state_t state);
-static herr_t H5HF_sect_node_free(H5HF_free_section_t *sect,
-    H5HF_indirect_t *parent);
+static herr_t               H5HF_sect_init_cls(H5FS_section_class_t *cls, H5HF_hdr_t *hdr);
+static herr_t               H5HF_sect_term_cls(H5FS_section_class_t *cls);
+static H5HF_free_section_t *H5HF_sect_node_new(unsigned sect_type, haddr_t sect_addr, hsize_t sect_size,
+                                               H5FS_section_state_t state);
+static herr_t               H5HF_sect_node_free(H5HF_free_section_t *sect, H5HF_indirect_t *parent);
 
 /* 'single' section routines */
-static herr_t H5HF_sect_single_locate_parent(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    hbool_t refresh, H5HF_free_section_t *sect);
-static herr_t H5HF_sect_single_full_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect);
+static herr_t H5HF_sect_single_locate_parent(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t refresh,
+                                             H5HF_free_section_t *sect);
+static herr_t H5HF_sect_single_full_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect);
 
 /* 'single' section callbacks */
-static herr_t H5HF_sect_single_add(H5FS_section_info_t *sect, unsigned *flags,
-    void *udata);
-static H5FS_section_info_t *H5HF_sect_single_deserialize(const H5FS_section_class_t *cls,
-    hid_t dxpl_id, const uint8_t *buf, haddr_t sect_addr, hsize_t sect_size,
-    unsigned *des_flags);
-static htri_t H5HF_sect_single_can_merge(const H5FS_section_info_t *sect1,
-    const H5FS_section_info_t *sect2, void *udata);
-static herr_t H5HF_sect_single_merge(H5FS_section_info_t *sect1,
-    H5FS_section_info_t *sect2, void *udata);
-static htri_t H5HF_sect_single_can_shrink(const H5FS_section_info_t *sect,
-    void *udata);
-static herr_t H5HF_sect_single_shrink(H5FS_section_info_t **_sect,
-    void *udata);
-static herr_t H5HF_sect_single_valid(const H5FS_section_class_t *cls,
-    const H5FS_section_info_t *sect);
+static herr_t               H5HF_sect_single_add(H5FS_section_info_t *sect, unsigned *flags, void *udata);
+static H5FS_section_info_t *H5HF_sect_single_deserialize(const H5FS_section_class_t *cls, hid_t dxpl_id,
+                                                         const uint8_t *buf, haddr_t sect_addr,
+                                                         hsize_t sect_size, unsigned *des_flags);
+static htri_t H5HF_sect_single_can_merge(const H5FS_section_info_t *sect1, const H5FS_section_info_t *sect2,
+                                         void *udata);
+static herr_t H5HF_sect_single_merge(H5FS_section_info_t *sect1, H5FS_section_info_t *sect2, void *udata);
+static htri_t H5HF_sect_single_can_shrink(const H5FS_section_info_t *sect, void *udata);
+static herr_t H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void *udata);
+static herr_t H5HF_sect_single_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *sect);
 
 /* 'row' section routines */
-static H5HF_free_section_t *H5HF_sect_row_create(haddr_t sect_off,
-    hsize_t sect_size, hbool_t is_first, unsigned row, unsigned col,
-    unsigned nentries, H5HF_free_section_t *under_sect);
-static herr_t H5HF_sect_row_first(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect);
-static herr_t H5HF_sect_row_from_single(H5HF_hdr_t *hdr,
-    H5HF_free_section_t *sect, H5HF_direct_t *dblock);
+static H5HF_free_section_t *H5HF_sect_row_create(haddr_t sect_off, hsize_t sect_size, hbool_t is_first,
+                                                 unsigned row, unsigned col, unsigned nentries,
+                                                 H5HF_free_section_t *under_sect);
+static herr_t               H5HF_sect_row_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect);
+static herr_t H5HF_sect_row_from_single(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, H5HF_direct_t *dblock);
 static herr_t H5HF_sect_row_free_real(H5HF_free_section_t *sect);
 
 /* 'row' section callbacks */
 static herr_t H5HF_sect_row_init_cls(H5FS_section_class_t *cls, void *udata);
 static herr_t H5HF_sect_row_term_cls(H5FS_section_class_t *cls);
-static herr_t H5HF_sect_row_serialize(const H5FS_section_class_t *cls,
-    const H5FS_section_info_t *sect, uint8_t *buf);
-static H5FS_section_info_t *H5HF_sect_row_deserialize(const H5FS_section_class_t *cls,
-    hid_t dxpl_id, const uint8_t *buf, haddr_t sect_addr, hsize_t sect_size,
-    unsigned *des_flags);
-static htri_t H5HF_sect_row_can_merge(const H5FS_section_info_t *sect1,
-    const H5FS_section_info_t *sect2, void *udata);
-static herr_t H5HF_sect_row_merge(H5FS_section_info_t *sect1,
-    H5FS_section_info_t *sect2, void *udata);
-static htri_t H5HF_sect_row_can_shrink(const H5FS_section_info_t *sect,
-    void *udata);
-static herr_t H5HF_sect_row_shrink(H5FS_section_info_t **sect,
-    void *udata);
+static herr_t H5HF_sect_row_serialize(const H5FS_section_class_t *cls, const H5FS_section_info_t *sect,
+                                      uint8_t *buf);
+static H5FS_section_info_t *H5HF_sect_row_deserialize(const H5FS_section_class_t *cls, hid_t dxpl_id,
+                                                      const uint8_t *buf, haddr_t sect_addr,
+                                                      hsize_t sect_size, unsigned *des_flags);
+static htri_t H5HF_sect_row_can_merge(const H5FS_section_info_t *sect1, const H5FS_section_info_t *sect2,
+                                      void *udata);
+static herr_t H5HF_sect_row_merge(H5FS_section_info_t *sect1, H5FS_section_info_t *sect2, void *udata);
+static htri_t H5HF_sect_row_can_shrink(const H5FS_section_info_t *sect, void *udata);
+static herr_t H5HF_sect_row_shrink(H5FS_section_info_t **sect, void *udata);
 static herr_t H5HF_sect_row_free(H5FS_section_info_t *sect);
-static herr_t H5HF_sect_row_valid(const H5FS_section_class_t *cls,
-    const H5FS_section_info_t *sect);
-static herr_t H5HF_sect_row_debug(const H5FS_section_info_t *sect,
-    FILE *stream, int indent, int fwidth);
+static herr_t H5HF_sect_row_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *sect);
+static herr_t H5HF_sect_row_debug(const H5FS_section_info_t *sect, FILE *stream, int indent, int fwidth);
 
 /* 'indirect' section routines */
-static H5HF_free_section_t *H5HF_sect_indirect_new(H5HF_hdr_t *hdr,
-    haddr_t sect_off, hsize_t sect_size,
-    H5HF_indirect_t *iblock, hsize_t iblock_off,
-    unsigned row, unsigned col, unsigned nentries);
-static herr_t H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, hbool_t first_child, H5HF_free_section_t **first_row_sect,
-    unsigned space_flags, unsigned start_row, unsigned start_col,
-    unsigned end_row, unsigned end_col);
-static H5HF_free_section_t *H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr,
-    H5HF_indirect_t *iblock, H5HF_free_section_t *row_sect);
-static herr_t H5HF_sect_indirect_decr(H5HF_free_section_t *sect);
-static herr_t H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect);
-static herr_t H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, H5HF_indirect_t *sect_iblock);
-static herr_t H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *row_sect, hbool_t *alloc_from_start);
-static herr_t H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, unsigned child_entry);
-static herr_t H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect);
+static H5HF_free_section_t *H5HF_sect_indirect_new(H5HF_hdr_t *hdr, haddr_t sect_off, hsize_t sect_size,
+                                                   H5HF_indirect_t *iblock, hsize_t iblock_off, unsigned row,
+                                                   unsigned col, unsigned nentries);
+static herr_t H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
+                                           hbool_t first_child, H5HF_free_section_t **first_row_sect,
+                                           unsigned space_flags, unsigned start_row, unsigned start_col,
+                                           unsigned end_row, unsigned end_col);
+static H5HF_free_section_t *H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock,
+                                                       H5HF_free_section_t *row_sect);
+static herr_t               H5HF_sect_indirect_decr(H5HF_free_section_t *sect);
+static herr_t  H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect);
+static herr_t  H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
+                                         H5HF_indirect_t *sect_iblock);
+static herr_t  H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *row_sect,
+                                             hbool_t *alloc_from_start);
+static herr_t  H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
+                                         unsigned child_entry);
+static herr_t  H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect);
 static hbool_t H5HF_sect_indirect_is_first(H5HF_free_section_t *sect);
-static H5HF_indirect_t * H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect);
-static hsize_t H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect);
-static H5HF_free_section_t * H5HF_sect_indirect_top(H5HF_free_section_t *sect);
-static herr_t H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect1, H5HF_free_section_t *sect2);
+static H5HF_indirect_t *    H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect);
+static hsize_t              H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect);
+static H5HF_free_section_t *H5HF_sect_indirect_top(H5HF_free_section_t *sect);
+static herr_t H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect1,
+                                           H5HF_free_section_t *sect2);
 static herr_t H5HF_sect_indirect_build_parent(H5HF_hdr_t *hdr, H5HF_free_section_t *sect);
-static herr_t H5HF_sect_indirect_shrink(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect);
-static herr_t H5HF_sect_indirect_serialize(H5HF_hdr_t *hdr,
-    const H5HF_free_section_t *sect, uint8_t *buf);
-static H5FS_section_info_t *H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr,
-    hid_t dxpl_id, const uint8_t *buf, haddr_t sect_addr, hsize_t sect_size,
-    unsigned *des_flags);
-static herr_t H5HF_sect_indirect_free(H5HF_free_section_t *sect);
-static herr_t H5HF_sect_indirect_valid(const H5HF_hdr_t *hdr,
-    const H5HF_free_section_t *sect);
-static herr_t H5HF_sect_indirect_debug(const H5HF_free_section_t *sect,
-    FILE *stream, int indent, int fwidth);
+static herr_t H5HF_sect_indirect_shrink(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect);
+static herr_t H5HF_sect_indirect_serialize(H5HF_hdr_t *hdr, const H5HF_free_section_t *sect, uint8_t *buf);
+static H5FS_section_info_t *H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *buf,
+                                                           haddr_t sect_addr, hsize_t sect_size,
+                                                           unsigned *des_flags);
+static herr_t               H5HF_sect_indirect_free(H5HF_free_section_t *sect);
+static herr_t               H5HF_sect_indirect_valid(const H5HF_hdr_t *hdr, const H5HF_free_section_t *sect);
+static herr_t H5HF_sect_indirect_debug(const H5HF_free_section_t *sect, FILE *stream, int indent, int fwidth);
 
 /* 'indirect' section callbacks */
 static herr_t H5HF_sect_indirect_init_cls(H5FS_section_class_t *cls, void *udata);
 static herr_t H5HF_sect_indirect_term_cls(H5FS_section_class_t *cls);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -184,27 +158,27 @@ static herr_t H5HF_sect_indirect_term_cls(H5FS_section_class_t *cls);
 /* Class info for "single" free space sections */
 H5FS_section_class_t H5HF_FSPACE_SECT_CLS_SINGLE[1] = {{
     /* Class variables */
-    H5HF_FSPACE_SECT_SINGLE,		/* Section type                 */
-    0,					/* Extra serialized size        */
-    H5FS_CLS_MERGE_SYM,			/* Class flags                  */
-    NULL,				/* Class private info           */
+    H5HF_FSPACE_SECT_SINGLE, /* Section type                 */
+    0,                       /* Extra serialized size        */
+    H5FS_CLS_MERGE_SYM,      /* Class flags                  */
+    NULL,                    /* Class private info           */
 
     /* Class methods */
-    NULL,				/* Initialize section class     */
-    NULL,				/* Terminate section class      */
+    NULL, /* Initialize section class     */
+    NULL, /* Terminate section class      */
 
     /* Object methods */
-    H5HF_sect_single_add,		/* Add section                  */
-    NULL,				/* Serialize section            */
-    H5HF_sect_single_deserialize,	/* Deserialize section          */
-    H5HF_sect_single_can_merge,		/* Can sections merge?          */
-    H5HF_sect_single_merge,		/* Merge sections               */
-    H5HF_sect_single_can_shrink,	/* Can section shrink container?*/
-    H5HF_sect_single_shrink,		/* Shrink container w/section   */
-    H5HF_sect_single_free,		/* Free section                 */
-    H5HF_sect_single_valid,		/* Check validity of section    */
-    NULL,				/* Split section node for alignment */
-    NULL,				/* Dump debugging for section   */
+    H5HF_sect_single_add,         /* Add section                  */
+    NULL,                         /* Serialize section            */
+    H5HF_sect_single_deserialize, /* Deserialize section          */
+    H5HF_sect_single_can_merge,   /* Can sections merge?          */
+    H5HF_sect_single_merge,       /* Merge sections               */
+    H5HF_sect_single_can_shrink,  /* Can section shrink container?*/
+    H5HF_sect_single_shrink,      /* Shrink container w/section   */
+    H5HF_sect_single_free,        /* Free section                 */
+    H5HF_sect_single_valid,       /* Check validity of section    */
+    NULL,                         /* Split section node for alignment */
+    NULL,                         /* Dump debugging for section   */
 }};
 
 /* Class info for "first row" free space sections */
@@ -213,53 +187,53 @@ H5FS_section_class_t H5HF_FSPACE_SECT_CLS_SINGLE[1] = {{
  */
 H5FS_section_class_t H5HF_FSPACE_SECT_CLS_FIRST_ROW[1] = {{
     /* Class variables */
-    H5HF_FSPACE_SECT_FIRST_ROW,		/* Section type                 */
-    0,					/* Extra serialized size        */
-    H5FS_CLS_MERGE_SYM,			/* Class flags                  */
-    NULL,				/* Class private info           */
+    H5HF_FSPACE_SECT_FIRST_ROW, /* Section type                 */
+    0,                          /* Extra serialized size        */
+    H5FS_CLS_MERGE_SYM,         /* Class flags                  */
+    NULL,                       /* Class private info           */
 
     /* Class methods */
-    H5HF_sect_row_init_cls,		/* Initialize section class     */
-    H5HF_sect_row_term_cls,		/* Terminate section class      */
+    H5HF_sect_row_init_cls, /* Initialize section class     */
+    H5HF_sect_row_term_cls, /* Terminate section class      */
 
     /* Object methods */
-    NULL,				/* Add section                  */
-    H5HF_sect_row_serialize,		/* Serialize section            */
-    H5HF_sect_row_deserialize,		/* Deserialize section          */
-    H5HF_sect_row_can_merge,		/* Can sections merge?          */
-    H5HF_sect_row_merge,		/* Merge sections               */
-    H5HF_sect_row_can_shrink,		/* Can section shrink container?*/
-    H5HF_sect_row_shrink,		/* Shrink container w/section   */
-    H5HF_sect_row_free,			/* Free section                 */
-    H5HF_sect_row_valid,		/* Check validity of section    */
-    NULL,				/* Split section node for alignment */
-    H5HF_sect_row_debug,		/* Dump debugging for section   */
+    NULL,                      /* Add section                  */
+    H5HF_sect_row_serialize,   /* Serialize section            */
+    H5HF_sect_row_deserialize, /* Deserialize section          */
+    H5HF_sect_row_can_merge,   /* Can sections merge?          */
+    H5HF_sect_row_merge,       /* Merge sections               */
+    H5HF_sect_row_can_shrink,  /* Can section shrink container?*/
+    H5HF_sect_row_shrink,      /* Shrink container w/section   */
+    H5HF_sect_row_free,        /* Free section                 */
+    H5HF_sect_row_valid,       /* Check validity of section    */
+    NULL,                      /* Split section node for alignment */
+    H5HF_sect_row_debug,       /* Dump debugging for section   */
 }};
 
 /* Class info for "normal row" free space sections */
 H5FS_section_class_t H5HF_FSPACE_SECT_CLS_NORMAL_ROW[1] = {{
     /* Class variables */
-    H5HF_FSPACE_SECT_NORMAL_ROW,	/* Section type                 */
-    0,					/* Extra serialized size        */
-    H5FS_CLS_MERGE_SYM|H5FS_CLS_SEPAR_OBJ|H5FS_CLS_GHOST_OBJ,	/* Class flags                  */
-    NULL,				/* Class private info           */
+    H5HF_FSPACE_SECT_NORMAL_ROW,                                  /* Section type                 */
+    0,                                                            /* Extra serialized size        */
+    H5FS_CLS_MERGE_SYM | H5FS_CLS_SEPAR_OBJ | H5FS_CLS_GHOST_OBJ, /* Class flags                  */
+    NULL,                                                         /* Class private info           */
 
     /* Class methods */
-    H5HF_sect_row_init_cls,		/* Initialize section class     */
-    H5HF_sect_row_term_cls,		/* Terminate section class      */
+    H5HF_sect_row_init_cls, /* Initialize section class     */
+    H5HF_sect_row_term_cls, /* Terminate section class      */
 
     /* Object methods */
-    NULL,				/* Add section                  */
-    NULL,				/* Serialize section            */
-    NULL,				/* Deserialize section          */
-    NULL,				/* Can sections merge?          */
-    NULL,				/* Merge sections               */
-    NULL,				/* Can section shrink container?*/
-    NULL,				/* Shrink container w/section   */
-    H5HF_sect_row_free,			/* Free section                 */
-    H5HF_sect_row_valid,		/* Check validity of section    */
-    NULL,				/* Split section node for alignment */
-    H5HF_sect_row_debug,		/* Dump debugging for section   */
+    NULL,                /* Add section                  */
+    NULL,                /* Serialize section            */
+    NULL,                /* Deserialize section          */
+    NULL,                /* Can sections merge?          */
+    NULL,                /* Merge sections               */
+    NULL,                /* Can section shrink container?*/
+    NULL,                /* Shrink container w/section   */
+    H5HF_sect_row_free,  /* Free section                 */
+    H5HF_sect_row_valid, /* Check validity of section    */
+    NULL,                /* Split section node for alignment */
+    H5HF_sect_row_debug, /* Dump debugging for section   */
 }};
 
 /* Class info for "indirect" free space sections */
@@ -268,44 +242,40 @@ H5FS_section_class_t H5HF_FSPACE_SECT_CLS_NORMAL_ROW[1] = {{
  */
 H5FS_section_class_t H5HF_FSPACE_SECT_CLS_INDIRECT[1] = {{
     /* Class variables */
-    H5HF_FSPACE_SECT_INDIRECT,		/* Section type                 */
-    0,					/* Extra serialized size        */
-    H5FS_CLS_MERGE_SYM|H5FS_CLS_GHOST_OBJ,			/* Class flags                  */
-    NULL,				/* Class private info           */
+    H5HF_FSPACE_SECT_INDIRECT,               /* Section type                 */
+    0,                                       /* Extra serialized size        */
+    H5FS_CLS_MERGE_SYM | H5FS_CLS_GHOST_OBJ, /* Class flags                  */
+    NULL,                                    /* Class private info           */
 
     /* Class methods */
-    H5HF_sect_indirect_init_cls,	/* Initialize section class     */
-    H5HF_sect_indirect_term_cls,	/* Terminate section class      */
+    H5HF_sect_indirect_init_cls, /* Initialize section class     */
+    H5HF_sect_indirect_term_cls, /* Terminate section class      */
 
     /* Object methods */
-    NULL,				/* Add section                  */
-    NULL,				/* Serialize section            */
-    NULL,				/* Deserialize section          */
-    NULL,				/* Can sections merge?          */
-    NULL,				/* Merge sections               */
-    NULL,				/* Can section shrink container?*/
-    NULL,				/* Shrink container w/section   */
-    NULL,				/* Free section                 */
-    NULL,				/* Check validity of section    */
-    NULL,				/* Split section node for alignment */
-    NULL,				/* Dump debugging for section   */
+    NULL, /* Add section                  */
+    NULL, /* Serialize section            */
+    NULL, /* Deserialize section          */
+    NULL, /* Can sections merge?          */
+    NULL, /* Merge sections               */
+    NULL, /* Can section shrink container?*/
+    NULL, /* Shrink container w/section   */
+    NULL, /* Free section                 */
+    NULL, /* Check validity of section    */
+    NULL, /* Split section node for alignment */
+    NULL, /* Dump debugging for section   */
 }};
 
 /* Declare a free list to manage the H5HF_free_section_t struct */
 H5FL_DEFINE(H5HF_free_section_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_init_cls
  *
@@ -322,8 +292,8 @@ H5FL_DEFINE(H5HF_free_section_t);
 static herr_t
 H5HF_sect_init_cls(H5FS_section_class_t *cls, H5HF_hdr_t *hdr)
 {
-    H5HF_sect_private_t *cls_prvt;      /* Pointer to class private info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_sect_private_t *cls_prvt;            /* Pointer to class private info */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -334,20 +304,19 @@ H5HF_sect_init_cls(H5FS_section_class_t *cls, H5HF_hdr_t *hdr)
     /* Allocate & initialize the class-private (i.e. private shared) information
      * for this type of section
      */
-    if(NULL == (cls_prvt = (H5HF_sect_private_t *)H5MM_malloc(sizeof(H5HF_sect_private_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    cls_prvt->hdr = hdr;
+    if (NULL == (cls_prvt = (H5HF_sect_private_t *)H5MM_malloc(sizeof(H5HF_sect_private_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    cls_prvt->hdr    = hdr;
     cls->cls_private = cls_prvt;
 
     /* Increment reference count on heap header */
-    if(H5HF_hdr_incr(hdr) < 0)
+    if (H5HF_hdr_incr(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared heap header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_init_cls() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_term_cls
  *
@@ -364,8 +333,8 @@ done:
 static herr_t
 H5HF_sect_term_cls(H5FS_section_class_t *cls)
 {
-    H5HF_sect_private_t *cls_prvt;      /* Pointer to class private info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_sect_private_t *cls_prvt;            /* Pointer to class private info */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -376,7 +345,7 @@ H5HF_sect_term_cls(H5FS_section_class_t *cls)
     cls_prvt = (H5HF_sect_private_t *)cls->cls_private;
 
     /* Decrement reference count on heap header */
-    if(H5HF_hdr_decr(cls_prvt->hdr) < 0)
+    if (H5HF_hdr_decr(cls_prvt->hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header")
 
     /* Free the class private information */
@@ -386,7 +355,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_term_cls() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_node_new
  *
@@ -402,11 +370,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5HF_free_section_t *
-H5HF_sect_node_new(unsigned sect_type, haddr_t sect_addr, hsize_t sect_size,
-    H5FS_section_state_t sect_state)
+H5HF_sect_node_new(unsigned sect_type, haddr_t sect_addr, hsize_t sect_size, H5FS_section_state_t sect_state)
 {
-    H5HF_free_section_t *new_sect;      /* New section */
-    H5HF_free_section_t *ret_value;     /* Return value */
+    H5HF_free_section_t *new_sect;  /* New section */
+    H5HF_free_section_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -414,15 +381,16 @@ H5HF_sect_node_new(unsigned sect_type, haddr_t sect_addr, hsize_t sect_size,
     HDassert(H5F_addr_defined(sect_addr));
 
     /* Create free list section node */
-    if(NULL == (new_sect = H5FL_MALLOC(H5HF_free_section_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for direct block free list section")
+    if (NULL == (new_sect = H5FL_MALLOC(H5HF_free_section_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for direct block free list section")
 
     /* Set the information passed in */
     new_sect->sect_info.addr = sect_addr;
     new_sect->sect_info.size = sect_size;
 
     /* Set the section's class & state */
-    new_sect->sect_info.type = sect_type;
+    new_sect->sect_info.type  = sect_type;
     new_sect->sect_info.state = sect_state;
 
     /* Set return value */
@@ -432,7 +400,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_node_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_node_free
  *
@@ -450,25 +417,25 @@ done:
 herr_t
 H5HF_sect_node_free(H5HF_free_section_t *sect, H5HF_indirect_t *iblock)
 {
-    herr_t ret_value = SUCCEED;               /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(sect);
 
     /* Release indirect block, if there was one */
-    if(iblock)
-        if(H5HF_iblock_decr(iblock) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on section's indirect block")
+    if (iblock)
+        if (H5HF_iblock_decr(iblock) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                        "can't decrement reference count on section's indirect block")
 
     /* Release the section */
     sect = H5FL_FREE(H5HF_free_section_t, sect);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5HF_sect_node_free() */
+} /* H5HF_sect_node_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_new
  *
@@ -483,11 +450,10 @@ done:
  *-------------------------------------------------------------------------
  */
 H5HF_free_section_t *
-H5HF_sect_single_new(hsize_t sect_off, size_t sect_size,
-    H5HF_indirect_t *parent, unsigned par_entry)
+H5HF_sect_single_new(hsize_t sect_off, size_t sect_size, H5HF_indirect_t *parent, unsigned par_entry)
 {
-    H5HF_free_section_t *sect = NULL;   /* 'Single' free space section to add */
-    H5HF_free_section_t *ret_value;     /* Return value */
+    H5HF_free_section_t *sect = NULL; /* 'Single' free space section to add */
+    H5HF_free_section_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -497,14 +463,16 @@ H5HF_sect_single_new(hsize_t sect_off, size_t sect_size,
     HDassert(sect_size);
 
     /* Create free space section node */
-    if(NULL == (sect = H5HF_sect_node_new(H5HF_FSPACE_SECT_SINGLE, sect_off, (hsize_t)sect_size, H5FS_SECT_LIVE)))
+    if (NULL ==
+        (sect = H5HF_sect_node_new(H5HF_FSPACE_SECT_SINGLE, sect_off, (hsize_t)sect_size, H5FS_SECT_LIVE)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for single section")
 
     /* Set the 'single' specific fields */
     sect->u.single.parent = parent;
-    if(sect->u.single.parent) {
-        if(H5HF_iblock_incr(sect->u.single.parent) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared indirect block")
+    if (sect->u.single.parent) {
+        if (H5HF_iblock_incr(sect->u.single.parent) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL,
+                        "can't increment reference count on shared indirect block")
     } /* end if */
     sect->u.single.par_entry = par_entry;
 
@@ -512,7 +480,7 @@ H5HF_sect_single_new(hsize_t sect_off, size_t sect_size,
     ret_value = sect;
 
 done:
-    if(!ret_value && sect) {
+    if (!ret_value && sect) {
         /* Release the section */
         sect = H5FL_FREE(H5HF_free_section_t, sect);
     } /* end if */
@@ -520,7 +488,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_single_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_locate_parent
  *
@@ -535,13 +502,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_single_locate_parent(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t refresh,
-    H5HF_free_section_t *sect)
+H5HF_sect_single_locate_parent(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t refresh, H5HF_free_section_t *sect)
 {
-    H5HF_indirect_t *sec_iblock;        /* Pointer to section indirect block */
-    unsigned sec_entry;                 /* Entry within section indirect block */
-    hbool_t did_protect;                /* Whether we protected the indirect block or not */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *sec_iblock;          /* Pointer to section indirect block */
+    unsigned         sec_entry;           /* Entry within section indirect block */
+    hbool_t          did_protect;         /* Whether we protected the indirect block or not */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -553,28 +519,30 @@ H5HF_sect_single_locate_parent(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t refresh,
     HDassert(sect);
 
     /* Look up indirect block containing direct blocks for range */
-    if(H5HF_man_dblock_locate(hdr, dxpl_id, sect->sect_info.addr, &sec_iblock, &sec_entry, &did_protect, H5AC_READ) < 0)
+    if (H5HF_man_dblock_locate(hdr, dxpl_id, sect->sect_info.addr, &sec_iblock, &sec_entry, &did_protect,
+                               H5AC_READ) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of section")
 
     /* Increment reference count on indirect block that free section is in */
-    if(H5HF_iblock_incr(sec_iblock) < 0)
+    if (H5HF_iblock_incr(sec_iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
 
     /* Check for refreshing existing parent information */
-    if(refresh) {
-        if(sect->u.single.parent) {
+    if (refresh) {
+        if (sect->u.single.parent) {
             /* Release hold on previous parent indirect block */
-            if(H5HF_iblock_decr(sect->u.single.parent) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on section's indirect block")
+            if (H5HF_iblock_decr(sect->u.single.parent) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                            "can't decrement reference count on section's indirect block")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Set the information for the section */
-    sect->u.single.parent = sec_iblock;
+    sect->u.single.parent    = sec_iblock;
     sect->u.single.par_entry = sec_entry;
 
     /* Unlock indirect block */
-    if(H5HF_man_iblock_unprotect(sec_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+    if (H5HF_man_iblock_unprotect(sec_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     sec_iblock = NULL;
 
@@ -582,7 +550,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_single_locate_parent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_revive
  *
@@ -597,10 +564,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_sect_single_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect)
+H5HF_sect_single_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -612,15 +578,15 @@ H5HF_sect_single_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
     HDassert(sect->sect_info.state == H5FS_SECT_SERIALIZED);
 
     /* Check for root direct block */
-    if(hdr->man_dtable.curr_root_rows == 0) {
+    if (hdr->man_dtable.curr_root_rows == 0) {
         /* Set the information for the section */
         HDassert(H5F_addr_defined(hdr->man_dtable.table_addr));
-        sect->u.single.parent = NULL;
+        sect->u.single.parent    = NULL;
         sect->u.single.par_entry = 0;
     } /* end if */
     else {
         /* Look up indirect block information for section */
-        if(H5HF_sect_single_locate_parent(hdr, dxpl_id, FALSE, sect) < 0)
+        if (H5HF_sect_single_locate_parent(hdr, dxpl_id, FALSE, sect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't get section's parent info")
     } /* end else */
 
@@ -631,7 +597,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_single_revive() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_dblock_info
  *
@@ -646,8 +611,8 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, haddr_t *dblock_addr, size_t *dblock_size)
+H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect, haddr_t *dblock_addr,
+                             size_t *dblock_size)
 {
     FUNC_ENTER_NOAPI_NOERR
 
@@ -662,22 +627,22 @@ H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id,
     HDassert(dblock_size);
 
     /* Check for root direct block */
-    if(hdr->man_dtable.curr_root_rows == 0) {
+    if (hdr->man_dtable.curr_root_rows == 0) {
         /* Retrieve direct block info from heap header */
         HDassert(H5F_addr_defined(hdr->man_dtable.table_addr));
-        *dblock_addr =  hdr->man_dtable.table_addr;
-        *dblock_size =  hdr->man_dtable.cparam.start_block_size;
+        *dblock_addr = hdr->man_dtable.table_addr;
+        *dblock_size = hdr->man_dtable.cparam.start_block_size;
     } /* end if */
     else {
         /* Retrieve direct block info from parent indirect block */
-        *dblock_addr =  sect->u.single.parent->ents[sect->u.single.par_entry].addr;
-        *dblock_size =  hdr->man_dtable.row_block_size[sect->u.single.par_entry / hdr->man_dtable.cparam.width];
+        *dblock_addr = sect->u.single.parent->ents[sect->u.single.par_entry].addr;
+        *dblock_size =
+            hdr->man_dtable.row_block_size[sect->u.single.par_entry / hdr->man_dtable.cparam.width];
     } /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_sect_single_dblock_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_reduce
  *
@@ -694,10 +659,9 @@ H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_sect_single_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, size_t amt)
+H5HF_sect_single_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect, size_t amt)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -710,9 +674,9 @@ H5HF_sect_single_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
     HDassert(sect->sect_info.state == H5FS_SECT_LIVE);
 
     /* Check for eliminating the section */
-    if(sect->sect_info.size == amt) {
+    if (sect->sect_info.size == amt) {
         /* Free single section */
-        if(H5HF_sect_single_free((H5FS_section_info_t *)sect) < 0)
+        if (H5HF_sect_single_free((H5FS_section_info_t *)sect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free single section node")
     } /* end if */
     else {
@@ -721,7 +685,7 @@ H5HF_sect_single_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
         sect->sect_info.size -= amt;
 
         /* Re-insert section node into heap's free space */
-        if(H5HF_space_add(hdr, dxpl_id, sect, 0) < 0)
+        if (H5HF_space_add(hdr, dxpl_id, sect, 0) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't re-add single section to free space manager")
     } /* end else */
 
@@ -729,7 +693,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_single_reduce() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_full_dblock
  *
@@ -748,13 +711,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_single_full_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect)
+H5HF_sect_single_full_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
-    haddr_t dblock_addr;                /* Section's direct block's address */
-    size_t dblock_size;                 /* Section's direct block's size */
-    size_t dblock_overhead;             /* Direct block's overhead */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    haddr_t dblock_addr;         /* Section's direct block's address */
+    size_t  dblock_size;         /* Section's direct block's size */
+    size_t  dblock_overhead;     /* Direct block's overhead */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -764,26 +726,27 @@ H5HF_sect_single_full_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id,
     HDassert(hdr);
 
     /* Retrieve direct block address from section */
-    if(H5HF_sect_single_dblock_info(hdr, dxpl_id, sect, &dblock_addr, &dblock_size) < 0)
+    if (H5HF_sect_single_dblock_info(hdr, dxpl_id, sect, &dblock_addr, &dblock_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve direct block information")
 
     /* Check for section occupying entire direct block */
     /* (and not the root direct block) */
     dblock_overhead = H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
-    if((dblock_size - dblock_overhead) == sect->sect_info.size &&
-            hdr->man_dtable.curr_root_rows > 0) {
-        H5HF_direct_t *dblock;          /* Pointer to direct block for section */
+    if ((dblock_size - dblock_overhead) == sect->sect_info.size && hdr->man_dtable.curr_root_rows > 0) {
+        H5HF_direct_t *dblock; /* Pointer to direct block for section */
 
-        if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, sect->u.single.parent, sect->u.single.par_entry, H5AC_WRITE)))
+        if (NULL ==
+            (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, sect->u.single.parent,
+                                              sect->u.single.par_entry, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
         HDassert(H5F_addr_eq(dblock->block_off + dblock_overhead, sect->sect_info.addr));
 
         /* Convert 'single' section into 'row' section */
-        if(H5HF_sect_row_from_single(hdr, sect, dblock) < 0)
+        if (H5HF_sect_row_from_single(hdr, sect, dblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCONVERT, FAIL, "can't convert single section into row section")
 
         /* Destroy direct block */
-        if(H5HF_man_dblock_destroy(hdr, dxpl_id, dblock, dblock_addr) < 0)
+        if (H5HF_man_dblock_destroy(hdr, dxpl_id, dblock, dblock_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release direct block")
         dblock = NULL;
     } /* end if */
@@ -792,7 +755,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_single_full_dblock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_add
  *
@@ -810,18 +772,18 @@ done:
 static herr_t
 H5HF_sect_single_add(H5FS_section_info_t *_sect, unsigned *flags, void *_udata)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Don't need to check section if we are deserializing, because it should
      *  have already been checked when it was first added
      */
-    if(!(*flags & H5FS_ADD_DESERIALIZING)) {
-        H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;   /* Fractal heap free section */
-        H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata;   /* User callback data */
-        H5HF_hdr_t *hdr = udata->hdr;       /* Fractal heap header */
-        hid_t dxpl_id = udata->dxpl_id;     /* DXPL ID for operation */
+    if (!(*flags & H5FS_ADD_DESERIALIZING)) {
+        H5HF_free_section_t *sect    = (H5HF_free_section_t *)_sect; /* Fractal heap free section */
+        H5HF_sect_add_ud_t * udata   = (H5HF_sect_add_ud_t *)_udata; /* User callback data */
+        H5HF_hdr_t *         hdr     = udata->hdr;                   /* Fractal heap header */
+        hid_t                dxpl_id = udata->dxpl_id;               /* DXPL ID for operation */
 
         /* Sanity check */
         HDassert(sect);
@@ -829,14 +791,14 @@ H5HF_sect_single_add(H5FS_section_info_t *_sect, unsigned *flags, void *_udata)
 
         /* Check if single section covers entire direct block it's in */
         /* (converts to row section possibly) */
-        if(H5HF_sect_single_full_dblock(hdr, dxpl_id, sect) < 0)
+        if (H5HF_sect_single_full_dblock(hdr, dxpl_id, sect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCONVERT, FAIL, "can't check/convert single section")
 
         /* Set the "returned space" flag if the single section was changed
          *      into a row section, so the "merging & shrinking" algorithm
          *      gets executed in the free space manager
          */
-        if(sect->sect_info.type != H5HF_FSPACE_SECT_SINGLE)
+        if (sect->sect_info.type != H5HF_FSPACE_SECT_SINGLE)
             *flags |= H5FS_ADD_RETURNED_SPACE;
     } /* end if */
 
@@ -844,7 +806,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_single_add() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_deserialize
  *
@@ -859,12 +820,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5FS_section_info_t *
-H5HF_sect_single_deserialize(const H5FS_section_class_t H5_ATTR_UNUSED *cls,
-    hid_t H5_ATTR_UNUSED dxpl_id, const uint8_t H5_ATTR_UNUSED *buf, haddr_t sect_addr,
-    hsize_t sect_size, unsigned H5_ATTR_UNUSED *des_flags)
+H5HF_sect_single_deserialize(const H5FS_section_class_t H5_ATTR_UNUSED *cls, hid_t H5_ATTR_UNUSED dxpl_id,
+                             const uint8_t H5_ATTR_UNUSED *buf, haddr_t sect_addr, hsize_t sect_size,
+                             unsigned H5_ATTR_UNUSED *des_flags)
 {
-    H5HF_free_section_t *new_sect;      /* New section */
-    H5FS_section_info_t *ret_value;     /* Return value */
+    H5HF_free_section_t *new_sect;  /* New section */
+    H5FS_section_info_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -873,7 +834,8 @@ H5HF_sect_single_deserialize(const H5FS_section_class_t H5_ATTR_UNUSED *cls,
     HDassert(sect_size);
 
     /* Create free list section node */
-    if(NULL == (new_sect = H5HF_sect_node_new(H5HF_FSPACE_SECT_SINGLE, sect_addr, sect_size, H5FS_SECT_SERIALIZED)))
+    if (NULL ==
+        (new_sect = H5HF_sect_node_new(H5HF_FSPACE_SECT_SINGLE, sect_addr, sect_size, H5FS_SECT_SERIALIZED)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "allocation failed for direct block free list section")
 
     /* Set return value */
@@ -883,7 +845,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_single_deserialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_can_merge
  *
@@ -901,19 +862,19 @@ done:
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5HF_sect_single_can_merge(const H5FS_section_info_t *_sect1,
-    const H5FS_section_info_t *_sect2, void H5_ATTR_UNUSED *_udata)
+H5HF_sect_single_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section_info_t *_sect2,
+                           void H5_ATTR_UNUSED *_udata)
 {
-    const H5HF_free_section_t *sect1 = (const H5HF_free_section_t *)_sect1;   /* Fractal heap free section */
-    const H5HF_free_section_t *sect2 = (const H5HF_free_section_t *)_sect2;   /* Fractal heap free section */
-    htri_t ret_value = FALSE;           /* Return value */
+    const H5HF_free_section_t *sect1 = (const H5HF_free_section_t *)_sect1; /* Fractal heap free section */
+    const H5HF_free_section_t *sect2 = (const H5HF_free_section_t *)_sect2; /* Fractal heap free section */
+    htri_t                     ret_value = FALSE;                           /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check arguments. */
     HDassert(sect1);
     HDassert(sect2);
-    HDassert(sect1->sect_info.type == sect2->sect_info.type);   /* Checks "MERGE_SYM" flag */
+    HDassert(sect1->sect_info.type == sect2->sect_info.type); /* Checks "MERGE_SYM" flag */
     HDassert(H5F_addr_lt(sect1->sect_info.addr, sect2->sect_info.addr));
 
     /* Check if second section adjoins first section */
@@ -921,14 +882,13 @@ H5HF_sect_single_can_merge(const H5FS_section_info_t *_sect1,
      *  overhead at the beginning of a block, so no need to check if sections
      *  are actually within the same direct block)
      */
-    if(H5F_addr_eq(sect1->sect_info.addr + sect1->sect_info.size, sect2->sect_info.addr))
+    if (H5F_addr_eq(sect1->sect_info.addr + sect1->sect_info.size, sect2->sect_info.addr))
         HGOTO_DONE(TRUE)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_single_can_merge() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_merge
  *
@@ -946,15 +906,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_single_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
-    void *_udata)
+H5HF_sect_single_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2, void *_udata)
 {
-    H5HF_free_section_t *sect1 = (H5HF_free_section_t *)_sect1;   /* Fractal heap free section */
-    H5HF_free_section_t *sect2 = (H5HF_free_section_t *)_sect2;   /* Fractal heap free section */
-    H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata;   /* User callback data */
-    H5HF_hdr_t *hdr = udata->hdr;       /* Fractal heap header */
-    hid_t dxpl_id = udata->dxpl_id;     /* DXPL ID for operation */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sect1     = (H5HF_free_section_t *)_sect1; /* Fractal heap free section */
+    H5HF_free_section_t *sect2     = (H5HF_free_section_t *)_sect2; /* Fractal heap free section */
+    H5HF_sect_add_ud_t * udata     = (H5HF_sect_add_ud_t *)_udata;  /* User callback data */
+    H5HF_hdr_t *         hdr       = udata->hdr;                    /* Fractal heap header */
+    hid_t                dxpl_id   = udata->dxpl_id;                /* DXPL ID for operation */
+    herr_t               ret_value = SUCCEED;                       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -969,24 +928,23 @@ H5HF_sect_single_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
     sect1->sect_info.size += sect2->sect_info.size;
 
     /* Get rid of second section */
-    if(H5HF_sect_single_free((H5FS_section_info_t *)sect2) < 0)
+    if (H5HF_sect_single_free((H5FS_section_info_t *)sect2) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free section node")
 
     /* Check to see if we should revive first section */
-    if(sect1->sect_info.state != H5FS_SECT_LIVE)
-        if(H5HF_sect_single_revive(hdr, dxpl_id, sect1) < 0)
+    if (sect1->sect_info.state != H5FS_SECT_LIVE)
+        if (H5HF_sect_single_revive(hdr, dxpl_id, sect1) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't revive single free section")
 
     /* Check if single section covers entire direct block it's in */
     /* (converts to row section possibly) */
-    if(H5HF_sect_single_full_dblock(hdr, dxpl_id, sect1) < 0)
+    if (H5HF_sect_single_full_dblock(hdr, dxpl_id, sect1) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTCONVERT, FAIL, "can't check/convert single section")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_single_merge() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_can_shrink
  *
@@ -1008,10 +966,10 @@ done:
 static htri_t
 H5HF_sect_single_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
 {
-    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect;   /* Fractal heap free section */
-    H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata;   /* User callback data */
-    H5HF_hdr_t *hdr = udata->hdr;       /* Fractal heap header */
-    htri_t ret_value = FALSE;           /* Return value */
+    const H5HF_free_section_t *sect      = (const H5HF_free_section_t *)_sect; /* Fractal heap free section */
+    H5HF_sect_add_ud_t *       udata     = (H5HF_sect_add_ud_t *)_udata;       /* User callback data */
+    H5HF_hdr_t *               hdr       = udata->hdr;                         /* Fractal heap header */
+    htri_t                     ret_value = FALSE;                              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1024,13 +982,13 @@ H5HF_sect_single_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
      *      would have been converted into a row section, if there was an
      *      indirect block that covered it)
      */
-    if(hdr->man_dtable.curr_root_rows == 0) {
-        size_t dblock_size;                 /* Section's direct block's size */
-        size_t dblock_overhead;             /* Direct block's overhead */
+    if (hdr->man_dtable.curr_root_rows == 0) {
+        size_t dblock_size;     /* Section's direct block's size */
+        size_t dblock_overhead; /* Direct block's overhead */
 
-        dblock_size = hdr->man_dtable.cparam.start_block_size;
+        dblock_size     = hdr->man_dtable.cparam.start_block_size;
         dblock_overhead = H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
-        if((dblock_size - dblock_overhead) == sect->sect_info.size)
+        if ((dblock_size - dblock_overhead) == sect->sect_info.size)
             HGOTO_DONE(TRUE)
     } /* end if */
     else {
@@ -1045,7 +1003,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_single_can_shrink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_shrink
  *
@@ -1063,14 +1020,14 @@ done:
 static herr_t
 H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void H5_ATTR_UNUSED *_udata)
 {
-    H5HF_free_section_t **sect = (H5HF_free_section_t **)_sect;   /* Fractal heap free section */
-    H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata;   /* User callback data */
-    H5HF_hdr_t *hdr = udata->hdr;       /* Fractal heap header */
-    hid_t dxpl_id = udata->dxpl_id;     /* DXPL ID for operation */
-    H5HF_direct_t *dblock;              /* Pointer to direct block for section */
-    haddr_t dblock_addr;                /* Section's direct block's address */
-    size_t dblock_size;                 /* Section's direct block's size */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t **sect    = (H5HF_free_section_t **)_sect; /* Fractal heap free section */
+    H5HF_sect_add_ud_t *  udata   = (H5HF_sect_add_ud_t *)_udata;  /* User callback data */
+    H5HF_hdr_t *          hdr     = udata->hdr;                    /* Fractal heap header */
+    hid_t                 dxpl_id = udata->dxpl_id;                /* DXPL ID for operation */
+    H5HF_direct_t *       dblock;                                  /* Pointer to direct block for section */
+    haddr_t               dblock_addr;                             /* Section's direct block's address */
+    size_t                dblock_size;                             /* Section's direct block's size */
+    herr_t                ret_value = SUCCEED;                     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1080,29 +1037,30 @@ H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void H5_ATTR_UNUSED *_udata
     HDassert((*sect)->sect_info.type == H5HF_FSPACE_SECT_SINGLE);
 
     /* Check to see if we should revive section */
-    if((*sect)->sect_info.state != H5FS_SECT_LIVE)
-        if(H5HF_sect_single_revive(hdr, dxpl_id, (*sect)) < 0)
+    if ((*sect)->sect_info.state != H5FS_SECT_LIVE)
+        if (H5HF_sect_single_revive(hdr, dxpl_id, (*sect)) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't revive single free section")
 
     /* Retrieve direct block address from section */
-    if(H5HF_sect_single_dblock_info(hdr, dxpl_id, (*sect), &dblock_addr, &dblock_size) < 0)
+    if (H5HF_sect_single_dblock_info(hdr, dxpl_id, (*sect), &dblock_addr, &dblock_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve direct block information")
 
     /* Protect the direct block for the section */
     /* (should be a root direct block) */
     HDassert(dblock_addr == hdr->man_dtable.table_addr);
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr,
-            dblock_size, (*sect)->u.single.parent, (*sect)->u.single.par_entry, H5AC_WRITE)))
+    if (NULL ==
+        (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, (*sect)->u.single.parent,
+                                          (*sect)->u.single.par_entry, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
     HDassert(H5F_addr_eq(dblock->block_off + dblock_size, (*sect)->sect_info.addr + (*sect)->sect_info.size));
 
     /* Destroy direct block */
-    if(H5HF_man_dblock_destroy(hdr, dxpl_id, dblock, dblock_addr) < 0)
+    if (H5HF_man_dblock_destroy(hdr, dxpl_id, dblock, dblock_addr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release direct block")
     dblock = NULL;
 
     /* Get rid of section */
-    if(H5HF_sect_single_free((H5FS_section_info_t *)*sect) < 0)
+    if (H5HF_sect_single_free((H5FS_section_info_t *)*sect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free section node")
 
     /* Indicate that the section has been released */
@@ -1112,7 +1070,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_single_shrink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_free
  *
@@ -1130,9 +1087,9 @@ done:
 herr_t
 H5HF_sect_single_free(H5FS_section_info_t *_sect)
 {
-    H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;   /* Pointer to section to free */
-    H5HF_indirect_t *parent = NULL;     /* Parent indirect block for section */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sect      = (H5HF_free_section_t *)_sect; /* Pointer to section to free */
+    H5HF_indirect_t *    parent    = NULL;                         /* Parent indirect block for section */
+    herr_t               ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1140,21 +1097,20 @@ H5HF_sect_single_free(H5FS_section_info_t *_sect)
     HDassert(sect);
 
     /* Check for live reference to an indirect block */
-    if(sect->sect_info.state == H5FS_SECT_LIVE) {
+    if (sect->sect_info.state == H5FS_SECT_LIVE) {
         /* Get parent indirect block, if there was one */
-        if(sect->u.single.parent)
+        if (sect->u.single.parent)
             parent = sect->u.single.parent;
     } /* end if */
 
     /* Release the section */
-    if(H5HF_sect_node_free(sect, parent) < 0)
+    if (H5HF_sect_node_free(sect, parent) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free section node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5HF_sect_single_free() */
+} /* H5HF_sect_single_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_single_valid
  *
@@ -1171,23 +1127,23 @@ done:
 static herr_t
 H5HF_sect_single_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls, const H5FS_section_info_t *_sect)
 {
-    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect;   /* Pointer to section to check */
+    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; /* Pointer to section to check */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check arguments. */
     HDassert(sect);
 
-    if(sect->sect_info.state == H5FS_SECT_LIVE) {
+    if (sect->sect_info.state == H5FS_SECT_LIVE) {
         /* Check if this section is not in a direct block that is the root direct block */
         /* (not enough information to check on a single section in a root direct block) */
-        if(sect->u.single.parent != NULL) {
-            H5HF_indirect_t *iblock;    /* Indirect block that section's direct block resides in */
-            haddr_t dblock_addr;        /* Direct block address */
-            size_t dblock_size;         /* Direct block size */
-            size_t dblock_overhead;     /* Direct block's overhead */
-            unsigned dblock_status = 0; /* Direct block's status in the metadata cache */
-            herr_t status;              /* Generic status value */
+        if (sect->u.single.parent != NULL) {
+            H5HF_indirect_t *iblock;            /* Indirect block that section's direct block resides in */
+            haddr_t          dblock_addr;       /* Direct block address */
+            size_t           dblock_size;       /* Direct block size */
+            size_t           dblock_overhead;   /* Direct block's overhead */
+            unsigned         dblock_status = 0; /* Direct block's status in the metadata cache */
+            herr_t           status;            /* Generic status value */
 
             /* Sanity check settings for section's direct block's parent */
             iblock = sect->u.single.parent;
@@ -1195,7 +1151,8 @@ H5HF_sect_single_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls, const H5F
 
             /* Retrieve direct block address from section */
             /* (Casting away const OK - QAK) */
-            status = H5HF_sect_single_dblock_info(iblock->hdr, H5AC_dxpl_id, (H5HF_free_section_t *)sect, &dblock_addr, &dblock_size);
+            status = H5HF_sect_single_dblock_info(iblock->hdr, H5AC_dxpl_id, (H5HF_free_section_t *)sect,
+                                                  &dblock_addr, &dblock_size);
             HDassert(status >= 0);
             HDassert(H5F_addr_eq(iblock->ents[sect->u.single.par_entry].addr, dblock_addr));
             HDassert(dblock_size > 0);
@@ -1215,11 +1172,12 @@ H5HF_sect_single_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls, const H5F
              *  protect it here in order to check single section's sanity
              *  against it.
              */
-            if(!(dblock_status & H5AC_ES__IS_PROTECTED)) {
-                H5HF_direct_t *dblock;      /* Direct block for section */
+            if (!(dblock_status & H5AC_ES__IS_PROTECTED)) {
+                H5HF_direct_t *dblock; /* Direct block for section */
 
                 /* Protect the direct block for the section */
-                dblock = H5HF_man_dblock_protect(iblock->hdr, H5AC_dxpl_id, dblock_addr, dblock_size, iblock, sect->u.single.par_entry, H5AC_READ);
+                dblock = H5HF_man_dblock_protect(iblock->hdr, H5AC_dxpl_id, dblock_addr, dblock_size, iblock,
+                                                 sect->u.single.par_entry, H5AC_READ);
                 HDassert(dblock);
 
                 /* Sanity check settings for section */
@@ -1227,19 +1185,19 @@ H5HF_sect_single_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls, const H5F
                 HDassert(dblock->size > sect->sect_info.size);
                 HDassert(H5F_addr_lt(dblock->block_off, sect->sect_info.addr));
                 HDassert(H5F_addr_ge((dblock->block_off + dblock->size),
-                        (sect->sect_info.addr + sect->sect_info.size)));
+                                     (sect->sect_info.addr + sect->sect_info.size)));
 
                 /* Release direct block */
-                status = H5AC_unprotect(iblock->hdr->f, H5AC_dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET);
+                status = H5AC_unprotect(iblock->hdr->f, H5AC_dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock,
+                                        H5AC__NO_FLAGS_SET);
                 HDassert(status >= 0);
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5HF_sect_single_valid() */
+} /* H5HF_sect_single_valid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_create
  *
@@ -1255,11 +1213,11 @@ H5HF_sect_single_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls, const H5F
  *-------------------------------------------------------------------------
  */
 static H5HF_free_section_t *
-H5HF_sect_row_create(haddr_t sect_off, hsize_t sect_size, hbool_t is_first,
-    unsigned row, unsigned col, unsigned nentries, H5HF_free_section_t *under_sect)
+H5HF_sect_row_create(haddr_t sect_off, hsize_t sect_size, hbool_t is_first, unsigned row, unsigned col,
+                     unsigned nentries, H5HF_free_section_t *under_sect)
 {
-    H5HF_free_section_t *sect = NULL;   /* 'Row' section created */
-    H5HF_free_section_t *ret_value;     /* Return value */
+    H5HF_free_section_t *sect = NULL; /* 'Row' section created */
+    H5HF_free_section_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1270,13 +1228,15 @@ H5HF_sect_row_create(haddr_t sect_off, hsize_t sect_size, hbool_t is_first,
 
     /* Create 'row' free space section node */
     /* ("inherits" underlying indirect section's state) */
-    if(NULL == (sect = H5HF_sect_node_new((unsigned)(is_first ? H5HF_FSPACE_SECT_FIRST_ROW : H5HF_FSPACE_SECT_NORMAL_ROW), sect_off, sect_size, under_sect->sect_info.state)))
+    if (NULL == (sect = H5HF_sect_node_new(
+                     (unsigned)(is_first ? H5HF_FSPACE_SECT_FIRST_ROW : H5HF_FSPACE_SECT_NORMAL_ROW),
+                     sect_off, sect_size, under_sect->sect_info.state)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for row section")
 
     /* Set the 'row' specific fields */
-    sect->u.row.under = under_sect;
-    sect->u.row.row = row;
-    sect->u.row.col = col;
+    sect->u.row.under       = under_sect;
+    sect->u.row.row         = row;
+    sect->u.row.col         = col;
     sect->u.row.num_entries = nentries;
     sect->u.row.checked_out = FALSE;
 
@@ -1287,7 +1247,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_from_single
  *
@@ -1302,10 +1261,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_row_from_single(H5HF_hdr_t *hdr, H5HF_free_section_t *sect,
-    H5HF_direct_t *dblock)
+H5HF_sect_row_from_single(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, H5HF_direct_t *dblock)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1317,26 +1275,25 @@ H5HF_sect_row_from_single(H5HF_hdr_t *hdr, H5HF_free_section_t *sect,
     HDassert(dblock);
 
     /* Convert 'single' section information to 'row' section info */
-    sect->sect_info.addr = dblock->block_off;
-    sect->sect_info.type = H5HF_FSPACE_SECT_FIRST_ROW;
-    sect->u.row.row = dblock->par_entry / hdr->man_dtable.cparam.width;
-    sect->u.row.col = dblock->par_entry % hdr->man_dtable.cparam.width;
+    sect->sect_info.addr    = dblock->block_off;
+    sect->sect_info.type    = H5HF_FSPACE_SECT_FIRST_ROW;
+    sect->u.row.row         = dblock->par_entry / hdr->man_dtable.cparam.width;
+    sect->u.row.col         = dblock->par_entry % hdr->man_dtable.cparam.width;
     sect->u.row.num_entries = 1;
     sect->u.row.checked_out = FALSE;
 
     /* Create indirect section that underlies the row section */
-    if(NULL == (sect->u.row.under = H5HF_sect_indirect_for_row(hdr, dblock->parent, sect)))
+    if (NULL == (sect->u.row.under = H5HF_sect_indirect_for_row(hdr, dblock->parent, sect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL, "serializing row section not supported yet")
 
     /* Release single section's hold on underlying indirect block */
-    if(H5HF_iblock_decr(dblock->parent) < 0)
+    if (H5HF_iblock_decr(dblock->parent) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_row_from_single() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_revive
  *
@@ -1353,7 +1310,7 @@ done:
 herr_t
 H5HF_sect_row_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1367,14 +1324,13 @@ H5HF_sect_row_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 
     /* Pass along "revive" request to underlying indirect section */
     /* (which will mark this section as "live") */
-    if(H5HF_sect_indirect_revive_row(hdr, dxpl_id, sect->u.row.under) < 0)
+    if (H5HF_sect_indirect_revive_row(hdr, dxpl_id, sect->u.row.under) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTREVIVE, FAIL, "can't revive indirect section")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_row_revive() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_reduce
  *
@@ -1391,11 +1347,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_sect_row_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
-    unsigned *entry_p)
+H5HF_sect_row_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect, unsigned *entry_p)
 {
-    hbool_t alloc_from_start;           /* Whether to allocate from the end of the row */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hbool_t alloc_from_start;    /* Whether to allocate from the end of the row */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1405,7 +1360,7 @@ H5HF_sect_row_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
     HDassert(hdr);
     HDassert(sect);
     HDassert(sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW ||
-            sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW);
+             sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW);
     HDassert(sect->sect_info.state == H5FS_SECT_LIVE);
     HDassert(entry_p);
 
@@ -1415,23 +1370,23 @@ H5HF_sect_row_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
 
     /* Forward row section to indirect routines, to handle reducing underlying indirect section */
     alloc_from_start = FALSE;
-    if(H5HF_sect_indirect_reduce_row(hdr, dxpl_id, sect, &alloc_from_start) < 0)
+    if (H5HF_sect_indirect_reduce_row(hdr, dxpl_id, sect, &alloc_from_start) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce underlying section")
 
     /* Determine entry allocated */
     *entry_p = (sect->u.row.row * hdr->man_dtable.cparam.width) + sect->u.row.col;
-    if(!alloc_from_start)
+    if (!alloc_from_start)
         *entry_p += (sect->u.row.num_entries - 1);
 
     /* Check for eliminating the section */
-    if(sect->u.row.num_entries == 1) {
+    if (sect->u.row.num_entries == 1) {
         /* Free row section */
-        if(H5HF_sect_row_free((H5FS_section_info_t *)sect) < 0)
+        if (H5HF_sect_row_free((H5FS_section_info_t *)sect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free row section node")
     } /* end if */
     else {
         /* Check whether to allocate from the beginning or end of the row */
-        if(alloc_from_start) {
+        if (alloc_from_start) {
             /* Adjust section start */
             sect->sect_info.addr += hdr->man_dtable.row_block_size[sect->u.row.row];
             sect->u.row.col++;
@@ -1444,7 +1399,7 @@ H5HF_sect_row_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
         sect->u.row.checked_out = FALSE;
 
         /* Add 'row' section back to free space list */
-        if(H5HF_space_add(hdr, dxpl_id, sect, 0) < 0)
+        if (H5HF_space_add(hdr, dxpl_id, sect, 0) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't re-add indirect section to free space manager")
     } /* end else */
 
@@ -1452,7 +1407,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_row_reduce() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_first
  *
@@ -1469,7 +1423,7 @@ done:
 static herr_t
 H5HF_sect_row_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1482,11 +1436,11 @@ H5HF_sect_row_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
      *  change it's class directly and the free space manager will adjust when
      *  it is checked back in.
      */
-    if(sect->u.row.checked_out)
+    if (sect->u.row.checked_out)
         sect->sect_info.type = H5HF_FSPACE_SECT_FIRST_ROW;
     else {
         /* Change row section to be the "first row" */
-        if(H5HF_space_sect_change_class(hdr, dxpl_id, sect, H5HF_FSPACE_SECT_FIRST_ROW) < 0)
+        if (H5HF_space_sect_change_class(hdr, dxpl_id, sect, H5HF_FSPACE_SECT_FIRST_ROW) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set row section to be first row")
     } /* end else */
 
@@ -1494,7 +1448,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_row_first() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_get_iblock
  *
@@ -1511,7 +1464,7 @@ done:
 H5HF_indirect_t *
 H5HF_sect_row_get_iblock(H5HF_free_section_t *sect)
 {
-    H5HF_indirect_t *ret_value;         /* Return value */
+    H5HF_indirect_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1520,7 +1473,7 @@ H5HF_sect_row_get_iblock(H5HF_free_section_t *sect)
      */
     HDassert(sect);
     HDassert(sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW ||
-            sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW);
+             sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW);
     HDassert(sect->sect_info.state == H5FS_SECT_LIVE);
 
     ret_value = H5HF_sect_indirect_get_iblock(sect->u.row.under);
@@ -1528,7 +1481,6 @@ H5HF_sect_row_get_iblock(H5HF_free_section_t *sect)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_row_get_iblock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_init_cls
  *
@@ -1549,8 +1501,8 @@ H5HF_sect_row_get_iblock(H5HF_free_section_t *sect)
 static herr_t
 H5HF_sect_row_init_cls(H5FS_section_class_t *cls, void *_udata)
 {
-    H5HF_hdr_t *hdr = (H5HF_hdr_t *)_udata; /* Fractal heap header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_hdr_t *hdr       = (H5HF_hdr_t *)_udata; /* Fractal heap header */
+    herr_t      ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1559,11 +1511,11 @@ H5HF_sect_row_init_cls(H5FS_section_class_t *cls, void *_udata)
     HDassert(hdr);
 
     /* Call common class initialization */
-    if(H5HF_sect_init_cls(cls, hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize common section class")
+    if (H5HF_sect_init_cls(cls, hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize common section class")
 
     /* First row sections actually are proxies for indirection sections on disk */
-    if(cls->type == H5HF_FSPACE_SECT_FIRST_ROW)
+    if (cls->type == H5HF_FSPACE_SECT_FIRST_ROW)
         cls->serial_size = H5HF_SECT_INDIRECT_SERIAL_SIZE(hdr);
     else
         cls->serial_size = 0;
@@ -1572,7 +1524,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_init_cls() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_term_cls
  *
@@ -1593,7 +1544,7 @@ done:
 static herr_t
 H5HF_sect_row_term_cls(H5FS_section_class_t *cls)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1601,14 +1552,13 @@ H5HF_sect_row_term_cls(H5FS_section_class_t *cls)
     HDassert(cls);
 
     /* Call common class termination */
-    if(H5HF_sect_term_cls(cls) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't terminate common section class")
+    if (H5HF_sect_term_cls(cls) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't terminate common section class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_term_cls() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_serialize
  *
@@ -1624,12 +1574,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_row_serialize(const H5FS_section_class_t *cls,
-    const H5FS_section_info_t *_sect, uint8_t *buf)
+H5HF_sect_row_serialize(const H5FS_section_class_t *cls, const H5FS_section_info_t *_sect, uint8_t *buf)
 {
-    H5HF_hdr_t *hdr;                    /* Fractal heap header */
-    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_hdr_t *               hdr; /* Fractal heap header */
+    const H5HF_free_section_t *sect      = (const H5HF_free_section_t *)_sect;
+    herr_t                     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1642,14 +1591,14 @@ H5HF_sect_row_serialize(const H5FS_section_class_t *cls,
 
     /* Forward to indirect routine to serialize underlying section */
     hdr = ((H5HF_sect_private_t *)(cls->cls_private))->hdr;
-    if(H5HF_sect_indirect_serialize(hdr, sect->u.row.under, buf) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTSERIALIZE, FAIL, "can't serialize row section's underlying indirect section")
+    if (H5HF_sect_indirect_serialize(hdr, sect->u.row.under, buf) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTSERIALIZE, FAIL,
+                    "can't serialize row section's underlying indirect section")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_serialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_deserialize
  *
@@ -1668,12 +1617,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5FS_section_info_t *
-H5HF_sect_row_deserialize(const H5FS_section_class_t *cls, hid_t dxpl_id,
-    const uint8_t *buf, haddr_t sect_addr, hsize_t sect_size,
-    unsigned *des_flags)
+H5HF_sect_row_deserialize(const H5FS_section_class_t *cls, hid_t dxpl_id, const uint8_t *buf,
+                          haddr_t sect_addr, hsize_t sect_size, unsigned *des_flags)
 {
-    H5HF_hdr_t *hdr;                    /* Fractal heap header */
-    H5FS_section_info_t *ret_value;     /* Return value */
+    H5HF_hdr_t *         hdr;       /* Fractal heap header */
+    H5FS_section_info_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1685,15 +1633,15 @@ H5HF_sect_row_deserialize(const H5FS_section_class_t *cls, hid_t dxpl_id,
 
     /* Forward to indirect routine to deserialize underlying section */
     hdr = ((H5HF_sect_private_t *)(cls->cls_private))->hdr;
-    if(NULL ==  (ret_value = H5HF_sect_indirect_deserialize(hdr, dxpl_id, buf,
-            sect_addr, sect_size, des_flags)))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTDECODE, NULL, "can't deserialize row section's underlying indirect section")
+    if (NULL ==
+        (ret_value = H5HF_sect_indirect_deserialize(hdr, dxpl_id, buf, sect_addr, sect_size, des_flags)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDECODE, NULL,
+                    "can't deserialize row section's underlying indirect section")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_deserialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_can_merge
  *
@@ -1711,13 +1659,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5HF_sect_row_can_merge(const H5FS_section_info_t *_sect1,
-    const H5FS_section_info_t *_sect2, void H5_ATTR_UNUSED *_udata)
+H5HF_sect_row_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section_info_t *_sect2,
+                        void H5_ATTR_UNUSED *_udata)
 {
-    const H5HF_free_section_t *sect1 = (const H5HF_free_section_t *)_sect1;   /* Fractal heap free section */
-    const H5HF_free_section_t *sect2 = (const H5HF_free_section_t *)_sect2;   /* Fractal heap free section */
-    H5HF_free_section_t *top_indir_sect1, *top_indir_sect2; /* Top indirect section for each row */
-    htri_t ret_value = FALSE;           /* Return value */
+    const H5HF_free_section_t *sect1 = (const H5HF_free_section_t *)_sect1; /* Fractal heap free section */
+    const H5HF_free_section_t *sect2 = (const H5HF_free_section_t *)_sect2; /* Fractal heap free section */
+    H5HF_free_section_t *      top_indir_sect1, *top_indir_sect2; /* Top indirect section for each row */
+    htri_t                     ret_value = FALSE;                 /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1725,7 +1673,7 @@ H5HF_sect_row_can_merge(const H5FS_section_info_t *_sect1,
     HDassert(sect1);
     HDassert(sect1->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW);
     HDassert(sect2);
-    HDassert(sect1->sect_info.type == sect2->sect_info.type);   /* Checks "MERGE_SYM" flag */
+    HDassert(sect1->sect_info.type == sect2->sect_info.type); /* Checks "MERGE_SYM" flag */
     HDassert(H5F_addr_lt(sect1->sect_info.addr, sect2->sect_info.addr));
 
     /* Get the top indirect section underlying each row */
@@ -1738,19 +1686,20 @@ H5HF_sect_row_can_merge(const H5FS_section_info_t *_sect1,
      *  the first section, but doesn't already have same underlying indirect
      *  section.
      */
-    if(top_indir_sect1 != top_indir_sect2) {
-        if(H5HF_sect_indirect_iblock_off(top_indir_sect1) == H5HF_sect_indirect_iblock_off(top_indir_sect2)) {
+    if (top_indir_sect1 != top_indir_sect2) {
+        if (H5HF_sect_indirect_iblock_off(top_indir_sect1) ==
+            H5HF_sect_indirect_iblock_off(top_indir_sect2)) {
             /* Check if second section adjoins first section */
-            if(H5F_addr_eq((top_indir_sect1->sect_info.addr + top_indir_sect1->u.indirect.span_size), top_indir_sect2->sect_info.addr))
+            if (H5F_addr_eq((top_indir_sect1->sect_info.addr + top_indir_sect1->u.indirect.span_size),
+                            top_indir_sect2->sect_info.addr))
                 HGOTO_DONE(TRUE)
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_can_merge() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_merge
  *
@@ -1768,15 +1717,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_row_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
-    void *_udata)
+H5HF_sect_row_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2, void *_udata)
 {
-    H5HF_free_section_t *sect1 = (H5HF_free_section_t *)_sect1;   /* Fractal heap free section */
-    H5HF_free_section_t *sect2 = (H5HF_free_section_t *)_sect2;   /* Fractal heap free section */
-    H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata;   /* User callback data */
-    H5HF_hdr_t *hdr = udata->hdr;       /* Fractal heap header */
-    hid_t dxpl_id = udata->dxpl_id;     /* DXPL ID for operation */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sect1     = (H5HF_free_section_t *)_sect1; /* Fractal heap free section */
+    H5HF_free_section_t *sect2     = (H5HF_free_section_t *)_sect2; /* Fractal heap free section */
+    H5HF_sect_add_ud_t * udata     = (H5HF_sect_add_ud_t *)_udata;  /* User callback data */
+    H5HF_hdr_t *         hdr       = udata->hdr;                    /* Fractal heap header */
+    hid_t                dxpl_id   = udata->dxpl_id;                /* DXPL ID for operation */
+    herr_t               ret_value = SUCCEED;                       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1787,29 +1735,29 @@ H5HF_sect_row_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
     HDassert(sect2->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW);
 
     /* Check if second section is past end of "next block" iterator */
-    if(sect2->sect_info.addr >= hdr->man_iter_off) {
-        H5HF_free_section_t *top_indir_sect;    /* Top indirect section for row */
+    if (sect2->sect_info.addr >= hdr->man_iter_off) {
+        H5HF_free_section_t *top_indir_sect; /* Top indirect section for row */
 
         /* Get the top indirect section underlying second row section */
         top_indir_sect = H5HF_sect_indirect_top(sect2->u.row.under);
 
         /* Shrink away underlying indirect section */
-        if(H5HF_sect_indirect_shrink(hdr, dxpl_id, top_indir_sect) < 0)
+        if (H5HF_sect_indirect_shrink(hdr, dxpl_id, top_indir_sect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't shrink underlying indirect section")
     } /* end if */
     else {
         /* Check to see if we should revive first section */
-        if(sect1->sect_info.state != H5FS_SECT_LIVE)
-            if(H5HF_sect_row_revive(hdr, dxpl_id, sect1) < 0)
+        if (sect1->sect_info.state != H5FS_SECT_LIVE)
+            if (H5HF_sect_row_revive(hdr, dxpl_id, sect1) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't revive single free section")
 
         /* Check to see if we should revive second section */
-        if(sect2->sect_info.state != H5FS_SECT_LIVE)
-            if(H5HF_sect_row_revive(hdr, dxpl_id, sect2) < 0)
+        if (sect2->sect_info.state != H5FS_SECT_LIVE)
+            if (H5HF_sect_row_revive(hdr, dxpl_id, sect2) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't revive single free section")
 
         /* Merge rows' underlying indirect sections together */
-        if(H5HF_sect_indirect_merge_row(hdr, dxpl_id, sect1, sect2) < 0)
+        if (H5HF_sect_indirect_merge_row(hdr, dxpl_id, sect1, sect2) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTMERGE, FAIL, "can't merge underlying indirect sections")
     } /* end else */
 
@@ -1817,7 +1765,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_merge() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_can_shrink
  *
@@ -1839,10 +1786,10 @@ done:
 static htri_t
 H5HF_sect_row_can_shrink(const H5FS_section_info_t *_sect, void H5_ATTR_UNUSED *_udata)
 {
-    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect;   /* Fractal heap free section */
-    H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata;   /* User callback data */
-    H5HF_hdr_t *hdr = udata->hdr;       /* Fractal heap header */
-    htri_t ret_value = FALSE;           /* Return value */
+    const H5HF_free_section_t *sect      = (const H5HF_free_section_t *)_sect; /* Fractal heap free section */
+    H5HF_sect_add_ud_t *       udata     = (H5HF_sect_add_ud_t *)_udata;       /* User callback data */
+    H5HF_hdr_t *               hdr       = udata->hdr;                         /* Fractal heap header */
+    htri_t                     ret_value = FALSE;                              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1851,14 +1798,13 @@ H5HF_sect_row_can_shrink(const H5FS_section_info_t *_sect, void H5_ATTR_UNUSED *
     HDassert(sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW);
 
     /* Check if section is past end of "next block" iterator */
-    if(sect->sect_info.addr >= hdr->man_iter_off)
+    if (sect->sect_info.addr >= hdr->man_iter_off)
         HGOTO_DONE(TRUE)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_can_shrink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_shrink
  *
@@ -1876,12 +1822,12 @@ done:
 static herr_t
 H5HF_sect_row_shrink(H5FS_section_info_t **_sect, void *_udata)
 {
-    H5HF_free_section_t **sect = (H5HF_free_section_t **)_sect;   /* Fractal heap free section */
-    H5HF_free_section_t *top_indir_sect; /* Top indirect section for row */
-    H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata;   /* User callback data */
-    H5HF_hdr_t *hdr = udata->hdr;       /* Fractal heap header */
-    hid_t dxpl_id = udata->dxpl_id;     /* DXPL ID for operation */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t **sect = (H5HF_free_section_t **)_sect;     /* Fractal heap free section */
+    H5HF_free_section_t * top_indir_sect;                           /* Top indirect section for row */
+    H5HF_sect_add_ud_t *  udata     = (H5HF_sect_add_ud_t *)_udata; /* User callback data */
+    H5HF_hdr_t *          hdr       = udata->hdr;                   /* Fractal heap header */
+    hid_t                 dxpl_id   = udata->dxpl_id;               /* DXPL ID for operation */
+    herr_t                ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1894,7 +1840,7 @@ H5HF_sect_row_shrink(H5FS_section_info_t **_sect, void *_udata)
     top_indir_sect = H5HF_sect_indirect_top((*sect)->u.row.under);
 
     /* Shrink away underlying indirect section */
-    if(H5HF_sect_indirect_shrink(hdr, dxpl_id, top_indir_sect) < 0)
+    if (H5HF_sect_indirect_shrink(hdr, dxpl_id, top_indir_sect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't shrink underlying indirect section")
 
     /* Indicate that the section has been released */
@@ -1904,7 +1850,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_row_shrink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_free_real
  *
@@ -1922,21 +1867,20 @@ done:
 static herr_t
 H5HF_sect_row_free_real(H5HF_free_section_t *sect)
 {
-    herr_t ret_value = SUCCEED;               /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(sect);
 
     /* Release the section */
-    if(H5HF_sect_node_free(sect, NULL) < 0)
+    if (H5HF_sect_node_free(sect, NULL) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free section node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5HF_sect_row_free_real() */
+} /* H5HF_sect_row_free_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_free
  *
@@ -1954,8 +1898,8 @@ done:
 static herr_t
 H5HF_sect_row_free(H5FS_section_info_t *_sect)
 {
-    H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;   /* Pointer to section to free */
-    herr_t ret_value = SUCCEED;               /* Return value */
+    H5HF_free_section_t *sect      = (H5HF_free_section_t *)_sect; /* Pointer to section to free */
+    herr_t               ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1963,18 +1907,17 @@ H5HF_sect_row_free(H5FS_section_info_t *_sect)
     HDassert(sect->u.row.under);
 
     /* Decrement the ref. count on the row section's underlying indirect section */
-    if(H5HF_sect_indirect_decr(sect->u.row.under) < 0)
+    if (H5HF_sect_indirect_decr(sect->u.row.under) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't detach section node")
 
     /* Release the section */
-    if(H5HF_sect_row_free_real(sect) < 0)
+    if (H5HF_sect_row_free_real(sect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free section node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5HF_sect_row_free() */
+} /* H5HF_sect_row_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_valid
  *
@@ -1991,11 +1934,11 @@ done:
 static herr_t
 H5HF_sect_row_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *_sect)
 {
-    H5HF_sect_private_t *cls_prvt;    /* Pointer to class private info */
-    const H5HF_hdr_t *hdr;      /* Fractal heap header */
-    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect;   /* Pointer to section to check */
-    const H5HF_free_section_t *indir_sect;   /* Pointer to underlying indirect section */
-    unsigned indir_idx;         /* Index of row in underlying indirect section's row array */
+    H5HF_sect_private_t *      cls_prvt;                                  /* Pointer to class private info */
+    const H5HF_hdr_t *         hdr;                                       /* Fractal heap header */
+    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; /* Pointer to section to check */
+    const H5HF_free_section_t *indir_sect; /* Pointer to underlying indirect section */
+    unsigned                   indir_idx;  /* Index of row in underlying indirect section's row array */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2005,22 +1948,22 @@ H5HF_sect_row_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *
 
     /* Retrieve class private information */
     cls_prvt = (H5HF_sect_private_t *)cls->cls_private;
-    hdr = cls_prvt->hdr;
+    hdr      = cls_prvt->hdr;
 
     /* Sanity checking on the row */
     HDassert(sect->u.row.under);
     HDassert(sect->u.row.num_entries);
     HDassert(sect->u.row.checked_out == FALSE);
     indir_sect = sect->u.row.under;
-    indir_idx = sect->u.row.row - indir_sect->u.indirect.row;
+    indir_idx  = sect->u.row.row - indir_sect->u.indirect.row;
     HDassert(indir_sect->u.indirect.dir_rows[indir_idx] == sect);
 
     /* Check if the section is actually within the heap */
     HDassert(sect->sect_info.addr < hdr->man_iter_off);
 
     /* Different checking for different kinds of rows */
-    if(sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW) {
-        H5HF_free_section_t *top_indir_sect;    /* Top indirect section for row */
+    if (sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW) {
+        H5HF_free_section_t *top_indir_sect; /* Top indirect section for row */
 
         /* Some extra sanity checks on the row */
         HDassert(sect->u.row.row == indir_sect->u.indirect.row);
@@ -2033,9 +1976,8 @@ H5HF_sect_row_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5HF_sect_row_valid() */
+} /* H5HF_sect_row_valid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_row_debug
  *
@@ -2050,10 +1992,9 @@ H5HF_sect_row_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_row_debug(const H5FS_section_info_t *_sect,
-    FILE *stream, int indent, int fwidth)
+H5HF_sect_row_debug(const H5FS_section_info_t *_sect, FILE *stream, int indent, int fwidth)
 {
-    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect;       /* Section to dump info */
+    const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; /* Section to dump info */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2061,21 +2002,14 @@ H5HF_sect_row_debug(const H5FS_section_info_t *_sect,
     HDassert(sect);
 
     /* Print indirect section information */
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Row:",
-	      sect->u.row.row);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Column:",
-	      sect->u.row.col);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of entries:",
-	      sect->u.row.num_entries);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Row:", sect->u.row.row);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Column:", sect->u.row.col);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of entries:", sect->u.row.num_entries);
 
     /* If this is a first row section display information about underlying indirect section */
-    if(sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW) {
+    if (sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW) {
         /* Print indirect section header */
-        HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
-                  "Underlying indirect section:");
+        HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Underlying indirect section:");
 
         H5HF_sect_indirect_debug(sect->u.row.under, stream, indent + 3, MAX(0, fwidth - 3));
     } /* end if */
@@ -2083,7 +2017,6 @@ H5HF_sect_row_debug(const H5FS_section_info_t *_sect,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_sect_row_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_iblock_off
  *
@@ -2100,7 +2033,7 @@ H5HF_sect_row_debug(const H5FS_section_info_t *_sect,
 static hsize_t
 H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect)
 {
-    hsize_t ret_value;           /* Return value */
+    hsize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2109,12 +2042,12 @@ H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect)
      */
     HDassert(sect);
 
-    ret_value = sect->sect_info.state == H5FS_SECT_LIVE ?  sect->u.indirect.u.iblock->block_off : sect->u.indirect.u.iblock_off;
+    ret_value = sect->sect_info.state == H5FS_SECT_LIVE ? sect->u.indirect.u.iblock->block_off
+                                                        : sect->u.indirect.u.iblock_off;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_iblock_off() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_top
  *
@@ -2131,7 +2064,7 @@ H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect)
 static H5HF_free_section_t *
 H5HF_sect_indirect_top(H5HF_free_section_t *sect)
 {
-    H5HF_free_section_t *ret_value;           /* Return value */
+    H5HF_free_section_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2140,7 +2073,7 @@ H5HF_sect_indirect_top(H5HF_free_section_t *sect)
      */
     HDassert(sect);
 
-    if(sect->u.indirect.parent)
+    if (sect->u.indirect.parent)
         ret_value = H5HF_sect_indirect_top(sect->u.indirect.parent);
     else
         ret_value = sect;
@@ -2148,7 +2081,6 @@ H5HF_sect_indirect_top(H5HF_free_section_t *sect)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_top() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_init_cls
  *
@@ -2166,8 +2098,8 @@ H5HF_sect_indirect_top(H5HF_free_section_t *sect)
 static herr_t
 H5HF_sect_indirect_init_cls(H5FS_section_class_t *cls, void *_udata)
 {
-    H5HF_hdr_t *hdr = (H5HF_hdr_t *)_udata; /* Fractal heap header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_hdr_t *hdr       = (H5HF_hdr_t *)_udata; /* Fractal heap header */
+    herr_t      ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2176,8 +2108,8 @@ H5HF_sect_indirect_init_cls(H5FS_section_class_t *cls, void *_udata)
     HDassert(hdr);
 
     /* Call to common class initialization */
-    if(H5HF_sect_init_cls(cls, hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize common section class")
+    if (H5HF_sect_init_cls(cls, hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize common section class")
 
     /* Set the size of all serialized objects of this class of sections */
     cls->serial_size = H5HF_SECT_INDIRECT_SERIAL_SIZE(hdr);
@@ -2186,7 +2118,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_indirect_init_cls() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_term_cls
  *
@@ -2204,7 +2135,7 @@ done:
 static herr_t
 H5HF_sect_indirect_term_cls(H5FS_section_class_t *cls)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2212,14 +2143,13 @@ H5HF_sect_indirect_term_cls(H5FS_section_class_t *cls)
     HDassert(cls);
 
     /* Call common class termination */
-    if(H5HF_sect_term_cls(cls) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't terminate common section class")
+    if (H5HF_sect_term_cls(cls) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't terminate common section class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_indirect_term_cls() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_new
  *
@@ -2235,12 +2165,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5HF_free_section_t *
-H5HF_sect_indirect_new(H5HF_hdr_t *hdr, haddr_t sect_off, hsize_t sect_size,
-    H5HF_indirect_t *iblock, hsize_t iblock_off, unsigned row, unsigned col,
-    unsigned nentries)
+H5HF_sect_indirect_new(H5HF_hdr_t *hdr, haddr_t sect_off, hsize_t sect_size, H5HF_indirect_t *iblock,
+                       hsize_t iblock_off, unsigned row, unsigned col, unsigned nentries)
 {
-    H5HF_free_section_t *sect = NULL;   /* 'Indirect' free space section to add */
-    H5HF_free_section_t *ret_value;     /* Return value */
+    H5HF_free_section_t *sect = NULL; /* 'Indirect' free space section to add */
+    H5HF_free_section_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2251,40 +2180,39 @@ H5HF_sect_indirect_new(H5HF_hdr_t *hdr, haddr_t sect_off, hsize_t sect_size,
     HDassert(nentries);
 
     /* Create free space section node */
-    if(NULL == (sect = H5HF_sect_node_new(H5HF_FSPACE_SECT_INDIRECT, sect_off,
-            sect_size, (iblock ? H5FS_SECT_LIVE : H5FS_SECT_SERIALIZED))))
+    if (NULL == (sect = H5HF_sect_node_new(H5HF_FSPACE_SECT_INDIRECT, sect_off, sect_size,
+                                           (iblock ? H5FS_SECT_LIVE : H5FS_SECT_SERIALIZED))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for indirect section")
 
     /* Set the 'indirect' specific fields */
-    if(iblock) {
-        sect->u.indirect.u.iblock = iblock;
-        sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
-                sect->u.indirect.u.iblock->max_rows;
-        if(H5HF_iblock_incr(sect->u.indirect.u.iblock) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared indirect block")
+    if (iblock) {
+        sect->u.indirect.u.iblock       = iblock;
+        sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * sect->u.indirect.u.iblock->max_rows;
+        if (H5HF_iblock_incr(sect->u.indirect.u.iblock) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL,
+                        "can't increment reference count on shared indirect block")
     } /* end if */
     else {
-        sect->u.indirect.u.iblock_off = iblock_off;
+        sect->u.indirect.u.iblock_off   = iblock_off;
         sect->u.indirect.iblock_entries = 0;
     } /* end else */
-    sect->u.indirect.row = row;
-    sect->u.indirect.col = col;
+    sect->u.indirect.row         = row;
+    sect->u.indirect.col         = col;
     sect->u.indirect.num_entries = nentries;
 
     /* Compute span size of indirect section */
-    sect->u.indirect.span_size = H5HF_dtable_span_size(&hdr->man_dtable,
-            row, col, nentries);
+    sect->u.indirect.span_size = H5HF_dtable_span_size(&hdr->man_dtable, row, col, nentries);
     HDassert(sect->u.indirect.span_size > 0);
 
     /* This indirect section doesn't (currently) have a parent */
-    sect->u.indirect.parent = NULL;
+    sect->u.indirect.parent    = NULL;
     sect->u.indirect.par_entry = 0;
 
     /* Set return value */
     ret_value = sect;
 
 done:
-    if(!ret_value && sect) {
+    if (!ret_value && sect) {
         /* Release the section */
         sect = H5FL_FREE(H5HF_free_section_t, sect);
     } /* end if */
@@ -2292,7 +2220,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_for_row
  *
@@ -2307,11 +2234,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5HF_free_section_t *
-H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock,
-    H5HF_free_section_t *row_sect)
+H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, H5HF_free_section_t *row_sect)
 {
-    H5HF_free_section_t *sect = NULL;   /* 'Indirect' free space section to add */
-    H5HF_free_section_t *ret_value;     /* Return value */
+    H5HF_free_section_t *sect = NULL; /* 'Indirect' free space section to add */
+    H5HF_free_section_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2324,38 +2250,38 @@ H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock,
     HDassert(row_sect->u.row.row < hdr->man_dtable.max_direct_rows);
 
     /* Create free space section node */
-    if(NULL == (sect = H5HF_sect_indirect_new(hdr, row_sect->sect_info.addr,
-            row_sect->sect_info.size, iblock, iblock->block_off,
-            row_sect->u.row.row, row_sect->u.row.col, row_sect->u.row.num_entries)))
+    if (NULL == (sect = H5HF_sect_indirect_new(hdr, row_sect->sect_info.addr, row_sect->sect_info.size,
+                                               iblock, iblock->block_off, row_sect->u.row.row,
+                                               row_sect->u.row.col, row_sect->u.row.num_entries)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't create indirect section")
 
     /* Set # of direct rows covered */
     sect->u.indirect.dir_nrows = 1;
 
     /* Allocate space for the derived row sections */
-    if(NULL == (sect->u.indirect.dir_rows = (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *))))
+    if (NULL ==
+        (sect->u.indirect.dir_rows = (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *))))
         HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, NULL, "allocation failed for row section pointer array")
 
     /* Atatch the new row section to indirect section */
     sect->u.indirect.dir_rows[0] = row_sect;
-    sect->u.indirect.rc = 1;
+    sect->u.indirect.rc          = 1;
 
     /* No indirect rows in current section */
     sect->u.indirect.indir_nents = 0;
-    sect->u.indirect.indir_ents = NULL;
+    sect->u.indirect.indir_ents  = NULL;
 
     /* Set return value */
     ret_value = sect;
 
 done:
-    if(!ret_value && sect)
-        if(H5HF_sect_indirect_free(sect) < 0)
+    if (!ret_value && sect)
+        if (H5HF_sect_indirect_free(sect) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, NULL, "can't free indirect section node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_for_row() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_init_rows
  *
@@ -2371,21 +2297,20 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, hbool_t first_child, H5HF_free_section_t **first_row_sect,
-    unsigned space_flags, unsigned start_row, unsigned start_col,
-    unsigned end_row, unsigned end_col)
+H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect, hbool_t first_child,
+                             H5HF_free_section_t **first_row_sect, unsigned space_flags, unsigned start_row,
+                             unsigned start_col, unsigned end_row, unsigned end_col)
 {
-    hsize_t curr_off;                   /* Offset of new section in "heap space" */
-    size_t dblock_overhead;             /* Direct block's overhead */
-    unsigned row_entries;               /* # of entries in row */
-    unsigned row_col;                   /* Column within current row */
-    unsigned curr_entry;                /* Current entry within indirect section */
-    unsigned curr_indir_entry;          /* Current indirect entry within indirect section */
-    unsigned curr_row;                  /* Current row within indirect section */
-    unsigned dir_nrows;                 /* # of direct rows in indirect section */
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hsize_t  curr_off;            /* Offset of new section in "heap space" */
+    size_t   dblock_overhead;     /* Direct block's overhead */
+    unsigned row_entries;         /* # of entries in row */
+    unsigned row_col;             /* Column within current row */
+    unsigned curr_entry;          /* Current entry within indirect section */
+    unsigned curr_indir_entry;    /* Current indirect entry within indirect section */
+    unsigned curr_row;            /* Current row within indirect section */
+    unsigned dir_nrows;           /* # of direct rows in indirect section */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2397,13 +2322,13 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
 
     /* Reset reference count for indirect section */
     /* (Also reset the direct & indirect row pointers */
-    sect->u.indirect.rc = 0;
-    sect->u.indirect.dir_rows = NULL;
+    sect->u.indirect.rc         = 0;
+    sect->u.indirect.dir_rows   = NULL;
     sect->u.indirect.indir_ents = NULL;
 
     /* Set up direct block information, if necessary */
-    if(start_row < hdr->man_dtable.max_direct_rows) {
-        unsigned max_direct_row;            /* Max. direct row covered */
+    if (start_row < hdr->man_dtable.max_direct_rows) {
+        unsigned max_direct_row; /* Max. direct row covered */
 
         /* Compute max. direct row covered by indirect section */
         max_direct_row = MIN(end_row, (hdr->man_dtable.max_direct_rows - 1));
@@ -2418,24 +2343,25 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
         sect->u.indirect.dir_nrows = 0;
 
         /* Allocate space for the derived row sections */
-        if(NULL == (sect->u.indirect.dir_rows = (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *) * dir_nrows)))
+        if (NULL == (sect->u.indirect.dir_rows =
+                         (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *) * dir_nrows)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "allocation failed for row section pointer array")
     } /* end if */
     else {
         /* No rows of direct blocks covered, reset direct row information */
-        dir_nrows = 0;
+        dir_nrows                  = 0;
         sect->u.indirect.dir_nrows = 0;
     } /* end else */
 
     /* Set up indirect block information, if necessary */
-    if(end_row >= hdr->man_dtable.max_direct_rows) {
-        unsigned indirect_start_row;    /* Row to start indirect entries on */
-        unsigned indirect_start_col;    /* Column to start indirect entries on */
-        unsigned indirect_start_entry;  /* Index of starting indirect entry */
-        unsigned indirect_end_entry;    /* Index of ending indirect entry */
+    if (end_row >= hdr->man_dtable.max_direct_rows) {
+        unsigned indirect_start_row;   /* Row to start indirect entries on */
+        unsigned indirect_start_col;   /* Column to start indirect entries on */
+        unsigned indirect_start_entry; /* Index of starting indirect entry */
+        unsigned indirect_end_entry;   /* Index of ending indirect entry */
 
         /* Compute starting indirect entry */
-        if(start_row < hdr->man_dtable.max_direct_rows) {
+        if (start_row < hdr->man_dtable.max_direct_rows) {
             indirect_start_row = hdr->man_dtable.max_direct_rows;
             indirect_start_col = 0;
         } /* end if */
@@ -2443,8 +2369,7 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
             indirect_start_row = start_row;
             indirect_start_col = start_col;
         } /* end else */
-        indirect_start_entry = (indirect_start_row * hdr->man_dtable.cparam.width)
-            + indirect_start_col;
+        indirect_start_entry = (indirect_start_row * hdr->man_dtable.cparam.width) + indirect_start_col;
 
         /* Compute ending indirect entry */
         indirect_end_entry = (end_row * hdr->man_dtable.cparam.width) + end_col;
@@ -2453,7 +2378,8 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
         sect->u.indirect.indir_nents = (indirect_end_entry - indirect_start_entry) + 1;
 
         /* Allocate space for the child indirect sections */
-        if(NULL == (sect->u.indirect.indir_ents = (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *) * sect->u.indirect.indir_nents)))
+        if (NULL == (sect->u.indirect.indir_ents = (H5HF_free_section_t **)H5MM_malloc(
+                         sizeof(H5HF_free_section_t *) * sect->u.indirect.indir_nents)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "allocation failed for indirect section pointer array")
     } /* end if */
     else {
@@ -2462,37 +2388,37 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
     } /* end else */
 
     /* Set up initial row information */
-    if(start_row == end_row)
+    if (start_row == end_row)
         row_entries = (end_col - start_col) + 1;
     else
         row_entries = hdr->man_dtable.cparam.width - start_col;
     row_col = start_col;
 
     /* Loop over creating the sections covered by this indirect section */
-    curr_off = sect->sect_info.addr;
-    curr_entry = (start_row * hdr->man_dtable.cparam.width) + start_col;
-    curr_row = 0;
+    curr_off         = sect->sect_info.addr;
+    curr_entry       = (start_row * hdr->man_dtable.cparam.width) + start_col;
+    curr_row         = 0;
     curr_indir_entry = 0;
-    dblock_overhead = H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
-    for(u = start_row; u <= end_row; u++, curr_row++) {
-        if(u < hdr->man_dtable.max_direct_rows) {
-            H5HF_free_section_t *row_sect = NULL;   /* 'Row' free space section to add */
+    dblock_overhead  = H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
+    for (u = start_row; u <= end_row; u++, curr_row++) {
+        if (u < hdr->man_dtable.max_direct_rows) {
+            H5HF_free_section_t *row_sect = NULL; /* 'Row' free space section to add */
 
             /* Create 'row' free space section node */
-            if(NULL == (row_sect = H5HF_sect_row_create(curr_off,
-                    (hdr->man_dtable.row_block_size[u] - dblock_overhead), first_child, u, row_col,
-                    row_entries, sect)))
+            if (NULL == (row_sect = H5HF_sect_row_create(
+                             curr_off, (hdr->man_dtable.row_block_size[u] - dblock_overhead), first_child, u,
+                             row_col, row_entries, sect)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL, "creation failed for child row section")
 
             /* Add new row section to array for indirect section */
             sect->u.indirect.dir_rows[curr_row] = row_sect;
 
             /* Check to see if we should grab the first row section instead of adding it immediately */
-            if(first_row_sect)
+            if (first_row_sect)
                 *first_row_sect = row_sect;
             else {
                 /* Add new row section to free space manager for the heap */
-                if(H5HF_space_add(hdr, dxpl_id, row_sect, space_flags) < 0)
+                if (H5HF_space_add(hdr, dxpl_id, row_sect, space_flags) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add row section to free space")
             } /* end else */
 
@@ -2506,36 +2432,42 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
             curr_entry += row_entries;
 
             /* Reset the 'first child' parameters */
-            first_child = FALSE;
+            first_child    = FALSE;
             first_row_sect = NULL;
         } /* end if */
         else {
-            H5HF_indirect_t *child_iblock;      /* Child indirect block */
-            H5HF_free_section_t *child_sect;    /* Child 'indirect' section to add */
-            unsigned child_nrows;               /* Number of child rows in indirect blocks for this row */
-            unsigned child_nentries;            /* Number of child entries in indirect blocks for this row */
-            unsigned v;         /* Local index variable */
+            H5HF_indirect_t *    child_iblock;   /* Child indirect block */
+            H5HF_free_section_t *child_sect;     /* Child 'indirect' section to add */
+            unsigned             child_nrows;    /* Number of child rows in indirect blocks for this row */
+            unsigned             child_nentries; /* Number of child entries in indirect blocks for this row */
+            unsigned             v;              /* Local index variable */
 
             /* Compute info about row's indirect blocks for child section */
-            child_nrows = H5HF_dtable_size_to_rows(&hdr->man_dtable, hdr->man_dtable.row_block_size[u]);
+            child_nrows    = H5HF_dtable_size_to_rows(&hdr->man_dtable, hdr->man_dtable.row_block_size[u]);
             child_nentries = child_nrows * hdr->man_dtable.cparam.width;
 
             /* Add an indirect section for each indirect block in the row */
-            for(v = 0; v < row_entries; v++) {
-                hbool_t did_protect;            /* Whether we protected the indirect block or not */
+            for (v = 0; v < row_entries; v++) {
+                hbool_t did_protect; /* Whether we protected the indirect block or not */
 
                 /* Try to get the child section's indirect block, if it's available */
-                if(sect->sect_info.state == H5FS_SECT_LIVE) {
-                    haddr_t child_iblock_addr;          /* Child indirect block's address on disk */
+                if (sect->sect_info.state == H5FS_SECT_LIVE) {
+                    haddr_t child_iblock_addr; /* Child indirect block's address on disk */
 
                     /* Get the address of the child indirect block */
-                    if(H5HF_man_iblock_entry_addr(sect->u.indirect.u.iblock, curr_entry, &child_iblock_addr) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve child indirect block's address")
+                    if (H5HF_man_iblock_entry_addr(sect->u.indirect.u.iblock, curr_entry,
+                                                   &child_iblock_addr) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
+                                    "unable to retrieve child indirect block's address")
 
                     /* If the child indirect block's address is defined, protect it */
-                    if(H5F_addr_defined(child_iblock_addr)) {
-                        if(NULL == (child_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, child_iblock_addr, child_nrows, sect->u.indirect.u.iblock, curr_entry, FALSE, H5AC_WRITE, &did_protect)))
-                            HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
+                    if (H5F_addr_defined(child_iblock_addr)) {
+                        if (NULL == (child_iblock =
+                                         H5HF_man_iblock_protect(hdr, dxpl_id, child_iblock_addr, child_nrows,
+                                                                 sect->u.indirect.u.iblock, curr_entry, FALSE,
+                                                                 H5AC_WRITE, &did_protect)))
+                            HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL,
+                                        "unable to protect fractal heap indirect block")
                     } /* end if */
                     else
                         child_iblock = NULL;
@@ -2544,25 +2476,26 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
                     child_iblock = NULL;
 
                 /* Create free space section node */
-                if(NULL == (child_sect = H5HF_sect_indirect_new(hdr, curr_off, (hsize_t)0,
-                        child_iblock, curr_off, 0, 0, child_nentries)))
+                if (NULL == (child_sect = H5HF_sect_indirect_new(hdr, curr_off, (hsize_t)0, child_iblock,
+                                                                 curr_off, 0, 0, child_nentries)))
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section")
 
                 /* Initialize rows for new indirect section */
-                if(H5HF_sect_indirect_init_rows(hdr, dxpl_id, child_sect,
-                        first_child, first_row_sect, space_flags, 0, 0,
-                        (child_nrows - 1), (hdr->man_dtable.cparam.width - 1)) < 0)
+                if (H5HF_sect_indirect_init_rows(hdr, dxpl_id, child_sect, first_child, first_row_sect,
+                                                 space_flags, 0, 0, (child_nrows - 1),
+                                                 (hdr->man_dtable.cparam.width - 1)) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize indirect section")
 
                 /* If we have a valid child indirect block, release it now */
                 /* (will be pinned, if rows reference it) */
-                if(child_iblock)
-                    if(H5HF_man_iblock_unprotect(child_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
-                        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+                if (child_iblock)
+                    if (H5HF_man_iblock_unprotect(child_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+                        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL,
+                                    "unable to release fractal heap indirect block")
 
                 /* Attach child section to this section */
-                child_sect->u.indirect.parent = sect;
-                child_sect->u.indirect.par_entry = curr_entry;
+                child_sect->u.indirect.parent                 = sect;
+                child_sect->u.indirect.par_entry              = curr_entry;
                 sect->u.indirect.indir_ents[curr_indir_entry] = child_sect;
                 sect->u.indirect.rc++;
 
@@ -2574,13 +2507,13 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
                 curr_indir_entry++;
 
                 /* Reset the 'first child' parameters */
-                first_child = FALSE;
+                first_child    = FALSE;
                 first_row_sect = NULL;
             } /* end for */
-        } /* end else */
+        }     /* end else */
 
         /* Compute the # of entries for the next row */
-        if(u < (end_row - 1))
+        if (u < (end_row - 1))
             row_entries = hdr->man_dtable.cparam.width;
         else
             row_entries = end_col + 1;
@@ -2593,21 +2526,19 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
     sect->u.indirect.dir_nrows = dir_nrows;
 
     /* Make certain we've tracked the section's dependents correctly */
-    HDassert(sect->u.indirect.rc ==
-            (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
+    HDassert(sect->u.indirect.rc == (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
 
 done:
-    if(ret_value < 0) {
-        if(sect->u.indirect.indir_ents)
+    if (ret_value < 0) {
+        if (sect->u.indirect.indir_ents)
             H5MM_xfree(sect->u.indirect.indir_ents);
-        if(sect->u.indirect.dir_rows)
+        if (sect->u.indirect.dir_rows)
             H5MM_xfree(sect->u.indirect.dir_rows);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_init_rows() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_add
  *
@@ -2623,19 +2554,19 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_sect_indirect_add(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_indirect_t *iblock, unsigned start_entry, unsigned nentries)
+H5HF_sect_indirect_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *iblock, unsigned start_entry,
+                       unsigned nentries)
 {
-    H5HF_free_section_t *sect = NULL;   /* 'Indirect' free space section to add */
-    H5HF_free_section_t *first_row_sect = NULL;   /* First row section in new indirect section */
-    hsize_t sect_off;                   /* Offset of section in heap space */
-    unsigned start_row;                 /* Start row in indirect block */
-    unsigned start_col;                 /* Start column in indirect block */
-    unsigned end_entry;                 /* End entry in indirect block */
-    unsigned end_row;                   /* End row in indirect block */
-    unsigned end_col;                   /* End column in indirect block */
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sect           = NULL; /* 'Indirect' free space section to add */
+    H5HF_free_section_t *first_row_sect = NULL; /* First row section in new indirect section */
+    hsize_t              sect_off;              /* Offset of section in heap space */
+    unsigned             start_row;             /* Start row in indirect block */
+    unsigned             start_col;             /* Start column in indirect block */
+    unsigned             end_entry;             /* End entry in indirect block */
+    unsigned             end_row;               /* End row in indirect block */
+    unsigned             end_col;               /* End column in indirect block */
+    unsigned             u;                     /* Local index variable */
+    herr_t               ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2652,41 +2583,40 @@ H5HF_sect_indirect_add(H5HF_hdr_t *hdr, hid_t dxpl_id,
 
     /* Compute end column & row */
     end_entry = (start_entry + nentries) - 1;
-    end_row = end_entry / hdr->man_dtable.cparam.width;
-    end_col = end_entry % hdr->man_dtable.cparam.width;
+    end_row   = end_entry / hdr->man_dtable.cparam.width;
+    end_col   = end_entry % hdr->man_dtable.cparam.width;
 
     /* Initialize information for rows skipped over */
     sect_off = iblock->block_off;
-    for(u = 0; u < start_row; u++)
+    for (u = 0; u < start_row; u++)
         sect_off += hdr->man_dtable.row_block_size[u] * hdr->man_dtable.cparam.width;
     sect_off += hdr->man_dtable.row_block_size[start_row] * start_col;
 
     /* Create free space section node */
-    if(NULL == (sect = H5HF_sect_indirect_new(hdr, sect_off, (hsize_t)0, iblock,
-            iblock->block_off, start_row, start_col, nentries)))
+    if (NULL == (sect = H5HF_sect_indirect_new(hdr, sect_off, (hsize_t)0, iblock, iblock->block_off,
+                                               start_row, start_col, nentries)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section")
 
     /* Initialize rows for new indirect section */
-    if(H5HF_sect_indirect_init_rows(hdr, dxpl_id, sect, TRUE, &first_row_sect,
-            H5FS_ADD_SKIP_VALID, start_row, start_col, end_row, end_col) < 0)
+    if (H5HF_sect_indirect_init_rows(hdr, dxpl_id, sect, TRUE, &first_row_sect, H5FS_ADD_SKIP_VALID,
+                                     start_row, start_col, end_row, end_col) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize indirect section")
     HDassert(first_row_sect);
 
     /* Now that underlying indirect section is consistent, add first row
      *  section to free space manager for the heap
      */
-    if(H5HF_space_add(hdr, dxpl_id, first_row_sect, H5FS_ADD_RETURNED_SPACE) < 0)
+    if (H5HF_space_add(hdr, dxpl_id, first_row_sect, H5FS_ADD_RETURNED_SPACE) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add row section to free space")
 
 done:
-    if(ret_value < 0 && sect)
-        if(H5HF_sect_indirect_free(sect) < 0)
+    if (ret_value < 0 && sect)
+        if (H5HF_sect_indirect_free(sect) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free indirect section node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_add() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_decr
  *
@@ -2703,7 +2633,7 @@ done:
 static herr_t
 H5HF_sect_indirect_decr(H5HF_free_section_t *sect)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2717,27 +2647,27 @@ H5HF_sect_indirect_decr(H5HF_free_section_t *sect)
     sect->u.indirect.rc--;
 
     /* If the indirect section's ref. count drops to zero, free the section */
-    if(sect->u.indirect.rc == 0) {
-        H5HF_free_section_t *par_sect;          /* Parent indirect section */
+    if (sect->u.indirect.rc == 0) {
+        H5HF_free_section_t *par_sect; /* Parent indirect section */
 
         /* Preserve pointer to parent indirect section when freeing this section */
         par_sect = sect->u.indirect.parent;
 
         /* Free indirect section */
-        if(H5HF_sect_indirect_free(sect) < 0)
+        if (H5HF_sect_indirect_free(sect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free indirect section node")
 
         /* Decrement ref. count on indirect section's parent */
-        if(par_sect)
-            if(H5HF_sect_indirect_decr(par_sect) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't decrement ref. count on parent indirect section")
+        if (par_sect)
+            if (H5HF_sect_indirect_decr(par_sect) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL,
+                            "can't decrement ref. count on parent indirect section")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_revive_row
  *
@@ -2754,10 +2684,10 @@ done:
 static herr_t
 H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
-    H5HF_indirect_t *sec_iblock;        /* Pointer to section indirect block */
-    hbool_t did_protect;                /* Whether we protected the indirect block or not */
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *sec_iblock;          /* Pointer to section indirect block */
+    hbool_t          did_protect;         /* Whether we protected the indirect block or not */
+    unsigned         u;                   /* Local index variable */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2769,22 +2699,22 @@ H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
     HDassert(sect->sect_info.state == H5FS_SECT_SERIALIZED);
 
     /* Look up indirect block containing indirect blocks for section */
-    if(H5HF_man_dblock_locate(hdr, dxpl_id, sect->sect_info.addr, &sec_iblock, NULL, &did_protect, H5AC_READ) < 0)
+    if (H5HF_man_dblock_locate(hdr, dxpl_id, sect->sect_info.addr, &sec_iblock, NULL, &did_protect,
+                               H5AC_READ) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of section")
 
     /* Increment reference count on indirect block that free section is in */
-    if(H5HF_iblock_incr(sec_iblock) < 0)
+    if (H5HF_iblock_incr(sec_iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
 
     /* Set the pointer to the section's indirect block */
     sect->u.indirect.u.iblock = sec_iblock;
 
     /* Set the number of entries in the indirect block */
-    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
-            sect->u.indirect.u.iblock->max_rows;
+    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * sect->u.indirect.u.iblock->max_rows;
 
     /* Unlock indirect block */
-    if(H5HF_man_iblock_unprotect(sec_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
+    if (H5HF_man_iblock_unprotect(sec_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     sec_iblock = NULL;
 
@@ -2792,19 +2722,19 @@ H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
     sect->sect_info.state = H5FS_SECT_LIVE;
 
     /* Loop over derived row sections and mark them all as 'live' now */
-    for(u = 0; u < sect->u.indirect.dir_nrows; u++)
+    for (u = 0; u < sect->u.indirect.dir_nrows; u++)
         sect->u.indirect.dir_rows[u]->sect_info.state = H5FS_SECT_LIVE;
 
     /* Revive parent indirect section, if there is one */
-    if(sect->u.indirect.parent && sect->u.indirect.parent->sect_info.state == H5FS_SECT_SERIALIZED)
-        if(H5HF_sect_indirect_revive(hdr, dxpl_id, sect->u.indirect.parent, sect->u.indirect.u.iblock->parent) < 0)
+    if (sect->u.indirect.parent && sect->u.indirect.parent->sect_info.state == H5FS_SECT_SERIALIZED)
+        if (H5HF_sect_indirect_revive(hdr, dxpl_id, sect->u.indirect.parent,
+                                      sect->u.indirect.u.iblock->parent) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREVIVE, FAIL, "can't revive indirect section")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_revive_row() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_revive
  *
@@ -2819,11 +2749,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *sect, H5HF_indirect_t *sect_iblock)
+H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
+                          H5HF_indirect_t *sect_iblock)
 {
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2836,33 +2766,32 @@ H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
     HDassert(sect_iblock);
 
     /* Increment reference count on indirect block that free section is in */
-    if(H5HF_iblock_incr(sect_iblock) < 0)
+    if (H5HF_iblock_incr(sect_iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
 
     /* Set the pointer to the section's indirect block */
     sect->u.indirect.u.iblock = sect_iblock;
 
     /* Set the number of entries in the indirect block */
-    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
-            sect->u.indirect.u.iblock->max_rows;
+    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * sect->u.indirect.u.iblock->max_rows;
 
     /* Section is "live" now */
     sect->sect_info.state = H5FS_SECT_LIVE;
 
     /* Loop over derived row sections and mark them all as 'live' now */
-    for(u = 0; u < sect->u.indirect.dir_nrows; u++)
+    for (u = 0; u < sect->u.indirect.dir_nrows; u++)
         sect->u.indirect.dir_rows[u]->sect_info.state = H5FS_SECT_LIVE;
 
     /* Revive parent indirect section, if there is one */
-    if(sect->u.indirect.parent && sect->u.indirect.parent->sect_info.state == H5FS_SECT_SERIALIZED)
-        if(H5HF_sect_indirect_revive(hdr, dxpl_id, sect->u.indirect.parent, sect->u.indirect.u.iblock->parent) < 0)
+    if (sect->u.indirect.parent && sect->u.indirect.parent->sect_info.state == H5FS_SECT_SERIALIZED)
+        if (H5HF_sect_indirect_revive(hdr, dxpl_id, sect->u.indirect.parent,
+                                      sect->u.indirect.u.iblock->parent) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREVIVE, FAIL, "can't revive indirect section")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_revive() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_reduce_row
  *
@@ -2880,19 +2809,19 @@ done:
  */
 static herr_t
 H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *row_sect,
-    hbool_t *alloc_from_start)
+                              hbool_t *alloc_from_start)
 {
-    H5HF_free_section_t *sect;          /* Indirect section underlying row section */
-    unsigned row_start_entry;           /* Entry for first block covered in row section */
-    unsigned row_end_entry;             /* Entry for last block covered in row section */
-    unsigned row_entry;                 /* Entry to allocate in row section */
-    unsigned start_entry;               /* Entry for first block covered */
-    unsigned start_row;                 /* Start row in indirect block */
-    unsigned start_col;                 /* Start column in indirect block */
-    unsigned end_entry;                 /* Entry for last block covered */
-    unsigned end_row;                   /* End row in indirect block */
-    H5HF_free_section_t *peer_sect = NULL; /* Peer indirect section */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sect;                /* Indirect section underlying row section */
+    unsigned             row_start_entry;     /* Entry for first block covered in row section */
+    unsigned             row_end_entry;       /* Entry for last block covered in row section */
+    unsigned             row_entry;           /* Entry to allocate in row section */
+    unsigned             start_entry;         /* Entry for first block covered */
+    unsigned             start_row;           /* Start row in indirect block */
+    unsigned             start_col;           /* Start column in indirect block */
+    unsigned             end_entry;           /* Entry for last block covered */
+    unsigned             end_row;             /* End row in indirect block */
+    H5HF_free_section_t *peer_sect = NULL;    /* Peer indirect section */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2904,15 +2833,15 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
 
     /* Compute starting & ending information for row section */
     row_start_entry = (row_sect->u.row.row * hdr->man_dtable.cparam.width) + row_sect->u.row.col;
-    row_end_entry = (row_start_entry + row_sect->u.row.num_entries) - 1;
+    row_end_entry   = (row_start_entry + row_sect->u.row.num_entries) - 1;
 
     /* Compute starting & ending information for indirect section */
-    sect = row_sect->u.row.under;
-    start_row = sect->u.indirect.row;
-    start_col = sect->u.indirect.col;
+    sect        = row_sect->u.row.under;
+    start_row   = sect->u.indirect.row;
+    start_col   = sect->u.indirect.col;
     start_entry = (start_row * hdr->man_dtable.cparam.width) + start_col;
-    end_entry = (start_entry + sect->u.indirect.num_entries) - 1;
-    end_row = end_entry / hdr->man_dtable.cparam.width;
+    end_entry   = (start_entry + sect->u.indirect.num_entries) - 1;
+    end_row     = end_entry / hdr->man_dtable.cparam.width;
 
     /* Additional sanity check */
     HDassert(sect->u.indirect.span_size > 0);
@@ -2922,31 +2851,31 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
     HDassert(sect->u.indirect.dir_rows[(row_sect->u.row.row - start_row)] == row_sect);
 
     /* Check if we should allocate from end of indirect section */
-    if(row_end_entry == end_entry && start_row != end_row) {
+    if (row_end_entry == end_entry && start_row != end_row) {
         *alloc_from_start = FALSE;
-        row_entry = row_end_entry;
+        row_entry         = row_end_entry;
     } /* end if */
     else {
         *alloc_from_start = TRUE;
-        row_entry = row_start_entry;
+        row_entry         = row_start_entry;
     } /* end else */
 
     /* Check if we have a parent section to be detached from */
-    if(sect->u.indirect.parent) {
-        hbool_t is_first;       /* Flag to indicate that this section is the first section in hierarchy */
+    if (sect->u.indirect.parent) {
+        hbool_t is_first; /* Flag to indicate that this section is the first section in hierarchy */
 
         /* Check if this section is the first section */
         is_first = H5HF_sect_indirect_is_first(sect);
 
         /* Remove this indirect section from parent indirect section */
-        if(H5HF_sect_indirect_reduce(hdr, dxpl_id, sect->u.indirect.parent, sect->u.indirect.par_entry) < 0)
+        if (H5HF_sect_indirect_reduce(hdr, dxpl_id, sect->u.indirect.parent, sect->u.indirect.par_entry) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce parent indirect section")
-        sect->u.indirect.parent = NULL;
+        sect->u.indirect.parent    = NULL;
         sect->u.indirect.par_entry = 0;
 
         /* If we weren't the first section, set "first row" for this indirect section */
-        if(!is_first)
-            if(H5HF_sect_indirect_first(hdr, dxpl_id, sect) < 0)
+        if (!is_first)
+            if (H5HF_sect_indirect_first(hdr, dxpl_id, sect) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for indirect section")
     } /* end if */
 
@@ -2954,14 +2883,14 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
     sect->u.indirect.span_size -= row_sect->sect_info.size;
 
     /* Check how to adjust section for allocated entry */
-    if(sect->u.indirect.num_entries > 1) {
-        if(row_entry == start_entry) {
+    if (sect->u.indirect.num_entries > 1) {
+        if (row_entry == start_entry) {
             /* Adjust section start */
             sect->sect_info.addr += hdr->man_dtable.row_block_size[sect->u.indirect.row];
 
             /* Adjust block coordinates of span */
             sect->u.indirect.col++;
-            if(sect->u.indirect.col == hdr->man_dtable.cparam.width) {
+            if (sect->u.indirect.col == hdr->man_dtable.cparam.width) {
                 HDassert(row_sect->u.row.num_entries == 1);
 
                 /* Adjust section's span information */
@@ -2972,17 +2901,17 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
                 sect->u.indirect.dir_nrows--;
 
                 /* Adjust direct row sections for indirect section */
-                if(sect->u.indirect.dir_nrows > 0) {
+                if (sect->u.indirect.dir_nrows > 0) {
                     HDassert(sect->u.indirect.dir_rows);
-                    HDmemmove(&sect->u.indirect.dir_rows[0],
-                            &sect->u.indirect.dir_rows[1],
-                            sect->u.indirect.dir_nrows * sizeof(H5HF_free_section_t *));
+                    HDmemmove(&sect->u.indirect.dir_rows[0], &sect->u.indirect.dir_rows[1],
+                              sect->u.indirect.dir_nrows * sizeof(H5HF_free_section_t *));
                     HDassert(sect->u.indirect.dir_rows[0]);
 
                     /* Make new "first row" in indirect section */
-                    if(row_sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW)
-                        if(H5HF_sect_row_first(hdr, dxpl_id, sect->u.indirect.dir_rows[0]) < 0)
-                            HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for indirect section")
+                    if (row_sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW)
+                        if (H5HF_sect_row_first(hdr, dxpl_id, sect->u.indirect.dir_rows[0]) < 0)
+                            HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL,
+                                        "can't make new 'first row' for indirect section")
                 } /* end if */
                 else {
                     /* Sanity check */
@@ -2993,17 +2922,18 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
                     sect->u.indirect.dir_rows = (H5HF_free_section_t **)H5MM_xfree(sect->u.indirect.dir_rows);
 
                     /* Make new "first row" in indirect section */
-                    if(row_sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW)
-                        if(H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
-                            HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for child indirect section")
+                    if (row_sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW)
+                        if (H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
+                            HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL,
+                                        "can't make new 'first row' for child indirect section")
                 } /* end else */
-            } /* end if */
+            }     /* end if */
 
             /* Adjust number of entries covered */
             sect->u.indirect.num_entries--;
         } /* end if */
-        else if(row_entry == end_entry) {
-            unsigned new_end_row;       /* New end row for entries */
+        else if (row_entry == end_entry) {
+            unsigned new_end_row; /* New end row for entries */
 
             /* Sanity check */
             HDassert(sect->u.indirect.indir_nents == 0);
@@ -3015,18 +2945,18 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
             /* Check for eliminating a direct row */
             new_end_row = ((start_entry + sect->u.indirect.num_entries) - 1) / hdr->man_dtable.cparam.width;
             HDassert(new_end_row <= end_row);
-            if(new_end_row < end_row) {
+            if (new_end_row < end_row) {
                 HDassert(new_end_row == (end_row - 1));
                 sect->u.indirect.dir_nrows--;
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else {
-            H5HF_indirect_t *iblock;    /* Pointer to indirect block for this section */
-            hsize_t iblock_off;         /* Section's indirect block's offset in "heap space" */
-            unsigned peer_nentries;     /* Number of entries in new peer indirect section */
-            unsigned peer_dir_nrows;    /* Number of direct rows in new peer indirect section */
-            unsigned new_start_row;     /* New starting row for current indirect section */
-            unsigned u;                 /* Local index variable */
+            H5HF_indirect_t *iblock;         /* Pointer to indirect block for this section */
+            hsize_t          iblock_off;     /* Section's indirect block's offset in "heap space" */
+            unsigned         peer_nentries;  /* Number of entries in new peer indirect section */
+            unsigned         peer_dir_nrows; /* Number of direct rows in new peer indirect section */
+            unsigned         new_start_row;  /* New starting row for current indirect section */
+            unsigned         u;              /* Local index variable */
 
             /* Sanity checks */
             HDassert(row_sect->u.row.col == 0);
@@ -3036,45 +2966,44 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
             HDassert(row_sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW);
 
             /* Compute basic information about peer & current indirect sections */
-            new_start_row = row_sect->u.row.row;
-            peer_nentries = row_entry - start_entry;
+            new_start_row  = row_sect->u.row.row;
+            peer_nentries  = row_entry - start_entry;
             peer_dir_nrows = new_start_row - start_row;
 
             /* Get indirect block information for peer */
-            if(sect->sect_info.state == H5FS_SECT_LIVE) {
-                iblock = sect->u.indirect.u.iblock;
+            if (sect->sect_info.state == H5FS_SECT_LIVE) {
+                iblock     = sect->u.indirect.u.iblock;
                 iblock_off = sect->u.indirect.u.iblock->block_off;
             } /* end if */
             else {
-                iblock = NULL;
+                iblock     = NULL;
                 iblock_off = sect->u.indirect.u.iblock_off;
             } /* end else */
 
             /* Create peer indirect section */
-            if(NULL == (peer_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr,
-                    sect->sect_info.size, iblock, iblock_off, start_row, start_col,
-                    peer_nentries)))
+            if (NULL ==
+                (peer_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr, sect->sect_info.size, iblock,
+                                                    iblock_off, start_row, start_col, peer_nentries)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section")
 
             /* Set up direct row & indirect entry information for peer section */
             peer_sect->u.indirect.indir_nents = 0;
-            peer_sect->u.indirect.indir_ents = NULL;
-            peer_sect->u.indirect.dir_nrows = peer_dir_nrows;
-            if(NULL == (peer_sect->u.indirect.dir_rows = (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *) * peer_dir_nrows)))
+            peer_sect->u.indirect.indir_ents  = NULL;
+            peer_sect->u.indirect.dir_nrows   = peer_dir_nrows;
+            if (NULL == (peer_sect->u.indirect.dir_rows = (H5HF_free_section_t **)H5MM_malloc(
+                             sizeof(H5HF_free_section_t *) * peer_dir_nrows)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "allocation failed for row section pointer array")
 
             /* Transfer row sections between current & peer sections */
-            HDmemcpy(&peer_sect->u.indirect.dir_rows[0],
-                &sect->u.indirect.dir_rows[0],
-                (sizeof(H5HF_free_section_t *) * peer_dir_nrows));
-            HDmemmove(&sect->u.indirect.dir_rows[0],
-                &sect->u.indirect.dir_rows[peer_dir_nrows],
-                (sizeof(H5HF_free_section_t *) * (sect->u.indirect.dir_nrows - peer_dir_nrows)));
+            HDmemcpy(&peer_sect->u.indirect.dir_rows[0], &sect->u.indirect.dir_rows[0],
+                     (sizeof(H5HF_free_section_t *) * peer_dir_nrows));
+            HDmemmove(&sect->u.indirect.dir_rows[0], &sect->u.indirect.dir_rows[peer_dir_nrows],
+                      (sizeof(H5HF_free_section_t *) * (sect->u.indirect.dir_nrows - peer_dir_nrows)));
             sect->u.indirect.dir_nrows -= peer_dir_nrows;
             HDassert(row_sect == sect->u.indirect.dir_rows[0]);
 
             /* Re-target transferred row sections to point to new underlying indirect section */
-            for(u = 0; u < peer_dir_nrows; u++)
+            for (u = 0; u < peer_dir_nrows; u++)
                 peer_sect->u.indirect.dir_rows[u]->u.row.under = peer_sect;
 
             /* Change first row section in indirect section to be the "first row" */
@@ -3090,25 +3019,27 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
 
             /* Transfer/update cached information about indirect block */
             peer_sect->u.indirect.iblock_entries = sect->u.indirect.iblock_entries;
-            peer_sect->u.indirect.span_size = row_sect->sect_info.addr - peer_sect->sect_info.addr;
+            peer_sect->u.indirect.span_size      = row_sect->sect_info.addr - peer_sect->sect_info.addr;
 
             /* Update information for current section */
             sect->sect_info.addr = row_sect->sect_info.addr + hdr->man_dtable.row_block_size[new_start_row];
-            sect->u.indirect.span_size -= peer_sect->u.indirect.span_size; /* (span for row section has already been removed) */
+            sect->u.indirect.span_size -=
+                peer_sect->u.indirect.span_size; /* (span for row section has already been removed) */
             sect->u.indirect.row = new_start_row;
             sect->u.indirect.col = row_sect->u.row.col + 1;
-            sect->u.indirect.num_entries -= (peer_nentries + 1); /* Transferred entries, plus the entry allocated out of the row */
+            sect->u.indirect.num_entries -=
+                (peer_nentries + 1); /* Transferred entries, plus the entry allocated out of the row */
 
             /* Make certain we've tracked the sections' dependents correctly */
-            HDassert(sect->u.indirect.rc ==
-                    (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
+            HDassert(sect->u.indirect.rc == (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
             HDassert(peer_sect->u.indirect.rc ==
-                    (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows));
+                     (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows));
 
-            /* Reset the peer_sect variable, to indicate that it has been hooked into the data structures correctly and shouldn't be freed */
+            /* Reset the peer_sect variable, to indicate that it has been hooked into the data structures
+             * correctly and shouldn't be freed */
             peer_sect = NULL;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Decrement count of entries & rows */
         sect->u.indirect.num_entries--;
@@ -3122,18 +3053,17 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
 done:
     /* Free allocated peer_sect.  Note that this is necessary for all failures until peer_sect is linked
      * into the main free space structures (via the direct blocks), and the reference count is updated. */
-    if(peer_sect) {
+    if (peer_sect) {
         /* Sanity check - we should only be here if an error occurred */
         HDassert(ret_value < 0);
 
-        if(H5HF_sect_indirect_free(peer_sect) < 0)
+        if (H5HF_sect_indirect_free(peer_sect) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free indirect section node")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_reduce_row() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_reduce
  *
@@ -3150,16 +3080,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
-    unsigned child_entry)
+H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect, unsigned child_entry)
 {
-    unsigned start_entry;               /* Entry for first block covered */
-    unsigned start_row;                 /* Start row in indirect block */
-    unsigned start_col;                 /* Start column in indirect block */
-    unsigned end_entry;                 /* Entry for last block covered */
-    unsigned end_row;                   /* End row in indirect block */
-    H5HF_free_section_t *peer_sect = NULL; /* Peer indirect section */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned             start_entry;         /* Entry for first block covered */
+    unsigned             start_row;           /* Start row in indirect block */
+    unsigned             start_col;           /* Start column in indirect block */
+    unsigned             end_entry;           /* Entry for last block covered */
+    unsigned             end_row;             /* End row in indirect block */
+    H5HF_free_section_t *peer_sect = NULL;    /* Peer indirect section */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3172,35 +3101,37 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
     HDassert(sect->u.indirect.iblock_entries > 0);
 
     /* Compute starting & ending information for indirect section */
-    start_row = sect->u.indirect.row;
-    start_col = sect->u.indirect.col;
+    start_row   = sect->u.indirect.row;
+    start_col   = sect->u.indirect.col;
     start_entry = (start_row * hdr->man_dtable.cparam.width) + start_col;
-    end_entry = (start_entry + sect->u.indirect.num_entries) - 1;
-    end_row = end_entry / hdr->man_dtable.cparam.width;
+    end_entry   = (start_entry + sect->u.indirect.num_entries) - 1;
+    end_row     = end_entry / hdr->man_dtable.cparam.width;
 
     /* Check how to adjust section for allocated entry */
-    if(sect->u.indirect.num_entries > 1) {
+    if (sect->u.indirect.num_entries > 1) {
         /* Check if we have a parent section to be detached from */
-        if(sect->u.indirect.parent) {
-            hbool_t is_first;       /* Flag to indicate that this section is the first section in hierarchy */
+        if (sect->u.indirect.parent) {
+            hbool_t is_first; /* Flag to indicate that this section is the first section in hierarchy */
 
             /* Check if this section is the first section */
             is_first = H5HF_sect_indirect_is_first(sect);
 
             /* Reduce parent indirect section */
-            if(H5HF_sect_indirect_reduce(hdr, dxpl_id, sect->u.indirect.parent, sect->u.indirect.par_entry) < 0)
+            if (H5HF_sect_indirect_reduce(hdr, dxpl_id, sect->u.indirect.parent, sect->u.indirect.par_entry) <
+                0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce parent indirect section")
-            sect->u.indirect.parent = NULL;
+            sect->u.indirect.parent    = NULL;
             sect->u.indirect.par_entry = 0;
 
             /* If we weren't the first section, set "first row" for this indirect section */
-            if(!is_first)
-                if(H5HF_sect_indirect_first(hdr, dxpl_id, sect) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for indirect section")
+            if (!is_first)
+                if (H5HF_sect_indirect_first(hdr, dxpl_id, sect) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL,
+                                "can't make new 'first row' for indirect section")
         } /* end if */
 
         /* Check if we can allocate from start of indirect section */
-        if(child_entry == start_entry) {
+        if (child_entry == start_entry) {
             /* Sanity check */
             HDassert(sect->u.indirect.dir_nrows == 0);
             HDassert(sect->u.indirect.dir_rows == NULL);
@@ -3212,7 +3143,7 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
 
             /* Adjust span of blocks covered */
             sect->u.indirect.col++;
-            if(sect->u.indirect.col == hdr->man_dtable.cparam.width) {
+            if (sect->u.indirect.col == hdr->man_dtable.cparam.width) {
                 sect->u.indirect.row++;
                 sect->u.indirect.col = 0;
             } /* end if */
@@ -3221,16 +3152,16 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
 
             /* Adjust indirect entry information */
             sect->u.indirect.indir_nents--;
-            HDmemmove(&sect->u.indirect.indir_ents[0],
-                    &sect->u.indirect.indir_ents[1],
-                    sect->u.indirect.indir_nents * sizeof(H5HF_free_section_t *));
+            HDmemmove(&sect->u.indirect.indir_ents[0], &sect->u.indirect.indir_ents[1],
+                      sect->u.indirect.indir_nents * sizeof(H5HF_free_section_t *));
             HDassert(sect->u.indirect.indir_ents[0]);
 
             /* Make new "first row" in new first indirect child section */
-            if(H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for child indirect section")
+            if (H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL,
+                            "can't make new 'first row' for child indirect section")
         } /* end if */
-        else if(child_entry == end_entry) {
+        else if (child_entry == end_entry) {
             /* Sanity check */
             HDassert(sect->u.indirect.indir_nents > 0);
             HDassert(sect->u.indirect.indir_ents);
@@ -3241,47 +3172,47 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
 
             /* Adjust indirect entry information */
             sect->u.indirect.indir_nents--;
-            if(sect->u.indirect.indir_nents == 0)
+            if (sect->u.indirect.indir_nents == 0)
                 sect->u.indirect.indir_ents = (H5HF_free_section_t **)H5MM_xfree(sect->u.indirect.indir_ents);
         } /* end if */
         else {
-            H5HF_indirect_t *iblock;    /* Pointer to indirect block for this section */
-            hsize_t iblock_off;         /* Section's indirect block's offset in "heap space" */
-            haddr_t peer_sect_addr;     /* Address of new peer section in "heap space" */
-            unsigned peer_nentries;     /* Number of entries in new peer indirect section */
-            unsigned peer_start_row;    /* Starting row for new peer indirect section */
-            unsigned peer_start_col;    /* Starting column for new peer indirect section */
-            unsigned child_row;         /* Row where child entry is located */
-            unsigned new_nentries;      /* New number of entries for current indirect section */
-            unsigned u;                 /* Local index variable */
+            H5HF_indirect_t *iblock;         /* Pointer to indirect block for this section */
+            hsize_t          iblock_off;     /* Section's indirect block's offset in "heap space" */
+            haddr_t          peer_sect_addr; /* Address of new peer section in "heap space" */
+            unsigned         peer_nentries;  /* Number of entries in new peer indirect section */
+            unsigned         peer_start_row; /* Starting row for new peer indirect section */
+            unsigned         peer_start_col; /* Starting column for new peer indirect section */
+            unsigned         child_row;      /* Row where child entry is located */
+            unsigned         new_nentries;   /* New number of entries for current indirect section */
+            unsigned         u;              /* Local index variable */
 
             /* Sanity check */
             HDassert(sect->u.indirect.indir_nents > 0);
             HDassert(sect->u.indirect.indir_ents);
 
             /* Compute basic information about peer & current indirect sections */
-            peer_nentries = end_entry - child_entry;
+            peer_nentries  = end_entry - child_entry;
             peer_start_row = (child_entry + 1) / hdr->man_dtable.cparam.width;
             peer_start_col = (child_entry + 1) % hdr->man_dtable.cparam.width;
-            child_row = child_entry / hdr->man_dtable.cparam.width;
-            new_nentries = sect->u.indirect.num_entries - (peer_nentries + 1);
+            child_row      = child_entry / hdr->man_dtable.cparam.width;
+            new_nentries   = sect->u.indirect.num_entries - (peer_nentries + 1);
             HDassert(child_row >= hdr->man_dtable.max_direct_rows);
 
             /* Get indirect block information for peer */
-            if(sect->sect_info.state == H5FS_SECT_LIVE) {
-                iblock = sect->u.indirect.u.iblock;
+            if (sect->sect_info.state == H5FS_SECT_LIVE) {
+                iblock     = sect->u.indirect.u.iblock;
                 iblock_off = sect->u.indirect.u.iblock->block_off;
             } /* end if */
             else {
-                iblock = NULL;
+                iblock     = NULL;
                 iblock_off = sect->u.indirect.u.iblock_off;
             } /* end else */
 
             /* Update the number of entries in current section & calculate it's span size */
             /* (Will use this to compute the section address for the peer section */
             sect->u.indirect.num_entries = new_nentries;
-            sect->u.indirect.span_size = H5HF_dtable_span_size(&hdr->man_dtable,
-                    sect->u.indirect.row, sect->u.indirect.col, new_nentries);
+            sect->u.indirect.span_size   = H5HF_dtable_span_size(&hdr->man_dtable, sect->u.indirect.row,
+                                                               sect->u.indirect.col, new_nentries);
             HDassert(sect->u.indirect.span_size > 0);
 
             /* Compute address of peer indirect section */
@@ -3290,30 +3221,32 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
             peer_sect_addr += hdr->man_dtable.row_block_size[child_row];
 
             /* Create peer indirect section */
-            if(NULL == (peer_sect = H5HF_sect_indirect_new(hdr, peer_sect_addr,
-                    sect->sect_info.size, iblock, iblock_off, peer_start_row,
-                    peer_start_col, peer_nentries)))
+            if (NULL == (peer_sect = H5HF_sect_indirect_new(hdr, peer_sect_addr, sect->sect_info.size, iblock,
+                                                            iblock_off, peer_start_row, peer_start_col,
+                                                            peer_nentries)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section")
 
             /* Set up direct row & indirect entry information for peer section */
-            peer_sect->u.indirect.dir_nrows = 0;
-            peer_sect->u.indirect.dir_rows = NULL;
+            peer_sect->u.indirect.dir_nrows   = 0;
+            peer_sect->u.indirect.dir_rows    = NULL;
             peer_sect->u.indirect.indir_nents = peer_nentries;
-            if(NULL == (peer_sect->u.indirect.indir_ents = (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *) * peer_nentries)))
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "allocation failed for indirect section pointer array")
+            if (NULL == (peer_sect->u.indirect.indir_ents = (H5HF_free_section_t **)H5MM_malloc(
+                             sizeof(H5HF_free_section_t *) * peer_nentries)))
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL,
+                            "allocation failed for indirect section pointer array")
 
             /* Transfer child indirect sections between current & peer sections */
             HDmemcpy(&peer_sect->u.indirect.indir_ents[0],
-                &sect->u.indirect.indir_ents[sect->u.indirect.indir_nents - peer_nentries],
-                (sizeof(H5HF_free_section_t *) * peer_nentries));
+                     &sect->u.indirect.indir_ents[sect->u.indirect.indir_nents - peer_nentries],
+                     (sizeof(H5HF_free_section_t *) * peer_nentries));
             sect->u.indirect.indir_nents -= (peer_nentries + 1); /* Transferred blocks, plus child entry */
 
             /* Eliminate indirect entries for this section, if appropriate */
-            if(sect->u.indirect.indir_nents == 0)
+            if (sect->u.indirect.indir_nents == 0)
                 sect->u.indirect.indir_ents = (H5HF_free_section_t **)H5MM_xfree(sect->u.indirect.indir_ents);
 
             /* Re-target transferred row sections to point to new underlying indirect section */
-            for(u = 0; u < peer_nentries; u++)
+            for (u = 0; u < peer_nentries; u++)
                 peer_sect->u.indirect.indir_ents[u]->u.indirect.parent = peer_sect;
 
             /* Adjust reference counts for current & peer sections */
@@ -3328,18 +3261,20 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
              *  detached the child section yet)
              */
             HDassert((sect->u.indirect.rc - 1) ==
-                    (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
+                     (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
             HDassert(peer_sect->u.indirect.rc ==
-                    (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows));
+                     (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows));
 
             /* Make new "first row" in peer section */
-            if(H5HF_sect_indirect_first(hdr, dxpl_id, peer_sect->u.indirect.indir_ents[0]) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for peer indirect section")
+            if (H5HF_sect_indirect_first(hdr, dxpl_id, peer_sect->u.indirect.indir_ents[0]) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL,
+                            "can't make new 'first row' for peer indirect section")
 
-            /* Reset the peer_sect variable, to indicate that it has been hooked into the data structures correctly and shouldn't be freed */
+            /* Reset the peer_sect variable, to indicate that it has been hooked into the data structures
+             * correctly and shouldn't be freed */
             peer_sect = NULL;
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Decrement count of entries & indirect entries */
         sect->u.indirect.num_entries--;
@@ -3352,24 +3287,23 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
 
     /* Decrement # of sections which depend on this row */
     /* (Must be last as section can be freed) */
-    if(H5HF_sect_indirect_decr(sect) < 0)
+    if (H5HF_sect_indirect_decr(sect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't decrement section's ref. count ")
 
 done:
     /* Free allocated peer_sect.  Note that this is necessary for all failures until peer_sect is linked
      * into the main free space structures (via the direct blocks), and the reference count is updated. */
-    if(peer_sect) {
+    if (peer_sect) {
         /* Sanity check - we should only be here if an error occurred */
         HDassert(ret_value < 0);
 
-        if(H5HF_sect_indirect_free(peer_sect) < 0)
+        if (H5HF_sect_indirect_free(peer_sect) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free indirect section node")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_reduce() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_is_first
  *
@@ -3386,7 +3320,7 @@ done:
 static hbool_t
 H5HF_sect_indirect_is_first(H5HF_free_section_t *sect)
 {
-    hbool_t ret_value = FALSE;         /* Return value */
+    hbool_t ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -3394,8 +3328,8 @@ H5HF_sect_indirect_is_first(H5HF_free_section_t *sect)
     HDassert(sect);
 
     /* Recurse to parent */
-    if(sect->u.indirect.parent) {
-        if(sect->sect_info.addr == sect->u.indirect.parent->sect_info.addr)
+    if (sect->u.indirect.parent) {
+        if (sect->sect_info.addr == sect->u.indirect.parent->sect_info.addr)
             ret_value = H5HF_sect_indirect_is_first(sect->u.indirect.parent);
     } /* end if */
     else
@@ -3404,7 +3338,6 @@ H5HF_sect_indirect_is_first(H5HF_free_section_t *sect)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_is_first() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_first
  *
@@ -3421,7 +3354,7 @@ H5HF_sect_indirect_is_first(H5HF_free_section_t *sect)
 static herr_t
 H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3430,7 +3363,7 @@ H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *se
     HDassert(sect);
 
     /* Check if this indirect section has direct block rows */
-    if(sect->u.indirect.dir_nrows > 0) {
+    if (sect->u.indirect.dir_nrows > 0) {
         /* Sanity checks */
         HDassert(sect->u.indirect.row == 0);
         HDassert(sect->u.indirect.col == 0);
@@ -3438,7 +3371,7 @@ H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *se
         HDassert(sect->u.indirect.dir_rows[0]);
 
         /* Change first row section in indirect section to be the "first row" */
-        if(H5HF_sect_row_first(hdr, dxpl_id, sect->u.indirect.dir_rows[0]) < 0)
+        if (H5HF_sect_row_first(hdr, dxpl_id, sect->u.indirect.dir_rows[0]) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set row section to be first row")
     } /* end if */
     else {
@@ -3448,7 +3381,7 @@ H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *se
         HDassert(sect->u.indirect.indir_ents[0]);
 
         /* Forward to first child indirect section */
-        if(H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
+        if (H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set child indirect section to be first row")
     } /* end else */
 
@@ -3456,7 +3389,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_first() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_get_iblock
  *
@@ -3485,7 +3417,6 @@ H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect)
     FUNC_LEAVE_NOAPI(sect->u.indirect.u.iblock)
 } /* end H5HF_sect_indirect_get_iblock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_merge_row
  *
@@ -3503,18 +3434,18 @@ H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    H5HF_free_section_t *row_sect1, H5HF_free_section_t *row_sect2)
+H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *row_sect1,
+                             H5HF_free_section_t *row_sect2)
 {
-    H5HF_free_section_t *sect1, *sect2; /* Indirect sections underlying row sections */
-    unsigned start_entry1;              /* Start entry for section #1 */
-    unsigned start_row1, start_col1;    /* Starting row & column for section #1 */
-    unsigned end_entry1;                /* End entry for section #1 */
-    unsigned end_row1;                  /* Ending row for section #1 */
-    unsigned start_row2;                /* Starting row for section #2 */
-    hbool_t merged_rows;                /* Flag to indicate that rows was merged together */
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_free_section_t *sect1, *sect2;          /* Indirect sections underlying row sections */
+    unsigned             start_entry1;           /* Start entry for section #1 */
+    unsigned             start_row1, start_col1; /* Starting row & column for section #1 */
+    unsigned             end_entry1;             /* End entry for section #1 */
+    unsigned             end_row1;               /* Ending row for section #1 */
+    unsigned             start_row2;             /* Starting row for section #2 */
+    hbool_t              merged_rows;            /* Flag to indicate that rows was merged together */
+    unsigned             u;                      /* Local index variable */
+    herr_t               ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3544,21 +3475,21 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
     HDassert(sect1->u.indirect.iblock_entries == sect2->u.indirect.iblock_entries);
 
     /* Set up span information */
-    start_row1 = sect1->u.indirect.row;
-    start_col1 = sect1->u.indirect.col;
+    start_row1   = sect1->u.indirect.row;
+    start_col1   = sect1->u.indirect.col;
     start_entry1 = (start_row1 * hdr->man_dtable.cparam.width) + start_col1;
-    end_entry1 = (start_entry1 + sect1->u.indirect.num_entries) - 1;
-    end_row1 = end_entry1 / hdr->man_dtable.cparam.width;
-    start_row2 = sect2->u.indirect.row;
+    end_entry1   = (start_entry1 + sect1->u.indirect.num_entries) - 1;
+    end_row1     = end_entry1 / hdr->man_dtable.cparam.width;
+    start_row2   = sect2->u.indirect.row;
 
     /* Check for direct sections in second section */
     /* (second indirect section can be parent of indirect section for second
      *          row, and thus have no row sections of it's own)
      */
-    if(sect2->u.indirect.dir_nrows > 0) {
-        unsigned new_dir_nrows1;        /* New value for number of direct rows in first section */
-        unsigned src_row2;              /* Source row for copying from second section */
-        unsigned nrows_moved2;          /* Number of rows to move from second section to first */
+    if (sect2->u.indirect.dir_nrows > 0) {
+        unsigned new_dir_nrows1; /* New value for number of direct rows in first section */
+        unsigned src_row2;       /* Source row for copying from second section */
+        unsigned nrows_moved2;   /* Number of rows to move from second section to first */
 
         /* Sanity check child row assumptions */
         /* (second indirect section should be at top of equal or deeper
@@ -3570,12 +3501,13 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
         HDassert(sect1->u.indirect.dir_rows);
 
         /* Check for sections sharing a row in the same underlying indirect block */
-        if(row_sect1->u.row.under->u.indirect.u.iblock->block_off == row_sect2->u.row.under->u.indirect.u.iblock->block_off
-                && end_row1 == start_row2) {
-            H5HF_free_section_t *last_row_sect1;        /* Last row in first indirect section */
+        if (row_sect1->u.row.under->u.indirect.u.iblock->block_off ==
+                row_sect2->u.row.under->u.indirect.u.iblock->block_off &&
+            end_row1 == start_row2) {
+            H5HF_free_section_t *last_row_sect1; /* Last row in first indirect section */
 
             /* Locate the last row section in first indirect section, if we don't already have it */
-            if(row_sect1->u.row.row != end_row1)
+            if (row_sect1->u.row.row != end_row1)
                 last_row_sect1 = sect1->u.indirect.dir_rows[sect1->u.indirect.dir_nrows - 1];
             else
                 last_row_sect1 = row_sect1;
@@ -3587,8 +3519,8 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
             last_row_sect1->u.row.num_entries += row_sect2->u.row.num_entries;
 
             /* Set up parameters for transfer of rows */
-            src_row2 = 1;
-            nrows_moved2 = sect2->u.indirect.dir_nrows - 1;
+            src_row2       = 1;
+            nrows_moved2   = sect2->u.indirect.dir_nrows - 1;
             new_dir_nrows1 = (sect1->u.indirect.dir_nrows + sect2->u.indirect.dir_nrows) - 1;
 
             /* Indicate that the rows were merged */
@@ -3597,8 +3529,8 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
         else {
 
             /* Set up parameters for transfer of rows */
-            src_row2  = 0;
-            nrows_moved2 = sect2->u.indirect.dir_nrows;
+            src_row2       = 0;
+            nrows_moved2   = sect2->u.indirect.dir_nrows;
             new_dir_nrows1 = sect1->u.indirect.dir_nrows + sect2->u.indirect.dir_nrows;
 
             /* Indicate that the rows were _not_ merged */
@@ -3606,21 +3538,21 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
         } /* end else */
 
         /* Check if we need to move additional rows */
-        if(nrows_moved2 > 0) {
-            H5HF_free_section_t **new_dir_rows;         /* Pointer to new array of direct row pointers */
+        if (nrows_moved2 > 0) {
+            H5HF_free_section_t **new_dir_rows; /* Pointer to new array of direct row pointers */
 
             /* Extend the first section's row array */
-            if(NULL == (new_dir_rows = (H5HF_free_section_t **)H5MM_realloc(sect1->u.indirect.dir_rows, sizeof(H5HF_free_section_t *) * new_dir_nrows1)))
+            if (NULL == (new_dir_rows = (H5HF_free_section_t **)H5MM_realloc(
+                             sect1->u.indirect.dir_rows, sizeof(H5HF_free_section_t *) * new_dir_nrows1)))
                 HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "allocation failed for row section pointer array")
             sect1->u.indirect.dir_rows = new_dir_rows;
 
             /* Transfer the second section's rows to first section */
             HDmemcpy(&sect1->u.indirect.dir_rows[sect1->u.indirect.dir_nrows],
-                &sect2->u.indirect.dir_rows[src_row2],
-                (sizeof(H5HF_free_section_t *) * nrows_moved2));
+                     &sect2->u.indirect.dir_rows[src_row2], (sizeof(H5HF_free_section_t *) * nrows_moved2));
 
             /* Re-target the row sections moved from second section */
-            for(u = sect1->u.indirect.dir_nrows; u < new_dir_nrows1; u++)
+            for (u = sect1->u.indirect.dir_nrows; u < new_dir_nrows1; u++)
                 sect1->u.indirect.dir_rows[u]->u.row.under = sect1;
 
             /* Adjust reference counts to account for transferred rows */
@@ -3630,14 +3562,14 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
             /* Update information for first section */
             sect1->u.indirect.dir_nrows = new_dir_nrows1;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else
         /* Indicate that the rows were _not_ merged */
         merged_rows = FALSE;
 
     /* Check for indirect sections in second section */
-    if(sect2->u.indirect.indir_nents > 0) {
-        unsigned new_indir_nents1;      /* New value for number of indirect entries in first section */
+    if (sect2->u.indirect.indir_nents > 0) {
+        unsigned new_indir_nents1; /* New value for number of indirect entries in first section */
 
         /* Some sanity checks on second indirect section */
         HDassert(sect2->u.indirect.rc > 0);
@@ -3648,26 +3580,27 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
         new_indir_nents1 = sect1->u.indirect.indir_nents + sect2->u.indirect.indir_nents;
 
         /* Check if first section can just take over second section's memory buffer */
-        if(sect1->u.indirect.indir_ents == NULL) {
+        if (sect1->u.indirect.indir_ents == NULL) {
             sect1->u.indirect.indir_ents = sect2->u.indirect.indir_ents;
             sect2->u.indirect.indir_ents = NULL;
         } /* end if */
         else {
-            H5HF_free_section_t **new_indir_ents;       /* Pointer to new array of indirect entries */
+            H5HF_free_section_t **new_indir_ents; /* Pointer to new array of indirect entries */
 
             /* Extend the first section's entry array */
-            if(NULL == (new_indir_ents = (H5HF_free_section_t **)H5MM_realloc(sect1->u.indirect.indir_ents, sizeof(H5HF_free_section_t *) * new_indir_nents1)))
+            if (NULL == (new_indir_ents = (H5HF_free_section_t **)H5MM_realloc(
+                             sect1->u.indirect.indir_ents, sizeof(H5HF_free_section_t *) * new_indir_nents1)))
                 HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "allocation failed for row section pointer array")
             sect1->u.indirect.indir_ents = new_indir_ents;
 
             /* Transfer the second section's entries to first section */
             HDmemcpy(&sect1->u.indirect.indir_ents[sect1->u.indirect.indir_nents],
-                &sect2->u.indirect.indir_ents[0],
-                (sizeof(H5HF_free_section_t *) * sect2->u.indirect.indir_nents));
+                     &sect2->u.indirect.indir_ents[0],
+                     (sizeof(H5HF_free_section_t *) * sect2->u.indirect.indir_nents));
         } /* end else */
 
         /* Re-target the child indirect sections moved from second section */
-        for(u = sect1->u.indirect.indir_nents; u < new_indir_nents1; u++)
+        for (u = sect1->u.indirect.indir_nents; u < new_indir_nents1; u++)
             sect1->u.indirect.indir_ents[u]->u.indirect.parent = sect1;
 
         /* Adjust reference counts for transferred child indirect sections */
@@ -3683,46 +3616,46 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
     sect1->u.indirect.span_size += sect2->u.indirect.span_size;
 
     /* Make certain we've tracked the first section's dependents correctly */
-    HDassert(sect1->u.indirect.rc ==
-            (sect1->u.indirect.indir_nents + sect1->u.indirect.dir_nrows));
+    HDassert(sect1->u.indirect.rc == (sect1->u.indirect.indir_nents + sect1->u.indirect.dir_nrows));
 
     /* Wrap up, freeing or re-inserting second row section */
     /* (want this to be after the first indirection section is consistent again) */
-    if(merged_rows) {
+    if (merged_rows) {
         /* Release second row section */
         /* (indirectly releases second indirect section, since all of it's
          *  other dependents are gone)
          */
         HDassert(sect2->u.indirect.rc == 1);
-        if(H5HF_sect_row_free((H5FS_section_info_t *)row_sect2) < 0)
+        if (H5HF_sect_row_free((H5FS_section_info_t *)row_sect2) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free row section")
     } /* end if */
     else {
         /* Decrement ref. count on second indirect section's parent */
         HDassert(sect2->u.indirect.rc == 0);
-        if(sect2->u.indirect.parent)
-            if(H5HF_sect_indirect_decr(sect2->u.indirect.parent) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't decrement ref. count on parent indirect section")
+        if (sect2->u.indirect.parent)
+            if (H5HF_sect_indirect_decr(sect2->u.indirect.parent) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL,
+                            "can't decrement ref. count on parent indirect section")
 
         /* Free second indirect section */
-        if(H5HF_sect_indirect_free(sect2) < 0)
+        if (H5HF_sect_indirect_free(sect2) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free indirect section node")
 
         /* Re-add the second section's first row */
         /* (it's already been added to first indirect section, but it's been removed
          *  from the free space manager and needs to be re-added)
-        */
+         */
         row_sect2->sect_info.type = H5HF_FSPACE_SECT_NORMAL_ROW;
-        if(H5HF_space_add(hdr, dxpl_id, row_sect2, H5FS_ADD_SKIP_VALID) < 0)
+        if (H5HF_space_add(hdr, dxpl_id, row_sect2, H5FS_ADD_SKIP_VALID) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't re-add second row section to free space")
     } /* end else */
 
     /* Check if we can create parent indirect section for first section */
     /* (i.e. merged indirect sections cover an entire indirect block) */
-    if(sect1->u.indirect.iblock_entries == sect1->u.indirect.num_entries) {
+    if (sect1->u.indirect.iblock_entries == sect1->u.indirect.num_entries) {
         /* Build parent section for fully populated indirect section */
         HDassert(sect1->u.indirect.parent == NULL);
-        if(H5HF_sect_indirect_build_parent(hdr, sect1) < 0)
+        if (H5HF_sect_indirect_build_parent(hdr, sect1) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL, "can't create parent for full indirect section")
     } /* end if */
 
@@ -3730,7 +3663,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_merge_row() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_build_parent
  *
@@ -3747,11 +3679,11 @@ done:
 static herr_t
 H5HF_sect_indirect_build_parent(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
 {
-    H5HF_indirect_t *par_iblock;        /* Indirect block for parent section */
-    H5HF_free_section_t *par_sect = NULL; /* Parent indirect section */
-    unsigned par_row, par_col;          /* Row & column in parent indirect section */
-    unsigned par_entry;                 /* Entry within parent indirect section */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *    par_iblock;          /* Indirect block for parent section */
+    H5HF_free_section_t *par_sect = NULL;     /* Parent indirect section */
+    unsigned             par_row, par_col;    /* Row & column in parent indirect section */
+    unsigned             par_entry;           /* Entry within parent indirect section */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3766,42 +3698,41 @@ H5HF_sect_indirect_build_parent(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
 
     /* Get information for creating parent indirect section */
     par_entry = sect->u.indirect.u.iblock->par_entry;
-    par_row = par_entry / hdr->man_dtable.cparam.width;
-    par_col = par_entry % hdr->man_dtable.cparam.width;
+    par_row   = par_entry / hdr->man_dtable.cparam.width;
+    par_col   = par_entry % hdr->man_dtable.cparam.width;
     HDassert(par_row >= hdr->man_dtable.max_direct_rows);
     par_iblock = sect->u.indirect.u.iblock->parent;
     HDassert(par_iblock);
 
     /* Create parent indirect section */
-    if(NULL == (par_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr,
-            sect->sect_info.size, par_iblock, par_iblock->block_off,
-            par_row, par_col, 1)))
+    if (NULL == (par_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr, sect->sect_info.size,
+                                                   par_iblock, par_iblock->block_off, par_row, par_col, 1)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section")
 
     /* No rows of direct blocks covered in parent, reset direct row information */
     par_sect->u.indirect.dir_nrows = 0;
-    par_sect->u.indirect.dir_rows = NULL;
+    par_sect->u.indirect.dir_rows  = NULL;
 
     /* Allocate space for the child indirect sections */
     par_sect->u.indirect.indir_nents = 1;
-    if(NULL == (par_sect->u.indirect.indir_ents = (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *))))
+    if (NULL == (par_sect->u.indirect.indir_ents =
+                     (H5HF_free_section_t **)H5MM_malloc(sizeof(H5HF_free_section_t *))))
         HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "allocation failed for indirect section pointer array")
 
     /* Attach sections together */
-    sect->u.indirect.parent = par_sect;
-    sect->u.indirect.par_entry = par_entry;
+    sect->u.indirect.parent            = par_sect;
+    sect->u.indirect.par_entry         = par_entry;
     par_sect->u.indirect.indir_ents[0] = sect;
-    par_sect->u.indirect.rc = 1;
+    par_sect->u.indirect.rc            = 1;
 
 done:
-    if(ret_value < 0)
-        if(par_sect && H5HF_sect_indirect_free(par_sect) < 0)
+    if (ret_value < 0)
+        if (par_sect && H5HF_sect_indirect_free(par_sect) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free indirect section node")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_build_parent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_shrink
  *
@@ -3818,8 +3749,8 @@ done:
 static herr_t
 H5HF_sect_indirect_shrink(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3831,33 +3762,32 @@ H5HF_sect_indirect_shrink(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
     HDassert(sect->u.indirect.dir_nrows > 0 || sect->u.indirect.indir_nents > 0);
 
     /* Walk through direct rows, freeing them */
-    for(u = 0; u < sect->u.indirect.dir_nrows; u++) {
+    for (u = 0; u < sect->u.indirect.dir_nrows; u++) {
         /* Remove the normal rows from free space manager */
-        if(sect->u.indirect.dir_rows[u]->sect_info.type != H5HF_FSPACE_SECT_FIRST_ROW) {
+        if (sect->u.indirect.dir_rows[u]->sect_info.type != H5HF_FSPACE_SECT_FIRST_ROW) {
             HDassert(sect->u.indirect.dir_rows[u]->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW);
-            if(H5HF_space_remove(hdr, dxpl_id, sect->u.indirect.dir_rows[u]) < 0)
+            if (H5HF_space_remove(hdr, dxpl_id, sect->u.indirect.dir_rows[u]) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove section from heap free space")
         } /* end if */
 
         /* Release the row section */
-        if(H5HF_sect_row_free_real(sect->u.indirect.dir_rows[u]) < 0)
+        if (H5HF_sect_row_free_real(sect->u.indirect.dir_rows[u]) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free child section node")
     } /* end for */
 
     /* Walk through indirect entries, freeing them (recursively) */
-    for(u = 0; u < sect->u.indirect.indir_nents; u++)
-        if(H5HF_sect_indirect_shrink(hdr, dxpl_id, sect->u.indirect.indir_ents[u]) < 0)
+    for (u = 0; u < sect->u.indirect.indir_nents; u++)
+        if (H5HF_sect_indirect_shrink(hdr, dxpl_id, sect->u.indirect.indir_ents[u]) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free child section node")
 
     /* Free the indirect section itself */
-    if(H5HF_sect_indirect_free(sect) < 0)
+    if (H5HF_sect_indirect_free(sect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free indirect section node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_sect_indirect_shrink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_serialize
  *
@@ -3873,10 +3803,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_serialize(H5HF_hdr_t *hdr, const H5HF_free_section_t *sect,
-    uint8_t *buf)
+H5HF_sect_indirect_serialize(H5HF_hdr_t *hdr, const H5HF_free_section_t *sect, uint8_t *buf)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3886,14 +3815,15 @@ H5HF_sect_indirect_serialize(H5HF_hdr_t *hdr, const H5HF_free_section_t *sect,
     HDassert(buf);
 
     /* Check if this indirect section has a parent & forward if this section is first */
-    if(sect->u.indirect.parent) {
-        if(sect->sect_info.addr == sect->u.indirect.parent->sect_info.addr)
-            if(H5HF_sect_indirect_serialize(hdr, sect->u.indirect.parent, buf) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTSERIALIZE, FAIL, "can't serialize indirect section's parent indirect section")
+    if (sect->u.indirect.parent) {
+        if (sect->sect_info.addr == sect->u.indirect.parent->sect_info.addr)
+            if (H5HF_sect_indirect_serialize(hdr, sect->u.indirect.parent, buf) < 0)
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTSERIALIZE, FAIL,
+                            "can't serialize indirect section's parent indirect section")
     } /* end if */
     else {
         /* Indirect range's indirect block's block offset */
-        if(sect->sect_info.state == H5FS_SECT_LIVE) {
+        if (sect->sect_info.state == H5FS_SECT_LIVE) {
             HDassert(sect->u.indirect.u.iblock);
             UINT64ENCODE_VAR(buf, sect->u.indirect.u.iblock->block_off, hdr->heap_off_size);
         } /* end if */
@@ -3914,7 +3844,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_indirect_serialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_deserialize
  *
@@ -3930,20 +3859,19 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5FS_section_info_t *
-H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id,
-    const uint8_t *buf, haddr_t sect_addr, hsize_t sect_size,
-    unsigned *des_flags)
+H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *buf, haddr_t sect_addr,
+                               hsize_t sect_size, unsigned *des_flags)
 {
-    H5HF_free_section_t *new_sect;      /* New indirect section */
-    hsize_t iblock_off;                 /* Indirect block's offset */
-    unsigned start_row;                 /* Indirect section's start row */
-    unsigned start_col;                 /* Indirect section's start column */
-    unsigned nentries;                  /* Indirect section's number of entries */
-    unsigned start_entry;               /* Start entry in indirect block */
-    unsigned end_entry;                 /* End entry in indirect block */
-    unsigned end_row;                   /* End row in indirect block */
-    unsigned end_col;                   /* End column in indirect block */
-    H5FS_section_info_t *ret_value;     /* Return value */
+    H5HF_free_section_t *new_sect;    /* New indirect section */
+    hsize_t              iblock_off;  /* Indirect block's offset */
+    unsigned             start_row;   /* Indirect section's start row */
+    unsigned             start_col;   /* Indirect section's start column */
+    unsigned             nentries;    /* Indirect section's number of entries */
+    unsigned             start_entry; /* Start entry in indirect block */
+    unsigned             end_entry;   /* End entry in indirect block */
+    unsigned             end_row;     /* End row in indirect block */
+    unsigned             end_col;     /* End column in indirect block */
+    H5FS_section_info_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3966,8 +3894,8 @@ H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id,
     UINT16DECODE(buf, nentries);
 
     /* Create free space section node */
-    if(NULL == (new_sect = H5HF_sect_indirect_new(hdr, sect_addr, sect_size,
-            NULL, iblock_off, start_row, start_col, nentries)))
+    if (NULL == (new_sect = H5HF_sect_indirect_new(hdr, sect_addr, sect_size, NULL, iblock_off, start_row,
+                                                   start_col, nentries)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't create indirect section")
 
     /* Compute start entry */
@@ -3975,13 +3903,13 @@ H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id,
 
     /* Compute end column & row */
     end_entry = (start_entry + nentries) - 1;
-    end_row = end_entry / hdr->man_dtable.cparam.width;
-    end_col = end_entry % hdr->man_dtable.cparam.width;
+    end_row   = end_entry / hdr->man_dtable.cparam.width;
+    end_col   = end_entry % hdr->man_dtable.cparam.width;
 
     /* Initialize rows for new indirect section */
-    if(H5HF_sect_indirect_init_rows(hdr, dxpl_id, new_sect, TRUE, NULL,
-            H5FS_ADD_DESERIALIZING, new_sect->u.indirect.row, new_sect->u.indirect.col,
-            end_row, end_col) < 0)
+    if (H5HF_sect_indirect_init_rows(hdr, dxpl_id, new_sect, TRUE, NULL, H5FS_ADD_DESERIALIZING,
+                                     new_sect->u.indirect.row, new_sect->u.indirect.col, end_row,
+                                     end_col) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't initialize indirect section")
 
     /* Indicate that this section shouldn't be added to free space manager's list */
@@ -3994,7 +3922,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_indirect_deserialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_free
  *
@@ -4012,8 +3939,8 @@ done:
 static herr_t
 H5HF_sect_indirect_free(H5HF_free_section_t *sect)
 {
-    H5HF_indirect_t *iblock = NULL;     /* Indirect block for section */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_indirect_t *iblock    = NULL;    /* Indirect block for section */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4026,21 +3953,20 @@ H5HF_sect_indirect_free(H5HF_free_section_t *sect)
     sect->u.indirect.indir_ents = (H5HF_free_section_t **)H5MM_xfree(sect->u.indirect.indir_ents);
 
     /* Check for live reference to an indirect block */
-    if(sect->sect_info.state == H5FS_SECT_LIVE) {
+    if (sect->sect_info.state == H5FS_SECT_LIVE) {
         /* Get indirect block, if there was one */
-        if(sect->u.indirect.u.iblock)
+        if (sect->u.indirect.u.iblock)
             iblock = sect->u.indirect.u.iblock;
     } /* end if */
 
     /* Release the sections */
-    if(H5HF_sect_node_free(sect, iblock) < 0)
+    if (H5HF_sect_node_free(sect, iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't free section node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5HF_sect_indirect_free() */
+} /* H5HF_sect_indirect_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_valid
  *
@@ -4057,12 +3983,12 @@ done:
 static herr_t
 H5HF_sect_indirect_valid(const H5HF_hdr_t *hdr, const H5HF_free_section_t *sect)
 {
-    unsigned start_row;         /* Row for first block covered */
-    unsigned start_col;         /* Column for first block covered */
-    unsigned start_entry;       /* Entry for first block covered */
-    unsigned end_row;           /* Row for last block covered */
-    unsigned end_entry;         /* Entry for last block covered */
-    unsigned u;                 /* Local index variable */
+    unsigned start_row;   /* Row for first block covered */
+    unsigned start_col;   /* Column for first block covered */
+    unsigned start_entry; /* Entry for first block covered */
+    unsigned end_row;     /* Row for last block covered */
+    unsigned end_entry;   /* Entry for last block covered */
+    unsigned u;           /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -4071,21 +3997,21 @@ H5HF_sect_indirect_valid(const H5HF_hdr_t *hdr, const H5HF_free_section_t *sect)
     HDassert(sect);
 
     /* Compute starting entry, column & row */
-    start_row = sect->u.indirect.row;
-    start_col = sect->u.indirect.col;
+    start_row   = sect->u.indirect.row;
+    start_col   = sect->u.indirect.col;
     start_entry = (start_row * hdr->man_dtable.cparam.width) + start_col;
 
     /* Compute ending entry, column & row */
     end_entry = (start_entry + sect->u.indirect.num_entries) - 1;
-    end_row = end_entry / hdr->man_dtable.cparam.width;
+    end_row   = end_entry / hdr->man_dtable.cparam.width;
 
     /* Sanity check any direct rows */
-    if(sect->u.indirect.dir_nrows > 0) {
-        unsigned dir_nrows;         /* Number of direct rows in section */
-        unsigned max_dir_row;       /* Maximum direct row in section */
+    if (sect->u.indirect.dir_nrows > 0) {
+        unsigned dir_nrows;   /* Number of direct rows in section */
+        unsigned max_dir_row; /* Maximum direct row in section */
 
         /* Check for indirect rows in section */
-        if(end_row >= hdr->man_dtable.max_direct_rows)
+        if (end_row >= hdr->man_dtable.max_direct_rows)
             max_dir_row = hdr->man_dtable.max_direct_rows - 1;
         else
             max_dir_row = end_row;
@@ -4093,43 +4019,43 @@ H5HF_sect_indirect_valid(const H5HF_hdr_t *hdr, const H5HF_free_section_t *sect)
         /* Iterate over direct rows, checking pointer references */
         dir_nrows = (max_dir_row - start_row) + 1;
         HDassert(dir_nrows == sect->u.indirect.dir_nrows);
-        for(u = 0; u < dir_nrows; u++) {
-            const H5HF_free_section_t *tmp_row_sect;    /* Pointer to row section */
+        for (u = 0; u < dir_nrows; u++) {
+            const H5HF_free_section_t *tmp_row_sect; /* Pointer to row section */
 
             tmp_row_sect = sect->u.indirect.dir_rows[u];
-            HDassert(tmp_row_sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW
-                    || tmp_row_sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW);
+            HDassert(tmp_row_sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW ||
+                     tmp_row_sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW);
             HDassert(tmp_row_sect->u.row.under == sect);
             HDassert(tmp_row_sect->u.row.row == (start_row + u));
-            if(u > 0) {
-                const H5HF_free_section_t *tmp_row_sect2;    /* Pointer to row section */
+            if (u > 0) {
+                const H5HF_free_section_t *tmp_row_sect2; /* Pointer to row section */
 
                 tmp_row_sect2 = sect->u.indirect.dir_rows[u - 1];
                 HDassert(tmp_row_sect2->u.row.row < tmp_row_sect->u.row.row);
                 HDassert(H5F_addr_lt(tmp_row_sect2->sect_info.addr, tmp_row_sect->sect_info.addr));
                 HDassert(tmp_row_sect2->sect_info.size <= tmp_row_sect->sect_info.size);
             } /* end if */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
 
     /* Sanity check any indirect entries */
-    if(sect->u.indirect.indir_nents > 0) {
+    if (sect->u.indirect.indir_nents > 0) {
         /* Basic sanity checks */
-        if(sect->sect_info.state == H5FS_SECT_LIVE) {
+        if (sect->sect_info.state == H5FS_SECT_LIVE) {
             HDassert(sect->u.indirect.iblock_entries);
             HDassert(sect->u.indirect.indir_nents <= sect->u.indirect.iblock_entries);
         } /* end if */
         HDassert(sect->u.indirect.indir_ents);
 
         /* Sanity check each child indirect section */
-        for(u = 0; u < sect->u.indirect.indir_nents; u++) {
-            const H5HF_free_section_t *tmp_child_sect;    /* Pointer to child indirect section */
+        for (u = 0; u < sect->u.indirect.indir_nents; u++) {
+            const H5HF_free_section_t *tmp_child_sect; /* Pointer to child indirect section */
 
             tmp_child_sect = sect->u.indirect.indir_ents[u];
             HDassert(tmp_child_sect->sect_info.type == H5HF_FSPACE_SECT_INDIRECT);
             HDassert(tmp_child_sect->u.indirect.parent == sect);
-            if(u > 0) {
-                const H5HF_free_section_t *tmp_child_sect2;    /* Pointer to child indirect section */
+            if (u > 0) {
+                const H5HF_free_section_t *tmp_child_sect2; /* Pointer to child indirect section */
 
                 tmp_child_sect2 = sect->u.indirect.indir_ents[u - 1];
                 HDassert(H5F_addr_lt(tmp_child_sect2->sect_info.addr, tmp_child_sect->sect_info.addr));
@@ -4138,12 +4064,11 @@ H5HF_sect_indirect_valid(const H5HF_hdr_t *hdr, const H5HF_free_section_t *sect)
             /* Recursively check child indirect section */
             H5HF_sect_indirect_valid(hdr, tmp_child_sect);
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5HF_sect_indirect_valid() */
+} /* H5HF_sect_indirect_valid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_sect_indirect_debug
  *
@@ -4159,8 +4084,7 @@ H5HF_sect_indirect_valid(const H5HF_hdr_t *hdr, const H5HF_free_section_t *sect)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_debug(const H5HF_free_section_t *sect,
-    FILE *stream, int indent, int fwidth)
+H5HF_sect_indirect_debug(const H5HF_free_section_t *sect, FILE *stream, int indent, int fwidth)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -4168,16 +4092,9 @@ H5HF_sect_indirect_debug(const H5HF_free_section_t *sect,
     HDassert(sect);
 
     /* Print indirect section information */
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Row:",
-	      sect->u.indirect.row);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Column:",
-	      sect->u.indirect.col);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of entries:",
-	      sect->u.indirect.num_entries);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Row:", sect->u.indirect.row);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Column:", sect->u.indirect.col);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of entries:", sect->u.indirect.num_entries);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_sect_indirect_debug() */
-
diff --git a/src/H5HFspace.c b/src/H5HFspace.c
index 4d4b0f4..7e9f89e 100644
--- a/src/H5HFspace.c
+++ b/src/H5HFspace.c
@@ -26,56 +26,48 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5HFpkg.h"    /* Fractal heaps			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-#define H5HF_FSPACE_SHRINK      80              /* Percent of "normal" size to shrink serialized free space size */
-#define H5HF_FSPACE_EXPAND      120             /* Percent of "normal" size to expand serialized free space size */
-#define H5HF_FSPACE_THRHD_DEF 	1             	/* Default: no alignment threshold */
-#define H5HF_FSPACE_ALIGN_DEF   1             	/* Default: no alignment */
+#define H5HF_FSPACE_SHRINK    80  /* Percent of "normal" size to shrink serialized free space size */
+#define H5HF_FSPACE_EXPAND    120 /* Percent of "normal" size to expand serialized free space size */
+#define H5HF_FSPACE_THRHD_DEF 1   /* Default: no alignment threshold */
+#define H5HF_FSPACE_ALIGN_DEF 1   /* Default: no alignment */
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_start
  *
@@ -101,12 +93,10 @@
 herr_t
 H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t may_create)
 {
-    const H5FS_section_class_t *classes[] = { /* Free space section classes implemented for fractal heap */
-        H5HF_FSPACE_SECT_CLS_SINGLE,
-        H5HF_FSPACE_SECT_CLS_FIRST_ROW,
-        H5HF_FSPACE_SECT_CLS_NORMAL_ROW,
-        H5HF_FSPACE_SECT_CLS_INDIRECT};
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5FS_section_class_t *classes[] = {/* Free space section classes implemented for fractal heap */
+                                             H5HF_FSPACE_SECT_CLS_SINGLE, H5HF_FSPACE_SECT_CLS_FIRST_ROW,
+                                             H5HF_FSPACE_SECT_CLS_NORMAL_ROW, H5HF_FSPACE_SECT_CLS_INDIRECT};
+    herr_t                      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -116,37 +106,37 @@ H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t may_create)
     HDassert(hdr);
 
     /* Check for creating free space info for the heap */
-    if(H5F_addr_defined(hdr->fs_addr)) {
+    if (H5F_addr_defined(hdr->fs_addr)) {
         /* Open an existing free space structure for the heap */
-        if(NULL == (hdr->fspace = H5FS_open(hdr->f, dxpl_id, hdr->fs_addr,
-                NELMTS(classes), classes, hdr, H5HF_FSPACE_THRHD_DEF, H5HF_FSPACE_ALIGN_DEF)))
+        if (NULL == (hdr->fspace = H5FS_open(hdr->f, dxpl_id, hdr->fs_addr, NELMTS(classes), classes, hdr,
+                                             H5HF_FSPACE_THRHD_DEF, H5HF_FSPACE_ALIGN_DEF)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize free space info")
     } /* end if */
     else {
         /* Check if we are allowed to create the free space manager */
-        if(may_create) {
-            H5FS_create_t fs_create;        /* Free space creation parameters */
+        if (may_create) {
+            H5FS_create_t fs_create; /* Free space creation parameters */
 
             /* Set the free space creation parameters */
-            fs_create.client = H5FS_CLIENT_FHEAP_ID;
+            fs_create.client         = H5FS_CLIENT_FHEAP_ID;
             fs_create.shrink_percent = H5HF_FSPACE_SHRINK;
             fs_create.expand_percent = H5HF_FSPACE_EXPAND;
-            fs_create.max_sect_size = hdr->man_dtable.cparam.max_direct_size;
-            fs_create.max_sect_addr = hdr->man_dtable.cparam.max_index;
+            fs_create.max_sect_size  = hdr->man_dtable.cparam.max_direct_size;
+            fs_create.max_sect_addr  = hdr->man_dtable.cparam.max_index;
 
             /* Create the free space structure for the heap */
-            if(NULL == (hdr->fspace = H5FS_create(hdr->f, dxpl_id, &hdr->fs_addr,
-                    &fs_create, NELMTS(classes), classes, hdr, H5HF_FSPACE_THRHD_DEF, H5HF_FSPACE_ALIGN_DEF)))
+            if (NULL ==
+                (hdr->fspace = H5FS_create(hdr->f, dxpl_id, &hdr->fs_addr, &fs_create, NELMTS(classes),
+                                           classes, hdr, H5HF_FSPACE_THRHD_DEF, H5HF_FSPACE_ALIGN_DEF)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize free space info")
             HDassert(H5F_addr_defined(hdr->fs_addr));
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_start() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_add
  *
@@ -163,11 +153,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node,
-    unsigned flags)
+H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node, unsigned flags)
 {
-    H5HF_sect_add_ud_t udata;          /* User data for free space manager 'add' */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_sect_add_ud_t udata;               /* User data for free space manager 'add' */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -178,23 +167,22 @@ H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node,
     HDassert(node);
 
     /* Check if the free space for the heap has been initialized */
-    if(!hdr->fspace)
-        if(H5HF_space_start(hdr, dxpl_id, TRUE) < 0)
+    if (!hdr->fspace)
+        if (H5HF_space_start(hdr, dxpl_id, TRUE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* Construct user data */
-    udata.hdr = hdr;
+    udata.hdr     = hdr;
     udata.dxpl_id = dxpl_id;
 
     /* Add to the free space for the heap */
-    if(H5FS_sect_add(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)node, flags, &udata) < 0)
+    if (H5FS_sect_add(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)node, flags, &udata) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "can't add section to heap free space")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_add() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_find
  *
@@ -213,8 +201,8 @@ done:
 htri_t
 H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request, H5HF_free_section_t **node)
 {
-    htri_t node_found = FALSE;  /* Whether an existing free list node was found */
-    htri_t ret_value;           /* Return value */
+    htri_t node_found = FALSE; /* Whether an existing free list node was found */
+    htri_t ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -226,13 +214,14 @@ H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request, H5HF_free_secti
     HDassert(node);
 
     /* Check if the free space for the heap has been initialized */
-    if(!hdr->fspace)
-        if(H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
+    if (!hdr->fspace)
+        if (H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* Search for free space in the heap */
-    if(hdr->fspace)
-        if((node_found = H5FS_sect_find(hdr->f, dxpl_id, hdr->fspace, request, (H5FS_section_info_t **)node)) < 0)
+    if (hdr->fspace)
+        if ((node_found =
+                 H5FS_sect_find(hdr->f, dxpl_id, hdr->fspace, request, (H5FS_section_info_t **)node)) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't locate free space in fractal heap")
 
     /* Set return value */
@@ -242,7 +231,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_find() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_revert_root_cb
  *
@@ -262,8 +250,8 @@ done:
 static herr_t
 H5HF_space_revert_root_cb(H5FS_section_info_t *_sect, void H5_ATTR_UNUSED *_udata)
 {
-    H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;       /* Section to dump info */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HF_free_section_t *sect      = (H5HF_free_section_t *)_sect; /* Section to dump info */
+    herr_t               ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -273,14 +261,15 @@ H5HF_space_revert_root_cb(H5FS_section_info_t *_sect, void H5_ATTR_UNUSED *_udat
     HDassert(sect);
 
     /* Only modify "live" single blocks... */
-    if(sect->sect_info.type == H5HF_FSPACE_SECT_SINGLE && sect->sect_info.state == H5FS_SECT_LIVE) {
+    if (sect->sect_info.type == H5HF_FSPACE_SECT_SINGLE && sect->sect_info.state == H5FS_SECT_LIVE) {
         /* Release hold on previous indirect block (we must have one) */
         HDassert(sect->u.single.parent);
-        if(H5HF_iblock_decr(sect->u.single.parent) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on section's indirect block")
+        if (H5HF_iblock_decr(sect->u.single.parent) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
+                        "can't decrement reference count on section's indirect block")
 
         /* Reset parent information */
-        sect->u.single.parent = NULL;
+        sect->u.single.parent    = NULL;
         sect->u.single.par_entry = 0;
     } /* end if */
 
@@ -288,7 +277,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_revert_root_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_revert_root
  *
@@ -307,7 +295,7 @@ done:
 herr_t
 H5HF_space_revert_root(const H5HF_hdr_t *hdr, hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -317,9 +305,9 @@ H5HF_space_revert_root(const H5HF_hdr_t *hdr, hid_t dxpl_id)
     HDassert(hdr);
 
     /* Only need to scan the sections if the free space has been initialized */
-    if(hdr->fspace) {
-	/* Iterate over all sections, reseting the parent pointers in 'single' sections */
-        if(H5FS_sect_iterate(hdr->f, dxpl_id, hdr->fspace, H5HF_space_revert_root_cb, NULL) < 0)
+    if (hdr->fspace) {
+        /* Iterate over all sections, reseting the parent pointers in 'single' sections */
+        if (H5FS_sect_iterate(hdr->f, dxpl_id, hdr->fspace, H5HF_space_revert_root_cb, NULL) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over sections to reset parent pointers")
     } /* end if */
 
@@ -327,7 +315,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_revert_root() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_create_root_cb
  *
@@ -347,9 +334,9 @@ done:
 static herr_t
 H5HF_space_create_root_cb(H5FS_section_info_t *_sect, void *_udata)
 {
-    H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;       /* Section to dump info */
-    H5HF_indirect_t *root_iblock = (H5HF_indirect_t *)_udata;	/* User data for callback */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HF_free_section_t *sect        = (H5HF_free_section_t *)_sect; /* Section to dump info */
+    H5HF_indirect_t *    root_iblock = (H5HF_indirect_t *)_udata;    /* User data for callback */
+    herr_t               ret_value   = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -365,22 +352,22 @@ H5HF_space_create_root_cb(H5FS_section_info_t *_sect, void *_udata)
     HDassert(sect->sect_info.type == H5HF_FSPACE_SECT_SINGLE);
 
     /* Increment ref. count on new root indirect block */
-    if(H5HF_iblock_incr(root_iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on section's indirect block")
+    if (H5HF_iblock_incr(root_iblock) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL,
+                    "can't increment reference count on section's indirect block")
 
     /* Set parent info ("live" section must _NOT_ have a parent right now) */
-    if(sect->sect_info.state == H5FS_SECT_SERIALIZED)
-        sect->sect_info.state = H5FS_SECT_LIVE;         /* Mark "live" now */
+    if (sect->sect_info.state == H5FS_SECT_SERIALIZED)
+        sect->sect_info.state = H5FS_SECT_LIVE; /* Mark "live" now */
     else
-         HDassert(!sect->u.single.parent);
-    sect->u.single.parent = root_iblock;
+        HDassert(!sect->u.single.parent);
+    sect->u.single.parent    = root_iblock;
     sect->u.single.par_entry = 0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_create_root_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_create_root
  *
@@ -400,7 +387,7 @@ done:
 herr_t
 H5HF_space_create_root(const H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *root_iblock)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -411,9 +398,10 @@ H5HF_space_create_root(const H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *ro
     HDassert(root_iblock);
 
     /* Only need to scan the sections if the free space has been initialized */
-    if(hdr->fspace) {
-	/* Iterate over all sections, seting the parent pointers in 'single' sections to the new indirect block */
-        if(H5FS_sect_iterate(hdr->f, dxpl_id, hdr->fspace, H5HF_space_create_root_cb, root_iblock) < 0)
+    if (hdr->fspace) {
+        /* Iterate over all sections, seting the parent pointers in 'single' sections to the new indirect
+         * block */
+        if (H5FS_sect_iterate(hdr->f, dxpl_id, hdr->fspace, H5HF_space_create_root_cb, root_iblock) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over sections to set parent pointers")
     } /* end if */
 
@@ -421,7 +409,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_create_root() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_size
  *
@@ -439,7 +426,7 @@ done:
 herr_t
 H5HF_space_size(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t *fs_size)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -450,13 +437,13 @@ H5HF_space_size(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t *fs_size)
     HDassert(fs_size);
 
     /* Check if the free space for the heap has been initialized */
-    if(!hdr->fspace)
-        if(H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
+    if (!hdr->fspace)
+        if (H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* Get free space metadata size */
-    if(hdr->fspace) {
-        if(H5FS_size(hdr->f, hdr->fspace, fs_size) < 0)
+    if (hdr->fspace) {
+        if (H5FS_size(hdr->f, hdr->fspace, fs_size) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't retrieve FS meta storage info")
     } /* end if */
     else
@@ -466,7 +453,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_remove
  *
@@ -484,7 +470,7 @@ done:
 herr_t
 H5HF_space_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -496,14 +482,13 @@ H5HF_space_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node)
     HDassert(node);
 
     /* Remove from the free space for the heap */
-    if(H5FS_sect_remove(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)node) < 0)
+    if (H5FS_sect_remove(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)node) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove section from heap free space")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_close
  *
@@ -522,7 +507,7 @@ done:
 herr_t
 H5HF_space_close(H5HF_hdr_t *hdr, hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -532,34 +517,33 @@ H5HF_space_close(H5HF_hdr_t *hdr, hid_t dxpl_id)
     HDassert(hdr);
 
     /* Check if the free space was ever opened */
-    if(hdr->fspace) {
-        hsize_t nsects;         /* Number of sections for this heap */
+    if (hdr->fspace) {
+        hsize_t nsects; /* Number of sections for this heap */
 
         /* Retrieve the number of sections for this heap */
-        if(H5FS_sect_stats(hdr->fspace, NULL, &nsects) < 0)
+        if (H5FS_sect_stats(hdr->fspace, NULL, &nsects) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOUNT, FAIL, "can't query free space section count")
 #ifdef QAK
-HDfprintf(stderr, "%s: nsects = %Hu\n", FUNC, nsects);
+        HDfprintf(stderr, "%s: nsects = %Hu\n", FUNC, nsects);
 #endif /* QAK */
 
         /* Close the free space for the heap */
-        if(H5FS_close(hdr->f, dxpl_id, hdr->fspace) < 0)
+        if (H5FS_close(hdr->f, dxpl_id, hdr->fspace) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
         hdr->fspace = NULL;
 
         /* Check if we can delete the free space manager for this heap */
-        if(!nsects) {
-            if(H5FS_delete(hdr->f, dxpl_id, hdr->fs_addr) < 0)
+        if (!nsects) {
+            if (H5FS_delete(hdr->f, dxpl_id, hdr->fs_addr) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "can't delete free space info")
             hdr->fs_addr = HADDR_UNDEF;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_delete
  *
@@ -577,7 +561,7 @@ done:
 herr_t
 H5HF_space_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -587,14 +571,13 @@ H5HF_space_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
     HDassert(hdr);
 
     /* Delete the free space manager */
-    if(H5FS_delete(hdr->f, dxpl_id, hdr->fs_addr) < 0)
+    if (H5FS_delete(hdr->f, dxpl_id, hdr->fs_addr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "can't delete to free space manager")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_space_change_sect_class
  *
@@ -613,11 +596,11 @@ done:
 herr_t
 H5HF_space_sect_change_class(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect, unsigned new_class)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef QAK
-HDfprintf(stderr, "%s: Called\n", FUNC);
+    HDfprintf(stderr, "%s: Called\n", FUNC);
 #endif /* QAK */
 
     /*
@@ -628,10 +611,9 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
     HDassert(sect);
 
     /* Notify the free space manager that a section has changed class */
-    if(H5FS_sect_change_class(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)sect, new_class) < 0)
+    if (H5FS_sect_change_class(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)sect, new_class) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMODIFY, FAIL, "can't modify class of free space section")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_space_sect_change_class() */
-
diff --git a/src/H5HFstat.c b/src/H5HFstat.c
index 401c064..328b1d7 100644
--- a/src/H5HFstat.c
+++ b/src/H5HFstat.c
@@ -22,51 +22,43 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5HFpkg.h"    /* Fractal heaps			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_stat_info
  *
@@ -91,21 +83,20 @@ H5HF_stat_info(const H5HF_t *fh, H5HF_stat_t *stats)
     HDassert(stats);
 
     /* Report statistics for fractal heap */
-    stats->man_size = fh->hdr->man_size;
+    stats->man_size       = fh->hdr->man_size;
     stats->man_alloc_size = fh->hdr->man_alloc_size;
-    stats->man_iter_off = fh->hdr->man_iter_off;
-    stats->man_nobjs = fh->hdr->man_nobjs;
+    stats->man_iter_off   = fh->hdr->man_iter_off;
+    stats->man_nobjs      = fh->hdr->man_nobjs;
     stats->man_free_space = fh->hdr->total_man_free;
-    stats->huge_size = fh->hdr->huge_size;
-    stats->huge_nobjs = fh->hdr->huge_nobjs;
-    stats->tiny_size = fh->hdr->tiny_size;
-    stats->tiny_nobjs = fh->hdr->tiny_nobjs;
-/* XXX: Add more metadata statistics for the heap */
+    stats->huge_size      = fh->hdr->huge_size;
+    stats->huge_nobjs     = fh->hdr->huge_nobjs;
+    stats->tiny_size      = fh->hdr->tiny_size;
+    stats->tiny_nobjs     = fh->hdr->tiny_nobjs;
+    /* XXX: Add more metadata statistics for the heap */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_stat_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5HF_size
  *
@@ -124,10 +115,10 @@ H5HF_stat_info(const H5HF_t *fh, H5HF_stat_t *stats)
 herr_t
 H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size)
 {
-    H5HF_hdr_t *hdr;                    /* Fractal heap header */
-    H5B2_t      *bt2 = NULL;            /* v2 B-tree handle for index */
-    hsize_t	meta_size = 0;		/* free space storage size */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HF_hdr_t *hdr;                 /* Fractal heap header */
+    H5B2_t *    bt2       = NULL;    /* v2 B-tree handle for index */
+    hsize_t     meta_size = 0;       /* free space storage size */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -141,38 +132,40 @@ H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size)
     hdr = fh->hdr;
 
     /* Add in values already known */
-    *heap_size += hdr->heap_size;               /* Heap header */
-    *heap_size += hdr->man_alloc_size;          /* Direct block storage for "managed" objects */
-    *heap_size += hdr->huge_size;               /* "huge" object storage */
+    *heap_size += hdr->heap_size;      /* Heap header */
+    *heap_size += hdr->man_alloc_size; /* Direct block storage for "managed" objects */
+    *heap_size += hdr->huge_size;      /* "huge" object storage */
 
     /* Check for indirect blocks for managed objects */
-    if(H5F_addr_defined(hdr->man_dtable.table_addr) && hdr->man_dtable.curr_root_rows != 0)
-        if(H5HF_man_iblock_size(hdr->f, dxpl_id, hdr, hdr->man_dtable.table_addr, hdr->man_dtable.curr_root_rows, NULL, 0, heap_size) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get fractal heap storage info for indirect block")
+    if (H5F_addr_defined(hdr->man_dtable.table_addr) && hdr->man_dtable.curr_root_rows != 0)
+        if (H5HF_man_iblock_size(hdr->f, dxpl_id, hdr, hdr->man_dtable.table_addr,
+                                 hdr->man_dtable.curr_root_rows, NULL, 0, heap_size) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
+                        "unable to get fractal heap storage info for indirect block")
 
     /* Check for B-tree storage of huge objects in fractal heap */
-    if(H5F_addr_defined(hdr->huge_bt2_addr)) {
+    if (H5F_addr_defined(hdr->huge_bt2_addr)) {
         /* Open the huge object index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for tracking 'huge' objects")
+        if (NULL == (bt2 = H5B2_open(hdr->f, dxpl_id, hdr->huge_bt2_addr, hdr->f)))
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTOPENOBJ, FAIL,
+                        "unable to open v2 B-tree for tracking 'huge' objects")
 
         /* Get the B-tree storage */
-        if(H5B2_size(bt2, dxpl_id, heap_size) < 0)
+        if (H5B2_size(bt2, dxpl_id, heap_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve B-tree storage info")
     } /* end if */
 
     /* Get storage for free-space tracking info */
-    if(H5F_addr_defined(hdr->fs_addr)) {
-        if(H5HF_space_size(hdr, dxpl_id, &meta_size) < 0)
+    if (H5F_addr_defined(hdr->fs_addr)) {
+        if (H5HF_space_size(hdr, dxpl_id, &meta_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve FS meta storage info")
-	*heap_size += meta_size;
+        *heap_size += meta_size;
     } /* end if */
 
 done:
     /* Release resources */
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for tracking 'huge' objects")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_size() */
-
diff --git a/src/H5HFtest.c b/src/H5HFtest.c
index 20bdc50..6a4e292 100644
--- a/src/H5HFtest.c
+++ b/src/H5HFtest.c
@@ -22,52 +22,44 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
-#define H5HF_TESTING		/*suppress warning about H5HF testing funcs*/
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
+#define H5HF_TESTING /*suppress warning about H5HF testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5HFpkg.h"    /* Fractal heaps			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_cparam_test
  *
@@ -92,9 +84,9 @@ H5HF_get_cparam_test(const H5HF_t *fh, H5HF_create_t *cparam)
     HDassert(cparam);
 
     /* Get fractal heap creation parameters */
-    if(fh->hdr->id_len == (unsigned)(1 + fh->hdr->heap_off_size + fh->hdr->heap_len_size))
+    if (fh->hdr->id_len == (unsigned)(1 + fh->hdr->heap_off_size + fh->hdr->heap_len_size))
         cparam->id_len = 0;
-    else if(fh->hdr->id_len == (1 + fh->hdr->sizeof_size + fh->hdr->sizeof_addr))
+    else if (fh->hdr->id_len == (1 + fh->hdr->sizeof_size + fh->hdr->sizeof_addr))
         cparam->id_len = 1;
     else
         cparam->id_len = fh->hdr->id_len;
@@ -105,7 +97,6 @@ H5HF_get_cparam_test(const H5HF_t *fh, H5HF_create_t *cparam)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_get_cparam_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_cmp_cparam_test
  *
@@ -122,7 +113,7 @@ H5HF_get_cparam_test(const H5HF_t *fh, H5HF_create_t *cparam)
 int
 H5HF_cmp_cparam_test(const H5HF_create_t *cparam1, const H5HF_create_t *cparam2)
 {
-    int ret_value = 0;         /* Return value */
+    int ret_value = 0; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -131,57 +122,57 @@ H5HF_cmp_cparam_test(const H5HF_create_t *cparam1, const H5HF_create_t *cparam2)
     HDassert(cparam2);
 
     /* Compare doubling table parameters */
-    if(cparam1->managed.width < cparam2->managed.width)
+    if (cparam1->managed.width < cparam2->managed.width)
         HGOTO_DONE(-1)
-    else if(cparam1->managed.width > cparam2->managed.width)
+    else if (cparam1->managed.width > cparam2->managed.width)
         HGOTO_DONE(1)
-    if(cparam1->managed.start_block_size < cparam2->managed.start_block_size)
+    if (cparam1->managed.start_block_size < cparam2->managed.start_block_size)
         HGOTO_DONE(-1)
-    else if(cparam1->managed.start_block_size > cparam2->managed.start_block_size)
+    else if (cparam1->managed.start_block_size > cparam2->managed.start_block_size)
         HGOTO_DONE(1)
-    if(cparam1->managed.max_direct_size < cparam2->managed.max_direct_size)
+    if (cparam1->managed.max_direct_size < cparam2->managed.max_direct_size)
         HGOTO_DONE(-1)
-    else if(cparam1->managed.max_direct_size > cparam2->managed.max_direct_size)
+    else if (cparam1->managed.max_direct_size > cparam2->managed.max_direct_size)
         HGOTO_DONE(1)
-    if(cparam1->managed.max_index < cparam2->managed.max_index)
+    if (cparam1->managed.max_index < cparam2->managed.max_index)
         HGOTO_DONE(-1)
-    else if(cparam1->managed.max_index > cparam2->managed.max_index)
+    else if (cparam1->managed.max_index > cparam2->managed.max_index)
         HGOTO_DONE(1)
-    if(cparam1->managed.start_root_rows < cparam2->managed.start_root_rows)
+    if (cparam1->managed.start_root_rows < cparam2->managed.start_root_rows)
         HGOTO_DONE(-1)
-    else if(cparam1->managed.start_root_rows > cparam2->managed.start_root_rows)
+    else if (cparam1->managed.start_root_rows > cparam2->managed.start_root_rows)
         HGOTO_DONE(1)
 
     /* Compare other general parameters for heap */
-    if(cparam1->max_man_size < cparam2->max_man_size)
+    if (cparam1->max_man_size < cparam2->max_man_size)
         HGOTO_DONE(-1)
-    else if(cparam1->max_man_size > cparam2->max_man_size)
+    else if (cparam1->max_man_size > cparam2->max_man_size)
         HGOTO_DONE(1)
-    if(cparam1->id_len < cparam2->id_len)
+    if (cparam1->id_len < cparam2->id_len)
         HGOTO_DONE(-1)
-    else if(cparam1->id_len > cparam2->id_len)
+    else if (cparam1->id_len > cparam2->id_len)
         HGOTO_DONE(1)
 
     /* Compare "important" parameters for any I/O pipeline filters */
-    if(cparam1->pline.nused < cparam2->pline.nused)
+    if (cparam1->pline.nused < cparam2->pline.nused)
         HGOTO_DONE(-1)
-    else if(cparam1->pline.nused > cparam2->pline.nused)
+    else if (cparam1->pline.nused > cparam2->pline.nused)
         HGOTO_DONE(1)
     else {
-        size_t u, v;       /* Local index variables */
+        size_t u, v; /* Local index variables */
 
         /* Compare each filter */
-        for(u = 0; u < cparam1->pline.nused; u++) {
+        for (u = 0; u < cparam1->pline.nused; u++) {
             /* Check filter ID */
-            if(cparam1->pline.filter[u].id < cparam2->pline.filter[u].id)
+            if (cparam1->pline.filter[u].id < cparam2->pline.filter[u].id)
                 HGOTO_DONE(-1)
-            else if(cparam1->pline.filter[u].id > cparam2->pline.filter[u].id)
+            else if (cparam1->pline.filter[u].id > cparam2->pline.filter[u].id)
                 HGOTO_DONE(1)
 
             /* Check filter flags */
-            if(cparam1->pline.filter[u].flags < cparam2->pline.filter[u].flags)
+            if (cparam1->pline.filter[u].flags < cparam2->pline.filter[u].flags)
                 HGOTO_DONE(-1)
-            else if(cparam1->pline.filter[u].flags > cparam2->pline.filter[u].flags)
+            else if (cparam1->pline.filter[u].flags > cparam2->pline.filter[u].flags)
                 HGOTO_DONE(1)
 
 /* Don't worry about comparing the filter names right now... */
@@ -190,41 +181,42 @@ H5HF_cmp_cparam_test(const H5HF_create_t *cparam1, const H5HF_create_t *cparam2)
  */
 #ifdef QAK
             /* Check filter name */
-HDfprintf(stderr, "%s: Check 1.0\n", "H5HF_cmp_cparam_test");
-HDfprintf(stderr, "%s: cparam1->pline.filter[%Zu].name = %s\n", "H5HF_cmp_cparam_test", u, (cparam1->pline.filter[u].name ? cparam1->pline.filter[u].name : "<nil>"));
-HDfprintf(stderr, "%s: cparam2->pline.filter[%Zu].name = %s\n", "H5HF_cmp_cparam_test", u, (cparam2->pline.filter[u].name ? cparam2->pline.filter[u].name : "<nil>"));
-            if(!cparam1->pline.filter[u].name && cparam2->pline.filter[u].name)
+            HDfprintf(stderr, "%s: Check 1.0\n", "H5HF_cmp_cparam_test");
+            HDfprintf(stderr, "%s: cparam1->pline.filter[%Zu].name = %s\n", "H5HF_cmp_cparam_test", u,
+                      (cparam1->pline.filter[u].name ? cparam1->pline.filter[u].name : "<nil>"));
+            HDfprintf(stderr, "%s: cparam2->pline.filter[%Zu].name = %s\n", "H5HF_cmp_cparam_test", u,
+                      (cparam2->pline.filter[u].name ? cparam2->pline.filter[u].name : "<nil>"));
+            if (!cparam1->pline.filter[u].name && cparam2->pline.filter[u].name)
                 HGOTO_DONE(-1)
-            else if(cparam1->pline.filter[u].name && !cparam2->pline.filter[u].name)
+            else if (cparam1->pline.filter[u].name && !cparam2->pline.filter[u].name)
                 HGOTO_DONE(1)
-            else if(cparam1->pline.filter[u].name && cparam2->pline.filter[u].name) {
-                if((ret_value = HDstrcmp(cparam1->pline.filter[u].name, cparam2->pline.filter[u].name)))
+            else if (cparam1->pline.filter[u].name && cparam2->pline.filter[u].name) {
+                if ((ret_value = HDstrcmp(cparam1->pline.filter[u].name, cparam2->pline.filter[u].name)))
                     HGOTO_DONE(ret_value)
             } /* end if */
-#endif /* QAK */
+#endif        /* QAK */
 
             /* Check # of filter parameters */
-            if(cparam1->pline.filter[u].cd_nelmts < cparam2->pline.filter[u].cd_nelmts)
+            if (cparam1->pline.filter[u].cd_nelmts < cparam2->pline.filter[u].cd_nelmts)
                 HGOTO_DONE(-1)
-            else if(cparam1->pline.filter[u].cd_nelmts > cparam2->pline.filter[u].cd_nelmts)
+            else if (cparam1->pline.filter[u].cd_nelmts > cparam2->pline.filter[u].cd_nelmts)
                 HGOTO_DONE(1)
 
             /* Check filter parameters */
-            for(v = 0; v < cparam1->pline.filter[u].cd_nelmts; v++) {
-                if(cparam1->pline.filter[u].cd_values[v] < cparam2->pline.filter[u].cd_values[v])
+            for (v = 0; v < cparam1->pline.filter[u].cd_nelmts; v++) {
+                if (cparam1->pline.filter[u].cd_values[v] < cparam2->pline.filter[u].cd_values[v])
                     HGOTO_DONE(-1)
-                else if(cparam1->pline.filter[u].cd_values[v] > cparam2->pline.filter[u].cd_values[v])
+                else if (cparam1->pline.filter[u].cd_values[v] > cparam2->pline.filter[u].cd_values[v])
                     HGOTO_DONE(1)
             } /* end for */
 
         } /* end for */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_cmp_cparam_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_max_root_rows
  *
@@ -242,7 +234,7 @@ done:
 unsigned
 H5HF_get_max_root_rows(const H5HF_t *fh)
 {
-    unsigned	ret_value;              /* Return value */
+    unsigned ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -255,7 +247,6 @@ H5HF_get_max_root_rows(const H5HF_t *fh)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_get_max_root_rows() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_dtable_width_test
  *
@@ -273,7 +264,7 @@ H5HF_get_max_root_rows(const H5HF_t *fh)
 unsigned
 H5HF_get_dtable_width_test(const H5HF_t *fh)
 {
-    unsigned	ret_value;              /* Return value */
+    unsigned ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -286,7 +277,6 @@ H5HF_get_dtable_width_test(const H5HF_t *fh)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_get_dtable_width_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_dtable_max_drows_test
  *
@@ -304,7 +294,7 @@ H5HF_get_dtable_width_test(const H5HF_t *fh)
 unsigned
 H5HF_get_dtable_max_drows_test(const H5HF_t *fh)
 {
-    unsigned	ret_value;              /* Return value */
+    unsigned ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -317,7 +307,6 @@ H5HF_get_dtable_max_drows_test(const H5HF_t *fh)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_get_dtable_max_drows_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_iblock_max_drows_test
  *
@@ -339,7 +328,7 @@ H5HF_get_dtable_max_drows_test(const H5HF_t *fh)
 unsigned
 H5HF_get_iblock_max_drows_test(const H5HF_t *fh, unsigned pos)
 {
-    unsigned	ret_value;              /* Return value */
+    unsigned ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -348,13 +337,11 @@ H5HF_get_iblock_max_drows_test(const H5HF_t *fh, unsigned pos)
     HDassert(pos);
 
     /* Return max. # of direct blocks in this indirect block row */
-    ret_value = pos + (fh->hdr->man_dtable.max_direct_bits -
-            fh->hdr->man_dtable.first_row_bits) + 1;
+    ret_value = pos + (fh->hdr->man_dtable.max_direct_bits - fh->hdr->man_dtable.first_row_bits) + 1;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_get_iblock_max_drows_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_dblock_size_test
  *
@@ -372,7 +359,7 @@ H5HF_get_iblock_max_drows_test(const H5HF_t *fh, unsigned pos)
 hsize_t
 H5HF_get_dblock_size_test(const H5HF_t *fh, unsigned row)
 {
-    hsize_t	ret_value;              /* Return value */
+    hsize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -385,7 +372,6 @@ H5HF_get_dblock_size_test(const H5HF_t *fh, unsigned row)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_get_dblock_size_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_dblock_free_test
  *
@@ -404,7 +390,7 @@ H5HF_get_dblock_size_test(const H5HF_t *fh, unsigned row)
 hsize_t
 H5HF_get_dblock_free_test(const H5HF_t *fh, unsigned row)
 {
-    hsize_t	ret_value;              /* Return value */
+    hsize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -417,7 +403,6 @@ H5HF_get_dblock_free_test(const H5HF_t *fh, unsigned row)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_get_dblock_free_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_id_off_test
  *
@@ -435,7 +420,7 @@ H5HF_get_dblock_free_test(const H5HF_t *fh, unsigned row)
 herr_t
 H5HF_get_id_off_test(const H5HF_t *fh, const void *_id, hsize_t *obj_off)
 {
-    const uint8_t *id = (const uint8_t *)_id;   /* Object ID */
+    const uint8_t *id = (const uint8_t *)_id; /* Object ID */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -452,7 +437,6 @@ H5HF_get_id_off_test(const H5HF_t *fh, const void *_id, hsize_t *obj_off)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_get_id_off_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_id_type_test
  *
@@ -469,7 +453,7 @@ H5HF_get_id_off_test(const H5HF_t *fh, const void *_id, hsize_t *obj_off)
 herr_t
 H5HF_get_id_type_test(const void *_id, unsigned char *obj_type)
 {
-    const uint8_t *id = (const uint8_t *)_id;   /* Object ID */
+    const uint8_t *id = (const uint8_t *)_id; /* Object ID */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -483,7 +467,6 @@ H5HF_get_id_type_test(const void *_id, unsigned char *obj_type)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_get_id_type_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_tiny_info_test
  *
@@ -498,8 +481,7 @@ H5HF_get_id_type_test(const void *_id, unsigned char *obj_type)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len,
-    hbool_t *len_extended)
+H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len, hbool_t *len_extended)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -510,13 +492,12 @@ H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len,
     HDassert(len_extended);
 
     /* Retrieve information about tiny object's ID encoding in a heap */
-    *max_len = fh->hdr->tiny_max_len;
+    *max_len      = fh->hdr->tiny_max_len;
     *len_extended = fh->hdr->tiny_len_extended;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_get_tiny_info_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_get_huge_info_test
  *
@@ -541,10 +522,9 @@ H5HF_get_huge_info_test(const H5HF_t *fh, hsize_t *next_id, hbool_t *ids_direct)
     HDassert(ids_direct);
 
     /* Retrieve information about tiny object's ID encoding in a heap */
-    if(next_id)
+    if (next_id)
         *next_id = fh->hdr->huge_next_id;
     *ids_direct = fh->hdr->huge_ids_direct;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_get_huge_info_test() */
-
diff --git a/src/H5HFtiny.c b/src/H5HFtiny.c
index ea913a2..3c18933 100644
--- a/src/H5HFtiny.c
+++ b/src/H5HFtiny.c
@@ -26,61 +26,51 @@
 /* Module Setup */
 /****************/
 
-#define H5HF_PACKAGE		/*suppress error about including H5HFpkg  */
-
+#define H5HF_PACKAGE /*suppress error about including H5HFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HFpkg.h"		/* Fractal heaps			*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5HFpkg.h"    /* Fractal heaps			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Tiny object length information */
-#define H5HF_TINY_LEN_SHORT     16              /* Max. length able to be encoded in first heap ID byte */
-#define H5HF_TINY_MASK_SHORT    0x0F            /* Mask for length in first heap ID byte */
-#define H5HF_TINY_MASK_EXT      0x0FFF          /* Mask for length in two heap ID bytes */
-#define H5HF_TINY_MASK_EXT_1    0x0F00          /* Mask for length in first byte of two heap ID bytes */
-#define H5HF_TINY_MASK_EXT_2    0x00FF          /* Mask for length in second byte of two heap ID bytes */
-
+#define H5HF_TINY_LEN_SHORT  16     /* Max. length able to be encoded in first heap ID byte */
+#define H5HF_TINY_MASK_SHORT 0x0F   /* Mask for length in first heap ID byte */
+#define H5HF_TINY_MASK_EXT   0x0FFF /* Mask for length in two heap ID bytes */
+#define H5HF_TINY_MASK_EXT_1 0x0F00 /* Mask for length in first byte of two heap ID bytes */
+#define H5HF_TINY_MASK_EXT_2 0x00FF /* Mask for length in second byte of two heap ID bytes */
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id,
-    H5HF_operator_t op, void *op_data);
-
+static herr_t H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, void *op_data);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_tiny_init
  *
@@ -111,23 +101,22 @@ H5HF_tiny_init(H5HF_hdr_t *hdr)
      *  extra byte, but using that byte means that the extra length byte is
      *  unnecessary)
      */
-    if((hdr->id_len - 1) <= H5HF_TINY_LEN_SHORT) {
-        hdr->tiny_max_len = hdr->id_len - 1;
+    if ((hdr->id_len - 1) <= H5HF_TINY_LEN_SHORT) {
+        hdr->tiny_max_len      = hdr->id_len - 1;
         hdr->tiny_len_extended = FALSE;
     } /* end if */
-    else if((hdr->id_len - 1) == (H5HF_TINY_LEN_SHORT + 1)) {
-        hdr->tiny_max_len = H5HF_TINY_LEN_SHORT;
+    else if ((hdr->id_len - 1) == (H5HF_TINY_LEN_SHORT + 1)) {
+        hdr->tiny_max_len      = H5HF_TINY_LEN_SHORT;
         hdr->tiny_len_extended = FALSE;
     } /* end if */
     else {
-        hdr->tiny_max_len = hdr->id_len - 2;
+        hdr->tiny_max_len      = hdr->id_len - 2;
         hdr->tiny_len_extended = TRUE;
     } /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_tiny_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_tiny_insert
  *
@@ -144,13 +133,13 @@ H5HF_tiny_init(H5HF_hdr_t *hdr)
 herr_t
 H5HF_tiny_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *_id)
 {
-    uint8_t *id = (uint8_t *)_id;       /* Pointer to ID buffer */
-    size_t enc_obj_size;                /* Encoded object size */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    uint8_t *id = (uint8_t *)_id; /* Pointer to ID buffer */
+    size_t   enc_obj_size;        /* Encoded object size */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef QAK
-HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
+    HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
 #endif /* QAK */
 
     /*
@@ -166,18 +155,16 @@ HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
     enc_obj_size = obj_size - 1;
 
     /* Encode object into ID */
-    if(!hdr->tiny_len_extended) {
-        *id++ = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_TINY |
-                (enc_obj_size & H5HF_TINY_MASK_SHORT);
+    if (!hdr->tiny_len_extended) {
+        *id++ = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_TINY | (enc_obj_size & H5HF_TINY_MASK_SHORT);
     } /* end if */
     else {
-        *id++ = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_TINY |
-                ((enc_obj_size & H5HF_TINY_MASK_EXT_1) >> 8);
+        *id++ = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_TINY | ((enc_obj_size & H5HF_TINY_MASK_EXT_1) >> 8);
         *id++ = enc_obj_size & H5HF_TINY_MASK_EXT_2;
     } /* end else */
     HDmemcpy(id, obj, obj_size);
 #ifdef H5_CLEAR_MEMORY
-HDmemset(id + obj_size, 0, (hdr->id_len - (1 + hdr->tiny_len_extended + obj_size)));
+    HDmemset(id + obj_size, 0, (hdr->id_len - (1 + hdr->tiny_len_extended + obj_size)));
 #endif /* H5_CLEAR_MEMORY */
 
     /* Update statistics about heap */
@@ -185,14 +172,13 @@ HDmemset(id + obj_size, 0, (hdr->id_len - (1 + hdr->tiny_len_extended + obj_size
     hdr->tiny_nobjs++;
 
     /* Mark heap header as modified */
-    if(H5HF_hdr_dirty(hdr) < 0)
+    if (H5HF_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_tiny_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_tiny_get_obj_len
  *
@@ -209,7 +195,7 @@ done:
 herr_t
 H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
 {
-    size_t enc_obj_size;                /* Encoded object size */
+    size_t enc_obj_size; /* Encoded object size */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -221,12 +207,12 @@ H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
     HDassert(obj_len_p);
 
     /* Check if 'tiny' object ID is in extended form, and retrieve encoded size */
-    if(!hdr->tiny_len_extended)
+    if (!hdr->tiny_len_extended)
         enc_obj_size = *id & H5HF_TINY_MASK_SHORT;
     else
-	/* (performed in this odd way to avoid compiler bug on tg-login3 with
-	 *  gcc 3.2.2 - QAK)
-	 */
+        /* (performed in this odd way to avoid compiler bug on tg-login3 with
+         *  gcc 3.2.2 - QAK)
+         */
         enc_obj_size = *(id + 1) | ((*id & H5HF_TINY_MASK_EXT_1) << 8);
 
     /* Set the object's length */
@@ -235,7 +221,6 @@ H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF_tiny_get_obj_len() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_tiny_op_real
  *
@@ -250,11 +235,10 @@ H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op,
-    void *op_data)
+H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, void *op_data)
 {
-    size_t enc_obj_size;                /* Encoded object size */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t enc_obj_size;        /* Encoded object size */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -266,7 +250,7 @@ H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op,
     HDassert(op);
 
     /* Check if 'tiny' object ID is in extended form */
-    if(!hdr->tiny_len_extended) {
+    if (!hdr->tiny_len_extended) {
         /* Retrieve the object's encoded length */
         enc_obj_size = *id & H5HF_TINY_MASK_SHORT;
 
@@ -275,27 +259,27 @@ H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op,
     } /* end if */
     else {
         /* Retrieve the object's encoded length */
-	/* (performed in this odd way to avoid compiler bug on tg-login3 with
-	 *  gcc 3.2.2 - QAK)
-	 */
+        /* (performed in this odd way to avoid compiler bug on tg-login3 with
+         *  gcc 3.2.2 - QAK)
+         */
         enc_obj_size = *(id + 1) | ((*id & H5HF_TINY_MASK_EXT_1) << 8);
 
         /* Advance past flag byte(s) */
-	/* (performed in two steps to avoid compiler bug on tg-login3 with
-	 *  gcc 3.2.2 - QAK)
-	 */
-        id++; id++;
+        /* (performed in two steps to avoid compiler bug on tg-login3 with
+         *  gcc 3.2.2 - QAK)
+         */
+        id++;
+        id++;
     } /* end else */
 
     /* Call the user's 'op' callback */
-    if(op(id, (enc_obj_size + 1), op_data) < 0)
+    if (op(id, (enc_obj_size + 1), op_data) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "application's callback failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_tiny_op_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_tiny_read
  *
@@ -312,7 +296,7 @@ done:
 herr_t
 H5HF_tiny_read(H5HF_hdr_t *hdr, const uint8_t *id, void *obj)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -324,14 +308,13 @@ H5HF_tiny_read(H5HF_hdr_t *hdr, const uint8_t *id, void *obj)
     HDassert(obj);
 
     /* Call the internal 'op' routine */
-    if(H5HF_tiny_op_real(hdr, id, H5HF_op_read, obj) < 0)
+    if (H5HF_tiny_op_real(hdr, id, H5HF_op_read, obj) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_tiny_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_tiny_op
  *
@@ -346,10 +329,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_tiny_op(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op,
-    void *op_data)
+H5HF_tiny_op(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, void *op_data)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -361,14 +343,13 @@ H5HF_tiny_op(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op,
     HDassert(op);
 
     /* Call the internal 'op' routine routine */
-    if(H5HF_tiny_op_real(hdr, id, op, op_data) < 0)
+    if (H5HF_tiny_op_real(hdr, id, op, op_data) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_tiny_op() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HF_tiny_remove
  *
@@ -385,8 +366,8 @@ done:
 herr_t
 H5HF_tiny_remove(H5HF_hdr_t *hdr, const uint8_t *id)
 {
-    size_t enc_obj_size;                /* Encoded object size */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t enc_obj_size;        /* Encoded object size */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -397,12 +378,12 @@ H5HF_tiny_remove(H5HF_hdr_t *hdr, const uint8_t *id)
     HDassert(id);
 
     /* Check if 'tiny' object ID is in extended form */
-    if(!hdr->tiny_len_extended)
+    if (!hdr->tiny_len_extended)
         enc_obj_size = *id & H5HF_TINY_MASK_SHORT;
     else
-	/* (performed in this odd way to avoid compiler bug on tg-login3 with
-	 *  gcc 3.2.2 - QAK)
-	 */
+        /* (performed in this odd way to avoid compiler bug on tg-login3 with
+         *  gcc 3.2.2 - QAK)
+         */
         enc_obj_size = *(id + 1) | ((*id & H5HF_TINY_MASK_EXT_1) << 8);
 
     /* Update statistics about heap */
@@ -410,10 +391,9 @@ H5HF_tiny_remove(H5HF_hdr_t *hdr, const uint8_t *id)
     hdr->tiny_nobjs--;
 
     /* Mark heap header as modified */
-    if(H5HF_hdr_dirty(hdr) < 0)
+    if (H5HF_hdr_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_tiny_remove() */
-
diff --git a/src/H5HG.c b/src/H5HG.c
index 194e4eb..b9559c7 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -39,19 +39,17 @@
 /* Module Setup */
 /****************/
 
-#define H5HG_PACKAGE		/*suppress error about including H5HGpkg	  */
-
+#define H5HG_PACKAGE /*suppress error about including H5HGpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"         /* File access				*/
-#include "H5HGpkg.h"		/* Global heaps				*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5HGpkg.h"     /* Global heaps				*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
@@ -60,31 +58,27 @@
 /*
  * The maximum number of links allowed to a global heap object.
  */
-#define H5HG_MAXLINK	65535
+#define H5HG_MAXLINK 65535
 
 /*
  * The maximum number of indices allowed in a global heap object.
  */
-#define H5HG_MAXIDX	65535
-
+#define H5HG_MAXIDX 65535
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static haddr_t H5HG_create(H5F_t *f, hid_t dxpl_id, size_t size);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -98,18 +92,14 @@ H5FL_SEQ_DEFINE(H5HG_obj_t);
 /* Declare a PQ free list to manage heap chunks */
 H5FL_BLK_DEFINE(gheap_chunk);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_create
  *
@@ -132,43 +122,43 @@ H5FL_BLK_DEFINE(gheap_chunk);
 static haddr_t
 H5HG_create(H5F_t *f, hid_t dxpl_id, size_t size)
 {
-    H5HG_heap_t	*heap = NULL;
-    uint8_t	*p = NULL;
-    haddr_t	addr = HADDR_UNDEF;
-    size_t	n;
-    haddr_t	ret_value = HADDR_UNDEF;        /* Return value */
+    H5HG_heap_t *heap = NULL;
+    uint8_t *    p    = NULL;
+    haddr_t      addr = HADDR_UNDEF;
+    size_t       n;
+    haddr_t      ret_value = HADDR_UNDEF; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(f);
-    if(size < H5HG_MINSIZE)
+    if (size < H5HG_MINSIZE)
         size = H5HG_MINSIZE;
     size = H5HG_ALIGN(size);
 
     /* Create it */
     H5_CHECK_OVERFLOW(size, size_t, hsize_t);
-    if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_GHEAP, dxpl_id, (hsize_t)size)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "unable to allocate file space for global heap")
-    if(NULL == (heap = H5FL_MALLOC(H5HG_heap_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed")
-    heap->addr = addr;
-    heap->size = size;
+    if (HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_GHEAP, dxpl_id, (hsize_t)size)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "unable to allocate file space for global heap")
+    if (NULL == (heap = H5FL_MALLOC(H5HG_heap_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed")
+    heap->addr   = addr;
+    heap->size   = size;
     heap->shared = H5F_SHARED(f);
 
-    if(NULL == (heap->chunk = H5FL_BLK_MALLOC(gheap_chunk, size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed")
+    if (NULL == (heap->chunk = H5FL_BLK_MALLOC(gheap_chunk, size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed")
 #ifdef H5_CLEAR_MEMORY
-HDmemset(heap->chunk, 0, size);
+    HDmemset(heap->chunk, 0, size);
 #endif /* H5_CLEAR_MEMORY */
     heap->nalloc = H5HG_NOBJS(f, size);
-    heap->nused = 1; /* account for index 0, which is used for the free object */
-    if(NULL == (heap->obj = H5FL_SEQ_MALLOC(H5HG_obj_t, heap->nalloc)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed")
+    heap->nused  = 1; /* account for index 0, which is used for the free object */
+    if (NULL == (heap->obj = H5FL_SEQ_MALLOC(H5HG_obj_t, heap->nalloc)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed")
 
     /* Initialize the header */
     HDmemcpy(heap->chunk, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC);
-    p = heap->chunk + H5_SIZEOF_MAGIC;
+    p    = heap->chunk + H5_SIZEOF_MAGIC;
     *p++ = H5HG_VERSION;
     *p++ = 0; /*reserved*/
     *p++ = 0; /*reserved*/
@@ -182,7 +172,7 @@ HDmemset(heap->chunk, 0, size);
      */
     n = H5HG_ALIGN(p - heap->chunk) - (size_t)(p - heap->chunk);
 #ifdef OLD_WAY
-/* Don't bother zeroing out the rest of the info in the heap -QAK */
+    /* Don't bother zeroing out the rest of the info in the heap -QAK */
     HDmemset(p, 0, n);
 #endif /* OLD_WAY */
     p += n;
@@ -192,45 +182,46 @@ HDmemset(heap->chunk, 0, size);
     HDassert(H5HG_ISALIGNED(heap->obj[0].size));
     heap->obj[0].nrefs = 0;
     heap->obj[0].begin = p;
-    UINT16ENCODE(p, 0);	/*object ID*/
-    UINT16ENCODE(p, 0);	/*reference count*/
+    UINT16ENCODE(p, 0); /*object ID*/
+    UINT16ENCODE(p, 0); /*reference count*/
     UINT32ENCODE(p, 0); /*reserved*/
     H5F_ENCODE_LENGTH(f, p, heap->obj[0].size);
 #ifdef OLD_WAY
-/* Don't bother zeroing out the rest of the info in the heap -QAK */
-    HDmemset (p, 0, (size_t)((heap->chunk+heap->size) - p));
+    /* Don't bother zeroing out the rest of the info in the heap -QAK */
+    HDmemset(p, 0, (size_t)((heap->chunk + heap->size) - p));
 #endif /* OLD_WAY */
 
     /* Add this heap to the beginning of the CWFS list */
-    if(H5F_cwfs_add(f, heap) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "unable to add global heap collection to file's CWFS")
+    if (H5F_cwfs_add(f, heap) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF,
+                    "unable to add global heap collection to file's CWFS")
 
     /* Add the heap to the cache */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_GHEAP, addr, heap, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "unable to cache global heap collection")
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_GHEAP, addr, heap, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "unable to cache global heap collection")
 
     ret_value = addr;
 
 done:
     /* Cleanup on error */
-    if(!H5F_addr_defined(ret_value)) {
-        if(H5F_addr_defined(addr)) {
+    if (!H5F_addr_defined(ret_value)) {
+        if (H5F_addr_defined(addr)) {
             /* Release the space on disk */
-            if(H5MF_xfree(f, H5FD_MEM_GHEAP, dxpl_id, addr, (hsize_t)size) < 0)
+            if (H5MF_xfree(f, H5FD_MEM_GHEAP, dxpl_id, addr, (hsize_t)size) < 0)
                 HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, HADDR_UNDEF, "unable to free global heap")
 
             /* Check if the heap object was allocated */
-            if(heap)
+            if (heap)
                 /* Destroy the heap object */
-                if(H5HG_free(heap) < 0)
-                    HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, HADDR_UNDEF, "unable to destroy global heap collection")
+                if (H5HG_free(heap) < 0)
+                    HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, HADDR_UNDEF,
+                                "unable to destroy global heap collection")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* H5HG_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_protect
  *
@@ -246,8 +237,8 @@ done:
 H5HG_heap_t *
 H5HG_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
 {
-    H5HG_heap_t *heap;          /* Global heap */
-    H5HG_heap_t *ret_value;     /* Return value */
+    H5HG_heap_t *heap;      /* Global heap */
+    H5HG_heap_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -256,7 +247,7 @@ H5HG_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
     HDassert(H5F_addr_defined(addr));
 
     /* Lock the heap into memory */
-    if(NULL == (heap = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, addr, f, rw)))
+    if (NULL == (heap = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, addr, f, rw)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect global heap")
 
     /* Set the heap's address */
@@ -269,7 +260,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HG_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_alloc
  *
@@ -291,36 +281,36 @@ done:
 static size_t
 H5HG_alloc(H5F_t *f, H5HG_heap_t *heap, size_t size, unsigned *heap_flags_ptr)
 {
-    size_t	idx;
-    uint8_t	*p;
-    size_t	need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(size);
-    size_t      ret_value;         /* Return value */
+    size_t   idx;
+    uint8_t *p;
+    size_t   need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(size);
+    size_t   ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(heap);
-    HDassert(heap->obj[0].size>=need);
+    HDassert(heap->obj[0].size >= need);
     HDassert(heap_flags_ptr);
 
     /*
      * Find an ID for the new object. ID zero is reserved for the free space
      * object.
      */
-    if(heap->nused <= H5HG_MAXIDX)
+    if (heap->nused <= H5HG_MAXIDX)
         idx = heap->nused++;
     else {
-        for(idx = 1; idx < heap->nused; idx++)
-            if(NULL == heap->obj[idx].begin)
+        for (idx = 1; idx < heap->nused; idx++)
+            if (NULL == heap->obj[idx].begin)
                 break;
     } /* end else */
 
     HDassert(idx < heap->nused);
 
     /* Check if we need more room to store heap objects */
-    if(idx >= heap->nalloc) {
-        size_t new_alloc;       /* New allocation number */
-        H5HG_obj_t *new_obj;	/* New array of object descriptions */
+    if (idx >= heap->nalloc) {
+        size_t      new_alloc; /* New allocation number */
+        H5HG_obj_t *new_obj;   /* New array of object descriptions */
 
         /* Determine the new number of objects to index */
         /* nalloc is *not* guaranteed to be a power of 2! - NAF 10/26/09 */
@@ -328,7 +318,7 @@ H5HG_alloc(H5F_t *f, H5HG_heap_t *heap, size_t size, unsigned *heap_flags_ptr)
         HDassert(idx < new_alloc);
 
         /* Reallocate array of objects */
-        if(NULL == (new_obj = H5FL_SEQ_REALLOC(H5HG_obj_t, heap->obj, new_alloc)))
+        if (NULL == (new_obj = H5FL_SEQ_REALLOC(H5HG_obj_t, heap->obj, new_alloc)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, 0, "memory allocation failed")
 
         /* Clear newly allocated space */
@@ -336,50 +326,50 @@ H5HG_alloc(H5F_t *f, H5HG_heap_t *heap, size_t size, unsigned *heap_flags_ptr)
 
         /* Update heap information */
         heap->nalloc = new_alloc;
-        heap->obj = new_obj;
+        heap->obj    = new_obj;
         HDassert(heap->nalloc > heap->nused);
     } /* end if */
 
     /* Initialize the new object */
     heap->obj[idx].nrefs = 0;
-    heap->obj[idx].size = size;
+    heap->obj[idx].size  = size;
     heap->obj[idx].begin = heap->obj[0].begin;
-    p = heap->obj[idx].begin;
+    p                    = heap->obj[idx].begin;
     UINT16ENCODE(p, idx);
     UINT16ENCODE(p, 0); /*nrefs*/
     UINT32ENCODE(p, 0); /*reserved*/
-    H5F_ENCODE_LENGTH (f, p, size);
+    H5F_ENCODE_LENGTH(f, p, size);
 
     /* Fix the free space object */
-    if(need == heap->obj[0].size) {
-	/*
-	 * All free space has been exhausted from this collection.
-	 */
-	heap->obj[0].size = 0;
-	heap->obj[0].begin = NULL;
+    if (need == heap->obj[0].size) {
+        /*
+         * All free space has been exhausted from this collection.
+         */
+        heap->obj[0].size  = 0;
+        heap->obj[0].begin = NULL;
     } /* end if */
-    else if(heap->obj[0].size-need >= H5HG_SIZEOF_OBJHDR (f)) {
-	/*
-	 * Some free space remains and it's larger than a heap object header,
-	 * so write the new free heap object header to the heap.
-	 */
-	heap->obj[0].size -= need;
-	heap->obj[0].begin += need;
-	p = heap->obj[0].begin;
-	UINT16ENCODE(p, 0);	/*id*/
-	UINT16ENCODE(p, 0);	/*nrefs*/
-	UINT32ENCODE(p, 0);	/*reserved*/
-	H5F_ENCODE_LENGTH (f, p, heap->obj[0].size);
-	HDassert(H5HG_ISALIGNED(heap->obj[0].size));
+    else if (heap->obj[0].size - need >= H5HG_SIZEOF_OBJHDR(f)) {
+        /*
+         * Some free space remains and it's larger than a heap object header,
+         * so write the new free heap object header to the heap.
+         */
+        heap->obj[0].size -= need;
+        heap->obj[0].begin += need;
+        p = heap->obj[0].begin;
+        UINT16ENCODE(p, 0); /*id*/
+        UINT16ENCODE(p, 0); /*nrefs*/
+        UINT32ENCODE(p, 0); /*reserved*/
+        H5F_ENCODE_LENGTH(f, p, heap->obj[0].size);
+        HDassert(H5HG_ISALIGNED(heap->obj[0].size));
     } /* end else-if */
     else {
-	/*
-	 * Some free space remains but it's smaller than a heap object header,
-	 * so we don't write the header.
-	 */
-	heap->obj[0].size -= need;
-	heap->obj[0].begin += need;
-	HDassert(H5HG_ISALIGNED(heap->obj[0].size));
+        /*
+         * Some free space remains but it's smaller than a heap object header,
+         * so we don't write the header.
+         */
+        heap->obj[0].size -= need;
+        heap->obj[0].begin += need;
+        HDassert(H5HG_ISALIGNED(heap->obj[0].size));
     }
 
     /* Mark the heap as dirty */
@@ -392,7 +382,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HG_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_extend
  *
@@ -423,13 +412,13 @@ done:
 herr_t
 H5HG_extend(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t need)
 {
-    H5HG_heap_t *heap = NULL;       /* Pointer to heap to extend */
-    unsigned heap_flags = H5AC__NO_FLAGS_SET;   /* Flags to unprotecting heap */
-    size_t  old_size;               /* Previous size of the heap's chunk */
-    uint8_t *new_chunk;             /* Pointer to new chunk information */
-    uint8_t *p;                     /* Pointer to raw heap info */
-    unsigned u;                     /* Local index variable */
-    herr_t  ret_value = SUCCEED;    /* Return value */
+    H5HG_heap_t *heap       = NULL;               /* Pointer to heap to extend */
+    unsigned     heap_flags = H5AC__NO_FLAGS_SET; /* Flags to unprotecting heap */
+    size_t       old_size;                        /* Previous size of the heap's chunk */
+    uint8_t *    new_chunk;                       /* Pointer to new chunk information */
+    uint8_t *    p;                               /* Pointer to raw heap info */
+    unsigned     u;                               /* Local index variable */
+    herr_t       ret_value = SUCCEED;             /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -438,14 +427,14 @@ H5HG_extend(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t need)
     HDassert(H5F_addr_defined(addr));
 
     /* Protect the heap */
-    if(NULL == (heap = H5HG_protect(f, dxpl_id, addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HG_protect(f, dxpl_id, addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap")
 
     /* Re-allocate the heap information in memory */
-    if(NULL == (new_chunk = H5FL_BLK_REALLOC(gheap_chunk, heap->chunk, (heap->size + need))))
+    if (NULL == (new_chunk = H5FL_BLK_REALLOC(gheap_chunk, heap->chunk, (heap->size + need))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "new heap allocation failed")
 #ifdef H5_CLEAR_MEMORY
-HDmemset(new_chunk + heap->size, 0, need);
+    HDmemset(new_chunk + heap->size, 0, need);
 #endif /* H5_CLEAR_MEMORY */
 
     /* Adjust the size of the heap */
@@ -457,8 +446,8 @@ HDmemset(new_chunk + heap->size, 0, need);
     H5F_ENCODE_LENGTH(f, p, heap->size);
 
     /* Move the pointers to the existing objects to their new locations */
-    for(u = 0; u < heap->nused; u++)
-        if(heap->obj[u].begin)
+    for (u = 0; u < heap->nused; u++)
+        if (heap->obj[u].begin)
             heap->obj[u].begin = new_chunk + (heap->obj[u].begin - heap->chunk);
 
     /* Update the heap chunk pointer now */
@@ -466,30 +455,29 @@ HDmemset(new_chunk + heap->size, 0, need);
 
     /* Update the free space information for the heap  */
     heap->obj[0].size += need;
-    if(heap->obj[0].begin == NULL)
-        heap->obj[0].begin = heap->chunk+old_size;
+    if (heap->obj[0].begin == NULL)
+        heap->obj[0].begin = heap->chunk + old_size;
     p = heap->obj[0].begin;
-    UINT16ENCODE(p, 0);	/*id*/
-    UINT16ENCODE(p, 0);	/*nrefs*/
-    UINT32ENCODE(p, 0);	/*reserved*/
+    UINT16ENCODE(p, 0); /*id*/
+    UINT16ENCODE(p, 0); /*nrefs*/
+    UINT32ENCODE(p, 0); /*reserved*/
     H5F_ENCODE_LENGTH(f, p, heap->obj[0].size);
     HDassert(H5HG_ISALIGNED(heap->obj[0].size));
 
     /* Resize the heap in the cache */
-    if(H5AC_resize_entry(heap, heap->size) < 0)
+    if (H5AC_resize_entry(heap, heap->size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize global heap in cache")
 
     /* Mark the heap as dirty */
     heap_flags |= H5AC__DIRTIED_FLAG;
 
 done:
-    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, heap->addr, heap, heap_flags) < 0)
+    if (heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, heap->addr, heap, heap_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to unprotect heap")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HG_extend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_insert
  *
@@ -513,14 +501,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj/*out*/)
+H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj /*out*/)
 {
-    size_t	need;		/*total space needed for object		*/
-    size_t	idx;
-    haddr_t	addr;           /* Address of heap to add object within */
-    H5HG_heap_t	*heap = NULL;
-    unsigned 	heap_flags = H5AC__NO_FLAGS_SET;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    size_t       need; /*total space needed for object		*/
+    size_t       idx;
+    haddr_t      addr; /* Address of heap to add object within */
+    H5HG_heap_t *heap       = NULL;
+    unsigned     heap_flags = H5AC__NO_FLAGS_SET;
+    herr_t       ret_value  = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -529,59 +517,58 @@ H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj/*out*/
     HDassert(0 == size || obj);
     HDassert(hobj);
 
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "no write intent on file")
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Find a large enough collection on the CWFS list */
     need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(size);
 
     /* Look for a heap in the file's CWFS that has enough space for the object */
     addr = HADDR_UNDEF;
-    if(H5F_cwfs_find_free_heap(f, dxpl_id, need, &addr) < 0)
+    if (H5F_cwfs_find_free_heap(f, dxpl_id, need, &addr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "error trying to locate heap")
 
     /*
      * If we didn't find any collection with enough free space then allocate a
      * new collection large enough for the message plus the collection header.
      */
-    if(!H5F_addr_defined(addr)) {
+    if (!H5F_addr_defined(addr)) {
         addr = H5HG_create(f, dxpl_id, need + H5HG_SIZEOF_HDR(f));
 
-        if(!H5F_addr_defined(addr))
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to allocate a global heap collection")
+        if (!H5F_addr_defined(addr))
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to allocate a global heap collection")
     } /* end if */
     HDassert(H5F_addr_defined(addr));
 
-    if(NULL == (heap = H5HG_protect(f, dxpl_id, addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HG_protect(f, dxpl_id, addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap")
 
     /* Split the free space to make room for the new object */
-    if(0 == (idx = H5HG_alloc(f, heap, size, &heap_flags)))
+    if (0 == (idx = H5HG_alloc(f, heap, size, &heap_flags)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "unable to allocate global heap object")
 
     /* Copy data into the heap */
-    if(size > 0) {
+    if (size > 0) {
         HDmemcpy(heap->obj[idx].begin + H5HG_SIZEOF_OBJHDR(f), obj, size);
 #ifdef OLD_WAY
-/* Don't bother zeroing out the rest of the info in the heap -QAK */
+        /* Don't bother zeroing out the rest of the info in the heap -QAK */
         HDmemset(heap->obj[idx].begin + H5HG_SIZEOF_OBJHDR(f) + size, 0,
                  need - (H5HG_SIZEOF_OBJHDR(f) + size));
 #endif /* OLD_WAY */
-    } /* end if */
+    }  /* end if */
     heap_flags |= H5AC__DIRTIED_FLAG;
 
     /* Return value */
     hobj->addr = heap->addr;
-    hobj->idx = idx;
+    hobj->idx  = idx;
 
 done:
-    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, heap->addr, heap, heap_flags) < 0)
+    if (heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, heap->addr, heap, heap_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to unprotect heap.")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HG_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_read
  *
@@ -600,14 +587,13 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object/*out*/,
-    size_t *buf_size)
+H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object /*out*/, size_t *buf_size)
 {
-    H5HG_heap_t	*heap = NULL;           /* Pointer to global heap object */
-    size_t	size;                   /* Size of the heap object */
-    uint8_t	*p;                     /* Pointer to object in heap buffer */
-    void        *orig_object = object;  /* Keep a copy of the original object pointer */
-    void	*ret_value;             /* Return value */
+    H5HG_heap_t *heap = NULL;          /* Pointer to global heap object */
+    size_t       size;                 /* Size of the heap object */
+    uint8_t *    p;                    /* Pointer to object in heap buffer */
+    void *       orig_object = object; /* Keep a copy of the original object pointer */
+    void *       ret_value;            /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -616,46 +602,45 @@ H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object/*out*/,
     HDassert(hobj);
 
     /* Load the heap */
-    if(NULL == (heap = H5HG_protect(f, dxpl_id, hobj->addr, H5AC_READ)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect global heap")
+    if (NULL == (heap = H5HG_protect(f, dxpl_id, hobj->addr, H5AC_READ)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect global heap")
 
     HDassert(hobj->idx < heap->nused);
     HDassert(heap->obj[hobj->idx].begin);
     size = heap->obj[hobj->idx].size;
-    p = heap->obj[hobj->idx].begin + H5HG_SIZEOF_OBJHDR(f);
+    p    = heap->obj[hobj->idx].begin + H5HG_SIZEOF_OBJHDR(f);
 
     /* Allocate a buffer for the object read in, if the user didn't give one */
-    if(!object && NULL == (object = H5MM_malloc(size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!object && NULL == (object = H5MM_malloc(size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     HDmemcpy(object, p, size);
 
     /*
      * Advance the heap in the CWFS list. We might have done this already
      * with the H5AC_protect(), but it won't hurt to do it twice.
      */
-    if(heap->obj[0].begin) {
-        if(H5F_cwfs_advance_heap(f, heap, FALSE) < 0)
+    if (heap->obj[0].begin) {
+        if (H5F_cwfs_advance_heap(f, heap, FALSE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTMODIFY, NULL, "can't adjust file's CWFS")
     } /* end if */
 
     /* If the caller would like to know the heap object's size, set that */
-    if(buf_size)
+    if (buf_size)
         *buf_size = size;
 
     /* Set return value */
     ret_value = object;
 
 done:
-    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, heap, H5AC__NO_FLAGS_SET) < 0)
+    if (heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, heap, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
-    if(NULL == ret_value && NULL == orig_object && object)
+    if (NULL == ret_value && NULL == orig_object && object)
         H5MM_free(object);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HG_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_link
  *
@@ -677,28 +662,28 @@ done:
 int
 H5HG_link(H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust)
 {
-    H5HG_heap_t *heap = NULL;
-    unsigned heap_flags = H5AC__NO_FLAGS_SET;
-    int ret_value;              /* Return value */
+    H5HG_heap_t *heap       = NULL;
+    unsigned     heap_flags = H5AC__NO_FLAGS_SET;
+    int          ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(f);
     HDassert(hobj);
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "no write intent on file")
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Load the heap */
-    if(NULL == (heap = H5HG_protect(f, dxpl_id, hobj->addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HG_protect(f, dxpl_id, hobj->addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap")
 
-    if(adjust != 0) {
+    if (adjust != 0) {
         HDassert(hobj->idx < heap->nused);
         HDassert(heap->obj[hobj->idx].begin);
-        if((heap->obj[hobj->idx].nrefs + adjust) < 0)
+        if ((heap->obj[hobj->idx].nrefs + adjust) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "new link count would be out of range")
-        if((heap->obj[hobj->idx].nrefs + adjust) > H5HG_MAXLINK)
+        if ((heap->obj[hobj->idx].nrefs + adjust) > H5HG_MAXLINK)
             HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "new link count would be out of range")
         heap->obj[hobj->idx].nrefs += adjust;
         heap_flags |= H5AC__DIRTIED_FLAG;
@@ -708,13 +693,12 @@ H5HG_link(H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust)
     ret_value = heap->obj[hobj->idx].nrefs;
 
 done:
-    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, heap, heap_flags) < 0)
+    if (heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, heap, heap_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HG_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_remove
  *
@@ -735,25 +719,25 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
+H5HG_remove(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
 {
-    H5HG_heap_t	*heap = NULL;
-    uint8_t	*p = NULL, *obj_start = NULL;
-    size_t	need;
-    unsigned	u;
-    unsigned    flags = H5AC__NO_FLAGS_SET;/* Whether the heap gets deleted */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5HG_heap_t *heap = NULL;
+    uint8_t *    p = NULL, *obj_start = NULL;
+    size_t       need;
+    unsigned     u;
+    unsigned     flags     = H5AC__NO_FLAGS_SET; /* Whether the heap gets deleted */
+    herr_t       ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(f);
     HDassert(hobj);
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
         HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Load the heap */
-    if(NULL == (heap = H5HG_protect(f, dxpl_id, hobj->addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HG_protect(f, dxpl_id, hobj->addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap")
 
     HDassert(hobj->idx < heap->nused);
@@ -763,53 +747,53 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
     need = H5HG_ALIGN(heap->obj[hobj->idx].size) + H5HG_SIZEOF_OBJHDR(f);
 
     /* Move the new free space to the end of the heap */
-    for(u = 0; u < heap->nused; u++)
-        if(heap->obj[u].begin > heap->obj[hobj->idx].begin)
+    for (u = 0; u < heap->nused; u++)
+        if (heap->obj[u].begin > heap->obj[hobj->idx].begin)
             heap->obj[u].begin -= need;
-    if(NULL == heap->obj[0].begin) {
+    if (NULL == heap->obj[0].begin) {
         heap->obj[0].begin = heap->chunk + (heap->size - need);
-        heap->obj[0].size = need;
+        heap->obj[0].size  = need;
         heap->obj[0].nrefs = 0;
     } /* end if */
     else
         heap->obj[0].size += need;
-    HDmemmove(obj_start, obj_start + need,
-              heap->size - (size_t)((obj_start + need) - heap->chunk));
-    if(heap->obj[0].size >= H5HG_SIZEOF_OBJHDR(f)) {
+    HDmemmove(obj_start, obj_start + need, heap->size - (size_t)((obj_start + need) - heap->chunk));
+    if (heap->obj[0].size >= H5HG_SIZEOF_OBJHDR(f)) {
         p = heap->obj[0].begin;
         UINT16ENCODE(p, 0); /*id*/
         UINT16ENCODE(p, 0); /*nrefs*/
         UINT32ENCODE(p, 0); /*reserved*/
-        H5F_ENCODE_LENGTH (f, p, heap->obj[0].size);
+        H5F_ENCODE_LENGTH(f, p, heap->obj[0].size);
     } /* end if */
     HDmemset(heap->obj + hobj->idx, 0, sizeof(H5HG_obj_t));
     flags |= H5AC__DIRTIED_FLAG;
 
-    if((heap->obj[0].size + H5HG_SIZEOF_HDR(f)) == heap->size) {
+    if ((heap->obj[0].size + H5HG_SIZEOF_HDR(f)) == heap->size) {
         /*
          * The collection is empty. Remove it from the CWFS list and return it
          * to the file free list.
          */
-        flags |= H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG; /* Indicate that the object was deleted, for the unprotect call */
-    } /* end if */
+        flags |=
+            H5AC__DELETED_FLAG |
+            H5AC__FREE_FILE_SPACE_FLAG; /* Indicate that the object was deleted, for the unprotect call */
+    }                                   /* end if */
     else {
         /*
          * If the heap is in the CWFS list then advance it one position.  The
          * H5AC_protect() might have done that too, but that's okay.  If the
          * heap isn't on the CWFS list then add it to the end.
          */
-        if(H5F_cwfs_advance_heap(f, heap, TRUE) < 0)
+        if (H5F_cwfs_advance_heap(f, heap, TRUE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTMODIFY, FAIL, "can't adjust file's CWFS")
     } /* end else */
 
 done:
-    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, heap, flags) < 0)
+    if (heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, heap, flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HG_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_free
  *
@@ -825,7 +809,7 @@ done:
 herr_t
 H5HG_free(H5HG_heap_t *heap)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -833,16 +817,15 @@ H5HG_free(H5HG_heap_t *heap)
     HDassert(heap);
 
     /* Remove the heap from the CWFS list */
-    if(H5F_cwfs_remove_heap(heap->shared, heap) < 0)
+    if (H5F_cwfs_remove_heap(heap->shared, heap) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove heap from file's CWFS")
 
-    if(heap->chunk)
+    if (heap->chunk)
         heap->chunk = H5FL_BLK_FREE(gheap_chunk, heap->chunk);
-    if(heap->obj)
+    if (heap->obj)
         heap->obj = H5FL_SEQ_FREE(H5HG_obj_t, heap->obj);
     heap = H5FL_FREE(H5HG_heap_t, heap);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HG_free() */
-
diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index 075697c..3d25bc0 100644
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -26,47 +26,41 @@
 /* Module Setup */
 /****************/
 
-#define H5HG_PACKAGE		/*suppress error about including H5HGpkg  */
-
+#define H5HG_PACKAGE /*suppress error about including H5HGpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5HGpkg.h"		/* Global heaps				*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5HGpkg.h"     /* Global heaps				*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Metadata cache callbacks */
 static H5HG_heap_t *H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5HG_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
-			 H5HG_heap_t *heap, unsigned H5_ATTR_UNUSED * flags_ptr);
-static herr_t H5HG_dest(H5F_t *f, H5HG_heap_t *heap);
-static herr_t H5HG_clear(H5F_t *f, H5HG_heap_t *heap, hbool_t destroy);
-static herr_t H5HG_size(const H5F_t *f, const H5HG_heap_t *heap, size_t *size_ptr);
-
+static herr_t       H5HG_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, H5HG_heap_t *heap,
+                               unsigned H5_ATTR_UNUSED *flags_ptr);
+static herr_t       H5HG_dest(H5F_t *f, H5HG_heap_t *heap);
+static herr_t       H5HG_clear(H5F_t *f, H5HG_heap_t *heap, hbool_t destroy);
+static herr_t       H5HG_size(const H5F_t *f, const H5HG_heap_t *heap, size_t *size_ptr);
 
 /*********************/
 /* Package Variables */
@@ -82,18 +76,14 @@ const H5AC_class_t H5AC_GHEAP[1] = {{
     (H5AC_size_func_t)H5HG_size,
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_load
  *
@@ -111,11 +101,11 @@ const H5AC_class_t H5AC_GHEAP[1] = {{
 static H5HG_heap_t *
 H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
 {
-    H5HG_heap_t	*heap = NULL;
-    uint8_t	*p;
-    size_t	nalloc, need;
-    size_t      max_idx = 0;            /* The maximum index seen */
-    H5HG_heap_t	*ret_value = NULL;      /* Return value */
+    H5HG_heap_t *heap = NULL;
+    uint8_t *    p;
+    size_t       nalloc, need;
+    size_t       max_idx   = 0;    /* The maximum index seen */
+    H5HG_heap_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -125,23 +115,23 @@ H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
     HDassert(udata);
 
     /* Read the initial 4k page */
-    if(NULL == (heap = H5FL_CALLOC(H5HG_heap_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (heap = H5FL_CALLOC(H5HG_heap_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     heap->shared = H5F_SHARED(f);
-    if(NULL == (heap->chunk = H5FL_BLK_MALLOC(gheap_chunk, (size_t)H5HG_MINSIZE)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    if(H5F_block_read(f, H5FD_MEM_GHEAP, addr, (size_t)H5HG_MINSIZE, dxpl_id, heap->chunk) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read global heap collection")
+    if (NULL == (heap->chunk = H5FL_BLK_MALLOC(gheap_chunk, (size_t)H5HG_MINSIZE)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (H5F_block_read(f, H5FD_MEM_GHEAP, addr, (size_t)H5HG_MINSIZE, dxpl_id, heap->chunk) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read global heap collection")
     p = heap->chunk;
 
     /* Magic number */
-    if(HDmemcmp(p, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad global heap collection signature")
+    if (HDmemcmp(p, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad global heap collection signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(H5HG_VERSION != *p++)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong version number in global heap")
+    if (H5HG_VERSION != *p++)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong version number in global heap")
 
     /* Reserved */
     p += 3;
@@ -154,54 +144,55 @@ H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
      * If we didn't read enough in the first try, then read the rest of the
      * collection now.
      */
-    if(heap->size > H5HG_MINSIZE) {
-	haddr_t next_addr = addr + (hsize_t)H5HG_MINSIZE;
-
-	if(NULL == (heap->chunk = H5FL_BLK_REALLOC(gheap_chunk, heap->chunk, heap->size)))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-	if(H5F_block_read(f, H5FD_MEM_GHEAP, next_addr, (heap->size - H5HG_MINSIZE), dxpl_id, heap->chunk + H5HG_MINSIZE) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read global heap collection")
+    if (heap->size > H5HG_MINSIZE) {
+        haddr_t next_addr = addr + (hsize_t)H5HG_MINSIZE;
+
+        if (NULL == (heap->chunk = H5FL_BLK_REALLOC(gheap_chunk, heap->chunk, heap->size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+        if (H5F_block_read(f, H5FD_MEM_GHEAP, next_addr, (heap->size - H5HG_MINSIZE), dxpl_id,
+                           heap->chunk + H5HG_MINSIZE) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read global heap collection")
     } /* end if */
 
     /* Decode each object */
-    p = heap->chunk + H5HG_SIZEOF_HDR(f);
+    p      = heap->chunk + H5HG_SIZEOF_HDR(f);
     nalloc = H5HG_NOBJS(f, heap->size);
 
     /* Calloc the obj array because the file format spec makes no guarantee
      * about the order of the objects, and unused slots must be set to zero.
      */
-    if(NULL == (heap->obj = H5FL_SEQ_CALLOC(H5HG_obj_t, nalloc)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (heap->obj = H5FL_SEQ_CALLOC(H5HG_obj_t, nalloc)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     heap->nalloc = nalloc;
-    while(p < (heap->chunk + heap->size)) {
-	if((p + H5HG_SIZEOF_OBJHDR(f)) > (heap->chunk + heap->size)) {
-	    /*
-	     * The last bit of space is too tiny for an object header, so we
-	     * assume that it's free space.
-	     */
-	    HDassert(NULL == heap->obj[0].begin);
-	    heap->obj[0].size = ((const uint8_t *)heap->chunk + heap->size) - p;
-	    heap->obj[0].begin = p;
-	    p += heap->obj[0].size;
-	} /* end if */
+    while (p < (heap->chunk + heap->size)) {
+        if ((p + H5HG_SIZEOF_OBJHDR(f)) > (heap->chunk + heap->size)) {
+            /*
+             * The last bit of space is too tiny for an object header, so we
+             * assume that it's free space.
+             */
+            HDassert(NULL == heap->obj[0].begin);
+            heap->obj[0].size  = ((const uint8_t *)heap->chunk + heap->size) - p;
+            heap->obj[0].begin = p;
+            p += heap->obj[0].size;
+        } /* end if */
         else {
-	    unsigned idx;
-	    uint8_t *begin = p;
+            unsigned idx;
+            uint8_t *begin = p;
 
-	    UINT16DECODE(p, idx);
+            UINT16DECODE(p, idx);
 
             /* Check if we need more room to store heap objects */
-            if(idx >= heap->nalloc) {
-                size_t new_alloc;       /* New allocation number */
-                H5HG_obj_t *new_obj;	/* New array of object descriptions */
+            if (idx >= heap->nalloc) {
+                size_t      new_alloc; /* New allocation number */
+                H5HG_obj_t *new_obj;   /* New array of object descriptions */
 
                 /* Determine the new number of objects to index */
                 new_alloc = MAX(heap->nalloc * 2, (idx + 1));
                 HDassert(idx < new_alloc);
 
                 /* Reallocate array of objects */
-                if(NULL == (new_obj = H5FL_SEQ_REALLOC(H5HG_obj_t, heap->obj, new_alloc)))
+                if (NULL == (new_obj = H5FL_SEQ_REALLOC(H5HG_obj_t, heap->obj, new_alloc)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
                 /* Clear newly allocated space */
@@ -209,39 +200,39 @@ H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
 
                 /* Update heap information */
                 heap->nalloc = new_alloc;
-                heap->obj = new_obj;
+                heap->obj    = new_obj;
                 HDassert(heap->nalloc > heap->nused);
             } /* end if */
 
-	    UINT16DECODE(p, heap->obj[idx].nrefs);
-	    p += 4; /*reserved*/
-	    H5F_DECODE_LENGTH(f, p, heap->obj[idx].size);
-	    heap->obj[idx].begin = begin;
-
-	    /*
-	     * The total storage size includes the size of the object header
-	     * and is zero padded so the next object header is properly
-	     * aligned. The entire obj array was calloc'ed, so no need to zero
-	     * the space here. The last bit of space is the free space object
-	     * whose size is never padded and already includes the object
-	     * header.
-	     */
-	    if(idx > 0) {
-		need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(heap->obj[idx].size);
-
-                if(idx > max_idx)
+            UINT16DECODE(p, heap->obj[idx].nrefs);
+            p += 4; /*reserved*/
+            H5F_DECODE_LENGTH(f, p, heap->obj[idx].size);
+            heap->obj[idx].begin = begin;
+
+            /*
+             * The total storage size includes the size of the object header
+             * and is zero padded so the next object header is properly
+             * aligned. The entire obj array was calloc'ed, so no need to zero
+             * the space here. The last bit of space is the free space object
+             * whose size is never padded and already includes the object
+             * header.
+             */
+            if (idx > 0) {
+                need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(heap->obj[idx].size);
+
+                if (idx > max_idx)
                     max_idx = idx;
-	    } /* end if */
+            } /* end if */
             else
-		need = heap->obj[idx].size;
-	    p = begin + need;
-	} /* end else */
-    } /* end while */
+                need = heap->obj[idx].size;
+            p = begin + need;
+        } /* end else */
+    }     /* end while */
     HDassert(p == heap->chunk + heap->size);
     HDassert(H5HG_ISALIGNED(heap->obj[0].size));
 
     /* Set the next index value to use */
-    if(max_idx > 0)
+    if (max_idx > 0)
         heap->nused = max_idx + 1;
     else
         heap->nused = 1;
@@ -249,20 +240,19 @@ H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
     HDassert(max_idx < heap->nused);
 
     /* Add the new heap to the CWFS list for the file */
-    if(H5F_cwfs_add(f, heap) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "unable to add global heap collection to file's CWFS")
+    if (H5F_cwfs_add(f, heap) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "unable to add global heap collection to file's CWFS")
 
     ret_value = heap;
 
 done:
-    if(!ret_value && heap)
-        if(H5HG_free(heap) < 0)
-	    HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, NULL, "unable to destroy global heap collection")
+    if (!ret_value && heap)
+        if (H5HG_free(heap) < 0)
+            HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, NULL, "unable to destroy global heap collection")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HG_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_flush
  *
@@ -277,9 +267,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HG_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HG_heap_t *heap, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5HG_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HG_heap_t *heap,
+           unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -289,21 +280,20 @@ H5HG_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HG_heap_t *
     HDassert(H5F_addr_eq(addr, heap->addr));
     HDassert(heap);
 
-    if(heap->cache_info.is_dirty) {
-	if(H5F_block_write(f, H5FD_MEM_GHEAP, addr, heap->size, dxpl_id, heap->chunk) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write global heap collection to file")
-	heap->cache_info.is_dirty = FALSE;
+    if (heap->cache_info.is_dirty) {
+        if (H5F_block_write(f, H5FD_MEM_GHEAP, addr, heap->size, dxpl_id, heap->chunk) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write global heap collection to file")
+        heap->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5HG_dest(f, heap) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy global heap collection")
+    if (destroy)
+        if (H5HG_dest(f, heap) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy global heap collection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HG_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_dest
  *
@@ -319,7 +309,7 @@ done:
 static herr_t
 H5HG_dest(H5F_t *f, H5HG_heap_t *heap)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -333,22 +323,21 @@ H5HG_dest(H5F_t *f, H5HG_heap_t *heap)
     HDassert(!heap->cache_info.free_file_space_on_destroy || H5F_addr_defined(heap->cache_info.addr));
 
     /* Check for freeing file space for globalheap */
-    if(heap->cache_info.free_file_space_on_destroy) {
+    if (heap->cache_info.free_file_space_on_destroy) {
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_GHEAP, H5AC_dxpl_id, heap->cache_info.addr, (hsize_t)heap->size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_GHEAP, H5AC_dxpl_id, heap->cache_info.addr, (hsize_t)heap->size) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free global heap")
     } /* end if */
 
     /* Destroy global heap collection */
-    if(H5HG_free(heap) < 0)
+    if (H5HG_free(heap) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy global heap collection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HG_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_clear
  *
@@ -374,15 +363,14 @@ H5HG_clear(H5F_t *f, H5HG_heap_t *heap, hbool_t destroy)
     /* Mark heap as clean */
     heap->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5HG_dest(f, heap) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy global heap collection")
+    if (destroy)
+        if (H5HG_dest(f, heap) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy global heap collection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HG_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_size
  *
@@ -410,4 +398,3 @@ H5HG_size(const H5F_t H5_ATTR_UNUSED *f, const H5HG_heap_t *heap, size_t *size_p
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HG_size() */
-
diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c
index 06765eb..885f9cf 100644
--- a/src/H5HGdbg.c
+++ b/src/H5HGdbg.c
@@ -21,54 +21,45 @@
 /* Module Setup */
 /****************/
 
-#define H5HG_PACKAGE		/*suppress error about including H5HGpkg	  */
-
+#define H5HG_PACKAGE /*suppress error about including H5HGpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		        */
-#include "H5HGpkg.h"		/* Global heaps				*/
-#include "H5Iprivate.h"		/* ID Functions		                */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		        */
+#include "H5HGpkg.h"     /* Global heaps				*/
+#include "H5Iprivate.h"  /* ID Functions		                */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_debug
  *
@@ -83,90 +74,78 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
-	  int fwidth)
+H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    unsigned		u, nused, maxobj;
-    unsigned		j, k;
-    H5HG_heap_t		*h = NULL;
-    uint8_t		*p = NULL;
-    herr_t              ret_value = SUCCEED;       /* Return value */
+    unsigned     u, nused, maxobj;
+    unsigned     j, k;
+    H5HG_heap_t *h         = NULL;
+    uint8_t *    p         = NULL;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* check arguments */
     HDassert(f);
-    HDassert(H5F_addr_defined (addr));
+    HDassert(H5F_addr_defined(addr));
     HDassert(stream);
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    if(NULL == (h = H5HG_protect(f, dxpl_id, addr, H5AC_READ)))
+    if (NULL == (h = H5HG_protect(f, dxpl_id, addr, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap collection");
 
     HDfprintf(stream, "%*sGlobal Heap Collection...\n", indent, "");
-    HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
-	    "Dirty:",
-	    (int)(h->cache_info.is_dirty));
+    HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, "Dirty:", (int)(h->cache_info.is_dirty));
     HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-	    "Total collection size in file:",
-	    (unsigned long)(h->size));
+              "Total collection size in file:", (unsigned long)(h->size));
 
-    for(u = 1, nused = 0, maxobj = 0; u < h->nused; u++)
-	if(h->obj[u].begin) {
-	    nused++;
-	    if (u>maxobj)
+    for (u = 1, nused = 0, maxobj = 0; u < h->nused; u++)
+        if (h->obj[u].begin) {
+            nused++;
+            if (u > maxobj)
                 maxobj = u;
-	}
-    HDfprintf(stream, "%*s%-*s %u/%lu/", indent, "", fwidth,
-	     "Objects defined/allocated/max:",
-	     nused,
-             (unsigned long)h->nalloc);
-    if(nused)
+        }
+    HDfprintf(stream, "%*s%-*s %u/%lu/", indent, "", fwidth, "Objects defined/allocated/max:", nused,
+              (unsigned long)h->nalloc);
+    if (nused)
         HDfprintf(stream, "%u\n", maxobj);
     else
         HDfprintf(stream, "NA\n");
 
-    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-	     "Free space:",
-	     (unsigned long)(h->obj[0].size));
+    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth, "Free space:", (unsigned long)(h->obj[0].size));
 
-    for(u = 1; u < h->nused; u++)
-	if(h->obj[u].begin) {
+    for (u = 1; u < h->nused; u++)
+        if (h->obj[u].begin) {
             char buf[64];
 
-	    HDsnprintf(buf, sizeof(buf), "Object %u", u);
-	    HDfprintf(stream, "%*s%s\n", indent, "", buf);
-	    HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MIN(fwidth - 3, 0),
-		     "Obffset in block:",
-		     (unsigned long)(h->obj[u].begin - h->chunk));
-	    HDfprintf(stream, "%*s%-*s %d\n", indent + 3, "", MIN(fwidth - 3, 0),
-		     "Reference count:",
-		     h->obj[u].nrefs);
-	    HDfprintf(stream, "%*s%-*s %lu/%lu\n", indent + 3, "",
-		     MIN(fwidth - 3, 0),
-		     "Size of object body:",
-		     (unsigned long)(h->obj[u].size),
-		     (unsigned long)H5HG_ALIGN(h->obj[u].size));
-	    p = h->obj[u].begin + H5HG_SIZEOF_OBJHDR(f);
-	    for(j = 0; j < h->obj[u].size; j += 16) {
-		HDfprintf(stream, "%*s%04u: ", indent + 6, "", j);
-		for(k = 0; k < 16; k++) {
-		    if(8 == k)
+            HDsnprintf(buf, sizeof(buf), "Object %u", u);
+            HDfprintf(stream, "%*s%s\n", indent, "", buf);
+            HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MIN(fwidth - 3, 0),
+                      "Obffset in block:", (unsigned long)(h->obj[u].begin - h->chunk));
+            HDfprintf(stream, "%*s%-*s %d\n", indent + 3, "", MIN(fwidth - 3, 0),
+                      "Reference count:", h->obj[u].nrefs);
+            HDfprintf(stream, "%*s%-*s %lu/%lu\n", indent + 3, "", MIN(fwidth - 3, 0),
+                      "Size of object body:", (unsigned long)(h->obj[u].size),
+                      (unsigned long)H5HG_ALIGN(h->obj[u].size));
+            p = h->obj[u].begin + H5HG_SIZEOF_OBJHDR(f);
+            for (j = 0; j < h->obj[u].size; j += 16) {
+                HDfprintf(stream, "%*s%04u: ", indent + 6, "", j);
+                for (k = 0; k < 16; k++) {
+                    if (8 == k)
                         HDfprintf(stream, " ");
-		    if(j + k < h->obj[u].size)
-			HDfprintf(stream, "%02x ", p[j + k]);
-		    else
-			HDfputs("   ", stream);
-		}
-		for(k = 0; k < 16 && j + k < h->obj[u].size; k++) {
-		    if(8 == k)
+                    if (j + k < h->obj[u].size)
+                        HDfprintf(stream, "%02x ", p[j + k]);
+                    else
+                        HDfputs("   ", stream);
+                }
+                for (k = 0; k < 16 && j + k < h->obj[u].size; k++) {
+                    if (8 == k)
                         HDfprintf(stream, " ");
-		    HDfputc(p[j + k]>' ' && p[j + k] <= '~' ? p[j + k] : '.', stream);
-		}
-		HDfprintf(stream, "\n");
-	    }
-	}
+                    HDfputc(p[j + k] > ' ' && p[j + k] <= '~' ? p[j + k] : '.', stream);
+                }
+                HDfprintf(stream, "\n");
+            }
+        }
 
 done:
     if (h && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, addr, h, H5AC__NO_FLAGS_SET) < 0)
@@ -174,4 +153,3 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HG_debug() */
-
diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h
index 5f20ed5..8c7239e 100644
--- a/src/H5HGpkg.h
+++ b/src/H5HGpkg.h
@@ -30,9 +30,8 @@
 #include "H5HGprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5FLprivate.h"	/* Free lists                           */
-
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5FLprivate.h" /* Free lists                           */
 
 /*****************************/
 /* Package Private Variables */
@@ -50,7 +49,6 @@ H5FL_SEQ_EXTERN(H5HG_obj_t);
 /* Declare extern the PQ free list to manage heap chunks */
 H5FL_BLK_EXTERN(gheap_chunk);
 
-
 /**************************/
 /* Package Private Macros */
 /**************************/
@@ -58,7 +56,7 @@ H5FL_BLK_EXTERN(gheap_chunk);
 /*
  * Global heap collection version.
  */
-#define H5HG_VERSION	1
+#define H5HG_VERSION 1
 
 /*
  * All global heap collections are at least this big.  This allows us to read
@@ -66,7 +64,7 @@ H5FL_BLK_EXTERN(gheap_chunk);
  * bytes of header to figure out the size.  If the heap is larger than this
  * then a second read gets the rest after we've decoded the header.
  */
-#define H5HG_MINSIZE	4096
+#define H5HG_MINSIZE 4096
 
 /*
  * Pad all global heap messages to a multiple of eight bytes so we can load
@@ -74,29 +72,29 @@ H5FL_BLK_EXTERN(gheap_chunk);
  * be sufficient for machines that have alignment constraints because our
  * largest data type is eight bytes.
  */
-#define H5HG_ALIGNMENT	8
-#define H5HG_ALIGN(X)	(H5HG_ALIGNMENT*(((X)+H5HG_ALIGNMENT-1)/H5HG_ALIGNMENT))
-#define H5HG_ISALIGNED(X) ((X)==H5HG_ALIGN(X))
+#define H5HG_ALIGNMENT    8
+#define H5HG_ALIGN(X)     (H5HG_ALIGNMENT * (((X) + H5HG_ALIGNMENT - 1) / H5HG_ALIGNMENT))
+#define H5HG_ISALIGNED(X) ((X) == H5HG_ALIGN(X))
 
 /*
  * The size of the collection header, always a multiple of the alignment so
  * that the stuff that follows the header is aligned.
  */
-#define H5HG_SIZEOF_HDR(f)						      \
-    (size_t)H5HG_ALIGN(4 +			/*magic number		*/ \
-                       1 +			/*version number	*/ \
-                       3 +			/*reserved		*/ \
-                       H5F_SIZEOF_SIZE(f))	/*collection size	*/
+#define H5HG_SIZEOF_HDR(f)                                                                                   \
+    (size_t) H5HG_ALIGN(4 +                 /*magic number		*/                                               \
+                        1 +                 /*version number	*/                                              \
+                        3 +                 /*reserved		*/                                                   \
+                        H5F_SIZEOF_SIZE(f)) /*collection size	*/
 
 /*
  * The overhead associated with each object in the heap, always a multiple of
  * the alignment so that the stuff that follows the header is aligned.
  */
-#define H5HG_SIZEOF_OBJHDR(f)						      \
-    (size_t)H5HG_ALIGN(2 +			/*object id number	*/ \
-                       2 +			/*reference count	*/ \
-                       4 +			/*reserved		*/ \
-                       H5F_SIZEOF_SIZE(f))	/*object data size	*/
+#define H5HG_SIZEOF_OBJHDR(f)                                                                                \
+    (size_t) H5HG_ALIGN(2 +                 /*object id number	*/                                            \
+                        2 +                 /*reference count	*/                                             \
+                        4 +                 /*reserved		*/                                                   \
+                        H5F_SIZEOF_SIZE(f)) /*object data size	*/
 
 /*
  * The initial guess for the number of messages in a collection.  We assume
@@ -105,36 +103,34 @@ H5FL_BLK_EXTERN(gheap_chunk);
  * some overhead and each message has some overhead.  The `+2' accounts for
  * rounding and for the free space object.
  */
-#define H5HG_NOBJS(f,z) ((((z)-H5HG_SIZEOF_HDR(f))/		      \
-                          H5HG_SIZEOF_OBJHDR(f)+2))
-
+#define H5HG_NOBJS(f, z) ((((z)-H5HG_SIZEOF_HDR(f)) / H5HG_SIZEOF_OBJHDR(f) + 2))
 
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
 typedef struct H5HG_obj_t {
-    int		nrefs;		/*reference count		*/
-    size_t		size;		/*total size of object		*/
-    uint8_t		*begin;		/*ptr to object into heap->chunk*/
+    int      nrefs; /*reference count		*/
+    size_t   size;  /*total size of object		*/
+    uint8_t *begin; /*ptr to object into heap->chunk*/
 } H5HG_obj_t;
 
 /* Forward declarations for fields */
 struct H5F_file_t;
 
 struct H5HG_heap_t {
-    H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
-                            /* first field in structure */
-    haddr_t		addr;		/*collection address		*/
-    size_t		size;		/*total size of collection	*/
-    uint8_t		*chunk;		/*the collection, incl. header	*/
-    size_t		nalloc;		/*numb object slots allocated	*/
-    size_t		nused;		/*number of slots used		*/
-                                        /* If this value is >65535 then all indices */
-                                        /* have been used at some time and the */
-                                        /* correct new index should be searched for */
-    struct H5F_file_t   *shared;        /* shared file */
-    H5HG_obj_t	*obj;		/*array of object descriptions	*/
+    H5AC_info_t cache_info;    /* Information for H5AC cache functions, _must_ be */
+                               /* first field in structure */
+    haddr_t  addr;             /*collection address		*/
+    size_t   size;             /*total size of collection	*/
+    uint8_t *chunk;            /*the collection, incl. header	*/
+    size_t   nalloc;           /*numb object slots allocated	*/
+    size_t   nused;            /*number of slots used		*/
+                               /* If this value is >65535 then all indices */
+                               /* have been used at some time and the */
+                               /* correct new index should be searched for */
+    struct H5F_file_t *shared; /* shared file */
+    H5HG_obj_t *       obj;    /*array of object descriptions	*/
 };
 
 /******************************/
@@ -144,4 +140,3 @@ H5_DLL herr_t H5HG_free(H5HG_heap_t *heap);
 H5_DLL H5HG_heap_t *H5HG_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw);
 
 #endif /* _H5HGpkg_H */
-
diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h
index 497dcc8..1c80efa 100644
--- a/src/H5HGprivate.h
+++ b/src/H5HGprivate.h
@@ -22,42 +22,39 @@
 #include "H5HGpublic.h"
 
 /* Private headers needed by this file. */
-#include "H5Fprivate.h"		/* File access				*/
+#include "H5Fprivate.h" /* File access				*/
 
 /* Information to locate object in global heap */
 typedef struct H5HG_t {
-    haddr_t		addr;		/*address of collection		*/
-    size_t		idx;		/*object ID within collection	*/
+    haddr_t addr; /*address of collection		*/
+    size_t  idx;  /*object ID within collection	*/
 } H5HG_t;
 
 /* Typedef for heap in memory (defined in H5HGpkg.h) */
 typedef struct H5HG_heap_t H5HG_heap_t;
 
-
 /*
  * Limit global heap collections to the some reasonable size.  This is
  * fairly arbitrary, but needs to be small enough that no more than H5HG_MAXIDX
  * objects will be allocated from a single heap.
  */
-#define H5HG_MAXSIZE	65536
+#define H5HG_MAXSIZE 65536
 
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5HG_PACKAGE
-#define H5HG_ADDR(H)            ((H)->addr)
-#define H5HG_SIZE(H)            ((H)->size)
-#define H5HG_FREE_SIZE(H)       ((H)->obj[0].size)
+#define H5HG_ADDR(H)      ((H)->addr)
+#define H5HG_SIZE(H)      ((H)->size)
+#define H5HG_FREE_SIZE(H) ((H)->obj[0].size)
 #else /* H5HG_PACKAGE */
-#define H5HG_ADDR(H)            (H5HG_get_addr(H))
-#define H5HG_SIZE(H)            (H5HG_get_size(H))
-#define H5HG_FREE_SIZE(H)       (H5HG_get_free_size(H))
+#define H5HG_ADDR(H)      (H5HG_get_addr(H))
+#define H5HG_SIZE(H)      (H5HG_get_size(H))
+#define H5HG_FREE_SIZE(H) (H5HG_get_free_size(H))
 #endif /* H5HG_PACKAGE */
 
-
 /* Main global heap routines */
-H5_DLL herr_t H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj,
-			   H5HG_t *hobj/*out*/);
-H5_DLL void *H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object, size_t *buf_size/*out*/);
-H5_DLL int H5HG_link(H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust);
+H5_DLL herr_t H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj /*out*/);
+H5_DLL void * H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object, size_t *buf_size /*out*/);
+H5_DLL int    H5HG_link(H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust);
 H5_DLL herr_t H5HG_remove(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj);
 
 /* Support routines */
@@ -65,12 +62,10 @@ H5_DLL herr_t H5HG_extend(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t need);
 
 /* Query routines */
 H5_DLL haddr_t H5HG_get_addr(const H5HG_heap_t *h);
-H5_DLL size_t H5HG_get_size(const H5HG_heap_t *h);
-H5_DLL size_t H5HG_get_free_size(const H5HG_heap_t *h);
+H5_DLL size_t  H5HG_get_size(const H5HG_heap_t *h);
+H5_DLL size_t  H5HG_get_free_size(const H5HG_heap_t *h);
 
 /* Debugging functions */
-H5_DLL herr_t H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
-			  int fwidth);
+H5_DLL herr_t H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
 
 #endif /* _H5HGprivate_H */
-
diff --git a/src/H5HGquery.c b/src/H5HGquery.c
index 919deda..9e4862d 100644
--- a/src/H5HGquery.c
+++ b/src/H5HGquery.c
@@ -23,53 +23,43 @@
 /* Module Setup */
 /****************/
 
-#define H5HG_PACKAGE		/*suppress error about including H5HGpkg	  */
-
+#define H5HG_PACKAGE /*suppress error about including H5HGpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HGpkg.h"		/* Global heaps				*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5HGpkg.h"    /* Global heaps				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_get_addr
  *
@@ -93,7 +83,6 @@ H5HG_get_addr(const H5HG_heap_t *heap)
     FUNC_LEAVE_NOAPI(heap->addr)
 } /* H5HG_get_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_get_size
  *
@@ -117,7 +106,6 @@ H5HG_get_size(const H5HG_heap_t *heap)
     FUNC_LEAVE_NOAPI(heap->size)
 } /* H5HG_get_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HG_get_free_size
  *
@@ -140,4 +128,3 @@ H5HG_get_free_size(const H5HG_heap_t *heap)
 
     FUNC_LEAVE_NOAPI(heap->obj[0].size)
 } /* H5HG_get_free_size() */
-
diff --git a/src/H5HL.c b/src/H5HL.c
index 9bd1e12..cdb1416 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -27,43 +27,37 @@
 /* Module Setup */
 /****************/
 
-#define H5HL_PACKAGE		/* Suppress error about including H5HLpkg */
-
+#define H5HL_PACKAGE /* Suppress error about including H5HLpkg */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"         /* File access				*/
-#include "H5HLpkg.h"		/* Local Heaps				*/
-#include "H5MFprivate.h"	/* File memory management		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5HLpkg.h"     /* Local Heaps				*/
+#include "H5MFprivate.h" /* File memory management		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-#define H5HL_MIN_HEAP   128             /* Minimum size to reduce heap buffer to */
-
+#define H5HL_MIN_HEAP 128 /* Minimum size to reduce heap buffer to */
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static H5HL_free_t *H5HL_remove_free(H5HL_t *heap, H5HL_free_t *fl);
-static herr_t H5HL_minimize_heap_space(H5F_t *f, hid_t dxpl_id, H5HL_t *heap);
-
+static herr_t       H5HL_minimize_heap_space(H5F_t *f, hid_t dxpl_id, H5HL_t *heap);
 
 /*********************/
 /* Package Variables */
@@ -75,18 +69,14 @@ H5FL_DEFINE(H5HL_free_t);
 /* Declare a PQ free list to manage the heap chunk information */
 H5FL_BLK_DEFINE(lheap_chunk);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_create
  *
@@ -109,12 +99,12 @@ H5FL_BLK_DEFINE(lheap_chunk);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr_p/*out*/)
+H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr_p /*out*/)
 {
-    H5HL_t	*heap = NULL;           /* Heap created */
-    H5HL_prfx_t *prfx = NULL;           /* Heap prefix */
-    hsize_t	total_size;		/* Total heap size on disk	*/
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5HL_t *     heap = NULL;         /* Heap created */
+    H5HL_prfx_t *prfx = NULL;         /* Heap prefix */
+    hsize_t      total_size;          /* Total heap size on disk	*/
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -123,73 +113,72 @@ H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr_p/*out*/)
     HDassert(addr_p);
 
     /* Adjust size hint as necessary */
-    if(size_hint && size_hint < H5HL_SIZEOF_FREE(f))
-	size_hint = H5HL_SIZEOF_FREE(f);
+    if (size_hint && size_hint < H5HL_SIZEOF_FREE(f))
+        size_hint = H5HL_SIZEOF_FREE(f);
     size_hint = H5HL_ALIGN(size_hint);
 
     /* Allocate new heap structure */
-    if(NULL == (heap = H5HL_new(H5F_SIZEOF_SIZE(f), H5F_SIZEOF_ADDR(f), H5HL_SIZEOF_HDR(f))))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate new heap struct")
+    if (NULL == (heap = H5HL_new(H5F_SIZEOF_SIZE(f), H5F_SIZEOF_ADDR(f), H5HL_SIZEOF_HDR(f))))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate new heap struct")
 
     /* Allocate file space */
     total_size = heap->prfx_size + size_hint;
-    if(HADDR_UNDEF == (heap->prfx_addr = H5MF_alloc(f, H5FD_MEM_LHEAP, dxpl_id, total_size)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "unable to allocate file memory")
+    if (HADDR_UNDEF == (heap->prfx_addr = H5MF_alloc(f, H5FD_MEM_LHEAP, dxpl_id, total_size)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "unable to allocate file memory")
 
     /* Initialize info */
     heap->single_cache_obj = TRUE;
-    heap->dblk_addr = heap->prfx_addr + (hsize_t)heap->prfx_size;
-    heap->dblk_size = size_hint;
-    if(size_hint)
-        if(NULL == (heap->dblk_image = H5FL_BLK_CALLOC(lheap_chunk, size_hint)))
+    heap->dblk_addr        = heap->prfx_addr + (hsize_t)heap->prfx_size;
+    heap->dblk_size        = size_hint;
+    if (size_hint)
+        if (NULL == (heap->dblk_image = H5FL_BLK_CALLOC(lheap_chunk, size_hint)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
     /* free list */
-    if(size_hint) {
-	if(NULL == (heap->freelist = H5FL_MALLOC(H5HL_free_t)))
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
-	heap->freelist->offset = 0;
-	heap->freelist->size = size_hint;
-	heap->freelist->prev = heap->freelist->next = NULL;
-        heap->free_block = 0;
+    if (size_hint) {
+        if (NULL == (heap->freelist = H5FL_MALLOC(H5HL_free_t)))
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
+        heap->freelist->offset = 0;
+        heap->freelist->size   = size_hint;
+        heap->freelist->prev = heap->freelist->next = NULL;
+        heap->free_block                            = 0;
     } /* end if */
     else {
-	heap->freelist = NULL;
+        heap->freelist   = NULL;
         heap->free_block = H5HL_FREE_NULL;
     } /* end else */
 
     /* Allocate the heap prefix */
-    if(NULL == (prfx = H5HL_prfx_new(heap)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
+    if (NULL == (prfx = H5HL_prfx_new(heap)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
     /* Add to cache */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to cache local heap prefix")
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to cache local heap prefix")
 
     /* Set address to return */
     *addr_p = heap->prfx_addr;
 
 done:
-    if(ret_value < 0) {
-        if(prfx) {
-            if(H5HL_prfx_dest(prfx) < 0)
+    if (ret_value < 0) {
+        if (prfx) {
+            if (H5HL_prfx_dest(prfx) < 0)
                 HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix")
         } /* end if */
         else {
-            if(heap) {
-                if(H5F_addr_defined(heap->prfx_addr))
-                    if(H5MF_xfree(f, H5FD_MEM_LHEAP, dxpl_id, heap->prfx_addr, total_size) < 0)
+            if (heap) {
+                if (H5F_addr_defined(heap->prfx_addr))
+                    if (H5MF_xfree(f, H5FD_MEM_LHEAP, dxpl_id, heap->prfx_addr, total_size) < 0)
                         HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "can't release heap data?")
-                if(H5HL_dest(heap) < 0)
+                if (H5HL_dest(heap) < 0)
                     HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap")
             } /* end if */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_dblk_realloc
  *
@@ -207,11 +196,11 @@ done:
 static herr_t
 H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
 {
-    H5HL_dblk_t *dblk;                  /* Local heap data block */
-    haddr_t old_addr;                   /* Old location of heap data block */
-    haddr_t new_addr;                   /* New location of heap data block */
-    size_t old_heap_size;               /* Old size of heap data block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_dblk_t *dblk;                /* Local heap data block */
+    haddr_t      old_addr;            /* Old location of heap data block */
+    haddr_t      new_addr;            /* New location of heap data block */
+    size_t       old_heap_size;       /* Old size of heap data block */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -220,15 +209,15 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
     HDassert(new_heap_size > 0);
 
     /* Release old space on disk */
-    old_addr = heap->dblk_addr;
+    old_addr      = heap->dblk_addr;
     old_heap_size = heap->dblk_size;
     H5_CHECK_OVERFLOW(old_heap_size, size_t, hsize_t);
-    if(H5MF_xfree(f, H5FD_MEM_LHEAP, dxpl_id, old_addr, (hsize_t)old_heap_size) < 0)
+    if (H5MF_xfree(f, H5FD_MEM_LHEAP, dxpl_id, old_addr, (hsize_t)old_heap_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "can't release old heap data?")
 
     /* Allocate new space on disk */
     H5_CHECK_OVERFLOW(new_heap_size, size_t, hsize_t);
-    if(HADDR_UNDEF == (new_addr = H5MF_alloc(f, H5FD_MEM_LHEAP, dxpl_id, (hsize_t)new_heap_size)))
+    if (HADDR_UNDEF == (new_addr = H5MF_alloc(f, H5FD_MEM_LHEAP, dxpl_id, (hsize_t)new_heap_size)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "unable to allocate file space for heap")
 
     /* Update heap info*/
@@ -236,15 +225,15 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
     heap->dblk_size = new_heap_size;
 
     /* Check if heap data block actually moved in the file */
-    if(H5F_addr_eq(old_addr, new_addr)) {
+    if (H5F_addr_eq(old_addr, new_addr)) {
         /* Check if heap data block is contiguous w/prefix */
-        if(heap->single_cache_obj) {
+        if (heap->single_cache_obj) {
             /* Sanity check */
             HDassert(H5F_addr_eq(heap->prfx_addr + heap->prfx_size, old_addr));
             HDassert(heap->prfx);
 
             /* Resize the heap prefix in the cache */
-            if(H5AC_resize_entry(heap->prfx, (size_t)(heap->prfx_size + new_heap_size)) < 0)
+            if (H5AC_resize_entry(heap->prfx, (size_t)(heap->prfx_size + new_heap_size)) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap in cache")
         } /* end if */
         else {
@@ -253,24 +242,24 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
             HDassert(heap->dblk);
 
             /* Resize the heap data block in the cache */
-            if(H5AC_resize_entry(heap->dblk, (size_t)new_heap_size) < 0)
+            if (H5AC_resize_entry(heap->dblk, (size_t)new_heap_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap in cache")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Check if heap data block was contiguous w/prefix previously */
-        if(heap->single_cache_obj) {
+        if (heap->single_cache_obj) {
             /* Create new heap data block */
-            if(NULL == (dblk = H5HL_dblk_new(heap)))
+            if (NULL == (dblk = H5HL_dblk_new(heap)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "unable to allocate local heap data block")
 
             /* Resize current heap prefix */
             heap->prfx_size = H5HL_SIZEOF_HDR(f);
-            if(H5AC_resize_entry(heap->prfx, (size_t)heap->prfx_size) < 0)
+            if (H5AC_resize_entry(heap->prfx, (size_t)heap->prfx_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap prefix in cache")
 
             /* Insert data block into cache (pinned) */
-            if(H5AC_insert_entry(f, dxpl_id, H5AC_LHEAP_DBLK, new_addr, dblk, H5AC__PIN_ENTRY_FLAG) < 0)
+            if (H5AC_insert_entry(f, dxpl_id, H5AC_LHEAP_DBLK, new_addr, dblk, H5AC__PIN_ENTRY_FLAG) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to cache local heap data block")
             dblk = NULL;
 
@@ -282,17 +271,17 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
             /* (ignore [unlikely] case where heap data block ends up
              *      contiguous w/heap prefix again.
              */
-            if(H5AC_resize_entry(heap->dblk, (size_t)new_heap_size) < 0)
+            if (H5AC_resize_entry(heap->dblk, (size_t)new_heap_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap data block in cache")
 
             /* Relocate the heap data block in the cache */
-            if(H5AC_move_entry(f, H5AC_LHEAP_DBLK, old_addr, new_addr) < 0)
+            if (H5AC_move_entry(f, H5AC_LHEAP_DBLK, old_addr, new_addr) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move heap data block in cache")
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Restore old heap address & size */
         heap->dblk_addr = old_addr;
         heap->dblk_size = old_heap_size;
@@ -301,7 +290,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_dblk_realloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5HL_minimize_heap_space
  *
@@ -320,8 +308,8 @@ done:
 static herr_t
 H5HL_minimize_heap_space(H5F_t *f, hid_t dxpl_id, H5HL_t *heap)
 {
-    size_t new_heap_size = heap->dblk_size;     /* New size of heap */
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    size_t new_heap_size = heap->dblk_size; /* New size of heap */
+    herr_t ret_value     = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -334,14 +322,14 @@ H5HL_minimize_heap_space(H5F_t *f, hid_t dxpl_id, H5HL_t *heap)
      * eliminating free blocks at the tail of the buffer before flushing the
      * buffer out.
      */
-    if(heap->freelist) {
-        H5HL_free_t    *tmp_fl;
-        H5HL_free_t    *last_fl = NULL;
+    if (heap->freelist) {
+        H5HL_free_t *tmp_fl;
+        H5HL_free_t *last_fl = NULL;
 
         /* Search for a free block at the end of the buffer */
-        for(tmp_fl = heap->freelist; tmp_fl; tmp_fl = tmp_fl->next)
+        for (tmp_fl = heap->freelist; tmp_fl; tmp_fl = tmp_fl->next)
             /* Check if the end of this free block is at the end of the buffer */
-            if(tmp_fl->offset + tmp_fl->size == heap->dblk_size) {
+            if (tmp_fl->offset + tmp_fl->size == heap->dblk_size) {
                 last_fl = tmp_fl;
                 break;
             } /* end if */
@@ -350,28 +338,28 @@ H5HL_minimize_heap_space(H5F_t *f, hid_t dxpl_id, H5HL_t *heap)
          * Found free block at the end of the buffer, decide what to do
          * about it
          */
-        if(last_fl) {
+        if (last_fl) {
             /*
              * If the last free block's size is more than half the memory
              * buffer size (and the memory buffer is larger than the
              * minimum size), reduce or eliminate it.
              */
-            if(last_fl->size >= (heap->dblk_size / 2) && heap->dblk_size > H5HL_MIN_HEAP) {
+            if (last_fl->size >= (heap->dblk_size / 2) && heap->dblk_size > H5HL_MIN_HEAP) {
                 /*
                  * Reduce size of buffer until it's too small or would
                  * eliminate the free block
                  */
-                while(new_heap_size > H5HL_MIN_HEAP &&
-                        new_heap_size >= (last_fl->offset + H5HL_SIZEOF_FREE(f)))
+                while (new_heap_size > H5HL_MIN_HEAP &&
+                       new_heap_size >= (last_fl->offset + H5HL_SIZEOF_FREE(f)))
                     new_heap_size /= 2;
 
                 /*
                  * Check if reducing the memory buffer size would
                  * eliminate the free block
                  */
-                if(new_heap_size < (last_fl->offset + H5HL_SIZEOF_FREE(f))) {
+                if (new_heap_size < (last_fl->offset + H5HL_SIZEOF_FREE(f))) {
                     /* Check if this is the only block on the free list */
-                    if(last_fl->prev == NULL && last_fl->next == NULL) {
+                    if (last_fl->prev == NULL && last_fl->next == NULL) {
                         /* Double the new memory size */
                         new_heap_size *= 2;
 
@@ -390,7 +378,7 @@ H5HL_minimize_heap_space(H5F_t *f, hid_t dxpl_id, H5HL_t *heap)
                         /* Eliminate the free block from the list */
                         last_fl = H5HL_remove_free(heap, last_fl);
                     } /* end else */
-                } /* end if */
+                }     /* end if */
                 else {
                     /* Truncate the free block */
                     last_fl->size = H5HL_ALIGN(new_heap_size - last_fl->offset);
@@ -398,24 +386,24 @@ H5HL_minimize_heap_space(H5F_t *f, hid_t dxpl_id, H5HL_t *heap)
                     HDassert(last_fl->size >= H5HL_SIZEOF_FREE(f));
                     HDassert(last_fl->size == H5HL_ALIGN(last_fl->size));
                 } /* end else */
-            } /* end if */
-        } /* end if */
-    } /* end if */
+            }     /* end if */
+        }         /* end if */
+    }             /* end if */
 
     /*
      * If the heap grew smaller than disk storage then move the
      * data segment of the heap to another contiguous block of disk
      * storage.
      */
-    if(new_heap_size != heap->dblk_size) {
-	HDassert(new_heap_size < heap->dblk_size);
+    if (new_heap_size != heap->dblk_size) {
+        HDassert(new_heap_size < heap->dblk_size);
 
         /* Resize the memory buffer */
-        if(NULL == (heap->dblk_image = H5FL_BLK_REALLOC(lheap_chunk, heap->dblk_image, new_heap_size)))
+        if (NULL == (heap->dblk_image = H5FL_BLK_REALLOC(lheap_chunk, heap->dblk_image, new_heap_size)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
         /* Reallocate data block in file */
-        if(H5HL_dblk_realloc(f, dxpl_id, heap, new_heap_size) < 0)
+        if (H5HL_dblk_realloc(f, dxpl_id, heap, new_heap_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "reallocating data block failed")
     } /* end if */
 
@@ -423,7 +411,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HL_minimize_heap_space() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5HL_protect
  *
@@ -441,13 +428,13 @@ done:
 H5HL_t *
 H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
 {
-    H5HL_cache_prfx_ud_t prfx_udata; /* User data for protecting local heap prefix */
-    H5HL_prfx_t *prfx = NULL;   /* Local heap prefix */
-    H5HL_dblk_t *dblk = NULL;   /* Local heap data block */
-    H5HL_t *heap;               /* Heap data structure */
-    unsigned prfx_cache_flags = H5AC__NO_FLAGS_SET;         /* Cache flags for unprotecting prefix entry */
-    unsigned dblk_cache_flags = H5AC__NO_FLAGS_SET;         /* Cache flags for unprotecting data block entry */
-    H5HL_t *ret_value;          /* Return value */
+    H5HL_cache_prfx_ud_t prfx_udata;                /* User data for protecting local heap prefix */
+    H5HL_prfx_t *        prfx = NULL;               /* Local heap prefix */
+    H5HL_dblk_t *        dblk = NULL;               /* Local heap data block */
+    H5HL_t *             heap;                      /* Heap data structure */
+    unsigned prfx_cache_flags = H5AC__NO_FLAGS_SET; /* Cache flags for unprotecting prefix entry */
+    unsigned dblk_cache_flags = H5AC__NO_FLAGS_SET; /* Cache flags for unprotecting data block entry */
+    H5HL_t * ret_value;                             /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -458,11 +445,11 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
     /* Construct the user data for protect callback */
     prfx_udata.sizeof_size = H5F_SIZEOF_SIZE(f);
     prfx_udata.sizeof_addr = H5F_SIZEOF_ADDR(f);
-    prfx_udata.prfx_addr = addr;
+    prfx_udata.prfx_addr   = addr;
     prfx_udata.sizeof_prfx = H5HL_SIZEOF_HDR(f);
 
     /* Protect the local heap prefix */
-    if(NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, &prfx_udata, rw)))
+    if (NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, &prfx_udata, rw)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to load heap prefix")
 
     /* Get the pointer to the heap */
@@ -470,9 +457,9 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
 
     /* Check if the heap is already pinned in memory */
     /* (for re-entrant situation) */
-    if(heap->prots == 0) {
+    if (heap->prots == 0) {
         /* Check if heap has separate data block */
-        if(heap->single_cache_obj) {
+        if (heap->single_cache_obj) {
             /* Set the flag for pinning the prefix when unprotecting it */
             prfx_cache_flags |= H5AC__PIN_ENTRY_FLAG;
         } /* end if */
@@ -480,21 +467,22 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
             H5HL_cache_dblk_ud_t dblk_udata; /* User data for protecting local heap data block */
 
             /* Construct the user data for protect callback */
-            dblk_udata.heap = heap;
+            dblk_udata.heap   = heap;
             dblk_udata.loaded = FALSE;
 
             /* Protect the local heap data block */
-            if(NULL == (dblk = (H5HL_dblk_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, &dblk_udata, rw)))
+            if (NULL == (dblk = (H5HL_dblk_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr,
+                                                            &dblk_udata, rw)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to load heap data block")
 
             /* Pin the prefix, if the data block was loaded from file */
-            if(dblk_udata.loaded)
+            if (dblk_udata.loaded)
                 prfx_cache_flags |= H5AC__PIN_ENTRY_FLAG;
 
             /* Set the flag for pinning the data block when unprotecting it */
             dblk_cache_flags |= H5AC__PIN_ENTRY_FLAG;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Increment # of times heap is protected */
     heap->prots++;
@@ -504,17 +492,16 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
 
 done:
     /* Release the prefix from the cache, now pinned */
-    if(prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, prfx_cache_flags) < 0)
+    if (prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, prfx_cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release local heap prefix")
 
     /* Release the data block from the cache, now pinned */
-    if(dblk && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, dblk, dblk_cache_flags) < 0)
+    if (dblk && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, dblk, dblk_cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release local heap data block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5HL_offset_into
  *
@@ -539,15 +526,14 @@ H5HL_offset_into(const H5HL_t *heap, size_t offset)
 
     /* Sanity check */
     HDassert(heap);
-    if(offset >= heap->dblk_size)
-       HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, NULL, "unable to offset into local heap data block")
+    if (offset >= heap->dblk_size)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, NULL, "unable to offset into local heap data block")
     ret_value = heap->dblk_image + offset;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_offset_into() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5HL_unprotect
  *
@@ -565,7 +551,7 @@ done:
 herr_t
 H5HL_unprotect(H5HL_t *heap)
 {
-    herr_t  ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -576,11 +562,11 @@ H5HL_unprotect(H5HL_t *heap)
     heap->prots--;
 
     /* Check for last unprotection of heap */
-    if(heap->prots == 0) {
+    if (heap->prots == 0) {
         /* Check for separate heap data block */
-        if(heap->single_cache_obj) {
+        if (heap->single_cache_obj) {
             /* Mark local heap prefix as evictable again */
-            if(H5AC_unpin_entry(heap->prfx) < 0)
+            if (H5AC_unpin_entry(heap->prfx) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin local heap data block")
         } /* end if */
         else {
@@ -589,16 +575,15 @@ H5HL_unprotect(H5HL_t *heap)
 
             /* Mark local heap data block as evictable again */
             /* (data block still pins prefix) */
-            if(H5AC_unpin_entry(heap->dblk) < 0)
+            if (H5AC_unpin_entry(heap->dblk) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin local heap data block")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_unprotect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_remove_free
  *
@@ -618,18 +603,17 @@ H5HL_remove_free(H5HL_t *heap, H5HL_free_t *fl)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(fl->prev)
+    if (fl->prev)
         fl->prev->next = fl->next;
-    if(fl->next)
+    if (fl->next)
         fl->next->prev = fl->prev;
 
-    if(!fl->prev)
+    if (!fl->prev)
         heap->freelist = fl->next;
 
     FUNC_LEAVE_NOAPI((H5HL_free_t *)H5FL_FREE(H5HL_free_t, fl))
 } /* end H5HL_remove_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_dirty
  *
@@ -647,7 +631,7 @@ H5HL_remove_free(H5HL_t *heap, H5HL_free_t *fl)
 static herr_t
 H5HL_dirty(H5HL_t *heap)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -656,23 +640,22 @@ H5HL_dirty(H5HL_t *heap)
     HDassert(heap->prfx);
 
     /* Mark heap data block as dirty, if there is one */
-    if(!heap->single_cache_obj) {
+    if (!heap->single_cache_obj) {
         /* Sanity check */
         HDassert(heap->dblk);
 
-        if(H5AC_mark_entry_dirty(heap->dblk) < 0)
+        if (H5AC_mark_entry_dirty(heap->dblk) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark heap data block as dirty")
     } /* end if */
 
     /* Mark heap prefix as dirty */
-    if(H5AC_mark_entry_dirty(heap->prfx) < 0)
+    if (H5AC_mark_entry_dirty(heap->prfx) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark heap prefix as dirty")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_dirty() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_insert
  *
@@ -690,11 +673,11 @@ done:
 size_t
 H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *buf)
 {
-    H5HL_free_t	*fl = NULL, *last_fl = NULL;
-    size_t	offset = 0;
-    size_t	need_size;
-    hbool_t	found;
-    size_t	ret_value;      /* Return value */
+    H5HL_free_t *fl = NULL, *last_fl = NULL;
+    size_t       offset = 0;
+    size_t       need_size;
+    hbool_t      found;
+    size_t       ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(UFAIL)
 
@@ -710,7 +693,7 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
      *  so we just accept that an extra flush of the heap info could occur
      *  if an error occurs -QAK)
      */
-    if(H5HL_dirty(heap) < 0)
+    if (H5HL_dirty(heap) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, UFAIL, "unable to mark heap as dirty")
 
     /*
@@ -724,27 +707,28 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
      * Look for a free slot large enough for this object and which would
      * leave zero or at least H5G_SIZEOF_FREE bytes left over.
      */
-    for(fl = heap->freelist, found = FALSE; fl; fl = fl->next) {
-	if(fl->size > need_size &&
-                fl->size - need_size >= H5HL_SIZEOF_FREE(f)) {
-	    /* a big enough free block was found */
-	    offset = fl->offset;
-	    fl->offset += need_size;
-	    fl->size -= need_size;
-	    HDassert(fl->offset == H5HL_ALIGN(fl->offset));
-	    HDassert(fl->size == H5HL_ALIGN(fl->size));
-	    found = TRUE;
-	    break;
-	} else if(fl->size == need_size) {
-	    /* free block of exact size found */
-	    offset = fl->offset;
-	    fl = H5HL_remove_free(heap, fl);
-	    found = TRUE;
-	    break;
-	} else if(!last_fl || last_fl->offset < fl->offset) {
-	    /* track free space that's closest to end of heap */
-	    last_fl = fl;
-	}
+    for (fl = heap->freelist, found = FALSE; fl; fl = fl->next) {
+        if (fl->size > need_size && fl->size - need_size >= H5HL_SIZEOF_FREE(f)) {
+            /* a big enough free block was found */
+            offset = fl->offset;
+            fl->offset += need_size;
+            fl->size -= need_size;
+            HDassert(fl->offset == H5HL_ALIGN(fl->offset));
+            HDassert(fl->size == H5HL_ALIGN(fl->size));
+            found = TRUE;
+            break;
+        }
+        else if (fl->size == need_size) {
+            /* free block of exact size found */
+            offset = fl->offset;
+            fl     = H5HL_remove_free(heap, fl);
+            found  = TRUE;
+            break;
+        }
+        else if (!last_fl || last_fl->offset < fl->offset) {
+            /* track free space that's closest to end of heap */
+            last_fl = fl;
+        }
     } /* end for */
 
     /*
@@ -753,15 +737,15 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
      * can extend that free chunk.  Otherwise we'll have to make another
      * free chunk.  If the heap must expand, we double its size.
      */
-    if(found == FALSE) {
-        size_t	need_more;      /* How much more space we need */
-        size_t	new_dblk_size;  /* Final size of space allocated for heap data block */
-        size_t	old_dblk_size;  /* Previous size of space allocated for heap data block */
-        htri_t  was_extended;   /* Whether the local heap's data segment on disk was extended */
+    if (found == FALSE) {
+        size_t need_more;     /* How much more space we need */
+        size_t new_dblk_size; /* Final size of space allocated for heap data block */
+        size_t old_dblk_size; /* Previous size of space allocated for heap data block */
+        htri_t was_extended;  /* Whether the local heap's data segment on disk was extended */
 
         /* At least double the heap's size, making certain there's enough room
          * for the new object */
-	need_more = MAX(need_size, heap->dblk_size);
+        need_more = MAX(need_size, heap->dblk_size);
 
         /* If there is no last free block or it's not at the end of the heap,
          * and the amount of space to allocate is not big enough to include at
@@ -769,106 +753,105 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
          * space requested to just the amount of space needed.  (Generally
          * speaking, this only occurs when the heap is small -QAK)
          */
-	if(!(last_fl && last_fl->offset + last_fl->size == heap->dblk_size)
-                && (need_more < (need_size + H5HL_SIZEOF_FREE(f))))
+        if (!(last_fl && last_fl->offset + last_fl->size == heap->dblk_size) &&
+            (need_more < (need_size + H5HL_SIZEOF_FREE(f))))
             need_more = need_size;
 
-	new_dblk_size = heap->dblk_size + need_more;
-	HDassert(heap->dblk_size < new_dblk_size);
+        new_dblk_size = heap->dblk_size + need_more;
+        HDassert(heap->dblk_size < new_dblk_size);
         old_dblk_size = heap->dblk_size;
-	H5_CHECK_OVERFLOW(heap->dblk_size, size_t, hsize_t);
-	H5_CHECK_OVERFLOW(new_dblk_size, size_t, hsize_t);
+        H5_CHECK_OVERFLOW(heap->dblk_size, size_t, hsize_t);
+        H5_CHECK_OVERFLOW(new_dblk_size, size_t, hsize_t);
 
         /* Extend current heap if possible */
-	was_extended = H5MF_try_extend(f, dxpl_id, H5FD_MEM_LHEAP, heap->dblk_addr, (hsize_t)(heap->dblk_size), (hsize_t)need_more);
-        if(was_extended < 0)
+        was_extended = H5MF_try_extend(f, dxpl_id, H5FD_MEM_LHEAP, heap->dblk_addr,
+                                       (hsize_t)(heap->dblk_size), (hsize_t)need_more);
+        if (was_extended < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, UFAIL, "error trying to extend heap")
 
         /* Check if we extended the heap data block in file */
-        if(was_extended == TRUE) {
+        if (was_extended == TRUE) {
             /* Check for prefix & data block contiguous */
-            if(heap->single_cache_obj) {
+            if (heap->single_cache_obj) {
                 /* Resize prefix+data block */
-                if(H5AC_resize_entry(heap->prfx, (size_t)(heap->prfx_size + new_dblk_size)) < 0)
+                if (H5AC_resize_entry(heap->prfx, (size_t)(heap->prfx_size + new_dblk_size)) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, UFAIL, "unable to resize heap prefix in cache")
             } /* end if */
             else {
                 /* Resize 'standalone' data block */
-                if(H5AC_resize_entry(heap->dblk, (size_t)new_dblk_size) < 0)
+                if (H5AC_resize_entry(heap->dblk, (size_t)new_dblk_size) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, UFAIL, "unable to resize heap data block in cache")
             } /* end else */
 
             /* Note new size */
             heap->dblk_size = new_dblk_size;
-	} /* end if */
+        }      /* end if */
         else { /* ...if we can't, allocate a new chunk & release the old */
             /* Reallocate data block in file */
-            if(H5HL_dblk_realloc(f, dxpl_id, heap, new_dblk_size) < 0)
+            if (H5HL_dblk_realloc(f, dxpl_id, heap, new_dblk_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, UFAIL, "reallocating data block failed")
-	} /* end if */
+        } /* end if */
 
         /* If the last free list in the heap is at the end of the heap, extend it */
-	if(last_fl && last_fl->offset + last_fl->size == old_dblk_size) {
-	    /*
-	     * Increase the size of the last free block.
-	     */
-	    offset = last_fl->offset;
-	    last_fl->offset += need_size;
-	    last_fl->size += need_more - need_size;
-	    HDassert(last_fl->offset == H5HL_ALIGN(last_fl->offset));
-	    HDassert(last_fl->size == H5HL_ALIGN(last_fl->size));
-
-	    if (last_fl->size < H5HL_SIZEOF_FREE(f)) {
+        if (last_fl && last_fl->offset + last_fl->size == old_dblk_size) {
+            /*
+             * Increase the size of the last free block.
+             */
+            offset = last_fl->offset;
+            last_fl->offset += need_size;
+            last_fl->size += need_more - need_size;
+            HDassert(last_fl->offset == H5HL_ALIGN(last_fl->offset));
+            HDassert(last_fl->size == H5HL_ALIGN(last_fl->size));
+
+            if (last_fl->size < H5HL_SIZEOF_FREE(f)) {
 #ifdef H5HL_DEBUG
-		if (H5DEBUG(HL) && last_fl->size) {
-		    HDfprintf(H5DEBUG(HL), "H5HL: lost %lu bytes at line %d\n",
-			    (unsigned long)(last_fl->size), __LINE__);
-		}
+                if (H5DEBUG(HL) && last_fl->size) {
+                    HDfprintf(H5DEBUG(HL), "H5HL: lost %lu bytes at line %d\n",
+                              (unsigned long)(last_fl->size), __LINE__);
+                }
 #endif
-		last_fl = H5HL_remove_free(heap, last_fl);
-	    }
-	} /* end if */
+                last_fl = H5HL_remove_free(heap, last_fl);
+            }
+        } /* end if */
         else {
-	    /*
-	     * Create a new free list element large enough that we can
-	     * take some space out of it right away.
-	     */
-	    offset = old_dblk_size;
-	    if(need_more - need_size >= H5HL_SIZEOF_FREE(f)) {
-		if(NULL == (fl = H5FL_MALLOC(H5HL_free_t)))
-		    HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, UFAIL, "memory allocation failed")
-		fl->offset = old_dblk_size + need_size;
-		fl->size = need_more - need_size;
-		HDassert(fl->offset == H5HL_ALIGN(fl->offset));
-		HDassert(fl->size == H5HL_ALIGN(fl->size));
-		fl->prev = NULL;
-		fl->next = heap->freelist;
-		if(heap->freelist)
+            /*
+             * Create a new free list element large enough that we can
+             * take some space out of it right away.
+             */
+            offset = old_dblk_size;
+            if (need_more - need_size >= H5HL_SIZEOF_FREE(f)) {
+                if (NULL == (fl = H5FL_MALLOC(H5HL_free_t)))
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, UFAIL, "memory allocation failed")
+                fl->offset = old_dblk_size + need_size;
+                fl->size   = need_more - need_size;
+                HDassert(fl->offset == H5HL_ALIGN(fl->offset));
+                HDassert(fl->size == H5HL_ALIGN(fl->size));
+                fl->prev = NULL;
+                fl->next = heap->freelist;
+                if (heap->freelist)
                     heap->freelist->prev = fl;
-		heap->freelist = fl;
+                heap->freelist = fl;
 #ifdef H5HL_DEBUG
-	    } else if (H5DEBUG(HL) && need_more > need_size) {
-		HDfprintf(H5DEBUG(HL),
-			"H5HL_insert: lost %lu bytes at line %d\n",
-			(unsigned long)(need_more - need_size), __LINE__);
+            }
+            else if (H5DEBUG(HL) && need_more > need_size) {
+                HDfprintf(H5DEBUG(HL), "H5HL_insert: lost %lu bytes at line %d\n",
+                          (unsigned long)(need_more - need_size), __LINE__);
 #endif
-	    }
-	} /* end else */
+            }
+        } /* end else */
 
 #ifdef H5HL_DEBUG
-	if (H5DEBUG(HL)) {
-	    HDfprintf(H5DEBUG(HL),
-		    "H5HL: resize mem buf from %lu to %lu bytes\n",
-		    (unsigned long)(old_dblk_size),
-		    (unsigned long)(old_dblk_size + need_more));
-	}
+        if (H5DEBUG(HL)) {
+            HDfprintf(H5DEBUG(HL), "H5HL: resize mem buf from %lu to %lu bytes\n",
+                      (unsigned long)(old_dblk_size), (unsigned long)(old_dblk_size + need_more));
+        }
 #endif
-	if(NULL == (heap->dblk_image = H5FL_BLK_REALLOC(lheap_chunk, heap->dblk_image, heap->dblk_size)))
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, UFAIL, "memory allocation failed")
+        if (NULL == (heap->dblk_image = H5FL_BLK_REALLOC(lheap_chunk, heap->dblk_image, heap->dblk_size)))
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, UFAIL, "memory allocation failed")
 
-	/* Clear new section so junk doesn't appear in the file */
+        /* Clear new section so junk doesn't appear in the file */
         /* (Avoid clearing section which will be overwritten with newly inserted data) */
-	HDmemset(heap->dblk_image + offset + buf_size, 0, (new_dblk_size - (offset + buf_size)));
+        HDmemset(heap->dblk_image + offset + buf_size, 0, (new_dblk_size - (offset + buf_size)));
     } /* end if */
 
     /* Copy the data into the heap */
@@ -881,7 +864,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HL_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_remove
  *
@@ -909,8 +891,8 @@ done:
 herr_t
 H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size)
 {
-    H5HL_free_t		*fl = NULL;
-    herr_t      	ret_value = SUCCEED;       /* Return value */
+    H5HL_free_t *fl        = NULL;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -931,7 +913,7 @@ H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size)
      *  so we just accept that an extra flush of the heap info could occur
      *  if an error occurs -QAK)
      */
-    if(H5HL_dirty(heap) < 0)
+    if (H5HL_dirty(heap) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark heap as dirty")
 
     /*
@@ -940,63 +922,60 @@ H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size)
      * that all three chunks can be combined into one.
      */
     fl = heap->freelist;
-    while(fl) {
+    while (fl) {
         H5HL_free_t *fl2 = NULL;
 
-	if((offset + size) == fl->offset) {
-	    fl->offset = offset;
-	    fl->size += size;
-	    HDassert(fl->offset == H5HL_ALIGN(fl->offset));
-	    HDassert(fl->size == H5HL_ALIGN(fl->size));
-	    fl2 = fl->next;
-	    while(fl2) {
-		if((fl2->offset + fl2->size) == fl->offset) {
-		    fl->offset = fl2->offset;
-		    fl->size += fl2->size;
-		    HDassert(fl->offset == H5HL_ALIGN(fl->offset));
-		    HDassert(fl->size == H5HL_ALIGN(fl->size));
-		    fl2 = H5HL_remove_free(heap, fl2);
-	            if(((fl->offset + fl->size) == heap->dblk_size) &&
-                             ((2 * fl->size) > heap->dblk_size)) {
-                        if(H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
-	                    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
+        if ((offset + size) == fl->offset) {
+            fl->offset = offset;
+            fl->size += size;
+            HDassert(fl->offset == H5HL_ALIGN(fl->offset));
+            HDassert(fl->size == H5HL_ALIGN(fl->size));
+            fl2 = fl->next;
+            while (fl2) {
+                if ((fl2->offset + fl2->size) == fl->offset) {
+                    fl->offset = fl2->offset;
+                    fl->size += fl2->size;
+                    HDassert(fl->offset == H5HL_ALIGN(fl->offset));
+                    HDassert(fl->size == H5HL_ALIGN(fl->size));
+                    fl2 = H5HL_remove_free(heap, fl2);
+                    if (((fl->offset + fl->size) == heap->dblk_size) && ((2 * fl->size) > heap->dblk_size)) {
+                        if (H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
+                            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
                     }
-		    HGOTO_DONE(SUCCEED);
-		}
-		fl2 = fl2->next;
-	    }
-	    if(((fl->offset + fl->size) == heap->dblk_size) &&
-                     ((2 * fl->size) > heap->dblk_size)) {
-                if(H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
-	            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
+                    HGOTO_DONE(SUCCEED);
+                }
+                fl2 = fl2->next;
             }
-	    HGOTO_DONE(SUCCEED);
-	} else if(fl->offset + fl->size == offset) {
-	    fl->size += size;
-	    fl2 = fl->next;
-	    HDassert(fl->size == H5HL_ALIGN(fl->size));
-	    while(fl2) {
-		if(fl->offset + fl->size == fl2->offset) {
-		    fl->size += fl2->size;
-		    HDassert(fl->size == H5HL_ALIGN(fl->size));
-		    fl2 = H5HL_remove_free(heap, fl2);
-	            if(((fl->offset + fl->size) == heap->dblk_size) &&
-                            ((2 * fl->size) > heap->dblk_size)) {
-                        if(H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
-	                    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
+            if (((fl->offset + fl->size) == heap->dblk_size) && ((2 * fl->size) > heap->dblk_size)) {
+                if (H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
+            }
+            HGOTO_DONE(SUCCEED);
+        }
+        else if (fl->offset + fl->size == offset) {
+            fl->size += size;
+            fl2 = fl->next;
+            HDassert(fl->size == H5HL_ALIGN(fl->size));
+            while (fl2) {
+                if (fl->offset + fl->size == fl2->offset) {
+                    fl->size += fl2->size;
+                    HDassert(fl->size == H5HL_ALIGN(fl->size));
+                    fl2 = H5HL_remove_free(heap, fl2);
+                    if (((fl->offset + fl->size) == heap->dblk_size) && ((2 * fl->size) > heap->dblk_size)) {
+                        if (H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
+                            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
                     } /* end if */
-		    HGOTO_DONE(SUCCEED);
-		} /* end if */
-		fl2 = fl2->next;
-	    } /* end while */
-	    if(((fl->offset + fl->size) == heap->dblk_size) &&
-                    ((2 * fl->size) > heap->dblk_size)) {
-                if(H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
-	            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
+                    HGOTO_DONE(SUCCEED);
+                } /* end if */
+                fl2 = fl2->next;
+            } /* end while */
+            if (((fl->offset + fl->size) == heap->dblk_size) && ((2 * fl->size) > heap->dblk_size)) {
+                if (H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
             } /* end if */
-	    HGOTO_DONE(SUCCEED);
-	} /* end if */
-	fl = fl->next;
+            HGOTO_DONE(SUCCEED);
+        } /* end if */
+        fl = fl->next;
     } /* end while */
 
     /*
@@ -1004,34 +983,32 @@ H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size)
      * hold the free list data.	 If not, the freed chunk is forever
      * lost.
      */
-    if(size < H5HL_SIZEOF_FREE(f)) {
+    if (size < H5HL_SIZEOF_FREE(f)) {
 #ifdef H5HL_DEBUG
-	if(H5DEBUG(HL)) {
-	    HDfprintf(H5DEBUG(HL), "H5HL: lost %lu bytes\n",
-		    (unsigned long) size);
-	}
+        if (H5DEBUG(HL)) {
+            HDfprintf(H5DEBUG(HL), "H5HL: lost %lu bytes\n", (unsigned long)size);
+        }
 #endif
-	HGOTO_DONE(SUCCEED);
+        HGOTO_DONE(SUCCEED);
     } /* end if */
 
     /*
      * Add an entry to the free list.
      */
-    if(NULL == (fl = H5FL_MALLOC(H5HL_free_t)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
+    if (NULL == (fl = H5FL_MALLOC(H5HL_free_t)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
     fl->offset = offset;
-    fl->size = size;
+    fl->size   = size;
     HDassert(fl->offset == H5HL_ALIGN(fl->offset));
     HDassert(fl->size == H5HL_ALIGN(fl->size));
     fl->prev = NULL;
     fl->next = heap->freelist;
-    if(heap->freelist)
+    if (heap->freelist)
         heap->freelist->prev = fl;
     heap->freelist = fl;
 
-    if(((fl->offset + fl->size) == heap->dblk_size) &&
-            ((2 * fl->size) > heap->dblk_size)) {
-        if(H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
+    if (((fl->offset + fl->size) == heap->dblk_size) && ((2 * fl->size) > heap->dblk_size)) {
+        if (H5HL_minimize_heap_space(f, dxpl_id, heap) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "heap size minimization failed")
     } /* end if */
 
@@ -1039,7 +1016,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_delete
  *
@@ -1056,12 +1032,12 @@ done:
 herr_t
 H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
 {
-    H5HL_t	*heap;                  /* Local heap to delete */
-    H5HL_cache_prfx_ud_t prfx_udata;    /* User data for protecting local heap prefix */
-    H5HL_prfx_t *prfx = NULL;           /* Local heap prefix */
-    H5HL_dblk_t *dblk = NULL;           /* Local heap data block */
-    unsigned    cache_flags = H5AC__NO_FLAGS_SET;       /* Flags for unprotecting heap */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5HL_t *             heap;                             /* Local heap to delete */
+    H5HL_cache_prfx_ud_t prfx_udata;                       /* User data for protecting local heap prefix */
+    H5HL_prfx_t *        prfx        = NULL;               /* Local heap prefix */
+    H5HL_dblk_t *        dblk        = NULL;               /* Local heap data block */
+    unsigned             cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting heap */
+    herr_t               ret_value   = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1072,51 +1048,52 @@ H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
     /* Construct the user data for protect callback */
     prfx_udata.sizeof_size = H5F_SIZEOF_SIZE(f);
     prfx_udata.sizeof_addr = H5F_SIZEOF_ADDR(f);
-    prfx_udata.prfx_addr = addr;
+    prfx_udata.prfx_addr   = addr;
     prfx_udata.sizeof_prfx = H5HL_SIZEOF_HDR(f);
 
     /* Protect the local heap prefix */
-    if(NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, &prfx_udata, H5AC_WRITE)))
+    if (NULL ==
+        (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, &prfx_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load heap prefix")
 
     /* Get the pointer to the heap */
     heap = prfx->heap;
 
     /* Check if heap has separate data block */
-    if(!heap->single_cache_obj) {
+    if (!heap->single_cache_obj) {
         H5HL_cache_dblk_ud_t dblk_udata; /* User data for protecting local heap data block */
 
         /* Construct the user data for protect callback */
-        dblk_udata.heap = heap;
+        dblk_udata.heap   = heap;
         dblk_udata.loaded = FALSE;
 
         /* Protect the local heap data block */
-        if(NULL == (dblk = (H5HL_dblk_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, &dblk_udata, H5AC_WRITE)))
+        if (NULL == (dblk = (H5HL_dblk_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr,
+                                                        &dblk_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load heap data block")
 
         /* Pin the prefix, if the data block was loaded from file */
-        if(dblk_udata.loaded) {
-            if(H5AC_pin_protected_entry(prfx) < 0)
+        if (dblk_udata.loaded) {
+            if (H5AC_pin_protected_entry(prfx) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin local heap prefix")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Set the flags for releasing the prefix and data block */
     cache_flags |= H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
 
 done:
     /* Release the data block from the cache, now deleted */
-    if(dblk && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, dblk, cache_flags) < 0)
+    if (dblk && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, dblk, cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release local heap data block")
 
     /* Release the prefix from the cache, now deleted */
-    if(prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, cache_flags) < 0)
+    if (prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release local heap prefix")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_get_size
  *
@@ -1133,10 +1110,10 @@ done:
 herr_t
 H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size)
 {
-    H5HL_cache_prfx_ud_t prfx_udata;      /* User data for protecting local heap prefix */
-    H5HL_prfx_t *prfx = NULL;   /* Local heap prefix */
-    H5HL_t *heap;               /* Heap data structure */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5HL_cache_prfx_ud_t prfx_udata;          /* User data for protecting local heap prefix */
+    H5HL_prfx_t *        prfx = NULL;         /* Local heap prefix */
+    H5HL_t *             heap;                /* Heap data structure */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1148,11 +1125,12 @@ H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size)
     /* Construct the user data for protect callback */
     prfx_udata.sizeof_size = H5F_SIZEOF_SIZE(f);
     prfx_udata.sizeof_addr = H5F_SIZEOF_ADDR(f);
-    prfx_udata.prfx_addr = addr;
+    prfx_udata.prfx_addr   = addr;
     prfx_udata.sizeof_prfx = H5HL_SIZEOF_HDR(f);
 
     /* Protect the local heap prefix */
-    if(NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, &prfx_udata, H5AC_READ)))
+    if (NULL ==
+        (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, &prfx_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load heap prefix")
 
     /* Get the pointer to the heap */
@@ -1162,13 +1140,12 @@ H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size)
     *size = heap->dblk_size;
 
 done:
-    if(prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, H5AC__NO_FLAGS_SET) < 0)
+    if (prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release local heap prefix")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_get_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5HL_heapsize
  *
@@ -1185,10 +1162,10 @@ done:
 herr_t
 H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size)
 {
-    H5HL_cache_prfx_ud_t prfx_udata;      /* User data for protecting local heap prefix */
-    H5HL_prfx_t *prfx = NULL;   /* Local heap prefix */
-    H5HL_t *heap;               /* Heap data structure */
-    herr_t ret_value = SUCCEED;    /* Return value */
+    H5HL_cache_prfx_ud_t prfx_udata;          /* User data for protecting local heap prefix */
+    H5HL_prfx_t *        prfx = NULL;         /* Local heap prefix */
+    H5HL_t *             heap;                /* Heap data structure */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1200,11 +1177,12 @@ H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size)
     /* Construct the user data for protect callback */
     prfx_udata.sizeof_size = H5F_SIZEOF_SIZE(f);
     prfx_udata.sizeof_addr = H5F_SIZEOF_ADDR(f);
-    prfx_udata.prfx_addr = addr;
+    prfx_udata.prfx_addr   = addr;
     prfx_udata.sizeof_prfx = H5HL_SIZEOF_HDR(f);
 
     /* Protect the local heap prefix */
-    if(NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, &prfx_udata, H5AC_READ)))
+    if (NULL ==
+        (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, &prfx_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load heap prefix")
 
     /* Get the pointer to the heap */
@@ -1214,9 +1192,8 @@ H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size)
     *heap_size += (hsize_t)(heap->prfx_size + heap->dblk_size);
 
 done:
-    if(prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, H5AC__NO_FLAGS_SET) < 0)
+    if (prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, prfx, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release local heap prefix")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_heapsize() */
-
diff --git a/src/H5HLcache.c b/src/H5HLcache.c
index 944ac90..b903a6e 100644
--- a/src/H5HLcache.c
+++ b/src/H5HLcache.c
@@ -26,24 +26,22 @@
 /* Module Setup */
 /****************/
 
-#define H5HL_PACKAGE		/* Suppress error about including H5HLpkg */
-
+#define H5HL_PACKAGE /* Suppress error about including H5HLpkg */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HLpkg.h"		/* Local Heaps				*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HLpkg.h"     /* Local Heaps				*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
-#define H5HL_VERSION	0               /* Local heap collection version    */
+#define H5HL_VERSION 0 /* Local heap collection version    */
 
 /* Set the local heap size to speculatively read in */
 /* (needs to be more than the local heap prefix size to work at all and
@@ -51,36 +49,32 @@
  *      extra I/O operations) */
 #define H5HL_SPEC_READ_SIZE 512
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Metadata cache callbacks */
-static void *H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
-    void *thing, unsigned *flags_ptr);
+static void * H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
+static herr_t H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, void *thing,
+                                unsigned *flags_ptr);
 static herr_t H5HL_prefix_dest(H5F_t *f, void *thing);
 static herr_t H5HL_prefix_clear(H5F_t *f, void *thing, hbool_t destroy);
 static herr_t H5HL_prefix_size(const H5F_t *f, const void *thing, size_t *size_ptr);
-static void *H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
-    void *thing, unsigned *flags_ptr);
+static void * H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
+static herr_t H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, void *thing,
+                                   unsigned *flags_ptr);
 static herr_t H5HL_datablock_dest(H5F_t *f, void *thing);
 static herr_t H5HL_datablock_clear(H5F_t *f, void *thing, hbool_t destroy);
 static herr_t H5HL_datablock_size(const H5F_t *f, const void *thing, size_t *size_ptr);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -104,18 +98,14 @@ const H5AC_class_t H5AC_LHEAP_DBLK[1] = {{
     H5HL_datablock_size,
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_fl_deserialize
  *
@@ -132,9 +122,9 @@ const H5AC_class_t H5AC_LHEAP_DBLK[1] = {{
 static herr_t
 H5HL_fl_deserialize(H5HL_t *heap)
 {
-    H5HL_free_t *fl = NULL, *tail = NULL;      /* Heap free block nodes */
-    hsize_t free_block;                 /* Offset of free block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_free_t *fl = NULL, *tail = NULL; /* Heap free block nodes */
+    hsize_t      free_block;              /* Offset of free block */
+    herr_t       ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -144,49 +134,48 @@ H5HL_fl_deserialize(H5HL_t *heap)
 
     /* Build free list */
     free_block = heap->free_block;
-    while(H5HL_FREE_NULL != free_block) {
-        const uint8_t *p;               /* Pointer into image buffer */
+    while (H5HL_FREE_NULL != free_block) {
+        const uint8_t *p; /* Pointer into image buffer */
 
         /* Sanity check */
-        if(free_block >= heap->dblk_size)
+        if (free_block >= heap->dblk_size)
             HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "bad heap free list")
 
         /* Allocate & initialize free list node */
-        if(NULL == (fl = H5FL_MALLOC(H5HL_free_t)))
+        if (NULL == (fl = H5FL_MALLOC(H5HL_free_t)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
         fl->offset = (size_t)free_block;
-        fl->prev = tail;
-        fl->next = NULL;
+        fl->prev   = tail;
+        fl->next   = NULL;
 
         /* Decode offset of next free block */
         p = heap->dblk_image + free_block;
         H5F_DECODE_LENGTH_LEN(p, free_block, heap->sizeof_size);
-        if(free_block == 0)
+        if (free_block == 0)
             HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "free block size is zero?")
 
         /* Decode length of this free block */
         H5F_DECODE_LENGTH_LEN(p, fl->size, heap->sizeof_size);
-        if((fl->offset + fl->size) > heap->dblk_size)
+        if ((fl->offset + fl->size) > heap->dblk_size)
             HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "bad heap free list")
 
         /* Append node onto list */
-        if(tail)
+        if (tail)
             tail->next = fl;
         else
             heap->freelist = fl;
         tail = fl;
-        fl = NULL;
+        fl   = NULL;
     } /* end while */
 
 done:
-    if(ret_value < 0)
-        if(fl)
+    if (ret_value < 0)
+        if (fl)
             fl = H5FL_FREE(H5HL_free_t, fl);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_fl_deserialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_fl_serialize
  *
@@ -204,7 +193,7 @@ done:
 static void
 H5HL_fl_serialize(const H5HL_t *heap)
 {
-    H5HL_free_t	*fl;                    /* Pointer to heap free list node */
+    H5HL_free_t *fl; /* Pointer to heap free list node */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -212,13 +201,13 @@ H5HL_fl_serialize(const H5HL_t *heap)
     HDassert(heap);
 
     /* Serialize the free list into the heap data's image */
-    for(fl = heap->freelist; fl; fl = fl->next) {
-        uint8_t     *p;                     /* Pointer into raw data buffer */
+    for (fl = heap->freelist; fl; fl = fl->next) {
+        uint8_t *p; /* Pointer into raw data buffer */
 
         HDassert(fl->offset == H5HL_ALIGN(fl->offset));
         p = heap->dblk_image + fl->offset;
 
-        if(fl->next)
+        if (fl->next)
             H5F_ENCODE_LENGTH_LEN(p, fl->next->offset, heap->sizeof_size)
         else
             H5F_ENCODE_LENGTH_LEN(p, H5HL_FREE_NULL, heap->sizeof_size)
@@ -229,7 +218,6 @@ H5HL_fl_serialize(const H5HL_t *heap)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5HL_fl_serialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_prefix_load
  *
@@ -247,15 +235,15 @@ H5HL_fl_serialize(const H5HL_t *heap)
 static void *
 H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5HL_t *heap = NULL;            /* Local heap */
-    H5HL_prfx_t *prfx = NULL;       /* Heap prefix deserialized */
-    H5HL_cache_prfx_ud_t *udata = (H5HL_cache_prfx_ud_t *)_udata;       /* User data for callback */
-    uint8_t		buf[H5HL_SPEC_READ_SIZE];   /* Buffer for decoding */
-    size_t	        spec_read_size; /* Size of buffer to speculatively read in */
-    const uint8_t	*p;         /* Pointer into decoding buffer */
-    haddr_t             eoa;        /* Relative end of file address */
-    hsize_t min;                    /* temp min value to avoid macro nesting */
-    H5HL_prfx_t *ret_value;         /* Return value */
+    H5HL_t *              heap  = NULL;                           /* Local heap */
+    H5HL_prfx_t *         prfx  = NULL;                           /* Heap prefix deserialized */
+    H5HL_cache_prfx_ud_t *udata = (H5HL_cache_prfx_ud_t *)_udata; /* User data for callback */
+    uint8_t               buf[H5HL_SPEC_READ_SIZE];               /* Buffer for decoding */
+    size_t                spec_read_size; /* Size of buffer to speculatively read in */
+    const uint8_t *       p;              /* Pointer into decoding buffer */
+    haddr_t               eoa;            /* Relative end of file address */
+    hsize_t               min;            /* temp min value to avoid macro nesting */
+    H5HL_prfx_t *         ret_value;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -269,7 +257,7 @@ H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata->sizeof_prfx <= sizeof(buf));
 
     /* Make certain we don't speculatively read off the end of the file */
-    if(HADDR_UNDEF == (eoa = H5F_get_eoa(f, H5FD_MEM_LHEAP)))
+    if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, H5FD_MEM_LHEAP)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, NULL, "unable to determine file size")
 
     /* Compute the size of the speculative local heap prefix buffer */
@@ -278,29 +266,29 @@ H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(spec_read_size >= udata->sizeof_prfx);
 
     /* Attempt to speculatively read both local heap prefix and heap data */
-    if(H5F_block_read(f, H5FD_MEM_LHEAP, addr, spec_read_size, dxpl_id, buf) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read local heap prefix")
+    if (H5F_block_read(f, H5FD_MEM_LHEAP, addr, spec_read_size, dxpl_id, buf) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read local heap prefix")
     p = buf;
 
     /* Check magic number */
-    if(HDmemcmp(p, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "bad local heap signature")
+    if (HDmemcmp(p, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "bad local heap signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(H5HL_VERSION != *p++)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "wrong version number in local heap")
+    if (H5HL_VERSION != *p++)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "wrong version number in local heap")
 
     /* Reserved */
     p += 3;
 
     /* Allocate space in memory for the heap */
-    if(NULL == (heap = H5HL_new(udata->sizeof_size, udata->sizeof_addr, udata->sizeof_prfx)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate local heap structure")
+    if (NULL == (heap = H5HL_new(udata->sizeof_size, udata->sizeof_addr, udata->sizeof_prfx)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate local heap structure")
 
     /* Allocate the heap prefix */
-    if(NULL == (prfx = H5HL_prfx_new(heap)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate local heap prefix")
+    if (NULL == (prfx = H5HL_prfx_new(heap)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate local heap prefix")
 
     /* Store the prefix's address & length */
     heap->prfx_addr = udata->prfx_addr;
@@ -311,25 +299,25 @@ H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
     /* Free list head */
     H5F_DECODE_LENGTH_LEN(p, heap->free_block, udata->sizeof_size);
-    if(heap->free_block != H5HL_FREE_NULL && heap->free_block >= heap->dblk_size)
-	HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "bad heap free list")
+    if (heap->free_block != H5HL_FREE_NULL && heap->free_block >= heap->dblk_size)
+        HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "bad heap free list")
 
     /* Heap data address */
     H5F_addr_decode_len(udata->sizeof_addr, &p, &(heap->dblk_addr));
 
     /* Check if heap block exists */
-    if(heap->dblk_size) {
+    if (heap->dblk_size) {
         /* Check if heap data block is contiguous with header */
-        if(H5F_addr_eq((heap->prfx_addr + heap->prfx_size), heap->dblk_addr)) {
+        if (H5F_addr_eq((heap->prfx_addr + heap->prfx_size), heap->dblk_addr)) {
             /* Note that the heap should be a single object in the cache */
             heap->single_cache_obj = TRUE;
 
             /* Allocate space for the heap data image */
-            if(NULL == (heap->dblk_image = H5FL_BLK_MALLOC(lheap_chunk, heap->dblk_size)))
+            if (NULL == (heap->dblk_image = H5FL_BLK_MALLOC(lheap_chunk, heap->dblk_size)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
 
             /* Check if the current buffer from the speculative read already has the heap data */
-            if(spec_read_size >= (heap->prfx_size + heap->dblk_size)) {
+            if (spec_read_size >= (heap->prfx_size + heap->dblk_size)) {
                 /* Set p to the start of the data block.  This is necessary
                  * because there may be a gap between the used portion of the
                  * prefix and the data block due to alignment constraints. */
@@ -340,12 +328,13 @@ H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
             } /* end if */
             else {
                 /* Read the local heap data block directly into buffer */
-                if(H5F_block_read(f, H5FD_MEM_LHEAP, heap->dblk_addr, heap->dblk_size, dxpl_id, heap->dblk_image) < 0)
+                if (H5F_block_read(f, H5FD_MEM_LHEAP, heap->dblk_addr, heap->dblk_size, dxpl_id,
+                                   heap->dblk_image) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read heap data")
             } /* end else */
 
             /* Build free list */
-            if(H5HL_fl_deserialize(heap) < 0)
+            if (H5HL_fl_deserialize(heap) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't initialize free list")
         } /* end if */
         else
@@ -358,21 +347,20 @@ H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
 done:
     /* Release the [possibly partially initialized] local heap on errors */
-    if(!ret_value) {
-        if(prfx) {
-            if(H5HL_prfx_dest(prfx) < 0)
+    if (!ret_value) {
+        if (prfx) {
+            if (H5HL_prfx_dest(prfx) < 0)
                 HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, NULL, "unable to destroy local heap prefix")
         } /* end if */
         else {
-            if(heap && H5HL_dest(heap) < 0)
+            if (heap && H5HL_dest(heap) < 0)
                 HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, NULL, "unable to destroy local heap")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_prefix_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_prefix_flush
  *
@@ -388,13 +376,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
-    void *thing, unsigned H5_ATTR_UNUSED *flags_ptr)
+H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, void *thing,
+                  unsigned H5_ATTR_UNUSED *flags_ptr)
 {
     H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing;   /* Local heap prefix to flush */
-    H5WB_t *wb = NULL;                  /* Wrapped buffer for heap data */
-    uint8_t heap_buf[H5HL_SPEC_READ_SIZE]; /* Buffer for heap */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5WB_t *     wb   = NULL;                   /* Wrapped buffer for heap data */
+    uint8_t      heap_buf[H5HL_SPEC_READ_SIZE]; /* Buffer for heap */
+    herr_t       ret_value = SUCCEED;           /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -403,23 +391,23 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
     HDassert(H5F_addr_defined(addr));
     HDassert(prfx);
 
-    if(prfx->cache_info.is_dirty) {
-        H5HL_t *heap = prfx->heap; /* Pointer to the local heap */
-        uint8_t *buf;           /* Pointer to heap buffer */
-        size_t buf_size;        /* Size of buffer for encoding & writing heap info */
-        uint8_t *p;             /* Pointer into raw data buffer */
+    if (prfx->cache_info.is_dirty) {
+        H5HL_t * heap = prfx->heap; /* Pointer to the local heap */
+        uint8_t *buf;               /* Pointer to heap buffer */
+        size_t   buf_size;          /* Size of buffer for encoding & writing heap info */
+        uint8_t *p;                 /* Pointer into raw data buffer */
 
         /* Wrap the local buffer for serialized heap info */
-        if(NULL == (wb = H5WB_wrap(heap_buf, sizeof(heap_buf))))
+        if (NULL == (wb = H5WB_wrap(heap_buf, sizeof(heap_buf))))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Compute the size of the buffer to encode & write */
         buf_size = heap->prfx_size;
-        if(heap->single_cache_obj)
+        if (heap->single_cache_obj)
             buf_size += heap->dblk_size;
 
         /* Get a pointer to a buffer that's large enough for serialized heap */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, buf_size)))
+        if (NULL == (buf = (uint8_t *)H5WB_actual(wb, buf_size)))
             HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Update the free block value from the free list */
@@ -430,17 +418,17 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
         HDmemcpy(p, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC);
         p += H5_SIZEOF_MAGIC;
         *p++ = H5HL_VERSION;
-        *p++ = 0;	/*reserved*/
-        *p++ = 0;	/*reserved*/
-        *p++ = 0;	/*reserved*/
+        *p++ = 0; /*reserved*/
+        *p++ = 0; /*reserved*/
+        *p++ = 0; /*reserved*/
         H5F_ENCODE_LENGTH_LEN(p, heap->dblk_size, heap->sizeof_size);
         H5F_ENCODE_LENGTH_LEN(p, heap->free_block, heap->sizeof_size);
         H5F_addr_encode_len(heap->sizeof_addr, &p, heap->dblk_addr);
 
         /* Check if the local heap is a single object in cache */
-        if(heap->single_cache_obj) {
-            if((size_t)(p - buf) < heap->prfx_size) {
-                size_t gap;         /* Size of gap between prefix and data block */
+        if (heap->single_cache_obj) {
+            if ((size_t)(p - buf) < heap->prfx_size) {
+                size_t gap; /* Size of gap between prefix and data block */
 
                 /* Set p to the start of the data block.  This is necessary because
                  * there may be a gap between the used portion of the prefix and the
@@ -458,26 +446,25 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
         } /* end if */
 
         /* Write the prefix [and possibly the data block] to the file */
-        if(H5F_block_write(f, H5FD_MEM_LHEAP, addr, buf_size, dxpl_id, buf) < 0)
+        if (H5F_block_write(f, H5FD_MEM_LHEAP, addr, buf_size, dxpl_id, buf) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write heap header and data to file")
 
-	prfx->cache_info.is_dirty = FALSE;
+        prfx->cache_info.is_dirty = FALSE;
     } /* end if */
 
     /* Should we destroy the memory version? */
-    if(destroy)
-        if(H5HL_prefix_dest(f, prfx) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix")
+    if (destroy)
+        if (H5HL_prefix_dest(f, prfx) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix")
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_prefix_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_prefix_dest
  *
@@ -494,8 +481,8 @@ done:
 static herr_t
 H5HL_prefix_dest(H5F_t *f, void *thing)
 {
-    H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing;   /* Local heap prefix to destroy */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_prfx_t *prfx      = (H5HL_prfx_t *)thing; /* Local heap prefix to destroy */
+    herr_t       ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -511,29 +498,28 @@ H5HL_prefix_dest(H5F_t *f, void *thing)
     HDassert(!prfx->cache_info.free_file_space_on_destroy || H5F_addr_defined(prfx->cache_info.addr));
 
     /* Check for freeing file space for local heap prefix */
-    if(prfx->cache_info.free_file_space_on_destroy) {
-        hsize_t free_size;       /* Size of region to free in file */
+    if (prfx->cache_info.free_file_space_on_destroy) {
+        hsize_t free_size; /* Size of region to free in file */
 
         /* Compute size to free for later */
         free_size = prfx->heap->prfx_size;
-        if(prfx->heap->single_cache_obj)
+        if (prfx->heap->single_cache_obj)
             free_size += prfx->heap->dblk_size;
 
         /* Free the local heap prefix [and possible the data block] on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_LHEAP, H5AC_dxpl_id, prfx->cache_info.addr, free_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_LHEAP, H5AC_dxpl_id, prfx->cache_info.addr, free_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free local heap prefix")
     } /* end if */
 
     /* Destroy local heap prefix */
-    if(H5HL_prfx_dest(prfx) < 0)
+    if (H5HL_prfx_dest(prfx) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't destroy local heap prefix")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_prefix_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_prefix_clear
  *
@@ -550,8 +536,8 @@ done:
 static herr_t
 H5HL_prefix_clear(H5F_t H5_ATTR_UNUSED *f, void *thing, hbool_t destroy)
 {
-    H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing;   /* The local heap prefix to operate on */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_prfx_t *prfx      = (H5HL_prfx_t *)thing; /* The local heap prefix to operate on */
+    herr_t       ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -561,15 +547,14 @@ H5HL_prefix_clear(H5F_t H5_ATTR_UNUSED *f, void *thing, hbool_t destroy)
     /* Mark heap prefix as clean */
     prfx->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5HL_prefix_dest(f, prfx) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix")
+    if (destroy)
+        if (H5HL_prefix_dest(f, prfx) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_prefix_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_prefix_size
  *
@@ -587,7 +572,7 @@ done:
 static herr_t
 H5HL_prefix_size(const H5F_t H5_ATTR_UNUSED *f, const void *thing, size_t *size_ptr)
 {
-    const H5HL_prfx_t *prfx = (const H5HL_prfx_t *)thing;   /* Pointer to local heap prefix to query */
+    const H5HL_prfx_t *prfx = (const H5HL_prfx_t *)thing; /* Pointer to local heap prefix to query */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -600,13 +585,12 @@ H5HL_prefix_size(const H5F_t H5_ATTR_UNUSED *f, const void *thing, size_t *size_
     *size_ptr = prfx->heap->prfx_size;
 
     /* If the heap is stored as a single object, add in the data block size also */
-    if(prfx->heap->single_cache_obj)
+    if (prfx->heap->single_cache_obj)
         *size_ptr += prfx->heap->dblk_size;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HL_prefix_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_datablock_load
  *
@@ -624,9 +608,9 @@ H5HL_prefix_size(const H5F_t H5_ATTR_UNUSED *f, const void *thing, size_t *size_
 static void *
 H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5HL_dblk_t *dblk = NULL;       /* Local heap data block deserialized */
-    H5HL_cache_dblk_ud_t *udata = (H5HL_cache_dblk_ud_t *)_udata;       /* User data for callback */
-    H5HL_dblk_t *ret_value;         /* Return value */
+    H5HL_dblk_t *         dblk  = NULL;                           /* Local heap data block deserialized */
+    H5HL_cache_dblk_ud_t *udata = (H5HL_cache_dblk_ud_t *)_udata; /* User data for callback */
+    H5HL_dblk_t *         ret_value;                              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -639,21 +623,22 @@ H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(NULL == udata->heap->dblk);
 
     /* Allocate space in memory for the heap data block */
-    if(NULL == (dblk = H5HL_dblk_new(udata->heap)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
+    if (NULL == (dblk = H5HL_dblk_new(udata->heap)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
 
     /* Check for heap still retaining image */
-    if(NULL == udata->heap->dblk_image) {
+    if (NULL == udata->heap->dblk_image) {
         /* Allocate space for the heap data image */
-        if(NULL == (udata->heap->dblk_image = H5FL_BLK_MALLOC(lheap_chunk, udata->heap->dblk_size)))
+        if (NULL == (udata->heap->dblk_image = H5FL_BLK_MALLOC(lheap_chunk, udata->heap->dblk_size)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate data block image buffer")
 
         /* Read local heap data block */
-        if(H5F_block_read(f, H5FD_MEM_LHEAP, udata->heap->dblk_addr, udata->heap->dblk_size, dxpl_id, udata->heap->dblk_image) < 0)
+        if (H5F_block_read(f, H5FD_MEM_LHEAP, udata->heap->dblk_addr, udata->heap->dblk_size, dxpl_id,
+                           udata->heap->dblk_image) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read local heap data block")
 
         /* Build free list */
-        if(H5HL_fl_deserialize(udata->heap) < 0)
+        if (H5HL_fl_deserialize(udata->heap) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't initialize free list")
     } /* end if */
 
@@ -665,14 +650,13 @@ H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
 done:
     /* Release the [possibly partially initialized] local heap on errors */
-    if(!ret_value && dblk)
-        if(H5HL_dblk_dest(dblk) < 0)
-	    HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, NULL, "unable to destroy local heap data block")
+    if (!ret_value && dblk)
+        if (H5HL_dblk_dest(dblk) < 0)
+            HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, NULL, "unable to destroy local heap data block")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_datablock_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_datablock_flush
  *
@@ -688,11 +672,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
-    void *_thing, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, void *_thing,
+                     unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_dblk_t *dblk      = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
+    herr_t       ret_value = SUCCEED;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -703,8 +687,8 @@ H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
     HDassert(dblk->heap);
     HDassert(!dblk->heap->single_cache_obj);
 
-    if(dblk->cache_info.is_dirty) {
-        H5HL_t *heap = dblk->heap;      /* Pointer to the local heap */
+    if (dblk->cache_info.is_dirty) {
+        H5HL_t *heap = dblk->heap; /* Pointer to the local heap */
 
         /* Update the free block value from the free list */
         heap->free_block = heap->freelist ? heap->freelist->offset : H5HL_FREE_NULL;
@@ -713,22 +697,22 @@ H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
         H5HL_fl_serialize(heap);
 
         /* Write the data block to the file */
-        if(H5F_block_write(f, H5FD_MEM_LHEAP, heap->dblk_addr, heap->dblk_size, dxpl_id, heap->dblk_image) < 0)
+        if (H5F_block_write(f, H5FD_MEM_LHEAP, heap->dblk_addr, heap->dblk_size, dxpl_id, heap->dblk_image) <
+            0)
             HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write heap data block to file")
 
-	dblk->cache_info.is_dirty = FALSE;
+        dblk->cache_info.is_dirty = FALSE;
     } /* end if */
 
     /* Should we destroy the memory version? */
-    if(destroy)
-        if(H5HL_datablock_dest(f, dblk) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap data block")
+    if (destroy)
+        if (H5HL_datablock_dest(f, dblk) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap data block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_datablock_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_datablock_dest
  *
@@ -745,8 +729,8 @@ done:
 static herr_t
 H5HL_datablock_dest(H5F_t *f, void *_thing)
 {
-    H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_dblk_t *dblk      = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
+    herr_t       ret_value = SUCCEED;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -763,22 +747,22 @@ H5HL_datablock_dest(H5F_t *f, void *_thing)
     HDassert(!dblk->cache_info.free_file_space_on_destroy || H5F_addr_defined(dblk->cache_info.addr));
 
     /* Check for freeing file space for local heap data block */
-    if(dblk->cache_info.free_file_space_on_destroy) {
+    if (dblk->cache_info.free_file_space_on_destroy) {
         /* Free the local heap data block on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_LHEAP, H5AC_dxpl_id, dblk->cache_info.addr, (hsize_t)dblk->heap->dblk_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_LHEAP, H5AC_dxpl_id, dblk->cache_info.addr,
+                       (hsize_t)dblk->heap->dblk_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free local heap data block")
     } /* end if */
 
     /* Destroy local heap data block */
-    if(H5HL_dblk_dest(dblk) < 0)
+    if (H5HL_dblk_dest(dblk) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't destroy local heap data block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_datablock_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_datablock_clear
  *
@@ -795,8 +779,8 @@ done:
 static herr_t
 H5HL_datablock_clear(H5F_t *f, void *_thing, hbool_t destroy)
 {
-    H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HL_dblk_t *dblk      = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
+    herr_t       ret_value = SUCCEED;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -806,15 +790,14 @@ H5HL_datablock_clear(H5F_t *f, void *_thing, hbool_t destroy)
     /* Mark local heap data block as clean */
     dblk->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5HL_datablock_dest(f, dblk) < 0)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap data block")
+    if (destroy)
+        if (H5HL_datablock_dest(f, dblk) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap data block")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_datablock_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_datablock_size
  *
@@ -846,4 +829,3 @@ H5HL_datablock_size(const H5F_t H5_ATTR_UNUSED *f, const void *_thing, size_t *s
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HL_datablock_size() */
-
diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c
index 55f695d..9df2cb5 100644
--- a/src/H5HLdbg.c
+++ b/src/H5HLdbg.c
@@ -16,16 +16,14 @@
  *
  * Purpose:	Local Heap object debugging functions.
  */
-#define H5HL_PACKAGE		/* Suppress error about including H5HLpkg */
+#define H5HL_PACKAGE /* Suppress error about including H5HLpkg */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		        */
+#include "H5HLpkg.h"     /* Local heaps				*/
+#include "H5Iprivate.h"  /* ID Functions		                */
+#include "H5MMprivate.h" /* Memory management			*/
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		        */
-#include "H5HLpkg.h"		/* Local heaps				*/
-#include "H5Iprivate.h"		/* ID Functions		                */
-#include "H5MMprivate.h"	/* Memory management			*/
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_debug
  *
@@ -49,14 +47,14 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int fwidth)
+H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    H5HL_t		*h = NULL;
-    int			free_block;
-    H5HL_free_t		*freelist;
-    uint8_t		*marker = NULL;
-    size_t		amount_free = 0;
-    herr_t              ret_value = SUCCEED;       /* Return value */
+    H5HL_t *     h = NULL;
+    int          free_block;
+    H5HL_free_t *freelist;
+    uint8_t *    marker      = NULL;
+    size_t       amount_free = 0;
+    herr_t       ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -67,57 +65,50 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    if(NULL == (h = (H5HL_t *)H5HL_protect(f, dxpl_id, addr, H5AC_READ)))
+    if (NULL == (h = (H5HL_t *)H5HL_protect(f, dxpl_id, addr, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load heap")
 
     HDfprintf(stream, "%*sLocal Heap...\n", indent, "");
     HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-	    "Header size (in bytes):",
-	    (unsigned long)h->prfx_size);
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Address of heap data:",
-	      h->dblk_addr);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	    "Data bytes allocated for heap:",
-            h->dblk_size);
+              "Header size (in bytes):", (unsigned long)h->prfx_size);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Address of heap data:", h->dblk_addr);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Data bytes allocated for heap:", h->dblk_size);
 
     /*
      * Traverse the free list and check that all free blocks fall within
      * the heap and that no two free blocks point to the same region of
      * the heap.  */
-    if(NULL == (marker = (uint8_t *)H5MM_calloc(h->dblk_size)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
+    if (NULL == (marker = (uint8_t *)H5MM_calloc(h->dblk_size)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
     HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
-    for(free_block = 0, freelist = h->freelist; freelist; freelist = freelist->next, free_block++) {
+    for (free_block = 0, freelist = h->freelist; freelist; freelist = freelist->next, free_block++) {
         char temp_str[32];
 
         HDsnprintf(temp_str, sizeof(temp_str), "Block #%d:", free_block);
-	HDfprintf(stream, "%*s%-*s %8Zu, %8Zu\n", indent+3, "", MAX(0,fwidth-9),
-		temp_str,
-		freelist->offset, freelist->size);
-	if((freelist->offset + freelist->size) > h->dblk_size)
-	    HDfprintf(stream, "***THAT FREE BLOCK IS OUT OF BOUNDS!\n");
-	else {
-            int	overlap = 0;
+        HDfprintf(stream, "%*s%-*s %8Zu, %8Zu\n", indent + 3, "", MAX(0, fwidth - 9), temp_str,
+                  freelist->offset, freelist->size);
+        if ((freelist->offset + freelist->size) > h->dblk_size)
+            HDfprintf(stream, "***THAT FREE BLOCK IS OUT OF BOUNDS!\n");
+        else {
+            int    overlap = 0;
             size_t i;
 
-	    for(i = 0; i < freelist->size; i++) {
-		if(marker[freelist->offset + i])
-		    overlap++;
-		marker[freelist->offset + i] = 1;
-	    } /* end for */
-	    if(overlap)
-		HDfprintf(stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
-	    else
-		amount_free += freelist->size;
-	} /* end for */
-    } /* end for */
-
-    if(h->dblk_size)
-	HDfprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth,
-		"Percent of heap used:",
-		((double)100.0f * (double)(h->dblk_size - amount_free) / (double)h->dblk_size));
+            for (i = 0; i < freelist->size; i++) {
+                if (marker[freelist->offset + i])
+                    overlap++;
+                marker[freelist->offset + i] = 1;
+            } /* end for */
+            if (overlap)
+                HDfprintf(stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
+            else
+                amount_free += freelist->size;
+        } /* end for */
+    }     /* end for */
+
+    if (h->dblk_size)
+        HDfprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth, "Percent of heap used:",
+                  ((double)100.0f * (double)(h->dblk_size - amount_free) / (double)h->dblk_size));
 
     /*
      * Print the data in a VMS-style octal dump.
@@ -125,10 +116,9 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int
     H5_buffer_dump(stream, indent, h->dblk_image, marker, (size_t)0, h->dblk_size);
 
 done:
-    if(h && H5HL_unprotect(h) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
+    if (h && H5HL_unprotect(h) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
     H5MM_xfree(marker);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_debug() */
-
diff --git a/src/H5HLint.c b/src/H5HLint.c
index f9f34e0..6f1983e 100644
--- a/src/H5HLint.c
+++ b/src/H5HLint.c
@@ -26,47 +26,39 @@
 /* Module Setup */
 /****************/
 
-#define H5HL_PACKAGE		/* Suppress error about including H5HLpkg */
-
+#define H5HL_PACKAGE /* Suppress error about including H5HLpkg */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HLpkg.h"		/* Local Heaps				*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5HLpkg.h"    /* Local Heaps				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -80,8 +72,6 @@ H5FL_DEFINE_STATIC(H5HL_dblk_t);
 /* Declare a free list to manage the H5HL_prfx_t struct */
 H5FL_DEFINE_STATIC(H5HL_prfx_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_new
  *
@@ -99,8 +89,8 @@ H5FL_DEFINE_STATIC(H5HL_prfx_t);
 H5HL_t *
 H5HL_new(size_t sizeof_size, size_t sizeof_addr, size_t prfx_size)
 {
-    H5HL_t *heap = NULL;        /* New local heap */
-    H5HL_t *ret_value;          /* Return value */
+    H5HL_t *heap = NULL; /* New local heap */
+    H5HL_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -110,13 +100,13 @@ H5HL_new(size_t sizeof_size, size_t sizeof_addr, size_t prfx_size)
     HDassert(prfx_size > 0);
 
     /* Allocate new local heap structure */
-    if(NULL == (heap = H5FL_CALLOC(H5HL_t)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
+    if (NULL == (heap = H5FL_CALLOC(H5HL_t)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
 
     /* Initialize non-zero fields */
     heap->sizeof_size = sizeof_size;
     heap->sizeof_addr = sizeof_addr;
-    heap->prfx_size = prfx_size;
+    heap->prfx_size   = prfx_size;
 
     /* Set the return value */
     ret_value = heap;
@@ -125,7 +115,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_inc_rc
  *
@@ -154,7 +143,6 @@ H5HL_inc_rc(H5HL_t *heap)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HL_inc_rc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_dec_rc
  *
@@ -181,13 +169,12 @@ H5HL_dec_rc(H5HL_t *heap)
     heap->rc--;
 
     /* Check if we should destroy the heap */
-    if(heap->rc == 0)
+    if (heap->rc == 0)
         H5HL_dest(heap);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HL_dec_rc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_dest
  *
@@ -215,21 +202,20 @@ H5HL_dest(H5HL_t *heap)
     HDassert(heap->prfx == NULL);
     HDassert(heap->dblk == NULL);
 
-    if(heap->dblk_image)
+    if (heap->dblk_image)
         heap->dblk_image = H5FL_BLK_FREE(lheap_chunk, heap->dblk_image);
-    while(heap->freelist) {
-        H5HL_free_t	*fl;
+    while (heap->freelist) {
+        H5HL_free_t *fl;
 
-        fl = heap->freelist;
+        fl             = heap->freelist;
         heap->freelist = fl->next;
-        fl = H5FL_FREE(H5HL_free_t, fl);
+        fl             = H5FL_FREE(H5HL_free_t, fl);
     } /* end while */
     heap = H5FL_FREE(H5HL_t, heap);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HL_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_prfx_new
  *
@@ -247,8 +233,8 @@ H5HL_dest(H5HL_t *heap)
 H5HL_prfx_t *
 H5HL_prfx_new(H5HL_t *heap)
 {
-    H5HL_prfx_t *prfx = NULL;       /* New local heap prefix */
-    H5HL_prfx_t *ret_value;         /* Return value */
+    H5HL_prfx_t *prfx = NULL; /* New local heap prefix */
+    H5HL_prfx_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -256,12 +242,12 @@ H5HL_prfx_new(H5HL_t *heap)
     HDassert(heap);
 
     /* Allocate new local heap prefix */
-    if(NULL == (prfx = H5FL_CALLOC(H5HL_prfx_t)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
+    if (NULL == (prfx = H5FL_CALLOC(H5HL_prfx_t)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
 
     /* Increment ref. count on heap data structure */
-    if(H5HL_inc_rc(heap) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment heap ref. count")
+    if (H5HL_inc_rc(heap) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment heap ref. count")
 
     /* Link the heap & the prefix */
     prfx->heap = heap;
@@ -274,7 +260,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_prfx_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_prfx_dest
  *
@@ -292,7 +277,7 @@ done:
 herr_t
 H5HL_prfx_dest(H5HL_prfx_t *prfx)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -300,12 +285,12 @@ H5HL_prfx_dest(H5HL_prfx_t *prfx)
     HDassert(prfx);
 
     /* Check if prefix was initialized */
-    if(prfx->heap) {
+    if (prfx->heap) {
         /* Unlink prefix from heap */
         prfx->heap->prfx = NULL;
 
         /* Decrement ref. count on heap data structure */
-        if(H5HL_dec_rc(prfx->heap) < 0)
+        if (H5HL_dec_rc(prfx->heap) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement heap ref. count")
 
         /* Unlink heap from prefix */
@@ -319,7 +304,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_prfx_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_dblk_new
  *
@@ -337,8 +321,8 @@ done:
 H5HL_dblk_t *
 H5HL_dblk_new(H5HL_t *heap)
 {
-    H5HL_dblk_t *dblk = NULL;       /* New local heap data block */
-    H5HL_dblk_t *ret_value;         /* Return value */
+    H5HL_dblk_t *dblk = NULL; /* New local heap data block */
+    H5HL_dblk_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -346,12 +330,12 @@ H5HL_dblk_new(H5HL_t *heap)
     HDassert(heap);
 
     /* Allocate new local heap data block */
-    if(NULL == (dblk = H5FL_CALLOC(H5HL_dblk_t)))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
+    if (NULL == (dblk = H5FL_CALLOC(H5HL_dblk_t)))
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
 
     /* Increment ref. count on heap data structure */
-    if(H5HL_inc_rc(heap) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment heap ref. count")
+    if (H5HL_inc_rc(heap) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment heap ref. count")
 
     /* Link the heap & the data block */
     dblk->heap = heap;
@@ -364,7 +348,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_dblk_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5HL_dblk_dest
  *
@@ -382,7 +365,7 @@ done:
 herr_t
 H5HL_dblk_dest(H5HL_dblk_t *dblk)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -390,16 +373,16 @@ H5HL_dblk_dest(H5HL_dblk_t *dblk)
     HDassert(dblk);
 
     /* Check if data block was initialized */
-    if(dblk->heap) {
+    if (dblk->heap) {
         /* Unlink data block from heap */
         dblk->heap->dblk = NULL;
 
         /* Unpin the local heap prefix */
-        if(H5AC_unpin_entry(dblk->heap->prfx) < 0)
+        if (H5AC_unpin_entry(dblk->heap->prfx) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "can't unpin local heap prefix")
 
         /* Decrement ref. count on heap data structure */
-        if(H5HL_dec_rc(dblk->heap) < 0)
+        if (H5HL_dec_rc(dblk->heap) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement heap ref. count")
 
         /* Unlink heap from data block */
@@ -412,4 +395,3 @@ H5HL_dblk_dest(H5HL_dblk_t *dblk)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HL_dblk_dest() */
-
diff --git a/src/H5HLpkg.h b/src/H5HLpkg.h
index e3b49d9..412a4df 100644
--- a/src/H5HLpkg.h
+++ b/src/H5HLpkg.h
@@ -30,8 +30,7 @@
 #include "H5HLprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5FLprivate.h"	/* Free lists                           */
-
+#include "H5FLprivate.h" /* Free lists                           */
 
 /*****************************/
 /* Package Private Variables */
@@ -49,32 +48,30 @@ H5FL_EXTERN(H5HL_free_t);
 /* Declare extern the PQ free list to manage the heap chunk information */
 H5FL_BLK_EXTERN(lheap_chunk);
 
-
 /**************************/
 /* Package Private Macros */
 /**************************/
 
-#define H5HL_SIZEOF_HDR(F)						      \
-    H5HL_ALIGN(H5_SIZEOF_MAGIC +	/*heap signature		*/    \
-	       1 +			/*version			*/    \
-	       3 +			/*reserved			*/    \
-	       H5F_SIZEOF_SIZE(F) +	/*data size			*/    \
-	       H5F_SIZEOF_SIZE(F) +	/*free list head		*/    \
-	       H5F_SIZEOF_ADDR(F))	/*data address			*/
+#define H5HL_SIZEOF_HDR(F)                                                                                   \
+    H5HL_ALIGN(H5_SIZEOF_MAGIC +    /*heap signature		*/                                                     \
+               1 +                  /*version			*/                                                           \
+               3 +                  /*reserved			*/                                                          \
+               H5F_SIZEOF_SIZE(F) + /*data size			*/                                                         \
+               H5F_SIZEOF_SIZE(F) + /*free list head		*/                                                     \
+               H5F_SIZEOF_ADDR(F))  /*data address			*/
 
 /* Value indicating end of free list on disk */
-#define H5HL_FREE_NULL	1
-
+#define H5HL_FREE_NULL 1
 
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
 typedef struct H5HL_free_t {
-    size_t		offset;		/*offset of free block		*/
-    size_t		size;		/*size of free block		*/
-    struct H5HL_free_t	*prev;		/*previous entry in free list	*/
-    struct H5HL_free_t	*next;		/*next entry in free list	*/
+    size_t              offset; /*offset of free block		*/
+    size_t              size;   /*size of free block		*/
+    struct H5HL_free_t *prev;   /*previous entry in free list	*/
+    struct H5HL_free_t *next;   /*next entry in free list	*/
 } H5HL_free_t;
 
 /* Forward declarations */
@@ -83,47 +80,47 @@ typedef struct H5HL_prfx_t H5HL_prfx_t;
 
 struct H5HL_t {
     /* General heap-management fields */
-    size_t                  rc;         /* Ref. count for prefix & data block using this struct */
-    size_t                  prots;      /* # of times the heap has been protected */
-    size_t                  sizeof_size; /* Size of file sizes */
-    size_t                  sizeof_addr; /* Size of file addresses */
-    hbool_t                 single_cache_obj;   /* Indicate if the heap is a single object in the cache */
-    H5HL_free_t		   *freelist;	/*the free list			*/
+    size_t       rc;               /* Ref. count for prefix & data block using this struct */
+    size_t       prots;            /* # of times the heap has been protected */
+    size_t       sizeof_size;      /* Size of file sizes */
+    size_t       sizeof_addr;      /* Size of file addresses */
+    hbool_t      single_cache_obj; /* Indicate if the heap is a single object in the cache */
+    H5HL_free_t *freelist;         /*the free list			*/
 
     /* Prefix-specific fields */
-    H5HL_prfx_t            *prfx;       /* The prefix object for the heap */
-    haddr_t                 prfx_addr;  /* address of heap prefix */
-    size_t                  prfx_size;  /* size of heap prefix */
-    hsize_t                 free_block; /* Address of first free block */
+    H5HL_prfx_t *prfx;       /* The prefix object for the heap */
+    haddr_t      prfx_addr;  /* address of heap prefix */
+    size_t       prfx_size;  /* size of heap prefix */
+    hsize_t      free_block; /* Address of first free block */
 
     /* Data block-specific fields */
-    H5HL_dblk_t            *dblk;       /* The data block object for the heap */
-    haddr_t		    dblk_addr;	/* address of data block	*/
-    size_t		    dblk_size;	/* size of heap data block on disk and in mem */
-    uint8_t		   *dblk_image;	/* The data block image */
+    H5HL_dblk_t *dblk;       /* The data block object for the heap */
+    haddr_t      dblk_addr;  /* address of data block	*/
+    size_t       dblk_size;  /* size of heap data block on disk and in mem */
+    uint8_t *    dblk_image; /* The data block image */
 };
 
 /* Struct for heap data block */
 struct H5HL_dblk_t {
-    H5AC_info_t cache_info;    /* Information for H5AC cache functions, _must_ be */
-                                /* first field in structure */
-    H5HL_t                 *heap;       /* Pointer to heap for data block */
+    H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
+                            /* first field in structure */
+    H5HL_t *heap;           /* Pointer to heap for data block */
 };
 
 /* Struct for heap prefix */
 struct H5HL_prfx_t {
-    H5AC_info_t cache_info;    /* Information for H5AC cache functions, _must_ be */
-                                /* first field in structure */
-    H5HL_t                 *heap;       /* Pointer to heap for prefix */
+    H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
+                            /* first field in structure */
+    H5HL_t *heap;           /* Pointer to heap for prefix */
 };
 
 /* Callback information for loading local heap prefix from disk */
 typedef struct H5HL_cache_prfx_ud_t {
     /* Downwards */
-    size_t sizeof_size;                 /* Size of file sizes */
-    size_t sizeof_addr;                 /* Size of file addresses */
-    haddr_t prfx_addr;                  /* Address of prefix */
-    size_t sizeof_prfx;                 /* Size of heap prefix */
+    size_t  sizeof_size; /* Size of file sizes */
+    size_t  sizeof_addr; /* Size of file addresses */
+    haddr_t prfx_addr;   /* Address of prefix */
+    size_t  sizeof_prfx; /* Size of heap prefix */
 
     /* Upwards */
 } H5HL_cache_prfx_ud_t;
@@ -131,28 +128,26 @@ typedef struct H5HL_cache_prfx_ud_t {
 /* Callback information for loading local heap data block from disk */
 typedef struct H5HL_cache_dblk_ud_t {
     /* Downwards */
-    H5HL_t *heap;                       /* Local heap */
+    H5HL_t *heap; /* Local heap */
 
     /* Upwards */
-    hbool_t loaded;                     /* Whether data block was loaded from file */
+    hbool_t loaded; /* Whether data block was loaded from file */
 } H5HL_cache_dblk_ud_t;
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 
 /* Heap routines */
 H5_DLL H5HL_t *H5HL_new(size_t sizeof_size, size_t sizeof_addr, size_t prfx_size);
-H5_DLL herr_t H5HL_dest(H5HL_t *heap);
+H5_DLL herr_t  H5HL_dest(H5HL_t *heap);
 
 /* Heap prefix routines */
 H5_DLL H5HL_prfx_t *H5HL_prfx_new(H5HL_t *heap);
-H5_DLL herr_t H5HL_prfx_dest(H5HL_prfx_t *prfx);
+H5_DLL herr_t       H5HL_prfx_dest(H5HL_prfx_t *prfx);
 
 /* Heap data block routines */
 H5_DLL H5HL_dblk_t *H5HL_dblk_new(H5HL_t *heap);
-H5_DLL herr_t H5HL_dblk_dest(H5HL_dblk_t *dblk);
+H5_DLL herr_t       H5HL_dblk_dest(H5HL_dblk_t *dblk);
 
 #endif /* _H5HLpkg_H */
-
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index 17d2196..0ec047b 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -30,23 +30,23 @@
 #include "H5HLpublic.h"
 
 /* Private headers needed by this file. */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Fprivate.h"		/* File access				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Fprivate.h"  /* File access				*/
 
 /*
  * Feature: Define H5HL_DEBUG on the compiler command line if you want to
  *	    diagnostic messages from this layer.
  */
 #ifdef NDEBUG
-#  undef H5HL_DEBUG
+#undef H5HL_DEBUG
 #endif
 
-#define H5HL_ALIGN(X)	((((unsigned)X)+7)&(unsigned)(~0x07)) /*align on 8-byte boundary	*/
+#define H5HL_ALIGN(X) ((((unsigned)X) + 7) & (unsigned)(~0x07)) /*align on 8-byte boundary	*/
 
-#define H5HL_SIZEOF_FREE(F)						      \
-    H5HL_ALIGN(H5F_SIZEOF_SIZE (F) +	/*ptr to next free block	*/    \
-	       H5F_SIZEOF_SIZE (F))	/*size of this free block	*/
+#define H5HL_SIZEOF_FREE(F)                                                                                  \
+    H5HL_ALIGN(H5F_SIZEOF_SIZE(F) + /*ptr to next free block	*/                                              \
+               H5F_SIZEOF_SIZE(F))  /*size of this free block	*/
 
 /****************************/
 /* Library Private Typedefs */
@@ -58,20 +58,16 @@ typedef struct H5HL_t H5HL_t;
 /*
  * Library prototypes...
  */
-H5_DLL herr_t H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr/*out*/);
+H5_DLL herr_t H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr /*out*/);
 H5_DLL H5HL_t *H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw);
-H5_DLL void *H5HL_offset_into(const H5HL_t *heap, size_t offset);
-H5_DLL herr_t H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset,
-    size_t size);
-H5_DLL herr_t H5HL_unprotect(H5HL_t *heap);
-H5_DLL size_t H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t size,
-    const void *buf);
-H5_DLL herr_t H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr);
-H5_DLL herr_t H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size);
-H5_DLL herr_t H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size);
+H5_DLL void *  H5HL_offset_into(const H5HL_t *heap, size_t offset);
+H5_DLL herr_t  H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size);
+H5_DLL herr_t  H5HL_unprotect(H5HL_t *heap);
+H5_DLL size_t  H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t size, const void *buf);
+H5_DLL herr_t  H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr);
+H5_DLL herr_t  H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size);
+H5_DLL herr_t  H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size);
 
 /* Debugging functions */
-H5_DLL herr_t H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
-			  int fwidth);
+H5_DLL herr_t H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
 #endif
-
diff --git a/src/H5HP.c b/src/H5HP.c
index c77610c..74a86a9 100644
--- a/src/H5HP.c
+++ b/src/H5HP.c
@@ -19,29 +19,28 @@
  *
  */
 
-
 /* Private headers needed */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HPprivate.h"	/* Heap routines			*/
-#include "H5FLprivate.h"	/* Memory management functions		*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HPprivate.h" /* Heap routines			*/
+#include "H5FLprivate.h" /* Memory management functions		*/
 
 /* Local Macros */
-#define H5HP_START_SIZE 16      /* Initial number of entries for heaps */
+#define H5HP_START_SIZE 16 /* Initial number of entries for heaps */
 
 /* Private typedefs & structs */
 
 /* Data structure for entries in the internal heap array */
 typedef struct {
-    int val;            /* Value to be used for heap condition */
-    H5HP_info_t *obj;   /* Pointer to object stored in heap */
-}H5HP_ent_t;
+    int          val; /* Value to be used for heap condition */
+    H5HP_info_t *obj; /* Pointer to object stored in heap */
+} H5HP_ent_t;
 
 /* Main heap data structure */
 struct H5HP_t {
     H5HP_type_t type;   /* Type of heap (minimum or maximum value at "top") */
-    size_t nobjs;       /* Number of active objects in heap array */
-    size_t nalloc;      /* Number of allocated locations in heap array */
+    size_t      nobjs;  /* Number of active objects in heap array */
+    size_t      nalloc; /* Number of allocated locations in heap array */
     H5HP_ent_t *heap;   /* Pointer to array containing heap entries */
 };
 
@@ -57,7 +56,6 @@ H5FL_DEFINE_STATIC(H5HP_t);
 /* Declare a free list to manage sequences of H5HP_ent_t */
 H5FL_SEQ_DEFINE_STATIC(H5HP_ent_t);
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_swim_max
@@ -82,40 +80,39 @@ H5FL_SEQ_DEFINE_STATIC(H5HP_ent_t);
 static herr_t
 H5HP_swim_max(H5HP_t *heap, size_t loc)
 {
-    int val;                    /* Temporary copy value of object to move in heap */
-    H5HP_info_t *obj;           /* Temporary pointer to object to move in heap */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    int          val;                 /* Temporary copy value of object to move in heap */
+    H5HP_info_t *obj;                 /* Temporary pointer to object to move in heap */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Get copies of the information about the object to move in the heap */
-    val=heap->heap[loc].val;
-    obj=heap->heap[loc].obj;
+    val = heap->heap[loc].val;
+    obj = heap->heap[loc].obj;
 
     /* Move object up in heap until it's reached the maximum location possible */
-    while(heap->heap[loc/2].val < val) {
+    while (heap->heap[loc / 2].val < val) {
         /* Move object "above" current location in heap down */
-        heap->heap[loc].val=heap->heap[loc/2].val;
-        heap->heap[loc].obj=heap->heap[loc/2].obj;
+        heap->heap[loc].val = heap->heap[loc / 2].val;
+        heap->heap[loc].obj = heap->heap[loc / 2].obj;
 
         /* Update heap location for object which moved */
-        heap->heap[loc].obj->heap_loc=loc;
+        heap->heap[loc].obj->heap_loc = loc;
 
         /* Move to location "above" current location */
-        loc=loc/2;
+        loc = loc / 2;
     } /* end while */
 
     /* Put object into heap at correct location */
-    heap->heap[loc].val=val;
-    heap->heap[loc].obj=obj;
+    heap->heap[loc].val = val;
+    heap->heap[loc].obj = obj;
 
     /* Update heap location for object */
-    heap->heap[loc].obj->heap_loc=loc;
+    heap->heap[loc].obj->heap_loc = loc;
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_swim_max() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_swim_min
@@ -140,40 +137,39 @@ H5HP_swim_max(H5HP_t *heap, size_t loc)
 static herr_t
 H5HP_swim_min(H5HP_t *heap, size_t loc)
 {
-    int val;                    /* Temporary copy value of object to move in heap */
-    H5HP_info_t *obj;           /* Temporary pointer to object to move in heap */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    int          val;                 /* Temporary copy value of object to move in heap */
+    H5HP_info_t *obj;                 /* Temporary pointer to object to move in heap */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Get copies of the information about the object to move in the heap */
-    val=heap->heap[loc].val;
-    obj=heap->heap[loc].obj;
+    val = heap->heap[loc].val;
+    obj = heap->heap[loc].obj;
 
     /* Move object up in heap until it's reached the minimum location possible */
-    while(heap->heap[loc/2].val > val) {
+    while (heap->heap[loc / 2].val > val) {
         /* Move object "above" current location in heap down */
-        heap->heap[loc].val=heap->heap[loc/2].val;
-        heap->heap[loc].obj=heap->heap[loc/2].obj;
+        heap->heap[loc].val = heap->heap[loc / 2].val;
+        heap->heap[loc].obj = heap->heap[loc / 2].obj;
 
         /* Update heap location for object which moved */
-        heap->heap[loc].obj->heap_loc=loc;
+        heap->heap[loc].obj->heap_loc = loc;
 
         /* Move to location "above" current location */
-        loc=loc/2;
+        loc = loc / 2;
     } /* end while */
 
     /* Put object into heap at correct location */
-    heap->heap[loc].val=val;
-    heap->heap[loc].obj=obj;
+    heap->heap[loc].val = val;
+    heap->heap[loc].obj = obj;
 
     /* Update heap location for object */
-    heap->heap[loc].obj->heap_loc=loc;
+    heap->heap[loc].obj->heap_loc = loc;
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_swim_min() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_sink_max
@@ -198,38 +194,38 @@ H5HP_swim_min(H5HP_t *heap, size_t loc)
 static herr_t
 H5HP_sink_max(H5HP_t *heap, size_t loc)
 {
-    int val;                    /* Temporary copy value of object to move in heap */
-    void *obj;                  /* Temporary pointer to object to move in heap */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    int    val;                 /* Temporary copy value of object to move in heap */
+    void * obj;                 /* Temporary pointer to object to move in heap */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Get copies of the information about the object to move in the heap */
-    val=heap->heap[loc].val;
-    obj=heap->heap[loc].obj;
+    val = heap->heap[loc].val;
+    obj = heap->heap[loc].obj;
 
     /* Move object up in heap until it's reached the maximum location possible */
-    while((2*loc)<=heap->nobjs) {
-        size_t new_loc=loc*2;   /* New object's potential location area */
+    while ((2 * loc) <= heap->nobjs) {
+        size_t new_loc = loc * 2; /* New object's potential location area */
 
         /* Get the greater of the two objects below the location in heap */
-        if(new_loc<heap->nobjs && (heap->heap[new_loc].val < heap->heap[new_loc+1].val))
+        if (new_loc < heap->nobjs && (heap->heap[new_loc].val < heap->heap[new_loc + 1].val))
             new_loc++;
 
         /* Check if the object is smaller than the larger of the objects below it */
         /* If so, its in the correct location now, and we can get out */
-        if(val >= heap->heap[new_loc].val)
+        if (val >= heap->heap[new_loc].val)
             break;
 
         /* Move the greater of the two objects below the current location up */
-        heap->heap[loc].val=heap->heap[new_loc].val;
-        heap->heap[loc].obj=heap->heap[new_loc].obj;
+        heap->heap[loc].val = heap->heap[new_loc].val;
+        heap->heap[loc].obj = heap->heap[new_loc].obj;
 
         /* Update heap location for object which moved */
-        heap->heap[loc].obj->heap_loc=loc;
+        heap->heap[loc].obj->heap_loc = loc;
 
         /* Move to location "below" current location */
-        loc=new_loc;
+        loc = new_loc;
     } /* end while */
 
     /* Put object into heap at correct location */
@@ -242,7 +238,6 @@ H5HP_sink_max(H5HP_t *heap, size_t loc)
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_sink_max() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_sink_min
@@ -267,38 +262,38 @@ H5HP_sink_max(H5HP_t *heap, size_t loc)
 static herr_t
 H5HP_sink_min(H5HP_t *heap, size_t loc)
 {
-    int val;                    /* Temporary copy value of object to move in heap */
-    void *obj;                  /* Temporary pointer to object to move in heap */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    int    val;                 /* Temporary copy value of object to move in heap */
+    void * obj;                 /* Temporary pointer to object to move in heap */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Get copies of the information about the object to move in the heap */
-    val=heap->heap[loc].val;
-    obj=heap->heap[loc].obj;
+    val = heap->heap[loc].val;
+    obj = heap->heap[loc].obj;
 
     /* Move object up in heap until it's reached the maximum location possible */
-    while((2*loc)<=heap->nobjs) {
-        size_t new_loc=loc*2;   /* New object's potential location area */
+    while ((2 * loc) <= heap->nobjs) {
+        size_t new_loc = loc * 2; /* New object's potential location area */
 
         /* Get the lesser of the two objects below the location in heap */
-        if(new_loc<heap->nobjs && (heap->heap[new_loc].val > heap->heap[new_loc+1].val))
+        if (new_loc < heap->nobjs && (heap->heap[new_loc].val > heap->heap[new_loc + 1].val))
             new_loc++;
 
         /* Check if the object is greater than the larger of the objects below it */
         /* If so, its in the correct location now, and we can get out */
-        if(val <= heap->heap[new_loc].val)
+        if (val <= heap->heap[new_loc].val)
             break;
 
         /* Move the greater of the two objects below the current location up */
-        heap->heap[loc].val=heap->heap[new_loc].val;
-        heap->heap[loc].obj=heap->heap[new_loc].obj;
+        heap->heap[loc].val = heap->heap[new_loc].val;
+        heap->heap[loc].obj = heap->heap[new_loc].obj;
 
         /* Update heap location for object which moved */
-        heap->heap[loc].obj->heap_loc=loc;
+        heap->heap[loc].obj->heap_loc = loc;
 
         /* Move to location "below" current location */
-        loc=new_loc;
+        loc = new_loc;
     } /* end while */
 
     /* Put object into heap at correct location */
@@ -311,7 +306,6 @@ H5HP_sink_min(H5HP_t *heap, size_t loc)
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_sink_min() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_create
@@ -334,60 +328,59 @@ H5HP_sink_min(H5HP_t *heap, size_t loc)
 H5HP_t *
 H5HP_create(H5HP_type_t heap_type)
 {
-    H5HP_t *new_heap=NULL;      /* Pointer to new heap object created */
-    H5HP_t *ret_value;          /* Return value */
+    H5HP_t *new_heap = NULL; /* Pointer to new heap object created */
+    H5HP_t *ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Check args */
-    HDassert(heap_type==H5HP_MIN_HEAP || heap_type==H5HP_MAX_HEAP);
+    HDassert(heap_type == H5HP_MIN_HEAP || heap_type == H5HP_MAX_HEAP);
 
     /* Allocate ref-counted string structure */
-    if((new_heap=H5FL_MALLOC(H5HP_t))==NULL)
-        HGOTO_ERROR(H5E_HEAP,H5E_NOSPACE,NULL,"memory allocation failed");
+    if ((new_heap = H5FL_MALLOC(H5HP_t)) == NULL)
+        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, NULL, "memory allocation failed");
 
     /* Allocate the array to store the heap entries */
-    if((new_heap->heap = H5FL_SEQ_MALLOC(H5HP_ent_t, (size_t)(H5HP_START_SIZE + 1)))==NULL)
-        HGOTO_ERROR(H5E_HEAP,H5E_NOSPACE,NULL,"memory allocation failed");
+    if ((new_heap->heap = H5FL_SEQ_MALLOC(H5HP_ent_t, (size_t)(H5HP_START_SIZE + 1))) == NULL)
+        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, NULL, "memory allocation failed");
 
     /* Set the internal fields */
-    new_heap->type=heap_type;
-    new_heap->nobjs=0;
-    new_heap->nalloc=H5HP_START_SIZE+1;
+    new_heap->type   = heap_type;
+    new_heap->nobjs  = 0;
+    new_heap->nalloc = H5HP_START_SIZE + 1;
 
     /* Set the information in the 0'th location based on the type of heap */
-    if(heap_type==H5HP_MIN_HEAP) {
+    if (heap_type == H5HP_MIN_HEAP) {
         /* Set the value in the '0' location to be the minimum value, to
          * simplify the algorithms
          */
-        new_heap->heap[0].val=INT_MIN;
-        new_heap->heap[0].obj=NULL;
+        new_heap->heap[0].val = INT_MIN;
+        new_heap->heap[0].obj = NULL;
     } /* end if */
     else {
         /* Set the value in the '0' location to be the maximum value, to
          * simplify the algorithms
          */
-        new_heap->heap[0].val=INT_MAX;
-        new_heap->heap[0].obj=NULL;
+        new_heap->heap[0].val = INT_MAX;
+        new_heap->heap[0].obj = NULL;
     } /* end else */
 
     /* Set the return value */
-    ret_value=new_heap;
+    ret_value = new_heap;
 
 done:
     /* Error cleanup */
-    if(NULL ==ret_value) {
-        if(NULL != new_heap) {
-            if(NULL != new_heap->heap)
+    if (NULL == ret_value) {
+        if (NULL != new_heap) {
+            if (NULL != new_heap->heap)
                 new_heap->heap = H5FL_SEQ_FREE(H5HP_ent_t, new_heap->heap);
             new_heap = H5FL_FREE(H5HP_t, new_heap);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_count
@@ -409,7 +402,7 @@ done:
 ssize_t
 H5HP_count(const H5HP_t *heap)
 {
-    ssize_t ret_value;   /* Return value */
+    ssize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -418,21 +411,20 @@ H5HP_count(const H5HP_t *heap)
 
     /* Check internal consistency */
     /* (Pre-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     /* Return the number of objects in the heap */
-    H5_CHECK_OVERFLOW(heap->nobjs,size_t,ssize_t);
-    ret_value=(ssize_t)heap->nobjs;
+    H5_CHECK_OVERFLOW(heap->nobjs, size_t, ssize_t);
+    ret_value = (ssize_t)heap->nobjs;
 
     /* No post-condition check necessary, since heap is constant */
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_count() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_insert
@@ -456,7 +448,7 @@ H5HP_count(const H5HP_t *heap)
 herr_t
 H5HP_insert(H5HP_t *heap, int val, void *obj)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -466,38 +458,38 @@ H5HP_insert(H5HP_t *heap, int val, void *obj)
 
     /* Check internal consistency */
     /* (Pre-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     /* Increment number of objects in heap */
     heap->nobjs++;
 
     /* Check if we need to allocate more room for heap array */
-    if(heap->nobjs>=heap->nalloc) {
-        size_t n = MAX(H5HP_START_SIZE, 2*(heap->nalloc-1)) + 1;
-        H5HP_ent_t *new_heap = H5FL_SEQ_REALLOC(H5HP_ent_t,heap->heap, n);
+    if (heap->nobjs >= heap->nalloc) {
+        size_t      n        = MAX(H5HP_START_SIZE, 2 * (heap->nalloc - 1)) + 1;
+        H5HP_ent_t *new_heap = H5FL_SEQ_REALLOC(H5HP_ent_t, heap->heap, n);
 
         if (!new_heap)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to extend heap array");
-        heap->heap = new_heap;
+        heap->heap   = new_heap;
         heap->nalloc = n;
     } /* end if */
 
     /* Insert new object at end of heap */
-    heap->heap[heap->nobjs].val = val;
-    heap->heap[heap->nobjs].obj = (H5HP_info_t *)obj;
+    heap->heap[heap->nobjs].val           = val;
+    heap->heap[heap->nobjs].obj           = (H5HP_info_t *)obj;
     heap->heap[heap->nobjs].obj->heap_loc = heap->nobjs;
 
     /* Restore heap condition */
-    if(heap->type==H5HP_MAX_HEAP) {
-        if(H5HP_swim_max(heap,heap->nobjs)<0)
+    if (heap->type == H5HP_MAX_HEAP) {
+        if (H5HP_swim_max(heap, heap->nobjs) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "unable to restore heap condition");
     } /* end if */
     else {
-        if(H5HP_swim_min(heap,heap->nobjs)<0)
+        if (H5HP_swim_min(heap, heap->nobjs) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "unable to restore heap condition");
     } /* end else */
 
@@ -505,16 +497,15 @@ done:
 
     /* Check internal consistency */
     /* (Post-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_insert() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_top
@@ -545,20 +536,19 @@ H5HP_top(const H5HP_t *heap, int *val)
 
     /* Check internal consistency */
     /* (Pre-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     /* Get value of the top object in the heap */
-    *val=heap->heap[1].val;
+    *val = heap->heap[1].val;
 
     /* No post-condition check necessary, since heap is constant */
     FUNC_LEAVE_NOAPI(SUCCEED);
 } /* end H5HP_top() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_remove
@@ -582,7 +572,7 @@ H5HP_top(const H5HP_t *heap, int *val)
 herr_t
 H5HP_remove(H5HP_t *heap, int *val, void **obj)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -593,55 +583,54 @@ H5HP_remove(H5HP_t *heap, int *val, void **obj)
 
     /* Check internal consistency */
     /* (Pre-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     /* Check if there are any objects on the heap to remove */
-    if(heap->nobjs==0)
+    if (heap->nobjs == 0)
         HGOTO_ERROR(H5E_HEAP, H5E_NOTFOUND, FAIL, "heap is empty");
 
     /* Get the information for the top object on the heap */
-    HDassert(heap->heap[1].obj->heap_loc==1);
-    *val=heap->heap[1].val;
-    *obj=heap->heap[1].obj;
+    HDassert(heap->heap[1].obj->heap_loc == 1);
+    *val = heap->heap[1].val;
+    *obj = heap->heap[1].obj;
 
     /* Move the last element in the heap to the top */
-    heap->heap[1].val=heap->heap[heap->nobjs].val;
-    heap->heap[1].obj=heap->heap[heap->nobjs].obj;
-    heap->heap[1].obj->heap_loc=1;
+    heap->heap[1].val           = heap->heap[heap->nobjs].val;
+    heap->heap[1].obj           = heap->heap[heap->nobjs].obj;
+    heap->heap[1].obj->heap_loc = 1;
 
     /* Decrement number of objects in heap */
     heap->nobjs--;
 
     /* Restore heap condition, if there are objects on the heap */
-    if(heap->nobjs>0) {
-        if(heap->type==H5HP_MAX_HEAP) {
-            if(H5HP_sink_max(heap, (size_t)1) < 0)
+    if (heap->nobjs > 0) {
+        if (heap->type == H5HP_MAX_HEAP) {
+            if (H5HP_sink_max(heap, (size_t)1) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "unable to restore heap condition");
         } /* end if */
         else {
-            if(H5HP_sink_min(heap, (size_t)1) < 0)
+            if (H5HP_sink_min(heap, (size_t)1) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "unable to restore heap condition");
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
 
     /* Check internal consistency */
     /* (Post-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_remove() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_change
@@ -665,10 +654,10 @@ done:
 herr_t
 H5HP_change(H5HP_t *heap, int val, void *_obj)
 {
-    H5HP_info_t *obj=(H5HP_info_t *)_obj;       /* Alias for object */
-    size_t obj_loc;             /* Location of object in heap */
-    int old_val;                /* Object's old priority value */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    H5HP_info_t *obj = (H5HP_info_t *)_obj; /* Alias for object */
+    size_t       obj_loc;                   /* Location of object in heap */
+    int          old_val;                   /* Object's old priority value */
+    herr_t       ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -678,56 +667,55 @@ H5HP_change(H5HP_t *heap, int val, void *_obj)
 
     /* Check internal consistency */
     /* (Pre-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     /* Get the location of the object in the heap */
-    obj_loc=obj->heap_loc;
-    HDassert(obj_loc>0 && obj_loc<=heap->nobjs);
+    obj_loc = obj->heap_loc;
+    HDassert(obj_loc > 0 && obj_loc <= heap->nobjs);
 
     /* Change the heap object's priority */
-    old_val=heap->heap[obj_loc].val;
-    heap->heap[obj_loc].val=val;
+    old_val                 = heap->heap[obj_loc].val;
+    heap->heap[obj_loc].val = val;
 
     /* Restore heap condition */
-    if(val<old_val) {
-        if(heap->type==H5HP_MAX_HEAP) {
-            if(H5HP_sink_max(heap,obj_loc)<0)
+    if (val < old_val) {
+        if (heap->type == H5HP_MAX_HEAP) {
+            if (H5HP_sink_max(heap, obj_loc) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
         } /* end if */
         else {
-            if(H5HP_swim_min(heap,obj_loc)<0)
+            if (H5HP_swim_min(heap, obj_loc) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
-        if(heap->type==H5HP_MAX_HEAP) {
-            if(H5HP_swim_max(heap,obj_loc)<0)
+        if (heap->type == H5HP_MAX_HEAP) {
+            if (H5HP_swim_max(heap, obj_loc) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
         } /* end if */
         else {
-            if(H5HP_sink_min(heap,obj_loc)<0)
+            if (H5HP_sink_min(heap, obj_loc) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
 
     /* Check internal consistency */
     /* (Post-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_change() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_incr
@@ -751,9 +739,9 @@ done:
 herr_t
 H5HP_incr(H5HP_t *heap, unsigned amt, void *_obj)
 {
-    H5HP_info_t *obj=(H5HP_info_t *)_obj;       /* Alias for object */
-    size_t obj_loc;             /* Location of object in heap */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    H5HP_info_t *obj = (H5HP_info_t *)_obj; /* Alias for object */
+    size_t       obj_loc;                   /* Location of object in heap */
+    herr_t       ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -763,11 +751,11 @@ H5HP_incr(H5HP_t *heap, unsigned amt, void *_obj)
 
     /* Check internal consistency */
     /* (Pre-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     /* Get the location of the object in the heap */
     obj_loc = obj->heap_loc;
@@ -777,12 +765,12 @@ H5HP_incr(H5HP_t *heap, unsigned amt, void *_obj)
     heap->heap[obj_loc].val += (int)amt;
 
     /* Restore heap condition */
-    if(H5HP_MAX_HEAP == heap->type) {
-        if(H5HP_swim_max(heap, obj_loc) < 0)
+    if (H5HP_MAX_HEAP == heap->type) {
+        if (H5HP_swim_max(heap, obj_loc) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition")
     } /* end if */
     else {
-        if(H5HP_sink_min(heap, obj_loc) < 0)
+        if (H5HP_sink_min(heap, obj_loc) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition")
     } /* end else */
 
@@ -790,16 +778,15 @@ done:
 
     /* Check internal consistency */
     /* (Post-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_incr() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_decr
@@ -823,9 +810,9 @@ done:
 herr_t
 H5HP_decr(H5HP_t *heap, unsigned amt, void *_obj)
 {
-    H5HP_info_t *obj=(H5HP_info_t *)_obj;       /* Alias for object */
-    size_t obj_loc;             /* Location of object in heap */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    H5HP_info_t *obj = (H5HP_info_t *)_obj; /* Alias for object */
+    size_t       obj_loc;                   /* Location of object in heap */
+    herr_t       ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -835,26 +822,26 @@ H5HP_decr(H5HP_t *heap, unsigned amt, void *_obj)
 
     /* Check internal consistency */
     /* (Pre-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     /* Get the location of the object in the heap */
-    obj_loc=obj->heap_loc;
-    HDassert(obj_loc>0 && obj_loc<=heap->nobjs);
+    obj_loc = obj->heap_loc;
+    HDassert(obj_loc > 0 && obj_loc <= heap->nobjs);
 
     /* Change the heap object's priority */
-    heap->heap[obj_loc].val-=amt;
+    heap->heap[obj_loc].val -= amt;
 
     /* Restore heap condition */
-    if(heap->type==H5HP_MAX_HEAP) {
-        if(H5HP_sink_max(heap,obj_loc)<0)
+    if (heap->type == H5HP_MAX_HEAP) {
+        if (H5HP_sink_max(heap, obj_loc) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
     } /* end if */
     else {
-        if(H5HP_swim_min(heap,obj_loc)<0)
+        if (H5HP_swim_min(heap, obj_loc) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
     } /* end else */
 
@@ -862,16 +849,15 @@ done:
 
     /* Check internal consistency */
     /* (Post-condition) */
-    HDassert(heap->nobjs<heap->nalloc);
+    HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
-    HDassert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
-        (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
-    HDassert(heap->heap[0].obj==NULL);
+    HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+    HDassert(heap->heap[0].obj == NULL);
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HP_decr() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5HP_close
@@ -904,7 +890,7 @@ H5HP_close(H5HP_t *heap)
     HDassert(heap->nobjs < heap->nalloc);
     HDassert(heap->heap);
     HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
-        (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+             (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
     HDassert(NULL == heap->heap[0].obj);
 
     /* Free internal structures for heap */
@@ -915,4 +901,3 @@ H5HP_close(H5HP_t *heap)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HP_close() */
-
diff --git a/src/H5HPprivate.h b/src/H5HPprivate.h
index 041c2b9..0148ca6 100644
--- a/src/H5HPprivate.h
+++ b/src/H5HPprivate.h
@@ -39,13 +39,13 @@ typedef struct H5HP_t H5HP_t;
 /* Typedef for objects which can be inserted into heaps */
 /* This _must_ be the first field in objects which can be inserted into heaps */
 typedef struct H5HP_info_t {
-    size_t heap_loc;                    /* Location of object in heap */
-}H5HP_info_t;
+    size_t heap_loc; /* Location of object in heap */
+} H5HP_info_t;
 
 /* Typedef for type of heap to create */
 typedef enum {
-    H5HP_MIN_HEAP,      /* Minimum values in heap are at the "top" */
-    H5HP_MAX_HEAP       /* Maximum values in heap are at the "top" */
+    H5HP_MIN_HEAP, /* Minimum values in heap are at the "top" */
+    H5HP_MAX_HEAP  /* Maximum values in heap are at the "top" */
 } H5HP_type_t;
 
 /**********/
@@ -56,14 +56,13 @@ typedef enum {
 /* Private routines */
 /********************/
 H5_DLL H5HP_t *H5HP_create(H5HP_type_t heap_type);
-H5_DLL herr_t H5HP_insert(H5HP_t *heap, int val, void *obj);
+H5_DLL herr_t  H5HP_insert(H5HP_t *heap, int val, void *obj);
 H5_DLL ssize_t H5HP_count(const H5HP_t *heap);
-H5_DLL herr_t H5HP_top(const H5HP_t *heap, int *val);
-H5_DLL herr_t H5HP_remove(H5HP_t *heap, int *val, void **ptr);
-H5_DLL herr_t H5HP_change(H5HP_t *heap, int val, void *obj);
-H5_DLL herr_t H5HP_incr(H5HP_t *heap, unsigned amt, void *obj);
-H5_DLL herr_t H5HP_decr(H5HP_t *heap, unsigned amt, void *obj);
-H5_DLL herr_t H5HP_close(H5HP_t *heap);
+H5_DLL herr_t  H5HP_top(const H5HP_t *heap, int *val);
+H5_DLL herr_t  H5HP_remove(H5HP_t *heap, int *val, void **ptr);
+H5_DLL herr_t  H5HP_change(H5HP_t *heap, int val, void *obj);
+H5_DLL herr_t  H5HP_incr(H5HP_t *heap, unsigned amt, void *obj);
+H5_DLL herr_t  H5HP_decr(H5HP_t *heap, unsigned amt, void *obj);
+H5_DLL herr_t  H5HP_close(H5HP_t *heap);
 
 #endif /* _H5HPprivate_H */
-
diff --git a/src/H5I.c b/src/H5I.c
index 94bad7f..8e382ba 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -33,31 +33,30 @@
  *	5/18/04 - Expanded to allow registration of new types at run-time
  */
 
-#define H5I_PACKAGE		/*suppress error about including H5Ipkg	  */
+#define H5I_PACKAGE /*suppress error about including H5Ipkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5I_init_interface
+#define H5_INTERFACE_INIT_FUNC H5I_init_interface
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Ipkg.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5SLprivate.h"	/* Skip Lists                           */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Ipkg.h"      /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5SLprivate.h" /* Skip Lists                           */
 
 /* Define this to compile in support for dumping ID information */
 /* #define H5I_DEBUG_OUTPUT */
 #ifndef H5I_DEBUG_OUTPUT
-#include "H5Gprivate.h"		/* Groups				*/
-#else /* H5I_DEBUG_OUTPUT */
-#define H5G_PACKAGE /*suppress error message about including H5Gpkg.h */
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Tprivate.h"		/* Datatypes				*/
-#endif /* H5I_DEBUG_OUTPUT */
+#include "H5Gprivate.h" /* Groups				*/
+#else                   /* H5I_DEBUG_OUTPUT */
+#define H5G_PACKAGE     /*suppress error message about including H5Gpkg.h */
+#include "H5Gpkg.h"     /* Groups		  		*/
+#include "H5Dprivate.h" /* Datasets				*/
+#include "H5Tprivate.h" /* Datatypes				*/
+#endif                  /* H5I_DEBUG_OUTPUT */
 
 /* Local Macros */
 
@@ -66,56 +65,55 @@
 #define MAX_FREE_ID_STRUCTS 1000
 
 /* Combine a Type number and an atom index into an atom */
-#define H5I_MAKE(g,i)	((((hid_t)(g) & TYPE_MASK) << ID_BITS) |	  \
-			     ((hid_t)(i) & ID_MASK))
+#define H5I_MAKE(g, i) ((((hid_t)(g)&TYPE_MASK) << ID_BITS) | ((hid_t)(i)&ID_MASK))
 
 /* Local typedefs */
 
 /* Atom information structure used */
 typedef struct H5I_id_info_t {
-    hid_t	id;		/* ID for this info			    */
-    unsigned	count;		/* ref. count for this atom		    */
-    unsigned    app_count;      /* ref. count of application visible atoms  */
-    const void	*obj_ptr;	/* pointer associated with the atom	    */
+    hid_t       id;        /* ID for this info			    */
+    unsigned    count;     /* ref. count for this atom		    */
+    unsigned    app_count; /* ref. count of application visible atoms  */
+    const void *obj_ptr;   /* pointer associated with the atom	    */
 } H5I_id_info_t;
 
 /* ID type structure used */
 typedef struct {
-    const H5I_class_t *cls;     /* Pointer to ID class                      */
-    unsigned	init_count;	/* # of times this type has been initialized*/
-    hbool_t	wrapped;	/* Whether the id count has wrapped around  */
-    unsigned	id_count;	/* Current number of IDs held		    */
-    hid_t	nextid;		/* ID to use for the next atom		    */
-    H5SL_t      *ids;           /* Pointer to skip list that stores IDs     */
+    const H5I_class_t *cls;        /* Pointer to ID class                      */
+    unsigned           init_count; /* # of times this type has been initialized*/
+    hbool_t            wrapped;    /* Whether the id count has wrapped around  */
+    unsigned           id_count;   /* Current number of IDs held		    */
+    hid_t              nextid;     /* ID to use for the next atom		    */
+    H5SL_t *           ids;        /* Pointer to skip list that stores IDs     */
 
     /* Fields for holding available IDs */
-    unsigned    avail_count;    /* # of available ID structures awaiting recycling */
-    H5SL_t      *avail_ids;     /* pointer to skip list of available IDs */
+    unsigned avail_count; /* # of available ID structures awaiting recycling */
+    H5SL_t * avail_ids;   /* pointer to skip list of available IDs */
 } H5I_id_type_t;
 
 typedef struct {
-    H5I_search_func_t app_cb;   /* Application's callback routine */
-    void *app_key;              /* Application's "key" (user data) */
-    void *ret_obj;              /* Object to return */
+    H5I_search_func_t app_cb;  /* Application's callback routine */
+    void *            app_key; /* Application's "key" (user data) */
+    void *            ret_obj; /* Object to return */
 } H5I_search_ud_t;
 
 /* User data for iterator callback when IDs have wrapped */
 typedef struct {
-    hid_t nextid;               /* Next ID to expect */
+    hid_t nextid; /* Next ID to expect */
 } H5I_wrap_ud_t;
 
 /* User data for iterator callback for ID iteration */
 typedef struct {
-    H5I_search_func_t user_func;        /* 'User' function to invoke */
-    void *user_udata;                   /* User data to pass to 'user' function */
-    hbool_t app_ref;                    /* Whether this is an appl. ref. call */
+    H5I_search_func_t user_func;  /* 'User' function to invoke */
+    void *            user_udata; /* User data to pass to 'user' function */
+    hbool_t           app_ref;    /* Whether this is an appl. ref. call */
 } H5I_iterate_ud_t;
 
 /* User data for H5I__clear_type_cb */
 typedef struct {
-    H5I_id_type_t *type_ptr;    /* Pointer to the type being cleard */
-    hbool_t force;              /* Whether to always remove the id */
-    hbool_t app_ref;            /* Whether this is an appl. ref. call */
+    H5I_id_type_t *type_ptr; /* Pointer to the type being cleard */
+    hbool_t        force;    /* Whether to always remove the id */
+    hbool_t        app_ref;  /* Whether this is an appl. ref. call */
 } H5I_clear_type_ud_t;
 
 /*-------------------- Locally scoped variables -----------------------------*/
@@ -129,7 +127,7 @@ static H5I_id_type_t *H5I_id_type_list_g[H5I_MAX_NUM_TYPES];
 /* Starts at 1 instead of 0 because it makes trace output look nicer.  If more */
 /* types (or IDs within a type) are needed, adjust TYPE_BITS in H5Ipkg.h       */
 /* and/or increase size of hid_t */
-static H5I_type_t H5I_next_type = (H5I_type_t) H5I_NTYPES;
+static H5I_type_t H5I_next_type = (H5I_type_t)H5I_NTYPES;
 
 /* Declare a free list to manage the H5I_id_info_t struct */
 H5FL_DEFINE_STATIC(H5I_id_info_t);
@@ -141,19 +139,18 @@ H5FL_DEFINE_STATIC(H5I_id_type_t);
 H5FL_DEFINE_STATIC(H5I_class_t);
 
 /*--------------------- Local function prototypes ---------------------------*/
-static herr_t H5I__free_cb(void *_item, void *_key, void *_udata);
-static htri_t H5I__clear_type_cb(void *_id, void *key, void *udata);
-static int H5I__destroy_type(H5I_type_t type);
-static void *H5I__remove_verify(hid_t id, H5I_type_t id_type);
-static void *H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id);
-static int H5I__inc_type_ref(H5I_type_t type);
-static int H5I__get_type_ref(H5I_type_t type);
+static herr_t         H5I__free_cb(void *_item, void *_key, void *_udata);
+static htri_t         H5I__clear_type_cb(void *_id, void *key, void *udata);
+static int            H5I__destroy_type(H5I_type_t type);
+static void *         H5I__remove_verify(hid_t id, H5I_type_t id_type);
+static void *         H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id);
+static int            H5I__inc_type_ref(H5I_type_t type);
+static int            H5I__get_type_ref(H5I_type_t type);
 static H5I_id_info_t *H5I__find_id(hid_t id);
 #ifdef H5I_DEBUG_OUTPUT
 static herr_t H5I__debug(H5I_type_t type);
 #endif /* H5I_DEBUG_OUTPUT */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5I_init_interface -- Initialize interface-specific information
@@ -174,7 +171,6 @@ H5I_init_interface(void)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5I_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_term_interface
  *
@@ -194,30 +190,30 @@ H5I_init_interface(void)
 int
 H5I_term_interface(void)
 {
-    H5I_id_type_t	*type_ptr;
-    H5I_type_t		type;
-    int		n = 0;
+    H5I_id_type_t *type_ptr;
+    H5I_type_t     type;
+    int            n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
+    if (H5_interface_initialize_g) {
         /* How many types are still being used? */
-        for(type = (H5I_type_t)0; type < H5I_next_type; H5_INC_ENUM(H5I_type_t, type)) {
-            if((type_ptr = H5I_id_type_list_g[type]) && type_ptr->ids)
+        for (type = (H5I_type_t)0; type < H5I_next_type; H5_INC_ENUM(H5I_type_t, type)) {
+            if ((type_ptr = H5I_id_type_list_g[type]) && type_ptr->ids)
                 n++;
         } /* end for */
 
         /* If no types are used then clean up */
-        if(0 == n) {
-            for(type = (H5I_type_t)0; type < H5I_next_type; H5_INC_ENUM(H5I_type_t,type)) {
+        if (0 == n) {
+            for (type = (H5I_type_t)0; type < H5I_next_type; H5_INC_ENUM(H5I_type_t, type)) {
                 type_ptr = H5I_id_type_list_g[type];
-                if(type_ptr) {
+                if (type_ptr) {
                     HDassert(NULL == type_ptr->ids);
-                    type_ptr = H5FL_FREE(H5I_id_type_t, type_ptr);
+                    type_ptr                 = H5FL_FREE(H5I_id_type_t, type_ptr);
                     H5I_id_type_list_g[type] = NULL;
                 } /* end if */
-            } /* end for */
-        } /* end if */
+            }     /* end for */
+        }         /* end if */
 
         /* Mark interface closed */
         H5_interface_initialize_g = 0;
@@ -226,7 +222,6 @@ H5I_term_interface(void)
     FUNC_LEAVE_NOAPI(n)
 } /* end H5I_term_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iregister_type
  *
@@ -251,9 +246,9 @@ H5I_term_interface(void)
 H5I_type_t
 H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free_t free_func)
 {
-    H5I_class_t *cls = NULL;    /* New ID class */
-    H5I_type_t new_type;        /* New ID type value */
-    H5I_type_t ret_value;       /* Return value */
+    H5I_class_t *cls = NULL; /* New ID class */
+    H5I_type_t   new_type;   /* New ID type value */
+    H5I_type_t   ret_value;  /* Return value */
 
     FUNC_ENTER_API(H5I_BADID)
     H5TRACE3("It", "zIux", hash_size, reserved, free_func);
@@ -261,41 +256,41 @@ H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free_t free_func)
     /* Generate a new H5I_type_t value */
 
     /* Increment the number of types*/
-    if(H5I_next_type < H5I_MAX_NUM_TYPES) {
+    if (H5I_next_type < H5I_MAX_NUM_TYPES) {
         new_type = H5I_next_type;
         H5_INC_ENUM(H5I_type_t, H5I_next_type);
     } /* end if */
     else {
-        hbool_t done;       /* Indicate that search was successful */
-        int i;              /* Local index variable */
+        hbool_t done; /* Indicate that search was successful */
+        int     i;    /* Local index variable */
 
         /* Look for a free type to give out */
         done = FALSE;
-        for(i = H5I_NTYPES; i < H5I_MAX_NUM_TYPES && done == FALSE; i++) {
-            if(NULL == H5I_id_type_list_g[i]) {
+        for (i = H5I_NTYPES; i < H5I_MAX_NUM_TYPES && done == FALSE; i++) {
+            if (NULL == H5I_id_type_list_g[i]) {
                 /* Found a free type ID */
                 new_type = (H5I_type_t)i;
-                done = TRUE;
+                done     = TRUE;
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /* Verify that we found a type to give out */
-        if(done == FALSE)
+        if (done == FALSE)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, H5I_BADID, "Maximum number of ID types exceeded.")
     } /* end else */
 
     /* Allocate new ID class */
-    if(NULL == (cls = H5FL_MALLOC(H5I_class_t)))
+    if (NULL == (cls = H5FL_MALLOC(H5I_class_t)))
         HGOTO_ERROR(H5E_ATOM, H5E_CANTALLOC, H5I_BADID, "ID class allocation failed")
 
     /* Initialize class fields */
-    cls->type_id = new_type;
-    cls->flags = H5I_CLASS_IS_APPLICATION;
-    cls->reserved = reserved;
+    cls->type_id   = new_type;
+    cls->flags     = H5I_CLASS_IS_APPLICATION;
+    cls->reserved  = reserved;
     cls->free_func = free_func;
 
     /* Register the new ID class */
-    if(H5I_register_type(cls) < 0)
+    if (H5I_register_type(cls) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINIT, H5I_BADID, "can't initialize ID class")
 
     /* Set return value */
@@ -303,15 +298,14 @@ H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free_t free_func)
 
 done:
     /* Clean up on error */
-    if(ret_value < 0) {
-        if(cls)
+    if (ret_value < 0) {
+        if (cls)
             cls = H5FL_FREE(H5I_class_t, cls);
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iregister_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_register_type
  *
@@ -331,8 +325,8 @@ done:
 herr_t
 H5I_register_type(const H5I_class_t *cls)
 {
-    H5I_id_type_t *type_ptr = NULL;	/* Ptr to the atomic type*/
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5I_id_type_t *type_ptr  = NULL;    /* Ptr to the atomic type*/
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -341,9 +335,9 @@ H5I_register_type(const H5I_class_t *cls)
     HDassert(cls->type_id > 0 && cls->type_id < H5I_MAX_NUM_TYPES);
 
     /* Initialize the type */
-    if(NULL == H5I_id_type_list_g[cls->type_id]) {
+    if (NULL == H5I_id_type_list_g[cls->type_id]) {
         /* Allocate the type information for new type */
-        if(NULL == (type_ptr = (H5I_id_type_t *)H5FL_CALLOC(H5I_id_type_t)))
+        if (NULL == (type_ptr = (H5I_id_type_t *)H5FL_CALLOC(H5I_id_type_t)))
             HGOTO_ERROR(H5E_ATOM, H5E_CANTALLOC, FAIL, "ID type allocation failed")
         H5I_id_type_list_g[cls->type_id] = type_ptr;
     } /* end if */
@@ -353,15 +347,15 @@ H5I_register_type(const H5I_class_t *cls)
     } /* end else */
 
     /* Initialize the ID type structure for new types */
-    if(type_ptr->init_count == 0) {
-        type_ptr->cls = cls;
-        type_ptr->wrapped = FALSE;
+    if (type_ptr->init_count == 0) {
+        type_ptr->cls      = cls;
+        type_ptr->wrapped  = FALSE;
         type_ptr->id_count = 0;
-        type_ptr->nextid = (hid_t)cls->reserved;
-        if(NULL == (type_ptr->ids = H5SL_create(H5SL_TYPE_HID, NULL)))
+        type_ptr->nextid   = (hid_t)cls->reserved;
+        if (NULL == (type_ptr->ids = H5SL_create(H5SL_TYPE_HID, NULL)))
             HGOTO_ERROR(H5E_ATOM, H5E_CANTCREATE, FAIL, "skip list creation failed")
         type_ptr->avail_count = 0;
-        if(NULL == (type_ptr->avail_ids = H5SL_create(H5SL_TYPE_HID, NULL)))
+        if (NULL == (type_ptr->avail_ids = H5SL_create(H5SL_TYPE_HID, NULL)))
             HGOTO_ERROR(H5E_ATOM, H5E_CANTCREATE, FAIL, "skip list creation failed")
     } /* end if */
 
@@ -369,20 +363,19 @@ H5I_register_type(const H5I_class_t *cls)
     type_ptr->init_count++;
 
 done:
-    if(ret_value < 0) {	/* Clean up on error */
-        if(type_ptr) {
-            if(type_ptr->ids)
+    if (ret_value < 0) { /* Clean up on error */
+        if (type_ptr) {
+            if (type_ptr->ids)
                 H5SL_close(type_ptr->ids);
-            if(type_ptr->avail_ids)
+            if (type_ptr->avail_ids)
                 H5SL_close(type_ptr->avail_ids);
             (void)H5FL_FREE(H5I_id_type_t, type_ptr);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_register_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Itype_exists
  *
@@ -401,25 +394,24 @@ done:
 htri_t
 H5Itype_exists(H5I_type_t type)
 {
-    htri_t ret_value = TRUE;                      /* Return value */
+    htri_t ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "It", type);
 
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type")
 
-    if(type <= H5I_BADID || type >= H5I_next_type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
+    if (type <= H5I_BADID || type >= H5I_next_type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
 
-    if(NULL == H5I_id_type_list_g[type])
+    if (NULL == H5I_id_type_list_g[type])
         ret_value = FALSE;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Itype_exists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Inmembers
  *
@@ -440,27 +432,27 @@ done:
 herr_t
 H5Inmembers(H5I_type_t type, hsize_t *num_members)
 {
-    int ret_value = SUCCEED;                      /* Return value */
+    int ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "It*h", type, num_members);
 
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type")
 
     /* Validate parameters.  This needs to be done here, instead of letting
      * the private interface handle it, because the public interface throws
      * an error when the supplied type does not exist.
      */
-    if(type <= H5I_BADID || type >= H5I_next_type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
-    if(NULL == H5I_id_type_list_g[type])
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "supplied type does not exist")
+    if (type <= H5I_BADID || type >= H5I_next_type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
+    if (NULL == H5I_id_type_list_g[type])
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "supplied type does not exist")
 
-    if(num_members) {
+    if (num_members) {
         int members;
 
-        if((members = H5I_nmembers(type)) < 0)
+        if ((members = H5I_nmembers(type)) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTCOUNT, FAIL, "can't compute number of members")
 
         H5_CHECKED_ASSIGN(*num_members, hsize_t, members, int);
@@ -470,7 +462,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Inmembers() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_nmembers
  *
@@ -489,14 +480,14 @@ done:
 int
 H5I_nmembers(H5I_type_t type)
 {
-    H5I_id_type_t	*type_ptr = NULL;
-    int		        ret_value;
+    H5I_id_type_t *type_ptr = NULL;
+    int            ret_value;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(type <= H5I_BADID || type >= H5I_next_type)
+    if (type <= H5I_BADID || type >= H5I_next_type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
-    if(NULL == (type_ptr = H5I_id_type_list_g[type]) || type_ptr->init_count <= 0)
+    if (NULL == (type_ptr = H5I_id_type_list_g[type]) || type_ptr->init_count <= 0)
         HGOTO_DONE(0);
 
     /* Set return value */
@@ -506,7 +497,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_nmembers() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iclear_type
  *
@@ -526,12 +516,12 @@ done:
 herr_t
 H5Iclear_type(H5I_type_t type, hbool_t force)
 {
-    herr_t ret_value;                      /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "Itb", type, force);
 
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type")
 
     ret_value = H5I_clear_type(type, force, TRUE);
@@ -540,7 +530,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iclear_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__free_cb
  *
@@ -557,7 +546,7 @@ done:
 static herr_t
 H5I__free_cb(void *_item, void H5_ATTR_UNUSED *_key, void H5_ATTR_UNUSED *_udata)
 {
-    H5I_id_info_t *item = (H5I_id_info_t *)_item;       /* Pointer to the ID node */
+    H5I_id_info_t *item = (H5I_id_info_t *)_item; /* Pointer to the ID node */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -569,7 +558,6 @@ H5I__free_cb(void *_item, void H5_ATTR_UNUSED *_key, void H5_ATTR_UNUSED *_udata
     FUNC_LEAVE_NOAPI(H5_ITER_CONT)
 } /* end H5I__free_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_clear_type
  *
@@ -587,29 +575,29 @@ H5I__free_cb(void *_item, void H5_ATTR_UNUSED *_key, void H5_ATTR_UNUSED *_udata
 herr_t
 H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref)
 {
-    H5I_clear_type_ud_t udata;          /* udata struct for callback */
-    int         ret_value = SUCCEED;    /* Return value */
+    H5I_clear_type_ud_t udata;               /* udata struct for callback */
+    int                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(type <= H5I_BADID || type >= H5I_next_type)
+    if (type <= H5I_BADID || type >= H5I_next_type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
 
     udata.type_ptr = H5I_id_type_list_g[type];
-    if(udata.type_ptr == NULL || udata.type_ptr->init_count <= 0)
+    if (udata.type_ptr == NULL || udata.type_ptr->init_count <= 0)
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
 
     /* Finish constructing udata */
-    udata.force = force;
+    udata.force   = force;
     udata.app_ref = app_ref;
 
     /* Attempt to free all ids in the type */
-    if(H5SL_try_free_safe(udata.type_ptr->ids, H5I__clear_type_cb, &udata) < 0)
+    if (H5SL_try_free_safe(udata.type_ptr->ids, H5I__clear_type_cb, &udata) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTDELETE, FAIL, "can't free ids in type")
 
     /* Also free any ID structures being retained for potential re-use */
-    if(udata.type_ptr->avail_count > 0) {
-        if(H5SL_free(udata.type_ptr->avail_ids, H5I__free_cb, NULL) < 0)
+    if (udata.type_ptr->avail_count > 0) {
+        if (H5SL_free(udata.type_ptr->avail_ids, H5I__free_cb, NULL) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTREMOVE, FAIL, "can't release available ID nodes")
         udata.type_ptr->avail_count = 0;
     } /* end if */
@@ -618,7 +606,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_clear_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5I__clear_type_cb
  *
@@ -636,9 +623,9 @@ done:
 static htri_t
 H5I__clear_type_cb(void *_id, void H5_ATTR_UNUSED *key, void *_udata)
 {
-    H5I_id_info_t       *id = (H5I_id_info_t *)_id; /* Current ID being worked with */
-    H5I_clear_type_ud_t *udata = (H5I_clear_type_ud_t *)_udata; /* udata struct */
-    htri_t              ret_value = FALSE;    /* Return value */
+    H5I_id_info_t *      id        = (H5I_id_info_t *)_id;          /* Current ID being worked with */
+    H5I_clear_type_ud_t *udata     = (H5I_clear_type_ud_t *)_udata; /* udata struct */
+    htri_t               ret_value = FALSE;                         /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -650,43 +637,42 @@ H5I__clear_type_cb(void *_id, void H5_ATTR_UNUSED *key, void *_udata)
      * Do nothing to the object if the reference count is larger than
      * one and forcing is off.
      */
-    if(udata->force || (id->count - (!udata->app_ref * id->app_count)) <= 1) {
+    if (udata->force || (id->count - (!udata->app_ref * id->app_count)) <= 1) {
         /* Check for a 'free' function and call it, if it exists */
         /* (Casting away const OK -QAK) */
-        if(udata->type_ptr->cls->free_func && (udata->type_ptr->cls->free_func)((void *)id->obj_ptr) < 0) {
-            if(udata->force) {
+        if (udata->type_ptr->cls->free_func && (udata->type_ptr->cls->free_func)((void *)id->obj_ptr) < 0) {
+            if (udata->force) {
 #ifdef H5I_DEBUG
-                if(H5DEBUG(I)) {
-                    HDfprintf(H5DEBUG(I), "H5I: free type=%d obj=0x%08lx "
-                            "failure ignored\n",
-                            (int)udata->type_ptr->cls->type_id,
-                            (unsigned long)(id->obj_ptr));
+                if (H5DEBUG(I)) {
+                    HDfprintf(H5DEBUG(I),
+                              "H5I: free type=%d obj=0x%08lx "
+                              "failure ignored\n",
+                              (int)udata->type_ptr->cls->type_id, (unsigned long)(id->obj_ptr));
                 } /* end if */
-#endif /*H5I_DEBUG*/
+#endif            /*H5I_DEBUG*/
 
                 /* Indicate node should be removed from list */
                 ret_value = TRUE;
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else {
             /* Indicate node should be removed from list */
             ret_value = TRUE;
         } /* end else */
 
         /* Remove ID if requested */
-        if(ret_value) {
+        if (ret_value) {
             /* Free ID info */
             id = H5FL_FREE(H5I_id_info_t, id);
 
             /* Decrement the number of IDs in the type */
             udata->type_ptr->id_count--;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__clear_type_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Idestroy_type
  *
@@ -706,12 +692,12 @@ H5I__clear_type_cb(void *_id, void H5_ATTR_UNUSED *key, void *_udata)
 herr_t
 H5Idestroy_type(H5I_type_t type)
 {
-    herr_t ret_value;           /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "It", type);
 
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type")
 
     ret_value = H5I__destroy_type(type);
@@ -720,7 +706,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Idestroy_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__destroy_type
  *
@@ -739,43 +724,41 @@ done:
 static herr_t
 H5I__destroy_type(H5I_type_t type)
 {
-    H5I_id_type_t *type_ptr;	/* ptr to the atomic type */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5I_id_type_t *type_ptr;            /* ptr to the atomic type */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
-    if(type <= H5I_BADID || type >= H5I_next_type)
+    if (type <= H5I_BADID || type >= H5I_next_type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
 
     type_ptr = H5I_id_type_list_g[type];
-    if(type_ptr == NULL || type_ptr->init_count <= 0)
+    if (type_ptr == NULL || type_ptr->init_count <= 0)
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
 
     /* Close/clear/destroy all IDs for this type */
-    H5E_BEGIN_TRY {
-        H5I_clear_type(type, TRUE, FALSE);
-    } H5E_END_TRY       /*don't care about errors*/
+    H5E_BEGIN_TRY { H5I_clear_type(type, TRUE, FALSE); }
+    H5E_END_TRY /*don't care about errors*/
 
-    /* Check if we should release the ID class */
-    if(type_ptr->cls->flags & H5I_CLASS_IS_APPLICATION)
-        type_ptr->cls = H5FL_FREE(H5I_class_t, (void *)type_ptr->cls);
+        /* Check if we should release the ID class */
+        if (type_ptr->cls->flags & H5I_CLASS_IS_APPLICATION)
+            type_ptr->cls = H5FL_FREE(H5I_class_t, (void *)type_ptr->cls);
 
-    if(H5SL_close(type_ptr->avail_ids) < 0)
+    if (H5SL_close(type_ptr->avail_ids) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTCLOSEOBJ, FAIL, "can't close skip list")
     type_ptr->avail_ids = NULL;
 
-    if(H5SL_close(type_ptr->ids) < 0)
+    if (H5SL_close(type_ptr->ids) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTCLOSEOBJ, FAIL, "can't close skip list")
     type_ptr->ids = NULL;
 
-    type_ptr = H5FL_FREE(H5I_id_type_t, type_ptr);
+    type_ptr                 = H5FL_FREE(H5I_id_type_t, type_ptr);
     H5I_id_type_list_g[type] = NULL;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__destroy_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iregister
  *
@@ -792,12 +775,12 @@ done:
 hid_t
 H5Iregister(H5I_type_t type, const void *object)
 {
-    hid_t ret_value;                      /* Return value */
+    hid_t ret_value; /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE2("i", "It*x", type, object);
 
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type")
 
     ret_value = H5I_register(type, object, TRUE);
@@ -806,7 +789,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__wrapped_cb
  *
@@ -823,9 +805,9 @@ done:
 static herr_t
 H5I__wrapped_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 {
-    H5I_id_info_t *item = (H5I_id_info_t *)_item;       /* Pointer to the ID node */
-    H5I_wrap_ud_t *udata = (H5I_wrap_ud_t *)_udata;     /* Pointer to user data */
-    int ret_value = H5_ITER_CONT;                       /* Return value */
+    H5I_id_info_t *item      = (H5I_id_info_t *)_item;  /* Pointer to the ID node */
+    H5I_wrap_ud_t *udata     = (H5I_wrap_ud_t *)_udata; /* Pointer to user data */
+    int            ret_value = H5_ITER_CONT;            /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -834,7 +816,7 @@ H5I__wrapped_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
     HDassert(udata);
 
     /* Break out if we see a free ID */
-    if(udata->nextid != (ID_MASK & item->id)) {
+    if (udata->nextid != (ID_MASK & item->id)) {
         /* Sanity check */
         HDassert(item->id > udata->nextid);
 
@@ -847,7 +829,6 @@ H5I__wrapped_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__wrapped_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_register
  *
@@ -869,25 +850,25 @@ H5I__wrapped_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 hid_t
 H5I_register(H5I_type_t type, const void *object, hbool_t app_ref)
 {
-    H5I_id_type_t	*type_ptr;	/*ptr to the type		*/
-    H5I_id_info_t	*id_ptr;	/*ptr to the new ID information */
-    hid_t		ret_value = SUCCEED; /*return value		*/
+    H5I_id_type_t *type_ptr;            /*ptr to the type		*/
+    H5I_id_info_t *id_ptr;              /*ptr to the new ID information */
+    hid_t          ret_value = SUCCEED; /*return value		*/
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    if(type <= H5I_BADID || type >= H5I_next_type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
+    if (type <= H5I_BADID || type >= H5I_next_type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
     type_ptr = H5I_id_type_list_g[type];
-    if(NULL == type_ptr || type_ptr->init_count <= 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
+    if (NULL == type_ptr || type_ptr->init_count <= 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
 
     /* If there is an available ID structure, use it. */
-    if(type_ptr->avail_count > 0) {
+    if (type_ptr->avail_count > 0) {
         /* Use existing available ID struct */
-        if(NULL == (id_ptr = (H5I_id_info_t *)H5SL_remove_first(type_ptr->avail_ids)))
+        if (NULL == (id_ptr = (H5I_id_info_t *)H5SL_remove_first(type_ptr->avail_ids)))
             HGOTO_ERROR(H5E_ATOM, H5E_CANTREMOVE, FAIL, "can't remove ID from available ID list")
-    
+
         /* Decrease count of available ID structures */
         type_ptr->avail_count--;
     } /* end if */
@@ -899,26 +880,26 @@ H5I_register(H5I_type_t type, const void *object, hbool_t app_ref)
          * wrapping around, thus necessitating checking for duplicate IDs being
          * handed out.
          */
-        if(type_ptr->nextid > (hid_t)ID_MASK)
+        if (type_ptr->nextid > (hid_t)ID_MASK)
             type_ptr->wrapped = TRUE;
 
         /*
          * If we've wrapped around then we need to check for duplicate id's being
          * handed out.
          */
-        if(type_ptr->wrapped) {
-            H5I_wrap_ud_t udata;    /* User data for iteration */
-            herr_t iter_status;     /* Iteration status */
+        if (type_ptr->wrapped) {
+            H5I_wrap_ud_t udata;       /* User data for iteration */
+            herr_t        iter_status; /* Iteration status */
 
             /* Set up user data for iteration */
             udata.nextid = (hid_t)type_ptr->cls->reserved;
 
             /* Iterate over all the ID nodes, looking for a gap in the ID sequence */
-            if((iter_status = H5SL_iterate(type_ptr->ids, H5I__wrapped_cb, &udata)) < 0)
+            if ((iter_status = H5SL_iterate(type_ptr->ids, H5I__wrapped_cb, &udata)) < 0)
                 HGOTO_ERROR(H5E_ATOM, H5E_BADITER, FAIL, "ID iteration failed")
 
             /* If we didn't break out of the iteration and we're at the max. ID, we've used all the IDs */
-            if(0 == iter_status && udata.nextid >= ID_MASK)
+            if (0 == iter_status && udata.nextid >= ID_MASK)
                 HGOTO_ERROR(H5E_ATOM, H5E_NOIDS, FAIL, "no IDs available in type")
 
             /* Sanity check */
@@ -929,7 +910,7 @@ H5I_register(H5I_type_t type, const void *object, hbool_t app_ref)
         } /* end if */
 
         /* Allocate new ID struct */
-        if(NULL == (id_ptr = H5FL_MALLOC(H5I_id_info_t)))
+        if (NULL == (id_ptr = H5FL_MALLOC(H5I_id_info_t)))
             HGOTO_ERROR(H5E_ATOM, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Make a new ID */
@@ -940,12 +921,12 @@ H5I_register(H5I_type_t type, const void *object, hbool_t app_ref)
     } /* end if */
 
     /* Fill in remaining fields of ID struct */
-    id_ptr->count = 1; /*initial reference count*/
+    id_ptr->count     = 1; /*initial reference count*/
     id_ptr->app_count = !!app_ref;
-    id_ptr->obj_ptr = object;
+    id_ptr->obj_ptr   = object;
 
     /* Insert into the type */
-    if(H5SL_insert(type_ptr->ids, id_ptr, &id_ptr->id) < 0)
+    if (H5SL_insert(type_ptr->ids, id_ptr, &id_ptr->id) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINSERT, FAIL, "can't insert ID node into skip list")
     type_ptr->id_count++;
 
@@ -956,7 +937,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_register() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_subst
  *
@@ -974,13 +954,13 @@ done:
 void *
 H5I_subst(hid_t id, const void *new_object)
 {
-    H5I_id_info_t	*id_ptr;	/* Ptr to the atom	*/
-    void		*ret_value;	/* Return value		*/
+    H5I_id_info_t *id_ptr;    /* Ptr to the atom	*/
+    void *         ret_value; /* Return value		*/
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* General lookup of the ID */
-    if(NULL == (id_ptr = H5I__find_id(id)))
+    if (NULL == (id_ptr = H5I__find_id(id)))
         HGOTO_ERROR(H5E_ATOM, H5E_NOTFOUND, NULL, "can't get ID ref count")
 
     /* Get the old object pointer to return */
@@ -994,7 +974,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end if */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_object
  *
@@ -1011,13 +990,13 @@ done:
 void *
 H5I_object(hid_t id)
 {
-    H5I_id_info_t	*id_ptr;		/*ptr to the new atom	*/
-    void		*ret_value = NULL;	/*return value		*/
+    H5I_id_info_t *id_ptr;           /*ptr to the new atom	*/
+    void *         ret_value = NULL; /*return value		*/
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* General lookup of the ID */
-    if(NULL != (id_ptr = H5I__find_id(id))) {
+    if (NULL != (id_ptr = H5I__find_id(id))) {
         /* Get the object pointer to return */
         /* (Casting away const OK -QAK) */
         ret_value = (void *)id_ptr->obj_ptr;
@@ -1027,7 +1006,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end if */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iobject_verify
  *
@@ -1048,15 +1026,15 @@ done:
 void *
 H5Iobject_verify(hid_t id, H5I_type_t id_type)
 {
-    void * ret_value;                      /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_API(NULL)
     H5TRACE2("*x", "iIt", id, id_type);
 
-    if(H5I_IS_LIB_TYPE(id_type))
+    if (H5I_IS_LIB_TYPE(id_type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
 
-    if(id_type < 1 || id_type >= H5I_next_type)
+    if (id_type < 1 || id_type >= H5I_next_type)
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "identifier has invalid type")
 
     ret_value = H5I_object_verify(id, id_type);
@@ -1065,7 +1043,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iobject_verify() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_object_verify
  *
@@ -1084,15 +1061,15 @@ done:
 void *
 H5I_object_verify(hid_t id, H5I_type_t id_type)
 {
-    H5I_id_info_t	*id_ptr = NULL;		/*ptr to the new atom	*/
-    void		*ret_value = NULL;	/*return value		*/
+    H5I_id_info_t *id_ptr    = NULL; /*ptr to the new atom	*/
+    void *         ret_value = NULL; /*return value		*/
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(id_type >= 1 && id_type < H5I_next_type);
 
     /* Verify that the type of the ID is correct & lookup the ID */
-    if(id_type == H5I_TYPE(id) && NULL != (id_ptr = H5I__find_id(id))) {
+    if (id_type == H5I_TYPE(id) && NULL != (id_ptr = H5I__find_id(id))) {
         /* Get the object pointer to return */
         /* (Casting away const OK -QAK) */
         ret_value = (void *)id_ptr->obj_ptr;
@@ -1102,7 +1079,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5I_object_verify() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_get_type
  *
@@ -1122,11 +1098,11 @@ done:
 H5I_type_t
 H5I_get_type(hid_t id)
 {
-    H5I_type_t		ret_value = H5I_BADID;
+    H5I_type_t ret_value = H5I_BADID;
 
     FUNC_ENTER_NOAPI(H5I_BADID)
 
-    if(id > 0)
+    if (id > 0)
         ret_value = H5I_TYPE(id);
 
     HDassert(ret_value >= H5I_BADID && ret_value < H5I_next_type);
@@ -1135,7 +1111,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_get_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iget_type
  *
@@ -1154,21 +1129,20 @@ done:
 H5I_type_t
 H5Iget_type(hid_t id)
 {
-    H5I_type_t		ret_value = H5I_BADID;          /* Return value */
+    H5I_type_t ret_value = H5I_BADID; /* Return value */
 
     FUNC_ENTER_API(H5I_BADID)
     H5TRACE1("It", "i", id);
 
     ret_value = H5I_get_type(id);
 
-    if(ret_value <= H5I_BADID || ret_value >= H5I_next_type || NULL == H5I_object(id))
-	HGOTO_DONE(H5I_BADID);
+    if (ret_value <= H5I_BADID || ret_value >= H5I_next_type || NULL == H5I_object(id))
+        HGOTO_DONE(H5I_BADID);
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iremove_verify
  *
@@ -1189,12 +1163,12 @@ done:
 void *
 H5Iremove_verify(hid_t id, H5I_type_t id_type)
 {
-    void * ret_value;                      /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_API(NULL)
     H5TRACE2("*x", "iIt", id, id_type);
 
-    if(H5I_IS_LIB_TYPE(id_type))
+    if (H5I_IS_LIB_TYPE(id_type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
 
     /* Remove the id */
@@ -1204,7 +1178,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iremove_verify() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__remove_verify
  *
@@ -1224,20 +1197,19 @@ done:
 void *
 H5I__remove_verify(hid_t id, H5I_type_t id_type)
 {
-    void * ret_value = NULL;	/*return value			*/
+    void *ret_value = NULL; /*return value			*/
 
     FUNC_ENTER_STATIC_NOERR
 
     /* Argument checking will be performed by H5I_remove() */
 
     /* Verify that the type of the ID is correct */
-    if(id_type == H5I_TYPE(id))
+    if (id_type == H5I_TYPE(id))
         ret_value = H5I_remove(id);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__remove_verify() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__remove_common
  *
@@ -1256,8 +1228,8 @@ H5I__remove_verify(hid_t id, H5I_type_t id_type)
 static void *
 H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id)
 {
-    H5I_id_info_t	*curr_id;	/*ptr to the current atom	*/
-    void *	        ret_value;	/*return value			*/
+    H5I_id_info_t *curr_id;   /*ptr to the current atom	*/
+    void *         ret_value; /*return value			*/
 
     FUNC_ENTER_STATIC
 
@@ -1265,31 +1237,31 @@ H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id)
     HDassert(type_ptr);
 
     /* Get the ID node for the ID */
-    if(NULL == (curr_id = (H5I_id_info_t *)H5SL_remove(type_ptr->ids, &id)))
+    if (NULL == (curr_id = (H5I_id_info_t *)H5SL_remove(type_ptr->ids, &id)))
         HGOTO_ERROR(H5E_ATOM, H5E_CANTDELETE, NULL, "can't remove ID node from skip list")
 
     /* (Casting away const OK -QAK) */
     ret_value = (void *)curr_id->obj_ptr;
 
     /* See if we can reuse IDs of this type */
-    if(type_ptr->cls->flags & H5I_CLASS_REUSE_IDS) {
+    if (type_ptr->cls->flags & H5I_CLASS_REUSE_IDS) {
         /* See if we can decrement the next ID for the ID class */
-        if(type_ptr->nextid == (ID_MASK & (curr_id->id + 1))) {
+        if (type_ptr->nextid == (ID_MASK & (curr_id->id + 1))) {
             type_ptr->nextid--;
             curr_id = H5FL_FREE(H5I_id_info_t, curr_id);
         } /* end if */
         else {
             /* Store the ID on the available ID list, for later */
-            if((type_ptr->avail_count < MAX_FREE_ID_STRUCTS)
-                    && (type_ptr->id_count > 1)) {
-                if(H5SL_insert(type_ptr->avail_ids, curr_id, &curr_id->id) < 0)
-                    HGOTO_ERROR(H5E_ATOM, H5E_CANTINSERT, NULL, "can't insert available ID node into skip list")
+            if ((type_ptr->avail_count < MAX_FREE_ID_STRUCTS) && (type_ptr->id_count > 1)) {
+                if (H5SL_insert(type_ptr->avail_ids, curr_id, &curr_id->id) < 0)
+                    HGOTO_ERROR(H5E_ATOM, H5E_CANTINSERT, NULL,
+                                "can't insert available ID node into skip list")
                 type_ptr->avail_count++;
             }
             else
                 curr_id = H5FL_FREE(H5I_id_info_t, curr_id);
         } /* end else */
-    } /* end if */
+    }     /* end if */
     /* Otherwise, just toss it. */
     else
         curr_id = H5FL_FREE(H5I_id_info_t, curr_id);
@@ -1299,12 +1271,12 @@ H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id)
 
     /* If there are no more IDs of this type, then we can free all available
        ID strutures, and reset starting typeid and wrapped status. */
-    if(0 == type_ptr->id_count) {
-        if(H5SL_free(type_ptr->avail_ids, H5I__free_cb, NULL) < 0)
+    if (0 == type_ptr->id_count) {
+        if (H5SL_free(type_ptr->avail_ids, H5I__free_cb, NULL) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTREMOVE, NULL, "can't release available ID nodes")
         type_ptr->avail_count = 0;
 
-        type_ptr->nextid = (hid_t)type_ptr->cls->reserved;
+        type_ptr->nextid  = (hid_t)type_ptr->cls->reserved;
         type_ptr->wrapped = FALSE;
     } /* end if */
 
@@ -1312,7 +1284,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__remove_common() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_remove
  *
@@ -1330,29 +1301,28 @@ done:
 void *
 H5I_remove(hid_t id)
 {
-    H5I_id_type_t	*type_ptr;	/*ptr to the atomic type	*/
-    H5I_type_t		type;		/*atom's atomic type		*/
-    void *	        ret_value;	/*return value			*/
+    H5I_id_type_t *type_ptr;  /*ptr to the atomic type	*/
+    H5I_type_t     type;      /*atom's atomic type		*/
+    void *         ret_value; /*return value			*/
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Check arguments */
     type = H5I_TYPE(id);
-    if(type <= H5I_BADID || type >= H5I_next_type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "invalid type number")
+    if (type <= H5I_BADID || type >= H5I_next_type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "invalid type number")
     type_ptr = H5I_id_type_list_g[type];
-    if(type_ptr == NULL || type_ptr->init_count <= 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "invalid type")
+    if (type_ptr == NULL || type_ptr->init_count <= 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "invalid type")
 
     /* Remove the node from the type */
-    if(NULL == (ret_value = H5I__remove_common(type_ptr, id)))
+    if (NULL == (ret_value = H5I__remove_common(type_ptr, id)))
         HGOTO_ERROR(H5E_ATOM, H5E_CANTDELETE, NULL, "can't remove ID node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Idec_ref
  *
@@ -1371,24 +1341,23 @@ done:
 int
 H5Idec_ref(hid_t id)
 {
-    int ret_value;                      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", id);
 
     /* Check arguments */
-    if(id < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID")
+    if (id < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID")
 
     /* Do actual decrement operation */
-    if((ret_value = H5I_dec_app_ref(id)) < 0)
+    if ((ret_value = H5I_dec_app_ref(id)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTDEC, FAIL, "can't decrement ID ref count")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Idec_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_dec_ref
  *
@@ -1409,8 +1378,8 @@ done:
 int
 H5I_dec_ref(hid_t id)
 {
-    H5I_id_info_t	*id_ptr;	/*ptr to the new ID	*/
-    int ret_value;                      /* Return value */
+    H5I_id_info_t *id_ptr;    /*ptr to the new ID	*/
+    int            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1418,7 +1387,7 @@ H5I_dec_ref(hid_t id)
     HDassert(id >= 0);
 
     /* General lookup of the ID */
-    if(NULL == (id_ptr = H5I__find_id(id)))
+    if (NULL == (id_ptr = H5I__find_id(id)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't locate ID")
 
     /*
@@ -1430,22 +1399,22 @@ H5I_dec_ref(hid_t id)
      * reference count without calling the free method.
      *
      * Beware: the free method may call other H5I functions.
-     * 
-     * If an object is closing, we can remove the ID even though the free 
+     *
+     * If an object is closing, we can remove the ID even though the free
      * method might fail.  This can happen when a mandatory filter fails to
-     * write when a dataset is closed and the chunk cache is flushed to the 
+     * write when a dataset is closed and the chunk cache is flushed to the
      * file.  We have to close the dataset anyway. (SLU - 2010/9/7)
      */
-    if(1 == id_ptr->count) {
-        H5I_id_type_t	*type_ptr;		/*ptr to the type	*/
+    if (1 == id_ptr->count) {
+        H5I_id_type_t *type_ptr; /*ptr to the type	*/
 
         /* Get the ID's type */
         type_ptr = H5I_id_type_list_g[H5I_TYPE(id)];
 
         /* (Casting away const OK -QAK) */
-        if(!type_ptr->cls->free_func || (type_ptr->cls->free_func)((void *)id_ptr->obj_ptr) >= 0) {
+        if (!type_ptr->cls->free_func || (type_ptr->cls->free_func)((void *)id_ptr->obj_ptr) >= 0) {
             /* Remove the node from the type */
-            if(NULL == H5I__remove_common(type_ptr, id))
+            if (NULL == H5I__remove_common(type_ptr, id))
                 HGOTO_ERROR(H5E_ATOM, H5E_CANTDELETE, FAIL, "can't remove ID node")
             ret_value = 0;
         } /* end if */
@@ -1461,7 +1430,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_dec_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_dec_app_ref
  *
@@ -1479,8 +1447,8 @@ done:
 int
 H5I_dec_app_ref(hid_t id)
 {
-    H5I_id_info_t	*id_ptr;	/*ptr to the new ID	*/
-    int ret_value;                      /* Return value */
+    H5I_id_info_t *id_ptr;    /*ptr to the new ID	*/
+    int            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1488,13 +1456,13 @@ H5I_dec_app_ref(hid_t id)
     HDassert(id >= 0);
 
     /* Call regular decrement reference count routine */
-    if((ret_value = H5I_dec_ref(id)) < 0)
+    if ((ret_value = H5I_dec_ref(id)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTDEC, FAIL, "can't decrement ID ref count")
 
     /* Check if the ID still exists */
-    if(ret_value > 0) {
+    if (ret_value > 0) {
         /* General lookup of the ID */
-        if(NULL == (id_ptr = H5I__find_id(id)))
+        if (NULL == (id_ptr = H5I__find_id(id)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't locate ID")
 
         /* Adjust app_ref */
@@ -1509,7 +1477,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_dec_app_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_dec_app_ref_always_close
  *
@@ -1527,7 +1494,7 @@ done:
 int
 H5I_dec_app_ref_always_close(hid_t id)
 {
-    int ret_value;                      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1538,11 +1505,11 @@ H5I_dec_app_ref_always_close(hid_t id)
     ret_value = H5I_dec_app_ref(id);
 
     /* Check for failure */
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /*
-         * If an object is closing, we can remove the ID even though the free 
+         * If an object is closing, we can remove the ID even though the free
          * method might fail.  This can happen when a mandatory filter fails to
-         * write when a dataset is closed and the chunk cache is flushed to the 
+         * write when a dataset is closed and the chunk cache is flushed to the
          * file.  We have to close the dataset anyway. (SLU - 2010/9/7)
          */
         H5I_remove(id);
@@ -1554,7 +1521,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_dec_app_ref_always_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iinc_ref
  *
@@ -1571,24 +1537,23 @@ done:
 int
 H5Iinc_ref(hid_t id)
 {
-    int ret_value;                      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", id);
 
     /* Check arguments */
-    if(id < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID")
+    if (id < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID")
 
     /* Do actual increment operation */
-    if((ret_value = H5I_inc_ref(id, TRUE)) < 0)
+    if ((ret_value = H5I_inc_ref(id, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINC, FAIL, "can't increment ID ref count")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iinc_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_inc_ref
  *
@@ -1605,8 +1570,8 @@ done:
 int
 H5I_inc_ref(hid_t id, hbool_t app_ref)
 {
-    H5I_id_info_t	*id_ptr;	/*ptr to the ID		*/
-    int ret_value;                      /* Return value */
+    H5I_id_info_t *id_ptr;    /*ptr to the ID		*/
+    int            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1614,8 +1579,8 @@ H5I_inc_ref(hid_t id, hbool_t app_ref)
     HDassert(id >= 0);
 
     /* General lookup of the ID */
-    if(NULL == (id_ptr = H5I__find_id(id)))
-	HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't locate ID")
+    if (NULL == (id_ptr = H5I__find_id(id)))
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't locate ID")
 
     /* Adjust reference counts */
     ++(id_ptr->count);
@@ -1629,7 +1594,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_inc_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iget_ref
  *
@@ -1646,24 +1610,23 @@ done:
 int
 H5Iget_ref(hid_t id)
 {
-    int ret_value;                      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", id);
 
     /* Check arguments */
-    if(id < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID")
+    if (id < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID")
 
     /* Do actual retrieve operation */
-    if((ret_value = H5I_get_ref(id, TRUE)) < 0)
+    if ((ret_value = H5I_get_ref(id, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't get ID ref count")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_get_ref
  *
@@ -1680,8 +1643,8 @@ done:
 int
 H5I_get_ref(hid_t id, hbool_t app_ref)
 {
-    H5I_id_info_t	*id_ptr;	/*ptr to the ID		*/
-    int ret_value;                      /* Return value */
+    H5I_id_info_t *id_ptr;    /*ptr to the ID		*/
+    int            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1689,8 +1652,8 @@ H5I_get_ref(hid_t id, hbool_t app_ref)
     HDassert(id >= 0);
 
     /* General lookup of the ID */
-    if(NULL == (id_ptr = H5I__find_id(id)))
-	HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't locate ID")
+    if (NULL == (id_ptr = H5I__find_id(id)))
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't locate ID")
 
     /* Set return value */
     ret_value = (int)(app_ref ? id_ptr->app_count : id_ptr->count);
@@ -1699,7 +1662,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_get_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iinc_type_ref
  *
@@ -1717,27 +1679,26 @@ done:
 int
 H5Iinc_type_ref(H5I_type_t type)
 {
-    int ret_value;                      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "It", type);
 
     /* Check arguments */
-    if(type <= 0 || type >= H5I_next_type)
+    if (type <= 0 || type >= H5I_next_type)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID type")
 
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type")
 
     /* Do actual increment operation */
-    if((ret_value = H5I__inc_type_ref(type)) < 0)
+    if ((ret_value = H5I__inc_type_ref(type)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINC, FAIL, "can't increment ID type ref count")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iinc_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__inc_type_ref
  *
@@ -1755,8 +1716,8 @@ done:
 static int
 H5I__inc_type_ref(H5I_type_t type)
 {
-    H5I_id_type_t	*type_ptr;	/* ptr to the type	*/
-    int ret_value;                      /* Return value */
+    H5I_id_type_t *type_ptr;  /* ptr to the type	*/
+    int            ret_value; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1765,8 +1726,8 @@ H5I__inc_type_ref(H5I_type_t type)
 
     /* Check arguments */
     type_ptr = H5I_id_type_list_g[type];
-    if(!type_ptr)
-	HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
+    if (!type_ptr)
+        HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
 
     /* Set return value */
     ret_value = (int)(++(type_ptr->init_count));
@@ -1775,7 +1736,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__inc_type_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Idec_type_ref
  *
@@ -1801,12 +1761,12 @@ done:
 herr_t
 H5Idec_type_ref(H5I_type_t type)
 {
-    herr_t ret_value;           /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "It", type);
 
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type")
 
     ret_value = H5I_dec_type_ref(type);
@@ -1815,7 +1775,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Idec_type_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_dec_type_ref
  *
@@ -1839,17 +1798,17 @@ done:
 herr_t
 H5I_dec_type_ref(H5I_type_t type)
 {
-    H5I_id_type_t	*type_ptr;      /* Pointer to the ID type */
-    herr_t		ret_value;      /* Return value */
+    H5I_id_type_t *type_ptr;  /* Pointer to the ID type */
+    herr_t         ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(type <= H5I_BADID || type >= H5I_next_type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
+    if (type <= H5I_BADID || type >= H5I_next_type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
 
     type_ptr = H5I_id_type_list_g[type];
-    if(type_ptr == NULL || type_ptr->init_count <= 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
+    if (type_ptr == NULL || type_ptr->init_count <= 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
 
     /*
      * Decrement the number of users of the atomic type.  If this is the
@@ -1857,7 +1816,7 @@ H5I_dec_type_ref(H5I_type_t type)
      * free all memory it used.  The free function is invoked for each atom
      * being freed.
      */
-    if(1 == type_ptr->init_count) {
+    if (1 == type_ptr->init_count) {
         H5I__destroy_type(type);
         ret_value = 0;
     } /* end if */
@@ -1870,7 +1829,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_dec_type_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iget_type_ref
  *
@@ -1888,27 +1846,26 @@ done:
 int
 H5Iget_type_ref(H5I_type_t type)
 {
-    int ret_value;                      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "It", type);
 
     /* Check arguments */
-    if(type <= 0 || type >= H5I_next_type)
+    if (type <= 0 || type >= H5I_next_type)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID type")
 
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type")
 
     /* Do actual retrieve operation */
-    if((ret_value = H5I__get_type_ref(type)) < 0)
+    if ((ret_value = H5I__get_type_ref(type)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't get ID type ref count")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__get_type_ref
  *
@@ -1927,8 +1884,8 @@ done:
 static int
 H5I__get_type_ref(H5I_type_t type)
 {
-    H5I_id_type_t	*type_ptr;	/*ptr to the type	*/
-    int ret_value;                      /* Return value */
+    H5I_id_type_t *type_ptr;  /*ptr to the type	*/
+    int            ret_value; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1937,7 +1894,7 @@ H5I__get_type_ref(H5I_type_t type)
 
     /* Check arguments */
     type_ptr = H5I_id_type_list_g[type];
-    if(!type_ptr)
+    if (!type_ptr)
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
 
     /* Set return value */
@@ -1947,7 +1904,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__get_type_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iis_valid
  *
@@ -1966,8 +1922,8 @@ done:
 htri_t
 H5Iis_valid(hid_t id)
 {
-    H5I_id_info_t   *id_ptr;            /* ptr to the ID */
-    htri_t          ret_value = TRUE;   /* Return value */
+    H5I_id_info_t *id_ptr;           /* ptr to the ID */
+    htri_t         ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", id);
@@ -1984,7 +1940,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iis_valid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__search_cb
  *
@@ -2006,18 +1961,17 @@ static int
 H5I__search_cb(void *obj, hid_t id, void *_udata)
 {
     H5I_search_ud_t *udata = (H5I_search_ud_t *)_udata; /* User data for callback */
-    int ret_value;     /* Callback return value */
+    int              ret_value;                         /* Callback return value */
 
     FUNC_ENTER_STATIC_NOERR
 
     ret_value = (*udata->app_cb)(obj, id, udata->app_key);
-    if(ret_value > 0)
+    if (ret_value > 0)
         udata->ret_obj = obj;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__search_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Isearch
  *
@@ -2045,22 +1999,22 @@ H5I__search_cb(void *obj, hid_t id, void *_udata)
 void *
 H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key)
 {
-    H5I_search_ud_t udata;      /* Context for iteration */
-    void *ret_value;            /* Return value */
+    H5I_search_ud_t udata;     /* Context for iteration */
+    void *          ret_value; /* Return value */
 
     FUNC_ENTER_API(NULL)
     H5TRACE3("*x", "Itx*x", type, func, key);
 
     /* Check arguments */
-    if(H5I_IS_LIB_TYPE(type))
+    if (H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
 
     /* Set up udata struct */
-    udata.app_cb = func;
+    udata.app_cb  = func;
     udata.app_key = key;
     udata.ret_obj = NULL;
 
-    /* Note that H5I_iterate returns an error code.  We ignore it 
+    /* Note that H5I_iterate returns an error code.  We ignore it
      * here, as we can't do anything with it without revising the API.
      */
     (void)H5I_iterate(type, H5I__search_cb, &udata, TRUE);
@@ -2072,7 +2026,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Isearch() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__iterate_cb
  *
@@ -2091,47 +2044,46 @@ done:
 static int
 H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 {
-    H5I_id_info_t *item = (H5I_id_info_t *)_item;       /* Pointer to the ID node */
-    H5I_iterate_ud_t *udata = (H5I_iterate_ud_t *)_udata; /* User data for callback */
-    int ret_value = H5_ITER_CONT;     /* Callback return value */
+    H5I_id_info_t *   item      = (H5I_id_info_t *)_item;     /* Pointer to the ID node */
+    H5I_iterate_ud_t *udata     = (H5I_iterate_ud_t *)_udata; /* User data for callback */
+    int               ret_value = H5_ITER_CONT;               /* Callback return value */
 
     FUNC_ENTER_STATIC_NOERR
 
     /* Don't make callback if app_ref is set and the appl. ref count is 0 */
-    if((!udata->app_ref) || (item->app_count > 0)) {
+    if ((!udata->app_ref) || (item->app_count > 0)) {
         herr_t cb_ret_val;
 
         /* (Casting away const OK) */
         cb_ret_val = (*udata->user_func)((void *)item->obj_ptr, item->id, udata->user_udata);
-        if(cb_ret_val > 0)
-            ret_value = H5_ITER_STOP;	/* terminate iteration early */
-        else if(cb_ret_val < 0)
-            ret_value = H5_ITER_ERROR;  /* indicate failure (which terminates iteration) */
-    } /* end if */
+        if (cb_ret_val > 0)
+            ret_value = H5_ITER_STOP; /* terminate iteration early */
+        else if (cb_ret_val < 0)
+            ret_value = H5_ITER_ERROR; /* indicate failure (which terminates iteration) */
+    }                                  /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__iterate_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_iterate
  *
- * Purpose:	Apply function FUNC to each member of type TYPE (with 
- *		non-zero application reference count if app_ref is TRUE).  
- *		Stop if FUNC returns a non zero value (i.e. anything 
- *		other than H5_ITER_CONT).  
+ * Purpose:	Apply function FUNC to each member of type TYPE (with
+ *		non-zero application reference count if app_ref is TRUE).
+ *		Stop if FUNC returns a non zero value (i.e. anything
+ *		other than H5_ITER_CONT).
  *
- *		If FUNC returns a positive value (i.e. H5_ITER_STOP), 
+ *		If FUNC returns a positive value (i.e. H5_ITER_STOP),
  *		return SUCCEED.
  *
- *		If FUNC returns a negative value (i.e. H5_ITER_ERROR), 
+ *		If FUNC returns a negative value (i.e. H5_ITER_ERROR),
  *		return FAIL.
- *		
- *		The FUNC should take a pointer to the object and the 
- *		udata as arguments and return non-zero to terminate 
+ *
+ *		The FUNC should take a pointer to the object and the
+ *		udata as arguments and return non-zero to terminate
  *		siteration, and zero to continue.
  *
- * Limitation:	Currently there is no way to start the iteration from 
+ * Limitation:	Currently there is no way to start the iteration from
  *		where a previous iteration left off.
  *
  * Return:	Success:	SUCCEED
@@ -2145,28 +2097,28 @@ H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 herr_t
 H5I_iterate(H5I_type_t type, H5I_search_func_t func, void *udata, hbool_t app_ref)
 {
-    H5I_id_type_t *type_ptr;		/*ptr to the type	*/
-    herr_t	   ret_value = SUCCEED;	/*return value		*/
+    H5I_id_type_t *type_ptr;            /*ptr to the type	*/
+    herr_t         ret_value = SUCCEED; /*return value		*/
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    if(type <= H5I_BADID || type >= H5I_next_type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
+    if (type <= H5I_BADID || type >= H5I_next_type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
     type_ptr = H5I_id_type_list_g[type];
 
     /* Only iterate through ID list if it is initialized and there are IDs in type */
-    if(type_ptr && type_ptr->init_count > 0 && type_ptr->id_count > 0) {
-        H5I_iterate_ud_t iter_udata;    /* User data for iteration callback */
-        herr_t iter_status;             /* Iteration status */
+    if (type_ptr && type_ptr->init_count > 0 && type_ptr->id_count > 0) {
+        H5I_iterate_ud_t iter_udata;  /* User data for iteration callback */
+        herr_t           iter_status; /* Iteration status */
 
         /* Set up iterator user data */
-        iter_udata.user_func = func;
+        iter_udata.user_func  = func;
         iter_udata.user_udata = udata;
-        iter_udata.app_ref = app_ref;
+        iter_udata.app_ref    = app_ref;
 
         /* Iterate over IDs */
-        if((iter_status = H5SL_iterate(type_ptr->ids, H5I__iterate_cb, &iter_udata)) < 0)
+        if ((iter_status = H5SL_iterate(type_ptr->ids, H5I__iterate_cb, &iter_udata)) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_BADITER, FAIL, "iteration failed")
     } /* end if */
 
@@ -2174,7 +2126,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__find_id
  *
@@ -2192,20 +2143,20 @@ done:
 static H5I_id_info_t *
 H5I__find_id(hid_t id)
 {
-    H5I_type_t		type;			/*ID's type		*/
-    H5I_id_type_t	*type_ptr;		/*ptr to the type	*/
-    H5I_id_info_t	*ret_value;		/*return value		*/
+    H5I_type_t     type;      /*ID's type		*/
+    H5I_id_type_t *type_ptr;  /*ptr to the type	*/
+    H5I_id_info_t *ret_value; /*return value		*/
 
     FUNC_ENTER_STATIC_NOERR
 
     /* Check arguments */
     type = H5I_TYPE(id);
-    if(type <= H5I_BADID || type >= H5I_next_type)
-	HGOTO_DONE(NULL)
+    if (type <= H5I_BADID || type >= H5I_next_type)
+        HGOTO_DONE(NULL)
 
     type_ptr = H5I_id_type_list_g[type];
-    if(!type_ptr || type_ptr->init_count <= 0)
-	HGOTO_DONE(NULL)
+    if (!type_ptr || type_ptr->init_count <= 0)
+        HGOTO_DONE(NULL)
 
     /* Locate the ID node for the ID */
     ret_value = (H5I_id_info_t *)H5SL_search(type_ptr->ids, &id);
@@ -2214,7 +2165,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__find_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Iget_name
  *
@@ -2241,27 +2191,26 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5Iget_name(hid_t id, char *name/*out*/, size_t size)
+H5Iget_name(hid_t id, char *name /*out*/, size_t size)
 {
-    H5G_loc_t     loc;          /* Object location */
-    ssize_t       ret_value;    /* Return value */
+    H5G_loc_t loc;       /* Object location */
+    ssize_t   ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "ixz", id, name, size);
 
     /* Get object location */
-    if(H5G_loc(id, &loc) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object location")
+    if (H5G_loc(id, &loc) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object location")
 
     /* Call internal group routine to retrieve object's name */
-    if((ret_value = H5G_get_name(&loc, name, size, NULL, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object name")
+    if ((ret_value = H5G_get_name(&loc, name, size, NULL, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object name")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Iget_file_id
  *
@@ -2280,19 +2229,18 @@ done:
 hid_t
 H5Iget_file_id(hid_t obj_id)
 {
-    hid_t ret_value;            /* Return value */
+    hid_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", obj_id);
 
-    if((ret_value = H5I_get_file_id(obj_id, TRUE)) < 0)
+    if ((ret_value = H5I_get_file_id(obj_id, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve file ID")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_file_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I_get_file_id
  *
@@ -2310,30 +2258,30 @@ done:
 hid_t
 H5I_get_file_id(hid_t obj_id, hbool_t app_ref)
 {
-    H5I_type_t type;            /* ID type */
-    hid_t ret_value;            /* Return value */
+    H5I_type_t type;      /* ID type */
+    hid_t      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get object type */
     type = H5I_TYPE(obj_id);
-    if(type == H5I_FILE) {
+    if (type == H5I_FILE) {
         /* Increment reference count on file ID */
-        if(H5I_inc_ref(obj_id, app_ref) < 0)
+        if (H5I_inc_ref(obj_id, app_ref) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTSET, FAIL, "incrementing file ID failed")
 
         /* Set return value */
         ret_value = obj_id;
     } /* end if */
-    else if(type == H5I_DATATYPE || type == H5I_GROUP || type == H5I_DATASET || type == H5I_ATTR) {
-        H5G_loc_t loc;              /* Location of object */
+    else if (type == H5I_DATATYPE || type == H5I_GROUP || type == H5I_DATASET || type == H5I_ATTR) {
+        H5G_loc_t loc; /* Location of object */
 
         /* Get the object location information */
-        if(H5G_loc(obj_id, &loc) < 0)
+        if (H5G_loc(obj_id, &loc) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't get object location")
 
         /* Get the file ID for the object */
-        if((ret_value = H5F_get_id(loc.oloc->file, app_ref)) < 0)
+        if ((ret_value = H5F_get_id(loc.oloc->file, app_ref)) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't get file ID")
     } /* end if */
     else
@@ -2344,7 +2292,7 @@ done:
 } /* end H5I_get_file_id() */
 
 #ifdef H5I_DEBUG_OUTPUT
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5I__debug_cb
  *
@@ -2361,10 +2309,10 @@ done:
 static herr_t
 H5I__debug_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 {
-    H5I_id_info_t *item = (H5I_id_info_t *)_item;       /* Pointer to the ID node */
-    H5I_type_t type = *(H5I_type_t *)_udata;            /* User data */
-    H5G_name_t *path = NULL;
-    int ret_value = H5_ITER_CONT;                       /* Return value */
+    H5I_id_info_t *item      = (H5I_id_info_t *)_item; /* Pointer to the ID node */
+    H5I_type_t     type      = *(H5I_type_t *)_udata;  /* User data */
+    H5G_name_t *   path      = NULL;
+    int            ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -2373,34 +2321,33 @@ H5I__debug_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
     HDfprintf(stderr, "		 obj   = 0x%08lx\n", (unsigned long)(item->obj_ptr));
 
     /* Get the group location, so we get get the name */
-    switch(type) {
+    switch (type) {
         case H5I_GROUP:
-            path = H5G_nameof((H5G_t*)item->obj_ptr);
+            path = H5G_nameof((H5G_t *)item->obj_ptr);
             break;
 
         case H5I_DATASET:
-            path = H5D_nameof((H5D_t*)item->obj_ptr);
+            path = H5D_nameof((H5D_t *)item->obj_ptr);
             break;
 
         case H5I_DATATYPE:
-            path = H5T_nameof((H5T_t*)item->obj_ptr);
+            path = H5T_nameof((H5T_t *)item->obj_ptr);
             break;
 
         default:
-            break;   /* Other types of IDs are not stored in files */
-    } /* end switch*/
+            break; /* Other types of IDs are not stored in files */
+    }              /* end switch*/
 
-    if(path) {
-        if(path->user_path_r)
+    if (path) {
+        if (path->user_path_r)
             HDfprintf(stderr, "                user_path = %s\n", H5RS_get_str(path->user_path_r));
-        if(path->full_path_r)
+        if (path->full_path_r)
             HDfprintf(stderr, "                full_path = %s\n", H5RS_get_str(path->full_path_r));
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5I__debug_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5I__debug
  *
@@ -2438,4 +2385,3 @@ H5I__debug(H5I_type_t type)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5I__debug() */
 #endif /* H5I_DEBUG_OUTPUT */
-
diff --git a/src/H5Ipkg.h b/src/H5Ipkg.h
index 6aa4552..b05028c 100644
--- a/src/H5Ipkg.h
+++ b/src/H5Ipkg.h
@@ -41,8 +41,8 @@
  * type). This is the only number that must be changed since all other bit
  * field sizes and masks are calculated from TYPE_BITS.
  */
-#define TYPE_BITS	7
-#define TYPE_MASK	(((hid_t)1 << TYPE_BITS) - 1)
+#define TYPE_BITS 7
+#define TYPE_MASK (((hid_t)1 << TYPE_BITS) - 1)
 
 #define H5I_MAX_NUM_TYPES TYPE_MASK
 
@@ -50,12 +50,11 @@
  * Number of bits to use for the Atom index in each atom (assumes 8-bit
  * bytes). We don't use the sign bit.
  */
-#define ID_BITS		((sizeof(hid_t) * 8) - (TYPE_BITS + 1))
-#define ID_MASK		(((hid_t)1 << ID_BITS) - 1)
+#define ID_BITS ((sizeof(hid_t) * 8) - (TYPE_BITS + 1))
+#define ID_MASK (((hid_t)1 << ID_BITS) - 1)
 
 /* Map an atom to an ID type number */
-#define H5I_TYPE(a)	((H5I_type_t)(((hid_t)(a) >> ID_BITS) & TYPE_MASK))
-
+#define H5I_TYPE(a) ((H5I_type_t)(((hid_t)(a) >> ID_BITS) & TYPE_MASK))
 
 /****************************/
 /* Package Private Typedefs */
@@ -67,8 +66,7 @@
 
 /* Testing functions */
 #ifdef H5I_TESTING
-H5_DLL ssize_t H5I_get_name_test(hid_t id, char *name/*out*/, size_t size,
-    hbool_t *cached);
+H5_DLL ssize_t H5I_get_name_test(hid_t id, char *name /*out*/, size_t size, hbool_t *cached);
 #endif /* H5I_TESTING */
 
 #endif /*_H5Ipkg_H*/
diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h
index 329af52..4e21be5 100644
--- a/src/H5Iprivate.h
+++ b/src/H5Iprivate.h
@@ -31,56 +31,52 @@
 /**************************/
 
 /* Macro to determine if a H5I_type_t is a "library type" */
-#define H5I_IS_LIB_TYPE( type ) (type > 0 && type < H5I_NTYPES)
+#define H5I_IS_LIB_TYPE(type) (type > 0 && type < H5I_NTYPES)
 
 /* Flags for ID class */
-#define H5I_CLASS_IS_APPLICATION        0x01
-#define H5I_CLASS_REUSE_IDS             0x02
-
+#define H5I_CLASS_IS_APPLICATION 0x01
+#define H5I_CLASS_REUSE_IDS      0x02
 
 /****************************/
 /* Library Private Typedefs */
 /****************************/
 
 typedef struct H5I_class_t {
-    H5I_type_t type_id;         /* Class ID for the type */
-    unsigned flags;             /* Class behavior flags */
-    unsigned reserved;          /* Number of reserved IDs for this type */
-                                /* [A specific number of type entries may be
-                                 * reserved to enable "constant" values to be
-                                 * handed out which are valid IDs in the type,
-                                 * but which do not map to any data structures
-                                 * and are not allocated dynamically later.]
-                                 */
-    H5I_free_t free_func;       /* Free function for object's of this type */
+    H5I_type_t type_id;   /* Class ID for the type */
+    unsigned   flags;     /* Class behavior flags */
+    unsigned   reserved;  /* Number of reserved IDs for this type */
+                          /* [A specific number of type entries may be
+                           * reserved to enable "constant" values to be
+                           * handed out which are valid IDs in the type,
+                           * but which do not map to any data structures
+                           * and are not allocated dynamically later.]
+                           */
+    H5I_free_t free_func; /* Free function for object's of this type */
 } H5I_class_t;
 
-
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
-H5_DLL herr_t H5I_register_type(const H5I_class_t *cls);
-H5_DLL int H5I_nmembers(H5I_type_t type);
-H5_DLL herr_t H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref);
-H5_DLL hid_t H5I_register(H5I_type_t type, const void *object, hbool_t app_ref);
-H5_DLL void *H5I_subst(hid_t id, const void *new_object);
-H5_DLL void *H5I_object(hid_t id);
-H5_DLL void *H5I_object_verify(hid_t id, H5I_type_t id_type);
+H5_DLL herr_t     H5I_register_type(const H5I_class_t *cls);
+H5_DLL int        H5I_nmembers(H5I_type_t type);
+H5_DLL herr_t     H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref);
+H5_DLL hid_t      H5I_register(H5I_type_t type, const void *object, hbool_t app_ref);
+H5_DLL void *     H5I_subst(hid_t id, const void *new_object);
+H5_DLL void *     H5I_object(hid_t id);
+H5_DLL void *     H5I_object_verify(hid_t id, H5I_type_t id_type);
 H5_DLL H5I_type_t H5I_get_type(hid_t id);
-H5_DLL hid_t H5I_get_file_id(hid_t obj_id, hbool_t app_ref);
-H5_DLL void *H5I_remove(hid_t id);
-H5_DLL herr_t H5I_iterate(H5I_type_t type, H5I_search_func_t func, void *udata, hbool_t app_ref);
-H5_DLL int H5I_get_ref(hid_t id, hbool_t app_ref);
-H5_DLL int H5I_inc_ref(hid_t id, hbool_t app_ref);
-H5_DLL int H5I_dec_ref(hid_t id);
-H5_DLL int H5I_dec_app_ref(hid_t id);
-H5_DLL int H5I_dec_app_ref_always_close(hid_t id);
-H5_DLL herr_t H5I_dec_type_ref(H5I_type_t type);
+H5_DLL hid_t      H5I_get_file_id(hid_t obj_id, hbool_t app_ref);
+H5_DLL void *     H5I_remove(hid_t id);
+H5_DLL herr_t     H5I_iterate(H5I_type_t type, H5I_search_func_t func, void *udata, hbool_t app_ref);
+H5_DLL int        H5I_get_ref(hid_t id, hbool_t app_ref);
+H5_DLL int        H5I_inc_ref(hid_t id, hbool_t app_ref);
+H5_DLL int        H5I_dec_ref(hid_t id);
+H5_DLL int        H5I_dec_app_ref(hid_t id);
+H5_DLL int        H5I_dec_app_ref_always_close(hid_t id);
+H5_DLL herr_t     H5I_dec_type_ref(H5I_type_t type);
 
 #endif /* _H5Iprivate_H */
-
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h
index c76f06c..5abe3da 100644
--- a/src/H5Ipublic.h
+++ b/src/H5Ipublic.h
@@ -32,30 +32,30 @@
  *
  */
 typedef enum H5I_type_t {
-    H5I_UNINIT		= (-2), /*uninitialized type			    */
-    H5I_BADID		= (-1),	/*invalid Type				    */
-    H5I_FILE            = 1,  	/*type ID for File objects      	    */
-    H5I_GROUP,	                /*type ID for Group objects     	    */
-    H5I_DATATYPE,	        /*type ID for Datatype objects		    */
-    H5I_DATASPACE,	        /*type ID for Dataspace objects		    */
-    H5I_DATASET,	        /*type ID for Dataset objects		    */
-    H5I_ATTR,		        /*type ID for Attribute objects		    */
-    H5I_REFERENCE,	        /*type ID for Reference objects		    */
-    H5I_VFL,			/*type ID for virtual file layer	    */
-    H5I_GENPROP_CLS,            /*type ID for generic property list classes */
-    H5I_GENPROP_LST,            /*type ID for generic property lists        */
-    H5I_ERROR_CLASS,            /*type ID for error classes		    */
-    H5I_ERROR_MSG,              /*type ID for error messages		    */
-    H5I_ERROR_STACK,            /*type ID for error stacks		    */
-    H5I_NTYPES		        /*number of library types, MUST BE LAST!    */
+    H5I_UNINIT = (-2), /*uninitialized type			    */
+    H5I_BADID  = (-1), /*invalid Type				    */
+    H5I_FILE   = 1,    /*type ID for File objects      	    */
+    H5I_GROUP,         /*type ID for Group objects     	    */
+    H5I_DATATYPE,      /*type ID for Datatype objects		    */
+    H5I_DATASPACE,     /*type ID for Dataspace objects		    */
+    H5I_DATASET,       /*type ID for Dataset objects		    */
+    H5I_ATTR,          /*type ID for Attribute objects		    */
+    H5I_REFERENCE,     /*type ID for Reference objects		    */
+    H5I_VFL,           /*type ID for virtual file layer	    */
+    H5I_GENPROP_CLS,   /*type ID for generic property list classes */
+    H5I_GENPROP_LST,   /*type ID for generic property lists        */
+    H5I_ERROR_CLASS,   /*type ID for error classes		    */
+    H5I_ERROR_MSG,     /*type ID for error messages		    */
+    H5I_ERROR_STACK,   /*type ID for error stacks		    */
+    H5I_NTYPES         /*number of library types, MUST BE LAST!    */
 } H5I_type_t;
 
 /* Type of atoms to return to users */
 typedef int hid_t;
-#define H5_SIZEOF_HID_T         H5_SIZEOF_INT
+#define H5_SIZEOF_HID_T H5_SIZEOF_INT
 
 /* An invalid object ID. This is also negative for error return. */
-#define H5I_INVALID_HID         (-1)
+#define H5I_INVALID_HID (-1)
 
 /*
  * Function for freeing objects. This function will be called with an object
@@ -64,7 +64,7 @@ typedef int hid_t;
  * can be removed from the ID type. If the function returns negative
  * (failure) then the object will remain in the ID type.
  */
-typedef herr_t (*H5I_free_t)(void*);
+typedef herr_t (*H5I_free_t)(void *);
 
 /* Type of the function to compare objects & keys */
 typedef int (*H5I_search_func_t)(void *obj, hid_t id, void *key);
@@ -75,28 +75,27 @@ extern "C" {
 
 /* Public API functions */
 
-H5_DLL hid_t H5Iregister(H5I_type_t type, const void *object);
-H5_DLL void *H5Iobject_verify(hid_t id, H5I_type_t id_type);
-H5_DLL void *H5Iremove_verify(hid_t id, H5I_type_t id_type);
+H5_DLL hid_t      H5Iregister(H5I_type_t type, const void *object);
+H5_DLL void *     H5Iobject_verify(hid_t id, H5I_type_t id_type);
+H5_DLL void *     H5Iremove_verify(hid_t id, H5I_type_t id_type);
 H5_DLL H5I_type_t H5Iget_type(hid_t id);
-H5_DLL hid_t H5Iget_file_id(hid_t id);
-H5_DLL ssize_t H5Iget_name(hid_t id, char *name/*out*/, size_t size);
-H5_DLL int H5Iinc_ref(hid_t id);
-H5_DLL int H5Idec_ref(hid_t id);
-H5_DLL int H5Iget_ref(hid_t id);
+H5_DLL hid_t      H5Iget_file_id(hid_t id);
+H5_DLL ssize_t    H5Iget_name(hid_t id, char *name /*out*/, size_t size);
+H5_DLL int        H5Iinc_ref(hid_t id);
+H5_DLL int        H5Idec_ref(hid_t id);
+H5_DLL int        H5Iget_ref(hid_t id);
 H5_DLL H5I_type_t H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free_t free_func);
-H5_DLL herr_t H5Iclear_type(H5I_type_t type, hbool_t force);
-H5_DLL herr_t H5Idestroy_type(H5I_type_t type);
-H5_DLL int H5Iinc_type_ref(H5I_type_t type);
-H5_DLL int H5Idec_type_ref(H5I_type_t type);
-H5_DLL int H5Iget_type_ref(H5I_type_t type);
-H5_DLL void *H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key);
-H5_DLL herr_t H5Inmembers(H5I_type_t type, hsize_t *num_members);
-H5_DLL htri_t H5Itype_exists(H5I_type_t type);
-H5_DLL htri_t H5Iis_valid(hid_t id);
+H5_DLL herr_t     H5Iclear_type(H5I_type_t type, hbool_t force);
+H5_DLL herr_t     H5Idestroy_type(H5I_type_t type);
+H5_DLL int        H5Iinc_type_ref(H5I_type_t type);
+H5_DLL int        H5Idec_type_ref(H5I_type_t type);
+H5_DLL int        H5Iget_type_ref(H5I_type_t type);
+H5_DLL void *     H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key);
+H5_DLL herr_t     H5Inmembers(H5I_type_t type, hsize_t *num_members);
+H5_DLL htri_t     H5Itype_exists(H5I_type_t type);
+H5_DLL htri_t     H5Iis_valid(hid_t id);
 
 #ifdef __cplusplus
 }
 #endif
 #endif /* _H5Ipublic_H */
-
diff --git a/src/H5Itest.c b/src/H5Itest.c
index 1ff9484..0dbbaba 100644
--- a/src/H5Itest.c
+++ b/src/H5Itest.c
@@ -21,46 +21,38 @@
 /* Module Setup */
 /****************/
 
-#define H5I_PACKAGE		/*suppress error about including H5Ipkg	  */
-#define H5I_TESTING		/*suppress warning about H5I testing funcs*/
-
+#define H5I_PACKAGE /*suppress error about including H5Ipkg	  */
+#define H5I_TESTING /*suppress warning about H5I testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5Ipkg.h"		/* IDs			  		*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gprivate.h"  /* Groups				*/
+#include "H5Ipkg.h"      /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function: H5I_get_name_test
  *
@@ -75,22 +67,21 @@
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5I_get_name_test(hid_t id, char *name/*out*/, size_t size, hbool_t *cached)
+H5I_get_name_test(hid_t id, char *name /*out*/, size_t size, hbool_t *cached)
 {
-    H5G_loc_t     loc;          /* Object location */
-    ssize_t       ret_value;    /* Return value */
+    H5G_loc_t loc;       /* Object location */
+    ssize_t   ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get object location */
-    if(H5G_loc(id, &loc) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object location")
+    if (H5G_loc(id, &loc) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object location")
 
     /* Call internal group routine to retrieve object's name */
-    if((ret_value = H5G_get_name(&loc, name, size, cached, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object name")
+    if ((ret_value = H5G_get_name(&loc, name, size, cached, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object name")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_get_name_test() */
-
diff --git a/src/H5L.c b/src/H5L.c
index 1e60398..d1ddfc3 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -15,25 +15,25 @@
 /* Module Setup */
 /****************/
 
-#define H5L_PACKAGE     /*suppress error about including H5Lpkg   */
+#define H5L_PACKAGE /*suppress error about including H5Lpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC  H5L_init_interface
+#define H5_INTERFACE_INIT_FUNC H5L_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"          /* Generic Functions                    */
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Dprivate.h"         /* Datasets                             */
-#include "H5Eprivate.h"         /* Error handling                       */
-#include "H5Fprivate.h"         /* File access                          */
-#include "H5Gprivate.h"         /* Groups                               */
-#include "H5Iprivate.h"         /* IDs                                  */
-#include "H5Lpkg.h"             /* Links                                */
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Oprivate.h"         /* File objects                         */
-#include "H5Pprivate.h"         /* Property lists                       */
+#include "H5private.h"   /* Generic Functions                    */
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Dprivate.h"  /* Datasets                             */
+#include "H5Eprivate.h"  /* Error handling                       */
+#include "H5Fprivate.h"  /* File access                          */
+#include "H5Gprivate.h"  /* Groups                               */
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5Lpkg.h"      /* Links                                */
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Oprivate.h"  /* File objects                         */
+#include "H5Pprivate.h"  /* Property lists                       */
 
 /****************/
 /* Local Macros */
@@ -41,170 +41,158 @@
 
 #define H5L_MIN_TABLE_SIZE 32 /* Minimum size of the user-defined link type table if it is allocated */
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for path traversal routine for getting link info by name */
 typedef struct {
-    H5L_info_t      *linfo;             /* Buffer to return to user */
-    hid_t           dxpl_id;            /* DXPL to use in callback */
+    H5L_info_t *linfo;   /* Buffer to return to user */
+    hid_t       dxpl_id; /* DXPL to use in callback */
 } H5L_trav_gi_t;
 
 /* User data for path traversal routine for getting link info by index */
 typedef struct {
     /* In */
-    H5_index_t idx_type;               /* Index to use */
-    H5_iter_order_t order;              /* Order to iterate in index */
-    hsize_t n;                          /* Offset of link within index */
-    hid_t dxpl_id;                      /* DXPL to use in callback */
+    H5_index_t      idx_type; /* Index to use */
+    H5_iter_order_t order;    /* Order to iterate in index */
+    hsize_t         n;        /* Offset of link within index */
+    hid_t           dxpl_id;  /* DXPL to use in callback */
 
     /* Out */
-    H5L_info_t      *linfo;             /* Buffer to return to user */
+    H5L_info_t *linfo; /* Buffer to return to user */
 } H5L_trav_gibi_t;
 
 /* User data for path traversal callback to creating a link */
 typedef struct {
-    H5F_t *file;                        /* Pointer to the file */
-    H5P_genplist_t *lc_plist;           /* Link creation property list */
-    hid_t dxpl_id;                      /* Dataset transfer property list */
-    H5G_name_t *path;                   /* Path to object being linked */
-    H5O_obj_create_t *ocrt_info;        /* Pointer to object creation info */
-    H5O_link_t *lnk;                    /* Pointer to link information to insert */
+    H5F_t *           file;      /* Pointer to the file */
+    H5P_genplist_t *  lc_plist;  /* Link creation property list */
+    hid_t             dxpl_id;   /* Dataset transfer property list */
+    H5G_name_t *      path;      /* Path to object being linked */
+    H5O_obj_create_t *ocrt_info; /* Pointer to object creation info */
+    H5O_link_t *      lnk;       /* Pointer to link information to insert */
 } H5L_trav_cr_t;
 
 /* User data for path traversal routine for moving and renaming a link */
 typedef struct {
-    const char *dst_name;               /* Destination name for moving object */
-    H5T_cset_t cset;                    /* Char set for new name */
-    H5G_loc_t  *dst_loc;                /* Destination location for moving object */
-    unsigned dst_target_flags;          /* Target flags for destination object */
-    hbool_t copy;                       /* TRUE if this is a copy operation */
-    hid_t lapl_id;                      /* LAPL to use in callback */
-    hid_t dxpl_id;                      /* DXPL to use in callback */
+    const char *dst_name;         /* Destination name for moving object */
+    H5T_cset_t  cset;             /* Char set for new name */
+    H5G_loc_t * dst_loc;          /* Destination location for moving object */
+    unsigned    dst_target_flags; /* Target flags for destination object */
+    hbool_t     copy;             /* TRUE if this is a copy operation */
+    hid_t       lapl_id;          /* LAPL to use in callback */
+    hid_t       dxpl_id;          /* DXPL to use in callback */
 } H5L_trav_mv_t;
 
 /* User data for path traversal routine for moving and renaming an object */
 typedef struct {
-    H5F_t *file;                        /* Pointer to the file */
-    H5O_link_t *lnk;                    /* Pointer to link information to insert */
-    hbool_t copy;                       /* TRUE if this is a copy operation */
-    hid_t dxpl_id;                      /* Dataset transfer property list */
+    H5F_t *     file;    /* Pointer to the file */
+    H5O_link_t *lnk;     /* Pointer to link information to insert */
+    hbool_t     copy;    /* TRUE if this is a copy operation */
+    hid_t       dxpl_id; /* Dataset transfer property list */
 } H5L_trav_mv2_t;
 
 /* User data for path traversal routine for getting link value */
 typedef struct {
-    size_t size;                        /* Size of user buffer */
-    void *buf;                          /* User buffer */
+    size_t size; /* Size of user buffer */
+    void * buf;  /* User buffer */
 } H5L_trav_gv_t;
 
 /* User data for path traversal routine for getting link value by index */
 typedef struct {
     /* In */
-    H5_index_t idx_type;               /* Index to use */
-    H5_iter_order_t order;              /* Order to iterate in index */
-    hsize_t n;                          /* Offset of link within index */
-    hid_t dxpl_id;                      /* DXPL to use in callback */
-    size_t size;                        /* Size of user buffer */
+    H5_index_t      idx_type; /* Index to use */
+    H5_iter_order_t order;    /* Order to iterate in index */
+    hsize_t         n;        /* Offset of link within index */
+    hid_t           dxpl_id;  /* DXPL to use in callback */
+    size_t          size;     /* Size of user buffer */
 
     /* Out */
-    void *buf;                          /* User buffer */
+    void *buf; /* User buffer */
 } H5L_trav_gvbi_t;
 
 /* User data for path traversal routine for removing link */
 typedef struct {
-    hid_t dxpl_id;                      /* DXPL to use in callback */
+    hid_t dxpl_id; /* DXPL to use in callback */
 } H5L_trav_rm_t;
 
 /* User data for path traversal routine for removing link by index */
 typedef struct {
     /* In */
-    H5_index_t idx_type;               /* Index to use */
-    H5_iter_order_t order;              /* Order to iterate in index */
-    hsize_t n;                          /* Offset of link within index */
-    hid_t dxpl_id;                      /* DXPL to use in callback */
+    H5_index_t      idx_type; /* Index to use */
+    H5_iter_order_t order;    /* Order to iterate in index */
+    hsize_t         n;        /* Offset of link within index */
+    hid_t           dxpl_id;  /* DXPL to use in callback */
 } H5L_trav_rmbi_t;
 
 /* User data for path traversal routine for getting name by index */
 typedef struct {
     /* In */
-    H5_index_t idx_type;                /* Index to use */
-    H5_iter_order_t order;              /* Order to iterate in index */
-    hsize_t n;                          /* Offset of link within index */
-    size_t size;                        /* Size of name buffer */
-    hid_t dxpl_id;                      /* DXPL to use in callback */
+    H5_index_t      idx_type; /* Index to use */
+    H5_iter_order_t order;    /* Order to iterate in index */
+    hsize_t         n;        /* Offset of link within index */
+    size_t          size;     /* Size of name buffer */
+    hid_t           dxpl_id;  /* DXPL to use in callback */
 
     /* Out */
-    char *name;                         /* Buffer to return name to user */
-    ssize_t name_len;                   /* Length of full name */
+    char *  name;     /* Buffer to return name to user */
+    ssize_t name_len; /* Length of full name */
 } H5L_trav_gnbi_t;
 
 /********************/
 /* Local Prototypes */
 /********************/
 
-static int H5L_find_class_idx(H5L_type_t id);
-static herr_t H5L_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_create_real(const H5G_loc_t *link_loc, const char *link_name,
-    H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info,
-    hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
+static int    H5L_find_class_idx(H5L_type_t id);
+static herr_t H5L_link_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                          H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_create_real(const H5G_loc_t *link_loc, const char *link_name, H5G_name_t *obj_path,
+                              H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, hid_t lcpl_id,
+                              hid_t lapl_id, hid_t dxpl_id);
 static herr_t H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size);
-static herr_t H5L_get_val_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_get_val_by_idx_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_delete_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_delete_by_idx_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_move_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_move_dest_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_exists_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static htri_t H5L_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id,
-    hid_t dxpl_id);
-static herr_t H5L_get_info_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_get_info_by_idx_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
-static herr_t H5L_get_name_by_idx_cb(H5G_loc_t *grp_loc/*in*/,
-    const char *name, const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/);
+static herr_t H5L_get_val_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                             H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_get_val_by_idx_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                                    H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                                    H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_delete_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                            H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_delete_by_idx_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                                   H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                                   H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_move_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                          H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_move_dest_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                               H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_exists_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                            H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
+static htri_t H5L_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id);
+static herr_t H5L_get_info_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                              H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_get_info_by_idx_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                                     H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                                     H5G_own_loc_t *own_loc /*out*/);
+static herr_t H5L_get_name_by_idx_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+                                     H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                                     H5G_own_loc_t *own_loc /*out*/);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Information about user-defined links */
-static size_t           H5L_table_alloc_g = 0;
-static size_t           H5L_table_used_g = 0;
-static H5L_class_t      *H5L_table_g = NULL;
+static size_t       H5L_table_alloc_g = 0;
+static size_t       H5L_table_used_g  = 0;
+static H5L_class_t *H5L_table_g       = NULL;
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_init
  *
@@ -222,7 +210,7 @@ static H5L_class_t      *H5L_table_g = NULL;
 herr_t
 H5L_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -231,7 +219,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_init_interface
  *
@@ -247,19 +234,18 @@ done:
 static herr_t
 H5L_init_interface(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Initialize user-defined link classes */
-    if(H5L_register_external() < 0)
+    if (H5L_register_external() < 0)
         HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, FAIL, "unable to register external link class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_term_interface
  *
@@ -280,7 +266,7 @@ H5L_term_interface(void)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Free the table of link types */
-    H5L_table_g = (H5L_class_t *)H5MM_xfree(H5L_table_g);
+    H5L_table_g      = (H5L_class_t *)H5MM_xfree(H5L_table_g);
     H5L_table_used_g = H5L_table_alloc_g = 0;
 
     /* Mark the interface as uninitialized */
@@ -289,7 +275,6 @@ H5L_term_interface(void)
     FUNC_LEAVE_NOAPI(n)
 } /* H5L_term_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lmove
  *
@@ -308,49 +293,46 @@ H5L_term_interface(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
-    const char *dst_name, hid_t lcpl_id, hid_t lapl_id)
+H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t lcpl_id,
+        hid_t lapl_id)
 {
-    H5G_loc_t   src_loc, *src_loc_p;
-    H5G_loc_t   dst_loc, *dst_loc_p;
-    herr_t      ret_value=SUCCEED;              /* Return value */
+    H5G_loc_t src_loc, *src_loc_p;
+    H5G_loc_t dst_loc, *dst_loc_p;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
-             lapl_id);
+    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id, lapl_id);
 
     /* Check arguments */
-    if(src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
+    if (src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not both be H5L_SAME_LOC")
-    if(src_loc_id != H5L_SAME_LOC && H5G_loc(src_loc_id, &src_loc) < 0)
+    if (src_loc_id != H5L_SAME_LOC && H5G_loc(src_loc_id, &src_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(dst_loc_id != H5L_SAME_LOC && H5G_loc(dst_loc_id, &dst_loc) < 0)
+    if (dst_loc_id != H5L_SAME_LOC && H5G_loc(dst_loc_id, &dst_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!src_name || !*src_name)
+    if (!src_name || !*src_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
-    if(!dst_name || !*dst_name)
+    if (!dst_name || !*dst_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination name specified")
-    if(lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
+    if (lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link creation property list")
 
     /* Set up src & dst location pointers */
     src_loc_p = &src_loc;
     dst_loc_p = &dst_loc;
-    if(src_loc_id == H5L_SAME_LOC)
+    if (src_loc_id == H5L_SAME_LOC)
         src_loc_p = dst_loc_p;
-    else if(dst_loc_id == H5L_SAME_LOC)
+    else if (dst_loc_id == H5L_SAME_LOC)
         dst_loc_p = src_loc_p;
 
     /* Move the link */
-    if(H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, FALSE, lcpl_id,
-            lapl_id, H5AC_dxpl_id) < 0)
-    HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
+    if (H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, FALSE, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lmove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lcopy
  *
@@ -366,49 +348,46 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
-    const char *dst_name, hid_t lcpl_id, hid_t lapl_id)
+H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t lcpl_id,
+        hid_t lapl_id)
 {
-    H5G_loc_t   src_loc, *src_loc_p;
-    H5G_loc_t   dst_loc, *dst_loc_p;
-    herr_t      ret_value=SUCCEED;              /* Return value */
+    H5G_loc_t src_loc, *src_loc_p;
+    H5G_loc_t dst_loc, *dst_loc_p;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
-             lapl_id);
+    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id, lapl_id);
 
     /* Check arguments */
-    if(src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
+    if (src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not both be H5L_SAME_LOC")
-    if(src_loc_id != H5L_SAME_LOC && H5G_loc(src_loc_id, &src_loc) < 0)
+    if (src_loc_id != H5L_SAME_LOC && H5G_loc(src_loc_id, &src_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(dst_loc_id != H5L_SAME_LOC && H5G_loc(dst_loc_id, &dst_loc) < 0)
+    if (dst_loc_id != H5L_SAME_LOC && H5G_loc(dst_loc_id, &dst_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!src_name || !*src_name)
+    if (!src_name || !*src_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
-    if(!dst_name || !*dst_name)
+    if (!dst_name || !*dst_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination name specified")
-    if(lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
+    if (lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link creation property list")
 
     /* Set up src & dst location pointers */
     src_loc_p = &src_loc;
     dst_loc_p = &dst_loc;
-    if(src_loc_id == H5L_SAME_LOC)
+    if (src_loc_id == H5L_SAME_LOC)
         src_loc_p = dst_loc_p;
-    else if(dst_loc_id == H5L_SAME_LOC)
+    else if (dst_loc_id == H5L_SAME_LOC)
         dst_loc_p = src_loc_p;
 
     /* Copy the link */
-    if(H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, TRUE, lcpl_id,
-                lapl_id, H5AC_dxpl_id) < 0)
-    HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
+    if (H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, TRUE, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lcopy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lcreate_soft
  *
@@ -428,34 +407,33 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lcreate_soft(const char *link_target,
-    hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id)
+H5Lcreate_soft(const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id,
+               hid_t lapl_id)
 {
-    H5G_loc_t   link_loc;               /* Group location for new link */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t link_loc;            /* Group location for new link */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "*si*sii", link_target, link_loc_id, link_name, lcpl_id, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(link_loc_id, &link_loc) < 0)
+    if (H5G_loc(link_loc_id, &link_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!link_target || !*link_target)
+    if (!link_target || !*link_target)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no target specified")
-    if(!link_name || !*link_name)
+    if (!link_name || !*link_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified")
-    if(lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
+    if (lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link creation property list")
 
     /* Create the link */
-    if(H5L_create_soft(link_target, &link_loc, link_name, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
+    if (H5L_create_soft(link_target, &link_loc, link_name, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lcreate_soft() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lcreate_hard
  *
@@ -473,51 +451,48 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name,
-    hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id)
+H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
+               hid_t lapl_id)
 {
-    H5G_loc_t   cur_loc, *cur_loc_p;
-    H5G_loc_t   new_loc, *new_loc_p;
-    herr_t      ret_value = SUCCEED;            /* Return value */
+    H5G_loc_t cur_loc, *cur_loc_p;
+    H5G_loc_t new_loc, *new_loc_p;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "i*si*sii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id,
-             lapl_id);
+    H5TRACE6("e", "i*si*sii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id, lapl_id);
 
     /* Check arguments */
-    if(cur_loc_id == H5L_SAME_LOC && new_loc_id == H5L_SAME_LOC)
+    if (cur_loc_id == H5L_SAME_LOC && new_loc_id == H5L_SAME_LOC)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not be both H5L_SAME_LOC")
-    if(cur_loc_id != H5L_SAME_LOC && H5G_loc(cur_loc_id, &cur_loc) < 0)
+    if (cur_loc_id != H5L_SAME_LOC && H5G_loc(cur_loc_id, &cur_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(new_loc_id != H5L_SAME_LOC && H5G_loc(new_loc_id, &new_loc) < 0)
+    if (new_loc_id != H5L_SAME_LOC && H5G_loc(new_loc_id, &new_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!cur_name || !*cur_name)
+    if (!cur_name || !*cur_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
-    if(!new_name || !*new_name)
+    if (!new_name || !*new_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified")
-    if(lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
+    if (lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link creation property list")
 
     /* Set up current & new location pointers */
     cur_loc_p = &cur_loc;
     new_loc_p = &new_loc;
-    if(cur_loc_id == H5L_SAME_LOC)
+    if (cur_loc_id == H5L_SAME_LOC)
         cur_loc_p = new_loc_p;
-    else if(new_loc_id == H5L_SAME_LOC)
+    else if (new_loc_id == H5L_SAME_LOC)
         new_loc_p = cur_loc_p;
-    else if(cur_loc_p->oloc->file != new_loc_p->oloc->file)
+    else if (cur_loc_p->oloc->file != new_loc_p->oloc->file)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should be in the same file.")
 
     /* Create the link */
-    if(H5L_create_hard(cur_loc_p, cur_name, new_loc_p, new_name,
-                lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
+    if (H5L_create_hard(cur_loc_p, cur_name, new_loc_p, new_name, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lcreate_hard() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lcreate_ud
  *
@@ -543,33 +518,31 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type,
-    const void *udata, size_t udata_size, hid_t lcpl_id, hid_t lapl_id)
+H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, const void *udata,
+             size_t udata_size, hid_t lcpl_id, hid_t lapl_id)
 {
-    H5G_loc_t   link_loc;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5G_loc_t link_loc;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "i*sLl*xzii", link_loc_id, link_name, link_type, udata,
-             udata_size, lcpl_id, lapl_id);
+    H5TRACE7("e", "i*sLl*xzii", link_loc_id, link_name, link_type, udata, udata_size, lcpl_id, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(link_loc_id, &link_loc) < 0)
+    if (H5G_loc(link_loc_id, &link_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!link_name || !*link_name)
+    if (!link_name || !*link_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no link name specified")
-    if(link_type < H5L_TYPE_UD_MIN || link_type > H5L_TYPE_MAX)
+    if (link_type < H5L_TYPE_UD_MIN || link_type > H5L_TYPE_MAX)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid link class")
 
     /* Create external link */
-    if(H5L_create_ud(&link_loc, link_name, udata, udata_size, link_type, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
+    if (H5L_create_ud(&link_loc, link_name, udata, udata_size, link_type, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lcreate_ud() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Ldelete
  *
@@ -590,27 +563,26 @@ done:
 herr_t
 H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id)
 {
-    H5G_loc_t   loc;                    /* Group's location */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_t loc;                 /* Group's location */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*si", loc_id, name, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Unlink */
-    if(H5L_delete(&loc, name, lapl_id, H5AC_dxpl_id) < 0)
+    if (H5L_delete(&loc, name, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "unable to delete link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ldelete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Ldelete_by_idx
  *
@@ -631,46 +603,45 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Ldelete_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id)
+H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                 hid_t lapl_id)
 {
-    H5G_loc_t   loc;                    /* Group's location */
-    H5L_trav_rmbi_t udata;              /* User data for callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_t       loc;                 /* Group's location */
+    H5L_trav_rmbi_t udata;               /* User data for callback */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!group_name || !*group_name)
+    if (!group_name || !*group_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up user data for unlink operation */
     udata.idx_type = idx_type;
-    udata.order = order;
-    udata.n = n;
-    udata.dxpl_id = H5AC_dxpl_id;
+    udata.order    = order;
+    udata.n        = n;
+    udata.dxpl_id  = H5AC_dxpl_id;
 
     /* Traverse the group hierarchy to remove the link */
-    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK|H5G_TARGET_MOUNT, H5L_delete_by_idx_cb, &udata, lapl_id, H5AC_dxpl_id) < 0)
+    if (H5G_traverse(&loc, group_name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK | H5G_TARGET_MOUNT,
+                     H5L_delete_by_idx_cb, &udata, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ldelete_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lget_val
  *
@@ -691,35 +662,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lget_val(hid_t loc_id, const char *name, void *buf/*out*/, size_t size,
-    hid_t lapl_id)
+H5Lget_val(hid_t loc_id, const char *name, void *buf /*out*/, size_t size, hid_t lapl_id)
 {
-    H5G_loc_t   loc;                    /* Group location for location to query */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Group location for location to query */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "i*sxzi", loc_id, name, buf, size, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc))
+    if (H5G_loc(loc_id, &loc))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Get the link value */
-    if(H5L_get_val(&loc, name, buf, size, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5L_get_val(&loc, name, buf, size, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link value for '%s'", name)
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lget_val() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lget_val_by_idx
  *
@@ -739,51 +707,47 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, void *buf/*out*/, size_t size,
-    hid_t lapl_id)
+H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                  void *buf /*out*/, size_t size, hid_t lapl_id)
 {
-    H5G_loc_t   loc;                    /* Group location for location to query */
-    H5L_trav_gvbi_t udata;              /* User data for callback */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t       loc;                 /* Group location for location to query */
+    H5L_trav_gvbi_t udata;               /* User data for callback */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("e", "i*sIiIohxzi", loc_id, group_name, idx_type, order, n, buf, size,
-             lapl_id);
+    H5TRACE8("e", "i*sIiIohxzi", loc_id, group_name, idx_type, order, n, buf, size, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc))
+    if (H5G_loc(loc_id, &loc))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!group_name || !*group_name)
+    if (!group_name || !*group_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up user data for retrieving information */
     udata.idx_type = idx_type;
-    udata.order = order;
-    udata.n = n;
-    udata.dxpl_id = H5AC_ind_dxpl_id;
-    udata.buf = buf;
-    udata.size = size;
+    udata.order    = order;
+    udata.n        = n;
+    udata.dxpl_id  = H5AC_ind_dxpl_id;
+    udata.buf      = buf;
+    udata.size     = size;
 
     /* Traverse the group hierarchy to locate the object to get info about */
-    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_val_by_idx_cb, &udata, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_traverse(&loc, group_name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_val_by_idx_cb, &udata,
+                     lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
-
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lget_val_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lexists
  *
@@ -800,32 +764,30 @@ done:
 htri_t
 H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id)
 {
-    H5G_loc_t   loc;
-    htri_t ret_value;
+    H5G_loc_t loc;
+    htri_t    ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("t", "i*si", loc_id, name, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc))
+    if (H5G_loc(loc_id, &loc))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Check for the existence of the link */
-    if((ret_value = H5L_exists(&loc, name, lapl_id, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5L_exists(&loc, name, lapl_id, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lexists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lget_info
  *
@@ -841,35 +803,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/,
-    hid_t lapl_id)
+H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/, hid_t lapl_id)
 {
-    H5G_loc_t   loc;
-    herr_t ret_value = SUCCEED;
+    H5G_loc_t loc;
+    herr_t    ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*sxi", loc_id, name, linfo, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc))
+    if (H5G_loc(loc_id, &loc))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Get the link information */
-    if(H5L_get_info(&loc, name, linfo, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5L_get_info(&loc, name, linfo, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lget_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lget_info_by_idx
  *
@@ -885,50 +844,46 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lget_info_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    H5L_info_t *linfo /*out*/, hid_t lapl_id)
+H5Lget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                   hsize_t n, H5L_info_t *linfo /*out*/, hid_t lapl_id)
 {
-    H5G_loc_t   loc;                    /* Group location for group to query */
-    H5L_trav_gibi_t udata;              /* User data for callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_t       loc;                 /* Group location for group to query */
+    H5L_trav_gibi_t udata;               /* User data for callback */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "i*sIiIohxi", loc_id, group_name, idx_type, order, n, linfo,
-             lapl_id);
+    H5TRACE7("e", "i*sIiIohxi", loc_id, group_name, idx_type, order, n, linfo, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc))
+    if (H5G_loc(loc_id, &loc))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!group_name || !*group_name)
+    if (!group_name || !*group_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up user data for callback */
     udata.idx_type = idx_type;
-    udata.order = order;
-    udata.n = n;
-    udata.dxpl_id = H5AC_ind_dxpl_id;
-    udata.linfo = linfo;
+    udata.order    = order;
+    udata.n        = n;
+    udata.dxpl_id  = H5AC_ind_dxpl_id;
+    udata.linfo    = linfo;
 
     /* Traverse the group hierarchy to locate the object to get info about */
-    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_get_info_by_idx_cb, &udata, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_traverse(&loc, group_name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_info_by_idx_cb, &udata,
+                     lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info")
 
-
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lget_info_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lregister
  *
@@ -951,35 +906,34 @@ done:
 herr_t
 H5Lregister(const H5L_class_t *cls)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "*x", cls);
 
     /* Check args */
-    if(cls == NULL)
+    if (cls == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid link class")
 
     /* Check H5L_class_t version number; this is where a function to convert
      * from an outdated version should be called.
      */
-    if(cls->version != H5L_LINK_CLASS_T_VERS)
-      HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid H5L_class_t version number")
+    if (cls->version != H5L_LINK_CLASS_T_VERS)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid H5L_class_t version number")
 
-    if(cls->id < H5L_TYPE_UD_MIN || cls->id > H5L_TYPE_MAX)
+    if (cls->id < H5L_TYPE_UD_MIN || cls->id > H5L_TYPE_MAX)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid link identification number")
-    if(cls->trav_func == NULL)
+    if (cls->trav_func == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no traversal function specified")
 
     /* Do it */
-    if(H5L_register(cls) < 0)
+    if (H5L_register(cls) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, FAIL, "unable to register link type")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lunregister
  *
@@ -998,24 +952,23 @@ done:
 herr_t
 H5Lunregister(H5L_type_t id)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "Ll", id);
 
     /* Check args */
-    if(id < 0 || id > H5L_TYPE_MAX)
+    if (id < 0 || id > H5L_TYPE_MAX)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid link type")
 
     /* Do it */
-    if(H5L_unregister(id) < 0)
+    if (H5L_unregister(id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, FAIL, "unable to unregister link type")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lunregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lis_registered
  *
@@ -1034,19 +987,19 @@ done:
 htri_t
 H5Lis_registered(H5L_type_t id)
 {
-    size_t i;                   /* Local index variable */
-    htri_t ret_value = FALSE;     /* Return value */
+    size_t i;                 /* Local index variable */
+    htri_t ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "Ll", id);
 
     /* Check args */
-    if(id < 0 || id > H5L_TYPE_MAX)
+    if (id < 0 || id > H5L_TYPE_MAX)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid link type id number")
 
     /* Is the link class already registered? */
-    for(i = 0; i < H5L_table_used_g; i++)
-        if(H5L_table_g[i].id == id) {
+    for (i = 0; i < H5L_table_used_g; i++)
+        if (H5L_table_g[i].id == id) {
             ret_value = TRUE;
             break;
         } /* end if */
@@ -1055,7 +1008,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lis_registered() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lget_name_by_idx
  *
@@ -1074,44 +1026,42 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5Lget_name_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    char *name /*out*/, size_t size, hid_t lapl_id)
+H5Lget_name_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                   hsize_t n, char *name /*out*/, size_t size, hid_t lapl_id)
 {
-    H5G_loc_t   loc;            /* Location of group */
-    H5L_trav_gnbi_t udata;      /* User data for callback */
-    ssize_t ret_value;          /* Return value */
+    H5G_loc_t       loc;       /* Location of group */
+    H5L_trav_gnbi_t udata;     /* User data for callback */
+    ssize_t         ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("Zs", "i*sIiIohxzi", loc_id, group_name, idx_type, order, n, name, size,
-             lapl_id);
+    H5TRACE8("Zs", "i*sIiIohxzi", loc_id, group_name, idx_type, order, n, name, size, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc))
+    if (H5G_loc(loc_id, &loc))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!group_name || !*group_name)
+    if (!group_name || !*group_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up user data for callback */
     udata.idx_type = idx_type;
-    udata.order = order;
-    udata.n = n;
-    udata.dxpl_id = H5AC_ind_dxpl_id;
-    udata.name = name;
-    udata.size = size;
+    udata.order    = order;
+    udata.n        = n;
+    udata.dxpl_id  = H5AC_ind_dxpl_id;
+    udata.name     = name;
+    udata.size     = size;
     udata.name_len = -1;
 
     /* Traverse the group hierarchy to locate the link to get name of */
-    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_get_name_by_idx_cb, &udata, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_traverse(&loc, group_name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_name_by_idx_cb, &udata,
+                     lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
 
     /* Set the return value */
@@ -1121,7 +1071,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lget_name_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Literate
  *
@@ -1145,50 +1094,50 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Literate(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
-    hsize_t *idx_p, H5L_iterate_t op, void *op_data)
+H5Literate(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate_t op,
+           void *op_data)
 {
-    H5I_type_t  id_type;        /* Type of ID */
-    H5G_link_iterate_t lnk_op;  /* Link operator */
-    hsize_t last_lnk;           /* Index of last object looked at */
-    hsize_t idx;                /* Internal location to hold index */
-    herr_t ret_value;           /* Return value */
+    H5I_type_t         id_type;   /* Type of ID */
+    H5G_link_iterate_t lnk_op;    /* Link operator */
+    hsize_t            last_lnk;  /* Index of last object looked at */
+    hsize_t            idx;       /* Internal location to hold index */
+    herr_t             ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iIiIo*hx*x", grp_id, idx_type, order, idx_p, op, op_data);
 
     /* Check arguments */
     id_type = H5I_get_type(grp_id);
-    if(!(H5I_GROUP == id_type || H5I_FILE == id_type))
+    if (!(H5I_GROUP == id_type || H5I_FILE == id_type))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(!op)
+    if (!op)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no operator specified")
 
     /* Set up iteration beginning/end info */
-    idx = (idx_p == NULL ? 0 : *idx_p);
+    idx      = (idx_p == NULL ? 0 : *idx_p);
     last_lnk = 0;
 
     /* Build link operator info */
-    lnk_op.op_type = H5G_LINK_OP_NEW;
+    lnk_op.op_type        = H5G_LINK_OP_NEW;
     lnk_op.op_func.op_new = op;
 
     /* Iterate over the links */
-    if((ret_value = H5G_iterate(grp_id, ".", idx_type, order, idx, &last_lnk, &lnk_op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5G_iterate(grp_id, ".", idx_type, order, idx, &last_lnk, &lnk_op, op_data, H5P_DEFAULT,
+                                 H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link iteration failed")
 
     /* Set the index we stopped at */
-    if(idx_p)
+    if (idx_p)
         *idx_p = last_lnk;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Literate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Literate_by_name
  *
@@ -1212,55 +1161,52 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Literate_by_name(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p,
-    H5L_iterate_t op, void *op_data, hid_t lapl_id)
+H5Literate_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                   hsize_t *idx_p, H5L_iterate_t op, void *op_data, hid_t lapl_id)
 {
-    H5G_link_iterate_t lnk_op;  /* Link operator */
-    hsize_t last_lnk;       /* Index of last object looked at */
-    hsize_t idx;            /* Internal location to hold index */
-    herr_t  ret_value;           /* Return value */
+    H5G_link_iterate_t lnk_op;    /* Link operator */
+    hsize_t            last_lnk;  /* Index of last object looked at */
+    hsize_t            idx;       /* Internal location to hold index */
+    herr_t             ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, group_name, idx_type, order, idx_p, op,
-             op_data, lapl_id);
+    H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, group_name, idx_type, order, idx_p, op, op_data, lapl_id);
 
     /* Check arguments */
-    if(!group_name || !*group_name)
+    if (!group_name || !*group_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(!op)
+    if (!op)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no operator specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up iteration beginning/end info */
-    idx = (idx_p == NULL ? 0 : *idx_p);
+    idx      = (idx_p == NULL ? 0 : *idx_p);
     last_lnk = 0;
 
     /* Build link operator info */
-    lnk_op.op_type = H5G_LINK_OP_NEW;
+    lnk_op.op_type        = H5G_LINK_OP_NEW;
     lnk_op.op_func.op_new = op;
 
     /* Iterate over the links */
-    if((ret_value = H5G_iterate(loc_id, group_name, idx_type, order, idx, &last_lnk, &lnk_op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5G_iterate(loc_id, group_name, idx_type, order, idx, &last_lnk, &lnk_op, op_data,
+                                 lapl_id, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link iteration failed")
 
     /* Set the index we stopped at */
-    if(idx_p)
+    if (idx_p)
         *idx_p = last_lnk;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Literate_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lvisit
  *
@@ -1290,35 +1236,33 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
-    H5L_iterate_t op, void *op_data)
+H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op, void *op_data)
 {
-    H5I_type_t  id_type;                /* Type of ID */
-    herr_t      ret_value;              /* Return value */
+    H5I_type_t id_type;   /* Type of ID */
+    herr_t     ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "iIiIox*x", grp_id, idx_type, order, op, op_data);
 
     /* Check args */
     id_type = H5I_get_type(grp_id);
-    if(!(H5I_GROUP == id_type || H5I_FILE == id_type))
+    if (!(H5I_GROUP == id_type || H5I_FILE == id_type))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(!op)
+    if (!op)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
 
     /* Call internal group visitation routine */
-    if((ret_value = H5G_visit(grp_id, ".", idx_type, order, op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5G_visit(grp_id, ".", idx_type, order, op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link visitation failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lvisit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Lvisit_by_name
  *
@@ -1348,32 +1292,31 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lvisit_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, H5L_iterate_t op, void *op_data, hid_t lapl_id)
+H5Lvisit_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                 H5L_iterate_t op, void *op_data, hid_t lapl_id)
 {
-    herr_t      ret_value;              /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "i*sIiIox*xi", loc_id, group_name, idx_type, order, op, op_data,
-             lapl_id);
+    H5TRACE7("e", "i*sIiIox*xi", loc_id, group_name, idx_type, order, op, op_data, lapl_id);
 
     /* Check args */
-    if(!group_name || !*group_name)
+    if (!group_name || !*group_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(!op)
+    if (!op)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Call internal group visitation routine */
-    if((ret_value = H5G_visit(loc_id, group_name, idx_type, order, op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5G_visit(loc_id, group_name, idx_type, order, op, op_data, lapl_id, H5AC_ind_dxpl_id)) <
+        0)
         HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link visitation failed")
 
 done:
@@ -1388,7 +1331,6 @@ done:
  *-------------------------------------------------------------------------
  */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_find_class_idx
  *
@@ -1407,20 +1349,19 @@ done:
 static int
 H5L_find_class_idx(H5L_type_t id)
 {
-    size_t i;                   /* Local index variable */
-    int ret_value = FAIL;         /* Return value */
+    size_t i;                /* Local index variable */
+    int    ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    for(i = 0; i < H5L_table_used_g; i++)
-        if(H5L_table_g[i].id == id)
+    for (i = 0; i < H5L_table_used_g; i++)
+        if (H5L_table_g[i].id == id)
             HGOTO_DONE((int)i)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_find_class_idx */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_find_class
  *
@@ -1438,23 +1379,22 @@ done:
 const H5L_class_t *
 H5L_find_class(H5L_type_t id)
 {
-    int idx;                            /* Filter index in global table */
-    H5L_class_t *ret_value = NULL;   /* Return value */
+    int          idx;              /* Filter index in global table */
+    H5L_class_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Get the index in the global table */
-    if((idx = H5L_find_class_idx(id)) < 0)
+    if ((idx = H5L_find_class_idx(id)) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, NULL, "unable to find link class")
 
     /* Set return value */
-    ret_value = H5L_table_g+idx;
+    ret_value = H5L_table_g + idx;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_find_class */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_register
  *
@@ -1473,8 +1413,8 @@ done:
 herr_t
 H5L_register(const H5L_class_t *cls)
 {
-    size_t      i;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    size_t i;                   /* Local index variable */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1482,23 +1422,23 @@ H5L_register(const H5L_class_t *cls)
     HDassert(cls->id >= 0 && cls->id <= H5L_TYPE_MAX);
 
     /* Is the link type already registered? */
-    for(i = 0; i < H5L_table_used_g; i++)
-        if(H5L_table_g[i].id == cls->id)
+    for (i = 0; i < H5L_table_used_g; i++)
+        if (H5L_table_g[i].id == cls->id)
             break;
 
     /* Filter not already registered */
-    if(i >= H5L_table_used_g) {
-        if(H5L_table_used_g >= H5L_table_alloc_g) {
-            size_t n = MAX(H5L_MIN_TABLE_SIZE, (2 * H5L_table_alloc_g));
+    if (i >= H5L_table_used_g) {
+        if (H5L_table_used_g >= H5L_table_alloc_g) {
+            size_t       n     = MAX(H5L_MIN_TABLE_SIZE, (2 * H5L_table_alloc_g));
             H5L_class_t *table = (H5L_class_t *)H5MM_realloc(H5L_table_g, (n * sizeof(H5L_class_t)));
-            if(!table)
+            if (!table)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to extend link type table")
-            H5L_table_g = table;
+            H5L_table_g       = table;
             H5L_table_alloc_g = n;
-    } /* end if */
+        } /* end if */
 
-    /* Initialize */
-    i = H5L_table_used_g++;
+        /* Initialize */
+        i = H5L_table_used_g++;
     } /* end if */
 
     /* Copy link class info into table */
@@ -1508,7 +1448,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_register */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_unregister
  *
@@ -1526,20 +1465,20 @@ done:
 herr_t
 H5L_unregister(H5L_type_t id)
 {
-    size_t i;                           /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t i;                   /* Local index variable */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(id >= 0 && id <= H5L_TYPE_MAX);
 
     /* Is the filter already registered? */
-    for(i = 0; i < H5L_table_used_g; i++)
-    if(H5L_table_g[i].id == id)
+    for (i = 0; i < H5L_table_used_g; i++)
+        if (H5L_table_g[i].id == id)
             break;
 
     /* Fail if filter not found */
-    if(i >= H5L_table_used_g)
+    if (i >= H5L_table_used_g)
         HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, FAIL, "link class is not registered")
 
     /* Remove filter from table */
@@ -1551,7 +1490,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_unregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_link
  *
@@ -1566,11 +1504,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc,
-    hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id)
+H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc, hid_t lcpl_id, hid_t lapl_id,
+         hid_t dxpl_id)
 {
-    H5O_link_t lnk;                     /* Link to insert */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_link_t lnk;                 /* Link to insert */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1585,18 +1523,18 @@ H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc,
      */
 
     /* Construct link information for eventual insertion */
-    lnk.type = H5L_TYPE_HARD;
+    lnk.type        = H5L_TYPE_HARD;
     lnk.u.hard.addr = obj_loc->oloc->addr;
 
     /* Create the link */
-    if(H5L_create_real(new_loc, new_name, obj_loc->path, obj_loc->oloc->file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
+    if (H5L_create_real(new_loc, new_name, obj_loc->path, obj_loc->oloc->file, &lnk, NULL, lcpl_id, lapl_id,
+                        dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_link_object
  *
@@ -1610,11 +1548,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_link_object(const H5G_loc_t *new_loc, const char *new_name,
-    H5O_obj_create_t *ocrt_info, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id)
+H5L_link_object(const H5G_loc_t *new_loc, const char *new_name, H5O_obj_create_t *ocrt_info, hid_t lcpl_id,
+                hid_t lapl_id, hid_t dxpl_id)
 {
-    H5O_link_t lnk;                     /* Link to insert */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_link_t lnk;                 /* Link to insert */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1632,14 +1570,13 @@ H5L_link_object(const H5G_loc_t *new_loc, const char *new_name,
     lnk.type = H5L_TYPE_HARD;
 
     /* Create the link */
-    if(H5L_create_real(new_loc, new_name, NULL, NULL, &lnk, ocrt_info, lcpl_id, lapl_id, dxpl_id) < 0)
+    if (H5L_create_real(new_loc, new_name, NULL, NULL, &lnk, ocrt_info, lcpl_id, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_link_object() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_link_cb
  *
@@ -1653,33 +1590,35 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t H5_ATTR_UNUSED *lnk,
-    H5G_loc_t *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/)
+H5L_link_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t H5_ATTR_UNUSED *lnk,
+            H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_cr_t *udata = (H5L_trav_cr_t *)_udata;   /* User data passed in */
-    H5G_t *grp = NULL;              /* H5G_t for this group, opened to pass to user callback */
-    hid_t grp_id = FAIL;            /* Id for this group (passed to user callback */
-    H5G_loc_t temp_loc;             /* For UD callback */
-    hbool_t temp_loc_init = FALSE;  /* Temporary location for UD callback (temp_loc) has been initialized */
-    hbool_t obj_created = FALSE;    /* Whether an object was created (through a hard link) */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5L_trav_cr_t *udata  = (H5L_trav_cr_t *)_udata; /* User data passed in */
+    H5G_t *        grp    = NULL;    /* H5G_t for this group, opened to pass to user callback */
+    hid_t          grp_id = FAIL;    /* Id for this group (passed to user callback */
+    H5G_loc_t      temp_loc;         /* For UD callback */
+    hbool_t temp_loc_init = FALSE;   /* Temporary location for UD callback (temp_loc) has been initialized */
+    hbool_t obj_created   = FALSE;   /* Whether an object was created (through a hard link) */
+    herr_t  ret_value     = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid location */
     /* (which is not what we want) */
-    if(obj_loc != NULL)
+    if (obj_loc != NULL)
         HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name already exists")
 
     /* Check for crossing file boundaries with a new hard link */
-    if(udata->lnk->type == H5L_TYPE_HARD) {
+    if (udata->lnk->type == H5L_TYPE_HARD) {
         /* Check for creating an object */
         /* (only for hard links) */
-        if(udata->ocrt_info) {
-            H5G_loc_t new_loc;          /* Group location for new object */
+        if (udata->ocrt_info) {
+            H5G_loc_t new_loc; /* Group location for new object */
 
             /* Create new object at this location */
-            if(NULL == (udata->ocrt_info->new_obj = H5O_obj_create(grp_loc->oloc->file, udata->ocrt_info->obj_type, udata->ocrt_info->crt_info, &new_loc, udata->dxpl_id)))
+            if (NULL == (udata->ocrt_info->new_obj =
+                             H5O_obj_create(grp_loc->oloc->file, udata->ocrt_info->obj_type,
+                                            udata->ocrt_info->crt_info, &new_loc, udata->dxpl_id)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to create object")
 
             /* Set address for hard link */
@@ -1693,57 +1632,57 @@ H5L_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t H5_ATTR
         } /* end if */
         else {
             /* Check that both objects are in same file */
-            if(!H5F_SAME_SHARED(grp_loc->oloc->file, udata->file))
+            if (!H5F_SAME_SHARED(grp_loc->oloc->file, udata->file))
                 HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "interfile hard links are not allowed")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Set 'standard' aspects of link */
-    udata->lnk->corder = 0;            /* Will be re-written during group insertion, if the group is tracking creation order */
-    udata->lnk->corder_valid = FALSE;   /* Creation order not valid (yet) */
+    udata->lnk->corder =
+        0; /* Will be re-written during group insertion, if the group is tracking creation order */
+    udata->lnk->corder_valid = FALSE; /* Creation order not valid (yet) */
 
     /* Check for non-default link creation properties */
-    if(udata->lc_plist) {
+    if (udata->lc_plist) {
         /* Get character encoding property */
-        if(H5P_get(udata->lc_plist, H5P_STRCRT_CHAR_ENCODING_NAME, &udata->lnk->cset) < 0)
+        if (H5P_get(udata->lc_plist, H5P_STRCRT_CHAR_ENCODING_NAME, &udata->lnk->cset) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for character encoding")
     } /* end if */
     else
-        udata->lnk->cset = H5F_DEFAULT_CSET;   /* Default character encoding for link */
+        udata->lnk->cset = H5F_DEFAULT_CSET; /* Default character encoding for link */
 
     /* Set the link's name correctly */
     /* Casting away const OK -QAK */
     udata->lnk->name = (char *)name;
 
     /* Insert link into group */
-    if(H5G_obj_insert(grp_loc->oloc, name, udata->lnk, TRUE,
-            udata->ocrt_info ? udata->ocrt_info->obj_type : H5O_TYPE_UNKNOWN,
-            udata->ocrt_info ? udata->ocrt_info->crt_info : NULL,
-            udata->dxpl_id) < 0)
+    if (H5G_obj_insert(grp_loc->oloc, name, udata->lnk, TRUE,
+                       udata->ocrt_info ? udata->ocrt_info->obj_type : H5O_TYPE_UNKNOWN,
+                       udata->ocrt_info ? udata->ocrt_info->crt_info : NULL, udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link for object")
 
     /* Set object's path if it has been passed in and is not set */
-    if(udata->path != NULL && udata->path->user_path_r == NULL)
-        if(H5G_name_set(grp_loc->path, udata->path, name) < 0)
+    if (udata->path != NULL && udata->path->user_path_r == NULL)
+        if (H5G_name_set(grp_loc->path, udata->path, name) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot set name")
 
     /* If link is a user-defined link, trigger its creation callback if it has one */
-    if(udata->lnk->type >= H5L_TYPE_UD_MIN) {
-        const H5L_class_t   *link_class;         /* User-defined link class */
+    if (udata->lnk->type >= H5L_TYPE_UD_MIN) {
+        const H5L_class_t *link_class; /* User-defined link class */
 
         /* Get the link class for this type of link. */
-        if(NULL == (link_class = H5L_find_class(udata->lnk->type)))
+        if (NULL == (link_class = H5L_find_class(udata->lnk->type)))
             HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, FAIL, "unable to get class of UD link")
 
-        if(link_class->create_func != NULL) {
-            H5O_loc_t           temp_oloc;
-            H5G_name_t          temp_path;
+        if (link_class->create_func != NULL) {
+            H5O_loc_t  temp_oloc;
+            H5G_name_t temp_path;
 
             /* Create a temporary location (or else H5G_open will do a shallow
              * copy and wipe out grp_loc)
              */
             H5G_name_reset(&temp_path);
-            if(H5O_loc_copy(&temp_oloc, grp_loc->oloc, H5_COPY_DEEP) < 0)
+            if (H5O_loc_copy(&temp_oloc, grp_loc->oloc, H5_COPY_DEEP) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "unable to copy object location")
 
             temp_loc.oloc = &temp_oloc;
@@ -1751,21 +1690,22 @@ H5L_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t H5_ATTR
             temp_loc_init = TRUE;
 
             /* Set up location for user-defined callback */
-            if((grp = H5G_open(&temp_loc, udata->dxpl_id)) == NULL)
+            if ((grp = H5G_open(&temp_loc, udata->dxpl_id)) == NULL)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
-            if((grp_id = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+            if ((grp_id = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
                 HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register ID for group")
 
             /* Make callback */
-            if((link_class->create_func)(name, grp_id, udata->lnk->u.ud.udata, udata->lnk->u.ud.size, H5P_DEFAULT) < 0)
+            if ((link_class->create_func)(name, grp_id, udata->lnk->u.ud.udata, udata->lnk->u.ud.size,
+                                          H5P_DEFAULT) < 0)
                 HGOTO_ERROR(H5E_LINK, H5E_CALLBACK, FAIL, "link creation callback failed")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Check if an object was created */
-    if(obj_created) {
-        H5O_loc_t oloc;         /* Object location for created object */
+    if (obj_created) {
+        H5O_loc_t oloc; /* Object location for created object */
 
         /* Set up object location */
         HDmemset(&oloc, 0, sizeof(oloc));
@@ -1773,20 +1713,20 @@ done:
         oloc.addr = udata->lnk->u.hard.addr;
 
         /* Decrement refcount on new object's object header in memory */
-        if(H5O_dec_rc_by_loc(&oloc, udata->dxpl_id) < 0)
-           HDONE_ERROR(H5E_LINK, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
+        if (H5O_dec_rc_by_loc(&oloc, udata->dxpl_id) < 0)
+            HDONE_ERROR(H5E_LINK, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
     } /* end if */
 
     /* Close the location given to the user callback if it was created */
-    if(grp_id >= 0) {
-        if(H5I_dec_app_ref(grp_id) < 0)
+    if (grp_id >= 0) {
+        if (H5I_dec_app_ref(grp_id) < 0)
             HDONE_ERROR(H5E_ATOM, H5E_CANTRELEASE, FAIL, "unable to close atom from UD callback")
     } /* end if */
-    else if(grp != NULL) {
-        if(H5G_close(grp) < 0)
+    else if (grp != NULL) {
+        if (H5G_close(grp) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "unable to close group given to UD callback")
     } /* end if */
-    else if(temp_loc_init)
+    else if (temp_loc_init)
         H5G_loc_free(&temp_loc);
 
     /* Indicate that this callback didn't take ownership of the group *
@@ -1796,7 +1736,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_link_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_create_real
  *
@@ -1817,15 +1756,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_create_real(const H5G_loc_t *link_loc, const char *link_name,
-    H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk,
-    H5O_obj_create_t *ocrt_info, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id)
+H5L_create_real(const H5G_loc_t *link_loc, const char *link_name, H5G_name_t *obj_path, H5F_t *obj_file,
+                H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id)
 {
-    char *norm_link_name = NULL;        /* Pointer to normalized link name */
-    unsigned target_flags = H5G_TARGET_NORMAL; /* Flags to pass to group traversal function */
-    H5P_genplist_t *lc_plist = NULL;   /* Link creation property list */
-    H5L_trav_cr_t udata;               /* User data for callback */
-    herr_t ret_value = SUCCEED;        /* Return value */
+    char *          norm_link_name = NULL;              /* Pointer to normalized link name */
+    unsigned        target_flags   = H5G_TARGET_NORMAL; /* Flags to pass to group traversal function */
+    H5P_genplist_t *lc_plist       = NULL;              /* Link creation property list */
+    H5L_trav_cr_t   udata;                              /* User data for callback */
+    herr_t          ret_value = SUCCEED;                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1836,22 +1774,22 @@ H5L_create_real(const H5G_loc_t *link_loc, const char *link_name,
     HDassert(lnk->type >= H5L_TYPE_HARD && lnk->type <= H5L_TYPE_MAX);
 
     /* Get normalized link name */
-    if((norm_link_name = H5G_normalize(link_name)) == NULL)
+    if ((norm_link_name = H5G_normalize(link_name)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name")
 
     /* Check for flags present in creation property list */
-    if(lcpl_id != H5P_DEFAULT) {
+    if (lcpl_id != H5P_DEFAULT) {
         unsigned crt_intmd_group;
 
         /* Get link creation property list */
-        if(NULL == (lc_plist = (H5P_genplist_t *)H5I_object(lcpl_id)))
+        if (NULL == (lc_plist = (H5P_genplist_t *)H5I_object(lcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
         /* Get intermediate group creation property */
-        if(H5P_get(lc_plist, H5L_CRT_INTERMEDIATE_GROUP_NAME, &crt_intmd_group) < 0)
+        if (H5P_get(lc_plist, H5L_CRT_INTERMEDIATE_GROUP_NAME, &crt_intmd_group) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for creating missing groups")
 
-        if(crt_intmd_group > 0)
+        if (crt_intmd_group > 0)
             target_flags |= H5G_CRT_INTMD_GROUP;
     } /* end if */
 
@@ -1868,26 +1806,25 @@ H5L_create_real(const H5G_loc_t *link_loc, const char *link_name,
      * of its fields should be populated except for name, which is set when
      * inserting it in the callback.
      */
-    udata.file = obj_file;
-    udata.lc_plist = lc_plist;
-    udata.dxpl_id = dxpl_id;
-    udata.path = obj_path;
+    udata.file      = obj_file;
+    udata.lc_plist  = lc_plist;
+    udata.dxpl_id   = dxpl_id;
+    udata.path      = obj_path;
     udata.ocrt_info = ocrt_info;
-    udata.lnk = lnk;
+    udata.lnk       = lnk;
 
     /* Traverse the destination path & create new link */
-    if(H5G_traverse(link_loc, link_name, target_flags, H5L_link_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(link_loc, link_name, target_flags, H5L_link_cb, &udata, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert link")
 
 done:
     /* Free the normalized path name */
-    if(norm_link_name)
+    if (norm_link_name)
         H5MM_xfree(norm_link_name);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_create_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_create_hard
  *
@@ -1901,18 +1838,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name,
-    const H5G_loc_t *link_loc, const char *link_name, hid_t lcpl_id,
-    hid_t lapl_id, hid_t dxpl_id)
+H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name, const H5G_loc_t *link_loc, const char *link_name,
+                hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id)
 {
-    char *norm_cur_name = NULL;         /* Pointer to normalized current name */
-    H5F_t *link_file = NULL;            /* Pointer to file to link to */
-    H5O_link_t lnk;                     /* Link to insert */
-    H5G_loc_t obj_loc;                  /* Location of object to link to */
-    H5G_name_t path;                    /* obj_loc's path*/
-    H5O_loc_t oloc;                     /* obj_loc's oloc */
-    hbool_t loc_valid = FALSE;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    char *     norm_cur_name = NULL; /* Pointer to normalized current name */
+    H5F_t *    link_file     = NULL; /* Pointer to file to link to */
+    H5O_link_t lnk;                  /* Link to insert */
+    H5G_loc_t  obj_loc;              /* Location of object to link to */
+    H5G_name_t path;                 /* obj_loc's path*/
+    H5O_loc_t  oloc;                 /* obj_loc's oloc */
+    hbool_t    loc_valid = FALSE;
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1923,7 +1859,7 @@ H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name,
     HDassert(link_name && *link_name);
 
     /* Get normalized copy of the current name */
-    if((norm_cur_name = H5G_normalize(cur_name)) == NULL)
+    if ((norm_cur_name = H5G_normalize(cur_name)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name")
 
     /* Set up link data specific to hard links */
@@ -1933,7 +1869,7 @@ H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name,
     obj_loc.path = &path;
     obj_loc.oloc = &oloc;
     H5G_loc_reset(&obj_loc);
-    if(H5G_loc_find(cur_loc, norm_cur_name, &obj_loc, lapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(cur_loc, norm_cur_name, &obj_loc, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "source object not found")
     loc_valid = TRUE;
 
@@ -1945,23 +1881,22 @@ H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name,
 
     /* Create actual link to the object.  Pass in NULL for the path, since this
      * function shouldn't change an object's user path. */
-    if(H5L_create_real(link_loc, link_name, NULL, link_file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
+    if (H5L_create_real(link_loc, link_name, NULL, link_file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
 done:
     /* Free the object header location */
-    if(loc_valid)
-        if(H5G_loc_free(&obj_loc) < 0)
+    if (loc_valid)
+        if (H5G_loc_free(&obj_loc) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to free location")
 
     /* Free the normalized path name */
-    if(norm_cur_name)
+    if (norm_cur_name)
         H5MM_xfree(norm_cur_name);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_create_hard() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_create_soft
  *
@@ -1975,12 +1910,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_create_soft(const char *target_path, const H5G_loc_t *link_loc,
-    const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id)
+H5L_create_soft(const char *target_path, const H5G_loc_t *link_loc, const char *link_name, hid_t lcpl_id,
+                hid_t lapl_id, hid_t dxpl_id)
 {
-    char *norm_target = NULL;           /* Pointer to normalized current name */
-    H5O_link_t lnk;                     /* Link to insert */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    char *     norm_target = NULL;  /* Pointer to normalized current name */
+    H5O_link_t lnk;                 /* Link to insert */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1990,26 +1925,25 @@ H5L_create_soft(const char *target_path, const H5G_loc_t *link_loc,
     HDassert(link_name && *link_name);
 
     /* Get normalized copy of the link target */
-    if((norm_target = H5G_normalize(target_path)) == NULL)
+    if ((norm_target = H5G_normalize(target_path)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name")
 
     /* Set up link data specific to soft links */
-    lnk.type = H5L_TYPE_SOFT;
+    lnk.type        = H5L_TYPE_SOFT;
     lnk.u.soft.name = norm_target;
 
     /* Create actual link to the object */
-    if(H5L_create_real(link_loc, link_name, NULL, NULL, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
+    if (H5L_create_real(link_loc, link_name, NULL, NULL, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
 done:
     /* Free the normalized target name */
-    if(norm_target)
+    if (norm_target)
         H5MM_xfree(norm_target);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_create_soft() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_create_ud
  *
@@ -2024,12 +1958,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_create_ud(const H5G_loc_t *link_loc, const char *link_name,
-    const void *ud_data, size_t ud_data_size, H5L_type_t type, hid_t lcpl_id,
-    hid_t lapl_id, hid_t dxpl_id)
+H5L_create_ud(const H5G_loc_t *link_loc, const char *link_name, const void *ud_data, size_t ud_data_size,
+              H5L_type_t type, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5O_link_t lnk;                     /* Link to insert */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_link_t lnk;                 /* Link to insert */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2043,22 +1976,22 @@ H5L_create_ud(const H5G_loc_t *link_loc, const char *link_name,
     lnk.u.ud.udata = NULL;
 
     /* Make sure that this link class is registered */
-    if(H5L_find_class_idx(type) < 0)
+    if (H5L_find_class_idx(type) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "link class has not been registered with library")
 
     /* Fill in UD link-specific information in the link struct*/
-    if(ud_data_size > 0) {
+    if (ud_data_size > 0) {
         lnk.u.ud.udata = H5MM_malloc((size_t)ud_data_size);
-        HDmemcpy(lnk.u.ud.udata, ud_data, (size_t) ud_data_size);
+        HDmemcpy(lnk.u.ud.udata, ud_data, (size_t)ud_data_size);
     } /* end if */
     else
         lnk.u.ud.udata = NULL;
 
     lnk.u.ud.size = ud_data_size;
-    lnk.type = type;
+    lnk.type      = type;
 
     /* Create actual link to the object */
-    if(H5L_create_real(link_loc, link_name, NULL, NULL, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
+    if (H5L_create_real(link_loc, link_name, NULL, NULL, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to register new name for object")
 
 done:
@@ -2068,7 +2001,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_create_ud() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_val_real
  *
@@ -2084,7 +2016,7 @@ done:
 static herr_t
 H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2092,17 +2024,17 @@ H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size)
     HDassert(lnk);
 
     /* Check for soft link */
-    if(H5L_TYPE_SOFT == lnk->type) {
+    if (H5L_TYPE_SOFT == lnk->type) {
         /* Copy to output buffer */
-        if(size > 0 && buf) {
+        if (size > 0 && buf) {
             HDstrncpy((char *)buf, lnk->u.soft.name, size);
-            if(HDstrlen(lnk->u.soft.name) >= size)
+            if (HDstrlen(lnk->u.soft.name) >= size)
                 ((char *)buf)[size - 1] = '\0';
         } /* end if */
-    } /* end if */
+    }     /* end if */
     /* Check for user-defined link */
-    else if(lnk->type >= H5L_TYPE_UD_MIN) {
-        const H5L_class_t *link_class;             /* User-defined link class */
+    else if (lnk->type >= H5L_TYPE_UD_MIN) {
+        const H5L_class_t *link_class; /* User-defined link class */
 
         /* Get the link class for this type of link.  It's okay if the class
          * isn't registered, though--we just can't give any more information
@@ -2110,11 +2042,11 @@ H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size)
          */
         link_class = H5L_find_class(lnk->type);
 
-        if(link_class != NULL && link_class->query_func != NULL) {
-            if((link_class->query_func)(lnk->name, lnk->u.ud.udata, lnk->u.ud.size, buf, size) < 0)
+        if (link_class != NULL && link_class->query_func != NULL) {
+            if ((link_class->query_func)(lnk->name, lnk->u.ud.udata, lnk->u.ud.size, buf, size) < 0)
                 HGOTO_ERROR(H5E_LINK, H5E_CALLBACK, FAIL, "query callback returned failure")
         } /* end if */
-        else if(buf && size > 0)
+        else if (buf && size > 0)
             ((char *)buf)[0] = '\0';
     } /* end if */
     else
@@ -2124,7 +2056,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_get_val_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_val_cb
  *
@@ -2138,20 +2069,20 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_get_val_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
-    H5G_loc_t H5_ATTR_UNUSED *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/)
+H5L_get_val_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+               H5G_loc_t H5_ATTR_UNUSED *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_gv_t *udata = (H5L_trav_gv_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;               /* Return value */
+    H5L_trav_gv_t *udata     = (H5L_trav_gv_t *)_udata; /* User data passed in */
+    herr_t         ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
-    if(lnk == NULL)
+    if (lnk == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "'%s' doesn't exist", name)
 
     /* Retrieve the value for the link */
-    if(H5L_get_val_real(lnk, udata->buf, udata->size) < 0)
+    if (H5L_get_val_real(lnk, udata->buf, udata->size) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't retrieve link value")
 
 done:
@@ -2162,7 +2093,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_get_val_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_val
  *
@@ -2183,11 +2113,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_get_val(H5G_loc_t *loc, const char *name, void *buf/*out*/, size_t size,
-    hid_t lapl_id, hid_t dxpl_id)
+H5L_get_val(H5G_loc_t *loc, const char *name, void *buf /*out*/, size_t size, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5L_trav_gv_t udata;           /* User data for callback */
-    herr_t ret_value = SUCCEED;    /* Return value */
+    H5L_trav_gv_t udata;               /* User data for callback */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2197,17 +2126,17 @@ H5L_get_val(H5G_loc_t *loc, const char *name, void *buf/*out*/, size_t size,
 
     /* Set up user data for retrieving information */
     udata.size = size;
-    udata.buf = buf;
+    udata.buf  = buf;
 
     /* Traverse the group hierarchy to locate the object to get info about */
-    if(H5G_traverse(loc, name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_val_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_val_cb, &udata, lapl_id,
+                     dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5L_get_val() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_val_by_idx_cb
  *
@@ -2222,34 +2151,34 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_get_val_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5L_get_val_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                      const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                      H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_gvbi_t *udata = (H5L_trav_gvbi_t *)_udata;   /* User data passed in */
-    H5O_link_t fnd_lnk;                 /* Link within group */
-    hbool_t lnk_copied = FALSE;         /* Whether the link was copied */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5L_trav_gvbi_t *udata = (H5L_trav_gvbi_t *)_udata; /* User data passed in */
+    H5O_link_t       fnd_lnk;                           /* Link within group */
+    hbool_t          lnk_copied = FALSE;                /* Whether the link was copied */
+    herr_t           ret_value  = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name of the group resolved to a valid object */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group doesn't exist")
 
     /* Query link */
-    if(H5G_obj_lookup_by_idx(obj_loc->oloc, udata->idx_type, udata->order,
-                udata->n, &fnd_lnk, udata->dxpl_id) < 0)
+    if (H5G_obj_lookup_by_idx(obj_loc->oloc, udata->idx_type, udata->order, udata->n, &fnd_lnk,
+                              udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "link not found")
     lnk_copied = TRUE;
 
     /* Retrieve the value for the link */
-    if(H5L_get_val_real(&fnd_lnk, udata->buf, udata->size) < 0)
+    if (H5L_get_val_real(&fnd_lnk, udata->buf, udata->size) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't retrieve link value")
 
 done:
     /* Reset the link information, if we have a copy */
-    if(lnk_copied)
+    if (lnk_copied)
         H5O_msg_reset(H5O_LINK_ID, &fnd_lnk);
 
     /* Indicate that this callback didn't take ownership of the group *
@@ -2259,7 +2188,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_get_val_by_idx_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_delete_cb
  *
@@ -2274,30 +2202,31 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_delete_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
-    H5G_loc_t H5_ATTR_UNUSED *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/)
+H5L_delete_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk,
+              H5G_loc_t H5_ATTR_UNUSED *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_rm_t *udata = (H5L_trav_rm_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;
+    H5L_trav_rm_t *udata     = (H5L_trav_rm_t *)_udata; /* User data passed in */
+    herr_t         ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the group resolved to a valid link */
-    if(grp_loc == NULL)
+    if (grp_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group doesn't exist")
 
     /* Check if the name in this group resolved to a valid link */
-    if(name == NULL)
+    if (name == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
     /* Check for non-existent (NULL) link.
      * Note that this can also occur when attempting to remove '.'
      */
-    if(lnk == NULL)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "callback link pointer is NULL (specified link may be '.' or not exist)")
+    if (lnk == NULL)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL,
+                    "callback link pointer is NULL (specified link may be '.' or not exist)")
 
     /* Remove the link from the group */
-    if(H5G_obj_remove(grp_loc->oloc, grp_loc->path->full_path_r, name, udata->dxpl_id) < 0)
+    if (H5G_obj_remove(grp_loc->oloc, grp_loc->path->full_path_r, name, udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to remove link from group")
 
 done:
@@ -2308,7 +2237,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_delete_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_delete
  *
@@ -2324,9 +2252,9 @@ done:
 herr_t
 H5L_delete(H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5L_trav_rm_t udata;                  /* User data for callback */
-    char         *norm_name = NULL;       /* Pointer to normalized name */
-    herr_t        ret_value = SUCCEED;    /* Return value */
+    H5L_trav_rm_t udata;               /* User data for callback */
+    char *        norm_name = NULL;    /* Pointer to normalized name */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2335,23 +2263,23 @@ H5L_delete(H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id)
     HDassert(name && *name);
 
     /* Get normalized copy of the name */
-    if((norm_name = H5G_normalize(name)) == NULL)
+    if ((norm_name = H5G_normalize(name)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name")
 
     /* Set up user data for unlink operation */
     udata.dxpl_id = dxpl_id;
-    if(H5G_traverse(loc, norm_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK|H5G_TARGET_MOUNT, H5L_delete_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, norm_name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK | H5G_TARGET_MOUNT, H5L_delete_cb,
+                     &udata, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL, "can't unlink object")
 
 done:
     /* Free the normalized path name */
-    if(norm_name)
+    if (norm_name)
         H5MM_xfree(norm_name);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_delete_by_idx_cb
  *
@@ -2365,22 +2293,22 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_delete_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5L_delete_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                     const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                     H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_gvbi_t *udata = (H5L_trav_gvbi_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5L_trav_gvbi_t *udata     = (H5L_trav_gvbi_t *)_udata; /* User data passed in */
+    herr_t           ret_value = SUCCEED;                   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name of the group resolved to a valid object */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group doesn't exist")
 
     /* Delete link */
-    if(H5G_obj_remove_by_idx(obj_loc->oloc, obj_loc->path->full_path_r,
-            udata->idx_type, udata->order, udata->n, udata->dxpl_id) < 0)
+    if (H5G_obj_remove_by_idx(obj_loc->oloc, obj_loc->path->full_path_r, udata->idx_type, udata->order,
+                              udata->n, udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "link not found")
 
 done:
@@ -2391,7 +2319,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_delete_by_idx_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_move_dest_cb
  *
@@ -2407,27 +2334,26 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_move_dest_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5L_move_dest_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t H5_ATTR_UNUSED *lnk,
+                 H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_mv2_t *udata = (H5L_trav_mv2_t *)_udata;   /* User data passed in */
-    H5G_t *grp = NULL;                  /* H5G_t for this group, opened to pass to user callback */
-    hid_t grp_id = FAIL;                /* ID for this group (passed to user callback */
-    H5G_loc_t temp_loc;                 /* For UD callback */
-    hbool_t temp_loc_init = FALSE;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5L_trav_mv2_t *udata  = (H5L_trav_mv2_t *)_udata; /* User data passed in */
+    H5G_t *         grp    = NULL; /* H5G_t for this group, opened to pass to user callback */
+    hid_t           grp_id = FAIL; /* ID for this group (passed to user callback */
+    H5G_loc_t       temp_loc;      /* For UD callback */
+    hbool_t         temp_loc_init = FALSE;
+    herr_t          ret_value     = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Make sure an object with this name doesn't already exist */
-    if(obj_loc != NULL)
+    if (obj_loc != NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "an object with that name already exists")
 
     /* Check for crossing file boundaries with a new hard link */
-    if(udata->lnk->type == H5L_TYPE_HARD) {
+    if (udata->lnk->type == H5L_TYPE_HARD) {
         /* Check that both objects are in same file */
-        if(!H5F_SAME_SHARED(grp_loc->oloc->file, udata->file))
+        if (!H5F_SAME_SHARED(grp_loc->oloc->file, udata->file))
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "moving a link across files is not allowed")
     } /* end if */
 
@@ -2437,27 +2363,26 @@ H5L_move_dest_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
     udata->lnk->name = (char *)name;
 
     /* Insert the link into the group */
-    if(H5G_obj_insert(grp_loc->oloc, name, udata->lnk, TRUE, H5O_TYPE_UNKNOWN,
-            NULL, udata->dxpl_id) < 0)
+    if (H5G_obj_insert(grp_loc->oloc, name, udata->lnk, TRUE, H5O_TYPE_UNKNOWN, NULL, udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
     /* If the link was a user-defined link, call its move callback if it has one */
-    if(udata->lnk->type >= H5L_TYPE_UD_MIN) {
-        const H5L_class_t   *link_class;         /* User-defined link class */
+    if (udata->lnk->type >= H5L_TYPE_UD_MIN) {
+        const H5L_class_t *link_class; /* User-defined link class */
 
         /* Get the link class for this type of link. */
-        if(NULL == (link_class = H5L_find_class(udata->lnk->type)))
+        if (NULL == (link_class = H5L_find_class(udata->lnk->type)))
             HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, FAIL, "link class is not registered")
 
-        if((!udata->copy && link_class->move_func) || (udata->copy && link_class->copy_func)) {
-            H5O_loc_t           temp_oloc;
-            H5G_name_t          temp_path;
+        if ((!udata->copy && link_class->move_func) || (udata->copy && link_class->copy_func)) {
+            H5O_loc_t  temp_oloc;
+            H5G_name_t temp_path;
 
             /* Create a temporary location (or else H5G_open will do a shallow
              * copy and wipe out grp_loc)
              */
             H5G_name_reset(&temp_path);
-            if(H5O_loc_copy(&temp_oloc, grp_loc->oloc, H5_COPY_DEEP) < 0)
+            if (H5O_loc_copy(&temp_oloc, grp_loc->oloc, H5_COPY_DEEP) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "unable to copy object location")
 
             temp_loc.oloc = &temp_oloc;
@@ -2465,33 +2390,35 @@ H5L_move_dest_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
             temp_loc_init = TRUE;
 
             /* Set up location for user-defined callback */
-            if((grp = H5G_open(&temp_loc, udata->dxpl_id)) == NULL)
+            if ((grp = H5G_open(&temp_loc, udata->dxpl_id)) == NULL)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
-            if((grp_id = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+            if ((grp_id = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
                 HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group ID")
 
-            if(udata->copy) {
-                if((link_class->copy_func)(udata->lnk->name, grp_id, udata->lnk->u.ud.udata, udata->lnk->u.ud.size) < 0)
+            if (udata->copy) {
+                if ((link_class->copy_func)(udata->lnk->name, grp_id, udata->lnk->u.ud.udata,
+                                            udata->lnk->u.ud.size) < 0)
                     HGOTO_ERROR(H5E_LINK, H5E_CALLBACK, FAIL, "UD copy callback returned error")
             } /* end if */
             else {
-                if((link_class->move_func)(udata->lnk->name, grp_id, udata->lnk->u.ud.udata, udata->lnk->u.ud.size) < 0)
+                if ((link_class->move_func)(udata->lnk->name, grp_id, udata->lnk->u.ud.udata,
+                                            udata->lnk->u.ud.size) < 0)
                     HGOTO_ERROR(H5E_LINK, H5E_CALLBACK, FAIL, "UD move callback returned error")
             } /* end else */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
 done:
     /* Close the location given to the user callback if it was created */
-    if(grp_id >= 0) {
-        if(H5I_dec_app_ref(grp_id) < 0)
+    if (grp_id >= 0) {
+        if (H5I_dec_app_ref(grp_id) < 0)
             HDONE_ERROR(H5E_ATOM, H5E_CANTRELEASE, FAIL, "unable to close atom from UD callback")
     } /* end if */
-    else if(grp != NULL) {
-        if(H5G_close(grp) < 0)
+    else if (grp != NULL) {
+        if (H5G_close(grp) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "unable to close group given to UD callback")
     } /* end if */
-    else if(temp_loc_init)
+    else if (temp_loc_init)
         H5G_loc_free(&temp_loc);
 
     /* Indicate that this callback didn't take ownership of the group *
@@ -2505,7 +2432,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_move_dest_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_move_cb
  *
@@ -2521,59 +2447,59 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_move_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
-    H5G_loc_t *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/)
+H5L_move_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk, H5G_loc_t *obj_loc,
+            void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_mv_t *udata = (H5L_trav_mv_t *)_udata;   /* User data passed in */
-    H5L_trav_mv2_t udata_out;           /* User data for H5L_move_dest_cb traversal */
-    char * orig_name = NULL;            /* The name of the link in this group */
-    hbool_t link_copied = FALSE;        /* Has udata_out.lnk been allocated? */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5L_trav_mv_t *udata = (H5L_trav_mv_t *)_udata; /* User data passed in */
+    H5L_trav_mv2_t udata_out;                       /* User data for H5L_move_dest_cb traversal */
+    char *         orig_name   = NULL;              /* The name of the link in this group */
+    hbool_t        link_copied = FALSE;             /* Has udata_out.lnk been allocated? */
+    herr_t         ret_value   = SUCCEED;           /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
     /* Check for operations on '.' */
-    if(lnk == NULL)
+    if (lnk == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "the name of a link must be supplied to move or copy")
 
     /* Set up user data for move_dest_cb */
-    if(NULL == (udata_out.lnk = (H5O_link_t *)H5O_msg_copy(H5O_LINK_ID, lnk, NULL)))
+    if (NULL == (udata_out.lnk = (H5O_link_t *)H5O_msg_copy(H5O_LINK_ID, lnk, NULL)))
         HGOTO_ERROR(H5E_LINK, H5E_CANTCOPY, FAIL, "unable to copy link to be moved")
 
     /* In this special case, the link's name is going to be replaced at its
      * destination, so we should free it here.
      */
     udata_out.lnk->name = (char *)H5MM_xfree(udata_out.lnk->name);
-    link_copied = TRUE;
+    link_copied         = TRUE;
 
     udata_out.lnk->cset = udata->cset;
-    udata_out.file = grp_loc->oloc->file;
-    udata_out.copy = udata->copy;
-    udata_out.dxpl_id = udata->dxpl_id;
+    udata_out.file      = grp_loc->oloc->file;
+    udata_out.copy      = udata->copy;
+    udata_out.dxpl_id   = udata->dxpl_id;
 
     /* Keep a copy of link's name (it's "owned" by the H5G_traverse() routine) */
     orig_name = H5MM_xstrdup(name);
 
     /* Insert the link into its new location */
-    if(H5G_traverse(udata->dst_loc, udata->dst_name, udata->dst_target_flags,
-            H5L_move_dest_cb, &udata_out, udata->lapl_id, udata->dxpl_id) < 0)
+    if (H5G_traverse(udata->dst_loc, udata->dst_name, udata->dst_target_flags, H5L_move_dest_cb, &udata_out,
+                     udata->lapl_id, udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to follow symbolic link")
 
     /* If this is a move and not a copy operation, change the object's name and remove the old link */
-    if(!udata->copy) {
-        H5RS_str_t *dst_name_r;      /* Ref-counted version of dest name */
+    if (!udata->copy) {
+        H5RS_str_t *dst_name_r; /* Ref-counted version of dest name */
 
         /* Make certain that the destination name is a full (not relative) path */
-        if(*(udata->dst_name) != '/') {
+        if (*(udata->dst_name) != '/') {
             HDassert(udata->dst_loc->path->full_path_r);
 
             /* Create reference counted string for full dst path */
-            if((dst_name_r = H5G_build_fullpath_refstr_str(udata->dst_loc->path->full_path_r,
-                    udata->dst_name)) == NULL)
+            if ((dst_name_r = H5G_build_fullpath_refstr_str(udata->dst_loc->path->full_path_r,
+                                                            udata->dst_name)) == NULL)
                 HGOTO_ERROR(H5E_SYM, H5E_PATH, FAIL, "can't build destination path name")
         } /* end if */
         else
@@ -2581,14 +2507,14 @@ H5L_move_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
         HDassert(dst_name_r);
 
         /* Fix names up */
-        if(H5G_name_replace(lnk, H5G_NAME_MOVE, obj_loc->oloc->file, obj_loc->path->full_path_r,
-                udata->dst_loc->oloc->file, dst_name_r, udata->dxpl_id) < 0) {
+        if (H5G_name_replace(lnk, H5G_NAME_MOVE, obj_loc->oloc->file, obj_loc->path->full_path_r,
+                             udata->dst_loc->oloc->file, dst_name_r, udata->dxpl_id) < 0) {
             H5RS_decr(dst_name_r);
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to replace name")
         } /* end if */
 
         /* Remove the old link */
-        if(H5G_obj_remove(grp_loc->oloc, grp_loc->path->full_path_r, orig_name, udata->dxpl_id) < 0) {
+        if (H5G_obj_remove(grp_loc->oloc, grp_loc->path->full_path_r, orig_name, udata->dxpl_id) < 0) {
             H5RS_decr(dst_name_r);
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to remove old name")
         } /* end if */
@@ -2598,14 +2524,14 @@ H5L_move_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
 
 done:
     /* Cleanup */
-    if(orig_name)
+    if (orig_name)
         H5MM_xfree(orig_name);
 
     /* If udata_out.lnk was copied, free any memory allocated
      * In this special case, the H5L_move_dest_cb callback resets the name
      * so H5O_msg_free shouldn't try to free it
      */
-    if(link_copied)
+    if (link_copied)
         H5O_msg_free(H5O_LINK_ID, udata_out.lnk);
 
     /* Indicate that this callback didn't take ownership of the group *
@@ -2615,7 +2541,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_move_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_move
  *
@@ -2637,17 +2562,16 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc,
-    const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id,
-    hid_t dxpl_id)
+H5L_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc, const char *dst_name,
+         hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id)
 {
-    unsigned    dst_target_flags = H5G_TARGET_NORMAL;
-    H5T_cset_t char_encoding = H5F_DEFAULT_CSET; /* Character encoding for link */
-    H5P_genplist_t* lc_plist;           /* Link creation property list */
-    H5P_genplist_t* la_plist;           /* Link access property list */
-    H5L_trav_mv_t      udata;          /* User data for traversal */
-    hid_t               lapl_copy;      /* Copy of lapl for this function */
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    unsigned        dst_target_flags = H5G_TARGET_NORMAL;
+    H5T_cset_t      char_encoding    = H5F_DEFAULT_CSET; /* Character encoding for link */
+    H5P_genplist_t *lc_plist;                            /* Link creation property list */
+    H5P_genplist_t *la_plist;                            /* Link access property list */
+    H5L_trav_mv_t   udata;                               /* User data for traversal */
+    hid_t           lapl_copy;                           /* Copy of lapl for this function */
+    herr_t          ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2658,57 +2582,55 @@ H5L_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc,
     HDassert(dst_name && *dst_name);
 
     /* Check for flags present in creation property list */
-    if(lcpl_id != H5P_DEFAULT) {
+    if (lcpl_id != H5P_DEFAULT) {
         unsigned crt_intmd_group;
 
-        if(NULL == (lc_plist = (H5P_genplist_t *)H5I_object(lcpl_id)))
+        if (NULL == (lc_plist = (H5P_genplist_t *)H5I_object(lcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
         /* Get intermediate group creation property */
-        if(H5P_get(lc_plist, H5L_CRT_INTERMEDIATE_GROUP_NAME, &crt_intmd_group) < 0)
+        if (H5P_get(lc_plist, H5L_CRT_INTERMEDIATE_GROUP_NAME, &crt_intmd_group) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for creating missing groups")
 
         /* Set target flags for source and destination */
-        if(crt_intmd_group > 0)
+        if (crt_intmd_group > 0)
             dst_target_flags |= H5G_CRT_INTMD_GROUP;
 
         /* Get character encoding property */
-        if(H5P_get(lc_plist, H5P_STRCRT_CHAR_ENCODING_NAME, &char_encoding) < 0)
+        if (H5P_get(lc_plist, H5P_STRCRT_CHAR_ENCODING_NAME, &char_encoding) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for character encoding")
     } /* end if */
 
     /* Copy the link access property list because traversing UD links will
      * decrease the NLINKS property. HDF5 should have NLINKS traversals to
      * get to the source and NLINKS more to get to the destination. */
-    if(lapl_id == H5P_DEFAULT)
+    if (lapl_id == H5P_DEFAULT)
         lapl_copy = lapl_id;
     else {
-        if(NULL == (la_plist = (H5P_genplist_t *)H5I_object(lapl_id)))
+        if (NULL == (la_plist = (H5P_genplist_t *)H5I_object(lapl_id)))
             HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a valid access PL")
-        if((lapl_copy = H5P_copy_plist(la_plist, FALSE)) < 0)
+        if ((lapl_copy = H5P_copy_plist(la_plist, FALSE)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to copy access properties")
     } /* end else */
 
     /* Set up user data */
-    udata.dst_loc = dst_loc;
-    udata.dst_name= dst_name;
+    udata.dst_loc          = dst_loc;
+    udata.dst_name         = dst_name;
     udata.dst_target_flags = dst_target_flags;
-    udata.cset = char_encoding;
-    udata.copy = copy_flag;
-    udata.lapl_id = lapl_copy;
-    udata.dxpl_id = dxpl_id;
+    udata.cset             = char_encoding;
+    udata.copy             = copy_flag;
+    udata.lapl_id          = lapl_copy;
+    udata.dxpl_id          = dxpl_id;
 
     /* Do the move */
-    if(H5G_traverse(src_loc,
-            src_name, H5G_TARGET_MOUNT | H5G_TARGET_SLINK | H5G_TARGET_UDLINK,
-            H5L_move_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(src_loc, src_name, H5G_TARGET_MOUNT | H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_move_cb,
+                     &udata, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to find link")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_move() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_exists_cb
  *
@@ -2722,11 +2644,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_exists_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t *lnk, H5G_loc_t H5_ATTR_UNUSED *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5L_exists_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+              const H5O_link_t *lnk, H5G_loc_t H5_ATTR_UNUSED *obj_loc, void *_udata /*in,out*/,
+              H5G_own_loc_t *own_loc /*out*/)
 {
-    hbool_t *udata = (hbool_t *)_udata;   /* User data passed in */
+    hbool_t *udata = (hbool_t *)_udata; /* User data passed in */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2740,7 +2662,6 @@ H5L_exists_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5L_exists_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_exists
  *
@@ -2756,13 +2677,14 @@ H5L_exists_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED
 static htri_t
 H5L_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id)
 {
-    hbool_t exists = FALSE;     /* Whether the link exists in the group */
-    htri_t ret_value;           /* Return value */
+    hbool_t exists = FALSE; /* Whether the link exists in the group */
+    htri_t  ret_value;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Traverse the group hierarchy to locate the object to get info about */
-    if(H5G_traverse(loc, name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_exists_cb, &exists, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_exists_cb, &exists, lapl_id,
+                     dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "path doesn't exist")
 
     /* Set return value */
@@ -2772,7 +2694,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5L_exists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_info_cb
  *
@@ -2786,21 +2707,21 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_get_info_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t *lnk, H5G_loc_t H5_ATTR_UNUSED *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5L_get_info_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                const H5O_link_t *lnk, H5G_loc_t H5_ATTR_UNUSED *obj_loc, void *_udata /*in,out*/,
+                H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_gi_t *udata = (H5L_trav_gi_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5L_trav_gi_t *udata     = (H5L_trav_gi_t *)_udata; /* User data passed in */
+    herr_t         ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
-    if(lnk == NULL)
+    if (lnk == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
     /* Get information from the link */
-    if(H5G_link_to_info(lnk, udata->linfo) < 0)
+    if (H5G_link_to_info(lnk, udata->linfo) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't get link info")
 
 done:
@@ -2811,7 +2732,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_get_info_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_info
  *
@@ -2825,26 +2745,25 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_get_info(const H5G_loc_t *loc, const char *name,
-    H5L_info_t *linfo/*out*/, hid_t lapl_id, hid_t dxpl_id)
+H5L_get_info(const H5G_loc_t *loc, const char *name, H5L_info_t *linfo /*out*/, hid_t lapl_id, hid_t dxpl_id)
 {
     H5L_trav_gi_t udata;               /* User data for callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    udata.linfo = linfo;
+    udata.linfo   = linfo;
     udata.dxpl_id = dxpl_id;
 
     /* Traverse the group hierarchy to locate the object to get info about */
-    if(H5G_traverse(loc, name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_get_info_cb, &udata, lapl_id, dxpl_id) < 0)
+    if (H5G_traverse(loc, name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_info_cb, &udata, lapl_id,
+                     dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5L_get_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_info_by_idx_cb
  *
@@ -2859,34 +2778,34 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_get_info_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5L_get_info_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                       const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                       H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_gibi_t *udata = (H5L_trav_gibi_t *)_udata;   /* User data passed in */
-    H5O_link_t fnd_lnk;                 /* Link within group */
-    hbool_t lnk_copied = FALSE;         /* Whether the link was copied */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5L_trav_gibi_t *udata = (H5L_trav_gibi_t *)_udata; /* User data passed in */
+    H5O_link_t       fnd_lnk;                           /* Link within group */
+    hbool_t          lnk_copied = FALSE;                /* Whether the link was copied */
+    herr_t           ret_value  = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name of the group resolved to a valid object */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group doesn't exist")
 
     /* Query link */
-    if(H5G_obj_lookup_by_idx(obj_loc->oloc, udata->idx_type, udata->order,
-                udata->n, &fnd_lnk, udata->dxpl_id) < 0)
+    if (H5G_obj_lookup_by_idx(obj_loc->oloc, udata->idx_type, udata->order, udata->n, &fnd_lnk,
+                              udata->dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "link not found")
     lnk_copied = TRUE;
 
     /* Get information from the link */
-    if(H5G_link_to_info(&fnd_lnk, udata->linfo) < 0)
+    if (H5G_link_to_info(&fnd_lnk, udata->linfo) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't get link info")
 
 done:
     /* Reset the link information, if we have a copy */
-    if(lnk_copied)
+    if (lnk_copied)
         H5O_msg_reset(H5O_LINK_ID, &fnd_lnk);
 
     /* Indicate that this callback didn't take ownership of the group *
@@ -2896,7 +2815,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_get_info_by_idx_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_default_lcpl
  *
@@ -2914,7 +2832,7 @@ done:
 hid_t
 H5L_get_default_lcpl(void)
 {
-    hid_t ret_value;            /* Return value */
+    hid_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2924,7 +2842,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5L_get_default_lcpl */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_get_name_by_idx_cb
  *
@@ -2939,22 +2856,22 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5L_get_name_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc/*in*/, const char H5_ATTR_UNUSED *name,
-    const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
-    H5G_own_loc_t *own_loc/*out*/)
+H5L_get_name_by_idx_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATTR_UNUSED *name,
+                       const H5O_link_t H5_ATTR_UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata /*in,out*/,
+                       H5G_own_loc_t *own_loc /*out*/)
 {
-    H5L_trav_gnbi_t *udata = (H5L_trav_gnbi_t *)_udata;   /* User data passed in */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5L_trav_gnbi_t *udata     = (H5L_trav_gnbi_t *)_udata; /* User data passed in */
+    herr_t           ret_value = SUCCEED;                   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name of the group resolved to a valid object */
-    if(obj_loc == NULL)
+    if (obj_loc == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group doesn't exist")
 
     /* Query link */
-    if((udata->name_len = H5G_obj_get_name_by_idx(obj_loc->oloc, udata->idx_type, udata->order,
-                udata->n, udata->name, udata->size, udata->dxpl_id)) < 0)
+    if ((udata->name_len = H5G_obj_get_name_by_idx(obj_loc->oloc, udata->idx_type, udata->order, udata->n,
+                                                   udata->name, udata->size, udata->dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "link not found")
 
 done:
@@ -2965,7 +2882,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_get_name_by_idx_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5L_link_copy_file
  *
@@ -2981,17 +2897,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
-    const H5O_loc_t *src_oloc, H5O_link_t *dst_lnk, H5O_copy_t *cpy_info)
+H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk, const H5O_loc_t *src_oloc,
+                   H5O_link_t *dst_lnk, H5O_copy_t *cpy_info)
 {
-    H5O_link_t tmp_src_lnk;             /* Temporary copy of src link, when needed */
-    const H5O_link_t *src_lnk = _src_lnk; /* Source link */
-    hbool_t dst_lnk_init = FALSE;       /* Whether the destination link is initialized */
-    hbool_t expanded_link_open = FALSE; /* Whether the target location has been opened */
-    H5G_loc_t tmp_src_loc;              /* Group location holding target object */
-    H5G_name_t tmp_src_path;            /* Path for target object */
-    H5O_loc_t tmp_src_oloc;             /* Object location for target object */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_link_t        tmp_src_lnk;                   /* Temporary copy of src link, when needed */
+    const H5O_link_t *src_lnk            = _src_lnk; /* Source link */
+    hbool_t           dst_lnk_init       = FALSE;    /* Whether the destination link is initialized */
+    hbool_t           expanded_link_open = FALSE;    /* Whether the target location has been opened */
+    H5G_loc_t         tmp_src_loc;                   /* Group location holding target object */
+    H5G_name_t        tmp_src_path;                  /* Path for target object */
+    H5O_loc_t         tmp_src_oloc;                  /* Object location for target object */
+    herr_t            ret_value = SUCCEED;           /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3002,68 +2918,64 @@ H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
     HDassert(cpy_info);
 
     /* Expand soft or external link, if requested */
-    if((H5L_TYPE_SOFT == src_lnk->type && cpy_info->expand_soft_link)
-            || (H5L_TYPE_EXTERNAL == src_lnk->type
-            && cpy_info->expand_ext_link)) {
-        H5G_loc_t   lnk_grp_loc;    /* Group location holding link */
-        H5G_name_t  lnk_grp_path;   /* Path for link */
-        htri_t      tar_exists;     /* Whether the target object exists */
+    if ((H5L_TYPE_SOFT == src_lnk->type && cpy_info->expand_soft_link) ||
+        (H5L_TYPE_EXTERNAL == src_lnk->type && cpy_info->expand_ext_link)) {
+        H5G_loc_t  lnk_grp_loc;  /* Group location holding link */
+        H5G_name_t lnk_grp_path; /* Path for link */
+        htri_t     tar_exists;   /* Whether the target object exists */
 
         /* Set up group location for link */
         H5G_name_reset(&lnk_grp_path);
         lnk_grp_loc.path = &lnk_grp_path;
-        lnk_grp_loc.oloc = (H5O_loc_t *)src_oloc;    /* Casting away const OK -QAK */
+        lnk_grp_loc.oloc = (H5O_loc_t *)src_oloc; /* Casting away const OK -QAK */
 
         /* Check if the target object exists */
-        if((tar_exists = H5G_loc_exists(&lnk_grp_loc, src_lnk->name, H5P_DEFAULT,
-                dxpl_id)) < 0)
+        if ((tar_exists = H5G_loc_exists(&lnk_grp_loc, src_lnk->name, H5P_DEFAULT, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to check if target object exists")
 
-        if(tar_exists) {
+        if (tar_exists) {
             /* Make a temporary copy of the link, so that it will not change the
              * info in the cache when we change it to a hard link */
-            if(NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, &tmp_src_lnk))
+            if (NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, &tmp_src_lnk))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy message")
 
             /* Set up group location for target object.  Let H5G_traverse expand
              * the link. */
             tmp_src_loc.path = &tmp_src_path;
             tmp_src_loc.oloc = &tmp_src_oloc;
-            if(H5G_loc_reset(&tmp_src_loc) < 0)
+            if (H5G_loc_reset(&tmp_src_loc) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to reset location")
 
             /* Find the target object */
-            if(H5G_loc_find(&lnk_grp_loc, src_lnk->name, &tmp_src_loc,
-                    H5P_DEFAULT, dxpl_id) < 0)
+            if (H5G_loc_find(&lnk_grp_loc, src_lnk->name, &tmp_src_loc, H5P_DEFAULT, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to find target object")
             expanded_link_open = TRUE;
 
             /* Convert symbolic link to hard link */
-            if(tmp_src_lnk.type == H5L_TYPE_SOFT)
-                tmp_src_lnk.u.soft.name =
-                        (char *)H5MM_xfree(tmp_src_lnk.u.soft.name);
-            else if(tmp_src_lnk.u.ud.size > 0)
+            if (tmp_src_lnk.type == H5L_TYPE_SOFT)
+                tmp_src_lnk.u.soft.name = (char *)H5MM_xfree(tmp_src_lnk.u.soft.name);
+            else if (tmp_src_lnk.u.ud.size > 0)
                 tmp_src_lnk.u.ud.udata = H5MM_xfree(tmp_src_lnk.u.ud.udata);
-            tmp_src_lnk.type = H5L_TYPE_HARD;
+            tmp_src_lnk.type        = H5L_TYPE_HARD;
             tmp_src_lnk.u.hard.addr = tmp_src_oloc.addr;
-            src_lnk = &tmp_src_lnk;
+            src_lnk                 = &tmp_src_lnk;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Copy src link information to dst link information */
-    if(NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, dst_lnk))
+    if (NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, dst_lnk))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy message")
     dst_lnk_init = TRUE;
 
     /* Check if object in source group is a hard link & copy it */
-    if(H5L_TYPE_HARD == src_lnk->type) {
-        H5O_loc_t new_dst_oloc;     /* Copied object location in destination */
+    if (H5L_TYPE_HARD == src_lnk->type) {
+        H5O_loc_t new_dst_oloc; /* Copied object location in destination */
 
         /* Set up copied object location to fill in */
         H5O_loc_reset(&new_dst_oloc);
         new_dst_oloc.file = dst_file;
 
-        if(!expanded_link_open) {
+        if (!expanded_link_open) {
             /* Build temporary object location for source */
             H5O_loc_reset(&tmp_src_oloc);
             tmp_src_oloc.file = src_oloc->file;
@@ -3074,8 +2986,7 @@ H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
         /* Copy the shared object from source to destination */
         /* Don't care about obj_type or udata because those are only important
          * for old style groups */
-        if(H5O_copy_header_map(&tmp_src_oloc, &new_dst_oloc, dxpl_id, cpy_info,
-                TRUE, NULL, NULL) < 0)
+        if (H5O_copy_header_map(&tmp_src_oloc, &new_dst_oloc, dxpl_id, cpy_info, TRUE, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
         /* Copy new destination object's information for eventual insertion */
@@ -3084,18 +2995,17 @@ H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
 
 done:
     /* Check if we used a temporary src link */
-    if(src_lnk != _src_lnk) {
+    if (src_lnk != _src_lnk) {
         HDassert(src_lnk == &tmp_src_lnk);
         H5O_msg_reset(H5O_LINK_ID, &tmp_src_lnk);
     } /* end if */
-    if(ret_value < 0)
-        if(dst_lnk_init)
+    if (ret_value < 0)
+        if (dst_lnk_init)
             H5O_msg_reset(H5O_LINK_ID, dst_lnk);
     /* Check if we need to free the temp source oloc */
-    if(expanded_link_open)
-        if(H5G_loc_free(&tmp_src_loc) < 0)
+    if (expanded_link_open)
+        if (H5G_loc_free(&tmp_src_loc) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free object")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_link_copy_file() */
-
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index b796fbe..23fe03c 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -11,50 +11,49 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg   */
-#define H5L_PACKAGE		/*suppress error about including H5Lpkg   */
+#define H5G_PACKAGE /*suppress error about including H5Gpkg   */
+#define H5L_PACKAGE /*suppress error about including H5Lpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5L_init_extern_interface
-
-#include "H5private.h"          /* Generic Functions                    */
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"         /* Error handling                       */
-#include "H5Gpkg.h"             /* Groups                               */
-#include "H5Iprivate.h"		/* IDs					*/
-#include "H5Lpkg.h"             /* Links                                */
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Opublic.h"          /* File objects                         */
-#include "H5Pprivate.h"         /* Property lists                       */
-
-static hid_t H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
-    const void *udata, size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id);
-static ssize_t H5L_extern_query(const char H5_ATTR_UNUSED * link_name, const void *udata,
-    size_t udata_size, void * buf /*out*/, size_t buf_size);
+#define H5_INTERFACE_INIT_FUNC H5L_init_extern_interface
+
+#include "H5private.h"   /* Generic Functions                    */
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling                       */
+#include "H5Gpkg.h"      /* Groups                               */
+#include "H5Iprivate.h"  /* IDs					*/
+#include "H5Lpkg.h"      /* Links                                */
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Opublic.h"   /* File objects                         */
+#include "H5Pprivate.h"  /* Property lists                       */
+
+static hid_t   H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group, const void *udata,
+                                   size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id);
+static ssize_t H5L_extern_query(const char H5_ATTR_UNUSED *link_name, const void *udata, size_t udata_size,
+                                void *buf /*out*/, size_t buf_size);
 
 /* Default External Link link class */
 const H5L_class_t H5L_EXTERN_LINK_CLASS[1] = {{
-    H5L_LINK_CLASS_T_VERS,      /* H5L_class_t version            */
-    H5L_TYPE_EXTERNAL,		/* Link type id number            */
-    "external",                 /* Link name for debugging        */
-    NULL,                       /* Creation callback              */
-    NULL,                       /* Move callback                  */
-    NULL,                       /* Copy callback                  */
-    H5L_extern_traverse,        /* The actual traversal function  */
-    NULL,                       /* Deletion callback              */
-    H5L_extern_query            /* Query callback                 */
+    H5L_LINK_CLASS_T_VERS, /* H5L_class_t version            */
+    H5L_TYPE_EXTERNAL,     /* Link type id number            */
+    "external",            /* Link name for debugging        */
+    NULL,                  /* Creation callback              */
+    NULL,                  /* Move callback                  */
+    NULL,                  /* Copy callback                  */
+    H5L_extern_traverse,   /* The actual traversal function  */
+    NULL,                  /* Deletion callback              */
+    H5L_extern_query       /* Query callback                 */
 }};
 
 /* Version of external link format */
-#define H5L_EXT_VERSION         0
+#define H5L_EXT_VERSION 0
 
 /* Valid flags for external links */
-#define H5L_EXT_FLAGS_ALL       0
+#define H5L_EXT_FLAGS_ALL 0
 
 /* Size of local link name buffer for traversing external links */
-#define H5L_EXT_TRAVERSE_BUF_SIZE       256
+#define H5L_EXT_TRAVERSE_BUF_SIZE 256
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5L_init_extern_interface -- Initialize interface-specific information
@@ -77,8 +76,6 @@ H5L_init_extern_interface(void)
     FUNC_LEAVE_NOAPI(H5L_init())
 } /* H5L_init_extern_interface() */
 
-
-
 /*--------------------------------------------------------------------------
  * Function: H5L_getenv_prefix_name --
  *
@@ -93,27 +90,27 @@ H5L_init_extern_interface(void)
  *
 --------------------------------------------------------------------------*/
 static char *
-H5L_getenv_prefix_name(char **env_prefix/*in,out*/)
+H5L_getenv_prefix_name(char **env_prefix /*in,out*/)
 {
-    char        *retptr=NULL;
-    char        *strret=NULL;
+    char *retptr = NULL;
+    char *strret = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     strret = HDstrchr(*env_prefix, H5_COLON_SEPC);
     if (strret == NULL) {
-        retptr = *env_prefix;
+        retptr      = *env_prefix;
         *env_prefix = strret;
-    } else {
-        retptr = *env_prefix;
+    }
+    else {
+        retptr      = *env_prefix;
         *env_prefix = strret + 1;
-        *strret = '\0';
+        *strret     = '\0';
     }
 
     FUNC_LEAVE_NOAPI(retptr)
 } /* end H5L_getenv_prefix_name() */
 
-
 /*--------------------------------------------------------------------------
  * Function: H5L_build_name
  *
@@ -125,30 +122,29 @@ H5L_getenv_prefix_name(char **env_prefix/*in,out*/)
  *
 --------------------------------------------------------------------------*/
 static herr_t
-H5L_build_name(char *prefix, char *file_name, char **full_name/*out*/)
+H5L_build_name(char *prefix, char *file_name, char **full_name /*out*/)
 {
-    size_t      prefix_len;             /* length of prefix */
-    size_t      fname_len;              /* Length of external link file name */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    size_t prefix_len;          /* length of prefix */
+    size_t fname_len;           /* Length of external link file name */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     prefix_len = HDstrlen(prefix);
-    fname_len = HDstrlen(file_name);
+    fname_len  = HDstrlen(file_name);
 
     /* Allocate a buffer to hold the filename + prefix + possibly the delimiter + terminating null byte */
-    if(NULL == (*full_name = (char *)H5MM_malloc(prefix_len + fname_len + 2)))
+    if (NULL == (*full_name = (char *)H5MM_malloc(prefix_len + fname_len + 2)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate filename buffer")
 
     /* Compose the full file name */
     HDsnprintf(*full_name, (prefix_len + fname_len + 2), "%s%s%s", prefix,
-        (H5_CHECK_DELIMITER(prefix[prefix_len - 1]) ? "" : H5_DIR_SEPS), file_name);
+               (H5_CHECK_DELIMITER(prefix[prefix_len - 1]) ? "" : H5_DIR_SEPS), file_name);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5L_build_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5L_extern_traverse
  *
@@ -184,31 +180,31 @@ done:
  *-------------------------------------------------------------------------
  */
 static hid_t
-H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
-    const void *_udata, size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id)
+H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group, const void *_udata,
+                    size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    char       *my_prefix;              /* Library's copy of the prefix */
-    H5G_loc_t   root_loc;               /* Location of root group in external file */
-    H5G_loc_t   loc;                    /* Location of object */
-    H5F_t	*ext_file = NULL;	/* File struct for external file */
-    const uint8_t *p = (const uint8_t *)_udata;  /* Pointer into external link buffer */
-    const char *file_name;              /* Name of file containing external link's object */
-    char *full_name = NULL;             /* File name with prefix */
-    const char  *obj_name;              /* Name external link's object */
-    size_t      fname_len;              /* Length of external link file name */
-    unsigned    intent;                 /* File access permissions */
-    H5L_elink_cb_t cb_info;             /* Callback info struct */
-    hid_t       fapl_id = -1;           /* File access property list for external link's file */
-    hid_t       ext_obj = -1;           /* ID for external link's object */
-    char        *parent_group_name = NULL;/* Temporary pointer to group name */
-    char        local_group_name[H5L_EXT_TRAVERSE_BUF_SIZE];  /* Local buffer to hold group name */
-    char        *temp_file_name = NULL; /* Temporary pointer to file name */
-    size_t      temp_file_name_len;     /* Length of temporary file name */
-    char        *actual_file_name = NULL; /* Parent file's actual name */
-    H5P_genplist_t  *fa_plist;          /* File access property list pointer */
-    H5F_close_degree_t 	fc_degree = H5F_CLOSE_WEAK;  /* File close degree for target file */
-    hid_t       ret_value;              /* Return value */
+    H5P_genplist_t *   plist;                              /* Property list pointer */
+    char *             my_prefix;                          /* Library's copy of the prefix */
+    H5G_loc_t          root_loc;                           /* Location of root group in external file */
+    H5G_loc_t          loc;                                /* Location of object */
+    H5F_t *            ext_file = NULL;                    /* File struct for external file */
+    const uint8_t *    p        = (const uint8_t *)_udata; /* Pointer into external link buffer */
+    const char *       file_name;                /* Name of file containing external link's object */
+    char *             full_name = NULL;         /* File name with prefix */
+    const char *       obj_name;                 /* Name external link's object */
+    size_t             fname_len;                /* Length of external link file name */
+    unsigned           intent;                   /* File access permissions */
+    H5L_elink_cb_t     cb_info;                  /* Callback info struct */
+    hid_t              fapl_id           = -1;   /* File access property list for external link's file */
+    hid_t              ext_obj           = -1;   /* ID for external link's object */
+    char *             parent_group_name = NULL; /* Temporary pointer to group name */
+    char               local_group_name[H5L_EXT_TRAVERSE_BUF_SIZE]; /* Local buffer to hold group name */
+    char *             temp_file_name = NULL;                       /* Temporary pointer to file name */
+    size_t             temp_file_name_len;                          /* Length of temporary file name */
+    char *             actual_file_name = NULL;                     /* Parent file's actual name */
+    H5P_genplist_t *   fa_plist;                                    /* File access property list pointer */
+    H5F_close_degree_t fc_degree = H5F_CLOSE_WEAK;                  /* File close degree for target file */
+    hid_t              ret_value;                                   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -216,88 +212,91 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
     HDassert(p);
 
     /* Check external link version & flags */
-    if(((*p >> 4) & 0x0F) > H5L_EXT_VERSION)
+    if (((*p >> 4) & 0x0F) > H5L_EXT_VERSION)
         HGOTO_ERROR(H5E_LINK, H5E_CANTDECODE, FAIL, "bad version number for external link")
-    if((*p & 0x0F) & ~H5L_EXT_FLAGS_ALL)
+    if ((*p & 0x0F) & ~H5L_EXT_FLAGS_ALL)
         HGOTO_ERROR(H5E_LINK, H5E_CANTDECODE, FAIL, "bad flags for external link")
     p++;
 
     /* Gather some information from the external link's user data */
     file_name = (const char *)p;
     fname_len = HDstrlen(file_name);
-    obj_name = (const char *)p + fname_len + 1;
+    obj_name  = (const char *)p + fname_len + 1;
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the fapl_id set for lapl_id if any */
-    if(H5P_get(plist, H5L_ACS_ELINK_FAPL_NAME, &fapl_id) < 0)
+    if (H5P_get(plist, H5L_ACS_ELINK_FAPL_NAME, &fapl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fapl for links")
 
     /* Get the location for the group holding the external link */
-    if(H5G_loc(cur_group, &loc) < 0)
+    if (H5G_loc(cur_group, &loc) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't get object location")
 
     /* get the access flags set for lapl_id if any */
-    if(H5P_get(plist, H5L_ACS_ELINK_FLAGS_NAME, &intent) < 0)
+    if (H5P_get(plist, H5L_ACS_ELINK_FLAGS_NAME, &intent) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get elink file access flags")
 
     /* get the file access mode flags for the parent file, if they were not set
      * on lapl_id */
-    if(intent == H5F_ACC_DEFAULT)
+    if (intent == H5F_ACC_DEFAULT)
         intent = H5F_INTENT(loc.oloc->file);
 
-    if((fapl_id == H5P_DEFAULT) && ((fapl_id = H5F_get_access_plist(loc.oloc->file, FALSE)) < 0))
-	HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't get parent's file access property list")
+    if ((fapl_id == H5P_DEFAULT) && ((fapl_id = H5F_get_access_plist(loc.oloc->file, FALSE)) < 0))
+        HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't get parent's file access property list")
 
     /* Get callback_info */
-    if(H5P_get(plist, H5L_ACS_ELINK_CB_NAME, &cb_info)<0)
+    if (H5P_get(plist, H5L_ACS_ELINK_CB_NAME, &cb_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get elink callback info")
 
     /* Get file access property list */
-    if(NULL == (fa_plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
-	HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
+    if (NULL == (fa_plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Make callback if it exists */
-    if(cb_info.func) {
-        const char  *parent_file_name;  /* Parent file name */
-        ssize_t group_name_len;         /* Length of parent group name */
+    if (cb_info.func) {
+        const char *parent_file_name; /* Parent file name */
+        ssize_t     group_name_len;   /* Length of parent group name */
 
         /* Get parent file name */
         parent_file_name = H5F_OPEN_NAME(loc.oloc->file);
 
         /* Query length of parent group name */
-        if((group_name_len = H5G_get_name(&loc, NULL, (size_t) 0, NULL, lapl_id, H5AC_ind_dxpl_id)) < 0)
+        if ((group_name_len = H5G_get_name(&loc, NULL, (size_t)0, NULL, lapl_id, H5AC_ind_dxpl_id)) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to retrieve length of group name")
 
         /* Account for null terminator */
         group_name_len++;
 
         /* Check if we need to allocate larger buffer */
-        if((size_t)group_name_len > sizeof(local_group_name)) {
-            if(NULL == (parent_group_name = (char *)H5MM_malloc((size_t)group_name_len)))
-                HGOTO_ERROR(H5E_LINK, H5E_CANTALLOC, FAIL, "can't allocate buffer to hold group name, group_name_len = %Zu", group_name_len)
+        if ((size_t)group_name_len > sizeof(local_group_name)) {
+            if (NULL == (parent_group_name = (char *)H5MM_malloc((size_t)group_name_len)))
+                HGOTO_ERROR(H5E_LINK, H5E_CANTALLOC, FAIL,
+                            "can't allocate buffer to hold group name, group_name_len = %Zu", group_name_len)
         } /* end if */
         else
             parent_group_name = local_group_name;
 
         /* Get parent group name */
-        if(H5G_get_name(&loc, parent_group_name, (size_t) group_name_len, NULL, lapl_id, H5AC_ind_dxpl_id) < 0)
+        if (H5G_get_name(&loc, parent_group_name, (size_t)group_name_len, NULL, lapl_id, H5AC_ind_dxpl_id) <
+            0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to retrieve group name")
 
         /* Make callback */
-        if((cb_info.func)(parent_file_name, parent_group_name, file_name, obj_name, &intent, fapl_id, cb_info.user_data) < 0)
+        if ((cb_info.func)(parent_file_name, parent_group_name, file_name, obj_name, &intent, fapl_id,
+                           cb_info.user_data) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CALLBACK, FAIL, "traversal operator failed")
 
         /* Check access flags */
-        if((intent & H5F_ACC_TRUNC) || (intent & H5F_ACC_EXCL))
+        if ((intent & H5F_ACC_TRUNC) || (intent & H5F_ACC_EXCL))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file open flags")
     } /* end if */
 
     /* Set file close degree for new file to "weak" */
-    if(H5P_set(fa_plist, H5F_ACS_CLOSE_DEGREE_NAME, &fc_degree) < 0)
-	HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file close degree")
+    if (H5P_set(fa_plist, H5F_ACS_CLOSE_DEGREE_NAME, &fc_degree) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file close degree")
 
     /*
      * Start searching for the target file
@@ -307,140 +306,150 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
     intent = ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY);
 
     /* Copy the file name to use */
-    if(NULL == (temp_file_name = H5MM_strdup(file_name)))
+    if (NULL == (temp_file_name = H5MM_strdup(file_name)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     temp_file_name_len = HDstrlen(temp_file_name);
 
     /* target file_name is an absolute pathname: see RM for detailed description */
-    if(H5_CHECK_ABSOLUTE(file_name) || H5_CHECK_ABS_PATH(file_name)) {
+    if (H5_CHECK_ABSOLUTE(file_name) || H5_CHECK_ABS_PATH(file_name)) {
         /* Try opening file */
-        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id))) {
+        if (NULL == (ext_file = H5F_efc_open(loc.oloc->file, file_name, intent, H5P_FILE_CREATE_DEFAULT,
+                                             fapl_id, H5AC_dxpl_id))) {
             char *ptr;
 
             H5E_clear_stack(NULL);
 
             /* get last component of file_name */
-	    H5_GET_LAST_DELIMITER(file_name, ptr)
-	    HDassert(ptr);
+            H5_GET_LAST_DELIMITER(file_name, ptr)
+            HDassert(ptr);
 
             /* Increment past delimiter */
             ptr++;
 
             /* Copy into the temp. file name */
-	    HDstrncpy(temp_file_name, ptr, temp_file_name_len);
+            HDstrncpy(temp_file_name, ptr, temp_file_name_len);
             temp_file_name[temp_file_name_len - 1] = '\0';
         } /* end if */
-    } /* end if */
-    else if(H5_CHECK_ABS_DRIVE(file_name)) {
+    }     /* end if */
+    else if (H5_CHECK_ABS_DRIVE(file_name)) {
         /* Try opening file */
-        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id))) {
+        if (NULL == (ext_file = H5F_efc_open(loc.oloc->file, file_name, intent, H5P_FILE_CREATE_DEFAULT,
+                                             fapl_id, H5AC_dxpl_id))) {
 
             H5E_clear_stack(NULL);
 
-	    /* strip "<drive-letter>:" */
-	    HDstrncpy(temp_file_name, &file_name[2], temp_file_name_len);
+            /* strip "<drive-letter>:" */
+            HDstrncpy(temp_file_name, &file_name[2], temp_file_name_len);
             temp_file_name[temp_file_name_len - 1] = '\0';
-	} /* end if */
-    } /* end if */
+        } /* end if */
+    }     /* end if */
 
     /* try searching from paths set in the environment variable */
-    if(ext_file == NULL) {
+    if (ext_file == NULL) {
         char *env_prefix;
 
-        if(NULL != (env_prefix = HDgetenv("HDF5_EXT_PREFIX"))) {
+        if (NULL != (env_prefix = HDgetenv("HDF5_EXT_PREFIX"))) {
             char *tmp_env_prefix, *saved_env;
 
-            if(NULL == (saved_env = tmp_env_prefix = H5MM_strdup(env_prefix)))
+            if (NULL == (saved_env = tmp_env_prefix = H5MM_strdup(env_prefix)))
                 HGOTO_ERROR(H5E_LINK, H5E_NOSPACE, FAIL, "memory allocation failed")
 
-            while((tmp_env_prefix) && (*tmp_env_prefix)) {
+            while ((tmp_env_prefix) && (*tmp_env_prefix)) {
                 char *out_prefix_name;
 
-                out_prefix_name = H5L_getenv_prefix_name(&tmp_env_prefix/*in,out*/);
-                if(out_prefix_name && (*out_prefix_name)) {
-                    if(H5L_build_name(out_prefix_name, temp_file_name, &full_name/*out*/) < 0) {
-			saved_env = (char *)H5MM_xfree(saved_env);
+                out_prefix_name = H5L_getenv_prefix_name(&tmp_env_prefix /*in,out*/);
+                if (out_prefix_name && (*out_prefix_name)) {
+                    if (H5L_build_name(out_prefix_name, temp_file_name, &full_name /*out*/) < 0) {
+                        saved_env = (char *)H5MM_xfree(saved_env);
                         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
-		    } /* end if */
+                    } /* end if */
 
-                    ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id);
+                    ext_file  = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT,
+                                            fapl_id, H5AC_dxpl_id);
                     full_name = (char *)H5MM_xfree(full_name);
-                    if(ext_file != NULL)
+                    if (ext_file != NULL)
                         break;
                     H5E_clear_stack(NULL);
                 } /* end if */
-            } /* end while */
-	    saved_env = (char *)H5MM_xfree(saved_env);
+            }     /* end while */
+            saved_env = (char *)H5MM_xfree(saved_env);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* try searching from property list */
-    if(ext_file == NULL) {
-        if(H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
+    if (ext_file == NULL) {
+        if (H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external link prefix")
-        if(my_prefix) {
-            if(H5L_build_name(my_prefix, temp_file_name, &full_name/*out*/) < 0)
+        if (my_prefix) {
+            if (H5L_build_name(my_prefix, temp_file_name, &full_name /*out*/) < 0)
                 HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
-            if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+            if (NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT,
+                                                 fapl_id, H5AC_dxpl_id)))
                 H5E_clear_stack(NULL);
             full_name = (char *)H5MM_xfree(full_name);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* try searching from main file's "extpath": see description in H5F_open() & H5_build_extpath() */
-    if(ext_file == NULL) {
+    if (ext_file == NULL) {
         char *extpath;
 
-        if(NULL != (extpath = H5F_EXTPATH(loc.oloc->file))) {
-            if(H5L_build_name(extpath, temp_file_name, &full_name/*out*/) < 0)
+        if (NULL != (extpath = H5F_EXTPATH(loc.oloc->file))) {
+            if (H5L_build_name(extpath, temp_file_name, &full_name /*out*/) < 0)
                 HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
-            if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+            if (NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT,
+                                                 fapl_id, H5AC_dxpl_id)))
                 H5E_clear_stack(NULL);
             full_name = (char *)H5MM_xfree(full_name);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* try the relative file_name stored in temp_file_name */
-    if(ext_file == NULL) {
-        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, temp_file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+    if (ext_file == NULL) {
+        if (NULL == (ext_file = H5F_efc_open(loc.oloc->file, temp_file_name, intent, H5P_FILE_CREATE_DEFAULT,
+                                             fapl_id, H5AC_dxpl_id)))
             H5E_clear_stack(NULL);
     } /* end if */
 
     /* try the 'resolved' name for the parent file (i.e. the name after symlinks
      * were resolved)
      */
-    if(ext_file == NULL) {
+    if (ext_file == NULL) {
         char *ptr = NULL;
 
         /* Copy resolved file name */
-        if(NULL == (actual_file_name = H5MM_strdup(H5F_ACTUAL_NAME(loc.oloc->file))))
+        if (NULL == (actual_file_name = H5MM_strdup(H5F_ACTUAL_NAME(loc.oloc->file))))
             HGOTO_ERROR(H5E_LINK, H5E_CANTALLOC, FAIL, "can't duplicate resolved file name string")
 
         /* get last component of file_name */
         H5_GET_LAST_DELIMITER(actual_file_name, ptr)
-        if(!ptr)
-            HGOTO_ERROR(H5E_LINK, H5E_CANTOPENFILE, FAIL, "unable to open external file, external link file name = '%s', temp_file_name = '%s'", file_name, temp_file_name)
+        if (!ptr)
+            HGOTO_ERROR(H5E_LINK, H5E_CANTOPENFILE, FAIL,
+                        "unable to open external file, external link file name = '%s', temp_file_name = '%s'",
+                        file_name, temp_file_name)
 
         /* Truncate filename portion from actual file name path */
         *ptr = '\0';
 
         /* Build new file name for the external file */
-        if(H5L_build_name(actual_file_name, temp_file_name, &full_name/*out*/) < 0)
+        if (H5L_build_name(actual_file_name, temp_file_name, &full_name /*out*/) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
 
         /* Try opening with the resolved name */
-        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
-            HGOTO_ERROR(H5E_LINK, H5E_CANTOPENFILE, FAIL, "unable to open external file, external link file name = '%s', temp_file_name = '%s'", file_name, temp_file_name)
+        if (NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT,
+                                             fapl_id, H5AC_dxpl_id)))
+            HGOTO_ERROR(H5E_LINK, H5E_CANTOPENFILE, FAIL,
+                        "unable to open external file, external link file name = '%s', temp_file_name = '%s'",
+                        file_name, temp_file_name)
         full_name = (char *)H5MM_xfree(full_name);
     } /* end if */
 
-
     /* Retrieve the "group location" for the file's root group */
-    if(H5G_root_loc(ext_file, &root_loc) < 0)
+    if (H5G_root_loc(ext_file, &root_loc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unable to create location for file")
 
     /* Open the object referenced in the external file */
-    if((ext_obj = H5O_open_name(&root_loc, obj_name, lapl_id, FALSE)) < 0)
+    if ((ext_obj = H5O_open_name(&root_loc, obj_name, lapl_id, FALSE)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     /* Set return value */
@@ -448,26 +457,25 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
 
 done:
     /* Release resources */
-    if(fapl_id > 0 && H5I_dec_ref(fapl_id) < 0)
+    if (fapl_id > 0 && H5I_dec_ref(fapl_id) < 0)
         HDONE_ERROR(H5E_ATOM, H5E_CANTRELEASE, FAIL, "unable to close atom for file access property list")
-    if(ext_file && H5F_efc_close(loc.oloc->file, ext_file) < 0)
+    if (ext_file && H5F_efc_close(loc.oloc->file, ext_file) < 0)
         HDONE_ERROR(H5E_LINK, H5E_CANTCLOSEFILE, FAIL, "problem closing external file")
-    if(parent_group_name && parent_group_name != local_group_name)
+    if (parent_group_name && parent_group_name != local_group_name)
         parent_group_name = (char *)H5MM_xfree(parent_group_name);
-    full_name = (char *)H5MM_xfree(full_name);
-    temp_file_name = (char *)H5MM_xfree(temp_file_name);
+    full_name        = (char *)H5MM_xfree(full_name);
+    temp_file_name   = (char *)H5MM_xfree(temp_file_name);
     actual_file_name = (char *)H5MM_xfree(actual_file_name);
 
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Close object if it's open and something failed */
-        if(ext_obj >= 0 && H5I_dec_ref(ext_obj) < 0)
+        if (ext_obj >= 0 && H5I_dec_ref(ext_obj) < 0)
             HDONE_ERROR(H5E_ATOM, H5E_CANTRELEASE, FAIL, "unable to close atom for external object")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_extern_traverse() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5L_extern_query
  *
@@ -486,24 +494,24 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5L_extern_query(const char H5_ATTR_UNUSED * link_name, const void *_udata, size_t udata_size,
-    void *buf /*out*/, size_t buf_size)
+H5L_extern_query(const char H5_ATTR_UNUSED *link_name, const void *_udata, size_t udata_size,
+                 void *buf /*out*/, size_t buf_size)
 {
-    const uint8_t *udata = (const uint8_t *)_udata;      /* Pointer to external link buffer */
-    ssize_t     ret_value = SUCCEED;    /* Return value */
+    const uint8_t *udata     = (const uint8_t *)_udata; /* Pointer to external link buffer */
+    ssize_t        ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check external link version & flags */
-    if(((*udata >> 4) & 0x0F) != H5L_EXT_VERSION)
+    if (((*udata >> 4) & 0x0F) != H5L_EXT_VERSION)
         HGOTO_ERROR(H5E_LINK, H5E_CANTDECODE, FAIL, "bad version number for external link")
-    if((*udata & 0x0F) & ~H5L_EXT_FLAGS_ALL)
+    if ((*udata & 0x0F) & ~H5L_EXT_FLAGS_ALL)
         HGOTO_ERROR(H5E_LINK, H5E_CANTDECODE, FAIL, "bad flags for external link")
 
     /* If the buffer is NULL, skip writing anything in it and just return
      * the size needed */
-    if(buf) {
-        if(udata_size < buf_size)
+    if (buf) {
+        if (udata_size < buf_size)
             buf_size = udata_size;
 
         /* Copy the udata verbatim up to buf_size */
@@ -517,7 +525,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_extern_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Lcreate_external
  *
@@ -539,52 +546,52 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lcreate_external(const char *file_name, const char *obj_name,
-    hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id)
+H5Lcreate_external(const char *file_name, const char *obj_name, hid_t link_loc_id, const char *link_name,
+                   hid_t lcpl_id, hid_t lapl_id)
 {
-    H5G_loc_t	link_loc;               /* Group location to create link */
-    char       *norm_obj_name = NULL;	/* Pointer to normalized current name */
-    void       *ext_link_buf = NULL;    /* Buffer to contain external link */
-    size_t      buf_size;               /* Size of buffer to hold external link */
-    size_t      file_name_len;          /* Length of file name string */
-    size_t      norm_obj_name_len;      /* Length of normalized object name string */
-    uint8_t    *p;                      /* Pointer into external link buffer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t link_loc;             /* Group location to create link */
+    char *    norm_obj_name = NULL; /* Pointer to normalized current name */
+    void *    ext_link_buf  = NULL; /* Buffer to contain external link */
+    size_t    buf_size;             /* Size of buffer to hold external link */
+    size_t    file_name_len;        /* Length of file name string */
+    size_t    norm_obj_name_len;    /* Length of normalized object name string */
+    uint8_t * p;                    /* Pointer into external link buffer */
+    herr_t    ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "*s*si*sii", file_name, obj_name, link_loc_id, link_name,
-             lcpl_id, lapl_id);
+    H5TRACE6("e", "*s*si*sii", file_name, obj_name, link_loc_id, link_name, lcpl_id, lapl_id);
 
     /* Check arguments */
-    if(!file_name || !*file_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no file name specified")
-    if(!obj_name || !*obj_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name specified")
-    if(H5G_loc(link_loc_id, &link_loc) < 0)
+    if (!file_name || !*file_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no file name specified")
+    if (!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no object name specified")
+    if (H5G_loc(link_loc_id, &link_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!link_name || !*link_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no link name specified")
+    if (!link_name || !*link_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no link name specified")
 
     /* Get normalized copy of the link target */
-    if(NULL == (norm_obj_name = H5G_normalize(obj_name)))
+    if (NULL == (norm_obj_name = H5G_normalize(obj_name)))
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize object name")
 
     /* Combine the filename and link name into a single buffer to give to the UD link */
-    file_name_len = HDstrlen(file_name) + 1;
+    file_name_len     = HDstrlen(file_name) + 1;
     norm_obj_name_len = HDstrlen(norm_obj_name) + 1;
-    buf_size = 1 + file_name_len + norm_obj_name_len;
-    if(NULL == (ext_link_buf = H5MM_malloc(buf_size)))
+    buf_size          = 1 + file_name_len + norm_obj_name_len;
+    if (NULL == (ext_link_buf = H5MM_malloc(buf_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate udata buffer")
 
     /* Encode the external link information */
-    p = (uint8_t *)ext_link_buf;
-    *p++ = (H5L_EXT_VERSION << 4) | H5L_EXT_FLAGS_ALL;  /* External link version & flags */
-    HDstrncpy((char *)p, file_name, buf_size - 1);      /* Name of file containing external link's object */
+    p    = (uint8_t *)ext_link_buf;
+    *p++ = (H5L_EXT_VERSION << 4) | H5L_EXT_FLAGS_ALL; /* External link version & flags */
+    HDstrncpy((char *)p, file_name, buf_size - 1);     /* Name of file containing external link's object */
     p += file_name_len;
-    HDstrncpy((char *)p, norm_obj_name, buf_size - (file_name_len + 1));       /* External link's object */
+    HDstrncpy((char *)p, norm_obj_name, buf_size - (file_name_len + 1)); /* External link's object */
 
     /* Create an external link */
-    if(H5L_create_ud(&link_loc, link_name, ext_link_buf, buf_size, H5L_TYPE_EXTERNAL, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
+    if (H5L_create_ud(&link_loc, link_name, ext_link_buf, buf_size, H5L_TYPE_EXTERNAL, lcpl_id, lapl_id,
+                      H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
@@ -594,7 +601,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lcreate_external() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5L_register_external
  *
@@ -612,18 +618,17 @@ done:
 herr_t
 H5L_register_external(void)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5L_register(H5L_EXTERN_LINK_CLASS) < 0)
+    if (H5L_register(H5L_EXTERN_LINK_CLASS) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, FAIL, "unable to register external link class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5L_register_external() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Lunpack_elink_val
  *
@@ -648,35 +653,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Lunpack_elink_val(const void *_ext_linkval, size_t link_size,
-    unsigned *flags, const char **filename, const char **obj_path)
+H5Lunpack_elink_val(const void *_ext_linkval, size_t link_size, unsigned *flags, const char **filename,
+                    const char **obj_path)
 {
     const uint8_t *ext_linkval = (const uint8_t *)_ext_linkval; /* Pointer to the link value */
-    unsigned    lnk_version;            /* External link format version */
-    unsigned    lnk_flags;              /* External link flags */
-    size_t      len;                    /* Length of the filename in the linkval*/
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned       lnk_version;                                 /* External link format version */
+    unsigned       lnk_flags;                                   /* External link flags */
+    size_t         len;                                         /* Length of the filename in the linkval*/
+    herr_t         ret_value = SUCCEED;                         /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE5("e", "*xz*Iu**s**s", _ext_linkval, link_size, flags, filename,
-             obj_path);
+    H5TRACE5("e", "*xz*Iu**s**s", _ext_linkval, link_size, flags, filename, obj_path);
 
     /* Sanity check external link buffer */
-    if(ext_linkval == NULL )
+    if (ext_linkval == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not an external link linkval buffer")
     lnk_version = (*ext_linkval >> 4) & 0x0F;
-    lnk_flags = *ext_linkval & 0x0F;
-    if(lnk_version > H5L_EXT_VERSION)
+    lnk_flags   = *ext_linkval & 0x0F;
+    if (lnk_version > H5L_EXT_VERSION)
         HGOTO_ERROR(H5E_LINK, H5E_CANTDECODE, FAIL, "bad version number for external link")
-    if(lnk_flags & (unsigned)~H5L_EXT_FLAGS_ALL)
+    if (lnk_flags & (unsigned)~H5L_EXT_FLAGS_ALL)
         HGOTO_ERROR(H5E_LINK, H5E_CANTDECODE, FAIL, "bad flags for external link")
-    if(link_size <= 2)
+    if (link_size <= 2)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid external link buffer")
 
     /* Try to do some error checking.  If the last character in the linkval
      * (the last character of obj_path) isn't NULL, then something's wrong.
      */
-    if(ext_linkval[link_size - 1] != '\0')
+    if (ext_linkval[link_size - 1] != '\0')
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "linkval buffer is not NULL-terminated")
 
     /* We're now guaranteed that HDstrlen won't segfault, since the buffer has
@@ -687,23 +691,22 @@ H5Lunpack_elink_val(const void *_ext_linkval, size_t link_size,
     /* If the first NULL we found was at the very end of the buffer, then
      * this external link value has no object name and is invalid.
      */
-    if((len + 1) >= (link_size - 1))
+    if ((len + 1) >= (link_size - 1))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "linkval buffer doesn't contain an object path")
 
     /* If we got here then the buffer contains (at least) two strings packed
      * in the correct way.  Assume it's correct and return pointers to the
      * filename and object path.
      */
-    if(filename)
+    if (filename)
         *filename = (const char *)ext_linkval + 1;
-    if(obj_path)
-        *obj_path = ((const char *)ext_linkval + 1) + len + 1;  /* Add one for NULL terminator */
+    if (obj_path)
+        *obj_path = ((const char *)ext_linkval + 1) + len + 1; /* Add one for NULL terminator */
 
     /* Set the flags to return */
-    if(flags)
+    if (flags)
         *flags = lnk_flags;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lunpack_elink_val() */
-
diff --git a/src/H5Lpkg.h b/src/H5Lpkg.h
index 62c9992..47967a7 100644
--- a/src/H5Lpkg.h
+++ b/src/H5Lpkg.h
@@ -31,32 +31,26 @@
 
 /* Other private headers needed by this file */
 
-
 /**************************/
 /* Package Private Macros */
 /**************************/
 
-
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 
-H5_DLL herr_t H5L_create_ud(const H5G_loc_t *link_loc, const char *link_name,
-    const void * ud_data, size_t ud_data_size, H5L_type_t type,
-    hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id,
-    const H5O_link_t *_src_lnk, const H5O_loc_t *src_oloc, H5O_link_t *dst_lnk,
-    H5O_copy_t *cpy_info);
+H5_DLL herr_t H5L_create_ud(const H5G_loc_t *link_loc, const char *link_name, const void *ud_data,
+                            size_t ud_data_size, H5L_type_t type, hid_t lcpl_id, hid_t lapl_id,
+                            hid_t dxpl_id);
+H5_DLL herr_t H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
+                                 const H5O_loc_t *src_oloc, H5O_link_t *dst_lnk, H5O_copy_t *cpy_info);
 
 #endif /* _H5Lpkg_H */
-
diff --git a/src/H5Lprivate.h b/src/H5Lprivate.h
index 3052de4..4f195af 100644
--- a/src/H5Lprivate.h
+++ b/src/H5Lprivate.h
@@ -22,32 +22,30 @@
 #include "H5Lpublic.h"
 
 /* Private headers needed by this file */
-#include "H5Gprivate.h"        /* Groups                */
-#include "H5Oprivate.h"        /* Object headers            */
-
+#include "H5Gprivate.h" /* Groups                */
+#include "H5Oprivate.h" /* Object headers            */
 
 /**************************/
 /* Library Private Macros */
 /**************************/
 
 /* Default number of soft links to traverse */
-#define H5L_NUM_LINKS   16
+#define H5L_NUM_LINKS 16
 
 /* ========  Link creation property names ======== */
-#define H5L_CRT_INTERMEDIATE_GROUP_NAME         "intermediate_group" /* Create intermediate groups flag */
+#define H5L_CRT_INTERMEDIATE_GROUP_NAME "intermediate_group" /* Create intermediate groups flag */
 
 /* ========  Link access property names ======== */
 /* Number of soft links to traverse */
-#define H5L_ACS_NLINKS_NAME        "max soft links"
+#define H5L_ACS_NLINKS_NAME "max soft links"
 /* External link prefix */
-#define H5L_ACS_ELINK_PREFIX_NAME  "external link prefix"
+#define H5L_ACS_ELINK_PREFIX_NAME "external link prefix"
 /* file access property list for external link access */
-#define H5L_ACS_ELINK_FAPL_NAME    "external link fapl"
+#define H5L_ACS_ELINK_FAPL_NAME "external link fapl"
 /* file access flags for external link traversal */
-#define H5L_ACS_ELINK_FLAGS_NAME   "external link flags"
+#define H5L_ACS_ELINK_FLAGS_NAME "external link flags"
 /*  callback function for external link traversal */
-#define H5L_ACS_ELINK_CB_NAME      "external link callback"
-
+#define H5L_ACS_ELINK_CB_NAME "external link callback"
 
 /****************************/
 /* Library Private Typedefs */
@@ -55,41 +53,36 @@
 
 /* Structure for external link traversal callback property */
 typedef struct H5L_elink_cb_t {
-    H5L_elink_traverse_t      func;
-    void                      *user_data;
+    H5L_elink_traverse_t func;
+    void *               user_data;
 } H5L_elink_cb_t;
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /******************************/
 /* Library Private Prototypes */
 /******************************/
 
 /* General operations on links */
 H5_DLL herr_t H5L_init(void);
-H5_DLL herr_t H5L_link(const H5G_loc_t *new_loc, const char *new_name,
-    H5G_loc_t *obj_loc, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5L_link_object(const H5G_loc_t *new_loc, const char *new_name,
-    H5O_obj_create_t *ocrt_info, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name,
-    const H5G_loc_t *link_loc, const char *link_name, hid_t lcpl_id,
-    hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5L_create_soft(const char *target_path, const H5G_loc_t *cur_loc,
-    const char *cur_name, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL hid_t H5L_get_default_lcpl(void);
-H5_DLL herr_t H5L_move(H5G_loc_t *src_loc, const char *src_name,
-    H5G_loc_t *dst_loc, const char *dst_name, hbool_t copy_flag,
-    hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5L_get_info(const H5G_loc_t *loc, const char *name,
-    H5L_info_t *linkbuf/*out*/, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5L_delete(H5G_loc_t *loc, const char *name, hid_t lapl_id,
-    hid_t dxpl_id);
-H5_DLL herr_t H5L_get_val(H5G_loc_t *loc, const char *name, void *buf/*out*/,
-    size_t size, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc, hid_t lcpl_id,
+                       hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5L_link_object(const H5G_loc_t *new_loc, const char *new_name, H5O_obj_create_t *ocrt_info,
+                              hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name, const H5G_loc_t *link_loc,
+                              const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5L_create_soft(const char *target_path, const H5G_loc_t *cur_loc, const char *cur_name,
+                              hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL hid_t  H5L_get_default_lcpl(void);
+H5_DLL herr_t H5L_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc, const char *dst_name,
+                       hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5L_get_info(const H5G_loc_t *loc, const char *name, H5L_info_t *linkbuf /*out*/, hid_t lapl_id,
+                           hid_t dxpl_id);
+H5_DLL herr_t H5L_delete(H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5L_get_val(H5G_loc_t *loc, const char *name, void *buf /*out*/, size_t size, hid_t lapl_id,
+                          hid_t dxpl_id);
 H5_DLL herr_t H5L_register_external(void);
 
 /* User-defined link functions */
@@ -98,4 +91,3 @@ H5_DLL herr_t H5L_unregister(H5L_type_t id);
 H5_DLL const H5L_class_t *H5L_find_class(H5L_type_t id);
 
 #endif /* _H5Lprivate_H */
-
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index 4ed89b2..f4c9dbb 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -25,9 +25,9 @@
 #define _H5Lpublic_H
 
 /* Public headers needed by this file */
-#include "H5public.h"        /* Generic Functions            */
-#include "H5Ipublic.h"        /* IDs                      */
-#include "H5Tpublic.h"        /* Datatypes                */
+#include "H5public.h"  /* Generic Functions            */
+#include "H5Ipublic.h" /* IDs                      */
+#include "H5Tpublic.h" /* Datatypes                */
 
 /*****************/
 /* Public Macros */
@@ -35,7 +35,7 @@
 
 /* Maximum length of a link's name */
 /* (encoded in a 32-bit unsigned integer) */
-#define H5L_MAX_LINK_NAME_LEN   ((uint32_t)(-1))  /* (4GB - 1) */
+#define H5L_MAX_LINK_NAME_LEN ((uint32_t)(-1)) /* (4GB - 1) */
 
 /* Macro to indicate operation occurs on same location */
 #define H5L_SAME_LOC (hid_t)0
@@ -60,26 +60,26 @@ extern "C" {
  * These values can never change because they appear in HDF5 files.
  */
 typedef enum {
-    H5L_TYPE_ERROR = (-1),      /* Invalid link type id         */
-    H5L_TYPE_HARD = 0,          /* Hard link id                 */
-    H5L_TYPE_SOFT = 1,          /* Soft link id                 */
-    H5L_TYPE_EXTERNAL = 64,     /* External link id             */
-    H5L_TYPE_MAX = 255            /* Maximum link type id         */
+    H5L_TYPE_ERROR    = (-1), /* Invalid link type id         */
+    H5L_TYPE_HARD     = 0,    /* Hard link id                 */
+    H5L_TYPE_SOFT     = 1,    /* Soft link id                 */
+    H5L_TYPE_EXTERNAL = 64,   /* External link id             */
+    H5L_TYPE_MAX      = 255   /* Maximum link type id         */
 } H5L_type_t;
 /* Maximum value link value for "built-in" link types */
 #define H5L_TYPE_BUILTIN_MAX H5L_TYPE_SOFT
 /* Link ids at or above this value are "user-defined" link types. */
-#define H5L_TYPE_UD_MIN      H5L_TYPE_EXTERNAL
+#define H5L_TYPE_UD_MIN H5L_TYPE_EXTERNAL
 
 /* Information struct for link (for H5Lget_info/H5Lget_info_by_idx) */
 typedef struct {
-    H5L_type_t          type;           /* Type of link                   */
-    hbool_t             corder_valid;   /* Indicate if creation order is valid */
-    int64_t             corder;         /* Creation order                 */
-    H5T_cset_t          cset;           /* Character set of link name     */
+    H5L_type_t type;         /* Type of link                   */
+    hbool_t    corder_valid; /* Indicate if creation order is valid */
+    int64_t    corder;       /* Creation order                 */
+    H5T_cset_t cset;         /* Character set of link name     */
     union {
-        haddr_t         address;        /* Address hard link points to    */
-        size_t          val_size;       /* Size of a soft link or UD link value */
+        haddr_t address;  /* Address hard link points to    */
+        size_t  val_size; /* Size of a soft link or UD link value */
     } u;
 } H5L_info_t;
 
@@ -89,114 +89,104 @@ typedef struct {
  */
 /* Callback prototypes for user-defined links */
 /* Link creation callback */
-typedef herr_t (*H5L_create_func_t)(const char *link_name, hid_t loc_group,
-    const void *lnkdata, size_t lnkdata_size, hid_t lcpl_id);
+typedef herr_t (*H5L_create_func_t)(const char *link_name, hid_t loc_group, const void *lnkdata,
+                                    size_t lnkdata_size, hid_t lcpl_id);
 
 /* Callback for when the link is moved */
-typedef herr_t (*H5L_move_func_t)(const char *new_name, hid_t new_loc,
-    const void *lnkdata, size_t lnkdata_size);
+typedef herr_t (*H5L_move_func_t)(const char *new_name, hid_t new_loc, const void *lnkdata,
+                                  size_t lnkdata_size);
 
 /* Callback for when the link is copied */
-typedef herr_t (*H5L_copy_func_t)(const char *new_name, hid_t new_loc,
-    const void *lnkdata, size_t lnkdata_size);
+typedef herr_t (*H5L_copy_func_t)(const char *new_name, hid_t new_loc, const void *lnkdata,
+                                  size_t lnkdata_size);
 
 /* Callback during link traversal */
-typedef hid_t (*H5L_traverse_func_t)(const char *link_name, hid_t cur_group,
-    const void *lnkdata, size_t lnkdata_size, hid_t lapl_id);
+typedef hid_t (*H5L_traverse_func_t)(const char *link_name, hid_t cur_group, const void *lnkdata,
+                                     size_t lnkdata_size, hid_t lapl_id);
 
 /* Callback for when the link is deleted */
-typedef herr_t (*H5L_delete_func_t)(const char *link_name, hid_t file,
-    const void *lnkdata, size_t lnkdata_size);
+typedef herr_t (*H5L_delete_func_t)(const char *link_name, hid_t file, const void *lnkdata,
+                                    size_t lnkdata_size);
 
 /* Callback for querying the link */
 /* Returns the size of the buffer needed */
-typedef ssize_t (*H5L_query_func_t)(const char *link_name, const void *lnkdata,
-    size_t lnkdata_size, void *buf /*out*/, size_t buf_size);
+typedef ssize_t (*H5L_query_func_t)(const char *link_name, const void *lnkdata, size_t lnkdata_size,
+                                    void *buf /*out*/, size_t buf_size);
 
 /* User-defined link types */
 typedef struct {
-    int version;                    /* Version number of this struct        */
-    H5L_type_t id;                  /* Link type ID                         */
-    const char *comment;            /* Comment for debugging                */
-    H5L_create_func_t create_func;  /* Callback during link creation        */
-    H5L_move_func_t move_func;      /* Callback after moving link           */
-    H5L_copy_func_t copy_func;      /* Callback after copying link          */
-    H5L_traverse_func_t trav_func;  /* Callback during link traversal       */
-    H5L_delete_func_t del_func;     /* Callback for link deletion           */
-    H5L_query_func_t query_func;    /* Callback for queries                 */
+    int                 version;     /* Version number of this struct        */
+    H5L_type_t          id;          /* Link type ID                         */
+    const char *        comment;     /* Comment for debugging                */
+    H5L_create_func_t   create_func; /* Callback during link creation        */
+    H5L_move_func_t     move_func;   /* Callback after moving link           */
+    H5L_copy_func_t     copy_func;   /* Callback after copying link          */
+    H5L_traverse_func_t trav_func;   /* Callback during link traversal       */
+    H5L_delete_func_t   del_func;    /* Callback for link deletion           */
+    H5L_query_func_t    query_func;  /* Callback for queries                 */
 } H5L_class_t;
 
 /* Prototype for H5Literate/H5Literate_by_name() operator */
-typedef herr_t (*H5L_iterate_t)(hid_t group, const char *name, const H5L_info_t *info,
-    void *op_data);
+typedef herr_t (*H5L_iterate_t)(hid_t group, const char *name, const H5L_info_t *info, void *op_data);
 
 /* Callback for external link traversal */
-typedef herr_t (*H5L_elink_traverse_t)(const char *parent_file_name,
-    const char *parent_group_name, const char *child_file_name,
-    const char *child_object_name, unsigned *acc_flags, hid_t fapl_id,
-    void *op_data);
-
+typedef herr_t (*H5L_elink_traverse_t)(const char *parent_file_name, const char *parent_group_name,
+                                       const char *child_file_name, const char *child_object_name,
+                                       unsigned *acc_flags, hid_t fapl_id, void *op_data);
 
 /********************/
 /* Public Variables */
 /********************/
 
-
 /*********************/
 /* Public Prototypes */
 /*********************/
-H5_DLL herr_t H5Lmove(hid_t src_loc, const char *src_name, hid_t dst_loc,
-    const char *dst_name, hid_t lcpl_id, hid_t lapl_id);
-H5_DLL herr_t H5Lcopy(hid_t src_loc, const char *src_name, hid_t dst_loc,
-    const char *dst_name, hid_t lcpl_id, hid_t lapl_id);
-H5_DLL herr_t H5Lcreate_hard(hid_t cur_loc, const char *cur_name,
-    hid_t dst_loc, const char *dst_name, hid_t lcpl_id, hid_t lapl_id);
-H5_DLL herr_t H5Lcreate_soft(const char *link_target, hid_t link_loc_id,
-    const char *link_name, hid_t lcpl_id, hid_t lapl_id);
+H5_DLL herr_t H5Lmove(hid_t src_loc, const char *src_name, hid_t dst_loc, const char *dst_name, hid_t lcpl_id,
+                      hid_t lapl_id);
+H5_DLL herr_t H5Lcopy(hid_t src_loc, const char *src_name, hid_t dst_loc, const char *dst_name, hid_t lcpl_id,
+                      hid_t lapl_id);
+H5_DLL herr_t H5Lcreate_hard(hid_t cur_loc, const char *cur_name, hid_t dst_loc, const char *dst_name,
+                             hid_t lcpl_id, hid_t lapl_id);
+H5_DLL herr_t H5Lcreate_soft(const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id,
+                             hid_t lapl_id);
 H5_DLL herr_t H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id);
-H5_DLL herr_t H5Ldelete_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id);
-H5_DLL herr_t H5Lget_val(hid_t loc_id, const char *name, void *buf/*out*/,
-    size_t size, hid_t lapl_id);
-H5_DLL herr_t H5Lget_val_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    void *buf/*out*/, size_t size, hid_t lapl_id);
+H5_DLL herr_t H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                               H5_iter_order_t order, hsize_t n, hid_t lapl_id);
+H5_DLL herr_t H5Lget_val(hid_t loc_id, const char *name, void *buf /*out*/, size_t size, hid_t lapl_id);
+H5_DLL herr_t H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                H5_iter_order_t order, hsize_t n, void *buf /*out*/, size_t size,
+                                hid_t lapl_id);
 H5_DLL htri_t H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id);
-H5_DLL herr_t H5Lget_info(hid_t loc_id, const char *name,
-    H5L_info_t *linfo /*out*/, hid_t lapl_id);
-H5_DLL herr_t H5Lget_info_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    H5L_info_t *linfo /*out*/, hid_t lapl_id);
-H5_DLL ssize_t H5Lget_name_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    char *name /*out*/, size_t size, hid_t lapl_id);
-H5_DLL herr_t H5Literate(hid_t grp_id, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t *idx, H5L_iterate_t op, void *op_data);
-H5_DLL herr_t H5Literate_by_name(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx,
-    H5L_iterate_t op, void *op_data, hid_t lapl_id);
-H5_DLL herr_t H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
-    H5L_iterate_t op, void *op_data);
-H5_DLL herr_t H5Lvisit_by_name(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op,
-    void *op_data, hid_t lapl_id);
+H5_DLL herr_t H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/, hid_t lapl_id);
+H5_DLL herr_t H5Lget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                 H5_iter_order_t order, hsize_t n, H5L_info_t *linfo /*out*/, hid_t lapl_id);
+H5_DLL ssize_t H5Lget_name_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                  H5_iter_order_t order, hsize_t n, char *name /*out*/, size_t size,
+                                  hid_t lapl_id);
+H5_DLL herr_t  H5Literate(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx,
+                          H5L_iterate_t op, void *op_data);
+H5_DLL herr_t  H5Literate_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                  H5_iter_order_t order, hsize_t *idx, H5L_iterate_t op, void *op_data,
+                                  hid_t lapl_id);
+H5_DLL herr_t  H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op,
+                        void *op_data);
+H5_DLL herr_t  H5Lvisit_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                H5_iter_order_t order, H5L_iterate_t op, void *op_data, hid_t lapl_id);
 
 /* UD link functions */
-H5_DLL herr_t H5Lcreate_ud(hid_t link_loc_id, const char *link_name,
-    H5L_type_t link_type, const void *udata, size_t udata_size, hid_t lcpl_id,
-    hid_t lapl_id);
+H5_DLL herr_t H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, const void *udata,
+                           size_t udata_size, hid_t lcpl_id, hid_t lapl_id);
 H5_DLL herr_t H5Lregister(const H5L_class_t *cls);
 H5_DLL herr_t H5Lunregister(H5L_type_t id);
 H5_DLL htri_t H5Lis_registered(H5L_type_t id);
 
 /* External link functions */
-H5_DLL herr_t H5Lunpack_elink_val(const void *ext_linkval/*in*/, size_t link_size,
-   unsigned *flags, const char **filename/*out*/, const char **obj_path /*out*/);
-H5_DLL herr_t H5Lcreate_external(const char *file_name, const char *obj_name,
-    hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id);
+H5_DLL herr_t H5Lunpack_elink_val(const void *ext_linkval /*in*/, size_t link_size, unsigned *flags,
+                                  const char **filename /*out*/, const char **obj_path /*out*/);
+H5_DLL herr_t H5Lcreate_external(const char *file_name, const char *obj_name, hid_t link_loc_id,
+                                 const char *link_name, hid_t lcpl_id, hid_t lapl_id);
 
 #ifdef __cplusplus
 }
 #endif
 #endif /* _H5Lpublic_H */
-
diff --git a/src/H5MF.c b/src/H5MF.c
index 60b142f..da1fb6f 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -26,32 +26,29 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-#define H5MF_PACKAGE		/*suppress error about including H5MFpkg  */
-
+#define H5F_PACKAGE  /*suppress error about including H5Fpkg	  */
+#define H5MF_PACKAGE /*suppress error about including H5MFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MFpkg.h"		/* File memory management		*/
-#include "H5VMprivate.h"	/* Vectors and arrays 			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MFpkg.h"     /* File memory management		*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-#define H5MF_FSPACE_SHRINK      80              /* Percent of "normal" size to shrink serialized free space size */
-#define H5MF_FSPACE_EXPAND      120             /* Percent of "normal" size to expand serialized free space size */
+#define H5MF_FSPACE_SHRINK 80  /* Percent of "normal" size to shrink serialized free space size */
+#define H5MF_FSPACE_EXPAND 120 /* Percent of "normal" size to expand serialized free space size */
 
 /* Map an allocation request type to a free list */
-#define H5MF_ALLOC_TO_FS_TYPE(F, T)      ((H5FD_MEM_DEFAULT == (F)->shared->fs_type_map[T]) \
-    ? (T) : (F)->shared->fs_type_map[T])
-
+#define H5MF_ALLOC_TO_FS_TYPE(F, T)                                                                          \
+    ((H5FD_MEM_DEFAULT == (F)->shared->fs_type_map[T]) ? (T) : (F)->shared->fs_type_map[T])
 
 /******************/
 /* Local Typedefs */
@@ -59,17 +56,15 @@
 
 /* Enum for kind of free space section+aggregator merging allowed for a file */
 typedef enum {
-    H5MF_AGGR_MERGE_SEPARATE,           /* Everything in separate free list */
-    H5MF_AGGR_MERGE_DICHOTOMY,          /* Metadata in one free list and raw data in another */
-    H5MF_AGGR_MERGE_TOGETHER            /* Metadata & raw data in one free list */
+    H5MF_AGGR_MERGE_SEPARATE,  /* Everything in separate free list */
+    H5MF_AGGR_MERGE_DICHOTOMY, /* Metadata in one free list and raw data in another */
+    H5MF_AGGR_MERGE_TOGETHER   /* Metadata & raw data in one free list */
 } H5MF_aggr_merge_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -78,22 +73,18 @@ typedef enum {
 static herr_t H5MF_alloc_create(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type);
 static herr_t H5MF_alloc_close(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_init_merge_flags
  *
@@ -110,10 +101,10 @@ static herr_t H5MF_alloc_close(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type);
 herr_t
 H5MF_init_merge_flags(H5F_t *f)
 {
-    H5MF_aggr_merge_t mapping_type;     /* Type of free list mapping */
-    H5FD_mem_t type;                    /* Memory type for iteration */
-    hbool_t all_same;                   /* Whether all the types map to the same value */
-    herr_t ret_value = SUCCEED;        	/* Return value */
+    H5MF_aggr_merge_t mapping_type;        /* Type of free list mapping */
+    H5FD_mem_t        type;                /* Memory type for iteration */
+    hbool_t           all_same;            /* Whether all the types map to the same value */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -126,62 +117,62 @@ H5MF_init_merge_flags(H5F_t *f)
      *  can merge with the metadata or small 'raw' data aggregator
      */
     all_same = TRUE;
-    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
+    for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
         /* Check for any different type mappings */
-        if(f->shared->fs_type_map[type] != f->shared->fs_type_map[H5FD_MEM_DEFAULT]) {
+        if (f->shared->fs_type_map[type] != f->shared->fs_type_map[H5FD_MEM_DEFAULT]) {
             all_same = FALSE;
             break;
         } /* end if */
 
     /* Check for all allocation types mapping to the same free list type */
-    if(all_same) {
-        if(f->shared->fs_type_map[H5FD_MEM_DEFAULT] == H5FD_MEM_DEFAULT)
+    if (all_same) {
+        if (f->shared->fs_type_map[H5FD_MEM_DEFAULT] == H5FD_MEM_DEFAULT)
             mapping_type = H5MF_AGGR_MERGE_SEPARATE;
         else
             mapping_type = H5MF_AGGR_MERGE_TOGETHER;
     } /* end if */
     else {
         /* Check for raw data mapping into same list as metadata */
-        if(f->shared->fs_type_map[H5FD_MEM_DRAW] == f->shared->fs_type_map[H5FD_MEM_SUPER])
+        if (f->shared->fs_type_map[H5FD_MEM_DRAW] == f->shared->fs_type_map[H5FD_MEM_SUPER])
             mapping_type = H5MF_AGGR_MERGE_SEPARATE;
         else {
-            hbool_t all_metadata_same;              /* Whether all metadata go in same free list */
+            hbool_t all_metadata_same; /* Whether all metadata go in same free list */
 
             /* One or more allocation type don't map to the same free list type */
             /* Check if all the metadata allocation types map to the same type */
             all_metadata_same = TRUE;
-            for(type = H5FD_MEM_SUPER; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
+            for (type = H5FD_MEM_SUPER; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
                 /* Skip checking raw data free list mapping */
                 /* (global heap is treated as raw data) */
-                if(type != H5FD_MEM_DRAW && type != H5FD_MEM_GHEAP) {
+                if (type != H5FD_MEM_DRAW && type != H5FD_MEM_GHEAP) {
                     /* Check for any different type mappings */
-                    if(f->shared->fs_type_map[type] != f->shared->fs_type_map[H5FD_MEM_SUPER]) {
+                    if (f->shared->fs_type_map[type] != f->shared->fs_type_map[H5FD_MEM_SUPER]) {
                         all_metadata_same = FALSE;
                         break;
                     } /* end if */
-                } /* end if */
+                }     /* end if */
 
             /* Check for all metadata on same free list */
-            if(all_metadata_same)
+            if (all_metadata_same)
                 mapping_type = H5MF_AGGR_MERGE_DICHOTOMY;
             else
                 mapping_type = H5MF_AGGR_MERGE_SEPARATE;
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
     /* Based on mapping type, initialize merging flags for each free list type */
-    switch(mapping_type) {
+    switch (mapping_type) {
         case H5MF_AGGR_MERGE_SEPARATE:
             /* Don't merge any metadata together */
             HDmemset(f->shared->fs_aggr_merge, 0, sizeof(f->shared->fs_aggr_merge));
 
             /* Check if merging raw data should be allowed */
             /* (treat global heaps as raw data) */
-            if(H5FD_MEM_DRAW == f->shared->fs_type_map[H5FD_MEM_DRAW] ||
-                    H5FD_MEM_DEFAULT == f->shared->fs_type_map[H5FD_MEM_DRAW]) {
-                f->shared->fs_aggr_merge[H5FD_MEM_DRAW] = H5F_FS_MERGE_RAWDATA;
+            if (H5FD_MEM_DRAW == f->shared->fs_type_map[H5FD_MEM_DRAW] ||
+                H5FD_MEM_DEFAULT == f->shared->fs_type_map[H5FD_MEM_DRAW]) {
+                f->shared->fs_aggr_merge[H5FD_MEM_DRAW]  = H5F_FS_MERGE_RAWDATA;
                 f->shared->fs_aggr_merge[H5FD_MEM_GHEAP] = H5F_FS_MERGE_RAWDATA;
-	    } /* end if */
+            } /* end if */
             break;
 
         case H5MF_AGGR_MERGE_DICHOTOMY:
@@ -190,13 +181,14 @@ H5MF_init_merge_flags(H5F_t *f)
 
             /* Allow merging raw data allocations together */
             /* (treat global heaps as raw data) */
-            f->shared->fs_aggr_merge[H5FD_MEM_DRAW] = H5F_FS_MERGE_RAWDATA;
+            f->shared->fs_aggr_merge[H5FD_MEM_DRAW]  = H5F_FS_MERGE_RAWDATA;
             f->shared->fs_aggr_merge[H5FD_MEM_GHEAP] = H5F_FS_MERGE_RAWDATA;
             break;
 
         case H5MF_AGGR_MERGE_TOGETHER:
             /* Merge all allocation types together */
-            HDmemset(f->shared->fs_aggr_merge, (H5F_FS_MERGE_METADATA | H5F_FS_MERGE_RAWDATA), sizeof(f->shared->fs_aggr_merge));
+            HDmemset(f->shared->fs_aggr_merge, (H5F_FS_MERGE_METADATA | H5F_FS_MERGE_RAWDATA),
+                     sizeof(f->shared->fs_aggr_merge));
             break;
 
         default:
@@ -207,7 +199,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_init_merge_flags() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_alloc_open
  *
@@ -226,9 +217,9 @@ done:
 herr_t
 H5MF_alloc_open(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
 {
-    const H5FS_section_class_t *classes[] = { /* Free space section classes implemented for file */
-        H5MF_FSPACE_SECT_CLS_SIMPLE};
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5FS_section_class_t *classes[] = {/* Free space section classes implemented for file */
+                                             H5MF_FSPACE_SECT_CLS_SIMPLE};
+    herr_t                      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -242,19 +233,18 @@ H5MF_alloc_open(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
     HDassert(f->shared->fs_state[type] == H5F_FS_STATE_CLOSED);
 
     /* Open an existing free space structure for the file */
-    if(NULL == (f->shared->fs_man[type] = H5FS_open(f, dxpl_id, f->shared->fs_addr[type],
-	    NELMTS(classes), classes, f, f->shared->alignment, f->shared->threshold)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize free space info")
+    if (NULL == (f->shared->fs_man[type] = H5FS_open(f, dxpl_id, f->shared->fs_addr[type], NELMTS(classes),
+                                                     classes, f, f->shared->alignment, f->shared->threshold)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize free space info")
 
     /* Set the state for the free space manager to "open", if it is now */
-    if(f->shared->fs_man[type])
+    if (f->shared->fs_man[type])
         f->shared->fs_state[type] = H5F_FS_STATE_OPEN;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_alloc_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_alloc_create
  *
@@ -273,10 +263,10 @@ done:
 static herr_t
 H5MF_alloc_create(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
 {
-    const H5FS_section_class_t *classes[] = { /* Free space section classes implemented for file */
-        H5MF_FSPACE_SECT_CLS_SIMPLE};
-    herr_t ret_value = SUCCEED;         /* Return value */
-    H5FS_create_t fs_create; 		/* Free space creation parameters */
+    const H5FS_section_class_t *classes[] = {/* Free space section classes implemented for file */
+                                             H5MF_FSPACE_SECT_CLS_SIMPLE};
+    herr_t                      ret_value = SUCCEED; /* Return value */
+    H5FS_create_t               fs_create;           /* Free space creation parameters */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -290,26 +280,24 @@ H5MF_alloc_create(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
     HDassert(f->shared->fs_state[type] == H5F_FS_STATE_CLOSED);
 
     /* Set the free space creation parameters */
-    fs_create.client = H5FS_CLIENT_FILE_ID;
+    fs_create.client         = H5FS_CLIENT_FILE_ID;
     fs_create.shrink_percent = H5MF_FSPACE_SHRINK;
     fs_create.expand_percent = H5MF_FSPACE_EXPAND;
-    fs_create.max_sect_addr = 1 + H5VM_log2_gen((uint64_t)f->shared->maxaddr);
-    fs_create.max_sect_size = f->shared->maxaddr;
-
-    if(NULL == (f->shared->fs_man[type] = H5FS_create(f, dxpl_id, NULL,
-	    &fs_create, NELMTS(classes), classes, f, f->shared->alignment, f->shared->threshold)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize free space info")
+    fs_create.max_sect_addr  = 1 + H5VM_log2_gen((uint64_t)f->shared->maxaddr);
+    fs_create.max_sect_size  = f->shared->maxaddr;
 
+    if (NULL == (f->shared->fs_man[type] = H5FS_create(f, dxpl_id, NULL, &fs_create, NELMTS(classes), classes,
+                                                       f, f->shared->alignment, f->shared->threshold)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize free space info")
 
     /* Set the state for the free space manager to "open", if it is now */
-    if(f->shared->fs_man[type])
+    if (f->shared->fs_man[type])
         f->shared->fs_state[type] = H5F_FS_STATE_OPEN;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_alloc_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_alloc_start
  *
@@ -327,7 +315,7 @@ done:
 herr_t
 H5MF_alloc_start(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -339,14 +327,14 @@ H5MF_alloc_start(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
     HDassert(type != H5FD_MEM_NOLIST);
 
     /* Check if the free space manager exists already */
-    if(H5F_addr_defined(f->shared->fs_addr[type])) {
+    if (H5F_addr_defined(f->shared->fs_addr[type])) {
         /* Open existing free space manager */
-        if(H5MF_alloc_open(f, dxpl_id, type) < 0)
+        if (H5MF_alloc_open(f, dxpl_id, type) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTOPENOBJ, FAIL, "can't initialize file free space")
     } /* end if */
     else {
         /* Create new free space manager */
-        if(H5MF_alloc_create(f, dxpl_id, type) < 0)
+        if (H5MF_alloc_create(f, dxpl_id, type) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCREATE, FAIL, "can't initialize file free space")
     } /* end else */
 
@@ -354,7 +342,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_alloc_start() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_alloc_close
  *
@@ -370,7 +357,7 @@ done:
 static herr_t
 H5MF_alloc_close(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -384,16 +371,15 @@ H5MF_alloc_close(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
     HDassert(f->shared->fs_state[type] != H5F_FS_STATE_CLOSED);
 
     /* Close an existing free space structure for the file */
-    if(H5FS_close(f, dxpl_id, f->shared->fs_man[type]) < 0)
+    if (H5FS_close(f, dxpl_id, f->shared->fs_man[type]) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release free space info")
-    f->shared->fs_man[type] = NULL;
+    f->shared->fs_man[type]   = NULL;
     f->shared->fs_state[type] = H5F_FS_STATE_CLOSED;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_alloc_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_alloc
  *
@@ -414,12 +400,12 @@ done:
 haddr_t
 H5MF_alloc(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, hsize_t size)
 {
-    H5FD_mem_t  fs_type;                /* Free space type (mapped from allocation type) */
-    haddr_t	ret_value;              /* Return value */
+    H5FD_mem_t fs_type;   /* Free space type (mapped from allocation type) */
+    haddr_t    ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_type, size);
+    HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_type, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check arguments */
@@ -432,26 +418,27 @@ HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_typ
     fs_type = H5MF_ALLOC_TO_FS_TYPE(f, alloc_type);
 
     /* Check if we are using the free space manager for this file */
-    if(H5F_HAVE_FREE_SPACE_MANAGER(f)) {
+    if (H5F_HAVE_FREE_SPACE_MANAGER(f)) {
         /* Check if the free space manager for the file has been initialized */
-        if(!f->shared->fs_man[fs_type] && H5F_addr_defined(f->shared->fs_addr[fs_type]))
-            if(H5MF_alloc_open(f, dxpl_id, fs_type) < 0)
+        if (!f->shared->fs_man[fs_type] && H5F_addr_defined(f->shared->fs_addr[fs_type]))
+            if (H5MF_alloc_open(f, dxpl_id, fs_type) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTOPENOBJ, HADDR_UNDEF, "can't initialize file free space")
 
         /* Search for large enough space in the free space manager */
-        if(f->shared->fs_man[fs_type]) {
-            H5MF_free_section_t *node;      /* Free space section pointer */
-            htri_t node_found = FALSE;      /* Whether an existing free list node was found */
+        if (f->shared->fs_man[fs_type]) {
+            H5MF_free_section_t *node;               /* Free space section pointer */
+            htri_t               node_found = FALSE; /* Whether an existing free list node was found */
 
             /* Try to get a section from the free space manager */
-            if((node_found = H5FS_sect_find(f, dxpl_id, f->shared->fs_man[fs_type], size, (H5FS_section_info_t **)&node)) < 0)
+            if ((node_found = H5FS_sect_find(f, dxpl_id, f->shared->fs_man[fs_type], size,
+                                             (H5FS_section_info_t **)&node)) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "error locating free space in file")
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Check 1.5, node_found = %t\n", FUNC, node_found);
+            HDfprintf(stderr, "%s: Check 1.5, node_found = %t\n", FUNC, node_found);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
             /* Check for actually finding section */
-            if(node_found) {
+            if (node_found) {
                 /* Sanity check */
                 HDassert(node);
 
@@ -459,61 +446,64 @@ HDfprintf(stderr, "%s: Check 1.5, node_found = %t\n", FUNC, node_found);
                 ret_value = node->sect_info.addr;
 
                 /* Check for eliminating the section */
-                if(node->sect_info.size == size) {
+                if (node->sect_info.size == size) {
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Check 1.6, freeing node\n", FUNC);
+                    HDfprintf(stderr, "%s: Check 1.6, freeing node\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
                     /* Free section node */
-                    if(H5MF_sect_simple_free((H5FS_section_info_t *)node) < 0)
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, HADDR_UNDEF, "can't free simple section node")
+                    if (H5MF_sect_simple_free((H5FS_section_info_t *)node) < 0)
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, HADDR_UNDEF,
+                                    "can't free simple section node")
                 } /* end if */
                 else {
-                    H5MF_sect_ud_t udata;               /* User data for callback */
+                    H5MF_sect_ud_t udata; /* User data for callback */
 
                     /* Adjust information for section */
                     node->sect_info.addr += size;
                     node->sect_info.size -= size;
 
                     /* Construct user data for callbacks */
-                    udata.f = f;
-                    udata.dxpl_id = dxpl_id;
-                    udata.alloc_type = alloc_type;
-                    udata.allow_sect_absorb = TRUE;
-		    udata.allow_eoa_shrink_only = FALSE; 
+                    udata.f                     = f;
+                    udata.dxpl_id               = dxpl_id;
+                    udata.alloc_type            = alloc_type;
+                    udata.allow_sect_absorb     = TRUE;
+                    udata.allow_eoa_shrink_only = FALSE;
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Check 1.7, re-adding node, node->sect_info.size = %Hu\n", FUNC, node->sect_info.size);
+                    HDfprintf(stderr, "%s: Check 1.7, re-adding node, node->sect_info.size = %Hu\n", FUNC,
+                              node->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
                     /* Re-insert section node into file's free space */
-                    if(H5FS_sect_add(f, dxpl_id, f->shared->fs_man[fs_type], (H5FS_section_info_t *)node, H5FS_ADD_RETURNED_SPACE, &udata) < 0)
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINSERT, HADDR_UNDEF, "can't re-add section to file free space")
+                    if (H5FS_sect_add(f, dxpl_id, f->shared->fs_man[fs_type], (H5FS_section_info_t *)node,
+                                      H5FS_ADD_RETURNED_SPACE, &udata) < 0)
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINSERT, HADDR_UNDEF,
+                                    "can't re-add section to file free space")
                 } /* end else */
 
                 /* Leave now */
                 HGOTO_DONE(ret_value)
             } /* end if */
-        } /* end if */
+        }     /* end if */
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Check 2.0\n", FUNC);
+        HDfprintf(stderr, "%s: Check 2.0\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
-    } /* end if */
+    }  /* end if */
 
     /* Allocate from the metadata aggregator (or the VFD) */
-    if(HADDR_UNDEF == (ret_value = H5MF_aggr_vfd_alloc(f, alloc_type, dxpl_id, size)))
-	HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "allocation failed from aggr/vfd")
+    if (HADDR_UNDEF == (ret_value = H5MF_aggr_vfd_alloc(f, alloc_type, dxpl_id, size)))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "allocation failed from aggr/vfd")
 
 done:
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Leaving: ret_value = %a, size = %Hu\n", FUNC, ret_value, size);
+    HDfprintf(stderr, "%s: Leaving: ret_value = %a, size = %Hu\n", FUNC, ret_value, size);
 #endif /* H5MF_ALLOC_DEBUG */
 #ifdef H5MF_ALLOC_DEBUG_DUMP
-H5MF_sects_dump(f, dxpl_id, stderr);
+    H5MF_sects_dump(f, dxpl_id, stderr);
 #endif /* H5MF_ALLOC_DEBUG_DUMP */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_alloc_tmp
  *
@@ -541,12 +531,12 @@ H5MF_sects_dump(f, dxpl_id, stderr);
 haddr_t
 H5MF_alloc_tmp(H5F_t *f, hsize_t size)
 {
-    haddr_t eoa;                /* End of allocated space in the file */
-    haddr_t ret_value;          /* Return value */
+    haddr_t eoa;       /* End of allocated space in the file */
+    haddr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: size = %Hu\n", FUNC, size);
+    HDfprintf(stderr, "%s: size = %Hu\n", FUNC, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
@@ -556,15 +546,15 @@ HDfprintf(stderr, "%s: size = %Hu\n", FUNC, size);
     HDassert(size > 0);
 
     /* Retrieve the 'eoa' for the file */
-    if(HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, HADDR_UNDEF, "driver get_eoa request failed")
+    if (HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, HADDR_UNDEF, "driver get_eoa request failed")
 
     /* Compute value to return */
     ret_value = f->shared->tmp_addr - size;
 
     /* Check for overlap into the actual allocated space in the file */
-    if(H5F_addr_le(ret_value, eoa))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, HADDR_UNDEF, "driver get_eoa request failed")
+    if (H5F_addr_le(ret_value, eoa))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, HADDR_UNDEF, "driver get_eoa request failed")
 
     /* Adjust temporary address allocator in the file */
     f->shared->tmp_addr = ret_value;
@@ -573,7 +563,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_alloc_tmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_xfree
  *
@@ -589,81 +578,82 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr,
-    hsize_t size)
+H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr, hsize_t size)
 {
-    H5F_io_info_t fio_info;             /* I/O info for operation */
-    H5MF_free_section_t *node = NULL;   /* Free space section pointer */
-    H5MF_sect_ud_t udata;               /* User data for callback */
-    H5FD_mem_t fs_type;                 /* Free space type (mapped from allocation type) */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5F_io_info_t        fio_info;            /* I/O info for operation */
+    H5MF_free_section_t *node = NULL;         /* Free space section pointer */
+    H5MF_sect_ud_t       udata;               /* User data for callback */
+    H5FD_mem_t           fs_type;             /* Free space type (mapped from allocation type) */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)alloc_type, addr, size);
+    HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)alloc_type,
+              addr, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check arguments */
     HDassert(f);
-    if(!H5F_addr_defined(addr) || 0 == size)
+    if (!H5F_addr_defined(addr) || 0 == size)
         HGOTO_DONE(SUCCEED);
-    HDassert(addr != 0);        /* Can't deallocate the superblock :-) */
+    HDassert(addr != 0); /* Can't deallocate the superblock :-) */
 
     /* Check for attempting to free space that's a 'temporary' file address */
-    if(H5F_addr_le(f->shared->tmp_addr, addr))
+    if (H5F_addr_le(f->shared->tmp_addr, addr))
         HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, FAIL, "attempting to free temporary file space")
 
     /* Set up I/O info for operation */
     fio_info.f = f;
-    if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+    if (NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Check if the space to free intersects with the file's metadata accumulator */
-    if(H5F__accum_free(&fio_info, alloc_type, addr, size) < 0)
-        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "can't check free space intersection w/metadata accumulator")
+    if (H5F__accum_free(&fio_info, alloc_type, addr, size) < 0)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL,
+                    "can't check free space intersection w/metadata accumulator")
 
     /* Get free space type from allocation type */
     fs_type = H5MF_ALLOC_TO_FS_TYPE(f, alloc_type);
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: fs_type = %u\n", FUNC, (unsigned)fs_type);
+    HDfprintf(stderr, "%s: fs_type = %u\n", FUNC, (unsigned)fs_type);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     /* Check if the free space manager for the file has been initialized */
-    if(!f->shared->fs_man[fs_type]) {
+    if (!f->shared->fs_man[fs_type]) {
         /* If there's no free space manager for objects of this type,
          *  see if we can avoid creating one by checking if the freed
          *  space is at the end of the file
          */
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: f->shared->fs_addr[%u] = %a\n", FUNC, (unsigned)fs_type, f->shared->fs_addr[fs_type]);
+        HDfprintf(stderr, "%s: f->shared->fs_addr[%u] = %a\n", FUNC, (unsigned)fs_type,
+                  f->shared->fs_addr[fs_type]);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
-        if(!H5F_addr_defined(f->shared->fs_addr[fs_type])) {
-            htri_t status;          /* "can absorb" status for section into */
+        if (!H5F_addr_defined(f->shared->fs_addr[fs_type])) {
+            htri_t status; /* "can absorb" status for section into */
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Trying to avoid starting up free space manager\n", FUNC);
+            HDfprintf(stderr, "%s: Trying to avoid starting up free space manager\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
             /* Try to shrink the file or absorb the block into a block aggregator */
-            if((status = H5MF_try_shrink(f, alloc_type, dxpl_id, addr, size)) < 0)
+            if ((status = H5MF_try_shrink(f, alloc_type, dxpl_id, addr, size)) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't check for absorbing block")
-            else if(status > 0)
+            else if (status > 0)
                 /* Indicate success */
                 HGOTO_DONE(SUCCEED)
         } /* end if */
 
         /* If we are deleting the free space manager, leave now, to avoid
          *  [re-]starting it.
-	 * or if file space strategy type is not using a free space manager
-	 *   (H5F_FILE_SPACE_AGGR_VFD or H5F_FILE_SPACE_VFD), drop free space
+         * or if file space strategy type is not using a free space manager
+         *   (H5F_FILE_SPACE_AGGR_VFD or H5F_FILE_SPACE_VFD), drop free space
          *   section on the floor.
          *
          * Note: this drops the space to free on the floor...
          *
          */
-        if(f->shared->fs_state[fs_type] == H5F_FS_STATE_DELETING ||
-	        !H5F_HAVE_FREE_SPACE_MANAGER(f)) {
+        if (f->shared->fs_state[fs_type] == H5F_FS_STATE_DELETING || !H5F_HAVE_FREE_SPACE_MANAGER(f)) {
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: dropping addr = %a, size = %Hu, on the floor!\n", FUNC, addr, size);
+            HDfprintf(stderr, "%s: dropping addr = %a, size = %Hu, on the floor!\n", FUNC, addr, size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
             HGOTO_DONE(SUCCEED)
         } /* end if */
@@ -672,49 +662,49 @@ HDfprintf(stderr, "%s: dropping addr = %a, size = %Hu, on the floor!\n", FUNC, a
          *  space isn't at the end of the file, so start up (or create)
          *  the file space manager
          */
-        if(H5MF_alloc_start(f, dxpl_id, fs_type) < 0)
+        if (H5MF_alloc_start(f, dxpl_id, fs_type) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize file free space")
     } /* end if */
     HDassert(f->shared->fs_man[fs_type]);
 
     /* Create free space section for block */
-    if(NULL == (node = H5MF_sect_simple_new(addr, size)))
+    if (NULL == (node = H5MF_sect_simple_new(addr, size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize free space section")
 
     /* Construct user data for callbacks */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.alloc_type = alloc_type;
-    udata.allow_sect_absorb = TRUE;
-    udata.allow_eoa_shrink_only = FALSE; 
+    udata.f                     = f;
+    udata.dxpl_id               = dxpl_id;
+    udata.alloc_type            = alloc_type;
+    udata.allow_sect_absorb     = TRUE;
+    udata.allow_eoa_shrink_only = FALSE;
 
     /* Add to the free space for the file */
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Before H5FS_sect_add()\n", FUNC);
+    HDfprintf(stderr, "%s: Before H5FS_sect_add()\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
-    if(H5FS_sect_add(f, dxpl_id, f->shared->fs_man[fs_type], (H5FS_section_info_t *)node, H5FS_ADD_RETURNED_SPACE, &udata) < 0)
+    if (H5FS_sect_add(f, dxpl_id, f->shared->fs_man[fs_type], (H5FS_section_info_t *)node,
+                      H5FS_ADD_RETURNED_SPACE, &udata) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINSERT, FAIL, "can't add section to file free space")
     node = NULL;
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: After H5FS_sect_add()\n", FUNC);
+    HDfprintf(stderr, "%s: After H5FS_sect_add()\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
 done:
     /* Release section node, if allocated and not added to section list or merged */
-    if(node)
-        if(H5MF_sect_simple_free((H5FS_section_info_t *)node) < 0)
+    if (node)
+        if (H5MF_sect_simple_free((H5FS_section_info_t *)node) < 0)
             HDONE_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't free simple section node")
 
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
 #endif /* H5MF_ALLOC_DEBUG */
 #ifdef H5MF_ALLOC_DEBUG_DUMP
-H5MF_sects_dump(f, dxpl_id, stderr);
+    H5MF_sects_dump(f, dxpl_id, stderr);
 #endif /* H5MF_ALLOC_DEBUG_DUMP */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_xfree() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_try_extend
  *
@@ -730,16 +720,17 @@ H5MF_sects_dump(f, dxpl_id, stderr);
  *-------------------------------------------------------------------------
  */
 htri_t
-H5MF_try_extend(H5F_t *f, hid_t dxpl_id, H5FD_mem_t alloc_type, haddr_t addr,
-    hsize_t size, hsize_t extra_requested)
+H5MF_try_extend(H5F_t *f, hid_t dxpl_id, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size,
+                hsize_t extra_requested)
 {
-    haddr_t     end;            /* End of block to extend */
-    H5FD_mem_t  map_type;       /* Mapped type */
-    htri_t	ret_value;      /* Return value */
+    haddr_t    end;       /* End of block to extend */
+    H5FD_mem_t map_type;  /* Mapped type */
+    htri_t     ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Entering: alloc_type = %u, addr = %a, size = %Hu, extra_requested = %Hu\n", FUNC, (unsigned)alloc_type, addr, size, extra_requested);
+    HDfprintf(stderr, "%s: Entering: alloc_type = %u, addr = %a, size = %Hu, extra_requested = %Hu\n", FUNC,
+              (unsigned)alloc_type, addr, size, extra_requested);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* Sanity check */
@@ -753,45 +744,46 @@ HDfprintf(stderr, "%s: Entering: alloc_type = %u, addr = %a, size = %Hu, extra_r
     end = addr + size;
 
     /* Check if the block is exactly at the end of the file */
-    if((ret_value = H5FD_try_extend(f->shared->lf, map_type, f, end, extra_requested)) < 0)
+    if ((ret_value = H5FD_try_extend(f->shared->lf, map_type, f, end, extra_requested)) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL, "error extending file")
-    else if(ret_value == FALSE) {
-        H5F_blk_aggr_t *aggr;   /* Aggregator to use */
+    else if (ret_value == FALSE) {
+        H5F_blk_aggr_t *aggr; /* Aggregator to use */
 
         /* Check for test block able to extend aggregation block */
-        aggr = (map_type == H5FD_MEM_DRAW) ?  &(f->shared->sdata_aggr) : &(f->shared->meta_aggr);
-        if((ret_value = H5MF_aggr_try_extend(f, aggr, map_type, end, extra_requested)) < 0)
+        aggr = (map_type == H5FD_MEM_DRAW) ? &(f->shared->sdata_aggr) : &(f->shared->meta_aggr);
+        if ((ret_value = H5MF_aggr_try_extend(f, aggr, map_type, end, extra_requested)) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL, "error extending aggregation block")
-        else if(ret_value == FALSE) {
-            H5FD_mem_t  fs_type;                /* Free space type (mapped from allocation type) */
+        else if (ret_value == FALSE) {
+            H5FD_mem_t fs_type; /* Free space type (mapped from allocation type) */
 
             /* Get free space type from allocation type */
             fs_type = H5MF_ALLOC_TO_FS_TYPE(f, alloc_type);
 
             /* Check if the free space for the file has been initialized */
-            if(!f->shared->fs_man[fs_type] && H5F_addr_defined(f->shared->fs_addr[fs_type]))
-                if(H5MF_alloc_open(f, dxpl_id, fs_type) < 0)
+            if (!f->shared->fs_man[fs_type] && H5F_addr_defined(f->shared->fs_addr[fs_type]))
+                if (H5MF_alloc_open(f, dxpl_id, fs_type) < 0)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize file free space")
 
             /* Check for test block able to block in free space manager */
-            if(f->shared->fs_man[fs_type])
-                if((ret_value = H5FS_sect_try_extend(f, dxpl_id, f->shared->fs_man[fs_type], addr, size, extra_requested)) < 0)
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL, "error extending block in free space manager")
+            if (f->shared->fs_man[fs_type])
+                if ((ret_value = H5FS_sect_try_extend(f, dxpl_id, f->shared->fs_man[fs_type], addr, size,
+                                                      extra_requested)) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL,
+                                "error extending block in free space manager")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Leaving: ret_value = %t\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: Leaving: ret_value = %t\n", FUNC, ret_value);
 #endif /* H5MF_ALLOC_DEBUG */
 #ifdef H5MF_ALLOC_DEBUG_DUMP
-H5MF_sects_dump(f, dxpl_id, stderr);
+    H5MF_sects_dump(f, dxpl_id, stderr);
 #endif /* H5MF_ALLOC_DEBUG_DUMP */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_try_extend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_get_freespace
  *
@@ -813,17 +805,17 @@ H5MF_sects_dump(f, dxpl_id, stderr);
 herr_t
 H5MF_get_freespace(H5F_t *f, hid_t dxpl_id, hsize_t *tot_space, hsize_t *meta_size)
 {
-    haddr_t eoa;                /* End of allocated space in the file */
-    haddr_t ma_addr = HADDR_UNDEF;    /* Base "metadata aggregator" address */
-    hsize_t ma_size = 0;        /* Size of "metadata aggregator" */
-    haddr_t sda_addr = HADDR_UNDEF;    /* Base "small data aggregator" address */
-    hsize_t sda_size = 0;       /* Size of "small data aggregator" */
-    hsize_t tot_fs_size = 0;    /* Amount of all free space managed */
-    hsize_t tot_meta_size = 0;  /* Amount of metadata for free space managers */
-    H5FD_mem_t type;            /* Memory type for iteration */
-    hbool_t fs_started[H5FD_MEM_NTYPES]; /* Indicate whether the free-space manager has been started */
-    hbool_t eoa_shrank;		/* Whether an EOA shrink occurs */
-    herr_t ret_value = SUCCEED; /* Return value */
+    haddr_t    eoa;                         /* End of allocated space in the file */
+    haddr_t    ma_addr       = HADDR_UNDEF; /* Base "metadata aggregator" address */
+    hsize_t    ma_size       = 0;           /* Size of "metadata aggregator" */
+    haddr_t    sda_addr      = HADDR_UNDEF; /* Base "small data aggregator" address */
+    hsize_t    sda_size      = 0;           /* Size of "small data aggregator" */
+    hsize_t    tot_fs_size   = 0;           /* Amount of all free space managed */
+    hsize_t    tot_meta_size = 0;           /* Amount of metadata for free space managers */
+    H5FD_mem_t type;                        /* Memory type for iteration */
+    hbool_t    fs_started[H5FD_MEM_NTYPES]; /* Indicate whether the free-space manager has been started */
+    hbool_t    eoa_shrank;                  /* Whether an EOA shrink occurs */
+    herr_t     ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -833,101 +825,100 @@ H5MF_get_freespace(H5F_t *f, hid_t dxpl_id, hsize_t *tot_space, hsize_t *meta_si
     HDassert(f->shared->lf);
 
     /* Retrieve the 'eoa' for the file */
-    if(HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
+    if (HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
 
     /* Retrieve metadata aggregator info, if available */
-    if(H5MF_aggr_query(f, &(f->shared->meta_aggr), &ma_addr, &ma_size) < 0)
+    if (H5MF_aggr_query(f, &(f->shared->meta_aggr), &ma_addr, &ma_size) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query metadata aggregator stats")
 
     /* Retrieve 'small data' aggregator info, if available */
-    if(H5MF_aggr_query(f, &(f->shared->sdata_aggr), &sda_addr, &sda_size) < 0)
+    if (H5MF_aggr_query(f, &(f->shared->sdata_aggr), &sda_addr, &sda_size) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query small data aggregator stats")
 
     /* Iterate over all the free space types that have managers and get each free list's space */
-    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
+    for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
 
-	fs_started[type] = FALSE;
+        fs_started[type] = FALSE;
 
-	/* Check if the free space for the file has been initialized */
-        if(!f->shared->fs_man[type] && H5F_addr_defined(f->shared->fs_addr[type])) {
-            if(H5MF_alloc_open(f, dxpl_id, type) < 0)
+        /* Check if the free space for the file has been initialized */
+        if (!f->shared->fs_man[type] && H5F_addr_defined(f->shared->fs_addr[type])) {
+            if (H5MF_alloc_open(f, dxpl_id, type) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize file free space")
             HDassert(f->shared->fs_man[type]);
             fs_started[type] = TRUE;
         } /* end if */
 
-	/* Check if there's free space of this type */
-        if(f->shared->fs_man[type]) {
-            hsize_t type_fs_size = 0;    /* Amount of free space managed for each type */
-            hsize_t type_meta_size = 0;  /* Amount of free space metadata for each type */
+        /* Check if there's free space of this type */
+        if (f->shared->fs_man[type]) {
+            hsize_t type_fs_size   = 0; /* Amount of free space managed for each type */
+            hsize_t type_meta_size = 0; /* Amount of free space metadata for each type */
 
             /* Retrieve free space size from free space manager */
-            if(H5FS_sect_stats(f->shared->fs_man[type], &type_fs_size, NULL) < 0)
+            if (H5FS_sect_stats(f->shared->fs_man[type], &type_fs_size, NULL) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query free space stats")
-            if(H5FS_size(f, f->shared->fs_man[type], &type_meta_size) < 0)
+            if (H5FS_size(f, f->shared->fs_man[type], &type_meta_size) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query free space metadata stats")
 
             /* Increment total free space for types */
             tot_fs_size += type_fs_size;
             tot_meta_size += type_meta_size;
-	} /* end if */
-    } /* end for */
+        } /* end if */
+    }     /* end for */
 
     /* Iterate until no more EOA shrink occurs */
     do {
-	eoa_shrank = FALSE;
-
-	/* Check the last section of each free-space manager */
-	for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
-	    haddr_t sect_addr = HADDR_UNDEF;
-	    hsize_t sect_size = 0;
-
-	    if(f->shared->fs_man[type]) {
-		if(H5FS_sect_query_last_sect(f->shared->fs_man[type], &sect_addr, &sect_size) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query last section on merge list")
-
-		/* Deduct space from previous accumulation if the section is at EOA */
-		if(H5F_addr_eq(sect_addr + sect_size, eoa)) {
-		    eoa = sect_addr;
-		    eoa_shrank = TRUE;
-		    tot_fs_size -= sect_size;
-		} /* end if */
-	    } /* end if */
-	} /* end for */
-
-	/* Check the metadata and raw data aggregators */
-	if(ma_size > 0 && H5F_addr_eq(ma_addr + ma_size, eoa)) {
-	    eoa = ma_addr;
-	    eoa_shrank = TRUE;
-	    ma_size = 0;
-	} /* end if */
-	if(sda_size > 0 && H5F_addr_eq(sda_addr + sda_size, eoa)) {
-	    eoa = sda_addr;
-	    eoa_shrank = TRUE;
-	    sda_size = 0;
-	} /* end if */
-    } while(eoa_shrank);
+        eoa_shrank = FALSE;
+
+        /* Check the last section of each free-space manager */
+        for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
+            haddr_t sect_addr = HADDR_UNDEF;
+            hsize_t sect_size = 0;
+
+            if (f->shared->fs_man[type]) {
+                if (H5FS_sect_query_last_sect(f->shared->fs_man[type], &sect_addr, &sect_size) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query last section on merge list")
+
+                /* Deduct space from previous accumulation if the section is at EOA */
+                if (H5F_addr_eq(sect_addr + sect_size, eoa)) {
+                    eoa        = sect_addr;
+                    eoa_shrank = TRUE;
+                    tot_fs_size -= sect_size;
+                } /* end if */
+            }     /* end if */
+        }         /* end for */
+
+        /* Check the metadata and raw data aggregators */
+        if (ma_size > 0 && H5F_addr_eq(ma_addr + ma_size, eoa)) {
+            eoa        = ma_addr;
+            eoa_shrank = TRUE;
+            ma_size    = 0;
+        } /* end if */
+        if (sda_size > 0 && H5F_addr_eq(sda_addr + sda_size, eoa)) {
+            eoa        = sda_addr;
+            eoa_shrank = TRUE;
+            sda_size   = 0;
+        } /* end if */
+    } while (eoa_shrank);
 
     /* Close the free-space managers if they were opened earlier in this routine */
-    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
-	if(fs_started[type])
-            if(H5MF_alloc_close(f, dxpl_id, type) < 0)
+    for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
+        if (fs_started[type])
+            if (H5MF_alloc_close(f, dxpl_id, type) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't close file free space")
     } /* end for */
 
     /* Set the value(s) to return */
     /* (The metadata & small data aggregators count as free space now, since they aren't at EOA) */
-    if(tot_space)
-	*tot_space = tot_fs_size + ma_size + sda_size;
-    if(meta_size)
-	*meta_size = tot_meta_size;
+    if (tot_space)
+        *tot_space = tot_fs_size + ma_size + sda_size;
+    if (meta_size)
+        *meta_size = tot_meta_size;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_get_freespace() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_try_shrink
  *
@@ -943,16 +934,16 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5MF_try_shrink(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr,
-    hsize_t size)
+H5MF_try_shrink(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr, hsize_t size)
 {
-    H5MF_free_section_t *node = NULL;   /* Free space section pointer */
-    H5MF_sect_ud_t udata;               /* User data for callback */
-    htri_t ret_value;                   /* Return value */
+    H5MF_free_section_t *node = NULL; /* Free space section pointer */
+    H5MF_sect_ud_t       udata;       /* User data for callback */
+    htri_t               ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)alloc_type, addr, size);
+    HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)alloc_type,
+              addr, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check arguments */
@@ -963,37 +954,36 @@ HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %a, size = %Hu\n", FUN
     HDassert(size > 0);
 
     /* Create free space section for block */
-    if(NULL == (node = H5MF_sect_simple_new(addr, size)))
+    if (NULL == (node = H5MF_sect_simple_new(addr, size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize free space section")
 
     /* Construct user data for callbacks */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.alloc_type = alloc_type;
-    udata.allow_sect_absorb = FALSE;    /* Force section to be absorbed into aggregator */
-    udata.allow_eoa_shrink_only = FALSE; 
+    udata.f                     = f;
+    udata.dxpl_id               = dxpl_id;
+    udata.alloc_type            = alloc_type;
+    udata.allow_sect_absorb     = FALSE; /* Force section to be absorbed into aggregator */
+    udata.allow_eoa_shrink_only = FALSE;
 
     /* Call the "can shrink" callback for the section */
-    if((ret_value = H5MF_sect_simple_can_shrink((const H5FS_section_info_t *)node, &udata)) < 0)
+    if ((ret_value = H5MF_sect_simple_can_shrink((const H5FS_section_info_t *)node, &udata)) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTMERGE, FAIL, "can't check if section can shrink container")
-    else if(ret_value > 0) {
+    else if (ret_value > 0) {
         /* Shrink or absorb the section */
-        if(H5MF_sect_simple_shrink((H5FS_section_info_t **)&node, &udata) < 0)
+        if (H5MF_sect_simple_shrink((H5FS_section_info_t **)&node, &udata) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't shrink container")
     } /* end if */
 
 done:
     /* Free section node allocated */
-    if(node && H5MF_sect_simple_free((H5FS_section_info_t *)node) < 0)
+    if (node && H5MF_sect_simple_free((H5FS_section_info_t *)node) < 0)
         HDONE_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't free simple section node")
 
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
 #endif /* H5MF_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_try_shrink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_close_shrink_eoa
  *
@@ -1009,11 +999,11 @@ HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
 static herr_t
 H5MF_close_shrink_eoa(H5F_t *f, hid_t dxpl_id)
 {
-    H5FD_mem_t type;            /* Memory type for iteration */
-    hbool_t eoa_shrank;		/* Whether an EOA shrink occurs */
-    htri_t status;		/* Status value */
-    H5MF_sect_ud_t udata;	/* User data for callback */
-    herr_t ret_value = SUCCEED;	/* Return value */
+    H5FD_mem_t     type;                /* Memory type for iteration */
+    hbool_t        eoa_shrank;          /* Whether an EOA shrink occurs */
+    htri_t         status;              /* Status value */
+    H5MF_sect_ud_t udata;               /* User data for callback */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1022,38 +1012,37 @@ H5MF_close_shrink_eoa(H5F_t *f, hid_t dxpl_id)
     HDassert(f->shared);
 
     /* Construct user data for callbacks */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-    udata.allow_sect_absorb = FALSE;    
-    udata.allow_eoa_shrink_only = TRUE; 
+    udata.f                     = f;
+    udata.dxpl_id               = dxpl_id;
+    udata.allow_sect_absorb     = FALSE;
+    udata.allow_eoa_shrink_only = TRUE;
 
     /* Iterate until no more EOA shrinking occurs */
     do {
-	eoa_shrank = FALSE;
-
-	/* Check the last section of each free-space manager */
-	for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
-	    if(f->shared->fs_man[type]) {
-		udata.alloc_type = type;
-		if((status = H5FS_sect_try_shrink_eoa(f, dxpl_id, f->shared->fs_man[type], &udata)) < 0)
-		    HGOTO_ERROR(H5E_FSPACE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa")
-		else if(status > 0)
-		    eoa_shrank = TRUE;
-	    } /* end if */
-	} /* end for */
-
-	/* check the two aggregators */
-	if((status = H5MF_aggrs_try_shrink_eoa(f, dxpl_id)) < 0)
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa")
-	else if(status > 0)
-	    eoa_shrank = TRUE;
-    } while(eoa_shrank);
+        eoa_shrank = FALSE;
+
+        /* Check the last section of each free-space manager */
+        for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
+            if (f->shared->fs_man[type]) {
+                udata.alloc_type = type;
+                if ((status = H5FS_sect_try_shrink_eoa(f, dxpl_id, f->shared->fs_man[type], &udata)) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa")
+                else if (status > 0)
+                    eoa_shrank = TRUE;
+            } /* end if */
+        }     /* end for */
+
+        /* check the two aggregators */
+        if ((status = H5MF_aggrs_try_shrink_eoa(f, dxpl_id)) < 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa")
+        else if (status > 0)
+            eoa_shrank = TRUE;
+    } while (eoa_shrank);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_close_shrink_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_close
  *
@@ -1075,12 +1064,12 @@ done:
 herr_t
 H5MF_close(H5F_t *f, hid_t dxpl_id)
 {
-    H5FD_mem_t type;                    /* Memory type for iteration */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FD_mem_t type;                /* Memory type for iteration */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Entering\n", FUNC);
+    HDfprintf(stderr, "%s: Entering\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
@@ -1090,40 +1079,42 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
 
     /* Free the space in aggregators */
     /* (for space not at EOF, it may be put into free space managers) */
-    if(H5MF_free_aggrs(f, dxpl_id) < 0)
+    if (H5MF_free_aggrs(f, dxpl_id) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "can't free aggregators")
 
     /* Trying shrinking the EOA for the file */
-    if(H5MF_close_shrink_eoa(f, dxpl_id) < 0)
+    if (H5MF_close_shrink_eoa(f, dxpl_id) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't shrink eoa")
 
     /* Iterate over all the free space types that have managers and get each free list's space */
-    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
+    for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Check 1.0 - f->shared->fs_man[%u] = %p, f->shared->fs_addr[%u] = %a\n", FUNC, (unsigned)type, f->shared->fs_man[type], (unsigned)type, f->shared->fs_addr[type]);
+        HDfprintf(stderr, "%s: Check 1.0 - f->shared->fs_man[%u] = %p, f->shared->fs_addr[%u] = %a\n", FUNC,
+                  (unsigned)type, f->shared->fs_man[type], (unsigned)type, f->shared->fs_addr[type]);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
         /* If the free space manager for this type is open, close it */
-        if(f->shared->fs_man[type]) {
+        if (f->shared->fs_man[type]) {
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Before closing free space manager\n", FUNC);
+            HDfprintf(stderr, "%s: Before closing free space manager\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
-            if(H5FS_close(f, dxpl_id, f->shared->fs_man[type]) < 0)
+            if (H5FS_close(f, dxpl_id, f->shared->fs_man[type]) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't release free space info")
-            f->shared->fs_man[type] = NULL;
+            f->shared->fs_man[type]   = NULL;
             f->shared->fs_state[type] = H5F_FS_STATE_CLOSED;
         } /* end if */
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Check 2.0 - f->shared->fs_man[%u] = %p, f->shared->fs_addr[%u] = %a\n", FUNC, (unsigned)type, f->shared->fs_man[type], (unsigned)type, f->shared->fs_addr[type]);
+        HDfprintf(stderr, "%s: Check 2.0 - f->shared->fs_man[%u] = %p, f->shared->fs_addr[%u] = %a\n", FUNC,
+                  (unsigned)type, f->shared->fs_man[type], (unsigned)type, f->shared->fs_addr[type]);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
         /* If there is free space manager info for this type, delete it */
         /* (XXX: Make this optional when free space for a file can be persistent) */
-        if(H5F_addr_defined(f->shared->fs_addr[type])) {
-            haddr_t tmp_fs_addr;            /* Temporary holder for free space manager address */
+        if (H5F_addr_defined(f->shared->fs_addr[type])) {
+            haddr_t tmp_fs_addr; /* Temporary holder for free space manager address */
 
             /* Put address into temporary variable and reset it */
             /* (Avoids loopback in file space freeing routine) */
-            tmp_fs_addr = f->shared->fs_addr[type];
+            tmp_fs_addr              = f->shared->fs_addr[type];
             f->shared->fs_addr[type] = HADDR_UNDEF;
 
             /* Shift to "deleting" state, to make certain we don't track any
@@ -1132,11 +1123,11 @@ HDfprintf(stderr, "%s: Check 2.0 - f->shared->fs_man[%u] = %p, f->shared->fs_add
             f->shared->fs_state[type] = H5F_FS_STATE_DELETING;
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: Before deleting free space manager\n", FUNC);
-#endif /* H5MF_ALLOC_DEBUG_MORE */
+            HDfprintf(stderr, "%s: Before deleting free space manager\n", FUNC);
+#endif      /* H5MF_ALLOC_DEBUG_MORE */
             /* Delete free space manager for this type */
-	    if(H5FS_delete(f, dxpl_id, tmp_fs_addr) < 0)
-		HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't delete free space manager")
+            if (H5FS_delete(f, dxpl_id, tmp_fs_addr) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't delete free space manager")
 
             /* Shift [back] to closed state */
             HDassert(f->shared->fs_state[type] == H5F_FS_STATE_DELETING);
@@ -1145,22 +1136,21 @@ HDfprintf(stderr, "%s: Before deleting free space manager\n", FUNC);
             /* Sanity check that the free space manager for this type wasn't started up again */
             HDassert(!H5F_addr_defined(f->shared->fs_addr[type]));
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Free the space in aggregators (again) */
     /* (in case any free space information re-started them) */
-    if(H5MF_free_aggrs(f, dxpl_id) < 0)
+    if (H5MF_free_aggrs(f, dxpl_id) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "can't free aggregators")
 
     /* Trying shrinking the EOA for the file */
     /* (in case any free space is now at the EOA) */
-    if(H5MF_close_shrink_eoa(f, dxpl_id) < 0)
+    if (H5MF_close_shrink_eoa(f, dxpl_id) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't shrink eoa")
 
 done:
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Leaving\n", FUNC);
+    HDfprintf(stderr, "%s: Leaving\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_close() */
-
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index 221b6d1..b3a9d88 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -23,58 +23,47 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-#define H5MF_PACKAGE		/*suppress error about including H5MFpkg  */
-
+#define H5F_PACKAGE  /*suppress error about including H5Fpkg	  */
+#define H5MF_PACKAGE /*suppress error about including H5MFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"		/* File access				*/
-#include "H5MFpkg.h"		/* File memory management		*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fpkg.h"     /* File access				*/
+#include "H5MFpkg.h"    /* File memory management		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 #define EXTEND_THRESHOLD 0.10F
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5MF_aggr_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type,
-    H5F_blk_aggr_t *aggr);
-
+static herr_t H5MF_aggr_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, H5F_blk_aggr_t *aggr);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_vfd_alloc
  *
@@ -95,11 +84,11 @@ static herr_t H5MF_aggr_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type,
 haddr_t
 H5MF_aggr_vfd_alloc(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, hsize_t size)
 {
-    haddr_t	ret_value;              /* Return value */
+    haddr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_type, size);
+    HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_type, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check arguments */
@@ -109,14 +98,16 @@ HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_typ
     HDassert(size > 0);
 
     /* Couldn't find anything from the free space manager, go allocate some */
-    if(alloc_type != H5FD_MEM_DRAW && alloc_type != H5FD_MEM_GHEAP) {
+    if (alloc_type != H5FD_MEM_DRAW && alloc_type != H5FD_MEM_GHEAP) {
         /* Handle metadata differently from "raw" data */
-        if(HADDR_UNDEF == (ret_value = H5MF_aggr_alloc(f, dxpl_id, &(f->shared->meta_aggr), &(f->shared->sdata_aggr), alloc_type, size)))
+        if (HADDR_UNDEF == (ret_value = H5MF_aggr_alloc(f, dxpl_id, &(f->shared->meta_aggr),
+                                                        &(f->shared->sdata_aggr), alloc_type, size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate metadata")
     } /* end if */
     else {
         /* Allocate "raw" data: H5FD_MEM_DRAW and H5FD_MEM_GHEAP */
-        if(HADDR_UNDEF == (ret_value = H5MF_aggr_alloc(f, dxpl_id, &(f->shared->sdata_aggr), &(f->shared->meta_aggr), H5FD_MEM_DRAW, size)))
+        if (HADDR_UNDEF == (ret_value = H5MF_aggr_alloc(f, dxpl_id, &(f->shared->sdata_aggr),
+                                                        &(f->shared->meta_aggr), H5FD_MEM_DRAW, size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate raw data")
     } /* end else */
 
@@ -125,16 +116,15 @@ HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_typ
 
 done:
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Leaving: ret_value = %a, size = %Hu\n", FUNC, ret_value, size);
+    HDfprintf(stderr, "%s: Leaving: ret_value = %a, size = %Hu\n", FUNC, ret_value, size);
 #endif /* H5MF_ALLOC_DEBUG */
 #ifdef H5MF_ALLOC_DEBUG_DUMP
-H5MF_sects_dump(f, dxpl_id, stderr);
+    H5MF_sects_dump(f, dxpl_id, stderr);
 #endif /* H5MF_ALLOC_DEBUG_DUMP */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_aggr_vfd_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_alloc
  *
@@ -150,31 +140,33 @@ H5MF_sects_dump(f, dxpl_id, stderr);
  *-------------------------------------------------------------------------
  */
 haddr_t
-H5MF_aggr_alloc(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr,
-    H5F_blk_aggr_t *other_aggr, H5FD_mem_t type, hsize_t size)
+H5MF_aggr_alloc(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5FD_mem_t type,
+                hsize_t size)
 {
-    haddr_t	eoa_frag_addr = HADDR_UNDEF;    /* Address of fragment at EOA */
-    hsize_t	eoa_frag_size = 0;      /* Size of fragment at EOA */
-    haddr_t	eoa = HADDR_UNDEF;      /* Initial EOA for the file */
-    haddr_t 	ret_value;              /* Return value */
+    haddr_t eoa_frag_addr = HADDR_UNDEF; /* Address of fragment at EOA */
+    hsize_t eoa_frag_size = 0;           /* Size of fragment at EOA */
+    haddr_t eoa           = HADDR_UNDEF; /* Initial EOA for the file */
+    haddr_t ret_value;                   /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
+    HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
 #endif /* H5MF_AGGR_DEBUG */
 
     /* check args */
     HDassert(f);
     HDassert(aggr);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
     HDassert(other_aggr);
-    HDassert(other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
     HDassert(other_aggr->feature_flag != aggr->feature_flag);
     HDassert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
     HDassert(size > 0);
 
     /* Get the EOA for the file */
-    if(HADDR_UNDEF == (eoa = H5F_get_eoa(f, type)))
+    if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, type)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, HADDR_UNDEF, "Unable to get eoa")
 
     /*
@@ -182,125 +174,151 @@ HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
      * space and sub-allocate out of that, if possible. Otherwise just allocate
      * through H5FD_alloc()
      */
-    if(f->shared->feature_flags & aggr->feature_flag) {
-        haddr_t	aggr_frag_addr = HADDR_UNDEF;   /* Address of aggregrator fragment */
-        hsize_t	aggr_frag_size = 0;             /* Size of aggregator fragment */
-        hsize_t alignment;                      /* Alignment of this section */
-        hsize_t aggr_mis_align = 0;             /* Mis-alignment of aggregator */
-        H5FD_mem_t alloc_type, other_alloc_type;/* Current aggregator & 'other' aggregator types */
+    if (f->shared->feature_flags & aggr->feature_flag) {
+        haddr_t    aggr_frag_addr = HADDR_UNDEF; /* Address of aggregrator fragment */
+        hsize_t    aggr_frag_size = 0;           /* Size of aggregator fragment */
+        hsize_t    alignment;                    /* Alignment of this section */
+        hsize_t    aggr_mis_align = 0;           /* Mis-alignment of aggregator */
+        H5FD_mem_t alloc_type, other_alloc_type; /* Current aggregator & 'other' aggregator types */
 
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: aggr = {%a, %Hu, %Hu}\n", FUNC, aggr->addr, aggr->tot_size, aggr->size);
+        HDfprintf(stderr, "%s: aggr = {%a, %Hu, %Hu}\n", FUNC, aggr->addr, aggr->tot_size, aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
 
         /* Turn off alignment if allocation < threshold */
-	alignment = f->shared->alignment;
-	if(!((alignment > 1) && (size >= f->shared->threshold)))
-	    alignment = 0; /* no alignment */
+        alignment = f->shared->alignment;
+        if (!((alignment > 1) && (size >= f->shared->threshold)))
+            alignment = 0; /* no alignment */
 
         /* Generate fragment if aggregator is mis-aligned */
-	if(alignment && aggr->addr > 0 && (aggr_mis_align = (aggr->addr + H5FD_get_base_addr(f->shared->lf)) % alignment)) {
-	    aggr_frag_addr = aggr->addr;
-	    aggr_frag_size = alignment - aggr_mis_align;
-	} /* end if */
+        if (alignment && aggr->addr > 0 &&
+            (aggr_mis_align = (aggr->addr + H5FD_get_base_addr(f->shared->lf)) % alignment)) {
+            aggr_frag_addr = aggr->addr;
+            aggr_frag_size = alignment - aggr_mis_align;
+        } /* end if */
 
-	alloc_type = aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW;
-	other_alloc_type = other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW;
+        alloc_type = aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW;
+        other_alloc_type =
+            other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW;
 
         /* Check if the space requested is larger than the space left in the block */
-        if((size + aggr_frag_size) > aggr->size) {
-            htri_t  	was_extended = FALSE;   /* Whether the file was extended */
+        if ((size + aggr_frag_size) > aggr->size) {
+            htri_t was_extended = FALSE; /* Whether the file was extended */
 
             /* Check if the block asked for is too large for 'normal' aggregator block */
-            if(size >= aggr->alloc_size) {
-		hsize_t ext_size = size + aggr_frag_size;
+            if (size >= aggr->alloc_size) {
+                hsize_t ext_size = size + aggr_frag_size;
 
                 /* Check for overlapping into file's temporary allocation space */
-                if(H5F_addr_gt((aggr->addr + aggr->size + ext_size), f->shared->tmp_addr))
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF, "'normal' file space allocation request will overlap into 'temporary' file space")
-
-		if ((aggr->addr > 0) && (was_extended = H5FD_try_extend(f->shared->lf, alloc_type, f, aggr->addr + aggr->size, ext_size)) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't extending space")
-		else if (was_extended) {
-		    /* aggr->size is unchanged */
-		    ret_value = aggr->addr + aggr_frag_size;
-		    aggr->addr += ext_size;
-		    aggr->tot_size += ext_size;
-		} else {
+                if (H5F_addr_gt((aggr->addr + aggr->size + ext_size), f->shared->tmp_addr))
+                    HGOTO_ERROR(
+                        H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF,
+                        "'normal' file space allocation request will overlap into 'temporary' file space")
+
+                if ((aggr->addr > 0) &&
+                    (was_extended = H5FD_try_extend(f->shared->lf, alloc_type, f, aggr->addr + aggr->size,
+                                                    ext_size)) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't extending space")
+                else if (was_extended) {
+                    /* aggr->size is unchanged */
+                    ret_value = aggr->addr + aggr_frag_size;
+                    aggr->addr += ext_size;
+                    aggr->tot_size += ext_size;
+                }
+                else {
                     /* Check for overlapping into file's temporary allocation space */
-                    if(H5F_addr_gt((eoa + size), f->shared->tmp_addr))
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF, "'normal' file space allocation request will overlap into 'temporary' file space")
+                    if (H5F_addr_gt((eoa + size), f->shared->tmp_addr))
+                        HGOTO_ERROR(
+                            H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF,
+                            "'normal' file space allocation request will overlap into 'temporary' file space")
 
                     /* Release "other" aggregator, if it exists, is at the end of the allocated space,
                      * has allocated more than one block and the unallocated space is greater than its
                      * allocation block size.
                      */
-		    if ((other_aggr->size > 0) && (H5F_addr_eq((other_aggr->addr + other_aggr->size), eoa)) &&
-			(other_aggr->tot_size > other_aggr->size) && ((other_aggr->tot_size - other_aggr->size) >= other_aggr->alloc_size)) {
-                            if(H5MF_aggr_free(f, dxpl_id, other_alloc_type, other_aggr) < 0)
-                                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation block")
-		    } /* end if */
+                    if ((other_aggr->size > 0) && (H5F_addr_eq((other_aggr->addr + other_aggr->size), eoa)) &&
+                        (other_aggr->tot_size > other_aggr->size) &&
+                        ((other_aggr->tot_size - other_aggr->size) >= other_aggr->alloc_size)) {
+                        if (H5MF_aggr_free(f, dxpl_id, other_alloc_type, other_aggr) < 0)
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF,
+                                        "can't free aggregation block")
+                    } /* end if */
 
                     /* Allocate space from the VFD (i.e. at the end of the file) */
-		    if(HADDR_UNDEF == (ret_value = H5FD_alloc(f->shared->lf, dxpl_id, alloc_type, f, size, &eoa_frag_addr, &eoa_frag_size)))
-			HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate aggregation block")
+                    if (HADDR_UNDEF == (ret_value = H5FD_alloc(f->shared->lf, dxpl_id, alloc_type, f, size,
+                                                               &eoa_frag_addr, &eoa_frag_size)))
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF,
+                                    "can't allocate aggregation block")
                 } /* end else */
-            } /* end if */
-	    else {
-		hsize_t ext_size = aggr->alloc_size;
+            }     /* end if */
+            else {
+                hsize_t ext_size = aggr->alloc_size;
 
                 /* Allocate another block */
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: Allocating block\n", FUNC);
+                HDfprintf(stderr, "%s: Allocating block\n", FUNC);
 #endif /* H5MF_AGGR_DEBUG */
 
-		if(aggr_frag_size > (ext_size - size))
-		    ext_size += (aggr_frag_size - (ext_size - size));
+                if (aggr_frag_size > (ext_size - size))
+                    ext_size += (aggr_frag_size - (ext_size - size));
 
                 /* Check for overlapping into file's temporary allocation space */
-                if(H5F_addr_gt((aggr->addr + aggr->size + ext_size), f->shared->tmp_addr))
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF, "'normal' file space allocation request will overlap into 'temporary' file space")
-
-		if((aggr->addr > 0) && (was_extended = H5FD_try_extend(f->shared->lf, alloc_type, f, aggr->addr + aggr->size, ext_size)) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't extending space")
-		else if (was_extended) {
-		    aggr->addr += aggr_frag_size;
-		    aggr->size += (ext_size - aggr_frag_size);
-		    aggr->tot_size += ext_size;
-		} else {
-                    haddr_t new_space;          /* Address of new space allocated */
+                if (H5F_addr_gt((aggr->addr + aggr->size + ext_size), f->shared->tmp_addr))
+                    HGOTO_ERROR(
+                        H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF,
+                        "'normal' file space allocation request will overlap into 'temporary' file space")
+
+                if ((aggr->addr > 0) &&
+                    (was_extended = H5FD_try_extend(f->shared->lf, alloc_type, f, aggr->addr + aggr->size,
+                                                    ext_size)) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't extending space")
+                else if (was_extended) {
+                    aggr->addr += aggr_frag_size;
+                    aggr->size += (ext_size - aggr_frag_size);
+                    aggr->tot_size += ext_size;
+                }
+                else {
+                    haddr_t new_space; /* Address of new space allocated */
 
                     /* Check for overlapping into file's temporary allocation space */
-                    if(H5F_addr_gt((eoa + aggr->alloc_size), f->shared->tmp_addr))
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF, "'normal' file space allocation request will overlap into 'temporary' file space")
+                    if (H5F_addr_gt((eoa + aggr->alloc_size), f->shared->tmp_addr))
+                        HGOTO_ERROR(
+                            H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF,
+                            "'normal' file space allocation request will overlap into 'temporary' file space")
 
                     /* Release "other" aggregator, if it exists, is at the end of the allocated space,
                      * has allocated more than one block and the unallocated space is greater than its
                      * allocation block size.
                      */
-		    if((other_aggr->size > 0) && (H5F_addr_eq((other_aggr->addr + other_aggr->size), eoa)) &&
-			(other_aggr->tot_size > other_aggr->size) && ((other_aggr->tot_size - other_aggr->size) >= other_aggr->alloc_size)) {
-                            if(H5MF_aggr_free(f, dxpl_id, other_alloc_type, other_aggr) < 0)
-                                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation block")
-		    } /* end if */
+                    if ((other_aggr->size > 0) && (H5F_addr_eq((other_aggr->addr + other_aggr->size), eoa)) &&
+                        (other_aggr->tot_size > other_aggr->size) &&
+                        ((other_aggr->tot_size - other_aggr->size) >= other_aggr->alloc_size)) {
+                        if (H5MF_aggr_free(f, dxpl_id, other_alloc_type, other_aggr) < 0)
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF,
+                                        "can't free aggregation block")
+                    } /* end if */
 
                     /* Allocate space from the VFD (i.e. at the end of the file) */
-		    if(HADDR_UNDEF == (new_space = H5FD_alloc(f->shared->lf, dxpl_id, alloc_type, f, aggr->alloc_size, &eoa_frag_addr, &eoa_frag_size)))
-			HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate aggregation block")
+                    if (HADDR_UNDEF ==
+                        (new_space = H5FD_alloc(f->shared->lf, dxpl_id, alloc_type, f, aggr->alloc_size,
+                                                &eoa_frag_addr, &eoa_frag_size)))
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF,
+                                    "can't allocate aggregation block")
 
                     /* Return the unused portion of the block to a free list */
-                    if(aggr->size > 0)
-                        if(H5MF_xfree(f, alloc_type, dxpl_id, aggr->addr, aggr->size) < 0)
-                            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation block")
+                    if (aggr->size > 0)
+                        if (H5MF_xfree(f, alloc_type, dxpl_id, aggr->addr, aggr->size) < 0)
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF,
+                                        "can't free aggregation block")
 
                     /* If the block is not to be aligned, fold the eoa fragment
                      * into the newly allocated aggregator, as it could have
                      * been allocated in an aligned manner if the aggregator
                      * block is larger than the threshold */
-                    if(eoa_frag_size && !alignment) {
+                    if (eoa_frag_size && !alignment) {
                         HDassert(eoa_frag_addr + eoa_frag_size == new_space);
-                        aggr->addr = eoa_frag_addr;
-                        aggr->size = aggr->alloc_size + eoa_frag_size;
+                        aggr->addr     = eoa_frag_addr;
+                        aggr->size     = aggr->alloc_size + eoa_frag_size;
                         aggr->tot_size = aggr->size;
 
                         /* Reset EOA fragment */
@@ -309,71 +327,72 @@ HDfprintf(stderr, "%s: Allocating block\n", FUNC);
                     } /* end if */
                     else {
                         /* Point the aggregator at the newly allocated block */
-                        aggr->addr = new_space;
-                        aggr->size = aggr->alloc_size;
+                        aggr->addr     = new_space;
+                        aggr->size     = aggr->alloc_size;
                         aggr->tot_size = aggr->alloc_size;
                     }
                 } /* end else */
 
-		/* Allocate space out of the metadata block */
-		ret_value = aggr->addr;
-		aggr->size -= size;
-		aggr->addr += size;
+                /* Allocate space out of the metadata block */
+                ret_value = aggr->addr;
+                aggr->size -= size;
+                aggr->addr += size;
             } /* end else */
 
-	    /* Freeing any possible fragment due to file allocation */
-	    if(eoa_frag_size)
-		if(H5MF_xfree(f, alloc_type, dxpl_id, eoa_frag_addr, eoa_frag_size) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free eoa fragment")
+            /* Freeing any possible fragment due to file allocation */
+            if (eoa_frag_size)
+                if (H5MF_xfree(f, alloc_type, dxpl_id, eoa_frag_addr, eoa_frag_size) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free eoa fragment")
 
-	    /* Freeing any possible fragment due to alignment in the block after extension */
-	    if(was_extended && aggr_frag_size)
-		if(H5MF_xfree(f, alloc_type, dxpl_id, aggr_frag_addr, aggr_frag_size) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation fragment")
+            /* Freeing any possible fragment due to alignment in the block after extension */
+            if (was_extended && aggr_frag_size)
+                if (H5MF_xfree(f, alloc_type, dxpl_id, aggr_frag_addr, aggr_frag_size) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation fragment")
         } /* end if */
         else {
             /* Allocate space out of the block */
-	    ret_value = aggr->addr + aggr_frag_size;
-	    aggr->size -= (size + aggr_frag_size);
-	    aggr->addr += (size + aggr_frag_size);
-
-	    /* free any possible fragment */
-	    if(aggr_frag_size)
-		if(H5MF_xfree(f, alloc_type, dxpl_id, aggr_frag_addr, aggr_frag_size) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation fragment")
+            ret_value = aggr->addr + aggr_frag_size;
+            aggr->size -= (size + aggr_frag_size);
+            aggr->addr += (size + aggr_frag_size);
+
+            /* free any possible fragment */
+            if (aggr_frag_size)
+                if (H5MF_xfree(f, alloc_type, dxpl_id, aggr_frag_addr, aggr_frag_size) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation fragment")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Check for overlapping into file's temporary allocation space */
-        if(H5F_addr_gt((eoa + size), f->shared->tmp_addr))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF, "'normal' file space allocation request will overlap into 'temporary' file space")
+        if (H5F_addr_gt((eoa + size), f->shared->tmp_addr))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF,
+                        "'normal' file space allocation request will overlap into 'temporary' file space")
 
         /* Allocate data from the file */
-        if(HADDR_UNDEF == (ret_value = H5FD_alloc(f->shared->lf, dxpl_id, type, f, size, &eoa_frag_addr, &eoa_frag_size)))
+        if (HADDR_UNDEF ==
+            (ret_value = H5FD_alloc(f->shared->lf, dxpl_id, type, f, size, &eoa_frag_addr, &eoa_frag_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate file space")
 
         /* Check if fragment was generated */
-	if(eoa_frag_size)
+        if (eoa_frag_size)
             /* Put fragment on the free list */
-	    if(H5MF_xfree(f, type, dxpl_id, eoa_frag_addr, eoa_frag_size) < 0)
-		HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free eoa fragment")
+            if (H5MF_xfree(f, type, dxpl_id, eoa_frag_addr, eoa_frag_size) < 0)
+                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, HADDR_UNDEF, "can't free eoa fragment")
     } /* end else */
 
     /* Sanity check for overlapping into file's temporary allocation space */
     HDassert(H5F_addr_le((ret_value + size), f->shared->tmp_addr));
 
     /* Post-condition sanity check */
-    if(f->shared->alignment && size >= f->shared->threshold)
-	HDassert(!((ret_value + H5FD_get_base_addr(f->shared->lf)) % f->shared->alignment));
+    if (f->shared->alignment && size >= f->shared->threshold)
+        HDassert(!((ret_value + H5FD_get_base_addr(f->shared->lf)) % f->shared->alignment));
 
 done:
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
 #endif /* H5MF_AGGR_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_aggr_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_try_extend
  *
@@ -400,87 +419,88 @@ HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
  *-------------------------------------------------------------------------
  */
 htri_t
-H5MF_aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr, H5FD_mem_t type,
-    haddr_t blk_end, hsize_t extra_requested)
+H5MF_aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr, H5FD_mem_t type, haddr_t blk_end,
+                     hsize_t extra_requested)
 {
-    htri_t ret_value = FALSE;           /* Return value */
+    htri_t ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(f);
     HDassert(aggr);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
 
     /* Check if this aggregator is active */
-    if(f->shared->feature_flags & aggr->feature_flag) {
-        /* 
-	 * If the block being tested adjoins the beginning of the aggregator
+    if (f->shared->feature_flags & aggr->feature_flag) {
+        /*
+         * If the block being tested adjoins the beginning of the aggregator
          *      block, check if the aggregator can accomodate the extension.
          */
-        if(H5F_addr_eq(blk_end, aggr->addr)) {
-	    haddr_t eoa;      /* EOA for the file */
-
-	    /* Get the EOA for the file */
-	    if(HADDR_UNDEF == (eoa = H5F_get_eoa(f, type)))
-		HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "Unable to get eoa")
-
-	    /* If the aggregator is at the end of file: */
-	    if(H5F_addr_eq(eoa, aggr->addr + aggr->size)) {
-		/* If extra_requested is below percentage threshold, extend block into the aggregator. */
-		if(extra_requested <= (EXTEND_THRESHOLD * aggr->size)) {
-		    aggr->size -= extra_requested;
-		    aggr->addr += extra_requested;
-
-		    /* Indicate success */
-		    HGOTO_DONE(TRUE);
-		} 
-		/* 
-		 * If extra_requested is above percentage threshold:
-		 * 1) "bubble" up the aggregator by aggr->alloc_size or extra_requested
-		 * 2) extend the block into the aggregator 
-		 */
-		else {
-		    hsize_t extra = (extra_requested < aggr->alloc_size) ? aggr->alloc_size : extra_requested;
-
-		    if((ret_value = H5FD_try_extend(f->shared->lf, type, f, (aggr->addr + aggr->size), extra)) < 0)
-			HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL, "error extending file")
-		    else if(ret_value == TRUE) {
-			/* Shift the aggregator block by the extra requested */
+        if (H5F_addr_eq(blk_end, aggr->addr)) {
+            haddr_t eoa; /* EOA for the file */
+
+            /* Get the EOA for the file */
+            if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, type)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "Unable to get eoa")
+
+            /* If the aggregator is at the end of file: */
+            if (H5F_addr_eq(eoa, aggr->addr + aggr->size)) {
+                /* If extra_requested is below percentage threshold, extend block into the aggregator. */
+                if (extra_requested <= (EXTEND_THRESHOLD * aggr->size)) {
+                    aggr->size -= extra_requested;
+                    aggr->addr += extra_requested;
+
+                    /* Indicate success */
+                    HGOTO_DONE(TRUE);
+                }
+                /*
+                 * If extra_requested is above percentage threshold:
+                 * 1) "bubble" up the aggregator by aggr->alloc_size or extra_requested
+                 * 2) extend the block into the aggregator
+                 */
+                else {
+                    hsize_t extra = (extra_requested < aggr->alloc_size) ? aggr->alloc_size : extra_requested;
+
+                    if ((ret_value =
+                             H5FD_try_extend(f->shared->lf, type, f, (aggr->addr + aggr->size), extra)) < 0)
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL, "error extending file")
+                    else if (ret_value == TRUE) {
+                        /* Shift the aggregator block by the extra requested */
                         /* (allocates the space for the extra_requested) */
-			aggr->addr += extra_requested;
+                        aggr->addr += extra_requested;
 
-			/* Add extra to the aggregator's total allocated amount */
-			aggr->tot_size += extra;
+                        /* Add extra to the aggregator's total allocated amount */
+                        aggr->tot_size += extra;
 
                         /* Account for any space added to the aggregator */
                         /* (either 0 (if extra_requested > aggr->alloc_size) or
                          *      (aggr->alloc_size - extra_requested) -QAK
                          */
-			aggr->size += extra;
-			aggr->size -= extra_requested;
-		    } /* end if */
-		} /* end if */
-	    } /* end if */
-            else { /* The aggreator is not at end of file */
+                        aggr->size += extra;
+                        aggr->size -= extra_requested;
+                    } /* end if */
+                }     /* end if */
+            }         /* end if */
+            else {    /* The aggreator is not at end of file */
                 /* Check if aggregator has enough internal space to satisfy the extension. */
-                if(aggr->size >= extra_requested) {
+                if (aggr->size >= extra_requested) {
                     /* Extend block into aggregator */
                     aggr->size -= extra_requested;
                     aggr->addr += extra_requested;
 
                     /* Indicate success */
                     HGOTO_DONE(TRUE);
-                 } /* end if */
-	    } /* end else */
-	} /* end if */
-    } /* end if */
+                } /* end if */
+            }     /* end else */
+        }         /* end if */
+    }             /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_aggr_try_extend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_can_absorb
  *
@@ -497,30 +517,32 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5MF_aggr_can_absorb(const H5F_t *f, const H5F_blk_aggr_t *aggr,
-    const H5MF_free_section_t *sect, H5MF_shrink_type_t *shrink)
+H5MF_aggr_can_absorb(const H5F_t *f, const H5F_blk_aggr_t *aggr, const H5MF_free_section_t *sect,
+                     H5MF_shrink_type_t *shrink)
 {
-    htri_t ret_value = FALSE;           /* Return value */
+    htri_t ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(f);
     HDassert(aggr);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
     HDassert(sect);
     HDassert(shrink);
 
     /* Check if this aggregator is active */
-    if(f->shared->feature_flags & aggr->feature_flag) {
+    if (f->shared->feature_flags & aggr->feature_flag) {
         /* Check if the block adjoins the beginning or end of the aggregator */
-        if(H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)
-                || H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr)) {
+        if (H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr) ||
+            H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr)) {
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: section {%a, %Hu} adjoins aggr = {%a, %Hu}\n", "H5MF_aggr_can_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr, aggr->size);
+            HDfprintf(stderr, "%s: section {%a, %Hu} adjoins aggr = {%a, %Hu}\n", "H5MF_aggr_can_absorb",
+                      sect->sect_info.addr, sect->sect_info.size, aggr->addr, aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
             /* Check if aggregator would get too large and should be absorbed into section */
-            if((aggr->size + sect->sect_info.size) >= aggr->alloc_size)
+            if ((aggr->size + sect->sect_info.size) >= aggr->alloc_size)
                 *shrink = H5MF_SHRINK_SECT_ABSORB_AGGR;
             else
                 *shrink = H5MF_SHRINK_AGGR_ABSORB_SECT;
@@ -528,13 +550,12 @@ HDfprintf(stderr, "%s: section {%a, %Hu} adjoins aggr = {%a, %Hu}\n", "H5MF_aggr
             /* Indicate success */
             HGOTO_DONE(TRUE)
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_aggr_can_absorb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_absorb
  *
@@ -551,23 +572,25 @@ done:
  */
 herr_t
 H5MF_aggr_absorb(const H5F_t H5_ATTR_UNUSED *f, H5F_blk_aggr_t *aggr, H5MF_free_section_t *sect,
-    hbool_t allow_sect_absorb)
+                 hbool_t allow_sect_absorb)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(f);
     HDassert(aggr);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
     HDassert(f->shared->feature_flags & aggr->feature_flag);
     HDassert(sect);
 
     /* Check if aggregator would get too large and should be absorbed into section */
-    if((aggr->size + sect->sect_info.size) >= aggr->alloc_size && allow_sect_absorb) {
+    if ((aggr->size + sect->sect_info.size) >= aggr->alloc_size && allow_sect_absorb) {
         /* Check if the section adjoins the beginning or end of the aggregator */
-        if(H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)) {
+        if (H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)) {
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: aggr {%a, %Hu} adjoins front of section = {%a, %Hu}\n", "H5MF_aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr, sect->sect_info.size);
+            HDfprintf(stderr, "%s: aggr {%a, %Hu} adjoins front of section = {%a, %Hu}\n", "H5MF_aggr_absorb",
+                      aggr->addr, aggr->size, sect->sect_info.addr, sect->sect_info.size);
 #endif /* H5MF_AGGR_DEBUG */
             /* Absorb aggregator onto end of section */
             sect->sect_info.size += aggr->size;
@@ -577,7 +600,8 @@ HDfprintf(stderr, "%s: aggr {%a, %Hu} adjoins front of section = {%a, %Hu}\n", "
             HDassert(H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr));
 
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: aggr {%a, %Hu} adjoins end of section = {%a, %Hu}\n", "H5MF_aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr, sect->sect_info.size);
+            HDfprintf(stderr, "%s: aggr {%a, %Hu} adjoins end of section = {%a, %Hu}\n", "H5MF_aggr_absorb",
+                      aggr->addr, aggr->size, sect->sect_info.addr, sect->sect_info.size);
 #endif /* H5MF_AGGR_DEBUG */
             /* Absorb aggregator onto beginning of section */
             sect->sect_info.addr -= aggr->size;
@@ -586,14 +610,15 @@ HDfprintf(stderr, "%s: aggr {%a, %Hu} adjoins end of section = {%a, %Hu}\n", "H5
 
         /* Reset aggregator */
         aggr->tot_size = 0;
-        aggr->addr = 0;
-        aggr->size = 0;
+        aggr->addr     = 0;
+        aggr->size     = 0;
     } /* end if */
     else {
         /* Check if the section adjoins the beginning or end of the aggregator */
-        if(H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)) {
+        if (H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)) {
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: section {%a, %Hu} adjoins front of aggr = {%a, %Hu}\n", "H5MF_aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr, aggr->size);
+            HDfprintf(stderr, "%s: section {%a, %Hu} adjoins front of aggr = {%a, %Hu}\n", "H5MF_aggr_absorb",
+                      sect->sect_info.addr, sect->sect_info.size, aggr->addr, aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
             /* Absorb section onto front of aggregator */
             aggr->addr -= sect->sect_info.size;
@@ -609,7 +634,8 @@ HDfprintf(stderr, "%s: section {%a, %Hu} adjoins front of aggr = {%a, %Hu}\n", "
             HDassert(H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr));
 
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: section {%a, %Hu} adjoins end of aggr = {%a, %Hu}\n", "H5MF_aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr, aggr->size);
+            HDfprintf(stderr, "%s: section {%a, %Hu} adjoins end of aggr = {%a, %Hu}\n", "H5MF_aggr_absorb",
+                      sect->sect_info.addr, sect->sect_info.size, aggr->addr, aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
             /* Absorb section onto end of aggregator */
             aggr->size += sect->sect_info.size;
@@ -621,7 +647,6 @@ HDfprintf(stderr, "%s: section {%a, %Hu} adjoins end of aggr = {%a, %Hu}\n", "H5
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5MF_aggr_absorb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_query
  *
@@ -636,28 +661,27 @@ HDfprintf(stderr, "%s: section {%a, %Hu} adjoins end of aggr = {%a, %Hu}\n", "H5
  *-------------------------------------------------------------------------
  */
 herr_t
-H5MF_aggr_query(const H5F_t *f, const H5F_blk_aggr_t *aggr, haddr_t *addr,
-    hsize_t *size)
+H5MF_aggr_query(const H5F_t *f, const H5F_blk_aggr_t *aggr, haddr_t *addr, hsize_t *size)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(f);
     HDassert(aggr);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
 
     /* Check if this aggregator is active */
-    if(f->shared->feature_flags & aggr->feature_flag) {
-	if(addr)
+    if (f->shared->feature_flags & aggr->feature_flag) {
+        if (addr)
             *addr = aggr->addr;
-        if(size)
+        if (size)
             *size = aggr->size;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5MF_aggr_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_reset
  *
@@ -674,39 +698,42 @@ H5MF_aggr_query(const H5F_t *f, const H5F_blk_aggr_t *aggr, haddr_t *addr,
 static herr_t
 H5MF_aggr_reset(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr)
 {
-    H5FD_mem_t alloc_type;      /* Type of file memory to work with */
-    herr_t ret_value = SUCCEED;	/* Return value */
+    H5FD_mem_t alloc_type;          /* Type of file memory to work with */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(f);
     HDassert(aggr);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
 
     /* Set the type of memory in the file */
-    alloc_type = (aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW);      /* Type of file memory to work with */
+    alloc_type = (aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA
+                      ? H5FD_MEM_DEFAULT
+                      : H5FD_MEM_DRAW); /* Type of file memory to work with */
 
     /* Check if this aggregator is active */
-    if(f->shared->feature_flags & aggr->feature_flag) {
-        haddr_t tmp_addr;       /* Temporary holder for aggregator address */
-        hsize_t tmp_size;       /* Temporary holder for aggregator size */
+    if (f->shared->feature_flags & aggr->feature_flag) {
+        haddr_t tmp_addr; /* Temporary holder for aggregator address */
+        hsize_t tmp_size; /* Temporary holder for aggregator size */
 
         /* Retain aggregator info */
         tmp_addr = aggr->addr;
         tmp_size = aggr->size;
 #ifdef H5MF_AGGR_DEBUG
-HDfprintf(stderr, "%s: tmp_addr = %a, tmp_size = %Hu\n", FUNC, tmp_addr, tmp_size);
+        HDfprintf(stderr, "%s: tmp_addr = %a, tmp_size = %Hu\n", FUNC, tmp_addr, tmp_size);
 #endif /* H5MF_AGGR_DEBUG */
 
         /* Reset aggregator block information */
         aggr->tot_size = 0;
-        aggr->addr = 0;
-        aggr->size = 0;
+        aggr->addr     = 0;
+        aggr->size     = 0;
 
         /* Return the unused portion of the metadata block to the file */
-        if(tmp_size > 0 && (H5F_INTENT(f) & H5F_ACC_RDWR))
-            if(H5MF_xfree(f, alloc_type, dxpl_id, tmp_addr, tmp_size) < 0)
+        if (tmp_size > 0 && (H5F_INTENT(f) & H5F_ACC_RDWR))
+            if (H5MF_xfree(f, alloc_type, dxpl_id, tmp_addr, tmp_size) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "can't release aggregator's free space")
     } /* end if */
 
@@ -714,7 +741,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_aggr_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_free_aggrs
  *
@@ -732,13 +758,13 @@ done:
 herr_t
 H5MF_free_aggrs(H5F_t *f, hid_t dxpl_id)
 {
-    H5F_blk_aggr_t *first_aggr;         /* First aggregator to reset */
-    H5F_blk_aggr_t *second_aggr;        /* Second aggregator to reset */
-    haddr_t ma_addr = HADDR_UNDEF;      /* Base "metadata aggregator" address */
-    hsize_t ma_size = 0;                /* Size of "metadata aggregator" */
-    haddr_t sda_addr = HADDR_UNDEF;     /* Base "small data aggregator" address */
-    hsize_t sda_size = 0;               /* Size of "small data aggregator" */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5F_blk_aggr_t *first_aggr;              /* First aggregator to reset */
+    H5F_blk_aggr_t *second_aggr;             /* Second aggregator to reset */
+    haddr_t         ma_addr   = HADDR_UNDEF; /* Base "metadata aggregator" address */
+    hsize_t         ma_size   = 0;           /* Size of "metadata aggregator" */
+    haddr_t         sda_addr  = HADDR_UNDEF; /* Base "small data aggregator" address */
+    hsize_t         sda_size  = 0;           /* Size of "small data aggregator" */
+    herr_t          ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -748,42 +774,41 @@ H5MF_free_aggrs(H5F_t *f, hid_t dxpl_id)
     HDassert(f->shared->lf);
 
     /* Retrieve metadata aggregator info, if available */
-    if(H5MF_aggr_query(f, &(f->shared->meta_aggr), &ma_addr, &ma_size) < 0)
+    if (H5MF_aggr_query(f, &(f->shared->meta_aggr), &ma_addr, &ma_size) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query metadata aggregator stats")
 
     /* Retrieve 'small data' aggregator info, if available */
-    if(H5MF_aggr_query(f, &(f->shared->sdata_aggr), &sda_addr, &sda_size) < 0)
+    if (H5MF_aggr_query(f, &(f->shared->sdata_aggr), &sda_addr, &sda_size) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query small data aggregator stats")
 
     /* Make certain we release the aggregator that's later in the file first */
     /* (so the file shrinks properly) */
-    if(H5F_addr_defined(ma_addr) && H5F_addr_defined(sda_addr)) {
-        if(H5F_addr_lt(ma_addr, sda_addr)) {
-            first_aggr = &(f->shared->sdata_aggr);
+    if (H5F_addr_defined(ma_addr) && H5F_addr_defined(sda_addr)) {
+        if (H5F_addr_lt(ma_addr, sda_addr)) {
+            first_aggr  = &(f->shared->sdata_aggr);
             second_aggr = &(f->shared->meta_aggr);
         } /* end if */
         else {
-            first_aggr = &(f->shared->meta_aggr);
+            first_aggr  = &(f->shared->meta_aggr);
             second_aggr = &(f->shared->sdata_aggr);
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
-        first_aggr = &(f->shared->meta_aggr);
+        first_aggr  = &(f->shared->meta_aggr);
         second_aggr = &(f->shared->sdata_aggr);
     } /* end else */
 
-     /* Release the unused portion of the metadata and "small data" blocks back
-      * to the free lists in the file.
-      */
-    if(H5MF_aggr_reset(f, dxpl_id, first_aggr) < 0)
+    /* Release the unused portion of the metadata and "small data" blocks back
+     * to the free lists in the file.
+     */
+    if (H5MF_aggr_reset(f, dxpl_id, first_aggr) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "can't reset metadata block")
-    if(H5MF_aggr_reset(f, dxpl_id, second_aggr) < 0)
+    if (H5MF_aggr_reset(f, dxpl_id, second_aggr) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "can't reset 'small data' block")
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_free_aggrs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_can_shrink_eoa
  *
@@ -799,29 +824,29 @@ done:
 static htri_t
 H5MF_aggr_can_shrink_eoa(H5F_t *f, H5FD_mem_t type, H5F_blk_aggr_t *aggr)
 {
-    haddr_t eoa = HADDR_UNDEF;      	/* EOA for the file */
-    htri_t ret_value = FALSE;   	/* Return value */
+    haddr_t eoa       = HADDR_UNDEF; /* EOA for the file */
+    htri_t  ret_value = FALSE;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(f);
     HDassert(aggr);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
 
     /* Get the EOA for the file */
-    if(HADDR_UNDEF == (eoa = H5F_get_eoa(f, type)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "Unable to get eoa")
+    if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, type)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "Unable to get eoa")
 
     /* Check if the aggregator is at EOA */
-    if(aggr->size > 0 && H5F_addr_defined(aggr->addr))
-	ret_value = H5F_addr_eq(eoa, aggr->addr + aggr->size);
+    if (aggr->size > 0 && H5F_addr_defined(aggr->addr))
+        ret_value = H5F_addr_eq(eoa, aggr->addr + aggr->size);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF_aggr_can_shrink_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggr_free
  *
@@ -839,7 +864,7 @@ done:
 static herr_t
 H5MF_aggr_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, H5F_blk_aggr_t *aggr)
 {
-    herr_t ret_value = SUCCEED;   	/* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -850,23 +875,23 @@ H5MF_aggr_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, H5F_blk_aggr_t *aggr)
     HDassert(H5F_addr_defined(aggr->addr));
     HDassert(aggr->size > 0);
     HDassert(H5F_INTENT(f) & H5F_ACC_RDWR);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
     HDassert(f->shared->feature_flags & aggr->feature_flag);
 
     /* Free the remaining space at EOA in the aggregator */
-    if(H5FD_free(f->shared->lf, dxpl_id, type, f, aggr->addr, aggr->size) < 0)
+    if (H5FD_free(f->shared->lf, dxpl_id, type, f, aggr->addr, aggr->size) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "can't free aggregation block")
 
     /* Reset the aggregator */
     aggr->tot_size = 0;
-    aggr->addr = HADDR_UNDEF;
-    aggr->size = 0;
+    aggr->addr     = HADDR_UNDEF;
+    aggr->size     = 0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF_aggr_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MF_aggrs_try_shrink_eoa
  *
@@ -883,9 +908,9 @@ done:
 htri_t
 H5MF_aggrs_try_shrink_eoa(H5F_t *f, hid_t dxpl_id)
 {
-    htri_t ma_status;        /* Whether the metadata aggregator can shrink the EOA */
-    htri_t sda_status;       /* Whether the small data aggregator can shrink the EOA */
-    htri_t ret_value;        /* Return value */
+    htri_t ma_status;  /* Whether the metadata aggregator can shrink the EOA */
+    htri_t sda_status; /* Whether the small data aggregator can shrink the EOA */
+    htri_t ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -893,21 +918,20 @@ H5MF_aggrs_try_shrink_eoa(H5F_t *f, hid_t dxpl_id)
     HDassert(f);
     HDassert(f->shared);
 
-    if((ma_status = H5MF_aggr_can_shrink_eoa(f, H5FD_MEM_DEFAULT, &(f->shared->meta_aggr))) < 0)
+    if ((ma_status = H5MF_aggr_can_shrink_eoa(f, H5FD_MEM_DEFAULT, &(f->shared->meta_aggr))) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query metadata aggregator stats")
-    if(ma_status > 0)
-	if(H5MF_aggr_free(f, dxpl_id, H5FD_MEM_DEFAULT, &(f->shared->meta_aggr)) < 0)
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa")
+    if (ma_status > 0)
+        if (H5MF_aggr_free(f, dxpl_id, H5FD_MEM_DEFAULT, &(f->shared->meta_aggr)) < 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa")
 
-    if((sda_status = H5MF_aggr_can_shrink_eoa(f, H5FD_MEM_DRAW, &(f->shared->sdata_aggr))) < 0)
+    if ((sda_status = H5MF_aggr_can_shrink_eoa(f, H5FD_MEM_DRAW, &(f->shared->sdata_aggr))) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query small data aggregator stats")
-    if(sda_status > 0)
-	if(H5MF_aggr_free(f, dxpl_id, H5FD_MEM_DRAW, &(f->shared->sdata_aggr)) < 0)
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa")
+    if (sda_status > 0)
+        if (H5MF_aggr_free(f, dxpl_id, H5FD_MEM_DRAW, &(f->shared->sdata_aggr)) < 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa")
 
     ret_value = (ma_status || sda_status);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_aggrs_try_shrink_eoa() */
-
diff --git a/src/H5MFdbg.c b/src/H5MFdbg.c
index d6e5d34..7ce6cf7 100644
--- a/src/H5MFdbg.c
+++ b/src/H5MFdbg.c
@@ -26,18 +26,17 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-#define H5MF_PACKAGE		/*suppress error about including H5MFpkg  */
-#define H5MF_DEBUGGING          /* Need access to file space debugging routines */
-
+#define H5F_PACKAGE    /*suppress error about including H5Fpkg	  */
+#define H5MF_PACKAGE   /*suppress error about including H5MFpkg  */
+#define H5MF_DEBUGGING /* Need access to file space debugging routines */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5MFpkg.h"		/* File memory management		*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fpkg.h"     /* File access				*/
+#include "H5MFpkg.h"    /* File memory management		*/
 
 #ifdef H5MF_ALLOC_DEBUG_DUMP
 
@@ -45,45 +44,38 @@
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for free space section iterator callback */
 typedef struct {
-    H5FS_t *fspace;             /* Free space manager */
-    FILE *stream;               /* Stream for output */
-    int indent;                 /* Indention amount */
-    int fwidth;                 /* Field width amount */
+    H5FS_t *fspace; /* Free space manager */
+    FILE *  stream; /* Stream for output */
+    int     indent; /* Indention amount */
+    int     fwidth; /* Field width amount */
 } H5MF_debug_iter_ud_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sects_debug_cb
  *
@@ -100,9 +92,9 @@ typedef struct {
 static herr_t
 H5MF_sects_debug_cb(H5FS_section_info_t *_sect, void *_udata)
 {
-    H5MF_free_section_t *sect = (H5MF_free_section_t *)_sect;       /* Section to dump info */
-    H5MF_debug_iter_ud_t *udata = (H5MF_debug_iter_ud_t *)_udata;         /* User data for callbacks */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5MF_free_section_t * sect      = (H5MF_free_section_t *)_sect;   /* Section to dump info */
+    H5MF_debug_iter_ud_t *udata     = (H5MF_debug_iter_ud_t *)_udata; /* User data for callbacks */
+    herr_t                ret_value = SUCCEED;                        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -114,30 +106,25 @@ H5MF_sects_debug_cb(H5FS_section_info_t *_sect, void *_udata)
 
     /* Print generic section information */
     HDfprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth,
-	      "Section type:",
-	      (sect->sect_info.type == H5MF_FSPACE_SECT_SIMPLE ? "simple" : "unknown"));
+              "Section type:", (sect->sect_info.type == H5MF_FSPACE_SECT_SIMPLE ? "simple" : "unknown"));
     HDfprintf(udata->stream, "%*s%-*s %a\n", udata->indent, "", udata->fwidth,
-	      "Section address:",
-	      sect->sect_info.addr);
+              "Section address:", sect->sect_info.addr);
     HDfprintf(udata->stream, "%*s%-*s %Hu\n", udata->indent, "", udata->fwidth,
-	      "Section size:",
-	      sect->sect_info.size);
+              "Section size:", sect->sect_info.size);
     HDfprintf(udata->stream, "%*s%-*s %Hu\n", udata->indent, "", udata->fwidth,
-	      "End of section:",
-	      (haddr_t)((sect->sect_info.addr + sect->sect_info.size) - 1));
+              "End of section:", (haddr_t)((sect->sect_info.addr + sect->sect_info.size) - 1));
     HDfprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth,
-	      "Section state:",
-	      (sect->sect_info.state == H5FS_SECT_LIVE ? "live" : "serialized"));
+              "Section state:", (sect->sect_info.state == H5FS_SECT_LIVE ? "live" : "serialized"));
 
     /* Dump section-specific debugging information */
-    if(H5FS_sect_debug(udata->fspace, _sect, udata->stream, udata->indent + 3, MAX(0, udata->fwidth - 3)) < 0)
+    if (H5FS_sect_debug(udata->fspace, _sect, udata->stream, udata->indent + 3, MAX(0, udata->fwidth - 3)) <
+        0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_BADITER, FAIL, "can't dump section's debugging info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_sects_debug_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sects_dump
  *
@@ -154,19 +141,19 @@ done:
 herr_t
 H5MF_sects_dump(H5F_t *f, hid_t dxpl_id, FILE *stream)
 {
-    haddr_t eoa;                        /* End of allocated space in the file */
-    haddr_t ma_addr = HADDR_UNDEF;      /* Base "metadata aggregator" address */
-    hsize_t ma_size = 0;                /* Size of "metadata aggregator" */
-    haddr_t sda_addr = HADDR_UNDEF;     /* Base "small data aggregator" address */
-    hsize_t sda_size = 0;               /* Size of "small data aggregator" */
-    H5FD_mem_t type;                    /* Memory type for iteration */
-    int indent = 0;                     /* Amount to indent */
-    int fwidth = 50;                    /* Field width */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    haddr_t    eoa;                    /* End of allocated space in the file */
+    haddr_t    ma_addr  = HADDR_UNDEF; /* Base "metadata aggregator" address */
+    hsize_t    ma_size  = 0;           /* Size of "metadata aggregator" */
+    haddr_t    sda_addr = HADDR_UNDEF; /* Base "small data aggregator" address */
+    hsize_t    sda_size = 0;           /* Size of "small data aggregator" */
+    H5FD_mem_t type;                   /* Memory type for iteration */
+    int        indent    = 0;          /* Amount to indent */
+    int        fwidth    = 50;         /* Field width */
+    herr_t     ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Dumping file free space sections\n", FUNC);
+    HDfprintf(stderr, "%s: Dumping file free space sections\n", FUNC);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /*
@@ -176,45 +163,44 @@ HDfprintf(stderr, "%s: Dumping file free space sections\n", FUNC);
     HDassert(stream);
 
     /* Retrieve the 'eoa' for the file */
-    if(HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
+    if (HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: for type = H5FD_MEM_DEFAULT, eoa = %a\n", FUNC, eoa);
+    HDfprintf(stderr, "%s: for type = H5FD_MEM_DEFAULT, eoa = %a\n", FUNC, eoa);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* Retrieve metadata aggregator info, if available */
     H5MF_aggr_query(f, &(f->shared->meta_aggr), &ma_addr, &ma_size);
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: ma_addr = %a, ma_size = %Hu, end of ma = %a\n", FUNC, ma_addr, ma_size, (haddr_t)((ma_addr + ma_size) - 1));
+    HDfprintf(stderr, "%s: ma_addr = %a, ma_size = %Hu, end of ma = %a\n", FUNC, ma_addr, ma_size,
+              (haddr_t)((ma_addr + ma_size) - 1));
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* Retrieve 'small data' aggregator info, if available */
     H5MF_aggr_query(f, &(f->shared->sdata_aggr), &sda_addr, &sda_size);
 #ifdef H5MF_ALLOC_DEBUG
-HDfprintf(stderr, "%s: sda_addr = %a, sda_size = %Hu, end of sda = %a\n", FUNC, sda_addr, sda_size, (haddr_t)((sda_addr + sda_size) - 1));
+    HDfprintf(stderr, "%s: sda_addr = %a, sda_size = %Hu, end of sda = %a\n", FUNC, sda_addr, sda_size,
+              (haddr_t)((sda_addr + sda_size) - 1));
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* Iterate over all the free space types that have managers and dump each free list's space */
-    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
+    for (type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) {
         /* Print header for type */
         HDfprintf(stream, "%*sFile Free Space Info for type = %u:\n", indent, "", (unsigned)type);
 
         /* Check for this type being mapped to another type */
-        if(H5FD_MEM_DEFAULT == f->shared->fs_type_map[type] ||
-                type == f->shared->fs_type_map[type]) {
+        if (H5FD_MEM_DEFAULT == f->shared->fs_type_map[type] || type == f->shared->fs_type_map[type]) {
             /* Retrieve the 'eoa' for this file memory type */
-            if(HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, type)))
+            if (HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, type)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
-            HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "eoa:",
-                      eoa);
+            HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", MAX(0, fwidth - 3), "eoa:", eoa);
 
             /* Print header for sections */
             HDfprintf(stream, "%*sSections:\n", indent + 3, "");
 
             /* If there is a free space manager for this type, iterate over them */
-            if(f->shared->fs_man[type]) {
-                H5MF_debug_iter_ud_t udata;        /* User data for callbacks */
+            if (f->shared->fs_man[type]) {
+                H5MF_debug_iter_ud_t udata; /* User data for callbacks */
 
                 /* Prepare user data for section iteration callback */
                 udata.fspace = f->shared->fs_man[type];
@@ -223,22 +209,21 @@ HDfprintf(stderr, "%s: sda_addr = %a, sda_size = %Hu, end of sda = %a\n", FUNC,
                 udata.fwidth = MAX(0, fwidth - 6);
 
                 /* Iterate over all the free space sections */
-                if(H5FS_sect_iterate(f, dxpl_id, f->shared->fs_man[type], H5MF_sects_debug_cb, &udata) < 0)
+                if (H5FS_sect_iterate(f, dxpl_id, f->shared->fs_man[type], H5MF_sects_debug_cb, &udata) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
             } /* end if */
             else {
                 /* No sections of this type */
                 HDfprintf(stream, "%*s<none>\n", indent + 6, "");
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else {
             HDfprintf(stream, "%*sMapped to type = %u\n", indent, "", (unsigned)f->shared->fs_type_map[type]);
         } /* end else */
-    } /* end for */
+    }     /* end for */
 
 done:
-HDfprintf(stderr, "%s: Done dumping file free space sections\n", FUNC);
+    HDfprintf(stderr, "%s: Done dumping file free space sections\n", FUNC);
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_sects_dump() */
 #endif /* H5MF_ALLOC_DEBUG_DUMP */
-
diff --git a/src/H5MFpkg.h b/src/H5MFpkg.h
index 6ecdc8a..4654227 100644
--- a/src/H5MFpkg.h
+++ b/src/H5MFpkg.h
@@ -30,8 +30,7 @@
 #include "H5MFprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5FSprivate.h"    /* File free space                      */
-
+#include "H5FSprivate.h" /* File free space                      */
 
 /**************************/
 /* Package Private Macros */
@@ -51,8 +50,7 @@
 
 /* Free space section types for file */
 /* (values stored in free space data structures in file) */
-#define H5MF_FSPACE_SECT_SIMPLE         0       /* Section is a range of actual bytes in file */
-
+#define H5MF_FSPACE_SECT_SIMPLE 0 /* Section is a range of actual bytes in file */
 
 /****************************/
 /* Package Private Typedefs */
@@ -60,21 +58,22 @@
 
 /* File free space section info */
 typedef struct H5MF_free_section_t {
-    H5FS_section_info_t sect_info;              /* Free space section information (must be first in struct) */
+    H5FS_section_info_t sect_info; /* Free space section information (must be first in struct) */
 #ifdef NOT_YET
     union {
         struct {
-            H5HF_indirect_t *parent;            /* Indirect block parent for free section's direct block */
-            unsigned par_entry;                 /* Entry of free section's direct block in parent indirect block */
+            H5HF_indirect_t *parent;    /* Indirect block parent for free section's direct block */
+            unsigned         par_entry; /* Entry of free section's direct block in parent indirect block */
         } single;
         struct {
-            struct H5HF_free_section_t *under;  /* Pointer to indirect block underlying row section */
-            unsigned    row;                    /* Row for range of blocks */
-            unsigned    col;                    /* Column for range of blocks */
-            unsigned    num_entries;            /* Number of entries covered */
+            struct H5HF_free_section_t *under;       /* Pointer to indirect block underlying row section */
+            unsigned                    row;         /* Row for range of blocks */
+            unsigned                    col;         /* Column for range of blocks */
+            unsigned                    num_entries; /* Number of entries covered */
 
             /* Fields that aren't stored */
-            hbool_t     checked_out;            /* Flag to indicate that a row section is temporarily out of the free space manager */
+            hbool_t checked_out; /* Flag to indicate that a row section is temporarily out of the free space
+                                    manager */
         } row;
         struct {
             /* Holds either a pointer to an indirect block (if its "live") or
@@ -84,23 +83,24 @@ typedef struct H5MF_free_section_t {
              *          or not)
              */
             union {
-                H5HF_indirect_t *iblock;        /* Indirect block for free section */
-                hsize_t iblock_off;             /* Indirect block offset in "heap space" */
+                H5HF_indirect_t *iblock;     /* Indirect block for free section */
+                hsize_t          iblock_off; /* Indirect block offset in "heap space" */
             } u;
-            unsigned    row;                    /* Row for range of blocks */
-            unsigned    col;                    /* Column for range of blocks */
-            unsigned    num_entries;            /* Number of entries covered */
+            unsigned row;         /* Row for range of blocks */
+            unsigned col;         /* Column for range of blocks */
+            unsigned num_entries; /* Number of entries covered */
 
             /* Fields that aren't stored */
-            struct H5HF_free_section_t *parent; /* Pointer to "parent" indirect section */
-            unsigned    par_entry;              /* Entry within parent indirect section */
-            hsize_t     span_size;              /* Size of space tracked, in "heap space" */
-            unsigned    iblock_entries;         /* Number of entries in indirect block where section is located */
-            unsigned    rc;                     /* Reference count of outstanding row & child indirect sections */
-            unsigned    dir_nrows;              /* Number of direct rows in section */
-            struct H5HF_free_section_t **dir_rows;  /* Array of pointers to outstanding row sections */
-            unsigned    indir_nents;            /* Number of indirect entries in section */
-            struct H5HF_free_section_t **indir_ents; /* Array of pointers to outstanding child indirect sections */
+            struct H5HF_free_section_t *parent;    /* Pointer to "parent" indirect section */
+            unsigned                    par_entry; /* Entry within parent indirect section */
+            hsize_t                     span_size; /* Size of space tracked, in "heap space" */
+            unsigned iblock_entries; /* Number of entries in indirect block where section is located */
+            unsigned rc;             /* Reference count of outstanding row & child indirect sections */
+            unsigned dir_nrows;      /* Number of direct rows in section */
+            struct H5HF_free_section_t **dir_rows;    /* Array of pointers to outstanding row sections */
+            unsigned                     indir_nents; /* Number of indirect entries in section */
+            struct H5HF_free_section_t *
+                *indir_ents; /* Array of pointers to outstanding child indirect sections */
         } indirect;
     } u;
 #endif /* NOT_YET */
@@ -108,26 +108,25 @@ typedef struct H5MF_free_section_t {
 
 /* Type of "container shrink" operation to perform */
 typedef enum {
-    H5MF_SHRINK_EOA,            /* Section should shrink the EOA value */
-    H5MF_SHRINK_AGGR_ABSORB_SECT,    /* Section should merge into the aggregator block */
-    H5MF_SHRINK_SECT_ABSORB_AGGR     /* Aggregator block should merge into the section */
+    H5MF_SHRINK_EOA,              /* Section should shrink the EOA value */
+    H5MF_SHRINK_AGGR_ABSORB_SECT, /* Section should merge into the aggregator block */
+    H5MF_SHRINK_SECT_ABSORB_AGGR  /* Aggregator block should merge into the section */
 } H5MF_shrink_type_t;
 
 /* User data for free space manager section callbacks */
 typedef struct H5MF_sect_ud_t {
     /* Down */
-    H5F_t *f;                   /* Pointer to file to operate on */
-    hid_t dxpl_id;              /* DXPL for VFD operations */
-    H5FD_mem_t alloc_type;      /* Type of memory being allocated */
-    hbool_t allow_sect_absorb;  /* Whether sections are allowed to absorb a block aggregator */
-    hbool_t allow_eoa_shrink_only;  /* Whether shrinking eoa is allowed only for the section */
+    H5F_t *    f;                     /* Pointer to file to operate on */
+    hid_t      dxpl_id;               /* DXPL for VFD operations */
+    H5FD_mem_t alloc_type;            /* Type of memory being allocated */
+    hbool_t    allow_sect_absorb;     /* Whether sections are allowed to absorb a block aggregator */
+    hbool_t    allow_eoa_shrink_only; /* Whether shrinking eoa is allowed only for the section */
 
     /* Up */
-    H5MF_shrink_type_t shrink;  /* Type of shrink operation to perform */
-    H5F_blk_aggr_t *aggr;       /* Aggregator block to operate on */
+    H5MF_shrink_type_t shrink; /* Type of shrink operation to perform */
+    H5F_blk_aggr_t *   aggr;   /* Aggregator block to operate on */
 } H5MF_sect_ud_t;
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -135,7 +134,6 @@ typedef struct H5MF_sect_ud_t {
 /* H5MF single section inherits serializable properties from H5FS_section_class_t */
 H5_DLLVAR H5FS_section_class_t H5MF_FSPACE_SECT_CLS_SIMPLE[1];
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
@@ -146,29 +144,24 @@ H5_DLL herr_t H5MF_alloc_start(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type);
 H5_DLL herr_t H5MF_sects_dump(H5F_t *f, hid_t dxpl_id, FILE *stream);
 
 /* 'simple' section routines */
-H5_DLL H5MF_free_section_t *H5MF_sect_simple_new(haddr_t sect_off,
-    hsize_t sect_size);
-H5_DLL htri_t H5MF_sect_simple_can_shrink(const H5FS_section_info_t *_sect,
-    void *udata);
-H5_DLL herr_t H5MF_sect_simple_shrink(H5FS_section_info_t **_sect,
-    void *udata);
-H5_DLL herr_t H5MF_sect_simple_free(H5FS_section_info_t *sect);
+H5_DLL H5MF_free_section_t *H5MF_sect_simple_new(haddr_t sect_off, hsize_t sect_size);
+H5_DLL htri_t               H5MF_sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *udata);
+H5_DLL herr_t               H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *udata);
+H5_DLL herr_t               H5MF_sect_simple_free(H5FS_section_info_t *sect);
 
 /* Block aggregator routines */
-H5_DLL haddr_t H5MF_aggr_alloc(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr,
-    H5F_blk_aggr_t *other_aggr, H5FD_mem_t type, hsize_t size);
-H5_DLL htri_t H5MF_aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr,
-    H5FD_mem_t type, haddr_t abs_blk_end, hsize_t extra_requested);
-H5_DLL htri_t H5MF_aggr_can_absorb(const H5F_t *f, const H5F_blk_aggr_t *aggr,
-    const H5MF_free_section_t *sect, H5MF_shrink_type_t *shrink);
-H5_DLL herr_t H5MF_aggr_absorb(const H5F_t *f, H5F_blk_aggr_t *aggr,
-    H5MF_free_section_t *sect, hbool_t allow_sect_absorb);
-H5_DLL herr_t H5MF_aggr_query(const H5F_t *f, const H5F_blk_aggr_t *aggr,
-    haddr_t *addr, hsize_t *size);
+H5_DLL haddr_t H5MF_aggr_alloc(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr,
+                               H5FD_mem_t type, hsize_t size);
+H5_DLL htri_t  H5MF_aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr, H5FD_mem_t type, haddr_t abs_blk_end,
+                                    hsize_t extra_requested);
+H5_DLL htri_t  H5MF_aggr_can_absorb(const H5F_t *f, const H5F_blk_aggr_t *aggr,
+                                    const H5MF_free_section_t *sect, H5MF_shrink_type_t *shrink);
+H5_DLL herr_t  H5MF_aggr_absorb(const H5F_t *f, H5F_blk_aggr_t *aggr, H5MF_free_section_t *sect,
+                                hbool_t allow_sect_absorb);
+H5_DLL herr_t  H5MF_aggr_query(const H5F_t *f, const H5F_blk_aggr_t *aggr, haddr_t *addr, hsize_t *size);
 
 /* Testing routines */
 #ifdef H5MF_TESTING
 #endif /* H5MF_TESTING */
 
 #endif /* _H5MFpkg_H */
-
diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h
index 6299cc2..c2f109a 100644
--- a/src/H5MFprivate.h
+++ b/src/H5MFprivate.h
@@ -27,8 +27,8 @@
 #define _H5MFprivate_H
 
 /* Private headers needed by this file */
-#include "H5Fprivate.h"         /* File access				*/
-#include "H5FDprivate.h"	/* File Drivers				*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5FDprivate.h" /* File Drivers				*/
 
 /**************************/
 /* Library Private Macros */
@@ -39,38 +39,33 @@
  *	    see diagnostics from this layer.
  */
 #ifdef NDEBUG
-#  undef H5MF_DEBUG
+#undef H5MF_DEBUG
 #endif
 
 /****************************/
 /* Library Private Typedefs */
 /****************************/
 
-
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
 
 /* File space manager routines */
 H5_DLL herr_t H5MF_init_merge_flags(H5F_t *f);
-H5_DLL herr_t H5MF_get_freespace(H5F_t *f, hid_t dxpl_id, hsize_t *tot_space,
-    hsize_t *meta_size);
+H5_DLL herr_t H5MF_get_freespace(H5F_t *f, hid_t dxpl_id, hsize_t *tot_space, hsize_t *meta_size);
 H5_DLL herr_t H5MF_close(H5F_t *f, hid_t dxpl_id);
 
 /* File space allocation routines */
 H5_DLL haddr_t H5MF_alloc(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
 H5_DLL haddr_t H5MF_aggr_vfd_alloc(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
-H5_DLL herr_t H5MF_xfree(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-			  hsize_t size);
-H5_DLL herr_t H5MF_try_extend(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type,
-    haddr_t addr, hsize_t size, hsize_t extra_requested);
-H5_DLL htri_t H5MF_try_shrink(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id,
-    haddr_t addr, hsize_t size);
+H5_DLL herr_t  H5MF_xfree(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size);
+H5_DLL herr_t  H5MF_try_extend(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, hsize_t size,
+                               hsize_t extra_requested);
+H5_DLL htri_t  H5MF_try_shrink(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr, hsize_t size);
 
 /* File 'temporary' space allocation routines */
 H5_DLL haddr_t H5MF_alloc_tmp(H5F_t *f, hsize_t size);
@@ -82,10 +77,8 @@ H5_DLL htri_t H5MF_aggrs_try_shrink_eoa(H5F_t *f, hid_t dxpl_id);
 /* Debugging routines */
 #ifdef H5MF_DEBUGGING
 #ifdef NOT_YET
-H5_DLL herr_t H5MF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
-    FILE *stream, int indent, int fwidth);
+H5_DLL herr_t H5MF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
 #endif /* NOT_YET */
 #endif /* H5MF_DEBUGGING */
 
 #endif /* end _H5MFprivate_H */
-
diff --git a/src/H5MFsection.c b/src/H5MFsection.c
index 18d6282..7a8ab24 100644
--- a/src/H5MFsection.c
+++ b/src/H5MFsection.c
@@ -23,50 +23,42 @@
 /* Module Setup */
 /****************/
 
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
-#define H5MF_PACKAGE		/*suppress error about including H5MFpkg  */
-
+#define H5F_PACKAGE  /*suppress error about including H5Fpkg	  */
+#define H5MF_PACKAGE /*suppress error about including H5MFpkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5MFpkg.h"		/* File memory management		*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fpkg.h"     /* File access				*/
+#include "H5MFpkg.h"    /* File memory management		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* 'simple' section callbacks */
-static H5FS_section_info_t *H5MF_sect_simple_deserialize(const H5FS_section_class_t *cls,
-    hid_t dxpl_id, const uint8_t *buf, haddr_t sect_addr, hsize_t sect_size,
-    unsigned *des_flags);
-static htri_t H5MF_sect_simple_can_merge(const H5FS_section_info_t *sect1,
-    const H5FS_section_info_t *sect2, void *udata);
-static herr_t H5MF_sect_simple_merge(H5FS_section_info_t *sect1,
-    H5FS_section_info_t *sect2, void *udata);
-static herr_t H5MF_sect_simple_valid(const H5FS_section_class_t *cls,
-    const H5FS_section_info_t *sect);
-static H5FS_section_info_t *H5MF_sect_simple_split(H5FS_section_info_t *sect,
-    hsize_t frag_size);
+static H5FS_section_info_t *H5MF_sect_simple_deserialize(const H5FS_section_class_t *cls, hid_t dxpl_id,
+                                                         const uint8_t *buf, haddr_t sect_addr,
+                                                         hsize_t sect_size, unsigned *des_flags);
+static htri_t H5MF_sect_simple_can_merge(const H5FS_section_info_t *sect1, const H5FS_section_info_t *sect2,
+                                         void *udata);
+static herr_t H5MF_sect_simple_merge(H5FS_section_info_t *sect1, H5FS_section_info_t *sect2, void *udata);
+static herr_t H5MF_sect_simple_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *sect);
+static H5FS_section_info_t *H5MF_sect_simple_split(H5FS_section_info_t *sect, hsize_t frag_size);
 
 /*********************/
 /* Package Variables */
@@ -75,35 +67,33 @@ static H5FS_section_info_t *H5MF_sect_simple_split(H5FS_section_info_t *sect,
 /* Class info for "simple" free space sections */
 H5FS_section_class_t H5MF_FSPACE_SECT_CLS_SIMPLE[1] = {{
     /* Class variables */
-    H5MF_FSPACE_SECT_SIMPLE,		/* Section type                 */
-    0,					/* Extra serialized size        */
+    H5MF_FSPACE_SECT_SIMPLE,                 /* Section type                 */
+    0,                                       /* Extra serialized size        */
     H5FS_CLS_MERGE_SYM | H5FS_CLS_ADJUST_OK, /* Class flags                  */
-    NULL,				/* Class private info           */
+    NULL,                                    /* Class private info           */
 
     /* Class methods */
-    NULL,				/* Initialize section class     */
-    NULL,				/* Terminate section class      */
+    NULL, /* Initialize section class     */
+    NULL, /* Terminate section class      */
 
     /* Object methods */
-    NULL,				/* Add section                  */
-    NULL,				/* Serialize section            */
-    H5MF_sect_simple_deserialize,	/* Deserialize section          */
-    H5MF_sect_simple_can_merge,		/* Can sections merge?          */
-    H5MF_sect_simple_merge,		/* Merge sections               */
-    H5MF_sect_simple_can_shrink,	/* Can section shrink container?*/
-    H5MF_sect_simple_shrink,		/* Shrink container w/section   */
-    H5MF_sect_simple_free,		/* Free section                 */
-    H5MF_sect_simple_valid,		/* Check validity of section    */
-    H5MF_sect_simple_split,		/* Split section node for alignment */
-    NULL,				/* Dump debugging for section   */
+    NULL,                         /* Add section                  */
+    NULL,                         /* Serialize section            */
+    H5MF_sect_simple_deserialize, /* Deserialize section          */
+    H5MF_sect_simple_can_merge,   /* Can sections merge?          */
+    H5MF_sect_simple_merge,       /* Merge sections               */
+    H5MF_sect_simple_can_shrink,  /* Can section shrink container?*/
+    H5MF_sect_simple_shrink,      /* Shrink container w/section   */
+    H5MF_sect_simple_free,        /* Free section                 */
+    H5MF_sect_simple_valid,       /* Check validity of section    */
+    H5MF_sect_simple_split,       /* Split section node for alignment */
+    NULL,                         /* Dump debugging for section   */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -111,8 +101,6 @@ H5FS_section_class_t H5MF_FSPACE_SECT_CLS_SIMPLE[1] = {{
 /* Declare a free list to manage the H5MF_free_section_t struct */
 H5FL_DEFINE(H5MF_free_section_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_new
  *
@@ -129,8 +117,8 @@ H5FL_DEFINE(H5MF_free_section_t);
 H5MF_free_section_t *
 H5MF_sect_simple_new(haddr_t sect_off, hsize_t sect_size)
 {
-    H5MF_free_section_t *sect = NULL;   /* 'Simple' free space section to add */
-    H5MF_free_section_t *ret_value;     /* Return value */
+    H5MF_free_section_t *sect = NULL; /* 'Simple' free space section to add */
+    H5MF_free_section_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -138,15 +126,16 @@ H5MF_sect_simple_new(haddr_t sect_off, hsize_t sect_size)
     HDassert(sect_size);
 
     /* Create free space section node */
-    if(NULL == (sect = H5FL_MALLOC(H5MF_free_section_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for direct block free list section")
+    if (NULL == (sect = H5FL_MALLOC(H5MF_free_section_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for direct block free list section")
 
     /* Set the information passed in */
     sect->sect_info.addr = sect_off;
     sect->sect_info.size = sect_size;
 
     /* Set the section's class & state */
-    sect->sect_info.type = H5MF_FSPACE_SECT_SIMPLE;
+    sect->sect_info.type  = H5MF_FSPACE_SECT_SIMPLE;
     sect->sect_info.state = H5FS_SECT_LIVE;
 
     /* Set return value */
@@ -156,7 +145,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_sect_simple_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_deserialize
  *
@@ -171,12 +159,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5FS_section_info_t *
-H5MF_sect_simple_deserialize(const H5FS_section_class_t H5_ATTR_UNUSED *cls,
-    hid_t H5_ATTR_UNUSED dxpl_id, const uint8_t H5_ATTR_UNUSED *buf, haddr_t sect_addr,
-    hsize_t sect_size, unsigned H5_ATTR_UNUSED *des_flags)
+H5MF_sect_simple_deserialize(const H5FS_section_class_t H5_ATTR_UNUSED *cls, hid_t H5_ATTR_UNUSED dxpl_id,
+                             const uint8_t H5_ATTR_UNUSED *buf, haddr_t sect_addr, hsize_t sect_size,
+                             unsigned H5_ATTR_UNUSED *des_flags)
 {
-    H5MF_free_section_t *sect;          /* New section */
-    H5FS_section_info_t *ret_value;     /* Return value */
+    H5MF_free_section_t *sect;      /* New section */
+    H5FS_section_info_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -185,7 +173,7 @@ H5MF_sect_simple_deserialize(const H5FS_section_class_t H5_ATTR_UNUSED *cls,
     HDassert(sect_size);
 
     /* Create free space section for block */
-    if(NULL == (sect = H5MF_sect_simple_new(sect_addr, sect_size)))
+    if (NULL == (sect = H5MF_sect_simple_new(sect_addr, sect_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, NULL, "can't initialize free space section")
 
     /* Set return value */
@@ -195,7 +183,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF_sect_simple_deserialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_can_merge
  *
@@ -212,19 +199,19 @@ done:
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5MF_sect_simple_can_merge(const H5FS_section_info_t *_sect1,
-    const H5FS_section_info_t *_sect2, void H5_ATTR_UNUSED *_udata)
+H5MF_sect_simple_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section_info_t *_sect2,
+                           void H5_ATTR_UNUSED *_udata)
 {
-    const H5MF_free_section_t *sect1 = (const H5MF_free_section_t *)_sect1;   /* File free section */
-    const H5MF_free_section_t *sect2 = (const H5MF_free_section_t *)_sect2;   /* File free section */
-    htri_t ret_value;                   /* Return value */
+    const H5MF_free_section_t *sect1 = (const H5MF_free_section_t *)_sect1; /* File free section */
+    const H5MF_free_section_t *sect2 = (const H5MF_free_section_t *)_sect2; /* File free section */
+    htri_t                     ret_value;                                   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check arguments. */
     HDassert(sect1);
     HDassert(sect2);
-    HDassert(sect1->sect_info.type == sect2->sect_info.type);   /* Checks "MERGE_SYM" flag */
+    HDassert(sect1->sect_info.type == sect2->sect_info.type); /* Checks "MERGE_SYM" flag */
     HDassert(H5F_addr_lt(sect1->sect_info.addr, sect2->sect_info.addr));
 
     /* Check if second section adjoins first section */
@@ -233,7 +220,6 @@ H5MF_sect_simple_can_merge(const H5FS_section_info_t *_sect1,
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF_sect_simple_can_merge() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_merge
  *
@@ -250,12 +236,11 @@ H5MF_sect_simple_can_merge(const H5FS_section_info_t *_sect1,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5MF_sect_simple_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
-    void H5_ATTR_UNUSED *_udata)
+H5MF_sect_simple_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2, void H5_ATTR_UNUSED *_udata)
 {
-    H5MF_free_section_t *sect1 = (H5MF_free_section_t *)_sect1;   /* File free section */
-    H5MF_free_section_t *sect2 = (H5MF_free_section_t *)_sect2;   /* File free section */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5MF_free_section_t *sect1     = (H5MF_free_section_t *)_sect1; /* File free section */
+    H5MF_free_section_t *sect2     = (H5MF_free_section_t *)_sect2; /* File free section */
+    herr_t               ret_value = SUCCEED;                       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -270,14 +255,13 @@ H5MF_sect_simple_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
     sect1->sect_info.size += sect2->sect_info.size;
 
     /* Get rid of second section */
-    if(H5MF_sect_simple_free((H5FS_section_info_t *)sect2) < 0)
+    if (H5MF_sect_simple_free((H5FS_section_info_t *)sect2) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't free section node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF_sect_simple_merge() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_can_shrink
  *
@@ -294,11 +278,11 @@ done:
 htri_t
 H5MF_sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
 {
-    const H5MF_free_section_t *sect = (const H5MF_free_section_t *)_sect;   /* File free section */
-    H5MF_sect_ud_t *udata = (H5MF_sect_ud_t *)_udata;   /* User data for callback */
-    haddr_t eoa;                /* End of address space in the file */
-    haddr_t end;                /* End of section to extend */
-    htri_t ret_value;           /* Return value */
+    const H5MF_free_section_t *sect  = (const H5MF_free_section_t *)_sect; /* File free section */
+    H5MF_sect_ud_t *           udata = (H5MF_sect_ud_t *)_udata;           /* User data for callback */
+    haddr_t                    eoa;       /* End of address space in the file */
+    haddr_t                    end;       /* End of section to extend */
+    htri_t                     ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -308,18 +292,19 @@ H5MF_sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
     HDassert(udata->f);
 
     /* Retrieve the end of the file's address space */
-    if(HADDR_UNDEF == (eoa = H5FD_get_eoa(udata->f->shared->lf, udata->alloc_type)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
+    if (HADDR_UNDEF == (eoa = H5FD_get_eoa(udata->f->shared->lf, udata->alloc_type)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
 
     /* Compute address of end of section to check */
     end = sect->sect_info.addr + sect->sect_info.size;
 
     /* Check if the section is exactly at the end of the allocated space in the file */
-    if(H5F_addr_eq(end, eoa)) {
+    if (H5F_addr_eq(end, eoa)) {
         /* Set the shrinking type */
         udata->shrink = H5MF_SHRINK_EOA;
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: section {%a, %Hu}, shrinks file, eoa = %a\n", FUNC, sect->sect_info.addr, sect->sect_info.size, eoa);
+        HDfprintf(stderr, "%s: section {%a, %Hu}, shrinks file, eoa = %a\n", FUNC, sect->sect_info.addr,
+                  sect->sect_info.size, eoa);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
         /* Indicate shrinking can occur */
@@ -327,47 +312,51 @@ HDfprintf(stderr, "%s: section {%a, %Hu}, shrinks file, eoa = %a\n", FUNC, sect-
     } /* end if */
     else {
         /* Shrinking can't occur if the 'eoa_shrink_only' flag is set and we're not shrinking the EOA */
-        if(udata->allow_eoa_shrink_only)
+        if (udata->allow_eoa_shrink_only)
             HGOTO_DONE(FALSE)
 
         /* Check if this section is allowed to merge with metadata aggregation block */
-        if(udata->f->shared->fs_aggr_merge[udata->alloc_type] & H5F_FS_MERGE_METADATA) {
-            htri_t status;              /* Status from aggregator adjoin */
+        if (udata->f->shared->fs_aggr_merge[udata->alloc_type] & H5F_FS_MERGE_METADATA) {
+            htri_t status; /* Status from aggregator adjoin */
 
             /* See if section can absorb the aggregator & vice versa */
-            if((status = H5MF_aggr_can_absorb(udata->f, &(udata->f->shared->meta_aggr), sect, &(udata->shrink))) < 0)
+            if ((status = H5MF_aggr_can_absorb(udata->f, &(udata->f->shared->meta_aggr), sect,
+                                               &(udata->shrink))) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTMERGE, FAIL, "error merging section with aggregation block")
-            else if(status > 0) {
+            else if (status > 0) {
                 /* Set the aggregator to operate on */
                 udata->aggr = &(udata->f->shared->meta_aggr);
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: section {%a, %Hu}, adjoins metadata aggregator\n", FUNC, sect->sect_info.addr, sect->sect_info.size);
+                HDfprintf(stderr, "%s: section {%a, %Hu}, adjoins metadata aggregator\n", FUNC,
+                          sect->sect_info.addr, sect->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
                 /* Indicate shrinking can occur */
                 HGOTO_DONE(TRUE)
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Check if this section is allowed to merge with small 'raw' aggregation block */
-        if(udata->f->shared->fs_aggr_merge[udata->alloc_type] & H5F_FS_MERGE_RAWDATA) {
-            htri_t status;              /* Status from aggregator adjoin */
+        if (udata->f->shared->fs_aggr_merge[udata->alloc_type] & H5F_FS_MERGE_RAWDATA) {
+            htri_t status; /* Status from aggregator adjoin */
 
             /* See if section can absorb the aggregator & vice versa */
-            if((status = H5MF_aggr_can_absorb(udata->f, &(udata->f->shared->sdata_aggr), sect, &(udata->shrink))) < 0)
+            if ((status = H5MF_aggr_can_absorb(udata->f, &(udata->f->shared->sdata_aggr), sect,
+                                               &(udata->shrink))) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTMERGE, FAIL, "error merging section with aggregation block")
-            else if(status > 0) {
+            else if (status > 0) {
                 /* Set the aggregator to operate on */
                 udata->aggr = &(udata->f->shared->sdata_aggr);
 #ifdef H5MF_ALLOC_DEBUG_MORE
-HDfprintf(stderr, "%s: section {%a, %Hu}, adjoins small data aggregator\n", FUNC, sect->sect_info.addr, sect->sect_info.size);
+                HDfprintf(stderr, "%s: section {%a, %Hu}, adjoins small data aggregator\n", FUNC,
+                          sect->sect_info.addr, sect->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
                 /* Indicate shrinking can occur */
                 HGOTO_DONE(TRUE)
             } /* end if */
-        } /* end if */
-    } /* end else */
+        }     /* end if */
+    }         /* end else */
 
     /* Set return value */
     ret_value = FALSE;
@@ -376,7 +365,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF_sect_simple_can_shrink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_shrink
  *
@@ -393,9 +381,9 @@ done:
 herr_t
 H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *_udata)
 {
-    H5MF_free_section_t **sect = (H5MF_free_section_t **)_sect;   /* File free section */
-    H5MF_sect_ud_t *udata = (H5MF_sect_ud_t *)_udata;   /* User data for callback */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5MF_free_section_t **sect      = (H5MF_free_section_t **)_sect; /* File free section */
+    H5MF_sect_ud_t *      udata     = (H5MF_sect_ud_t *)_udata;      /* User data for callback */
+    herr_t                ret_value = SUCCEED;                       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -405,12 +393,13 @@ H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *_udata)
     HDassert(udata->f);
 
     /* Check for shrinking file */
-    if(H5MF_SHRINK_EOA == udata->shrink) {
+    if (H5MF_SHRINK_EOA == udata->shrink) {
         /* Sanity check */
         HDassert(H5F_INTENT(udata->f) & H5F_ACC_RDWR);
 
         /* Release section's space at EOA with file driver */
-        if(H5FD_free(udata->f->shared->lf, udata->dxpl_id, udata->alloc_type, udata->f, (*sect)->sect_info.addr, (*sect)->sect_info.size) < 0)
+        if (H5FD_free(udata->f->shared->lf, udata->dxpl_id, udata->alloc_type, udata->f,
+                      (*sect)->sect_info.addr, (*sect)->sect_info.size) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "driver free request failed")
     } /* end if */
     else {
@@ -418,14 +407,15 @@ H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *_udata)
         HDassert(udata->aggr);
 
         /* Absorb the section into the aggregator or vice versa */
-        if(H5MF_aggr_absorb(udata->f, udata->aggr, *sect, udata->allow_sect_absorb) < 0)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTMERGE, FAIL, "can't absorb section into aggregator or vice versa")
+        if (H5MF_aggr_absorb(udata->f, udata->aggr, *sect, udata->allow_sect_absorb) < 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTMERGE, FAIL,
+                        "can't absorb section into aggregator or vice versa")
     } /* end else */
 
     /* Check for freeing section */
-    if(udata->shrink != H5MF_SHRINK_SECT_ABSORB_AGGR) {
+    if (udata->shrink != H5MF_SHRINK_SECT_ABSORB_AGGR) {
         /* Free section */
-        if(H5MF_sect_simple_free((H5FS_section_info_t *)*sect) < 0)
+        if (H5MF_sect_simple_free((H5FS_section_info_t *)*sect) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't free simple section node")
 
         /* Mark section as freed, for free space manager */
@@ -436,7 +426,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF_sect_simple_shrink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_free
  *
@@ -453,7 +442,7 @@ done:
 herr_t
 H5MF_sect_simple_free(H5FS_section_info_t *_sect)
 {
-    H5MF_free_section_t *sect = (H5MF_free_section_t *)_sect;   /* File free section */
+    H5MF_free_section_t *sect = (H5MF_free_section_t *)_sect; /* File free section */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -464,9 +453,8 @@ H5MF_sect_simple_free(H5FS_section_info_t *_sect)
     sect = H5FL_FREE(H5MF_free_section_t, sect);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5MF_sect_simple_free() */
+} /* H5MF_sect_simple_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_valid
  *
@@ -481,16 +469,15 @@ H5MF_sect_simple_free(H5FS_section_info_t *_sect)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5MF_sect_simple_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls,
-    const H5FS_section_info_t
+H5MF_sect_simple_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls, const H5FS_section_info_t
 #ifdef NDEBUG
-    H5_ATTR_UNUSED
+                                                                           H5_ATTR_UNUSED
 #endif /* NDEBUG */
-    *_sect)
+                                                                               *_sect)
 {
 #ifndef NDEBUG
-    const H5MF_free_section_t *sect = (const H5MF_free_section_t *)_sect;   /* File free section */
-#endif /* NDEBUG */
+    const H5MF_free_section_t *sect = (const H5MF_free_section_t *)_sect; /* File free section */
+#endif                                                                    /* NDEBUG */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -498,8 +485,7 @@ H5MF_sect_simple_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls,
     HDassert(sect);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5MF_sect_simple_valid() */
-
+} /* H5MF_sect_simple_valid() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5MF_sect_simple_split
@@ -517,12 +503,12 @@ H5MF_sect_simple_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls,
 static H5FS_section_info_t *
 H5MF_sect_simple_split(H5FS_section_info_t *sect, hsize_t frag_size)
 {
-    H5MF_free_section_t *ret_value;     /* Return value */
+    H5MF_free_section_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate space for new section */
-    if(NULL == (ret_value = H5MF_sect_simple_new(sect->addr, frag_size)))
+    if (NULL == (ret_value = H5MF_sect_simple_new(sect->addr, frag_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, NULL, "can't initialize free space section")
 
     /* Set new section's info */
@@ -532,4 +518,3 @@ H5MF_sect_simple_split(H5FS_section_info_t *sect, hsize_t frag_size)
 done:
     FUNC_LEAVE_NOAPI((H5FS_section_info_t *)ret_value)
 } /* end H5MF_sect_simple_split() */
-
diff --git a/src/H5MM.c b/src/H5MM.c
index 354800b..081542b 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -22,20 +22,17 @@
  *-------------------------------------------------------------------------
  */
 
-
 /****************/
 /* Module Setup */
 /****************/
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MM_malloc
  *
@@ -46,7 +43,7 @@
  *              difficult to check as a return value. This is still
  *              considered an error condition since allocations of zero
  *              bytes usually indicate problems.
- *  
+ *
  * Return:      Success:    Pointer to new memory
  *              Failure:    NULL
  *
@@ -65,7 +62,7 @@ H5MM_malloc(size_t size)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(size)
+    if (size)
         ret_value = HDmalloc(size);
     else
         ret_value = NULL;
@@ -73,7 +70,6 @@ H5MM_malloc(size_t size)
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5MM_malloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MM_calloc
  *
@@ -105,7 +101,7 @@ H5MM_calloc(size_t size)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(size)
+    if (size)
         ret_value = HDcalloc((size_t)1, size);
     else
         ret_value = NULL;
@@ -113,7 +109,6 @@ H5MM_calloc(size_t size)
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5MM_calloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MM_realloc
  *
@@ -146,7 +141,7 @@ H5MM_realloc(void *mem, size_t size)
 
     HDassert(mem || size);
 
-    if(NULL == mem && 0 == size) {  
+    if (NULL == mem && 0 == size) {
         /* Not defined in the standard, return NULL */
         ret_value = NULL;
     }
@@ -154,14 +149,13 @@ H5MM_realloc(void *mem, size_t size)
         ret_value = HDrealloc(mem, size);
 
         /* Some platforms do not return NULL if size is zero. */
-        if(0 == size)
+        if (0 == size)
             ret_value = NULL;
     }
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MM_realloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MM_xstrdup
  *
@@ -178,12 +172,12 @@ H5MM_realloc(void *mem, size_t size)
 char *
 H5MM_xstrdup(const char *s)
 {
-    char    *ret_value = NULL;
+    char *ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(s) {
-        if(NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1)))
+    if (s) {
+        if (NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
         HDstrcpy(ret_value, s);
     } /* end if */
@@ -192,7 +186,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MM_xstrdup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MM_strdup
  *
@@ -216,9 +209,9 @@ H5MM_strdup(const char *s)
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(!s)
+    if (!s)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "null string")
-    if(NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1)))
+    if (NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     HDstrcpy(ret_value, s);
 
@@ -226,7 +219,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MM_strdup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5MM_xfree
  *
@@ -250,7 +242,7 @@ H5MM_xfree(void *mem)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(mem)
+    if (mem)
         HDfree(mem);
 
     FUNC_LEAVE_NOAPI(NULL);
diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h
index ccf05e6..fe93522 100644
--- a/src/H5MMprivate.h
+++ b/src/H5MMprivate.h
@@ -29,7 +29,7 @@
 /* Private headers needed by this file */
 #include "H5private.h"
 
-#define H5MM_free(Z)	HDfree(Z)
+#define H5MM_free(Z) HDfree(Z)
 
 /*
  * Library prototypes...
@@ -42,4 +42,3 @@ H5_DLL char *H5MM_strdup(const char *s);
 H5_DLL void *H5MM_xfree(void *mem);
 
 #endif /* _H5MMprivate_H */
-
diff --git a/src/H5MMpublic.h b/src/H5MMpublic.h
index 4e54c33..f66fafb 100644
--- a/src/H5MMpublic.h
+++ b/src/H5MMpublic.h
@@ -42,4 +42,3 @@ extern "C" {
 }
 #endif
 #endif /* _H5MMpublic_H */
-
diff --git a/src/H5MP.c b/src/H5MP.c
index 251d623..7acda6c 100644
--- a/src/H5MP.c
+++ b/src/H5MP.c
@@ -27,41 +27,37 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5MP_PACKAGE		/*suppress error about including H5MPpkg  */
+#define H5MP_PACKAGE /*suppress error about including H5MPpkg  */
 
 /* Private headers */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5MPpkg.h"		/* Memory Pools				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5MPpkg.h"     /* Memory Pools				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Minimum sized block */
-#define H5MP_MIN_BLOCK  (H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)) + H5MP_BLOCK_ALIGNMENT)
+#define H5MP_MIN_BLOCK (H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)) + H5MP_BLOCK_ALIGNMENT)
 
 /* First block in page */
-#define H5MP_PAGE_FIRST_BLOCK(p) \
+#define H5MP_PAGE_FIRST_BLOCK(p)                                                                             \
     (H5MP_page_blk_t *)((unsigned char *)(p) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t)))
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /********************************/
 /* Package Variable Definitions */
 /********************************/
 
-
 /********************/
 /* Static Variables */
 /********************/
@@ -69,8 +65,6 @@
 /* Declare a free list to manage the H5MP_pool_t struct */
 H5FL_DEFINE(H5MP_pool_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_create
  *
@@ -87,40 +81,39 @@ H5FL_DEFINE(H5MP_pool_t);
 H5MP_pool_t *
 H5MP_create(size_t page_size, unsigned flags)
 {
-    H5MP_pool_t *mp = NULL;             /* New memory pool header */
-    H5MP_pool_t *ret_value;             /* Return value */
+    H5MP_pool_t *mp = NULL; /* New memory pool header */
+    H5MP_pool_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Allocate space for the pool header */
-    if(NULL == (mp = H5FL_MALLOC(H5MP_pool_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for memory pool header")
+    if (NULL == (mp = H5FL_MALLOC(H5MP_pool_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for memory pool header")
 
     /* Assign information */
     mp->page_size = H5MP_BLOCK_ALIGN(page_size);
-    mp->flags = flags;
+    mp->flags     = flags;
 
     /* Initialize information */
     mp->free_size = 0;
-    mp->first = NULL;
-    mp->max_size = mp->page_size - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t));
+    mp->first     = NULL;
+    mp->max_size  = mp->page_size - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t));
 
     /* Create factory for pool pages */
-    if(NULL == (mp->page_fac = H5FL_fac_init(page_size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "can't create page factory")
+    if (NULL == (mp->page_fac = H5FL_fac_init(page_size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "can't create page factory")
 
     /* Set return value */
     ret_value = mp;
 
 done:
-    if(NULL == ret_value && mp)
-        if(H5MP_close(mp) < 0)
+    if (NULL == ret_value && mp)
+        if (H5MP_close(mp) < 0)
             HDONE_ERROR(H5E_RESOURCE, H5E_CANTFREE, NULL, "unable to free memory pool header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MP_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_new_page
  *
@@ -137,9 +130,9 @@ done:
 static H5MP_page_t *
 H5MP_new_page(H5MP_pool_t *mp, size_t page_size)
 {
-    H5MP_page_t *new_page;              /* New page created */
-    H5MP_page_blk_t *first_blk;         /* Pointer to first block in page */
-    H5MP_page_t *ret_value;             /* Return value */
+    H5MP_page_t *    new_page;  /* New page created */
+    H5MP_page_blk_t *first_blk; /* Pointer to first block in page */
+    H5MP_page_t *    ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -148,34 +141,34 @@ H5MP_new_page(H5MP_pool_t *mp, size_t page_size)
     HDassert(page_size >= mp->page_size);
 
     /* Allocate page */
-    if(page_size > mp->page_size) {
-        if(NULL == (new_page = (H5MP_page_t *)H5MM_malloc(page_size)))
+    if (page_size > mp->page_size) {
+        if (NULL == (new_page = (H5MP_page_t *)H5MM_malloc(page_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page")
         new_page->free_size = page_size - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t));
         new_page->fac_alloc = FALSE;
     } /* end if */
     else {
-        if(NULL == (new_page = (H5MP_page_t *)H5FL_FAC_MALLOC(mp->page_fac)))
+        if (NULL == (new_page = (H5MP_page_t *)H5FL_FAC_MALLOC(mp->page_fac)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page")
         new_page->free_size = mp->max_size;
         new_page->fac_alloc = TRUE;
     } /* end else */
 #ifdef QAK
-HDfprintf(stderr,"%s: Allocating new page = %p\n", FUNC, new_page);
+    HDfprintf(stderr, "%s: Allocating new page = %p\n", FUNC, new_page);
 #endif /* QAK */
 
     /* Initialize page information */
-    first_blk = H5MP_PAGE_FIRST_BLOCK(new_page);
-    first_blk->size = new_page->free_size;
-    first_blk->page = new_page;
+    first_blk          = H5MP_PAGE_FIRST_BLOCK(new_page);
+    first_blk->size    = new_page->free_size;
+    first_blk->page    = new_page;
     first_blk->is_free = TRUE;
-    first_blk->prev = NULL;
-    first_blk->next = NULL;
+    first_blk->prev    = NULL;
+    first_blk->next    = NULL;
 
     /* Insert into page list */
     new_page->prev = NULL;
     new_page->next = mp->first;
-    if(mp->first)
+    if (mp->first)
         mp->first->prev = new_page;
     mp->first = new_page;
 
@@ -190,7 +183,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MP_new_page() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_malloc
  *
@@ -205,12 +197,12 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5MP_malloc (H5MP_pool_t *mp, size_t request)
+H5MP_malloc(H5MP_pool_t *mp, size_t request)
 {
-    H5MP_page_t *alloc_page = NULL; /* Page to allocate space from */
-    H5MP_page_blk_t *alloc_free;    /* Pointer to free space in page */
-    size_t needed;                  /* Size requested, plus block header and alignment */
-    void *ret_value;                /* Return value */
+    H5MP_page_t *    alloc_page = NULL; /* Page to allocate space from */
+    H5MP_page_blk_t *alloc_free;        /* Pointer to free space in page */
+    size_t           needed;            /* Size requested, plus block header and alignment */
+    void *           ret_value;         /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -221,31 +213,31 @@ H5MP_malloc (H5MP_pool_t *mp, size_t request)
     /* Compute actual size needed */
     needed = H5MP_BLOCK_ALIGN(request) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t));
 #ifdef QAK
-HDfprintf(stderr,"%s: sizeof(H5MP_page_blk_t) = %Zu\n", FUNC, sizeof(H5MP_page_blk_t));
-HDfprintf(stderr,"%s: request = %Zu, needed = %Zu\n", FUNC, request, needed);
+    HDfprintf(stderr, "%s: sizeof(H5MP_page_blk_t) = %Zu\n", FUNC, sizeof(H5MP_page_blk_t));
+    HDfprintf(stderr, "%s: request = %Zu, needed = %Zu\n", FUNC, request, needed);
 #endif /* QAK */
 
     /* See if the request can be handled by existing free space */
-    if(needed <= mp->free_size) {
-        size_t pool_free_avail;      /* Amount of free space possibly available in pool */
+    if (needed <= mp->free_size) {
+        size_t pool_free_avail; /* Amount of free space possibly available in pool */
 
         /* Locate page with enough free space */
-        alloc_page = mp->first;
+        alloc_page      = mp->first;
         pool_free_avail = mp->free_size;
-        while(alloc_page && pool_free_avail >= needed) {
+        while (alloc_page && pool_free_avail >= needed) {
             /* If we found a page with enough free space, search for large
              * enough free block on that page */
-            if(alloc_page->free_size >= needed) {
-                size_t page_free_avail;      /* Amount of free space possibly available */
+            if (alloc_page->free_size >= needed) {
+                size_t page_free_avail; /* Amount of free space possibly available */
 
                 /* Locate large enough block */
-                alloc_free = alloc_page->free_blk;
+                alloc_free      = alloc_page->free_blk;
                 page_free_avail = alloc_page->free_size;
-                while(alloc_free && page_free_avail >= needed) {
-                    if(alloc_free->is_free) {
+                while (alloc_free && page_free_avail >= needed) {
+                    if (alloc_free->is_free) {
                         /* If we found a large enough block, leave now */
-                        if(alloc_free->size >= needed)
-                            goto found;     /* Needed to escape double "while" loop */
+                        if (alloc_free->size >= needed)
+                            goto found; /* Needed to escape double "while" loop */
 
                         /* Decrement amount of potential space left */
                         page_free_avail -= alloc_free->size;
@@ -254,7 +246,7 @@ HDfprintf(stderr,"%s: request = %Zu, needed = %Zu\n", FUNC, request, needed);
                     /* Go to next block */
                     alloc_free = alloc_free->next;
                 } /* end while */
-            } /* end if */
+            }     /* end if */
 
             /* Decrement amount of potential space left */
             pool_free_avail -= alloc_page->free_size;
@@ -262,17 +254,17 @@ HDfprintf(stderr,"%s: request = %Zu, needed = %Zu\n", FUNC, request, needed);
             /* Go to next page */
             alloc_page = alloc_page->next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     {
-        size_t page_size;       /* Size of page needed */
+        size_t page_size; /* Size of page needed */
 
         /* Check if the request is too large for a standard page */
-        page_size = (needed > mp->max_size) ?
-            (needed + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))) : mp->page_size;
+        page_size =
+            (needed > mp->max_size) ? (needed + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))) : mp->page_size;
 
         /* Allocate new page */
-        if(NULL == (alloc_page = H5MP_new_page(mp, page_size)))
+        if (NULL == (alloc_page = H5MP_new_page(mp, page_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page")
 
         /* Set the block to allocate from */
@@ -287,24 +279,24 @@ found:
     HDassert(alloc_free);
 
     /* Check if we can subdivide the free space */
-    if(alloc_free->size > (needed + H5MP_MIN_BLOCK)) {
-        H5MP_page_blk_t *new_free;          /* New free block created */
+    if (alloc_free->size > (needed + H5MP_MIN_BLOCK)) {
+        H5MP_page_blk_t *new_free; /* New free block created */
 
         /* Carve out new free block after block to allocate */
         new_free = (H5MP_page_blk_t *)(((unsigned char *)alloc_free) + needed);
 
         /* Link into existing lists */
         new_free->next = alloc_free->next;
-        if(alloc_free->next)
+        if (alloc_free->next)
             alloc_free->next->prev = new_free;
-        new_free->prev = alloc_free;
+        new_free->prev   = alloc_free;
         alloc_free->next = new_free;
 
         /* Set blocks' information */
-        new_free->size = alloc_free->size - needed;
-        new_free->is_free = TRUE;
-        new_free->page = alloc_free->page;
-        alloc_free->size = needed;
+        new_free->size      = alloc_free->size - needed;
+        new_free->is_free   = TRUE;
+        new_free->page      = alloc_free->page;
+        alloc_free->size    = needed;
         alloc_free->is_free = FALSE;
     } /* end if */
     else {
@@ -314,21 +306,20 @@ found:
 
     /* Update page & pool's free size information */
     alloc_page->free_size -= alloc_free->size;
-    if(alloc_page->free_blk == alloc_free)
+    if (alloc_page->free_blk == alloc_free)
         alloc_page->free_blk = alloc_free->next;
     mp->free_size -= alloc_free->size;
 
     /* Set new space pointer for the return value */
     ret_value = ((unsigned char *)alloc_free) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t));
 #ifdef QAK
-HDfprintf(stderr,"%s: Allocating space from page, ret_value = %p\n", FUNC, ret_value);
+    HDfprintf(stderr, "%s: Allocating space from page, ret_value = %p\n", FUNC, ret_value);
 #endif /* QAK */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MP_malloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_free
  *
@@ -347,9 +338,9 @@ done:
 void *
 H5MP_free(H5MP_pool_t *mp, void *spc)
 {
-    H5MP_page_blk_t *spc_blk;           /* Block for space to free */
-    H5MP_page_t *spc_page;              /* Page containing block to free */
-    void *ret_value = NULL;             /* Return value */
+    H5MP_page_blk_t *spc_blk;          /* Block for space to free */
+    H5MP_page_t *    spc_page;         /* Page containing block to free */
+    void *           ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -367,57 +358,56 @@ H5MP_free(H5MP_pool_t *mp, void *spc)
     /* Add it's space to the amount of free space in the page & pool */
     spc_page = spc_blk->page;
 #ifdef QAK
-HDfprintf(stderr,"%s: Freeing from page = %p\n", "H5MP_free", spc_page);
+    HDfprintf(stderr, "%s: Freeing from page = %p\n", "H5MP_free", spc_page);
 #endif /* QAK */
     spc_page->free_size += spc_blk->size;
     mp->free_size += spc_blk->size;
 
     /* Move page with newly freed space to front of list of pages in pool */
-    if(spc_page != mp->first) {
+    if (spc_page != mp->first) {
         /* Remove page from list */
         spc_page->prev->next = spc_page->next;
-        if(spc_page->next)
+        if (spc_page->next)
             spc_page->next->prev = spc_page->prev;
 
         /* Insert page at beginning of list */
-        spc_page->prev = NULL;
-        spc_page->next = mp->first;
+        spc_page->prev  = NULL;
+        spc_page->next  = mp->first;
         mp->first->prev = spc_page;
-        mp->first = spc_page;
+        mp->first       = spc_page;
     } /* end if */
 
     /* Check if block can be merged with free space after it on page */
-    if(spc_blk->next != NULL) {
-        H5MP_page_blk_t *next_blk;          /* Block following space to free */
+    if (spc_blk->next != NULL) {
+        H5MP_page_blk_t *next_blk; /* Block following space to free */
 
         next_blk = spc_blk->next;
         HDassert(next_blk->prev == spc_blk);
-        if(next_blk->is_free) {
+        if (next_blk->is_free) {
             spc_blk->size += next_blk->size;
             spc_blk->next = next_blk->next;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Check if block can be merged with free space before it on page */
-    if(spc_blk->prev != NULL) {
-        H5MP_page_blk_t *prev_blk;          /* Block before space to free */
+    if (spc_blk->prev != NULL) {
+        H5MP_page_blk_t *prev_blk; /* Block before space to free */
 
         prev_blk = spc_blk->prev;
         HDassert(prev_blk->next == spc_blk);
-        if(prev_blk->is_free) {
+        if (prev_blk->is_free) {
             prev_blk->size += spc_blk->size;
             prev_blk->next = spc_blk->next;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Check if the block freed becomes the first free block on the page */
-    if(spc_page->free_blk == NULL || spc_blk < spc_page->free_blk)
+    if (spc_page->free_blk == NULL || spc_blk < spc_page->free_blk)
         spc_page->free_blk = spc_blk;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MP_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_close
  *
@@ -434,32 +424,32 @@ HDfprintf(stderr,"%s: Freeing from page = %p\n", "H5MP_free", spc_page);
 herr_t
 H5MP_close(H5MP_pool_t *mp)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Release memory for pool pages */
-    if(mp->first != NULL) {
-        H5MP_page_t *page, *next_page;  /* Pointer to pages in pool */
+    if (mp->first != NULL) {
+        H5MP_page_t *page, *next_page; /* Pointer to pages in pool */
 
         /* Iterate through pages, releasing them */
         page = mp->first;
-        while(page) {
+        while (page) {
             next_page = page->next;
 
             /* Free the page appropriately */
-            if(page->fac_alloc)
+            if (page->fac_alloc)
                 page = (H5MP_page_t *)H5FL_FAC_FREE(mp->page_fac, page);
             else
                 page = (H5MP_page_t *)H5MM_xfree(page);
 
             page = next_page;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     /* Release page factory */
-    if(mp->page_fac)
-        if(H5FL_fac_term(mp->page_fac) < 0)
+    if (mp->page_fac)
+        if (H5FL_fac_term(mp->page_fac) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't destroy page factory")
 
 done:
@@ -468,4 +458,3 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MP_close() */
-
diff --git a/src/H5MPpkg.h b/src/H5MPpkg.h
index ff1c33c..23bcecf 100644
--- a/src/H5MPpkg.h
+++ b/src/H5MPpkg.h
@@ -27,10 +27,10 @@
 #define _H5MPpkg_H
 
 /* Get package's private header */
-#include "H5MPprivate.h"	/* Memory Pools				*/
+#include "H5MPprivate.h" /* Memory Pools				*/
 
 /* Other private headers needed by this file */
-#include "H5FLprivate.h"	/* Free Lists                           */
+#include "H5FLprivate.h" /* Free Lists                           */
 
 /**************************/
 /* Package Private Macros */
@@ -40,60 +40,56 @@
 /* (Ideas from Apache APR :-) */
 
 /* Default alignment necessary */
-#define H5MP_BLOCK_ALIGNMENT    8
+#define H5MP_BLOCK_ALIGNMENT 8
 
 /* General alignment macro */
 /* (this only works for aligning to power of 2 boundary) */
-#define H5MP_ALIGN(x, a) \
-       (((x) + ((size_t)(a)) - 1) & ~(((size_t)(a)) - 1))
+#define H5MP_ALIGN(x, a) (((x) + ((size_t)(a)) - 1) & ~(((size_t)(a)) - 1))
 
 /* Default alignment */
 #define H5MP_BLOCK_ALIGN(x) H5MP_ALIGN(x, H5MP_BLOCK_ALIGNMENT)
 
-
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
 /* Free block in pool */
 typedef struct H5MP_page_blk_t {
-    size_t size;                        /* Size of block (includes this H5MP_page_blk_t info) */
-    unsigned is_free:1;                 /* Flag to indicate the block is free */
-    struct H5MP_page_t *page;           /* Pointer to page block is located in */
-    struct H5MP_page_blk_t *prev;       /* Pointer to previous block in page */
-    struct H5MP_page_blk_t *next;       /* Pointer to next block in page */
+    size_t                  size;        /* Size of block (includes this H5MP_page_blk_t info) */
+    unsigned                is_free : 1; /* Flag to indicate the block is free */
+    struct H5MP_page_t *    page;        /* Pointer to page block is located in */
+    struct H5MP_page_blk_t *prev;        /* Pointer to previous block in page */
+    struct H5MP_page_blk_t *next;        /* Pointer to next block in page */
 } H5MP_page_blk_t;
 
 /* Memory pool page */
 typedef struct H5MP_page_t {
-    size_t free_size;                   /* Total amount of free space in page */
-    unsigned fac_alloc:1;               /* Flag to indicate the page was allocated by the pool's factory */
-    H5MP_page_blk_t *free_blk;          /* Pointer to first free block in page */
-    struct H5MP_page_t *next;           /* Pointer to next page in pool */
-    struct H5MP_page_t *prev;           /* Pointer to previous page in pool */
+    size_t              free_size;     /* Total amount of free space in page */
+    unsigned            fac_alloc : 1; /* Flag to indicate the page was allocated by the pool's factory */
+    H5MP_page_blk_t *   free_blk;      /* Pointer to first free block in page */
+    struct H5MP_page_t *next;          /* Pointer to next page in pool */
+    struct H5MP_page_t *prev;          /* Pointer to previous page in pool */
 } H5MP_page_t;
 
 /* Memory pool header */
 struct H5MP_pool_t {
     H5FL_fac_head_t *page_fac;  /* Free-list factory for pages */
-    size_t page_size;           /* Page size for pool */
-    size_t free_size;           /* Total amount of free space in pool */
-    size_t max_size;            /* Maximum block that will fit in a standard page */
-    H5MP_page_t *first;         /* Pointer to first page in pool */
-    unsigned flags;             /* Bit flags for pool settings */
+    size_t           page_size; /* Page size for pool */
+    size_t           free_size; /* Total amount of free space in pool */
+    size_t           max_size;  /* Maximum block that will fit in a standard page */
+    H5MP_page_t *    first;     /* Pointer to first page in pool */
+    unsigned         flags;     /* Bit flags for pool settings */
 };
 
-
 /*****************************************/
 /* Package Private Variable Declarations */
 /*****************************************/
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 #ifdef H5MP_TESTING
-H5_DLL herr_t H5MP_get_pool_free_size (const H5MP_pool_t *mp, size_t *free_size);
+H5_DLL herr_t H5MP_get_pool_free_size(const H5MP_pool_t *mp, size_t *free_size);
 H5_DLL htri_t H5MP_pool_is_free_size_correct(const H5MP_pool_t *mp);
 H5_DLL herr_t H5MP_get_pool_first_page(const H5MP_pool_t *mp, H5MP_page_t **page);
 H5_DLL herr_t H5MP_get_page_free_size(const H5MP_page_t *mp, size_t *page);
@@ -101,4 +97,3 @@ H5_DLL herr_t H5MP_get_page_next_page(const H5MP_page_t *page, H5MP_page_t **nex
 #endif /* H5MP_TESTING */
 
 #endif /* _H5MPpkg_H */
-
diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h
index 009cb50..22e36cc 100644
--- a/src/H5MPprivate.h
+++ b/src/H5MPprivate.h
@@ -30,16 +30,14 @@
 
 /* Private headers needed by this file */
 
-
 /**************************/
 /* Library Private Macros */
 /**************************/
 
 /* Pool creation flags */
 /* Default settings */
-#define H5MP_FLG_DEFAULT        0
-#define H5MP_PAGE_SIZE_DEFAULT  4096    /* (bytes) */
-
+#define H5MP_FLG_DEFAULT       0
+#define H5MP_PAGE_SIZE_DEFAULT 4096 /* (bytes) */
 
 /****************************/
 /* Library Private Typedefs */
@@ -48,13 +46,12 @@
 /* Memory pool header (defined in H5MPpkg.c) */
 typedef struct H5MP_pool_t H5MP_pool_t;
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
-H5_DLL H5MP_pool_t *H5MP_create (size_t page_size, unsigned flags);
-H5_DLL void * H5MP_malloc (H5MP_pool_t *mp, size_t request);
-H5_DLL void * H5MP_free (H5MP_pool_t *mp, void *spc);
-H5_DLL herr_t H5MP_close (H5MP_pool_t *mp);
+H5_DLL H5MP_pool_t *H5MP_create(size_t page_size, unsigned flags);
+H5_DLL void *       H5MP_malloc(H5MP_pool_t *mp, size_t request);
+H5_DLL void *       H5MP_free(H5MP_pool_t *mp, void *spc);
+H5_DLL herr_t       H5MP_close(H5MP_pool_t *mp);
 
 #endif /* _H5MPprivate_H */
diff --git a/src/H5MPtest.c b/src/H5MPtest.c
index c353bb8..8ba54f9 100644
--- a/src/H5MPtest.c
+++ b/src/H5MPtest.c
@@ -17,19 +17,18 @@
  * Purpose:	Memory pool testing functions.
  */
 
-#define H5MP_PACKAGE		/*suppress error about including H5MPpkg  */
-#define H5MP_TESTING		/*include H5MP testing funcs*/
+#define H5MP_PACKAGE /*suppress error about including H5MPpkg  */
+#define H5MP_TESTING /*include H5MP testing funcs*/
 
 /* Private headers */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5MPpkg.h"		/* Memory Pools				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5MPpkg.h"    /* Memory Pools				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
 
 /* Static Prototypes */
 
 /* Package variables */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_get_pool_free_size
  *
@@ -61,7 +60,6 @@ H5MP_get_pool_free_size(const H5MP_pool_t *mp, size_t *free_size)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5MP_get_pool_free_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_get_pool_first_page
  *
@@ -93,7 +91,6 @@ H5MP_get_pool_first_page(const H5MP_pool_t *mp, H5MP_page_t **page)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5MP_get_pool_first_page() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_pool_is_free_size_correct
  *
@@ -116,9 +113,9 @@ H5MP_get_pool_first_page(const H5MP_pool_t *mp, H5MP_page_t **page)
 htri_t
 H5MP_pool_is_free_size_correct(const H5MP_pool_t *mp)
 {
-    H5MP_page_t *page;          /* Pointer to current page */
-    size_t pool_free;           /* Size of pages' free space */
-    htri_t ret_value = TRUE;    /* Return value */
+    H5MP_page_t *page;             /* Pointer to current page */
+    size_t       pool_free;        /* Size of pages' free space */
+    htri_t       ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -127,17 +124,17 @@ H5MP_pool_is_free_size_correct(const H5MP_pool_t *mp)
 
     /* Iterate through pages, checking the free size & accumulating the
      * free space for all the pages */
-    page = mp->first;
+    page      = mp->first;
     pool_free = 0;
-    while(page != NULL) {
-        H5MP_page_blk_t *blk;           /* Pointer to current free block */
-        size_t page_free;               /* Size of blocks on free list */
+    while (page != NULL) {
+        H5MP_page_blk_t *blk;       /* Pointer to current free block */
+        size_t           page_free; /* Size of blocks on free list */
 
         /* Iterate through the blocks in page, accumulating free space */
-        blk = (H5MP_page_blk_t *)((unsigned char *)page + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t)));
+        blk       = (H5MP_page_blk_t *)((unsigned char *)page + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t)));
         page_free = 0;
-        while(blk != NULL) {
-            if(blk->is_free)
+        while (blk != NULL) {
+            if (blk->is_free)
                 page_free += blk->size;
             blk = blk->next;
         } /* end while */
@@ -145,10 +142,11 @@ H5MP_pool_is_free_size_correct(const H5MP_pool_t *mp)
         /* Check that the free space from the blocks on the free list
          * corresponds to space in page */
 #ifdef QAK
-HDfprintf(stderr,"%s: page_free = %Zu, page->free_size = %Zu\n", "H5MP_pool_is_free_size_correct", page_free, page->free_size);
+        HDfprintf(stderr, "%s: page_free = %Zu, page->free_size = %Zu\n", "H5MP_pool_is_free_size_correct",
+                  page_free, page->free_size);
 #endif /* QAK */
-        if(page_free != page->free_size)
-            HGOTO_DONE (FALSE)
+        if (page_free != page->free_size)
+            HGOTO_DONE(FALSE)
 
         /* Increment the amount of free space in pool */
         pool_free += page->free_size;
@@ -160,16 +158,16 @@ HDfprintf(stderr,"%s: page_free = %Zu, page->free_size = %Zu\n", "H5MP_pool_is_f
     /* Check that the free space from the pages
      * corresponds to free space in pool */
 #ifdef QAK
-HDfprintf(stderr,"%s: pool_free = %Zu, mp->free_size = %Zu\n", "H5MP_pool_is_free_size_correct", pool_free, mp->free_size);
+    HDfprintf(stderr, "%s: pool_free = %Zu, mp->free_size = %Zu\n", "H5MP_pool_is_free_size_correct",
+              pool_free, mp->free_size);
 #endif /* QAK */
-    if(pool_free != mp->free_size)
-        HGOTO_DONE (FALSE)
+    if (pool_free != mp->free_size)
+        HGOTO_DONE(FALSE)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MP_pool_is_free_size_correct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_get_page_free_size
  *
@@ -201,7 +199,6 @@ H5MP_get_page_free_size(const H5MP_page_t *page, size_t *free_size)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5MP_get_page_free_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5MP_get_page_next_page
  *
@@ -232,4 +229,3 @@ H5MP_get_page_next_page(const H5MP_page_t *page, H5MP_page_t **next_page)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5MP_get_page_next_page() */
-
diff --git a/src/H5O.c b/src/H5O.c
index 4df72ec..a2a78bb 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -26,65 +26,59 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5O_init_interface
+#define H5_INTERFACE_INIT_FUNC H5O_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5FOprivate.h"        /* File objects                         */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Lprivate.h"		/* Links				*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5SMprivate.h"        /* Shared object header messages        */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5FOprivate.h" /* File objects                         */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Lprivate.h"  /* Links				*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5SMprivate.h" /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for recursive traversal over objects from a group */
 typedef struct {
-    hid_t       obj_id;         /* The ID for the starting group */
-    H5G_loc_t	*start_loc;     /* Location of starting group */
-    hid_t       lapl_id;        /* LAPL for walking across links */
-    hid_t       dxpl_id; 	/* DXPL for operations */
-    H5SL_t     *visited;        /* Skip list for tracking visited nodes */
-    H5O_iterate_t op;           /* Application callback */
-    void       *op_data;        /* Application's op data */
+    hid_t         obj_id;    /* The ID for the starting group */
+    H5G_loc_t *   start_loc; /* Location of starting group */
+    hid_t         lapl_id;   /* LAPL for walking across links */
+    hid_t         dxpl_id;   /* DXPL for operations */
+    H5SL_t *      visited;   /* Skip list for tracking visited nodes */
+    H5O_iterate_t op;        /* Application callback */
+    void *        op_data;   /* Application's op data */
 } H5O_iter_visit_ud_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static herr_t H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh);
 static herr_t H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type);
-static herr_t H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, H5O_iterate_t op, void *op_data, hid_t lapl_id,
-    hid_t dxpl_id);
+static herr_t H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                        H5O_iterate_t op, void *op_data, hid_t lapl_id, hid_t dxpl_id);
 static herr_t H5O_get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr);
 static const H5O_obj_class_t *H5O_obj_class_real(H5O_t *oh);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -96,34 +90,34 @@ static const H5O_obj_class_t *H5O_obj_class_real(H5O_t *oh);
  */
 
 const H5O_msg_class_t *const H5O_msg_class_g[] = {
-    H5O_MSG_NULL,           /*0x0000 Null                                   */
-    H5O_MSG_SDSPACE,        /*0x0001 Dataspace                              */
-    H5O_MSG_LINFO,          /*0x0002 Link information                       */
-    H5O_MSG_DTYPE,          /*0x0003 Datatype                               */
-    H5O_MSG_FILL,           /*0x0004 Old data storage -- fill value         */
-    H5O_MSG_FILL_NEW,       /*0x0005 New data storage -- fill value         */
-    H5O_MSG_LINK,           /*0x0006 Link                                   */
-    H5O_MSG_EFL,            /*0x0007 Data storage -- external data files    */
-    H5O_MSG_LAYOUT,         /*0x0008 Data Layout                            */
+    H5O_MSG_NULL,     /*0x0000 Null                                   */
+    H5O_MSG_SDSPACE,  /*0x0001 Dataspace                              */
+    H5O_MSG_LINFO,    /*0x0002 Link information                       */
+    H5O_MSG_DTYPE,    /*0x0003 Datatype                               */
+    H5O_MSG_FILL,     /*0x0004 Old data storage -- fill value         */
+    H5O_MSG_FILL_NEW, /*0x0005 New data storage -- fill value         */
+    H5O_MSG_LINK,     /*0x0006 Link                                   */
+    H5O_MSG_EFL,      /*0x0007 Data storage -- external data files    */
+    H5O_MSG_LAYOUT,   /*0x0008 Data Layout                            */
 #ifdef H5O_ENABLE_BOGUS
-    H5O_MSG_BOGUS_VALID,    /*0x0009 "Bogus valid" (for testing)            */
-#else /* H5O_ENABLE_BOGUS */
-    NULL,                   /*0x0009 "Bogus valid" (for testing)            */
-#endif /* H5O_ENABLE_BOGUS */
-    H5O_MSG_GINFO,          /*0x000A Group information                      */
-    H5O_MSG_PLINE,          /*0x000B Data storage -- filter pipeline        */
-    H5O_MSG_ATTR,           /*0x000C Attribute                              */
-    H5O_MSG_NAME,           /*0x000D Object name                            */
-    H5O_MSG_MTIME,          /*0x000E Object modification date and time      */
-    H5O_MSG_SHMESG,         /*0x000F File-wide shared message table         */
-    H5O_MSG_CONT,           /*0x0010 Object header continuation             */
-    H5O_MSG_STAB,           /*0x0011 Symbol table                           */
-    H5O_MSG_MTIME_NEW,      /*0x0012 New Object modification date and time  */
-    H5O_MSG_BTREEK,         /*0x0013 Non-default v1 B-tree 'K' values       */
-    H5O_MSG_DRVINFO,        /*0x0014 Driver info settings                   */
-    H5O_MSG_AINFO,          /*0x0015 Attribute information                  */
-    H5O_MSG_REFCOUNT,       /*0x0016 Object's ref. count                    */
-    H5O_MSG_UNKNOWN         /*0x0017 Placeholder for unknown message        */
+    H5O_MSG_BOGUS_VALID, /*0x0009 "Bogus valid" (for testing)            */
+#else                    /* H5O_ENABLE_BOGUS */
+    NULL, /*0x0009 "Bogus valid" (for testing)            */
+#endif                   /* H5O_ENABLE_BOGUS */
+    H5O_MSG_GINFO,       /*0x000A Group information                      */
+    H5O_MSG_PLINE,       /*0x000B Data storage -- filter pipeline        */
+    H5O_MSG_ATTR,        /*0x000C Attribute                              */
+    H5O_MSG_NAME,        /*0x000D Object name                            */
+    H5O_MSG_MTIME,       /*0x000E Object modification date and time      */
+    H5O_MSG_SHMESG,      /*0x000F File-wide shared message table         */
+    H5O_MSG_CONT,        /*0x0010 Object header continuation             */
+    H5O_MSG_STAB,        /*0x0011 Symbol table                           */
+    H5O_MSG_MTIME_NEW,   /*0x0012 New Object modification date and time  */
+    H5O_MSG_BTREEK,      /*0x0013 Non-default v1 B-tree 'K' values       */
+    H5O_MSG_DRVINFO,     /*0x0014 Driver info settings                   */
+    H5O_MSG_AINFO,       /*0x0015 Attribute information                  */
+    H5O_MSG_REFCOUNT,    /*0x0016 Object's ref. count                    */
+    H5O_MSG_UNKNOWN      /*0x0017 Placeholder for unknown message        */
 };
 
 /* Declare a free list to manage the H5O_t struct */
@@ -141,7 +135,6 @@ H5FL_BLK_DEFINE(chunk_image);
 /* Declare external the free list for H5O_cont_t sequences */
 H5FL_SEQ_EXTERN(H5O_cont_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
@@ -152,7 +145,6 @@ H5FL_EXTERN(time_t);
 /* Declare external the free list for H5_obj_t's */
 H5FL_EXTERN(H5_obj_t);
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -164,13 +156,11 @@ H5FL_EXTERN(H5_obj_t);
  * datatype message is a datatype but only some of them are datasets.
  */
 static const H5O_obj_class_t *const H5O_obj_class_g[] = {
-    H5O_OBJ_DATATYPE,		/* Datatype object (H5O_TYPE_NAMED_DATATYPE - 2) */
-    H5O_OBJ_DATASET,		/* Dataset object (H5O_TYPE_DATASET - 1) */
-    H5O_OBJ_GROUP,		/* Group object (H5O_TYPE_GROUP - 0) */
+    H5O_OBJ_DATATYPE, /* Datatype object (H5O_TYPE_NAMED_DATATYPE - 2) */
+    H5O_OBJ_DATASET,  /* Dataset object (H5O_TYPE_DATASET - 1) */
+    H5O_OBJ_GROUP,    /* Group object (H5O_TYPE_GROUP - 0) */
 };
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_init_interface
  *
@@ -201,7 +191,6 @@ H5O_init_interface(void)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oopen
  *
@@ -227,27 +216,26 @@ H5O_init_interface(void)
 hid_t
 H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id)
 {
-    H5G_loc_t	loc;
-    hid_t       ret_value = FAIL;
+    H5G_loc_t loc;
+    hid_t     ret_value = FAIL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "i*si", loc_id, name, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Open the object */
-    if((ret_value = H5O_open_name(&loc, name, lapl_id, TRUE)) < 0)
+    if ((ret_value = H5O_open_name(&loc, name, lapl_id, TRUE)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oopen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oopen_by_idx
  *
@@ -272,33 +260,32 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, hid_t lapl_id)
+H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+               hid_t lapl_id)
 {
-    H5G_loc_t	loc;
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    hid_t       ret_value = FAIL;
+    H5G_loc_t  loc;
+    H5G_loc_t  obj_loc;           /* Location used to open group */
+    H5G_name_t obj_path;          /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;          /* Opened object object location */
+    hbool_t    loc_found = FALSE; /* Entry at 'name' found */
+    hid_t      ret_value = FAIL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("i", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!group_name || !*group_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (!group_name || !*group_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up opened group location to fill in */
     obj_loc.oloc = &obj_oloc;
@@ -306,24 +293,24 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location, according to the order in the index */
-    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &obj_loc /*out*/, lapl_id,
+                            H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     loc_found = TRUE;
 
     /* Open the object */
-    if((ret_value = H5O_open_by_loc(&obj_loc, lapl_id, H5AC_ind_dxpl_id, TRUE)) < 0)
+    if ((ret_value = H5O_open_by_loc(&obj_loc, lapl_id, H5AC_ind_dxpl_id, TRUE)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
     /* Release the object location if we failed after copying it */
-    if(ret_value < 0 && loc_found)
-        if(H5G_loc_free(&obj_loc) < 0)
+    if (ret_value < 0 && loc_found)
+        if (H5G_loc_free(&obj_loc) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oopen_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oopen_by_addr
  *
@@ -362,20 +349,20 @@ done:
 hid_t
 H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
 {
-    H5G_loc_t	loc;
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hid_t       lapl_id = H5P_LINK_ACCESS_DEFAULT; /* lapl to use to open this object */
-    hid_t       ret_value = FAIL;
+    H5G_loc_t  loc;
+    H5G_loc_t  obj_loc;                             /* Location used to open group */
+    H5G_name_t obj_path;                            /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;                            /* Opened object object location */
+    hid_t      lapl_id   = H5P_LINK_ACCESS_DEFAULT; /* lapl to use to open this object */
+    hid_t      ret_value = FAIL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "ia", loc_id, addr);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no address supplied")
 
     /* Set up opened group location to fill in */
@@ -384,10 +371,10 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
     H5G_loc_reset(&obj_loc);
     obj_loc.oloc->addr = addr;
     obj_loc.oloc->file = loc.oloc->file;
-    H5G_name_reset(obj_loc.path);       /* objects opened through this routine don't have a path name */
+    H5G_name_reset(obj_loc.path); /* objects opened through this routine don't have a path name */
 
     /* Open the object */
-    if((ret_value = H5O_open_by_loc(&obj_loc, lapl_id, H5AC_ind_dxpl_id, TRUE)) < 0)
+    if ((ret_value = H5O_open_by_loc(&obj_loc, lapl_id, H5AC_ind_dxpl_id, TRUE)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
@@ -395,7 +382,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oopen_by_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Olink
  *
@@ -418,42 +404,41 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
-    hid_t lapl_id)
+H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id)
 {
-    H5G_loc_t	new_loc;
-    H5G_loc_t	obj_loc;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5G_loc_t new_loc;
+    H5G_loc_t obj_loc;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "ii*sii", obj_id, new_loc_id, new_name, lcpl_id, lapl_id);
 
     /* Check arguments */
-    if(H5G_loc(obj_id, &obj_loc) < 0)
+    if (H5G_loc(obj_id, &obj_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(new_loc_id == H5L_SAME_LOC)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "cannot use H5L_SAME_LOC when only one location is specified")
-    if(H5G_loc(new_loc_id, &new_loc) < 0)
+    if (new_loc_id == H5L_SAME_LOC)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
+                    "cannot use H5L_SAME_LOC when only one location is specified")
+    if (H5G_loc(new_loc_id, &new_loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!new_name || !*new_name)
+    if (!new_name || !*new_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
 /* Avoid compiler warning on 32-bit machines */
 #if H5_SIZEOF_SIZE_T > H5_SIZEOF_INT32_T
-    if(HDstrlen(new_name) > H5L_MAX_LINK_NAME_LEN)
+    if (HDstrlen(new_name) > H5L_MAX_LINK_NAME_LEN)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "name too long")
 #endif /* H5_SIZEOF_SIZE_T > H5_SIZEOF_INT32_T */
-    if(lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
+    if (lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link creation property list")
 
     /* Link to the object */
-    if(H5L_link(&new_loc, new_name, &obj_loc, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
+    if (H5L_link(&new_loc, new_name, &obj_loc, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Olink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oincr_refcount
  *
@@ -477,24 +462,23 @@ done:
 herr_t
 H5Oincr_refcount(hid_t object_id)
 {
-    H5O_loc_t  *oloc;
-    herr_t      ret_value = SUCCEED;
+    H5O_loc_t *oloc;
+    herr_t     ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the object's oloc so we can adjust its link count */
-    if((oloc = H5O_get_loc(object_id)) == NULL)
+    if ((oloc = H5O_get_loc(object_id)) == NULL)
         HGOTO_ERROR(H5E_ATOM, H5E_BADVALUE, FAIL, "unable to get object location from ID")
 
-    if(H5O_link(oloc, 1, H5AC_dxpl_id) < 0)
+    if (H5O_link(oloc, 1, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5O_incr_refcount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Odecr_refcount
  *
@@ -518,24 +502,23 @@ done:
 herr_t
 H5Odecr_refcount(hid_t object_id)
 {
-    H5O_loc_t  *oloc;
-    herr_t      ret_value = SUCCEED;
+    H5O_loc_t *oloc;
+    herr_t     ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the object's oloc so we can adjust its link count */
-    if((oloc = H5O_get_loc(object_id)) == NULL)
+    if ((oloc = H5O_get_loc(object_id)) == NULL)
         HGOTO_ERROR(H5E_ATOM, H5E_BADVALUE, FAIL, "unable to get object location from ID")
 
-    if(H5O_link(oloc, -1, H5AC_dxpl_id) < 0)
+    if (H5O_link(oloc, -1, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Odecr_refcount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oexists_by_name
  *
@@ -552,32 +535,30 @@ done:
 htri_t
 H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id)
 {
-    H5G_loc_t	loc;                    /* Location info */
-    hid_t       ret_value = FAIL;       /* Return value */
+    H5G_loc_t loc;              /* Location info */
+    hid_t     ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("t", "i*si", loc_id, name, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Check if the object exists */
-    if((ret_value = H5G_loc_exists(&loc, name, lapl_id, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5G_loc_exists(&loc, name, lapl_id, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine if '%s' exists", name)
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oexists_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oget_info
  *
@@ -594,27 +575,26 @@ done:
 herr_t
 H5Oget_info(hid_t loc_id, H5O_info_t *oinfo)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Location of group */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", loc_id, oinfo);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!oinfo)
+    if (!oinfo)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
 
     /* Retrieve the object's information */
-    if(H5G_loc_info(&loc, ".", TRUE, oinfo/*out*/, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_info(&loc, ".", TRUE, oinfo /*out*/, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oget_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oget_info_by_name
  *
@@ -631,34 +611,32 @@ done:
 herr_t
 H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t lapl_id)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Location of group */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*s*xi", loc_id, name, oinfo, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(!oinfo)
+    if (!oinfo)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Retrieve the object's information */
-    if(H5G_loc_info(&loc, name, TRUE, oinfo/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_info(&loc, name, TRUE, oinfo /*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oget_info_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oget_info_by_idx
  *
@@ -674,36 +652,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, H5O_info_t *oinfo, hid_t lapl_id)
+H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                   hsize_t n, H5O_info_t *oinfo, hid_t lapl_id)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t  loc;                 /* Location of group */
+    H5G_loc_t  obj_loc;             /* Location used to open group */
+    H5G_name_t obj_path;            /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;            /* Opened object object location */
+    hbool_t    loc_found = FALSE;   /* Entry at 'name' found */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, oinfo,
-             lapl_id);
+    H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, oinfo, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!group_name || !*group_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(!oinfo)
+    if (!group_name || !*group_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (!oinfo)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Set up opened group location to fill in */
     obj_loc.oloc = &obj_oloc;
@@ -711,23 +687,23 @@ H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location, according to the order in the index */
-    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &obj_loc /*out*/, lapl_id,
+                            H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     loc_found = TRUE;
 
     /* Retrieve the object's information */
-    if(H5O_get_info(obj_loc.oloc, H5AC_ind_dxpl_id, TRUE, oinfo) < 0)
+    if (H5O_get_info(obj_loc.oloc, H5AC_ind_dxpl_id, TRUE, oinfo) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve object info")
 
 done:
     /* Release the object location */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oget_info_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oset_comment
  *
@@ -748,25 +724,24 @@ done:
 herr_t
 H5Oset_comment(hid_t obj_id, const char *comment)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Location of group */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", obj_id, comment);
 
     /* Check args */
-    if(H5G_loc(obj_id, &loc) < 0)
+    if (H5G_loc(obj_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* (Re)set the object's comment */
-    if(H5G_loc_set_comment(&loc, ".", comment, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_set_comment(&loc, ".", comment, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oset_comment() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oset_comment_by_name
  *
@@ -785,35 +760,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment,
-    hid_t lapl_id)
+H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, hid_t lapl_id)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Location of group */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*s*si", loc_id, name, comment, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* (Re)set the object's comment */
-    if(H5G_loc_set_comment(&loc, name, comment, lapl_id, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_set_comment(&loc, name, comment, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oset_comment_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oget_comment
  *
@@ -833,25 +805,25 @@ done:
 ssize_t
 H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    ssize_t     ret_value;              /* Return value */
+    H5G_loc_t loc;       /* Location of group */
+    ssize_t   ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "i*sz", obj_id, comment, bufsize);
 
     /* Check args */
-    if(H5G_loc(obj_id, &loc) < 0)
+    if (H5G_loc(obj_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Retrieve the object's comment */
-    if((ret_value = H5G_loc_get_comment(&loc, ".", comment/*out*/, bufsize, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5G_loc_get_comment(&loc, ".", comment /*out*/, bufsize, H5P_LINK_ACCESS_DEFAULT,
+                                         H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oget_comment() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oget_comment_by_name
  *
@@ -869,35 +841,33 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t bufsize,
-    hid_t lapl_id)
+H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t bufsize, hid_t lapl_id)
 {
-    H5G_loc_t	loc;                    /* Location of group */
-    ssize_t     ret_value;              /* Return value */
+    H5G_loc_t loc;       /* Location of group */
+    ssize_t   ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("Zs", "i*s*szi", loc_id, name, comment, bufsize, lapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Retrieve the object's comment */
-    if((ret_value = H5G_loc_get_comment(&loc, name, comment/*out*/, bufsize, lapl_id, H5AC_ind_dxpl_id)) < 0)
+    if ((ret_value = H5G_loc_get_comment(&loc, name, comment /*out*/, bufsize, lapl_id, H5AC_ind_dxpl_id)) <
+        0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oget_comment_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Ovisit
  *
@@ -931,31 +901,30 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
-    H5O_iterate_t op, void *op_data)
+H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op, void *op_data)
 {
-    herr_t      ret_value;              /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "iIiIox*x", obj_id, idx_type, order, op, op_data);
 
     /* Check args */
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(!op)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (!op)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
 
     /* Call internal object visitation routine */
-    if((ret_value = H5O_visit(obj_id, ".", idx_type, order, op, op_data, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed")
+    if ((ret_value = H5O_visit(obj_id, ".", idx_type, order, op, op_data, H5P_LINK_ACCESS_DEFAULT,
+                               H5AC_ind_dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ovisit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Ovisit_by_name
  *
@@ -989,39 +958,37 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, H5O_iterate_t op, void *op_data, hid_t lapl_id)
+H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                 H5O_iterate_t op, void *op_data, hid_t lapl_id)
 {
-    herr_t      ret_value;              /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "i*sIiIox*xi", loc_id, obj_name, idx_type, order, op, op_data,
-             lapl_id);
+    H5TRACE7("e", "i*sIiIox*xi", loc_id, obj_name, idx_type, order, op, op_data, lapl_id);
 
     /* Check args */
-    if(!obj_name || !*obj_name)
+    if (!obj_name || !*obj_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
-    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
-    if(!op)
+    if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if (order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if (!op)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
-    if(H5P_DEFAULT == lapl_id)
+    if (H5P_DEFAULT == lapl_id)
         lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+    else if (TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Call internal object visitation routine */
-    if((ret_value = H5O_visit(loc_id, obj_name, idx_type, order, op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed")
+    if ((ret_value = H5O_visit(loc_id, obj_name, idx_type, order, op, op_data, lapl_id, H5AC_ind_dxpl_id)) <
+        0)
+        HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ovisit_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Oclose
  *
@@ -1043,19 +1010,19 @@ done:
 herr_t
 H5Oclose(hid_t object_id)
 {
-    herr_t       ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the type of the object and close it in the correct way */
-    switch(H5I_get_type(object_id)) {
+    switch (H5I_get_type(object_id)) {
         case H5I_GROUP:
         case H5I_DATATYPE:
         case H5I_DATASET:
-            if(H5I_object(object_id) == NULL)
+            if (H5I_object(object_id) == NULL)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid object")
-            if(H5I_dec_app_ref(object_id) < 0)
+            if (H5I_dec_app_ref(object_id) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "unable to close object")
             break;
 
@@ -1073,15 +1040,15 @@ H5Oclose(hid_t object_id)
         case H5I_ERROR_STACK:
         case H5I_NTYPES:
         default:
-            HGOTO_ERROR(H5E_ARGS, H5E_CANTRELEASE, FAIL, "not a valid file object ID (dataset, group, or datatype)")
-        break;
+            HGOTO_ERROR(H5E_ARGS, H5E_CANTRELEASE, FAIL,
+                        "not a valid file object ID (dataset, group, or datatype)")
+            break;
     } /* end switch */
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_create
  *
@@ -1103,17 +1070,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc,
-    hid_t ocpl_id, H5O_loc_t *loc/*out*/)
+H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc, hid_t ocpl_id,
+           H5O_loc_t *loc /*out*/)
 {
-    H5P_genplist_t  *oc_plist;          /* Object creation property list */
-    H5O_t      *oh = NULL;              /* Object header created */
-    haddr_t     oh_addr;                /* Address of initial object header */
-    size_t      oh_size;                /* Size of initial object header */
-    uint8_t	oh_flags;		/* Object header's initial status flags */
-    unsigned    insert_flags = H5AC__NO_FLAGS_SET; /* Flags for inserting object header into cache */
-    hbool_t     store_msg_crt_idx;      /* Whether to always store message creation indices for this file */
-    herr_t      ret_value = SUCCEED;    /* return value */
+    H5P_genplist_t *oc_plist;                          /* Object creation property list */
+    H5O_t *         oh = NULL;                         /* Object header created */
+    haddr_t         oh_addr;                           /* Address of initial object header */
+    size_t          oh_size;                           /* Size of initial object header */
+    uint8_t         oh_flags;                          /* Object header's initial status flags */
+    unsigned        insert_flags = H5AC__NO_FLAGS_SET; /* Flags for inserting object header into cache */
+    hbool_t         store_msg_crt_idx;   /* Whether to always store message creation indices for this file */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1123,27 +1090,27 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc,
     HDassert(TRUE == H5P_isa_class(ocpl_id, H5P_OBJECT_CREATE));
 
     /* Check for invalid access request */
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
         HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "no write intent on file")
 
     /* Make certain we allocate at least a reasonable size for the object header */
     size_hint = H5O_ALIGN_F(f, MAX(H5O_MIN_SIZE, size_hint));
 
     /* Get the property list */
-    if(NULL == (oc_plist = (H5P_genplist_t *)H5I_object(ocpl_id)))
+    if (NULL == (oc_plist = (H5P_genplist_t *)H5I_object(ocpl_id)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Get any object header status flags set by properties */
-    if(H5P_get(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &oh_flags) < 0)
+    if (H5P_get(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &oh_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
     /* Allocate the object header and zero out header fields */
-    if(NULL == (oh = H5FL_CALLOC(H5O_t)))
+    if (NULL == (oh = H5FL_CALLOC(H5O_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize file-specific information for object header */
     store_msg_crt_idx = H5F_STORE_MSG_CRT_IDX(f);
-    if(H5F_USE_LATEST_FORMAT(f) || store_msg_crt_idx || (oh_flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED))
+    if (H5F_USE_LATEST_FORMAT(f) || store_msg_crt_idx || (oh_flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED))
         oh->version = H5O_VERSION_LATEST;
     else
         oh->version = H5O_VERSION_1;
@@ -1151,20 +1118,20 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc,
     oh->sizeof_addr = H5F_SIZEOF_ADDR(f);
 #ifdef H5O_ENABLE_BAD_MESG_COUNT
     /* Check whether the "bad message count" property is set */
-    if(H5P_exist_plist(oc_plist, H5O_BAD_MESG_COUNT_NAME) > 0) {
+    if (H5P_exist_plist(oc_plist, H5O_BAD_MESG_COUNT_NAME) > 0) {
         /* Retrieve bad message count flag */
-        if(H5P_get(oc_plist, H5O_BAD_MESG_COUNT_NAME, &oh->store_bad_mesg_count) < 0)
+        if (H5P_get(oc_plist, H5O_BAD_MESG_COUNT_NAME, &oh->store_bad_mesg_count) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get bad message count flag")
-    } /* end if */
+    }  /* end if */
 #endif /* H5O_ENABLE_BAD_MESG_COUNT */
 
     /* Set initial status flags */
     oh->flags = oh_flags;
 
     /* Initialize version-specific fields */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Initialize all time fields with current time, if we are storing them */
-        if(oh->flags & H5O_HDR_STORE_TIMES)
+        if (oh->flags & H5O_HDR_STORE_TIMES)
             oh->atime = oh->mtime = oh->ctime = oh->btime = H5_now();
         else
             oh->atime = oh->mtime = oh->ctime = oh->btime = 0;
@@ -1172,29 +1139,29 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc,
         /* Make certain attribute creation order tracking is enabled if
          *      attributes can be shared in this file.
          */
-        if(store_msg_crt_idx)
+        if (store_msg_crt_idx)
             oh->flags |= H5O_HDR_ATTR_CRT_ORDER_TRACKED;
 
         /* Retrieve attribute storage phase change values from property list */
-        if(H5P_get(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0)
+        if (H5P_get(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get max. # of compact attributes")
-        if(H5P_get(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0)
+        if (H5P_get(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get min. # of dense attributes")
 
         /* Check for non-default attribute storage phase change values */
-        if(oh->max_compact != H5O_CRT_ATTR_MAX_COMPACT_DEF || oh->min_dense != H5O_CRT_ATTR_MIN_DENSE_DEF)
+        if (oh->max_compact != H5O_CRT_ATTR_MAX_COMPACT_DEF || oh->min_dense != H5O_CRT_ATTR_MIN_DENSE_DEF)
             oh->flags |= H5O_HDR_ATTR_STORE_PHASE_CHANGE;
 
-        /* Determine correct value for chunk #0 size bits */
+            /* Determine correct value for chunk #0 size bits */
 /* Avoid compiler warning on 32-bit machines */
 #if H5_SIZEOF_SIZE_T > H5_SIZEOF_INT32_T
-        if(size_hint > 4294967295UL)
+        if (size_hint > 4294967295UL)
             oh->flags |= H5O_HDR_CHUNK0_8;
         else
 #endif /* H5_SIZEOF_SIZE_T > H5_SIZEOF_INT32_T */
-        if(size_hint > 65535)
+            if (size_hint > 65535)
             oh->flags |= H5O_HDR_CHUNK0_4;
-        else if(size_hint > 255)
+        else if (size_hint > 255)
             oh->flags |= H5O_HDR_CHUNK0_2;
     } /* end if */
     else {
@@ -1207,51 +1174,52 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc,
     oh_size = (size_t)H5O_SIZEOF_HDR(oh) + size_hint;
 
     /* Allocate disk space for header and first chunk */
-    if(HADDR_UNDEF == (oh_addr = H5MF_alloc(f, H5FD_MEM_OHDR, dxpl_id, (hsize_t)oh_size)))
+    if (HADDR_UNDEF == (oh_addr = H5MF_alloc(f, H5FD_MEM_OHDR, dxpl_id, (hsize_t)oh_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for object header")
 
     /* Create the chunk list */
     oh->nchunks = oh->alloc_nchunks = 1;
-    if(NULL == (oh->chunk = H5FL_SEQ_MALLOC(H5O_chunk_t, (size_t)oh->alloc_nchunks)))
+    if (NULL == (oh->chunk = H5FL_SEQ_MALLOC(H5O_chunk_t, (size_t)oh->alloc_nchunks)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the first chunk */
     oh->chunk[0].addr = oh_addr;
     oh->chunk[0].size = oh_size;
-    oh->chunk[0].gap = 0;
+    oh->chunk[0].gap  = 0;
 
     /* Allocate enough space for the first chunk */
     /* (including space for serializing the object header prefix */
-    if(NULL == (oh->chunk[0].image = H5FL_BLK_CALLOC(chunk_image, oh_size)))
+    if (NULL == (oh->chunk[0].image = H5FL_BLK_CALLOC(chunk_image, oh_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Put magic # for object header in first chunk */
-    if(oh->version > H5O_VERSION_1)
+    if (oh->version > H5O_VERSION_1)
         HDmemcpy(oh->chunk[0].image, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC);
 
     /* Create the message list */
-    oh->nmesgs = 1;
+    oh->nmesgs       = 1;
     oh->alloc_nmesgs = H5O_NMESGS;
-    if(NULL == (oh->mesg = H5FL_SEQ_CALLOC(H5O_mesg_t, oh->alloc_nmesgs)))
+    if (NULL == (oh->mesg = H5FL_SEQ_CALLOC(H5O_mesg_t, oh->alloc_nmesgs)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the initial "null" message, covering the entire first chunk */
-    oh->mesg[0].type = H5O_MSG_NULL;
-    oh->mesg[0].dirty = TRUE;
+    oh->mesg[0].type   = H5O_MSG_NULL;
+    oh->mesg[0].dirty  = TRUE;
     oh->mesg[0].native = NULL;
-    oh->mesg[0].raw = oh->chunk[0].image + (H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)) + H5O_SIZEOF_MSGHDR_OH(oh);
+    oh->mesg[0].raw =
+        oh->chunk[0].image + (H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)) + H5O_SIZEOF_MSGHDR_OH(oh);
     oh->mesg[0].raw_size = size_hint - (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
-    oh->mesg[0].chunkno = 0;
+    oh->mesg[0].chunkno  = 0;
 
     /* Check for non-zero initial refcount on the object header */
-    if(initial_rc > 0) {
+    if (initial_rc > 0) {
         /* Set the initial refcount & pin the header when its inserted */
         oh->rc = initial_rc;
         insert_flags |= H5AC__PIN_ENTRY_FLAG;
     } /* end if */
 
     /* Cache object header */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_OHDR, oh_addr, oh, insert_flags) < 0)
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_OHDR, oh_addr, oh, insert_flags) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header")
     oh = NULL;
 
@@ -1260,18 +1228,17 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc,
     loc->addr = oh_addr;
 
     /* Open it */
-    if(H5O_open(loc) < 0)
+    if (H5O_open(loc) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object header")
 
 done:
-    if(ret_value < 0 && oh)
-        if(H5O_free(oh) < 0)
-	    HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data")
+    if (ret_value < 0 && oh)
+        if (H5O_free(oh) < 0)
+            HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_open
  *
@@ -1293,7 +1260,7 @@ done:
 herr_t
 H5O_open(H5O_loc_t *loc)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1302,13 +1269,13 @@ H5O_open(H5O_loc_t *loc)
     HDassert(loc->file);
 
 #ifdef H5O_DEBUG
-    if(H5DEBUG(O))
-	HDfprintf(H5DEBUG(O), "> %a\n", loc->addr);
+    if (H5DEBUG(O))
+        HDfprintf(H5DEBUG(O), "> %a\n", loc->addr);
 #endif
 
     /* Turn off the variable for holding file or increment open-lock counters */
-    if(loc->holding_file)
-     	loc->holding_file = FALSE;
+    if (loc->holding_file)
+        loc->holding_file = FALSE;
     else
         H5F_INCR_NOPEN_OBJS(loc->file);
 
@@ -1316,7 +1283,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_open_name
  *
@@ -1333,12 +1299,12 @@ done:
 hid_t
 H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hbool_t app_ref)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    hid_t       dxpl_id = H5AC_ind_dxpl_id;  /* transfer property list used for this operation */
-    hid_t       ret_value = FAIL;
+    H5G_loc_t  obj_loc;                      /* Location used to open group */
+    H5G_name_t obj_path;                     /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;                     /* Opened object object location */
+    hbool_t    loc_found = FALSE;            /* Entry at 'name' found */
+    hid_t      dxpl_id   = H5AC_ind_dxpl_id; /* transfer property list used for this operation */
+    hid_t      ret_value = FAIL;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1352,23 +1318,22 @@ H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hbool_t app_ref)
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(loc, name, &obj_loc/*out*/, lapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(loc, name, &obj_loc /*out*/, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Open the object */
-    if((ret_value = H5O_open_by_loc(&obj_loc, lapl_id, dxpl_id, app_ref)) < 0)
+    if ((ret_value = H5O_open_by_loc(&obj_loc, lapl_id, dxpl_id, app_ref)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
-    if(ret_value < 0 && loc_found)
-        if(H5G_loc_free(&obj_loc) < 0)
+    if (ret_value < 0 && loc_found)
+        if (H5G_loc_free(&obj_loc) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_open_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_open_by_loc
  *
@@ -1385,27 +1350,26 @@ done:
 hid_t
 H5O_open_by_loc(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref)
 {
-    const H5O_obj_class_t *obj_class;   /* Class of object for location */
-    hid_t      ret_value;               /* Return value */
+    const H5O_obj_class_t *obj_class; /* Class of object for location */
+    hid_t                  ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(obj_loc);
 
     /* Get the object class for this location */
-    if(NULL == (obj_class = H5O_obj_class(obj_loc->oloc, dxpl_id)))
+    if (NULL == (obj_class = H5O_obj_class(obj_loc->oloc, dxpl_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine object class")
 
     /* Call the object class's 'open' routine */
     HDassert(obj_class->open);
-    if((ret_value = obj_class->open(obj_loc, lapl_id, dxpl_id, app_ref)) < 0)
+    if ((ret_value = obj_class->open(obj_loc, lapl_id, dxpl_id, app_ref)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_open_by_loc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_close
  *
@@ -1421,7 +1385,7 @@ done:
 herr_t
 H5O_close(H5O_loc_t *loc)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1434,13 +1398,12 @@ H5O_close(H5O_loc_t *loc)
     H5F_DECR_NOPEN_OBJS(loc->file);
 
 #ifdef H5O_DEBUG
-    if(H5DEBUG(O)) {
-	if(H5F_FILE_ID(loc->file)< 0 && 1 == H5F_NREFS(loc->file))
-	    HDfprintf(H5DEBUG(O), "< %a auto %lu remaining\n",
-		      loc->addr,
-		      (unsigned long)H5F_NOPEN_OBJS(loc->file));
-	else
-	    HDfprintf(H5DEBUG(O), "< %a\n", loc->addr);
+    if (H5DEBUG(O)) {
+        if (H5F_FILE_ID(loc->file) < 0 && 1 == H5F_NREFS(loc->file))
+            HDfprintf(H5DEBUG(O), "< %a auto %lu remaining\n", loc->addr,
+                      (unsigned long)H5F_NOPEN_OBJS(loc->file));
+        else
+            HDfprintf(H5DEBUG(O), "< %a\n", loc->addr);
     } /* end if */
 #endif
 
@@ -1448,20 +1411,19 @@ H5O_close(H5O_loc_t *loc)
      * If the file open object count has reached the number of open mount points
      * (each of which has a group open in the file) attempt to close the file.
      */
-    if(H5F_NOPEN_OBJS(loc->file) == H5F_NMOUNTS(loc->file))
+    if (H5F_NOPEN_OBJS(loc->file) == H5F_NMOUNTS(loc->file))
         /* Attempt to close down the file hierarchy */
-        if(H5F_try_close(loc->file) < 0)
+        if (H5F_try_close(loc->file) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCLOSEFILE, FAIL, "problem attempting file close")
 
     /* Release location information */
-    if(H5O_loc_free(loc) < 0)
+    if (H5O_loc_free(loc) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_link_oh
  *
@@ -1481,8 +1443,8 @@ done:
 int
 H5O_link_oh(H5F_t *f, int adjust, hid_t dxpl_id, H5O_t *oh, hbool_t *deleted)
 {
-    haddr_t addr = H5O_OH_GET_ADDR(oh);     /* Object header address */
-    int	ret_value;                      /* Return value */
+    haddr_t addr = H5O_OH_GET_ADDR(oh); /* Object header address */
+    int     ret_value;                  /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1492,59 +1454,59 @@ H5O_link_oh(H5F_t *f, int adjust, hid_t dxpl_id, H5O_t *oh, hbool_t *deleted)
     HDassert(deleted);
 
     /* Check for adjusting link count */
-    if(adjust) {
-        if(adjust < 0) {
+    if (adjust) {
+        if (adjust < 0) {
             /* Check for too large of an adjustment */
-            if((unsigned)(-adjust) > oh->nlink)
+            if ((unsigned)(-adjust) > oh->nlink)
                 HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "link count would be negative")
 
             /* Adjust the link count for the object header */
             oh->nlink = (unsigned)((int)oh->nlink + adjust);
 
             /* Mark object header as dirty in cache */
-            if(H5AC_mark_entry_dirty(oh) < 0)
+            if (H5AC_mark_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
 
             /* Check if the object should be deleted */
-            if(oh->nlink == 0) {
+            if (oh->nlink == 0) {
                 /* Check if the object is still open by the user */
-                if(H5FO_opened(f, addr) != NULL) {
+                if (H5FO_opened(f, addr) != NULL) {
                     /* Flag the object to be deleted when it's closed */
-                    if(H5FO_mark(f, addr, TRUE) < 0)
+                    if (H5FO_mark(f, addr, TRUE) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't mark object for deletion")
                 } /* end if */
                 else {
                     /* Mark the object header for deletion */
                     *deleted = TRUE;
                 } /* end else */
-            } /* end if */
-        } /* end if */
+            }     /* end if */
+        }         /* end if */
         else {
             /* A new object, or one that will be deleted */
-            if(0 == oh->nlink) {
+            if (0 == oh->nlink) {
                 /* Check if the object is currently open, but marked for deletion */
-                if(H5FO_marked(f, addr)) {
+                if (H5FO_marked(f, addr)) {
                     /* Remove "delete me" flag on the object */
-                    if(H5FO_mark(f, addr, FALSE) < 0)
+                    if (H5FO_mark(f, addr, FALSE) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't mark object for deletion")
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             /* Adjust the link count for the object header */
             oh->nlink = (unsigned)((int)oh->nlink + adjust);
 
             /* Mark object header as dirty in cache */
-            if(H5AC_mark_entry_dirty(oh) < 0)
+            if (H5AC_mark_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
         } /* end if */
 
         /* Check for operations on refcount message */
-        if(oh->version > H5O_VERSION_1) {
+        if (oh->version > H5O_VERSION_1) {
             /* Check if the object has a refcount message already */
-            if(oh->has_refcount_msg) {
+            if (oh->has_refcount_msg) {
                 /* Check for removing refcount message */
-                if(oh->nlink <= 1) {
-                    if(H5O_msg_remove_real(f, oh, H5O_MSG_REFCOUNT, H5O_ALL, NULL, NULL, TRUE, dxpl_id) < 0)
+                if (oh->nlink <= 1) {
+                    if (H5O_msg_remove_real(f, oh, H5O_MSG_REFCOUNT, H5O_ALL, NULL, NULL, TRUE, dxpl_id) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete refcount message")
                     oh->has_refcount_msg = FALSE;
                 } /* end if */
@@ -1552,22 +1514,24 @@ H5O_link_oh(H5F_t *f, int adjust, hid_t dxpl_id, H5O_t *oh, hbool_t *deleted)
                 else {
                     H5O_refcount_t refcount = oh->nlink;
 
-                    if(H5O_msg_write_real(f, dxpl_id, oh, H5O_MSG_REFCOUNT, H5O_MSG_FLAG_DONTSHARE, 0, &refcount) < 0)
+                    if (H5O_msg_write_real(f, dxpl_id, oh, H5O_MSG_REFCOUNT, H5O_MSG_FLAG_DONTSHARE, 0,
+                                           &refcount) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTUPDATE, FAIL, "unable to update refcount message")
                 } /* end else */
-            } /* end if */
+            }     /* end if */
             else {
                 /* Check for adding refcount message to object */
-                if(oh->nlink > 1) {
+                if (oh->nlink > 1) {
                     H5O_refcount_t refcount = oh->nlink;
 
-                    if(H5O_msg_append_real(f, dxpl_id, oh, H5O_MSG_REFCOUNT, H5O_MSG_FLAG_DONTSHARE, 0, &refcount) < 0)
+                    if (H5O_msg_append_real(f, dxpl_id, oh, H5O_MSG_REFCOUNT, H5O_MSG_FLAG_DONTSHARE, 0,
+                                            &refcount) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to create new refcount message")
                     oh->has_refcount_msg = TRUE;
                 } /* end if */
-            } /* end else */
-        } /* end if */
-    } /* end if */
+            }     /* end else */
+        }         /* end if */
+    }             /* end if */
 
     /* Set return value */
     ret_value = (int)oh->nlink;
@@ -1576,7 +1540,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_link_oh() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_link
  *
@@ -1596,9 +1559,9 @@ done:
 int
 H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id)
 {
-    H5O_t	*oh = NULL;
-    hbool_t deleted = FALSE;            /* Whether the object was deleted */
-    int	ret_value;                      /* Return value */
+    H5O_t * oh      = NULL;
+    hbool_t deleted = FALSE; /* Whether the object was deleted */
+    int     ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1608,23 +1571,22 @@ H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id)
     HDassert(H5F_addr_defined(loc->addr));
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Call the "real" link routine */
-    if((ret_value = H5O_link_oh(loc->file, adjust, dxpl_id, oh, &deleted)) < 0)
+    if ((ret_value = H5O_link_oh(loc->file, adjust, dxpl_id, oh, &deleted)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust object link count")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
-    if(ret_value >= 0 && deleted && H5O_delete(loc->file, dxpl_id, loc->addr) < 0)
+    if (oh && H5O_unpin(oh) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
+    if (ret_value >= 0 && deleted && H5O_delete(loc->file, dxpl_id, loc->addr) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't delete object from file")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_protect
  *
@@ -1645,11 +1607,11 @@ done:
 H5O_t *
 H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
 {
-    H5O_t *oh = NULL;           /* Object header protected */
-    H5O_cache_ud_t udata;       /* User data for protecting object header */
-    H5O_cont_msgs_t cont_msg_info;      /* Continuation message info */
-    unsigned file_intent;       /* R/W intent on file */
-    H5O_t *ret_value;           /* Return value */
+    H5O_t *         oh = NULL;     /* Object header protected */
+    H5O_cache_ud_t  udata;         /* User data for protecting object header */
+    H5O_cont_msgs_t cont_msg_info; /* Continuation message info */
+    unsigned        file_intent;   /* R/W intent on file */
+    H5O_t *         ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1658,34 +1620,34 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
     HDassert(loc->file);
 
     /* Check for valid address */
-    if(!H5F_addr_defined(loc->addr))
+    if (!H5F_addr_defined(loc->addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "address undefined")
 
     /* Check for write access on the file */
     file_intent = H5F_INTENT(loc->file);
-    if((prot == H5AC_WRITE) && (0 == (file_intent & H5F_ACC_RDWR)))
-	HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "no write intent on file")
+    if ((prot == H5AC_WRITE) && (0 == (file_intent & H5F_ACC_RDWR)))
+        HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "no write intent on file")
 
     /* Construct the user data for protect callback */
-    udata.made_attempt = FALSE;
-    udata.v1_pfx_nmesgs = 0;
-    udata.common.f = loc->file;
-    udata.common.dxpl_id = dxpl_id;
-    udata.common.file_intent = file_intent;
+    udata.made_attempt            = FALSE;
+    udata.v1_pfx_nmesgs           = 0;
+    udata.common.f                = loc->file;
+    udata.common.dxpl_id          = dxpl_id;
+    udata.common.file_intent      = file_intent;
     udata.common.merged_null_msgs = 0;
-    udata.common.mesgs_modified = FALSE;
+    udata.common.mesgs_modified   = FALSE;
     HDmemset(&cont_msg_info, 0, sizeof(cont_msg_info));
     udata.common.cont_msg_info = &cont_msg_info;
-    udata.common.addr = loc->addr;
+    udata.common.addr          = loc->addr;
 
     /* Lock the object header into the cache */
-    if(NULL == (oh = (H5O_t *)H5AC_protect(loc->file, dxpl_id, H5AC_OHDR, loc->addr, &udata, prot)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
+    if (NULL == (oh = (H5O_t *)H5AC_protect(loc->file, dxpl_id, H5AC_OHDR, loc->addr, &udata, prot)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Check if there are any continuation messages to process */
-    if(cont_msg_info.nmsgs > 0) {
-        size_t curr_msg;        /* Current continuation message to process */
-        H5O_chk_cache_ud_t chk_udata;   /* User data for loading chunk */
+    if (cont_msg_info.nmsgs > 0) {
+        size_t             curr_msg;  /* Current continuation message to process */
+        H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */
 
         /* Sanity check - we should only have continuation messages to process
          *      when the object header is actually loaded from the file.
@@ -1694,29 +1656,31 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
         HDassert(cont_msg_info.msgs);
 
         /* Construct the user data for protecting chunks */
-        chk_udata.decoding = TRUE;
-        chk_udata.oh = oh;
-        chk_udata.chunkno = UINT_MAX;   /* Set to invalid value, for better error detection */
-        chk_udata.common.f = loc->file;
-        chk_udata.common.dxpl_id = dxpl_id;
-        chk_udata.common.file_intent = file_intent;
+        chk_udata.decoding                = TRUE;
+        chk_udata.oh                      = oh;
+        chk_udata.chunkno                 = UINT_MAX; /* Set to invalid value, for better error detection */
+        chk_udata.common.f                = loc->file;
+        chk_udata.common.dxpl_id          = dxpl_id;
+        chk_udata.common.file_intent      = file_intent;
         chk_udata.common.merged_null_msgs = udata.common.merged_null_msgs;
-        chk_udata.common.mesgs_modified = udata.common.mesgs_modified;
-        chk_udata.common.cont_msg_info = &cont_msg_info;
+        chk_udata.common.mesgs_modified   = udata.common.mesgs_modified;
+        chk_udata.common.cont_msg_info    = &cont_msg_info;
 
         /* Read in continuation messages, until there are no more */
         curr_msg = 0;
-        while(curr_msg < cont_msg_info.nmsgs) {
-            H5O_chunk_proxy_t *chk_proxy;       /* Proxy for chunk, to bring it into memory */
+        while (curr_msg < cont_msg_info.nmsgs) {
+            H5O_chunk_proxy_t *chk_proxy; /* Proxy for chunk, to bring it into memory */
 #ifndef NDEBUG
-            size_t chkcnt = oh->nchunks;      /* Count of chunks (for sanity checking) */
-#endif /* NDEBUG */
+            size_t chkcnt = oh->nchunks; /* Count of chunks (for sanity checking) */
+#endif                                   /* NDEBUG */
 
             /* Bring the chunk into the cache */
             /* (which adds to the object header) */
             chk_udata.common.addr = cont_msg_info.msgs[curr_msg].addr;
-            chk_udata.size = cont_msg_info.msgs[curr_msg].size;
-            if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(loc->file, dxpl_id, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, &chk_udata, prot)))
+            chk_udata.size        = cont_msg_info.msgs[curr_msg].size;
+            if (NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(loc->file, dxpl_id, H5AC_OHDR_CHK,
+                                                                       cont_msg_info.msgs[curr_msg].addr,
+                                                                       &chk_udata, prot)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk")
 
             /* Sanity check */
@@ -1725,7 +1689,8 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
             HDassert(oh->nchunks == (chkcnt + 1));
 
             /* Release the chunk from the cache */
-            if(H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, chk_proxy, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr,
+                               chk_proxy, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header chunk")
 
             /* Advance to next continuation message */
@@ -1737,16 +1702,16 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
 
         /* Pass back out some of the chunk's user data */
         udata.common.merged_null_msgs = chk_udata.common.merged_null_msgs;
-        udata.common.mesgs_modified = chk_udata.common.mesgs_modified;
+        udata.common.mesgs_modified   = chk_udata.common.mesgs_modified;
     } /* end if */
 
     /* Check for incorrect # of object header messages, if we've just loaded
      *  this object header from the file
      */
-    if(udata.made_attempt) {
+    if (udata.made_attempt) {
         /* Check for incorrect # of messages in v1 object header */
-        if(oh->version == H5O_VERSION_1 &&
-                (oh->nmesgs + udata.common.merged_null_msgs) != udata.v1_pfx_nmesgs) {
+        if (oh->version == H5O_VERSION_1 &&
+            (oh->nmesgs + udata.common.merged_null_msgs) != udata.v1_pfx_nmesgs) {
 /* Don't enforce the error on an incorrect # of object header messages bug
  *      unless strict format checking is enabled.  This allows for older
  *      files, created with a version of the library that had a bug in tracking
@@ -1760,25 +1725,26 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
             /* (object header will have been marked dirty during protect, if we
              *  have write access -QAK)
              */
-            if(prot != H5AC_WRITE)
+            if (prot != H5AC_WRITE)
                 oh->prefix_modified = TRUE;
 #ifndef NDEBUG
             else {
-                unsigned oh_status = 0;         /* Object header entry cache status */
+                unsigned oh_status = 0; /* Object header entry cache status */
 
                 /* Check the object header's status in the metadata cache */
-                if(H5AC_get_entry_status(loc->file, loc->addr, &oh_status) < 0)
-                    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to check metadata cache status for object header")
+                if (H5AC_get_entry_status(loc->file, loc->addr, &oh_status) < 0)
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL,
+                                "unable to check metadata cache status for object header")
 
                 /* Make certain that object header is not dirty */
                 HDassert(!(oh_status & H5AC_ES__IS_DIRTY));
             } /* end else */
-#endif /* NDEBUG */
-#endif /* H5_STRICT_FORMAT_CHECKS */
+#endif    /* NDEBUG */
+#endif    /* H5_STRICT_FORMAT_CHECKS */
         } /* end if */
 
         /* Check for any messages that were modified while being read in */
-        if(udata.common.mesgs_modified && prot != H5AC_WRITE)
+        if (udata.common.mesgs_modified && prot != H5AC_WRITE)
             oh->mesgs_modified = TRUE;
 
         /* Reset the field that contained chunk 0's size during speculative load */
@@ -1788,12 +1754,12 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
     /* Take care of loose ends for modifications made while bringing in the
      *      object header & chunks.
      */
-    if(prot == H5AC_WRITE) {
+    if (prot == H5AC_WRITE) {
         /* Check for the object header prefix being modified somehow */
         /* (usually through updating the # of object header messages) */
-        if(oh->prefix_modified) {
+        if (oh->prefix_modified) {
             /* Mark the header as dirty now */
-            if(H5AC_mark_entry_dirty(oh) < 0)
+            if (H5AC_mark_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, NULL, "unable to mark object header as dirty")
 
             /* Reset flag */
@@ -1801,50 +1767,50 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
         } /* end if */
 
         /* Check for deferred dirty messages */
-        if(oh->mesgs_modified) {
-            unsigned u;         /* Local index variable */
+        if (oh->mesgs_modified) {
+            unsigned u; /* Local index variable */
 
             /* Loop through all messages, marking their chunks as dirty */
             /* (slightly inefficient, since we don't know exactly which messages
              *  were modified when the object header & chunks were brought in
              *  from the file, but this only can happen once per load -QAK)
              */
-            for(u = 0; u < oh->nmesgs; u++) {
+            for (u = 0; u < oh->nmesgs; u++) {
                 /* Mark each chunk with a dirty message as dirty also */
-                if(oh->mesg[u].dirty) {
-                    H5O_chunk_proxy_t *chk_proxy;        /* Chunk that message is in */
+                if (oh->mesg[u].dirty) {
+                    H5O_chunk_proxy_t *chk_proxy; /* Chunk that message is in */
 
                     /* Protect chunk */
-                    if(NULL == (chk_proxy = H5O_chunk_protect(loc->file, dxpl_id, oh, oh->mesg[u].chunkno)))
+                    if (NULL == (chk_proxy = H5O_chunk_protect(loc->file, dxpl_id, oh, oh->mesg[u].chunkno)))
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk")
 
                     /* Unprotect chunk, marking it dirty */
-                    if(H5O_chunk_unprotect(loc->file, dxpl_id, chk_proxy, TRUE) < 0)
-                        HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to unprotect object header chunk")
+                    if (H5O_chunk_unprotect(loc->file, dxpl_id, chk_proxy, TRUE) < 0)
+                        HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL,
+                                    "unable to unprotect object header chunk")
                 } /* end if */
-            } /* end for */
+            }     /* end for */
 
             /* Reset flag */
             oh->mesgs_modified = FALSE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 #ifdef H5O_DEBUG
-H5O_assert(oh);
+    H5O_assert(oh);
 #endif /* H5O_DEBUG */
 
     /* Set return value */
     ret_value = oh;
 
 done:
-    if(ret_value == NULL && oh)
-        if(H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR, loc->addr, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (ret_value == NULL && oh)
+        if (H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR, loc->addr, oh, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_pin
  *
@@ -1865,8 +1831,8 @@ done:
 H5O_t *
 H5O_pin(const H5O_loc_t *loc, hid_t dxpl_id)
 {
-    H5O_t       *oh = NULL;     /* Object header */
-    H5O_t       *ret_value;     /* Return value */
+    H5O_t *oh = NULL; /* Object header */
+    H5O_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1874,12 +1840,12 @@ H5O_pin(const H5O_loc_t *loc, hid_t dxpl_id)
     HDassert(loc);
 
     /* Get header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to protect object header")
 
     /* Increment the reference count on the object header */
     /* (which will pin it, if appropriate) */
-    if(H5O_inc_rc(oh) < 0)
+    if (H5O_inc_rc(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, NULL, "unable to increment reference count on object header")
 
     /* Set the return value */
@@ -1887,13 +1853,12 @@ H5O_pin(const H5O_loc_t *loc, hid_t dxpl_id)
 
 done:
     /* Release the object header from the cache */
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_pin() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_unpin
  *
@@ -1912,7 +1877,7 @@ done:
 herr_t
 H5O_unpin(H5O_t *oh)
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1921,14 +1886,13 @@ H5O_unpin(H5O_t *oh)
 
     /* Decrement the reference count on the object header */
     /* (which will unpin it, if appropriate) */
-    if(H5O_dec_rc(oh) < 0)
+    if (H5O_dec_rc(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement reference count on object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_unpin() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_unprotect
  *
@@ -1948,7 +1912,7 @@ done:
 herr_t
 H5O_unprotect(const H5O_loc_t *loc, hid_t dxpl_id, H5O_t *oh, unsigned oh_flags)
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1957,14 +1921,13 @@ H5O_unprotect(const H5O_loc_t *loc, hid_t dxpl_id, H5O_t *oh, unsigned oh_flags)
     HDassert(oh);
 
     /* Unprotect the object header */
-    if(H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR, oh->chunk[0].addr, oh, oh_flags) < 0)
+    if (H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR, oh->chunk[0].addr, oh, oh_flags) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_unprotect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_touch_oh
  *
@@ -1982,10 +1945,10 @@ done:
 herr_t
 H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    hbool_t chk_dirtied = FALSE;        /* Flag for unprotecting chunk */
-    time_t	now;                    /* Current time */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_chunk_proxy_t *chk_proxy   = NULL;  /* Chunk that message is in */
+    hbool_t            chk_dirtied = FALSE; /* Flag for unprotecting chunk */
+    time_t             now;                 /* Current time */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1993,43 +1956,45 @@ H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force)
     HDassert(oh);
 
     /* Check if this object header is tracking times */
-    if(oh->flags & H5O_HDR_STORE_TIMES) {
+    if (oh->flags & H5O_HDR_STORE_TIMES) {
         /* Get current time */
         now = H5_now();
 
         /* Check version, to determine how to store time information */
-        if(oh->version == H5O_VERSION_1) {
-            size_t	idx;                    /* Index of modification time message to update */
+        if (oh->version == H5O_VERSION_1) {
+            size_t idx; /* Index of modification time message to update */
 
             /* Look for existing message */
-            for(idx = 0; idx < oh->nmesgs; idx++)
-                if(H5O_MSG_MTIME == oh->mesg[idx].type || H5O_MSG_MTIME_NEW == oh->mesg[idx].type)
+            for (idx = 0; idx < oh->nmesgs; idx++)
+                if (H5O_MSG_MTIME == oh->mesg[idx].type || H5O_MSG_MTIME_NEW == oh->mesg[idx].type)
                     break;
 
             /* Create a new message, if necessary */
-            if(idx == oh->nmesgs) {
-                unsigned mesg_flags = 0;        /* Flags for message in object header */
+            if (idx == oh->nmesgs) {
+                unsigned mesg_flags = 0; /* Flags for message in object header */
 
                 /* If we would have to create a new message, but we aren't 'forcing' it, get out now */
-                if(!force)
-                    HGOTO_DONE(SUCCEED);        /*nothing to do*/
+                if (!force)
+                    HGOTO_DONE(SUCCEED); /*nothing to do*/
 
                 /* Allocate space for the modification time message */
-                if(H5O_msg_alloc(f, dxpl_id, oh, H5O_MSG_MTIME_NEW, &mesg_flags, &now, &idx) < 0)
-                    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to allocate space for modification time message")
+                if (H5O_msg_alloc(f, dxpl_id, oh, H5O_MSG_MTIME_NEW, &mesg_flags, &now, &idx) < 0)
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL,
+                                "unable to allocate space for modification time message")
 
                 /* Set the message's flags if appropriate */
                 oh->mesg[idx].flags = (uint8_t)mesg_flags;
             } /* end if */
 
             /* Protect chunk */
-            if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, oh->mesg[idx].chunkno)))
+            if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, oh->mesg[idx].chunkno)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
             /* Allocate 'native' space, if necessary */
-            if(NULL == oh->mesg[idx].native) {
-                if(NULL == (oh->mesg[idx].native = H5FL_MALLOC(time_t)))
-                    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "memory allocation failed for modification time message")
+            if (NULL == oh->mesg[idx].native) {
+                if (NULL == (oh->mesg[idx].native = H5FL_MALLOC(time_t)))
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL,
+                                "memory allocation failed for modification time message")
             } /* end if */
 
             /* Update the message */
@@ -2037,7 +2002,7 @@ H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force)
 
             /* Mark the message as dirty */
             oh->mesg[idx].dirty = TRUE;
-            chk_dirtied = TRUE;
+            chk_dirtied         = TRUE;
         } /* end if */
         else {
             /* XXX: For now, update access time & change fields in the object header */
@@ -2045,20 +2010,19 @@ H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force)
             oh->atime = oh->ctime = now;
 
             /* Mark object header as dirty in cache */
-            if(H5AC_mark_entry_dirty(oh) < 0)
+            if (H5AC_mark_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Release chunk */
-    if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_touch_oh() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_touch
  *
@@ -2077,9 +2041,9 @@ done:
 herr_t
 H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id)
 {
-    H5O_t	*oh = NULL;             /* Object header to modify */
-    unsigned 	oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_t *  oh        = NULL;               /* Object header to modify */
+    unsigned oh_flags  = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
+    herr_t   ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2087,25 +2051,25 @@ H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id)
     HDassert(loc);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Create/Update the modification time message */
-    if(H5O_touch_oh(loc->file, dxpl_id, oh, force) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "unable to update object modificaton time")
+    if (H5O_touch_oh(loc->file, dxpl_id, oh, force) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "unable to update object modificaton time")
 
     /* Mark object header as changed */
     oh_flags |= H5AC__DIRTIED_FLAG;
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, oh_flags) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, oh_flags) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_touch() */
 
 #ifdef H5O_ENABLE_BOGUS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5O_bogus_oh
  *
@@ -2122,9 +2086,9 @@ done:
 herr_t
 H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned bogus_id, unsigned mesg_flags)
 {
-    size_t idx;                 /* Local index variable */
-    H5O_msg_class_t *type;      /* Message class type */
-    herr_t ret_value = SUCCEED; /* Return value */
+    size_t           idx;                 /* Local index variable */
+    H5O_msg_class_t *type;                /* Message class type */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2132,31 +2096,30 @@ H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned bogus_id, unsigned mes
     HDassert(oh);
 
     /* Look for existing message */
-    for(idx = 0; idx < oh->nmesgs; idx++)
-        if(H5O_MSG_BOGUS_VALID == oh->mesg[idx].type ||
-           H5O_MSG_BOGUS_INVALID == oh->mesg[idx].type)
+    for (idx = 0; idx < oh->nmesgs; idx++)
+        if (H5O_MSG_BOGUS_VALID == oh->mesg[idx].type || H5O_MSG_BOGUS_INVALID == oh->mesg[idx].type)
             break;
 
     /* Create a new message */
-    if(idx == oh->nmesgs) {
-        H5O_bogus_t *bogus;             /* Pointer to the bogus information */
+    if (idx == oh->nmesgs) {
+        H5O_bogus_t *bogus; /* Pointer to the bogus information */
 
         /* Allocate the native message in memory */
-        if(NULL == (bogus = H5MM_malloc(sizeof(H5O_bogus_t))))
+        if (NULL == (bogus = H5MM_malloc(sizeof(H5O_bogus_t))))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "memory allocation failed for 'bogus' message")
 
         /* Update the native value */
         bogus->u = H5O_BOGUS_VALUE;
 
-        if(bogus_id == H5O_BOGUS_VALID_ID)
+        if (bogus_id == H5O_BOGUS_VALID_ID)
             type = H5O_MSG_BOGUS_VALID;
-        else if(bogus_id == H5O_BOGUS_INVALID_ID)
+        else if (bogus_id == H5O_BOGUS_INVALID_ID)
             type = H5O_MSG_BOGUS_INVALID;
         else
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID for 'bogus' message")
 
         /* Allocate space in the object header for bogus message */
-        if(H5O_msg_alloc(f, dxpl_id, oh, type, &mesg_flags, bogus, &idx) < 0)
+        if (H5O_msg_alloc(f, dxpl_id, oh, type, &mesg_flags, bogus, &idx) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to allocate space for 'bogus' message")
 
         /* Point to "bogus" information (take it over) */
@@ -2166,7 +2129,7 @@ H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned bogus_id, unsigned mes
         oh->mesg[idx].flags = mesg_flags;
 
         /* Mark the message and object header as dirty */
-        oh->mesg[idx].dirty = TRUE;
+        oh->mesg[idx].dirty     = TRUE;
         oh->cache_info.is_dirty = TRUE;
     } /* end if */
 
@@ -2175,7 +2138,6 @@ done:
 } /* end H5O_bogus_oh() */
 #endif /* H5O_ENABLE_BOGUS */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_delete
  *
@@ -2195,10 +2157,10 @@ done:
 herr_t
 H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
 {
-    H5O_t *oh = NULL;           /* Object header information */
-    H5O_loc_t loc;              /* Object location for object to delete */
-    unsigned oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *   oh = NULL;                      /* Object header information */
+    H5O_loc_t loc;                            /* Object location for object to delete */
+    unsigned  oh_flags  = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
+    herr_t    ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2207,29 +2169,28 @@ H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
     HDassert(H5F_addr_defined(addr));
 
     /* Set up the object location */
-    loc.file = f;
-    loc.addr = addr;
+    loc.file         = f;
+    loc.addr         = addr;
     loc.holding_file = FALSE;
 
     /* Get the object header information */
-    if(NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC_WRITE)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Delete object */
-    if(H5O_delete_oh(f, dxpl_id, oh) < 0)
+    if (H5O_delete_oh(f, dxpl_id, oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't delete object from file")
 
     /* Mark object header as deleted */
     oh_flags = H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
 
 done:
-    if(oh && H5O_unprotect(&loc, dxpl_id, oh, oh_flags) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(&loc, dxpl_id, oh, oh_flags) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_delete_oh
  *
@@ -2250,9 +2211,9 @@ done:
 static herr_t
 H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
 {
-    H5O_mesg_t *curr_msg;       /* Pointer to current message being operated on */
-    unsigned	u;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_mesg_t *curr_msg; /* Pointer to current message being operated on */
+    unsigned    u;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2263,17 +2224,17 @@ H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
     /* Walk through the list of object header messages, asking each one to
      * delete any file space used
      */
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
         /* Free any space referred to in the file from this message */
-        if(H5O_delete_mesg(f, dxpl_id, oh, curr_msg) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete file space for object header message")
+        if (H5O_delete_mesg(f, dxpl_id, oh, curr_msg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL,
+                        "unable to delete file space for object header message")
     } /* end for */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_delete_oh() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_obj_type
  *
@@ -2290,27 +2251,26 @@ done:
 herr_t
 H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type, hid_t dxpl_id)
 {
-    H5O_t	*oh = NULL;             /* Object header for location */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_t *oh        = NULL;    /* Object header for location */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve the type of the object */
-    if(H5O_obj_type_real(oh, obj_type) < 0)
+    if (H5O_obj_type_real(oh, obj_type) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_obj_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_obj_type_real
  *
@@ -2327,7 +2287,7 @@ done:
 static herr_t
 H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type)
 {
-    const H5O_obj_class_t *obj_class;           /* Class of object for header */
+    const H5O_obj_class_t *obj_class; /* Class of object for header */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2336,7 +2296,7 @@ H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type)
     HDassert(obj_type);
 
     /* Look up class for object header */
-    if(NULL == (obj_class = H5O_obj_class_real(oh))) {
+    if (NULL == (obj_class = H5O_obj_class_real(oh))) {
         /* Clear error stack from "failed" class lookup */
         H5E_clear_stack(NULL);
 
@@ -2351,7 +2311,6 @@ H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_obj_type_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_obj_class
  *
@@ -2368,27 +2327,26 @@ H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type)
 const H5O_obj_class_t *
 H5O_obj_class(const H5O_loc_t *loc, hid_t dxpl_id)
 {
-    H5O_t	*oh = NULL;                     /* Object header for location */
-    const H5O_obj_class_t *ret_value;           /* Return value */
+    H5O_t *                oh = NULL; /* Object header for location */
+    const H5O_obj_class_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Test whether entry qualifies as a particular type of object */
-    if(NULL == (ret_value = H5O_obj_class_real(oh)))
+    if (NULL == (ret_value = H5O_obj_class_real(oh)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_obj_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_obj_class_real
  *
@@ -2405,8 +2363,8 @@ done:
 static const H5O_obj_class_t *
 H5O_obj_class_real(H5O_t *oh)
 {
-    size_t	i;                      /* Local index variable */
-    const H5O_obj_class_t *ret_value;   /* Return value */
+    size_t                 i;         /* Local index variable */
+    const H5O_obj_class_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -2415,23 +2373,22 @@ H5O_obj_class_real(H5O_t *oh)
 
     /* Test whether entry qualifies as a particular type of object */
     /* (Note: loop is in reverse order, to test specific objects first) */
-    for(i = NELMTS(H5O_obj_class_g); i > 0; --i) {
-        htri_t	isa;            /* Is entry a particular type? */
+    for (i = NELMTS(H5O_obj_class_g); i > 0; --i) {
+        htri_t isa; /* Is entry a particular type? */
 
-	if((isa = (H5O_obj_class_g[i - 1]->isa)(oh)) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to determine object type")
-	else if(isa)
-	    HGOTO_DONE(H5O_obj_class_g[i - 1])
+        if ((isa = (H5O_obj_class_g[i - 1]->isa)(oh)) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to determine object type")
+        else if (isa)
+            HGOTO_DONE(H5O_obj_class_g[i - 1])
     } /* end for */
 
-    if(0 == i)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to determine object type")
+    if (0 == i)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to determine object type")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_obj_class_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_get_loc
  *
@@ -2448,23 +2405,23 @@ done:
 H5O_loc_t *
 H5O_get_loc(hid_t object_id)
 {
-    H5O_loc_t   *ret_value;     /* Return value */
+    H5O_loc_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    switch(H5I_get_type(object_id)) {
+    switch (H5I_get_type(object_id)) {
         case H5I_GROUP:
-            if(NULL == (ret_value = H5O_OBJ_GROUP->get_oloc(object_id)))
+            if (NULL == (ret_value = H5O_OBJ_GROUP->get_oloc(object_id)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from group ID")
             break;
 
         case H5I_DATASET:
-            if(NULL == (ret_value = H5O_OBJ_DATASET->get_oloc(object_id)))
+            if (NULL == (ret_value = H5O_OBJ_DATASET->get_oloc(object_id)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from dataset ID")
             break;
 
         case H5I_DATATYPE:
-            if(NULL == (ret_value = H5O_OBJ_DATATYPE->get_oloc(object_id)))
+            if (NULL == (ret_value = H5O_OBJ_DATATYPE->get_oloc(object_id)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from datatype ID")
             break;
 
@@ -2489,7 +2446,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_loc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_loc_reset
  *
@@ -2518,7 +2474,6 @@ H5O_loc_reset(H5O_loc_t *loc)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_loc_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_loc_copy
  *
@@ -2555,20 +2510,20 @@ H5O_loc_copy(H5O_loc_t *dst, H5O_loc_t *src, H5_copy_depth_t depth)
     HDmemcpy(dst, src, sizeof(H5O_loc_t));
 
     /* Deep copy the names */
-    if(depth == H5_COPY_DEEP) {
+    if (depth == H5_COPY_DEEP) {
         /* If the original entry was holding open the file, this one should
          * hold it open, too.
          */
-        if(src->holding_file)
+        if (src->holding_file)
             H5F_INCR_NOPEN_OBJS(dst->file);
-    } else if(depth == H5_COPY_SHALLOW) {
+    }
+    else if (depth == H5_COPY_SHALLOW) {
         H5O_loc_reset(src);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_loc_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_loc_hold_file
  *
@@ -2593,7 +2548,7 @@ H5O_loc_hold_file(H5O_loc_t *loc)
     HDassert(loc->file);
 
     /* If this location is not already holding its file open, do so. */
-    if(!loc->holding_file) {
+    if (!loc->holding_file) {
         H5F_INCR_NOPEN_OBJS(loc->file);
         loc->holding_file = TRUE;
     } /* end if */
@@ -2601,7 +2556,6 @@ H5O_loc_hold_file(H5O_loc_t *loc)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_loc_hold_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_loc_free
  *
@@ -2628,20 +2582,19 @@ H5O_loc_free(H5O_loc_t *loc)
     HDassert(loc);
 
     /* If this location is holding its file open try to close the file. */
-    if(loc->holding_file) {
+    if (loc->holding_file) {
         H5F_DECR_NOPEN_OBJS(loc->file);
         loc->holding_file = FALSE;
-        if(H5F_NOPEN_OBJS(loc->file) <= 0) {
-            if(H5F_try_close(loc->file) < 0)
+        if (H5F_NOPEN_OBJS(loc->file) <= 0) {
+            if (H5F_try_close(loc->file) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close file")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_loc_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_get_hdr_info
  *
@@ -2658,8 +2611,8 @@ done:
 herr_t
 H5O_get_hdr_info(const H5O_loc_t *loc, hid_t dxpl_id, H5O_hdr_info_t *hdr)
 {
-    H5O_t *oh = NULL;                   /* Object header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *oh        = NULL;    /* Object header */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2671,21 +2624,20 @@ H5O_get_hdr_info(const H5O_loc_t *loc, hid_t dxpl_id, H5O_hdr_info_t *hdr)
     HDmemset(hdr, 0, sizeof(*hdr));
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to load object header")
 
     /* Get the information for the object header */
-    if(H5O_get_hdr_info_real(oh, hdr) < 0)
+    if (H5O_get_hdr_info_real(oh, hdr) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object header info")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_hdr_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_get_hdr_info_real
  *
@@ -2702,9 +2654,9 @@ done:
 static herr_t
 H5O_get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
 {
-    const H5O_mesg_t *curr_msg;         /* Pointer to current message being operated on */
-    const H5O_chunk_t *curr_chunk;	/* Pointer to current message being operated on */
-    unsigned u;                         /* Local index variable */
+    const H5O_mesg_t * curr_msg;   /* Pointer to current message being operated on */
+    const H5O_chunk_t *curr_chunk; /* Pointer to current message being operated on */
+    unsigned           u;          /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2723,18 +2675,18 @@ H5O_get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
     hdr->flags = oh->flags;
 
     /* Iterate over all the messages, accumulating message size & type information */
-    hdr->space.meta = (hsize_t)H5O_SIZEOF_HDR(oh) + (hsize_t)(H5O_SIZEOF_CHKHDR_OH(oh) * (oh->nchunks - 1));
-    hdr->space.mesg = 0;
-    hdr->space.free = 0;
+    hdr->space.meta   = (hsize_t)H5O_SIZEOF_HDR(oh) + (hsize_t)(H5O_SIZEOF_CHKHDR_OH(oh) * (oh->nchunks - 1));
+    hdr->space.mesg   = 0;
+    hdr->space.free   = 0;
     hdr->mesg.present = 0;
-    hdr->mesg.shared = 0;
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
-        uint64_t type_flag;             /* Flag for message type */
+    hdr->mesg.shared  = 0;
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+        uint64_t type_flag; /* Flag for message type */
 
         /* Accumulate space usage information, based on the type of message */
-	if(H5O_NULL_ID == curr_msg->type->id)
+        if (H5O_NULL_ID == curr_msg->type->id)
             hdr->space.free += (hsize_t)((size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg->raw_size);
-        else if(H5O_CONT_ID == curr_msg->type->id)
+        else if (H5O_CONT_ID == curr_msg->type->id)
             hdr->space.meta += (hsize_t)((size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg->raw_size);
         else {
             hdr->space.meta += (hsize_t)H5O_SIZEOF_MSGHDR_OH(oh);
@@ -2746,13 +2698,13 @@ H5O_get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
         hdr->mesg.present |= type_flag;
 
         /* Set flag if the message is shared in some way */
-        if(curr_msg->flags & H5O_MSG_FLAG_SHARED)                                   \
+        if (curr_msg->flags & H5O_MSG_FLAG_SHARED)
             hdr->mesg.shared |= type_flag;
     } /* end for */
 
     /* Iterate over all the chunks, adding any gaps to the free space */
     hdr->space.total = 0;
-    for(u = 0, curr_chunk = &oh->chunk[0]; u < oh->nchunks; u++, curr_chunk++) {
+    for (u = 0, curr_chunk = &oh->chunk[0]; u < oh->nchunks; u++, curr_chunk++) {
         /* Accumulate the size of the header on disk */
         hdr->space.total += curr_chunk->size;
 
@@ -2766,7 +2718,6 @@ H5O_get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_get_hdr_info_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_get_info
  *
@@ -2781,12 +2732,11 @@ H5O_get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info,
-    H5O_info_t *oinfo)
+H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info, H5O_info_t *oinfo)
 {
-    const H5O_obj_class_t *obj_class;   /* Class of object for header */
-    H5O_t *oh = NULL;                   /* Object header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_obj_class_t *obj_class;           /* Class of object for header */
+    H5O_t *                oh        = NULL;    /* Object header */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2795,8 +2745,8 @@ H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info,
     HDassert(oinfo);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Reset the object info structure */
     HDmemset(oinfo, 0, sizeof(*oinfo));
@@ -2808,7 +2758,7 @@ H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info,
     oinfo->addr = loc->addr;
 
     /* Get class for object */
-    if(NULL == (obj_class = H5O_obj_class_real(oh)))
+    if (NULL == (obj_class = H5O_obj_class_real(oh)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine object class")
 
     /* Retrieve the type of the object */
@@ -2818,14 +2768,14 @@ H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info,
     oinfo->rc = oh->nlink;
 
     /* Get modification time for object */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         oinfo->atime = oh->atime;
         oinfo->mtime = oh->mtime;
         oinfo->ctime = oh->ctime;
         oinfo->btime = oh->btime;
     } /* end if */
     else {
-        htri_t	exists;                 /* Flag if header message of interest exists */
+        htri_t exists; /* Flag if header message of interest exists */
 
         /* No information for access & modification fields */
         /* (we stopped updating the "modification time" header message for
@@ -2837,59 +2787,58 @@ H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info,
         oinfo->btime = 0;
 
         /* Might be information for modification time */
-        if((exists = H5O_msg_exists_oh(oh, H5O_MTIME_ID)) < 0)
+        if ((exists = H5O_msg_exists_oh(oh, H5O_MTIME_ID)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "unable to check for MTIME message")
-        if(exists > 0) {
+        if (exists > 0) {
             /* Get "old style" modification time info */
-            if(NULL == H5O_msg_read_oh(loc->file, dxpl_id, oh, H5O_MTIME_ID, &oinfo->ctime))
+            if (NULL == H5O_msg_read_oh(loc->file, dxpl_id, oh, H5O_MTIME_ID, &oinfo->ctime))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't read MTIME message")
         } /* end if */
         else {
             /* Check for "new style" modification time info */
-            if((exists = H5O_msg_exists_oh(oh, H5O_MTIME_NEW_ID)) < 0)
+            if ((exists = H5O_msg_exists_oh(oh, H5O_MTIME_NEW_ID)) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "unable to check for MTIME_NEW message")
-            if(exists > 0) {
+            if (exists > 0) {
                 /* Get "new style" modification time info */
-                if(NULL == H5O_msg_read_oh(loc->file, dxpl_id, oh, H5O_MTIME_NEW_ID, &oinfo->ctime))
+                if (NULL == H5O_msg_read_oh(loc->file, dxpl_id, oh, H5O_MTIME_NEW_ID, &oinfo->ctime))
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't read MTIME_NEW message")
             } /* end if */
             else
                 oinfo->ctime = 0;
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
     /* Get the information for the object header */
-    if(H5O_get_hdr_info_real(oh, &oinfo->hdr) < 0)
+    if (H5O_get_hdr_info_real(oh, &oinfo->hdr) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object header info")
 
     /* Retrieve # of attributes */
-    if(H5O_attr_count_real(loc->file, dxpl_id, oh, &oinfo->num_attrs) < 0)
+    if (H5O_attr_count_real(loc->file, dxpl_id, oh, &oinfo->num_attrs) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve attribute count")
 
     /* Get B-tree & heap metadata storage size, if requested */
-    if(want_ih_info) {
+    if (want_ih_info) {
         /* Check for 'bh_info' callback for this type of object */
-        if(obj_class->bh_info) {
+        if (obj_class->bh_info) {
             /* Call the object's class 'bh_info' routine */
-            if((obj_class->bh_info)(loc->file, dxpl_id, oh, &oinfo->meta_size.obj) < 0)
+            if ((obj_class->bh_info)(loc->file, dxpl_id, oh, &oinfo->meta_size.obj) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object's btree & heap info")
         } /* end if */
 
         /* Get B-tree & heap info for any attributes */
-        if(oinfo->num_attrs > 0) {
-            if(H5O_attr_bh_info(loc->file, dxpl_id, oh, &oinfo->meta_size.attr) < 0)
+        if (oinfo->num_attrs > 0) {
+            if (H5O_attr_bh_info(loc->file, dxpl_id, oh, &oinfo->meta_size.attr) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve attribute btree & heap info")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_get_create_plist
  *
@@ -2906,8 +2855,8 @@ done:
 herr_t
 H5O_get_create_plist(const H5O_loc_t *loc, hid_t dxpl_id, H5P_genplist_t *oc_plist)
 {
-    H5O_t *oh = NULL;                   /* Object header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *oh        = NULL;    /* Object header */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2916,35 +2865,36 @@ H5O_get_create_plist(const H5O_loc_t *loc, hid_t dxpl_id, H5P_genplist_t *oc_pli
     HDassert(oc_plist);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Set property values, if they were used for the object */
-    if(oh->version > H5O_VERSION_1) {
-        uint8_t ohdr_flags;             /* "User-visible" object header status flags */
+    if (oh->version > H5O_VERSION_1) {
+        uint8_t ohdr_flags; /* "User-visible" object header status flags */
 
         /* Set attribute storage values */
-        if(H5P_set(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set max. # of compact attributes in property list")
-        if(H5P_set(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0)
+        if (H5P_set(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL,
+                        "can't set max. # of compact attributes in property list")
+        if (H5P_set(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set min. # of dense attributes in property list")
 
         /* Mask off non-"user visible" flags */
-        ohdr_flags = oh->flags & (H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | H5O_HDR_STORE_TIMES);
+        ohdr_flags = oh->flags &
+                     (H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | H5O_HDR_STORE_TIMES);
 
         /* Set object header flags */
-        if(H5P_set(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+        if (H5P_set(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set object header flags")
     } /* end if */
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_get_nlinks
  *
@@ -2961,8 +2911,8 @@ done:
 herr_t
 H5O_get_nlinks(const H5O_loc_t *loc, hid_t dxpl_id, hsize_t *nlinks)
 {
-    H5O_t *oh = NULL;                   /* Object header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *oh        = NULL;    /* Object header */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2971,20 +2921,19 @@ H5O_get_nlinks(const H5O_loc_t *loc, hid_t dxpl_id, hsize_t *nlinks)
     HDassert(nlinks);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve the # of link messages seen when the object header was loaded */
     *nlinks = oh->link_msgs_seen;
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_nlinks() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_obj_create
  *
@@ -2999,11 +2948,10 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc,
-    hid_t dxpl_id)
+H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
 {
-    size_t u;                           /* Local index variable */
-    void *ret_value = NULL;             /* Return value */
+    size_t u;                /* Local index variable */
+    void * ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -3014,25 +2962,24 @@ H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc
     HDassert(obj_loc);
 
     /* Iterate through the object classes */
-    for(u = 0; u < NELMTS(H5O_obj_class_g); u++) {
+    for (u = 0; u < NELMTS(H5O_obj_class_g); u++) {
         /* Check for correct type of object to create */
-	if(H5O_obj_class_g[u]->type == obj_type) {
+        if (H5O_obj_class_g[u]->type == obj_type) {
             /* Call the object class's 'create' routine */
             HDassert(H5O_obj_class_g[u]->create);
-            if(NULL == (ret_value = H5O_obj_class_g[u]->create(f, crt_info, obj_loc, dxpl_id)))
+            if (NULL == (ret_value = H5O_obj_class_g[u]->create(f, crt_info, obj_loc, dxpl_id)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object")
 
             /* Break out of loop */
             break;
         } /* end if */
-    } /* end for */
+    }     /* end for */
     HDassert(ret_value);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_obj_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_get_oh_addr
  *
@@ -3062,7 +3009,6 @@ H5O_get_oh_addr(const H5O_t *oh)
     FUNC_LEAVE_NOAPI(oh->chunk[0].addr)
 } /* end H5O_get_oh_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_get_rc_and_type
  *
@@ -3079,8 +3025,8 @@ H5O_get_oh_addr(const H5O_t *oh)
 herr_t
 H5O_get_rc_and_type(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc, H5O_type_t *otype)
 {
-    H5O_t *oh = NULL;                   /* Object header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *oh        = NULL;    /* Object header */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3088,26 +3034,25 @@ H5O_get_rc_and_type(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc, H5O_type_
     HDassert(loc);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Set the object's reference count */
-    if(rc)
+    if (rc)
         *rc = oh->nlink;
 
     /* Retrieve the type of the object */
-    if(otype)
-        if(H5O_obj_type_real(oh, otype) < 0)
+    if (otype)
+        if (H5O_obj_type_real(oh, otype) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_rc_and_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_free_visit_visited
  *
@@ -3121,7 +3066,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *operator_data/*in,out*/)
+H5O_free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *operator_data /*in,out*/)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -3130,7 +3075,6 @@ H5O_free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_free_visit_visited() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_visit_cb
  *
@@ -3145,15 +3089,14 @@ H5O_free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *linfo,
-    void *_udata)
+H5O_visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *linfo, void *_udata)
 {
-    H5O_iter_visit_ud_t *udata = (H5O_iter_visit_ud_t *)_udata;     /* User data for callback */
-    H5G_loc_t   obj_loc;                /* Location of object */
-    H5G_name_t  obj_path;            	/* Object's group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Object's object location */
-    hbool_t     obj_found = FALSE;      /* Object at 'name' found */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    H5O_iter_visit_ud_t *udata = (H5O_iter_visit_ud_t *)_udata; /* User data for callback */
+    H5G_loc_t            obj_loc;                               /* Location of object */
+    H5G_name_t           obj_path;                              /* Object's group hier. path */
+    H5O_loc_t            obj_oloc;                              /* Object's object location */
+    hbool_t              obj_found = FALSE;                     /* Object at 'name' found */
+    herr_t               ret_value = H5_ITER_CONT;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3163,8 +3106,8 @@ H5O_visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *lin
     HDassert(udata);
 
     /* Check if this is a hard link */
-    if(linfo->type == H5L_TYPE_HARD) {
-        H5_obj_t obj_pos;       /* Object "position" for this object */
+    if (linfo->type == H5L_TYPE_HARD) {
+        H5_obj_t obj_pos; /* Object "position" for this object */
 
         /* Set up opened group location to fill in */
         obj_loc.oloc = &obj_oloc;
@@ -3173,7 +3116,7 @@ H5O_visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *lin
 
         /* Find the object using the LAPL passed in */
         /* (Correctly handles mounted files) */
-        if(H5G_loc_find(udata->start_loc, name, &obj_loc/*out*/, udata->lapl_id, udata->dxpl_id) < 0)
+        if (H5G_loc_find(udata->start_loc, name, &obj_loc /*out*/, udata->lapl_id, udata->dxpl_id) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
         obj_found = TRUE;
 
@@ -3182,47 +3125,47 @@ H5O_visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *lin
         obj_pos.addr = obj_oloc.addr;
 
         /* Check if we've seen the object the link references before */
-        if(NULL == H5SL_search(udata->visited, &obj_pos)) {
-            H5O_info_t oinfo;           /* Object info */
+        if (NULL == H5SL_search(udata->visited, &obj_pos)) {
+            H5O_info_t oinfo; /* Object info */
 
             /* Get the object's info */
-            if(H5O_get_info(&obj_oloc, udata->dxpl_id, TRUE, &oinfo) < 0)
+            if (H5O_get_info(&obj_oloc, udata->dxpl_id, TRUE, &oinfo) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get object info")
 
             /* Make the application callback */
             ret_value = (udata->op)(udata->obj_id, name, &oinfo, udata->op_data);
 
             /* Check for continuing to visit objects */
-            if(ret_value == H5_ITER_CONT) {
+            if (ret_value == H5_ITER_CONT) {
                 /* If its ref count is > 1, we add it to the list of visited objects */
                 /* (because it could come up again during traversal) */
-                if(oinfo.rc > 1) {
-                    H5_obj_t *new_node;                  /* New object node for visited list */
+                if (oinfo.rc > 1) {
+                    H5_obj_t *new_node; /* New object node for visited list */
 
                     /* Allocate new object "position" node */
-                    if((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
+                    if ((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
                         HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate object node")
 
                     /* Set node information */
                     *new_node = obj_pos;
 
                     /* Add to list of visited objects */
-                    if(H5SL_insert(udata->visited, new_node, new_node) < 0)
-                        HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert object node into visited list")
+                    if (H5SL_insert(udata->visited, new_node, new_node) < 0)
+                        HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR,
+                                    "can't insert object node into visited list")
                 } /* end if */
-            } /* end if */
-        } /* end if */
-    } /* end if */
+            }     /* end if */
+        }         /* end if */
+    }             /* end if */
 
 done:
     /* Release resources */
-    if(obj_found && H5G_loc_free(&obj_loc) < 0)
+    if (obj_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_visit_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_visit
  *
@@ -3256,19 +3199,18 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, H5O_iterate_t op, void *op_data, hid_t lapl_id,
-    hid_t dxpl_id)
+H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op,
+          void *op_data, hid_t lapl_id, hid_t dxpl_id)
 {
-    H5O_iter_visit_ud_t udata;  /* User data for callback */
-    H5G_loc_t	loc;            /* Location of reference object */
-    H5G_loc_t   obj_loc;        /* Location used to open object */
-    H5G_name_t  obj_path;       /* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;       /* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    H5O_info_t  oinfo;          /* Object info struct */
-    hid_t       obj_id = (-1);  /* ID of object */
-    herr_t      ret_value;      /* Return value */
+    H5O_iter_visit_ud_t udata;             /* User data for callback */
+    H5G_loc_t           loc;               /* Location of reference object */
+    H5G_loc_t           obj_loc;           /* Location used to open object */
+    H5G_name_t          obj_path;          /* Opened object group hier. path */
+    H5O_loc_t           obj_oloc;          /* Opened object object location */
+    hbool_t             loc_found = FALSE; /* Entry at 'name' found */
+    H5O_info_t          oinfo;             /* Object info struct */
+    hid_t               obj_id = (-1);     /* ID of object */
+    herr_t              ret_value;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3276,7 +3218,7 @@ H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     HDmemset(&udata, 0, sizeof(udata));
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Set up opened group location to fill in */
@@ -3285,84 +3227,83 @@ H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(&loc, obj_name, &obj_loc /*out*/, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Get the object's info */
-    if(H5O_get_info(&obj_oloc, dxpl_id, TRUE, &oinfo) < 0)
+    if (H5O_get_info(&obj_oloc, dxpl_id, TRUE, &oinfo) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to get object info")
 
     /* Open the object */
     /* (Takes ownership of the obj_loc information) */
-    if((obj_id = H5O_open_by_loc(&obj_loc, lapl_id, dxpl_id, TRUE)) < 0)
+    if ((obj_id = H5O_open_by_loc(&obj_loc, lapl_id, dxpl_id, TRUE)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     /* Make callback for starting object */
-    if((ret_value = op(obj_id, ".", &oinfo, op_data)) < 0)
+    if ((ret_value = op(obj_id, ".", &oinfo, op_data)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "can't visit objects")
 
     /* Check return value of first callback */
-    if(ret_value != H5_ITER_CONT)
+    if (ret_value != H5_ITER_CONT)
         HGOTO_DONE(ret_value);
 
     /* Check for object being a group */
-    if(oinfo.type == H5O_TYPE_GROUP) {
-        H5G_loc_t	start_loc;          /* Location of starting group */
+    if (oinfo.type == H5O_TYPE_GROUP) {
+        H5G_loc_t start_loc; /* Location of starting group */
 
         /* Get the location of the starting group */
-        if(H5G_loc(obj_id, &start_loc) < 0)
+        if (H5G_loc(obj_id, &start_loc) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Set up user data for visiting links */
-        udata.obj_id = obj_id;
+        udata.obj_id    = obj_id;
         udata.start_loc = &start_loc;
-        udata.lapl_id = lapl_id;
-        udata.dxpl_id = dxpl_id;
-        udata.op = op;
-        udata.op_data = op_data;
+        udata.lapl_id   = lapl_id;
+        udata.dxpl_id   = dxpl_id;
+        udata.op        = op;
+        udata.op_data   = op_data;
 
         /* Create skip list to store visited object information */
-        if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL)
+        if ((udata.visited = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
 
         /* If its ref count is > 1, we add it to the list of visited objects */
         /* (because it could come up again during traversal) */
-        if(oinfo.rc > 1) {
-            H5_obj_t *obj_pos;                  /* New object node for visited list */
+        if (oinfo.rc > 1) {
+            H5_obj_t *obj_pos; /* New object node for visited list */
 
             /* Allocate new object "position" node */
-            if((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
+            if ((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
                 HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, FAIL, "can't allocate object node")
 
             /* Construct unique "position" for this object */
             obj_pos->fileno = oinfo.fileno;
-            obj_pos->addr = oinfo.addr;
+            obj_pos->addr   = oinfo.addr;
 
             /* Add to list of visited objects */
-            if(H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
+            if (H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object node into visited list")
         } /* end if */
 
         /* Call internal group visitation routine */
-        if((ret_value = H5G_visit(obj_id, ".", idx_type, order, H5O_visit_cb, &udata, lapl_id, dxpl_id)) < 0)
+        if ((ret_value = H5G_visit(obj_id, ".", idx_type, order, H5O_visit_cb, &udata, lapl_id, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "object visitation failed")
     } /* end if */
 
 done:
-    if(obj_id > 0) {
-        if(H5I_dec_app_ref(obj_id) < 0)
+    if (obj_id > 0) {
+        if (H5I_dec_app_ref(obj_id) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "unable to close object")
     } /* end if */
-    else if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    else if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't free location")
-    if(udata.visited)
+    if (udata.visited)
         H5SL_destroy(udata.visited, H5O_free_visit_visited, NULL);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_visit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_inc_rc
  *
@@ -3379,7 +3320,7 @@ done:
 herr_t
 H5O_inc_rc(H5O_t *oh)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3387,8 +3328,8 @@ H5O_inc_rc(H5O_t *oh)
     HDassert(oh);
 
     /* Pin the object header when the reference count goes above 0 */
-    if(oh->rc == 0)
-        if(H5AC_pin_protected_entry(oh) < 0)
+    if (oh->rc == 0)
+        if (H5AC_pin_protected_entry(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Increment reference count */
@@ -3398,7 +3339,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_inc_rc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dec_rc
  *
@@ -3415,7 +3355,7 @@ done:
 herr_t
 H5O_dec_rc(H5O_t *oh)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3426,15 +3366,14 @@ H5O_dec_rc(H5O_t *oh)
     oh->rc--;
 
     /* Unpin the object header when the reference count goes back to 0 */
-    if(oh->rc == 0)
-        if(H5AC_unpin_entry(oh) < 0)
+    if (oh->rc == 0)
+        if (H5AC_unpin_entry(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dec_rc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5O_dec_rc_by_loc
  *
@@ -3452,8 +3391,8 @@ done:
 herr_t
 H5O_dec_rc_by_loc(const H5O_loc_t *loc, hid_t dxpl_id)
 {
-    H5O_t       *oh = NULL;             /* Object header */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_t *oh        = NULL;    /* Object header */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3461,23 +3400,22 @@ H5O_dec_rc_by_loc(const H5O_loc_t *loc, hid_t dxpl_id)
     HDassert(loc);
 
     /* Get header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-       HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Decrement the reference count on the object header */
     /* (which will unpin it, if appropriate) */
-    if(H5O_dec_rc(oh) < 0)
+    if (H5O_dec_rc(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement reference count on object header")
 
 done:
     /* Release the object header from the cache */
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dec_rc_by_loc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_free
  *
@@ -3494,7 +3432,7 @@ done:
 herr_t
 H5O_free(H5O_t *oh)
 {
-    unsigned	u;                      /* Local index variable */
+    unsigned u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -3502,20 +3440,20 @@ H5O_free(H5O_t *oh)
     HDassert(oh);
 
     /* Destroy chunks */
-    if(oh->chunk) {
-        for(u = 0; u < oh->nchunks; u++)
+    if (oh->chunk) {
+        for (u = 0; u < oh->nchunks; u++)
             oh->chunk[u].image = H5FL_BLK_FREE(chunk_image, oh->chunk[u].image);
 
         oh->chunk = (H5O_chunk_t *)H5FL_SEQ_FREE(H5O_chunk_t, oh->chunk);
     } /* end if */
 
     /* Destroy messages */
-    if(oh->mesg) {
-        for(u = 0; u < oh->nmesgs; u++) {
+    if (oh->mesg) {
+        for (u = 0; u < oh->nmesgs; u++) {
 #ifndef NDEBUG
             /* Verify that message is clean, unless it could have been marked
              * dirty by decoding */
-            if(oh->ndecode_dirtied && oh->mesg[u].dirty)
+            if (oh->ndecode_dirtied && oh->mesg[u].dirty)
                 oh->ndecode_dirtied--;
             else
                 HDassert(oh->mesg[u].dirty == 0);
@@ -3535,4 +3473,3 @@ H5O_free(H5O_t *oh)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_free() */
-
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c
index 48e6978..f11a11a 100644
--- a/src/H5Oainfo.c
+++ b/src/H5Oainfo.c
@@ -22,72 +22,68 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg	  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"             /* Attributes				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5A_PACKAGE /*suppress error about including H5Apkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_ainfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void *H5O_ainfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_ainfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_ainfo_copy(const void *_mesg, void *_dest);
+static void * H5O_ainfo_copy(const void *_mesg, void *_dest);
 static size_t H5O_ainfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_ainfo_free(void *_mesg);
-static herr_t H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    void *_mesg);
-static herr_t H5O_ainfo_pre_copy_file(H5F_t *file_src, const void *mesg_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata);
-static void *H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src,
-    H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags,
-    H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
-static herr_t H5O_ainfo_post_copy_file(const H5O_loc_t *src_oloc,
-    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
-    unsigned *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info);
-static herr_t H5O_ainfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-			     FILE * stream, int indent, int fwidth);
+static herr_t H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg);
+static herr_t H5O_ainfo_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
+                                      const H5O_copy_t *cpy_info, void *udata);
+static void * H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size,
+                                  unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
+static herr_t H5O_ainfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc,
+                                       void *mesg_dst, unsigned *mesg_flags, hid_t dxpl_id,
+                                       H5O_copy_t *cpy_info);
+static herr_t H5O_ainfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                              int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_AINFO[1] = {{
-    H5O_AINFO_ID,            	/*message id number             */
-    "ainfo",                 	/*message name for debugging    */
-    sizeof(H5O_ainfo_t),     	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_ainfo_decode,        	/*decode message                */
-    H5O_ainfo_encode,        	/*encode message                */
-    H5O_ainfo_copy,          	/*copy the native value         */
-    H5O_ainfo_size,          	/*size of symbol table entry    */
-    NULL,                   	/*default reset method          */
-    H5O_ainfo_free,	        /* free method			*/
-    H5O_ainfo_delete,	        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    H5O_ainfo_pre_copy_file,	/* pre copy native value to file */
-    H5O_ainfo_copy_file,	/* copy native value to file    */
-    H5O_ainfo_post_copy_file,   /* post copy native value to file */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_ainfo_debug          	/*debug the message             */
+    H5O_AINFO_ID,             /*message id number             */
+    "ainfo",                  /*message name for debugging    */
+    sizeof(H5O_ainfo_t),      /*native message size           */
+    0,                        /* messages are sharable?       */
+    H5O_ainfo_decode,         /*decode message                */
+    H5O_ainfo_encode,         /*encode message                */
+    H5O_ainfo_copy,           /*copy the native value         */
+    H5O_ainfo_size,           /*size of symbol table entry    */
+    NULL,                     /*default reset method          */
+    H5O_ainfo_free,           /* free method			*/
+    H5O_ainfo_delete,         /* file delete method		*/
+    NULL,                     /* link method			*/
+    NULL,                     /*set share method		*/
+    NULL,                     /*can share method		*/
+    H5O_ainfo_pre_copy_file,  /* pre copy native value to file */
+    H5O_ainfo_copy_file,      /* copy native value to file    */
+    H5O_ainfo_post_copy_file, /* post copy native value to file */
+    NULL,                     /* get creation index		*/
+    NULL,                     /* set creation index		*/
+    H5O_ainfo_debug           /*debug the message             */
 }};
 
 /* Current version of attribute info information */
-#define H5O_AINFO_VERSION 	0
+#define H5O_AINFO_VERSION 0
 
 /* Flags for attribute info flag encoding */
-#define H5O_AINFO_TRACK_CORDER          0x01
-#define H5O_AINFO_INDEX_CORDER          0x02
-#define H5O_AINFO_ALL_FLAGS             (H5O_AINFO_TRACK_CORDER | H5O_AINFO_INDEX_CORDER)
+#define H5O_AINFO_TRACK_CORDER 0x01
+#define H5O_AINFO_INDEX_CORDER 0x02
+#define H5O_AINFO_ALL_FLAGS    (H5O_AINFO_TRACK_CORDER | H5O_AINFO_INDEX_CORDER)
 
 /* Declare a free list to manage the H5O_ainfo_t struct */
 H5FL_DEFINE_STATIC(H5O_ainfo_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_decode
  *
@@ -104,12 +100,12 @@ H5FL_DEFINE_STATIC(H5O_ainfo_t);
  */
 static void *
 H5O_ainfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                 size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_ainfo_t	*ainfo = NULL;  /* Attribute info */
+    H5O_ainfo_t * ainfo = NULL; /* Attribute info */
     unsigned char flags;        /* Flags for encoding attribute info */
-    void        *ret_value;     /* Return value */
+    void *        ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -118,16 +114,16 @@ H5O_ainfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     HDassert(p);
 
     /* Version of message */
-    if(*p++ != H5O_AINFO_VERSION)
+    if (*p++ != H5O_AINFO_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for message")
 
     /* Allocate space for message */
-    if(NULL == (ainfo = H5FL_MALLOC(H5O_ainfo_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (ainfo = H5FL_MALLOC(H5O_ainfo_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Get the flags for the message */
     flags = *p++;
-    if(flags & ~H5O_AINFO_ALL_FLAGS)
+    if (flags & ~H5O_AINFO_ALL_FLAGS)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad flag value for message")
     ainfo->track_corder = (flags & H5O_AINFO_TRACK_CORDER) ? TRUE : FALSE;
     ainfo->index_corder = (flags & H5O_AINFO_INDEX_CORDER) ? TRUE : FALSE;
@@ -136,7 +132,7 @@ H5O_ainfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     ainfo->nattrs = HSIZET_MAX;
 
     /* Max. creation order value for the object */
-    if(ainfo->track_corder)
+    if (ainfo->track_corder)
         UINT16DECODE(p, ainfo->max_crt_idx)
     else
         ainfo->max_crt_idx = H5O_MAX_CRT_ORDER_IDX;
@@ -148,7 +144,7 @@ H5O_ainfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     H5F_addr_decode(f, &p, &(ainfo->name_bt2_addr));
 
     /* Address of v2 B-tree to index creation order of links, if there is one */
-    if(ainfo->index_corder)
+    if (ainfo->index_corder)
         H5F_addr_decode(f, &p, &(ainfo->corder_bt2_addr));
     else
         ainfo->corder_bt2_addr = HADDR_UNDEF;
@@ -157,13 +153,12 @@ H5O_ainfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     ret_value = ainfo;
 
 done:
-    if(ret_value == NULL && ainfo != NULL)
+    if (ret_value == NULL && ainfo != NULL)
         ainfo = H5FL_FREE(H5O_ainfo_t, ainfo);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_ainfo_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_encode
  *
@@ -180,8 +175,8 @@ done:
 static herr_t
 H5O_ainfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_ainfo_t   *ainfo = (const H5O_ainfo_t *)_mesg;
-    unsigned char       flags;          /* Flags for encoding attribute info */
+    const H5O_ainfo_t *ainfo = (const H5O_ainfo_t *)_mesg;
+    unsigned char      flags; /* Flags for encoding attribute info */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -196,10 +191,10 @@ H5O_ainfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     /* The flags for the attribute indices */
     flags = (unsigned char)(ainfo->track_corder ? H5O_AINFO_TRACK_CORDER : 0);
     flags = (unsigned char)(flags | (ainfo->index_corder ? H5O_AINFO_INDEX_CORDER : 0));
-    *p++ = flags;
+    *p++  = flags;
 
     /* Max. creation order value for the object */
-    if(ainfo->track_corder)
+    if (ainfo->track_corder)
         UINT16ENCODE(p, ainfo->max_crt_idx);
 
     /* Address of fractal heap to store "dense" attributes */
@@ -209,7 +204,7 @@ H5O_ainfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     H5F_addr_encode(f, &p, ainfo->name_bt2_addr);
 
     /* Address of v2 B-tree to index creation order of attributes, if they are indexed */
-    if(ainfo->index_corder)
+    if (ainfo->index_corder)
         H5F_addr_encode(f, &p, ainfo->corder_bt2_addr);
     else
         HDassert(!H5F_addr_defined(ainfo->corder_bt2_addr));
@@ -217,7 +212,6 @@ H5O_ainfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_ainfo_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_copy
  *
@@ -236,16 +230,16 @@ H5O_ainfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
 static void *
 H5O_ainfo_copy(const void *_mesg, void *_dest)
 {
-    const H5O_ainfo_t   *ainfo = (const H5O_ainfo_t *)_mesg;
-    H5O_ainfo_t         *dest = (H5O_ainfo_t *) _dest;
-    void                *ret_value;     /* Return value */
+    const H5O_ainfo_t *ainfo = (const H5O_ainfo_t *)_mesg;
+    H5O_ainfo_t *      dest  = (H5O_ainfo_t *)_dest;
+    void *             ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(ainfo);
-    if(!dest && NULL == (dest = H5FL_MALLOC(H5O_ainfo_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!dest && NULL == (dest = H5FL_MALLOC(H5O_ainfo_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* copy */
     *dest = *ainfo;
@@ -257,7 +251,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_ainfo_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_size
  *
@@ -277,23 +270,25 @@ done:
 static size_t
 H5O_ainfo_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
-    const H5O_ainfo_t   *ainfo = (const H5O_ainfo_t *)_mesg;
-    size_t ret_value;   /* Return value */
+    const H5O_ainfo_t *ainfo = (const H5O_ainfo_t *)_mesg;
+    size_t             ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set return value */
-    ret_value = (size_t)(1                       /* Version */
-                + 1                     /* Index flags */
-                + (ainfo->track_corder ? 2 : 0) /* Curr. max. creation order value */
-                + H5F_SIZEOF_ADDR(f)    /* Address of fractal heap to store "dense" attributes */
-                + H5F_SIZEOF_ADDR(f)    /* Address of v2 B-tree for indexing names of attributes */
-                + (ainfo->index_corder ? H5F_SIZEOF_ADDR(f) : 0));   /* Address of v2 B-tree for indexing creation order values of attributes */
+    ret_value =
+        (size_t)(1                               /* Version */
+                 + 1                             /* Index flags */
+                 + (ainfo->track_corder ? 2 : 0) /* Curr. max. creation order value */
+                 + H5F_SIZEOF_ADDR(f)            /* Address of fractal heap to store "dense" attributes */
+                 + H5F_SIZEOF_ADDR(f)            /* Address of v2 B-tree for indexing names of attributes */
+                 + (ainfo->index_corder
+                        ? H5F_SIZEOF_ADDR(f)
+                        : 0)); /* Address of v2 B-tree for indexing creation order values of attributes */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_ainfo_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_ainfo_free
  *
@@ -318,7 +313,6 @@ H5O_ainfo_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_ainfo_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_delete
  *
@@ -334,8 +328,8 @@ H5O_ainfo_free(void *mesg)
 static herr_t
 H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_mesg)
 {
-    H5O_ainfo_t *ainfo = (H5O_ainfo_t *)_mesg;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_ainfo_t *ainfo     = (H5O_ainfo_t *)_mesg;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -344,15 +338,14 @@ H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_
     HDassert(ainfo);
 
     /* If the object is using "dense" attribute storage, delete it */
-    if(H5F_addr_defined(ainfo->fheap_addr))
-        if(H5A_dense_delete(f, dxpl_id, ainfo) < 0)
+    if (H5F_addr_defined(ainfo->fheap_addr))
+        if (H5A_dense_delete(f, dxpl_id, ainfo) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free dense attribute storage")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_ainfo_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_pre_copy_file
  *
@@ -369,7 +362,7 @@ done:
  */
 static herr_t
 H5O_ainfo_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSED *native_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata)
+                        hbool_t *deleted, const H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -380,13 +373,12 @@ H5O_ainfo_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSE
     /* If we are not copying attributes into the destination file, indicate
      *  that this message should be deleted.
      */
-    if(cpy_info->copy_without_attr)
+    if (cpy_info->copy_without_attr)
         *deleted = TRUE;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_ainfo_pre_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_copy_file
  *
@@ -401,13 +393,13 @@ H5O_ainfo_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSE
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
-    hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
-    H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata, hid_t dxpl_id)
+H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t H5_ATTR_UNUSED *recompute_size,
+                    unsigned H5_ATTR_UNUSED *mesg_flags, H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata,
+                    hid_t dxpl_id)
 {
     H5O_ainfo_t *ainfo_src = (H5O_ainfo_t *)mesg_src;
     H5O_ainfo_t *ainfo_dst = NULL;
-    void        *ret_value;             /* Return value */
+    void *       ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -419,16 +411,16 @@ H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
     HDassert(!cpy_info->copy_without_attr);
 
     /* Allocate space for the destination message */
-    if(NULL == (ainfo_dst = H5FL_MALLOC(H5O_ainfo_t)))
+    if (NULL == (ainfo_dst = H5FL_MALLOC(H5O_ainfo_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the top level of the information */
     *ainfo_dst = *ainfo_src;
 
-    if(H5F_addr_defined(ainfo_src->fheap_addr)) {
+    if (H5F_addr_defined(ainfo_src->fheap_addr)) {
         /* copy dense attribute */
 
-        if(H5A_dense_create(file_dst, dxpl_id, ainfo_dst) < 0)
+        if (H5A_dense_create(file_dst, dxpl_id, ainfo_dst) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to create dense storage for attributes")
     } /* end if */
 
@@ -437,13 +429,12 @@ H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
 
 done:
     /* Release destination attribute information on failure */
-    if(!ret_value && ainfo_dst)
+    if (!ret_value && ainfo_dst)
         ainfo_dst = H5FL_FREE(H5O_ainfo_t, ainfo_dst);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_ainfo_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_post_copy_file
  *
@@ -461,28 +452,26 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_ainfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
-    H5O_loc_t *dst_oloc, void *mesg_dst, unsigned H5_ATTR_UNUSED *mesg_flags,
-    hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5O_ainfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
+                         unsigned H5_ATTR_UNUSED *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
     const H5O_ainfo_t *ainfo_src = (const H5O_ainfo_t *)mesg_src;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(ainfo_src);
 
-    if(H5F_addr_defined(ainfo_src->fheap_addr)) {
-        if(H5A_dense_post_copy_file_all(src_oloc, ainfo_src, dst_oloc,
-                (H5O_ainfo_t *)mesg_dst, dxpl_id, cpy_info) < 0)
-        HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, FAIL, "can't copy attribute")
+    if (H5F_addr_defined(ainfo_src->fheap_addr)) {
+        if (H5A_dense_post_copy_file_all(src_oloc, ainfo_src, dst_oloc, (H5O_ainfo_t *)mesg_dst, dxpl_id,
+                                         cpy_info) < 0)
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, FAIL, "can't copy attribute")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_ainfo_post_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ainfo_debug
  *
@@ -497,10 +486,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_ainfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE * stream,
-	       int indent, int fwidth)
+H5O_ainfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+                int indent, int fwidth)
 {
-    const H5O_ainfo_t       *ainfo = (const H5O_ainfo_t *) _mesg;
+    const H5O_ainfo_t *ainfo = (const H5O_ainfo_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -511,22 +500,19 @@ H5O_ainfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const voi
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Number of attributes:", ainfo->nattrs);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Number of attributes:", ainfo->nattrs);
     HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "Track creation order of attributes:", ainfo->track_corder);
+              "Track creation order of attributes:", ainfo->track_corder);
     HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "Index creation order of attributes:", ainfo->index_corder);
+              "Index creation order of attributes:", ainfo->index_corder);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Max. creation index value:", (unsigned)ainfo->max_crt_idx);
+              "Max. creation index value:", (unsigned)ainfo->max_crt_idx);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "'Dense' attribute storage fractal heap address:", ainfo->fheap_addr);
+              "'Dense' attribute storage fractal heap address:", ainfo->fheap_addr);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "'Dense' attribute storage name index v2 B-tree address:", ainfo->name_bt2_addr);
+              "'Dense' attribute storage name index v2 B-tree address:", ainfo->name_bt2_addr);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "'Dense' attribute storage creation order index v2 B-tree address:", ainfo->corder_bt2_addr);
-
+              "'Dense' attribute storage creation order index v2 B-tree address:", ainfo->corder_bt2_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_ainfo_debug() */
-
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index 25052e7..93d051b 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -26,53 +26,47 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5Opkg.h"             /* Object headers			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static herr_t H5O_add_gap(H5F_t *f, H5O_t *oh, unsigned chunkno,
-    hbool_t *chk_dirtied, size_t idx, uint8_t *new_gap_loc, size_t new_gap_size);
-static herr_t H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied,
-    H5O_mesg_t *mesg, uint8_t *new_gap_loc, size_t new_gap_size);
+static herr_t H5O_add_gap(H5F_t *f, H5O_t *oh, unsigned chunkno, hbool_t *chk_dirtied, size_t idx,
+                          uint8_t *new_gap_loc, size_t new_gap_size);
+static herr_t H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg, uint8_t *new_gap_loc,
+                                size_t new_gap_size);
 static herr_t H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t null_idx,
-    const H5O_msg_class_t *new_type, void *new_native, size_t new_size);
-static htri_t H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    unsigned chunkno, size_t size, size_t *msg_idx);
-static herr_t H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size,
-    size_t *new_idx);
+                             const H5O_msg_class_t *new_type, void *new_native, size_t new_size);
+static htri_t H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, size_t size,
+                                     size_t *msg_idx);
+static herr_t H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new_idx);
 static htri_t H5O_move_cont(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned cont_u);
 static htri_t H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh);
 static htri_t H5O_merge_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh);
 static htri_t H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh);
-static herr_t H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    unsigned chunkno);
-
+static herr_t H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno);
 
 /*********************/
 /* Package Variables */
@@ -81,18 +75,14 @@ static herr_t H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
 /* Declare extern the free list for H5O_cont_t's */
 H5FL_EXTERN(H5O_cont_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_add_gap
  *
@@ -107,12 +97,12 @@ H5FL_EXTERN(H5O_cont_t);
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_add_gap(H5F_t *f, H5O_t *oh, unsigned chunkno, hbool_t *chk_dirtied,
-    size_t idx, uint8_t *new_gap_loc, size_t new_gap_size)
+H5O_add_gap(H5F_t *f, H5O_t *oh, unsigned chunkno, hbool_t *chk_dirtied, size_t idx, uint8_t *new_gap_loc,
+            size_t new_gap_size)
 {
-    hbool_t merged_with_null;           /* Whether the gap was merged with a null message */
-    size_t u;                           /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hbool_t merged_with_null;    /* Whether the gap was merged with a null message */
+    size_t  u;                   /* Local index variable */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -124,74 +114,75 @@ H5O_add_gap(H5F_t *f, H5O_t *oh, unsigned chunkno, hbool_t *chk_dirtied,
     HDassert(new_gap_size);
 
 #ifndef NDEBUG
-if(chunkno > 0) {
-    unsigned chk_proxy_status = 0;         /* Object header chunk proxy entry cache status */
+    if (chunkno > 0) {
+        unsigned chk_proxy_status = 0; /* Object header chunk proxy entry cache status */
 
-    /* Check the object header chunk proxy's status in the metadata cache */
-    if(H5AC_get_entry_status(f, oh->chunk[chunkno].addr, &chk_proxy_status) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to check metadata cache status for object header chunk proxy")
+        /* Check the object header chunk proxy's status in the metadata cache */
+        if (H5AC_get_entry_status(f, oh->chunk[chunkno].addr, &chk_proxy_status) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL,
+                        "unable to check metadata cache status for object header chunk proxy")
 
-    /* Make certain that object header is protected */
-    HDassert(chk_proxy_status & H5AC_ES__IS_PROTECTED);
-} /* end if */
+        /* Make certain that object header is protected */
+        HDassert(chk_proxy_status & H5AC_ES__IS_PROTECTED);
+    }  /* end if */
 #endif /* NDEBUG */
 
     /* Check for existing null message in chunk */
     merged_with_null = FALSE;
-    for(u = 0; u < oh->nmesgs && !merged_with_null; u++) {
+    for (u = 0; u < oh->nmesgs && !merged_with_null; u++) {
         /* Find a null message in the chunk with the new gap */
         /* (a null message that's not the one we are eliminating) */
-        if(H5O_NULL_ID == oh->mesg[u].type->id && oh->mesg[u].chunkno == chunkno
-                && u != idx) {
+        if (H5O_NULL_ID == oh->mesg[u].type->id && oh->mesg[u].chunkno == chunkno && u != idx) {
             /* Sanity check - chunks with null messages shouldn't have a gap */
             HDassert(oh->chunk[chunkno].gap == 0);
 
             /* Eliminate the gap in the chunk */
-            if(H5O_eliminate_gap(oh, chk_dirtied, &oh->mesg[u], new_gap_loc, new_gap_size) < 0)
+            if (H5O_eliminate_gap(oh, chk_dirtied, &oh->mesg[u], new_gap_loc, new_gap_size) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't eliminate gap in chunk")
 
             /* Set flag to indicate that the gap was handled */
             merged_with_null = TRUE;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* If we couldn't find a null message in the chunk, move the gap to the end */
-    if(!merged_with_null) {
+    if (!merged_with_null) {
         /* Adjust message offsets after new gap forward in chunk */
-        for(u = 0; u < oh->nmesgs; u++)
-            if(oh->mesg[u].chunkno == chunkno && oh->mesg[u].raw > new_gap_loc)
+        for (u = 0; u < oh->nmesgs; u++)
+            if (oh->mesg[u].chunkno == chunkno && oh->mesg[u].raw > new_gap_loc)
                 oh->mesg[u].raw -= new_gap_size;
 
         /* Slide raw message info forward in chunk image */
         HDmemmove(new_gap_loc, new_gap_loc + new_gap_size,
-                (size_t)((oh->chunk[chunkno].image + (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh))) - (new_gap_loc + new_gap_size)));
+                  (size_t)((oh->chunk[chunkno].image + (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh))) -
+                           (new_gap_loc + new_gap_size)));
 
         /* Add existing gap size to new gap size */
         new_gap_size += oh->chunk[chunkno].gap;
 
         /* Merging with existing gap will allow for a new null message */
-        if(new_gap_size >= (size_t)H5O_SIZEOF_MSGHDR_OH(oh)) {
-            H5O_mesg_t *null_msg;       /* Pointer to new null message */
+        if (new_gap_size >= (size_t)H5O_SIZEOF_MSGHDR_OH(oh)) {
+            H5O_mesg_t *null_msg; /* Pointer to new null message */
 
             /* Check if we need to extend message table to hold the new null message */
-            if(oh->nmesgs >= oh->alloc_nmesgs)
-                if(H5O_alloc_msgs(oh, (size_t)1) < 0)
+            if (oh->nmesgs >= oh->alloc_nmesgs)
+                if (H5O_alloc_msgs(oh, (size_t)1) < 0)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate more space for messages")
 
             /* Increment new gap size */
             oh->chunk[chunkno].gap += new_gap_size;
 
             /* Create new null message, with the tail of the previous null message */
-            null_msg = &(oh->mesg[oh->nmesgs++]);
-            null_msg->type = H5O_MSG_NULL;
-            null_msg->native = NULL;
+            null_msg           = &(oh->mesg[oh->nmesgs++]);
+            null_msg->type     = H5O_MSG_NULL;
+            null_msg->native   = NULL;
             null_msg->raw_size = new_gap_size - (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
-            null_msg->raw = (oh->chunk[chunkno].image + oh->chunk[chunkno].size)
-                    - (H5O_SIZEOF_CHKSUM_OH(oh) + null_msg->raw_size);
+            null_msg->raw      = (oh->chunk[chunkno].image + oh->chunk[chunkno].size) -
+                            (H5O_SIZEOF_CHKSUM_OH(oh) + null_msg->raw_size);
             null_msg->chunkno = chunkno;
 
             /* Zero out new null message's raw data */
-            if(null_msg->raw_size)
+            if (null_msg->raw_size)
                 HDmemset(null_msg->raw, 0, null_msg->raw_size);
 
             /* Mark message as dirty */
@@ -211,7 +202,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_add_gap() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_eliminate_gap
  *
@@ -233,11 +223,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg,
-    uint8_t *gap_loc, size_t gap_size)
+H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg, uint8_t *gap_loc, size_t gap_size)
 {
-    uint8_t *move_start, *move_end;     /* Pointers to area of messages to move */
-    hbool_t null_before_gap;            /* Flag whether the null message is before the gap or not */
+    uint8_t *move_start, *move_end; /* Pointers to area of messages to move */
+    hbool_t  null_before_gap;       /* Flag whether the null message is before the gap or not */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -253,37 +242,36 @@ H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg,
     null_before_gap = (hbool_t)(mesg->raw < gap_loc);
 
     /* Set up information about region of messages to move */
-    if(null_before_gap) {
+    if (null_before_gap) {
         move_start = mesg->raw + mesg->raw_size;
-        move_end = gap_loc;
+        move_end   = gap_loc;
     } /* end if */
     else {
         move_start = gap_loc + gap_size;
-        move_end = mesg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
+        move_end   = mesg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
     } /* end else */
 
     /* Check for messages between null message and gap */
-    if(move_end > move_start) {
-        unsigned u;                 /* Local index variable */
+    if (move_end > move_start) {
+        unsigned u; /* Local index variable */
 
         /* Look for messages that need to move, to adjust raw pointers in chunk */
         /* (this doesn't change the moved messages 'dirty' state) */
-        for(u = 0; u < oh->nmesgs; u++) {
-            uint8_t *msg_start;     /* Start of encoded message in chunk */
+        for (u = 0; u < oh->nmesgs; u++) {
+            uint8_t *msg_start; /* Start of encoded message in chunk */
 
             msg_start = oh->mesg[u].raw - H5O_SIZEOF_MSGHDR_OH(oh);
-            if(oh->mesg[u].chunkno == mesg->chunkno
-                    && (msg_start >= move_start && msg_start < move_end)) {
+            if (oh->mesg[u].chunkno == mesg->chunkno && (msg_start >= move_start && msg_start < move_end)) {
                 /* Move message's raw pointer in appropriate direction */
-                if(null_before_gap)
+                if (null_before_gap)
                     oh->mesg[u].raw += gap_size;
                 else
                     oh->mesg[u].raw -= gap_size;
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /* Slide raw message info in chunk image */
-        if(null_before_gap)
+        if (null_before_gap)
             /* Slide messages down */
             HDmemmove(move_start + gap_size, move_start, (size_t)(move_end - move_start));
         else {
@@ -294,12 +282,12 @@ H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg,
             mesg->raw -= gap_size;
         } /* end else */
     }
-    else if(move_end == move_start && !null_before_gap) {
-	/* Slide null message up */
-	HDmemmove(move_start - gap_size, move_start, mesg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
+    else if (move_end == move_start && !null_before_gap) {
+        /* Slide null message up */
+        HDmemmove(move_start - gap_size, move_start, mesg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
 
-	/* Adjust start of null message */
-	mesg->raw -= gap_size;
+        /* Adjust start of null message */
+        mesg->raw -= gap_size;
     } /* end if */
 
     /* Zero out addition to null message */
@@ -312,13 +300,12 @@ H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg,
     oh->chunk[mesg->chunkno].gap = 0;
 
     /* Mark null message as dirty */
-    mesg->dirty = TRUE;
+    mesg->dirty  = TRUE;
     *chk_dirtied = TRUE;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5O_eliminate_gap() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_alloc_null
@@ -334,13 +321,13 @@ H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t null_idx,
-    const H5O_msg_class_t *new_type, void *new_native, size_t new_size)
+H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t null_idx, const H5O_msg_class_t *new_type,
+               void *new_native, size_t new_size)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    hbool_t chk_dirtied = FALSE;        /* Flags for unprotecting chunk */
-    H5O_mesg_t *alloc_msg;              /* Pointer to null message to allocate out of */
-    herr_t ret_value = SUCCEED; 	/* Return value */
+    H5O_chunk_proxy_t *chk_proxy   = NULL;  /* Chunk that message is in */
+    hbool_t            chk_dirtied = FALSE; /* Flags for unprotecting chunk */
+    H5O_mesg_t *       alloc_msg;           /* Pointer to null message to allocate out of */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -353,29 +340,31 @@ H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t null_idx,
     alloc_msg = &oh->mesg[null_idx];
 
     /* Protect chunk */
-    if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, alloc_msg->chunkno)))
+    if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, alloc_msg->chunkno)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
     /* Check if there's a need to split the null message */
-    if(alloc_msg->raw_size > new_size) {
+    if (alloc_msg->raw_size > new_size) {
         /* Check for producing a gap in the chunk */
-        if((alloc_msg->raw_size - new_size) < (size_t)H5O_SIZEOF_MSGHDR_OH(oh)) {
-            size_t gap_size = alloc_msg->raw_size - new_size;     /* Size of gap produced */
+        if ((alloc_msg->raw_size - new_size) < (size_t)H5O_SIZEOF_MSGHDR_OH(oh)) {
+            size_t gap_size = alloc_msg->raw_size - new_size; /* Size of gap produced */
 
             /* Adjust the size of the null message being eliminated */
             alloc_msg->raw_size = new_size;
 
             /* Add the gap to the chunk */
-            if(H5O_add_gap(f, oh, alloc_msg->chunkno, &chk_dirtied, null_idx, alloc_msg->raw + alloc_msg->raw_size, gap_size) < 0)
+            if (H5O_add_gap(f, oh, alloc_msg->chunkno, &chk_dirtied, null_idx,
+                            alloc_msg->raw + alloc_msg->raw_size, gap_size) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert gap in chunk")
         } /* end if */
         else {
-            size_t  new_mesg_size = new_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh); /* Total size of newly allocated message */
-            H5O_mesg_t *null_msg;       /* Pointer to new null message */
+            size_t new_mesg_size =
+                new_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh); /* Total size of newly allocated message */
+            H5O_mesg_t *null_msg;                            /* Pointer to new null message */
 
             /* Check if we need to extend message table to hold the new null message */
-            if(oh->nmesgs >= oh->alloc_nmesgs) {
-                if(H5O_alloc_msgs(oh, (size_t)1) < 0)
+            if (oh->nmesgs >= oh->alloc_nmesgs) {
+                if (H5O_alloc_msgs(oh, (size_t)1) < 0)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate more space for messages")
 
                 /* "Retarget" 'alloc_msg' pointer into newly re-allocated array of messages */
@@ -383,50 +372,50 @@ H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t null_idx,
             } /* end if */
 
             /* Create new null message, with the tail of the previous null message */
-            null_msg = &(oh->mesg[oh->nmesgs++]);
-            null_msg->type = H5O_MSG_NULL;
-            null_msg->native = NULL;
-            null_msg->raw = alloc_msg->raw + new_mesg_size;
+            null_msg           = &(oh->mesg[oh->nmesgs++]);
+            null_msg->type     = H5O_MSG_NULL;
+            null_msg->native   = NULL;
+            null_msg->raw      = alloc_msg->raw + new_mesg_size;
             null_msg->raw_size = alloc_msg->raw_size - new_mesg_size;
-            null_msg->chunkno = alloc_msg->chunkno;
+            null_msg->chunkno  = alloc_msg->chunkno;
 
             /* Mark the message as dirty */
             null_msg->dirty = TRUE;
-            chk_dirtied = TRUE;
+            chk_dirtied     = TRUE;
 
             /* Check for gap in new null message's chunk */
-            if(oh->chunk[null_msg->chunkno].gap > 0) {
-                unsigned null_chunkno = null_msg->chunkno;   /* Chunk w/gap */
+            if (oh->chunk[null_msg->chunkno].gap > 0) {
+                unsigned null_chunkno = null_msg->chunkno; /* Chunk w/gap */
 
                 /* Eliminate the gap in the chunk */
-                if(H5O_eliminate_gap(oh, &chk_dirtied, null_msg,
-                        ((oh->chunk[null_chunkno].image + oh->chunk[null_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[null_chunkno].gap)),
-                        oh->chunk[null_chunkno].gap) < 0)
+                if (H5O_eliminate_gap(oh, &chk_dirtied, null_msg,
+                                      ((oh->chunk[null_chunkno].image + oh->chunk[null_chunkno].size) -
+                                       (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[null_chunkno].gap)),
+                                      oh->chunk[null_chunkno].gap) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
             } /* end if */
 
             /* Set the size of the new "real" message */
             alloc_msg->raw_size = new_size;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Initialize the new message */
-    alloc_msg->type = new_type;
+    alloc_msg->type   = new_type;
     alloc_msg->native = new_native;
 
     /* Mark the new message as dirty */
     alloc_msg->dirty = TRUE;
-    chk_dirtied = TRUE;
+    chk_dirtied      = TRUE;
 
 done:
     /* Release chunk */
-    if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_alloc_null() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_alloc_msgs
@@ -444,10 +433,10 @@ done:
 herr_t
 H5O_alloc_msgs(H5O_t *oh, size_t min_alloc)
 {
-    size_t old_alloc;                   /* Old number of messages allocated */
-    size_t na;                          /* New number of messages allocated */
-    H5O_mesg_t *new_mesg;               /* Pointer to new message array */
-    herr_t ret_value = SUCCEED; 	/* Return value */
+    size_t      old_alloc;           /* Old number of messages allocated */
+    size_t      na;                  /* New number of messages allocated */
+    H5O_mesg_t *new_mesg;            /* Pointer to new message array */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -456,15 +445,15 @@ H5O_alloc_msgs(H5O_t *oh, size_t min_alloc)
 
     /* Initialize number of messages information */
     old_alloc = oh->alloc_nmesgs;
-    na = oh->alloc_nmesgs + MAX(oh->alloc_nmesgs, min_alloc);   /* At least double */
+    na        = oh->alloc_nmesgs + MAX(oh->alloc_nmesgs, min_alloc); /* At least double */
 
     /* Attempt to allocate more memory */
-    if(NULL == (new_mesg = H5FL_SEQ_REALLOC(H5O_mesg_t, oh->mesg, na)))
+    if (NULL == (new_mesg = H5FL_SEQ_REALLOC(H5O_mesg_t, oh->mesg, na)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Update ohdr information */
     oh->alloc_nmesgs = na;
-    oh->mesg = new_mesg;
+    oh->mesg         = new_mesg;
 
     /* Set new object header info to zeros */
     HDmemset(&oh->mesg[old_alloc], 0, (oh->alloc_nmesgs - old_alloc) * sizeof(H5O_mesg_t));
@@ -473,7 +462,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_alloc_msgs() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_alloc_extend_chunk
@@ -503,23 +491,22 @@ done:
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
-    size_t size, size_t *msg_idx)
+H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, size_t size, size_t *msg_idx)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;    /* Chunk that message is in */
-    hbool_t     chk_dirtied = FALSE;        /* Flag for unprotecting chunk */
-    size_t      delta;          /* Change in chunk's size */
-    size_t      aligned_size = H5O_ALIGN_OH(oh, size);
-    uint8_t     *old_image;     /* Old address of chunk's image in memory */
-    size_t      old_size;       /* Old size of chunk */
-    htri_t      was_extended;   /* If chunk can be extended */
-    size_t      extend_msg;     /* Index of null message to extend */
-    hbool_t     extended_msg = FALSE;   /* Whether an existing message was extended */
-    uint8_t     new_size_flags = 0;     /* New chunk #0 size flags */
-    hbool_t     adjust_size_flags = FALSE;      /* Whether to adjust the chunk #0 size flags */
-    size_t      extra_prfx_size = 0; /* Extra bytes added to object header prefix */
-    size_t      u;              /* Local index variable */
-    htri_t      ret_value = TRUE; 	/* return value */
+    H5O_chunk_proxy_t *chk_proxy   = NULL;  /* Chunk that message is in */
+    hbool_t            chk_dirtied = FALSE; /* Flag for unprotecting chunk */
+    size_t             delta;               /* Change in chunk's size */
+    size_t             aligned_size = H5O_ALIGN_OH(oh, size);
+    uint8_t *          old_image;                 /* Old address of chunk's image in memory */
+    size_t             old_size;                  /* Old size of chunk */
+    htri_t             was_extended;              /* If chunk can be extended */
+    size_t             extend_msg;                /* Index of null message to extend */
+    hbool_t            extended_msg      = FALSE; /* Whether an existing message was extended */
+    uint8_t            new_size_flags    = 0;     /* New chunk #0 size flags */
+    hbool_t            adjust_size_flags = FALSE; /* Whether to adjust the chunk #0 size flags */
+    size_t             extra_prfx_size   = 0;     /* Extra bytes added to object header prefix */
+    size_t             u;                         /* Local index variable */
+    htri_t             ret_value = TRUE;          /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -534,22 +521,22 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
     /* Test to see if the specified chunk ends with a null messages.
      * If successful, set the index of the the null message in extend_msg.
      */
-    for(u = 0; u < oh->nmesgs; u++) {
+    for (u = 0; u < oh->nmesgs; u++) {
         /* Check for null message at end of proper chunk */
         /* (account for possible checksum at end of chunk) */
-        if(oh->mesg[u].chunkno == chunkno && H5O_NULL_ID == oh->mesg[u].type->id &&
-                ((oh->mesg[u].raw + oh->mesg[u].raw_size)
-                == ((oh->chunk[chunkno].image + oh->chunk[chunkno].size) -
-                    (oh->chunk[chunkno].gap + H5O_SIZEOF_CHKSUM_OH(oh))))) {
+        if (oh->mesg[u].chunkno == chunkno && H5O_NULL_ID == oh->mesg[u].type->id &&
+            ((oh->mesg[u].raw + oh->mesg[u].raw_size) ==
+             ((oh->chunk[chunkno].image + oh->chunk[chunkno].size) -
+              (oh->chunk[chunkno].gap + H5O_SIZEOF_CHKSUM_OH(oh))))) {
 
-            extend_msg = u;
+            extend_msg   = u;
             extended_msg = TRUE;
             break;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* If we can extend an existing null message, adjust the delta appropriately */
-    if(extended_msg) {
+    if (extended_msg) {
         HDassert(oh->chunk[chunkno].gap == 0);
         delta = aligned_size - oh->mesg[extend_msg].raw_size;
     } /* end if */
@@ -558,119 +545,119 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
     delta = H5O_ALIGN_OH(oh, delta);
 
     /* Check for changing the chunk #0 data size enough to need adjusting the flags */
-    if(oh->version > H5O_VERSION_1 && chunkno == 0) {
-        uint64_t chunk0_size;           /* Size of chunk 0's data */
+    if (oh->version > H5O_VERSION_1 && chunkno == 0) {
+        uint64_t chunk0_size;                                                     /* Size of chunk 0's data */
         size_t   orig_prfx_size = (size_t)1 << (oh->flags & H5O_HDR_CHUNK0_SIZE); /* Original prefix size */
 
         HDassert(oh->chunk[0].size >= (size_t)H5O_SIZEOF_HDR(oh));
         chunk0_size = oh->chunk[0].size - (size_t)H5O_SIZEOF_HDR(oh);
 
         /* Check for moving to a 8-byte size encoding */
-        if(orig_prfx_size < 8 && (chunk0_size + delta) > 4294967295) {
-            extra_prfx_size = 8 - orig_prfx_size;
-            new_size_flags = H5O_HDR_CHUNK0_8;
+        if (orig_prfx_size < 8 && (chunk0_size + delta) > 4294967295) {
+            extra_prfx_size   = 8 - orig_prfx_size;
+            new_size_flags    = H5O_HDR_CHUNK0_8;
             adjust_size_flags = TRUE;
         } /* end if */
         /* Check for moving to a 4-byte size encoding */
-        else if(orig_prfx_size < 4 && (chunk0_size + delta) > 65535) {
-            extra_prfx_size = 4 - orig_prfx_size;
-            new_size_flags = H5O_HDR_CHUNK0_4;
+        else if (orig_prfx_size < 4 && (chunk0_size + delta) > 65535) {
+            extra_prfx_size   = 4 - orig_prfx_size;
+            new_size_flags    = H5O_HDR_CHUNK0_4;
             adjust_size_flags = TRUE;
         } /* end if */
         /* Check for moving to a 2-byte size encoding */
-        else if(orig_prfx_size < 2 && (chunk0_size + delta) > 255) {
-            extra_prfx_size = 2 - orig_prfx_size;
-            new_size_flags = H5O_HDR_CHUNK0_2;
+        else if (orig_prfx_size < 2 && (chunk0_size + delta) > 255) {
+            extra_prfx_size   = 2 - orig_prfx_size;
+            new_size_flags    = H5O_HDR_CHUNK0_2;
             adjust_size_flags = TRUE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Protect chunk */
-    if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, chunkno)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
+    if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, chunkno)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
     /* Determine whether the chunk can be extended */
     was_extended = H5MF_try_extend(f, dxpl_id, H5FD_MEM_OHDR, oh->chunk[chunkno].addr,
-                                 (hsize_t)(oh->chunk[chunkno].size), (hsize_t)(delta + extra_prfx_size));
-    if(was_extended < 0) /* error */
+                                   (hsize_t)(oh->chunk[chunkno].size), (hsize_t)(delta + extra_prfx_size));
+    if (was_extended < 0) /* error */
         HGOTO_ERROR(H5E_OHDR, H5E_CANTEXTEND, FAIL, "can't tell if we can extend chunk")
-    else if(was_extended == FALSE)     /* can't extend -- we are done */
+    else if (was_extended == FALSE) /* can't extend -- we are done */
         HGOTO_DONE(FALSE)
 
     /* Adjust object header prefix flags */
-    if(adjust_size_flags) {
+    if (adjust_size_flags) {
         oh->flags = (uint8_t)(oh->flags & ~H5O_HDR_CHUNK0_SIZE);
         oh->flags |= new_size_flags;
 
         /* Mark object header as dirty in cache */
-        if(H5AC_mark_entry_dirty(oh) < 0)
+        if (H5AC_mark_entry_dirty(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
     } /* end if */
 
     /* If we can extend an existing null message, take care of that */
-    if(extended_msg) {
+    if (extended_msg) {
         /* Adjust message size of existing null message */
         oh->mesg[extend_msg].raw_size += delta;
     } /* end if */
     /* Create new null message for end of chunk */
     else {
         /* Create a new null message */
-        if(oh->nmesgs >= oh->alloc_nmesgs)
-            if(H5O_alloc_msgs(oh, (size_t)1) < 0)
+        if (oh->nmesgs >= oh->alloc_nmesgs)
+            if (H5O_alloc_msgs(oh, (size_t)1) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate more space for messages")
 
         /* Set extension message */
         extend_msg = oh->nmesgs++;
 
         /* Initialize new null message */
-        oh->mesg[extend_msg].type = H5O_MSG_NULL;
+        oh->mesg[extend_msg].type   = H5O_MSG_NULL;
         oh->mesg[extend_msg].native = NULL;
-        oh->mesg[extend_msg].raw = ((oh->chunk[chunkno].image + oh->chunk[chunkno].size)
-                - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[chunkno].gap))
-                + H5O_SIZEOF_MSGHDR_OH(oh);
+        oh->mesg[extend_msg].raw    = ((oh->chunk[chunkno].image + oh->chunk[chunkno].size) -
+                                    (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[chunkno].gap)) +
+                                   H5O_SIZEOF_MSGHDR_OH(oh);
         oh->mesg[extend_msg].raw_size = (delta + oh->chunk[chunkno].gap) - (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
-        oh->mesg[extend_msg].chunkno = chunkno;
+        oh->mesg[extend_msg].chunkno  = chunkno;
     } /* end else */
 
     /* Mark the extended message as dirty */
     oh->mesg[extend_msg].dirty = TRUE;
-    chk_dirtied = TRUE;
+    chk_dirtied                = TRUE;
 
     /* Allocate more memory space for chunk's image */
     old_image = oh->chunk[chunkno].image;
-    old_size = oh->chunk[chunkno].size;
+    old_size  = oh->chunk[chunkno].size;
     oh->chunk[chunkno].size += delta + extra_prfx_size;
     oh->chunk[chunkno].image = H5FL_BLK_REALLOC(chunk_image, old_image, oh->chunk[chunkno].size);
-    oh->chunk[chunkno].gap = 0;
-    if(NULL == oh->chunk[chunkno].image)
+    oh->chunk[chunkno].gap   = 0;
+    if (NULL == oh->chunk[chunkno].image)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Wipe new space for chunk */
     HDmemset(oh->chunk[chunkno].image + old_size, 0, oh->chunk[chunkno].size - old_size);
 
     /* Move chunk 0 data up if the size flags changed */
-    if(adjust_size_flags)
+    if (adjust_size_flags)
         HDmemmove(oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh),
-                oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh) - extra_prfx_size,
-                old_size - (size_t)H5O_SIZEOF_HDR(oh) + extra_prfx_size);
+                  oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh) - extra_prfx_size,
+                  old_size - (size_t)H5O_SIZEOF_HDR(oh) + extra_prfx_size);
 
     /* Spin through existing messages, adjusting them */
-    for(u = 0; u < oh->nmesgs; u++) {
+    for (u = 0; u < oh->nmesgs; u++) {
         /* Adjust raw addresses for messages in this chunk to reflect new 'image' address */
-        if(oh->mesg[u].chunkno == chunkno)
+        if (oh->mesg[u].chunkno == chunkno)
             oh->mesg[u].raw = oh->chunk[chunkno].image + extra_prfx_size + (oh->mesg[u].raw - old_image);
 
         /* Find continuation message which points to this chunk and adjust chunk's size */
         /* (Chunk 0 doesn't have a continuation message that points to it and
          * it's size is directly encoded in the object header) */
-        if(chunkno > 0 && (H5O_CONT_ID == oh->mesg[u].type->id) &&
-                (((H5O_cont_t *)(oh->mesg[u].native))->chunkno == chunkno)) {
-            H5O_chunk_proxy_t *chk_proxy2 = NULL;       /* Chunk that continuation message is in */
-            hbool_t chk_dirtied2 = FALSE;               /* Flag for unprotecting chunk */
-            unsigned cont_chunkno = oh->mesg[u].chunkno;    /* Chunk # for continuation message */
+        if (chunkno > 0 && (H5O_CONT_ID == oh->mesg[u].type->id) &&
+            (((H5O_cont_t *)(oh->mesg[u].native))->chunkno == chunkno)) {
+            H5O_chunk_proxy_t *chk_proxy2   = NULL;                /* Chunk that continuation message is in */
+            hbool_t            chk_dirtied2 = FALSE;               /* Flag for unprotecting chunk */
+            unsigned           cont_chunkno = oh->mesg[u].chunkno; /* Chunk # for continuation message */
 
             /* Protect chunk containing continuation message */
-            if(NULL == (chk_proxy2 = H5O_chunk_protect(f, dxpl_id, oh, cont_chunkno)))
+            if (NULL == (chk_proxy2 = H5O_chunk_protect(f, dxpl_id, oh, cont_chunkno)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
             /* Adjust size in continuation message */
@@ -679,16 +666,16 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
 
             /* Flag continuation message as dirty */
             oh->mesg[u].dirty = TRUE;
-            chk_dirtied2 = TRUE;
+            chk_dirtied2      = TRUE;
 
             /* Release chunk containing continuation message */
-            if(H5O_chunk_unprotect(f, dxpl_id, chk_proxy2, chk_dirtied2) < 0)
+            if (H5O_chunk_unprotect(f, dxpl_id, chk_proxy2, chk_dirtied2) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Resize the chunk in the cache */
-    if(H5O_chunk_resize(oh, chk_proxy) < 0)
+    if (H5O_chunk_resize(oh, chk_proxy) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTRESIZE, FAIL, "unable to resize object header chunk")
 
     /* Set new message index */
@@ -696,13 +683,12 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
 
 done:
     /* Release chunk */
-    if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_alloc_extend_chunk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_alloc_new_chunk
  *
@@ -743,27 +729,27 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
 {
     /* Struct for storing information about "best" messages to allocate from */
     typedef struct {
-        int msgno;                      /* Index in message array */
-        size_t gap_size;                /* Size of any "gap" in the chunk immediately after message */
-        size_t null_size;               /* Size of any null message in the chunk immediately after message */
-        size_t total_size;              /* Total size of "available" space around message */
-        unsigned null_msgno;            /* Message index of null message immediately after message */
+        int      msgno;      /* Index in message array */
+        size_t   gap_size;   /* Size of any "gap" in the chunk immediately after message */
+        size_t   null_size;  /* Size of any null message in the chunk immediately after message */
+        size_t   total_size; /* Total size of "available" space around message */
+        unsigned null_msgno; /* Message index of null message immediately after message */
     } alloc_info;
 
-    H5O_mesg_t *curr_msg;               /* Pointer to current message to operate on */
-    H5O_chunk_proxy_t *chk_proxy;       /* Chunk that message is in */
-    size_t      cont_size;              /*continuation message size     */
-    size_t      multi_size = 0;         /* Size of all the messages in the last chunk */
-    int         found_null = (-1);      /* Best fit null message         */
-    alloc_info  found_attr = {-1, 0, 0, 0, 0};      /* Best fit attribute message    */
-    alloc_info  found_other = {-1, 0, 0, 0, 0};     /* Best fit other message        */
-    size_t      idx;                    /* Message number */
-    uint8_t     *p = NULL;              /*ptr into new chunk            */
-    H5O_cont_t  *cont = NULL;           /*native continuation message   */
-    size_t      chunkno;                /* Chunk allocated */
-    haddr_t	new_chunk_addr;
-    unsigned    u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_mesg_t *       curr_msg;                       /* Pointer to current message to operate on */
+    H5O_chunk_proxy_t *chk_proxy;                      /* Chunk that message is in */
+    size_t             cont_size;                      /*continuation message size     */
+    size_t             multi_size  = 0;                /* Size of all the messages in the last chunk */
+    int                found_null  = (-1);             /* Best fit null message         */
+    alloc_info         found_attr  = {-1, 0, 0, 0, 0}; /* Best fit attribute message    */
+    alloc_info         found_other = {-1, 0, 0, 0, 0}; /* Best fit other message        */
+    size_t             idx;                            /* Message number */
+    uint8_t *          p    = NULL;                    /*ptr into new chunk            */
+    H5O_cont_t *       cont = NULL;                    /*native continuation message   */
+    size_t             chunkno;                        /* Chunk allocated */
+    haddr_t            new_chunk_addr;
+    unsigned           u;                   /* Local index variable */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -784,83 +770,87 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
      *
      */
     cont_size = H5O_ALIGN_OH(oh, (size_t)(H5F_SIZEOF_ADDR(f) + H5F_SIZEOF_SIZE(f)));
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
-        if(curr_msg->type->id == H5O_NULL_ID) {
-            if(cont_size == curr_msg->raw_size) {
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+        if (curr_msg->type->id == H5O_NULL_ID) {
+            if (cont_size == curr_msg->raw_size) {
                 found_null = (int)u;
                 break;
-            }  /* end if */
-            else if(curr_msg->raw_size > cont_size &&
-                    (found_null < 0 || curr_msg->raw_size < oh->mesg[found_null].raw_size))
+            } /* end if */
+            else if (curr_msg->raw_size > cont_size &&
+                     (found_null < 0 || curr_msg->raw_size < oh->mesg[found_null].raw_size))
                 found_null = (int)u;
         } /* end if */
-        else if(curr_msg->type->id == H5O_CONT_ID) {
+        else if (curr_msg->type->id == H5O_CONT_ID) {
             /* Don't consider continuation messages (for now) */
         } /* end if */
-        else if(curr_msg->locked) {
+        else if (curr_msg->locked) {
             /* Don't consider locked messages */
         } /* end if */
         else {
-            unsigned msg_chunkno = curr_msg->chunkno;         /* Chunk that the message is in */
-            uint8_t *end_chunk_data = (oh->chunk[msg_chunkno].image + oh->chunk[msg_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[msg_chunkno].gap);     /* End of message data in chunk */
-            uint8_t *end_msg = curr_msg->raw + curr_msg->raw_size;  /* End of current message */
-            size_t gap_size = 0;            /* Size of gap after current message */
-            size_t null_size = 0;           /* Size of NULL message after current message */
-            unsigned null_msgno = 0;        /* Index of NULL message after current message */
-            size_t total_size;              /* Total size of available space "around" current message */
+            unsigned msg_chunkno = curr_msg->chunkno; /* Chunk that the message is in */
+            uint8_t *end_chunk_data =
+                (oh->chunk[msg_chunkno].image + oh->chunk[msg_chunkno].size) -
+                (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[msg_chunkno].gap); /* End of message data in chunk */
+            uint8_t *end_msg    = curr_msg->raw + curr_msg->raw_size;    /* End of current message */
+            size_t   gap_size   = 0; /* Size of gap after current message */
+            size_t   null_size  = 0; /* Size of NULL message after current message */
+            unsigned null_msgno = 0; /* Index of NULL message after current message */
+            size_t   total_size;     /* Total size of available space "around" current message */
 
             /* Check if the message is the last one in the chunk */
-            if(end_msg == end_chunk_data)
+            if (end_msg == end_chunk_data)
                 gap_size = oh->chunk[msg_chunkno].gap;
             else {
-                H5O_mesg_t *tmp_msg;    /* Temp. pointer to message to operate on */
-                unsigned v;             /* Local index variable */
+                H5O_mesg_t *tmp_msg; /* Temp. pointer to message to operate on */
+                unsigned    v;       /* Local index variable */
 
                 /* Check for null message after this message, in same chunk */
-                for(v = 0, tmp_msg = &oh->mesg[0]; v < oh->nmesgs; v++, tmp_msg++) {
-                    if(tmp_msg->type->id == H5O_NULL_ID && (tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) == end_msg) {
+                for (v = 0, tmp_msg = &oh->mesg[0]; v < oh->nmesgs; v++, tmp_msg++) {
+                    if (tmp_msg->type->id == H5O_NULL_ID &&
+                        (tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) == end_msg) {
                         null_msgno = v;
-                        null_size = (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + tmp_msg->raw_size;
+                        null_size  = (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + tmp_msg->raw_size;
                         break;
                     } /* end if */
 
                     /* XXX: Should also check for NULL message in front of current message... */
 
                 } /* end for */
-            } /* end else */
+            }     /* end else */
 
             /* Add up current message's total available space */
             total_size = curr_msg->raw_size + gap_size + null_size;
 
             /* Check if message is large enough to hold continuation info */
-            if(total_size >= cont_size) {
-                if(curr_msg->type->id == H5O_ATTR_ID) {
-                    if(found_attr.msgno < 0 || total_size < found_attr.total_size) {
-                        found_attr.msgno = (int)u;
-                        found_attr.gap_size = gap_size;
-                        found_attr.null_size = null_size;
+            if (total_size >= cont_size) {
+                if (curr_msg->type->id == H5O_ATTR_ID) {
+                    if (found_attr.msgno < 0 || total_size < found_attr.total_size) {
+                        found_attr.msgno      = (int)u;
+                        found_attr.gap_size   = gap_size;
+                        found_attr.null_size  = null_size;
                         found_attr.total_size = total_size;
                         found_attr.null_msgno = null_msgno;
                     } /* end if */
-                } /* end if */
+                }     /* end if */
                 else {
-                    if(found_other.msgno < 0 || total_size < found_other.total_size) {
-                        found_other.msgno = (int)u;
-                        found_other.gap_size = gap_size;
-                        found_other.null_size = null_size;
+                    if (found_other.msgno < 0 || total_size < found_other.total_size) {
+                        found_other.msgno      = (int)u;
+                        found_other.gap_size   = gap_size;
+                        found_other.null_size  = null_size;
                         found_other.total_size = total_size;
                         found_other.null_msgno = null_msgno;
                     } /* end if */
-                } /* end else */
-            } /* end if */
-            else if(found_null < 0 && found_attr.msgno < 0 && found_other.msgno < 0 && msg_chunkno == oh->nchunks - 1)
+                }     /* end else */
+            }         /* end if */
+            else if (found_null < 0 && found_attr.msgno < 0 && found_other.msgno < 0 &&
+                     msg_chunkno == oh->nchunks - 1)
                 /* Keep track of the total size of smaller messages in the last
                  * chunk, in case we need to move more than 1 message.
                  */
                 multi_size += curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
         } /* end else */
-    } /* end for */
-    if(found_null >= 0 || found_attr.msgno >= 0 || found_other.msgno >= 0)
+    }     /* end for */
+    if (found_null >= 0 || found_attr.msgno >= 0 || found_other.msgno >= 0)
         multi_size = 0;
 
     /*
@@ -873,15 +863,15 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
      * If all else fails, move every message in the last chunk.
      *
      */
-    if(multi_size == 0) {
-        if(found_null < 0) {
-            if(found_other.msgno < 0)
+    if (multi_size == 0) {
+        if (found_null < 0) {
+            if (found_other.msgno < 0)
                 found_other = found_attr;
 
             HDassert(found_other.msgno >= 0);
             size += (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + oh->mesg[found_other.msgno].raw_size;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else
         size += multi_size;
 
@@ -898,37 +888,37 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
      * on the chunk and the continuation chunk magic #. (which are only present
      * in later versions of the object header)
      */
-    size +=  H5O_SIZEOF_CHKHDR_OH(oh);
+    size += H5O_SIZEOF_CHKHDR_OH(oh);
 
     /* allocate space in file to hold the new chunk */
     new_chunk_addr = H5MF_alloc(f, H5FD_MEM_OHDR, dxpl_id, (hsize_t)size);
-    if(HADDR_UNDEF == new_chunk_addr)
+    if (HADDR_UNDEF == new_chunk_addr)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate space for new chunk")
 
     /*
      * Create the new chunk giving it a file address.
      */
-    if(oh->nchunks >= oh->alloc_nchunks) {
-        size_t na = MAX(H5O_NCHUNKS, oh->alloc_nchunks * 2);        /* Double # of chunks allocated */
+    if (oh->nchunks >= oh->alloc_nchunks) {
+        size_t       na = MAX(H5O_NCHUNKS, oh->alloc_nchunks * 2); /* Double # of chunks allocated */
         H5O_chunk_t *x;
 
-        if(NULL == (x = H5FL_SEQ_REALLOC(H5O_chunk_t, oh->chunk, na)))
+        if (NULL == (x = H5FL_SEQ_REALLOC(H5O_chunk_t, oh->chunk, na)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
         oh->alloc_nchunks = na;
-        oh->chunk = x;
+        oh->chunk         = x;
     } /* end if */
 
-    chunkno = oh->nchunks++;
+    chunkno                 = oh->nchunks++;
     oh->chunk[chunkno].addr = new_chunk_addr;
     oh->chunk[chunkno].size = size;
-    oh->chunk[chunkno].gap = 0;
-    if(NULL == (oh->chunk[chunkno].image = p = H5FL_BLK_CALLOC(chunk_image, size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    oh->chunk[chunkno].gap  = 0;
+    if (NULL == (oh->chunk[chunkno].image = p = H5FL_BLK_CALLOC(chunk_image, size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* If this is a later version of the object header format, put the magic
      *  # at the beginning of the chunk image.
      */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         HDmemcpy(p, H5O_CHK_MAGIC, (size_t)H5_SIZEOF_MAGIC);
         p += H5_SIZEOF_MAGIC;
     } /* end if */
@@ -937,58 +927,59 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
      * Make sure we have enough space for all possible new messages
      * that could be generated below.
      */
-    if(oh->nmesgs + 3 > oh->alloc_nmesgs)
-        if(H5O_alloc_msgs(oh, (size_t)3) < 0)
+    if (oh->nmesgs + 3 > oh->alloc_nmesgs)
+        if (H5O_alloc_msgs(oh, (size_t)3) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate more space for messages")
 
     /* Check if we need to move multiple messages, in order to make room for the new message */
-    if(multi_size > 0) {
+    if (multi_size > 0) {
         /* Move all non-null messages in the last chunk to the new chunk.  This
          * should be extremely rare so we don't care too much about minimizing
          * the space used.
          */
-        H5O_mesg_t *null_msg;       /* Pointer to new null message */
+        H5O_mesg_t *null_msg; /* Pointer to new null message */
 
         /* Protect last chunk */
-        if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, chunkno - 1)))
+        if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, chunkno - 1)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
         /* Copy each message to the new location */
-        for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++)
-            if(curr_msg->chunkno == chunkno - 1) {
-                if(curr_msg->type->id == H5O_NULL_ID) {
+        for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++)
+            if (curr_msg->chunkno == chunkno - 1) {
+                if (curr_msg->type->id == H5O_NULL_ID) {
                     /* Delete the null message */
-                    if(u < oh->nmesgs - 1)
+                    if (u < oh->nmesgs - 1)
                         HDmemmove(curr_msg, curr_msg + 1, ((oh->nmesgs - 1) - u) * sizeof(H5O_mesg_t));
                     oh->nmesgs--;
                 } /* end if */
                 else {
                     /* Copy the raw data */
                     HDmemcpy(p, curr_msg->raw - (size_t)H5O_SIZEOF_MSGHDR_OH(oh),
-                        curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
+                             curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
 
                     /* Update the message info */
                     curr_msg->chunkno = chunkno;
-                    curr_msg->raw = p + H5O_SIZEOF_MSGHDR_OH(oh);
+                    curr_msg->raw     = p + H5O_SIZEOF_MSGHDR_OH(oh);
 
                     /* Account for copied message in new chunk */
                     p += (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg->raw_size;
                     size -= (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg->raw_size;
                 } /* end else */
-            } /* end if */
+            }     /* end if */
 
         /* Create a null message spanning the entire last chunk */
-        found_null = (int)oh->nmesgs++;
-        null_msg = &(oh->mesg[found_null]);
-        null_msg->type = H5O_MSG_NULL;
-        null_msg->dirty = TRUE;
+        found_null       = (int)oh->nmesgs++;
+        null_msg         = &(oh->mesg[found_null]);
+        null_msg->type   = H5O_MSG_NULL;
+        null_msg->dirty  = TRUE;
         null_msg->native = NULL;
-        null_msg->raw = oh->chunk[chunkno - 1].image
-                + ((chunkno == 1) ? H5O_SIZEOF_HDR(oh) : H5O_SIZEOF_CHKHDR_OH(oh))
-                - H5O_SIZEOF_CHKSUM_OH(oh) + H5O_SIZEOF_MSGHDR_OH(oh);
-        null_msg->raw_size = oh->chunk[chunkno - 1].size
-                - ((chunkno == 1) ? (size_t)H5O_SIZEOF_HDR(oh) : (size_t)H5O_SIZEOF_CHKHDR_OH(oh))
-                - (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
+        null_msg->raw    = oh->chunk[chunkno - 1].image +
+                        ((chunkno == 1) ? H5O_SIZEOF_HDR(oh) : H5O_SIZEOF_CHKHDR_OH(oh)) -
+                        H5O_SIZEOF_CHKSUM_OH(oh) + H5O_SIZEOF_MSGHDR_OH(oh);
+        null_msg->raw_size =
+            oh->chunk[chunkno - 1].size -
+            ((chunkno == 1) ? (size_t)H5O_SIZEOF_HDR(oh) : (size_t)H5O_SIZEOF_CHKHDR_OH(oh)) -
+            (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
         null_msg->chunkno = chunkno - 1;
 
         HDassert(null_msg->raw_size >= cont_size);
@@ -997,33 +988,34 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
         oh->chunk[chunkno - 1].gap = 0;
 
         /* Release chunk, marking it dirty */
-        if(H5O_chunk_unprotect(f, dxpl_id, chk_proxy, TRUE) < 0)
+        if (H5O_chunk_unprotect(f, dxpl_id, chk_proxy, TRUE) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
-    } else if(found_null < 0) {
+    }
+    else if (found_null < 0) {
         /* Move message (that will be replaced with continuation message)
          *  to new chunk, if necessary.
          */
-        H5O_mesg_t *null_msg;       /* Pointer to new null message */
+        H5O_mesg_t *null_msg; /* Pointer to new null message */
 
         /* Protect chunk */
-        if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, oh->mesg[found_other.msgno].chunkno)))
+        if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, oh->mesg[found_other.msgno].chunkno)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
         /* Create null message for space that message to copy currently occupies */
-        found_null = (int)oh->nmesgs++;
-        null_msg = &(oh->mesg[found_null]);
-        null_msg->type = H5O_MSG_NULL;
-        null_msg->native = NULL;
-        null_msg->raw = oh->mesg[found_other.msgno].raw;
+        found_null         = (int)oh->nmesgs++;
+        null_msg           = &(oh->mesg[found_null]);
+        null_msg->type     = H5O_MSG_NULL;
+        null_msg->native   = NULL;
+        null_msg->raw      = oh->mesg[found_other.msgno].raw;
         null_msg->raw_size = oh->mesg[found_other.msgno].raw_size;
-        null_msg->chunkno = oh->mesg[found_other.msgno].chunkno;
+        null_msg->chunkno  = oh->mesg[found_other.msgno].chunkno;
 
         /* Copy the message to move (& its prefix) to its new location */
         HDmemcpy(p, oh->mesg[found_other.msgno].raw - H5O_SIZEOF_MSGHDR_OH(oh),
                  oh->mesg[found_other.msgno].raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
 
         /* Switch moved message to point to new location */
-        oh->mesg[found_other.msgno].raw = p + H5O_SIZEOF_MSGHDR_OH(oh);
+        oh->mesg[found_other.msgno].raw     = p + H5O_SIZEOF_MSGHDR_OH(oh);
         oh->mesg[found_other.msgno].chunkno = chunkno;
 
         /* Account for copied message in new chunk */
@@ -1031,14 +1023,15 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
         size -= (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + oh->mesg[found_other.msgno].raw_size;
 
         /* Add any available space after the message to move to the new null message */
-        if(found_other.gap_size > 0) {
+        if (found_other.gap_size > 0) {
             /* Absorb a gap after the moved message */
             HDassert(oh->chunk[null_msg->chunkno].gap == found_other.gap_size);
             null_msg->raw_size += found_other.gap_size;
             oh->chunk[null_msg->chunkno].gap = 0;
         } /* end if */
-        else if(found_other.null_size > 0) {
-            H5O_mesg_t *old_null_msg = &oh->mesg[found_other.null_msgno]; /* Pointer to NULL message to eliminate */
+        else if (found_other.null_size > 0) {
+            H5O_mesg_t *old_null_msg =
+                &oh->mesg[found_other.null_msgno]; /* Pointer to NULL message to eliminate */
 
             /* Absorb a null message after the moved message */
             HDassert((null_msg->raw + null_msg->raw_size) == (old_null_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)));
@@ -1048,8 +1041,9 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
             H5O_msg_free_mesg(old_null_msg);
 
             /* Remove null message from list of messages */
-            if(found_other.null_msgno < (oh->nmesgs - 1))
-                HDmemmove(old_null_msg, old_null_msg + 1, ((oh->nmesgs - 1) - found_other.null_msgno) * sizeof(H5O_mesg_t));
+            if (found_other.null_msgno < (oh->nmesgs - 1))
+                HDmemmove(old_null_msg, old_null_msg + 1,
+                          ((oh->nmesgs - 1) - found_other.null_msgno) * sizeof(H5O_mesg_t));
 
             /* Decrement # of messages */
             /* (Don't bother reducing size of message array for now -QAK) */
@@ -1063,34 +1057,34 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new
         null_msg->dirty = TRUE;
 
         /* Release chunk, marking it dirty */
-        if(H5O_chunk_unprotect(f, dxpl_id, chk_proxy, TRUE) < 0)
+        if (H5O_chunk_unprotect(f, dxpl_id, chk_proxy, TRUE) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
     } /* end if */
     HDassert(found_null >= 0);
 
     /* Create null message for [rest of] space in new chunk */
     /* (account for chunk's magic # & checksum) */
-    idx = oh->nmesgs++;
-    oh->mesg[idx].type = H5O_MSG_NULL;
-    oh->mesg[idx].dirty = TRUE;
-    oh->mesg[idx].native = NULL;
-    oh->mesg[idx].raw = p + H5O_SIZEOF_MSGHDR_OH(oh);
+    idx                    = oh->nmesgs++;
+    oh->mesg[idx].type     = H5O_MSG_NULL;
+    oh->mesg[idx].dirty    = TRUE;
+    oh->mesg[idx].native   = NULL;
+    oh->mesg[idx].raw      = p + H5O_SIZEOF_MSGHDR_OH(oh);
     oh->mesg[idx].raw_size = size - (size_t)(H5O_SIZEOF_CHKHDR_OH(oh) + H5O_SIZEOF_MSGHDR_OH(oh));
-    oh->mesg[idx].chunkno = chunkno;
+    oh->mesg[idx].chunkno  = chunkno;
 
     /* Insert the new chunk into the cache */
-    if(H5O_chunk_add(f, dxpl_id, oh, chunkno) < 0)
+    if (H5O_chunk_add(f, dxpl_id, oh, chunkno) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't add new chunk to cache")
 
     /* Initialize the continuation information */
-    if(NULL == (cont = H5FL_MALLOC(H5O_cont_t)))
+    if (NULL == (cont = H5FL_MALLOC(H5O_cont_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    cont->addr = oh->chunk[chunkno].addr;
-    cont->size = oh->chunk[chunkno].size;
+    cont->addr    = oh->chunk[chunkno].addr;
+    cont->size    = oh->chunk[chunkno].size;
     cont->chunkno = chunkno;
 
     /* Split the null message and point at continuation message */
-    if(H5O_alloc_null(f, dxpl_id, oh, (size_t)found_null, H5O_MSG_CONT, cont, cont_size) < 0)
+    if (H5O_alloc_null(f, dxpl_id, oh, (size_t)found_null, H5O_MSG_CONT, cont, cont_size) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't split null message")
 
     /* Set new message index value */
@@ -1100,7 +1094,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_alloc_new_chunk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_alloc
  *
@@ -1116,8 +1109,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
-    const void *mesg, size_t *mesg_idx)
+H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, const void *mesg, size_t *mesg_idx)
 {
     size_t raw_size;            /* Raw size of message */
     size_t aligned_size;        /* Size of message including alignment */
@@ -1134,20 +1126,20 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
 
     /* Compute the size needed to store the message in the object header */
     raw_size = (type->raw_size)(f, FALSE, mesg);
-    if(0 == raw_size)
+    if (0 == raw_size)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "can't compute object header message size")
-    if(raw_size >= H5O_MESG_MAX_SIZE)
+    if (raw_size >= H5O_MESG_MAX_SIZE)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "object header message is too large")
     aligned_size = H5O_ALIGN_OH(oh, raw_size);
 
     /* look for a null message which is large enough */
-    for(idx = 0; idx < oh->nmesgs; idx++)
-        if(H5O_NULL_ID == oh->mesg[idx].type->id && oh->mesg[idx].raw_size >= aligned_size)
+    for (idx = 0; idx < oh->nmesgs; idx++)
+        if (H5O_NULL_ID == oh->mesg[idx].type->id && oh->mesg[idx].raw_size >= aligned_size)
             break;
 
     /* if we didn't find one, then allocate more header space */
-    if(idx >= oh->nmesgs) {
-        unsigned        chunkno;
+    if (idx >= oh->nmesgs) {
+        unsigned chunkno;
 
         /* check to see if we can extend one of the chunks.  If we can,
          * do so.  Otherwise, we will have to allocate a new chunk.
@@ -1155,28 +1147,28 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
          * Note that in this new version of this function, all chunks
          * must have file space allocated to them.
          */
-        for(chunkno = 0; chunkno < oh->nchunks; chunkno++) {
-            htri_t	tri_result;     /* Status from attempting to extend chunk */
+        for (chunkno = 0; chunkno < oh->nchunks; chunkno++) {
+            htri_t tri_result; /* Status from attempting to extend chunk */
 
-            if((tri_result = H5O_alloc_extend_chunk(f, dxpl_id, oh, chunkno, raw_size, &idx)) < 0)
+            if ((tri_result = H5O_alloc_extend_chunk(f, dxpl_id, oh, chunkno, raw_size, &idx)) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTEXTEND, FAIL, "H5O_alloc_extend_chunk failed unexpectedly")
-            if(tri_result == TRUE)
-		break;
+            if (tri_result == TRUE)
+                break;
         } /* end for */
 
         /* If we were not able to extend a chunk, create a new one */
-        if(idx >= oh->nmesgs)
-            if(H5O_alloc_new_chunk(f, dxpl_id, oh, raw_size, &idx) < 0)
+        if (idx >= oh->nmesgs)
+            if (H5O_alloc_new_chunk(f, dxpl_id, oh, raw_size, &idx) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, FAIL, "unable to create a new object header data chunk")
     } /* end if */
     HDassert(idx < oh->nmesgs);
 
     /* Split the null message and point at continuation message */
-    if(H5O_alloc_null(f, dxpl_id, oh, idx, type, NULL, aligned_size) < 0)
+    if (H5O_alloc_null(f, dxpl_id, oh, idx, type, NULL, aligned_size) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't split null message")
 
     /* Mark object header as dirty in cache */
-    if(H5AC_mark_entry_dirty(oh) < 0)
+    if (H5AC_mark_entry_dirty(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
 
     /* Set message index value */
@@ -1186,7 +1178,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_alloc() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_release_mesg
@@ -1202,12 +1193,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
-    hbool_t adj_link)
+H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg, hbool_t adj_link)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;    /* Chunk that message is in */
-    hbool_t chk_dirtied = FALSE;            /* Flag for unprotecting chunk */
-    herr_t ret_value = SUCCEED; 	    /* Return value */
+    H5O_chunk_proxy_t *chk_proxy   = NULL;    /* Chunk that message is in */
+    hbool_t            chk_dirtied = FALSE;   /* Flag for unprotecting chunk */
+    herr_t             ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1217,22 +1207,24 @@ H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
     HDassert(mesg);
 
     /* Check if we should operate on the message */
-    if(adj_link) {
+    if (adj_link) {
         /* Free any space referred to in the file from this message */
-        if(H5O_delete_mesg(f, dxpl_id, oh, mesg) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete file space for object header message")
+        if (H5O_delete_mesg(f, dxpl_id, oh, mesg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL,
+                        "unable to delete file space for object header message")
     } /* end if */
 
     /* Protect chunk */
-    if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, mesg->chunkno)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header chunk")
+    if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, mesg->chunkno)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header chunk")
 
     /* Free any native information */
     H5O_msg_free_mesg(mesg);
 
     /* Change message type to nil and zero it */
     mesg->type = H5O_MSG_NULL;
-    HDassert(mesg->raw + mesg->raw_size <= (oh->chunk[mesg->chunkno].image + oh->chunk[mesg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[mesg->chunkno].gap));
+    HDassert(mesg->raw + mesg->raw_size <= (oh->chunk[mesg->chunkno].image + oh->chunk[mesg->chunkno].size) -
+                                               (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[mesg->chunkno].gap));
     HDmemset(mesg->raw, 0, mesg->raw_size);
 
     /* Clear message flags */
@@ -1243,23 +1235,23 @@ H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
     chk_dirtied = TRUE;
 
     /* Check if chunk has a gap currently */
-    if(oh->chunk[mesg->chunkno].gap) {
+    if (oh->chunk[mesg->chunkno].gap) {
         /* Eliminate the gap in the chunk */
-        if(H5O_eliminate_gap(oh, &chk_dirtied, mesg,
-                ((oh->chunk[mesg->chunkno].image + oh->chunk[mesg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[mesg->chunkno].gap)),
-                oh->chunk[mesg->chunkno].gap) < 0)
+        if (H5O_eliminate_gap(oh, &chk_dirtied, mesg,
+                              ((oh->chunk[mesg->chunkno].image + oh->chunk[mesg->chunkno].size) -
+                               (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[mesg->chunkno].gap)),
+                              oh->chunk[mesg->chunkno].gap) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
     } /* end if */
 
 done:
     /* Release chunk, if not already done */
-    if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_release_mesg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_move_cont
  *
@@ -1276,11 +1268,11 @@ done:
 static htri_t
 H5O_move_cont(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned cont_u)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that continuation message is in */
-    H5O_mesg_t 	*cont_msg;	/* Pointer to the continuation message */
-    unsigned   	deleted_chunkno;       	/* Chunk # to delete */
-    hbool_t     chk_dirtied = FALSE;    /* Flags for unprotecting chunk */
-    htri_t 	ret_value = TRUE;       /* Return value */
+    H5O_chunk_proxy_t *chk_proxy = NULL;    /* Chunk that continuation message is in */
+    H5O_mesg_t *       cont_msg;            /* Pointer to the continuation message */
+    unsigned           deleted_chunkno;     /* Chunk # to delete */
+    hbool_t            chk_dirtied = FALSE; /* Flags for unprotecting chunk */
+    htri_t             ret_value   = TRUE;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1294,29 +1286,29 @@ H5O_move_cont(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned cont_u)
     deleted_chunkno = ((H5O_cont_t *)(cont_msg->native))->chunkno;
 
     /* Check if continuation message is pointing to the last chunk */
-    if(deleted_chunkno == (oh->nchunks - 1)) {
-        size_t nonnull_size;	/* Total size of nonnull messages in the chunk pointed to by cont message */
-        H5O_mesg_t *curr_msg;   /* Pointer to the current message to operate on */
-        size_t gap_size;        /* Size of gap produced */
-        size_t v;	        /* Local index variable */
+    if (deleted_chunkno == (oh->nchunks - 1)) {
+        size_t      nonnull_size; /* Total size of nonnull messages in the chunk pointed to by cont message */
+        H5O_mesg_t *curr_msg;     /* Pointer to the current message to operate on */
+        size_t      gap_size;     /* Size of gap produced */
+        size_t      v;            /* Local index variable */
 
         /* Spin through messages */
         nonnull_size = 0;
-        for(v = 0, curr_msg = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg++) {
-            if(curr_msg->chunkno == deleted_chunkno) {
+        for (v = 0, curr_msg = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg++) {
+            if (curr_msg->chunkno == deleted_chunkno) {
                 /* If there's a locked message, we can't move all messages out of
                  *  chunk to delete, so get out now.
                  */
-                if(curr_msg->locked)
+                if (curr_msg->locked)
                     HGOTO_DONE(FALSE)
 
                 /* Find size of all non-null messages in the chunk pointed to by the continuation message */
-                if(curr_msg->type->id != H5O_NULL_ID) {
+                if (curr_msg->type->id != H5O_NULL_ID) {
                     HDassert(curr_msg->type->id != H5O_CONT_ID);
                     nonnull_size += curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
                 } /* end if */
-            } /* end if */
-        } /* end for */
+            }     /* end if */
+        }         /* end for */
 
         /* Size of gap in chunk w/continuation message */
         gap_size = oh->chunk[cont_msg->chunkno].gap;
@@ -1325,48 +1317,49 @@ H5O_move_cont(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned cont_u)
         /* (Could count any null messages in the chunk w/the continuation
          *      message also, but that is pretty complex. -QAK)
          */
-        if(nonnull_size && nonnull_size <= (gap_size + cont_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh))) {
-            uint8_t *move_start, *move_end;	/* Pointers to area of messages to move */
-            unsigned cont_chunkno;              /* Chunk number for continuation message */
+        if (nonnull_size &&
+            nonnull_size <= (gap_size + cont_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh))) {
+            uint8_t *move_start, *move_end; /* Pointers to area of messages to move */
+            unsigned cont_chunkno;          /* Chunk number for continuation message */
 
             /* Get continuation info */
-            move_start = cont_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
-            move_end = cont_msg->raw + cont_msg->raw_size;
+            move_start   = cont_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
+            move_end     = cont_msg->raw + cont_msg->raw_size;
             cont_chunkno = cont_msg->chunkno;
 
             /* Convert continuation message into a null message.  Do not delete
              * the target chunk yet, so we can still copy messages from it. */
-            if(H5O_release_mesg(f, dxpl_id, oh, cont_msg, FALSE) < 0)
+            if (H5O_release_mesg(f, dxpl_id, oh, cont_msg, FALSE) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to convert into null message")
 
             /* Protect chunk */
-            if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, cont_chunkno)))
+            if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, cont_chunkno)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header chunk")
 
             /* Move message(s) forward into continuation message */
-            for(v = 0, curr_msg = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg++)
+            for (v = 0, curr_msg = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg++)
                 /* Look for messages in chunk to delete */
-                if(curr_msg->chunkno == deleted_chunkno) {
+                if (curr_msg->chunkno == deleted_chunkno) {
                     /* Move messages out of chunk to delete */
-                    if(curr_msg->type->id != H5O_NULL_ID) {
-                        size_t move_size;	/* Size of the message to be moved */
+                    if (curr_msg->type->id != H5O_NULL_ID) {
+                        size_t move_size; /* Size of the message to be moved */
 
                         /* Compute size of message to move */
                         move_size = curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
 
                         /* Move message out of deleted chunk */
                         HDmemcpy(move_start, curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh), move_size);
-                        curr_msg->raw = move_start + H5O_SIZEOF_MSGHDR_OH(oh);
+                        curr_msg->raw     = move_start + H5O_SIZEOF_MSGHDR_OH(oh);
                         curr_msg->chunkno = cont_chunkno;
-                        chk_dirtied = TRUE;
+                        chk_dirtied       = TRUE;
 
                         /* Adjust location to move messages to */
                         move_start += move_size;
                     } /* end else */
-                } /* end if */
+                }     /* end if */
 
             /* Delete the target chunk */
-            if(H5O_chunk_delete(f, dxpl_id, oh, deleted_chunkno) < 0)
+            if (H5O_chunk_delete(f, dxpl_id, oh, deleted_chunkno) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to remove chunk from cache")
 
             HDassert(move_start <= (move_end + gap_size));
@@ -1374,65 +1367,66 @@ H5O_move_cont(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned cont_u)
             /* Check if there is space remaining in the continuation message */
             /* (The remaining space can be gap or a null message) */
             gap_size += (size_t)(move_end - move_start);
-            if(gap_size >= (size_t)H5O_SIZEOF_MSGHDR_OH(oh)) {
+            if (gap_size >= (size_t)H5O_SIZEOF_MSGHDR_OH(oh)) {
                 /* Adjust size of null (was continuation) message */
                 cont_msg->raw_size = gap_size - (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
-                cont_msg->raw = move_start + H5O_SIZEOF_MSGHDR_OH(oh);
-                cont_msg->dirty = TRUE;
-                chk_dirtied = TRUE;
+                cont_msg->raw      = move_start + H5O_SIZEOF_MSGHDR_OH(oh);
+                cont_msg->dirty    = TRUE;
+                chk_dirtied        = TRUE;
             } /* end if */
             else {
                 /* Check if there is space that should be a gap */
-                if(gap_size > 0) {
+                if (gap_size > 0) {
                     /* Convert remnant into gap in chunk */
-                    if(H5O_add_gap(f, oh, cont_chunkno, &chk_dirtied, cont_u, move_start, gap_size) < 0)
+                    if (H5O_add_gap(f, oh, cont_chunkno, &chk_dirtied, cont_u, move_start, gap_size) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert gap in chunk")
                 } /* end if */
 
                 /* Release any information/memory for continuation message */
                 H5O_msg_free_mesg(cont_msg);
-                if(cont_u < (oh->nmesgs - 1))
-                    HDmemmove(&oh->mesg[cont_u], &oh->mesg[cont_u + 1], ((oh->nmesgs - 1) - cont_u) * sizeof(H5O_mesg_t));
+                if (cont_u < (oh->nmesgs - 1))
+                    HDmemmove(&oh->mesg[cont_u], &oh->mesg[cont_u + 1],
+                              ((oh->nmesgs - 1) - cont_u) * sizeof(H5O_mesg_t));
                 oh->nmesgs--;
             } /* end else */
 
             /* Move message(s) forward into continuation message */
             /*      Note: unsigned v wrapping around at the end */
-            for(v = oh->nmesgs - 1, curr_msg = &oh->mesg[v]; v < oh->nmesgs; v--, curr_msg--)
+            for (v = oh->nmesgs - 1, curr_msg = &oh->mesg[v]; v < oh->nmesgs; v--, curr_msg--)
                 /* Look for messages in chunk to delete */
-                if(curr_msg->chunkno == deleted_chunkno) {
+                if (curr_msg->chunkno == deleted_chunkno) {
                     /* Remove all null messages in deleted chunk from list of messages */
-                    if(curr_msg->type->id == H5O_NULL_ID) {
+                    if (curr_msg->type->id == H5O_NULL_ID) {
                         /* Release any information/memory for message */
                         H5O_msg_free_mesg(curr_msg);
                         chk_dirtied = TRUE;
 
                         /* Remove from message list */
-                        if(v < (oh->nmesgs - 1))
-                            HDmemmove(&oh->mesg[v], &oh->mesg[v + 1], ((oh->nmesgs - 1) - v) * sizeof(H5O_mesg_t));
+                        if (v < (oh->nmesgs - 1))
+                            HDmemmove(&oh->mesg[v], &oh->mesg[v + 1],
+                                      ((oh->nmesgs - 1) - v) * sizeof(H5O_mesg_t));
                         oh->nmesgs--;
                     } /* end if */
-                } /* end if */
+                }     /* end if */
 
             /* Remove chunk from list of chunks */
             oh->chunk[deleted_chunkno].image = H5FL_BLK_FREE(chunk_image, oh->chunk[deleted_chunkno].image);
             oh->nchunks--;
-        }  /* end if */
+        } /* end if */
         else
             ret_value = FALSE;
-    }  /* end if */
+    } /* end if */
     else
         ret_value = FALSE;
 
 done:
     /* Release chunk, if not already done */
-    if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_move_cont() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_move_msgs_forward
@@ -1450,13 +1444,13 @@ done:
 static htri_t
 H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
 {
-    H5O_chunk_proxy_t *null_chk_proxy = NULL;  /* Chunk that null message is in */
-    H5O_chunk_proxy_t *curr_chk_proxy = NULL;  /* Chunk that message is in */
-    hbool_t null_chk_dirtied = FALSE;  /* Flags for unprotecting null chunk */
-    hbool_t curr_chk_dirtied = FALSE;  /* Flags for unprotecting curr chunk */
-    hbool_t packed_msg;                 /* Flag to indicate that messages were packed */
-    hbool_t did_packing = FALSE;        /* Whether any messages were packed */
-    htri_t ret_value; 	                /* Return value */
+    H5O_chunk_proxy_t *null_chk_proxy   = NULL;  /* Chunk that null message is in */
+    H5O_chunk_proxy_t *curr_chk_proxy   = NULL;  /* Chunk that message is in */
+    hbool_t            null_chk_dirtied = FALSE; /* Flags for unprotecting null chunk */
+    hbool_t            curr_chk_dirtied = FALSE; /* Flags for unprotecting curr chunk */
+    hbool_t            packed_msg;               /* Flag to indicate that messages were packed */
+    hbool_t            did_packing = FALSE;      /* Whether any messages were packed */
+    htri_t             ret_value;                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1468,54 +1462,60 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
      *      add a list of messages to each chunk -QAK)
      */
     do {
-        H5O_mesg_t *curr_msg;       /* Pointer to current message to operate on */
-        unsigned	u;              /* Local index variable */
+        H5O_mesg_t *curr_msg; /* Pointer to current message to operate on */
+        unsigned    u;        /* Local index variable */
 
         /* Reset packed messages flag */
         packed_msg = FALSE;
 
         /* Scan through messages for messages that can be moved earlier in chunks */
-        for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
-            if(H5O_NULL_ID == curr_msg->type->id) {
-                H5O_chunk_t *chunk;     /* Pointer to chunk that null message is in */
+        for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+            if (H5O_NULL_ID == curr_msg->type->id) {
+                H5O_chunk_t *chunk; /* Pointer to chunk that null message is in */
 
                 /* Check if null message is not last in chunk */
                 chunk = &(oh->chunk[curr_msg->chunkno]);
-                if((curr_msg->raw + curr_msg->raw_size)
-                        != ((chunk->image + chunk->size) - (H5O_SIZEOF_CHKSUM_OH(oh) + chunk->gap))) {
-                    H5O_mesg_t *nonnull_msg;       /* Pointer to current message to operate on */
-                    unsigned	v;              /* Local index variable */
-
-                    /* Loop over messages again, looking for the message in the chunk after the null message */
-                    for(v = 0, nonnull_msg = &oh->mesg[0]; v < oh->nmesgs; v++, nonnull_msg++) {
+                if ((curr_msg->raw + curr_msg->raw_size) !=
+                    ((chunk->image + chunk->size) - (H5O_SIZEOF_CHKSUM_OH(oh) + chunk->gap))) {
+                    H5O_mesg_t *nonnull_msg; /* Pointer to current message to operate on */
+                    unsigned    v;           /* Local index variable */
+
+                    /* Loop over messages again, looking for the message in the chunk after the null message
+                     */
+                    for (v = 0, nonnull_msg = &oh->mesg[0]; v < oh->nmesgs; v++, nonnull_msg++) {
                         /* Locate message that is immediately after the null message */
-                        if((curr_msg->chunkno == nonnull_msg->chunkno) &&
-                                ((curr_msg->raw + curr_msg->raw_size) == (nonnull_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)))) {
+                        if ((curr_msg->chunkno == nonnull_msg->chunkno) &&
+                            ((curr_msg->raw + curr_msg->raw_size) ==
+                             (nonnull_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)))) {
                             /* Don't swap messages if the second message is also a null message */
                             /* (We'll merge them together later, in another routine) */
-                            if(H5O_NULL_ID != nonnull_msg->type->id) {
+                            if (H5O_NULL_ID != nonnull_msg->type->id) {
                                 /* Protect chunk */
-                                if(NULL == (null_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, curr_msg->chunkno)))
-                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
+                                if (NULL ==
+                                    (null_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, curr_msg->chunkno)))
+                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL,
+                                                "unable to load object header chunk")
 
                                 /* Copy raw data for non-null message to new location */
                                 HDmemmove(curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh),
-                                    nonnull_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh), nonnull_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
+                                          nonnull_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh),
+                                          nonnull_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
 
                                 /* Adjust non-null message's offset in chunk */
                                 nonnull_msg->raw = curr_msg->raw;
 
                                 /* Adjust null message's offset in chunk */
-                                curr_msg->raw = nonnull_msg->raw +
-                                        nonnull_msg->raw_size + H5O_SIZEOF_MSGHDR_OH(oh);
+                                curr_msg->raw =
+                                    nonnull_msg->raw + nonnull_msg->raw_size + H5O_SIZEOF_MSGHDR_OH(oh);
 
                                 /* Mark null message dirty */
                                 /* (since we need to re-encode its message header) */
                                 curr_msg->dirty = TRUE;
 
                                 /* Release chunk, marking it dirty */
-                                if(H5O_chunk_unprotect(f, dxpl_id, null_chk_proxy, TRUE) < 0)
-                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
+                                if (H5O_chunk_unprotect(f, dxpl_id, null_chk_proxy, TRUE) < 0)
+                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL,
+                                                "unable to unprotect object header chunk")
                                 null_chk_proxy = NULL;
 
                                 /* Set the flag to indicate that the null message
@@ -1528,122 +1528,142 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                             /* Break out of loop */
                             break;
                         } /* end if */
-                    } /* end for */
+                    }     /* end for */
                     /* Should have been message after null message */
                     HDassert(v < oh->nmesgs);
                 } /* end if */
-            } /* end if */
+            }     /* end if */
             else {
-                H5O_mesg_t *null_msg;   /* Pointer to current message to operate on */
-                size_t   v;             /* Local index variable */
+                H5O_mesg_t *null_msg; /* Pointer to current message to operate on */
+                size_t      v;        /* Local index variable */
 
                 /* Check if messages in chunk pointed to can replace continuation message */
-                if(H5O_CONT_ID == curr_msg->type->id) {
-                    htri_t status;      /* Status from moving messages */
+                if (H5O_CONT_ID == curr_msg->type->id) {
+                    htri_t status; /* Status from moving messages */
 
-		    if((status = H5O_move_cont(f, dxpl_id, oh, u)) < 0)
-			HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "Error in moving messages into cont message")
-		    else if(status > 0) { /* Message(s) got moved into "continuation" message */
+                    if ((status = H5O_move_cont(f, dxpl_id, oh, u)) < 0)
+                        HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL,
+                                    "Error in moving messages into cont message")
+                    else if (status > 0) { /* Message(s) got moved into "continuation" message */
                         packed_msg = TRUE;
-			break;
-		    } /* end else-if */
-		} /* end if */
+                        break;
+                    } /* end else-if */
+                }     /* end if */
 
                 /* Don't let locked messages be moved into earlier chunk */
-                if(!curr_msg->locked) {
+                if (!curr_msg->locked) {
                     /* Loop over messages again, looking for large enough null message in earlier chunk */
-                    for(v = 0, null_msg = &oh->mesg[0]; v < oh->nmesgs; v++, null_msg++) {
-                        if(H5O_NULL_ID == null_msg->type->id && curr_msg->chunkno > null_msg->chunkno
-                                && curr_msg->raw_size <= null_msg->raw_size) {
-                            unsigned old_chunkno;   /* Old message information */
+                    for (v = 0, null_msg = &oh->mesg[0]; v < oh->nmesgs; v++, null_msg++) {
+                        if (H5O_NULL_ID == null_msg->type->id && curr_msg->chunkno > null_msg->chunkno &&
+                            curr_msg->raw_size <= null_msg->raw_size) {
+                            unsigned old_chunkno; /* Old message information */
                             uint8_t *old_raw;
 
                             /* Keep old information about non-null message */
                             old_chunkno = curr_msg->chunkno;
-                            old_raw = curr_msg->raw;
+                            old_raw     = curr_msg->raw;
 
                             /* Protect chunks */
-                            if(NULL == (null_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, null_msg->chunkno)))
-                                HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
-                            if(NULL == (curr_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, curr_msg->chunkno)))
-                                HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
+                            if (NULL ==
+                                (null_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, null_msg->chunkno)))
+                                HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL,
+                                            "unable to load object header chunk")
+                            if (NULL ==
+                                (curr_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, curr_msg->chunkno)))
+                                HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL,
+                                            "unable to load object header chunk")
 
                             /* Copy raw data for non-null message to new chunk */
-                            HDmemcpy(null_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh), curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh), curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
+                            HDmemcpy(null_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh),
+                                     curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh),
+                                     curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
 
                             /* Point non-null message at null message's space */
                             curr_msg->chunkno = null_msg->chunkno;
-                            curr_msg->raw = null_msg->raw;
-                            curr_chk_dirtied = TRUE;
+                            curr_msg->raw     = null_msg->raw;
+                            curr_chk_dirtied  = TRUE;
 
                             /* Change information for null message */
-                            if(curr_msg->raw_size == null_msg->raw_size) {
+                            if (curr_msg->raw_size == null_msg->raw_size) {
                                 /* Point null message at old non-null space */
                                 /* (Instead of freeing it and allocating new message) */
                                 null_msg->chunkno = old_chunkno;
-                                null_msg->raw = old_raw;
+                                null_msg->raw     = old_raw;
 
                                 /* Mark null message dirty */
-                                null_msg->dirty = TRUE;
+                                null_msg->dirty  = TRUE;
                                 null_chk_dirtied = TRUE;
 
                                 /* Release current chunk, marking it dirty */
-                                if(H5O_chunk_unprotect(f, dxpl_id, curr_chk_proxy, curr_chk_dirtied) < 0)
-                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
-                                curr_chk_proxy = NULL;
+                                if (H5O_chunk_unprotect(f, dxpl_id, curr_chk_proxy, curr_chk_dirtied) < 0)
+                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL,
+                                                "unable to unprotect object header chunk")
+                                curr_chk_proxy   = NULL;
                                 curr_chk_dirtied = FALSE;
 
                                 /* Check for gap in null message's chunk */
-                                if(oh->chunk[old_chunkno].gap > 0) {
+                                if (oh->chunk[old_chunkno].gap > 0) {
                                     /* Eliminate the gap in the chunk */
-                                    if(H5O_eliminate_gap(oh, &null_chk_dirtied, null_msg,
-                                            ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)),
+                                    if (H5O_eliminate_gap(
+                                            oh, &null_chk_dirtied, null_msg,
+                                            ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) -
+                                             (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)),
                                             oh->chunk[old_chunkno].gap) < 0)
-                                        HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
+                                        HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL,
+                                                    "can't eliminate gap in chunk")
                                 } /* end if */
 
                                 /* Release null chunk, marking it dirty */
-                                if(H5O_chunk_unprotect(f, dxpl_id, null_chk_proxy, null_chk_dirtied) < 0)
-                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
-                                null_chk_proxy = NULL;
+                                if (H5O_chunk_unprotect(f, dxpl_id, null_chk_proxy, null_chk_dirtied) < 0)
+                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL,
+                                                "unable to unprotect object header chunk")
+                                null_chk_proxy   = NULL;
                                 null_chk_dirtied = FALSE;
                             } /* end if */
                             else {
-                                size_t new_null_msg;          /* Message index for new null message */
+                                size_t new_null_msg; /* Message index for new null message */
 
                                 /* Check if null message is large enough to still exist */
-                                if((null_msg->raw_size - curr_msg->raw_size) < (size_t)H5O_SIZEOF_MSGHDR_OH(oh)) {
-                                    size_t gap_size = null_msg->raw_size - curr_msg->raw_size;     /* Size of gap produced */
+                                if ((null_msg->raw_size - curr_msg->raw_size) <
+                                    (size_t)H5O_SIZEOF_MSGHDR_OH(oh)) {
+                                    size_t gap_size =
+                                        null_msg->raw_size - curr_msg->raw_size; /* Size of gap produced */
 
                                     /* Adjust the size of the null message being eliminated */
                                     null_msg->raw_size = curr_msg->raw_size;
 
                                     /* Mark null message dirty */
-                                    null_msg->dirty = TRUE;
+                                    null_msg->dirty  = TRUE;
                                     null_chk_dirtied = TRUE;
 
                                     /* Add the gap to the chunk */
-                                    if(H5O_add_gap(f, oh, null_msg->chunkno, &null_chk_dirtied, v, null_msg->raw + null_msg->raw_size, gap_size) < 0)
-                                        HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert gap in chunk")
+                                    if (H5O_add_gap(f, oh, null_msg->chunkno, &null_chk_dirtied, v,
+                                                    null_msg->raw + null_msg->raw_size, gap_size) < 0)
+                                        HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL,
+                                                    "can't insert gap in chunk")
 
-                                    /* Re-use message # for new null message taking place of non-null message */
+                                    /* Re-use message # for new null message taking place of non-null message
+                                     */
                                     new_null_msg = v;
                                 } /* end if */
                                 else {
                                     /* Adjust null message's size & offset */
                                     null_msg->raw += curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
-                                    null_msg->raw_size -= curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
+                                    null_msg->raw_size -=
+                                        curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
 
                                     /* Mark null message dirty */
-                                    null_msg->dirty = TRUE;
+                                    null_msg->dirty  = TRUE;
                                     null_chk_dirtied = TRUE;
 
                                     /* Create new null message for previous location of non-null message */
-                                    if(oh->nmesgs >= oh->alloc_nmesgs) {
-                                        if(H5O_alloc_msgs(oh, (size_t)1) < 0)
-                                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate more space for messages")
+                                    if (oh->nmesgs >= oh->alloc_nmesgs) {
+                                        if (H5O_alloc_msgs(oh, (size_t)1) < 0)
+                                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                                        "can't allocate more space for messages")
 
-                                        /* "Retarget" 'curr_msg' pointer into newly re-allocated array of messages */
+                                        /* "Retarget" 'curr_msg' pointer into newly re-allocated array of
+                                         * messages */
                                         curr_msg = &oh->mesg[u];
                                     } /* end if */
 
@@ -1652,35 +1672,40 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                                 } /* end else */
 
                                 /* Release null message's chunk, marking it dirty */
-                                if(H5O_chunk_unprotect(f, dxpl_id, null_chk_proxy, null_chk_dirtied) < 0)
-                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
-                                null_chk_proxy = NULL;
+                                if (H5O_chunk_unprotect(f, dxpl_id, null_chk_proxy, null_chk_dirtied) < 0)
+                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL,
+                                                "unable to unprotect object header chunk")
+                                null_chk_proxy   = NULL;
                                 null_chk_dirtied = FALSE;
 
                                 /* Initialize new null message to take over non-null message's location */
-                                oh->mesg[new_null_msg].type = H5O_MSG_NULL;
-                                oh->mesg[new_null_msg].native = NULL;
-                                oh->mesg[new_null_msg].raw = old_raw;
+                                oh->mesg[new_null_msg].type     = H5O_MSG_NULL;
+                                oh->mesg[new_null_msg].native   = NULL;
+                                oh->mesg[new_null_msg].raw      = old_raw;
                                 oh->mesg[new_null_msg].raw_size = curr_msg->raw_size;
-                                oh->mesg[new_null_msg].chunkno = old_chunkno;
+                                oh->mesg[new_null_msg].chunkno  = old_chunkno;
 
                                 /* Mark new null message dirty */
                                 oh->mesg[new_null_msg].dirty = TRUE;
-                                curr_chk_dirtied = TRUE;
+                                curr_chk_dirtied             = TRUE;
 
                                 /* Check for gap in new null message's chunk */
-                                if(oh->chunk[old_chunkno].gap > 0) {
+                                if (oh->chunk[old_chunkno].gap > 0) {
                                     /* Eliminate the gap in the chunk */
-                                    if(H5O_eliminate_gap(oh, &curr_chk_dirtied, &oh->mesg[new_null_msg],
-                                            ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)),
+                                    if (H5O_eliminate_gap(
+                                            oh, &curr_chk_dirtied, &oh->mesg[new_null_msg],
+                                            ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) -
+                                             (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)),
                                             oh->chunk[old_chunkno].gap) < 0)
-                                        HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
+                                        HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL,
+                                                    "can't eliminate gap in chunk")
                                 } /* end if */
 
                                 /* Release new null message's chunk, marking it dirty */
-                                if(H5O_chunk_unprotect(f, dxpl_id, curr_chk_proxy, curr_chk_dirtied) < 0)
-                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
-                                curr_chk_proxy = NULL;
+                                if (H5O_chunk_unprotect(f, dxpl_id, curr_chk_proxy, curr_chk_dirtied) < 0)
+                                    HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL,
+                                                "unable to unprotect object header chunk")
+                                curr_chk_proxy   = NULL;
                                 curr_chk_dirtied = FALSE;
                             } /* end else */
 
@@ -1693,34 +1718,33 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                              */
                             break;
                         } /* end if */
-                    } /* end for */
-                } /* end if */
+                    }     /* end for */
+                }         /* end if */
 
                 /* If we packed messages, get out of loop and start over */
                 /* (Don't know if this has any benefit one way or the other -QAK) */
-                if(packed_msg)
+                if (packed_msg)
                     break;
             } /* end else */
-        } /* end for */
+        }     /* end for */
 
         /* If we did any packing, remember that */
-        if(packed_msg)
+        if (packed_msg)
             did_packing = TRUE;
-    } while(packed_msg);
+    } while (packed_msg);
 
     /* Set return value */
     ret_value = (htri_t)did_packing;
 
 done:
-    if(null_chk_proxy && H5O_chunk_unprotect(f, dxpl_id, null_chk_proxy, null_chk_dirtied) < 0)
+    if (null_chk_proxy && H5O_chunk_unprotect(f, dxpl_id, null_chk_proxy, null_chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect null object header chunk")
-    if(curr_chk_proxy && H5O_chunk_unprotect(f, dxpl_id, curr_chk_proxy, curr_chk_dirtied) < 0)
+    if (curr_chk_proxy && H5O_chunk_unprotect(f, dxpl_id, curr_chk_proxy, curr_chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect current object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_move_msgs_forward() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_merge_null
@@ -1738,9 +1762,9 @@ done:
 static htri_t
 H5O_merge_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
 {
-    hbool_t merged_msg;                 /* Flag to indicate that messages were merged */
-    hbool_t did_merging = FALSE;        /* Whether any messages were merged */
-    htri_t ret_value; 	                /* Return value */
+    hbool_t merged_msg;          /* Flag to indicate that messages were merged */
+    hbool_t did_merging = FALSE; /* Whether any messages were merged */
+    htri_t  ret_value;           /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1752,38 +1776,41 @@ H5O_merge_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
      *      a list of messages to each chunk -QAK)
      */
     do {
-        H5O_mesg_t *curr_msg;       /* Pointer to current message to operate on */
-        unsigned	u;              /* Local index variable */
+        H5O_mesg_t *curr_msg; /* Pointer to current message to operate on */
+        unsigned    u;        /* Local index variable */
 
         /* Reset merged messages flag */
         merged_msg = FALSE;
 
         /* Scan messages for adjacent null messages & merge them */
-        for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
-            if(H5O_NULL_ID == curr_msg->type->id) {
-                H5O_mesg_t *curr_msg2;       /* Pointer to current message to operate on */
-                unsigned	v;              /* Local index variable */
+        for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+            if (H5O_NULL_ID == curr_msg->type->id) {
+                H5O_mesg_t *curr_msg2; /* Pointer to current message to operate on */
+                unsigned    v;         /* Local index variable */
 
                 /* Should be no gaps in chunk with null message */
                 HDassert(oh->chunk[curr_msg->chunkno].gap == 0);
 
                 /* Loop over messages again, looking for null message in same chunk */
-                for(v = 0, curr_msg2 = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg2++) {
-                    if(u != v && H5O_NULL_ID == curr_msg2->type->id && curr_msg->chunkno == curr_msg2->chunkno) {
-                        ssize_t adj_raw;        /* Amount to adjust raw message pointer */
-                        size_t adj_raw_size;    /* Amount to adjust raw message size */
+                for (v = 0, curr_msg2 = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg2++) {
+                    if (u != v && H5O_NULL_ID == curr_msg2->type->id &&
+                        curr_msg->chunkno == curr_msg2->chunkno) {
+                        ssize_t adj_raw;      /* Amount to adjust raw message pointer */
+                        size_t  adj_raw_size; /* Amount to adjust raw message size */
 
                         /* Check for second message after first message */
-                        if((curr_msg->raw + curr_msg->raw_size) == (curr_msg2->raw - H5O_SIZEOF_MSGHDR_OH(oh))) {
+                        if ((curr_msg->raw + curr_msg->raw_size) ==
+                            (curr_msg2->raw - H5O_SIZEOF_MSGHDR_OH(oh))) {
                             /* Extend first null message length to cover second null message */
-                            adj_raw = 0;
+                            adj_raw      = 0;
                             adj_raw_size = (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg2->raw_size;
 
                             /* Message has been merged */
                             merged_msg = TRUE;
                         } /* end if */
                         /* Check for second message before first message */
-                        else if((curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) == (curr_msg2->raw + curr_msg2->raw_size)) {
+                        else if ((curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) ==
+                                 (curr_msg2->raw + curr_msg2->raw_size)) {
                             /* Adjust first message address and extend length to cover second message */
                             adj_raw = -((ssize_t)((size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg2->raw_size));
                             adj_raw_size = (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg2->raw_size;
@@ -1793,15 +1820,17 @@ H5O_merge_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                         } /* end if */
 
                         /* Second message has been merged, delete it */
-                        if(merged_msg) {
-                            H5O_chunk_proxy_t *curr_chk_proxy;        /* Chunk that message is in */
+                        if (merged_msg) {
+                            H5O_chunk_proxy_t *curr_chk_proxy; /* Chunk that message is in */
 
                             /* Release any information/memory for second message */
                             H5O_msg_free_mesg(curr_msg2);
 
                             /* Protect chunk */
-                            if(NULL == (curr_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, curr_msg->chunkno)))
-                                HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
+                            if (NULL ==
+                                (curr_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, curr_msg->chunkno)))
+                                HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL,
+                                            "unable to load object header chunk")
 
                             /* Adjust first message address and extend length to cover second message */
                             curr_msg->raw += adj_raw;
@@ -1811,38 +1840,40 @@ H5O_merge_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                             curr_msg->dirty = TRUE;
 
                             /* Release new null message's chunk, marking it dirty */
-                            if(H5O_chunk_unprotect(f, dxpl_id, curr_chk_proxy, TRUE) < 0)
-                                HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
+                            if (H5O_chunk_unprotect(f, dxpl_id, curr_chk_proxy, TRUE) < 0)
+                                HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL,
+                                            "unable to unprotect object header chunk")
 
                             /* Remove second message from list of messages */
-                            if(v < (oh->nmesgs - 1))
-                                HDmemmove(&oh->mesg[v], &oh->mesg[v + 1], ((oh->nmesgs - 1) - v) * sizeof(H5O_mesg_t));
+                            if (v < (oh->nmesgs - 1))
+                                HDmemmove(&oh->mesg[v], &oh->mesg[v + 1],
+                                          ((oh->nmesgs - 1) - v) * sizeof(H5O_mesg_t));
 
                             /* Decrement # of messages */
                             /* (Don't bother reducing size of message array for now -QAK) */
                             oh->nmesgs--;
 
                             /* If the merged message is too large, shrink the chunk */
-                            if(curr_msg->raw_size >= H5O_MESG_MAX_SIZE)
-                                if(H5O_alloc_shrink_chunk(f, dxpl_id, oh, curr_msg->chunkno) < 0)
+                            if (curr_msg->raw_size >= H5O_MESG_MAX_SIZE)
+                                if (H5O_alloc_shrink_chunk(f, dxpl_id, oh, curr_msg->chunkno) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTPACK, FAIL, "unable to shrink chunk")
 
                             /* Get out of loop */
                             break;
                         } /* end if */
-                    } /* end if */
-                } /* end for */
+                    }     /* end if */
+                }         /* end for */
 
                 /* Get out of loop if we merged messages */
-                if(merged_msg)
+                if (merged_msg)
                     break;
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /* If we did any merging, remember that */
-        if(merged_msg)
+        if (merged_msg)
             did_merging = TRUE;
-    } while(merged_msg);
+    } while (merged_msg);
 
     /* Set return value */
     ret_value = (htri_t)did_merging;
@@ -1851,7 +1882,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_merge_null() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_remove_empty_chunks
@@ -1873,9 +1903,9 @@ done:
 static htri_t
 H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
 {
-    hbool_t deleted_chunk;              /* Whether to a chunk was deleted */
-    hbool_t did_deleting = FALSE;       /* Whether any chunks were deleted */
-    htri_t ret_value; 	                /* Return value */
+    hbool_t deleted_chunk;        /* Whether to a chunk was deleted */
+    hbool_t did_deleting = FALSE; /* Whether any chunks were deleted */
+    htri_t  ret_value;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1884,39 +1914,39 @@ H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
 
     /* Loop until no chunks are freed */
     do {
-        H5O_mesg_t *null_msg;       /* Pointer to null message found */
-        H5O_mesg_t *cont_msg;       /* Pointer to continuation message found */
-        unsigned	u, v;       /* Local index variables */
+        H5O_mesg_t *null_msg; /* Pointer to null message found */
+        H5O_mesg_t *cont_msg; /* Pointer to continuation message found */
+        unsigned    u, v;     /* Local index variables */
 
         /* Reset 'chunk deleted' flag */
         deleted_chunk = FALSE;
 
         /* Scan messages for null messages that fill an entire chunk */
-        for(u = 0, null_msg = &oh->mesg[0]; u < oh->nmesgs; u++, null_msg++) {
+        for (u = 0, null_msg = &oh->mesg[0]; u < oh->nmesgs; u++, null_msg++) {
             /* If a null message takes up an entire object header chunk (and
              * its not the "base" chunk), delete that chunk from object header
              */
-            if(H5O_NULL_ID == null_msg->type->id && null_msg->chunkno > 0 &&
-                    ((size_t)H5O_SIZEOF_MSGHDR_OH(oh) + null_msg->raw_size)
-                         == (oh->chunk[null_msg->chunkno].size - H5O_SIZEOF_CHKHDR_OH(oh))) {
-                H5O_mesg_t *curr_msg;           /* Pointer to current message to operate on */
-                unsigned null_msg_no;           /* Message # for null message */
-                unsigned deleted_chunkno;       /* Chunk # to delete */
+            if (H5O_NULL_ID == null_msg->type->id && null_msg->chunkno > 0 &&
+                ((size_t)H5O_SIZEOF_MSGHDR_OH(oh) + null_msg->raw_size) ==
+                    (oh->chunk[null_msg->chunkno].size - H5O_SIZEOF_CHKHDR_OH(oh))) {
+                H5O_mesg_t *curr_msg;        /* Pointer to current message to operate on */
+                unsigned    null_msg_no;     /* Message # for null message */
+                unsigned    deleted_chunkno; /* Chunk # to delete */
 
                 /* Locate continuation message that points to chunk */
-                for(v = 0, cont_msg = &oh->mesg[0]; v < oh->nmesgs; v++, cont_msg++) {
-                    if(H5O_CONT_ID == cont_msg->type->id) {
+                for (v = 0, cont_msg = &oh->mesg[0]; v < oh->nmesgs; v++, cont_msg++) {
+                    if (H5O_CONT_ID == cont_msg->type->id) {
                         /* Decode current continuation message if necessary */
                         H5O_LOAD_NATIVE(f, dxpl_id, 0, oh, cont_msg, FAIL)
 
                         /* Check if the chunkno needs to be set */
                         /* (should only occur when the continuation message is first decoded) */
-                        if(0 == ((H5O_cont_t *)(cont_msg->native))->chunkno) {
-                            unsigned w;         /* Local index variable */
+                        if (0 == ((H5O_cont_t *)(cont_msg->native))->chunkno) {
+                            unsigned w; /* Local index variable */
 
                             /* Find chunk that this continuation message points to */
-                            for(w = 0; w < oh->nchunks; w++)
-                                if(oh->chunk[w].addr == ((H5O_cont_t *)(cont_msg->native))->addr) {
+                            for (w = 0; w < oh->nchunks; w++)
+                                if (oh->chunk[w].addr == ((H5O_cont_t *)(cont_msg->native))->addr) {
                                     ((H5O_cont_t *)(cont_msg->native))->chunkno = w;
                                     break;
                                 } /* end if */
@@ -1924,21 +1954,21 @@ H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                         } /* end if */
 
                         /* Check for correct chunk to delete */
-                        if(oh->chunk[null_msg->chunkno].addr == ((H5O_cont_t *)(cont_msg->native))->addr)
+                        if (oh->chunk[null_msg->chunkno].addr == ((H5O_cont_t *)(cont_msg->native))->addr)
                             break;
                     } /* end if */
-                } /* end for */
+                }     /* end for */
                 /* Must be a continuation message that points to chunk containing null message */
                 HDassert(v < oh->nmesgs);
                 HDassert(cont_msg);
                 HDassert(((H5O_cont_t *)(cont_msg->native))->chunkno == null_msg->chunkno);
 
                 /* Initialize information about null message */
-                null_msg_no = u;
+                null_msg_no     = u;
                 deleted_chunkno = null_msg->chunkno;
 
                 /* Convert continuation message into a null message */
-                if(H5O_release_mesg(f, dxpl_id, oh, cont_msg, TRUE) < 0)
+                if (H5O_release_mesg(f, dxpl_id, oh, cont_msg, TRUE) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to convert into null message")
 
                 /*
@@ -1946,27 +1976,31 @@ H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                  */
 
                 /* Free memory for chunk image */
-                oh->chunk[null_msg->chunkno].image = H5FL_BLK_FREE(chunk_image, oh->chunk[null_msg->chunkno].image);
+                oh->chunk[null_msg->chunkno].image =
+                    H5FL_BLK_FREE(chunk_image, oh->chunk[null_msg->chunkno].image);
 
                 /* Remove chunk from list of chunks */
-                if(null_msg->chunkno < (oh->nchunks - 1)) {
-                    HDmemmove(&oh->chunk[null_msg->chunkno], &oh->chunk[null_msg->chunkno + 1], ((oh->nchunks - 1) - null_msg->chunkno) * sizeof(H5O_chunk_t));
+                if (null_msg->chunkno < (oh->nchunks - 1)) {
+                    HDmemmove(&oh->chunk[null_msg->chunkno], &oh->chunk[null_msg->chunkno + 1],
+                              ((oh->nchunks - 1) - null_msg->chunkno) * sizeof(H5O_chunk_t));
 
                     /* Adjust chunk number for any chunk proxies that are in the cache */
-                    for(u = null_msg->chunkno; u < (oh->nchunks - 1); u++) {
-                        unsigned chk_proxy_status = 0;  /* Metadata cache status of chunk proxy for chunk */
+                    for (u = null_msg->chunkno; u < (oh->nchunks - 1); u++) {
+                        unsigned chk_proxy_status = 0; /* Metadata cache status of chunk proxy for chunk */
 
                         /* Check the chunk proxy's status in the metadata cache */
-                        if(H5AC_get_entry_status(f, oh->chunk[u].addr, &chk_proxy_status) < 0)
-                            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to check metadata cache status for chunk proxy")
+                        if (H5AC_get_entry_status(f, oh->chunk[u].addr, &chk_proxy_status) < 0)
+                            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL,
+                                        "unable to check metadata cache status for chunk proxy")
 
                         /* If the entry is in the cache, update its chunk index */
-                        if(chk_proxy_status & H5AC_ES__IN_CACHE) {
-                            if(H5O_chunk_update_idx(f, dxpl_id, oh, u) < 0)
-                                HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "unable to update index for chunk proxy")
+                        if (chk_proxy_status & H5AC_ES__IN_CACHE) {
+                            if (H5O_chunk_update_idx(f, dxpl_id, oh, u) < 0)
+                                HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL,
+                                            "unable to update index for chunk proxy")
                         } /* end if */
-                    } /* end for */
-                } /* end if */
+                    }     /* end for */
+                }         /* end if */
 
                 /* Decrement # of chunks */
                 /* (Don't bother reducing size of chunk array for now -QAK) */
@@ -1980,35 +2014,36 @@ H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                 H5O_msg_free_mesg(null_msg);
 
                 /* Remove null message from list of messages */
-                if(null_msg_no < (oh->nmesgs - 1))
-                    HDmemmove(&oh->mesg[null_msg_no], &oh->mesg[null_msg_no + 1], ((oh->nmesgs - 1) - null_msg_no) * sizeof(H5O_mesg_t));
+                if (null_msg_no < (oh->nmesgs - 1))
+                    HDmemmove(&oh->mesg[null_msg_no], &oh->mesg[null_msg_no + 1],
+                              ((oh->nmesgs - 1) - null_msg_no) * sizeof(H5O_mesg_t));
 
                 /* Decrement # of messages */
                 /* (Don't bother reducing size of message array for now -QAK) */
                 oh->nmesgs--;
 
                 /* Adjust chunk # for messages in chunks after deleted chunk */
-                for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+                for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
                     /* Sanity check - there should be no messages in deleted chunk */
                     HDassert(curr_msg->chunkno != deleted_chunkno);
 
                     /* Adjust chunk index for messages in later chunks */
-                    if(curr_msg->chunkno > deleted_chunkno)
+                    if (curr_msg->chunkno > deleted_chunkno)
                         curr_msg->chunkno--;
 
                     /* Check for continuation message */
-                    if(H5O_CONT_ID == curr_msg->type->id) {
+                    if (H5O_CONT_ID == curr_msg->type->id) {
                         /* Decode current continuation message if necessary */
                         H5O_LOAD_NATIVE(f, dxpl_id, 0, oh, curr_msg, FAIL)
 
                         /* Check if the chunkno needs to be set */
                         /* (should only occur when the continuation message is first decoded) */
-                        if(0 == ((H5O_cont_t *)(curr_msg->native))->chunkno) {
-                            unsigned w;         /* Local index variable */
+                        if (0 == ((H5O_cont_t *)(curr_msg->native))->chunkno) {
+                            unsigned w; /* Local index variable */
 
                             /* Find chunk that this continuation message points to */
-                            for(w = 0; w < oh->nchunks; w++)
-                                if(oh->chunk[w].addr == ((H5O_cont_t *)(curr_msg->native))->addr) {
+                            for (w = 0; w < oh->nchunks; w++)
+                                if (oh->chunk[w].addr == ((H5O_cont_t *)(curr_msg->native))->addr) {
                                     ((H5O_cont_t *)(curr_msg->native))->chunkno = w;
                                     break;
                                 } /* end if */
@@ -2016,22 +2051,22 @@ H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                         } /* end if */
                         else {
                             /* Check for pointer to chunk after deleted chunk */
-                            if(((H5O_cont_t *)(curr_msg->native))->chunkno > deleted_chunkno)
+                            if (((H5O_cont_t *)(curr_msg->native))->chunkno > deleted_chunkno)
                                 ((H5O_cont_t *)(curr_msg->native))->chunkno--;
                         } /* end else */
-                    } /* end if */
-                } /* end for */
+                    }     /* end if */
+                }         /* end for */
 
                 /* Found chunk to delete */
                 deleted_chunk = TRUE;
                 break;
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /* If we deleted any chunks, remember that */
-        if(deleted_chunk)
+        if (deleted_chunk)
             did_deleting = TRUE;
-    } while(deleted_chunk);
+    } while (deleted_chunk);
 
     /* Set return value */
     ret_value = (htri_t)did_deleting;
@@ -2040,7 +2075,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_remove_empty_chunks() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_condense_header
@@ -2063,9 +2097,9 @@ done:
 herr_t
 H5O_condense_header(H5F_t *f, H5O_t *oh, hid_t dxpl_id)
 {
-    hbool_t rescan_header;              /* Whether to rescan header */
-    htri_t result;                      /* Result from packing/merging/etc */
-    herr_t ret_value = SUCCEED; 	/* return value */
+    hbool_t rescan_header;       /* Whether to rescan header */
+    htri_t  result;              /* Result from packing/merging/etc */
+    herr_t  ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2079,34 +2113,33 @@ H5O_condense_header(H5F_t *f, H5O_t *oh, hid_t dxpl_id)
 
         /* Scan for messages that can be moved earlier in chunks */
         result = H5O_move_msgs_forward(f, dxpl_id, oh);
-        if(result < 0)
+        if (result < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPACK, FAIL, "can't move header messages forward")
-        if(result > 0)
+        if (result > 0)
             rescan_header = TRUE;
 
         /* Scan for adjacent null messages & merge them */
         result = H5O_merge_null(f, dxpl_id, oh);
-        if(result < 0)
+        if (result < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPACK, FAIL, "can't pack null header messages")
-        if(result > 0)
+        if (result > 0)
             rescan_header = TRUE;
 
         /* Scan for empty chunks to remove */
         result = H5O_remove_empty_chunks(f, dxpl_id, oh);
-        if(result < 0)
+        if (result < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPACK, FAIL, "can't remove empty chunk")
-        if(result > 0)
+        if (result > 0)
             rescan_header = TRUE;
-    } while(rescan_header);
+    } while (rescan_header);
 #ifdef H5O_DEBUG
-H5O_assert(oh);
+    H5O_assert(oh);
 #endif /* H5O_DEBUG */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_condense_header() */
 
-
 /*-------------------------------------------------------------------------
  *
  * Function:    H5O_alloc_shrink_chunk
@@ -2124,21 +2157,21 @@ done:
 static herr_t
 H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno)
 {
-    H5O_chunk_t *chunk = &oh->chunk[chunkno];   /* Chunk to shrink */
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Metadata cache proxy for chunk to shrink */
-    H5O_mesg_t  *curr_msg;                      /* Current message to examine */
-    uint8_t     *old_image = chunk->image;      /* Old address of chunk's image in memory */
-    size_t      old_size = chunk->size;         /* Old size of chunk */
-    size_t      new_size = chunk->size - chunk->gap; /* Size of shrunk chunk */
-    size_t      total_msg_size;                 /* Size of the messages in this chunk */
-    size_t      min_chunk_size = H5O_ALIGN_OH(oh, H5O_MIN_SIZE); /* Minimum chunk size */
-    size_t      sizeof_chksum = H5O_SIZEOF_CHKSUM_OH(oh); /* Size of chunk checksum */
-    size_t      sizeof_msghdr = H5O_SIZEOF_MSGHDR_OH(oh); /* Size of message header */
-    uint8_t     new_size_flags = 0;             /* New chunk #0 size flags */
-    hbool_t     adjust_size_flags = FALSE;      /* Whether to adjust the chunk #0 size flags */
-    size_t      less_prfx_size = 0;             /* Bytes removed from object header prefix */
-    size_t      u;                              /* Index */
-    herr_t      ret_value = SUCCEED;            /* Return value */
+    H5O_chunk_t *      chunk     = &oh->chunk[chunkno];      /* Chunk to shrink */
+    H5O_chunk_proxy_t *chk_proxy = NULL;                     /* Metadata cache proxy for chunk to shrink */
+    H5O_mesg_t *       curr_msg;                             /* Current message to examine */
+    uint8_t *          old_image = chunk->image;             /* Old address of chunk's image in memory */
+    size_t             old_size  = chunk->size;              /* Old size of chunk */
+    size_t             new_size  = chunk->size - chunk->gap; /* Size of shrunk chunk */
+    size_t             total_msg_size;                       /* Size of the messages in this chunk */
+    size_t             min_chunk_size    = H5O_ALIGN_OH(oh, H5O_MIN_SIZE); /* Minimum chunk size */
+    size_t             sizeof_chksum     = H5O_SIZEOF_CHKSUM_OH(oh);       /* Size of chunk checksum */
+    size_t             sizeof_msghdr     = H5O_SIZEOF_MSGHDR_OH(oh);       /* Size of message header */
+    uint8_t            new_size_flags    = 0;                              /* New chunk #0 size flags */
+    hbool_t            adjust_size_flags = FALSE; /* Whether to adjust the chunk #0 size flags */
+    size_t             less_prfx_size    = 0;     /* Bytes removed from object header prefix */
+    size_t             u;                         /* Index */
+    herr_t             ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2147,33 +2180,32 @@ H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno)
     HDassert(oh);
 
     /* Protect chunk */
-    if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, chunkno)))
+    if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, chunkno)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header chunk")
 
     /* Loop backwards to increase the chance of seeing more null messages at the
      * end of the chunk.  Note that we rely on unsigned u wrapping around at the
      * end.
      */
-    for(u = oh->nmesgs - 1, curr_msg = &oh->mesg[u]; u < oh->nmesgs; u--, curr_msg--) {
-        if((H5O_NULL_ID == curr_msg->type->id) && (chunkno == curr_msg->chunkno)) {
+    for (u = oh->nmesgs - 1, curr_msg = &oh->mesg[u]; u < oh->nmesgs; u--, curr_msg--) {
+        if ((H5O_NULL_ID == curr_msg->type->id) && (chunkno == curr_msg->chunkno)) {
             size_t shrink_size = curr_msg->raw_size + sizeof_msghdr; /* Amount to shrink the chunk by */
 
             /* If the current message is not at the end of the chunk, copy the
-                * data after it (except the checksum).
-                */
-            if(curr_msg->raw + curr_msg->raw_size
-                < old_image + new_size - sizeof_chksum) {
-                unsigned    v;              /* Index */
-                H5O_mesg_t  *curr_msg2;
-                uint8_t     *src = curr_msg->raw + curr_msg->raw_size; /* Source location */
+             * data after it (except the checksum).
+             */
+            if (curr_msg->raw + curr_msg->raw_size < old_image + new_size - sizeof_chksum) {
+                unsigned    v; /* Index */
+                H5O_mesg_t *curr_msg2;
+                uint8_t *   src = curr_msg->raw + curr_msg->raw_size; /* Source location */
 
                 /* Slide down the raw data */
                 HDmemmove(curr_msg->raw - sizeof_msghdr, src,
-                    (size_t)(old_image + new_size - sizeof_chksum - src));
+                          (size_t)(old_image + new_size - sizeof_chksum - src));
 
                 /* Update the raw data pointers for messages after this one */
-                for(v = 0, curr_msg2 = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg2++)
-                    if((chunkno == curr_msg2->chunkno) && (curr_msg2->raw > curr_msg->raw))
+                for (v = 0, curr_msg2 = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg2++)
+                    if ((chunkno == curr_msg2->chunkno) && (curr_msg2->raw > curr_msg->raw))
                         curr_msg2->raw -= shrink_size;
             } /* end if */
 
@@ -2184,29 +2216,29 @@ H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno)
             H5O_msg_free_mesg(curr_msg);
 
             /* Remove the deleted null message from list of messages */
-            if(u < (oh->nmesgs - 1))
-                HDmemmove(&oh->mesg[u], &oh->mesg[u+1], ((oh->nmesgs - 1) - u) * sizeof(H5O_mesg_t));
+            if (u < (oh->nmesgs - 1))
+                HDmemmove(&oh->mesg[u], &oh->mesg[u + 1], ((oh->nmesgs - 1) - u) * sizeof(H5O_mesg_t));
 
             /* Decrement # of messages */
             /* (Don't bother reducing size of message array for now) */
             oh->nmesgs--;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Check if the chunk is too small, extend if necessary */
     total_msg_size = new_size - (size_t)(chunkno == 0 ? H5O_SIZEOF_HDR(oh) : H5O_SIZEOF_CHKHDR_OH(oh));
-    if(total_msg_size < min_chunk_size) {
+    if (total_msg_size < min_chunk_size) {
         HDassert(oh->alloc_nmesgs > oh->nmesgs);
         oh->nmesgs++;
 
         /* Initialize new null message to make the chunk large enough */
-        curr_msg = &oh->mesg[oh->nmesgs - 1];
-        curr_msg->type = H5O_MSG_NULL;
-        curr_msg->dirty = TRUE;
+        curr_msg         = &oh->mesg[oh->nmesgs - 1];
+        curr_msg->type   = H5O_MSG_NULL;
+        curr_msg->dirty  = TRUE;
         curr_msg->native = NULL;
-        curr_msg->raw = old_image + new_size + sizeof_msghdr - sizeof_chksum;
-        curr_msg->raw_size = MAX(H5O_ALIGN_OH(oh, min_chunk_size - total_msg_size),
-            sizeof_msghdr) - sizeof_msghdr;
+        curr_msg->raw    = old_image + new_size + sizeof_msghdr - sizeof_chksum;
+        curr_msg->raw_size =
+            MAX(H5O_ALIGN_OH(oh, min_chunk_size - total_msg_size), sizeof_msghdr) - sizeof_msghdr;
         curr_msg->chunkno = chunkno;
 
         /* update the new chunk size */
@@ -2214,67 +2246,67 @@ H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno)
     } /* end if */
 
     /* Check for changing the chunk #0 data size enough to need adjusting the flags */
-    if(oh->version > H5O_VERSION_1 && chunkno == 0) {
-        uint64_t chunk0_newsize = new_size - (size_t)H5O_SIZEOF_HDR(oh);  /* New size of chunk 0's data */
+    if (oh->version > H5O_VERSION_1 && chunkno == 0) {
+        uint64_t chunk0_newsize = new_size - (size_t)H5O_SIZEOF_HDR(oh); /* New size of chunk 0's data */
         size_t   orig_prfx_size = (size_t)1 << (oh->flags & H5O_HDR_CHUNK0_SIZE); /* Original prefix size */
 
         /* Check for moving to a 1-byte size encoding */
-        if(orig_prfx_size > 1 && chunk0_newsize <= 255) {
-            less_prfx_size = orig_prfx_size - 1;
-            new_size_flags = H5O_HDR_CHUNK0_1;
+        if (orig_prfx_size > 1 && chunk0_newsize <= 255) {
+            less_prfx_size    = orig_prfx_size - 1;
+            new_size_flags    = H5O_HDR_CHUNK0_1;
             adjust_size_flags = TRUE;
         } /* end if */
         /* Check for moving to a 2-byte size encoding */
-        else if(orig_prfx_size > 2 && chunk0_newsize <= 65535) {
-            less_prfx_size = orig_prfx_size - 2;
-            new_size_flags = H5O_HDR_CHUNK0_2;
+        else if (orig_prfx_size > 2 && chunk0_newsize <= 65535) {
+            less_prfx_size    = orig_prfx_size - 2;
+            new_size_flags    = H5O_HDR_CHUNK0_2;
             adjust_size_flags = TRUE;
         } /* end if */
         /* Check for moving to a 4-byte size encoding */
-        else if(orig_prfx_size > 4 && chunk0_newsize <= 4294967295) {
-            less_prfx_size = orig_prfx_size - 4;
-            new_size_flags = H5O_HDR_CHUNK0_4;
+        else if (orig_prfx_size > 4 && chunk0_newsize <= 4294967295) {
+            less_prfx_size    = orig_prfx_size - 4;
+            new_size_flags    = H5O_HDR_CHUNK0_4;
             adjust_size_flags = TRUE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
-    if(adjust_size_flags) {
+    if (adjust_size_flags) {
         /* Adjust object header prefix flags */
         oh->flags = (uint8_t)(oh->flags & ~H5O_HDR_CHUNK0_SIZE);
         oh->flags |= new_size_flags;
 
         /* Slide chunk 0 data down */
         HDmemmove(chunk->image + H5O_SIZEOF_HDR(oh) - sizeof_chksum,
-            chunk->image + H5O_SIZEOF_HDR(oh) - sizeof_chksum + less_prfx_size,
-            new_size - (size_t)H5O_SIZEOF_HDR(oh));
+                  chunk->image + H5O_SIZEOF_HDR(oh) - sizeof_chksum + less_prfx_size,
+                  new_size - (size_t)H5O_SIZEOF_HDR(oh));
 
         /* Adjust chunk size */
         new_size -= less_prfx_size;
     } /* end if */
 
     /* Allocate less memory space for chunk's image */
-    chunk->size = new_size;
+    chunk->size  = new_size;
     chunk->image = H5FL_BLK_REALLOC(chunk_image, old_image, chunk->size);
-    chunk->gap = 0;
-    if(NULL == oh->chunk[chunkno].image)
+    chunk->gap   = 0;
+    if (NULL == oh->chunk[chunkno].image)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Spin through existing messages, adjusting them */
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
-        if(adjust_size_flags || (chunk->image != old_image))
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+        if (adjust_size_flags || (chunk->image != old_image))
             /* Adjust raw addresses for messages in this chunk to reflect new 'image' address */
-            if(curr_msg->chunkno == chunkno)
+            if (curr_msg->chunkno == chunkno)
                 curr_msg->raw = chunk->image - less_prfx_size + (curr_msg->raw - old_image);
 
         /* Find continuation message which points to this chunk and adjust chunk's size */
         /* (Chunk 0 doesn't have a continuation message that points to it and
          * its size is directly encoded in the object header) */
-        if(chunkno > 0 && (H5O_CONT_ID == curr_msg->type->id) &&
-                (((H5O_cont_t *)(curr_msg->native))->chunkno == chunkno)) {
-            H5O_chunk_proxy_t *cont_chk_proxy;        /* Chunk that message is in */
+        if (chunkno > 0 && (H5O_CONT_ID == curr_msg->type->id) &&
+            (((H5O_cont_t *)(curr_msg->native))->chunkno == chunkno)) {
+            H5O_chunk_proxy_t *cont_chk_proxy; /* Chunk that message is in */
 
             /* Protect chunk */
-            if(NULL == (cont_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, curr_msg->chunkno)))
+            if (NULL == (cont_chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, curr_msg->chunkno)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header chunk")
 
             /* Adjust size of continuation message */
@@ -2285,26 +2317,25 @@ H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno)
             curr_msg->dirty = TRUE;
 
             /* Release chunk, marking it dirty */
-            if(H5O_chunk_unprotect(f, dxpl_id, cont_chk_proxy, TRUE) < 0)
+            if (H5O_chunk_unprotect(f, dxpl_id, cont_chk_proxy, TRUE) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     HDassert(new_size <= old_size);
 
     /* Resize the chunk in the cache */
-    if(H5O_chunk_resize(oh, chk_proxy) < 0)
+    if (H5O_chunk_resize(oh, chk_proxy) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTRESIZE, FAIL, "unable to resize object header chunk")
 
     /* Free the unused space in the file */
-    if(H5MF_xfree(f, H5FD_MEM_OHDR, dxpl_id, chunk->addr + new_size, (hsize_t)(old_size - new_size)) < 0)
+    if (H5MF_xfree(f, H5FD_MEM_OHDR, dxpl_id, chunk->addr + new_size, (hsize_t)(old_size - new_size)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to shrink object header chunk")
 
 done:
     /* Release chunk, marking it dirty */
-    if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, TRUE) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, TRUE) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_alloc_shrink_chunk() */
-
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index 195b508..1a0d632 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -11,87 +11,85 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5A_PACKAGE             /*prevent warning from including H5Apkg   */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-#define H5S_PACKAGE	        /*suppress error about including H5Spkg	  */
+#define H5A_PACKAGE /*prevent warning from including H5Apkg   */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Spkg.h"		/* Dataspaces				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Spkg.h"      /* Dataspaces				*/
 
 /* PRIVATE PROTOTYPES */
 static herr_t H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg);
-static void *H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
-static void *H5O_attr_copy(const void *_mesg, void *_dest);
+static void * H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
+static void * H5O_attr_copy(const void *_mesg, void *_dest);
 static size_t H5O_attr_size(const H5F_t *f, const void *_mesg);
 static herr_t H5O_attr_free(void *mesg);
-static herr_t H5O_attr_pre_copy_file(H5F_t *file_src, const void *mesg_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata);
-static void *H5O_attr_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type,
-    void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
-    H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
-static herr_t H5O_attr_post_copy_file(const H5O_loc_t *src_oloc,
-    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, hid_t dxpl_id,
-    H5O_copy_t *cpy_info);
+static herr_t H5O_attr_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
+                                     const H5O_copy_t *cpy_info, void *udata);
+static void * H5O_attr_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type, void *native_src,
+                                 H5F_t *file_dst, hbool_t *recompute_size, H5O_copy_t *cpy_info, void *udata,
+                                 hid_t dxpl_id);
+static herr_t H5O_attr_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc,
+                                      void *mesg_dst, hid_t dxpl_id, H5O_copy_t *cpy_info);
 static herr_t H5O_attr_get_crt_index(const void *_mesg, H5O_msg_crt_idx_t *crt_idx);
 static herr_t H5O_attr_set_crt_index(void *_mesg, H5O_msg_crt_idx_t crt_idx);
-static herr_t H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-			      FILE * stream, int indent, int fwidth);
+static herr_t H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                             int fwidth);
 
 /* Set up & include shared message "interface" info */
-#define H5O_SHARED_TYPE			H5O_MSG_ATTR
-#define H5O_SHARED_DECODE		H5O_attr_shared_decode
-#define H5O_SHARED_DECODE_REAL		H5O_attr_decode
-#define H5O_SHARED_ENCODE		H5O_attr_shared_encode
-#define H5O_SHARED_ENCODE_REAL		H5O_attr_encode
-#define H5O_SHARED_SIZE			H5O_attr_shared_size
-#define H5O_SHARED_SIZE_REAL		H5O_attr_size
-#define H5O_SHARED_DELETE		H5O_attr_shared_delete
-#define H5O_SHARED_DELETE_REAL		H5O_attr_delete
-#define H5O_SHARED_LINK			H5O_attr_shared_link
-#define H5O_SHARED_LINK_REAL		H5O_attr_link
-#define H5O_SHARED_COPY_FILE		H5O_attr_shared_copy_file
-#define H5O_SHARED_COPY_FILE_REAL	H5O_attr_copy_file
-#define H5O_SHARED_POST_COPY_FILE	H5O_attr_shared_post_copy_file
-#define H5O_SHARED_POST_COPY_FILE_REAL	H5O_attr_post_copy_file
-#undef  H5O_SHARED_POST_COPY_FILE_UPD
-#define H5O_SHARED_DEBUG		H5O_attr_shared_debug
-#define H5O_SHARED_DEBUG_REAL		H5O_attr_debug
-#include "H5Oshared.h"			/* Shared Object Header Message Callbacks */
+#define H5O_SHARED_TYPE                H5O_MSG_ATTR
+#define H5O_SHARED_DECODE              H5O_attr_shared_decode
+#define H5O_SHARED_DECODE_REAL         H5O_attr_decode
+#define H5O_SHARED_ENCODE              H5O_attr_shared_encode
+#define H5O_SHARED_ENCODE_REAL         H5O_attr_encode
+#define H5O_SHARED_SIZE                H5O_attr_shared_size
+#define H5O_SHARED_SIZE_REAL           H5O_attr_size
+#define H5O_SHARED_DELETE              H5O_attr_shared_delete
+#define H5O_SHARED_DELETE_REAL         H5O_attr_delete
+#define H5O_SHARED_LINK                H5O_attr_shared_link
+#define H5O_SHARED_LINK_REAL           H5O_attr_link
+#define H5O_SHARED_COPY_FILE           H5O_attr_shared_copy_file
+#define H5O_SHARED_COPY_FILE_REAL      H5O_attr_copy_file
+#define H5O_SHARED_POST_COPY_FILE      H5O_attr_shared_post_copy_file
+#define H5O_SHARED_POST_COPY_FILE_REAL H5O_attr_post_copy_file
+#undef H5O_SHARED_POST_COPY_FILE_UPD
+#define H5O_SHARED_DEBUG      H5O_attr_shared_debug
+#define H5O_SHARED_DEBUG_REAL H5O_attr_debug
+#include "H5Oshared.h" /* Shared Object Header Message Callbacks */
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_ATTR[1] = {{
-    H5O_ATTR_ID,		/* message id number            */
-    "attribute",		/* message name for debugging   */
-    sizeof(H5A_t),		/* native message size          */
-    H5O_SHARE_IS_SHARABLE,	/* messages are sharable?       */
-    H5O_attr_shared_decode,	/* decode message               */
-    H5O_attr_shared_encode,	/* encode message               */
-    H5O_attr_copy,		/* copy the native value        */
-    H5O_attr_shared_size,	/* size of raw message          */
-    H5O_attr_reset,	        /* reset method                 */
-    H5O_attr_free,	        /* free method			*/
-    H5O_attr_shared_delete,	/* file delete method		*/
-    H5O_attr_shared_link,	/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    H5O_attr_pre_copy_file,	/* pre copy native value to file */
-    H5O_attr_shared_copy_file,	/* copy native value to file    */
-    H5O_attr_shared_post_copy_file,	/* post copy native value to file    */
-    H5O_attr_get_crt_index,	/* get creation index		*/
-    H5O_attr_set_crt_index,	/* set creation index		*/
-    H5O_attr_shared_debug	/* debug the message            */
+    H5O_ATTR_ID,                    /* message id number            */
+    "attribute",                    /* message name for debugging   */
+    sizeof(H5A_t),                  /* native message size          */
+    H5O_SHARE_IS_SHARABLE,          /* messages are sharable?       */
+    H5O_attr_shared_decode,         /* decode message               */
+    H5O_attr_shared_encode,         /* encode message               */
+    H5O_attr_copy,                  /* copy the native value        */
+    H5O_attr_shared_size,           /* size of raw message          */
+    H5O_attr_reset,                 /* reset method                 */
+    H5O_attr_free,                  /* free method			*/
+    H5O_attr_shared_delete,         /* file delete method		*/
+    H5O_attr_shared_link,           /* link method			*/
+    NULL,                           /*set share method		*/
+    NULL,                           /*can share method		*/
+    H5O_attr_pre_copy_file,         /* pre copy native value to file */
+    H5O_attr_shared_copy_file,      /* copy native value to file    */
+    H5O_attr_shared_post_copy_file, /* post copy native value to file    */
+    H5O_attr_get_crt_index,         /* get creation index		*/
+    H5O_attr_set_crt_index,         /* set creation index		*/
+    H5O_attr_shared_debug           /* debug the message            */
 }};
 
 /* Flags for attribute flag encoding */
-#define H5O_ATTR_FLAG_TYPE_SHARED       0x01
-#define H5O_ATTR_FLAG_SPACE_SHARED      0x02
-#define H5O_ATTR_FLAG_ALL               0x03
+#define H5O_ATTR_FLAG_TYPE_SHARED  0x01
+#define H5O_ATTR_FLAG_SPACE_SHARED 0x02
+#define H5O_ATTR_FLAG_ALL          0x03
 
 /* Declare external the free list for H5S_t's */
 H5FL_EXTERN(H5S_t);
@@ -99,7 +97,6 @@ H5FL_EXTERN(H5S_t);
 /* Declare external the free list for H5S_extent_t's */
 H5FL_EXTERN(H5S_extent_t);
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_attr_decode
@@ -124,13 +121,13 @@ H5FL_EXTERN(H5S_extent_t);
 --------------------------------------------------------------------------*/
 static void *
 H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags,
-    unsigned *ioflags, size_t p_size, const uint8_t *p)
+                unsigned *ioflags, size_t p_size, const uint8_t *p)
 {
-    H5A_t        *attr = NULL;
-    H5S_extent_t *extent;       /*extent dimensionality information  */
-    size_t       name_len;      /*attribute name length */
-    unsigned     flags = 0;     /* Attribute flags */
-    H5A_t        *ret_value = NULL;     /* Return value */
+    H5A_t *       attr = NULL;
+    H5S_extent_t *extent;           /*extent dimensionality information  */
+    size_t        name_len;         /*attribute name length */
+    unsigned      flags     = 0;    /* Attribute flags */
+    H5A_t *       ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -138,27 +135,27 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned H5_ATTR_UNUSED
     HDassert(f);
     HDassert(p);
 
-    if(NULL == (attr = H5FL_CALLOC(H5A_t)))
+    if (NULL == (attr = H5FL_CALLOC(H5A_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
-    if(NULL == (attr->shared = H5FL_CALLOC(H5A_shared_t)))
+    if (NULL == (attr->shared = H5FL_CALLOC(H5A_shared_t)))
         HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate shared attr structure")
 
     /* Version number */
     attr->shared->version = *p++;
-    if(attr->shared->version < H5O_ATTR_VERSION_1 || attr->shared->version > H5O_ATTR_VERSION_LATEST)
+    if (attr->shared->version < H5O_ATTR_VERSION_1 || attr->shared->version > H5O_ATTR_VERSION_LATEST)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTLOAD, NULL, "bad version number for attribute message")
 
     /* Get the flags byte if we have a later version of the attribute */
-    if(attr->shared->version >= H5O_ATTR_VERSION_2) {
+    if (attr->shared->version >= H5O_ATTR_VERSION_2) {
         flags = *p++;
 
         /* Check for unknown flag */
-        if(flags & (unsigned)~H5O_ATTR_FLAG_ALL)
+        if (flags & (unsigned)~H5O_ATTR_FLAG_ALL)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTLOAD, NULL, "unknown flag for attribute message")
     } /* end if */
     else
-        p++;    /* Byte is unused when version<2 */
+        p++; /* Byte is unused when version<2 */
 
     /*
      * Decode the sizes of the parts of the attribute.  The sizes stored in
@@ -172,22 +169,23 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned H5_ATTR_UNUSED
      * Decode the character encoding for the name for versions 3 or later,
      * as well as some reserved bytes.
      */
-    if(attr->shared->version >= H5O_ATTR_VERSION_3)
+    if (attr->shared->version >= H5O_ATTR_VERSION_3)
         attr->shared->encoding = (H5T_cset_t)*p++;
 
     /* Decode and store the name */
-    if(NULL == (attr->shared->name = H5MM_strdup((const char *)p)))
+    if (NULL == (attr->shared->name = H5MM_strdup((const char *)p)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    if(attr->shared->version < H5O_ATTR_VERSION_2)
-        p += H5O_ALIGN_OLD(name_len);    /* advance the memory pointer */
+    if (attr->shared->version < H5O_ATTR_VERSION_2)
+        p += H5O_ALIGN_OLD(name_len); /* advance the memory pointer */
     else
-        p += name_len;    /* advance the memory pointer */
+        p += name_len; /* advance the memory pointer */
 
     /* Decode the attribute's datatype */
-    if(NULL == (attr->shared->dt = (H5T_t *)(H5O_MSG_DTYPE->decode)(f, dxpl_id, open_oh,
-        ((flags & H5O_ATTR_FLAG_TYPE_SHARED) ? H5O_MSG_FLAG_SHARED : 0), ioflags, attr->shared->dt_size, p)))
+    if (NULL == (attr->shared->dt = (H5T_t *)(H5O_MSG_DTYPE->decode)(
+                     f, dxpl_id, open_oh, ((flags & H5O_ATTR_FLAG_TYPE_SHARED) ? H5O_MSG_FLAG_SHARED : 0),
+                     ioflags, attr->shared->dt_size, p)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDECODE, NULL, "can't decode attribute datatype")
-    if(attr->shared->version < H5O_ATTR_VERSION_2)
+    if (attr->shared->version < H5O_ATTR_VERSION_2)
         p += H5O_ALIGN_OLD(attr->shared->dt_size);
     else
         p += attr->shared->dt_size;
@@ -195,12 +193,13 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned H5_ATTR_UNUSED
     /* decode the attribute dataspace.  It can be shared in versions >= 3
      * What's actually shared, though, is only the extent.
      */
-    if(NULL == (attr->shared->ds = H5FL_CALLOC(H5S_t)))
+    if (NULL == (attr->shared->ds = H5FL_CALLOC(H5S_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Decode attribute's dataspace extent */
-    if((extent = (H5S_extent_t *)(H5O_MSG_SDSPACE->decode)(f, dxpl_id, open_oh,
-            ((flags & H5O_ATTR_FLAG_SPACE_SHARED) ? H5O_MSG_FLAG_SHARED : 0), ioflags, attr->shared->ds_size, p)) == NULL)
+    if ((extent = (H5S_extent_t *)(H5O_MSG_SDSPACE->decode)(
+             f, dxpl_id, open_oh, ((flags & H5O_ATTR_FLAG_SPACE_SHARED) ? H5O_MSG_FLAG_SHARED : 0), ioflags,
+             attr->shared->ds_size, p)) == NULL)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDECODE, NULL, "can't decode attribute dataspace")
 
     /* Copy the extent information to the dataspace */
@@ -210,25 +209,26 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned H5_ATTR_UNUSED
     extent = H5FL_FREE(H5S_extent_t, extent);
 
     /* Default to entire dataspace being selected */
-    if(H5S_select_all(attr->shared->ds, FALSE) < 0)
+    if (H5S_select_all(attr->shared->ds, FALSE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, NULL, "unable to set all selection")
 
-    if(attr->shared->version < H5O_ATTR_VERSION_2)
+    if (attr->shared->version < H5O_ATTR_VERSION_2)
         p += H5O_ALIGN_OLD(attr->shared->ds_size);
     else
         p += attr->shared->ds_size;
 
     /* Compute the size of the data */
-    H5_CHECKED_ASSIGN(attr->shared->data_size, size_t, H5S_GET_EXTENT_NPOINTS(attr->shared->ds) * H5T_get_size(attr->shared->dt), hsize_t);
+    H5_CHECKED_ASSIGN(attr->shared->data_size, size_t,
+                      H5S_GET_EXTENT_NPOINTS(attr->shared->ds) * H5T_get_size(attr->shared->dt), hsize_t);
 
     /* Go get the data */
-    if(attr->shared->data_size) {
+    if (attr->shared->data_size) {
         /* Ensure that data size doesn't exceed buffer size, in case of
            it's being corrupted in the file */
-        if(attr->shared->data_size > p_size)
+        if (attr->shared->data_size > p_size)
             HGOTO_ERROR(H5E_RESOURCE, H5E_OVERFLOW, NULL, "data size exceeds buffer size")
 
-        if(NULL == (attr->shared->data = H5FL_BLK_MALLOC(attr_buf, attr->shared->data_size)))
+        if (NULL == (attr->shared->data = H5FL_BLK_MALLOC(attr_buf, attr->shared->data_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
         HDmemcpy(attr->shared->data, p, attr->shared->data_size);
     } /* end if */
@@ -241,11 +241,11 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned H5_ATTR_UNUSED
     ret_value = attr;
 
 done:
-    if(NULL == ret_value)
-        if(attr) {
-            if(attr->shared) {
+    if (NULL == ret_value)
+        if (attr) {
+            if (attr->shared) {
                 /* Free any dynamicly allocated items */
-                if(H5A_free(attr) < 0)
+                if (H5A_free(attr) < 0)
                     HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, NULL, "can't release attribute info")
 
                 /* Destroy shared attribute struct */
@@ -258,7 +258,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_decode() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_attr_encode
@@ -278,12 +277,12 @@ done:
 static herr_t
 H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
 {
-    const H5A_t *attr = (const H5A_t *) mesg;
-    size_t      name_len;   /* Attribute name length */
-    htri_t      is_type_shared;    /* Flag to indicate that a shared datatype is used for this attribute */
-    htri_t      is_space_shared;   /* Flag to indicate that a shared dataspace is used for this attribute */
-    unsigned    flags = 0;      /* Attribute flags */
-    herr_t      ret_value = SUCCEED;      /* Return value */
+    const H5A_t *attr = (const H5A_t *)mesg;
+    size_t       name_len;        /* Attribute name length */
+    htri_t       is_type_shared;  /* Flag to indicate that a shared datatype is used for this attribute */
+    htri_t       is_space_shared; /* Flag to indicate that a shared dataspace is used for this attribute */
+    unsigned     flags     = 0;   /* Attribute flags */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -293,21 +292,21 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
     HDassert(attr);
 
     /* Check whether datatype and dataspace are shared */
-    if((is_type_shared = H5O_msg_is_shared(H5O_DTYPE_ID, attr->shared->dt)) < 0)
+    if ((is_type_shared = H5O_msg_is_shared(H5O_DTYPE_ID, attr->shared->dt)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "can't determine if datatype is shared")
 
-    if((is_space_shared = H5O_msg_is_shared(H5O_SDSPACE_ID, attr->shared->ds)) < 0)
+    if ((is_space_shared = H5O_msg_is_shared(H5O_SDSPACE_ID, attr->shared->ds)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "can't determine if dataspace is shared")
 
     /* Encode Version */
     *p++ = attr->shared->version;
 
     /* Set attribute flags if version >1 */
-    if(attr->shared->version >= H5O_ATTR_VERSION_2) {
-        flags = (is_type_shared ? H5O_ATTR_FLAG_TYPE_SHARED : 0 );
+    if (attr->shared->version >= H5O_ATTR_VERSION_2) {
+        flags = (is_type_shared ? H5O_ATTR_FLAG_TYPE_SHARED : 0);
         flags |= (is_space_shared ? H5O_ATTR_FLAG_SPACE_SHARED : 0);
-        *p++ = (uint8_t)flags;    /* Set flags for attribute */
-    } /* end if */
+        *p++ = (uint8_t)flags; /* Set flags for attribute */
+    }                          /* end if */
     else
         *p++ = 0; /* Reserved, for version <2 */
 
@@ -322,12 +321,12 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
     UINT16ENCODE(p, attr->shared->ds_size);
 
     /* The character encoding for the attribute's name, in later versions */
-    if(attr->shared->version >= H5O_ATTR_VERSION_3)
+    if (attr->shared->version >= H5O_ATTR_VERSION_3)
         *p++ = (uint8_t)attr->shared->encoding;
 
     /* Write the name including null terminator */
     HDmemcpy(p, attr->shared->name, name_len);
-    if(attr->shared->version < H5O_ATTR_VERSION_2) {
+    if (attr->shared->version < H5O_ATTR_VERSION_2) {
         /* Pad to the correct number of bytes */
         HDmemset(p + name_len, 0, H5O_ALIGN_OLD(name_len) - name_len);
         p += H5O_ALIGN_OLD(name_len);
@@ -336,10 +335,10 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
         p += name_len;
 
     /* encode the attribute datatype */
-    if((H5O_MSG_DTYPE->encode)(f, FALSE, p, attr->shared->dt) < 0)
+    if ((H5O_MSG_DTYPE->encode)(f, FALSE, p, attr->shared->dt) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "can't encode attribute datatype")
 
-    if(attr->shared->version < H5O_ATTR_VERSION_2) {
+    if (attr->shared->version < H5O_ATTR_VERSION_2) {
         HDmemset(p + attr->shared->dt_size, 0, H5O_ALIGN_OLD(attr->shared->dt_size) - attr->shared->dt_size);
         p += H5O_ALIGN_OLD(attr->shared->dt_size);
     } /* end if */
@@ -347,10 +346,10 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
         p += attr->shared->dt_size;
 
     /* encode the attribute dataspace */
-    if((H5O_MSG_SDSPACE->encode)(f, FALSE, p, &(attr->shared->ds->extent)) < 0)
+    if ((H5O_MSG_SDSPACE->encode)(f, FALSE, p, &(attr->shared->ds->extent)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "can't encode attribute dataspace")
 
-    if(attr->shared->version < H5O_ATTR_VERSION_2) {
+    if (attr->shared->version < H5O_ATTR_VERSION_2) {
         HDmemset(p + attr->shared->ds_size, 0, H5O_ALIGN_OLD(attr->shared->ds_size) - attr->shared->ds_size);
         p += H5O_ALIGN_OLD(attr->shared->ds_size);
     } /* end if */
@@ -358,7 +357,7 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
         p += attr->shared->ds_size;
 
     /* Store attribute data.  If there's no data, store 0 as fill value. */
-    if(attr->shared->data)
+    if (attr->shared->data)
         HDmemcpy(p, attr->shared->data, attr->shared->data_size);
     else
         HDmemset(p, 0, attr->shared->data_size);
@@ -367,7 +366,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5O_attr_encode() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_attr_copy
@@ -386,7 +384,7 @@ done:
 static void *
 H5O_attr_copy(const void *_src, void *_dst)
 {
-    void *ret_value;            /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -394,14 +392,13 @@ H5O_attr_copy(const void *_src, void *_dst)
     HDassert(_src);
 
     /* copy */
-    if(NULL == (ret_value = (H5A_t *)H5A_copy((H5A_t *)_dst, (const H5A_t *)_src)))
+    if (NULL == (ret_value = (H5A_t *)H5A_copy((H5A_t *)_dst, (const H5A_t *)_src)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "can't copy attribute")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_copy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_attr_size
@@ -421,48 +418,47 @@ done:
 static size_t
 H5O_attr_size(const H5F_t H5_ATTR_UNUSED *f, const void *_mesg)
 {
-    const H5A_t         *attr = (const H5A_t *)_mesg;
-    size_t		name_len;
-    size_t		ret_value = 0;
+    const H5A_t *attr = (const H5A_t *)_mesg;
+    size_t       name_len;
+    size_t       ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(attr);
 
     /* Common size information */
-    ret_value = 1 +				/*version               */
-                1 +				/*reserved/flags	*/
-                2 +				/*name size inc. null	*/
-                2 +				/*type size		*/
-                2; 				/*space size		*/
+    ret_value = 1 + /*version               */
+                1 + /*reserved/flags	*/
+                2 + /*name size inc. null	*/
+                2 + /*type size		*/
+                2;  /*space size		*/
 
     /* Length of attribute name */
     name_len = HDstrlen(attr->shared->name) + 1;
 
     /* Version-specific size information */
-    if(attr->shared->version == H5O_ATTR_VERSION_1)
-        ret_value += H5O_ALIGN_OLD(name_len) +	/*attribute name	*/
-                    H5O_ALIGN_OLD(attr->shared->dt_size) +	/*datatype		*/
-                    H5O_ALIGN_OLD(attr->shared->ds_size) +	/*dataspace		*/
-                    attr->shared->data_size;		/*the data itself	*/
-    else if(attr->shared->version == H5O_ATTR_VERSION_2)
-        ret_value += name_len	+		/*attribute name	*/
-                    attr->shared->dt_size +		/*datatype		*/
-                    attr->shared->ds_size +		/*dataspace		*/
-                    attr->shared->data_size;		/*the data itself	*/
-    else if(attr->shared->version == H5O_ATTR_VERSION_3)
-        ret_value += 1 +                        /*character encoding    */
-                    name_len	+		/*attribute name	*/
-                    attr->shared->dt_size +		/*datatype		*/
-                    attr->shared->ds_size +		/*dataspace		*/
-                    attr->shared->data_size;		/*the data itself	*/
+    if (attr->shared->version == H5O_ATTR_VERSION_1)
+        ret_value += H5O_ALIGN_OLD(name_len) +              /*attribute name	*/
+                     H5O_ALIGN_OLD(attr->shared->dt_size) + /*datatype		*/
+                     H5O_ALIGN_OLD(attr->shared->ds_size) + /*dataspace		*/
+                     attr->shared->data_size;               /*the data itself	*/
+    else if (attr->shared->version == H5O_ATTR_VERSION_2)
+        ret_value += name_len +               /*attribute name	*/
+                     attr->shared->dt_size +  /*datatype		*/
+                     attr->shared->ds_size +  /*dataspace		*/
+                     attr->shared->data_size; /*the data itself	*/
+    else if (attr->shared->version == H5O_ATTR_VERSION_3)
+        ret_value += 1 +                      /*character encoding    */
+                     name_len +               /*attribute name	*/
+                     attr->shared->dt_size +  /*datatype		*/
+                     attr->shared->ds_size +  /*dataspace		*/
+                     attr->shared->data_size; /*the data itself	*/
     else
         HDassert(0 && "Bad attribute version");
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_attr_reset
  *
@@ -491,7 +487,6 @@ H5O_attr_reset(void H5_ATTR_UNUSED *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_attr_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_free
  *
@@ -511,21 +506,20 @@ H5O_attr_reset(void H5_ATTR_UNUSED *_mesg)
 static herr_t
 H5O_attr_free(void *mesg)
 {
-    H5A_t *attr = (H5A_t *)mesg;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5A_t *attr      = (H5A_t *)mesg;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(mesg);
 
-    if(H5A_close(attr) < 0)
+    if (H5A_close(attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, FAIL, "unable to close attribute object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_attr_delete
  *
@@ -541,8 +535,8 @@ done:
 herr_t
 H5O_attr_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *_mesg)
 {
-    H5A_t *attr = (H5A_t *) _mesg;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5A_t *attr      = (H5A_t *)_mesg;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -551,18 +545,17 @@ H5O_attr_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *_mesg)
     HDassert(attr);
 
     /* Decrement reference count on datatype in file */
-    if((H5O_MSG_DTYPE->del)(f, dxpl_id, oh, attr->shared->dt) < 0)
+    if ((H5O_MSG_DTYPE->del)(f, dxpl_id, oh, attr->shared->dt) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust datatype link count")
 
     /* Decrement reference count on dataspace in file */
-    if((H5O_MSG_SDSPACE->del)(f, dxpl_id, oh, attr->shared->ds) < 0)
+    if ((H5O_MSG_SDSPACE->del)(f, dxpl_id, oh, attr->shared->ds) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust dataspace link count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_attr_link
  *
@@ -579,8 +572,8 @@ done:
 herr_t
 H5O_attr_link(H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *_mesg)
 {
-    H5A_t *attr = (H5A_t *) _mesg;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5A_t *attr      = (H5A_t *)_mesg;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -594,16 +587,15 @@ H5O_attr_link(H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *_mesg)
      * message is deleted.
      */
     /* Increment reference count on datatype & dataspace in file */
-    if((H5O_MSG_DTYPE->link)(f, dxpl_id, oh, attr->shared->dt) < 0)
+    if ((H5O_MSG_DTYPE->link)(f, dxpl_id, oh, attr->shared->dt) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust datatype link count")
-    if((H5O_MSG_SDSPACE->link)(f, dxpl_id, oh, attr->shared->ds) < 0)
+    if ((H5O_MSG_SDSPACE->link)(f, dxpl_id, oh, attr->shared->ds) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust dataspace link count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_attr_pre_copy_file
  *
@@ -621,7 +613,7 @@ done:
  */
 static herr_t
 H5O_attr_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSED *native_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata)
+                       hbool_t *deleted, const H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -632,13 +624,12 @@ H5O_attr_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSED
     /* If we are not copying attributes into the destination file, indicate
      *  that this message should be deleted.
      */
-    if(cpy_info->copy_without_attr)
+    if (cpy_info->copy_without_attr)
         *deleted = TRUE;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_attr_pre_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_attr_copy_file
  *
@@ -654,11 +645,11 @@ H5O_attr_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSED
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_attr_copy_file(H5F_t *file_src, const H5O_msg_class_t H5_ATTR_UNUSED *mesg_type,
-    void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
-    H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata, hid_t dxpl_id)
+H5O_attr_copy_file(H5F_t *file_src, const H5O_msg_class_t H5_ATTR_UNUSED *mesg_type, void *native_src,
+                   H5F_t *file_dst, hbool_t *recompute_size, H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata,
+                   hid_t dxpl_id)
 {
-    void        *ret_value;             /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -671,17 +662,17 @@ H5O_attr_copy_file(H5F_t *file_src, const H5O_msg_class_t H5_ATTR_UNUSED *mesg_t
     /* Mark datatype as being on disk now.  This step used to be done in a lower level
      * by H5O_dtype_decode.  But it has been moved up.  Not an ideal place, but no better
      * place than here. */
-    if(H5T_set_loc(((H5A_t *)native_src)->shared->dt, file_src, H5T_LOC_DISK) < 0)
+    if (H5T_set_loc(((H5A_t *)native_src)->shared->dt, file_src, H5T_LOC_DISK) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "invalid datatype location")
 
-    if(NULL == (ret_value = H5A_attr_copy_file((H5A_t *)native_src, file_dst, recompute_size, cpy_info,  dxpl_id)))
+    if (NULL ==
+        (ret_value = H5A_attr_copy_file((H5A_t *)native_src, file_dst, recompute_size, cpy_info, dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, NULL, "can't copy attribute")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_attr_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_attr_post_copy_file
  *
@@ -699,23 +690,21 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
-    H5O_loc_t *dst_oloc, void *mesg_dst, hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5O_attr_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
+                        hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
-
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if ( H5A_attr_post_copy_file(src_oloc, (const H5A_t *)mesg_src,
-         dst_oloc, (H5A_t *)mesg_dst, dxpl_id, cpy_info) < 0)
+    if (H5A_attr_post_copy_file(src_oloc, (const H5A_t *)mesg_src, dst_oloc, (H5A_t *)mesg_dst, dxpl_id,
+                                cpy_info) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, FAIL, "can't copy attribute")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_attr_post_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_get_crt_index
  *
@@ -732,7 +721,7 @@ done:
 static herr_t
 H5O_attr_get_crt_index(const void *_mesg, H5O_msg_crt_idx_t *crt_idx /*out*/)
 {
-    const H5A_t  *attr = (const H5A_t *)_mesg;
+    const H5A_t *attr = (const H5A_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -745,7 +734,6 @@ H5O_attr_get_crt_index(const void *_mesg, H5O_msg_crt_idx_t *crt_idx /*out*/)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_attr_get_crt_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_set_crt_index
  *
@@ -762,7 +750,7 @@ H5O_attr_get_crt_index(const void *_mesg, H5O_msg_crt_idx_t *crt_idx /*out*/)
 static herr_t
 H5O_attr_set_crt_index(void *_mesg, H5O_msg_crt_idx_t crt_idx)
 {
-    H5A_t  *attr = (H5A_t *)_mesg;
+    H5A_t *attr = (H5A_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -774,7 +762,6 @@ H5O_attr_set_crt_index(void *_mesg, H5O_msg_crt_idx_t crt_idx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_attr_set_crt_index() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_attr_debug
@@ -794,13 +781,12 @@ H5O_attr_set_crt_index(void *_mesg, H5O_msg_crt_idx_t crt_idx)
     parameter.
 --------------------------------------------------------------------------*/
 static herr_t
-H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream, int indent,
-	       int fwidth)
+H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth)
 {
     const H5A_t *mesg = (const H5A_t *)_mesg;
-    const char		*s;             /* Temporary string pointer */
-    char		buf[128];       /* Temporary string buffer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const char * s;                   /* Temporary string pointer */
+    char         buf[128];            /* Temporary string buffer */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -810,10 +796,8 @@ H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream, int in
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth,
-	    "Name:",
-	    mesg->shared->name);
-    switch(mesg->shared->encoding) {
+    HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth, "Name:", mesg->shared->name);
+    switch (mesg->shared->encoding) {
         case H5T_CSET_ASCII:
             s = "ASCII";
             break;
@@ -846,37 +830,27 @@ H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream, int in
             s = buf;
             break;
     } /* end switch */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-            "Character Set of Name:",
-            s);
-    HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	    "Object opened:",
-	    mesg->obj_opened);
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	    "Object:",
-	    mesg->oloc.addr);
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set of Name:", s);
+    HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth, "Object opened:", mesg->obj_opened);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Object:", mesg->oloc.addr);
 
     /* Check for attribute creation order index on the attribute */
-    if(mesg->shared->crt_idx != H5O_MAX_CRT_ORDER_IDX)
+    if (mesg->shared->crt_idx != H5O_MAX_CRT_ORDER_IDX)
         HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                "Creation Index:",
-                (unsigned)mesg->shared->crt_idx);
+                  "Creation Index:", (unsigned)mesg->shared->crt_idx);
 
     HDfprintf(stream, "%*sDatatype...\n", indent, "");
-    HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0,fwidth - 3),
-	    "Encoded Size:",
-	    (unsigned long)(mesg->shared->dt_size));
-    if((H5O_MSG_DTYPE->debug)(f, dxpl_id, mesg->shared->dt, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
+    HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
+              "Encoded Size:", (unsigned long)(mesg->shared->dt_size));
+    if ((H5O_MSG_DTYPE->debug)(f, dxpl_id, mesg->shared->dt, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to display datatype message info")
 
     HDfprintf(stream, "%*sDataspace...\n", indent, "");
     HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
-	    "Encoded Size:",
-	    (unsigned long)(mesg->shared->ds_size));
-    if(H5S_debug(f, dxpl_id, mesg->shared->ds, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
+              "Encoded Size:", (unsigned long)(mesg->shared->ds_size));
+    if (H5S_debug(f, dxpl_id, mesg->shared->ds, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to display dataspace message info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_debug() */
-
diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c
index 972ad2a..0521a87 100644
--- a/src/H5Oattribute.c
+++ b/src/H5Oattribute.c
@@ -26,132 +26,123 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg	  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5A_PACKAGE /*suppress error about including H5Apkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5SMprivate.h"	/* Shared Object Header Messages	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Fprivate.h"		/* File 			        */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes	  			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5SMprivate.h" /* Shared Object Header Messages	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Fprivate.h"  /* File 			        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for iteration when converting attributes to dense storage */
 typedef struct {
-    H5F_t      *f;              /* Pointer to file for insertion */
-    hid_t dxpl_id;              /* DXPL during iteration */
-    H5O_ainfo_t *ainfo;         /* Attribute info struct */
+    H5F_t *      f;       /* Pointer to file for insertion */
+    hid_t        dxpl_id; /* DXPL during iteration */
+    H5O_ainfo_t *ainfo;   /* Attribute info struct */
 } H5O_iter_cvt_t;
 
 /* User data for iteration when opening an attribute */
 typedef struct {
     /* down */
-    const char *name;           /* Name of attribute to open */
+    const char *name; /* Name of attribute to open */
 
     /* up */
-    H5A_t *attr;                /* Attribute data to update object header with */
+    H5A_t *attr; /* Attribute data to update object header with */
 } H5O_iter_opn_t;
 
 /* User data for iteration when updating an attribute */
 typedef struct {
     /* down */
-    H5F_t *f;                   /* Pointer to file attribute is in */
-    hid_t dxpl_id;              /* DXPL for operation */
-    H5A_t *attr;                /* Attribute data to update object header with */
+    H5F_t *f;       /* Pointer to file attribute is in */
+    hid_t  dxpl_id; /* DXPL for operation */
+    H5A_t *attr;    /* Attribute data to update object header with */
 
     /* up */
-    hbool_t found;              /* Whether the attribute was found */
+    hbool_t found; /* Whether the attribute was found */
 } H5O_iter_wrt_t;
 
 /* User data for iteration when renaming an attribute */
 typedef struct {
     /* down */
-    H5F_t *f;                   /* Pointer to file attribute is in */
-    hid_t dxpl_id;              /* DXPL for operation */
-    const char *old_name;       /* Old name of attribute */
-    const char *new_name;       /* New name of attribute */
+    H5F_t *     f;        /* Pointer to file attribute is in */
+    hid_t       dxpl_id;  /* DXPL for operation */
+    const char *old_name; /* Old name of attribute */
+    const char *new_name; /* New name of attribute */
 
     /* up */
-    hbool_t found;              /* Whether the attribute was found */
+    hbool_t found; /* Whether the attribute was found */
 } H5O_iter_ren_t;
 
 /* User data for iteration when iterating over attributes */
 typedef struct {
     /* down */
-    H5F_t *f;                   /* Pointer to file attribute is in */
-    hid_t dxpl_id;              /* DXPL for operation */
-    hid_t loc_id;               /* ID of object being iterated over */
-    unsigned skip;              /* # of attributes to skip over */
-    H5A_operator_t op;          /* Callback routine for each attribute */
-    void *op_data;              /* User data for callback */
+    H5F_t *        f;       /* Pointer to file attribute is in */
+    hid_t          dxpl_id; /* DXPL for operation */
+    hid_t          loc_id;  /* ID of object being iterated over */
+    unsigned       skip;    /* # of attributes to skip over */
+    H5A_operator_t op;      /* Callback routine for each attribute */
+    void *         op_data; /* User data for callback */
 
     /* up */
-    unsigned count;             /* Count of attributes examined */
+    unsigned count; /* Count of attributes examined */
 } H5O_iter_itr_t;
 
 /* User data for iteration when removing an attribute */
 typedef struct {
     /* down */
-    H5F_t *f;                   /* Pointer to file attribute is in */
-    hid_t dxpl_id;              /* DXPL for operation */
-    const char *name;           /* Name of attribute to open */
+    H5F_t *     f;       /* Pointer to file attribute is in */
+    hid_t       dxpl_id; /* DXPL for operation */
+    const char *name;    /* Name of attribute to open */
 
     /* up */
-    hbool_t found;              /* Found attribute to delete */
+    hbool_t found; /* Found attribute to delete */
 } H5O_iter_rm_t;
 
 /* User data for iteration when checking if an attribute exists */
 typedef struct {
     /* down */
-    const char *name;           /* Name of attribute to open */
+    const char *name; /* Name of attribute to open */
 
     /* up */
-    hbool_t found;              /* Found attribute */
+    hbool_t found; /* Found attribute */
 } H5O_iter_xst_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr,
-    const char* name_to_open);
+static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char *name_to_open);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_to_dense_cb
  *
@@ -171,12 +162,12 @@ static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_to_dense_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata/*in,out*/)
+H5O_attr_to_dense_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_UNUSED sequence,
+                     unsigned *oh_modified, void *_udata /*in,out*/)
 {
-    H5O_iter_cvt_t *udata = (H5O_iter_cvt_t *)_udata;   /* Operator user data */
-    H5A_t *attr = (H5A_t *)mesg->native;        /* Pointer to attribute to insert */
-    herr_t ret_value = H5_ITER_CONT;            /* Return value */
+    H5O_iter_cvt_t *udata     = (H5O_iter_cvt_t *)_udata; /* Operator user data */
+    H5A_t *         attr      = (H5A_t *)mesg->native;    /* Pointer to attribute to insert */
+    herr_t          ret_value = H5_ITER_CONT;             /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -189,12 +180,12 @@ H5O_attr_to_dense_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
     HDassert(attr);
 
     /* Insert attribute into dense storage */
-    if(H5A_dense_insert(udata->f, udata->dxpl_id, udata->ainfo, attr) < 0)
+    if (H5A_dense_insert(udata->f, udata->dxpl_id, udata->ainfo, attr) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR, "unable to add to dense storage")
 
     /* Convert message into a null message in the header */
     /* (don't delete attribute's space in the file though) */
-    if(H5O_release_mesg(udata->f, udata->dxpl_id, oh, mesg, FALSE) < 0)
+    if (H5O_release_mesg(udata->f, udata->dxpl_id, oh, mesg, FALSE) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, H5_ITER_ERROR, "unable to convert into null message")
 
     /* Indicate that the object header was modified */
@@ -204,7 +195,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_to_dense_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_create
  *
@@ -220,10 +210,10 @@ done:
 herr_t
 H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
-    H5O_ainfo_t ainfo;                  /* Attribute information for object */
-    htri_t shared_mesg;                 /* Should this message be stored in the Shared Message table? */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *     oh = NULL;           /* Pointer to actual object header */
+    H5O_ainfo_t ainfo;               /* Attribute information for object */
+    htri_t      shared_mesg;         /* Should this message be stored in the Shared Message table? */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -232,26 +222,26 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
     HDassert(attr);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Check if this object already has attribute information */
-    if(oh->version > H5O_VERSION_1) {
-        hbool_t new_ainfo = FALSE;      /* Flag to indicate that the attribute information is new */
-        htri_t ainfo_exists;            /* Whether the attribute info was retrieved */
+    if (oh->version > H5O_VERSION_1) {
+        hbool_t new_ainfo = FALSE; /* Flag to indicate that the attribute information is new */
+        htri_t  ainfo_exists;      /* Whether the attribute info was retrieved */
 
         /* Check for (& retrieve if available) attribute info */
-        if((ainfo_exists = H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
-        if(!ainfo_exists) {
+        if (!ainfo_exists) {
             /* Initialize attribute information */
-            ainfo.track_corder = (hbool_t)((oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) ? TRUE : FALSE);
-            ainfo.index_corder = (hbool_t)((oh->flags & H5O_HDR_ATTR_CRT_ORDER_INDEXED) ? TRUE : FALSE);
-            ainfo.max_crt_idx = 0;
+            ainfo.track_corder    = (hbool_t)((oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) ? TRUE : FALSE);
+            ainfo.index_corder    = (hbool_t)((oh->flags & H5O_HDR_ATTR_CRT_ORDER_INDEXED) ? TRUE : FALSE);
+            ainfo.max_crt_idx     = 0;
             ainfo.corder_bt2_addr = HADDR_UNDEF;
-            ainfo.nattrs = 0;
-            ainfo.fheap_addr = HADDR_UNDEF;
-            ainfo.name_bt2_addr = HADDR_UNDEF;
+            ainfo.nattrs          = 0;
+            ainfo.fheap_addr      = HADDR_UNDEF;
+            ainfo.name_bt2_addr   = HADDR_UNDEF;
 
             /* Set flag to add attribute information to object header */
             new_ainfo = TRUE;
@@ -264,47 +254,48 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
         } /* end else */
 
         /* Check if switching to "dense" attribute storage is possible */
-        if(!H5F_addr_defined(ainfo.fheap_addr)) {
-            htri_t sharable;        /* Whether the attribute will be shared */
-            size_t raw_size = 0;    /* Raw size of message */
+        if (!H5F_addr_defined(ainfo.fheap_addr)) {
+            htri_t sharable;     /* Whether the attribute will be shared */
+            size_t raw_size = 0; /* Raw size of message */
 
             /* Check for attribute being sharable */
-            if((sharable = H5SM_can_share(loc->file, dxpl_id, NULL, NULL, H5O_ATTR_ID, attr)) < 0)
+            if ((sharable = H5SM_can_share(loc->file, dxpl_id, NULL, NULL, H5O_ATTR_ID, attr)) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_BADMESG, FAIL, "can't determine attribute sharing status")
-            else if(sharable == FALSE) {
+            else if (sharable == FALSE) {
                 /* Compute the size needed to encode the attribute */
                 raw_size = (H5O_MSG_ATTR->raw_size)(loc->file, FALSE, attr);
             } /* end if */
 
             /* Check for condititions for switching to "dense" attribute storage are met */
-            if(ainfo.nattrs == oh->max_compact || (!sharable && raw_size >= H5O_MESG_MAX_SIZE)) {
-                H5O_iter_cvt_t udata;           /* User data for callback */
-                H5O_mesg_operator_t op;         /* Wrapper for operator */
+            if (ainfo.nattrs == oh->max_compact || (!sharable && raw_size >= H5O_MESG_MAX_SIZE)) {
+                H5O_iter_cvt_t      udata; /* User data for callback */
+                H5O_mesg_operator_t op;    /* Wrapper for operator */
 
                 /* Create dense storage for attributes */
-                if(H5A_dense_create(loc->file, dxpl_id, &ainfo) < 0)
+                if (H5A_dense_create(loc->file, dxpl_id, &ainfo) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to create dense storage for attributes")
 
                 /* Set up user data for callback */
-                udata.f = loc->file;
+                udata.f       = loc->file;
                 udata.dxpl_id = dxpl_id;
-                udata.ainfo = &ainfo;
+                udata.ainfo   = &ainfo;
 
                 /* Iterate over existing attributes, moving them to dense storage */
-                op.op_type = H5O_MESG_OP_LIB;
+                op.op_type  = H5O_MESG_OP_LIB;
                 op.u.lib_op = H5O_attr_to_dense_cb;
-                if(H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
-                    HGOTO_ERROR(H5E_ATTR, H5E_CANTCONVERT, FAIL, "error converting attributes to dense storage")
+                if (H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+                    HGOTO_ERROR(H5E_ATTR, H5E_CANTCONVERT, FAIL,
+                                "error converting attributes to dense storage")
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Increment attribute count on object */
         ainfo.nattrs++;
 
         /* Check whether we're tracking the creation index on attributes */
-        if(ainfo.track_corder) {
+        if (ainfo.track_corder) {
             /* Check for attribute creation order index on the object wrapping around */
-            if(ainfo.max_crt_idx == H5O_MAX_CRT_ORDER_IDX)
+            if (ainfo.max_crt_idx == H5O_MAX_CRT_ORDER_IDX)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTINC, FAIL, "attribute creation index can't be incremented")
 
             /* Set the creation order index on the attribute & incr. creation order index */
@@ -315,16 +306,18 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
             attr->shared->crt_idx = H5O_MAX_CRT_ORDER_IDX;
 
         /* Add the attribute information message, if one is needed */
-        if(new_ainfo) {
-            if(H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, &ainfo) < 0)
+        if (new_ainfo) {
+            if (H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0,
+                                    &ainfo) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute info message")
         } /* end if */
         /* Otherwise, update existing message */
         else {
-            if(H5O_msg_write_real(loc->file, dxpl_id, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, &ainfo) < 0)
+            if (H5O_msg_write_real(loc->file, dxpl_id, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, &ainfo) <
+                0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update attribute info message")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Set "bogus" creation index for attribute */
         attr->shared->crt_idx = H5O_MAX_CRT_ORDER_IDX;
@@ -334,14 +327,14 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
     } /* end else */
 
     /* Check for storing attribute with dense storage */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Insert attribute into dense storage */
-        if(H5A_dense_insert(loc->file, dxpl_id, &ainfo, attr) < 0)
+        if (H5A_dense_insert(loc->file, dxpl_id, &ainfo, attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to add to dense storage")
     } /* end if */
     else {
         /* Append new message to object header */
-        if(H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, attr) < 0)
+        if (H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute in header")
     } /* end else */
 
@@ -352,11 +345,11 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
     attr->shared->nrefs += 1;
 
     /* Was new attribute shared? */
-    if((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, attr)) > 0) {
-        hsize_t attr_rc;                /* Attribute's ref count in shared message storage */
+    if ((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, attr)) > 0) {
+        hsize_t attr_rc; /* Attribute's ref count in shared message storage */
 
         /* Retrieve ref count for shared attribute */
-        if(H5SM_get_refcount(loc->file, dxpl_id, H5O_ATTR_ID, &attr->sh_loc, &attr_rc) < 0)
+        if (H5SM_get_refcount(loc->file, dxpl_id, H5O_ATTR_ID, &attr->sh_loc, &attr_rc) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve shared message ref count")
 
         /* If this is not the first copy of the attribute in the shared message
@@ -382,26 +375,25 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
          *
          *      *ick* -QAK, 2007/01/08
          */
-        if(attr_rc > 1) {
-            if(H5O_attr_delete(loc->file, dxpl_id, oh, attr) < 0)
+        if (attr_rc > 1) {
+            if (H5O_attr_delete(loc->file, dxpl_id, oh, attr) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
         } /* end if */
-    } /* end if */
-    else if(shared_mesg < 0)
-	HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "error determining if message should be shared")
+    }     /* end if */
+    else if (shared_mesg < 0)
+        HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "error determining if message should be shared")
 
     /* Update the modification time, if any */
-    if(H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update time on object")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_open_cb
  *
@@ -421,11 +413,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_open_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
-    unsigned H5_ATTR_UNUSED *oh_modified, void *_udata/*in,out*/)
+H5O_attr_open_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence,
+                 unsigned H5_ATTR_UNUSED *oh_modified, void *_udata /*in,out*/)
 {
-    H5O_iter_opn_t *udata = (H5O_iter_opn_t *)_udata;   /* Operator user data */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    H5O_iter_opn_t *udata     = (H5O_iter_opn_t *)_udata; /* Operator user data */
+    herr_t          ret_value = H5_ITER_CONT;             /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -435,15 +427,14 @@ H5O_attr_open_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
     HDassert(!udata->attr);
 
     /* Check for correct attribute message to modify */
-    if(HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->name) == 0) {
+    if (HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->name) == 0) {
         /* Make a copy of the attribute to return */
-        if(NULL == (udata->attr = H5A_copy(NULL, (H5A_t *)mesg->native)))
+        if (NULL == (udata->attr = H5A_copy(NULL, (H5A_t *)mesg->native)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "unable to copy attribute")
 
         /* Assign [somewhat arbitrary] creation order value, for older versions
          * of the format or if creation order is not tracked */
-        if(oh->version == H5O_VERSION_1
-                || !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED))
+        if (oh->version == H5O_VERSION_1 || !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED))
             udata->attr->shared->crt_idx = sequence;
 
         /* Stop iterating */
@@ -454,7 +445,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_open_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_open_by_name
  *
@@ -475,12 +465,12 @@ done:
 H5A_t *
 H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
-    H5O_ainfo_t ainfo;                  /* Attribute information for object */
-    H5A_t *exist_attr = NULL;           /* Existing opened attribute object */
-    H5A_t *opened_attr = NULL;          /* Newly opened attribute object */
-    htri_t found_open_attr = FALSE;     /* Whether opened object is found */
-    H5A_t *ret_value;                   /* Return value */
+    H5O_t *     oh = NULL;               /* Pointer to actual object header */
+    H5O_ainfo_t ainfo;                   /* Attribute information for object */
+    H5A_t *     exist_attr      = NULL;  /* Existing opened attribute object */
+    H5A_t *     opened_attr     = NULL;  /* Newly opened attribute object */
+    htri_t      found_open_attr = FALSE; /* Whether opened object is found */
+    H5A_t *     ret_value;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -489,49 +479,49 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     HDassert(name);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, NULL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
+        if (H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "can't check for attribute info message")
     } /* end if */
 
     /* If found the attribute is already opened, make a copy of it to share the
      * object information.  If not, open attribute as a new object
      */
-    if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, name)) < 0)
+    if ((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, name)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "failed in finding opened attribute")
-    else if(found_open_attr == TRUE) {
-        if(NULL == (opened_attr = H5A_copy(NULL, exist_attr)))
+    else if (found_open_attr == TRUE) {
+        if (NULL == (opened_attr = H5A_copy(NULL, exist_attr)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, NULL, "can't copy existing attribute")
     } /* end else if */
     else {
         /* Check for attributes in dense storage */
-        if(H5F_addr_defined(ainfo.fheap_addr)) {
+        if (H5F_addr_defined(ainfo.fheap_addr)) {
             /* Open attribute with dense storage */
-            if(NULL == (opened_attr = H5A_dense_open(loc->file, dxpl_id, &ainfo, name)))
+            if (NULL == (opened_attr = H5A_dense_open(loc->file, dxpl_id, &ainfo, name)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "can't open attribute")
         } /* end if */
         else {
-            H5O_iter_opn_t udata;           /* User data for callback */
-            H5O_mesg_operator_t op;         /* Wrapper for operator */
+            H5O_iter_opn_t      udata; /* User data for callback */
+            H5O_mesg_operator_t op;    /* Wrapper for operator */
 
             /* Set up user data for callback */
             udata.name = name;
             udata.attr = NULL;
 
             /* Iterate over attributes, to locate correct one to open */
-            op.op_type = H5O_MESG_OP_LIB;
+            op.op_type  = H5O_MESG_OP_LIB;
             op.u.lib_op = H5O_attr_open_cb;
-            if(H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+            if (H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "error updating attribute")
 
             /* Check that we found the attribute */
-            if(!udata.attr)
+            if (!udata.attr)
                 HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, NULL, "can't locate attribute: '%s'", name)
 
             /* Get attribute opened from object header */
@@ -540,7 +530,7 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
         } /* end else */
 
         /* Mark datatype as being on disk now */
-        if(H5T_set_loc(opened_attr->shared->dt, loc->file, H5T_LOC_DISK) < 0)
+        if (H5T_set_loc(opened_attr->shared->dt, loc->file, H5T_LOC_DISK) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "invalid datatype location")
     } /* end else */
 
@@ -548,18 +538,17 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     ret_value = opened_attr;
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     /* Release any resources, on error */
-    if(NULL == ret_value && opened_attr)
-        if(H5A_close(opened_attr) < 0)
+    if (NULL == ret_value && opened_attr)
+        if (H5A_close(opened_attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, NULL, "can't close attribute")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_open_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_open_by_idx_cb
  *
@@ -577,8 +566,8 @@ done:
 static herr_t
 H5O_attr_open_by_idx_cb(const H5A_t *attr, void *_ret_attr)
 {
-    H5A_t **ret_attr = (H5A_t **)_ret_attr;     /* 'User data' passed in */
-    herr_t ret_value = H5_ITER_STOP;   /* Return value */
+    H5A_t **ret_attr  = (H5A_t **)_ret_attr; /* 'User data' passed in */
+    herr_t  ret_value = H5_ITER_STOP;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -587,14 +576,13 @@ H5O_attr_open_by_idx_cb(const H5A_t *attr, void *_ret_attr)
     HDassert(ret_attr);
 
     /* Copy attribute information.  Shared some attribute information. */
-    if(NULL == (*ret_attr = H5A_copy(NULL, attr)))
+    if (NULL == (*ret_attr = H5A_copy(NULL, attr)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy attribute")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_open_by_idx_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_open_by_idx
  *
@@ -614,15 +602,15 @@ done:
  *-------------------------------------------------------------------------
  */
 H5A_t *
-H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, hid_t dxpl_id)
+H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                     hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Object header */
-    H5A_attr_iter_op_t attr_op;         /* Attribute operator */
-    H5A_t *exist_attr = NULL;           /* Existing opened attribute object */
-    H5A_t *opened_attr = NULL;          /* Newly opened attribute object */
-    htri_t found_open_attr = FALSE;     /* Whether opened object is found */
-    H5A_t *ret_value;                   /* Return value */
+    H5O_t *            oh = NULL;               /* Object header */
+    H5A_attr_iter_op_t attr_op;                 /* Attribute operator */
+    H5A_t *            exist_attr      = NULL;  /* Existing opened attribute object */
+    H5A_t *            opened_attr     = NULL;  /* Newly opened attribute object */
+    htri_t             found_open_attr = FALSE; /* Whether opened object is found */
+    H5A_t *            ret_value;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -630,55 +618,55 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
     HDassert(loc);
 
     /* Build attribute operator info */
-    attr_op.op_type = H5A_ATTR_OP_LIB;
+    attr_op.op_type  = H5A_ATTR_OP_LIB;
     attr_op.u.lib_op = H5O_attr_open_by_idx_cb;
 
     /* Iterate over attributes to locate correct one */
-    if(H5O_attr_iterate_real((hid_t)-1, loc, dxpl_id, idx_type, order, n, NULL, &attr_op, &opened_attr) < 0)
+    if (H5O_attr_iterate_real((hid_t)-1, loc, dxpl_id, idx_type, order, n, NULL, &attr_op, &opened_attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_BADITER, NULL, "can't locate attribute")
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, NULL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Find out whether it has already been opened.  If it has, close the object
      * and make a copy of the already opened object to share the object info.
      */
-    if(opened_attr) {
-        if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, opened_attr->shared->name)) < 0)
+    if (opened_attr) {
+        if ((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, opened_attr->shared->name)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "failed in finding opened attribute")
 
         /* If found that the attribute is already opened, make a copy of it
          * and close the object just opened.
          */
-        if(found_open_attr && exist_attr) {
-            if(H5A_close(opened_attr) < 0)
+        if (found_open_attr && exist_attr) {
+            if (H5A_close(opened_attr) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, NULL, "can't close attribute")
-            if(NULL == (opened_attr = H5A_copy(NULL, exist_attr)))
+            if (NULL == (opened_attr = H5A_copy(NULL, exist_attr)))
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, NULL, "can't copy existing attribute")
-        } else {
+        }
+        else {
             /* Mark datatype as being on disk now */
-            if(H5T_set_loc(opened_attr->shared->dt, loc->file, H5T_LOC_DISK) < 0)
+            if (H5T_set_loc(opened_attr->shared->dt, loc->file, H5T_LOC_DISK) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "invalid datatype location")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Set return value */
     ret_value = opened_attr;
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     /* Release any resources, on error */
-    if(NULL == ret_value && opened_attr)
-        if(H5A_close(opened_attr) < 0)
+    if (NULL == ret_value && opened_attr)
+        if (H5A_close(opened_attr) < 0)
             HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, NULL, "can't close attribute")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_open_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_find_opened_attr
  *
@@ -695,71 +683,70 @@ done:
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char* name_to_open)
+H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char *name_to_open)
 {
-    hid_t *attr_id_list = NULL;         /* List of IDs for opened attributes */
-    unsigned long loc_fnum;             /* File serial # for object */
-    size_t num_open_attr;               /* Number of opened attributes */
-    htri_t ret_value = FALSE;           /* Return value */
+    hid_t *       attr_id_list = NULL; /* List of IDs for opened attributes */
+    unsigned long loc_fnum;            /* File serial # for object */
+    size_t        num_open_attr;       /* Number of opened attributes */
+    htri_t        ret_value = FALSE;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get file serial number for the location of attribute */
-    if(H5F_get_fileno(loc->file, &loc_fnum) < 0)
+    if (H5F_get_fileno(loc->file, &loc_fnum) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_BADVALUE, FAIL, "can't get file serial number")
 
     /* Count all opened attributes */
-    if(H5F_get_obj_count(loc->file, H5F_OBJ_ATTR | H5F_OBJ_LOCAL, FALSE, &num_open_attr) < 0)
+    if (H5F_get_obj_count(loc->file, H5F_OBJ_ATTR | H5F_OBJ_LOCAL, FALSE, &num_open_attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't count opened attributes")
 
     /* Find out whether the attribute has been opened */
-    if(num_open_attr) {
-        size_t check_num_attr;  /* Number of open attribute IDs */
-        size_t u;          /* Local index variable */
+    if (num_open_attr) {
+        size_t check_num_attr; /* Number of open attribute IDs */
+        size_t u;              /* Local index variable */
 
         /* Allocate space for the attribute ID list */
-        if(NULL == (attr_id_list = (hid_t *)H5MM_malloc(num_open_attr * sizeof(hid_t))))
+        if (NULL == (attr_id_list = (hid_t *)H5MM_malloc(num_open_attr * sizeof(hid_t))))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, FAIL, "unable to allocate memory for attribute ID list")
 
         /* Retrieve the IDs of all opened attributes */
-        if(H5F_get_obj_ids(loc->file, H5F_OBJ_ATTR | H5F_OBJ_LOCAL, num_open_attr, attr_id_list, FALSE, &check_num_attr) < 0)
+        if (H5F_get_obj_ids(loc->file, H5F_OBJ_ATTR | H5F_OBJ_LOCAL, num_open_attr, attr_id_list, FALSE,
+                            &check_num_attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get IDs of opened attributes")
-	if(check_num_attr != num_open_attr)
+        if (check_num_attr != num_open_attr)
             HGOTO_ERROR(H5E_INTERNAL, H5E_BADITER, FAIL, "open attribute count mismatch")
 
         /* Iterate over the attributes */
-        for(u = 0; u < num_open_attr; u++) {
-            unsigned long attr_fnum;        /* Attributes file serial number */
+        for (u = 0; u < num_open_attr; u++) {
+            unsigned long attr_fnum; /* Attributes file serial number */
 
             /* Get pointer to attribute */
-            if(NULL == (*attr = (H5A_t *)H5I_object_verify(attr_id_list[u], H5I_ATTR)))
+            if (NULL == (*attr = (H5A_t *)H5I_object_verify(attr_id_list[u], H5I_ATTR)))
                 HGOTO_ERROR(H5E_ATTR, H5E_BADTYPE, FAIL, "not an attribute")
 
             /* Get file serial number for attribute */
-            if(H5F_get_fileno((*attr)->oloc.file, &attr_fnum) < 0)
+            if (H5F_get_fileno((*attr)->oloc.file, &attr_fnum) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_BADVALUE, FAIL, "can't get file serial number")
 
             /* Verify whether it's the right object.  The attribute name, object
              *  address to which the attribute is attached, and file serial
              *  number should all match.
              */
-            if(!HDstrcmp(name_to_open, (*attr)->shared->name) &&
-                    loc->addr == (*attr)->oloc.addr &&
-                    loc_fnum == attr_fnum) {
+            if (!HDstrcmp(name_to_open, (*attr)->shared->name) && loc->addr == (*attr)->oloc.addr &&
+                loc_fnum == attr_fnum) {
                 ret_value = TRUE;
                 break;
             } /* end if */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
 
 done:
-    if(attr_id_list)
+    if (attr_id_list)
         H5MM_free(attr_id_list);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_find_opened_attr */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_update_shared
  *
@@ -774,13 +761,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_attr_update_shared(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5A_t *attr,
-    H5O_shared_t *update_sh_mesg)
+H5O_attr_update_shared(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5A_t *attr, H5O_shared_t *update_sh_mesg)
 {
-    H5O_shared_t sh_mesg;               /* Shared object header message */
-    hsize_t attr_rc;                    /* Attribute's ref count in shared message storage */
-    htri_t shared_mesg;                 /* Whether the message should be shared */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_shared_t sh_mesg;             /* Shared object header message */
+    hsize_t      attr_rc;             /* Attribute's ref count in shared message storage */
+    htri_t       shared_mesg;         /* Whether the message should be shared */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -789,22 +775,22 @@ H5O_attr_update_shared(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5A_t *attr,
     HDassert(attr);
 
     /* Extract shared message info from current attribute (for later use) */
-    if(H5O_set_shared(&sh_mesg, &(attr->sh_loc)) < 0)
+    if (H5O_set_shared(&sh_mesg, &(attr->sh_loc)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, FAIL, "can't get shared message")
 
     /* Reset existing sharing information */
-    if(H5O_msg_reset_share(H5O_ATTR_ID, attr) < 0)
+    if (H5O_msg_reset_share(H5O_ATTR_ID, attr) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to reset attribute sharing")
 
     /* Store new version of message as a SOHM */
     /* (should always work, since we're not changing the size of the attribute) */
-    if((shared_mesg = H5SM_try_share(f, dxpl_id, oh, 0, H5O_ATTR_ID, attr, NULL)) == 0)
+    if ((shared_mesg = H5SM_try_share(f, dxpl_id, oh, 0, H5O_ATTR_ID, attr, NULL)) == 0)
         HGOTO_ERROR(H5E_ATTR, H5E_BADMESG, FAIL, "attribute changed sharing status")
-    else if(shared_mesg < 0)
+    else if (shared_mesg < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_BADMESG, FAIL, "can't share attribute")
 
     /* Retrieve shared message storage ref count for new shared attribute */
-    if(H5SM_get_refcount(f, dxpl_id, H5O_ATTR_ID, &attr->sh_loc, &attr_rc) < 0)
+    if (H5SM_get_refcount(f, dxpl_id, H5O_ATTR_ID, &attr->sh_loc, &attr_rc) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve shared message ref count")
 
     /* If the newly shared attribute needs to share "ownership" of the shared
@@ -816,26 +802,25 @@ H5O_attr_update_shared(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5A_t *attr,
      *
      *      *ick* -QAK, 2007/01/08
      */
-    if(attr_rc == 1) {
+    if (attr_rc == 1) {
         /* Increment reference count on attribute components */
-        if(H5O_attr_link(f, dxpl_id, oh, attr) < 0)
+        if (H5O_attr_link(f, dxpl_id, oh, attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust attribute link count")
     } /* end if */
 
     /* Remove the old attribute from the SOHM storage */
-    if(H5SM_delete(f, dxpl_id, oh, &sh_mesg) < 0)
+    if (H5SM_delete(f, dxpl_id, oh, &sh_mesg) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to delete shared attribute in shared storage")
 
     /* Extract updated shared message info from modified attribute, if requested */
-    if(update_sh_mesg)
-        if(H5O_set_shared(update_sh_mesg, &(attr->sh_loc)) < 0)
+    if (update_sh_mesg)
+        if (H5O_set_shared(update_sh_mesg, &(attr->sh_loc)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, FAIL, "can't get shared message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_update_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_write_cb
  *
@@ -860,13 +845,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata/*in,out*/)
+H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_UNUSED sequence,
+                  unsigned *oh_modified, void *_udata /*in,out*/)
 {
-    H5O_iter_wrt_t *udata = (H5O_iter_wrt_t *)_udata;   /* Operator user data */
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    hbool_t chk_dirtied = FALSE;        /* Flag for unprotecting chunk */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    H5O_iter_wrt_t *   udata       = (H5O_iter_wrt_t *)_udata; /* Operator user data */
+    H5O_chunk_proxy_t *chk_proxy   = NULL;                     /* Chunk that message is in */
+    hbool_t            chk_dirtied = FALSE;                    /* Flag for unprotecting chunk */
+    herr_t             ret_value   = H5_ITER_CONT;             /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -876,15 +861,15 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
     HDassert(!udata->found);
 
     /* Check for correct attribute message to modify */
-    if(0 == HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->attr->shared->name)) {
+    if (0 == HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->attr->shared->name)) {
         /* Protect chunk */
-        if(NULL == (chk_proxy = H5O_chunk_protect(udata->f, udata->dxpl_id, oh, mesg->chunkno)))
+        if (NULL == (chk_proxy = H5O_chunk_protect(udata->f, udata->dxpl_id, oh, mesg->chunkno)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, H5_ITER_ERROR, "unable to load object header chunk")
 
         /* Because the attribute structure is shared now. The only situation that requires
-         * copying the data is when the metadata cache evicts and reloads this attribute. 
+         * copying the data is when the metadata cache evicts and reloads this attribute.
          * The shared attribute structure will be different in that situation. SLU-2010/7/29 */
-        if(((H5A_t *)mesg->native)->shared != udata->attr->shared) {
+        if (((H5A_t *)mesg->native)->shared != udata->attr->shared) {
             /* Sanity check */
             HDassert(((H5A_t *)mesg->native)->shared->data);
             HDassert(udata->attr->shared->data);
@@ -892,7 +877,8 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
 
             /* (Needs to occur before updating the shared message, or the hash
              *      value on the old & new messages will be the same) */
-            HDmemcpy(((H5A_t *)mesg->native)->shared->data, udata->attr->shared->data, udata->attr->shared->data_size);
+            HDmemcpy(((H5A_t *)mesg->native)->shared->data, udata->attr->shared->data,
+                     udata->attr->shared->data_size);
         } /* end if */
 
         /* Mark the message as modified */
@@ -900,14 +886,16 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
         chk_dirtied = TRUE;
 
         /* Release chunk */
-        if(H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_dirtied) < 0)
+        if (H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_dirtied) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to unprotect object header chunk")
         chk_proxy = NULL;
 
         /* Update the shared attribute in the SOHM storage */
-        if(mesg->flags & H5O_MSG_FLAG_SHARED)
-            if(H5O_attr_update_shared(udata->f, udata->dxpl_id, oh, udata->attr, (H5O_shared_t *)mesg->native) < 0)
-                HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, H5_ITER_ERROR, "unable to update attribute in shared storage")
+        if (mesg->flags & H5O_MSG_FLAG_SHARED)
+            if (H5O_attr_update_shared(udata->f, udata->dxpl_id, oh, udata->attr,
+                                       (H5O_shared_t *)mesg->native) < 0)
+                HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, H5_ITER_ERROR,
+                            "unable to update attribute in shared storage")
 
         /* Indicate that the object header was modified */
         *oh_modified = H5O_MODIFY;
@@ -921,13 +909,12 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
 
 done:
     /* Release chunk, if not already done */
-    if(chk_proxy && H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_write_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_write
  *
@@ -943,9 +930,9 @@ done:
 herr_t
 H5O_attr_write(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
-    H5O_ainfo_t ainfo;                  /* Attribute information for object */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *     oh = NULL;           /* Pointer to actual object header */
+    H5O_ainfo_t ainfo;               /* Attribute information for object */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -954,56 +941,55 @@ H5O_attr_write(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
     HDassert(attr);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
+        if (H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check for attributes stored densely */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Modify the attribute data in dense storage */
-        if(H5A_dense_write(loc->file, dxpl_id, &ainfo, attr) < 0)
+        if (H5A_dense_write(loc->file, dxpl_id, &ainfo, attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "error updating attribute")
     } /* end if */
     else {
-        H5O_iter_wrt_t udata;           /* User data for callback */
-        H5O_mesg_operator_t op;         /* Wrapper for operator */
+        H5O_iter_wrt_t      udata; /* User data for callback */
+        H5O_mesg_operator_t op;    /* Wrapper for operator */
 
         /* Set up user data for callback */
-        udata.f = loc->file;
+        udata.f       = loc->file;
         udata.dxpl_id = dxpl_id;
-        udata.attr = attr;
-        udata.found = FALSE;
+        udata.attr    = attr;
+        udata.found   = FALSE;
 
         /* Iterate over attributes, to locate correct one to update */
-        op.op_type = H5O_MESG_OP_LIB;
+        op.op_type  = H5O_MESG_OP_LIB;
         op.u.lib_op = H5O_attr_write_cb;
-        if(H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+        if (H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "error updating attribute")
 
         /* Check that we found the attribute */
-        if(!udata.found)
+        if (!udata.found)
             HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "can't locate open attribute?")
     } /* end else */
 
     /* Update the modification time, if any */
-    if(H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update time on object")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_write */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_rename_chk_cb
  *
@@ -1023,11 +1009,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_rename_chk_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned H5_ATTR_UNUSED sequence, unsigned H5_ATTR_UNUSED *oh_modified, void *_udata/*in,out*/)
+H5O_attr_rename_chk_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg /*in,out*/,
+                       unsigned H5_ATTR_UNUSED sequence, unsigned H5_ATTR_UNUSED *oh_modified,
+                       void *_udata /*in,out*/)
 {
-    H5O_iter_ren_t *udata = (H5O_iter_ren_t *)_udata;   /* Operator user data */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    H5O_iter_ren_t *udata     = (H5O_iter_ren_t *)_udata; /* Operator user data */
+    herr_t          ret_value = H5_ITER_CONT;             /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1037,7 +1024,7 @@ H5O_attr_rename_chk_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
     HDassert(!udata->found);
 
     /* Check for existing attribute with new name */
-    if(HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->new_name) == 0) {
+    if (HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->new_name) == 0) {
         /* Indicate that we found an existing attribute with the new name*/
         udata->found = TRUE;
 
@@ -1048,7 +1035,6 @@ H5O_attr_rename_chk_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_rename_chk_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_rename_mod_cb
  *
@@ -1073,13 +1059,13 @@ H5O_attr_rename_chk_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata/*in,out*/)
+H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_UNUSED sequence,
+                       unsigned *oh_modified, void *_udata /*in,out*/)
 {
-    H5O_iter_ren_t *udata = (H5O_iter_ren_t *)_udata;   /* Operator user data */
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    hbool_t chk_dirtied = FALSE;        /* Flag for unprotecting chunk */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    H5O_iter_ren_t *   udata       = (H5O_iter_ren_t *)_udata; /* Operator user data */
+    H5O_chunk_proxy_t *chk_proxy   = NULL;                     /* Chunk that message is in */
+    hbool_t            chk_dirtied = FALSE;                    /* Flag for unprotecting chunk */
+    herr_t             ret_value   = H5_ITER_CONT;             /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1089,11 +1075,11 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
     HDassert(!udata->found);
 
     /* Find correct attribute message to rename */
-    if(HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->old_name) == 0) {
-        unsigned old_version = ((H5A_t *)mesg->native)->shared->version;        /* Old version of the attribute */
+    if (HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->old_name) == 0) {
+        unsigned old_version = ((H5A_t *)mesg->native)->shared->version; /* Old version of the attribute */
 
         /* Protect chunk */
-        if(NULL == (chk_proxy = H5O_chunk_protect(udata->f, udata->dxpl_id, oh, mesg->chunkno)))
+        if (NULL == (chk_proxy = H5O_chunk_protect(udata->f, udata->dxpl_id, oh, mesg->chunkno)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, H5_ITER_ERROR, "unable to load object header chunk")
 
         /* Change the name for the attribute */
@@ -1101,7 +1087,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
         ((H5A_t *)mesg->native)->shared->name = H5MM_xstrdup(udata->new_name);
 
         /* Recompute the version to encode the attribute with */
-        if(H5A_set_version(udata->f, ((H5A_t *)mesg->native)) < 0)
+        if (H5A_set_version(udata->f, ((H5A_t *)mesg->native)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTSET, H5_ITER_ERROR, "unable to update attribute version")
 
         /* Mark the message as modified */
@@ -1109,24 +1095,25 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
         chk_dirtied = TRUE;
 
         /* Release chunk */
-        if(H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_dirtied) < 0)
+        if (H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_dirtied) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to unprotect object header chunk")
         chk_proxy = NULL;
 
         /* Check for shared message */
-        if(mesg->flags & H5O_MSG_FLAG_SHARED) {
+        if (mesg->flags & H5O_MSG_FLAG_SHARED) {
             /* Update the shared attribute in the SOHM storage */
-            if(H5O_attr_update_shared(udata->f, udata->dxpl_id, oh, (H5A_t *)mesg->native, NULL) < 0)
-                HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, H5_ITER_ERROR, "unable to update attribute in shared storage")
+            if (H5O_attr_update_shared(udata->f, udata->dxpl_id, oh, (H5A_t *)mesg->native, NULL) < 0)
+                HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, H5_ITER_ERROR,
+                            "unable to update attribute in shared storage")
         } /* end if */
         else {
             /* Sanity check */
             HDassert(H5O_msg_is_shared(H5O_ATTR_ID, (H5A_t *)mesg->native) == FALSE);
 
             /* Check for attribute message changing size */
-            if(HDstrlen(udata->new_name) != HDstrlen(udata->old_name) ||
-                    old_version != ((H5A_t *)mesg->native)->shared->version) {
-                H5A_t *attr;            /* Attribute to re-add */
+            if (HDstrlen(udata->new_name) != HDstrlen(udata->old_name) ||
+                old_version != ((H5A_t *)mesg->native)->shared->version) {
+                H5A_t *attr; /* Attribute to re-add */
 
                 /* Take ownership of the message's native info (the attribute)
                  *      so any shared objects in the file aren't adjusted (and
@@ -1138,22 +1125,25 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
                  *      list of messages during the "add the modified attribute"
                  *      step, invalidating the message pointer we have here - QAK)
                  */
-                attr = (H5A_t *)mesg->native;
+                attr         = (H5A_t *)mesg->native;
                 mesg->native = NULL;
 
                 /* Delete old attribute */
                 /* (doesn't decrement the link count on shared components becuase
                  *      the "native" pointer has been reset)
                  */
-                if(H5O_release_mesg(udata->f, udata->dxpl_id, oh, mesg, FALSE) < 0)
-                    HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, H5_ITER_ERROR, "unable to release previous attribute")
+                if (H5O_release_mesg(udata->f, udata->dxpl_id, oh, mesg, FALSE) < 0)
+                    HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, H5_ITER_ERROR,
+                                "unable to release previous attribute")
 
-		*oh_modified = H5O_MODIFY_CONDENSE;
+                *oh_modified = H5O_MODIFY_CONDENSE;
 
                 /* Append renamed attribute to object header */
                 /* (Don't let it become shared) */
-                if(H5O_msg_append_real(udata->f, udata->dxpl_id, oh, H5O_MSG_ATTR, (mesg->flags | H5O_MSG_FLAG_DONTSHARE), 0, attr) < 0)
-                    HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, H5_ITER_ERROR, "unable to relocate renamed attribute in header")
+                if (H5O_msg_append_real(udata->f, udata->dxpl_id, oh, H5O_MSG_ATTR,
+                                        (mesg->flags | H5O_MSG_FLAG_DONTSHARE), 0, attr) < 0)
+                    HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, H5_ITER_ERROR,
+                                "unable to relocate renamed attribute in header")
 
                 /* Sanity check */
                 HDassert(H5O_msg_is_shared(H5O_ATTR_ID, attr) == FALSE);
@@ -1161,7 +1151,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
                 /* Close the local copy of the attribute */
                 H5A_close(attr);
             } /* end if */
-        } /* end else */
+        }     /* end else */
 
         /* Indicate that the object header was modified */
         *oh_modified |= H5O_MODIFY;
@@ -1175,13 +1165,12 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
 
 done:
     /* Release chunk, if not already done */
-    if(chk_proxy && H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_rename_mod_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_rename
  *
@@ -1195,12 +1184,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id, const char *old_name,
-    const char *new_name)
+H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id, const char *old_name, const char *new_name)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
-    H5O_ainfo_t ainfo;                  /* Attribute information for object */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *     oh = NULL;           /* Pointer to actual object header */
+    H5O_ainfo_t ainfo;               /* Attribute information for object */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1210,67 +1198,66 @@ H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id, const char *old_name,
     HDassert(new_name);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
+        if (H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check for attributes stored densely */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Rename the attribute data in dense storage */
-        if(H5A_dense_rename(loc->file, dxpl_id, &ainfo, old_name, new_name) < 0)
+        if (H5A_dense_rename(loc->file, dxpl_id, &ainfo, old_name, new_name) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "error updating attribute")
     } /* end if */
     else {
-        H5O_iter_ren_t udata;           /* User data for callback */
-        H5O_mesg_operator_t op;         /* Wrapper for operator */
+        H5O_iter_ren_t      udata; /* User data for callback */
+        H5O_mesg_operator_t op;    /* Wrapper for operator */
 
         /* Set up user data for callback */
-        udata.f = loc->file;
-        udata.dxpl_id = dxpl_id;
+        udata.f        = loc->file;
+        udata.dxpl_id  = dxpl_id;
         udata.old_name = old_name;
         udata.new_name = new_name;
-        udata.found = FALSE;
+        udata.found    = FALSE;
 
         /* Iterate over attributes, to check if "new name" exists already */
-        op.op_type = H5O_MESG_OP_LIB;
+        op.op_type  = H5O_MESG_OP_LIB;
         op.u.lib_op = H5O_attr_rename_chk_cb;
-        if(H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+        if (H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "error updating attribute")
 
         /* If the new name was found, indicate an error */
-        if(udata.found)
+        if (udata.found)
             HGOTO_ERROR(H5E_ATTR, H5E_EXISTS, FAIL, "attribute with new name already exists")
 
         /* Iterate over attributes again, to actually rename attribute with old name */
-        op.op_type = H5O_MESG_OP_LIB;
+        op.op_type  = H5O_MESG_OP_LIB;
         op.u.lib_op = H5O_attr_rename_mod_cb;
-        if(H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+        if (H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "error updating attribute")
 
         /* Check that we found the attribute to rename */
-        if(!udata.found)
+        if (!udata.found)
             HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "can't locate attribute with old name")
     } /* end else */
 
     /* Update the modification time, if any */
-    if(H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update time on object")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_rename */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_iterate_real
  *
@@ -1284,14 +1271,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
-    hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data)
+H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id, H5_index_t idx_type,
+                      H5_iter_order_t order, hsize_t skip, hsize_t *last_attr,
+                      const H5A_attr_iter_op_t *attr_op, void *op_data)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
-    H5O_ainfo_t ainfo;                  /* Attribute information for object */
-    H5A_attr_table_t atable = {0, NULL};        /* Table of attributes */
-    herr_t ret_value;                   /* Return value */
+    H5O_t *          oh = NULL;          /* Pointer to actual object header */
+    H5O_ainfo_t      ainfo;              /* Attribute information for object */
+    H5A_attr_table_t atable = {0, NULL}; /* Table of attributes */
+    herr_t           ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1302,62 +1289,62 @@ H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id,
     HDassert(attr_op);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
+        if (H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check for attributes stored densely */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Check for skipping too many attributes */
-        if(skip > 0 && skip >= ainfo.nattrs)
+        if (skip > 0 && skip >= ainfo.nattrs)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
 
         /* Release the object header */
-        if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        if (H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
         oh = NULL;
 
         /* Iterate over attributes in dense storage */
-        if((ret_value = H5A_dense_iterate(loc->file, dxpl_id, loc_id, &ainfo, idx_type, order, skip, last_attr, attr_op, op_data)) < 0)
+        if ((ret_value = H5A_dense_iterate(loc->file, dxpl_id, loc_id, &ainfo, idx_type, order, skip,
+                                           last_attr, attr_op, op_data)) < 0)
             HERROR(H5E_ATTR, H5E_BADITER, "error iterating over attributes");
     } /* end if */
     else {
         /* Build table of attributes for compact storage */
-        if(H5A_compact_build_table(loc->file, dxpl_id, oh, idx_type, order, &atable) < 0)
+        if (H5A_compact_build_table(loc->file, dxpl_id, oh, idx_type, order, &atable) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "error building attribute table")
 
         /* Release the object header */
-        if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        if (H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
         oh = NULL;
 
         /* Check for skipping too many attributes */
-        if(skip > 0 && skip >= atable.nattrs)
+        if (skip > 0 && skip >= atable.nattrs)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
 
         /* Iterate over attributes in table */
-        if((ret_value = H5A_attr_iterate_table(&atable, skip, last_attr, loc_id, attr_op, op_data)) < 0)
+        if ((ret_value = H5A_attr_iterate_table(&atable, skip, last_attr, loc_id, attr_op, op_data)) < 0)
             HERROR(H5E_ATTR, H5E_CANTNEXT, "iteration operator failed");
     } /* end else */
 
 done:
     /* Release resources */
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
-    if(atable.attrs && H5A_attr_release_table(&atable) < 0)
+    if (atable.attrs && H5A_attr_release_table(&atable) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to release attribute table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_iterate_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_iterate
  *
@@ -1371,12 +1358,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_attr_iterate(hid_t loc_id, hid_t dxpl_id,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
-    hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data)
+H5O_attr_iterate(hid_t loc_id, hid_t dxpl_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
+                 hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data)
 {
-    H5G_loc_t loc;	        /* Object location */
-    herr_t ret_value;           /* Return value */
+    H5G_loc_t loc;       /* Object location */
+    herr_t    ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1384,18 +1370,18 @@ H5O_attr_iterate(hid_t loc_id, hid_t dxpl_id,
     HDassert(attr_op);
 
     /* Look up location for location ID */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Iterate over attributes to locate correct one */
-    if((ret_value = H5O_attr_iterate_real(loc_id, loc.oloc, dxpl_id, idx_type, order, skip, last_attr, attr_op, op_data)) < 0)
+    if ((ret_value = H5O_attr_iterate_real(loc_id, loc.oloc, dxpl_id, idx_type, order, skip, last_attr,
+                                           attr_op, op_data)) < 0)
         HERROR(H5E_ATTR, H5E_BADITER, "error iterating over attributes");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_remove_update
  *
@@ -1417,11 +1403,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo,
-    hid_t dxpl_id)
+H5O_attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo, hid_t dxpl_id)
 {
-    H5A_attr_table_t atable = {0, NULL};        /* Table of attributes */
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    H5A_attr_table_t atable    = {0, NULL}; /* Table of attributes */
+    herr_t           ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1434,40 +1419,41 @@ H5O_attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo,
     ainfo->nattrs--;
 
     /* Check for shifting from dense storage back to compact storage */
-    if(H5F_addr_defined(ainfo->fheap_addr) && ainfo->nattrs < oh->min_dense) {
-        hbool_t can_convert = TRUE;     /* Whether converting to attribute messages is possible */
-        size_t u;                       /* Local index */
+    if (H5F_addr_defined(ainfo->fheap_addr) && ainfo->nattrs < oh->min_dense) {
+        hbool_t can_convert = TRUE; /* Whether converting to attribute messages is possible */
+        size_t  u;                  /* Local index */
 
         /* Build the table of attributes for this object */
-        if(H5A_dense_build_table(loc->file, dxpl_id, ainfo, H5_INDEX_NAME, H5_ITER_NATIVE, &atable) < 0)
+        if (H5A_dense_build_table(loc->file, dxpl_id, ainfo, H5_INDEX_NAME, H5_ITER_NATIVE, &atable) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "error building attribute table")
 
         /* Inspect attributes in table for ones that can't be converted back
          * into attribute message form (currently only attributes which
          * can't fit into an object header message)
          */
-        for(u = 0; u < ainfo->nattrs; u++)
-            if(H5O_msg_size_oh(loc->file, oh, H5O_ATTR_ID, (atable.attrs[u]), (size_t)0) >= H5O_MESG_MAX_SIZE) {
+        for (u = 0; u < ainfo->nattrs; u++)
+            if (H5O_msg_size_oh(loc->file, oh, H5O_ATTR_ID, (atable.attrs[u]), (size_t)0) >=
+                H5O_MESG_MAX_SIZE) {
                 can_convert = FALSE;
                 break;
             } /* end if */
 
         /* If ok, insert attributes as object header messages */
-        if(can_convert) {
-            H5A_t *exist_attr = NULL;
+        if (can_convert) {
+            H5A_t *exist_attr      = NULL;
             htri_t found_open_attr = FALSE;
 
             /* Iterate over attributes, to put them into header */
-            for(u = 0; u < ainfo->nattrs; u++) {
-                htri_t shared_mesg;             /* Should this message be stored in the Shared Message table? */
+            for (u = 0; u < ainfo->nattrs; u++) {
+                htri_t shared_mesg; /* Should this message be stored in the Shared Message table? */
 
                 /* Check if attribute is shared */
-                if((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, (atable.attrs[u]))) < 0)
+                if ((shared_mesg = H5O_msg_is_shared(H5O_ATTR_ID, (atable.attrs[u]))) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "error determining if message is shared")
-                else if(shared_mesg == 0) {
+                else if (shared_mesg == 0) {
                     /* Increment reference count on attribute components */
                     /* (so that they aren't deleted when the dense attribute storage is deleted) */
-                    if(H5O_attr_link(loc->file, dxpl_id, oh, (atable.attrs[u])) < 0)
+                    if (H5O_attr_link(loc->file, dxpl_id, oh, (atable.attrs[u])) < 0)
                         HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust attribute link count")
                 } /* end if */
                 else {
@@ -1478,48 +1464,49 @@ H5O_attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo,
                 /* Insert attribute message into object header (Will increment
                    reference count on shared attributes) */
                 /* Find out whether the attribute has been opened */
-                if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, (atable.attrs[u])->shared->name)) < 0)
+                if ((found_open_attr =
+                         H5O_attr_find_opened_attr(loc, &exist_attr, (atable.attrs[u])->shared->name)) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "failed in finding opened attribute")
 
                 /* If found the attribute is already opened, use the opened message to insert.
                    If not, still use the message in the attribute table. */
-                if(found_open_attr && exist_attr) {
-                    if(H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, exist_attr) < 0)
+                if (found_open_attr && exist_attr) {
+                    if (H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, exist_attr) < 0)
                         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't create message")
-
-                } else {
-                    if(H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, (atable.attrs[u])) < 0)
+                }
+                else {
+                    if (H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, (atable.attrs[u])) <
+                        0)
                         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't create message")
                 }
             } /* end for */
 
             /* Remove the dense storage */
-            if(H5A_dense_delete(loc->file, dxpl_id, ainfo) < 0)
+            if (H5A_dense_delete(loc->file, dxpl_id, ainfo) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete dense attribute storage")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Check if we have deleted all the attributes and the attribute info
      *  message should be deleted itself.
      */
-    if(ainfo->nattrs == 0) {
-        if(H5O_msg_remove_real(loc->file, oh, H5O_MSG_AINFO, H5O_ALL, NULL, NULL, TRUE, dxpl_id) < 0)
+    if (ainfo->nattrs == 0) {
+        if (H5O_msg_remove_real(loc->file, oh, H5O_MSG_AINFO, H5O_ALL, NULL, NULL, TRUE, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute info")
     } /* end if */
     else {
-        if(H5O_msg_write_real(loc->file, dxpl_id, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, ainfo) < 0)
+        if (H5O_msg_write_real(loc->file, dxpl_id, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update attribute info message")
     } /* end else */
 
 done:
     /* Release resources */
-    if(atable.attrs && H5A_attr_release_table(&atable) < 0)
+    if (atable.attrs && H5A_attr_release_table(&atable) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to release attribute table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_remove_update() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_remove_cb
  *
@@ -1539,11 +1526,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata/*in,out*/)
+H5O_attr_remove_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_UNUSED sequence,
+                   unsigned *oh_modified, void *_udata /*in,out*/)
 {
-    H5O_iter_rm_t *udata = (H5O_iter_rm_t *)_udata;   /* Operator user data */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    H5O_iter_rm_t *udata     = (H5O_iter_rm_t *)_udata; /* Operator user data */
+    herr_t         ret_value = H5_ITER_CONT;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1553,9 +1540,9 @@ H5O_attr_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
     HDassert(!udata->found);
 
     /* Check for correct attribute message to modify */
-    if(HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->name) == 0) {
+    if (HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->name) == 0) {
         /* Convert message into a null message (i.e. delete it) */
-        if(H5O_release_mesg(udata->f, udata->dxpl_id, oh, mesg, TRUE) < 0)
+        if (H5O_release_mesg(udata->f, udata->dxpl_id, oh, mesg, TRUE) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, H5_ITER_ERROR, "unable to convert into null message")
 
         /* Indicate that the object header was modified */
@@ -1572,7 +1559,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_remove_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_remove
  *
@@ -1588,10 +1574,10 @@ done:
 herr_t
 H5O_attr_remove(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
+    H5O_t *     oh = NULL;              /* Pointer to actual object header */
     H5O_ainfo_t ainfo;                  /* Attribute information for object */
-    htri_t ainfo_exists = FALSE;        /* Whether the attribute info exists in the file */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    htri_t      ainfo_exists = FALSE;   /* Whether the attribute info exists in the file */
+    herr_t      ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1600,61 +1586,60 @@ H5O_attr_remove(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     HDassert(name);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if((ainfo_exists = H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check for attributes stored densely */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Delete attribute from dense storage */
-        if(H5A_dense_remove(loc->file, dxpl_id, &ainfo, name) < 0)
+        if (H5A_dense_remove(loc->file, dxpl_id, &ainfo, name) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute in dense storage")
     } /* end if */
     else {
-        H5O_iter_rm_t udata;            /* User data for callback */
-        H5O_mesg_operator_t op;         /* Wrapper for operator */
+        H5O_iter_rm_t       udata; /* User data for callback */
+        H5O_mesg_operator_t op;    /* Wrapper for operator */
 
         /* Set up user data for callback */
-        udata.f = loc->file;
+        udata.f       = loc->file;
         udata.dxpl_id = dxpl_id;
-        udata.name = name;
-        udata.found = FALSE;
+        udata.name    = name;
+        udata.found   = FALSE;
 
         /* Iterate over attributes, to locate correct one to delete */
-        op.op_type = H5O_MESG_OP_LIB;
+        op.op_type  = H5O_MESG_OP_LIB;
         op.u.lib_op = H5O_attr_remove_cb;
-        if(H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+        if (H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "error deleting attribute")
 
         /* Check that we found the attribute */
-        if(!udata.found)
+        if (!udata.found)
             HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "can't locate attribute")
     } /* end else */
 
     /* Update the attribute information after removing an attribute */
-    if(ainfo_exists)
-        if(H5O_attr_remove_update(loc, oh, &ainfo, dxpl_id) < 0)
+    if (ainfo_exists)
+        if (H5O_attr_remove_update(loc, oh, &ainfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update attribute info")
 
     /* Update the modification time, if any */
-    if(H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update time on object")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_remove_by_idx
  *
@@ -1669,14 +1654,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, hid_t dxpl_id)
+H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
+                       hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
-    H5O_ainfo_t ainfo;                  /* Attribute information for object */
-    htri_t ainfo_exists = FALSE;        /* Whether the attribute info exists in the file */
-    H5A_attr_table_t atable = {0, NULL};        /* Table of attributes */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *          oh = NULL;                /* Pointer to actual object header */
+    H5O_ainfo_t      ainfo;                    /* Attribute information for object */
+    htri_t           ainfo_exists = FALSE;     /* Whether the attribute info exists in the file */
+    H5A_attr_table_t atable       = {0, NULL}; /* Table of attributes */
+    herr_t           ret_value    = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1684,71 +1669,70 @@ H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
     HDassert(loc);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if((ainfo_exists = H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check for attributes stored densely */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Delete attribute from dense storage */
-        if(H5A_dense_remove_by_idx(loc->file, dxpl_id, &ainfo, idx_type, order, n) < 0)
+        if (H5A_dense_remove_by_idx(loc->file, dxpl_id, &ainfo, idx_type, order, n) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute in dense storage")
     } /* end if */
     else {
-        H5O_iter_rm_t udata;            /* User data for callback */
-        H5O_mesg_operator_t op;         /* Wrapper for operator */
+        H5O_iter_rm_t       udata; /* User data for callback */
+        H5O_mesg_operator_t op;    /* Wrapper for operator */
 
         /* Build table of attributes for compact storage */
-        if(H5A_compact_build_table(loc->file, dxpl_id, oh, idx_type, order, &atable) < 0)
+        if (H5A_compact_build_table(loc->file, dxpl_id, oh, idx_type, order, &atable) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "error building attribute table")
 
         /* Check for skipping too many attributes */
-        if(n >= atable.nattrs)
+        if (n >= atable.nattrs)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
 
         /* Set up user data for callback, to remove the attribute by name */
-        udata.f = loc->file;
+        udata.f       = loc->file;
         udata.dxpl_id = dxpl_id;
-        udata.name = ((atable.attrs[n])->shared)->name;
-        udata.found = FALSE;
+        udata.name    = ((atable.attrs[n])->shared)->name;
+        udata.found   = FALSE;
 
         /* Iterate over attributes, to locate correct one to delete */
-        op.op_type = H5O_MESG_OP_LIB;
+        op.op_type  = H5O_MESG_OP_LIB;
         op.u.lib_op = H5O_attr_remove_cb;
-        if(H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+        if (H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "error deleting attribute")
 
         /* Check that we found the attribute */
-        if(!udata.found)
+        if (!udata.found)
             HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "can't locate attribute")
     } /* end else */
 
     /* Update the attribute information after removing an attribute */
-    if(ainfo_exists)
-        if(H5O_attr_remove_update(loc, oh, &ainfo, dxpl_id) < 0)
+    if (ainfo_exists)
+        if (H5O_attr_remove_update(loc, oh, &ainfo, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update attribute info")
 
     /* Update the modification time, if any */
-    if(H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, dxpl_id, oh, FALSE) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update time on object")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
-    if(atable.attrs && H5A_attr_release_table(&atable) < 0)
+    if (atable.attrs && H5A_attr_release_table(&atable) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to release attribute table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_remove_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_count_real
  *
@@ -1764,7 +1748,7 @@ done:
 herr_t
 H5O_attr_count_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hsize_t *nattrs)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1774,26 +1758,26 @@ H5O_attr_count_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hsize_t *nattrs)
     HDassert(nattrs);
 
     /* Check for attributes stored densely */
-    if(oh->version > H5O_VERSION_1) {
-        htri_t ainfo_exists = FALSE;        /* Whether the attribute info exists in the file */
-        H5O_ainfo_t ainfo;                  /* Attribute information for object */
+    if (oh->version > H5O_VERSION_1) {
+        htri_t      ainfo_exists = FALSE; /* Whether the attribute info exists in the file */
+        H5O_ainfo_t ainfo;                /* Attribute information for object */
 
         /* Attempt to get the attribute information from the object header */
-        if((ainfo_exists = H5A_get_ainfo(f, dxpl_id, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A_get_ainfo(f, dxpl_id, oh, &ainfo)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
-        else if(ainfo_exists > 0)
+        else if (ainfo_exists > 0)
             *nattrs = ainfo.nattrs;
         else
             *nattrs = 0;
     } /* end if */
     else {
-        hsize_t attr_count;     /* Number of attributes found */
-        unsigned u;             /* Local index variable */
+        hsize_t  attr_count; /* Number of attributes found */
+        unsigned u;          /* Local index variable */
 
         /* Loop over all messages, counting the attributes */
         attr_count = 0;
-        for(u = 0; u < oh->nmesgs; u++)
-            if(oh->mesg[u].type == H5O_MSG_ATTR)
+        for (u = 0; u < oh->nmesgs; u++)
+            if (oh->mesg[u].type == H5O_MSG_ATTR)
                 attr_count++;
         *nattrs = attr_count;
     } /* end else */
@@ -1802,7 +1786,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_count_real */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_exists_cb
  *
@@ -1822,11 +1805,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned H5_ATTR_UNUSED sequence, unsigned H5_ATTR_UNUSED *oh_modified, void *_udata/*in,out*/)
+H5O_attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_UNUSED sequence,
+                   unsigned H5_ATTR_UNUSED *oh_modified, void *_udata /*in,out*/)
 {
-    H5O_iter_rm_t *udata = (H5O_iter_rm_t *)_udata;   /* Operator user data */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    H5O_iter_rm_t *udata     = (H5O_iter_rm_t *)_udata; /* Operator user data */
+    herr_t         ret_value = H5_ITER_CONT;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1835,7 +1818,7 @@ H5O_attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
     HDassert(!udata->found);
 
     /* Check for correct attribute message */
-    if(HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->name) == 0) {
+    if (HDstrcmp(((H5A_t *)mesg->native)->shared->name, udata->name) == 0) {
         /* Indicate that this message is the attribute sought */
         udata->found = TRUE;
 
@@ -1846,7 +1829,6 @@ H5O_attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_exists_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_exists
  *
@@ -1862,9 +1844,9 @@ H5O_attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
 htri_t
 H5O_attr_exists(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;           /* Pointer to actual object header */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    htri_t ret_value;           /* Return value */
+    H5O_t *     oh = NULL; /* Pointer to actual object header */
+    H5O_ainfo_t ainfo;     /* Attribute information for object */
+    htri_t      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1873,37 +1855,37 @@ H5O_attr_exists(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     HDassert(name);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
+        if (H5A_get_ainfo(loc->file, dxpl_id, oh, &ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check for attributes stored densely */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Check if attribute exists in dense storage */
-        if((ret_value = H5A_dense_exists(loc->file, dxpl_id, &ainfo, name)) < 0)
+        if ((ret_value = H5A_dense_exists(loc->file, dxpl_id, &ainfo, name)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_BADITER, FAIL, "error checking for existence of attribute")
     } /* end if */
     else {
-        H5O_iter_rm_t udata;            /* User data for callback */
-        H5O_mesg_operator_t op;         /* Wrapper for operator */
+        H5O_iter_rm_t       udata; /* User data for callback */
+        H5O_mesg_operator_t op;    /* Wrapper for operator */
 
         /* Set up user data for callback */
-        udata.f = loc->file;
+        udata.f       = loc->file;
         udata.dxpl_id = dxpl_id;
-        udata.name = name;
-        udata.found = FALSE;
+        udata.name    = name;
+        udata.found   = FALSE;
 
         /* Iterate over existing attributes, checking for attribute with same name */
-        op.op_type = H5O_MESG_OP_LIB;
+        op.op_type  = H5O_MESG_OP_LIB;
         op.u.lib_op = H5O_attr_exists_cb;
-        if(H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
+        if (H5O_msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata, dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_BADITER, FAIL, "error checking for existence of attribute")
 
         /* Check that we found the attribute */
@@ -1911,13 +1893,12 @@ H5O_attr_exists(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     } /* end else */
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_exists */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_attr_bh_info
  *
@@ -1933,10 +1914,10 @@ done:
 herr_t
 H5O_attr_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
 {
-    H5HF_t      *fheap = NULL;              /* Fractal heap handle */
-    H5B2_t      *bt2_name = NULL;           /* v2 B-tree handle for name index */
-    H5B2_t      *bt2_corder = NULL;         /* v2 B-tree handle for creation order index */
-    herr_t      ret_value = SUCCEED;        /* Return value */
+    H5HF_t *fheap      = NULL;    /* Fractal heap handle */
+    H5B2_t *bt2_name   = NULL;    /* v2 B-tree handle for name index */
+    H5B2_t *bt2_corder = NULL;    /* v2 B-tree handle for creation order index */
+    herr_t  ret_value  = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1945,63 +1926,64 @@ H5O_attr_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
     HDassert(bh_info);
 
     /* Attributes are only stored in fractal heap & indexed w/v2 B-tree in later versions */
-    if(oh->version > H5O_VERSION_1) {
-        H5O_ainfo_t ainfo;          /* Attribute information for object */
-        htri_t ainfo_exists = FALSE;        /* Whether the attribute info exists in the file */
+    if (oh->version > H5O_VERSION_1) {
+        H5O_ainfo_t ainfo;                /* Attribute information for object */
+        htri_t      ainfo_exists = FALSE; /* Whether the attribute info exists in the file */
 
         /* Check for (& retrieve if available) attribute info */
-        if((ainfo_exists = H5A_get_ainfo(f, dxpl_id, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A_get_ainfo(f, dxpl_id, oh, &ainfo)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
-        else if(ainfo_exists > 0) {
+        else if (ainfo_exists > 0) {
             /* Check if name index available */
-            if(H5F_addr_defined(ainfo.name_bt2_addr)) {
+            if (H5F_addr_defined(ainfo.name_bt2_addr)) {
                 /* Open the name index v2 B-tree */
-                if(NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo.name_bt2_addr, NULL)))
+                if (NULL == (bt2_name = H5B2_open(f, dxpl_id, ainfo.name_bt2_addr, NULL)))
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
                 /* Get name index B-tree size */
-                if(H5B2_size(bt2_name, dxpl_id, &(bh_info->index_size)) < 0)
+                if (H5B2_size(bt2_name, dxpl_id, &(bh_info->index_size)) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve B-tree storage info")
             } /* end if */
 
             /* Check if creation order index available */
-            if(H5F_addr_defined(ainfo.corder_bt2_addr)) {
+            if (H5F_addr_defined(ainfo.corder_bt2_addr)) {
                 /* Open the creation order index v2 B-tree */
-                if(NULL == (bt2_corder = H5B2_open(f, dxpl_id, ainfo.corder_bt2_addr, NULL)))
-                    HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
+                if (NULL == (bt2_corder = H5B2_open(f, dxpl_id, ainfo.corder_bt2_addr, NULL)))
+                    HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL,
+                                "unable to open v2 B-tree for creation order index")
 
                 /* Get creation order index B-tree size */
-                if(H5B2_size(bt2_corder, dxpl_id, &(bh_info->index_size)) < 0)
+                if (H5B2_size(bt2_corder, dxpl_id, &(bh_info->index_size)) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve B-tree storage info")
             } /* end if */
 
             /* Get storage size of fractal heap, if it's used */
-            if(H5F_addr_defined(ainfo.fheap_addr)) {
+            if (H5F_addr_defined(ainfo.fheap_addr)) {
                 /* Open the fractal heap for attributes */
-                if(NULL == (fheap = H5HF_open(f, dxpl_id, ainfo.fheap_addr)))
+                if (NULL == (fheap = H5HF_open(f, dxpl_id, ainfo.fheap_addr)))
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
                 /* Get heap storage size */
-                if(H5HF_size(fheap, dxpl_id, &(bh_info->heap_size)) < 0)
+                if (H5HF_size(fheap, dxpl_id, &(bh_info->heap_size)) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve B-tree storage info")
             } /* end if */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for creation order index")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O_attr_bh_info() */
+} /* H5O_attr_bh_info() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5O_attr_count
  *
@@ -2017,9 +1999,9 @@ done:
 int
 H5O_attr_count(const H5O_loc_t *loc, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;           /* Pointer to actual object header */
-    hsize_t nattrs;             /* Number of attributes */
-    int ret_value;              /* Return value */
+    H5O_t * oh = NULL; /* Pointer to actual object header */
+    hsize_t nattrs;    /* Number of attributes */
+    int     ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2027,21 +2009,20 @@ H5O_attr_count(const H5O_loc_t *loc, hid_t dxpl_id)
     HDassert(loc);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve # of attributes on object */
-    if(H5O_attr_count_real(loc->file, dxpl_id, oh, &nattrs) < 0)
+    if (H5O_attr_count_real(loc->file, dxpl_id, oh, &nattrs) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve attribute count")
 
     /* Set return value */
     ret_value = (int)nattrs;
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_attr_count */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Obogus.c b/src/H5Obogus.c
index bf002ea..994e8e8 100644
--- a/src/H5Obogus.c
+++ b/src/H5Obogus.c
@@ -26,72 +26,71 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 #ifdef H5O_ENABLE_BOGUS
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_bogus_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void *H5O_bogus_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_bogus_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
 static size_t H5O_bogus_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
-static herr_t H5O_bogus_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
-			     int indent, int fwidth);
+static herr_t H5O_bogus_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                              int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_BOGUS_VALID[1] = {{
-    H5O_BOGUS_VALID_ID,     /*message id number                 */
-    "bogus valid",          /*message name for debugging        */
-    0,                      /*native message size               */
-    H5O_SHARE_IS_SHARABLE,  /*messages are sharable?            */
-    H5O_bogus_decode,       /*decode message                    */
-    H5O_bogus_encode,       /*encode message                    */
-    NULL,                   /*copy the native value             */
-    H5O_bogus_size,         /*raw message size                  */
-    NULL,                   /*free internal memory              */
-    NULL,                   /*free method                       */
-    NULL,                   /* file delete method               */
-    NULL,                   /* link method                      */
-    NULL,                   /*set share method                  */
-    NULL,                   /*can share method                  */
-    NULL,                   /* pre copy native value to file    */
-    NULL,                   /* copy native value to file        */
-    NULL,                   /* post copy native value to file   */
-    NULL,                   /* get creation index               */
-    NULL,                   /* set creation index               */
-    H5O_bogus_debug         /*debug the message                 */
+    H5O_BOGUS_VALID_ID,    /*message id number                 */
+    "bogus valid",         /*message name for debugging        */
+    0,                     /*native message size               */
+    H5O_SHARE_IS_SHARABLE, /*messages are sharable?            */
+    H5O_bogus_decode,      /*decode message                    */
+    H5O_bogus_encode,      /*encode message                    */
+    NULL,                  /*copy the native value             */
+    H5O_bogus_size,        /*raw message size                  */
+    NULL,                  /*free internal memory              */
+    NULL,                  /*free method                       */
+    NULL,                  /* file delete method               */
+    NULL,                  /* link method                      */
+    NULL,                  /*set share method                  */
+    NULL,                  /*can share method                  */
+    NULL,                  /* pre copy native value to file    */
+    NULL,                  /* copy native value to file        */
+    NULL,                  /* post copy native value to file   */
+    NULL,                  /* get creation index               */
+    NULL,                  /* set creation index               */
+    H5O_bogus_debug        /*debug the message                 */
 }};
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_BOGUS_INVALID[1] = {{
-    H5O_BOGUS_INVALID_ID,   /*message id number                 */
-    "bogus invalid",        /*message name for debugging        */
-    0,                      /*native message size               */
-    H5O_SHARE_IS_SHARABLE,  /*messages are sharable?            */
-    H5O_bogus_decode,       /*decode message                    */
-    H5O_bogus_encode,       /*encode message                    */
-    NULL,                   /*copy the native value             */
-    H5O_bogus_size,         /*raw message size                  */
-    NULL,                   /*free internal memory              */
-    NULL,                   /*free method                       */
-    NULL,                   /* file delete method               */
-    NULL,                   /* link method                      */
-    NULL,                   /*set share method                  */
-    NULL,                   /*can share method                  */
-    NULL,                   /* pre copy native value to file    */
-    NULL,                   /* copy native value to file        */
-    NULL,                   /* post copy native value to file   */
-    NULL,                   /* get creation index               */
-    NULL,                   /* set creation index               */
-    H5O_bogus_debug         /*debug the message                 */
+    H5O_BOGUS_INVALID_ID,  /*message id number                 */
+    "bogus invalid",       /*message name for debugging        */
+    0,                     /*native message size               */
+    H5O_SHARE_IS_SHARABLE, /*messages are sharable?            */
+    H5O_bogus_decode,      /*decode message                    */
+    H5O_bogus_encode,      /*encode message                    */
+    NULL,                  /*copy the native value             */
+    H5O_bogus_size,        /*raw message size                  */
+    NULL,                  /*free internal memory              */
+    NULL,                  /*free method                       */
+    NULL,                  /* file delete method               */
+    NULL,                  /* link method                      */
+    NULL,                  /*set share method                  */
+    NULL,                  /*can share method                  */
+    NULL,                  /* pre copy native value to file    */
+    NULL,                  /* copy native value to file        */
+    NULL,                  /* post copy native value to file   */
+    NULL,                  /* get creation index               */
+    NULL,                  /* set creation index               */
+    H5O_bogus_debug        /*debug the message                 */
 }};
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_bogus_decode
  *
@@ -110,11 +109,11 @@ const H5O_msg_class_t H5O_MSG_BOGUS_INVALID[1] = {{
  */
 static void *
 H5O_bogus_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                 size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
     H5O_bogus_t *mesg = NULL;
-    void *ret_value;            /* Return value */
+    void *       ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -123,27 +122,26 @@ H5O_bogus_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     HDassert(p);
 
     /* Allocate the bogus message */
-    if(NULL == (mesg = (H5O_bogus_t *)H5MM_calloc(sizeof(H5O_bogus_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (mesg = (H5O_bogus_t *)H5MM_calloc(sizeof(H5O_bogus_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* decode */
     UINT32DECODE(p, mesg->u);
 
     /* Validate the bogus info */
-    if(mesg->u != H5O_BOGUS_VALUE)
-	HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "invalid bogus value :-)")
+    if (mesg->u != H5O_BOGUS_VALUE)
+        HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "invalid bogus value :-)")
 
     /* Set return value */
     ret_value = mesg;
 
 done:
-    if(ret_value == NULL && mesg != NULL)
+    if (ret_value == NULL && mesg != NULL)
         H5MM_xfree(mesg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_bogus_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_bogus_encode
  *
@@ -158,7 +156,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_bogus_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void H5_ATTR_UNUSED *mesg)
+H5O_bogus_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
+                 const void H5_ATTR_UNUSED *mesg)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -173,7 +172,6 @@ H5O_bogus_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_bogus_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_bogus_size
  *
@@ -193,14 +191,14 @@ H5O_bogus_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_bogus_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED *mesg)
+H5O_bogus_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
+               const void H5_ATTR_UNUSED *mesg)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(4)
 } /* end H5O_bogus_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_bogus_debug
  *
@@ -218,9 +216,9 @@ H5O_bogus_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_sha
  */
 static herr_t
 H5O_bogus_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
-	       int indent, int fwidth)
+                int indent, int fwidth)
 {
-    const H5O_bogus_t	*mesg = (const H5O_bogus_t *)_mesg;
+    const H5O_bogus_t *mesg = (const H5O_bogus_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -231,10 +229,8 @@ H5O_bogus_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const voi
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s `%u'\n", indent, "", fwidth,
-            "Bogus Value:", mesg->u);
+    HDfprintf(stream, "%*s%-*s `%u'\n", indent, "", fwidth, "Bogus Value:", mesg->u);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_bogus_debug() */
 #endif /* H5O_ENABLE_BOGUS */
-
diff --git a/src/H5Obtreek.c b/src/H5Obtreek.c
index 6bcdcc3..27423ae 100644
--- a/src/H5Obtreek.c
+++ b/src/H5Obtreek.c
@@ -11,7 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 /* Programmer:  Quincey Koziol <koziol@hdfgroup.org>
  *              Thursday, March  1, 2007
  *
@@ -19,49 +18,48 @@
  *              information in the superblock extension.
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5MMprivate.h" /* Memory management			*/
 
-static void  *H5O_btreek_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_btreek_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_btreek_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void  *H5O_btreek_copy(const void *_mesg, void *_dest);
+static void * H5O_btreek_copy(const void *_mesg, void *_dest);
 static size_t H5O_btreek_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
-static herr_t H5O_btreek_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
-			     int indent, int fwidth);
+static herr_t H5O_btreek_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                               int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_BTREEK[1] = {{
-    H5O_BTREEK_ID,              /*message id number                     */
-    "v1 B-tree 'K' values",     /*message name for debugging            */
-    sizeof(H5O_btreek_t),	/*native message size                   */
-    0,				/* messages are sharable?       */
-    H5O_btreek_decode,		/*decode message                        */
-    H5O_btreek_encode,		/*encode message                        */
-    H5O_btreek_copy,            /*copy the native value                 */
-    H5O_btreek_size,		/*raw message size			*/
-    NULL,                       /*free internal memory			*/
-    NULL,                       /* free method				*/
-    NULL,			/* file delete method			*/
-    NULL,			/* link method				*/
-    NULL,			/*set share method		        */
-    NULL,		    	/*can share method		        */
-    NULL,			/* pre copy native value to file	*/
-    NULL,			/* copy native value to file		*/
-    NULL,			/* post copy native value to file	*/
-    NULL,			/* get creation index		        */
-    NULL,			/* set creation index		        */
-    H5O_btreek_debug            /*debug the message			*/
+    H5O_BTREEK_ID,          /*message id number                     */
+    "v1 B-tree 'K' values", /*message name for debugging            */
+    sizeof(H5O_btreek_t),   /*native message size                   */
+    0,                      /* messages are sharable?       */
+    H5O_btreek_decode,      /*decode message                        */
+    H5O_btreek_encode,      /*encode message                        */
+    H5O_btreek_copy,        /*copy the native value                 */
+    H5O_btreek_size,        /*raw message size			*/
+    NULL,                   /*free internal memory			*/
+    NULL,                   /* free method				*/
+    NULL,                   /* file delete method			*/
+    NULL,                   /* link method				*/
+    NULL,                   /*set share method		        */
+    NULL,                   /*can share method		        */
+    NULL,                   /* pre copy native value to file	*/
+    NULL,                   /* copy native value to file		*/
+    NULL,                   /* post copy native value to file	*/
+    NULL,                   /* get creation index		        */
+    NULL,                   /* set creation index		        */
+    H5O_btreek_debug        /*debug the message			*/
 }};
 
 /* Current version of v1 B-tree 'K' value information */
-#define H5O_BTREEK_VERSION 	0
+#define H5O_BTREEK_VERSION 0
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_btreek_decode
  *
@@ -78,11 +76,11 @@ const H5O_msg_class_t H5O_MSG_BTREEK[1] = {{
  */
 static void *
 H5O_btreek_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                  unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                  size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_btreek_t	*mesg;          /* Native message */
-    void                *ret_value;     /* Return value */
+    H5O_btreek_t *mesg;      /* Native message */
+    void *        ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -91,12 +89,12 @@ H5O_btreek_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H
     HDassert(p);
 
     /* Version of message */
-    if(*p++ != H5O_BTREEK_VERSION)
+    if (*p++ != H5O_BTREEK_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for message")
 
     /* Allocate space for message */
-    if(NULL == (mesg = (H5O_btreek_t *)H5MM_calloc(sizeof(H5O_btreek_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for v1 B-tree 'K' message")
+    if (NULL == (mesg = (H5O_btreek_t *)H5MM_calloc(sizeof(H5O_btreek_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for v1 B-tree 'K' message")
 
     /* Retrieve non-default B-tree 'K' values */
     UINT16DECODE(p, mesg->btree_k[H5B_CHUNK_ID]);
@@ -110,7 +108,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_btreek_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_btreek_encode
  *
@@ -124,7 +121,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_btreek_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O_btreek_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
+                  const void *_mesg)
 {
     const H5O_btreek_t *mesg = (const H5O_btreek_t *)_mesg;
 
@@ -144,7 +142,6 @@ H5O_btreek_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_btreek_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_btreek_copy
  *
@@ -162,17 +159,18 @@ H5O_btreek_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared
 static void *
 H5O_btreek_copy(const void *_mesg, void *_dest)
 {
-    const H5O_btreek_t	*mesg = (const H5O_btreek_t *)_mesg;
-    H5O_btreek_t	*dest = (H5O_btreek_t *)_dest;
-    void		*ret_value;
+    const H5O_btreek_t *mesg = (const H5O_btreek_t *)_mesg;
+    H5O_btreek_t *      dest = (H5O_btreek_t *)_dest;
+    void *              ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert(mesg);
 
-    if(!dest && NULL == (dest = (H5O_btreek_t *)H5MM_malloc(sizeof(H5O_btreek_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for shared message table message")
+    if (!dest && NULL == (dest = (H5O_btreek_t *)H5MM_malloc(sizeof(H5O_btreek_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for shared message table message")
 
     /* All this message requires is a shallow copy */
     *dest = *mesg;
@@ -184,7 +182,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_btreek_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_btreek_size
  *
@@ -200,24 +197,24 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_btreek_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED *_mesg)
+H5O_btreek_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
+                const void H5_ATTR_UNUSED *_mesg)
 {
-    size_t                   ret_value;
+    size_t ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Sanity check */
     HDassert(f);
 
-    ret_value = 1 +             /* Version number */
-		2 +             /* Chunked storage internal B-tree 'K' value */
-		2 +             /* Symbol table node internal B-tree 'K' value */
-		2;              /* Symbol table node leaf 'K' value */
+    ret_value = 1 + /* Version number */
+                2 + /* Chunked storage internal B-tree 'K' value */
+                2 + /* Symbol table node internal B-tree 'K' value */
+                2;  /* Symbol table node leaf 'K' value */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_btreek_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_btreek_debug
  *
@@ -232,7 +229,7 @@ H5O_btreek_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_sh
  */
 static herr_t
 H5O_btreek_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
-    int indent, int fwidth)
+                 int indent, int fwidth)
 {
     const H5O_btreek_t *mesg = (const H5O_btreek_t *)_mesg;
 
@@ -246,12 +243,11 @@ H5O_btreek_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const vo
     HDassert(fwidth >= 0);
 
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Chunked storage internal B-tree 'K' value:", mesg->btree_k[H5B_CHUNK_ID]);
+              "Chunked storage internal B-tree 'K' value:", mesg->btree_k[H5B_CHUNK_ID]);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Symbol table node internal B-tree 'K' value:", mesg->btree_k[H5B_SNODE_ID]);
+              "Symbol table node internal B-tree 'K' value:", mesg->btree_k[H5B_SNODE_ID]);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Symbol table node leaf 'K' value:", mesg->sym_leaf_k);
+              "Symbol table node leaf 'K' value:", mesg->sym_leaf_k);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_btreek_debug() */
-
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 8e7690e..eb843db 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -26,19 +26,17 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
@@ -50,46 +48,43 @@
  *      size to save the extra I/O operations) */
 #define H5O_SPEC_READ_SIZE 512
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Metadata cache callbacks */
 static H5O_t *H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5O_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5O_t *oh, unsigned H5_ATTR_UNUSED * flags_ptr);
+static herr_t H5O_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5O_t *oh,
+                        unsigned H5_ATTR_UNUSED *flags_ptr);
 static herr_t H5O_dest(H5F_t *f, H5O_t *oh);
 static herr_t H5O_clear(H5F_t *f, H5O_t *oh, hbool_t destroy);
 static herr_t H5O_size(const H5F_t *f, const H5O_t *oh, size_t *size_ptr);
 
 static H5O_chunk_proxy_t *H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5O_cache_chk_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5O_chunk_proxy_t *chk_proxy, unsigned H5_ATTR_UNUSED * flags_ptr);
-static herr_t H5O_cache_chk_dest(H5F_t *f, H5O_chunk_proxy_t *chk_proxy);
-static herr_t H5O_cache_chk_clear(H5F_t *f, H5O_chunk_proxy_t *chk_proxy, hbool_t destroy);
+static herr_t             H5O_cache_chk_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+                                              H5O_chunk_proxy_t *chk_proxy, unsigned H5_ATTR_UNUSED *flags_ptr);
+static herr_t             H5O_cache_chk_dest(H5F_t *f, H5O_chunk_proxy_t *chk_proxy);
+static herr_t             H5O_cache_chk_clear(H5F_t *f, H5O_chunk_proxy_t *chk_proxy, hbool_t destroy);
 static herr_t H5O_cache_chk_size(const H5F_t *f, const H5O_chunk_proxy_t *chk_proxy, size_t *size_ptr);
 
 /* Chunk proxy routines */
 static herr_t H5O_chunk_proxy_dest(H5O_chunk_proxy_t *chunk_proxy);
 
 /* Chunk routines */
-static herr_t H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len,
-    const uint8_t *image, H5O_common_cache_ud_t *udata, hbool_t *dirty);
+static herr_t H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
+                                    H5O_common_cache_ud_t *udata, hbool_t *dirty);
 static herr_t H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno);
 
 /* Misc. routines */
-static herr_t H5O_add_cont_msg(H5O_cont_msgs_t *cont_msg_info,
-    const H5O_cont_t *cont);
-
+static herr_t H5O_add_cont_msg(H5O_cont_msgs_t *cont_msg_info, const H5O_cont_t *cont);
 
 /*********************/
 /* Package Variables */
@@ -124,18 +119,14 @@ H5FL_EXTERN(H5O_chunk_proxy_t);
 /* Declare the free list for H5O_cont_t sequences */
 H5FL_SEQ_DEFINE(H5O_cont_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_load
  *
@@ -154,17 +145,17 @@ H5FL_SEQ_DEFINE(H5O_cont_t);
 static H5O_t *
 H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5O_t	*oh = NULL;     /* Object header read in */
-    H5O_cache_ud_t *udata = (H5O_cache_ud_t *)_udata;       /* User data for callback */
-    H5WB_t      *wb = NULL;     /* Wrapped buffer for prefix data */
-    uint8_t     read_buf[H5O_SPEC_READ_SIZE];       /* Buffer for speculative read */
-    const uint8_t *p;           /* Pointer into buffer to decode */
-    uint8_t     *buf;           /* Buffer to decode */
-    size_t	spec_read_size; /* Size of buffer to speculatively read in */
-    size_t	prefix_size;    /* Size of object header prefix */
-    size_t	buf_size;       /* Size of prefix+chunk #0 buffer */
-    haddr_t     eoa;		/* Relative end of file address	*/
-    H5O_t	*ret_value;     /* Return value */
+    H5O_t *         oh    = NULL;                     /* Object header read in */
+    H5O_cache_ud_t *udata = (H5O_cache_ud_t *)_udata; /* User data for callback */
+    H5WB_t *        wb    = NULL;                     /* Wrapped buffer for prefix data */
+    uint8_t         read_buf[H5O_SPEC_READ_SIZE];     /* Buffer for speculative read */
+    const uint8_t * p;                                /* Pointer into buffer to decode */
+    uint8_t *       buf;                              /* Buffer to decode */
+    size_t          spec_read_size;                   /* Size of buffer to speculatively read in */
+    size_t          prefix_size;                      /* Size of object header prefix */
+    size_t          buf_size;                         /* Size of prefix+chunk #0 buffer */
+    haddr_t         eoa;                              /* Relative end of file address	*/
+    H5O_t *         ret_value;                        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -176,20 +167,20 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata->common.cont_msg_info);
 
     /* Make certain we don't speculatively read off the end of the file */
-    if(HADDR_UNDEF == (eoa = H5F_get_eoa(f, H5FD_MEM_OHDR)))
+    if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, H5FD_MEM_OHDR)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to determine file size")
 
     /* Compute the size of the speculative object header buffer */
     H5_CHECKED_ASSIGN(spec_read_size, size_t, MIN(eoa - addr, H5O_SPEC_READ_SIZE), hsize_t);
 
     /* Attempt to speculatively read both object header prefix and first chunk */
-    if(H5F_block_read(f, H5FD_MEM_OHDR, addr, spec_read_size, dxpl_id, read_buf) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read object header")
+    if (H5F_block_read(f, H5FD_MEM_OHDR, addr, spec_read_size, dxpl_id, read_buf) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read object header")
     p = read_buf;
 
     /* Allocate space for the object header data structure */
-    if(NULL == (oh = H5FL_CALLOC(H5O_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (oh = H5FL_CALLOC(H5O_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* File-specific, non-stored information */
     oh->sizeof_size = H5F_SIZEOF_SIZE(udata->common.f);
@@ -197,26 +188,26 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
     /* Check for presence of magic number */
     /* (indicates version 2 or later) */
-    if(!HDmemcmp(p, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    if (!HDmemcmp(p, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /* Magic number */
         p += H5_SIZEOF_MAGIC;
 
         /* Version */
         oh->version = *p++;
-        if(H5O_VERSION_2 != oh->version)
+        if (H5O_VERSION_2 != oh->version)
             HGOTO_ERROR(H5E_OHDR, H5E_VERSION, NULL, "bad object header version number")
 
         /* Flags */
         oh->flags = *p++;
-        if(oh->flags & ~H5O_HDR_ALL_FLAGS)
+        if (oh->flags & ~H5O_HDR_ALL_FLAGS)
             HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "unknown object header status flag(s)")
 
         /* Number of links to object (unless overridden by refcount message) */
         oh->nlink = 1;
 
         /* Time fields */
-        if(oh->flags & H5O_HDR_STORE_TIMES) {
-            uint32_t tmp;       /* Temporary value */
+        if (oh->flags & H5O_HDR_STORE_TIMES) {
+            uint32_t tmp; /* Temporary value */
 
             UINT32DECODE(p, tmp);
             oh->atime = (time_t)tmp;
@@ -231,45 +222,45 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
             oh->atime = oh->mtime = oh->ctime = oh->btime = 0;
 
         /* Attribute fields */
-        if(oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
+        if (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
             UINT16DECODE(p, oh->max_compact);
             UINT16DECODE(p, oh->min_dense);
-            if(oh->max_compact < oh->min_dense)
+            if (oh->max_compact < oh->min_dense)
                 HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "bad object header attribute phase change values")
         } /* end if */
         else {
             oh->max_compact = H5O_CRT_ATTR_MAX_COMPACT_DEF;
-            oh->min_dense = H5O_CRT_ATTR_MIN_DENSE_DEF;
+            oh->min_dense   = H5O_CRT_ATTR_MIN_DENSE_DEF;
         } /* end else */
 
         /* First chunk size */
-        switch(oh->flags & H5O_HDR_CHUNK0_SIZE) {
-            case 0:     /* 1 byte size */
+        switch (oh->flags & H5O_HDR_CHUNK0_SIZE) {
+            case 0: /* 1 byte size */
                 oh->chunk0_size = *p++;
                 break;
 
-            case 1:     /* 2 byte size */
+            case 1: /* 2 byte size */
                 UINT16DECODE(p, oh->chunk0_size);
                 break;
 
-            case 2:     /* 4 byte size */
+            case 2: /* 4 byte size */
                 UINT32DECODE(p, oh->chunk0_size);
                 break;
 
-            case 3:     /* 8 byte size */
+            case 3: /* 8 byte size */
                 UINT64DECODE(p, oh->chunk0_size);
                 break;
 
             default:
                 HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "bad size for chunk 0")
         } /* end switch */
-        if(oh->chunk0_size > 0 && oh->chunk0_size < H5O_SIZEOF_MSGHDR_OH(oh))
+        if (oh->chunk0_size > 0 && oh->chunk0_size < H5O_SIZEOF_MSGHDR_OH(oh))
             HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "bad object header chunk size")
     } /* end if */
     else {
         /* Version */
         oh->version = *p++;
-        if(H5O_VERSION_1 != oh->version)
+        if (H5O_VERSION_1 != oh->version)
             HGOTO_ERROR(H5E_OHDR, H5E_VERSION, NULL, "bad object header version number")
 
         /* Flags */
@@ -289,12 +280,12 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
         /* Reset unused attribute fields */
         oh->max_compact = 0;
-        oh->min_dense = 0;
+        oh->min_dense   = 0;
 
         /* First chunk size */
         UINT32DECODE(p, oh->chunk0_size);
-        if((udata->v1_pfx_nmesgs > 0 && oh->chunk0_size < H5O_SIZEOF_MSGHDR_OH(oh)) ||
-                (udata->v1_pfx_nmesgs == 0 && oh->chunk0_size > 0))
+        if ((udata->v1_pfx_nmesgs > 0 && oh->chunk0_size < H5O_SIZEOF_MSGHDR_OH(oh)) ||
+            (udata->v1_pfx_nmesgs == 0 && oh->chunk0_size > 0))
             HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "bad object header chunk size")
 
         /* Reserved, in version 1 (for 8-byte alignment padding) */
@@ -309,27 +300,29 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     buf_size = oh->chunk0_size + (size_t)H5O_SIZEOF_HDR(oh);
 
     /* Check if the speculative read was large enough to parse the first chunk */
-    if(spec_read_size < buf_size) {
+    if (spec_read_size < buf_size) {
         /* Wrap the local buffer for serialized header info */
-        if(NULL == (wb = H5WB_wrap(read_buf, sizeof(read_buf))))
+        if (NULL == (wb = H5WB_wrap(read_buf, sizeof(read_buf))))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for serialized header */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, buf_size)))
+        if (NULL == (buf = (uint8_t *)H5WB_actual(wb, buf_size)))
             HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, NULL, "can't get actual buffer")
 
         /* Copy existing raw data into new buffer */
         HDmemcpy(buf, read_buf, spec_read_size);
 
         /* Read rest of the raw data */
-        if(H5F_block_read(f, H5FD_MEM_OHDR, (addr + spec_read_size), (buf_size - spec_read_size), dxpl_id, (buf + spec_read_size)) < 0)
+        if (H5F_block_read(f, H5FD_MEM_OHDR, (addr + spec_read_size), (buf_size - spec_read_size), dxpl_id,
+                           (buf + spec_read_size)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read object header data")
     } /* end if */
     else
         buf = read_buf;
 
     /* Parse the first chunk */
-    if(H5O_chunk_deserialize(oh, udata->common.addr, oh->chunk0_size, buf, &(udata->common), &oh->cache_info.is_dirty) < 0)
+    if (H5O_chunk_deserialize(oh, udata->common.addr, oh->chunk0_size, buf, &(udata->common),
+                              &oh->cache_info.is_dirty) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't deserialize first object header chunk")
 
     /* Note that we've loaded the object header from the file */
@@ -340,18 +333,17 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
 
     /* Release the [possibly partially initialized] object header on errors */
-    if(!ret_value && oh)
-        if(H5O_free(oh) < 0)
-	    HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, NULL, "unable to destroy object header data")
+    if (!ret_value && oh)
+        if (H5O_free(oh) < 0)
+            HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, NULL, "unable to destroy object header data")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_flush
  *
@@ -366,7 +358,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSED addr, H5O_t *oh, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5O_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSED addr, H5O_t *oh,
+          unsigned H5_ATTR_UNUSED *flags_ptr)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
@@ -378,11 +371,11 @@ H5O_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSED addr,
     HDassert(oh);
 
     /* flush */
-    if(oh->cache_info.is_dirty) {
-        uint8_t	*p;             /* Pointer to object header prefix buffer */
+    if (oh->cache_info.is_dirty) {
+        uint8_t *p; /* Pointer to object header prefix buffer */
 
 #ifdef H5O_DEBUG
-H5O_assert(oh);
+        H5O_assert(oh);
 #endif /* H5O_DEBUG */
 
         /* Point to raw data 'image' for first chunk, which has room for the prefix */
@@ -392,8 +385,8 @@ H5O_assert(oh);
          * also require that chunk 0 always be updated, since the checksum
          * on the entire block of memory needs to be updated if anything is
          * modified */
-        if(oh->version > H5O_VERSION_1) {
-            uint64_t chunk0_size;       /* Size of chunk 0's data */
+        if (oh->version > H5O_VERSION_1) {
+            uint64_t chunk0_size; /* Size of chunk 0's data */
 
             HDassert(oh->chunk[0].size >= (size_t)H5O_SIZEOF_HDR(oh));
             chunk0_size = oh->chunk[0].size - (size_t)H5O_SIZEOF_HDR(oh);
@@ -409,7 +402,7 @@ H5O_assert(oh);
             *p++ = oh->flags;
 
             /* Time fields */
-            if(oh->flags & H5O_HDR_STORE_TIMES) {
+            if (oh->flags & H5O_HDR_STORE_TIMES) {
                 UINT32ENCODE(p, oh->atime);
                 UINT32ENCODE(p, oh->mtime);
                 UINT32ENCODE(p, oh->ctime);
@@ -417,37 +410,37 @@ H5O_assert(oh);
             } /* end if */
 
             /* Attribute fields */
-            if(oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
+            if (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
                 UINT16ENCODE(p, oh->max_compact);
                 UINT16ENCODE(p, oh->min_dense);
             } /* end if */
 
             /* First chunk size */
-            switch(oh->flags & H5O_HDR_CHUNK0_SIZE) {
-                case 0:     /* 1 byte size */
+            switch (oh->flags & H5O_HDR_CHUNK0_SIZE) {
+                case 0: /* 1 byte size */
                     HDassert(chunk0_size < 256);
                     *p++ = (uint8_t)chunk0_size;
                     break;
 
-                case 1:     /* 2 byte size */
+                case 1: /* 2 byte size */
                     HDassert(chunk0_size < 65536);
                     UINT16ENCODE(p, chunk0_size);
                     break;
 
-                case 2:     /* 4 byte size */
-		    /* use <= 2**32 -1 to stay within 4 bytes integer range */
+                case 2: /* 4 byte size */
+                        /* use <= 2**32 -1 to stay within 4 bytes integer range */
                     HDassert(chunk0_size <= 4294967295UL);
                     UINT32ENCODE(p, chunk0_size);
                     break;
 
-                case 3:     /* 8 byte size */
+                case 3: /* 8 byte size */
                     UINT64ENCODE(p, chunk0_size);
                     break;
 
                 default:
                     HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "bad size for chunk 0")
             } /* end switch */
-        } /* end if */
+        }     /* end if */
         else {
             /* Version */
             *p++ = oh->version;
@@ -457,7 +450,7 @@ H5O_assert(oh);
 
             /* Number of messages */
 #ifdef H5O_ENABLE_BAD_MESG_COUNT
-            if(oh->store_bad_mesg_count)
+            if (oh->store_bad_mesg_count)
                 UINT16ENCODE(p, (oh->nmesgs - 1))
             else
 #endif /* H5O_ENABLE_BAD_MESG_COUNT */
@@ -476,28 +469,28 @@ H5O_assert(oh);
         HDassert((size_t)(p - oh->chunk[0].image) == (size_t)(H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
 
         /* Serialize messages for this chunk */
-        if(H5O_chunk_serialize(f, oh, (unsigned)0) < 0)
+        if (H5O_chunk_serialize(f, oh, (unsigned)0) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL, "unable to serialize first object header chunk")
 
         /* Write the chunk out */
         HDassert(H5F_addr_defined(oh->chunk[0].addr));
-        if(H5F_block_write(f, H5FD_MEM_OHDR, oh->chunk[0].addr, oh->chunk[0].size, dxpl_id, oh->chunk[0].image) < 0)
+        if (H5F_block_write(f, H5FD_MEM_OHDR, oh->chunk[0].addr, oh->chunk[0].size, dxpl_id,
+                            oh->chunk[0].image) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to write object header chunk to disk")
 
         /* Mark object header as clean now */
-	oh->cache_info.is_dirty = FALSE;
+        oh->cache_info.is_dirty = FALSE;
     } /* end if */
 
     /* Destroy the object header, if requested */
-    if(destroy)
-        if(H5O_dest(f, oh) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data")
+    if (destroy)
+        if (H5O_dest(f, oh) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dest
  *
@@ -514,7 +507,7 @@ done:
 static herr_t
 H5O_dest(H5F_t *f, H5O_t *oh)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -529,22 +522,21 @@ H5O_dest(H5F_t *f, H5O_t *oh)
     HDassert(!oh->cache_info.free_file_space_on_destroy || H5F_addr_defined(oh->cache_info.addr));
 
     /* Check for releasing file space for object header */
-    if(oh->chunk && oh->cache_info.free_file_space_on_destroy) {
+    if (oh->chunk && oh->cache_info.free_file_space_on_destroy) {
         /* Free main (first) object header "chunk" */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_OHDR, H5AC_dxpl_id, oh->chunk[0].addr, (hsize_t)oh->chunk[0].size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_OHDR, H5AC_dxpl_id, oh->chunk[0].addr, (hsize_t)oh->chunk[0].size) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free object header")
     } /* end if */
 
     /* Destroy object header */
-    if(H5O_free(oh) < 0)
+    if (H5O_free(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't destroy object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_clear
  *
@@ -556,17 +548,17 @@ done:
  *		koziol@ncsa.uiuc.edu
  *		Mar 20 2003
  *
- * Changes:	In the parallel case, there is the possibility that the 
+ * Changes:	In the parallel case, there is the possibility that the
  *		the object header may be flushed by different processes
  *		over the life of the computation.  Thus we must ensure
  *		that the chunk images are up to date before we mark the
  *		messages clean -- as otherwise we may overwrite valid
  *		data with a blank section of a chunk image.
  *
- *		To deal with this, I have added code to call 
- *		H5O_chunk_serialize() for all chunks before we 
- *		mark all messages as clean if we are not destroying the 
- *		object.  Do this in the parallel case only, as the problem 
+ *		To deal with this, I have added code to call
+ *		H5O_chunk_serialize() for all chunks before we
+ *		mark all messages as clean if we are not destroying the
+ *		object.  Do this in the parallel case only, as the problem
  *		can only occur in this context.
  *
  *						JRM -- 10/12/10
@@ -576,8 +568,8 @@ done:
 static herr_t
 H5O_clear(H5F_t *f, H5O_t *oh, hbool_t destroy)
 {
-    unsigned	u;      /* Local index variable */
-    herr_t ret_value = SUCCEED;
+    unsigned u; /* Local index variable */
+    herr_t   ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -585,31 +577,30 @@ H5O_clear(H5F_t *f, H5O_t *oh, hbool_t destroy)
     HDassert(oh);
 
 #ifdef H5_HAVE_PARALLEL
-    if ( ( oh->cache_info.is_dirty ) && ( ! destroy ) ) {
+    if ((oh->cache_info.is_dirty) && (!destroy)) {
 
-	size_t i;
+        size_t i;
 
         /* scan through all chunks associated with the object header,
-	 * and cause them to update their images for all entries currently
- 	 * marked dirty.  Must do this in the parallel case, as it is possible
-	 * that this processor may clear this object header several times
-	 * before flushing it -- thus causing undefined sections of the image
-	 * to be written to disk overwriting valid data.
+         * and cause them to update their images for all entries currently
+         * marked dirty.  Must do this in the parallel case, as it is possible
+         * that this processor may clear this object header several times
+         * before flushing it -- thus causing undefined sections of the image
+         * to be written to disk overwriting valid data.
          */
 
-	for ( i = 0; i < oh->nchunks; i++ ) {
+        for (i = 0; i < oh->nchunks; i++) {
 
-            if ( H5O_chunk_serialize(f, oh, i) < 0 ) {
+            if (H5O_chunk_serialize(f, oh, i) < 0) {
 
-                HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL, 
-			    "unable to serialize object header chunk")
-	    }
+                HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL, "unable to serialize object header chunk")
+            }
         }
     }
 #endif /* H5_HAVE_PARALLEL */
 
     /* Mark messages as clean */
-    for(u = 0; u < oh->nmesgs; u++)
+    for (u = 0; u < oh->nmesgs; u++)
         oh->mesg[u].dirty = FALSE;
 
 #ifndef NDEBUG
@@ -620,15 +611,14 @@ H5O_clear(H5F_t *f, H5O_t *oh, hbool_t destroy)
     /* Mark whole header as clean */
     oh->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5O_dest(f, oh) < 0)
+    if (destroy)
+        if (H5O_dest(f, oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_size
  *
@@ -653,15 +643,14 @@ H5O_size(const H5F_t H5_ATTR_UNUSED *f, const H5O_t *oh, size_t *size_ptr)
     HDassert(size_ptr);
 
     /* Report the object header's prefix+first chunk length */
-    if(oh->chunk0_size)
-       *size_ptr = (size_t)H5O_SIZEOF_HDR(oh) + oh->chunk0_size;
+    if (oh->chunk0_size)
+        *size_ptr = (size_t)H5O_SIZEOF_HDR(oh) + oh->chunk0_size;
     else
-       *size_ptr = oh->chunk[0].size;
+        *size_ptr = oh->chunk[0].size;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5O_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_cache_chk_load
  *
@@ -679,12 +668,12 @@ H5O_size(const H5F_t H5_ATTR_UNUSED *f, const H5O_t *oh, size_t *size_ptr)
 static H5O_chunk_proxy_t *
 H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5O_chunk_proxy_t	*chk_proxy = NULL;     /* Chunk proxy object */
-    H5O_chk_cache_ud_t *udata = (H5O_chk_cache_ud_t *)_udata;       /* User data for callback */
-    H5WB_t      *wb = NULL;             /* Wrapped buffer for prefix data */
-    uint8_t     chunk_buf[H5O_SPEC_READ_SIZE];       /* Buffer for speculative read */
-    uint8_t     *buf;                   /* Buffer to decode */
-    H5O_chunk_proxy_t	*ret_value;     /* Return value */
+    H5O_chunk_proxy_t * chk_proxy = NULL;                         /* Chunk proxy object */
+    H5O_chk_cache_ud_t *udata     = (H5O_chk_cache_ud_t *)_udata; /* User data for callback */
+    H5WB_t *            wb        = NULL;                         /* Wrapped buffer for prefix data */
+    uint8_t             chunk_buf[H5O_SPEC_READ_SIZE];            /* Buffer for speculative read */
+    uint8_t *           buf;                                      /* Buffer to decode */
+    H5O_chunk_proxy_t * ret_value;                                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -695,34 +684,35 @@ H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata->oh);
 
     /* Allocate space for the object header data structure */
-    if(NULL == (chk_proxy = H5FL_CALLOC(H5O_chunk_proxy_t)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "memory allocation failed")
+    if (NULL == (chk_proxy = H5FL_CALLOC(H5O_chunk_proxy_t)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "memory allocation failed")
 
     /* Wrap the local buffer for serialized header info */
-    if(NULL == (wb = H5WB_wrap(chunk_buf, sizeof(chunk_buf))))
+    if (NULL == (wb = H5WB_wrap(chunk_buf, sizeof(chunk_buf))))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't wrap buffer")
 
     /* Get a pointer to a buffer that's large enough for serialized header */
-    if(NULL == (buf = (uint8_t *)H5WB_actual(wb, udata->size)))
+    if (NULL == (buf = (uint8_t *)H5WB_actual(wb, udata->size)))
         HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, NULL, "can't get actual buffer")
 
     /* Read rest of the raw data */
-    if(H5F_block_read(f, H5FD_MEM_OHDR, addr, udata->size, dxpl_id, buf) < 0)
+    if (H5F_block_read(f, H5FD_MEM_OHDR, addr, udata->size, dxpl_id, buf) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read object header continuation chunk")
 
     /* Check if we are still decoding the object header */
     /* (as opposed to bringing a piece of it back from the file) */
-    if(udata->decoding) {
+    if (udata->decoding) {
         /* Sanity check */
         HDassert(udata->common.f);
         HDassert(udata->common.cont_msg_info);
 
         /* Parse the chunk */
-        if(H5O_chunk_deserialize(udata->oh, udata->common.addr, udata->size, buf, &(udata->common), &chk_proxy->cache_info.is_dirty) < 0)
+        if (H5O_chunk_deserialize(udata->oh, udata->common.addr, udata->size, buf, &(udata->common),
+                                  &chk_proxy->cache_info.is_dirty) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't deserialize object header chunk")
 
         /* Set the fields for the chunk proxy */
-        chk_proxy->oh = udata->oh;
+        chk_proxy->oh      = udata->oh;
         chk_proxy->chunkno = udata->oh->nchunks - 1;
     } /* end if */
     else {
@@ -730,17 +720,18 @@ H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
         HDassert(udata->chunkno < udata->oh->nchunks);
 
         /* Set the fields for the chunk proxy */
-        chk_proxy->oh = udata->oh;
+        chk_proxy->oh      = udata->oh;
         chk_proxy->chunkno = udata->chunkno;
 
         /* Sanity check that the chunk representation we have in memory is the same
          *      as the one being brought in from disk.
          */
-        HDassert(0 == HDmemcmp(buf, chk_proxy->oh->chunk[chk_proxy->chunkno].image, chk_proxy->oh->chunk[chk_proxy->chunkno].size));
+        HDassert(0 == HDmemcmp(buf, chk_proxy->oh->chunk[chk_proxy->chunkno].image,
+                               chk_proxy->oh->chunk[chk_proxy->chunkno].size));
     } /* end else */
 
     /* Increment reference count of object header */
-    if(H5O_inc_rc(udata->oh) < 0)
+    if (H5O_inc_rc(udata->oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, NULL, "can't increment reference count on object header")
 
     /* Set return value */
@@ -748,18 +739,17 @@ H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
 
     /* Release the [possibly partially initialized] object header on errors */
-    if(!ret_value && chk_proxy)
-        if(H5O_chunk_proxy_dest(chk_proxy) < 0)
-	    HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, NULL, "unable to destroy object header chunk proxy")
+    if (!ret_value && chk_proxy)
+        if (H5O_chunk_proxy_dest(chk_proxy) < 0)
+            HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, NULL, "unable to destroy object header chunk proxy")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_cache_chk_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_cache_chk_flush
  *
@@ -774,39 +764,42 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_cache_chk_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
-    H5O_chunk_proxy_t *chk_proxy, unsigned H5_ATTR_UNUSED * flags_ptr)
+H5O_cache_chk_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5O_chunk_proxy_t *chk_proxy,
+                    unsigned H5_ATTR_UNUSED *flags_ptr)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* flush */
-    if(chk_proxy->cache_info.is_dirty) {
+    if (chk_proxy->cache_info.is_dirty) {
         /* Serialize messages for this chunk */
-        if(H5O_chunk_serialize(f, chk_proxy->oh, chk_proxy->chunkno) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL, "unable to serialize object header continuation chunk")
+        if (H5O_chunk_serialize(f, chk_proxy->oh, chk_proxy->chunkno) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL,
+                        "unable to serialize object header continuation chunk")
 
         /* Write the chunk out */
         HDassert(H5F_addr_defined(chk_proxy->oh->chunk[chk_proxy->chunkno].addr));
         HDassert(H5F_addr_eq(addr, chk_proxy->oh->chunk[chk_proxy->chunkno].addr));
-        if(H5F_block_write(f, H5FD_MEM_OHDR, addr, chk_proxy->oh->chunk[chk_proxy->chunkno].size, dxpl_id, chk_proxy->oh->chunk[chk_proxy->chunkno].image) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to write object header continuation chunk to disk")
+        if (H5F_block_write(f, H5FD_MEM_OHDR, addr, chk_proxy->oh->chunk[chk_proxy->chunkno].size, dxpl_id,
+                            chk_proxy->oh->chunk[chk_proxy->chunkno].image) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL,
+                        "unable to write object header continuation chunk to disk")
 
         /* Mark object header as clean now */
-	chk_proxy->cache_info.is_dirty = FALSE;
+        chk_proxy->cache_info.is_dirty = FALSE;
     } /* end if */
 
     /* Destroy the object header, if requested */
-    if(destroy)
-        if(H5O_cache_chk_dest(f, chk_proxy) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header continuation chunk data")
+    if (destroy)
+        if (H5O_cache_chk_dest(f, chk_proxy) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL,
+                        "unable to destroy object header continuation chunk data")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_cache_chk_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_cache_chk_dest
  *
@@ -823,7 +816,7 @@ done:
 static herr_t
 H5O_cache_chk_dest(H5F_t *f, H5O_chunk_proxy_t *chk_proxy)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -835,25 +828,26 @@ H5O_cache_chk_dest(H5F_t *f, H5O_chunk_proxy_t *chk_proxy)
     HDassert(chk_proxy->cache_info.is_dirty == FALSE);
 
     /* If we're going to free the space on disk, the address must be valid */
-    HDassert(!chk_proxy->cache_info.free_file_space_on_destroy || H5F_addr_defined(chk_proxy->cache_info.addr));
+    HDassert(!chk_proxy->cache_info.free_file_space_on_destroy ||
+             H5F_addr_defined(chk_proxy->cache_info.addr));
 
     /* Check for releasing file space for object header */
-    if(chk_proxy->cache_info.free_file_space_on_destroy) {
+    if (chk_proxy->cache_info.free_file_space_on_destroy) {
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_OHDR, H5AC_dxpl_id, chk_proxy->oh->chunk[chk_proxy->chunkno].addr, (hsize_t)chk_proxy->oh->chunk[chk_proxy->chunkno].size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_OHDR, H5AC_dxpl_id, chk_proxy->oh->chunk[chk_proxy->chunkno].addr,
+                       (hsize_t)chk_proxy->oh->chunk[chk_proxy->chunkno].size) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free object header continuation chunk")
     } /* end if */
 
     /* Destroy object header chunk proxy */
-    if(H5O_chunk_proxy_dest(chk_proxy) < 0)
+    if (H5O_chunk_proxy_dest(chk_proxy) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "unable to destroy object header chunk proxy")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_cache_chk_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_cache_chk_clear
  *
@@ -865,26 +859,26 @@ done:
  *              koziol@hdfgroup.org
  *              July 12, 2008
  *
- * Changes:	In the parallel case, there is the possibility that the 
- *		the object header chunk may be flushed by different 
- *		processes over the life of the computation.  Thus we must 
+ * Changes:	In the parallel case, there is the possibility that the
+ *		the object header chunk may be flushed by different
+ *		processes over the life of the computation.  Thus we must
  *		ensure that the chunk image is up to date before we mark its
  *		messages clean -- as otherwise we may overwrite valid
  *		data with a blank section of a chunk image.
  *
- *		To deal with this, I have added code to call 
- *		H5O_chunk_serialize() for this chunk before we 
- *		mark all messages as clean if we are not destroying the 
+ *		To deal with this, I have added code to call
+ *		H5O_chunk_serialize() for this chunk before we
+ *		mark all messages as clean if we are not destroying the
  *		chunk.
  *
- *		Do this in the parallel case only, as the problem 
+ *		Do this in the parallel case only, as the problem
  *		can only occur in this context.
  *
  *		Note that at present at least, it seems that this fix
- *		is not necessary, as we don't seem to be able to 
+ *		is not necessary, as we don't seem to be able to
  *		generate a dirty chunk without creating a dirty object
  *		header.  However, the object header code will be changing
- *		a lot in the near future, so I'll leave this fix in 
+ *		a lot in the near future, so I'll leave this fix in
  *		for now, unless Quincey requests otherwise.
  *
  *						JRM -- 10/12/10
@@ -894,8 +888,8 @@ done:
 static herr_t
 H5O_cache_chk_clear(H5F_t *f, H5O_chunk_proxy_t *chk_proxy, hbool_t destroy)
 {
-    unsigned	u;      /* Local index variable */
-    herr_t ret_value = SUCCEED;
+    unsigned u; /* Local index variable */
+    herr_t   ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -903,33 +897,32 @@ H5O_cache_chk_clear(H5F_t *f, H5O_chunk_proxy_t *chk_proxy, hbool_t destroy)
     HDassert(chk_proxy);
 
 #ifdef H5_HAVE_PARALLEL
-    if ( ( chk_proxy->oh->cache_info.is_dirty ) && ( ! destroy ) ) {
+    if ((chk_proxy->oh->cache_info.is_dirty) && (!destroy)) {
 
-        if ( H5O_chunk_serialize(f, chk_proxy->oh, chk_proxy->chunkno) < 0 ) {
+        if (H5O_chunk_serialize(f, chk_proxy->oh, chk_proxy->chunkno) < 0) {
 
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL, 
-                       "unable to serialize object header chunk")
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL, "unable to serialize object header chunk")
         }
     }
 #endif /* H5_HAVE_PARALLEL */
 
     /* Mark messages in chunk as clean */
-    for(u = 0; u < chk_proxy->oh->nmesgs; u++)
-        if(chk_proxy->oh->mesg[u].chunkno == chk_proxy->chunkno)
+    for (u = 0; u < chk_proxy->oh->nmesgs; u++)
+        if (chk_proxy->oh->mesg[u].chunkno == chk_proxy->chunkno)
             chk_proxy->oh->mesg[u].dirty = FALSE;
 
     /* Mark as clean */
     chk_proxy->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5O_cache_chk_dest(f, chk_proxy) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header continuation chunk data")
+    if (destroy)
+        if (H5O_cache_chk_dest(f, chk_proxy) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL,
+                        "unable to destroy object header continuation chunk data")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_cache_chk_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_cache_chk_size
  *
@@ -960,7 +953,6 @@ H5O_cache_chk_size(const H5F_t H5_ATTR_UNUSED *f, const H5O_chunk_proxy_t *chk_p
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5O_cache_chk_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_add_cont_msg
  *
@@ -989,27 +981,26 @@ H5O_add_cont_msg(H5O_cont_msgs_t *cont_msg_info, const H5O_cont_t *cont)
     HDassert(cont);
 
     /* Increase chunk array size, if necessary */
-    if(cont_msg_info->nmsgs >= cont_msg_info->alloc_nmsgs) {
-        size_t na = MAX(H5O_NCHUNKS, cont_msg_info->alloc_nmsgs * 2);        /* Double # of messages allocated */
+    if (cont_msg_info->nmsgs >= cont_msg_info->alloc_nmsgs) {
+        size_t na = MAX(H5O_NCHUNKS, cont_msg_info->alloc_nmsgs * 2); /* Double # of messages allocated */
         H5O_cont_t *x;
 
-        if(NULL == (x = H5FL_SEQ_REALLOC(H5O_cont_t, cont_msg_info->msgs, na)))
+        if (NULL == (x = H5FL_SEQ_REALLOC(H5O_cont_t, cont_msg_info->msgs, na)))
             HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, FAIL, "memory allocation failed")
         cont_msg_info->alloc_nmsgs = na;
-        cont_msg_info->msgs = x;
+        cont_msg_info->msgs        = x;
     } /* end if */
 
     /* Init the continuation message info */
-    contno = cont_msg_info->nmsgs++;
-    cont_msg_info->msgs[contno].addr = cont->addr;
-    cont_msg_info->msgs[contno].size = cont->size;
+    contno                              = cont_msg_info->nmsgs++;
+    cont_msg_info->msgs[contno].addr    = cont->addr;
+    cont_msg_info->msgs[contno].size    = cont->size;
     cont_msg_info->msgs[contno].chunkno = cont->chunkno;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_add_cont_msg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_deserialize
  *
@@ -1025,17 +1016,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
-    H5O_common_cache_ud_t *udata, hbool_t *dirty)
+H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image, H5O_common_cache_ud_t *udata,
+                      hbool_t *dirty)
 {
-    const uint8_t *p;           /* Pointer into buffer to decode */
-    uint8_t *eom_ptr;           /* Pointer to end of messages for a chunk */
-    size_t curmesg;             /* Current message being decoded in object header */
-    unsigned merged_null_msgs = 0;  /* Number of null messages merged together */
-    unsigned chunkno;           /* Current chunk's index */
+    const uint8_t *p;                    /* Pointer into buffer to decode */
+    uint8_t *      eom_ptr;              /* Pointer to end of messages for a chunk */
+    size_t         curmesg;              /* Current message being decoded in object header */
+    unsigned       merged_null_msgs = 0; /* Number of null messages merged together */
+    unsigned       chunkno;              /* Current chunk's index */
 #ifndef NDEBUG
     unsigned nullcnt;           /* Count of null messages (for sanity checking gaps in chunks) */
-#endif /* NDEBUG */
+#endif                          /* NDEBUG */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -1048,20 +1039,20 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
     HDassert(udata->cont_msg_info);
 
     /* Increase chunk array size, if necessary */
-    if(oh->nchunks >= oh->alloc_nchunks) {
-        size_t na = MAX(H5O_NCHUNKS, oh->alloc_nchunks * 2);        /* Double # of chunks allocated */
+    if (oh->nchunks >= oh->alloc_nchunks) {
+        size_t       na = MAX(H5O_NCHUNKS, oh->alloc_nchunks * 2); /* Double # of chunks allocated */
         H5O_chunk_t *x;
 
-        if(NULL == (x = H5FL_SEQ_REALLOC(H5O_chunk_t, oh->chunk, na)))
+        if (NULL == (x = H5FL_SEQ_REALLOC(H5O_chunk_t, oh->chunk, na)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, FAIL, "memory allocation failed")
         oh->alloc_nchunks = na;
-        oh->chunk = x;
+        oh->chunk         = x;
     } /* end if */
 
     /* Init the chunk data info */
-    chunkno = oh->nchunks++;
+    chunkno                = oh->nchunks++;
     oh->chunk[chunkno].gap = 0;
-    if(chunkno == 0) {
+    if (chunkno == 0) {
         /* First chunk's 'image' includes room for the object header prefix */
         oh->chunk[0].addr = addr;
         oh->chunk[0].size = len + (size_t)H5O_SIZEOF_HDR(oh);
@@ -1070,7 +1061,7 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
         oh->chunk[chunkno].addr = addr;
         oh->chunk[chunkno].size = len;
     } /* end else */
-    if(NULL == (oh->chunk[chunkno].image = H5FL_BLK_MALLOC(chunk_image, oh->chunk[chunkno].size)))
+    if (NULL == (oh->chunk[chunkno].image = H5FL_BLK_MALLOC(chunk_image, oh->chunk[chunkno].size)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
     /* Copy disk image into chunk's image */
@@ -1080,13 +1071,13 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
     p = oh->chunk[chunkno].image;
 
     /* Handle chunk 0 as special case */
-    if(chunkno == 0)
+    if (chunkno == 0)
         /* Skip over [already decoded] prefix */
         p += (size_t)(H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh));
     /* Check for magic # on chunks > 0 in later versions of the format */
-    else if(chunkno > 0 && oh->version > H5O_VERSION_1) {
+    else if (chunkno > 0 && oh->version > H5O_VERSION_1) {
         /* Magic number */
-        if(HDmemcmp(p, H5O_CHK_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        if (HDmemcmp(p, H5O_CHK_MAGIC, (size_t)H5_SIZEOF_MAGIC))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "wrong object header chunk signature")
         p += H5_SIZEOF_MAGIC;
     } /* end if */
@@ -1099,17 +1090,17 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
 #ifndef NDEBUG
     nullcnt = 0;
 #endif /* NDEBUG */
-    while(p < eom_ptr) {
-        size_t mesgno;          /* Current message to operate on */
-        size_t mesg_size;       /* Size of message read in */
-        unsigned id;            /* ID (type) of current message */
-        uint8_t	flags;          /* Flags for current message */
-        H5O_msg_crt_idx_t crt_idx = 0;  /* Creation index for current message */
+    while (p < eom_ptr) {
+        size_t            mesgno;      /* Current message to operate on */
+        size_t            mesg_size;   /* Size of message read in */
+        unsigned          id;          /* ID (type) of current message */
+        uint8_t           flags;       /* Flags for current message */
+        H5O_msg_crt_idx_t crt_idx = 0; /* Creation index for current message */
 
         /* Decode message prefix info */
 
         /* Version # */
-        if(oh->version == H5O_VERSION_1)
+        if (oh->version == H5O_VERSION_1)
             UINT16DECODE(p, id)
         else
             id = *p++;
@@ -1120,44 +1111,42 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
 
         /* Message flags */
         flags = *p++;
-        if(flags & ~H5O_MSG_FLAG_BITS)
+        if (flags & ~H5O_MSG_FLAG_BITS)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unknown flag for message")
-        if((flags & H5O_MSG_FLAG_SHARED) && (flags & H5O_MSG_FLAG_DONTSHARE))
+        if ((flags & H5O_MSG_FLAG_SHARED) && (flags & H5O_MSG_FLAG_DONTSHARE))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination for message")
-        if((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && (flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE))
+        if ((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && (flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination for message")
-        if((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && !(flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN))
+        if ((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && !(flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination for message")
         /* Delay checking the "shareable" flag until we've made sure id
          * references a valid message class that this version of the library
          * knows about */
 
         /* Reserved bytes/creation index */
-        if(oh->version == H5O_VERSION_1)
+        if (oh->version == H5O_VERSION_1)
             p += 3; /*reserved*/
         else {
             /* Only decode creation index if they are being tracked */
-            if(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)
+            if (oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)
                 UINT16DECODE(p, crt_idx);
         } /* end else */
 
         /* Try to detect invalidly formatted object header message that
          *  extends past end of chunk.
          */
-        if(p + mesg_size > eom_ptr)
+        if (p + mesg_size > eom_ptr)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "corrupt object header")
 
 #ifndef NDEBUG
         /* Increment count of null messages */
-        if(H5O_NULL_ID == id)
+        if (H5O_NULL_ID == id)
             nullcnt++;
 #endif /* NDEBUG */
 
         /* Check for combining two adjacent 'null' messages */
-        if((udata->file_intent & H5F_ACC_RDWR) &&
-                H5O_NULL_ID == id && oh->nmesgs > 0 &&
-                H5O_NULL_ID == oh->mesg[oh->nmesgs - 1].type->id &&
-                oh->mesg[oh->nmesgs - 1].chunkno == chunkno) {
+        if ((udata->file_intent & H5F_ACC_RDWR) && H5O_NULL_ID == id && oh->nmesgs > 0 &&
+            H5O_NULL_ID == oh->mesg[oh->nmesgs - 1].type->id && oh->mesg[oh->nmesgs - 1].chunkno == chunkno) {
 
             /* Combine adjacent null messages */
             mesgno = oh->nmesgs - 1;
@@ -1168,34 +1157,34 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
         } /* end if */
         else {
             /* Check if we need to extend message table to hold the new message */
-            if(oh->nmesgs >= oh->alloc_nmesgs)
-                if(H5O_alloc_msgs(oh, (size_t)1) < 0)
+            if (oh->nmesgs >= oh->alloc_nmesgs)
+                if (H5O_alloc_msgs(oh, (size_t)1) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, FAIL, "can't allocate more space for messages")
 
             /* Get index for message */
             mesgno = oh->nmesgs++;
 
             /* Initialize information about message */
-            oh->mesg[mesgno].dirty = FALSE;
-            oh->mesg[mesgno].flags = flags;
-            oh->mesg[mesgno].crt_idx = crt_idx;
-            oh->mesg[mesgno].native = NULL;
-            oh->mesg[mesgno].raw = (uint8_t *)p;        /* Casting away const OK - QAK */
+            oh->mesg[mesgno].dirty    = FALSE;
+            oh->mesg[mesgno].flags    = flags;
+            oh->mesg[mesgno].crt_idx  = crt_idx;
+            oh->mesg[mesgno].native   = NULL;
+            oh->mesg[mesgno].raw      = (uint8_t *)p; /* Casting away const OK - QAK */
             oh->mesg[mesgno].raw_size = mesg_size;
-            oh->mesg[mesgno].chunkno = chunkno;
+            oh->mesg[mesgno].chunkno  = chunkno;
 
             /* Point unknown messages at 'unknown' message class */
             /* (Usually from future versions of the library) */
-            if(id >= H5O_UNKNOWN_ID ||
+            if (id >= H5O_UNKNOWN_ID ||
 #ifdef H5O_ENABLE_BOGUS
-               id == H5O_BOGUS_VALID_ID ||
+                id == H5O_BOGUS_VALID_ID ||
 #endif
-               NULL == H5O_msg_class_g[id]) {
+                NULL == H5O_msg_class_g[id]) {
 
-                H5O_unknown_t *unknown;     /* Pointer to "unknown" message info */
+                H5O_unknown_t *unknown; /* Pointer to "unknown" message info */
 
                 /* Allocate "unknown" message info */
-                if(NULL == (unknown = H5FL_MALLOC(H5O_unknown_t)))
+                if (NULL == (unknown = H5FL_MALLOC(H5O_unknown_t)))
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
                 /* Save the original message type ID */
@@ -1208,13 +1197,13 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
                 oh->mesg[mesgno].type = H5O_msg_class_g[H5O_UNKNOWN_ID];
 
                 /* Check for "fail if unknown" message flag */
-                if((udata->file_intent & H5F_ACC_RDWR) && 
-                   (flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE))
-                    HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "unknown message with 'fail if unknown' flag found")
+                if ((udata->file_intent & H5F_ACC_RDWR) &&
+                    (flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE))
+                    HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL,
+                                "unknown message with 'fail if unknown' flag found")
                 /* Check for "mark if unknown" message flag, etc. */
-                else if((flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN) &&
-                        !(flags & H5O_MSG_FLAG_WAS_UNKNOWN) &&
-                        (udata->file_intent & H5F_ACC_RDWR)) {
+                else if ((flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN) && !(flags & H5O_MSG_FLAG_WAS_UNKNOWN) &&
+                         (udata->file_intent & H5F_ACC_RDWR)) {
 
                     /* Mark the message as "unknown" */
                     /* This is a bit aggressive, since the application may
@@ -1231,28 +1220,28 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
 
                     /* Mark the message and chunk as dirty */
                     oh->mesg[mesgno].dirty = TRUE;
-                    udata->mesgs_modified = TRUE;
-                    *dirty = TRUE;
+                    udata->mesgs_modified  = TRUE;
+                    *dirty                 = TRUE;
                 } /* end if */
-            } /* end if */
+            }     /* end if */
             else {
                 /* Check for message of unshareable class marked as "shareable"
                  */
-                if((flags & H5O_MSG_FLAG_SHAREABLE)
-                        && H5O_msg_class_g[id]
-                        && !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE))
-                    HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message of unshareable class flagged as shareable")
+                if ((flags & H5O_MSG_FLAG_SHAREABLE) && H5O_msg_class_g[id] &&
+                    !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE))
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL,
+                                "message of unshareable class flagged as shareable")
 
                 /* Set message class for "known" messages */
                 oh->mesg[mesgno].type = H5O_msg_class_g[id];
             } /* end else */
-        } /* end else */
+        }     /* end else */
 
         /* Advance decode pointer past message */
         p += mesg_size;
 
         /* Check for 'gap' at end of chunk */
-        if((eom_ptr - p) > 0 && (eom_ptr - p) < H5O_SIZEOF_MSGHDR_OH(oh)) {
+        if ((eom_ptr - p) > 0 && (eom_ptr - p) < H5O_SIZEOF_MSGHDR_OH(oh)) {
             /* Gaps can only occur in later versions of the format */
             HDassert(oh->version > H5O_VERSION_1);
 
@@ -1265,21 +1254,22 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
             /* Increment location in chunk */
             p += oh->chunk[chunkno].gap;
         } /* end if */
-    } /* end while */
+    }     /* end while */
 
     /* Check for correct checksum on chunks, in later versions of the format */
-    if(oh->version > H5O_VERSION_1) {
-        uint32_t stored_chksum;     /* Checksum from file */
-        uint32_t computed_chksum;   /* Checksum computed in memory */
+    if (oh->version > H5O_VERSION_1) {
+        uint32_t stored_chksum;   /* Checksum from file */
+        uint32_t computed_chksum; /* Checksum computed in memory */
 
         /* Metadata checksum */
         UINT32DECODE(p, stored_chksum);
 
         /* Compute checksum on chunk */
-        computed_chksum = H5_checksum_metadata(oh->chunk[chunkno].image, (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM), 0);
+        computed_chksum =
+            H5_checksum_metadata(oh->chunk[chunkno].image, (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM), 0);
 
         /* Verify checksum */
-        if(stored_chksum != computed_chksum)
+        if (stored_chksum != computed_chksum)
             HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "incorrect metadata checksum for object header chunk")
     } /* end if */
 
@@ -1288,60 +1278,63 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
 
     /* Do some inspection/interpretation of new messages from this chunk */
     /* (detect continuation messages, ref. count messages, etc.) */
-    while(curmesg < oh->nmesgs) {
+    while (curmesg < oh->nmesgs) {
         /* Check if next message to examine is a continuation message */
-        if(H5O_CONT_ID == oh->mesg[curmesg].type->id) {
+        if (H5O_CONT_ID == oh->mesg[curmesg].type->id) {
             H5O_cont_t *cont;
-            unsigned ioflags = 0;   /* Flags for decode routine */
+            unsigned    ioflags = 0; /* Flags for decode routine */
 
             /* Decode continuation message */
-            cont = (H5O_cont_t *)(H5O_MSG_CONT->decode)(udata->f, udata->dxpl_id, NULL, 0, &ioflags, oh->mesg[curmesg].raw_size, oh->mesg[curmesg].raw);
-            cont->chunkno = udata->cont_msg_info->nmsgs + 1;	/*the next continuation message/chunk */
+            cont          = (H5O_cont_t *)(H5O_MSG_CONT->decode)(udata->f, udata->dxpl_id, NULL, 0, &ioflags,
+                                                        oh->mesg[curmesg].raw_size, oh->mesg[curmesg].raw);
+            cont->chunkno = udata->cont_msg_info->nmsgs + 1; /*the next continuation message/chunk */
 
             /* Save 'native' form of continuation message */
             oh->mesg[curmesg].native = cont;
 
             /* Add to continuation messages left to interpret */
-            if(H5O_add_cont_msg(udata->cont_msg_info, cont) < 0)
+            if (H5O_add_cont_msg(udata->cont_msg_info, cont) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't add continuation message")
 
             /* Mark the message & chunk as dirty if the message was changed by decoding */
-            if((ioflags & H5O_DECODEIO_DIRTY) && (udata->file_intent & H5F_ACC_RDWR)) {
+            if ((ioflags & H5O_DECODEIO_DIRTY) && (udata->file_intent & H5F_ACC_RDWR)) {
                 oh->mesg[curmesg].dirty = TRUE;
-                udata->mesgs_modified = TRUE;
-                *dirty = TRUE;
+                udata->mesgs_modified   = TRUE;
+                *dirty                  = TRUE;
             } /* end if */
-        } /* end if */
+        }     /* end if */
         /* Check if next message to examine is a ref. count message */
-        else if(H5O_REFCOUNT_ID == oh->mesg[curmesg].type->id) {
+        else if (H5O_REFCOUNT_ID == oh->mesg[curmesg].type->id) {
             H5O_refcount_t *refcount;
-            unsigned ioflags = 0;   /* Flags for decode routine */
+            unsigned        ioflags = 0; /* Flags for decode routine */
 
             /* Decode ref. count message */
             HDassert(oh->version > H5O_VERSION_1);
-            refcount = (H5O_refcount_t *)(H5O_MSG_REFCOUNT->decode)(udata->f, udata->dxpl_id, NULL, 0, &ioflags, oh->mesg[curmesg].raw_size, oh->mesg[curmesg].raw);
+            refcount = (H5O_refcount_t *)(H5O_MSG_REFCOUNT->decode)(udata->f, udata->dxpl_id, NULL, 0,
+                                                                    &ioflags, oh->mesg[curmesg].raw_size,
+                                                                    oh->mesg[curmesg].raw);
 
             /* Save 'native' form of ref. count message */
             oh->mesg[curmesg].native = refcount;
 
             /* Set object header values */
             oh->has_refcount_msg = TRUE;
-            oh->nlink = *refcount;
+            oh->nlink            = *refcount;
 
             /* Mark the message & chunk as dirty if the message was changed by decoding */
-            if((ioflags & H5O_DECODEIO_DIRTY) && (udata->file_intent & H5F_ACC_RDWR)) {
+            if ((ioflags & H5O_DECODEIO_DIRTY) && (udata->file_intent & H5F_ACC_RDWR)) {
                 oh->mesg[curmesg].dirty = TRUE;
-                udata->mesgs_modified = TRUE;
-                *dirty = TRUE;
+                udata->mesgs_modified   = TRUE;
+                *dirty                  = TRUE;
             } /* end if */
-        } /* end if */
+        }     /* end if */
         /* Check if next message to examine is a link message */
-        else if(H5O_LINK_ID == oh->mesg[curmesg].type->id) {
+        else if (H5O_LINK_ID == oh->mesg[curmesg].type->id) {
             /* Increment the count of link messages */
             oh->link_msgs_seen++;
         } /* end if */
         /* Check if next message to examine is an attribute message */
-        else if(H5O_ATTR_ID == oh->mesg[curmesg].type->id) {
+        else if (H5O_ATTR_ID == oh->mesg[curmesg].type->id) {
             /* Increment the count of attribute messages */
             oh->attr_msgs_seen++;
         } /* end if */
@@ -1351,16 +1344,15 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
     } /* end while */
 
     /* Mark the chunk dirty if we've merged null messages */
-    if(merged_null_msgs) {
+    if (merged_null_msgs) {
         udata->mesgs_modified = TRUE;
-	*dirty = TRUE;
+        *dirty                = TRUE;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_chunk_deserialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_serialize
  *
@@ -1378,9 +1370,9 @@ done:
 static herr_t
 H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno)
 {
-    H5O_mesg_t *curr_msg;       /* Pointer to current message being operated on */
-    unsigned	u;              /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_mesg_t *curr_msg;            /* Pointer to current message being operated on */
+    unsigned    u;                   /* Local index variable */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1389,32 +1381,35 @@ H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno)
     HDassert(oh);
 
     /* Encode any dirty messages in this chunk */
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++)
-        if(curr_msg->dirty && curr_msg->chunkno == chunkno)
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++)
+        if (curr_msg->dirty && curr_msg->chunkno == chunkno)
             /* Casting away const OK -QAK */
-            if(H5O_msg_flush((H5F_t *)f, oh, curr_msg) < 0)
+            if (H5O_msg_flush((H5F_t *)f, oh, curr_msg) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode object header message")
 
     /* Sanity checks */
-    if(oh->version > H5O_VERSION_1)
+    if (oh->version > H5O_VERSION_1)
         /* Make certain the magic # is present */
-        HDassert(!HDmemcmp(oh->chunk[chunkno].image, (chunkno == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), H5_SIZEOF_MAGIC));
+        HDassert(!HDmemcmp(oh->chunk[chunkno].image, (chunkno == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC),
+                           H5_SIZEOF_MAGIC));
     else
         /* Gaps should never occur in version 1 of the format */
         HDassert(oh->chunk[chunkno].gap == 0);
 
     /* Extra work, for later versions of the format */
-    if(oh->version > H5O_VERSION_1) {
-        uint32_t metadata_chksum;   /* Computed metadata checksum value */
-        uint8_t	*p;                 /* Pointer into object header chunk */
+    if (oh->version > H5O_VERSION_1) {
+        uint32_t metadata_chksum; /* Computed metadata checksum value */
+        uint8_t *p;               /* Pointer into object header chunk */
 
         /* Check for gap in chunk & zero it out */
-        if(oh->chunk[chunkno].gap)
+        if (oh->chunk[chunkno].gap)
             HDmemset((oh->chunk[chunkno].image + oh->chunk[chunkno].size) -
-                (H5O_SIZEOF_CHKSUM + oh->chunk[chunkno].gap), 0, oh->chunk[chunkno].gap);
+                         (H5O_SIZEOF_CHKSUM + oh->chunk[chunkno].gap),
+                     0, oh->chunk[chunkno].gap);
 
         /* Compute metadata checksum */
-        metadata_chksum = H5_checksum_metadata(oh->chunk[chunkno].image, (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM), 0);
+        metadata_chksum =
+            H5_checksum_metadata(oh->chunk[chunkno].image, (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM), 0);
 
         /* Metadata checksum */
         p = oh->chunk[chunkno].image + (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM);
@@ -1425,7 +1420,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_chunk_serialize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_proxy_dest
  *
@@ -1451,7 +1445,7 @@ H5O_chunk_proxy_dest(H5O_chunk_proxy_t *chk_proxy)
     HDassert(chk_proxy);
 
     /* Decrement reference count of object header */
-    if(chk_proxy->oh && H5O_dec_rc(chk_proxy->oh) < 0)
+    if (chk_proxy->oh && H5O_dec_rc(chk_proxy->oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "can't decrement reference count on object header")
 
     /* Release the chunk proxy object */
@@ -1460,4 +1454,3 @@ H5O_chunk_proxy_dest(H5O_chunk_proxy_t *chk_proxy)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_chunk_proxy_dest() */
-
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c
index 5e62c8c..10320e7 100644
--- a/src/H5Ochunk.c
+++ b/src/H5Ochunk.c
@@ -26,36 +26,31 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Opkg.h"             /* Object headers			*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Opkg.h"     /* Object headers			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -63,18 +58,14 @@
 /* Declare the free list for H5O_chunk_proxy_t's */
 H5FL_DEFINE(H5O_chunk_proxy_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_add
  *
@@ -92,8 +83,8 @@ H5FL_DEFINE(H5O_chunk_proxy_t);
 herr_t
 H5O_chunk_add(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;       /* Proxy for chunk, to mark it dirty in the cache */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_chunk_proxy_t *chk_proxy = NULL;    /* Proxy for chunk, to mark it dirty in the cache */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -104,31 +95,30 @@ H5O_chunk_add(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     HDassert(idx > 0);
 
     /* Allocate space for the object header data structure */
-    if(NULL == (chk_proxy = H5FL_CALLOC(H5O_chunk_proxy_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    if (NULL == (chk_proxy = H5FL_CALLOC(H5O_chunk_proxy_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Set the values in the chunk proxy */
-    chk_proxy->oh = oh;
+    chk_proxy->oh      = oh;
     chk_proxy->chunkno = idx;
 
     /* Increment reference count on object header */
-    if(H5O_inc_rc(oh) < 0)
+    if (H5O_inc_rc(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, FAIL, "can't increment reference count on object header")
 
     /* Insert the chunk proxy into the cache */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, chk_proxy, H5AC__NO_FLAGS_SET) < 0)
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, chk_proxy, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header chunk")
     chk_proxy = NULL;
 
 done:
-    if(ret_value < 0)
-        if(chk_proxy)
+    if (ret_value < 0)
+        if (chk_proxy)
             chk_proxy = H5FL_FREE(H5O_chunk_proxy_t, chk_proxy);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_chunk_add() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_protect
  *
@@ -146,8 +136,8 @@ done:
 H5O_chunk_proxy_t *
 H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Proxy for protected chunk */
-    H5O_chunk_proxy_t *ret_value;               /* Return value */
+    H5O_chunk_proxy_t *chk_proxy = NULL; /* Proxy for protected chunk */
+    H5O_chunk_proxy_t *ret_value;        /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -157,32 +147,33 @@ H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     HDassert(idx < oh->nchunks);
 
     /* Check for protecting first chunk */
-    if(0 == idx) {
+    if (0 == idx) {
         /* Create new "fake" chunk proxy for first chunk */
         /* (since the first chunk is already handled by the H5O_t object) */
-        if(NULL == (chk_proxy = H5FL_CALLOC(H5O_chunk_proxy_t)))
+        if (NULL == (chk_proxy = H5FL_CALLOC(H5O_chunk_proxy_t)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "memory allocation failed")
 
         /* Increment reference count on object header */
-        if(H5O_inc_rc(oh) < 0)
+        if (H5O_inc_rc(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, NULL, "can't increment reference count on object header")
 
         /* Set chunk proxy fields */
-        chk_proxy->oh = oh;
+        chk_proxy->oh      = oh;
         chk_proxy->chunkno = idx;
     } /* end if */
     else {
-        H5O_chk_cache_ud_t chk_udata;       /* User data for loading chunk */
+        H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */
 
         /* Construct the user data for protecting chunk proxy */
         /* (and _not_ decoding it) */
         HDmemset(&chk_udata, 0, sizeof(chk_udata));
-        chk_udata.oh = oh;
+        chk_udata.oh      = oh;
         chk_udata.chunkno = idx;
-        chk_udata.size = oh->chunk[idx].size;
+        chk_udata.size    = oh->chunk[idx].size;
 
         /* Get the chunk proxy */
-        if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, &chk_udata, H5AC_WRITE)))
+        if (NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(
+                         f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, &chk_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk")
 
         /* Sanity check */
@@ -195,14 +186,13 @@ H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
 
 done:
     /* Cleanup on error */
-    if(!ret_value)
-        if(0 == idx && chk_proxy)
+    if (!ret_value)
+        if (0 == idx && chk_proxy)
             chk_proxy = H5FL_FREE(H5O_chunk_proxy_t, chk_proxy);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_chunk_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_unprotect
  *
@@ -218,10 +208,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy,
-    hbool_t dirtied)
+H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy, hbool_t dirtied)
 {
-    herr_t ret_value = SUCCEED;        /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -230,16 +219,16 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy,
     HDassert(chk_proxy);
 
     /* Check for releasing first chunk */
-    if(0 == chk_proxy->chunkno) {
+    if (0 == chk_proxy->chunkno) {
         /* Check for dirtying the first chunk */
-        if(dirtied) {
+        if (dirtied) {
             /* Mark object header as dirty in cache */
-            if(H5AC_mark_entry_dirty(chk_proxy->oh) < 0)
+            if (H5AC_mark_entry_dirty(chk_proxy->oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
         } /* end else/if */
 
         /* Decrement reference count of object header */
-        if(H5O_dec_rc(chk_proxy->oh) < 0)
+        if (H5O_dec_rc(chk_proxy->oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "can't decrement reference count on object header")
 
         /* Free fake chunk proxy */
@@ -247,7 +236,8 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy,
     } /* end if */
     else {
         /* Release the chunk proxy from the cache, possibly marking it dirty */
-        if(H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, chk_proxy->oh->chunk[chk_proxy->chunkno].addr, chk_proxy, (dirtied ? H5AC__DIRTIED_FLAG : H5AC__NO_FLAGS_SET)) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, chk_proxy->oh->chunk[chk_proxy->chunkno].addr,
+                           chk_proxy, (dirtied ? H5AC__DIRTIED_FLAG : H5AC__NO_FLAGS_SET)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
     } /* end else */
 
@@ -255,7 +245,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_chunk_unprotect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_resize
  *
@@ -273,7 +262,7 @@ done:
 herr_t
 H5O_chunk_resize(H5O_t *oh, H5O_chunk_proxy_t *chk_proxy)
 {
-    herr_t ret_value = SUCCEED;        /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -282,14 +271,14 @@ H5O_chunk_resize(H5O_t *oh, H5O_chunk_proxy_t *chk_proxy)
     HDassert(chk_proxy);
 
     /* Check for resizing first chunk */
-    if(0 == chk_proxy->chunkno) {
+    if (0 == chk_proxy->chunkno) {
         /* Resize object header in cache */
-        if(H5AC_resize_entry(oh, oh->chunk[0].size) < 0)
+        if (H5AC_resize_entry(oh, oh->chunk[0].size) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTRESIZE, FAIL, "unable to resize chunk in cache")
     } /* end if */
     else {
         /* Resize chunk in cache */
-        if(H5AC_resize_entry(chk_proxy, oh->chunk[chk_proxy->chunkno].size) < 0)
+        if (H5AC_resize_entry(chk_proxy, oh->chunk[chk_proxy->chunkno].size) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTRESIZE, FAIL, "unable to resize chunk in cache")
     } /* end else */
 
@@ -297,7 +286,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_chunk_resize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_update_idx
  *
@@ -315,9 +303,9 @@ done:
 herr_t
 H5O_chunk_update_idx(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
 {
-    H5O_chunk_proxy_t *chk_proxy;       /* Proxy for chunk, to mark it dirty in the cache */
-    H5O_chk_cache_ud_t chk_udata;       /* User data for loading chunk */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_chunk_proxy_t *chk_proxy;           /* Proxy for chunk, to mark it dirty in the cache */
+    H5O_chk_cache_ud_t chk_udata;           /* User data for loading chunk */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -330,26 +318,26 @@ H5O_chunk_update_idx(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     /* Construct the user data for protecting chunk proxy */
     /* (and _not_ decoding it) */
     HDmemset(&chk_udata, 0, sizeof(chk_udata));
-    chk_udata.oh = oh;
+    chk_udata.oh      = oh;
     chk_udata.chunkno = idx;
-    chk_udata.size = oh->chunk[idx].size;
+    chk_udata.size    = oh->chunk[idx].size;
 
     /* Get the chunk proxy */
-    if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, &chk_udata, H5AC_WRITE)))
+    if (NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr,
+                                                               &chk_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
     /* Update index for chunk proxy in cache */
     chk_proxy->chunkno = idx;
 
     /* Release the chunk proxy from the cache, marking it deleted */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, chk_proxy, H5AC__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, chk_proxy, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_chunk_update_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_chunk_delete
  *
@@ -367,9 +355,9 @@ done:
 herr_t
 H5O_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
 {
-    H5O_chunk_proxy_t *chk_proxy;       /* Proxy for chunk, to mark it dirty in the cache */
-    H5O_chk_cache_ud_t chk_udata;       /* User data for loading chunk */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_chunk_proxy_t *chk_proxy;           /* Proxy for chunk, to mark it dirty in the cache */
+    H5O_chk_cache_ud_t chk_udata;           /* User data for loading chunk */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -382,12 +370,13 @@ H5O_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     /* Construct the user data for protecting chunk proxy */
     /* (and _not_ decoding it) */
     HDmemset(&chk_udata, 0, sizeof(chk_udata));
-    chk_udata.oh = oh;
+    chk_udata.oh      = oh;
     chk_udata.chunkno = idx;
-    chk_udata.size = oh->chunk[idx].size;
+    chk_udata.size    = oh->chunk[idx].size;
 
     /* Get the chunk proxy */
-    if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, &chk_udata, H5AC_WRITE)))
+    if (NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr,
+                                                               &chk_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
     /* Sanity check */
@@ -395,10 +384,10 @@ H5O_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     HDassert(chk_proxy->chunkno == idx);
 
     /* Release the chunk proxy from the cache, marking it deleted */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, chk_proxy, (H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG)) < 0)
+    if (H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, chk_proxy,
+                       (H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_chunk_delete() */
-
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index b91b181..787cd40 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -25,53 +25,51 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists				*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists				*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_cont_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_cont_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_cont_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
 static size_t H5O_cont_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_cont_free(void *mesg);
 static herr_t H5O_cont_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg);
-static herr_t H5O_cont_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
-			     int indent, int fwidth);
+static herr_t H5O_cont_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                             int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_CONT[1] = {{
-    H5O_CONT_ID,            	/*message id number             */
-    "hdr continuation",     	/*message name for debugging    */
-    sizeof(H5O_cont_t),     	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_cont_decode,        	/*decode message                */
-    H5O_cont_encode,        	/*encode message                */
-    NULL,                   	/*no copy method                */
-    H5O_cont_size,          	/*size of header continuation   */
-    NULL,                   	/*reset method			*/
-    H5O_cont_free,	        /* free method			*/
-    H5O_cont_delete,		/* file delete method		*/
-    NULL,			/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    NULL,			/* copy native value to file    */
-    NULL, 		 	/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_cont_debug         	/*debugging                     */
+    H5O_CONT_ID,        /*message id number             */
+    "hdr continuation", /*message name for debugging    */
+    sizeof(H5O_cont_t), /*native message size           */
+    0,                  /* messages are sharable?       */
+    H5O_cont_decode,    /*decode message                */
+    H5O_cont_encode,    /*encode message                */
+    NULL,               /*no copy method                */
+    H5O_cont_size,      /*size of header continuation   */
+    NULL,               /*reset method			*/
+    H5O_cont_free,      /* free method			*/
+    H5O_cont_delete,    /* file delete method		*/
+    NULL,               /* link method			*/
+    NULL,               /*set share method		*/
+    NULL,               /*can share method		*/
+    NULL,               /* pre copy native value to file */
+    NULL,               /* copy native value to file    */
+    NULL,               /* post copy native value to file    */
+    NULL,               /* get creation index		*/
+    NULL,               /* set creation index		*/
+    H5O_cont_debug      /*debugging                     */
 }};
 
 /* Declare the free list for H5O_cont_t's */
 H5FL_DEFINE(H5O_cont_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_cont_decode
  *
@@ -89,11 +87,11 @@ H5FL_DEFINE(H5O_cont_t);
  */
 static void *
 H5O_cont_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_cont_t             *cont = NULL;
-    void                   *ret_value;
+    H5O_cont_t *cont = NULL;
+    void *      ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -102,8 +100,8 @@ H5O_cont_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op
     HDassert(p);
 
     /* Allocate space for the message */
-    if(NULL == (cont = H5FL_MALLOC(H5O_cont_t)))
-	HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+    if (NULL == (cont = H5FL_MALLOC(H5O_cont_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
 
     /* Decode */
     H5F_addr_decode(f, &p, &(cont->addr));
@@ -117,7 +115,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_cont_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_cont_encode
  *
@@ -134,7 +131,7 @@ done:
 static herr_t
 H5O_cont_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_cont_t       *cont = (const H5O_cont_t *) _mesg;
+    const H5O_cont_t *cont = (const H5O_cont_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -152,7 +149,6 @@ H5O_cont_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_cont_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_cont_size
  *
@@ -173,18 +169,17 @@ H5O_cont_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
 static size_t
 H5O_cont_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED *_mesg)
 {
-    size_t ret_value;   /* Return value */
+    size_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set return value */
-    ret_value = (size_t)(H5F_SIZEOF_ADDR(f) +    /* Continuation header address */
-                H5F_SIZEOF_SIZE(f));     /* Continuation header length */
+    ret_value = (size_t)(H5F_SIZEOF_ADDR(f) + /* Continuation header address */
+                         H5F_SIZEOF_SIZE(f)); /* Continuation header length */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_cont_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_cont_free
  *
@@ -209,7 +204,6 @@ H5O_cont_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_cont_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_cont_delete
  *
@@ -225,8 +219,8 @@ H5O_cont_free(void *mesg)
 static herr_t
 H5O_cont_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
 {
-    H5O_cont_t *mesg = (H5O_cont_t *) _mesg;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_cont_t *mesg      = (H5O_cont_t *)_mesg;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -236,14 +230,13 @@ H5O_cont_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
 
     /* Notify the cache that the chunk has been deleted */
     /* (releases the space for the chunk) */
-    if(H5O_chunk_delete(f, dxpl_id, open_oh, mesg->chunkno) < 0)
+    if (H5O_chunk_delete(f, dxpl_id, open_oh, mesg->chunkno) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to remove chunk from cache")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_cont_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_cont_debug
  *
@@ -260,10 +253,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_cont_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE * stream,
-	       int indent, int fwidth)
+H5O_cont_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+               int indent, int fwidth)
 {
-    const H5O_cont_t       *cont = (const H5O_cont_t *) _mesg;
+    const H5O_cont_t *cont = (const H5O_cont_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -274,15 +267,11 @@ H5O_cont_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Continuation address:", cont->addr);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Continuation address:", cont->addr);
 
     HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-	      "Continuation size in bytes:",
-	      (unsigned long) (cont->size));
-    HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
-	      "Points to chunk number:",
-	      (int) (cont->chunkno));
+              "Continuation size in bytes:", (unsigned long)(cont->size));
+    HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, "Points to chunk number:", (int)(cont->chunkno));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_cont_debug() */
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 2d974f1..0c27f30 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -26,76 +26,70 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Aprivate.h"         /* Attributes                           */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5HGprivate.h"        /* Global Heaps                         */
-#include "H5FOprivate.h"        /* File objects                         */
-#include "H5Lprivate.h"         /* Links			  	*/
-#include "H5MFprivate.h"	/* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Pprivate.h"         /* Property lists                       */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Aprivate.h"  /* Attributes                           */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5HGprivate.h" /* Global Heaps                         */
+#include "H5FOprivate.h" /* File objects                         */
+#include "H5Lprivate.h"  /* Links			  	*/
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Pprivate.h"  /* Property lists                       */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Key object for skiplist of committed datatypes */
 typedef struct H5O_copy_search_comm_dt_key_t {
-    H5T_t               *dt;    /* Datatype */
-    unsigned long       fileno; /* File number */
+    H5T_t *       dt;     /* Datatype */
+    unsigned long fileno; /* File number */
 } H5O_copy_search_comm_dt_key_t;
 
 /* Callback struct for building a list of committed datatypes */
 typedef struct H5O_copy_search_comm_dt_ud_t {
-    H5SL_t      *dst_dt_list;   /* Skip list of committed datatypes */
-    H5G_loc_t   *dst_root_loc;  /* Starting location for iteration */
-    H5O_loc_t   obj_oloc;       /* Object location (for attribute iteration callback) */
-    hid_t       dxpl_id;        /* Dataset transfer property list id */
+    H5SL_t *   dst_dt_list;  /* Skip list of committed datatypes */
+    H5G_loc_t *dst_root_loc; /* Starting location for iteration */
+    H5O_loc_t  obj_oloc;     /* Object location (for attribute iteration callback) */
+    hid_t      dxpl_id;      /* Dataset transfer property list id */
 } H5O_copy_search_comm_dt_ud_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static herr_t H5O_copy_free_addrmap_cb(void *item, void *key, void *op_data);
-static herr_t H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
-    hid_t dxpl_id, H5O_copy_t *cpy_info, H5O_type_t *obj_type, void **udata);
-static herr_t H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
-    hid_t dxpl_id, hid_t ocpypl_id);
-static herr_t H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc,
-    const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t dxpl_id);
-static herr_t H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id,
-    H5O_loc_t *dst_oloc, H5G_loc_t *dst_root_loc, H5O_copy_t *cpy_info);
+static herr_t H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, hid_t dxpl_id,
+                                   H5O_copy_t *cpy_info, H5O_type_t *obj_type, void **udata);
+static herr_t H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, hid_t dxpl_id,
+                              hid_t ocpypl_id);
+static herr_t H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name, hid_t ocpypl_id,
+                           hid_t lcpl_id, hid_t dxpl_id);
+static herr_t H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc,
+                                  H5G_loc_t *dst_root_loc, H5O_copy_t *cpy_info);
 static herr_t H5O_copy_free_comm_dt_cb(void *item, void *key, void *op_data);
-static int H5O_copy_comm_dt_cmp(const void *dt1, const void *dt2);
-static herr_t H5O_copy_search_comm_dt_cb(hid_t group, const char *name,
-    const H5L_info_t *linfo, void *udata);
-static htri_t H5O_copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src,
-    H5O_loc_t *oloc_dst/*in, out*/, hid_t dxpl_id, H5O_copy_t *cpy_info);
-static herr_t H5O_copy_insert_comm_dt(H5F_t *file_src, H5O_t *oh_src,
-    H5O_loc_t *oloc_dst, hid_t dxpl_id, H5O_copy_t *cpy_info);
-
+static int    H5O_copy_comm_dt_cmp(const void *dt1, const void *dt2);
+static herr_t H5O_copy_search_comm_dt_cb(hid_t group, const char *name, const H5L_info_t *linfo, void *udata);
+static htri_t H5O_copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst /*in, out*/,
+                                      hid_t dxpl_id, H5O_copy_t *cpy_info);
+static herr_t H5O_copy_insert_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst, hid_t dxpl_id,
+                                      H5O_copy_t *cpy_info);
 
 /*********************/
 /* Package Variables */
@@ -110,18 +104,14 @@ H5FL_DEFINE(H5O_copy_search_comm_dt_key_t);
 /* Declare a free list to manage haddr_t variables */
 H5FL_DEFINE(haddr_t);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5Ocopy
  *
@@ -200,40 +190,39 @@ H5FL_DEFINE(haddr_t);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
-        const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id)
+H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id,
+        hid_t lcpl_id)
 {
-    H5G_loc_t	loc;                    /* Source group group location */
-    H5G_loc_t	src_loc;                /* Source object group location */
-    H5G_loc_t	dst_loc;                /* Destination group location */
+    H5G_loc_t loc;     /* Source group group location */
+    H5G_loc_t src_loc; /* Source object group location */
+    H5G_loc_t dst_loc; /* Destination group location */
 
     /* for opening the destination object */
-    H5G_name_t  src_path;               /* Opened source object hier. path */
-    H5O_loc_t   src_oloc;               /* Opened source object object location */
-    hbool_t     loc_found = FALSE;      /* Location at 'name' found */
-    hbool_t     obj_open = FALSE;       /* Entry at 'name' found */
+    H5G_name_t src_path;          /* Opened source object hier. path */
+    H5O_loc_t  src_oloc;          /* Opened source object object location */
+    hbool_t    loc_found = FALSE; /* Location at 'name' found */
+    hbool_t    obj_open  = FALSE; /* Entry at 'name' found */
 
-    herr_t      ret_value = SUCCEED;        /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name,
-             ocpypl_id, lcpl_id);
+    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, ocpypl_id, lcpl_id);
 
     /* Check arguments */
-    if(H5G_loc(src_loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(H5G_loc(dst_loc_id, &dst_loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!src_name || !*src_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no source name specified")
-    if(!dst_name || !*dst_name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination name specified")
+    if (H5G_loc(src_loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (H5G_loc(dst_loc_id, &dst_loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!src_name || !*src_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no source name specified")
+    if (!dst_name || !*dst_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination name specified")
 
     /* check if destination name already exists */
     {
-        H5G_name_t  tmp_path;
-        H5O_loc_t   tmp_oloc;
-        H5G_loc_t   tmp_loc;
+        H5G_name_t tmp_path;
+        H5O_loc_t  tmp_oloc;
+        H5G_loc_t  tmp_loc;
 
         /* Set up group location */
         tmp_loc.oloc = &tmp_oloc;
@@ -241,7 +230,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
         H5G_loc_reset(&tmp_loc);
 
         /* Check if object already exists in destination */
-        if(H5G_loc_find(&dst_loc, dst_name, &tmp_loc, H5P_DEFAULT, H5AC_ind_dxpl_id) >= 0) {
+        if (H5G_loc_find(&dst_loc, dst_name, &tmp_loc, H5P_DEFAULT, H5AC_ind_dxpl_id) >= 0) {
             H5G_name_free(&tmp_path);
             HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "destination object already exists")
         } /* end if */
@@ -253,45 +242,42 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     H5G_loc_reset(&src_loc);
 
     /* Find the source object to copy */
-    if(H5G_loc_find(&loc, src_name, &src_loc/*out*/, H5P_DEFAULT, H5AC_ind_dxpl_id) < 0)
+    if (H5G_loc_find(&loc, src_name, &src_loc /*out*/, H5P_DEFAULT, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "source object not found")
     loc_found = TRUE;
 
     /* Open source object's object header */
-    if(H5O_open(&src_oloc) < 0)
+    if (H5O_open(&src_oloc) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object")
     obj_open = TRUE;
 
     /* Get correct property lists */
-    if(H5P_DEFAULT == lcpl_id) {
-        if((lcpl_id = H5L_get_default_lcpl()) < 0)
+    if (H5P_DEFAULT == lcpl_id) {
+        if ((lcpl_id = H5L_get_default_lcpl()) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to get default lcpl")
     } /* end if */
-    else
-        if(TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
+    else if (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
 
     /* Get object copy property list */
-    if(H5P_DEFAULT == ocpypl_id)
+    if (H5P_DEFAULT == ocpypl_id)
         ocpypl_id = H5P_OBJECT_COPY_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(ocpypl_id, H5P_OBJECT_COPY))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not object copy property list")
+    else if (TRUE != H5P_isa_class(ocpypl_id, H5P_OBJECT_COPY))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not object copy property list")
 
     /* Do the actual copying of the object */
-    if(H5O_copy_obj(&src_loc, &dst_loc, dst_name, ocpypl_id, lcpl_id, H5AC_dxpl_id) < 0)
+    if (H5O_copy_obj(&src_loc, &dst_loc, dst_name, ocpypl_id, lcpl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
 done:
-    if(loc_found && H5G_loc_free(&src_loc) < 0)
+    if (loc_found && H5G_loc_free(&src_loc) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't free location")
-    if(obj_open && H5O_close(&src_oloc) < 0)
+    if (obj_open && H5O_close(&src_oloc) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CLOSEERROR, FAIL, "unable to release object header")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ocopy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_header_real
  *
@@ -316,32 +302,31 @@ done:
  *	When the object is opened, call the object's flush class action
  *	to ensure that cached data is flushed so that H5Ocopy will get
  *	the correct data.
- *	
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
-    hid_t dxpl_id, H5O_copy_t *cpy_info, H5O_type_t *obj_type,
-    void **udata /*out*/)
+H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, hid_t dxpl_id,
+                     H5O_copy_t *cpy_info, H5O_type_t *obj_type, void **udata /*out*/)
 {
-    H5O_addr_map_t         *addr_map = NULL;       /* Address mapping of object copied */
-    H5O_t                  *oh_src = NULL;         /* Object header for source object */
-    H5O_t                  *oh_dst = NULL;         /* Object header for destination object */
-    unsigned               mesgno = 0;
-    haddr_t                addr_new = HADDR_UNDEF;
-    hbool_t                *deleted = NULL;      /* Array of flags indicating whether messages should be copied */
-    hbool_t                inserted = FALSE;        /* Whether the destination object header has been inserted into the cache */
-    size_t                 null_msgs;               /* Number of NULL messages found in each loop */
-    size_t                 orig_dst_msgs;           /* Original # of messages in dest. object */
-    H5O_mesg_t             *mesg_src;               /* Message in source object header */
-    H5O_mesg_t             *mesg_dst;               /* Message in source object header */
-    const H5O_msg_class_t  *copy_type;              /* Type of message to use for copying */
-    const H5O_obj_class_t  *obj_class = NULL;       /* Type of object we are copying */
-    void                   *cpy_udata = NULL;       /* User data for passing to message callbacks */
-    uint64_t               dst_oh_size;             /* Total size of the destination OH */
-    size_t                 dst_oh_null;             /* Size of the null message to add to destination OH */
-    size_t                 dst_oh_gap;              /* Size of the gap in chunk #0 of destination OH */
-    uint8_t                *current_pos;            /* Current position in destination image */
+    H5O_addr_map_t *addr_map = NULL; /* Address mapping of object copied */
+    H5O_t *         oh_src   = NULL; /* Object header for source object */
+    H5O_t *         oh_dst   = NULL; /* Object header for destination object */
+    unsigned        mesgno   = 0;
+    haddr_t         addr_new = HADDR_UNDEF;
+    hbool_t *       deleted  = NULL; /* Array of flags indicating whether messages should be copied */
+    hbool_t     inserted = FALSE; /* Whether the destination object header has been inserted into the cache */
+    size_t      null_msgs;        /* Number of NULL messages found in each loop */
+    size_t      orig_dst_msgs;    /* Original # of messages in dest. object */
+    H5O_mesg_t *mesg_src;         /* Message in source object header */
+    H5O_mesg_t *mesg_dst;         /* Message in source object header */
+    const H5O_msg_class_t *copy_type;        /* Type of message to use for copying */
+    const H5O_obj_class_t *obj_class = NULL; /* Type of object we are copying */
+    void *                 cpy_udata = NULL; /* User data for passing to message callbacks */
+    uint64_t               dst_oh_size;      /* Total size of the destination OH */
+    size_t                 dst_oh_null;      /* Size of the null message to add to destination OH */
+    size_t                 dst_oh_gap;       /* Size of the gap in chunk #0 of destination OH */
+    uint8_t *              current_pos;      /* Current position in destination image */
     size_t                 msghdr_size;
     herr_t                 ret_value = SUCCEED;
 
@@ -354,83 +339,82 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
     HDassert(cpy_info);
 
     /* Get pointer to object class for this object */
-    if((obj_class = H5O_obj_class(oloc_src, dxpl_id)) == NULL)
+    if ((obj_class = H5O_obj_class(oloc_src, dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
 
     /* Set the pointer to the shared struct for the object if opened in the file */
     cpy_info->shared_fo = H5FO_opened(oloc_src->file, oloc_src->addr);
 
     /* Get source object header */
-    if(NULL == (oh_src = H5O_protect(oloc_src, dxpl_id, H5AC_READ)))
+    if (NULL == (oh_src = H5O_protect(oloc_src, dxpl_id, H5AC_READ)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve user data for particular type of object to copy */
-    if(obj_class->get_copy_file_udata &&
-            (NULL == (cpy_udata = (obj_class->get_copy_file_udata)())))
+    if (obj_class->get_copy_file_udata && (NULL == (cpy_udata = (obj_class->get_copy_file_udata)())))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to retrieve copy user data")
 
     /* If we are merging committed datatypes, check for a match in the destination
      * file now */
-    if(cpy_info->merge_comm_dt && obj_class->type == H5O_TYPE_NAMED_DATATYPE) {
+    if (cpy_info->merge_comm_dt && obj_class->type == H5O_TYPE_NAMED_DATATYPE) {
         unsigned long fileno_src; /* fileno for source file */
         unsigned long fileno_dst; /* fileno for destination file */
-        htri_t merge; /* Whether we found a match in the destination file */
+        htri_t        merge;      /* Whether we found a match in the destination file */
 
         /* Check if the source and dest file are the same.  If so, just return
          * the source object address */
         H5F_GET_FILENO(oloc_src->file, fileno_src);
         H5F_GET_FILENO(oloc_dst->file, fileno_dst);
-        if(fileno_src == fileno_dst) {
-            merge = TRUE;
+        if (fileno_src == fileno_dst) {
+            merge          = TRUE;
             oloc_dst->addr = oloc_src->addr;
         } /* end if */
         else
             /* Search for a matching committed datatype, building the list if
              * necessary */
-            if((merge = H5O_copy_search_comm_dt(oloc_src->file, oh_src, oloc_dst, dxpl_id, cpy_info)) < 0)
-                HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't search for matching committed datatype")
+            if ((merge = H5O_copy_search_comm_dt(oloc_src->file, oh_src, oloc_dst, dxpl_id, cpy_info)) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't search for matching committed datatype")
 
-        if(merge) {
+        if (merge) {
             /* Found a match, add to skip list and exit */
             /* Allocate space for the address mapping of the object copied */
-            if(NULL == (addr_map = H5FL_MALLOC(H5O_addr_map_t)))
+            if (NULL == (addr_map = H5FL_MALLOC(H5O_addr_map_t)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Insert the address mapping for the found object into the copied
              * list */
             addr_map->src_obj_pos.fileno = fileno_src;
-            addr_map->src_obj_pos.addr = oloc_src->addr;
-            addr_map->dst_addr = oloc_dst->addr;
-            addr_map->is_locked = TRUE;                 /* We've locked the object currently */
-            addr_map->inc_ref_count = 0;                /* Start with no additional ref counts to add */
-            addr_map->obj_class = obj_class;
-            addr_map->udata = cpy_udata;
+            addr_map->src_obj_pos.addr   = oloc_src->addr;
+            addr_map->dst_addr           = oloc_dst->addr;
+            addr_map->is_locked          = TRUE; /* We've locked the object currently */
+            addr_map->inc_ref_count      = 0;    /* Start with no additional ref counts to add */
+            addr_map->obj_class          = obj_class;
+            addr_map->udata              = cpy_udata;
 
             /* Insert into skip list */
-            if(H5SL_insert(cpy_info->map_list, addr_map, &(addr_map->src_obj_pos)) < 0) {
+            if (H5SL_insert(cpy_info->map_list, addr_map, &(addr_map->src_obj_pos)) < 0) {
                 addr_map = H5FL_FREE(H5O_addr_map_t, addr_map);
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object into skip list")
             } /* end if */
 
             HGOTO_DONE(SUCCEED)
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Flush any dirty messages in source object header to update the header chunks */
-    if(H5O_flush_msgs(oloc_src->file, oh_src) < 0)
+    if (H5O_flush_msgs(oloc_src->file, oh_src) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to flush object header messages")
 
     /* Allocate the destination object header and fill in header fields */
-    if(NULL == (oh_dst = H5FL_CALLOC(H5O_t)))
+    if (NULL == (oh_dst = H5FL_CALLOC(H5O_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize header information */
-    oh_dst->version = oh_src->version;
-    oh_dst->flags = oh_src->flags;
+    oh_dst->version        = oh_src->version;
+    oh_dst->flags          = oh_src->flags;
     oh_dst->link_msgs_seen = oh_src->link_msgs_seen;
     oh_dst->attr_msgs_seen = oh_src->attr_msgs_seen;
-    oh_dst->sizeof_size = H5F_SIZEOF_SIZE(oloc_dst->file);
-    oh_dst->sizeof_addr = H5F_SIZEOF_ADDR(oloc_dst->file);
+    oh_dst->sizeof_size    = H5F_SIZEOF_SIZE(oloc_dst->file);
+    oh_dst->sizeof_addr    = H5F_SIZEOF_ADDR(oloc_dst->file);
 
     /* Copy time fields */
     oh_dst->atime = oh_src->atime;
@@ -440,7 +424,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
 
     /* Copy attribute storage information */
     oh_dst->max_compact = oh_src->max_compact;
-    oh_dst->min_dense = oh_src->min_dense;
+    oh_dst->min_dense   = oh_src->min_dense;
 
     /* Initialize size of chunk array.  Start off with zero chunks so this field
      * is consistent with the current state of the chunk array.  This is
@@ -449,7 +433,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
     oh_dst->alloc_nchunks = oh_dst->nchunks = 0;
 
     /* Allocate memory for the chunk array - always start with 1 chunk */
-    if(NULL == (oh_dst->chunk = H5FL_SEQ_MALLOC(H5O_chunk_t, 1)))
+    if (NULL == (oh_dst->chunk = H5FL_SEQ_MALLOC(H5O_chunk_t, 1)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Update number of allocated chunks.  There are still no chunks used. */
@@ -458,7 +442,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
     /* Allocate memory for "deleted" array.  This array marks the message in
      * the source that shouldn't be copied to the destination.
      */
-    if(NULL == (deleted = (hbool_t *)HDmalloc(sizeof(hbool_t) * oh_src->nmesgs)))
+    if (NULL == (deleted = (hbool_t *)HDmalloc(sizeof(hbool_t) * oh_src->nmesgs)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     HDmemset(deleted, FALSE, sizeof(hbool_t) * oh_src->nmesgs);
 
@@ -467,12 +451,12 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
      * Keep track of how many NULL or deleted messages we find (or create)
      */
     null_msgs = 0;
-    for(mesgno = 0; mesgno < oh_src->nmesgs; mesgno++) {
+    for (mesgno = 0; mesgno < oh_src->nmesgs; mesgno++) {
         /* Set up convenience variables */
         mesg_src = &(oh_src->mesg[mesgno]);
 
         /* Sanity check */
-        HDassert(!mesg_src->dirty);     /* Should be cleared by earlier call to flush messages */
+        HDassert(!mesg_src->dirty); /* Should be cleared by earlier call to flush messages */
 
         /* Get message class to operate on */
         copy_type = mesg_src->type;
@@ -480,70 +464,70 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
         /* Check for continuation message; these are converted to NULL
          * messages because the destination OH will have only one chunk
          */
-        if(H5O_CONT_ID == mesg_src->type->id || H5O_NULL_ID == mesg_src->type->id) {
+        if (H5O_CONT_ID == mesg_src->type->id || H5O_NULL_ID == mesg_src->type->id) {
             deleted[mesgno] = TRUE;
             ++null_msgs;
             copy_type = H5O_MSG_NULL;
         } /* end if */
         HDassert(copy_type);
 
-        if(copy_type->pre_copy_file) {
+        if (copy_type->pre_copy_file) {
             /* Decode the message if necessary. */
             H5O_LOAD_NATIVE(oloc_src->file, dxpl_id, 0, oh_src, mesg_src, FAIL)
 
             /* Perform "pre copy" operation on message */
-            if((copy_type->pre_copy_file)(oloc_src->file, mesg_src->native,
-                    &(deleted[mesgno]), cpy_info, cpy_udata) < 0)
+            if ((copy_type->pre_copy_file)(oloc_src->file, mesg_src->native, &(deleted[mesgno]), cpy_info,
+                                           cpy_udata) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to perform 'pre copy' operation on message")
 
             /* Check if the message should be deleted in the destination */
-            if(deleted[mesgno])
+            if (deleted[mesgno])
                 /* Mark message as deleted */
                 ++null_msgs;
         } /* end if(copy_type->pre_copy_file) */
-    } /* end for */
+    }     /* end for */
 
     /* Initialize size of message list.  It may or may not include the NULL messages
      * detected above.
      */
-    if(cpy_info->preserve_null)
+    if (cpy_info->preserve_null)
         oh_dst->alloc_nmesgs = oh_dst->nmesgs = oh_src->nmesgs;
     else
         oh_dst->alloc_nmesgs = oh_dst->nmesgs = (oh_src->nmesgs - null_msgs);
 
     /* Allocate memory for destination message array */
-    if(oh_dst->alloc_nmesgs > 0)
-        if(NULL == (oh_dst->mesg = H5FL_SEQ_CALLOC(H5O_mesg_t, oh_dst->alloc_nmesgs)))
+    if (oh_dst->alloc_nmesgs > 0)
+        if (NULL == (oh_dst->mesg = H5FL_SEQ_CALLOC(H5O_mesg_t, oh_dst->alloc_nmesgs)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* "copy" pass over messages, to perform main message copying */
     null_msgs = 0;
-    for(mesgno = 0; mesgno < oh_dst->nmesgs; mesgno++) {
+    for (mesgno = 0; mesgno < oh_dst->nmesgs; mesgno++) {
         /* Skip any deleted or NULL messages in the source unless the
          * preserve_null flag is set
          */
-        if(FALSE == cpy_info->preserve_null) {
-            while(deleted[mesgno + null_msgs]) {
+        if (FALSE == cpy_info->preserve_null) {
+            while (deleted[mesgno + null_msgs]) {
                 ++null_msgs;
                 HDassert(mesgno + null_msgs < oh_src->nmesgs);
             } /* end while */
-        } /* end if */
+        }     /* end if */
 
         /* Set up convenience variables */
         mesg_src = &(oh_src->mesg[mesgno + null_msgs]);
         mesg_dst = &(oh_dst->mesg[mesgno]);
 
         /* Initialize non-zero components of destination message */
-        mesg_dst->crt_idx = mesg_src->crt_idx;
-        mesg_dst->flags = mesg_src->flags;
+        mesg_dst->crt_idx  = mesg_src->crt_idx;
+        mesg_dst->flags    = mesg_src->flags;
         mesg_dst->raw_size = mesg_src->raw_size;
-        mesg_dst->type = mesg_src->type;
+        mesg_dst->type     = mesg_src->type;
 
         /* If we're preserving deleted messages, set their types to 'NULL'
          * in the destination.
          */
-        if(cpy_info->preserve_null && deleted[mesgno]) {
-            mesg_dst->type = H5O_MSG_NULL;
+        if (cpy_info->preserve_null && deleted[mesgno]) {
+            mesg_dst->type  = H5O_MSG_NULL;
             mesg_dst->flags = 0;
             mesg_dst->dirty = TRUE;
         } /* end if */
@@ -556,9 +540,9 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
         HDassert(copy_type);
 
         /* copy this message into destination file */
-        if(copy_type->copy_file) {
-            hbool_t recompute_size;     /* Whether copy_file callback created a shared message */
-            unsigned mesg_flags;        /* Message flags */
+        if (copy_type->copy_file) {
+            hbool_t  recompute_size; /* Whether copy_file callback created a shared message */
+            unsigned mesg_flags;     /* Message flags */
 
             /* Decode the message if necessary. */
             H5O_LOAD_NATIVE(oloc_src->file, dxpl_id, 0, oh_src, mesg_src, FAIL)
@@ -566,20 +550,18 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
             /* Get destination message flags, and unset shared and shareable
              * flags.  mesg_dst->flags will contain the original flags for now.
              */
-            mesg_flags = (unsigned)mesg_dst->flags & ~H5O_MSG_FLAG_SHARED
-                    & ~H5O_MSG_FLAG_SHAREABLE;
+            mesg_flags = (unsigned)mesg_dst->flags & ~H5O_MSG_FLAG_SHARED & ~H5O_MSG_FLAG_SHAREABLE;
 
             /* Copy the source message */
             recompute_size = FALSE;
-            if((mesg_dst->native = H5O_msg_copy_file(copy_type, oloc_src->file,
-                    mesg_src->native, oloc_dst->file, &recompute_size,
-                    &mesg_flags, cpy_info, cpy_udata, dxpl_id)) == NULL)
+            if ((mesg_dst->native =
+                     H5O_msg_copy_file(copy_type, oloc_src->file, mesg_src->native, oloc_dst->file,
+                                       &recompute_size, &mesg_flags, cpy_info, cpy_udata, dxpl_id)) == NULL)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object header message")
 
             /* Check if the sharing state changed, and recompute the size if so
              */
-            if(!(mesg_flags & H5O_MSG_FLAG_SHARED)
-                    != !(mesg_dst->flags & H5O_MSG_FLAG_SHARED))
+            if (!(mesg_flags & H5O_MSG_FLAG_SHARED) != !(mesg_dst->flags & H5O_MSG_FLAG_SHARED))
                 recompute_size = TRUE;
 
             /* Set destination message flags */
@@ -589,15 +571,15 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
             /* (its sharing status or one of its components (for attributes)
              *  could have changed)
              */
-            if(recompute_size)
-                mesg_dst->raw_size = H5O_ALIGN_OH(oh_dst,
-                        H5O_msg_raw_size(oloc_dst->file, mesg_dst->type->id, FALSE, mesg_dst->native));
+            if (recompute_size)
+                mesg_dst->raw_size = H5O_ALIGN_OH(
+                    oh_dst, H5O_msg_raw_size(oloc_dst->file, mesg_dst->type->id, FALSE, mesg_dst->native));
 
-            /* Mark the message in the destination as dirty, so it'll get encoded when the object header is flushed */
+            /* Mark the message in the destination as dirty, so it'll get encoded when the object header is
+             * flushed */
             mesg_dst->dirty = TRUE;
         } /* end if (mesg_src->type->copy_file) */
-    } /* end of mesgno loop */
-
+    }     /* end of mesgno loop */
 
     /* Allocate the destination header and copy any messages that didn't have
      * copy callbacks.  They get copied directly from the source image to the
@@ -610,35 +592,35 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
 
     /* Compute space for messages. */
     dst_oh_size = 0;
-    for(mesgno = 0; mesgno < oh_dst->nmesgs; mesgno++) {
+    for (mesgno = 0; mesgno < oh_dst->nmesgs; mesgno++) {
         dst_oh_size += (uint64_t)H5O_SIZEOF_MSGHDR_OH(oh_dst);
         dst_oh_size += oh_dst->mesg[mesgno].raw_size;
     } /* end for */
 
     /* Check if we need to determine correct value for chunk #0 size bits */
-    if(oh_dst->version > H5O_VERSION_1) {
+    if (oh_dst->version > H5O_VERSION_1) {
         /* Reset destination object header's "chunk 0 size" flags */
         oh_dst->flags = (uint8_t)(oh_dst->flags & ~H5O_HDR_CHUNK0_SIZE);
 
         /* Determine correct value for chunk #0 size bits */
-        if(dst_oh_size > 4294967295)
+        if (dst_oh_size > 4294967295)
             oh_dst->flags |= H5O_HDR_CHUNK0_8;
-        else if(dst_oh_size > 65535)
+        else if (dst_oh_size > 65535)
             oh_dst->flags |= H5O_HDR_CHUNK0_4;
-        else if(dst_oh_size > 255)
+        else if (dst_oh_size > 255)
             oh_dst->flags |= H5O_HDR_CHUNK0_2;
     } /* end if */
 
     /* Check if the chunk's data portion is too small */
     dst_oh_gap = dst_oh_null = 0;
-    if(dst_oh_size < H5O_MIN_SIZE) {
-        size_t delta = (size_t)(H5O_MIN_SIZE - dst_oh_size);    /* Delta in chunk size needed */
+    if (dst_oh_size < H5O_MIN_SIZE) {
+        size_t delta = (size_t)(H5O_MIN_SIZE - dst_oh_size); /* Delta in chunk size needed */
 
         /* Sanity check */
         HDassert((oh_dst->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_1);
 
         /* Determine whether to create gap or NULL message */
-        if(delta < H5O_SIZEOF_MSGHDR_OH(oh_dst))
+        if (delta < H5O_SIZEOF_MSGHDR_OH(oh_dst))
             dst_oh_gap = delta;
         else
             dst_oh_null = delta;
@@ -654,7 +636,8 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
     dst_oh_size += (uint64_t)H5O_SIZEOF_HDR(oh_dst);
 
     /* Allocate space for chunk in destination file */
-    if(HADDR_UNDEF == (oh_dst->chunk[0].addr = H5MF_alloc(oloc_dst->file, H5FD_MEM_OHDR, dxpl_id, (hsize_t)dst_oh_size)))
+    if (HADDR_UNDEF ==
+        (oh_dst->chunk[0].addr = H5MF_alloc(oloc_dst->file, H5FD_MEM_OHDR, dxpl_id, (hsize_t)dst_oh_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for object header")
     addr_new = oh_dst->chunk[0].addr;
 
@@ -667,12 +650,12 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
      *  clear to zero bytes, so we just set the buffer to zero's here.
      *  (QAK - 2010/08/17)
      */
-    if(NULL == (oh_dst->chunk[0].image = H5FL_BLK_CALLOC(chunk_image, (size_t)dst_oh_size)))
+    if (NULL == (oh_dst->chunk[0].image = H5FL_BLK_CALLOC(chunk_image, (size_t)dst_oh_size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Set dest. chunk information */
     oh_dst->chunk[0].size = (size_t)dst_oh_size;
-    oh_dst->chunk[0].gap = dst_oh_gap;
+    oh_dst->chunk[0].gap  = dst_oh_gap;
 
     /* Update size of chunk array.  The destination now has one chunk. */
     oh_dst->nchunks = 1;
@@ -689,29 +672,29 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
     /* Write the magic number for versions > 1 and skip the rest of the
      * header.  This will be written when the header is flushed to disk.
      */
-    if(oh_dst->version > H5O_VERSION_1)
+    if (oh_dst->version > H5O_VERSION_1)
         HDmemcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC);
     current_pos += H5O_SIZEOF_HDR(oh_dst) - H5O_SIZEOF_CHKSUM_OH(oh_dst);
 
     /* Loop through destination messages, updating their "raw" info */
     null_msgs = 0;
-    for(mesgno = 0; mesgno < oh_dst->nmesgs; mesgno++) {
+    for (mesgno = 0; mesgno < oh_dst->nmesgs; mesgno++) {
         /* Skip any deleted or NULL messages in the source unless the
          * preserve_null flag is set.
          */
-        if(FALSE == cpy_info->preserve_null) {
-            while(deleted[mesgno + null_msgs]) {
+        if (FALSE == cpy_info->preserve_null) {
+            while (deleted[mesgno + null_msgs]) {
                 ++null_msgs;
                 HDassert(mesgno + null_msgs < oh_src->nmesgs);
             } /* end while */
-        } /* end if */
+        }     /* end if */
 
         /* Set up convenience variables */
         mesg_src = &(oh_src->mesg[mesgno + null_msgs]);
         mesg_dst = &(oh_dst->mesg[mesgno]);
 
         /* Copy each message that wasn't dirtied above */
-        if(!mesg_dst->dirty)
+        if (!mesg_dst->dirty)
             /* Copy the message header plus the message's raw data. */
             HDmemcpy(current_pos, mesg_src->raw - msghdr_size, msghdr_size + mesg_src->raw_size);
 
@@ -726,56 +709,56 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
     orig_dst_msgs = oh_dst->nmesgs;
 
     /* Check if we need to add a NULL message to this header */
-    if(dst_oh_null > 0) {
-        size_t null_idx;                /* Index of new NULL message */
+    if (dst_oh_null > 0) {
+        size_t null_idx; /* Index of new NULL message */
 
         /* Make sure we have enough space for new NULL message */
-        if(oh_dst->nmesgs + 1 > oh_dst->alloc_nmesgs)
-            if(H5O_alloc_msgs(oh_dst, (size_t)1) < 0)
+        if (oh_dst->nmesgs + 1 > oh_dst->alloc_nmesgs)
+            if (H5O_alloc_msgs(oh_dst, (size_t)1) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate more space for messages")
 
         /* Create null message for [rest of] space in new chunk */
         /* (account for chunk's magic # & checksum) */
-        null_idx = oh_dst->nmesgs++;
-        oh_dst->mesg[null_idx].type = H5O_MSG_NULL;
-        oh_dst->mesg[null_idx].dirty = TRUE;
-        oh_dst->mesg[null_idx].native = NULL;
-        oh_dst->mesg[null_idx].raw = current_pos + msghdr_size;
-        oh_dst->mesg[null_idx].raw_size = dst_oh_null -  msghdr_size;
-        oh_dst->mesg[null_idx].chunkno = 0;
+        null_idx                        = oh_dst->nmesgs++;
+        oh_dst->mesg[null_idx].type     = H5O_MSG_NULL;
+        oh_dst->mesg[null_idx].dirty    = TRUE;
+        oh_dst->mesg[null_idx].native   = NULL;
+        oh_dst->mesg[null_idx].raw      = current_pos + msghdr_size;
+        oh_dst->mesg[null_idx].raw_size = dst_oh_null - msghdr_size;
+        oh_dst->mesg[null_idx].chunkno  = 0;
     } /* end if */
 
     /* Make sure we filled the chunk, except for room at the end for a checksum */
-    HDassert(current_pos + dst_oh_gap + dst_oh_null + H5O_SIZEOF_CHKSUM_OH(oh_dst) == (size_t)dst_oh_size + oh_dst->chunk[0].image);
+    HDassert(current_pos + dst_oh_gap + dst_oh_null + H5O_SIZEOF_CHKSUM_OH(oh_dst) ==
+             (size_t)dst_oh_size + oh_dst->chunk[0].image);
 
     /* Set the dest. object location to the first chunk address */
     HDassert(H5F_addr_defined(addr_new));
     oloc_dst->addr = addr_new;
 
-
     /* If we are merging committed datatypes and this is a committed datatype, insert
      * the copied datatype into the list of committed datatypes in the target file.
      */
-    if(cpy_info->merge_comm_dt && obj_class->type == H5O_TYPE_NAMED_DATATYPE)
-        if(H5O_copy_insert_comm_dt(oloc_src->file, oh_src, oloc_dst, dxpl_id, cpy_info) < 0)
+    if (cpy_info->merge_comm_dt && obj_class->type == H5O_TYPE_NAMED_DATATYPE)
+        if (H5O_copy_insert_comm_dt(oloc_src->file, oh_src, oloc_dst, dxpl_id, cpy_info) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't insert committed datatype into destination list")
 
     /* Allocate space for the address mapping of the object copied */
-    if(NULL == (addr_map = H5FL_MALLOC(H5O_addr_map_t)))
+    if (NULL == (addr_map = H5FL_MALLOC(H5O_addr_map_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Insert the address mapping for the new object into the copied list */
     /* (Do this here, because "post copy" possibly checks it) */
     H5F_GET_FILENO(oloc_src->file, addr_map->src_obj_pos.fileno);
     addr_map->src_obj_pos.addr = oloc_src->addr;
-    addr_map->dst_addr = oloc_dst->addr;
-    addr_map->is_locked = TRUE;                 /* We've locked the object currently */
-    addr_map->inc_ref_count = 0;                /* Start with no additional ref counts to add */
-    addr_map->obj_class = obj_class;
-    addr_map->udata = cpy_udata;
+    addr_map->dst_addr         = oloc_dst->addr;
+    addr_map->is_locked        = TRUE; /* We've locked the object currently */
+    addr_map->inc_ref_count    = 0;    /* Start with no additional ref counts to add */
+    addr_map->obj_class        = obj_class;
+    addr_map->udata            = cpy_udata;
 
     /* Insert into skip list */
-    if(H5SL_insert(cpy_info->map_list, addr_map, &(addr_map->src_obj_pos)) < 0) {
+    if (H5SL_insert(cpy_info->map_list, addr_map, &(addr_map->src_obj_pos)) < 0) {
         addr_map = H5FL_FREE(H5O_addr_map_t, addr_map);
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object into skip list")
     } /* end if */
@@ -784,16 +767,16 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
      * object header for destination object
      */
     null_msgs = 0;
-    for(mesgno = 0; mesgno < orig_dst_msgs; mesgno++) {
+    for (mesgno = 0; mesgno < orig_dst_msgs; mesgno++) {
         /* Skip any deleted or NULL messages in the source unless the
          * preserve_null flag is set
          */
-        if(FALSE == cpy_info->preserve_null) {
-            while(deleted[mesgno + null_msgs]) {
+        if (FALSE == cpy_info->preserve_null) {
+            while (deleted[mesgno + null_msgs]) {
                 ++null_msgs;
                 HDassert(mesgno + null_msgs < oh_src->nmesgs);
             } /* end while */
-        } /* end if */
+        }     /* end if */
 
         /* Set up convenience variables */
         mesg_src = &(oh_src->mesg[mesgno + null_msgs]);
@@ -806,8 +789,8 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
         copy_type = mesg_dst->type;
         HDassert(copy_type);
 
-        if(copy_type->post_copy_file && mesg_src->native) {
-            unsigned mesg_flags;        /* Message flags */
+        if (copy_type->post_copy_file && mesg_src->native) {
+            unsigned mesg_flags; /* Message flags */
 
             /* Sanity check destination message */
             HDassert(mesg_dst->type == mesg_src->type);
@@ -821,58 +804,58 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
             cpy_info->oh_dst = oh_dst;
 
             /* Perform "post copy" operation on message */
-            if((copy_type->post_copy_file)(oloc_src, mesg_src->native, oloc_dst,
-                    mesg_dst->native, &mesg_flags, dxpl_id, cpy_info) < 0)
-                HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to perform 'post copy' operation on message")
+            if ((copy_type->post_copy_file)(oloc_src, mesg_src->native, oloc_dst, mesg_dst->native,
+                                            &mesg_flags, dxpl_id, cpy_info) < 0)
+                HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL,
+                            "unable to perform 'post copy' operation on message")
 
             /* Verify that the flags did not change */
-            HDassert(mesg_flags == (unsigned) mesg_dst->flags);
+            HDassert(mesg_flags == (unsigned)mesg_dst->flags);
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Indicate that the destination address will no longer be locked */
     addr_map->is_locked = FALSE;
 
     /* Increment object header's reference count, if any descendents have created links to this object */
-    if(addr_map->inc_ref_count) {
+    if (addr_map->inc_ref_count) {
         H5_CHECK_OVERFLOW(addr_map->inc_ref_count, hsize_t, unsigned);
         oh_dst->nlink += (unsigned)addr_map->inc_ref_count;
     } /* end if */
 
     /* Insert destination object header in cache */
-    if(H5AC_insert_entry(oloc_dst->file, dxpl_id, H5AC_OHDR, oloc_dst->addr, oh_dst, H5AC__NO_FLAGS_SET) < 0)
+    if (H5AC_insert_entry(oloc_dst->file, dxpl_id, H5AC_OHDR, oloc_dst->addr, oh_dst, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header")
-    oh_dst = NULL;
+    oh_dst   = NULL;
     inserted = TRUE;
 
     /* Set obj_type and udata, if requested */
-    if(obj_type) {
+    if (obj_type) {
         HDassert(udata);
         *obj_type = obj_class->type;
-        *udata = cpy_udata;
+        *udata    = cpy_udata;
     } /* end if */
 
 done:
     /* Free deleted array */
-    if(deleted)
+    if (deleted)
         HDfree(deleted);
 
     /* Release pointer to source object header and its derived objects */
-    if(oh_src && H5O_unprotect(oloc_src, dxpl_id, oh_src, H5AC__NO_FLAGS_SET) < 0)
+    if (oh_src && H5O_unprotect(oloc_src, dxpl_id, oh_src, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     /* Free destination object header on failure */
-    if(ret_value < 0 && oh_dst && !inserted) {
-        if(H5O_free(oh_dst) < 0)
+    if (ret_value < 0 && oh_dst && !inserted) {
+        if (H5O_free(oh_dst) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data")
-        if(H5O_loc_reset(oloc_dst) < 0)
+        if (H5O_loc_reset(oloc_dst) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_header_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_header_map
  *
@@ -887,14 +870,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
-    hid_t dxpl_id, H5O_copy_t *cpy_info, hbool_t inc_depth,
-    H5O_type_t *obj_type, void **udata /*out*/)
+H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, hid_t dxpl_id,
+                    H5O_copy_t *cpy_info, hbool_t inc_depth, H5O_type_t *obj_type, void **udata /*out*/)
 {
-    H5O_addr_map_t      *addr_map = NULL;       /* Address mapping of object copied */
-    H5_obj_t            src_obj_pos;            /* Position of source object */
-    hbool_t             inc_link;               /* Whether to increment the link count for the object */
-    herr_t              ret_value = SUCCEED;
+    H5O_addr_map_t *addr_map = NULL; /* Address mapping of object copied */
+    H5_obj_t        src_obj_pos;     /* Position of source object */
+    hbool_t         inc_link;        /* Whether to increment the link count for the object */
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -910,25 +892,23 @@ H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
     src_obj_pos.addr = oloc_src->addr;
 
     /* Search for the object in the skip list of copied objects */
-    addr_map = (H5O_addr_map_t *)H5SL_search(cpy_info->map_list,
-            &src_obj_pos);
+    addr_map = (H5O_addr_map_t *)H5SL_search(cpy_info->map_list, &src_obj_pos);
 
     /* Check if address is already in list of objects copied */
-    if(addr_map == NULL) {
+    if (addr_map == NULL) {
         /* Copy object for the first time */
 
         /* Check for incrementing the depth of copy */
         /* (Can't do this for all copies, since committed datatypes should always be copied) */
-        if(inc_depth)
+        if (inc_depth)
             cpy_info->curr_depth++;
 
         /* Copy object referred to */
-        if(H5O_copy_header_real(oloc_src, oloc_dst, dxpl_id, cpy_info, obj_type,
-                udata) < 0)
+        if (H5O_copy_header_real(oloc_src, oloc_dst, dxpl_id, cpy_info, obj_type, udata) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
         /* Check for incrementing the depth of copy */
-        if(inc_depth)
+        if (inc_depth)
             cpy_info->curr_depth--;
 
         /* When an object is copied for the first time, increment it's link */
@@ -942,10 +922,10 @@ H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
         oloc_dst->addr = addr_map->dst_addr;
 
         /* Return saved obj_type and udata, if requested */
-        if(obj_type) {
+        if (obj_type) {
             HDassert(udata);
             *obj_type = addr_map->obj_class->type;
-            *udata = addr_map->udata;
+            *udata    = addr_map->udata;
         } /* end if */
 
         /* If the object is locked currently (because we are copying a group
@@ -953,7 +933,7 @@ H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
          * increment it's deferred reference count instead of incrementing the
          * reference count now.
          */
-        if(addr_map->is_locked) {
+        if (addr_map->is_locked) {
             addr_map->inc_ref_count++;
             inc_link = FALSE;
         } /* end if */
@@ -962,15 +942,14 @@ H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/,
     } /* end else */
 
     /* Increment destination object's link count, if allowed */
-    if(inc_link)
-        if(H5O_link(oloc_dst, 1, dxpl_id) < 0)
+    if (inc_link)
+        if (H5O_link(oloc_dst, 1, dxpl_id) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to increment object link count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_header_map() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_copy_free_addrmap_cb
@@ -1000,7 +979,7 @@ H5O_copy_free_addrmap_cb(void *_item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNU
     HDassert(item);
 
     /* Release user data for particular type of object */
-    if(item->udata) {
+    if (item->udata) {
         HDassert(item->obj_class);
         HDassert(item->obj_class->free_copy_file_udata);
         (item->obj_class->free_copy_file_udata)(item->udata);
@@ -1010,9 +989,8 @@ H5O_copy_free_addrmap_cb(void *_item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNU
     item = H5FL_FREE(H5O_addr_map_t, item);
 
     FUNC_LEAVE_NOAPI(0)
-}   /* H5O_copy_free_addrmap_cb() */
+} /* H5O_copy_free_addrmap_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_header
  *
@@ -1026,15 +1004,14 @@ H5O_copy_free_addrmap_cb(void *_item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNU
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
-    hid_t dxpl_id, hid_t ocpypl_id)
+H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t dxpl_id, hid_t ocpypl_id)
 {
-    H5O_copy_t  cpy_info;               /* Information for copying object */
-    H5P_genplist_t  *ocpy_plist;        /* Object copy property list created */
+    H5O_copy_t                   cpy_info;       /* Information for copying object */
+    H5P_genplist_t *             ocpy_plist;     /* Object copy property list created */
     H5O_copy_dtype_merge_list_t *dt_list = NULL; /* List of datatype merge suggestions */
-    H5O_mcdt_cb_info_t   cb_info;      	/* Callback info struct */
-    unsigned    cpy_option = 0;         /* Copy options */
-    herr_t      ret_value = SUCCEED;
+    H5O_mcdt_cb_info_t           cb_info;        /* Callback info struct */
+    unsigned                     cpy_option = 0; /* Copy options */
+    herr_t                       ret_value  = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1048,40 +1025,40 @@ H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
     HDmemset(&cpy_info, 0, sizeof(H5O_copy_t));
 
     /* Get the copy property list */
-    if(NULL == (ocpy_plist = (H5P_genplist_t *)H5I_object(ocpypl_id)))
+    if (NULL == (ocpy_plist = (H5P_genplist_t *)H5I_object(ocpypl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Retrieve the copy parameters */
-    if(H5P_get(ocpy_plist, H5O_CPY_OPTION_NAME, &cpy_option) < 0)
+    if (H5P_get(ocpy_plist, H5O_CPY_OPTION_NAME, &cpy_option) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object copy flag")
 
     /* Retrieve the marge committed datatype list */
-    if(H5P_get(ocpy_plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &dt_list) < 0)
+    if (H5P_get(ocpy_plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &dt_list) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get merge committed datatype list")
 
     /* Get callback info */
-    if(H5P_get(ocpy_plist, H5O_CPY_MCDT_SEARCH_CB_NAME, &cb_info) < 0)
+    if (H5P_get(ocpy_plist, H5O_CPY_MCDT_SEARCH_CB_NAME, &cb_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get callback info")
 
     /* Convert copy flags into copy struct */
-    if((cpy_option & H5O_COPY_SHALLOW_HIERARCHY_FLAG) > 0) {
+    if ((cpy_option & H5O_COPY_SHALLOW_HIERARCHY_FLAG) > 0) {
         cpy_info.copy_shallow = TRUE;
-        cpy_info.max_depth = 1;
+        cpy_info.max_depth    = 1;
     } /* end if */
     else
-        cpy_info.max_depth = -1;        /* Current default is for full, recursive hier. copy */
+        cpy_info.max_depth = -1; /* Current default is for full, recursive hier. copy */
     cpy_info.curr_depth = 0;
-    if((cpy_option & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0)
+    if ((cpy_option & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0)
         cpy_info.expand_soft_link = TRUE;
-    if((cpy_option & H5O_COPY_EXPAND_EXT_LINK_FLAG) > 0)
+    if ((cpy_option & H5O_COPY_EXPAND_EXT_LINK_FLAG) > 0)
         cpy_info.expand_ext_link = TRUE;
-    if((cpy_option & H5O_COPY_EXPAND_REFERENCE_FLAG) > 0)
+    if ((cpy_option & H5O_COPY_EXPAND_REFERENCE_FLAG) > 0)
         cpy_info.expand_ref = TRUE;
-    if((cpy_option & H5O_COPY_WITHOUT_ATTR_FLAG) > 0)
+    if ((cpy_option & H5O_COPY_WITHOUT_ATTR_FLAG) > 0)
         cpy_info.copy_without_attr = TRUE;
-    if((cpy_option & H5O_COPY_PRESERVE_NULL_FLAG) > 0)
+    if ((cpy_option & H5O_COPY_PRESERVE_NULL_FLAG) > 0)
         cpy_info.preserve_null = TRUE;
-    if((cpy_option & H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) > 0)
+    if ((cpy_option & H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) > 0)
         cpy_info.merge_comm_dt = TRUE;
 
     /* Add dt_list to copy struct */
@@ -1092,23 +1069,22 @@ H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
     cpy_info.mcdt_ud = cb_info.user_data;
 
     /* Create a skip list to keep track of which objects are copied */
-    if(NULL == (cpy_info.map_list = H5SL_create(H5SL_TYPE_OBJ, NULL)))
+    if (NULL == (cpy_info.map_list = H5SL_create(H5SL_TYPE_OBJ, NULL)))
         HGOTO_ERROR(H5E_SLIST, H5E_CANTCREATE, FAIL, "cannot make skip list")
 
     /* copy the object from the source file to the destination file */
-    if(H5O_copy_header_real(oloc_src, oloc_dst, dxpl_id, &cpy_info, NULL, NULL) < 0)
+    if (H5O_copy_header_real(oloc_src, oloc_dst, dxpl_id, &cpy_info, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
 done:
-    if(cpy_info.map_list)
+    if (cpy_info.map_list)
         H5SL_destroy(cpy_info.map_list, H5O_copy_free_addrmap_cb, NULL);
-    if(cpy_info.dst_dt_list)
+    if (cpy_info.dst_dt_list)
         H5SL_destroy(cpy_info.dst_dt_list, H5O_copy_free_comm_dt_cb, NULL);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_header() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_obj
  *
@@ -1122,15 +1098,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name,
-    hid_t ocpypl_id, hid_t lcpl_id, hid_t dxpl_id)
+H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id,
+             hid_t dxpl_id)
 {
-    H5G_name_t      new_path;                   /* Copied object group hier. path */
-    H5O_loc_t       new_oloc;                   /* Copied object object location */
-    H5G_loc_t       new_loc;                    /* Group location of object copied */
-    H5F_t           *cached_dst_file;           /* Cached destination file */
-    hbool_t         entry_inserted = FALSE;     /* Flag to indicate that the new entry was inserted into a group */
-    herr_t          ret_value = SUCCEED;        /* Return value */
+    H5G_name_t new_path;                 /* Copied object group hier. path */
+    H5O_loc_t  new_oloc;                 /* Copied object object location */
+    H5G_loc_t  new_loc;                  /* Group location of object copied */
+    H5F_t *    cached_dst_file;          /* Cached destination file */
+    hbool_t    entry_inserted = FALSE;   /* Flag to indicate that the new entry was inserted into a group */
+    herr_t     ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1152,7 +1128,7 @@ H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name,
     cached_dst_file = dst_loc->oloc->file;
 
     /* Copy the object from the source file to the destination file */
-    if(H5O_copy_header(src_loc->oloc, &new_oloc, dxpl_id, ocpypl_id) < 0)
+    if (H5O_copy_header(src_loc->oloc, &new_oloc, dxpl_id, ocpypl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
     /* Patch dst_loc.  Again, this can be removed once oloc's point to shared
@@ -1160,19 +1136,18 @@ H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name,
     dst_loc->oloc->file = cached_dst_file;
 
     /* Insert the new object in the destination file's group */
-    if(H5L_link(dst_loc, dst_name, &new_loc, lcpl_id, H5P_DEFAULT, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to insert link")
+    if (H5L_link(dst_loc, dst_name, &new_loc, lcpl_id, H5P_DEFAULT, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to insert link")
     entry_inserted = TRUE;
 
 done:
     /* Free the ID to name buffers */
-    if(entry_inserted)
+    if (entry_inserted)
         H5G_loc_free(&new_loc);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_obj() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_obj_by_ref
  *
@@ -1186,10 +1161,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc,
-    H5G_loc_t *dst_root_loc, H5O_copy_t *cpy_info)
+H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc, H5G_loc_t *dst_root_loc,
+                    H5O_copy_t *cpy_info)
 {
-    herr_t  ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1197,16 +1172,15 @@ H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc,
     HDassert(dst_oloc);
 
     /* Perform the copy, or look up existing copy */
-    if((ret_value = H5O_copy_header_map(src_oloc, dst_oloc, dxpl_id, cpy_info,
-            FALSE, NULL, NULL)) < 0)
+    if ((ret_value = H5O_copy_header_map(src_oloc, dst_oloc, dxpl_id, cpy_info, FALSE, NULL, NULL)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
     /* Check if a new valid object is copied to the destination */
-    if(H5F_addr_defined(dst_oloc->addr) && (ret_value > SUCCEED)) {
-        char    tmp_obj_name[80];
-        H5G_name_t      new_path;
-        H5O_loc_t       new_oloc;
-        H5G_loc_t       new_loc;
+    if (H5F_addr_defined(dst_oloc->addr) && (ret_value > SUCCEED)) {
+        char       tmp_obj_name[80];
+        H5G_name_t new_path;
+        H5O_loc_t  new_oloc;
+        H5G_loc_t  new_loc;
 
         /* Set up group location for new object */
         new_loc.oloc = &new_oloc;
@@ -1216,7 +1190,8 @@ H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc,
         new_oloc.addr = dst_oloc->addr;
 
         /* Pick a default name for the new object */
-        HDsnprintf(tmp_obj_name, sizeof(tmp_obj_name), "~obj_pointed_by_%llu", (unsigned long long)dst_oloc->addr);
+        HDsnprintf(tmp_obj_name, sizeof(tmp_obj_name), "~obj_pointed_by_%llu",
+                   (unsigned long long)dst_oloc->addr);
 
         /* Create a link to the newly copied object */
         /* Note: since H5O_copy_header_map actually copied the target object, it
@@ -1224,7 +1199,7 @@ H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc,
          * pass the obj_type and udata fields returned by H5O_copy_header_map.
          * This could be changed in the future to slightly improve performance
          * --NAF */
-        if(H5L_link(dst_root_loc, tmp_obj_name, &new_loc, H5P_DEFAULT, H5P_DEFAULT, dxpl_id) < 0)
+        if (H5L_link(dst_root_loc, tmp_obj_name, &new_loc, H5P_DEFAULT, H5P_DEFAULT, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to insert link")
 
         H5G_loc_free(&new_loc);
@@ -1234,7 +1209,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_obj_by_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_copy_expand_ref
  *
@@ -1248,17 +1222,16 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
-    H5F_t *file_dst, void *_dst_ref, size_t ref_count, H5R_type_t ref_type,
-    H5O_copy_t *cpy_info)
+H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id, H5F_t *file_dst, void *_dst_ref,
+                    size_t ref_count, H5R_type_t ref_type, H5O_copy_t *cpy_info)
 {
-    H5O_loc_t 	dst_oloc;         	/* Copied object object location */
-    H5O_loc_t	src_oloc;          	/* Temporary object location for source object */
-    H5G_loc_t   dst_root_loc;           /* The location of root group of the destination file */
-    const uint8_t *q;                   /* Pointer to source OID to store */
-    uint8_t     *p;                     /* Pointer to destination OID to store */
-    size_t      i;                      /* Local index variable */
-    herr_t	ret_value = SUCCEED;
+    H5O_loc_t      dst_oloc;     /* Copied object object location */
+    H5O_loc_t      src_oloc;     /* Temporary object location for source object */
+    H5G_loc_t      dst_root_loc; /* The location of root group of the destination file */
+    const uint8_t *q;            /* Pointer to source OID to store */
+    uint8_t *      p;            /* Pointer to destination OID to store */
+    size_t         i;            /* Local index variable */
+    herr_t         ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1277,26 +1250,26 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
     dst_oloc.file = file_dst;
 
     /* Set up the root group in the destination file */
-    if(NULL == (dst_root_loc.oloc = H5G_oloc(H5G_rootof(file_dst))))
+    if (NULL == (dst_root_loc.oloc = H5G_oloc(H5G_rootof(file_dst))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location for root group")
-    if(NULL == (dst_root_loc.path = H5G_nameof(H5G_rootof(file_dst))))
+    if (NULL == (dst_root_loc.path = H5G_nameof(H5G_rootof(file_dst))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path for root group")
 
     /* Copy object references */
-    if(H5R_OBJECT == ref_type) {
+    if (H5R_OBJECT == ref_type) {
         hobj_ref_t *src_ref = (hobj_ref_t *)_src_ref;
         hobj_ref_t *dst_ref = (hobj_ref_t *)_dst_ref;
 
         /* Making equivalent references in the destination file */
-        for(i = 0; i < ref_count; i++) {
+        for (i = 0; i < ref_count; i++) {
             /* Set up for the object copy for the reference */
             q = (uint8_t *)(&src_ref[i]);
             H5F_addr_decode(src_oloc.file, (const uint8_t **)&q, &(src_oloc.addr));
             dst_oloc.addr = HADDR_UNDEF;
 
             /* Attempt to copy object from source to destination file */
-            if(src_oloc.addr != (haddr_t)0) {
-                if(H5O_copy_obj_by_ref(&src_oloc, dxpl_id, &dst_oloc, &dst_root_loc, cpy_info) < 0)
+            if (src_oloc.addr != (haddr_t)0) {
+                if (H5O_copy_obj_by_ref(&src_oloc, dxpl_id, &dst_oloc, &dst_root_loc, cpy_info) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
             } /* end if */
             else
@@ -1306,27 +1279,28 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
             /* Set the object reference info for the destination file */
             p = (uint8_t *)(&dst_ref[i]);
             H5F_addr_encode(dst_oloc.file, &p, dst_oloc.addr);
-	} /* end for */
-    }  /* end if */
+        } /* end for */
+    }     /* end if */
     /* Copy region references */
-    else if(H5R_DATASET_REGION == ref_type) {
+    else if (H5R_DATASET_REGION == ref_type) {
         hdset_reg_ref_t *src_ref = (hdset_reg_ref_t *)_src_ref;
         hdset_reg_ref_t *dst_ref = (hdset_reg_ref_t *)_dst_ref;
-        uint8_t *buf = NULL;    /* Buffer to store serialized selection in */
-        H5HG_t hobjid;          /* Heap object ID */
-        size_t buf_size;        /* Length of object in heap */
+        uint8_t *        buf     = NULL; /* Buffer to store serialized selection in */
+        H5HG_t           hobjid;         /* Heap object ID */
+        size_t           buf_size;       /* Length of object in heap */
 
         /* Making equivalent references in the destination file */
-        for(i = 0; i < ref_count; i++) {
+        for (i = 0; i < ref_count; i++) {
             /* Get the heap ID for the dataset region */
             q = (const uint8_t *)(&src_ref[i]);
             H5F_addr_decode(src_oloc.file, (const uint8_t **)&q, &(hobjid.addr));
             UINT32DECODE(q, hobjid.idx);
 
-            if(hobjid.addr != (haddr_t)0) {
+            if (hobjid.addr != (haddr_t)0) {
                 /* Get the dataset region from the heap (allocate inside routine) */
-                if((buf = (uint8_t *)H5HG_read(src_oloc.file, dxpl_id, &hobjid, NULL, &buf_size)) == NULL)
-                    HGOTO_ERROR(H5E_REFERENCE, H5E_READERROR, FAIL, "Unable to read dataset region information")
+                if ((buf = (uint8_t *)H5HG_read(src_oloc.file, dxpl_id, &hobjid, NULL, &buf_size)) == NULL)
+                    HGOTO_ERROR(H5E_REFERENCE, H5E_READERROR, FAIL,
+                                "Unable to read dataset region information")
 
                 /* Get the object oid for the dataset */
                 q = (const uint8_t *)buf;
@@ -1334,7 +1308,7 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
                 dst_oloc.addr = HADDR_UNDEF;
 
                 /* copy the object pointed by the ref to the destination */
-                if(H5O_copy_obj_by_ref(&src_oloc, dxpl_id, &dst_oloc, &dst_root_loc, cpy_info) < 0) {
+                if (H5O_copy_obj_by_ref(&src_oloc, dxpl_id, &dst_oloc, &dst_root_loc, cpy_info) < 0) {
                     H5MM_xfree(buf);
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
                 } /* end if */
@@ -1344,11 +1318,11 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
                 H5F_addr_encode(dst_oloc.file, &p, dst_oloc.addr);
 
                 /* Save the serialized buffer to the destination */
-                if(H5HG_insert(dst_oloc.file, dxpl_id, buf_size, buf, &hobjid) < 0) {
+                if (H5HG_insert(dst_oloc.file, dxpl_id, buf_size, buf, &hobjid) < 0) {
                     H5MM_xfree(buf);
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "Unable to write dataset region information")
                 } /* end if */
-            } /* end if */
+            }     /* end if */
             else
                 /* Set parameters so the reference is written as all 0's */
                 HDmemset(&hobjid, 0, sizeof(hobjid));
@@ -1361,7 +1335,7 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
             /* Free the buffer allocated in H5HG_read() */
             H5MM_xfree(buf);
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
 
@@ -1369,7 +1343,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_expand_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_free_comm_dt_cb
  *
@@ -1385,8 +1358,8 @@ done:
 static herr_t
 H5O_copy_free_comm_dt_cb(void *item, void *_key, void H5_ATTR_UNUSED *op_data)
 {
-    haddr_t     *addr = (haddr_t *)item;
-    H5O_copy_search_comm_dt_key_t *key = (H5O_copy_search_comm_dt_key_t *)_key;
+    haddr_t *                      addr = (haddr_t *)item;
+    H5O_copy_search_comm_dt_key_t *key  = (H5O_copy_search_comm_dt_key_t *)_key;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1395,13 +1368,12 @@ H5O_copy_free_comm_dt_cb(void *item, void *_key, void H5_ATTR_UNUSED *op_data)
     HDassert(key->dt);
 
     key->dt = (H5T_t *)H5O_msg_free(H5O_DTYPE_ID, key->dt);
-    key = H5FL_FREE(H5O_copy_search_comm_dt_key_t, key);
-    addr = H5FL_FREE(haddr_t, addr);
+    key     = H5FL_FREE(H5O_copy_search_comm_dt_key_t, key);
+    addr    = H5FL_FREE(haddr_t, addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_copy_free_comm_dt_cb */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_comm_dt_cmp
  *
@@ -1420,18 +1392,18 @@ H5O_copy_free_comm_dt_cb(void *item, void *_key, void H5_ATTR_UNUSED *op_data)
 static int
 H5O_copy_comm_dt_cmp(const void *_key1, const void *_key2)
 {
-    const H5O_copy_search_comm_dt_key_t *key1 = (const H5O_copy_search_comm_dt_key_t *)_key1;
-    const H5O_copy_search_comm_dt_key_t *key2 = (const H5O_copy_search_comm_dt_key_t *)_key2;
-    int ret_value = 0;
+    const H5O_copy_search_comm_dt_key_t *key1      = (const H5O_copy_search_comm_dt_key_t *)_key1;
+    const H5O_copy_search_comm_dt_key_t *key2      = (const H5O_copy_search_comm_dt_key_t *)_key2;
+    int                                  ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check fileno.  It is unlikely to be different so check if they are equal
      * first so only one comparison needs to be made. */
-    if(key1->fileno != key2->fileno) {
-        if(key1->fileno < key2->fileno)
+    if (key1->fileno != key2->fileno) {
+        if (key1->fileno < key2->fileno)
             HGOTO_DONE(-1)
-        if(key1->fileno > key2->fileno)
+        if (key1->fileno > key2->fileno)
             HGOTO_DONE(1)
     } /* end if */
 
@@ -1441,7 +1413,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_comm_dt_cmp */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_search_comm_dt_attr_cb
  *
@@ -1461,12 +1432,12 @@ done:
 static herr_t
 H5O_copy_search_comm_dt_attr_cb(const H5A_t *attr, void *_udata)
 {
-    H5O_copy_search_comm_dt_ud_t *udata = (H5O_copy_search_comm_dt_ud_t *)_udata;
-    H5T_t       *dt = NULL;             /* Datatype */
-    H5O_copy_search_comm_dt_key_t *key = NULL; /* Skiplist key */
-    haddr_t     *addr = NULL;           /* Destination address */
-    hbool_t     obj_inserted = FALSE;   /* Object inserted into skip list */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_copy_search_comm_dt_ud_t * udata        = (H5O_copy_search_comm_dt_ud_t *)_udata;
+    H5T_t *                        dt           = NULL;    /* Datatype */
+    H5O_copy_search_comm_dt_key_t *key          = NULL;    /* Skiplist key */
+    haddr_t *                      addr         = NULL;    /* Destination address */
+    hbool_t                        obj_inserted = FALSE;   /* Object inserted into skip list */
+    herr_t                         ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1477,53 +1448,52 @@ H5O_copy_search_comm_dt_attr_cb(const H5A_t *attr, void *_udata)
     HDassert(H5F_addr_defined(udata->obj_oloc.addr));
 
     /* Get attribute datatype */
-    if(NULL == (dt = H5A_type(attr)))
+    if (NULL == (dt = H5A_type(attr)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get attribute datatype")
 
     /* Check if the datatype is committed and search the skip list if so */
-    if(H5T_committed(dt)) {
+    if (H5T_committed(dt)) {
         /* Allocate key */
-        if(NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
+        if (NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Copy datatype into key */
-        if(NULL == (key->dt = (H5T_t *)H5O_msg_copy(H5O_DTYPE_ID, dt, NULL)))
+        if (NULL == (key->dt = (H5T_t *)H5O_msg_copy(H5O_DTYPE_ID, dt, NULL)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to copy datatype message")
 
         /* Get datatype object fileno */
         H5F_GET_FILENO(udata->obj_oloc.file, key->fileno);
 
-        if(!H5SL_search(udata->dst_dt_list, key)) {
+        if (!H5SL_search(udata->dst_dt_list, key)) {
             /* Allocate destination address */
-            if(NULL == (addr = H5FL_MALLOC(haddr_t)))
+            if (NULL == (addr = H5FL_MALLOC(haddr_t)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Add the destination datatype to the skip list */
             *addr = ((H5O_shared_t *)(key->dt))->u.loc.oh_addr;
-            if(H5SL_insert(udata->dst_dt_list, addr, key) < 0)
+            if (H5SL_insert(udata->dst_dt_list, addr, key) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object into skip list")
             obj_inserted = TRUE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Release resources */
-    if(!obj_inserted) {
-        if(key) {
-            if(key->dt)
+    if (!obj_inserted) {
+        if (key) {
+            if (key->dt)
                 key->dt = (H5T_t *)H5O_msg_free(H5O_DTYPE_ID, key->dt);
             key = H5FL_FREE(H5O_copy_search_comm_dt_key_t, key);
         } /* end if */
-        if(addr) {
+        if (addr) {
             HDassert(ret_value < 0);
             addr = H5FL_FREE(haddr_t, addr);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_search_comm_dt_attr_cb */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_search_comm_dt_check
  *
@@ -1544,15 +1514,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_copy_search_comm_dt_check(H5O_loc_t *obj_oloc,
-    H5O_copy_search_comm_dt_ud_t *udata)
+H5O_copy_search_comm_dt_check(H5O_loc_t *obj_oloc, H5O_copy_search_comm_dt_ud_t *udata)
 {
-    H5O_copy_search_comm_dt_key_t *key = NULL; /* Skiplist key */
-    haddr_t     *addr = NULL;           /* Destination address */
-    hbool_t     obj_inserted = FALSE;   /* Object inserted into skip list */
-    H5A_attr_iter_op_t attr_op;         /* Attribute iteration operator */
-    const H5O_obj_class_t  *obj_class = NULL;       /* Type of object */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_copy_search_comm_dt_key_t *key          = NULL;  /* Skiplist key */
+    haddr_t *                      addr         = NULL;  /* Destination address */
+    hbool_t                        obj_inserted = FALSE; /* Object inserted into skip list */
+    H5A_attr_iter_op_t             attr_op;              /* Attribute iteration operator */
+    const H5O_obj_class_t *        obj_class = NULL;     /* Type of object */
+    herr_t                         ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1563,92 +1532,91 @@ H5O_copy_search_comm_dt_check(H5O_loc_t *obj_oloc,
     HDassert(udata->dst_root_loc);
 
     /* Get pointer to object class for this object */
-    if((obj_class = H5O_obj_class(obj_oloc, udata->dxpl_id)) == NULL)
+    if ((obj_class = H5O_obj_class(obj_oloc, udata->dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
 
     /* Check if the object is a datatype, a dataset using a committed
      * datatype, or contains an attribute using a committed datatype */
-    if(obj_class->type == H5O_TYPE_NAMED_DATATYPE) {
+    if (obj_class->type == H5O_TYPE_NAMED_DATATYPE) {
         /* Allocate key */
-        if(NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
+        if (NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Read the destination datatype */
-        if(NULL == (key->dt = (H5T_t *)H5O_msg_read(obj_oloc, H5O_DTYPE_ID, NULL, udata->dxpl_id)))
+        if (NULL == (key->dt = (H5T_t *)H5O_msg_read(obj_oloc, H5O_DTYPE_ID, NULL, udata->dxpl_id)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't read DTYPE message")
 
         /* Get destination object fileno */
         H5F_GET_FILENO(obj_oloc->file, key->fileno);
 
         /* Check if the datatype is already present in the skip list */
-        if(!H5SL_search(udata->dst_dt_list, key)) {
+        if (!H5SL_search(udata->dst_dt_list, key)) {
             /* Allocate destination address */
-            if(NULL == (addr = H5FL_MALLOC(haddr_t)))
+            if (NULL == (addr = H5FL_MALLOC(haddr_t)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Add the destination datatype to the skip list */
             *addr = obj_oloc->addr;
-            if(H5SL_insert(udata->dst_dt_list, addr, key) < 0)
+            if (H5SL_insert(udata->dst_dt_list, addr, key) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object into skip list")
             obj_inserted = TRUE;
         } /* end if */
-    } /* end if */
-    else if(obj_class->type == H5O_TYPE_DATASET) {
+    }     /* end if */
+    else if (obj_class->type == H5O_TYPE_DATASET) {
         /* Allocate key */
-        if(NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
+        if (NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Read the destination datatype */
-        if(NULL == (key->dt = (H5T_t *)H5O_msg_read(obj_oloc, H5O_DTYPE_ID, NULL, udata->dxpl_id)))
+        if (NULL == (key->dt = (H5T_t *)H5O_msg_read(obj_oloc, H5O_DTYPE_ID, NULL, udata->dxpl_id)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't read DTYPE message")
 
         /* Check if the datatype is committed and search the skip list if so
-            */
-        if(H5T_committed(key->dt)) {
+         */
+        if (H5T_committed(key->dt)) {
             /* Get datatype object fileno */
             H5F_GET_FILENO(obj_oloc->file, key->fileno);
 
-            if(!H5SL_search(udata->dst_dt_list, key)) {
+            if (!H5SL_search(udata->dst_dt_list, key)) {
                 /* Allocate destination address */
-                if(NULL == (addr = H5FL_MALLOC(haddr_t)))
+                if (NULL == (addr = H5FL_MALLOC(haddr_t)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
                 /* Add the destination datatype to the skip list */
                 *addr = ((H5O_shared_t *)(key->dt))->u.loc.oh_addr;
-                if(H5SL_insert(udata->dst_dt_list, addr, key) < 0)
+                if (H5SL_insert(udata->dst_dt_list, addr, key) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object into skip list")
                 obj_inserted = TRUE;
             } /* end if */
-        } /* end if */
-    } /* end else */
+        }     /* end if */
+    }         /* end else */
 
     /* Search within attributes */
-    attr_op.op_type = H5A_ATTR_OP_LIB;
-    attr_op.u.lib_op = H5O_copy_search_comm_dt_attr_cb;
+    attr_op.op_type      = H5A_ATTR_OP_LIB;
+    attr_op.u.lib_op     = H5O_copy_search_comm_dt_attr_cb;
     udata->obj_oloc.file = obj_oloc->file;
     udata->obj_oloc.addr = obj_oloc->addr;
-    if(H5O_attr_iterate_real((hid_t)-1, obj_oloc, udata->dxpl_id, H5_INDEX_NAME, 
-                             H5_ITER_NATIVE, (hsize_t)0, NULL, &attr_op, udata) < 0)
+    if (H5O_attr_iterate_real((hid_t)-1, obj_oloc, udata->dxpl_id, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0,
+                              NULL, &attr_op, udata) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "error iterating over attributes");
 
 done:
     /* Release resources */
-    if(!obj_inserted) {
-        if(key) {
-            if(key->dt)
+    if (!obj_inserted) {
+        if (key) {
+            if (key->dt)
                 key->dt = (H5T_t *)H5O_msg_free(H5O_DTYPE_ID, key->dt);
             key = H5FL_FREE(H5O_copy_search_comm_dt_key_t, key);
         } /* end if */
-        if(addr) {
+        if (addr) {
             HDassert(ret_value < 0);
             addr = H5FL_FREE(haddr_t, addr);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_search_comm_dt_check */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_search_comm_dt_cb
  *
@@ -1664,15 +1632,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_copy_search_comm_dt_cb(hid_t H5_ATTR_UNUSED group, const char *name,
-    const H5L_info_t *linfo, void *_udata)
+H5O_copy_search_comm_dt_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *linfo,
+                           void *_udata)
 {
-    H5O_copy_search_comm_dt_ud_t *udata = (H5O_copy_search_comm_dt_ud_t *)_udata; /* Skip list of dtypes in dest file */
-    H5G_loc_t   obj_loc;                /* Location of object */
-    H5O_loc_t   obj_oloc;               /* Object's object location */
-    H5G_name_t  obj_path;               /* Object's group hier. path */
-    hbool_t     obj_found = FALSE;      /* Object at 'name' found */
-    herr_t      ret_value = H5_ITER_CONT; /* Return value */
+    H5O_copy_search_comm_dt_ud_t *udata =
+        (H5O_copy_search_comm_dt_ud_t *)_udata; /* Skip list of dtypes in dest file */
+    H5G_loc_t  obj_loc;                         /* Location of object */
+    H5O_loc_t  obj_oloc;                        /* Object's object location */
+    H5G_name_t obj_path;                        /* Object's group hier. path */
+    hbool_t    obj_found = FALSE;               /* Object at 'name' found */
+    herr_t     ret_value = H5_ITER_CONT;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1684,31 +1653,31 @@ H5O_copy_search_comm_dt_cb(hid_t H5_ATTR_UNUSED group, const char *name,
     HDassert(udata->dst_root_loc);
 
     /* Check if this is a hard link */
-    if(linfo->type == H5L_TYPE_HARD) {
+    if (linfo->type == H5L_TYPE_HARD) {
         /* Set up opened group location to fill in */
         obj_loc.oloc = &obj_oloc;
         obj_loc.path = &obj_path;
         H5G_loc_reset(&obj_loc);
 
         /* Find the object */
-        if(H5G_loc_find(udata->dst_root_loc, name, &obj_loc/*out*/, H5P_LINK_ACCESS_DEFAULT, udata->dxpl_id) < 0)
+        if (H5G_loc_find(udata->dst_root_loc, name, &obj_loc /*out*/, H5P_LINK_ACCESS_DEFAULT,
+                         udata->dxpl_id) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
         obj_found = TRUE;
 
         /* Check object and add to skip list if appropriate */
-        if(H5O_copy_search_comm_dt_check(&obj_oloc, udata) < 0)
+        if (H5O_copy_search_comm_dt_check(&obj_oloc, udata) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "can't check object")
     } /* end if */
 
 done:
     /* Release resources */
-    if(obj_found && H5G_loc_free(&obj_loc) < 0)
+    if (obj_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_search_comm_dt_cb */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_search_comm_dt
  *
@@ -1727,14 +1696,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5O_copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src,
-    H5O_loc_t *oloc_dst/*in, out*/, hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5O_copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst /*in, out*/, hid_t dxpl_id,
+                        H5O_copy_t *cpy_info)
 {
-    H5O_copy_search_comm_dt_key_t *key = NULL; /* Skiplist key */
-    haddr_t     *dst_addr;      /* Destination datatype address */
-    H5G_loc_t   dst_root_loc = {NULL, NULL}; /* Destination root group location */
-    H5O_copy_search_comm_dt_ud_t udata; /* Group iteration user data */
-    herr_t      ret_value = FALSE; /* Return value */
+    H5O_copy_search_comm_dt_key_t *key = NULL;                  /* Skiplist key */
+    haddr_t *                      dst_addr;                    /* Destination datatype address */
+    H5G_loc_t                      dst_root_loc = {NULL, NULL}; /* Destination root group location */
+    H5O_copy_search_comm_dt_ud_t   udata;                       /* Group iteration user data */
+    herr_t                         ret_value = FALSE;           /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1746,33 +1715,33 @@ H5O_copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src,
     HDassert(cpy_info);
 
     /* Allocate key */
-    if(NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
+    if (NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Read the source datatype */
-    if(NULL == (key->dt = (H5T_t *)H5O_msg_read_oh(file_src, dxpl_id, oh_src, H5O_DTYPE_ID, NULL)))
+    if (NULL == (key->dt = (H5T_t *)H5O_msg_read_oh(file_src, dxpl_id, oh_src, H5O_DTYPE_ID, NULL)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't read DTYPE message")
 
     /* Get destination object fileno */
     H5F_GET_FILENO(oloc_dst->file, key->fileno);
 
     /* Check if the destination dtype list exists, create it if it does not */
-    if(!cpy_info->dst_dt_list) {
+    if (!cpy_info->dst_dt_list) {
         /* Create the skip list */
-        if(NULL == (cpy_info->dst_dt_list = H5SL_create(H5SL_TYPE_GENERIC, H5O_copy_comm_dt_cmp)))
+        if (NULL == (cpy_info->dst_dt_list = H5SL_create(H5SL_TYPE_GENERIC, H5O_copy_comm_dt_cmp)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create skip list for committed datatypes")
 
         /* Add suggested types to list, if they are present */
-        if(cpy_info->dst_dt_suggestion_list) {
+        if (cpy_info->dst_dt_suggestion_list) {
             H5O_copy_dtype_merge_list_t *suggestion = cpy_info->dst_dt_suggestion_list;
-            H5G_loc_t   obj_loc;                /* Location of object */
-            H5O_loc_t   obj_oloc;               /* Object's object location */
-            H5G_name_t  obj_path;               /* Object's group hier. path */
+            H5G_loc_t                    obj_loc;  /* Location of object */
+            H5O_loc_t                    obj_oloc; /* Object's object location */
+            H5G_name_t                   obj_path; /* Object's group hier. path */
 
             /* Set up the root group in the destination file */
-            if(NULL == (dst_root_loc.oloc = H5G_oloc(H5G_rootof(oloc_dst->file))))
+            if (NULL == (dst_root_loc.oloc = H5G_oloc(H5G_rootof(oloc_dst->file))))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location for root group")
-            if(NULL == (dst_root_loc.path = H5G_nameof(H5G_rootof(oloc_dst->file))))
+            if (NULL == (dst_root_loc.path = H5G_nameof(H5G_rootof(oloc_dst->file))))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path for root group")
 
             /* Set up opened group location to fill in */
@@ -1781,101 +1750,102 @@ H5O_copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src,
             H5G_loc_reset(&obj_loc);
 
             /* Build udata */
-            udata.dst_dt_list = cpy_info->dst_dt_list;
-            udata.dst_root_loc = &dst_root_loc;
+            udata.dst_dt_list   = cpy_info->dst_dt_list;
+            udata.dst_root_loc  = &dst_root_loc;
             udata.obj_oloc.file = NULL;
             udata.obj_oloc.addr = HADDR_UNDEF;
-            udata.dxpl_id = dxpl_id;
+            udata.dxpl_id       = dxpl_id;
 
             /* Walk through the list of datatype suggestions */
-            while(suggestion) {
+            while (suggestion) {
                 /* Find the object */
-                if(H5G_loc_find(&dst_root_loc, suggestion->path, &obj_loc/*out*/, H5P_LINK_ACCESS_DEFAULT, dxpl_id) < 0)
+                if (H5G_loc_find(&dst_root_loc, suggestion->path, &obj_loc /*out*/, H5P_LINK_ACCESS_DEFAULT,
+                                 dxpl_id) < 0)
                     /* Ignore errors - i.e. suggestions not present in
                      * destination file */
                     H5E_clear_stack(NULL);
                 else
                     /* Check object and add to skip list if appropriate */
-                    if(H5O_copy_search_comm_dt_check(&obj_oloc, &udata) < 0) {
-                        if(H5G_loc_free(&obj_loc) < 0)
-                            HERROR(H5E_OHDR, H5E_CANTRELEASE, "can't free location");
-                        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't check object")
-                    } /* end if */
+                    if (H5O_copy_search_comm_dt_check(&obj_oloc, &udata) < 0) {
+                    if (H5G_loc_free(&obj_loc) < 0)
+                        HERROR(H5E_OHDR, H5E_CANTRELEASE, "can't free location");
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't check object")
+                } /* end if */
 
                 /* Free location */
-                if(H5G_loc_free(&obj_loc) < 0)
+                if (H5G_loc_free(&obj_loc) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't free location");
 
                 /* Advance the suggestion pointer */
                 suggestion = suggestion->next;
             } /* end while */
-        } /* end if */
+        }     /* end if */
     }
 
-    if(!cpy_info->dst_dt_list_complete) {
+    if (!cpy_info->dst_dt_list_complete) {
         /* Search for the type in the destination file, and return its address
          * if found, but only if the list is populated with and only with
          * suggested types.  We will search complete lists later. */
-        if(cpy_info->dst_dt_suggestion_list
-                && NULL != (dst_addr = (haddr_t *)H5SL_search(
-                cpy_info->dst_dt_list, key))) {
+        if (cpy_info->dst_dt_suggestion_list &&
+            NULL != (dst_addr = (haddr_t *)H5SL_search(cpy_info->dst_dt_list, key))) {
             oloc_dst->addr = *dst_addr;
-            ret_value = TRUE;
+            ret_value      = TRUE;
         } /* end if */
         else {
             H5O_mcdt_search_ret_t search_cb_ret = H5O_MCDT_SEARCH_CONT;
 
             /* Make callback to see if we should search destination file */
-            if(cpy_info->mcdt_cb)
-                if((search_cb_ret = cpy_info->mcdt_cb(cpy_info->mcdt_ud)) == H5O_MCDT_SEARCH_ERROR)
+            if (cpy_info->mcdt_cb)
+                if ((search_cb_ret = cpy_info->mcdt_cb(cpy_info->mcdt_ud)) == H5O_MCDT_SEARCH_ERROR)
                     HGOTO_ERROR(H5E_OHDR, H5E_CALLBACK, FAIL, "callback returned error")
 
-            if(search_cb_ret == H5O_MCDT_SEARCH_CONT) {
+            if (search_cb_ret == H5O_MCDT_SEARCH_CONT) {
                 /* Build the complete dst dt list */
                 /* Set up the root group in the destination file, if necessary */
-                if(!dst_root_loc.oloc) {
+                if (!dst_root_loc.oloc) {
                     HDassert(!dst_root_loc.path);
-                    if(NULL == (dst_root_loc.oloc = H5G_oloc(H5G_rootof(oloc_dst->file))))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get object location for root group")
-                    if(NULL == (dst_root_loc.path = H5G_nameof(H5G_rootof(oloc_dst->file))))
+                    if (NULL == (dst_root_loc.oloc = H5G_oloc(H5G_rootof(oloc_dst->file))))
+                        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                    "unable to get object location for root group")
+                    if (NULL == (dst_root_loc.path = H5G_nameof(H5G_rootof(oloc_dst->file))))
                         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get path for root group")
                 } /* end if */
                 else
                     HDassert(dst_root_loc.path);
 
                 /* Build udata.  Note that this may be done twice in some cases, but
-                * it should be rare and should be cheaper on average than trying to
-                * keep track of whether it was done before. */
-                udata.dst_dt_list = cpy_info->dst_dt_list;
-                udata.dst_root_loc = &dst_root_loc;
+                 * it should be rare and should be cheaper on average than trying to
+                 * keep track of whether it was done before. */
+                udata.dst_dt_list   = cpy_info->dst_dt_list;
+                udata.dst_root_loc  = &dst_root_loc;
                 udata.obj_oloc.file = NULL;
                 udata.obj_oloc.addr = HADDR_UNDEF;
-                udata.dxpl_id = dxpl_id;
+                udata.dxpl_id       = dxpl_id;
 
                 /* Traverse the destination file, adding committed datatypes to the skip
-                * list */
-                if(H5G_visit(H5F_FILE_ID(oloc_dst->file), "/", H5_INDEX_NAME, H5_ITER_NATIVE, H5O_copy_search_comm_dt_cb, &udata, H5P_LINK_ACCESS_DEFAULT, dxpl_id) < 0)
+                 * list */
+                if (H5G_visit(H5F_FILE_ID(oloc_dst->file), "/", H5_INDEX_NAME, H5_ITER_NATIVE,
+                              H5O_copy_search_comm_dt_cb, &udata, H5P_LINK_ACCESS_DEFAULT, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "object visitation failed")
                 cpy_info->dst_dt_list_complete = TRUE;
             } /* end if */
-            else
-                if(search_cb_ret != H5O_MCDT_SEARCH_STOP)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unknown return value for callback")
+            else if (search_cb_ret != H5O_MCDT_SEARCH_STOP)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unknown return value for callback")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Search for the type in the destination file, and return its address if
      * found, but only if the list is complete */
-    if(cpy_info->dst_dt_list_complete) {
-        if(NULL != (dst_addr = (haddr_t *)H5SL_search(cpy_info->dst_dt_list, key))) {
+    if (cpy_info->dst_dt_list_complete) {
+        if (NULL != (dst_addr = (haddr_t *)H5SL_search(cpy_info->dst_dt_list, key))) {
             oloc_dst->addr = *dst_addr;
-            ret_value = TRUE;
+            ret_value      = TRUE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
-    if(key) {
-        if(key->dt)
+    if (key) {
+        if (key->dt)
             key->dt = (H5T_t *)H5O_msg_free(H5O_DTYPE_ID, key->dt);
         key = H5FL_FREE(H5O_copy_search_comm_dt_key_t, key);
     } /* end if */
@@ -1883,7 +1853,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_search_comm_dt */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_copy_insert_comm_dt
  *
@@ -1898,12 +1867,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_copy_insert_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst,
-    hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5O_copy_insert_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst, hid_t dxpl_id,
+                        H5O_copy_t *cpy_info)
 {
-    H5O_copy_search_comm_dt_key_t *key = NULL; /* Skiplist key */
-    haddr_t     *addr = NULL;   /* Destination object address */
-    herr_t      ret_value = SUCCEED; /* Return value */
+    H5O_copy_search_comm_dt_key_t *key       = NULL;    /* Skiplist key */
+    haddr_t *                      addr      = NULL;    /* Destination object address */
+    herr_t                         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1916,37 +1885,36 @@ H5O_copy_insert_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst,
     HDassert(cpy_info->dst_dt_list);
 
     /* Allocate key */
-    if(NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
+    if (NULL == (key = H5FL_MALLOC(H5O_copy_search_comm_dt_key_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Read the datatype.  Read from the source file because the destination
      * object could be changed in the post-copy. */
-    if(NULL == (key->dt = (H5T_t *)H5O_msg_read_oh(file_src, dxpl_id, oh_src, H5O_DTYPE_ID, NULL)))
+    if (NULL == (key->dt = (H5T_t *)H5O_msg_read_oh(file_src, dxpl_id, oh_src, H5O_DTYPE_ID, NULL)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't read DTYPE message")
 
     /* Get destination object fileno */
     H5F_GET_FILENO(oloc_dst->file, key->fileno);
 
     /* Allocate destination address */
-    if(NULL == (addr = H5FL_MALLOC(haddr_t)))
+    if (NULL == (addr = H5FL_MALLOC(haddr_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Add the destination datatype to the skip list */
     *addr = oloc_dst->addr;
-    if(H5SL_insert(cpy_info->dst_dt_list, addr, key) < 0)
+    if (H5SL_insert(cpy_info->dst_dt_list, addr, key) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object into skip list")
 
 done:
-    if(ret_value < 0) {
-        if(key) {
-            if(key->dt)
+    if (ret_value < 0) {
+        if (key) {
+            if (key->dt)
                 key->dt = (H5T_t *)H5O_msg_free(H5O_DTYPE_ID, key->dt);
             key = H5FL_FREE(H5O_copy_search_comm_dt_key_t, key);
         } /* end if */
-        if(addr)
+        if (addr)
             addr = H5FL_FREE(haddr_t, addr);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_insert_comm_dt */
-
diff --git a/src/H5Odbg.c b/src/H5Odbg.c
index 86db45c..87f0dd4 100644
--- a/src/H5Odbg.c
+++ b/src/H5Odbg.c
@@ -26,54 +26,47 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Ppublic.h"		/* Property Lists			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Ppublic.h"   /* Property Lists			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 #ifdef H5O_DEBUG
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5O_assert
  *
@@ -91,25 +84,25 @@
 herr_t
 H5O_assert(const H5O_t *oh)
 {
-    H5O_mesg_t *curr_msg;               /* Pointer to current message to examine */
-    H5O_mesg_t *tmp_msg;                /* Pointer to temporary message to examine */
-    unsigned cont_msgs_found = 0;       /* # of continuation messages for object */
-    size_t meta_space;                  /* Size of header metadata */
-    size_t mesg_space;                  /* Size of message raw data */
-    size_t free_space;                  /* Size of free space in header */
-    size_t hdr_size;                    /* Size of header's chunks */
-    unsigned u, v;                      /* Local index variables */
+    H5O_mesg_t *curr_msg;            /* Pointer to current message to examine */
+    H5O_mesg_t *tmp_msg;             /* Pointer to temporary message to examine */
+    unsigned    cont_msgs_found = 0; /* # of continuation messages for object */
+    size_t      meta_space;          /* Size of header metadata */
+    size_t      mesg_space;          /* Size of message raw data */
+    size_t      free_space;          /* Size of free space in header */
+    size_t      hdr_size;            /* Size of header's chunks */
+    unsigned    u, v;                /* Local index variables */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Initialize the tracking variables */
-    hdr_size = 0;
+    hdr_size   = 0;
     meta_space = (size_t)H5O_SIZEOF_HDR(oh) + (size_t)(H5O_SIZEOF_CHKHDR_OH(oh) * (oh->nchunks - 1));
     mesg_space = 0;
     free_space = 0;
 
     /* Loop over all chunks in object header */
-    for(u = 0; u < oh->nchunks; u++) {
+    for (u = 0; u < oh->nchunks; u++) {
         /* Accumulate the size of the header on header */
         hdr_size += oh->chunk[u].size;
 
@@ -124,9 +117,10 @@ H5O_assert(const H5O_t *oh)
         HDassert(H5F_addr_defined(oh->chunk[u].addr));
 
         /* Version specific checks */
-        if(oh->version > H5O_VERSION_1) {
+        if (oh->version > H5O_VERSION_1) {
             /* Make certain that the magic number is correct for each chunk */
-            HDassert(!HDmemcmp(oh->chunk[u].image, (u == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), H5_SIZEOF_MAGIC));
+            HDassert(
+                !HDmemcmp(oh->chunk[u].image, (u == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), H5_SIZEOF_MAGIC));
 
             /* Check for valid gap size */
             HDassert(oh->chunk[u].gap < (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
@@ -137,33 +131,33 @@ H5O_assert(const H5O_t *oh)
     } /* end for */
 
     /* Check for correct chunk #0 size flags */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         uint64_t chunk0_size = oh->chunk[0].size - (size_t)H5O_SIZEOF_HDR(oh);
 
-        if(chunk0_size <= 255)
+        if (chunk0_size <= 255)
             HDassert((oh->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_1);
-        else if(chunk0_size <= 65535)
+        else if (chunk0_size <= 65535)
             HDassert((oh->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_2);
-        else if(chunk0_size <= 4294967295)
+        else if (chunk0_size <= 4294967295)
             HDassert((oh->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_4);
         else
             HDassert((oh->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_8);
     } /* end if */
 
     /* Loop over all messages in object header */
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
         uint8_t *curr_hdr;      /* Start of current message header */
-        size_t  curr_tot_size;  /* Total size of current message (including header) */
+        size_t   curr_tot_size; /* Total size of current message (including header) */
 
-        curr_hdr = curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
+        curr_hdr      = curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
         curr_tot_size = curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
 
         /* Accumulate information, based on the type of message */
-	if(H5O_NULL_ID == curr_msg->type->id)
+        if (H5O_NULL_ID == curr_msg->type->id)
             free_space += curr_tot_size;
-        else if(H5O_CONT_ID == curr_msg->type->id) {
-            H5O_cont_t *cont = (H5O_cont_t *)curr_msg->native;
-            hbool_t found_chunk = FALSE;        /* Found a chunk that matches */
+        else if (H5O_CONT_ID == curr_msg->type->id) {
+            H5O_cont_t *cont        = (H5O_cont_t *)curr_msg->native;
+            hbool_t     found_chunk = FALSE; /* Found a chunk that matches */
 
             HDassert(cont);
 
@@ -172,13 +166,13 @@ H5O_assert(const H5O_t *oh)
 
             /* Sanity check that every continuation message has a matching chunk */
             /* (and only one) */
-            for(v = 0; v < oh->nchunks; v++) {
-                if(H5F_addr_eq(cont->addr, oh->chunk[v].addr) && cont->size == oh->chunk[v].size) {
+            for (v = 0; v < oh->nchunks; v++) {
+                if (H5F_addr_eq(cont->addr, oh->chunk[v].addr) && cont->size == oh->chunk[v].size) {
                     HDassert(cont->chunkno == v);
                     HDassert(!found_chunk);
                     found_chunk = TRUE;
                 } /* end if */
-            } /* end for */
+            }     /* end for */
             HDassert(found_chunk);
 
             meta_space += curr_tot_size;
@@ -195,25 +189,29 @@ H5O_assert(const H5O_t *oh)
         HDassert(curr_msg->chunkno < oh->nchunks);
 
         /* Make certain null messages aren't in chunks with gaps */
-        if(H5O_NULL_ID == curr_msg->type->id)
+        if (H5O_NULL_ID == curr_msg->type->id)
             HDassert(oh->chunk[curr_msg->chunkno].gap == 0);
 
         /* Make certain that the message is completely in a chunk message area */
-        HDassert(curr_tot_size <= (oh->chunk[curr_msg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[curr_msg->chunkno].gap));
-        if(curr_msg->chunkno == 0)
-            HDassert(curr_hdr >= oh->chunk[curr_msg->chunkno].image + (H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
+        HDassert(curr_tot_size <= (oh->chunk[curr_msg->chunkno].size) -
+                                      (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[curr_msg->chunkno].gap));
+        if (curr_msg->chunkno == 0)
+            HDassert(curr_hdr >=
+                     oh->chunk[curr_msg->chunkno].image + (H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
         else
-            HDassert(curr_hdr >= oh->chunk[curr_msg->chunkno].image + (H5O_SIZEOF_CHKHDR_OH(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
-        HDassert(curr_msg->raw + curr_msg->raw_size <= (oh->chunk[curr_msg->chunkno].image + oh->chunk[curr_msg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[curr_msg->chunkno].gap));
+            HDassert(curr_hdr >= oh->chunk[curr_msg->chunkno].image +
+                                     (H5O_SIZEOF_CHKHDR_OH(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
+        HDassert(curr_msg->raw + curr_msg->raw_size <=
+                 (oh->chunk[curr_msg->chunkno].image + oh->chunk[curr_msg->chunkno].size) -
+                     (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[curr_msg->chunkno].gap));
 
         /* Make certain that no other messages overlap this message */
-        for(v = 0, tmp_msg = &oh->mesg[0]; v < oh->nmesgs; v++, tmp_msg++) {
-            if(u != v)
-                HDassert(!((tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) >= curr_hdr
-                        && (tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh))
-                        < (curr_hdr + curr_tot_size)));
+        for (v = 0, tmp_msg = &oh->mesg[0]; v < oh->nmesgs; v++, tmp_msg++) {
+            if (u != v)
+                HDassert(!((tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) >= curr_hdr &&
+                           (tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) < (curr_hdr + curr_tot_size)));
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
     /* Sanity check that the # of cont. messages is correct for the # of chunks */
     HDassert(oh->nchunks == (cont_msgs_found + 1));
@@ -225,7 +223,6 @@ H5O_assert(const H5O_t *oh)
 } /* end H5O_assert() */
 #endif /* H5O_DEBUG */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_debug_id
  *
@@ -243,16 +240,17 @@ H5O_assert(const H5O_t *oh)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream, int indent, int fwidth)
+H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream, int indent,
+             int fwidth)
 {
-    const H5O_msg_class_t *type;            /* Actual H5O class type for the ID */
-    herr_t      ret_value;       /* Return value */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    herr_t                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(type->debug);
     HDassert(f);
@@ -262,14 +260,13 @@ H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *
     HDassert(fwidth >= 0);
 
     /* Call the debug method in the class */
-    if((ret_value = (type->debug)(f, dxpl_id, mesg, stream, indent, fwidth)) < 0)
+    if ((ret_value = (type->debug)(f, dxpl_id, mesg, stream, indent, fwidth)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, FAIL, "unable to debug message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_debug_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_debug_real
  *
@@ -290,10 +287,10 @@ done:
 herr_t
 H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    size_t	mesg_total = 0, chunk_total = 0, gap_total = 0;
-    unsigned	*sequence = NULL;
-    unsigned	i;              /* Local index variable */
-    herr_t	ret_value = SUCCEED;
+    size_t    mesg_total = 0, chunk_total = 0, gap_total = 0;
+    unsigned *sequence = NULL;
+    unsigned  i; /* Local index variable */
+    herr_t    ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -308,93 +305,71 @@ H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, i
     /* debug */
     HDfprintf(stream, "%*sObject Header...\n", indent, "");
 
-    HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "Dirty:",
-	      oh->cache_info.is_dirty);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Version:",
-	      oh->version);
+    HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth, "Dirty:", oh->cache_info.is_dirty);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", oh->version);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Header size (in bytes):",
-	      (unsigned)H5O_SIZEOF_HDR(oh));
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of links:",
-	      oh->nlink);
+              "Header size (in bytes):", (unsigned)H5O_SIZEOF_HDR(oh));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of links:", oh->nlink);
 
     /* Extra information for later versions */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Display object's status flags */
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		   "Attribute creation order tracked:",
-		   (oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) ? "Yes" : "No");
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		   "Attribute creation order indexed:",
-		   (oh->flags & H5O_HDR_ATTR_CRT_ORDER_INDEXED) ? "Yes" : "No");
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		   "Attribute storage phase change values:",
-		   (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) ? "Non-default" : "Default");
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		   "Timestamps:",
-		   (oh->flags & H5O_HDR_STORE_TIMES) ? "Enabled" : "Disabled");
-        if(oh->flags & ~H5O_HDR_ALL_FLAGS)
-            HDfprintf(stream, "*** UNKNOWN OBJECT HEADER STATUS FLAG: %02x!\n",
-                (unsigned)oh->flags);
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute creation order tracked:",
+                  (oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) ? "Yes" : "No");
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute creation order indexed:",
+                  (oh->flags & H5O_HDR_ATTR_CRT_ORDER_INDEXED) ? "Yes" : "No");
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute storage phase change values:",
+                  (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) ? "Non-default" : "Default");
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+                  "Timestamps:", (oh->flags & H5O_HDR_STORE_TIMES) ? "Enabled" : "Disabled");
+        if (oh->flags & ~H5O_HDR_ALL_FLAGS)
+            HDfprintf(stream, "*** UNKNOWN OBJECT HEADER STATUS FLAG: %02x!\n", (unsigned)oh->flags);
 
         /* Only dump times, if they are tracked */
-        if(oh->flags & H5O_HDR_STORE_TIMES) {
-            struct tm *tm;          /* Time structure */
-            char buf[128];          /* Buffer for formatting time info */
+        if (oh->flags & H5O_HDR_STORE_TIMES) {
+            struct tm *tm;       /* Time structure */
+            char       buf[128]; /* Buffer for formatting time info */
 
             /* Time fields */
             tm = HDlocaltime(&oh->atime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Access Time:", buf);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Access Time:", buf);
             tm = HDlocaltime(&oh->mtime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Modification Time:", buf);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Modification Time:", buf);
             tm = HDlocaltime(&oh->ctime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Change Time:", buf);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Change Time:", buf);
             tm = HDlocaltime(&oh->btime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Birth Time:", buf);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Birth Time:", buf);
         } /* end if */
 
         /* Attribute tracking fields */
-        if(oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
+        if (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
             HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                      "Max. compact attributes:",
-                      (unsigned)oh->max_compact);
+                      "Max. compact attributes:", (unsigned)oh->max_compact);
             HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                      "Min. dense attributes:",
-                      (unsigned)oh->min_dense);
+                      "Min. dense attributes:", (unsigned)oh->min_dense);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     HDfprintf(stream, "%*s%-*s %Zu (%Zu)\n", indent, "", fwidth,
-	      "Number of messages (allocated):",
-	      oh->nmesgs, oh->alloc_nmesgs);
-    HDfprintf(stream, "%*s%-*s %Zu (%Zu)\n", indent, "", fwidth,
-	      "Number of chunks (allocated):",
-	      oh->nchunks, oh->alloc_nchunks);
+              "Number of messages (allocated):", oh->nmesgs, oh->alloc_nmesgs);
+    HDfprintf(stream, "%*s%-*s %Zu (%Zu)\n", indent, "", fwidth, "Number of chunks (allocated):", oh->nchunks,
+              oh->alloc_nchunks);
 
     /* debug each chunk */
-    for(i = 0, chunk_total = 0; i < oh->nchunks; i++) {
+    for (i = 0, chunk_total = 0; i < oh->nchunks; i++) {
         size_t chunk_size;
 
-	HDfprintf(stream, "%*sChunk %d...\n", indent, "", i);
+        HDfprintf(stream, "%*sChunk %d...\n", indent, "", i);
 
-	HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Address:",
-                  oh->chunk[i].addr);
+        HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", MAX(0, fwidth - 3), "Address:", oh->chunk[i].addr);
 
         /* Decrement chunk 0's size by the object header prefix size */
-	if(0 == i) {
-            if(H5F_addr_ne(oh->chunk[i].addr, addr))
+        if (0 == i) {
+            if (H5F_addr_ne(oh->chunk[i].addr, addr))
                 HDfprintf(stream, "*** WRONG ADDRESS FOR CHUNK #0!\n");
             chunk_size = oh->chunk[i].size - (size_t)H5O_SIZEOF_HDR(oh);
         } /* end if */
@@ -402,134 +377,117 @@ H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, i
             chunk_size = oh->chunk[i].size;
 
         /* Accumulate chunk's size to total */
-	chunk_total += chunk_size;
-	gap_total += oh->chunk[i].gap;
+        chunk_total += chunk_size;
+        gap_total += oh->chunk[i].gap;
 
-	HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Size in bytes:",
-		  chunk_size);
+        HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3), "Size in bytes:", chunk_size);
 
-	HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Gap:",
-                  oh->chunk[i].gap);
+        HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3), "Gap:", oh->chunk[i].gap);
     } /* end for */
 
     /* debug each message */
-    if(NULL == (sequence = (unsigned *)H5MM_calloc(NELMTS(H5O_msg_class_g) * sizeof(unsigned))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    for(i = 0, mesg_total = 0; i < oh->nmesgs; i++) {
-        const H5O_msg_class_t  *debug_type;              /* Type of message to use for callbacks */
-        unsigned chunkno;                       /* Chunk for message */
+    if (NULL == (sequence = (unsigned *)H5MM_calloc(NELMTS(H5O_msg_class_g) * sizeof(unsigned))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    for (i = 0, mesg_total = 0; i < oh->nmesgs; i++) {
+        const H5O_msg_class_t *debug_type; /* Type of message to use for callbacks */
+        unsigned               chunkno;    /* Chunk for message */
 
         /* Accumulate message's size to total */
-	mesg_total += (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + oh->mesg[i].raw_size;
-
-	/* For version 2 object header, add size of "OCHK" for continuation chunk */
-	if (oh->mesg[i].type->id == H5O_CONT_ID)
-	    mesg_total += H5O_SIZEOF_CHKHDR_OH(oh);
-
-	HDfprintf(stream, "%*sMessage %d...\n", indent, "", i);
-
-	/* check for bad message id */
-	if(oh->mesg[i].type->id >= (int)NELMTS(H5O_msg_class_g)) {
-	    HDfprintf(stream, "*** BAD MESSAGE ID 0x%04x\n",
-		      oh->mesg[i].type->id);
-	    continue;
-	} /* end if */
-
-	/* message name and size */
-	HDfprintf(stream, "%*s%-*s 0x%04x `%s' (%d)\n",
-		  indent + 3, "", MAX(0, fwidth - 3),
-		  "Message ID (sequence number):",
-		  (unsigned) (oh->mesg[i].type->id),
-		  oh->mesg[i].type->name,
-		  sequence[oh->mesg[i].type->id]++);
-	HDfprintf(stream, "%*s%-*s %t\n", indent + 3, "", MAX (0, fwidth - 3),
-		   "Dirty:",
-		   oh->mesg[i].dirty);
-        HDfprintf(stream, "%*s%-*s ", indent + 3, "", MAX (0, fwidth - 3),
-                   "Message flags:");
-	if(oh->mesg[i].flags) {
+        mesg_total += (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + oh->mesg[i].raw_size;
+
+        /* For version 2 object header, add size of "OCHK" for continuation chunk */
+        if (oh->mesg[i].type->id == H5O_CONT_ID)
+            mesg_total += H5O_SIZEOF_CHKHDR_OH(oh);
+
+        HDfprintf(stream, "%*sMessage %d...\n", indent, "", i);
+
+        /* check for bad message id */
+        if (oh->mesg[i].type->id >= (int)NELMTS(H5O_msg_class_g)) {
+            HDfprintf(stream, "*** BAD MESSAGE ID 0x%04x\n", oh->mesg[i].type->id);
+            continue;
+        } /* end if */
+
+        /* message name and size */
+        HDfprintf(stream, "%*s%-*s 0x%04x `%s' (%d)\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Message ID (sequence number):", (unsigned)(oh->mesg[i].type->id), oh->mesg[i].type->name,
+                  sequence[oh->mesg[i].type->id]++);
+        HDfprintf(stream, "%*s%-*s %t\n", indent + 3, "", MAX(0, fwidth - 3), "Dirty:", oh->mesg[i].dirty);
+        HDfprintf(stream, "%*s%-*s ", indent + 3, "", MAX(0, fwidth - 3), "Message flags:");
+        if (oh->mesg[i].flags) {
             hbool_t flag_printed = FALSE;
 
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_SHARED) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_SHARED) {
                 HDfprintf(stream, "<S");
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_CONSTANT) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_CONSTANT) {
                 HDfprintf(stream, "%sC", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_DONTSHARE) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_DONTSHARE) {
                 HDfprintf(stream, "%sDS", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE) {
                 HDfprintf(stream, "%sFIU", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN) {
                 HDfprintf(stream, "%sMIU", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_WAS_UNKNOWN) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_WAS_UNKNOWN) {
                 HDassert(oh->mesg[i].flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN);
                 HDfprintf(stream, "%sWU", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(!flag_printed)
+            if (!flag_printed)
                 HDfprintf(stream, "-");
             HDfprintf(stream, ">\n");
-            if(oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS)
-                HDfprintf(stream, "%*s%-*s 0x%02x\n", indent + 3,"", MAX(0, fwidth - 3),
-                           "*** ADDITIONAL UNKNOWN FLAGS --->",
-                           oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS);
+            if (oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS)
+                HDfprintf(stream, "%*s%-*s 0x%02x\n", indent + 3, "", MAX(0, fwidth - 3),
+                          "*** ADDITIONAL UNKNOWN FLAGS --->", oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS);
         } /* end if */
         else
             HDfprintf(stream, "<none>\n");
-	HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Chunk number:",
-		  oh->mesg[i].chunkno);
-	chunkno = oh->mesg[i].chunkno;
-	if(chunkno >= oh->nchunks)
-	    HDfprintf(stream, "*** BAD CHUNK NUMBER\n");
-	HDfprintf(stream, "%*s%-*s (%Zu, %Zu) bytes\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Raw message data (offset, size) in chunk:",
-		  (size_t)(oh->mesg[i].raw - oh->chunk[chunkno].image),
-		  oh->mesg[i].raw_size);
-
-	/* check the size */
-	if((oh->mesg[i].raw + oh->mesg[i].raw_size >
-                 oh->chunk[chunkno].image + oh->chunk[chunkno].size) ||
-                (oh->mesg[i].raw < oh->chunk[chunkno].image))
-	    HDfprintf(stream, "*** BAD MESSAGE RAW ADDRESS\n");
-
-	/* decode the message */
-	debug_type = oh->mesg[i].type;
-	if(NULL == oh->mesg[i].native && debug_type->decode)
+        HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Chunk number:", oh->mesg[i].chunkno);
+        chunkno = oh->mesg[i].chunkno;
+        if (chunkno >= oh->nchunks)
+            HDfprintf(stream, "*** BAD CHUNK NUMBER\n");
+        HDfprintf(stream, "%*s%-*s (%Zu, %Zu) bytes\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Raw message data (offset, size) in chunk:",
+                  (size_t)(oh->mesg[i].raw - oh->chunk[chunkno].image), oh->mesg[i].raw_size);
+
+        /* check the size */
+        if ((oh->mesg[i].raw + oh->mesg[i].raw_size > oh->chunk[chunkno].image + oh->chunk[chunkno].size) ||
+            (oh->mesg[i].raw < oh->chunk[chunkno].image))
+            HDfprintf(stream, "*** BAD MESSAGE RAW ADDRESS\n");
+
+        /* decode the message */
+        debug_type = oh->mesg[i].type;
+        if (NULL == oh->mesg[i].native && debug_type->decode)
             H5O_LOAD_NATIVE(f, dxpl_id, H5O_DECODEIO_NOCHANGE, oh, &oh->mesg[i], FAIL)
 
-	/* print the message */
-	HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Message Information:");
-	if(debug_type->debug && oh->mesg[i].native != NULL)
-	    (debug_type->debug)(f, dxpl_id, oh->mesg[i].native, stream, indent + 6, MAX(0, fwidth - 6));
-	else
-	    HDfprintf(stream, "%*s<No info for this message>\n", indent + 6, "");
+        /* print the message */
+        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "Message Information:");
+        if (debug_type->debug && oh->mesg[i].native != NULL)
+            (debug_type->debug)(f, dxpl_id, oh->mesg[i].native, stream, indent + 6, MAX(0, fwidth - 6));
+        else
+            HDfprintf(stream, "%*s<No info for this message>\n", indent + 6, "");
     } /* end for */
 
-    if((mesg_total + gap_total) != chunk_total)
-	HDfprintf(stream, "*** TOTAL SIZE DOES NOT MATCH ALLOCATED SIZE!\n");
+    if ((mesg_total + gap_total) != chunk_total)
+        HDfprintf(stream, "*** TOTAL SIZE DOES NOT MATCH ALLOCATED SIZE!\n");
 
 done:
     /* Release resources */
-    if(sequence)
+    if (sequence)
         sequence = (unsigned *)H5MM_xfree(sequence);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_debug_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_debug
  *
@@ -546,9 +504,9 @@ done:
 herr_t
 H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    H5O_t	*oh = NULL;             /* Object header to display */
-    H5O_loc_t   loc;                    /* Object location for object to delete */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5O_t *   oh = NULL;           /* Object header to display */
+    H5O_loc_t loc;                 /* Object location for object to delete */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -560,20 +518,19 @@ H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
     HDassert(fwidth >= 0);
 
     /* Set up the object location */
-    loc.file = f;
-    loc.addr = addr;
+    loc.file         = f;
+    loc.addr         = addr;
     loc.holding_file = FALSE;
 
-    if(NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* debug */
     H5O_debug_real(f, dxpl_id, oh, addr, stream, indent, fwidth);
 
 done:
-    if(oh && H5O_unprotect(&loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(&loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_debug() */
-
diff --git a/src/H5Odrvinfo.c b/src/H5Odrvinfo.c
index fd8ad6b..7a84df5 100644
--- a/src/H5Odrvinfo.c
+++ b/src/H5Odrvinfo.c
@@ -11,7 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 /* Programmer:  Quincey Koziol <koziol@hdfgroup.org>
  *              Thursday, March  1, 2007
  *
@@ -19,50 +18,49 @@
  *              in the superblock extension.
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5MMprivate.h" /* Memory management			*/
 
-static void  *H5O_drvinfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_drvinfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                 unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_drvinfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void  *H5O_drvinfo_copy(const void *_mesg, void *_dest);
+static void * H5O_drvinfo_copy(const void *_mesg, void *_dest);
 static size_t H5O_drvinfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_drvinfo_reset(void *_mesg);
-static herr_t H5O_drvinfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
-			     int indent, int fwidth);
+static herr_t H5O_drvinfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                                int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_DRVINFO[1] = {{
-    H5O_DRVINFO_ID,             /*message id number                     */
-    "driver info",		/*message name for debugging            */
-    sizeof(H5O_drvinfo_t),	/*native message size                   */
-    0,				/* messages are sharable?       */
-    H5O_drvinfo_decode,		/*decode message                        */
-    H5O_drvinfo_encode,		/*encode message                        */
-    H5O_drvinfo_copy,           /*copy the native value                 */
-    H5O_drvinfo_size,		/*raw message size			*/
-    H5O_drvinfo_reset,          /*free internal memory			*/
-    NULL,                       /* free method				*/
-    NULL,			/* file delete method			*/
-    NULL,			/* link method				*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		        */
-    NULL,			/* pre copy native value to file	*/
-    NULL,			/* copy native value to file		*/
-    NULL,			/* post copy native value to file	*/
-    NULL,			/* get creation index		        */
-    NULL,			/* set creation index		        */
-    H5O_drvinfo_debug           /*debug the message			*/
+    H5O_DRVINFO_ID,        /*message id number                     */
+    "driver info",         /*message name for debugging            */
+    sizeof(H5O_drvinfo_t), /*native message size                   */
+    0,                     /* messages are sharable?       */
+    H5O_drvinfo_decode,    /*decode message                        */
+    H5O_drvinfo_encode,    /*encode message                        */
+    H5O_drvinfo_copy,      /*copy the native value                 */
+    H5O_drvinfo_size,      /*raw message size			*/
+    H5O_drvinfo_reset,     /*free internal memory			*/
+    NULL,                  /* free method				*/
+    NULL,                  /* file delete method			*/
+    NULL,                  /* link method				*/
+    NULL,                  /*set share method		*/
+    NULL,                  /*can share method		        */
+    NULL,                  /* pre copy native value to file	*/
+    NULL,                  /* copy native value to file		*/
+    NULL,                  /* post copy native value to file	*/
+    NULL,                  /* get creation index		        */
+    NULL,                  /* set creation index		        */
+    H5O_drvinfo_debug      /*debug the message			*/
 }};
 
 /* Current version of driver info information */
-#define H5O_DRVINFO_VERSION 	0
+#define H5O_DRVINFO_VERSION 0
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_drvinfo_decode
  *
@@ -79,11 +77,11 @@ const H5O_msg_class_t H5O_MSG_DRVINFO[1] = {{
  */
 static void *
 H5O_drvinfo_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                   unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                   size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_drvinfo_t	*mesg;          /* Native message */
-    void                *ret_value;     /* Return value */
+    H5O_drvinfo_t *mesg;      /* Native message */
+    void *         ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -92,12 +90,12 @@ H5O_drvinfo_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t
     HDassert(p);
 
     /* Version of message */
-    if(*p++ != H5O_DRVINFO_VERSION)
+    if (*p++ != H5O_DRVINFO_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for message")
 
     /* Allocate space for message */
-    if(NULL == (mesg = (H5O_drvinfo_t *)H5MM_calloc(sizeof(H5O_drvinfo_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for driver info message")
+    if (NULL == (mesg = (H5O_drvinfo_t *)H5MM_calloc(sizeof(H5O_drvinfo_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for driver info message")
 
     /* Retrieve driver name */
     HDmemcpy(mesg->name, p, 8);
@@ -109,9 +107,9 @@ H5O_drvinfo_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t
     HDassert(mesg->len);
 
     /* Allocate space for buffer */
-    if(NULL == (mesg->buf = (uint8_t *)H5MM_malloc(mesg->len))) {
+    if (NULL == (mesg->buf = (uint8_t *)H5MM_malloc(mesg->len))) {
         mesg = (H5O_drvinfo_t *)H5MM_xfree(mesg);
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for driver info buffer")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for driver info buffer")
     } /* end if */
 
     /* Copy encoded driver info into buffer */
@@ -124,7 +122,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_drvinfo_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_drvinfo_encode
  *
@@ -138,7 +135,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_drvinfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O_drvinfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
+                   const void *_mesg)
 {
     const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg;
 
@@ -160,7 +158,6 @@ H5O_drvinfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_share
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_drvinfo_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_drvinfo_copy
  *
@@ -178,26 +175,27 @@ H5O_drvinfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_share
 static void *
 H5O_drvinfo_copy(const void *_mesg, void *_dest)
 {
-    const H5O_drvinfo_t	*mesg = (const H5O_drvinfo_t *)_mesg;
-    H5O_drvinfo_t	*dest = (H5O_drvinfo_t *)_dest;
-    void		*ret_value;
+    const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg;
+    H5O_drvinfo_t *      dest = (H5O_drvinfo_t *)_dest;
+    void *               ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert(mesg);
 
-    if(!dest && NULL == (dest = (H5O_drvinfo_t *)H5MM_malloc(sizeof(H5O_drvinfo_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for shared message table message")
+    if (!dest && NULL == (dest = (H5O_drvinfo_t *)H5MM_malloc(sizeof(H5O_drvinfo_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for shared message table message")
 
     /* Shallow copy the fields */
     *dest = *mesg;
 
     /* Copy the buffer */
-    if(NULL == (dest->buf = (uint8_t *)H5MM_malloc(mesg->len))) {
-        if(dest != _dest)
+    if (NULL == (dest->buf = (uint8_t *)H5MM_malloc(mesg->len))) {
+        if (dest != _dest)
             dest = (H5O_drvinfo_t *)H5MM_xfree(dest);
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     } /* end if */
     HDmemcpy(dest->buf, mesg->buf, mesg->len);
 
@@ -208,7 +206,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_drvinfo_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_drvinfo_size
  *
@@ -227,7 +224,7 @@ static size_t
 H5O_drvinfo_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
     const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg;
-    size_t                   ret_value;
+    size_t               ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -235,15 +232,14 @@ H5O_drvinfo_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_s
     HDassert(f);
     HDassert(mesg);
 
-    ret_value = 1 +             /* Version number */
-		8 +             /* Driver name */
-		2 +             /* Buffer length */
-		mesg->len;      /* Buffer */
+    ret_value = 1 +        /* Version number */
+                8 +        /* Driver name */
+                2 +        /* Buffer length */
+                mesg->len; /* Buffer */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_drvinfo_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_drvinfo_reset
  *
@@ -261,7 +257,7 @@ H5O_drvinfo_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_s
 static herr_t
 H5O_drvinfo_reset(void *_mesg)
 {
-    H5O_drvinfo_t *mesg = (H5O_drvinfo_t *) _mesg;
+    H5O_drvinfo_t *mesg = (H5O_drvinfo_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -274,7 +270,6 @@ H5O_drvinfo_reset(void *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_drvinfo_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_drvinfo_debug
  *
@@ -289,7 +284,7 @@ H5O_drvinfo_reset(void *_mesg)
  */
 static herr_t
 H5O_drvinfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
-    int indent, int fwidth)
+                  int indent, int fwidth)
 {
     const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg;
 
@@ -302,12 +297,8 @@ H5O_drvinfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const v
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Driver name:", mesg->name);
-    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
-	      "Buffer size:", mesg->len);
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Driver name:", mesg->name);
+    HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Buffer size:", mesg->len);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_drvinfo_debug() */
-
-
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 908ee31..bc257b9 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -11,108 +11,106 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-#define H5T_PACKAGE		/*prevent warning from including H5Tpkg   */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files				*/
-#include "H5FLprivate.h"	/* Free Lists				*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Tpkg.h"		/* Datatypes				*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
-
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+#define H5T_PACKAGE /*prevent warning from including H5Tpkg   */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* Files				*/
+#include "H5FLprivate.h" /* Free Lists				*/
+#include "H5Gprivate.h"  /* Groups				*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Tpkg.h"      /* Datatypes				*/
+#include "H5VMprivate.h" /* Vectors and arrays 			*/
 
 /* PRIVATE PROTOTYPES */
 static herr_t H5O_dtype_encode(H5F_t *f, uint8_t *p, const void *mesg);
-static void *H5O_dtype_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void *H5O_dtype_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static void *H5O_dtype_copy(const void *_mesg, void *_dest);
 static size_t H5O_dtype_size(const H5F_t *f, const void *_mesg);
 static herr_t H5O_dtype_reset(void *_mesg);
 static herr_t H5O_dtype_free(void *_mesg);
 static herr_t H5O_dtype_set_share(void *_mesg, const H5O_shared_t *sh);
 static htri_t H5O_dtype_can_share(const void *_mesg);
-static herr_t H5O_dtype_pre_copy_file(H5F_t *file_src, const void *mesg_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata);
-static void *H5O_dtype_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type,
-    void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
-    H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
-static herr_t H5O_dtype_shared_post_copy_upd(const H5O_loc_t *src_oloc,
-    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, hid_t dxpl_id,
-    H5O_copy_t *cpy_info);
-
-static herr_t H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-    FILE * stream, int indent, int fwidth);
+static herr_t H5O_dtype_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
+                                      const H5O_copy_t *cpy_info, void *_udata);
+static void * H5O_dtype_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type, void *native_src,
+                                  H5F_t *file_dst, hbool_t *recompute_size, H5O_copy_t *cpy_info, void *udata,
+                                  hid_t dxpl_id);
+static herr_t H5O_dtype_shared_post_copy_upd(const H5O_loc_t *src_oloc, const void *mesg_src,
+                                             H5O_loc_t *dst_oloc, void *mesg_dst, hid_t dxpl_id,
+                                             H5O_copy_t *cpy_info);
+
+static herr_t H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                              int fwidth);
 
 /* Set up & include shared message "interface" info */
-#define H5O_SHARED_TYPE			H5O_MSG_DTYPE
-#define H5O_SHARED_DECODE		H5O_dtype_shared_decode
-#define H5O_SHARED_DECODE_REAL		H5O_dtype_decode
-#define H5O_SHARED_ENCODE		H5O_dtype_shared_encode
-#define H5O_SHARED_ENCODE_REAL		H5O_dtype_encode
-#define H5O_SHARED_SIZE			H5O_dtype_shared_size
-#define H5O_SHARED_SIZE_REAL		H5O_dtype_size
-#define H5O_SHARED_DELETE		H5O_dtype_shared_delete
+#define H5O_SHARED_TYPE        H5O_MSG_DTYPE
+#define H5O_SHARED_DECODE      H5O_dtype_shared_decode
+#define H5O_SHARED_DECODE_REAL H5O_dtype_decode
+#define H5O_SHARED_ENCODE      H5O_dtype_shared_encode
+#define H5O_SHARED_ENCODE_REAL H5O_dtype_encode
+#define H5O_SHARED_SIZE        H5O_dtype_shared_size
+#define H5O_SHARED_SIZE_REAL   H5O_dtype_size
+#define H5O_SHARED_DELETE      H5O_dtype_shared_delete
 #undef H5O_SHARED_DELETE_REAL
-#define H5O_SHARED_LINK			H5O_dtype_shared_link
+#define H5O_SHARED_LINK H5O_dtype_shared_link
 #undef H5O_SHARED_LINK_REAL
-#define H5O_SHARED_COPY_FILE		H5O_dtype_shared_copy_file
-#define H5O_SHARED_COPY_FILE_REAL	H5O_dtype_copy_file
-#define H5O_SHARED_POST_COPY_FILE	H5O_dtype_shared_post_copy_file
-#undef  H5O_SHARED_POST_COPY_FILE_REAL
-#define H5O_SHARED_POST_COPY_FILE_UPD   H5O_dtype_shared_post_copy_upd
-#define H5O_SHARED_DEBUG		H5O_dtype_shared_debug
-#define H5O_SHARED_DEBUG_REAL		H5O_dtype_debug
-#include "H5Oshared.h"			/* Shared Object Header Message Callbacks */
+#define H5O_SHARED_COPY_FILE      H5O_dtype_shared_copy_file
+#define H5O_SHARED_COPY_FILE_REAL H5O_dtype_copy_file
+#define H5O_SHARED_POST_COPY_FILE H5O_dtype_shared_post_copy_file
+#undef H5O_SHARED_POST_COPY_FILE_REAL
+#define H5O_SHARED_POST_COPY_FILE_UPD H5O_dtype_shared_post_copy_upd
+#define H5O_SHARED_DEBUG              H5O_dtype_shared_debug
+#define H5O_SHARED_DEBUG_REAL         H5O_dtype_debug
+#include "H5Oshared.h" /* Shared Object Header Message Callbacks */
 
 /* Macros to check for the proper version of a datatype */
 #ifdef H5_STRICT_FORMAT_CHECKS
 /* If the version is too low, give an error.  No error if nochange is set
  * because in that case we are either debugging or deleting the object header */
-#define H5O_DTYPE_CHECK_VERSION(DT, VERS, MIN_VERS, IOF, CLASS, ERR)           \
-    if(((VERS) < (MIN_VERS)) && !(*(IOF) & H5O_DECODEIO_NOCHANGE))             \
+#define H5O_DTYPE_CHECK_VERSION(DT, VERS, MIN_VERS, IOF, CLASS, ERR)                                         \
+    if (((VERS) < (MIN_VERS)) && !(*(IOF)&H5O_DECODEIO_NOCHANGE))                                            \
         HGOTO_ERROR(H5E_DATATYPE, H5E_VERSION, ERR, "incorrect " CLASS " datatype version")
 #else /* H5_STRICT_FORMAT_CHECKS */
 /* If the version is too low and we are allowed to change the message, upgrade
  * it and mark the object header as dirty */
-#define H5O_DTYPE_CHECK_VERSION(DT, VERS, MIN_VERS, IOF, CLASS, ERR)           \
-    if(((VERS) < (MIN_VERS)) && !(*(IOF) & H5O_DECODEIO_NOCHANGE)) {           \
-        (VERS) = (MIN_VERS);                                                   \
-        if(H5T__upgrade_version((DT), (VERS)) < 0)                              \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade " CLASS " encoding version") \
-        *(IOF) |= H5O_DECODEIO_DIRTY;                                          \
-    } /* end if */
+#define H5O_DTYPE_CHECK_VERSION(DT, VERS, MIN_VERS, IOF, CLASS, ERR)                                         \
+    if (((VERS) < (MIN_VERS)) && !(*(IOF)&H5O_DECODEIO_NOCHANGE)) {                                          \
+        (VERS) = (MIN_VERS);                                                                                 \
+        if (H5T__upgrade_version((DT), (VERS)) < 0)                                                          \
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade " CLASS " encoding version")         \
+        *(IOF) |= H5O_DECODEIO_DIRTY;                                                                        \
+    }  /* end if */
 #endif /* H5_STRICT_FORMAT_CHECKS */
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_DTYPE[1] = {{
-    H5O_DTYPE_ID,		/* message id number		*/
-    "datatype",			/* message name for debugging	*/
-    sizeof(H5T_t),		/* native message size		*/
-    H5O_SHARE_IS_SHARABLE|H5O_SHARE_IN_OHDR,	/* messages are sharable?       */
-    H5O_dtype_shared_decode,	/* decode message		*/
-    H5O_dtype_shared_encode,	/* encode message		*/
-    H5O_dtype_copy,		/* copy the native value	*/
-    H5O_dtype_shared_size,	/* size of raw message		*/
-    H5O_dtype_reset,		/* reset method			*/
-    H5O_dtype_free,		/* free method			*/
-    H5O_dtype_shared_delete,	/* file delete method		*/
-    H5O_dtype_shared_link,	/* link method			*/
-    H5O_dtype_set_share,	/* set share method		*/
-    H5O_dtype_can_share,	/* can share method		*/
-    H5O_dtype_pre_copy_file,	/* pre copy native value to file */
-    H5O_dtype_shared_copy_file,	/* copy native value to file    */
-    H5O_dtype_shared_post_copy_file,	/* post copy native value to file */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_dtype_shared_debug	/* debug the message		*/
+    H5O_DTYPE_ID,                              /* message id number		*/
+    "datatype",                                /* message name for debugging	*/
+    sizeof(H5T_t),                             /* native message size		*/
+    H5O_SHARE_IS_SHARABLE | H5O_SHARE_IN_OHDR, /* messages are sharable?       */
+    H5O_dtype_shared_decode,                   /* decode message		*/
+    H5O_dtype_shared_encode,                   /* encode message		*/
+    H5O_dtype_copy,                            /* copy the native value	*/
+    H5O_dtype_shared_size,                     /* size of raw message		*/
+    H5O_dtype_reset,                           /* reset method			*/
+    H5O_dtype_free,                            /* free method			*/
+    H5O_dtype_shared_delete,                   /* file delete method		*/
+    H5O_dtype_shared_link,                     /* link method			*/
+    H5O_dtype_set_share,                       /* set share method		*/
+    H5O_dtype_can_share,                       /* can share method		*/
+    H5O_dtype_pre_copy_file,                   /* pre copy native value to file */
+    H5O_dtype_shared_copy_file,                /* copy native value to file    */
+    H5O_dtype_shared_post_copy_file,           /* post copy native value to file */
+    NULL,                                      /* get creation index		*/
+    NULL,                                      /* set creation index		*/
+    H5O_dtype_shared_debug                     /* debug the message		*/
 }};
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_decode_helper
  *
@@ -129,12 +127,12 @@ const H5O_msg_class_t H5O_MSG_DTYPE[1] = {{
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **pp, H5T_t *dt)
+H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags /*in,out*/, const uint8_t **pp, H5T_t *dt)
 {
-    unsigned	flags, version;
-    unsigned	i;
-    size_t	z;
-    htri_t      ret_value = FALSE;       /* Return value */
+    unsigned flags, version;
+    unsigned i;
+    size_t   z;
+    htri_t   ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -144,24 +142,24 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
 
     /* Version, class & flags */
     UINT32DECODE(*pp, flags);
-    version = (flags>>4) & 0x0f;
-    if(version < H5O_DTYPE_VERSION_1 || version > H5O_DTYPE_VERSION_3)
+    version = (flags >> 4) & 0x0f;
+    if (version < H5O_DTYPE_VERSION_1 || version > H5O_DTYPE_VERSION_3)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTLOAD, FAIL, "bad version number for datatype message")
     dt->shared->version = version;
-    dt->shared->type = (H5T_class_t)(flags & 0x0f);
+    dt->shared->type    = (H5T_class_t)(flags & 0x0f);
     flags >>= 8;
 
     /* Size */
     UINT32DECODE(*pp, dt->shared->size);
 
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_INTEGER:
             /*
              * Integer types...
              */
-            dt->shared->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
-            dt->shared->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
-            dt->shared->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
+            dt->shared->u.atomic.order    = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
+            dt->shared->u.atomic.lsb_pad  = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
+            dt->shared->u.atomic.msb_pad  = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
             dt->shared->u.atomic.u.i.sign = (flags & 0x8) ? H5T_SGN_2 : H5T_SGN_NONE;
             UINT16DECODE(*pp, dt->shared->u.atomic.offset);
             UINT16DECODE(*pp, dt->shared->u.atomic.prec);
@@ -172,19 +170,19 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
              * Floating-point types...
              */
             dt->shared->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
-            if(version >= H5O_DTYPE_VERSION_3) {
+            if (version >= H5O_DTYPE_VERSION_3) {
                 /* Unsupported byte order*/
-                if((flags & 0x40) && !(flags & 0x1))
+                if ((flags & 0x40) && !(flags & 0x1))
                     HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "bad byte order for datatype message")
 
                 /* VAX order if both 1st and 6th bits are turned on*/
-                if(flags & 0x40)
+                if (flags & 0x40)
                     dt->shared->u.atomic.order = H5T_ORDER_VAX;
             } /* end if */
             dt->shared->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
             dt->shared->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
             dt->shared->u.atomic.u.f.pad = (flags & 0x8) ? H5T_PAD_ONE : H5T_PAD_ZERO;
-            switch((flags >> 4) & 0x03) {
+            switch ((flags >> 4) & 0x03) {
                 case 0:
                     dt->shared->u.atomic.u.f.norm = H5T_NORM_NONE;
                     break;
@@ -203,16 +201,16 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
             dt->shared->u.atomic.u.f.sign = (flags >> 8) & 0xff;
             UINT16DECODE(*pp, dt->shared->u.atomic.offset);
             UINT16DECODE(*pp, dt->shared->u.atomic.prec);
-            dt->shared->u.atomic.u.f.epos = *(*pp)++;
+            dt->shared->u.atomic.u.f.epos  = *(*pp)++;
             dt->shared->u.atomic.u.f.esize = *(*pp)++;
             HDassert(dt->shared->u.atomic.u.f.esize > 0);
-            dt->shared->u.atomic.u.f.mpos = *(*pp)++;
+            dt->shared->u.atomic.u.f.mpos  = *(*pp)++;
             dt->shared->u.atomic.u.f.msize = *(*pp)++;
             HDassert(dt->shared->u.atomic.u.f.msize > 0);
             UINT32DECODE(*pp, dt->shared->u.atomic.u.f.ebias);
             break;
 
-        case H5T_TIME:  /* Time datatypes */
+        case H5T_TIME: /* Time datatypes */
             dt->shared->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
             UINT16DECODE(*pp, dt->shared->u.atomic.prec);
             break;
@@ -221,13 +219,13 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
             /*
              * Character string types...
              */
-            dt->shared->u.atomic.order = H5T_ORDER_NONE;
-            dt->shared->u.atomic.prec = 8 * dt->shared->size;
-            dt->shared->u.atomic.offset = 0;
+            dt->shared->u.atomic.order   = H5T_ORDER_NONE;
+            dt->shared->u.atomic.prec    = 8 * dt->shared->size;
+            dt->shared->u.atomic.offset  = 0;
             dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
             dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
 
-            dt->shared->u.atomic.u.s.pad = (H5T_str_t)(flags & 0x0f);
+            dt->shared->u.atomic.u.s.pad  = (H5T_str_t)(flags & 0x0f);
             dt->shared->u.atomic.u.s.cset = (H5T_cset_t)((flags >> 4) & 0x0f);
             break;
 
@@ -235,7 +233,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
             /*
              * Bit fields...
              */
-            dt->shared->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
+            dt->shared->u.atomic.order   = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
             dt->shared->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
             dt->shared->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
             UINT16DECODE(*pp, dt->shared->u.atomic.offset);
@@ -248,191 +246,195 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
              */
             z = flags & (H5T_OPAQUE_TAG_MAX - 1);
             HDassert(0 == (z & 0x7)); /*must be aligned*/
-            if(NULL == (dt->shared->u.opaque.tag = (char *)H5MM_malloc(z + 1)))
+            if (NULL == (dt->shared->u.opaque.tag = (char *)H5MM_malloc(z + 1)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
             HDmemcpy(dt->shared->u.opaque.tag, *pp, z);
             dt->shared->u.opaque.tag[z] = '\0';
             *pp += z;
             break;
 
-        case H5T_COMPOUND:
-            {
-                unsigned offset_nbytes;         /* Size needed to encode member offsets */
-                size_t max_memb_pos = 0;        /* Maximum member covered, so far */
-                unsigned max_version = 0;       /* Maximum member version */
-                hbool_t upgrade_to = 0;         /* Version number we can "soft" upgrade to */
-                unsigned j;
+        case H5T_COMPOUND: {
+            unsigned offset_nbytes;    /* Size needed to encode member offsets */
+            size_t   max_memb_pos = 0; /* Maximum member covered, so far */
+            unsigned max_version  = 0; /* Maximum member version */
+            hbool_t  upgrade_to   = 0; /* Version number we can "soft" upgrade to */
+            unsigned j;
 
-                /* Compute the # of bytes required to store a member offset */
-                offset_nbytes = H5VM_limit_enc_size((uint64_t)dt->shared->size);
+            /* Compute the # of bytes required to store a member offset */
+            offset_nbytes = H5VM_limit_enc_size((uint64_t)dt->shared->size);
 
-                /*
-                 * Compound datatypes...
-                 */
-                dt->shared->u.compnd.nmembs = flags & 0xffff;
-                if(dt->shared->u.compnd.nmembs == 0)
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "invalid number of members: %u", dt->shared->u.compnd.nmembs)
-                dt->shared->u.compnd.nalloc = dt->shared->u.compnd.nmembs;
-                dt->shared->u.compnd.memb = (H5T_cmemb_t *)H5MM_calloc(dt->shared->u.compnd.nalloc * sizeof(H5T_cmemb_t));
-                dt->shared->u.compnd.memb_size = 0;
-                if(NULL == dt->shared->u.compnd.memb)
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed")
-                for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-                    unsigned ndims = 0;     /* Number of dimensions of the array field */
-                    htri_t can_upgrade;     /* Whether we can upgrade this type's version */
-                    hsize_t dim[H5O_LAYOUT_NDIMS];  /* Dimensions of the array */
-                    H5T_t *array_dt;    /* Temporary pointer to the array datatype */
-                    H5T_t *temp_type;   /* Temporary pointer to the field's datatype */
-
-                    /* Decode the field name */
-                    dt->shared->u.compnd.memb[i].name = H5MM_xstrdup((const char *)*pp);
-
-                    /* Version 3 of the datatype message eliminated the padding to multiple of 8 bytes */
-                    if(version >= H5O_DTYPE_VERSION_3)
-                        /* Advance past name, including null terminator */
-                        *pp += HDstrlen((const char *)*pp) + 1;
-                    else
-                        /* Advance multiple of 8 w/ null terminator */
-                        *pp += ((HDstrlen((const char *)*pp) + 8) / 8) * 8;
+            /*
+             * Compound datatypes...
+             */
+            dt->shared->u.compnd.nmembs = flags & 0xffff;
+            if (dt->shared->u.compnd.nmembs == 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "invalid number of members: %u",
+                            dt->shared->u.compnd.nmembs)
+            dt->shared->u.compnd.nalloc = dt->shared->u.compnd.nmembs;
+            dt->shared->u.compnd.memb =
+                (H5T_cmemb_t *)H5MM_calloc(dt->shared->u.compnd.nalloc * sizeof(H5T_cmemb_t));
+            dt->shared->u.compnd.memb_size = 0;
+            if (NULL == dt->shared->u.compnd.memb)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed")
+            for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+                unsigned ndims = 0;             /* Number of dimensions of the array field */
+                htri_t   can_upgrade;           /* Whether we can upgrade this type's version */
+                hsize_t  dim[H5O_LAYOUT_NDIMS]; /* Dimensions of the array */
+                H5T_t *  array_dt;              /* Temporary pointer to the array datatype */
+                H5T_t *  temp_type;             /* Temporary pointer to the field's datatype */
+
+                /* Decode the field name */
+                dt->shared->u.compnd.memb[i].name = H5MM_xstrdup((const char *)*pp);
 
-                    /* Decode the field offset */
-                    /* (starting with version 3 of the datatype message, use the minimum # of bytes required) */
-                    if(version >= H5O_DTYPE_VERSION_3)
-                        UINT32DECODE_VAR(*pp, dt->shared->u.compnd.memb[i].offset, offset_nbytes)
-                    else
-                        UINT32DECODE(*pp, dt->shared->u.compnd.memb[i].offset)
-
-                    /* Older versions of the library allowed a field to have
-                     * intrinsic 'arrayness'.  Newer versions of the library
-                     * use the separate array datatypes. */
-                    if(version == H5O_DTYPE_VERSION_1) {
-                        /* Decode the number of dimensions */
-                        ndims = *(*pp)++;
-
-                        /* Check that ndims is valid */
-                        if(ndims > 4)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "invalid number of dimensions for array")
-
-                        *pp += 3;		/*reserved bytes */
-
-                        /* Skip dimension permutation */
-                        *pp += 4;
-
-                        /* Skip reserved bytes */
-                        *pp += 4;
-
-                        /* Decode array dimension sizes */
-                        for(j = 0; j < 4; j++)
-                            UINT32DECODE(*pp, dim[j]);
-                    } /* end if */
-
-                    /* Allocate space for the field's datatype */
-                    if(NULL == (temp_type = H5T__alloc()))
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-
-                    /* Decode the field's datatype information */
-                    if((can_upgrade = H5O_dtype_decode_helper(f, ioflags, pp, temp_type)) < 0) {
-                        for(j = 0; j <= i; j++)
-                            H5MM_xfree(dt->shared->u.compnd.memb[j].name);
-                        H5MM_xfree(dt->shared->u.compnd.memb);
-                        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode member type")
-                    } /* end if */
-
-                    /* Upgrade the version if we can and it is necessary */
-                    if(can_upgrade && temp_type->shared->version > version) {
-                        upgrade_to = temp_type->shared->version;
-
-                        /* Pass "can_upgrade" flag down to parent type */
-                        ret_value = TRUE;
-                    } /* end if */
-
-                    /* Go create the array datatype now, for older versions of the datatype message */
-                    if(version == H5O_DTYPE_VERSION_1) {
-                        /* Check if this member is an array field */
-                        if(ndims > 0) {
-                            /* Create the array datatype for the field */
-                            if((array_dt = H5T__array_create(temp_type, ndims, dim)) == NULL) {
-                                for(j = 0; j <= i; j++)
-                                    H5MM_xfree(dt->shared->u.compnd.memb[j].name);
-                                H5MM_xfree(dt->shared->u.compnd.memb);
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to create array datatype")
-                            } /* end if */
-
-                            /* Close the base type for the array */
-                            H5T_close(temp_type);
-
-                            /* Make the array type the type that is set for the field */
-                            temp_type = array_dt;
-
-                            /* Reset array version if NOCHANGE is specified (i.e. h5debug) */
-                            if(*ioflags & H5O_DECODEIO_NOCHANGE)
-                                temp_type->shared->version = H5O_DTYPE_VERSION_1;
-                            else {
-                                /* Otherwise upgrade the compound version */
-                                if(upgrade_to < temp_type->shared->version)
-                                    upgrade_to = temp_type->shared->version;
-
-                                /* Set the return value to indicate that we should freely
-                                 * upgrade parent types */
-                                ret_value = TRUE;
-                            } /* end else */
+                /* Version 3 of the datatype message eliminated the padding to multiple of 8 bytes */
+                if (version >= H5O_DTYPE_VERSION_3)
+                    /* Advance past name, including null terminator */
+                    *pp += HDstrlen((const char *)*pp) + 1;
+                else
+                    /* Advance multiple of 8 w/ null terminator */
+                    *pp += ((HDstrlen((const char *)*pp) + 8) / 8) * 8;
+
+                /* Decode the field offset */
+                /* (starting with version 3 of the datatype message, use the minimum # of bytes required) */
+                if (version >= H5O_DTYPE_VERSION_3)
+                    UINT32DECODE_VAR(*pp, dt->shared->u.compnd.memb[i].offset, offset_nbytes)
+                else
+                    UINT32DECODE(*pp, dt->shared->u.compnd.memb[i].offset)
+
+                /* Older versions of the library allowed a field to have
+                 * intrinsic 'arrayness'.  Newer versions of the library
+                 * use the separate array datatypes. */
+                if (version == H5O_DTYPE_VERSION_1) {
+                    /* Decode the number of dimensions */
+                    ndims = *(*pp)++;
+
+                    /* Check that ndims is valid */
+                    if (ndims > 4)
+                        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "invalid number of dimensions for array")
+
+                    *pp += 3; /*reserved bytes */
+
+                    /* Skip dimension permutation */
+                    *pp += 4;
+
+                    /* Skip reserved bytes */
+                    *pp += 4;
+
+                    /* Decode array dimension sizes */
+                    for (j = 0; j < 4; j++)
+                        UINT32DECODE(*pp, dim[j]);
+                } /* end if */
+
+                /* Allocate space for the field's datatype */
+                if (NULL == (temp_type = H5T__alloc()))
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+
+                /* Decode the field's datatype information */
+                if ((can_upgrade = H5O_dtype_decode_helper(f, ioflags, pp, temp_type)) < 0) {
+                    for (j = 0; j <= i; j++)
+                        H5MM_xfree(dt->shared->u.compnd.memb[j].name);
+                    H5MM_xfree(dt->shared->u.compnd.memb);
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode member type")
+                } /* end if */
+
+                /* Upgrade the version if we can and it is necessary */
+                if (can_upgrade && temp_type->shared->version > version) {
+                    upgrade_to = temp_type->shared->version;
+
+                    /* Pass "can_upgrade" flag down to parent type */
+                    ret_value = TRUE;
+                } /* end if */
+
+                /* Go create the array datatype now, for older versions of the datatype message */
+                if (version == H5O_DTYPE_VERSION_1) {
+                    /* Check if this member is an array field */
+                    if (ndims > 0) {
+                        /* Create the array datatype for the field */
+                        if ((array_dt = H5T__array_create(temp_type, ndims, dim)) == NULL) {
+                            for (j = 0; j <= i; j++)
+                                H5MM_xfree(dt->shared->u.compnd.memb[j].name);
+                            H5MM_xfree(dt->shared->u.compnd.memb);
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL,
+                                        "unable to create array datatype")
                         } /* end if */
-                    } /* end if */
-
-                    /* Keep track of the maximum member version found */
-                    if(temp_type->shared->version > max_version)
-                        max_version = temp_type->shared->version;
-
-                    /*
-                     * Set the "force conversion" flag if VL datatype fields exist in this
-                     * type or any component types
-                     */
-                    if(temp_type->shared->force_conv == TRUE)
-                        dt->shared->force_conv = TRUE;
-
-                    /* Member size */
-                    dt->shared->u.compnd.memb[i].size = temp_type->shared->size;
-                    dt->shared->u.compnd.memb_size += temp_type->shared->size;
-
-                    /* Set the field datatype (finally :-) */
-                    dt->shared->u.compnd.memb[i].type = temp_type;
-
-                    /* Check if this field overlaps with a prior field */
-                    /* (probably indicates that the file is corrupt) */
-                    if(i > 0 && dt->shared->u.compnd.memb[i].offset < max_memb_pos) {
-                        for(j = 0; j < i; j++)
-                            if(dt->shared->u.compnd.memb[i].offset >= dt->shared->u.compnd.memb[j].offset
-                                    && dt->shared->u.compnd.memb[i].offset < (dt->shared->u.compnd.memb[j].offset + dt->shared->u.compnd.memb[j].size))
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "member overlaps with previous member")
-                    } /* end if */
-
-                    /* Update the maximum member position covered */
-                    max_memb_pos = MAX(max_memb_pos, (dt->shared->u.compnd.memb[i].offset + dt->shared->u.compnd.memb[i].size));
-                } /* end for */
 
-                /* Check if the compound type is packed */
-                H5T__update_packed(dt);
-
-                /* Upgrade the compound if requested */
-                if(version < upgrade_to) {
-                    version = upgrade_to;
-                    if(H5T__upgrade_version(dt, upgrade_to) < 0)
-                        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade compound encoding version")
-                    /* We won't mark the message dirty since there were no
-                     * errors in the file, simply type versions that we will no
-                     * longer encode. */
+                        /* Close the base type for the array */
+                        H5T_close(temp_type);
+
+                        /* Make the array type the type that is set for the field */
+                        temp_type = array_dt;
+
+                        /* Reset array version if NOCHANGE is specified (i.e. h5debug) */
+                        if (*ioflags & H5O_DECODEIO_NOCHANGE)
+                            temp_type->shared->version = H5O_DTYPE_VERSION_1;
+                        else {
+                            /* Otherwise upgrade the compound version */
+                            if (upgrade_to < temp_type->shared->version)
+                                upgrade_to = temp_type->shared->version;
+
+                            /* Set the return value to indicate that we should freely
+                             * upgrade parent types */
+                            ret_value = TRUE;
+                        } /* end else */
+                    }     /* end if */
+                }         /* end if */
+
+                /* Keep track of the maximum member version found */
+                if (temp_type->shared->version > max_version)
+                    max_version = temp_type->shared->version;
+
+                /*
+                 * Set the "force conversion" flag if VL datatype fields exist in this
+                 * type or any component types
+                 */
+                if (temp_type->shared->force_conv == TRUE)
+                    dt->shared->force_conv = TRUE;
+
+                /* Member size */
+                dt->shared->u.compnd.memb[i].size = temp_type->shared->size;
+                dt->shared->u.compnd.memb_size += temp_type->shared->size;
+
+                /* Set the field datatype (finally :-) */
+                dt->shared->u.compnd.memb[i].type = temp_type;
+
+                /* Check if this field overlaps with a prior field */
+                /* (probably indicates that the file is corrupt) */
+                if (i > 0 && dt->shared->u.compnd.memb[i].offset < max_memb_pos) {
+                    for (j = 0; j < i; j++)
+                        if (dt->shared->u.compnd.memb[i].offset >= dt->shared->u.compnd.memb[j].offset &&
+                            dt->shared->u.compnd.memb[i].offset <
+                                (dt->shared->u.compnd.memb[j].offset + dt->shared->u.compnd.memb[j].size))
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL,
+                                        "member overlaps with previous member")
                 } /* end if */
 
-                /* Check that no member of this compound has a version greater
-                 * than the compound itself. */
-                H5O_DTYPE_CHECK_VERSION(dt, version, max_version, ioflags, "compound", FAIL)
-            }
-            break;
+                /* Update the maximum member position covered */
+                max_memb_pos = MAX(max_memb_pos,
+                                   (dt->shared->u.compnd.memb[i].offset + dt->shared->u.compnd.memb[i].size));
+            } /* end for */
+
+            /* Check if the compound type is packed */
+            H5T__update_packed(dt);
+
+            /* Upgrade the compound if requested */
+            if (version < upgrade_to) {
+                version = upgrade_to;
+                if (H5T__upgrade_version(dt, upgrade_to) < 0)
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade compound encoding version")
+                /* We won't mark the message dirty since there were no
+                 * errors in the file, simply type versions that we will no
+                 * longer encode. */
+            } /* end if */
+
+            /* Check that no member of this compound has a version greater
+             * than the compound itself. */
+            H5O_DTYPE_CHECK_VERSION(dt, version, max_version, ioflags, "compound", FAIL)
+        } break;
 
         case H5T_REFERENCE: /* Reference datatypes...  */
-            dt->shared->u.atomic.order = H5T_ORDER_NONE;
-            dt->shared->u.atomic.prec = 8 * dt->shared->size;
-            dt->shared->u.atomic.offset = 0;
+            dt->shared->u.atomic.order   = H5T_ORDER_NONE;
+            dt->shared->u.atomic.prec    = 8 * dt->shared->size;
+            dt->shared->u.atomic.offset  = 0;
             dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
             dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
 
@@ -440,7 +442,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
             dt->shared->u.atomic.u.r.rtype = (H5R_type_t)(flags & 0x0f);
 
             /* Set extra information for object references, so the hobj_ref_t gets swizzled correctly */
-            if(dt->shared->u.atomic.u.r.rtype == H5R_OBJECT) {
+            if (dt->shared->u.atomic.u.r.rtype == H5R_OBJECT) {
                 /* Mark location this type as undefined for now.  The caller function should
                  * decide the location. */
                 dt->shared->u.atomic.u.r.loc = H5T_LOC_BADLOC;
@@ -455,26 +457,27 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
              * Enumeration datatypes...
              */
             dt->shared->u.enumer.nmembs = dt->shared->u.enumer.nalloc = flags & 0xffff;
-            if(NULL == (dt->shared->parent = H5T__alloc()))
+            if (NULL == (dt->shared->parent = H5T__alloc()))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-            if(H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
+            if (H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode parent datatype")
 
             /* Check if the parent of this enum has a version greater than the
              * enum itself. */
-            H5O_DTYPE_CHECK_VERSION(dt, version, dt->shared->parent->shared->version,
-                ioflags, "enum", FAIL)
+            H5O_DTYPE_CHECK_VERSION(dt, version, dt->shared->parent->shared->version, ioflags, "enum", FAIL)
 
-            if(NULL == (dt->shared->u.enumer.name = (char **)H5MM_calloc(dt->shared->u.enumer.nalloc * sizeof(char*))) ||
-                    NULL == (dt->shared->u.enumer.value = (uint8_t *)H5MM_calloc(dt->shared->u.enumer.nalloc * dt->shared->parent->shared->size)))
+            if (NULL == (dt->shared->u.enumer.name =
+                             (char **)H5MM_calloc(dt->shared->u.enumer.nalloc * sizeof(char *))) ||
+                NULL == (dt->shared->u.enumer.value = (uint8_t *)H5MM_calloc(
+                             dt->shared->u.enumer.nalloc * dt->shared->parent->shared->size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Names */
-            for(i = 0; i < dt->shared->u.enumer.nmembs; i++) {
-                dt->shared->u.enumer.name[i] = H5MM_xstrdup((const char*)*pp);
+            for (i = 0; i < dt->shared->u.enumer.nmembs; i++) {
+                dt->shared->u.enumer.name[i] = H5MM_xstrdup((const char *)*pp);
 
                 /* Version 3 of the datatype message eliminated the padding to multiple of 8 bytes */
-                if(version >= H5O_DTYPE_VERSION_3)
+                if (version >= H5O_DTYPE_VERSION_3)
                     /* Advance past name, including null terminator */
                     *pp += HDstrlen((const char *)*pp) + 1;
                 else
@@ -488,75 +491,72 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
             *pp += dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size;
             break;
 
-        case H5T_VLEN:  /* Variable length datatypes...  */
+        case H5T_VLEN: /* Variable length datatypes...  */
             /* Set the type of VL information, either sequence or string */
             dt->shared->u.vlen.type = (H5T_vlen_type_t)(flags & 0x0f);
-            if(dt->shared->u.vlen.type == H5T_VLEN_STRING) {
+            if (dt->shared->u.vlen.type == H5T_VLEN_STRING) {
                 dt->shared->u.vlen.pad  = (H5T_str_t)((flags >> 4) & 0x0f);
                 dt->shared->u.vlen.cset = (H5T_cset_t)((flags >> 8) & 0x0f);
             } /* end if */
 
             /* Decode base type of VL information */
-            if(NULL == (dt->shared->parent = H5T__alloc()))
+            if (NULL == (dt->shared->parent = H5T__alloc()))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "memory allocation failed")
-            if(H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
+            if (H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode VL parent type")
 
             /* Check if the parent of this vlen has a version greater than the
              * vlen itself. */
-            H5O_DTYPE_CHECK_VERSION(dt, version, dt->shared->parent->shared->version,
-                ioflags, "vlen", FAIL)
+            H5O_DTYPE_CHECK_VERSION(dt, version, dt->shared->parent->shared->version, ioflags, "vlen", FAIL)
 
-            dt->shared->force_conv=TRUE;
+            dt->shared->force_conv = TRUE;
 
             /* Mark location this type as undefined for now.  The caller function should
              * decide the location. */
-            if(H5T_set_loc(dt, f, H5T_LOC_BADLOC) < 0)
+            if (H5T_set_loc(dt, f, H5T_LOC_BADLOC) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid datatype location")
             break;
 
-        case H5T_ARRAY:  /* Array datatypes */
+        case H5T_ARRAY: /* Array datatypes */
             /* Decode the number of dimensions */
             dt->shared->u.array.ndims = *(*pp)++;
 
             /* Double-check the number of dimensions */
-            if(dt->shared->u.array.ndims > H5S_MAX_RANK)
+            if (dt->shared->u.array.ndims > H5S_MAX_RANK)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTLOAD, FAIL, "too many dimensions for array datatype")
 
             /* Skip reserved bytes, if version has them */
-            if(version < H5O_DTYPE_VERSION_3)
+            if (version < H5O_DTYPE_VERSION_3)
                 *pp += 3;
 
             /* Decode array dimension sizes & compute number of elements */
-            for(i = 0, dt->shared->u.array.nelem = 1; i < (unsigned)dt->shared->u.array.ndims; i++) {
+            for (i = 0, dt->shared->u.array.nelem = 1; i < (unsigned)dt->shared->u.array.ndims; i++) {
                 UINT32DECODE(*pp, dt->shared->u.array.dim[i]);
                 dt->shared->u.array.nelem *= dt->shared->u.array.dim[i];
             } /* end for */
 
             /* Skip array dimension permutations, if version has them */
-            if(version < H5O_DTYPE_VERSION_3)
+            if (version < H5O_DTYPE_VERSION_3)
                 *pp += dt->shared->u.array.ndims * 4;
 
             /* Decode base type of array */
-            if(NULL == (dt->shared->parent = H5T__alloc()))
+            if (NULL == (dt->shared->parent = H5T__alloc()))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "memory allocation failed")
-            if(H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
+            if (H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode array parent type")
 
             /* Check if the parent of this array has a version greater than the
              * array itself. */
-            H5O_DTYPE_CHECK_VERSION(dt, version, dt->shared->parent->shared->version,
-                ioflags, "array", FAIL)
+            H5O_DTYPE_CHECK_VERSION(dt, version, dt->shared->parent->shared->version, ioflags, "array", FAIL)
 
             /* There should be no array datatypes with version < 2. */
-            H5O_DTYPE_CHECK_VERSION(dt, version, H5O_DTYPE_VERSION_2, ioflags,
-                "array", FAIL)
+            H5O_DTYPE_CHECK_VERSION(dt, version, H5O_DTYPE_VERSION_2, ioflags, "array", FAIL)
 
             /*
              * Set the "force conversion" flag if a VL base datatype is used or
              * or if any components of the base datatype are VL types.
              */
-            if(dt->shared->parent->shared->force_conv == TRUE)
+            if (dt->shared->parent->shared->force_conv == TRUE)
                 dt->shared->force_conv = TRUE;
             break;
 
@@ -567,18 +567,17 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
     } /* end switch */
 
 done:
-    if(ret_value < 0) {
-        if(dt != NULL) {
-            if(dt->shared != NULL)
+    if (ret_value < 0) {
+        if (dt != NULL) {
+            if (dt->shared != NULL)
                 dt->shared = H5FL_FREE(H5T_shared_t, dt->shared);
             dt = H5FL_FREE(H5T_t, dt);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_decode_helper() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_encode_helper
  *
@@ -598,11 +597,11 @@ done:
 static herr_t
 H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
 {
-    unsigned	flags = 0;
-    uint8_t	*hdr = (uint8_t *)*pp;
-    unsigned	i;
-    size_t	n, z;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned flags = 0;
+    uint8_t *hdr   = (uint8_t *)*pp;
+    unsigned i;
+    size_t   n, z;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -614,14 +613,14 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
     *pp += 4;
     UINT32ENCODE(*pp, dt->shared->size);
 
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_INTEGER:
             /*
              * Integer datatypes...
              */
             switch (dt->shared->u.atomic.order) {
                 case H5T_ORDER_LE:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_ORDER_BE:
                     flags |= 0x01;
@@ -632,12 +631,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_ORDER_MIXED:
                 case H5T_ORDER_NONE:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "byte order is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "byte order is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.lsb_pad) {
                 case H5T_PAD_ZERO:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_PAD_ONE:
                     flags |= 0x02;
@@ -647,12 +647,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_PAD_BACKGROUND:
                 case H5T_NPAD:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "bit padding is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "bit padding is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.msb_pad) {
                 case H5T_PAD_ZERO:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_PAD_ERROR:
                 case H5T_PAD_BACKGROUND:
@@ -662,12 +663,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                     break;
 
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "bit padding is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "bit padding is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.u.i.sign) {
                 case H5T_SGN_NONE:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_SGN_2:
                     flags |= 0x08;
@@ -676,7 +678,8 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_SGN_ERROR:
                 case H5T_NSGN:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "sign scheme is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "sign scheme is not supported in file format yet")
             } /* end switch */
 
             UINT16ENCODE(*pp, dt->shared->u.atomic.offset);
@@ -689,13 +692,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
              */
             switch (dt->shared->u.atomic.order) {
                 case H5T_ORDER_LE:
-                    break;		/*nothing*/
+                    break; /*nothing*/
 
                 case H5T_ORDER_BE:
                     flags |= 0x01;
                     break;
 
-                case H5T_ORDER_VAX:     /*turn on 1st and 6th (reserved before adding VAX) bits*/
+                case H5T_ORDER_VAX: /*turn on 1st and 6th (reserved before adding VAX) bits*/
                     flags |= 0x41;
                     HDassert(dt->shared->version >= H5O_DTYPE_VERSION_3);
                     break;
@@ -704,12 +707,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_ORDER_ERROR:
                 case H5T_ORDER_NONE:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "byte order is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "byte order is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.lsb_pad) {
                 case H5T_PAD_ZERO:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_PAD_ONE:
                     flags |= 0x02;
@@ -719,12 +723,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_PAD_BACKGROUND:
                 case H5T_NPAD:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "bit padding is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "bit padding is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.msb_pad) {
                 case H5T_PAD_ZERO:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_PAD_ONE:
                     flags |= 0x04;
@@ -734,12 +739,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_PAD_BACKGROUND:
                 case H5T_NPAD:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "bit padding is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "bit padding is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.u.f.pad) {
                 case H5T_PAD_ZERO:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_PAD_ONE:
                     flags |= 0x08;
@@ -749,12 +755,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_PAD_BACKGROUND:
                 case H5T_NPAD:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "bit padding is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "bit padding is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.u.f.norm) {
                 case H5T_NORM_NONE:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_NORM_MSBSET:
                     flags |= 0x10;
@@ -766,7 +773,8 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
 
                 case H5T_NORM_ERROR:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "normalization scheme is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "normalization scheme is not supported in file format yet")
             } /* end switch */
 
             flags = (unsigned)(flags | ((dt->shared->u.atomic.u.f.sign << 8) & 0xff00));
@@ -783,10 +791,10 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
             UINT32ENCODE(*pp, dt->shared->u.atomic.u.f.ebias);
             break;
 
-        case H5T_TIME:  /* Time datatypes...  */
+        case H5T_TIME: /* Time datatypes...  */
             switch (dt->shared->u.atomic.order) {
                 case H5T_ORDER_LE:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_ORDER_BE:
                     flags |= 0x01;
@@ -797,7 +805,8 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_ORDER_ERROR:
                 case H5T_ORDER_NONE:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "byte order is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "byte order is not supported in file format yet")
             } /* end switch */
             UINT16ENCODE(*pp, dt->shared->u.atomic.prec);
             break;
@@ -822,7 +831,7 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
              */
             switch (dt->shared->u.atomic.order) {
                 case H5T_ORDER_LE:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_ORDER_BE:
                     flags |= 0x01;
@@ -833,12 +842,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_ORDER_ERROR:
                 case H5T_ORDER_NONE:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "byte order is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "byte order is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.lsb_pad) {
                 case H5T_PAD_ZERO:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_PAD_ONE:
                     flags |= 0x02;
@@ -848,12 +858,13 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_PAD_BACKGROUND:
                 case H5T_NPAD:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "bit padding is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "bit padding is not supported in file format yet")
             } /* end switch */
 
             switch (dt->shared->u.atomic.msb_pad) {
                 case H5T_PAD_ZERO:
-                    break;		/*nothing */
+                    break; /*nothing */
 
                 case H5T_PAD_ONE:
                     flags |= 0x04;
@@ -863,7 +874,8 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 case H5T_PAD_BACKGROUND:
                 case H5T_NPAD:
                 default:
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "bit padding is not supported in file format yet")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "bit padding is not supported in file format yet")
             } /* end switch */
 
             UINT16ENCODE(*pp, dt->shared->u.atomic.offset);
@@ -877,90 +889,89 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
              * null terminated).
              */
             {
-                size_t	aligned;
+                size_t aligned;
 
-                z = HDstrlen(dt->shared->u.opaque.tag);
+                z       = HDstrlen(dt->shared->u.opaque.tag);
                 aligned = (z + 7) & (H5T_OPAQUE_TAG_MAX - 8);
-                flags = (unsigned)(flags | aligned);
-                HDmemcpy(*pp, dt->shared->u.opaque.tag, MIN(z,aligned));
-                for(n = MIN(z, aligned); n < aligned; n++)
+                flags   = (unsigned)(flags | aligned);
+                HDmemcpy(*pp, dt->shared->u.opaque.tag, MIN(z, aligned));
+                for (n = MIN(z, aligned); n < aligned; n++)
                     (*pp)[n] = 0;
                 *pp += aligned;
             }
             break;
 
-        case H5T_COMPOUND:
-            {
-                unsigned offset_nbytes;         /* Size needed to encode member offsets */
+        case H5T_COMPOUND: {
+            unsigned offset_nbytes; /* Size needed to encode member offsets */
 
-                /* Compute the # of bytes required to store a member offset */
-                offset_nbytes = H5VM_limit_enc_size((uint64_t)dt->shared->size);
+            /* Compute the # of bytes required to store a member offset */
+            offset_nbytes = H5VM_limit_enc_size((uint64_t)dt->shared->size);
 
-                /*
-                 * Compound datatypes...
+            /*
+             * Compound datatypes...
+             */
+            flags = dt->shared->u.compnd.nmembs & 0xffff;
+            for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+                /* Sanity check */
+                /* (compound datatypes w/array members must be encoded w/version >= 2) */
+                HDassert(dt->shared->u.compnd.memb[i].type->shared->type != H5T_ARRAY ||
+                         dt->shared->version >= H5O_DTYPE_VERSION_2);
+
+                /* Check that the version is at least as great as the member */
+                HDassert(dt->shared->version >= dt->shared->u.compnd.memb[i].type->shared->version);
+
+                /* Name */
+                HDstrcpy((char *)(*pp), dt->shared->u.compnd.memb[i].name);
+
+                /* Version 3 of the datatype message removed the padding to multiple of 8 bytes */
+                n = HDstrlen(dt->shared->u.compnd.memb[i].name);
+                if (dt->shared->version >= H5O_DTYPE_VERSION_3)
+                    *pp += n + 1;
+                else {
+                    /* Pad name to multiple of 8 bytes */
+                    for (z = n + 1; z % 8; z++)
+                        (*pp)[z] = '\0';
+                    *pp += z;
+                } /* end if */
+
+                /* Member offset */
+                /* (starting with version 3 of the datatype message, use the minimum # of bytes required) */
+                if (dt->shared->version >= H5O_DTYPE_VERSION_3)
+                    UINT32ENCODE_VAR(*pp, (uint32_t)dt->shared->u.compnd.memb[i].offset, offset_nbytes)
+                else
+                    UINT32ENCODE(*pp, dt->shared->u.compnd.memb[i].offset)
+
+                /* If we don't have any array fields, write out the old style
+                 * member information, for better backward compatibility
+                 * Write out all zeros for the array information, though...
                  */
-                flags = dt->shared->u.compnd.nmembs & 0xffff;
-                for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-                    /* Sanity check */
-                    /* (compound datatypes w/array members must be encoded w/version >= 2) */
-                    HDassert(dt->shared->u.compnd.memb[i].type->shared->type != H5T_ARRAY || dt->shared->version >= H5O_DTYPE_VERSION_2);
-
-                    /* Check that the version is at least as great as the member */
-                    HDassert(dt->shared->version >= dt->shared->u.compnd.memb[i].type->shared->version);
-
-                    /* Name */
-                    HDstrcpy((char*)(*pp), dt->shared->u.compnd.memb[i].name);
-
-                    /* Version 3 of the datatype message removed the padding to multiple of 8 bytes */
-                    n = HDstrlen(dt->shared->u.compnd.memb[i].name);
-                    if(dt->shared->version >= H5O_DTYPE_VERSION_3)
-                        *pp += n + 1;
-                    else {
-                        /* Pad name to multiple of 8 bytes */
-                        for(z = n + 1; z % 8; z++)
-                            (*pp)[z] = '\0';
-                        *pp += z;
-                    } /* end if */
-
-                    /* Member offset */
-                    /* (starting with version 3 of the datatype message, use the minimum # of bytes required) */
-                    if(dt->shared->version >= H5O_DTYPE_VERSION_3)
-                        UINT32ENCODE_VAR(*pp, (uint32_t)dt->shared->u.compnd.memb[i].offset, offset_nbytes)
-                    else
-                        UINT32ENCODE(*pp, dt->shared->u.compnd.memb[i].offset)
+                if (dt->shared->version == H5O_DTYPE_VERSION_1) {
+                    unsigned j;
 
-                    /* If we don't have any array fields, write out the old style
-                     * member information, for better backward compatibility
-                     * Write out all zeros for the array information, though...
-                     */
-                    if(dt->shared->version == H5O_DTYPE_VERSION_1) {
-                        unsigned	j;
+                    /* Dimensionality */
+                    *(*pp)++ = 0;
 
-                        /* Dimensionality */
-                        *(*pp)++ = 0;
+                    /* Reserved */
+                    *(*pp)++ = 0;
+                    *(*pp)++ = 0;
+                    *(*pp)++ = 0;
 
-                        /* Reserved */
-                        *(*pp)++ = 0;
-                        *(*pp)++ = 0;
-                        *(*pp)++ = 0;
+                    /* Dimension permutation */
+                    UINT32ENCODE(*pp, 0);
 
-                        /* Dimension permutation */
-                        UINT32ENCODE(*pp, 0);
+                    /* Reserved */
+                    UINT32ENCODE(*pp, 0);
 
-                        /* Reserved */
+                    /* Dimensions */
+                    for (j = 0; j < 4; j++)
                         UINT32ENCODE(*pp, 0);
+                } /* end if */
 
-                        /* Dimensions */
-                        for(j = 0; j < 4; j++)
-                            UINT32ENCODE(*pp, 0);
-                    } /* end if */
-
-                    /* Subtype */
-                    if(H5O_dtype_encode_helper(f, pp, dt->shared->u.compnd.memb[i].type) < 0)
-                        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "unable to encode member type")
-                } /* end for */
-            }
-            break;
+                /* Subtype */
+                if (H5O_dtype_encode_helper(f, pp, dt->shared->u.compnd.memb[i].type) < 0)
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "unable to encode member type")
+            } /* end for */
+        } break;
 
         case H5T_REFERENCE:
             flags |= (dt->shared->u.atomic.u.r.rtype & 0x0f);
@@ -976,47 +987,48 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
             flags = dt->shared->u.enumer.nmembs & 0xffff;
 
             /* Parent type */
-            if(H5O_dtype_encode_helper(f, pp, dt->shared->parent) < 0)
+            if (H5O_dtype_encode_helper(f, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "unable to encode parent datatype")
 
             /* Names, each a multiple of eight bytes */
-            for(i = 0; i < dt->shared->u.enumer.nmembs; i++) {
+            for (i = 0; i < dt->shared->u.enumer.nmembs; i++) {
                 /* Name */
-                HDstrcpy((char*)(*pp), dt->shared->u.enumer.name[i]);
+                HDstrcpy((char *)(*pp), dt->shared->u.enumer.name[i]);
 
                 /* Version 3 of the datatype message removed the padding to multiple of 8 bytes */
                 n = HDstrlen(dt->shared->u.enumer.name[i]);
-                if(dt->shared->version >= H5O_DTYPE_VERSION_3)
+                if (dt->shared->version >= H5O_DTYPE_VERSION_3)
                     *pp += n + 1;
                 else {
                     /* Pad to multiple of 8 bytes */
-                    for(z = n + 1; z % 8; z++)
+                    for (z = n + 1; z % 8; z++)
                         (*pp)[z] = '\0';
                     *pp += z;
                 } /* end for */
-            } /* end for */
+            }     /* end for */
 
             /* Values */
-            HDmemcpy(*pp, dt->shared->u.enumer.value, dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size);
+            HDmemcpy(*pp, dt->shared->u.enumer.value,
+                     dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size);
             *pp += dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size;
             break;
 
-        case H5T_VLEN:  /* Variable length datatypes...  */
+        case H5T_VLEN: /* Variable length datatypes...  */
             /* Check that the version is at least as great as the parent */
             HDassert(dt->shared->version >= dt->shared->parent->shared->version);
 
             flags |= (dt->shared->u.vlen.type & 0x0f);
-            if(dt->shared->u.vlen.type == H5T_VLEN_STRING) {
-                flags = (unsigned)(flags | (((unsigned)dt->shared->u.vlen.pad   & 0x0f) << 4));
-                flags = (unsigned)(flags | (((unsigned)dt->shared->u.vlen.cset  & 0x0f) << 8));
+            if (dt->shared->u.vlen.type == H5T_VLEN_STRING) {
+                flags = (unsigned)(flags | (((unsigned)dt->shared->u.vlen.pad & 0x0f) << 4));
+                flags = (unsigned)(flags | (((unsigned)dt->shared->u.vlen.cset & 0x0f) << 8));
             } /* end if */
 
             /* Encode base type of VL information */
-            if(H5O_dtype_encode_helper(f, pp, dt->shared->parent) < 0)
+            if (H5O_dtype_encode_helper(f, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "unable to encode VL parent type")
             break;
 
-        case H5T_ARRAY:  /* Array datatypes */
+        case H5T_ARRAY: /* Array datatypes */
             /* Double-check the number of dimensions */
             HDassert(dt->shared->u.array.ndims <= H5S_MAX_RANK);
 
@@ -1031,7 +1043,7 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
             *(*pp)++ = (uint8_t)dt->shared->u.array.ndims;
 
             /* Drop this information for Version 3 of the format */
-            if(dt->shared->version < H5O_DTYPE_VERSION_3) {
+            if (dt->shared->version < H5O_DTYPE_VERSION_3) {
                 /* Reserved */
                 *(*pp)++ = '\0';
                 *(*pp)++ = '\0';
@@ -1039,18 +1051,18 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
             } /* end if */
 
             /* Encode array dimensions */
-            for(i = 0; i < (unsigned)dt->shared->u.array.ndims; i++)
+            for (i = 0; i < (unsigned)dt->shared->u.array.ndims; i++)
                 UINT32ENCODE(*pp, dt->shared->u.array.dim[i]);
 
             /* Drop this information for Version 3 of the format */
-            if(dt->shared->version < H5O_DTYPE_VERSION_3) {
+            if (dt->shared->version < H5O_DTYPE_VERSION_3) {
                 /* Encode 'fake' array dimension permutations */
-                for(i = 0; i < (unsigned)dt->shared->u.array.ndims; i++)
+                for (i = 0; i < (unsigned)dt->shared->u.array.ndims; i++)
                     UINT32ENCODE(*pp, i);
             } /* end if */
 
             /* Encode base type of array's information */
-            if(H5O_dtype_encode_helper(f, pp, dt->shared->parent) < 0)
+            if (H5O_dtype_encode_helper(f, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "unable to encode VL parent type")
             break;
 
@@ -1071,32 +1083,32 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_encode_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_dtype_decode
  PURPOSE
     Decode a message and return a pointer to a memory struct
-	with the decoded information
+        with the decoded information
  USAGE
     void *H5O_dtype_decode(f, dxpl_id, mesg_flags, p)
-	H5F_t *f;		IN: pointer to the HDF5 file struct
+        H5F_t *f;		IN: pointer to the HDF5 file struct
         hid_t dxpl_id;          IN: DXPL for any I/O
         unsigned mesg_flags;    IN: Message flags to influence decoding
-	const uint8 *p;		IN: the raw information buffer
+        const uint8 *p;		IN: the raw information buffer
  RETURNS
     Pointer to the new message in native order on success, NULL on failure
  DESCRIPTION
-	This function decodes the "raw" disk form of a simple datatype message
+        This function decodes the "raw" disk form of a simple datatype message
     into a struct in memory native format.  The struct is allocated within this
     function using malloc() and is returned to the caller.
 --------------------------------------------------------------------------*/
 static void *
-H5O_dtype_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags,
-    unsigned *ioflags/*in,out*/, size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+H5O_dtype_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
+                 unsigned H5_ATTR_UNUSED mesg_flags, unsigned *ioflags /*in,out*/,
+                 size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5T_t	*dt = NULL;
-    void        *ret_value;     /* Return value */
+    H5T_t *dt = NULL;
+    void * ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1104,11 +1116,11 @@ H5O_dtype_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     HDassert(p);
 
     /* Allocate datatype message */
-    if(NULL == (dt = H5T__alloc()))
+    if (NULL == (dt = H5T__alloc()))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Perform actual decode of message */
-    if(H5O_dtype_decode_helper(f, ioflags, &p, dt) < 0)
+    if (H5O_dtype_decode_helper(f, ioflags, &p, dt) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, NULL, "can't decode type")
 
     /* Set return value */
@@ -1118,7 +1130,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_decode() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_dtype_encode
@@ -1126,21 +1137,21 @@ done:
     Encode a simple datatype message
  USAGE
     herr_t H5O_dtype_encode(f, raw_size, p, mesg)
-	H5F_t *f;	  IN: pointer to the HDF5 file struct
-	size_t raw_size;	IN: size of the raw information buffer
-	const uint8 *p;		IN: the raw information buffer
-	const void *mesg;	IN: Pointer to the simple datatype struct
+        H5F_t *f;	  IN: pointer to the HDF5 file struct
+        size_t raw_size;	IN: size of the raw information buffer
+        const uint8 *p;		IN: the raw information buffer
+        const void *mesg;	IN: Pointer to the simple datatype struct
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
-	This function encodes the native memory form of the simple datatype
+        This function encodes the native memory form of the simple datatype
     message in the "raw" disk form.
 --------------------------------------------------------------------------*/
 static herr_t
 H5O_dtype_encode(H5F_t *f, uint8_t *p, const void *mesg)
 {
-    const H5T_t	   *dt = (const H5T_t *) mesg;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    const H5T_t *dt        = (const H5T_t *)mesg;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1150,14 +1161,13 @@ H5O_dtype_encode(H5F_t *f, uint8_t *p, const void *mesg)
     HDassert(dt);
 
     /* encode */
-    if(H5O_dtype_encode_helper(f, &p, dt) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode type")
+    if (H5O_dtype_encode_helper(f, &p, dt) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode type")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_encode() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_dtype_copy
@@ -1165,22 +1175,22 @@ done:
     Copies a message from MESG to DEST, allocating DEST if necessary.
  USAGE
     void *H5O_dtype_copy(mesg, dest)
-	const void *mesg;	IN: Pointer to the source simple datatype
-				    struct
-	const void *dest;	IN: Pointer to the destination simple
-				    datatype struct
+        const void *mesg;	IN: Pointer to the source simple datatype
+                                    struct
+        const void *dest;	IN: Pointer to the destination simple
+                                    datatype struct
  RETURNS
     Pointer to DEST on success, NULL on failure
  DESCRIPTION
-	This function copies a native (memory) simple datatype message,
+        This function copies a native (memory) simple datatype message,
     allocating the destination structure if necessary.
 --------------------------------------------------------------------------*/
 static void *
 H5O_dtype_copy(const void *_src, void *_dst)
 {
-    const H5T_t		   *src = (const H5T_t *) _src;
-    H5T_t		   *dst;
-    void 		   *ret_value;  /* Return value */
+    const H5T_t *src = (const H5T_t *)_src;
+    H5T_t *      dst;
+    void *       ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1188,14 +1198,14 @@ H5O_dtype_copy(const void *_src, void *_dst)
     HDassert(src);
 
     /* Copy */
-    if(NULL == (dst = H5T_copy(src, H5T_COPY_ALL)))
+    if (NULL == (dst = H5T_copy(src, H5T_COPY_ALL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "can't copy type")
 
     /* Was result already allocated? */
-    if(_dst) {
-        *((H5T_t *) _dst) = *dst;
-        dst = H5FL_FREE(H5T_t, dst);
-        dst = (H5T_t *) _dst;
+    if (_dst) {
+        *((H5T_t *)_dst) = *dst;
+        dst              = H5FL_FREE(H5T_t, dst);
+        dst              = (H5T_t *)_dst;
     } /* end if */
 
     /* Set return value */
@@ -1205,7 +1215,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_copy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_dtype_size
@@ -1213,21 +1222,21 @@ done:
     Return the raw message size in bytes
  USAGE
     void *H5O_dtype_size(f, mesg)
-	H5F_t *f;	  IN: pointer to the HDF5 file struct
-	const void *mesg;     IN: Pointer to the source simple datatype struct
+        H5F_t *f;	  IN: pointer to the HDF5 file struct
+        const void *mesg;     IN: Pointer to the source simple datatype struct
  RETURNS
     Size of message on success, 0 on failure
  DESCRIPTION
-	This function returns the size of the raw simple datatype message on
+        This function returns the size of the raw simple datatype message on
     success.  (Not counting the message type or size fields, only the data
     portion of the message).  It doesn't take into account alignment.
 --------------------------------------------------------------------------*/
 static size_t
 H5O_dtype_size(const H5F_t *f, const void *_mesg)
 {
-    const H5T_t	*dt = (const H5T_t *)_mesg;
-    unsigned	u;                      /* Local index variable */
-    size_t	ret_value;
+    const H5T_t *dt = (const H5T_t *)_mesg;
+    unsigned     u; /* Local index variable */
+    size_t       ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1235,11 +1244,11 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
     HDassert(dt);
 
     /* Set the common size information */
-    ret_value = 4 +     /* Type, class & flags */
-        4;              /* Size of datatype */
+    ret_value = 4 + /* Type, class & flags */
+                4;  /* Size of datatype */
 
     /* Add in the property field length for each datatype class */
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_INTEGER:
             ret_value += 4;
             break;
@@ -1260,54 +1269,52 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
             ret_value += (HDstrlen(dt->shared->u.opaque.tag) + 7) & (H5T_OPAQUE_TAG_MAX - 8);
             break;
 
-        case H5T_COMPOUND:
-            {
-                unsigned offset_nbytes;         /* Size needed to encode member offsets */
+        case H5T_COMPOUND: {
+            unsigned offset_nbytes; /* Size needed to encode member offsets */
 
-                /* Compute the # of bytes required to store a member offset */
-                offset_nbytes = H5VM_limit_enc_size((uint64_t)dt->shared->size);
+            /* Compute the # of bytes required to store a member offset */
+            offset_nbytes = H5VM_limit_enc_size((uint64_t)dt->shared->size);
 
-                /* Compute the total size needed to encode compound datatype */
-                for(u = 0; u < dt->shared->u.compnd.nmembs; u++) {
-                    size_t name_len;    /* Length of field's name */
+            /* Compute the total size needed to encode compound datatype */
+            for (u = 0; u < dt->shared->u.compnd.nmembs; u++) {
+                size_t name_len; /* Length of field's name */
 
-                    /* Get length of field's name */
-                    name_len = HDstrlen(dt->shared->u.compnd.memb[u].name);
+                /* Get length of field's name */
+                name_len = HDstrlen(dt->shared->u.compnd.memb[u].name);
 
-                    /* Versions of the format >= 3 don't pad out the name */
-                    if(dt->shared->version >= H5O_DTYPE_VERSION_3)
-                        ret_value += name_len + 1;
-                    else
-                        ret_value += ((name_len + 8) / 8) * 8;
-
-                    /* Check for encoding array datatype or using the latest file format */
-                    /* (starting with version 3 of the datatype message, use the minimum # of bytes required) */
-                    if(dt->shared->version >= H5O_DTYPE_VERSION_3)
-                        ret_value += offset_nbytes; 	/*member offset*/
-                    else if(dt->shared->version == H5O_DTYPE_VERSION_2)
-                        ret_value += 4; 	/*member offset*/
-                    else
-                        ret_value += 4 +	/*member offset*/
-                             1 +		/*dimensionality*/
-                             3 +		/*reserved*/
-                             4 +		/*permutation*/
-                             4 +		/*reserved*/
-                             16;		/*dimensions*/
-                    ret_value += H5O_dtype_size(f, dt->shared->u.compnd.memb[u].type);
-                } /* end for */
-            }
-            break;
+                /* Versions of the format >= 3 don't pad out the name */
+                if (dt->shared->version >= H5O_DTYPE_VERSION_3)
+                    ret_value += name_len + 1;
+                else
+                    ret_value += ((name_len + 8) / 8) * 8;
+
+                /* Check for encoding array datatype or using the latest file format */
+                /* (starting with version 3 of the datatype message, use the minimum # of bytes required) */
+                if (dt->shared->version >= H5O_DTYPE_VERSION_3)
+                    ret_value += offset_nbytes; /*member offset*/
+                else if (dt->shared->version == H5O_DTYPE_VERSION_2)
+                    ret_value += 4; /*member offset*/
+                else
+                    ret_value += 4 + /*member offset*/
+                                 1 + /*dimensionality*/
+                                 3 + /*reserved*/
+                                 4 + /*permutation*/
+                                 4 + /*reserved*/
+                                 16; /*dimensions*/
+                ret_value += H5O_dtype_size(f, dt->shared->u.compnd.memb[u].type);
+            } /* end for */
+        } break;
 
         case H5T_ENUM:
             ret_value += H5O_dtype_size(f, dt->shared->parent);
-            for(u = 0; u < dt->shared->u.enumer.nmembs; u++) {
-                size_t name_len;    /* Length of field's name */
+            for (u = 0; u < dt->shared->u.enumer.nmembs; u++) {
+                size_t name_len; /* Length of field's name */
 
                 /* Get length of field's name */
                 name_len = HDstrlen(dt->shared->u.enumer.name[u]);
 
                 /* Versions of the format >= 3 don't pad out the name */
-                if(dt->shared->version >= H5O_DTYPE_VERSION_3)
+                if (dt->shared->version >= H5O_DTYPE_VERSION_3)
                     ret_value += name_len + 1;
                 else
                     ret_value += ((name_len + 8) / 8) * 8;
@@ -1321,10 +1328,10 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
 
         case H5T_ARRAY:
             ret_value += 1; /* ndims */
-            if(dt->shared->version < H5O_DTYPE_VERSION_3)
-                ret_value += 3; /* reserved bytes*/
+            if (dt->shared->version < H5O_DTYPE_VERSION_3)
+                ret_value += 3;                         /* reserved bytes*/
             ret_value += 4 * dt->shared->u.array.ndims; /* dimensions */
-            if(dt->shared->version < H5O_DTYPE_VERSION_3)
+            if (dt->shared->version < H5O_DTYPE_VERSION_3)
                 ret_value += 4 * dt->shared->u.array.ndims; /* dimension permutations */
             ret_value += H5O_dtype_size(f, dt->shared->parent);
             break;
@@ -1341,7 +1348,6 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_dtype_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_reset
  *
@@ -1360,17 +1366,16 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
 static herr_t
 H5O_dtype_reset(void *_mesg)
 {
-    H5T_t		   *dt = (H5T_t *) _mesg;
+    H5T_t *dt = (H5T_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(dt)
+    if (dt)
         H5T__free(dt);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_dtype_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_free
  *
@@ -1392,13 +1397,12 @@ H5O_dtype_free(void *mesg)
 
     HDassert(mesg);
 
-    ((H5T_t *) mesg)->shared = H5FL_FREE(H5T_shared_t, ((H5T_t *) mesg)->shared);
-    mesg = H5FL_FREE(H5T_t, mesg);
+    ((H5T_t *)mesg)->shared = H5FL_FREE(H5T_shared_t, ((H5T_t *)mesg)->shared);
+    mesg                    = H5FL_FREE(H5T_t, mesg);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_dtype_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_set_share
  *
@@ -1412,9 +1416,9 @@ H5O_dtype_free(void *mesg)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_dtype_set_share(void *_mesg/*in,out*/, const H5O_shared_t *sh)
+H5O_dtype_set_share(void *_mesg /*in,out*/, const H5O_shared_t *sh)
 {
-    H5T_t *dt = (H5T_t *)_mesg;
+    H5T_t *dt        = (H5T_t *)_mesg;
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -1429,19 +1433,20 @@ H5O_dtype_set_share(void *_mesg/*in,out*/, const H5O_shared_t *sh)
 
     /* Make sure we're not sharing a committed type in the heap */
     HDassert(sh->type == H5O_SHARE_TYPE_COMMITTED ||
-        (dt->shared->state != H5T_STATE_OPEN && dt->shared->state != H5T_STATE_NAMED));
+             (dt->shared->state != H5T_STATE_OPEN && dt->shared->state != H5T_STATE_NAMED));
 
     /* Copy the shared information */
-    if(H5O_set_shared(&(dt->sh_loc), sh) < 0)
+    if (H5O_set_shared(&(dt->sh_loc), sh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy shared message info")
 
     /* If this is now a committed datatype, set its state properly. */
-    if(sh->type == H5O_SHARE_TYPE_COMMITTED) {
+    if (sh->type == H5O_SHARE_TYPE_COMMITTED) {
         dt->shared->state = H5T_STATE_NAMED;
 
         /* Set up the object location for the datatype also */
         dt->oloc.file = sh->file;
-        dt->oloc.addr = sh->u.loc.oh_addr;;
+        dt->oloc.addr = sh->u.loc.oh_addr;
+        ;
         dt->oloc.holding_file = FALSE;
     } /* end if */
 
@@ -1449,7 +1454,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_set_share() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_can_share
  *
@@ -1469,31 +1473,30 @@ done:
 static htri_t
 H5O_dtype_can_share(const void *_mesg)
 {
-    const H5T_t	*mesg = (const H5T_t *)_mesg;
-    htri_t tri_ret;
-    htri_t ret_value = TRUE;
+    const H5T_t *mesg = (const H5T_t *)_mesg;
+    htri_t       tri_ret;
+    htri_t       ret_value = TRUE;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(mesg);
 
     /* Don't share immutable datatypes */
-    if((tri_ret = H5T_is_immutable(mesg)) > 0)
+    if ((tri_ret = H5T_is_immutable(mesg)) > 0)
         HGOTO_DONE(FALSE)
-    else if(tri_ret < 0)
+    else if (tri_ret < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, FAIL, "can't tell if datatype is immutable")
 
     /* Don't share committed datatypes */
-    if((tri_ret = H5T_committed(mesg)) > 0)
+    if ((tri_ret = H5T_committed(mesg)) > 0)
         HGOTO_DONE(FALSE)
-    else if(tri_ret < 0)
+    else if (tri_ret < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, FAIL, "can't tell if datatype is shared")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_can_share() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_dtype_pre_copy_file
  *
@@ -1510,13 +1513,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_dtype_pre_copy_file(H5F_t *file_src, const void *mesg_src,
-    hbool_t H5_ATTR_UNUSED *deleted, const H5O_copy_t H5_ATTR_UNUSED *cpy_info,
-    void *_udata)
+H5O_dtype_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t H5_ATTR_UNUSED *deleted,
+                        const H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata)
 {
-    const H5T_t	*dt_src = (const H5T_t *)mesg_src;  /* Source datatype */
-    H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata;   /* Dataset copying user data */
-    herr_t ret_value = SUCCEED;          /* Return value */
+    const H5T_t *       dt_src    = (const H5T_t *)mesg_src;      /* Source datatype */
+    H5D_copy_file_ud_t *udata     = (H5D_copy_file_ud_t *)_udata; /* Dataset copying user data */
+    herr_t              ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1531,13 +1533,13 @@ H5O_dtype_pre_copy_file(H5F_t *file_src, const void *mesg_src,
      * message is an early version, but since the layout information isn't
      * available here, we just make a copy in all situations)
      */
-    if(udata) {
+    if (udata) {
         /* Create a memory copy of the variable-length datatype */
-        if(NULL == (udata->src_dtype = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
+        if (NULL == (udata->src_dtype = H5T_copy(dt_src, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy")
 
         /* Set the location of the source datatype to describe the disk form of the data */
-        if(H5T_set_loc(udata->src_dtype, file_src, H5T_LOC_DISK) < 0)
+        if (H5T_set_loc(udata->src_dtype, file_src, H5T_LOC_DISK) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "cannot mark datatype on disk")
     } /* end if */
 
@@ -1545,7 +1547,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_pre_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_dtype_copy_file
  *
@@ -1560,32 +1561,32 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_dtype_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const H5O_msg_class_t *mesg_type,
-    void *native_src, H5F_t *file_dst, hbool_t H5_ATTR_UNUSED *recompute_size,
-    H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *udata, hid_t H5_ATTR_UNUSED dxpl_id)
+H5O_dtype_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const H5O_msg_class_t *mesg_type, void *native_src,
+                    H5F_t *file_dst, hbool_t H5_ATTR_UNUSED *recompute_size,
+                    H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *udata,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    H5T_t *dst_mesg;            /* Destination datatype */
-    void *ret_value;            /* Return value */
+    H5T_t *dst_mesg;  /* Destination datatype */
+    void * ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Perform a normal copy of the object header message */
-    if(NULL == (dst_mesg = (H5T_t *)H5O_dtype_copy(native_src, NULL)))
+    if (NULL == (dst_mesg = (H5T_t *)H5O_dtype_copy(native_src, NULL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy")
 
     /* The datatype will be in the new file; set its location. */
-    if(H5T_set_loc(dst_mesg, file_dst, H5T_LOC_DISK) < 0)
+    if (H5T_set_loc(dst_mesg, file_dst, H5T_LOC_DISK) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to set location")
 
     ret_value = dst_mesg;
 
 done:
-    if(NULL == ret_value)
+    if (NULL == ret_value)
         H5O_msg_free(mesg_type->id, dst_mesg);
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_dtype_shared_post_copy_upd
  *
@@ -1600,15 +1601,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_dtype_shared_post_copy_upd(const H5O_loc_t H5_ATTR_UNUSED *src_oloc,
-    const void H5_ATTR_UNUSED *mesg_src, H5O_loc_t H5_ATTR_UNUSED *dst_oloc, void *mesg_dst,
-    hid_t H5_ATTR_UNUSED dxpl_id, H5O_copy_t H5_ATTR_UNUSED *cpy_info)
+H5O_dtype_shared_post_copy_upd(const H5O_loc_t H5_ATTR_UNUSED *src_oloc, const void H5_ATTR_UNUSED *mesg_src,
+                               H5O_loc_t H5_ATTR_UNUSED *dst_oloc, void *mesg_dst,
+                               hid_t H5_ATTR_UNUSED dxpl_id, H5O_copy_t H5_ATTR_UNUSED *cpy_info)
 {
-    H5T_t       *dt_dst = (H5T_t *)mesg_dst;    /* Destination datatype */
+    H5T_t *dt_dst = (H5T_t *)mesg_dst; /* Destination datatype */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(dt_dst->sh_loc.type == H5O_SHARE_TYPE_COMMITTED) {
+    if (dt_dst->sh_loc.type == H5O_SHARE_TYPE_COMMITTED) {
         HDassert(H5T_committed(dt_dst));
         dt_dst->oloc.file = dt_dst->sh_loc.file;
         dt_dst->oloc.addr = dt_dst->sh_loc.u.loc.oh_addr;
@@ -1619,7 +1620,6 @@ H5O_dtype_shared_post_copy_upd(const H5O_loc_t H5_ATTR_UNUSED *src_oloc,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_dtype_shared_post_copy_upd */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_dtype_debug
@@ -1627,27 +1627,26 @@ H5O_dtype_shared_post_copy_upd(const H5O_loc_t H5_ATTR_UNUSED *src_oloc,
     Prints debugging information for a message
  USAGE
     void *H5O_dtype_debug(f, mesg, stream, indent, fwidth)
-	H5F_t *f;		IN: pointer to the HDF5 file struct
-	const void *mesg;	IN: Pointer to the source simple datatype
-				    struct
-	FILE *stream;		IN: Pointer to the stream for output data
-	int indent;		IN: Amount to indent information by
-	int fwidth;		IN: Field width (?)
+        H5F_t *f;		IN: pointer to the HDF5 file struct
+        const void *mesg;	IN: Pointer to the source simple datatype
+                                    struct
+        FILE *stream;		IN: Pointer to the stream for output data
+        int indent;		IN: Amount to indent information by
+        int fwidth;		IN: Field width (?)
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
-	This function prints debugging output to the stream passed as a
+        This function prints debugging output to the stream passed as a
     parameter.
 --------------------------------------------------------------------------*/
 static herr_t
-H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
-		int indent, int fwidth)
+H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream, int indent, int fwidth)
 {
-    const H5T_t		*dt = (const H5T_t*)mesg;
-    const char		*s;
-    char		buf[256];
-    unsigned		i;
-    size_t		k;
+    const H5T_t *dt = (const H5T_t *)mesg;
+    const char * s;
+    char         buf[256];
+    unsigned     i;
+    size_t       k;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1710,59 +1709,48 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
             s = buf;
             break;
     } /* end switch */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	    "Type class:",
-	    s);
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type class:", s);
 
-    HDfprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth,
-	    "Size:",
-	    (unsigned long)(dt->shared->size), 1 == dt->shared->size ? "" : "s");
+    HDfprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth, "Size:", (unsigned long)(dt->shared->size),
+              1 == dt->shared->size ? "" : "s");
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-		"Version:", dt->shared->version);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", dt->shared->version);
 
     if (H5T_COMPOUND == dt->shared->type) {
-	HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-		"Number of members:",
-		dt->shared->u.compnd.nmembs);
-	for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-	    sprintf(buf, "Member %u:", i);
-	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		    buf,
-		    dt->shared->u.compnd.memb[i].name);
-	    HDfprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX(0, fwidth-3),
-		    "Byte offset:",
-		    (unsigned long)(dt->shared->u.compnd.memb[i].offset));
-	    H5O_dtype_debug(f, dxpl_id, dt->shared->u.compnd.memb[i].type, stream,
-			    indent + 3, MAX(0, fwidth - 3));
-	}
-    } else if(H5T_ENUM == dt->shared->type) {
-	HDfprintf(stream, "%*s%s\n", indent, "", "Base type:");
-	H5O_dtype_debug(f, dxpl_id, dt->shared->parent, stream, indent+3, MAX(0, fwidth-3));
-	HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-		"Number of members:",
-		dt->shared->u.enumer.nmembs);
-	for(i = 0; i < dt->shared->u.enumer.nmembs; i++) {
-	    sprintf(buf, "Member %u:", i);
-	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		    buf,
-		    dt->shared->u.enumer.name[i]);
-	    HDfprintf(stream, "%*s%-*s 0x", indent, "", fwidth,
-		    "Raw bytes of value:");
-	    for(k = 0; k < dt->shared->parent->shared->size; k++)
-		HDfprintf(stream, "%02x",
-			dt->shared->u.enumer.value[i*dt->shared->parent->shared->size + k]);
-	    HDfprintf(stream, "\n");
-	} /* end for */
-
-    } else if(H5T_OPAQUE == dt->shared->type) {
-	HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth,
-		"Tag:", dt->shared->u.opaque.tag);
-    } else if(H5T_REFERENCE == dt->shared->type) {
-	HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
-		"Fix dumping reference types!");
-    } else if(H5T_STRING == dt->shared->type) {
-        switch(dt->shared->u.atomic.u.s.cset) {
+        HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+                  "Number of members:", dt->shared->u.compnd.nmembs);
+        for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+            sprintf(buf, "Member %u:", i);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, buf, dt->shared->u.compnd.memb[i].name);
+            HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
+                      "Byte offset:", (unsigned long)(dt->shared->u.compnd.memb[i].offset));
+            H5O_dtype_debug(f, dxpl_id, dt->shared->u.compnd.memb[i].type, stream, indent + 3,
+                            MAX(0, fwidth - 3));
+        }
+    }
+    else if (H5T_ENUM == dt->shared->type) {
+        HDfprintf(stream, "%*s%s\n", indent, "", "Base type:");
+        H5O_dtype_debug(f, dxpl_id, dt->shared->parent, stream, indent + 3, MAX(0, fwidth - 3));
+        HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+                  "Number of members:", dt->shared->u.enumer.nmembs);
+        for (i = 0; i < dt->shared->u.enumer.nmembs; i++) {
+            sprintf(buf, "Member %u:", i);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, buf, dt->shared->u.enumer.name[i]);
+            HDfprintf(stream, "%*s%-*s 0x", indent, "", fwidth, "Raw bytes of value:");
+            for (k = 0; k < dt->shared->parent->shared->size; k++)
+                HDfprintf(stream, "%02x",
+                          dt->shared->u.enumer.value[i * dt->shared->parent->shared->size + k]);
+            HDfprintf(stream, "\n");
+        } /* end for */
+    }
+    else if (H5T_OPAQUE == dt->shared->type) {
+        HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth, "Tag:", dt->shared->u.opaque.tag);
+    }
+    else if (H5T_REFERENCE == dt->shared->type) {
+        HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Fix dumping reference types!");
+    }
+    else if (H5T_STRING == dt->shared->type) {
+        switch (dt->shared->u.atomic.u.s.cset) {
             case H5T_CSET_ASCII:
                 s = "ASCII";
                 break;
@@ -1795,11 +1783,9 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                "Character Set:",
-                s);
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set:", s);
 
-        switch(dt->shared->u.atomic.u.s.pad) {
+        switch (dt->shared->u.atomic.u.s.pad) {
             case H5T_STR_NULLTERM:
                 s = "NULL Terminated";
                 break;
@@ -1835,11 +1821,10 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                "String Padding:",
-                s);
-    } else if(H5T_VLEN == dt->shared->type) {
-        switch(dt->shared->u.vlen.type) {
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "String Padding:", s);
+    }
+    else if (H5T_VLEN == dt->shared->type) {
+        switch (dt->shared->u.vlen.type) {
             case H5T_VLEN_SEQUENCE:
                 s = "sequence";
                 break;
@@ -1855,10 +1840,9 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                "Vlen type:", s);
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Vlen type:", s);
 
-        switch(dt->shared->u.vlen.loc) {
+        switch (dt->shared->u.vlen.loc) {
             case H5T_LOC_MEMORY:
                 s = "memory";
                 break;
@@ -1874,12 +1858,11 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                "Location:", s);
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Location:", s);
 
         /* Extra information for VL-strings */
-        if(dt->shared->u.vlen.type == H5T_VLEN_STRING) {
-            switch(dt->shared->u.vlen.cset) {
+        if (dt->shared->u.vlen.type == H5T_VLEN_STRING) {
+            switch (dt->shared->u.vlen.cset) {
                 case H5T_CSET_ASCII:
                     s = "ASCII";
                     break;
@@ -1912,11 +1895,9 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                     s = buf;
                     break;
             } /* end switch */
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Character Set:",
-                    s);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set:", s);
 
-            switch(dt->shared->u.vlen.pad) {
+            switch (dt->shared->u.vlen.pad) {
                 case H5T_STR_NULLTERM:
                     s = "NULL Terminated";
                     break;
@@ -1952,22 +1933,20 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                     s = buf;
                     break;
             } /* end switch */
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "String Padding:",
-                    s);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "String Padding:", s);
         } /* end if */
-    } else if(H5T_ARRAY == dt->shared->type) {
-	HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-		"Rank:",
-		dt->shared->u.array.ndims);
+    }
+    else if (H5T_ARRAY == dt->shared->type) {
+        HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Rank:", dt->shared->u.array.ndims);
         HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Dim Size:");
-        for(i = 0; i < dt->shared->u.array.ndims; i++)
+        for (i = 0; i < dt->shared->u.array.ndims; i++)
             HDfprintf(stream, "%s%u", (i ? ", " : ""), (unsigned)dt->shared->u.array.dim[i]);
         HDfprintf(stream, "}\n");
-	HDfprintf(stream, "%*s%s\n", indent, "", "Base type:");
-	H5O_dtype_debug(f, dxpl_id, dt->shared->parent, stream, indent + 3, MAX(0, fwidth - 3));
-    } else {
-	switch (dt->shared->u.atomic.order) {
+        HDfprintf(stream, "%*s%s\n", indent, "", "Base type:");
+        H5O_dtype_debug(f, dxpl_id, dt->shared->parent, stream, indent + 3, MAX(0, fwidth - 3));
+    }
+    else {
+        switch (dt->shared->u.atomic.order) {
             case H5T_ORDER_LE:
                 s = "little endian";
                 break;
@@ -1993,22 +1972,18 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 sprintf(buf, "H5T_ORDER_%d", dt->shared->u.atomic.order);
                 s = buf;
                 break;
-	} /* end switch */
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		"Byte order:",
-		s);
-
-	HDfprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
-		"Precision:",
-		(unsigned long)(dt->shared->u.atomic.prec),
-		1==dt->shared->u.atomic.prec?"":"s");
-
-	HDfprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
-		"Offset:",
-		(unsigned long)(dt->shared->u.atomic.offset),
-		1==dt->shared->u.atomic.offset?"":"s");
-
-	switch (dt->shared->u.atomic.lsb_pad) {
+        } /* end switch */
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Byte order:", s);
+
+        HDfprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
+                  "Precision:", (unsigned long)(dt->shared->u.atomic.prec),
+                  1 == dt->shared->u.atomic.prec ? "" : "s");
+
+        HDfprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
+                  "Offset:", (unsigned long)(dt->shared->u.atomic.offset),
+                  1 == dt->shared->u.atomic.offset ? "" : "s");
+
+        switch (dt->shared->u.atomic.lsb_pad) {
             case H5T_PAD_ZERO:
                 s = "zero";
                 break;
@@ -2026,11 +2001,10 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
             default:
                 s = "pad?";
                 break;
-	} /* end switch */
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		"Low pad type:", s);
+        } /* end switch */
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Low pad type:", s);
 
-	switch (dt->shared->u.atomic.msb_pad) {
+        switch (dt->shared->u.atomic.msb_pad) {
             case H5T_PAD_ZERO:
                 s = "zero";
                 break;
@@ -2048,12 +2022,11 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
             default:
                 s = "pad?";
                 break;
-	} /* end switch */
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		"High pad type:", s);
+        } /* end switch */
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "High pad type:", s);
 
-	if (H5T_FLOAT == dt->shared->type) {
-	    switch (dt->shared->u.atomic.u.f.pad) {
+        if (H5T_FLOAT == dt->shared->type) {
+            switch (dt->shared->u.atomic.u.f.pad) {
                 case H5T_PAD_ZERO:
                     s = "zero";
                     break;
@@ -2075,11 +2048,10 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                         sprintf(buf, "bit-%d", dt->shared->u.atomic.u.f.pad);
                     s = buf;
                     break;
-	    } /* end switch */
-	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		    "Internal pad type:", s);
+            } /* end switch */
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Internal pad type:", s);
 
-	    switch (dt->shared->u.atomic.u.f.norm) {
+            switch (dt->shared->u.atomic.u.f.norm) {
                 case H5T_NORM_IMPLIED:
                     s = "implied";
                     break;
@@ -2094,38 +2066,31 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
 
                 case H5T_NORM_ERROR:
                 default:
-                    sprintf(buf, "H5T_NORM_%d", (int) (dt->shared->u.atomic.u.f.norm));
+                    sprintf(buf, "H5T_NORM_%d", (int)(dt->shared->u.atomic.u.f.norm));
                     s = buf;
-	    } /* end switch */
-	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		    "Normalization:", s);
-
-	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-		    "Sign bit location:",
-		    (unsigned long) (dt->shared->u.atomic.u.f.sign));
+            } /* end switch */
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Normalization:", s);
 
-	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-		    "Exponent location:",
-		    (unsigned long) (dt->shared->u.atomic.u.f.epos));
+            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                      "Sign bit location:", (unsigned long)(dt->shared->u.atomic.u.f.sign));
 
-	    HDfprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
-		    "Exponent bias:",
-		    (unsigned long) (dt->shared->u.atomic.u.f.ebias));
+            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                      "Exponent location:", (unsigned long)(dt->shared->u.atomic.u.f.epos));
 
-	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-		    "Exponent size:",
-		    (unsigned long) (dt->shared->u.atomic.u.f.esize));
+            HDfprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
+                      "Exponent bias:", (unsigned long)(dt->shared->u.atomic.u.f.ebias));
 
-	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-		    "Mantissa location:",
-		    (unsigned long) (dt->shared->u.atomic.u.f.mpos));
+            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                      "Exponent size:", (unsigned long)(dt->shared->u.atomic.u.f.esize));
 
-	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-		    "Mantissa size:",
-		    (unsigned long) (dt->shared->u.atomic.u.f.msize));
+            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                      "Mantissa location:", (unsigned long)(dt->shared->u.atomic.u.f.mpos));
 
-	} else if (H5T_INTEGER == dt->shared->type) {
-	    switch (dt->shared->u.atomic.u.i.sign) {
+            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                      "Mantissa size:", (unsigned long)(dt->shared->u.atomic.u.f.msize));
+        }
+        else if (H5T_INTEGER == dt->shared->type) {
+            switch (dt->shared->u.atomic.u.i.sign) {
                 case H5T_SGN_NONE:
                     s = "none";
                     break;
@@ -2137,15 +2102,13 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 case H5T_SGN_ERROR:
                 case H5T_NSGN:
                 default:
-                    sprintf(buf, "H5T_SGN_%d", (int) (dt->shared->u.atomic.u.i.sign));
+                    sprintf(buf, "H5T_SGN_%d", (int)(dt->shared->u.atomic.u.i.sign));
                     s = buf;
                     break;
-	    } /* end switch */
-	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		    "Sign scheme:", s);
-	}
+            } /* end switch */
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Sign scheme:", s);
+        }
     }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_dtype_debug() */
-
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 958c1e0..04c8599 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -16,56 +16,52 @@
  *	       Tuesday, November 25, 1997
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5HLprivate.h" /* Local Heaps				*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                             size_t p_size, const uint8_t *p);
 static herr_t H5O_efl_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_efl_copy(const void *_mesg, void *_dest);
+static void * H5O_efl_copy(const void *_mesg, void *_dest);
 static size_t H5O_efl_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_efl_reset(void *_mesg);
-static void *H5O_efl_copy_file(H5F_t *file_src, void *mesg_src,
-    H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags,
-    H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
-static herr_t H5O_efl_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
-			    int indent, int fwidth);
+static void * H5O_efl_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size,
+                                unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
+static herr_t H5O_efl_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_EFL[1] = {{
-    H5O_EFL_ID,		    	/*message id number		*/
-    "external file list",   	/*message name for debugging    */
-    sizeof(H5O_efl_t),	    	/*native message size	    	*/
-    0,				/* messages are sharable?       */
-    H5O_efl_decode,	    	/*decode message		*/
-    H5O_efl_encode,	    	/*encode message		*/
-    H5O_efl_copy,	    	/*copy native value		*/
-    H5O_efl_size,	    	/*size of message on disk	*/
-    H5O_efl_reset,	    	/*reset method		    	*/
-    NULL,		            /* free method			*/
-    NULL,		        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    H5O_efl_copy_file,		/* copy native value to file    */
-    NULL,			/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_efl_debug	    	/*debug the message		*/
+    H5O_EFL_ID,           /*message id number		*/
+    "external file list", /*message name for debugging    */
+    sizeof(H5O_efl_t),    /*native message size	    	*/
+    0,                    /* messages are sharable?       */
+    H5O_efl_decode,       /*decode message		*/
+    H5O_efl_encode,       /*encode message		*/
+    H5O_efl_copy,         /*copy native value		*/
+    H5O_efl_size,         /*size of message on disk	*/
+    H5O_efl_reset,        /*reset method		    	*/
+    NULL,                 /* free method			*/
+    NULL,                 /* file delete method		*/
+    NULL,                 /* link method			*/
+    NULL,                 /*set share method		*/
+    NULL,                 /*can share method		*/
+    NULL,                 /* pre copy native value to file */
+    H5O_efl_copy_file,    /* copy native value to file    */
+    NULL,                 /* post copy native value to file    */
+    NULL,                 /* get creation index		*/
+    NULL,                 /* set creation index		*/
+    H5O_efl_debug         /*debug the message		*/
 }};
 
-#define H5O_EFL_VERSION		1
+#define H5O_EFL_VERSION 1
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_efl_decode
  *
@@ -87,16 +83,15 @@ const H5O_msg_class_t H5O_MSG_EFL[1] = {{
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags,
+               unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_efl_t   *mesg = NULL;
+    H5O_efl_t * mesg = NULL;
     int         version;
-    const char  *s = NULL;
-    H5HL_t      *heap;
-    size_t      u;                  /* Local index variable */
-    void        *ret_value = NULL;  /* Return value */
+    const char *s = NULL;
+    H5HL_t *    heap;
+    size_t      u;                /* Local index variable */
+    void *      ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -104,12 +99,12 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
     HDassert(f);
     HDassert(p);
 
-    if(NULL == (mesg = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t))))
+    if (NULL == (mesg = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Version */
     version = *p++;
-    if(version != H5O_EFL_VERSION)
+    if (version != H5O_EFL_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for external file list message")
 
     /* Reserved */
@@ -117,7 +112,7 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
 
     /* Number of slots */
     UINT16DECODE(p, mesg->nalloc);
-    HDassert(mesg->nalloc>0);
+    HDassert(mesg->nalloc > 0);
     UINT16DECODE(p, mesg->nused);
     HDassert(mesg->nused <= mesg->nalloc);
 
@@ -127,44 +122,44 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
 #ifndef NDEBUG
     HDassert(H5F_addr_defined(mesg->heap_addr));
 
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC_READ)))
+    if (NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read protect link value")
 
     s = (const char *)H5HL_offset_into(heap, 0);
 
     HDassert(s && !*s);
 
-    if(H5HL_unprotect(heap) < 0)
+    if (H5HL_unprotect(heap) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read unprotect link value")
     heap = NULL;
 #endif
 
     /* Decode the file list */
     mesg->slot = (H5O_efl_entry_t *)H5MM_calloc(mesg->nalloc * sizeof(H5O_efl_entry_t));
-    if(NULL == mesg->slot)
+    if (NULL == mesg->slot)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC_READ)))
+    if (NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read protect link value")
-    for(u = 0; u < mesg->nused; u++) {
+    for (u = 0; u < mesg->nused; u++) {
         /* Name */
-        H5F_DECODE_LENGTH (f, p, mesg->slot[u].name_offset);
+        H5F_DECODE_LENGTH(f, p, mesg->slot[u].name_offset);
 
-        if((s = (const char *)H5HL_offset_into(heap, mesg->slot[u].name_offset)) == NULL)
+        if ((s = (const char *)H5HL_offset_into(heap, mesg->slot[u].name_offset)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "unable to get external file name")
-        if(*s == (char)'\0')
+        if (*s == (char)'\0')
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "invalid external file name")
-        mesg->slot[u].name = H5MM_xstrdup (s);
+        mesg->slot[u].name = H5MM_xstrdup(s);
         HDassert(mesg->slot[u].name);
 
         /* File offset */
-        H5F_DECODE_LENGTH (f, p, mesg->slot[u].offset);
+        H5F_DECODE_LENGTH(f, p, mesg->slot[u].offset);
 
         /* Size */
-        H5F_DECODE_LENGTH (f, p, mesg->slot[u].size);
+        H5F_DECODE_LENGTH(f, p, mesg->slot[u].size);
     } /* end for */
 
-    if(H5HL_unprotect(heap) < 0)
+    if (H5HL_unprotect(heap) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read unprotect link value")
     heap = NULL;
 
@@ -172,14 +167,13 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
     ret_value = mesg;
 
 done:
-    if(ret_value == NULL)
-        if(mesg != NULL)
+    if (ret_value == NULL)
+        if (mesg != NULL)
             H5MM_xfree(mesg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_efl_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_efl_encode
  *
@@ -195,8 +189,8 @@ done:
 static herr_t
 H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_efl_t	*mesg = (const H5O_efl_t *)_mesg;
-    size_t		u;      /* Local index variable */
+    const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg;
+    size_t           u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -224,21 +218,20 @@ H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, cons
     H5F_addr_encode(f, &p, mesg->heap_addr);
 
     /* Encode file list */
-    for(u = 0; u < mesg->nused; u++) {
-	/*
-	 * The name should have been added to the heap when the dataset was
-	 * created.
-	 */
-	HDassert(mesg->slot[u].name_offset);
-	H5F_ENCODE_LENGTH(f, p, mesg->slot[u].name_offset);
-	H5F_ENCODE_LENGTH(f, p, (hsize_t)mesg->slot[u].offset);
-	H5F_ENCODE_LENGTH(f, p, mesg->slot[u].size);
+    for (u = 0; u < mesg->nused; u++) {
+        /*
+         * The name should have been added to the heap when the dataset was
+         * created.
+         */
+        HDassert(mesg->slot[u].name_offset);
+        H5F_ENCODE_LENGTH(f, p, mesg->slot[u].name_offset);
+        H5F_ENCODE_LENGTH(f, p, (hsize_t)mesg->slot[u].offset);
+        H5F_ENCODE_LENGTH(f, p, mesg->slot[u].size);
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_efl_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_efl_copy
  *
@@ -257,30 +250,30 @@ H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, cons
 static void *
 H5O_efl_copy(const void *_mesg, void *_dest)
 {
-    const H5O_efl_t	*mesg = (const H5O_efl_t *) _mesg;
-    H5O_efl_t		*dest = (H5O_efl_t *) _dest;
-    size_t		u;              /* Local index variable */
-    void                *ret_value;     /* Return value */
+    const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg;
+    H5O_efl_t *      dest = (H5O_efl_t *)_dest;
+    size_t           u;         /* Local index variable */
+    void *           ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(mesg);
-    if(!dest) {
-	if(NULL == (dest = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t))))
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message")
-        if(NULL == (dest->slot = (H5O_efl_entry_t *)H5MM_calloc(mesg->nalloc * sizeof(H5O_efl_entry_t))))
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message slots")
+    if (!dest) {
+        if (NULL == (dest = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t))))
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message")
+        if (NULL == (dest->slot = (H5O_efl_entry_t *)H5MM_calloc(mesg->nalloc * sizeof(H5O_efl_entry_t))))
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message slots")
     } /* end if */
-    else if(dest->nalloc < mesg->nalloc) {
-        H5O_efl_entry_t *temp_slot;     /* Temporary pointer to new slot information */
+    else if (dest->nalloc < mesg->nalloc) {
+        H5O_efl_entry_t *temp_slot; /* Temporary pointer to new slot information */
 
         /* Allocate new 'slot' information */
-        if(NULL == (temp_slot = (H5O_efl_entry_t *)H5MM_calloc(mesg->nalloc * sizeof(H5O_efl_entry_t))))
+        if (NULL == (temp_slot = (H5O_efl_entry_t *)H5MM_calloc(mesg->nalloc * sizeof(H5O_efl_entry_t))))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message slots")
 
         /* Release old 'slot' information */
-        for(u = 0; u < dest->nused; u++)
+        for (u = 0; u < dest->nused; u++)
             dest->slot[u].name = (char *)H5MM_xfree(dest->slot[u].name);
         dest->slot = (H5O_efl_entry_t *)H5MM_xfree(dest->slot);
 
@@ -289,16 +282,16 @@ H5O_efl_copy(const void *_mesg, void *_dest)
     } /* end if */
     else {
         /* Release old 'slot' information */
-        for(u = 0; u < dest->nused; u++)
+        for (u = 0; u < dest->nused; u++)
             dest->slot[u].name = (char *)H5MM_xfree(dest->slot[u].name);
     } /* end else */
     dest->heap_addr = mesg->heap_addr;
-    dest->nalloc = mesg->nalloc;
-    dest->nused = mesg->nused;
+    dest->nalloc    = mesg->nalloc;
+    dest->nused     = mesg->nused;
 
-    for(u = 0; u < mesg->nused; u++) {
-	dest->slot[u] = mesg->slot[u];
-	if(NULL == (dest->slot[u].name = H5MM_xstrdup(mesg->slot[u].name)))
+    for (u = 0; u < mesg->nused; u++) {
+        dest->slot[u] = mesg->slot[u];
+        if (NULL == (dest->slot[u].name = H5MM_xstrdup(mesg->slot[u].name)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message slot name")
     } /* end for */
 
@@ -306,23 +299,22 @@ H5O_efl_copy(const void *_mesg, void *_dest)
     ret_value = dest;
 
 done:
-    if(NULL == ret_value) {
-        if(dest && NULL == _dest) {
-            if(dest->slot) {
-                for(u = 0; u < mesg->nused; u++) {
-                    if(dest->slot[u].name != NULL && dest->slot[u].name != mesg->slot[u].name)
+    if (NULL == ret_value) {
+        if (dest && NULL == _dest) {
+            if (dest->slot) {
+                for (u = 0; u < mesg->nused; u++) {
+                    if (dest->slot[u].name != NULL && dest->slot[u].name != mesg->slot[u].name)
                         dest->slot[u].name = (char *)H5MM_xfree(dest->slot[u].name);
                 } /* end for */
                 dest->slot = (H5O_efl_entry_t *)H5MM_xfree(dest->slot);
             } /* end if */
             dest = (H5O_efl_t *)H5MM_xfree(dest);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_efl_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_efl_size
  *
@@ -343,8 +335,8 @@ done:
 static size_t
 H5O_efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
-    const H5O_efl_t	*mesg = (const H5O_efl_t *) _mesg;
-    size_t		ret_value = 0;
+    const H5O_efl_t *mesg      = (const H5O_efl_t *)_mesg;
+    size_t           ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -352,18 +344,17 @@ H5O_efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *
     HDassert(f);
     HDassert(mesg);
 
-    ret_value = (size_t)H5F_SIZEOF_ADDR(f) +			/*heap address	*/
-		2 +					/*slots allocated*/
-		2 +					/*num slots used*/
-		4 +					/*reserved	*/
-		mesg->nused * ((size_t)H5F_SIZEOF_SIZE(f) +	/*name offset	*/
-			       (size_t)H5F_SIZEOF_SIZE(f) +	/*file offset	*/
-			       (size_t)H5F_SIZEOF_SIZE(f));	/*file size	*/
+    ret_value = (size_t)H5F_SIZEOF_ADDR(f) +                /*heap address	*/
+                2 +                                         /*slots allocated*/
+                2 +                                         /*num slots used*/
+                4 +                                         /*reserved	*/
+                mesg->nused * ((size_t)H5F_SIZEOF_SIZE(f) + /*name offset	*/
+                               (size_t)H5F_SIZEOF_SIZE(f) + /*file offset	*/
+                               (size_t)H5F_SIZEOF_SIZE(f)); /*file size	*/
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_efl_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_efl_reset
  *
@@ -380,8 +371,8 @@ H5O_efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *
 static herr_t
 H5O_efl_reset(void *_mesg)
 {
-    H5O_efl_t	*mesg = (H5O_efl_t *) _mesg;
-    size_t	u;              /* Local index variable */
+    H5O_efl_t *mesg = (H5O_efl_t *)_mesg;
+    size_t     u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -389,8 +380,8 @@ H5O_efl_reset(void *_mesg)
     HDassert(mesg);
 
     /* reset */
-    if(mesg->slot) {
-        for(u = 0; u < mesg->nused; u++)
+    if (mesg->slot) {
+        for (u = 0; u < mesg->nused; u++)
             mesg->slot[u].name = (char *)H5MM_xfree(mesg->slot[u].name);
         mesg->slot = (H5O_efl_entry_t *)H5MM_xfree(mesg->slot);
     } /* end if */
@@ -400,7 +391,6 @@ H5O_efl_reset(void *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_efl_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_efl_total_size
  *
@@ -417,29 +407,28 @@ H5O_efl_reset(void *_mesg)
  *-------------------------------------------------------------------------
  */
 hsize_t
-H5O_efl_total_size (H5O_efl_t *efl)
+H5O_efl_total_size(H5O_efl_t *efl)
 {
-    hsize_t	ret_value = 0, tmp;
+    hsize_t ret_value = 0, tmp;
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(efl->nused > 0 && H5O_EFL_UNLIMITED == efl->slot[efl->nused - 1].size)
-	ret_value = H5O_EFL_UNLIMITED;
+    if (efl->nused > 0 && H5O_EFL_UNLIMITED == efl->slot[efl->nused - 1].size)
+        ret_value = H5O_EFL_UNLIMITED;
     else {
-        size_t		u;      /* Local index variable */
+        size_t u; /* Local index variable */
 
-	for(u = 0; u < efl->nused; u++, ret_value = tmp) {
-	    tmp = ret_value + efl->slot[u].size;
-	    if(tmp <= ret_value)
-		HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, 0, "total external storage size overflowed");
-	} /* end for */
-    } /* end else */
+        for (u = 0; u < efl->nused; u++, ret_value = tmp) {
+            tmp = ret_value + efl->slot[u].size;
+            if (tmp <= ret_value)
+                HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, 0, "total external storage size overflowed");
+        } /* end for */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_efl_total_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_efl_copy_file
  *
@@ -456,14 +445,14 @@ done:
  */
 static void *
 H5O_efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_dst,
-    hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
-    H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *_udata, hid_t dxpl_id)
+                  hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
+                  H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *_udata, hid_t dxpl_id)
 {
-    H5O_efl_t   *efl_src = (H5O_efl_t *) mesg_src;
-    H5O_efl_t   *efl_dst = NULL;
-    H5HL_t      *heap = NULL;                           /* Pointer to local heap for EFL file names */
-    size_t      idx, size, name_offset, heap_size;
-    void        *ret_value;          /* Return value */
+    H5O_efl_t *efl_src = (H5O_efl_t *)mesg_src;
+    H5O_efl_t *efl_dst = NULL;
+    H5HL_t *   heap    = NULL; /* Pointer to local heap for EFL file names */
+    size_t     idx, size, name_offset, heap_size;
+    void *     ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -472,34 +461,34 @@ H5O_efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_ds
     HDassert(file_dst);
 
     /* Allocate space for the destination efl */
-    if(NULL == (efl_dst = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t))))
+    if (NULL == (efl_dst = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the "top level" information */
     HDmemcpy(efl_dst, efl_src, sizeof(H5O_efl_t));
 
     /* Determine size needed for destination heap */
-    heap_size = H5HL_ALIGN(1);  /* "empty" name */
-    for(idx = 0; idx < efl_src->nused; idx++)
+    heap_size = H5HL_ALIGN(1); /* "empty" name */
+    for (idx = 0; idx < efl_src->nused; idx++)
         heap_size += H5HL_ALIGN(HDstrlen(efl_src->slot[idx].name) + 1);
 
     /* Create name heap */
-    if(H5HL_create(file_dst, dxpl_id, heap_size, &efl_dst->heap_addr/*out*/) < 0)
+    if (H5HL_create(file_dst, dxpl_id, heap_size, &efl_dst->heap_addr /*out*/) < 0)
         HGOTO_ERROR(H5E_EFL, H5E_CANTINIT, NULL, "can't create heap")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(file_dst, dxpl_id, efl_dst->heap_addr, H5AC_WRITE)))
+    if (NULL == (heap = H5HL_protect(file_dst, dxpl_id, efl_dst->heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_EFL, H5E_PROTECT, NULL, "unable to protect EFL file name heap")
 
     /* Insert "empty" name first */
-    if((size_t)(-1) == (name_offset = H5HL_insert(file_dst, dxpl_id, heap, (size_t)1, "")))
+    if ((size_t)(-1) == (name_offset = H5HL_insert(file_dst, dxpl_id, heap, (size_t)1, "")))
         HGOTO_ERROR(H5E_EFL, H5E_CANTINSERT, NULL, "can't insert file name into heap")
     HDassert(0 == name_offset);
 
     /* allocate array of external file entries */
-    if(efl_src->nalloc > 0) {
+    if (efl_src->nalloc > 0) {
         size = efl_src->nalloc * sizeof(H5O_efl_entry_t);
-        if((efl_dst->slot = (H5O_efl_entry_t *)H5MM_calloc(size)) == NULL)
+        if ((efl_dst->slot = (H5O_efl_entry_t *)H5MM_calloc(size)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* copy content from the source. Need to update later */
@@ -507,10 +496,11 @@ H5O_efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_ds
     } /* end if */
 
     /* copy the name from the source */
-    for(idx = 0; idx < efl_src->nused; idx++) {
+    for (idx = 0; idx < efl_src->nused; idx++) {
         efl_dst->slot[idx].name = H5MM_xstrdup(efl_src->slot[idx].name);
-        if((size_t)(-1) == (efl_dst->slot[idx].name_offset = H5HL_insert(file_dst, dxpl_id, heap,
-                HDstrlen(efl_dst->slot[idx].name) + 1, efl_dst->slot[idx].name)))
+        if ((size_t)(-1) == (efl_dst->slot[idx].name_offset =
+                                 H5HL_insert(file_dst, dxpl_id, heap, HDstrlen(efl_dst->slot[idx].name) + 1,
+                                             efl_dst->slot[idx].name)))
             HGOTO_ERROR(H5E_EFL, H5E_CANTINSERT, NULL, "can't insert file name into heap")
     } /* end for */
 
@@ -519,16 +509,15 @@ H5O_efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_ds
 
 done:
     /* Release resources */
-    if(heap && H5HL_unprotect(heap) < 0)
+    if (heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_EFL, H5E_PROTECT, NULL, "unable to unprotect EFL file name heap")
-    if(!ret_value)
-        if(efl_dst)
+    if (!ret_value)
+        if (efl_dst)
             H5MM_xfree(efl_dst);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_efl_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_efl_debug
  *
@@ -542,11 +531,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_efl_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE * stream,
-	      int indent, int fwidth)
+H5O_efl_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+              int indent, int fwidth)
 {
-    const H5O_efl_t	   *mesg = (const H5O_efl_t *) _mesg;
-    size_t		    u;
+    const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg;
+    size_t           u;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -557,36 +546,29 @@ H5O_efl_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Heap address:", mesg->heap_addr);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Heap address:", mesg->heap_addr);
 
-    HDfprintf(stream, "%*s%-*s %u/%u\n", indent, "", fwidth,
-	      "Slots used/allocated:",
-	      mesg->nused, mesg->nalloc);
+    HDfprintf(stream, "%*s%-*s %u/%u\n", indent, "", fwidth, "Slots used/allocated:", mesg->nused,
+              mesg->nalloc);
 
-    for(u = 0; u < mesg->nused; u++) {
-        char		    buf[64];
+    for (u = 0; u < mesg->nused; u++) {
+        char buf[64];
 
-	HDsnprintf(buf, sizeof(buf), "File %u", (unsigned)u);
-	HDfprintf(stream, "%*s%s:\n", indent, "", buf);
+        HDsnprintf(buf, sizeof(buf), "File %u", (unsigned)u);
+        HDfprintf(stream, "%*s%s:\n", indent, "", buf);
 
-	HDfprintf(stream, "%*s%-*s \"%s\"\n", indent+3, "", MAX (fwidth-3, 0),
-		  "Name:",
-		  mesg->slot[u].name);
+        HDfprintf(stream, "%*s%-*s \"%s\"\n", indent + 3, "", MAX(fwidth - 3, 0),
+                  "Name:", mesg->slot[u].name);
 
-	HDfprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX (fwidth-3, 0),
-		  "Name offset:",
-		  (unsigned long)(mesg->slot[u].name_offset));
+        HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(fwidth - 3, 0),
+                  "Name offset:", (unsigned long)(mesg->slot[u].name_offset));
 
-	HDfprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX (fwidth-3, 0),
-		   "Offset of data in file:",
-		   (unsigned long)(mesg->slot[u].offset));
+        HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(fwidth - 3, 0),
+                  "Offset of data in file:", (unsigned long)(mesg->slot[u].offset));
 
-	HDfprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX (fwidth-3, 0),
-		   "Bytes reserved for data:",
-		   (unsigned long)(mesg->slot[u].size));
+        HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(fwidth - 3, 0),
+                  "Bytes reserved for data:", (unsigned long)(mesg->slot[u].size));
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_efl_debug() */
-
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index eee6cd2..776d6dc 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -18,146 +18,147 @@
  *		uninitialized data points of a dataset.
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Pprivate.h"		/* Property lists			*/
-#include "H5Sprivate.h"		/* Dataspaces				*/
-
-
-static void  *H5O_fill_old_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Pprivate.h"  /* Property lists			*/
+#include "H5Sprivate.h"  /* Dataspaces				*/
+
+static void * H5O_fill_old_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                  unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_fill_old_encode(H5F_t *f, uint8_t *p, const void *_mesg);
 static size_t H5O_fill_old_size(const H5F_t *f, const void *_mesg);
-static void  *H5O_fill_new_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_fill_new_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                  unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_fill_new_encode(H5F_t *f, uint8_t *p, const void *_mesg);
 static size_t H5O_fill_new_size(const H5F_t *f, const void *_mesg);
-static void  *H5O_fill_copy(const void *_mesg, void *_dest);
+static void * H5O_fill_copy(const void *_mesg, void *_dest);
 static herr_t H5O_fill_reset(void *_mesg);
 static herr_t H5O_fill_free(void *_mesg);
-static herr_t H5O_fill_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
-			     int indent, int fwidth);
+static herr_t H5O_fill_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                             int fwidth);
 
 /* Set up & include shared message "interface" info */
-#define H5O_SHARED_TYPE			H5O_MSG_FILL
-#define H5O_SHARED_DECODE		H5O_fill_shared_decode
-#define H5O_SHARED_DECODE_REAL		H5O_fill_old_decode
-#define H5O_SHARED_ENCODE		H5O_fill_shared_encode
-#define H5O_SHARED_ENCODE_REAL		H5O_fill_old_encode
-#define H5O_SHARED_SIZE			H5O_fill_shared_size
-#define H5O_SHARED_SIZE_REAL		H5O_fill_old_size
-#define H5O_SHARED_DELETE		H5O_fill_shared_delete
+#define H5O_SHARED_TYPE        H5O_MSG_FILL
+#define H5O_SHARED_DECODE      H5O_fill_shared_decode
+#define H5O_SHARED_DECODE_REAL H5O_fill_old_decode
+#define H5O_SHARED_ENCODE      H5O_fill_shared_encode
+#define H5O_SHARED_ENCODE_REAL H5O_fill_old_encode
+#define H5O_SHARED_SIZE        H5O_fill_shared_size
+#define H5O_SHARED_SIZE_REAL   H5O_fill_old_size
+#define H5O_SHARED_DELETE      H5O_fill_shared_delete
 #undef H5O_SHARED_DELETE_REAL
-#define H5O_SHARED_LINK			H5O_fill_shared_link
+#define H5O_SHARED_LINK H5O_fill_shared_link
 #undef H5O_SHARED_LINK_REAL
-#define H5O_SHARED_COPY_FILE		H5O_fill_shared_copy_file
+#define H5O_SHARED_COPY_FILE H5O_fill_shared_copy_file
 #undef H5O_SHARED_COPY_FILE_REAL
-#define H5O_SHARED_POST_COPY_FILE	H5O_fill_shared_post_copy_file
+#define H5O_SHARED_POST_COPY_FILE H5O_fill_shared_post_copy_file
 #undef H5O_SHARED_POST_COPY_FILE_REAL
-#undef  H5O_SHARED_POST_COPY_FILE_UPD
-#define H5O_SHARED_DEBUG		H5O_fill_shared_debug
-#define H5O_SHARED_DEBUG_REAL		H5O_fill_debug
-#include "H5Oshared.h"			/* Shared Object Header Message Callbacks */
+#undef H5O_SHARED_POST_COPY_FILE_UPD
+#define H5O_SHARED_DEBUG      H5O_fill_shared_debug
+#define H5O_SHARED_DEBUG_REAL H5O_fill_debug
+#include "H5Oshared.h" /* Shared Object Header Message Callbacks */
 
 /* Set up & include shared message "interface" info */
 /* (Kludgy 'undef's in order to re-include the H5Oshared.h header) */
 #undef H5O_SHARED_TYPE
-#define H5O_SHARED_TYPE			H5O_MSG_FILL_NEW
+#define H5O_SHARED_TYPE H5O_MSG_FILL_NEW
 #undef H5O_SHARED_DECODE
-#define H5O_SHARED_DECODE		H5O_fill_new_shared_decode
+#define H5O_SHARED_DECODE H5O_fill_new_shared_decode
 #undef H5O_SHARED_DECODE_REAL
-#define H5O_SHARED_DECODE_REAL		H5O_fill_new_decode
+#define H5O_SHARED_DECODE_REAL H5O_fill_new_decode
 #undef H5O_SHARED_ENCODE
-#define H5O_SHARED_ENCODE		H5O_fill_new_shared_encode
+#define H5O_SHARED_ENCODE H5O_fill_new_shared_encode
 #undef H5O_SHARED_ENCODE_REAL
-#define H5O_SHARED_ENCODE_REAL		H5O_fill_new_encode
+#define H5O_SHARED_ENCODE_REAL H5O_fill_new_encode
 #undef H5O_SHARED_SIZE
-#define H5O_SHARED_SIZE			H5O_fill_new_shared_size
+#define H5O_SHARED_SIZE H5O_fill_new_shared_size
 #undef H5O_SHARED_SIZE_REAL
-#define H5O_SHARED_SIZE_REAL		H5O_fill_new_size
+#define H5O_SHARED_SIZE_REAL H5O_fill_new_size
 #undef H5O_SHARED_DELETE
-#define H5O_SHARED_DELETE		H5O_fill_new_shared_delete
+#define H5O_SHARED_DELETE H5O_fill_new_shared_delete
 #undef H5O_SHARED_DELETE_REAL
 #undef H5O_SHARED_LINK
-#define H5O_SHARED_LINK			H5O_fill_new_shared_link
+#define H5O_SHARED_LINK H5O_fill_new_shared_link
 #undef H5O_SHARED_LINK_REAL
 #undef H5O_SHARED_COPY_FILE
-#define H5O_SHARED_COPY_FILE		H5O_fill_new_shared_copy_file
+#define H5O_SHARED_COPY_FILE H5O_fill_new_shared_copy_file
 #undef H5O_SHARED_COPY_FILE_REAL
 #undef H5O_SHARED_POST_COPY_FILE
-#define H5O_SHARED_POST_COPY_FILE	H5O_fill_new_shared_post_copy_file
+#define H5O_SHARED_POST_COPY_FILE H5O_fill_new_shared_post_copy_file
 #undef H5O_SHARED_POST_COPY_FILE_REAL
-#undef  H5O_SHARED_POST_COPY_FILE_UPD
+#undef H5O_SHARED_POST_COPY_FILE_UPD
 #undef H5O_SHARED_DEBUG
-#define H5O_SHARED_DEBUG		H5O_fill_new_shared_debug
+#define H5O_SHARED_DEBUG H5O_fill_new_shared_debug
 #undef H5O_SHARED_DEBUG_REAL
-#define H5O_SHARED_DEBUG_REAL		H5O_fill_debug
+#define H5O_SHARED_DEBUG_REAL H5O_fill_debug
 #undef H5Oshared_H
-#include "H5Oshared.h"			/* Shared Object Header Message Callbacks */
+#include "H5Oshared.h" /* Shared Object Header Message Callbacks */
 
 /* This message derives from H5O message class, for old fill value before version 1.5 */
 const H5O_msg_class_t H5O_MSG_FILL[1] = {{
-    H5O_FILL_ID,                /*message id number                     */
-    "fill",                     /*message name for debugging            */
-    sizeof(H5O_fill_t),		/*native message size                   */
-    H5O_SHARE_IS_SHARABLE|H5O_SHARE_IN_OHDR,	/* messages are sharable?       */
-    H5O_fill_shared_decode,	/*decode message                        */
-    H5O_fill_shared_encode,	/*encode message                        */
-    H5O_fill_copy,		/*copy the native value                 */
-    H5O_fill_shared_size,	/*raw message size			*/
-    H5O_fill_reset,		/*free internal memory			*/
-    H5O_fill_free,		/* free method				*/
-    H5O_fill_shared_delete,	/* file delete method			*/
-    H5O_fill_shared_link,	/* link method				*/
-    NULL,			/* set share method			*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file	*/
-    H5O_fill_shared_copy_file,	/* copy native value to file		*/
-    H5O_fill_shared_post_copy_file,	/* post copy native value to file	*/
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_fill_shared_debug       /*debug the message			*/
+    H5O_FILL_ID,                               /*message id number                     */
+    "fill",                                    /*message name for debugging            */
+    sizeof(H5O_fill_t),                        /*native message size                   */
+    H5O_SHARE_IS_SHARABLE | H5O_SHARE_IN_OHDR, /* messages are sharable?       */
+    H5O_fill_shared_decode,                    /*decode message                        */
+    H5O_fill_shared_encode,                    /*encode message                        */
+    H5O_fill_copy,                             /*copy the native value                 */
+    H5O_fill_shared_size,                      /*raw message size			*/
+    H5O_fill_reset,                            /*free internal memory			*/
+    H5O_fill_free,                             /* free method				*/
+    H5O_fill_shared_delete,                    /* file delete method			*/
+    H5O_fill_shared_link,                      /* link method				*/
+    NULL,                                      /* set share method			*/
+    NULL,                                      /*can share method		*/
+    NULL,                                      /* pre copy native value to file	*/
+    H5O_fill_shared_copy_file,                 /* copy native value to file		*/
+    H5O_fill_shared_post_copy_file,            /* post copy native value to file	*/
+    NULL,                                      /* get creation index		*/
+    NULL,                                      /* set creation index		*/
+    H5O_fill_shared_debug                      /*debug the message			*/
 }};
 
 /* This message derives from H5O message class, for new fill value after version 1.4  */
 const H5O_msg_class_t H5O_MSG_FILL_NEW[1] = {{
-    H5O_FILL_NEW_ID,		/*message id number			*/
-    "fill_new", 		/*message name for debugging		*/
-    sizeof(H5O_fill_t),		/*native message size			*/
-    H5O_SHARE_IS_SHARABLE|H5O_SHARE_IN_OHDR,	/* messages are sharable?       */
-    H5O_fill_new_shared_decode,	/*decode message			*/
-    H5O_fill_new_shared_encode,	/*encode message			*/
-    H5O_fill_copy,		/*copy the native value			*/
-    H5O_fill_new_shared_size,	/*raw message size			*/
-    H5O_fill_reset,		/*free internal memory			*/
-    H5O_fill_free,		/* free method				*/
-    H5O_fill_new_shared_delete,	/* file delete method			*/
-    H5O_fill_new_shared_link,	/* link method				*/
-    NULL,			/* set share method			*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file	*/
-    H5O_fill_new_shared_copy_file, /* copy native value to file		*/
-    H5O_fill_new_shared_post_copy_file,	/* post copy native value to file	*/
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_fill_new_shared_debug	/*debug the message			*/
+    H5O_FILL_NEW_ID,                           /*message id number			*/
+    "fill_new",                                /*message name for debugging		*/
+    sizeof(H5O_fill_t),                        /*native message size			*/
+    H5O_SHARE_IS_SHARABLE | H5O_SHARE_IN_OHDR, /* messages are sharable?       */
+    H5O_fill_new_shared_decode,                /*decode message			*/
+    H5O_fill_new_shared_encode,                /*encode message			*/
+    H5O_fill_copy,                             /*copy the native value			*/
+    H5O_fill_new_shared_size,                  /*raw message size			*/
+    H5O_fill_reset,                            /*free internal memory			*/
+    H5O_fill_free,                             /* free method				*/
+    H5O_fill_new_shared_delete,                /* file delete method			*/
+    H5O_fill_new_shared_link,                  /* link method				*/
+    NULL,                                      /* set share method			*/
+    NULL,                                      /*can share method		*/
+    NULL,                                      /* pre copy native value to file	*/
+    H5O_fill_new_shared_copy_file,             /* copy native value to file		*/
+    H5O_fill_new_shared_post_copy_file,        /* post copy native value to file	*/
+    NULL,                                      /* get creation index		*/
+    NULL,                                      /* set creation index		*/
+    H5O_fill_new_shared_debug                  /*debug the message			*/
 }};
 
 /* Masks, shift values & flags for fill value message */
-#define H5O_FILL_MASK_ALLOC_TIME        0x03
-#define H5O_FILL_SHIFT_ALLOC_TIME       0
-#define H5O_FILL_MASK_FILL_TIME         0x03
-#define H5O_FILL_SHIFT_FILL_TIME        2
-#define H5O_FILL_FLAG_UNDEFINED_VALUE   0x10
-#define H5O_FILL_FLAG_HAVE_VALUE        0x20
-#define H5O_FILL_FLAGS_ALL              (H5O_FILL_MASK_ALLOC_TIME | (H5O_FILL_MASK_FILL_TIME << H5O_FILL_SHIFT_FILL_TIME) | H5O_FILL_FLAG_UNDEFINED_VALUE | H5O_FILL_FLAG_HAVE_VALUE)
+#define H5O_FILL_MASK_ALLOC_TIME      0x03
+#define H5O_FILL_SHIFT_ALLOC_TIME     0
+#define H5O_FILL_MASK_FILL_TIME       0x03
+#define H5O_FILL_SHIFT_FILL_TIME      2
+#define H5O_FILL_FLAG_UNDEFINED_VALUE 0x10
+#define H5O_FILL_FLAG_HAVE_VALUE      0x20
+#define H5O_FILL_FLAGS_ALL                                                                                   \
+    (H5O_FILL_MASK_ALLOC_TIME | (H5O_FILL_MASK_FILL_TIME << H5O_FILL_SHIFT_FILL_TIME) |                      \
+     H5O_FILL_FLAG_UNDEFINED_VALUE | H5O_FILL_FLAG_HAVE_VALUE)
 
 /* Declare a free list to manage the H5O_fill_t struct */
 H5FL_DEFINE(H5O_fill_t);
@@ -165,7 +166,6 @@ H5FL_DEFINE(H5O_fill_t);
 /* Declare extern the free list to manage blocks of type conversion data */
 H5FL_BLK_EXTERN(type_conv);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_new_decode
  *
@@ -183,27 +183,27 @@ H5FL_BLK_EXTERN(type_conv);
  */
 static void *
 H5O_fill_new_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_fill_t	*fill = NULL;
-    void	*ret_value;
+    H5O_fill_t *fill = NULL;
+    void *      ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(f);
     HDassert(p);
 
-    if(NULL == (fill = H5FL_CALLOC(H5O_fill_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value message")
+    if (NULL == (fill = H5FL_CALLOC(H5O_fill_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value message")
 
     /* Version */
     fill->version = *p++;
-    if(fill->version < H5O_FILL_VERSION_1 || fill->version > H5O_FILL_VERSION_LATEST)
+    if (fill->version < H5O_FILL_VERSION_1 || fill->version > H5O_FILL_VERSION_LATEST)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for fill value message")
 
     /* Decode each version */
-    if(fill->version < H5O_FILL_VERSION_3) {
+    if (fill->version < H5O_FILL_VERSION_3) {
         /* Space allocation time */
         fill->alloc_time = (H5D_alloc_time_t)*p++;
 
@@ -214,49 +214,50 @@ H5O_fill_new_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t
         fill->fill_defined = *p++;
 
         /* Only decode fill value information if one is defined */
-        if(fill->fill_defined) {
+        if (fill->fill_defined) {
             INT32DECODE(p, fill->size);
-            if(fill->size > 0) {
+            if (fill->size > 0) {
                 H5_CHECK_OVERFLOW(fill->size, ssize_t, size_t);
-                if(NULL == (fill->buf = H5MM_malloc((size_t)fill->size)))
+                if (NULL == (fill->buf = H5MM_malloc((size_t)fill->size)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value")
                 HDmemcpy(fill->buf, p, (size_t)fill->size);
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else
             fill->size = (-1);
     } /* end if */
     else {
-        unsigned flags;          /* Status flags */
+        unsigned flags; /* Status flags */
 
         /* Flags */
         flags = *p++;
 
         /* Check for unknown flags */
-        if(flags & (unsigned)~H5O_FILL_FLAGS_ALL)
+        if (flags & (unsigned)~H5O_FILL_FLAGS_ALL)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "unknown flag for fill value message")
 
         /* Space allocation time */
-        fill->alloc_time = (H5D_alloc_time_t)((flags >> H5O_FILL_SHIFT_ALLOC_TIME) & H5O_FILL_MASK_ALLOC_TIME);
+        fill->alloc_time =
+            (H5D_alloc_time_t)((flags >> H5O_FILL_SHIFT_ALLOC_TIME) & H5O_FILL_MASK_ALLOC_TIME);
 
         /* Fill value write time */
         fill->fill_time = (H5D_fill_time_t)((flags >> H5O_FILL_SHIFT_FILL_TIME) & H5O_FILL_MASK_FILL_TIME);
 
         /* Check for undefined fill value */
-        if(flags & H5O_FILL_FLAG_UNDEFINED_VALUE) {
+        if (flags & H5O_FILL_FLAG_UNDEFINED_VALUE) {
             /* Sanity check */
             HDassert(!(flags & H5O_FILL_FLAG_HAVE_VALUE));
 
             /* Set value for "undefined" fill value */
             fill->size = (-1);
         } /* end if */
-        else if(flags & H5O_FILL_FLAG_HAVE_VALUE) {
+        else if (flags & H5O_FILL_FLAG_HAVE_VALUE) {
             /* Fill value size */
             UINT32DECODE(p, fill->size);
 
             /* Fill value */
             H5_CHECK_OVERFLOW(fill->size, ssize_t, size_t);
-            if(NULL == (fill->buf = H5MM_malloc((size_t)fill->size)))
+            if (NULL == (fill->buf = H5MM_malloc((size_t)fill->size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value")
             HDmemcpy(fill->buf, p, (size_t)fill->size);
 
@@ -267,22 +268,21 @@ H5O_fill_new_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t
             /* Set the "defined" flag */
             fill->fill_defined = TRUE;
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
     /* Set return value */
     ret_value = (void *)fill;
 
 done:
-    if(!ret_value && fill) {
-        if(fill->buf)
+    if (!ret_value && fill) {
+        if (fill->buf)
             H5MM_xfree(fill->buf);
-	fill = H5FL_FREE(H5O_fill_t, fill);
+        fill = H5FL_FREE(H5O_fill_t, fill);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_fill_new_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_fill_old_decode
  *
@@ -298,31 +298,31 @@ done:
  */
 static void *
 H5O_fill_old_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_fill_t *fill = NULL;		/* Decoded fill value message */
-    void *ret_value;                    /* Return value */
+    H5O_fill_t *fill = NULL; /* Decoded fill value message */
+    void *      ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(f);
     HDassert(p);
 
-    if(NULL == (fill = H5FL_CALLOC(H5O_fill_t)))
+    if (NULL == (fill = H5FL_CALLOC(H5O_fill_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value message")
 
     /* Set non-zero default fields */
-    fill->version = H5O_FILL_VERSION_2;
+    fill->version    = H5O_FILL_VERSION_2;
     fill->alloc_time = H5D_ALLOC_TIME_LATE;
-    fill->fill_time = H5D_FILL_TIME_IFSET;
+    fill->fill_time  = H5D_FILL_TIME_IFSET;
 
     /* Fill value size */
     UINT32DECODE(p, fill->size);
 
     /* Only decode the fill value itself if there is one */
-    if(fill->size > 0) {
-        if(NULL == (fill->buf = H5MM_malloc((size_t)fill->size)))
+    if (fill->size > 0) {
+        if (NULL == (fill->buf = H5MM_malloc((size_t)fill->size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value")
         HDmemcpy(fill->buf, p, (size_t)fill->size);
         fill->fill_defined = TRUE;
@@ -331,19 +331,18 @@ H5O_fill_old_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t
         fill->size = (-1);
 
     /* Set return value */
-    ret_value = (void*)fill;
+    ret_value = (void *)fill;
 
 done:
-    if(!ret_value && fill) {
-        if(fill->buf)
+    if (!ret_value && fill) {
+        if (fill->buf)
             H5MM_xfree(fill->buf);
-	fill = H5FL_FREE(H5O_fill_t, fill);
+        fill = H5FL_FREE(H5O_fill_t, fill);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_fill_old_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_new_encode
  *
@@ -361,7 +360,7 @@ done:
 static herr_t
 H5O_fill_new_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
 {
-    const H5O_fill_t	*fill = (const H5O_fill_t *)_fill;
+    const H5O_fill_t *fill = (const H5O_fill_t *)_fill;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -372,7 +371,7 @@ H5O_fill_new_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
     /* Version */
     *p++ = (uint8_t)fill->version;
 
-    if(fill->version < H5O_FILL_VERSION_3) {
+    if (fill->version < H5O_FILL_VERSION_3) {
         /* Space allocation time */
         *p++ = (uint8_t)fill->alloc_time;
 
@@ -383,28 +382,29 @@ H5O_fill_new_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
         *p++ = (uint8_t)fill->fill_defined;
 
         /* Only write out the size and fill value if it is defined */
-        if(fill->fill_defined) {
+        if (fill->fill_defined) {
             UINT32ENCODE(p, fill->size);
-            if(fill->size > 0)
-                if(fill->buf) {
+            if (fill->size > 0)
+                if (fill->buf) {
                     H5_CHECK_OVERFLOW(fill->size, ssize_t, size_t);
                     HDmemcpy(p, fill->buf, (size_t)fill->size);
                 } /* end if */
-        } /* end if */
-    } /* end if */
+        }         /* end if */
+    }             /* end if */
     else {
-        uint8_t flags = 0;      /* Fill value setting flags */
+        uint8_t flags = 0; /* Fill value setting flags */
 
         /* Encode space allocation time */
         HDassert(fill->alloc_time == (H5O_FILL_MASK_ALLOC_TIME & fill->alloc_time));
-        flags = (uint8_t)(flags | ((H5O_FILL_MASK_ALLOC_TIME & fill->alloc_time) << H5O_FILL_SHIFT_ALLOC_TIME));
+        flags =
+            (uint8_t)(flags | ((H5O_FILL_MASK_ALLOC_TIME & fill->alloc_time) << H5O_FILL_SHIFT_ALLOC_TIME));
 
         /* Encode fill value writing time */
         HDassert(fill->fill_time == (H5O_FILL_MASK_FILL_TIME & fill->fill_time));
         flags = (uint8_t)(flags | ((H5O_FILL_MASK_FILL_TIME & fill->fill_time) << H5O_FILL_SHIFT_FILL_TIME));
 
         /* Check if we need to encode a fill value size */
-        if(fill->size < 0) {
+        if (fill->size < 0) {
             /* Indicate that the fill value has been "undefined" by the user */
             flags |= H5O_FILL_FLAG_UNDEFINED_VALUE;
 
@@ -414,7 +414,7 @@ H5O_fill_new_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
             /* Sanity check */
             HDassert(!fill->buf);
         } /* end if */
-        else if(fill->size > 0) {
+        else if (fill->size > 0) {
             /* Indicate that a fill value size is present */
             flags |= H5O_FILL_FLAG_HAVE_VALUE;
 
@@ -436,12 +436,11 @@ H5O_fill_new_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
             /* Sanity check */
             HDassert(!fill->buf);
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_fill_new_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_fill_old_encode
  *
@@ -466,13 +465,12 @@ H5O_fill_old_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
     HDassert(fill && NULL == fill->type);
 
     UINT32ENCODE(p, fill->size);
-    if(fill->buf)
+    if (fill->buf)
         HDmemcpy(p, fill->buf, (size_t)fill->size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_fill_old_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_copy
  *
@@ -492,72 +490,74 @@ H5O_fill_old_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
 static void *
 H5O_fill_copy(const void *_src, void *_dst)
 {
-    const H5O_fill_t	*src = (const H5O_fill_t *)_src;
-    H5O_fill_t		*dst = (H5O_fill_t *)_dst;
-    void		*ret_value;
+    const H5O_fill_t *src = (const H5O_fill_t *)_src;
+    H5O_fill_t *      dst = (H5O_fill_t *)_dst;
+    void *            ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(src);
 
-    if(!dst && NULL == (dst = H5FL_MALLOC(H5O_fill_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill message")
+    if (!dst && NULL == (dst = H5FL_MALLOC(H5O_fill_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill message")
 
     /* Shallow copy basic fields */
     *dst = *src;
 
     /* Copy data type of fill value */
-    if(src->type) {
-        if(NULL == (dst->type = H5T_copy(src->type, H5T_COPY_TRANSIENT)))
+    if (src->type) {
+        if (NULL == (dst->type = H5T_copy(src->type, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "can't copy datatype")
     } /* end if */
     else
         dst->type = NULL;
 
     /* Copy fill value and its size */
-    if(src->buf) {
+    if (src->buf) {
         H5_CHECK_OVERFLOW(src->size, ssize_t, size_t);
-	if(NULL == (dst->buf = H5MM_malloc((size_t)src->size)))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value")
-	HDmemcpy(dst->buf, src->buf, (size_t)src->size);
+        if (NULL == (dst->buf = H5MM_malloc((size_t)src->size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value")
+        HDmemcpy(dst->buf, src->buf, (size_t)src->size);
 
         /* Check for needing to convert/copy fill value */
-        if(src->type) {
-            H5T_path_t *tpath;      /* Conversion information */
+        if (src->type) {
+            H5T_path_t *tpath; /* Conversion information */
 
             /* Set up type conversion function */
-            if(NULL == (tpath = H5T_path_find(src->type, dst->type, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
-                HGOTO_ERROR(H5E_OHDR, H5E_UNSUPPORTED, NULL, "unable to convert between src and dst data types")
+            if (NULL == (tpath = H5T_path_find(src->type, dst->type, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
+                HGOTO_ERROR(H5E_OHDR, H5E_UNSUPPORTED, NULL,
+                            "unable to convert between src and dst data types")
 
             /* If necessary, convert fill value datatypes (which copies VL components, etc.) */
-            if(!H5T_path_noop(tpath)) {
-                hid_t dst_id, src_id;       /* Source & destination datatypes for type conversion */
-                uint8_t *bkg_buf = NULL;    /* Background conversion buffer */
-                size_t bkg_size;            /* Size of background buffer */
+            if (!H5T_path_noop(tpath)) {
+                hid_t    dst_id, src_id; /* Source & destination datatypes for type conversion */
+                uint8_t *bkg_buf = NULL; /* Background conversion buffer */
+                size_t   bkg_size;       /* Size of background buffer */
 
                 /* Wrap copies of types to convert */
                 dst_id = H5I_register(H5I_DATATYPE, H5T_copy(dst->type, H5T_COPY_TRANSIENT), FALSE);
-                if(dst_id < 0)
+                if (dst_id < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to copy/register datatype")
                 src_id = H5I_register(H5I_DATATYPE, H5T_copy(src->type, H5T_COPY_ALL), FALSE);
-                if(src_id < 0) {
+                if (src_id < 0) {
                     H5I_dec_ref(dst_id);
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to copy/register datatype")
                 } /* end if */
 
                 /* Allocate a background buffer */
                 bkg_size = MAX(H5T_get_size(dst->type), H5T_get_size(src->type));
-                if(H5T_path_bkg(tpath) && NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, bkg_size))) {
+                if (H5T_path_bkg(tpath) && NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, bkg_size))) {
                     H5I_dec_ref(src_id);
                     H5I_dec_ref(dst_id);
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
                 } /* end if */
 
                 /* Convert fill value */
-                if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, dst->buf, bkg_buf, H5AC_ind_dxpl_id) < 0) {
+                if (H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, dst->buf, bkg_buf,
+                                H5AC_ind_dxpl_id) < 0) {
                     H5I_dec_ref(src_id);
                     H5I_dec_ref(dst_id);
-                    if(bkg_buf)
+                    if (bkg_buf)
                         bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf);
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTCONVERT, NULL, "datatype conversion failed")
                 } /* end if */
@@ -565,11 +565,11 @@ H5O_fill_copy(const void *_src, void *_dst)
                 /* Release the background buffer */
                 H5I_dec_ref(src_id);
                 H5I_dec_ref(dst_id);
-                if(bkg_buf)
+                if (bkg_buf)
                     bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf);
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
     else
         dst->buf = NULL;
 
@@ -577,19 +577,18 @@ H5O_fill_copy(const void *_src, void *_dst)
     ret_value = dst;
 
 done:
-    if(!ret_value && dst) {
-        if(dst->buf)
+    if (!ret_value && dst) {
+        if (dst->buf)
             H5MM_xfree(dst->buf);
-	if(dst->type)
+        if (dst->type)
             H5T_close(dst->type);
-	if(!_dst)
+        if (!_dst)
             dst = H5FL_FREE(H5O_fill_t, dst);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_fill_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_new_size
  *
@@ -610,8 +609,8 @@ done:
 static size_t
 H5O_fill_new_size(const H5F_t H5_ATTR_UNUSED *f, const void *_fill)
 {
-    const H5O_fill_t	*fill = (const H5O_fill_t *)_fill;
-    size_t		ret_value;
+    const H5O_fill_t *fill = (const H5O_fill_t *)_fill;
+    size_t            ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -619,27 +618,26 @@ H5O_fill_new_size(const H5F_t H5_ATTR_UNUSED *f, const void *_fill)
     HDassert(fill);
 
     /* Determine size for different versions */
-    if(fill->version < H5O_FILL_VERSION_3) {
-        ret_value = 1 +	 		/* Version number        */
-                    1 + 		/* Space allocation time */
-                    1 + 		/* Fill value write time */
-                    1; 			/* Fill value defined    */
-        if(fill->fill_defined)
-            ret_value += 4 +	/* Fill value size	 */
-                    (fill->size > 0 ? (size_t)fill->size : 0);	/* Size of fill value	 */
-    } /* end if */
+    if (fill->version < H5O_FILL_VERSION_3) {
+        ret_value = 1 + /* Version number        */
+                    1 + /* Space allocation time */
+                    1 + /* Fill value write time */
+                    1;  /* Fill value defined    */
+        if (fill->fill_defined)
+            ret_value += 4 +                                        /* Fill value size	 */
+                         (fill->size > 0 ? (size_t)fill->size : 0); /* Size of fill value	 */
+    }                                                               /* end if */
     else {
-        ret_value = 1 +	 		/* Version number        */
-                    1;			/* Status flags          */
-        if(fill->size > 0)
-            ret_value += 4 +		/* Fill value size	 */
-                    (size_t)fill->size;		/* Size of fill value	 */
-    } /* end else */
+        ret_value = 1 + /* Version number        */
+                    1;  /* Status flags          */
+        if (fill->size > 0)
+            ret_value += 4 +                 /* Fill value size	 */
+                         (size_t)fill->size; /* Size of fill value	 */
+    }                                        /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_fill_new_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_fill_old_size
  *
@@ -667,7 +665,6 @@ H5O_fill_old_size(const H5F_t H5_ATTR_UNUSED *f, const void *_fill)
     FUNC_LEAVE_NOAPI(4 + (size_t)fill->size)
 } /* end H5O_fill_old_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_reset_dyn
  *
@@ -683,32 +680,32 @@ H5O_fill_old_size(const H5F_t H5_ATTR_UNUSED *f, const void *_fill)
 herr_t
 H5O_fill_reset_dyn(H5O_fill_t *fill)
 {
-    hid_t fill_type_id = -1;            /* Datatype ID for fill value datatype when reclaiming VL fill values */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hid_t  fill_type_id = -1;      /* Datatype ID for fill value datatype when reclaiming VL fill values */
+    herr_t ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(fill);
 
-    if(fill->buf) {
-        if(fill->type && H5T_detect_class(fill->type, H5T_VLEN, FALSE) > 0) {
-            H5T_t *fill_type;           /* Copy of fill value datatype */
-            H5S_t *fill_space;          /* Scalar dataspace for fill value element */
+    if (fill->buf) {
+        if (fill->type && H5T_detect_class(fill->type, H5T_VLEN, FALSE) > 0) {
+            H5T_t *fill_type;  /* Copy of fill value datatype */
+            H5S_t *fill_space; /* Scalar dataspace for fill value element */
 
             /* Copy the fill value datatype and get an ID for it */
-            if(NULL == (fill_type = H5T_copy(fill->type, H5T_COPY_TRANSIENT)))
+            if (NULL == (fill_type = H5T_copy(fill->type, H5T_COPY_TRANSIENT)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to copy fill value datatype")
-            if((fill_type_id = H5I_register(H5I_DATATYPE, fill_type, FALSE)) < 0) {
+            if ((fill_type_id = H5I_register(H5I_DATATYPE, fill_type, FALSE)) < 0) {
                 H5T_close(fill_type);
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTREGISTER, FAIL, "unable to register fill value datatype")
             } /* end if */
 
             /* Create a scalar dataspace for the fill value element */
-            if(NULL == (fill_space = H5S_create(H5S_SCALAR)))
+            if (NULL == (fill_space = H5S_create(H5S_SCALAR)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create scalar dataspace")
 
             /* Reclaim any variable length components of the fill value */
-            if(H5D_vlen_reclaim(fill_type_id, fill_space, H5P_DATASET_XFER_DEFAULT, fill->buf) < 0) {
+            if (H5D_vlen_reclaim(fill_type_id, fill_space, H5P_DATASET_XFER_DEFAULT, fill->buf) < 0) {
                 H5S_close(fill_space);
                 HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "unable to reclaim variable-length fill value data")
             } /* end if */
@@ -721,19 +718,18 @@ H5O_fill_reset_dyn(H5O_fill_t *fill)
         fill->buf = H5MM_xfree(fill->buf);
     } /* end if */
     fill->size = 0;
-    if(fill->type) {
-	H5T_close(fill->type);
-	fill->type = NULL;
+    if (fill->type) {
+        H5T_close(fill->type);
+        fill->type = NULL;
     } /* end if */
 
 done:
-    if(fill_type_id > 0 && H5I_dec_ref(fill_type_id) < 0)
+    if (fill_type_id > 0 && H5I_dec_ref(fill_type_id) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for temp ID")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_fill_reset_dyn() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_reset
  *
@@ -749,7 +745,7 @@ done:
 static herr_t
 H5O_fill_reset(void *_fill)
 {
-    H5O_fill_t	*fill = (H5O_fill_t *)_fill;
+    H5O_fill_t *fill = (H5O_fill_t *)_fill;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -766,7 +762,6 @@ H5O_fill_reset(void *_fill)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_fill_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_free
  *
@@ -791,7 +786,6 @@ H5O_fill_free(void *fill)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_fill_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_debug
  *
@@ -806,10 +800,10 @@ H5O_fill_free(void *fill)
  */
 static herr_t
 H5O_fill_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_fill, FILE *stream,
-	       int indent, int fwidth)
+               int indent, int fwidth)
 {
     const H5O_fill_t *fill = (const H5O_fill_t *)_fill;
-    H5D_fill_value_t fill_status;       /* Whether the fill value is defined */
+    H5D_fill_value_t  fill_status; /* Whether the fill value is defined */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -820,80 +814,78 @@ H5O_fill_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDassert(fwidth >= 0);
 
     HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Space Allocation Time:");
-    switch(fill->alloc_time) {
+    switch (fill->alloc_time) {
         case H5D_ALLOC_TIME_EARLY:
-            HDfprintf(stream,"Early\n");
+            HDfprintf(stream, "Early\n");
             break;
 
         case H5D_ALLOC_TIME_LATE:
-            HDfprintf(stream,"Late\n");
+            HDfprintf(stream, "Late\n");
             break;
 
         case H5D_ALLOC_TIME_INCR:
-            HDfprintf(stream,"Incremental\n");
+            HDfprintf(stream, "Incremental\n");
             break;
 
         case H5D_ALLOC_TIME_DEFAULT:
         case H5D_ALLOC_TIME_ERROR:
         default:
-            HDfprintf(stream,"Unknown!\n");
+            HDfprintf(stream, "Unknown!\n");
             break;
     } /* end switch */
     HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Fill Time:");
-    switch(fill->fill_time) {
+    switch (fill->fill_time) {
         case H5D_FILL_TIME_ALLOC:
-            HDfprintf(stream,"On Allocation\n");
+            HDfprintf(stream, "On Allocation\n");
             break;
 
         case H5D_FILL_TIME_NEVER:
-            HDfprintf(stream,"Never\n");
+            HDfprintf(stream, "Never\n");
             break;
 
         case H5D_FILL_TIME_IFSET:
-            HDfprintf(stream,"If Set\n");
+            HDfprintf(stream, "If Set\n");
             break;
 
         case H5D_FILL_TIME_ERROR:
         default:
-            HDfprintf(stream,"Unknown!\n");
+            HDfprintf(stream, "Unknown!\n");
             break;
 
     } /* end switch */
     HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Fill Value Defined:");
     H5P_is_fill_value_defined((const H5O_fill_t *)fill, &fill_status);
-    switch(fill_status) {
+    switch (fill_status) {
         case H5D_FILL_VALUE_UNDEFINED:
-            HDfprintf(stream,"Undefined\n");
+            HDfprintf(stream, "Undefined\n");
             break;
 
         case H5D_FILL_VALUE_DEFAULT:
-            HDfprintf(stream,"Default\n");
+            HDfprintf(stream, "Default\n");
             break;
 
         case H5D_FILL_VALUE_USER_DEFINED:
-            HDfprintf(stream,"User Defined\n");
+            HDfprintf(stream, "User Defined\n");
             break;
 
         case H5D_FILL_VALUE_ERROR:
         default:
-            HDfprintf(stream,"Unknown!\n");
+            HDfprintf(stream, "Unknown!\n");
             break;
 
     } /* end switch */
-    HDfprintf(stream, "%*s%-*s %Zd\n", indent, "", fwidth,
-	      "Size:", fill->size);
+    HDfprintf(stream, "%*s%-*s %Zd\n", indent, "", fwidth, "Size:", fill->size);
     HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Data type:");
-    if(fill->type) {
-	H5T_debug(fill->type, stream);
-	HDfprintf(stream, "\n");
+    if (fill->type) {
+        H5T_debug(fill->type, stream);
+        HDfprintf(stream, "\n");
     } /* end if */
     else
-	HDfprintf(stream, "<dataset type>\n");
+        HDfprintf(stream, "<dataset type>\n");
 
     FUNC_LEAVE_NOAPI(SUCCEED);
 } /* end H5O_fill_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_fill_convert
  *
@@ -912,10 +904,10 @@ H5O_fill_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
 herr_t
 H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed, hid_t dxpl_id)
 {
-    H5T_path_t		*tpath;			    /* Type conversion info	*/
-    void		*buf = NULL, *bkg = NULL;   /* Conversion buffers	*/
-    hid_t		src_id = -1, dst_id = -1;   /* Datatype identifiers	*/
-    herr_t      	ret_value = SUCCEED;        /* Return value */
+    H5T_path_t *tpath;                    /* Type conversion info	*/
+    void *      buf = NULL, *bkg = NULL;  /* Conversion buffers	*/
+    hid_t       src_id = -1, dst_id = -1; /* Datatype identifiers	*/
+    herr_t      ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -924,53 +916,53 @@ H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed, hid_
     HDassert(fill_changed);
 
     /* No-op cases */
-    if(!fill->buf || !fill->type || 0 == H5T_cmp(fill->type, dset_type, FALSE)) {
+    if (!fill->buf || !fill->type || 0 == H5T_cmp(fill->type, dset_type, FALSE)) {
         /* Don't need datatype for fill value */
-	if(fill->type)
+        if (fill->type)
             H5T_close(fill->type);
-	fill->type = NULL;
+        fill->type = NULL;
 
         /* Note that the fill value info has changed */
         *fill_changed = TRUE;
 
-	HGOTO_DONE(SUCCEED);
+        HGOTO_DONE(SUCCEED);
     } /* end if */
 
     /*
      * Can we convert between source and destination data types?
      */
-    if(NULL == (tpath = H5T_path_find(fill->type, dset_type, NULL, NULL, dxpl_id, FALSE)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to convert between src and dst datatypes")
+    if (NULL == (tpath = H5T_path_find(fill->type, dset_type, NULL, NULL, dxpl_id, FALSE)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to convert between src and dst datatypes")
 
     /* Don't bother doing anything if there will be no actual conversion */
-    if(!H5T_path_noop(tpath)) {
-        if((src_id = H5I_register(H5I_DATATYPE, H5T_copy(fill->type, H5T_COPY_ALL), FALSE)) < 0 ||
-                (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(dset_type, H5T_COPY_ALL), FALSE)) < 0)
+    if (!H5T_path_noop(tpath)) {
+        if ((src_id = H5I_register(H5I_DATATYPE, H5T_copy(fill->type, H5T_COPY_ALL), FALSE)) < 0 ||
+            (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(dset_type, H5T_COPY_ALL), FALSE)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to copy/register data type")
 
         /*
          * Datatype conversions are always done in place, so we need a buffer
          * that is large enough for both source and destination.
          */
-        if(H5T_get_size(fill->type) >= H5T_get_size(dset_type))
+        if (H5T_get_size(fill->type) >= H5T_get_size(dset_type))
             buf = fill->buf;
         else {
-            if(NULL == (buf = H5MM_malloc(H5T_get_size(dset_type))))
+            if (NULL == (buf = H5MM_malloc(H5T_get_size(dset_type))))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
             HDmemcpy(buf, fill->buf, H5T_get_size(fill->type));
         } /* end else */
 
         /* Use CALLOC here to clear the buffer in case later the library thinks there's
          * data in the background. */
-        if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_calloc(H5T_get_size(dset_type))))
+        if (H5T_path_bkg(tpath) && NULL == (bkg = H5MM_calloc(H5T_get_size(dset_type))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
 
         /* Do the conversion */
-        if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
+        if (H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "datatype conversion failed")
 
         /* Update the fill message */
-        if(buf != fill->buf) {
+        if (buf != fill->buf) {
             H5T_vlen_reclaim_elmt(fill->buf, fill->type, dxpl_id);
             H5MM_xfree(fill->buf);
             fill->buf = buf;
@@ -984,19 +976,18 @@ H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed, hid_
     } /* end if */
 
 done:
-    if(src_id >= 0 && H5I_dec_ref(src_id) < 0)
+    if (src_id >= 0 && H5I_dec_ref(src_id) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for temp ID")
-    if(dst_id >= 0 && H5I_dec_ref(dst_id) < 0)
+    if (dst_id >= 0 && H5I_dec_ref(dst_id) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for temp ID")
-    if(buf != fill->buf)
+    if (buf != fill->buf)
         H5MM_xfree(buf);
-    if(bkg)
+    if (bkg)
         H5MM_xfree(bkg);
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5O_fill_convert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_fill_set_latest_version
  *
@@ -1022,4 +1013,3 @@ H5O_fill_set_latest_version(H5O_fill_t *fill)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_fill_set_latest_version() */
-
diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c
index fedab8c..1dca8b5 100644
--- a/src/H5Oginfo.c
+++ b/src/H5Oginfo.c
@@ -22,60 +22,58 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_ginfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void *H5O_ginfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_ginfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_ginfo_copy(const void *_mesg, void *_dest);
+static void * H5O_ginfo_copy(const void *_mesg, void *_dest);
 static size_t H5O_ginfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_ginfo_free(void *_mesg);
-static herr_t H5O_ginfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-			     FILE * stream, int indent, int fwidth);
+static herr_t H5O_ginfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                              int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_GINFO[1] = {{
-    H5O_GINFO_ID,            	/*message id number             */
-    "ginfo",                 	/*message name for debugging    */
-    sizeof(H5O_ginfo_t),     	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_ginfo_decode,        	/*decode message                */
-    H5O_ginfo_encode,        	/*encode message                */
-    H5O_ginfo_copy,          	/*copy the native value         */
-    H5O_ginfo_size,          	/*size of symbol table entry    */
-    NULL,                   	/*default reset method          */
-    H5O_ginfo_free,	        /* free method			*/
-    NULL,	        	/* file delete method		*/
-    NULL,			/* link method			*/
-    NULL, 			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    NULL,			/* copy native value to file    */
-    NULL,			/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_ginfo_debug          	/*debug the message             */
+    H5O_GINFO_ID,        /*message id number             */
+    "ginfo",             /*message name for debugging    */
+    sizeof(H5O_ginfo_t), /*native message size           */
+    0,                   /* messages are sharable?       */
+    H5O_ginfo_decode,    /*decode message                */
+    H5O_ginfo_encode,    /*encode message                */
+    H5O_ginfo_copy,      /*copy the native value         */
+    H5O_ginfo_size,      /*size of symbol table entry    */
+    NULL,                /*default reset method          */
+    H5O_ginfo_free,      /* free method			*/
+    NULL,                /* file delete method		*/
+    NULL,                /* link method			*/
+    NULL,                /*set share method		*/
+    NULL,                /*can share method		*/
+    NULL,                /* pre copy native value to file */
+    NULL,                /* copy native value to file    */
+    NULL,                /* post copy native value to file    */
+    NULL,                /* get creation index		*/
+    NULL,                /* set creation index		*/
+    H5O_ginfo_debug      /*debug the message             */
 }};
 
 /* Current version of group info information */
-#define H5O_GINFO_VERSION 	0
+#define H5O_GINFO_VERSION 0
 
 /* Flags for group info flag encoding */
-#define H5O_GINFO_STORE_PHASE_CHANGE    0x01
-#define H5O_GINFO_STORE_EST_ENTRY_INFO  0x02
-#define H5O_GINFO_ALL_FLAGS             (H5O_GINFO_STORE_PHASE_CHANGE | H5O_GINFO_STORE_EST_ENTRY_INFO)
+#define H5O_GINFO_STORE_PHASE_CHANGE   0x01
+#define H5O_GINFO_STORE_EST_ENTRY_INFO 0x02
+#define H5O_GINFO_ALL_FLAGS            (H5O_GINFO_STORE_PHASE_CHANGE | H5O_GINFO_STORE_EST_ENTRY_INFO)
 
 /* Declare a free list to manage the H5O_ginfo_t struct */
 H5FL_DEFINE_STATIC(H5O_ginfo_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ginfo_decode
  *
@@ -94,12 +92,12 @@ H5FL_DEFINE_STATIC(H5O_ginfo_t);
  */
 static void *
 H5O_ginfo_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                 size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_ginfo_t         *ginfo = NULL;  /* Pointer to group information message */
-    unsigned char       flags;          /* Flags for encoding group info */
-    void                *ret_value;     /* Return value */
+    H5O_ginfo_t * ginfo = NULL; /* Pointer to group information message */
+    unsigned char flags;        /* Flags for encoding group info */
+    void *        ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -107,52 +105,51 @@ H5O_ginfo_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5
     HDassert(p);
 
     /* Version of message */
-    if(*p++ != H5O_GINFO_VERSION)
+    if (*p++ != H5O_GINFO_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for message")
 
     /* Allocate space for message */
-    if(NULL == (ginfo = H5FL_CALLOC(H5O_ginfo_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (ginfo = H5FL_CALLOC(H5O_ginfo_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Get the flags for the group */
     flags = *p++;
-    if(flags & ~H5O_GINFO_ALL_FLAGS)
+    if (flags & ~H5O_GINFO_ALL_FLAGS)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad flag value for message")
     ginfo->store_link_phase_change = (flags & H5O_GINFO_STORE_PHASE_CHANGE) ? TRUE : FALSE;
-    ginfo->store_est_entry_info = (flags & H5O_GINFO_STORE_EST_ENTRY_INFO) ? TRUE : FALSE;
+    ginfo->store_est_entry_info    = (flags & H5O_GINFO_STORE_EST_ENTRY_INFO) ? TRUE : FALSE;
 
     /* Get the max. # of links to store compactly & the min. # of links to store densely */
-    if(ginfo->store_link_phase_change) {
+    if (ginfo->store_link_phase_change) {
         UINT16DECODE(p, ginfo->max_compact)
         UINT16DECODE(p, ginfo->min_dense)
     } /* end if */
     else {
         ginfo->max_compact = H5G_CRT_GINFO_MAX_COMPACT;
-        ginfo->min_dense = H5G_CRT_GINFO_MIN_DENSE;
+        ginfo->min_dense   = H5G_CRT_GINFO_MIN_DENSE;
     } /* end else */
 
     /* Get the estimated # of entries & name lengths */
-    if(ginfo->store_est_entry_info) {
+    if (ginfo->store_est_entry_info) {
         UINT16DECODE(p, ginfo->est_num_entries)
         UINT16DECODE(p, ginfo->est_name_len)
     } /* end if */
     else {
         ginfo->est_num_entries = H5G_CRT_GINFO_EST_NUM_ENTRIES;
-        ginfo->est_name_len = H5G_CRT_GINFO_EST_NAME_LEN;
+        ginfo->est_name_len    = H5G_CRT_GINFO_EST_NAME_LEN;
     } /* end if */
 
     /* Set return value */
     ret_value = ginfo;
 
 done:
-    if(ret_value == NULL)
-        if(ginfo != NULL)
+    if (ret_value == NULL)
+        if (ginfo != NULL)
             ginfo = H5FL_FREE(H5O_ginfo_t, ginfo);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_ginfo_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ginfo_encode
  *
@@ -167,10 +164,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
+                 const void *_mesg)
 {
-    const H5O_ginfo_t  *ginfo = (const H5O_ginfo_t *) _mesg;
-    unsigned char       flags = 0;          /* Flags for encoding group info */
+    const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)_mesg;
+    unsigned char      flags = 0; /* Flags for encoding group info */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -182,18 +180,18 @@ H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     *p++ = H5O_GINFO_VERSION;
 
     /* The flags for the group info */
-    flags = (unsigned char)(ginfo->store_link_phase_change ?  H5O_GINFO_STORE_PHASE_CHANGE : 0);
-    flags = (unsigned char)(flags | (ginfo->store_est_entry_info ?  H5O_GINFO_STORE_EST_ENTRY_INFO : 0));
-    *p++ = flags;
+    flags = (unsigned char)(ginfo->store_link_phase_change ? H5O_GINFO_STORE_PHASE_CHANGE : 0);
+    flags = (unsigned char)(flags | (ginfo->store_est_entry_info ? H5O_GINFO_STORE_EST_ENTRY_INFO : 0));
+    *p++  = flags;
 
     /* Store the max. # of links to store compactly & the min. # of links to store densely */
-    if(ginfo->store_link_phase_change) {
+    if (ginfo->store_link_phase_change) {
         UINT16ENCODE(p, ginfo->max_compact)
         UINT16ENCODE(p, ginfo->min_dense)
     } /* end if */
 
     /* Estimated # of entries & name lengths */
-    if(ginfo->store_est_entry_info) {
+    if (ginfo->store_est_entry_info) {
         UINT16ENCODE(p, ginfo->est_num_entries)
         UINT16ENCODE(p, ginfo->est_name_len)
     } /* end if */
@@ -201,7 +199,6 @@ H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_ginfo_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ginfo_copy
  *
@@ -221,16 +218,16 @@ H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
 static void *
 H5O_ginfo_copy(const void *_mesg, void *_dest)
 {
-    const H5O_ginfo_t   *ginfo = (const H5O_ginfo_t *)_mesg;
-    H5O_ginfo_t         *dest = (H5O_ginfo_t *)_dest;
-    void                *ret_value;     /* Return value */
+    const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)_mesg;
+    H5O_ginfo_t *      dest  = (H5O_ginfo_t *)_dest;
+    void *             ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(ginfo);
-    if(!dest && NULL == (dest = H5FL_MALLOC(H5O_ginfo_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!dest && NULL == (dest = H5FL_MALLOC(H5O_ginfo_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* copy */
     *dest = *ginfo;
@@ -242,7 +239,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_ginfo_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ginfo_size
  *
@@ -263,27 +259,26 @@ done:
 static size_t
 H5O_ginfo_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
-    const H5O_ginfo_t   *ginfo = (const H5O_ginfo_t *)_mesg;
-    size_t ret_value;   /* Return value */
+    const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)_mesg;
+    size_t             ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set return value */
-    ret_value = 1 +                     /* Version */
-                1 +                     /* Flags */
-                (ginfo->store_link_phase_change ? (
-            (size_t)(2 +                 /* "Max compact" links */
-                    2)                   /* "Min dense" links */
-                ) : 0) +                /* "Min dense" links */
-                (ginfo->store_est_entry_info ? (
-            (size_t)(2 +                 /* Estimated # of entries in group */
-                    2)                   /* Estimated length of name of entry in group */
-                ) : 0);
+    ret_value = 1 +                                             /* Version */
+                1 +                                             /* Flags */
+                (ginfo->store_link_phase_change ? ((size_t)(2 + /* "Max compact" links */
+                                                            2)  /* "Min dense" links */
+                                                   )
+                                                : 0) +       /* "Min dense" links */
+                (ginfo->store_est_entry_info ? ((size_t)(2 + /* Estimated # of entries in group */
+                                                         2)  /* Estimated length of name of entry in group */
+                                                )
+                                             : 0);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_ginfo_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_ginfo_free
  *
@@ -308,7 +303,6 @@ H5O_ginfo_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_ginfo_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_ginfo_debug
  *
@@ -323,10 +317,10 @@ H5O_ginfo_free(void *mesg)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_ginfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE * stream,
-	       int indent, int fwidth)
+H5O_ginfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+                int indent, int fwidth)
 {
-    const H5O_ginfo_t       *ginfo = (const H5O_ginfo_t *) _mesg;
+    const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -337,15 +331,12 @@ H5O_ginfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const voi
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Max. compact links:", ginfo->max_compact);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Min. dense links:", ginfo->min_dense);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Max. compact links:", ginfo->max_compact);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Min. dense links:", ginfo->min_dense);
+              "Estimated # of objects in group:", ginfo->est_num_entries);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Estimated # of objects in group:", ginfo->est_num_entries);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Estimated length of object in group's name:", ginfo->est_name_len);
+              "Estimated length of object in group's name:", ginfo->est_name_len);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_ginfo_debug() */
-
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 185dca1..74c8c7f 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -17,67 +17,61 @@
  * Purpose:     Messages related to data layout.
  */
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5MFprivate.h"	/* File space management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Pprivate.h"		/* Property lists			*/
-
+#define H5D_PACKAGE /*suppress error about including H5Dpkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dpkg.h"      /* Dataset functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5MFprivate.h" /* File space management		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Pprivate.h"  /* Property lists			*/
 
 /* Local macros */
 
-
 /* PRIVATE PROTOTYPES */
-static void *H5O_layout_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_layout_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_layout_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_layout_copy(const void *_mesg, void *_dest);
+static void * H5O_layout_copy(const void *_mesg, void *_dest);
 static size_t H5O_layout_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_layout_reset(void *_mesg);
 static herr_t H5O_layout_free(void *_mesg);
-static herr_t H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    void *_mesg);
-static void *H5O_layout_copy_file(H5F_t *file_src, void *mesg_src,
-    H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags,
-    H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
-static herr_t H5O_layout_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
-			       int indent, int fwidth);
+static herr_t H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg);
+static void * H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size,
+                                   unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
+static herr_t H5O_layout_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                               int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_LAYOUT[1] = {{
-    H5O_LAYOUT_ID,          	/*message id number             */
-    "layout",               	/*message name for debugging    */
-    sizeof(H5O_layout_t),   	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_layout_decode,      	/*decode message                */
-    H5O_layout_encode,      	/*encode message                */
-    H5O_layout_copy,        	/*copy the native value         */
-    H5O_layout_size,        	/*size of message on disk       */
-    H5O_layout_reset,		/*reset method                  */
-    H5O_layout_free,        	/*free the struct		*/
-    H5O_layout_delete,	        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    H5O_layout_copy_file,	/* copy native value to file    */
-    NULL,		        /* post copy native value to file */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_layout_debug       	/*debug the message             */
+    H5O_LAYOUT_ID,        /*message id number             */
+    "layout",             /*message name for debugging    */
+    sizeof(H5O_layout_t), /*native message size           */
+    0,                    /* messages are sharable?       */
+    H5O_layout_decode,    /*decode message                */
+    H5O_layout_encode,    /*encode message                */
+    H5O_layout_copy,      /*copy the native value         */
+    H5O_layout_size,      /*size of message on disk       */
+    H5O_layout_reset,     /*reset method                  */
+    H5O_layout_free,      /*free the struct		*/
+    H5O_layout_delete,    /* file delete method		*/
+    NULL,                 /* link method			*/
+    NULL,                 /*set share method		*/
+    NULL,                 /*can share method		*/
+    NULL,                 /* pre copy native value to file */
+    H5O_layout_copy_file, /* copy native value to file    */
+    NULL,                 /* post copy native value to file */
+    NULL,                 /* get creation index		*/
+    NULL,                 /* set creation index		*/
+    H5O_layout_debug      /*debug the message             */
 }};
 
-
 /* Declare a free list to manage the H5O_layout_t struct */
 H5FL_DEFINE(H5O_layout_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_layout_decode
  *
@@ -95,12 +89,12 @@ H5FL_DEFINE(H5O_layout_t);
  */
 static void *
 H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                  unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                  size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_layout_t           *mesg = NULL;
-    unsigned               u;
-    void                   *ret_value;          /* Return value */
+    H5O_layout_t *mesg = NULL;
+    unsigned      u;
+    void *        ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -109,19 +103,19 @@ H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *
     HDassert(p);
 
     /* decode */
-    if(NULL == (mesg = H5FL_CALLOC(H5O_layout_t)))
+    if (NULL == (mesg = H5FL_CALLOC(H5O_layout_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     mesg->version = *p++;
-    if(mesg->version < H5O_LAYOUT_VERSION_1 || mesg->version > H5O_LAYOUT_VERSION_3)
+    if (mesg->version < H5O_LAYOUT_VERSION_1 || mesg->version > H5O_LAYOUT_VERSION_3)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for layout message")
 
-    if(mesg->version < H5O_LAYOUT_VERSION_3) {
-        unsigned	ndims;			/* Num dimensions in chunk           */
+    if (mesg->version < H5O_LAYOUT_VERSION_3) {
+        unsigned ndims; /* Num dimensions in chunk           */
 
         /* Dimensionality */
         ndims = *p++;
-        if(ndims > H5O_LAYOUT_NDIMS)
+        if (ndims > H5O_LAYOUT_NDIMS)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "dimensionality is too large")
 
         /* Layout class */
@@ -132,13 +126,13 @@ H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *
         p += 5;
 
         /* Address */
-        if(mesg->type == H5D_CONTIGUOUS) {
+        if (mesg->type == H5D_CONTIGUOUS) {
             H5F_addr_decode(f, &p, &(mesg->storage.u.contig.addr));
 
             /* Set the layout operations */
             mesg->ops = H5D_LOPS_CONTIG;
         } /* end if */
-        else if(mesg->type == H5D_CHUNKED) {
+        else if (mesg->type == H5D_CHUNKED) {
             H5F_addr_decode(f, &p, &(mesg->storage.u.chunk.idx_addr));
 
             /* Set the layout operations */
@@ -147,7 +141,7 @@ H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *
             /* Set the chunk operations */
             /* (Only "btree" indexing type currently supported in this version) */
             mesg->storage.u.chunk.idx_type = H5D_CHUNK_BTREE;
-            mesg->storage.u.chunk.ops = H5D_COPS_BTREE;
+            mesg->storage.u.chunk.ops      = H5D_COPS_BTREE;
         } /* end if */
         else {
             /* Sanity check */
@@ -158,46 +152,48 @@ H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *
         } /* end else */
 
         /* Read the size */
-        if(mesg->type != H5D_CHUNKED) {
+        if (mesg->type != H5D_CHUNKED) {
             /* Don't compute size of contiguous storage here, due to possible
              * truncation of the dimension sizes when they were stored in this
              * version of the layout message.  Compute the contiguous storage
              * size in the dataset code, where we've got the dataspace
              * information available also.  - QAK 5/26/04
              */
-            p += ndims * 4;     /* Skip over dimension sizes (32-bit quantities) */
-        } /* end if */
+            p += ndims * 4; /* Skip over dimension sizes (32-bit quantities) */
+        }                   /* end if */
         else {
-            mesg->u.chunk.ndims=ndims;
-            for(u = 0; u < ndims; u++)
+            mesg->u.chunk.ndims = ndims;
+            for (u = 0; u < ndims; u++)
                 UINT32DECODE(p, mesg->u.chunk.dim[u]);
 
             /* Compute chunk size */
-            for(u = 1, mesg->u.chunk.size = mesg->u.chunk.dim[0]; u < ndims; u++)
+            for (u = 1, mesg->u.chunk.size = mesg->u.chunk.dim[0]; u < ndims; u++)
                 mesg->u.chunk.size *= mesg->u.chunk.dim[u];
         } /* end if */
 
-        if(mesg->type == H5D_COMPACT) {
+        if (mesg->type == H5D_COMPACT) {
             UINT32DECODE(p, mesg->storage.u.compact.size);
-            if(mesg->storage.u.compact.size > 0) {
-                if(NULL == (mesg->storage.u.compact.buf = H5MM_malloc(mesg->storage.u.compact.size)))
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for compact data buffer")
+            if (mesg->storage.u.compact.size > 0) {
+                if (NULL == (mesg->storage.u.compact.buf = H5MM_malloc(mesg->storage.u.compact.size)))
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                                "memory allocation failed for compact data buffer")
                 HDmemcpy(mesg->storage.u.compact.buf, p, mesg->storage.u.compact.size);
                 p += mesg->storage.u.compact.size;
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
     else {
         /* Layout class */
         mesg->type = (H5D_layout_t)*p++;
 
         /* Interpret the rest of the message according to the layout class */
-        switch(mesg->type) {
+        switch (mesg->type) {
             case H5D_COMPACT:
                 UINT16DECODE(p, mesg->storage.u.compact.size);
-                if(mesg->storage.u.compact.size > 0) {
-                    if(NULL == (mesg->storage.u.compact.buf = H5MM_malloc(mesg->storage.u.compact.size)))
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for compact data buffer")
+                if (mesg->storage.u.compact.size > 0) {
+                    if (NULL == (mesg->storage.u.compact.buf = H5MM_malloc(mesg->storage.u.compact.size)))
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                                    "memory allocation failed for compact data buffer")
                     HDmemcpy(mesg->storage.u.compact.buf, p, mesg->storage.u.compact.size);
                     p += mesg->storage.u.compact.size;
                 } /* end if */
@@ -217,24 +213,24 @@ H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *
             case H5D_CHUNKED:
                 /* Dimensionality */
                 mesg->u.chunk.ndims = *p++;
-                if(mesg->u.chunk.ndims > H5O_LAYOUT_NDIMS)
+                if (mesg->u.chunk.ndims > H5O_LAYOUT_NDIMS)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "dimensionality is too large")
 
                 /* B-tree address */
                 H5F_addr_decode(f, &p, &(mesg->storage.u.chunk.idx_addr));
 
                 /* Chunk dimensions */
-                for(u = 0; u < mesg->u.chunk.ndims; u++)
+                for (u = 0; u < mesg->u.chunk.ndims; u++)
                     UINT32DECODE(p, mesg->u.chunk.dim[u]);
 
                 /* Compute chunk size */
-                for(u = 1, mesg->u.chunk.size = mesg->u.chunk.dim[0]; u < mesg->u.chunk.ndims; u++)
+                for (u = 1, mesg->u.chunk.size = mesg->u.chunk.dim[0]; u < mesg->u.chunk.ndims; u++)
                     mesg->u.chunk.size *= mesg->u.chunk.dim[u];
 
                 /* Set the chunk operations */
                 /* (Only "btree" indexing type supported with v3 of message format) */
                 mesg->storage.u.chunk.idx_type = H5D_CHUNK_BTREE;
-                mesg->storage.u.chunk.ops = H5D_COPS_BTREE;
+                mesg->storage.u.chunk.ops      = H5D_COPS_BTREE;
 
                 /* Set the layout operations */
                 mesg->ops = H5D_LOPS_CHUNK;
@@ -245,20 +241,19 @@ H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *
             default:
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "Invalid layout class")
         } /* end switch */
-    } /* end else */
+    }     /* end else */
 
     /* Set return value */
     ret_value = mesg;
 
 done:
-    if(ret_value == NULL)
-        if(mesg)
+    if (ret_value == NULL)
+        if (mesg)
             mesg = H5FL_FREE(H5O_layout_t, mesg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_layout_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_layout_encode
  *
@@ -292,9 +287,9 @@ done:
 static herr_t
 H5O_layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_layout_t     *mesg = (const H5O_layout_t *) _mesg;
-    unsigned               u;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    const H5O_layout_t *mesg = (const H5O_layout_t *)_mesg;
+    unsigned            u;
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -310,14 +305,14 @@ H5O_layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, c
     *p++ = (uint8_t)mesg->type;
 
     /* Write out layout class specific information */
-    switch(mesg->type) {
+    switch (mesg->type) {
         case H5D_COMPACT:
             /* Size of raw data */
             UINT16ENCODE(p, mesg->storage.u.compact.size);
 
             /* Raw data */
-            if(mesg->storage.u.compact.size > 0) {
-                if(mesg->storage.u.compact.buf)
+            if (mesg->storage.u.compact.size > 0) {
+                if (mesg->storage.u.compact.buf)
                     HDmemcpy(p, mesg->storage.u.compact.buf, mesg->storage.u.compact.size);
                 else
                     HDmemset(p, 0, mesg->storage.u.compact.size);
@@ -339,7 +334,7 @@ H5O_layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, c
             H5F_addr_encode(f, &p, mesg->storage.u.chunk.idx_addr);
 
             /* Dimension sizes */
-            for(u = 0; u < mesg->u.chunk.ndims; u++)
+            for (u = 0; u < mesg->u.chunk.ndims; u++)
                 UINT32ENCODE(p, mesg->u.chunk.dim[u]);
             break;
 
@@ -353,7 +348,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_layout_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_layout_copy
  *
@@ -372,9 +366,9 @@ done:
 static void *
 H5O_layout_copy(const void *_mesg, void *_dest)
 {
-    const H5O_layout_t     *mesg = (const H5O_layout_t *) _mesg;
-    H5O_layout_t           *dest = (H5O_layout_t *) _dest;
-    void                   *ret_value;          /* Return value */
+    const H5O_layout_t *mesg = (const H5O_layout_t *)_mesg;
+    H5O_layout_t *      dest = (H5O_layout_t *)_dest;
+    void *              ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -382,16 +376,16 @@ H5O_layout_copy(const void *_mesg, void *_dest)
     HDassert(mesg);
 
     /* Allocate destination message, if necessary */
-    if(!dest && NULL == (dest = H5FL_MALLOC(H5O_layout_t)))
+    if (!dest && NULL == (dest = H5FL_MALLOC(H5O_layout_t)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "layout message allocation failed")
 
     /* copy */
     *dest = *mesg;
 
     /* Deep copy the buffer for compact datasets also */
-    if(mesg->type == H5D_COMPACT && mesg->storage.u.compact.size > 0) {
+    if (mesg->type == H5D_COMPACT && mesg->storage.u.compact.size > 0) {
         /* Allocate memory for the raw data */
-        if(NULL == (dest->storage.u.compact.buf = H5MM_malloc(dest->storage.u.compact.size)))
+        if (NULL == (dest->storage.u.compact.buf = H5MM_malloc(dest->storage.u.compact.size)))
             HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, NULL, "unable to allocate memory for compact dataset")
 
         /* Copy over the raw data */
@@ -399,21 +393,20 @@ H5O_layout_copy(const void *_mesg, void *_dest)
     } /* end if */
 
     /* Reset the pointer of the chunked storage index but not the address */
-    if(dest->type == H5D_CHUNKED && dest->storage.u.chunk.ops)
-	H5D_chunk_idx_reset(&dest->storage.u.chunk, FALSE);
+    if (dest->type == H5D_CHUNKED && dest->storage.u.chunk.ops)
+        H5D_chunk_idx_reset(&dest->storage.u.chunk, FALSE);
 
     /* Set return value */
     ret_value = dest;
 
 done:
-    if(ret_value == NULL)
-        if(NULL == _dest)
+    if (ret_value == NULL)
+        if (NULL == _dest)
             dest = H5FL_FREE(H5O_layout_t, dest);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_layout_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_layout_size
  *
@@ -433,8 +426,8 @@ done:
 static size_t
 H5O_layout_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
-    const H5O_layout_t     *mesg = (const H5O_layout_t *) _mesg;
-    size_t                  ret_value;
+    const H5O_layout_t *mesg = (const H5O_layout_t *)_mesg;
+    size_t              ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -449,7 +442,6 @@ H5O_layout_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const voi
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_layout_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_layout_reset
  *
@@ -466,13 +458,13 @@ H5O_layout_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const voi
 static herr_t
 H5O_layout_reset(void *_mesg)
 {
-    H5O_layout_t     *mesg = (H5O_layout_t *)_mesg;
+    H5O_layout_t *mesg = (H5O_layout_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(mesg) {
+    if (mesg) {
         /* Free the compact storage buffer */
-        if(H5D_COMPACT == mesg->type)
+        if (H5D_COMPACT == mesg->type)
             mesg->storage.u.compact.buf = H5MM_xfree(mesg->storage.u.compact.buf);
 
         /* Reset the message */
@@ -482,7 +474,6 @@ H5O_layout_reset(void *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_layout_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_layout_free
  *
@@ -498,15 +489,15 @@ H5O_layout_reset(void *_mesg)
 static herr_t
 H5O_layout_free(void *_mesg)
 {
-    H5O_layout_t     *mesg = (H5O_layout_t *) _mesg;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_layout_t *mesg      = (H5O_layout_t *)_mesg;
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(mesg);
 
     /* Free resources within the message */
-    if(H5O_layout_reset(mesg) < 0)
+    if (H5O_layout_reset(mesg) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free message resources")
 
     mesg = H5FL_FREE(H5O_layout_t, mesg);
@@ -515,7 +506,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_layout_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_layout_delete
  *
@@ -531,8 +521,8 @@ done:
 static herr_t
 H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
 {
-    H5O_layout_t *mesg = (H5O_layout_t *) _mesg;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_layout_t *mesg      = (H5O_layout_t *)_mesg;
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -542,20 +532,20 @@ H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
     HDassert(mesg);
 
     /* Perform different actions, depending on the type of storage */
-    switch(mesg->type) {
-        case H5D_COMPACT:       /* Compact data storage */
+    switch (mesg->type) {
+        case H5D_COMPACT: /* Compact data storage */
             /* Nothing required */
             break;
 
-        case H5D_CONTIGUOUS:    /* Contiguous block on disk */
+        case H5D_CONTIGUOUS: /* Contiguous block on disk */
             /* Free the file space for the raw data */
-            if(H5D__contig_delete(f, dxpl_id, &mesg->storage) < 0)
+            if (H5D__contig_delete(f, dxpl_id, &mesg->storage) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free raw data")
             break;
 
-        case H5D_CHUNKED:       /* Chunked blocks on disk */
+        case H5D_CHUNKED: /* Chunked blocks on disk */
             /* Free the file space for the index & chunk raw data */
-            if(H5D__chunk_delete(f, dxpl_id, open_oh, &mesg->storage) < 0)
+            if (H5D__chunk_delete(f, dxpl_id, open_oh, &mesg->storage) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free raw data")
             break;
 
@@ -569,7 +559,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_layout_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_layout_copy_file
  *
@@ -585,16 +574,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
-    hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
-    H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id)
+H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t H5_ATTR_UNUSED *recompute_size,
+                     unsigned H5_ATTR_UNUSED *mesg_flags, H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id)
 {
-    H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata;   /* Dataset copying user data */
-    H5O_layout_t       *layout_src = (H5O_layout_t *) mesg_src;
-    H5O_layout_t       *layout_dst = NULL;
-    hbool_t             copied = FALSE;                         /* Whether the data was copied */
-    H5D_shared_t *shared_fo = (H5D_shared_t *)cpy_info->shared_fo;
-    void               *ret_value;                              /* Return value */
+    H5D_copy_file_ud_t *udata      = (H5D_copy_file_ud_t *)_udata; /* Dataset copying user data */
+    H5O_layout_t *      layout_src = (H5O_layout_t *)mesg_src;
+    H5O_layout_t *      layout_dst = NULL;
+    hbool_t             copied     = FALSE; /* Whether the data was copied */
+    H5D_shared_t *      shared_fo  = (H5D_shared_t *)cpy_info->shared_fo;
+    void *              ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -604,21 +592,23 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
     HDassert(file_dst);
 
     /* Allocate space for the destination layout */
-    if(NULL == (layout_dst = H5FL_MALLOC(H5O_layout_t)))
+    if (NULL == (layout_dst = H5FL_MALLOC(H5O_layout_t)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "memory allocation failed")
 
     /* Copy the "top level" information */
     *layout_dst = *layout_src;
 
     /* Copy the layout type specific information */
-    switch(layout_src->type) {
+    switch (layout_src->type) {
         case H5D_COMPACT:
-	    if(layout_src->storage.u.compact.buf) {
+            if (layout_src->storage.u.compact.buf) {
                 /* copy compact raw data */
-                if(H5D__compact_copy(file_src, &layout_src->storage.u.compact, file_dst, &layout_dst->storage.u.compact, udata->src_dtype, cpy_info, dxpl_id) < 0)
+                if (H5D__compact_copy(file_src, &layout_src->storage.u.compact, file_dst,
+                                      &layout_dst->storage.u.compact, udata->src_dtype, cpy_info,
+                                      dxpl_id) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy chunked storage")
                 copied = TRUE;
-	    } /* end if */
+            } /* end if */
             break;
 
         case H5D_CONTIGUOUS:
@@ -626,24 +616,29 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
              * layout message less than version 3 because versions 1 & 2 would
              * truncate the dimension sizes to 32-bits of information. - QAK 5/26/04
              */
-            if(layout_src->version < H5O_LAYOUT_VERSION_3)
-                layout_dst->storage.u.contig.size = H5S_extent_nelem(udata->src_space_extent) *
-                                        H5T_get_size(udata->src_dtype);
+            if (layout_src->version < H5O_LAYOUT_VERSION_3)
+                layout_dst->storage.u.contig.size =
+                    H5S_extent_nelem(udata->src_space_extent) * H5T_get_size(udata->src_dtype);
 
-            if(H5D__contig_is_space_alloc(&layout_src->storage)
-                    || (cpy_info->shared_fo && H5D__contig_is_data_cached((const H5D_shared_t *)cpy_info->shared_fo))) {
+            if (H5D__contig_is_space_alloc(&layout_src->storage) ||
+                (cpy_info->shared_fo &&
+                 H5D__contig_is_data_cached((const H5D_shared_t *)cpy_info->shared_fo))) {
                 /* copy contiguous raw data */
-                if(H5D__contig_copy(file_src, &layout_src->storage.u.contig, file_dst, &layout_dst->storage.u.contig, udata->src_dtype, cpy_info, dxpl_id) < 0)
+                if (H5D__contig_copy(file_src, &layout_src->storage.u.contig, file_dst,
+                                     &layout_dst->storage.u.contig, udata->src_dtype, cpy_info, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy contiguous storage")
                 copied = TRUE;
             } /* end if */
             break;
 
         case H5D_CHUNKED:
-            if(H5D__chunk_is_space_alloc(&layout_src->storage)
-                    || (cpy_info->shared_fo && H5D__chunk_is_data_cached((const H5D_shared_t *)cpy_info->shared_fo))) {
+            if (H5D__chunk_is_space_alloc(&layout_src->storage) ||
+                (cpy_info->shared_fo &&
+                 H5D__chunk_is_data_cached((const H5D_shared_t *)cpy_info->shared_fo))) {
                 /* Create chunked layout */
-                if(H5D__chunk_copy(file_src, &layout_src->storage.u.chunk, &layout_src->u.chunk, file_dst, &layout_dst->storage.u.chunk, udata->src_space_extent, udata->src_dtype, udata->common.src_pline, cpy_info, dxpl_id) < 0)
+                if (H5D__chunk_copy(file_src, &layout_src->storage.u.chunk, &layout_src->u.chunk, file_dst,
+                                    &layout_dst->storage.u.chunk, udata->src_space_extent, udata->src_dtype,
+                                    udata->common.src_pline, cpy_info, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy chunked storage")
                 copied = TRUE;
             } /* end if */
@@ -656,21 +651,20 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
     } /* end switch */
 
     /* Check if copy routine was invoked (which frees the source datatype) */
-    if(copied)
+    if (copied)
         udata->src_dtype = NULL;
 
     /* Set return value */
     ret_value = layout_dst;
 
 done:
-    if(!ret_value)
-	if(layout_dst)
-	    layout_dst = H5FL_FREE(H5O_layout_t, layout_dst);
+    if (!ret_value)
+        if (layout_dst)
+            layout_dst = H5FL_FREE(H5O_layout_t, layout_dst);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_layout_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_layout_debug
  *
@@ -684,11 +678,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_layout_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg,
-    FILE * stream, int indent, int fwidth)
+H5O_layout_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+                 int indent, int fwidth)
 {
-    const H5O_layout_t     *mesg = (const H5O_layout_t *) _mesg;
-    unsigned                    u;
+    const H5O_layout_t *mesg = (const H5O_layout_t *)_mesg;
+    unsigned            u;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -699,50 +693,43 @@ H5O_layout_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const vo
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Version:", mesg->version);
-    switch(mesg->type) {
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", mesg->version);
+    switch (mesg->type) {
         case H5D_CHUNKED:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                      "Type:", "Chunked");
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Chunked");
 
             /* Chunk # of dims & size */
             HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                      "Number of dimensions:",
-                      (unsigned long)(mesg->u.chunk.ndims));
+                      "Number of dimensions:", (unsigned long)(mesg->u.chunk.ndims));
             HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Size:");
-            for(u = 0; u < mesg->u.chunk.ndims; u++)
+            for (u = 0; u < mesg->u.chunk.ndims; u++)
                 HDfprintf(stream, "%s%lu", u ? ", " : "", (unsigned long)(mesg->u.chunk.dim[u]));
             HDfprintf(stream, "}\n");
 
             /* Index information */
-            switch(mesg->storage.u.chunk.idx_type) {
+            switch (mesg->storage.u.chunk.idx_type) {
                 case H5D_CHUNK_BTREE:
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                              "Index Type:", "v1 B-tree");
+                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "v1 B-tree");
                     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
                               "B-tree address:", mesg->storage.u.chunk.idx_addr);
                     break;
 
                 default:
-                    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth,
-                              "Index Type:", "Unknown", (unsigned)mesg->storage.u.chunk.idx_type);
+                    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Index Type:", "Unknown",
+                              (unsigned)mesg->storage.u.chunk.idx_type);
                     break;
             } /* end switch */
             break;
 
         case H5D_CONTIGUOUS:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                      "Type:", "Contiguous");
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Contiguous");
             HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
                       "Data address:", mesg->storage.u.contig.addr);
-            HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-                      "Data Size:", mesg->storage.u.contig.size);
+            HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Data Size:", mesg->storage.u.contig.size);
             break;
 
         case H5D_COMPACT:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                      "Type:", "Compact");
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Compact");
             HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
                       "Data Size:", mesg->storage.u.compact.size);
             break;
@@ -750,11 +737,10 @@ H5O_layout_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const vo
         case H5D_LAYOUT_ERROR:
         case H5D_NLAYOUTS:
         default:
-            HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth,
-                      "Type:", "Unknown", (unsigned)mesg->type);
+            HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Type:", "Unknown",
+                      (unsigned)mesg->type);
             break;
     } /* end switch */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_layout_debug() */
-
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index adda4ea..a10f03d 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -22,81 +22,77 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-#define H5L_PACKAGE		/*suppress error about including H5Lpkg	  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Lpkg.h"             /* Links                                */
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
+#define H5L_PACKAGE /*suppress error about including H5Lpkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5Lpkg.h"      /* Links                                */
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_linfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void *H5O_linfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_linfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_linfo_copy(const void *_mesg, void *_dest);
+static void * H5O_linfo_copy(const void *_mesg, void *_dest);
 static size_t H5O_linfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_linfo_free(void *_mesg);
-static herr_t H5O_linfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    void *_mesg);
-static void *H5O_linfo_copy_file(H5F_t *file_src, void *native_src,
-    H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags,
-    H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
-static herr_t H5O_linfo_post_copy_file(const H5O_loc_t *parent_src_oloc,
-    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
-    unsigned *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info);
-static herr_t H5O_linfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-			     FILE * stream, int indent, int fwidth);
+static herr_t H5O_linfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg);
+static void * H5O_linfo_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
+                                  unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
+static herr_t H5O_linfo_post_copy_file(const H5O_loc_t *parent_src_oloc, const void *mesg_src,
+                                       H5O_loc_t *dst_oloc, void *mesg_dst, unsigned *mesg_flags,
+                                       hid_t dxpl_id, H5O_copy_t *cpy_info);
+static herr_t H5O_linfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                              int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_LINFO[1] = {{
-    H5O_LINFO_ID,            	/*message id number             */
-    "linfo",                 	/*message name for debugging    */
-    sizeof(H5O_linfo_t),     	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_linfo_decode,        	/*decode message                */
-    H5O_linfo_encode,        	/*encode message                */
-    H5O_linfo_copy,          	/*copy the native value         */
-    H5O_linfo_size,          	/*size of symbol table entry    */
-    NULL,                   	/*default reset method          */
-    H5O_linfo_free,	        /* free method			*/
-    H5O_linfo_delete,	        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL, 			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    H5O_linfo_copy_file,	/* copy native value to file    */
-    H5O_linfo_post_copy_file,	/* post copy native value to file */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_linfo_debug          	/*debug the message             */
+    H5O_LINFO_ID,             /*message id number             */
+    "linfo",                  /*message name for debugging    */
+    sizeof(H5O_linfo_t),      /*native message size           */
+    0,                        /* messages are sharable?       */
+    H5O_linfo_decode,         /*decode message                */
+    H5O_linfo_encode,         /*encode message                */
+    H5O_linfo_copy,           /*copy the native value         */
+    H5O_linfo_size,           /*size of symbol table entry    */
+    NULL,                     /*default reset method          */
+    H5O_linfo_free,           /* free method			*/
+    H5O_linfo_delete,         /* file delete method		*/
+    NULL,                     /* link method			*/
+    NULL,                     /*set share method		*/
+    NULL,                     /*can share method		*/
+    NULL,                     /* pre copy native value to file */
+    H5O_linfo_copy_file,      /* copy native value to file    */
+    H5O_linfo_post_copy_file, /* post copy native value to file */
+    NULL,                     /* get creation index		*/
+    NULL,                     /* set creation index		*/
+    H5O_linfo_debug           /*debug the message             */
 }};
 
 /* Current version of link info information */
-#define H5O_LINFO_VERSION 	0
+#define H5O_LINFO_VERSION 0
 
 /* Flags for link info index flag encoding */
-#define H5O_LINFO_TRACK_CORDER          0x01
-#define H5O_LINFO_INDEX_CORDER          0x02
-#define H5O_LINFO_ALL_FLAGS             (H5O_LINFO_TRACK_CORDER | H5O_LINFO_INDEX_CORDER)
+#define H5O_LINFO_TRACK_CORDER 0x01
+#define H5O_LINFO_INDEX_CORDER 0x02
+#define H5O_LINFO_ALL_FLAGS    (H5O_LINFO_TRACK_CORDER | H5O_LINFO_INDEX_CORDER)
 
 /* Data exchange structure to use when copying links from src to dst */
 typedef struct {
-    const H5O_loc_t *src_oloc;          /* Source object location */
-    H5O_loc_t *dst_oloc;                /* Destination object location */
-    H5O_linfo_t *dst_linfo;             /* Destination object's link info message */
-    hid_t dxpl_id;                      /* DXPL for operation */
-    H5O_copy_t  *cpy_info;              /* Information for copy operation */
+    const H5O_loc_t *src_oloc;  /* Source object location */
+    H5O_loc_t *      dst_oloc;  /* Destination object location */
+    H5O_linfo_t *    dst_linfo; /* Destination object's link info message */
+    hid_t            dxpl_id;   /* DXPL for operation */
+    H5O_copy_t *     cpy_info;  /* Information for copy operation */
 } H5O_linfo_postcopy_ud_t;
 
 /* Declare a free list to manage the H5O_linfo_t struct */
 H5FL_DEFINE_STATIC(H5O_linfo_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_linfo_decode
  *
@@ -113,12 +109,12 @@ H5FL_DEFINE_STATIC(H5O_linfo_t);
  */
 static void *
 H5O_linfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                 size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_linfo_t	*linfo = NULL;  /* Link info */
+    H5O_linfo_t * linfo = NULL; /* Link info */
     unsigned char index_flags;  /* Flags for encoding link index info */
-    void        *ret_value;     /* Return value */
+    void *        ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -127,16 +123,16 @@ H5O_linfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     HDassert(p);
 
     /* Version of message */
-    if(*p++ != H5O_LINFO_VERSION)
+    if (*p++ != H5O_LINFO_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for message")
 
     /* Allocate space for message */
-    if(NULL == (linfo = H5FL_MALLOC(H5O_linfo_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (linfo = H5FL_MALLOC(H5O_linfo_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Get the index flags for the group */
     index_flags = *p++;
-    if(index_flags & ~H5O_LINFO_ALL_FLAGS)
+    if (index_flags & ~H5O_LINFO_ALL_FLAGS)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad flag value for message")
     linfo->track_corder = (index_flags & H5O_LINFO_TRACK_CORDER) ? TRUE : FALSE;
     linfo->index_corder = (index_flags & H5O_LINFO_INDEX_CORDER) ? TRUE : FALSE;
@@ -145,7 +141,7 @@ H5O_linfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     linfo->nlinks = HSIZET_MAX;
 
     /* Max. link creation order value for the group, if tracked */
-    if(linfo->track_corder)
+    if (linfo->track_corder)
         INT64DECODE(p, linfo->max_corder)
     else
         linfo->max_corder = 0;
@@ -157,7 +153,7 @@ H5O_linfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     H5F_addr_decode(f, &p, &(linfo->name_bt2_addr));
 
     /* Address of v2 B-tree to index creation order of links, if there is one */
-    if(linfo->index_corder)
+    if (linfo->index_corder)
         H5F_addr_decode(f, &p, &(linfo->corder_bt2_addr));
     else
         linfo->corder_bt2_addr = HADDR_UNDEF;
@@ -166,14 +162,13 @@ H5O_linfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o
     ret_value = linfo;
 
 done:
-    if(ret_value == NULL)
-        if(linfo != NULL)
+    if (ret_value == NULL)
+        if (linfo != NULL)
             linfo = H5FL_FREE(H5O_linfo_t, linfo);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_linfo_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_linfo_encode
  *
@@ -190,8 +185,8 @@ done:
 static herr_t
 H5O_linfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_linfo_t   *linfo = (const H5O_linfo_t *)_mesg;
-    unsigned char       index_flags;          /* Flags for encoding link index info */
+    const H5O_linfo_t *linfo = (const H5O_linfo_t *)_mesg;
+    unsigned char      index_flags; /* Flags for encoding link index info */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -206,10 +201,10 @@ H5O_linfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     /* The flags for the link indices */
     index_flags = (uint8_t)(linfo->track_corder ? H5O_LINFO_TRACK_CORDER : 0);
     index_flags = (uint8_t)(index_flags | (linfo->index_corder ? H5O_LINFO_INDEX_CORDER : 0));
-    *p++ = index_flags;
+    *p++        = index_flags;
 
     /* Max. link creation order value for the group, if tracked */
-    if(linfo->track_corder)
+    if (linfo->track_corder)
         INT64ENCODE(p, linfo->max_corder)
 
     /* Address of fractal heap to store "dense" links */
@@ -219,7 +214,7 @@ H5O_linfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     H5F_addr_encode(f, &p, linfo->name_bt2_addr);
 
     /* Address of v2 B-tree to index creation order of links, if they are indexed */
-    if(linfo->index_corder)
+    if (linfo->index_corder)
         H5F_addr_encode(f, &p, linfo->corder_bt2_addr);
     else
         HDassert(!H5F_addr_defined(linfo->corder_bt2_addr));
@@ -227,7 +222,6 @@ H5O_linfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_linfo_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_linfo_copy
  *
@@ -246,16 +240,16 @@ H5O_linfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
 static void *
 H5O_linfo_copy(const void *_mesg, void *_dest)
 {
-    const H5O_linfo_t   *linfo = (const H5O_linfo_t *)_mesg;
-    H5O_linfo_t         *dest = (H5O_linfo_t *) _dest;
-    void                *ret_value;     /* Return value */
+    const H5O_linfo_t *linfo = (const H5O_linfo_t *)_mesg;
+    H5O_linfo_t *      dest  = (H5O_linfo_t *)_dest;
+    void *             ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(linfo);
-    if(!dest && NULL == (dest = H5FL_MALLOC(H5O_linfo_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!dest && NULL == (dest = H5FL_MALLOC(H5O_linfo_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* copy */
     *dest = *linfo;
@@ -267,7 +261,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_linfo_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_linfo_size
  *
@@ -287,23 +280,24 @@ done:
 static size_t
 H5O_linfo_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
-    const H5O_linfo_t   *linfo = (const H5O_linfo_t *)_mesg;
-    size_t ret_value;   /* Return value */
+    const H5O_linfo_t *linfo = (const H5O_linfo_t *)_mesg;
+    size_t             ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set return value */
-    ret_value = 1                       /* Version */
-                + 1                     /* Index flags */
-                + (linfo->track_corder ? (size_t)8 : 0) /* Curr. max. creation order value */
-                + (size_t)H5F_SIZEOF_ADDR(f)    /* Address of fractal heap to store "dense" links */
-                + (size_t)H5F_SIZEOF_ADDR(f)    /* Address of v2 B-tree for indexing names of links */
-                + (linfo->index_corder ? (size_t)H5F_SIZEOF_ADDR(f) : 0);   /* Address of v2 B-tree for indexing creation order values of links */
+    ret_value =
+        1                                       /* Version */
+        + 1                                     /* Index flags */
+        + (linfo->track_corder ? (size_t)8 : 0) /* Curr. max. creation order value */
+        + (size_t)H5F_SIZEOF_ADDR(f)            /* Address of fractal heap to store "dense" links */
+        + (size_t)H5F_SIZEOF_ADDR(f)            /* Address of v2 B-tree for indexing names of links */
+        + (linfo->index_corder ? (size_t)H5F_SIZEOF_ADDR(f)
+                               : 0); /* Address of v2 B-tree for indexing creation order values of links */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_linfo_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_linfo_free
  *
@@ -328,7 +322,6 @@ H5O_linfo_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_linfo_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_linfo_delete
  *
@@ -344,8 +337,8 @@ H5O_linfo_free(void *mesg)
 static herr_t
 H5O_linfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_mesg)
 {
-    H5O_linfo_t *linfo = (H5O_linfo_t *)_mesg;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_linfo_t *linfo     = (H5O_linfo_t *)_mesg;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -354,15 +347,14 @@ H5O_linfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_
     HDassert(linfo);
 
     /* If the group is using "dense" link storage, delete it */
-    if(H5F_addr_defined(linfo->fheap_addr))
-        if(H5G__dense_delete(f, dxpl_id, linfo, TRUE) < 0)
+    if (H5F_addr_defined(linfo->fheap_addr))
+        if (H5G__dense_delete(f, dxpl_id, linfo, TRUE) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free dense link storage")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_linfo_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_linfo_copy_file
  *
@@ -379,13 +371,13 @@ done:
  */
 static void *
 H5O_linfo_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t *file_dst,
-    hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
-    H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id)
+                    hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
+                    H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id)
 {
-    H5O_linfo_t          *linfo_src = (H5O_linfo_t *) native_src;
-    H5O_linfo_t          *linfo_dst = NULL;
-    H5G_copy_file_ud_t *udata = (H5G_copy_file_ud_t *) _udata;
-    void                 *ret_value;          /* Return value */
+    H5O_linfo_t *       linfo_src = (H5O_linfo_t *)native_src;
+    H5O_linfo_t *       linfo_dst = NULL;
+    H5G_copy_file_ud_t *udata     = (H5G_copy_file_ud_t *)_udata;
+    void *              ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -394,18 +386,18 @@ H5O_linfo_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t *fil
     HDassert(cpy_info);
 
     /* Copy the source message */
-    if(NULL == (linfo_dst = (H5O_linfo_t *)H5O_linfo_copy(linfo_src, NULL)))
+    if (NULL == (linfo_dst = (H5O_linfo_t *)H5O_linfo_copy(linfo_src, NULL)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "memory allocation failed")
 
     /* If we are performing a 'shallow hierarchy' copy, and the links in this
      *  group won't be included in the destination, reset the link info for
      *  this group.
      */
-    if(cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth) {
-        linfo_dst->nlinks = 0;
-        linfo_dst->max_corder = 0;
-        linfo_dst->fheap_addr = HADDR_UNDEF;
-        linfo_dst->name_bt2_addr = HADDR_UNDEF;
+    if (cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth) {
+        linfo_dst->nlinks          = 0;
+        linfo_dst->max_corder      = 0;
+        linfo_dst->fheap_addr      = HADDR_UNDEF;
+        linfo_dst->name_bt2_addr   = HADDR_UNDEF;
         linfo_dst->corder_bt2_addr = HADDR_UNDEF;
     } /* end if */
     else {
@@ -413,25 +405,24 @@ H5O_linfo_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t *fil
         /* (XXX: should probably get the "creation" parameters for the source group's
          *      dense link storage components and use those - QAK)
          */
-        if(H5F_addr_defined(linfo_src->fheap_addr)) {
+        if (H5F_addr_defined(linfo_src->fheap_addr)) {
             /* Create the dense link storage */
-            if(H5G__dense_create(file_dst, dxpl_id, linfo_dst, udata->common.src_pline) < 0)
+            if (H5G__dense_create(file_dst, dxpl_id, linfo_dst, udata->common.src_pline) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create 'dense' form of new format group")
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     /* Set return value */
     ret_value = linfo_dst;
 
 done:
-    if(!ret_value)
-        if(linfo_dst)
+    if (!ret_value)
+        if (linfo_dst)
             linfo_dst = H5FL_FREE(H5O_linfo_t, linfo_dst);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_linfo_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_linfo_post_copy_file_cb
  *
@@ -450,10 +441,10 @@ done:
 static herr_t
 H5O_linfo_post_copy_file_cb(const H5O_link_t *src_lnk, void *_udata)
 {
-    H5O_linfo_postcopy_ud_t *udata = (H5O_linfo_postcopy_ud_t *)_udata;     /* 'User data' passed in */
-    H5O_link_t dst_lnk;                 /* Destination link to insert */
-    hbool_t dst_lnk_init = FALSE;       /* Whether the destination link is initialized */
-    herr_t ret_value = H5_ITER_CONT;  /* Return value */
+    H5O_linfo_postcopy_ud_t *udata = (H5O_linfo_postcopy_ud_t *)_udata; /* 'User data' passed in */
+    H5O_link_t               dst_lnk;                                   /* Destination link to insert */
+    hbool_t                  dst_lnk_init = FALSE;        /* Whether the destination link is initialized */
+    herr_t                   ret_value    = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -462,25 +453,24 @@ H5O_linfo_post_copy_file_cb(const H5O_link_t *src_lnk, void *_udata)
     HDassert(udata);
 
     /* Copy the link (and the object it points to) */
-    if(H5L_link_copy_file(udata->dst_oloc->file, udata->dxpl_id, src_lnk,
-            udata->src_oloc, &dst_lnk, udata->cpy_info) < 0)
+    if (H5L_link_copy_file(udata->dst_oloc->file, udata->dxpl_id, src_lnk, udata->src_oloc, &dst_lnk,
+                           udata->cpy_info) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, H5_ITER_ERROR, "unable to copy link")
     dst_lnk_init = TRUE;
 
     /* Insert the new object in the destination file's group */
     /* (Doesn't increment the link count - that's already been taken care of for hard links) */
-    if(H5G__dense_insert(udata->dst_oloc->file, udata->dxpl_id, udata->dst_linfo, &dst_lnk) < 0)
+    if (H5G__dense_insert(udata->dst_oloc->file, udata->dxpl_id, udata->dst_linfo, &dst_lnk) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR, "unable to insert destination link")
 
 done:
     /* Check if the destination link has been initialized */
-    if(dst_lnk_init)
+    if (dst_lnk_init)
         H5O_msg_reset(H5O_LINK_ID, &dst_lnk);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_linfo_post_copy_file_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_linfo_post_copy_file
  *
@@ -494,13 +484,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
-    H5O_loc_t *dst_oloc, void *mesg_dst, unsigned H5_ATTR_UNUSED *mesg_flags,
-    hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5O_linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
+                         unsigned H5_ATTR_UNUSED *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
-    const H5O_linfo_t   *linfo_src = (const H5O_linfo_t *)mesg_src;
-    H5O_linfo_t         *linfo_dst = (H5O_linfo_t *)mesg_dst;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    const H5O_linfo_t *linfo_src = (const H5O_linfo_t *)mesg_src;
+    H5O_linfo_t *      linfo_dst = (H5O_linfo_t *)mesg_dst;
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -513,22 +502,23 @@ H5O_linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
     HDassert(cpy_info);
 
     /* If we are performing a 'shallow hierarchy' copy, get out now */
-    if(cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth)
+    if (cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth)
         HGOTO_DONE(SUCCEED)
 
     /* Check for copying dense link storage */
-    if(H5F_addr_defined(linfo_src->fheap_addr)) {
-        H5O_linfo_postcopy_ud_t udata;          /* User data for iteration callback */
+    if (H5F_addr_defined(linfo_src->fheap_addr)) {
+        H5O_linfo_postcopy_ud_t udata; /* User data for iteration callback */
 
         /* Set up dense link iteration user data */
-        udata.src_oloc = src_oloc;
-        udata.dst_oloc = dst_oloc;
+        udata.src_oloc  = src_oloc;
+        udata.dst_oloc  = dst_oloc;
         udata.dst_linfo = linfo_dst;
-        udata.dxpl_id = dxpl_id;
-        udata.cpy_info = cpy_info;
+        udata.dxpl_id   = dxpl_id;
+        udata.cpy_info  = cpy_info;
 
         /* Iterate over the links in the group, building a table of the link messages */
-        if(H5G__dense_iterate(src_oloc->file, dxpl_id, linfo_src, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, H5O_linfo_post_copy_file_cb, &udata) < 0)
+        if (H5G__dense_iterate(src_oloc->file, dxpl_id, linfo_src, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0,
+                               NULL, H5O_linfo_post_copy_file_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
     } /* end if */
 
@@ -536,7 +526,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_linfo_post_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_linfo_debug
  *
@@ -551,10 +540,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_linfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE * stream,
-	       int indent, int fwidth)
+H5O_linfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+                int indent, int fwidth)
 {
-    const H5O_linfo_t       *linfo = (const H5O_linfo_t *) _mesg;
+    const H5O_linfo_t *linfo = (const H5O_linfo_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -566,21 +555,17 @@ H5O_linfo_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const voi
     HDassert(fwidth >= 0);
 
     HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "Track creation order of links:", linfo->track_corder);
+              "Track creation order of links:", linfo->track_corder);
     HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "Index creation order of links:", linfo->index_corder);
-    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
-	      "Number of links:", linfo->nlinks);
-    HDfprintf(stream, "%*s%-*s %Hd\n", indent, "", fwidth,
-	      "Max. creation order value:", linfo->max_corder);
+              "Index creation order of links:", linfo->index_corder);
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Number of links:", linfo->nlinks);
+    HDfprintf(stream, "%*s%-*s %Hd\n", indent, "", fwidth, "Max. creation order value:", linfo->max_corder);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "'Dense' link storage fractal heap address:", linfo->fheap_addr);
+              "'Dense' link storage fractal heap address:", linfo->fheap_addr);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "'Dense' link storage name index v2 B-tree address:", linfo->name_bt2_addr);
+              "'Dense' link storage name index v2 B-tree address:", linfo->name_bt2_addr);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "'Dense' link storage creation order index v2 B-tree address:", linfo->corder_bt2_addr);
-
+              "'Dense' link storage creation order index v2 B-tree address:", linfo->corder_bt2_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_linfo_debug() */
-
diff --git a/src/H5Olink.c b/src/H5Olink.c
index 436522a..98d11aa 100644
--- a/src/H5Olink.c
+++ b/src/H5Olink.c
@@ -22,83 +22,81 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-#define H5L_PACKAGE		/*suppress error about including H5Lpkg	  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"         /* IDs                                  */
-#include "H5Lpkg.h"             /* Links                                */
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
+#define H5L_PACKAGE /*suppress error about including H5Lpkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5Lpkg.h"      /* Links                                */
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_link_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_link_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_link_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_link_copy(const void *_mesg, void *_dest);
+static void * H5O_link_copy(const void *_mesg, void *_dest);
 static size_t H5O_link_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_link_reset(void *_mesg);
 static herr_t H5O_link_free(void *_mesg);
-static herr_t H5O_link_pre_copy_file(H5F_t *file_src, const void *mesg_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata);
-static void *H5O_link_copy_file(H5F_t *file_src, void *native_src,
-    H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags,
-    H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
-static herr_t H5O_link_post_copy_file(const H5O_loc_t *src_oloc,
-    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
-    unsigned *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info);
-static herr_t H5O_link_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-    FILE * stream, int indent, int fwidth);
+static herr_t H5O_link_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
+                                     const H5O_copy_t *cpy_info, void *udata);
+static void * H5O_link_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
+                                 unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
+static herr_t H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc,
+                                      void *mesg_dst, unsigned *mesg_flags, hid_t dxpl_id,
+                                      H5O_copy_t *cpy_info);
+static herr_t H5O_link_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                             int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_LINK[1] = {{
-    H5O_LINK_ID,            	/*message id number             */
-    "link",                 	/*message name for debugging    */
-    sizeof(H5O_link_t),     	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_link_decode,        	/*decode message                */
-    H5O_link_encode,        	/*encode message                */
-    H5O_link_copy,          	/*copy the native value         */
-    H5O_link_size,          	/*size of symbol table entry    */
-    H5O_link_reset,		/* reset method			*/
-    H5O_link_free,	        /* free method			*/
-    H5O_link_delete,	       	/* file delete method		*/
-    NULL,			/* link method			*/
-    NULL, 			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    H5O_link_pre_copy_file,	/* pre copy native value to file */
-    H5O_link_copy_file,		/* copy native value to file    */
-    H5O_link_post_copy_file,	/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_link_debug          	/*debug the message             */
+    H5O_LINK_ID,             /*message id number             */
+    "link",                  /*message name for debugging    */
+    sizeof(H5O_link_t),      /*native message size           */
+    0,                       /* messages are sharable?       */
+    H5O_link_decode,         /*decode message                */
+    H5O_link_encode,         /*encode message                */
+    H5O_link_copy,           /*copy the native value         */
+    H5O_link_size,           /*size of symbol table entry    */
+    H5O_link_reset,          /* reset method			*/
+    H5O_link_free,           /* free method			*/
+    H5O_link_delete,         /* file delete method		*/
+    NULL,                    /* link method			*/
+    NULL,                    /*set share method		*/
+    NULL,                    /*can share method		*/
+    H5O_link_pre_copy_file,  /* pre copy native value to file */
+    H5O_link_copy_file,      /* copy native value to file    */
+    H5O_link_post_copy_file, /* post copy native value to file    */
+    NULL,                    /* get creation index		*/
+    NULL,                    /* set creation index		*/
+    H5O_link_debug           /*debug the message             */
 }};
 
 /* Current version of link information */
-#define H5O_LINK_VERSION 	1
+#define H5O_LINK_VERSION 1
 
 /* Flags for link flag encoding */
-#define H5O_LINK_NAME_SIZE              0x03    /* 2-bit field for size of name length */
-#define H5O_LINK_STORE_CORDER           0x04    /* Whether to store creation index */
-#define H5O_LINK_STORE_LINK_TYPE        0x08    /* Whether to store non-default link type */
-#define H5O_LINK_STORE_NAME_CSET        0x10    /* Whether to store non-default name character set */
-#define H5O_LINK_ALL_FLAGS              (H5O_LINK_NAME_SIZE | H5O_LINK_STORE_CORDER | H5O_LINK_STORE_LINK_TYPE | H5O_LINK_STORE_NAME_CSET)
+#define H5O_LINK_NAME_SIZE       0x03 /* 2-bit field for size of name length */
+#define H5O_LINK_STORE_CORDER    0x04 /* Whether to store creation index */
+#define H5O_LINK_STORE_LINK_TYPE 0x08 /* Whether to store non-default link type */
+#define H5O_LINK_STORE_NAME_CSET 0x10 /* Whether to store non-default name character set */
+#define H5O_LINK_ALL_FLAGS                                                                                   \
+    (H5O_LINK_NAME_SIZE | H5O_LINK_STORE_CORDER | H5O_LINK_STORE_LINK_TYPE | H5O_LINK_STORE_NAME_CSET)
 
 /* Individual definitions of name size values */
-#define H5O_LINK_NAME_1                 0x00    /* Use 1-byte value for name length */
-#define H5O_LINK_NAME_2                 0x01    /* Use 2-byte value for name length */
-#define H5O_LINK_NAME_4                 0x02    /* Use 4-byte value for name length */
-#define H5O_LINK_NAME_8                 0x03    /* Use 8-byte value for name length */
+#define H5O_LINK_NAME_1 0x00 /* Use 1-byte value for name length */
+#define H5O_LINK_NAME_2 0x01 /* Use 2-byte value for name length */
+#define H5O_LINK_NAME_4 0x02 /* Use 4-byte value for name length */
+#define H5O_LINK_NAME_8 0x03 /* Use 8-byte value for name length */
 
 /* Declare a free list to manage the H5O_link_t struct */
 H5FL_DEFINE_STATIC(H5O_link_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_decode
  *
@@ -117,14 +115,14 @@ H5FL_DEFINE_STATIC(H5O_link_t);
  */
 static void *
 H5O_link_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t p_size, const uint8_t *p)
+                unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size,
+                const uint8_t *p)
 {
-    H5O_link_t          *lnk = NULL;    /* Pointer to link message */
-    size_t              len = 0;        /* Length of a string in the message */
-    unsigned char       link_flags;     /* Flags for encoding link info */
-    const uint8_t       *p_end = p + p_size;  /* End of the p buffer */
-    void                *ret_value;     /* Return value */
+    H5O_link_t *   lnk = NULL;         /* Pointer to link message */
+    size_t         len = 0;            /* Length of a string in the message */
+    unsigned char  link_flags;         /* Flags for encoding link info */
+    const uint8_t *p_end = p + p_size; /* End of the p buffer */
+    void *         ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -133,86 +131,86 @@ H5O_link_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op
     HDassert(p);
 
     /* decode */
-    if(*p++ != H5O_LINK_VERSION)
+    if (*p++ != H5O_LINK_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for message")
 
     /* Allocate space for message */
-    if(NULL == (lnk = H5FL_CALLOC(H5O_link_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (lnk = H5FL_CALLOC(H5O_link_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Get the encoding flags for the link */
     link_flags = *p++;
-    if(link_flags & ~H5O_LINK_ALL_FLAGS)
+    if (link_flags & ~H5O_LINK_ALL_FLAGS)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad flag value for message")
 
     /* Check for non-default link type */
-    if(link_flags & H5O_LINK_STORE_LINK_TYPE) {
+    if (link_flags & H5O_LINK_STORE_LINK_TYPE) {
         /* Get the type of the link */
         lnk->type = (H5L_type_t)*p++;
-        if(lnk->type < H5L_TYPE_HARD || lnk->type > H5L_TYPE_MAX)
+        if (lnk->type < H5L_TYPE_HARD || lnk->type > H5L_TYPE_MAX)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad link type")
     } /* end if */
     else
         lnk->type = H5L_TYPE_HARD;
 
     /* Get the link creation time from the file */
-    if(link_flags & H5O_LINK_STORE_CORDER) {
+    if (link_flags & H5O_LINK_STORE_CORDER) {
         INT64DECODE(p, lnk->corder)
         lnk->corder_valid = TRUE;
     } /* end if */
     else {
-        lnk->corder = 0;
+        lnk->corder       = 0;
         lnk->corder_valid = FALSE;
     } /* end else */
 
     /* Check for non-default name character set */
-    if(link_flags & H5O_LINK_STORE_NAME_CSET) {
+    if (link_flags & H5O_LINK_STORE_NAME_CSET) {
         /* Get the link name's character set */
         lnk->cset = (H5T_cset_t)*p++;
-        if(lnk->cset < H5T_CSET_ASCII || lnk->cset > H5T_CSET_UTF8)
+        if (lnk->cset < H5T_CSET_ASCII || lnk->cset > H5T_CSET_UTF8)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad cset type")
     } /* end if */
     else
         lnk->cset = H5T_CSET_ASCII;
 
     /* Get the length of the link's name */
-    switch(link_flags & H5O_LINK_NAME_SIZE) {
-        case 0:     /* 1 byte size */
+    switch (link_flags & H5O_LINK_NAME_SIZE) {
+        case 0: /* 1 byte size */
             len = *p++;
             break;
 
-        case 1:     /* 2 byte size */
+        case 1: /* 2 byte size */
             UINT16DECODE(p, len);
             break;
 
-        case 2:     /* 4 byte size */
+        case 2: /* 4 byte size */
             UINT32DECODE(p, len);
             break;
 
-        case 3:     /* 8 byte size */
+        case 3: /* 8 byte size */
             UINT64DECODE(p, len);
             break;
 
         default:
             HDassert(0 && "bad size for name");
     } /* end switch */
-    if(len == 0)
+    if (len == 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "invalid name length")
 
     /* Make sure that length doesn't exceed buffer size, which could occur
        when the file is corrupted */
-    if(p + len > p_end)
+    if (p + len > p_end)
         HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "name length causes read past end of buffer")
 
     /* Get the link's name */
-    if(NULL == (lnk->name = (char *)H5MM_malloc(len + 1)))
+    if (NULL == (lnk->name = (char *)H5MM_malloc(len + 1)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     HDmemcpy(lnk->name, p, len);
     lnk->name[len] = '\0';
     p += len;
 
     /* Get the appropriate information for each type of link */
-    switch(lnk->type) {
+    switch (lnk->type) {
         case H5L_TYPE_HARD:
             /* Get the address of the object the link points to */
             H5F_addr_decode(f, &p, &(lnk->u.hard.addr));
@@ -221,15 +219,15 @@ H5O_link_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op
         case H5L_TYPE_SOFT:
             /* Get the link value */
             UINT16DECODE(p, len)
-            if(len == 0)
+            if (len == 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "invalid link length")
 
             /* Make sure that length doesn't exceed buffer size, which could occur
                when the file is corrupted */
-            if(p + len > p_end)
+            if (p + len > p_end)
                 HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "name length causes read past end of buffer")
 
-            if(NULL == (lnk->u.soft.name = (char *)H5MM_malloc((size_t)len + 1)))
+            if (NULL == (lnk->u.soft.name = (char *)H5MM_malloc((size_t)len + 1)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
             HDmemcpy(lnk->u.soft.name, p, len);
             lnk->u.soft.name[len] = '\0';
@@ -241,20 +239,19 @@ H5O_link_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
         default:
-            if(lnk->type < H5L_TYPE_UD_MIN || lnk->type > H5L_TYPE_MAX)
+            if (lnk->type < H5L_TYPE_UD_MIN || lnk->type > H5L_TYPE_MAX)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "unknown link type")
 
             /* A UD link.  Get the user-supplied data */
             UINT16DECODE(p, len)
             lnk->u.ud.size = len;
-            if(len > 0)
-            {
+            if (len > 0) {
                 /* Make sure that length doesn't exceed buffer size, which could
                    occur when the file is corrupted */
-                if(p + len > p_end)
+                if (p + len > p_end)
                     HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "name length causes read past end of buffer")
 
-                if(NULL == (lnk->u.ud.udata = H5MM_malloc((size_t)len)))
+                if (NULL == (lnk->u.ud.udata = H5MM_malloc((size_t)len)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
                 HDmemcpy(lnk->u.ud.udata, p, len);
                 p += len;
@@ -267,13 +264,13 @@ H5O_link_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op
     ret_value = lnk;
 
 done:
-    if(ret_value == NULL)
-        if(lnk != NULL) {
-            if(lnk->name != NULL)
+    if (ret_value == NULL)
+        if (lnk != NULL) {
+            if (lnk->name != NULL)
                 H5MM_xfree(lnk->name);
-            if(lnk->type == H5L_TYPE_SOFT && lnk->u.soft.name != NULL)
+            if (lnk->type == H5L_TYPE_SOFT && lnk->u.soft.name != NULL)
                 H5MM_xfree(lnk->u.soft.name);
-            if(lnk->type >= H5L_TYPE_UD_MIN && lnk->u.ud.size > 0 && lnk->u.ud.udata != NULL)
+            if (lnk->type >= H5L_TYPE_UD_MIN && lnk->u.ud.size > 0 && lnk->u.ud.udata != NULL)
                 H5MM_xfree(lnk->u.ud.udata);
             lnk = H5FL_FREE(H5O_link_t, lnk);
         } /* end if */
@@ -281,7 +278,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_link_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_encode
  *
@@ -298,9 +294,9 @@ done:
 static herr_t
 H5O_link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_link_t    *lnk = (const H5O_link_t *) _mesg;
-    uint64_t            len;            /* Length of a string in the message */
-    unsigned char       link_flags;     /* Flags for encoding link info */
+    const H5O_link_t *lnk = (const H5O_link_t *)_mesg;
+    uint64_t          len;        /* Length of a string in the message */
+    unsigned char     link_flags; /* Flags for encoding link info */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -317,46 +313,46 @@ H5O_link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
     *p++ = H5O_LINK_VERSION;
 
     /* The encoding flags for the link */
-    if(len > 4294967295)
+    if (len > 4294967295)
         link_flags = H5O_LINK_NAME_8;
-    else if(len > 65535)
+    else if (len > 65535)
         link_flags = H5O_LINK_NAME_4;
-    else if(len > 255)
+    else if (len > 255)
         link_flags = H5O_LINK_NAME_2;
     else
         link_flags = H5O_LINK_NAME_1;
     link_flags = (unsigned char)(link_flags | (lnk->corder_valid ? H5O_LINK_STORE_CORDER : 0));
     link_flags = (unsigned char)(link_flags | ((lnk->type != H5L_TYPE_HARD) ? H5O_LINK_STORE_LINK_TYPE : 0));
     link_flags = (unsigned char)(link_flags | ((lnk->cset != H5T_CSET_ASCII) ? H5O_LINK_STORE_NAME_CSET : 0));
-    *p++ = link_flags;
+    *p++       = link_flags;
 
     /* Store the type of a non-default link */
-    if(link_flags & H5O_LINK_STORE_LINK_TYPE)
+    if (link_flags & H5O_LINK_STORE_LINK_TYPE)
         *p++ = (uint8_t)lnk->type;
 
     /* Store the link creation order in the file, if its valid */
-    if(lnk->corder_valid)
+    if (lnk->corder_valid)
         INT64ENCODE(p, lnk->corder)
 
     /* Store a non-default link name character set */
-    if(link_flags & H5O_LINK_STORE_NAME_CSET)
+    if (link_flags & H5O_LINK_STORE_NAME_CSET)
         *p++ = (uint8_t)lnk->cset;
 
     /* Store the link name's length */
-    switch(link_flags & H5O_LINK_NAME_SIZE) {
-        case 0:     /* 1 byte size */
+    switch (link_flags & H5O_LINK_NAME_SIZE) {
+        case 0: /* 1 byte size */
             *p++ = (uint8_t)len;
             break;
 
-        case 1:     /* 2 byte size */
+        case 1: /* 2 byte size */
             UINT16ENCODE(p, len);
             break;
 
-        case 2:     /* 4 byte size */
+        case 2: /* 4 byte size */
             UINT32ENCODE(p, len);
             break;
 
-        case 3:     /* 8 byte size */
+        case 3: /* 8 byte size */
             UINT64ENCODE(p, len);
             break;
 
@@ -369,7 +365,7 @@ H5O_link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
     p += len;
 
     /* Store the appropriate information for each type of link */
-    switch(lnk->type) {
+    switch (lnk->type) {
         case H5L_TYPE_HARD:
             /* Store the address of the object the link points to */
             H5F_addr_encode(f, &p, lnk->u.hard.addr);
@@ -394,10 +390,9 @@ H5O_link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
             /* Store the user-supplied data, however long it is */
             len = (uint16_t)lnk->u.ud.size;
             UINT16ENCODE(p, len)
-            if(len > 0)
-            {
+            if (len > 0) {
                 HDmemcpy(p, lnk->u.ud.udata, (size_t)len);
-                p+=len;
+                p += len;
             }
             break;
     } /* end switch */
@@ -405,7 +400,6 @@ H5O_link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_link_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_copy
  *
@@ -425,54 +419,53 @@ H5O_link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
 static void *
 H5O_link_copy(const void *_mesg, void *_dest)
 {
-    const H5O_link_t    *lnk = (const H5O_link_t *) _mesg;
-    H5O_link_t          *dest = (H5O_link_t *) _dest;
-    void                *ret_value;     /* Return value */
+    const H5O_link_t *lnk  = (const H5O_link_t *)_mesg;
+    H5O_link_t *      dest = (H5O_link_t *)_dest;
+    void *            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(lnk);
-    if(!dest && NULL == (dest = H5FL_MALLOC(H5O_link_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!dest && NULL == (dest = H5FL_MALLOC(H5O_link_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy static information */
     *dest = *lnk;
 
     /* Duplicate the link's name */
     HDassert(lnk->name);
-    if(NULL == (dest->name = H5MM_xstrdup(lnk->name)))
+    if (NULL == (dest->name = H5MM_xstrdup(lnk->name)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't duplicate link name")
 
     /* Copy other information needed for different link types */
-    if(lnk->type == H5L_TYPE_SOFT) {
-        if(NULL == (dest->u.soft.name = H5MM_xstrdup(lnk->u.soft.name)))
+    if (lnk->type == H5L_TYPE_SOFT) {
+        if (NULL == (dest->u.soft.name = H5MM_xstrdup(lnk->u.soft.name)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't duplicate soft link value")
     } /* end if */
-    else if(lnk->type >= H5L_TYPE_UD_MIN) {
-        if(lnk->u.ud.size > 0) {
-            if(NULL == (dest->u.ud.udata = H5MM_malloc(lnk->u.ud.size)))
+    else if (lnk->type >= H5L_TYPE_UD_MIN) {
+        if (lnk->u.ud.size > 0) {
+            if (NULL == (dest->u.ud.udata = H5MM_malloc(lnk->u.ud.size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
             HDmemcpy(dest->u.ud.udata, lnk->u.ud.udata, lnk->u.ud.size);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Set return value */
     ret_value = dest;
 
 done:
-    if(NULL == ret_value)
-        if(dest) {
-            if(dest->name && dest->name != lnk->name)
+    if (NULL == ret_value)
+        if (dest) {
+            if (dest->name && dest->name != lnk->name)
                 dest->name = (char *)H5MM_xfree(dest->name);
-            if(NULL == _dest)
-                dest = H5FL_FREE(H5O_link_t ,dest);
+            if (NULL == _dest)
+                dest = H5FL_FREE(H5O_link_t, dest);
         } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_link_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_size
  *
@@ -494,9 +487,9 @@ static size_t
 H5O_link_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
     const H5O_link_t *lnk = (const H5O_link_t *)_mesg;
-    uint64_t name_len;    /* Length of name */
-    size_t name_size;   /* Size of encoded name length */
-    size_t ret_value;   /* Return value */
+    uint64_t          name_len;  /* Length of name */
+    size_t            name_size; /* Size of encoded name length */
+    size_t            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -507,33 +500,33 @@ H5O_link_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void
     name_len = (uint64_t)HDstrlen(lnk->name);
 
     /* Determine correct value for name size bits */
-    if(name_len > 4294967295)
+    if (name_len > 4294967295)
         name_size = 8;
-    else if(name_len > 65535)
+    else if (name_len > 65535)
         name_size = 4;
-    else if(name_len > 255)
+    else if (name_len > 255)
         name_size = 2;
     else
         name_size = 1;
 
     /* Set return value */
-    ret_value = 1 +                     /* Version */
-                1 +                     /* Link encoding flags */
+    ret_value = 1 +                                            /* Version */
+                1 +                                            /* Link encoding flags */
                 (lnk->type != H5L_TYPE_HARD ? (size_t)1 : 0) + /* Link type */
-                (lnk->corder_valid ? 8 : 0) + /* Creation order */
-                (lnk->cset != H5T_CSET_ASCII ? 1 : 0) + /* Character set */
-                name_size +             /* Name length */
-                name_len;               /* Name */
+                (lnk->corder_valid ? 8 : 0) +                  /* Creation order */
+                (lnk->cset != H5T_CSET_ASCII ? 1 : 0) +        /* Character set */
+                name_size +                                    /* Name length */
+                name_len;                                      /* Name */
 
     /* Add the appropriate length for each type of link */
-    switch(lnk->type) {
+    switch (lnk->type) {
         case H5L_TYPE_HARD:
             ret_value += H5F_SIZEOF_ADDR(f);
             break;
 
         case H5L_TYPE_SOFT:
-            ret_value += 2 +                            /* Link value length */
-                        HDstrlen(lnk->u.soft.name);     /* Link value */
+            ret_value += 2 +                         /* Link value length */
+                         HDstrlen(lnk->u.soft.name); /* Link value */
             break;
 
         case H5L_TYPE_ERROR:
@@ -541,15 +534,14 @@ H5O_link_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void
         case H5L_TYPE_MAX:
         default: /* Default is user-defined link type */
             HDassert(lnk->type >= H5L_TYPE_UD_MIN);
-            ret_value += 2 +                            /* User-defined data size */
-                         lnk->u.ud.size;                /* User-defined data */
+            ret_value += 2 +             /* User-defined data size */
+                         lnk->u.ud.size; /* User-defined data */
             break;
     } /* end switch */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_link_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_link_reset
  *
@@ -570,12 +562,12 @@ H5O_link_reset(void *_mesg)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(lnk) {
+    if (lnk) {
         /* Free information for link (but don't free link pointer) */
-        if(lnk->type == H5L_TYPE_SOFT)
+        if (lnk->type == H5L_TYPE_SOFT)
             lnk->u.soft.name = (char *)H5MM_xfree(lnk->u.soft.name);
         else if (lnk->type >= H5L_TYPE_UD_MIN) {
-            if(lnk->u.ud.size > 0)
+            if (lnk->u.ud.size > 0)
                 lnk->u.ud.udata = H5MM_xfree(lnk->u.ud.udata);
         } /* end if */
         lnk->name = (char *)H5MM_xfree(lnk->name);
@@ -584,7 +576,6 @@ H5O_link_reset(void *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_link_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_link_free
  *
@@ -613,7 +604,6 @@ H5O_link_free(void *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_link_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_delete
  *
@@ -629,8 +619,8 @@ H5O_link_free(void *_mesg)
 herr_t
 H5O_link_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_mesg)
 {
-    H5O_link_t *lnk = (H5O_link_t *)_mesg;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_link_t *lnk       = (H5O_link_t *)_mesg;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -640,7 +630,7 @@ H5O_link_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_m
 
     /* Check for adjusting the link count when the link is removed */
     /* Adjust the reference count of the object when a hard link is removed */
-    if(lnk->type == H5L_TYPE_HARD) {
+    if (lnk->type == H5L_TYPE_HARD) {
         H5O_loc_t oloc;
 
         /* Construct object location for object, in order to decrement it's ref count */
@@ -650,42 +640,41 @@ H5O_link_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_m
         oloc.addr = lnk->u.hard.addr;
 
         /* Decrement the ref count for the object */
-        if(H5O_link(&oloc, -1, dxpl_id) < 0)
+        if (H5O_link(&oloc, -1, dxpl_id) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to decrement object link count")
     } /* end if */
     /* Perform the "delete" callback when a user-defined link is removed */
-    else if(lnk->type >= H5L_TYPE_UD_MIN) {
-        const H5L_class_t   *link_class;         /* User-defined link class */
+    else if (lnk->type >= H5L_TYPE_UD_MIN) {
+        const H5L_class_t *link_class; /* User-defined link class */
 
         /* Get the link class for this type of link. */
-        if(NULL == (link_class = H5L_find_class(lnk->type)))
+        if (NULL == (link_class = H5L_find_class(lnk->type)))
             HGOTO_ERROR(H5E_OHDR, H5E_NOTREGISTERED, FAIL, "link class not registered")
 
         /* Check for delete callback */
-        if(link_class->del_func) {
-            hid_t file_id;           /* ID for the file the link is located in (passed to user callback) */
+        if (link_class->del_func) {
+            hid_t file_id; /* ID for the file the link is located in (passed to user callback) */
 
             /* Get a file ID for the file the link is in */
-            if((file_id = H5F_get_id(f, FALSE)) < 0)
+            if ((file_id = H5F_get_id(f, FALSE)) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to get file ID")
 
             /* Call user-defined link's 'delete' callback */
-            if((link_class->del_func)(lnk->name, file_id, lnk->u.ud.udata, lnk->u.ud.size) < 0) {
+            if ((link_class->del_func)(lnk->name, file_id, lnk->u.ud.udata, lnk->u.ud.size) < 0) {
                 H5I_dec_ref(file_id);
                 HGOTO_ERROR(H5E_OHDR, H5E_CALLBACK, FAIL, "link deletion callback returned failure")
             } /* end if */
 
             /* Release the file ID */
-            if(H5I_dec_ref(file_id) < 0)
+            if (H5I_dec_ref(file_id) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCLOSEFILE, FAIL, "can't close file")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_link_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_pre_copy_file
  *
@@ -703,7 +692,7 @@ done:
  */
 static herr_t
 H5O_link_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSED *native_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata)
+                       hbool_t *deleted, const H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -716,13 +705,12 @@ H5O_link_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSED
      *  in the destination object header before performing any other actions
      *  on it.
      */
-    if(cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth)
+    if (cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth)
         *deleted = TRUE;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_link_pre_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_copy_file
  *
@@ -739,11 +727,12 @@ H5O_link_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSED
  */
 static void *
 H5O_link_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t H5_ATTR_UNUSED *file_dst,
-    hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
-    H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *udata, hid_t H5_ATTR_UNUSED dxpl_id)
+                   hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
+                   H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *udata,
+                   hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    H5O_link_t  *link_src = (H5O_link_t *)native_src;
-    void        *ret_value;          /* Return value */
+    H5O_link_t *link_src = (H5O_link_t *)native_src;
+    void *      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -753,19 +742,18 @@ H5O_link_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t H5_AT
     HDassert(cpy_info->max_depth < 0 || cpy_info->curr_depth < cpy_info->max_depth);
 
     /* Sanity check source link type */
-    if(link_src->type > H5L_TYPE_SOFT && link_src->type < H5L_TYPE_UD_MIN)
+    if (link_src->type > H5L_TYPE_SOFT && link_src->type < H5L_TYPE_UD_MIN)
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, NULL, "unrecognized built-in link type")
 
     /* Allocate "blank" link for destination */
     /* (values will be filled in during 'post copy' operation) */
-    if(NULL == (ret_value = H5FL_CALLOC(H5O_link_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (ret_value = H5FL_CALLOC(H5O_link_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_link_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_post_copy_file
  *
@@ -779,13 +767,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
-    H5O_loc_t *dst_oloc, void *mesg_dst, unsigned H5_ATTR_UNUSED *mesg_flags,
-    hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
+                        unsigned H5_ATTR_UNUSED *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
-    const H5O_link_t    *link_src = (const H5O_link_t *)mesg_src;
-    H5O_link_t          *link_dst = (H5O_link_t *)mesg_dst;
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    const H5O_link_t *link_src  = (const H5O_link_t *)mesg_src;
+    H5O_link_t *      link_dst  = (H5O_link_t *)mesg_dst;
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -799,15 +786,13 @@ H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
     HDassert(cpy_info->max_depth < 0 || cpy_info->curr_depth < cpy_info->max_depth);
 
     /* Copy the link (and the object it points to) */
-    if(H5L_link_copy_file(dst_oloc->file, dxpl_id, link_src, src_oloc, link_dst,
-            cpy_info) < 0)
+    if (H5L_link_copy_file(dst_oloc->file, dxpl_id, link_src, src_oloc, link_dst, cpy_info) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy link")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_link_post_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_link_debug
  *
@@ -822,11 +807,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_link_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE * stream,
-	       int indent, int fwidth)
+H5O_link_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+               int indent, int fwidth)
 {
-    const H5O_link_t    *lnk = (const H5O_link_t *) _mesg;
-    herr_t               ret_value = SUCCEED;          /* Return value */
+    const H5O_link_t *lnk       = (const H5O_link_t *)_mesg;
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -837,52 +822,50 @@ H5O_link_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Link Type:", (lnk->type == H5L_TYPE_HARD ? "Hard" :
-                  (lnk->type == H5L_TYPE_SOFT ? "Soft" :
-                  (lnk->type == H5L_TYPE_EXTERNAL ? "External" :
-                  (lnk->type >= H5L_TYPE_UD_MIN ? "User-defined" : "Unknown")))));
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Link Type:",
+              (lnk->type == H5L_TYPE_HARD
+                   ? "Hard"
+                   : (lnk->type == H5L_TYPE_SOFT
+                          ? "Soft"
+                          : (lnk->type == H5L_TYPE_EXTERNAL
+                                 ? "External"
+                                 : (lnk->type >= H5L_TYPE_UD_MIN ? "User-defined" : "Unknown")))));
 
-    if(lnk->corder_valid)
-        HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-                  "Creation Order:", lnk->corder);
+    if (lnk->corder_valid)
+        HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Creation Order:", lnk->corder);
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Link Name Character Set:", (lnk->cset == H5T_CSET_ASCII ?
-                "ASCII" : (lnk->cset == H5T_CSET_UTF8 ? "UTF-8" : "Unknown")));
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Link Name:", lnk->name);
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Link Name Character Set:",
+              (lnk->cset == H5T_CSET_ASCII ? "ASCII" : (lnk->cset == H5T_CSET_UTF8 ? "UTF-8" : "Unknown")));
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Link Name:", lnk->name);
 
     /* Display link-specific information */
-    switch(lnk->type) {
+    switch (lnk->type) {
         case H5L_TYPE_HARD:
-            HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-                      "Object address:", lnk->u.hard.addr);
+            HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Object address:", lnk->u.hard.addr);
             break;
 
         case H5L_TYPE_SOFT:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                      "Link Value:", lnk->u.soft.name);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Link Value:", lnk->u.soft.name);
             break;
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_EXTERNAL:
         case H5L_TYPE_MAX:
         default:
-            if(lnk->type >= H5L_TYPE_UD_MIN) {
-                if(lnk->type == H5L_TYPE_EXTERNAL) {
-                    const char *objname = (const char *)lnk->u.ud.udata + (HDstrlen((const char *)lnk->u.ud.udata) + 1);
+            if (lnk->type >= H5L_TYPE_UD_MIN) {
+                if (lnk->type == H5L_TYPE_EXTERNAL) {
+                    const char *objname =
+                        (const char *)lnk->u.ud.udata + (HDstrlen((const char *)lnk->u.ud.udata) + 1);
 
                     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                               "External File Name:", lnk->u.ud.udata);
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                              "External Object Name:", objname);
+                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "External Object Name:", objname);
                 } /* end if */
                 else {
                     HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth,
                               "User-Defined Link Size:", lnk->u.ud.size);
                 } /* end else */
-            } /* end if */
+            }     /* end if */
             else
                 HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type")
             break;
@@ -891,4 +874,3 @@ H5O_link_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_link_debug() */
-
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index 970fda6..d0347b5 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -26,75 +26,65 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions        */
-#include "H5Aprivate.h"		/* Attributes               */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access              */
-#include "H5Iprivate.h"		/* IDs                      */
-#include "H5MMprivate.h"	/* Memory management        */
-#include "H5Opkg.h"         /* Object headers           */
-#include "H5SMprivate.h"    /* Shared object header messages */
-
+#include "H5private.h"   /* Generic Functions        */
+#include "H5Aprivate.h"  /* Attributes               */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access              */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Opkg.h"      /* Object headers           */
+#include "H5SMprivate.h" /* Shared object header messages */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for iteration while removing a message */
 typedef struct {
-    H5F_t      *f;              /* Pointer to file for insertion */
-    hid_t dxpl_id;              /* DXPL during iteration */
-    int sequence;               /* Sequence # to search for */
-    unsigned nfailed;           /* # of failed message removals */
-    H5O_operator_t op;          /* Callback routine for removal operations */
-    void *op_data;              /* Callback data for removal operations */
-    hbool_t adj_link;           /* Whether to adjust links when removing messages */
+    H5F_t *        f;        /* Pointer to file for insertion */
+    hid_t          dxpl_id;  /* DXPL during iteration */
+    int            sequence; /* Sequence # to search for */
+    unsigned       nfailed;  /* # of failed message removals */
+    H5O_operator_t op;       /* Callback routine for removal operations */
+    void *         op_data;  /* Callback data for removal operations */
+    hbool_t        adj_link; /* Whether to adjust links when removing messages */
 } H5O_iter_rm_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static herr_t H5O_msg_reset_real(const H5O_msg_class_t *type, void *native);
-static herr_t H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned sequence, unsigned *oh_modified, void *_udata/*in,out*/);
-static herr_t H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t idx,
-    const H5O_msg_class_t *type, const void *mesg, unsigned mesg_flags,
-    unsigned update_flags);
-
+static herr_t H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence,
+                                unsigned *oh_modified, void *_udata /*in,out*/);
+static herr_t H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t idx, const H5O_msg_class_t *type,
+                            const void *mesg, unsigned mesg_flags, unsigned update_flags);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_create
  *
@@ -111,11 +101,11 @@ static herr_t H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t idx,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
-    unsigned update_flags, void *mesg, hid_t dxpl_id)
+H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags, unsigned update_flags, void *mesg,
+               hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Object header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *oh        = NULL;    /* Object header */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -126,21 +116,20 @@ H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
     HDassert(mesg);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Go append message to object header */
-    if(H5O_msg_append_oh(loc->file, dxpl_id, oh, type_id, mesg_flags, update_flags, mesg) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to append to object header")
+    if (H5O_msg_append_oh(loc->file, dxpl_id, oh, type_id, mesg_flags, update_flags, mesg) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to append to object header")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_append_oh
  *
@@ -159,33 +148,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_append_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
-    unsigned mesg_flags, unsigned update_flags, void *mesg)
+H5O_msg_append_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, unsigned mesg_flags,
+                  unsigned update_flags, void *mesg)
 {
-    const H5O_msg_class_t *type;        /* Original H5O class type for the ID */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_msg_class_t *type;                /* Original H5O class type for the ID */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* check args */
     HDassert(f);
     HDassert(oh);
-    HDassert(H5O_ATTR_ID != type_id);   /* Attributes are modified in another routine */
+    HDassert(H5O_ATTR_ID != type_id); /* Attributes are modified in another routine */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(0 == (mesg_flags & ~H5O_MSG_FLAG_BITS));
     HDassert(mesg);
 
     /* Append new message to object header */
-    if(H5O_msg_append_real(f, dxpl_id, oh, type, mesg_flags, update_flags, mesg) < 0)
+    if (H5O_msg_append_real(f, dxpl_id, oh, type, mesg_flags, update_flags, mesg) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new message in header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_append_oh() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_append_real
  *
@@ -202,11 +190,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
-    unsigned mesg_flags, unsigned update_flags, void *mesg)
+H5O_msg_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, unsigned mesg_flags,
+                    unsigned update_flags, void *mesg)
 {
-    size_t idx;                         /* Index of message to modify */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t idx;                 /* Index of message to modify */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -218,21 +206,20 @@ H5O_msg_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *t
     HDassert(mesg);
 
     /* Allocate space for a new message */
-    if(H5O_msg_alloc(f, dxpl_id, oh, type, &mesg_flags, mesg, &idx) < 0)
+    if (H5O_msg_alloc(f, dxpl_id, oh, type, &mesg_flags, mesg, &idx) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, FAIL, "unable to create new message")
 
     /* Copy the information for the message */
-    if(H5O_copy_mesg(f, dxpl_id, oh, idx, type, mesg, mesg_flags, update_flags) < 0)
+    if (H5O_copy_mesg(f, dxpl_id, oh, idx, type, mesg, mesg_flags, update_flags) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to write message")
 #ifdef H5O_DEBUG
-H5O_assert(oh);
+    H5O_assert(oh);
 #endif /* H5O_DEBUG */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_append_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_write
  *
@@ -254,12 +241,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
-    unsigned update_flags, void *mesg, hid_t dxpl_id)
+H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags, unsigned update_flags, void *mesg,
+              hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Object header to use */
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *                oh = NULL;           /* Object header to use */
+    const H5O_msg_class_t *type;                /* Actual H5O class type for the ID */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -267,29 +254,28 @@ H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
     HDassert(loc);
     HDassert(loc->file);
     HDassert(H5F_addr_defined(loc->addr));
-    HDassert(H5O_ATTR_ID != type_id);   /* Attributes are modified in another routine */
+    HDassert(H5O_ATTR_ID != type_id); /* Attributes are modified in another routine */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(mesg);
     HDassert(0 == (mesg_flags & ~H5O_MSG_FLAG_BITS));
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Call the "real" modify routine */
-    if(H5O_msg_write_real(loc->file, dxpl_id, oh, type, mesg_flags, update_flags, mesg) < 0)
+    if (H5O_msg_write_real(loc->file, dxpl_id, oh, type, mesg_flags, update_flags, mesg) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to write object header message")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_write_oh
  *
@@ -310,33 +296,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_write_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
-    unsigned mesg_flags, unsigned update_flags, void *mesg)
+H5O_msg_write_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, unsigned mesg_flags,
+                 unsigned update_flags, void *mesg)
 {
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_msg_class_t *type;                /* Actual H5O class type for the ID */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* check args */
     HDassert(f);
     HDassert(oh);
-    HDassert(H5O_ATTR_ID != type_id);   /* Attributes are modified in another routine */
+    HDassert(H5O_ATTR_ID != type_id); /* Attributes are modified in another routine */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(mesg);
     HDassert(0 == (mesg_flags & ~H5O_MSG_FLAG_BITS));
 
     /* Call the "real" modify routine */
-    if(H5O_msg_write_real(f, dxpl_id, oh, type, mesg_flags, update_flags, mesg) < 0)
+    if (H5O_msg_write_real(f, dxpl_id, oh, type, mesg_flags, update_flags, mesg) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to write object header message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_write_oh() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_write_real
  *
@@ -358,12 +343,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
-    unsigned mesg_flags, unsigned update_flags, void *mesg)
+H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, unsigned mesg_flags,
+                   unsigned update_flags, void *mesg)
 {
-    H5O_mesg_t         *idx_msg;        /* Pointer to message to modify */
-    size_t		idx;            /* Index of message to modify */
-    herr_t	        ret_value = SUCCEED;    /* Return value */
+    H5O_mesg_t *idx_msg;             /* Pointer to message to modify */
+    size_t      idx;                 /* Index of message to modify */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -376,22 +361,22 @@ H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *ty
     HDassert(0 == (mesg_flags & ~H5O_MSG_FLAG_BITS));
 
     /* Locate message of correct type */
-    for(idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
-	if(type == idx_msg->type)
+    for (idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
+        if (type == idx_msg->type)
             break;
-    if(idx == oh->nmesgs)
+    if (idx == oh->nmesgs)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "message type not found")
 
     /* Check for modifying a constant message */
-    if(!(update_flags & H5O_UPDATE_FORCE) && (idx_msg->flags & H5O_MSG_FLAG_CONSTANT))
-	HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to modify constant message")
+    if (!(update_flags & H5O_UPDATE_FORCE) && (idx_msg->flags & H5O_MSG_FLAG_CONSTANT))
+        HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to modify constant message")
     /* This message is shared, but it's being modified. */
-    else if((idx_msg->flags & H5O_MSG_FLAG_SHARED) || (idx_msg->flags & H5O_MSG_FLAG_SHAREABLE)) {
-        htri_t status;              /* Status of "try share" call */
+    else if ((idx_msg->flags & H5O_MSG_FLAG_SHARED) || (idx_msg->flags & H5O_MSG_FLAG_SHAREABLE)) {
+        htri_t status; /* Status of "try share" call */
 
-         /* First, sanity check to make sure it's not a committed message;
-          *     these can't ever be modified.
-          */
+        /* First, sanity check to make sure it's not a committed message;
+         *     these can't ever be modified.
+         */
         HDassert(((H5O_shared_t *)idx_msg->native)->type != H5O_SHARE_TYPE_COMMITTED);
 
         /* Also, sanity check that a message doesn't switch status from being
@@ -407,7 +392,7 @@ H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *ty
          *      the location of the object changes (from in another object's
          *      header to the SOHM heap), so just delete it first -QAK)
          */
-        if(H5SM_delete(f, dxpl_id, oh, (H5O_shared_t *)idx_msg->native) < 0)
+        if (H5SM_delete(f, dxpl_id, oh, (H5O_shared_t *)idx_msg->native) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete message from SOHM index")
 
         /* If we're replacing a shared message, the new message must be shared
@@ -417,24 +402,24 @@ H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *ty
          * XXX: This doesn't handle freeing extra space in object header from
          *      a message shrinking.
          */
-        if((status = H5SM_try_share(f, dxpl_id, ((mesg_flags & H5O_MSG_FLAG_SHARED) ? NULL : oh), 0, idx_msg->type->id, mesg, &mesg_flags)) < 0)
+        if ((status = H5SM_try_share(f, dxpl_id, ((mesg_flags & H5O_MSG_FLAG_SHARED) ? NULL : oh), 0,
+                                     idx_msg->type->id, mesg, &mesg_flags)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "error while trying to share message")
-        if(status == FALSE && (mesg_flags & H5O_MSG_FLAG_SHARED))
+        if (status == FALSE && (mesg_flags & H5O_MSG_FLAG_SHARED))
             HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "message changed sharing status")
     } /* end if */
 
     /* Copy the information for the message */
-    if(H5O_copy_mesg(f, dxpl_id, oh, idx, type, mesg, mesg_flags, update_flags) < 0)
+    if (H5O_copy_mesg(f, dxpl_id, oh, idx, type, mesg, mesg_flags, update_flags) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to write message")
 #ifdef H5O_DEBUG
-H5O_assert(oh);
+    H5O_assert(oh);
 #endif /* H5O_DEBUG */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_write_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_read
  *
@@ -459,11 +444,10 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg,
-    hid_t dxpl_id)
+H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Object header to use */
-    void *ret_value;                    /* Return value */
+    H5O_t *oh = NULL; /* Object header to use */
+    void * ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -474,21 +458,20 @@ H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg,
     HDassert(type_id < NELMTS(H5O_msg_class_g));
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to protect object header")
 
     /* Call the "real" read routine */
-    if(NULL == (ret_value = H5O_msg_read_oh(loc->file, dxpl_id, oh, type_id, mesg)))
-	HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read object header message")
+    if (NULL == (ret_value = H5O_msg_read_oh(loc->file, dxpl_id, oh, type_id, mesg)))
+        HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read object header message")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_read_oh
  *
@@ -513,12 +496,11 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
-    void *mesg)
+H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, void *mesg)
 {
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    unsigned       idx;                 /* Message's index in object header */
-    void           *ret_value = NULL;
+    const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
+    unsigned               idx;  /* Message's index in object header */
+    void *                 ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -526,14 +508,14 @@ H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
     HDassert(f);
     HDassert(oh);
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Scan through the messages looking for the right one */
-    for(idx = 0; idx < oh->nmesgs; idx++)
-	if(type == oh->mesg[idx].type)
+    for (idx = 0; idx < oh->nmesgs; idx++)
+        if (type == oh->mesg[idx].type)
             break;
-    if(idx == oh->nmesgs)
+    if (idx == oh->nmesgs)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, NULL, "message type not found")
 
     /*
@@ -547,14 +529,13 @@ H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
      * the raw message) so we must copy the native message before
      * returning.
      */
-    if(NULL == (ret_value = (type->copy)(oh->mesg[idx].native, mesg)))
+    if (NULL == (ret_value = (type->copy)(oh->mesg[idx].native, mesg)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to copy message to user space")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_read_oh() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_reset
  *
@@ -573,25 +554,24 @@ done:
 herr_t
 H5O_msg_reset(unsigned type_id, void *native)
 {
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_msg_class_t *type;                /* Actual H5O class type for the ID */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Call the "real" reset routine */
-    if(H5O_msg_reset_real(type, native) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTRESET, FAIL, "unable to reset object header")
+    if (H5O_msg_reset_real(type, native) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTRESET, FAIL, "unable to reset object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_reset_real
  *
@@ -610,27 +590,26 @@ done:
 static herr_t
 H5O_msg_reset_real(const H5O_msg_class_t *type, void *native)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(type);
 
-    if(native) {
-	if(type->reset) {
-	    if((type->reset)(native) < 0)
-		HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "reset method failed")
-	} /* end if */
+    if (native) {
+        if (type->reset) {
+            if ((type->reset)(native) < 0)
+                HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "reset method failed")
+        } /* end if */
         else
-	    HDmemset(native, 0, type->native_size);
+            HDmemset(native, 0, type->native_size);
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_reset_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_free
  *
@@ -649,14 +628,14 @@ done:
 void *
 H5O_msg_free(unsigned type_id, void *mesg)
 {
-    const H5O_msg_class_t *type;            /* Actual H5O class type for the ID */
-    void * ret_value;                   /* Return value */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    void *                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Call the "real" free routine */
@@ -665,7 +644,6 @@ H5O_msg_free(unsigned type_id, void *mesg)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_free_mesg
  *
@@ -692,7 +670,6 @@ H5O_msg_free_mesg(H5O_mesg_t *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_msg_free_mesg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_free_real
  *
@@ -716,9 +693,9 @@ H5O_msg_free_real(const H5O_msg_class_t *type, void *msg_native)
     /* check args */
     HDassert(type);
 
-    if(msg_native) {
+    if (msg_native) {
         H5O_msg_reset_real(type, msg_native);
-        if(NULL != (type->free))
+        if (NULL != (type->free))
             (type->free)(msg_native);
         else
             H5MM_xfree(msg_native);
@@ -727,7 +704,6 @@ H5O_msg_free_real(const H5O_msg_class_t *type, void *msg_native)
     FUNC_LEAVE_NOAPI(NULL)
 } /* end H5O_msg_free_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_copy
  *
@@ -746,26 +722,25 @@ H5O_msg_free_real(const H5O_msg_class_t *type, void *msg_native)
 void *
 H5O_msg_copy(unsigned type_id, const void *mesg, void *dst)
 {
-    const H5O_msg_class_t *type;            /* Actual H5O class type for the ID */
-    void	*ret_value;             /* Return value */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    void *                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* check args */
     HDassert(mesg);
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Call the message class's copy routine */
-    if(NULL == (ret_value = (type->copy)(mesg, dst)))
+    if (NULL == (ret_value = (type->copy)(mesg, dst)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to copy object header message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_count
  *
@@ -784,10 +759,10 @@ done:
 int
 H5O_msg_count(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;           /* Object header to operate on */
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    unsigned msg_count;         /* Message count */
-    int	ret_value;              /* Return value */
+    H5O_t *                oh = NULL; /* Object header to operate on */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    unsigned               msg_count; /* Message count */
+    int                    ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -796,25 +771,24 @@ H5O_msg_count(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
     HDassert(loc->file);
     HDassert(H5F_addr_defined(loc->addr));
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Count the messages of the correct type */
     msg_count = H5O_msg_count_real(oh, type);
     H5_CHECKED_ASSIGN(ret_value, int, msg_count, unsigned);
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_count() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_count_real
  *
@@ -833,8 +807,8 @@ done:
 unsigned
 H5O_msg_count_real(const H5O_t *oh, const H5O_msg_class_t *type)
 {
-    unsigned u;                 /* Local index variable */
-    unsigned ret_value;         /* Return value */
+    unsigned u;         /* Local index variable */
+    unsigned ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -843,14 +817,13 @@ H5O_msg_count_real(const H5O_t *oh, const H5O_msg_class_t *type)
     HDassert(type);
 
     /* Loop over all messages, counting the ones of the type looked for */
-    for(u = ret_value = 0; u < oh->nmesgs; u++)
-	if(oh->mesg[u].type == type)
+    for (u = ret_value = 0; u < oh->nmesgs; u++)
+        if (oh->mesg[u].type == type)
             ret_value++;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_count_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_exists
  *
@@ -872,8 +845,8 @@ H5O_msg_count_real(const H5O_t *oh, const H5O_msg_class_t *type)
 htri_t
 H5O_msg_exists(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
 {
-    H5O_t	*oh = NULL;             /* Object header for location */
-    htri_t      ret_value;              /* Return value */
+    H5O_t *oh = NULL; /* Object header for location */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -882,21 +855,20 @@ H5O_msg_exists(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
     HDassert(type_id < NELMTS(H5O_msg_class_g));
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Call the "real" exists routine */
-    if((ret_value = H5O_msg_exists_oh(oh, type_id)) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_READERROR, FAIL, "unable to verify object header message")
+    if ((ret_value = H5O_msg_exists_oh(oh, type_id)) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_READERROR, FAIL, "unable to verify object header message")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_exists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_exists_oh
  *
@@ -918,27 +890,26 @@ done:
 htri_t
 H5O_msg_exists_oh(const H5O_t *oh, unsigned type_id)
 {
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    unsigned	u;                      /* Local index variable */
-    htri_t      ret_value = FALSE;      /* Return value */
+    const H5O_msg_class_t *type;              /* Actual H5O class type for the ID */
+    unsigned               u;                 /* Local index variable */
+    htri_t                 ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(oh);
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Scan through the messages looking for the right one */
-    for(u = 0; u < oh->nmesgs; u++)
-	if(type == oh->mesg[u].type)
+    for (u = 0; u < oh->nmesgs; u++)
+        if (type == oh->mesg[u].type)
             HGOTO_DONE(TRUE)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_exists_oh() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_remove
  *
@@ -960,12 +931,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj_link,
-    hid_t dxpl_id)
+H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj_link, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
-    const H5O_msg_class_t *type;            /* Actual H5O class type for the ID */
-    herr_t      ret_value;              /* Return value */
+    H5O_t *                oh = NULL; /* Pointer to actual object header */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    herr_t                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -973,27 +943,26 @@ H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj
     HDassert(loc);
     HDassert(loc->file);
     HDassert(H5F_addr_defined(loc->addr));
-    HDassert(H5O_ATTR_ID != type_id);   /* Attributes are modified in another routine */
+    HDassert(H5O_ATTR_ID != type_id); /* Attributes are modified in another routine */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Call the "real" remove routine */
-    if((ret_value = H5O_msg_remove_real(loc->file, oh, type, sequence, NULL, NULL, adj_link, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to remove object header message")
+    if ((ret_value = H5O_msg_remove_real(loc->file, oh, type, sequence, NULL, NULL, adj_link, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to remove object header message")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_remove_op
  *
@@ -1012,12 +981,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence,
-    H5O_operator_t op, void *op_data, hbool_t adj_link, hid_t dxpl_id)
+H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence, H5O_operator_t op, void *op_data,
+                  hbool_t adj_link, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Pointer to actual object header */
-    const H5O_msg_class_t *type;            /* Actual H5O class type for the ID */
-    herr_t      ret_value;              /* Return value */
+    H5O_t *                oh = NULL; /* Pointer to actual object header */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    herr_t                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1025,27 +994,26 @@ H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence,
     HDassert(loc);
     HDassert(loc->file);
     HDassert(H5F_addr_defined(loc->addr));
-    HDassert(H5O_ATTR_ID != type_id);   /* Attributes are modified in another routine */
+    HDassert(H5O_ATTR_ID != type_id); /* Attributes are modified in another routine */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc, dxpl_id)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc, dxpl_id)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Call the "real" remove routine */
-    if((ret_value = H5O_msg_remove_real(loc->file, oh, type, sequence, op, op_data, adj_link, dxpl_id)) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to remove object header message")
+    if ((ret_value = H5O_msg_remove_real(loc->file, oh, type, sequence, op, op_data, adj_link, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to remove object header message")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_remove_op() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_remove_cb
  *
@@ -1062,16 +1030,16 @@ done:
  * Modifications:
  *	Vailin Choi; Sept 2011
  *	Indicate that the object header is modified and might possibly need
- *	to condense messages in the object header 
+ *	to condense messages in the object header
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
-    unsigned *oh_modified, void *_udata/*in,out*/)
+H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence, unsigned *oh_modified,
+                  void *_udata /*in,out*/)
 {
-    H5O_iter_rm_t *udata = (H5O_iter_rm_t *)_udata;   /* Operator user data */
-    htri_t try_remove = FALSE;         /* Whether to try removing a message */
-    herr_t ret_value = H5_ITER_CONT;   /* Return value */
+    H5O_iter_rm_t *udata      = (H5O_iter_rm_t *)_udata; /* Operator user data */
+    htri_t         try_remove = FALSE;                   /* Whether to try removing a message */
+    herr_t         ret_value  = H5_ITER_CONT;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1079,33 +1047,34 @@ H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
     HDassert(mesg);
 
     /* Check for callback routine */
-    if(udata->op) {
+    if (udata->op) {
         /* Call the iterator callback */
-        if((try_remove = (udata->op)(mesg->native, sequence, udata->op_data)) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, H5_ITER_ERROR, "object header message deletion callback failed")
+        if ((try_remove = (udata->op)(mesg->native, sequence, udata->op_data)) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, H5_ITER_ERROR,
+                        "object header message deletion callback failed")
     } /* end if */
     else {
         /* If there's no callback routine, does the sequence # match? */
-        if((int)sequence == udata->sequence || H5O_ALL == udata->sequence)
+        if ((int)sequence == udata->sequence || H5O_ALL == udata->sequence)
             try_remove = TRUE;
     } /* end else */
 
     /* Try removing the message, if indicated */
-    if(try_remove) {
+    if (try_remove) {
         /*
          * Keep track of how many times we failed trying to remove constant
          * messages.
          * (OK to remove constant messages - QAK)
          */
         /* Convert message into a null message */
-        if(H5O_release_mesg(udata->f, udata->dxpl_id, oh, mesg, udata->adj_link) < 0)
+        if (H5O_release_mesg(udata->f, udata->dxpl_id, oh, mesg, udata->adj_link) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, H5_ITER_ERROR, "unable to release message")
 
         /* Indicate that the object header was modified & might need to condense messages in object header */
         *oh_modified = H5O_MODIFY_CONDENSE;
 
         /* Break out now, if we've found the correct message */
-        if(udata->sequence == H5O_FIRST || udata->sequence != H5O_ALL)
+        if (udata->sequence == H5O_FIRST || udata->sequence != H5O_ALL)
             HGOTO_DONE(H5_ITER_STOP)
     } /* end if */
 
@@ -1113,7 +1082,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_remove_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_remove_real
  *
@@ -1132,13 +1100,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_remove_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type,
-    int sequence, H5O_operator_t app_op, void *op_data, hbool_t adj_link,
-    hid_t dxpl_id)
+H5O_msg_remove_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type, int sequence, H5O_operator_t app_op,
+                    void *op_data, hbool_t adj_link, hid_t dxpl_id)
 {
-    H5O_iter_rm_t udata;                /* User data for iterator */
-    H5O_mesg_operator_t op;             /* Wrapper for operator */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_iter_rm_t       udata;               /* User data for iterator */
+    H5O_mesg_operator_t op;                  /* Wrapper for operator */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1148,33 +1115,32 @@ H5O_msg_remove_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type,
     HDassert(type);
 
     /* Make certain we are allowed to modify the file */
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "no write intent on file")
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Set up iterator operator data */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
+    udata.f        = f;
+    udata.dxpl_id  = dxpl_id;
     udata.sequence = sequence;
-    udata.nfailed = 0;
-    udata.op = app_op;
-    udata.op_data = op_data;
+    udata.nfailed  = 0;
+    udata.op       = app_op;
+    udata.op_data  = op_data;
     udata.adj_link = adj_link;
 
     /* Iterate over the messages, deleting appropriate one(s) */
-    op.op_type = H5O_MESG_OP_LIB;
+    op.op_type  = H5O_MESG_OP_LIB;
     op.u.lib_op = H5O_msg_remove_cb;
-    if(H5O_msg_iterate_real(f, oh, type, &op, &udata, dxpl_id) < 0)
+    if (H5O_msg_iterate_real(f, oh, type, &op, &udata, dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "error iterating over messages")
 
     /* Fail if we tried to remove any constant messages */
-    if(udata.nfailed)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to remove constant message(s)")
+    if (udata.nfailed)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to remove constant message(s)")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_remove_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_iterate
  *
@@ -1207,12 +1173,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id,
-    const H5O_mesg_operator_t *op, void *op_data, hid_t dxpl_id)
+H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id, const H5O_mesg_operator_t *op, void *op_data,
+                hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;               /* Pointer to actual object header */
-    const H5O_msg_class_t *type;    /* Actual H5O class type for the ID */
-    herr_t ret_value;               /* Return value */
+    H5O_t *                oh = NULL; /* Pointer to actual object header */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    herr_t                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1221,26 +1187,25 @@ H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id,
     HDassert(loc->file);
     HDassert(H5F_addr_defined(loc->addr));
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(op);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Call the "real" iterate routine */
-    if((ret_value = H5O_msg_iterate_real(loc->file, oh, type, op, op_data, dxpl_id)) < 0)
+    if ((ret_value = H5O_msg_iterate_real(loc->file, oh, type, op, op_data, dxpl_id)) < 0)
         HERROR(H5E_OHDR, H5E_BADITER, "unable to iterate over object header messages");
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_iterate_real
  *
@@ -1279,14 +1244,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_iterate_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type,
-    const H5O_mesg_operator_t *op, void *op_data, hid_t dxpl_id)
+H5O_msg_iterate_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type, const H5O_mesg_operator_t *op,
+                     void *op_data, hid_t dxpl_id)
 {
-    H5O_mesg_t         *idx_msg;        /* Pointer to current message */
-    unsigned		idx;            /* Absolute index of current message in all messages */
-    unsigned		sequence;       /* Relative index of current message for messages of type */
-    unsigned		oh_modified = 0;    /* Whether the callback modified the object header */
-    herr_t              ret_value = H5_ITER_CONT;      /* Return value */
+    H5O_mesg_t *idx_msg;                    /* Pointer to current message */
+    unsigned    idx;                        /* Absolute index of current message in all messages */
+    unsigned    sequence;                   /* Relative index of current message for messages of type */
+    unsigned    oh_modified = 0;            /* Whether the callback modified the object header */
+    herr_t      ret_value   = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1298,56 +1263,55 @@ H5O_msg_iterate_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type,
     HDassert(op->u.app_op);
 
     /* Iterate over messages */
-    for(sequence = 0, idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs && !ret_value; idx++, idx_msg++) {
-	if(type == idx_msg->type) {
+    for (sequence = 0, idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs && !ret_value; idx++, idx_msg++) {
+        if (type == idx_msg->type) {
             /* Decode the message if necessary.  */
             H5O_LOAD_NATIVE(f, dxpl_id, 0, oh, idx_msg, FAIL)
 
             /* Check for making an "internal" (i.e. within the H5O package) callback */
-            if(op->op_type == H5O_MESG_OP_LIB)
+            if (op->op_type == H5O_MESG_OP_LIB)
                 ret_value = (op->u.lib_op)(oh, idx_msg, sequence, &oh_modified, op_data);
             else
                 ret_value = (op->u.app_op)(idx_msg->native, sequence, op_data);
 
             /* Check for iterator callback indicating to get out of loop */
-            if(ret_value != 0)
+            if (ret_value != 0)
                 break;
 
             /* Increment sequence value for message type */
             sequence++;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Check for error from iterator */
-    if(ret_value < 0)
+    if (ret_value < 0)
         HERROR(H5E_OHDR, H5E_CANTLIST, "iterator function failed");
 
 done:
     /* Check if object message was modified */
-    if(oh_modified) {
+    if (oh_modified) {
         /* Try to condense object header info if the flag indicates so */
         /* (Since this routine is used to remove messages from an
          *  object header, the header will be condensed after each
          *  message removal)
          */
-	if(oh_modified & H5O_MODIFY_CONDENSE) {
-	    if(H5O_condense_header(f, oh, dxpl_id) < 0)
-		HDONE_ERROR(H5E_OHDR, H5E_CANTPACK, FAIL, "can't pack object header")
-	}
+        if (oh_modified & H5O_MODIFY_CONDENSE) {
+            if (H5O_condense_header(f, oh, dxpl_id) < 0)
+                HDONE_ERROR(H5E_OHDR, H5E_CANTPACK, FAIL, "can't pack object header")
+        }
 
         /* Mark object header as changed */
-        if(H5O_touch_oh(f, dxpl_id, oh, FALSE) < 0)
+        if (H5O_touch_oh(f, dxpl_id, oh, FALSE) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTUPDATE, FAIL, "unable to update time on object")
 
         /* Mark object header as dirty in cache */
-        if(H5AC_mark_entry_dirty(oh) < 0)
+        if (H5AC_mark_entry_dirty(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_iterate_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_raw_size
  *
@@ -1363,31 +1327,29 @@ done:
  *-------------------------------------------------------------------------
  */
 size_t
-H5O_msg_raw_size(const H5F_t *f, unsigned type_id, hbool_t disable_shared,
-    const void *mesg)
+H5O_msg_raw_size(const H5F_t *f, unsigned type_id, hbool_t disable_shared, const void *mesg)
 {
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    size_t ret_value;                   /* Return value */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    size_t                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(0)
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(type->raw_size);
     HDassert(f);
     HDassert(mesg);
 
     /* Compute the raw data size for the mesg */
-    if(0 == (ret_value = (type->raw_size)(f, disable_shared, mesg)))
+    if (0 == (ret_value = (type->raw_size)(f, disable_shared, mesg)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, 0, "unable to determine size of message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_raw_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_size_f
  *
@@ -1406,35 +1368,33 @@ done:
  *-------------------------------------------------------------------------
  */
 size_t
-H5O_msg_size_f(const H5F_t *f, hid_t ocpl_id, unsigned type_id,
-    const void *mesg, size_t extra_raw)
+H5O_msg_size_f(const H5F_t *f, hid_t ocpl_id, unsigned type_id, const void *mesg, size_t extra_raw)
 {
-    const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
-    H5P_genplist_t *ocpl;       /* Object Creation Property list */
-    uint8_t oh_flags;           /* Object header status flags */
-    size_t ret_value;           /* Return value */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    H5P_genplist_t *       ocpl;      /* Object Creation Property list */
+    uint8_t                oh_flags;  /* Object header status flags */
+    size_t                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(0)
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(type->raw_size);
     HDassert(f);
     HDassert(mesg);
 
     /* Get the property list */
-    if(NULL == (ocpl = (H5P_genplist_t *)H5I_object(ocpl_id)))
+    if (NULL == (ocpl = (H5P_genplist_t *)H5I_object(ocpl_id)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, 0, "not a property list")
 
     /* Get any object header status flags set by properties */
-    if(H5P_get(ocpl, H5O_CRT_OHDR_FLAGS_NAME, &oh_flags) < 0)
+    if (H5P_get(ocpl, H5O_CRT_OHDR_FLAGS_NAME, &oh_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, 0, "can't get object header flags")
 
-
     /* Compute the raw data size for the mesg */
-    if((ret_value = (type->raw_size)(f, FALSE, mesg)) == 0)
+    if ((ret_value = (type->raw_size)(f, FALSE, mesg)) == 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, 0, "unable to determine size of message")
 
     /* Add in "extra" raw space */
@@ -1444,14 +1404,13 @@ H5O_msg_size_f(const H5F_t *f, hid_t ocpl_id, unsigned type_id,
     ret_value = (size_t)H5O_ALIGN_F(f, ret_value);
 
     /* Add space for message header */
-    ret_value += (size_t)H5O_SIZEOF_MSGHDR_F(f,
-            (H5F_STORE_MSG_CRT_IDX(f) || oh_flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED));
+    ret_value += (size_t)H5O_SIZEOF_MSGHDR_F(
+        f, (H5F_STORE_MSG_CRT_IDX(f) || oh_flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_size_f() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_size_oh
  *
@@ -1470,24 +1429,23 @@ done:
  *-------------------------------------------------------------------------
  */
 size_t
-H5O_msg_size_oh(const H5F_t *f, const H5O_t *oh, unsigned type_id,
-    const void *mesg, size_t extra_raw)
+H5O_msg_size_oh(const H5F_t *f, const H5O_t *oh, unsigned type_id, const void *mesg, size_t extra_raw)
 {
-    const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
-    size_t ret_value;           /* Return value */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    size_t                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(0)
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(type->raw_size);
     HDassert(f);
     HDassert(mesg);
 
     /* Compute the raw data size for the mesg */
-    if((ret_value = (type->raw_size)(f, FALSE, mesg)) == 0)
+    if ((ret_value = (type->raw_size)(f, FALSE, mesg)) == 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, 0, "unable to determine size of message")
 
     /* Add in "extra" raw space */
@@ -1503,7 +1461,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_size_oh() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_msg_can_share
  *
@@ -1524,19 +1481,19 @@ done:
 htri_t
 H5O_msg_can_share(unsigned type_id, const void *mesg)
 {
-    const H5O_msg_class_t *type;    /* Actual H5O class type for the ID */
-    htri_t ret_value;
+    const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
+    htri_t                 ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(mesg);
 
     /* If there is a can_share callback, use it */
-    if(type->can_share)
+    if (type->can_share)
         ret_value = (type->can_share)(mesg);
     else {
         /* Otherwise, the message can be shared if messages of this type are
@@ -1553,7 +1510,6 @@ H5O_msg_can_share(unsigned type_id, const void *mesg)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_can_share() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_msg_can_share_in_ohdr
  *
@@ -1571,14 +1527,14 @@ H5O_msg_can_share(unsigned type_id, const void *mesg)
 htri_t
 H5O_msg_can_share_in_ohdr(unsigned type_id)
 {
-    const H5O_msg_class_t *type;    /* Actual H5O class type for the ID */
-    htri_t ret_value;
+    const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
+    htri_t                 ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Otherwise, the message can be shared if messages of this type are
@@ -1590,7 +1546,6 @@ H5O_msg_can_share_in_ohdr(unsigned type_id)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_can_share_in_ohdr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_msg_is_shared
  *
@@ -1609,25 +1564,25 @@ H5O_msg_can_share_in_ohdr(unsigned type_id)
 htri_t
 H5O_msg_is_shared(unsigned type_id, const void *mesg)
 {
-    const H5O_msg_class_t *type;    /* Actual H5O class type for the ID */
-    htri_t ret_value;
+    const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
+    htri_t                 ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
 #ifdef H5O_ENABLE_BOGUS
-    if(type_id >= NELMTS(H5O_msg_class_g))
+    if (type_id >= NELMTS(H5O_msg_class_g))
         ret_value = FALSE;
     else
 #endif /* H5O_ENABLE_BOGUS */
     {
         HDassert(type_id < NELMTS(H5O_msg_class_g));
-        type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+        type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
         HDassert(type);
         HDassert(mesg);
 
         /* If messages in a class aren't sharable, then obviously this message isn't shared! :-) */
-        if(type->share_flags & H5O_SHARE_IS_SHARABLE)
+        if (type->share_flags & H5O_SHARE_IS_SHARABLE)
             ret_value = H5O_IS_STORED_SHARED(((const H5O_shared_t *)mesg)->type);
         else
             ret_value = FALSE;
@@ -1636,7 +1591,6 @@ H5O_msg_is_shared(unsigned type_id, const void *mesg)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_is_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_set_share
  *
@@ -1654,14 +1608,14 @@ H5O_msg_is_shared(unsigned type_id, const void *mesg)
 herr_t
 H5O_msg_set_share(unsigned type_id, const H5O_shared_t *share, void *mesg)
 {
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_msg_class_t *type;                /* Actual H5O class type for the ID */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(type->share_flags & H5O_SHARE_IS_SHARABLE);
     HDassert(mesg);
@@ -1671,15 +1625,15 @@ H5O_msg_set_share(unsigned type_id, const H5O_shared_t *share, void *mesg)
     /* If there's a special action for this class that needs to be performed
      *  when setting the shared component, do that
      */
-    if(type->set_share) {
-        if((type->set_share)(mesg, share) < 0)
+    if (type->set_share) {
+        if ((type->set_share)(mesg, share) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "unable to set shared message information")
     } /* end if */
     else {
         /* Set this message as the shared component for the message, wiping out
          * any information that was there before
          */
-        if(H5O_set_shared((H5O_shared_t *)mesg, share) < 0)
+        if (H5O_set_shared((H5O_shared_t *)mesg, share) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "unable to set shared message information")
     } /* end else */
 
@@ -1687,7 +1641,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_set_share() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_reset_share
  *
@@ -1705,13 +1658,13 @@ done:
 herr_t
 H5O_msg_reset_share(unsigned type_id, void *mesg)
 {
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
+    const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(type->share_flags & H5O_SHARE_IS_SHARABLE);
     HDassert(mesg);
@@ -1722,7 +1675,6 @@ H5O_msg_reset_share(unsigned type_id, void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_msg_reset_share() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_msg_get_crt_index
  *
@@ -1739,22 +1691,22 @@ H5O_msg_reset_share(unsigned type_id, void *mesg)
 herr_t
 H5O_msg_get_crt_index(unsigned type_id, const void *mesg, H5O_msg_crt_idx_t *crt_idx)
 {
-    const H5O_msg_class_t *type;    /* Actual H5O class type for the ID */
-    herr_t ret_value = SUCCEED;
+    const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
+    herr_t                 ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(mesg);
     HDassert(crt_idx);
 
     /* If there is a "get_crt_index callback, use it */
-    if(type->get_crt_index) {
+    if (type->get_crt_index) {
         /* Retrieve the creation index from the native message */
-        if((type->get_crt_index)(mesg, crt_idx) < 0)
+        if ((type->get_crt_index)(mesg, crt_idx) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to retrieve creation index")
     } /* end if */
     else
@@ -1764,7 +1716,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_get_crt_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_encode
  *
@@ -1782,29 +1733,27 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared,
-    unsigned char *buf, const void *mesg)
+H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared, unsigned char *buf, const void *mesg)
 {
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_msg_class_t *type;                /* Actual H5O class type for the ID */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* check args */
     HDassert(f);
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Encode */
-    if((type->encode)(f, disable_shared, buf, mesg) < 0)
+    if ((type->encode)(f, disable_shared, buf, mesg) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_decode
  *
@@ -1827,30 +1776,29 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5O_msg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id,
-    size_t buf_size, const unsigned char *buf)
+H5O_msg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, size_t buf_size,
+               const unsigned char *buf)
 {
-    const H5O_msg_class_t   *type;      /* Actual H5O class type for the ID */
-    void *ret_value;                    /* Return value */
-    unsigned ioflags = 0;               /* Flags for decode routine */
+    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
+    void *                 ret_value;   /* Return value */
+    unsigned               ioflags = 0; /* Flags for decode routine */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* check args */
     HDassert(f);
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* decode */
-    if((ret_value = (type->decode)(f, dxpl_id, open_oh, 0, &ioflags, buf_size, buf)) == NULL)
+    if ((ret_value = (type->decode)(f, dxpl_id, open_oh, 0, &ioflags, buf_size, buf)) == NULL)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, NULL, "unable to decode message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_msg_copy_file
  *
@@ -1870,11 +1818,11 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5O_msg_copy_file(const H5O_msg_class_t *type, H5F_t *file_src,
-    void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
-    unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id)
+H5O_msg_copy_file(const H5O_msg_class_t *type, H5F_t *file_src, void *native_src, H5F_t *file_dst,
+                  hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata,
+                  hid_t dxpl_id)
 {
-    void        *ret_value;
+    void *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1890,14 +1838,14 @@ H5O_msg_copy_file(const H5O_msg_class_t *type, H5F_t *file_src,
     /* The copy_file callback will return an H5O_shared_t only if the message
      * to be copied is a committed datatype.
      */
-    if(NULL == (ret_value = (type->copy_file)(file_src, native_src, file_dst, recompute_size, mesg_flags, cpy_info, udata, dxpl_id)))
+    if (NULL == (ret_value = (type->copy_file)(file_src, native_src, file_dst, recompute_size, mesg_flags,
+                                               cpy_info, udata, dxpl_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy object header message to file")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_alloc
  *
@@ -1912,8 +1860,8 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
-    unsigned *mesg_flags, void *native, size_t *mesg_idx)
+H5O_msg_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, unsigned *mesg_flags,
+              void *native, size_t *mesg_idx)
 {
     size_t new_idx;             /* New index for message */
     htri_t shared_mesg;         /* Should this message be stored in the Shared Message table? */
@@ -1931,28 +1879,28 @@ H5O_msg_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
     HDassert(mesg_idx);
 
     /* Check if message is already shared */
-    if((shared_mesg = H5O_msg_is_shared(type->id, native)) < 0)
+    if ((shared_mesg = H5O_msg_is_shared(type->id, native)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "error determining if message is shared")
-    else if(shared_mesg > 0) {
+    else if (shared_mesg > 0) {
         /* Increment message's reference count */
-        if(type->link && (type->link)(f, dxpl_id, oh, native) < 0)
+        if (type->link && (type->link)(f, dxpl_id, oh, native) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared message ref count")
         *mesg_flags |= H5O_MSG_FLAG_SHARED;
     } /* end if */
     else {
         /* Attempt to share message */
-        if(H5SM_try_share(f, dxpl_id, oh, 0, type->id, native, mesg_flags) < 0)
+        if (H5SM_try_share(f, dxpl_id, oh, 0, type->id, native, mesg_flags) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "error determining if message should be shared")
     } /* end else */
 
     /* Allocate space in the object header for the message */
-    if(H5O_alloc(f, dxpl_id, oh, type, native, &new_idx) < 0)
+    if (H5O_alloc(f, dxpl_id, oh, type, native, &new_idx) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to allocate space for message")
 
     /* Get the message's "creation index", if it has one */
-    if(type->get_crt_index) {
+    if (type->get_crt_index) {
         /* Retrieve the creation index from the native message */
-        if((type->get_crt_index)(native, &oh->mesg[new_idx].crt_idx) < 0)
+        if ((type->get_crt_index)(native, &oh->mesg[new_idx].crt_idx) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to retrieve creation index")
     } /* end if */
 
@@ -1963,7 +1911,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_copy_mesg
  *
@@ -1978,14 +1925,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t idx,
-    const H5O_msg_class_t *type, const void *mesg, unsigned mesg_flags,
-    unsigned update_flags)
+H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t idx, const H5O_msg_class_t *type, const void *mesg,
+              unsigned mesg_flags, unsigned update_flags)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    H5O_mesg_t *idx_msg = &oh->mesg[idx];       /* Pointer to message to modify */
-    hbool_t chk_dirtied = FALSE;                /* Flag for unprotecting chunk */
-    herr_t      ret_value = SUCCEED;            /* Return value */
+    H5O_chunk_proxy_t *chk_proxy   = NULL;           /* Chunk that message is in */
+    H5O_mesg_t *       idx_msg     = &oh->mesg[idx]; /* Pointer to message to modify */
+    hbool_t            chk_dirtied = FALSE;          /* Flag for unprotecting chunk */
+    herr_t             ret_value   = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1997,14 +1943,14 @@ H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t idx,
     HDassert(mesg);
 
     /* Protect chunk */
-    if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, idx_msg->chunkno)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header chunk")
+    if (NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, idx_msg->chunkno)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header chunk")
 
     /* Reset existing native information for the header's message */
     H5O_msg_reset_real(type, idx_msg->native);
 
     /* Copy the native object for the message */
-    if(NULL == (idx_msg->native = (type->copy)(mesg, idx_msg->native)))
+    if (NULL == (idx_msg->native = (type->copy)(mesg, idx_msg->native)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to copy message to object header")
 
     /* Update the message flags */
@@ -2012,27 +1958,26 @@ H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t idx,
 
     /* Mark the message as modified */
     idx_msg->dirty = TRUE;
-    chk_dirtied = TRUE;
+    chk_dirtied    = TRUE;
 
     /* Release chunk */
-    if(H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
     chk_proxy = NULL;
 
     /* Update the modification time, if requested */
-    if(update_flags & H5O_UPDATE_TIME)
-        if(H5O_touch_oh(f, dxpl_id, oh, FALSE) < 0)
+    if (update_flags & H5O_UPDATE_TIME)
+        if (H5O_touch_oh(f, dxpl_id, oh, FALSE) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUPDATE, FAIL, "unable to update time on object")
 
 done:
     /* Release chunk, if not already released */
-    if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_copy_mesg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_msg_delete
  *
@@ -2056,29 +2001,27 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id,
-    void *mesg)
+H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, void *mesg)
 {
-    const H5O_msg_class_t   *type;      /* Actual H5O class type for the ID */
-    herr_t ret_value = SUCCEED;                    /* Return value */
+    const H5O_msg_class_t *type;                /* Actual H5O class type for the ID */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* check args */
     HDassert(f);
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* delete */
-    if((type->del) && (type->del)(f, dxpl_id, open_oh, mesg) < 0)
+    if ((type->del) && (type->del)(f, dxpl_id, open_oh, mesg) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete file space for object header message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_delete_mesg
  *
@@ -2097,8 +2040,8 @@ done:
 herr_t
 H5O_delete_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg)
 {
-    const H5O_msg_class_t *type = mesg->type;  /* Type of object to free */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    const H5O_msg_class_t *type      = mesg->type; /* Type of object to free */
+    herr_t                 ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2108,19 +2051,19 @@ H5O_delete_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg)
     HDassert(oh);
 
     /* Check if there is a file space deletion callback for this type of message */
-    if(type->del) {
+    if (type->del) {
         /* Decode the message if necessary. */
         H5O_LOAD_NATIVE(f, dxpl_id, H5O_DECODEIO_NOCHANGE, oh, mesg, FAIL)
 
-        if((type->del)(f, dxpl_id, oh, mesg->native) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete file space for object header message")
+        if ((type->del)(f, dxpl_id, oh, mesg->native) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL,
+                        "unable to delete file space for object header message")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_delete_mesg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_flush
  *
@@ -2137,9 +2080,9 @@ done:
 herr_t
 H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg)
 {
-    uint8_t	*p;             /* Temporary pointer to encode with */
-    unsigned    msg_id;         /* ID for message */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    uint8_t *p;                   /* Temporary pointer to encode with */
+    unsigned msg_id;              /* ID for message */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2151,13 +2094,13 @@ H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg)
     p = mesg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
 
     /* Retrieve actual message ID, for unknown messages */
-    if(mesg->type == H5O_MSG_UNKNOWN)
+    if (mesg->type == H5O_MSG_UNKNOWN)
         msg_id = *(H5O_unknown_t *)(mesg->native);
     else
         msg_id = (uint8_t)mesg->type->id;
 
     /* Encode the message prefix */
-    if(oh->version == H5O_VERSION_1)
+    if (oh->version == H5O_VERSION_1)
         UINT16ENCODE(p, msg_id)
     else
         *p++ = (uint8_t)msg_id;
@@ -2166,22 +2109,22 @@ H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg)
     *p++ = mesg->flags;
 
     /* Only encode reserved bytes for version 1 of format */
-    if(oh->version == H5O_VERSION_1) {
+    if (oh->version == H5O_VERSION_1) {
         *p++ = 0; /*reserved*/
         *p++ = 0; /*reserved*/
         *p++ = 0; /*reserved*/
-    } /* end for */
+    }             /* end for */
     /* Only encode creation index for version 2+ of format */
     else {
         /* Only encode creation index if they are being tracked */
-        if(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)
+        if (oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)
             UINT16ENCODE(p, mesg->crt_idx);
     } /* end else */
     HDassert(p == mesg->raw);
 
 #ifndef NDEBUG
     /* Make certain that null messages aren't in chunks w/gaps */
-    if(H5O_NULL_ID == msg_id)
+    if (H5O_NULL_ID == msg_id)
         HDassert(oh->chunk[mesg->chunkno].gap == 0);
     else
         /* Non-null messages should always have a native pointer */
@@ -2189,7 +2132,7 @@ H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg)
 #endif /* NDEBUG */
 
     /* Encode the message itself, if it's not an "unknown" message */
-    if(mesg->native && mesg->type != H5O_MSG_UNKNOWN) {
+    if (mesg->native && mesg->type != H5O_MSG_UNKNOWN) {
         /*
          * Encode the message.  If the message is shared then we
          * encode a Shared Object message instead of the object
@@ -2198,19 +2141,19 @@ H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg)
         HDassert(mesg->raw >= oh->chunk[mesg->chunkno].image);
         HDassert(mesg->raw_size == H5O_ALIGN_OH(oh, mesg->raw_size));
         HDassert(mesg->raw + mesg->raw_size <=
-               oh->chunk[mesg->chunkno].image + (oh->chunk[mesg->chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh)));
+                 oh->chunk[mesg->chunkno].image + (oh->chunk[mesg->chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh)));
 #ifndef NDEBUG
-/* Sanity check that the message won't overwrite past it's allocated space */
-{
-    size_t msg_size;
-
-    msg_size = mesg->type->raw_size(f, FALSE, mesg->native);
-    msg_size = H5O_ALIGN_OH(oh, msg_size);
-    HDassert(msg_size <= mesg->raw_size);
-}
+        /* Sanity check that the message won't overwrite past it's allocated space */
+        {
+            size_t msg_size;
+
+            msg_size = mesg->type->raw_size(f, FALSE, mesg->native);
+            msg_size = H5O_ALIGN_OH(oh, msg_size);
+            HDassert(msg_size <= mesg->raw_size);
+        }
 #endif /* NDEBUG */
         HDassert(mesg->type->encode);
-        if((mesg->type->encode)(f, FALSE, mesg->raw, mesg->native) < 0)
+        if ((mesg->type->encode)(f, FALSE, mesg->raw, mesg->native) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode object header message")
     } /* end if */
 
@@ -2221,7 +2164,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_flush_msgs
  *
@@ -2238,9 +2180,9 @@ done:
 herr_t
 H5O_flush_msgs(H5F_t *f, H5O_t *oh)
 {
-    H5O_mesg_t *curr_msg;       /* Pointer to current message being operated on */
-    unsigned	u;              /* Local index variable */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5O_mesg_t *curr_msg;            /* Pointer to current message being operated on */
+    unsigned    u;                   /* Local index variable */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2249,26 +2191,25 @@ H5O_flush_msgs(H5F_t *f, H5O_t *oh)
     HDassert(oh);
 
     /* Encode any dirty messages */
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++)
-        if(curr_msg->dirty)
-            if(H5O_msg_flush(f, oh, curr_msg) < 0)
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++)
+        if (curr_msg->dirty)
+            if (H5O_msg_flush(f, oh, curr_msg) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode object header message")
 
     /* Sanity check for the correct # of messages in object header */
-    if(oh->nmesgs != u)
+    if (oh->nmesgs != u)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "corrupt object header - too few messages")
 
 #ifndef NDEBUG
-        /* Reset the number of messages dirtied by decoding, as they have all
-         * been flushed */
-        oh->ndecode_dirtied = 0;
+    /* Reset the number of messages dirtied by decoding, as they have all
+     * been flushed */
+    oh->ndecode_dirtied = 0;
 #endif /* NDEBUG */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_flush_msgs() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_chunkno
  *
@@ -2287,11 +2228,11 @@ done:
 int
 H5O_msg_get_chunkno(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Object header to use */
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    H5O_mesg_t *idx_msg;                /* Pointer to message to modify */
-    unsigned idx;                       /* Index of message to modify */
-    int ret_value;                      /* Return value */
+    H5O_t *                oh = NULL; /* Object header to use */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    H5O_mesg_t *           idx_msg;   /* Pointer to message to modify */
+    unsigned               idx;       /* Index of message to modify */
+    int                    ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2300,31 +2241,30 @@ H5O_msg_get_chunkno(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
     HDassert(loc->file);
     HDassert(H5F_addr_defined(loc->addr));
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Locate message of correct type */
-    for(idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
-	if(type == idx_msg->type)
+    for (idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
+        if (type == idx_msg->type)
             break;
-    if(idx == oh->nmesgs)
+    if (idx == oh->nmesgs)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "message type not found")
 
     /* Set return value */
     H5_CHECKED_ASSIGN(ret_value, int, idx_msg->chunkno, unsigned);
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_get_chunkno() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_lock
  *
@@ -2342,11 +2282,11 @@ done:
 herr_t
 H5O_msg_lock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Object header to use */
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    H5O_mesg_t *idx_msg;                /* Pointer to message to modify */
-    unsigned idx;                       /* Index of message to modify */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *                oh = NULL;           /* Object header to use */
+    const H5O_msg_class_t *type;                /* Actual H5O class type for the ID */
+    H5O_mesg_t *           idx_msg;             /* Pointer to message to modify */
+    unsigned               idx;                 /* Index of message to modify */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2355,35 +2295,34 @@ H5O_msg_lock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
     HDassert(loc->file);
     HDassert(H5F_addr_defined(loc->addr));
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Locate message of correct type */
-    for(idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
-	if(type == idx_msg->type)
+    for (idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
+        if (type == idx_msg->type)
             break;
-    if(idx == oh->nmesgs)
+    if (idx == oh->nmesgs)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "message type not found")
 
     /* Fail if the message is already locked */
-    if(idx_msg->locked)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTLOCK, FAIL, "message already locked")
+    if (idx_msg->locked)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTLOCK, FAIL, "message already locked")
 
     /* Make the message locked */
     idx_msg->locked = TRUE;
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_lock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_msg_unlock
  *
@@ -2400,11 +2339,11 @@ done:
 herr_t
 H5O_msg_unlock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;                   /* Object header to use */
-    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
-    H5O_mesg_t *idx_msg;                /* Pointer to message to modify */
-    unsigned idx;                       /* Index of message to modify */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *                oh = NULL;           /* Object header to use */
+    const H5O_msg_class_t *type;                /* Actual H5O class type for the ID */
+    H5O_mesg_t *           idx_msg;             /* Pointer to message to modify */
+    unsigned               idx;                 /* Index of message to modify */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2413,31 +2352,30 @@ H5O_msg_unlock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
     HDassert(loc->file);
     HDassert(H5F_addr_defined(loc->addr));
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Locate message of correct type */
-    for(idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
-	if(type == idx_msg->type)
+    for (idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
+        if (type == idx_msg->type)
             break;
-    if(idx == oh->nmesgs)
+    if (idx == oh->nmesgs)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "message type not found")
 
     /* Fail if the message is not locked */
-    if(!idx_msg->locked)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTUNLOCK, FAIL, "message not locked")
+    if (!idx_msg->locked)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTUNLOCK, FAIL, "message not locked")
 
     /* Make the message unlocked */
     idx_msg->locked = FALSE;
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_msg_unlock() */
-
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index b244267..1a8b610 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -17,81 +17,80 @@
  * Purpose:	The object modification time message.
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
 
-
-static void *H5O_mtime_new_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_mtime_new_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                   unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_mtime_new_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
 static size_t H5O_mtime_new_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 
-static void *H5O_mtime_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void *H5O_mtime_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_mtime_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_mtime_copy(const void *_mesg, void *_dest);
+static void * H5O_mtime_copy(const void *_mesg, void *_dest);
 static size_t H5O_mtime_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_mtime_reset(void *_mesg);
 static herr_t H5O_mtime_free(void *_mesg);
-static herr_t H5O_mtime_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
-			     int indent, int fwidth);
+static herr_t H5O_mtime_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                              int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_MTIME[1] = {{
-    H5O_MTIME_ID,		/*message id number		*/
-    "mtime",			/*message name for debugging	*/
-    sizeof(time_t),		/*native message size		*/
-    0,				/* messages are sharable?       */
-    H5O_mtime_decode,		/*decode message		*/
-    H5O_mtime_encode,		/*encode message		*/
-    H5O_mtime_copy,		/*copy the native value		*/
-    H5O_mtime_size,		/*raw message size		*/
-    H5O_mtime_reset,		/* reset method			*/
-    H5O_mtime_free,		/* free method			*/
-    NULL,		        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    NULL,			/* copy native value to file    */
-    NULL,			/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_mtime_debug		/*debug the message		*/
+    H5O_MTIME_ID,     /*message id number		*/
+    "mtime",          /*message name for debugging	*/
+    sizeof(time_t),   /*native message size		*/
+    0,                /* messages are sharable?       */
+    H5O_mtime_decode, /*decode message		*/
+    H5O_mtime_encode, /*encode message		*/
+    H5O_mtime_copy,   /*copy the native value		*/
+    H5O_mtime_size,   /*raw message size		*/
+    H5O_mtime_reset,  /* reset method			*/
+    H5O_mtime_free,   /* free method			*/
+    NULL,             /* file delete method		*/
+    NULL,             /* link method			*/
+    NULL,             /*set share method		*/
+    NULL,             /*can share method		*/
+    NULL,             /* pre copy native value to file */
+    NULL,             /* copy native value to file    */
+    NULL,             /* post copy native value to file    */
+    NULL,             /* get creation index		*/
+    NULL,             /* set creation index		*/
+    H5O_mtime_debug   /*debug the message		*/
 }};
 
 /* This message derives from H5O message class */
 /* (Only encode, decode & size routines are different from old mtime routines) */
 const H5O_msg_class_t H5O_MSG_MTIME_NEW[1] = {{
-    H5O_MTIME_NEW_ID,		/*message id number		*/
-    "mtime_new",		/*message name for debugging	*/
-    sizeof(time_t),		/*native message size		*/
-    0,				/* messages are sharable?       */
-    H5O_mtime_new_decode,	/*decode message		*/
-    H5O_mtime_new_encode,	/*encode message		*/
-    H5O_mtime_copy,		/*copy the native value		*/
-    H5O_mtime_new_size,		/*raw message size		*/
-    H5O_mtime_reset,		/* reset method			*/
-    H5O_mtime_free,		/* free method			*/
-    NULL,		        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    NULL,			/* copy native value to file    */
-    NULL,			/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_mtime_debug		/*debug the message		*/
+    H5O_MTIME_NEW_ID,     /*message id number		*/
+    "mtime_new",          /*message name for debugging	*/
+    sizeof(time_t),       /*native message size		*/
+    0,                    /* messages are sharable?       */
+    H5O_mtime_new_decode, /*decode message		*/
+    H5O_mtime_new_encode, /*encode message		*/
+    H5O_mtime_copy,       /*copy the native value		*/
+    H5O_mtime_new_size,   /*raw message size		*/
+    H5O_mtime_reset,      /* reset method			*/
+    H5O_mtime_free,       /* free method			*/
+    NULL,                 /* file delete method		*/
+    NULL,                 /* link method			*/
+    NULL,                 /*set share method		*/
+    NULL,                 /*can share method		*/
+    NULL,                 /* pre copy native value to file */
+    NULL,                 /* copy native value to file    */
+    NULL,                 /* post copy native value to file    */
+    NULL,                 /* get creation index		*/
+    NULL,                 /* set creation index		*/
+    H5O_mtime_debug       /*debug the message		*/
 }};
 
 /* Current version of new mtime information */
-#define H5O_MTIME_VERSION 	1
+#define H5O_MTIME_VERSION 1
 
 /* Track whether tzset routine was called */
 static hbool_t ntzset = FALSE;
@@ -99,7 +98,6 @@ static hbool_t ntzset = FALSE;
 /* Declare a free list to manage the time_t struct */
 H5FL_DEFINE(time_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_new_decode
  *
@@ -118,12 +116,12 @@ H5FL_DEFINE(time_t);
  */
 static void *
 H5O_mtime_new_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                     unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                     size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    time_t	*mesg;
-    uint32_t    tmp_time;               /* Temporary copy of the time */
-    void        *ret_value = NULL;      /* Return value */
+    time_t * mesg;
+    uint32_t tmp_time;         /* Temporary copy of the time */
+    void *   ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -132,28 +130,27 @@ H5O_mtime_new_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_
     HDassert(p);
 
     /* decode */
-    if(*p++ != H5O_MTIME_VERSION)
+    if (*p++ != H5O_MTIME_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for mtime message");
 
     /* Skip reserved bytes */
-    p+=3;
+    p += 3;
 
     /* Get the time_t from the file */
     UINT32DECODE(p, tmp_time);
 
     /* The return value */
-    if (NULL==(mesg = H5FL_MALLOC(time_t)))
+    if (NULL == (mesg = H5FL_MALLOC(time_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
     *mesg = (time_t)tmp_time;
 
     /* Set return value */
-    ret_value=mesg;
+    ret_value = mesg;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_mtime_new_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_decode
  *
@@ -172,13 +169,13 @@ done:
  */
 static void *
 H5O_mtime_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                 size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    time_t	*mesg, the_time;
-    int	i;
-    struct tm	tm;
-    void        *ret_value = NULL;      /* Return value */
+    time_t *  mesg, the_time;
+    int       i;
+    struct tm tm;
+    void *    ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -187,24 +184,24 @@ H5O_mtime_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5
     HDassert(p);
 
     /* decode */
-    for(i = 0; i < 14; i++)
-        if(!HDisdigit(p[i]))
+    for (i = 0; i < 14; i++)
+        if (!HDisdigit(p[i]))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "badly formatted modification time message")
 
     /* Convert YYYYMMDDhhmmss UTC to a time_t. */
     HDmemset(&tm, 0, sizeof tm);
-    tm.tm_year = (p[0]-'0')*1000 + (p[1]-'0')*100 + (p[2]-'0')*10 + (p[3]-'0') - 1900;
-    tm.tm_mon = (p[4]-'0')*10 + (p[5]-'0') - 1;
-    tm.tm_mday = (p[6]-'0')*10 + (p[7]-'0');
-    tm.tm_hour = (p[8]-'0')*10 + (p[9]-'0');
-    tm.tm_min = (p[10]-'0')*10 + (p[11]-'0');
-    tm.tm_sec = (p[12]-'0')*10 + (p[13]-'0');
+    tm.tm_year  = (p[0] - '0') * 1000 + (p[1] - '0') * 100 + (p[2] - '0') * 10 + (p[3] - '0') - 1900;
+    tm.tm_mon   = (p[4] - '0') * 10 + (p[5] - '0') - 1;
+    tm.tm_mday  = (p[6] - '0') * 10 + (p[7] - '0');
+    tm.tm_hour  = (p[8] - '0') * 10 + (p[9] - '0');
+    tm.tm_min   = (p[10] - '0') * 10 + (p[11] - '0');
+    tm.tm_sec   = (p[12] - '0') * 10 + (p[13] - '0');
     tm.tm_isdst = -1; /* (figure it out) */
-    if((time_t)-1 == (the_time = H5_make_time(&tm)))
+    if ((time_t)-1 == (the_time = H5_make_time(&tm)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't construct time info")
 
     /* The return value */
-    if(NULL == (mesg = H5FL_MALLOC(time_t)))
+    if (NULL == (mesg = H5FL_MALLOC(time_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     *mesg = the_time;
 
@@ -215,7 +212,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_mtime_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_new_encode
  *
@@ -230,9 +226,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_mtime_new_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O_mtime_new_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
+                     const void *_mesg)
 {
-    const time_t	*mesg = (const time_t *) _mesg;
+    const time_t *mesg = (const time_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -255,7 +252,6 @@ H5O_mtime_new_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_sha
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_mtime_new_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_encode
  *
@@ -272,10 +268,11 @@ H5O_mtime_new_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_sha
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_mtime_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O_mtime_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
+                 const void *_mesg)
 {
-    const time_t	*mesg = (const time_t *) _mesg;
-    struct tm		*tm;
+    const time_t *mesg = (const time_t *)_mesg;
+    struct tm *   tm;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -286,14 +283,12 @@ H5O_mtime_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
 
     /* encode */
     tm = HDgmtime(mesg);
-    HDsprintf((char*)p, "%04d%02d%02d%02d%02d%02d",
-      1900+tm->tm_year, 1+tm->tm_mon, tm->tm_mday,
-      tm->tm_hour, tm->tm_min, tm->tm_sec);
+    HDsprintf((char *)p, "%04d%02d%02d%02d%02d%02d", 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday,
+              tm->tm_hour, tm->tm_min, tm->tm_sec);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_copy
  *
@@ -315,28 +310,27 @@ H5O_mtime_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
 static void *
 H5O_mtime_copy(const void *_mesg, void *_dest)
 {
-    const time_t	*mesg = (const time_t *) _mesg;
-    time_t		*dest = (time_t *) _dest;
-    void                *ret_value = NULL;      /* Return value */
+    const time_t *mesg      = (const time_t *)_mesg;
+    time_t *      dest      = (time_t *)_dest;
+    void *        ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(mesg);
-    if (!dest && NULL==(dest = H5FL_MALLOC(time_t)))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+    if (!dest && NULL == (dest = H5FL_MALLOC(time_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
 
     /* copy */
     *dest = *mesg;
 
     /* Set return value */
-    ret_value=dest;
+    ret_value = dest;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_new_size
  *
@@ -358,7 +352,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_mtime_new_size(const H5F_t H5_ATTR_UNUSED * f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED * mesg)
+H5O_mtime_new_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
+                   const void H5_ATTR_UNUSED *mesg)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -369,7 +364,6 @@ H5O_mtime_new_size(const H5F_t H5_ATTR_UNUSED * f, hbool_t H5_ATTR_UNUSED disabl
     FUNC_LEAVE_NOAPI(8)
 } /* end H5O_mtime_new_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_size
  *
@@ -391,7 +385,8 @@ H5O_mtime_new_size(const H5F_t H5_ATTR_UNUSED * f, hbool_t H5_ATTR_UNUSED disabl
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_mtime_size(const H5F_t H5_ATTR_UNUSED * f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED * mesg)
+H5O_mtime_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
+               const void H5_ATTR_UNUSED *mesg)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -402,7 +397,6 @@ H5O_mtime_size(const H5F_t H5_ATTR_UNUSED * f, hbool_t H5_ATTR_UNUSED disable_sh
     FUNC_LEAVE_NOAPI(16)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_reset
  *
@@ -426,7 +420,6 @@ H5O_mtime_reset(void H5_ATTR_UNUSED *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_free
  *
@@ -451,7 +444,6 @@ H5O_mtime_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_mtime_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_mtime_debug
  *
@@ -467,11 +459,11 @@ H5O_mtime_free(void *mesg)
  */
 static herr_t
 H5O_mtime_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
-		int indent, int fwidth)
+                int indent, int fwidth)
 {
-    const time_t	*mesg = (const time_t *)_mesg;
-    struct tm		*tm;
-    char		buf[128];
+    const time_t *mesg = (const time_t *)_mesg;
+    struct tm *   tm;
+    char          buf[128];
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -486,9 +478,7 @@ H5O_mtime_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const voi
     tm = HDlocaltime(mesg);
 
     HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-      "Time:", buf);
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Time:", buf);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
-
diff --git a/src/H5Oname.c b/src/H5Oname.c
index 45635ec..d60d1c3 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -22,49 +22,47 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_name_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_name_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_name_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_name_copy(const void *_mesg, void *_dest);
+static void * H5O_name_copy(const void *_mesg, void *_dest);
 static size_t H5O_name_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_name_reset(void *_mesg);
-static herr_t H5O_name_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
-			     int indent, int fwidth);
+static herr_t H5O_name_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                             int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_NAME[1] = {{
-    H5O_NAME_ID,            	/*message id number             */
-    "name",                 	/*message name for debugging    */
-    sizeof(H5O_name_t),     	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_name_decode,        	/*decode message                */
-    H5O_name_encode,        	/*encode message                */
-    H5O_name_copy,          	/*copy the native value         */
-    H5O_name_size,          	/*raw message size              */
-    H5O_name_reset,         	/*free internal memory          */
-    NULL,			/* free method			*/
-    NULL,		        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    NULL,			/* copy native value to file    */
-    NULL,			/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_name_debug         	/*debug the message             */
+    H5O_NAME_ID,        /*message id number             */
+    "name",             /*message name for debugging    */
+    sizeof(H5O_name_t), /*native message size           */
+    0,                  /* messages are sharable?       */
+    H5O_name_decode,    /*decode message                */
+    H5O_name_encode,    /*encode message                */
+    H5O_name_copy,      /*copy the native value         */
+    H5O_name_size,      /*raw message size              */
+    H5O_name_reset,     /*free internal memory          */
+    NULL,               /* free method			*/
+    NULL,               /* file delete method		*/
+    NULL,               /* link method			*/
+    NULL,               /*set share method		*/
+    NULL,               /*can share method		*/
+    NULL,               /* pre copy native value to file */
+    NULL,               /* copy native value to file    */
+    NULL,               /* post copy native value to file    */
+    NULL,               /* get creation index		*/
+    NULL,               /* set creation index		*/
+    H5O_name_debug      /*debug the message             */
 }};
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_decode
  *
@@ -83,11 +81,11 @@ const H5O_msg_class_t H5O_MSG_NAME[1] = {{
  */
 static void *
 H5O_name_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_name_t          *mesg;
-    void                *ret_value;     /* Return value */
+    H5O_name_t *mesg;
+    void *      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -96,24 +94,23 @@ H5O_name_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_
     HDassert(p);
 
     /* decode */
-    if(NULL == (mesg = (H5O_name_t *)H5MM_calloc(sizeof(H5O_name_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    if(NULL == (mesg->s = (char *)H5MM_strdup((const char *)p)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (mesg = (H5O_name_t *)H5MM_calloc(sizeof(H5O_name_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (mesg->s = (char *)H5MM_strdup((const char *)p)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set return value */
     ret_value = mesg;
 
 done:
-    if(NULL == ret_value) {
-        if(mesg)
+    if (NULL == ret_value) {
+        if (mesg)
             mesg = (H5O_name_t *)H5MM_xfree(mesg);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_name_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_encode
  *
@@ -132,7 +129,7 @@ done:
 static herr_t
 H5O_name_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_name_t       *mesg = (const H5O_name_t *) _mesg;
+    const H5O_name_t *mesg = (const H5O_name_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -142,12 +139,11 @@ H5O_name_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     HDassert(mesg && mesg->s);
 
     /* encode */
-    HDstrcpy((char*)p, mesg->s);
+    HDstrcpy((char *)p, mesg->s);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_copy
  *
@@ -169,35 +165,34 @@ H5O_name_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
 static void *
 H5O_name_copy(const void *_mesg, void *_dest)
 {
-    const H5O_name_t       *mesg = (const H5O_name_t *) _mesg;
-    H5O_name_t             *dest = (H5O_name_t *) _dest;
-    void                *ret_value;     /* Return value */
+    const H5O_name_t *mesg = (const H5O_name_t *)_mesg;
+    H5O_name_t *      dest = (H5O_name_t *)_dest;
+    void *            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(mesg);
 
-    if(!dest && NULL == (dest = (H5O_name_t *)H5MM_calloc(sizeof(H5O_name_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!dest && NULL == (dest = (H5O_name_t *)H5MM_calloc(sizeof(H5O_name_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* copy */
     *dest = *mesg;
-    if(NULL == (dest->s = H5MM_xstrdup(mesg->s)))
+    if (NULL == (dest->s = H5MM_xstrdup(mesg->s)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set return value */
     ret_value = dest;
 
 done:
-    if(NULL == ret_value)
-        if(dest && NULL == _dest)
+    if (NULL == ret_value)
+        if (dest && NULL == _dest)
             dest = (H5O_name_t *)H5MM_xfree(dest);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_name_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_size
  *
@@ -221,8 +216,8 @@ done:
 static size_t
 H5O_name_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
-    const H5O_name_t       *mesg = (const H5O_name_t *) _mesg;
-    size_t                  ret_value;
+    const H5O_name_t *mesg = (const H5O_name_t *)_mesg;
+    size_t            ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -235,7 +230,6 @@ H5O_name_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shar
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_reset
  *
@@ -255,7 +249,7 @@ H5O_name_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shar
 static herr_t
 H5O_name_reset(void *_mesg)
 {
-    H5O_name_t             *mesg = (H5O_name_t *) _mesg;
+    H5O_name_t *mesg = (H5O_name_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -268,7 +262,6 @@ H5O_name_reset(void *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_name_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_debug
  *
@@ -286,9 +279,9 @@ H5O_name_reset(void *_mesg)
  */
 static herr_t
 H5O_name_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
-	       int indent, int fwidth)
+               int indent, int fwidth)
 {
-    const H5O_name_t	*mesg = (const H5O_name_t *)_mesg;
+    const H5O_name_t *mesg = (const H5O_name_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -299,9 +292,7 @@ H5O_name_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth,
-            "Name:",
-            mesg->s);
+    HDfprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth, "Name:", mesg->s);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
diff --git a/src/H5Onull.c b/src/H5Onull.c
index b6a9214..bfde430 100644
--- a/src/H5Onull.c
+++ b/src/H5Onull.c
@@ -22,33 +22,31 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h" /* Generic Functions			*/
+#include "H5Opkg.h"    /* Object headers			*/
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_NULL[1] = {{
-    H5O_NULL_ID,            	/*message id number             */
-    "null",                 	/*message name for debugging    */
-    0,                      	/*native message size           */
-    0,				/* messages are sharable?       */
-    NULL,                   	/*no decode method              */
-    NULL,                   	/*no encode method              */
-    NULL,                   	/*no copy method                */
-    NULL,                   	/*no size method                */
-    NULL,                   	/*no reset method               */
-    NULL,                   	/*no free method                */
-    NULL,		    	/*no file delete method         */
-    NULL,		    	/*no link method		*/
-    NULL,	            	/*no set share method	        */
-    NULL,		    	/*no can share method		*/
-    NULL,		    	/*no pre copy native value to file */
-    NULL,		    	/*no copy native value to file  */
-    NULL,		    	/*no post copy native value to file */
-    NULL,			/*no get creation index		*/
-    NULL,			/*no set creation index		*/
-    NULL                    	/*no debug method               */
+    H5O_NULL_ID, /*message id number             */
+    "null",      /*message name for debugging    */
+    0,           /*native message size           */
+    0,           /* messages are sharable?       */
+    NULL,        /*no decode method              */
+    NULL,        /*no encode method              */
+    NULL,        /*no copy method                */
+    NULL,        /*no size method                */
+    NULL,        /*no reset method               */
+    NULL,        /*no free method                */
+    NULL,        /*no file delete method         */
+    NULL,        /*no link method		*/
+    NULL,        /*no set share method	        */
+    NULL,        /*no can share method		*/
+    NULL,        /*no pre copy native value to file */
+    NULL,        /*no copy native value to file  */
+    NULL,        /*no post copy native value to file */
+    NULL,        /*no get creation index		*/
+    NULL,        /*no set creation index		*/
+    NULL         /*no debug method               */
 }};
-
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index 8077be9..f42b1b1 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -19,32 +19,33 @@
 #define _H5Opkg_H
 
 /* Get package's private header */
-#include "H5Oprivate.h"		/* Object headers		  	*/
+#include "H5Oprivate.h" /* Object headers		  	*/
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5FLprivate.h"	/* Free Lists                           */
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5FLprivate.h" /* Free Lists                           */
 
 /* Object header macros */
-#define H5O_NMESGS	8 		/*initial number of messages	     */
-#define H5O_NCHUNKS	2		/*initial number of chunks	     */
-#define H5O_MIN_SIZE	22		/* Min. obj header data size (must be big enough for a message prefix and a continuation message) */
-#define H5O_MSG_TYPES   24              /* # of types of messages            */
-#define H5O_MAX_CRT_ORDER_IDX 65535     /* Max. creation order index value   */
+#define H5O_NMESGS  8 /*initial number of messages	     */
+#define H5O_NCHUNKS 2 /*initial number of chunks	     */
+#define H5O_MIN_SIZE                                                                                         \
+    22 /* Min. obj header data size (must be big enough for a message prefix and a continuation message) */
+#define H5O_MSG_TYPES         24    /* # of types of messages            */
+#define H5O_MAX_CRT_ORDER_IDX 65535 /* Max. creation order index value   */
 
 /* Versions of object header structure */
 
 /* Initial version of the object header format */
-#define H5O_VERSION_1		1
+#define H5O_VERSION_1 1
 
 /* Revised version - leaves out reserved bytes and alignment padding, and adds
  *      magic number as prefix and checksum as suffix for all chunks.
  */
-#define H5O_VERSION_2		2
+#define H5O_VERSION_2 2
 
 /* The latest version of the format.  Look through the 'flush'
  *      and 'size' callback for places to change when updating this. */
-#define H5O_VERSION_LATEST	H5O_VERSION_2
+#define H5O_VERSION_LATEST H5O_VERSION_2
 
 /*
  * Align messages on 8-byte boundaries because we would like to copy the
@@ -54,20 +55,13 @@
  *
  * Note: We no longer attempt to do this. - QAK, 10/16/06
  */
-#define H5O_ALIGN_OLD(X)	(8 * (((X) + 7) / 8))
-#define H5O_ALIGN_VERS(V, X)						      \
-    (((V) == H5O_VERSION_1) ?						      \
-		H5O_ALIGN_OLD(X)					      \
-        :								      \
-		(X)							      \
-    )
-#define H5O_ALIGN_OH(O, X)						      \
-     H5O_ALIGN_VERS((O)->version, X)
-#define H5O_ALIGN_F(F, X)						      \
-     H5O_ALIGN_VERS((H5F_USE_LATEST_FORMAT(F) ? H5O_VERSION_LATEST : H5O_VERSION_1), X)
+#define H5O_ALIGN_OLD(X)     (8 * (((X) + 7) / 8))
+#define H5O_ALIGN_VERS(V, X) (((V) == H5O_VERSION_1) ? H5O_ALIGN_OLD(X) : (X))
+#define H5O_ALIGN_OH(O, X)   H5O_ALIGN_VERS((O)->version, X)
+#define H5O_ALIGN_F(F, X)    H5O_ALIGN_VERS((H5F_USE_LATEST_FORMAT(F) ? H5O_VERSION_LATEST : H5O_VERSION_1), X)
 
 /* Size of checksum (on disk) */
-#define H5O_SIZEOF_CHKSUM               4
+#define H5O_SIZEOF_CHKSUM 4
 
 /* ========= Object Creation properties ============ */
 /* Default values for some of the object creation properties */
@@ -76,99 +70,86 @@
  *      default attribute phase change storage are handled correctly if they
  *      are changed.
  */
-#define H5O_CRT_ATTR_MAX_COMPACT_DEF    8
-#define H5O_CRT_ATTR_MIN_DENSE_DEF      6
-#define H5O_CRT_OHDR_FLAGS_DEF          H5O_HDR_STORE_TIMES
+#define H5O_CRT_ATTR_MAX_COMPACT_DEF 8
+#define H5O_CRT_ATTR_MIN_DENSE_DEF   6
+#define H5O_CRT_OHDR_FLAGS_DEF       H5O_HDR_STORE_TIMES
 
 /* Object header status flag definitions */
-#define H5O_HDR_CHUNK0_1                0x00    /* Use 1-byte value for chunk #0 size */
-#define H5O_HDR_CHUNK0_2                0x01    /* Use 2-byte value for chunk #0 size */
-#define H5O_HDR_CHUNK0_4                0x02    /* Use 4-byte value for chunk #0 size */
-#define H5O_HDR_CHUNK0_8                0x03    /* Use 8-byte value for chunk #0 size */
+#define H5O_HDR_CHUNK0_1 0x00 /* Use 1-byte value for chunk #0 size */
+#define H5O_HDR_CHUNK0_2 0x01 /* Use 2-byte value for chunk #0 size */
+#define H5O_HDR_CHUNK0_4 0x02 /* Use 4-byte value for chunk #0 size */
+#define H5O_HDR_CHUNK0_8 0x03 /* Use 8-byte value for chunk #0 size */
 
 /*
  * Size of object header prefix.
  */
-#define H5O_SIZEOF_HDR(O)						      \
-    (((O)->version == H5O_VERSION_1)  					      \
-        ?								      \
-            H5O_ALIGN_OLD(1 +	/*version number	*/		      \
-                1 +		/*reserved 		*/		      \
-                2 +		/*number of messages	*/		      \
-                4 +		/*reference count	*/		      \
-                4)		/*chunk data size	*/		      \
-        :								      \
-            (H5_SIZEOF_MAGIC +	/*magic number  	*/		      \
-                1 +		/*version number 	*/		      \
-                1 +		/*flags		 	*/		      \
-                (((O)->flags & H5O_HDR_STORE_TIMES) ? (			      \
-                  4 +		/*access time		*/		      \
-                  4 +		/*modification time	*/		      \
-                  4 +		/*change time		*/		      \
-                  4		/*birth time		*/		      \
-                ) : 0) +						      \
-                (((O)->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) ? (	      \
-                  2 +		/*max compact attributes */		      \
-                  2		/*min dense attributes	*/		      \
-                ) : 0) +						      \
-                (1 << ((O)->flags & H5O_HDR_CHUNK0_SIZE)) + /*chunk 0 data size */ \
-                H5O_SIZEOF_CHKSUM) /*checksum size	*/		      \
+#define H5O_SIZEOF_HDR(O)                                                                                    \
+    (((O)->version == H5O_VERSION_1)                                                                         \
+         ? H5O_ALIGN_OLD(1 +                           /*version number	*/                                   \
+                         1 +                           /*reserved 		*/                                       \
+                         2 +                           /*number of messages	*/                               \
+                         4 +                           /*reference count	*/                                  \
+                         4)                            /*chunk data size	*/                                  \
+         : (H5_SIZEOF_MAGIC +                          /*magic number  	*/                                   \
+            1 +                                        /*version number 	*/                                  \
+            1 +                                        /*flags		 	*/                                         \
+            (((O)->flags & H5O_HDR_STORE_TIMES) ? (4 + /*access time		*/                                     \
+                                                   4 + /*modification time	*/                                \
+                                                   4 + /*change time		*/                                     \
+                                                   4   /*birth time		*/                                      \
+                                                   )                                                         \
+                                                : 0) +                                                       \
+            (((O)->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) ? (2 + /*max compact attributes */               \
+                                                               2   /*min dense attributes	*/                 \
+                                                               )                                             \
+                                                            : 0) +                                           \
+            (1 << ((O)->flags & H5O_HDR_CHUNK0_SIZE)) + /*chunk 0 data size */                               \
+            H5O_SIZEOF_CHKSUM)                          /*checksum size	*/                                   \
     )
 
 /*
  * Size of object header message prefix
  */
-#define H5O_SIZEOF_MSGHDR_VERS(V,C)					      \
-    (((V) == H5O_VERSION_1)  						      \
-        ?								      \
-            H5O_ALIGN_OLD(2 +	/*message type		*/		      \
-                2 +		/*sizeof message data	*/		      \
-                1 +		/*flags              	*/		      \
-                3)		/*reserved		*/		      \
-        :								      \
-            (1 +		/*message type		*/		      \
-                2 + 		/*sizeof message data	*/		      \
-                1 +		/*flags              	*/		      \
-                ((C) ? (						      \
-                  2		/*creation index     	*/		      \
-                ) : 0))							      \
-    )
-#define H5O_SIZEOF_MSGHDR_OH(O)						      \
-    H5O_SIZEOF_MSGHDR_VERS((O)->version, (O)->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)
-#define H5O_SIZEOF_MSGHDR_F(F, C)						      \
-    H5O_SIZEOF_MSGHDR_VERS((H5F_USE_LATEST_FORMAT(F) || H5F_STORE_MSG_CRT_IDX(F)) ? H5O_VERSION_LATEST : H5O_VERSION_1, (C))
+#define H5O_SIZEOF_MSGHDR_VERS(V, C)                                                                         \
+    (((V) == H5O_VERSION_1) ? H5O_ALIGN_OLD(2 + /*message type		*/                                           \
+                                            2 + /*sizeof message data	*/                                     \
+                                            1 + /*flags              	*/                                     \
+                                            3)  /*reserved		*/                                               \
+                            : (1 +              /*message type		*/                                           \
+                               2 +              /*sizeof message data	*/                                     \
+                               1 +              /*flags              	*/                                     \
+                               ((C) ? (2        /*creation index     	*/                                     \
+                                       )                                                                     \
+                                    : 0)))
+#define H5O_SIZEOF_MSGHDR_OH(O)                                                                              \
+    H5O_SIZEOF_MSGHDR_VERS((O)->version, (O)->flags &H5O_HDR_ATTR_CRT_ORDER_TRACKED)
+#define H5O_SIZEOF_MSGHDR_F(F, C)                                                                            \
+    H5O_SIZEOF_MSGHDR_VERS(                                                                                  \
+        (H5F_USE_LATEST_FORMAT(F) || H5F_STORE_MSG_CRT_IDX(F)) ? H5O_VERSION_LATEST : H5O_VERSION_1, (C))
 
 /*
  * Size of chunk "header" for each chunk
  */
-#define H5O_SIZEOF_CHKHDR_VERS(V)					      \
-    (((V) == H5O_VERSION_1)  						      \
-        ?								      \
-            0 +		/*no magic #  */				      \
-                0 	/*no checksum */				      \
-        :								      \
-            H5_SIZEOF_MAGIC + 		/*magic #  */			      \
-                H5O_SIZEOF_CHKSUM 	/*checksum */			      \
+#define H5O_SIZEOF_CHKHDR_VERS(V)                                                                            \
+    (((V) == H5O_VERSION_1) ? 0 +                   /*no magic #  */                                         \
+                                  0                 /*no checksum */                                         \
+                            : H5_SIZEOF_MAGIC +     /*magic #  */                                            \
+                                  H5O_SIZEOF_CHKSUM /*checksum */                                            \
     )
-#define H5O_SIZEOF_CHKHDR_OH(O)						      \
-    H5O_SIZEOF_CHKHDR_VERS((O)->version)
+#define H5O_SIZEOF_CHKHDR_OH(O) H5O_SIZEOF_CHKHDR_VERS((O)->version)
 
 /*
  * Size of checksum for each chunk
  */
-#define H5O_SIZEOF_CHKSUM_VERS(V)					      \
-    (((V) == H5O_VERSION_1)  						      \
-        ?								      \
-            0 		/*no checksum */				      \
-        :								      \
-            H5O_SIZEOF_CHKSUM 		/*checksum */			      \
+#define H5O_SIZEOF_CHKSUM_VERS(V)                                                                            \
+    (((V) == H5O_VERSION_1) ? 0                 /*no checksum */                                             \
+                            : H5O_SIZEOF_CHKSUM /*checksum */                                                \
     )
-#define H5O_SIZEOF_CHKSUM_OH(O)						      \
-    H5O_SIZEOF_CHKSUM_VERS((O)->version)
+#define H5O_SIZEOF_CHKSUM_OH(O) H5O_SIZEOF_CHKSUM_VERS((O)->version)
 
 /* Input/output flags for decode functions */
-#define H5O_DECODEIO_NOCHANGE           0x01u   /* IN: do not modify values */
-#define H5O_DECODEIO_DIRTY              0x02u   /* OUT: message has been changed */
+#define H5O_DECODEIO_NOCHANGE 0x01u /* IN: do not modify values */
+#define H5O_DECODEIO_DIRTY    0x02u /* OUT: message has been changed */
 
 /* Macro to incremend ndecode_dirtied (only if we are debugging) */
 #ifndef NDEBUG
@@ -179,84 +160,89 @@
 
 /* Load native information for a message, if it's not already present */
 /* (Only works for messages with decode callback) */
-#define H5O_LOAD_NATIVE(F, DXPL, IOF, OH, MSG, ERR)                           \
-    if(NULL == (MSG)->native) {                                               \
-        const H5O_msg_class_t	*msg_type = (MSG)->type;                      \
-        unsigned                ioflags = (IOF);                              \
-                                                                              \
-        /* Decode the message */                                              \
-        HDassert(msg_type->decode);                                           \
-        if(NULL == ((MSG)->native = (msg_type->decode)((F), (DXPL), (OH), (MSG)->flags, &ioflags, (MSG)->raw_size, (MSG)->raw))) \
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, ERR, "unable to decode message") \
-                                                                              \
-        /* Mark the message dirty if it was changed by decoding */            \
-        if((ioflags & H5O_DECODEIO_DIRTY) && (H5F_get_intent((F)) & H5F_ACC_RDWR)) { \
-            (MSG)->dirty = TRUE;                                              \
-            /* Increment the count of messages dirtied by decoding, but */    \
-            /* only ifndef NDEBUG */                                          \
-            INCR_NDECODE_DIRTIED(OH)                                          \
-        }                                                                     \
-                                                                              \
-        /* Set the message's "shared info", if it's shareable */	      \
-        if((MSG)->flags & H5O_MSG_FLAG_SHAREABLE) {                           \
-            HDassert(msg_type->share_flags & H5O_SHARE_IS_SHARABLE);          \
-            H5O_UPDATE_SHARED((H5O_shared_t *)(MSG)->native, H5O_SHARE_TYPE_HERE, (F), msg_type->id, (MSG)->crt_idx, (OH)->chunk[0].addr) \
-        } /* end if */                                                        \
-                                                                              \
-        /* Set the message's "creation index", if it has one */		      \
-        if(msg_type->set_crt_index) {				      	      \
-            /* Set the creation index for the message */		      \
-            if((msg_type->set_crt_index)((MSG)->native, (MSG)->crt_idx) < 0)  \
-                HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, ERR, "unable to set creation index") \
-        } /* end if */							      \
-    } /* end if */
+#define H5O_LOAD_NATIVE(F, DXPL, IOF, OH, MSG, ERR)                                                          \
+    if (NULL == (MSG)->native) {                                                                             \
+        const H5O_msg_class_t *msg_type = (MSG)->type;                                                       \
+        unsigned               ioflags  = (IOF);                                                             \
+                                                                                                             \
+        /* Decode the message */                                                                             \
+        HDassert(msg_type->decode);                                                                          \
+        if (NULL == ((MSG)->native = (msg_type->decode)((F), (DXPL), (OH), (MSG)->flags, &ioflags,           \
+                                                        (MSG)->raw_size, (MSG)->raw)))                       \
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, ERR, "unable to decode message")                           \
+                                                                                                             \
+        /* Mark the message dirty if it was changed by decoding */                                           \
+        if ((ioflags & H5O_DECODEIO_DIRTY) && (H5F_get_intent((F)) & H5F_ACC_RDWR)) {                        \
+            (MSG)->dirty = TRUE;                                                                             \
+            /* Increment the count of messages dirtied by decoding, but */                                   \
+            /* only ifndef NDEBUG */                                                                         \
+            INCR_NDECODE_DIRTIED(OH)                                                                         \
+        }                                                                                                    \
+                                                                                                             \
+        /* Set the message's "shared info", if it's shareable */                                             \
+        if ((MSG)->flags & H5O_MSG_FLAG_SHAREABLE) {                                                         \
+            HDassert(msg_type->share_flags &H5O_SHARE_IS_SHARABLE);                                          \
+            H5O_UPDATE_SHARED((H5O_shared_t *)(MSG)->native, H5O_SHARE_TYPE_HERE, (F), msg_type->id,         \
+                              (MSG)->crt_idx, (OH)->chunk[0].addr)                                           \
+        } /* end if */                                                                                       \
+                                                                                                             \
+        /* Set the message's "creation index", if it has one */                                              \
+        if (msg_type->set_crt_index) {                                                                       \
+            /* Set the creation index for the message */                                                     \
+            if ((msg_type->set_crt_index)((MSG)->native, (MSG)->crt_idx) < 0)                                \
+                HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, ERR, "unable to set creation index")                      \
+        } /* end if */                                                                                       \
+    }     /* end if */
 
 /* Flags for a message class's "sharability" */
-#define H5O_SHARE_IS_SHARABLE   0x01
-#define H5O_SHARE_IN_OHDR       0x02
-
+#define H5O_SHARE_IS_SHARABLE 0x01
+#define H5O_SHARE_IN_OHDR     0x02
 
 /* The "message class" type */
 struct H5O_msg_class_t {
-    unsigned	id;				/*message type ID on disk   */
-    const char	*name;				/*for debugging             */
-    size_t	native_size;			/*size of native message    */
-    unsigned    share_flags;			/* Message sharing settings */
-    void	*(*decode)(H5F_t *, hid_t, H5O_t *, unsigned, unsigned *, size_t, const uint8_t *);
-    herr_t	(*encode)(H5F_t *, hbool_t, uint8_t *, const void *);
-    void	*(*copy)(const void *, void *);	/*copy native value         */
-    size_t	(*raw_size)(const H5F_t *, hbool_t, const void *);/*sizeof encoded message	*/
-    herr_t	(*reset)(void *);		/*free nested data structs  */
-    herr_t	(*free)(void *);		/*free main data struct  */
-    herr_t	(*del)(H5F_t *, hid_t, H5O_t *, void *);    /* Delete space in file referenced by this message */
-    herr_t	(*link)(H5F_t *, hid_t, H5O_t *, void *);   /* Increment any links in file reference by this message */
-    herr_t	(*set_share)(void*, const H5O_shared_t*);   /* Set shared information */
-    htri_t	(*can_share)(const void *);	/* Is message allowed to be shared? */
-    herr_t	(*pre_copy_file)(H5F_t *, const void *, hbool_t *, const H5O_copy_t *, void *); /*"pre copy" action when copying native value to file */
-    void	*(*copy_file)(H5F_t *, void *, H5F_t *, hbool_t *, unsigned *, H5O_copy_t *, void *, hid_t); /*copy native value to file */
-    herr_t	(*post_copy_file)(const H5O_loc_t *, const void *, H5O_loc_t *, void *, unsigned *, hid_t, H5O_copy_t *); /*"post copy" action when copying native value to file */
-    herr_t      (*get_crt_index)(const void *, H5O_msg_crt_idx_t *);	/* Get message's creation index */
-    herr_t      (*set_crt_index)(void *, H5O_msg_crt_idx_t);	/* Set message's creation index */
-    herr_t	(*debug)(H5F_t*, hid_t, const void*, FILE*, int, int);
+    unsigned    id;          /*message type ID on disk   */
+    const char *name;        /*for debugging             */
+    size_t      native_size; /*size of native message    */
+    unsigned    share_flags; /* Message sharing settings */
+    void *(*decode)(H5F_t *, hid_t, H5O_t *, unsigned, unsigned *, size_t, const uint8_t *);
+    herr_t (*encode)(H5F_t *, hbool_t, uint8_t *, const void *);
+    void *(*copy)(const void *, void *);                      /*copy native value         */
+    size_t (*raw_size)(const H5F_t *, hbool_t, const void *); /*sizeof encoded message	*/
+    herr_t (*reset)(void *);                                  /*free nested data structs  */
+    herr_t (*free)(void *);                                   /*free main data struct  */
+    herr_t (*del)(H5F_t *, hid_t, H5O_t *, void *); /* Delete space in file referenced by this message */
+    herr_t (*link)(H5F_t *, hid_t, H5O_t *,
+                   void *); /* Increment any links in file reference by this message */
+    herr_t (*set_share)(void *, const H5O_shared_t *); /* Set shared information */
+    htri_t (*can_share)(const void *);                 /* Is message allowed to be shared? */
+    herr_t (*pre_copy_file)(H5F_t *, const void *, hbool_t *, const H5O_copy_t *,
+                            void *); /*"pre copy" action when copying native value to file */
+    void *(*copy_file)(H5F_t *, void *, H5F_t *, hbool_t *, unsigned *, H5O_copy_t *, void *,
+                       hid_t); /*copy native value to file */
+    herr_t (*post_copy_file)(const H5O_loc_t *, const void *, H5O_loc_t *, void *, unsigned *, hid_t,
+                             H5O_copy_t *); /*"post copy" action when copying native value to file */
+    herr_t (*get_crt_index)(const void *, H5O_msg_crt_idx_t *); /* Get message's creation index */
+    herr_t (*set_crt_index)(void *, H5O_msg_crt_idx_t);         /* Set message's creation index */
+    herr_t (*debug)(H5F_t *, hid_t, const void *, FILE *, int, int);
 };
 
 struct H5O_mesg_t {
-    const H5O_msg_class_t	*type;	/*type of message		     */
-    hbool_t		dirty;		/*raw out of date wrt native	     */
-    hbool_t		locked;		/*message is locked into chunk	     */
-    uint8_t		flags;		/*message flags			     */
-    H5O_msg_crt_idx_t   crt_idx;        /*message creation index	     */
-    unsigned		chunkno;	/*chunk number for this mesg	     */
-    void		*native;	/*native format message		     */
-    uint8_t		*raw;		/*ptr to raw data		     */
-    size_t		raw_size;	/*size with alignment		     */
+    const H5O_msg_class_t *type;     /*type of message		     */
+    hbool_t                dirty;    /*raw out of date wrt native	     */
+    hbool_t                locked;   /*message is locked into chunk	     */
+    uint8_t                flags;    /*message flags			     */
+    H5O_msg_crt_idx_t      crt_idx;  /*message creation index	     */
+    unsigned               chunkno;  /*chunk number for this mesg	     */
+    void *                 native;   /*native format message		     */
+    uint8_t *              raw;      /*ptr to raw data		     */
+    size_t                 raw_size; /*size with alignment		     */
 };
 
 typedef struct H5O_chunk_t {
-    haddr_t	addr;			/*chunk file address		     */
-    size_t	size;			/*chunk size			     */
-    size_t	gap;			/*space at end of chunk too small for null message */
-    uint8_t	*image;			/*image of file			     */
+    haddr_t  addr;  /*chunk file address		     */
+    size_t   size;  /*chunk size			     */
+    size_t   gap;   /*space at end of chunk too small for null message */
+    uint8_t *image; /*image of file			     */
 } H5O_chunk_t;
 
 struct H5O_t {
@@ -264,123 +250,123 @@ struct H5O_t {
                             /* first field in structure */
 
     /* File-specific information (not stored) */
-    size_t      sizeof_size;            /* Size of file sizes 		     */
-    size_t      sizeof_addr;            /* Size of file addresses	     */
+    size_t sizeof_size; /* Size of file sizes 		     */
+    size_t sizeof_addr; /* Size of file addresses	     */
 
     /* Debugging information (not stored) */
 #ifdef H5O_ENABLE_BAD_MESG_COUNT
-    hbool_t     store_bad_mesg_count;   /* Flag to indicate that a bad message count should be stored */
-                                        /* (This is to simulate a bug in earlier
-                                         *      versions of the library)
-                                         */
-#endif /* H5O_ENABLE_BAD_MESG_COUNT */
+    hbool_t store_bad_mesg_count; /* Flag to indicate that a bad message count should be stored */
+                                  /* (This is to simulate a bug in earlier
+                                   *      versions of the library)
+                                   */
+#endif                            /* H5O_ENABLE_BAD_MESG_COUNT */
 #ifndef NDEBUG
-    size_t      ndecode_dirtied;        /* Number of messages dirtied by decoding */
-#endif /* NDEBUG */
+    size_t ndecode_dirtied; /* Number of messages dirtied by decoding */
+#endif                      /* NDEBUG */
 
     /* Chunk management information (not stored) */
-    size_t      rc;                     /* Reference count of [continuation] chunks using this structure */
-    size_t      chunk0_size;            /* Size of serialized first chunk    */
-    hbool_t     mesgs_modified;         /* Whether any messages were modified when the object header was deserialized */
-    hbool_t     prefix_modified;        /* Whether prefix was modified when the object header was deserialized */
+    size_t  rc;              /* Reference count of [continuation] chunks using this structure */
+    size_t  chunk0_size;     /* Size of serialized first chunk    */
+    hbool_t mesgs_modified;  /* Whether any messages were modified when the object header was deserialized */
+    hbool_t prefix_modified; /* Whether prefix was modified when the object header was deserialized */
 
     /* Object information (stored) */
-    hbool_t     has_refcount_msg;       /* Whether the object has a ref. count message */
-    unsigned	nlink;			/*link count			     */
-    uint8_t	version;		/*version number		     */
-    uint8_t	flags;			/*flags				     */
+    hbool_t  has_refcount_msg; /* Whether the object has a ref. count message */
+    unsigned nlink;            /*link count			     */
+    uint8_t  version;          /*version number		     */
+    uint8_t  flags;            /*flags				     */
 
     /* Time information (stored, for versions > 1 & H5O_HDR_STORE_TIMES flag set) */
-    time_t      atime;                  /*access time 			     */
-    time_t      mtime;                  /*modification time 		     */
-    time_t      ctime;                  /*change time 			     */
-    time_t      btime;                  /*birth time 			     */
+    time_t atime; /*access time 			     */
+    time_t mtime; /*modification time 		     */
+    time_t ctime; /*change time 			     */
+    time_t btime; /*birth time 			     */
 
     /* Attribute information (stored, for versions > 1) */
-    unsigned	max_compact;		/* Maximum # of compact attributes   */
-    unsigned	min_dense;		/* Minimum # of "dense" attributes   */
+    unsigned max_compact; /* Maximum # of compact attributes   */
+    unsigned min_dense;   /* Minimum # of "dense" attributes   */
 
     /* Message management (stored, encoded in chunks) */
-    size_t	nmesgs;			/*number of messages		     */
-    size_t	alloc_nmesgs;		/*number of message slots	     */
-    H5O_mesg_t	*mesg;			/*array of messages		     */
-    size_t      link_msgs_seen;         /* # of link messages seen when loading header */
-    size_t      attr_msgs_seen;         /* # of attribute messages seen when loading header */
+    size_t      nmesgs;         /*number of messages		     */
+    size_t      alloc_nmesgs;   /*number of message slots	     */
+    H5O_mesg_t *mesg;           /*array of messages		     */
+    size_t      link_msgs_seen; /* # of link messages seen when loading header */
+    size_t      attr_msgs_seen; /* # of attribute messages seen when loading header */
 
     /* Chunk management (not stored) */
-    size_t	nchunks;		/*number of chunks		     */
-    size_t	alloc_nchunks;		/*chunks allocated		     */
-    H5O_chunk_t *chunk;			/*array of chunks		     */
+    size_t       nchunks;       /*number of chunks		     */
+    size_t       alloc_nchunks; /*chunks allocated		     */
+    H5O_chunk_t *chunk;         /*array of chunks		     */
 };
 
 /* Class for types of objects in file */
 typedef struct H5O_obj_class_t {
-    H5O_type_t	type;				/*object type on disk	     */
-    const char	*name;				/*for debugging		     */
-    void       *(*get_copy_file_udata)(void);	/*retrieve user data for 'copy file' operation */
-    void	(*free_copy_file_udata)(void *); /*free user data for 'copy file' operation */
-    htri_t	(*isa)(H5O_t *);		/*if a header matches an object class */
-    hid_t	(*open)(const H5G_loc_t *, hid_t, hid_t, hbool_t );	/*open an object of this class */
-    void	*(*create)(H5F_t *, void *, H5G_loc_t *, hid_t );	/*create an object of this class */
-    H5O_loc_t	*(*get_oloc)(hid_t );		/*get the object header location for an object */
-    herr_t      (*bh_info)(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info); /*get the index & heap info for an object */
-    herr_t      (*flush)(H5G_loc_t *loc, hid_t dxpl_id); 		/*flush an opened object of this class */
+    H5O_type_t  type;                                        /*object type on disk	     */
+    const char *name;                                        /*for debugging		     */
+    void *(*get_copy_file_udata)(void);                      /*retrieve user data for 'copy file' operation */
+    void (*free_copy_file_udata)(void *);                    /*free user data for 'copy file' operation */
+    htri_t (*isa)(H5O_t *);                                  /*if a header matches an object class */
+    hid_t (*open)(const H5G_loc_t *, hid_t, hid_t, hbool_t); /*open an object of this class */
+    void *(*create)(H5F_t *, void *, H5G_loc_t *, hid_t);    /*create an object of this class */
+    H5O_loc_t *(*get_oloc)(hid_t);                           /*get the object header location for an object */
+    herr_t (*bh_info)(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
+                      H5_ih_info_t *bh_info);       /*get the index & heap info for an object */
+    herr_t (*flush)(H5G_loc_t *loc, hid_t dxpl_id); /*flush an opened object of this class */
 } H5O_obj_class_t;
 
 /* Node in skip list to map addresses from one file to another during object header copy */
 typedef struct H5O_addr_map_t {
-    H5_obj_t    src_obj_pos;            /* Location of source object */
-    haddr_t     dst_addr;               /* Address of object in destination file */
-    hbool_t     is_locked;              /* Indicate that the destination object is locked currently */
-    hsize_t     inc_ref_count;          /* Number of deferred increments to reference count */
-    const H5O_obj_class_t *obj_class;   /* Object class */
-    void        *udata;                 /* Object class copy file udata */
+    H5_obj_t               src_obj_pos;   /* Location of source object */
+    haddr_t                dst_addr;      /* Address of object in destination file */
+    hbool_t                is_locked;     /* Indicate that the destination object is locked currently */
+    hsize_t                inc_ref_count; /* Number of deferred increments to reference count */
+    const H5O_obj_class_t *obj_class;     /* Object class */
+    void *                 udata;         /* Object class copy file udata */
 } H5O_addr_map_t;
 
 /* Stack of continuation messages to interpret */
 typedef struct H5O_cont_msgs_t {
-    size_t      nmsgs;                  /* Number of continuation messages found so far */
-    size_t	alloc_nmsgs;		/* Continuation messages allocated */
-    H5O_cont_t *msgs;			/* Array of continuation messages */
+    size_t      nmsgs;       /* Number of continuation messages found so far */
+    size_t      alloc_nmsgs; /* Continuation messages allocated */
+    H5O_cont_t *msgs;        /* Array of continuation messages */
 } H5O_cont_msgs_t;
 
 /* Common callback information for loading object header prefix from disk */
 typedef struct H5O_common_cache_ud_t {
-    H5F_t *f;                           /* Pointer to file for object header/chunk */
-    hid_t dxpl_id;                      /* DXPL for operation */
-    unsigned file_intent;               /* Read/write intent for file */
-    unsigned merged_null_msgs;          /* Number of null messages merged together */
-    hbool_t mesgs_modified;             /* Whether any messages were modified when the object header was deserialized */
-    H5O_cont_msgs_t *cont_msg_info;     /* Pointer to continuation messages to work on */
-    haddr_t addr;                       /* Address of the prefix or chunk */
+    H5F_t *  f;                /* Pointer to file for object header/chunk */
+    hid_t    dxpl_id;          /* DXPL for operation */
+    unsigned file_intent;      /* Read/write intent for file */
+    unsigned merged_null_msgs; /* Number of null messages merged together */
+    hbool_t  mesgs_modified; /* Whether any messages were modified when the object header was deserialized */
+    H5O_cont_msgs_t *cont_msg_info; /* Pointer to continuation messages to work on */
+    haddr_t          addr;          /* Address of the prefix or chunk */
 } H5O_common_cache_ud_t;
 
 /* Callback information for loading object header prefix from disk */
 typedef struct H5O_cache_ud_t {
-    hbool_t made_attempt;               /* Whether the deserialize routine was already attempted */
-    unsigned v1_pfx_nmesgs;             /* Number of messages from v1 prefix header */
-    H5O_common_cache_ud_t common;       /* Common object header cache callback info */
+    hbool_t               made_attempt;  /* Whether the deserialize routine was already attempted */
+    unsigned              v1_pfx_nmesgs; /* Number of messages from v1 prefix header */
+    H5O_common_cache_ud_t common;        /* Common object header cache callback info */
 } H5O_cache_ud_t;
 
 /* Structure representing each chunk in the cache */
 typedef struct H5O_chunk_proxy_t {
-    H5AC_info_t cache_info;    /* Information for metadata cache functions, _must_ be */
-                                /* first field in structure */
+    H5AC_info_t cache_info; /* Information for metadata cache functions, _must_ be */
+                            /* first field in structure */
 
-    H5O_t       *oh;                    /* Object header for this chunk */
-    unsigned    chunkno;                /* Chunk number for this chunk */
+    H5O_t *  oh;      /* Object header for this chunk */
+    unsigned chunkno; /* Chunk number for this chunk */
 } H5O_chunk_proxy_t;
 
 /* Callback information for loading object header chunk from disk */
 typedef struct H5O_chk_cache_ud_t {
-    hbool_t decoding;                   /* Whether the object header is being decoded */
-    H5O_t *oh;                          /* Object header for this chunk */
-    unsigned chunkno;                   /* Index of chunk being brought in (for re-loads) */
-    size_t size;                        /* Size of chunk in the file */
-    H5O_common_cache_ud_t common;       /* Common object header cache callback info */
+    hbool_t               decoding; /* Whether the object header is being decoded */
+    H5O_t *               oh;       /* Object header for this chunk */
+    unsigned              chunkno;  /* Index of chunk being brought in (for re-loads) */
+    size_t                size;     /* Size of chunk in the file */
+    H5O_common_cache_ud_t common;   /* Common object header cache callback info */
 } H5O_chk_cache_ud_t;
 
-
 /* H5O object header inherits cache-like properties from H5AC */
 H5_DLLVAR const H5AC_class_t H5AC_OHDR[1];
 
@@ -506,7 +492,6 @@ H5_DLLVAR const H5O_msg_class_t H5O_MSG_REFCOUNT[1];
 /* Placeholder for unknown message. (0x0017) */
 H5_DLLVAR const H5O_msg_class_t H5O_MSG_UNKNOWN[1];
 
-
 /*
  * Object header "object" types
  */
@@ -520,88 +505,75 @@ H5_DLLVAR const H5O_obj_class_t H5O_OBJ_DATASET[1];
 /* Datatype Object. (H5O_TYPE_NAMED_DATATYPE - 2) */
 H5_DLLVAR const H5O_obj_class_t H5O_OBJ_DATATYPE[1];
 
-
 /* Package-local function prototypes */
 H5_DLL herr_t H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg);
 H5_DLL herr_t H5O_flush_msgs(H5F_t *f, H5O_t *oh);
-H5_DLL hid_t H5O_open_by_loc(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref);
+H5_DLL hid_t  H5O_open_by_loc(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref);
 H5_DLL herr_t H5O_delete_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_mesg_t *mesg);
-H5_DLL const H5O_obj_class_t * H5O_obj_class(const H5O_loc_t *loc, hid_t dxpl_id);
-H5_DLL int H5O_link_oh(H5F_t *f, int adjust, hid_t dxpl_id, H5O_t *oh, hbool_t *deleted);
-H5_DLL herr_t H5O_inc_rc(H5O_t *oh);
-H5_DLL herr_t H5O_dec_rc(H5O_t *oh);
-H5_DLL herr_t H5O_free(H5O_t *oh);
+H5_DLL const H5O_obj_class_t *H5O_obj_class(const H5O_loc_t *loc, hid_t dxpl_id);
+H5_DLL int                    H5O_link_oh(H5F_t *f, int adjust, hid_t dxpl_id, H5O_t *oh, hbool_t *deleted);
+H5_DLL herr_t                 H5O_inc_rc(H5O_t *oh);
+H5_DLL herr_t                 H5O_dec_rc(H5O_t *oh);
+H5_DLL herr_t                 H5O_free(H5O_t *oh);
 
 /* Object header message routines */
-H5_DLL herr_t H5O_msg_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    const H5O_msg_class_t *type, unsigned *mesg_flags, void *mesg,
-    size_t *mesg_idx);
-H5_DLL herr_t H5O_msg_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    const H5O_msg_class_t *type, unsigned mesg_flags, unsigned update_flags,
-    void *mesg);
-H5_DLL herr_t H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    const H5O_msg_class_t *type, unsigned mesg_flags, unsigned update_flags,
-    void *mesg);
-H5_DLL void *H5O_msg_free_real(const H5O_msg_class_t *type, void *mesg);
-H5_DLL herr_t H5O_msg_free_mesg(H5O_mesg_t *mesg);
+H5_DLL herr_t   H5O_msg_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
+                              unsigned *mesg_flags, void *mesg, size_t *mesg_idx);
+H5_DLL herr_t   H5O_msg_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
+                                    unsigned mesg_flags, unsigned update_flags, void *mesg);
+H5_DLL herr_t   H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
+                                   unsigned mesg_flags, unsigned update_flags, void *mesg);
+H5_DLL void *   H5O_msg_free_real(const H5O_msg_class_t *type, void *mesg);
+H5_DLL herr_t   H5O_msg_free_mesg(H5O_mesg_t *mesg);
 H5_DLL unsigned H5O_msg_count_real(const H5O_t *oh, const H5O_msg_class_t *type);
-H5_DLL herr_t H5O_msg_remove_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type,
-    int sequence, H5O_operator_t op, void *op_data, hbool_t adj_link, hid_t dxpl_id);
-H5_DLL void *H5O_msg_copy_file(const H5O_msg_class_t *type, H5F_t *file_src,
-    void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size,
-    unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
+H5_DLL herr_t   H5O_msg_remove_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type, int sequence,
+                                    H5O_operator_t op, void *op_data, hbool_t adj_link, hid_t dxpl_id);
+H5_DLL void * H5O_msg_copy_file(const H5O_msg_class_t *type, H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
+                                hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info,
+                                void *udata, hid_t dxpl_id);
 H5_DLL herr_t H5O_msg_iterate_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type,
-    const H5O_mesg_operator_t *op, void *op_data, hid_t dxpl_id);
+                                   const H5O_mesg_operator_t *op, void *op_data, hid_t dxpl_id);
 
 /* Object header chunk routines */
 H5_DLL herr_t H5O_chunk_add(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx);
-H5_DLL H5O_chunk_proxy_t *H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    unsigned idx);
-H5_DLL herr_t H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id,
-    H5O_chunk_proxy_t *chk_proxy, hbool_t chk_dirtied);
+H5_DLL H5O_chunk_proxy_t *H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx);
+H5_DLL herr_t H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy, hbool_t chk_dirtied);
 H5_DLL herr_t H5O_chunk_update_idx(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx);
 H5_DLL herr_t H5O_chunk_resize(H5O_t *oh, H5O_chunk_proxy_t *chk_proxy);
 H5_DLL herr_t H5O_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx);
 
 /* Collect storage info for btree and heap */
-H5_DLL herr_t H5O_attr_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    H5_ih_info_t *bh_info);
+H5_DLL herr_t H5O_attr_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info);
 
 /* Object header allocation routines */
 H5_DLL herr_t H5O_alloc_msgs(H5O_t *oh, size_t min_alloc);
-H5_DLL herr_t  H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    const H5O_msg_class_t *type, const void *mesg, size_t *mesg_idx);
+H5_DLL herr_t H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, const void *mesg,
+                        size_t *mesg_idx);
 H5_DLL herr_t H5O_condense_header(H5F_t *f, H5O_t *oh, hid_t dxpl_id);
-H5_DLL herr_t H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    H5O_mesg_t *mesg, hbool_t adj_link);
+H5_DLL herr_t H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg, hbool_t adj_link);
 
 /* Shared object operators */
-H5_DLL void * H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned *ioflags, const uint8_t *buf, const H5O_msg_class_t *type);
-H5_DLL herr_t H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_mesg);
+H5_DLL void *H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags, const uint8_t *buf,
+                               const H5O_msg_class_t *type);
+H5_DLL herr_t H5O_shared_encode(const H5F_t *f, uint8_t *buf /*out*/, const H5O_shared_t *sh_mesg);
 H5_DLL size_t H5O_shared_size(const H5F_t *f, const H5O_shared_t *sh_mesg);
-H5_DLL herr_t H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    const H5O_msg_class_t *mesg_type, H5O_shared_t *sh_mesg);
-H5_DLL herr_t H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    const H5O_msg_class_t *mesg_type, H5O_shared_t *sh_mesg);
-H5_DLL herr_t H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst,
-    const H5O_msg_class_t *mesg_type, const void *_native_src, void *_native_dst,
-    hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info,
-    void *udata, hid_t dxpl_id);
-H5_DLL herr_t H5O_shared_post_copy_file (H5F_t *f,
-    const H5O_msg_class_t *mesg_type, const H5O_shared_t *shared_src,
-    H5O_shared_t *shared_dst, unsigned *mesg_flags, hid_t dxpl_id,
-    H5O_copy_t *cpy_info);
-H5_DLL herr_t H5O_shared_debug(const H5O_shared_t *mesg, FILE *stream,
-    int indent, int fwidth);
+H5_DLL herr_t H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, const H5O_msg_class_t *mesg_type,
+                                H5O_shared_t *sh_mesg);
+H5_DLL herr_t H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, const H5O_msg_class_t *mesg_type,
+                              H5O_shared_t *sh_mesg);
+H5_DLL herr_t H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst, const H5O_msg_class_t *mesg_type,
+                                   const void *_native_src, void *_native_dst, hbool_t *recompute_size,
+                                   unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
+H5_DLL herr_t H5O_shared_post_copy_file(H5F_t *f, const H5O_msg_class_t *mesg_type,
+                                        const H5O_shared_t *shared_src, H5O_shared_t *shared_dst,
+                                        unsigned *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info);
+H5_DLL herr_t H5O_shared_debug(const H5O_shared_t *mesg, FILE *stream, int indent, int fwidth);
 
 /* Attribute message operators */
 H5_DLL herr_t H5O_attr_reset(void *_mesg);
 H5_DLL herr_t H5O_attr_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg);
 H5_DLL herr_t H5O_attr_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg);
-H5_DLL herr_t H5O_attr_count_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    hsize_t *nattrs);
-
+H5_DLL herr_t H5O_attr_count_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hsize_t *nattrs);
 
 /* These functions operate on object locations */
 H5_DLL H5O_loc_t *H5O_get_loc(hid_t id);
@@ -621,7 +593,7 @@ H5_DLL herr_t H5O_get_rc(const H5O_loc_t *oloc, hid_t dxpl_id, unsigned *rc);
 #ifdef H5O_DEBUG
 H5_DLL herr_t H5O_assert(const H5O_t *oh);
 #endif /* H5O_DEBUG */
-H5_DLL herr_t H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int fwidth);
+H5_DLL herr_t H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, int indent,
+                             int fwidth);
 
 #endif /* _H5Opkg_H */
-
diff --git a/src/H5Opline.c b/src/H5Opline.c
index adaee33..f6b7de7 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -18,81 +18,78 @@
  * Purpose:	Data filter pipeline message.
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists				*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Zpkg.h"		/* Data filters				*/
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists				*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 /* PRIVATE PROTOTYPES */
 static herr_t H5O_pline_encode(H5F_t *f, uint8_t *p, const void *mesg);
-static void *H5O_pline_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void *H5O_pline_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static void *H5O_pline_copy(const void *_mesg, void *_dest);
 static size_t H5O_pline_size(const H5F_t *f, const void *_mesg);
 static herr_t H5O_pline_reset(void *_mesg);
 static herr_t H5O_pline_free(void *_mesg);
-static herr_t H5O_pline_pre_copy_file(H5F_t *file_src,
-    const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata);
-static herr_t H5O_pline_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-    FILE * stream, int indent, int fwidth);
+static herr_t H5O_pline_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
+                                      const H5O_copy_t *cpy_info, void *_udata);
+static herr_t H5O_pline_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                              int fwidth);
 
 /* Set up & include shared message "interface" info */
-#define H5O_SHARED_TYPE			H5O_MSG_PLINE
-#define H5O_SHARED_DECODE		H5O_pline_shared_decode
-#define H5O_SHARED_DECODE_REAL		H5O_pline_decode
-#define H5O_SHARED_ENCODE		H5O_pline_shared_encode
-#define H5O_SHARED_ENCODE_REAL		H5O_pline_encode
-#define H5O_SHARED_SIZE			H5O_pline_shared_size
-#define H5O_SHARED_SIZE_REAL		H5O_pline_size
-#define H5O_SHARED_DELETE		H5O_pline_shared_delete
+#define H5O_SHARED_TYPE        H5O_MSG_PLINE
+#define H5O_SHARED_DECODE      H5O_pline_shared_decode
+#define H5O_SHARED_DECODE_REAL H5O_pline_decode
+#define H5O_SHARED_ENCODE      H5O_pline_shared_encode
+#define H5O_SHARED_ENCODE_REAL H5O_pline_encode
+#define H5O_SHARED_SIZE        H5O_pline_shared_size
+#define H5O_SHARED_SIZE_REAL   H5O_pline_size
+#define H5O_SHARED_DELETE      H5O_pline_shared_delete
 #undef H5O_SHARED_DELETE_REAL
-#define H5O_SHARED_LINK			H5O_pline_shared_link
+#define H5O_SHARED_LINK H5O_pline_shared_link
 #undef H5O_SHARED_LINK_REAL
-#define H5O_SHARED_COPY_FILE		H5O_pline_shared_copy_file
+#define H5O_SHARED_COPY_FILE H5O_pline_shared_copy_file
 #undef H5O_SHARED_COPY_FILE_REAL
-#define H5O_SHARED_POST_COPY_FILE	H5O_pline_shared_post_copy_file
+#define H5O_SHARED_POST_COPY_FILE H5O_pline_shared_post_copy_file
 #undef H5O_SHARED_POST_COPY_FILE_REAL
-#undef  H5O_SHARED_POST_COPY_FILE_UPD
-#define H5O_SHARED_DEBUG		H5O_pline_shared_debug
-#define H5O_SHARED_DEBUG_REAL		H5O_pline_debug
-#include "H5Oshared.h"			/* Shared Object Header Message Callbacks */
+#undef H5O_SHARED_POST_COPY_FILE_UPD
+#define H5O_SHARED_DEBUG      H5O_pline_shared_debug
+#define H5O_SHARED_DEBUG_REAL H5O_pline_debug
+#include "H5Oshared.h" /* Shared Object Header Message Callbacks */
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_PLINE[1] = {{
-    H5O_PLINE_ID,		/* message id number		*/
-    "filter pipeline",		/* message name for debugging	*/
-    sizeof(H5O_pline_t),	/* native message size		*/
-    H5O_SHARE_IS_SHARABLE|H5O_SHARE_IN_OHDR,	/* messages are sharable?       */
-    H5O_pline_shared_decode,	/* decode message		*/
-    H5O_pline_shared_encode,	/* encode message		*/
-    H5O_pline_copy,		/* copy the native value	*/
-    H5O_pline_shared_size,	/* size of raw message		*/
-    H5O_pline_reset,		/* reset method			*/
-    H5O_pline_free,		/* free method			*/
-    H5O_pline_shared_delete,    /* file delete method		*/
-    H5O_pline_shared_link,	/* link method			*/
-    NULL,			/* set share method		*/
-    NULL,		    	/*can share method		*/
-    H5O_pline_pre_copy_file,	/* pre copy native value to file */
-    H5O_pline_shared_copy_file,	/* copy native value to file    */
-    H5O_pline_shared_post_copy_file,	/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_pline_shared_debug	/* debug the message		*/
+    H5O_PLINE_ID,                              /* message id number		*/
+    "filter pipeline",                         /* message name for debugging	*/
+    sizeof(H5O_pline_t),                       /* native message size		*/
+    H5O_SHARE_IS_SHARABLE | H5O_SHARE_IN_OHDR, /* messages are sharable?       */
+    H5O_pline_shared_decode,                   /* decode message		*/
+    H5O_pline_shared_encode,                   /* encode message		*/
+    H5O_pline_copy,                            /* copy the native value	*/
+    H5O_pline_shared_size,                     /* size of raw message		*/
+    H5O_pline_reset,                           /* reset method			*/
+    H5O_pline_free,                            /* free method			*/
+    H5O_pline_shared_delete,                   /* file delete method		*/
+    H5O_pline_shared_link,                     /* link method			*/
+    NULL,                                      /* set share method		*/
+    NULL,                                      /*can share method		*/
+    H5O_pline_pre_copy_file,                   /* pre copy native value to file */
+    H5O_pline_shared_copy_file,                /* copy native value to file    */
+    H5O_pline_shared_post_copy_file,           /* post copy native value to file    */
+    NULL,                                      /* get creation index		*/
+    NULL,                                      /* set creation index		*/
+    H5O_pline_shared_debug                     /* debug the message		*/
 }};
 
-
 /* Declare a free list to manage the H5O_pline_t struct */
 H5FL_DEFINE(H5O_pline_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_pline_decode
  *
@@ -108,15 +105,15 @@ H5FL_DEFINE(H5O_pline_t);
  */
 static void *
 H5O_pline_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t p_size, const uint8_t *p)
+                 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size,
+                 const uint8_t *p)
 {
-    H5O_pline_t		*pline = NULL;          /* Pipeline message */
-    H5Z_filter_info_t   *filter;                /* Filter to decode */
-    size_t		name_length;            /* Length of filter name */
-    size_t		i;                      /* Local index variable */
-    const uint8_t *p_end = p + p_size - 1;  /* End of the p buffer */
-    void		*ret_value = NULL;      /* Return value */
+    H5O_pline_t *      pline = NULL;               /* Pipeline message */
+    H5Z_filter_info_t *filter;                     /* Filter to decode */
+    size_t             name_length;                /* Length of filter name */
+    size_t             i;                          /* Local index variable */
+    const uint8_t *    p_end     = p + p_size - 1; /* End of the p buffer */
+    void *             ret_value = NULL;           /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -124,17 +121,17 @@ H5O_pline_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5
     HDassert(p);
 
     /* Allocate space for I/O pipeline message */
-    if(NULL == (pline = H5FL_CALLOC(H5O_pline_t)))
+    if (NULL == (pline = H5FL_CALLOC(H5O_pline_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Version */
     pline->version = *p++;
-    if(pline->version < H5O_PLINE_VERSION_1 || pline->version > H5O_PLINE_VERSION_LATEST)
+    if (pline->version < H5O_PLINE_VERSION_1 || pline->version > H5O_PLINE_VERSION_LATEST)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTLOAD, NULL, "bad version number for filter pipeline message")
 
     /* Number of filters */
     pline->nused = *p++;
-    if(pline->nused > H5Z_MAX_NFILTERS) {
+    if (pline->nused > H5Z_MAX_NFILTERS) {
 
         /* Reset the number of filters used to avoid array traversal in error
          * handling code.
@@ -145,25 +142,25 @@ H5O_pline_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5
     }
 
     /* Reserved */
-    if(pline->version == H5O_PLINE_VERSION_1)
+    if (pline->version == H5O_PLINE_VERSION_1)
         p += 6;
 
     /* Allocate array for filters */
     pline->nalloc = pline->nused;
-    if(NULL == (pline->filter = (H5Z_filter_info_t *)H5MM_calloc(pline->nalloc * sizeof(pline->filter[0]))))
+    if (NULL == (pline->filter = (H5Z_filter_info_t *)H5MM_calloc(pline->nalloc * sizeof(pline->filter[0]))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Decode filters */
-    for(i = 0, filter = &pline->filter[0]; i < pline->nused; i++, filter++) {
+    for (i = 0, filter = &pline->filter[0]; i < pline->nused; i++, filter++) {
         /* Filter ID */
         UINT16DECODE(p, filter->id);
 
         /* Length of filter name */
-        if(pline->version > H5O_PLINE_VERSION_1 && filter->id < H5Z_FILTER_RESERVED)
+        if (pline->version > H5O_PLINE_VERSION_1 && filter->id < H5Z_FILTER_RESERVED)
             name_length = 0;
         else {
             UINT16DECODE(p, name_length);
-            if(pline->version == H5O_PLINE_VERSION_1 && name_length % 8)
+            if (pline->version == H5O_PLINE_VERSION_1 && name_length % 8)
                 HGOTO_ERROR(H5E_PLINE, H5E_CANTLOAD, NULL, "filter name length is not a multiple of eight")
         } /* end if */
 
@@ -174,17 +171,17 @@ H5O_pline_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5
         UINT16DECODE(p, filter->cd_nelmts);
 
         /* Filter name, if there is one */
-        if(name_length) {
-            size_t actual_name_length;          /* Actual length of name */
+        if (name_length) {
+            size_t actual_name_length; /* Actual length of name */
 
             /* Determine actual name length (without padding, but with null terminator) */
             actual_name_length = HDstrlen((const char *)p) + 1;
             HDassert(actual_name_length <= name_length);
 
             /* Allocate space for the filter name, or use the internal buffer */
-            if(actual_name_length > H5Z_COMMON_NAME_LEN) {
+            if (actual_name_length > H5Z_COMMON_NAME_LEN) {
                 filter->name = (char *)H5MM_malloc(actual_name_length);
-                if(NULL == filter->name)
+                if (NULL == filter->name)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for filter name")
             } /* end if */
             else
@@ -195,13 +192,13 @@ H5O_pline_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5
         } /* end if */
 
         /* Filter parameters */
-        if(filter->cd_nelmts) {
-            size_t	j;              /* Local index variable */
+        if (filter->cd_nelmts) {
+            size_t j; /* Local index variable */
 
             /* Allocate space for the client data elements, or use the internal buffer */
-            if(filter->cd_nelmts > H5Z_COMMON_CD_VALUES) {
+            if (filter->cd_nelmts > H5Z_COMMON_CD_VALUES) {
                 filter->cd_values = (unsigned *)H5MM_malloc(filter->cd_nelmts * sizeof(unsigned));
-                if(NULL == filter->cd_values)
+                if (NULL == filter->cd_values)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for client data")
             } /* end if */
             else
@@ -214,20 +211,22 @@ H5O_pline_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5
                 if (p + 4 - 1 <= p_end)
                     UINT32DECODE(p, filter->cd_values[j])
                 else
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "ran off the end of the buffer: current p = %p, p_size = %zu, p_end = %p", p, p_size, p_end)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                                "ran off the end of the buffer: current p = %p, p_size = %zu, p_end = %p", p,
+                                p_size, p_end)
             }
 
-            if(pline->version == H5O_PLINE_VERSION_1)
-                if(filter->cd_nelmts % 2)
+            if (pline->version == H5O_PLINE_VERSION_1)
+                if (filter->cd_nelmts % 2)
                     p += 4; /*padding*/
-        } /* end if */
-    } /* end for */
+        }                   /* end if */
+    }                       /* end for */
 
     /* Set return value */
     ret_value = pline;
 
 done:
-    if(NULL == ret_value && pline) {
+    if (NULL == ret_value && pline) {
         H5O_pline_reset(pline);
         H5O_pline_free(pline);
     } /* end if */
@@ -235,7 +234,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_pline_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_pline_encode
  *
@@ -249,11 +247,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p/*out*/, const void *mesg)
+H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p /*out*/, const void *mesg)
 {
-    const H5O_pline_t	*pline = (const H5O_pline_t*)mesg;      /* Pipeline message to encode */
-    const       H5Z_filter_info_t *filter;      /* Filter to encode */
-    size_t	i, j;                   /* Local index variables */
+    const H5O_pline_t *      pline = (const H5O_pline_t *)mesg; /* Pipeline message to encode */
+    const H5Z_filter_info_t *filter;                            /* Filter to encode */
+    size_t                   i, j;                              /* Local index variables */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -264,37 +262,37 @@ H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p/*out*/, const void *mesg)
     /* Message header */
     *p++ = (uint8_t)pline->version;
     *p++ = (uint8_t)(pline->nused);
-    if(pline->version == H5O_PLINE_VERSION_1) {
-        *p++ = 0;	/*reserved 1*/
-        *p++ = 0;	/*reserved 2*/
-        *p++ = 0;	/*reserved 3*/
-        *p++ = 0;	/*reserved 4*/
-        *p++ = 0;	/*reserved 5*/
-        *p++ = 0;	/*reserved 6*/
-    } /* end if */
+    if (pline->version == H5O_PLINE_VERSION_1) {
+        *p++ = 0; /*reserved 1*/
+        *p++ = 0; /*reserved 2*/
+        *p++ = 0; /*reserved 3*/
+        *p++ = 0; /*reserved 4*/
+        *p++ = 0; /*reserved 5*/
+        *p++ = 0; /*reserved 6*/
+    }             /* end if */
 
     /* Encode filters */
-    for(i = 0, filter = &pline->filter[0]; i < pline->nused; i++, filter++) {
-        const char	*name;                  /* Filter name */
-        size_t		name_length;            /* Length of filter name */
+    for (i = 0, filter = &pline->filter[0]; i < pline->nused; i++, filter++) {
+        const char *name;        /* Filter name */
+        size_t      name_length; /* Length of filter name */
 
         /* Filter ID */
-	UINT16ENCODE(p, filter->id);
+        UINT16ENCODE(p, filter->id);
 
         /* Skip writing the name length & name if the filter is an internal filter */
-        if(pline->version > H5O_PLINE_VERSION_1 && filter->id < H5Z_FILTER_RESERVED) {
+        if (pline->version > H5O_PLINE_VERSION_1 && filter->id < H5Z_FILTER_RESERVED) {
             name_length = 0;
-            name = NULL;
+            name        = NULL;
         } /* end if */
         else {
-            H5Z_class2_t	*cls;                   /* Filter class */
+            H5Z_class2_t *cls; /* Filter class */
 
             /*
              * Get the filter name.  If the pipeline message has a name in it then
              * use that one.  Otherwise try to look up the filter and get the name
              * as it was registered.
              */
-            if(NULL == (name = filter->name) && (cls = H5Z_find(filter->id)))
+            if (NULL == (name = filter->name) && (cls = H5Z_find(filter->id)))
                 name = cls->name;
             name_length = name ? HDstrlen(name) + 1 : 0;
 
@@ -303,37 +301,36 @@ H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p/*out*/, const void *mesg)
         } /* end else */
 
         /* Filter flags */
-	UINT16ENCODE(p, filter->flags);
+        UINT16ENCODE(p, filter->flags);
 
         /* # of filter parameters */
-	UINT16ENCODE(p, filter->cd_nelmts);
+        UINT16ENCODE(p, filter->cd_nelmts);
 
         /* Encode name, if there is one to encode */
-	if(name_length > 0) {
+        if (name_length > 0) {
             /* Store name, with null terminator */
-	    HDmemcpy(p, name, name_length);
-	    p += name_length;
+            HDmemcpy(p, name, name_length);
+            p += name_length;
 
             /* Pad out name to alignment, in older versions */
-            if(pline->version == H5O_PLINE_VERSION_1)
-                while(name_length++ % 8)
+            if (pline->version == H5O_PLINE_VERSION_1)
+                while (name_length++ % 8)
                     *p++ = 0;
-	} /* end if */
+        } /* end if */
 
         /* Filter parameters */
-	for(j = 0; j < filter->cd_nelmts; j++)
-	    UINT32ENCODE(p, filter->cd_values[j]);
+        for (j = 0; j < filter->cd_nelmts; j++)
+            UINT32ENCODE(p, filter->cd_values[j]);
 
         /* Align the parameters for older versions of the format */
-        if(pline->version == H5O_PLINE_VERSION_1)
-            if(filter->cd_nelmts % 2)
+        if (pline->version == H5O_PLINE_VERSION_1)
+            if (filter->cd_nelmts % 2)
                 UINT32ENCODE(p, 0);
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_pline_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_pline_copy
  *
@@ -351,82 +348,83 @@ H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p/*out*/, const void *mesg)
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_pline_copy(const void *_src, void *_dst/*out*/)
+H5O_pline_copy(const void *_src, void *_dst /*out*/)
 {
-    const H5O_pline_t	*src = (const H5O_pline_t *)_src;       /* Source pipeline message */
-    H5O_pline_t		*dst = (H5O_pline_t *)_dst;             /* Destination pipeline message */
-    size_t		i;                      /* Local index variable */
-    H5O_pline_t		*ret_value;             /* Return value */
+    const H5O_pline_t *src = (const H5O_pline_t *)_src; /* Source pipeline message */
+    H5O_pline_t *      dst = (H5O_pline_t *)_dst;       /* Destination pipeline message */
+    size_t             i;                               /* Local index variable */
+    H5O_pline_t *      ret_value;                       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate pipeline message, if not provided */
-    if(!dst && NULL == (dst = H5FL_MALLOC(H5O_pline_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!dst && NULL == (dst = H5FL_MALLOC(H5O_pline_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Shallow copy basic fields */
     *dst = *src;
 
     /* Copy over filters, if any */
     dst->nalloc = dst->nused;
-    if(dst->nalloc) {
+    if (dst->nalloc) {
         /* Allocate array to hold filters */
-	if(NULL == (dst->filter = (H5Z_filter_info_t *)H5MM_calloc(dst->nalloc * sizeof(dst->filter[0]))))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+        if (NULL == (dst->filter = (H5Z_filter_info_t *)H5MM_calloc(dst->nalloc * sizeof(dst->filter[0]))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* Deep-copy filters */
-        for(i = 0; i < src->nused; i++) {
+        for (i = 0; i < src->nused; i++) {
             /* Basic filter information */
             dst->filter[i] = src->filter[i];
 
             /* Filter name */
-            if(src->filter[i].name) {
-                size_t namelen;         /* Length of source filter name, including null terminator  */
+            if (src->filter[i].name) {
+                size_t namelen; /* Length of source filter name, including null terminator  */
 
                 namelen = HDstrlen(src->filter[i].name) + 1;
 
                 /* Allocate space for the filter name, or use the internal buffer */
-                if(namelen > H5Z_COMMON_NAME_LEN) {
+                if (namelen > H5Z_COMMON_NAME_LEN) {
                     dst->filter[i].name = (char *)H5MM_strdup(src->filter[i].name);
-                    if(NULL == dst->filter[i].name)
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for filter name")
+                    if (NULL == dst->filter[i].name)
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                                    "memory allocation failed for filter name")
                 } /* end if */
                 else
                     dst->filter[i].name = dst->filter[i]._name;
             } /* end if */
 
             /* Filter parameters */
-            if(src->filter[i].cd_nelmts > 0) {
+            if (src->filter[i].cd_nelmts > 0) {
                 /* Allocate space for the client data elements, or use the internal buffer */
-                if(src->filter[i].cd_nelmts > H5Z_COMMON_CD_VALUES) {
-                    if(NULL == (dst->filter[i].cd_values = (unsigned *)H5MM_malloc(src->filter[i].cd_nelmts* sizeof(unsigned))))
+                if (src->filter[i].cd_nelmts > H5Z_COMMON_CD_VALUES) {
+                    if (NULL == (dst->filter[i].cd_values =
+                                     (unsigned *)H5MM_malloc(src->filter[i].cd_nelmts * sizeof(unsigned))))
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
                     HDmemcpy(dst->filter[i].cd_values, src->filter[i].cd_values,
-                            src->filter[i].cd_nelmts * sizeof(unsigned));
+                             src->filter[i].cd_nelmts * sizeof(unsigned));
                 } /* end if */
                 else
                     dst->filter[i].cd_values = dst->filter[i]._cd_values;
             } /* end if */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
     else
-	dst->filter = NULL;
+        dst->filter = NULL;
 
     /* Set return value */
     ret_value = dst;
 
 done:
-    if(!ret_value && dst) {
+    if (!ret_value && dst) {
         H5O_pline_reset(dst);
-	if(!_dst)
+        if (!_dst)
             H5O_pline_free(dst);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_pline_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_pline_size
  *
@@ -444,50 +442,53 @@ done:
 static size_t
 H5O_pline_size(const H5F_t H5_ATTR_UNUSED *f, const void *mesg)
 {
-    const H5O_pline_t	*pline = (const H5O_pline_t*)mesg;      /* Pipeline message */
-    size_t i;                   /* Local index variable */
-    size_t ret_value;           /* Return value */
+    const H5O_pline_t *pline = (const H5O_pline_t *)mesg; /* Pipeline message */
+    size_t             i;                                 /* Local index variable */
+    size_t             ret_value;                         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Message header */
-    ret_value = 1 +			/*version			*/
-	   1 +				/*number of filters		*/
-	   (pline->version == H5O_PLINE_VERSION_1 ? 6 : 0);	/*reserved			*/
+    ret_value = 1 +                                              /*version			*/
+                1 +                                              /*number of filters		*/
+                (pline->version == H5O_PLINE_VERSION_1 ? 6 : 0); /*reserved			*/
 
     /* Calculate size of each filter in pipeline */
-    for(i = 0; i < pline->nused; i++) {
-        size_t	name_len;               /* Length of filter name */
-        const char *name;               /* Filter name */
+    for (i = 0; i < pline->nused; i++) {
+        size_t      name_len; /* Length of filter name */
+        const char *name;     /* Filter name */
 
         /* Don't write the name length & name if the filter is an internal filter */
-        if(pline->version > H5O_PLINE_VERSION_1 && pline->filter[i].id < H5Z_FILTER_RESERVED)
+        if (pline->version > H5O_PLINE_VERSION_1 && pline->filter[i].id < H5Z_FILTER_RESERVED)
             name_len = 0;
         else {
-            H5Z_class2_t	*cls;                   /* Filter class */
+            H5Z_class2_t *cls; /* Filter class */
 
             /* Get the name of the filter, same as done with H5O_pline_encode() */
-            if(NULL == (name = pline->filter[i].name) && (cls = H5Z_find(pline->filter[i].id)))
+            if (NULL == (name = pline->filter[i].name) && (cls = H5Z_find(pline->filter[i].id)))
                 name = cls->name;
             name_len = name ? HDstrlen(name) + 1 : 0;
         } /* end else */
 
-	ret_value += 2 +			/*filter identification number	*/
-		(size_t)((pline->version == H5O_PLINE_VERSION_1 || pline->filter[i].id >= H5Z_FILTER_RESERVED) ? 2 : 0) +				/*name length			*/
-		2 +				/*flags				*/
-		2 +				/*number of client data values	*/
-		(pline->version == H5O_PLINE_VERSION_1 ? (size_t)H5O_ALIGN_OLD(name_len) : name_len);	/*length of the filter name	*/
-
-	ret_value += pline->filter[i].cd_nelmts * 4;
-        if(pline->version == H5O_PLINE_VERSION_1)
-            if(pline->filter[i].cd_nelmts % 2)
+        ret_value +=
+            2 + /*filter identification number	*/
+            (size_t)((pline->version == H5O_PLINE_VERSION_1 || pline->filter[i].id >= H5Z_FILTER_RESERVED)
+                         ? 2
+                         : 0) + /*name length			*/
+            2 +                 /*flags				*/
+            2 +                 /*number of client data values	*/
+            (pline->version == H5O_PLINE_VERSION_1 ? (size_t)H5O_ALIGN_OLD(name_len)
+                                                   : name_len); /*length of the filter name	*/
+
+        ret_value += pline->filter[i].cd_nelmts * 4;
+        if (pline->version == H5O_PLINE_VERSION_1)
+            if (pline->filter[i].cd_nelmts % 2)
                 ret_value += 4;
     } /* end for */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_pline_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_pline_reset
  *
@@ -504,8 +505,8 @@ H5O_pline_size(const H5F_t H5_ATTR_UNUSED *f, const void *mesg)
 static herr_t
 H5O_pline_reset(void *mesg)
 {
-    H5O_pline_t	*pline = (H5O_pline_t*)mesg;    /* Pipeline message */
-    size_t	i;                              /* Local index variable */
+    H5O_pline_t *pline = (H5O_pline_t *)mesg; /* Pipeline message */
+    size_t       i;                           /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -519,14 +520,14 @@ H5O_pline_reset(void *mesg)
     if (pline->filter) {
 
         /* Free information for each filter */
-        for(i = 0; i < pline->nused; i++) {
-            if(pline->filter[i].name && pline->filter[i].name != pline->filter[i]._name)
+        for (i = 0; i < pline->nused; i++) {
+            if (pline->filter[i].name && pline->filter[i].name != pline->filter[i]._name)
                 HDassert((HDstrlen(pline->filter[i].name) + 1) > H5Z_COMMON_NAME_LEN);
-            if(pline->filter[i].name != pline->filter[i]._name)
+            if (pline->filter[i].name != pline->filter[i]._name)
                 pline->filter[i].name = (char *)H5MM_xfree(pline->filter[i].name);
-            if(pline->filter[i].cd_values && pline->filter[i].cd_values != pline->filter[i]._cd_values)
+            if (pline->filter[i].cd_values && pline->filter[i].cd_values != pline->filter[i]._cd_values)
                 HDassert(pline->filter[i].cd_nelmts > H5Z_COMMON_CD_VALUES);
-            if(pline->filter[i].cd_values != pline->filter[i]._cd_values)
+            if (pline->filter[i].cd_values != pline->filter[i]._cd_values)
                 pline->filter[i].cd_values = (unsigned *)H5MM_xfree(pline->filter[i].cd_values);
         } /* end for */
 
@@ -543,7 +544,6 @@ H5O_pline_reset(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_pline_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_pline_free
  *
@@ -568,7 +568,6 @@ H5O_pline_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_pline_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_pline_pre_copy_file
  *
@@ -585,12 +584,12 @@ H5O_pline_free(void *mesg)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_pline_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src,
-    hbool_t H5_ATTR_UNUSED *deleted, const H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata)
+H5O_pline_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src, hbool_t H5_ATTR_UNUSED *deleted,
+                        const H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata)
 {
-    const H5O_pline_t *pline_src = (const H5O_pline_t *)mesg_src;    /* Source datatype */
-    H5O_copy_file_ud_common_t *udata = (H5O_copy_file_ud_common_t *)_udata; /* Object copying user data */
-    herr_t             ret_value = SUCCEED;                     /* Return value */
+    const H5O_pline_t *        pline_src = (const H5O_pline_t *)mesg_src;       /* Source datatype */
+    H5O_copy_file_ud_common_t *udata     = (H5O_copy_file_ud_common_t *)_udata; /* Object copying user data */
+    herr_t                     ret_value = SUCCEED;                             /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -601,15 +600,14 @@ H5O_pline_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src,
      * and make a copy of the filter pipeline for later in
      * the object copying process.
      */
-    if(udata)
-        if(NULL == (udata->src_pline = (H5O_pline_t *)H5O_pline_copy(pline_src, NULL)))
+    if (udata)
+        if (NULL == (udata->src_pline = (H5O_pline_t *)H5O_pline_copy(pline_src, NULL)))
             HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to copy")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_pline_pre_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_pline_debug
  *
@@ -626,10 +624,10 @@ done:
  */
 static herr_t
 H5O_pline_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *mesg, FILE *stream,
-		int indent, int fwidth)
+                int indent, int fwidth)
 {
-    const H5O_pline_t	*pline = (const H5O_pline_t *)mesg;
-    size_t		i, j;
+    const H5O_pline_t *pline = (const H5O_pline_t *)mesg;
+    size_t             i, j;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -640,49 +638,40 @@ H5O_pline_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const voi
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %Zu/%Zu\n", indent, "", fwidth,
-	    "Number of filters:",
-	    pline->nused,
-	    pline->nalloc);
+    HDfprintf(stream, "%*s%-*s %Zu/%Zu\n", indent, "", fwidth, "Number of filters:", pline->nused,
+              pline->nalloc);
 
     /* Loop over all the filters */
-    for(i = 0; i < pline->nused; i++) {
-	char		name[32];
-
-	HDsnprintf(name, sizeof(name), "Filter at position %u", (unsigned)i);
-	HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, name);
-	HDfprintf(stream, "%*s%-*s 0x%04x\n", indent + 3, "", MAX(0, fwidth - 3),
-		"Filter identification:",
-		(unsigned)(pline->filter[i].id));
-	if(pline->filter[i].name)
-	    HDfprintf(stream, "%*s%-*s \"%s\"\n", indent + 3, "", MAX(0, fwidth - 3),
-		    "Filter name:",
-		    pline->filter[i].name);
-	else
-	    HDfprintf(stream, "%*s%-*s NONE\n", indent + 3, "", MAX(0, fwidth - 3),
-		    "Filter name:");
-	HDfprintf(stream, "%*s%-*s 0x%04x\n", indent + 3, "", MAX(0, fwidth - 3),
-		"Flags:",
-		pline->filter[i].flags);
-	HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3),
-		"Num CD values:",
-		pline->filter[i].cd_nelmts);
+    for (i = 0; i < pline->nused; i++) {
+        char name[32];
+
+        HDsnprintf(name, sizeof(name), "Filter at position %u", (unsigned)i);
+        HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, name);
+        HDfprintf(stream, "%*s%-*s 0x%04x\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Filter identification:", (unsigned)(pline->filter[i].id));
+        if (pline->filter[i].name)
+            HDfprintf(stream, "%*s%-*s \"%s\"\n", indent + 3, "", MAX(0, fwidth - 3),
+                      "Filter name:", pline->filter[i].name);
+        else
+            HDfprintf(stream, "%*s%-*s NONE\n", indent + 3, "", MAX(0, fwidth - 3), "Filter name:");
+        HDfprintf(stream, "%*s%-*s 0x%04x\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Flags:", pline->filter[i].flags);
+        HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Num CD values:", pline->filter[i].cd_nelmts);
 
         /* Filter parameters */
-	for(j = 0; j < pline->filter[i].cd_nelmts; j++) {
-	    char	field_name[32];
-
-	    HDsnprintf(field_name, sizeof(field_name), "CD value %lu", (unsigned long)j);
-	    HDfprintf(stream, "%*s%-*s %u\n", indent + 6, "", MAX(0, fwidth - 6),
-		    field_name,
-		    pline->filter[i].cd_values[j]);
-	} /* end for */
-    } /* end for */
+        for (j = 0; j < pline->filter[i].cd_nelmts; j++) {
+            char field_name[32];
+
+            HDsnprintf(field_name, sizeof(field_name), "CD value %lu", (unsigned long)j);
+            HDfprintf(stream, "%*s%-*s %u\n", indent + 6, "", MAX(0, fwidth - 6), field_name,
+                      pline->filter[i].cd_values[j]);
+        } /* end for */
+    }     /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_pline_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_pline_set_latest_version
  *
@@ -708,4 +697,3 @@ H5O_pline_set_latest_version(H5O_pline_t *pline)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_pline_set_latest_version() */
-
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 5e806cd..8665c49 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -25,24 +25,24 @@
 #define _H5Oprivate_H
 
 /* Include the public header file for this API */
-#include "H5Opublic.h"          /* Object header functions              */
+#include "H5Opublic.h" /* Object header functions              */
 
 /* Public headers needed by this file */
-#include "H5Dpublic.h"          /* Dataset functions                    */
-#include "H5Lpublic.h"		/* Link functions                       */
-#include "H5Spublic.h"		/* Dataspace functions			*/
+#include "H5Dpublic.h" /* Dataset functions                    */
+#include "H5Lpublic.h" /* Link functions                       */
+#include "H5Spublic.h" /* Dataspace functions			*/
 
 /* Private headers needed by this file */
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5SLprivate.h"	/* Skip lists				*/
-#include "H5Tprivate.h"		/* Datatype functions			*/
-#include "H5Zprivate.h"         /* I/O pipeline filters			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5SLprivate.h" /* Skip lists				*/
+#include "H5Tprivate.h"  /* Datatype functions			*/
+#include "H5Zprivate.h"  /* I/O pipeline filters			*/
 
 /* Forward references of package typedefs */
 typedef struct H5O_msg_class_t H5O_msg_class_t;
-typedef struct H5O_mesg_t H5O_mesg_t;
-typedef struct H5O_t H5O_t;
+typedef struct H5O_mesg_t      H5O_mesg_t;
+typedef struct H5O_t           H5O_t;
 
 /* Values used to create the shared message & attribute heaps */
 /* (Note that these parameters have been tuned so that the resulting heap ID
@@ -50,33 +50,36 @@ typedef struct H5O_t H5O_t;
  *      directly in an 8 byte integer in memory, think carefully before changing it.
  *      -QAK)
  */
-#define H5O_FHEAP_MAN_WIDTH                     4
-#define H5O_FHEAP_MAN_START_BLOCK_SIZE          1024
-#define H5O_FHEAP_MAN_MAX_DIRECT_SIZE           (64 * 1024)
-#define H5O_FHEAP_MAN_MAX_INDEX                 40
-#define H5O_FHEAP_MAN_START_ROOT_ROWS           1
-#define H5O_FHEAP_CHECKSUM_DBLOCKS              TRUE
-#define H5O_FHEAP_MAX_MAN_SIZE                  (4 * 1024)
-#define H5O_FHEAP_ID_LEN                        8
+#define H5O_FHEAP_MAN_WIDTH            4
+#define H5O_FHEAP_MAN_START_BLOCK_SIZE 1024
+#define H5O_FHEAP_MAN_MAX_DIRECT_SIZE  (64 * 1024)
+#define H5O_FHEAP_MAN_MAX_INDEX        40
+#define H5O_FHEAP_MAN_START_ROOT_ROWS  1
+#define H5O_FHEAP_CHECKSUM_DBLOCKS     TRUE
+#define H5O_FHEAP_MAX_MAN_SIZE         (4 * 1024)
+#define H5O_FHEAP_ID_LEN               8
 
 /* Object header macros */
-#define H5O_MESG_MAX_SIZE	65536	/*max obj header message size	     */
-#define H5O_ALL		(-1)		/* Operate on all messages of type   */
-#define H5O_FIRST	(-2)		/* Operate on first message of type  */
+#define H5O_MESG_MAX_SIZE 65536 /*max obj header message size	     */
+#define H5O_ALL           (-1)  /* Operate on all messages of type   */
+#define H5O_FIRST         (-2)  /* Operate on first message of type  */
 
 /* Flags needed when encoding messages */
-#define H5O_MSG_FLAG_CONSTANT	0x01u
-#define H5O_MSG_FLAG_SHARED	0x02u
-#define H5O_MSG_FLAG_DONTSHARE	0x04u
+#define H5O_MSG_FLAG_CONSTANT                           0x01u
+#define H5O_MSG_FLAG_SHARED                             0x02u
+#define H5O_MSG_FLAG_DONTSHARE                          0x04u
 #define H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE 0x08u
-#define H5O_MSG_FLAG_MARK_IF_UNKNOWN 0x10u
-#define H5O_MSG_FLAG_WAS_UNKNOWN 0x20u
-#define H5O_MSG_FLAG_SHAREABLE  0x40u
-#define H5O_MSG_FLAG_BITS	(H5O_MSG_FLAG_CONSTANT|H5O_MSG_FLAG_SHARED|H5O_MSG_FLAG_DONTSHARE|H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE|H5O_MSG_FLAG_MARK_IF_UNKNOWN|H5O_MSG_FLAG_WAS_UNKNOWN|H5O_MSG_FLAG_SHAREABLE)
+#define H5O_MSG_FLAG_MARK_IF_UNKNOWN                    0x10u
+#define H5O_MSG_FLAG_WAS_UNKNOWN                        0x20u
+#define H5O_MSG_FLAG_SHAREABLE                          0x40u
+#define H5O_MSG_FLAG_BITS                                                                                    \
+    (H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_SHARED | H5O_MSG_FLAG_DONTSHARE |                                  \
+     H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE | H5O_MSG_FLAG_MARK_IF_UNKNOWN |                        \
+     H5O_MSG_FLAG_WAS_UNKNOWN | H5O_MSG_FLAG_SHAREABLE)
 
 /* Flags for updating messages */
-#define H5O_UPDATE_TIME         0x01u
-#define H5O_UPDATE_FORCE        0x02u   /* Force updating the message */
+#define H5O_UPDATE_TIME  0x01u
+#define H5O_UPDATE_FORCE 0x02u /* Force updating the message */
 
 /* Hash value constants */
 #define H5O_HASH_SIZE 32
@@ -85,121 +88,128 @@ typedef struct H5O_t H5O_t;
 /* #define H5O_ENABLE_BOGUS */
 
 /* ========= Object Creation properties ============ */
-#define H5O_CRT_ATTR_MAX_COMPACT_NAME	"max compact attr"      /* Max. # of attributes to store compactly */
-#define H5O_CRT_ATTR_MIN_DENSE_NAME	"min dense attr"	/* Min. # of attributes to store densely */
-#define H5O_CRT_OHDR_FLAGS_NAME		"object header flags"	/* Object header flags */
-#define H5O_CRT_PIPELINE_NAME           "pline"                 /* Filter pipeline */
-#define H5O_CRT_PIPELINE_DEF            {{0, NULL, H5O_NULL_ID, {{0, HADDR_UNDEF}}}, H5O_PLINE_VERSION_1, 0, 0, NULL}
+#define H5O_CRT_ATTR_MAX_COMPACT_NAME "max compact attr"    /* Max. # of attributes to store compactly */
+#define H5O_CRT_ATTR_MIN_DENSE_NAME   "min dense attr"      /* Min. # of attributes to store densely */
+#define H5O_CRT_OHDR_FLAGS_NAME       "object header flags" /* Object header flags */
+#define H5O_CRT_PIPELINE_NAME         "pline"               /* Filter pipeline */
+#define H5O_CRT_PIPELINE_DEF                                                                                 \
+    {                                                                                                        \
+        {0, NULL, H5O_NULL_ID, {{0, HADDR_UNDEF}}}, H5O_PLINE_VERSION_1, 0, 0, NULL                          \
+    }
 #ifdef H5O_ENABLE_BOGUS
-#define H5O_BOGUS_MSG_FLAGS_NAME        "bogus msg flags"       /* Flags for 'bogus' message */
-#define H5O_BOGUS_MSG_FLAGS_SIZE        sizeof(uint8_t)
+#define H5O_BOGUS_MSG_FLAGS_NAME "bogus msg flags" /* Flags for 'bogus' message */
+#define H5O_BOGUS_MSG_FLAGS_SIZE sizeof(uint8_t)
 
 /* bogus ID can be either (a) H5O_BOGUS_VALID_ID or (b) H5O_BOGUS_INVALID_ID */
-#define H5O_BOGUS_MSG_ID_NAME        "bogus msg id"         /* ID for 'bogus' message */
-#define H5O_BOGUS_MSG_ID_SIZE        sizeof(unsigned)
+#define H5O_BOGUS_MSG_ID_NAME "bogus msg id" /* ID for 'bogus' message */
+#define H5O_BOGUS_MSG_ID_SIZE sizeof(unsigned)
 
 #endif /* H5O_ENABLE_BOGUS */
 #ifdef H5O_ENABLE_BAD_MESG_COUNT
-#define H5O_BAD_MESG_COUNT_NAME         "bad message count"       /* Flag setting bad message count */
-#define H5O_BAD_MESG_COUNT_SIZE         sizeof(hbool_t)
+#define H5O_BAD_MESG_COUNT_NAME "bad message count" /* Flag setting bad message count */
+#define H5O_BAD_MESG_COUNT_SIZE sizeof(hbool_t)
 #endif /* H5O_ENABLE_BAD_MESG_COUNT */
 
 /* ========= Object Copy properties ============ */
-#define H5O_CPY_OPTION_NAME 		 "copy object"           /* Copy options */
-#define H5O_CPY_MERGE_COMM_DT_LIST_NAME "merge committed dtype list"   /* List of datatype paths to search in the dest file for merging */
-#define H5O_CPY_MCDT_SEARCH_CB_NAME 	 "committed dtype list search" /* Callback function when the search for a matching committed datatype is complete */
+#define H5O_CPY_OPTION_NAME "copy object" /* Copy options */
+#define H5O_CPY_MERGE_COMM_DT_LIST_NAME                                                                      \
+    "merge committed dtype list" /* List of datatype paths to search in the dest file for merging */
+#define H5O_CPY_MCDT_SEARCH_CB_NAME                                                                          \
+    "committed dtype list search" /* Callback function when the search for a matching committed datatype is  \
+                                     complete */
 
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5O_PACKAGE
-#define H5O_OH_GET_ADDR(O)    ((O)->chunk[0].addr)
+#define H5O_OH_GET_ADDR(O) ((O)->chunk[0].addr)
 #else /* H5O_PACKAGE */
-#define H5O_OH_GET_ADDR(O)    (H5O_get_oh_addr(O))
+#define H5O_OH_GET_ADDR(O) (H5O_get_oh_addr(O))
 #endif /* H5O_PACKAGE */
 
 /* Set the fields in a shared message structure */
-#define H5O_UPDATE_SHARED(SH_MESG, SH_TYPE, F, MSG_TYPE, CRT_IDX, OH_ADDR)    \
-    {                                                                         \
-        (SH_MESG)->type = (SH_TYPE);                                          \
-        (SH_MESG)->file = (F);                                                \
-        (SH_MESG)->msg_type_id = (MSG_TYPE);                                  \
-        (SH_MESG)->u.loc.index = (CRT_IDX);                                   \
-        (SH_MESG)->u.loc.oh_addr = (OH_ADDR);                                 \
+#define H5O_UPDATE_SHARED(SH_MESG, SH_TYPE, F, MSG_TYPE, CRT_IDX, OH_ADDR)                                   \
+    {                                                                                                        \
+        (SH_MESG)->type          = (SH_TYPE);                                                                \
+        (SH_MESG)->file          = (F);                                                                      \
+        (SH_MESG)->msg_type_id   = (MSG_TYPE);                                                               \
+        (SH_MESG)->u.loc.index   = (CRT_IDX);                                                                \
+        (SH_MESG)->u.loc.oh_addr = (OH_ADDR);                                                                \
     } /* end block */
 
-
 /* Fractal heap ID type for shared message & attribute heap IDs. */
 typedef union {
-    uint8_t id[H5O_FHEAP_ID_LEN];       /* Buffer to hold ID, for encoding/decoding */
-    uint64_t val;                       /* Value, for quick comparisons */
+    uint8_t  id[H5O_FHEAP_ID_LEN]; /* Buffer to hold ID, for encoding/decoding */
+    uint64_t val;                  /* Value, for quick comparisons */
 } H5O_fheap_id_t;
 
 /* The object location information for an object */
 typedef struct H5O_loc_t {
-    H5F_t       *file;          /* File that object header is located within */
-    haddr_t     addr;           /* File address of object header */
-    hbool_t     holding_file;   /* True if this object header has incremented
-                                 * its file's count of open objects. */
+    H5F_t * file;         /* File that object header is located within */
+    haddr_t addr;         /* File address of object header */
+    hbool_t holding_file; /* True if this object header has incremented
+                           * its file's count of open objects. */
 } H5O_loc_t;
 
 /* Typedef for linked list of datatype merge suggestions */
 typedef struct H5O_copy_dtype_merge_list_t {
-    char *path; /* Path to datatype in destination file */
+    char *                              path; /* Path to datatype in destination file */
     struct H5O_copy_dtype_merge_list_t *next; /* Next object in list */
 } H5O_copy_dtype_merge_list_t;
 
 /* Structure for callback property before searching the global list of committed datatypes at destination */
 typedef struct H5O_mcdt_cb_info_t {
-    H5O_mcdt_search_cb_t 	func;
-    void  			*user_data;
+    H5O_mcdt_search_cb_t func;
+    void *               user_data;
 } H5O_mcdt_cb_info_t;
 
 /* Settings/flags for copying an object */
 typedef struct H5O_copy_t {
-    hbool_t copy_shallow;               /* Flag to perform shallow hierarchy copy */
-    hbool_t expand_soft_link;           /* Flag to expand soft links */
-    hbool_t expand_ext_link;            /* Flag to expand external links */
-    hbool_t expand_ref;                 /* Flag to expand object references */
-    hbool_t copy_without_attr;          /* Flag to not copy attributes */
-    hbool_t preserve_null;              /* Flag to not delete NULL messages */
-    hbool_t merge_comm_dt;             /* Flag to merge committed datatypes in dest file */
+    hbool_t                      copy_shallow;           /* Flag to perform shallow hierarchy copy */
+    hbool_t                      expand_soft_link;       /* Flag to expand soft links */
+    hbool_t                      expand_ext_link;        /* Flag to expand external links */
+    hbool_t                      expand_ref;             /* Flag to expand object references */
+    hbool_t                      copy_without_attr;      /* Flag to not copy attributes */
+    hbool_t                      preserve_null;          /* Flag to not delete NULL messages */
+    hbool_t                      merge_comm_dt;          /* Flag to merge committed datatypes in dest file */
     H5O_copy_dtype_merge_list_t *dst_dt_suggestion_list; /* Suggestions for merging committed datatypes */
-    int     curr_depth;                 /* Current depth in hierarchy copied */
-    int     max_depth;                  /* Maximum depth in hierarchy to copy */
-    H5SL_t  *map_list;                  /* Skip list to hold address mappings */
-    H5SL_t  *dst_dt_list;               /* Skip list to hold committed datatypes in dest file */
-    hbool_t dst_dt_list_complete;       /* Whether the destination datatype list is complete (i.e. not only populated with "suggestions" from H5Padd_merge_committed_dtype_path) */
-    H5O_t   *oh_dst;                    /* The destination object header */
-    void    *shared_fo;                 /* The shared pointer for the object */
-    H5O_mcdt_search_cb_t mcdt_cb;	/* The callback to invoke before searching the global list of committed datatypes at destination */
-    void *mcdt_ud;			/* User data passed to callback */
+    int                          curr_depth;             /* Current depth in hierarchy copied */
+    int                          max_depth;              /* Maximum depth in hierarchy to copy */
+    H5SL_t *                     map_list;               /* Skip list to hold address mappings */
+    H5SL_t *                     dst_dt_list; /* Skip list to hold committed datatypes in dest file */
+    hbool_t dst_dt_list_complete;   /* Whether the destination datatype list is complete (i.e. not only
+                                       populated with "suggestions" from H5Padd_merge_committed_dtype_path) */
+    H5O_t *              oh_dst;    /* The destination object header */
+    void *               shared_fo; /* The shared pointer for the object */
+    H5O_mcdt_search_cb_t mcdt_cb;   /* The callback to invoke before searching the global list of committed
+                                       datatypes at destination */
+    void *mcdt_ud;                  /* User data passed to callback */
 } H5O_copy_t;
 
 /* Header message IDs */
-#define H5O_NULL_ID             0x0000  /* Null Message.  */
-#define H5O_SDSPACE_ID          0x0001  /* Dataspace Message. */
-#define H5O_LINFO_ID            0x0002  /* Link info Message. */
-#define H5O_DTYPE_ID            0x0003  /* Datatype Message.  */
-#define H5O_FILL_ID             0x0004  /* Fill Value Message. (Old)  */
-#define H5O_FILL_NEW_ID         0x0005  /* Fill Value Message. (New)  */
-#define H5O_LINK_ID             0x0006  /* Link Message. */
-#define H5O_EFL_ID              0x0007  /* External File List Message  */
-#define H5O_LAYOUT_ID           0x0008  /* Data Layout Message.  */
-#define H5O_BOGUS_VALID_ID      0x0009  /* "Bogus valid" Message.  */
-#define H5O_GINFO_ID            0x000a  /* Group info Message.  */
-#define H5O_PLINE_ID            0x000b  /* Filter pipeline message.  */
-#define H5O_ATTR_ID             0x000c  /* Attribute Message.  */
-#define H5O_NAME_ID             0x000d  /* Object name message.  */
-#define H5O_MTIME_ID            0x000e  /* Modification time message. (Old)  */
-#define H5O_SHMESG_ID           0x000f  /* Shared message "SOHM" table. */
-#define H5O_CONT_ID             0x0010  /* Object header continuation message.  */
-#define H5O_STAB_ID             0x0011  /* Symbol table message.  */
-#define H5O_MTIME_NEW_ID        0x0012  /* Modification time message. (New)  */
-#define H5O_BTREEK_ID           0x0013  /* v1 B-tree 'K' values message.  */
-#define H5O_DRVINFO_ID          0x0014  /* Driver info message.  */
-#define H5O_AINFO_ID            0x0015  /* Attribute info message.  */
-#define H5O_REFCOUNT_ID         0x0016  /* Reference count message.  */
-#define H5O_UNKNOWN_ID          0x0017  /* Placeholder message ID for unknown message.  */
-                                        /* (this should never exist in a file) */
+#define H5O_NULL_ID        0x0000 /* Null Message.  */
+#define H5O_SDSPACE_ID     0x0001 /* Dataspace Message. */
+#define H5O_LINFO_ID       0x0002 /* Link info Message. */
+#define H5O_DTYPE_ID       0x0003 /* Datatype Message.  */
+#define H5O_FILL_ID        0x0004 /* Fill Value Message. (Old)  */
+#define H5O_FILL_NEW_ID    0x0005 /* Fill Value Message. (New)  */
+#define H5O_LINK_ID        0x0006 /* Link Message. */
+#define H5O_EFL_ID         0x0007 /* External File List Message  */
+#define H5O_LAYOUT_ID      0x0008 /* Data Layout Message.  */
+#define H5O_BOGUS_VALID_ID 0x0009 /* "Bogus valid" Message.  */
+#define H5O_GINFO_ID       0x000a /* Group info Message.  */
+#define H5O_PLINE_ID       0x000b /* Filter pipeline message.  */
+#define H5O_ATTR_ID        0x000c /* Attribute Message.  */
+#define H5O_NAME_ID        0x000d /* Object name message.  */
+#define H5O_MTIME_ID       0x000e /* Modification time message. (Old)  */
+#define H5O_SHMESG_ID      0x000f /* Shared message "SOHM" table. */
+#define H5O_CONT_ID        0x0010 /* Object header continuation message.  */
+#define H5O_STAB_ID        0x0011 /* Symbol table message.  */
+#define H5O_MTIME_NEW_ID   0x0012 /* Modification time message. (New)  */
+#define H5O_BTREEK_ID      0x0013 /* v1 B-tree 'K' values message.  */
+#define H5O_DRVINFO_ID     0x0014 /* Driver info message.  */
+#define H5O_AINFO_ID       0x0015 /* Attribute info message.  */
+#define H5O_REFCOUNT_ID    0x0016 /* Reference count message.  */
+#define H5O_UNKNOWN_ID     0x0017 /* Placeholder message ID for unknown message.  */
+                                  /* (this should never exist in a file) */
 
 /*
  * Note: Must increment H5O_MSG_TYPES in H5Opkg.h and update H5O_msg_class_g
@@ -209,34 +219,33 @@ typedef struct H5O_copy_t {
  *
  * (this should never exist in a file)
  */
-#define H5O_BOGUS_INVALID_ID    0x0018  /* "Bogus invalid" Message.  */
+#define H5O_BOGUS_INVALID_ID 0x0018 /* "Bogus invalid" Message.  */
 
 /* Shared object message types.
  * Shared objects can be committed, in which case the shared message contains
  * the location of the object header that holds the message, or shared in the
  * heap, in which case the shared message holds their heap ID.
  */
-#define H5O_SHARE_TYPE_UNSHARED     0           /* Message is not shared */
-#define H5O_SHARE_TYPE_SOHM         1           /* Message is stored in SOHM heap */
-#define H5O_SHARE_TYPE_COMMITTED    2           /* Message is stored in another object header */
-#define H5O_SHARE_TYPE_HERE         3           /* Message is stored in this object header, but is sharable */
+#define H5O_SHARE_TYPE_UNSHARED  0 /* Message is not shared */
+#define H5O_SHARE_TYPE_SOHM      1 /* Message is stored in SOHM heap */
+#define H5O_SHARE_TYPE_COMMITTED 2 /* Message is stored in another object header */
+#define H5O_SHARE_TYPE_HERE      3 /* Message is stored in this object header, but is sharable */
 
 /* Detect messages that aren't stored in message's object header */
-#define H5O_IS_STORED_SHARED(T) ((((T) == H5O_SHARE_TYPE_SOHM) || ((T) == H5O_SHARE_TYPE_COMMITTED)) ? TRUE : FALSE)
+#define H5O_IS_STORED_SHARED(T)                                                                              \
+    ((((T) == H5O_SHARE_TYPE_SOHM) || ((T) == H5O_SHARE_TYPE_COMMITTED)) ? TRUE : FALSE)
 
 /* Detect shared messages that are "tracked" in some other location */
 #define H5O_IS_TRACKED_SHARED(T) ((T) > 0)
 
-
 /* Specify the object header address and index needed
  *      to locate a message in another object header.
  */
 typedef struct H5O_mesg_loc_t {
-    H5O_msg_crt_idx_t index;            /* index within object header   */
-    haddr_t oh_addr;                    /* address of object header    */
+    H5O_msg_crt_idx_t index;   /* index within object header   */
+    haddr_t           oh_addr; /* address of object header    */
 } H5O_mesg_loc_t;
 
-
 /*
  * Shared object header message info.
  *
@@ -244,16 +253,15 @@ typedef struct H5O_mesg_loc_t {
  * include a H5O_shared_t struct as the first field in their "native" type)
  */
 typedef struct H5O_shared_t {
-    unsigned type;                      /* Type describing how message is shared */
-    H5F_t *file;                        /* File that message is located within */
-    unsigned msg_type_id;               /* Message's type ID */
+    unsigned type;        /* Type describing how message is shared */
+    H5F_t *  file;        /* File that message is located within */
+    unsigned msg_type_id; /* Message's type ID */
     union {
-        H5O_mesg_loc_t	loc;		/* Object location info		     */
-        H5O_fheap_id_t  heap_id;        /* ID within the SOHM heap           */
+        H5O_mesg_loc_t loc;     /* Object location info		     */
+        H5O_fheap_id_t heap_id; /* ID within the SOHM heap           */
     } u;
 } H5O_shared_t;
 
-
 /*
  * Link Info Message.
  * (Contains dynamic information about links in a group)
@@ -268,24 +276,24 @@ typedef struct H5O_shared_t {
  */
 typedef struct H5O_linfo_t {
     /* Creation order info */
-    hbool_t     track_corder;           /* Are creation order values tracked on links? */
-    hbool_t     index_corder;           /* Are creation order values indexed on links? */
-    int64_t     max_corder;             /* Current max. creation order value for group */
-    haddr_t     corder_bt2_addr;        /* Address of v2 B-tree for indexing creation order values of links */
+    hbool_t track_corder;    /* Are creation order values tracked on links? */
+    hbool_t index_corder;    /* Are creation order values indexed on links? */
+    int64_t max_corder;      /* Current max. creation order value for group */
+    haddr_t corder_bt2_addr; /* Address of v2 B-tree for indexing creation order values of links */
 
     /* Storage management info */
-    hsize_t     nlinks;                 /* Number of links in the group      */
-    haddr_t     fheap_addr;             /* Address of fractal heap for storing "dense" links */
-    haddr_t     name_bt2_addr;          /* Address of v2 B-tree for indexing names of links */
+    hsize_t nlinks;        /* Number of links in the group      */
+    haddr_t fheap_addr;    /* Address of fractal heap for storing "dense" links */
+    haddr_t name_bt2_addr; /* Address of v2 B-tree for indexing names of links */
 } H5O_linfo_t;
 
 /* Initial version of the "old" fill value information */
 /* (It doesn't look like this value was ever used in the file -QAK) */
-#define H5O_FILL_VERSION_1 	1
+#define H5O_FILL_VERSION_1 1
 /* Revised version of the "new" fill value information */
-#define H5O_FILL_VERSION_2 	2
+#define H5O_FILL_VERSION_2 2
 /* Version of the "new" fill value information with smaller default format */
-#define H5O_FILL_VERSION_3 	3
+#define H5O_FILL_VERSION_3 3
 
 /* The latest version of the format.  Look through the 'encode', 'decode'
  *      and 'size' callback for places to change when updating this. */
@@ -301,15 +309,15 @@ typedef struct H5O_linfo_t {
  */
 
 typedef struct H5O_fill_t {
-    H5O_shared_t        sh_loc;         /* Shared message info (must be first) */
-
-    unsigned	        version;	/* Encoding version number           */
-    H5T_t		*type;		/*type. Null implies same as dataset */
-    ssize_t		size;		/*number of bytes in the fill value  */
-    void		*buf;		/*the fill value		     */
-    H5D_alloc_time_t	alloc_time;	/* time to allocate space	     */
-    H5D_fill_time_t	fill_time;	/* time to write fill value	     */
-    hbool_t		fill_defined;   /* whether fill value is defined     */
+    H5O_shared_t sh_loc; /* Shared message info (must be first) */
+
+    unsigned         version;      /* Encoding version number           */
+    H5T_t *          type;         /*type. Null implies same as dataset */
+    ssize_t          size;         /*number of bytes in the fill value  */
+    void *           buf;          /*the fill value		     */
+    H5D_alloc_time_t alloc_time;   /* time to allocate space	     */
+    H5D_fill_time_t  fill_time;    /* time to write fill value	     */
+    hbool_t          fill_defined; /* whether fill value is defined     */
 } H5O_fill_t;
 
 /*
@@ -317,28 +325,28 @@ typedef struct H5O_fill_t {
  * (Data structure in memory)
  */
 typedef struct H5O_link_hard_t {
-    haddr_t	addr;			/* Object header address */
+    haddr_t addr; /* Object header address */
 } H5O_link_hard_t;
 
 typedef struct H5O_link_soft_t {
-    char	*name;			/* Destination name */
+    char *name; /* Destination name */
 } H5O_link_soft_t;
 
 typedef struct H5O_link_ud_t {
-    void	*udata;			/* Opaque data supplied by the user */
-    size_t       size;                  /* Size of udata */
+    void * udata; /* Opaque data supplied by the user */
+    size_t size;  /* Size of udata */
 } H5O_link_ud_t;
 
 typedef struct H5O_link_t {
-    H5L_type_t  type;                   /* Type of link */
-    hbool_t     corder_valid;           /* Creation order for link is valid (not stored) */
-    int64_t     corder;                 /* Creation order for link (stored if it's valid) */
-    H5T_cset_t  cset;                   /* Character set of link name	*/
-    char	*name;			/* Link name */
+    H5L_type_t type;         /* Type of link */
+    hbool_t    corder_valid; /* Creation order for link is valid (not stored) */
+    int64_t    corder;       /* Creation order for link (stored if it's valid) */
+    H5T_cset_t cset;         /* Character set of link name	*/
+    char *     name;         /* Link name */
     union {
-        H5O_link_hard_t hard;           /* Information for hard links */
-        H5O_link_soft_t soft;           /* Information for soft links */
-        H5O_link_ud_t ud;               /* Information for user-defined links */
+        H5O_link_hard_t hard; /* Information for hard links */
+        H5O_link_soft_t soft; /* Information for soft links */
+        H5O_link_ud_t   ud;   /* Information for user-defined links */
     } u;
 } H5O_link_t;
 
@@ -346,99 +354,97 @@ typedef struct H5O_link_t {
  * External File List Message
  * (Data structure in memory)
  */
-#define H5O_EFL_ALLOC		16	/*number of slots to alloc at once   */
-#define H5O_EFL_UNLIMITED	H5F_UNLIMITED /*max possible file size	     */
+#define H5O_EFL_ALLOC     16            /*number of slots to alloc at once   */
+#define H5O_EFL_UNLIMITED H5F_UNLIMITED /*max possible file size	     */
 
 typedef struct H5O_efl_entry_t {
-    size_t	name_offset;		/*offset of name within heap	     */
-    char	*name;			/*malloc'd name			     */
-    off_t	offset;			/*offset of data within file	     */
-    hsize_t	size;			/*size allocated within file	     */
+    size_t  name_offset; /*offset of name within heap	     */
+    char *  name;        /*malloc'd name			     */
+    off_t   offset;      /*offset of data within file	     */
+    hsize_t size;        /*size allocated within file	     */
 } H5O_efl_entry_t;
 
 typedef struct H5O_efl_t {
-    haddr_t	heap_addr;		/*address of name heap		     */
-    size_t	nalloc;			/*number of slots allocated	     */
-    size_t	nused;			/*number of slots used		     */
-    H5O_efl_entry_t *slot;		/*array of external file entries     */
+    haddr_t          heap_addr; /*address of name heap		     */
+    size_t           nalloc;    /*number of slots allocated	     */
+    size_t           nused;     /*number of slots used		     */
+    H5O_efl_entry_t *slot;      /*array of external file entries     */
 } H5O_efl_t;
 
-
 /*
  * Data Layout Message.
  * (Data structure in file)
  */
-#define H5O_LAYOUT_NDIMS	(H5S_MAX_RANK+1)
+#define H5O_LAYOUT_NDIMS (H5S_MAX_RANK + 1)
 
 /* Initial version of the layout information.  Used when space is allocated */
-#define H5O_LAYOUT_VERSION_1	1
+#define H5O_LAYOUT_VERSION_1 1
 
 /* This version added support for delaying allocation */
-#define H5O_LAYOUT_VERSION_2	2
+#define H5O_LAYOUT_VERSION_2 2
 
 /* This version is revised to store just the information needed for each
  *      storage type, and to straighten out problems with contiguous layout's
  *      sizes (was encoding them as 4-byte values when they were really n-byte
  *      values (where n usually is 8)).
  */
-#define H5O_LAYOUT_VERSION_3	3
-
+#define H5O_LAYOUT_VERSION_3 3
 
 /* Forward declaration of structs used below */
-struct H5D_layout_ops_t;                /* Defined in H5Dpkg.h               */
-struct H5D_chunk_ops_t;                 /* Defined in H5Dpkg.h               */
+struct H5D_layout_ops_t; /* Defined in H5Dpkg.h               */
+struct H5D_chunk_ops_t;  /* Defined in H5Dpkg.h               */
 
 typedef struct H5O_storage_contig_t {
-    haddr_t	addr;			/* File address of data              */
-    hsize_t     size;                   /* Size of data in bytes             */
+    haddr_t addr; /* File address of data              */
+    hsize_t size; /* Size of data in bytes             */
 } H5O_storage_contig_t;
 
 typedef struct H5O_storage_chunk_btree_t {
-    haddr_t     dset_ohdr_addr;         /* File address dataset's object header */
-    H5RC_t     *shared;			/* Ref-counted shared info for B-tree nodes */
+    haddr_t dset_ohdr_addr; /* File address dataset's object header */
+    H5RC_t *shared;         /* Ref-counted shared info for B-tree nodes */
 } H5O_storage_chunk_btree_t;
 
 typedef struct H5O_storage_chunk_t {
-    H5D_chunk_index_t idx_type;		/* Type of chunk index               */
-    haddr_t	idx_addr;		/* File address of chunk index       */
-    const struct H5D_chunk_ops_t *ops;  /* Pointer to chunked storage operations */
+    H5D_chunk_index_t             idx_type; /* Type of chunk index               */
+    haddr_t                       idx_addr; /* File address of chunk index       */
+    const struct H5D_chunk_ops_t *ops;      /* Pointer to chunked storage operations */
     union {
         H5O_storage_chunk_btree_t btree; /* Information for v1 B-tree index   */
     } u;
 } H5O_storage_chunk_t;
 
 typedef struct H5O_storage_compact_t {
-    hbool_t     dirty;                  /* Dirty flag for compact dataset    */
-    size_t      size;                   /* Size of buffer in bytes           */
-    void        *buf;                   /* Buffer for compact dataset        */
+    hbool_t dirty; /* Dirty flag for compact dataset    */
+    size_t  size;  /* Size of buffer in bytes           */
+    void *  buf;   /* Buffer for compact dataset        */
 } H5O_storage_compact_t;
 
 typedef struct H5O_storage_t {
-    H5D_layout_t type;			/* Type of layout                    */
+    H5D_layout_t type; /* Type of layout                    */
     union {
-        H5O_storage_contig_t contig;    /* Information for contiguous storage */
-        H5O_storage_chunk_t chunk;      /* Information for chunked storage    */
-        H5O_storage_compact_t compact;  /* Information for compact storage    */
+        H5O_storage_contig_t  contig;  /* Information for contiguous storage */
+        H5O_storage_chunk_t   chunk;   /* Information for chunked storage    */
+        H5O_storage_compact_t compact; /* Information for compact storage    */
     } u;
 } H5O_storage_t;
 
 typedef struct H5O_layout_chunk_t {
-    unsigned	ndims;			/* Num dimensions in chunk           */
-    uint32_t	dim[H5O_LAYOUT_NDIMS];	/* Size of chunk in elements         */
-    uint32_t    size;                   /* Size of chunk in bytes            */
-    hsize_t     nchunks;                /* Number of chunks in dataset	     */
-    hsize_t     chunks[H5O_LAYOUT_NDIMS]; /* # of chunks in dataset dimensions */
-    hsize_t    	down_chunks[H5O_LAYOUT_NDIMS];	/* "down" size of number of chunks in each dimension */
+    unsigned ndims;                         /* Num dimensions in chunk           */
+    uint32_t dim[H5O_LAYOUT_NDIMS];         /* Size of chunk in elements         */
+    uint32_t size;                          /* Size of chunk in bytes            */
+    hsize_t  nchunks;                       /* Number of chunks in dataset	     */
+    hsize_t  chunks[H5O_LAYOUT_NDIMS];      /* # of chunks in dataset dimensions */
+    hsize_t  down_chunks[H5O_LAYOUT_NDIMS]; /* "down" size of number of chunks in each dimension */
 } H5O_layout_chunk_t;
 
 typedef struct H5O_layout_t {
-    H5D_layout_t type;			/* Type of layout                    */
-    unsigned version;                   /* Version of message                */
-    const struct H5D_layout_ops_t *ops; /* Pointer to data layout I/O operations */
+    H5D_layout_t                   type;    /* Type of layout                    */
+    unsigned                       version; /* Version of message                */
+    const struct H5D_layout_ops_t *ops;     /* Pointer to data layout I/O operations */
     union {
-        H5O_layout_chunk_t chunk;       /* Information for chunked layout    */
+        H5O_layout_chunk_t chunk; /* Information for chunked layout    */
     } u;
-    H5O_storage_t storage;              /* Information for storing dataset elements */
+    H5O_storage_t storage; /* Information for storing dataset elements */
 } H5O_layout_t;
 
 #ifdef H5O_ENABLE_BOGUS
@@ -446,10 +452,10 @@ typedef struct H5O_layout_t {
  * "Bogus" Message.
  * (Data structure in memory)
  */
-#define H5O_BOGUS_VALUE         0xdeadbeef
+#define H5O_BOGUS_VALUE 0xdeadbeef
 typedef struct H5O_bogus_t {
-    H5O_shared_t        sh_loc;         /* Shared message info (must be first) */
-    unsigned u;                         /* Hold the bogus info */
+    H5O_shared_t sh_loc; /* Shared message info (must be first) */
+    unsigned     u;      /* Hold the bogus info */
 } H5O_bogus_t;
 #endif /* H5O_ENABLE_BOGUS */
 
@@ -462,19 +468,19 @@ typedef struct H5O_bogus_t {
  */
 typedef struct H5O_ginfo_t {
     /* "Old" format group info (not stored) */
-    uint32_t    lheap_size_hint;        /* Local heap size hint              */
+    uint32_t lheap_size_hint; /* Local heap size hint              */
 
     /* "New" format group info (stored) */
 
     /* (storage management info) */
-    hbool_t     store_link_phase_change;/* Whether to store the link phase change values */
-    uint16_t	max_compact;		/* Maximum # of compact links        */
-    uint16_t	min_dense;		/* Minimum # of "dense" links        */
+    hbool_t  store_link_phase_change; /* Whether to store the link phase change values */
+    uint16_t max_compact;             /* Maximum # of compact links        */
+    uint16_t min_dense;               /* Minimum # of "dense" links        */
 
     /* (initial object header size info) */
-    hbool_t     store_est_entry_info;   /* Whether to store the est. entry values */
-    uint16_t	est_num_entries;	/* Estimated # of entries in group   */
-    uint16_t	est_name_len;		/* Estimated length of entry name    */
+    hbool_t  store_est_entry_info; /* Whether to store the est. entry values */
+    uint16_t est_num_entries;      /* Estimated # of entries in group   */
+    uint16_t est_name_len;         /* Estimated length of entry name    */
 } H5O_ginfo_t;
 
 /*
@@ -483,25 +489,25 @@ typedef struct H5O_ginfo_t {
  */
 
 /* The initial version of the format */
-#define H5O_PLINE_VERSION_1	1
+#define H5O_PLINE_VERSION_1 1
 
 /* This version encodes the message fields more efficiently */
 /* (Drops the reserved bytes, doesn't align the name and doesn't encode the
  *      filter name at all if it's a filter provided by the library)
  */
-#define H5O_PLINE_VERSION_2	2
+#define H5O_PLINE_VERSION_2 2
 
 /* The latest version of the format.  Look through the 'encode' and 'size'
  *      callbacks for places to change when updating this. */
 #define H5O_PLINE_VERSION_LATEST H5O_PLINE_VERSION_2
 
 typedef struct H5O_pline_t {
-    H5O_shared_t        sh_loc;         /* Shared message info (must be first) */
+    H5O_shared_t sh_loc; /* Shared message info (must be first) */
 
-    unsigned	version;	        /* Encoding version number */
-    size_t	nalloc;			/*num elements in `filter' array     */
-    size_t	nused;			/*num filters defined		     */
-    H5Z_filter_info_t *filter;		/*array of filters		     */
+    unsigned           version; /* Encoding version number */
+    size_t             nalloc;  /*num elements in `filter' array     */
+    size_t             nused;   /*num filters defined		     */
+    H5Z_filter_info_t *filter;  /*array of filters		     */
 } H5O_pline_t;
 
 /*
@@ -510,7 +516,7 @@ typedef struct H5O_pline_t {
  */
 
 typedef struct H5O_name_t {
-    char	*s;			/*ptr to malloc'd memory	     */
+    char *s; /*ptr to malloc'd memory	     */
 } H5O_name_t;
 
 /*
@@ -520,9 +526,9 @@ typedef struct H5O_name_t {
  * (Data structure in memory)
  */
 typedef struct H5O_shmesg_table_t {
-    haddr_t		addr;	        /*file address of SOHM table */
-    unsigned		version;	/*SOHM table version number */
-    unsigned		nindexes;	/*number of indexes in the table */
+    haddr_t  addr;     /*file address of SOHM table */
+    unsigned version;  /*SOHM table version number */
+    unsigned nindexes; /*number of indexes in the table */
 } H5O_shmesg_table_t;
 
 /*
@@ -531,11 +537,11 @@ typedef struct H5O_shmesg_table_t {
  */
 
 typedef struct H5O_cont_t {
-    haddr_t	addr;			/*address of continuation block	     */
-    size_t	size;			/*size of continuation block	     */
+    haddr_t addr; /*address of continuation block	     */
+    size_t  size; /*size of continuation block	     */
 
     /* the following field(s) do not appear on disk */
-    unsigned	chunkno;		/*chunk this mesg refers to	     */
+    unsigned chunkno; /*chunk this mesg refers to	     */
 } H5O_cont_t;
 
 /*
@@ -543,8 +549,8 @@ typedef struct H5O_cont_t {
  * (Data structure in memory)
  */
 typedef struct H5O_stab_t {
-    haddr_t	btree_addr;		/*address of B-tree		     */
-    haddr_t	heap_addr;		/*address of name heap		     */
+    haddr_t btree_addr; /*address of B-tree		     */
+    haddr_t heap_addr;  /*address of name heap		     */
 } H5O_stab_t;
 
 /*
@@ -554,8 +560,8 @@ typedef struct H5O_stab_t {
  * (Data structure in memory)
  */
 typedef struct H5O_btreek_t {
-    unsigned        btree_k[H5B_NUM_BTREE_ID];  /* B-tree internal node 'K' values */
-    unsigned        sym_leaf_k;                 /* Symbol table leaf node's 'K' value */
+    unsigned btree_k[H5B_NUM_BTREE_ID]; /* B-tree internal node 'K' values */
+    unsigned sym_leaf_k;                /* Symbol table leaf node's 'K' value */
 } H5O_btreek_t;
 
 /*
@@ -564,9 +570,9 @@ typedef struct H5O_btreek_t {
  * (Data structure in memory)
  */
 typedef struct H5O_drvinfo_t {
-    char                name[9];                /* Driver name */
-    size_t		len;                    /* Length of encoded buffer */
-    uint8_t            *buf;                    /* Buffer for encoded info */
+    char     name[9]; /* Driver name */
+    size_t   len;     /* Length of encoded buffer */
+    uint8_t *buf;     /* Buffer for encoded info */
 } H5O_drvinfo_t;
 
 /*
@@ -576,63 +582,61 @@ typedef struct H5O_drvinfo_t {
  */
 typedef struct H5O_ainfo_t {
     /* Creation order info */
-    hbool_t     track_corder;           /* Are creation order values tracked on attributes? */
-    hbool_t     index_corder;           /* Are creation order values indexed on attributes? */
-    H5O_msg_crt_idx_t max_crt_idx;      /* Maximum attribute creation index used */
-    haddr_t     corder_bt2_addr;        /* Address of v2 B-tree for indexing creation order values of "dense" attributes */
+    hbool_t           track_corder; /* Are creation order values tracked on attributes? */
+    hbool_t           index_corder; /* Are creation order values indexed on attributes? */
+    H5O_msg_crt_idx_t max_crt_idx;  /* Maximum attribute creation index used */
+    haddr_t
+        corder_bt2_addr; /* Address of v2 B-tree for indexing creation order values of "dense" attributes */
 
     /* Storage management info */
-    hsize_t     nattrs;                 /* Number of attributes on the object */
-    haddr_t     fheap_addr;             /* Address of fractal heap for storing "dense" attributes */
-    haddr_t     name_bt2_addr;          /* Address of v2 B-tree for indexing names of "dense" attributes */
+    hsize_t nattrs;        /* Number of attributes on the object */
+    haddr_t fheap_addr;    /* Address of fractal heap for storing "dense" attributes */
+    haddr_t name_bt2_addr; /* Address of v2 B-tree for indexing names of "dense" attributes */
 } H5O_ainfo_t;
 
 /*
  * Reference Count Message.
  * (Data structure in memory)
  */
-typedef uint32_t H5O_refcount_t;        /* Contains # of links to object, if >1 */
+typedef uint32_t H5O_refcount_t; /* Contains # of links to object, if >1 */
 
 /*
  * "Unknown" Message.
  * (Data structure in memory)
  */
-typedef unsigned H5O_unknown_t;         /* Original message type ID */
-
+typedef unsigned H5O_unknown_t; /* Original message type ID */
 
 /* Typedef for "application" iteration operations */
-typedef herr_t (*H5O_operator_t)(const void *mesg/*in*/, unsigned idx,
-    void *operator_data/*in,out*/);
+typedef herr_t (*H5O_operator_t)(const void *mesg /*in*/, unsigned idx, void *operator_data /*in,out*/);
 
 /* Typedef for "internal library" iteration operations */
-typedef herr_t (*H5O_lib_operator_t)(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
-    unsigned sequence, unsigned *oh_modified/*out*/, void *operator_data/*in,out*/);
+typedef herr_t (*H5O_lib_operator_t)(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence,
+                                     unsigned *oh_modified /*out*/, void *operator_data /*in,out*/);
 
 /* Some syntactic sugar to make the compiler happy with two different kinds of iterator callbacks */
 typedef enum H5O_mesg_operator_type_t {
-    H5O_MESG_OP_APP,            /* Application callback */
-    H5O_MESG_OP_LIB             /* Library internal callback */
+    H5O_MESG_OP_APP, /* Application callback */
+    H5O_MESG_OP_LIB  /* Library internal callback */
 } H5O_mesg_operator_type_t;
 
 /* To indicate that the object header is just modified */
-#define H5O_MODIFY		0x01
+#define H5O_MODIFY 0x01
 /* To indicate that the object header is modified and might possibly need to condense messages */
-#define H5O_MODIFY_CONDENSE	0x02
+#define H5O_MODIFY_CONDENSE 0x02
 
 typedef struct {
     H5O_mesg_operator_type_t op_type;
     union {
-        H5O_operator_t app_op;      /* Application callback for each message */
-        H5O_lib_operator_t lib_op;  /* Library internal callback for each message */
+        H5O_operator_t     app_op; /* Application callback for each message */
+        H5O_lib_operator_t lib_op; /* Library internal callback for each message */
     } u;
 } H5O_mesg_operator_t;
 
-
 /* Typedef for abstract object creation */
 typedef struct {
-    H5O_type_t obj_type;        /* Type of object to create */
-    void *crt_info;             /* Information for object creation callback */
-    void *new_obj;              /* Pointer to new object created */
+    H5O_type_t obj_type; /* Type of object to create */
+    void *     crt_info; /* Information for object creation callback */
+    void *     new_obj;  /* Pointer to new object created */
 } H5O_obj_create_t;
 
 /* Forward declarations for prototype arguments */
@@ -640,96 +644,87 @@ struct H5P_genplist_t;
 
 /* Object header routines */
 H5_DLL herr_t H5O_init(void);
-H5_DLL herr_t H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint,
-    size_t initial_rc, hid_t ocpl_id, H5O_loc_t *loc/*out*/);
+H5_DLL herr_t H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc, hid_t ocpl_id,
+                         H5O_loc_t *loc /*out*/);
 H5_DLL herr_t H5O_open(H5O_loc_t *loc);
 H5_DLL herr_t H5O_close(H5O_loc_t *loc);
-H5_DLL int H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id);
+H5_DLL int    H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id);
 H5_DLL H5O_t *H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot);
 H5_DLL H5O_t *H5O_pin(const H5O_loc_t *loc, hid_t dxpl_id);
 H5_DLL herr_t H5O_unpin(H5O_t *oh);
 H5_DLL herr_t H5O_dec_rc_by_loc(const H5O_loc_t *loc, hid_t dxpl_id);
-H5_DLL herr_t H5O_unprotect(const H5O_loc_t *loc, hid_t dxpl_id, H5O_t *oh,
-    unsigned oh_flags);
+H5_DLL herr_t H5O_unprotect(const H5O_loc_t *loc, hid_t dxpl_id, H5O_t *oh, unsigned oh_flags);
 H5_DLL herr_t H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id);
-H5_DLL herr_t H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    hbool_t force);
+H5_DLL herr_t H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force);
 #ifdef H5O_ENABLE_BOGUS
 H5_DLL herr_t H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned mesg_id, unsigned mesg_flags);
 #endif /* H5O_ENABLE_BOGUS */
 H5_DLL herr_t H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 H5_DLL herr_t H5O_get_hdr_info(const H5O_loc_t *oloc, hid_t dxpl_id, H5O_hdr_info_t *hdr);
-H5_DLL herr_t H5O_get_info(const H5O_loc_t *oloc, hid_t dxpl_id, hbool_t want_ih_info,
-    H5O_info_t *oinfo);
+H5_DLL herr_t H5O_get_info(const H5O_loc_t *oloc, hid_t dxpl_id, hbool_t want_ih_info, H5O_info_t *oinfo);
 H5_DLL herr_t H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type, hid_t dxpl_id);
 H5_DLL herr_t H5O_get_create_plist(const H5O_loc_t *loc, hid_t dxpl_id, struct H5P_genplist_t *oc_plist);
-H5_DLL hid_t H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hbool_t app_ref);
+H5_DLL hid_t  H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hbool_t app_ref);
 H5_DLL herr_t H5O_get_nlinks(const H5O_loc_t *loc, hid_t dxpl_id, hsize_t *nlinks);
 H5_DLL void *H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id);
 H5_DLL haddr_t H5O_get_oh_addr(const H5O_t *oh);
-H5_DLL herr_t H5O_get_rc_and_type(const H5O_loc_t *oloc, hid_t dxpl_id, unsigned *rc, H5O_type_t *otype);
+H5_DLL herr_t  H5O_get_rc_and_type(const H5O_loc_t *oloc, hid_t dxpl_id, unsigned *rc, H5O_type_t *otype);
 
 /* Object header message routines */
 H5_DLL herr_t H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
-    unsigned update_flags, void *mesg, hid_t dxpl_id);
-H5_DLL herr_t H5O_msg_append_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
-    unsigned mesg_flags, unsigned update_flags, void *mesg);
-H5_DLL herr_t H5O_msg_write(const H5O_loc_t *loc, unsigned type_id,
-    unsigned mesg_flags, unsigned update_flags, void *mesg, hid_t dxpl_id);
-H5_DLL herr_t H5O_msg_write_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
-    unsigned type_id, unsigned mesg_flags, unsigned update_flags, void *mesg);
-H5_DLL void *H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg,
-    hid_t dxpl_id);
-H5_DLL void *H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
-    void *mesg);
+                             unsigned update_flags, void *mesg, hid_t dxpl_id);
+H5_DLL herr_t H5O_msg_append_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, unsigned mesg_flags,
+                                unsigned update_flags, void *mesg);
+H5_DLL herr_t H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
+                            unsigned update_flags, void *mesg, hid_t dxpl_id);
+H5_DLL herr_t H5O_msg_write_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, unsigned mesg_flags,
+                               unsigned update_flags, void *mesg);
+H5_DLL void * H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg, hid_t dxpl_id);
+H5_DLL void * H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, void *mesg);
 H5_DLL herr_t H5O_msg_reset(unsigned type_id, void *native);
-H5_DLL void *H5O_msg_free(unsigned type_id, void *mesg);
-H5_DLL void *H5O_msg_copy(unsigned type_id, const void *mesg, void *dst);
-H5_DLL int H5O_msg_count(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id);
+H5_DLL void * H5O_msg_free(unsigned type_id, void *mesg);
+H5_DLL void * H5O_msg_copy(unsigned type_id, const void *mesg, void *dst);
+H5_DLL int    H5O_msg_count(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id);
 H5_DLL htri_t H5O_msg_exists(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id);
 H5_DLL htri_t H5O_msg_exists_oh(const H5O_t *oh, unsigned type_id);
-H5_DLL herr_t H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence,
-    hbool_t adj_link, hid_t dxpl_id);
-H5_DLL herr_t H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence,
-    H5O_operator_t op, void *op_data, hbool_t adj_link, hid_t dxpl_id);
-H5_DLL herr_t H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id,
-    const H5O_mesg_operator_t *op, void *op_data, hid_t dxpl_id);
-H5_DLL size_t H5O_msg_raw_size(const H5F_t *f, unsigned type_id,
-    hbool_t disable_shared, const void *mesg);
-H5_DLL size_t H5O_msg_size_f(const H5F_t *f, hid_t ocpl_id, unsigned type_id,
-    const void *mesg, size_t extra_raw);
-H5_DLL size_t H5O_msg_size_oh(const H5F_t *f, const H5O_t *oh, unsigned type_id,
-    const void *mesg, size_t extra_raw);
+H5_DLL herr_t H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj_link,
+                             hid_t dxpl_id);
+H5_DLL herr_t H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence, H5O_operator_t op,
+                                void *op_data, hbool_t adj_link, hid_t dxpl_id);
+H5_DLL herr_t H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id, const H5O_mesg_operator_t *op,
+                              void *op_data, hid_t dxpl_id);
+H5_DLL size_t H5O_msg_raw_size(const H5F_t *f, unsigned type_id, hbool_t disable_shared, const void *mesg);
+H5_DLL size_t H5O_msg_size_f(const H5F_t *f, hid_t ocpl_id, unsigned type_id, const void *mesg,
+                             size_t extra_raw);
+H5_DLL size_t H5O_msg_size_oh(const H5F_t *f, const H5O_t *oh, unsigned type_id, const void *mesg,
+                              size_t extra_raw);
 H5_DLL htri_t H5O_msg_is_shared(unsigned type_id, const void *mesg);
 H5_DLL htri_t H5O_msg_can_share(unsigned type_id, const void *mesg);
 H5_DLL htri_t H5O_msg_can_share_in_ohdr(unsigned type_id);
-H5_DLL herr_t H5O_msg_set_share(unsigned type_id, const H5O_shared_t *share,
-    void *mesg);
+H5_DLL herr_t H5O_msg_set_share(unsigned type_id, const H5O_shared_t *share, void *mesg);
 H5_DLL herr_t H5O_msg_reset_share(unsigned type_id, void *mesg);
-H5_DLL herr_t H5O_msg_get_crt_index(unsigned type_id, const void *mesg,
-    H5O_msg_crt_idx_t *crt_idx);
-H5_DLL herr_t H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared,
-    unsigned char *buf, const void *obj);
-H5_DLL void* H5O_msg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned type_id, size_t buf_size, const unsigned char *buf);
-H5_DLL herr_t H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned type_id, void *mesg);
-H5_DLL int H5O_msg_get_chunkno(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id);
+H5_DLL herr_t H5O_msg_get_crt_index(unsigned type_id, const void *mesg, H5O_msg_crt_idx_t *crt_idx);
+H5_DLL herr_t H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared, unsigned char *buf,
+                             const void *obj);
+H5_DLL void * H5O_msg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, size_t buf_size,
+                             const unsigned char *buf);
+H5_DLL herr_t H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, void *mesg);
+H5_DLL int    H5O_msg_get_chunkno(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id);
 H5_DLL herr_t H5O_msg_lock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id);
 H5_DLL herr_t H5O_msg_unlock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id);
 
 /* Object copying routines */
-H5_DLL herr_t H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
-    hid_t dxpl_id, H5O_copy_t *cpy_info, hbool_t inc_depth,
-    H5O_type_t *obj_type, void **udata);
-H5_DLL herr_t H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
-    H5F_t *file_dst, void *_dst_ref, size_t ref_count, H5R_type_t ref_type,
-    H5O_copy_t *cpy_info);
+H5_DLL herr_t H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t dxpl_id,
+                                  H5O_copy_t *cpy_info, hbool_t inc_depth, H5O_type_t *obj_type,
+                                  void **udata);
+H5_DLL herr_t H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id, H5F_t *file_dst,
+                                  void *_dst_ref, size_t ref_count, H5R_type_t ref_type,
+                                  H5O_copy_t *cpy_info);
 
 /* Debugging routines */
-H5_DLL herr_t H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream, int indent, int fwidth);
-H5_DLL herr_t H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
-			 int fwidth);
+H5_DLL herr_t H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
+                           int indent, int fwidth);
+H5_DLL herr_t H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
 
 /* These functions operate on object locations */
 H5_DLL herr_t H5O_loc_reset(H5O_loc_t *loc);
@@ -746,8 +741,7 @@ H5_DLL herr_t H5O_fill_convert(H5O_fill_t *fill, H5T_t *type, hbool_t *fill_chan
 H5_DLL herr_t H5O_fill_set_latest_version(H5O_fill_t *fill);
 
 /* Link operators */
-H5_DLL herr_t H5O_link_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    void *_mesg);
+H5_DLL herr_t H5O_link_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg);
 
 /* Filter pipeline operators */
 H5_DLL herr_t H5O_pline_set_latest_version(H5O_pline_t *pline);
@@ -756,4 +750,3 @@ H5_DLL herr_t H5O_pline_set_latest_version(H5O_pline_t *pline);
 H5_DLL herr_t H5O_set_shared(H5O_shared_t *dst, const H5O_shared_t *src);
 
 #endif /* _H5Oprivate_H */
-
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index 566d0c1..0080a37 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -26,23 +26,23 @@
 #define _H5Opublic_H
 
 /* Public headers needed by this file */
-#include "H5public.h"		/* Generic Functions			*/
-#include "H5Ipublic.h"		/* IDs			  		*/
-#include "H5Lpublic.h"		/* Links		  		*/
+#include "H5public.h"  /* Generic Functions			*/
+#include "H5Ipublic.h" /* IDs			  		*/
+#include "H5Lpublic.h" /* Links		  		*/
 
 /*****************/
 /* Public Macros */
 /*****************/
 
 /* Flags for object copy (H5Ocopy) */
-#define H5O_COPY_SHALLOW_HIERARCHY_FLAG (0x0001u)   /* Copy only immediate members */
-#define H5O_COPY_EXPAND_SOFT_LINK_FLAG  (0x0002u)   /* Expand soft links into new objects */
-#define H5O_COPY_EXPAND_EXT_LINK_FLAG   (0x0004u)   /* Expand external links into new objects */
-#define H5O_COPY_EXPAND_REFERENCE_FLAG	(0x0008u)   /* Copy objects that are pointed by references */
-#define H5O_COPY_WITHOUT_ATTR_FLAG      (0x0010u)   /* Copy object without copying attributes */
-#define H5O_COPY_PRESERVE_NULL_FLAG     (0x0020u)   /* Copy NULL messages (empty space) */
-#define H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG (0x0040u)   /* Merge committed datatypes in dest file */
-#define H5O_COPY_ALL                    (0x007Fu)   /* All object copying flags (for internal checking) */
+#define H5O_COPY_SHALLOW_HIERARCHY_FLAG     (0x0001u) /* Copy only immediate members */
+#define H5O_COPY_EXPAND_SOFT_LINK_FLAG      (0x0002u) /* Expand soft links into new objects */
+#define H5O_COPY_EXPAND_EXT_LINK_FLAG       (0x0004u) /* Expand external links into new objects */
+#define H5O_COPY_EXPAND_REFERENCE_FLAG      (0x0008u) /* Copy objects that are pointed by references */
+#define H5O_COPY_WITHOUT_ATTR_FLAG          (0x0010u) /* Copy object without copying attributes */
+#define H5O_COPY_PRESERVE_NULL_FLAG         (0x0020u) /* Copy NULL messages (empty space) */
+#define H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG (0x0040u) /* Merge committed datatypes in dest file */
+#define H5O_COPY_ALL                        (0x007Fu) /* All object copying flags (for internal checking) */
 
 /* Flags for shared message indexes.
  * Pass these flags in using the mesg_type_flags parameter in
@@ -51,26 +51,30 @@
  * but we need to assign each kind of message to a different bit so that
  * one index can hold multiple types.)
  */
-#define H5O_SHMESG_NONE_FLAG    0x0000          /* No shared messages */
+#define H5O_SHMESG_NONE_FLAG    0x0000                  /* No shared messages */
 #define H5O_SHMESG_SDSPACE_FLAG ((unsigned)1 << 0x0001) /* Simple Dataspace Message.  */
 #define H5O_SHMESG_DTYPE_FLAG   ((unsigned)1 << 0x0003) /* Datatype Message.  */
 #define H5O_SHMESG_FILL_FLAG    ((unsigned)1 << 0x0005) /* Fill Value Message. */
 #define H5O_SHMESG_PLINE_FLAG   ((unsigned)1 << 0x000b) /* Filter pipeline message.  */
 #define H5O_SHMESG_ATTR_FLAG    ((unsigned)1 << 0x000c) /* Attribute Message.  */
-#define H5O_SHMESG_ALL_FLAG     (H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_FILL_FLAG | H5O_SHMESG_PLINE_FLAG | H5O_SHMESG_ATTR_FLAG)
+#define H5O_SHMESG_ALL_FLAG                                                                                  \
+    (H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_FILL_FLAG | H5O_SHMESG_PLINE_FLAG |        \
+     H5O_SHMESG_ATTR_FLAG)
 
 /* Object header status flag definitions */
-#define H5O_HDR_CHUNK0_SIZE             0x03    /* 2-bit field indicating # of bytes to store the size of chunk 0's data */
-#define H5O_HDR_ATTR_CRT_ORDER_TRACKED  0x04    /* Attribute creation order is tracked */
-#define H5O_HDR_ATTR_CRT_ORDER_INDEXED  0x08    /* Attribute creation order has index */
-#define H5O_HDR_ATTR_STORE_PHASE_CHANGE 0x10    /* Non-default attribute storage phase change values stored */
-#define H5O_HDR_STORE_TIMES             0x20    /* Store access, modification, change & birth times for object */
-#define H5O_HDR_ALL_FLAGS       (H5O_HDR_CHUNK0_SIZE | H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | H5O_HDR_ATTR_STORE_PHASE_CHANGE | H5O_HDR_STORE_TIMES)
+#define H5O_HDR_CHUNK0_SIZE             0x03 /* 2-bit field indicating # of bytes to store the size of chunk 0's data */
+#define H5O_HDR_ATTR_CRT_ORDER_TRACKED  0x04 /* Attribute creation order is tracked */
+#define H5O_HDR_ATTR_CRT_ORDER_INDEXED  0x08 /* Attribute creation order has index */
+#define H5O_HDR_ATTR_STORE_PHASE_CHANGE 0x10 /* Non-default attribute storage phase change values stored */
+#define H5O_HDR_STORE_TIMES             0x20 /* Store access, modification, change & birth times for object */
+#define H5O_HDR_ALL_FLAGS                                                                                    \
+    (H5O_HDR_CHUNK0_SIZE | H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED |                 \
+     H5O_HDR_ATTR_STORE_PHASE_CHANGE | H5O_HDR_STORE_TIMES)
 
 /* Maximum shared message values.  Number of indexes is 8 to allow room to add
  * new types of messages.
  */
-#define H5O_SHMESG_MAX_NINDEXES 8
+#define H5O_SHMESG_MAX_NINDEXES  8
 #define H5O_SHMESG_MAX_LIST_SIZE 5000
 
 /*******************/
@@ -79,47 +83,47 @@
 
 /* Types of objects in file */
 typedef enum H5O_type_t {
-    H5O_TYPE_UNKNOWN = -1,	/* Unknown object type		*/
-    H5O_TYPE_GROUP,	        /* Object is a group		*/
-    H5O_TYPE_DATASET,		/* Object is a dataset		*/
-    H5O_TYPE_NAMED_DATATYPE, 	/* Object is a named data type	*/
-    H5O_TYPE_NTYPES             /* Number of different object types (must be last!) */
+    H5O_TYPE_UNKNOWN = -1,   /* Unknown object type		*/
+    H5O_TYPE_GROUP,          /* Object is a group		*/
+    H5O_TYPE_DATASET,        /* Object is a dataset		*/
+    H5O_TYPE_NAMED_DATATYPE, /* Object is a named data type	*/
+    H5O_TYPE_NTYPES          /* Number of different object types (must be last!) */
 } H5O_type_t;
 
 /* Information struct for object header metadata (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx) */
 typedef struct H5O_hdr_info_t {
-    unsigned version;		/* Version number of header format in file */
-    unsigned nmesgs;		/* Number of object header messages */
-    unsigned nchunks;		/* Number of object header chunks */
-    unsigned flags;             /* Object header status flags */
+    unsigned version; /* Version number of header format in file */
+    unsigned nmesgs;  /* Number of object header messages */
+    unsigned nchunks; /* Number of object header chunks */
+    unsigned flags;   /* Object header status flags */
     struct {
-        hsize_t total;		/* Total space for storing object header in file */
-        hsize_t meta;		/* Space within header for object header metadata information */
-        hsize_t mesg;		/* Space within header for actual message information */
-        hsize_t free;		/* Free space within object header */
+        hsize_t total; /* Total space for storing object header in file */
+        hsize_t meta;  /* Space within header for object header metadata information */
+        hsize_t mesg;  /* Space within header for actual message information */
+        hsize_t free;  /* Free space within object header */
     } space;
     struct {
-        uint64_t present;	/* Flags to indicate presence of message type in header */
-        uint64_t shared;	/* Flags to indicate message type is shared in header */
+        uint64_t present; /* Flags to indicate presence of message type in header */
+        uint64_t shared;  /* Flags to indicate message type is shared in header */
     } mesg;
 } H5O_hdr_info_t;
 
 /* Information struct for object (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx) */
 typedef struct H5O_info_t {
-    unsigned long 	fileno;		/* File number that object is located in */
-    haddr_t 		addr;		/* Object address in file	*/
-    H5O_type_t 		type;		/* Basic object type (group, dataset, etc.) */
-    unsigned 		rc;		/* Reference count of object    */
-    time_t		atime;		/* Access time			*/
-    time_t		mtime;		/* Modification time		*/
-    time_t		ctime;		/* Change time			*/
-    time_t		btime;		/* Birth time			*/
-    hsize_t 		num_attrs;	/* # of attributes attached to object */
-    H5O_hdr_info_t      hdr;            /* Object header information */
+    unsigned long  fileno;    /* File number that object is located in */
+    haddr_t        addr;      /* Object address in file	*/
+    H5O_type_t     type;      /* Basic object type (group, dataset, etc.) */
+    unsigned       rc;        /* Reference count of object    */
+    time_t         atime;     /* Access time			*/
+    time_t         mtime;     /* Modification time		*/
+    time_t         ctime;     /* Change time			*/
+    time_t         btime;     /* Birth time			*/
+    hsize_t        num_attrs; /* # of attributes attached to object */
+    H5O_hdr_info_t hdr;       /* Object header information */
     /* Extra metadata storage for obj & attributes */
     struct {
-        H5_ih_info_t   obj;             /* v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets */
-        H5_ih_info_t   attr;            /* v2 B-tree & heap for attributes */
+        H5_ih_info_t obj;  /* v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets */
+        H5_ih_info_t attr; /* v2 B-tree & heap for attributes */
     } meta_size;
 } H5O_info_t;
 
@@ -127,23 +131,23 @@ typedef struct H5O_info_t {
 typedef uint32_t H5O_msg_crt_idx_t;
 
 /* Prototype for H5Ovisit/H5Ovisit_by_name() operator */
-typedef herr_t (*H5O_iterate_t)(hid_t obj, const char *name, const H5O_info_t *info,
-    void *op_data);
+typedef herr_t (*H5O_iterate_t)(hid_t obj, const char *name, const H5O_info_t *info, void *op_data);
 
 typedef enum H5O_mcdt_search_ret_t {
-    H5O_MCDT_SEARCH_ERROR = -1,	/* Abort H5Ocopy */
-    H5O_MCDT_SEARCH_CONT,	/* Continue the global search of all committed datatypes in the destination file */
-    H5O_MCDT_SEARCH_STOP	/* Stop the search, but continue copying.  The committed datatype will be copied but not merged. */
+    H5O_MCDT_SEARCH_ERROR = -1, /* Abort H5Ocopy */
+    H5O_MCDT_SEARCH_CONT, /* Continue the global search of all committed datatypes in the destination file */
+    H5O_MCDT_SEARCH_STOP  /* Stop the search, but continue copying.  The committed datatype will be copied but
+                             not merged. */
 } H5O_mcdt_search_ret_t;
 
-/* Callback to invoke when completing the search for a matching committed datatype from the committed dtype list */
+/* Callback to invoke when completing the search for a matching committed datatype from the committed dtype
+ * list */
 typedef H5O_mcdt_search_ret_t (*H5O_mcdt_search_cb_t)(void *op_data);
 
 /********************/
 /* Public Variables */
 /********************/
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -151,34 +155,29 @@ extern "C" {
 /*********************/
 /* Public Prototypes */
 /*********************/
-H5_DLL hid_t H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id);
-H5_DLL hid_t H5Oopen_by_addr(hid_t loc_id, haddr_t addr);
-H5_DLL hid_t H5Oopen_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id);
+H5_DLL hid_t  H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id);
+H5_DLL hid_t  H5Oopen_by_addr(hid_t loc_id, haddr_t addr);
+H5_DLL hid_t  H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
+                             hsize_t n, hid_t lapl_id);
 H5_DLL htri_t H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id);
 H5_DLL herr_t H5Oget_info(hid_t loc_id, H5O_info_t *oinfo);
-H5_DLL herr_t H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo,
-    hid_t lapl_id);
-H5_DLL herr_t H5Oget_info_by_idx(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_info_t *oinfo,
-    hid_t lapl_id);
-H5_DLL herr_t H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name,
-    hid_t lcpl_id, hid_t lapl_id);
+H5_DLL herr_t H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t lapl_id);
+H5_DLL herr_t H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                 H5_iter_order_t order, hsize_t n, H5O_info_t *oinfo, hid_t lapl_id);
+H5_DLL herr_t H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id);
 H5_DLL herr_t H5Oincr_refcount(hid_t object_id);
 H5_DLL herr_t H5Odecr_refcount(hid_t object_id);
-H5_DLL herr_t H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
-    const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id);
+H5_DLL herr_t H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name,
+                      hid_t ocpypl_id, hid_t lcpl_id);
 H5_DLL herr_t H5Oset_comment(hid_t obj_id, const char *comment);
-H5_DLL herr_t H5Oset_comment_by_name(hid_t loc_id, const char *name,
-    const char *comment, hid_t lapl_id);
+H5_DLL herr_t H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, hid_t lapl_id);
 H5_DLL ssize_t H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize);
-H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name,
-    char *comment, size_t bufsize, hid_t lapl_id);
-H5_DLL herr_t H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
-    H5O_iterate_t op, void *op_data);
-H5_DLL herr_t H5Ovisit_by_name(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op,
-    void *op_data, hid_t lapl_id);
+H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t bufsize,
+                                      hid_t lapl_id);
+H5_DLL herr_t  H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op,
+                        void *op_data);
+H5_DLL herr_t H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                               H5O_iterate_t op, void *op_data, hid_t lapl_id);
 H5_DLL herr_t H5Oclose(hid_t object_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
@@ -193,10 +192,10 @@ H5_DLL herr_t H5Oclose(hid_t object_id);
 
 /* A struct that's part of the H5G_stat_t routine (deprecated) */
 typedef struct H5O_stat_t {
-    hsize_t size;               /* Total size of object header in file */
-    hsize_t free;               /* Free space within object header */
-    unsigned nmesgs;            /* Number of object header messages */
-    unsigned nchunks;           /* Number of object header chunks */
+    hsize_t  size;    /* Total size of object header in file */
+    hsize_t  free;    /* Free space within object header */
+    unsigned nmesgs;  /* Number of object header messages */
+    unsigned nchunks; /* Number of object header chunks */
 } H5O_stat_t;
 
 /* Function prototypes */
@@ -207,4 +206,3 @@ typedef struct H5O_stat_t {
 }
 #endif
 #endif /* _H5Opublic_H */
-
diff --git a/src/H5Orefcount.c b/src/H5Orefcount.c
index 78ff791..bd679c1 100644
--- a/src/H5Orefcount.c
+++ b/src/H5Orefcount.c
@@ -22,57 +22,55 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_refcount_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_refcount_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                  unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_refcount_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_refcount_copy(const void *_mesg, void *_dest);
+static void * H5O_refcount_copy(const void *_mesg, void *_dest);
 static size_t H5O_refcount_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_refcount_free(void *_mesg);
-static herr_t H5O_refcount_pre_copy_file(H5F_t *file_src, const void *mesg_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata);
-static herr_t H5O_refcount_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-			     FILE * stream, int indent, int fwidth);
+static herr_t H5O_refcount_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
+                                         const H5O_copy_t *cpy_info, void *udata);
+static herr_t H5O_refcount_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                                 int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_REFCOUNT[1] = {{
-    H5O_REFCOUNT_ID,           	/*message id number             */
-    "refcount",                	/*message name for debugging    */
-    sizeof(H5O_refcount_t),    	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_refcount_decode,	/*decode message                */
-    H5O_refcount_encode,	/*encode message                */
-    H5O_refcount_copy,		/*copy the native value         */
-    H5O_refcount_size,		/*size of symbol table entry    */
-    NULL,                   	/*default reset method          */
-    H5O_refcount_free,	        /* free method			*/
-    NULL,			/* file delete method		*/
-    NULL,			/* link method			*/
-    NULL, 			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    H5O_refcount_pre_copy_file,	/* pre copy native value to file */
-    NULL,			/* copy native value to file    */
-    NULL,			/* post copy native value to file */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_refcount_debug         	/*debug the message             */
+    H5O_REFCOUNT_ID,            /*message id number             */
+    "refcount",                 /*message name for debugging    */
+    sizeof(H5O_refcount_t),     /*native message size           */
+    0,                          /* messages are sharable?       */
+    H5O_refcount_decode,        /*decode message                */
+    H5O_refcount_encode,        /*encode message                */
+    H5O_refcount_copy,          /*copy the native value         */
+    H5O_refcount_size,          /*size of symbol table entry    */
+    NULL,                       /*default reset method          */
+    H5O_refcount_free,          /* free method			*/
+    NULL,                       /* file delete method		*/
+    NULL,                       /* link method			*/
+    NULL,                       /*set share method		*/
+    NULL,                       /*can share method		*/
+    H5O_refcount_pre_copy_file, /* pre copy native value to file */
+    NULL,                       /* copy native value to file    */
+    NULL,                       /* post copy native value to file */
+    NULL,                       /* get creation index		*/
+    NULL,                       /* set creation index		*/
+    H5O_refcount_debug          /*debug the message             */
 }};
 
 /* Current version of ref. count information */
-#define H5O_REFCOUNT_VERSION 	0
+#define H5O_REFCOUNT_VERSION 0
 
 /* Declare a free list to manage the H5O_refcount_t struct */
 H5FL_DEFINE_STATIC(H5O_refcount_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_refcount_decode
  *
@@ -89,11 +87,11 @@ H5FL_DEFINE_STATIC(H5O_refcount_t);
  */
 static void *
 H5O_refcount_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_refcount_t *refcount = NULL;  /* Reference count */
-    void        *ret_value;     /* Return value */
+    H5O_refcount_t *refcount = NULL; /* Reference count */
+    void *          ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -102,12 +100,12 @@ H5O_refcount_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t
     HDassert(p);
 
     /* Version of message */
-    if(*p++ != H5O_REFCOUNT_VERSION)
+    if (*p++ != H5O_REFCOUNT_VERSION)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for message")
 
     /* Allocate space for message */
-    if(NULL == (refcount = H5FL_MALLOC(H5O_refcount_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (refcount = H5FL_MALLOC(H5O_refcount_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Get ref. count for object */
     UINT32DECODE(p, *refcount)
@@ -116,13 +114,12 @@ H5O_refcount_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t
     ret_value = refcount;
 
 done:
-    if(ret_value == NULL && refcount != NULL)
+    if (ret_value == NULL && refcount != NULL)
         refcount = H5FL_FREE(H5O_refcount_t, refcount);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_refcount_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_refcount_encode
  *
@@ -137,9 +134,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_refcount_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O_refcount_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
+                    const void *_mesg)
 {
-    const H5O_refcount_t   *refcount = (const H5O_refcount_t *)_mesg;
+    const H5O_refcount_t *refcount = (const H5O_refcount_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -157,7 +155,6 @@ H5O_refcount_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shar
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_refcount_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_refcount_copy
  *
@@ -176,16 +173,16 @@ H5O_refcount_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shar
 static void *
 H5O_refcount_copy(const void *_mesg, void *_dest)
 {
-    const H5O_refcount_t   *refcount = (const H5O_refcount_t *)_mesg;
-    H5O_refcount_t         *dest = (H5O_refcount_t *) _dest;
-    void                *ret_value;     /* Return value */
+    const H5O_refcount_t *refcount = (const H5O_refcount_t *)_mesg;
+    H5O_refcount_t *      dest     = (H5O_refcount_t *)_dest;
+    void *                ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(refcount);
-    if(!dest && NULL == (dest = H5FL_MALLOC(H5O_refcount_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!dest && NULL == (dest = H5FL_MALLOC(H5O_refcount_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* copy */
     *dest = *refcount;
@@ -197,7 +194,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_refcount_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_refcount_size
  *
@@ -216,20 +212,19 @@ done:
  */
 static size_t
 H5O_refcount_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
-    const void H5_ATTR_UNUSED *_mesg)
+                  const void H5_ATTR_UNUSED *_mesg)
 {
-    size_t ret_value;   /* Return value */
+    size_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set return value */
-    ret_value = 1                       /* Version */
-                + 4;                    /* Ref. count */
+    ret_value = 1    /* Version */
+                + 4; /* Ref. count */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_refcount_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_refcount_free
  *
@@ -254,7 +249,6 @@ H5O_refcount_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_refcount_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_refcount_pre_copy_file
  *
@@ -271,7 +265,8 @@ H5O_refcount_free(void *mesg)
  */
 static herr_t
 H5O_refcount_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UNUSED *native_src,
-    hbool_t *deleted, const H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *udata)
+                           hbool_t *deleted, const H5O_copy_t H5_ATTR_UNUSED *cpy_info,
+                           void H5_ATTR_UNUSED *udata)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -287,7 +282,6 @@ H5O_refcount_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UN
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_refcount_pre_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_refcount_debug
  *
@@ -302,10 +296,10 @@ H5O_refcount_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void H5_ATTR_UN
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_refcount_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE * stream,
-	       int indent, int fwidth)
+H5O_refcount_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+                   int indent, int fwidth)
 {
-    const H5O_refcount_t       *refcount = (const H5O_refcount_t *) _mesg;
+    const H5O_refcount_t *refcount = (const H5O_refcount_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -316,9 +310,7 @@ H5O_refcount_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of links:", (unsigned)*refcount);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of links:", (unsigned)*refcount);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_refcount_debug() */
-
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index e633a30..b9c1530 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -11,75 +11,74 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5O_PACKAGE	/*suppress error about including H5Opkg	  */
-#define H5S_PACKAGE		/*prevent warning from including H5Spkg.h */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Gprivate.h"		/* Groups			  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"		/* Object headers		  	*/
-#include "H5Spkg.h"		/* Dataspaces 				*/
-
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+#define H5S_PACKAGE /*prevent warning from including H5Spkg.h */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Gprivate.h"  /* Groups			  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers		  	*/
+#include "H5Spkg.h"      /* Dataspaces 				*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_sdspace_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_sdspace_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                 unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg);
-static void *H5O_sdspace_copy(const void *_mesg, void *_dest);
+static void * H5O_sdspace_copy(const void *_mesg, void *_dest);
 static size_t H5O_sdspace_size(const H5F_t *f, const void *_mesg);
 static herr_t H5O_sdspace_reset(void *_mesg);
 static herr_t H5O_sdspace_free(void *_mesg);
-static herr_t H5O_sdspace_pre_copy_file(H5F_t *file_src, const void *mesg_src,
-    hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata);
-static herr_t H5O_sdspace_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-				FILE * stream, int indent, int fwidth);
+static herr_t H5O_sdspace_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
+                                        const H5O_copy_t *cpy_info, void *_udata);
+static herr_t H5O_sdspace_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                                int fwidth);
 
 /* Set up & include shared message "interface" info */
-#define H5O_SHARED_TYPE			H5O_MSG_SDSPACE
-#define H5O_SHARED_DECODE		H5O_sdspace_shared_decode
-#define H5O_SHARED_DECODE_REAL		H5O_sdspace_decode
-#define H5O_SHARED_ENCODE		H5O_sdspace_shared_encode
-#define H5O_SHARED_ENCODE_REAL		H5O_sdspace_encode
-#define H5O_SHARED_SIZE			H5O_sdspace_shared_size
-#define H5O_SHARED_SIZE_REAL		H5O_sdspace_size
-#define H5O_SHARED_DELETE		H5O_sdspace_shared_delete
+#define H5O_SHARED_TYPE        H5O_MSG_SDSPACE
+#define H5O_SHARED_DECODE      H5O_sdspace_shared_decode
+#define H5O_SHARED_DECODE_REAL H5O_sdspace_decode
+#define H5O_SHARED_ENCODE      H5O_sdspace_shared_encode
+#define H5O_SHARED_ENCODE_REAL H5O_sdspace_encode
+#define H5O_SHARED_SIZE        H5O_sdspace_shared_size
+#define H5O_SHARED_SIZE_REAL   H5O_sdspace_size
+#define H5O_SHARED_DELETE      H5O_sdspace_shared_delete
 #undef H5O_SHARED_DELETE_REAL
-#define H5O_SHARED_LINK			H5O_sdspace_shared_link
+#define H5O_SHARED_LINK H5O_sdspace_shared_link
 #undef H5O_SHARED_LINK_REAL
-#define H5O_SHARED_COPY_FILE		H5O_sdspace_shared_copy_file
+#define H5O_SHARED_COPY_FILE H5O_sdspace_shared_copy_file
 #undef H5O_SHARED_COPY_FILE_REAL
-#define H5O_SHARED_POST_COPY_FILE	H5O_sdspace_shared_post_copy_file
+#define H5O_SHARED_POST_COPY_FILE H5O_sdspace_shared_post_copy_file
 #undef H5O_SHARED_POST_COPY_FILE_REAL
-#undef  H5O_SHARED_POST_COPY_FILE_UPD
-#define H5O_SHARED_DEBUG		H5O_sdspace_shared_debug
-#define H5O_SHARED_DEBUG_REAL		H5O_sdspace_debug
-#include "H5Oshared.h"			/* Shared Object Header Message Callbacks */
+#undef H5O_SHARED_POST_COPY_FILE_UPD
+#define H5O_SHARED_DEBUG      H5O_sdspace_shared_debug
+#define H5O_SHARED_DEBUG_REAL H5O_sdspace_debug
+#include "H5Oshared.h" /* Shared Object Header Message Callbacks */
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_SDSPACE[1] = {{
-    H5O_SDSPACE_ID,	    	/* message id number		    	*/
-    "dataspace",	    	/* message name for debugging	   	*/
-    sizeof(H5S_extent_t),   	/* native message size		    	*/
-    H5O_SHARE_IS_SHARABLE|H5O_SHARE_IN_OHDR,	/* messages are sharable?       */
-    H5O_sdspace_shared_decode,	/* decode message			*/
-    H5O_sdspace_shared_encode,	/* encode message			*/
-    H5O_sdspace_copy,	    	/* copy the native value		*/
-    H5O_sdspace_shared_size,	/* size of symbol table entry	    	*/
-    H5O_sdspace_reset,	    	/* default reset method		    	*/
-    H5O_sdspace_free,		/* free method				*/
-    H5O_sdspace_shared_delete,	/* file delete method		*/
-    H5O_sdspace_shared_link,	/* link method			*/
-    NULL,			/* set share method		*/
-    NULL,		    	/*can share method		*/
-    H5O_sdspace_pre_copy_file,	/* pre copy native value to file */
-    H5O_sdspace_shared_copy_file,/* copy native value to file    */
-    H5O_sdspace_shared_post_copy_file,/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_sdspace_shared_debug	/* debug the message		    	*/
+    H5O_SDSPACE_ID,                            /* message id number		    	*/
+    "dataspace",                               /* message name for debugging	   	*/
+    sizeof(H5S_extent_t),                      /* native message size		    	*/
+    H5O_SHARE_IS_SHARABLE | H5O_SHARE_IN_OHDR, /* messages are sharable?       */
+    H5O_sdspace_shared_decode,                 /* decode message			*/
+    H5O_sdspace_shared_encode,                 /* encode message			*/
+    H5O_sdspace_copy,                          /* copy the native value		*/
+    H5O_sdspace_shared_size,                   /* size of symbol table entry	    	*/
+    H5O_sdspace_reset,                         /* default reset method		    	*/
+    H5O_sdspace_free,                          /* free method				*/
+    H5O_sdspace_shared_delete,                 /* file delete method		*/
+    H5O_sdspace_shared_link,                   /* link method			*/
+    NULL,                                      /* set share method		*/
+    NULL,                                      /*can share method		*/
+    H5O_sdspace_pre_copy_file,                 /* pre copy native value to file */
+    H5O_sdspace_shared_copy_file,              /* copy native value to file    */
+    H5O_sdspace_shared_post_copy_file,         /* post copy native value to file    */
+    NULL,                                      /* get creation index		*/
+    NULL,                                      /* set creation index		*/
+    H5O_sdspace_shared_debug                   /* debug the message		    	*/
 }};
 
 /* Declare external the free list for H5S_extent_t's */
@@ -88,35 +87,34 @@ H5FL_EXTERN(H5S_extent_t);
 /* Declare external the free list for hsize_t arrays */
 H5FL_ARR_EXTERN(hsize_t);
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_sdspace_decode
  PURPOSE
     Decode a simple dimensionality message and return a pointer to a memory
-	struct with the decoded information
+        struct with the decoded information
  USAGE
     void *H5O_sdspace_decode(f, dxpl_id, mesg_flags, p)
-	H5F_t *f;	        IN: pointer to the HDF5 file struct
+        H5F_t *f;	        IN: pointer to the HDF5 file struct
         hid_t dxpl_id;          IN: DXPL for any I/O
         unsigned mesg_flags;    IN: Message flags to influence decoding
-	const uint8 *p;		IN: the raw information buffer
+        const uint8 *p;		IN: the raw information buffer
  RETURNS
     Pointer to the new message in native order on success, NULL on failure
  DESCRIPTION
-	This function decodes the "raw" disk form of a simple dimensionality
+        This function decodes the "raw" disk form of a simple dimensionality
     message into a struct in memory native format.  The struct is allocated
     within this function using malloc() and is returned to the caller.
 --------------------------------------------------------------------------*/
 static void *
 H5O_sdspace_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                   unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                   size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5S_extent_t	*sdim = NULL;/* New extent dimensionality structure */
-    void		*ret_value;
-    unsigned		i;		/* local counting variable */
-    unsigned		flags, version;
+    H5S_extent_t *sdim = NULL; /* New extent dimensionality structure */
+    void *        ret_value;
+    unsigned      i; /* local counting variable */
+    unsigned      flags, version;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -125,29 +123,29 @@ H5O_sdspace_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED
     HDassert(p);
 
     /* decode */
-    if(NULL == (sdim = H5FL_CALLOC(H5S_extent_t)))
+    if (NULL == (sdim = H5FL_CALLOC(H5S_extent_t)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_NOSPACE, NULL, "dataspace structure allocation failed")
 
     /* Check version */
     version = *p++;
-    if(version < H5O_SDSPACE_VERSION_1 || version > H5O_SDSPACE_VERSION_2)
+    if (version < H5O_SDSPACE_VERSION_1 || version > H5O_SDSPACE_VERSION_2)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "wrong version number in dataspace message")
     sdim->version = version;
 
     /* Get rank */
     sdim->rank = *p++;
-    if(sdim->rank > H5S_MAX_RANK)
+    if (sdim->rank > H5S_MAX_RANK)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "simple dataspace dimensionality is too large")
 
     /* Get dataspace flags for later */
     flags = *p++;
 
     /* Get or determine the type of the extent */
-    if(version >= H5O_SDSPACE_VERSION_2)
+    if (version >= H5O_SDSPACE_VERSION_2)
         sdim->type = (H5S_class_t)*p++;
     else {
         /* Set the dataspace type to be simple or scalar as appropriate */
-        if(sdim->rank > 0)
+        if (sdim->rank > 0)
             sdim->type = H5S_SIMPLE;
         else
             sdim->type = H5S_SCALAR;
@@ -158,38 +156,38 @@ H5O_sdspace_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED
     HDassert(sdim->type != H5S_NULL || sdim->version >= H5O_SDSPACE_VERSION_2);
 
     /* Only Version 1 has these reserved bytes */
-    if(version == H5O_SDSPACE_VERSION_1)
+    if (version == H5O_SDSPACE_VERSION_1)
         p += 4; /*reserved*/
 
     /* Decode dimension sizes */
-    if(sdim->rank > 0) {
-        if(NULL == (sdim->size = (hsize_t *)H5FL_ARR_MALLOC(hsize_t, (size_t)sdim->rank)))
+    if (sdim->rank > 0) {
+        if (NULL == (sdim->size = (hsize_t *)H5FL_ARR_MALLOC(hsize_t, (size_t)sdim->rank)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
-        for(i = 0; i < sdim->rank; i++)
+        for (i = 0; i < sdim->rank; i++)
             H5F_DECODE_LENGTH(f, p, sdim->size[i]);
 
-        if(flags & H5S_VALID_MAX) {
-            if(NULL == (sdim->max = (hsize_t *)H5FL_ARR_MALLOC(hsize_t, (size_t)sdim->rank)))
+        if (flags & H5S_VALID_MAX) {
+            if (NULL == (sdim->max = (hsize_t *)H5FL_ARR_MALLOC(hsize_t, (size_t)sdim->rank)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-            for(i = 0; i < sdim->rank; i++)
-                H5F_DECODE_LENGTH (f, p, sdim->max[i]);
+            for (i = 0; i < sdim->rank; i++)
+                H5F_DECODE_LENGTH(f, p, sdim->max[i]);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Compute the number of elements in the extent */
-    if(sdim->type == H5S_NULL)
+    if (sdim->type == H5S_NULL)
         sdim->nelem = 0;
     else {
-        for(i = 0, sdim->nelem = 1; i < sdim->rank; i++)
+        for (i = 0, sdim->nelem = 1; i < sdim->rank; i++)
             sdim->nelem *= sdim->size[i];
     } /* end else */
 
     /* Set return value */
-    ret_value = (void*)sdim;	/*success*/
+    ret_value = (void *)sdim; /*success*/
 
 done:
-    if(!ret_value && sdim) {
+    if (!ret_value && sdim) {
         H5S_extent_release(sdim);
         sdim = H5FL_FREE(H5S_extent_t, sdim);
     } /* end if */
@@ -197,7 +195,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_sdspace_decode() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_sdspace_encode
@@ -205,22 +202,22 @@ done:
     Encode a simple dimensionality message
  USAGE
     herr_t H5O_sdspace_encode(f, raw_size, p, mesg)
-	H5F_t *f;	        IN: pointer to the HDF5 file struct
-	size_t raw_size;	IN: size of the raw information buffer
-	const uint8 *p;		IN: the raw information buffer
-	const void *mesg;	IN: Pointer to the extent dimensionality struct
+        H5F_t *f;	        IN: pointer to the HDF5 file struct
+        size_t raw_size;	IN: size of the raw information buffer
+        const uint8 *p;		IN: the raw information buffer
+        const void *mesg;	IN: Pointer to the extent dimensionality struct
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
-	This function encodes the native memory form of the simple
+        This function encodes the native memory form of the simple
     dimensionality message in the "raw" disk form.
 
  MODIFICATIONS
-	Robb Matzke, 1998-04-09
-	The current and maximum dimensions are now H5F_SIZEOF_SIZET bytes
-	instead of just four bytes.
+        Robb Matzke, 1998-04-09
+        The current and maximum dimensions are now H5F_SIZEOF_SIZET bytes
+        instead of just four bytes.
 
-  	Robb Matzke, 1998-07-20
+        Robb Matzke, 1998-07-20
         Added a version number and reformatted the message for aligment.
 
         Raymond Lu
@@ -232,9 +229,9 @@ done:
 static herr_t
 H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg)
 {
-    const H5S_extent_t	*sdim = (const H5S_extent_t *)_mesg;
-    unsigned		flags = 0;
-    unsigned		u;  /* Local counting variable */
+    const H5S_extent_t *sdim  = (const H5S_extent_t *)_mesg;
+    unsigned            flags = 0;
+    unsigned            u; /* Local counting variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -252,12 +249,12 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg)
     *p++ = (uint8_t)sdim->rank;
 
     /* Flags */
-    if(sdim->max)
+    if (sdim->max)
         flags |= H5S_VALID_MAX;
     *p++ = (uint8_t)flags;
 
     /* Dataspace type */
-    if(sdim->version > H5O_SDSPACE_VERSION_1)
+    if (sdim->version > H5O_SDSPACE_VERSION_1)
         *p++ = (uint8_t)sdim->type;
     else {
         *p++ = 0; /*reserved*/
@@ -265,22 +262,21 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg)
         *p++ = 0; /*reserved*/
         *p++ = 0; /*reserved*/
         *p++ = 0; /*reserved*/
-    } /* end else */
+    }             /* end else */
 
     /* Current & maximum dimensions */
-    if(sdim->rank > 0) {
-        for(u = 0; u < sdim->rank; u++)
+    if (sdim->rank > 0) {
+        for (u = 0; u < sdim->rank; u++)
             H5F_ENCODE_LENGTH(f, p, sdim->size[u]);
-        if(flags & H5S_VALID_MAX) {
-            for(u = 0; u < sdim->rank; u++)
+        if (flags & H5S_VALID_MAX) {
+            for (u = 0; u < sdim->rank; u++)
                 H5F_ENCODE_LENGTH(f, p, sdim->max[u]);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_sdspace_encode() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_sdspace_copy
@@ -288,44 +284,43 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg)
     Copies a message from MESG to DEST, allocating DEST if necessary.
  USAGE
     void *H5O_sdspace_copy(_mesg, _dest)
-	const void *_mesg;	IN: Pointer to the source extent dimensionality struct
-	const void *_dest;	IN: Pointer to the destination extent dimensionality struct
+        const void *_mesg;	IN: Pointer to the source extent dimensionality struct
+        const void *_dest;	IN: Pointer to the destination extent dimensionality struct
  RETURNS
     Pointer to DEST on success, NULL on failure
  DESCRIPTION
-	This function copies a native (memory) simple dimensionality message,
+        This function copies a native (memory) simple dimensionality message,
     allocating the destination structure if necessary.
 --------------------------------------------------------------------------*/
 static void *
 H5O_sdspace_copy(const void *_mesg, void *_dest)
 {
-    const H5S_extent_t	   *mesg = (const H5S_extent_t *)_mesg;
-    H5S_extent_t	   *dest = (H5S_extent_t *)_dest;
-    void                   *ret_value;          /* Return value */
+    const H5S_extent_t *mesg = (const H5S_extent_t *)_mesg;
+    H5S_extent_t *      dest = (H5S_extent_t *)_dest;
+    void *              ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(mesg);
-    if(!dest && NULL == (dest = H5FL_CALLOC(H5S_extent_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (!dest && NULL == (dest = H5FL_CALLOC(H5S_extent_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy extent information */
-    if(H5S_extent_copy(dest, mesg, TRUE) < 0)
+    if (H5S_extent_copy(dest, mesg, TRUE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy extent")
 
     /* Set return value */
     ret_value = dest;
 
 done:
-    if(NULL == ret_value)
-        if(dest && NULL == _dest)
+    if (NULL == ret_value)
+        if (dest && NULL == _dest)
             dest = H5FL_FREE(H5S_extent_t, dest);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_sdspace_copy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_sdspace_size
@@ -333,34 +328,34 @@ done:
     Return the raw message size in bytes
  USAGE
     void *H5O_sdspace_size(f, mesg)
-	H5F_t *f;	  IN: pointer to the HDF5 file struct
-	const void *mesg;	IN: Pointer to the source extent dimensionality struct
+        H5F_t *f;	  IN: pointer to the HDF5 file struct
+        const void *mesg;	IN: Pointer to the source extent dimensionality struct
  RETURNS
     Size of message on success, zero on failure
  DESCRIPTION
-	This function returns the size of the raw simple dimensionality message on
+        This function returns the size of the raw simple dimensionality message on
     success.  (Not counting the message type or size fields, only the data
     portion of the message).  It doesn't take into account alignment.
 
  MODIFICATIONS
-	Robb Matzke, 1998-04-09
-	The current and maximum dimensions are now H5F_SIZEOF_SIZET bytes
-	instead of just four bytes.
+        Robb Matzke, 1998-04-09
+        The current and maximum dimensions are now H5F_SIZEOF_SIZET bytes
+        instead of just four bytes.
 --------------------------------------------------------------------------*/
 static size_t
 H5O_sdspace_size(const H5F_t *f, const void *_mesg)
 {
-    const H5S_extent_t	*space = (const H5S_extent_t *)_mesg;
-    size_t		ret_value;
+    const H5S_extent_t *space = (const H5S_extent_t *)_mesg;
+    size_t              ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Basic information for all dataspace messages */
-    ret_value = 1 +             /* Version */
-            1 +                 /* Rank */
-            1 +                 /* Flags */
-            1 +                 /* Dataspace type/reserved */
-            ((space->version > H5O_SDSPACE_VERSION_1) ? 0 : 4); /* Eliminated/reserved */
+    ret_value = 1 +                                                 /* Version */
+                1 +                                                 /* Rank */
+                1 +                                                 /* Flags */
+                1 +                                                 /* Dataspace type/reserved */
+                ((space->version > H5O_SDSPACE_VERSION_1) ? 0 : 4); /* Eliminated/reserved */
 
     /* Add in the dimension sizes */
     ret_value += space->rank * H5F_SIZEOF_SIZE(f);
@@ -371,7 +366,6 @@ H5O_sdspace_size(const H5F_t *f, const void *_mesg)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_sdspace_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_sdspace_reset
  *
@@ -390,7 +384,7 @@ H5O_sdspace_size(const H5F_t *f, const void *_mesg)
 static herr_t
 H5O_sdspace_reset(void *_mesg)
 {
-    H5S_extent_t	*mesg = (H5S_extent_t*)_mesg;
+    H5S_extent_t *mesg = (H5S_extent_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -399,7 +393,6 @@ H5O_sdspace_reset(void *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_sdsdpace_free
  *
@@ -424,7 +417,6 @@ H5O_sdspace_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_sdspace_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_sdspace_pre_copy_file
  *
@@ -442,11 +434,12 @@ H5O_sdspace_free(void *mesg)
  */
 static herr_t
 H5O_sdspace_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src,
-    hbool_t H5_ATTR_UNUSED *deleted, const H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata)
+                          hbool_t H5_ATTR_UNUSED *deleted, const H5O_copy_t H5_ATTR_UNUSED *cpy_info,
+                          void *_udata)
 {
-    const H5S_extent_t *src_space_extent = (const H5S_extent_t *)mesg_src;  /* Source dataspace extent */
-    H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata;   /* Dataset copying user data */
-    herr_t         ret_value = SUCCEED;          /* Return value */
+    const H5S_extent_t *src_space_extent = (const H5S_extent_t *)mesg_src; /* Source dataspace extent */
+    H5D_copy_file_ud_t *udata            = (H5D_copy_file_ud_t *)_udata;   /* Dataset copying user data */
+    herr_t              ret_value        = SUCCEED;                        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -460,13 +453,13 @@ H5O_sdspace_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src,
      * if the layout is an early version, but that information isn't
      * available here, so we just make a copy of it in all cases)
      */
-    if(udata) {
+    if (udata) {
         /* Allocate copy of dataspace extent */
-        if(NULL == (udata->src_space_extent = H5FL_CALLOC(H5S_extent_t)))
+        if (NULL == (udata->src_space_extent = H5FL_CALLOC(H5S_extent_t)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_NOSPACE, FAIL, "dataspace extent allocation failed")
 
         /* Create a copy of the dataspace extent */
-        if(H5S_extent_copy(udata->src_space_extent, src_space_extent, TRUE) < 0)
+        if (H5S_extent_copy(udata->src_space_extent, src_space_extent, TRUE) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "can't copy extent")
     } /* end if */
 
@@ -474,7 +467,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dspace_pre_copy_file() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_sdspace_debug
@@ -482,22 +474,22 @@ done:
     Prints debugging information for a simple dimensionality message
  USAGE
     void *H5O_sdspace_debug(f, mesg, stream, indent, fwidth)
-	H5F_t *f;	        IN: pointer to the HDF5 file struct
-	const void *mesg;	IN: Pointer to the source extent dimensionality struct
-	FILE *stream;		IN: Pointer to the stream for output data
-	int indent;		IN: Amount to indent information by
-	int fwidth;		IN: Field width (?)
+        H5F_t *f;	        IN: pointer to the HDF5 file struct
+        const void *mesg;	IN: Pointer to the source extent dimensionality struct
+        FILE *stream;		IN: Pointer to the stream for output data
+        int indent;		IN: Amount to indent information by
+        int fwidth;		IN: Field width (?)
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
-	This function prints debugging output to the stream passed as a
+        This function prints debugging output to the stream passed as a
     parameter.
 --------------------------------------------------------------------------*/
 static herr_t
-H5O_sdspace_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *mesg,
-		  FILE * stream, int indent, int fwidth)
+H5O_sdspace_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *mesg, FILE *stream,
+                  int indent, int fwidth)
 {
-    const H5S_extent_t	   *sdim = (const H5S_extent_t *)mesg;
+    const H5S_extent_t *sdim = (const H5S_extent_t *)mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -508,33 +500,30 @@ H5O_sdspace_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const v
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-	    "Rank:",
-	    (unsigned long) (sdim->rank));
+    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth, "Rank:", (unsigned long)(sdim->rank));
 
-    if(sdim->rank > 0) {
-        unsigned		    u;	/* local counting variable */
+    if (sdim->rank > 0) {
+        unsigned u; /* local counting variable */
 
         HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Dim Size:");
-        for(u = 0; u < sdim->rank; u++)
-            HDfprintf (stream, "%s%Hu", u?", ":"", sdim->size[u]);
-        HDfprintf (stream, "}\n");
+        for (u = 0; u < sdim->rank; u++)
+            HDfprintf(stream, "%s%Hu", u ? ", " : "", sdim->size[u]);
+        HDfprintf(stream, "}\n");
 
         HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Dim Max:");
-        if(sdim->max) {
-            HDfprintf (stream, "{");
-            for(u = 0; u < sdim->rank; u++) {
-                if(H5S_UNLIMITED==sdim->max[u])
-                    HDfprintf (stream, "%sUNLIM", u?", ":"");
+        if (sdim->max) {
+            HDfprintf(stream, "{");
+            for (u = 0; u < sdim->rank; u++) {
+                if (H5S_UNLIMITED == sdim->max[u])
+                    HDfprintf(stream, "%sUNLIM", u ? ", " : "");
                 else
-                    HDfprintf (stream, "%s%Hu", u?", ":"", sdim->max[u]);
+                    HDfprintf(stream, "%s%Hu", u ? ", " : "", sdim->max[u]);
             } /* end for */
-            HDfprintf (stream, "}\n");
+            HDfprintf(stream, "}\n");
         } /* end if */
         else
-            HDfprintf (stream, "CONSTANT\n");
+            HDfprintf(stream, "CONSTANT\n");
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_sdspace_debug() */
-
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 2475dd5..4803c91 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -28,65 +28,57 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5HFprivate.h"        /* Fractal heap				*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5SMprivate.h"        /* Shared object header messages        */
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5Gprivate.h"  /* Groups				*/
+#include "H5HFprivate.h" /* Fractal heap				*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5SMprivate.h" /* Shared object header messages        */
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* First version, with full symbol table entry as link for object header sharing */
-#define H5O_SHARED_VERSION_1	1
+#define H5O_SHARED_VERSION_1 1
 
 /* Older version, with just address of object as link for object header sharing */
-#define H5O_SHARED_VERSION_2	2
+#define H5O_SHARED_VERSION_2 2
 
 /* Newest version, which recognizes messages that are stored in the SOHM heap */
-#define H5O_SHARED_VERSION_3	3
-#define H5O_SHARED_VERSION_LATEST	H5O_SHARED_VERSION_3
+#define H5O_SHARED_VERSION_3      3
+#define H5O_SHARED_VERSION_LATEST H5O_SHARED_VERSION_3
 
 /* Size of stack buffer for serialized messages */
-#define H5O_MESG_BUF_SIZE               128
-
+#define H5O_MESG_BUF_SIZE 128
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shared_read
  *
@@ -104,13 +96,13 @@
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_shared_read(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags,
-    const H5O_shared_t *shared, const H5O_msg_class_t *type)
+H5O_shared_read(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags, const H5O_shared_t *shared,
+                const H5O_msg_class_t *type)
 {
     H5HF_t *fheap = NULL;
-    H5WB_t *wb = NULL;          /* Wrapped buffer for attribute data */
+    H5WB_t *wb    = NULL;                /* Wrapped buffer for attribute data */
     uint8_t mesg_buf[H5O_MESG_BUF_SIZE]; /* Buffer for deserializing messages */
-    void *ret_value = NULL;     /* Return value */
+    void *  ret_value = NULL;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -126,77 +118,77 @@ H5O_shared_read(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags,
     HDassert(H5O_IS_STORED_SHARED(shared->type));
 
     /* Check for implicit shared object header message */
-    if(shared->type == H5O_SHARE_TYPE_SOHM) {
-        haddr_t fheap_addr;             /* Address of SOHM heap */
-        uint8_t *mesg_ptr;              /* Pointer to raw message in heap */
-        size_t mesg_size;               /* Size of message */
+    if (shared->type == H5O_SHARE_TYPE_SOHM) {
+        haddr_t  fheap_addr; /* Address of SOHM heap */
+        uint8_t *mesg_ptr;   /* Pointer to raw message in heap */
+        size_t   mesg_size;  /* Size of message */
 
         /* Retrieve the fractal heap address for shared messages */
-        if(H5SM_get_fheap_addr(f, dxpl_id, type->id, &fheap_addr) < 0)
+        if (H5SM_get_fheap_addr(f, dxpl_id, type->id, &fheap_addr) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "can't get fheap address for shared messages")
 
         /* Open the fractal heap */
-        if(NULL == (fheap = H5HF_open(f, dxpl_id, fheap_addr)))
+        if (NULL == (fheap = H5HF_open(f, dxpl_id, fheap_addr)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open fractal heap")
 
         /* Get the size of the message in the heap */
-        if(H5HF_get_obj_len(fheap, dxpl_id, &(shared->u.heap_id), &mesg_size) < 0)
+        if (H5HF_get_obj_len(fheap, dxpl_id, &(shared->u.heap_id), &mesg_size) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "can't get message size from fractal heap.")
 
         /* Wrap the local buffer for serialized message */
-        if(NULL == (wb = H5WB_wrap(mesg_buf, sizeof(mesg_buf))))
+        if (NULL == (wb = H5WB_wrap(mesg_buf, sizeof(mesg_buf))))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for message */
-        if(NULL == (mesg_ptr = (uint8_t *)H5WB_actual(wb, mesg_size)))
+        if (NULL == (mesg_ptr = (uint8_t *)H5WB_actual(wb, mesg_size)))
             HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, NULL, "can't get actual buffer")
 
         /* Retrieve the message from the heap */
-        if(H5HF_read(fheap, dxpl_id, &(shared->u.heap_id), mesg_ptr) < 0)
+        if (H5HF_read(fheap, dxpl_id, &(shared->u.heap_id), mesg_ptr) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "can't read message from fractal heap.")
 
         /* Decode the message */
-        if(NULL == (ret_value = (type->decode)(f, dxpl_id, open_oh, 0, ioflags, mesg_size, mesg_ptr)))
+        if (NULL == (ret_value = (type->decode)(f, dxpl_id, open_oh, 0, ioflags, mesg_size, mesg_ptr)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, NULL, "can't decode shared message.")
     } /* end if */
     else {
-        H5O_loc_t oloc;         /* Location for object header where message is stored */
+        H5O_loc_t oloc; /* Location for object header where message is stored */
 
         HDassert(shared->type == H5O_SHARE_TYPE_COMMITTED);
 
         /* Build the object location for the shared message's object header */
-        oloc.file = f;
-        oloc.addr = shared->u.loc.oh_addr;
+        oloc.file         = f;
+        oloc.addr         = shared->u.loc.oh_addr;
         oloc.holding_file = FALSE;
 
-        if(open_oh && oloc.addr == H5O_OH_GET_ADDR(open_oh)) {
+        if (open_oh && oloc.addr == H5O_OH_GET_ADDR(open_oh)) {
             /* The shared message is in the already opened object header.  This
              * is possible, for example, if an attribute's datatype is shared in
              * the same object header the attribute is in.  Read the message
              * directly. */
-            if(NULL == (ret_value = H5O_msg_read_oh(f, dxpl_id, open_oh, type->id, NULL)))
+            if (NULL == (ret_value = H5O_msg_read_oh(f, dxpl_id, open_oh, type->id, NULL)))
                 HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read message")
-        } else
+        }
+        else
             /* The shared message is in another object header */
-            if(NULL == (ret_value = H5O_msg_read(&oloc, type->id, NULL, dxpl_id)))
-                HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read message")
+            if (NULL == (ret_value = H5O_msg_read(&oloc, type->id, NULL, dxpl_id)))
+            HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read message")
     } /* end else */
 
     /* Mark the message as shared */
-    if(H5O_msg_set_share(type->id, shared, ret_value) < 0)
+    if (H5O_msg_set_share(type->id, shared, ret_value) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to set sharing information")
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, NULL, "can't close fractal heap")
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shared_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shared_link_adj
  *
@@ -219,10 +211,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_shared_link_adj(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    const H5O_msg_class_t *type, H5O_shared_t *shared, int adjust)
+H5O_shared_link_adj(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, const H5O_msg_class_t *type,
+                    H5O_shared_t *shared, int adjust)
 {
-    herr_t ret_value = SUCCEED;     /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -231,8 +223,8 @@ H5O_shared_link_adj(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     HDassert(shared);
 
     /* Check for type of shared message */
-    if(shared->type == H5O_SHARE_TYPE_COMMITTED) {
-        H5O_loc_t oloc;         /* Location for object header where message is stored */
+    if (shared->type == H5O_SHARE_TYPE_COMMITTED) {
+        H5O_loc_t oloc; /* Location for object header where message is stored */
 
         /*
          * The shared message is stored in some object header.
@@ -253,46 +245,46 @@ H5O_shared_link_adj(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
             HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "interfile hard links are not allowed")*/
 
         /* Build the object location for the shared message's object header */
-        oloc.file = f;
-        oloc.addr = shared->u.loc.oh_addr;
+        oloc.file         = f;
+        oloc.addr         = shared->u.loc.oh_addr;
         oloc.holding_file = FALSE;
 
-        if(open_oh && oloc.addr == H5O_OH_GET_ADDR(open_oh)) {
+        if (open_oh && oloc.addr == H5O_OH_GET_ADDR(open_oh)) {
             /* The shared message is in the already opened object header.  This
              * is possible, for example, if an attribute's datatype is shared in
              * the same object header the attribute is in.  Adjust the link
              * count directly. */
             hbool_t deleted = FALSE; /* This is used only to satisfy H5O_link_oh */
 
-            if(H5O_link_oh(f, adjust, dxpl_id, open_oh, &deleted) < 0)
+            if (H5O_link_oh(f, adjust, dxpl_id, open_oh, &deleted) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count")
 
             HDassert(!deleted);
-        } else
+        }
+        else
             /* The shared message is in another object header */
-            if(H5O_link(&oloc, adjust, dxpl_id) < 0)
-                HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count")
+            if (H5O_link(&oloc, adjust, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count")
     } /* end if */
     else {
         HDassert(shared->type == H5O_SHARE_TYPE_SOHM || shared->type == H5O_SHARE_TYPE_HERE);
 
         /* Check for decrementing reference count on shared message */
-        if(adjust < 0) {
-            if(H5SM_delete(f, dxpl_id, open_oh, shared) < 0)
+        if (adjust < 0) {
+            if (H5SM_delete(f, dxpl_id, open_oh, shared) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to delete message from SOHM table")
         } /* end if */
         /* Check for incrementing reference count on message */
-        else if(adjust > 0) {
-            if(H5SM_try_share(f, dxpl_id, open_oh, 0, type->id, shared, NULL) < 0)
+        else if (adjust > 0) {
+            if (H5SM_try_share(f, dxpl_id, open_oh, 0, type->id, shared, NULL) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, FAIL, "error trying to share message")
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shared_link_adj() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shared_decode
  *
@@ -306,12 +298,12 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags,
-    const uint8_t *buf, const H5O_msg_class_t *type)
+H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags, const uint8_t *buf,
+                  const H5O_msg_class_t *type)
 {
-    H5O_shared_t sh_mesg;       /* Shared message info */
-    unsigned version;           /* Shared message version */
-    void *ret_value;            /* Return value */
+    H5O_shared_t sh_mesg;   /* Shared message info */
+    unsigned     version;   /* Shared message version */
+    void *       ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -322,13 +314,13 @@ H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags,
 
     /* Version */
     version = *buf++;
-    if(version < H5O_SHARED_VERSION_1 || version > H5O_SHARED_VERSION_LATEST)
+    if (version < H5O_SHARED_VERSION_1 || version > H5O_SHARED_VERSION_LATEST)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for shared object message")
 
     /* Get the shared information type
      * Flags are unused before version 3.
      */
-    if(version >= H5O_SHARED_VERSION_2)
+    if (version >= H5O_SHARED_VERSION_2)
         sh_mesg.type = *buf++;
     else {
         sh_mesg.type = H5O_SHARE_TYPE_COMMITTED;
@@ -336,23 +328,23 @@ H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags,
     } /* end else */
 
     /* Skip reserved bytes (for version 1) */
-    if(version == H5O_SHARED_VERSION_1)
+    if (version == H5O_SHARED_VERSION_1)
         buf += 6;
 
     /* Body */
-    if(version == H5O_SHARED_VERSION_1) {
+    if (version == H5O_SHARED_VERSION_1) {
         /* Initialize other location fields */
         sh_mesg.u.loc.index = 0;
 
         /* Decode stored "symbol table entry" into message location */
-        buf += H5F_SIZEOF_SIZE(f);          /* Skip over local heap address */
+        buf += H5F_SIZEOF_SIZE(f); /* Skip over local heap address */
         H5F_addr_decode(f, &buf, &(sh_mesg.u.loc.oh_addr));
     } /* end if */
     else if (version >= H5O_SHARED_VERSION_2) {
         /* If this message is in the heap, copy a heap ID.
          * Otherwise, it is a named datatype, so copy an H5O_loc_t.
          */
-        if(sh_mesg.type == H5O_SHARE_TYPE_SOHM) {
+        if (sh_mesg.type == H5O_SHARE_TYPE_SOHM) {
             HDassert(version >= H5O_SHARED_VERSION_3);
             HDmemcpy(&sh_mesg.u.heap_id, buf, sizeof(sh_mesg.u.heap_id));
         } /* end if */
@@ -360,27 +352,26 @@ H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags,
             /* The H5O_COMMITTED_FLAG should be set if this message
              * is from an older version before the flag existed.
              */
-            if(version < H5O_SHARED_VERSION_3)
+            if (version < H5O_SHARED_VERSION_3)
                 sh_mesg.type = H5O_SHARE_TYPE_COMMITTED;
 
             sh_mesg.u.loc.index = 0;
             H5F_addr_decode(f, &buf, &sh_mesg.u.loc.oh_addr);
         } /* end else */
-    } /* end else if */
+    }     /* end else if */
 
     /* Set file pointer & message type for all types of shared messages */
-    sh_mesg.file = f;
+    sh_mesg.file        = f;
     sh_mesg.msg_type_id = type->id;
 
     /* Retrieve actual message, through decoded shared message info */
-    if(NULL == (ret_value = H5O_shared_read(f, dxpl_id, open_oh, ioflags, &sh_mesg, type)))
+    if (NULL == (ret_value = H5O_shared_read(f, dxpl_id, open_oh, ioflags, &sh_mesg, type)))
         HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to retrieve native message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shared_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shared_encode
  *
@@ -394,9 +385,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_mesg)
+H5O_shared_encode(const H5F_t *f, uint8_t *buf /*out*/, const H5O_shared_t *sh_mesg)
 {
-    unsigned    version;
+    unsigned version;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -408,12 +399,12 @@ H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_me
     /* If this message is shared in the heap, we need to use version 3 of the
      * encoding and encode the SHARED_IN_HEAP flag.
      */
-    if(sh_mesg->type == H5O_SHARE_TYPE_SOHM)
+    if (sh_mesg->type == H5O_SHARE_TYPE_SOHM)
         version = H5O_SHARED_VERSION_LATEST;
     else {
         HDassert(sh_mesg->type == H5O_SHARE_TYPE_COMMITTED);
         version = H5O_SHARED_VERSION_2; /* version 1 is no longer used */
-    } /* end else */
+    }                                   /* end else */
 
     *buf++ = (uint8_t)version;
     *buf++ = (uint8_t)sh_mesg->type;
@@ -421,7 +412,7 @@ H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_me
     /* Encode either the heap ID of the message or the address of the
      * object header that holds it.
      */
-    if(sh_mesg->type == H5O_SHARE_TYPE_SOHM)
+    if (sh_mesg->type == H5O_SHARE_TYPE_SOHM)
         HDmemcpy(buf, &(sh_mesg->u.heap_id), sizeof(sh_mesg->u.heap_id));
     else
         H5F_addr_encode(f, &buf, sh_mesg->u.loc.oh_addr);
@@ -429,7 +420,6 @@ H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_me
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_shared_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_set_shared
  *
@@ -458,7 +448,6 @@ H5O_set_shared(H5O_shared_t *dst, const H5O_shared_t *src)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_set_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shared_size
  *
@@ -475,26 +464,25 @@ H5O_set_shared(H5O_shared_t *dst, const H5O_shared_t *src)
 size_t
 H5O_shared_size(const H5F_t *f, const H5O_shared_t *sh_mesg)
 {
-    size_t ret_value;           /* Return value */
+    size_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(sh_mesg->type == H5O_SHARE_TYPE_COMMITTED) {
-        ret_value = (size_t)1 +		/*version			*/
-            (size_t)1 +			/*the type field		*/
-            (size_t)H5F_SIZEOF_ADDR(f);	/*sharing by another obj hdr	*/
-    } /* end if */
+    if (sh_mesg->type == H5O_SHARE_TYPE_COMMITTED) {
+        ret_value = (size_t)1 +                 /*version			*/
+                    (size_t)1 +                 /*the type field		*/
+                    (size_t)H5F_SIZEOF_ADDR(f); /*sharing by another obj hdr	*/
+    }                                           /* end if */
     else {
         HDassert(sh_mesg->type == H5O_SHARE_TYPE_SOHM);
-        ret_value = 1 +			/*version			*/
-            1 +				/*the type field		*/
-            H5O_FHEAP_ID_LEN;		/* Shared in the heap		*/
-    } /* end else */
+        ret_value = 1 +               /*version			*/
+                    1 +               /*the type field		*/
+                    H5O_FHEAP_ID_LEN; /* Shared in the heap		*/
+    }                                 /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shared_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_shared_delete
  *
@@ -508,10 +496,9 @@ H5O_shared_size(const H5F_t *f, const H5O_shared_t *sh_mesg)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    const H5O_msg_class_t *type, H5O_shared_t *sh_mesg)
+H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, const H5O_msg_class_t *type, H5O_shared_t *sh_mesg)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -529,14 +516,13 @@ H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
      */
 
     /* Decrement the reference count on the shared object */
-    if(H5O_shared_link_adj(f, dxpl_id, open_oh, type, sh_mesg, -1) < 0)
+    if (H5O_shared_link_adj(f, dxpl_id, open_oh, type, sh_mesg, -1) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shared_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_shared_link
  *
@@ -551,10 +537,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    const H5O_msg_class_t *type, H5O_shared_t *sh_mesg)
+H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, const H5O_msg_class_t *type, H5O_shared_t *sh_mesg)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -563,14 +548,13 @@ H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     HDassert(sh_mesg);
 
     /* Increment the reference count on the shared object */
-    if(H5O_shared_link_adj(f, dxpl_id, open_oh, type, sh_mesg, 1) < 0)
+    if (H5O_shared_link_adj(f, dxpl_id, open_oh, type, sh_mesg, 1) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shared_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_shared_copy_file
  *
@@ -585,14 +569,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst,
-    const H5O_msg_class_t *mesg_type, const void *_native_src, void *_native_dst,
-    hbool_t H5_ATTR_UNUSED *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info,
-    void H5_ATTR_UNUSED *udata, hid_t dxpl_id)
+H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst, const H5O_msg_class_t *mesg_type,
+                     const void *_native_src, void *_native_dst, hbool_t H5_ATTR_UNUSED *recompute_size,
+                     unsigned *mesg_flags, H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata, hid_t dxpl_id)
 {
-    const H5O_shared_t  *shared_src = (const H5O_shared_t *)_native_src; /* Alias to shared info in native source */
-    H5O_shared_t        *shared_dst = (H5O_shared_t *)_native_dst; /* Alias to shared info in native destination message */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_shared_t *shared_src =
+        (const H5O_shared_t *)_native_src; /* Alias to shared info in native source */
+    H5O_shared_t *shared_dst =
+        (H5O_shared_t *)_native_dst; /* Alias to shared info in native destination message */
+    herr_t ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -614,9 +599,9 @@ H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst,
      * be updated (to allow calculation of the final size) but the message is
      * not actually shared.
      */
-    if(shared_src->type != H5O_SHARE_TYPE_COMMITTED) {
+    if (shared_src->type != H5O_SHARE_TYPE_COMMITTED) {
         /* Simulate trying to share new message in the destination file. */
-        if(H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_DEFER, mesg_type->id, _native_dst, mesg_flags) < 0)
+        if (H5SM_try_share(file_dst, dxpl_id, NULL, H5SM_DEFER, mesg_type->id, _native_dst, mesg_flags) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to determine if message should be shared")
     } /* end if */
     else {
@@ -630,7 +615,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_shared_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_shared_post_copy_file
  *
@@ -650,11 +634,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_shared_post_copy_file(H5F_t *f, const H5O_msg_class_t *mesg_type,
-    const H5O_shared_t *shared_src, H5O_shared_t *shared_dst,
-    unsigned *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5O_shared_post_copy_file(H5F_t *f, const H5O_msg_class_t *mesg_type, const H5O_shared_t *shared_src,
+                          H5O_shared_t *shared_dst, unsigned *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -664,7 +647,7 @@ H5O_shared_post_copy_file(H5F_t *f, const H5O_msg_class_t *mesg_type,
     HDassert(shared_dst);
 
     /* Copy the target of committed messages, try to share others */
-    if(shared_src->type == H5O_SHARE_TYPE_COMMITTED) {
+    if (shared_src->type == H5O_SHARE_TYPE_COMMITTED) {
         H5O_loc_t dst_oloc;
         H5O_loc_t src_oloc;
 
@@ -673,8 +656,7 @@ H5O_shared_post_copy_file(H5F_t *f, const H5O_msg_class_t *mesg_type,
         dst_oloc.file = f;
         src_oloc.file = shared_src->file;
         src_oloc.addr = shared_src->u.loc.oh_addr;
-        if(H5O_copy_header_map(&src_oloc, &dst_oloc, dxpl_id, cpy_info, FALSE,
-                NULL, NULL) < 0)
+        if (H5O_copy_header_map(&src_oloc, &dst_oloc, dxpl_id, cpy_info, FALSE, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
         /* Set up destination message's shared info */
@@ -682,15 +664,13 @@ H5O_shared_post_copy_file(H5F_t *f, const H5O_msg_class_t *mesg_type,
     } /* end if */
     else
         /* Share the message */
-        if(H5SM_try_share(f, dxpl_id, NULL, H5SM_WAS_DEFERRED, mesg_type->id,
-                shared_dst, mesg_flags) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "can't share message")
+        if (H5SM_try_share(f, dxpl_id, NULL, H5SM_WAS_DEFERRED, mesg_type->id, shared_dst, mesg_flags) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "can't share message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shared_post_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shared_debug
  *
@@ -714,43 +694,30 @@ H5O_shared_debug(const H5O_shared_t *mesg, FILE *stream, int indent, int fwidth)
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    switch(mesg->type) {
+    switch (mesg->type) {
         case H5O_SHARE_TYPE_UNSHARED:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Shared Message type:",
-                    "Unshared");
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Unshared");
             break;
 
         case H5O_SHARE_TYPE_COMMITTED:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Shared Message type:",
-                    "Obj Hdr");
-            HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-                    "Object address:",
-                    mesg->u.loc.oh_addr);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Obj Hdr");
+            HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Object address:", mesg->u.loc.oh_addr);
             break;
 
         case H5O_SHARE_TYPE_SOHM:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Shared Message type:",
-                    "SOHM");
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "SOHM");
             HDfprintf(stream, "%*s%-*s %016llx\n", indent, "", fwidth,
-                    "Heap ID:",
-                    (unsigned long long)mesg->u.heap_id.val);
+                      "Heap ID:", (unsigned long long)mesg->u.heap_id.val);
             break;
 
         case H5O_SHARE_TYPE_HERE:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Shared Message type:",
-                    "Here");
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Here");
             break;
 
         default:
-            HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth,
-                    "Shared Message type:",
-                    "Unknown", (unsigned)mesg->type);
+            HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Shared Message type:", "Unknown",
+                      (unsigned)mesg->type);
     } /* end switch */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_shared_debug() */
-
diff --git a/src/H5Oshared.h b/src/H5Oshared.h
index e60d7ba..f293234 100644
--- a/src/H5Oshared.h
+++ b/src/H5Oshared.h
@@ -27,7 +27,6 @@
 #ifndef H5Oshared_H
 #define H5Oshared_H
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_SHARED_DECODE
  *
@@ -46,10 +45,10 @@
  *-------------------------------------------------------------------------
  */
 static H5_INLINE void *
-H5O_SHARED_DECODE(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
-    unsigned *ioflags, size_t p_size, const uint8_t *p)
+H5O_SHARED_DECODE(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                  size_t p_size, const uint8_t *p)
 {
-    void *ret_value;            /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -64,22 +63,22 @@ H5O_SHARED_DECODE(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
 #endif /* H5O_SHARED_DECODE_REAL */
 
     /* Check for shared message */
-    if(mesg_flags & H5O_MSG_FLAG_SHARED) {
+    if (mesg_flags & H5O_MSG_FLAG_SHARED) {
         /* Retrieve native message info indirectly through shared message */
-        if(NULL == (ret_value = H5O_shared_decode(f, dxpl_id, open_oh, ioflags, p, H5O_SHARED_TYPE)))
+        if (NULL == (ret_value = H5O_shared_decode(f, dxpl_id, open_oh, ioflags, p, H5O_SHARED_TYPE)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, NULL, "unable to decode shared message")
 
-        /* We currently do not support automatically fixing shared messages */
+            /* We currently do not support automatically fixing shared messages */
 #ifdef H5_STRICT_FORMAT_CHECKS
-        if(*ioflags & H5O_DECODEIO_DIRTY)
+        if (*ioflags & H5O_DECODEIO_DIRTY)
             HGOTO_ERROR(H5E_OHDR, H5E_UNSUPPORTED, NULL, "unable to mark shared message dirty")
-#else /* H5_STRICT_FORMAT_CHECKS */
+#else  /* H5_STRICT_FORMAT_CHECKS */
         *ioflags &= ~H5O_DECODEIO_DIRTY;
 #endif /* H5_STRICT_FORMAT_CHECKS */
-    } /* end if */
+    }  /* end if */
     else {
         /* Decode native message directly */
-        if(NULL == (ret_value = H5O_SHARED_DECODE_REAL(f, dxpl_id, open_oh, mesg_flags, ioflags, p_size, p)))
+        if (NULL == (ret_value = H5O_SHARED_DECODE_REAL(f, dxpl_id, open_oh, mesg_flags, ioflags, p_size, p)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, NULL, "unable to decode native message")
     } /* end else */
 
@@ -87,7 +86,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_DECODE() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_SHARED_ENCODE
  *
@@ -108,8 +106,9 @@ done:
 static H5_INLINE herr_t
 H5O_SHARED_ENCODE(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_shared_t *sh_mesg = (const H5O_shared_t *)_mesg;     /* Pointer to shared message portion of actual message */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_shared_t *sh_mesg =
+        (const H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
+    herr_t ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -127,22 +126,21 @@ H5O_SHARED_ENCODE(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mes
     HDassert(sh_mesg->type == H5O_SHARE_TYPE_UNSHARED || sh_mesg->msg_type_id == H5O_SHARED_TYPE->id);
 
     /* Check for message stored elsewhere */
-    if(H5O_IS_STORED_SHARED(sh_mesg->type) && !disable_shared) {
+    if (H5O_IS_STORED_SHARED(sh_mesg->type) && !disable_shared) {
         /* Encode shared message into buffer */
-        if(H5O_shared_encode(f, p, sh_mesg) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode shared message")
+        if (H5O_shared_encode(f, p, sh_mesg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode shared message")
     } /* end if */
     else {
         /* Encode native message directly */
-        if(H5O_SHARED_ENCODE_REAL(f, p, _mesg) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode native message")
+        if (H5O_SHARED_ENCODE_REAL(f, p, _mesg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode native message")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_ENCODE() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_SHARED_SIZE
  *
@@ -163,8 +161,9 @@ done:
 static H5_INLINE size_t
 H5O_SHARED_SIZE(const H5F_t *f, hbool_t disable_shared, const void *_mesg)
 {
-    const H5O_shared_t *sh_mesg = (const H5O_shared_t *)_mesg;     /* Pointer to shared message portion of actual message */
-    size_t ret_value;           /* Return value */
+    const H5O_shared_t *sh_mesg =
+        (const H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
+    size_t ret_value;                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -179,22 +178,21 @@ H5O_SHARED_SIZE(const H5F_t *f, hbool_t disable_shared, const void *_mesg)
 #endif /* H5O_SHARED_SIZE_REAL */
 
     /* Check for message stored elsewhere */
-    if(H5O_IS_STORED_SHARED(sh_mesg->type) && !disable_shared) {
+    if (H5O_IS_STORED_SHARED(sh_mesg->type) && !disable_shared) {
         /* Retrieve encoded size of shared message */
-        if(0 == (ret_value = H5O_shared_size(f, sh_mesg)))
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, 0, "unable to retrieve encoded size of shared message")
+        if (0 == (ret_value = H5O_shared_size(f, sh_mesg)))
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, 0, "unable to retrieve encoded size of shared message")
     } /* end if */
     else {
         /* Retrieve size of native message directly */
-        if(0 == (ret_value = H5O_SHARED_SIZE_REAL(f, _mesg)))
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, 0, "unable to retrieve encoded size of native message")
+        if (0 == (ret_value = H5O_SHARED_SIZE_REAL(f, _mesg)))
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, 0, "unable to retrieve encoded size of native message")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_SIZE() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_SHARED_DELETE
  *
@@ -216,8 +214,8 @@ done:
 static H5_INLINE herr_t
 H5O_SHARED_DELETE(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
 {
-    H5O_shared_t *sh_mesg = (H5O_shared_t *)_mesg;     /* Pointer to shared message portion of actual message */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_shared_t *sh_mesg   = (H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
+    herr_t        ret_value = SUCCEED;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -229,24 +227,23 @@ H5O_SHARED_DELETE(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
 #endif /* H5O_SHARED_DELETE */
 
     /* Check for message tracked elsewhere */
-    if(H5O_IS_TRACKED_SHARED(sh_mesg->type)) {
+    if (H5O_IS_TRACKED_SHARED(sh_mesg->type)) {
         /* Decrement the reference count on the shared message/object */
-        if(H5O_shared_delete(f, dxpl_id, open_oh, H5O_SHARED_TYPE, sh_mesg) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for shared message")
+        if (H5O_shared_delete(f, dxpl_id, open_oh, H5O_SHARED_TYPE, sh_mesg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for shared message")
     } /* end if */
 #ifdef H5O_SHARED_DELETE_REAL
     else {
         /* Decrement the reference count on the native message directly */
-        if(H5O_SHARED_DELETE_REAL(f, dxpl_id, open_oh, _mesg) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for native message")
-    } /* end else */
+        if (H5O_SHARED_DELETE_REAL(f, dxpl_id, open_oh, _mesg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for native message")
+    }  /* end else */
 #endif /* H5O_SHARED_DELETE_REAL */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_DELETE() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_SHARED_LINK
  *
@@ -268,8 +265,8 @@ done:
 static H5_INLINE herr_t
 H5O_SHARED_LINK(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
 {
-    H5O_shared_t *sh_mesg = (H5O_shared_t *)_mesg;     /* Pointer to shared message portion of actual message */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_shared_t *sh_mesg   = (H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
+    herr_t        ret_value = SUCCEED;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -281,24 +278,23 @@ H5O_SHARED_LINK(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
 #endif /* H5O_SHARED_LINK */
 
     /* Check for message tracked elsewhere */
-    if(H5O_IS_TRACKED_SHARED(sh_mesg->type)) {
+    if (H5O_IS_TRACKED_SHARED(sh_mesg->type)) {
         /* Increment the reference count on the shared message/object */
-        if(H5O_shared_link(f, dxpl_id, open_oh, H5O_SHARED_TYPE, sh_mesg) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, FAIL, "unable to increment ref count for shared message")
+        if (H5O_shared_link(f, dxpl_id, open_oh, H5O_SHARED_TYPE, sh_mesg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, FAIL, "unable to increment ref count for shared message")
     } /* end if */
 #ifdef H5O_SHARED_LINK_REAL
     else {
         /* Increment the reference count on the native message directly */
-        if(H5O_SHARED_LINK_REAL(f, dxpl_id, open_oh, _mesg) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, FAIL, "unable to increment ref count for native message")
-    } /* end else */
+        if (H5O_SHARED_LINK_REAL(f, dxpl_id, open_oh, _mesg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, FAIL, "unable to increment ref count for native message")
+    }  /* end else */
 #endif /* H5O_SHARED_LINK_REAL */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_LINK() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_SHARED_COPY_FILE
  *
@@ -317,12 +313,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5_INLINE void *
-H5O_SHARED_COPY_FILE(H5F_t *file_src, void *_native_src, H5F_t *file_dst,
-    hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info,
-    void *udata, hid_t dxpl_id)
+H5O_SHARED_COPY_FILE(H5F_t *file_src, void *_native_src, H5F_t *file_dst, hbool_t *recompute_size,
+                     unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id)
 {
-    void *dst_mesg = NULL;      /* Destination message */
-    void *ret_value;            /* Return value */
+    void *dst_mesg = NULL; /* Destination message */
+    void *ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -335,11 +330,12 @@ H5O_SHARED_COPY_FILE(H5F_t *file_src, void *_native_src, H5F_t *file_dst,
 
 #ifdef H5O_SHARED_COPY_FILE_REAL
     /* Call native message's copy file callback to copy the message */
-    if(NULL == (dst_mesg = H5O_SHARED_COPY_FILE_REAL(file_src, H5O_SHARED_TYPE, _native_src, file_dst, recompute_size, cpy_info, udata, dxpl_id)))
+    if (NULL == (dst_mesg = H5O_SHARED_COPY_FILE_REAL(file_src, H5O_SHARED_TYPE, _native_src, file_dst,
+                                                      recompute_size, cpy_info, udata, dxpl_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy native message to another file")
-#else /* H5O_SHARED_COPY_FILE_REAL */
+#else  /* H5O_SHARED_COPY_FILE_REAL */
     /* No copy file callback defined, just copy the message itself */
-    if(NULL == (dst_mesg = (H5O_SHARED_TYPE->copy)(_native_src, NULL)))
+    if (NULL == (dst_mesg = (H5O_SHARED_TYPE->copy)(_native_src, NULL)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy native message")
 #endif /* H5O_SHARED_COPY_FILE_REAL */
 
@@ -347,22 +343,21 @@ H5O_SHARED_COPY_FILE(H5F_t *file_src, void *_native_src, H5F_t *file_dst,
     HDmemset(dst_mesg, 0, sizeof(H5O_shared_t));
 
     /* Handle sharing destination message */
-    if(H5O_shared_copy_file(file_src, file_dst, H5O_SHARED_TYPE, _native_src,
-            dst_mesg, recompute_size, mesg_flags, cpy_info, udata, dxpl_id) < 0)
+    if (H5O_shared_copy_file(file_src, file_dst, H5O_SHARED_TYPE, _native_src, dst_mesg, recompute_size,
+                             mesg_flags, cpy_info, udata, dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, NULL, "unable to determine if message should be shared")
 
     /* Set return value */
     ret_value = dst_mesg;
 
 done:
-    if(!ret_value)
-        if(dst_mesg)
+    if (!ret_value)
+        if (dst_mesg)
             H5O_msg_free(H5O_SHARED_TYPE->id, dst_mesg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_COPY_FILE() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_SHARED_POST_COPY_FILE
  *
@@ -381,13 +376,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5_INLINE herr_t
-H5O_SHARED_POST_COPY_FILE(const H5O_loc_t *oloc_src, const void *mesg_src,
-    H5O_loc_t *oloc_dst, void *mesg_dst, unsigned *mesg_flags, hid_t dxpl_id,
-    H5O_copy_t *cpy_info)
+H5O_SHARED_POST_COPY_FILE(const H5O_loc_t *oloc_src, const void *mesg_src, H5O_loc_t *oloc_dst,
+                          void *mesg_dst, unsigned *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
-    const H5O_shared_t  *shared_src = (const H5O_shared_t *)mesg_src; /* Alias to shared info in native source */
-    H5O_shared_t        *shared_dst = (H5O_shared_t *)mesg_dst; /* Alias to shared info in native destination */
-    herr_t              ret_value = SUCCEED;         /* Return value */
+    const H5O_shared_t *shared_src =
+        (const H5O_shared_t *)mesg_src;                  /* Alias to shared info in native source */
+    H5O_shared_t *shared_dst = (H5O_shared_t *)mesg_dst; /* Alias to shared info in native destination */
+    herr_t        ret_value  = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -406,34 +401,33 @@ H5O_SHARED_POST_COPY_FILE(const H5O_loc_t *oloc_src, const void *mesg_src,
 
 #ifdef H5O_SHARED_POST_COPY_FILE_REAL
     /* Call native message's post copy file callback to copy the message */
-    if(H5O_SHARED_POST_COPY_FILE_REAL(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) <0 )
+    if (H5O_SHARED_POST_COPY_FILE_REAL(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy native message to another file")
 #endif /* H5O_SHARED_POST_COPY_FILE_REAL */
 
     /* Update shared message after the post copy - will short circuit in
      * production if the DEFER pass determined it will not be shared; debug mode
      * verifies that it is indeed the case */
-    if(H5O_shared_post_copy_file(oloc_dst->file, H5O_SHARED_TYPE,
-            shared_src, shared_dst, mesg_flags, dxpl_id, cpy_info) < 0)
+    if (H5O_shared_post_copy_file(oloc_dst->file, H5O_SHARED_TYPE, shared_src, shared_dst, mesg_flags,
+                                  dxpl_id, cpy_info) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to fix shared message in post copy")
 
 #ifdef H5O_SHARED_POST_COPY_FILE_UPD
     /* Call native message's post copy file update callback to update the
      * message */
-    if(H5O_SHARED_POST_COPY_FILE_UPD(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) < 0)
+    if (H5O_SHARED_POST_COPY_FILE_UPD(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to update native message")
 #endif /* H5O_SHARED_POST_COPY_FILE_UPD */
 
     /* Make sure that if the the source or destination is committed, both are
      * committed */
-    HDassert((shared_src->type == H5O_SHARE_TYPE_COMMITTED)
-            == (shared_dst->type == H5O_SHARE_TYPE_COMMITTED));
+    HDassert((shared_src->type == H5O_SHARE_TYPE_COMMITTED) ==
+             (shared_dst->type == H5O_SHARE_TYPE_COMMITTED));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_POST_COPY_FILE() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_SHARED_DEBUG
  *
@@ -452,11 +446,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5_INLINE herr_t
-H5O_SHARED_DEBUG(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
-    int indent, int fwidth)
+H5O_SHARED_DEBUG(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth)
 {
-    const H5O_shared_t *sh_mesg = (const H5O_shared_t *)_mesg;     /* Pointer to shared message portion of actual message */
-    herr_t ret_value = SUCCEED;           /* Return value */
+    const H5O_shared_t *sh_mesg =
+        (const H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
+    herr_t ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -471,14 +465,14 @@ H5O_SHARED_DEBUG(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
 #endif /* H5O_SHARED_DEBUG_REAL */
 
     /* Check for message stored elsewhere */
-    if(H5O_IS_STORED_SHARED(sh_mesg->type)) {
+    if (H5O_IS_STORED_SHARED(sh_mesg->type)) {
         /* Print shared message information */
-        if(H5O_shared_debug(sh_mesg, stream, indent, fwidth) < 0)
+        if (H5O_shared_debug(sh_mesg, stream, indent, fwidth) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to display shared message info")
     } /* end if */
 
     /* Call native message's debug callback */
-    if(H5O_SHARED_DEBUG_REAL(f, dxpl_id, _mesg, stream, indent, fwidth) < 0)
+    if (H5O_SHARED_DEBUG_REAL(f, dxpl_id, _mesg, stream, indent, fwidth) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to display native message info")
 
 done:
@@ -486,4 +480,3 @@ done:
 } /* end H5O_SHARED_DEBUG() */
 
 #endif /* H5Oshared_H */
-
diff --git a/src/H5Oshmesg.c b/src/H5Oshmesg.c
index 489114a..1392d10 100644
--- a/src/H5Oshmesg.c
+++ b/src/H5Oshmesg.c
@@ -11,7 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 /* Programmer:  James Laird <jlaird@hdfgroup.org>
  *              Monday, January 29, 2007
  *
@@ -19,46 +18,45 @@
  *              information in the superblock extension.
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5MMprivate.h" /* Memory management			*/
 
-static void  *H5O_shmesg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_shmesg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
+                                unsigned *ioflags, size_t p_size, const uint8_t *p);
 static herr_t H5O_shmesg_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void  *H5O_shmesg_copy(const void *_mesg, void *_dest);
+static void * H5O_shmesg_copy(const void *_mesg, void *_dest);
 static size_t H5O_shmesg_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
-static herr_t H5O_shmesg_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
-			     int indent, int fwidth);
+static herr_t H5O_shmesg_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                               int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_SHMESG[1] = {{
     H5O_SHMESG_ID,              /*message id number                     */
     "shared message table",     /*message name for debugging            */
-    sizeof(H5O_shmesg_table_t),	/*native message size                   */
-    0,				/* messages are sharable?       */
-    H5O_shmesg_decode,		/*decode message                        */
-    H5O_shmesg_encode,		/*encode message                        */
+    sizeof(H5O_shmesg_table_t), /*native message size                   */
+    0,                          /* messages are sharable?       */
+    H5O_shmesg_decode,          /*decode message                        */
+    H5O_shmesg_encode,          /*encode message                        */
     H5O_shmesg_copy,            /*copy the native value                 */
-    H5O_shmesg_size,		/*raw message size			*/
+    H5O_shmesg_size,            /*raw message size			*/
     NULL,                       /*free internal memory			*/
     NULL,                       /* free method				*/
-    NULL,			/* file delete method			*/
-    NULL,			/* link method				*/
-    NULL,	                /* set share method			*/
-    NULL,		    	/*can share method		        */
-    NULL,			/* pre copy native value to file	*/
-    NULL,			/* copy native value to file		*/
-    NULL,			/* post copy native value to file	*/
-    NULL,			/* get creation index		        */
-    NULL,			/* set creation index		        */
-    H5O_shmesg_debug              /*debug the message			*/
+    NULL,                       /* file delete method			*/
+    NULL,                       /* link method				*/
+    NULL,                       /* set share method			*/
+    NULL,                       /*can share method		        */
+    NULL,                       /* pre copy native value to file	*/
+    NULL,                       /* copy native value to file		*/
+    NULL,                       /* post copy native value to file	*/
+    NULL,                       /* get creation index		        */
+    NULL,                       /* set creation index		        */
+    H5O_shmesg_debug            /*debug the message			*/
 }};
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shmesg_decode
  *
@@ -75,11 +73,11 @@ const H5O_msg_class_t H5O_MSG_SHMESG[1] = {{
  */
 static void *
 H5O_shmesg_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                  unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                  size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_shmesg_table_t	*mesg;          /* Native message */
-    void                *ret_value;     /* Return value */
+    H5O_shmesg_table_t *mesg;      /* Native message */
+    void *              ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -87,8 +85,9 @@ H5O_shmesg_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *
     HDassert(f);
     HDassert(p);
 
-    if(NULL == (mesg = (H5O_shmesg_table_t *)H5MM_calloc(sizeof(H5O_shmesg_table_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for shared message table message")
+    if (NULL == (mesg = (H5O_shmesg_table_t *)H5MM_calloc(sizeof(H5O_shmesg_table_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for shared message table message")
 
     /* Retrieve version, table address, and number of indexes */
     mesg->version = *p++;
@@ -102,7 +101,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shmesg_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shmesg_encode
  *
@@ -135,7 +133,6 @@ H5O_shmesg_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, c
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_shmesg_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shmesg_copy
  *
@@ -153,17 +150,18 @@ H5O_shmesg_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, c
 static void *
 H5O_shmesg_copy(const void *_mesg, void *_dest)
 {
-    const H5O_shmesg_table_t	*mesg = (const H5O_shmesg_table_t *)_mesg;
-    H5O_shmesg_table_t		*dest = (H5O_shmesg_table_t *)_dest;
-    void			*ret_value;
+    const H5O_shmesg_table_t *mesg = (const H5O_shmesg_table_t *)_mesg;
+    H5O_shmesg_table_t *      dest = (H5O_shmesg_table_t *)_dest;
+    void *                    ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert(mesg);
 
-    if(!dest && NULL == (dest = (H5O_shmesg_table_t *)H5MM_malloc(sizeof(H5O_shmesg_table_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for shared message table message")
+    if (!dest && NULL == (dest = (H5O_shmesg_table_t *)H5MM_malloc(sizeof(H5O_shmesg_table_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for shared message table message")
 
     /* All this message requires is a shallow copy */
     *dest = *mesg;
@@ -175,7 +173,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shmesg_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shmesg_size
  *
@@ -193,21 +190,20 @@ done:
 static size_t
 H5O_shmesg_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED *_mesg)
 {
-    size_t                   ret_value;
+    size_t ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Sanity check */
     HDassert(f);
 
-    ret_value = (size_t)(1 +                     /* Version number        */
-		H5F_SIZEOF_ADDR(f) +    /* Table address */
-		1);                      /* Number of indexes */
+    ret_value = (size_t)(1 +                  /* Version number        */
+                         H5F_SIZEOF_ADDR(f) + /* Table address */
+                         1);                  /* Number of indexes */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_shmesg_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_shmesg_debug
  *
@@ -222,7 +218,7 @@ H5O_shmesg_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const voi
  */
 static herr_t
 H5O_shmesg_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
-    int indent, int fwidth)
+                 int indent, int fwidth)
 {
     const H5O_shmesg_table_t *mesg = (const H5O_shmesg_table_t *)_mesg;
 
@@ -235,13 +231,9 @@ H5O_shmesg_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const vo
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Version:", mesg->version);
-    HDfprintf(stream, "%*s%-*s %a (rel)\n", indent, "", fwidth,
-	      "Shared message table address:", mesg->addr);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of indexes:", mesg->nindexes);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", mesg->version);
+    HDfprintf(stream, "%*s%-*s %a (rel)\n", indent, "", fwidth, "Shared message table address:", mesg->addr);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of indexes:", mesg->nindexes);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_shmesg_debug() */
-
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index cf8c96a..a756b01 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -22,62 +22,59 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Gpkg.h"		/* Groups				*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5G_PACKAGE /*suppress error about including H5Gpkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Gpkg.h"      /* Groups				*/
+#include "H5HLprivate.h" /* Local Heaps				*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_stab_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p);
+static void * H5O_stab_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
+                              size_t p_size, const uint8_t *p);
 static herr_t H5O_stab_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_stab_copy(const void *_mesg, void *_dest);
+static void * H5O_stab_copy(const void *_mesg, void *_dest);
 static size_t H5O_stab_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_stab_free(void *_mesg);
 static herr_t H5O_stab_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg);
-static void *H5O_stab_copy_file(H5F_t *file_src, void *native_src,
-    H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags,
-    H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id);
-static herr_t H5O_stab_post_copy_file(const H5O_loc_t *src_oloc,
-    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
-    unsigned *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info);
-static herr_t H5O_stab_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
-    FILE * stream, int indent, int fwidth);
+static void * H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
+                                 unsigned *mesg_flags, H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id);
+static herr_t H5O_stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc,
+                                      void *mesg_dst, unsigned *mesg_flags, hid_t dxpl_id,
+                                      H5O_copy_t *cpy_info);
+static herr_t H5O_stab_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
+                             int fwidth);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_STAB[1] = {{
-    H5O_STAB_ID,            	/*message id number             */
-    "stab",                 	/*message name for debugging    */
-    sizeof(H5O_stab_t),     	/*native message size           */
-    0,				/* messages are sharable?       */
-    H5O_stab_decode,        	/*decode message                */
-    H5O_stab_encode,        	/*encode message                */
-    H5O_stab_copy,          	/*copy the native value         */
-    H5O_stab_size,          	/*size of symbol table entry    */
-    NULL,                   	/*default reset method          */
-    H5O_stab_free,	        /* free method			*/
-    H5O_stab_delete,	        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL, 			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    H5O_stab_copy_file,		/* copy native value to file    */
-    H5O_stab_post_copy_file,	/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O_stab_debug         	/*debug the message             */
+    H5O_STAB_ID,             /*message id number             */
+    "stab",                  /*message name for debugging    */
+    sizeof(H5O_stab_t),      /*native message size           */
+    0,                       /* messages are sharable?       */
+    H5O_stab_decode,         /*decode message                */
+    H5O_stab_encode,         /*encode message                */
+    H5O_stab_copy,           /*copy the native value         */
+    H5O_stab_size,           /*size of symbol table entry    */
+    NULL,                    /*default reset method          */
+    H5O_stab_free,           /* free method			*/
+    H5O_stab_delete,         /* file delete method		*/
+    NULL,                    /* link method			*/
+    NULL,                    /*set share method		*/
+    NULL,                    /*can share method		*/
+    NULL,                    /* pre copy native value to file */
+    H5O_stab_copy_file,      /* copy native value to file    */
+    H5O_stab_post_copy_file, /* post copy native value to file    */
+    NULL,                    /* get creation index		*/
+    NULL,                    /* set creation index		*/
+    H5O_stab_debug           /*debug the message             */
 }};
 
 /* Declare a free list to manage the H5O_stab_t struct */
 H5FL_DEFINE_STATIC(H5O_stab_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_stab_decode
  *
@@ -96,11 +93,11 @@ H5FL_DEFINE_STATIC(H5O_stab_t);
  */
 static void *
 H5O_stab_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
+                size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    H5O_stab_t          *stab = NULL;
-    void                *ret_value;     /* Return value */
+    H5O_stab_t *stab = NULL;
+    void *      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -109,8 +106,8 @@ H5O_stab_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op
     HDassert(p);
 
     /* decode */
-    if(NULL == (stab = H5FL_CALLOC(H5O_stab_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (stab = H5FL_CALLOC(H5O_stab_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     H5F_addr_decode(f, &p, &(stab->btree_addr));
     H5F_addr_decode(f, &p, &(stab->heap_addr));
 
@@ -118,15 +115,14 @@ H5O_stab_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op
     ret_value = stab;
 
 done:
-    if(ret_value == NULL) {
-        if(stab != NULL)
+    if (ret_value == NULL) {
+        if (stab != NULL)
             stab = H5FL_FREE(H5O_stab_t, stab);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_stab_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_stab_encode
  *
@@ -143,7 +139,7 @@ done:
 static herr_t
 H5O_stab_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const H5O_stab_t       *stab = (const H5O_stab_t *) _mesg;
+    const H5O_stab_t *stab = (const H5O_stab_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -159,7 +155,6 @@ H5O_stab_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_stab_copy
  *
@@ -179,16 +174,16 @@ H5O_stab_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
 static void *
 H5O_stab_copy(const void *_mesg, void *_dest)
 {
-    const H5O_stab_t       *stab = (const H5O_stab_t *) _mesg;
-    H5O_stab_t             *dest = (H5O_stab_t *) _dest;
-    void                *ret_value;     /* Return value */
+    const H5O_stab_t *stab = (const H5O_stab_t *)_mesg;
+    H5O_stab_t *      dest = (H5O_stab_t *)_dest;
+    void *            ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(stab);
-    if(!dest && NULL == (dest = H5FL_MALLOC(H5O_stab_t)))
-	HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+    if (!dest && NULL == (dest = H5FL_MALLOC(H5O_stab_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
 
     /* copy */
     *dest = *stab;
@@ -200,7 +195,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_stab_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_stab_size
  *
@@ -221,7 +215,7 @@ done:
 static size_t
 H5O_stab_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED *_mesg)
 {
-    size_t ret_value;   /* Return value */
+    size_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -231,7 +225,6 @@ H5O_stab_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_stab_free
  *
@@ -258,7 +251,6 @@ H5O_stab_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_stab_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_stab_delete
  *
@@ -274,7 +266,7 @@ H5O_stab_free(void *mesg)
 static herr_t
 H5O_stab_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *mesg)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -283,14 +275,13 @@ H5O_stab_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *me
     HDassert(mesg);
 
     /* Free the file space for the symbol table */
-    if(H5G__stab_delete(f, dxpl_id, (const H5O_stab_t *)mesg) < 0)
+    if (H5G__stab_delete(f, dxpl_id, (const H5O_stab_t *)mesg) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free symbol table")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_stab_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_stab_copy_file
  *
@@ -306,15 +297,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst,
-    hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags,
-    H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata, hid_t dxpl_id)
+H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t H5_ATTR_UNUSED *recompute_size,
+                   unsigned H5_ATTR_UNUSED *mesg_flags, H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata,
+                   hid_t dxpl_id)
 {
-    H5O_stab_t          *stab_src = (H5O_stab_t *) native_src;
-    H5O_stab_t          *stab_dst = NULL;
-    H5G_copy_file_ud_t  *udata = (H5G_copy_file_ud_t *)_udata;
-    size_t              size_hint;              /* Local heap initial size */
-    void                *ret_value;             /* Return value */
+    H5O_stab_t *        stab_src = (H5O_stab_t *)native_src;
+    H5O_stab_t *        stab_dst = NULL;
+    H5G_copy_file_ud_t *udata    = (H5G_copy_file_ud_t *)_udata;
+    size_t              size_hint; /* Local heap initial size */
+    void *              ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -323,34 +314,33 @@ H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst,
     HDassert(file_dst);
 
     /* Allocate space for the destination stab */
-    if(NULL == (stab_dst = H5FL_MALLOC(H5O_stab_t)))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (stab_dst = H5FL_MALLOC(H5O_stab_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Get the old local heap's size and use that as the hint for the new heap */
-    if(H5HL_get_size(file_src, dxpl_id, stab_src->heap_addr, &size_hint) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, NULL, "can't query local heap size")
+    if (H5HL_get_size(file_src, dxpl_id, stab_src->heap_addr, &size_hint) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, NULL, "can't query local heap size")
 
     /* Create components of symbol table message */
-    if(H5G__stab_create_components(file_dst, stab_dst, size_hint, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "can't create symbol table components")
+    if (H5G__stab_create_components(file_dst, stab_dst, size_hint, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "can't create symbol table components")
 
     /* Cache stab in udata */
-    udata->cache_type = H5G_CACHED_STAB;
+    udata->cache_type            = H5G_CACHED_STAB;
     udata->cache.stab.btree_addr = stab_dst->btree_addr;
-    udata->cache.stab.heap_addr = stab_dst->heap_addr;
+    udata->cache.stab.heap_addr  = stab_dst->heap_addr;
 
     /* Set return value */
     ret_value = stab_dst;
 
 done:
-    if(!ret_value)
-        if(stab_dst)
+    if (!ret_value)
+        if (stab_dst)
             stab_dst = H5FL_FREE(H5O_stab_t, stab_dst);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_stab_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_stab_post_copy_file
  *
@@ -364,14 +354,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
-    H5O_loc_t *dst_oloc, void *mesg_dst, unsigned H5_ATTR_UNUSED *mesg_flags,
-    hid_t dxpl_id, H5O_copy_t *cpy_info)
+H5O_stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
+                        unsigned H5_ATTR_UNUSED *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info)
 {
-    const H5O_stab_t    *stab_src = (const H5O_stab_t *)mesg_src;
-    H5O_stab_t          *stab_dst = (H5O_stab_t *)mesg_dst;
-    H5G_bt_it_cpy_t     udata;      /* B-tree user data */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    const H5O_stab_t *stab_src = (const H5O_stab_t *)mesg_src;
+    H5O_stab_t *      stab_dst = (H5O_stab_t *)mesg_dst;
+    H5G_bt_it_cpy_t   udata;               /* B-tree user data */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -383,25 +372,24 @@ H5O_stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
     HDassert(cpy_info);
 
     /* If we are performing a 'shallow hierarchy' copy, get out now */
-    if(cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth)
+    if (cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth)
         HGOTO_DONE(SUCCEED)
 
     /* Set up B-tree iteration user data */
-    udata.src_oloc = src_oloc;
+    udata.src_oloc      = src_oloc;
     udata.src_heap_addr = stab_src->heap_addr;
-    udata.dst_file = dst_oloc->file;
-    udata.dst_stab = stab_dst;
-    udata.cpy_info = cpy_info;
+    udata.dst_file      = dst_oloc->file;
+    udata.dst_stab      = stab_dst;
+    udata.cpy_info      = cpy_info;
 
     /* Iterate over objects in group, copying them */
-    if((H5B_iterate(src_oloc->file, dxpl_id, H5B_SNODE, stab_src->btree_addr, H5G__node_copy, &udata)) < 0)
+    if ((H5B_iterate(src_oloc->file, dxpl_id, H5B_SNODE, stab_src->btree_addr, H5G__node_copy, &udata)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "iteration operator failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5O_stab_post_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_stab_debug
  *
@@ -418,10 +406,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_stab_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE * stream,
-	       int indent, int fwidth)
+H5O_stab_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream,
+               int indent, int fwidth)
 {
-    const H5O_stab_t       *stab = (const H5O_stab_t *) _mesg;
+    const H5O_stab_t *stab = (const H5O_stab_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -432,12 +420,9 @@ H5O_stab_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "B-tree address:", stab->btree_addr);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "B-tree address:", stab->btree_addr);
 
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-	      "Name heap address:", stab->heap_addr);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Name heap address:", stab->heap_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
-
diff --git a/src/H5Otest.c b/src/H5Otest.c
index 12cb420..51b9d1a 100644
--- a/src/H5Otest.c
+++ b/src/H5Otest.c
@@ -21,57 +21,48 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg	  */
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-#define H5O_TESTING		/*suppress warning about H5O testing funcs*/
-
+#define H5A_PACKAGE /*suppress error about including H5Apkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+#define H5O_TESTING /*suppress warning about H5O testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Opkg.h"             /* Object headers			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes	  			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_is_attr_dense_test
@@ -94,31 +85,31 @@
 htri_t
 H5O_is_attr_dense_test(hid_t oid)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    H5O_loc_t *loc;             /* Pointer to object's location */
-    htri_t ret_value;           /* Return value */
+    H5O_t *     oh = NULL; /* Object header */
+    H5O_ainfo_t ainfo;     /* Attribute information for object */
+    H5O_loc_t * loc;       /* Pointer to object's location */
+    htri_t      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo) < 0)
+        if (H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check if dense storage is being used */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Check for any messages in object header */
         HDassert(H5O_msg_count_real(oh, H5O_MSG_ATTR) == 0);
 
@@ -128,13 +119,12 @@ H5O_is_attr_dense_test(hid_t oid)
         ret_value = FALSE;
 
 done:
-    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O_is_attr_dense_test() */
+} /* H5O_is_attr_dense_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_is_attr_empty_test
@@ -156,28 +146,28 @@ done:
 htri_t
 H5O_is_attr_empty_test(hid_t oid)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    htri_t ainfo_exists = FALSE;        /* Whether the attribute info exists in the file */
-    H5O_loc_t *loc;            /* Pointer to object's location */
-    hsize_t nattrs;             /* Number of attributes */
-    htri_t ret_value;           /* Return value */
+    H5O_t *     oh       = NULL;      /* Object header */
+    H5B2_t *    bt2_name = NULL;      /* v2 B-tree handle for name index */
+    H5O_ainfo_t ainfo;                /* Attribute information for object */
+    htri_t      ainfo_exists = FALSE; /* Whether the attribute info exists in the file */
+    H5O_loc_t * loc;                  /* Pointer to object's location */
+    hsize_t     nattrs;               /* Number of attributes */
+    htri_t      ret_value;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if((ainfo_exists = H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
@@ -185,20 +175,21 @@ H5O_is_attr_empty_test(hid_t oid)
     nattrs = H5O_msg_count_real(oh, H5O_MSG_ATTR);
 
     /* Check for later version of object header format & attribute info available */
-    if(oh->version > H5O_VERSION_1) {
-        if(ainfo_exists) {
+    if (oh->version > H5O_VERSION_1) {
+        if (ainfo_exists) {
             /* Check for using dense storage */
-            if(H5F_addr_defined(ainfo.fheap_addr)) {
+            if (H5F_addr_defined(ainfo.fheap_addr)) {
                 /* Check for any messages in object header */
                 HDassert(nattrs == 0);
 
                 /* Open the name index v2 B-tree */
-                if(NULL == (bt2_name = H5B2_open(loc->file, H5AC_ind_dxpl_id, ainfo.name_bt2_addr, NULL)))
+                if (NULL == (bt2_name = H5B2_open(loc->file, H5AC_ind_dxpl_id, ainfo.name_bt2_addr, NULL)))
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
                 /* Retrieve # of records in name index */
-                if(H5B2_get_nrec(bt2_name, &nattrs) < 0)
-                    HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
+                if (H5B2_get_nrec(bt2_name, &nattrs) < 0)
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL,
+                                "unable to retrieve # of records from name index")
             } /* end if */
 
             /* Verify that attribute count in object header is correct */
@@ -213,15 +204,14 @@ H5O_is_attr_empty_test(hid_t oid)
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name, H5AC_ind_dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, H5AC_ind_dxpl_id) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O_is_attr_empty_test() */
+} /* H5O_is_attr_empty_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_num_attrs_test
@@ -244,28 +234,28 @@ done:
 herr_t
 H5O_num_attrs_test(hid_t oid, hsize_t *nattrs)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5B2_t *bt2_name = NULL;            /* v2 B-tree handle for name index */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    H5O_loc_t *loc;            /* Pointer to object's location */
-    hsize_t obj_nattrs;         /* Number of attributes */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *     oh       = NULL;     /* Object header */
+    H5B2_t *    bt2_name = NULL;     /* v2 B-tree handle for name index */
+    H5O_ainfo_t ainfo;               /* Attribute information for object */
+    H5O_loc_t * loc;                 /* Pointer to object's location */
+    hsize_t     obj_nattrs;          /* Number of attributes */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo) < 0)
+        if (H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
@@ -273,18 +263,18 @@ H5O_num_attrs_test(hid_t oid, hsize_t *nattrs)
     obj_nattrs = H5O_msg_count_real(oh, H5O_MSG_ATTR);
 
     /* Check for later version of object header format */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for using dense storage */
-        if(H5F_addr_defined(ainfo.fheap_addr)) {
+        if (H5F_addr_defined(ainfo.fheap_addr)) {
             /* Check for any messages in object header */
             HDassert(obj_nattrs == 0);
 
             /* Open the name index v2 B-tree */
-            if(NULL == (bt2_name = H5B2_open(loc->file, H5AC_ind_dxpl_id, ainfo.name_bt2_addr, NULL)))
+            if (NULL == (bt2_name = H5B2_open(loc->file, H5AC_ind_dxpl_id, ainfo.name_bt2_addr, NULL)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
             /* Retrieve # of records in name index */
-            if(H5B2_get_nrec(bt2_name, &obj_nattrs) < 0)
+            if (H5B2_get_nrec(bt2_name, &obj_nattrs) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
         } /* end if */
 
@@ -297,15 +287,14 @@ H5O_num_attrs_test(hid_t oid, hsize_t *nattrs)
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name, H5AC_ind_dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, H5AC_ind_dxpl_id) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O_num_attrs_test() */
+} /* H5O_num_attrs_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_attr_dense_info_test
@@ -330,71 +319,71 @@ done:
 herr_t
 H5O_attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5B2_t *bt2_name = NULL;    /* v2 B-tree handle for name index */
-    H5B2_t *bt2_corder = NULL;  /* v2 B-tree handle for creation order index */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    H5O_loc_t *loc;            /* Pointer to object's location */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *     oh         = NULL;   /* Object header */
+    H5B2_t *    bt2_name   = NULL;   /* v2 B-tree handle for name index */
+    H5B2_t *    bt2_corder = NULL;   /* v2 B-tree handle for creation order index */
+    H5O_ainfo_t ainfo;               /* Attribute information for object */
+    H5O_loc_t * loc;                 /* Pointer to object's location */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo) < 0)
+        if (H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check for 'dense' attribute storage file addresses being defined */
-    if(!H5F_addr_defined(ainfo.fheap_addr))
+    if (!H5F_addr_defined(ainfo.fheap_addr))
         HGOTO_DONE(FAIL)
-    if(!H5F_addr_defined(ainfo.name_bt2_addr))
+    if (!H5F_addr_defined(ainfo.name_bt2_addr))
         HGOTO_DONE(FAIL)
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(loc->file, H5AC_ind_dxpl_id, ainfo.name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(loc->file, H5AC_ind_dxpl_id, ainfo.name_bt2_addr, NULL)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Retrieve # of records in name index */
-    if(H5B2_get_nrec(bt2_name, name_count) < 0)
+    if (H5B2_get_nrec(bt2_name, name_count) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
 
     /* Check if there is a creation order index */
-    if(H5F_addr_defined(ainfo.corder_bt2_addr)) {
+    if (H5F_addr_defined(ainfo.corder_bt2_addr)) {
         /* Open the creation order index v2 B-tree */
-        if(NULL == (bt2_corder = H5B2_open(loc->file, H5AC_ind_dxpl_id, ainfo.corder_bt2_addr, NULL)))
+        if (NULL == (bt2_corder = H5B2_open(loc->file, H5AC_ind_dxpl_id, ainfo.corder_bt2_addr, NULL)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
 
         /* Retrieve # of records in creation order index */
-        if(H5B2_get_nrec(bt2_corder, corder_count) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from creation order index")
+        if (H5B2_get_nrec(bt2_corder, corder_count) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL,
+                        "unable to retrieve # of records from creation order index")
     } /* end if */
     else
         *corder_count = 0;
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name, H5AC_ind_dxpl_id) < 0)
+    if (bt2_name && H5B2_close(bt2_name, H5AC_ind_dxpl_id) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder, H5AC_ind_dxpl_id) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder, H5AC_ind_dxpl_id) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for creation order index")
-    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O_attr_dense_info_test() */
+} /* H5O_attr_dense_info_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_check_msg_marked_test
@@ -419,45 +408,45 @@ done:
 herr_t
 H5O_check_msg_marked_test(hid_t oid, hbool_t flag_val)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5O_loc_t *loc;            /* Pointer to object's location */
-    H5O_mesg_t *idx_msg;        /* Pointer to message */
-    unsigned idx;               /* Index of message */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *     oh = NULL;           /* Object header */
+    H5O_loc_t * loc;                 /* Pointer to object's location */
+    H5O_mesg_t *idx_msg;             /* Pointer to message */
+    unsigned    idx;                 /* Index of message */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Locate "unknown" message  */
-    for(idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
-	if(idx_msg->type->id == H5O_UNKNOWN_ID) {
+    for (idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
+        if (idx_msg->type->id == H5O_UNKNOWN_ID) {
             /* Check for "unknown" message having the correct flags */
-            if(((idx_msg->flags & H5O_MSG_FLAG_WAS_UNKNOWN) > 0) != flag_val)
-                HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "'unknown' message has incorrect 'was unknown' flag value")
+            if (((idx_msg->flags & H5O_MSG_FLAG_WAS_UNKNOWN) > 0) != flag_val)
+                HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL,
+                            "'unknown' message has incorrect 'was unknown' flag value")
 
             /* Break out of loop, to indicate that the "unknown" message was found */
             break;
         } /* end if */
 
     /* Check for not finding an "unknown" message */
-    if(idx == oh->nmesgs)
+    if (idx == oh->nmesgs)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "'unknown' message type not found")
 
 done:
-    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O_check_msg_marked_test() */
+} /* H5O_check_msg_marked_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_expunge_chunks_test
@@ -482,41 +471,41 @@ done:
 herr_t
 H5O_expunge_chunks_test(const H5O_loc_t *loc, hid_t dxpl_id)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    haddr_t chk_addr[16];       /* Array of chunk addresses */
-    size_t nchunks;             /* Number of chunks in object header */
-    size_t u;                   /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t * oh = NULL;           /* Object header */
+    haddr_t chk_addr[16];        /* Array of chunk addresses */
+    size_t  nchunks;             /* Number of chunks in object header */
+    size_t  u;                   /* Local index variable */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Safety check */
     nchunks = oh->nchunks;
     HDassert(0 < nchunks && nchunks < NELMTS(chk_addr));
 
     /* Iterate over all the chunks, saving the chunk addresses */
-    for(u = 0; u < oh->nchunks; u++)
+    for (u = 0; u < oh->nchunks; u++)
         chk_addr[u] = oh->chunk[u].addr;
 
     /* Release the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
+    if (H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Iterate over all the saved chunk addresses, evicting them from the cache */
     /* (in reverse order, so that chunk #0 is unpinned) */
-    for(u = nchunks - 1; u < nchunks; u--)
-        if(H5AC_expunge_entry(loc->file, dxpl_id, (u == 0 ? H5AC_OHDR : H5AC_OHDR_CHK), chk_addr[u], H5AC__NO_FLAGS_SET) < 0)
+    for (u = nchunks - 1; u < nchunks; u--)
+        if (H5AC_expunge_entry(loc->file, dxpl_id, (u == 0 ? H5AC_OHDR : H5AC_OHDR_CHK), chk_addr[u],
+                               H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTEXPUNGE, FAIL, "unable to expunge object header chunk")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O_expunge_chunks_test() */
+} /* H5O_expunge_chunks_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O_get_rc
@@ -541,7 +530,7 @@ done:
 herr_t
 H5O_get_rc(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc)
 {
-    H5O_t *oh = NULL;           /* Object header */
+    H5O_t *oh        = NULL;    /* Object header */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -551,17 +540,16 @@ H5O_get_rc(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc)
     HDassert(rc);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Save the refcount for the object header */
     *rc = oh->nlink;
 
 done:
     /* Release the object header */
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
+    if (oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O_expunge_chunks_test() */
-
+} /* H5O_expunge_chunks_test() */
diff --git a/src/H5Ounknown.c b/src/H5Ounknown.c
index 704d4c0..8484b83 100644
--- a/src/H5Ounknown.c
+++ b/src/H5Ounknown.c
@@ -22,45 +22,43 @@
  *-------------------------------------------------------------------------
  */
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Opkg.h"             /* Object headers			*/
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
 static herr_t H5O_unknown_free(void *_mesg);
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_UNKNOWN[1] = {{
-    H5O_UNKNOWN_ID,           	/*message id number             */
-    "unknown",                	/*message name for debugging    */
-    0,				/*native message size           */
-    0,			        /* messages are sharable?       */
-    NULL,			/*decode message                */
-    NULL,			/*encode message                */
-    NULL,			/*copy the native value         */
-    NULL,			/*size of symbol table entry    */
-    NULL,                   	/*default reset method          */
-    H5O_unknown_free,	        /* free method			*/
-    NULL,			/* file delete method		*/
-    NULL,			/* link method			*/
-    NULL, 			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    NULL,			/* copy native value to file    */
-    NULL,			/* post copy native value to file */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    NULL			/*debug the message             */
+    H5O_UNKNOWN_ID,   /*message id number             */
+    "unknown",        /*message name for debugging    */
+    0,                /*native message size           */
+    0,                /* messages are sharable?       */
+    NULL,             /*decode message                */
+    NULL,             /*encode message                */
+    NULL,             /*copy the native value         */
+    NULL,             /*size of symbol table entry    */
+    NULL,             /*default reset method          */
+    H5O_unknown_free, /* free method			*/
+    NULL,             /* file delete method		*/
+    NULL,             /* link method			*/
+    NULL,             /*set share method		*/
+    NULL,             /*can share method		*/
+    NULL,             /* pre copy native value to file */
+    NULL,             /* copy native value to file    */
+    NULL,             /* post copy native value to file */
+    NULL,             /* get creation index		*/
+    NULL,             /* set creation index		*/
+    NULL              /*debug the message             */
 }};
 
 /* Declare a free list to manage the H5O_unknown_t struct */
 H5FL_DEFINE(H5O_unknown_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_unknown_free
  *
@@ -84,4 +82,3 @@ H5O_unknown_free(void *mesg)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_unknown_free() */
-
diff --git a/src/H5P.c b/src/H5P.c
index 4a09e2e..da19955 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -20,57 +20,50 @@
 /* Module Setup */
 /****************/
 
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5P__init_pub_interface
-
+#define H5_INTERFACE_INIT_FUNC H5P__init_pub_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Typedef for property iterator callback */
 typedef struct {
-    H5P_iterate_t iter_func;    /* Iterator callback */
-    hid_t id;                   /* Property list or class ID */
-    void *iter_data;            /* Iterator callback pointer */
+    H5P_iterate_t iter_func; /* Iterator callback */
+    hid_t         id;        /* Property list or class ID */
+    void *        iter_data; /* Iterator callback pointer */
 } H5P_iter_ud_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5P__init_pub_interface -- Initialize interface-specific information
@@ -91,7 +84,6 @@ H5P__init_pub_interface(void)
     FUNC_LEAVE_NOAPI(H5P_init())
 } /* H5P__init_pub_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5P__term_pub_interface -- Terminate interface
@@ -115,7 +107,6 @@ H5P__term_pub_interface(void)
     FUNC_LEAVE_NOAPI(0)
 } /* H5P__term_pub_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pcopy
@@ -140,46 +131,45 @@ H5P__term_pub_interface(void)
 hid_t
 H5Pcopy(hid_t id)
 {
-    void *obj;                  /* Property object to copy */
-    hid_t ret_value=FALSE;      /* return value */
+    void *obj;               /* Property object to copy */
+    hid_t ret_value = FALSE; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", id);
 
-    if(H5P_DEFAULT==id)
+    if (H5P_DEFAULT == id)
         HGOTO_DONE(H5P_DEFAULT);
 
     /* Check arguments. */
-    if(H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
+    if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not property object");
-    if(NULL == (obj = H5I_object(id)))
+    if (NULL == (obj = H5I_object(id)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property object doesn't exist");
 
     /* Compare property lists */
-    if(H5I_GENPROP_LST == H5I_get_type(id)) {
-        if((ret_value = H5P_copy_plist((H5P_genplist_t *)obj, TRUE)) < 0)
+    if (H5I_GENPROP_LST == H5I_get_type(id)) {
+        if ((ret_value = H5P_copy_plist((H5P_genplist_t *)obj, TRUE)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy property list");
     } /* end if */
     /* Must be property classes */
     else {
-        H5P_genclass_t *copy_class;      /* Copy of class */
+        H5P_genclass_t *copy_class; /* Copy of class */
 
         /* Copy the class */
-        if((copy_class = H5P_copy_pclass((H5P_genclass_t *)obj)) == NULL)
+        if ((copy_class = H5P_copy_pclass((H5P_genclass_t *)obj)) == NULL)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy property class");
 
         /* Get an atom for the copied class */
-        if((ret_value = H5I_register(H5I_GENPROP_CLS, copy_class, TRUE)) < 0) {
+        if ((ret_value = H5I_register(H5I_GENPROP_CLS, copy_class, TRUE)) < 0) {
             H5P_close_class(copy_class);
             HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to atomize property list class");
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pcopy() */
+} /* H5Pcopy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pcreate_class
@@ -215,52 +205,49 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 hid_t
-H5Pcreate_class(hid_t parent, const char *name,
-    H5P_cls_create_func_t cls_create, void *create_data,
-    H5P_cls_copy_func_t cls_copy, void *copy_data,
-    H5P_cls_close_func_t cls_close, void *close_data
-    )
+H5Pcreate_class(hid_t parent, const char *name, H5P_cls_create_func_t cls_create, void *create_data,
+                H5P_cls_copy_func_t cls_copy, void *copy_data, H5P_cls_close_func_t cls_close,
+                void *close_data)
 {
-    H5P_genclass_t	*par_class = NULL;  /* Pointer to the parent class */
-    H5P_genclass_t	*pclass = NULL;     /* Property list class created */
-    hid_t	ret_value;                  /* Return value		   */
+    H5P_genclass_t *par_class = NULL; /* Pointer to the parent class */
+    H5P_genclass_t *pclass    = NULL; /* Property list class created */
+    hid_t           ret_value;        /* Return value		   */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("i", "i*sx*xx*xx*x", parent, name, cls_create, create_data, cls_copy,
-             copy_data, cls_close, close_data);
+    H5TRACE8("i", "i*sx*xx*xx*x", parent, name, cls_create, create_data, cls_copy, copy_data, cls_close,
+             close_data);
 
     /* Check arguments. */
-    if(H5P_DEFAULT!=parent && (H5I_GENPROP_CLS!=H5I_get_type(parent)))
+    if (H5P_DEFAULT != parent && (H5I_GENPROP_CLS != H5I_get_type(parent)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid class name")
-    if((create_data != NULL && cls_create == NULL)
-            || (copy_data != NULL && cls_copy == NULL)
-            || (close_data != NULL && cls_close == NULL))
+    if ((create_data != NULL && cls_create == NULL) || (copy_data != NULL && cls_copy == NULL) ||
+        (close_data != NULL && cls_close == NULL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "data specified, but no callback provided")
 
     /* Get the pointer to the parent class */
-    if(parent == H5P_DEFAULT)
+    if (parent == H5P_DEFAULT)
         par_class = NULL;
-    else if(NULL == (par_class = (H5P_genclass_t *)H5I_object(parent)))
+    else if (NULL == (par_class = (H5P_genclass_t *)H5I_object(parent)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't retrieve parent class")
 
     /* Create the new property list class */
-    if(NULL == (pclass = H5P_create_class(par_class, name, H5P_TYPE_USER, cls_create, create_data, cls_copy, copy_data, cls_close, close_data)))
+    if (NULL == (pclass = H5P_create_class(par_class, name, H5P_TYPE_USER, cls_create, create_data, cls_copy,
+                                           copy_data, cls_close, close_data)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "unable to create property list class")
 
     /* Get an atom for the class */
-    if((ret_value = H5I_register(H5I_GENPROP_CLS, pclass, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_GENPROP_CLS, pclass, TRUE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to atomize property list class")
 
 done:
-    if(ret_value < 0 && pclass)
+    if (ret_value < 0 && pclass)
         H5P_close_class(pclass);
 
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pcreate_class() */
+} /* H5Pcreate_class() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pcreate
@@ -286,25 +273,24 @@ done:
 hid_t
 H5Pcreate(hid_t cls_id)
 {
-    H5P_genclass_t	*pclass;   /* Property list class to modify */
-    hid_t ret_value;               /* return value */
+    H5P_genclass_t *pclass;    /* Property list class to modify */
+    hid_t           ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", cls_id);
 
     /* Check arguments. */
-    if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS)))
+    if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class");
 
     /* Create the new property list */
-    if((ret_value = H5P_create_id(pclass, TRUE)) < 0)
+    if ((ret_value = H5P_create_id(pclass, TRUE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "unable to create property list");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pcreate() */
+} /* H5Pcreate() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pregister2
@@ -460,52 +446,51 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value,
-    H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
-    H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
-    H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
-    H5P_prp_close_func_t prp_close)
+H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_prp_create_func_t prp_create,
+             H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
+             H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close)
 {
-    H5P_genclass_t *pclass;     /* Property list class to modify */
+    H5P_genclass_t *pclass;      /* Property list class to modify */
     H5P_genclass_t *orig_pclass; /* Original property class */
-    herr_t ret_value;           /* Return value */
+    herr_t          ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE11("e", "i*sz*xxxxxxxx", cls_id, name, size, def_value, prp_create,
-             prp_set, prp_get, prp_delete, prp_copy, prp_cmp, prp_close);
+    H5TRACE11("e", "i*sz*xxxxxxxx", cls_id, name, size, def_value, prp_create, prp_set, prp_get, prp_delete,
+              prp_copy, prp_cmp, prp_close);
 
     /* Check arguments. */
-    if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS)))
+    if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid class name")
-    if(size > 0 && def_value == NULL)
+    if (size > 0 && def_value == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "properties >0 size must have default")
 
     /* Create the new property list class */
     orig_pclass = pclass;
-    if((ret_value = H5P_register(&pclass, name, size, def_value, prp_create, prp_set, prp_get, prp_delete, prp_copy, prp_cmp, prp_close)) < 0)
+    if ((ret_value = H5P_register(&pclass, name, size, def_value, prp_create, prp_set, prp_get, prp_delete,
+                                  prp_copy, prp_cmp, prp_close)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in class")
 
     /* Check if the property class changed and needs to be substituted in the ID */
-    if(pclass != orig_pclass) {
-        H5P_genclass_t *old_pclass;     /* Old property class */
+    if (pclass != orig_pclass) {
+        H5P_genclass_t *old_pclass; /* Old property class */
 
         /* Substitute the new property class in the ID */
-        if(NULL == (old_pclass = (H5P_genclass_t *)H5I_subst(cls_id, pclass)))
+        if (NULL == (old_pclass = (H5P_genclass_t *)H5I_subst(cls_id, pclass)))
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to substitute property class in ID")
         HDassert(old_pclass == orig_pclass);
 
         /* Close the previous class */
-        if(H5P_close_class(old_pclass) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL, "unable to close original property class after substitution")
+        if (H5P_close_class(old_pclass) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL,
+                        "unable to close original property class after substitution")
     } /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pregister2() */
+} /* H5Pregister2() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pinsert2
@@ -646,35 +631,34 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value,
-    H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-    H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
-    H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close)
+H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value, H5P_prp_set_func_t prp_set,
+           H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+           H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close)
 {
-    H5P_genplist_t	*plist;    /* Property list to modify */
-    herr_t ret_value;           /* return value */
+    H5P_genplist_t *plist;     /* Property list to modify */
+    herr_t          ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE10("e", "i*sz*xxxxxxx", plist_id, name, size, value, prp_set, prp_get,
-             prp_delete, prp_copy, prp_cmp, prp_close);
+    H5TRACE10("e", "i*sz*xxxxxxx", plist_id, name, size, value, prp_set, prp_get, prp_delete, prp_copy,
+              prp_cmp, prp_close);
 
     /* Check arguments. */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property name")
-    if(size > 0 && value == NULL)
+    if (size > 0 && value == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "properties >0 size must have default")
 
     /* Create the new property list class */
-    if((ret_value = H5P_insert(plist, name, size, value, prp_set, prp_get, prp_delete, prp_copy, prp_cmp, prp_close)) < 0)
+    if ((ret_value = H5P_insert(plist, name, size, value, prp_set, prp_get, prp_delete, prp_copy, prp_cmp,
+                                prp_close)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in plist")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pinsert2() */
+} /* H5Pinsert2() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pset
@@ -709,29 +693,28 @@ done:
 herr_t
 H5Pset(hid_t plist_id, const char *name, void *value)
 {
-    H5P_genplist_t *plist;      /* Property list to modify */
-    herr_t ret_value=SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list to modify */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*s*x", plist_id, name, value);
 
     /* Check arguments. */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property name");
-    if(value==NULL)
+    if (value == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalied property value");
 
     /* Go set the value */
-    if(H5P_set(plist,name,value) < 0)
+    if (H5P_set(plist, name, value) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value in plist");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pset() */
+} /* H5Pset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pexist
@@ -757,41 +740,39 @@ done:
 htri_t
 H5Pexist(hid_t id, const char *name)
 {
-    H5P_genplist_t	*plist;    /* Property list to query */
-    H5P_genclass_t	*pclass;   /* Property class to query */
-    htri_t ret_value;           /* return value */
+    H5P_genplist_t *plist;     /* Property list to query */
+    H5P_genclass_t *pclass;    /* Property class to query */
+    htri_t          ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("t", "i*s", id, name);
 
     /* Check arguments. */
-    if(H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
+    if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property name");
 
     /* Check for the existance of the property in the list or class */
-    if(H5I_GENPROP_LST == H5I_get_type(id)) {
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(id)))
+    if (H5I_GENPROP_LST == H5I_get_type(id)) {
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
-        if((ret_value = H5P_exist_plist(plist, name)) < 0)
+        if ((ret_value = H5P_exist_plist(plist, name)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "property does not exist in list");
     } /* end if */
+    else if (H5I_GENPROP_CLS == H5I_get_type(id)) {
+        if (NULL == (pclass = (H5P_genclass_t *)H5I_object(id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property class");
+        if ((ret_value = H5P_exist_pclass(pclass, name)) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "property does not exist in class");
+    } /* end if */
     else
-        if(H5I_GENPROP_CLS == H5I_get_type(id)) {
-            if(NULL == (pclass = (H5P_genclass_t *)H5I_object(id)))
-                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property class");
-            if((ret_value = H5P_exist_pclass(pclass, name)) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "property does not exist in class");
-        } /* end if */
-        else
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pexist() */
+} /* H5Pexist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pget_size
@@ -818,46 +799,44 @@ done:
 herr_t
 H5Pget_size(hid_t id, const char *name, size_t *size)
 {
-    H5P_genclass_t	*pclass;   /* Property class to query */
-    H5P_genplist_t	*plist;    /* Property list to query */
-    herr_t ret_value;           /* return value */
+    H5P_genclass_t *pclass;    /* Property class to query */
+    H5P_genplist_t *plist;     /* Property list to query */
+    herr_t          ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*s*z", id, name, size);
 
     /* Check arguments. */
-    if(H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
+    if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property name");
-    if(size==NULL)
+    if (size == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property size");
 
-    if(H5I_GENPROP_LST == H5I_get_type(id)) {
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(id)))
+    if (H5I_GENPROP_LST == H5I_get_type(id)) {
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
 
         /* Check the property size */
-        if((ret_value = H5P_get_size_plist(plist, name, size)) < 0)
+        if ((ret_value = H5P_get_size_plist(plist, name, size)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to query size in plist");
     } /* end if */
-    else
-        if(H5I_GENPROP_CLS == H5I_get_type(id)) {
-            if(NULL == (pclass = (H5P_genclass_t *)H5I_object(id)))
-                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
+    else if (H5I_GENPROP_CLS == H5I_get_type(id)) {
+        if (NULL == (pclass = (H5P_genclass_t *)H5I_object(id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
 
-            /* Check the property size */
-            if((ret_value = H5P_get_size_pclass(pclass, name, size)) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to query size in plist");
-        } /* end if */
-        else
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
+        /* Check the property size */
+        if ((ret_value = H5P_get_size_pclass(pclass, name, size)) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to query size in plist");
+    } /* end if */
+    else
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pget_size() */
+} /* H5Pget_size() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pget_class
@@ -881,37 +860,36 @@ done:
 hid_t
 H5Pget_class(hid_t plist_id)
 {
-    H5P_genplist_t	*plist;         /* Property list to query */
-    H5P_genclass_t	*pclass=NULL;   /* Property list class */
-    hid_t ret_value=FAIL;           /* return value */
+    H5P_genplist_t *plist;            /* Property list to query */
+    H5P_genclass_t *pclass    = NULL; /* Property list class */
+    hid_t           ret_value = FAIL; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", plist_id);
 
     /* Check arguments. */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
 
     /* Retrieve the property list class */
-    if((pclass = H5P_get_class(plist)) == NULL)
+    if ((pclass = H5P_get_class(plist)) == NULL)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "unable to query class of property list");
 
     /* Increment the outstanding references to the class object */
-    if(H5P_access_class(pclass, H5P_MOD_INC_REF) < 0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTINIT, FAIL,"Can't increment class ID ref count");
+    if (H5P_access_class(pclass, H5P_MOD_INC_REF) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Can't increment class ID ref count");
 
     /* Get an atom for the class */
-    if((ret_value = H5I_register(H5I_GENPROP_CLS, pclass, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_GENPROP_CLS, pclass, TRUE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to atomize property list class");
 
 done:
-    if(ret_value<0 && pclass)
+    if (ret_value < 0 && pclass)
         H5P_close_class(pclass);
 
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pget_class() */
+} /* H5Pget_class() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pget_nprops
@@ -938,40 +916,38 @@ done:
 herr_t
 H5Pget_nprops(hid_t id, size_t *nprops)
 {
-    H5P_genplist_t	*plist;    /* Property list to query */
-    H5P_genclass_t	*pclass;   /* Property class to query */
-    herr_t ret_value=SUCCEED;      /* return value */
+    H5P_genplist_t *plist;               /* Property list to query */
+    H5P_genclass_t *pclass;              /* Property class to query */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*z", id, nprops);
 
     /* Check arguments. */
-    if(H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
+    if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
-    if(nprops==NULL)
+    if (nprops == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property nprops pointer");
 
-    if(H5I_GENPROP_LST == H5I_get_type(id)) {
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(id)))
+    if (H5I_GENPROP_LST == H5I_get_type(id)) {
+        if (NULL == (plist = (H5P_genplist_t *)H5I_object(id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
-        if(H5P_get_nprops_plist(plist, nprops) < 0)
+        if (H5P_get_nprops_plist(plist, nprops) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to query # of properties in plist");
     } /* end if */
+    else if (H5I_GENPROP_CLS == H5I_get_type(id)) {
+        if (NULL == (pclass = (H5P_genclass_t *)H5I_object(id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property class");
+        if (H5P_get_nprops_pclass(pclass, nprops, FALSE) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to query # of properties in pclass");
+    } /* end if */
     else
-        if(H5I_GENPROP_CLS == H5I_get_type(id)) {
-            if(NULL == (pclass = (H5P_genclass_t *)H5I_object(id)))
-                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property class");
-            if(H5P_get_nprops_pclass(pclass, nprops, FALSE) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to query # of properties in pclass");
-        } /* end if */
-        else
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pget_nprops() */
+} /* H5Pget_nprops() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pequal
@@ -995,26 +971,26 @@ done:
 htri_t
 H5Pequal(hid_t id1, hid_t id2)
 {
-    void *obj1, *obj2;          /* Property objects to compare */
-    htri_t ret_value = FALSE;     /* return value */
+    void * obj1, *obj2;       /* Property objects to compare */
+    htri_t ret_value = FALSE; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("t", "ii", id1, id2);
 
     /* Check arguments. */
-    if((H5I_GENPROP_LST != H5I_get_type(id1) && H5I_GENPROP_CLS != H5I_get_type(id1))
-            || (H5I_GENPROP_LST != H5I_get_type(id2) && H5I_GENPROP_CLS != H5I_get_type(id2)))
+    if ((H5I_GENPROP_LST != H5I_get_type(id1) && H5I_GENPROP_CLS != H5I_get_type(id1)) ||
+        (H5I_GENPROP_LST != H5I_get_type(id2) && H5I_GENPROP_CLS != H5I_get_type(id2)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not property objects")
-    if(H5I_get_type(id1) != H5I_get_type(id2))
+    if (H5I_get_type(id1) != H5I_get_type(id2))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not the same kind of property objects")
-    if(NULL == (obj1 = H5I_object(id1)) || NULL == (obj2 = H5I_object(id2)))
+    if (NULL == (obj1 = H5I_object(id1)) || NULL == (obj2 = H5I_object(id2)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property object doesn't exist")
 
     /* Compare property lists */
-    if(H5I_GENPROP_LST == H5I_get_type(id1)) {
+    if (H5I_GENPROP_LST == H5I_get_type(id1)) {
         int cmp_ret = 0;
 
-        if(H5P_cmp_plist((const H5P_genplist_t *)obj1, (const H5P_genplist_t *)obj2, &cmp_ret) < 0)
+        if (H5P_cmp_plist((const H5P_genplist_t *)obj1, (const H5P_genplist_t *)obj2, &cmp_ret) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTCOMPARE, FAIL, "can't compare property lists")
 
         /* Set return value */
@@ -1022,15 +998,14 @@ H5Pequal(hid_t id1, hid_t id2)
     } /* end if */
     /* Must be property classes */
     else {
-        if(H5P_cmp_class((const H5P_genclass_t *)obj1, (const H5P_genclass_t *)obj2) == 0)
+        if (H5P_cmp_class((const H5P_genclass_t *)obj1, (const H5P_genclass_t *)obj2) == 0)
             ret_value = TRUE;
     } /* end else */
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pequal() */
+} /* H5Pequal() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pisa_class
@@ -1057,26 +1032,25 @@ done:
 htri_t
 H5Pisa_class(hid_t plist_id, hid_t pclass_id)
 {
-    htri_t ret_value;                   /* return value */
+    htri_t ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("t", "ii", plist_id, pclass_id);
 
     /* Check arguments. */
-    if(H5I_GENPROP_LST != H5I_get_type(plist_id))
+    if (H5I_GENPROP_LST != H5I_get_type(plist_id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
-    if(H5I_GENPROP_CLS != H5I_get_type(pclass_id))
+    if (H5I_GENPROP_CLS != H5I_get_type(pclass_id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property class");
 
     /* Compare the property list's class against the other class */
-    if((ret_value = H5P_isa_class(plist_id, pclass_id)) < 0)
+    if ((ret_value = H5P_isa_class(plist_id, pclass_id)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to compare property list classes");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pisa_class() */
+} /* H5Pisa_class() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P__iterate_cb
@@ -1101,8 +1075,8 @@ property list or class.
 static int
 H5P__iterate_cb(H5P_genprop_t *prop, void *_udata)
 {
-    H5P_iter_ud_t *udata = (H5P_iter_ud_t *)_udata;     /* Pointer to user data */
-    int ret_value = 0;                                  /* Return value */
+    H5P_iter_ud_t *udata     = (H5P_iter_ud_t *)_udata; /* Pointer to user data */
+    int            ret_value = 0;                       /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1116,7 +1090,6 @@ H5P__iterate_cb(H5P_genprop_t *prop, void *_udata)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__iterate_cb() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Piterate
@@ -1173,46 +1146,46 @@ iteration, the function's behavior is undefined.
 int
 H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data)
 {
-    H5P_iter_ud_t udata;    /* User data for internal iterator callback */
-    int fake_idx = 0;       /* Index when user doesn't provide one */
-    void *obj;              /* Property object to copy */
-    int ret_value;          /* return value */
+    H5P_iter_ud_t udata;        /* User data for internal iterator callback */
+    int           fake_idx = 0; /* Index when user doesn't provide one */
+    void *        obj;          /* Property object to copy */
+    int           ret_value;    /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("Is", "i*Isx*x", id, idx, iter_func, iter_data);
 
     /* Check arguments. */
-    if(H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
+    if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
-    if(NULL == (obj = H5I_object(id)))
+    if (NULL == (obj = H5I_object(id)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property object doesn't exist");
-    if(iter_func == NULL)
+    if (iter_func == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration callback");
 
     /* Set up user data */
     udata.iter_func = iter_func;
-    udata.id = id;
+    udata.id        = id;
     udata.iter_data = iter_data;
 
-    if(H5I_GENPROP_LST == H5I_get_type(id)) {
+    if (H5I_GENPROP_LST == H5I_get_type(id)) {
         /* Iterate over a property list */
-        if((ret_value = H5P_iterate_plist((H5P_genplist_t *)obj, TRUE, (idx ? idx : &fake_idx), H5P__iterate_cb, &udata)) < 0)
+        if ((ret_value = H5P_iterate_plist((H5P_genplist_t *)obj, TRUE, (idx ? idx : &fake_idx),
+                                           H5P__iterate_cb, &udata)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to iterate over list");
     } /* end if */
+    else if (H5I_GENPROP_CLS == H5I_get_type(id)) {
+        /* Iterate over a property class */
+        if ((ret_value = H5P_iterate_pclass((H5P_genclass_t *)obj, (idx ? idx : &fake_idx), H5P__iterate_cb,
+                                            &udata)) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to iterate over class");
+    } /* end if */
     else
-        if(H5I_GENPROP_CLS == H5I_get_type(id)) {
-            /* Iterate over a property class */
-            if((ret_value = H5P_iterate_pclass((H5P_genclass_t *)obj, (idx ? idx : &fake_idx), H5P__iterate_cb, &udata)) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to iterate over class");
-        } /* end if */
-        else
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Piterate() */
+} /* H5Piterate() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pget
@@ -1244,29 +1217,28 @@ done:
 herr_t
 H5Pget(hid_t plist_id, const char *name, void *value)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*s*x", plist_id, name, value);
 
     /* Check arguments. */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property name");
-    if(value==NULL)
+    if (value == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalied property value");
 
     /* Go get the value */
-    if(H5P_get(plist,name,value) < 0)
+    if (H5P_get(plist, name, value) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to query property value");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pget() */
+} /* H5Pget() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Premove
@@ -1296,27 +1268,26 @@ done:
 herr_t
 H5Premove(hid_t plist_id, const char *name)
 {
-    H5P_genplist_t	*plist;    /* Property list to modify */
-    herr_t ret_value;           /* return value */
+    H5P_genplist_t *plist;     /* Property list to modify */
+    herr_t          ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", plist_id, name);
 
     /* Check arguments. */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property name");
 
     /* Create the new property list class */
-    if((ret_value = H5P_remove(plist_id,plist,name)) < 0)
+    if ((ret_value = H5P_remove(plist_id, plist, name)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "unable to remove property");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Premove() */
+} /* H5Premove() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pcopy_prop
@@ -1358,41 +1329,40 @@ done:
 herr_t
 H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name)
 {
-    H5I_type_t src_id_type, dst_id_type;        /* ID types */
-    herr_t ret_value = SUCCEED;     /* return value */
+    H5I_type_t src_id_type, dst_id_type; /* ID types */
+    herr_t     ret_value = SUCCEED;      /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ii*s", dst_id, src_id, name);
 
     /* Check arguments. */
-    if((src_id_type = H5I_get_type(src_id)) < 0)
+    if ((src_id_type = H5I_get_type(src_id)) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid source ID")
-    if((dst_id_type = H5I_get_type(dst_id)) < 0)
+    if ((dst_id_type = H5I_get_type(dst_id)) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid destination ID")
-    if((H5I_GENPROP_LST != src_id_type && H5I_GENPROP_CLS != src_id_type)
-            || (H5I_GENPROP_LST != dst_id_type && H5I_GENPROP_CLS != dst_id_type))
+    if ((H5I_GENPROP_LST != src_id_type && H5I_GENPROP_CLS != src_id_type) ||
+        (H5I_GENPROP_LST != dst_id_type && H5I_GENPROP_CLS != dst_id_type))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not property objects")
-    if(src_id_type != dst_id_type)
+    if (src_id_type != dst_id_type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not the same kind of property objects")
-    if(!name || !*name)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no name given")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name given")
 
     /* Compare property lists */
-    if(H5I_GENPROP_LST == src_id_type) {
-        if(H5P_copy_prop_plist(dst_id, src_id, name) < 0)
+    if (H5I_GENPROP_LST == src_id_type) {
+        if (H5P_copy_prop_plist(dst_id, src_id, name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy property between lists")
     } /* end if */
     /* Must be property classes */
     else {
-        if(H5P_copy_prop_pclass(dst_id, src_id, name) < 0)
+        if (H5P_copy_prop_pclass(dst_id, src_id, name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy property between classes")
     } /* end else */
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pcopy_prop() */
+} /* H5Pcopy_prop() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Punregister
@@ -1417,27 +1387,26 @@ done:
 herr_t
 H5Punregister(hid_t pclass_id, const char *name)
 {
-    H5P_genclass_t	*pclass;   /* Property list class to modify */
-    herr_t ret_value;           /* return value */
+    H5P_genclass_t *pclass;    /* Property list class to modify */
+    herr_t          ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", pclass_id, name);
 
     /* Check arguments. */
-    if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
+    if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class");
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property name");
 
     /* Remove the property list from class */
-    if((ret_value = H5P_unregister(pclass, name)) < 0)
+    if ((ret_value = H5P_unregister(pclass, name)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to remove property from class");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Punregister() */
+} /* H5Punregister() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pclose
@@ -1462,27 +1431,26 @@ done:
 herr_t
 H5Pclose(hid_t plist_id)
 {
-    herr_t ret_value = SUCCEED;      /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", plist_id);
 
     /* Allow default property lists to pass through without throwing an error */
-    if(H5P_DEFAULT != plist_id) {
+    if (H5P_DEFAULT != plist_id) {
         /* Check arguments. */
-        if(H5I_GENPROP_LST != H5I_get_type(plist_id))
+        if (H5I_GENPROP_LST != H5I_get_type(plist_id))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
         /* Close the property list */
-        if(H5I_dec_app_ref(plist_id) < 0)
+        if (H5I_dec_app_ref(plist_id) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't close")
     } /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pclose() */
+} /* H5Pclose() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pget_class_name
@@ -1506,25 +1474,24 @@ done:
 char *
 H5Pget_class_name(hid_t pclass_id)
 {
-    H5P_genclass_t	*pclass;    /* Property class to query */
-    char *ret_value;       /* return value */
+    H5P_genclass_t *pclass;    /* Property class to query */
+    char *          ret_value; /* return value */
 
     FUNC_ENTER_API(NULL)
     H5TRACE1("*s", "i", pclass_id);
 
     /* Check arguments. */
-    if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
+    if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property class");
 
     /* Get the property list class name */
-    if((ret_value = H5P_get_class_name(pclass)) == NULL)
+    if ((ret_value = H5P_get_class_name(pclass)) == NULL)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "unable to query name of class");
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pget_class_name() */
+} /* H5Pget_class_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pget_class_parent
@@ -1547,37 +1514,36 @@ done:
 hid_t
 H5Pget_class_parent(hid_t pclass_id)
 {
-    H5P_genclass_t	*pclass;    /* Property class to query */
-    H5P_genclass_t	*parent = NULL;   /* Parent's property class */
-    hid_t ret_value;       /* return value */
+    H5P_genclass_t *pclass;        /* Property class to query */
+    H5P_genclass_t *parent = NULL; /* Parent's property class */
+    hid_t           ret_value;     /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", pclass_id);
 
     /* Check arguments. */
-    if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
+    if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property class")
 
     /* Retrieve the property class's parent */
-    if(NULL == (parent = H5P_get_class_parent(pclass)))
+    if (NULL == (parent = H5P_get_class_parent(pclass)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "unable to query class of property list")
 
     /* Increment the outstanding references to the class object */
-    if(H5P_access_class(parent, H5P_MOD_INC_REF) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL,"Can't increment class ID ref count")
+    if (H5P_access_class(parent, H5P_MOD_INC_REF) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Can't increment class ID ref count")
 
     /* Get an atom for the class */
-    if((ret_value = H5I_register(H5I_GENPROP_CLS, parent, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_GENPROP_CLS, parent, TRUE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to atomize property list class")
 
 done:
-    if(ret_value < 0 && parent)
+    if (ret_value < 0 && parent)
         H5P_close_class(parent);
 
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pget_class_parent() */
+} /* H5Pget_class_parent() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pclose_class
@@ -1599,20 +1565,19 @@ done:
 herr_t
 H5Pclose_class(hid_t cls_id)
 {
-    hid_t	ret_value = SUCCEED;    /* Return value			*/
+    hid_t ret_value = SUCCEED; /* Return value			*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", cls_id);
 
     /* Check arguments */
-    if(H5I_GENPROP_CLS != H5I_get_type(cls_id))
+    if (H5I_GENPROP_CLS != H5I_get_type(cls_id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class")
 
     /* Close the property list class */
-    if(H5I_dec_app_ref(cls_id) < 0)
+    if (H5I_dec_app_ref(cls_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't close")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pclose_class() */
-
+} /* H5Pclose_class() */
diff --git a/src/H5PL.c b/src/H5PL.c
index 950b527..68fcbb5 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -9,46 +9,46 @@
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#define H5PL_PACKAGE        /*suppress error about including H5PLpkg   */
+#define H5PL_PACKAGE /*suppress error about including H5PLpkg   */
 
 /****************/
 /* Module Setup */
 /****************/
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5PL__init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5PL__init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions            */
-#include "H5Eprivate.h"     /* Error handling               */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5PLpkg.h"        /* Plugin                       */
-#include "H5Zprivate.h"     /* Filter pipeline              */
-
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Eprivate.h"  /* Error handling               */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5PLpkg.h"     /* Plugin                       */
+#include "H5Zprivate.h"  /* Filter pipeline              */
 
 /****************/
 /* Local Macros */
 /****************/
 #ifdef H5_HAVE_WIN32_API
-#define H5PL_EXPAND_ENV_VAR {                                                            \
-        long bufCharCount;                                                               \
-        char *tempbuf;                                                                   \
-        if(NULL == (tempbuf = (char *)H5MM_malloc(H5PL_EXPAND_BUFFER_SIZE)))             \
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for expanded path")                          \
-        if((bufCharCount = ExpandEnvironmentStringsA(dl_path, tempbuf, H5PL_EXPAND_BUFFER_SIZE)) > H5PL_EXPAND_BUFFER_SIZE) { \
-            tempbuf = (char *)H5MM_xfree(tempbuf);                                       \
-            HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "expanded path is too long")      \
-        }                                                                                \
-        if(bufCharCount == 0) {                                                          \
-            tempbuf = (char *)H5MM_xfree(tempbuf);                                       \
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "failed to expand path")          \
-        }                                                                                \
-        dl_path = (char *)H5MM_xfree(dl_path);                                           \
-        dl_path = tempbuf;                                                               \
- }
+#define H5PL_EXPAND_ENV_VAR                                                                                  \
+    {                                                                                                        \
+        long  bufCharCount;                                                                                  \
+        char *tempbuf;                                                                                       \
+        if (NULL == (tempbuf = (char *)H5MM_malloc(H5PL_EXPAND_BUFFER_SIZE)))                                \
+            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for expanded path")          \
+        if ((bufCharCount = ExpandEnvironmentStringsA(dl_path, tempbuf, H5PL_EXPAND_BUFFER_SIZE)) >          \
+            H5PL_EXPAND_BUFFER_SIZE) {                                                                       \
+            tempbuf = (char *)H5MM_xfree(tempbuf);                                                           \
+            HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "expanded path is too long")                          \
+        }                                                                                                    \
+        if (bufCharCount == 0) {                                                                             \
+            tempbuf = (char *)H5MM_xfree(tempbuf);                                                           \
+            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "failed to expand path")                              \
+        }                                                                                                    \
+        dl_path = (char *)H5MM_xfree(dl_path);                                                               \
+        dl_path = tempbuf;                                                                                   \
+    }
 #else
 #define H5PL_EXPAND_ENV_VAR
 #endif /* H5_HAVE_WIN32_API */
@@ -72,7 +72,7 @@
 
 #ifdef H5_HAVE_WIN32_API
 
-#define H5PL_PATH_SEPARATOR     ";"
+#define H5PL_PATH_SEPARATOR ";"
 
 /* Handle for dynamic library */
 #define H5PL_HANDLE HINSTANCE
@@ -81,7 +81,7 @@
 #define H5PL_OPEN_DLIB(S) LoadLibraryExA(S, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)
 
 /* Get the address of a symbol in dynamic library */
-#define H5PL_GET_LIB_FUNC(H,N) GetProcAddress(H,N)
+#define H5PL_GET_LIB_FUNC(H, N) GetProcAddress(H, N)
 
 /* Close dynamic library */
 #define H5PL_CLOSE_LIB(H) FreeLibrary(H)
@@ -100,28 +100,28 @@ typedef const void *(__cdecl *H5PL_get_plugin_info_t)(void);
 #define H5PL_PATH_SEPARATOR     ":"
 
 /* Handle for dynamic library */
-#define H5PL_HANDLE void *
+#define H5PL_HANDLE             void *
 
 /* Get a handle to a plugin library.  Windows: TEXT macro handles Unicode strings */
-#define H5PL_OPEN_DLIB(S) dlopen(S, RTLD_LAZY | RTLD_LOCAL)
+#define H5PL_OPEN_DLIB(S)       dlopen(S, RTLD_LAZY | RTLD_LOCAL)
 
 /* Get the address of a symbol in dynamic library */
-#define H5PL_GET_LIB_FUNC(H,N) dlsym(H,N)
+#define H5PL_GET_LIB_FUNC(H, N) dlsym(H, N)
 
 /* Close dynamic library */
-#define H5PL_CLOSE_LIB(H) dlclose(H)
+#define H5PL_CLOSE_LIB(H)       dlclose(H)
 
 /* Clear error */
-#define H5PL_CLR_ERROR HERROR(H5E_PLUGIN, H5E_CANTGET, "can't dlopen:%s", dlerror())
+#define H5PL_CLR_ERROR          HERROR(H5E_PLUGIN, H5E_CANTGET, "can't dlopen:%s", dlerror())
 
 typedef const void *(*H5PL_get_plugin_info_t)(void);
 #endif /* H5_HAVE_WIN32_API */
 
 /* Whether to preload pathnames for plugin libraries */
-#define H5PL_DEFAULT_PATH       H5_DEFAULT_PLUGINDIR
+#define H5PL_DEFAULT_PATH H5_DEFAULT_PLUGINDIR
 
 /* Special symbol to indicate no plugin loading */
-#define H5PL_NO_PLUGIN          "::"
+#define H5PL_NO_PLUGIN "::"
 
 /******************/
 /* Local Typedefs */
@@ -129,12 +129,11 @@ typedef const void *(*H5PL_get_plugin_info_t)(void);
 
 /* Type for the list of info for opened plugin libraries */
 typedef struct H5PL_table_t {
-    H5PL_type_t pl_type;            /* plugin type          */
-    int         pl_id;              /* ID for the plugin    */
-    H5PL_HANDLE handle;             /* plugin handle        */
+    H5PL_type_t pl_type; /* plugin type          */
+    int         pl_id;   /* ID for the plugin    */
+    H5PL_HANDLE handle;  /* plugin handle        */
 } H5PL_table_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -145,34 +144,30 @@ static htri_t H5PL__open(H5PL_type_t pl_type, char *libname, int plugin_id, cons
 static htri_t H5PL__search_table(H5PL_type_t plugin_type, int type_id, const void **info);
 static herr_t H5PL__close(H5PL_HANDLE handle);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Table for opened plugin libraries */
-static size_t           H5PL_table_alloc_g = 0;
-static size_t           H5PL_table_used_g = 0;
-static H5PL_table_t     *H5PL_table_g = NULL;
+static size_t        H5PL_table_alloc_g = 0;
+static size_t        H5PL_table_used_g  = 0;
+static H5PL_table_t *H5PL_table_g       = NULL;
 
 /* Table of location paths for plugin libraries */
-static char             *H5PL_path_table_g[H5PL_MAX_PATH_NUM];
-static size_t           H5PL_num_paths_g = 0;
-static hbool_t          H5PL_path_found_g = FALSE;
+static char *  H5PL_path_table_g[H5PL_MAX_PATH_NUM];
+static size_t  H5PL_num_paths_g  = 0;
+static hbool_t H5PL_path_found_g = FALSE;
 
 /* Enable all plugin libraries */
-static unsigned int     H5PL_plugin_g = H5PL_ALL_PLUGIN;
-
+static unsigned int H5PL_plugin_g = H5PL_ALL_PLUGIN;
 
 /*--------------------------------------------------------------------------
 NAME
@@ -188,23 +183,22 @@ DESCRIPTION
 static herr_t
 H5PL__init_interface(void)
 {
-    char        *preload_path;
+    char *preload_path;
 
     FUNC_ENTER_STATIC_NOERR
 
     /* Retrieve pathnames from HDF5_PLUGIN_PRELOAD if the user sets it
      * to tell the library to load plugin libraries without search.
      */
-    if(NULL != (preload_path = HDgetenv("HDF5_PLUGIN_PRELOAD"))) {
+    if (NULL != (preload_path = HDgetenv("HDF5_PLUGIN_PRELOAD"))) {
         /* Special symbal "::" means no plugin during data reading. */
-        if(!HDstrcmp(preload_path, H5PL_NO_PLUGIN))
+        if (!HDstrcmp(preload_path, H5PL_NO_PLUGIN))
             H5PL_plugin_g = 0;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5PL__init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLset_loading_state
  *
@@ -227,7 +221,7 @@ H5PL__init_interface(void)
 herr_t
 H5PLset_loading_state(unsigned int plugin_type)
 {
-    char *preload_path;
+    char * preload_path;
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
@@ -237,16 +231,15 @@ H5PLset_loading_state(unsigned int plugin_type)
     H5PL_plugin_g = plugin_type;
 
     /* check if special ENV variable is set and disable all plugin types */
-    if(NULL != (preload_path = HDgetenv("HDF5_PLUGIN_PRELOAD"))) {
+    if (NULL != (preload_path = HDgetenv("HDF5_PLUGIN_PRELOAD"))) {
         /* Special symbol "::" means no plugin during data reading. */
-        if(!HDstrcmp(preload_path, H5PL_NO_PLUGIN))
+        if (!HDstrcmp(preload_path, H5PL_NO_PLUGIN))
             H5PL_plugin_g = 0;
     }
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLset_loading_state() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLget_loading_state
  *
@@ -267,14 +260,13 @@ H5PLget_loading_state(unsigned int *plugin_type)
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "*Iu", plugin_type);
 
-    if(plugin_type)
+    if (plugin_type)
         *plugin_type = H5PL_plugin_g;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLget_loading_state() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5PL_term_interface
  *
@@ -295,36 +287,35 @@ done:
 int
 H5PL_term_interface(void)
 {
-    int  i = 0;
+    int i = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
-        size_t u;       /* Local index variable */
+    if (H5_interface_initialize_g) {
+        size_t u; /* Local index variable */
 
         /* Close opened dynamic libraries */
-        for(u = 0; u < H5PL_table_used_g; u++)
+        for (u = 0; u < H5PL_table_used_g; u++)
             H5PL__close((H5PL_table_g[u]).handle);
 
         /* Free the table of dynamic libraries */
-        H5PL_table_g = (H5PL_table_t *)H5MM_xfree(H5PL_table_g);
+        H5PL_table_g      = (H5PL_table_t *)H5MM_xfree(H5PL_table_g);
         H5PL_table_used_g = H5PL_table_alloc_g = 0;
 
         /* Free the table of search paths */
-        for(u = 0; u < H5PL_num_paths_g; u++)
-            if(H5PL_path_table_g[u])
+        for (u = 0; u < H5PL_num_paths_g; u++)
+            if (H5PL_path_table_g[u])
                 H5PL_path_table_g[u] = (char *)H5MM_xfree(H5PL_path_table_g[u]);
-        H5PL_num_paths_g = 0;
+        H5PL_num_paths_g  = 0;
         H5PL_path_found_g = FALSE;
 
         H5_interface_initialize_g = 0;
-        i = 1;
+        i                         = 1;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(i)
 } /* end H5PL_term_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5PL_load
  *
@@ -342,60 +333,61 @@ H5PL_term_interface(void)
 const void *
 H5PL_load(H5PL_type_t type, int id)
 {
-    htri_t      found;               /* Whether the plugin was found */
-    const void  *plugin_info = NULL;
-    const void  *ret_value = NULL;
+    htri_t      found; /* Whether the plugin was found */
+    const void *plugin_info = NULL;
+    const void *ret_value   = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
-    switch(type) {
+    switch (type) {
         case H5PL_TYPE_FILTER:
-            if((H5PL_plugin_g & H5PL_FILTER_PLUGIN) == 0)
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTLOAD, NULL, "required dynamically loaded plugin filter '%d' is not available", id)
+            if ((H5PL_plugin_g & H5PL_FILTER_PLUGIN) == 0)
+                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTLOAD, NULL,
+                            "required dynamically loaded plugin filter '%d' is not available", id)
             break;
 
         case H5PL_TYPE_ERROR:
         case H5PL_TYPE_NONE:
         default:
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTLOAD, NULL, "required dynamically loaded plugin '%d' is not valid", id)
+            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTLOAD, NULL,
+                        "required dynamically loaded plugin '%d' is not valid", id)
     } /* end switch */
 
     /* Initialize the location paths for dynamic libraries, if they aren't
      * already set up.
      */
-    if(FALSE == H5PL_path_found_g)
-        if(H5PL__init_path_table() < 0)
+    if (FALSE == H5PL_path_found_g)
+        if (H5PL__init_path_table() < 0)
             HGOTO_ERROR(H5E_PLUGIN, H5E_CANTINIT, NULL, "can't initialize search path table")
 
     /* Search in the table of already loaded plugin libraries */
-    if((found = H5PL__search_table(type, id, &plugin_info)) < 0)
+    if ((found = H5PL__search_table(type, id, &plugin_info)) < 0)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, NULL, "search in table failed")
 
     /* If not found, iterate through the path table to find the right dynamic library */
-    if(!found) {
-        size_t       i;                   /* Local index variable */
+    if (!found) {
+        size_t i; /* Local index variable */
 
-        for(i = 0; i < H5PL_num_paths_g; i++) {
-            if((found = H5PL__find(type, id, H5PL_path_table_g[i], &plugin_info)) < 0)
+        for (i = 0; i < H5PL_num_paths_g; i++) {
+            if ((found = H5PL__find(type, id, H5PL_path_table_g[i], &plugin_info)) < 0)
                 HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, NULL, "search in paths failed")
 
             /* Break out if found */
-            if(found) {
+            if (found) {
                 HDassert(plugin_info);
                 break;
             } /* end if */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
 
     /* Check if we found the plugin */
-    if(found)
+    if (found)
         ret_value = plugin_info;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5PL_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLappend
  *
@@ -409,15 +401,15 @@ herr_t
 H5PLappend(const char *plugin_path)
 {
     herr_t ret_value = SUCCEED; /* Return value */
-    char        *dl_path = NULL;
+    char * dl_path   = NULL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "*s", plugin_path);
-    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
+    if (H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
-    if(NULL == plugin_path)
+    if (NULL == plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
+    if (NULL == (dl_path = H5MM_strdup(plugin_path)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
@@ -429,7 +421,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLappend() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLprepend
  *
@@ -442,17 +433,17 @@ done:
 herr_t
 H5PLprepend(const char *plugin_path)
 {
-    herr_t ret_value = SUCCEED; /* Return value */
-    char        *dl_path = NULL;
+    herr_t       ret_value = SUCCEED; /* Return value */
+    char *       dl_path   = NULL;
     unsigned int plindex;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "*s", plugin_path);
-    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
+    if (H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
-    if(NULL == plugin_path)
+    if (NULL == plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
+    if (NULL == (dl_path = H5MM_strdup(plugin_path)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
@@ -466,7 +457,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLprepend() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLreplace
  *
@@ -480,20 +470,20 @@ herr_t
 H5PLreplace(const char *plugin_path, unsigned int index)
 {
     herr_t ret_value = SUCCEED; /* Return value */
-    char        *dl_path = NULL;
+    char * dl_path   = NULL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "*sIu", plugin_path, index);
-    if(NULL == plugin_path)
+    if (NULL == plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    if(index >= H5PL_MAX_PATH_NUM)
+    if (index >= H5PL_MAX_PATH_NUM)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
-    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
+    if (NULL == (dl_path = H5MM_strdup(plugin_path)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
 
-    if(H5PL_path_table_g[index])
+    if (H5PL_path_table_g[index])
         H5PL_path_table_g[index] = (char *)H5MM_xfree(H5PL_path_table_g[index]);
     H5PL_path_table_g[index] = dl_path;
 
@@ -501,7 +491,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLreplace() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLinsert
  *
@@ -514,24 +503,24 @@ done:
 herr_t
 H5PLinsert(const char *plugin_path, unsigned int index)
 {
-    herr_t ret_value = SUCCEED; /* Return value */
-    char        *dl_path = NULL;
+    herr_t       ret_value = SUCCEED; /* Return value */
+    char *       dl_path   = NULL;
     unsigned int plindex;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "*sIu", plugin_path, index);
-    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
+    if (H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
-    if(NULL == plugin_path)
+    if (NULL == plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    if(index >= H5PL_MAX_PATH_NUM)
+    if (index >= H5PL_MAX_PATH_NUM)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
-    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
+    if (NULL == (dl_path = H5MM_strdup(plugin_path)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
 
-    for(plindex = (unsigned int)H5PL_num_paths_g; plindex > index; plindex--)
+    for (plindex = (unsigned int)H5PL_num_paths_g; plindex > index; plindex--)
         H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex - 1];
     H5PL_path_table_g[index] = dl_path;
     H5PL_num_paths_g++;
@@ -540,7 +529,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLinsert() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLremove
  *
@@ -553,21 +541,21 @@ done:
 herr_t
 H5PLremove(unsigned int index)
 {
-    herr_t ret_value = SUCCEED; /* Return value */
+    herr_t       ret_value = SUCCEED; /* Return value */
     unsigned int plindex;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "Iu", index);
-    if(H5PL_num_paths_g == 0)
+    if (H5PL_num_paths_g == 0)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
-    if(index >= H5PL_MAX_PATH_NUM)
+    if (index >= H5PL_MAX_PATH_NUM)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
-    if(NULL == H5PL_path_table_g[index])
+    if (NULL == H5PL_path_table_g[index])
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no directory path at index")
     H5PL_path_table_g[index] = (char *)H5MM_xfree(H5PL_path_table_g[index]);
 
     H5PL_num_paths_g--;
-    for(plindex = index; plindex < (unsigned int)H5PL_num_paths_g; plindex++)
+    for (plindex = index; plindex < (unsigned int)H5PL_num_paths_g; plindex++)
         H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex + 1];
     H5PL_path_table_g[H5PL_num_paths_g] = NULL;
 
@@ -575,7 +563,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLremove() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLget
  *
@@ -595,24 +582,24 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5PLget(unsigned int index, char *pathname/*out*/, size_t size)
+H5PLget(unsigned int index, char *pathname /*out*/, size_t size)
 {
-    ssize_t      ret_value = 0;    /* Return value */
-    size_t       len = 0;          /* Length of pathname */
-    char        *dl_path = NULL;
+    ssize_t ret_value = 0; /* Return value */
+    size_t  len       = 0; /* Length of pathname */
+    char *  dl_path   = NULL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "Iuxz", index, pathname, size);
-    if(H5PL_num_paths_g == 0)
+    if (H5PL_num_paths_g == 0)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
-    if(index >= H5PL_MAX_PATH_NUM)
+    if (index >= H5PL_MAX_PATH_NUM)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
-    if(NULL == (dl_path = H5PL_path_table_g[index]))
+    if (NULL == (dl_path = H5PL_path_table_g[index]))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no directory path at index")
     len = HDstrlen(dl_path);
-    if(pathname) {
+    if (pathname) {
         HDstrncpy(pathname, dl_path, MIN((size_t)(len + 1), size));
-        if((size_t)len >= size)
+        if ((size_t)len >= size)
             pathname[size - 1] = '\0';
     } /* end if */
 
@@ -623,7 +610,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLget() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PLsize
  *
@@ -647,7 +633,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLsize() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5PL__init_path_table
  *
@@ -663,10 +648,10 @@ done:
 static herr_t
 H5PL__init_path_table(void)
 {
-    char        *dl_path = NULL;
-    char        *origin_dl_path;
-    char        *dir;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    char * dl_path = NULL;
+    char * origin_dl_path;
+    char * dir;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -674,22 +659,22 @@ H5PL__init_path_table(void)
      * or from the default paths if it isn't set.
      */
     origin_dl_path = HDgetenv("HDF5_PLUGIN_PATH");
-    if(NULL == origin_dl_path)
+    if (NULL == origin_dl_path)
         dl_path = H5MM_strdup(H5PL_DEFAULT_PATH);
     else
         dl_path = H5MM_strdup(origin_dl_path);
-    if(NULL == dl_path)
+    if (NULL == dl_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
 
     /* Put paths in the path table.  They are separated by ":" */
     dir = HDstrtok(dl_path, H5PL_PATH_SEPARATOR);
-    while(dir) {
+    while (dir) {
         /* Check for too many directories in path */
-        if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
+        if (H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
             HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
-        if(NULL == (H5PL_path_table_g[H5PL_num_paths_g] = H5MM_strdup(dir)))
+        if (NULL == (H5PL_path_table_g[H5PL_num_paths_g] = H5MM_strdup(dir)))
             HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
         H5PL_num_paths_g++;
         dir = HDstrtok(NULL, H5PL_PATH_SEPARATOR);
@@ -698,13 +683,12 @@ H5PL__init_path_table(void)
     H5PL_path_found_g = TRUE;
 
 done:
-    if(dl_path)
+    if (dl_path)
         dl_path = (char *)H5MM_xfree(dl_path);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5PL__init_path_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5PL__find
  *
@@ -726,119 +710,117 @@ done:
 static htri_t
 H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info)
 {
-    char           *pathname = NULL;
-    DIR            *dirp = NULL;
-    struct dirent  *dp;
+    char *         pathname = NULL;
+    DIR *          dirp     = NULL;
+    struct dirent *dp;
     htri_t         ret_value = FALSE;
 
     FUNC_ENTER_STATIC
 
     /* Open the directory */
-    if(!(dirp = HDopendir(dir)))
+    if (!(dirp = HDopendir(dir)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_OPENERROR, FAIL, "can't open directory: %s", dir)
 
     /* Iterates through all entries in the directory to find the right plugin library */
-    while(NULL != (dp = HDreaddir(dirp))) {
+    while (NULL != (dp = HDreaddir(dirp))) {
         /* The library we are looking for should be called libxxx.so... on Unix
          * or libxxx.xxx.dylib on Mac.
          */
 #ifndef __CYGWIN__
-        if(!HDstrncmp(dp->d_name, "lib", (size_t)3) &&
-                (HDstrstr(dp->d_name, ".so") || HDstrstr(dp->d_name, ".dylib"))) {
+        if (!HDstrncmp(dp->d_name, "lib", (size_t)3) &&
+            (HDstrstr(dp->d_name, ".so") || HDstrstr(dp->d_name, ".dylib"))) {
 #else
-        if(!HDstrncmp(dp->d_name, "cyg", (size_t)3) &&
-                HDstrstr(dp->d_name, ".dll") ) {
+        if (!HDstrncmp(dp->d_name, "cyg", (size_t)3) && HDstrstr(dp->d_name, ".dll")) {
 
 #endif
-            h5_stat_t   my_stat;
-            size_t      pathname_len;
-            htri_t      found_in_dir;
+            h5_stat_t my_stat;
+            size_t    pathname_len;
+            htri_t    found_in_dir;
 
             /* Allocate & initialize the path name */
             pathname_len = HDstrlen(dir) + HDstrlen(dp->d_name) + 2;
-            if(NULL == (pathname = (char *)H5MM_malloc(pathname_len)))
+            if (NULL == (pathname = (char *)H5MM_malloc(pathname_len)))
                 HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
             HDsnprintf(pathname, pathname_len, "%s/%s", dir, dp->d_name);
 
             /* Get info for directory entry */
-            if(HDstat(pathname, &my_stat) == -1)
+            if (HDstat(pathname, &my_stat) == -1)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't stat file: %s", HDstrerror(errno))
 
             /* If it is a directory, skip it */
-            if(S_ISDIR(my_stat.st_mode))
+            if (S_ISDIR(my_stat.st_mode))
                 continue;
 
             /* Attempt to open the dynamic library as a filter library */
-            if((found_in_dir = H5PL__open(plugin_type, pathname, type_id, info)) < 0)
+            if ((found_in_dir = H5PL__open(plugin_type, pathname, type_id, info)) < 0)
                 HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "search in directory failed")
-            if(found_in_dir)
-                HGOTO_DONE(TRUE)    /* Indicate success */
+            if (found_in_dir)
+                HGOTO_DONE(TRUE) /* Indicate success */
             pathname = (char *)H5MM_xfree(pathname);
         } /* end if */
-    } /* end while */
+    }     /* end while */
 
 done:
-    if(dirp)
-        if(HDclosedir(dirp) < 0)
+    if (dirp)
+        if (HDclosedir(dirp) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CLOSEERROR, FAIL, "can't close directory: %s", HDstrerror(errno))
     pathname = (char *)H5MM_xfree(pathname);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5PL__find() */
-#else /* H5_HAVE_WIN32_API */
+#else  /* H5_HAVE_WIN32_API */
 static htri_t
 H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info)
 {
-    WIN32_FIND_DATAA    fdFile;
-    HANDLE              hFind;
-    char                *pathname = NULL;
-    char                service[2048];
-    htri_t              ret_value = FALSE;
+    WIN32_FIND_DATAA fdFile;
+    HANDLE           hFind;
+    char *           pathname = NULL;
+    char             service[2048];
+    htri_t           ret_value = FALSE;
 
     FUNC_ENTER_STATIC
 
     /* Specify a file mask. *.* = We want everything! */
     sprintf(service, "%s\\*.dll", dir);
-    if((hFind = FindFirstFileA(service, &fdFile)) == INVALID_HANDLE_VALUE)
+    if ((hFind = FindFirstFileA(service, &fdFile)) == INVALID_HANDLE_VALUE)
         HGOTO_ERROR(H5E_PLUGIN, H5E_OPENERROR, FAIL, "can't open directory")
 
     do {
         /* Find first file will always return "."
          * and ".." as the first two directories.
          */
-        if(HDstrcmp(fdFile.cFileName, ".") != 0 && HDstrcmp(fdFile.cFileName, "..") != 0) {
-            size_t      pathname_len;
-            htri_t      found_in_dir;
+        if (HDstrcmp(fdFile.cFileName, ".") != 0 && HDstrcmp(fdFile.cFileName, "..") != 0) {
+            size_t pathname_len;
+            htri_t found_in_dir;
 
             /* Allocate & initialize the path name */
             pathname_len = HDstrlen(dir) + HDstrlen(fdFile.cFileName) + 2;
-            if(NULL == (pathname = (char *)H5MM_malloc(pathname_len)))
+            if (NULL == (pathname = (char *)H5MM_malloc(pathname_len)))
                 HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
             HDsnprintf(pathname, pathname_len, "%s\\%s", dir, fdFile.cFileName);
 
             /* Is the entity a File or Folder? */
-            if(fdFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+            if (fdFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
                 continue;
 
-            if((found_in_dir = H5PL__open(plugin_type, pathname, type_id, info)) < 0)
+            if ((found_in_dir = H5PL__open(plugin_type, pathname, type_id, info)) < 0)
                 HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "search in directory failed")
-            if(found_in_dir)
-                HGOTO_DONE(TRUE)    /* Indicate success */
+            if (found_in_dir)
+                HGOTO_DONE(TRUE) /* Indicate success */
             pathname = (char *)H5MM_xfree(pathname);
-        } /* end if */
-    } while(FindNextFileA(hFind, &fdFile)); /* Find the next file. */
+        }                                    /* end if */
+    } while (FindNextFileA(hFind, &fdFile)); /* Find the next file. */
 
 done:
-    if(hFind)
+    if (hFind)
         FindClose(hFind);
-    if(pathname)
+    if (pathname)
         pathname = (char *)H5MM_xfree(pathname);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5PL__find() */
 #endif /* H5_HAVE_WIN32_API */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5PL__open
  *
@@ -868,25 +850,26 @@ H5_GCC_DIAG_OFF("pedantic")
 static htri_t
 H5PL__open(H5PL_type_t pl_type, char *libname, int pl_id, const void **pl_info)
 {
-    H5PL_HANDLE    handle = NULL;
-    htri_t         ret_value = FALSE;
+    H5PL_HANDLE handle    = NULL;
+    htri_t      ret_value = FALSE;
 
     FUNC_ENTER_STATIC
 
     /* There are different reasons why a library can't be open, e.g. wrong architecture.
      * simply continue if we can't open it.
      */
-    if(NULL == (handle = H5PL_OPEN_DLIB(libname))) {
+    if (NULL == (handle = H5PL_OPEN_DLIB(libname))) {
         H5PL_CLR_ERROR; /* clear error */
-    } /* end if */
+    }                   /* end if */
     else {
         H5PL_get_plugin_info_t get_plugin_info = NULL;
 
         /* Return a handle for the function H5PLget_plugin_info in the dynamic library.
          * The plugin library is suppose to define this function.
          */
-        if(NULL == (get_plugin_info = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC(handle, "H5PLget_plugin_info"))) {
-            if(H5PL__close(handle) < 0)
+        if (NULL ==
+            (get_plugin_info = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC(handle, "H5PLget_plugin_info"))) {
+            if (H5PL__close(handle) < 0)
                 HGOTO_ERROR(H5E_PLUGIN, H5E_CLOSEERROR, FAIL, "can't close dynamic library")
         } /* end if */
         else {
@@ -895,29 +878,31 @@ H5PL__open(H5PL_type_t pl_type, char *libname, int pl_id, const void **pl_info)
             /* Invoke H5PLget_plugin_info to verify this is the right library we are looking for.
              * Move on if it isn't.
              */
-            if(NULL == (plugin_info = (const H5Z_class2_t *)(*get_plugin_info)())) {
-                if(H5PL__close(handle) < 0)
+            if (NULL == (plugin_info = (const H5Z_class2_t *)(*get_plugin_info)())) {
+                if (H5PL__close(handle) < 0)
                     HGOTO_ERROR(H5E_PLUGIN, H5E_CLOSEERROR, FAIL, "can't close dynamic library")
                 HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "can't get plugin info")
             } /* end if */
 
             /* Successfully found plugin library, check if it's the right one */
-            if(plugin_info->id == pl_id) {
+            if (plugin_info->id == pl_id) {
                 /* Expand the table if it is too small */
-                if(H5PL_table_used_g >= H5PL_table_alloc_g) {
-                    size_t n = MAX(H5Z_MAX_NFILTERS, 2 * H5PL_table_alloc_g);
-                    H5PL_table_t *table = (H5PL_table_t *)H5MM_realloc(H5PL_table_g, n * sizeof(H5PL_table_t));
+                if (H5PL_table_used_g >= H5PL_table_alloc_g) {
+                    size_t        n = MAX(H5Z_MAX_NFILTERS, 2 * H5PL_table_alloc_g);
+                    H5PL_table_t *table =
+                        (H5PL_table_t *)H5MM_realloc(H5PL_table_g, n * sizeof(H5PL_table_t));
 
-                    if(!table)
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "unable to extend dynamic library table")
+                    if (!table)
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL,
+                                    "unable to extend dynamic library table")
 
-                    H5PL_table_g = table;
+                    H5PL_table_g       = table;
                     H5PL_table_alloc_g = n;
                 } /* end if */
 
-                (H5PL_table_g[H5PL_table_used_g]).handle = handle;
+                (H5PL_table_g[H5PL_table_used_g]).handle  = handle;
                 (H5PL_table_g[H5PL_table_used_g]).pl_type = pl_type;
-                (H5PL_table_g[H5PL_table_used_g]).pl_id = plugin_info->id;
+                (H5PL_table_g[H5PL_table_used_g]).pl_id   = plugin_info->id;
                 H5PL_table_used_g++;
 
                 /* Set the plugin info to return */
@@ -926,17 +911,15 @@ H5PL__open(H5PL_type_t pl_type, char *libname, int pl_id, const void **pl_info)
                 /* Indicate success */
                 ret_value = TRUE;
             } /* end if */
-            else
-                if(H5PL__close(handle) < 0)
-                    HGOTO_ERROR(H5E_PLUGIN, H5E_CLOSEERROR, FAIL, "can't close dynamic library")
+            else if (H5PL__close(handle) < 0)
+                HGOTO_ERROR(H5E_PLUGIN, H5E_CLOSEERROR, FAIL, "can't close dynamic library")
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5PL__open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5PL__search_table
  *
@@ -955,37 +938,37 @@ done:
 static htri_t
 H5PL__search_table(H5PL_type_t plugin_type, int type_id, const void **info)
 {
-    htri_t         ret_value = FALSE;
+    htri_t ret_value = FALSE;
 
     FUNC_ENTER_STATIC
 
     /* Search in the table of already opened dynamic libraries */
-    if(H5PL_table_used_g > 0) {
-        size_t         i;
+    if (H5PL_table_used_g > 0) {
+        size_t i;
 
-        for(i = 0; i < H5PL_table_used_g; i++) {
-            if((plugin_type == (H5PL_table_g[i]).pl_type) && (type_id == (H5PL_table_g[i]).pl_id)) {
+        for (i = 0; i < H5PL_table_used_g; i++) {
+            if ((plugin_type == (H5PL_table_g[i]).pl_type) && (type_id == (H5PL_table_g[i]).pl_id)) {
                 H5PL_get_plugin_info_t get_plugin_info;
-                const H5Z_class2_t   *plugin_info;
+                const H5Z_class2_t *   plugin_info;
 
-                if(NULL == (get_plugin_info = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC((H5PL_table_g[i]).handle, "H5PLget_plugin_info")))
+                if (NULL == (get_plugin_info = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC(
+                                 (H5PL_table_g[i]).handle, "H5PLget_plugin_info")))
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get function for H5PLget_plugin_info")
 
-                if(NULL == (plugin_info = (const H5Z_class2_t *)(*get_plugin_info)()))
+                if (NULL == (plugin_info = (const H5Z_class2_t *)(*get_plugin_info)()))
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get plugin info")
 
                 *info = plugin_info;
                 HGOTO_DONE(TRUE)
             } /* end if */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5PL__search_table() */
 H5_GCC_DIAG_ON("pedantic")
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5PL__close
  *
diff --git a/src/H5PLextern.h b/src/H5PLextern.h
index 7547ad7..e00721f 100644
--- a/src/H5PLextern.h
+++ b/src/H5PLextern.h
@@ -21,12 +21,12 @@
 #include "hdf5.h"
 
 /* plugins always export */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-  #define H5PLUGIN_DLL __declspec(dllexport)
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-  #define H5PLUGIN_DLL __attribute__ ((visibility("default")))
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5PLUGIN_DLL __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5PLUGIN_DLL __attribute__((visibility("default")))
 #else
-  #define H5PLUGIN_DLL
+#define H5PLUGIN_DLL
 #endif
 
 #ifdef __cplusplus
@@ -41,4 +41,3 @@ H5PLUGIN_DLL const void *H5PLget_plugin_info(void);
 #endif
 
 #endif /* _H5PLextern_H */
-
diff --git a/src/H5PLpkg.h b/src/H5PLpkg.h
index b52a52f..e171b7e 100644
--- a/src/H5PLpkg.h
+++ b/src/H5PLpkg.h
@@ -19,7 +19,7 @@
 #define _H5PLpkg_H
 
 /* Include private header file */
-#include "H5PLprivate.h"          /* Filter functions                */
+#include "H5PLprivate.h" /* Filter functions                */
 
 /* Other private headers needed by this file */
 
@@ -27,22 +27,18 @@
 /* Package Private Macros */
 /**************************/
 
-#define H5PL_MAX_PATH_NUM       16
-
+#define H5PL_MAX_PATH_NUM 16
 
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 
 #endif /* _H5PLpkg_H */
-
diff --git a/src/H5PLprivate.h b/src/H5PLprivate.h
index 0ab8f8c..59516d9 100644
--- a/src/H5PLprivate.h
+++ b/src/H5PLprivate.h
@@ -21,24 +21,20 @@
 #include "H5PLpublic.h"
 
 /* Private headers needed by this file */
-#include "H5private.h"          /* Generic Functions                    */
-
+#include "H5private.h" /* Generic Functions                    */
 
 /**************************/
 /* Library Private Macros */
 /**************************/
 
-
 /****************************/
 /* Library Private Typedefs */
 /****************************/
 
-
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
@@ -47,4 +43,3 @@
 H5_DLL const void *H5PL_load(H5PL_type_t plugin_type, int type_id);
 
 #endif /* _H5PLprivate_H */
-
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index 9ce1fca..ded2362 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -18,7 +18,7 @@
 #define _H5PLpublic_H
 
 /* Public headers needed by this file */
-#include "H5public.h"          /* Generic Functions                    */
+#include "H5public.h" /* Generic Functions                    */
 
 /*******************/
 /* Public Typedefs */
@@ -26,33 +26,32 @@
 
 /* Plugin type used by the plugin library */
 typedef enum H5PL_type_t {
-    H5PL_TYPE_ERROR        = -1,  /*error                    */
-    H5PL_TYPE_FILTER       = 0,   /*filter                   */
-    H5PL_TYPE_NONE         = 1    /*this must be last!       */
+    H5PL_TYPE_ERROR  = -1, /*error                    */
+    H5PL_TYPE_FILTER = 0,  /*filter                   */
+    H5PL_TYPE_NONE   = 1   /*this must be last!       */
 } H5PL_type_t;
 
 /* Common dynamic plugin type flags used by the set/get_loading_state functions */
 #define H5PL_FILTER_PLUGIN 0x0001
-#define H5PL_ALL_PLUGIN 0xFFFF
+#define H5PL_ALL_PLUGIN    0xFFFF
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* plugin state */
-H5_DLL herr_t H5PLset_loading_state(unsigned int plugin_type);
-H5_DLL herr_t H5PLget_loading_state(unsigned int *plugin_type/*out*/);
-H5_DLL herr_t H5PLappend(const char *plugin_path);
-H5_DLL herr_t H5PLprepend(const char *plugin_path);
-H5_DLL herr_t H5PLreplace(const char *plugin_path, unsigned int index);
-H5_DLL herr_t H5PLinsert(const char *plugin_path, unsigned int index);
-H5_DLL herr_t H5PLremove(unsigned int index);
-H5_DLL ssize_t H5PLget(unsigned int index, char *pathname/*out*/, size_t size);
-H5_DLL herr_t H5PLsize(unsigned int *listsize/*out*/);
+H5_DLL herr_t  H5PLset_loading_state(unsigned int plugin_type);
+H5_DLL herr_t  H5PLget_loading_state(unsigned int *plugin_type /*out*/);
+H5_DLL herr_t  H5PLappend(const char *plugin_path);
+H5_DLL herr_t  H5PLprepend(const char *plugin_path);
+H5_DLL herr_t  H5PLreplace(const char *plugin_path, unsigned int index);
+H5_DLL herr_t  H5PLinsert(const char *plugin_path, unsigned int index);
+H5_DLL herr_t  H5PLremove(unsigned int index);
+H5_DLL ssize_t H5PLget(unsigned int index, char *pathname /*out*/, size_t size);
+H5_DLL herr_t  H5PLsize(unsigned int *listsize /*out*/);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* _H5PLpublic_H */
-
diff --git a/src/H5Pacpl.c b/src/H5Pacpl.c
index 64b6608..2c94a70 100644
--- a/src/H5Pacpl.c
+++ b/src/H5Pacpl.c
@@ -25,62 +25,54 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* Attribute creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_ACRT[1] = {{
-    "attribute create",		/* Class name for debugging     */
-    H5P_TYPE_ATTRIBUTE_CREATE,  /* Class type                   */
+    "attribute create",        /* Class name for debugging     */
+    H5P_TYPE_ATTRIBUTE_CREATE, /* Class type                   */
 
-    &H5P_CLS_STRING_CREATE_g,	/* Parent class                 */
-    &H5P_CLS_ATTRIBUTE_CREATE_g, /* Pointer to class            */
+    &H5P_CLS_STRING_CREATE_g,       /* Parent class                 */
+    &H5P_CLS_ATTRIBUTE_CREATE_g,    /* Pointer to class            */
     &H5P_CLS_ATTRIBUTE_CREATE_ID_g, /* Pointer to class ID          */
     &H5P_LST_ATTRIBUTE_CREATE_ID_g, /* Pointer to default property list ID */
-    NULL,			/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    NULL,                           /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
-
-
diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c
index e167d82..72afaad 100644
--- a/src/H5Pdapl.c
+++ b/src/H5Pdapl.c
@@ -25,20 +25,18 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions */
-#include "H5Dprivate.h"		/* Datasets */
-#include "H5Eprivate.h"		/* Error handling */
-#include "H5Fprivate.h"		/* Files */
-#include "H5Iprivate.h"		/* IDs */
-#include "H5Ppkg.h"         /* Property lists */
-#include "H5MMprivate.h"	/* Memory management */
-
+#include "H5private.h"   /* Generic Functions */
+#include "H5Dprivate.h"  /* Datasets */
+#include "H5Eprivate.h"  /* Error handling */
+#include "H5Fprivate.h"  /* Files */
+#include "H5Iprivate.h"  /* IDs */
+#include "H5Ppkg.h"      /* Property lists */
+#include "H5MMprivate.h" /* Memory management */
 
 /****************/
 /* Local Macros */
@@ -46,35 +44,32 @@
 
 /* ========= Dataset Access properties ============ */
 /* Definitions for size of raw data chunk cache(slots) */
-#define H5D_ACS_DATA_CACHE_NUM_SLOTS_SIZE       sizeof(size_t)
-#define H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF        H5D_CHUNK_CACHE_NSLOTS_DEFAULT
+#define H5D_ACS_DATA_CACHE_NUM_SLOTS_SIZE sizeof(size_t)
+#define H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF  H5D_CHUNK_CACHE_NSLOTS_DEFAULT
 /* Definition for size of raw data chunk cache(bytes) */
-#define H5D_ACS_DATA_CACHE_BYTE_SIZE_SIZE       sizeof(size_t)
-#define H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF        H5D_CHUNK_CACHE_NBYTES_DEFAULT
+#define H5D_ACS_DATA_CACHE_BYTE_SIZE_SIZE sizeof(size_t)
+#define H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF  H5D_CHUNK_CACHE_NBYTES_DEFAULT
 /* Definition for preemption read chunks first */
-#define H5D_ACS_PREEMPT_READ_CHUNKS_SIZE        sizeof(double)
-#define H5D_ACS_PREEMPT_READ_CHUNKS_DEF         H5D_CHUNK_CACHE_W0_DEFAULT
+#define H5D_ACS_PREEMPT_READ_CHUNKS_SIZE sizeof(double)
+#define H5D_ACS_PREEMPT_READ_CHUNKS_DEF  H5D_CHUNK_CACHE_W0_DEFAULT
 /* Definitions for external file prefix */
-#define H5D_ACS_EFILE_PREFIX_SIZE               sizeof(char *)
-#define H5D_ACS_EFILE_PREFIX_DEF                NULL /*default is no prefix */
-#define H5D_ACS_EFILE_PREFIX_SET                H5P__dapl_efile_pref_set
-#define H5D_ACS_EFILE_PREFIX_GET                H5P__dapl_efile_pref_get
-#define H5D_ACS_EFILE_PREFIX_DEL                H5P__dapl_efile_pref_del
-#define H5D_ACS_EFILE_PREFIX_COPY               H5P__dapl_efile_pref_copy
-#define H5D_ACS_EFILE_PREFIX_CMP                H5P__dapl_efile_pref_cmp
-#define H5D_ACS_EFILE_PREFIX_CLOSE              H5P__dapl_efile_pref_close
-
+#define H5D_ACS_EFILE_PREFIX_SIZE  sizeof(char *)
+#define H5D_ACS_EFILE_PREFIX_DEF   NULL /*default is no prefix */
+#define H5D_ACS_EFILE_PREFIX_SET   H5P__dapl_efile_pref_set
+#define H5D_ACS_EFILE_PREFIX_GET   H5P__dapl_efile_pref_get
+#define H5D_ACS_EFILE_PREFIX_DEL   H5P__dapl_efile_pref_del
+#define H5D_ACS_EFILE_PREFIX_COPY  H5P__dapl_efile_pref_copy
+#define H5D_ACS_EFILE_PREFIX_CMP   H5P__dapl_efile_pref_cmp
+#define H5D_ACS_EFILE_PREFIX_CLOSE H5P__dapl_efile_pref_close
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -83,13 +78,12 @@
 static herr_t H5P__dacc_reg_prop(H5P_genclass_t *pclass);
 
 /* Property list callbacks */
-static herr_t H5P__dapl_efile_pref_set(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P__dapl_efile_pref_get(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P__dapl_efile_pref_del(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P__dapl_efile_pref_copy(const char* name, size_t size, void* value);
-static int H5P__dapl_efile_pref_cmp(const void *value1, const void *value2, size_t size);
-static herr_t H5P__dapl_efile_pref_close(const char* name, size_t size, void* value);
-
+static herr_t H5P__dapl_efile_pref_set(hid_t prop_id, const char *name, size_t size, void *value);
+static herr_t H5P__dapl_efile_pref_get(hid_t prop_id, const char *name, size_t size, void *value);
+static herr_t H5P__dapl_efile_pref_del(hid_t prop_id, const char *name, size_t size, void *value);
+static herr_t H5P__dapl_efile_pref_copy(const char *name, size_t size, void *value);
+static int    H5P__dapl_efile_pref_cmp(const void *value1, const void *value2, size_t size);
+static herr_t H5P__dapl_efile_pref_close(const char *name, size_t size, void *value);
 
 /*********************/
 /* Package Variables */
@@ -97,38 +91,35 @@ static herr_t H5P__dapl_efile_pref_close(const char* name, size_t size, void* va
 
 /* Dataset access property list class library initialization object */
 const H5P_libclass_t H5P_CLS_DACC[1] = {{
-    "dataset access",		/* Class name for debugging     */
-    H5P_TYPE_DATASET_ACCESS,    /* Class type                   */
-
-    &H5P_CLS_LINK_ACCESS_g,	/* Parent class                 */
-    &H5P_CLS_DATASET_ACCESS_g,	/* Pointer to class             */
-    &H5P_CLS_DATASET_ACCESS_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_DATASET_ACCESS_ID_g,	/* Pointer to default property list ID */
-    H5P__dacc_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,		        /* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,		        /* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "dataset access",        /* Class name for debugging     */
+    H5P_TYPE_DATASET_ACCESS, /* Class type                   */
+
+    &H5P_CLS_LINK_ACCESS_g,       /* Parent class                 */
+    &H5P_CLS_DATASET_ACCESS_g,    /* Pointer to class             */
+    &H5P_CLS_DATASET_ACCESS_ID_g, /* Pointer to class ID          */
+    &H5P_LST_DATASET_ACCESS_ID_g, /* Pointer to default property list ID */
+    H5P__dacc_reg_prop,           /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Property value defaults */
-static const char *H5D_def_efile_prefix_g = H5D_ACS_EFILE_PREFIX_DEF; /* Default external file prefix string */
-
+static const char *H5D_def_efile_prefix_g =
+    H5D_ACS_EFILE_PREFIX_DEF; /* Default external file prefix string */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__dacc_reg_prop
  *
@@ -144,36 +135,39 @@ static const char *H5D_def_efile_prefix_g = H5D_ACS_EFILE_PREFIX_DEF; /* Default
 static herr_t
 H5P__dacc_reg_prop(H5P_genclass_t *pclass)
 {
-    size_t rdcc_nslots = H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF;      /* Default raw data chunk cache # of slots */
-    size_t rdcc_nbytes = H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF;      /* Default raw data chunk cache # of bytes */
-    double rdcc_w0 = H5D_ACS_PREEMPT_READ_CHUNKS_DEF;           /* Default raw data chunk cache dirty ratio */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t rdcc_nslots = H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF; /* Default raw data chunk cache # of slots */
+    size_t rdcc_nbytes = H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF; /* Default raw data chunk cache # of bytes */
+    double rdcc_w0     = H5D_ACS_PREEMPT_READ_CHUNKS_DEF;  /* Default raw data chunk cache dirty ratio */
+    herr_t ret_value   = SUCCEED;                          /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register the size of raw data chunk cache (elements) */
-    if(H5P_register_real(pclass, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, H5D_ACS_DATA_CACHE_NUM_SLOTS_SIZE, &rdcc_nslots, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, H5D_ACS_DATA_CACHE_NUM_SLOTS_SIZE,
+                          &rdcc_nslots, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the size of raw data chunk cache(bytes) */
-    if(H5P_register_real(pclass, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, H5D_ACS_DATA_CACHE_BYTE_SIZE_SIZE, &rdcc_nbytes, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, H5D_ACS_DATA_CACHE_BYTE_SIZE_SIZE,
+                          &rdcc_nbytes, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the preemption for reading chunks */
-    if(H5P_register_real(pclass, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, H5D_ACS_PREEMPT_READ_CHUNKS_SIZE, &rdcc_w0, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, H5D_ACS_PREEMPT_READ_CHUNKS_SIZE,
+                          &rdcc_w0, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register property for external file prefix */
-    if(H5P_register_real(pclass, H5D_ACS_EFILE_PREFIX_NAME, H5D_ACS_EFILE_PREFIX_SIZE, &H5D_def_efile_prefix_g, 
-            NULL, H5D_ACS_EFILE_PREFIX_SET, H5D_ACS_EFILE_PREFIX_GET,
-            H5D_ACS_EFILE_PREFIX_DEL, H5D_ACS_EFILE_PREFIX_COPY, H5D_ACS_EFILE_PREFIX_CMP, H5D_ACS_EFILE_PREFIX_CLOSE) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5D_ACS_EFILE_PREFIX_NAME, H5D_ACS_EFILE_PREFIX_SIZE,
+                          &H5D_def_efile_prefix_g, NULL, H5D_ACS_EFILE_PREFIX_SET, H5D_ACS_EFILE_PREFIX_GET,
+                          H5D_ACS_EFILE_PREFIX_DEL, H5D_ACS_EFILE_PREFIX_COPY, H5D_ACS_EFILE_PREFIX_CMP,
+                          H5D_ACS_EFILE_PREFIX_CLOSE) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dacc_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__dapl_efile_pref_set
  *
@@ -186,7 +180,7 @@ done:
  */
 static herr_t
 H5P__dapl_efile_pref_set(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
+                         size_t H5_ATTR_UNUSED size, void *value)
 {
     FUNC_ENTER_STATIC_NOERR
 
@@ -199,7 +193,6 @@ H5P__dapl_efile_pref_set(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P__dapl_efile_pref_set() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__dapl_efile_pref_get
  *
@@ -212,7 +205,7 @@ H5P__dapl_efile_pref_set(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED
  */
 static herr_t
 H5P__dapl_efile_pref_get(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
+                         size_t H5_ATTR_UNUSED size, void *value)
 {
     FUNC_ENTER_STATIC_NOERR
 
@@ -225,7 +218,6 @@ H5P__dapl_efile_pref_get(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P__dapl_efile_pref_get() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__dapl_efile_pref_del
  *
@@ -237,7 +229,7 @@ H5P__dapl_efile_pref_get(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED
  */
 static herr_t
 H5P__dapl_efile_pref_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
+                         size_t H5_ATTR_UNUSED size, void *value)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -248,7 +240,6 @@ H5P__dapl_efile_pref_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P__dapl_efile_pref_del() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__dapl_efile_pref_copy
  *
@@ -270,7 +261,6 @@ H5P__dapl_efile_pref_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P__dapl_efile_pref_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__dapl_efile_pref_cmp
  *
@@ -285,24 +275,23 @@ H5P__dapl_efile_pref_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED
 static int
 H5P__dapl_efile_pref_cmp(const void *value1, const void *value2, size_t H5_ATTR_UNUSED size)
 {
-    const char *pref1 = *(const char * const *)value1;
-    const char *pref2 = *(const char * const *)value2;
-    int ret_value = 0;
+    const char *pref1     = *(const char *const *)value1;
+    const char *pref2     = *(const char *const *)value2;
+    int         ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(NULL == pref1 && NULL != pref2)
+    if (NULL == pref1 && NULL != pref2)
         HGOTO_DONE(1);
-    if(NULL != pref1 && NULL == pref2)
+    if (NULL != pref1 && NULL == pref2)
         HGOTO_DONE(-1);
-    if(NULL != pref1 && NULL != pref2)
+    if (NULL != pref1 && NULL != pref2)
         ret_value = HDstrcmp(pref1, pref2);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dapl_efile_pref_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__dapl_efile_pref_close
  *
@@ -324,7 +313,6 @@ H5P__dapl_efile_pref_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSE
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P__dapl_efile_pref_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_chunk_cache
  *
@@ -358,34 +346,35 @@ H5P__dapl_efile_pref_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSE
 herr_t
 H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "izzd", dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0);
 
     /* Check arguments.  Note that we allow negative values - they are
      * considered to "unset" the property. */
-    if(rdcc_w0 > (double)1.0f)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "raw data cache w0 value must be between 0.0 and 1.0 inclusive, or H5D_CHUNK_CACHE_W0_DEFAULT");
+    if (rdcc_w0 > (double)1.0f)
+        HGOTO_ERROR(
+            H5E_ARGS, H5E_BADVALUE, FAIL,
+            "raw data cache w0 value must be between 0.0 and 1.0 inclusive, or H5D_CHUNK_CACHE_W0_DEFAULT");
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(dapl_id,H5P_DATASET_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(dapl_id, H5P_DATASET_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
     /* Set sizes */
-    if(H5P_set(plist, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, &rdcc_nslots) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set data cache number of chunks");
-    if(H5P_set(plist, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &rdcc_nbytes) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set data cache byte size");
-    if(H5P_set(plist, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, &rdcc_w0) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks");
+    if (H5P_set(plist, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, &rdcc_nslots) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache number of chunks");
+    if (H5P_set(plist, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, &rdcc_nbytes) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache byte size");
+    if (H5P_set(plist, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, &rdcc_w0) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set preempt read chunks");
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_chunk_cache() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_chunk_cache
  *
@@ -409,9 +398,9 @@ done:
 herr_t
 H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots, size_t *rdcc_nbytes, double *rdcc_w0)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5P_genplist_t *def_plist;  /* Default file access property list */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5P_genplist_t *def_plist;           /* Default file access property list */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*z*z*d", dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0);
@@ -428,31 +417,30 @@ H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots, size_t *rdcc_nbytes, doub
      * from the default fapl is used. */
     if (rdcc_nslots) {
         if (H5P_get(plist, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, rdcc_nslots) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache number of slots");
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get data cache number of slots");
         if (*rdcc_nslots == H5D_CHUNK_CACHE_NSLOTS_DEFAULT)
             if (H5P_get(def_plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, rdcc_nslots) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get default data cache number of slots");
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get default data cache number of slots");
     } /* end if */
     if (rdcc_nbytes) {
         if (H5P_get(plist, H5D_ACS_DATA_CACHE_BYTE_SIZE_NAME, rdcc_nbytes) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache byte size");
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get data cache byte size");
         if (*rdcc_nbytes == H5D_CHUNK_CACHE_NBYTES_DEFAULT)
             if (H5P_get(def_plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, rdcc_nbytes) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get default data cache byte size");
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get default data cache byte size");
     } /* end if */
     if (rdcc_w0) {
         if (H5P_get(plist, H5D_ACS_PREEMPT_READ_CHUNKS_NAME, rdcc_w0) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks");
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get preempt read chunks");
         if (*rdcc_w0 < 0)
             if (H5P_get(def_plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, rdcc_w0) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get default preempt read chunks");
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get default preempt read chunks");
     } /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_efile_prefix
  *
@@ -474,25 +462,24 @@ done:
 herr_t
 H5Pset_efile_prefix(hid_t plist_id, const char *prefix)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", plist_id, prefix);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set prefix */
-    if(H5P_set(plist, H5D_ACS_EFILE_PREFIX_NAME, &prefix) < 0)
+    if (H5P_set(plist, H5D_ACS_EFILE_PREFIX_NAME, &prefix) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set prefix info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_efile_prefix() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_efile_prefix
  *
@@ -508,16 +495,16 @@ done:
 ssize_t
 H5Pget_efile_prefix(hid_t plist_id, char *prefix, size_t size)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    char *my_prefix;                    /* Library's copy of the prefix */
-    size_t	len;                    /* Length of prefix string */
-    ssize_t 	ret_value;              /* Return value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    char *          my_prefix; /* Library's copy of the prefix */
+    size_t          len;       /* Length of prefix string */
+    ssize_t         ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "i*sz", plist_id, prefix, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the current prefix */
@@ -525,15 +512,15 @@ H5Pget_efile_prefix(hid_t plist_id, char *prefix, size_t size)
     my_prefix = (char *)H5P_peek_voidp(plist, H5D_ACS_EFILE_PREFIX_NAME);
 
     /* Check for prefix being set */
-    if(my_prefix) {
+    if (my_prefix) {
         /* Copy to user's buffer, if given */
         len = HDstrlen(my_prefix);
-        if(prefix) {
+        if (prefix) {
             HDstrncpy(prefix, my_prefix, MIN(len + 1, size));
-            if(len >= size)
+            if (len >= size)
                 prefix[size - 1] = '\0';
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else
         len = 0;
 
@@ -543,4 +530,3 @@ H5Pget_efile_prefix(hid_t plist_id, char *prefix, size_t size)
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_efile_prefix() */
-
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 81dfdf1..e1b6b88 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -25,80 +25,142 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-#include "H5Zpkg.h"		/* Data filters				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Ppkg.h"      /* Property lists		  	*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Define default layout information */
-#define H5D_DEF_STORAGE_COMPACT_INIT  {(hbool_t)FALSE, (size_t)0, NULL}
-#define H5D_DEF_STORAGE_CONTIG_INIT   {HADDR_UNDEF, (hsize_t)0}
-#define H5D_DEF_STORAGE_CHUNK_INIT    {H5D_CHUNK_BTREE, HADDR_UNDEF,  NULL, {{HADDR_UNDEF, NULL}}}
-#define H5D_DEF_LAYOUT_CHUNK_INIT    {(unsigned)0, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, (uint32_t)0, (hsize_t)0, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}
+#define H5D_DEF_STORAGE_COMPACT_INIT                                                                         \
+    {                                                                                                        \
+        (hbool_t) FALSE, (size_t)0, NULL                                                                     \
+    }
+#define H5D_DEF_STORAGE_CONTIG_INIT                                                                          \
+    {                                                                                                        \
+        HADDR_UNDEF, (hsize_t)0                                                                              \
+    }
+#define H5D_DEF_STORAGE_CHUNK_INIT                                                                           \
+    {                                                                                                        \
+        H5D_CHUNK_BTREE, HADDR_UNDEF, NULL,                                                                  \
+        {                                                                                                    \
+            {                                                                                                \
+                HADDR_UNDEF, NULL                                                                            \
+            }                                                                                                \
+        }                                                                                                    \
+    }
+#define H5D_DEF_LAYOUT_CHUNK_INIT                                                                            \
+    {                                                                                                        \
+        (unsigned)0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                     \
+                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},                                       \
+            (uint32_t)0, (hsize_t)0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                     \
+                                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},                       \
+        {                                                                                                    \
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
+                0                                                                                            \
+        }                                                                                                    \
+    }
 #ifdef H5_HAVE_C99_DESIGNATED_INITIALIZER
-#define H5D_DEF_STORAGE_COMPACT  {H5D_COMPACT, { .compact = H5D_DEF_STORAGE_COMPACT_INIT }}
-#define H5D_DEF_STORAGE_CONTIG   {H5D_CONTIGUOUS, { .contig = H5D_DEF_STORAGE_CONTIG_INIT }}
-#define H5D_DEF_STORAGE_CHUNK    {H5D_CHUNKED, { .chunk = H5D_DEF_STORAGE_CHUNK_INIT }}
-#define H5D_DEF_LAYOUT_COMPACT  {H5D_COMPACT, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, H5D_DEF_STORAGE_COMPACT}
-#define H5D_DEF_LAYOUT_CONTIG   {H5D_CONTIGUOUS, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, H5D_DEF_STORAGE_CONTIG}
-#define H5D_DEF_LAYOUT_CHUNK    {H5D_CHUNKED, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, H5D_DEF_STORAGE_CHUNK}
+#define H5D_DEF_STORAGE_COMPACT                                                                              \
+    {                                                                                                        \
+        H5D_COMPACT, { .compact = H5D_DEF_STORAGE_COMPACT_INIT }                                             \
+    }
+#define H5D_DEF_STORAGE_CONTIG                                                                               \
+    {                                                                                                        \
+        H5D_CONTIGUOUS, { .contig = H5D_DEF_STORAGE_CONTIG_INIT }                                            \
+    }
+#define H5D_DEF_STORAGE_CHUNK                                                                                \
+    {                                                                                                        \
+        H5D_CHUNKED, { .chunk = H5D_DEF_STORAGE_CHUNK_INIT }                                                 \
+    }
+#define H5D_DEF_LAYOUT_COMPACT                                                                               \
+    {                                                                                                        \
+        H5D_COMPACT, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, H5D_DEF_STORAGE_COMPACT        \
+    }
+#define H5D_DEF_LAYOUT_CONTIG                                                                                \
+    {                                                                                                        \
+        H5D_CONTIGUOUS, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, H5D_DEF_STORAGE_CONTIG      \
+    }
+#define H5D_DEF_LAYOUT_CHUNK                                                                                 \
+    {                                                                                                        \
+        H5D_CHUNKED, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, H5D_DEF_STORAGE_CHUNK          \
+    }
 #else /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
 /* Note that the compact & chunked layout initialization values are using the
  *      contiguous layout initialization in the union, because the contiguous
  *      layout is first in the union.  These values are overridden in the
  *      H5P__init_def_layout() routine. -QAK
  */
-#define H5D_DEF_LAYOUT_COMPACT  {H5D_COMPACT, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT}}
-#define H5D_DEF_LAYOUT_CONTIG   {H5D_CONTIGUOUS, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT}}
-#define H5D_DEF_LAYOUT_CHUNK    {H5D_CHUNKED, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT}}
+#define H5D_DEF_LAYOUT_COMPACT                                                                               \
+    {                                                                                                        \
+        H5D_COMPACT, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT},                                \
+        {                                                                                                    \
+            H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT                                                      \
+        }                                                                                                    \
+    }
+#define H5D_DEF_LAYOUT_CONTIG                                                                                \
+    {                                                                                                        \
+        H5D_CONTIGUOUS, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT},                             \
+        {                                                                                                    \
+            H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT                                                      \
+        }                                                                                                    \
+    }
+#define H5D_DEF_LAYOUT_CHUNK                                                                                 \
+    {                                                                                                        \
+        H5D_CHUNKED, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT},                                \
+        {                                                                                                    \
+            H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT                                                      \
+        }                                                                                                    \
+    }
 #endif /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
 
 /* ========  Dataset creation properties ======== */
 /* Definitions for storage layout property */
-#define H5D_CRT_LAYOUT_SIZE        sizeof(H5O_layout_t)
-#define H5D_CRT_LAYOUT_DEF         H5D_DEF_LAYOUT_CONTIG
-#define H5D_CRT_LAYOUT_CMP         H5P__dcrt_layout_cmp
+#define H5D_CRT_LAYOUT_SIZE sizeof(H5O_layout_t)
+#define H5D_CRT_LAYOUT_DEF  H5D_DEF_LAYOUT_CONTIG
+#define H5D_CRT_LAYOUT_CMP  H5P__dcrt_layout_cmp
 /* Definitions for fill value.  size=0 means fill value will be 0 as
  * library default; size=-1 means fill value is undefined. */
-#define H5D_CRT_FILL_VALUE_SIZE    sizeof(H5O_fill_t)
-#define H5D_CRT_FILL_VALUE_DEF     {{0, NULL, H5O_NULL_ID, {{0, HADDR_UNDEF}}}, H5O_FILL_VERSION_2, NULL, 0, NULL, H5D_ALLOC_TIME_LATE, H5D_FILL_TIME_IFSET, FALSE}
-#define H5D_CRT_FILL_VALUE_CMP     H5P_fill_value_cmp
+#define H5D_CRT_FILL_VALUE_SIZE sizeof(H5O_fill_t)
+#define H5D_CRT_FILL_VALUE_DEF                                                                               \
+    {                                                                                                        \
+        {0, NULL, H5O_NULL_ID, {{0, HADDR_UNDEF}}}, H5O_FILL_VERSION_2, NULL, 0, NULL, H5D_ALLOC_TIME_LATE,  \
+            H5D_FILL_TIME_IFSET, FALSE                                                                       \
+    }
+#define H5D_CRT_FILL_VALUE_CMP H5P_fill_value_cmp
 /* Definitions for space allocation time state */
-#define H5D_CRT_ALLOC_TIME_STATE_SIZE   sizeof(unsigned)
-#define H5D_CRT_ALLOC_TIME_STATE_DEF    1
+#define H5D_CRT_ALLOC_TIME_STATE_SIZE sizeof(unsigned)
+#define H5D_CRT_ALLOC_TIME_STATE_DEF  1
 /* Definitions for external file list */
 #define H5D_CRT_EXT_FILE_LIST_SIZE sizeof(H5O_efl_t)
-#define H5D_CRT_EXT_FILE_LIST_DEF  {HADDR_UNDEF, 0, 0, NULL}
-#define H5D_CRT_EXT_FILE_LIST_CMP  H5P__dcrt_ext_file_list_cmp
-
+#define H5D_CRT_EXT_FILE_LIST_DEF                                                                            \
+    {                                                                                                        \
+        HADDR_UNDEF, 0, 0, NULL                                                                              \
+    }
+#define H5D_CRT_EXT_FILE_LIST_CMP H5P__dcrt_ext_file_list_cmp
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -118,31 +180,29 @@ static herr_t H5P__dcrt_close(hid_t dxpl_id, void *close_data);
 static int H5P__dcrt_layout_cmp(const void *value1, const void *value2, size_t size);
 static int H5P__dcrt_ext_file_list_cmp(const void *value1, const void *value2, size_t size);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* Dataset creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_DCRT[1] = {{
-    "dataset create",		/* Class name for debugging     */
-    H5P_TYPE_DATASET_CREATE,    /* Class type                   */
-
-    &H5P_CLS_OBJECT_CREATE_g,	/* Parent class                 */
-    &H5P_CLS_DATASET_CREATE_g,	/* Pointer to class             */
-    &H5P_CLS_DATASET_CREATE_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_DATASET_CREATE_ID_g,	/* Pointer to default property list ID */
-    H5P__dcrt_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    H5P__dcrt_copy,		/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    H5P__dcrt_close,		/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "dataset create",        /* Class name for debugging     */
+    H5P_TYPE_DATASET_CREATE, /* Class type                   */
+
+    &H5P_CLS_OBJECT_CREATE_g,     /* Parent class                 */
+    &H5P_CLS_DATASET_CREATE_g,    /* Pointer to class             */
+    &H5P_CLS_DATASET_CREATE_ID_g, /* Pointer to class ID          */
+    &H5P_LST_DATASET_CREATE_ID_g, /* Pointer to default property list ID */
+    H5P__dcrt_reg_prop,           /* Default property registration routine */
+
+    NULL,            /* Class creation callback      */
+    NULL,            /* Class creation callback info */
+    H5P__dcrt_copy,  /* Class copy callback          */
+    NULL,            /* Class copy callback info     */
+    H5P__dcrt_close, /* Class close callback         */
+    NULL             /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
@@ -153,17 +213,15 @@ H5FL_BLK_EXTERN(type_conv);
 /* Defaults for each type of layout */
 #ifdef H5_HAVE_C99_DESIGNATED_INITIALIZER
 static const H5O_layout_t H5D_def_layout_compact_g = H5D_DEF_LAYOUT_COMPACT;
-static const H5O_layout_t H5D_def_layout_contig_g = H5D_DEF_LAYOUT_CONTIG;
-static const H5O_layout_t H5D_def_layout_chunk_g = H5D_DEF_LAYOUT_CHUNK;
-#else /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
-static H5O_layout_t H5D_def_layout_compact_g = H5D_DEF_LAYOUT_COMPACT;
-static H5O_layout_t H5D_def_layout_contig_g = H5D_DEF_LAYOUT_CONTIG;
-static H5O_layout_t H5D_def_layout_chunk_g = H5D_DEF_LAYOUT_CHUNK;
-static hbool_t H5P_dcrt_def_layout_init_g = FALSE;
+static const H5O_layout_t H5D_def_layout_contig_g  = H5D_DEF_LAYOUT_CONTIG;
+static const H5O_layout_t H5D_def_layout_chunk_g   = H5D_DEF_LAYOUT_CHUNK;
+#else  /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
+static H5O_layout_t H5D_def_layout_compact_g   = H5D_DEF_LAYOUT_COMPACT;
+static H5O_layout_t H5D_def_layout_contig_g    = H5D_DEF_LAYOUT_CONTIG;
+static H5O_layout_t H5D_def_layout_chunk_g     = H5D_DEF_LAYOUT_CHUNK;
+static hbool_t      H5P_dcrt_def_layout_init_g = FALSE;
 #endif /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__dcrt_reg_prop
  *
@@ -178,35 +236,38 @@ static hbool_t H5P_dcrt_def_layout_init_g = FALSE;
 static herr_t
 H5P__dcrt_reg_prop(H5P_genclass_t *pclass)
 {
-    H5O_layout_t layout = H5D_CRT_LAYOUT_DEF;          /* Default storage layout */
-    H5O_fill_t fill = H5D_CRT_FILL_VALUE_DEF;           /* Default fill value */
-    unsigned alloc_time_state = H5D_CRT_ALLOC_TIME_STATE_DEF;   /* Default allocation time state */
-    H5O_efl_t efl = H5D_CRT_EXT_FILE_LIST_DEF;          /* Default external file list */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_layout_t layout           = H5D_CRT_LAYOUT_DEF;           /* Default storage layout */
+    H5O_fill_t   fill             = H5D_CRT_FILL_VALUE_DEF;       /* Default fill value */
+    unsigned     alloc_time_state = H5D_CRT_ALLOC_TIME_STATE_DEF; /* Default allocation time state */
+    H5O_efl_t    efl              = H5D_CRT_EXT_FILE_LIST_DEF;    /* Default external file list */
+    herr_t       ret_value        = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register the storage layout property */
-    if(H5P_register_real(pclass, H5D_CRT_LAYOUT_NAME, H5D_CRT_LAYOUT_SIZE, &layout, NULL, NULL, NULL, NULL, NULL, H5D_CRT_LAYOUT_CMP, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_CRT_LAYOUT_NAME, H5D_CRT_LAYOUT_SIZE, &layout, NULL, NULL, NULL, NULL,
+                          NULL, H5D_CRT_LAYOUT_CMP, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the fill value property */
-    if(H5P_register_real(pclass, H5D_CRT_FILL_VALUE_NAME, H5D_CRT_FILL_VALUE_SIZE, &fill, NULL, NULL, NULL, NULL, NULL, H5D_CRT_FILL_VALUE_CMP, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_CRT_FILL_VALUE_NAME, H5D_CRT_FILL_VALUE_SIZE, &fill, NULL, NULL, NULL,
+                          NULL, NULL, H5D_CRT_FILL_VALUE_CMP, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the space allocation time state property */
-    if(H5P_register_real(pclass, H5D_CRT_ALLOC_TIME_STATE_NAME, H5D_CRT_ALLOC_TIME_STATE_SIZE, &alloc_time_state, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_CRT_ALLOC_TIME_STATE_NAME, H5D_CRT_ALLOC_TIME_STATE_SIZE,
+                          &alloc_time_state, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the external file list property */
-    if(H5P_register_real(pclass, H5D_CRT_EXT_FILE_LIST_NAME, H5D_CRT_EXT_FILE_LIST_SIZE, &efl, NULL, NULL, NULL, NULL, NULL, H5D_CRT_EXT_FILE_LIST_CMP, NULL) < 0)
-       HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5D_CRT_EXT_FILE_LIST_NAME, H5D_CRT_EXT_FILE_LIST_SIZE, &efl, NULL, NULL,
+                          NULL, NULL, NULL, H5D_CRT_EXT_FILE_LIST_CMP, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dcrt_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__dcrt_copy
  *
@@ -226,38 +287,38 @@ done:
 static herr_t
 H5P__dcrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void H5_ATTR_UNUSED *copy_data)
 {
-    H5O_fill_t     src_fill, dst_fill;          /* Source & destination fill values */
-    H5O_efl_t      src_efl, dst_efl;            /* Source & destination external file lists */
-    H5O_layout_t   src_layout, dst_layout;      /* Source & destination layout */
-    H5P_genplist_t *src_plist;                  /* Pointer to source property list */
-    H5P_genplist_t *dst_plist;                  /* Pointer to destination property list */
-    herr_t         ret_value = SUCCEED;         /* Return value */
+    H5O_fill_t      src_fill, dst_fill;     /* Source & destination fill values */
+    H5O_efl_t       src_efl, dst_efl;       /* Source & destination external file lists */
+    H5O_layout_t    src_layout, dst_layout; /* Source & destination layout */
+    H5P_genplist_t *src_plist;              /* Pointer to source property list */
+    H5P_genplist_t *dst_plist;              /* Pointer to destination property list */
+    herr_t          ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Verify property list IDs */
-    if(NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_plist_id)))
+    if (NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_plist_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
-    if(NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_plist_id)))
+    if (NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_plist_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
 
     /* Get the layout, fill value, external file list, and data pipeline
      *  properties from the old property list
      */
-    if(H5P_get(src_plist, H5D_CRT_LAYOUT_NAME, &src_layout) < 0)
+    if (H5P_get(src_plist, H5D_CRT_LAYOUT_NAME, &src_layout) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get layout")
-    if(H5P_get(src_plist, H5D_CRT_FILL_VALUE_NAME, &src_fill) < 0)
+    if (H5P_get(src_plist, H5D_CRT_FILL_VALUE_NAME, &src_fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
-    if(H5P_get(src_plist, H5D_CRT_EXT_FILE_LIST_NAME, &src_efl) < 0)
+    if (H5P_get(src_plist, H5D_CRT_EXT_FILE_LIST_NAME, &src_efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
     /* Make copy of layout */
-    if(NULL == H5O_msg_copy(H5O_LAYOUT_ID, &src_layout, &dst_layout))
+    if (NULL == H5O_msg_copy(H5O_LAYOUT_ID, &src_layout, &dst_layout))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't copy layout")
 
     /* Reset layout values set when dataset is created */
     dst_layout.ops = NULL;
-    switch(dst_layout.type) {
+    switch (dst_layout.type) {
         case H5D_COMPACT:
             dst_layout.storage.u.compact.buf = H5MM_xfree(dst_layout.storage.u.compact.buf);
             HDmemset(&dst_layout.storage.u.compact, 0, sizeof(dst_layout.storage.u.compact));
@@ -273,10 +334,11 @@ H5P__dcrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void H5_ATTR_UNUSED *copy
             dst_layout.u.chunk.size = 0;
 
             /* Reset index info, if the chunk ops are set */
-            if(dst_layout.storage.u.chunk.ops)
-		/* Reset address and pointer of the array struct for the chunked storage index */
-                if(H5D_chunk_idx_reset(&dst_layout.storage.u.chunk, TRUE) < 0)
-                    HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to reset chunked storage index in dest")
+            if (dst_layout.storage.u.chunk.ops)
+                /* Reset address and pointer of the array struct for the chunked storage index */
+                if (H5D_chunk_idx_reset(&dst_layout.storage.u.chunk, TRUE) < 0)
+                    HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL,
+                                "unable to reset chunked storage index in dest")
 
             /* Reset chunk index ops */
             dst_layout.storage.u.chunk.ops = NULL;
@@ -289,38 +351,37 @@ H5P__dcrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void H5_ATTR_UNUSED *copy
     } /* end switch */
 
     /* Make copy of fill value */
-    if(NULL == H5O_msg_copy(H5O_FILL_ID, &src_fill, &dst_fill))
+    if (NULL == H5O_msg_copy(H5O_FILL_ID, &src_fill, &dst_fill))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't copy fill value")
 
     /* Make copy of external file list */
     HDmemset(&dst_efl, 0, sizeof(H5O_efl_t));
-    if(NULL == H5O_msg_copy(H5O_EFL_ID, &src_efl, &dst_efl))
+    if (NULL == H5O_msg_copy(H5O_EFL_ID, &src_efl, &dst_efl))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't copy external file list")
 
     /* Reset efl name_offset and heap_addr, these are the values when the dataset is created */
-    if(dst_efl.slot) {
+    if (dst_efl.slot) {
         unsigned int i;
 
         dst_efl.heap_addr = HADDR_UNDEF;
-        for(i = 0; i < dst_efl.nused; i++)
+        for (i = 0; i < dst_efl.nused; i++)
             dst_efl.slot[i].name_offset = 0;
     } /* end if */
 
     /* Set the layout, fill value, external file list, and data pipeline
      *  properties for the destination property list
      */
-    if(H5P_set(dst_plist, H5D_CRT_LAYOUT_NAME, &dst_layout) < 0)
+    if (H5P_set(dst_plist, H5D_CRT_LAYOUT_NAME, &dst_layout) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set layout")
-    if(H5P_set(dst_plist, H5D_CRT_FILL_VALUE_NAME, &dst_fill) < 0)
+    if (H5P_set(dst_plist, H5D_CRT_FILL_VALUE_NAME, &dst_fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set fill value")
-    if(H5P_set(dst_plist, H5D_CRT_EXT_FILE_LIST_NAME, &dst_efl) < 0)
+    if (H5P_set(dst_plist, H5D_CRT_EXT_FILE_LIST_NAME, &dst_efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set external file list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dcrt_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P__dcrt_close
  *
@@ -340,35 +401,34 @@ done:
 static herr_t
 H5P__dcrt_close(hid_t dcpl_id, void H5_ATTR_UNUSED *close_data)
 {
-    H5O_fill_t      fill;               /* Fill value */
-    H5O_efl_t       efl;                /* External file list */
-    H5P_genplist_t *plist;              /* Property list */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_fill_t      fill;                /* Fill value */
+    H5O_efl_t       efl;                 /* External file list */
+    H5P_genplist_t *plist;               /* Property list */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Check arguments */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
 
     /* Get the fill value, external file list, and data pipeline properties
      * from the old property list */
-    if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
-    if(H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
+    if (H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
     /* Clean up any values set for the fill-value and external file-list */
-    if(H5O_msg_reset(H5O_FILL_ID, &fill) < 0)
+    if (H5O_msg_reset(H5O_FILL_ID, &fill) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't release fill info")
-    if(H5O_msg_reset(H5O_EFL_ID, &efl) < 0)
+    if (H5O_msg_reset(H5O_EFL_ID, &efl) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't release external file list info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dcrt_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__dcrt_layout_cmp
  *
@@ -388,9 +448,9 @@ done:
 static int
 H5P__dcrt_layout_cmp(const void *_layout1, const void *_layout2, size_t H5_ATTR_UNUSED size)
 {
-    const H5O_layout_t *layout1 = (const H5O_layout_t *)_layout1,     /* Create local aliases for values */
-        *layout2 = (const H5O_layout_t *)_layout2;
-    herr_t ret_value = 0;       /* Return value */
+    const H5O_layout_t *layout1 = (const H5O_layout_t *)_layout1, /* Create local aliases for values */
+        *layout2                = (const H5O_layout_t *)_layout2;
+    herr_t ret_value            = 0; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -400,34 +460,41 @@ H5P__dcrt_layout_cmp(const void *_layout1, const void *_layout2, size_t H5_ATTR_
     HDassert(size == sizeof(H5O_layout_t));
 
     /* Check for different layout type */
-    if(layout1->type < layout2->type) HGOTO_DONE(-1)
-    if(layout1->type > layout2->type) HGOTO_DONE(1)
+    if (layout1->type < layout2->type)
+        HGOTO_DONE(-1)
+    if (layout1->type > layout2->type)
+        HGOTO_DONE(1)
 
     /* Check for different layout version */
-    if(layout1->version < layout2->version) HGOTO_DONE(-1)
-    if(layout1->version > layout2->version) HGOTO_DONE(1)
+    if (layout1->version < layout2->version)
+        HGOTO_DONE(-1)
+    if (layout1->version > layout2->version)
+        HGOTO_DONE(1)
 
     /* Compare non-dataset-specific fields in layout info */
-    switch(layout1->type) {
+    switch (layout1->type) {
         case H5D_COMPACT:
         case H5D_CONTIGUOUS:
             break;
 
-        case H5D_CHUNKED:
-            {
-                unsigned u;     /* Local index variable */
-
-                /* Check the number of dimensions */
-                if(layout1->u.chunk.ndims < layout2->u.chunk.ndims) HGOTO_DONE(-1)
-                if(layout1->u.chunk.ndims > layout2->u.chunk.ndims) HGOTO_DONE(1)
-
-                /* Compare the chunk dims */
-                for(u = 0; u < layout1->u.chunk.ndims - 1; u++) {
-                    if(layout1->u.chunk.dim[u] < layout2->u.chunk.dim[u]) HGOTO_DONE(-1)
-                    if(layout1->u.chunk.dim[u] > layout2->u.chunk.dim[u]) HGOTO_DONE(1)
-                } /* end for */
-            } /* end case */
-            break;
+        case H5D_CHUNKED: {
+            unsigned u; /* Local index variable */
+
+            /* Check the number of dimensions */
+            if (layout1->u.chunk.ndims < layout2->u.chunk.ndims)
+                HGOTO_DONE(-1)
+            if (layout1->u.chunk.ndims > layout2->u.chunk.ndims)
+                HGOTO_DONE(1)
+
+            /* Compare the chunk dims */
+            for (u = 0; u < layout1->u.chunk.ndims - 1; u++) {
+                if (layout1->u.chunk.dim[u] < layout2->u.chunk.dim[u])
+                    HGOTO_DONE(-1)
+                if (layout1->u.chunk.dim[u] > layout2->u.chunk.dim[u])
+                    HGOTO_DONE(1)
+            } /* end for */
+        }     /* end case */
+        break;
 
         case H5D_LAYOUT_ERROR:
         case H5D_NLAYOUTS:
@@ -439,7 +506,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dcrt_layout_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P_fill_value_cmp
  *
@@ -458,10 +524,10 @@ done:
 int
 H5P_fill_value_cmp(const void *_fill1, const void *_fill2, size_t H5_ATTR_UNUSED size)
 {
-    const H5O_fill_t *fill1 = (const H5O_fill_t *)_fill1,     /* Create local aliases for values */
-        *fill2 = (const H5O_fill_t *)_fill2;
-    int cmp_value;              /* Value from comparison */
-    herr_t ret_value = 0;       /* Return value */
+    const H5O_fill_t *fill1 = (const H5O_fill_t *)_fill1, /* Create local aliases for values */
+        *fill2              = (const H5O_fill_t *)_fill2;
+    int    cmp_value;     /* Value from comparison */
+    herr_t ret_value = 0; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -471,36 +537,45 @@ H5P_fill_value_cmp(const void *_fill1, const void *_fill2, size_t H5_ATTR_UNUSED
     HDassert(size == sizeof(H5O_fill_t));
 
     /* Check the size of fill values */
-    if(fill1->size < fill2->size) HGOTO_DONE(-1);
-    if(fill1->size > fill2->size) HGOTO_DONE(1);
+    if (fill1->size < fill2->size)
+        HGOTO_DONE(-1);
+    if (fill1->size > fill2->size)
+        HGOTO_DONE(1);
 
     /* Check the types of the fill values */
-    if(fill1->type == NULL && fill2->type != NULL) HGOTO_DONE(-1);
-    if(fill1->type != NULL && fill2->type == NULL) HGOTO_DONE(1);
-    if(fill1->type != NULL)
-        if((cmp_value = H5T_cmp(fill1->type, fill2->type, FALSE)) != 0)
+    if (fill1->type == NULL && fill2->type != NULL)
+        HGOTO_DONE(-1);
+    if (fill1->type != NULL && fill2->type == NULL)
+        HGOTO_DONE(1);
+    if (fill1->type != NULL)
+        if ((cmp_value = H5T_cmp(fill1->type, fill2->type, FALSE)) != 0)
             HGOTO_DONE(cmp_value);
 
     /* Check the fill values in the buffers */
-    if(fill1->buf == NULL && fill2->buf != NULL) HGOTO_DONE(-1);
-    if(fill1->buf != NULL && fill2->buf == NULL) HGOTO_DONE(1);
-    if(fill1->buf != NULL)
-        if((cmp_value = HDmemcmp(fill1->buf, fill2->buf, (size_t)fill1->size)) != 0)
+    if (fill1->buf == NULL && fill2->buf != NULL)
+        HGOTO_DONE(-1);
+    if (fill1->buf != NULL && fill2->buf == NULL)
+        HGOTO_DONE(1);
+    if (fill1->buf != NULL)
+        if ((cmp_value = HDmemcmp(fill1->buf, fill2->buf, (size_t)fill1->size)) != 0)
             HGOTO_DONE(cmp_value);
 
     /* Check the allocation time for the fill values */
-    if(fill1->alloc_time < fill2->alloc_time) HGOTO_DONE(-1);
-    if(fill1->alloc_time > fill2->alloc_time) HGOTO_DONE(1);
+    if (fill1->alloc_time < fill2->alloc_time)
+        HGOTO_DONE(-1);
+    if (fill1->alloc_time > fill2->alloc_time)
+        HGOTO_DONE(1);
 
     /* Check the fill time for the fill values */
-    if(fill1->fill_time < fill2->fill_time) HGOTO_DONE(-1);
-    if(fill1->fill_time > fill2->fill_time) HGOTO_DONE(1);
+    if (fill1->fill_time < fill2->fill_time)
+        HGOTO_DONE(-1);
+    if (fill1->fill_time > fill2->fill_time)
+        HGOTO_DONE(1);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_fill_value_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__dcrt_ext_file_list_cmp
  *
@@ -520,10 +595,10 @@ done:
 static int
 H5P__dcrt_ext_file_list_cmp(const void *_efl1, const void *_efl2, size_t H5_ATTR_UNUSED size)
 {
-    const H5O_efl_t *efl1 = (const H5O_efl_t *)_efl1,     /* Create local aliases for values */
-        *efl2 = (const H5O_efl_t *)_efl2;
-    int cmp_value;              /* Value from comparison */
-    herr_t ret_value = 0;       /* Return value */
+    const H5O_efl_t *efl1 = (const H5O_efl_t *)_efl1, /* Create local aliases for values */
+        *efl2             = (const H5O_efl_t *)_efl2;
+    int    cmp_value;     /* Value from comparison */
+    herr_t ret_value = 0; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -533,55 +608,70 @@ H5P__dcrt_ext_file_list_cmp(const void *_efl1, const void *_efl2, size_t H5_ATTR
     HDassert(size == sizeof(H5O_efl_t));
 
     /* Check the heap address of external file lists */
-    if(H5F_addr_defined(efl1->heap_addr) || H5F_addr_defined(efl2->heap_addr)) {
-        if(!H5F_addr_defined(efl1->heap_addr) && H5F_addr_defined(efl2->heap_addr)) HGOTO_DONE(-1);
-        if(H5F_addr_defined(efl1->heap_addr) && !H5F_addr_defined(efl2->heap_addr)) HGOTO_DONE(1);
-        if((cmp_value = H5F_addr_cmp(efl1->heap_addr, efl2->heap_addr)) != 0)
+    if (H5F_addr_defined(efl1->heap_addr) || H5F_addr_defined(efl2->heap_addr)) {
+        if (!H5F_addr_defined(efl1->heap_addr) && H5F_addr_defined(efl2->heap_addr))
+            HGOTO_DONE(-1);
+        if (H5F_addr_defined(efl1->heap_addr) && !H5F_addr_defined(efl2->heap_addr))
+            HGOTO_DONE(1);
+        if ((cmp_value = H5F_addr_cmp(efl1->heap_addr, efl2->heap_addr)) != 0)
             HGOTO_DONE(cmp_value);
     } /* end if */
 
     /* Check the number of allocated efl entries */
-    if(efl1->nalloc < efl2->nalloc) HGOTO_DONE(-1);
-    if(efl1->nalloc > efl2->nalloc) HGOTO_DONE(1);
+    if (efl1->nalloc < efl2->nalloc)
+        HGOTO_DONE(-1);
+    if (efl1->nalloc > efl2->nalloc)
+        HGOTO_DONE(1);
 
     /* Check the number of used efl entries */
-    if(efl1->nused < efl2->nused) HGOTO_DONE(-1);
-    if(efl1->nused > efl2->nused) HGOTO_DONE(1);
+    if (efl1->nused < efl2->nused)
+        HGOTO_DONE(-1);
+    if (efl1->nused > efl2->nused)
+        HGOTO_DONE(1);
 
     /* Check the efl entry information */
-    if(efl1->slot == NULL && efl2->slot != NULL) HGOTO_DONE(-1);
-    if(efl1->slot != NULL && efl2->slot == NULL) HGOTO_DONE(1);
-    if(efl1->slot != NULL && efl1->nused > 0) {
-        size_t u;       /* Local index variable */
+    if (efl1->slot == NULL && efl2->slot != NULL)
+        HGOTO_DONE(-1);
+    if (efl1->slot != NULL && efl2->slot == NULL)
+        HGOTO_DONE(1);
+    if (efl1->slot != NULL && efl1->nused > 0) {
+        size_t u; /* Local index variable */
 
         /* Loop through all entries, comparing them */
-        for(u = 0; u < efl1->nused; u++) {
+        for (u = 0; u < efl1->nused; u++) {
             /* Check the name offset of the efl entry */
-            if(efl1->slot[u].name_offset < efl2->slot[u].name_offset) HGOTO_DONE(-1);
-            if(efl1->slot[u].name_offset > efl2->slot[u].name_offset) HGOTO_DONE(1);
+            if (efl1->slot[u].name_offset < efl2->slot[u].name_offset)
+                HGOTO_DONE(-1);
+            if (efl1->slot[u].name_offset > efl2->slot[u].name_offset)
+                HGOTO_DONE(1);
 
             /* Check the name of the efl entry */
-            if(efl1->slot[u].name == NULL && efl2->slot[u].name != NULL) HGOTO_DONE(-1);
-            if(efl1->slot[u].name != NULL && efl2->slot[u].name == NULL) HGOTO_DONE(1);
-            if(efl1->slot[u].name != NULL)
-                if((cmp_value = HDstrcmp(efl1->slot[u].name, efl2->slot[u].name)) != 0)
+            if (efl1->slot[u].name == NULL && efl2->slot[u].name != NULL)
+                HGOTO_DONE(-1);
+            if (efl1->slot[u].name != NULL && efl2->slot[u].name == NULL)
+                HGOTO_DONE(1);
+            if (efl1->slot[u].name != NULL)
+                if ((cmp_value = HDstrcmp(efl1->slot[u].name, efl2->slot[u].name)) != 0)
                     HGOTO_DONE(cmp_value);
 
             /* Check the file offset of the efl entry */
-            if(efl1->slot[u].offset < efl2->slot[u].offset) HGOTO_DONE(-1);
-            if(efl1->slot[u].offset > efl2->slot[u].offset) HGOTO_DONE(1);
+            if (efl1->slot[u].offset < efl2->slot[u].offset)
+                HGOTO_DONE(-1);
+            if (efl1->slot[u].offset > efl2->slot[u].offset)
+                HGOTO_DONE(1);
 
             /* Check the file size of the efl entry */
-            if(efl1->slot[u].size < efl2->slot[u].size) HGOTO_DONE(-1);
-            if(efl1->slot[u].size > efl2->slot[u].size) HGOTO_DONE(1);
+            if (efl1->slot[u].size < efl2->slot[u].size)
+                HGOTO_DONE(-1);
+            if (efl1->slot[u].size > efl2->slot[u].size)
+                HGOTO_DONE(1);
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dcrt_ext_file_list_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5P__set_layout
  *
@@ -597,25 +687,25 @@ done:
 static herr_t
 H5P__set_layout(H5P_genplist_t *plist, const H5O_layout_t *layout)
 {
-    unsigned alloc_time_state;          /* State of allocation time property */
-    herr_t ret_value = SUCCEED;         /* return value */
+    unsigned alloc_time_state;    /* State of allocation time property */
+    herr_t   ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_STATIC
 
     /* Get the allocation time state */
-    if(H5P_get(plist, H5D_CRT_ALLOC_TIME_STATE_NAME, &alloc_time_state) < 0)
+    if (H5P_get(plist, H5D_CRT_ALLOC_TIME_STATE_NAME, &alloc_time_state) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get space allocation time state")
 
     /* If we still have the "default" allocation time, change it according to the new layout */
-    if(alloc_time_state) {
-        H5O_fill_t fill;            /* Fill value */
+    if (alloc_time_state) {
+        H5O_fill_t fill; /* Fill value */
 
         /* Get current fill value info */
-        if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+        if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
         /* Set the default based on layout */
-        switch(layout->type) {
+        switch (layout->type) {
             case H5D_COMPACT:
                 fill.alloc_time = H5D_ALLOC_TIME_EARLY;
                 break;
@@ -635,12 +725,12 @@ H5P__set_layout(H5P_genplist_t *plist, const H5O_layout_t *layout)
         } /* end switch */
 
         /* Set updated fill value info */
-        if(H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+        if (H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set space allocation time")
     } /* end if */
 
     /* Set layout value */
-    if(H5P_set(plist, H5D_CRT_LAYOUT_NAME, layout) < 0)
+    if (H5P_set(plist, H5D_CRT_LAYOUT_NAME, layout) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set layout")
 
 done:
@@ -648,7 +738,7 @@ done:
 } /* end H5P__set_layout() */
 
 #ifndef H5_HAVE_C99_DESIGNATED_INITIALIZER
-
+
 /*-------------------------------------------------------------------------
  * Function:  H5P__init_def_layout
  *
@@ -665,16 +755,16 @@ done:
 static herr_t
 H5P__init_def_layout(void)
 {
-    const H5O_layout_chunk_t def_layout_chunk = H5D_DEF_LAYOUT_CHUNK_INIT;
+    const H5O_layout_chunk_t    def_layout_chunk  = H5D_DEF_LAYOUT_CHUNK_INIT;
     const H5O_storage_compact_t def_store_compact = H5D_DEF_STORAGE_COMPACT_INIT;
-    const H5O_storage_chunk_t def_store_chunk = H5D_DEF_STORAGE_CHUNK_INIT;
+    const H5O_storage_chunk_t   def_store_chunk   = H5D_DEF_STORAGE_CHUNK_INIT;
 
     FUNC_ENTER_STATIC_NOERR
 
     /* Initialize the default layout info for non-contigous layouts */
     H5D_def_layout_compact_g.storage.u.compact = def_store_compact;
-    H5D_def_layout_chunk_g.u.chunk = def_layout_chunk;
-    H5D_def_layout_chunk_g.storage.u.chunk = def_store_chunk;
+    H5D_def_layout_chunk_g.u.chunk             = def_layout_chunk;
+    H5D_def_layout_chunk_g.storage.u.chunk     = def_store_chunk;
 
     /* Note that we've initialized the default values */
     H5P_dcrt_def_layout_init_g = TRUE;
@@ -683,7 +773,6 @@ H5P__init_def_layout(void)
 } /* end H5P__init_def_layout() */
 #endif /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_layout
  *
@@ -706,32 +795,32 @@ H5P__init_def_layout(void)
 herr_t
 H5Pset_layout(hid_t plist_id, H5D_layout_t layout_type)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    const H5O_layout_t *layout;         /* Pointer to default layout information for type specified */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *    plist;               /* Property list pointer */
+    const H5O_layout_t *layout;              /* Pointer to default layout information for type specified */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDl", plist_id, layout_type);
 
     /* Check arguments */
-    if(layout_type < 0 || layout_type >= H5D_NLAYOUTS)
+    if (layout_type < 0 || layout_type >= H5D_NLAYOUTS)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "raw data layout method is not valid")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
 #ifndef H5_HAVE_C99_DESIGNATED_INITIALIZER
     /* If the compiler doesn't support C99 designated initializers, check if
      *  the default layout structs have been initialized yet or not.  *ick* -QAK
      */
-    if(!H5P_dcrt_def_layout_init_g)
-        if(H5P__init_def_layout() < 0)
+    if (!H5P_dcrt_def_layout_init_g)
+        if (H5P__init_def_layout() < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't initialize default layout info")
 #endif /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
 
     /* Get pointer to correct default layout */
-    switch(layout_type) {
+    switch (layout_type) {
         case H5D_COMPACT:
             layout = &H5D_def_layout_compact_g;
             break;
@@ -751,14 +840,13 @@ H5Pset_layout(hid_t plist_id, H5D_layout_t layout_type)
     } /* end switch */
 
     /* Set value */
-    if(H5P__set_layout(plist, layout) < 0)
+    if (H5P__set_layout(plist, layout) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set layout")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_layout() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_layout
  *
@@ -783,19 +871,19 @@ done:
 H5D_layout_t
 H5Pget_layout(hid_t plist_id)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5O_layout_t layout;        /* Layout property */
-    H5D_layout_t ret_value;     /* Return value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    H5O_layout_t    layout;    /* Layout property */
+    H5D_layout_t    ret_value; /* Return value */
 
     FUNC_ENTER_API(H5D_LAYOUT_ERROR)
     H5TRACE1("Dl", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5D_LAYOUT_ERROR, "can't find object for ID")
 
     /* Get layout property */
-    if(H5P_get(plist, H5D_CRT_LAYOUT_NAME, &layout) < 0)
+    if (H5P_get(plist, H5D_CRT_LAYOUT_NAME, &layout) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5D_LAYOUT_ERROR, "can't get layout")
 
     /* Set return value */
@@ -805,7 +893,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* ed H5Pget_layout() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_chunk
  *
@@ -833,29 +920,29 @@ done:
 herr_t
 H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/])
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5O_layout_t chunk_layout;  /* Layout information for setting chunk info */
-    uint64_t chunk_nelmts;      /* Number of elements in chunk */
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5O_layout_t    chunk_layout;        /* Layout information for setting chunk info */
+    uint64_t        chunk_nelmts;        /* Number of elements in chunk */
+    unsigned        u;                   /* Local index variable */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIs*[a1]h", plist_id, ndims, dim);
 
     /* Check arguments */
-    if(ndims <= 0)
+    if (ndims <= 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "chunk dimensionality must be positive")
-    if(ndims > H5S_MAX_RANK)
+    if (ndims > H5S_MAX_RANK)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "chunk dimensionality is too large")
-    if(!dim)
+    if (!dim)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no chunk dimensions specified")
 
 #ifndef H5_HAVE_C99_DESIGNATED_INITIALIZER
     /* If the compiler doesn't support C99 designated initializers, check if
      *  the default layout structs have been initialized yet or not.  *ick* -QAK
      */
-    if(!H5P_dcrt_def_layout_init_g)
-        if(H5P__init_def_layout() < 0)
+    if (!H5P_dcrt_def_layout_init_g)
+        if (H5P__init_def_layout() < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't initialize default layout info")
 #endif /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
 
@@ -863,31 +950,30 @@ H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/])
     HDmemcpy(&chunk_layout, &H5D_def_layout_chunk_g, sizeof(H5D_def_layout_chunk_g));
     HDmemset(&chunk_layout.u.chunk.dim, 0, sizeof(chunk_layout.u.chunk.dim));
     chunk_nelmts = 1;
-    for(u = 0; u < (unsigned)ndims; u++) {
-        if(dim[u] == 0)
+    for (u = 0; u < (unsigned)ndims; u++) {
+        if (dim[u] == 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "all chunk dimensions must be positive")
-        if(dim[u] != (dim[u] & 0xffffffff))
+        if (dim[u] != (dim[u] & 0xffffffff))
             HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "all chunk dimensions must be less than 2^32")
         chunk_nelmts *= dim[u];
-        if(chunk_nelmts > (uint64_t)0xffffffff)
+        if (chunk_nelmts > (uint64_t)0xffffffff)
             HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "number of elements in chunk must be < 4GB")
         chunk_layout.u.chunk.dim[u] = (uint32_t)dim[u]; /* Store user's chunk dimensions */
-    } /* end for */
+    }                                                   /* end for */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set chunk information in property list */
     chunk_layout.u.chunk.ndims = (unsigned)ndims;
-    if(H5P__set_layout(plist, &chunk_layout) < 0)
+    if (H5P__set_layout(plist, &chunk_layout) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set layout")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_chunk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_chunk
  *
@@ -913,30 +999,30 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/)
+H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[] /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5O_layout_t layout;        /* Layout information */
-    int ret_value;              /* Return value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    H5O_layout_t    layout;    /* Layout information */
+    int             ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Is", "iIsx", plist_id, max_ndims, dim);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Retrieve the layout property */
-    if(H5P_get(plist, H5D_CRT_LAYOUT_NAME, &layout) < 0)
+    if (H5P_get(plist, H5D_CRT_LAYOUT_NAME, &layout) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't get layout")
-    if(H5D_CHUNKED != layout.type)
+    if (H5D_CHUNKED != layout.type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a chunked storage layout")
 
-    if(dim) {
-        unsigned	u;      /* Local index variable */
+    if (dim) {
+        unsigned u; /* Local index variable */
 
         /* Get the dimension sizes */
-        for(u = 0; u < layout.u.chunk.ndims && u < (unsigned)max_ndims; u++)
+        for (u = 0; u < layout.u.chunk.ndims && u < (unsigned)max_ndims; u++)
             dim[u] = layout.u.chunk.dim[u];
     } /* end if */
 
@@ -947,7 +1033,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_chunk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_external
  *
@@ -974,64 +1059,62 @@ done:
 herr_t
 H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size)
 {
-    size_t		idx;
-    hsize_t		total, tmp;
-    H5O_efl_t           efl;
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    size_t          idx;
+    hsize_t         total, tmp;
+    H5O_efl_t       efl;
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*soh", plist_id, name, offset, size);
 
     /* Check arguments */
-    if(!name || !*name)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no name given")
-    if(offset < 0)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "negative external file offset")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name given")
+    if (offset < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "negative external file offset")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-    if(H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
+    if (H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
-    if(efl.nused > 0 && H5O_EFL_UNLIMITED == efl.slot[efl.nused - 1].size)
+    if (efl.nused > 0 && H5O_EFL_UNLIMITED == efl.slot[efl.nused - 1].size)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "previous file size is unlimited")
 
-    if(H5O_EFL_UNLIMITED != size) {
-        for(idx = 0, total = size; idx < efl.nused; idx++, total = tmp) {
+    if (H5O_EFL_UNLIMITED != size) {
+        for (idx = 0, total = size; idx < efl.nused; idx++, total = tmp) {
             tmp = total + efl.slot[idx].size;
-            if(tmp <= total)
+            if (tmp <= total)
                 HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "total external data size overflowed")
         } /* end for */
-    } /* end if */
-
+    }     /* end if */
 
     /* Add to the list */
-    if(efl.nused >= efl.nalloc) {
-        size_t na = efl.nalloc + H5O_EFL_ALLOC;
-        H5O_efl_entry_t *x = (H5O_efl_entry_t *)H5MM_realloc(efl.slot, na * sizeof(H5O_efl_entry_t));
+    if (efl.nused >= efl.nalloc) {
+        size_t           na = efl.nalloc + H5O_EFL_ALLOC;
+        H5O_efl_entry_t *x  = (H5O_efl_entry_t *)H5MM_realloc(efl.slot, na * sizeof(H5O_efl_entry_t));
 
-        if(!x)
+        if (!x)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "memory allocation failed")
         efl.nalloc = na;
-        efl.slot = x;
+        efl.slot   = x;
     } /* end if */
-    idx = efl.nused;
+    idx                       = efl.nused;
     efl.slot[idx].name_offset = 0; /*not entered into heap yet*/
-    efl.slot[idx].name = H5MM_xstrdup(name);
-    efl.slot[idx].offset = offset;
-    efl.slot[idx].size = size;
+    efl.slot[idx].name        = H5MM_xstrdup(name);
+    efl.slot[idx].offset      = offset;
+    efl.slot[idx].size        = size;
     efl.nused++;
 
-    if(H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
+    if (H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set external file list")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_external() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_external_count
  *
@@ -1056,19 +1139,19 @@ done:
 int
 H5Pget_external_count(hid_t plist_id)
 {
-    H5O_efl_t           efl;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    int ret_value;              /* return value */
+    H5O_efl_t       efl;
+    H5P_genplist_t *plist;     /* Property list pointer */
+    int             ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
+    if (H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
     /* Set return value */
@@ -1078,7 +1161,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_external_count() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_external
  *
@@ -1111,40 +1193,39 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name/*out*/,
-		 off_t *offset/*out*/, hsize_t *size/*out*/)
+H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name /*out*/, off_t *offset /*out*/,
+                hsize_t *size /*out*/)
 {
-    H5O_efl_t           efl;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5O_efl_t       efl;
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iIuzxxx", plist_id, idx, name_size, name, offset, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
+    if (H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
-    if(idx >= efl.nused)
+    if (idx >= efl.nused)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "external file index is out of range")
 
     /* Return values */
-    if(name_size>0 && name)
+    if (name_size > 0 && name)
         HDstrncpy(name, efl.slot[idx].name, name_size);
-    if(offset)
+    if (offset)
         *offset = efl.slot[idx].offset;
-    if(size)
+    if (size)
         *size = efl.slot[idx].size;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_external() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_szip
  *
@@ -1164,29 +1245,29 @@ done:
 herr_t
 H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block)
 {
-    H5O_pline_t         pline;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    unsigned cd_values[2];      /* Filter parameters */
-    unsigned int config_flags;
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_pline_t     pline;
+    H5P_genplist_t *plist;        /* Property list pointer */
+    unsigned        cd_values[2]; /* Filter parameters */
+    unsigned int    config_flags;
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIuIu", plist_id, options_mask, pixels_per_block);
 
-    if(H5Z_get_filter_info(H5Z_FILTER_SZIP, &config_flags) < 0)
+    if (H5Z_get_filter_info(H5Z_FILTER_SZIP, &config_flags) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't get filter info")
 
-    if(!(config_flags & H5Z_FILTER_CONFIG_ENCODE_ENABLED))
+    if (!(config_flags & H5Z_FILTER_CONFIG_ENCODE_ENABLED))
         HGOTO_ERROR(H5E_PLINE, H5E_NOENCODER, FAIL, "Filter present but encoding is disabled.")
 
     /* Check arguments */
-    if((pixels_per_block % 2) == 1)
+    if ((pixels_per_block % 2) == 1)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "pixels_per_block is not even")
-    if(pixels_per_block > H5_SZIP_MAX_PIXELS_PER_BLOCK)
+    if (pixels_per_block > H5_SZIP_MAX_PIXELS_PER_BLOCK)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "pixels_per_block is too large")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Always set K13 compression (and un-set CHIP compression) */
@@ -1201,22 +1282,21 @@ H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block)
     options_mask &= (unsigned)(~(H5_SZIP_LSB_OPTION_MASK | H5_SZIP_MSB_OPTION_MASK));
 
     /* Set the parameters for the filter */
-    cd_values[0]=options_mask;
-    cd_values[1]=pixels_per_block;
+    cd_values[0] = options_mask;
+    cd_values[1] = pixels_per_block;
 
     /* Add the filter */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
-    if(H5Z_append(&pline, H5Z_FILTER_SZIP, H5Z_FLAG_OPTIONAL, (size_t)2, cd_values) < 0)
+    if (H5Z_append(&pline, H5Z_FILTER_SZIP, H5Z_FLAG_OPTIONAL, (size_t)2, cd_values) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add szip filter to pipeline")
-    if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_szip() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_shuffle
  *
@@ -1236,34 +1316,33 @@ done:
 herr_t
 H5Pset_shuffle(hid_t plist_id)
 {
-    H5O_pline_t         pline;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    H5O_pline_t     pline;
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", plist_id);
 
     /* Check arguments */
-    if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE))
-        HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
+    if (TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
 
     /* Get the plist structure */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Add the filter */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
-    if(H5Z_append(&pline, H5Z_FILTER_SHUFFLE, H5Z_FLAG_OPTIONAL, (size_t)0, NULL) < 0)
+    if (H5Z_append(&pline, H5Z_FILTER_SHUFFLE, H5Z_FLAG_OPTIONAL, (size_t)0, NULL) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to shuffle the data")
-    if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_shuffle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_nbit
  *
@@ -1282,34 +1361,33 @@ done:
 herr_t
 H5Pset_nbit(hid_t plist_id)
 {
-    H5O_pline_t         pline;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    H5O_pline_t     pline;
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", plist_id);
 
     /* Check arguments */
-    if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE))
-        HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
+    if (TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
 
     /* Get the plist structure */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Add the nbit filter */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
-    if(H5Z_append(&pline, H5Z_FILTER_NBIT, H5Z_FLAG_OPTIONAL, (size_t)0, NULL) < 0)
+    if (H5Z_append(&pline, H5Z_FILTER_NBIT, H5Z_FLAG_OPTIONAL, (size_t)0, NULL) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add nbit filter to pipeline")
-    if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_nbit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_scaleoffset
  *
@@ -1344,25 +1422,25 @@ done:
 herr_t
 H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_factor)
 {
-    H5O_pline_t         pline;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    unsigned cd_values[2];      /* Filter parameters */
-    herr_t ret_value=SUCCEED;   /* return value */
+    H5O_pline_t     pline;
+    H5P_genplist_t *plist;               /* Property list pointer */
+    unsigned        cd_values[2];        /* Filter parameters */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iZaIs", plist_id, scale_type, scale_factor);
 
     /* Check arguments */
-    if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE))
-        HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
+    if (TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
 
-    if(scale_factor < 0)
-       HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "scale factor must be >= 0")
-    if(scale_type!=H5Z_SO_FLOAT_DSCALE && scale_type!=H5Z_SO_FLOAT_ESCALE && scale_type!=H5Z_SO_INT)
-       HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid scale type")
+    if (scale_factor < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "scale factor must be >= 0")
+    if (scale_type != H5Z_SO_FLOAT_DSCALE && scale_type != H5Z_SO_FLOAT_ESCALE && scale_type != H5Z_SO_INT)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid scale type")
 
     /* Get the plist structure */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set parameters for the filter
@@ -1377,18 +1455,17 @@ H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_fac
     cd_values[1] = (unsigned)scale_factor;
 
     /* Add the scaleoffset filter */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
-    if(H5Z_append(&pline, H5Z_FILTER_SCALEOFFSET, H5Z_FLAG_OPTIONAL, (size_t)2, cd_values) < 0)
+    if (H5Z_append(&pline, H5Z_FILTER_SCALEOFFSET, H5Z_FLAG_OPTIONAL, (size_t)2, cd_values) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add scaleoffset filter to pipeline")
-    if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_scaleoffset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_fill_value
  *
@@ -1416,76 +1493,77 @@ done:
 herr_t
 H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    H5O_fill_t fill;                    /* Fill value to modify */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5O_fill_t      fill;                /* Fill value to modify */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ii*x", plist_id, type_id, value);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the current fill value */
-    if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
     /* Release the dynamic fill value components */
     H5O_fill_reset_dyn(&fill);
 
-    if(value) {
-        H5T_t *type;            /* Datatype for fill value */
-        H5T_path_t *tpath;      /* Conversion information */
+    if (value) {
+        H5T_t *     type;  /* Datatype for fill value */
+        H5T_path_t *tpath; /* Conversion information */
 
         /* Retrieve pointer to datatype */
-	if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
-	/* Set the fill value */
-        if(NULL == (fill.type = H5T_copy(type, H5T_COPY_TRANSIENT)))
+        /* Set the fill value */
+        if (NULL == (fill.type = H5T_copy(type, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy datatype")
         fill.size = (ssize_t)H5T_get_size(type);
-        if(NULL == (fill.buf = H5MM_malloc((size_t)fill.size)))
+        if (NULL == (fill.buf = H5MM_malloc((size_t)fill.size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "memory allocation failed for fill value")
         HDmemcpy(fill.buf, value, (size_t)fill.size);
 
         /* Set up type conversion function */
-        if(NULL == (tpath = H5T_path_find(type, type, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
-            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest data types")
+        if (NULL == (tpath = H5T_path_find(type, type, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
+            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
+                        "unable to convert between src and dest data types")
 
         /* If necessary, convert fill value datatypes (which copies VL components, etc.) */
-        if(!H5T_path_noop(tpath)) {
-            uint8_t *bkg_buf = NULL;    /* Background conversion buffer */
+        if (!H5T_path_noop(tpath)) {
+            uint8_t *bkg_buf = NULL; /* Background conversion buffer */
 
             /* Allocate a background buffer */
-            if(H5T_path_bkg(tpath) && NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, (size_t)fill.size)))
+            if (H5T_path_bkg(tpath) && NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, (size_t)fill.size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Convert the fill value */
-            if(H5T_convert(tpath, type_id, type_id, (size_t)1, (size_t)0, (size_t)0, fill.buf, bkg_buf, H5AC_ind_dxpl_id) < 0) {
-                if(bkg_buf)
+            if (H5T_convert(tpath, type_id, type_id, (size_t)1, (size_t)0, (size_t)0, fill.buf, bkg_buf,
+                            H5AC_ind_dxpl_id) < 0) {
+                if (bkg_buf)
                     bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf);
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
             } /* end if */
 
             /* Release the background buffer */
-            if(bkg_buf)
+            if (bkg_buf)
                 bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf);
         } /* end if */
-    }  /* end if */
+    }     /* end if */
     else
         fill.size = (-1);
 
     /* Update fill value in property list */
-    if(H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set fill value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fill_value() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_get_fill_value
  *
@@ -1503,16 +1581,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value/*out*/,
-    hid_t dxpl_id)
+H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value /*out*/, hid_t dxpl_id)
 {
-    H5O_fill_t          fill;                   /* Fill value to retrieve */
-    H5T_path_t		*tpath;		        /*type conversion info	*/
-    void		*buf = NULL;		/*conversion buffer	*/
-    void		*bkg = NULL;		/*conversion buffer	*/
-    hid_t		src_id = -1;		/*source datatype id	*/
-    hid_t		dst_id = -1;		/*destination datatype id	*/
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5O_fill_t  fill;                /* Fill value to retrieve */
+    H5T_path_t *tpath;               /*type conversion info	*/
+    void *      buf       = NULL;    /*conversion buffer	*/
+    void *      bkg       = NULL;    /*conversion buffer	*/
+    hid_t       src_id    = -1;      /*source datatype id	*/
+    hid_t       dst_id    = -1;      /*destination datatype id	*/
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1522,23 +1599,23 @@ H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value/*out*/,
      * datatype conversion might not have resulted in zero.  If fill value
      * is undefined, also return error.
      */
-    if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
-    if(fill.size == -1)
-	HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "fill value is undefined")
+    if (fill.size == -1)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "fill value is undefined")
 
     /* Check for "default" fill value */
-    if(fill.size == 0) {
-	HDmemset(value, 0, H5T_get_size(type));
-   	HGOTO_DONE(SUCCEED);
+    if (fill.size == 0) {
+        HDmemset(value, 0, H5T_get_size(type));
+        HGOTO_DONE(SUCCEED);
     } /* end if */
 
-     /*
+    /*
      * Can we convert between the source and destination datatypes?
      */
-    if(NULL == (tpath = H5T_path_find(fill.type, type, NULL, NULL, dxpl_id, FALSE)))
+    if (NULL == (tpath = H5T_path_find(fill.type, type, NULL, NULL, dxpl_id, FALSE)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to convert between src and dst datatypes")
-    if((src_id = H5I_register(H5I_DATATYPE, H5T_copy(fill.type, H5T_COPY_TRANSIENT), FALSE)) < 0)
+    if ((src_id = H5I_register(H5I_DATATYPE, H5T_copy(fill.type, H5T_COPY_TRANSIENT), FALSE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to copy/register datatype")
 
     /*
@@ -1546,41 +1623,40 @@ H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value/*out*/,
      * other than the fill value buffer that is large enough for both source
      * and destination.  The app-supplied buffer might do okay.
      */
-    if(H5T_get_size(type) >= H5T_get_size(fill.type)) {
+    if (H5T_get_size(type) >= H5T_get_size(fill.type)) {
         buf = value;
-        if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_malloc(H5T_get_size(type))))
+        if (H5T_path_bkg(tpath) && NULL == (bkg = H5MM_malloc(H5T_get_size(type))))
             HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion")
     } /* end if */
     else {
-        if(NULL == (buf = H5MM_malloc(H5T_get_size(fill.type))))
+        if (NULL == (buf = H5MM_malloc(H5T_get_size(fill.type))))
             HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion")
-        if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_malloc(H5T_get_size(fill.type))))
+        if (H5T_path_bkg(tpath) && NULL == (bkg = H5MM_malloc(H5T_get_size(fill.type))))
             HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion")
     } /* end else */
     HDmemcpy(buf, fill.buf, H5T_get_size(fill.type));
 
     /* Do the conversion */
-    if((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(type, H5T_COPY_TRANSIENT), FALSE)) < 0)
+    if ((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(type, H5T_COPY_TRANSIENT), FALSE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to copy/register datatype")
-    if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
+    if (H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "datatype conversion failed")
-    if(buf != value)
+    if (buf != value)
         HDmemcpy(value, buf, H5T_get_size(type));
 
 done:
-    if(buf != value)
+    if (buf != value)
         H5MM_xfree(buf);
-    if(bkg != value)
+    if (bkg != value)
         H5MM_xfree(bkg);
-    if(src_id >= 0 && H5I_dec_ref(src_id) < 0)
+    if (src_id >= 0 && H5I_dec_ref(src_id) < 0)
         HDONE_ERROR(H5E_PLIST, H5E_CANTDEC, FAIL, "can't decrement ref count of temp ID")
-    if(dst_id >= 0 && H5I_dec_ref(dst_id) < 0)
+    if (dst_id >= 0 && H5I_dec_ref(dst_id) < 0)
         HDONE_ERROR(H5E_PLIST, H5E_CANTDEC, FAIL, "can't decrement ref count of temp ID")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_get_fill_value() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_fill_value
  *
@@ -1598,34 +1674,33 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/)
+H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value /*out*/)
 {
-    H5P_genplist_t      *plist;                 /* Property list pointer */
-    H5T_t		*type;		        /* Datatype		*/
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5T_t *         type;                /* Datatype		*/
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iix", plist_id, type_id, value);
 
     /* Check arguments */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(!value)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,"no fill value output buffer")
+    if (!value)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no fill value output buffer")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the fill value */
-    if(H5P_get_fill_value(plist, type, value, H5AC_ind_dxpl_id) < 0)
+    if (H5P_get_fill_value(plist, type, value, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_fill_value() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_is_fill_value_defined
  *
@@ -1649,16 +1724,16 @@ H5P_is_fill_value_defined(const H5O_fill_t *fill, H5D_fill_value_t *status)
     HDassert(status);
 
     /* Check if the fill value was "unset" */
-    if(fill->size == -1 && !fill->buf)
-	*status = H5D_FILL_VALUE_UNDEFINED;
+    if (fill->size == -1 && !fill->buf)
+        *status = H5D_FILL_VALUE_UNDEFINED;
     /* Check if the fill value was set to the default fill value by the library */
-    else if(fill->size == 0 && !fill->buf)
-	*status = H5D_FILL_VALUE_DEFAULT;
+    else if (fill->size == 0 && !fill->buf)
+        *status = H5D_FILL_VALUE_DEFAULT;
     /* Check if the fill value was set by the application */
-    else if(fill->size > 0 && fill->buf)
-	*status = H5D_FILL_VALUE_USER_DEFINED;
+    else if (fill->size > 0 && fill->buf)
+        *status = H5D_FILL_VALUE_USER_DEFINED;
     else {
-	*status = H5D_FILL_VALUE_ERROR;
+        *status = H5D_FILL_VALUE_ERROR;
         HGOTO_ERROR(H5E_PLIST, H5E_BADRANGE, FAIL, "invalid combination of fill-value info")
     } /* end else */
 
@@ -1666,7 +1741,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_is_fill_value_defined() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_fill_value_defined
  *
@@ -1682,26 +1756,25 @@ done:
 herr_t
 H5P_fill_value_defined(H5P_genplist_t *plist, H5D_fill_value_t *status)
 {
-    H5O_fill_t	        fill;                   /* Fill value to query */
-    herr_t		ret_value = SUCCEED;
+    H5O_fill_t fill; /* Fill value to query */
+    herr_t     ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(status);
 
     /* Get the fill value struct */
-    if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
     /* Get the fill-value status */
-    if(H5P_is_fill_value_defined(&fill, status) < 0)
+    if (H5P_is_fill_value_defined(&fill, status) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't check fill value status")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_fill_value_defined() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pfill_value_defined
  *
@@ -1717,8 +1790,8 @@ done:
 herr_t
 H5Pfill_value_defined(hid_t plist_id, H5D_fill_value_t *status)
 {
-    H5P_genplist_t 	*plist;                 /* Property list to query */
-    herr_t		ret_value = SUCCEED;
+    H5P_genplist_t *plist; /* Property list to query */
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*DF", plist_id, status);
@@ -1726,18 +1799,17 @@ H5Pfill_value_defined(hid_t plist_id, H5D_fill_value_t *status)
     HDassert(status);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the fill-value status */
-    if(H5P_fill_value_defined(plist, status) < 0)
+    if (H5P_fill_value_defined(plist, status) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't check fill value status")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pfill_value_defined() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_alloc_time
  *
@@ -1758,32 +1830,32 @@ done:
 herr_t
 H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time)
 {
-    H5P_genplist_t *plist; 	/* Property list pointer */
-    H5O_fill_t fill;            /* Fill value property to modify */
-    unsigned alloc_time_state;  /* State of allocation time property */
-    herr_t ret_value = SUCCEED; /* return value 	 */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5O_fill_t      fill;                /* Fill value property to modify */
+    unsigned        alloc_time_state;    /* State of allocation time property */
+    herr_t          ret_value = SUCCEED; /* return value 	 */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDa", plist_id, alloc_time);
 
     /* Check arguments */
-    if(alloc_time < H5D_ALLOC_TIME_DEFAULT || alloc_time > H5D_ALLOC_TIME_INCR)
+    if (alloc_time < H5D_ALLOC_TIME_DEFAULT || alloc_time > H5D_ALLOC_TIME_INCR)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid allocation time setting")
 
     /* Get the property list structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
-	HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Check for resetting to default for layout type */
-    if(alloc_time == H5D_ALLOC_TIME_DEFAULT) {
-        H5O_layout_t layout;            /* Type of storage layout */
+    if (alloc_time == H5D_ALLOC_TIME_DEFAULT) {
+        H5O_layout_t layout; /* Type of storage layout */
 
         /* Retrieve the storage layout */
-        if(H5P_get(plist, H5D_CRT_LAYOUT_NAME, &layout) < 0)
+        if (H5P_get(plist, H5D_CRT_LAYOUT_NAME, &layout) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get layout")
 
         /* Set the default based on layout */
-        switch(layout.type) {
+        switch (layout.type) {
             case H5D_COMPACT:
                 alloc_time = H5D_ALLOC_TIME_EARLY;
                 break;
@@ -1810,23 +1882,22 @@ H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time)
         alloc_time_state = 0;
 
     /* Retrieve previous fill value settings */
-    if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
     /* Update property value */
     fill.alloc_time = alloc_time;
 
     /* Set values */
-    if(H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set fill value")
-    if(H5P_set(plist, H5D_CRT_ALLOC_TIME_STATE_NAME, &alloc_time_state) < 0)
+    if (H5P_set(plist, H5D_CRT_ALLOC_TIME_STATE_NAME, &alloc_time_state) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set space allocation time")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Pset_alloc_time() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_alloc_time
  *
@@ -1842,7 +1913,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time/*out*/)
+H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time /*out*/)
 {
     herr_t ret_value = SUCCEED; /* return value          */
 
@@ -1850,16 +1921,16 @@ H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time/*out*/)
     H5TRACE2("e", "ix", plist_id, alloc_time);
 
     /* Get values */
-    if(alloc_time) {
-        H5P_genplist_t *plist;  /* Property list pointer */
-        H5O_fill_t fill;        /* Fill value property to query */
+    if (alloc_time) {
+        H5P_genplist_t *plist; /* Property list pointer */
+        H5O_fill_t      fill;  /* Fill value property to query */
 
         /* Get the property list structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Retrieve fill value settings */
-        if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+        if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
         /* Set user's value */
@@ -1870,7 +1941,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_alloc_time() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fill_time
  *
@@ -1887,37 +1957,36 @@ done:
 herr_t
 H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5O_fill_t fill;            /* Fill value property to modify */
-    herr_t ret_value = SUCCEED; /* return value          */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5O_fill_t      fill;                /* Fill value property to modify */
+    herr_t          ret_value = SUCCEED; /* return value          */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDf", plist_id, fill_time);
 
     /* Check arguments */
-    if(fill_time < H5D_FILL_TIME_ALLOC || fill_time > H5D_FILL_TIME_IFSET)
+    if (fill_time < H5D_FILL_TIME_ALLOC || fill_time > H5D_FILL_TIME_IFSET)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid fill time setting")
 
     /* Get the property list structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Retrieve previous fill value settings */
-    if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
     /* Update property value */
     fill.fill_time = fill_time;
 
     /* Set values */
-    if(H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+    if (H5P_set(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set fill value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fill_time() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_fill_time
  *
@@ -1935,7 +2004,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time/*out*/)
+H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time /*out*/)
 {
     herr_t ret_value = SUCCEED; /* return value          */
 
@@ -1943,16 +2012,16 @@ H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time/*out*/)
     H5TRACE2("e", "ix", plist_id, fill_time);
 
     /* Set values */
-    if(fill_time) {
-        H5P_genplist_t *plist;  /* Property list pointer */
-        H5O_fill_t fill;        /* Fill value property to query */
+    if (fill_time) {
+        H5P_genplist_t *plist; /* Property list pointer */
+        H5O_fill_t      fill;  /* Fill value property to query */
 
         /* Get the property list structure */
-        if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Retrieve fill value settings */
-        if(H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
+        if (H5P_get(plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
         /* Set user's value */
@@ -1962,4 +2031,3 @@ H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time/*out*/)
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_fill_time() */
-
diff --git a/src/H5Pdeprec.c b/src/H5Pdeprec.c
index 2dff86d..8f3d80a 100644
--- a/src/H5Pdeprec.c
+++ b/src/H5Pdeprec.c
@@ -29,58 +29,48 @@
 /* Module Setup */
 /****************/
 
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg   */
+#define H5P_PACKAGE /*suppress error about including H5Ppkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5P__init_deprec_interface
-
+#define H5_INTERFACE_INIT_FUNC H5P__init_deprec_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files		  	        */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fprivate.h" /* Files		  	        */
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5P__init_deprec_interface -- Initialize interface-specific information
@@ -101,7 +91,6 @@ H5P__init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5P_init())
 } /* H5P__init_deprec_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5P__term_deprec_interface -- Terminate interface
@@ -126,7 +115,7 @@ H5P__term_deprec_interface(void)
 } /* H5P__term_deprec_interface() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5Pregister1
@@ -267,51 +256,51 @@ H5P__term_deprec_interface(void)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
-    H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
-    H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
-    H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close)
+H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_prp_create_func_t prp_create,
+             H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
+             H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close)
 {
-    H5P_genclass_t *pclass;         /* Property list class to modify */
-    H5P_genclass_t *orig_pclass;    /* Original property class */
-    herr_t ret_value;               /* Return value */
+    H5P_genclass_t *pclass;      /* Property list class to modify */
+    H5P_genclass_t *orig_pclass; /* Original property class */
+    herr_t          ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE10("e", "i*sz*xxxxxxx", cls_id, name, size, def_value, prp_create,
-             prp_set, prp_get, prp_delete, prp_copy, prp_close);
+    H5TRACE10("e", "i*sz*xxxxxxx", cls_id, name, size, def_value, prp_create, prp_set, prp_get, prp_delete,
+              prp_copy, prp_close);
 
     /* Check arguments. */
-    if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS)))
+    if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class");
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid class name");
-    if(size > 0 && def_value == NULL)
+    if (size > 0 && def_value == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "properties >0 size must have default");
 
     /* Create the new property list class */
     orig_pclass = pclass;
-    if((ret_value = H5P_register(&pclass, name, size, def_value, prp_create, prp_set, prp_get, prp_delete, prp_copy, NULL, prp_close)) < 0)
+    if ((ret_value = H5P_register(&pclass, name, size, def_value, prp_create, prp_set, prp_get, prp_delete,
+                                  prp_copy, NULL, prp_close)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in class");
 
     /* Check if the property class changed and needs to be substituted in the ID */
-    if(pclass != orig_pclass) {
-        H5P_genclass_t *old_pclass;     /* Old property class */
+    if (pclass != orig_pclass) {
+        H5P_genclass_t *old_pclass; /* Old property class */
 
         /* Substitute the new property class in the ID */
-        if(NULL == (old_pclass = (H5P_genclass_t *)H5I_subst(cls_id, pclass)))
+        if (NULL == (old_pclass = (H5P_genclass_t *)H5I_subst(cls_id, pclass)))
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to substitute property class in ID")
         HDassert(old_pclass == orig_pclass);
 
         /* Close the previous class */
-        if(H5P_close_class(orig_pclass) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL, "unable to close original property class after substitution")
+        if (H5P_close_class(orig_pclass) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL,
+                        "unable to close original property class after substitution")
     } /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pregister1() */
+} /* H5Pregister1() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Pinsert1
@@ -452,32 +441,31 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
-    H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-    H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
-    H5P_prp_close_func_t prp_close)
+H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value, H5P_prp_set_func_t prp_set,
+           H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+           H5P_prp_close_func_t prp_close)
 {
-    H5P_genplist_t	*plist;    /* Property list to modify */
-    herr_t ret_value;           /* return value */
+    H5P_genplist_t *plist;     /* Property list to modify */
+    herr_t          ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE9("e", "i*sz*xxxxxx", plist_id, name, size, value, prp_set, prp_get,
-             prp_delete, prp_copy, prp_close);
+    H5TRACE9("e", "i*sz*xxxxxx", plist_id, name, size, value, prp_set, prp_get, prp_delete, prp_copy,
+             prp_close);
 
     /* Check arguments. */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid property name")
-    if(size > 0 && value == NULL)
+    if (size > 0 && value == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "properties >0 size must have default")
 
     /* Create the new property list class */
-    if((ret_value = H5P_insert(plist, name, size, value, prp_set, prp_get, prp_delete, prp_copy, NULL, prp_close)) < 0)
+    if ((ret_value = H5P_insert(plist, name, size, value, prp_set, prp_get, prp_delete, prp_copy, NULL,
+                                prp_close)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in plist")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Pinsert1() */
+} /* H5Pinsert1() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 75a5a47..76c933f 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -25,18 +25,16 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Dprivate.h" /* Datasets				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
@@ -44,35 +42,38 @@
 
 /* ======== Data transfer properties ======== */
 /* Definitions for maximum temp buffer size property */
-#define H5D_XFER_MAX_TEMP_BUF_SIZE      sizeof(size_t)
-#define H5D_XFER_MAX_TEMP_BUF_DEF       H5D_TEMP_BUF_SIZE
+#define H5D_XFER_MAX_TEMP_BUF_SIZE sizeof(size_t)
+#define H5D_XFER_MAX_TEMP_BUF_DEF  H5D_TEMP_BUF_SIZE
 /* Definitions for type conversion buffer property */
-#define H5D_XFER_TCONV_BUF_SIZE         sizeof(void *)
-#define H5D_XFER_TCONV_BUF_DEF          NULL
+#define H5D_XFER_TCONV_BUF_SIZE sizeof(void *)
+#define H5D_XFER_TCONV_BUF_DEF  NULL
 /* Definitions for background buffer property */
-#define H5D_XFER_BKGR_BUF_SIZE          sizeof(void *)
-#define H5D_XFER_BKGR_BUF_DEF           NULL
+#define H5D_XFER_BKGR_BUF_SIZE sizeof(void *)
+#define H5D_XFER_BKGR_BUF_DEF  NULL
 /* Definitions for background buffer type property */
-#define H5D_XFER_BKGR_BUF_TYPE_SIZE     sizeof(H5T_bkg_t)
-#define H5D_XFER_BKGR_BUF_TYPE_DEF      H5T_BKG_NO
+#define H5D_XFER_BKGR_BUF_TYPE_SIZE sizeof(H5T_bkg_t)
+#define H5D_XFER_BKGR_BUF_TYPE_DEF  H5T_BKG_NO
 /* Definitions for B-tree node splitting ratio property */
 /* (These default B-tree node splitting ratios are also used for splitting
  * group's B-trees as well as chunked dataset's B-trees - QAK)
  */
 #define H5D_XFER_BTREE_SPLIT_RATIO_SIZE sizeof(double[3])
-#define H5D_XFER_BTREE_SPLIT_RATIO_DEF  {0.1F, 0.5F, 0.9F}
+#define H5D_XFER_BTREE_SPLIT_RATIO_DEF                                                                       \
+    {                                                                                                        \
+        0.1F, 0.5F, 0.9F                                                                                     \
+    }
 /* Definitions for vlen allocation function property */
-#define H5D_XFER_VLEN_ALLOC_SIZE        sizeof(H5MM_allocate_t)
-#define H5D_XFER_VLEN_ALLOC_DEF         H5D_VLEN_ALLOC
+#define H5D_XFER_VLEN_ALLOC_SIZE sizeof(H5MM_allocate_t)
+#define H5D_XFER_VLEN_ALLOC_DEF  H5D_VLEN_ALLOC
 /* Definitions for vlen allocation info property */
-#define H5D_XFER_VLEN_ALLOC_INFO_SIZE   sizeof(void *)
-#define H5D_XFER_VLEN_ALLOC_INFO_DEF    H5D_VLEN_ALLOC_INFO
+#define H5D_XFER_VLEN_ALLOC_INFO_SIZE sizeof(void *)
+#define H5D_XFER_VLEN_ALLOC_INFO_DEF  H5D_VLEN_ALLOC_INFO
 /* Definitions for vlen free function property */
-#define H5D_XFER_VLEN_FREE_SIZE         sizeof(H5MM_free_t)
-#define H5D_XFER_VLEN_FREE_DEF          H5D_VLEN_FREE
+#define H5D_XFER_VLEN_FREE_SIZE sizeof(H5MM_free_t)
+#define H5D_XFER_VLEN_FREE_DEF  H5D_VLEN_FREE
 /* Definitions for vlen free info property */
-#define H5D_XFER_VLEN_FREE_INFO_SIZE    sizeof(void *)
-#define H5D_XFER_VLEN_FREE_INFO_DEF     H5D_VLEN_FREE_INFO
+#define H5D_XFER_VLEN_FREE_INFO_SIZE sizeof(void *)
+#define H5D_XFER_VLEN_FREE_INFO_DEF  H5D_VLEN_FREE_INFO
 /* Definitions for hyperslab vector size property */
 /* (Be cautious about increasing the default size, there are arrays allocated
  *      on the stack which depend on it - QAK)
@@ -82,77 +83,81 @@
 
 #ifdef H5_HAVE_PARALLEL
 /* Definitions for I/O transfer mode property */
-#define H5D_XFER_IO_XFER_MODE_SIZE      sizeof(H5FD_mpio_xfer_t)
-#define H5D_XFER_IO_XFER_MODE_DEF       H5FD_MPIO_INDEPENDENT
+#define H5D_XFER_IO_XFER_MODE_SIZE sizeof(H5FD_mpio_xfer_t)
+#define H5D_XFER_IO_XFER_MODE_DEF  H5FD_MPIO_INDEPENDENT
 /* Definitions for optimization of MPI-IO transfer mode property */
-#define H5D_XFER_MPIO_COLLECTIVE_OPT_SIZE       sizeof(H5FD_mpio_collective_opt_t)
-#define H5D_XFER_MPIO_COLLECTIVE_OPT_DEF        H5FD_MPIO_COLLECTIVE_IO
-#define H5D_XFER_MPIO_CHUNK_OPT_HARD_SIZE       sizeof(H5FD_mpio_chunk_opt_t)
-#define H5D_XFER_MPIO_CHUNK_OPT_HARD_DEF        H5FD_MPIO_CHUNK_DEFAULT
-#define H5D_XFER_MPIO_CHUNK_OPT_NUM_SIZE        sizeof(unsigned)
-#define H5D_XFER_MPIO_CHUNK_OPT_NUM_DEF         H5D_ONE_LINK_CHUNK_IO_THRESHOLD
-#define H5D_XFER_MPIO_CHUNK_OPT_RATIO_SIZE      sizeof(unsigned)
-#define H5D_XFER_MPIO_CHUNK_OPT_RATIO_DEF       H5D_MULTI_CHUNK_IO_COL_THRESHOLD
+#define H5D_XFER_MPIO_COLLECTIVE_OPT_SIZE  sizeof(H5FD_mpio_collective_opt_t)
+#define H5D_XFER_MPIO_COLLECTIVE_OPT_DEF   H5FD_MPIO_COLLECTIVE_IO
+#define H5D_XFER_MPIO_CHUNK_OPT_HARD_SIZE  sizeof(H5FD_mpio_chunk_opt_t)
+#define H5D_XFER_MPIO_CHUNK_OPT_HARD_DEF   H5FD_MPIO_CHUNK_DEFAULT
+#define H5D_XFER_MPIO_CHUNK_OPT_NUM_SIZE   sizeof(unsigned)
+#define H5D_XFER_MPIO_CHUNK_OPT_NUM_DEF    H5D_ONE_LINK_CHUNK_IO_THRESHOLD
+#define H5D_XFER_MPIO_CHUNK_OPT_RATIO_SIZE sizeof(unsigned)
+#define H5D_XFER_MPIO_CHUNK_OPT_RATIO_DEF  H5D_MULTI_CHUNK_IO_COL_THRESHOLD
 /* Definitions for chunk opt mode property. */
-#define H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_SIZE     sizeof(H5D_mpio_actual_chunk_opt_mode_t)
-#define H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_DEF      H5D_MPIO_NO_CHUNK_OPTIMIZATION
+#define H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_SIZE sizeof(H5D_mpio_actual_chunk_opt_mode_t)
+#define H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_DEF  H5D_MPIO_NO_CHUNK_OPTIMIZATION
 /* Definitions for chunk io mode property. */
-#define H5D_MPIO_ACTUAL_IO_MODE_SIZE    sizeof(H5D_mpio_actual_io_mode_t)
-#define H5D_MPIO_ACTUAL_IO_MODE_DEF     H5D_MPIO_NO_COLLECTIVE
+#define H5D_MPIO_ACTUAL_IO_MODE_SIZE sizeof(H5D_mpio_actual_io_mode_t)
+#define H5D_MPIO_ACTUAL_IO_MODE_DEF  H5D_MPIO_NO_COLLECTIVE
 /* Definitions for cause of broken collective io property */
-#define H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE   sizeof(uint32_t)
-#define H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF   H5D_MPIO_COLLECTIVE 
+#define H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE sizeof(uint32_t)
+#define H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF  H5D_MPIO_COLLECTIVE
 /* Definitions for memory MPI type property */
-#define H5FD_MPI_XFER_MEM_MPI_TYPE_SIZE        sizeof(MPI_Datatype)
-#define H5FD_MPI_XFER_MEM_MPI_TYPE_DEF         MPI_DATATYPE_NULL
+#define H5FD_MPI_XFER_MEM_MPI_TYPE_SIZE sizeof(MPI_Datatype)
+#define H5FD_MPI_XFER_MEM_MPI_TYPE_DEF  MPI_DATATYPE_NULL
 /* Definitions for file MPI type property */
-#define H5FD_MPI_XFER_FILE_MPI_TYPE_SIZE       sizeof(MPI_Datatype)
-#define H5FD_MPI_XFER_FILE_MPI_TYPE_DEF        MPI_DATATYPE_NULL
+#define H5FD_MPI_XFER_FILE_MPI_TYPE_SIZE sizeof(MPI_Datatype)
+#define H5FD_MPI_XFER_FILE_MPI_TYPE_DEF  MPI_DATATYPE_NULL
 #endif /* H5_HAVE_PARALLEL */
 
 /* Definitions for EDC property */
-#define H5D_XFER_EDC_SIZE           sizeof(H5Z_EDC_t)
-#define H5D_XFER_EDC_DEF            H5Z_ENABLE_EDC
+#define H5D_XFER_EDC_SIZE sizeof(H5Z_EDC_t)
+#define H5D_XFER_EDC_DEF  H5Z_ENABLE_EDC
 /* Definitions for filter callback function property */
-#define H5D_XFER_FILTER_CB_SIZE     sizeof(H5Z_cb_t)
-#define H5D_XFER_FILTER_CB_DEF      {NULL,NULL}
+#define H5D_XFER_FILTER_CB_SIZE sizeof(H5Z_cb_t)
+#define H5D_XFER_FILTER_CB_DEF                                                                               \
+    {                                                                                                        \
+        NULL, NULL                                                                                           \
+    }
 /* Definitions for type conversion callback function property */
-#define H5D_XFER_CONV_CB_SIZE       sizeof(H5T_conv_cb_t)
-#define H5D_XFER_CONV_CB_DEF        {NULL,NULL}
+#define H5D_XFER_CONV_CB_SIZE sizeof(H5T_conv_cb_t)
+#define H5D_XFER_CONV_CB_DEF                                                                                 \
+    {                                                                                                        \
+        NULL, NULL                                                                                           \
+    }
 /* Definitions for data transform property */
-#define H5D_XFER_XFORM_SIZE         sizeof(void *)
-#define H5D_XFER_XFORM_DEF          NULL
-#define H5D_XFER_XFORM_DEL          H5P__dxfr_xform_del
-#define H5D_XFER_XFORM_COPY         H5P__dxfr_xform_copy
-#define H5D_XFER_XFORM_CMP          H5P__dxfr_xform_cmp
-#define H5D_XFER_XFORM_CLOSE        H5P__dxfr_xform_close
+#define H5D_XFER_XFORM_SIZE  sizeof(void *)
+#define H5D_XFER_XFORM_DEF   NULL
+#define H5D_XFER_XFORM_DEL   H5P__dxfr_xform_del
+#define H5D_XFER_XFORM_COPY  H5P__dxfr_xform_copy
+#define H5D_XFER_XFORM_CMP   H5P__dxfr_xform_cmp
+#define H5D_XFER_XFORM_CLOSE H5P__dxfr_xform_close
 /* Definitions for properties of direct chunk write */
-#define H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_SIZE		sizeof(hbool_t)
-#define H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_DEF		FALSE
-#define H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_SIZE	sizeof(uint32_t)
-#define H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_DEF		0
-#define H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_SIZE		sizeof(hsize_t *)
-#define H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_DEF		NULL
-#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_SIZE	sizeof(uint32_t)
-#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF	0
+#define H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_SIZE     sizeof(hbool_t)
+#define H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_DEF      FALSE
+#define H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_SIZE  sizeof(uint32_t)
+#define H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_DEF   0
+#define H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_SIZE   sizeof(hsize_t *)
+#define H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_DEF    NULL
+#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_SIZE sizeof(uint32_t)
+#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF  0
 /* Definitions for properties of direct chunk read */
-#define H5D_XFER_DIRECT_CHUNK_READ_FLAG_SIZE        sizeof(hbool_t)
-#define H5D_XFER_DIRECT_CHUNK_READ_FLAG_DEF         FALSE
-#define H5D_XFER_DIRECT_CHUNK_READ_FILTERS_SIZE     sizeof(uint32_t)
-#define H5D_XFER_DIRECT_CHUNK_READ_FILTERS_DEF      0
-#define H5D_XFER_DIRECT_CHUNK_READ_OFFSET_SIZE		sizeof(hsize_t *)
-#define H5D_XFER_DIRECT_CHUNK_READ_OFFSET_DEF		NULL
+#define H5D_XFER_DIRECT_CHUNK_READ_FLAG_SIZE    sizeof(hbool_t)
+#define H5D_XFER_DIRECT_CHUNK_READ_FLAG_DEF     FALSE
+#define H5D_XFER_DIRECT_CHUNK_READ_FILTERS_SIZE sizeof(uint32_t)
+#define H5D_XFER_DIRECT_CHUNK_READ_FILTERS_DEF  0
+#define H5D_XFER_DIRECT_CHUNK_READ_OFFSET_SIZE  sizeof(hsize_t *)
+#define H5D_XFER_DIRECT_CHUNK_READ_OFFSET_DEF   NULL
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -161,11 +166,10 @@
 static herr_t H5P__dxfr_reg_prop(H5P_genclass_t *pclass);
 
 /* Property list callbacks */
-static herr_t H5P__dxfr_xform_del(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P__dxfr_xform_copy(const char* name, size_t size, void* value);
-static int H5P__dxfr_xform_cmp(const void *value1, const void *value2, size_t size);
-static herr_t H5P__dxfr_xform_close(const char* name, size_t size, void* value);
-
+static herr_t H5P__dxfr_xform_del(hid_t prop_id, const char *name, size_t size, void *value);
+static herr_t H5P__dxfr_xform_copy(const char *name, size_t size, void *value);
+static int    H5P__dxfr_xform_cmp(const void *value1, const void *value2, size_t size);
+static herr_t H5P__dxfr_xform_close(const char *name, size_t size, void *value);
 
 /*********************/
 /* Package Variables */
@@ -173,35 +177,31 @@ static herr_t H5P__dxfr_xform_close(const char* name, size_t size, void* value);
 
 /* Data transfer property list class library initialization object */
 const H5P_libclass_t H5P_CLS_DXFR[1] = {{
-    "data transfer",		/* Class name for debugging     */
-    H5P_TYPE_DATASET_XFER,      /* Class type                   */
-
-    &H5P_CLS_ROOT_g,		/* Parent class                 */
-    &H5P_CLS_DATASET_XFER_g,	/* Pointer to class             */
-    &H5P_CLS_DATASET_XFER_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_DATASET_XFER_ID_g,	/* Pointer to default property list ID */
-    H5P__dxfr_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "data transfer",       /* Class name for debugging     */
+    H5P_TYPE_DATASET_XFER, /* Class type                   */
+
+    &H5P_CLS_ROOT_g,            /* Parent class                 */
+    &H5P_CLS_DATASET_XFER_g,    /* Pointer to class             */
+    &H5P_CLS_DATASET_XFER_ID_g, /* Pointer to class ID          */
+    &H5P_LST_DATASET_XFER_ID_g, /* Pointer to default property list ID */
+    H5P__dxfr_reg_prop,         /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /***************************/
 /* Local Private Variables */
 /***************************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__dxfr_reg_prop
  *
@@ -216,186 +216,224 @@ const H5P_libclass_t H5P_CLS_DXFR[1] = {{
 static herr_t
 H5P__dxfr_reg_prop(H5P_genclass_t *pclass)
 {
-    size_t def_max_temp_buf = H5D_XFER_MAX_TEMP_BUF_DEF;        /* Default value for maximum temp buffer size */
-    void *def_tconv_buf = H5D_XFER_TCONV_BUF_DEF;               /* Default value for type conversion buffer */
-    void *def_bkgr_buf = H5D_XFER_BKGR_BUF_DEF;                 /* Default value for background buffer */
+    size_t    def_max_temp_buf  = H5D_XFER_MAX_TEMP_BUF_DEF; /* Default value for maximum temp buffer size */
+    void *    def_tconv_buf     = H5D_XFER_TCONV_BUF_DEF;    /* Default value for type conversion buffer */
+    void *    def_bkgr_buf      = H5D_XFER_BKGR_BUF_DEF;     /* Default value for background buffer */
     H5T_bkg_t def_bkgr_buf_type = H5D_XFER_BKGR_BUF_TYPE_DEF;
-    double def_btree_split_ratio[3] = H5D_XFER_BTREE_SPLIT_RATIO_DEF;   /* Default value for B-tree node split ratios */
-    H5MM_allocate_t def_vlen_alloc = H5D_XFER_VLEN_ALLOC_DEF;   /* Default value for vlen allocation function */
-    void *def_vlen_alloc_info = H5D_XFER_VLEN_ALLOC_INFO_DEF;   /* Default value for vlen allocation information */
-    H5MM_free_t def_vlen_free = H5D_XFER_VLEN_FREE_DEF;         /* Default value for vlen free function */
-    void *def_vlen_free_info = H5D_XFER_VLEN_FREE_INFO_DEF;     /* Default value for vlen free information */
-    size_t def_hyp_vec_size = H5D_XFER_HYPER_VECTOR_SIZE_DEF;   /* Default value for vector size */
+    double    def_btree_split_ratio[3] =
+        H5D_XFER_BTREE_SPLIT_RATIO_DEF;                       /* Default value for B-tree node split ratios */
+    H5MM_allocate_t def_vlen_alloc = H5D_XFER_VLEN_ALLOC_DEF; /* Default value for vlen allocation function */
+    void *          def_vlen_alloc_info =
+        H5D_XFER_VLEN_ALLOC_INFO_DEF;                   /* Default value for vlen allocation information */
+    H5MM_free_t def_vlen_free = H5D_XFER_VLEN_FREE_DEF; /* Default value for vlen free function */
+    void * def_vlen_free_info = H5D_XFER_VLEN_FREE_INFO_DEF;    /* Default value for vlen free information */
+    size_t def_hyp_vec_size   = H5D_XFER_HYPER_VECTOR_SIZE_DEF; /* Default value for vector size */
 #ifdef H5_HAVE_PARALLEL
-    H5FD_mpio_xfer_t def_io_xfer_mode = H5D_XFER_IO_XFER_MODE_DEF;      /* Default value for I/O transfer mode */
-    H5FD_mpio_chunk_opt_t def_mpio_chunk_opt_mode = H5D_XFER_MPIO_CHUNK_OPT_HARD_DEF;
-    H5FD_mpio_collective_opt_t def_mpio_collective_opt_mode = H5D_XFER_MPIO_COLLECTIVE_OPT_DEF;
-    unsigned def_mpio_chunk_opt_num = H5D_XFER_MPIO_CHUNK_OPT_NUM_DEF;
-    unsigned def_mpio_chunk_opt_ratio = H5D_XFER_MPIO_CHUNK_OPT_RATIO_DEF;
+    H5FD_mpio_xfer_t def_io_xfer_mode = H5D_XFER_IO_XFER_MODE_DEF; /* Default value for I/O transfer mode */
+    H5FD_mpio_chunk_opt_t            def_mpio_chunk_opt_mode        = H5D_XFER_MPIO_CHUNK_OPT_HARD_DEF;
+    H5FD_mpio_collective_opt_t       def_mpio_collective_opt_mode   = H5D_XFER_MPIO_COLLECTIVE_OPT_DEF;
+    unsigned                         def_mpio_chunk_opt_num         = H5D_XFER_MPIO_CHUNK_OPT_NUM_DEF;
+    unsigned                         def_mpio_chunk_opt_ratio       = H5D_XFER_MPIO_CHUNK_OPT_RATIO_DEF;
     H5D_mpio_actual_chunk_opt_mode_t def_mpio_actual_chunk_opt_mode = H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_DEF;
-    H5D_mpio_actual_io_mode_t def_mpio_actual_io_mode = H5D_MPIO_ACTUAL_IO_MODE_DEF;
-    H5D_mpio_no_collective_cause_t def_mpio_no_collective_cause = H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF; 
-    MPI_Datatype btype = H5FD_MPI_XFER_MEM_MPI_TYPE_DEF;  /* Default value for MPI buffer type */
-    MPI_Datatype ftype = H5FD_MPI_XFER_FILE_MPI_TYPE_DEF; /* Default value for MPI file type */
-#endif /* H5_HAVE_PARALLEL */
-    H5Z_EDC_t enable_edc = H5D_XFER_EDC_DEF;            /* Default value for EDC property */
-    H5Z_cb_t filter_cb = H5D_XFER_FILTER_CB_DEF;        /* Default value for filter callback */
-    H5T_conv_cb_t conv_cb = H5D_XFER_CONV_CB_DEF;       /* Default value for datatype conversion callback */
-    void *def_xfer_xform = H5D_XFER_XFORM_DEF;          /* Default value for data transform */
-    hbool_t direct_chunk_flag = H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_DEF; 	        /* Default value for the flag of direct chunk write */
-    uint32_t direct_chunk_filters = H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_DEF;	/* Default value for the filters of direct chunk write */
-    hsize_t *direct_chunk_offset = H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_DEF; 	/* Default value for the offset of direct chunk write */
-    uint32_t direct_chunk_datasize = H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF;    /* Default value for the datasize of direct chunk write */
-    hbool_t direct_chunk_read_flag = H5D_XFER_DIRECT_CHUNK_READ_FLAG_DEF;         /* Default value for the flag of direct chunk read */
-    hsize_t *direct_chunk_read_offset = H5D_XFER_DIRECT_CHUNK_READ_OFFSET_DEF; 	  /* Default value for the offset of direct chunk read */
-    uint32_t direct_chunk_read_filters = H5D_XFER_DIRECT_CHUNK_READ_FILTERS_DEF;    /* Default value for the filters of direct chunk read */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_mpio_actual_io_mode_t        def_mpio_actual_io_mode        = H5D_MPIO_ACTUAL_IO_MODE_DEF;
+    H5D_mpio_no_collective_cause_t   def_mpio_no_collective_cause   = H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF;
+    MPI_Datatype btype = H5FD_MPI_XFER_MEM_MPI_TYPE_DEF;   /* Default value for MPI buffer type */
+    MPI_Datatype ftype = H5FD_MPI_XFER_FILE_MPI_TYPE_DEF;  /* Default value for MPI file type */
+#endif                                                     /* H5_HAVE_PARALLEL */
+    H5Z_EDC_t     enable_edc     = H5D_XFER_EDC_DEF;       /* Default value for EDC property */
+    H5Z_cb_t      filter_cb      = H5D_XFER_FILTER_CB_DEF; /* Default value for filter callback */
+    H5T_conv_cb_t conv_cb        = H5D_XFER_CONV_CB_DEF; /* Default value for datatype conversion callback */
+    void *        def_xfer_xform = H5D_XFER_XFORM_DEF;   /* Default value for data transform */
+    hbool_t       direct_chunk_flag =
+        H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_DEF; /* Default value for the flag of direct chunk write */
+    uint32_t direct_chunk_filters =
+        H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_DEF; /* Default value for the filters of direct chunk write */
+    hsize_t *direct_chunk_offset =
+        H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_DEF; /* Default value for the offset of direct chunk write */
+    uint32_t direct_chunk_datasize =
+        H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF; /* Default value for the datasize of direct chunk write */
+    hbool_t direct_chunk_read_flag =
+        H5D_XFER_DIRECT_CHUNK_READ_FLAG_DEF; /* Default value for the flag of direct chunk read */
+    hsize_t *direct_chunk_read_offset =
+        H5D_XFER_DIRECT_CHUNK_READ_OFFSET_DEF; /* Default value for the offset of direct chunk read */
+    uint32_t direct_chunk_read_filters =
+        H5D_XFER_DIRECT_CHUNK_READ_FILTERS_DEF; /* Default value for the filters of direct chunk read */
+    herr_t ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register the max. temp buffer size property */
-    if(H5P_register_real(pclass, H5D_XFER_MAX_TEMP_BUF_NAME, H5D_XFER_MAX_TEMP_BUF_SIZE, &def_max_temp_buf, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_MAX_TEMP_BUF_NAME, H5D_XFER_MAX_TEMP_BUF_SIZE, &def_max_temp_buf,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the type conversion buffer property */
-    if(H5P_register_real(pclass, H5D_XFER_TCONV_BUF_NAME, H5D_XFER_TCONV_BUF_SIZE, &def_tconv_buf, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_TCONV_BUF_NAME, H5D_XFER_TCONV_BUF_SIZE, &def_tconv_buf, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the background buffer property */
-    if(H5P_register_real(pclass, H5D_XFER_BKGR_BUF_NAME, H5D_XFER_BKGR_BUF_SIZE, &def_bkgr_buf, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_BKGR_BUF_NAME, H5D_XFER_BKGR_BUF_SIZE, &def_bkgr_buf, NULL, NULL,
+                          NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the background buffer type property */
-    if(H5P_register_real(pclass, H5D_XFER_BKGR_BUF_TYPE_NAME, H5D_XFER_BKGR_BUF_TYPE_SIZE, &def_bkgr_buf_type, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_BKGR_BUF_TYPE_NAME, H5D_XFER_BKGR_BUF_TYPE_SIZE,
+                          &def_bkgr_buf_type, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the B-Tree node splitting ratios property */
-    if(H5P_register_real(pclass, H5D_XFER_BTREE_SPLIT_RATIO_NAME, H5D_XFER_BTREE_SPLIT_RATIO_SIZE, def_btree_split_ratio, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_BTREE_SPLIT_RATIO_NAME, H5D_XFER_BTREE_SPLIT_RATIO_SIZE,
+                          def_btree_split_ratio, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vlen allocation function property */
-    if(H5P_register_real(pclass, H5D_XFER_VLEN_ALLOC_NAME, H5D_XFER_VLEN_ALLOC_SIZE, &def_vlen_alloc, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_VLEN_ALLOC_NAME, H5D_XFER_VLEN_ALLOC_SIZE, &def_vlen_alloc, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vlen allocation information property */
-    if(H5P_register_real(pclass, H5D_XFER_VLEN_ALLOC_INFO_NAME, H5D_XFER_VLEN_ALLOC_INFO_SIZE, &def_vlen_alloc_info, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_VLEN_ALLOC_INFO_NAME, H5D_XFER_VLEN_ALLOC_INFO_SIZE,
+                          &def_vlen_alloc_info, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vlen free function property */
-    if(H5P_register_real(pclass, H5D_XFER_VLEN_FREE_NAME, H5D_XFER_VLEN_FREE_SIZE, &def_vlen_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_VLEN_FREE_NAME, H5D_XFER_VLEN_FREE_SIZE, &def_vlen_free, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vlen free information property */
-    if(H5P_register_real(pclass, H5D_XFER_VLEN_FREE_INFO_NAME, H5D_XFER_VLEN_FREE_INFO_SIZE, &def_vlen_free_info, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_VLEN_FREE_INFO_NAME, H5D_XFER_VLEN_FREE_INFO_SIZE,
+                          &def_vlen_free_info, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vector size property */
-    if(H5P_register_real(pclass, H5D_XFER_HYPER_VECTOR_SIZE_NAME, H5D_XFER_HYPER_VECTOR_SIZE_SIZE, &def_hyp_vec_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_HYPER_VECTOR_SIZE_NAME, H5D_XFER_HYPER_VECTOR_SIZE_SIZE,
+                          &def_hyp_vec_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 #ifdef H5_HAVE_PARALLEL
     /* Register the I/O transfer mode properties */
-    if(H5P_register_real(pclass, H5D_XFER_IO_XFER_MODE_NAME, H5D_XFER_IO_XFER_MODE_SIZE, &def_io_xfer_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_IO_XFER_MODE_NAME, H5D_XFER_IO_XFER_MODE_SIZE, &def_io_xfer_mode,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P_register_real(pclass, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, H5D_XFER_MPIO_COLLECTIVE_OPT_SIZE, &def_mpio_collective_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, H5D_XFER_MPIO_COLLECTIVE_OPT_SIZE,
+                          &def_mpio_collective_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P_register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, H5D_XFER_MPIO_CHUNK_OPT_HARD_SIZE, &def_mpio_chunk_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, H5D_XFER_MPIO_CHUNK_OPT_HARD_SIZE,
+                          &def_mpio_chunk_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P_register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, H5D_XFER_MPIO_CHUNK_OPT_NUM_SIZE, &def_mpio_chunk_opt_num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, H5D_XFER_MPIO_CHUNK_OPT_NUM_SIZE,
+                          &def_mpio_chunk_opt_num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P_register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, H5D_XFER_MPIO_CHUNK_OPT_RATIO_SIZE, &def_mpio_chunk_opt_ratio, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, H5D_XFER_MPIO_CHUNK_OPT_RATIO_SIZE,
+                          &def_mpio_chunk_opt_ratio, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the chunk optimization mode property. */
-    if(H5P_register_real(pclass, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_SIZE, &def_mpio_actual_chunk_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_SIZE,
+                          &def_mpio_actual_chunk_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the actual I/O mode property. */
-    if(H5P_register_real(pclass, H5D_MPIO_ACTUAL_IO_MODE_NAME, H5D_MPIO_ACTUAL_IO_MODE_SIZE, &def_mpio_actual_io_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_MPIO_ACTUAL_IO_MODE_NAME, H5D_MPIO_ACTUAL_IO_MODE_SIZE,
+                          &def_mpio_actual_io_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the local cause of broken collective I/O */
-    if(H5P_register_real(pclass, H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME, H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE, &def_mpio_no_collective_cause, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME, H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE,
+                          &def_mpio_no_collective_cause, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the global cause of broken collective I/O */
-    if(H5P_register_real(pclass, H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME, H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE, &def_mpio_no_collective_cause, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME, H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE,
+                          &def_mpio_no_collective_cause, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the MPI memory type property */
-    if(H5P_register_real(pclass, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, H5FD_MPI_XFER_MEM_MPI_TYPE_SIZE, 
-                         &btype, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, H5FD_MPI_XFER_MEM_MPI_TYPE_SIZE, &btype,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the MPI file type property */
-    if(H5P_register_real(pclass, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, H5FD_MPI_XFER_FILE_MPI_TYPE_SIZE, 
-                         &ftype, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, H5FD_MPI_XFER_FILE_MPI_TYPE_SIZE, &ftype,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 #endif /* H5_HAVE_PARALLEL */
 
     /* Register the EDC property */
-    if(H5P_register_real(pclass, H5D_XFER_EDC_NAME, H5D_XFER_EDC_SIZE, &enable_edc, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_EDC_NAME, H5D_XFER_EDC_SIZE, &enable_edc, NULL, NULL, NULL, NULL,
+                          NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the filter callback property */
-    if(H5P_register_real(pclass, H5D_XFER_FILTER_CB_NAME, H5D_XFER_FILTER_CB_SIZE, &filter_cb, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_FILTER_CB_NAME, H5D_XFER_FILTER_CB_SIZE, &filter_cb, NULL, NULL,
+                          NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the type conversion callback property */
-    if(H5P_register_real(pclass, H5D_XFER_CONV_CB_NAME, H5D_XFER_CONV_CB_SIZE, &conv_cb, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_CONV_CB_NAME, H5D_XFER_CONV_CB_SIZE, &conv_cb, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the data transform property */
-    if(H5P_register_real(pclass, H5D_XFER_XFORM_NAME, H5D_XFER_XFORM_SIZE, &def_xfer_xform, NULL, NULL, NULL, H5D_XFER_XFORM_DEL, H5D_XFER_XFORM_COPY, H5D_XFER_XFORM_CMP, H5D_XFER_XFORM_CLOSE) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_XFORM_NAME, H5D_XFER_XFORM_SIZE, &def_xfer_xform, NULL, NULL, NULL,
+                          H5D_XFER_XFORM_DEL, H5D_XFER_XFORM_COPY, H5D_XFER_XFORM_CMP,
+                          H5D_XFER_XFORM_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the property of flag for direct chunk write */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_NAME, H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_SIZE, &direct_chunk_flag,
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_NAME,
+                          H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_SIZE, &direct_chunk_flag, NULL, NULL, NULL, NULL,
+                          NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the property of filter for direct chunk write */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_NAME, H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_SIZE, &direct_chunk_filters,
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_NAME,
+                          H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_SIZE, &direct_chunk_filters, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the property of offset for direct chunk write */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_NAME, H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_SIZE, &direct_chunk_offset,
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_NAME,
+                          H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_SIZE, &direct_chunk_offset, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the property of datasize for direct chunk write */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_NAME, H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_SIZE, &direct_chunk_datasize,
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_NAME,
+                          H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_SIZE, &direct_chunk_datasize, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the property of flag for direct chunk read */
     /* (Note: this property should not have an encode/decode callback) */
-    if(H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_READ_FLAG_NAME, H5D_XFER_DIRECT_CHUNK_READ_FLAG_SIZE, &direct_chunk_read_flag,
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_READ_FLAG_NAME, H5D_XFER_DIRECT_CHUNK_READ_FLAG_SIZE,
+                          &direct_chunk_read_flag, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the property of filter for direct chunk read */
     /* (Note: this property should not have an encode/decode callback) */
-    if(H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_READ_FILTERS_NAME, H5D_XFER_DIRECT_CHUNK_READ_FILTERS_SIZE, &direct_chunk_read_filters,
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_READ_FILTERS_NAME,
+                          H5D_XFER_DIRECT_CHUNK_READ_FILTERS_SIZE, &direct_chunk_read_filters, NULL, NULL,
+                          NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the property of offset for direct chunk read */
     /* (Note: this property should not have an encode/decode callback) */
-    if(H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_READ_OFFSET_NAME, H5D_XFER_DIRECT_CHUNK_READ_OFFSET_SIZE, &direct_chunk_read_offset,
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5D_XFER_DIRECT_CHUNK_READ_OFFSET_NAME,
+                          H5D_XFER_DIRECT_CHUNK_READ_OFFSET_SIZE, &direct_chunk_read_offset, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dxfr_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5P_dxfr_xform_del
  *
@@ -411,22 +449,22 @@ done:
  */
 /* ARGSUSED */
 static herr_t
-H5P__dxfr_xform_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
+H5P__dxfr_xform_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size,
+                    void *value)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(value);
 
-    if(H5Z_xform_destroy(*(H5Z_data_xform_t **)value) < 0)
+    if (H5Z_xform_destroy(*(H5Z_data_xform_t **)value) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL, "error closing the parse tree")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dxfr_xform_del() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5P__dxfr_xform_copy
  *
@@ -445,20 +483,19 @@ done:
 static herr_t
 H5P__dxfr_xform_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(value);
 
-    if(H5Z_xform_copy((H5Z_data_xform_t **)value) < 0)
+    if (H5Z_xform_copy((H5Z_data_xform_t **)value) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL, "error copying the data transform info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dxfr_xform_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5P__dxfr_xform_cmp
  *
@@ -475,10 +512,12 @@ done:
 static int
 H5P__dxfr_xform_cmp(const void *_xform1, const void *_xform2, size_t H5_ATTR_UNUSED size)
 {
-    const H5Z_data_xform_t * const *xform1 = (const H5Z_data_xform_t * const *)_xform1; /* Create local aliases for values */
-    const H5Z_data_xform_t * const *xform2 = (const H5Z_data_xform_t * const *)_xform2; /* Create local aliases for values */
-    const char *pexp1, *pexp2;          /* Pointers to transform expressions */
-    herr_t ret_value = 0;               /* Return value */
+    const H5Z_data_xform_t *const *xform1 =
+        (const H5Z_data_xform_t *const *)_xform1; /* Create local aliases for values */
+    const H5Z_data_xform_t *const *xform2 =
+        (const H5Z_data_xform_t *const *)_xform2; /* Create local aliases for values */
+    const char *pexp1, *pexp2;                    /* Pointers to transform expressions */
+    herr_t      ret_value = 0;                    /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -488,31 +527,34 @@ H5P__dxfr_xform_cmp(const void *_xform1, const void *_xform2, size_t H5_ATTR_UNU
     HDassert(size == sizeof(H5Z_data_xform_t *));
 
     /* Check for a property being set */
-    if(*xform1 == NULL && *xform2 != NULL) HGOTO_DONE(-1);
-    if(*xform1 != NULL && *xform2 == NULL) HGOTO_DONE(1);
+    if (*xform1 == NULL && *xform2 != NULL)
+        HGOTO_DONE(-1);
+    if (*xform1 != NULL && *xform2 == NULL)
+        HGOTO_DONE(1);
 
-    if(*xform1) {
+    if (*xform1) {
         HDassert(*xform2);
-    
+
         /* Get the transform expressions */
         pexp1 = H5Z_xform_extract_xform_str(*xform1);
         pexp2 = H5Z_xform_extract_xform_str(*xform2);
 
         /* Check for property expressions */
-        if(pexp1 == NULL && pexp2 != NULL) HGOTO_DONE(-1);
-        if(pexp1 != NULL && pexp2 == NULL) HGOTO_DONE(1);
+        if (pexp1 == NULL && pexp2 != NULL)
+            HGOTO_DONE(-1);
+        if (pexp1 != NULL && pexp2 == NULL)
+            HGOTO_DONE(1);
 
-        if(pexp1) {
+        if (pexp1) {
             HDassert(pexp2);
             ret_value = HDstrcmp(pexp1, pexp2);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dxfr_xform_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5P__dxfr_xform_close
  *
@@ -530,20 +572,19 @@ done:
 static herr_t
 H5P__dxfr_xform_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(value);
 
-    if(H5Z_xform_destroy(*(H5Z_data_xform_t **)value) < 0)
+    if (H5Z_xform_destroy(*(H5Z_data_xform_t **)value) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL, "error closing the parse tree")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__dxfr_xform_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_data_transform
  *
@@ -559,47 +600,46 @@ done:
 herr_t
 H5Pset_data_transform(hid_t plist_id, const char *expression)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
+    H5P_genplist_t *  plist;                     /* Property list pointer */
     H5Z_data_xform_t *data_xform_prop = NULL;    /* New data xform property */
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t            ret_value       = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", plist_id, expression);
 
     /* Check arguments */
-    if(expression == NULL)
+    if (expression == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "expression cannot be NULL")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* See if a data transform is already set, and free it if it is */
-    if(H5P_get(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) < 0)
+    if (H5P_get(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting data transform expression")
 
     /* Destroy previous data transform property */
-    if(H5Z_xform_destroy(data_xform_prop) < 0)
+    if (H5Z_xform_destroy(data_xform_prop) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CLOSEERROR, FAIL, "unable to release data transform expression")
 
     /* Create data transform info from expression */
-    if(NULL == (data_xform_prop = H5Z_xform_create(expression)))
+    if (NULL == (data_xform_prop = H5Z_xform_create(expression)))
         HGOTO_ERROR(H5E_PLINE, H5E_NOSPACE, FAIL, "unable to create data transform info")
 
     /* Update property list */
-    if(H5P_set(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) < 0)
+    if (H5P_set(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "Error setting data transform expression")
 
 done:
-    if(ret_value <  0) {
-        if(data_xform_prop && H5Z_xform_destroy(data_xform_prop) <  0)
+    if (ret_value < 0) {
+        if (data_xform_prop && H5Z_xform_destroy(data_xform_prop) < 0)
             HDONE_ERROR(H5E_PLINE, H5E_CLOSEERROR, FAIL, "unable to release data transform expression")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_data_transform() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_data_transform
  *
@@ -625,48 +665,47 @@ done:
 ssize_t
 H5Pget_data_transform(hid_t plist_id, char *expression /*out*/, size_t size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5Z_data_xform_t *data_xform_prop = NULL;    /* New data xform property */
-    size_t	len;
-    const char*	pexp;
-    ssize_t 	ret_value;   /* return value */
+    H5P_genplist_t *  plist;                  /* Property list pointer */
+    H5Z_data_xform_t *data_xform_prop = NULL; /* New data xform property */
+    size_t            len;
+    const char *      pexp;
+    ssize_t           ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "ixz", plist_id, expression, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-    if(H5P_get(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) < 0)
+    if (H5P_get(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "error getting data transform expression")
 
-    if(NULL == data_xform_prop)
+    if (NULL == data_xform_prop)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "data transform has not been set")
 
     /* Get the data transform string */
-    if(NULL == (pexp = H5Z_xform_extract_xform_str(data_xform_prop)))
-	HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "failed to retrieve transform expression")
+    if (NULL == (pexp = H5Z_xform_extract_xform_str(data_xform_prop)))
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "failed to retrieve transform expression")
 
     len = HDstrlen(pexp);
-    if(expression) {
-	HDstrncpy(expression, pexp, MIN(len + 1, size));
-        if(len >= size)
+    if (expression) {
+        HDstrncpy(expression, pexp, MIN(len + 1, size));
+        if (len >= size)
             expression[size - 1] = '\0';
     } /* end if */
 
     ret_value = (ssize_t)len;
 
 done:
-    if(ret_value < 0) {
-	if(data_xform_prop && H5Z_xform_destroy(data_xform_prop) < 0)
+    if (ret_value < 0) {
+        if (data_xform_prop && H5Z_xform_destroy(data_xform_prop) < 0)
             HDONE_ERROR(H5E_PLINE, H5E_CLOSEERROR, FAIL, "unable to release data transform expression")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_data_transform() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_buffer
  *
@@ -691,33 +730,32 @@ done:
 herr_t
 H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iz*x*x", plist_id, size, tconv, bkg);
 
     /* Check arguments */
-    if(size == 0)
+    if (size == 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "buffer size must not be zero")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Update property list */
-    if(H5P_set(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size) < 0)
+    if (H5P_set(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "Can't set transfer buffer size")
-    if(H5P_set(plist, H5D_XFER_TCONV_BUF_NAME, &tconv) < 0)
+    if (H5P_set(plist, H5D_XFER_TCONV_BUF_NAME, &tconv) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "Can't set transfer type conversion buffer")
-    if(H5P_set(plist, H5D_XFER_BKGR_BUF_NAME, &bkg) < 0)
+    if (H5P_set(plist, H5D_XFER_BKGR_BUF_NAME, &bkg) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "Can't set background type conversion buffer")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_buffer() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_buffer
  *
@@ -733,29 +771,29 @@ done:
  *-------------------------------------------------------------------------
  */
 size_t
-H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/)
+H5Pget_buffer(hid_t plist_id, void **tconv /*out*/, void **bkg /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t size;                /* Type conversion buffer size */
-    size_t ret_value;           /* Return value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    size_t          size;      /* Type conversion buffer size */
+    size_t          ret_value; /* Return value */
 
     FUNC_ENTER_API(0)
     H5TRACE3("z", "ixx", plist_id, tconv, bkg);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, 0, "can't find object for ID")
 
     /* Return values */
-    if(tconv)
-        if(H5P_get(plist, H5D_XFER_TCONV_BUF_NAME, tconv) < 0)
+    if (tconv)
+        if (H5P_get(plist, H5D_XFER_TCONV_BUF_NAME, tconv) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, 0, "Can't get transfer type conversion buffer")
-    if(bkg)
-        if(H5P_get(plist, H5D_XFER_BKGR_BUF_NAME, bkg) < 0)
+    if (bkg)
+        if (H5P_get(plist, H5D_XFER_BKGR_BUF_NAME, bkg) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, 0, "Can't get background type conversion buffer")
 
     /* Get the size */
-    if(H5P_get(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size) < 0)
+    if (H5P_get(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, 0, "Can't set transfer buffer size")
 
     /* Set the return value */
@@ -765,7 +803,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_buffer() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_preserve
  *
@@ -785,27 +822,26 @@ done:
 herr_t
 H5Pset_preserve(hid_t plist_id, hbool_t status)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5T_bkg_t need_bkg;         /* Value for background buffer type */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5T_bkg_t       need_bkg;            /* Value for background buffer type */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ib", plist_id, status);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Update property list */
     need_bkg = status ? H5T_BKG_YES : H5T_BKG_NO;
-    if(H5P_set(plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &need_bkg) < 0)
+    if (H5P_set(plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &need_bkg) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_preserve() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_preserve
  *
@@ -823,19 +859,19 @@ done:
 int
 H5Pget_preserve(hid_t plist_id)
 {
-    H5T_bkg_t need_bkg;         /* Background value */
-    H5P_genplist_t *plist;      /* Property list pointer */
-    int ret_value;              /* return value */
+    H5T_bkg_t       need_bkg;  /* Background value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    int             ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(H5P_get(plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &need_bkg) < 0)
+    if (H5P_get(plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &need_bkg) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
 
     /* Set return value */
@@ -845,7 +881,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_preserve() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_edc_check
  *
@@ -864,29 +899,28 @@ done:
 herr_t
 H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iZe", plist_id, check);
 
     /* Check argument */
-    if(check != H5Z_ENABLE_EDC && check != H5Z_DISABLE_EDC)
+    if (check != H5Z_ENABLE_EDC && check != H5Z_DISABLE_EDC)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid value")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Update property list */
-    if(H5P_set(plist, H5D_XFER_EDC_NAME, &check) < 0)
+    if (H5P_set(plist, H5D_XFER_EDC_NAME, &check) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_edc_check() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_edc_check
  *
@@ -905,25 +939,24 @@ done:
 H5Z_EDC_t
 H5Pget_edc_check(hid_t plist_id)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5Z_EDC_t      ret_value;   /* Return value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    H5Z_EDC_t       ret_value; /* Return value */
 
     FUNC_ENTER_API(H5Z_ERROR_EDC)
     H5TRACE1("Ze", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5Z_ERROR_EDC, "can't find object for ID")
 
     /* Update property list */
-    if(H5P_get(plist, H5D_XFER_EDC_NAME, &ret_value) < 0)
+    if (H5P_get(plist, H5D_XFER_EDC_NAME, &ret_value) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, H5Z_ERROR_EDC, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_edc_check() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_filter_callback
  *
@@ -943,29 +976,28 @@ done:
 herr_t
 H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, void *op_data)
 {
-    H5P_genplist_t      *plist;      /* Property list pointer */
-    herr_t              ret_value=SUCCEED;   /* return value */
-    H5Z_cb_t            cb_struct;
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
+    H5Z_cb_t        cb_struct;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ix*x", plist_id, func, op_data);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Update property list */
-    cb_struct.func = func;
+    cb_struct.func    = func;
     cb_struct.op_data = op_data;
 
-    if (H5P_set(plist,H5D_XFER_FILTER_CB_NAME,&cb_struct)<0)
+    if (H5P_set(plist, H5D_XFER_FILTER_CB_NAME, &cb_struct) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_type_conv_cb
  *
@@ -985,29 +1017,28 @@ done:
 herr_t
 H5Pset_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t op, void *operate_data)
 {
-    H5P_genplist_t      *plist;      /* Property list pointer */
-    herr_t              ret_value=SUCCEED;   /* return value */
-    H5T_conv_cb_t       cb_struct;
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
+    H5T_conv_cb_t   cb_struct;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ix*x", plist_id, op, operate_data);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Update property list */
-    cb_struct.func = op;
+    cb_struct.func      = op;
     cb_struct.user_data = operate_data;
 
-    if (H5P_set(plist,H5D_XFER_CONV_CB_NAME,&cb_struct)<0)
+    if (H5P_set(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_type_conv_cb
  *
@@ -1027,30 +1058,29 @@ done:
 herr_t
 H5Pget_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t *op, void **operate_data)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5T_conv_cb_t       cb_struct;
-    herr_t              ret_value=SUCCEED;   /* return value */
+    H5P_genplist_t *plist; /* Property list pointer */
+    H5T_conv_cb_t   cb_struct;
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*x**x", plist_id, op, operate_data);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get property */
-    if (H5P_get(plist,H5D_XFER_CONV_CB_NAME,&cb_struct)<0)
+    if (H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
     /* Assign return value */
-    *op = cb_struct.func;
+    *op           = cb_struct.func;
     *operate_data = cb_struct.user_data;
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_btree_ratios
  *
@@ -1067,37 +1097,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, double *middle/*out*/,
-    double *right/*out*/)
+H5Pget_btree_ratios(hid_t plist_id, double *left /*out*/, double *middle /*out*/, double *right /*out*/)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    double btree_split_ratio[3];        /* B-tree node split ratios */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;                /* Property list pointer */
+    double          btree_split_ratio[3]; /* B-tree node split ratios */
+    herr_t          ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "ixxx", plist_id, left, middle, right);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the split ratios */
-    if(H5P_get(plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &btree_split_ratio) < 0)
+    if (H5P_get(plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &btree_split_ratio) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
 
     /* Get values */
-    if(left)
+    if (left)
         *left = btree_split_ratio[0];
-    if(middle)
+    if (middle)
         *middle = btree_split_ratio[1];
-    if(right)
+    if (right)
         *right = btree_split_ratio[2];
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_btree_ratios() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_btree_ratios
  *
@@ -1119,24 +1147,22 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
-    double right)
+H5Pset_btree_ratios(hid_t plist_id, double left, double middle, double right)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    double split_ratio[3];      /* B-tree node split ratios */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    double          split_ratio[3];      /* B-tree node split ratios */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iddd", plist_id, left, middle, right);
 
     /* Check arguments */
-    if(left < (double)0.0f || left > (double)1.0f
-            || middle < (double)0.0f || middle > (double)1.0f
-            || right < (double)0.0f || right > (double)1.0f)
+    if (left < (double)0.0f || left > (double)1.0f || middle < (double)0.0f || middle > (double)1.0f ||
+        right < (double)0.0f || right > (double)1.0f)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "split ratio must satisfy 0.0<=X<=1.0")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
@@ -1145,14 +1171,13 @@ H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
     split_ratio[2] = right;
 
     /* Set the split ratios */
-    if(H5P_set(plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &split_ratio) < 0)
+    if (H5P_set(plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &split_ratio) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_btree_ratios() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_set_vlen_mem_manager
  *
@@ -1173,30 +1198,29 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P_set_vlen_mem_manager(H5P_genplist_t *plist, H5MM_allocate_t alloc_func,
-    void *alloc_info, H5MM_free_t free_func, void *free_info)
+H5P_set_vlen_mem_manager(H5P_genplist_t *plist, H5MM_allocate_t alloc_func, void *alloc_info,
+                         H5MM_free_t free_func, void *free_info)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(plist);
 
     /* Update property list */
-    if(H5P_set(plist, H5D_XFER_VLEN_ALLOC_NAME, &alloc_func) < 0)
+    if (H5P_set(plist, H5D_XFER_VLEN_ALLOC_NAME, &alloc_func) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
-    if(H5P_set(plist, H5D_XFER_VLEN_ALLOC_INFO_NAME, &alloc_info) < 0)
+    if (H5P_set(plist, H5D_XFER_VLEN_ALLOC_INFO_NAME, &alloc_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
-    if(H5P_set(plist, H5D_XFER_VLEN_FREE_NAME, &free_func) < 0)
+    if (H5P_set(plist, H5D_XFER_VLEN_FREE_NAME, &free_func) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
-    if(H5P_set(plist, H5D_XFER_VLEN_FREE_INFO_NAME, &free_info) < 0)
+    if (H5P_set(plist, H5D_XFER_VLEN_FREE_INFO_NAME, &free_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_set_vlen_mem_manager() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_vlen_mem_manager
  *
@@ -1217,29 +1241,27 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func,
-    void *alloc_info, H5MM_free_t free_func, void *free_info)
+H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func,
+                        void *free_info)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE5("e", "ix*xx*x", plist_id, alloc_func, alloc_info, free_func,
-             free_info);
+    H5TRACE5("e", "ix*xx*x", plist_id, alloc_func, alloc_info, free_func, free_info);
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
     /* Update property list */
-    if(H5P_set_vlen_mem_manager(plist, alloc_func, alloc_info, free_func, free_info) < 0)
+    if (H5P_set_vlen_mem_manager(plist, alloc_func, alloc_info, free_func, free_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set values")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_vlen_mem_manager() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_vlen_mem_manager
  *
@@ -1253,37 +1275,36 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func/*out*/,
-    void **alloc_info/*out*/, H5MM_free_t *free_func/*out*/, void **free_info/*out*/)
+H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func /*out*/, void **alloc_info /*out*/,
+                        H5MM_free_t *free_func /*out*/, void **free_info /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "ixxxx", plist_id, alloc_func, alloc_info, free_func, free_info);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-    if(alloc_func)
-        if(H5P_get(plist, H5D_XFER_VLEN_ALLOC_NAME, alloc_func) < 0)
+    if (alloc_func)
+        if (H5P_get(plist, H5D_XFER_VLEN_ALLOC_NAME, alloc_func) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
-    if(alloc_info)
-        if(H5P_get(plist, H5D_XFER_VLEN_ALLOC_INFO_NAME, alloc_info) < 0)
+    if (alloc_info)
+        if (H5P_get(plist, H5D_XFER_VLEN_ALLOC_INFO_NAME, alloc_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
-    if(free_func)
-        if(H5P_get(plist, H5D_XFER_VLEN_FREE_NAME, free_func) < 0)
+    if (free_func)
+        if (H5P_get(plist, H5D_XFER_VLEN_FREE_NAME, free_func) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
-    if(free_info)
-        if(H5P_get(plist, H5D_XFER_VLEN_FREE_INFO_NAME, free_info) < 0)
+    if (free_info)
+        if (H5P_get(plist, H5D_XFER_VLEN_FREE_INFO_NAME, free_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_vlen_mem_manager() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_hyper_vector_size
  *
@@ -1308,29 +1329,28 @@ done:
 herr_t
 H5Pset_hyper_vector_size(hid_t plist_id, size_t vector_size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", plist_id, vector_size);
 
     /* Check arguments */
-    if(vector_size < 1)
+    if (vector_size < 1)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "vector size too small")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Update property list */
-    if(H5P_set(plist, H5D_XFER_HYPER_VECTOR_SIZE_NAME, &vector_size) < 0)
+    if (H5P_set(plist, H5D_XFER_HYPER_VECTOR_SIZE_NAME, &vector_size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_hyper_vector_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_hyper_vector_size
  *
@@ -1344,21 +1364,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_hyper_vector_size(hid_t plist_id, size_t *vector_size/*out*/)
+H5Pget_hyper_vector_size(hid_t plist_id, size_t *vector_size /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, vector_size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Return values */
-    if(vector_size)
-        if(H5P_get(plist, H5D_XFER_HYPER_VECTOR_SIZE_NAME, vector_size) < 0)
+    if (vector_size)
+        if (H5P_get(plist, H5D_XFER_HYPER_VECTOR_SIZE_NAME, vector_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
 
 done:
@@ -1366,7 +1386,7 @@ done:
 } /* end H5Pget_hyper_vector_size() */
 
 #ifdef H5_HAVE_PARALLEL
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_mpio_actual_chunk_opt_mode
  *
@@ -1382,26 +1402,25 @@ done:
 herr_t
 H5Pget_mpio_actual_chunk_opt_mode(hid_t plist_id, H5D_mpio_actual_chunk_opt_mode_t *actual_chunk_opt_mode)
 {
-    H5P_genplist_t     *plist;
-    herr_t ret_value = SUCCEED;   /* return value */
-    
+    H5P_genplist_t *plist;
+    herr_t          ret_value = SUCCEED; /* return value */
+
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Do", plist_id, actual_chunk_opt_mode);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Return values */
-    if(actual_chunk_opt_mode)
-        if(H5P_get(plist, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, actual_chunk_opt_mode) < 0)
+    if (actual_chunk_opt_mode)
+        if (H5P_get(plist, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, actual_chunk_opt_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_mpio_actual_chunk_opt_mode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_mpio_actual_io_mode
  *
@@ -1418,19 +1437,19 @@ done:
 herr_t
 H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t *actual_io_mode)
 {
-    H5P_genplist_t     *plist;
-    herr_t ret_value = SUCCEED;   /* return value */
-    
+    H5P_genplist_t *plist;
+    herr_t          ret_value = SUCCEED; /* return value */
+
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Di", plist_id, actual_io_mode);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Return values */
-    if(actual_io_mode)
-        if(H5P_get(plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, actual_io_mode) < 0)
+    if (actual_io_mode)
+        if (H5P_get(plist, H5D_MPIO_ACTUAL_IO_MODE_NAME, actual_io_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
 
 done:
@@ -1449,31 +1468,29 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_mpio_no_collective_cause(hid_t plist_id, uint32_t *local_no_collective_cause, uint32_t *global_no_collective_cause)
+H5Pget_mpio_no_collective_cause(hid_t plist_id, uint32_t *local_no_collective_cause,
+                                uint32_t *global_no_collective_cause)
 {
-    H5P_genplist_t     *plist;
-    herr_t ret_value = SUCCEED;   /* return value */
-    
+    H5P_genplist_t *plist;
+    herr_t          ret_value = SUCCEED; /* return value */
+
     FUNC_ENTER_API(FAIL)
-    H5TRACE3("e", "i*Iu*Iu", plist_id, local_no_collective_cause,
-             global_no_collective_cause);
+    H5TRACE3("e", "i*Iu*Iu", plist_id, local_no_collective_cause, global_no_collective_cause);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Return values */
-    if(local_no_collective_cause)
-        if(H5P_get(plist, H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME, local_no_collective_cause) < 0)
+    if (local_no_collective_cause)
+        if (H5P_get(plist, H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME, local_no_collective_cause) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get local value")
-    if(global_no_collective_cause)
-        if(H5P_get(plist, H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME, global_no_collective_cause) < 0)
+    if (global_no_collective_cause)
+        if (H5P_get(plist, H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME, global_no_collective_cause) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get global value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_mpio_no_collective_cause() */
 
-
 #endif /* H5_HAVE_PARALLEL */
-
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index e19448d..35ebffe 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -25,125 +25,121 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files		  	        */
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"        /* Memory Management                    */
-#include "H5Ppkg.h"		/* Property lists		  	*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* Files		  	        */
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory Management                    */
+#include "H5Ppkg.h"      /* Property lists		  	*/
 
 /* Includes needed to set as default file driver */
-#include "H5FDsec2.h"		/* Posix unbuffered I/O	file driver	*/
-#include "H5FDstdio.h"		/* Standard C buffered I/O		*/
+#include "H5FDsec2.h"  /* Posix unbuffered I/O	file driver	*/
+#include "H5FDstdio.h" /* Standard C buffered I/O		*/
 #ifdef H5_HAVE_WINDOWS
-#include "H5FDwindows.h"        /* Windows buffered I/O                 */
+#include "H5FDwindows.h" /* Windows buffered I/O                 */
 #endif
 
-
 /****************/
 /* Local Macros */
 /****************/
 
 /* ========= File Access properties ============ */
 /* Definitions for the initial metadata cache resize configuration */
-#define H5F_ACS_META_CACHE_INIT_CONFIG_SIZE	sizeof(H5AC_cache_config_t)
-#define H5F_ACS_META_CACHE_INIT_CONFIG_DEF	H5AC__DEFAULT_CACHE_CONFIG
+#define H5F_ACS_META_CACHE_INIT_CONFIG_SIZE sizeof(H5AC_cache_config_t)
+#define H5F_ACS_META_CACHE_INIT_CONFIG_DEF  H5AC__DEFAULT_CACHE_CONFIG
 /* Definitions for size of raw data chunk cache(slots) */
-#define H5F_ACS_DATA_CACHE_NUM_SLOTS_SIZE       sizeof(size_t)
-#define H5F_ACS_DATA_CACHE_NUM_SLOTS_DEF        521
+#define H5F_ACS_DATA_CACHE_NUM_SLOTS_SIZE sizeof(size_t)
+#define H5F_ACS_DATA_CACHE_NUM_SLOTS_DEF  521
 /* Definition for size of raw data chunk cache(bytes) */
-#define H5F_ACS_DATA_CACHE_BYTE_SIZE_SIZE       sizeof(size_t)
-#define H5F_ACS_DATA_CACHE_BYTE_SIZE_DEF        (1024*1024)
+#define H5F_ACS_DATA_CACHE_BYTE_SIZE_SIZE sizeof(size_t)
+#define H5F_ACS_DATA_CACHE_BYTE_SIZE_DEF  (1024 * 1024)
 /* Definition for preemption read chunks first */
-#define H5F_ACS_PREEMPT_READ_CHUNKS_SIZE        sizeof(double)
-#define H5F_ACS_PREEMPT_READ_CHUNKS_DEF         0.75f
+#define H5F_ACS_PREEMPT_READ_CHUNKS_SIZE sizeof(double)
+#define H5F_ACS_PREEMPT_READ_CHUNKS_DEF  0.75f
 /* Definition for threshold for alignment */
-#define H5F_ACS_ALIGN_THRHD_SIZE                sizeof(hsize_t)
-#define H5F_ACS_ALIGN_THRHD_DEF                 1
+#define H5F_ACS_ALIGN_THRHD_SIZE sizeof(hsize_t)
+#define H5F_ACS_ALIGN_THRHD_DEF  1
 /* Definition for alignment */
-#define H5F_ACS_ALIGN_SIZE                      sizeof(hsize_t)
-#define H5F_ACS_ALIGN_DEF                       1
+#define H5F_ACS_ALIGN_SIZE sizeof(hsize_t)
+#define H5F_ACS_ALIGN_DEF  1
 /* Definition for minimum metadata allocation block size (when
    aggregating metadata allocations. */
-#define H5F_ACS_META_BLOCK_SIZE_SIZE            sizeof(hsize_t)
-#define H5F_ACS_META_BLOCK_SIZE_DEF             2048
+#define H5F_ACS_META_BLOCK_SIZE_SIZE sizeof(hsize_t)
+#define H5F_ACS_META_BLOCK_SIZE_DEF  2048
 /* Definition for maximum sieve buffer size (when data sieving
    is allowed by file driver */
-#define H5F_ACS_SIEVE_BUF_SIZE_SIZE             sizeof(size_t)
-#define H5F_ACS_SIEVE_BUF_SIZE_DEF              (64*1024)
+#define H5F_ACS_SIEVE_BUF_SIZE_SIZE sizeof(size_t)
+#define H5F_ACS_SIEVE_BUF_SIZE_DEF  (64 * 1024)
 /* Definition for minimum "small data" allocation block size (when
    aggregating "small" raw data allocations. */
-#define H5F_ACS_SDATA_BLOCK_SIZE_SIZE           sizeof(hsize_t)
-#define H5F_ACS_SDATA_BLOCK_SIZE_DEF            2048
+#define H5F_ACS_SDATA_BLOCK_SIZE_SIZE sizeof(hsize_t)
+#define H5F_ACS_SDATA_BLOCK_SIZE_DEF  2048
 /* Definition for garbage-collect references */
-#define H5F_ACS_GARBG_COLCT_REF_SIZE            sizeof(unsigned)
-#define H5F_ACS_GARBG_COLCT_REF_DEF             0
+#define H5F_ACS_GARBG_COLCT_REF_SIZE sizeof(unsigned)
+#define H5F_ACS_GARBG_COLCT_REF_DEF  0
 /* Definition for file driver ID */
-#define H5F_ACS_FILE_DRV_ID_SIZE                sizeof(hid_t)
-#define H5F_ACS_FILE_DRV_ID_DEF                 H5_DEFAULT_VFD
+#define H5F_ACS_FILE_DRV_ID_SIZE sizeof(hid_t)
+#define H5F_ACS_FILE_DRV_ID_DEF  H5_DEFAULT_VFD
 /* Definition for file driver info */
-#define H5F_ACS_FILE_DRV_INFO_SIZE              sizeof(void*)
-#define H5F_ACS_FILE_DRV_INFO_DEF               NULL
+#define H5F_ACS_FILE_DRV_INFO_SIZE sizeof(void *)
+#define H5F_ACS_FILE_DRV_INFO_DEF  NULL
 /* Definition for file close degree */
-#define H5F_CLOSE_DEGREE_SIZE		        sizeof(H5F_close_degree_t)
-#define H5F_CLOSE_DEGREE_DEF		        H5F_CLOSE_DEFAULT
+#define H5F_CLOSE_DEGREE_SIZE sizeof(H5F_close_degree_t)
+#define H5F_CLOSE_DEGREE_DEF  H5F_CLOSE_DEFAULT
 /* Definition for offset position in file for family file driver */
-#define H5F_ACS_FAMILY_OFFSET_SIZE              sizeof(hsize_t)
-#define H5F_ACS_FAMILY_OFFSET_DEF               0
+#define H5F_ACS_FAMILY_OFFSET_SIZE sizeof(hsize_t)
+#define H5F_ACS_FAMILY_OFFSET_DEF  0
 /* Definition for new member size of family driver. It's private
  * property only used by h5repart */
-#define H5F_ACS_FAMILY_NEWSIZE_SIZE             sizeof(hsize_t)
-#define H5F_ACS_FAMILY_NEWSIZE_DEF              0
+#define H5F_ACS_FAMILY_NEWSIZE_SIZE sizeof(hsize_t)
+#define H5F_ACS_FAMILY_NEWSIZE_DEF  0
 /* Definition for whether to convert family to sec2 driver. It's private
  * property only used by h5repart */
-#define H5F_ACS_FAMILY_TO_SEC2_SIZE             sizeof(hbool_t)
-#define H5F_ACS_FAMILY_TO_SEC2_DEF              FALSE
+#define H5F_ACS_FAMILY_TO_SEC2_SIZE sizeof(hbool_t)
+#define H5F_ACS_FAMILY_TO_SEC2_DEF  FALSE
 /* Definition for data type in multi file driver */
-#define H5F_ACS_MULTI_TYPE_SIZE                 sizeof(H5FD_mem_t)
-#define H5F_ACS_MULTI_TYPE_DEF                  H5FD_MEM_DEFAULT
+#define H5F_ACS_MULTI_TYPE_SIZE sizeof(H5FD_mem_t)
+#define H5F_ACS_MULTI_TYPE_DEF  H5FD_MEM_DEFAULT
 /* Definition for 'use latest format version' flag */
-#define H5F_ACS_LATEST_FORMAT_SIZE              sizeof(hbool_t)
-#define H5F_ACS_LATEST_FORMAT_DEF               FALSE
+#define H5F_ACS_LATEST_FORMAT_SIZE sizeof(hbool_t)
+#define H5F_ACS_LATEST_FORMAT_DEF  FALSE
 /* Definition for whether to query the file descriptor from the core VFD
  * instead of the memory address.  (Private to library)
  */
-#define H5F_ACS_WANT_POSIX_FD_SIZE              sizeof(hbool_t)
-#define H5F_ACS_WANT_POSIX_FD_DEF               FALSE
+#define H5F_ACS_WANT_POSIX_FD_SIZE sizeof(hbool_t)
+#define H5F_ACS_WANT_POSIX_FD_DEF  FALSE
 /* Definition for external file cache size */
-#define H5F_ACS_EFC_SIZE_SIZE                   sizeof(unsigned)
-#define H5F_ACS_EFC_SIZE_DEF                    0
+#define H5F_ACS_EFC_SIZE_SIZE sizeof(unsigned)
+#define H5F_ACS_EFC_SIZE_DEF  0
 /* Definition of pointer to initial file image info */
-#define H5F_ACS_FILE_IMAGE_INFO_SIZE            sizeof(H5FD_file_image_info_t)
-#define H5F_ACS_FILE_IMAGE_INFO_DEF             H5FD_DEFAULT_FILE_IMAGE_INFO
-#define H5F_ACS_FILE_IMAGE_INFO_DEL             H5P_file_image_info_del
-#define H5F_ACS_FILE_IMAGE_INFO_COPY            H5P_file_image_info_copy
-#define H5F_ACS_FILE_IMAGE_INFO_CLOSE           H5P_file_image_info_close
+#define H5F_ACS_FILE_IMAGE_INFO_SIZE  sizeof(H5FD_file_image_info_t)
+#define H5F_ACS_FILE_IMAGE_INFO_DEF   H5FD_DEFAULT_FILE_IMAGE_INFO
+#define H5F_ACS_FILE_IMAGE_INFO_DEL   H5P_file_image_info_del
+#define H5F_ACS_FILE_IMAGE_INFO_COPY  H5P_file_image_info_copy
+#define H5F_ACS_FILE_IMAGE_INFO_CLOSE H5P_file_image_info_close
 /* Definition of core VFD write tracking flag */
-#define H5F_ACS_CORE_WRITE_TRACKING_FLAG_SIZE   sizeof(hbool_t)
-#define H5F_ACS_CORE_WRITE_TRACKING_FLAG_DEF    FALSE
+#define H5F_ACS_CORE_WRITE_TRACKING_FLAG_SIZE sizeof(hbool_t)
+#define H5F_ACS_CORE_WRITE_TRACKING_FLAG_DEF  FALSE
 /* Definition of core VFD write tracking page size */
-#define H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_SIZE      sizeof(size_t)
-#define H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_DEF       524288
+#define H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_SIZE sizeof(size_t)
+#define H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_DEF  524288
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -158,41 +154,37 @@ static herr_t H5P_file_image_info_del(hid_t prop_id, const char *name, size_t si
 static herr_t H5P_file_image_info_copy(const char *name, size_t size, void *value);
 static herr_t H5P_file_image_info_close(const char *name, size_t size, void *value);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* File access property list class library initialization object */
 const H5P_libclass_t H5P_CLS_FACC[1] = {{
-    "file access",		/* Class name for debugging     */
-    H5P_TYPE_FILE_ACCESS,       /* Class type                   */
-
-    &H5P_CLS_ROOT_g,		/* Parent class                 */
-    &H5P_CLS_FILE_ACCESS_g,	/* Pointer to class             */
-    &H5P_CLS_FILE_ACCESS_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_FILE_ACCESS_ID_g,	/* Pointer to default property list ID */
-    H5P_facc_reg_prop,		/* Default property registration routine */
-
-    H5P_facc_create,		/* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    H5P_facc_copy,		/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    H5P_facc_close,		/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "file access",        /* Class name for debugging     */
+    H5P_TYPE_FILE_ACCESS, /* Class type                   */
+
+    &H5P_CLS_ROOT_g,           /* Parent class                 */
+    &H5P_CLS_FILE_ACCESS_g,    /* Pointer to class             */
+    &H5P_CLS_FILE_ACCESS_ID_g, /* Pointer to class ID          */
+    &H5P_LST_FILE_ACCESS_ID_g, /* Pointer to default property list ID */
+    H5P_facc_reg_prop,         /* Default property registration routine */
+
+    H5P_facc_create, /* Class creation callback      */
+    NULL,            /* Class creation callback info */
+    H5P_facc_copy,   /* Class copy callback          */
+    NULL,            /* Class copy callback info     */
+    H5P_facc_close,  /* Class close callback         */
+    NULL             /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_facc_reg_prop
  *
@@ -207,133 +199,162 @@ const H5P_libclass_t H5P_CLS_FACC[1] = {{
 static herr_t
 H5P_facc_reg_prop(H5P_genclass_t *pclass)
 {
-    H5AC_cache_config_t mdc_initCacheCfg = H5F_ACS_META_CACHE_INIT_CONFIG_DEF;  /* Default metadata cache settings */
-    size_t rdcc_nslots = H5F_ACS_DATA_CACHE_NUM_SLOTS_DEF;      /* Default raw data chunk cache # of slots */
-    size_t rdcc_nbytes = H5F_ACS_DATA_CACHE_BYTE_SIZE_DEF;      /* Default raw data chunk cache # of bytes */
-    double rdcc_w0 = H5F_ACS_PREEMPT_READ_CHUNKS_DEF;           /* Default raw data chunk cache dirty ratio */
-    hsize_t threshold = H5F_ACS_ALIGN_THRHD_DEF;                /* Default allocation alignment threshold */
-    hsize_t alignment = H5F_ACS_ALIGN_DEF;                      /* Default allocation alignment value */
-    hsize_t meta_block_size = H5F_ACS_META_BLOCK_SIZE_DEF;      /* Default metadata allocation block size */
-    size_t sieve_buf_size = H5F_ACS_SIEVE_BUF_SIZE_DEF;         /* Default raw data I/O sieve buffer size */
-    hsize_t sdata_block_size = H5F_ACS_SDATA_BLOCK_SIZE_DEF;    /* Default small data allocation block size */
-    unsigned gc_ref = H5F_ACS_GARBG_COLCT_REF_DEF;              /* Default garbage collection for references setting */
-    hid_t driver_id = H5F_ACS_FILE_DRV_ID_DEF;                  /* Default VFL driver ID */
-    void *driver_info = H5F_ACS_FILE_DRV_INFO_DEF;              /* Default VFL driver info */
-    H5F_close_degree_t close_degree = H5F_CLOSE_DEGREE_DEF;     /* Default file close degree */
-    hsize_t family_offset = H5F_ACS_FAMILY_OFFSET_DEF;          /* Default offset for family VFD */
-    hsize_t family_newsize = H5F_ACS_FAMILY_NEWSIZE_DEF;        /* Default size of new files for family VFD */
-    hbool_t family_to_sec2 = H5F_ACS_FAMILY_TO_SEC2_DEF;        /* Default ?? for family VFD */
-    H5FD_mem_t mem_type = H5F_ACS_MULTI_TYPE_DEF;               /* Default file space type for multi VFD */
-    hbool_t latest_format = H5F_ACS_LATEST_FORMAT_DEF;          /* Default setting for "use the latest version of the format" flag */
-    hbool_t want_posix_fd = H5F_ACS_WANT_POSIX_FD_DEF;          /* Default setting for retrieving 'handle' from core VFD */
-    unsigned efc_size = H5F_ACS_EFC_SIZE_DEF;                   /* Default external file cache size */
-    H5FD_file_image_info_t file_image_info = H5F_ACS_FILE_IMAGE_INFO_DEF;  /* Default file image info and callbacks */
-    hbool_t core_write_tracking_flag = H5F_ACS_CORE_WRITE_TRACKING_FLAG_DEF;              /* Default setting for core VFD write tracking */
-    size_t core_write_tracking_page_size = H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_DEF;     /* Default core VFD write tracking page size */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5AC_cache_config_t mdc_initCacheCfg =
+        H5F_ACS_META_CACHE_INIT_CONFIG_DEF;                      /* Default metadata cache settings */
+    size_t   rdcc_nslots     = H5F_ACS_DATA_CACHE_NUM_SLOTS_DEF; /* Default raw data chunk cache # of slots */
+    size_t   rdcc_nbytes     = H5F_ACS_DATA_CACHE_BYTE_SIZE_DEF; /* Default raw data chunk cache # of bytes */
+    double   rdcc_w0         = H5F_ACS_PREEMPT_READ_CHUNKS_DEF; /* Default raw data chunk cache dirty ratio */
+    hsize_t  threshold       = H5F_ACS_ALIGN_THRHD_DEF;         /* Default allocation alignment threshold */
+    hsize_t  alignment       = H5F_ACS_ALIGN_DEF;               /* Default allocation alignment value */
+    hsize_t  meta_block_size = H5F_ACS_META_BLOCK_SIZE_DEF;     /* Default metadata allocation block size */
+    size_t   sieve_buf_size  = H5F_ACS_SIEVE_BUF_SIZE_DEF;      /* Default raw data I/O sieve buffer size */
+    hsize_t  sdata_block_size = H5F_ACS_SDATA_BLOCK_SIZE_DEF;   /* Default small data allocation block size */
+    unsigned gc_ref    = H5F_ACS_GARBG_COLCT_REF_DEF; /* Default garbage collection for references setting */
+    hid_t    driver_id = H5F_ACS_FILE_DRV_ID_DEF;     /* Default VFL driver ID */
+    void *   driver_info             = H5F_ACS_FILE_DRV_INFO_DEF; /* Default VFL driver info */
+    H5F_close_degree_t close_degree  = H5F_CLOSE_DEGREE_DEF;      /* Default file close degree */
+    hsize_t            family_offset = H5F_ACS_FAMILY_OFFSET_DEF; /* Default offset for family VFD */
+    hsize_t    family_newsize = H5F_ACS_FAMILY_NEWSIZE_DEF; /* Default size of new files for family VFD */
+    hbool_t    family_to_sec2 = H5F_ACS_FAMILY_TO_SEC2_DEF; /* Default ?? for family VFD */
+    H5FD_mem_t mem_type       = H5F_ACS_MULTI_TYPE_DEF;     /* Default file space type for multi VFD */
+    hbool_t    latest_format =
+        H5F_ACS_LATEST_FORMAT_DEF; /* Default setting for "use the latest version of the format" flag */
+    hbool_t want_posix_fd =
+        H5F_ACS_WANT_POSIX_FD_DEF; /* Default setting for retrieving 'handle' from core VFD */
+    unsigned               efc_size = H5F_ACS_EFC_SIZE_DEF; /* Default external file cache size */
+    H5FD_file_image_info_t file_image_info =
+        H5F_ACS_FILE_IMAGE_INFO_DEF; /* Default file image info and callbacks */
+    hbool_t core_write_tracking_flag =
+        H5F_ACS_CORE_WRITE_TRACKING_FLAG_DEF; /* Default setting for core VFD write tracking */
+    size_t core_write_tracking_page_size =
+        H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_DEF; /* Default core VFD write tracking page size */
+    herr_t ret_value = SUCCEED;                    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Register the initial metadata cache resize configuration */
-    if(H5P_register_real(pclass, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, H5F_ACS_META_CACHE_INIT_CONFIG_SIZE, &mdc_initCacheCfg, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, H5F_ACS_META_CACHE_INIT_CONFIG_SIZE,
+                          &mdc_initCacheCfg, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the size of raw data chunk cache (elements) */
-    if(H5P_register_real(pclass, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, H5F_ACS_DATA_CACHE_NUM_SLOTS_SIZE, &rdcc_nslots, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, H5F_ACS_DATA_CACHE_NUM_SLOTS_SIZE,
+                          &rdcc_nslots, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the size of raw data chunk cache(bytes) */
-    if(H5P_register_real(pclass, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, H5F_ACS_DATA_CACHE_BYTE_SIZE_SIZE, &rdcc_nbytes, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, H5F_ACS_DATA_CACHE_BYTE_SIZE_SIZE,
+                          &rdcc_nbytes, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the preemption for reading chunks */
-    if(H5P_register_real(pclass, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, H5F_ACS_PREEMPT_READ_CHUNKS_SIZE, &rdcc_w0, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, H5F_ACS_PREEMPT_READ_CHUNKS_SIZE,
+                          &rdcc_w0, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the threshold for alignment */
-    if(H5P_register_real(pclass, H5F_ACS_ALIGN_THRHD_NAME, H5F_ACS_ALIGN_THRHD_SIZE, &threshold, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_ALIGN_THRHD_NAME, H5F_ACS_ALIGN_THRHD_SIZE, &threshold, NULL, NULL,
+                          NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the alignment */
-    if(H5P_register_real(pclass, H5F_ACS_ALIGN_NAME, H5F_ACS_ALIGN_SIZE, &alignment, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_ALIGN_NAME, H5F_ACS_ALIGN_SIZE, &alignment, NULL, NULL, NULL, NULL,
+                          NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the minimum metadata allocation block size */
-    if(H5P_register_real(pclass, H5F_ACS_META_BLOCK_SIZE_NAME, H5F_ACS_META_BLOCK_SIZE_SIZE, &meta_block_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_META_BLOCK_SIZE_NAME, H5F_ACS_META_BLOCK_SIZE_SIZE,
+                          &meta_block_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the maximum sieve buffer size */
-    if(H5P_register_real(pclass, H5F_ACS_SIEVE_BUF_SIZE_NAME, H5F_ACS_SIEVE_BUF_SIZE_SIZE, &sieve_buf_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_SIEVE_BUF_SIZE_NAME, H5F_ACS_SIEVE_BUF_SIZE_SIZE, &sieve_buf_size,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the minimum "small data" allocation block size */
-    if(H5P_register_real(pclass, H5F_ACS_SDATA_BLOCK_SIZE_NAME, H5F_ACS_SDATA_BLOCK_SIZE_SIZE, &sdata_block_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_SDATA_BLOCK_SIZE_NAME, H5F_ACS_SDATA_BLOCK_SIZE_SIZE,
+                          &sdata_block_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the garbage collection reference */
-    if(H5P_register_real(pclass, H5F_ACS_GARBG_COLCT_REF_NAME, H5F_ACS_GARBG_COLCT_REF_SIZE, &gc_ref, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_GARBG_COLCT_REF_NAME, H5F_ACS_GARBG_COLCT_REF_SIZE, &gc_ref, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the file driver ID */
-    if(H5P_register_real(pclass, H5F_ACS_FILE_DRV_ID_NAME, H5F_ACS_FILE_DRV_ID_SIZE, &driver_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_FILE_DRV_ID_NAME, H5F_ACS_FILE_DRV_ID_SIZE, &driver_id, NULL, NULL,
+                          NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the file driver info */
-    if(H5P_register_real(pclass, H5F_ACS_FILE_DRV_INFO_NAME, H5F_ACS_FILE_DRV_INFO_SIZE, &driver_info, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_FILE_DRV_INFO_NAME, H5F_ACS_FILE_DRV_INFO_SIZE, &driver_info, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the file close degree */
-    if(H5P_register_real(pclass, H5F_ACS_CLOSE_DEGREE_NAME, H5F_CLOSE_DEGREE_SIZE, &close_degree, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_CLOSE_DEGREE_NAME, H5F_CLOSE_DEGREE_SIZE, &close_degree, NULL, NULL,
+                          NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the offset of family driver info */
-    if(H5P_register_real(pclass, H5F_ACS_FAMILY_OFFSET_NAME, H5F_ACS_FAMILY_OFFSET_SIZE, &family_offset, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_FAMILY_OFFSET_NAME, H5F_ACS_FAMILY_OFFSET_SIZE, &family_offset,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the private property of new family file size. It's used by h5repart only. */
-    if(H5P_register_real(pclass, H5F_ACS_FAMILY_NEWSIZE_NAME, H5F_ACS_FAMILY_NEWSIZE_SIZE, &family_newsize, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_FAMILY_NEWSIZE_NAME, H5F_ACS_FAMILY_NEWSIZE_SIZE, &family_newsize,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the private property of whether convert family to sec2 driver. It's used by h5repart only. */
-    if(H5P_register_real(pclass, H5F_ACS_FAMILY_TO_SEC2_NAME, H5F_ACS_FAMILY_TO_SEC2_SIZE, &family_to_sec2, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_FAMILY_TO_SEC2_NAME, H5F_ACS_FAMILY_TO_SEC2_SIZE, &family_to_sec2,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the data type of multi driver info */
-    if(H5P_register_real(pclass, H5F_ACS_MULTI_TYPE_NAME, H5F_ACS_MULTI_TYPE_SIZE, &mem_type, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_MULTI_TYPE_NAME, H5F_ACS_MULTI_TYPE_SIZE, &mem_type, NULL, NULL,
+                          NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the 'use the latest version of the format' flag */
-    if(H5P_register_real(pclass, H5F_ACS_LATEST_FORMAT_NAME, H5F_ACS_LATEST_FORMAT_SIZE, &latest_format, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_LATEST_FORMAT_NAME, H5F_ACS_LATEST_FORMAT_SIZE, &latest_format,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the private property of whether to retrieve the file descriptor from the core VFD */
     /* (used internally to the library only) */
-    if(H5P_register_real(pclass, H5F_ACS_WANT_POSIX_FD_NAME, H5F_ACS_WANT_POSIX_FD_SIZE, &want_posix_fd, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_WANT_POSIX_FD_NAME, H5F_ACS_WANT_POSIX_FD_SIZE, &want_posix_fd,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the external file cache size */
-    if(H5P_register_real(pclass, H5F_ACS_EFC_SIZE_NAME, H5F_ACS_EFC_SIZE_SIZE, &efc_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_EFC_SIZE_NAME, H5F_ACS_EFC_SIZE_SIZE, &efc_size, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the initial file image info */
-    if(H5P_register_real(pclass, H5F_ACS_FILE_IMAGE_INFO_NAME, H5F_ACS_FILE_IMAGE_INFO_SIZE, &file_image_info, NULL, NULL, NULL, H5F_ACS_FILE_IMAGE_INFO_DEL, H5F_ACS_FILE_IMAGE_INFO_COPY, NULL, H5F_ACS_FILE_IMAGE_INFO_CLOSE) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_FILE_IMAGE_INFO_NAME, H5F_ACS_FILE_IMAGE_INFO_SIZE,
+                          &file_image_info, NULL, NULL, NULL, H5F_ACS_FILE_IMAGE_INFO_DEL,
+                          H5F_ACS_FILE_IMAGE_INFO_COPY, NULL, H5F_ACS_FILE_IMAGE_INFO_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the core VFD backing store write tracking flag */
-    if(H5P_register_real(pclass, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, H5F_ACS_CORE_WRITE_TRACKING_FLAG_SIZE, &core_write_tracking_flag, 
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME,
+                          H5F_ACS_CORE_WRITE_TRACKING_FLAG_SIZE, &core_write_tracking_flag, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the size of the core VFD backing store page size */
-    if(H5P_register_real(pclass, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_SIZE, &core_write_tracking_page_size, 
-            NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME,
+                          H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_SIZE, &core_write_tracking_page_size, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_facc_reg_prop() */
 
-
 /*----------------------------------------------------------------------------
  * Function:	H5P_facc_create
  *
@@ -354,29 +375,29 @@ done:
 static herr_t
 H5P_facc_create(hid_t fapl_id, void H5_ATTR_UNUSED *copy_data)
 {
-    hid_t          driver_id;
-    H5P_genplist_t *plist;              /* Property list */
-    herr_t         ret_value = SUCCEED;
+    hid_t           driver_id;
+    H5P_genplist_t *plist; /* Property list */
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check argument */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Retrieve driver ID property */
-    if(H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
+    if (H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver ID")
 
-    if(driver_id > 0) {
+    if (driver_id > 0) {
         void *driver_info;
 
         /* Retrieve driver info property */
-        if(H5P_get(plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
+        if (H5P_get(plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver info")
 
         /* Set the driver for the property list */
-        if(H5FD_fapl_open(plist, driver_id, driver_info) < 0)
+        if (H5FD_fapl_open(plist, driver_id, driver_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set driver")
     } /* end if */
 
@@ -384,7 +405,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_facc_create() */
 
-
 /*--------------------------------------------------------------------------
  * Function:	H5P_facc_copy
  *
@@ -404,30 +424,30 @@ done:
 static herr_t
 H5P_facc_copy(hid_t dst_fapl_id, hid_t src_fapl_id, void H5_ATTR_UNUSED *copy_data)
 {
-    hid_t          driver_id;
-    H5P_genplist_t *src_plist;              /* Source property list */
-    herr_t         ret_value = SUCCEED;
+    hid_t           driver_id;
+    H5P_genplist_t *src_plist; /* Source property list */
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get driver ID from source property list */
-    if(NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_fapl_id)))
+    if (NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_fapl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
-    if(H5P_get(src_plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
+    if (H5P_get(src_plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver ID")
 
-    if(driver_id > 0) {
-        H5P_genplist_t *dst_plist;              /* Destination property list */
-        void *driver_info;
+    if (driver_id > 0) {
+        H5P_genplist_t *dst_plist; /* Destination property list */
+        void *          driver_info;
 
         /* Get driver info from source property list */
-        if(H5P_get(src_plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
+        if (H5P_get(src_plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver info")
 
         /* Set the driver for the destination property list */
-        if(NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_fapl_id)))
+        if (NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_fapl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
-        if(H5FD_fapl_open(dst_plist, driver_id, driver_info) < 0)
+        if (H5FD_fapl_open(dst_plist, driver_id, driver_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set driver")
     } /* end if */
 
@@ -435,7 +455,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_facc_copy() */
 
-
 /*--------------------------------------------------------------------------
  * Function:	H5P_facc_close
  *
@@ -455,37 +474,36 @@ done:
 herr_t
 H5P_facc_close(hid_t fapl_id, void H5_ATTR_UNUSED *close_data)
 {
-    hid_t      driver_id;
-    H5P_genplist_t *plist;              /* Property list */
-    herr_t     ret_value = SUCCEED;
+    hid_t           driver_id;
+    H5P_genplist_t *plist; /* Property list */
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check argument */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Get driver ID property */
-    if(H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
+    if (H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
         HGOTO_DONE(FAIL) /* Can't return errors when library is shutting down */
 
-    if(driver_id > 0) {
+    if (driver_id > 0) {
         void *driver_info;
 
         /* Get driver info property */
-        if(H5P_get(plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
+        if (H5P_get(plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
             HGOTO_DONE(FAIL) /* Can't return errors when library is shutting down */
 
         /* Close the driver for the property list */
-        if(H5FD_fapl_close(driver_id, driver_info) < 0)
+        if (H5FD_fapl_close(driver_id, driver_info) < 0)
             HGOTO_DONE(FAIL) /* Can't return errors when library is shutting down */
-    } /* end if */
+    }                        /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_facc_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_alignment
  *
@@ -519,31 +537,30 @@ done:
 herr_t
 H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ihh", fapl_id, threshold, alignment);
 
     /* Check args */
-    if(alignment < 1)
+    if (alignment < 1)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "alignment must be positive")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
-    if(H5P_set(plist, H5F_ACS_ALIGN_THRHD_NAME, &threshold) < 0)
+    if (H5P_set(plist, H5F_ACS_ALIGN_THRHD_NAME, &threshold) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set threshold")
-    if(H5P_set(plist, H5F_ACS_ALIGN_NAME, &alignment) < 0)
+    if (H5P_set(plist, H5F_ACS_ALIGN_NAME, &alignment) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set alignment")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_alignment
  *
@@ -559,36 +576,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
-    hsize_t *alignment/*out*/)
+H5Pget_alignment(hid_t fapl_id, hsize_t *threshold /*out*/, hsize_t *alignment /*out*/)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", fapl_id, threshold, alignment);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(threshold)
-        if(H5P_get(plist, H5F_ACS_ALIGN_THRHD_NAME, threshold) < 0)
+    if (threshold)
+        if (H5P_get(plist, H5F_ACS_ALIGN_THRHD_NAME, threshold) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get threshold")
-    if(alignment)
-        if(H5P_get(plist, H5F_ACS_ALIGN_NAME, alignment) < 0)
+    if (alignment)
+        if (H5P_get(plist, H5F_ACS_ALIGN_NAME, alignment) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get alignment")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_alignment() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_set_driver
  *
- * Purpose:	Set the file driver (DRIVER_ID) for a file access 
+ * Purpose:	Set the file driver (DRIVER_ID) for a file access
  *		property list (PLIST_ID) and supply an optional
  *		struct containing the driver-specific properites
  *		(DRIVER_INFO).  The driver properties will be copied into the
@@ -607,28 +622,28 @@ done:
 herr_t
 H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_driver_info)
 {
-    hid_t driver_id;            /* VFL driver ID */
-    void *driver_info;          /* VFL driver info */
+    hid_t  driver_id;           /* VFL driver ID */
+    void * driver_info;         /* VFL driver info */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(NULL == H5I_object_verify(new_driver_id, H5I_VFL))
+    if (NULL == H5I_object_verify(new_driver_id, H5I_VFL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file driver ID")
 
-    if(TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS)) {
+    if (TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS)) {
         /* Get the current driver information */
-        if(H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
+        if (H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &driver_id) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver ID")
-        if(H5P_get(plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL,"can't get driver info")
+        if (H5P_get(plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver info")
 
         /* Close the driver for the property list */
-        if(H5FD_fapl_close(driver_id, driver_info) < 0)
+        if (H5FD_fapl_close(driver_id, driver_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't reset driver")
 
         /* Set the driver for the property list */
-        if(H5FD_fapl_open(plist, new_driver_id, new_driver_info) < 0)
+        if (H5FD_fapl_open(plist, new_driver_id, new_driver_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set driver")
     } /* end if */
     else
@@ -638,11 +653,10 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_set_driver() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_driver
  *
- * Purpose:	Set the file driver (DRIVER_ID) for a file access 
+ * Purpose:	Set the file driver (DRIVER_ID) for a file access
  *		property list (PLIST_ID) and supply an optional
  *		struct containing the driver-specific properites
  *		(DRIVER_INFO).  The driver properties will be copied into the
@@ -661,27 +675,26 @@ done:
 herr_t
 H5Pset_driver(hid_t plist_id, hid_t new_driver_id, const void *new_driver_info)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ii*x", plist_id, new_driver_id, new_driver_info);
 
     /* Check arguments */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
-    if(NULL == H5I_object_verify(new_driver_id, H5I_VFL))
+    if (NULL == H5I_object_verify(new_driver_id, H5I_VFL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file driver ID")
 
     /* Set the driver */
-    if(H5P_set_driver(plist, new_driver_id, new_driver_info) < 0)
+    if (H5P_set_driver(plist, new_driver_id, new_driver_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set driver info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_driver() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_get_driver
  *
@@ -703,26 +716,25 @@ done:
 hid_t
 H5P_get_driver(H5P_genplist_t *plist)
 {
-    hid_t ret_value = FAIL;     /* Return value */
+    hid_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the current driver ID */
-    if(TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS)) {
-        if(H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &ret_value) < 0)
+    if (TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS)) {
+        if (H5P_get(plist, H5F_ACS_FILE_DRV_ID_NAME, &ret_value) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver ID")
     } /* end if */
     else
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
-    if(H5FD_VFD_DEFAULT == ret_value)
+    if (H5FD_VFD_DEFAULT == ret_value)
         ret_value = H5_DEFAULT_VFD;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_get_driver() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_driver
  *
@@ -744,24 +756,23 @@ done:
 hid_t
 H5Pget_driver(hid_t plist_id)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    hid_t	ret_value;      /* Return value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    hid_t           ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", plist_id);
 
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Get the driver */
-    if((ret_value = H5P_get_driver(plist)) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver")
+    if ((ret_value = H5P_get_driver(plist)) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get driver")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_driver() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_get_driver_info
  *
@@ -784,13 +795,13 @@ done:
 void *
 H5P_get_driver_info(H5P_genplist_t *plist)
 {
-    void *ret_value = NULL;     /* Return value */
+    void *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Get the current driver info */
-    if(TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS)) {
-        if(H5P_get(plist, H5F_ACS_FILE_DRV_INFO_NAME, &ret_value) < 0)
+    if (TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS)) {
+        if (H5P_get(plist, H5F_ACS_FILE_DRV_INFO_NAME, &ret_value) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get driver info")
     } /* end if */
     else
@@ -800,7 +811,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_get_driver_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_driver_info
  *
@@ -823,24 +833,23 @@ done:
 void *
 H5Pget_driver_info(hid_t plist_id)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    void *ret_value;            /* Return value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    void *          ret_value; /* Return value */
 
     FUNC_ENTER_API(NULL)
     H5TRACE1("*x", "i", plist_id);
 
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list")
 
     /* Get the driver info */
-    if(NULL == (ret_value = H5P_get_driver_info(plist)))
+    if (NULL == (ret_value = H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get driver info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_driver_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_family_offset
  *
@@ -855,31 +864,30 @@ done:
  *              Sep 17, 2002
  *
  *-------------------------------------------------------------------------
-*/
+ */
 herr_t
 H5Pset_family_offset(hid_t fapl_id, hsize_t offset)
 {
-    H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ih", fapl_id, offset);
 
     /* Get the plist structure */
-    if(H5P_DEFAULT == fapl_id)
+    if (H5P_DEFAULT == fapl_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't modify default property list")
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set value */
-    if(H5P_set(plist, H5F_ACS_FAMILY_OFFSET_NAME, &offset) < 0)
+    if (H5P_set(plist, H5F_ACS_FAMILY_OFFSET_NAME, &offset) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set offset for family file")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_family_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_family_offset
  *
@@ -898,21 +906,21 @@ done:
 herr_t
 H5Pget_family_offset(hid_t fapl_id, hsize_t *offset)
 {
-    H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*h", fapl_id, offset);
 
     /* Get the plist structure */
-    if(H5P_DEFAULT == fapl_id)
+    if (H5P_DEFAULT == fapl_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't modify default property list")
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(offset) {
-        if(H5P_get(plist, H5F_ACS_FAMILY_OFFSET_NAME, offset) < 0)
+    if (offset) {
+        if (H5P_get(plist, H5F_ACS_FAMILY_OFFSET_NAME, offset) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set offset for family file")
     } /* end if */
 
@@ -920,7 +928,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_family_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_multi_type
  *
@@ -939,27 +946,26 @@ done:
 herr_t
 H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type)
 {
-    H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value = SUCCEED;      /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iMt", fapl_id, type);
 
     /* Get the plist structure */
-    if(H5P_DEFAULT == fapl_id)
+    if (H5P_DEFAULT == fapl_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't modify default property list")
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set value */
-     if(H5P_set(plist, H5F_ACS_MULTI_TYPE_NAME, &type) < 0)
+    if (H5P_set(plist, H5F_ACS_MULTI_TYPE_NAME, &type) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set type for multi driver")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_multi_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_multi_type
  *
@@ -978,21 +984,21 @@ done:
 herr_t
 H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type)
 {
-    H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Mt", fapl_id, type);
 
     /* Get the plist structure */
-    if(H5P_DEFAULT == fapl_id)
+    if (H5P_DEFAULT == fapl_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't modify default property list")
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(type) {
-        if(H5P_get(plist, H5F_ACS_MULTI_TYPE_NAME, type) < 0)
+    if (type) {
+        if (H5P_get(plist, H5F_ACS_MULTI_TYPE_NAME, type) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get type for multi driver")
     } /* end if */
 
@@ -1000,7 +1006,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_multi_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_cache
  *
@@ -1024,37 +1029,36 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_cache(hid_t plist_id, int H5_ATTR_UNUSED mdc_nelmts,
-	     size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0)
+H5Pset_cache(hid_t plist_id, int H5_ATTR_UNUSED mdc_nelmts, size_t rdcc_nslots, size_t rdcc_nbytes,
+             double rdcc_w0)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE5("e", "iIszzd", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes,
-             rdcc_w0);
+    H5TRACE5("e", "iIszzd", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes, rdcc_w0);
 
     /* Check arguments */
-    if(rdcc_w0 < (double)0.0f || rdcc_w0 > (double)1.0f)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "raw data cache w0 value must be between 0.0 and 1.0 inclusive")
+    if (rdcc_w0 < (double)0.0f || rdcc_w0 > (double)1.0f)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                    "raw data cache w0 value must be between 0.0 and 1.0 inclusive")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set sizes */
-    if(H5P_set(plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, &rdcc_nslots) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set data cache number of slots")
-    if(H5P_set(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &rdcc_nbytes) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set data cache byte size")
-    if(H5P_set(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, &rdcc_w0) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks")
+    if (H5P_set(plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, &rdcc_nslots) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache number of slots")
+    if (H5P_set(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &rdcc_nbytes) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache byte size")
+    if (H5P_set(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, &rdcc_w0) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set preempt read chunks")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_cache() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_cache
  *
@@ -1072,41 +1076,38 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
-	     size_t *rdcc_nslots, size_t *rdcc_nbytes, double *rdcc_w0)
+H5Pget_cache(hid_t plist_id, int *mdc_nelmts, size_t *rdcc_nslots, size_t *rdcc_nbytes, double *rdcc_w0)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE5("e", "i*Is*z*z*d", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes,
-             rdcc_w0);
+    H5TRACE5("e", "i*Is*z*z*d", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes, rdcc_w0);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get sizes */
 
     /* the mdc_nelmts FAPL entry no longer exists, so just return a constant */
-    if(mdc_nelmts)
+    if (mdc_nelmts)
         *mdc_nelmts = 0;
 
-    if(rdcc_nslots)
-        if(H5P_get(plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, rdcc_nslots) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache number of slots")
-    if(rdcc_nbytes)
-        if(H5P_get(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, rdcc_nbytes) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache byte size")
-    if(rdcc_w0)
-        if(H5P_get(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, rdcc_w0) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks")
+    if (rdcc_nslots)
+        if (H5P_get(plist, H5F_ACS_DATA_CACHE_NUM_SLOTS_NAME, rdcc_nslots) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get data cache number of slots")
+    if (rdcc_nbytes)
+        if (H5P_get(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, rdcc_nbytes) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get data cache byte size")
+    if (rdcc_w0)
+        if (H5P_get(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, rdcc_w0) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get preempt read chunks")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_cache() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_mdc_config
  *
@@ -1123,18 +1124,18 @@ done:
 herr_t
 H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", plist_id, config_ptr);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* validate the new configuration */
-    if(H5AC_validate_config(config_ptr) < 0)
+    if (H5AC_validate_config(config_ptr) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid metadata cache configuration")
 
     /* set the modified config */
@@ -1143,14 +1144,13 @@ H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
      * will have to test the version and do translation here.
      */
 
-    if(H5P_set(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, config_ptr) < 0)
+    if (H5P_set(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, config_ptr) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set metadata cache initial config")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Pset_mdc_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_mdc_config
  *
@@ -1171,21 +1171,21 @@ done:
 herr_t
 H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", plist_id, config_ptr);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* validate the config_ptr */
-    if(config_ptr == NULL)
+    if (config_ptr == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
 
-    if(config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION)
+    if (config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown config version.")
 
     /* If we ever support multiple versions of H5AC_cache_config_t, we
@@ -1194,14 +1194,13 @@ H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
      */
 
     /* Get the current initial metadata cache resize configuration */
-    if(H5P_get(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, config_ptr) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get metadata cache initial resize config")
+    if (H5P_get(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, config_ptr) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get metadata cache initial resize config")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Pget_mdc_config() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_gc_references
  *
@@ -1236,25 +1235,24 @@ done:
 herr_t
 H5Pset_gc_references(hid_t plist_id, unsigned gc_ref)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, gc_ref);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
-    if(H5P_set(plist, H5F_ACS_GARBG_COLCT_REF_NAME, &gc_ref) < 0)
+    if (H5P_set(plist, H5F_ACS_GARBG_COLCT_REF_NAME, &gc_ref) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set garbage collect reference")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_gc_references
  *
@@ -1276,28 +1274,27 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref/*out*/)
+H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, gc_ref);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(gc_ref)
-        if(H5P_get(plist, H5F_ACS_GARBG_COLCT_REF_NAME, gc_ref) < 0)
+    if (gc_ref)
+        if (H5P_get(plist, H5F_ACS_GARBG_COLCT_REF_NAME, gc_ref) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get garbage collect reference")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fclose_degree
  *
@@ -1315,25 +1312,24 @@ done:
 herr_t
 H5Pset_fclose_degree(hid_t plist_id, H5F_close_degree_t degree)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iFd", plist_id, degree);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
-    if(H5P_set(plist, H5F_ACS_CLOSE_DEGREE_NAME, &degree) < 0)
+    if (H5P_set(plist, H5F_ACS_CLOSE_DEGREE_NAME, &degree) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file close degree")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fclose_degree() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_fclose_degree
  *
@@ -1351,24 +1347,23 @@ done:
 herr_t
 H5Pget_fclose_degree(hid_t plist_id, H5F_close_degree_t *degree)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Fd", plist_id, degree);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-    if(degree && H5P_get(plist, H5F_ACS_CLOSE_DEGREE_NAME, degree) < 0)
+    if (degree && H5P_get(plist, H5F_ACS_CLOSE_DEGREE_NAME, degree) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file close degree")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_fclose_degree() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_meta_block_size
  *
@@ -1401,25 +1396,24 @@ done:
 herr_t
 H5Pset_meta_block_size(hid_t plist_id, hsize_t size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ih", plist_id, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
-    if(H5P_set(plist, H5F_ACS_META_BLOCK_SIZE_NAME, &size) < 0)
+    if (H5P_set(plist, H5F_ACS_META_BLOCK_SIZE_NAME, &size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set meta data block size")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_meta_block_size
  *
@@ -1441,21 +1435,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_meta_block_size(hid_t plist_id, hsize_t *size/*out*/)
+H5Pget_meta_block_size(hid_t plist_id, hsize_t *size /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(size) {
-        if(H5P_get(plist, H5F_ACS_META_BLOCK_SIZE_NAME, size) < 0)
+    if (size) {
+        if (H5P_get(plist, H5F_ACS_META_BLOCK_SIZE_NAME, size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get meta data block size")
     } /* end if */
 
@@ -1463,7 +1457,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_sieve_buf_size
  *
@@ -1496,25 +1489,24 @@ done:
 herr_t
 H5Pset_sieve_buf_size(hid_t plist_id, size_t size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", plist_id, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
-    if(H5P_set(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &size) < 0)
+    if (H5P_set(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set sieve buffer size")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_sieve_buf_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_sieve_buf_size
  *
@@ -1536,28 +1528,27 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/)
+H5Pget_sieve_buf_size(hid_t plist_id, size_t *size /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(size)
-        if(H5P_get(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, size) < 0)
+    if (size)
+        if (H5P_get(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get sieve buffer size")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_sieve_buf_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_small_data_block_size
  *
@@ -1585,25 +1576,24 @@ done:
 herr_t
 H5Pset_small_data_block_size(hid_t plist_id, hsize_t size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ih", plist_id, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
-    if(H5P_set(plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &size) < 0)
+    if (H5P_set(plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'small data' block size")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_small_data_block_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_small_data_block_size
  *
@@ -1620,21 +1610,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size/*out*/)
+H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(size) {
-        if(H5P_get(plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, size) < 0)
+    if (size) {
+        if (H5P_get(plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get 'small data' block size")
     } /* end if */
 
@@ -1642,7 +1632,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_small_data_block_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_libver_bounds
  *
@@ -1730,12 +1719,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
-    H5F_libver_t high)
+H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low, H5F_libver_t high)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    hbool_t latest;             /* Whether to use the latest version or not */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    hbool_t         latest;              /* Whether to use the latest version or not */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iFvFv", plist_id, low, high);
@@ -1744,23 +1732,22 @@ H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
     /* (Note that this is _really_ restricted right now, we'll want to loosen
      *  this up more as we add features - QAK)
      */
-    if(high != H5F_LIBVER_LATEST)
+    if (high != H5F_LIBVER_LATEST)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid high library version bound")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
     latest = (hbool_t)((low == H5F_LIBVER_LATEST) ? TRUE : FALSE);
-    if(H5P_set(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0)
+    if (H5P_set(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set library version bounds")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_libver_bounds() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_libver_bounds
  *
@@ -1775,36 +1762,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low/*out*/,
-    H5F_libver_t *high/*out*/)
+H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low /*out*/, H5F_libver_t *high /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    hbool_t latest;             /* Whether to use the latest version or not */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    hbool_t         latest;              /* Whether to use the latest version or not */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", plist_id, low, high);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0)
+    if (H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get library version bounds")
 
     /* Check for setting values to return */
     /* (Again, this is restricted now, we'll need to open it up later -QAK) */
-    if(low)
+    if (low)
         *low = latest ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST;
-    if(high)
+    if (high)
         *high = H5F_LIBVER_LATEST;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_libver_bounds() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_elink_file_cache_size
  *
@@ -1824,25 +1809,24 @@ done:
 herr_t
 H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, efc_size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set value */
-    if(H5P_set(plist, H5F_ACS_EFC_SIZE_NAME, &efc_size) < 0)
+    if (H5P_set(plist, H5F_ACS_EFC_SIZE_NAME, &efc_size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set elink file cache size")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_elink_file_cache_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_elink_file_cache_size
  *
@@ -1862,32 +1846,31 @@ done:
 herr_t
 H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Iu", plist_id, efc_size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(efc_size)
-        if(H5P_get(plist, H5F_ACS_EFC_SIZE_NAME, efc_size) < 0)
+    if (efc_size)
+        if (H5P_get(plist, H5F_ACS_EFC_SIZE_NAME, efc_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get elink file cache size")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_elink_file_cache_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Pset_file_image
  *
- * Purpose:     Sets the initial file image. Some file drivers can initialize 
- *              the starting data in a file from a buffer. 
- *              
+ * Purpose:     Sets the initial file image. Some file drivers can initialize
+ *              the starting data in a file from a buffer.
+ *
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Jacob Gruber
@@ -1898,55 +1881,56 @@ done:
 herr_t
 H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len)
 {
-    H5P_genplist_t *fapl;               /* Property list pointer */
-    H5FD_file_image_info_t image_info;  /* File image info */
-    herr_t ret_value = SUCCEED;         /* Return value */
-    
+    H5P_genplist_t *       fapl;                /* Property list pointer */
+    H5FD_file_image_info_t image_info;          /* File image info */
+    herr_t                 ret_value = SUCCEED; /* Return value */
+
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*xz", fapl_id, buf_ptr, buf_len);
 
     /* validate parameters */
-    if(!(((buf_ptr == NULL) && (buf_len == 0)) || ((buf_ptr != NULL) && (buf_len > 0))))
+    if (!(((buf_ptr == NULL) && (buf_len == 0)) || ((buf_ptr != NULL) && (buf_len > 0))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "inconsistant buf_ptr and buf_len")
-   
+
     /* Get the plist structure */
-    if(NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-        
+
     /* Get old image info */
-    if(H5P_get(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &image_info) < 0)
+    if (H5P_get(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &image_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get old file image pointer")
-        
+
     /* Release previous buffer, if it exists */
-    if(image_info.buffer != NULL) {
-        if(image_info.callbacks.image_free) {
-            if(SUCCEED != image_info.callbacks.image_free(image_info.buffer, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET, image_info.callbacks.udata))
+    if (image_info.buffer != NULL) {
+        if (image_info.callbacks.image_free) {
+            if (SUCCEED != image_info.callbacks.image_free(image_info.buffer,
+                                                           H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET,
+                                                           image_info.callbacks.udata))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "image_free callback failed")
         } /* end if */
         else
             H5MM_xfree(image_info.buffer);
-    } /* end if */  
-    
+    } /* end if */
+
     /* Update struct */
-    if(buf_ptr) {
+    if (buf_ptr) {
         /* Allocate memory */
-        if(image_info.callbacks.image_malloc) {
-            if(NULL == (image_info.buffer = image_info.callbacks.image_malloc(buf_len,
-                    H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET, image_info.callbacks.udata)))
+        if (image_info.callbacks.image_malloc) {
+            if (NULL == (image_info.buffer = image_info.callbacks.image_malloc(
+                             buf_len, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET, image_info.callbacks.udata)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "image malloc callback failed")
-         } /* end if */
-         else
-            if(NULL == (image_info.buffer = H5MM_malloc(buf_len)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory block")
-    
+        } /* end if */
+        else if (NULL == (image_info.buffer = H5MM_malloc(buf_len)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory block")
+
         /* Copy data */
-        if(image_info.callbacks.image_memcpy) {
-            if(image_info.buffer != image_info.callbacks.image_memcpy(image_info.buffer, 
-                   buf_ptr, buf_len, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET, 
-                   image_info.callbacks.udata))
-	        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
+        if (image_info.callbacks.image_memcpy) {
+            if (image_info.buffer != image_info.callbacks.image_memcpy(image_info.buffer, buf_ptr, buf_len,
+                                                                       H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET,
+                                                                       image_info.callbacks.udata))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
         } /* end if */
-	else
+        else
             HDmemcpy(image_info.buffer, buf_ptr, buf_len);
     } /* end if */
     else
@@ -1955,34 +1939,33 @@ H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len)
     image_info.size = buf_len;
 
     /* Set values */
-    if(H5P_set(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &image_info) < 0)
+    if (H5P_set(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &image_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file image info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_file_image() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Pget_file_image
  *
- * Purpose:     If the file image exists and buf_ptr_ptr is not NULL, 
- *		allocate a buffer of the correct size, copy the image into 
- *		the new buffer, and return the buffer to the caller in 
+ * Purpose:     If the file image exists and buf_ptr_ptr is not NULL,
+ *		allocate a buffer of the correct size, copy the image into
+ *		the new buffer, and return the buffer to the caller in
  *		*buf_ptr_ptr.  Do this using the file image callbacks
- *		if defined.  
+ *		if defined.
  *
- *		NB: It is the responsibility of the caller to free the 
+ *		NB: It is the responsibility of the caller to free the
  *		buffer whose address is returned in *buf_ptr_ptr.  Do
- *		this using free if the file image callbacks are not 
- *		defined, or with whatever method is appropriate if 
+ *		this using free if the file image callbacks are not
+ *		defined, or with whatever method is appropriate if
  *		the callbacks are defined.
  *
- *              If buf_ptr_ptr is not NULL, and no image exists, set 
+ *              If buf_ptr_ptr is not NULL, and no image exists, set
  *		*buf_ptr_ptr to NULL.
  *
  *		If buf_len_ptr is not NULL, set *buf_len_ptr equal
- *		to the length of the file image if it exists, and 
+ *		to the length of the file image if it exists, and
  *		to 0 if it does not.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -1995,52 +1978,52 @@ done:
 herr_t
 H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr)
 {
-    H5P_genplist_t *fapl;               /* Property list pointer */
-    H5FD_file_image_info_t image_info;  /* File image info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *       fapl;                /* Property list pointer */
+    H5FD_file_image_info_t image_info;          /* File image info */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i**x*z", fapl_id, buf_ptr_ptr, buf_len_ptr);
 
     /* Get the plist structure */
-    if(NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(H5P_get(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &image_info) < 0)
+    if (H5P_get(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &image_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file image info")
 
     /* verify file image field consistancy */
-    HDassert(((image_info.buffer != NULL) && (image_info.size > 0)) || 
+    HDassert(((image_info.buffer != NULL) && (image_info.size > 0)) ||
              ((image_info.buffer == NULL) && (image_info.size == 0)));
 
     /* Set output size */
-    if(buf_len_ptr != NULL)
+    if (buf_len_ptr != NULL)
         *buf_len_ptr = image_info.size;
 
     /* Duplicate the image if desired, using callbacks if available */
-    if(buf_ptr_ptr != NULL) {
-        void * copy_ptr = NULL;         /* Copy of memory image */
+    if (buf_ptr_ptr != NULL) {
+        void *copy_ptr = NULL; /* Copy of memory image */
 
-        if(image_info.buffer != NULL) {
+        if (image_info.buffer != NULL) {
             /* Allocate memory */
-            if(image_info.callbacks.image_malloc) {
-                if(NULL == (copy_ptr = image_info.callbacks.image_malloc(image_info.size,
-                        H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET, image_info.callbacks.udata)))
+            if (image_info.callbacks.image_malloc) {
+                if (NULL ==
+                    (copy_ptr = image_info.callbacks.image_malloc(
+                         image_info.size, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET, image_info.callbacks.udata)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "image malloc callback failed")
             } /* end if */
-            else
-                if(NULL == (copy_ptr = H5MM_malloc(image_info.size)))
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate copy")
-    
+            else if (NULL == (copy_ptr = H5MM_malloc(image_info.size)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate copy")
+
             /* Copy data */
-            if(image_info.callbacks.image_memcpy) {
-                if(copy_ptr != image_info.callbacks.image_memcpy(copy_ptr, image_info.buffer,
-                        image_info.size, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET, 
-                        image_info.callbacks.udata))
+            if (image_info.callbacks.image_memcpy) {
+                if (copy_ptr != image_info.callbacks.image_memcpy(
+                                    copy_ptr, image_info.buffer, image_info.size,
+                                    H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET, image_info.callbacks.udata))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
             } /* end if */
-	    else
+            else
                 HDmemcpy(copy_ptr, image_info.buffer, image_info.size);
         } /* end if */
 
@@ -2051,13 +2034,12 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_file_image */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Pset_file_image_callbacks
  *
  * Purpose:     Sets the callbacks for file images. Some file drivers allow
  *              the use of user-defined callbacks for allocating, freeing and
- *              copying the drivers internal buffer, potentially allowing a 
+ *              copying the drivers internal buffer, potentially allowing a
  *              clever user to do optimizations such as avoiding large mallocs
  *              and memcpys or to perform detailed logging.
  *
@@ -2071,70 +2053,70 @@ done:
 herr_t
 H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr)
 {
-    H5P_genplist_t *fapl;               /* Property list pointer */
-    H5FD_file_image_info_t info;        /* File image info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *       fapl;                /* Property list pointer */
+    H5FD_file_image_info_t info;                /* File image info */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", fapl_id, callbacks_ptr);
 
     /* Get the plist structure */
-    if(NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get old info */
-    if(H5P_get(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &info) < 0)
+    if (H5P_get(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get old file image info")
 
     /* verify file image field consistancy */
-    HDassert(((info.buffer != NULL) && (info.size > 0)) || 
-             ((info.buffer == NULL) && (info.size == 0)));
+    HDassert(((info.buffer != NULL) && (info.size > 0)) || ((info.buffer == NULL) && (info.size == 0)));
 
     /* Make sure a file image hasn't already been set */
-    if(info.buffer != NULL || info.size > 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_SETDISALLOWED, FAIL, "setting callbacks when an image is already set is forbidden. It could cause memory leaks.")
+    if (info.buffer != NULL || info.size > 0)
+        HGOTO_ERROR(
+            H5E_PLIST, H5E_SETDISALLOWED, FAIL,
+            "setting callbacks when an image is already set is forbidden. It could cause memory leaks.")
 
     /* verify that callbacks_ptr is not NULL */
-    if(NULL == callbacks_ptr)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
+    if (NULL == callbacks_ptr)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
 
     /* Make sure udata callbacks are going to be set if udata is going to be set */
-    if(callbacks_ptr->udata)
-        if(callbacks_ptr->udata_copy == NULL || callbacks_ptr->udata_free == NULL)
+    if (callbacks_ptr->udata)
+        if (callbacks_ptr->udata_copy == NULL || callbacks_ptr->udata_free == NULL)
             HGOTO_ERROR(H5E_PLIST, H5E_SETDISALLOWED, FAIL, "udata callbacks must be set if udata is set")
 
     /* Release old udata if it exists */
-    if(info.callbacks.udata != NULL) {
+    if (info.callbacks.udata != NULL) {
         HDassert(info.callbacks.udata_free);
-        if(info.callbacks.udata_free(info.callbacks.udata) < 0)
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "udata_free callback failed")
+        if (info.callbacks.udata_free(info.callbacks.udata) < 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "udata_free callback failed")
     } /* end if */
 
     /* Update struct */
     info.callbacks = *callbacks_ptr;
 
-    if(callbacks_ptr->udata) {
+    if (callbacks_ptr->udata) {
         HDassert(callbacks_ptr->udata_copy);
         HDassert(callbacks_ptr->udata_free);
-        if((info.callbacks.udata = callbacks_ptr->udata_copy(callbacks_ptr->udata)) == NULL)
+        if ((info.callbacks.udata = callbacks_ptr->udata_copy(callbacks_ptr->udata)) == NULL)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't copy the suppplied udata")
     } /* end if */
 
     /* Set values */
-    if(H5P_set(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &info) < 0)
+    if (H5P_set(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file image info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_file_image_callbacks() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Pget_file_image_callbacks
  *
  * Purpose:     Sets the callbacks for file images. Some file drivers allow
  *              the use of user-defined callbacks for allocating, freeing and
- *              copying the drivers internal buffer, potentially allowing a 
+ *              copying the drivers internal buffer, potentially allowing a
  *              clever user to do optimizations such as avoiding large mallocs
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2147,50 +2129,48 @@ done:
 herr_t
 H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr)
 {
-    H5P_genplist_t *fapl;               /* Property list pointer */
-    H5FD_file_image_info_t info;        /* File image info */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *       fapl;                /* Property list pointer */
+    H5FD_file_image_info_t info;                /* File image info */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", fapl_id, callbacks_ptr);
 
     /* Get the plist structure */
-    if(NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get old info */
-    if(H5P_get(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &info) < 0)
+    if (H5P_get(fapl, H5F_ACS_FILE_IMAGE_INFO_NAME, &info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file image info")
 
     /* verify file image field consistancy */
-    HDassert(((info.buffer != NULL) && (info.size > 0)) || 
-             ((info.buffer == NULL) && (info.size == 0)));
+    HDassert(((info.buffer != NULL) && (info.size > 0)) || ((info.buffer == NULL) && (info.size == 0)));
 
     /* verify that callbacks_ptr is not NULL */
-    if(NULL == callbacks_ptr)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
+    if (NULL == callbacks_ptr)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
 
     /* Transfer values to parameters */
     *callbacks_ptr = info.callbacks;
 
     /* Copy udata if it exists */
-    if(info.callbacks.udata != NULL) {
+    if (info.callbacks.udata != NULL) {
         HDassert(info.callbacks.udata_copy);
-        if((callbacks_ptr->udata = info.callbacks.udata_copy(info.callbacks.udata)) == 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't copy udata")
+        if ((callbacks_ptr->udata = info.callbacks.udata_copy(info.callbacks.udata)) == 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't copy udata")
     } /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_file_image_callbacks() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5P_file_image_info_del
  *
  * Purpose:     Delete callback for the file image info property, called
  *              when the property is deleted from the plist. The buffer
- *              and udata may need to be freed, possibly using their 
+ *              and udata may need to be freed, possibly using their
  *              respective callbacks so the default free won't work.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2201,50 +2181,50 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P_file_image_info_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
+H5P_file_image_info_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
+                        size_t H5_ATTR_UNUSED size, void *value)
 {
-    H5FD_file_image_info_t info;        /* Image info struct */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FD_file_image_info_t info;                /* Image info struct */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(value) {
+    if (value) {
         info = *(H5FD_file_image_info_t *)value;
 
         /* verify file image field consistancy */
-        HDassert(((info.buffer != NULL) && (info.size > 0)) || 
-                 ((info.buffer == NULL) && (info.size == 0)));
+        HDassert(((info.buffer != NULL) && (info.size > 0)) || ((info.buffer == NULL) && (info.size == 0)));
 
-        if(info.buffer && info.size > 0) {
+        if (info.buffer && info.size > 0) {
             /* Free buffer */
-            if(info.callbacks.image_free) {
-                if(info.callbacks.image_free(info.buffer, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE, info.callbacks.udata) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "image_free callback failed")
+            if (info.callbacks.image_free) {
+                if (info.callbacks.image_free(info.buffer, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE,
+                                              info.callbacks.udata) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "image_free callback failed")
             } /* end if */
             else
                 HDfree(info.buffer);
         } /* end if */
 
         /* Free udata if it exists */
-        if(info.callbacks.udata) {
-            if(NULL == info.callbacks.udata_free)
+        if (info.callbacks.udata) {
+            if (NULL == info.callbacks.udata_free)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "udata_free not defined")
 
-            if(info.callbacks.udata_free(info.callbacks.udata) < 0)
-	        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "udata_free callback failed")
+            if (info.callbacks.udata_free(info.callbacks.udata) < 0)
+                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "udata_free callback failed")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_file_image_info_del() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5P_file_image_info_copy
  *
  * Purpose:     Copy callback for the file image info property. The buffer
- *              and udata may need to be copied, possibly using their 
+ *              and udata may need to be copied, possibly using their
  *              respective callbacks so the default copy won't work.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2257,52 +2237,52 @@ done:
 herr_t
 H5P_file_image_info_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(value) {
-        H5FD_file_image_info_t *info;   /* Image info struct */
+    if (value) {
+        H5FD_file_image_info_t *info; /* Image info struct */
 
         info = (H5FD_file_image_info_t *)value;
 
         /* verify file image field consistancy */
-        HDassert(((info->buffer != NULL) && (info->size > 0)) || 
+        HDassert(((info->buffer != NULL) && (info->size > 0)) ||
                  ((info->buffer == NULL) && (info->size == 0)));
 
-        if(info->buffer && info->size > 0) {
-            void *old_buffer;            /* Pointer to old image buffer */
+        if (info->buffer && info->size > 0) {
+            void *old_buffer; /* Pointer to old image buffer */
 
             /* Store the old buffer */
             old_buffer = info->buffer;
 
             /* Allocate new buffer */
-            if(info->callbacks.image_malloc) {
-                if(NULL == (info->buffer = info->callbacks.image_malloc(info->size,
-                        H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY, info->callbacks.udata)))
+            if (info->callbacks.image_malloc) {
+                if (NULL == (info->buffer = info->callbacks.image_malloc(
+                                 info->size, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY, info->callbacks.udata)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "image malloc callback failed")
             } /* end if */
             else {
-                if(NULL == (info->buffer = H5MM_malloc(info->size)))
+                if (NULL == (info->buffer = H5MM_malloc(info->size)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory block")
             } /* end else */
-            
+
             /* Copy data to new buffer */
-            if(info->callbacks.image_memcpy) {
-                if(info->buffer != info->callbacks.image_memcpy(info->buffer, old_buffer, 
-			info->size, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY, 
-			info->callbacks.udata))
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
+            if (info->callbacks.image_memcpy) {
+                if (info->buffer != info->callbacks.image_memcpy(info->buffer, old_buffer, info->size,
+                                                                 H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY,
+                                                                 info->callbacks.udata))
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, "image_memcpy callback failed")
             } /* end if */
-	    else
+            else
                 HDmemcpy(info->buffer, old_buffer, info->size);
         } /* end if */
 
         /* Copy udata if it exists */
-        if(info->callbacks.udata) {
+        if (info->callbacks.udata) {
             void *old_udata = info->callbacks.udata;
 
-            if(NULL == info->callbacks.udata_copy)
+            if (NULL == info->callbacks.udata_copy)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "udata_copy not defined")
 
             info->callbacks.udata = info->callbacks.udata_copy(old_udata);
@@ -2314,12 +2294,11 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_file_image_info_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5P_file_image_info_close
  *
  * Purpose:     Close callback for the file image info property. The buffer
- *              and udata may need to be freed, possibly using their 
+ *              and udata may need to be freed, possibly using their
  *              respective callbacks so the standard free won't work.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2332,40 +2311,39 @@ done:
 herr_t
 H5P_file_image_info_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(value) {
-        H5FD_file_image_info_t *info;        /* Image info struct */
+    if (value) {
+        H5FD_file_image_info_t *info; /* Image info struct */
 
         info = (H5FD_file_image_info_t *)value;
-             
-        if(info->buffer != NULL && info->size > 0) { 
+
+        if (info->buffer != NULL && info->size > 0) {
             /* Free buffer */
-            if(info->callbacks.image_free) {
-                if(info->callbacks.image_free(info->buffer, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE,
-                        info->callbacks.udata) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "image_free callback failed")
+            if (info->callbacks.image_free) {
+                if (info->callbacks.image_free(info->buffer, H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE,
+                                               info->callbacks.udata) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "image_free callback failed")
             } /* end if */
             else
                 H5MM_xfree(info->buffer);
         } /* end if */
 
         /* Free udata if it exists */
-        if(info->callbacks.udata) {
-            if(NULL == info->callbacks.udata_free)
+        if (info->callbacks.udata) {
+            if (NULL == info->callbacks.udata_free)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "udata_free not defined")
-            if(info->callbacks.udata_free(info->callbacks.udata) < 0)
+            if (info->callbacks.udata_free(info->callbacks.udata) < 0)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "udata_free callback failed")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_file_image_info_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_core_write_tracking
  *
@@ -2379,31 +2357,30 @@ done:
 herr_t
 H5Pset_core_write_tracking(hid_t plist_id, hbool_t is_enabled, size_t page_size)
 {
-    H5P_genplist_t *plist;        /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ibz", plist_id, is_enabled, page_size);
 
     /* The page size cannot be zero */
-    if(page_size == 0)
+    if (page_size == 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "page_size cannot be zero")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
-    if(H5P_set(plist, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, &is_enabled) < 0)
+    if (H5P_set(plist, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, &is_enabled) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set core VFD write tracking flag")
-    if(H5P_set(plist, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, &page_size) < 0)
+    if (H5P_set(plist, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, &page_size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set core VFD write tracking page size")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_core_write_tracking
  *
@@ -2417,28 +2394,27 @@ done:
 herr_t
 H5Pget_core_write_tracking(hid_t plist_id, hbool_t *is_enabled, size_t *page_size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*b*z", plist_id, is_enabled, page_size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(is_enabled) {
-        if(H5P_get(plist, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, is_enabled) < 0)
+    if (is_enabled) {
+        if (H5P_get(plist, H5F_ACS_CORE_WRITE_TRACKING_FLAG_NAME, is_enabled) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get core VFD write tracking flag")
     } /* end if */
 
-    if(page_size) {
-        if(H5P_get(plist, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, page_size) < 0)
+    if (page_size) {
+        if (H5P_get(plist, H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_NAME, page_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get core VFD write tracking page size")
     } /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
-
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 1aba2c0..957393c 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -25,19 +25,17 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Bprivate.h"		/* B-tree subclass names		*/
-#include "H5Eprivate.h"		/* Error handling			*/
-#include "H5Fprivate.h"		/* Files				*/
-#include "H5SMprivate.h"        /* Shared object header messages	*/
-#include "H5Ppkg.h"		/* Property lists		 	*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Bprivate.h"  /* B-tree subclass names		*/
+#include "H5Eprivate.h"  /* Error handling			*/
+#include "H5Fprivate.h"  /* Files				*/
+#include "H5SMprivate.h" /* Shared object header messages	*/
+#include "H5Ppkg.h"      /* Property lists		 	*/
 
 /****************/
 /* Local Macros */
@@ -45,46 +43,52 @@
 
 /* ========= File Creation properties ============ */
 /* Definitions for the size of the file user block in bytes */
-#define H5F_CRT_USER_BLOCK_SIZE      sizeof(hsize_t)
-#define H5F_CRT_USER_BLOCK_DEF       0
+#define H5F_CRT_USER_BLOCK_SIZE sizeof(hsize_t)
+#define H5F_CRT_USER_BLOCK_DEF  0
 /* Definitions for the 1/2 rank for symbol table leaf nodes */
-#define H5F_CRT_SYM_LEAF_SIZE        sizeof(unsigned)
+#define H5F_CRT_SYM_LEAF_SIZE sizeof(unsigned)
 /* Definitions for the 1/2 rank for btree internal nodes    */
-#define H5F_CRT_BTREE_RANK_SIZE      sizeof(unsigned[H5B_NUM_BTREE_ID])
-#define H5F_CRT_BTREE_RANK_DEF       {HDF5_BTREE_SNODE_IK_DEF,HDF5_BTREE_CHUNK_IK_DEF}
+#define H5F_CRT_BTREE_RANK_SIZE sizeof(unsigned[H5B_NUM_BTREE_ID])
+#define H5F_CRT_BTREE_RANK_DEF                                                                               \
+    {                                                                                                        \
+        HDF5_BTREE_SNODE_IK_DEF, HDF5_BTREE_CHUNK_IK_DEF                                                     \
+    }
 /* Definitions for byte number in an address                */
-#define H5F_CRT_ADDR_BYTE_NUM_SIZE   sizeof(uint8_t)
-#define H5F_CRT_ADDR_BYTE_NUM_DEF    H5F_OBJ_ADDR_SIZE
+#define H5F_CRT_ADDR_BYTE_NUM_SIZE sizeof(uint8_t)
+#define H5F_CRT_ADDR_BYTE_NUM_DEF  H5F_OBJ_ADDR_SIZE
 /* Definitions for byte number for object size              */
-#define H5F_CRT_OBJ_BYTE_NUM_SIZE     sizeof(uint8_t)
-#define H5F_CRT_OBJ_BYTE_NUM_DEF      H5F_OBJ_SIZE_SIZE
+#define H5F_CRT_OBJ_BYTE_NUM_SIZE sizeof(uint8_t)
+#define H5F_CRT_OBJ_BYTE_NUM_DEF  H5F_OBJ_SIZE_SIZE
 /* Definitions for version number of the superblock         */
-#define H5F_CRT_SUPER_VERS_SIZE       sizeof(unsigned)
-#define H5F_CRT_SUPER_VERS_DEF        HDF5_SUPERBLOCK_VERSION_DEF
+#define H5F_CRT_SUPER_VERS_SIZE sizeof(unsigned)
+#define H5F_CRT_SUPER_VERS_DEF  HDF5_SUPERBLOCK_VERSION_DEF
 /* Definitions for shared object header messages */
 #define H5F_CRT_SHMSG_NINDEXES_SIZE    sizeof(unsigned)
 #define H5F_CRT_SHMSG_NINDEXES_DEF     (0)
 #define H5F_CRT_SHMSG_INDEX_TYPES_SIZE sizeof(unsigned[H5O_SHMESG_MAX_NINDEXES])
-#define H5F_CRT_SHMSG_INDEX_TYPES_DEF  {0,0,0,0,0,0}
+#define H5F_CRT_SHMSG_INDEX_TYPES_DEF                                                                        \
+    {                                                                                                        \
+        0, 0, 0, 0, 0, 0                                                                                     \
+    }
 #define H5F_CRT_SHMSG_INDEX_MINSIZE_SIZE sizeof(unsigned[H5O_SHMESG_MAX_NINDEXES])
-#define H5F_CRT_SHMSG_INDEX_MINSIZE_DEF {250,250,250,250,250,250}
+#define H5F_CRT_SHMSG_INDEX_MINSIZE_DEF                                                                      \
+    {                                                                                                        \
+        250, 250, 250, 250, 250, 250                                                                         \
+    }
 /* Definitions for shared object header list/btree phase change cutoffs */
-#define H5F_CRT_SHMSG_LIST_MAX_SIZE     sizeof(unsigned)
-#define H5F_CRT_SHMSG_LIST_MAX_DEF      (50)
-#define H5F_CRT_SHMSG_BTREE_MIN_SIZE    sizeof(unsigned)
-#define H5F_CRT_SHMSG_BTREE_MIN_DEF     (40)
-
+#define H5F_CRT_SHMSG_LIST_MAX_SIZE  sizeof(unsigned)
+#define H5F_CRT_SHMSG_LIST_MAX_DEF   (50)
+#define H5F_CRT_SHMSG_BTREE_MIN_SIZE sizeof(unsigned)
+#define H5F_CRT_SHMSG_BTREE_MIN_DEF  (40)
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -92,42 +96,37 @@
 /* Property class callbacks */
 static herr_t H5P_fcrt_reg_prop(H5P_genclass_t *pclass);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* File creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_FCRT[1] = {{
-    "file create",		/* Class name for debugging     */
-    H5P_TYPE_FILE_CREATE,       /* Class type                   */
-
-    &H5P_CLS_GROUP_CREATE_g,	/* Parent class                 */
-    &H5P_CLS_FILE_CREATE_g,	/* Pointer to class             */
-    &H5P_CLS_FILE_CREATE_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_FILE_CREATE_ID_g,	/* Pointer to default property list ID */
-    H5P_fcrt_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "file create",        /* Class name for debugging     */
+    H5P_TYPE_FILE_CREATE, /* Class type                   */
+
+    &H5P_CLS_GROUP_CREATE_g,   /* Parent class                 */
+    &H5P_CLS_FILE_CREATE_g,    /* Pointer to class             */
+    &H5P_CLS_FILE_CREATE_ID_g, /* Pointer to class ID          */
+    &H5P_LST_FILE_CREATE_ID_g, /* Pointer to default property list ID */
+    H5P_fcrt_reg_prop,         /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_fcrt_reg_prop
  *
@@ -142,65 +141,74 @@ const H5P_libclass_t H5P_CLS_FCRT[1] = {{
 static herr_t
 H5P_fcrt_reg_prop(H5P_genclass_t *pclass)
 {
-    hsize_t userblock_size = H5F_CRT_USER_BLOCK_DEF;    /* Default userblock size */
-    unsigned sym_leaf_k = H5F_CRT_SYM_LEAF_DEF;         /* Default size for symbol table leaf nodes */
-    unsigned btree_k[H5B_NUM_BTREE_ID] = H5F_CRT_BTREE_RANK_DEF;    /* Default 'K' values for B-trees in file */
-    uint8_t sizeof_addr = H5F_CRT_ADDR_BYTE_NUM_DEF;     /* Default size of addresses in the file */
-    uint8_t sizeof_size = H5F_CRT_OBJ_BYTE_NUM_DEF;      /* Default size of sizes in the file */
-    unsigned superblock_ver = H5F_CRT_SUPER_VERS_DEF;   /* Default superblock version # */
-    unsigned num_sohm_indexes    = H5F_CRT_SHMSG_NINDEXES_DEF;
+    hsize_t  userblock_size            = H5F_CRT_USER_BLOCK_DEF; /* Default userblock size */
+    unsigned sym_leaf_k                = H5F_CRT_SYM_LEAF_DEF; /* Default size for symbol table leaf nodes */
+    unsigned btree_k[H5B_NUM_BTREE_ID] = H5F_CRT_BTREE_RANK_DEF; /* Default 'K' values for B-trees in file */
+    uint8_t  sizeof_addr      = H5F_CRT_ADDR_BYTE_NUM_DEF;       /* Default size of addresses in the file */
+    uint8_t  sizeof_size      = H5F_CRT_OBJ_BYTE_NUM_DEF;        /* Default size of sizes in the file */
+    unsigned superblock_ver   = H5F_CRT_SUPER_VERS_DEF;          /* Default superblock version # */
+    unsigned num_sohm_indexes = H5F_CRT_SHMSG_NINDEXES_DEF;
     unsigned sohm_index_flags[H5O_SHMESG_MAX_NINDEXES]    = H5F_CRT_SHMSG_INDEX_TYPES_DEF;
     unsigned sohm_index_minsizes[H5O_SHMESG_MAX_NINDEXES] = H5F_CRT_SHMSG_INDEX_MINSIZE_DEF;
-    unsigned sohm_list_max  = H5F_CRT_SHMSG_LIST_MAX_DEF;
-    unsigned sohm_btree_min  = H5F_CRT_SHMSG_BTREE_MIN_DEF;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned sohm_list_max                                = H5F_CRT_SHMSG_LIST_MAX_DEF;
+    unsigned sohm_btree_min                               = H5F_CRT_SHMSG_BTREE_MIN_DEF;
+    herr_t   ret_value                                    = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Register the user block size */
-    if(H5P_register_real(pclass, H5F_CRT_USER_BLOCK_NAME, H5F_CRT_USER_BLOCK_SIZE, &userblock_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_CRT_USER_BLOCK_NAME, H5F_CRT_USER_BLOCK_SIZE, &userblock_size, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the 1/2 rank for symbol table leaf nodes */
-    if(H5P_register_real(pclass, H5F_CRT_SYM_LEAF_NAME, H5F_CRT_SYM_LEAF_SIZE, &sym_leaf_k, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_CRT_SYM_LEAF_NAME, H5F_CRT_SYM_LEAF_SIZE, &sym_leaf_k, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the 1/2 rank for btree internal nodes */
-    if(H5P_register_real(pclass, H5F_CRT_BTREE_RANK_NAME, H5F_CRT_BTREE_RANK_SIZE, btree_k, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_CRT_BTREE_RANK_NAME, H5F_CRT_BTREE_RANK_SIZE, btree_k, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the byte number for an address */
-    if(H5P_register_real(pclass, H5F_CRT_ADDR_BYTE_NUM_NAME, H5F_CRT_ADDR_BYTE_NUM_SIZE, &sizeof_addr, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_CRT_ADDR_BYTE_NUM_NAME, H5F_CRT_ADDR_BYTE_NUM_SIZE, &sizeof_addr, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the byte number for object size */
-    if(H5P_register_real(pclass, H5F_CRT_OBJ_BYTE_NUM_NAME, H5F_CRT_OBJ_BYTE_NUM_SIZE, &sizeof_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_CRT_OBJ_BYTE_NUM_NAME, H5F_CRT_OBJ_BYTE_NUM_SIZE, &sizeof_size, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the superblock version number */
-    if(H5P_register_real(pclass, H5F_CRT_SUPER_VERS_NAME, H5F_CRT_SUPER_VERS_SIZE, &superblock_ver, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5F_CRT_SUPER_VERS_NAME, H5F_CRT_SUPER_VERS_SIZE, &superblock_ver, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the shared OH message information */
-    if(H5P_register_real(pclass,H5F_CRT_SHMSG_NINDEXES_NAME, H5F_CRT_SHMSG_NINDEXES_SIZE, &num_sohm_indexes,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if (H5P_register_real(pclass, H5F_CRT_SHMSG_NINDEXES_NAME, H5F_CRT_SHMSG_NINDEXES_SIZE, &num_sohm_indexes,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P_register_real(pclass,H5F_CRT_SHMSG_INDEX_TYPES_NAME, H5F_CRT_SHMSG_INDEX_TYPES_SIZE, &sohm_index_flags,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if (H5P_register_real(pclass, H5F_CRT_SHMSG_INDEX_TYPES_NAME, H5F_CRT_SHMSG_INDEX_TYPES_SIZE,
+                          &sohm_index_flags, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P_register_real(pclass,H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, H5F_CRT_SHMSG_INDEX_MINSIZE_SIZE, &sohm_index_minsizes,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if (H5P_register_real(pclass, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, H5F_CRT_SHMSG_INDEX_MINSIZE_SIZE,
+                          &sohm_index_minsizes, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the shared OH cutoff size information */
-    if(H5P_register_real(pclass,H5F_CRT_SHMSG_LIST_MAX_NAME, H5F_CRT_SHMSG_LIST_MAX_SIZE, &sohm_list_max,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if (H5P_register_real(pclass, H5F_CRT_SHMSG_LIST_MAX_NAME, H5F_CRT_SHMSG_LIST_MAX_SIZE, &sohm_list_max,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P_register_real(pclass,H5F_CRT_SHMSG_BTREE_MIN_NAME, H5F_CRT_SHMSG_BTREE_MIN_SIZE, &sohm_btree_min,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if (H5P_register_real(pclass, H5F_CRT_SHMSG_BTREE_MIN_NAME, H5F_CRT_SHMSG_BTREE_MIN_SIZE, &sohm_btree_min,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_fcrt_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_version
  *
@@ -225,35 +233,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_version(hid_t plist_id, unsigned *super/*out*/, unsigned *freelist/*out*/,
-    unsigned *stab/*out*/, unsigned *shhdr/*out*/)
+H5Pget_version(hid_t plist_id, unsigned *super /*out*/, unsigned *freelist /*out*/, unsigned *stab /*out*/,
+               unsigned *shhdr /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "ixxxx", plist_id, super, freelist, stab, shhdr);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(super)
-        if(H5P_get(plist, H5F_CRT_SUPER_VERS_NAME, super) < 0)
+    if (super)
+        if (H5P_get(plist, H5F_CRT_SUPER_VERS_NAME, super) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get superblock version")
-    if(freelist)
-        *freelist = HDF5_FREESPACE_VERSION;     /* (hard-wired) */
-    if(stab)
-        *stab = HDF5_OBJECTDIR_VERSION;         /* (hard-wired) */
-    if(shhdr)
-        *shhdr = HDF5_SHAREDHEADER_VERSION;     /* (hard-wired) */
+    if (freelist)
+        *freelist = HDF5_FREESPACE_VERSION; /* (hard-wired) */
+    if (stab)
+        *stab = HDF5_OBJECTDIR_VERSION; /* (hard-wired) */
+    if (shhdr)
+        *shhdr = HDF5_SHAREDHEADER_VERSION; /* (hard-wired) */
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_version() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_userblock
  *
@@ -270,36 +277,35 @@ done:
 herr_t
 H5Pset_userblock(hid_t plist_id, hsize_t size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ih", plist_id, size);
 
     /* Sanity check non-zero userblock sizes */
-    if(size > 0) {
+    if (size > 0) {
         /* Check that the userblock size is >=512 */
-        if(size < 512)
+        if (size < 512)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "userblock size is non-zero and less than 512")
 
         /* Check that the userblock size is a power of two */
-        if(!POWER_OF_TWO(size))
+        if (!POWER_OF_TWO(size))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "userblock size is non-zero and not a power of two")
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set value */
-    if(H5P_set(plist, H5F_CRT_USER_BLOCK_NAME, &size) < 0)
+    if (H5P_set(plist, H5F_CRT_USER_BLOCK_NAME, &size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set user block")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_userblock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_userblock
  *
@@ -323,26 +329,25 @@ done:
 herr_t
 H5Pget_userblock(hid_t plist_id, hsize_t *size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*h", plist_id, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
     /* Get value */
     if (size)
-        if(H5P_get(plist, H5F_CRT_USER_BLOCK_NAME, size) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL,"can't get user block");
+        if (H5P_get(plist, H5F_CRT_USER_BLOCK_NAME, size) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get user block");
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_sizes
  *
@@ -360,37 +365,37 @@ done:
 herr_t
 H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "izz", plist_id, sizeof_addr, sizeof_size);
 
     /* Check arguments */
-    if(sizeof_addr) {
-        if(sizeof_addr != 2 && sizeof_addr != 4 && sizeof_addr != 8 && sizeof_addr != 16)
+    if (sizeof_addr) {
+        if (sizeof_addr != 2 && sizeof_addr != 4 && sizeof_addr != 8 && sizeof_addr != 16)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file haddr_t size is not valid")
     } /* end if */
-    if(sizeof_size) {
-        if(sizeof_size != 2 && sizeof_size != 4 && sizeof_size != 8 && sizeof_size != 16)
+    if (sizeof_size) {
+        if (sizeof_size != 2 && sizeof_size != 4 && sizeof_size != 8 && sizeof_size != 16)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file size_t size is not valid")
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set value */
-    if(sizeof_addr) {
+    if (sizeof_addr) {
         uint8_t tmp_sizeof_addr = (uint8_t)sizeof_addr;
 
-        if(H5P_set(plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &tmp_sizeof_addr) < 0)
+        if (H5P_set(plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &tmp_sizeof_addr) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set byte number for an address")
     } /* end if */
-    if(sizeof_size) {
+    if (sizeof_size) {
         uint8_t tmp_sizeof_size = (uint8_t)sizeof_size;
 
-        if(H5P_set(plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &tmp_sizeof_size) < 0)
+        if (H5P_set(plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &tmp_sizeof_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set byte number for object ")
     } /* end if */
 
@@ -398,7 +403,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_sizes() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_sizes
  *
@@ -417,28 +421,28 @@ done:
 herr_t
 H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr, size_t *sizeof_size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*z*z", plist_id, sizeof_addr, sizeof_size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(sizeof_addr) {
+    if (sizeof_addr) {
         uint8_t tmp_sizeof_addr;
 
-        if(H5P_get(plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &tmp_sizeof_addr) < 0)
+        if (H5P_get(plist, H5F_CRT_ADDR_BYTE_NUM_NAME, &tmp_sizeof_addr) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get byte number for an address")
         *sizeof_addr = tmp_sizeof_addr;
     } /* end if */
-    if(sizeof_size) {
+    if (sizeof_size) {
         uint8_t tmp_sizeof_size;
 
-        if(H5P_get(plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &tmp_sizeof_size) < 0)
+        if (H5P_get(plist, H5F_CRT_OBJ_BYTE_NUM_NAME, &tmp_sizeof_size) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get byte number for object ")
         *sizeof_size = tmp_sizeof_size;
     } /* end if */
@@ -447,7 +451,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_sizes() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_sym_k
  *
@@ -481,37 +484,36 @@ done:
 herr_t
 H5Pset_sym_k(hid_t plist_id, unsigned ik, unsigned lk)
 {
-    unsigned btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    unsigned        btree_k[H5B_NUM_BTREE_ID];
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIuIu", plist_id, ik, lk);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
     /* Set values */
     if (ik > 0) {
-	if((ik * 2) >= HDF5_BTREE_IK_MAX_ENTRIES)
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "istore IK value exceeds maximum B-tree entries");
+        if ((ik * 2) >= HDF5_BTREE_IK_MAX_ENTRIES)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "istore IK value exceeds maximum B-tree entries");
 
-        if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
+        if (H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree interanl nodes");
         btree_k[H5B_SNODE_ID] = ik;
-        if(H5P_set(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
+        if (H5P_set(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for btree nodes");
     }
     if (lk > 0)
-        if(H5P_set(plist, H5F_CRT_SYM_LEAF_NAME, &lk) < 0)
+        if (H5P_set(plist, H5F_CRT_SYM_LEAF_NAME, &lk) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for symbol table leaf nodes");
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_sym_k
  *
@@ -533,34 +535,33 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out */ , unsigned *lk /*out */ )
+H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out */, unsigned *lk /*out */)
 {
-    unsigned btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    unsigned        btree_k[H5B_NUM_BTREE_ID];
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", plist_id, ik, lk);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
     /* Get values */
     if (ik) {
-        if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
+        if (H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree nodes");
         *ik = btree_k[H5B_SNODE_ID];
     }
     if (lk)
-        if(H5P_get(plist, H5F_CRT_SYM_LEAF_NAME, lk) < 0)
+        if (H5P_get(plist, H5F_CRT_SYM_LEAF_NAME, lk) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for symbol table leaf nodes");
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_istore_k
  *
@@ -583,9 +584,9 @@ done:
 herr_t
 H5Pset_istore_k(hid_t plist_id, unsigned ik)
 {
-    unsigned btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    unsigned        btree_k[H5B_NUM_BTREE_ID];
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, ik);
@@ -594,25 +595,24 @@ H5Pset_istore_k(hid_t plist_id, unsigned ik)
     if (ik == 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "istore IK value must be positive");
 
-    if((ik * 2) >= HDF5_BTREE_IK_MAX_ENTRIES)
+    if ((ik * 2) >= HDF5_BTREE_IK_MAX_ENTRIES)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "istore IK value exceeds maximum B-tree entries");
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
     /* Set value */
-    if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
+    if (H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree interanl nodes");
     btree_k[H5B_CHUNK_ID] = ik;
-    if(H5P_set(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
+    if (H5P_set(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for btree interanl nodes");
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_istore_k
  *
@@ -635,22 +635,22 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out */ )
+H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out */)
 {
-    unsigned btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned        btree_k[H5B_NUM_BTREE_ID];
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, ik);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
     /* Get value */
-    if(ik) {
-        if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
+    if (ik) {
+        if (H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree interanl nodes");
         *ik = btree_k[H5B_CHUNK_ID];
     } /* end if */
@@ -659,7 +659,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_istore_k() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_shared_mesg_nindexes
  *
@@ -682,28 +681,28 @@ done:
 herr_t
 H5Pset_shared_mesg_nindexes(hid_t plist_id, unsigned nindexes)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, nindexes);
 
     /* Check argument */
     if (nindexes > H5O_SHMESG_MAX_NINDEXES)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "number of indexes is greater than H5O_SHMESG_MAX_NINDEXES");
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL,
+                    "number of indexes is greater than H5O_SHMESG_MAX_NINDEXES");
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
-    if(H5P_set(plist, H5F_CRT_SHMSG_NINDEXES_NAME, &nindexes) < 0)
+    if (H5P_set(plist, H5F_CRT_SHMSG_NINDEXES_NAME, &nindexes) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set number of indexes");
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_shared_mesg_nindexes() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_shared_mesg_nindexes
  *
@@ -720,24 +719,23 @@ done:
 herr_t
 H5Pget_shared_mesg_nindexes(hid_t plist_id, unsigned *nindexes)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Iu", plist_id, nindexes);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
-    if(H5P_get(plist, H5F_CRT_SHMSG_NINDEXES_NAME, nindexes) < 0)
+    if (H5P_get(plist, H5F_CRT_SHMSG_NINDEXES_NAME, nindexes) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get number of indexes");
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_shared_mesg_nindexes() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_shared_mesg_index
  *
@@ -758,52 +756,51 @@ done:
 herr_t
 H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_flags, unsigned min_mesg_size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    unsigned    nindexes;               /* Number of SOHM indexes */
-    unsigned    type_flags[H5O_SHMESG_MAX_NINDEXES]; /* Array of mesg_type_flags*/
-    unsigned    minsizes[H5O_SHMESG_MAX_NINDEXES]; /* Array of min_mesg_sizes*/
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5P_genplist_t *plist;                               /* Property list pointer */
+    unsigned        nindexes;                            /* Number of SOHM indexes */
+    unsigned        type_flags[H5O_SHMESG_MAX_NINDEXES]; /* Array of mesg_type_flags*/
+    unsigned        minsizes[H5O_SHMESG_MAX_NINDEXES];   /* Array of min_mesg_sizes*/
+    herr_t          ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iIuIuIu", plist_id, index_num, mesg_type_flags, min_mesg_size);
 
     /* Check arguments */
-    if(mesg_type_flags > H5O_SHMESG_ALL_FLAG)
+    if (mesg_type_flags > H5O_SHMESG_ALL_FLAG)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "unrecognized flags in mesg_type_flags")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Read the current number of indexes */
-    if(H5P_get(plist, H5F_CRT_SHMSG_NINDEXES_NAME, &nindexes) < 0)
+    if (H5P_get(plist, H5F_CRT_SHMSG_NINDEXES_NAME, &nindexes) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get number of indexes")
 
     /* Range check */
-    if(index_num >= nindexes)
+    if (index_num >= nindexes)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index_num is too large; no such index");
 
     /* Get arrays of type flags and message sizes */
-    if(H5P_get(plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, type_flags) < 0)
+    if (H5P_get(plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, type_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get current index type flags")
-    if(H5P_get(plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, minsizes) < 0)
+    if (H5P_get(plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, minsizes) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get current min sizes")
 
     /* Set values in arrays */
     type_flags[index_num] = mesg_type_flags;
-    minsizes[index_num] = min_mesg_size;
+    minsizes[index_num]   = min_mesg_size;
 
     /* Write arrays back to plist */
-    if(H5P_set(plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, type_flags) < 0)
+    if (H5P_set(plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, type_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set index type flags")
-    if(H5P_set(plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, minsizes) < 0)
+    if (H5P_set(plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, minsizes) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set min mesg sizes")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_shared_mesg_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_shared_mesg_index
  *
@@ -819,46 +816,46 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type_flags, unsigned *min_mesg_size)
+H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type_flags,
+                         unsigned *min_mesg_size)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    unsigned    nindexes;               /* Number of SOHM indexes */
-    unsigned    type_flags[H5O_SHMESG_MAX_NINDEXES]; /* Array of mesg_type_flags*/
-    unsigned    minsizes[H5O_SHMESG_MAX_NINDEXES]; /* Array of min_mesg_sizes*/
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5P_genplist_t *plist;                               /* Property list pointer */
+    unsigned        nindexes;                            /* Number of SOHM indexes */
+    unsigned        type_flags[H5O_SHMESG_MAX_NINDEXES]; /* Array of mesg_type_flags*/
+    unsigned        minsizes[H5O_SHMESG_MAX_NINDEXES];   /* Array of min_mesg_sizes*/
+    herr_t          ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE4("e", "iIu*Iu*Iu", plist_id, index_num, mesg_type_flags,
-             min_mesg_size);
+    H5TRACE4("e", "iIu*Iu*Iu", plist_id, index_num, mesg_type_flags, min_mesg_size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Read the current number of indexes */
-    if(H5P_get(plist, H5F_CRT_SHMSG_NINDEXES_NAME, &nindexes) < 0)
+    if (H5P_get(plist, H5F_CRT_SHMSG_NINDEXES_NAME, &nindexes) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get number of indexes")
 
-    if(index_num >= nindexes)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index_num is greater than number of indexes in property list")
+    if (index_num >= nindexes)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL,
+                    "index_num is greater than number of indexes in property list")
 
     /* Get arrays of type flags and message sizes */
-    if(H5P_get(plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, type_flags) < 0)
+    if (H5P_get(plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, type_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get current index type flags")
-    if(H5P_get(plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, minsizes) < 0)
+    if (H5P_get(plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, minsizes) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get current min sizes")
 
     /* Get values from arrays */
-    if(mesg_type_flags)
+    if (mesg_type_flags)
         *mesg_type_flags = type_flags[index_num];
-    if(min_mesg_size)
+    if (min_mesg_size)
         *min_mesg_size = minsizes[index_num];
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_shared_mesg_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_shared_mesg_phase_change
  *
@@ -881,8 +878,8 @@ done:
 herr_t
 H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_btree)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIuIu", plist_id, max_list, min_btree);
@@ -892,33 +889,32 @@ H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_
      *
      * Range check to make certain they will fit into encoded form.
      */
-    if(max_list + 1 < min_btree)
+    if (max_list + 1 < min_btree)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "minimum B-tree value is greater than maximum list value")
-    if(max_list > H5O_SHMESG_MAX_LIST_SIZE)
+    if (max_list > H5O_SHMESG_MAX_LIST_SIZE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "max list value is larger than H5O_SHMESG_MAX_LIST_SIZE")
-    if(min_btree > H5O_SHMESG_MAX_LIST_SIZE)
+    if (min_btree > H5O_SHMESG_MAX_LIST_SIZE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "min btree value is larger than H5O_SHMESG_MAX_LIST_SIZE")
 
     /* Avoid the strange case where max_list == 0 and min_btree == 1, so deleting the
      * last message in a B-tree makes it become an empty list.
      */
-    if(max_list == 0)
+    if (max_list == 0)
         min_btree = 0;
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
-    if(H5P_set(plist, H5F_CRT_SHMSG_LIST_MAX_NAME, &max_list) < 0)
+    if (H5P_set(plist, H5F_CRT_SHMSG_LIST_MAX_NAME, &max_list) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set list maximum in property list");
-    if(H5P_set(plist, H5F_CRT_SHMSG_BTREE_MIN_NAME, &min_btree) < 0)
+    if (H5P_set(plist, H5F_CRT_SHMSG_BTREE_MIN_NAME, &min_btree) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set B-tree minimum in property list");
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_shared_mesg_phase_change() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_shared_mesg_phase_change
  *
@@ -935,27 +931,26 @@ done:
 herr_t
 H5Pget_shared_mesg_phase_change(hid_t plist_id, unsigned *max_list, unsigned *min_btree)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*Iu*Iu", plist_id, max_list, min_btree);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
 
     /* Get value */
     if (max_list) {
-        if(H5P_get(plist, H5F_CRT_SHMSG_LIST_MAX_NAME, max_list) < 0)
+        if (H5P_get(plist, H5F_CRT_SHMSG_LIST_MAX_NAME, max_list) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get list maximum");
     }
     if (min_btree) {
-        if(H5P_get(plist, H5F_CRT_SHMSG_BTREE_MIN_NAME, min_btree) < 0)
+        if (H5P_get(plist, H5F_CRT_SHMSG_BTREE_MIN_NAME, min_btree) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get SOHM information");
     }
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_shared_mesg_phase_change() */
-
diff --git a/src/H5Pfmpl.c b/src/H5Pfmpl.c
index 5e343e8..a6f1734 100644
--- a/src/H5Pfmpl.c
+++ b/src/H5Pfmpl.c
@@ -25,18 +25,16 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files		  	        */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fprivate.h" /* Files		  	        */
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
@@ -44,20 +42,17 @@
 
 /* ======================== File Mount properties ====================*/
 /* Definition for whether absolute symlinks local to file. */
-#define H5F_MNT_SYM_LOCAL_SIZE		sizeof(hbool_t)
-#define H5F_MNT_SYM_LOCAL_DEF	 	FALSE
-
+#define H5F_MNT_SYM_LOCAL_SIZE sizeof(hbool_t)
+#define H5F_MNT_SYM_LOCAL_DEF  FALSE
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -65,37 +60,33 @@
 /* Property class callbacks */
 static herr_t H5P_fmnt_reg_prop(H5P_genclass_t *pclass);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* File mount property list class library initialization object */
 const H5P_libclass_t H5P_CLS_FMNT[1] = {{
-    "file mount",		/* Class name for debugging     */
-    H5P_TYPE_FILE_MOUNT,        /* Class type                   */
-
-    &H5P_CLS_ROOT_g,		/* Parent class                 */
-    &H5P_CLS_FILE_MOUNT_g,	/* Pointer to class             */
-    &H5P_CLS_FILE_MOUNT_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_FILE_MOUNT_ID_g,	/* Pointer to default property list ID */
-    H5P_fmnt_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "file mount",        /* Class name for debugging     */
+    H5P_TYPE_FILE_MOUNT, /* Class type                   */
+
+    &H5P_CLS_ROOT_g,          /* Parent class                 */
+    &H5P_CLS_FILE_MOUNT_g,    /* Pointer to class             */
+    &H5P_CLS_FILE_MOUNT_ID_g, /* Pointer to class ID          */
+    &H5P_LST_FILE_MOUNT_ID_g, /* Pointer to default property list ID */
+    H5P_fmnt_reg_prop,        /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_fmnt_reg_prop
  *
@@ -110,16 +101,16 @@ const H5P_libclass_t H5P_CLS_FMNT[1] = {{
 static herr_t
 H5P_fmnt_reg_prop(H5P_genclass_t *pclass)
 {
-    hbool_t local = H5F_MNT_SYM_LOCAL_DEF;      /* Whether symlinks are local to file */
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    hbool_t local     = H5F_MNT_SYM_LOCAL_DEF; /* Whether symlinks are local to file */
+    herr_t  ret_value = SUCCEED;               /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Register property of whether symlinks is local to file */
-    if(H5P_register_real(pclass, H5F_MNT_SYM_LOCAL_NAME, H5F_MNT_SYM_LOCAL_SIZE, &local, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5F_MNT_SYM_LOCAL_NAME, H5F_MNT_SYM_LOCAL_SIZE, &local, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_fmnt_reg_prop() */
-
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c
index 2651288..0cb665e 100644
--- a/src/H5Pgcpl.c
+++ b/src/H5Pgcpl.c
@@ -25,34 +25,30 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gprivate.h"         /* Groups                               */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Gprivate.h" /* Groups                               */
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Oprivate.h" /* Object headers		  	*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -60,42 +56,37 @@
 /* Property class callbacks */
 static herr_t H5P__gcrt_reg_prop(H5P_genclass_t *pclass);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* Group creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_GCRT[1] = {{
-    "group create",		/* Class name for debugging     */
-    H5P_TYPE_GROUP_CREATE,      /* Class type                   */
-
-    &H5P_CLS_OBJECT_CREATE_g,	/* Parent class                 */
-    &H5P_CLS_GROUP_CREATE_g,	/* Pointer to class             */
-    &H5P_CLS_GROUP_CREATE_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_GROUP_CREATE_ID_g,	/* Pointer to default property list ID */
-    H5P__gcrt_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "group create",        /* Class name for debugging     */
+    H5P_TYPE_GROUP_CREATE, /* Class type                   */
+
+    &H5P_CLS_OBJECT_CREATE_g,   /* Parent class                 */
+    &H5P_CLS_GROUP_CREATE_g,    /* Pointer to class             */
+    &H5P_CLS_GROUP_CREATE_ID_g, /* Pointer to class ID          */
+    &H5P_LST_GROUP_CREATE_ID_g, /* Pointer to default property list ID */
+    H5P__gcrt_reg_prop,         /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__gcrt_reg_prop
  *
@@ -110,25 +101,26 @@ const H5P_libclass_t H5P_CLS_GCRT[1] = {{
 static herr_t
 H5P__gcrt_reg_prop(H5P_genclass_t *pclass)
 {
-    H5O_ginfo_t ginfo = H5G_CRT_GROUP_INFO_DEF;     /* Default group info settings */
-    H5O_linfo_t linfo = H5G_CRT_LINK_INFO_DEF;      /* Default link info settings */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_ginfo_t ginfo     = H5G_CRT_GROUP_INFO_DEF; /* Default group info settings */
+    H5O_linfo_t linfo     = H5G_CRT_LINK_INFO_DEF;  /* Default link info settings */
+    herr_t      ret_value = SUCCEED;                /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register group info property */
-    if(H5P_register_real(pclass, H5G_CRT_GROUP_INFO_NAME, H5G_CRT_GROUP_INFO_SIZE, &ginfo, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5G_CRT_GROUP_INFO_NAME, H5G_CRT_GROUP_INFO_SIZE, &ginfo, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register link info property */
-    if(H5P_register_real(pclass, H5G_CRT_LINK_INFO_NAME, H5G_CRT_LINK_INFO_SIZE, &linfo, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5G_CRT_LINK_INFO_NAME, H5G_CRT_LINK_INFO_SIZE, &linfo, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__gcrt_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_local_heap_size_hint
  *
@@ -143,33 +135,32 @@ done:
 herr_t
 H5Pset_local_heap_size_hint(hid_t plist_id, size_t size_hint)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5O_ginfo_t ginfo;          /* Group information structure */
-    herr_t ret_value = SUCCEED;       /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5O_ginfo_t     ginfo;               /* Group information structure */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", plist_id, size_hint);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+    if (H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
 
     /* Update field */
     H5_CHECKED_ASSIGN(ginfo.lheap_size_hint, uint32_t, size_hint, size_t);
 
     /* Set value */
-    if(H5P_set(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+    if (H5P_set(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set group info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_local_heap_size_hint() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_local_heap_size_hint
  *
@@ -185,21 +176,21 @@ done:
 herr_t
 H5Pget_local_heap_size_hint(hid_t plist_id, size_t *size_hint /*out*/)
 {
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, size_hint);
 
-    if(size_hint) {
-        H5P_genplist_t *plist;      /* Property list pointer */
-        H5O_ginfo_t ginfo;          /* Group information structure */
+    if (size_hint) {
+        H5P_genplist_t *plist; /* Property list pointer */
+        H5O_ginfo_t     ginfo; /* Group information structure */
 
         /* Get the plist structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get value */
-        if(H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+        if (H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
 
         /* Update field */
@@ -210,7 +201,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_local_heap_size_hint() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_link_phase_change
  *
@@ -231,46 +221,45 @@ done:
 herr_t
 H5Pset_link_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    H5O_ginfo_t ginfo;                  /* Group information structure */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5O_ginfo_t     ginfo;               /* Group information structure */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense);
 
     /* Range check values */
-    if(max_compact < min_dense)
+    if (max_compact < min_dense)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "max compact value must be >= min dense value")
-    if(max_compact > 65535)
+    if (max_compact > 65535)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "max compact value must be < 65536")
-    if(min_dense > 65535)
+    if (min_dense > 65535)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "min dense value must be < 65536")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get group info */
-    if(H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+    if (H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
 
     /* Update fields */
-    if(max_compact != H5G_CRT_GINFO_MAX_COMPACT || min_dense != H5G_CRT_GINFO_MIN_DENSE)
+    if (max_compact != H5G_CRT_GINFO_MAX_COMPACT || min_dense != H5G_CRT_GINFO_MIN_DENSE)
         ginfo.store_link_phase_change = TRUE;
     else
         ginfo.store_link_phase_change = FALSE;
     ginfo.max_compact = (uint16_t)max_compact;
-    ginfo.min_dense = (uint16_t)min_dense;
+    ginfo.min_dense   = (uint16_t)min_dense;
 
     /* Set group info */
-    if(H5P_set(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+    if (H5P_set(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set group info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_link_phase_change() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_link_phase_change
  *
@@ -286,27 +275,27 @@ done:
 herr_t
 H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact /*out*/, unsigned *min_dense /*out*/)
 {
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", plist_id, max_compact, min_dense);
 
     /* Get values */
-    if(max_compact || min_dense) {
-        H5P_genplist_t *plist;      /* Property list pointer */
-        H5O_ginfo_t ginfo;          /* Group information structure */
+    if (max_compact || min_dense) {
+        H5P_genplist_t *plist; /* Property list pointer */
+        H5O_ginfo_t     ginfo; /* Group information structure */
 
         /* Get the plist structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get group info */
-        if(H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+        if (H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
 
-        if(max_compact)
+        if (max_compact)
             *max_compact = ginfo.max_compact;
-        if(min_dense)
+        if (min_dense)
             *min_dense = ginfo.min_dense;
     } /* end if */
 
@@ -314,7 +303,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_link_phase_change() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_est_link_info
  *
@@ -337,44 +325,43 @@ done:
 herr_t
 H5Pset_est_link_info(hid_t plist_id, unsigned est_num_entries, unsigned est_name_len)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    H5O_ginfo_t ginfo;                  /* Group information structure */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5O_ginfo_t     ginfo;               /* Group information structure */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIuIu", plist_id, est_num_entries, est_name_len);
 
     /* Range check values */
-    if(est_num_entries > 65535)
+    if (est_num_entries > 65535)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "est. number of entries must be < 65536")
-    if(est_name_len > 65535)
+    if (est_name_len > 65535)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "est. name length must be < 65536")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get group info */
-    if(H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+    if (H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
 
     /* Update fields */
-    if(est_num_entries != H5G_CRT_GINFO_EST_NUM_ENTRIES || est_name_len != H5G_CRT_GINFO_EST_NAME_LEN)
+    if (est_num_entries != H5G_CRT_GINFO_EST_NUM_ENTRIES || est_name_len != H5G_CRT_GINFO_EST_NAME_LEN)
         ginfo.store_est_entry_info = TRUE;
     else
         ginfo.store_est_entry_info = FALSE;
     ginfo.est_num_entries = (uint16_t)est_num_entries;
-    ginfo.est_name_len = (uint16_t)est_name_len;
+    ginfo.est_name_len    = (uint16_t)est_name_len;
 
     /* Set group info */
-    if(H5P_set(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+    if (H5P_set(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set group info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_est_link_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_est_link_info
  *
@@ -390,27 +377,27 @@ done:
 herr_t
 H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries /*out*/, unsigned *est_name_len /*out*/)
 {
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", plist_id, est_num_entries, est_name_len);
 
     /* Get values */
-    if(est_num_entries || est_name_len) {
-        H5P_genplist_t *plist;      /* Property list pointer */
-        H5O_ginfo_t ginfo;          /* Group information structure */
+    if (est_num_entries || est_name_len) {
+        H5P_genplist_t *plist; /* Property list pointer */
+        H5O_ginfo_t     ginfo; /* Group information structure */
 
         /* Get the plist structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get group info */
-        if(H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
+        if (H5P_get(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
 
-        if(est_num_entries)
+        if (est_num_entries)
             *est_num_entries = ginfo.est_num_entries;
-        if(est_name_len)
+        if (est_name_len)
             *est_name_len = ginfo.est_name_len;
     } /* end if */
 
@@ -418,7 +405,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_est_link_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_link_creation_order
  *
@@ -433,23 +419,23 @@ done:
 herr_t
 H5Pset_link_creation_order(hid_t plist_id, unsigned crt_order_flags)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    H5O_linfo_t linfo;                  /* Link information structure */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5O_linfo_t     linfo;               /* Link information structure */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, crt_order_flags);
 
-        /* Check for bad combination of flags */
-    if(!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED))
+    /* Check for bad combination of flags */
+    if (!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "tracking creation order is required for index")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get link info */
-    if(H5P_get(plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
+    if (H5P_get(plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get link info")
 
     /* Update fields */
@@ -457,14 +443,13 @@ H5Pset_link_creation_order(hid_t plist_id, unsigned crt_order_flags)
     linfo.index_corder = (hbool_t)((crt_order_flags & H5P_CRT_ORDER_INDEXED) ? TRUE : FALSE);
 
     /* Set link info */
-    if(H5P_set(plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
+    if (H5P_set(plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set link info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_link_creation_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_link_creation_order
  *
@@ -480,25 +465,25 @@ done:
 herr_t
 H5Pget_link_creation_order(hid_t plist_id, unsigned *crt_order_flags /*out*/)
 {
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, crt_order_flags);
 
     /* Get values */
-    if(crt_order_flags) {
-        H5P_genplist_t *plist;      /* Property list pointer */
-        H5O_linfo_t linfo;          /* Link information structure */
+    if (crt_order_flags) {
+        H5P_genplist_t *plist; /* Property list pointer */
+        H5O_linfo_t     linfo; /* Link information structure */
 
         /* Reset the value to return */
         *crt_order_flags = 0;
 
         /* Get the plist structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get link info */
-        if(H5P_get(plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
+        if (H5P_get(plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get link info")
 
         *crt_order_flags |= linfo.track_corder ? H5P_CRT_ORDER_TRACKED : 0;
@@ -508,4 +493,3 @@ H5Pget_link_creation_order(hid_t plist_id, unsigned *crt_order_flags /*out*/)
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_link_creation_order() */
-
diff --git a/src/H5Pint.c b/src/H5Pint.c
index 2b71e77..ede19be 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -20,73 +20,68 @@
 /* Module Setup */
 /****************/
 
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5P_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5P_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Ppkg.h"      /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Typedef for checking for duplicate class names in parent class */
 typedef struct {
-    const H5P_genclass_t *parent;       /* Pointer to parent class */
-    const char *name;                   /* Pointer to name to check */
-    H5P_genclass_t *new_class;          /* Pointer to class during path traversal */
+    const H5P_genclass_t *parent;    /* Pointer to parent class */
+    const char *          name;      /* Pointer to name to check */
+    H5P_genclass_t *      new_class; /* Pointer to class during path traversal */
 } H5P_check_class_t;
 
 /* Typedef for property list iterator callback */
 typedef struct {
-    H5P_iterate_int_t cb_func;  /* Iterator callback */
-    void *udata;                /* Iterator callback pointer */
-    const H5P_genplist_t *plist;      /* Property list pointer */
-    H5SL_t *seen;               /* Skip list to hold names of properties already seen */
-    int *curr_idx_ptr;          /* Pointer to current iteration index */
-    int prev_idx;               /* Previous iteration index */
+    H5P_iterate_int_t     cb_func;      /* Iterator callback */
+    void *                udata;        /* Iterator callback pointer */
+    const H5P_genplist_t *plist;        /* Property list pointer */
+    H5SL_t *              seen;         /* Skip list to hold names of properties already seen */
+    int *                 curr_idx_ptr; /* Pointer to current iteration index */
+    int                   prev_idx;     /* Previous iteration index */
 } H5P_iter_plist_ud_t;
 
 /* Typedef for property list class iterator callback */
 typedef struct {
-    H5P_iterate_int_t cb_func;  /* Iterator callback */
-    void *udata;                /* Iterator callback pointer */
-    int *curr_idx_ptr;          /* Pointer to current iteration index */
-    int prev_idx;               /* Previous iteration index */
+    H5P_iterate_int_t cb_func;      /* Iterator callback */
+    void *            udata;        /* Iterator callback pointer */
+    int *             curr_idx_ptr; /* Pointer to current iteration index */
+    int               prev_idx;     /* Previous iteration index */
 } H5P_iter_pclass_ud_t;
 
 /* Typedef for property list comparison callback */
 typedef struct {
-    const H5P_genplist_t *plist2;       /* Pointer to second property list */
-    int cmp_value;              /* Value from property comparison */
+    const H5P_genplist_t *plist2;    /* Pointer to second property list */
+    int                   cmp_value; /* Value from property comparison */
 } H5P_plist_cmp_ud_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* General helper routines */
 static H5P_genprop_t *H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type);
-static herr_t H5P_free_prop(H5P_genprop_t *prop);
-static int H5P_cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2);
-
+static herr_t         H5P_free_prop(H5P_genprop_t *prop);
+static int            H5P_cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2);
 
 /*********************/
 /* Package Variables */
@@ -96,191 +91,188 @@ static int H5P_cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2);
  * Predefined property list classes. These are initialized at runtime by
  * H5P_init_interface() in this source file.
  */
-hid_t H5P_CLS_ROOT_ID_g                         = FAIL;
-H5P_genclass_t *H5P_CLS_ROOT_g                  = NULL;
-hid_t H5P_CLS_OBJECT_CREATE_ID_g                = FAIL;
-H5P_genclass_t *H5P_CLS_OBJECT_CREATE_g         = NULL;
-hid_t H5P_CLS_FILE_CREATE_ID_g                  = FAIL;
-H5P_genclass_t *H5P_CLS_FILE_CREATE_g           = NULL;
-hid_t H5P_CLS_FILE_ACCESS_ID_g                  = FAIL;
-H5P_genclass_t *H5P_CLS_FILE_ACCESS_g           = NULL;
-hid_t H5P_CLS_DATASET_CREATE_ID_g               = FAIL;
-H5P_genclass_t *H5P_CLS_DATASET_CREATE_g        = NULL;
-hid_t H5P_CLS_DATASET_ACCESS_ID_g               = FAIL;
-H5P_genclass_t *H5P_CLS_DATASET_ACCESS_g        = NULL;
-hid_t H5P_CLS_DATASET_XFER_ID_g                 = FAIL;
-H5P_genclass_t *H5P_CLS_DATASET_XFER_g          = NULL;
-hid_t H5P_CLS_FILE_MOUNT_ID_g                   = FAIL;
-H5P_genclass_t *H5P_CLS_FILE_MOUNT_g            = NULL;
-hid_t H5P_CLS_GROUP_CREATE_ID_g                 = FAIL;
-H5P_genclass_t *H5P_CLS_GROUP_CREATE_g          = NULL;
-hid_t H5P_CLS_GROUP_ACCESS_ID_g                 = FAIL;
-H5P_genclass_t *H5P_CLS_GROUP_ACCESS_g          = NULL;
-hid_t H5P_CLS_DATATYPE_CREATE_ID_g              = FAIL;
-H5P_genclass_t *H5P_CLS_DATATYPE_CREATE_g       = NULL;
-hid_t H5P_CLS_DATATYPE_ACCESS_ID_g              = FAIL;
-H5P_genclass_t *H5P_CLS_DATATYPE_ACCESS_g       = NULL;
-hid_t H5P_CLS_ATTRIBUTE_CREATE_ID_g             = FAIL;
-H5P_genclass_t *H5P_CLS_ATTRIBUTE_CREATE_g      = NULL;
-hid_t H5P_CLS_OBJECT_COPY_ID_g                  = FAIL;
-H5P_genclass_t *H5P_CLS_OBJECT_COPY_g           = NULL;
-hid_t H5P_CLS_LINK_CREATE_ID_g                  = FAIL;
-H5P_genclass_t *H5P_CLS_LINK_CREATE_g           = NULL;
-hid_t H5P_CLS_LINK_ACCESS_ID_g                  = FAIL;
-H5P_genclass_t *H5P_CLS_LINK_ACCESS_g           = NULL;
-hid_t H5P_CLS_STRING_CREATE_ID_g                = FAIL;
-H5P_genclass_t *H5P_CLS_STRING_CREATE_g         = NULL;
+hid_t           H5P_CLS_ROOT_ID_g             = FAIL;
+H5P_genclass_t *H5P_CLS_ROOT_g                = NULL;
+hid_t           H5P_CLS_OBJECT_CREATE_ID_g    = FAIL;
+H5P_genclass_t *H5P_CLS_OBJECT_CREATE_g       = NULL;
+hid_t           H5P_CLS_FILE_CREATE_ID_g      = FAIL;
+H5P_genclass_t *H5P_CLS_FILE_CREATE_g         = NULL;
+hid_t           H5P_CLS_FILE_ACCESS_ID_g      = FAIL;
+H5P_genclass_t *H5P_CLS_FILE_ACCESS_g         = NULL;
+hid_t           H5P_CLS_DATASET_CREATE_ID_g   = FAIL;
+H5P_genclass_t *H5P_CLS_DATASET_CREATE_g      = NULL;
+hid_t           H5P_CLS_DATASET_ACCESS_ID_g   = FAIL;
+H5P_genclass_t *H5P_CLS_DATASET_ACCESS_g      = NULL;
+hid_t           H5P_CLS_DATASET_XFER_ID_g     = FAIL;
+H5P_genclass_t *H5P_CLS_DATASET_XFER_g        = NULL;
+hid_t           H5P_CLS_FILE_MOUNT_ID_g       = FAIL;
+H5P_genclass_t *H5P_CLS_FILE_MOUNT_g          = NULL;
+hid_t           H5P_CLS_GROUP_CREATE_ID_g     = FAIL;
+H5P_genclass_t *H5P_CLS_GROUP_CREATE_g        = NULL;
+hid_t           H5P_CLS_GROUP_ACCESS_ID_g     = FAIL;
+H5P_genclass_t *H5P_CLS_GROUP_ACCESS_g        = NULL;
+hid_t           H5P_CLS_DATATYPE_CREATE_ID_g  = FAIL;
+H5P_genclass_t *H5P_CLS_DATATYPE_CREATE_g     = NULL;
+hid_t           H5P_CLS_DATATYPE_ACCESS_ID_g  = FAIL;
+H5P_genclass_t *H5P_CLS_DATATYPE_ACCESS_g     = NULL;
+hid_t           H5P_CLS_ATTRIBUTE_CREATE_ID_g = FAIL;
+H5P_genclass_t *H5P_CLS_ATTRIBUTE_CREATE_g    = NULL;
+hid_t           H5P_CLS_OBJECT_COPY_ID_g      = FAIL;
+H5P_genclass_t *H5P_CLS_OBJECT_COPY_g         = NULL;
+hid_t           H5P_CLS_LINK_CREATE_ID_g      = FAIL;
+H5P_genclass_t *H5P_CLS_LINK_CREATE_g         = NULL;
+hid_t           H5P_CLS_LINK_ACCESS_ID_g      = FAIL;
+H5P_genclass_t *H5P_CLS_LINK_ACCESS_g         = NULL;
+hid_t           H5P_CLS_STRING_CREATE_ID_g    = FAIL;
+H5P_genclass_t *H5P_CLS_STRING_CREATE_g       = NULL;
 
 /*
  * Predefined property lists for each predefined class. These are initialized
  * at runtime by H5P_init_interface() in this source file.
  */
-hid_t H5P_LST_FILE_CREATE_ID_g          = FAIL;
-hid_t H5P_LST_FILE_ACCESS_ID_g          = FAIL;
-hid_t H5P_LST_DATASET_CREATE_ID_g       = FAIL;
-hid_t H5P_LST_DATASET_ACCESS_ID_g       = FAIL;
-hid_t H5P_LST_DATASET_XFER_ID_g         = FAIL;
-hid_t H5P_LST_FILE_MOUNT_ID_g           = FAIL;
-hid_t H5P_LST_GROUP_CREATE_ID_g         = FAIL;
-hid_t H5P_LST_GROUP_ACCESS_ID_g         = FAIL;
-hid_t H5P_LST_DATATYPE_CREATE_ID_g      = FAIL;
-hid_t H5P_LST_DATATYPE_ACCESS_ID_g      = FAIL;
-hid_t H5P_LST_ATTRIBUTE_CREATE_ID_g     = FAIL;
-hid_t H5P_LST_OBJECT_COPY_ID_g          = FAIL;
-hid_t H5P_LST_LINK_CREATE_ID_g          = FAIL;
-hid_t H5P_LST_LINK_ACCESS_ID_g          = FAIL;
+hid_t H5P_LST_FILE_CREATE_ID_g      = FAIL;
+hid_t H5P_LST_FILE_ACCESS_ID_g      = FAIL;
+hid_t H5P_LST_DATASET_CREATE_ID_g   = FAIL;
+hid_t H5P_LST_DATASET_ACCESS_ID_g   = FAIL;
+hid_t H5P_LST_DATASET_XFER_ID_g     = FAIL;
+hid_t H5P_LST_FILE_MOUNT_ID_g       = FAIL;
+hid_t H5P_LST_GROUP_CREATE_ID_g     = FAIL;
+hid_t H5P_LST_GROUP_ACCESS_ID_g     = FAIL;
+hid_t H5P_LST_DATATYPE_CREATE_ID_g  = FAIL;
+hid_t H5P_LST_DATATYPE_ACCESS_ID_g  = FAIL;
+hid_t H5P_LST_ATTRIBUTE_CREATE_ID_g = FAIL;
+hid_t H5P_LST_OBJECT_COPY_ID_g      = FAIL;
+hid_t H5P_LST_LINK_CREATE_ID_g      = FAIL;
+hid_t H5P_LST_LINK_ACCESS_ID_g      = FAIL;
 
 /* Root property list class library initialization object */
 const H5P_libclass_t H5P_CLS_ROOT[1] = {{
-    "root",			/* Class name for debugging     */
-    H5P_TYPE_ROOT,              /* Class type                   */
-
-    NULL,			/* Parent class                 */
-    &H5P_CLS_ROOT_g,		/* Pointer to class             */
-    &H5P_CLS_ROOT_ID_g,		/* Pointer to class ID          */
-    NULL,			/* Pointer to default property list ID */
-    NULL,			/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "root",        /* Class name for debugging     */
+    H5P_TYPE_ROOT, /* Class type                   */
+
+    NULL,               /* Parent class                 */
+    &H5P_CLS_ROOT_g,    /* Pointer to class             */
+    &H5P_CLS_ROOT_ID_g, /* Pointer to class ID          */
+    NULL,               /* Pointer to default property list ID */
+    NULL,               /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
 /* Group access property list class library initialization object */
 /* (move to proper source code file when used for real) */
 const H5P_libclass_t H5P_CLS_GACC[1] = {{
-    "group access",		/* Class name for debugging     */
-    H5P_TYPE_GROUP_ACCESS,      /* Class type                   */
-
-    &H5P_CLS_LINK_ACCESS_g,	/* Parent class                 */
-    &H5P_CLS_GROUP_ACCESS_g,	/* Pointer to class             */
-    &H5P_CLS_GROUP_ACCESS_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_GROUP_ACCESS_ID_g,	/* Pointer to default property list ID */
-    NULL,			/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "group access",        /* Class name for debugging     */
+    H5P_TYPE_GROUP_ACCESS, /* Class type                   */
+
+    &H5P_CLS_LINK_ACCESS_g,     /* Parent class                 */
+    &H5P_CLS_GROUP_ACCESS_g,    /* Pointer to class             */
+    &H5P_CLS_GROUP_ACCESS_ID_g, /* Pointer to class ID          */
+    &H5P_LST_GROUP_ACCESS_ID_g, /* Pointer to default property list ID */
+    NULL,                       /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
 /* Datatype creation property list class library initialization object */
 /* (move to proper source code file when used for real) */
 const H5P_libclass_t H5P_CLS_TCRT[1] = {{
-    "datatype create",		/* Class name for debugging     */
-    H5P_TYPE_DATATYPE_CREATE,   /* Class type                   */
-
-    &H5P_CLS_OBJECT_CREATE_g,	/* Parent class                 */
-    &H5P_CLS_DATATYPE_CREATE_g,	/* Pointer to class             */
-    &H5P_CLS_DATATYPE_CREATE_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_DATATYPE_CREATE_ID_g,	/* Pointer to default property list ID */
-    NULL,			/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "datatype create",        /* Class name for debugging     */
+    H5P_TYPE_DATATYPE_CREATE, /* Class type                   */
+
+    &H5P_CLS_OBJECT_CREATE_g,      /* Parent class                 */
+    &H5P_CLS_DATATYPE_CREATE_g,    /* Pointer to class             */
+    &H5P_CLS_DATATYPE_CREATE_ID_g, /* Pointer to class ID          */
+    &H5P_LST_DATATYPE_CREATE_ID_g, /* Pointer to default property list ID */
+    NULL,                          /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
 /* Datatype access property list class library initialization object */
 /* (move to proper source code file when used for real) */
 const H5P_libclass_t H5P_CLS_TACC[1] = {{
-    "datatype access",		/* Class name for debugging     */
-    H5P_TYPE_DATATYPE_ACCESS,   /* Class type                   */
-
-    &H5P_CLS_LINK_ACCESS_g,	/* Parent class                 */
-    &H5P_CLS_DATATYPE_ACCESS_g,	/* Pointer to class             */
-    &H5P_CLS_DATATYPE_ACCESS_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_DATATYPE_ACCESS_ID_g,	/* Pointer to default property list ID */
-    NULL,			/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "datatype access",        /* Class name for debugging     */
+    H5P_TYPE_DATATYPE_ACCESS, /* Class type                   */
+
+    &H5P_CLS_LINK_ACCESS_g,        /* Parent class                 */
+    &H5P_CLS_DATATYPE_ACCESS_g,    /* Pointer to class             */
+    &H5P_CLS_DATATYPE_ACCESS_ID_g, /* Pointer to class ID          */
+    &H5P_LST_DATATYPE_ACCESS_ID_g, /* Pointer to default property list ID */
+    NULL,                          /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /* Library property list classes defined in other code modules */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_OCRT[1];         /* Object creation */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_STRCRT[1];       /* String create */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_LACC[1];         /* Link access */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_GCRT[1];         /* Group create */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_OCPY[1];         /* Object copy */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_FCRT[1];         /* File creation */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_FACC[1];         /* File access */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_DCRT[1];         /* Dataset creation */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_DACC[1];         /* Dataset access */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_DXFR[1];         /* Data transfer */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_FMNT[1];         /* File mount */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_ACRT[1];         /* Attribute creation */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_LCRT[1];         /* Link creation */
-
+H5_DLLVAR const H5P_libclass_t H5P_CLS_OCRT[1];   /* Object creation */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_STRCRT[1]; /* String create */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_LACC[1];   /* Link access */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_GCRT[1];   /* Group create */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_OCPY[1];   /* Object copy */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_FCRT[1];   /* File creation */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_FACC[1];   /* File access */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_DCRT[1];   /* Dataset creation */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_DACC[1];   /* Dataset access */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_DXFR[1];   /* Data transfer */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_FMNT[1];   /* File mount */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_ACRT[1];   /* Attribute creation */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_LCRT[1];   /* Link creation */
 
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Track the revision count of a class, to make comparisons faster */
 static unsigned H5P_next_rev = 0;
-#define H5P_GET_NEXT_REV        (H5P_next_rev++)
+#define H5P_GET_NEXT_REV (H5P_next_rev++)
 
 /* List of all property list classes in the library */
 /* (order here is not important, they will be initialized in the proper
  *      order according to their parent class dependencies)
  */
-static H5P_libclass_t const * const init_class[] = {
-    H5P_CLS_ROOT,       /* Root */
-    H5P_CLS_OCRT,       /* Object create */
-    H5P_CLS_STRCRT,     /* String create */
-    H5P_CLS_LACC,       /* Link access */
-    H5P_CLS_GCRT,       /* Group create */
-    H5P_CLS_OCPY,       /* Object copy */
-    H5P_CLS_GACC,       /* Group access */
-    H5P_CLS_FCRT,       /* File creation */
-    H5P_CLS_FACC,       /* File access */
-    H5P_CLS_DCRT,       /* Dataset creation */
-    H5P_CLS_DACC,       /* Dataset access */
-    H5P_CLS_DXFR,       /* Data transfer */
-    H5P_CLS_FMNT,       /* File mount */
-    H5P_CLS_TCRT,       /* Datatype creation */
-    H5P_CLS_TACC,       /* Datatype access */
-    H5P_CLS_ACRT,       /* Attribute creation */
-    H5P_CLS_LCRT        /* Link creation */
+static H5P_libclass_t const *const init_class[] = {
+    H5P_CLS_ROOT,   /* Root */
+    H5P_CLS_OCRT,   /* Object create */
+    H5P_CLS_STRCRT, /* String create */
+    H5P_CLS_LACC,   /* Link access */
+    H5P_CLS_GCRT,   /* Group create */
+    H5P_CLS_OCPY,   /* Object copy */
+    H5P_CLS_GACC,   /* Group access */
+    H5P_CLS_FCRT,   /* File creation */
+    H5P_CLS_FACC,   /* File access */
+    H5P_CLS_DCRT,   /* Dataset creation */
+    H5P_CLS_DACC,   /* Dataset access */
+    H5P_CLS_DXFR,   /* Data transfer */
+    H5P_CLS_FMNT,   /* File mount */
+    H5P_CLS_TCRT,   /* Datatype creation */
+    H5P_CLS_TACC,   /* Datatype access */
+    H5P_CLS_ACRT,   /* Attribute creation */
+    H5P_CLS_LCRT    /* Link creation */
 };
 
 /* Declare a free list to manage the H5P_genclass_t struct */
@@ -294,22 +286,20 @@ H5FL_DEFINE_STATIC(H5P_genplist_t);
 
 /* Generic Property Class ID class */
 static const H5I_class_t H5I_GENPROPCLS_CLS[1] = {{
-    H5I_GENPROP_CLS,		/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,				/* # of reserved IDs for class */
-    (H5I_free_t)H5P_close_class	/* Callback routine for closing objects of this class */
+    H5I_GENPROP_CLS,            /* ID class value */
+    H5I_CLASS_REUSE_IDS,        /* Class flags */
+    0,                          /* # of reserved IDs for class */
+    (H5I_free_t)H5P_close_class /* Callback routine for closing objects of this class */
 }};
 
 /* Generic Property List ID class */
 static const H5I_class_t H5I_GENPROPLST_CLS[1] = {{
-    H5I_GENPROP_LST,		/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,				/* # of reserved IDs for class */
-    (H5I_free_t)H5P_close	/* Callback routine for closing objects of this class */
+    H5I_GENPROP_LST,      /* ID class value */
+    H5I_CLASS_REUSE_IDS,  /* Class flags */
+    0,                    /* # of reserved IDs for class */
+    (H5I_free_t)H5P_close /* Callback routine for closing objects of this class */
 }};
 
-
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_do_prop_cb1
@@ -335,50 +325,49 @@ static const H5I_class_t H5I_GENPROPLST_CLS[1] = {{
 static herr_t
 H5P_do_prop_cb1(H5SL_t *slist, H5P_genprop_t *prop, H5P_prp_cb1_t cb)
 {
-    void *tmp_value=NULL;       /* Temporary value buffer */
-    H5P_genprop_t *pcopy=NULL;  /* Copy of property to insert into skip list */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    void *         tmp_value = NULL;    /* Temporary value buffer */
+    H5P_genprop_t *pcopy     = NULL;    /* Copy of property to insert into skip list */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate space for a temporary copy of the property value */
-    if(NULL == (tmp_value = H5MM_malloc(prop->size)))
+    if (NULL == (tmp_value = H5MM_malloc(prop->size)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for temporary property value")
-    HDmemcpy(tmp_value,prop->value,prop->size);
+    HDmemcpy(tmp_value, prop->value, prop->size);
 
     /* Call "type 1" callback ('create', 'copy' or 'close') */
-    if(cb(prop->name,prop->size,tmp_value) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL,"Property callback failed")
+    if (cb(prop->name, prop->size, tmp_value) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Property callback failed")
 
     /* Check if the property value changed */
-    if((prop->cmp)(tmp_value,prop->value,prop->size)) {
+    if ((prop->cmp)(tmp_value, prop->value, prop->size)) {
         /* Make a copy of the class's property */
-        if((pcopy=H5P_dup_prop(prop,H5P_PROP_WITHIN_LIST)) == NULL)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL,"Can't copy property")
+        if ((pcopy = H5P_dup_prop(prop, H5P_PROP_WITHIN_LIST)) == NULL)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
 
         /* Copy the changed value into the new property */
-        HDmemcpy(pcopy->value,tmp_value,prop->size);
+        HDmemcpy(pcopy->value, tmp_value, prop->size);
 
         /* Insert the changed property into the property list */
-        if(H5P_add_prop(slist,pcopy) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert property into skip list")
+        if (H5P_add_prop(slist, pcopy) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into skip list")
     } /* end if */
 
 done:
     /* Release the temporary value buffer */
-    if(tmp_value!=NULL)
+    if (tmp_value != NULL)
         H5MM_xfree(tmp_value);
 
     /* Cleanup on failure */
-    if(ret_value<0) {
-        if(pcopy!=NULL)
+    if (ret_value < 0) {
+        if (pcopy != NULL)
             H5P_free_prop(pcopy);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_do_prop_cb1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_init
  *
@@ -398,7 +387,7 @@ done:
 herr_t
 H5P_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -407,7 +396,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_init() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5P_init_interface -- Initialize interface-specific information
@@ -421,18 +409,18 @@ DESCRIPTION
 static herr_t
 H5P_init_interface(void)
 {
-    size_t tot_init;                    /* Total # of classes initialized */
-    size_t pass_init;                   /* # of classes initialized in each pass */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t tot_init;            /* Total # of classes initialized */
+    size_t pass_init;           /* # of classes initialized in each pass */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /*
      * Initialize the Generic Property class & object groups.
      */
-    if(H5I_register_type(H5I_GENPROPCLS_CLS) < 0)
+    if (H5I_register_type(H5I_GENPROPCLS_CLS) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINIT, FAIL, "unable to initialize ID group")
-    if(H5I_register_type(H5I_GENPROPLST_CLS) < 0)
+    if (H5I_register_type(H5I_GENPROPLST_CLS) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINIT, FAIL, "unable to initialize ID group")
 
     /* Repeatedly pass over the list of property list classes for the library,
@@ -441,47 +429,52 @@ H5P_init_interface(void)
      */
     tot_init = 0;
     do {
-        size_t u;                           /* Local index variable */
+        size_t u; /* Local index variable */
 
         /* Reset pass initialization counter */
         pass_init = 0;
 
         /* Make a pass over all the library's property list classes */
-        for(u = 0; u < NELMTS(init_class); u++) {
+        for (u = 0; u < NELMTS(init_class); u++) {
             H5P_libclass_t const *lib_class = init_class[u]; /* Current class to operate on */
 
             /* Check if the current class hasn't been initialized and can be now */
             HDassert(lib_class->class_id);
-            if(*lib_class->class_id == (-1) && (lib_class->par_pclass == NULL
-                        || *lib_class->par_pclass != NULL)) {
+            if (*lib_class->class_id == (-1) &&
+                (lib_class->par_pclass == NULL || *lib_class->par_pclass != NULL)) {
                 /* Sanity check - only the root class is not allowed to have a parent class */
                 HDassert(lib_class->par_pclass || lib_class == H5P_CLS_ROOT);
 
                 /* Allocate the new class */
-                if(NULL == (*lib_class->pclass = H5P_create_class(lib_class->par_pclass ? *lib_class->par_pclass : NULL, lib_class->name, lib_class->type, lib_class->create_func, lib_class->create_data, lib_class->copy_func, lib_class->copy_data, lib_class->close_func, lib_class->close_data)))
+                if (NULL == (*lib_class->pclass = H5P_create_class(
+                                 lib_class->par_pclass ? *lib_class->par_pclass : NULL, lib_class->name,
+                                 lib_class->type, lib_class->create_func, lib_class->create_data,
+                                 lib_class->copy_func, lib_class->copy_data, lib_class->close_func,
+                                 lib_class->close_data)))
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
 
                 /* Call routine to register properties for class */
-                if(lib_class->reg_prop_func && (*lib_class->reg_prop_func)(*lib_class->pclass) < 0)
+                if (lib_class->reg_prop_func && (*lib_class->reg_prop_func)(*lib_class->pclass) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register properties")
 
                 /* Register the new class */
-                if((*lib_class->class_id = H5I_register(H5I_GENPROP_CLS, *lib_class->pclass, FALSE)) < 0)
+                if ((*lib_class->class_id = H5I_register(H5I_GENPROP_CLS, *lib_class->pclass, FALSE)) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register property list class")
 
                 /* Only register the default property list if it hasn't been created yet */
-                if(lib_class->def_plist_id && *lib_class->def_plist_id == (-1)) {
+                if (lib_class->def_plist_id && *lib_class->def_plist_id == (-1)) {
                     /* Register the default property list for the new class*/
-                    if((*lib_class->def_plist_id = H5P_create_id(*lib_class->pclass, FALSE)) < 0)
-                         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register default property list for class")
+                    if ((*lib_class->def_plist_id = H5P_create_id(*lib_class->pclass, FALSE)) < 0)
+                        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL,
+                                    "can't register default property list for class")
                 } /* end if */
 
                 /* Increment class initialization counters */
                 pass_init++;
                 tot_init++;
             } /* end if */
-        } /* end for */
-    } while(pass_init > 0);
+        }     /* end for */
+    } while (pass_init > 0);
 
     /* Verify that all classes were initialized */
     HDassert(tot_init == NELMTS(init_class));
@@ -490,7 +483,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_init_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_term_interface
@@ -511,90 +503,64 @@ done:
 int
 H5P_term_interface(void)
 {
-    int	n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
-        int	nlist, nclass;
+    if (H5_interface_initialize_g) {
+        int nlist, nclass;
 
         /* Destroy HDF5 library property classes & lists */
 
         /* Check if there are any open property list classes or lists */
         nclass = H5I_nmembers(H5I_GENPROP_CLS);
-        nlist = H5I_nmembers(H5I_GENPROP_LST);
+        nlist  = H5I_nmembers(H5I_GENPROP_LST);
 
         /* If there are any open classes or groups, attempt to get rid of them. */
-        if((nclass + nlist) > 0) {
+        if ((nclass + nlist) > 0) {
             /* Clear the lists */
-            if(nlist > 0) {
+            if (nlist > 0) {
                 (void)H5I_clear_type(H5I_GENPROP_LST, FALSE, FALSE);
 
                 /* Reset the default property lists, if they've been closed */
-                if(H5I_nmembers(H5I_GENPROP_LST) == 0) {
-                    H5P_LST_FILE_CREATE_ID_g =
-                        H5P_LST_FILE_ACCESS_ID_g =
-                        H5P_LST_DATASET_CREATE_ID_g =
-                        H5P_LST_DATASET_ACCESS_ID_g =
-                        H5P_LST_DATASET_XFER_ID_g =
-                        H5P_LST_GROUP_CREATE_ID_g =
-                        H5P_LST_GROUP_ACCESS_ID_g =
-                        H5P_LST_DATATYPE_CREATE_ID_g =
-                        H5P_LST_DATATYPE_ACCESS_ID_g =
-                        H5P_LST_ATTRIBUTE_CREATE_ID_g =
-                        H5P_LST_OBJECT_COPY_ID_g =
-                        H5P_LST_LINK_CREATE_ID_g =
-                        H5P_LST_LINK_ACCESS_ID_g =
-                        H5P_LST_FILE_MOUNT_ID_g = (-1);
+                if (H5I_nmembers(H5I_GENPROP_LST) == 0) {
+                    H5P_LST_FILE_CREATE_ID_g = H5P_LST_FILE_ACCESS_ID_g = H5P_LST_DATASET_CREATE_ID_g =
+                        H5P_LST_DATASET_ACCESS_ID_g = H5P_LST_DATASET_XFER_ID_g = H5P_LST_GROUP_CREATE_ID_g =
+                            H5P_LST_GROUP_ACCESS_ID_g            = H5P_LST_DATATYPE_CREATE_ID_g =
+                                H5P_LST_DATATYPE_ACCESS_ID_g     = H5P_LST_ATTRIBUTE_CREATE_ID_g =
+                                    H5P_LST_OBJECT_COPY_ID_g     = H5P_LST_LINK_CREATE_ID_g =
+                                        H5P_LST_LINK_ACCESS_ID_g = H5P_LST_FILE_MOUNT_ID_g = (-1);
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             /* Only attempt to close the classes after all the lists are closed */
-            if(nlist == 0 && nclass > 0) {
+            if (nlist == 0 && nclass > 0) {
                 (void)H5I_clear_type(H5I_GENPROP_CLS, FALSE, FALSE);
 
                 /* Reset the default property lists, if they've been closed */
-                if(H5I_nmembers(H5I_GENPROP_CLS) == 0) {
-                        H5P_CLS_ROOT_g =
-                        H5P_CLS_OBJECT_CREATE_g =
-                        H5P_CLS_FILE_CREATE_g =
-                        H5P_CLS_FILE_ACCESS_g =
-                        H5P_CLS_DATASET_CREATE_g =
-                        H5P_CLS_DATASET_ACCESS_g =
-                        H5P_CLS_DATASET_XFER_g =
-                        H5P_CLS_GROUP_CREATE_g =
-                        H5P_CLS_GROUP_ACCESS_g =
-                        H5P_CLS_DATATYPE_CREATE_g =
-                        H5P_CLS_DATATYPE_ACCESS_g =
-                        H5P_CLS_STRING_CREATE_g =
-                        H5P_CLS_ATTRIBUTE_CREATE_g =
-                        H5P_CLS_OBJECT_COPY_g =
-                        H5P_CLS_LINK_CREATE_g =
-                        H5P_CLS_LINK_ACCESS_g =
-                        H5P_CLS_FILE_MOUNT_g = NULL;
-
-                        H5P_CLS_ROOT_ID_g =
-                        H5P_CLS_OBJECT_CREATE_ID_g =
-                        H5P_CLS_FILE_CREATE_ID_g =
-                        H5P_CLS_FILE_ACCESS_ID_g =
-                        H5P_CLS_DATASET_CREATE_ID_g =
-                        H5P_CLS_DATASET_ACCESS_ID_g =
-                        H5P_CLS_DATASET_XFER_ID_g =
-                        H5P_CLS_GROUP_CREATE_ID_g =
-                        H5P_CLS_GROUP_ACCESS_ID_g =
-                        H5P_CLS_DATATYPE_CREATE_ID_g =
-                        H5P_CLS_DATATYPE_ACCESS_ID_g =
-                        H5P_CLS_STRING_CREATE_ID_g =
-                        H5P_CLS_ATTRIBUTE_CREATE_ID_g =
-                        H5P_CLS_OBJECT_COPY_ID_g =
-                        H5P_CLS_LINK_CREATE_ID_g =
-                        H5P_CLS_LINK_ACCESS_ID_g =
-                        H5P_CLS_FILE_MOUNT_ID_g = (-1);
+                if (H5I_nmembers(H5I_GENPROP_CLS) == 0) {
+                    H5P_CLS_ROOT_g = H5P_CLS_OBJECT_CREATE_g = H5P_CLS_FILE_CREATE_g = H5P_CLS_FILE_ACCESS_g =
+                        H5P_CLS_DATASET_CREATE_g = H5P_CLS_DATASET_ACCESS_g = H5P_CLS_DATASET_XFER_g =
+                            H5P_CLS_GROUP_CREATE_g = H5P_CLS_GROUP_ACCESS_g = H5P_CLS_DATATYPE_CREATE_g =
+                                H5P_CLS_DATATYPE_ACCESS_g                   = H5P_CLS_STRING_CREATE_g =
+                                    H5P_CLS_ATTRIBUTE_CREATE_g              = H5P_CLS_OBJECT_COPY_g =
+                                        H5P_CLS_LINK_CREATE_g = H5P_CLS_LINK_ACCESS_g = H5P_CLS_FILE_MOUNT_g =
+                                            NULL;
+
+                    H5P_CLS_ROOT_ID_g = H5P_CLS_OBJECT_CREATE_ID_g = H5P_CLS_FILE_CREATE_ID_g =
+                        H5P_CLS_FILE_ACCESS_ID_g = H5P_CLS_DATASET_CREATE_ID_g = H5P_CLS_DATASET_ACCESS_ID_g =
+                            H5P_CLS_DATASET_XFER_ID_g                          = H5P_CLS_GROUP_CREATE_ID_g =
+                                H5P_CLS_GROUP_ACCESS_ID_g               = H5P_CLS_DATATYPE_CREATE_ID_g =
+                                    H5P_CLS_DATATYPE_ACCESS_ID_g        = H5P_CLS_STRING_CREATE_ID_g =
+                                        H5P_CLS_ATTRIBUTE_CREATE_ID_g   = H5P_CLS_OBJECT_COPY_ID_g =
+                                            H5P_CLS_LINK_CREATE_ID_g    = H5P_CLS_LINK_ACCESS_ID_g =
+                                                H5P_CLS_FILE_MOUNT_ID_g = (-1);
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             n++; /*H5I*/
-        } else {
+        }
+        else {
             /* Close public interface */
             n += H5P__term_pub_interface();
 
@@ -610,12 +576,11 @@ H5P_term_interface(void)
             /* Mark closed */
             H5_interface_initialize_g = 0;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5P_term_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_copy_pclass
@@ -639,9 +604,9 @@ H5P_term_interface(void)
 H5P_genclass_t *
 H5P_copy_pclass(H5P_genclass_t *pclass)
 {
-    H5P_genclass_t *new_pclass = NULL;  /* Property list class copied */
-    H5P_genprop_t *pcopy;               /* Copy of property to insert into class */
-    H5P_genclass_t *ret_value=NULL;     /* return value */
+    H5P_genclass_t *new_pclass = NULL; /* Property list class copied */
+    H5P_genprop_t * pcopy;             /* Copy of property to insert into class */
+    H5P_genclass_t *ret_value = NULL;  /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -652,43 +617,44 @@ H5P_copy_pclass(H5P_genclass_t *pclass)
      */
 
     /* Create the new property list class */
-    if(NULL == (new_pclass = H5P_create_class(pclass->parent, pclass->name, pclass->type, pclass->create_func, pclass->create_data, pclass->copy_func, pclass->copy_data, pclass->close_func, pclass->close_data)))
+    if (NULL == (new_pclass = H5P_create_class(pclass->parent, pclass->name, pclass->type,
+                                               pclass->create_func, pclass->create_data, pclass->copy_func,
+                                               pclass->copy_data, pclass->close_func, pclass->close_data)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, NULL, "unable to create property list class")
 
     /* Copy the properties registered for this class */
-    if(pclass->nprops > 0) {
-        H5SL_node_t *curr_node;   /* Current node in skip list */
+    if (pclass->nprops > 0) {
+        H5SL_node_t *curr_node; /* Current node in skip list */
 
         /* Walk through the properties in the old class */
-        curr_node=H5SL_first(pclass->props);
-        while(curr_node!=NULL) {
+        curr_node = H5SL_first(pclass->props);
+        while (curr_node != NULL) {
             /* Make a copy of the class's property */
-            if(NULL == (pcopy = H5P_dup_prop((H5P_genprop_t *)H5SL_item(curr_node), H5P_PROP_WITHIN_CLASS)))
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, NULL,"Can't copy property")
+            if (NULL == (pcopy = H5P_dup_prop((H5P_genprop_t *)H5SL_item(curr_node), H5P_PROP_WITHIN_CLASS)))
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, NULL, "Can't copy property")
 
             /* Insert the initialized property into the property list */
-            if(H5P_add_prop(new_pclass->props,pcopy) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, NULL,"Can't insert property into class")
+            if (H5P_add_prop(new_pclass->props, pcopy) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, NULL, "Can't insert property into class")
 
             /* Increment property count for class */
             new_pclass->nprops++;
 
             /* Get the next property node in the list */
-            curr_node=H5SL_next(curr_node);
+            curr_node = H5SL_next(curr_node);
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     /* Set the return value */
-    ret_value=new_pclass;
+    ret_value = new_pclass;
 
 done:
-    if(ret_value==NULL && new_pclass)
+    if (ret_value == NULL && new_pclass)
         H5P_close_class(new_pclass);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_copy_pclass() */
+} /* H5P_copy_pclass() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_copy_plist
@@ -713,16 +679,16 @@ done:
 hid_t
 H5P_copy_plist(const H5P_genplist_t *old_plist, hbool_t app_ref)
 {
-    H5P_genclass_t *tclass;     /* Temporary class pointer */
-    H5P_genplist_t *new_plist=NULL;  /* New property list generated from copy */
-    H5P_genprop_t *tmp;         /* Temporary pointer to properties */
-    H5P_genprop_t *new_prop;    /* New property created for copy */
-    hid_t new_plist_id;         /* Property list ID of new list created */
-    H5SL_node_t *curr_node;     /* Current node in skip list */
-    H5SL_t *seen=NULL;          /* Skip list containing properties already seen */
-    size_t nseen;               /* Number of items 'seen' */
-    hbool_t has_parent_class;   /* Flag to indicate that this property list's class has a parent */
-    hid_t ret_value=FAIL;       /* return value */
+    H5P_genclass_t *tclass;           /* Temporary class pointer */
+    H5P_genplist_t *new_plist = NULL; /* New property list generated from copy */
+    H5P_genprop_t * tmp;              /* Temporary pointer to properties */
+    H5P_genprop_t * new_prop;         /* New property created for copy */
+    hid_t           new_plist_id;     /* Property list ID of new list created */
+    H5SL_node_t *   curr_node;        /* Current node in skip list */
+    H5SL_t *        seen = NULL;      /* Skip list containing properties already seen */
+    size_t          nseen;            /* Number of items 'seen' */
+    hbool_t         has_parent_class; /* Flag to indicate that this property list's class has a parent */
+    hid_t           ret_value = FAIL; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -733,120 +699,121 @@ H5P_copy_plist(const H5P_genplist_t *old_plist, hbool_t app_ref)
      */
 
     /* Allocate room for the property list */
-    if(NULL==(new_plist = H5FL_CALLOC(H5P_genplist_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
+    if (NULL == (new_plist = H5FL_CALLOC(H5P_genplist_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Set class state */
-    new_plist->pclass = old_plist->pclass;
-    new_plist->nprops = 0;      /* Initially the plist has the same number of properties as the class */
-    new_plist->class_init = FALSE;  /* Initially, wait until the class callback finishes to set */
+    new_plist->pclass     = old_plist->pclass;
+    new_plist->nprops     = 0;     /* Initially the plist has the same number of properties as the class */
+    new_plist->class_init = FALSE; /* Initially, wait until the class callback finishes to set */
 
     /* Initialize the skip list to hold the changed properties */
-    if((new_plist->props = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for changed properties")
+    if ((new_plist->props = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "can't create skip list for changed properties")
 
     /* Create the skip list for deleted properties */
-    if((new_plist->del = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for deleted properties")
+    if ((new_plist->del = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "can't create skip list for deleted properties")
 
     /* Create the skip list to hold names of properties already seen
      * (This prevents a property in the class hierarchy from having it's
      * 'create' callback called, if a property in the class hierarchy has
      * already been seen)
      */
-    if((seen = H5SL_create(H5SL_TYPE_STR, NULL))== NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for seen properties")
+    if ((seen = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "can't create skip list for seen properties")
     nseen = 0;
 
     /* Cycle through the deleted properties & copy them into the new list's deleted section */
-    if(H5SL_count(old_plist->del)>0) {
-        curr_node=H5SL_first(old_plist->del);
-        while(curr_node) {
-            char *new_name;   /* Pointer to new name */
+    if (H5SL_count(old_plist->del) > 0) {
+        curr_node = H5SL_first(old_plist->del);
+        while (curr_node) {
+            char *new_name; /* Pointer to new name */
 
             /* Duplicate string for insertion into new deleted property skip list */
-            if((new_name=H5MM_xstrdup((char *)H5SL_item(curr_node))) == NULL)
-                HGOTO_ERROR(H5E_RESOURCE,H5E_NOSPACE,FAIL,"memory allocation failed")
+            if ((new_name = H5MM_xstrdup((char *)H5SL_item(curr_node))) == NULL)
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Insert property name into deleted list */
-            if(H5SL_insert(new_plist->del,new_name,new_name) < 0)
-                HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into deleted skip list")
+            if (H5SL_insert(new_plist->del, new_name, new_name) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into deleted skip list")
 
             /* Add property name to "seen" list */
-            if(H5SL_insert(seen,new_name,new_name) < 0)
-                HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into seen skip list")
+            if (H5SL_insert(seen, new_name, new_name) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into seen skip list")
             nseen++;
 
             /* Get the next property node in the skip list */
-            curr_node=H5SL_next(curr_node);
+            curr_node = H5SL_next(curr_node);
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     /* Cycle through the properties and copy them also */
-    if(H5SL_count(old_plist->props)>0) {
-        curr_node=H5SL_first(old_plist->props);
-        while(curr_node) {
+    if (H5SL_count(old_plist->props) > 0) {
+        curr_node = H5SL_first(old_plist->props);
+        while (curr_node) {
             /* Get a pointer to the node's property */
             tmp = (H5P_genprop_t *)H5SL_item(curr_node);
 
             /* Make a copy of the list's property */
-            if(NULL == (new_prop = H5P_dup_prop(tmp, H5P_PROP_WITHIN_LIST)))
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL,"Can't copy property")
+            if (NULL == (new_prop = H5P_dup_prop(tmp, H5P_PROP_WITHIN_LIST)))
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
 
             /* Call property copy callback, if it exists */
-            if(new_prop->copy) {
-                if((new_prop->copy)(new_prop->name,new_prop->size,new_prop->value) < 0) {
+            if (new_prop->copy) {
+                if ((new_prop->copy)(new_prop->name, new_prop->size, new_prop->value) < 0) {
                     H5P_free_prop(new_prop);
-                    HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL,"Can't copy property")
+                    HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             /* Insert the initialized property into the property list */
-            if(H5P_add_prop(new_plist->props,new_prop) < 0) {
+            if (H5P_add_prop(new_plist->props, new_prop) < 0) {
                 H5P_free_prop(new_prop);
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert property into list")
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into list")
             } /* end if */
 
             /* Add property name to "seen" list */
-            if(H5SL_insert(seen,new_prop->name,new_prop->name) < 0)
-                HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into seen skip list")
+            if (H5SL_insert(seen, new_prop->name, new_prop->name) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into seen skip list")
             nseen++;
 
             /* Increment the number of properties in list */
             new_plist->nprops++;
 
             /* Get the next property node in the skip list */
-            curr_node=H5SL_next(curr_node);
+            curr_node = H5SL_next(curr_node);
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     /*
      * Check for copying class properties (up through list of parent classes also),
      * initialize each with default value & make property 'copy' callback.
      */
-    tclass=old_plist->pclass;
+    tclass           = old_plist->pclass;
     has_parent_class = (hbool_t)(tclass != NULL && tclass->parent != NULL && tclass->parent->nprops > 0);
-    while(tclass!=NULL) {
-        if(tclass->nprops>0) {
+    while (tclass != NULL) {
+        if (tclass->nprops > 0) {
             /* Walk through the properties in the old class */
-            curr_node=H5SL_first(tclass->props);
-            while(curr_node!=NULL) {
+            curr_node = H5SL_first(tclass->props);
+            while (curr_node != NULL) {
                 /* Get pointer to property from node */
                 tmp = (H5P_genprop_t *)H5SL_item(curr_node);
 
                 /* Only "copy" properties we haven't seen before */
-                if(nseen==0 || H5SL_search(seen,tmp->name) == NULL) {
+                if (nseen == 0 || H5SL_search(seen, tmp->name) == NULL) {
                     /* Call property creation callback, if it exists */
-                    if(tmp->copy) {
+                    if (tmp->copy) {
                         /* Call the callback & insert changed value into skip list (if necessary) */
-                        if(H5P_do_prop_cb1(new_plist->props,tmp,tmp->copy) < 0)
-                            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL,"Can't create property")
+                        if (H5P_do_prop_cb1(new_plist->props, tmp, tmp->copy) < 0)
+                            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't create property")
                     } /* end if */
 
                     /* Add property name to "seen" list, if we have other classes to work on */
-                    if(has_parent_class) {
-                        if(H5SL_insert(seen,tmp->name,tmp->name) < 0)
-                            HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into seen skip list")
+                    if (has_parent_class) {
+                        if (H5SL_insert(seen, tmp->name, tmp->name) < 0)
+                            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,
+                                        "can't insert property into seen skip list")
                         nseen++;
                     } /* end if */
 
@@ -855,37 +822,38 @@ H5P_copy_plist(const H5P_genplist_t *old_plist, hbool_t app_ref)
                 } /* end if */
 
                 /* Get the next property node in the skip list */
-                curr_node=H5SL_next(curr_node);
+                curr_node = H5SL_next(curr_node);
             } /* end while */
-        } /* end if */
+        }     /* end if */
 
         /* Go up to parent class */
-        tclass=tclass->parent;
+        tclass = tclass->parent;
     } /* end while */
 
     /* Increment the number of property lists derived from class */
-    if(H5P_access_class(new_plist->pclass, H5P_MOD_INC_LST) < 0)
+    if (H5P_access_class(new_plist->pclass, H5P_MOD_INC_LST) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Can't increment class ref count")
 
     /* Get an atom for the property list */
-    if((new_plist_id = H5I_register(H5I_GENPROP_LST, new_plist, app_ref)) < 0)
+    if ((new_plist_id = H5I_register(H5I_GENPROP_LST, new_plist, app_ref)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to atomize property list")
 
-    /* Save the property list ID in the property list struct, for use in the property class's 'close' callback */
-    new_plist->plist_id=new_plist_id;
+    /* Save the property list ID in the property list struct, for use in the property class's 'close' callback
+     */
+    new_plist->plist_id = new_plist_id;
 
     /* Call the class callback (if it exists) now that we have the property list ID
      * (up through chain of parent classes also)
      */
     tclass = new_plist->pclass;
-    while(NULL != tclass) {
-        if(NULL != tclass->copy_func) {
-            if((tclass->copy_func)(new_plist_id, old_plist->plist_id, old_plist->pclass->copy_data) < 0) {
+    while (NULL != tclass) {
+        if (NULL != tclass->copy_func) {
+            if ((tclass->copy_func)(new_plist_id, old_plist->plist_id, old_plist->pclass->copy_data) < 0) {
                 /* Delete ID, ignore return value */
                 H5I_remove(new_plist_id);
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL,"Can't initialize property")
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Can't initialize property")
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Go up to parent class */
         tclass = tclass->parent;
@@ -895,20 +863,19 @@ H5P_copy_plist(const H5P_genplist_t *old_plist, hbool_t app_ref)
     new_plist->class_init = TRUE;
 
     /* Set the return value */
-    ret_value=new_plist_id;
+    ret_value = new_plist_id;
 
 done:
     /* Release the list of 'seen' properties */
-    if(seen!=NULL)
+    if (seen != NULL)
         H5SL_close(seen);
 
-    if(ret_value<0 && new_plist)
+    if (ret_value < 0 && new_plist)
         H5P_close(new_plist);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_copy_plist() */
+} /* H5P_copy_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_dup_prop
@@ -931,8 +898,8 @@ done:
 static H5P_genprop_t *
 H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type)
 {
-    H5P_genprop_t *prop = NULL;      /* Pointer to new property copied */
-    H5P_genprop_t *ret_value;        /* Return value */
+    H5P_genprop_t *prop = NULL; /* Pointer to new property copied */
+    H5P_genprop_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -940,7 +907,7 @@ H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type)
     HDassert(type != H5P_PROP_WITHIN_UNKNOWN);
 
     /* Allocate the new property */
-    if(NULL == (prop = H5FL_MALLOC(H5P_genprop_t)))
+    if (NULL == (prop = H5FL_MALLOC(H5P_genprop_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy basic property information */
@@ -949,7 +916,7 @@ H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type)
     /* Check if we should duplicate the name or share it */
 
     /* Duplicating property for a class */
-    if(type == H5P_PROP_WITHIN_CLASS) {
+    if (type == H5P_PROP_WITHIN_CLASS) {
         HDassert(oprop->type == H5P_PROP_WITHIN_CLASS);
         HDassert(oprop->shared_name == FALSE);
 
@@ -961,9 +928,9 @@ H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type)
         /* Check if we are duplicating a property from a list or a class */
 
         /* Duplicating a property from a list */
-        if(oprop->type == H5P_PROP_WITHIN_LIST) {
+        if (oprop->type == H5P_PROP_WITHIN_LIST) {
             /* If the old property's name wasn't shared, we have to copy it here also */
-            if(!oprop->shared_name)
+            if (!oprop->shared_name)
                 prop->name = H5MM_xstrdup(oprop->name);
         } /* end if */
         /* Duplicating a property from a class */
@@ -977,12 +944,12 @@ H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type)
             /* Set the type */
             prop->type = type;
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
     /* Duplicate current value, if it exists */
-    if(oprop->value != NULL) {
+    if (oprop->value != NULL) {
         HDassert(prop->size > 0);
-        if(NULL == (prop->value = H5MM_malloc(prop->size)))
+        if (NULL == (prop->value = H5MM_malloc(prop->size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
         HDmemcpy(prop->value, oprop->value, prop->size);
     } /* end if */
@@ -992,20 +959,19 @@ H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type)
 
 done:
     /* Free any resources allocated */
-    if(ret_value == NULL) {
-        if(prop != NULL) {
-            if(prop->name != NULL)
+    if (ret_value == NULL) {
+        if (prop != NULL) {
+            if (prop->name != NULL)
                 H5MM_xfree(prop->name);
-            if(prop->value != NULL)
+            if (prop->value != NULL)
                 H5MM_xfree(prop->value);
             prop = H5FL_FREE(H5P_genprop_t, prop);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_dup_prop() */
+} /* H5P_dup_prop() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_create_prop
@@ -1038,15 +1004,13 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static H5P_genprop_t *
-H5P_create_prop(const char *name, size_t size, H5P_prop_within_t type,
-    const void *value,
-    H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
-    H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
-    H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
-    H5P_prp_close_func_t prp_close)
+H5P_create_prop(const char *name, size_t size, H5P_prop_within_t type, const void *value,
+                H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+                H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+                H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close)
 {
-    H5P_genprop_t *prop = NULL;        /* Pointer to new property copied */
-    H5P_genprop_t *ret_value;        /* Return value */
+    H5P_genprop_t *prop = NULL; /* Pointer to new property copied */
+    H5P_genprop_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1055,18 +1019,18 @@ H5P_create_prop(const char *name, size_t size, H5P_prop_within_t type,
     HDassert(type != H5P_PROP_WITHIN_UNKNOWN);
 
     /* Allocate the new property */
-    if(NULL == (prop = H5FL_MALLOC(H5P_genprop_t)))
+    if (NULL == (prop = H5FL_MALLOC(H5P_genprop_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set the property initial values */
-    prop->name = H5MM_xstrdup(name); /* Duplicate name */
+    prop->name        = H5MM_xstrdup(name); /* Duplicate name */
     prop->shared_name = FALSE;
-    prop->size = size;
-    prop->type = type;
+    prop->size        = size;
+    prop->type        = type;
 
     /* Duplicate value, if it exists */
-    if(value != NULL) {
-        if(NULL == (prop->value = H5MM_malloc (prop->size)))
+    if (value != NULL) {
+        if (NULL == (prop->value = H5MM_malloc(prop->size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
         HDmemcpy(prop->value, value, prop->size);
     } /* end if */
@@ -1075,12 +1039,12 @@ H5P_create_prop(const char *name, size_t size, H5P_prop_within_t type,
 
     /* Set the function pointers */
     prop->create = prp_create;
-    prop->set = prp_set;
-    prop->get = prp_get;
-    prop->del = prp_delete;
-    prop->copy = prp_copy;
+    prop->set    = prp_set;
+    prop->get    = prp_get;
+    prop->del    = prp_delete;
+    prop->copy   = prp_copy;
     /* Use custom comparison routine if available, otherwise default to memcmp() */
-    if(prp_cmp != NULL)
+    if (prp_cmp != NULL)
         prop->cmp = prp_cmp;
     else
         prop->cmp = &memcmp;
@@ -1091,20 +1055,19 @@ H5P_create_prop(const char *name, size_t size, H5P_prop_within_t type,
 
 done:
     /* Free any resources allocated */
-    if(ret_value == NULL) {
-        if(prop != NULL) {
-            if(prop->name != NULL)
+    if (ret_value == NULL) {
+        if (prop != NULL) {
+            if (prop->name != NULL)
                 H5MM_xfree(prop->name);
-            if(prop->value != NULL)
+            if (prop->value != NULL)
                 H5MM_xfree(prop->value);
             prop = H5FL_FREE(H5P_genprop_t, prop);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_create_prop() */
+} /* H5P_create_prop() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_add_prop
@@ -1126,7 +1089,7 @@ done:
 herr_t
 H5P_add_prop(H5SL_t *slist, H5P_genprop_t *prop)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1135,14 +1098,13 @@ H5P_add_prop(H5SL_t *slist, H5P_genprop_t *prop)
     HDassert(prop->type != H5P_PROP_WITHIN_UNKNOWN);
 
     /* Insert property into skip list */
-    if(H5SL_insert(slist, prop, prop->name) < 0)
+    if (H5SL_insert(slist, prop, prop->name) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into skip list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5P_add_prop() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P__find_prop_plist
@@ -1164,7 +1126,7 @@ done:
 H5P_genprop_t *
 H5P__find_prop_plist(const H5P_genplist_t *plist, const char *name)
 {
-    H5P_genprop_t *ret_value;   /* Property pointer return value */
+    H5P_genprop_t *ret_value; /* Property pointer return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1172,19 +1134,19 @@ H5P__find_prop_plist(const H5P_genplist_t *plist, const char *name)
     HDassert(name);
 
     /* Check if the property has been deleted from list */
-    if(H5SL_search(plist->del,name) != NULL) {
+    if (H5SL_search(plist->del, name) != NULL) {
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "can't find property in skip list")
     } /* end if */
     else {
         /* Get the property data from the skip list */
-        if(NULL == (ret_value = (H5P_genprop_t *)H5SL_search(plist->props, name))) {
-            H5P_genclass_t *tclass;     /* Temporary class pointer */
+        if (NULL == (ret_value = (H5P_genprop_t *)H5SL_search(plist->props, name))) {
+            H5P_genclass_t *tclass; /* Temporary class pointer */
 
             /* Couldn't find property in list itself, start searching through class info */
             tclass = plist->pclass;
-            while(tclass != NULL) {
+            while (tclass != NULL) {
                 /* Find the property in the class */
-                if(NULL != (ret_value = (H5P_genprop_t *)H5SL_search(tclass->props, name)))
+                if (NULL != (ret_value = (H5P_genprop_t *)H5SL_search(tclass->props, name)))
                     /* Got pointer to property - leave now */
                     break;
 
@@ -1193,16 +1155,15 @@ H5P__find_prop_plist(const H5P_genplist_t *plist, const char *name)
             } /* end while */
 
             /* Check if we haven't found the property */
-            if(ret_value == NULL)
-                HGOTO_ERROR(H5E_PLIST,H5E_NOTFOUND,NULL,"can't find property in skip list")
+            if (ret_value == NULL)
+                HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "can't find property in skip list")
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P__find_prop_plist() */
+} /* H5P__find_prop_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_find_prop_pclass
@@ -1224,7 +1185,7 @@ done:
 static H5P_genprop_t *
 H5P_find_prop_pclass(H5P_genclass_t *pclass, const char *name)
 {
-    H5P_genprop_t *ret_value;   /* Property pointer return value */
+    H5P_genprop_t *ret_value; /* Property pointer return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1232,14 +1193,13 @@ H5P_find_prop_pclass(H5P_genclass_t *pclass, const char *name)
     HDassert(name);
 
     /* Get the property from the skip list */
-    if(NULL == (ret_value = (H5P_genprop_t *)H5SL_search(pclass->props, name)))
-        HGOTO_ERROR(H5E_PLIST,H5E_NOTFOUND,NULL,"can't find property in skip list")
+    if (NULL == (ret_value = (H5P_genprop_t *)H5SL_search(pclass->props, name)))
+        HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "can't find property in skip list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_find_prop_pclass() */
+} /* H5P_find_prop_pclass() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_free_prop
@@ -1266,19 +1226,18 @@ H5P_free_prop(H5P_genprop_t *prop)
     HDassert(prop);
 
     /* Release the property value if it exists */
-    if(prop->value)
+    if (prop->value)
         H5MM_xfree(prop->value);
 
     /* Only free the name if we own it */
-    if(!prop->shared_name)
+    if (!prop->shared_name)
         H5MM_xfree(prop->name);
 
     prop = H5FL_FREE(H5P_genprop_t, prop);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5P_free_prop() */
+} /* H5P_free_prop() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_free_prop_cb
@@ -1302,24 +1261,23 @@ H5P_free_prop(H5P_genprop_t *prop)
 static herr_t
 H5P_free_prop_cb(void *item, void H5_ATTR_UNUSED *key, void *op_data)
 {
-    H5P_genprop_t *tprop=(H5P_genprop_t *)item; /* Temporary pointer to property */
-    hbool_t make_cb = *(hbool_t *)op_data;      /* Whether to make property 'close' callback */
+    H5P_genprop_t *tprop   = (H5P_genprop_t *)item; /* Temporary pointer to property */
+    hbool_t        make_cb = *(hbool_t *)op_data;   /* Whether to make property 'close' callback */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(tprop);
 
     /* Call the close callback and ignore the return value, there's nothing we can do about it */
-    if(make_cb && tprop->close != NULL)
+    if (make_cb && tprop->close != NULL)
         (tprop->close)(tprop->name, tprop->size, tprop->value);
 
     /* Free the property, ignoring return value, nothing we can do */
     H5P_free_prop(tprop);
 
     FUNC_LEAVE_NOAPI(0)
-}   /* H5P_free_prop_cb() */
+} /* H5P_free_prop_cb() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_free_del_name_cb
@@ -1342,7 +1300,7 @@ H5P_free_prop_cb(void *item, void H5_ATTR_UNUSED *key, void *op_data)
 static herr_t
 H5P_free_del_name_cb(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *op_data)
 {
-    char *del_name=(char *)item;       /* Temporary pointer to deleted name */
+    char *del_name = (char *)item; /* Temporary pointer to deleted name */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1352,9 +1310,8 @@ H5P_free_del_name_cb(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *
     H5MM_xfree(del_name);
 
     FUNC_LEAVE_NOAPI(0)
-}   /* H5P_free_del_name_cb() */
+} /* H5P_free_del_name_cb() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_access_class
@@ -1385,35 +1342,35 @@ H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
     HDassert(pclass);
     HDassert(mod > H5P_MOD_ERR && mod < H5P_MOD_MAX);
 
-    switch(mod) {
-        case H5P_MOD_INC_CLS:        /* Increment the dependant class count*/
+    switch (mod) {
+        case H5P_MOD_INC_CLS: /* Increment the dependant class count*/
             pclass->classes++;
             break;
 
-        case H5P_MOD_DEC_CLS:        /* Decrement the dependant class count*/
+        case H5P_MOD_DEC_CLS: /* Decrement the dependant class count*/
             pclass->classes--;
             break;
 
-        case H5P_MOD_INC_LST:        /* Increment the dependant list count*/
+        case H5P_MOD_INC_LST: /* Increment the dependant list count*/
             pclass->plists++;
             break;
 
-        case H5P_MOD_DEC_LST:        /* Decrement the dependant list count*/
+        case H5P_MOD_DEC_LST: /* Decrement the dependant list count*/
             pclass->plists--;
             break;
 
-        case H5P_MOD_INC_REF:        /* Increment the ID reference count*/
+        case H5P_MOD_INC_REF: /* Increment the ID reference count*/
             /* Reset the deleted flag if incrementing the reference count */
-            if(pclass->deleted)
+            if (pclass->deleted)
                 pclass->deleted = FALSE;
             pclass->ref_count++;
             break;
 
-        case H5P_MOD_DEC_REF:        /* Decrement the ID reference count*/
+        case H5P_MOD_DEC_REF: /* Decrement the ID reference count*/
             pclass->ref_count--;
 
             /* Mark the class object as deleted if reference count drops to zero */
-            if(pclass->ref_count == 0)
+            if (pclass->ref_count == 0)
                 pclass->deleted = TRUE;
             break;
 
@@ -1424,14 +1381,14 @@ H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
     } /* end switch */
 
     /* Check if we can release the class information now */
-    if(pclass->deleted && pclass->plists == 0 && pclass->classes == 0) {
-        H5P_genclass_t *par_class = pclass->parent;       /* Pointer to class's parent */
+    if (pclass->deleted && pclass->plists == 0 && pclass->classes == 0) {
+        H5P_genclass_t *par_class = pclass->parent; /* Pointer to class's parent */
 
         HDassert(pclass->name);
         H5MM_xfree(pclass->name);
 
         /* Free the class properties without making callbacks */
-        if(pclass->props) {
+        if (pclass->props) {
             hbool_t make_cb = FALSE;
 
             H5SL_destroy(pclass->props, H5P_free_prop_cb, &make_cb);
@@ -1440,14 +1397,13 @@ H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
         pclass = H5FL_FREE(H5P_genclass_t, pclass);
 
         /* Reduce the number of dependent classes on parent class also */
-        if(par_class != NULL)
+        if (par_class != NULL)
             H5P_access_class(par_class, H5P_MOD_DEC_CLS);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5P_access_class() */
+} /* H5P_access_class() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_open_class_path_cb
@@ -1472,9 +1428,9 @@ H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
 static int
 H5P_open_class_path_cb(void *_obj, hid_t H5_ATTR_UNUSED id, void *_key)
 {
-    H5P_genclass_t *obj = (H5P_genclass_t *)_obj; /* Pointer to the class for this ID */
-    H5P_check_class_t *key = (H5P_check_class_t *)_key; /* Pointer to key information for comparison */
-    int ret_value = 0;    /* Return value */
+    H5P_genclass_t *   obj       = (H5P_genclass_t *)_obj;    /* Pointer to the class for this ID */
+    H5P_check_class_t *key       = (H5P_check_class_t *)_key; /* Pointer to key information for comparison */
+    int                ret_value = 0;                         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1483,18 +1439,17 @@ H5P_open_class_path_cb(void *_obj, hid_t H5_ATTR_UNUSED id, void *_key)
     HDassert(key);
 
     /* Check if the class object has the same parent as the new class */
-    if(obj->parent == key->parent) {
+    if (obj->parent == key->parent) {
         /* Check if they have the same name */
-        if(HDstrcmp(obj->name, key->name) == 0) {
+        if (HDstrcmp(obj->name, key->name) == 0) {
             key->new_class = obj;
-            ret_value = 1;        /* Indicate a match */
-        } /* end if */
-    } /* end if */
+            ret_value      = 1; /* Indicate a match */
+        }                       /* end if */
+    }                           /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_open_class_path_cb() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_create_class
@@ -1530,11 +1485,10 @@ H5P_open_class_path_cb(void *_obj, hid_t H5_ATTR_UNUSED id, void *_key)
 --------------------------------------------------------------------------*/
 H5P_genclass_t *
 H5P_create_class(H5P_genclass_t *par_class, const char *name, H5P_plist_type_t type,
-    H5P_cls_create_func_t cls_create, void *create_data,
-    H5P_cls_copy_func_t cls_copy, void *copy_data,
-    H5P_cls_close_func_t cls_close, void *close_data)
+                 H5P_cls_create_func_t cls_create, void *create_data, H5P_cls_copy_func_t cls_copy,
+                 void *copy_data, H5P_cls_close_func_t cls_close, void *close_data)
 {
-    H5P_genclass_t *pclass=NULL;   /* Property list class created */
+    H5P_genclass_t *pclass = NULL; /* Property list class created */
     H5P_genclass_t *ret_value;     /* return value */
 
     FUNC_ENTER_NOAPI(NULL)
@@ -1542,40 +1496,40 @@ H5P_create_class(H5P_genclass_t *par_class, const char *name, H5P_plist_type_t t
     HDassert(name);
     /* Allow internal classes to break some rules */
     /* (This allows the root of the tree to be created with this routine -QAK) */
-    if(type == H5P_TYPE_USER)
+    if (type == H5P_TYPE_USER)
         HDassert(par_class);
 
     /* Allocate room for the class */
-    if(NULL == (pclass = H5FL_CALLOC(H5P_genclass_t)))
+    if (NULL == (pclass = H5FL_CALLOC(H5P_genclass_t)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, NULL, "propery list class allocation failed")
 
     /* Set class state */
     pclass->parent = par_class;
-    if(NULL == (pclass->name = H5MM_xstrdup(name)))
+    if (NULL == (pclass->name = H5MM_xstrdup(name)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, NULL, "propery list class name allocation failed")
-    pclass->type = type;
-    pclass->nprops = 0;     /* Classes are created without properties initially */
-    pclass->plists = 0;     /* No properties lists of this class yet */
-    pclass->classes = 0;    /* No classes derived from this class yet */
-    pclass->ref_count = 1;  /* This is the first reference to the new class */
-    pclass->deleted = FALSE;    /* Not deleted yet... :-) */
-    pclass->revision = H5P_GET_NEXT_REV;        /* Get a revision number for the class */
+    pclass->type      = type;
+    pclass->nprops    = 0;                /* Classes are created without properties initially */
+    pclass->plists    = 0;                /* No properties lists of this class yet */
+    pclass->classes   = 0;                /* No classes derived from this class yet */
+    pclass->ref_count = 1;                /* This is the first reference to the new class */
+    pclass->deleted   = FALSE;            /* Not deleted yet... :-) */
+    pclass->revision  = H5P_GET_NEXT_REV; /* Get a revision number for the class */
 
     /* Create the skip list for properties */
-    if(NULL == (pclass->props = H5SL_create(H5SL_TYPE_STR, NULL)))
+    if (NULL == (pclass->props = H5SL_create(H5SL_TYPE_STR, NULL)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, NULL, "can't create skip list for properties")
 
     /* Set callback functions and pass-along data */
     pclass->create_func = cls_create;
     pclass->create_data = create_data;
-    pclass->copy_func = cls_copy;
-    pclass->copy_data = copy_data;
-    pclass->close_func = cls_close;
-    pclass->close_data = close_data;
+    pclass->copy_func   = cls_copy;
+    pclass->copy_data   = copy_data;
+    pclass->close_func  = cls_close;
+    pclass->close_data  = close_data;
 
     /* Increment parent class's derived class value */
-    if(par_class != NULL) {
-        if(H5P_access_class(par_class, H5P_MOD_INC_CLS) < 0)
+    if (par_class != NULL) {
+        if (H5P_access_class(par_class, H5P_MOD_INC_CLS) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, NULL, "Can't increment parent class ref count")
     } /* end if */
 
@@ -1584,11 +1538,11 @@ H5P_create_class(H5P_genclass_t *par_class, const char *name, H5P_plist_type_t t
 
 done:
     /* Free any resources allocated */
-    if(ret_value == NULL)
-        if(pclass) {
-            if(pclass->name)
+    if (ret_value == NULL)
+        if (pclass) {
+            if (pclass->name)
                 H5MM_xfree(pclass->name);
-            if(pclass->props) {
+            if (pclass->props) {
                 hbool_t make_cb = FALSE;
 
                 H5SL_destroy(pclass->props, H5P_free_prop_cb, &make_cb);
@@ -1597,9 +1551,8 @@ done:
         } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_create_class() */
+} /* H5P_create_class() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_create
@@ -1628,11 +1581,11 @@ done:
 static H5P_genplist_t *
 H5P_create(H5P_genclass_t *pclass)
 {
-    H5P_genclass_t *tclass;         /* Temporary class pointer */
-    H5P_genplist_t *plist=NULL;     /* New property list created */
-    H5P_genprop_t *tmp;             /* Temporary pointer to parent class properties */
-    H5SL_t *seen=NULL;              /* Skip list to hold names of properties already seen */
-    H5P_genplist_t *ret_value;      /* Return value */
+    H5P_genclass_t *tclass;       /* Temporary class pointer */
+    H5P_genplist_t *plist = NULL; /* New property list created */
+    H5P_genprop_t * tmp;          /* Temporary pointer to parent class properties */
+    H5SL_t *        seen = NULL;  /* Skip list to hold names of properties already seen */
+    H5P_genplist_t *ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1643,106 +1596,106 @@ H5P_create(H5P_genclass_t *pclass)
      */
 
     /* Allocate room for the property list */
-    if(NULL==(plist = H5FL_CALLOC(H5P_genplist_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,"memory allocation failed")
+    if (NULL == (plist = H5FL_CALLOC(H5P_genplist_t)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set class state */
-    plist->pclass = pclass;
-    plist->nprops = 0;      /* Initially the plist has the same number of properties as the class */
-    plist->class_init = FALSE;  /* Initially, wait until the class callback finishes to set */
+    plist->pclass     = pclass;
+    plist->nprops     = 0;     /* Initially the plist has the same number of properties as the class */
+    plist->class_init = FALSE; /* Initially, wait until the class callback finishes to set */
 
     /* Create the skip list for changed properties */
-    if((plist->props = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,NULL,"can't create skip list for changed properties")
+    if ((plist->props = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, NULL, "can't create skip list for changed properties")
 
     /* Create the skip list for deleted properties */
-    if((plist->del = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,NULL,"can't create skip list for deleted properties")
+    if ((plist->del = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, NULL, "can't create skip list for deleted properties")
 
     /* Create the skip list to hold names of properties already seen
      * (This prevents a property in the class hierarchy from having it's
      * 'create' callback called, if a property in the class hierarchy has
      * already been seen)
      */
-    if((seen = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,NULL,"can't create skip list for seen properties")
+    if ((seen = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, NULL, "can't create skip list for seen properties")
 
     /*
      * Check if we should copy class properties (up through list of parent classes also),
      * initialize each with default value & make property 'create' callback.
      */
-    tclass=pclass;
-    while(tclass!=NULL) {
-        if(tclass->nprops>0) {
-            H5SL_node_t *curr_node;   /* Current node in skip list */
+    tclass = pclass;
+    while (tclass != NULL) {
+        if (tclass->nprops > 0) {
+            H5SL_node_t *curr_node; /* Current node in skip list */
 
             /* Walk through the properties in the old class */
-            curr_node=H5SL_first(tclass->props);
-            while(curr_node!=NULL) {
+            curr_node = H5SL_first(tclass->props);
+            while (curr_node != NULL) {
                 /* Get pointer to property from node */
                 tmp = (H5P_genprop_t *)H5SL_item(curr_node);
 
                 /* Only "create" properties we haven't seen before */
-                if(H5SL_search(seen,tmp->name) == NULL) {
+                if (H5SL_search(seen, tmp->name) == NULL) {
                     /* Call property creation callback, if it exists */
-                    if(tmp->create) {
+                    if (tmp->create) {
                         /* Call the callback & insert changed value into skip list (if necessary) */
-                        if(H5P_do_prop_cb1(plist->props,tmp,tmp->create) < 0)
-                            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, NULL,"Can't create property")
+                        if (H5P_do_prop_cb1(plist->props, tmp, tmp->create) < 0)
+                            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, NULL, "Can't create property")
                     } /* end if */
 
                     /* Add property name to "seen" list */
-                    if(H5SL_insert(seen,tmp->name,tmp->name) < 0)
-                        HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,NULL,"can't insert property into seen skip list")
+                    if (H5SL_insert(seen, tmp->name, tmp->name) < 0)
+                        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, NULL,
+                                    "can't insert property into seen skip list")
 
                     /* Increment the number of properties in list */
                     plist->nprops++;
                 } /* end if */
 
                 /* Get the next property node in the skip list */
-                curr_node=H5SL_next(curr_node);
+                curr_node = H5SL_next(curr_node);
             } /* end while */
-        } /* end if */
+        }     /* end if */
 
         /* Go up to parent class */
-        tclass=tclass->parent;
+        tclass = tclass->parent;
     } /* end while */
 
     /* Increment the number of property lists derived from class */
-    if(H5P_access_class(plist->pclass,H5P_MOD_INC_LST) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, NULL,"Can't increment class ref count")
+    if (H5P_access_class(plist->pclass, H5P_MOD_INC_LST) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, NULL, "Can't increment class ref count")
 
     /* Set return value */
-    ret_value=plist;
+    ret_value = plist;
 
 done:
     /* Release the skip list of 'seen' properties */
-    if(seen!=NULL)
+    if (seen != NULL)
         H5SL_close(seen);
 
     /* Release resources allocated on failure */
-    if(ret_value==NULL) {
-        if(plist!=NULL) {
+    if (ret_value == NULL) {
+        if (plist != NULL) {
             /* Close & free any changed properties */
-            if(plist->props) {
-                unsigned make_cb=1;
+            if (plist->props) {
+                unsigned make_cb = 1;
 
-                H5SL_destroy(plist->props,H5P_free_prop_cb,&make_cb);
+                H5SL_destroy(plist->props, H5P_free_prop_cb, &make_cb);
             } /* end if */
 
             /* Close the deleted property skip list */
-            if(plist->del)
+            if (plist->del)
                 H5SL_close(plist->del);
 
             /* Release the property list itself */
             plist = H5FL_FREE(H5P_genplist_t, plist);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_create() */
+} /* H5P_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_create_id
@@ -1768,38 +1721,39 @@ done:
 hid_t
 H5P_create_id(H5P_genclass_t *pclass, hbool_t app_ref)
 {
-    H5P_genclass_t *tclass;         /* Temporary class pointer */
-    H5P_genplist_t *plist = NULL;   /* Property list created */
-    hid_t plist_id = FAIL;      /* Property list ID */
-    hid_t ret_value;            /* return value */
+    H5P_genclass_t *tclass;          /* Temporary class pointer */
+    H5P_genplist_t *plist    = NULL; /* Property list created */
+    hid_t           plist_id = FAIL; /* Property list ID */
+    hid_t           ret_value;       /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(pclass);
 
     /* Create the new property list */
-    if((plist=H5P_create(pclass)) == NULL)
+    if ((plist = H5P_create(pclass)) == NULL)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "unable to create property list")
 
     /* Get an atom for the property list */
-    if((plist_id = H5I_register(H5I_GENPROP_LST, plist, app_ref)) < 0)
+    if ((plist_id = H5I_register(H5I_GENPROP_LST, plist, app_ref)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to atomize property list")
 
-    /* Save the property list ID in the property list struct, for use in the property class's 'close' callback */
-    plist->plist_id=plist_id;
+    /* Save the property list ID in the property list struct, for use in the property class's 'close' callback
+     */
+    plist->plist_id = plist_id;
 
     /* Call the class callback (if it exists) now that we have the property list ID
      * (up through chain of parent classes also)
      */
     tclass = plist->pclass;
-    while(NULL != tclass) {
-        if(NULL != tclass->create_func) {
-            if((tclass->create_func)(plist_id, tclass->create_data) < 0) {
+    while (NULL != tclass) {
+        if (NULL != tclass->create_func) {
+            if ((tclass->create_func)(plist_id, tclass->create_data) < 0) {
                 /* Delete ID, ignore return value */
                 H5I_remove(plist_id);
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL,"Can't initialize property")
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Can't initialize property")
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Go up to parent class */
         tclass = tclass->parent;
@@ -1809,16 +1763,15 @@ H5P_create_id(H5P_genclass_t *pclass, hbool_t app_ref)
     plist->class_init = TRUE;
 
     /* Set the return value */
-    ret_value=plist_id;
+    ret_value = plist_id;
 
 done:
-    if(ret_value<0 && plist)
+    if (ret_value < 0 && plist)
         H5P_close(plist);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_create_id() */
+} /* H5P_create_id() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_register_real
@@ -1974,14 +1927,13 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5P_register_real(H5P_genclass_t *pclass, const char *name, size_t size,
-    const void *def_value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
-    H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
-    H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
-    H5P_prp_close_func_t prp_close)
+H5P_register_real(H5P_genclass_t *pclass, const char *name, size_t size, const void *def_value,
+                  H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+                  H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+                  H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close)
 {
-    H5P_genprop_t *new_prop = NULL;     /* Temporary property pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5P_genprop_t *new_prop  = NULL;    /* Temporary property pointer */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1992,16 +1944,17 @@ H5P_register_real(H5P_genclass_t *pclass, const char *name, size_t size,
     HDassert((size > 0 && def_value != NULL) || (size == 0));
 
     /* Check for duplicate named properties */
-    if(NULL != H5SL_search(pclass->props, name))
+    if (NULL != H5SL_search(pclass->props, name))
         HGOTO_ERROR(H5E_PLIST, H5E_EXISTS, FAIL, "property already exists")
 
     /* Create property object from parameters */
-    if(NULL == (new_prop = H5P_create_prop(name, size, H5P_PROP_WITHIN_CLASS, def_value, prp_create, prp_set, prp_get, prp_delete, prp_copy, prp_cmp, prp_close)))
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL,"Can't create property")
+    if (NULL == (new_prop = H5P_create_prop(name, size, H5P_PROP_WITHIN_CLASS, def_value, prp_create, prp_set,
+                                            prp_get, prp_delete, prp_copy, prp_cmp, prp_close)))
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "Can't create property")
 
     /* Insert property into property list class */
-    if(H5P_add_prop(pclass->props, new_prop) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert property into class")
+    if (H5P_add_prop(pclass->props, new_prop) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into class")
 
     /* Increment property count for class */
     pclass->nprops++;
@@ -2010,14 +1963,13 @@ H5P_register_real(H5P_genclass_t *pclass, const char *name, size_t size,
     pclass->revision = H5P_GET_NEXT_REV;
 
 done:
-    if(ret_value < 0)
-        if(new_prop && H5P_free_prop(new_prop) < 0)
+    if (ret_value < 0)
+        if (new_prop && H5P_free_prop(new_prop) < 0)
             HDONE_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close property")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_register_real() */
+} /* H5P_register_real() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_register
@@ -2173,15 +2125,14 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5P_register(H5P_genclass_t **ppclass, const char *name, size_t size,
-    const void *def_value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
-    H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
-    H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
-    H5P_prp_close_func_t prp_close)
+H5P_register(H5P_genclass_t **ppclass, const char *name, size_t size, const void *def_value,
+             H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+             H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
+             H5P_prp_close_func_t prp_close)
 {
-    H5P_genclass_t *pclass = *ppclass;  /* Pointer to class to modify */
-    H5P_genclass_t *new_class = NULL;   /* New class pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5P_genclass_t *pclass    = *ppclass; /* Pointer to class to modify */
+    H5P_genclass_t *new_class = NULL;     /* New class pointer */
+    herr_t          ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2192,29 +2143,29 @@ H5P_register(H5P_genclass_t **ppclass, const char *name, size_t size,
     /* Check if class needs to be split because property lists or classes have
      *  been created since the last modification was made to the class.
      */
-    if(pclass->plists > 0 || pclass->classes > 0) {
-        if(NULL == (new_class = H5P_create_class(pclass->parent, pclass->name,
-                pclass->type, pclass->create_func, pclass->create_data,
-                pclass->copy_func, pclass->copy_data,
-                pclass->close_func, pclass->close_data)))
+    if (pclass->plists > 0 || pclass->classes > 0) {
+        if (NULL == (new_class = H5P_create_class(pclass->parent, pclass->name, pclass->type,
+                                                  pclass->create_func, pclass->create_data, pclass->copy_func,
+                                                  pclass->copy_data, pclass->close_func, pclass->close_data)))
             HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy class")
 
         /* Walk through the skip list of the old class and copy properties */
-        if(pclass->nprops > 0) {
-            H5SL_node_t *curr_node;   /* Current node in skip list */
+        if (pclass->nprops > 0) {
+            H5SL_node_t *curr_node; /* Current node in skip list */
 
             /* Walk through the properties in the old class */
             curr_node = H5SL_first(pclass->props);
-            while(curr_node != NULL) {
-                H5P_genprop_t *pcopy;               /* Property copy */
+            while (curr_node != NULL) {
+                H5P_genprop_t *pcopy; /* Property copy */
 
                 /* Make a copy of the class's property */
-                if(NULL == (pcopy = H5P_dup_prop((H5P_genprop_t *)H5SL_item(curr_node), H5P_PROP_WITHIN_CLASS)))
+                if (NULL ==
+                    (pcopy = H5P_dup_prop((H5P_genprop_t *)H5SL_item(curr_node), H5P_PROP_WITHIN_CLASS)))
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
 
                 /* Insert the initialized property into the property class */
-                if(H5P_add_prop(new_class->props, pcopy) < 0)
-                    HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert property into class")
+                if (H5P_add_prop(new_class->props, pcopy) < 0)
+                    HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into class")
 
                 /* Increment property count for class */
                 new_class->nprops++;
@@ -2222,29 +2173,29 @@ H5P_register(H5P_genclass_t **ppclass, const char *name, size_t size,
                 /* Get the next property node in the skip list */
                 curr_node = H5SL_next(curr_node);
             } /* end while */
-        } /* end if */
+        }     /* end if */
 
         /* Use the new class instead of the old one */
         pclass = new_class;
     } /* end if */
 
     /* Really register the property in the class */
-    if(H5P_register_real(pclass, name, size, def_value, prp_create, prp_set, prp_get, prp_delete, prp_copy, prp_cmp, prp_close) < 0)
+    if (H5P_register_real(pclass, name, size, def_value, prp_create, prp_set, prp_get, prp_delete, prp_copy,
+                          prp_cmp, prp_close) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "can't register property")
 
     /* Update pointer to pointer to class, if a new one was generated */
-    if(new_class)
+    if (new_class)
         *ppclass = pclass;
 
 done:
-    if(ret_value < 0)
-        if(new_class && H5P_close_class(new_class) < 0)
+    if (ret_value < 0)
+        if (new_class && H5P_close_class(new_class) < 0)
             HDONE_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close new property class")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_register() */
+} /* H5P_register() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_insert
@@ -2385,13 +2336,12 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
-    void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-    H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
-    H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close)
+H5P_insert(H5P_genplist_t *plist, const char *name, size_t size, void *value, H5P_prp_set_func_t prp_set,
+           H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+           H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close)
 {
-    H5P_genprop_t *new_prop = NULL;     /* Temporary property pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genprop_t *new_prop  = NULL;    /* Temporary property pointer */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2400,59 +2350,59 @@ H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
     HDassert((size > 0 && value != NULL) || (size == 0));
 
     /* Check for duplicate named properties */
-    if(NULL != H5SL_search(plist->props, name))
+    if (NULL != H5SL_search(plist->props, name))
         HGOTO_ERROR(H5E_PLIST, H5E_EXISTS, FAIL, "property already exists")
 
     /* Check if the property has been deleted */
-    if(NULL != H5SL_search(plist->del, name)) {
+    if (NULL != H5SL_search(plist->del, name)) {
         char *temp_name = NULL;
 
         /* Remove the property name from the deleted property skip list */
-        if(NULL == (temp_name = (char *)H5SL_remove(plist->del, name)))
-            HGOTO_ERROR(H5E_PLIST,H5E_CANTDELETE,FAIL,"can't remove property from deleted skip list")
+        if (NULL == (temp_name = (char *)H5SL_remove(plist->del, name)))
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "can't remove property from deleted skip list")
 
         /* free the name of the removed property */
         H5MM_xfree(temp_name);
     } /* end if */
     else {
-        H5P_genclass_t *tclass;     /* Temporary class pointer */
+        H5P_genclass_t *tclass; /* Temporary class pointer */
 
         /* Check if the property is already in the class hierarchy */
         tclass = plist->pclass;
-        while(tclass) {
-            if(tclass->nprops > 0) {
+        while (tclass) {
+            if (tclass->nprops > 0) {
                 /* Find the property in the class */
-                if(NULL != H5SL_search(tclass->props, name))
+                if (NULL != H5SL_search(tclass->props, name))
                     HGOTO_ERROR(H5E_PLIST, H5E_EXISTS, FAIL, "property already exists")
             } /* end if */
 
             /* Go up to parent class */
             tclass = tclass->parent;
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
     /* Ok to add to property list */
 
     /* Create property object from parameters */
-    if(NULL == (new_prop = H5P_create_prop(name, size, H5P_PROP_WITHIN_LIST, value, NULL, prp_set, prp_get, prp_delete, prp_copy, prp_cmp, prp_close)))
+    if (NULL == (new_prop = H5P_create_prop(name, size, H5P_PROP_WITHIN_LIST, value, NULL, prp_set, prp_get,
+                                            prp_delete, prp_copy, prp_cmp, prp_close)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "Can't create property")
 
     /* Insert property into property list class */
-    if(H5P_add_prop(plist->props, new_prop) < 0)
+    if (H5P_add_prop(plist->props, new_prop) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into class")
 
     /* Increment property count for class */
     plist->nprops++;
 
 done:
-    if(ret_value < 0)
-        if(new_prop && H5P_free_prop(new_prop) < 0)
+    if (ret_value < 0)
+        if (new_prop && H5P_free_prop(new_prop) < 0)
             HDONE_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close property")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5P_insert() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_set
@@ -2487,9 +2437,9 @@ done:
 herr_t
 H5P_set(H5P_genplist_t *plist, const char *name, const void *value)
 {
-    H5P_genclass_t *tclass;     /* Temporary class pointer */
-    H5P_genprop_t *prop;        /* Temporary property pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5P_genclass_t *tclass;              /* Temporary class pointer */
+    H5P_genprop_t * prop;                /* Temporary property pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2498,82 +2448,85 @@ H5P_set(H5P_genplist_t *plist, const char *name, const void *value)
     HDassert(value);
 
     /* Check if the property has been deleted */
-    if(H5SL_search(plist->del,name)!=NULL)
+    if (H5SL_search(plist->del, name) != NULL)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist")
 
     /* Find property in changed list */
-    if(NULL != (prop = (H5P_genprop_t *)H5SL_search(plist->props, name))) {
+    if (NULL != (prop = (H5P_genprop_t *)H5SL_search(plist->props, name))) {
         /* Check for property size >0 */
-        if(prop->size==0)
+        if (prop->size == 0)
             HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "property has zero size")
 
         /* Make a copy of the value and pass to 'set' callback */
-        if(prop->set!=NULL) {
-            void *tmp_value;            /* Temporary value for property */
+        if (prop->set != NULL) {
+            void *tmp_value; /* Temporary value for property */
 
             /* Make a copy of the current value, in case the callback fails */
-            if(NULL==(tmp_value=H5MM_malloc(prop->size)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed temporary property value")
-            HDmemcpy(tmp_value,value,prop->size);
+            if (NULL == (tmp_value = H5MM_malloc(prop->size)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                            "memory allocation failed temporary property value")
+            HDmemcpy(tmp_value, value, prop->size);
 
             /* Call user's callback */
-            if((*(prop->set))(plist->plist_id,name,prop->size,tmp_value) < 0) {
+            if ((*(prop->set))(plist->plist_id, name, prop->size, tmp_value) < 0) {
                 H5MM_xfree(tmp_value);
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set property value")
             } /* end if */
 
             /* Copy new [possibly unchanged] value into property value */
-            HDmemcpy(prop->value,tmp_value,prop->size);
+            HDmemcpy(prop->value, tmp_value, prop->size);
 
             /* Free the temporary value buffer */
             H5MM_xfree(tmp_value);
         } /* end if */
         /* No 'set' callback, just copy value */
         else
-            HDmemcpy(prop->value,value,prop->size);
+            HDmemcpy(prop->value, value, prop->size);
     } /* end if */
     else {
         /*
          * Check if we should set class properties (up through list of parent classes also),
          * & make property 'set' callback.
          */
-        tclass=plist->pclass;
-        while(tclass!=NULL) {
-            if(tclass->nprops>0) {
+        tclass = plist->pclass;
+        while (tclass != NULL) {
+            if (tclass->nprops > 0) {
                 /* Find the property in the class */
-                if((prop = (H5P_genprop_t *)H5SL_search(tclass->props,name))!=NULL) {
-                    H5P_genprop_t *pcopy;  /* Copy of property to insert into skip list */
+                if ((prop = (H5P_genprop_t *)H5SL_search(tclass->props, name)) != NULL) {
+                    H5P_genprop_t *pcopy; /* Copy of property to insert into skip list */
 
                     /* Check for property size >0 */
-                    if(prop->size==0)
-                        HGOTO_ERROR(H5E_PLIST,H5E_BADVALUE,FAIL,"property has zero size")
+                    if (prop->size == 0)
+                        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "property has zero size")
 
                     /* Make a copy of the value and pass to 'set' callback */
-                    if(prop->set!=NULL) {
-                        void *tmp_value;            /* Temporary value for property */
+                    if (prop->set != NULL) {
+                        void *tmp_value; /* Temporary value for property */
 
                         /* Make a copy of the current value, in case the callback fails */
-                        if(NULL==(tmp_value=H5MM_malloc(prop->size)))
-                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed temporary property value")
-                        HDmemcpy(tmp_value,value,prop->size);
+                        if (NULL == (tmp_value = H5MM_malloc(prop->size)))
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                        "memory allocation failed temporary property value")
+                        HDmemcpy(tmp_value, value, prop->size);
 
                         /* Call user's callback */
-                        if((*(prop->set))(plist->plist_id,name,prop->size,tmp_value) < 0) {
+                        if ((*(prop->set))(plist->plist_id, name, prop->size, tmp_value) < 0) {
                             H5MM_xfree(tmp_value);
                             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set property value")
                         } /* end if */
 
-                        if((prop->cmp)(tmp_value,prop->value,prop->size)) {
+                        if ((prop->cmp)(tmp_value, prop->value, prop->size)) {
                             /* Make a copy of the class's property */
-                            if((pcopy=H5P_dup_prop(prop,H5P_PROP_WITHIN_LIST)) == NULL)
-                                HGOTO_ERROR(H5E_PLIST,H5E_CANTCOPY,FAIL,"Can't copy property")
+                            if ((pcopy = H5P_dup_prop(prop, H5P_PROP_WITHIN_LIST)) == NULL)
+                                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
 
                             /* Copy new value into property value */
-                            HDmemcpy(pcopy->value,tmp_value,pcopy->size);
+                            HDmemcpy(pcopy->value, tmp_value, pcopy->size);
 
                             /* Insert the changed property into the property list */
-                            if(H5P_add_prop(plist->props,pcopy) < 0)
-                                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert changed property into skip list")
+                            if (H5P_add_prop(plist->props, pcopy) < 0)
+                                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,
+                                            "Can't insert changed property into skip list")
                         } /* end if */
 
                         /* Free the temporary value buffer */
@@ -2581,39 +2534,39 @@ H5P_set(H5P_genplist_t *plist, const char *name, const void *value)
                     } /* end if */
                     /* No 'set' callback, just copy value */
                     else {
-                        if((prop->cmp)(value,prop->value,prop->size)) {
+                        if ((prop->cmp)(value, prop->value, prop->size)) {
                             /* Make a copy of the class's property */
-                            if((pcopy=H5P_dup_prop(prop,H5P_PROP_WITHIN_LIST)) == NULL)
-                                HGOTO_ERROR(H5E_PLIST,H5E_CANTCOPY,FAIL,"Can't copy property")
+                            if ((pcopy = H5P_dup_prop(prop, H5P_PROP_WITHIN_LIST)) == NULL)
+                                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
 
-                            HDmemcpy(pcopy->value,value,pcopy->size);
+                            HDmemcpy(pcopy->value, value, pcopy->size);
 
                             /* Insert the changed property into the property list */
-                            if(H5P_add_prop(plist->props,pcopy) < 0)
-                                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert changed property into skip list")
+                            if (H5P_add_prop(plist->props, pcopy) < 0)
+                                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,
+                                            "Can't insert changed property into skip list")
                         } /* end if */
-                    } /* end else */
+                    }     /* end else */
 
                     /* Leave */
                     HGOTO_DONE(SUCCEED);
                 } /* end while */
-            } /* end if */
+            }     /* end if */
 
             /* Go up to parent class */
-            tclass=tclass->parent;
+            tclass = tclass->parent;
         } /* end while */
 
         /* If we get this far, then it wasn't in the list of changed properties,
          * nor in the properties in the class hierarchy, indicate an error
          */
-        HGOTO_ERROR(H5E_PLIST,H5E_NOTFOUND,FAIL,"can't find property in skip list")
+        HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "can't find property in skip list")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_set() */
+} /* H5P_set() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_exist_plist
@@ -2638,7 +2591,7 @@ done:
 htri_t
 H5P_exist_plist(const H5P_genplist_t *plist, const char *name)
 {
-    htri_t ret_value = FAIL;     /* return value */
+    htri_t ret_value = FAIL; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2646,18 +2599,18 @@ H5P_exist_plist(const H5P_genplist_t *plist, const char *name)
     HDassert(name);
 
     /* Check for property in deleted property list */
-    if(H5SL_search(plist->del, name) != NULL)
+    if (H5SL_search(plist->del, name) != NULL)
         ret_value = FALSE;
     else {
         /* Check for property in changed property list */
-        if(H5SL_search(plist->props, name) != NULL)
+        if (H5SL_search(plist->props, name) != NULL)
             ret_value = TRUE;
         else {
-            H5P_genclass_t *tclass;     /* Temporary class pointer */
+            H5P_genclass_t *tclass; /* Temporary class pointer */
 
             tclass = plist->pclass;
-            while(tclass != NULL) {
-                if(H5SL_search(tclass->props, name) != NULL)
+            while (tclass != NULL) {
+                if (H5SL_search(tclass->props, name) != NULL)
                     HGOTO_DONE(TRUE)
 
                 /* Go up to parent class */
@@ -2667,13 +2620,12 @@ H5P_exist_plist(const H5P_genplist_t *plist, const char *name)
             /* If we've reached here, we couldn't find the property */
             ret_value = FALSE;
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_exist_plist() */
+} /* H5P_exist_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_exist_pclass
@@ -2698,7 +2650,7 @@ done:
 htri_t
 H5P_exist_pclass(H5P_genclass_t *pclass, const char *name)
 {
-    htri_t ret_value = FAIL;     /* return value */
+    htri_t ret_value = FAIL; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2706,14 +2658,14 @@ H5P_exist_pclass(H5P_genclass_t *pclass, const char *name)
     HDassert(name);
 
     /* Check for property in property list */
-    if(H5SL_search(pclass->props, name) != NULL)
+    if (H5SL_search(pclass->props, name) != NULL)
         ret_value = TRUE;
     else {
-        H5P_genclass_t *tclass;     /* Temporary class pointer */
+        H5P_genclass_t *tclass; /* Temporary class pointer */
 
         tclass = pclass->parent;
-        while(tclass != NULL) {
-            if(H5SL_search(tclass->props, name) != NULL)
+        while (tclass != NULL) {
+            if (H5SL_search(tclass->props, name) != NULL)
                 HGOTO_DONE(TRUE)
 
             /* Go up to parent class */
@@ -2726,9 +2678,8 @@ H5P_exist_pclass(H5P_genclass_t *pclass, const char *name)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_exist_pclass() */
+} /* H5P_exist_pclass() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get_size_plist
@@ -2754,8 +2705,8 @@ done:
 herr_t
 H5P_get_size_plist(const H5P_genplist_t *plist, const char *name, size_t *size)
 {
-    H5P_genprop_t *prop;        /* Temporary property pointer */
-    herr_t ret_value=SUCCEED;      /* return value */
+    H5P_genprop_t *prop;                /* Temporary property pointer */
+    herr_t         ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2764,7 +2715,7 @@ H5P_get_size_plist(const H5P_genplist_t *plist, const char *name, size_t *size)
     HDassert(size);
 
     /* Find property */
-    if(NULL == (prop = H5P__find_prop_plist(plist, name)))
+    if (NULL == (prop = H5P__find_prop_plist(plist, name)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist")
 
     /* Get property size */
@@ -2772,9 +2723,8 @@ H5P_get_size_plist(const H5P_genplist_t *plist, const char *name, size_t *size)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get_size_plist() */
+} /* H5P_get_size_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get_size_pclass
@@ -2800,8 +2750,8 @@ done:
 herr_t
 H5P_get_size_pclass(H5P_genclass_t *pclass, const char *name, size_t *size)
 {
-    H5P_genprop_t *prop;        /* Temporary property pointer */
-    herr_t ret_value=SUCCEED;      /* return value */
+    H5P_genprop_t *prop;                /* Temporary property pointer */
+    herr_t         ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2810,17 +2760,16 @@ H5P_get_size_pclass(H5P_genclass_t *pclass, const char *name, size_t *size)
     HDassert(size);
 
     /* Find property */
-    if((prop=H5P_find_prop_pclass(pclass,name)) == NULL)
+    if ((prop = H5P_find_prop_pclass(pclass, name)) == NULL)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist")
 
     /* Get property size */
-    *size=prop->size;
+    *size = prop->size;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get_size_pclass() */
+} /* H5P_get_size_pclass() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get_nprops_plist
@@ -2853,9 +2802,8 @@ H5P_get_nprops_plist(const H5P_genplist_t *plist, size_t *nprops)
     *nprops = plist->nprops;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5P_get_nprops_plist() */
+} /* H5P_get_nprops_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get_nprops_pclass
@@ -2880,7 +2828,7 @@ H5P_get_nprops_plist(const H5P_genplist_t *plist, size_t *nprops)
 herr_t
 H5P_get_nprops_pclass(const H5P_genclass_t *pclass, size_t *nprops, hbool_t recurse)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2891,17 +2839,16 @@ H5P_get_nprops_pclass(const H5P_genclass_t *pclass, size_t *nprops, hbool_t recu
     *nprops = pclass->nprops;
 
     /* Check if the class is derived, and walk up the chain, if so */
-    if(recurse)
-	while(pclass->parent != NULL) {
-	    pclass = pclass->parent;
-	    *nprops += pclass->nprops;
-	} /* end while */
+    if (recurse)
+        while (pclass->parent != NULL) {
+            pclass = pclass->parent;
+            *nprops += pclass->nprops;
+        } /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get_nprops_pclass() */
+} /* H5P_get_nprops_pclass() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_cmp_prop
@@ -2927,8 +2874,8 @@ done:
 static int
 H5P_cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2)
 {
-    int cmp_value;             /* Value from comparison */
-    int ret_value = 0;         /* return value */
+    int cmp_value;     /* Value from comparison */
+    int ret_value = 0; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2936,62 +2883,86 @@ H5P_cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2)
     HDassert(prop2);
 
     /* Check the name */
-    if((cmp_value = HDstrcmp(prop1->name, prop2->name)) != 0)
+    if ((cmp_value = HDstrcmp(prop1->name, prop2->name)) != 0)
         HGOTO_DONE(cmp_value);
 
     /* Check the size of properties */
-    if(prop1->size < prop2->size) HGOTO_DONE(-1);
-    if(prop1->size > prop2->size) HGOTO_DONE(1);
+    if (prop1->size < prop2->size)
+        HGOTO_DONE(-1);
+    if (prop1->size > prop2->size)
+        HGOTO_DONE(1);
 
     /* Check if they both have the same 'create' callback */
-    if(prop1->create == NULL && prop2->create != NULL) HGOTO_DONE(-1);
-    if(prop1->create != NULL && prop2->create == NULL) HGOTO_DONE(1);
-    if(prop1->create != prop2->create) HGOTO_DONE(-1);
+    if (prop1->create == NULL && prop2->create != NULL)
+        HGOTO_DONE(-1);
+    if (prop1->create != NULL && prop2->create == NULL)
+        HGOTO_DONE(1);
+    if (prop1->create != prop2->create)
+        HGOTO_DONE(-1);
 
     /* Check if they both have the same 'set' callback */
-    if(prop1->set == NULL && prop2->set != NULL) HGOTO_DONE(-1);
-    if(prop1->set != NULL && prop2->set == NULL) HGOTO_DONE(1);
-    if(prop1->set != prop2->set) HGOTO_DONE(-1);
+    if (prop1->set == NULL && prop2->set != NULL)
+        HGOTO_DONE(-1);
+    if (prop1->set != NULL && prop2->set == NULL)
+        HGOTO_DONE(1);
+    if (prop1->set != prop2->set)
+        HGOTO_DONE(-1);
 
     /* Check if they both have the same 'get' callback */
-    if(prop1->get == NULL && prop2->get != NULL) HGOTO_DONE(-1);
-    if(prop1->get != NULL && prop2->get == NULL) HGOTO_DONE(1);
-    if(prop1->get != prop2->get) HGOTO_DONE(-1);
+    if (prop1->get == NULL && prop2->get != NULL)
+        HGOTO_DONE(-1);
+    if (prop1->get != NULL && prop2->get == NULL)
+        HGOTO_DONE(1);
+    if (prop1->get != prop2->get)
+        HGOTO_DONE(-1);
 
     /* Check if they both have the same 'delete' callback */
-    if(prop1->del == NULL && prop2->del != NULL) HGOTO_DONE(-1);
-    if(prop1->del != NULL && prop2->del == NULL) HGOTO_DONE(1);
-    if(prop1->del != prop2->del) HGOTO_DONE(-1);
+    if (prop1->del == NULL && prop2->del != NULL)
+        HGOTO_DONE(-1);
+    if (prop1->del != NULL && prop2->del == NULL)
+        HGOTO_DONE(1);
+    if (prop1->del != prop2->del)
+        HGOTO_DONE(-1);
 
     /* Check if they both have the same 'copy' callback */
-    if(prop1->copy == NULL && prop2->copy != NULL) HGOTO_DONE(-1);
-    if(prop1->copy != NULL && prop2->copy == NULL) HGOTO_DONE(1);
-    if(prop1->copy != prop2->copy) HGOTO_DONE(-1);
+    if (prop1->copy == NULL && prop2->copy != NULL)
+        HGOTO_DONE(-1);
+    if (prop1->copy != NULL && prop2->copy == NULL)
+        HGOTO_DONE(1);
+    if (prop1->copy != prop2->copy)
+        HGOTO_DONE(-1);
 
     /* Check if they both have the same 'compare' callback */
-    if(prop1->cmp == NULL && prop2->cmp != NULL) HGOTO_DONE(-1);
-    if(prop1->cmp != NULL && prop2->cmp == NULL) HGOTO_DONE(1);
-    if(prop1->cmp != prop2->cmp) HGOTO_DONE(-1);
+    if (prop1->cmp == NULL && prop2->cmp != NULL)
+        HGOTO_DONE(-1);
+    if (prop1->cmp != NULL && prop2->cmp == NULL)
+        HGOTO_DONE(1);
+    if (prop1->cmp != prop2->cmp)
+        HGOTO_DONE(-1);
 
     /* Check if they both have the same 'close' callback */
-    if(prop1->close == NULL && prop2->close != NULL) HGOTO_DONE(-1);
-    if(prop1->close != NULL && prop2->close == NULL) HGOTO_DONE(1);
-    if(prop1->close != prop2->close) HGOTO_DONE(-1);
+    if (prop1->close == NULL && prop2->close != NULL)
+        HGOTO_DONE(-1);
+    if (prop1->close != NULL && prop2->close == NULL)
+        HGOTO_DONE(1);
+    if (prop1->close != prop2->close)
+        HGOTO_DONE(-1);
 
     /* Check if they both have values allocated (or not allocated) */
-    if(prop1->value == NULL && prop2->value != NULL) HGOTO_DONE(-1);
-    if(prop1->value != NULL && prop2->value == NULL) HGOTO_DONE(1);
-    if(prop1->value != NULL) {
+    if (prop1->value == NULL && prop2->value != NULL)
+        HGOTO_DONE(-1);
+    if (prop1->value != NULL && prop2->value == NULL)
+        HGOTO_DONE(1);
+    if (prop1->value != NULL) {
         /* Call comparison routine */
-        if((cmp_value = prop1->cmp(prop1->value, prop2->value, prop1->size)) != 0)
+        if ((cmp_value = prop1->cmp(prop1->value, prop2->value, prop1->size)) != 0)
             HGOTO_DONE(cmp_value);
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_cmp_prop() */
+} /* H5P_cmp_prop() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_cmp_class
@@ -3017,9 +2988,9 @@ done:
 int
 H5P_cmp_class(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2)
 {
-    H5SL_node_t *tnode1, *tnode2;   /* Temporary pointer to property nodes */
-    int cmp_value;                  /* Value from comparison */
-    int ret_value = 0;              /* Return value */
+    H5SL_node_t *tnode1, *tnode2; /* Temporary pointer to property nodes */
+    int          cmp_value;       /* Value from comparison */
+    int          ret_value = 0;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -3027,65 +2998,89 @@ H5P_cmp_class(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2)
     HDassert(pclass2);
 
     /* Use the revision number to quickly check for identical classes */
-    if(pclass1->revision == pclass2->revision)
+    if (pclass1->revision == pclass2->revision)
         HGOTO_DONE(0);
 
     /* Check the name */
-    if((cmp_value = HDstrcmp(pclass1->name, pclass2->name)) != 0)
+    if ((cmp_value = HDstrcmp(pclass1->name, pclass2->name)) != 0)
         HGOTO_DONE(cmp_value);
 
     /* Check the number of properties */
-    if(pclass1->nprops < pclass2->nprops) HGOTO_DONE(-1);
-    if(pclass1->nprops > pclass2->nprops) HGOTO_DONE(1);
+    if (pclass1->nprops < pclass2->nprops)
+        HGOTO_DONE(-1);
+    if (pclass1->nprops > pclass2->nprops)
+        HGOTO_DONE(1);
 
     /* Check the number of property lists created from the class */
-    if(pclass1->plists < pclass2->plists) HGOTO_DONE(-1);
-    if(pclass1->plists > pclass2->plists) HGOTO_DONE(1);
+    if (pclass1->plists < pclass2->plists)
+        HGOTO_DONE(-1);
+    if (pclass1->plists > pclass2->plists)
+        HGOTO_DONE(1);
 
     /* Check the number of classes derived from the class */
-    if(pclass1->classes < pclass2->classes) HGOTO_DONE(-1);
-    if(pclass1->classes > pclass2->classes) HGOTO_DONE(1);
+    if (pclass1->classes < pclass2->classes)
+        HGOTO_DONE(-1);
+    if (pclass1->classes > pclass2->classes)
+        HGOTO_DONE(1);
 
     /* Check the number of ID references open on the class */
-    if(pclass1->ref_count < pclass2->ref_count) HGOTO_DONE(-1);
-    if(pclass1->ref_count > pclass2->ref_count) HGOTO_DONE(1);
+    if (pclass1->ref_count < pclass2->ref_count)
+        HGOTO_DONE(-1);
+    if (pclass1->ref_count > pclass2->ref_count)
+        HGOTO_DONE(1);
 
     /* Check the property list types */
-    if(pclass1->type < pclass2->type) HGOTO_DONE(-1);
-    if(pclass1->type > pclass2->type) HGOTO_DONE(1);
+    if (pclass1->type < pclass2->type)
+        HGOTO_DONE(-1);
+    if (pclass1->type > pclass2->type)
+        HGOTO_DONE(1);
 
     /* Check whether they are deleted or not */
-    if(pclass1->deleted < pclass2->deleted) HGOTO_DONE(-1);
-    if(pclass1->deleted > pclass2->deleted) HGOTO_DONE(1);
+    if (pclass1->deleted < pclass2->deleted)
+        HGOTO_DONE(-1);
+    if (pclass1->deleted > pclass2->deleted)
+        HGOTO_DONE(1);
 
     /* Check whether they have creation callback functions & data */
-    if(pclass1->create_func == NULL && pclass2->create_func != NULL) HGOTO_DONE(-1);
-    if(pclass1->create_func != NULL && pclass2->create_func == NULL) HGOTO_DONE(1);
-    if(pclass1->create_func != pclass2->create_func) HGOTO_DONE(-1);
-    if(pclass1->create_data < pclass2->create_data) HGOTO_DONE(-1);
-    if(pclass1->create_data > pclass2->create_data) HGOTO_DONE(1);
+    if (pclass1->create_func == NULL && pclass2->create_func != NULL)
+        HGOTO_DONE(-1);
+    if (pclass1->create_func != NULL && pclass2->create_func == NULL)
+        HGOTO_DONE(1);
+    if (pclass1->create_func != pclass2->create_func)
+        HGOTO_DONE(-1);
+    if (pclass1->create_data < pclass2->create_data)
+        HGOTO_DONE(-1);
+    if (pclass1->create_data > pclass2->create_data)
+        HGOTO_DONE(1);
 
     /* Check whether they have close callback functions & data */
-    if(pclass1->close_func == NULL && pclass2->close_func != NULL) HGOTO_DONE(-1);
-    if(pclass1->close_func != NULL && pclass2->close_func == NULL) HGOTO_DONE(1);
-    if(pclass1->close_func != pclass2->close_func) HGOTO_DONE(-1);
-    if(pclass1->close_data < pclass2->close_data) HGOTO_DONE(-1);
-    if(pclass1->close_data > pclass2->close_data) HGOTO_DONE(1);
+    if (pclass1->close_func == NULL && pclass2->close_func != NULL)
+        HGOTO_DONE(-1);
+    if (pclass1->close_func != NULL && pclass2->close_func == NULL)
+        HGOTO_DONE(1);
+    if (pclass1->close_func != pclass2->close_func)
+        HGOTO_DONE(-1);
+    if (pclass1->close_data < pclass2->close_data)
+        HGOTO_DONE(-1);
+    if (pclass1->close_data > pclass2->close_data)
+        HGOTO_DONE(1);
 
     /* Cycle through the properties and compare them also */
     tnode1 = H5SL_first(pclass1->props);
     tnode2 = H5SL_first(pclass2->props);
-    while(tnode1 || tnode2) {
-        H5P_genprop_t *prop1, *prop2;   /* Property for node */
+    while (tnode1 || tnode2) {
+        H5P_genprop_t *prop1, *prop2; /* Property for node */
 
         /* Check if they both have properties in this skip list node */
-        if(tnode1 == NULL && tnode2 != NULL) HGOTO_DONE(-1);
-        if(tnode1 != NULL && tnode2 == NULL) HGOTO_DONE(1);
+        if (tnode1 == NULL && tnode2 != NULL)
+            HGOTO_DONE(-1);
+        if (tnode1 != NULL && tnode2 == NULL)
+            HGOTO_DONE(1);
 
         /* Compare the two properties */
         prop1 = (H5P_genprop_t *)H5SL_item(tnode1);
         prop2 = (H5P_genprop_t *)H5SL_item(tnode2);
-        if((cmp_value = H5P_cmp_prop(prop1, prop2)) != 0)
+        if ((cmp_value = H5P_cmp_prop(prop1, prop2)) != 0)
             HGOTO_DONE(cmp_value);
 
         /* Advance the pointers */
@@ -3095,9 +3090,8 @@ H5P_cmp_class(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_cmp_class() */
+} /* H5P_cmp_class() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P__cmp_plist_cb
@@ -3124,9 +3118,9 @@ done:
 static int
 H5P__cmp_plist_cb(H5P_genprop_t *prop, void *_udata)
 {
-    H5P_plist_cmp_ud_t *udata = (H5P_plist_cmp_ud_t *)_udata;   /* Pointer to user data */
-    htri_t prop2_exist;                 /* Whether the property exists in the second property list */
-    int ret_value = H5_ITER_CONT;       /* Return value */
+    H5P_plist_cmp_ud_t *udata = (H5P_plist_cmp_ud_t *)_udata; /* Pointer to user data */
+    htri_t              prop2_exist; /* Whether the property exists in the second property list */
+    int                 ret_value = H5_ITER_CONT; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -3135,17 +3129,17 @@ H5P__cmp_plist_cb(H5P_genprop_t *prop, void *_udata)
     HDassert(udata);
 
     /* Check if the property exists in the second property list */
-    if((prop2_exist = H5P_exist_plist(udata->plist2, prop->name)) < 0)
+    if ((prop2_exist = H5P_exist_plist(udata->plist2, prop->name)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, H5_ITER_ERROR, "can't lookup existance of property?")
-    if(prop2_exist) {
-        const H5P_genprop_t *prop2;         /* Pointer to property in second plist */
+    if (prop2_exist) {
+        const H5P_genprop_t *prop2; /* Pointer to property in second plist */
 
         /* Look up same property in second property list */
-        if(NULL == (prop2 = H5P__find_prop_plist(udata->plist2, prop->name)))
+        if (NULL == (prop2 = H5P__find_prop_plist(udata->plist2, prop->name)))
             HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, H5_ITER_ERROR, "property doesn't exist")
 
         /* Compare the two properties */
-        if((udata->cmp_value = H5P_cmp_prop(prop, prop2)) != 0)
+        if ((udata->cmp_value = H5P_cmp_prop(prop, prop2)) != 0)
             HGOTO_DONE(H5_ITER_STOP);
     } /* end if */
     else {
@@ -3158,7 +3152,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__cmp_plist_cb() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_cmp_plist
@@ -3184,12 +3177,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5P_cmp_plist(const H5P_genplist_t *plist1, const H5P_genplist_t *plist2,
-    int *cmp_ret)
+H5P_cmp_plist(const H5P_genplist_t *plist1, const H5P_genplist_t *plist2, int *cmp_ret)
 {
-    H5P_plist_cmp_ud_t udata;   /* User data for callback */
-    int idx = 0;                /* Index of property to begin with */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_plist_cmp_ud_t udata;               /* User data for callback */
+    int                idx       = 0;       /* Index of property to begin with */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3198,39 +3190,39 @@ H5P_cmp_plist(const H5P_genplist_t *plist1, const H5P_genplist_t *plist2,
     HDassert(cmp_ret);
 
     /* Check the number of properties */
-    if(plist1->nprops < plist2->nprops) {
+    if (plist1->nprops < plist2->nprops) {
         *cmp_ret = -1;
         HGOTO_DONE(SUCCEED);
     } /* end if */
-    if(plist1->nprops > plist2->nprops) {
+    if (plist1->nprops > plist2->nprops) {
         *cmp_ret = 1;
         HGOTO_DONE(SUCCEED);
     } /* end if */
 
     /* Check whether they've been initialized */
-    if(plist1->class_init < plist2->class_init) {
+    if (plist1->class_init < plist2->class_init) {
         *cmp_ret = -1;
         HGOTO_DONE(SUCCEED);
     } /* end if */
-    if(plist1->class_init > plist2->class_init) {
+    if (plist1->class_init > plist2->class_init) {
         *cmp_ret = 1;
         HGOTO_DONE(SUCCEED);
     } /* end if */
 
     /* Set up iterator callback info */
     udata.cmp_value = 0;
-    udata.plist2 = plist2;
+    udata.plist2    = plist2;
 
     /* Iterate over properties in first property list */
-    if((ret_value = H5P_iterate_plist(plist1, TRUE, &idx, H5P__cmp_plist_cb, &udata)) < 0)
+    if ((ret_value = H5P_iterate_plist(plist1, TRUE, &idx, H5P__cmp_plist_cb, &udata)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to iterate over list")
-    if(ret_value != 0) {
+    if (ret_value != 0) {
         *cmp_ret = udata.cmp_value;
         HGOTO_DONE(SUCCEED);
     } /* end if */
 
     /* Check the parent classes */
-    if((*cmp_ret = H5P_cmp_class(plist1->pclass, plist2->pclass)) != 0)
+    if ((*cmp_ret = H5P_cmp_class(plist1->pclass, plist2->pclass)) != 0)
         HGOTO_DONE(SUCCEED);
 
     /* Property lists must be equal, set comparison value to 0 */
@@ -3238,9 +3230,8 @@ H5P_cmp_plist(const H5P_genplist_t *plist1, const H5P_genplist_t *plist2,
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_cmp_plist() */
+} /* H5P_cmp_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_class_isa
@@ -3275,11 +3266,12 @@ H5P_class_isa(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2)
     HDassert(pclass2);
 
     /* Compare property classes */
-    if(H5P_cmp_class(pclass1, pclass2) == 0) {
+    if (H5P_cmp_class(pclass1, pclass2) == 0) {
         HGOTO_DONE(TRUE);
-    } else {
+    }
+    else {
         /* Check if the class is derived, and walk up the chain, if so */
-        if(pclass1->parent != NULL)
+        if (pclass1->parent != NULL)
             ret_value = H5P_class_isa(pclass1->parent, pclass2);
         else
             HGOTO_DONE(FALSE);
@@ -3287,9 +3279,8 @@ H5P_class_isa(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_class_isa() */
+} /* H5P_class_isa() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_isa_class
@@ -3318,27 +3309,26 @@ done:
 htri_t
 H5P_isa_class(hid_t plist_id, hid_t pclass_id)
 {
-    H5P_genplist_t	*plist;         /* Property list to query */
-    H5P_genclass_t	*pclass;        /* Property list class */
-    htri_t ret_value;                   /* return value */
+    H5P_genplist_t *plist;     /* Property list to query */
+    H5P_genclass_t *pclass;    /* Property list class */
+    htri_t          ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments. */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
-    if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
+    if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property class")
 
     /* Compare the property list's class against the other class */
-    if((ret_value = H5P_class_isa(plist->pclass, pclass)) < 0)
+    if ((ret_value = H5P_class_isa(plist->pclass, pclass)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to compare property list classes")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_isa_class() */
+} /* H5P_isa_class() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_object_verify
@@ -3370,23 +3360,22 @@ done:
 H5P_genplist_t *
 H5P_object_verify(hid_t plist_id, hid_t pclass_id)
 {
-    H5P_genplist_t *ret_value;                   /* return value */
+    H5P_genplist_t *ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Compare the property list's class against the other class */
-    if(H5P_isa_class(plist_id, pclass_id) != TRUE)
+    if (H5P_isa_class(plist_id, pclass_id) != TRUE)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, NULL, "property list is not a member of the class")
 
     /* Get the plist structure */
-    if(NULL == (ret_value = (H5P_genplist_t *)H5I_object(plist_id)))
+    if (NULL == (ret_value = (H5P_genplist_t *)H5I_object(plist_id)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, NULL, "can't find object for ID")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_object_verify() */
+} /* H5P_object_verify() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P__iterate_plist_cb
@@ -3410,10 +3399,10 @@ property list.
 static int
 H5P__iterate_plist_cb(void *_item, void *_key, void *_udata)
 {
-    H5P_genprop_t *item = (H5P_genprop_t *)_item;       /* Pointer to the property */
-    char *key = (char *)_key;                           /* Pointer to the property's name */
-    H5P_iter_plist_ud_t *udata = (H5P_iter_plist_ud_t *)_udata;     /* Pointer to user data */
-    int ret_value = H5_ITER_CONT;                       /* Return value */
+    H5P_genprop_t *      item      = (H5P_genprop_t *)_item;        /* Pointer to the property */
+    char *               key       = (char *)_key;                  /* Pointer to the property's name */
+    H5P_iter_plist_ud_t *udata     = (H5P_iter_plist_ud_t *)_udata; /* Pointer to user data */
+    int                  ret_value = H5_ITER_CONT;                  /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -3422,10 +3411,10 @@ H5P__iterate_plist_cb(void *_item, void *_key, void *_udata)
     HDassert(key);
 
     /* Check if we've found the correctly indexed property */
-    if(*udata->curr_idx_ptr >= udata->prev_idx) {
+    if (*udata->curr_idx_ptr >= udata->prev_idx) {
         /* Call the callback function */
         ret_value = (*udata->cb_func)(item, udata->udata);
-        if(ret_value != 0)
+        if (ret_value != 0)
             HGOTO_DONE(ret_value);
     } /* end if */
 
@@ -3433,14 +3422,13 @@ H5P__iterate_plist_cb(void *_item, void *_key, void *_udata)
     (*udata->curr_idx_ptr)++;
 
     /* Add property name to 'seen' list */
-    if(H5SL_insert(udata->seen, key, key) < 0)
+    if (H5SL_insert(udata->seen, key, key) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert property into 'seen' skip list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__iterate_plist_cb() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P__iterate_plist_pclass_cb
@@ -3464,10 +3452,10 @@ deleted, and then chains to the property list callback.
 static int
 H5P__iterate_plist_pclass_cb(void *_item, void *_key, void *_udata)
 {
-    H5P_genprop_t *item = (H5P_genprop_t *)_item;       /* Pointer to the property */
-    char *key = (char *)_key;                           /* Pointer to the property's name */
-    H5P_iter_plist_ud_t *udata = (H5P_iter_plist_ud_t *)_udata;     /* Pointer to user data */
-    int ret_value = H5_ITER_CONT;                       /* Return value */
+    H5P_genprop_t *      item      = (H5P_genprop_t *)_item;        /* Pointer to the property */
+    char *               key       = (char *)_key;                  /* Pointer to the property's name */
+    H5P_iter_plist_ud_t *udata     = (H5P_iter_plist_ud_t *)_udata; /* Pointer to user data */
+    int                  ret_value = H5_ITER_CONT;                  /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -3478,14 +3466,12 @@ H5P__iterate_plist_pclass_cb(void *_item, void *_key, void *_udata)
     /* Only call iterator callback for properties we haven't seen
      * before and that haven't been deleted.
      */
-    if(NULL == H5SL_search(udata->seen, key) &&
-            NULL == H5SL_search(udata->plist->del, key))
+    if (NULL == H5SL_search(udata->seen, key) && NULL == H5SL_search(udata->plist->del, key))
         ret_value = H5P__iterate_plist_cb(item, key, udata);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__iterate_plist_pclass_cb() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_iterate_plist
@@ -3541,14 +3527,14 @@ iteration, the function's behavior is undefined.
  REVISION LOG
 --------------------------------------------------------------------------*/
 int
-H5P_iterate_plist(const H5P_genplist_t *plist, hbool_t iter_all_prop, int *idx,
-    H5P_iterate_int_t cb_func, void *udata)
+H5P_iterate_plist(const H5P_genplist_t *plist, hbool_t iter_all_prop, int *idx, H5P_iterate_int_t cb_func,
+                  void *udata)
 {
-    H5P_genclass_t *tclass;     /* Temporary class pointer */
+    H5P_genclass_t *    tclass;           /* Temporary class pointer */
     H5P_iter_plist_ud_t udata_int;        /* User data for skip list iterator */
-    H5SL_t *seen = NULL;        /* Skip list to hold names of properties already seen */
-    int curr_idx = 0;           /* Current iteration index */
-    int ret_value = 0;          /* Return value */
+    H5SL_t *            seen      = NULL; /* Skip list to hold names of properties already seen */
+    int                 curr_idx  = 0;    /* Current iteration index */
+    int                 ret_value = 0;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3558,50 +3544,49 @@ H5P_iterate_plist(const H5P_genplist_t *plist, hbool_t iter_all_prop, int *idx,
     HDassert(cb_func);
 
     /* Create the skip list to hold names of properties already seen */
-    if(NULL == (seen = H5SL_create(H5SL_TYPE_STR, NULL)))
+    if (NULL == (seen = H5SL_create(H5SL_TYPE_STR, NULL)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "can't create skip list for seen properties")
 
     /* Set up iterator callback info */
-    udata_int.plist = plist;
-    udata_int.cb_func = cb_func;
-    udata_int.udata = udata;
-    udata_int.seen = seen;
+    udata_int.plist        = plist;
+    udata_int.cb_func      = cb_func;
+    udata_int.udata        = udata;
+    udata_int.seen         = seen;
     udata_int.curr_idx_ptr = &curr_idx;
-    udata_int.prev_idx = *idx;
+    udata_int.prev_idx     = *idx;
 
     /* Iterate over properties in property list proper */
     /* (Will be only the non-default (i.e. changed) properties) */
     ret_value = H5SL_iterate(plist->props, H5P__iterate_plist_cb, &udata_int);
-    if(ret_value != 0)
+    if (ret_value != 0)
         HGOTO_DONE(ret_value);
 
     /* Check for iterating over all properties, or just non-default ones */
-    if(iter_all_prop) {
+    if (iter_all_prop) {
         /* Walk up the class hiearchy */
         tclass = plist->pclass;
-        while(tclass != NULL) {
+        while (tclass != NULL) {
             /* Iterate over properties in property list class */
             ret_value = H5SL_iterate(tclass->props, H5P__iterate_plist_pclass_cb, &udata_int);
-            if(ret_value != 0)
+            if (ret_value != 0)
                 HGOTO_DONE(ret_value);
 
             /* Go up to parent class */
             tclass = tclass->parent;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Set the index we stopped at */
     *idx = curr_idx;
 
     /* Release the skip list of 'seen' properties */
-    if(seen != NULL)
+    if (seen != NULL)
         H5SL_close(seen);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_iterate_plist() */
+} /* H5P_iterate_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P__iterate_pclass_cb
@@ -3626,10 +3611,10 @@ property list class.
 static int
 H5P__iterate_pclass_cb(void *_item, void *_key, void *_udata)
 {
-    H5P_genprop_t *item = (H5P_genprop_t *)_item;       /* Pointer to the property */
-    char *key = (char *)_key;                           /* Pointer to the property's name */
-    H5P_iter_pclass_ud_t *udata = (H5P_iter_pclass_ud_t *)_udata;     /* Pointer to user data */
-    int ret_value = 0;                                  /* Return value */
+    H5P_genprop_t *       item      = (H5P_genprop_t *)_item;         /* Pointer to the property */
+    char *                key       = (char *)_key;                   /* Pointer to the property's name */
+    H5P_iter_pclass_ud_t *udata     = (H5P_iter_pclass_ud_t *)_udata; /* Pointer to user data */
+    int                   ret_value = 0;                              /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -3638,10 +3623,10 @@ H5P__iterate_pclass_cb(void *_item, void *_key, void *_udata)
     HDassert(key);
 
     /* Check if we've found the correctly indexed property */
-    if(*udata->curr_idx_ptr >= udata->prev_idx) {
+    if (*udata->curr_idx_ptr >= udata->prev_idx) {
         /* Call the callback function */
         ret_value = (*udata->cb_func)(item, udata->udata);
-        if(ret_value != 0)
+        if (ret_value != 0)
             HGOTO_DONE(ret_value);
     } /* end if */
 
@@ -3652,7 +3637,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__iterate_pclass_cb() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_iterate_pclass
@@ -3705,12 +3689,11 @@ iteration, the function's behavior is undefined.
  REVISION LOG
 --------------------------------------------------------------------------*/
 int
-H5P_iterate_pclass(const H5P_genclass_t *pclass, int *idx,
-    H5P_iterate_int_t cb_func, void *udata)
+H5P_iterate_pclass(const H5P_genclass_t *pclass, int *idx, H5P_iterate_int_t cb_func, void *udata)
 {
-    H5P_iter_pclass_ud_t udata_int; /* User data for skip list iterator */
-    int curr_idx = 0;           /* Current iteration index */
-    int ret_value = 0;          /* Return value */
+    H5P_iter_pclass_ud_t udata_int;     /* User data for skip list iterator */
+    int                  curr_idx  = 0; /* Current iteration index */
+    int                  ret_value = 0; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -3720,14 +3703,14 @@ H5P_iterate_pclass(const H5P_genclass_t *pclass, int *idx,
     HDassert(cb_func);
 
     /* Set up iterator callback info */
-    udata_int.cb_func = cb_func;
-    udata_int.udata = udata;
+    udata_int.cb_func      = cb_func;
+    udata_int.udata        = udata;
     udata_int.curr_idx_ptr = &curr_idx;
-    udata_int.prev_idx = *idx;
+    udata_int.prev_idx     = *idx;
 
     /* Iterate over properties in property list class proper */
     ret_value = H5SL_iterate(pclass->props, H5P__iterate_pclass_cb, &udata_int);
-    if(ret_value != 0)
+    if (ret_value != 0)
         HGOTO_DONE(ret_value);
 
 done:
@@ -3735,9 +3718,8 @@ done:
     *idx = curr_idx;
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_iterate_pclass() */
+} /* H5P_iterate_pclass() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_peek_unsigned
@@ -3768,7 +3750,7 @@ done:
 unsigned
 H5P_peek_unsigned(H5P_genplist_t *plist, const char *name)
 {
-    unsigned ret_value;            /* return value */
+    unsigned ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(UFAIL)
 
@@ -3776,13 +3758,12 @@ H5P_peek_unsigned(H5P_genplist_t *plist, const char *name)
     HDassert(name);
 
     /* Get the value to return, don't worry about the return value, we can't return it */
-    H5P_get(plist,name,&ret_value);
+    H5P_get(plist, name, &ret_value);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_peek_unsigned() */
+} /* H5P_peek_unsigned() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_peek_hid_t
@@ -3813,7 +3794,7 @@ done:
 hid_t
 H5P_peek_hid_t(H5P_genplist_t *plist, const char *name)
 {
-    hid_t ret_value;            /* return value */
+    hid_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3821,13 +3802,12 @@ H5P_peek_hid_t(H5P_genplist_t *plist, const char *name)
     HDassert(name);
 
     /* Get the value to return, don't worry about the return value, we can't return it */
-    H5P_get(plist,name,&ret_value);
+    H5P_get(plist, name, &ret_value);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_peek_hid_t() */
+} /* H5P_peek_hid_t() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_peek_voidp
@@ -3858,7 +3838,7 @@ done:
 void *
 H5P_peek_voidp(H5P_genplist_t *plist, const char *name)
 {
-    void * ret_value;            /* return value */
+    void *ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -3866,13 +3846,12 @@ H5P_peek_voidp(H5P_genplist_t *plist, const char *name)
     HDassert(name);
 
     /* Get the value to return, don't worry about the return value, we can't return it */
-    H5P_get(plist,name,&ret_value);
+    H5P_get(plist, name, &ret_value);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_peek_voidp() */
+} /* H5P_peek_voidp() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_peek_size_t
@@ -3903,7 +3882,7 @@ done:
 size_t
 H5P_peek_size_t(H5P_genplist_t *plist, const char *name)
 {
-    size_t ret_value;            /* return value */
+    size_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(UFAIL)
 
@@ -3911,13 +3890,12 @@ H5P_peek_size_t(H5P_genplist_t *plist, const char *name)
     HDassert(name);
 
     /* Get the value to return, don't worry about the return value, we can't return it */
-    H5P_get(plist,name,&ret_value);
+    H5P_get(plist, name, &ret_value);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_peek_size_t() */
+} /* H5P_peek_size_t() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get
@@ -3949,9 +3927,9 @@ done:
 herr_t
 H5P_get(const H5P_genplist_t *plist, const char *name, void *value)
 {
-    H5P_genclass_t *tclass;     /* Temporary class pointer */
-    H5P_genprop_t *prop;        /* Temporary property pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5P_genclass_t *tclass;              /* Temporary class pointer */
+    H5P_genprop_t * prop;                /* Temporary property pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3960,112 +3938,114 @@ H5P_get(const H5P_genplist_t *plist, const char *name, void *value)
     HDassert(value);
 
     /* Check if the property has been deleted */
-    if(H5SL_search(plist->del,name)!=NULL)
+    if (H5SL_search(plist->del, name) != NULL)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist")
 
     /* Find property */
-    if((prop = (H5P_genprop_t *)H5SL_search(plist->props,name))!=NULL) {
+    if ((prop = (H5P_genprop_t *)H5SL_search(plist->props, name)) != NULL) {
         /* Check for property size >0 */
-        if(prop->size==0)
+        if (prop->size == 0)
             HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "property has zero size")
 
         /* Make a copy of the value and pass to 'get' callback */
-        if(prop->get!=NULL) {
-            void *tmp_value;            /* Temporary value for property */
+        if (prop->get != NULL) {
+            void *tmp_value; /* Temporary value for property */
 
             /* Make a copy of the current value, in case the callback fails */
-            if(NULL==(tmp_value=H5MM_malloc(prop->size)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed temporary property value")
-            HDmemcpy(tmp_value,prop->value,prop->size);
+            if (NULL == (tmp_value = H5MM_malloc(prop->size)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                            "memory allocation failed temporary property value")
+            HDmemcpy(tmp_value, prop->value, prop->size);
 
             /* Call user's callback */
-            if((*(prop->get))(plist->plist_id,name,prop->size,tmp_value) < 0)
+            if ((*(prop->get))(plist->plist_id, name, prop->size, tmp_value) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't get property value")
 
             /* Copy new [possibly unchanged] value into return value */
-            HDmemcpy(value,tmp_value,prop->size);
+            HDmemcpy(value, tmp_value, prop->size);
 
             /* Free the temporary value buffer */
             H5MM_xfree(tmp_value);
         } /* end if */
         /* No 'get' callback, just copy value */
         else
-            HDmemcpy(value,prop->value,prop->size);
+            HDmemcpy(value, prop->value, prop->size);
     } /* end if */
     else {
         /*
          * Check if we should get class properties (up through list of parent classes also),
          * & make property 'get' callback.
          */
-        tclass=plist->pclass;
-        while(tclass!=NULL) {
-            if(tclass->nprops>0) {
+        tclass = plist->pclass;
+        while (tclass != NULL) {
+            if (tclass->nprops > 0) {
                 /* Find the property in the class */
-                if((prop = (H5P_genprop_t *)H5SL_search(tclass->props,name))!=NULL) {
+                if ((prop = (H5P_genprop_t *)H5SL_search(tclass->props, name)) != NULL) {
                     /* Check for property size >0 */
-                    if(prop->size==0)
-                        HGOTO_ERROR(H5E_PLIST,H5E_BADVALUE,FAIL,"property has zero size")
+                    if (prop->size == 0)
+                        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "property has zero size")
 
                     /* Call the 'get' callback, if there is one */
-                    if(prop->get!=NULL) {
-                        void *tmp_value;            /* Temporary value for property */
+                    if (prop->get != NULL) {
+                        void *tmp_value; /* Temporary value for property */
 
                         /* Make a copy of the current value, in case the callback fails */
-                        if(NULL==(tmp_value=H5MM_malloc(prop->size)))
-                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed temporary property value")
-                        HDmemcpy(tmp_value,prop->value,prop->size);
+                        if (NULL == (tmp_value = H5MM_malloc(prop->size)))
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                        "memory allocation failed temporary property value")
+                        HDmemcpy(tmp_value, prop->value, prop->size);
 
                         /* Call user's callback */
-                        if((*(prop->get))(plist->plist_id,name,prop->size,tmp_value) < 0) {
+                        if ((*(prop->get))(plist->plist_id, name, prop->size, tmp_value) < 0) {
                             H5MM_xfree(tmp_value);
                             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set property value")
                         } /* end if */
 
-                        if((prop->cmp)(tmp_value,prop->value,prop->size)) {
-                            H5P_genprop_t *pcopy;  /* Copy of property to insert into skip list */
+                        if ((prop->cmp)(tmp_value, prop->value, prop->size)) {
+                            H5P_genprop_t *pcopy; /* Copy of property to insert into skip list */
 
                             /* Make a copy of the class's property */
-                            if((pcopy=H5P_dup_prop(prop,H5P_PROP_WITHIN_LIST)) == NULL)
-                                HGOTO_ERROR(H5E_PLIST,H5E_CANTCOPY,FAIL,"Can't copy property")
+                            if ((pcopy = H5P_dup_prop(prop, H5P_PROP_WITHIN_LIST)) == NULL)
+                                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
 
                             /* Copy new value into property value */
-                            HDmemcpy(pcopy->value,tmp_value,prop->size);
+                            HDmemcpy(pcopy->value, tmp_value, prop->size);
 
                             /* Insert the changed property into the property list */
-                            if(H5P_add_prop(plist->props,pcopy) < 0)
-                                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert changed property into skip list")
+                            if (H5P_add_prop(plist->props, pcopy) < 0)
+                                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,
+                                            "Can't insert changed property into skip list")
                         } /* end if */
 
                         /* Copy new [possibly unchanged] value into return value */
-                        HDmemcpy(value,tmp_value,prop->size);
+                        HDmemcpy(value, tmp_value, prop->size);
 
                         /* Free the temporary value buffer */
                         H5MM_xfree(tmp_value);
                     } /* end if */
                     /* No 'get' callback, just copy value */
                     else
-                        HDmemcpy(value,prop->value,prop->size);
+                        HDmemcpy(value, prop->value, prop->size);
 
                     /* Leave */
                     HGOTO_DONE(SUCCEED);
                 } /* end while */
-            } /* end if */
+            }     /* end if */
 
             /* Go up to parent class */
-            tclass=tclass->parent;
+            tclass = tclass->parent;
         } /* end while */
 
         /* If we get this far, then it wasn't in the list of changed properties,
          * nor in the properties in the class hierarchy, indicate an error
          */
-        HGOTO_ERROR(H5E_PLIST,H5E_NOTFOUND,FAIL,"can't find property in skip list")
+        HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "can't find property in skip list")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get() */
+} /* H5P_get() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_remove
@@ -4095,10 +4075,10 @@ done:
 herr_t
 H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name)
 {
-    H5P_genclass_t *tclass;     /* Temporary class pointer */
-    H5P_genprop_t *prop;        /* Temporary property pointer */
-    char *del_name;             /* Pointer to deleted name */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    H5P_genclass_t *tclass;              /* Temporary class pointer */
+    H5P_genprop_t * prop;                /* Temporary property pointer */
+    char *          del_name;            /* Pointer to deleted name */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -4106,29 +4086,29 @@ H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name)
     HDassert(name);
 
     /* Indicate that the property isn't in the list if it has been deleted already */
-    if(H5SL_search(plist->del,name)!=NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_NOTFOUND,FAIL,"can't find property in skip list")
+    if (H5SL_search(plist->del, name) != NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "can't find property in skip list")
 
     /* Get the property node from the changed property skip list */
-    if((prop = (H5P_genprop_t *)H5SL_search(plist->props,name))!=NULL) {
+    if ((prop = (H5P_genprop_t *)H5SL_search(plist->props, name)) != NULL) {
         /* Pass value to 'close' callback, if it exists */
-        if(prop->del!=NULL) {
+        if (prop->del != NULL) {
             /* Call user's callback */
-            if((*(prop->del))(plist_id,name,prop->size,prop->value) < 0)
+            if ((*(prop->del))(plist_id, name, prop->size, prop->value) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't close property value")
         } /* end if */
 
         /* Duplicate string for insertion into new deleted property skip list */
-        if((del_name=H5MM_xstrdup(name)) == NULL)
-            HGOTO_ERROR(H5E_RESOURCE,H5E_NOSPACE,FAIL,"memory allocation failed")
+        if ((del_name = H5MM_xstrdup(name)) == NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Insert property name into deleted list */
-        if(H5SL_insert(plist->del,del_name,del_name) < 0)
-            HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into deleted skip list")
+        if (H5SL_insert(plist->del, del_name, del_name) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into deleted skip list")
 
         /* Remove the property from the skip list */
-        if(H5SL_remove(plist->props,prop->name) == NULL)
-            HGOTO_ERROR(H5E_PLIST,H5E_CANTDELETE,FAIL,"can't remove property from skip list")
+        if (H5SL_remove(plist->props, prop->name) == NULL)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "can't remove property from skip list")
 
         /* Free the property, ignoring return value, nothing we can do */
         H5P_free_prop(prop);
@@ -4142,22 +4122,23 @@ H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name)
          * Check if we should delete class properties (up through list of parent classes also),
          * & make property 'delete' callback.
          */
-        tclass=plist->pclass;
-        while(tclass!=NULL) {
-            if(tclass->nprops>0) {
+        tclass = plist->pclass;
+        while (tclass != NULL) {
+            if (tclass->nprops > 0) {
                 /* Find the property in the class */
-                if((prop=H5P_find_prop_pclass(tclass,name))!=NULL) {
+                if ((prop = H5P_find_prop_pclass(tclass, name)) != NULL) {
                     /* Pass value to 'del' callback, if it exists */
-                    if(prop->del!=NULL) {
-                        void *tmp_value;       /* Temporary value buffer */
+                    if (prop->del != NULL) {
+                        void *tmp_value; /* Temporary value buffer */
 
                         /* Allocate space for a temporary copy of the property value */
-                        if(NULL==(tmp_value=H5MM_malloc(prop->size)))
-                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for temporary property value")
-                        HDmemcpy(tmp_value,prop->value,prop->size);
+                        if (NULL == (tmp_value = H5MM_malloc(prop->size)))
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                        "memory allocation failed for temporary property value")
+                        HDmemcpy(tmp_value, prop->value, prop->size);
 
                         /* Call user's callback */
-                        if((*(prop->del))(plist_id,name,prop->size,tmp_value) < 0) {
+                        if ((*(prop->del))(plist_id, name, prop->size, tmp_value) < 0) {
                             H5MM_xfree(tmp_value);
                             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't close property value")
                         } /* end if */
@@ -4167,12 +4148,13 @@ H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name)
                     } /* end if */
 
                     /* Duplicate string for insertion into new deleted property skip list */
-                    if((del_name=H5MM_xstrdup(name)) == NULL)
-                        HGOTO_ERROR(H5E_RESOURCE,H5E_NOSPACE,FAIL,"memory allocation failed")
+                    if ((del_name = H5MM_xstrdup(name)) == NULL)
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
                     /* Insert property name into deleted list */
-                    if(H5SL_insert(plist->del,del_name,del_name) < 0)
-                        HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into deleted skip list")
+                    if (H5SL_insert(plist->del, del_name, del_name) < 0)
+                        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,
+                                    "can't insert property into deleted skip list")
 
                     /* Decrement the number of properties in list */
                     plist->nprops--;
@@ -4180,23 +4162,22 @@ H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name)
                     /* Leave */
                     HGOTO_DONE(SUCCEED);
                 } /* end while */
-            } /* end if */
+            }     /* end if */
 
             /* Go up to parent class */
-            tclass=tclass->parent;
+            tclass = tclass->parent;
         } /* end while */
 
         /* If we get this far, then it wasn't in the list of changed properties,
          * nor in the properties in the class hierarchy, indicate an error
          */
-        HGOTO_ERROR(H5E_PLIST,H5E_NOTFOUND,FAIL,"can't find property in skip list")
+        HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "can't find property in skip list")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_remove() */
+} /* H5P_remove() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_copy_prop_plist
@@ -4231,42 +4212,43 @@ done:
 herr_t
 H5P_copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name)
 {
-    H5P_genplist_t *dst_plist;      /* Pointer to destination property list */
-    H5P_genplist_t *src_plist;      /* Pointer to source property list */
-    H5P_genprop_t *prop;            /* Temporary property pointer */
-    H5P_genprop_t *new_prop=NULL;   /* Pointer to new property */
-    herr_t ret_value=SUCCEED;       /* return value */
+    H5P_genplist_t *dst_plist;           /* Pointer to destination property list */
+    H5P_genplist_t *src_plist;           /* Pointer to source property list */
+    H5P_genprop_t * prop;                /* Temporary property pointer */
+    H5P_genprop_t * new_prop  = NULL;    /* Pointer to new property */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(name);
 
     /* Get the objects to operate on */
-    if(NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_id)) || NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_id)))
+    if (NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_id)) ||
+        NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_id)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property object doesn't exist")
 
     /* If the property exists in the destination alread */
-    if(NULL != H5P__find_prop_plist(dst_plist, name)) {
+    if (NULL != H5P__find_prop_plist(dst_plist, name)) {
         /* Delete the property from the destination list, calling the 'close' callback if necessary */
-        if(H5P_remove(dst_id,dst_plist,name) < 0)
+        if (H5P_remove(dst_id, dst_plist, name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "unable to remove property")
 
         /* Get the pointer to the source property */
         prop = H5P__find_prop_plist(src_plist, name);
 
         /* Make a copy of the source property */
-        if((new_prop=H5P_dup_prop(prop,H5P_PROP_WITHIN_LIST)) == NULL)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL,"Can't copy property")
+        if ((new_prop = H5P_dup_prop(prop, H5P_PROP_WITHIN_LIST)) == NULL)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
 
         /* Call property copy callback, if it exists */
-        if(new_prop->copy) {
-            if((new_prop->copy)(new_prop->name,new_prop->size,new_prop->value) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL,"Can't copy property")
+        if (new_prop->copy) {
+            if ((new_prop->copy)(new_prop->name, new_prop->size, new_prop->value) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property")
         } /* end if */
 
         /* Insert the initialized property into the property list */
-        if(H5P_add_prop(dst_plist->props,new_prop) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert property into list")
+        if (H5P_add_prop(dst_plist->props, new_prop) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into list")
 
         /* Increment the number of properties in list */
         dst_plist->nprops++;
@@ -4277,20 +4259,20 @@ H5P_copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name)
         prop = H5P__find_prop_plist(src_plist, name);
 
         /* Create property object from parameters */
-        if(NULL == (new_prop = H5P_create_prop(prop->name, prop->size, H5P_PROP_WITHIN_LIST, prop->value,
-                prop->create, prop->set, prop->get,
-                prop->del, prop->copy, prop->cmp, prop->close)))
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL,"Can't create property")
+        if (NULL == (new_prop = H5P_create_prop(prop->name, prop->size, H5P_PROP_WITHIN_LIST, prop->value,
+                                                prop->create, prop->set, prop->get, prop->del, prop->copy,
+                                                prop->cmp, prop->close)))
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "Can't create property")
 
         /* Call property creation callback, if it exists */
-        if(new_prop->create) {
-            if((new_prop->create)(new_prop->name, new_prop->size, new_prop->value) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL,"Can't initialize property")
+        if (new_prop->create) {
+            if ((new_prop->create)(new_prop->name, new_prop->size, new_prop->value) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Can't initialize property")
         } /* end if */
 
         /* Insert property into property list class */
-        if(H5P_add_prop(dst_plist->props, new_prop) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,"Can't insert property into class")
+        if (H5P_add_prop(dst_plist->props, new_prop) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into class")
 
         /* Increment property count for class */
         dst_plist->nprops++;
@@ -4298,15 +4280,14 @@ H5P_copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name)
 
 done:
     /* Cleanup, if necessary */
-    if(ret_value<0) {
-        if(new_prop!=NULL)
+    if (ret_value < 0) {
+        if (new_prop != NULL)
             H5P_free_prop(new_prop);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_copy_prop_plist() */
+} /* H5P_copy_prop_plist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_copy_prop_pclass
@@ -4339,11 +4320,11 @@ done:
 herr_t
 H5P_copy_prop_pclass(hid_t dst_id, hid_t src_id, const char *name)
 {
-    H5P_genclass_t *src_pclass;     /* Source property class, containing property to copy */
-    H5P_genclass_t *dst_pclass;     /* Destination property class */
-    H5P_genclass_t *orig_dst_pclass; /* Original destination property class */
-    H5P_genprop_t *prop;            /* Temporary property pointer */
-    herr_t ret_value = SUCCEED;     /* return value */
+    H5P_genclass_t *src_pclass;          /* Source property class, containing property to copy */
+    H5P_genclass_t *dst_pclass;          /* Destination property class */
+    H5P_genclass_t *orig_dst_pclass;     /* Original destination property class */
+    H5P_genprop_t * prop;                /* Temporary property pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4351,49 +4332,49 @@ H5P_copy_prop_pclass(hid_t dst_id, hid_t src_id, const char *name)
     HDassert(name);
 
     /* Get propery list classes */
-    if(NULL == (src_pclass = (H5P_genclass_t *)H5I_object(src_id)))
+    if (NULL == (src_pclass = (H5P_genclass_t *)H5I_object(src_id)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "source property class object doesn't exist")
-    if(NULL == (dst_pclass = (H5P_genclass_t *)H5I_object(dst_id)))
+    if (NULL == (dst_pclass = (H5P_genclass_t *)H5I_object(dst_id)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "destination property class object doesn't exist")
 
     /* Get the property from the source */
-    if(NULL == (prop = H5P_find_prop_pclass(src_pclass, name)))
+    if (NULL == (prop = H5P_find_prop_pclass(src_pclass, name)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "unable to locate property")
 
     /* If the property exists in the destination already */
-    if(H5P_exist_pclass(dst_pclass, name)) {
+    if (H5P_exist_pclass(dst_pclass, name)) {
         /* Delete the old property from the destination class */
-        if(H5P_unregister(dst_pclass, name) < 0)
+        if (H5P_unregister(dst_pclass, name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "unable to remove property")
     } /* end if */
 
     /* Register the property into the destination */
     orig_dst_pclass = dst_pclass;
-    if(H5P_register(&dst_pclass, name, prop->size, prop->value, prop->create, prop->set, prop->get,
-            prop->del, prop->copy, prop->cmp, prop->close) < 0)
+    if (H5P_register(&dst_pclass, name, prop->size, prop->value, prop->create, prop->set, prop->get,
+                     prop->del, prop->copy, prop->cmp, prop->close) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "unable to remove property")
 
     /* Check if the property class changed and needs to be substituted in the ID */
-    if(dst_pclass != orig_dst_pclass) {
-        H5P_genclass_t *old_dst_pclass;     /* Old destination property class */
+    if (dst_pclass != orig_dst_pclass) {
+        H5P_genclass_t *old_dst_pclass; /* Old destination property class */
 
         /* Substitute the new destination property class in the ID */
-        if(NULL == (old_dst_pclass = (H5P_genclass_t *)H5I_subst(dst_id, dst_pclass)))
+        if (NULL == (old_dst_pclass = (H5P_genclass_t *)H5I_subst(dst_id, dst_pclass)))
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to substitute property class in ID")
         HDassert(old_dst_pclass == orig_dst_pclass);
 
         /* Close the previous class */
-        if(H5P_close_class(old_dst_pclass) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL, "unable to close original property class after substitution")
+        if (H5P_close_class(old_dst_pclass) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTCLOSEOBJ, FAIL,
+                        "unable to close original property class after substitution")
     } /* end if */
 
 done:
     /* Cleanup, if necessary */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_copy_prop_pclass() */
+} /* H5P_copy_prop_pclass() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_unregister
@@ -4418,8 +4399,8 @@ done:
 herr_t
 H5P_unregister(H5P_genclass_t *pclass, const char *name)
 {
-    H5P_genprop_t *prop;        /* Temporary property pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5P_genprop_t *prop;                /* Temporary property pointer */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4427,12 +4408,12 @@ H5P_unregister(H5P_genclass_t *pclass, const char *name)
     HDassert(name);
 
     /* Get the property node from the skip list */
-    if((prop = (H5P_genprop_t *)H5SL_search(pclass->props,name)) == NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_NOTFOUND,FAIL,"can't find property in skip list")
+    if ((prop = (H5P_genprop_t *)H5SL_search(pclass->props, name)) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "can't find property in skip list")
 
     /* Remove the property from the skip list */
-    if(H5SL_remove(pclass->props,prop->name) == NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_CANTDELETE,FAIL,"can't remove property from skip list")
+    if (H5SL_remove(pclass->props, prop->name) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "can't remove property from skip list")
 
     /* Free the property, ignoring return value, nothing we can do */
     H5P_free_prop(prop);
@@ -4445,9 +4426,8 @@ H5P_unregister(H5P_genclass_t *pclass, const char *name)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_unregister() */
+} /* H5P_unregister() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_close
@@ -4475,16 +4455,16 @@ done:
 herr_t
 H5P_close(void *_plist)
 {
-    H5P_genclass_t *tclass;         /* Temporary class pointer */
-    H5P_genplist_t *plist=(H5P_genplist_t *)_plist;
-    H5SL_t *seen=NULL;              /* Skip list to hold names of properties already seen */
-    size_t nseen;                   /* Number of items 'seen' */
-    hbool_t has_parent_class;       /* Flag to indicate that this property list's class has a parent */
-    size_t ndel;                    /* Number of items deleted */
-    H5SL_node_t *curr_node;         /* Current node in skip list */
-    H5P_genprop_t *tmp;             /* Temporary pointer to properties */
-    unsigned make_cb=0;             /* Operator data for property free callback */
-    herr_t ret_value=SUCCEED;       /* return value */
+    H5P_genclass_t *tclass; /* Temporary class pointer */
+    H5P_genplist_t *plist = (H5P_genplist_t *)_plist;
+    H5SL_t *        seen  = NULL;        /* Skip list to hold names of properties already seen */
+    size_t          nseen;               /* Number of items 'seen' */
+    hbool_t         has_parent_class;    /* Flag to indicate that this property list's class has a parent */
+    size_t          ndel;                /* Number of items deleted */
+    H5SL_node_t *   curr_node;           /* Current node in skip list */
+    H5P_genprop_t * tmp;                 /* Temporary pointer to properties */
+    unsigned        make_cb   = 0;       /* Operator data for property free callback */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4493,10 +4473,10 @@ H5P_close(void *_plist)
     /* Make call to property list class close callback, if needed
      * (up through chain of parent classes also)
      */
-    if(plist->class_init) {
+    if (plist->class_init) {
         tclass = plist->pclass;
-        while(NULL != tclass) {
-            if(NULL != tclass->close_func) {
+        while (NULL != tclass) {
+            if (NULL != tclass->close_func) {
                 /* Call user's "close" callback function, ignoring return value */
                 (tclass->close_func)(plist->plist_id, tclass->close_data);
             } /* end if */
@@ -4504,122 +4484,123 @@ H5P_close(void *_plist)
             /* Go up to parent class */
             tclass = tclass->parent;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     /* Create the skip list to hold names of properties already seen
      * (This prevents a property in the class hierarchy from having it's
      * 'close' callback called, if a property in the class hierarchy has
      * already been seen)
      */
-    if((seen = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
-        HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for seen properties")
+    if ((seen = H5SL_create(H5SL_TYPE_STR, NULL)) == NULL)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "can't create skip list for seen properties")
     nseen = 0;
 
     /* Walk through the changed properties in the list */
-    if(H5SL_count(plist->props)>0) {
-        curr_node=H5SL_first(plist->props);
-        while(curr_node!=NULL) {
+    if (H5SL_count(plist->props) > 0) {
+        curr_node = H5SL_first(plist->props);
+        while (curr_node != NULL) {
             /* Get pointer to property from node */
             tmp = (H5P_genprop_t *)H5SL_item(curr_node);
 
             /* Call property close callback, if it exists */
-            if(tmp->close) {
+            if (tmp->close) {
                 /* Call the 'close' callback */
-                (tmp->close)(tmp->name,tmp->size,tmp->value);
+                (tmp->close)(tmp->name, tmp->size, tmp->value);
             } /* end if */
 
             /* Add property name to "seen" list */
-            if(H5SL_insert(seen,tmp->name,tmp->name) < 0)
-                HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into seen skip list")
+            if (H5SL_insert(seen, tmp->name, tmp->name) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into seen skip list")
             nseen++;
 
             /* Get the next property node in the skip list */
-            curr_node=H5SL_next(curr_node);
+            curr_node = H5SL_next(curr_node);
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     /* Determine number of deleted items from property list */
-    ndel=H5SL_count(plist->del);
+    ndel = H5SL_count(plist->del);
 
     /*
      * Check if we should remove class properties (up through list of parent classes also),
      * initialize each with default value & make property 'remove' callback.
      */
-    tclass=plist->pclass;
+    tclass           = plist->pclass;
     has_parent_class = (hbool_t)(tclass != NULL && tclass->parent != NULL && tclass->parent->nprops > 0);
-    while(tclass!=NULL) {
-        if(tclass->nprops>0) {
+    while (tclass != NULL) {
+        if (tclass->nprops > 0) {
             /* Walk through the properties in the class */
-            curr_node=H5SL_first(tclass->props);
-            while(curr_node!=NULL) {
+            curr_node = H5SL_first(tclass->props);
+            while (curr_node != NULL) {
                 /* Get pointer to property from node */
                 tmp = (H5P_genprop_t *)H5SL_item(curr_node);
 
                 /* Only "delete" properties we haven't seen before
                  * and that haven't already been deleted
                  */
-                if((nseen==0 || H5SL_search(seen,tmp->name) == NULL) &&
-                        (ndel==0 || H5SL_search(plist->del,tmp->name) == NULL)) {
+                if ((nseen == 0 || H5SL_search(seen, tmp->name) == NULL) &&
+                    (ndel == 0 || H5SL_search(plist->del, tmp->name) == NULL)) {
 
                     /* Call property close callback, if it exists */
-                    if(tmp->close) {
-                        void *tmp_value;       /* Temporary value buffer */
+                    if (tmp->close) {
+                        void *tmp_value; /* Temporary value buffer */
 
                         /* Allocate space for a temporary copy of the property value */
-                        if(NULL==(tmp_value=H5MM_malloc(tmp->size)))
-                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for temporary property value")
-                        HDmemcpy(tmp_value,tmp->value,tmp->size);
+                        if (NULL == (tmp_value = H5MM_malloc(tmp->size)))
+                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                        "memory allocation failed for temporary property value")
+                        HDmemcpy(tmp_value, tmp->value, tmp->size);
 
                         /* Call the 'close' callback */
-                        (tmp->close)(tmp->name,tmp->size,tmp_value);
+                        (tmp->close)(tmp->name, tmp->size, tmp_value);
 
                         /* Release the temporary value buffer */
                         H5MM_xfree(tmp_value);
                     } /* end if */
 
                     /* Add property name to "seen" list, if we have other classes to work on */
-                    if(has_parent_class) {
-                        if(H5SL_insert(seen,tmp->name,tmp->name) < 0)
-                            HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into seen skip list")
+                    if (has_parent_class) {
+                        if (H5SL_insert(seen, tmp->name, tmp->name) < 0)
+                            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,
+                                        "can't insert property into seen skip list")
                         nseen++;
                     } /* end if */
-                } /* end if */
+                }     /* end if */
 
                 /* Get the next property node in the skip list */
-                curr_node=H5SL_next(curr_node);
+                curr_node = H5SL_next(curr_node);
             } /* end while */
-        } /* end if */
+        }     /* end if */
 
         /* Go up to parent class */
-        tclass=tclass->parent;
+        tclass = tclass->parent;
     } /* end while */
 
     /* Decrement class's dependant property list value! */
-    if(H5P_access_class(plist->pclass,H5P_MOD_DEC_LST) < 0)
+    if (H5P_access_class(plist->pclass, H5P_MOD_DEC_LST) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Can't decrement class ref count")
 
     /* Free the list of 'seen' properties */
     H5SL_close(seen);
-    seen=NULL;
+    seen = NULL;
 
     /* Free the list of deleted property names */
-    H5SL_destroy(plist->del,H5P_free_del_name_cb,NULL);
+    H5SL_destroy(plist->del, H5P_free_del_name_cb, NULL);
 
     /* Free the properties */
-    H5SL_destroy(plist->props,H5P_free_prop_cb,&make_cb);
+    H5SL_destroy(plist->props, H5P_free_prop_cb, &make_cb);
 
     /* Destroy property list object */
     plist = H5FL_FREE(H5P_genplist_t, plist);
 
 done:
     /* Release the skip list of 'seen' properties */
-    if(seen != NULL)
+    if (seen != NULL)
         H5SL_close(seen);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_close() */
+} /* H5P_close() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get_class_name
@@ -4643,20 +4624,19 @@ done:
 char *
 H5P_get_class_name(H5P_genclass_t *pclass)
 {
-    char *ret_value;      /* return value */
+    char *ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(pclass);
 
     /* Get class name */
-    ret_value=H5MM_xstrdup(pclass->name);
+    ret_value = H5MM_xstrdup(pclass->name);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get_class_name() */
+} /* H5P_get_class_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get_class_path
@@ -4681,26 +4661,26 @@ done:
 char *
 H5P_get_class_path(H5P_genclass_t *pclass)
 {
-    char *ret_value;    /* return value */
+    char *ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(pclass);
 
     /* Recursively build the full path */
-    if(pclass->parent != NULL) {
-        char *par_path;     /* Parent class's full path */
+    if (pclass->parent != NULL) {
+        char *par_path; /* Parent class's full path */
 
         /* Get the parent class's path */
         par_path = H5P_get_class_path(pclass->parent);
-        if(par_path != NULL) {
+        if (par_path != NULL) {
             size_t ret_str_len;
 
             /* Allocate enough space for the parent class's path, plus the '/'
              * separator, this class's name and the string terminator
              */
             ret_str_len = HDstrlen(par_path) + 1 + HDstrlen(pclass->name) + 1;
-            if(NULL == (ret_value = (char *)H5MM_malloc(ret_str_len)))
+            if (NULL == (ret_value = (char *)H5MM_malloc(ret_str_len)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for class name")
 
             /* Build the full path for this class */
@@ -4717,9 +4697,8 @@ H5P_get_class_path(H5P_genclass_t *pclass)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get_class_path() */
+} /* H5P_get_class_path() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_open_class_path
@@ -4742,12 +4721,12 @@ done:
 H5P_genclass_t *
 H5P_open_class_path(const char *path)
 {
-    char *tmp_path = NULL;      /* Temporary copy of the path */
-    char *curr_name;            /* Pointer to current component of path name */
-    char *delimit;              /* Pointer to path delimiter during traversal */
-    H5P_genclass_t *curr_class; /* Pointer to class during path traversal */
-    H5P_check_class_t check_info;   /* Structure to hold the information for checking duplicate names */
-    H5P_genclass_t *ret_value;  /* Return value */
+    char *            tmp_path = NULL; /* Temporary copy of the path */
+    char *            curr_name;       /* Pointer to current component of path name */
+    char *            delimit;         /* Pointer to path delimiter during traversal */
+    H5P_genclass_t *  curr_class;      /* Pointer to class during path traversal */
+    H5P_check_class_t check_info;      /* Structure to hold the information for checking duplicate names */
+    H5P_genclass_t *  ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4758,43 +4737,43 @@ H5P_open_class_path(const char *path)
     HDassert(tmp_path);
 
     /* Find the generic property class with this full path */
-    curr_name = tmp_path;
+    curr_name  = tmp_path;
     curr_class = NULL;
-    while(NULL != (delimit = HDstrchr(curr_name, '/'))) {
+    while (NULL != (delimit = HDstrchr(curr_name, '/'))) {
         /* Change the delimiter to terminate the string */
         *delimit = '\0';
 
         /* Set up the search structure */
-        check_info.parent = curr_class;
-        check_info.name = curr_name;
+        check_info.parent    = curr_class;
+        check_info.name      = curr_name;
         check_info.new_class = NULL;
 
         /* Find the class with this name & parent by iterating over the open classes */
-        if(H5I_iterate(H5I_GENPROP_CLS, H5P_open_class_path_cb, &check_info, FALSE) < 0)
-	    HGOTO_ERROR(H5E_PLIST, H5E_BADITER, NULL, "can't iterate over classes")
-	else if(NULL == check_info.new_class)
-	    HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "can't locate class")
+        if (H5I_iterate(H5I_GENPROP_CLS, H5P_open_class_path_cb, &check_info, FALSE) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_BADITER, NULL, "can't iterate over classes")
+        else if (NULL == check_info.new_class)
+            HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "can't locate class")
 
         /* Advance the pointer in the path to the start of the next component */
         curr_class = check_info.new_class;
-        curr_name = delimit + 1;
+        curr_name  = delimit + 1;
     } /* end while */
 
     /* Should be pointing to the last component in the path name now... */
 
     /* Set up the search structure */
-    check_info.parent = curr_class;
-    check_info.name = curr_name;
+    check_info.parent    = curr_class;
+    check_info.name      = curr_name;
     check_info.new_class = NULL;
 
     /* Find the class with this name & parent by iterating over the open classes */
-    if(H5I_iterate(H5I_GENPROP_CLS, H5P_open_class_path_cb, &check_info, FALSE) < 0)
+    if (H5I_iterate(H5I_GENPROP_CLS, H5P_open_class_path_cb, &check_info, FALSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_BADITER, NULL, "can't iterate over classes")
-    else if(NULL == check_info.new_class)
+    else if (NULL == check_info.new_class)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "can't locate class")
 
     /* Copy it */
-    if(NULL == (ret_value = H5P_copy_pclass(check_info.new_class)))
+    if (NULL == (ret_value = H5P_copy_pclass(check_info.new_class)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, NULL, "can't copy property class")
 
 done:
@@ -4804,7 +4783,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5P_open_class_path() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get_class_parent
@@ -4827,7 +4805,7 @@ done:
 H5P_genclass_t *
 H5P_get_class_parent(const H5P_genclass_t *pclass)
 {
-    H5P_genclass_t *ret_value;      /* return value */
+    H5P_genclass_t *ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -4837,9 +4815,8 @@ H5P_get_class_parent(const H5P_genclass_t *pclass)
     ret_value = pclass->parent;
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get_class_parent() */
+} /* H5P_get_class_parent() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_close_class
@@ -4860,22 +4837,21 @@ H5P_get_class_parent(const H5P_genclass_t *pclass)
 herr_t
 H5P_close_class(void *_pclass)
 {
-    H5P_genclass_t *pclass = (H5P_genclass_t *)_pclass;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5P_genclass_t *pclass    = (H5P_genclass_t *)_pclass;
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(pclass);
 
     /* Decrement the reference count & check if the object should go away */
-    if(H5P_access_class(pclass, H5P_MOD_DEC_REF) < 0)
+    if (H5P_access_class(pclass, H5P_MOD_DEC_REF) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "can't decrement ID ref count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_close_class() */
+} /* H5P_close_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_get_plist_id
  *
@@ -4903,7 +4879,6 @@ H5P_get_plist_id(const H5P_genplist_t *plist)
     FUNC_LEAVE_NOAPI(plist->plist_id)
 } /* end H5P_get_plist_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_get_class
  *
@@ -4930,4 +4905,3 @@ H5P_get_class(const H5P_genplist_t *plist)
 
     FUNC_LEAVE_NOAPI(plist->pclass)
 } /* end H5P_get_class() */
-
diff --git a/src/H5Plapl.c b/src/H5Plapl.c
index 101ac05..7f83c71 100644
--- a/src/H5Plapl.c
+++ b/src/H5Plapl.c
@@ -25,18 +25,17 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Lprivate.h"		/* Links		  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Lprivate.h"  /* Links		  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Ppkg.h"      /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
@@ -44,44 +43,44 @@
 
 /* ========  Link access properties ======== */
 /* Definitions for number of soft links to traverse */
-#define H5L_ACS_NLINKS_SIZE        sizeof(size_t)
-#define H5L_ACS_NLINKS_DEF         H5L_NUM_LINKS /*max symlinks to follow per lookup  */
+#define H5L_ACS_NLINKS_SIZE sizeof(size_t)
+#define H5L_ACS_NLINKS_DEF  H5L_NUM_LINKS /*max symlinks to follow per lookup  */
 
 /* Definitions for external link prefix */
-#define H5L_ACS_ELINK_PREFIX_SIZE        sizeof(char *)
-#define H5L_ACS_ELINK_PREFIX_DEF         NULL /*default is no prefix */
-#define H5L_ACS_ELINK_PREFIX_DEL         H5P_lacc_elink_pref_del
-#define H5L_ACS_ELINK_PREFIX_COPY        H5P_lacc_elink_pref_copy
-#define H5L_ACS_ELINK_PREFIX_CMP         H5P_lacc_elink_pref_cmp
-#define H5L_ACS_ELINK_PREFIX_CLOSE       H5P_lacc_elink_pref_close
+#define H5L_ACS_ELINK_PREFIX_SIZE  sizeof(char *)
+#define H5L_ACS_ELINK_PREFIX_DEF   NULL /*default is no prefix */
+#define H5L_ACS_ELINK_PREFIX_DEL   H5P_lacc_elink_pref_del
+#define H5L_ACS_ELINK_PREFIX_COPY  H5P_lacc_elink_pref_copy
+#define H5L_ACS_ELINK_PREFIX_CMP   H5P_lacc_elink_pref_cmp
+#define H5L_ACS_ELINK_PREFIX_CLOSE H5P_lacc_elink_pref_close
 
 /* Definitions for setting fapl of external link access */
-#define H5L_ACS_ELINK_FAPL_SIZE        	sizeof(hid_t)
-#define H5L_ACS_ELINK_FAPL_DEF         	H5P_DEFAULT
-#define H5L_ACS_ELINK_FAPL_DEL		H5P_lacc_elink_fapl_del
-#define H5L_ACS_ELINK_FAPL_COPY        	H5P_lacc_elink_fapl_copy
-#define H5L_ACS_ELINK_FAPL_CMP        	H5P_lacc_elink_fapl_cmp
-#define H5L_ACS_ELINK_FAPL_CLOSE       	H5P_lacc_elink_fapl_close
+#define H5L_ACS_ELINK_FAPL_SIZE  sizeof(hid_t)
+#define H5L_ACS_ELINK_FAPL_DEF   H5P_DEFAULT
+#define H5L_ACS_ELINK_FAPL_DEL   H5P_lacc_elink_fapl_del
+#define H5L_ACS_ELINK_FAPL_COPY  H5P_lacc_elink_fapl_copy
+#define H5L_ACS_ELINK_FAPL_CMP   H5P_lacc_elink_fapl_cmp
+#define H5L_ACS_ELINK_FAPL_CLOSE H5P_lacc_elink_fapl_close
 
 /* Definitions for file access flags for external link traversal */
-#define H5L_ACS_ELINK_FLAGS_SIZE        sizeof(unsigned)
-#define H5L_ACS_ELINK_FLAGS_DEF         H5F_ACC_DEFAULT
+#define H5L_ACS_ELINK_FLAGS_SIZE sizeof(unsigned)
+#define H5L_ACS_ELINK_FLAGS_DEF  H5F_ACC_DEFAULT
 
 /* Definitions for callback function for external link traversal */
-#define H5L_ACS_ELINK_CB_SIZE           sizeof(H5L_elink_cb_t)
-#define H5L_ACS_ELINK_CB_DEF            {NULL,NULL}
-
+#define H5L_ACS_ELINK_CB_SIZE sizeof(H5L_elink_cb_t)
+#define H5L_ACS_ELINK_CB_DEF                                                                                 \
+    {                                                                                                        \
+        NULL, NULL                                                                                           \
+    }
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -90,15 +89,14 @@
 static herr_t H5P_lacc_reg_prop(H5P_genclass_t *pclass);
 
 /* Property list callbacks */
-static herr_t H5P_lacc_elink_pref_del(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P_lacc_elink_pref_copy(const char* name, size_t size, void* value);
-static int H5P_lacc_elink_pref_cmp(const void *value1, const void *value2, size_t size);
-static herr_t H5P_lacc_elink_pref_close(const char* name, size_t size, void* value);
-static herr_t H5P_lacc_elink_fapl_del(hid_t prop_id, const char* name, size_t size, void* value);
-static herr_t H5P_lacc_elink_fapl_copy(const char* name, size_t size, void* value);
-static int H5P_lacc_elink_fapl_cmp(const void *value1, const void *value2, size_t size);
-static herr_t H5P_lacc_elink_fapl_close(const char* name, size_t size, void* value);
-
+static herr_t H5P_lacc_elink_pref_del(hid_t prop_id, const char *name, size_t size, void *value);
+static herr_t H5P_lacc_elink_pref_copy(const char *name, size_t size, void *value);
+static int    H5P_lacc_elink_pref_cmp(const void *value1, const void *value2, size_t size);
+static herr_t H5P_lacc_elink_pref_close(const char *name, size_t size, void *value);
+static herr_t H5P_lacc_elink_fapl_del(hid_t prop_id, const char *name, size_t size, void *value);
+static herr_t H5P_lacc_elink_fapl_copy(const char *name, size_t size, void *value);
+static int    H5P_lacc_elink_fapl_cmp(const void *value1, const void *value2, size_t size);
+static herr_t H5P_lacc_elink_fapl_close(const char *name, size_t size, void *value);
 
 /*********************/
 /* Package Variables */
@@ -106,35 +104,31 @@ static herr_t H5P_lacc_elink_fapl_close(const char* name, size_t size, void* val
 
 /* Dataset creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_LACC[1] = {{
-    "link access",		/* Class name for debugging     */
-    H5P_TYPE_LINK_ACCESS,       /* Class type                   */
-
-    &H5P_CLS_ROOT_g,		/* Parent class                 */
-    &H5P_CLS_LINK_ACCESS_g,	/* Pointer to class             */
-    &H5P_CLS_LINK_ACCESS_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_LINK_ACCESS_ID_g,	/* Pointer to default property list ID */
-    H5P_lacc_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "link access",        /* Class name for debugging     */
+    H5P_TYPE_LINK_ACCESS, /* Class type                   */
+
+    &H5P_CLS_ROOT_g,           /* Parent class                 */
+    &H5P_CLS_LINK_ACCESS_g,    /* Pointer to class             */
+    &H5P_CLS_LINK_ACCESS_ID_g, /* Pointer to class ID          */
+    &H5P_LST_LINK_ACCESS_ID_g, /* Pointer to default property list ID */
+    H5P_lacc_reg_prop,         /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_lacc_reg_prop
  *
@@ -154,41 +148,48 @@ const H5P_libclass_t H5P_CLS_LACC[1] = {{
 static herr_t
 H5P_lacc_reg_prop(H5P_genclass_t *pclass)
 {
-    size_t nlinks = H5L_ACS_NLINKS_DEF; 	   /* Default number of soft links to traverse */
-    char *elink_prefix = H5L_ACS_ELINK_PREFIX_DEF; /* Default external link prefix string */
-    hid_t def_fapl_id = H5L_ACS_ELINK_FAPL_DEF;    /* Default fapl for external link access */
-    unsigned elink_flags = H5L_ACS_ELINK_FLAGS_DEF; /* Default file access flags for external link traversal */
+    size_t   nlinks       = H5L_ACS_NLINKS_DEF;       /* Default number of soft links to traverse */
+    char *   elink_prefix = H5L_ACS_ELINK_PREFIX_DEF; /* Default external link prefix string */
+    hid_t    def_fapl_id  = H5L_ACS_ELINK_FAPL_DEF;   /* Default fapl for external link access */
+    unsigned elink_flags =
+        H5L_ACS_ELINK_FLAGS_DEF; /* Default file access flags for external link traversal */
     H5L_elink_cb_t elink_cb = H5L_ACS_ELINK_CB_DEF; /* Default external link traversal callback */
 
-    herr_t ret_value = SUCCEED;         	   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Register property for number of links traversed */
-    if(H5P_register_real(pclass, H5L_ACS_NLINKS_NAME, H5L_ACS_NLINKS_SIZE, &nlinks, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5L_ACS_NLINKS_NAME, H5L_ACS_NLINKS_SIZE, &nlinks, NULL, NULL, NULL, NULL,
+                          NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register property for external link prefix */
-    if(H5P_register_real(pclass, H5L_ACS_ELINK_PREFIX_NAME, H5L_ACS_ELINK_PREFIX_SIZE, &elink_prefix, NULL, NULL, NULL, H5L_ACS_ELINK_PREFIX_DEL, H5L_ACS_ELINK_PREFIX_COPY, H5L_ACS_ELINK_PREFIX_CMP, H5L_ACS_ELINK_PREFIX_CLOSE) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5L_ACS_ELINK_PREFIX_NAME, H5L_ACS_ELINK_PREFIX_SIZE, &elink_prefix, NULL,
+                          NULL, NULL, H5L_ACS_ELINK_PREFIX_DEL, H5L_ACS_ELINK_PREFIX_COPY,
+                          H5L_ACS_ELINK_PREFIX_CMP, H5L_ACS_ELINK_PREFIX_CLOSE) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register fapl for link access */
-    if(H5P_register_real(pclass, H5L_ACS_ELINK_FAPL_NAME, H5L_ACS_ELINK_FAPL_SIZE, &def_fapl_id, NULL, NULL, NULL, H5L_ACS_ELINK_FAPL_DEL, H5L_ACS_ELINK_FAPL_COPY, H5L_ACS_ELINK_FAPL_CMP, H5L_ACS_ELINK_FAPL_CLOSE) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5L_ACS_ELINK_FAPL_NAME, H5L_ACS_ELINK_FAPL_SIZE, &def_fapl_id, NULL, NULL,
+                          NULL, H5L_ACS_ELINK_FAPL_DEL, H5L_ACS_ELINK_FAPL_COPY, H5L_ACS_ELINK_FAPL_CMP,
+                          H5L_ACS_ELINK_FAPL_CLOSE) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register property for external link file access flags */
-    if(H5P_register_real(pclass, H5L_ACS_ELINK_FLAGS_NAME, H5L_ACS_ELINK_FLAGS_SIZE, &elink_flags, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5L_ACS_ELINK_FLAGS_NAME, H5L_ACS_ELINK_FLAGS_SIZE, &elink_flags, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register property for external link file traversal callback */
-    if(H5P_register_real(pclass, H5L_ACS_ELINK_CB_NAME, H5L_ACS_ELINK_CB_SIZE, &elink_cb, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
-         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if (H5P_register_real(pclass, H5L_ACS_ELINK_CB_NAME, H5L_ACS_ELINK_CB_SIZE, &elink_cb, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_lacc_reg_prop() */
 
-
 /*--------------------------------------------------------------------------
  * Function:	H5P_lacc_elink_fapl_del
  *
@@ -204,10 +205,11 @@ done:
  */
 /* ARGSUSED */
 static herr_t
-H5P_lacc_elink_fapl_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
+H5P_lacc_elink_fapl_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
+                        size_t H5_ATTR_UNUSED size, void *value)
 {
-    hid_t          l_fapl_id;
-    herr_t         ret_value = SUCCEED;
+    hid_t  l_fapl_id;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -215,14 +217,13 @@ H5P_lacc_elink_fapl_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED
 
     l_fapl_id = (*(const hid_t *)value);
 
-    if((l_fapl_id > H5P_DEFAULT) && (H5I_dec_ref(l_fapl_id) < 0))
-	HGOTO_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close atom for file access property list")
+    if ((l_fapl_id > H5P_DEFAULT) && (H5I_dec_ref(l_fapl_id) < 0))
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close atom for file access property list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_lacc_elink_fapl_del() */
 
-
 /*--------------------------------------------------------------------------
  * Function:	H5P_lacc_elink_fapl_copy
  *
@@ -240,8 +241,8 @@ done:
 static herr_t
 H5P_lacc_elink_fapl_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    hid_t          l_fapl_id;
-    herr_t         ret_value = SUCCEED;
+    hid_t  l_fapl_id;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -249,21 +250,20 @@ H5P_lacc_elink_fapl_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED
 
     l_fapl_id = (*(const hid_t *)value);
 
-    if(l_fapl_id > H5P_DEFAULT) {
+    if (l_fapl_id > H5P_DEFAULT) {
         H5P_genplist_t *l_fapl_plist;
 
-        if(NULL == (l_fapl_plist = (H5P_genplist_t *)H5P_object_verify(l_fapl_id, H5P_FILE_ACCESS)))
+        if (NULL == (l_fapl_plist = (H5P_genplist_t *)H5P_object_verify(l_fapl_id, H5P_FILE_ACCESS)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
-	if(((*(hid_t *)value) = H5P_copy_plist(l_fapl_plist, FALSE)) < 0)
-	    HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to copy file access properties")
+        if (((*(hid_t *)value) = H5P_copy_plist(l_fapl_plist, FALSE)) < 0)
+            HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to copy file access properties")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_lacc_elink_fapl_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P_lacc_elink_fapl_cmp
  *
@@ -281,25 +281,29 @@ done:
 static int
 H5P_lacc_elink_fapl_cmp(const void *value1, const void *value2, size_t H5_ATTR_UNUSED size)
 {
-    const hid_t *fapl1 = (const hid_t *)value1;
-    const hid_t *fapl2 = (const hid_t *)value2;
-    H5P_genplist_t *obj1, *obj2;          /* Property lists to compare */
-    int ret_value = 0;
+    const hid_t *   fapl1 = (const hid_t *)value1;
+    const hid_t *   fapl2 = (const hid_t *)value2;
+    H5P_genplist_t *obj1, *obj2; /* Property lists to compare */
+    int             ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check for comparison with default value */
-    if(*fapl1 == 0 && *fapl2 > 0) HGOTO_DONE(1);
-    if(*fapl1 > 0 && *fapl2 == 0) HGOTO_DONE(-1);
+    if (*fapl1 == 0 && *fapl2 > 0)
+        HGOTO_DONE(1);
+    if (*fapl1 > 0 && *fapl2 == 0)
+        HGOTO_DONE(-1);
 
     /* Get the property list objects */
     obj1 = (H5P_genplist_t *)H5I_object(*fapl1);
     obj2 = (H5P_genplist_t *)H5I_object(*fapl2);
 
     /* Check for NULL property lists */
-    if(obj1 == NULL && obj2 != NULL) HGOTO_DONE(1);
-    if(obj1 != NULL && obj2 == NULL) HGOTO_DONE(-1);
-    if(obj1 && obj2) {
+    if (obj1 == NULL && obj2 != NULL)
+        HGOTO_DONE(1);
+    if (obj1 != NULL && obj2 == NULL)
+        HGOTO_DONE(-1);
+    if (obj1 && obj2) {
         herr_t status;
 
         status = H5P_cmp_plist(obj1, obj2, &ret_value);
@@ -310,7 +314,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_lacc_elink_fapl_cmp() */
 
-
 /*--------------------------------------------------------------------------
  * Function:	H5P_lacc_elink_fapl_close
  *
@@ -328,22 +331,21 @@ done:
 static herr_t
 H5P_lacc_elink_fapl_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    hid_t		l_fapl_id;
-    herr_t     		ret_value = SUCCEED;
+    hid_t  l_fapl_id;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(value);
 
     l_fapl_id = (*(const hid_t *)value);
-    if((l_fapl_id > H5P_DEFAULT) && (H5I_dec_ref(l_fapl_id) < 0))
-	HGOTO_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close atom for file access property list")
+    if ((l_fapl_id > H5P_DEFAULT) && (H5I_dec_ref(l_fapl_id) < 0))
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close atom for file access property list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_lacc_elink_fapl_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_lacc_elink_pref_del
  *
@@ -357,7 +359,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5P_lacc_elink_pref_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
+H5P_lacc_elink_pref_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
+                        size_t H5_ATTR_UNUSED size, void *value)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -368,7 +371,6 @@ H5P_lacc_elink_pref_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P_lacc_elink_pref_del() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_lacc_elink_pref_copy
  *
@@ -394,7 +396,6 @@ H5P_lacc_elink_pref_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P_lacc_elink_pref_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P_lacc_elink_pref_cmp
  *
@@ -412,24 +413,23 @@ H5P_lacc_elink_pref_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED
 static int
 H5P_lacc_elink_pref_cmp(const void *value1, const void *value2, size_t H5_ATTR_UNUSED size)
 {
-    const char *pref1 = *(const char * const *)value1;
-    const char *pref2 = *(const char * const *)value2;
-    int ret_value = 0;
+    const char *pref1     = *(const char *const *)value1;
+    const char *pref2     = *(const char *const *)value2;
+    int         ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(NULL == pref1 && NULL != pref2)
+    if (NULL == pref1 && NULL != pref2)
         HGOTO_DONE(1);
-    if(NULL != pref1 && NULL == pref2)
+    if (NULL != pref1 && NULL == pref2)
         HGOTO_DONE(-1);
-    if(NULL != pref1 && NULL != pref2)
+    if (NULL != pref1 && NULL != pref2)
         ret_value = HDstrcmp(pref1, pref2);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_lacc_elink_pref_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_lacc_elink_pref_close
  *
@@ -455,7 +455,6 @@ H5P_lacc_elink_pref_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P_lacc_elink_pref_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_nlinks
  *
@@ -480,28 +479,27 @@ H5P_lacc_elink_pref_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED
 herr_t
 H5Pset_nlinks(hid_t plist_id, size_t nlinks)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", plist_id, nlinks);
 
-    if(nlinks <= 0)
+    if (nlinks <= 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "number of links must be positive");
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set number of links */
-    if(H5P_set(plist, H5L_ACS_NLINKS_NAME, &nlinks) < 0)
+    if (H5P_set(plist, H5L_ACS_NLINKS_NAME, &nlinks) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set nlink info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_nlinks() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_nlinks
  *
@@ -521,28 +519,27 @@ done:
 herr_t
 H5Pget_nlinks(hid_t plist_id, size_t *nlinks)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*z", plist_id, nlinks);
 
-    if(!nlinks)
+    if (!nlinks)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer passed in");
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the current number of links */
-    if(H5P_get(plist, H5L_ACS_NLINKS_NAME, nlinks) < 0)
+    if (H5P_get(plist, H5L_ACS_NLINKS_NAME, nlinks) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get number of links")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_elink_prefix
  *
@@ -560,37 +557,36 @@ done:
 herr_t
 H5Pset_elink_prefix(hid_t plist_id, const char *prefix)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    char *my_prefix;                    /* Copy of prefix string */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    char *          my_prefix;           /* Copy of prefix string */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", plist_id, prefix);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get current prefix value */
-    if(H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
+    if (H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get prefix info")
 
     /* Free existing prefix, if there is one */
     H5MM_xfree(my_prefix);
 
     /* Make a copy of the user's prefix string */
-    if(NULL == (my_prefix = H5MM_xstrdup(prefix)))
+    if (NULL == (my_prefix = H5MM_xstrdup(prefix)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy prefix")
 
     /* Set prefix */
-    if(H5P_set(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
+    if (H5P_set(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set prefix info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_elink_prefix() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_elink_prefix
  *
@@ -610,32 +606,32 @@ done:
 ssize_t
 H5Pget_elink_prefix(hid_t plist_id, char *prefix, size_t size)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    char *my_prefix;                    /* Library's copy of the prefix */
-    size_t	len;                    /* Length of prefix string */
-    ssize_t 	ret_value;              /* Return value */
+    H5P_genplist_t *plist;     /* Property list pointer */
+    char *          my_prefix; /* Library's copy of the prefix */
+    size_t          len;       /* Length of prefix string */
+    ssize_t         ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "i*sz", plist_id, prefix, size);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the current prefix */
-    if(H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
+    if (H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external link prefix")
 
     /* Check for prefix being set */
-    if(my_prefix) {
+    if (my_prefix) {
         /* Copy to user's buffer, if given */
         len = HDstrlen(my_prefix);
-        if(prefix) {
+        if (prefix) {
             HDstrncpy(prefix, my_prefix, MIN(len + 1, size));
-            if(len >= size)
+            if (len >= size)
                 prefix[size - 1] = '\0';
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else
         len = 0;
 
@@ -661,41 +657,40 @@ done:
 herr_t
 H5Pset_elink_fapl(hid_t lapl_id, hid_t fapl_id)
 {
-    H5P_genplist_t 	*plist, *fapl_plist;	/* Property list pointer */
-    hid_t		l_fapl_id, new_fapl_id;
-    herr_t 		ret_value = SUCCEED;         		/* Return value */
+    H5P_genplist_t *plist, *fapl_plist; /* Property list pointer */
+    hid_t           l_fapl_id, new_fapl_id;
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ii", lapl_id, fapl_id);
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link access property list");
 
     /* Get the current file access property list for the link access */
-    if(H5P_get(plist, H5L_ACS_ELINK_FAPL_NAME, &l_fapl_id) < 0)
+    if (H5P_get(plist, H5L_ACS_ELINK_FAPL_NAME, &l_fapl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fapl")
 
     /* Close the current file access property list if set */
-    if((l_fapl_id > H5P_DEFAULT) && (H5I_dec_ref(l_fapl_id) < 0))
-	HGOTO_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close atom for file access property list")
+    if ((l_fapl_id > H5P_DEFAULT) && (H5I_dec_ref(l_fapl_id) < 0))
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to close atom for file access property list")
 
-    if(NULL == (fapl_plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
-	HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access property list");
+    if (NULL == (fapl_plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access property list");
 
     /* Make a copy of the property list for FAPL_ID */
-    if((new_fapl_id = H5P_copy_plist(fapl_plist, FALSE)) < 0)
-	HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to copy file access properties")
+    if ((new_fapl_id = H5P_copy_plist(fapl_plist, FALSE)) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to copy file access properties")
 
     /* Set the file access property list for the link access */
-    if(H5P_set(plist, H5L_ACS_ELINK_FAPL_NAME, &new_fapl_id) < 0)
+    if (H5P_set(plist, H5L_ACS_ELINK_FAPL_NAME, &new_fapl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set fapl for link")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_elink_fapl() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_elink_fapl
  *
@@ -712,34 +707,34 @@ done:
 hid_t
 H5Pget_elink_fapl(hid_t lapl_id)
 {
-    H5P_genplist_t 	*plist, *fapl_plist; 	/* Property list pointer */
-    hid_t		l_fapl_id;
-    hid_t		ret_value=FAIL;		/* Return value */
+    H5P_genplist_t *plist, *fapl_plist; /* Property list pointer */
+    hid_t           l_fapl_id;
+    hid_t           ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", lapl_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-    if(H5P_get(plist, H5L_ACS_ELINK_FAPL_NAME, &l_fapl_id) < 0)
+    if (H5P_get(plist, H5L_ACS_ELINK_FAPL_NAME, &l_fapl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fapl for links")
 
-    if(l_fapl_id > H5P_DEFAULT) {
-	if(NULL==(fapl_plist = H5P_object_verify(l_fapl_id, H5P_FILE_ACCESS)))
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
+    if (l_fapl_id > H5P_DEFAULT) {
+        if (NULL == (fapl_plist = H5P_object_verify(l_fapl_id, H5P_FILE_ACCESS)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
 
-	if((ret_value = H5P_copy_plist(fapl_plist, TRUE)) < 0)
-	    HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to copy file access properties")
-    } else
-	ret_value = l_fapl_id;
+        if ((ret_value = H5P_copy_plist(fapl_plist, TRUE)) < 0)
+            HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to copy file access properties")
+    }
+    else
+        ret_value = l_fapl_id;
 
 done:
     FUNC_LEAVE_API(ret_value);
 } /* end H5Pget_elink_fapl() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_elink_acc_flags
  *
@@ -757,29 +752,28 @@ done:
 herr_t
 H5Pset_elink_acc_flags(hid_t lapl_id, unsigned flags)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", lapl_id, flags);
 
     /* Check that flags are valid */
-    if((flags != H5F_ACC_RDWR) && (flags != H5F_ACC_RDONLY) && (flags != H5F_ACC_DEFAULT))
+    if ((flags != H5F_ACC_RDWR) && (flags != H5F_ACC_RDONLY) && (flags != H5F_ACC_DEFAULT))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file open flags")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set flags */
-    if(H5P_set(plist, H5L_ACS_ELINK_FLAGS_NAME, &flags) < 0)
+    if (H5P_set(plist, H5L_ACS_ELINK_FLAGS_NAME, &flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set access flags")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_elink_acc_flags() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_elink_acc_flags
  *
@@ -796,26 +790,25 @@ done:
 herr_t
 H5Pget_elink_acc_flags(hid_t lapl_id, unsigned *flags)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Iu", lapl_id, flags);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get flags */
     if (flags)
-        if(H5P_get(plist, H5L_ACS_ELINK_FLAGS_NAME, flags)<0)
+        if (H5P_get(plist, H5L_ACS_ELINK_FLAGS_NAME, flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, 0, "can't get access flags")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_elink_acc_flags() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_elink_cb
  *
@@ -833,35 +826,34 @@ done:
 herr_t
 H5Pset_elink_cb(hid_t lapl_id, H5L_elink_traverse_t func, void *op_data)
 {
-    H5P_genplist_t  *plist;                 /* Property list pointer */
-    H5L_elink_cb_t  cb_info;                /* Callback info struct */
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5L_elink_cb_t  cb_info;             /* Callback info struct */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ix*x", lapl_id, func, op_data);
 
     /* Check if the callback function is NULL and the user data is non-NULL.
      * This is almost certainly an error as the user data will not be used. */
-    if(!func && op_data)
+    if (!func && op_data)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "callback is NULL while user data is not")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Populate the callback info struct */
-    cb_info.func = func;
+    cb_info.func      = func;
     cb_info.user_data = op_data;
 
     /* Set callback info */
-    if(H5P_set(plist, H5L_ACS_ELINK_CB_NAME, &cb_info) < 0)
+    if (H5P_set(plist, H5L_ACS_ELINK_CB_NAME, &cb_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set callback info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_elink_acc_flags() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_elink_cb
  *
@@ -878,29 +870,27 @@ done:
 herr_t
 H5Pget_elink_cb(hid_t lapl_id, H5L_elink_traverse_t *func, void **op_data)
 {
-    H5P_genplist_t  *plist;                 /* Property list pointer */
-    H5L_elink_cb_t  cb_info;                /* Callback info struct */
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    H5L_elink_cb_t  cb_info;             /* Callback info struct */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*x**x", lapl_id, func, op_data);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get callback_info */
-    if(H5P_get(plist, H5L_ACS_ELINK_CB_NAME, &cb_info)<0)
+    if (H5P_get(plist, H5L_ACS_ELINK_CB_NAME, &cb_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get callback info")
 
-    if(func)
+    if (func)
         *func = cb_info.func;
 
-    if(op_data)
+    if (op_data)
         *op_data = cb_info.user_data;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_elink_cb() */
-
-
diff --git a/src/H5Plcpl.c b/src/H5Plcpl.c
index 5bab907..f85592d 100644
--- a/src/H5Plcpl.c
+++ b/src/H5Plcpl.c
@@ -25,18 +25,16 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Lprivate.h"		/* Links        		  	*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Lprivate.h" /* Links        		  	*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
@@ -44,20 +42,17 @@
 
 /* ========  Link creation properties ======== */
 /* Definitions for create intermediate groups flag */
-#define H5L_CRT_INTERMEDIATE_GROUP_SIZE         sizeof(unsigned)
-#define H5L_CRT_INTERMEDIATE_GROUP_DEF          0
-
+#define H5L_CRT_INTERMEDIATE_GROUP_SIZE sizeof(unsigned)
+#define H5L_CRT_INTERMEDIATE_GROUP_DEF  0
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -65,42 +60,37 @@
 /* Property class callbacks */
 static herr_t H5P_lcrt_reg_prop(H5P_genclass_t *pclass);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* Link creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_LCRT[1] = {{
-    "link create",		/* Class name for debugging     */
-    H5P_TYPE_LINK_CREATE,       /* Class type                   */
-
-    &H5P_CLS_STRING_CREATE_g,	/* Parent class                 */
-    &H5P_CLS_LINK_CREATE_g,	/* Pointer to class             */
-    &H5P_CLS_LINK_CREATE_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_LINK_CREATE_ID_g,	/* Pointer to default property list ID */
-    H5P_lcrt_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "link create",        /* Class name for debugging     */
+    H5P_TYPE_LINK_CREATE, /* Class type                   */
+
+    &H5P_CLS_STRING_CREATE_g,  /* Parent class                 */
+    &H5P_CLS_LINK_CREATE_g,    /* Pointer to class             */
+    &H5P_CLS_LINK_CREATE_ID_g, /* Pointer to class ID          */
+    &H5P_LST_LINK_CREATE_ID_g, /* Pointer to default property list ID */
+    H5P_lcrt_reg_prop,         /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_lcrt_reg_prop
  *
@@ -115,20 +105,21 @@ const H5P_libclass_t H5P_CLS_LCRT[1] = {{
 herr_t
 H5P_lcrt_reg_prop(H5P_genclass_t *pclass)
 {
-    unsigned intmd_group = H5L_CRT_INTERMEDIATE_GROUP_DEF;      /* Default setting for creating intermediate groups */
+    unsigned intmd_group =
+        H5L_CRT_INTERMEDIATE_GROUP_DEF; /* Default setting for creating intermediate groups */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Register create intermediate groups property */
-    if(H5P_register_real(pclass, H5L_CRT_INTERMEDIATE_GROUP_NAME, H5L_CRT_INTERMEDIATE_GROUP_SIZE, &intmd_group, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5L_CRT_INTERMEDIATE_GROUP_NAME, H5L_CRT_INTERMEDIATE_GROUP_SIZE,
+                          &intmd_group, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_lcrt_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_create_intermediate_group
  *
@@ -146,26 +137,25 @@ done:
 herr_t
 H5Pset_create_intermediate_group(hid_t plist_id, unsigned crt_intmd_group)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, crt_intmd_group);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set value */
     crt_intmd_group = (unsigned)(crt_intmd_group > 0 ? 1 : 0);
-    if(H5P_set(plist, H5L_CRT_INTERMEDIATE_GROUP_NAME, &crt_intmd_group) < 0)
+    if (H5P_set(plist, H5L_CRT_INTERMEDIATE_GROUP_NAME, &crt_intmd_group) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set intermediate group creation flag")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_create_intermediate_group() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_create_intermediate_group
  *
@@ -181,22 +171,21 @@ done:
 herr_t
 H5Pget_create_intermediate_group(hid_t plist_id, unsigned *crt_intmd_group /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, crt_intmd_group);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(crt_intmd_group)
-        if(H5P_get(plist, H5L_CRT_INTERMEDIATE_GROUP_NAME, crt_intmd_group) < 0)
+    if (crt_intmd_group)
+        if (H5P_get(plist, H5L_CRT_INTERMEDIATE_GROUP_NAME, crt_intmd_group) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get intermediate group creation flag")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_create_intermediate_group() */
-
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index 5db1788..00c5811 100644
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -25,21 +25,19 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-#include "H5PLprivate.h"	/* Dynamic plugin			*/
-#include "H5Zprivate.h"	        /* Filter pipeline			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Ppkg.h"      /* Property lists		  	*/
+#include "H5PLprivate.h" /* Dynamic plugin			*/
+#include "H5Zprivate.h"  /* Filter pipeline			*/
 
 /****************/
 /* Local Macros */
@@ -47,26 +45,23 @@
 
 /* ========= Object Creation properties ============ */
 /* Definitions for the max. # of attributes to store compactly */
-#define H5O_CRT_ATTR_MAX_COMPACT_SIZE   sizeof(unsigned)
+#define H5O_CRT_ATTR_MAX_COMPACT_SIZE sizeof(unsigned)
 /* Definitions for the min. # of attributes to store densely */
-#define H5O_CRT_ATTR_MIN_DENSE_SIZE     sizeof(unsigned)
+#define H5O_CRT_ATTR_MIN_DENSE_SIZE sizeof(unsigned)
 /* Definitions for object header flags */
-#define H5O_CRT_OHDR_FLAGS_SIZE         sizeof(uint8_t)
+#define H5O_CRT_OHDR_FLAGS_SIZE sizeof(uint8_t)
 /* Definitions for filter pipeline */
 #define H5O_CRT_PIPELINE_SIZE sizeof(H5O_pline_t)
-#define H5O_CRT_PIPELINE_CMP            H5P__ocrt_pipeline_cmp
-
+#define H5O_CRT_PIPELINE_CMP  H5P__ocrt_pipeline_cmp
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -80,8 +75,8 @@ static herr_t H5P__ocrt_close(hid_t dxpl_id, void *close_data);
 static int H5P__ocrt_pipeline_cmp(const void *value1, const void *value2, size_t size);
 
 /* Local routines */
-static herr_t H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter, 
-    unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/]);
+static herr_t H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned int flags,
+                              size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/]);
 
 /*********************/
 /* Package Variables */
@@ -89,36 +84,31 @@ static herr_t H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter,
 
 /* Object creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_OCRT[1] = {{
-    "object create",		/* Class name for debugging     */
-    H5P_TYPE_OBJECT_CREATE,     /* Class type                   */
-
-    &H5P_CLS_ROOT_g,		/* Parent class                 */
-    &H5P_CLS_OBJECT_CREATE_g,	/* Pointer to class             */
-    &H5P_CLS_OBJECT_CREATE_ID_g,	/* Pointer to class ID          */
-    NULL,			/* Pointer to default property list ID */
-    H5P__ocrt_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    H5P__ocrt_copy,		/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    H5P__ocrt_close,		/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "object create",        /* Class name for debugging     */
+    H5P_TYPE_OBJECT_CREATE, /* Class type                   */
+
+    &H5P_CLS_ROOT_g,             /* Parent class                 */
+    &H5P_CLS_OBJECT_CREATE_g,    /* Pointer to class             */
+    &H5P_CLS_OBJECT_CREATE_ID_g, /* Pointer to class ID          */
+    NULL,                        /* Pointer to default property list ID */
+    H5P__ocrt_reg_prop,          /* Default property registration routine */
+
+    NULL,            /* Class creation callback      */
+    NULL,            /* Class creation callback info */
+    H5P__ocrt_copy,  /* Class copy callback          */
+    NULL,            /* Class copy callback info     */
+    H5P__ocrt_close, /* Class close callback         */
+    NULL             /* Class close callback info    */
 }};
 
-
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__ocrt_reg_prop
  *
@@ -134,35 +124,39 @@ const H5P_libclass_t H5P_CLS_OCRT[1] = {{
 static herr_t
 H5P__ocrt_reg_prop(H5P_genclass_t *pclass)
 {
-    unsigned attr_max_compact = H5O_CRT_ATTR_MAX_COMPACT_DEF;   /* Default max. compact attribute storage settings */
-    unsigned attr_min_dense = H5O_CRT_ATTR_MIN_DENSE_DEF;       /* Default min. dense attribute storage settings */
-    uint8_t ohdr_flags = H5O_CRT_OHDR_FLAGS_DEF;        /* Default object header flag settings */
-    H5O_pline_t pline = H5O_CRT_PIPELINE_DEF;           /* Default I/O pipeline setting */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned attr_max_compact =
+        H5O_CRT_ATTR_MAX_COMPACT_DEF; /* Default max. compact attribute storage settings */
+    unsigned attr_min_dense = H5O_CRT_ATTR_MIN_DENSE_DEF; /* Default min. dense attribute storage settings */
+    uint8_t  ohdr_flags     = H5O_CRT_OHDR_FLAGS_DEF;     /* Default object header flag settings */
+    H5O_pline_t pline       = H5O_CRT_PIPELINE_DEF;       /* Default I/O pipeline setting */
+    herr_t      ret_value   = SUCCEED;                    /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register max. compact attribute storage property */
-    if(H5P_register_real(pclass, H5O_CRT_ATTR_MAX_COMPACT_NAME, H5O_CRT_ATTR_MAX_COMPACT_SIZE, &attr_max_compact, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5O_CRT_ATTR_MAX_COMPACT_NAME, H5O_CRT_ATTR_MAX_COMPACT_SIZE,
+                          &attr_max_compact, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register min. dense attribute storage property */
-    if(H5P_register_real(pclass, H5O_CRT_ATTR_MIN_DENSE_NAME, H5O_CRT_ATTR_MIN_DENSE_SIZE, &attr_min_dense, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5O_CRT_ATTR_MIN_DENSE_NAME, H5O_CRT_ATTR_MIN_DENSE_SIZE, &attr_min_dense,
+                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register object header flags property */
-    if(H5P_register_real(pclass, H5O_CRT_OHDR_FLAGS_NAME, H5O_CRT_OHDR_FLAGS_SIZE, &ohdr_flags, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5O_CRT_OHDR_FLAGS_NAME, H5O_CRT_OHDR_FLAGS_SIZE, &ohdr_flags, NULL, NULL,
+                          NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the pipeline property */
-    if(H5P_register_real(pclass, H5O_CRT_PIPELINE_NAME, H5O_CRT_PIPELINE_SIZE, &pline, NULL, NULL, NULL, NULL, NULL, H5O_CRT_PIPELINE_CMP, NULL) < 0)
+    if (H5P_register_real(pclass, H5O_CRT_PIPELINE_NAME, H5O_CRT_PIPELINE_SIZE, &pline, NULL, NULL, NULL,
+                          NULL, NULL, H5O_CRT_PIPELINE_CMP, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__ocrt_copy
  *
@@ -182,36 +176,35 @@ done:
 static herr_t
 H5P__ocrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void H5_ATTR_UNUSED *copy_data)
 {
-    H5O_pline_t    src_pline, dst_pline;        /* Source & destination pipelines */
-    H5P_genplist_t *src_plist;                  /* Pointer to source property list */
-    H5P_genplist_t *dst_plist;                  /* Pointer to destination property list */
-    herr_t         ret_value = SUCCEED;         /* Return value */
+    H5O_pline_t     src_pline, dst_pline; /* Source & destination pipelines */
+    H5P_genplist_t *src_plist;            /* Pointer to source property list */
+    H5P_genplist_t *dst_plist;            /* Pointer to destination property list */
+    herr_t          ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Verify property list IDs */
-    if(NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_plist_id)))
+    if (NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_plist_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an object creation property list")
-    if(NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_plist_id)))
+    if (NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_plist_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an object creation property list")
 
     /* Get the link pipeline property from the old property list */
-    if(H5P_get(src_plist, H5O_CRT_PIPELINE_NAME, &src_pline) < 0)
+    if (H5P_get(src_plist, H5O_CRT_PIPELINE_NAME, &src_pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Make copy of link pipeline */
-    if(NULL == H5O_msg_copy(H5O_PLINE_ID, &src_pline, &dst_pline))
+    if (NULL == H5O_msg_copy(H5O_PLINE_ID, &src_pline, &dst_pline))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't copy link pipeline")
 
     /* Set the link pipeline property for the destination property list */
-    if(H5P_set(dst_plist, H5O_CRT_PIPELINE_NAME, &dst_pline) < 0)
+    if (H5P_set(dst_plist, H5O_CRT_PIPELINE_NAME, &dst_pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P__ocrt_close
  *
@@ -231,29 +224,28 @@ done:
 static herr_t
 H5P__ocrt_close(hid_t dcpl_id, void H5_ATTR_UNUSED *close_data)
 {
-    H5O_pline_t     pline;              /* I/O pipeline */
-    H5P_genplist_t *plist;              /* Property list */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_pline_t     pline;               /* I/O pipeline */
+    H5P_genplist_t *plist;               /* Property list */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Check arguments */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an object creation property list")
 
     /* Get the link pipeline property from the old property list */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Clean up any values set for the link pipeline */
-    if(H5O_msg_reset(H5O_PLINE_ID, &pline) < 0)
+    if (H5O_msg_reset(H5O_PLINE_ID, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't release pipeline info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_attr_phase_change
  *
@@ -279,35 +271,34 @@ done:
 herr_t
 H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense);
 
     /* Range check values */
-    if(max_compact < min_dense)
+    if (max_compact < min_dense)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "max compact value must be >= min dense value")
-    if(max_compact > 65535)
+    if (max_compact > 65535)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "max compact value must be < 65536")
-    if(min_dense > 65535)
+    if (min_dense > 65535)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "min dense value must be < 65536")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set property values */
-    if(H5P_set(plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &max_compact) < 0)
+    if (H5P_set(plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &max_compact) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set max. # of compact attributes in property list")
-    if(H5P_set(plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &min_dense) < 0)
+    if (H5P_set(plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &min_dense) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set min. # of dense attributes in property list")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_attr_phase_change */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_attr_phase_change
  *
@@ -323,23 +314,23 @@ done:
 herr_t
 H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact, unsigned *min_dense)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*Iu*Iu", plist_id, max_compact, min_dense);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(max_compact) {
-        if(H5P_get(plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, max_compact) < 0)
+    if (max_compact) {
+        if (H5P_get(plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, max_compact) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get max. # of compact attributes")
     } /* end if */
-    if(min_dense) {
-        if(H5P_get(plist, H5O_CRT_ATTR_MIN_DENSE_NAME, min_dense) < 0)
+    if (min_dense) {
+        if (H5P_get(plist, H5O_CRT_ATTR_MIN_DENSE_NAME, min_dense) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get min. # of dense attributes")
     } /* end if */
 
@@ -347,7 +338,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_attr_phase_change() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_attr_creation_order
  *
@@ -363,41 +353,42 @@ done:
 herr_t
 H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flags)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    uint8_t ohdr_flags;                 /* Object header flags */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    uint8_t         ohdr_flags;          /* Object header flags */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, crt_order_flags);
 
     /* Check for bad combination of flags */
-    if(!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED))
+    if (!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "tracking creation order is required for index")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get object header flags */
-    if(H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+    if (H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
     /* Mask off previous attribute creation order flag settings */
-    ohdr_flags &= (uint8_t)~(H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED);
+    ohdr_flags &= (uint8_t) ~(H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED);
 
     /* Update with new attribute creation order flags */
-    ohdr_flags = (uint8_t)(ohdr_flags | ((crt_order_flags & H5P_CRT_ORDER_TRACKED) ? H5O_HDR_ATTR_CRT_ORDER_TRACKED : 0));
-    ohdr_flags = (uint8_t)(ohdr_flags | ((crt_order_flags & H5P_CRT_ORDER_INDEXED) ? H5O_HDR_ATTR_CRT_ORDER_INDEXED : 0));
+    ohdr_flags = (uint8_t)(ohdr_flags |
+                           ((crt_order_flags & H5P_CRT_ORDER_TRACKED) ? H5O_HDR_ATTR_CRT_ORDER_TRACKED : 0));
+    ohdr_flags = (uint8_t)(ohdr_flags |
+                           ((crt_order_flags & H5P_CRT_ORDER_INDEXED) ? H5O_HDR_ATTR_CRT_ORDER_INDEXED : 0));
 
     /* Set object header flags */
-    if(H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+    if (H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set object header flags")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_attr_creation_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_attr_creation_order
  *
@@ -414,25 +405,25 @@ done:
 herr_t
 H5Pget_attr_creation_order(hid_t plist_id, unsigned *crt_order_flags)
 {
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Iu", plist_id, crt_order_flags);
 
     /* Get values */
-    if(crt_order_flags) {
+    if (crt_order_flags) {
         H5P_genplist_t *plist;      /* Property list pointer */
-        uint8_t ohdr_flags;         /* Object header flags */
+        uint8_t         ohdr_flags; /* Object header flags */
 
         /* Reset the value to return */
         *crt_order_flags = 0;
 
         /* Get the plist structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get object header flags */
-        if(H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+        if (H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
         /* Set creation order flags to return */
@@ -444,7 +435,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_attr_creation_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_obj_track_times
  *
@@ -474,19 +464,19 @@ done:
 herr_t
 H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    uint8_t ohdr_flags;                 /* Object header flags */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    uint8_t         ohdr_flags;          /* Object header flags */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ib", plist_id, track_times);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get object header flags */
-    if(H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+    if (H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
     /* Mask off previous time tracking flag settings */
@@ -496,14 +486,13 @@ H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times)
     ohdr_flags = (uint8_t)(ohdr_flags | (track_times ? H5O_HDR_STORE_TIMES : 0));
 
     /* Set object header flags */
-    if(H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+    if (H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set object header flags")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_obj_track_times() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_obj_track_times
  *
@@ -519,22 +508,22 @@ done:
 herr_t
 H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times)
 {
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*b", plist_id, track_times);
 
     /* Get values */
-    if(track_times) {
+    if (track_times) {
         H5P_genplist_t *plist;      /* Property list pointer */
-        uint8_t ohdr_flags;         /* Object header flags */
+        uint8_t         ohdr_flags; /* Object header flags */
 
         /* Get the plist structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get object header flags */
-        if(H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+        if (H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
         /* Set track times flag to return */
@@ -545,7 +534,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_obj_track_times() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_modify_filter
  *
@@ -583,31 +571,30 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P_modify_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned flags,
-    size_t cd_nelmts, const unsigned cd_values[/*cd_nelmts*/])
+H5P_modify_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned flags, size_t cd_nelmts,
+                  const unsigned cd_values[/*cd_nelmts*/])
 {
-    H5O_pline_t         pline;
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5O_pline_t pline;
+    herr_t      ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the pipeline property to modify */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Modify the filter parameters of the I/O pipeline */
-    if(H5Z_modify(&pline, filter, flags, cd_nelmts, cd_values) < 0)
+    if (H5Z_modify(&pline, filter, flags, cd_nelmts, cd_values) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add filter to pipeline")
 
     /* Put the I/O pipeline information back into the property list */
-    if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_modify_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pmodify_filter
  *
@@ -652,37 +639,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags,
-               size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/])
+H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+                 const unsigned int cd_values[/*cd_nelmts*/])
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    herr_t          ret_value = SUCCEED;    /* return value */
+    H5P_genplist_t *plist;               /* Property list */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values);
 
     /* Check args */
-    if (filter<0 || filter>H5Z_FILTER_MAX)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identifier")
+    if (filter < 0 || filter > H5Z_FILTER_MAX)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identifier")
     if (flags & ~((unsigned)H5Z_FLAG_DEFMASK))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid flags")
-    if (cd_nelmts>0 && !cd_values)
+    if (cd_nelmts > 0 && !cd_values)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no client data values supplied")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-
     /* Modify the filter parameters of the I/O pipeline */
-    if(H5P_modify_filter(plist, filter, flags, cd_nelmts, cd_values) < 0)
+    if (H5P_modify_filter(plist, filter, flags, cd_nelmts, cd_values) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't modify filter")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pmodify_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_filter
  *
@@ -728,36 +713,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags,
-	       size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/])
+H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+              const unsigned int cd_values[/*cd_nelmts*/])
 {
-    H5P_genplist_t  *plist;             /* Property list */
-    herr_t          ret_value=SUCCEED;  /* return value */
+    H5P_genplist_t *plist;               /* Property list */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values);
 
     /* Check args */
-    if (filter<0 || filter>H5Z_FILTER_MAX)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identifier")
+    if (filter < 0 || filter > H5Z_FILTER_MAX)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identifier")
     if (flags & ~((unsigned)H5Z_FLAG_DEFMASK))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid flags")
-    if (cd_nelmts>0 && !cd_values)
+    if (cd_nelmts > 0 && !cd_values)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no client data values supplied")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Call the private function */
-    if(H5P__set_filter(plist, filter, flags, cd_nelmts, cd_values) < 0)
+    if (H5P__set_filter(plist, filter, flags, cd_nelmts, cd_values) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "failed to call private function")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P__set_filter
  *
@@ -783,7 +767,7 @@ done:
  *		If this bit is set but encoding is disabled for a filter,
  *		attempting to write will generate an error.
  *
- *              If the filter is not registered, this function tries to load 
+ *              If the filter is not registered, this function tries to load
  *              it dynamically during run time.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -794,36 +778,35 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned int flags,
-	       size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/])
+H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+                const unsigned int cd_values[/*cd_nelmts*/])
 {
-    H5O_pline_t     pline;                  /* Filter pipeline */
-    htri_t          filter_avail;           /* Filter availability */
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    H5O_pline_t pline;               /* Filter pipeline */
+    htri_t      filter_avail;        /* Filter availability */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Check if filter is already available */
-    if((filter_avail = H5Z_filter_avail(filter)) < 0)
+    if ((filter_avail = H5Z_filter_avail(filter)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't check filter availability")
 
     /* Get the pipeline property to append to */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Add the filter to the I/O pipeline */
-    if(H5Z_append(&pline, filter, flags, cd_nelmts, cd_values) < 0)
+    if (H5Z_append(&pline, filter, flags, cd_nelmts, cd_values) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add filter to pipeline")
 
     /* Put the I/O pipeline information back into the property list */
-    if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__set_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_nfilters
  *
@@ -854,29 +837,28 @@ done:
 int
 H5Pget_nfilters(hid_t plist_id)
 {
-    H5P_genplist_t  *plist;         /* Property list */
-    H5O_pline_t     pline;          /* Filter pipeline */
-    int             ret_value;      /* return value */
+    H5P_genplist_t *plist;     /* Property list */
+    H5O_pline_t     pline;     /* Filter pipeline */
+    int             ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to query */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Set return value */
-    ret_value=(int)(pline.nused);
+    ret_value = (int)(pline.nused);
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_nfilters */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_filter2
  *
@@ -909,58 +891,57 @@ done:
  *-------------------------------------------------------------------------
  */
 H5Z_filter_t
-H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags/*out*/,
-	       size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-	       size_t namelen, char name[]/*out*/,
+H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/, size_t *cd_nelmts /*in_out*/,
+               unsigned cd_values[] /*out*/, size_t namelen, char name[] /*out*/,
                unsigned *filter_config /*out*/)
 {
-    H5P_genplist_t  *plist;             /* Property list */
-    H5O_pline_t     pline;              /* Filter pipeline */
+    H5P_genplist_t *         plist;     /* Property list */
+    H5O_pline_t              pline;     /* Filter pipeline */
     const H5Z_filter_info_t *filter;    /* Pointer to filter information */
-    H5Z_filter_t    ret_value;          /* return value */
+    H5Z_filter_t             ret_value; /* return value */
 
     FUNC_ENTER_API(H5Z_FILTER_ERROR)
-    H5TRACE8("Zf", "iIux*zxzxx", plist_id, idx, flags, cd_nelmts, cd_values,
-             namelen, name, filter_config);
+    H5TRACE8("Zf", "iIux*zxzxx", plist_id, idx, flags, cd_nelmts, cd_values, namelen, name, filter_config);
 
     /* Check args */
-    if(cd_nelmts || cd_values) {
+    if (cd_nelmts || cd_values) {
         /*
          * It's likely that users forget to initialize this on input, so
          * we'll check that it has a reasonable value.  The actual number
          * is unimportant because the H5O layer will detect when a message
          * is too large.
          */
-        if(cd_nelmts && *cd_nelmts > 256)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "probable uninitialized *cd_nelmts argument")
-        if(cd_nelmts && *cd_nelmts > 0 && !cd_values)
+        if (cd_nelmts && *cd_nelmts > 256)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR,
+                        "probable uninitialized *cd_nelmts argument")
+        if (cd_nelmts && *cd_nelmts > 0 && !cd_values)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "client data values not supplied")
 
         /*
          * If cd_nelmts is null but cd_values is non-null then just ignore
          * cd_values
          */
-        if(!cd_nelmts)
+        if (!cd_nelmts)
             cd_values = NULL;
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5Z_FILTER_ERROR, "can't find object for ID")
 
     /* Get the pipeline property to query */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5Z_FILTER_ERROR, "can't get pipeline")
 
     /* Check index */
-    if(idx >= pline.nused)
+    if (idx >= pline.nused)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "filter number is invalid")
 
     /* Set pointer to particular filter to query */
     filter = &pline.filter[idx];
 
     /* Get filter information */
-    if(H5P_get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
+    if (H5P_get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5Z_FILTER_ERROR, "can't get filter info")
 
     /* Set return value */
@@ -970,7 +951,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_filter2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_get_filter_by_id
  *
@@ -994,33 +974,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P_get_filter_by_id(H5P_genplist_t *plist, H5Z_filter_t id, unsigned int *flags/*out*/,
-    size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-    size_t namelen, char name[]/*out*/, unsigned *filter_config)
+H5P_get_filter_by_id(H5P_genplist_t *plist, H5Z_filter_t id, unsigned int *flags /*out*/,
+                     size_t *cd_nelmts /*in_out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                     char name[] /*out*/, unsigned *filter_config)
 {
-    H5O_pline_t         pline;  /* Filter pipeline */
-    H5Z_filter_info_t *filter;  /* Pointer to filter information */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_pline_t        pline;               /* Filter pipeline */
+    H5Z_filter_info_t *filter;              /* Pointer to filter information */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get pipeline info */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Get pointer to filter in pipeline */
-    if(NULL == (filter = H5Z_filter_info(&pline, id)))
+    if (NULL == (filter = H5Z_filter_info(&pline, id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "filter ID is invalid")
 
     /* Get filter information */
-    if(H5P_get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
+    if (H5P_get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get filter info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_get_filter_by_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_filter_by_id2
  *
@@ -1051,54 +1030,51 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags/*out*/,
-    size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-    size_t namelen, char name[]/*out*/, unsigned *filter_config)
+H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out*/,
+                     size_t *cd_nelmts /*in_out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                     char name[] /*out*/, unsigned *filter_config)
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    H5O_pline_t     pline;                  /* Filter pipeline */
-    const H5Z_filter_info_t *filter;        /* Pointer to filter information */
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *         plist;               /* Property list */
+    H5O_pline_t              pline;               /* Filter pipeline */
+    const H5Z_filter_info_t *filter;              /* Pointer to filter information */
+    herr_t                   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("e", "iZfx*zxzx*Iu", plist_id, id, flags, cd_nelmts, cd_values,
-             namelen, name, filter_config);
+    H5TRACE8("e", "iZfx*zxzx*Iu", plist_id, id, flags, cd_nelmts, cd_values, namelen, name, filter_config);
 
     /* Check args */
-    if(cd_nelmts || cd_values) {
+    if (cd_nelmts || cd_values) {
         /*
          * It's likely that users forget to initialize this on input, so
          * we'll check that it has a reasonable value.  The actual number
          * is unimportant because the H5O layer will detect when a message
          * is too large.
          */
-        if(cd_nelmts && *cd_nelmts > 256)
+        if (cd_nelmts && *cd_nelmts > 256)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "probable uninitialized *cd_nelmts argument")
-        if(cd_nelmts && *cd_nelmts > 0 && !cd_values)
+        if (cd_nelmts && *cd_nelmts > 0 && !cd_values)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "client data values not supplied")
 
         /*
          * If cd_nelmts is null but cd_values is non-null then just ignore
          * cd_values
          */
-        if(!cd_nelmts)
+        if (!cd_nelmts)
             cd_values = NULL;
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get filter information */
-    if(H5P_get_filter_by_id(plist, id, flags, cd_nelmts, cd_values, namelen,
-            name, filter_config) < 0)
+    if (H5P_get_filter_by_id(plist, id, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get filter info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_filter_by_id2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pall_filters_avail
  *
@@ -1124,35 +1100,34 @@ done:
 htri_t
 H5Pall_filters_avail(hid_t plist_id)
 {
-    H5P_genplist_t  *plist;         /* Property list */
-    H5O_pline_t     pline;          /* Filter pipeline */
-    htri_t          ret_value;      /* Return value */
+    H5P_genplist_t *plist;     /* Property list */
+    H5O_pline_t     pline;     /* Filter pipeline */
+    htri_t          ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to query */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Check if all filters are available */
-    if((ret_value = H5Z_all_filters_avail(&pline)) < 0)
+    if ((ret_value = H5Z_all_filters_avail(&pline)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "can't check pipeline information")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pall_filters_avail() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_filter_in_pline
  *
  * Purpose:	Check whether the filter is in the pipeline of the object
- *              creation property list.  
+ *              creation property list.
  *
  * Return:	TRUE:		found
  *		FALSE:		not found
@@ -1166,24 +1141,23 @@ done:
 htri_t
 H5P_filter_in_pline(H5P_genplist_t *plist, H5Z_filter_t id)
 {
-    H5O_pline_t         pline;  /* Filter pipeline */
-    htri_t ret_value = SUCCEED;   /* Return value */
+    H5O_pline_t pline;               /* Filter pipeline */
+    htri_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get pipeline info */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Check if the file is in the pipeline */
-    if((ret_value = H5Z_filter_in_pline(&pline, id)) < 0)
+    if ((ret_value = H5Z_filter_in_pline(&pline, id)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTCOMPARE, FAIL, "can't find filter")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_get_filter_by_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Premove_filter
  *
@@ -1207,29 +1181,29 @@ done:
 herr_t
 H5Premove_filter(hid_t plist_id, H5Z_filter_t filter)
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    H5O_pline_t     pline;                  /* Filter pipeline */
-    herr_t          ret_value = SUCCEED;    /* return value          */
+    H5P_genplist_t *plist;               /* Property list */
+    H5O_pline_t     pline;               /* Filter pipeline */
+    herr_t          ret_value = SUCCEED; /* return value          */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iZf", plist_id, filter);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to modify */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Check if there are any filters */
     if (pline.filter) {
         /* Delete filter */
-        if(H5Z_delete(&pline, filter) < 0)
+        if (H5Z_delete(&pline, filter) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't delete filter")
 
         /* Put the I/O pipeline information back into the property list */
-        if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+        if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
     } /* end if */
 
@@ -1237,7 +1211,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Premove_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_deflate
  *
@@ -1271,38 +1244,37 @@ done:
 herr_t
 H5Pset_deflate(hid_t plist_id, unsigned level)
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    H5O_pline_t     pline;                  /* Filter pipeline */
-    herr_t          ret_value = SUCCEED;    /* return value */
+    H5P_genplist_t *plist;               /* Property list */
+    H5O_pline_t     pline;               /* Filter pipeline */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, level);
 
     /* Check arguments */
-    if(level > 9)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid deflate level")
+    if (level > 9)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid deflate level")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to append to */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Add the filter */
-    if(H5Z_append(&pline, H5Z_FILTER_DEFLATE, H5Z_FLAG_OPTIONAL, (size_t)1, &level) < 0)
+    if (H5Z_append(&pline, H5Z_FILTER_DEFLATE, H5Z_FLAG_OPTIONAL, (size_t)1, &level) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add deflate filter to pipeline")
 
     /* Put the I/O pipeline information back into the property list */
-    if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_deflate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fletcher32
  *
@@ -1326,34 +1298,33 @@ done:
 herr_t
 H5Pset_fletcher32(hid_t plist_id)
 {
-    H5P_genplist_t  *plist;             /* Property list */
-    H5O_pline_t     pline;              /* Filter pipeline */
-    herr_t          ret_value=SUCCEED;  /* return value */
+    H5P_genplist_t *plist;               /* Property list */
+    H5O_pline_t     pline;               /* Filter pipeline */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to append to */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Add the Fletcher32 checksum as a filter */
-    if(H5Z_append(&pline, H5Z_FILTER_FLETCHER32, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0)
+    if (H5Z_append(&pline, H5Z_FILTER_FLETCHER32, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add fletcher32 filter to pipeline")
 
     /* Put the I/O pipeline information back into the property list */
-    if(H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_set(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fletcher32() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5P_get_filter
  *
@@ -1367,10 +1338,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P_get_filter(const H5Z_filter_info_t *filter, unsigned int *flags/*out*/,
-    size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-    size_t namelen, char name[]/*out*/,
-    unsigned *filter_config /*out*/)
+H5P_get_filter(const H5Z_filter_info_t *filter, unsigned int *flags /*out*/, size_t *cd_nelmts /*in_out*/,
+               unsigned cd_values[] /*out*/, size_t namelen, char name[] /*out*/,
+               unsigned *filter_config /*out*/)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1378,58 +1348,57 @@ H5P_get_filter(const H5Z_filter_info_t *filter, unsigned int *flags/*out*/,
     HDassert(filter);
 
     /* Filter flags */
-    if(flags)
+    if (flags)
         *flags = filter->flags;
 
     /* Filter parameters */
-    if(cd_values) {
-        size_t	i;                      /* Local index variable */
+    if (cd_values) {
+        size_t i; /* Local index variable */
 
-        for(i = 0; i < filter->cd_nelmts && i < *cd_nelmts; i++)
+        for (i = 0; i < filter->cd_nelmts && i < *cd_nelmts; i++)
             cd_values[i] = filter->cd_values[i];
     } /* end if */
 
     /* Number of filter parameters */
-    if(cd_nelmts)
+    if (cd_nelmts)
         *cd_nelmts = filter->cd_nelmts;
 
     /* Filter name */
-    if(namelen > 0 && name) {
+    if (namelen > 0 && name) {
         const char *s = filter->name;
 
         /* If there's no name on the filter, use the class's filter name */
-        if(!s) {
+        if (!s) {
             H5Z_class2_t *cls = H5Z_find(filter->id);
 
-            if(cls)
+            if (cls)
                 s = cls->name;
         } /* end if */
 
         /* Check for actual name */
-        if(s) {
+        if (s) {
             HDstrncpy(name, s, namelen);
             name[namelen - 1] = '\0';
         } /* end if */
         else {
             /* Check for unknown library filter */
             /* (probably from a future version of the library) */
-            if(filter->id < 256) {
+            if (filter->id < 256) {
                 HDstrncpy(name, "Unknown library filter", namelen);
                 name[namelen - 1] = '\0';
             } /* end if */
             else
                 name[0] = '\0';
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Filter configuration (assume filter ID has already been checked) */
-    if(filter_config)
+    if (filter_config)
         H5Z_get_filter_info(filter->id, filter_config);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P_get_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__ocrt_pipeline_cmp
  *
@@ -1448,9 +1417,9 @@ H5P_get_filter(const H5Z_filter_info_t *filter, unsigned int *flags/*out*/,
 static int
 H5P__ocrt_pipeline_cmp(const void *_pline1, const void *_pline2, size_t H5_ATTR_UNUSED size)
 {
-    const H5O_pline_t *pline1 = (const H5O_pline_t *)_pline1,     /* Create local aliases for values */
-        *pline2 = (const H5O_pline_t *)_pline2;
-    int cmp_value;              /* Value from comparison */
+    const H5O_pline_t *pline1 = (const H5O_pline_t *)_pline1, /* Create local aliases for values */
+        *pline2               = (const H5O_pline_t *)_pline2;
+    int    cmp_value;     /* Value from comparison */
     herr_t ret_value = 0; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
@@ -1461,58 +1430,74 @@ H5P__ocrt_pipeline_cmp(const void *_pline1, const void *_pline2, size_t H5_ATTR_
     HDassert(size == sizeof(H5O_pline_t));
 
     /* Check the number of used pipeline entries */
-    if(pline1->nused < pline2->nused) HGOTO_DONE(-1);
-    if(pline1->nused > pline2->nused) HGOTO_DONE(1);
+    if (pline1->nused < pline2->nused)
+        HGOTO_DONE(-1);
+    if (pline1->nused > pline2->nused)
+        HGOTO_DONE(1);
 
     /* Check the filter entry information */
-    if(pline1->filter == NULL && pline2->filter != NULL) HGOTO_DONE(-1);
-    if(pline1->filter != NULL && pline2->filter == NULL) HGOTO_DONE(1);
-    if(pline1->filter != NULL && pline1->nused > 0) {
-        size_t u;       /* Local index variable */
+    if (pline1->filter == NULL && pline2->filter != NULL)
+        HGOTO_DONE(-1);
+    if (pline1->filter != NULL && pline2->filter == NULL)
+        HGOTO_DONE(1);
+    if (pline1->filter != NULL && pline1->nused > 0) {
+        size_t u; /* Local index variable */
 
         /* Loop through all filters, comparing them */
-        for(u = 0; u < pline1->nused; u++) {
+        for (u = 0; u < pline1->nused; u++) {
             /* Check the ID of the filter */
-            if(pline1->filter[u].id < pline2->filter[u].id) HGOTO_DONE(-1);
-            if(pline1->filter[u].id > pline2->filter[u].id) HGOTO_DONE(1);
+            if (pline1->filter[u].id < pline2->filter[u].id)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].id > pline2->filter[u].id)
+                HGOTO_DONE(1);
 
             /* Check the flags for the filter */
-            if(pline1->filter[u].flags < pline2->filter[u].flags) HGOTO_DONE(-1);
-            if(pline1->filter[u].flags > pline2->filter[u].flags) HGOTO_DONE(1);
+            if (pline1->filter[u].flags < pline2->filter[u].flags)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].flags > pline2->filter[u].flags)
+                HGOTO_DONE(1);
 
             /* Check the name of the filter */
-            if(pline1->filter[u].name == NULL && pline2->filter[u].name != NULL) HGOTO_DONE(-1);
-            if(pline1->filter[u].name != NULL && pline2->filter[u].name == NULL) HGOTO_DONE(1);
-            if(pline1->filter[u].name != NULL)
-                if((cmp_value = HDstrcmp(pline1->filter[u].name, pline2->filter[u].name)) != 0)
+            if (pline1->filter[u].name == NULL && pline2->filter[u].name != NULL)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].name != NULL && pline2->filter[u].name == NULL)
+                HGOTO_DONE(1);
+            if (pline1->filter[u].name != NULL)
+                if ((cmp_value = HDstrcmp(pline1->filter[u].name, pline2->filter[u].name)) != 0)
                     HGOTO_DONE(cmp_value);
 
             /* Check the number of parameters for the filter */
-            if(pline1->filter[u].cd_nelmts < pline2->filter[u].cd_nelmts) HGOTO_DONE(-1);
-            if(pline1->filter[u].cd_nelmts > pline2->filter[u].cd_nelmts) HGOTO_DONE(1);
+            if (pline1->filter[u].cd_nelmts < pline2->filter[u].cd_nelmts)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].cd_nelmts > pline2->filter[u].cd_nelmts)
+                HGOTO_DONE(1);
 
             /* Check the filter parameter information */
-            if(pline1->filter[u].cd_values == NULL && pline2->filter[u].cd_values != NULL) HGOTO_DONE(-1);
-            if(pline1->filter[u].cd_values != NULL && pline2->filter[u].cd_values == NULL) HGOTO_DONE(1);
-            if(pline1->filter[u].cd_values != NULL && pline1->filter[u].cd_nelmts > 0) {
-                size_t v;       /* Local index variable */
+            if (pline1->filter[u].cd_values == NULL && pline2->filter[u].cd_values != NULL)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].cd_values != NULL && pline2->filter[u].cd_values == NULL)
+                HGOTO_DONE(1);
+            if (pline1->filter[u].cd_values != NULL && pline1->filter[u].cd_nelmts > 0) {
+                size_t v; /* Local index variable */
 
                 /* Loop through all parameters, comparing them */
-                for(v = 0; v < pline1->filter[u].cd_nelmts; v++) {
+                for (v = 0; v < pline1->filter[u].cd_nelmts; v++) {
                     /* Check each parameter for the filter */
-                    if(pline1->filter[u].cd_values[v] < pline2->filter[u].cd_values[v]) HGOTO_DONE(-1);
-                    if(pline1->filter[u].cd_values[v] > pline2->filter[u].cd_values[v]) HGOTO_DONE(1);
+                    if (pline1->filter[u].cd_values[v] < pline2->filter[u].cd_values[v])
+                        HGOTO_DONE(-1);
+                    if (pline1->filter[u].cd_values[v] > pline2->filter[u].cd_values[v])
+                        HGOTO_DONE(1);
                 } /* end for */
-            } /* end if */
-        } /* end for */
-    } /* end if */
+            }     /* end if */
+        }         /* end for */
+    }             /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_pipeline_cmp() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_filter1
  *
@@ -1537,57 +1522,56 @@ done:
  *-------------------------------------------------------------------------
  */
 H5Z_filter_t
-H5Pget_filter1(hid_t plist_id, unsigned idx, unsigned int *flags/*out*/,
-	       size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-	       size_t namelen, char name[]/*out*/)
+H5Pget_filter1(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/, size_t *cd_nelmts /*in_out*/,
+               unsigned cd_values[] /*out*/, size_t namelen, char name[] /*out*/)
 {
-    H5O_pline_t         pline;  /* Filter pipeline */
-    const H5Z_filter_info_t *filter;  /* Pointer to filter information */
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5Z_filter_t ret_value;     /* return value */
+    H5O_pline_t              pline;     /* Filter pipeline */
+    const H5Z_filter_info_t *filter;    /* Pointer to filter information */
+    H5P_genplist_t *         plist;     /* Property list pointer */
+    H5Z_filter_t             ret_value; /* return value */
 
     FUNC_ENTER_API(H5Z_FILTER_ERROR)
-    H5TRACE7("Zf", "iIux*zxzx", plist_id, idx, flags, cd_nelmts, cd_values, namelen,
-             name);
+    H5TRACE7("Zf", "iIux*zxzx", plist_id, idx, flags, cd_nelmts, cd_values, namelen, name);
 
     /* Check args */
-    if(cd_nelmts || cd_values) {
+    if (cd_nelmts || cd_values) {
         /*
          * It's likely that users forget to initialize this on input, so
          * we'll check that it has a reasonable value.  The actual number
          * is unimportant because the H5O layer will detect when a message
          * is too large.
          */
-        if(cd_nelmts && *cd_nelmts > 256)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "probable uninitialized *cd_nelmts argument")
-        if(cd_nelmts && *cd_nelmts > 0 && !cd_values)
+        if (cd_nelmts && *cd_nelmts > 256)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR,
+                        "probable uninitialized *cd_nelmts argument")
+        if (cd_nelmts && *cd_nelmts > 0 && !cd_values)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "client data values not supplied")
 
         /*
          * If cd_nelmts is null but cd_values is non-null then just ignore
          * cd_values
          */
-        if(!cd_nelmts)
+        if (!cd_nelmts)
             cd_values = NULL;
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5Z_FILTER_ERROR, "can't find object for ID")
 
     /* Get pipeline info */
-    if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5Z_FILTER_ERROR, "can't get pipeline")
 
     /* Check more args */
-    if(idx >= pline.nused)
+    if (idx >= pline.nused)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "filter number is invalid")
 
     /* Set pointer to particular filter to query */
     filter = &pline.filter[idx];
 
     /* Get filter information */
-    if(H5P_get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, NULL) < 0)
+    if (H5P_get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5Z_FILTER_ERROR, "can't get filter info")
 
     /* Set return value */
@@ -1597,7 +1581,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_filter1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_filter_by_id1
  *
@@ -1620,48 +1603,46 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsigned int *flags/*out*/,
-    size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-    size_t namelen, char name[]/*out*/)
+H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out*/,
+                     size_t *cd_nelmts /*in_out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                     char name[] /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "iZfx*zxzx", plist_id, id, flags, cd_nelmts, cd_values, namelen,
-             name);
+    H5TRACE7("e", "iZfx*zxzx", plist_id, id, flags, cd_nelmts, cd_values, namelen, name);
 
     /* Check args */
-    if(cd_nelmts || cd_values) {
+    if (cd_nelmts || cd_values) {
         /*
          * It's likely that users forget to initialize this on input, so
          * we'll check that it has a reasonable value.  The actual number
          * is unimportant because the H5O layer will detect when a message
          * is too large.
          */
-        if(cd_nelmts && *cd_nelmts > 256)
+        if (cd_nelmts && *cd_nelmts > 256)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "probable uninitialized *cd_nelmts argument")
-        if(cd_nelmts && *cd_nelmts > 0 && !cd_values)
+        if (cd_nelmts && *cd_nelmts > 0 && !cd_values)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "client data values not supplied")
 
         /*
          * If cd_nelmts is null but cd_values is non-null then just ignore
          * cd_values
          */
-        if(!cd_nelmts)
+        if (!cd_nelmts)
             cd_values = NULL;
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get filter info */
-    if(H5P_get_filter_by_id(plist, id, flags, cd_nelmts, cd_values, namelen, name, NULL) < 0)
+    if (H5P_get_filter_by_id(plist, id, flags, cd_nelmts, cd_values, namelen, name, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get filter info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_filter_by_id1() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c
index 544d792..8dfa786 100644
--- a/src/H5Pocpypl.c
+++ b/src/H5Pocpypl.c
@@ -25,20 +25,18 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"        /* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Ppkg.h"      /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
@@ -46,29 +44,30 @@
 
 /* ========= Object Copy properties ============ */
 /* Definitions for copy options */
-#define H5O_CPY_OPTION_SIZE			sizeof(unsigned)
-#define H5O_CPY_OPTION_DEF			0
+#define H5O_CPY_OPTION_SIZE sizeof(unsigned)
+#define H5O_CPY_OPTION_DEF  0
 /* Definitions for merge committed dtype list */
-#define H5O_CPY_MERGE_COMM_DT_LIST_SIZE        sizeof(char *)
-#define H5O_CPY_MERGE_COMM_DT_LIST_DEF         NULL
-#define H5O_CPY_MERGE_COMM_DT_LIST_COPY        H5P__ocpy_merge_comm_dt_list_copy
-#define H5O_CPY_MERGE_COMM_DT_LIST_CMP         H5P__ocpy_merge_comm_dt_list_cmp
-#define H5O_CPY_MERGE_COMM_DT_LIST_CLOSE       H5P__ocpy_merge_comm_dt_list_close
-/* Definitions for callback function when completing the search for a matching committed datatype from the committed dtype list */
-#define H5O_CPY_MCDT_SEARCH_CB_SIZE           sizeof(H5O_mcdt_cb_info_t)
-#define H5O_CPY_MCDT_SEARCH_CB_DEF            {NULL,NULL} 
-
+#define H5O_CPY_MERGE_COMM_DT_LIST_SIZE  sizeof(char *)
+#define H5O_CPY_MERGE_COMM_DT_LIST_DEF   NULL
+#define H5O_CPY_MERGE_COMM_DT_LIST_COPY  H5P__ocpy_merge_comm_dt_list_copy
+#define H5O_CPY_MERGE_COMM_DT_LIST_CMP   H5P__ocpy_merge_comm_dt_list_cmp
+#define H5O_CPY_MERGE_COMM_DT_LIST_CLOSE H5P__ocpy_merge_comm_dt_list_close
+/* Definitions for callback function when completing the search for a matching committed datatype from the
+ * committed dtype list */
+#define H5O_CPY_MCDT_SEARCH_CB_SIZE sizeof(H5O_mcdt_cb_info_t)
+#define H5O_CPY_MCDT_SEARCH_CB_DEF                                                                           \
+    {                                                                                                        \
+        NULL, NULL                                                                                           \
+    }
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -80,10 +79,9 @@ static H5O_copy_dtype_merge_list_t *H5P__free_merge_comm_dtype_list(H5O_copy_dty
 static herr_t H5P__ocpy_reg_prop(H5P_genclass_t *pclass);
 
 /* Property callbacks */
-static herr_t H5P__ocpy_merge_comm_dt_list_copy(const char* name, size_t size, void* value);
-static int H5P__ocpy_merge_comm_dt_list_cmp(const void *value1, const void *value2, size_t size);
-static herr_t H5P__ocpy_merge_comm_dt_list_close(const char* name, size_t size, void* value);
-
+static herr_t H5P__ocpy_merge_comm_dt_list_copy(const char *name, size_t size, void *value);
+static int    H5P__ocpy_merge_comm_dt_list_cmp(const void *value1, const void *value2, size_t size);
+static herr_t H5P__ocpy_merge_comm_dt_list_close(const char *name, size_t size, void *value);
 
 /*********************/
 /* Package Variables */
@@ -91,29 +89,27 @@ static herr_t H5P__ocpy_merge_comm_dt_list_close(const char* name, size_t size,
 
 /* Object copy property list class library initialization object */
 const H5P_libclass_t H5P_CLS_OCPY[1] = {{
-    "object copy",		/* Class name for debugging     */
-    H5P_TYPE_OBJECT_COPY,       /* Class type                   */
-
-    &H5P_CLS_ROOT_g,		/* Parent class                 */
-    &H5P_CLS_OBJECT_COPY_g,	/* Pointer to class             */
-    &H5P_CLS_OBJECT_COPY_ID_g,	/* Pointer to class ID          */
-    &H5P_LST_OBJECT_COPY_ID_g,	/* Pointer to default property list ID */
-    H5P__ocpy_reg_prop,		/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "object copy",        /* Class name for debugging     */
+    H5P_TYPE_OBJECT_COPY, /* Class type                   */
+
+    &H5P_CLS_ROOT_g,           /* Parent class                 */
+    &H5P_CLS_OBJECT_COPY_g,    /* Pointer to class             */
+    &H5P_CLS_OBJECT_COPY_ID_g, /* Pointer to class ID          */
+    &H5P_LST_OBJECT_COPY_ID_g, /* Pointer to default property list ID */
+    H5P__ocpy_reg_prop,        /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -121,8 +117,6 @@ const H5P_libclass_t H5P_CLS_OCPY[1] = {{
 /* Declare a free list to manage the H5O_copy_dtype_merge_list_t struct */
 H5FL_DEFINE(H5O_copy_dtype_merge_list_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__ocpy_reg_prop
  *
@@ -137,30 +131,36 @@ H5FL_DEFINE(H5O_copy_dtype_merge_list_t);
 static herr_t
 H5P__ocpy_reg_prop(H5P_genclass_t *pclass)
 {
-    unsigned ocpy_option = H5O_CPY_OPTION_DEF;  /* Default object copy flags */
-    H5O_copy_dtype_merge_list_t *merge_comm_dtype_list = H5O_CPY_MERGE_COMM_DT_LIST_DEF; /* Default merge committed dtype list */
-    H5O_mcdt_cb_info_t mcdt_cb = H5O_CPY_MCDT_SEARCH_CB_DEF; /* Default callback before searching the global list of committed datatypes at destination */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned                     ocpy_option = H5O_CPY_OPTION_DEF; /* Default object copy flags */
+    H5O_copy_dtype_merge_list_t *merge_comm_dtype_list =
+        H5O_CPY_MERGE_COMM_DT_LIST_DEF;                      /* Default merge committed dtype list */
+    H5O_mcdt_cb_info_t mcdt_cb = H5O_CPY_MCDT_SEARCH_CB_DEF; /* Default callback before searching the global
+                                                                list of committed datatypes at destination */
+    herr_t ret_value = SUCCEED;                              /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register copy options property */
-    if(H5P_register_real(pclass, H5O_CPY_OPTION_NAME, H5O_CPY_OPTION_SIZE, &ocpy_option, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5O_CPY_OPTION_NAME, H5O_CPY_OPTION_SIZE, &ocpy_option, NULL, NULL, NULL,
+                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register merge named dtype list property */
-    if(H5P_register_real(pclass, H5O_CPY_MERGE_COMM_DT_LIST_NAME, H5O_CPY_MERGE_COMM_DT_LIST_SIZE, &merge_comm_dtype_list, NULL, NULL, NULL, NULL, H5O_CPY_MERGE_COMM_DT_LIST_COPY, H5O_CPY_MERGE_COMM_DT_LIST_CMP, H5O_CPY_MERGE_COMM_DT_LIST_CLOSE) < 0)
+    if (H5P_register_real(pclass, H5O_CPY_MERGE_COMM_DT_LIST_NAME, H5O_CPY_MERGE_COMM_DT_LIST_SIZE,
+                          &merge_comm_dtype_list, NULL, NULL, NULL, NULL, H5O_CPY_MERGE_COMM_DT_LIST_COPY,
+                          H5O_CPY_MERGE_COMM_DT_LIST_CMP, H5O_CPY_MERGE_COMM_DT_LIST_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-    /* Register property for callback when completing the search for a matching named datatype from the named dtype list */
-    if(H5P_register_real(pclass, H5O_CPY_MCDT_SEARCH_CB_NAME, H5O_CPY_MCDT_SEARCH_CB_SIZE, &mcdt_cb, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    /* Register property for callback when completing the search for a matching named datatype from the named
+     * dtype list */
+    if (H5P_register_real(pclass, H5O_CPY_MCDT_SEARCH_CB_NAME, H5O_CPY_MCDT_SEARCH_CB_SIZE, &mcdt_cb, NULL,
+                          NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocpy_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__free_merge_comm_dtype_list
  *
@@ -180,7 +180,7 @@ H5P__free_merge_comm_dtype_list(H5O_copy_dtype_merge_list_t *dt_list)
     FUNC_ENTER_STATIC_NOERR
 
     /* Free the list */
-    while(dt_list) {
+    while (dt_list) {
         tmp_node = dt_list->next;
         (void)H5MM_xfree(dt_list->path);
         (void)H5FL_FREE(H5O_copy_dtype_merge_list_t, dt_list);
@@ -190,7 +190,6 @@ H5P__free_merge_comm_dtype_list(H5O_copy_dtype_merge_list_t *dt_list)
     FUNC_LEAVE_NOAPI(NULL);
 } /* H5P__free_merge_comm_dtype_list */
 
-
 /*--------------------------------------------------------------------------
  * Function:	H5P__ocpy_merge_comm_dt_list_copy
  *
@@ -206,13 +205,13 @@ H5P__free_merge_comm_dtype_list(H5O_copy_dtype_merge_list_t *dt_list)
  */
 /* ARGSUSED */
 static herr_t
-H5P__ocpy_merge_comm_dt_list_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size,
-    void *value)
+H5P__ocpy_merge_comm_dt_list_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    const H5O_copy_dtype_merge_list_t *src_dt_list;     /* Source merge named datatype lists */
-    H5O_copy_dtype_merge_list_t *dst_dt_list = NULL;    /* Destination merge named datatype lists */
-    H5O_copy_dtype_merge_list_t *dst_dt_list_tail = NULL, *tmp_dt_list = NULL; /* temporary merge named datatype lists */
-    herr_t         ret_value = SUCCEED;
+    const H5O_copy_dtype_merge_list_t *src_dt_list;             /* Source merge named datatype lists */
+    H5O_copy_dtype_merge_list_t *      dst_dt_list      = NULL; /* Destination merge named datatype lists */
+    H5O_copy_dtype_merge_list_t *      dst_dt_list_tail = NULL,
+                                *tmp_dt_list            = NULL; /* temporary merge named datatype lists */
+    herr_t ret_value                                    = SUCCEED;
 
     FUNC_ENTER_STATIC
 
@@ -220,20 +219,20 @@ H5P__ocpy_merge_comm_dt_list_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATT
 
     /* Make copy of merge committed dtype list */
     src_dt_list = *(const H5O_copy_dtype_merge_list_t **)value;
-    while(src_dt_list) {
+    while (src_dt_list) {
         /* Copy src_dt_list */
-        if(NULL == (tmp_dt_list = H5FL_CALLOC(H5O_copy_dtype_merge_list_t)))
+        if (NULL == (tmp_dt_list = H5FL_CALLOC(H5O_copy_dtype_merge_list_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-        if(NULL == (tmp_dt_list->path = H5MM_strdup(src_dt_list->path)))
+        if (NULL == (tmp_dt_list->path = H5MM_strdup(src_dt_list->path)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /* Add copied node to dest dtype list */
-        if(dst_dt_list_tail) {
+        if (dst_dt_list_tail) {
             dst_dt_list_tail->next = tmp_dt_list;
-            dst_dt_list_tail = tmp_dt_list;
+            dst_dt_list_tail       = tmp_dt_list;
         } /* end if */
         else {
-            dst_dt_list = tmp_dt_list;
+            dst_dt_list      = tmp_dt_list;
             dst_dt_list_tail = tmp_dt_list;
         } /* end else */
         tmp_dt_list = NULL;
@@ -246,18 +245,17 @@ H5P__ocpy_merge_comm_dt_list_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATT
     *(H5O_copy_dtype_merge_list_t **)value = dst_dt_list;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         dst_dt_list = H5P__free_merge_comm_dtype_list(dst_dt_list);
-        if(tmp_dt_list) {
+        if (tmp_dt_list) {
             tmp_dt_list->path = (char *)H5MM_xfree(tmp_dt_list->path);
-            tmp_dt_list = H5FL_FREE(H5O_copy_dtype_merge_list_t, tmp_dt_list);
+            tmp_dt_list       = H5FL_FREE(H5O_copy_dtype_merge_list_t, tmp_dt_list);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocpy_merge_comm_dt_list_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__ocpy_merge_comm_dt_list_cmp
  *
@@ -275,12 +273,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5P__ocpy_merge_comm_dt_list_cmp(const void *_dt_list1, const void *_dt_list2,
-    size_t H5_ATTR_UNUSED size)
+H5P__ocpy_merge_comm_dt_list_cmp(const void *_dt_list1, const void *_dt_list2, size_t H5_ATTR_UNUSED size)
 {
-    const H5O_copy_dtype_merge_list_t *dt_list1 = *(H5O_copy_dtype_merge_list_t * const *)_dt_list1,     /* Create local aliases for values */
-        *dt_list2 = *(H5O_copy_dtype_merge_list_t * const *)_dt_list2;
-    herr_t ret_value = 0;       /* Return value */
+    const H5O_copy_dtype_merge_list_t *dt_list1 = *(H5O_copy_dtype_merge_list_t *const *)
+                                                      _dt_list1, /* Create local aliases for values */
+        *dt_list2    = *(H5O_copy_dtype_merge_list_t *const *)_dt_list2;
+    herr_t ret_value = 0; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -291,10 +289,11 @@ H5P__ocpy_merge_comm_dt_list_cmp(const void *_dt_list1, const void *_dt_list2,
 
     /* Walk through the lists, comparing each path.  For the lists to be the
      * same, the paths must be in the same order. */
-    while(dt_list1 && dt_list2) {
+    while (dt_list1 && dt_list2) {
         /* Compare paths */
         ret_value = HDstrcmp(dt_list1->path, dt_list2->path);
-        if(ret_value != 0) HGOTO_DONE(ret_value)
+        if (ret_value != 0)
+            HGOTO_DONE(ret_value)
 
         /* Advance to next node */
         dt_list1 = dt_list1->next;
@@ -302,14 +301,15 @@ H5P__ocpy_merge_comm_dt_list_cmp(const void *_dt_list1, const void *_dt_list2,
     } /* end while */
 
     /* Check if one list is longer than the other */
-    if(dt_list1) HGOTO_DONE(1)
-    if(dt_list2) HGOTO_DONE(-1)
+    if (dt_list1)
+        HGOTO_DONE(1)
+    if (dt_list2)
+        HGOTO_DONE(-1)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocpy_merge_comm_dt_list_cmp() */
 
-
 /*--------------------------------------------------------------------------
  * Function:	H5P__ocpy_merge_comm_dt_list_close
  *
@@ -337,7 +337,6 @@ H5P__ocpy_merge_comm_dt_list_close(const char H5_ATTR_UNUSED *name, size_t H5_AT
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P__ocpy_merge_comm_dt_list_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_copy_object
  *
@@ -362,29 +361,28 @@ H5P__ocpy_merge_comm_dt_list_close(const char H5_ATTR_UNUSED *name, size_t H5_AT
 herr_t
 H5Pset_copy_object(hid_t plist_id, unsigned cpy_option)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, cpy_option);
 
     /* Check parameters */
-    if(cpy_option & ~H5O_COPY_ALL)
+    if (cpy_option & ~H5O_COPY_ALL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unknown option specified")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set value */
-    if(H5P_set(plist, H5O_CPY_OPTION_NAME, &cpy_option) < 0)
+    if (H5P_set(plist, H5O_CPY_OPTION_NAME, &cpy_option) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set copy object flag")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_copy_object() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_copy_object
  *
@@ -400,26 +398,25 @@ done:
 herr_t
 H5Pget_copy_object(hid_t plist_id, unsigned *cpy_option /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, cpy_option);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(cpy_option)
-        if(H5P_get(plist, H5O_CPY_OPTION_NAME, cpy_option) < 0)
+    if (cpy_option)
+        if (H5P_get(plist, H5O_CPY_OPTION_NAME, cpy_option) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object copy flag")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_copy_object() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Padd_merge_committed_dtype_path
  *
@@ -443,48 +440,47 @@ done:
 herr_t
 H5Padd_merge_committed_dtype_path(hid_t plist_id, const char *path)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5O_copy_dtype_merge_list_t *old_list; 	/* Merge committed dtype list currently present */
-    H5O_copy_dtype_merge_list_t *new_obj = NULL; /* New object to add to list */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *             plist;               /* Property list pointer */
+    H5O_copy_dtype_merge_list_t *old_list;            /* Merge committed dtype list currently present */
+    H5O_copy_dtype_merge_list_t *new_obj   = NULL;    /* New object to add to list */
+    herr_t                       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", plist_id, path);
 
     /* Check parameters */
-    if(!path)
+    if (!path)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no path specified")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get dtype list */
-    if(H5P_get(plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &old_list) < 0)
+    if (H5P_get(plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &old_list) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get merge named dtype list")
 
     /* Add the new path to the list */
-    if(NULL == (new_obj = H5FL_CALLOC(H5O_copy_dtype_merge_list_t)))
+    if (NULL == (new_obj = H5FL_CALLOC(H5O_copy_dtype_merge_list_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    if(NULL == (new_obj->path = H5MM_strdup(path)))
+    if (NULL == (new_obj->path = H5MM_strdup(path)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     new_obj->next = old_list;
 
     /* Update the list stored in the property list */
-    if(H5P_set(plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &new_obj) < 0)
+    if (H5P_set(plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &new_obj) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set merge named dtype list")
 
 done:
-    if(ret_value < 0)
-        if(new_obj) {
+    if (ret_value < 0)
+        if (new_obj) {
             new_obj->path = (char *)H5MM_xfree(new_obj->path);
-            new_obj = H5FL_FREE(H5O_copy_dtype_merge_list_t, new_obj);
+            new_obj       = H5FL_FREE(H5O_copy_dtype_merge_list_t, new_obj);
         } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Padd_merge_committed_dtype_path() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pfree_merge_committed_dtype_paths
  *
@@ -504,33 +500,32 @@ done:
 herr_t
 H5Pfree_merge_committed_dtype_paths(hid_t plist_id)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5O_copy_dtype_merge_list_t *dt_list; /* Merge committed dtype list currently present */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *             plist;               /* Property list pointer */
+    H5O_copy_dtype_merge_list_t *dt_list;             /* Merge committed dtype list currently present */
+    herr_t                       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get dtype list */
-    if(H5P_get(plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &dt_list) < 0)
+    if (H5P_get(plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &dt_list) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get merge committed dtype list")
 
     /* Free dtype list */
     dt_list = H5P__free_merge_comm_dtype_list(dt_list);
 
     /* Update the list stored in the property list (to NULL) */
-    if(H5P_set(plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &dt_list) < 0)
+    if (H5P_set(plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &dt_list) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set merge committed dtype list")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pfree_merge_committed_dtype_paths() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_mcdt_search_cb
  *
@@ -552,39 +547,38 @@ done:
 herr_t
 H5Pset_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t func, void *op_data)
 {
-    H5P_genplist_t *plist;      	/* Property list pointer */
-    H5O_mcdt_cb_info_t cb_info;		/* Callback info struct */
-    herr_t ret_value = SUCCEED; 	/* Return value */
+    H5P_genplist_t *   plist;               /* Property list pointer */
+    H5O_mcdt_cb_info_t cb_info;             /* Callback info struct */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ix*x", plist_id, func, op_data);
 
     /* Check if the callback function is NULL and the user data is non-NULL.
      * This is almost certainly an error as the user data will not be used. */
-    if(!func && op_data)
+    if (!func && op_data)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "callback is NULL while user data is not")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-     /* Populate the callback info struct */
-    cb_info.func = func;
+    /* Populate the callback info struct */
+    cb_info.func      = func;
     cb_info.user_data = op_data;
 
     /* Set callback info */
-    if(H5P_set(plist, H5O_CPY_MCDT_SEARCH_CB_NAME, &cb_info) < 0)
+    if (H5P_set(plist, H5O_CPY_MCDT_SEARCH_CB_NAME, &cb_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set callback info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_mcdt_search_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_mcdt_search_cb
  *
- * Purpose:     Retrieves the callback function and user data from the specified 
+ * Purpose:     Retrieves the callback function and user data from the specified
  *		object copy property list.
  *
  * Usage:       H5Pget_mcdt_search_cb(plist_id, H5O_mcdt_search_cb_t *func, void **op_data)
@@ -601,28 +595,27 @@ done:
 herr_t
 H5Pget_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t *func, void **op_data)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5O_mcdt_cb_info_t cb_info;	/* Callback info struct */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *   plist;               /* Property list pointer */
+    H5O_mcdt_cb_info_t cb_info;             /* Callback info struct */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*x**x", plist_id, func, op_data);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get callback info */
-    if(H5P_get(plist, H5O_CPY_MCDT_SEARCH_CB_NAME, &cb_info) < 0)
+    if (H5P_get(plist, H5O_CPY_MCDT_SEARCH_CB_NAME, &cb_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get callback info")
-    
-    if(func)
-	*func = cb_info.func;
 
-    if(op_data)
-	*op_data = cb_info.user_data;
+    if (func)
+        *func = cb_info.func;
+
+    if (op_data)
+        *op_data = cb_info.user_data;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_mcdt_search_cb() */
-
diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h
index 2160d55..0b264eb 100644
--- a/src/H5Ppkg.h
+++ b/src/H5Ppkg.h
@@ -30,27 +30,26 @@
 #include "H5Pprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5SLprivate.h"	/* Skip lists				*/
+#include "H5SLprivate.h" /* Skip lists				*/
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
-
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
 /* Define enum for type of object that property is within */
 typedef enum {
-    H5P_PROP_WITHIN_UNKNOWN=0,  /* Property container is unknown */
-    H5P_PROP_WITHIN_LIST,       /* Property is within a list */
-    H5P_PROP_WITHIN_CLASS       /* Property is within a class */
+    H5P_PROP_WITHIN_UNKNOWN = 0, /* Property container is unknown */
+    H5P_PROP_WITHIN_LIST,        /* Property is within a list */
+    H5P_PROP_WITHIN_CLASS        /* Property is within a class */
 } H5P_prop_within_t;
 
 /* Define enum for modifications to class */
 typedef enum {
-    H5P_MOD_ERR=(-1),   /* Indicate an error */
+    H5P_MOD_ERR = (-1), /* Indicate an error */
     H5P_MOD_INC_CLS,    /* Increment the dependant class count*/
     H5P_MOD_DEC_CLS,    /* Decrement the dependant class count*/
     H5P_MOD_INC_LST,    /* Increment the dependant list count*/
@@ -63,52 +62,54 @@ typedef enum {
 /* Define structure to hold property information */
 typedef struct H5P_genprop_t {
     /* Values for this property */
-    char *name;         /* Name of property */
-    size_t size;        /* Size of property value */
-    void *value;        /* Pointer to property value */
-    H5P_prop_within_t type;     /* Type of object the property is within */
-    hbool_t shared_name;   /* Whether the name is shared or not */
+    char *            name;        /* Name of property */
+    size_t            size;        /* Size of property value */
+    void *            value;       /* Pointer to property value */
+    H5P_prop_within_t type;        /* Type of object the property is within */
+    hbool_t           shared_name; /* Whether the name is shared or not */
 
     /* Callback function pointers & info */
-    H5P_prp_create_func_t create;   /* Function to call when a property is created */
-    H5P_prp_set_func_t set; /* Function to call when a property value is set */
-    H5P_prp_get_func_t get; /* Function to call when a property value is retrieved */
-    H5P_prp_delete_func_t del; /* Function to call when a property is deleted */
-    H5P_prp_copy_func_t copy;  /* Function to call when a property is copied */
-    H5P_prp_compare_func_t cmp; /* Function to call when a property is compared */
-    H5P_prp_close_func_t close; /* Function to call when a property is closed */
+    H5P_prp_create_func_t  create; /* Function to call when a property is created */
+    H5P_prp_set_func_t     set;    /* Function to call when a property value is set */
+    H5P_prp_get_func_t     get;    /* Function to call when a property value is retrieved */
+    H5P_prp_delete_func_t  del;    /* Function to call when a property is deleted */
+    H5P_prp_copy_func_t    copy;   /* Function to call when a property is copied */
+    H5P_prp_compare_func_t cmp;    /* Function to call when a property is compared */
+    H5P_prp_close_func_t   close;  /* Function to call when a property is closed */
 } H5P_genprop_t;
 
 /* Define structure to hold class information */
 struct H5P_genclass_t {
-    struct H5P_genclass_t *parent;     /* Pointer to parent class */
-    char      *name;       /* Name of property list class */
-    H5P_plist_type_t type; /* Type of property */
-    size_t     nprops;     /* Number of properties in class */
-    unsigned   plists;     /* Number of property lists that have been created since the last modification to the class */
-    unsigned   classes;    /* Number of classes that have been derived since the last modification to the class */
-    unsigned   ref_count;  /* Number of oustanding ID's open on this class object */
-    hbool_t    deleted;    /* Whether this class has been deleted and is waiting for dependent classes & proplists to close */
-    unsigned   revision;   /* Revision number of a particular class (global) */
-    H5SL_t    *props;      /* Skip list containing properties */
+    struct H5P_genclass_t *parent; /* Pointer to parent class */
+    char *                 name;   /* Name of property list class */
+    H5P_plist_type_t       type;   /* Type of property */
+    size_t                 nprops; /* Number of properties in class */
+    unsigned
+             plists; /* Number of property lists that have been created since the last modification to the class */
+    unsigned classes; /* Number of classes that have been derived since the last modification to the class */
+    unsigned ref_count; /* Number of oustanding ID's open on this class object */
+    hbool_t  deleted;  /* Whether this class has been deleted and is waiting for dependent classes & proplists
+                          to close */
+    unsigned revision; /* Revision number of a particular class (global) */
+    H5SL_t * props;    /* Skip list containing properties */
 
     /* Callback function pointers & info */
-    H5P_cls_create_func_t create_func;  /* Function to call when a property list is created */
-    void *create_data;     /* Pointer to user data to pass along to create callback */
-    H5P_cls_copy_func_t copy_func;      /* Function to call when a property list is copied */
-    void *copy_data;       /* Pointer to user data to pass along to copy callback */
-    H5P_cls_close_func_t close_func;    /* Function to call when a property list is closed */
-    void *close_data;      /* Pointer to user data to pass along to close callback */
+    H5P_cls_create_func_t create_func; /* Function to call when a property list is created */
+    void *                create_data; /* Pointer to user data to pass along to create callback */
+    H5P_cls_copy_func_t   copy_func;   /* Function to call when a property list is copied */
+    void *                copy_data;   /* Pointer to user data to pass along to copy callback */
+    H5P_cls_close_func_t  close_func;  /* Function to call when a property list is closed */
+    void *                close_data;  /* Pointer to user data to pass along to close callback */
 };
 
 /* Define structure to hold property list information */
 struct H5P_genplist_t {
-    H5P_genclass_t *pclass; /* Pointer to class info */
-    hid_t   plist_id;   /* Copy of the property list ID (for use in close callback) */
-    size_t  nprops;     /* Number of properties in class */
-    hbool_t class_init; /* Whether the class initialization callback finished successfully */
-    H5SL_t *del;        /* Skip list containing names of deleted properties */
-    H5SL_t *props;      /* Skip list containing properties */
+    H5P_genclass_t *pclass;     /* Pointer to class info */
+    hid_t           plist_id;   /* Copy of the property list ID (for use in close callback) */
+    size_t          nprops;     /* Number of properties in class */
+    hbool_t         class_init; /* Whether the class initialization callback finished successfully */
+    H5SL_t *        del;        /* Skip list containing names of deleted properties */
+    H5SL_t *        props;      /* Skip list containing properties */
 };
 
 /* Function pointer for library classes with properties to register */
@@ -120,22 +121,22 @@ typedef herr_t (*H5P_reg_prop_func_t)(H5P_genclass_t *pclass);
  * class variables and methods used to initialize the class.
  */
 typedef struct H5P_libclass_t {
-    const char	*name;		        /* Class name */
-    H5P_plist_type_t type;              /* Class type */
+    const char *     name; /* Class name */
+    H5P_plist_type_t type; /* Class type */
 
-    H5P_genclass_t * * par_pclass;      /* Pointer to global parent class property list class */
-    H5P_genclass_t * * pclass;          /* Pointer to global property list class */
-    hid_t * const class_id;             /* Pointer to global property list class ID */
-    hid_t * const def_plist_id;         /* Pointer to global default property list ID */
-    H5P_reg_prop_func_t reg_prop_func;  /* Register class's properties */
+    H5P_genclass_t **   par_pclass;    /* Pointer to global parent class property list class */
+    H5P_genclass_t **   pclass;        /* Pointer to global property list class */
+    hid_t *const        class_id;      /* Pointer to global property list class ID */
+    hid_t *const        def_plist_id;  /* Pointer to global default property list ID */
+    H5P_reg_prop_func_t reg_prop_func; /* Register class's properties */
 
     /* Class callback function pointers & info */
-    H5P_cls_create_func_t create_func;  /* Function to call when a property list is created */
-    void *create_data;                  /* Pointer to user data to pass along to create callback */
-    H5P_cls_copy_func_t copy_func;      /* Function to call when a property list is copied */
-    void *copy_data;                    /* Pointer to user data to pass along to copy callback */
-    H5P_cls_close_func_t close_func;    /* Function to call when a property list is closed */
-    void *close_data;                   /* Pointer to user data to pass along to close callback */
+    H5P_cls_create_func_t create_func; /* Function to call when a property list is created */
+    void *                create_data; /* Pointer to user data to pass along to create callback */
+    H5P_cls_copy_func_t   copy_func;   /* Function to call when a property list is copied */
+    void *                copy_data;   /* Pointer to user data to pass along to copy callback */
+    H5P_cls_close_func_t  close_func;  /* Function to call when a property list is closed */
+    void *                close_data;  /* Pointer to user data to pass along to close callback */
 } H5P_libclass_t;
 
 /* Property list/class iterator callback function pointer */
@@ -148,7 +149,6 @@ struct H5Z_filter_info_t;
 /* Package Private Variables */
 /*****************************/
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
@@ -156,57 +156,51 @@ struct H5Z_filter_info_t;
 /* Private functions, not part of the publicly documented API */
 H5_DLL herr_t H5P__term_pub_interface(void);
 H5_DLL herr_t H5P__term_deprec_interface(void);
-H5_DLL H5P_genclass_t *H5P_create_class(H5P_genclass_t *par_class,
-    const char *name, H5P_plist_type_t type,
-    H5P_cls_create_func_t cls_create, void *create_data,
-    H5P_cls_copy_func_t cls_copy, void *copy_data,
-    H5P_cls_close_func_t cls_close, void *close_data);
+H5_DLL H5P_genclass_t *H5P_create_class(H5P_genclass_t *par_class, const char *name, H5P_plist_type_t type,
+                                        H5P_cls_create_func_t cls_create, void *create_data,
+                                        H5P_cls_copy_func_t cls_copy, void *copy_data,
+                                        H5P_cls_close_func_t cls_close, void *close_data);
 H5_DLL H5P_genclass_t *H5P_copy_pclass(H5P_genclass_t *pclass);
-H5_DLL herr_t H5P_register_real(H5P_genclass_t *pclass, const char *name, size_t size,
-    const void *def_value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
-    H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
-    H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
-    H5P_prp_close_func_t prp_close);
-H5_DLL herr_t H5P_register(H5P_genclass_t **pclass, const char *name, size_t size,
-    const void *def_value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
-    H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
-    H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
-    H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5P_register_real(H5P_genclass_t *pclass, const char *name, size_t size, const void *def_value,
+                                H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
+                                H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
+                                H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
+                                H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5P_register(H5P_genclass_t **pclass, const char *name, size_t size, const void *def_value,
+                           H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
+                           H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
+                           H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
+                           H5P_prp_close_func_t prp_close);
 H5_DLL herr_t H5P_add_prop(H5SL_t *props, H5P_genprop_t *prop);
 H5_DLL herr_t H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod);
 H5_DLL htri_t H5P_exist_pclass(H5P_genclass_t *pclass, const char *name);
-H5_DLL herr_t H5P_get_size_plist(const H5P_genplist_t *plist, const char *name,
-    size_t *size);
-H5_DLL herr_t H5P_get_size_pclass(H5P_genclass_t *pclass, const char *name,
-    size_t *size);
+H5_DLL herr_t H5P_get_size_plist(const H5P_genplist_t *plist, const char *name, size_t *size);
+H5_DLL herr_t H5P_get_size_pclass(H5P_genclass_t *pclass, const char *name, size_t *size);
 H5_DLL herr_t H5P_get_nprops_plist(const H5P_genplist_t *plist, size_t *nprops);
-H5_DLL int H5P_cmp_class(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2);
-H5_DLL herr_t H5P_cmp_plist(const H5P_genplist_t *plist1, const H5P_genplist_t *plist2,
-    int *cmp_ret);
-H5_DLL int H5P_iterate_plist(const H5P_genplist_t *plist, hbool_t iter_all_prop,
-    int *idx, H5P_iterate_int_t iter_func, void *iter_data);
-H5_DLL int H5P_iterate_pclass(const H5P_genclass_t *pclass, int *idx,
-    H5P_iterate_int_t iter_func, void *iter_data);
+H5_DLL int    H5P_cmp_class(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2);
+H5_DLL herr_t H5P_cmp_plist(const H5P_genplist_t *plist1, const H5P_genplist_t *plist2, int *cmp_ret);
+H5_DLL int    H5P_iterate_plist(const H5P_genplist_t *plist, hbool_t iter_all_prop, int *idx,
+                                H5P_iterate_int_t iter_func, void *iter_data);
+H5_DLL int    H5P_iterate_pclass(const H5P_genclass_t *pclass, int *idx, H5P_iterate_int_t iter_func,
+                                 void *iter_data);
 H5_DLL herr_t H5P_copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name);
 H5_DLL herr_t H5P_copy_prop_pclass(hid_t dst_id, hid_t src_id, const char *name);
 H5_DLL herr_t H5P_unregister(H5P_genclass_t *pclass, const char *name);
-H5_DLL char *H5P_get_class_path(H5P_genclass_t *pclass);
+H5_DLL char * H5P_get_class_path(H5P_genclass_t *pclass);
 H5_DLL H5P_genclass_t *H5P_open_class_path(const char *path);
 H5_DLL H5P_genclass_t *H5P_get_class_parent(const H5P_genclass_t *pclass);
-H5_DLL herr_t H5P_close_class(void *_pclass);
+H5_DLL herr_t          H5P_close_class(void *_pclass);
 H5_DLL H5P_genprop_t *H5P__find_prop_plist(const H5P_genplist_t *plist, const char *name);
 
 /* Private OCPL routines */
-H5_DLL herr_t H5P_get_filter(const struct H5Z_filter_info_t *filter,
-    unsigned int *flags, size_t *cd_nelmts, unsigned cd_values[],
-    size_t namelen, char name[], unsigned *filter_config);
+H5_DLL herr_t H5P_get_filter(const struct H5Z_filter_info_t *filter, unsigned int *flags, size_t *cd_nelmts,
+                             unsigned cd_values[], size_t namelen, char name[], unsigned *filter_config);
 
 /* Testing functions */
 #ifdef H5P_TESTING
-H5_DLL char *H5P_get_class_path_test(hid_t pclass_id);
-H5_DLL hid_t H5P_open_class_path_test(const char *path);
+H5_DLL char * H5P_get_class_path_test(hid_t pclass_id);
+H5_DLL hid_t  H5P_open_class_path_test(const char *path);
 H5_DLL herr_t H5P_reset_external_file_test(hid_t dcpl_id);
 #endif /* H5P_TESTING */
 
 #endif /* _H5Ppkg_H */
-
diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index 7c6cbcb..9adbf8c 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -21,25 +21,24 @@
 #include "H5Ppublic.h"
 
 /* Private headers needed by this file */
-#include "H5private.h"		/* Generic Functions			*/
+#include "H5private.h" /* Generic Functions			*/
 
 /**************************/
 /* Library Private Macros */
 /**************************/
 
 /* ========  String creation property names ======== */
-#define H5P_STRCRT_CHAR_ENCODING_NAME  "character_encoding"     /* Character set encoding for string */
+#define H5P_STRCRT_CHAR_ENCODING_NAME "character_encoding" /* Character set encoding for string */
 
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5P_PACKAGE
-#define H5P_PLIST_ID(P)     ((P)->plist_id)
-#define H5P_CLASS(P)        ((P)->pclass)
+#define H5P_PLIST_ID(P) ((P)->plist_id)
+#define H5P_CLASS(P)    ((P)->pclass)
 #else /* H5F_PACKAGE */
-#define H5P_PLIST_ID(P)     (H5P_get_plist_id(P))
-#define H5P_CLASS(P)        (H5P_get_class(P))
+#define H5P_PLIST_ID(P) (H5P_get_plist_id(P))
+#define H5P_CLASS(P)    (H5P_get_class(P))
 #endif /* H5P_PACKAGE */
 
-
 /****************************/
 /* Library Private Typedefs */
 /****************************/
@@ -53,24 +52,24 @@ typedef struct H5P_genplist_t H5P_genplist_t;
 typedef struct H5P_genclass_t H5P_genclass_t;
 
 typedef enum H5P_plist_type_t {
-    H5P_TYPE_USER              = 0,
-    H5P_TYPE_ROOT              = 1,
-    H5P_TYPE_OBJECT_CREATE     = 2,
-    H5P_TYPE_FILE_CREATE       = 3,
-    H5P_TYPE_FILE_ACCESS       = 4,
-    H5P_TYPE_DATASET_CREATE    = 5,
-    H5P_TYPE_DATASET_ACCESS    = 6,
-    H5P_TYPE_DATASET_XFER      = 7,
-    H5P_TYPE_FILE_MOUNT        = 8,
-    H5P_TYPE_GROUP_CREATE      = 9,
-    H5P_TYPE_GROUP_ACCESS      = 10,
-    H5P_TYPE_DATATYPE_CREATE   = 11,
-    H5P_TYPE_DATATYPE_ACCESS   = 12,
-    H5P_TYPE_STRING_CREATE     = 13,
-    H5P_TYPE_ATTRIBUTE_CREATE  = 14,
-    H5P_TYPE_OBJECT_COPY       = 15,
-    H5P_TYPE_LINK_CREATE       = 16,
-    H5P_TYPE_LINK_ACCESS       = 17,
+    H5P_TYPE_USER             = 0,
+    H5P_TYPE_ROOT             = 1,
+    H5P_TYPE_OBJECT_CREATE    = 2,
+    H5P_TYPE_FILE_CREATE      = 3,
+    H5P_TYPE_FILE_ACCESS      = 4,
+    H5P_TYPE_DATASET_CREATE   = 5,
+    H5P_TYPE_DATASET_ACCESS   = 6,
+    H5P_TYPE_DATASET_XFER     = 7,
+    H5P_TYPE_FILE_MOUNT       = 8,
+    H5P_TYPE_GROUP_CREATE     = 9,
+    H5P_TYPE_GROUP_ACCESS     = 10,
+    H5P_TYPE_DATATYPE_CREATE  = 11,
+    H5P_TYPE_DATATYPE_ACCESS  = 12,
+    H5P_TYPE_STRING_CREATE    = 13,
+    H5P_TYPE_ATTRIBUTE_CREATE = 14,
+    H5P_TYPE_OBJECT_COPY      = 15,
+    H5P_TYPE_LINK_CREATE      = 16,
+    H5P_TYPE_LINK_ACCESS      = 17,
     H5P_TYPE_MAX_TYPE
 } H5P_plist_type_t;
 
@@ -97,7 +96,6 @@ H5_DLLVAR H5P_genclass_t *H5P_CLS_LINK_CREATE_g;
 H5_DLLVAR H5P_genclass_t *H5P_CLS_LINK_ACCESS_g;
 H5_DLLVAR H5P_genclass_t *H5P_CLS_STRING_CREATE_g;
 
-
 /******************************/
 /* Library Private Prototypes */
 /******************************/
@@ -107,36 +105,31 @@ H5_DLL herr_t H5P_init(void);
 
 /* Internal versions of API routines */
 H5_DLL herr_t H5P_close(void *_plist);
-H5_DLL hid_t H5P_create_id(H5P_genclass_t *pclass, hbool_t app_ref);
-H5_DLL hid_t H5P_copy_plist(const H5P_genplist_t *old_plist, hbool_t app_ref);
+H5_DLL hid_t  H5P_create_id(H5P_genclass_t *pclass, hbool_t app_ref);
+H5_DLL hid_t  H5P_copy_plist(const H5P_genplist_t *old_plist, hbool_t app_ref);
 H5_DLL herr_t H5P_get(const H5P_genplist_t *plist, const char *name, void *value);
 H5_DLL herr_t H5P_set(H5P_genplist_t *plist, const char *name, const void *value);
-H5_DLL herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
-    void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-    H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
-    H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size, void *value,
+                         H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+                         H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+                         H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close);
 H5_DLL herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name);
 H5_DLL htri_t H5P_exist_plist(const H5P_genplist_t *plist, const char *name);
 H5_DLL htri_t H5P_class_isa(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2);
-H5_DLL char *H5P_get_class_name(H5P_genclass_t *pclass);
-H5_DLL herr_t H5P_get_nprops_pclass(const H5P_genclass_t *pclass, size_t *nprops,
-    hbool_t recurse);
-H5_DLL hid_t H5P_get_driver(H5P_genplist_t *plist);
+H5_DLL char * H5P_get_class_name(H5P_genclass_t *pclass);
+H5_DLL herr_t H5P_get_nprops_pclass(const H5P_genclass_t *pclass, size_t *nprops, hbool_t recurse);
+H5_DLL hid_t  H5P_get_driver(H5P_genplist_t *plist);
 H5_DLL void * H5P_get_driver_info(H5P_genplist_t *plist);
-H5_DLL herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id,
-            const void *new_driver_info);
-H5_DLL herr_t H5P_set_vlen_mem_manager(H5P_genplist_t *plist,
-        H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func,
-        void *free_info);
-H5_DLL herr_t H5P_is_fill_value_defined(const struct H5O_fill_t *fill,
-        H5D_fill_value_t *status);
-H5_DLL int H5P_fill_value_cmp(const void *value1, const void *value2,
-    size_t size);
-H5_DLL herr_t H5P_modify_filter(H5P_genplist_t *plist, H5Z_filter_t filter,
-    unsigned flags, size_t cd_nelmts, const unsigned cd_values[]);
-H5_DLL herr_t H5P_get_filter_by_id(H5P_genplist_t *plist, H5Z_filter_t id,
-    unsigned int *flags, size_t *cd_nelmts, unsigned cd_values[],
-    size_t namelen, char name[], unsigned *filter_config);
+H5_DLL herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_driver_info);
+H5_DLL herr_t H5P_set_vlen_mem_manager(H5P_genplist_t *plist, H5MM_allocate_t alloc_func, void *alloc_info,
+                                       H5MM_free_t free_func, void *free_info);
+H5_DLL herr_t H5P_is_fill_value_defined(const struct H5O_fill_t *fill, H5D_fill_value_t *status);
+H5_DLL int    H5P_fill_value_cmp(const void *value1, const void *value2, size_t size);
+H5_DLL herr_t H5P_modify_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned flags, size_t cd_nelmts,
+                                const unsigned cd_values[]);
+H5_DLL herr_t H5P_get_filter_by_id(H5P_genplist_t *plist, H5Z_filter_t id, unsigned int *flags,
+                                   size_t *cd_nelmts, unsigned cd_values[], size_t namelen, char name[],
+                                   unsigned *filter_config);
 H5_DLL htri_t H5P_filter_in_pline(H5P_genplist_t *plist, H5Z_filter_t id);
 
 /* Query internal fields of the property list struct */
@@ -149,15 +142,12 @@ H5_DLL H5P_genplist_t *H5P_object_verify(hid_t plist_id, hid_t pclass_id);
 
 /* Private functions to "peek" at properties of a certain type */
 H5_DLL unsigned H5P_peek_unsigned(H5P_genplist_t *plist, const char *name);
-H5_DLL hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name);
-H5_DLL void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name);
-H5_DLL size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name);
+H5_DLL hid_t    H5P_peek_hid_t(H5P_genplist_t *plist, const char *name);
+H5_DLL void *   H5P_peek_voidp(H5P_genplist_t *plist, const char *name);
+H5_DLL size_t   H5P_peek_size_t(H5P_genplist_t *plist, const char *name);
 
 /* Private DCPL routines */
-H5_DLL herr_t H5P_fill_value_defined(H5P_genplist_t *plist,
-    H5D_fill_value_t *status);
-H5_DLL herr_t H5P_get_fill_value(H5P_genplist_t *plist, const struct H5T_t *type,
-    void *value, hid_t dxpl_id);
+H5_DLL herr_t H5P_fill_value_defined(H5P_genplist_t *plist, H5D_fill_value_t *status);
+H5_DLL herr_t H5P_get_fill_value(H5P_genplist_t *plist, const struct H5T_t *type, void *value, hid_t dxpl_id);
 
 #endif /* _H5Pprivate_H */
-
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index faa6ed8..817e829 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -33,7 +33,6 @@
 #include "H5Tpublic.h"
 #include "H5Zpublic.h"
 
-
 /*****************/
 /* Public Macros */
 /*****************/
@@ -41,57 +40,57 @@
 /* When this header is included from a private HDF5 header, don't make calls to H5open() */
 #undef H5OPEN
 #ifndef _H5private_H
-#define H5OPEN        H5open(),
-#else   /* _H5private_H */
+#define H5OPEN H5open(),
+#else /* _H5private_H */
 #define H5OPEN
-#endif  /* _H5private_H */
+#endif /* _H5private_H */
 
 /*
  * The library's property list classes
  */
 
-#define H5P_ROOT		   	(H5OPEN H5P_CLS_ROOT_ID_g)
-#define H5P_OBJECT_CREATE 		(H5OPEN H5P_CLS_OBJECT_CREATE_ID_g)
-#define H5P_FILE_CREATE 		(H5OPEN H5P_CLS_FILE_CREATE_ID_g)
-#define H5P_FILE_ACCESS 		(H5OPEN H5P_CLS_FILE_ACCESS_ID_g)
-#define H5P_DATASET_CREATE     		(H5OPEN H5P_CLS_DATASET_CREATE_ID_g)
-#define H5P_DATASET_ACCESS     		(H5OPEN H5P_CLS_DATASET_ACCESS_ID_g)
-#define H5P_DATASET_XFER       		(H5OPEN H5P_CLS_DATASET_XFER_ID_g)
-#define H5P_FILE_MOUNT       		(H5OPEN H5P_CLS_FILE_MOUNT_ID_g)
-#define H5P_GROUP_CREATE 		(H5OPEN H5P_CLS_GROUP_CREATE_ID_g)
-#define H5P_GROUP_ACCESS 		(H5OPEN H5P_CLS_GROUP_ACCESS_ID_g)
-#define H5P_DATATYPE_CREATE 		(H5OPEN H5P_CLS_DATATYPE_CREATE_ID_g)
-#define H5P_DATATYPE_ACCESS 		(H5OPEN H5P_CLS_DATATYPE_ACCESS_ID_g)
-#define H5P_STRING_CREATE 		(H5OPEN H5P_CLS_STRING_CREATE_ID_g)
-#define H5P_ATTRIBUTE_CREATE 		(H5OPEN H5P_CLS_ATTRIBUTE_CREATE_ID_g)
-#define H5P_OBJECT_COPY	 		(H5OPEN H5P_CLS_OBJECT_COPY_ID_g)
-#define H5P_LINK_CREATE 		(H5OPEN H5P_CLS_LINK_CREATE_ID_g)
-#define H5P_LINK_ACCESS 		(H5OPEN H5P_CLS_LINK_ACCESS_ID_g)
+#define H5P_ROOT             (H5OPEN H5P_CLS_ROOT_ID_g)
+#define H5P_OBJECT_CREATE    (H5OPEN H5P_CLS_OBJECT_CREATE_ID_g)
+#define H5P_FILE_CREATE      (H5OPEN H5P_CLS_FILE_CREATE_ID_g)
+#define H5P_FILE_ACCESS      (H5OPEN H5P_CLS_FILE_ACCESS_ID_g)
+#define H5P_DATASET_CREATE   (H5OPEN H5P_CLS_DATASET_CREATE_ID_g)
+#define H5P_DATASET_ACCESS   (H5OPEN H5P_CLS_DATASET_ACCESS_ID_g)
+#define H5P_DATASET_XFER     (H5OPEN H5P_CLS_DATASET_XFER_ID_g)
+#define H5P_FILE_MOUNT       (H5OPEN H5P_CLS_FILE_MOUNT_ID_g)
+#define H5P_GROUP_CREATE     (H5OPEN H5P_CLS_GROUP_CREATE_ID_g)
+#define H5P_GROUP_ACCESS     (H5OPEN H5P_CLS_GROUP_ACCESS_ID_g)
+#define H5P_DATATYPE_CREATE  (H5OPEN H5P_CLS_DATATYPE_CREATE_ID_g)
+#define H5P_DATATYPE_ACCESS  (H5OPEN H5P_CLS_DATATYPE_ACCESS_ID_g)
+#define H5P_STRING_CREATE    (H5OPEN H5P_CLS_STRING_CREATE_ID_g)
+#define H5P_ATTRIBUTE_CREATE (H5OPEN H5P_CLS_ATTRIBUTE_CREATE_ID_g)
+#define H5P_OBJECT_COPY      (H5OPEN H5P_CLS_OBJECT_COPY_ID_g)
+#define H5P_LINK_CREATE      (H5OPEN H5P_CLS_LINK_CREATE_ID_g)
+#define H5P_LINK_ACCESS      (H5OPEN H5P_CLS_LINK_ACCESS_ID_g)
 
 /*
  * The library's default property lists
  */
-#define H5P_FILE_CREATE_DEFAULT		(H5OPEN H5P_LST_FILE_CREATE_ID_g)
-#define H5P_FILE_ACCESS_DEFAULT 	(H5OPEN H5P_LST_FILE_ACCESS_ID_g)
-#define H5P_DATASET_CREATE_DEFAULT  	(H5OPEN H5P_LST_DATASET_CREATE_ID_g)
-#define H5P_DATASET_ACCESS_DEFAULT  	(H5OPEN H5P_LST_DATASET_ACCESS_ID_g)
-#define H5P_DATASET_XFER_DEFAULT   	(H5OPEN H5P_LST_DATASET_XFER_ID_g)
-#define H5P_FILE_MOUNT_DEFAULT       	(H5OPEN H5P_LST_FILE_MOUNT_ID_g)
-#define H5P_GROUP_CREATE_DEFAULT	(H5OPEN H5P_LST_GROUP_CREATE_ID_g)
-#define H5P_GROUP_ACCESS_DEFAULT 	(H5OPEN H5P_LST_GROUP_ACCESS_ID_g)
-#define H5P_DATATYPE_CREATE_DEFAULT	(H5OPEN H5P_LST_DATATYPE_CREATE_ID_g)
-#define H5P_DATATYPE_ACCESS_DEFAULT 	(H5OPEN H5P_LST_DATATYPE_ACCESS_ID_g)
-#define H5P_ATTRIBUTE_CREATE_DEFAULT	(H5OPEN H5P_LST_ATTRIBUTE_CREATE_ID_g)
-#define H5P_OBJECT_COPY_DEFAULT		(H5OPEN H5P_LST_OBJECT_COPY_ID_g)
-#define H5P_LINK_CREATE_DEFAULT		(H5OPEN H5P_LST_LINK_CREATE_ID_g)
-#define H5P_LINK_ACCESS_DEFAULT		(H5OPEN H5P_LST_LINK_ACCESS_ID_g)
+#define H5P_FILE_CREATE_DEFAULT      (H5OPEN H5P_LST_FILE_CREATE_ID_g)
+#define H5P_FILE_ACCESS_DEFAULT      (H5OPEN H5P_LST_FILE_ACCESS_ID_g)
+#define H5P_DATASET_CREATE_DEFAULT   (H5OPEN H5P_LST_DATASET_CREATE_ID_g)
+#define H5P_DATASET_ACCESS_DEFAULT   (H5OPEN H5P_LST_DATASET_ACCESS_ID_g)
+#define H5P_DATASET_XFER_DEFAULT     (H5OPEN H5P_LST_DATASET_XFER_ID_g)
+#define H5P_FILE_MOUNT_DEFAULT       (H5OPEN H5P_LST_FILE_MOUNT_ID_g)
+#define H5P_GROUP_CREATE_DEFAULT     (H5OPEN H5P_LST_GROUP_CREATE_ID_g)
+#define H5P_GROUP_ACCESS_DEFAULT     (H5OPEN H5P_LST_GROUP_ACCESS_ID_g)
+#define H5P_DATATYPE_CREATE_DEFAULT  (H5OPEN H5P_LST_DATATYPE_CREATE_ID_g)
+#define H5P_DATATYPE_ACCESS_DEFAULT  (H5OPEN H5P_LST_DATATYPE_ACCESS_ID_g)
+#define H5P_ATTRIBUTE_CREATE_DEFAULT (H5OPEN H5P_LST_ATTRIBUTE_CREATE_ID_g)
+#define H5P_OBJECT_COPY_DEFAULT      (H5OPEN H5P_LST_OBJECT_COPY_ID_g)
+#define H5P_LINK_CREATE_DEFAULT      (H5OPEN H5P_LST_LINK_CREATE_ID_g)
+#define H5P_LINK_ACCESS_DEFAULT      (H5OPEN H5P_LST_LINK_ACCESS_ID_g)
 
 /* Common creation order flags (for links in groups and attributes on objects) */
-#define H5P_CRT_ORDER_TRACKED           0x0001
-#define H5P_CRT_ORDER_INDEXED           0x0002
+#define H5P_CRT_ORDER_TRACKED 0x0001
+#define H5P_CRT_ORDER_INDEXED 0x0002
 
 /* Default value for all property list classes */
-#define H5P_DEFAULT     (hid_t)0
+#define H5P_DEFAULT (hid_t)0
 
 #ifdef __cplusplus
 extern "C" {
@@ -101,11 +100,9 @@ extern "C" {
 /* Public Typedefs */
 /*******************/
 
-
 /* Define property list class callback function pointer types */
 typedef herr_t (*H5P_cls_create_func_t)(hid_t prop_id, void *create_data);
-typedef herr_t (*H5P_cls_copy_func_t)(hid_t new_prop_id, hid_t old_prop_id,
-                                      void *copy_data);
+typedef herr_t (*H5P_cls_copy_func_t)(hid_t new_prop_id, hid_t old_prop_id, void *copy_data);
 typedef herr_t (*H5P_cls_close_func_t)(hid_t prop_id, void *close_data);
 
 /* Define property list callback function pointer types */
@@ -131,38 +128,38 @@ typedef enum H5D_mpio_actual_chunk_opt_mode_t {
     H5D_MPIO_NO_CHUNK_OPTIMIZATION = 0,
     H5D_MPIO_LINK_CHUNK,
     H5D_MPIO_MULTI_CHUNK
-}  H5D_mpio_actual_chunk_opt_mode_t;
+} H5D_mpio_actual_chunk_opt_mode_t;
 
 typedef enum H5D_mpio_actual_io_mode_t {
     /* The following four values are conveniently defined as a bit field so that
      * we can switch from the default to indpendent or collective and then to
-     * mixed without having to check the original value. 
-     * 
-     * NO_COLLECTIVE means that either collective I/O wasn't requested or that 
+     * mixed without having to check the original value.
+     *
+     * NO_COLLECTIVE means that either collective I/O wasn't requested or that
      * no I/O took place.
      *
      * CHUNK_INDEPENDENT means that collective I/O was requested, but the
      * chunk optimization scheme chose independent I/O for each chunk.
      */
-    H5D_MPIO_NO_COLLECTIVE = 0x0,
+    H5D_MPIO_NO_COLLECTIVE     = 0x0,
     H5D_MPIO_CHUNK_INDEPENDENT = 0x1,
-    H5D_MPIO_CHUNK_COLLECTIVE = 0x2,
-    H5D_MPIO_CHUNK_MIXED = 0x1 | 0x2,
+    H5D_MPIO_CHUNK_COLLECTIVE  = 0x2,
+    H5D_MPIO_CHUNK_MIXED       = 0x1 | 0x2,
 
     /* The contiguous case is separate from the bit field. */
     H5D_MPIO_CONTIGUOUS_COLLECTIVE = 0x4
-} H5D_mpio_actual_io_mode_t; 
+} H5D_mpio_actual_io_mode_t;
 
 /* Broken collective IO property */
 typedef enum H5D_mpio_no_collective_cause_t {
-    H5D_MPIO_COLLECTIVE = 0x00,
-    H5D_MPIO_SET_INDEPENDENT = 0x01,
-    H5D_MPIO_DATATYPE_CONVERSION = 0x02,
-    H5D_MPIO_DATA_TRANSFORMS = 0x04,
-    H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED = 0x08,
-    H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES = 0x10,
+    H5D_MPIO_COLLECTIVE                        = 0x00,
+    H5D_MPIO_SET_INDEPENDENT                   = 0x01,
+    H5D_MPIO_DATATYPE_CONVERSION               = 0x02,
+    H5D_MPIO_DATA_TRANSFORMS                   = 0x04,
+    H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED    = 0x08,
+    H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES   = 0x10,
     H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET = 0x20,
-    H5D_MPIO_FILTERS = 0x40
+    H5D_MPIO_FILTERS                           = 0x40
 } H5D_mpio_no_collective_cause_t;
 
 /********************/
@@ -211,38 +208,36 @@ H5_DLLVAR hid_t H5P_LST_LINK_ACCESS_ID_g;
 /*********************/
 
 /* Generic property list routines */
-H5_DLL hid_t H5Pcreate_class(hid_t parent, const char *name,
-    H5P_cls_create_func_t cls_create, void *create_data,
-    H5P_cls_copy_func_t cls_copy, void *copy_data,
-    H5P_cls_close_func_t cls_close, void *close_data);
-H5_DLL char *H5Pget_class_name(hid_t pclass_id);
-H5_DLL hid_t H5Pcreate(hid_t cls_id);
-H5_DLL herr_t H5Pregister2(hid_t cls_id, const char *name, size_t size,
-    void *def_value, H5P_prp_create_func_t prp_create,
-    H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-    H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t prp_copy,
-    H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close);
-H5_DLL herr_t H5Pinsert2(hid_t plist_id, const char *name, size_t size,
-    void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-    H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
-    H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close);
+H5_DLL hid_t  H5Pcreate_class(hid_t parent, const char *name, H5P_cls_create_func_t cls_create,
+                              void *create_data, H5P_cls_copy_func_t cls_copy, void *copy_data,
+                              H5P_cls_close_func_t cls_close, void *close_data);
+H5_DLL char * H5Pget_class_name(hid_t pclass_id);
+H5_DLL hid_t  H5Pcreate(hid_t cls_id);
+H5_DLL herr_t H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value,
+                           H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
+                           H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_del,
+                           H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp,
+                           H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value,
+                         H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+                         H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+                         H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close);
 H5_DLL herr_t H5Pset(hid_t plist_id, const char *name, void *value);
 H5_DLL htri_t H5Pexist(hid_t plist_id, const char *name);
 H5_DLL herr_t H5Pget_size(hid_t id, const char *name, size_t *size);
 H5_DLL herr_t H5Pget_nprops(hid_t id, size_t *nprops);
-H5_DLL hid_t H5Pget_class(hid_t plist_id);
-H5_DLL hid_t H5Pget_class_parent(hid_t pclass_id);
-H5_DLL herr_t H5Pget(hid_t plist_id, const char *name, void * value);
+H5_DLL hid_t  H5Pget_class(hid_t plist_id);
+H5_DLL hid_t  H5Pget_class_parent(hid_t pclass_id);
+H5_DLL herr_t H5Pget(hid_t plist_id, const char *name, void *value);
 H5_DLL htri_t H5Pequal(hid_t id1, hid_t id2);
 H5_DLL htri_t H5Pisa_class(hid_t plist_id, hid_t pclass_id);
-H5_DLL int H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func,
-            void *iter_data);
+H5_DLL int    H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data);
 H5_DLL herr_t H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name);
 H5_DLL herr_t H5Premove(hid_t plist_id, const char *name);
 H5_DLL herr_t H5Punregister(hid_t pclass_id, const char *name);
 H5_DLL herr_t H5Pclose_class(hid_t plist_id);
 H5_DLL herr_t H5Pclose(hid_t plist_id);
-H5_DLL hid_t H5Pcopy(hid_t plist_id);
+H5_DLL hid_t  H5Pcopy(hid_t plist_id);
 
 /* Object creation property list (OCPL) routines */
 H5_DLL herr_t H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense);
@@ -251,172 +246,135 @@ H5_DLL herr_t H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flag
 H5_DLL herr_t H5Pget_attr_creation_order(hid_t plist_id, unsigned *crt_order_flags);
 H5_DLL herr_t H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times);
 H5_DLL herr_t H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times);
-H5_DLL herr_t H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter,
-        unsigned int flags, size_t cd_nelmts,
-        const unsigned int cd_values[/*cd_nelmts*/]);
-H5_DLL herr_t H5Pset_filter(hid_t plist_id, H5Z_filter_t filter,
-        unsigned int flags, size_t cd_nelmts,
-        const unsigned int c_values[]);
-H5_DLL int H5Pget_nfilters(hid_t plist_id);
-H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned filter,
-       unsigned int *flags/*out*/,
-       size_t *cd_nelmts/*out*/,
-       unsigned cd_values[]/*out*/,
-       size_t namelen, char name[],
-       unsigned *filter_config /*out*/);
-H5_DLL herr_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id,
-       unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
-       unsigned cd_values[]/*out*/, size_t namelen, char name[]/*out*/,
-       unsigned *filter_config/*out*/);
-H5_DLL htri_t H5Pall_filters_avail(hid_t plist_id);
-H5_DLL herr_t H5Premove_filter(hid_t plist_id, H5Z_filter_t filter);
-H5_DLL herr_t H5Pset_deflate(hid_t plist_id, unsigned aggression);
-H5_DLL herr_t H5Pset_fletcher32(hid_t plist_id);
+H5_DLL herr_t H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+                               const unsigned int cd_values[/*cd_nelmts*/]);
+H5_DLL herr_t H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+                            const unsigned int c_values[]);
+H5_DLL int    H5Pget_nfilters(hid_t plist_id);
+H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned filter, unsigned int *flags /*out*/,
+                                   size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                                   char name[], unsigned *filter_config /*out*/);
+H5_DLL herr_t       H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out*/,
+                                         size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                                         char name[] /*out*/, unsigned *filter_config /*out*/);
+H5_DLL htri_t       H5Pall_filters_avail(hid_t plist_id);
+H5_DLL herr_t       H5Premove_filter(hid_t plist_id, H5Z_filter_t filter);
+H5_DLL herr_t       H5Pset_deflate(hid_t plist_id, unsigned aggression);
+H5_DLL herr_t       H5Pset_fletcher32(hid_t plist_id);
 
 /* File creation property list (FCPL) routines */
-H5_DLL herr_t H5Pget_version(hid_t plist_id, unsigned *boot/*out*/,
-         unsigned *freelist/*out*/, unsigned *stab/*out*/,
-         unsigned *shhdr/*out*/);
+H5_DLL herr_t H5Pget_version(hid_t plist_id, unsigned *boot /*out*/, unsigned *freelist /*out*/,
+                             unsigned *stab /*out*/, unsigned *shhdr /*out*/);
 H5_DLL herr_t H5Pset_userblock(hid_t plist_id, hsize_t size);
 H5_DLL herr_t H5Pget_userblock(hid_t plist_id, hsize_t *size);
-H5_DLL herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr,
-       size_t sizeof_size);
-H5_DLL herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr/*out*/,
-       size_t *sizeof_size/*out*/);
+H5_DLL herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size);
+H5_DLL herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr /*out*/, size_t *sizeof_size /*out*/);
 H5_DLL herr_t H5Pset_sym_k(hid_t plist_id, unsigned ik, unsigned lk);
-H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, unsigned *ik/*out*/, unsigned *lk/*out*/);
+H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out*/, unsigned *lk /*out*/);
 H5_DLL herr_t H5Pset_istore_k(hid_t plist_id, unsigned ik);
-H5_DLL herr_t H5Pget_istore_k(hid_t plist_id, unsigned *ik/*out*/);
+H5_DLL herr_t H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out*/);
 H5_DLL herr_t H5Pset_shared_mesg_nindexes(hid_t plist_id, unsigned nindexes);
 H5_DLL herr_t H5Pget_shared_mesg_nindexes(hid_t plist_id, unsigned *nindexes);
-H5_DLL herr_t H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_flags, unsigned min_mesg_size);
-H5_DLL herr_t H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type_flags, unsigned *min_mesg_size);
+H5_DLL herr_t H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_flags,
+                                       unsigned min_mesg_size);
+H5_DLL herr_t H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type_flags,
+                                       unsigned *min_mesg_size);
 H5_DLL herr_t H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_btree);
 H5_DLL herr_t H5Pget_shared_mesg_phase_change(hid_t plist_id, unsigned *max_list, unsigned *min_btree);
 
 /* File access property list (FAPL) routines */
-H5_DLL herr_t H5Pset_alignment(hid_t fapl_id, hsize_t threshold,
-    hsize_t alignment);
-H5_DLL herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
-    hsize_t *alignment/*out*/);
-H5_DLL herr_t H5Pset_driver(hid_t plist_id, hid_t driver_id,
-        const void *driver_info);
-H5_DLL hid_t H5Pget_driver(hid_t plist_id);
-H5_DLL void *H5Pget_driver_info(hid_t plist_id);
+H5_DLL herr_t H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment);
+H5_DLL herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold /*out*/, hsize_t *alignment /*out*/);
+H5_DLL herr_t H5Pset_driver(hid_t plist_id, hid_t driver_id, const void *driver_info);
+H5_DLL hid_t  H5Pget_driver(hid_t plist_id);
+H5_DLL void * H5Pget_driver_info(hid_t plist_id);
 H5_DLL herr_t H5Pset_family_offset(hid_t fapl_id, hsize_t offset);
 H5_DLL herr_t H5Pget_family_offset(hid_t fapl_id, hsize_t *offset);
 H5_DLL herr_t H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type);
 H5_DLL herr_t H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type);
-H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts,
-       size_t rdcc_nslots, size_t rdcc_nbytes,
-       double rdcc_w0);
-H5_DLL herr_t H5Pget_cache(hid_t plist_id,
-       int *mdc_nelmts, /* out */
-       size_t *rdcc_nslots/*out*/,
-       size_t *rdcc_nbytes/*out*/, double *rdcc_w0);
-H5_DLL herr_t H5Pset_mdc_config(hid_t    plist_id,
-       H5AC_cache_config_t * config_ptr);
-H5_DLL herr_t H5Pget_mdc_config(hid_t     plist_id,
-       H5AC_cache_config_t * config_ptr);	/* out */
+H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nslots, size_t rdcc_nbytes,
+                           double rdcc_w0);
+H5_DLL herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts, /* out */
+                           size_t *rdcc_nslots /*out*/, size_t *rdcc_nbytes /*out*/, double *rdcc_w0);
+H5_DLL herr_t H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr);
+H5_DLL herr_t H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr); /* out */
 H5_DLL herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
-H5_DLL herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref/*out*/);
+H5_DLL herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref /*out*/);
 H5_DLL herr_t H5Pset_fclose_degree(hid_t fapl_id, H5F_close_degree_t degree);
 H5_DLL herr_t H5Pget_fclose_degree(hid_t fapl_id, H5F_close_degree_t *degree);
 H5_DLL herr_t H5Pset_meta_block_size(hid_t fapl_id, hsize_t size);
-H5_DLL herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size/*out*/);
+H5_DLL herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size /*out*/);
 H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size);
-H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size/*out*/);
+H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size /*out*/);
 H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
-H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size/*out*/);
-H5_DLL herr_t H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
-    H5F_libver_t high);
-H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low,
-    H5F_libver_t *high);
+H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size /*out*/);
+H5_DLL herr_t H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low, H5F_libver_t high);
+H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low, H5F_libver_t *high);
 H5_DLL herr_t H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size);
 H5_DLL herr_t H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size);
 H5_DLL herr_t H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len);
 H5_DLL herr_t H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr);
-H5_DLL herr_t H5Pset_file_image_callbacks(hid_t fapl_id,
-       H5FD_file_image_callbacks_t *callbacks_ptr);
-H5_DLL herr_t H5Pget_file_image_callbacks(hid_t fapl_id,
-       H5FD_file_image_callbacks_t *callbacks_ptr);
+H5_DLL herr_t H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
+H5_DLL herr_t H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
 
 H5_DLL herr_t H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size_t page_size);
 H5_DLL herr_t H5Pget_core_write_tracking(hid_t fapl_id, hbool_t *is_enabled, size_t *page_size);
 
 /* Dataset creation property list (DCPL) routines */
-H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
+H5_DLL herr_t       H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
 H5_DLL H5D_layout_t H5Pget_layout(hid_t plist_id);
-H5_DLL herr_t H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/]);
-H5_DLL int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
-H5_DLL herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset,
-          hsize_t size);
-H5_DLL int H5Pget_external_count(hid_t plist_id);
-H5_DLL herr_t H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size,
-          char *name/*out*/, off_t *offset/*out*/,
-          hsize_t *size/*out*/);
-H5_DLL herr_t H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block);
-H5_DLL herr_t H5Pset_shuffle(hid_t plist_id);
-H5_DLL herr_t H5Pset_nbit(hid_t plist_id);
-H5_DLL herr_t H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_factor);
-H5_DLL herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id,
-     const void *value);
-H5_DLL herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id,
-     void *value/*out*/);
-H5_DLL herr_t H5Pfill_value_defined(hid_t plist, H5D_fill_value_t *status);
-H5_DLL herr_t H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t
-	alloc_time);
-H5_DLL herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t
-	*alloc_time/*out*/);
-H5_DLL herr_t H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time);
-H5_DLL herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t
-	*fill_time/*out*/);
+H5_DLL herr_t       H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/]);
+H5_DLL int          H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[] /*out*/);
+H5_DLL herr_t       H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size);
+H5_DLL int          H5Pget_external_count(hid_t plist_id);
+H5_DLL herr_t       H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name /*out*/,
+                                    off_t *offset /*out*/, hsize_t *size /*out*/);
+H5_DLL herr_t       H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block);
+H5_DLL herr_t       H5Pset_shuffle(hid_t plist_id);
+H5_DLL herr_t       H5Pset_nbit(hid_t plist_id);
+H5_DLL herr_t       H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_factor);
+H5_DLL herr_t       H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value);
+H5_DLL herr_t       H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value /*out*/);
+H5_DLL herr_t       H5Pfill_value_defined(hid_t plist, H5D_fill_value_t *status);
+H5_DLL herr_t       H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time);
+H5_DLL herr_t       H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time /*out*/);
+H5_DLL herr_t       H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time);
+H5_DLL herr_t       H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time /*out*/);
 
 /* Dataset access property list (DAPL) routines */
-H5_DLL herr_t H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots,
-       size_t rdcc_nbytes, double rdcc_w0);
-H5_DLL herr_t H5Pget_chunk_cache(hid_t dapl_id,
-       size_t *rdcc_nslots/*out*/,
-       size_t *rdcc_nbytes/*out*/,
-       double *rdcc_w0/*out*/);
-H5_DLL herr_t H5Pset_efile_prefix(hid_t dapl_id, const char* prefix);
-H5_DLL ssize_t H5Pget_efile_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size);
+H5_DLL herr_t  H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0);
+H5_DLL herr_t  H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots /*out*/, size_t *rdcc_nbytes /*out*/,
+                                  double *rdcc_w0 /*out*/);
+H5_DLL herr_t  H5Pset_efile_prefix(hid_t dapl_id, const char *prefix);
+H5_DLL ssize_t H5Pget_efile_prefix(hid_t dapl_id, char *prefix /*out*/, size_t size);
 
 /* Dataset xfer property list (DXPL) routines */
-H5_DLL herr_t H5Pset_data_transform(hid_t plist_id, const char* expression);
-H5_DLL ssize_t H5Pget_data_transform(hid_t plist_id, char* expression /*out*/, size_t size);
-H5_DLL herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv,
-        void *bkg);
-H5_DLL size_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/,
-        void **bkg/*out*/);
-H5_DLL herr_t H5Pset_preserve(hid_t plist_id, hbool_t status);
-H5_DLL int H5Pget_preserve(hid_t plist_id);
-H5_DLL herr_t H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check);
+H5_DLL herr_t    H5Pset_data_transform(hid_t plist_id, const char *expression);
+H5_DLL ssize_t   H5Pget_data_transform(hid_t plist_id, char *expression /*out*/, size_t size);
+H5_DLL herr_t    H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg);
+H5_DLL size_t    H5Pget_buffer(hid_t plist_id, void **tconv /*out*/, void **bkg /*out*/);
+H5_DLL herr_t    H5Pset_preserve(hid_t plist_id, hbool_t status);
+H5_DLL int       H5Pget_preserve(hid_t plist_id);
+H5_DLL herr_t    H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check);
 H5_DLL H5Z_EDC_t H5Pget_edc_check(hid_t plist_id);
-H5_DLL herr_t H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func,
-                                     void* op_data);
-H5_DLL herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
-       double right);
-H5_DLL herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/,
-       double *middle/*out*/,
-       double *right/*out*/);
-H5_DLL herr_t H5Pset_vlen_mem_manager(hid_t plist_id,
-                                       H5MM_allocate_t alloc_func,
-                                       void *alloc_info, H5MM_free_t free_func,
-                                       void *free_info);
-H5_DLL herr_t H5Pget_vlen_mem_manager(hid_t plist_id,
-                                       H5MM_allocate_t *alloc_func,
-                                       void **alloc_info,
-                                       H5MM_free_t *free_func,
-                                       void **free_info);
-H5_DLL herr_t H5Pset_hyper_vector_size(hid_t fapl_id, size_t size);
-H5_DLL herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size/*out*/);
-H5_DLL herr_t H5Pset_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t op, void* operate_data);
-H5_DLL herr_t H5Pget_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t *op, void** operate_data);
+H5_DLL herr_t    H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, void *op_data);
+H5_DLL herr_t    H5Pset_btree_ratios(hid_t plist_id, double left, double middle, double right);
+H5_DLL herr_t    H5Pget_btree_ratios(hid_t plist_id, double *left /*out*/, double *middle /*out*/,
+                                     double *right /*out*/);
+H5_DLL herr_t    H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func, void *alloc_info,
+                                         H5MM_free_t free_func, void *free_info);
+H5_DLL herr_t    H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func, void **alloc_info,
+                                         H5MM_free_t *free_func, void **free_info);
+H5_DLL herr_t    H5Pset_hyper_vector_size(hid_t fapl_id, size_t size);
+H5_DLL herr_t    H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size /*out*/);
+H5_DLL herr_t    H5Pset_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t op, void *operate_data);
+H5_DLL herr_t    H5Pget_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t *op, void **operate_data);
 #ifdef H5_HAVE_PARALLEL
-H5_DLL herr_t H5Pget_mpio_actual_chunk_opt_mode(hid_t plist_id, H5D_mpio_actual_chunk_opt_mode_t *actual_chunk_opt_mode);
+H5_DLL herr_t H5Pget_mpio_actual_chunk_opt_mode(hid_t                             plist_id,
+                                                H5D_mpio_actual_chunk_opt_mode_t *actual_chunk_opt_mode);
 H5_DLL herr_t H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t *actual_io_mode);
-H5_DLL herr_t H5Pget_mpio_no_collective_cause(hid_t plist_id, uint32_t *local_no_collective_cause, uint32_t *global_no_collective_cause);
+H5_DLL herr_t H5Pget_mpio_no_collective_cause(hid_t plist_id, uint32_t *local_no_collective_cause,
+                                              uint32_t *global_no_collective_cause);
 #endif /* H5_HAVE_PARALLEL */
 
 /* Link creation property list (LCPL) routines */
@@ -427,9 +385,11 @@ H5_DLL herr_t H5Pget_create_intermediate_group(hid_t plist_id, unsigned *crt_int
 H5_DLL herr_t H5Pset_local_heap_size_hint(hid_t plist_id, size_t size_hint);
 H5_DLL herr_t H5Pget_local_heap_size_hint(hid_t plist_id, size_t *size_hint /*out*/);
 H5_DLL herr_t H5Pset_link_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense);
-H5_DLL herr_t H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact /*out*/, unsigned *min_dense /*out*/);
+H5_DLL herr_t H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact /*out*/,
+                                       unsigned *min_dense /*out*/);
 H5_DLL herr_t H5Pset_est_link_info(hid_t plist_id, unsigned est_num_entries, unsigned est_name_len);
-H5_DLL herr_t H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries /* out */, unsigned *est_name_len /* out */);
+H5_DLL herr_t H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries /* out */,
+                                   unsigned *est_name_len /* out */);
 H5_DLL herr_t H5Pset_link_creation_order(hid_t plist_id, unsigned crt_order_flags);
 H5_DLL herr_t H5Pget_link_creation_order(hid_t plist_id, unsigned *crt_order_flags /* out */);
 
@@ -438,16 +398,16 @@ H5_DLL herr_t H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding);
 H5_DLL herr_t H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/);
 
 /* Link access property list (LAPL) routines */
-H5_DLL herr_t H5Pset_nlinks(hid_t plist_id, size_t nlinks);
-H5_DLL herr_t H5Pget_nlinks(hid_t plist_id, size_t *nlinks);
-H5_DLL herr_t H5Pset_elink_prefix(hid_t plist_id, const char *prefix);
+H5_DLL herr_t  H5Pset_nlinks(hid_t plist_id, size_t nlinks);
+H5_DLL herr_t  H5Pget_nlinks(hid_t plist_id, size_t *nlinks);
+H5_DLL herr_t  H5Pset_elink_prefix(hid_t plist_id, const char *prefix);
 H5_DLL ssize_t H5Pget_elink_prefix(hid_t plist_id, char *prefix, size_t size);
-H5_DLL hid_t H5Pget_elink_fapl(hid_t lapl_id);
-H5_DLL herr_t H5Pset_elink_fapl(hid_t lapl_id, hid_t fapl_id);
-H5_DLL herr_t H5Pset_elink_acc_flags(hid_t lapl_id, unsigned flags);
-H5_DLL herr_t H5Pget_elink_acc_flags(hid_t lapl_id, unsigned *flags);
-H5_DLL herr_t H5Pset_elink_cb(hid_t lapl_id, H5L_elink_traverse_t func, void *op_data);
-H5_DLL herr_t H5Pget_elink_cb(hid_t lapl_id, H5L_elink_traverse_t *func, void **op_data);
+H5_DLL hid_t   H5Pget_elink_fapl(hid_t lapl_id);
+H5_DLL herr_t  H5Pset_elink_fapl(hid_t lapl_id, hid_t fapl_id);
+H5_DLL herr_t  H5Pset_elink_acc_flags(hid_t lapl_id, unsigned flags);
+H5_DLL herr_t  H5Pget_elink_acc_flags(hid_t lapl_id, unsigned *flags);
+H5_DLL herr_t  H5Pset_elink_cb(hid_t lapl_id, H5L_elink_traverse_t func, void *op_data);
+H5_DLL herr_t  H5Pget_elink_cb(hid_t lapl_id, H5L_elink_traverse_t *func, void **op_data);
 
 /* Object copy property list (OCPYPL) routines */
 H5_DLL herr_t H5Pset_copy_object(hid_t plist_id, unsigned crt_intmd);
@@ -466,28 +426,25 @@ H5_DLL herr_t H5Pget_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t *func,
 /* Macros */
 
 /* We renamed the "root" of the property list class hierarchy */
-#define H5P_NO_CLASS            H5P_ROOT
-
+#define H5P_NO_CLASS H5P_ROOT
 
 /* Typedefs */
 
-
 /* Function prototypes */
-H5_DLL herr_t H5Pregister1(hid_t cls_id, const char *name, size_t size,
-    void *def_value, H5P_prp_create_func_t prp_create,
-    H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-    H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t prp_copy,
-    H5P_prp_close_func_t prp_close);
-H5_DLL herr_t H5Pinsert1(hid_t plist_id, const char *name, size_t size,
-    void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-    H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
-    H5P_prp_close_func_t prp_close);
-H5_DLL H5Z_filter_t H5Pget_filter1(hid_t plist_id, unsigned filter,
-    unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
-    unsigned cd_values[]/*out*/, size_t namelen, char name[]);
-H5_DLL herr_t H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id,
-    unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
-    unsigned cd_values[]/*out*/, size_t namelen, char name[]/*out*/);
+H5_DLL herr_t       H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
+                                 H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
+                                 H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_del,
+                                 H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close);
+H5_DLL herr_t       H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
+                               H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+                               H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+                               H5P_prp_close_func_t prp_close);
+H5_DLL H5Z_filter_t H5Pget_filter1(hid_t plist_id, unsigned filter, unsigned int *flags /*out*/,
+                                   size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                                   char name[]);
+H5_DLL herr_t       H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out*/,
+                                         size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                                         char name[] /*out*/);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
@@ -495,4 +452,3 @@ H5_DLL herr_t H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id,
 }
 #endif
 #endif /* _H5Ppublic_H */
-
diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c
index 2aa9b35..bc3b614 100644
--- a/src/H5Pstrcpl.c
+++ b/src/H5Pstrcpl.c
@@ -25,17 +25,16 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Fprivate.h" /* Files */
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
 
 /****************/
 /* Local Macros */
@@ -43,20 +42,17 @@
 
 /* ========  String creation properties ======== */
 /* Definitions for character set encoding property */
-#define H5P_STRCRT_CHAR_ENCODING_SIZE  sizeof(H5T_cset_t)
-#define H5P_STRCRT_CHAR_ENCODING_DEF   H5F_DEFAULT_CSET
-
+#define H5P_STRCRT_CHAR_ENCODING_SIZE sizeof(H5T_cset_t)
+#define H5P_STRCRT_CHAR_ENCODING_DEF  H5F_DEFAULT_CSET
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -64,42 +60,37 @@
 /* Property class callbacks */
 static herr_t H5P__strcrt_reg_prop(H5P_genclass_t *pclass);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
 /* String creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_STRCRT[1] = {{
-    "string create",		/* Class name for debugging     */
-    H5P_TYPE_STRING_CREATE,     /* Class type                   */
-
-    &H5P_CLS_ROOT_g,		/* Parent class                 */
-    &H5P_CLS_STRING_CREATE_g,	/* Pointer to class             */
-    &H5P_CLS_STRING_CREATE_ID_g,	/* Pointer to class ID          */
-    NULL,			/* Pointer to default property list ID */
-    H5P__strcrt_reg_prop,	/* Default property registration routine */
-
-    NULL,		        /* Class creation callback      */
-    NULL,		        /* Class creation callback info */
-    NULL,			/* Class copy callback          */
-    NULL,		        /* Class copy callback info     */
-    NULL,			/* Class close callback         */
-    NULL 		        /* Class close callback info    */
+    "string create",        /* Class name for debugging     */
+    H5P_TYPE_STRING_CREATE, /* Class type                   */
+
+    &H5P_CLS_ROOT_g,             /* Parent class                 */
+    &H5P_CLS_STRING_CREATE_g,    /* Pointer to class             */
+    &H5P_CLS_STRING_CREATE_ID_g, /* Pointer to class ID          */
+    NULL,                        /* Pointer to default property list ID */
+    H5P__strcrt_reg_prop,        /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__strcrt_reg_prop
  *
@@ -114,20 +105,20 @@ const H5P_libclass_t H5P_CLS_STRCRT[1] = {{
 static herr_t
 H5P__strcrt_reg_prop(H5P_genclass_t *pclass)
 {
-    H5T_cset_t char_encoding = H5P_STRCRT_CHAR_ENCODING_DEF;  /* Default character set encoding */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5T_cset_t char_encoding = H5P_STRCRT_CHAR_ENCODING_DEF; /* Default character set encoding */
+    herr_t     ret_value     = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register character encoding */
-    if(H5P_register_real(pclass, H5P_STRCRT_CHAR_ENCODING_NAME, H5P_STRCRT_CHAR_ENCODING_SIZE, &char_encoding, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+    if (H5P_register_real(pclass, H5P_STRCRT_CHAR_ENCODING_NAME, H5P_STRCRT_CHAR_ENCODING_SIZE,
+                          &char_encoding, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__strcrt_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_char_encoding
  *
@@ -142,8 +133,8 @@ done:
 herr_t
 H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iTc", plist_id, encoding);
@@ -153,18 +144,17 @@ H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "character encoding is not valid")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_STRING_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_STRING_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set the character encoding */
-    if(H5P_set(plist, H5P_STRCRT_CHAR_ENCODING_NAME, &encoding) < 0)
+    if (H5P_set(plist, H5P_STRCRT_CHAR_ENCODING_NAME, &encoding) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set character encoding")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5P_set_char_encoding() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_char_encoding
  *
@@ -179,22 +169,21 @@ done:
 herr_t
 H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, encoding);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_STRING_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_STRING_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(encoding)
-        if(H5P_get(plist, H5P_STRCRT_CHAR_ENCODING_NAME, encoding) < 0)
+    if (encoding)
+        if (H5P_get(plist, H5P_STRCRT_CHAR_ENCODING_NAME, encoding) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get character encoding flag")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_char_encoding() */
-
diff --git a/src/H5Ptest.c b/src/H5Ptest.c
index 86a6405..79e4dc8 100644
--- a/src/H5Ptest.c
+++ b/src/H5Ptest.c
@@ -17,22 +17,20 @@
  * Purpose:	Generic Property Testing Functions
  */
 
-#define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
-#define H5P_TESTING		/*suppress warning about H5P testing funcs*/
-
+#define H5P_PACKAGE /*suppress error about including H5Ppkg	  */
+#define H5P_TESTING /*suppress warning about H5P testing funcs*/
 
 /* Private header files */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Ppkg.h"		/* Property lists		  	*/
-#include "H5Dprivate.h"		/* Dataset		  		*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Ppkg.h"     /* Property lists		  	*/
+#include "H5Dprivate.h" /* Dataset		  		*/
 
 /* Local variables */
 
 /* Local typedefs */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_get_class_path_test
@@ -58,24 +56,23 @@
 char *
 H5P_get_class_path_test(hid_t pclass_id)
 {
-    H5P_genclass_t	*pclass;    /* Property class to query */
-    char *ret_value;       /* return value */
+    H5P_genclass_t *pclass;    /* Property class to query */
+    char *          ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Check arguments. */
-    if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
+    if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property class");
 
     /* Get the property list class path */
-    if(NULL == (ret_value = H5P_get_class_path(pclass)))
+    if (NULL == (ret_value = H5P_get_class_path(pclass)))
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "unable to query full path of class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get_class_path_test() */
+} /* H5P_get_class_path_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_open_class_path_test
@@ -99,31 +96,30 @@ done:
 hid_t
 H5P_open_class_path_test(const char *path)
 {
-    H5P_genclass_t *pclass=NULL;/* Property class to query */
-    hid_t ret_value;            /* Return value */
+    H5P_genclass_t *pclass = NULL; /* Property class to query */
+    hid_t           ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments. */
-    if (NULL == path || *path=='\0')
+    if (NULL == path || *path == '\0')
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid class path");
 
     /* Open the property list class */
-    if ((pclass=H5P_open_class_path(path))==NULL)
+    if ((pclass = H5P_open_class_path(path)) == NULL)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "unable to find class with full path");
 
     /* Get an atom for the class */
-    if ((ret_value=H5I_register(H5I_GENPROP_CLS, pclass, TRUE))<0)
+    if ((ret_value = H5I_register(H5I_GENPROP_CLS, pclass, TRUE)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to atomize property list class");
 
 done:
-    if(ret_value<0 && pclass)
+    if (ret_value < 0 && pclass)
         H5P_close_class(pclass);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_open_class_path_test() */
+} /* H5P_open_class_path_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5P_reset_external_file_test
@@ -143,29 +139,28 @@ done:
 herr_t
 H5P_reset_external_file_test(hid_t dcpl_id)
 {
-    H5O_efl_t       efl;                /* External file list */
-    H5P_genplist_t *plist;              /* Property list */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_efl_t       efl;                 /* External file list */
+    H5P_genplist_t *plist;               /* Property list */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
 
     /* get external file list */
-    if(H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
+    if (H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
     /* Clean up any values set for the external file-list */
-    if(H5O_msg_reset(H5O_EFL_ID, &efl) < 0)
+    if (H5O_msg_reset(H5O_EFL_ID, &efl) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't release external file list info")
 
     /* set external file list */
-    if(H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
+    if (H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_reset_external_file_test() */
-
+} /* H5P_reset_external_file_test() */
diff --git a/src/H5R.c b/src/H5R.c
index 74816f8..75506b0 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -15,74 +15,65 @@
 /* Module Setup */
 /****************/
 
-#define H5R_PACKAGE		/*suppress error about including H5Rpkg   */
+#define H5R_PACKAGE /*suppress error about including H5Rpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5R_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5R_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5HGprivate.h"	/* Global Heaps				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Rpkg.h"		/* References				*/
-#include "H5Sprivate.h"		/* Dataspaces 				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gprivate.h"  /* Groups				*/
+#include "H5HGprivate.h" /* Global Heaps				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Rpkg.h"      /* References				*/
+#include "H5Sprivate.h"  /* Dataspaces 				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static herr_t H5R_create(void *ref, H5G_loc_t *loc, const char *name,
-        H5R_type_t ref_type, H5S_t *space, hid_t dxpl_id);
-static hid_t H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type,
-    const void *_ref, hbool_t app_ref);
+static herr_t  H5R_create(void *ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5S_t *space,
+                          hid_t dxpl_id);
+static hid_t   H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_ref,
+                               hbool_t app_ref);
 static H5S_t * H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref);
-static ssize_t H5R_get_name(H5F_t *file, hid_t lapl_id, hid_t dxpl_id, hid_t id,
-    H5R_type_t ref_type, const void *_ref, char *name, size_t size);
-
+static ssize_t H5R_get_name(H5F_t *file, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_type,
+                            const void *_ref, char *name, size_t size);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Reference ID class */
 static const H5I_class_t H5I_REFERENCE_CLS[1] = {{
-    H5I_REFERENCE,		/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    0,				/* # of reserved IDs for class */
-    NULL			/* Callback routine for closing objects of this class */
+    H5I_REFERENCE,       /* ID class value */
+    H5I_CLASS_REUSE_IDS, /* Class flags */
+    0,                   /* # of reserved IDs for class */
+    NULL                 /* Callback routine for closing objects of this class */
 }};
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5R_init
  *
@@ -99,7 +90,7 @@ static const H5I_class_t H5I_REFERENCE_CLS[1] = {{
 herr_t
 H5R_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -108,7 +99,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R_init() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5R_init_interface -- Initialize interface-specific information
@@ -124,19 +114,18 @@ DESCRIPTION
 static herr_t
 H5R_init_interface(void)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Initialize the atom group for the file IDs */
-    if(H5I_register_type(H5I_REFERENCE_CLS) < 0)
-	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to initialize interface");
+    if (H5I_register_type(H5I_REFERENCE_CLS) < 0)
+        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to initialize interface");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5R_term_interface
@@ -157,32 +146,31 @@ done:
 int
 H5R_term_interface(void)
 {
-    int	n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if (H5_interface_initialize_g) {
-	if(H5I_nmembers(H5I_REFERENCE) > 0) {
-	    (void)H5I_clear_type(H5I_REFERENCE, FALSE, FALSE);
+        if (H5I_nmembers(H5I_REFERENCE) > 0) {
+            (void)H5I_clear_type(H5I_REFERENCE, FALSE, FALSE);
             n++; /*H5I*/
-	} /* end if */
+        }        /* end if */
         else {
             /* Close deprecated interface */
             n += H5R__term_deprec_interface();
 
             /* Destroy the reference id group */
-	    (void)H5I_dec_type_ref(H5I_REFERENCE);
+            (void)H5I_dec_type_ref(H5I_REFERENCE);
             n++; /*H5I*/
 
             /* Mark closed */
-	    H5_interface_initialize_g = 0;
-	} /* end else */
-    } /* end if */
+            H5_interface_initialize_g = 0;
+        } /* end else */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5R_term_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5R_create
@@ -213,11 +201,11 @@ H5R_term_interface(void)
 static herr_t
 H5R_create(void *_ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5S_t *space, hid_t dxpl_id)
 {
-    H5G_loc_t	obj_loc;		/* Group hier. location of object */
-    H5G_name_t  path;            	/* Object group hier. path */
-    H5O_loc_t   oloc;            	/* Object object location */
-    hbool_t     obj_found = FALSE;      /* Object location found */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5G_loc_t  obj_loc;             /* Group hier. location of object */
+    H5G_name_t path;                /* Object group hier. path */
+    H5O_loc_t  oloc;                /* Object object location */
+    hbool_t    obj_found = FALSE;   /* Object location found */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -232,58 +220,59 @@ H5R_create(void *_ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5
     H5G_loc_reset(&obj_loc);
 
     /* Find the object */
-    if(H5G_loc_find(loc, name, &obj_loc, H5P_DEFAULT, dxpl_id) < 0)
+    if (H5G_loc_find(loc, name, &obj_loc, H5P_DEFAULT, dxpl_id) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_NOTFOUND, FAIL, "object not found")
     obj_found = TRUE;
 
-    switch(ref_type) {
-        case H5R_OBJECT:
-        {
+    switch (ref_type) {
+        case H5R_OBJECT: {
             hobj_ref_t *ref = (hobj_ref_t *)_ref; /* Get pointer to correct type of reference struct */
 
             *ref = obj_loc.oloc->addr;
             break;
         }
 
-        case H5R_DATASET_REGION:
-        {
-            H5HG_t hobjid;      /* Heap object ID */
-            hdset_reg_ref_t *ref = (hdset_reg_ref_t *)_ref; /* Get pointer to correct type of reference struct */
-            hssize_t buf_size;  /* Size of buffer needed to serialize selection */
-            uint8_t *p;       /* Pointer to OID to store */
-            uint8_t *buf;     /* Buffer to store serialized selection in */
-            unsigned heapid_found;  /* Flag for non-zero heap ID found */
-            unsigned u;        /* local index */
+        case H5R_DATASET_REGION: {
+            H5HG_t           hobjid; /* Heap object ID */
+            hdset_reg_ref_t *ref =
+                (hdset_reg_ref_t *)_ref; /* Get pointer to correct type of reference struct */
+            hssize_t buf_size;           /* Size of buffer needed to serialize selection */
+            uint8_t *p;                  /* Pointer to OID to store */
+            uint8_t *buf;                /* Buffer to store serialized selection in */
+            unsigned heapid_found;       /* Flag for non-zero heap ID found */
+            unsigned u;                  /* local index */
 
             /* Set up information for dataset region */
 
             /* Return any previous heap block to the free list if we are garbage collecting */
-            if(H5F_GC_REF(loc->oloc->file)) {
+            if (H5F_GC_REF(loc->oloc->file)) {
                 /* Check for an existing heap ID in the reference */
-                for(u = 0, heapid_found = 0, p = (uint8_t *)ref; u < H5R_DSET_REG_REF_BUF_SIZE; u++)
-                    if(p[u] != 0) {
+                for (u = 0, heapid_found = 0, p = (uint8_t *)ref; u < H5R_DSET_REG_REF_BUF_SIZE; u++)
+                    if (p[u] != 0) {
                         heapid_found = 1;
                         break;
                     } /* end if */
 
-                if(heapid_found != 0) {
-/* Return heap block to free list */
+                if (heapid_found != 0) {
+                    /* Return heap block to free list */
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
-            /* Zero the heap ID out, may leak heap space if user is re-using reference and doesn't have garbage collection on */
+            /* Zero the heap ID out, may leak heap space if user is re-using reference and doesn't have
+             * garbage collection on */
             HDmemset(ref, 0, H5R_DSET_REG_REF_BUF_SIZE);
 
             /* Get the amount of space required to serialize the selection */
-            if((buf_size = H5S_SELECT_SERIAL_SIZE(space)) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "Invalid amount of space for serializing selection")
+            if ((buf_size = H5S_SELECT_SERIAL_SIZE(space)) < 0)
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL,
+                            "Invalid amount of space for serializing selection")
 
             /* Increase buffer size to allow for the dataset OID */
             buf_size += (hssize_t)sizeof(haddr_t);
 
             /* Allocate the space to store the serialized information */
             H5_CHECK_OVERFLOW(buf_size, hssize_t, size_t);
-            if(NULL == (buf = (uint8_t *)H5MM_malloc((size_t)buf_size)))
+            if (NULL == (buf = (uint8_t *)H5MM_malloc((size_t)buf_size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Serialize information for dataset OID into heap buffer */
@@ -291,12 +280,12 @@ H5R_create(void *_ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5
             H5F_addr_encode(loc->oloc->file, &p, obj_loc.oloc->addr);
 
             /* Serialize the selection into heap buffer */
-            if(H5S_SELECT_SERIALIZE(space, p) < 0)
+            if (H5S_SELECT_SERIALIZE(space, p) < 0)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCOPY, FAIL, "Unable to serialize selection")
 
             /* Save the serialized buffer for later */
             H5_CHECK_OVERFLOW(buf_size, hssize_t, size_t);
-            if(H5HG_insert(loc->oloc->file, dxpl_id, (size_t)buf_size, buf, &hobjid) < 0)
+            if (H5HG_insert(loc->oloc->file, dxpl_id, (size_t)buf_size, buf, &hobjid) < 0)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_WRITEERROR, FAIL, "Unable to serialize selection")
 
             /* Serialize the heap ID and index for storage in the file */
@@ -317,13 +306,12 @@ H5R_create(void *_ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5
     } /* end switch */
 
 done:
-    if(obj_found)
+    if (obj_found)
         H5G_loc_free(&obj_loc);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5R_create() */
+} /* end H5R_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Rcreate
@@ -354,38 +342,37 @@ done:
 herr_t
 H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id)
 {
-    H5G_loc_t   loc;            /* File location */
-    H5S_t      *space = NULL;   /* Pointer to dataspace containing region */
-    herr_t      ret_value;      /* Return value */
+    H5G_loc_t loc;          /* File location */
+    H5S_t *   space = NULL; /* Pointer to dataspace containing region */
+    herr_t    ret_value;    /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "*xi*sRti", ref, loc_id, name, ref_type, space_id);
 
     /* Check args */
-    if(ref == NULL)
+    if (ref == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer")
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name given")
-    if(ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
+    if (ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
-    if(ref_type != H5R_OBJECT && ref_type != H5R_DATASET_REGION)
+    if (ref_type != H5R_OBJECT && ref_type != H5R_DATASET_REGION)
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "reference type not supported")
-    if(space_id == (-1) && ref_type == H5R_DATASET_REGION)
+    if (space_id == (-1) && ref_type == H5R_DATASET_REGION)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "reference region dataspace id must be valid")
-    if(space_id != (-1) && (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))))
+    if (space_id != (-1) && (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Create reference */
-    if((ret_value = H5R_create(ref, &loc, name, ref_type, space, H5AC_dxpl_id)) < 0)
+    if ((ret_value = H5R_create(ref, &loc, name, ref_type, space, H5AC_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to create reference")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Rcreate() */
+} /* end H5Rcreate() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5R_dereference
@@ -415,12 +402,12 @@ done:
 static hid_t
 H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_ref, hbool_t app_ref)
 {
-    H5O_loc_t oloc;             /* Object location */
-    H5G_name_t path;            /* Path of object */
-    H5G_loc_t loc;              /* Group location */
-    unsigned rc;		/* Reference count of object */
-    H5O_type_t obj_type;        /* Type of object */
-    hid_t ret_value;            /* Return value */
+    H5O_loc_t  oloc;      /* Object location */
+    H5G_name_t path;      /* Path of object */
+    H5G_loc_t  loc;       /* Group location */
+    unsigned   rc;        /* Reference count of object */
+    H5O_type_t obj_type;  /* Type of object */
+    hid_t      ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -432,29 +419,28 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_re
     H5O_loc_reset(&oloc);
     oloc.file = file;
 
-    switch(ref_type) {
+    switch (ref_type) {
         case H5R_OBJECT:
             oloc.addr = *(const hobj_ref_t *)_ref; /* Only object references currently supported */
-	    if(!H5F_addr_defined(oloc.addr) || oloc.addr == 0)
-	      HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Undefined reference pointer")
-	      break;
-            
-        case H5R_DATASET_REGION:
-        {
-            H5HG_t hobjid;  /* Heap object ID */
-            uint8_t *buf;   /* Buffer to store serialized selection in */
-            const uint8_t *p;           /* Pointer to OID to store */
+            if (!H5F_addr_defined(oloc.addr) || oloc.addr == 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Undefined reference pointer")
+            break;
+
+        case H5R_DATASET_REGION: {
+            H5HG_t         hobjid; /* Heap object ID */
+            uint8_t *      buf;    /* Buffer to store serialized selection in */
+            const uint8_t *p;      /* Pointer to OID to store */
 
             /* Get the heap ID for the dataset region */
             p = (const uint8_t *)_ref;
             H5F_addr_decode(oloc.file, &p, &(hobjid.addr));
             UINT32DECODE(p, hobjid.idx);
 
-            if(!H5F_addr_defined(hobjid.addr) || hobjid.addr == 0)
-	      HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Undefined reference pointer")
+            if (!H5F_addr_defined(hobjid.addr) || hobjid.addr == 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Undefined reference pointer")
 
             /* Get the dataset region from the heap (allocate inside routine) */
-            if(NULL == (buf = (uint8_t *)H5HG_read(oloc.file, dxpl_id, &hobjid, NULL, NULL)))
+            if (NULL == (buf = (uint8_t *)H5HG_read(oloc.file, dxpl_id, &hobjid, NULL, NULL)))
                 HGOTO_ERROR(H5E_REFERENCE, H5E_READERROR, FAIL, "Unable to read dataset region information")
 
             /* Get the object oid for the dataset */
@@ -475,7 +461,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_re
 
     /* Get the # of links for object, and its type */
     /* (To check to make certain that this object hasn't been deleted since the reference was created) */
-    if(H5O_get_rc_and_type(&oloc, dxpl_id, &rc, &obj_type) < 0 || 0 == rc)
+    if (H5O_get_rc_and_type(&oloc, dxpl_id, &rc, &obj_type) < 0 || 0 == rc)
         HGOTO_ERROR(H5E_REFERENCE, H5E_LINKCOUNT, FAIL, "dereferencing deleted object")
 
     /* Construct a group location for opening the object */
@@ -484,65 +470,61 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_re
     loc.path = &path;
 
     /* Open the object */
-    switch(obj_type) {
-        case H5O_TYPE_GROUP:
-            {
-                H5G_t *group;               /* Pointer to group to open */
-
-                if(NULL == (group = H5G_open(&loc, dxpl_id)))
-                    HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "not found")
-
-                /* Create an atom for the group */
-                if((ret_value = H5I_register(H5I_GROUP, group, app_ref)) < 0) {
-                    H5G_close(group);
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTREGISTER, FAIL, "can't register group")
-                } /* end if */
-            } /* end case */
-            break;
+    switch (obj_type) {
+        case H5O_TYPE_GROUP: {
+            H5G_t *group; /* Pointer to group to open */
 
-        case H5O_TYPE_NAMED_DATATYPE:
-            {
-                H5T_t *type;                /* Pointer to datatype to open */
+            if (NULL == (group = H5G_open(&loc, dxpl_id)))
+                HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "not found")
 
-                if(NULL == (type = H5T_open(&loc, dxpl_id)))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "not found")
+            /* Create an atom for the group */
+            if ((ret_value = H5I_register(H5I_GROUP, group, app_ref)) < 0) {
+                H5G_close(group);
+                HGOTO_ERROR(H5E_SYM, H5E_CANTREGISTER, FAIL, "can't register group")
+            } /* end if */
+        }     /* end case */
+        break;
 
-                /* Create an atom for the datatype */
-                if((ret_value = H5I_register(H5I_DATATYPE, type, app_ref)) < 0) {
-                    H5T_close(type);
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "can't register datatype")
-                } /* end if */
-            } /* end case */
-            break;
+        case H5O_TYPE_NAMED_DATATYPE: {
+            H5T_t *type; /* Pointer to datatype to open */
 
-        case H5O_TYPE_DATASET:
-            {
-                hid_t dapl_id = H5P_DATASET_ACCESS_DEFAULT; /* dapl to use to open dataset */
-                H5D_t *dset;                /* Pointer to dataset to open */
+            if (NULL == (type = H5T_open(&loc, dxpl_id)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "not found")
 
-                /* Open the dataset */
-                if(NULL == (dset = H5D_open(&loc, dapl_id, dxpl_id)))
-                    HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found")
+            /* Create an atom for the datatype */
+            if ((ret_value = H5I_register(H5I_DATATYPE, type, app_ref)) < 0) {
+                H5T_close(type);
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "can't register datatype")
+            } /* end if */
+        }     /* end case */
+        break;
 
-                /* Create an atom for the dataset */
-                if((ret_value = H5I_register(H5I_DATASET, dset, app_ref)) < 0) {
-                    H5D_close(dset);
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "can't register dataset")
-                } /* end if */
-            } /* end case */
-            break;
+        case H5O_TYPE_DATASET: {
+            hid_t  dapl_id = H5P_DATASET_ACCESS_DEFAULT; /* dapl to use to open dataset */
+            H5D_t *dset;                                 /* Pointer to dataset to open */
+
+            /* Open the dataset */
+            if (NULL == (dset = H5D_open(&loc, dapl_id, dxpl_id)))
+                HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found")
+
+            /* Create an atom for the dataset */
+            if ((ret_value = H5I_register(H5I_DATASET, dset, app_ref)) < 0) {
+                H5D_close(dset);
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "can't register dataset")
+            } /* end if */
+        }     /* end case */
+        break;
 
         case H5O_TYPE_UNKNOWN:
         case H5O_TYPE_NTYPES:
         default:
             HGOTO_ERROR(H5E_REFERENCE, H5E_BADTYPE, FAIL, "can't identify type of object referenced")
-     } /* end switch */
+    } /* end switch */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5R_dereference() */
+} /* end H5R_dereference() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Rdereference
@@ -568,33 +550,32 @@ done:
 hid_t
 H5Rdereference(hid_t id, H5R_type_t ref_type, const void *_ref)
 {
-    H5G_loc_t loc;      /* Group location */
-    H5F_t *file = NULL; /* File object */
-    hid_t ret_value;
+    H5G_loc_t loc;         /* Group location */
+    H5F_t *   file = NULL; /* File object */
+    hid_t     ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "iRt*x", id, ref_type, _ref);
 
     /* Check args */
-    if(H5G_loc(id, &loc) < 0)
+    if (H5G_loc(id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
+    if (ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
-    if(_ref == NULL)
+    if (_ref == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer")
 
     /* Get the file pointer from the entry */
     file = loc.oloc->file;
 
     /* Create reference */
-    if((ret_value = H5R_dereference(file, H5AC_ind_dxpl_id, ref_type, _ref, TRUE)) < 0)
+    if ((ret_value = H5R_dereference(file, H5AC_ind_dxpl_id, ref_type, _ref, TRUE)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to dereference object")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Rdereference() */
+} /* end H5Rdereference() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5R_get_region
@@ -619,12 +600,12 @@ done:
 static H5S_t *
 H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref)
 {
-    H5O_loc_t oloc;             /* Object location */
-    const uint8_t *p;           /* Pointer to OID to store */
-    H5HG_t hobjid;              /* Heap object ID */
-    uint8_t *buf = NULL;        /* Buffer to store serialized selection in */
-    H5S_t *ds = NULL;           /* Temporary pointer to dataspace */
-    H5S_t *ret_value = NULL;
+    H5O_loc_t      oloc;             /* Object location */
+    const uint8_t *p;                /* Pointer to OID to store */
+    H5HG_t         hobjid;           /* Heap object ID */
+    uint8_t *      buf       = NULL; /* Buffer to store serialized selection in */
+    H5S_t *        ds        = NULL; /* Temporary pointer to dataspace */
+    H5S_t *        ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -641,7 +622,7 @@ H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref)
     UINT32DECODE(p, hobjid.idx);
 
     /* Get the dataset region from the heap (allocate inside routine) */
-    if((buf = (uint8_t *)H5HG_read(oloc.file, dxpl_id, &hobjid, NULL, NULL)) == NULL)
+    if ((buf = (uint8_t *)H5HG_read(oloc.file, dxpl_id, &hobjid, NULL, NULL)) == NULL)
         HGOTO_ERROR(H5E_REFERENCE, H5E_READERROR, NULL, "Unable to read dataset region information")
 
     /* Get the object oid for the dataset */
@@ -649,29 +630,28 @@ H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref)
     H5F_addr_decode(oloc.file, &p, &(oloc.addr));
 
     /* Open and copy the dataset's dataspace */
-    if((ds = H5S_read(&oloc, dxpl_id)) == NULL)
+    if ((ds = H5S_read(&oloc, dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_DATASPACE, H5E_NOTFOUND, NULL, "not found")
 
     /* Unserialize the selection */
-    if(H5S_select_deserialize(ds, p) < 0)
+    if (H5S_select_deserialize(ds, p) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, NULL, "can't deserialize selection")
 
     ret_value = ds;
 
 done:
     /* Free the buffer allocated in H5HG_read() */
-    if(buf)
+    if (buf)
         H5MM_xfree(buf);
 
-    if(ret_value == NULL) {
-        if(ds && H5S_close(ds) < 0)
+    if (ret_value == NULL) {
+        if (ds && H5S_close(ds) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release dataspace")
     }
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5R_get_region() */
+} /* end H5R_get_region() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Rget_region
@@ -699,33 +679,32 @@ hid_t
 H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref)
 {
     H5G_loc_t loc;          /* Object's group location */
-    H5S_t *space = NULL;    /* Dataspace object */
-    hid_t ret_value;
+    H5S_t *   space = NULL; /* Dataspace object */
+    hid_t     ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "iRt*x", id, ref_type, ref);
 
     /* Check args */
-    if(H5G_loc(id, &loc) < 0)
+    if (H5G_loc(id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(ref_type != H5R_DATASET_REGION)
+    if (ref_type != H5R_DATASET_REGION)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
-    if(ref == NULL)
+    if (ref == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer")
 
     /* Get the dataspace with the correct region selected */
-    if((space = H5R_get_region(loc.oloc->file, H5AC_ind_dxpl_id, ref)) == NULL)
+    if ((space = H5R_get_region(loc.oloc->file, H5AC_ind_dxpl_id, ref)) == NULL)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create dataspace")
 
     /* Atomize */
-    if((ret_value = H5I_register (H5I_DATASPACE, space, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASPACE, space, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Rget_region() */
+} /* end H5Rget_region() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5R_get_obj_type
@@ -749,12 +728,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type,
-    const void *_ref, H5O_type_t *obj_type)
+H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_ref, H5O_type_t *obj_type)
 {
-    H5O_loc_t oloc;             /* Object location */
-    unsigned rc;		/* Reference count of object    */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_loc_t oloc;                /* Object location */
+    unsigned  rc;                  /* Reference count of object    */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -765,17 +743,16 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type,
     H5O_loc_reset(&oloc);
     oloc.file = file;
 
-    switch(ref_type) {
+    switch (ref_type) {
         case H5R_OBJECT:
             /* Get the object oid */
             oloc.addr = *(const hobj_ref_t *)_ref; /* Only object references currently supported */
             break;
 
-        case H5R_DATASET_REGION:
-        {
-            H5HG_t hobjid;      /* Heap object ID */
-            const uint8_t *p;   /* Pointer to reference to decode */
-            uint8_t *buf;       /* Buffer to store serialized selection in */
+        case H5R_DATASET_REGION: {
+            H5HG_t         hobjid; /* Heap object ID */
+            const uint8_t *p;      /* Pointer to reference to decode */
+            uint8_t *      buf;    /* Buffer to store serialized selection in */
 
             /* Get the heap ID for the dataset region */
             p = (const uint8_t *)_ref;
@@ -783,7 +760,7 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type,
             UINT32DECODE(p, hobjid.idx);
 
             /* Get the dataset region from the heap (allocate inside routine) */
-            if((buf = (uint8_t *)H5HG_read(oloc.file, dxpl_id, &hobjid, NULL, NULL)) == NULL)
+            if ((buf = (uint8_t *)H5HG_read(oloc.file, dxpl_id, &hobjid, NULL, NULL)) == NULL)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_READERROR, FAIL, "Unable to read dataset region information")
 
             /* Get the object oid for the dataset */
@@ -804,14 +781,13 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type,
 
     /* Get the # of links for object, and its type */
     /* (To check to make certain that this object hasn't been deleted since the reference was created) */
-    if(H5O_get_rc_and_type(&oloc, dxpl_id, &rc, obj_type) < 0 || 0 == rc)
+    if (H5O_get_rc_and_type(&oloc, dxpl_id, &rc, obj_type) < 0 || 0 == rc)
         HGOTO_ERROR(H5E_REFERENCE, H5E_LINKCOUNT, FAIL, "dereferencing deleted object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5R_get_obj_type() */
+} /* end H5R_get_obj_type() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Rget_obj_type2
@@ -836,32 +812,30 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *ref,
-    H5O_type_t *obj_type)
+H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *ref, H5O_type_t *obj_type)
 {
-    H5G_loc_t loc;              /* Object location */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5G_loc_t loc;                 /* Object location */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iRt*x*Ot", id, ref_type, ref, obj_type);
 
     /* Check args */
-    if(H5G_loc(id, &loc) < 0)
+    if (H5G_loc(id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
+    if (ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
-    if(ref == NULL)
+    if (ref == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer")
 
     /* Get the object information */
-    if(H5R_get_obj_type(loc.oloc->file, H5AC_ind_dxpl_id, ref_type, ref, obj_type) < 0)
-	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to determine object type")
+    if (H5R_get_obj_type(loc.oloc->file, H5AC_ind_dxpl_id, ref_type, ref, obj_type) < 0)
+        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to determine object type")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Rget_obj_type2() */
+} /* end H5Rget_obj_type2() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5R_get_name
@@ -891,12 +865,12 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static ssize_t
-H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_type,
-    const void *_ref, char *name, size_t size)
+H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_type, const void *_ref,
+             char *name, size_t size)
 {
-    hid_t file_id = (-1);       /* ID for file that the reference is in */
-    H5O_loc_t oloc;             /* Object location describing object for reference */
-    ssize_t ret_value;          /* Return value */
+    hid_t     file_id = (-1); /* ID for file that the reference is in */
+    H5O_loc_t oloc;           /* Object location describing object for reference */
+    ssize_t   ret_value;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -910,16 +884,15 @@ H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_ty
     oloc.file = f;
 
     /* Get address for reference */
-    switch(ref_type) {
+    switch (ref_type) {
         case H5R_OBJECT:
             oloc.addr = *(const hobj_ref_t *)_ref;
             break;
 
-        case H5R_DATASET_REGION:
-        {
-            H5HG_t hobjid;  /* Heap object ID */
-            uint8_t *buf;   /* Buffer to store serialized selection in */
-            const uint8_t *p;           /* Pointer to OID to store */
+        case H5R_DATASET_REGION: {
+            H5HG_t         hobjid; /* Heap object ID */
+            uint8_t *      buf;    /* Buffer to store serialized selection in */
+            const uint8_t *p;      /* Pointer to OID to store */
 
             /* Get the heap ID for the dataset region */
             p = (const uint8_t *)_ref;
@@ -927,7 +900,7 @@ H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_ty
             UINT32DECODE(p, hobjid.idx);
 
             /* Get the dataset region from the heap (allocate inside routine) */
-            if((buf = (uint8_t *)H5HG_read(oloc.file, dxpl_id, &hobjid, NULL, NULL)) == NULL)
+            if ((buf = (uint8_t *)H5HG_read(oloc.file, dxpl_id, &hobjid, NULL, NULL)) == NULL)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_READERROR, FAIL, "Unable to read dataset region information")
 
             /* Get the object oid for the dataset */
@@ -947,22 +920,21 @@ H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_ty
     } /* end switch */
 
     /* Retrieve file ID for name search */
-    if((file_id = H5I_get_file_id(id, FALSE)) < 0)
+    if ((file_id = H5I_get_file_id(id, FALSE)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't retrieve file ID")
 
     /* Get name, length, etc. */
-    if((ret_value = H5G_get_name_by_addr(file_id, lapl_id, dxpl_id, &oloc, name, size)) < 0)
+    if ((ret_value = H5G_get_name_by_addr(file_id, lapl_id, dxpl_id, &oloc, name, size)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't determine name")
 
 done:
     /* Close file ID used for search */
-    if(file_id > 0 && H5I_dec_ref(file_id) < 0)
+    if (file_id > 0 && H5I_dec_ref(file_id) < 0)
         HDONE_ERROR(H5E_REFERENCE, H5E_CANTDEC, FAIL, "can't decrement ref count of temp ID")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R_get_name() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Rget_name
@@ -989,32 +961,30 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 ssize_t
-H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name,
-    size_t size)
+H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name, size_t size)
 {
-    H5G_loc_t loc;      /* Group location */
-    H5F_t *file;        /* File object */
-    ssize_t ret_value;  /* Return value */
+    H5G_loc_t loc;       /* Group location */
+    H5F_t *   file;      /* File object */
+    ssize_t   ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("Zs", "iRt*x*sz", id, ref_type, _ref, name, size);
 
     /* Check args */
-    if(H5G_loc(id, &loc) < 0)
+    if (H5G_loc(id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
+    if (ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
-    if(_ref == NULL)
+    if (_ref == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer")
 
     /* Get the file pointer from the entry */
     file = loc.oloc->file;
 
     /* Get name */
-    if((ret_value = H5R_get_name(file, H5P_DEFAULT, H5AC_ind_dxpl_id, id, ref_type, _ref, name, size)) < 0)
+    if ((ret_value = H5R_get_name(file, H5P_DEFAULT, H5AC_ind_dxpl_id, id, ref_type, _ref, name, size)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to determine object path")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Rget_name() */
-
diff --git a/src/H5RC.c b/src/H5RC.c
index 23465d1..5e22ff9 100644
--- a/src/H5RC.c
+++ b/src/H5RC.c
@@ -18,17 +18,15 @@
  *
  */
 
-
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5RCprivate.h"        /* Reference-counted buffers            */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5RCprivate.h" /* Reference-counted buffers            */
 
 /* Private typedefs & structs */
 
 /* Declare a free list to manage the H5RC_t struct */
 H5FL_DEFINE_STATIC(H5RC_t);
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RC_create
@@ -53,7 +51,7 @@ H5FL_DEFINE_STATIC(H5RC_t);
 H5RC_t *
 H5RC_create(void *o, H5RC_free_func_t free_func)
 {
-    H5RC_t *ret_value;   /* Return value */
+    H5RC_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -62,19 +60,18 @@ H5RC_create(void *o, H5RC_free_func_t free_func)
     HDassert(free_func);
 
     /* Allocate ref-counted string structure */
-    if(NULL == (ret_value = H5FL_MALLOC(H5RC_t)))
-        HGOTO_ERROR(H5E_RS,H5E_NOSPACE,NULL,"memory allocation failed")
+    if (NULL == (ret_value = H5FL_MALLOC(H5RC_t)))
+        HGOTO_ERROR(H5E_RS, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set the internal fields */
-    ret_value->o = o;
-    ret_value->n = 1;
+    ret_value->o         = o;
+    ret_value->n         = 1;
     ret_value->free_func = free_func;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5RC_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RC_decr
@@ -97,7 +94,7 @@ done:
 herr_t
 H5RC_decr(H5RC_t *rc)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -111,8 +108,8 @@ H5RC_decr(H5RC_t *rc)
     rc->n--;
 
     /* Check if we should delete this object now */
-    if(rc->n == 0) {
-        if((rc->free_func)(rc->o) < 0) {
+    if (rc->n == 0) {
+        if ((rc->free_func)(rc->o) < 0) {
             rc = H5FL_FREE(H5RC_t, rc);
             HGOTO_ERROR(H5E_RS, H5E_CANTFREE, FAIL, "memory release failed")
         } /* end if */
@@ -122,4 +119,3 @@ H5RC_decr(H5RC_t *rc)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5RC_decr() */
-
diff --git a/src/H5RCprivate.h b/src/H5RCprivate.h
index b2425f7..4998f11 100644
--- a/src/H5RCprivate.h
+++ b/src/H5RCprivate.h
@@ -38,24 +38,22 @@ typedef herr_t (*H5RC_free_func_t)(void *o);
 
 /* Typedef for reference counted objects */
 typedef struct H5RC_t {
-    void *o;            /* Object to be reference counted */
-    size_t n;           /* Reference count of number of pointers sharing object */
+    void *           o;         /* Object to be reference counted */
+    size_t           n;         /* Reference count of number of pointers sharing object */
     H5RC_free_func_t free_func; /* Function to free object */
 } H5RC_t;
 
 /**********/
 /* Macros */
 /**********/
-#define H5RC_INC(rc)            ((rc)->n++)
-#define H5RC_DEC(rc)            (H5RC_decr(rc))
-#define H5RC_GET_OBJ(rc)        ((rc)->o)
+#define H5RC_INC(rc)     ((rc)->n++)
+#define H5RC_DEC(rc)     (H5RC_decr(rc))
+#define H5RC_GET_OBJ(rc) ((rc)->o)
 
 /********************/
 /* Private routines */
 /********************/
 H5_DLL H5RC_t *H5RC_create(void *s, H5RC_free_func_t free_func);
-H5_DLL herr_t H5RC_decr(H5RC_t *rc);
+H5_DLL herr_t  H5RC_decr(H5RC_t *rc);
 
 #endif /* _H5RSprivate_H */
-
-
diff --git a/src/H5RS.c b/src/H5RS.c
index 0a3fff0..48e0fa9 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -18,16 +18,15 @@
  *
  */
 
-
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5RSprivate.h"        /* Reference-counted strings            */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5RSprivate.h" /* Reference-counted strings            */
 
 /* Private typedefs & structs */
 struct H5RS_str_t {
-    char *s;            /* String to be reference counted */
-    unsigned wrapped;   /* Indicates that the string to be ref-counted is not copied */
-    unsigned n;         /* Reference count of number of pointers sharing string */
+    char *   s;       /* String to be reference counted */
+    unsigned wrapped; /* Indicates that the string to be ref-counted is not copied */
+    unsigned n;       /* Reference count of number of pointers sharing string */
 };
 
 /* Declare a free list to manage the H5RS_str_t struct */
@@ -36,7 +35,6 @@ H5FL_DEFINE_STATIC(H5RS_str_t);
 /* Declare the PQ free list for the wrapped strings */
 H5FL_BLK_DEFINE(str_buf);
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_xstrdup
@@ -59,11 +57,11 @@ H5FL_BLK_DEFINE(str_buf);
 static char *
 H5RS_xstrdup(const char *s)
 {
-    char *ret_value;   /* Return value */
+    char *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(s) {
+    if (s) {
         size_t len = HDstrlen(s) + 1;
 
         ret_value = (char *)H5FL_BLK_MALLOC(str_buf, len);
@@ -76,7 +74,6 @@ H5RS_xstrdup(const char *s)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5RS_xstrdup() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_create
@@ -99,24 +96,23 @@ H5RS_xstrdup(const char *s)
 H5RS_str_t *
 H5RS_create(const char *s)
 {
-    H5RS_str_t *ret_value;   /* Return value */
+    H5RS_str_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Allocate ref-counted string structure */
-    if(NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
+    if (NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
         HGOTO_ERROR(H5E_RS, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set the internal fields */
-    ret_value->s = H5RS_xstrdup(s);
+    ret_value->s       = H5RS_xstrdup(s);
     ret_value->wrapped = 0;
-    ret_value->n = 1;
+    ret_value->n       = 1;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5RS_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_wrap
@@ -139,24 +135,23 @@ done:
 H5RS_str_t *
 H5RS_wrap(char *s)
 {
-    H5RS_str_t *ret_value;   /* Return value */
+    H5RS_str_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Allocate ref-counted string structure */
-    if(NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
+    if (NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
         HGOTO_ERROR(H5E_RS, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set the internal fields */
-    ret_value->s = s;
+    ret_value->s       = s;
     ret_value->wrapped = 1;
-    ret_value->n = 1;
+    ret_value->n       = 1;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5RS_wrap() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_own
@@ -181,24 +176,23 @@ done:
 H5RS_str_t *
 H5RS_own(char *s)
 {
-    H5RS_str_t *ret_value;   /* Return value */
+    H5RS_str_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Allocate ref-counted string structure */
-    if(NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
+    if (NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
         HGOTO_ERROR(H5E_RS, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set the internal fields */
-    ret_value->s = s;
+    ret_value->s       = s;
     ret_value->wrapped = 0;
-    ret_value->n = 1;
+    ret_value->n       = 1;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5RS_own() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_decr
@@ -228,8 +222,8 @@ H5RS_decr(H5RS_str_t *rs)
     HDassert(rs->n > 0);
 
     /* Decrement reference count for string */
-    if((--rs->n) == 0) {
-        if(!rs->wrapped)
+    if ((--rs->n) == 0) {
+        if (!rs->wrapped)
             rs->s = (char *)H5FL_BLK_FREE(str_buf, rs->s);
         rs = H5FL_FREE(H5RS_str_t, rs);
     } /* end if */
@@ -237,7 +231,6 @@ H5RS_decr(H5RS_str_t *rs)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5RS_decr() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_incr
@@ -269,8 +262,8 @@ H5RS_incr(H5RS_str_t *rs)
      * string, duplicate the string now, so that the wrapped string can go out
      * scope appropriately.
      */
-    if(rs->wrapped) {
-        rs->s = H5RS_xstrdup(rs->s);
+    if (rs->wrapped) {
+        rs->s       = H5RS_xstrdup(rs->s);
         rs->wrapped = 0;
     } /* end if */
 
@@ -280,7 +273,6 @@ H5RS_incr(H5RS_str_t *rs)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5RS_incr() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_dup
@@ -306,14 +298,13 @@ H5RS_dup(H5RS_str_t *ret_value)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check for valid reference counted string */
-    if(ret_value != NULL)
+    if (ret_value != NULL)
         /* Increment reference count for string */
         ret_value->n++;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5RS_dup() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_dup_str
@@ -335,8 +326,8 @@ H5RS_dup(H5RS_str_t *ret_value)
 H5RS_str_t *
 H5RS_dup_str(const char *s)
 {
-    char *new_str;              /* Duplicate of string */
-    size_t path_len;            /* Length of the path */
+    char *      new_str;  /* Duplicate of string */
+    size_t      path_len; /* Length of the path */
     H5RS_str_t *ret_value;
 
     FUNC_ENTER_NOAPI(NULL)
@@ -348,7 +339,7 @@ H5RS_dup_str(const char *s)
     path_len = HDstrlen(s);
 
     /* Allocate space for the string */
-    if(NULL == (new_str = (char *)H5FL_BLK_MALLOC(str_buf, path_len + 1)))
+    if (NULL == (new_str = (char *)H5FL_BLK_MALLOC(str_buf, path_len + 1)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy name for full path */
@@ -361,7 +352,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5RS_dup_str() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_cmp
@@ -398,7 +388,6 @@ H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2)
     FUNC_LEAVE_NOAPI(HDstrcmp(rs1->s, rs2->s))
 } /* end H5RS_cmp() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_len
@@ -429,7 +418,6 @@ H5RS_len(const H5RS_str_t *rs)
     FUNC_LEAVE_NOAPI((ssize_t)HDstrlen(rs->s))
 } /* end H5RS_len() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_get_str
@@ -463,7 +451,6 @@ H5RS_get_str(const H5RS_str_t *rs)
     FUNC_LEAVE_NOAPI(rs->s)
 } /* end H5RS_get_str() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5RS_get_count
@@ -494,4 +481,3 @@ H5RS_get_count(const H5RS_str_t *rs)
 
     FUNC_LEAVE_NOAPI(rs->n)
 } /* end H5RS_get_count() */
-
diff --git a/src/H5RSprivate.h b/src/H5RSprivate.h
index f69624a..d73265c 100644
--- a/src/H5RSprivate.h
+++ b/src/H5RSprivate.h
@@ -46,14 +46,13 @@ typedef struct H5RS_str_t H5RS_str_t;
 H5_DLL H5RS_str_t *H5RS_create(const char *s);
 H5_DLL H5RS_str_t *H5RS_wrap(char *s);
 H5_DLL H5RS_str_t *H5RS_own(char *s);
-H5_DLL herr_t H5RS_decr(H5RS_str_t *rs);
-H5_DLL herr_t H5RS_incr(H5RS_str_t *rs);
+H5_DLL herr_t      H5RS_decr(H5RS_str_t *rs);
+H5_DLL herr_t      H5RS_incr(H5RS_str_t *rs);
 H5_DLL H5RS_str_t *H5RS_dup(H5RS_str_t *s);
 H5_DLL H5RS_str_t *H5RS_dup_str(const char *s);
-H5_DLL int H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2);
-H5_DLL ssize_t H5RS_len(const H5RS_str_t *rs);
-H5_DLL char *H5RS_get_str(const H5RS_str_t *rs);
-H5_DLL unsigned H5RS_get_count(const H5RS_str_t *rs);
+H5_DLL int         H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2);
+H5_DLL ssize_t     H5RS_len(const H5RS_str_t *rs);
+H5_DLL char *      H5RS_get_str(const H5RS_str_t *rs);
+H5_DLL unsigned    H5RS_get_count(const H5RS_str_t *rs);
 
 #endif /* _H5RSprivate_H */
-
diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c
index 6058296..eaa1618 100644
--- a/src/H5Rdeprec.c
+++ b/src/H5Rdeprec.c
@@ -29,59 +29,49 @@
 /* Module Setup */
 /****************/
 
-#define H5R_PACKAGE		/*suppress error about including H5Rpkg   */
+#define H5R_PACKAGE /*suppress error about including H5Rpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5R__init_deprec_interface
-
+#define H5_INTERFACE_INIT_FUNC H5R__init_deprec_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Rpkg.h"		/* References				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Gprivate.h"  /* Groups				*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Rpkg.h"      /* References				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5R__init_deprec_interface -- Initialize interface-specific information
@@ -102,7 +92,6 @@ H5R__init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5R_init())
 } /* H5R__init_deprec_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5R__term_deprec_interface -- Terminate interface
@@ -127,7 +116,7 @@ H5R__term_deprec_interface(void)
 } /* H5R__term_deprec_interface() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5Rget_obj_type1
@@ -154,31 +143,30 @@ H5R__term_deprec_interface(void)
 H5G_obj_t
 H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *ref)
 {
-    H5G_loc_t loc;              /* Object location */
-    H5O_type_t obj_type;        /* Object type */
-    H5G_obj_t ret_value;        /* Return value */
+    H5G_loc_t  loc;       /* Object location */
+    H5O_type_t obj_type;  /* Object type */
+    H5G_obj_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(H5G_UNKNOWN)
     H5TRACE3("Go", "iRt*x", id, ref_type, ref);
 
     /* Check args */
-    if(H5G_loc(id, &loc) < 0)
+    if (H5G_loc(id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a location")
-    if(ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
+    if (ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "invalid reference type")
-    if(ref == NULL)
+    if (ref == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "invalid reference pointer")
 
     /* Get the object information */
-    if(H5R_get_obj_type(loc.oloc->file, H5AC_ind_dxpl_id, ref_type, ref, &obj_type) < 0)
-	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type")
+    if (H5R_get_obj_type(loc.oloc->file, H5AC_ind_dxpl_id, ref_type, ref, &obj_type) < 0)
+        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type")
 
     /* Set return value */
     ret_value = H5G_map_obj_type(obj_type);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Rget_obj_type1() */
+} /* end H5Rget_obj_type1() */
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Rpkg.h b/src/H5Rpkg.h
index a010da4..08ce908 100644
--- a/src/H5Rpkg.h
+++ b/src/H5Rpkg.h
@@ -30,23 +30,20 @@
 #include "H5Rprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5Fprivate.h"         /* File access				*/
+#include "H5Fprivate.h" /* File access				*/
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
-
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
@@ -54,9 +51,7 @@
 /* General functions */
 H5_DLL herr_t H5R_init(void);
 H5_DLL herr_t H5R__term_deprec_interface(void);
-H5_DLL herr_t H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type,
-    const void *_ref, H5O_type_t *obj_type);
-
+H5_DLL herr_t H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_ref,
+                               H5O_type_t *obj_type);
 
 #endif /* _H5Rpkg_H */
-
diff --git a/src/H5Rprivate.h b/src/H5Rprivate.h
index 7efa225..0d43f25 100644
--- a/src/H5Rprivate.h
+++ b/src/H5Rprivate.h
@@ -25,5 +25,4 @@
 
 /* Private functions */
 
-#endif  /* _H5Rprivate_H */
-
+#endif /* _H5Rprivate_H */
diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h
index d6b1e2b..ceb38cb 100644
--- a/src/H5Rpublic.h
+++ b/src/H5Rpublic.h
@@ -26,10 +26,10 @@
  * Reference types allowed.
  */
 typedef enum {
-    H5R_BADTYPE     =   (-1),   /*invalid Reference Type                     */
-    H5R_OBJECT,                 /*Object reference                           */
-    H5R_DATASET_REGION,         /*Dataset Region Reference                   */
-    H5R_MAXTYPE                 /*highest type (Invalid as true type)	     */
+    H5R_BADTYPE = (-1), /*invalid Reference Type                     */
+    H5R_OBJECT,         /*Object reference                           */
+    H5R_DATASET_REGION, /*Dataset Region Reference                   */
+    H5R_MAXTYPE         /*highest type (Invalid as true type)	     */
 } H5R_type_t;
 
 /* Note! Be careful with the sizes of the references because they should really
@@ -37,17 +37,19 @@ typedef enum {
  * to be defined at compile-time, so we have to go with the worst case sizes for
  * them.  -QAK
  */
-#define H5R_OBJ_REF_BUF_SIZE    sizeof(haddr_t)
+#define H5R_OBJ_REF_BUF_SIZE sizeof(haddr_t)
 /* Object reference structure for user's code */
-typedef haddr_t hobj_ref_t; /* Needs to be large enough to store largest haddr_t in a worst case machine (ie. 8 bytes currently) */
+typedef haddr_t hobj_ref_t; /* Needs to be large enough to store largest haddr_t in a worst case machine (ie.
+                               8 bytes currently) */
 
-#define H5R_DSET_REG_REF_BUF_SIZE    (sizeof(haddr_t)+4)
+#define H5R_DSET_REG_REF_BUF_SIZE (sizeof(haddr_t) + 4)
 /* 4 is used instead of sizeof(int) to permit portability between
    the Crays and other machines (the heap ID is always encoded as an int32 anyway)
 */
 /* Dataset Region reference structure for user's code */
-typedef unsigned char hdset_reg_ref_t[H5R_DSET_REG_REF_BUF_SIZE];/* Buffer to store heap ID and index */
-/* Needs to be large enough to store largest haddr_t in a worst case machine (ie. 8 bytes currently) plus an int */
+typedef unsigned char hdset_reg_ref_t[H5R_DSET_REG_REF_BUF_SIZE]; /* Buffer to store heap ID and index */
+/* Needs to be large enough to store largest haddr_t in a worst case machine (ie. 8 bytes currently) plus an
+ * int */
 
 /* Publicly visible data structures */
 
@@ -56,14 +58,12 @@ extern "C" {
 #endif
 
 /* Functions in H5R.c */
-H5_DLL herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name,
-			 H5R_type_t ref_type, hid_t space_id);
-H5_DLL hid_t H5Rdereference(hid_t dataset, H5R_type_t ref_type, const void *ref);
-H5_DLL hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, const void *ref);
-H5_DLL herr_t H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *_ref,
-    H5O_type_t *obj_type);
-H5_DLL ssize_t H5Rget_name(hid_t loc_id, H5R_type_t ref_type, const void *ref,
-    char *name/*out*/, size_t size);
+H5_DLL herr_t  H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id);
+H5_DLL hid_t   H5Rdereference(hid_t dataset, H5R_type_t ref_type, const void *ref);
+H5_DLL hid_t   H5Rget_region(hid_t dataset, H5R_type_t ref_type, const void *ref);
+H5_DLL herr_t  H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *_ref, H5O_type_t *obj_type);
+H5_DLL ssize_t H5Rget_name(hid_t loc_id, H5R_type_t ref_type, const void *ref, char *name /*out*/,
+                           size_t size);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
@@ -73,10 +73,8 @@ H5_DLL ssize_t H5Rget_name(hid_t loc_id, H5R_type_t ref_type, const void *ref,
 
 /* Macros */
 
-
 /* Typedefs */
 
-
 /* Function prototypes */
 H5_DLL H5G_obj_t H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *_ref);
 
@@ -86,5 +84,4 @@ H5_DLL H5G_obj_t H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *_re
 }
 #endif
 
-#endif  /* _H5Rpublic_H */
-
+#endif /* _H5Rpublic_H */
diff --git a/src/H5S.c b/src/H5S.c
index 50bee52..cff9c7e 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -15,58 +15,50 @@
 /* Module Setup */
 /****************/
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5S_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5S_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* Files				*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Spkg.h"		/* Dataspaces 				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* Files				*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Spkg.h"      /* Dataspaces 				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Version of datatype encoding */
-#define H5S_ENCODE_VERSION      0
-
+#define H5S_ENCODE_VERSION 0
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank,
-    const hsize_t *dims, const hsize_t *max);
+static herr_t H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims, const hsize_t *max);
 static htri_t H5S_is_simple(const H5S_t *sdim);
 static herr_t H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc);
 static H5S_t *H5S_decode(const unsigned char *buf);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -78,18 +70,16 @@ H5FL_DEFINE(H5S_extent_t);
 H5FL_DEFINE(H5S_t);
 
 /* Declare a free list to manage the array's of hsize_t's */
-H5FL_ARR_DEFINE(hsize_t,H5S_MAX_RANK);
+H5FL_ARR_DEFINE(hsize_t, H5S_MAX_RANK);
 
 /* Dataspace ID class */
 static const H5I_class_t H5I_DATASPACE_CLS[1] = {{
-    H5I_DATASPACE,		/* ID class value */
-    H5I_CLASS_REUSE_IDS,	/* Class flags */
-    2,				/* # of reserved IDs for class */
-    (H5I_free_t)H5S_close	/* Callback routine for closing objects of this class */
+    H5I_DATASPACE,        /* ID class value */
+    H5I_CLASS_REUSE_IDS,  /* Class flags */
+    2,                    /* # of reserved IDs for class */
+    (H5I_free_t)H5S_close /* Callback routine for closing objects of this class */
 }};
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5S_init_interface -- Initialize interface-specific information
@@ -105,19 +95,18 @@ DESCRIPTION
 static herr_t
 H5S_init_interface(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Initialize the atom group for the file IDs */
-    if(H5I_register_type(H5I_DATASPACE_CLS) < 0)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize interface")
+    if (H5I_register_type(H5I_DATASPACE_CLS) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_init_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_term_interface
@@ -138,29 +127,28 @@ done:
 int
 H5S_term_interface(void)
 {
-    int	n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
-	if(H5I_nmembers(H5I_DATASPACE) > 0) {
-	    (void)H5I_clear_type(H5I_DATASPACE, FALSE, FALSE);
+    if (H5_interface_initialize_g) {
+        if (H5I_nmembers(H5I_DATASPACE) > 0) {
+            (void)H5I_clear_type(H5I_DATASPACE, FALSE, FALSE);
             n++; /*H5I*/
-	} /* end if */
+        }        /* end if */
         else {
             /* Destroy the dataspace object id group */
-	    (void)H5I_dec_type_ref(H5I_DATASPACE);
+            (void)H5I_dec_type_ref(H5I_DATASPACE);
             n++; /*H5I*/
 
-	    /* Shut down interface */
-	    H5_interface_initialize_g = 0;
-	} /* end else */
-    } /* end if */
+            /* Shut down interface */
+            H5_interface_initialize_g = 0;
+        } /* end else */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5S_term_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_create
@@ -182,25 +170,25 @@ H5S_term_interface(void)
 H5S_t *
 H5S_create(H5S_class_t type)
 {
-    H5S_t *new_ds = NULL;    /* New dataspace created */
-    H5S_t *ret_value;           /* Return value */
+    H5S_t *new_ds = NULL; /* New dataspace created */
+    H5S_t *ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Create a new dataspace */
-    if(NULL == (new_ds = H5FL_CALLOC(H5S_t)))
+    if (NULL == (new_ds = H5FL_CALLOC(H5S_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Initialize default dataspace state */
     new_ds->extent.type = type;
-    if(type == H5S_NULL)
+    if (type == H5S_NULL)
         new_ds->extent.version = H5O_SDSPACE_VERSION_2;
     else
         new_ds->extent.version = H5O_SDSPACE_VERSION_1;
     new_ds->extent.rank = 0;
     new_ds->extent.size = new_ds->extent.max = NULL;
 
-    switch(type) {
+    switch (type) {
         case H5S_SCALAR:
             new_ds->extent.nelem = 1;
             break;
@@ -217,29 +205,28 @@ H5S_create(H5S_class_t type)
     } /* end switch */
 
     /* Start with "all" selection */
-    if(H5S_select_all(new_ds, FALSE) < 0)
+    if (H5S_select_all(new_ds, FALSE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, NULL, "unable to set all selection")
 
     /* Reset common selection info pointer */
     new_ds->select.sel_info.hslab = NULL;
 
     /* Reset "shared" info on extent */
-    if(H5O_msg_reset_share(H5O_SDSPACE_ID, &(new_ds->extent.sh_loc)) < 0)
+    if (H5O_msg_reset_share(H5O_SDSPACE_ID, &(new_ds->extent.sh_loc)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRESET, NULL, "unable to reset shared component info")
 
     /* Set return value */
     ret_value = new_ds;
 
 done:
-    if(ret_value == NULL) {
-        if(new_ds && H5S_close(new_ds) < 0)
+    if (ret_value == NULL) {
+        if (new_ds && H5S_close(new_ds) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, NULL, "unable to release dataspace")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Screate
@@ -261,33 +248,32 @@ done:
 hid_t
 H5Screate(H5S_class_t type)
 {
-    H5S_t *new_ds=NULL;         /* New dataspace structure */
-    hid_t ret_value;            /* Return value */
+    H5S_t *new_ds = NULL; /* New dataspace structure */
+    hid_t  ret_value;     /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "Sc", type);
 
     /* Check args */
-    if(type <= H5S_NO_CLASS || type > H5S_NULL)  /* don't allow complex dataspace yet */
+    if (type <= H5S_NO_CLASS || type > H5S_NULL) /* don't allow complex dataspace yet */
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid dataspace type")
 
-    if(NULL == (new_ds = H5S_create(type)))
+    if (NULL == (new_ds = H5S_create(type)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "unable to create dataspace")
 
     /* Atomize */
-    if((ret_value = H5I_register (H5I_DATASPACE, new_ds, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASPACE, new_ds, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom")
 
 done:
-    if(ret_value < 0) {
-        if(new_ds && H5S_close(new_ds) < 0)
+    if (ret_value < 0) {
+        if (new_ds && H5S_close(new_ds) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Screate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_extent_release
  *
@@ -305,25 +291,24 @@ done:
 herr_t
 H5S_extent_release(H5S_extent_t *extent)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(extent);
 
     /* Release extent */
-    if(extent->type == H5S_SIMPLE) {
-        if(extent->size)
+    if (extent->type == H5S_SIMPLE) {
+        if (extent->size)
             extent->size = H5FL_ARR_FREE(hsize_t, extent->size);
-        if(extent->max)
+        if (extent->max)
             extent->max = H5FL_ARR_FREE(hsize_t, extent->max);
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_extent_release() */
+} /* end H5S_extent_release() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_close
  *
@@ -339,18 +324,18 @@ done:
 herr_t
 H5S_close(H5S_t *ds)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(ds);
 
     /* Release selection (this should come before the extent release) */
-    if(H5S_SELECT_RELEASE(ds) < 0)
+    if (H5S_SELECT_RELEASE(ds) < 0)
         HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace selection")
 
     /* Release extent */
-    if(H5S_extent_release(&ds->extent) < 0)
+    if (H5S_extent_release(&ds->extent) < 0)
         HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace extent")
 
     /* Release the main structure */
@@ -360,7 +345,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sclose
  *
@@ -380,24 +364,23 @@ done:
 herr_t
 H5Sclose(hid_t space_id)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", space_id);
 
     /* Check args */
-    if (NULL == H5I_object_verify(space_id,H5I_DATASPACE))
+    if (NULL == H5I_object_verify(space_id, H5I_DATASPACE))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* When the reference count reaches zero the resources are freed */
-    if(H5I_dec_app_ref(space_id) < 0)
+    if (H5I_dec_app_ref(space_id) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDEC, FAIL, "problem freeing id")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Sclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Scopy
  *
@@ -417,35 +400,34 @@ done:
 hid_t
 H5Scopy(hid_t space_id)
 {
-    H5S_t	*src;
-    H5S_t	*dst = NULL;
-    hid_t	ret_value;
+    H5S_t *src;
+    H5S_t *dst = NULL;
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", space_id);
 
     /* Check args */
-    if(NULL == (src = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (src = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Copy */
-    if(NULL == (dst = H5S_copy(src, FALSE, TRUE)))
+    if (NULL == (dst = H5S_copy(src, FALSE, TRUE)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to copy dataspace")
 
     /* Atomize */
-    if((ret_value = H5I_register (H5I_DATASPACE, dst, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASPACE, dst, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom")
 
 done:
-    if(ret_value < 0) {
-        if(dst && H5S_close(dst) < 0)
+    if (ret_value < 0) {
+        if (dst && H5S_close(dst) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Scopy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sextent_copy
  *
@@ -461,36 +443,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Sextent_copy(hid_t dst_id,hid_t src_id)
+H5Sextent_copy(hid_t dst_id, hid_t src_id)
 {
-    H5S_t	*src;
-    H5S_t	*dst;
-    hid_t	ret_value = SUCCEED;
+    H5S_t *src;
+    H5S_t *dst;
+    hid_t  ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ii", dst_id, src_id);
 
     /* Check args */
-    if(NULL == (src = (H5S_t *)H5I_object_verify(src_id, H5I_DATASPACE)))
+    if (NULL == (src = (H5S_t *)H5I_object_verify(src_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
-    if(NULL == (dst = (H5S_t *)H5I_object_verify(dst_id, H5I_DATASPACE)))
+    if (NULL == (dst = (H5S_t *)H5I_object_verify(dst_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Copy */
-    if(H5S_extent_copy(&(dst->extent), &(src->extent), TRUE) < 0)
+    if (H5S_extent_copy(&(dst->extent), &(src->extent), TRUE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "can't copy extent")
 
     /* If the selection is 'all', update the number of elements selected in the
      * destination space */
-    if(H5S_SEL_ALL == H5S_GET_SELECT_TYPE(dst))
-        if(H5S_select_all(dst, FALSE) < 0)
+    if (H5S_SEL_ALL == H5S_GET_SELECT_TYPE(dst))
+        if (H5S_select_all(dst, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Sextent_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_extent_copy
  *
@@ -509,38 +490,38 @@ herr_t
 H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src, hbool_t copy_max)
 {
     unsigned u;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Release destination extent before we copy over it */
-    if(H5S_extent_release(dst) < 0)
+    if (H5S_extent_release(dst) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace extent")
 
     /* Copy the regular fields */
-    dst->type = src->type;
+    dst->type    = src->type;
     dst->version = src->version;
-    dst->nelem = src->nelem;
-    dst->rank = src->rank;
+    dst->nelem   = src->nelem;
+    dst->rank    = src->rank;
 
     switch (src->type) {
         case H5S_NULL:
         case H5S_SCALAR:
             dst->size = NULL;
-            dst->max = NULL;
+            dst->max  = NULL;
             break;
 
         case H5S_SIMPLE:
-            if(src->size) {
+            if (src->size) {
                 dst->size = (hsize_t *)H5FL_ARR_MALLOC(hsize_t, (size_t)src->rank);
-                for(u = 0; u < src->rank; u++)
+                for (u = 0; u < src->rank; u++)
                     dst->size[u] = src->size[u];
             } /* end if */
             else
                 dst->size = NULL;
-            if(copy_max && src->max) {
+            if (copy_max && src->max) {
                 dst->max = (hsize_t *)H5FL_ARR_MALLOC(hsize_t, (size_t)src->rank);
-                for(u = 0; u < src->rank; u++)
+                for (u = 0; u < src->rank; u++)
                     dst->max[u] = src->max[u];
             } /* end if */
             else
@@ -554,14 +535,13 @@ H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src, hbool_t copy_max)
     } /* end switch */
 
     /* Copy the shared object info */
-    if(H5O_set_shared(&(dst->sh_loc), &(src->sh_loc)) < 0)
+    if (H5O_set_shared(&(dst->sh_loc), &(src->sh_loc)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "can't copy shared information")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_extent_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_copy
  *
@@ -586,34 +566,33 @@ done:
 H5S_t *
 H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max)
 {
-    H5S_t		   *dst = NULL;
-    H5S_t		   *ret_value;   /* Return value */
+    H5S_t *dst = NULL;
+    H5S_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(NULL == (dst = H5FL_CALLOC(H5S_t)))
+    if (NULL == (dst = H5FL_CALLOC(H5S_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the source dataspace's extent */
-    if(H5S_extent_copy(&(dst->extent), &(src->extent), copy_max) < 0)
+    if (H5S_extent_copy(&(dst->extent), &(src->extent), copy_max) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy extent")
 
     /* Copy the source dataspace's selection */
-    if(H5S_select_copy(dst, src, share_selection) < 0)
+    if (H5S_select_copy(dst, src, share_selection) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy select")
 
     /* Set the return value */
     ret_value = dst;
 
 done:
-    if(NULL == ret_value)
-        if(dst)
+    if (NULL == ret_value)
+        if (dst)
             dst = H5FL_FREE(H5S_t, dst);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_get_simple_extent_npoints
  *
@@ -638,7 +617,7 @@ done:
 hssize_t
 H5S_get_simple_extent_npoints(const H5S_t *ds)
 {
-    hssize_t    ret_value;
+    hssize_t ret_value;
 
     FUNC_ENTER_NOAPI(-1)
 
@@ -652,7 +631,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_get_simple_extent_npoints() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sget_simple_extent_npoints
  *
@@ -673,14 +651,14 @@ done:
 hssize_t
 H5Sget_simple_extent_npoints(hid_t space_id)
 {
-    H5S_t		   *ds;
-    hssize_t		    ret_value;
+    H5S_t *  ds;
+    hssize_t ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Hs", "i", space_id);
 
     /* Check args */
-    if(NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     ret_value = (hssize_t)H5S_GET_EXTENT_NPOINTS(ds);
@@ -689,7 +667,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Sget_simple_extent_npoints() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_get_npoints_max
  *
@@ -714,8 +691,8 @@ done:
 hsize_t
 H5S_get_npoints_max(const H5S_t *ds)
 {
-    hsize_t	    ret_value;
-    unsigned	    u;
+    hsize_t  ret_value;
+    unsigned u;
 
     FUNC_ENTER_NOAPI(0)
 
@@ -733,8 +710,8 @@ H5S_get_npoints_max(const H5S_t *ds)
 
         case H5S_SIMPLE:
             if (ds->extent.max) {
-                for (ret_value=1, u=0; u<ds->extent.rank; u++) {
-                    if (H5S_UNLIMITED==ds->extent.max[u]) {
+                for (ret_value = 1, u = 0; u < ds->extent.rank; u++) {
+                    if (H5S_UNLIMITED == ds->extent.max[u]) {
                         ret_value = HSIZET_MAX;
                         break;
                     }
@@ -743,7 +720,7 @@ H5S_get_npoints_max(const H5S_t *ds)
                 }
             }
             else {
-                for (ret_value=1, u=0; u<ds->extent.rank; u++)
+                for (ret_value = 1, u = 0; u < ds->extent.rank; u++)
                     ret_value *= ds->extent.size[u];
             }
             break;
@@ -758,7 +735,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sget_simple_extent_ndims
  *
@@ -778,14 +754,14 @@ done:
 int
 H5Sget_simple_extent_ndims(hid_t space_id)
 {
-    H5S_t		   *ds;
-    int		   ret_value;
+    H5S_t *ds;
+    int    ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", space_id);
 
     /* Check args */
-    if(NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     ret_value = (int)H5S_GET_EXTENT_NDIMS(ds);
@@ -794,7 +770,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Sget_simple_extent_ndims() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_get_simple_extent_ndims
  *
@@ -819,14 +794,14 @@ done:
 int
 H5S_get_simple_extent_ndims(const H5S_t *ds)
 {
-    int	ret_value;      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* check args */
     HDassert(ds);
 
-    switch(H5S_GET_EXTENT_TYPE(ds)) {
+    switch (H5S_GET_EXTENT_TYPE(ds)) {
         case H5S_NULL:
         case H5S_SCALAR:
         case H5S_SIMPLE:
@@ -843,7 +818,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_get_simple_extent_ndims() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sget_simple_extent_dims
  *
@@ -867,11 +841,10 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
-			  hsize_t maxdims[]/*out*/)
+H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[] /*out*/, hsize_t maxdims[] /*out*/)
 {
-    H5S_t		   *ds;
-    int		   ret_value;
+    H5S_t *ds;
+    int    ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Is", "ixx", space_id, dims, maxdims);
@@ -886,7 +859,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_extent_get_dims
  *
@@ -904,15 +876,15 @@ done:
 int
 H5S_extent_get_dims(const H5S_extent_t *ext, hsize_t dims[], hsize_t max_dims[])
 {
-    int	i;              /* Local index variable */
-    int	ret_value;      /* Return value */
+    int i;         /* Local index variable */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* check args */
     HDassert(ext);
 
-    switch(ext->type) {
+    switch (ext->type) {
         case H5S_NULL:
         case H5S_SCALAR:
             ret_value = 0;
@@ -920,16 +892,16 @@ H5S_extent_get_dims(const H5S_extent_t *ext, hsize_t dims[], hsize_t max_dims[])
 
         case H5S_SIMPLE:
             ret_value = (int)ext->rank;
-            for(i = 0; i < ret_value; i++) {
-                if(dims)
+            for (i = 0; i < ret_value; i++) {
+                if (dims)
                     dims[i] = ext->size[i];
-                if(max_dims) {
-                    if(ext->max)
+                if (max_dims) {
+                    if (ext->max)
                         max_dims[i] = ext->max[i];
                     else
                         max_dims[i] = ext->size[i];
                 } /* end if */
-            } /* end for */
+            }     /* end for */
             break;
 
         case H5S_NO_CLASS:
@@ -942,7 +914,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_extent_get_dims() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_get_simple_extent_dims
  *
@@ -963,7 +934,7 @@ done:
 int
 H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[])
 {
-    int	ret_value;      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -971,14 +942,13 @@ H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[])
     HDassert(ds);
 
     /* Get dims for extent */
-    if((ret_value = H5S_extent_get_dims(&ds->extent, dims, max_dims)) < 0)
+    if ((ret_value = H5S_extent_get_dims(&ds->extent, dims, max_dims)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't retrieve dataspace extent dims")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_get_simple_extent_dims() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_write
  *
@@ -995,7 +965,7 @@ done:
 herr_t
 H5S_write(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned update_flags, H5S_t *ds)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1005,14 +975,13 @@ H5S_write(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned update_flags, H5S_t *ds)
     HDassert(H5S_GET_EXTENT_TYPE(ds) >= 0);
 
     /* Write the current dataspace extent to the dataspace message */
-    if(H5O_msg_write_oh(f, dxpl_id, oh, H5O_SDSPACE_ID, 0, update_flags, &(ds->extent)) < 0)
+    if (H5O_msg_write_oh(f, dxpl_id, oh, H5O_SDSPACE_ID, 0, update_flags, &(ds->extent)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't update simple dataspace message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_append
  *
@@ -1036,7 +1005,7 @@ done:
 herr_t
 H5S_append(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5S_t *ds)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1046,14 +1015,13 @@ H5S_append(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5S_t *ds)
     HDassert(H5S_GET_EXTENT_TYPE(ds) >= 0);
 
     /* Add the dataspace message to the object header */
-    if(H5O_msg_append_oh(f, dxpl_id, oh, H5O_SDSPACE_ID, 0, 0, &(ds->extent)) < 0)
+    if (H5O_msg_append_oh(f, dxpl_id, oh, H5O_SDSPACE_ID, 0, 0, &(ds->extent)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't add simple dataspace message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_append() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_read
  *
@@ -1071,37 +1039,36 @@ done:
 H5S_t *
 H5S_read(const H5O_loc_t *loc, hid_t dxpl_id)
 {
-    H5S_t	   *ds = NULL;          /* Dataspace to return */
-    H5S_t	   *ret_value;          /* Return value */
+    H5S_t *ds = NULL; /* Dataspace to return */
+    H5S_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* check args */
     HDassert(loc);
 
-    if(NULL == (ds = H5FL_CALLOC(H5S_t)))
+    if (NULL == (ds = H5FL_CALLOC(H5S_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
-    if(H5O_msg_read(loc, H5O_SDSPACE_ID, &(ds->extent), dxpl_id) == NULL)
+    if (H5O_msg_read(loc, H5O_SDSPACE_ID, &(ds->extent), dxpl_id) == NULL)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, NULL, "unable to load dataspace info from dataset header")
 
     /* Default to entire dataspace being selected */
-    if(H5S_select_all(ds, FALSE) < 0)
+    if (H5S_select_all(ds, FALSE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, NULL, "unable to set all selection")
 
     /* Set the value for successful return */
     ret_value = ds;
 
 done:
-    if(ret_value == NULL) {
-        if(ds != NULL)
+    if (ret_value == NULL) {
+        if (ds != NULL)
             ds = H5FL_FREE(H5S_t, ds);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_read() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_is_simple
@@ -1109,17 +1076,17 @@ done:
     Check if a dataspace is simple (internal)
  USAGE
     htri_t H5S_is_simple(sdim)
-	H5S_t *sdim;		IN: Pointer to dataspace object to query
+        H5S_t *sdim;		IN: Pointer to dataspace object to query
  RETURNS
     TRUE/FALSE/FAIL
  DESCRIPTION
-	This function determines the if a dataspace is "simple". ie. if it
+        This function determines the if a dataspace is "simple". ie. if it
     has orthogonal, evenly spaced dimensions.
 --------------------------------------------------------------------------*/
 static htri_t
 H5S_is_simple(const H5S_t *sdim)
 {
-    htri_t		    ret_value;
+    htri_t ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1127,13 +1094,12 @@ H5S_is_simple(const H5S_t *sdim)
     HDassert(sdim);
 
     /* H5S_NULL shouldn't be simple dataspace */
-    ret_value = (H5S_GET_EXTENT_TYPE(sdim) == H5S_SIMPLE ||
-	  H5S_GET_EXTENT_TYPE(sdim) == H5S_SCALAR) ? TRUE : FALSE;
+    ret_value =
+        (H5S_GET_EXTENT_TYPE(sdim) == H5S_SIMPLE || H5S_GET_EXTENT_TYPE(sdim) == H5S_SCALAR) ? TRUE : FALSE;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_is_simple() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sis_simple
@@ -1141,33 +1107,32 @@ H5S_is_simple(const H5S_t *sdim)
     Check if a dataspace is simple
  USAGE
     htri_t H5Sis_simple(space_id)
-	hid_t space_id;	      IN: ID of dataspace object to query
+        hid_t space_id;	      IN: ID of dataspace object to query
  RETURNS
     TRUE/FALSE/FAIL
  DESCRIPTION
-	This function determines the if a dataspace is "simple". ie. if it
+        This function determines the if a dataspace is "simple". ie. if it
     has orthogonal, evenly spaced dimensions.
 --------------------------------------------------------------------------*/
 htri_t
 H5Sis_simple(hid_t space_id)
 {
-    H5S_t		   *space;	/* dataspace to modify */
-    htri_t		    ret_value;
+    H5S_t *space; /* dataspace to modify */
+    htri_t ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", space_id);
 
     /* Check args and all the boring stuff. */
-    if ((space = (H5S_t *)H5I_object_verify(space_id,H5I_DATASPACE)) == NULL)
-	HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a dataspace")
+    if ((space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)) == NULL)
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a dataspace")
 
     ret_value = H5S_is_simple(space);
 
-  done:
+done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sset_extent_simple
@@ -1178,8 +1143,8 @@ H5Sis_simple(hid_t space_id)
         hid_t space_id;	      IN: Dataspace object to query
         int rank;	      IN: # of dimensions for the dataspace
         const size_t *dims;   IN: Size of each dimension for the dataspace
- 	const size_t *max;    IN: Maximum size of each dimension for the
- 				  dataspace
+        const size_t *max;    IN: Maximum size of each dimension for the
+                                  dataspace
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
@@ -1204,47 +1169,47 @@ H5Sis_simple(hid_t space_id)
     release.
 --------------------------------------------------------------------------*/
 herr_t
-H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/],
-		      const hsize_t max[/*rank*/])
+H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/], const hsize_t max[/*rank*/])
 {
-    H5S_t	*space;	/* dataspace to modify */
-    int	        u;	/* local counting variable */
-    herr_t      ret_value=SUCCEED;   /* Return value */
+    H5S_t *space;               /* dataspace to modify */
+    int    u;                   /* local counting variable */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iIs*[a1]h*[a1]h", space_id, rank, dims, max);
 
     /* Check args */
-    if ((space = (H5S_t *)H5I_object_verify(space_id,H5I_DATASPACE)) == NULL)
+    if ((space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)) == NULL)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a dataspace")
     if (rank > 0 && dims == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no dimensions specified")
-    if (rank<0 || rank>H5S_MAX_RANK)
+    if (rank < 0 || rank > H5S_MAX_RANK)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid rank")
     if (dims) {
-        for (u=0; u<rank; u++) {
-            if (H5S_UNLIMITED==dims[u])
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "current dimension must have a specific size, not H5S_UNLIMITED")
+        for (u = 0; u < rank; u++) {
+            if (H5S_UNLIMITED == dims[u])
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                            "current dimension must have a specific size, not H5S_UNLIMITED")
         }
     }
-    if (max!=NULL) {
-        if(dims==NULL)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "maximum dimension specified, but no current dimensions specified")
-        for (u=0; u<rank; u++) {
-            if (max[u]!=H5S_UNLIMITED && max[u]<dims[u])
+    if (max != NULL) {
+        if (dims == NULL)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "maximum dimension specified, but no current dimensions specified")
+        for (u = 0; u < rank; u++) {
+            if (max[u] != H5S_UNLIMITED && max[u] < dims[u])
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid maximum dimension size")
         }
     }
 
     /* Do it */
-    if (H5S_set_extent_simple(space, (unsigned)rank, dims, max)<0)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to set simple extent")
+    if (H5S_set_extent_simple(space, (unsigned)rank, dims, max) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to set simple extent")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_set_extent_simple
  *
@@ -1261,11 +1226,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims,
-		       const hsize_t *max)
+H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims, const hsize_t *max)
 {
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1274,16 +1238,16 @@ H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims,
     HDassert(0 == rank || dims);
 
     /* shift out of the previous state to a "simple" dataspace.  */
-    if(H5S_extent_release(&space->extent) < 0)
+    if (H5S_extent_release(&space->extent) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "failed to release previous dataspace extent")
 
-    if(rank == 0) {		/* scalar variable */
-        space->extent.type = H5S_SCALAR;
+    if (rank == 0) { /* scalar variable */
+        space->extent.type  = H5S_SCALAR;
         space->extent.nelem = 1;
-        space->extent.rank = 0;	/* set to scalar rank */
-    } /* end if */
+        space->extent.rank  = 0; /* set to scalar rank */
+    }                            /* end if */
     else {
-        hsize_t nelem;  /* Number of elements in extent */
+        hsize_t nelem; /* Number of elements in extent */
 
         space->extent.type = H5S_SIMPLE;
 
@@ -1292,19 +1256,20 @@ H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims,
         space->extent.size = (hsize_t *)H5FL_ARR_MALLOC(hsize_t, (size_t)rank);
 
         /* Copy the dimensions & compute the number of elements in the extent */
-        for(u = 0, nelem = 1; u < space->extent.rank; u++) {
+        for (u = 0, nelem = 1; u < space->extent.rank; u++) {
             space->extent.size[u] = dims[u];
             nelem *= dims[u];
         } /* end for */
         space->extent.nelem = nelem;
 
-        /* Copy the maximum dimensions if specified. Otherwise, the maximal dimensions are the 
+        /* Copy the maximum dimensions if specified. Otherwise, the maximal dimensions are the
          * same as the dimension */
         space->extent.max = (hsize_t *)H5FL_ARR_MALLOC(hsize_t, (size_t)rank);
-        if(max != NULL) {
+        if (max != NULL) {
             HDmemcpy(space->extent.max, max, sizeof(hsize_t) * rank);
-        } else {
-            for(u = 0; u < space->extent.rank; u++)
+        }
+        else {
+            for (u = 0; u < space->extent.rank; u++)
                 space->extent.max[u] = dims[u];
         }
     } /* end else */
@@ -1316,15 +1281,14 @@ H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims,
     space->select.offset_changed = FALSE;
 
     /* If the selection is 'all', update the number of elements selected */
-    if(H5S_GET_SELECT_TYPE(space) == H5S_SEL_ALL)
-        if(H5S_select_all(space, FALSE) < 0)
+    if (H5S_GET_SELECT_TYPE(space) == H5S_SEL_ALL)
+        if (H5S_select_all(space, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5S_set_extent_simple() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Screate_simple
  *
@@ -1346,60 +1310,59 @@ done:
  *
  * Modification:
  *              Raymond Lu 03/30/2011
- *              We allow 0-dimension for non-unlimited dimension starting 
+ *              We allow 0-dimension for non-unlimited dimension starting
  *              from 1.8.7 release.
  *
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Screate_simple(int rank, const hsize_t dims[/*rank*/],
-		  const hsize_t maxdims[/*rank*/])
+H5Screate_simple(int rank, const hsize_t dims[/*rank*/], const hsize_t maxdims[/*rank*/])
 {
-    H5S_t	*space = NULL;
-    int		i;
-    hid_t	ret_value;
+    H5S_t *space = NULL;
+    int    i;
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "Is*[a0]h*[a0]h", rank, dims, maxdims);
 
     /* Check arguments */
-    if(rank < 0)
+    if (rank < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dimensionality cannot be negative")
-    if(rank > H5S_MAX_RANK)
+    if (rank > H5S_MAX_RANK)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dimensionality is too large")
 
     /* We allow users to use this function to create scalar or null dataspace.
      * Check DIMS isn't set when the RANK is 0.
      */
-    if(!dims && rank != 0)
+    if (!dims && rank != 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid dataspace information")
 
     /* Check whether the current dimensions are valid */
-    for(i = 0; i < rank; i++) {
-        if(H5S_UNLIMITED == dims[i])
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "current dimension must have a specific size, not H5S_UNLIMITED")
-        if(maxdims && H5S_UNLIMITED != maxdims[i] && maxdims[i]<dims[i])
+    for (i = 0; i < rank; i++) {
+        if (H5S_UNLIMITED == dims[i])
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "current dimension must have a specific size, not H5S_UNLIMITED")
+        if (maxdims && H5S_UNLIMITED != maxdims[i] && maxdims[i] < dims[i])
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "maxdims is smaller than dims")
     } /* end for */
 
     /* Create the space and set the extent */
-    if(NULL == (space = H5S_create_simple((unsigned)rank,dims,maxdims)))
+    if (NULL == (space = H5S_create_simple((unsigned)rank, dims, maxdims)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create simple dataspace")
 
     /* Atomize */
-    if((ret_value = H5I_register (H5I_DATASPACE, space, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASPACE, space, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace ID")
 
 done:
-    if(ret_value < 0) {
-        if(space && H5S_close(space) < 0)
+    if (ret_value < 0) {
+        if (space && H5S_close(space) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Screate_simple() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_create_simple
  *
@@ -1420,27 +1383,25 @@ done:
  *-------------------------------------------------------------------------
  */
 H5S_t *
-H5S_create_simple(unsigned rank, const hsize_t dims[/*rank*/],
-		  const hsize_t maxdims[/*rank*/])
+H5S_create_simple(unsigned rank, const hsize_t dims[/*rank*/], const hsize_t maxdims[/*rank*/])
 {
-    H5S_t	*ret_value;     /* Return value */
+    H5S_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Check arguments */
-    HDassert(rank <=H5S_MAX_RANK);
+    HDassert(rank <= H5S_MAX_RANK);
 
     /* Create the space and set the extent */
-    if(NULL==(ret_value=H5S_create(H5S_SIMPLE)))
+    if (NULL == (ret_value = H5S_create(H5S_SIMPLE)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, NULL, "can't create simple dataspace")
-    if(H5S_set_extent_simple(ret_value,rank,dims,maxdims)<0)
+    if (H5S_set_extent_simple(ret_value, rank, dims, maxdims) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, NULL, "can't set dimensions")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_create_simple() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sencode
  *
@@ -1462,24 +1423,23 @@ done:
 herr_t
 H5Sencode(hid_t obj_id, void *buf, size_t *nalloc)
 {
-    H5S_t       *dspace;
-    herr_t      ret_value=SUCCEED;
+    H5S_t *dspace;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*x*z", obj_id, buf, nalloc);
 
     /* Check argument and retrieve object */
-    if (NULL==(dspace=(H5S_t *)H5I_object_verify(obj_id, H5I_DATASPACE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
+    if (NULL == (dspace = (H5S_t *)H5I_object_verify(obj_id, H5I_DATASPACE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
-    if(H5S_encode(dspace, (unsigned char *)buf, nalloc)<0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode datatype")
+    if (H5S_encode(dspace, (unsigned char *)buf, nalloc) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_encode
  *
@@ -1499,30 +1459,30 @@ done:
 static herr_t
 H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc)
 {
-    size_t      extent_size;    /* Size of serialized dataspace extent */
-    hssize_t    sselect_size;   /* Signed size of serialized dataspace selection */
-    size_t      select_size;    /* Size of serialized dataspace selection */
-    H5F_t       *f = NULL;      /* Fake file structure*/
-    herr_t      ret_value = SUCCEED;
+    size_t   extent_size;      /* Size of serialized dataspace extent */
+    hssize_t sselect_size;     /* Signed size of serialized dataspace selection */
+    size_t   select_size;      /* Size of serialized dataspace selection */
+    H5F_t *  f         = NULL; /* Fake file structure*/
+    herr_t   ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate "fake" file structure */
-    if(NULL == (f = H5F_fake_alloc((uint8_t)0)))
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate fake file struct")
+    if (NULL == (f = H5F_fake_alloc((uint8_t)0)))
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate fake file struct")
 
     /* Find out the size of buffer needed for extent */
-    if((extent_size = H5O_msg_raw_size(f, H5O_SDSPACE_ID, TRUE, obj)) == 0)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_BADSIZE, FAIL, "can't find dataspace size")
+    if ((extent_size = H5O_msg_raw_size(f, H5O_SDSPACE_ID, TRUE, obj)) == 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADSIZE, FAIL, "can't find dataspace size")
 
     /* Find out the size of buffer needed for selection */
-    if((sselect_size = H5S_SELECT_SERIAL_SIZE(obj)) < 0)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_BADSIZE, FAIL, "can't find dataspace selection size")
+    if ((sselect_size = H5S_SELECT_SERIAL_SIZE(obj)) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADSIZE, FAIL, "can't find dataspace selection size")
     H5_CHECKED_ASSIGN(select_size, size_t, sselect_size, hssize_t);
 
     /* Verify the size of buffer.  If it's not big enough, simply return the
      * right size without filling the buffer. */
-    if(!buf || *nalloc < (extent_size + select_size + 1 + 1 + 1 + 4))
+    if (!buf || *nalloc < (extent_size + select_size + 1 + 1 + 1 + 4))
         *nalloc = extent_size + select_size + 1 + 1 + 1 + 4;
     else {
         /* Encode the type of the information */
@@ -1538,24 +1498,23 @@ H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc)
         UINT32ENCODE(buf, extent_size);
 
         /* Encode the extent part of dataspace */
-        if(H5O_msg_encode(f, H5O_SDSPACE_ID, TRUE, buf, obj) < 0)
+        if (H5O_msg_encode(f, H5O_SDSPACE_ID, TRUE, buf, obj) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTENCODE, FAIL, "can't encode extent space")
         buf += extent_size;
 
         /* Encode the selection part of dataspace.  */
-        if(H5S_SELECT_SERIALIZE(obj, buf) < 0)
+        if (H5S_SELECT_SERIALIZE(obj, buf) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTENCODE, FAIL, "can't encode select space")
     } /* end else */
 
 done:
     /* Release fake file structure */
-    if(f && H5F_fake_free(f) < 0)
+    if (f && H5F_fake_free(f) < 0)
         HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release fake file struct")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sdecode
  *
@@ -1575,27 +1534,26 @@ done:
 hid_t
 H5Sdecode(const void *buf)
 {
-    H5S_t       *ds;
-    hid_t       ret_value;
+    H5S_t *ds;
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "*x", buf);
 
-    if(buf == NULL)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "empty buffer")
+    if (buf == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "empty buffer")
 
-    if((ds = H5S_decode((const unsigned char *)buf)) == NULL)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDECODE, FAIL, "can't decode object")
+    if ((ds = H5S_decode((const unsigned char *)buf)) == NULL)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDECODE, FAIL, "can't decode object")
 
     /* Register the type and return the ID */
-    if((ret_value = H5I_register(H5I_DATASPACE, ds, TRUE)) < 0)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTREGISTER, FAIL, "unable to register dataspace")
+    if ((ret_value = H5I_register(H5I_DATASPACE, ds, TRUE)) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTREGISTER, FAIL, "unable to register dataspace")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Sdecode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_decode
  *
@@ -1612,57 +1570,59 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static H5S_t*
+static H5S_t *
 H5S_decode(const unsigned char *buf)
 {
-    H5S_t       *ds;
+    H5S_t *       ds;
     H5S_extent_t *extent;
-    size_t      extent_size;            /* size of the extent message*/
-    H5F_t       *f = NULL;              /* Fake file structure*/
-    uint8_t     sizeof_size;            /* 'Size of sizes' for file */
-    H5S_t       *ret_value;
+    size_t        extent_size; /* size of the extent message*/
+    H5F_t *       f = NULL;    /* Fake file structure*/
+    uint8_t       sizeof_size; /* 'Size of sizes' for file */
+    H5S_t *       ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Decode the type of the information */
-    if(*buf++ != H5O_SDSPACE_ID)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_BADMESG, NULL, "not an encoded dataspace")
+    if (*buf++ != H5O_SDSPACE_ID)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADMESG, NULL, "not an encoded dataspace")
 
     /* Decode the version of the dataspace information */
-    if(*buf++ != H5S_ENCODE_VERSION)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_VERSION, NULL, "unknown version of encoded dataspace")
+    if (*buf++ != H5S_ENCODE_VERSION)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_VERSION, NULL, "unknown version of encoded dataspace")
 
     /* Decode the "size of size" information */
     sizeof_size = *buf++;
 
     /* Allocate "fake" file structure */
-    if(NULL == (f = H5F_fake_alloc(sizeof_size)))
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, NULL, "can't allocate fake file struct")
+    if (NULL == (f = H5F_fake_alloc(sizeof_size)))
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, NULL, "can't allocate fake file struct")
 
     /* Decode size of extent information */
     UINT32DECODE(buf, extent_size);
 
     /* Decode the extent part of dataspace */
     /* (pass mostly bogus file pointer and bogus DXPL) */
-    if((extent = (H5S_extent_t *)H5O_msg_decode(f, H5P_DEFAULT, NULL, H5O_SDSPACE_ID, extent_size, buf))==NULL)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDECODE, NULL, "can't decode object")
+    if ((extent = (H5S_extent_t *)H5O_msg_decode(f, H5P_DEFAULT, NULL, H5O_SDSPACE_ID, extent_size, buf)) ==
+        NULL)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDECODE, NULL, "can't decode object")
     buf += extent_size;
 
     /* Copy the extent into dataspace structure */
-    if((ds = H5FL_CALLOC(H5S_t))==NULL)
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for dataspace conversion path table")
-    if(H5O_msg_copy(H5O_SDSPACE_ID, extent, &(ds->extent)) == NULL)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy object")
-    if(H5S_extent_release(extent) < 0)
+    if ((ds = H5FL_CALLOC(H5S_t)) == NULL)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "memory allocation failed for dataspace conversion path table")
+    if (H5O_msg_copy(H5O_SDSPACE_ID, extent, &(ds->extent)) == NULL)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy object")
+    if (H5S_extent_release(extent) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTDELETE, NULL, "can't release previous dataspace")
     extent = H5FL_FREE(H5S_extent_t, extent);
 
     /* Initialize to "all" selection. Deserialization relies on valid existing selection. */
-    if(H5S_select_all(ds, FALSE) < 0)
+    if (H5S_select_all(ds, FALSE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, NULL, "unable to set all selection")
 
     /* Decode the select part of dataspace.  I believe this part always exists. */
-    if(H5S_SELECT_DESERIALIZE(ds, buf) < 0)
+    if (H5S_SELECT_DESERIALIZE(ds, buf) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDECODE, NULL, "can't decode space selection")
 
     /* Set return value */
@@ -1670,13 +1630,12 @@ H5S_decode(const unsigned char *buf)
 
 done:
     /* Release fake file structure */
-    if(f && H5F_fake_free(f) < 0)
+    if (f && H5F_fake_free(f) < 0)
         HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, NULL, "unable to release fake file struct")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_get_simple_extent_type
  *
@@ -1702,19 +1661,18 @@ done:
 H5S_class_t
 H5S_get_simple_extent_type(const H5S_t *space)
 {
-    H5S_class_t	ret_value;
+    H5S_class_t ret_value;
 
     FUNC_ENTER_NOAPI(H5S_NO_CLASS)
 
     HDassert(space);
 
-    ret_value=H5S_GET_EXTENT_TYPE(space);
+    ret_value = H5S_GET_EXTENT_TYPE(space);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sget_simple_extent_type
  *
@@ -1736,8 +1694,8 @@ done:
 H5S_class_t
 H5Sget_simple_extent_type(hid_t sid)
 {
-    H5S_t	*space;
-    H5S_class_t	ret_value;
+    H5S_t *     space;
+    H5S_class_t ret_value;
 
     FUNC_ENTER_API(H5S_NO_CLASS)
     H5TRACE1("Sc", "i", sid);
@@ -1746,13 +1704,12 @@ H5Sget_simple_extent_type(hid_t sid)
     if (NULL == (space = (H5S_t *)H5I_object_verify(sid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5S_NO_CLASS, "not a dataspace")
 
-    ret_value=H5S_GET_EXTENT_TYPE(space);
+    ret_value = H5S_GET_EXTENT_TYPE(space);
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sset_extent_none
@@ -1764,14 +1721,14 @@ done:
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
-	This function resets the type of a dataspace back to "none" with no
+        This function resets the type of a dataspace back to "none" with no
     extent information stored for the dataspace.
 --------------------------------------------------------------------------*/
 herr_t
 H5Sset_extent_none(hid_t space_id)
 {
-    H5S_t		   *space;	/* dataspace to modify */
-    herr_t                  ret_value=SUCCEED;  /* Return value */
+    H5S_t *space;               /* dataspace to modify */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", space_id);
@@ -1781,16 +1738,15 @@ H5Sset_extent_none(hid_t space_id)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a dataspace")
 
     /* Clear the previous extent from the dataspace */
-    if(H5S_extent_release(&space->extent)<0)
+    if (H5S_extent_release(&space->extent) < 0)
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTDELETE, FAIL, "can't release previous dataspace")
 
-    space->extent.type=H5S_NO_CLASS;
+    space->extent.type = H5S_NO_CLASS;
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Sset_extent_none() */
+} /* end H5Sset_extent_none() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Soffset_simple
@@ -1803,15 +1759,15 @@ done:
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
-	This function creates an offset for the selection within an extent, allowing
+        This function creates an offset for the selection within an extent, allowing
     the same shaped selection to be moved to different locations within a
     dataspace without requiring it to be re-defined.
 --------------------------------------------------------------------------*/
 herr_t
 H5Soffset_simple(hid_t space_id, const hssize_t *offset)
 {
-    H5S_t		   *space;	/* dataspace to modify */
-    herr_t                  ret_value=SUCCEED;  /* Return value */
+    H5S_t *space;               /* dataspace to modify */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Hs", space_id, offset);
@@ -1819,21 +1775,20 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset)
     /* Check args */
     if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a dataspace")
-    if (space->extent.rank==0 || (H5S_GET_EXTENT_TYPE(space)==H5S_SCALAR
-            || H5S_GET_EXTENT_TYPE(space)==H5S_NULL))
+    if (space->extent.rank == 0 ||
+        (H5S_GET_EXTENT_TYPE(space) == H5S_SCALAR || H5S_GET_EXTENT_TYPE(space) == H5S_NULL))
         HGOTO_ERROR(H5E_ATOM, H5E_UNSUPPORTED, FAIL, "can't set offset on scalar or null dataspace")
     if (offset == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no offset specified")
 
     /* Set the selection offset */
-    if(H5S_select_offset(space,offset)<0)
+    if (H5S_select_offset(space, offset) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't set offset")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Soffset_simple() */
+} /* end H5Soffset_simple() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5S_set_extent
  *
@@ -1851,7 +1806,7 @@ htri_t
 H5S_set_extent(H5S_t *space, const hsize_t *size)
 {
     unsigned u;                 /* Local index variable */
-    htri_t ret_value = FALSE;   /* Return value */
+    htri_t   ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1860,28 +1815,28 @@ H5S_set_extent(H5S_t *space, const hsize_t *size)
     HDassert(size);
 
     /* Verify that the dimensions being changed are allowed to change */
-    for(u = 0; u < space->extent.rank; u++) {
-        if(space->extent.size[u] != size[u]) {
+    for (u = 0; u < space->extent.rank; u++) {
+        if (space->extent.size[u] != size[u]) {
             /* Check for invalid dimension size modification */
-            if(space->extent.max && H5S_UNLIMITED != space->extent.max[u] &&
-                     space->extent.max[u] < size[u])
-                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "dimension cannot exceed the existing maximal size (new: %llu max: %llu)", (unsigned long long)size[u], (unsigned long long)space->extent.max[u])
+            if (space->extent.max && H5S_UNLIMITED != space->extent.max[u] && space->extent.max[u] < size[u])
+                HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL,
+                            "dimension cannot exceed the existing maximal size (new: %llu max: %llu)",
+                            (unsigned long long)size[u], (unsigned long long)space->extent.max[u])
 
             /* Indicate that dimension size can be modified */
             ret_value = TRUE;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Update dimension size(s) */
-    if(ret_value)
-        if(H5S_set_extent_real(space, size) < 0)
-             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "failed to change dimension size(s)")
+    if (ret_value)
+        if (H5S_set_extent_real(space, size) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "failed to change dimension size(s)")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_set_extent() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5S_has_extent
  *
@@ -1906,7 +1861,7 @@ H5S_has_extent(const H5S_t *ds)
 
     HDassert(ds);
 
-    if(0 == ds->extent.rank && 0 == ds->extent.nelem && H5S_NULL != ds->extent.type)
+    if (0 == ds->extent.rank && 0 == ds->extent.nelem && H5S_NULL != ds->extent.type)
         ret_value = FALSE;
     else
         ret_value = TRUE;
@@ -1914,7 +1869,6 @@ H5S_has_extent(const H5S_t *ds)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_has_extent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5S_set_extent_real
  *
@@ -1931,9 +1885,9 @@ H5S_has_extent(const H5S_t *ds)
 herr_t
 H5S_set_extent_real(H5S_t *space, const hsize_t *size)
 {
-    hsize_t nelem;      /* Number of elements in extent */
-    unsigned u;         /* Local index variable */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    hsize_t  nelem;               /* Number of elements in extent */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1942,26 +1896,25 @@ H5S_set_extent_real(H5S_t *space, const hsize_t *size)
     HDassert(size);
 
     /* Change the dataspace size & re-compute the number of elements in the extent */
-    for(u = 0, nelem = 1; u < space->extent.rank; u++ ) {
+    for (u = 0, nelem = 1; u < space->extent.rank; u++) {
         space->extent.size[u] = size[u];
         nelem *= size[u];
     } /* end for */
     space->extent.nelem = nelem;
 
     /* If the selection is 'all', update the number of elements selected */
-    if(H5S_SEL_ALL == H5S_GET_SELECT_TYPE(space))
-        if(H5S_select_all(space, FALSE) < 0)
+    if (H5S_SEL_ALL == H5S_GET_SELECT_TYPE(space))
+        if (H5S_select_all(space, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
     /* Mark the dataspace as no longer shared if it was before */
-    if(H5O_msg_reset_share(H5O_SDSPACE_ID, space) < 0)
+    if (H5O_msg_reset_share(H5O_SDSPACE_ID, space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRESET, FAIL, "can't stop sharing dataspace")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_set_extent_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Sextent_equal
  *
@@ -1979,26 +1932,25 @@ done:
 htri_t
 H5Sextent_equal(hid_t space1_id, hid_t space2_id)
 {
-    const H5S_t	*ds1, *ds2;     /* Dataspaces to compare */
-    htri_t	ret_value;
+    const H5S_t *ds1, *ds2; /* Dataspaces to compare */
+    htri_t       ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("t", "ii", space1_id, space2_id);
 
     /* check args */
-    if(NULL == (ds1 = (const H5S_t *)H5I_object_verify(space1_id, H5I_DATASPACE)) ||
-            NULL == (ds2 = (const H5S_t *)H5I_object_verify(space2_id, H5I_DATASPACE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
+    if (NULL == (ds1 = (const H5S_t *)H5I_object_verify(space1_id, H5I_DATASPACE)) ||
+        NULL == (ds2 = (const H5S_t *)H5I_object_verify(space2_id, H5I_DATASPACE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Check dataspaces for extent's equality */
-    if((ret_value = H5S_extent_equal(ds1, ds2)) < 0)
-	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOMPARE, FAIL, "dataspace comparison failed")
+    if ((ret_value = H5S_extent_equal(ds1, ds2)) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOMPARE, FAIL, "dataspace comparison failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Sextent_equal() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_extent_equal
@@ -2010,13 +1962,13 @@ done:
  RETURNS
      TRUE if equal, FALSE if unequal on succeess/Negative on failure
  DESCRIPTION
-	Compare two dataspaces if their extents are identical.
+        Compare two dataspaces if their extents are identical.
 --------------------------------------------------------------------------*/
 htri_t
 H5S_extent_equal(const H5S_t *ds1, const H5S_t *ds2)
 {
-    unsigned u;                 /* Local index variable */
-    htri_t ret_value = TRUE;    /* Return value */
+    unsigned u;                /* Local index variable */
+    htri_t   ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2025,41 +1977,39 @@ H5S_extent_equal(const H5S_t *ds1, const H5S_t *ds2)
     HDassert(ds2);
 
     /* Make certain the dataspaces are the same type */
-    if(ds1->extent.type != ds2->extent.type)
+    if (ds1->extent.type != ds2->extent.type)
         HGOTO_DONE(FALSE)
 
     /* Make certain the dataspaces are the same rank */
-    if(ds1->extent.rank != ds2->extent.rank)
+    if (ds1->extent.rank != ds2->extent.rank)
         HGOTO_DONE(FALSE)
 
     /* Make certain the dataspaces' current dimensions are the same size */
-    if(ds1->extent.rank > 0) {
+    if (ds1->extent.rank > 0) {
         HDassert(ds1->extent.size);
         HDassert(ds2->extent.size);
-        for(u = 0; u < ds1->extent.rank; u++)
-            if(ds1->extent.size[u] != ds2->extent.size[u])
+        for (u = 0; u < ds1->extent.rank; u++)
+            if (ds1->extent.size[u] != ds2->extent.size[u])
                 HGOTO_DONE(FALSE)
     } /* end if */
 
     /* Make certain the dataspaces' maximum dimensions are the same size */
-    if(ds1->extent.rank > 0) {
+    if (ds1->extent.rank > 0) {
         /* Check for no maximum dimensions on dataspaces */
-        if(ds1->extent.max != NULL && ds2->extent.max != NULL) {
-            for(u = 0; u < ds1->extent.rank; u++)
-                if(ds1->extent.max[u] != ds2->extent.max[u])
+        if (ds1->extent.max != NULL && ds2->extent.max != NULL) {
+            for (u = 0; u < ds1->extent.rank; u++)
+                if (ds1->extent.max[u] != ds2->extent.max[u])
                     HGOTO_DONE(FALSE)
         } /* end if */
-        else
-            if((ds1->extent.max == NULL && ds2->extent.max != NULL) ||
-                    (ds1->extent.max != NULL && ds2->extent.max == NULL))
-                HGOTO_DONE(FALSE)
+        else if ((ds1->extent.max == NULL && ds2->extent.max != NULL) ||
+                 (ds1->extent.max != NULL && ds2->extent.max == NULL))
+            HGOTO_DONE(FALSE)
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_extent_equal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_extent_nelem
  *
@@ -2085,7 +2035,6 @@ H5S_extent_nelem(const H5S_extent_t *ext)
     FUNC_LEAVE_NOAPI(ext->nelem)
 } /* end H5S_extent_nelem() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5S_set_latest_version
  *
@@ -2113,7 +2062,7 @@ H5S_set_latest_version(H5S_t *ds)
 } /* end H5S_set_latest_version() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5S_extend
  *
@@ -2131,8 +2080,8 @@ H5S_set_latest_version(H5S_t *ds)
 int
 H5S_extend(H5S_t *space, const hsize_t *size)
 {
-    unsigned	u;
-    int	ret_value = 0;
+    unsigned u;
+    int      ret_value = 0;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2141,22 +2090,21 @@ H5S_extend(H5S_t *space, const hsize_t *size)
     HDassert(size);
 
     /* Check through all the dimensions to see if modifying the dataspace is allowed */
-    for(u = 0; u < space->extent.rank; u++) {
-        if(space->extent.size[u]<size[u]) {
-            if(space->extent.max && H5S_UNLIMITED!=space->extent.max[u] &&
-                    space->extent.max[u]<size[u])
+    for (u = 0; u < space->extent.rank; u++) {
+        if (space->extent.size[u] < size[u]) {
+            if (space->extent.max && H5S_UNLIMITED != space->extent.max[u] && space->extent.max[u] < size[u])
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dimension cannot be increased")
             ret_value++;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Update */
-    if(ret_value) {
-        hsize_t nelem;  /* Number of elements in extent */
+    if (ret_value) {
+        hsize_t nelem; /* Number of elements in extent */
 
         /* Change the dataspace size & re-compute the number of elements in the extent */
-        for(u = 0, nelem = 1; u < space->extent.rank; u++) {
-            if(space->extent.size[u] < size[u])
+        for (u = 0, nelem = 1; u < space->extent.rank; u++) {
+            if (space->extent.size[u] < size[u])
                 space->extent.size[u] = size[u];
 
             nelem *= space->extent.size[u];
@@ -2164,12 +2112,12 @@ H5S_extend(H5S_t *space, const hsize_t *size)
         space->extent.nelem = nelem;
 
         /* If the selection is 'all', update the number of elements selected */
-        if(H5S_GET_SELECT_TYPE(space) == H5S_SEL_ALL)
-            if(H5S_select_all(space, FALSE) < 0)
+        if (H5S_GET_SELECT_TYPE(space) == H5S_SEL_ALL)
+            if (H5S_select_all(space, FALSE) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
         /* Mark the dataspace as no longer shared if it was before */
-        if(H5O_msg_reset_share(H5O_SDSPACE_ID, space) < 0)
+        if (H5O_msg_reset_share(H5O_SDSPACE_ID, space) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRESET, FAIL, "can't stop sharing dataspace")
     } /* end if */
 
@@ -2177,4 +2125,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_extend() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5SL.c b/src/H5SL.c
index 12ed5c8..7f02ef6 100644
--- a/src/H5SL.c
+++ b/src/H5SL.c
@@ -58,521 +58,516 @@
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5SL_init_interface
-
+#define H5_INTERFACE_INIT_FUNC H5SL_init_interface
 
 /* Private headers needed */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5SLprivate.h"	/* Skip list routines			*/
-#include "H5MMprivate.h"    /* Memory management                    */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5SLprivate.h" /* Skip list routines			*/
+#include "H5MMprivate.h" /* Memory management                    */
 
 /* Local Macros */
 
 /* Define the code template for searches for the "OP" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_SEARCH_FOUND(SLIST, X, I)                   \
-{                                                                              \
-    HDassert(!X->removed);                                                     \
-    HGOTO_DONE(X->item);                                                       \
-} /* end block */
+#define H5SL_LOCATE_SEARCH_FOUND(SLIST, X, I)                                                                \
+    {                                                                                                        \
+        HDassert(!X->removed);                                                                               \
+        HGOTO_DONE(X->item);                                                                                 \
+    } /* end block */
 
 /* Define the code template for deferred removals for the "OP" in the
  * H5SL_LOCATE macro */
-#define H5SL_LOCATE_SEARCH_DEFER_REMOVE_FOUND(SLIST, X, I)      \
-{                                                                              \
-    HDassert(!X->removed);                                                     \
-    X->removed = TRUE;                                                         \
-    HGOTO_DONE(X->item);                                                       \
-} /* end block */
+#define H5SL_LOCATE_SEARCH_DEFER_REMOVE_FOUND(SLIST, X, I)                                                   \
+    {                                                                                                        \
+        HDassert(!X->removed);                                                                               \
+        X->removed = TRUE;                                                                                   \
+        HGOTO_DONE(X->item);                                                                                 \
+    } /* end block */
 
 /* Define the code template for finds for the "OP" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_FIND_FOUND(SLIST, X, I)                     \
-{                                                                              \
-    HDassert(!X->removed);                                                     \
-    HGOTO_DONE(X);                                                             \
-} /* end block */
-
+#define H5SL_LOCATE_FIND_FOUND(SLIST, X, I)                                                                  \
+    {                                                                                                        \
+        HDassert(!X->removed);                                                                               \
+        HGOTO_DONE(X);                                                                                       \
+    } /* end block */
 
 /* Define a code template for comparing scalar keys for the "CMP" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_SCALAR_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL)              \
-        (*(TYPE *)((PNODE)->key) < *(TYPE *)PKEY)
+#define H5SL_LOCATE_SCALAR_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL) (*(TYPE *)((PNODE)->key) < *(TYPE *)PKEY)
 
 /* Define a code template for comparing string keys for the "CMP" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_STRING_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL)              \
-        (((PNODE)->hashval == HASHVAL) ?                                \
-            (HDstrcmp((const char *)(PNODE)->key, (const char *)PKEY) < 0) : \
-            ((PNODE)->hashval < HASHVAL))
+#define H5SL_LOCATE_STRING_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL)                                            \
+    (((PNODE)->hashval == HASHVAL) ? (HDstrcmp((const char *)(PNODE)->key, (const char *)PKEY) < 0)          \
+                                   : ((PNODE)->hashval < HASHVAL))
 
 /* Define a code template for comparing H5_obj_t keys for the "CMP" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_OBJ_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL)                 \
-        ((((TYPE *)((PNODE)->key))->fileno == ((TYPE *)PKEY)->fileno)          \
-        ? (((TYPE *)((PNODE)->key))->addr < ((TYPE *)PKEY)->addr)              \
-        : (((TYPE *)((PNODE)->key))->fileno < ((TYPE *)PKEY)->fileno))
+#define H5SL_LOCATE_OBJ_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL)                                               \
+    ((((TYPE *)((PNODE)->key))->fileno == ((TYPE *)PKEY)->fileno)                                            \
+         ? (((TYPE *)((PNODE)->key))->addr < ((TYPE *)PKEY)->addr)                                           \
+         : (((TYPE *)((PNODE)->key))->fileno < ((TYPE *)PKEY)->fileno))
 
 /* Define a code template for comparing generic keys for the "CMP" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_GENERIC_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL)             \
-        ((SLIST)->cmp((TYPE *)((PNODE)->key), (TYPE *)PKEY) < 0)
-
+#define H5SL_LOCATE_GENERIC_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL)                                           \
+    ((SLIST)->cmp((TYPE *)((PNODE)->key), (TYPE *)PKEY) < 0)
 
 /* Define a code template for comparing scalar keys for the "EQ" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_SCALAR_EQ(SLIST, TYPE, PNODE, PKEY, HASHVAL)               \
-        (*(TYPE *)((PNODE)->key) == *(TYPE *)PKEY)
+#define H5SL_LOCATE_SCALAR_EQ(SLIST, TYPE, PNODE, PKEY, HASHVAL) (*(TYPE *)((PNODE)->key) == *(TYPE *)PKEY)
 
 /* Define a code template for comparing string keys for the "EQ" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_STRING_EQ(SLIST, TYPE, PNODE, PKEY, HASHVAL)               \
-        (((PNODE)->hashval == HASHVAL) && (HDstrcmp((const char *)(PNODE)->key, (const char *)PKEY) == 0))
+#define H5SL_LOCATE_STRING_EQ(SLIST, TYPE, PNODE, PKEY, HASHVAL)                                             \
+    (((PNODE)->hashval == HASHVAL) && (HDstrcmp((const char *)(PNODE)->key, (const char *)PKEY) == 0))
 
 /* Define a code template for comparing H5_obj_t keys for the "EQ" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_OBJ_EQ(SLIST, TYPE, PNODE, PKEY, HASHVAL)                  \
-        ((((TYPE *)((PNODE)->key))->fileno == ((TYPE *)PKEY)->fileno) && (((TYPE *)((PNODE)->key))->addr == ((TYPE *)PKEY)->addr))
+#define H5SL_LOCATE_OBJ_EQ(SLIST, TYPE, PNODE, PKEY, HASHVAL)                                                \
+    ((((TYPE *)((PNODE)->key))->fileno == ((TYPE *)PKEY)->fileno) &&                                         \
+     (((TYPE *)((PNODE)->key))->addr == ((TYPE *)PKEY)->addr))
 
 /* Define a code template for comparing generic keys for the "EQ" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_GENERIC_EQ(SLIST, TYPE, PNODE, PKEY, HASHVAL)             \
-        ((SLIST)->cmp((TYPE *)((PNODE)->key), (TYPE *)PKEY) == 0)
+#define H5SL_LOCATE_GENERIC_EQ(SLIST, TYPE, PNODE, PKEY, HASHVAL)                                            \
+    ((SLIST)->cmp((TYPE *)((PNODE)->key), (TYPE *)PKEY) == 0)
 
-
-/* Define a code template for initializing the hash value for scalar keys for the "HASHINIT" in the H5SL_LOCATE macro */
+/* Define a code template for initializing the hash value for scalar keys for the "HASHINIT" in the
+ * H5SL_LOCATE macro */
 #define H5SL_LOCATE_SCALAR_HASHINIT(KEY, HASHVAL)
 
-/* Define a code template for initializing the hash value for string keys for the "HASHINIT" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_STRING_HASHINIT(KEY, HASHVAL)                       \
-    HASHVAL = H5_hash_string((const char *)KEY);
+/* Define a code template for initializing the hash value for string keys for the "HASHINIT" in the
+ * H5SL_LOCATE macro */
+#define H5SL_LOCATE_STRING_HASHINIT(KEY, HASHVAL) HASHVAL = H5_hash_string((const char *)KEY);
 
-/* Define a code template for initializing the hash value for H5_obj_t keys for the "HASHINIT" in the H5SL_LOCATE macro */
+/* Define a code template for initializing the hash value for H5_obj_t keys for the "HASHINIT" in the
+ * H5SL_LOCATE macro */
 #define H5SL_LOCATE_OBJ_HASHINIT(KEY, HASHVAL)
 
-/* Define a code template for initializing the hash value for generic keys for the "HASHINIT" in the H5SL_LOCATE macro */
+/* Define a code template for initializing the hash value for generic keys for the "HASHINIT" in the
+ * H5SL_LOCATE macro */
 #define H5SL_LOCATE_GENERIC_HASHINIT(KEY, HASHVAL)
 
-
 /* Macro used to find node for operation, if all keys are valid */
-#define H5SL_LOCATE_OPT(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)      \
-{                                                                       \
-    int _i;                     /* Local index variable */              \
-    unsigned _count;            /* Num nodes searched at this height */ \
-                                                                        \
-    H5_GLUE3(H5SL_LOCATE_,CMP,_HASHINIT)(KEY, HASHVAL)                  \
-    for(_i = (int)SLIST->curr_level; _i >= 0; _i--) {                   \
-        _count = 0;                                                     \
-        while(_count < 3 && X->forward[_i] &&                           \
-                H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL) ) { \
-            X = X->forward[_i];                                         \
-            _count++;                                                   \
-        } /* end while */                                               \
-    } /* end for */                                                     \
-    X = X->forward[0];                                                  \
-    if(X != NULL && H5_GLUE3(H5SL_LOCATE_,CMP,_EQ)(SLIST, TYPE, X, KEY, HASHVAL) ) { \
-        /* What to do when a node is found */                           \
-        H5_GLUE3(H5SL_LOCATE_,OP,_FOUND)(SLIST, X, _i)                  \
-    } /* end if */                                                      \
-}
+#define H5SL_LOCATE_OPT(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                               \
+    {                                                                                                        \
+        int      _i;     /* Local index variable */                                                          \
+        unsigned _count; /* Num nodes searched at this height */                                             \
+                                                                                                             \
+        H5_GLUE3(H5SL_LOCATE_, CMP, _HASHINIT)                                                               \
+        (KEY, HASHVAL) for (_i = (int)SLIST->curr_level; _i >= 0; _i--)                                      \
+        {                                                                                                    \
+            _count = 0;                                                                                      \
+            while (_count < 3 && X->forward[_i] &&                                                           \
+                   H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) {           \
+                X = X->forward[_i];                                                                          \
+                _count++;                                                                                    \
+            } /* end while */                                                                                \
+        }     /* end for */                                                                                  \
+        X = X->forward[0];                                                                                   \
+        if (X != NULL && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, X, KEY, HASHVAL)) {                   \
+            /* What to do when a node is found */                                                            \
+            H5_GLUE3(H5SL_LOCATE_, OP, _FOUND)(SLIST, X, _i)                                                 \
+        } /* end if */                                                                                       \
+    }
 
 /* Macro used to find node for operation, if there may be "removed" nodes in the
  * list (whose keys cannot be read) */
-#define H5SL_LOCATE_SAFE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)      \
-{                                                                       \
-    int _i;                     /* Local index variable */              \
-    H5SL_node_t *_low = X;                                              \
-    H5SL_node_t *_high = NULL;                                          \
-                                                                        \
-    H5_GLUE3(H5SL_LOCATE_,CMP,_HASHINIT)(KEY, HASHVAL)                  \
-    for(_i = (int)SLIST->curr_level; _i >= 0; _i--) {                   \
-        X = _low->forward[_i];                                          \
-        while(X != _high) {                                             \
-            if(!X->removed) {                                            \
-                if(H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(SLIST, TYPE, X, KEY, HASHVAL)) \
-                    _low = X;                                           \
-                else                                                    \
-                    break;                                              \
-            } /* end if */                                              \
-            X = X->forward[_i];                                         \
-        } /* end while */                                               \
-        _high = X;                                                      \
-        if(X != NULL && H5_GLUE3(H5SL_LOCATE_,CMP,_EQ)(SLIST, TYPE, X, KEY, HASHVAL) ) { \
-            /* What to do when a node is found */                       \
-            H5_GLUE3(H5SL_LOCATE_,OP,_FOUND)(SLIST, X, _i)              \
-            break;                                                      \
-        } /* end if */                                                  \
-    } /* end for */                                                     \
-}
+#define H5SL_LOCATE_SAFE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                              \
+    {                                                                                                        \
+        int          _i; /* Local index variable */                                                          \
+        H5SL_node_t *_low  = X;                                                                              \
+        H5SL_node_t *_high = NULL;                                                                           \
+                                                                                                             \
+        H5_GLUE3(H5SL_LOCATE_, CMP, _HASHINIT)                                                               \
+        (KEY, HASHVAL) for (_i = (int)SLIST->curr_level; _i >= 0; _i--)                                      \
+        {                                                                                                    \
+            X = _low->forward[_i];                                                                           \
+            while (X != _high) {                                                                             \
+                if (!X->removed) {                                                                           \
+                    if (H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X, KEY, HASHVAL))                     \
+                        _low = X;                                                                            \
+                    else                                                                                     \
+                        break;                                                                               \
+                } /* end if */                                                                               \
+                X = X->forward[_i];                                                                          \
+            } /* end while */                                                                                \
+            _high = X;                                                                                       \
+            if (X != NULL && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, X, KEY, HASHVAL)) {               \
+                /* What to do when a node is found */                                                        \
+                H5_GLUE3(H5SL_LOCATE_, OP, _FOUND)(SLIST, X, _i) break;                                      \
+            } /* end if */                                                                                   \
+        }     /* end for */                                                                                  \
+    }
 
 /* Macro used to find node for operation */
-#define H5SL_LOCATE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)              \
-{                                                                       \
-    if((SLIST)->safe_iterating)                                         \
-        H5SL_LOCATE_SAFE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)         \
-    else                                                                \
-        H5SL_LOCATE_OPT(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)          \
-}
-
+#define H5SL_LOCATE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                                   \
+    {                                                                                                        \
+        if ((SLIST)->safe_iterating)                                                                         \
+            H5SL_LOCATE_SAFE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                          \
+        else                                                                                                 \
+            H5SL_LOCATE_OPT(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                           \
+    }
 
 /* Macro used to grow a node by 1.  Does not update pointers. LVL is the current
  * level of X.  Does not update LVL but does update X->lvl. */
-#define H5SL_GROW(X, LVL, ERR)                                                 \
-{                                                                              \
-    /* Check if we need to increase allocation of forward pointers */          \
-    if(LVL + 1 >= 1u << X->log_nalloc) {                                       \
-        H5SL_node_t **_tmp;                                                    \
-        HDassert(LVL + 1 == 1u << X->log_nalloc);                              \
-        /* Double the amount of allocated space */                             \
-        X->log_nalloc++;                                                       \
-                                                                               \
-        /* Check if we need to create a new factory */                         \
-        if(X->log_nalloc >= H5SL_fac_nused_g) {                                \
-            HDassert(X->log_nalloc == H5SL_fac_nused_g);                       \
-                                                                               \
-            /* Check if we need to allocate space for the factory pointer*/    \
-            if(H5SL_fac_nused_g >= H5SL_fac_nalloc_g) {                        \
-                HDassert(H5SL_fac_nused_g == H5SL_fac_nalloc_g);               \
-                /* Double the size of the array of factory pointers */         \
-                H5SL_fac_nalloc_g *= 2;                                        \
-                if(NULL == (H5SL_fac_g = (H5FL_fac_head_t **)H5MM_realloc(     \
-                        (void *)H5SL_fac_g, H5SL_fac_nalloc_g                  \
-                        * sizeof(H5FL_fac_head_t *))))                         \
-                    HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, ERR, "memory allocation failed") \
-            } /* end if */                                                     \
-                                                                               \
-            /* Create the new factory */                                       \
-            H5SL_fac_g[H5SL_fac_nused_g] = H5FL_fac_init((1u << H5SL_fac_nused_g) * sizeof(H5SL_node_t *)); \
-            H5SL_fac_nused_g++;                                                \
-        } /* end if */                                                         \
-                                                                               \
-        /* Allocate space for new forward pointers */                          \
-        if(NULL == (_tmp = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[X->log_nalloc]))) \
-            HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, ERR, "memory allocation failed") \
-        HDmemcpy((void *)_tmp, (const void *)X->forward, (LVL + 1) * sizeof(H5SL_node_t *)); \
-        X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[X->log_nalloc-1], (void *)X->forward);  \
-        X->forward = _tmp;                                                     \
-    } /* end if */                                                             \
-                                                                               \
-    X->level++;                                                                \
-}
-
+#define H5SL_GROW(X, LVL, ERR)                                                                               \
+    {                                                                                                        \
+        /* Check if we need to increase allocation of forward pointers */                                    \
+        if (LVL + 1 >= 1u << X->log_nalloc) {                                                                \
+            H5SL_node_t **_tmp;                                                                              \
+            HDassert(LVL + 1 == 1u << X->log_nalloc);                                                        \
+            /* Double the amount of allocated space */                                                       \
+            X->log_nalloc++;                                                                                 \
+                                                                                                             \
+            /* Check if we need to create a new factory */                                                   \
+            if (X->log_nalloc >= H5SL_fac_nused_g) {                                                         \
+                HDassert(X->log_nalloc == H5SL_fac_nused_g);                                                 \
+                                                                                                             \
+                /* Check if we need to allocate space for the factory pointer*/                              \
+                if (H5SL_fac_nused_g >= H5SL_fac_nalloc_g) {                                                 \
+                    HDassert(H5SL_fac_nused_g == H5SL_fac_nalloc_g);                                         \
+                    /* Double the size of the array of factory pointers */                                   \
+                    H5SL_fac_nalloc_g *= 2;                                                                  \
+                    if (NULL == (H5SL_fac_g = (H5FL_fac_head_t **)H5MM_realloc(                              \
+                                     (void *)H5SL_fac_g, H5SL_fac_nalloc_g * sizeof(H5FL_fac_head_t *))))    \
+                        HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, ERR, "memory allocation failed")               \
+                } /* end if */                                                                               \
+                                                                                                             \
+                /* Create the new factory */                                                                 \
+                H5SL_fac_g[H5SL_fac_nused_g] =                                                               \
+                    H5FL_fac_init((1u << H5SL_fac_nused_g) * sizeof(H5SL_node_t *));                         \
+                H5SL_fac_nused_g++;                                                                          \
+            } /* end if */                                                                                   \
+                                                                                                             \
+            /* Allocate space for new forward pointers */                                                    \
+            if (NULL == (_tmp = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[X->log_nalloc])))                 \
+                HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, ERR, "memory allocation failed")                       \
+            HDmemcpy((void *)_tmp, (const void *)X->forward, (LVL + 1) * sizeof(H5SL_node_t *));             \
+            X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[X->log_nalloc - 1], (void *)X->forward);   \
+            X->forward = _tmp;                                                                               \
+        } /* end if */                                                                                       \
+                                                                                                             \
+        X->level++;                                                                                          \
+    }
 
 /* Macro used to shrink a node by 1.  Does not update pointers.  LVL is the
  * current level of X.  Does not update LVL but does update X->level. */
-#define H5SL_SHRINK(X, LVL)                                                    \
-{                                                                              \
-    /* Check if we can reduce the allocation of forward pointers */            \
-    if(LVL <= 1u << (X->log_nalloc - 1)) {                                     \
-        H5SL_node_t **_tmp;                                                    \
-        HDassert(LVL == 1u << (X->log_nalloc - 1));                            \
-        X->log_nalloc--;                                                       \
-                                                                               \
-        /* Allocate space for new forward pointers */                          \
-        if(NULL == (_tmp = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[X->log_nalloc]))) \
-            HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "memory allocation failed") \
-        HDmemcpy((void *)_tmp, (const void *)X->forward, (LVL) * sizeof(H5SL_node_t *)); \
-        X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[X->log_nalloc+1], (void *)X->forward);  \
-        X->forward = _tmp;                                                     \
-    } /* end if */                                                             \
-                                                                               \
-    X->level--;                                                                \
-}
-
+#define H5SL_SHRINK(X, LVL)                                                                                  \
+    {                                                                                                        \
+        /* Check if we can reduce the allocation of forward pointers */                                      \
+        if (LVL <= 1u << (X->log_nalloc - 1)) {                                                              \
+            H5SL_node_t **_tmp;                                                                              \
+            HDassert(LVL == 1u << (X->log_nalloc - 1));                                                      \
+            X->log_nalloc--;                                                                                 \
+                                                                                                             \
+            /* Allocate space for new forward pointers */                                                    \
+            if (NULL == (_tmp = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[X->log_nalloc])))                 \
+                HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "memory allocation failed")                        \
+            HDmemcpy((void *)_tmp, (const void *)X->forward, (LVL) * sizeof(H5SL_node_t *));                 \
+            X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[X->log_nalloc + 1], (void *)X->forward);   \
+            X->forward = _tmp;                                                                               \
+        } /* end if */                                                                                       \
+                                                                                                             \
+        X->level--;                                                                                          \
+    }
 
 /* Macro used to grow the level of a node by 1, with appropriate changes to the
  * head node if necessary.  PREV is the previous node of the height that X is to
  * grow to. */
-#define H5SL_PROMOTE(SLIST, X, PREV, ERR)                                      \
-{                                                                              \
-    size_t _lvl = X->level;                                                    \
-                                                                               \
-    H5SL_GROW(X, _lvl, ERR);                                                   \
-                                                                               \
-    if(_lvl == (size_t) SLIST->curr_level) {                                   \
-        HDassert(PREV == SLIST->header);                                       \
-        /* Grow the head */                                                    \
-        H5SL_GROW(PREV, _lvl, ERR)                                             \
-        SLIST->curr_level++;                                                   \
-        X->forward[_lvl+1] = NULL;                                             \
-    } else {                                                                   \
-        HDassert(_lvl < (size_t) SLIST->curr_level);                           \
-        X->forward[_lvl+1] = PREV->forward[_lvl+1];                            \
-    } /* end else */                                                           \
-    PREV->forward[_lvl+1] = X;                                                 \
-}
-
+#define H5SL_PROMOTE(SLIST, X, PREV, ERR)                                                                    \
+    {                                                                                                        \
+        size_t _lvl = X->level;                                                                              \
+                                                                                                             \
+        H5SL_GROW(X, _lvl, ERR);                                                                             \
+                                                                                                             \
+        if (_lvl == (size_t)SLIST->curr_level) {                                                             \
+            HDassert(PREV == SLIST->header);                                                                 \
+            /* Grow the head */                                                                              \
+            H5SL_GROW(PREV, _lvl, ERR)                                                                       \
+            SLIST->curr_level++;                                                                             \
+            X->forward[_lvl + 1] = NULL;                                                                     \
+        }                                                                                                    \
+        else {                                                                                               \
+            HDassert(_lvl < (size_t)SLIST->curr_level);                                                      \
+            X->forward[_lvl + 1] = PREV->forward[_lvl + 1];                                                  \
+        } /* end else */                                                                                     \
+        PREV->forward[_lvl + 1] = X;                                                                         \
+    }
 
 /* Macro used to reduce the level of a node by 1.  Does not update the head node
  * "current level".  PREV is the previous node of the currrent height of X. */
-#define H5SL_DEMOTE(X, PREV)                                                   \
-{                                                                              \
-    size_t _lvl = X->level;                                                    \
-                                                                               \
-    HDassert(PREV->forward[_lvl] == X);                                        \
-    PREV->forward[_lvl] = X->forward[_lvl];                                    \
-    H5SL_SHRINK(X, _lvl);                                                      \
-}
-
+#define H5SL_DEMOTE(X, PREV)                                                                                 \
+    {                                                                                                        \
+        size_t _lvl = X->level;                                                                              \
+                                                                                                             \
+        HDassert(PREV->forward[_lvl] == X);                                                                  \
+        PREV->forward[_lvl] = X->forward[_lvl];                                                              \
+        H5SL_SHRINK(X, _lvl);                                                                                \
+    }
 
 /* Macro used to insert node.  Does not actually insert the node.  After running
  * this macro, X will contain the node before where the new node should be
  * inserted (at level 0). */
-#define H5SL_INSERT(CMP, SLIST, X, TYPE, KEY, HASHVAL)                         \
-{                                                                              \
-    H5SL_node_t *_last = X;     /* Lowest node in the current gap */           \
-    H5SL_node_t *_next = NULL;  /* Highest node in the currect gap */          \
-    H5SL_node_t *_drop;         /* Low node of the gap to drop into */         \
-    int         _count;         /* Number of nodes in the current gap */       \
-    int         _i;                                                            \
-                                                                               \
-    H5_GLUE3(H5SL_LOCATE_,CMP,_HASHINIT)(KEY, HASHVAL)                         \
-    for(_i = (int)SLIST->curr_level; _i >= 0; _i--) {                          \
-        /* Search for the node to drop into, also count the number of nodes */ \
-        /* of height _i in this gap */                                         \
-        _drop = NULL;                                                          \
-        for(_count = 0; ; _count++) {                                          \
-            /* Terminate if this is the last node in the gap */                \
-            if(X->forward[_i] == _next) {                                      \
-                if(!_drop)                                                     \
-                    _drop = X;                                                 \
-                break;                                                         \
-            } /* end if */                                                     \
-                                                                               \
-            /* Check if this node is the start of the next gap */              \
-            if(!_drop && !H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) \
-                _drop = X;                                                     \
-                                                                               \
-            /* No need to check the last node in the gap if there are 3, as */ \
-            /* there cannot be a fourth */                                     \
-            if(_count == 2) {                                                  \
-                if(!_drop)                                                     \
-                    _drop = X->forward[_i];                                    \
-                _count = 3;                                                    \
-                break;                                                         \
-            }                                                                  \
-            X = X->forward[_i];                                                \
-        } /* end for */                                                        \
-        HDassert(!_drop->forward[_i] ||                                        \
-                !H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(SLIST, TYPE, _drop->forward[_i], KEY, HASHVAL)); \
-                                                                               \
-        /* Promote the middle node if necessary */                             \
-        if(_count == 3) {                                                      \
-            HDassert(X == _last->forward[_i]->forward[_i]);                    \
-            H5SL_PROMOTE(SLIST, X, _last, NULL)                                \
-        }                                                                      \
-                                                                               \
-        /* Prepare to drop down */                                             \
-        X = _last = _drop;                                                     \
-        _next = _drop->forward[_i];                                            \
-    } /* end for */                                                            \
-                                                                               \
-    if(_next && H5_GLUE3(H5SL_LOCATE_,CMP,_EQ)(SLIST, TYPE, _next, KEY, HASHVAL)) \
-        HGOTO_ERROR(H5E_SLIST, H5E_CANTINSERT, NULL, "can't insert duplicate key") \
-}
-
+#define H5SL_INSERT(CMP, SLIST, X, TYPE, KEY, HASHVAL)                                                       \
+    {                                                                                                        \
+        H5SL_node_t *_last = X;    /* Lowest node in the current gap */                                      \
+        H5SL_node_t *_next = NULL; /* Highest node in the currect gap */                                     \
+        H5SL_node_t *_drop;        /* Low node of the gap to drop into */                                    \
+        int          _count;       /* Number of nodes in the current gap */                                  \
+        int          _i;                                                                                     \
+                                                                                                             \
+        H5_GLUE3(H5SL_LOCATE_, CMP, _HASHINIT)                                                               \
+        (KEY, HASHVAL) for (_i = (int)SLIST->curr_level; _i >= 0; _i--)                                      \
+        {                                                                                                    \
+            /* Search for the node to drop into, also count the number of nodes */                           \
+            /* of height _i in this gap */                                                                   \
+            _drop = NULL;                                                                                    \
+            for (_count = 0;; _count++) {                                                                    \
+                /* Terminate if this is the last node in the gap */                                          \
+                if (X->forward[_i] == _next) {                                                               \
+                    if (!_drop)                                                                              \
+                        _drop = X;                                                                           \
+                    break;                                                                                   \
+                } /* end if */                                                                               \
+                                                                                                             \
+                /* Check if this node is the start of the next gap */                                        \
+                if (!_drop && !H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) \
+                    _drop = X;                                                                               \
+                                                                                                             \
+                /* No need to check the last node in the gap if there are 3, as */                           \
+                /* there cannot be a fourth */                                                               \
+                if (_count == 2) {                                                                           \
+                    if (!_drop)                                                                              \
+                        _drop = X->forward[_i];                                                              \
+                    _count = 3;                                                                              \
+                    break;                                                                                   \
+                }                                                                                            \
+                X = X->forward[_i];                                                                          \
+            } /* end for */                                                                                  \
+            HDassert(!_drop->forward[_i] ||                                                                  \
+                     !H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, _drop->forward[_i], KEY, HASHVAL));     \
+                                                                                                             \
+            /* Promote the middle node if necessary */                                                       \
+            if (_count == 3) {                                                                               \
+                HDassert(X == _last->forward[_i]->forward[_i]);                                              \
+                H5SL_PROMOTE(SLIST, X, _last, NULL)                                                          \
+            }                                                                                                \
+                                                                                                             \
+            /* Prepare to drop down */                                                                       \
+            X = _last = _drop;                                                                               \
+            _next     = _drop->forward[_i];                                                                  \
+        } /* end for */                                                                                      \
+                                                                                                             \
+        if (_next && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, _next, KEY, HASHVAL))                     \
+            HGOTO_ERROR(H5E_SLIST, H5E_CANTINSERT, NULL, "can't insert duplicate key")                       \
+    }
 
 /* Macro used to remove node */
-#define H5SL_REMOVE(CMP, SLIST, X, TYPE, KEY, HASHVAL)                         \
-{                                                                              \
-    /* Check for deferred removal */                                           \
-    if(SLIST->safe_iterating)                                                  \
-        H5SL_LOCATE(SEARCH_DEFER_REMOVE, CMP, SLIST, X, TYPE, KEY, HASHVAL)           \
-    else {                                                                     \
-        H5SL_node_t *_last = X;     /* Lowest node in the current gap */       \
-        H5SL_node_t *_llast = X;    /* Lowest node in the previous gap */      \
-        H5SL_node_t *_next = NULL;  /* Highest node in the currect gap */      \
-        H5SL_node_t *_drop = NULL;  /* Low node of the gap to drop into */     \
-        H5SL_node_t *_ldrop = NULL; /* Low node of gap before the one to drop into */ \
-        H5SL_node_t *_head = SLIST->header; /* Head of the skip list */        \
-        int         _count;         /* Number of nodes in the current gap */   \
-        int         _i = (int)SLIST->curr_level;                               \
-                                                                               \
-        if(_i < 0)                                                             \
-            HGOTO_DONE(NULL);                                                  \
-                                                                               \
-        H5_GLUE3(H5SL_LOCATE_,CMP,_HASHINIT)(KEY, HASHVAL)                     \
-                                                                               \
-        /* Find the gap to drop in to at the highest level */                  \
-        while(X && (!X->key || H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(SLIST, TYPE, X, KEY, HASHVAL))) { \
-            _llast = _last;                                                    \
-            _last = X;                                                         \
-            X = X->forward[_i];                                                \
-        }                                                                      \
-        _next = X;                                                             \
-                                                                               \
-        /* Main loop */                                                        \
-        for(_i--; _i >= 0; _i--) {                                             \
-            /* Search for the node to drop into, also count the number of */   \
-            /* nodes of height _i in this gap and keep track of of the node */ \
-            /* before the one to drop into (_ldrop will become _llast, */      \
-            /* _drop will become _last). */                                    \
-            X = _ldrop = _last;                                                \
-            _drop = NULL;                                                      \
-            for(_count = 0; ; _count++) {                                      \
-                /* Terminate if this is the last node in the gap */            \
-                if(X->forward[_i] == _next) {                                  \
-                    if(!_drop)                                                 \
-                        _drop = X;                                             \
-                    break;                                                     \
-                } /* end if */                                                 \
-                                                                               \
-                /* If we have already found the node to drop into and there */ \
-                /* is more than one node in this gap, we can stop searching */ \
-                if(_drop) {                                                    \
-                    HDassert(_count >= 1);                                     \
-                    _count = 2;                                                \
-                    break;                                                     \
-                } else { /* !_drop */                                          \
-                    /* Check if this node is the start of the next gap */      \
-                    if (!H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) { \
-                        _drop = X;                                             \
-                        /* Again check if we can stop searching */             \
-                        if(_count) {                                           \
-                            _count = 2;                                        \
-                            break;                                             \
-                        } /* end if */                                         \
-                    } /* end if */                                             \
-                    else                                                       \
-                        _ldrop = X;                                            \
-                } /* end else */                                               \
-                                                                               \
-                /* No need to check the last node in the gap if there are */   \
-                /* 3, as there cannot be a fourth */                           \
-                if(_count == 2) {                                              \
-                    if(!_drop)                                                 \
-                        _drop = X->forward[_i];                                \
-                    break;                                                     \
-                } /* end if */                                                 \
-                X = X->forward[_i];                                            \
-            } /* end for */                                                    \
-            HDassert(_count >= 1 && _count <= 3);                              \
-            HDassert(!_drop->forward[_i] ||                                    \
-                    !H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(SLIST, TYPE, _drop->forward[_i], KEY, HASHVAL)); \
-                                                                               \
-            /* Check if we need to adjust node heights */                      \
-            if(_count == 1) {                                                  \
-                /* Check if we are in the first gap */                         \
-                if(_llast == _last) {                                          \
-                    /* We are in the first gap, count the number of nodes */   \
-                    /* of height _i in the next gap.  We need only check */    \
-                    /* onenode to see if we should promote the first node */   \
-                    /* in the next gap */                                      \
-                    _llast = _next->forward[_i+1];                             \
-                                                                               \
-                    /* Demote the separator node */                            \
-                    H5SL_DEMOTE(_next, _last)                                  \
-                                                                               \
-                    /* If there are 2 or more nodes, promote the first */      \
-                    if(_next->forward[_i]->forward[_i] != _llast) {            \
-                        X = _next->forward[_i];                                \
-                        H5SL_PROMOTE(SLIST, X, _last, NULL)                    \
-                    } else if(!_head->forward[_i+1]) {                         \
-                        /* shrink the header */                                \
-                        HDassert(_i == SLIST->curr_level - 1);                 \
-                        HDassert((size_t) SLIST->curr_level == _head->level);  \
-                                                                               \
-                        H5SL_SHRINK(_head, (size_t) (_i+1))                    \
-                        SLIST->curr_level--;                                   \
-                    } /* end else */                                           \
-                } else {                                                       \
-                    /* We are not in the first gap, count the number of */     \
-                    /* nodes of height _i in the previous gap.  Note we */     \
-                    /* "look ahead" in this loop so X has the value of the */  \
-                    /* last node in the previous gap. */                       \
-                    X = _llast->forward[_i];                                   \
-                    for(_count = 1; _count < 3 && X->forward[_i] != _last; _count++) \
-                        X = X->forward[_i];                                    \
-                    HDassert(X->forward[_i] == _last);                         \
-                                                                               \
-                    /* Demote the separator node */                            \
-                    H5SL_DEMOTE(_last, _llast)                                 \
-                                                                               \
-                    /* If there are 2 or more nodes, promote the last */       \
-                    if(_count >= 2)                                            \
-                        H5SL_PROMOTE(SLIST, X, _llast, NULL)                   \
-                    else if(!_head->forward[_i+1]) {                           \
-                        /* shrink the header */                                \
-                        HDassert(_i == SLIST->curr_level - 1);                 \
-                        HDassert((size_t) SLIST->curr_level == _head->level);  \
-                                                                               \
-                        H5SL_SHRINK(_head, (size_t) (_i+1))                    \
-                        SLIST->curr_level--;                                   \
-                    } /* end else */                                           \
-                } /* end else */                                               \
-            } /* end if */                                                     \
-                                                                               \
-            /* Prepare to drop down */                                         \
-            _llast = _ldrop;                                                   \
-            _last = _drop;                                                     \
-            _next = _drop->forward[_i];                                        \
-        } /* end for */                                                        \
-                                                                               \
-        /* Check if we've found the node */                                    \
-        if(_next && H5_GLUE3(H5SL_LOCATE_,CMP,_EQ)(SLIST, TYPE, _next, KEY, HASHVAL)) { \
-            void *tmp = _next->item;                                           \
-            X = _next;                                                         \
-                                                                               \
-            /* If the node has a height > 0, swap it with its (lower) */       \
-            /* neighbor */                                                     \
-            if(X->level) {                                                     \
-                X = X->backward;                                               \
-                _next->key = X->key;                                           \
-                _next->item = X->item;                                         \
-                _next->hashval = X->hashval;                                   \
-            } /* end if */                                                     \
-            HDassert(!X->level);                                               \
-                                                                               \
-            /* Remove the node */                                              \
-            X->backward->forward[0] = X->forward[0];                           \
-            if(SLIST->last == X)                                               \
-                SLIST->last = X->backward;                                     \
-            else                                                               \
-                X->forward[0]->backward = X->backward;                         \
-            SLIST->nobjs--;                                                    \
-            X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[0], X->forward); \
-            X = H5FL_FREE(H5SL_node_t, X);                                     \
-                                                                               \
-            HGOTO_DONE(tmp);                                                   \
-        } /* end if */                                                         \
-    } /* end else */                                                           \
-}
-
+#define H5SL_REMOVE(CMP, SLIST, X, TYPE, KEY, HASHVAL)                                                       \
+    {                                                                                                        \
+        /* Check for deferred removal */                                                                     \
+        if (SLIST->safe_iterating)                                                                           \
+            H5SL_LOCATE(SEARCH_DEFER_REMOVE, CMP, SLIST, X, TYPE, KEY, HASHVAL)                              \
+        else {                                                                                               \
+            H5SL_node_t *_last  = X;             /* Lowest node in the current gap */                        \
+            H5SL_node_t *_llast = X;             /* Lowest node in the previous gap */                       \
+            H5SL_node_t *_next  = NULL;          /* Highest node in the currect gap */                       \
+            H5SL_node_t *_drop  = NULL;          /* Low node of the gap to drop into */                      \
+            H5SL_node_t *_ldrop = NULL;          /* Low node of gap before the one to drop into */           \
+            H5SL_node_t *_head  = SLIST->header; /* Head of the skip list */                                 \
+            int          _count;                 /* Number of nodes in the current gap */                    \
+            int          _i = (int)SLIST->curr_level;                                                        \
+                                                                                                             \
+            if (_i < 0)                                                                                      \
+                HGOTO_DONE(NULL);                                                                            \
+                                                                                                             \
+            H5_GLUE3(H5SL_LOCATE_, CMP, _HASHINIT)                                                           \
+            (KEY, HASHVAL)                                                                                   \
+                                                                                                             \
+                /* Find the gap to drop in to at the highest level */                                        \
+                while (X && (!X->key || H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X, KEY, HASHVAL)))    \
+            {                                                                                                \
+                _llast = _last;                                                                              \
+                _last  = X;                                                                                  \
+                X      = X->forward[_i];                                                                     \
+            }                                                                                                \
+            _next = X;                                                                                       \
+                                                                                                             \
+            /* Main loop */                                                                                  \
+            for (_i--; _i >= 0; _i--) {                                                                      \
+                /* Search for the node to drop into, also count the number of */                             \
+                /* nodes of height _i in this gap and keep track of of the node */                           \
+                /* before the one to drop into (_ldrop will become _llast, */                                \
+                /* _drop will become _last). */                                                              \
+                X = _ldrop = _last;                                                                          \
+                _drop      = NULL;                                                                           \
+                for (_count = 0;; _count++) {                                                                \
+                    /* Terminate if this is the last node in the gap */                                      \
+                    if (X->forward[_i] == _next) {                                                           \
+                        if (!_drop)                                                                          \
+                            _drop = X;                                                                       \
+                        break;                                                                               \
+                    } /* end if */                                                                           \
+                                                                                                             \
+                    /* If we have already found the node to drop into and there */                           \
+                    /* is more than one node in this gap, we can stop searching */                           \
+                    if (_drop) {                                                                             \
+                        HDassert(_count >= 1);                                                               \
+                        _count = 2;                                                                          \
+                        break;                                                                               \
+                    }                                                                                        \
+                    else { /* !_drop */                                                                      \
+                        /* Check if this node is the start of the next gap */                                \
+                        if (!H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) { \
+                            _drop = X;                                                                       \
+                            /* Again check if we can stop searching */                                       \
+                            if (_count) {                                                                    \
+                                _count = 2;                                                                  \
+                                break;                                                                       \
+                            } /* end if */                                                                   \
+                        }     /* end if */                                                                   \
+                        else                                                                                 \
+                            _ldrop = X;                                                                      \
+                    } /* end else */                                                                         \
+                                                                                                             \
+                    /* No need to check the last node in the gap if there are */                             \
+                    /* 3, as there cannot be a fourth */                                                     \
+                    if (_count == 2) {                                                                       \
+                        if (!_drop)                                                                          \
+                            _drop = X->forward[_i];                                                          \
+                        break;                                                                               \
+                    } /* end if */                                                                           \
+                    X = X->forward[_i];                                                                      \
+                } /* end for */                                                                              \
+                HDassert(_count >= 1 && _count <= 3);                                                        \
+                HDassert(!_drop->forward[_i] ||                                                              \
+                         !H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, _drop->forward[_i], KEY, HASHVAL)); \
+                                                                                                             \
+                /* Check if we need to adjust node heights */                                                \
+                if (_count == 1) {                                                                           \
+                    /* Check if we are in the first gap */                                                   \
+                    if (_llast == _last) {                                                                   \
+                        /* We are in the first gap, count the number of nodes */                             \
+                        /* of height _i in the next gap.  We need only check */                              \
+                        /* onenode to see if we should promote the first node */                             \
+                        /* in the next gap */                                                                \
+                        _llast = _next->forward[_i + 1];                                                     \
+                                                                                                             \
+                        /* Demote the separator node */                                                      \
+                        H5SL_DEMOTE(_next, _last)                                                            \
+                                                                                                             \
+                        /* If there are 2 or more nodes, promote the first */                                \
+                        if (_next->forward[_i]->forward[_i] != _llast) {                                     \
+                            X = _next->forward[_i];                                                          \
+                            H5SL_PROMOTE(SLIST, X, _last, NULL)                                              \
+                        }                                                                                    \
+                        else if (!_head->forward[_i + 1]) {                                                  \
+                            /* shrink the header */                                                          \
+                            HDassert(_i == SLIST->curr_level - 1);                                           \
+                            HDassert((size_t)SLIST->curr_level == _head->level);                             \
+                                                                                                             \
+                            H5SL_SHRINK(_head, (size_t)(_i + 1))                                             \
+                            SLIST->curr_level--;                                                             \
+                        } /* end else */                                                                     \
+                    }                                                                                        \
+                    else {                                                                                   \
+                        /* We are not in the first gap, count the number of */                               \
+                        /* nodes of height _i in the previous gap.  Note we */                               \
+                        /* "look ahead" in this loop so X has the value of the */                            \
+                        /* last node in the previous gap. */                                                 \
+                        X = _llast->forward[_i];                                                             \
+                        for (_count = 1; _count < 3 && X->forward[_i] != _last; _count++)                    \
+                            X = X->forward[_i];                                                              \
+                        HDassert(X->forward[_i] == _last);                                                   \
+                                                                                                             \
+                        /* Demote the separator node */                                                      \
+                        H5SL_DEMOTE(_last, _llast)                                                           \
+                                                                                                             \
+                        /* If there are 2 or more nodes, promote the last */                                 \
+                        if (_count >= 2)                                                                     \
+                            H5SL_PROMOTE(SLIST, X, _llast, NULL)                                             \
+                        else if (!_head->forward[_i + 1]) {                                                  \
+                            /* shrink the header */                                                          \
+                            HDassert(_i == SLIST->curr_level - 1);                                           \
+                            HDassert((size_t)SLIST->curr_level == _head->level);                             \
+                                                                                                             \
+                            H5SL_SHRINK(_head, (size_t)(_i + 1))                                             \
+                            SLIST->curr_level--;                                                             \
+                        } /* end else */                                                                     \
+                    }     /* end else */                                                                     \
+                }         /* end if */                                                                       \
+                                                                                                             \
+                /* Prepare to drop down */                                                                   \
+                _llast = _ldrop;                                                                             \
+                _last  = _drop;                                                                              \
+                _next  = _drop->forward[_i];                                                                 \
+            } /* end for */                                                                                  \
+                                                                                                             \
+            /* Check if we've found the node */                                                              \
+            if (_next && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, _next, KEY, HASHVAL)) {               \
+                void *tmp = _next->item;                                                                     \
+                X         = _next;                                                                           \
+                                                                                                             \
+                /* If the node has a height > 0, swap it with its (lower) */                                 \
+                /* neighbor */                                                                               \
+                if (X->level) {                                                                              \
+                    X              = X->backward;                                                            \
+                    _next->key     = X->key;                                                                 \
+                    _next->item    = X->item;                                                                \
+                    _next->hashval = X->hashval;                                                             \
+                } /* end if */                                                                               \
+                HDassert(!X->level);                                                                         \
+                                                                                                             \
+                /* Remove the node */                                                                        \
+                X->backward->forward[0] = X->forward[0];                                                     \
+                if (SLIST->last == X)                                                                        \
+                    SLIST->last = X->backward;                                                               \
+                else                                                                                         \
+                    X->forward[0]->backward = X->backward;                                                   \
+                SLIST->nobjs--;                                                                              \
+                X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[0], X->forward);                       \
+                X          = H5FL_FREE(H5SL_node_t, X);                                                      \
+                                                                                                             \
+                HGOTO_DONE(tmp);                                                                             \
+            } /* end if */                                                                                   \
+        }     /* end else */                                                                                 \
+    }
 
 /* Macro used to search for node */
-#define H5SL_SEARCH(CMP, SLIST, X, TYPE, KEY, HASHVAL)          \
-    H5SL_LOCATE(SEARCH, CMP, SLIST, X, TYPE, KEY, HASHVAL)
+#define H5SL_SEARCH(CMP, SLIST, X, TYPE, KEY, HASHVAL) H5SL_LOCATE(SEARCH, CMP, SLIST, X, TYPE, KEY, HASHVAL)
 
 /* Macro used to find a node */
-#define H5SL_FIND(CMP, SLIST, X, TYPE, KEY, HASHVAL)            \
-    H5SL_LOCATE(FIND, CMP, SLIST, X, TYPE, KEY, HASHVAL)
-
+#define H5SL_FIND(CMP, SLIST, X, TYPE, KEY, HASHVAL) H5SL_LOCATE(FIND, CMP, SLIST, X, TYPE, KEY, HASHVAL)
 
 /* Private typedefs & structs */
 
 /* Skip list node data structure */
 struct H5SL_node_t {
-    const void *key;                    /* Pointer to node's key */
-    void *item;                         /* Pointer to node's item */
-    size_t level;                       /* The level of this node */
-    size_t log_nalloc;                  /* log2(Number of slots allocated in forward) */
-    uint32_t hashval;                   /* Hash value for key (only for strings, currently) */
-    hbool_t removed;                    /* Whether the node is "removed" (actual removal deferred) */
-    struct H5SL_node_t **forward;       /* Array of forward pointers from this node */
-    struct H5SL_node_t *backward;       /* Backward pointer from this node */
+    const void *         key;        /* Pointer to node's key */
+    void *               item;       /* Pointer to node's item */
+    size_t               level;      /* The level of this node */
+    size_t               log_nalloc; /* log2(Number of slots allocated in forward) */
+    uint32_t             hashval;    /* Hash value for key (only for strings, currently) */
+    hbool_t              removed;    /* Whether the node is "removed" (actual removal deferred) */
+    struct H5SL_node_t **forward;    /* Array of forward pointers from this node */
+    struct H5SL_node_t * backward;   /* Backward pointer from this node */
 };
 
 /* Main skip list data structure */
 struct H5SL_t {
     /* Static values for each list */
-    H5SL_type_t type;   /* Type of skip list */
-    H5SL_cmp_t cmp;     /* Comparison callback, if type is H5SL_TYPE_GENERIC */
+    H5SL_type_t type; /* Type of skip list */
+    H5SL_cmp_t  cmp;  /* Comparison callback, if type is H5SL_TYPE_GENERIC */
 
     /* Dynamic values for each list */
-    int curr_level;             /* Current top level used in list */
-    size_t nobjs;               /* Number of active objects in skip list */
-    H5SL_node_t *header;        /* Header for nodes in skip list */
-    H5SL_node_t *last;          /* Pointer to last node in skip list */
-    hbool_t safe_iterating;     /* Whether a routine is "safely" iterating over the list and removals should be deferred */
+    int          curr_level; /* Current top level used in list */
+    size_t       nobjs;      /* Number of active objects in skip list */
+    H5SL_node_t *header;     /* Header for nodes in skip list */
+    H5SL_node_t *last;       /* Pointer to last node in skip list */
+    hbool_t safe_iterating;  /* Whether a routine is "safely" iterating over the list and removals should be
+                                deferred */
 };
 
 /* Static functions */
-static H5SL_node_t * H5SL_new_node(void *item, const void *key, uint32_t hashval);
+static H5SL_node_t *H5SL_new_node(void *item, const void *key, uint32_t hashval);
 static H5SL_node_t *H5SL_insert_common(H5SL_t *slist, void *item, const void *key);
-static herr_t H5SL_release_common(H5SL_t *slist, H5SL_operator_t op, void *op_data);
-static herr_t H5SL_close_common(H5SL_t *slist, H5SL_operator_t op, void *op_data);
+static herr_t       H5SL_release_common(H5SL_t *slist, H5SL_operator_t op, void *op_data);
+static herr_t       H5SL_close_common(H5SL_t *slist, H5SL_operator_t op, void *op_data);
 
 /* Declare a free list to manage the H5SL_t struct */
 H5FL_DEFINE_STATIC(H5SL_t);
@@ -582,10 +577,9 @@ H5FL_DEFINE_STATIC(H5SL_node_t);
 
 /* Global variables */
 static H5FL_fac_head_t **H5SL_fac_g;
-static size_t H5SL_fac_nused_g;
-static size_t H5SL_fac_nalloc_g;
+static size_t            H5SL_fac_nused_g;
+static size_t            H5SL_fac_nalloc_g;
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_init_interface
@@ -621,7 +615,6 @@ H5SL_init_interface(void)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SL_init_interface() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_new_node
@@ -647,21 +640,21 @@ H5SL_init_interface(void)
 static H5SL_node_t *
 H5SL_new_node(void *item, const void *key, uint32_t hashval)
 {
-    H5SL_node_t *ret_value;      /* New skip list node */
+    H5SL_node_t *ret_value; /* New skip list node */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate the node */
-    if(NULL == (ret_value = (H5SL_node_t *)H5FL_MALLOC(H5SL_node_t)))
+    if (NULL == (ret_value = (H5SL_node_t *)H5FL_MALLOC(H5SL_node_t)))
         HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Initialize node */
-    ret_value->key = key;
-    ret_value->item = item;
-    ret_value->level = 0;
+    ret_value->key     = key;
+    ret_value->item    = item;
+    ret_value->level   = 0;
     ret_value->hashval = hashval;
     ret_value->removed = FALSE;
-    if(NULL == (ret_value->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0]))) {
+    if (NULL == (ret_value->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0]))) {
         ret_value = H5FL_FREE(H5SL_node_t, ret_value);
         HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "memory allocation failed")
     } /* end if */
@@ -671,7 +664,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_new_node() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_insert_common
@@ -696,10 +688,10 @@ done:
 static H5SL_node_t *
 H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
 {
-    H5SL_node_t *x;                             /* Current node to examine */
-    H5SL_node_t *prev;                          /* Node before the new node */
-    uint32_t hashval = 0;                       /* Hash value for key */
-    H5SL_node_t *ret_value;                     /* Return value */
+    H5SL_node_t *x;           /* Current node to examine */
+    H5SL_node_t *prev;        /* Node before the new node */
+    uint32_t     hashval = 0; /* Hash value for key */
+    H5SL_node_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -715,8 +707,8 @@ H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
     /* Work through the forward pointers for a node, finding the node at each
      * level that is before the location to insert
      */
-    prev=slist->header;
-    switch(slist->type) {
+    prev = slist->header;
+    switch (slist->type) {
         case H5SL_TYPE_INT:
             H5SL_INSERT(SCALAR, slist, prev, const int, key, -)
             break;
@@ -757,21 +749,20 @@ H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
             HDassert(0 && "Unknown skiplist type!");
     } /* end switch */
 
-
     /* 'key' must not have been found in existing list, if we get here */
 
-    if(slist->curr_level < 0)
+    if (slist->curr_level < 0)
         slist->curr_level = 0;
 
     /* Create new node of level 0 */
-    if(NULL == (x = H5SL_new_node(item, key, hashval)))
-        HGOTO_ERROR(H5E_SLIST ,H5E_NOSPACE, NULL, "can't create new skip list node")
+    if (NULL == (x = H5SL_new_node(item, key, hashval)))
+        HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "can't create new skip list node")
 
     /* Update the links */
-    x->backward = prev;
-    x->forward[0] = prev->forward[0];
+    x->backward      = prev;
+    x->forward[0]    = prev->forward[0];
     prev->forward[0] = x;
-    if(x->forward[0])
+    if (x->forward[0])
         x->forward[0]->backward = x;
     else {
         HDassert(slist->last == prev);
@@ -782,13 +773,12 @@ H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
     slist->nobjs++;
 
     /* Set return value */
-    ret_value=x;
+    ret_value = x;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_insert_common() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_release_common
@@ -816,8 +806,8 @@ done:
 static herr_t
 H5SL_release_common(H5SL_t *slist, H5SL_operator_t op, void *op_data)
 {
-    H5SL_node_t *node, *next_node;      /* Pointers to skip list nodes */
-    herr_t ret_value = SUCCEED;
+    H5SL_node_t *node, *next_node; /* Pointers to skip list nodes */
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -829,39 +819,39 @@ H5SL_release_common(H5SL_t *slist, H5SL_operator_t op, void *op_data)
 
     /* Free skip list nodes */
     node = slist->header->forward[0];
-    while(node) {
+    while (node) {
         next_node = node->forward[0];
 
         /* Call callback, if one is given */
-        if(op)
+        if (op)
             /* Casting away const OK -QAK */
             (void)(op)(node->item, (void *)node->key, op_data);
 
         node->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[node->log_nalloc], node->forward);
-        node = H5FL_FREE(H5SL_node_t, node);
-        node = next_node;
+        node          = H5FL_FREE(H5SL_node_t, node);
+        node          = next_node;
     } /* end while */
 
     /* Reset the header pointers */
-    slist->header->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[slist->header->log_nalloc], slist->header->forward);
-    if(NULL == (slist->header->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0])))
+    slist->header->forward =
+        (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[slist->header->log_nalloc], slist->header->forward);
+    if (NULL == (slist->header->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0])))
         HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, FAIL, "memory allocation failed")
     slist->header->forward[0] = NULL;
     slist->header->log_nalloc = 0;
-    slist->header->level = 0;
+    slist->header->level      = 0;
 
     /* Reset the last pointer */
     slist->last = slist->header;
 
     /* Reset the dynamic internal fields */
     slist->curr_level = -1;
-    slist->nobjs = 0;
+    slist->nobjs      = 0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_release_common() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_close_common
@@ -899,11 +889,12 @@ H5SL_close_common(H5SL_t *slist, H5SL_operator_t op, void *op_data)
     /* (Pre-condition) */
 
     /* Free skip list nodes */
-    if(H5SL_release_common(slist, op, op_data) < 0)
+    if (H5SL_release_common(slist, op, op_data) < 0)
         HGOTO_ERROR(H5E_SLIST, H5E_CANTFREE, FAIL, "can't release skip list nodes")
 
     /* Release header node */
-    slist->header->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[slist->header->log_nalloc], slist->header->forward);
+    slist->header->forward =
+        (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[slist->header->log_nalloc], slist->header->forward);
     slist->header = H5FL_FREE(H5SL_node_t, slist->header);
 
     /* Free skip list object */
@@ -913,7 +904,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_close_common() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_create
@@ -934,9 +924,9 @@ done:
 H5SL_t *
 H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp)
 {
-    H5SL_t *new_slist = NULL;   /* Pointer to new skip list object created */
-    H5SL_node_t *header;        /* Pointer to skip list header node */
-    H5SL_t *ret_value;          /* Return value */
+    H5SL_t *     new_slist = NULL; /* Pointer to new skip list object created */
+    H5SL_node_t *header;           /* Pointer to skip list header node */
+    H5SL_t *     ret_value;        /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -944,7 +934,7 @@ H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp)
     HDassert(type >= H5SL_TYPE_INT && type <= H5SL_TYPE_GENERIC);
 
     /* Allocate skip list structure */
-    if(NULL == (new_slist = H5FL_MALLOC(H5SL_t)))
+    if (NULL == (new_slist = H5FL_MALLOC(H5SL_t)))
         HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set the static internal fields */
@@ -953,13 +943,13 @@ H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp)
     new_slist->cmp = cmp;
 
     /* Set the dynamic internal fields */
-    new_slist->curr_level = -1;
-    new_slist->nobjs = 0;
+    new_slist->curr_level     = -1;
+    new_slist->nobjs          = 0;
     new_slist->safe_iterating = FALSE;
 
     /* Allocate the header node */
-    if(NULL == (header = H5SL_new_node(NULL, NULL, (uint32_t)ULONG_MAX)))
-        HGOTO_ERROR(H5E_SLIST ,H5E_NOSPACE, NULL, "can't create new skip list node")
+    if (NULL == (header = H5SL_new_node(NULL, NULL, (uint32_t)ULONG_MAX)))
+        HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "can't create new skip list node")
 
     /* Initialize header node's forward pointer */
     header->forward[0] = NULL;
@@ -969,22 +959,21 @@ H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp)
 
     /* Attach the header */
     new_slist->header = header;
-    new_slist->last = header;
+    new_slist->last   = header;
 
     /* Set the return value */
     ret_value = new_slist;
 
 done:
     /* Error cleanup */
-    if(ret_value == NULL) {
-        if(new_slist != NULL)
+    if (ret_value == NULL) {
+        if (new_slist != NULL)
             new_slist = H5FL_FREE(H5SL_t, new_slist);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_count
@@ -1020,7 +1009,6 @@ H5SL_count(H5SL_t *slist)
     FUNC_LEAVE_NOAPI(slist->nobjs)
 } /* end H5SL_count() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_insert
@@ -1045,7 +1033,7 @@ H5SL_count(H5SL_t *slist)
 herr_t
 H5SL_insert(H5SL_t *slist, void *item, const void *key)
 {
-    herr_t ret_value=SUCCEED;                   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1060,14 +1048,13 @@ H5SL_insert(H5SL_t *slist, void *item, const void *key)
     /* (Pre-condition) */
 
     /* Insert item into skip list */
-    if(H5SL_insert_common(slist,item,key)==NULL)
-        HGOTO_ERROR(H5E_SLIST,H5E_CANTINSERT,FAIL,"can't create new skip list node")
+    if (H5SL_insert_common(slist, item, key) == NULL)
+        HGOTO_ERROR(H5E_SLIST, H5E_CANTINSERT, FAIL, "can't create new skip list node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_insert() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_add
@@ -1095,7 +1082,7 @@ done:
 H5SL_node_t *
 H5SL_add(H5SL_t *slist, void *item, const void *key)
 {
-    H5SL_node_t *ret_value;                   /* Return value */
+    H5SL_node_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1110,14 +1097,13 @@ H5SL_add(H5SL_t *slist, void *item, const void *key)
     /* (Pre-condition) */
 
     /* Insert item into skip list */
-    if((ret_value=H5SL_insert_common(slist,item,key))==NULL)
-        HGOTO_ERROR(H5E_SLIST,H5E_CANTINSERT,NULL,"can't create new skip list node")
+    if ((ret_value = H5SL_insert_common(slist, item, key)) == NULL)
+        HGOTO_ERROR(H5E_SLIST, H5E_CANTINSERT, NULL, "can't create new skip list node")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_add() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_remove
@@ -1140,9 +1126,9 @@ done:
 void *
 H5SL_remove(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *x;                             /* Current node to examine */
-    uint32_t hashval = 0;                       /* Hash value for key */
-    void *ret_value = NULL;                     /* Return value */
+    H5SL_node_t *x;                /* Current node to examine */
+    uint32_t     hashval   = 0;    /* Hash value for key */
+    void *       ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1159,7 +1145,7 @@ H5SL_remove(H5SL_t *slist, const void *key)
      * level that is before the location to remove
      */
     x = slist->header;
-    switch(slist->type) {
+    switch (slist->type) {
         case H5SL_TYPE_INT:
             H5SL_REMOVE(SCALAR, slist, x, const int, key, -)
             break;
@@ -1204,7 +1190,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_remove() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_remove_first
@@ -1226,12 +1211,12 @@ done:
 void *
 H5SL_remove_first(H5SL_t *slist)
 {
-    void *ret_value = NULL;                     /* Return value */
-    H5SL_node_t *head = slist->header;          /* Skip list header */
-    H5SL_node_t *tmp = slist->header->forward[0]; /* Temporary node pointer */
-    H5SL_node_t *next;                          /* Next node to search for */
-    size_t      level = slist->curr_level;      /* Skip list level */
-    size_t      i;                              /* Index */
+    void *       ret_value = NULL;                      /* Return value */
+    H5SL_node_t *head      = slist->header;             /* Skip list header */
+    H5SL_node_t *tmp       = slist->header->forward[0]; /* Temporary node pointer */
+    H5SL_node_t *next;                                  /* Next node to search for */
+    size_t       level = slist->curr_level;             /* Skip list level */
+    size_t       i;                                     /* Index */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1247,7 +1232,7 @@ H5SL_remove_first(H5SL_t *slist)
     /* Remove item from skip list */
 
     /* Check for empty list */
-    if(slist->last != slist->header) {
+    if (slist->last != slist->header) {
 
         /* Assign return value */
         ret_value = tmp->item;
@@ -1256,58 +1241,59 @@ H5SL_remove_first(H5SL_t *slist)
 
         /* Remove the first node */
         head->forward[0] = tmp->forward[0];
-        if(slist->last == tmp)
+        if (slist->last == tmp)
             slist->last = head;
         else
             tmp->forward[0]->backward = head;
         slist->nobjs--;
         /* Free memory */
         tmp->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[0], tmp->forward);
-        tmp = H5FL_FREE(H5SL_node_t, tmp);
+        tmp          = H5FL_FREE(H5SL_node_t, tmp);
 
         /* Reshape the skip list as necessary to maintain 1-2-3 condition */
-        for(i=0; i < level; i++) {
-            next = head->forward[i+1];
+        for (i = 0; i < level; i++) {
+            next = head->forward[i + 1];
             HDassert(next);
 
             /* Check if  head->forward[i] == head->forward[i+1] (illegal) */
-            if(head->forward[i] == next) {
-                tmp = next;
-                next = next->forward[i+1];
+            if (head->forward[i] == next) {
+                tmp  = next;
+                next = next->forward[i + 1];
 
-                HDassert(tmp->level == i+1);
+                HDassert(tmp->level == i + 1);
 
                 /* Demote head->forward[i] */
                 H5SL_DEMOTE(tmp, head)
 
                 /* Check if we need to promote the following node to maintain
                  * 1-2-3 condition */
-                if(tmp->forward[i]->forward[i] != next) {
+                if (tmp->forward[i]->forward[i] != next) {
                     HDassert(tmp->forward[i]->forward[i]->forward[i] == next ||
-                        tmp->forward[i]->forward[i]->forward[i]->forward[i] == next);
+                             tmp->forward[i]->forward[i]->forward[i]->forward[i] == next);
                     tmp = tmp->forward[i];
                     H5SL_PROMOTE(slist, tmp, head, NULL);
                     /* In this case, since there is a node of height = i+1 here
                      * now (tmp), we know the skip list must be valid and can
                      * break */
                     break;
-                } else if(!head->forward[i+1]) {
+                }
+                else if (!head->forward[i + 1]) {
                     /* We just shrunk the largest node, shrink the header */
                     HDassert(i == level - 1);
 
                     H5SL_SHRINK(head, level)
                     slist->curr_level--;
                 } /* end else */
-            } else
+            }
+            else
                 break;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_remove_first() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_search
@@ -1330,9 +1316,9 @@ done:
 void *
 H5SL_search(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *x;                             /* Current node to examine */
-    uint32_t hashval = 0;                       /* Hash value for key */
-    void *ret_value;                            /* Return value */
+    H5SL_node_t *x;           /* Current node to examine */
+    uint32_t     hashval = 0; /* Hash value for key */
+    void *       ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1348,8 +1334,8 @@ H5SL_search(H5SL_t *slist, const void *key)
     /* Work through the forward pointers for a node, finding the node at each
      * level that is before the location to insert
      */
-    x=slist->header;
-    switch(slist->type) {
+    x = slist->header;
+    switch (slist->type) {
         case H5SL_TYPE_INT:
             H5SL_SEARCH(SCALAR, slist, x, const int, key, -)
             break;
@@ -1391,13 +1377,12 @@ H5SL_search(H5SL_t *slist, const void *key)
     } /* end switch */
 
     /* 'key' must not have been found in list, if we get here */
-    ret_value=NULL;
+    ret_value = NULL;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_search() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_less
@@ -1423,9 +1408,9 @@ done:
 void *
 H5SL_less(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *x;                             /* Current node to examine */
-    uint32_t hashval = 0;                       /* Hash value for key */
-    void *ret_value;                            /* Return value */
+    H5SL_node_t *x;           /* Current node to examine */
+    uint32_t     hashval = 0; /* Hash value for key */
+    void *       ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1444,8 +1429,8 @@ H5SL_less(H5SL_t *slist, const void *key)
     /* Work through the forward pointers for a node, finding the node at each
      * level that is before the location to insert
      */
-    x=slist->header;
-    switch(slist->type) {
+    x = slist->header;
+    switch (slist->type) {
         case H5SL_TYPE_INT:
             H5SL_SEARCH(SCALAR, slist, x, const int, key, -)
             break;
@@ -1488,25 +1473,24 @@ H5SL_less(H5SL_t *slist, const void *key)
 
     /* An exact match for 'key' must not have been found in list, if we get here */
     /* Check for a node with a key that is less than the given 'key' */
-    if(x==NULL) {
+    if (x == NULL) {
         /* Check for walking off the list */
-        if(slist->last!=slist->header)
-            ret_value=slist->last->item;
+        if (slist->last != slist->header)
+            ret_value = slist->last->item;
         else
-            ret_value=NULL;
+            ret_value = NULL;
     } /* end if */
     else {
-        if(x->backward!=slist->header)
-            ret_value=x->backward->item;
+        if (x->backward != slist->header)
+            ret_value = x->backward->item;
         else
-            ret_value=NULL;
+            ret_value = NULL;
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_less() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_greater
@@ -1532,9 +1516,9 @@ done:
 void *
 H5SL_greater(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *x;                             /* Current node to examine */
-    uint32_t hashval = 0;                       /* Hash value for key */
-    void *ret_value;                            /* Return value */
+    H5SL_node_t *x;           /* Current node to examine */
+    uint32_t     hashval = 0; /* Hash value for key */
+    void *       ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1554,7 +1538,7 @@ H5SL_greater(H5SL_t *slist, const void *key)
      * level that is before the location to insert
      */
     x = slist->header;
-    switch(slist->type) {
+    switch (slist->type) {
         case H5SL_TYPE_INT:
             H5SL_SEARCH(SCALAR, slist, x, const int, key, -)
             break;
@@ -1597,7 +1581,7 @@ H5SL_greater(H5SL_t *slist, const void *key)
 
     /* An exact match for 'key' must not have been found in list, if we get here */
     /* ('x' must be the next node with a key greater than the 'key', or NULL) */
-    if(x)
+    if (x)
         ret_value = x->item;
     else
         ret_value = NULL;
@@ -1606,7 +1590,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_greater() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_find
@@ -1631,9 +1614,9 @@ done:
 H5SL_node_t *
 H5SL_find(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *x;                             /* Current node to examine */
-    uint32_t hashval = 0;                       /* Hash value for key */
-    H5SL_node_t *ret_value;                     /* Return value */
+    H5SL_node_t *x;           /* Current node to examine */
+    uint32_t     hashval = 0; /* Hash value for key */
+    H5SL_node_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1649,8 +1632,8 @@ H5SL_find(H5SL_t *slist, const void *key)
     /* Work through the forward pointers for a node, finding the node at each
      * level that is before the location to insert
      */
-    x=slist->header;
-    switch(slist->type) {
+    x = slist->header;
+    switch (slist->type) {
         case H5SL_TYPE_INT:
             H5SL_FIND(SCALAR, slist, x, const int, key, -)
             break;
@@ -1692,13 +1675,12 @@ H5SL_find(H5SL_t *slist, const void *key)
     } /* end switch */
 
     /* 'key' must not have been found in list, if we get here */
-    ret_value=NULL;
+    ret_value = NULL;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_find() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_below
@@ -1724,9 +1706,9 @@ done:
 H5SL_node_t *
 H5SL_below(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *x;                             /* Current node to examine */
-    uint32_t hashval = 0;                       /* Hash value for key */
-    H5SL_node_t *ret_value;                     /* Return value */
+    H5SL_node_t *x;           /* Current node to examine */
+    uint32_t     hashval = 0; /* Hash value for key */
+    H5SL_node_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1743,7 +1725,7 @@ H5SL_below(H5SL_t *slist, const void *key)
      * level that is before the location to insert
      */
     x = slist->header;
-    switch(slist->type) {
+    switch (slist->type) {
         case H5SL_TYPE_INT:
             H5SL_FIND(SCALAR, slist, x, const int, key, -)
             break;
@@ -1786,15 +1768,15 @@ H5SL_below(H5SL_t *slist, const void *key)
 
     /* An exact match for 'key' must not have been found in list, if we get here */
     /* Check for a node with a key that is less than the given 'key' */
-    if(NULL == x) {
+    if (NULL == x) {
         /* Check for walking off the list */
-        if(slist->last != slist->header)
+        if (slist->last != slist->header)
             ret_value = slist->last;
         else
             ret_value = NULL;
     } /* end if */
     else {
-        if(x->backward != slist->header)
+        if (x->backward != slist->header)
             ret_value = x->backward;
         else
             ret_value = NULL;
@@ -1804,7 +1786,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_below() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_above
@@ -1830,9 +1811,9 @@ done:
 H5SL_node_t *
 H5SL_above(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *x;                             /* Current node to examine */
-    uint32_t hashval = 0;                       /* Hash value for key */
-    H5SL_node_t *ret_value;                     /* Return value */
+    H5SL_node_t *x;           /* Current node to examine */
+    uint32_t     hashval = 0; /* Hash value for key */
+    H5SL_node_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1849,7 +1830,7 @@ H5SL_above(H5SL_t *slist, const void *key)
      * level that is before the location to insert
      */
     x = slist->header;
-    switch(slist->type) {
+    switch (slist->type) {
         case H5SL_TYPE_INT:
             H5SL_FIND(SCALAR, slist, x, const int, key, -)
             break;
@@ -1892,7 +1873,7 @@ H5SL_above(H5SL_t *slist, const void *key)
 
     /* An exact match for 'key' must not have been found in list, if we get here */
     /* ('x' must be the next node with a key greater than the 'key', or NULL) */
-    if(x)
+    if (x)
         ret_value = x;
     else
         ret_value = NULL;
@@ -1901,7 +1882,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_above() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_first
@@ -1938,7 +1918,6 @@ H5SL_first(H5SL_t *slist)
     FUNC_LEAVE_NOAPI(slist->header->forward[0])
 } /* end H5SL_first() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_next
@@ -1975,7 +1954,6 @@ H5SL_next(H5SL_node_t *slist_node)
     FUNC_LEAVE_NOAPI(slist_node->forward[0])
 } /* end H5SL_next() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_prev
@@ -2010,10 +1988,9 @@ H5SL_prev(H5SL_node_t *slist_node)
     /* (Pre-condition) */
 
     /* Walk backward, detecting the header node (which has it's key set to NULL) */
-    FUNC_LEAVE_NOAPI(slist_node->backward->key==NULL ? NULL : slist_node->backward)
+    FUNC_LEAVE_NOAPI(slist_node->backward->key == NULL ? NULL : slist_node->backward)
 } /* end H5SL_prev() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_last
@@ -2048,10 +2025,9 @@ H5SL_last(H5SL_t *slist)
     /* (Pre-condition) */
 
     /* Find last node, avoiding the header node */
-    FUNC_LEAVE_NOAPI(slist->last==slist->header ? NULL : slist->last)
+    FUNC_LEAVE_NOAPI(slist->last == slist->header ? NULL : slist->last)
 } /* end H5SL_last() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_item
@@ -2087,7 +2063,6 @@ H5SL_item(H5SL_node_t *slist_node)
     FUNC_LEAVE_NOAPI(slist_node->item)
 } /* end H5SL_item() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_iterate
@@ -2124,9 +2099,9 @@ H5SL_item(H5SL_node_t *slist_node)
 herr_t
 H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data)
 {
-    H5SL_node_t *node;  /* Pointer to current skip list node */
-    H5SL_node_t *next;  /* Pointer to next skip list node */
-    herr_t ret_value = 0; /* Return value */
+    H5SL_node_t *node;          /* Pointer to current skip list node */
+    H5SL_node_t *next;          /* Pointer to next skip list node */
+    herr_t       ret_value = 0; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2138,14 +2113,14 @@ H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data)
 
     /* Free skip list nodes */
     node = slist->header->forward[0];
-    while(node != NULL) {
+    while (node != NULL) {
         /* Protect against the node being deleted by the callback */
         next = node->forward[0];
 
         /* Call the iterator callback */
         /* Casting away const OK -QAK */
-        if(!node->removed)
-            if((ret_value = (op)(node->item, (void *)node->key, op_data)) != 0)
+        if (!node->removed)
+            if ((ret_value = (op)(node->item, (void *)node->key, op_data)) != 0)
                 break;
 
         /* Advance to next node */
@@ -2155,7 +2130,6 @@ H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_iterate() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_release
@@ -2191,12 +2165,11 @@ H5SL_release(H5SL_t *slist)
     /* (Pre-condition) */
 
     /* Free skip list nodes */
-    H5SL_release_common(slist,NULL,NULL); /* always succeeds */
+    H5SL_release_common(slist, NULL, NULL); /* always succeeds */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SL_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_free
@@ -2240,12 +2213,11 @@ H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data)
     /* (Pre-condition) */
 
     /* Free skip list nodes */
-    H5SL_release_common(slist,op,op_data); /* always succeeds */
+    H5SL_release_common(slist, op, op_data); /* always succeeds */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SL_free() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_try_free_safe
@@ -2277,8 +2249,8 @@ herr_t
 H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data)
 {
     H5SL_node_t *node, *next_node, *last_node; /* Pointers to skip list nodes */
-    htri_t op_ret;
-    herr_t ret_value = SUCCEED;
+    htri_t       op_ret;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2299,16 +2271,16 @@ H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data)
     /* Iterate over skip list nodes, making the callback for each and marking
      * them as removed if requested by the callback */
     node = slist->header->forward[0];
-    while(node) {
+    while (node) {
         /* Check if the node was already removed */
-        if(!node->removed) {
+        if (!node->removed) {
             /* Call callback */
             /* Casting away const OK -NAF */
-            if((op_ret = (op)(node->item , (void *)node->key, op_data)) < 0)
+            if ((op_ret = (op)(node->item, (void *)node->key, op_data)) < 0)
                 HGOTO_ERROR(H5E_SLIST, H5E_CALLBACK, FAIL, "callback operation failed")
 
             /* Check if op indicated that the node should be removed */
-            if(op_ret)
+            if (op_ret)
                 /* Mark the node as removed */
                 node->removed = TRUE;
         } /* end if */
@@ -2321,17 +2293,17 @@ H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data)
     slist->safe_iterating = FALSE;
 
     /* Iterate over nodes, freeing ones marked as removed */
-    node = slist->header->forward[0];
+    node      = slist->header->forward[0];
     last_node = slist->header;
-    while(node) {
+    while (node) {
         /* Save next node */
         next_node = node->forward[0];
 
         /* Check if the node was marked as removed */
-        if(node->removed) {
+        if (node->removed) {
             /* Remove the node */
             node->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[node->log_nalloc], node->forward);
-            node = H5FL_FREE(H5SL_node_t, node);
+            node          = H5FL_FREE(H5SL_node_t, node);
             slist->nobjs--;
         } /* end if */
         else {
@@ -2341,18 +2313,19 @@ H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data)
             /* Set level to 0.  Note there is no need to preserve
              * node->forward[0] since it was cached above and will always be
              * updated later. */
-            if(node->level > 0) {
-                node->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[node->log_nalloc], (void *)node->forward);
-                if(NULL == (node->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0])))
+            if (node->level > 0) {
+                node->forward =
+                    (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[node->log_nalloc], (void *)node->forward);
+                if (NULL == (node->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0])))
                     HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, FAIL, "memory allocation failed")
                 node->log_nalloc = 0;
-                node->level = 0;
+                node->level      = 0;
             } /* end if */
 
             /* Update pointers */
             last_node->forward[0] = node;
-            node->backward = last_node;
-            last_node = node;
+            node->backward        = last_node;
+            last_node             = node;
         } /* end else */
 
         /* Advance node */
@@ -2361,23 +2334,24 @@ H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data)
 
     /* Final pointer update */
     last_node->forward[0] = NULL;
-    slist->last = last_node;
+    slist->last           = last_node;
 
     /* Demote skip list to level 0 */
-    if(slist->curr_level > 0) {
+    if (slist->curr_level > 0) {
         HDassert(slist->header->level == (size_t)slist->curr_level);
 
-        node = slist->header->forward[0];
-        slist->header->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[slist->header->log_nalloc], (void *)slist->header->forward);
-        if(NULL == (slist->header->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0])))
+        node                   = slist->header->forward[0];
+        slist->header->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[slist->header->log_nalloc],
+                                                               (void *)slist->header->forward);
+        if (NULL == (slist->header->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0])))
             HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, FAIL, "memory allocation failed")
         slist->header->forward[0] = node;
         slist->header->log_nalloc = 0;
-        slist->header->level = 0;
+        slist->header->level      = 0;
     } /* end if */
 
     /* Check if there are any nodes left */
-    if(slist->nobjs > 0) {
+    if (slist->nobjs > 0) {
         int i;
 
         HDassert(slist->header->forward[0]);
@@ -2386,31 +2360,31 @@ H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data)
         slist->curr_level = 0;
 
         /* Rebuild the forward arrays */
-        for(i = 0; slist->curr_level >= i; i++) {
+        for (i = 0; slist->curr_level >= i; i++) {
             HDassert(slist->curr_level == i);
 
             /* Promote every third node this level until we run out of nodes */
             node = last_node = slist->header;
-            while(1) {
+            while (1) {
                 /* Check second node in gap, if not present, no need to promote
                  * further this level. */
                 HDassert(node->forward[i]);
                 node = node->forward[i]->forward[i];
-                if(!node)
+                if (!node)
                     break;
 
                 /* Check third and fourth node in gap, if either is not present,
                  * no need to promote further this level. */
                 node = node->forward[i];
-                if(!node || !node->forward[i])
+                if (!node || !node->forward[i])
                     break;
 
                 /* Promote the third node in the gap */
                 H5SL_PROMOTE(slist, node, last_node, FAIL)
                 last_node = node;
             } /* end while */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
     else {
         HDassert(!slist->header->forward[0]);
         HDassert(slist->last == slist->header);
@@ -2424,7 +2398,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_try_free_safe() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_destroy
@@ -2454,7 +2427,7 @@ done:
 herr_t
 H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2465,12 +2438,11 @@ H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data)
     /* (Pre-condition) */
 
     /* Close skip list */
-    (void)H5SL_close_common(slist,op,op_data); /* always succeeds */
+    (void)H5SL_close_common(slist, op, op_data); /* always succeeds */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_destroy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_close
@@ -2502,12 +2474,11 @@ H5SL_close(H5SL_t *slist)
     /* (Pre-condition) */
 
     /* Close skip list */
-    (void)H5SL_close_common(slist,NULL,NULL); /* always succeeds */
+    (void)H5SL_close_common(slist, NULL, NULL); /* always succeeds */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SL_close() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5SL_term_interface
@@ -2518,7 +2489,7 @@ H5SL_close(H5SL_t *slist)
  RETURNS
     Success:	Positive if any action might have caused a change in some
                 other interface; zero otherwise.
-   	Failure:	Negative
+        Failure:	Negative
  DESCRIPTION
     Release any resources allocated.
  GLOBAL VARIABLES
@@ -2527,24 +2498,25 @@ H5SL_close(H5SL_t *slist)
  EXAMPLES
  REVISION LOG
 --------------------------------------------------------------------------*/
-int H5SL_term_interface(void)
+int
+H5SL_term_interface(void)
 {
-    size_t  i;
-    herr_t  ret;
-    int     n = H5_interface_initialize_g ? 1 : 0;
+    size_t i;
+    herr_t ret;
+    int    n = H5_interface_initialize_g ? 1 : 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(n) {
+    if (n) {
         /* Terminate all the factories */
-        for(i=0; i<H5SL_fac_nused_g; i++) {
+        for (i = 0; i < H5SL_fac_nused_g; i++) {
             ret = H5FL_fac_term(H5SL_fac_g[i]);
             HDassert(ret >= 0);
         }
         H5SL_fac_nused_g = 0;
 
         /* Free the list of factories */
-        H5SL_fac_g = (H5FL_fac_head_t **)H5MM_xfree((void *)H5SL_fac_g);
+        H5SL_fac_g        = (H5FL_fac_head_t **)H5MM_xfree((void *)H5SL_fac_g);
         H5SL_fac_nalloc_g = 0;
 
         /* Mark the interface as uninitialized */
@@ -2553,4 +2525,3 @@ int H5SL_term_interface(void)
 
     FUNC_LEAVE_NOAPI(n)
 } /* H5SL_term_interface() */
-
diff --git a/src/H5SLprivate.h b/src/H5SLprivate.h
index 1393a25..8a75d3e 100644
--- a/src/H5SLprivate.h
+++ b/src/H5SLprivate.h
@@ -34,7 +34,7 @@
 /************/
 
 /* Typedefs for skip list struct (defined in H5SL.c) */
-typedef struct H5SL_t H5SL_t;
+typedef struct H5SL_t      H5SL_t;
 typedef struct H5SL_node_t H5SL_node_t;
 
 /* Typedef for kinds of skip lists supported */
@@ -58,25 +58,23 @@ typedef enum {
 typedef int (*H5SL_cmp_t)(const void *key1, const void *key2);
 
 /* Typedef for iteration operations */
-typedef herr_t (*H5SL_operator_t)(void *item, void *key,
-    void *operator_data/*in,out*/);
+typedef herr_t (*H5SL_operator_t)(void *item, void *key, void *operator_data /*in,out*/);
 
 /* Typedef for H5SL_try_free_safe operation callback */
-typedef htri_t (*H5SL_try_free_op_t)(void *item, void *key,
-    void *operator_data/*in,out*/);
+typedef htri_t (*H5SL_try_free_op_t)(void *item, void *key, void *operator_data /*in,out*/);
 
 /********************/
 /* Private routines */
 /********************/
 H5_DLL H5SL_t *H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp);
-H5_DLL size_t H5SL_count(H5SL_t *slist);
-H5_DLL herr_t H5SL_insert(H5SL_t *slist, void *item, const void *key);
+H5_DLL size_t  H5SL_count(H5SL_t *slist);
+H5_DLL herr_t  H5SL_insert(H5SL_t *slist, void *item, const void *key);
 H5_DLL H5SL_node_t *H5SL_add(H5SL_t *slist, void *item, const void *key);
-H5_DLL void *H5SL_remove(H5SL_t *slist, const void *key);
-H5_DLL void *H5SL_remove_first(H5SL_t *slist);
-H5_DLL void *H5SL_search(H5SL_t *slist, const void *key);
-H5_DLL void *H5SL_less(H5SL_t *slist, const void *key);
-H5_DLL void *H5SL_greater(H5SL_t *slist, const void *key);
+H5_DLL void *       H5SL_remove(H5SL_t *slist, const void *key);
+H5_DLL void *       H5SL_remove_first(H5SL_t *slist);
+H5_DLL void *       H5SL_search(H5SL_t *slist, const void *key);
+H5_DLL void *       H5SL_less(H5SL_t *slist, const void *key);
+H5_DLL void *       H5SL_greater(H5SL_t *slist, const void *key);
 H5_DLL H5SL_node_t *H5SL_find(H5SL_t *slist, const void *key);
 H5_DLL H5SL_node_t *H5SL_below(H5SL_t *slist, const void *key);
 H5_DLL H5SL_node_t *H5SL_above(H5SL_t *slist, const void *key);
@@ -84,15 +82,13 @@ H5_DLL H5SL_node_t *H5SL_first(H5SL_t *slist);
 H5_DLL H5SL_node_t *H5SL_next(H5SL_node_t *slist_node);
 H5_DLL H5SL_node_t *H5SL_prev(H5SL_node_t *slist_node);
 H5_DLL H5SL_node_t *H5SL_last(H5SL_t *slist);
-H5_DLL void *H5SL_item(H5SL_node_t *slist_node);
-H5_DLL herr_t H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data);
-H5_DLL herr_t H5SL_release(H5SL_t *slist);
-H5_DLL herr_t H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data);
-H5_DLL herr_t H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op,
-    void *op_data);
-H5_DLL herr_t H5SL_close(H5SL_t *slist);
-H5_DLL herr_t H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data);
-H5_DLL int H5SL_term_interface(void);
+H5_DLL void *       H5SL_item(H5SL_node_t *slist_node);
+H5_DLL herr_t       H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data);
+H5_DLL herr_t       H5SL_release(H5SL_t *slist);
+H5_DLL herr_t       H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data);
+H5_DLL herr_t       H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data);
+H5_DLL herr_t       H5SL_close(H5SL_t *slist);
+H5_DLL herr_t       H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data);
+H5_DLL int          H5SL_term_interface(void);
 
 #endif /* _H5SLprivate_H */
-
diff --git a/src/H5SM.c b/src/H5SM.c
index b549b59..35fe355 100644
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -15,69 +15,61 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg 	  */
-#define H5SM_PACKAGE		/*suppress error about including H5SMpkg	  */
+#define H5O_PACKAGE  /*suppress error about including H5Opkg 	  */
+#define H5SM_PACKAGE /*suppress error about including H5SMpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access                          */
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5MFprivate.h"        /* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object Headers                       */
-#include "H5SMpkg.h"            /* Shared object header messages        */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access                          */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object Headers                       */
+#include "H5SMpkg.h"     /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Udata struct for calls to H5SM_read_iter_op */
 typedef struct H5SM_read_udata_t {
-    H5F_t *file;                    /* File in which sharing is happening (in) */
+    H5F_t *           file;         /* File in which sharing is happening (in) */
     H5O_msg_crt_idx_t idx;          /* Creation index of this message (in) */
-    size_t buf_size;                /* Size of the encoded message (out) */
-    void *encoding_buf;             /* The encoded message (out) */
+    size_t            buf_size;     /* Size of the encoded message (out) */
+    void *            encoding_buf; /* The encoded message (out) */
 } H5SM_read_udata_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5SM_create_index(H5F_t *f, H5SM_index_header_t *header,
-                                hid_t dxpl_id);
-static herr_t H5SM_delete_index(H5F_t *f, H5SM_index_header_t *header,
-                                hid_t dxpl_id, hbool_t delete_heap);
+static herr_t  H5SM_create_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id);
+static herr_t  H5SM_delete_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id, hbool_t delete_heap);
 static haddr_t H5SM_create_list(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id);
-static herr_t H5SM_find_in_list(const H5SM_list_t *list, const H5SM_mesg_key_t *key, 
-                                size_t *empty_pos, size_t *list_pos);
-static herr_t H5SM_convert_list_to_btree(H5F_t * f, H5SM_index_header_t * header,
-                H5SM_list_t **_list, H5HF_t *fheap, H5O_t *open_oh, hid_t dxpl_id);
-static herr_t H5SM_convert_btree_to_list(H5F_t * f, H5SM_index_header_t * header, hid_t dxpl_id);
-static herr_t H5SM_incr_ref(void *record, void *_op_data, hbool_t *changed);
-static herr_t H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    H5SM_index_header_t *header, hbool_t defer, unsigned type_id, void *mesg,
-    unsigned *cache_flags_ptr);
-static herr_t H5SM_decr_ref(void *record, void *op_data, hbool_t *changed);
-static herr_t H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    H5SM_index_header_t *header, const H5O_shared_t * mesg,
-    unsigned *cache_flags, size_t * /*out*/ mesg_size, void ** /*out*/ encoded_mesg);
-static herr_t H5SM_type_to_flag(unsigned type_id, unsigned *type_flag);
-static herr_t H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence,
-    unsigned *oh_modified, void *_udata);
-static herr_t H5SM_read_mesg_fh_cb(const void *obj, size_t obj_len, void *_udata);
-static herr_t H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap,
-               H5O_t * open_oh, hid_t dxpl_id, size_t *encoding_size /*out*/,
-               void ** encoded_mesg /*out*/);
-
+static herr_t  H5SM_find_in_list(const H5SM_list_t *list, const H5SM_mesg_key_t *key, size_t *empty_pos,
+                                 size_t *list_pos);
+static herr_t  H5SM_convert_list_to_btree(H5F_t *f, H5SM_index_header_t *header, H5SM_list_t **_list,
+                                          H5HF_t *fheap, H5O_t *open_oh, hid_t dxpl_id);
+static herr_t  H5SM_convert_btree_to_list(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id);
+static herr_t  H5SM_incr_ref(void *record, void *_op_data, hbool_t *changed);
+static herr_t  H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5SM_index_header_t *header,
+                               hbool_t defer, unsigned type_id, void *mesg, unsigned *cache_flags_ptr);
+static herr_t  H5SM_decr_ref(void *record, void *op_data, hbool_t *changed);
+static herr_t  H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5SM_index_header_t *header,
+                                      const H5O_shared_t *mesg, unsigned *cache_flags,
+                                      size_t * /*out*/ mesg_size, void ** /*out*/ encoded_mesg);
+static herr_t  H5SM_type_to_flag(unsigned type_id, unsigned *type_flag);
+static herr_t  H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence, unsigned *oh_modified,
+                                 void *_udata);
+static herr_t  H5SM_read_mesg_fh_cb(const void *obj, size_t obj_len, void *_udata);
+static herr_t  H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap, H5O_t *open_oh, hid_t dxpl_id,
+                              size_t *encoding_size /*out*/, void **encoded_mesg /*out*/);
 
 /*********************/
 /* Package Variables */
@@ -88,18 +80,14 @@ H5FL_ARR_DEFINE(H5SM_index_header_t, H5O_SHMESG_MAX_NINDEXES);
 H5FL_DEFINE(H5SM_list_t);
 H5FL_ARR_DEFINE(H5SM_sohm_t, H5O_SHMESG_MAX_LIST_SIZE);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_init
  *
@@ -117,17 +105,17 @@ H5FL_ARR_DEFINE(H5SM_sohm_t, H5O_SHMESG_MAX_LIST_SIZE);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t dxpl_id)
+H5SM_init(H5F_t *f, H5P_genplist_t *fc_plist, const H5O_loc_t *ext_loc, hid_t dxpl_id)
 {
-    H5O_shmesg_table_t sohm_table;      /* SOHM message for superblock extension */
-    H5SM_master_table_t *table = NULL;  /* SOHM master table for file */
-    haddr_t table_addr = HADDR_UNDEF;   /* Address of SOHM master table in file */
-    unsigned list_max, btree_min;       /* Phase change limits for SOHM indices */
-    unsigned index_type_flags[H5O_SHMESG_MAX_NINDEXES]; /* Messages types stored in each index */
+    H5O_shmesg_table_t   sohm_table;               /* SOHM message for superblock extension */
+    H5SM_master_table_t *table      = NULL;        /* SOHM master table for file */
+    haddr_t              table_addr = HADDR_UNDEF; /* Address of SOHM master table in file */
+    unsigned             list_max, btree_min;      /* Phase change limits for SOHM indices */
+    unsigned             index_type_flags[H5O_SHMESG_MAX_NINDEXES]; /* Messages types stored in each index */
     unsigned minsizes[H5O_SHMESG_MAX_NINDEXES]; /* Message size sharing threshhold for each index */
-    unsigned type_flags_used;           /* Message type flags used, for sanity checking */
-    unsigned x;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned type_flags_used;                   /* Message type flags used, for sanity checking */
+    unsigned x;                                 /* Local index variable */
+    herr_t   ret_value = SUCCEED;               /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -136,30 +124,31 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d
     HDassert(!H5F_addr_defined(H5F_SOHM_ADDR(f)));
 
     /* Initialize master table */
-    if(NULL == (table = H5FL_MALLOC(H5SM_master_table_t)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTALLOC, FAIL, "memory allocation failed for SOHM table")
+    if (NULL == (table = H5FL_MALLOC(H5SM_master_table_t)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTALLOC, FAIL, "memory allocation failed for SOHM table")
     table->num_indexes = H5F_SOHM_NINDEXES(f);
-    table->table_size = H5SM_TABLE_SIZE(f);
+    table->table_size  = H5SM_TABLE_SIZE(f);
 
     /* Get information from fcpl */
-    if(H5P_get(fc_plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, &index_type_flags) < 0)
+    if (H5P_get(fc_plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, &index_type_flags) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't get SOHM type flags")
-    if(H5P_get(fc_plist, H5F_CRT_SHMSG_LIST_MAX_NAME, &list_max) < 0)
+    if (H5P_get(fc_plist, H5F_CRT_SHMSG_LIST_MAX_NAME, &list_max) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't get SOHM list maximum")
-    if(H5P_get(fc_plist, H5F_CRT_SHMSG_BTREE_MIN_NAME, &btree_min) < 0)
+    if (H5P_get(fc_plist, H5F_CRT_SHMSG_BTREE_MIN_NAME, &btree_min) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't get SOHM btree minimum")
-    if(H5P_get(fc_plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, &minsizes) < 0)
+    if (H5P_get(fc_plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, &minsizes) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't get SOHM message min sizes")
 
     /* Verify that values are valid */
-    if(table->num_indexes > H5O_SHMESG_MAX_NINDEXES)
+    if (table->num_indexes > H5O_SHMESG_MAX_NINDEXES)
         HGOTO_ERROR(H5E_SOHM, H5E_BADRANGE, FAIL, "number of indexes in property list is too large")
 
     /* Check that type flags weren't duplicated anywhere */
     type_flags_used = 0;
-    for(x = 0; x < table->num_indexes; ++x) {
-        if(index_type_flags[x] & type_flags_used)
-            HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, FAIL, "the same shared message type flag is assigned to more than one index")
+    for (x = 0; x < table->num_indexes; ++x) {
+        if (index_type_flags[x] & type_flags_used)
+            HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, FAIL,
+                        "the same shared message type flag is assigned to more than one index")
         type_flags_used |= index_type_flags[x];
     } /* end for */
 
@@ -177,23 +166,24 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d
     HDassert(table->num_indexes > 0 && table->num_indexes <= H5O_SHMESG_MAX_NINDEXES);
 
     /* Allocate the SOHM indexes as an array. */
-    if(NULL == (table->indexes = (H5SM_index_header_t *)H5FL_ARR_MALLOC(H5SM_index_header_t, (size_t)table->num_indexes)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "memory allocation failed for SOHM indexes")
+    if (NULL == (table->indexes =
+                     (H5SM_index_header_t *)H5FL_ARR_MALLOC(H5SM_index_header_t, (size_t)table->num_indexes)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "memory allocation failed for SOHM indexes")
 
     /* Initialize all of the indexes, but don't allocate space for them to
      * hold messages until we actually need to write to them.
      */
-    for(x = 0; x < table->num_indexes; x++) {
-        table->indexes[x].btree_min = btree_min;
-        table->indexes[x].list_max = list_max;
-        table->indexes[x].mesg_types = index_type_flags[x];
+    for (x = 0; x < table->num_indexes; x++) {
+        table->indexes[x].btree_min     = btree_min;
+        table->indexes[x].list_max      = list_max;
+        table->indexes[x].mesg_types    = index_type_flags[x];
         table->indexes[x].min_mesg_size = minsizes[x];
-        table->indexes[x].index_addr = HADDR_UNDEF;
-        table->indexes[x].heap_addr = HADDR_UNDEF;
-        table->indexes[x].num_messages = 0;
+        table->indexes[x].index_addr    = HADDR_UNDEF;
+        table->indexes[x].heap_addr     = HADDR_UNDEF;
+        table->indexes[x].num_messages  = 0;
 
         /* Indexes start as lists unless the list-to-btree threshold is zero */
-        if(table->indexes[x].list_max > 0)
+        if (table->indexes[x].list_max > 0)
             table->indexes[x].index_type = H5SM_LIST;
         else
             table->indexes[x].index_type = H5SM_BTREE;
@@ -203,12 +193,12 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d
     } /* end for */
 
     /* Allocate space for the table on disk */
-    if(HADDR_UNDEF == (table_addr = H5MF_alloc(f, H5FD_MEM_SOHM_TABLE, dxpl_id, (hsize_t)table->table_size)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "file allocation failed for SOHM table")
+    if (HADDR_UNDEF == (table_addr = H5MF_alloc(f, H5FD_MEM_SOHM_TABLE, dxpl_id, (hsize_t)table->table_size)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "file allocation failed for SOHM table")
 
     /* Cache the new table */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, table, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTINS, FAIL, "can't add SOHM table to cache")
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, table, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTINS, FAIL, "can't add SOHM table to cache")
 
     /* Record the address of the master table in the file */
     H5F_SET_SOHM_ADDR(f, table_addr);
@@ -216,28 +206,28 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d
     /* Check for sharing attributes in this file, which means that creation
      *  indices must be tracked on object header message in the file.
      */
-    if(type_flags_used & H5O_SHMESG_ATTR_FLAG)
+    if (type_flags_used & H5O_SHMESG_ATTR_FLAG)
         H5F_SET_STORE_MSG_CRT_IDX(f, TRUE);
 
     /* Write shared message information to the superblock extension */
-    sohm_table.addr = H5F_SOHM_ADDR(f);
-    sohm_table.version = H5F_SOHM_VERS(f);
+    sohm_table.addr     = H5F_SOHM_ADDR(f);
+    sohm_table.version  = H5F_SOHM_VERS(f);
     sohm_table.nindexes = H5F_SOHM_NINDEXES(f);
-    if(H5O_msg_create(ext_loc, H5O_SHMESG_ID, H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, &sohm_table, dxpl_id) < 0)
+    if (H5O_msg_create(ext_loc, H5O_SHMESG_ID, H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_DONTSHARE,
+                       H5O_UPDATE_TIME, &sohm_table, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, FAIL, "unable to update SOHM header message")
 
 done:
-    if(ret_value < 0) {
-        if(table_addr != HADDR_UNDEF)
+    if (ret_value < 0) {
+        if (table_addr != HADDR_UNDEF)
             H5MF_xfree(f, H5FD_MEM_SOHM_TABLE, dxpl_id, table_addr, (hsize_t)table->table_size);
-        if(table != NULL)
+        if (table != NULL)
             table = H5FL_FREE(H5SM_master_table_t, table);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_type_to_flag
  *
@@ -253,12 +243,12 @@ done:
 static herr_t
 H5SM_type_to_flag(unsigned type_id, unsigned *type_flag)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Translate the H5O type_id into an H5SM type flag */
-    switch(type_id) {
+    switch (type_id) {
         case H5O_FILL_ID:
             type_id = H5O_FILL_NEW_ID;
             /* Fall through... */
@@ -279,7 +269,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_type_to_flag() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_get_index
  *
@@ -299,21 +288,21 @@ done:
 ssize_t
 H5SM_get_index(const H5SM_master_table_t *table, unsigned type_id)
 {
-    size_t x;
+    size_t   x;
     unsigned type_flag;
-    ssize_t ret_value = FAIL;
+    ssize_t  ret_value = FAIL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Translate the H5O type_id into an H5SM type flag */
-    if(H5SM_type_to_flag(type_id, &type_flag) < 0)
+    if (H5SM_type_to_flag(type_id, &type_flag) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't map message type to flag")
 
     /* Search the indexes until we find one that matches this flag or we've
      * searched them all.
      */
-    for(x = 0; x < table->num_indexes; ++x)
-        if(table->indexes[x].mesg_types & type_flag)
+    for (x = 0; x < table->num_indexes; ++x)
+        if (table->indexes[x].mesg_types & type_flag)
             HGOTO_DONE((ssize_t)x)
 
     /* At this point, ret_value is either the location of the correct
@@ -323,7 +312,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_get_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_type_shared
  *
@@ -339,25 +327,26 @@ done:
 htri_t
 H5SM_type_shared(H5F_t *f, unsigned type_id, hid_t dxpl_id)
 {
-    H5SM_master_table_t *table = NULL;  /* Shared object master table */
-    unsigned type_flag;                 /* Flag corresponding to message type */
-    size_t u;                           /* Local index variable */
-    htri_t ret_value = FALSE;           /* Return value */
+    H5SM_master_table_t *table = NULL;      /* Shared object master table */
+    unsigned             type_flag;         /* Flag corresponding to message type */
+    size_t               u;                 /* Local index variable */
+    htri_t               ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Translate the H5O type_id into an H5SM type flag */
-    if(H5SM_type_to_flag(type_id, &type_flag) < 0)
+    if (H5SM_type_to_flag(type_id, &type_flag) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't map message type to flag")
 
     /* Look up the master SOHM table */
-    if(H5F_addr_defined(H5F_SOHM_ADDR(f))) {
-        H5SM_table_cache_ud_t cache_udata;      /* User-data for callback */
+    if (H5F_addr_defined(H5F_SOHM_ADDR(f))) {
+        H5SM_table_cache_ud_t cache_udata; /* User-data for callback */
 
         /* Set up user data for callback */
         cache_udata.f = f;
 
-        if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
+        if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE,
+                                                                 H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
     } /* end if */
     else
@@ -367,19 +356,18 @@ H5SM_type_shared(H5F_t *f, unsigned type_id, hid_t dxpl_id)
     /* Search the indexes until we find one that matches this flag or we've
      * searched them all.
      */
-    for(u = 0; u < table->num_indexes; u++)
-        if(table->indexes[u].mesg_types & type_flag)
+    for (u = 0; u < table->num_indexes; u++)
+        if (table->indexes[u].mesg_types & type_flag)
             HGOTO_DONE(TRUE)
 
 done:
     /* Release the master SOHM table */
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_type_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_get_fheap_addr
  *
@@ -396,10 +384,10 @@ done:
 herr_t
 H5SM_get_fheap_addr(H5F_t *f, hid_t dxpl_id, unsigned type_id, haddr_t *fheap_addr)
 {
-    H5SM_master_table_t *table = NULL;  /* Shared object master table */
-    H5SM_table_cache_ud_t cache_udata;  /* User-data for callback */
-    ssize_t index_num;                  /* Which index */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5SM_master_table_t * table = NULL;        /* Shared object master table */
+    H5SM_table_cache_ud_t cache_udata;         /* User-data for callback */
+    ssize_t               index_num;           /* Which index */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -411,25 +399,25 @@ H5SM_get_fheap_addr(H5F_t *f, hid_t dxpl_id, unsigned type_id, haddr_t *fheap_ad
     cache_udata.f = f;
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
+    if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f),
+                                                             &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* Look up index for message type */
-    if((index_num = H5SM_get_index(table, type_id)) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to find correct SOHM index")
+    if ((index_num = H5SM_get_index(table, type_id)) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to find correct SOHM index")
 
     /* Retrieve heap address for index */
     *fheap_addr = table->indexes[index_num].heap_addr;
 
 done:
     /* Release the master SOHM table */
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_get_fheap_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_create_index
  *
@@ -445,10 +433,10 @@ done:
 static herr_t
 H5SM_create_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
 {
-    H5HF_create_t fheap_cparam;         /* Fractal heap creation parameters */
-    H5HF_t *fheap = NULL;               /* Fractal heap handle */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    herr_t ret_value = SUCCEED;
+    H5HF_create_t fheap_cparam;     /* Fractal heap creation parameters */
+    H5HF_t *      fheap     = NULL; /* Fractal heap handle */
+    H5B2_t *      bt2       = NULL; /* v2 B-tree handle for index */
+    herr_t        ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -458,11 +446,11 @@ H5SM_create_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
     HDassert(header->btree_min <= header->list_max + 1);
 
     /* In most cases, the index starts as a list */
-    if(header->list_max > 0) {
-        haddr_t list_addr = HADDR_UNDEF;    /* Address of SOHM list */
+    if (header->list_max > 0) {
+        haddr_t list_addr = HADDR_UNDEF; /* Address of SOHM list */
 
         /* Create the list index */
-        if((list_addr = H5SM_create_list(f, header, dxpl_id)) == HADDR_UNDEF)
+        if ((list_addr = H5SM_create_list(f, header, dxpl_id)) == HADDR_UNDEF)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTCREATE, FAIL, "list creation failed for SOHM index")
 
         /* Set the index type & address */
@@ -471,20 +459,20 @@ H5SM_create_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
     } /* end if */
     /* index is a B-tree */
     else {
-        H5B2_create_t bt2_cparam;           /* v2 B-tree creation parameters */
-        haddr_t tree_addr = HADDR_UNDEF;    /* Address of SOHM B-tree */
+        H5B2_create_t bt2_cparam;              /* v2 B-tree creation parameters */
+        haddr_t       tree_addr = HADDR_UNDEF; /* Address of SOHM B-tree */
 
         /* Create the v2 B-tree index */
-        bt2_cparam.cls = H5SM_INDEX;
-        bt2_cparam.node_size = (uint32_t)H5SM_B2_NODE_SIZE;
-        bt2_cparam.rrec_size = (uint32_t)H5SM_SOHM_ENTRY_SIZE(f);
+        bt2_cparam.cls           = H5SM_INDEX;
+        bt2_cparam.node_size     = (uint32_t)H5SM_B2_NODE_SIZE;
+        bt2_cparam.rrec_size     = (uint32_t)H5SM_SOHM_ENTRY_SIZE(f);
         bt2_cparam.split_percent = H5SM_B2_SPLIT_PERCENT;
         bt2_cparam.merge_percent = H5SM_B2_MERGE_PERCENT;
-        if(NULL == (bt2 = H5B2_create(f, dxpl_id, &bt2_cparam, f)))
+        if (NULL == (bt2 = H5B2_create(f, dxpl_id, &bt2_cparam, f)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTCREATE, FAIL, "B-tree creation failed for SOHM index")
 
         /* Retrieve the v2 B-tree's address in the file */
-        if(H5B2_get_addr(bt2, &tree_addr) < 0)
+        if (H5B2_get_addr(bt2, &tree_addr) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't get v2 B-tree address for SOHM index")
 
         /* Set the index type & address */
@@ -494,42 +482,41 @@ H5SM_create_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
 
     /* Create a heap to hold the shared messages that the list or B-tree will index */
     HDmemset(&fheap_cparam, 0, sizeof(fheap_cparam));
-    fheap_cparam.managed.width = H5O_FHEAP_MAN_WIDTH;
+    fheap_cparam.managed.width            = H5O_FHEAP_MAN_WIDTH;
     fheap_cparam.managed.start_block_size = H5O_FHEAP_MAN_START_BLOCK_SIZE;
-    fheap_cparam.managed.max_direct_size = H5O_FHEAP_MAN_MAX_DIRECT_SIZE;
-    fheap_cparam.managed.max_index = H5O_FHEAP_MAN_MAX_INDEX;
-    fheap_cparam.managed.start_root_rows = H5O_FHEAP_MAN_START_ROOT_ROWS;
-    fheap_cparam.checksum_dblocks = H5O_FHEAP_CHECKSUM_DBLOCKS;
-    fheap_cparam.id_len = 0;
-    fheap_cparam.max_man_size = H5O_FHEAP_MAX_MAN_SIZE;
-    if(NULL == (fheap = H5HF_create(f, dxpl_id, &fheap_cparam)))
+    fheap_cparam.managed.max_direct_size  = H5O_FHEAP_MAN_MAX_DIRECT_SIZE;
+    fheap_cparam.managed.max_index        = H5O_FHEAP_MAN_MAX_INDEX;
+    fheap_cparam.managed.start_root_rows  = H5O_FHEAP_MAN_START_ROOT_ROWS;
+    fheap_cparam.checksum_dblocks         = H5O_FHEAP_CHECKSUM_DBLOCKS;
+    fheap_cparam.id_len                   = 0;
+    fheap_cparam.max_man_size             = H5O_FHEAP_MAX_MAN_SIZE;
+    if (NULL == (fheap = H5HF_create(f, dxpl_id, &fheap_cparam)))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, FAIL, "unable to create fractal heap")
 
-    if(H5HF_get_heap_addr(fheap, &(header->heap_addr)) < 0)
+    if (H5HF_get_heap_addr(fheap, &(header->heap_addr)) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGETSIZE, FAIL, "can't get fractal heap address")
 
 #ifndef NDEBUG
-{
-    size_t fheap_id_len;             /* Size of a fractal heap ID */
+    {
+        size_t fheap_id_len; /* Size of a fractal heap ID */
 
-    /* Sanity check ID length */
-    if(H5HF_get_id_len(fheap, &fheap_id_len) < 0)
-        HGOTO_ERROR(H5E_SOHM, H5E_CANTGETSIZE, FAIL, "can't get fractal heap ID length")
-    HDassert(fheap_id_len == H5O_FHEAP_ID_LEN);
-}
+        /* Sanity check ID length */
+        if (H5HF_get_id_len(fheap, &fheap_id_len) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTGETSIZE, FAIL, "can't get fractal heap ID length")
+        HDassert(fheap_id_len == H5O_FHEAP_ID_LEN);
+    }
 #endif /* NDEBUG */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for SOHM index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_create_index */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_delete_index
  *
@@ -550,60 +537,59 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_delete_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id,
-    hbool_t delete_heap)
+H5SM_delete_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id, hbool_t delete_heap)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Determine whether index is a list or a B-tree. */
-    if(header->index_type == H5SM_LIST) {
-        unsigned index_status = 0;         /* Index list's status in the metadata cache */
+    if (header->index_type == H5SM_LIST) {
+        unsigned index_status = 0; /* Index list's status in the metadata cache */
 
         /* Check the index list's status in the metadata cache */
-        if(H5AC_get_entry_status(f, header->index_addr, &index_status) < 0)
+        if (H5AC_get_entry_status(f, header->index_addr, &index_status) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "unable to check metadata cache status for direct block")
 
         /* If the index list is in the cache, expunge it now */
-        if(index_status & H5AC_ES__IN_CACHE) {
+        if (index_status & H5AC_ES__IN_CACHE) {
             /* Sanity checks on index list */
             HDassert(!(index_status & H5AC_ES__IS_PINNED));
             HDassert(!(index_status & H5AC_ES__IS_PROTECTED));
 
             /* Evict the index list from the metadata cache */
-            if(H5AC_expunge_entry(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, H5AC__FREE_FILE_SPACE_FLAG) < 0)
+            if (H5AC_expunge_entry(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr,
+                                   H5AC__FREE_FILE_SPACE_FLAG) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTREMOVE, FAIL, "unable to remove list index from cache")
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
         HDassert(header->index_type == H5SM_BTREE);
 
         /* Delete the B-tree. */
-        if(H5B2_delete(f, dxpl_id, header->index_addr, f, NULL, NULL) < 0)
+        if (H5B2_delete(f, dxpl_id, header->index_addr, f, NULL, NULL) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTDELETE, FAIL, "unable to delete B-tree")
 
         /* Revert to list unless B-trees can have zero records */
-        if(header->btree_min > 0)
+        if (header->btree_min > 0)
             header->index_type = H5SM_LIST;
     } /* end else */
 
     /* Free the index's heap if requested. */
-    if(delete_heap == TRUE) {
-        if(H5HF_delete(f, dxpl_id, header->heap_addr) < 0)
+    if (delete_heap == TRUE) {
+        if (H5HF_delete(f, dxpl_id, header->heap_addr) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTDELETE, FAIL, "unable to delete fractal heap")
         header->heap_addr = HADDR_UNDEF;
     } /* end if */
 
     /* Reset index info */
-    header->index_addr = HADDR_UNDEF;
+    header->index_addr   = HADDR_UNDEF;
     header->num_messages = 0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_delete_index */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_create_list
  *
@@ -622,11 +608,11 @@ done:
 static haddr_t
 H5SM_create_list(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
 {
-    H5SM_list_t *list = NULL;   /* List of messages */
-    hsize_t x;                  /* Counter variable */
-    size_t num_entries;         /* Number of messages to create in list */
-    haddr_t addr = HADDR_UNDEF; /* Address of the list on disk */
-    haddr_t ret_value;
+    H5SM_list_t *list = NULL;        /* List of messages */
+    hsize_t      x;                  /* Counter variable */
+    size_t       num_entries;        /* Number of messages to create in list */
+    haddr_t      addr = HADDR_UNDEF; /* Address of the list on disk */
+    haddr_t      ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -636,44 +622,43 @@ H5SM_create_list(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
     num_entries = header->list_max;
 
     /* Allocate list in memory */
-    if(NULL == (list = H5FL_MALLOC(H5SM_list_t)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for SOHM list")
-    if(NULL == (list->messages = (H5SM_sohm_t *)H5FL_ARR_CALLOC(H5SM_sohm_t, num_entries)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for SOHM list")
+    if (NULL == (list = H5FL_MALLOC(H5SM_list_t)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for SOHM list")
+    if (NULL == (list->messages = (H5SM_sohm_t *)H5FL_ARR_CALLOC(H5SM_sohm_t, num_entries)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for SOHM list")
 
     /* Initialize messages in list */
-    for(x = 0; x < num_entries; x++)
+    for (x = 0; x < num_entries; x++)
         list->messages[x].location = H5SM_NO_LOC;
 
     /* Point list at header passed in */
     list->header = header;
 
     /* Allocate space for the list on disk */
-    if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_SOHM_INDEX, dxpl_id, (hsize_t)header->list_size)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for SOHM list")
+    if (HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_SOHM_INDEX, dxpl_id, (hsize_t)header->list_size)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for SOHM list")
 
     /* Put the list into the cache */
-    if(H5AC_insert_entry(f, dxpl_id, H5AC_SOHM_LIST, addr, list, H5AC__NO_FLAGS_SET) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTINS, HADDR_UNDEF, "can't add SOHM list to cache")
+    if (H5AC_insert_entry(f, dxpl_id, H5AC_SOHM_LIST, addr, list, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTINS, HADDR_UNDEF, "can't add SOHM list to cache")
 
     /* Set return value */
     ret_value = addr;
 
 done:
-    if(ret_value == HADDR_UNDEF) {
-        if(list != NULL) {
-            if(list->messages != NULL)
+    if (ret_value == HADDR_UNDEF) {
+        if (list != NULL) {
+            if (list->messages != NULL)
                 list->messages = H5FL_ARR_FREE(H5SM_sohm_t, list->messages);
             list = H5FL_FREE(H5SM_list_t, list);
         } /* end if */
-        if(addr != HADDR_UNDEF)
+        if (addr != HADDR_UNDEF)
             H5MF_xfree(f, H5FD_MEM_SOHM_INDEX, dxpl_id, addr, (hsize_t)header->list_size);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_create_list */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_convert_list_to_btree
  *
@@ -696,18 +681,18 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_convert_list_to_btree(H5F_t *f, H5SM_index_header_t *header,
-    H5SM_list_t **_list, H5HF_t *fheap, H5O_t *open_oh, hid_t dxpl_id)
+H5SM_convert_list_to_btree(H5F_t *f, H5SM_index_header_t *header, H5SM_list_t **_list, H5HF_t *fheap,
+                           H5O_t *open_oh, hid_t dxpl_id)
 {
-    H5SM_list_t *list;                  /* Pointer to the existing message list */
-    H5SM_mesg_key_t key;                /* Key for inserting records in v2 B-tree */
-    H5B2_create_t bt2_cparam;           /* v2 B-tree creation parameters */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    haddr_t     tree_addr;              /* New v2 B-tree's address */
-    size_t      num_messages;		/* Number of messages being tracked */
-    size_t      x;
-    void *      encoding_buf = NULL;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5SM_list_t *   list;         /* Pointer to the existing message list */
+    H5SM_mesg_key_t key;          /* Key for inserting records in v2 B-tree */
+    H5B2_create_t   bt2_cparam;   /* v2 B-tree creation parameters */
+    H5B2_t *        bt2 = NULL;   /* v2 B-tree handle for index */
+    haddr_t         tree_addr;    /* New v2 B-tree's address */
+    size_t          num_messages; /* Number of messages being tracked */
+    size_t          x;
+    void *          encoding_buf = NULL;
+    herr_t          ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -718,77 +703,78 @@ H5SM_convert_list_to_btree(H5F_t *f, H5SM_index_header_t *header,
     list = *_list;
 
     /* Create the new v2 B-tree for tracking the messages */
-    bt2_cparam.cls = H5SM_INDEX;
-    bt2_cparam.node_size = (uint32_t)H5SM_B2_NODE_SIZE;
-    bt2_cparam.rrec_size = (uint32_t)H5SM_SOHM_ENTRY_SIZE(f);
+    bt2_cparam.cls           = H5SM_INDEX;
+    bt2_cparam.node_size     = (uint32_t)H5SM_B2_NODE_SIZE;
+    bt2_cparam.rrec_size     = (uint32_t)H5SM_SOHM_ENTRY_SIZE(f);
     bt2_cparam.split_percent = H5SM_B2_SPLIT_PERCENT;
     bt2_cparam.merge_percent = H5SM_B2_MERGE_PERCENT;
-    if(NULL == (bt2 = H5B2_create(f, dxpl_id, &bt2_cparam, f)))
+    if (NULL == (bt2 = H5B2_create(f, dxpl_id, &bt2_cparam, f)))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTCREATE, FAIL, "B-tree creation failed for SOHM index")
 
     /* Retrieve the v2 B-tree's address in the file */
-    if(H5B2_get_addr(bt2, &tree_addr) < 0)
+    if (H5B2_get_addr(bt2, &tree_addr) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't get v2 B-tree address for SOHM index")
 
     /* Set up key values that all messages will use.  Since these messages
      * are in the heap, they have a heap ID and no encoding or type_id.
      */
-    key.file = f;
-    key.dxpl_id = dxpl_id;
-    key.fheap = fheap;
+    key.file          = f;
+    key.dxpl_id       = dxpl_id;
+    key.fheap         = fheap;
     key.encoding_size = 0;
-    key.encoding = NULL;
+    key.encoding      = NULL;
 
     /* Insert each record into the new B-tree */
-    for(x = 0; x < header->list_max; x++) {
-        if(list->messages[x].location != H5SM_NO_LOC) {
+    for (x = 0; x < header->list_max; x++) {
+        if (list->messages[x].location != H5SM_NO_LOC) {
             /* Copy message into key */
             key.message = list->messages[x];
 
             /* Get the encoded message */
-            if(H5SM_read_mesg(f, &(key.message), fheap, open_oh, dxpl_id, &key.encoding_size, &encoding_buf) < 0)
+            if (H5SM_read_mesg(f, &(key.message), fheap, open_oh, dxpl_id, &key.encoding_size,
+                               &encoding_buf) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, FAIL, "Couldn't read SOHM message in list")
 
             key.encoding = encoding_buf;
 
             /* Insert the message into the B-tree */
-            if(H5B2_insert(bt2, dxpl_id, &key) < 0)
+            if (H5B2_insert(bt2, dxpl_id, &key) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "couldn't add SOHM to B-tree")
 
             /* Free buffer from H5SM_read_mesg */
-            if(encoding_buf)
+            if (encoding_buf)
                 encoding_buf = H5MM_xfree(encoding_buf);
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* Unprotect list in cache and release heap */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to release SOHM list")
+    if (H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list,
+                       H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to release SOHM list")
     *_list = list = NULL;
 
     /* Delete the old list index (but not its heap, which the new index is
      * still using!)
      */
-    num_messages = header->num_messages;        /* preserve this across the index deletion */
-    if(H5SM_delete_index(f, header, dxpl_id, FALSE) < 0)
+    num_messages = header->num_messages; /* preserve this across the index deletion */
+    if (H5SM_delete_index(f, header, dxpl_id, FALSE) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTDELETE, FAIL, "can't free list index")
 
     /* Set/restore header info */
-    header->index_addr = tree_addr;
-    header->index_type = H5SM_BTREE;
+    header->index_addr   = tree_addr;
+    header->index_type   = H5SM_BTREE;
     header->num_messages = num_messages;
 
 done:
     /* Release resources */
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for SOHM index")
-    if(encoding_buf)
+    if (encoding_buf)
         encoding_buf = H5MM_xfree(encoding_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5SM_convert_list_to_btree() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_convert_btree_to_list
  *
@@ -804,12 +790,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_convert_btree_to_list(H5F_t * f, H5SM_index_header_t * header, hid_t dxpl_id)
+H5SM_convert_btree_to_list(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
 {
-    H5SM_list_t     *list = NULL;
-    H5SM_list_cache_ud_t cache_udata;   /* User-data for metadata cache callback */
-    haddr_t          btree_addr;
-    herr_t           ret_value = SUCCEED;
+    H5SM_list_t *        list = NULL;
+    H5SM_list_cache_ud_t cache_udata; /* User-data for metadata cache callback */
+    haddr_t              btree_addr;
+    herr_t               ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -819,35 +805,35 @@ H5SM_convert_btree_to_list(H5F_t * f, H5SM_index_header_t * header, hid_t dxpl_i
     btree_addr = header->index_addr;
 
     header->num_messages = 0;
-    header->index_type = H5SM_LIST;
+    header->index_type   = H5SM_LIST;
 
     /* Create a new list index */
-    if(HADDR_UNDEF == (header->index_addr = H5SM_create_list(f, header, dxpl_id)))
+    if (HADDR_UNDEF == (header->index_addr = H5SM_create_list(f, header, dxpl_id)))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, FAIL, "unable to create shared message list")
 
     /* Set up user data for metadata cache callback */
-    cache_udata.f = f;
+    cache_udata.f      = f;
     cache_udata.header = header;
 
     /* Protect the SOHM list */
-    if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, &cache_udata, H5AC_WRITE)))
+    if (NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr,
+                                                    &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM list index")
 
     /* Delete the B-tree and have messages copy themselves to the
      * list as they're deleted
      */
-    if(H5B2_delete(f, dxpl_id, btree_addr, f, H5SM_bt2_convert_to_list_op, list) < 0)
+    if (H5B2_delete(f, dxpl_id, btree_addr, f, H5SM_bt2_convert_to_list_op, list) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTDELETE, FAIL, "unable to delete B-tree")
 
 done:
     /* Release the SOHM list from the cache */
-    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__DIRTIED_FLAG) < 0)
+    if (list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__DIRTIED_FLAG) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to unprotect SOHM index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_convert_btree_to_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_can_share_common
  *
@@ -869,19 +855,19 @@ done:
 static htri_t
 H5SM_can_share_common(const H5F_t *f, unsigned type_id, const void *mesg)
 {
-    htri_t ret_value;           /* Return value */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check whether this message ought to be shared or not */
     /* If sharing is disabled in this file, don't share the message */
-    if(!H5F_addr_defined(H5F_SOHM_ADDR(f)))
+    if (!H5F_addr_defined(H5F_SOHM_ADDR(f)))
         HGOTO_DONE(FALSE)
 
     /* Type-specific check */
-    if((ret_value = H5O_msg_can_share(type_id, mesg)) < 0)
+    if ((ret_value = H5O_msg_can_share(type_id, mesg)) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_BADTYPE, FAIL, "can_share callback returned error")
-    if(ret_value == FALSE)
+    if (ret_value == FALSE)
         HGOTO_DONE(FALSE)
 
     /* At this point, the message passes the "trivial" checks and is worth
@@ -892,7 +878,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_can_share_common() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_can_share
  *
@@ -911,64 +896,65 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5SM_can_share(H5F_t *f, hid_t dxpl_id, H5SM_master_table_t *table,
-    ssize_t *sohm_index_num, unsigned type_id, const void *mesg)
+H5SM_can_share(H5F_t *f, hid_t dxpl_id, H5SM_master_table_t *table, ssize_t *sohm_index_num, unsigned type_id,
+               const void *mesg)
 {
-    size_t              mesg_size;
+    size_t               mesg_size;
     H5SM_master_table_t *my_table = NULL;
-    ssize_t             index_num;
-    htri_t              tri_ret;
-    htri_t              ret_value = TRUE;
+    ssize_t              index_num;
+    htri_t               tri_ret;
+    htri_t               ret_value = TRUE;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* "trivial" sharing checks */
-    if((tri_ret = H5SM_can_share_common(f, type_id, mesg)) < 0)
+    if ((tri_ret = H5SM_can_share_common(f, type_id, mesg)) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_BADTYPE, FAIL, "'trivial' sharing checks returned error")
-    if(tri_ret == FALSE)
+    if (tri_ret == FALSE)
         HGOTO_DONE(FALSE)
 
     /* Look up the master SOHM table */
     /* (use incoming master SOHM table if possible) */
-    if(table)
+    if (table)
         my_table = table;
     else {
-        H5SM_table_cache_ud_t cache_udata;      /* User-data for callback */
+        H5SM_table_cache_ud_t cache_udata; /* User-data for callback */
 
         /* Set up user data for callback */
         cache_udata.f = f;
 
-        if(NULL == (my_table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
+        if (NULL == (my_table = (H5SM_master_table_t *)H5AC_protect(
+                         f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
     } /* end if */
 
     /* Find the right index for this message type.  If there is no such index
      * then this type of message isn't shareable
      */
-    if((index_num = H5SM_get_index(my_table, type_id)) < 0) {
+    if ((index_num = H5SM_get_index(my_table, type_id)) < 0) {
         H5E_clear_stack(NULL); /*ignore error*/
         HGOTO_DONE(FALSE)
     } /* end if */
 
     /* If the message isn't big enough, don't bother sharing it */
-    if(0 == (mesg_size = H5O_msg_raw_size(f, type_id, TRUE, mesg)))
+    if (0 == (mesg_size = H5O_msg_raw_size(f, type_id, TRUE, mesg)))
         HGOTO_ERROR(H5E_SOHM, H5E_BADMESG, FAIL, "unable to get OH message size")
-    if(mesg_size < my_table->indexes[index_num].min_mesg_size)
+    if (mesg_size < my_table->indexes[index_num].min_mesg_size)
         HGOTO_DONE(FALSE)
 
     /* At this point, the message will be shared, set the index number if requested. */
-    if(sohm_index_num)
+    if (sohm_index_num)
         *sohm_index_num = index_num;
 
 done:
     /* Release the master SOHM table, if we protected it */
-    if(my_table && my_table != table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), my_table, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (my_table && my_table != table &&
+        H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), my_table, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_can_share() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_try_share
  *
@@ -1030,18 +1016,18 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned defer_flags,
-    unsigned type_id, void *mesg, unsigned *mesg_flags)
+H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned defer_flags, unsigned type_id, void *mesg,
+               unsigned *mesg_flags)
 {
-    H5SM_master_table_t *table = NULL;
-    H5SM_table_cache_ud_t cache_udata;      /* User-data for callback */
-    unsigned            cache_flags = H5AC__NO_FLAGS_SET;
-    ssize_t             index_num;
-    htri_t              tri_ret;
+    H5SM_master_table_t * table = NULL;
+    H5SM_table_cache_ud_t cache_udata; /* User-data for callback */
+    unsigned              cache_flags = H5AC__NO_FLAGS_SET;
+    ssize_t               index_num;
+    htri_t                tri_ret;
 #ifndef NDEBUG
-    unsigned            deferred_type = -1u;
+    unsigned deferred_type = -1u;
 #endif
-    htri_t              ret_value = TRUE;
+    htri_t ret_value = TRUE;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1049,41 +1035,42 @@ H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned defer_flags,
      * be the same as the one we get here.  In debug mode, we make sure this
      * holds true; otherwise we can leave now if it wasn't shared in the DEFER
      * pass. */
-    if(defer_flags & H5SM_WAS_DEFERRED)
+    if (defer_flags & H5SM_WAS_DEFERRED)
 #ifndef NDEBUG
         deferred_type = ((H5O_shared_t *)mesg)->type;
-#else /* NDEBUG */
-        if((((H5O_shared_t *)mesg)->type != H5O_SHARE_TYPE_HERE)
-                && (((H5O_shared_t *)mesg)->type != H5O_SHARE_TYPE_SOHM))
+#else  /* NDEBUG */
+        if ((((H5O_shared_t *)mesg)->type != H5O_SHARE_TYPE_HERE) &&
+            (((H5O_shared_t *)mesg)->type != H5O_SHARE_TYPE_SOHM))
             HGOTO_DONE(FALSE);
 #endif /* NDEBUG */
 
     /* "trivial" sharing checks */
-    if(mesg_flags && (*mesg_flags & H5O_MSG_FLAG_DONTSHARE))
+    if (mesg_flags && (*mesg_flags & H5O_MSG_FLAG_DONTSHARE))
         HGOTO_DONE(FALSE)
-    if((tri_ret = H5SM_can_share_common(f, type_id, mesg)) < 0)
+    if ((tri_ret = H5SM_can_share_common(f, type_id, mesg)) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_BADTYPE, FAIL, "'trivial' sharing checks returned error")
-    if(tri_ret == FALSE)
+    if (tri_ret == FALSE)
         HGOTO_DONE(FALSE)
 
     /* Set up user data for callback */
     cache_udata.f = f;
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_WRITE)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
+    if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f),
+                                                             &cache_udata, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* "complex" sharing checks */
-    if((tri_ret = H5SM_can_share(f, dxpl_id, table, &index_num, type_id, mesg)) < 0)
+    if ((tri_ret = H5SM_can_share(f, dxpl_id, table, &index_num, type_id, mesg)) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_BADTYPE, FAIL, "'complex' sharing checks returned error")
-    if(tri_ret == FALSE)
+    if (tri_ret == FALSE)
         HGOTO_DONE(FALSE)
 
     /* At this point, the message will be shared. */
 
     /* If the index hasn't been allocated yet, create it */
-    if(table->indexes[index_num].index_addr == HADDR_UNDEF) {
-        if(H5SM_create_index(f, &(table->indexes[index_num]), dxpl_id) < 0)
+    if (table->indexes[index_num].index_addr == HADDR_UNDEF) {
+        if (H5SM_create_index(f, &(table->indexes[index_num]), dxpl_id) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, FAIL, "unable to create SOHM index")
         cache_flags |= H5AC__DIRTIED_FLAG;
     } /* end if */
@@ -1091,41 +1078,39 @@ H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned defer_flags,
     /* Write the message as a shared message.  This may or may not cause the
      * message to become shared (if it is unique, it will not be shared).
      */
-    if(H5SM_write_mesg(f, dxpl_id, open_oh, &(table->indexes[index_num]),
-            (defer_flags & H5SM_DEFER) != 0, type_id, mesg, &cache_flags) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "can't write shared message")
+    if (H5SM_write_mesg(f, dxpl_id, open_oh, &(table->indexes[index_num]), (defer_flags & H5SM_DEFER) != 0,
+                        type_id, mesg, &cache_flags) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "can't write shared message")
 
     /* Set flags if this message was "written" without error and wasn't a
      * 'defer' attempt; it is now either fully shared or "shareable".
      */
-    if(mesg_flags) {
-        if(((H5O_shared_t *)mesg)->type == H5O_SHARE_TYPE_HERE)
+    if (mesg_flags) {
+        if (((H5O_shared_t *)mesg)->type == H5O_SHARE_TYPE_HERE)
             *mesg_flags |= H5O_MSG_FLAG_SHAREABLE;
         else {
             HDassert(((H5O_shared_t *)mesg)->type == H5O_SHARE_TYPE_SOHM);
             *mesg_flags |= H5O_MSG_FLAG_SHARED;
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
-    HDassert((ret_value != TRUE)
-            || ((H5O_shared_t *)mesg)->type == H5O_SHARE_TYPE_HERE
-            || ((H5O_shared_t *)mesg)->type == H5O_SHARE_TYPE_SOHM);
+    HDassert((ret_value != TRUE) || ((H5O_shared_t *)mesg)->type == H5O_SHARE_TYPE_HERE ||
+             ((H5O_shared_t *)mesg)->type == H5O_SHARE_TYPE_SOHM);
 #ifndef NDEBUG
     /* If we previously deferred this operation, make sure the saved message
      * type is the same as the one we get here. */
-    if(defer_flags & H5SM_WAS_DEFERRED)
+    if (defer_flags & H5SM_WAS_DEFERRED)
         HDassert(deferred_type == ((H5O_shared_t *)mesg)->type);
 #endif /* NDEBUG */
 
     /* Release the master SOHM table */
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, cache_flags) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, cache_flags) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_try_share() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_incr_ref
  *
@@ -1146,9 +1131,9 @@ done:
 static herr_t
 H5SM_incr_ref(void *record, void *_op_data, hbool_t *changed)
 {
-    H5SM_sohm_t *message = (H5SM_sohm_t *) record;
-    H5SM_incr_ref_opdata *op_data = (H5SM_incr_ref_opdata *) _op_data;
-    herr_t ret_value = SUCCEED;
+    H5SM_sohm_t *         message   = (H5SM_sohm_t *)record;
+    H5SM_incr_ref_opdata *op_data   = (H5SM_incr_ref_opdata *)_op_data;
+    herr_t                ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1159,14 +1144,15 @@ H5SM_incr_ref(void *record, void *_op_data, hbool_t *changed)
     /* If the message was previously shared in an object header, share
      * it in the heap now.
      */
-    if(message->location == H5SM_IN_OH) {
+    if (message->location == H5SM_IN_OH) {
         HDassert(op_data->key && op_data->key->fheap);
 
         /* Put the message in the heap and record its new heap ID */
-        if(H5HF_insert(op_data->key->fheap, op_data->dxpl_id, op_data->key->encoding_size, op_data->key->encoding, &message->u.heap_loc.fheap_id) < 0)
+        if (H5HF_insert(op_data->key->fheap, op_data->dxpl_id, op_data->key->encoding_size,
+                        op_data->key->encoding, &message->u.heap_loc.fheap_id) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "unable to insert message into fractal heap")
 
-        message->location = H5SM_IN_HEAP;
+        message->location             = H5SM_IN_HEAP;
         message->u.heap_loc.ref_count = 2;
     } /* end if */
     else {
@@ -1179,14 +1165,13 @@ H5SM_incr_ref(void *record, void *_op_data, hbool_t *changed)
     *changed = TRUE;
 
     /* Check for retrieving the heap ID */
-    if(op_data)
-       op_data->fheap_id = message->u.heap_loc.fheap_id;
+    if (op_data)
+        op_data->fheap_id = message->u.heap_loc.fheap_id;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_incr_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_write_mesg
  *
@@ -1220,21 +1205,20 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    H5SM_index_header_t *header, hbool_t defer, unsigned type_id, void *mesg,
-    unsigned *cache_flags_ptr)
+H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5SM_index_header_t *header, hbool_t defer,
+                unsigned type_id, void *mesg, unsigned *cache_flags_ptr)
 {
-    H5SM_list_t           *list = NULL;     /* List index */
-    H5SM_mesg_key_t       key;              /* Key used to search the index */
-    H5SM_list_cache_ud_t cache_udata;   /* User-data for metadata cache callback */
-    H5O_shared_t          shared;           /* Shared H5O message */
-    hbool_t               found = FALSE;    /* Was the message in the index? */
-    H5HF_t                *fheap = NULL;    /* Fractal heap handle */
-    H5B2_t                *bt2 = NULL;      /* v2 B-tree handle for index */
-    size_t                buf_size;         /* Size of the encoded message */
-    void *                encoding_buf = NULL; /* Buffer for encoded message */
-    size_t                empty_pos = UFAIL; /* Empty entry in list */
-    herr_t                ret_value = SUCCEED;
+    H5SM_list_t *        list = NULL;          /* List index */
+    H5SM_mesg_key_t      key;                  /* Key used to search the index */
+    H5SM_list_cache_ud_t cache_udata;          /* User-data for metadata cache callback */
+    H5O_shared_t         shared;               /* Shared H5O message */
+    hbool_t              found = FALSE;        /* Was the message in the index? */
+    H5HF_t *             fheap = NULL;         /* Fractal heap handle */
+    H5B2_t *             bt2   = NULL;         /* v2 B-tree handle for index */
+    size_t               buf_size;             /* Size of the encoded message */
+    void *               encoding_buf = NULL;  /* Buffer for encoded message */
+    size_t               empty_pos    = UFAIL; /* Empty entry in list */
+    herr_t               ret_value    = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1244,64 +1228,66 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     HDassert(cache_flags_ptr);
 
     /* Encode the message to be written */
-    if((buf_size = H5O_msg_raw_size(f, type_id, TRUE, mesg)) == 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_BADSIZE, FAIL, "can't find message size")
-    if(NULL == (encoding_buf = H5MM_malloc(buf_size)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "can't allocate buffer for encoding")
-    if(H5O_msg_encode(f, type_id, TRUE, (unsigned char *)encoding_buf, mesg) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTENCODE, FAIL, "can't encode message to be shared")
+    if ((buf_size = H5O_msg_raw_size(f, type_id, TRUE, mesg)) == 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_BADSIZE, FAIL, "can't find message size")
+    if (NULL == (encoding_buf = H5MM_malloc(buf_size)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "can't allocate buffer for encoding")
+    if (H5O_msg_encode(f, type_id, TRUE, (unsigned char *)encoding_buf, mesg) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTENCODE, FAIL, "can't encode message to be shared")
 
     /* Open the fractal heap for this index */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, header->heap_addr)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, header->heap_addr)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Set up a key for the message to be written */
-    key.dxpl_id = dxpl_id;
-    key.file = f;
-    key.fheap = fheap;
-    key.encoding = encoding_buf;
-    key.encoding_size = buf_size;
-    key.message.hash = H5_checksum_lookup3(encoding_buf, buf_size, type_id);
+    key.dxpl_id          = dxpl_id;
+    key.file             = f;
+    key.fheap            = fheap;
+    key.encoding         = encoding_buf;
+    key.encoding_size    = buf_size;
+    key.message.hash     = H5_checksum_lookup3(encoding_buf, buf_size, type_id);
     key.message.location = H5SM_NO_LOC;
 
     /* Assume the message is already in the index and try to increment its
      * reference count.  If this fails, the message isn't in the index after
      * all and we'll need to add it.
      */
-    if(header->index_type == H5SM_LIST) {
-        size_t list_pos;        /* Position in a list index */
+    if (header->index_type == H5SM_LIST) {
+        size_t list_pos; /* Position in a list index */
 
         /* Set up user data for metadata cache callback */
-        cache_udata.f = f;
+        cache_udata.f      = f;
         cache_udata.header = header;
 
         /* The index is a list; get it from the cache */
-        if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, &cache_udata, defer ? H5AC_READ : H5AC_WRITE)))
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
+        if (NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr,
+                                                        &cache_udata, defer ? H5AC_READ : H5AC_WRITE)))
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
 
         /* See if the message is already in the index and get its location.
          * Also record the first empty list position we find in case we need it
          * later.
          */
-        if(H5SM_find_in_list(list, &key, &empty_pos, &list_pos) < 0)
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "unable to search for message in list")
+        if (H5SM_find_in_list(list, &key, &empty_pos, &list_pos) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "unable to search for message in list")
 
-        if(defer) {
-            if(list_pos != UFAIL)
+        if (defer) {
+            if (list_pos != UFAIL)
                 found = TRUE;
         } /* end if */
         else {
-            if(list_pos != UFAIL) {
+            if (list_pos != UFAIL) {
                 /* If the message was previously shared in an object header, share
                  * it in the heap now.
                  */
-                if(list->messages[list_pos].location == H5SM_IN_OH) {
+                if (list->messages[list_pos].location == H5SM_IN_OH) {
                     /* Put the message in the heap and record its new heap ID */
-                    if(H5HF_insert(fheap, dxpl_id, key.encoding_size, key.encoding, &shared.u.heap_id) < 0)
-                        HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "unable to insert message into fractal heap")
+                    if (H5HF_insert(fheap, dxpl_id, key.encoding_size, key.encoding, &shared.u.heap_id) < 0)
+                        HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL,
+                                    "unable to insert message into fractal heap")
 
-                    list->messages[list_pos].location = H5SM_IN_HEAP;
-                    list->messages[list_pos].u.heap_loc.fheap_id = shared.u.heap_id;
+                    list->messages[list_pos].location             = H5SM_IN_HEAP;
+                    list->messages[list_pos].u.heap_loc.fheap_id  = shared.u.heap_id;
                     list->messages[list_pos].u.heap_loc.ref_count = 2;
                 } /* end if */
                 else {
@@ -1312,27 +1298,27 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
 
                 /* Set up the shared location to point to the shared location */
                 shared.u.heap_id = list->messages[list_pos].u.heap_loc.fheap_id;
-                found = TRUE;
+                found            = TRUE;
             } /* end if */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
     /* Index is a B-tree */
     else {
         HDassert(header->index_type == H5SM_BTREE);
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for SOHM index")
 
-        if(defer) {
-            htri_t bt2_find;  /* Result from searching in the v2 B-tree */
+        if (defer) {
+            htri_t bt2_find; /* Result from searching in the v2 B-tree */
 
             /* If this returns 0, it means that the message wasn't found. */
             /* If it return 1, set the heap_id in the shared struct.  It will
              * return a heap ID, since a message with a reference count greater
              * than 1 is always shared in the heap.
              */
-            if((bt2_find = H5B2_find(bt2, dxpl_id, &key, NULL, NULL)) < 0)
+            if ((bt2_find = H5B2_find(bt2, dxpl_id, &key, NULL, NULL)) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "can't search for message in index")
             found = (hbool_t)bt2_find;
         } /* end if */
@@ -1340,7 +1326,7 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
             H5SM_incr_ref_opdata op_data;
 
             /* Set up callback info */
-            op_data.key = &key;
+            op_data.key     = &key;
             op_data.dxpl_id = dxpl_id;
 
             /* If this returns failure, it means that the message wasn't found. */
@@ -1348,27 +1334,27 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
              * return a heap ID, since a message with a reference count greater
              * than 1 is always shared in the heap.
              */
-            if(H5B2_modify(bt2, dxpl_id, &key, H5SM_incr_ref, &op_data) >= 0) {
+            if (H5B2_modify(bt2, dxpl_id, &key, H5SM_incr_ref, &op_data) >= 0) {
                 shared.u.heap_id = op_data.fheap_id;
-                found = TRUE;
+                found            = TRUE;
             } /* end if */
             else
                 H5E_clear_stack(NULL); /*ignore error*/
-        } /* end else */
-    } /* end else */
+        }                              /* end else */
+    }                                  /* end else */
 
-    if(found)
+    if (found)
         /* If the message was found, it's shared in the heap (now).  Set up a
          * shared message so we can mark it as shared.
          */
         shared.type = H5O_SHARE_TYPE_SOHM;
     else {
-        htri_t share_in_ohdr;           /* Whether the new message can be shared in another object's header */
+        htri_t share_in_ohdr; /* Whether the new message can be shared in another object's header */
 
         /* Add the message to the index */
 
         /* Check if the message can be shared in another object's header */
-        if((share_in_ohdr = H5O_msg_can_share_in_ohdr(type_id)) < 0)
+        if ((share_in_ohdr = H5O_msg_can_share_in_ohdr(type_id)) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_BADTYPE, FAIL, "'share in ohdr' check returned error")
 
         /* If this message can be shared in an object header location, it is
@@ -1388,59 +1374,59 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
          *              no object header location available, insert it in the
          *              heap.
          */
-        if(share_in_ohdr && open_oh) {
+        if (share_in_ohdr && open_oh) {
             /* Set up shared component info */
             shared.type = H5O_SHARE_TYPE_HERE;
 
             /* Retrieve any creation index from the native message */
-            if(H5O_msg_get_crt_index(type_id, mesg, &shared.u.loc.index) < 0)
+            if (H5O_msg_get_crt_index(type_id, mesg, &shared.u.loc.index) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "unable to retrieve creation index")
 
-            if(defer)
+            if (defer)
                 shared.u.loc.oh_addr = HADDR_UNDEF;
             else {
                 shared.u.loc.oh_addr = H5O_OH_GET_ADDR(open_oh);
 
                 /* Copy shared component info into key for inserting into index */
-                key.message.location = H5SM_IN_OH;
+                key.message.location   = H5SM_IN_OH;
                 key.message.u.mesg_loc = shared.u.loc;
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else {
             /* Set up shared component info */
             /* (heap ID set below, if not deferred) */
             shared.type = H5O_SHARE_TYPE_SOHM;
 
-            if(!defer) {
+            if (!defer) {
                 /* Put the message in the heap and record its new heap ID */
-                if(H5HF_insert(fheap, dxpl_id, key.encoding_size, key.encoding, &shared.u.heap_id) < 0)
+                if (H5HF_insert(fheap, dxpl_id, key.encoding_size, key.encoding, &shared.u.heap_id) < 0)
                     HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "unable to insert message into fractal heap")
 
-                key.message.location = H5SM_IN_HEAP;
-                key.message.u.heap_loc.fheap_id = shared.u.heap_id;
+                key.message.location             = H5SM_IN_HEAP;
+                key.message.u.heap_loc.fheap_id  = shared.u.heap_id;
                 key.message.u.heap_loc.ref_count = 1;
             } /* end if */
-        } /* end else */
+        }     /* end else */
 
-        if(!defer) {
+        if (!defer) {
             /* Set common information */
             key.message.msg_type_id = type_id;
 
             /* Check whether the list has grown enough that it needs to become a B-tree */
-            if(header->index_type == H5SM_LIST && header->num_messages >= header->list_max)
-                if(H5SM_convert_list_to_btree(f, header, &list, fheap, open_oh, dxpl_id) < 0)
+            if (header->index_type == H5SM_LIST && header->num_messages >= header->list_max)
+                if (H5SM_convert_list_to_btree(f, header, &list, fheap, open_oh, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_SOHM, H5E_CANTDELETE, FAIL, "unable to convert list to B-tree")
 
             /* Insert the new message into the SOHM index */
-            if(header->index_type == H5SM_LIST) {
+            if (header->index_type == H5SM_LIST) {
                 /* Index is a list.  Find an empty spot if we haven't already */
-                if(empty_pos == UFAIL) {
+                if (empty_pos == UFAIL) {
                     size_t pos;
 
-                    if(H5SM_find_in_list(list, NULL, &empty_pos, &pos) < 0)
+                    if (H5SM_find_in_list(list, NULL, &empty_pos, &pos) < 0)
                         HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "unable to search for message in list")
 
-                    if(pos == UFAIL || empty_pos == UFAIL)
+                    if (pos == UFAIL || empty_pos == UFAIL)
                         HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "unable to find empty entry in list")
                 }
                 /* Insert message into list */
@@ -1453,46 +1439,47 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
                 HDassert(header->index_type == H5SM_BTREE);
 
                 /* Open the index v2 B-tree, if it isn't already */
-                if(NULL == bt2) {
-                    if(NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
-                        HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for SOHM index")
+                if (NULL == bt2) {
+                    if (NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
+                        HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL,
+                                    "unable to open v2 B-tree for SOHM index")
                 } /* end if */
 
-                if(H5B2_insert(bt2, dxpl_id, &key) < 0)
+                if (H5B2_insert(bt2, dxpl_id, &key) < 0)
                     HGOTO_ERROR(H5E_SOHM, H5E_CANTINSERT, FAIL, "couldn't add SOHM to B-tree")
             } /* end else */
 
             ++(header->num_messages);
             (*cache_flags_ptr) |= H5AC__DIRTIED_FLAG;
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     /* Set the file pointer & message type for the shared component */
-    shared.file = f;
+    shared.file        = f;
     shared.msg_type_id = type_id;
 
     /* Update the original message's shared component */
-    if(H5O_msg_set_share(type_id, &shared, mesg) < 0)
+    if (H5O_msg_set_share(type_id, &shared, mesg) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_BADMESG, FAIL, "unable to set sharing information")
 
 done:
     /* Release the fractal heap & v2 B-tree if we opened them */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for SOHM index")
 
     /* If we got a list out of the cache, release it (it is always dirty after writing a message) */
-    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, defer ? H5AC__NO_FLAGS_SET : H5AC__DIRTIED_FLAG) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
+    if (list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list,
+                               defer ? H5AC__NO_FLAGS_SET : H5AC__DIRTIED_FLAG) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
 
-    if(encoding_buf)
+    if (encoding_buf)
         encoding_buf = H5MM_xfree(encoding_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_write_mesg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_delete
  *
@@ -1514,14 +1501,14 @@ done:
 herr_t
 H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg)
 {
-    H5SM_master_table_t  *table = NULL;
+    H5SM_master_table_t * table       = NULL;
     unsigned              cache_flags = H5AC__NO_FLAGS_SET;
-    H5SM_table_cache_ud_t cache_udata;      /* User-data for callback */
+    H5SM_table_cache_ud_t cache_udata; /* User-data for callback */
     ssize_t               index_num;
-    size_t                mesg_size = 0;
-    void                 *mesg_buf = NULL;
-    void                 *native_mesg = NULL;
-    unsigned              type_id;              /* Message type ID to operate on */
+    size_t                mesg_size   = 0;
+    void *                mesg_buf    = NULL;
+    void *                native_mesg = NULL;
+    unsigned              type_id; /* Message type ID to operate on */
     herr_t                ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -1537,54 +1524,56 @@ H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg)
     cache_udata.f = f;
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_WRITE)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
+    if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f),
+                                                             &cache_udata, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* Find the correct index and try to delete from it */
-    if((index_num = H5SM_get_index(table, type_id)) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "unable to find correct SOHM index")
+    if ((index_num = H5SM_get_index(table, type_id)) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "unable to find correct SOHM index")
 
     /* If mesg_buf is not NULL, the message's reference count has reached
      * zero and any file space it uses needs to be freed.  mesg_buf holds the
      * serialized form of the message.
      */
-    if(H5SM_delete_from_index(f, dxpl_id, open_oh, &(table->indexes[index_num]), sh_mesg, &cache_flags, &mesg_size, &mesg_buf) < 0)
+    if (H5SM_delete_from_index(f, dxpl_id, open_oh, &(table->indexes[index_num]), sh_mesg, &cache_flags,
+                               &mesg_size, &mesg_buf) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTDELETE, FAIL, "unable to delete mesage from SOHM index")
 
     /* Release the master SOHM table */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, cache_flags) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, cache_flags) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
     table = NULL;
 
     /* If buf was allocated, delete the message it holds.  This message may
      * reference other shared messages that also need to be deleted, so the
      * master table needs to be unprotected when we do this.
      */
-    if(mesg_buf) {
-        if(NULL == (native_mesg = H5O_msg_decode(f, dxpl_id, open_oh, type_id, mesg_size, (const unsigned char *)mesg_buf)))
+    if (mesg_buf) {
+        if (NULL == (native_mesg = H5O_msg_decode(f, dxpl_id, open_oh, type_id, mesg_size,
+                                                  (const unsigned char *)mesg_buf)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTDECODE, FAIL, "can't decode shared message.")
 
-        if(H5O_msg_delete(f, dxpl_id, open_oh, type_id, native_mesg) < 0)
+        if (H5O_msg_delete(f, dxpl_id, open_oh, type_id, native_mesg) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "can't delete shared message.")
     } /* end if */
 
 done:
     /* Release the master SOHM table (should only happen on error) */
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, cache_flags) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, cache_flags) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     /* Release any native message we decoded */
-    if(native_mesg)
+    if (native_mesg)
         H5O_msg_free(type_id, native_mesg);
 
     /* Free encoding buf */
-    if(mesg_buf)
+    if (mesg_buf)
         mesg_buf = H5MM_xfree(mesg_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_find_in_list
  *
@@ -1610,7 +1599,7 @@ static herr_t
 H5SM_find_in_list(const H5SM_list_t *list, const H5SM_mesg_key_t *key, size_t *empty_pos, size_t *pos)
 {
     size_t x;
-    herr_t ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1619,32 +1608,32 @@ H5SM_find_in_list(const H5SM_list_t *list, const H5SM_mesg_key_t *key, size_t *e
     HDassert(key || empty_pos);
 
     /* Initialize empty_pos to an invalid value */
-    if(empty_pos)
+    if (empty_pos)
         *empty_pos = UFAIL;
 
     /* Find the first (only) message equal to the key passed in.
      * Also record the first empty position we find.
      */
-    for(x = 0; x < list->header->list_max; x++) {
-        if(list->messages[x].location != H5SM_NO_LOC) {
+    for (x = 0; x < list->header->list_max; x++) {
+        if (list->messages[x].location != H5SM_NO_LOC) {
             int cmp;
 
-            if(H5SM_message_compare(key, &(list->messages[x]), &cmp) < 0)
+            if (H5SM_message_compare(key, &(list->messages[x]), &cmp) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTCOMPARE, FAIL, "can't compare message records")
 
-            if(0 == cmp) {
+            if (0 == cmp) {
                 *pos = x;
                 HGOTO_DONE(SUCCEED)
             }
         }
-        else if(empty_pos && list->messages[x].location == H5SM_NO_LOC) {
+        else if (empty_pos && list->messages[x].location == H5SM_NO_LOC) {
             /* Note position */
             *empty_pos = x;
 
             /* Found earlier position possible, don't check any more */
             empty_pos = NULL;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
     /* If we reached this point, we didn't find the message */
     *pos = UFAIL;
@@ -1653,7 +1642,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_find_in_list */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_get_hash_fh_cb
  *
@@ -1671,7 +1659,7 @@ done:
 herr_t
 H5SM_get_hash_fh_cb(const void *obj, size_t obj_len, void *_udata)
 {
-    H5SM_fh_ud_gh_t *udata = (H5SM_fh_ud_gh_t *)_udata;       /* User data for fractal heap 'op' callback */
+    H5SM_fh_ud_gh_t *udata = (H5SM_fh_ud_gh_t *)_udata; /* User data for fractal heap 'op' callback */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1681,7 +1669,6 @@ H5SM_get_hash_fh_cb(const void *obj, size_t obj_len, void *_udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_get_hash_fh_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_decr_ref
  *
@@ -1704,7 +1691,7 @@ H5SM_get_hash_fh_cb(const void *obj, size_t obj_len, void *_udata)
 static herr_t
 H5SM_decr_ref(void *record, void *op_data, hbool_t *changed)
 {
-    H5SM_sohm_t *message = (H5SM_sohm_t *) record;
+    H5SM_sohm_t *message = (H5SM_sohm_t *)record;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1716,18 +1703,17 @@ H5SM_decr_ref(void *record, void *op_data, hbool_t *changed)
      * Messages stored in object headers always have refcounts of 1,
      * so the calling function should know to just delete such a message
      */
-    if(message->location == H5SM_IN_HEAP) {
+    if (message->location == H5SM_IN_HEAP) {
         --message->u.heap_loc.ref_count;
         *changed = TRUE;
     } /* end if */
 
-    if(op_data)
-       *(H5SM_sohm_t *)op_data = *message;
+    if (op_data)
+        *(H5SM_sohm_t *)op_data = *message;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_decr_ref() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_delete_from_index
  *
@@ -1746,19 +1732,19 @@ H5SM_decr_ref(void *record, void *op_data, hbool_t *changed)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    H5SM_index_header_t *header, const H5O_shared_t *mesg,
-    unsigned *cache_flags, size_t * /*out*/ mesg_size, void ** /*out*/ encoded_mesg)
+H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5SM_index_header_t *header,
+                       const H5O_shared_t *mesg, unsigned *cache_flags, size_t * /*out*/ mesg_size,
+                       void ** /*out*/ encoded_mesg)
 {
-    H5SM_list_t     *list = NULL;
+    H5SM_list_t *   list = NULL;
     H5SM_mesg_key_t key;
-    H5SM_sohm_t     message;            /* Deleted message returned from index */
-    H5SM_sohm_t    *message_ptr;        /* Pointer to deleted message returned from index */
-    H5HF_t         *fheap = NULL;       /* Fractal heap that contains the message */
-    H5B2_t         *bt2 = NULL;         /* v2 B-tree handle for index */
-    size_t          buf_size;           /* Size of the encoded message (out) */
-    void            *encoding_buf = NULL; /* The encoded message (out) */
-    unsigned        type_id;            /* Message type to operate on */
+    H5SM_sohm_t     message;             /* Deleted message returned from index */
+    H5SM_sohm_t *   message_ptr;         /* Pointer to deleted message returned from index */
+    H5HF_t *        fheap = NULL;        /* Fractal heap that contains the message */
+    H5B2_t *        bt2   = NULL;        /* v2 B-tree handle for index */
+    size_t          buf_size;            /* Size of the encoded message (out) */
+    void *          encoding_buf = NULL; /* The encoded message (out) */
+    unsigned        type_id;             /* Message type to operate on */
     herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -1774,56 +1760,57 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     type_id = mesg->msg_type_id;
 
     /* Open the heap for this type of message. */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, header->heap_addr)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, header->heap_addr)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Get the message size and encoded message for the message to be deleted,
      * either from its OH or from the heap.
      */
-    if(mesg->type == H5O_SHARE_TYPE_HERE) {
-        key.message.location = H5SM_IN_OH;
+    if (mesg->type == H5O_SHARE_TYPE_HERE) {
+        key.message.location    = H5SM_IN_OH;
         key.message.msg_type_id = type_id;
-        key.message.u.mesg_loc = mesg->u.loc;
+        key.message.u.mesg_loc  = mesg->u.loc;
     } /* end if */
     else {
-        key.message.location = H5SM_IN_HEAP;
-        key.message.msg_type_id = type_id;
+        key.message.location             = H5SM_IN_HEAP;
+        key.message.msg_type_id          = type_id;
         key.message.u.heap_loc.ref_count = 0; /* Refcount isn't relevant here */
-        key.message.u.heap_loc.fheap_id = mesg->u.heap_id;
+        key.message.u.heap_loc.fheap_id  = mesg->u.heap_id;
     } /* end else */
 
     /* Get the encoded message */
-    if(H5SM_read_mesg(f, &key.message, fheap, open_oh, dxpl_id, &buf_size, &encoding_buf) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
+    if (H5SM_read_mesg(f, &key.message, fheap, open_oh, dxpl_id, &buf_size, &encoding_buf) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Set up key for message to be deleted. */
-    key.file = f;
-    key.dxpl_id = dxpl_id;
-    key.fheap = fheap;
-    key.encoding = encoding_buf;
+    key.file          = f;
+    key.dxpl_id       = dxpl_id;
+    key.fheap         = fheap;
+    key.encoding      = encoding_buf;
     key.encoding_size = buf_size;
-    key.message.hash = H5_checksum_lookup3(encoding_buf, buf_size, type_id);
+    key.message.hash  = H5_checksum_lookup3(encoding_buf, buf_size, type_id);
 
     /* Try to find the message in the index */
-    if(header->index_type == H5SM_LIST) {
-        H5SM_list_cache_ud_t cache_udata;   /* User-data for metadata cache callback */
-        size_t list_pos;        /* Position of the message in the list */
+    if (header->index_type == H5SM_LIST) {
+        H5SM_list_cache_ud_t cache_udata; /* User-data for metadata cache callback */
+        size_t               list_pos;    /* Position of the message in the list */
 
         /* Set up user data for metadata cache callback */
-        cache_udata.f = f;
+        cache_udata.f      = f;
         cache_udata.header = header;
 
         /* If the index is stored as a list, get it from the cache */
-        if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, &cache_udata, H5AC_WRITE)))
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
+        if (NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr,
+                                                        &cache_udata, H5AC_WRITE)))
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
 
         /* Find the message in the list */
-        if(H5SM_find_in_list(list, &key, NULL, &list_pos) < 0)
+        if (H5SM_find_in_list(list, &key, NULL, &list_pos) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "unable to search for message in list")
-        if(list_pos == UFAIL)
-	    HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "message not in index")
+        if (list_pos == UFAIL)
+            HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "message not in index")
 
-        if(list->messages[list_pos].location == H5SM_IN_HEAP)
+        if (list->messages[list_pos].location == H5SM_IN_HEAP)
             --(list->messages[list_pos].u.heap_loc.ref_count);
 
         /* Point to the message */
@@ -1834,14 +1821,14 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
         HDassert(header->index_type == H5SM_BTREE);
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for SOHM index")
 
         /* If this returns failure, it means that the message wasn't found.
          * If it succeeds, a copy of the modified message will be returned.
          */
-        if(H5B2_modify(bt2, dxpl_id, &key, H5SM_decr_ref, &message) < 0)
-	    HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "message not in index")
+        if (H5B2_modify(bt2, dxpl_id, &key, H5SM_decr_ref, &message) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "message not in index")
 
         /* Point to the message */
         message_ptr = &message;
@@ -1850,7 +1837,7 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     /* If the ref count is zero or this message was in an OH (which always
      * has a ref count of 1) delete the message from the index
      */
-    if(message_ptr->location == H5SM_IN_OH || message_ptr->u.heap_loc.ref_count == 0) {
+    if (message_ptr->location == H5SM_IN_OH || message_ptr->u.heap_loc.ref_count == 0) {
         /* Save the location */
         H5SM_storage_loc_t old_loc = message_ptr->location;
 
@@ -1859,78 +1846,77 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
         *cache_flags |= H5AC__DIRTIED_FLAG;
 
         /* Remove the message from the index */
-        if(header->index_type == H5SM_LIST)
+        if (header->index_type == H5SM_LIST)
             message_ptr->location = H5SM_NO_LOC;
         else {
             /* Open the index v2 B-tree, if it isn't already */
-            if(NULL == bt2) {
-                if(NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
+            if (NULL == bt2) {
+                if (NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
                     HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for SOHM index")
             } /* end if */
 
-            if(H5B2_remove(bt2, dxpl_id, &key, NULL, NULL) < 0)
+            if (H5B2_remove(bt2, dxpl_id, &key, NULL, NULL) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTREMOVE, FAIL, "unable to delete message from index")
         } /* end else */
 
         /* Remove the message from the heap if it was stored in the heap*/
-        if(old_loc == H5SM_IN_HEAP)
-            if(H5HF_remove(fheap, dxpl_id, &(message_ptr->u.heap_loc.fheap_id)) < 0)
-	        HGOTO_ERROR(H5E_SOHM, H5E_CANTREMOVE, FAIL, "unable to remove message from heap")
-
+        if (old_loc == H5SM_IN_HEAP)
+            if (H5HF_remove(fheap, dxpl_id, &(message_ptr->u.heap_loc.fheap_id)) < 0)
+                HGOTO_ERROR(H5E_SOHM, H5E_CANTREMOVE, FAIL, "unable to remove message from heap")
 
         /* Return the message's encoding so anything it references can be freed */
         *encoded_mesg = encoding_buf;
-        *mesg_size = buf_size;
+        *mesg_size    = buf_size;
 
         /* If there are no messages left in the index, delete it */
-        if(header->num_messages == 0) {
+        if (header->num_messages == 0) {
 
             /* Unprotect cache and release heap */
-            if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
-	        HGOTO_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to release SOHM list")
+            if (list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list,
+                                       H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
+                HGOTO_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to release SOHM list")
             list = NULL;
 
             HDassert(fheap);
-            if(H5HF_close(fheap, dxpl_id) < 0)
+            if (H5HF_close(fheap, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
             fheap = NULL;
 
             /* Delete the index and its heap */
-            if(H5SM_delete_index(f, header, dxpl_id, TRUE) < 0)
+            if (H5SM_delete_index(f, header, dxpl_id, TRUE) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTDELETE, FAIL, "can't delete empty index")
-        }  /* end if */
-        else if(header->index_type == H5SM_BTREE && header->num_messages < header->btree_min) {
+        } /* end if */
+        else if (header->index_type == H5SM_BTREE && header->num_messages < header->btree_min) {
             /* Otherwise, if we've just passed the btree-to-list cutoff, convert
              * this B-tree into a list
              */
-           if(H5SM_convert_btree_to_list(f, header, dxpl_id) < 0)
+            if (H5SM_convert_btree_to_list(f, header, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, FAIL, "unable to convert btree to list")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Release the SOHM list */
-    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__DIRTIED_FLAG) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
+    if (list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__DIRTIED_FLAG) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
 
     /* Release the fractal heap & v2 B-tree if we opened them */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for SOHM index")
 
     /* Free the message encoding, if we're not returning it in encoded_mesg
      * or if there's been an error.
      */
-    if(encoding_buf && (NULL == *encoded_mesg || ret_value < 0)) {
+    if (encoding_buf && (NULL == *encoded_mesg || ret_value < 0)) {
         encoding_buf = H5MM_xfree(encoding_buf);
-        *mesg_size = 0;
+        *mesg_size   = 0;
     }
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_delete_from_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_get_info
  *
@@ -1946,12 +1932,12 @@ done:
 herr_t
 H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
 {
-    H5F_t *f = ext_loc->file;           /* File pointer (convenience variable) */
-    H5O_shmesg_table_t sohm_table;      /* SOHM message from superblock extension */
-    H5SM_master_table_t *table = NULL;  /* SOHM master table */
-    unsigned tmp_sohm_nindexes;		/* Number of shared messages indexes in the table */
-    htri_t status;                      /* Status for message existing */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5F_t *              f = ext_loc->file;   /* File pointer (convenience variable) */
+    H5O_shmesg_table_t   sohm_table;          /* SOHM message from superblock extension */
+    H5SM_master_table_t *table = NULL;        /* SOHM master table */
+    unsigned             tmp_sohm_nindexes;   /* Number of shared messages indexes in the table */
+    htri_t               status;              /* Status for message existing */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1961,18 +1947,18 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
     HDassert(fc_plist);
 
     /* Check for the extension having a 'shared message info' message */
-    if((status = H5O_msg_exists(ext_loc, H5O_SHMESG_ID, dxpl_id)) < 0)
+    if ((status = H5O_msg_exists(ext_loc, H5O_SHMESG_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "unable to read object header")
-    if(status) {
-        H5SM_table_cache_ud_t cache_udata;      /* User-data for callback */
-        unsigned index_flags[H5O_SHMESG_MAX_NINDEXES];  /* Message flags for each index */
-        unsigned minsizes[H5O_SHMESG_MAX_NINDEXES];     /* Minimum message size for each index */
-        unsigned sohm_l2b;           /* SOHM list-to-btree cutoff */
-        unsigned sohm_b2l;           /* SOHM btree-to-list cutoff */
-        unsigned u;                  /* Local index variable */
+    if (status) {
+        H5SM_table_cache_ud_t cache_udata;                          /* User-data for callback */
+        unsigned              index_flags[H5O_SHMESG_MAX_NINDEXES]; /* Message flags for each index */
+        unsigned              minsizes[H5O_SHMESG_MAX_NINDEXES];    /* Minimum message size for each index */
+        unsigned              sohm_l2b;                             /* SOHM list-to-btree cutoff */
+        unsigned              sohm_b2l;                             /* SOHM btree-to-list cutoff */
+        unsigned              u;                                    /* Local index variable */
 
         /* Retrieve the 'shared message info' structure */
-        if(NULL == H5O_msg_read(ext_loc, H5O_SHMESG_ID, &sohm_table, dxpl_id))
+        if (NULL == H5O_msg_read(ext_loc, H5O_SHMESG_ID, &sohm_table, dxpl_id))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "shared message info message not present")
 
         /* Portably initialize the arrays */
@@ -1990,7 +1976,8 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
         cache_udata.f = f;
 
         /* Read the rest of the SOHM table information from the cache */
-        if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
+        if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE,
+                                                                 H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
         /* Get index conversion limits */
@@ -1998,10 +1985,10 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
         sohm_b2l = (unsigned)table->indexes[0].btree_min;
 
         /* Iterate through all indices */
-        for(u = 0; u < table->num_indexes; ++u) {
+        for (u = 0; u < table->num_indexes; ++u) {
             /* Pack information about the individual SOHM index */
             index_flags[u] = table->indexes[u].mesg_types;
-            minsizes[u] = (unsigned)table->indexes[u].min_mesg_size;
+            minsizes[u]    = (unsigned)table->indexes[u].min_mesg_size;
 
             /* Sanity check */
             HDassert(sohm_l2b == table->indexes[u].list_max);
@@ -2010,21 +1997,21 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
             /* Check for sharing attributes in this file, which means that creation
              *  indices must be tracked on object header message in the file.
              */
-            if(index_flags[u] & H5O_SHMESG_ATTR_FLAG)
+            if (index_flags[u] & H5O_SHMESG_ATTR_FLAG)
                 H5F_SET_STORE_MSG_CRT_IDX(f, TRUE);
         } /* end for */
 
         /* Set values in the property list */
         tmp_sohm_nindexes = H5F_SOHM_NINDEXES(f);
-        if(H5P_set(fc_plist, H5F_CRT_SHMSG_NINDEXES_NAME, &tmp_sohm_nindexes) < 0)
+        if (H5P_set(fc_plist, H5F_CRT_SHMSG_NINDEXES_NAME, &tmp_sohm_nindexes) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTSET, FAIL, "can't set number of SOHM indexes")
-        if(H5P_set(fc_plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, index_flags) < 0)
+        if (H5P_set(fc_plist, H5F_CRT_SHMSG_INDEX_TYPES_NAME, index_flags) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTSET, FAIL, "can't set type flags for indexes")
-        if(H5P_set(fc_plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, minsizes) < 0)
+        if (H5P_set(fc_plist, H5F_CRT_SHMSG_INDEX_MINSIZE_NAME, minsizes) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTSET, FAIL, "can't set type flags for indexes")
-        if(H5P_set(fc_plist, H5F_CRT_SHMSG_LIST_MAX_NAME, &sohm_l2b) < 0)
+        if (H5P_set(fc_plist, H5F_CRT_SHMSG_LIST_MAX_NAME, &sohm_l2b) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't set SOHM cutoff in property list")
-        if(H5P_set(fc_plist, H5F_CRT_SHMSG_BTREE_MIN_NAME, &sohm_b2l) < 0)
+        if (H5P_set(fc_plist, H5F_CRT_SHMSG_BTREE_MIN_NAME, &sohm_b2l) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't set SOHM cutoff in property list")
     } /* end if */
     else {
@@ -2035,19 +2022,18 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
 
         /* Shared object header messages are disabled */
         tmp_sohm_nindexes = H5F_SOHM_NINDEXES(f);
-        if(H5P_set(fc_plist, H5F_CRT_SHMSG_NINDEXES_NAME, &tmp_sohm_nindexes) < 0)
+        if (H5P_set(fc_plist, H5F_CRT_SHMSG_NINDEXES_NAME, &tmp_sohm_nindexes) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTSET, FAIL, "can't set number of SOHM indexes")
     } /* end else */
 
 done:
     /* Release the master SOHM table if we took it out of the cache */
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_get_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_reconstitute
  *
@@ -2062,8 +2048,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5SM_reconstitute(H5O_shared_t *sh_mesg, H5F_t *f, unsigned msg_type_id,
-    H5O_fheap_id_t heap_id)
+H5SM_reconstitute(H5O_shared_t *sh_mesg, H5F_t *f, unsigned msg_type_id, H5O_fheap_id_t heap_id)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2071,15 +2056,14 @@ H5SM_reconstitute(H5O_shared_t *sh_mesg, H5F_t *f, unsigned msg_type_id,
     HDassert(sh_mesg);
 
     /* Set flag for shared message */
-    sh_mesg->type = H5O_SHARE_TYPE_SOHM;
-    sh_mesg->file = f;
+    sh_mesg->type        = H5O_SHARE_TYPE_SOHM;
+    sh_mesg->file        = f;
     sh_mesg->msg_type_id = msg_type_id;
-    sh_mesg->u.heap_id = heap_id;
+    sh_mesg->u.heap_id   = heap_id;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_reconstitute() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_get_refcount_bt2_cb
  *
@@ -2095,8 +2079,8 @@ H5SM_reconstitute(H5O_shared_t *sh_mesg, H5F_t *f, unsigned msg_type_id,
 static herr_t
 H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data)
 {
-    const H5SM_sohm_t *record = (const H5SM_sohm_t *)_record;  /* v2 B-tree record for message */
-    H5SM_sohm_t *op_data = (H5SM_sohm_t *)_op_data;       /* "op data" from v2 B-tree find */
+    const H5SM_sohm_t *record  = (const H5SM_sohm_t *)_record; /* v2 B-tree record for message */
+    H5SM_sohm_t *      op_data = (H5SM_sohm_t *)_op_data;      /* "op data" from v2 B-tree find */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -2112,7 +2096,6 @@ H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_get_refcount_bt2_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_get_refcount
  *
@@ -2126,21 +2109,20 @@ H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
-    const H5O_shared_t *sh_mesg, hsize_t *ref_count)
+H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id, const H5O_shared_t *sh_mesg, hsize_t *ref_count)
 {
-    H5HF_t *fheap = NULL;               /* Fractal heap that contains shared messages */
-    H5B2_t *bt2 = NULL;                 /* v2 B-tree handle for index */
-    H5SM_master_table_t *table = NULL;  /* SOHM master table */
-    H5SM_table_cache_ud_t tbl_cache_udata;  /* User-data for callback */
-    H5SM_list_t *list = NULL;           /* SOHM index list for message type (if in list form) */
-    H5SM_index_header_t *header=NULL;   /* Index header for message type */
-    H5SM_mesg_key_t key;                /* Key for looking up message */
-    H5SM_sohm_t message;                /* Shared message returned from callback */
-    ssize_t index_num;                  /* Table index for message type */
-    size_t buf_size;                    /* Size of the encoded message */
-    void * encoding_buf = NULL;         /* Buffer for encoded message */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5HF_t *              fheap = NULL;           /* Fractal heap that contains shared messages */
+    H5B2_t *              bt2   = NULL;           /* v2 B-tree handle for index */
+    H5SM_master_table_t * table = NULL;           /* SOHM master table */
+    H5SM_table_cache_ud_t tbl_cache_udata;        /* User-data for callback */
+    H5SM_list_t *         list   = NULL;          /* SOHM index list for message type (if in list form) */
+    H5SM_index_header_t * header = NULL;          /* Index header for message type */
+    H5SM_mesg_key_t       key;                    /* Key for looking up message */
+    H5SM_sohm_t           message;                /* Shared message returned from callback */
+    ssize_t               index_num;              /* Table index for message type */
+    size_t                buf_size;               /* Size of the encoded message */
+    void *                encoding_buf = NULL;    /* Buffer for encoded message */
+    herr_t                ret_value    = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2153,72 +2135,74 @@ H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     tbl_cache_udata.f = f;
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &tbl_cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
+    if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f),
+                                                             &tbl_cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* Find the correct index and find the message in it */
-    if((index_num = H5SM_get_index(table, type_id)) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "unable to find correct SOHM index")
+    if ((index_num = H5SM_get_index(table, type_id)) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "unable to find correct SOHM index")
     header = &(table->indexes[index_num]);
 
     /* Open the heap for this message type */
-    if(NULL == (fheap = H5HF_open(f, dxpl_id, header->heap_addr)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
+    if (NULL == (fheap = H5HF_open(f, dxpl_id, header->heap_addr)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Set up a SOHM message to correspond to the shared message passed in */
-    key.message.location = H5SM_IN_HEAP;
-    key.message.u.heap_loc.fheap_id = sh_mesg->u.heap_id;
+    key.message.location             = H5SM_IN_HEAP;
+    key.message.u.heap_loc.fheap_id  = sh_mesg->u.heap_id;
     key.message.u.heap_loc.ref_count = 0; /* Ref count isn't needed to find message */
 
     /* Get the encoded message */
-    if(H5SM_read_mesg(f, &key.message, fheap, NULL, dxpl_id, &buf_size, &encoding_buf) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
+    if (H5SM_read_mesg(f, &key.message, fheap, NULL, dxpl_id, &buf_size, &encoding_buf) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
     /* Set up key for message to locate */
-    key.file = f;
-    key.dxpl_id = dxpl_id;
-    key.fheap = fheap;
-    key.encoding = encoding_buf;
+    key.file          = f;
+    key.dxpl_id       = dxpl_id;
+    key.fheap         = fheap;
+    key.encoding      = encoding_buf;
     key.encoding_size = buf_size;
-    key.message.hash = H5_checksum_lookup3(encoding_buf, buf_size, type_id);
+    key.message.hash  = H5_checksum_lookup3(encoding_buf, buf_size, type_id);
 
     /* Try to find the message in the index */
-    if(header->index_type == H5SM_LIST) {
-        H5SM_list_cache_ud_t lst_cache_udata;  /* User-data for metadata cache callback */
-        size_t list_pos;        /* Position of the message in the list */
+    if (header->index_type == H5SM_LIST) {
+        H5SM_list_cache_ud_t lst_cache_udata; /* User-data for metadata cache callback */
+        size_t               list_pos;        /* Position of the message in the list */
 
         /* Set up user data for metadata cache callback */
-        lst_cache_udata.f = f;
+        lst_cache_udata.f      = f;
         lst_cache_udata.header = header;
 
         /* If the index is stored as a list, get it from the cache */
-        if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, &lst_cache_udata, H5AC_READ)))
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
+        if (NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr,
+                                                        &lst_cache_udata, H5AC_READ)))
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
 
         /* Find the message in the list */
-        if(H5SM_find_in_list(list, &key, NULL, &list_pos) < 0)
+        if (H5SM_find_in_list(list, &key, NULL, &list_pos) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "unable to search for message in list")
-        if(list_pos == UFAIL)
-	    HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "message not in index")
+        if (list_pos == UFAIL)
+            HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "message not in index")
 
         /* Copy the message */
         message = list->messages[list_pos];
     } /* end if */
     else {
-        htri_t msg_exists;      /* Whether the message exists in the v2 B-tree */
+        htri_t msg_exists; /* Whether the message exists in the v2 B-tree */
 
         /* Index is a B-tree */
         HDassert(header->index_type == H5SM_BTREE);
 
         /* Open the index v2 B-tree */
-        if(NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
+        if (NULL == (bt2 = H5B2_open(f, dxpl_id, header->index_addr, f)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for SOHM index")
 
         /* Look up the message in the v2 B-tree */
-        if((msg_exists = H5B2_find(bt2, dxpl_id, &key, H5SM_get_refcount_bt2_cb, &message)) < 0)
+        if ((msg_exists = H5B2_find(bt2, dxpl_id, &key, H5SM_get_refcount_bt2_cb, &message)) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "error finding message in index")
-        if(!msg_exists)
-	    HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "message not in index")
+        if (!msg_exists)
+            HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "message not in index")
     } /* end else */
 
     /* Set the refcount for the message */
@@ -2227,21 +2211,20 @@ H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
 
 done:
     /* Release resources */
-    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for SOHM index")
-    if(encoding_buf)
+    if (encoding_buf)
         encoding_buf = H5MM_xfree(encoding_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_get_refcount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_read_iter_op
  *
@@ -2265,11 +2248,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
-    unsigned H5_ATTR_UNUSED *oh_modified, void *_udata/*in,out*/)
+H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence,
+                  unsigned H5_ATTR_UNUSED *oh_modified, void *_udata /*in,out*/)
 {
-    H5SM_read_udata_t *udata = (H5SM_read_udata_t *) _udata;
-    herr_t ret_value = H5_ITER_CONT;
+    H5SM_read_udata_t *udata     = (H5SM_read_udata_t *)_udata;
+    herr_t             ret_value = H5_ITER_CONT;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2282,10 +2265,10 @@ H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
     HDassert(NULL == udata->encoding_buf);
 
     /* Check the creation index for this message */
-    if(sequence == udata->idx) {
+    if (sequence == udata->idx) {
         /* Check if the message is dirty & flush it to the object header if so */
-        if(mesg->dirty)
-            if(H5O_msg_flush(udata->file, oh, mesg) < 0)
+        if (mesg->dirty)
+            if (H5O_msg_flush(udata->file, oh, mesg) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTENCODE, H5_ITER_ERROR, "unable to encode object header message")
 
         /* Get the message's encoded size */
@@ -2293,7 +2276,7 @@ H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
         HDassert(udata->buf_size);
 
         /* Allocate buffer to return the message in */
-        if(NULL == (udata->encoding_buf = H5MM_malloc(udata->buf_size)))
+        if (NULL == (udata->encoding_buf = H5MM_malloc(udata->buf_size)))
             HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, H5_ITER_ERROR, "memory allocation failed")
 
         /* Copy the encoded message into the buffer to return */
@@ -2307,7 +2290,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_read_iter_op() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_read_mesg_fh_cb
  *
@@ -2325,13 +2307,13 @@ done:
 static herr_t
 H5SM_read_mesg_fh_cb(const void *obj, size_t obj_len, void *_udata)
 {
-    H5SM_read_udata_t *udata = (H5SM_read_udata_t *)_udata;
-    herr_t ret_value = SUCCEED;
+    H5SM_read_udata_t *udata     = (H5SM_read_udata_t *)_udata;
+    herr_t             ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate a buffer to hold the message */
-    if(NULL == (udata->encoding_buf = H5MM_malloc(obj_len)))
+    if (NULL == (udata->encoding_buf = H5MM_malloc(obj_len)))
         HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Copy the message from the heap */
@@ -2342,7 +2324,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_read_mesg_fh_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_read_mesg
  *
@@ -2357,14 +2338,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap,
-    H5O_t *open_oh, hid_t dxpl_id, size_t *encoding_size /*out*/,
-    void ** encoded_mesg /*out*/)
+H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap, H5O_t *open_oh, hid_t dxpl_id,
+               size_t *encoding_size /*out*/, void **encoded_mesg /*out*/)
 {
-    H5SM_read_udata_t udata;    /* User data for callbacks */
-    H5O_loc_t oloc;             /* Object location for message in object header */
-    H5O_t *oh = NULL;           /* Object header for message in object header */
-    herr_t ret_value = SUCCEED;
+    H5SM_read_udata_t udata;            /* User data for callbacks */
+    H5O_loc_t         oloc;             /* Object location for message in object header */
+    H5O_t *           oh        = NULL; /* Object header for message in object header */
+    herr_t            ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2373,77 +2353,76 @@ H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap,
     HDassert(fheap);
 
     /* Set up user data for message iteration */
-    udata.file = f;
-    udata.idx = mesg->u.mesg_loc.index;
+    udata.file         = f;
+    udata.idx          = mesg->u.mesg_loc.index;
     udata.encoding_buf = NULL;
-    udata.idx = 0;
+    udata.idx          = 0;
 
     /* Get the message size and encoded message for the message to be deleted,
      * either from its OH or from the heap.
      */
-    if(mesg->location == H5SM_IN_OH) {
+    if (mesg->location == H5SM_IN_OH) {
         /* Read message from object header */
-        const H5O_msg_class_t *type = NULL;    /* Actual H5O class type for the ID */
-        H5O_mesg_operator_t op;         /* Wrapper for operator */
+        const H5O_msg_class_t *type = NULL; /* Actual H5O class type for the ID */
+        H5O_mesg_operator_t    op;          /* Wrapper for operator */
 
-        type = H5O_msg_class_g[mesg->msg_type_id];    /* map the type ID to the actual type object */
+        type = H5O_msg_class_g[mesg->msg_type_id]; /* map the type ID to the actual type object */
         HDassert(type);
 
         /* Reset object location for operation */
-        if(H5O_loc_reset(&oloc) < 0)
+        if (H5O_loc_reset(&oloc) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTRESET, FAIL, "unable to initialize location")
 
-        if(NULL == open_oh || mesg->u.mesg_loc.oh_addr != H5O_OH_GET_ADDR(open_oh)) {
+        if (NULL == open_oh || mesg->u.mesg_loc.oh_addr != H5O_OH_GET_ADDR(open_oh)) {
             /* Open the object in the file */
             oloc.file = f;
             oloc.addr = mesg->u.mesg_loc.oh_addr;
-            if(H5O_open(&oloc) < 0)
-	        HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, FAIL, "unable to open object header")
+            if (H5O_open(&oloc) < 0)
+                HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, FAIL, "unable to open object header")
 
             /* Load the object header from the cache */
-            if(NULL == (oh = H5O_protect(&oloc, dxpl_id, H5AC_READ)))
-	        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load object header")
+            if (NULL == (oh = H5O_protect(&oloc, dxpl_id, H5AC_READ)))
+                HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load object header")
         } /* end if */
         else
             oh = open_oh;
 
         /* Use the "real" iterate routine so it doesn't try to protect the OH */
-        op.op_type = H5O_MESG_OP_LIB;
+        op.op_type  = H5O_MESG_OP_LIB;
         op.u.lib_op = H5SM_read_iter_op;
-        if((ret_value = H5O_msg_iterate_real(f, oh, type, &op, &udata, dxpl_id)) < 0)
+        if ((ret_value = H5O_msg_iterate_real(f, oh, type, &op, &udata, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_BADITER, FAIL, "unable to iterate over object header messages")
     } /* end if */
     else {
         HDassert(mesg->location == H5SM_IN_HEAP);
 
         /* Copy the message from the heap */
-        if(H5HF_op(fheap, dxpl_id, &(mesg->u.heap_loc.fheap_id), H5SM_read_mesg_fh_cb, &udata) < 0)
+        if (H5HF_op(fheap, dxpl_id, &(mesg->u.heap_loc.fheap_id), H5SM_read_mesg_fh_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, FAIL, "can't read message from fractal heap.")
     } /* end else */
     HDassert(udata.encoding_buf);
     HDassert(udata.buf_size);
 
     /* Record the returned values */
-    *encoded_mesg = udata.encoding_buf;
+    *encoded_mesg  = udata.encoding_buf;
     *encoding_size = udata.buf_size;
 
 done:
     /* Close the object header if we opened one and had an error */
-    if(oh && oh != open_oh) {
-        if(oh && H5O_unprotect(&oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && oh != open_oh) {
+        if (oh && H5O_unprotect(&oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
-        if(H5O_close(&oloc) < 0)
+        if (H5O_close(&oloc) < 0)
             HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "unable to close object header")
     } /* end if */
 
     /* Release the encoding buffer on error */
-    if(ret_value < 0 && udata.encoding_buf)
+    if (ret_value < 0 && udata.encoding_buf)
         udata.encoding_buf = H5MM_xfree(udata.encoding_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_read_mesg */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_table_free
  *
@@ -2472,7 +2451,6 @@ H5SM_table_free(H5SM_master_table_t *table)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_table_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_list_free
  *
@@ -2500,7 +2478,6 @@ H5SM_list_free(H5SM_list_t *list)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_list_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_table_debug
  *
@@ -2517,14 +2494,13 @@ H5SM_list_free(H5SM_list_t *list)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr,
-                         FILE *stream, int indent, int fwidth,
-                         unsigned table_vers, unsigned num_indexes)
+H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr, FILE *stream, int indent, int fwidth,
+                 unsigned table_vers, unsigned num_indexes)
 {
-    H5SM_master_table_t *table = NULL;  /* SOHM master table */
-    H5SM_table_cache_ud_t cache_udata;  /* User-data for callback */
-    unsigned x;                         /* Counter variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5SM_master_table_t * table = NULL;        /* SOHM master table */
+    H5SM_table_cache_ud_t cache_udata;         /* User-data for callback */
+    unsigned              x;                   /* Counter variable */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2537,60 +2513,61 @@ H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr,
     /* If table_vers and num_indexes are UFAIL, replace them with values from
      * userblock
      */
-    if(table_vers == UFAIL)
+    if (table_vers == UFAIL)
         table_vers = H5F_SOHM_VERS(f);
-    else if(table_vers != H5F_SOHM_VERS(f))
-	HDfprintf(stream, "*** SOHM TABLE VERSION DOESN'T MATCH VERSION IN SUPERBLOCK!\n");
-    if(num_indexes == UFAIL)
+    else if (table_vers != H5F_SOHM_VERS(f))
+        HDfprintf(stream, "*** SOHM TABLE VERSION DOESN'T MATCH VERSION IN SUPERBLOCK!\n");
+    if (num_indexes == UFAIL)
         num_indexes = H5F_SOHM_NINDEXES(f);
-    else if(num_indexes != H5F_SOHM_NINDEXES(f))
-	HDfprintf(stream, "*** NUMBER OF SOHM INDEXES DOESN'T MATCH VALUE IN SUPERBLOCK!\n");
+    else if (num_indexes != H5F_SOHM_NINDEXES(f))
+        HDfprintf(stream, "*** NUMBER OF SOHM INDEXES DOESN'T MATCH VALUE IN SUPERBLOCK!\n");
 
     /* Check arguments.  Version must be 0, the only version implemented so far */
-    if(table_vers > HDF5_SHAREDHEADER_VERSION)
+    if (table_vers > HDF5_SHAREDHEADER_VERSION)
         HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, FAIL, "unknown shared message table version")
-    if(num_indexes == 0 || num_indexes > H5O_SHMESG_MAX_NINDEXES)
-        HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, FAIL, "number of indexes must be between 1 and H5O_SHMESG_MAX_NINDEXES")
+    if (num_indexes == 0 || num_indexes > H5O_SHMESG_MAX_NINDEXES)
+        HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, FAIL,
+                    "number of indexes must be between 1 and H5O_SHMESG_MAX_NINDEXES")
 
     /* Set up user data for callback */
     cache_udata.f = f;
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
+    if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, table_addr,
+                                                             &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     HDfprintf(stream, "%*sShared Message Master Table...\n", indent, "");
-    for(x = 0; x < num_indexes; ++x) {
+    for (x = 0; x < num_indexes; ++x) {
         HDfprintf(stream, "%*sIndex %d...\n", indent, "", x);
-        HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth,
-                "SOHM Index Type:",
-                (table->indexes[x].index_type == H5SM_LIST ? "List" :
-                (table->indexes[x].index_type == H5SM_BTREE ? "B-Tree" : "Unknown")));
+        HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "SOHM Index Type:",
+                  (table->indexes[x].index_type == H5SM_LIST
+                       ? "List"
+                       : (table->indexes[x].index_type == H5SM_BTREE ? "B-Tree" : "Unknown")));
 
         HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", fwidth,
-                "Address of index:", table->indexes[x].index_addr);
+                  "Address of index:", table->indexes[x].index_addr);
         HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", fwidth,
-                "Address of index's heap:", table->indexes[x].heap_addr);
+                  "Address of index's heap:", table->indexes[x].heap_addr);
         HDfprintf(stream, "%*s%-*s 0x%08x\n", indent + 3, "", fwidth,
-                "Message type flags:", table->indexes[x].mesg_types);
+                  "Message type flags:", table->indexes[x].mesg_types);
         HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
-                "Minimum size of messages:", table->indexes[x].min_mesg_size);
+                  "Minimum size of messages:", table->indexes[x].min_mesg_size);
         HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
-                "Number of messages:", table->indexes[x].num_messages);
+                  "Number of messages:", table->indexes[x].num_messages);
         HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
-                "Maximum list size:", table->indexes[x].list_max);
+                  "Maximum list size:", table->indexes[x].list_max);
         HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
-                "Minimum B-tree size:", table->indexes[x].btree_min);
+                  "Minimum B-tree size:", table->indexes[x].btree_min);
     } /* end for */
 
 done:
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, table, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, table, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_table_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_list_debug
  *
@@ -2606,16 +2583,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr,
-                         FILE *stream, int indent, int fwidth,
-                         unsigned table_vers, size_t num_messages)
+H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr, FILE *stream, int indent, int fwidth,
+                unsigned table_vers, size_t num_messages)
 {
 
-    H5SM_list_t *list = NULL;           /* SOHM index list for message type (if in list form) */
-    H5SM_index_header_t header;         /* A "false" header used to read the list */
-    H5SM_list_cache_ud_t cache_udata;   /* User-data for metadata cache callback */
-    unsigned x;                         /* Counter variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5SM_list_t *        list = NULL;         /* SOHM index list for message type (if in list form) */
+    H5SM_index_header_t  header;              /* A "false" header used to read the list */
+    H5SM_list_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
+    unsigned             x;                   /* Counter variable */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2626,61 +2602,59 @@ H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr,
     HDassert(fwidth >= 0);
 
     /* Check arguments.  Version must be 0, the only version implemented so far */
-    if(table_vers > H5SM_LIST_VERSION)
+    if (table_vers > H5SM_LIST_VERSION)
         HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, FAIL, "unknown shared message list version")
-    if(num_messages == 0 || num_messages > H5O_SHMESG_MAX_LIST_SIZE)
-        HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, FAIL, "number of indexes must be between 1 and H5O_SHMESG_MAX_NINDEXES")
+    if (num_messages == 0 || num_messages > H5O_SHMESG_MAX_LIST_SIZE)
+        HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, FAIL,
+                    "number of indexes must be between 1 and H5O_SHMESG_MAX_NINDEXES")
 
     /* Create a temporary header using the arguments.  The cache needs this to load the list. */
     HDmemset(&header, 0, sizeof(H5SM_index_header_t));
     header.list_max = header.num_messages = num_messages;
-    header.index_type = H5SM_LIST;
-    header.index_addr = list_addr;
+    header.index_type                     = H5SM_LIST;
+    header.index_addr                     = list_addr;
 
     /* Set up user data for metadata cache callback */
-    cache_udata.f = f;
+    cache_udata.f      = f;
     cache_udata.header = &header;
 
     /* Get the list from the cache */
-    if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, list_addr, &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
+    if (NULL ==
+        (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, list_addr, &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
 
     HDfprintf(stream, "%*sShared Message List Index...\n", indent, "");
-    for(x = 0; x < num_messages; ++x) {
+    for (x = 0; x < num_messages; ++x) {
         HDfprintf(stream, "%*sShared Object Header Message %d...\n", indent, "", x);
         HDfprintf(stream, "%*s%-*s %08lu\n", indent + 3, "", fwidth,
-                "Hash value:", (unsigned long)list->messages[x].hash);
-        if(list->messages[x].location == H5SM_IN_HEAP) {
-            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth,
-                    "Location:", "in heap");
+                  "Hash value:", (unsigned long)list->messages[x].hash);
+        if (list->messages[x].location == H5SM_IN_HEAP) {
+            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "in heap");
             HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
-                    "Heap ID:", list->messages[x].u.heap_loc.fheap_id);
+                      "Heap ID:", list->messages[x].u.heap_loc.fheap_id);
             HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", fwidth,
-                    "Reference count:", list->messages[x].u.heap_loc.ref_count);
+                      "Reference count:", list->messages[x].u.heap_loc.ref_count);
         } /* end if */
-        else if(list->messages[x].location == H5SM_IN_OH) {
-            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth,
-                    "Location:", "in object header");
+        else if (list->messages[x].location == H5SM_IN_OH) {
+            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "in object header");
             HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", fwidth,
-                    "Object header address:", list->messages[x].u.mesg_loc.oh_addr);
+                      "Object header address:", list->messages[x].u.mesg_loc.oh_addr);
             HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", fwidth,
-                    "Message creation index:", list->messages[x].u.mesg_loc.oh_addr);
+                      "Message creation index:", list->messages[x].u.mesg_loc.oh_addr);
             HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", fwidth,
-                    "Message type ID:", list->messages[x].msg_type_id);
+                      "Message type ID:", list->messages[x].msg_type_id);
         } /* end if */
         else
-            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth,
-                    "Location:", "invalid");
+            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "invalid");
     } /* end for */
 
 done:
-    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, list_addr, list, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
+    if (list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, list_addr, list, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_list_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_ih_size
  *
@@ -2700,12 +2674,12 @@ done:
 herr_t
 H5SM_ih_size(H5F_t *f, hid_t dxpl_id, H5F_info_t *finfo)
 {
-    H5SM_master_table_t *table = NULL;          /* SOHM master table */
-    H5SM_table_cache_ud_t cache_udata;          /* User-data for callback */
-    H5HF_t              *fheap = NULL;          /* Fractal heap handle */
-    H5B2_t              *bt2 = NULL;            /* v2 B-tree handle for index */
-    unsigned    	u;                      /* Local index variable */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    H5SM_master_table_t * table = NULL;        /* SOHM master table */
+    H5SM_table_cache_ud_t cache_udata;         /* User-data for callback */
+    H5HF_t *              fheap = NULL;        /* Fractal heap handle */
+    H5B2_t *              bt2   = NULL;        /* v2 B-tree handle for index */
+    unsigned              u;                   /* Local index variable */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2718,61 +2692,61 @@ H5SM_ih_size(H5F_t *f, hid_t dxpl_id, H5F_info_t *finfo)
     cache_udata.f = f;
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
+    if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f),
+                                                             &cache_udata, H5AC_READ)))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* Get SOHM header size */
     finfo->sohm.hdr_size = table->table_size;
 
     /* Loop over all the indices for shared messages */
-    for(u = 0; u < table->num_indexes; u++) {
+    for (u = 0; u < table->num_indexes; u++) {
         /* Get index storage size (for either B-tree or list) */
-	if(table->indexes[u].index_type == H5SM_BTREE) {
-	    if(H5F_addr_defined(table->indexes[u].index_addr)) {
+        if (table->indexes[u].index_type == H5SM_BTREE) {
+            if (H5F_addr_defined(table->indexes[u].index_addr)) {
                 /* Open the index v2 B-tree */
-                if(NULL == (bt2 = H5B2_open(f, dxpl_id, table->indexes[u].index_addr, f)))
+                if (NULL == (bt2 = H5B2_open(f, dxpl_id, table->indexes[u].index_addr, f)))
                     HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for SOHM index")
 
-		if(H5B2_size(bt2, dxpl_id, &(finfo->sohm.msgs_info.index_size)) < 0)
+                if (H5B2_size(bt2, dxpl_id, &(finfo->sohm.msgs_info.index_size)) < 0)
                     HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't retrieve B-tree storage info")
 
                 /* Close the v2 B-tree */
-                if(H5B2_close(bt2, dxpl_id) < 0)
+                if (H5B2_close(bt2, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for SOHM index")
                 bt2 = NULL;
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else {
             HDassert(table->indexes[u].index_type == H5SM_LIST);
-	    finfo->sohm.msgs_info.index_size += table->indexes[u].list_size;
+            finfo->sohm.msgs_info.index_size += table->indexes[u].list_size;
         } /* end else */
 
         /* Check for heap for this index */
-	if(H5F_addr_defined(table->indexes[u].heap_addr)) {
+        if (H5F_addr_defined(table->indexes[u].heap_addr)) {
             /* Open the fractal heap for this index */
-            if(NULL == (fheap = H5HF_open(f, dxpl_id, table->indexes[u].heap_addr)))
+            if (NULL == (fheap = H5HF_open(f, dxpl_id, table->indexes[u].heap_addr)))
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
             /* Get heap storage size */
-	    if(H5HF_size(fheap, dxpl_id, &(finfo->sohm.msgs_info.heap_size)) < 0)
-		HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't retrieve fractal heap storage info")
+            if (H5HF_size(fheap, dxpl_id, &(finfo->sohm.msgs_info.heap_size)) < 0)
+                HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "can't retrieve fractal heap storage info")
 
             /* Close the fractal heap */
-            if(H5HF_close(fheap, dxpl_id) < 0)
+            if (H5HF_close(fheap, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
             fheap = NULL;
         } /* end if */
-    } /* end for */
+    }     /* end for */
 
 done:
     /* Release resources */
-    if(fheap && H5HF_close(fheap, dxpl_id) < 0)
+    if (fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
-    if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
+    if (bt2 && H5B2_close(bt2, dxpl_id) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for SOHM index")
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_ih_size() */
-
diff --git a/src/H5SMbtree2.c b/src/H5SMbtree2.c
index c9b1b03..473f62d 100644
--- a/src/H5SMbtree2.c
+++ b/src/H5SMbtree2.c
@@ -15,62 +15,57 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg 	  */
-#define H5SM_PACKAGE		/*suppress error about including H5SMpkg	  */
-
+#define H5O_PACKAGE  /*suppress error about including H5Opkg 	  */
+#define H5SM_PACKAGE /*suppress error about including H5SMpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Opkg.h"             /* Object Headers                       */
-#include "H5SMpkg.h"            /* Shared object header messages        */
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Opkg.h"     /* Object Headers                       */
+#include "H5SMpkg.h"    /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* v2 B-tree callbacks */
-static void *H5SM_bt2_crt_context(void *udata);
+static void * H5SM_bt2_crt_context(void *udata);
 static herr_t H5SM_bt2_dst_context(void *ctx);
 static herr_t H5SM_bt2_store(void *native, const void *udata);
-static herr_t H5SM_bt2_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
-static void *H5SM_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
-
+static herr_t H5SM_bt2_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth,
+                             const void *record, const void *_udata);
+static void * H5SM_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 /* v2 B-tree class for SOHM indexes*/
-const H5B2_class_t H5SM_INDEX[1]={{   /* B-tree class information */
-    H5B2_SOHM_INDEX_ID,               /* Type of B-tree */
-    "H5B2_SOHM_INDEX_ID",             /* Name of B-tree class */
-    sizeof(H5SM_sohm_t),              /* Size of native record */
-    H5SM_bt2_crt_context,             /* Create client callback context */
-    H5SM_bt2_dst_context,             /* Destroy client callback context */
-    H5SM_bt2_store,                   /* Record storage callback */
-    H5SM_message_compare,             /* Record comparison callback */
-    H5SM_message_encode,              /* Record encoding callback */
-    H5SM_message_decode,              /* Record decoding callback */
-    H5SM_bt2_debug,                   /* Record debugging callback */
-    H5SM_bt2_crt_dbg_context,	      /* Create debugging context */
-    H5SM_bt2_dst_context 	      /* Destroy debugging context */
+const H5B2_class_t H5SM_INDEX[1] = {{
+    /* B-tree class information */
+    H5B2_SOHM_INDEX_ID,       /* Type of B-tree */
+    "H5B2_SOHM_INDEX_ID",     /* Name of B-tree class */
+    sizeof(H5SM_sohm_t),      /* Size of native record */
+    H5SM_bt2_crt_context,     /* Create client callback context */
+    H5SM_bt2_dst_context,     /* Destroy client callback context */
+    H5SM_bt2_store,           /* Record storage callback */
+    H5SM_message_compare,     /* Record comparison callback */
+    H5SM_message_encode,      /* Record encoding callback */
+    H5SM_message_decode,      /* Record decoding callback */
+    H5SM_bt2_debug,           /* Record debugging callback */
+    H5SM_bt2_crt_dbg_context, /* Create debugging context */
+    H5SM_bt2_dst_context      /* Destroy debugging context */
 }};
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -78,8 +73,6 @@ const H5B2_class_t H5SM_INDEX[1]={{   /* B-tree class information */
 /* Declare a free list to manage the H5SM_bt2_ctx_t struct */
 H5FL_DEFINE_STATIC(H5SM_bt2_ctx_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_bt2_crt_context
  *
@@ -96,9 +89,9 @@ H5FL_DEFINE_STATIC(H5SM_bt2_ctx_t);
 static void *
 H5SM_bt2_crt_context(void *_f)
 {
-    H5F_t *f = (H5F_t *)_f;     /* User data for building callback context */
-    H5SM_bt2_ctx_t *ctx;        /* Callback context structure */
-    void *ret_value;            /* Return value */
+    H5F_t *         f = (H5F_t *)_f; /* User data for building callback context */
+    H5SM_bt2_ctx_t *ctx;             /* Callback context structure */
+    void *          ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -106,7 +99,7 @@ H5SM_bt2_crt_context(void *_f)
     HDassert(f);
 
     /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5SM_bt2_ctx_t)))
+    if (NULL == (ctx = H5FL_MALLOC(H5SM_bt2_ctx_t)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate callback context")
 
     /* Determine the size of addresses & lengths in the file */
@@ -119,7 +112,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5SM_bt2_crt_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_bt2_dst_context
  *
@@ -136,7 +128,7 @@ done:
 static herr_t
 H5SM_bt2_dst_context(void *_ctx)
 {
-    H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -149,7 +141,6 @@ H5SM_bt2_dst_context(void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5SM_bt2_dst_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_bt2_store
  *
@@ -178,7 +169,6 @@ H5SM_bt2_store(void *native, const void *udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_bt2_store */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_bt2_debug
  *
@@ -193,28 +183,27 @@ H5SM_bt2_store(void *native, const void *udata)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_bt2_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *record, const void H5_ATTR_UNUSED *_udata)
+H5SM_bt2_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, int indent,
+               int fwidth, const void *record, const void H5_ATTR_UNUSED *_udata)
 {
     const H5SM_sohm_t *sohm = (const H5SM_sohm_t *)record;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(sohm->location == H5SM_IN_HEAP)
+    if (sohm->location == H5SM_IN_HEAP)
         HDfprintf(stream, "%*s%-*s {%a, %lo, %Hx}\n", indent, "", fwidth,
-            "Shared Message in heap:",
-            sohm->u.heap_loc.fheap_id, sohm->hash, sohm->u.heap_loc.ref_count);
+                  "Shared Message in heap:", sohm->u.heap_loc.fheap_id, sohm->hash,
+                  sohm->u.heap_loc.ref_count);
     else {
         HDassert(sohm->location == H5SM_IN_OH);
         HDfprintf(stream, "%*s%-*s {%a, %lo, %Hx, %Hx}\n", indent, "", fwidth,
-            "Shared Message in OH:",
-            sohm->u.mesg_loc.oh_addr, sohm->hash, sohm->msg_type_id, sohm->u.mesg_loc.index);
+                  "Shared Message in OH:", sohm->u.mesg_loc.oh_addr, sohm->hash, sohm->msg_type_id,
+                  sohm->u.mesg_loc.index);
     } /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_bt2_debug */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_bt2_crt_dbg_context
  *
@@ -231,8 +220,8 @@ H5SM_bt2_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED
 static void *
 H5SM_bt2_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr)
 {
-    H5SM_bt2_ctx_t *ctx;        /* Callback context structure */
-    void *ret_value;            /* Return value */
+    H5SM_bt2_ctx_t *ctx;       /* Callback context structure */
+    void *          ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -240,7 +229,7 @@ H5SM_bt2_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR
     HDassert(f);
 
     /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5SM_bt2_ctx_t)))
+    if (NULL == (ctx = H5FL_MALLOC(H5SM_bt2_ctx_t)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate callback context")
 
     /* Determine the size of addresses & lengths in the file */
@@ -253,7 +242,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5SM_bt2_crt_dbg_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_bt2_convert_to_list_op
  *
@@ -271,11 +259,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5SM_bt2_convert_to_list_op(const void * record, void *op_data)
+H5SM_bt2_convert_to_list_op(const void *record, void *op_data)
 {
     const H5SM_sohm_t *message = (const H5SM_sohm_t *)record;
-    const H5SM_list_t *list = (const H5SM_list_t *)op_data;
-    size_t mesg_idx;            /* Index of message to modify */
+    const H5SM_list_t *list    = (const H5SM_list_t *)op_data;
+    size_t             mesg_idx; /* Index of message to modify */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -294,4 +282,3 @@ H5SM_bt2_convert_to_list_op(const void * record, void *op_data)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_bt2_convert_to_list_op() */
-
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 82dae2d..3197e36 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -15,54 +15,50 @@
 /* Module Setup */
 /****************/
 
-#define H5SM_PACKAGE		/*suppress error about including H5SMpkg	  */
-
+#define H5SM_PACKAGE /*suppress error about including H5SMpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access                          */
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5MFprivate.h"        /* File memory management		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5SMpkg.h"            /* Shared object header messages        */
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access                          */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5MFprivate.h" /* File memory management		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5SMpkg.h"     /* Shared object header messages        */
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Size of stack buffer for serialized tables */
-#define H5SM_TBL_BUF_SIZE       1024
+#define H5SM_TBL_BUF_SIZE 1024
 
 /* Size of stack buffer for serialized list indices */
-#define H5SM_LST_BUF_SIZE       1024
-
+#define H5SM_LST_BUF_SIZE 1024
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Metadata cache (H5AC) callbacks */
 static H5SM_master_table_t *H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_master_table_t *table);
-static herr_t H5SM_table_dest(H5F_t *f, H5SM_master_table_t* table);
-static herr_t H5SM_table_clear(H5F_t *f, H5SM_master_table_t *table, hbool_t destroy);
-static herr_t H5SM_table_size(const H5F_t *f, const H5SM_master_table_t *table, size_t *size_ptr);
+static herr_t               H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+                                             H5SM_master_table_t *table);
+static herr_t               H5SM_table_dest(H5F_t *f, H5SM_master_table_t *table);
+static herr_t               H5SM_table_clear(H5F_t *f, H5SM_master_table_t *table, hbool_t destroy);
+static herr_t       H5SM_table_size(const H5F_t *f, const H5SM_master_table_t *table, size_t *size_ptr);
 static H5SM_list_t *H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
 static herr_t H5SM_list_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_list_t *list);
-static herr_t H5SM_list_dest(H5F_t *f, H5SM_list_t* list);
+static herr_t H5SM_list_dest(H5F_t *f, H5SM_list_t *list);
 static herr_t H5SM_list_clear(H5F_t *f, H5SM_list_t *list, hbool_t destroy);
 static herr_t H5SM_list_size(const H5F_t *f, const H5SM_list_t H5_ATTR_UNUSED *list, size_t *size_ptr);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -85,18 +81,14 @@ const H5AC_class_t H5AC_SOHM_LIST[1] = {{
     (H5AC_size_func_t)H5SM_list_size,
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_table_load
  *
@@ -114,13 +106,13 @@ static H5SM_master_table_t *
 H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udata)
 {
     H5SM_master_table_t *table = NULL;
-    H5WB_t        *wb = NULL;           /* Wrapped buffer for table data */
-    uint8_t       tbl_buf[H5SM_TBL_BUF_SIZE]; /* Buffer for table */
-    uint8_t       *buf;                 /* Reading buffer */
-    const uint8_t *p;                   /* Pointer into input buffer */
-    uint32_t      stored_chksum;        /* Stored metadata checksum value */
-    uint32_t      computed_chksum;      /* Computed metadata checksum value */
-    size_t        x;                    /* Counter variable for index headers */
+    H5WB_t *             wb    = NULL;               /* Wrapped buffer for table data */
+    uint8_t              tbl_buf[H5SM_TBL_BUF_SIZE]; /* Buffer for table */
+    uint8_t *            buf;                        /* Reading buffer */
+    const uint8_t *      p;                          /* Pointer into input buffer */
+    uint32_t             stored_chksum;              /* Stored metadata checksum value */
+    uint32_t             computed_chksum;            /* Computed metadata checksum value */
+    size_t               x;                          /* Counter variable for index headers */
     H5SM_master_table_t *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -131,8 +123,8 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udat
     HDassert(H5F_SOHM_VERS(f) == HDF5_SHAREDHEADER_VERSION);
 
     /* Allocate space for the master table in memory */
-    if(NULL == (table = H5FL_CALLOC(H5SM_master_table_t)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (table = H5FL_CALLOC(H5SM_master_table_t)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Read number of indexes and version from file superblock */
     table->num_indexes = H5F_SOHM_NINDEXES(f);
@@ -142,7 +134,7 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udat
     HDassert(table->num_indexes > 0);
 
     /* Wrap the local buffer for serialized table info */
-    if(NULL == (wb = H5WB_wrap(tbl_buf, sizeof(tbl_buf))))
+    if (NULL == (wb = H5WB_wrap(tbl_buf, sizeof(tbl_buf))))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, NULL, "can't wrap buffer")
 
     /* Compute the size of the SOHM table header on disk.  This is the "table"
@@ -151,33 +143,34 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udat
     table->table_size = H5SM_TABLE_SIZE(f);
 
     /* Get a pointer to a buffer that's large enough for serialized table */
-    if(NULL == (buf = (uint8_t *)H5WB_actual(wb, table->table_size)))
+    if (NULL == (buf = (uint8_t *)H5WB_actual(wb, table->table_size)))
         HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "can't get actual buffer")
 
     /* Read header from disk */
-    if(H5F_block_read(f, H5FD_MEM_SOHM_TABLE, addr, table->table_size, dxpl_id, buf) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_READERROR, NULL, "can't read SOHM table")
+    if (H5F_block_read(f, H5FD_MEM_SOHM_TABLE, addr, table->table_size, dxpl_id, buf) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_READERROR, NULL, "can't read SOHM table")
 
     /* Get temporary pointer to serialized table */
     p = buf;
 
     /* Check magic number */
-    if(HDmemcmp(p, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, NULL, "bad SOHM table signature")
+    if (HDmemcmp(p, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+        HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, NULL, "bad SOHM table signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Allocate space for the index headers in memory*/
-    if(NULL == (table->indexes = (H5SM_index_header_t *)H5FL_ARR_MALLOC(H5SM_index_header_t, (size_t)table->num_indexes)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed for SOHM indexes")
+    if (NULL == (table->indexes =
+                     (H5SM_index_header_t *)H5FL_ARR_MALLOC(H5SM_index_header_t, (size_t)table->num_indexes)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed for SOHM indexes")
 
     /* Read in the index headers */
-    for(x = 0; x < table->num_indexes; ++x) {
+    for (x = 0; x < table->num_indexes; ++x) {
         /* Verify correct version of index list */
-        if(H5SM_LIST_VERSION != *p++)
+        if (H5SM_LIST_VERSION != *p++)
             HGOTO_ERROR(H5E_SOHM, H5E_VERSION, NULL, "bad shared message list version number")
 
         /* Type of the index (list or B-tree) */
-        table->indexes[x].index_type= (H5SM_index_type_t)*p++;
+        table->indexes[x].index_type = (H5SM_index_type_t)*p++;
 
         /* Type of messages in the index */
         UINT16DECODE(p, table->indexes[x].mesg_types);
@@ -214,7 +207,7 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udat
     computed_chksum = H5_checksum_metadata(buf, (table->table_size - H5SM_SIZEOF_CHECKSUM), 0);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
+    if (stored_chksum != computed_chksum)
         HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, NULL, "incorrect metadata checksum for shared message table")
 
     /* Set return value */
@@ -222,16 +215,15 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udat
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
-    if(!ret_value && table)
-        if(H5SM_table_free(table) < 0)
-	    HDONE_ERROR(H5E_SOHM, H5E_CANTFREE, NULL, "unable to destroy sohm table")
+    if (!ret_value && table)
+        if (H5SM_table_free(table) < 0)
+            HDONE_ERROR(H5E_SOHM, H5E_CANTFREE, NULL, "unable to destroy sohm table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_table_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_table_flush
  *
@@ -250,7 +242,7 @@ H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_ma
 {
     H5WB_t *wb = NULL;                  /* Wrapped buffer for table data */
     uint8_t tbl_buf[H5SM_TBL_BUF_SIZE]; /* Buffer for table */
-    herr_t ret_value = SUCCEED;  /* Return value */
+    herr_t  ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -259,11 +251,11 @@ H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_ma
     HDassert(H5F_addr_defined(addr));
     HDassert(table);
 
-    if(table->cache_info.is_dirty) {
-        uint8_t  *buf;               /* Temporary buffer */
-        uint8_t  *p;                 /* Pointer into raw data buffer */
-        uint32_t computed_chksum;    /* Computed metadata checksum value */
-        size_t   x;                  /* Counter variable */
+    if (table->cache_info.is_dirty) {
+        uint8_t *buf;             /* Temporary buffer */
+        uint8_t *p;               /* Pointer into raw data buffer */
+        uint32_t computed_chksum; /* Computed metadata checksum value */
+        size_t   x;               /* Counter variable */
 
         /* Verify that we're writing version 0 of the table; this is the only
          * version defined so far.
@@ -271,11 +263,11 @@ H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_ma
         HDassert(H5F_SOHM_VERS(f) == HDF5_SHAREDHEADER_VERSION);
 
         /* Wrap the local buffer for serialized header info */
-        if(NULL == (wb = H5WB_wrap(tbl_buf, sizeof(tbl_buf))))
+        if (NULL == (wb = H5WB_wrap(tbl_buf, sizeof(tbl_buf))))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for serialized table */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, table->table_size)))
+        if (NULL == (buf = (uint8_t *)H5WB_actual(wb, table->table_size)))
             HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Get temporary pointer to buffer for serialized table */
@@ -286,7 +278,7 @@ H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_ma
         p += H5_SIZEOF_MAGIC;
 
         /* Encode each index header */
-        for(x = 0; x < table->num_indexes; ++x) {
+        for (x = 0; x < table->num_indexes; ++x) {
             /* Version for this list. */
             *p++ = H5SM_LIST_VERSION;
 
@@ -321,25 +313,24 @@ H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_ma
 
         /* Write the table to disk */
         HDassert((size_t)(p - buf) == table->table_size);
-	if(H5F_block_write(f, H5FD_MEM_SOHM_TABLE, addr, table->table_size, dxpl_id, buf) < 0)
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTFLUSH, FAIL, "unable to save sohm table to disk")
+        if (H5F_block_write(f, H5FD_MEM_SOHM_TABLE, addr, table->table_size, dxpl_id, buf) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTFLUSH, FAIL, "unable to save sohm table to disk")
 
-	table->cache_info.is_dirty = FALSE;
+        table->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5SM_table_dest(f, table) < 0)
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "unable to destroy sohm table")
+    if (destroy)
+        if (H5SM_table_dest(f, table) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "unable to destroy sohm table")
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_table_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_table_dest
  *
@@ -353,9 +344,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_table_dest(H5F_t H5_ATTR_UNUSED *f, H5SM_master_table_t* table)
+H5SM_table_dest(H5F_t H5_ATTR_UNUSED *f, H5SM_master_table_t *table)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -364,14 +355,13 @@ H5SM_table_dest(H5F_t H5_ATTR_UNUSED *f, H5SM_master_table_t* table)
     HDassert(table->indexes);
 
     /* Destroy Shared Object Header Message table */
-    if(H5SM_table_free(table) < 0)
+    if (H5SM_table_free(table) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTRELEASE, FAIL, "unable to free shared message table")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_table_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_table_clear
  *
@@ -387,7 +377,7 @@ done:
 static herr_t
 H5SM_table_clear(H5F_t *f, H5SM_master_table_t *table, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -399,15 +389,14 @@ H5SM_table_clear(H5F_t *f, H5SM_master_table_t *table, hbool_t destroy)
     /* Reset the dirty flag.  */
     table->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5SM_table_dest(f, table) < 0)
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "unable to delete SOHM master table")
+    if (destroy)
+        if (H5SM_table_dest(f, table) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "unable to delete SOHM master table")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_table_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_table_size
  *
@@ -436,7 +425,6 @@ H5SM_table_size(const H5F_t H5_ATTR_UNUSED *f, const H5SM_master_table_t *table,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_table_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_list_load
  *
@@ -452,17 +440,17 @@ H5SM_table_size(const H5F_t H5_ATTR_UNUSED *f, const H5SM_master_table_t *table,
 static H5SM_list_t *
 H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 {
-    H5SM_list_t *list;          /* The SOHM list being read in */
+    H5SM_list_t *         list;                                   /* The SOHM list being read in */
     H5SM_list_cache_ud_t *udata = (H5SM_list_cache_ud_t *)_udata; /* User data for callback */
-    H5SM_bt2_ctx_t ctx;         /* Message encoding context */
-    H5WB_t *wb = NULL;          /* Wrapped buffer for list index data */
-    uint8_t lst_buf[H5SM_LST_BUF_SIZE]; /* Buffer for list index */
-    uint8_t *buf;               /* Reading buffer */
-    uint8_t *p;                 /* Pointer into input buffer */
-    uint32_t stored_chksum;     /* Stored metadata checksum value */
-    uint32_t computed_chksum;   /* Computed metadata checksum value */
-    size_t x;                   /* Counter variable for messages in list */
-    H5SM_list_t *ret_value;     /* Return value */
+    H5SM_bt2_ctx_t        ctx;                                    /* Message encoding context */
+    H5WB_t *              wb = NULL;                              /* Wrapped buffer for list index data */
+    uint8_t               lst_buf[H5SM_LST_BUF_SIZE];             /* Buffer for list index */
+    uint8_t *             buf;                                    /* Reading buffer */
+    uint8_t *             p;                                      /* Pointer into input buffer */
+    uint32_t              stored_chksum;                          /* Stored metadata checksum value */
+    uint32_t              computed_chksum;                        /* Computed metadata checksum value */
+    size_t                x;                                      /* Counter variable for messages in list */
+    H5SM_list_t *         ret_value;                              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -470,40 +458,40 @@ H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     HDassert(udata->header);
 
     /* Allocate space for the SOHM list data structure */
-    if(NULL == (list = H5FL_MALLOC(H5SM_list_t)))
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (list = H5FL_MALLOC(H5SM_list_t)))
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed")
     HDmemset(&list->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Allocate list in memory as an array*/
-    if((list->messages = (H5SM_sohm_t *)H5FL_ARR_MALLOC(H5SM_sohm_t, udata->header->list_max)) == NULL)
-	HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "file allocation failed for SOHM list")
+    if ((list->messages = (H5SM_sohm_t *)H5FL_ARR_MALLOC(H5SM_sohm_t, udata->header->list_max)) == NULL)
+        HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "file allocation failed for SOHM list")
 
     list->header = udata->header;
 
     /* Wrap the local buffer for serialized list index info */
-    if(NULL == (wb = H5WB_wrap(lst_buf, sizeof(lst_buf))))
+    if (NULL == (wb = H5WB_wrap(lst_buf, sizeof(lst_buf))))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, NULL, "can't wrap buffer")
 
     /* Get a pointer to a buffer that's large enough for serialized list index */
-    if(NULL == (buf = (uint8_t *)H5WB_actual(wb, udata->header->list_size)))
+    if (NULL == (buf = (uint8_t *)H5WB_actual(wb, udata->header->list_size)))
         HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "can't get actual buffer")
 
     /* Read list from disk */
-    if(H5F_block_read(f, H5FD_MEM_SOHM_INDEX, addr, udata->header->list_size, dxpl_id, buf) < 0)
-	HGOTO_ERROR(H5E_SOHM, H5E_READERROR, NULL, "can't read SOHM list")
+    if (H5F_block_read(f, H5FD_MEM_SOHM_INDEX, addr, udata->header->list_size, dxpl_id, buf) < 0)
+        HGOTO_ERROR(H5E_SOHM, H5E_READERROR, NULL, "can't read SOHM list")
 
     /* Get temporary pointer to serialized list index */
     p = buf;
 
     /* Check magic number */
-    if(HDmemcmp(p, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+    if (HDmemcmp(p, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, NULL, "bad SOHM list signature")
     p += H5_SIZEOF_MAGIC;
 
     /* Read messages into the list array */
     ctx.sizeof_addr = H5F_SIZEOF_ADDR(udata->f);
-    for(x = 0; x < udata->header->num_messages; x++) {
-        if(H5SM_message_decode(p, &(list->messages[x]), &ctx) < 0)
+    for (x = 0; x < udata->header->num_messages; x++) {
+        if (H5SM_message_decode(p, &(list->messages[x]), &ctx) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, NULL, "can't decode shared message")
         p += H5SM_SOHM_ENTRY_SIZE(udata->f);
     } /* end for */
@@ -518,11 +506,11 @@ H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
     computed_chksum = H5_checksum_metadata(buf, ((size_t)(p - buf) - H5SM_SIZEOF_CHECKSUM), 0);
 
     /* Verify checksum */
-    if(stored_chksum != computed_chksum)
+    if (stored_chksum != computed_chksum)
         HGOTO_ERROR(H5E_SOHM, H5E_BADVALUE, NULL, "incorrect metadata checksum for shared message list")
 
     /* Initialize the rest of the array */
-    for(x = udata->header->num_messages; x < udata->header->list_max; x++)
+    for (x = udata->header->num_messages; x < udata->header->list_max; x++)
         list->messages[x].location = H5SM_NO_LOC;
 
     /* Set return value */
@@ -530,10 +518,10 @@ H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
-    if(!ret_value && list) {
-        if(list->messages)
+    if (!ret_value && list) {
+        if (list->messages)
             list->messages = H5FL_ARR_FREE(H5SM_sohm_t, list->messages);
         list = H5FL_FREE(H5SM_list_t, list);
     } /* end if */
@@ -541,7 +529,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_list_load() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_list_flush
  *
@@ -559,7 +546,7 @@ H5SM_list_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_lis
 {
     H5WB_t *wb = NULL;                  /* Wrapped buffer for list index data */
     uint8_t lst_buf[H5SM_LST_BUF_SIZE]; /* Buffer for list index */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t  ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -569,20 +556,20 @@ H5SM_list_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_lis
     HDassert(list);
     HDassert(list->header);
 
-    if(list->cache_info.is_dirty) {
-        H5SM_bt2_ctx_t ctx;         /* Message encoding context */
-        uint8_t *buf;               /* Temporary buffer */
-        uint8_t *p;                 /* Pointer into raw data buffer */
-        uint32_t computed_chksum;   /* Computed metadata checksum value */
-        size_t mesgs_written;       /* Number of messages written to list */
-        size_t x;                   /* Local index variable */
+    if (list->cache_info.is_dirty) {
+        H5SM_bt2_ctx_t ctx;             /* Message encoding context */
+        uint8_t *      buf;             /* Temporary buffer */
+        uint8_t *      p;               /* Pointer into raw data buffer */
+        uint32_t       computed_chksum; /* Computed metadata checksum value */
+        size_t         mesgs_written;   /* Number of messages written to list */
+        size_t         x;               /* Local index variable */
 
         /* Wrap the local buffer for serialized list index info */
-        if(NULL == (wb = H5WB_wrap(lst_buf, sizeof(lst_buf))))
+        if (NULL == (wb = H5WB_wrap(lst_buf, sizeof(lst_buf))))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
         /* Get a pointer to a buffer that's large enough for serialized list index */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, list->header->list_size)))
+        if (NULL == (buf = (uint8_t *)H5WB_actual(wb, list->header->list_size)))
             HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Get temporary pointer to buffer for serialized list index */
@@ -593,47 +580,46 @@ H5SM_list_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_lis
         p += H5_SIZEOF_MAGIC;
 
         /* Write messages from the messages array to disk */
-        mesgs_written = 0;
+        mesgs_written   = 0;
         ctx.sizeof_addr = H5F_SIZEOF_ADDR(f);
-        for(x = 0; x < list->header->list_max && mesgs_written < list->header->num_messages; x++) {
-            if(list->messages[x].location != H5SM_NO_LOC) {
-                if(H5SM_message_encode(p, &(list->messages[x]), &ctx) < 0)
+        for (x = 0; x < list->header->list_max && mesgs_written < list->header->num_messages; x++) {
+            if (list->messages[x].location != H5SM_NO_LOC) {
+                if (H5SM_message_encode(p, &(list->messages[x]), &ctx) < 0)
                     HGOTO_ERROR(H5E_SOHM, H5E_CANTFLUSH, FAIL, "unable to write shared message to disk")
 
                 p += H5SM_SOHM_ENTRY_SIZE(f);
                 ++mesgs_written;
             } /* end if */
-        } /* end for */
+        }     /* end for */
         HDassert(mesgs_written == list->header->num_messages);
 
         /* Compute checksum on buffer */
         computed_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
         UINT32ENCODE(p, computed_chksum);
 #ifdef H5_CLEAR_MEMORY
-HDmemset(p, 0, (list->header->list_size - (size_t)(p - buf)));
+        HDmemset(p, 0, (list->header->list_size - (size_t)(p - buf)));
 #endif /* H5_CLEAR_MEMORY */
 
         /* Write the list to disk */
         HDassert((size_t)(p - buf) <= list->header->list_size);
-	if(H5F_block_write(f, H5FD_MEM_SOHM_INDEX, addr, list->header->list_size, dxpl_id, buf) < 0)
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTFLUSH, FAIL, "unable to save sohm table to disk")
+        if (H5F_block_write(f, H5FD_MEM_SOHM_INDEX, addr, list->header->list_size, dxpl_id, buf) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTFLUSH, FAIL, "unable to save sohm table to disk")
 
         list->cache_info.is_dirty = FALSE;
     } /* end if */
 
-    if(destroy)
-        if(H5SM_list_dest(f, list) < 0)
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "unable to destroy list")
+    if (destroy)
+        if (H5SM_list_dest(f, list) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "unable to destroy list")
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_SOHM, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_list_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_list_dest
  *
@@ -647,9 +633,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_list_dest(H5F_t *f, H5SM_list_t* list)
+H5SM_list_dest(H5F_t *f, H5SM_list_t *list)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -662,22 +648,22 @@ H5SM_list_dest(H5F_t *f, H5SM_list_t* list)
     HDassert(!list->cache_info.free_file_space_on_destroy || H5F_addr_defined(list->cache_info.addr));
 
     /* Check for freeing file space for shared message index list */
-    if(list->cache_info.free_file_space_on_destroy) {
+    if (list->cache_info.free_file_space_on_destroy) {
         /* Release the space on disk */
         /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_SOHM_INDEX, H5AC_dxpl_id, list->cache_info.addr, (hsize_t)list->header->list_size) < 0)
+        if (H5MF_xfree(f, H5FD_MEM_SOHM_INDEX, H5AC_dxpl_id, list->cache_info.addr,
+                       (hsize_t)list->header->list_size) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "unable to free shared message list")
     } /* end if */
 
     /* Destroy Shared Object Header Message list */
-    if(H5SM_list_free(list) < 0)
+    if (H5SM_list_free(list) < 0)
         HGOTO_ERROR(H5E_SOHM, H5E_CANTRELEASE, FAIL, "unable to free shared message list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_list_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_list_clear
  *
@@ -693,7 +679,7 @@ done:
 static herr_t
 H5SM_list_clear(H5F_t *f, H5SM_list_t *list, hbool_t destroy)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -705,15 +691,14 @@ H5SM_list_clear(H5F_t *f, H5SM_list_t *list, hbool_t destroy)
     /* Reset the dirty flag.  */
     list->cache_info.is_dirty = FALSE;
 
-    if(destroy)
-        if(H5SM_list_dest(f, list) < 0)
-	    HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "unable to destroy SOHM list")
+    if (destroy)
+        if (H5SM_list_dest(f, list) < 0)
+            HGOTO_ERROR(H5E_SOHM, H5E_CANTFREE, FAIL, "unable to destroy SOHM list")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end of H5SM_list_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_list_size
  *
@@ -742,4 +727,3 @@ H5SM_list_size(const H5F_t H5_ATTR_UNUSED *f, const H5SM_list_t *list, size_t *s
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_list_size() */
-
diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c
index f342e28..b143c6a 100644
--- a/src/H5SMmessage.c
+++ b/src/H5SMmessage.c
@@ -15,24 +15,21 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg 	  */
-#define H5SM_PACKAGE		/*suppress error about including H5SMpkg	  */
-
+#define H5O_PACKAGE  /*suppress error about including H5Opkg 	  */
+#define H5SM_PACKAGE /*suppress error about including H5SMpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Opkg.h"             /* Object Headers                       */
-#include "H5SMpkg.h"            /* Shared object header messages        */
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Opkg.h"     /* Object Headers                       */
+#include "H5SMpkg.h"    /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -40,35 +37,29 @@
 /* Udata struct for calls to H5SM_compare_cb and H5SM_compare_iter_op*/
 typedef struct H5SM_compare_udata_t {
     const H5SM_mesg_key_t *key; /* Key; compare this against stored message */
-    H5O_msg_crt_idx_t idx;      /* Index of the message in the OH, if applicable */
-    herr_t ret;                 /* Return value; set this to result of memcmp */
+    H5O_msg_crt_idx_t      idx; /* Index of the message in the OH, if applicable */
+    herr_t                 ret; /* Return value; set this to result of memcmp */
 } H5SM_compare_udata_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 static herr_t H5SM_compare_cb(const void *obj, size_t obj_len, void *udata);
-static herr_t H5SM_compare_iter_op(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence,
-    unsigned *oh_modified, void *udata);
-
+static herr_t H5SM_compare_iter_op(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence, unsigned *oh_modified,
+                                   void *udata);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_compare_cb
  *
@@ -93,9 +84,9 @@ H5SM_compare_cb(const void *obj, size_t obj_len, void *_udata)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* If the encoding sizes are different, it's not the same object */
-    if(udata->key->encoding_size > obj_len)
+    if (udata->key->encoding_size > obj_len)
         udata->ret = 1;
-    else if(udata->key->encoding_size < obj_len)
+    else if (udata->key->encoding_size < obj_len)
         udata->ret = -1;
     else
         /* Sizes are the same.  Return result of memcmp */
@@ -104,7 +95,6 @@ H5SM_compare_cb(const void *obj, size_t obj_len, void *_udata)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_compare_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_compare_iter_op
  *
@@ -126,11 +116,11 @@ H5SM_compare_cb(const void *obj, size_t obj_len, void *_udata)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_compare_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
-    unsigned H5_ATTR_UNUSED *oh_modified, void *_udata/*in,out*/)
+H5SM_compare_iter_op(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence,
+                     unsigned H5_ATTR_UNUSED *oh_modified, void *_udata /*in,out*/)
 {
-    H5SM_compare_udata_t *udata = (H5SM_compare_udata_t *) _udata;
-    herr_t ret_value = H5_ITER_CONT;
+    H5SM_compare_udata_t *udata     = (H5SM_compare_udata_t *)_udata;
+    herr_t                ret_value = H5_ITER_CONT;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -142,21 +132,22 @@ H5SM_compare_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
     HDassert(udata && udata->key);
 
     /* Check the creation index for this message */
-    if(sequence == udata->idx) {
+    if (sequence == udata->idx) {
         size_t aligned_encoded_size = H5O_ALIGN_OH(oh, udata->key->encoding_size);
 
         /* Sanity check the message's length */
         HDassert(mesg->raw_size > 0);
 
-        if(aligned_encoded_size > mesg->raw_size)
+        if (aligned_encoded_size > mesg->raw_size)
             udata->ret = 1;
-        else if(aligned_encoded_size < mesg->raw_size)
+        else if (aligned_encoded_size < mesg->raw_size)
             udata->ret = -1;
         else {
             /* Check if the message is dirty & flush it to the object header if so */
-            if(mesg->dirty)
-                if(H5O_msg_flush(udata->key->file, oh, mesg) < 0)
-                    HGOTO_ERROR(H5E_SOHM, H5E_CANTENCODE, H5_ITER_ERROR, "unable to encode object header message")
+            if (mesg->dirty)
+                if (H5O_msg_flush(udata->key->file, oh, mesg) < 0)
+                    HGOTO_ERROR(H5E_SOHM, H5E_CANTENCODE, H5_ITER_ERROR,
+                                "unable to encode object header message")
 
             HDassert(udata->key->encoding_size <= mesg->raw_size);
             udata->ret = HDmemcmp(udata->key->encoding, mesg->raw, udata->key->encoding_size);
@@ -170,7 +161,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_compare_iter_op() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_message_compare
  *
@@ -190,9 +180,9 @@ done:
 herr_t
 H5SM_message_compare(const void *rec1, const void *rec2, int *result)
 {
-    const H5SM_mesg_key_t *key = (const H5SM_mesg_key_t *) rec1;
-    const H5SM_sohm_t *mesg = (const H5SM_sohm_t *) rec2;
-    herr_t ret_value = SUCCEED;
+    const H5SM_mesg_key_t *key       = (const H5SM_mesg_key_t *)rec1;
+    const H5SM_sohm_t *    mesg      = (const H5SM_sohm_t *)rec2;
+    herr_t                 ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -202,25 +192,25 @@ H5SM_message_compare(const void *rec1, const void *rec2, int *result)
      * Likewise, if the message has an OH location that is matched by the
      * message in the index, we've found the message.
      */
-    if(mesg->location == H5SM_IN_HEAP && key->message.location == H5SM_IN_HEAP) {
-        if(key->message.u.heap_loc.fheap_id.val == mesg->u.heap_loc.fheap_id.val) {
+    if (mesg->location == H5SM_IN_HEAP && key->message.location == H5SM_IN_HEAP) {
+        if (key->message.u.heap_loc.fheap_id.val == mesg->u.heap_loc.fheap_id.val) {
             *result = 0;
             HGOTO_DONE(SUCCEED);
         }
     } /* end if */
-    else if(mesg->location == H5SM_IN_OH && key->message.location == H5SM_IN_OH) {
-        if(key->message.u.mesg_loc.oh_addr == mesg->u.mesg_loc.oh_addr &&
-           key->message.u.mesg_loc.index == mesg->u.mesg_loc.index &&
-           key->message.msg_type_id == mesg->msg_type_id) {
+    else if (mesg->location == H5SM_IN_OH && key->message.location == H5SM_IN_OH) {
+        if (key->message.u.mesg_loc.oh_addr == mesg->u.mesg_loc.oh_addr &&
+            key->message.u.mesg_loc.index == mesg->u.mesg_loc.index &&
+            key->message.msg_type_id == mesg->msg_type_id) {
             *result = 0;
             HGOTO_DONE(SUCCEED);
         }
     } /* end if */
 
     /* Compare hash values */
-    if(key->message.hash > mesg->hash)
+    if (key->message.hash > mesg->hash)
         *result = 1;
-    else if(key->message.hash < mesg->hash)
+    else if (key->message.hash < mesg->hash)
         *result = -1;
     /* If the hash values match, make sure the messages are really the same */
     else {
@@ -238,21 +228,21 @@ H5SM_message_compare(const void *rec1, const void *rec2, int *result)
         /* Compare the encoded message with either the message in the heap or
          * the message in an object header.
          */
-        if(mesg->location == H5SM_IN_HEAP) {
+        if (mesg->location == H5SM_IN_HEAP) {
             /* Call heap op routine with comparison callback */
-            if(H5HF_op(key->fheap, key->dxpl_id, &(mesg->u.heap_loc.fheap_id), H5SM_compare_cb, &udata) < 0)
+            if (H5HF_op(key->fheap, key->dxpl_id, &(mesg->u.heap_loc.fheap_id), H5SM_compare_cb, &udata) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
         } /* end if */
         else {
-            H5O_loc_t oloc;             /* Object owning the message */
-            H5O_mesg_operator_t op;             /* Message operator */
+            H5O_loc_t           oloc; /* Object owning the message */
+            H5O_mesg_operator_t op;   /* Message operator */
 
             /* Sanity checks */
             HDassert(key->file);
             HDassert(mesg->location == H5SM_IN_OH);
 
             /* Reset the object location */
-            if(H5O_loc_reset(&oloc) < 0)
+            if (H5O_loc_reset(&oloc) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize target location")
 
             /* Set up object location */
@@ -263,9 +253,9 @@ H5SM_message_compare(const void *rec1, const void *rec2, int *result)
             udata.idx = mesg->u.mesg_loc.index;
 
             /* Locate the right message and compare with it */
-            op.op_type = H5O_MESG_OP_LIB;
+            op.op_type  = H5O_MESG_OP_LIB;
             op.u.lib_op = H5SM_compare_iter_op;
-            if(H5O_msg_iterate(&oloc, mesg->msg_type_id, &op, &udata, key->dxpl_id) < 0)
+            if (H5O_msg_iterate(&oloc, mesg->msg_type_id, &op, &udata, key->dxpl_id) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "error iterating over links")
         } /* end else */
 
@@ -276,7 +266,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_message_compare */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_message_encode
  *
@@ -293,7 +282,7 @@ done:
 herr_t
 H5SM_message_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 {
-    H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx;       /* Callback context structure */
+    H5SM_bt2_ctx_t *   ctx     = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */
     const H5SM_sohm_t *message = (const H5SM_sohm_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -304,14 +293,14 @@ H5SM_message_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
     *raw++ = (uint8_t)message->location;
     UINT32ENCODE(raw, message->hash);
 
-    if(message->location == H5SM_IN_HEAP) {
+    if (message->location == H5SM_IN_HEAP) {
         UINT32ENCODE(raw, message->u.heap_loc.ref_count);
         HDmemcpy(raw, message->u.heap_loc.fheap_id.id, (size_t)H5O_FHEAP_ID_LEN);
     } /* end if */
     else {
         HDassert(message->location == H5SM_IN_OH);
 
-        *raw++ = 0;     /* reserved (possible flags byte) */
+        *raw++ = 0; /* reserved (possible flags byte) */
         *raw++ = (uint8_t)message->msg_type_id;
         UINT16ENCODE(raw, message->u.mesg_loc.index);
         H5F_addr_encode_len((size_t)ctx->sizeof_addr, &raw, message->u.mesg_loc.oh_addr);
@@ -320,7 +309,6 @@ H5SM_message_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_message_encode */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5SM_message_decode
  *
@@ -337,22 +325,22 @@ H5SM_message_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
 herr_t
 H5SM_message_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
 {
-    H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx;       /* Callback context structure */
-    H5SM_sohm_t *message = (H5SM_sohm_t *)_nrecord;
+    H5SM_bt2_ctx_t *ctx     = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */
+    H5SM_sohm_t *   message = (H5SM_sohm_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     message->location = (H5SM_storage_loc_t)*raw++;
     UINT32DECODE(raw, message->hash);
 
-    if(message->location == H5SM_IN_HEAP) {
+    if (message->location == H5SM_IN_HEAP) {
         UINT32DECODE(raw, message->u.heap_loc.ref_count);
         HDmemcpy(message->u.heap_loc.fheap_id.id, raw, (size_t)H5O_FHEAP_ID_LEN);
     } /* end if */
     else {
         HDassert(message->location == H5SM_IN_OH);
 
-        raw++;          /* reserved */
+        raw++; /* reserved */
         message->msg_type_id = *raw++;
         UINT16DECODE(raw, message->u.mesg_loc.index);
         H5F_addr_decode_len((size_t)ctx->sizeof_addr, &raw, &message->u.mesg_loc.oh_addr);
@@ -360,4 +348,3 @@ H5SM_message_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_message_decode */
-
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h
index 374841c..a0aa3e7 100644
--- a/src/H5SMpkg.h
+++ b/src/H5SMpkg.h
@@ -27,13 +27,12 @@
 #define _H5SMpkg_H
 
 /* Get package's private header */
-#include "H5SMprivate.h"	/* Shared Object Header Messages	*/
+#include "H5SMprivate.h" /* Shared Object Header Messages	*/
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"        /* Metadata Cache		  	*/
-#include "H5B2private.h"        /* B-trees                              */
-#include "H5HFprivate.h"        /* Fractal heaps		  	*/
-
+#include "H5ACprivate.h" /* Metadata Cache		  	*/
+#include "H5B2private.h" /* B-trees                              */
+#include "H5HFprivate.h" /* Fractal heaps		  	*/
 
 /****************************/
 /* Package Macros           */
@@ -42,61 +41,59 @@
 /* Size of checksum information (on disk) */
 #define H5SM_SIZEOF_CHECKSUM 4
 
-#define H5SM_HEAP_LOC_SIZE (                                                  \
-        (unsigned)4                     /* Reference count */                 \
-        + sizeof(H5O_fheap_id_t)        /* size of heap ID on disk */         \
+#define H5SM_HEAP_LOC_SIZE                                                                                   \
+    ((unsigned)4              /* Reference count */                                                          \
+     + sizeof(H5O_fheap_id_t) /* size of heap ID on disk */                                                  \
     )
 
-#define H5SM_OH_LOC_SIZE(f) (                                                 \
-        (unsigned)1             /* reserved (possible flags?) */              \
-        + (unsigned)1           /* message type ID */			      \
-        + (unsigned)2           /* creation index of message in OH */         \
-        + H5F_SIZEOF_ADDR(f)    /* address of OH */                           \
+#define H5SM_OH_LOC_SIZE(f)                                                                                  \
+    ((unsigned)1          /* reserved (possible flags?) */                                                   \
+     + (unsigned)1        /* message type ID */                                                              \
+     + (unsigned)2        /* creation index of message in OH */                                              \
+     + H5F_SIZEOF_ADDR(f) /* address of OH */                                                                \
     )
 
-#define H5SM_SOHM_ENTRY_SIZE(f) (                                             \
-        (unsigned)1             /* Message location */                        \
-        + (unsigned)4           /* Hash value */                              \
-        + MAX(H5SM_HEAP_LOC_SIZE, H5SM_OH_LOC_SIZE(f))  /* Entry */           \
+#define H5SM_SOHM_ENTRY_SIZE(f)                                                                              \
+    ((unsigned)1                                    /* Message location */                                   \
+     + (unsigned)4                                  /* Hash value */                                         \
+     + MAX(H5SM_HEAP_LOC_SIZE, H5SM_OH_LOC_SIZE(f)) /* Entry */                                              \
     )
 
-#define H5SM_INDEX_HEADER_SIZE(f) (                                           \
-        (unsigned)1             /* Whether index is a list or B-tree */       \
-        + (unsigned)1           /* Version of index format */                 \
-        + (unsigned)2           /* Type of messages stored in the index */    \
-        + (unsigned)4           /* Minimum size of messages to share */       \
-        + (unsigned)(3 * 2)     /* B-tree cutoff, list cutoff, # of shared messages */ \
-        + H5F_SIZEOF_ADDR(f)    /* Location of list or B-tree */              \
-        + H5F_SIZEOF_ADDR(f)    /* Address of heap */                         \
+#define H5SM_INDEX_HEADER_SIZE(f)                                                                            \
+    ((unsigned)1          /* Whether index is a list or B-tree */                                            \
+     + (unsigned)1        /* Version of index format */                                                      \
+     + (unsigned)2        /* Type of messages stored in the index */                                         \
+     + (unsigned)4        /* Minimum size of messages to share */                                            \
+     + (unsigned)(3 * 2)  /* B-tree cutoff, list cutoff, # of shared messages */                             \
+     + H5F_SIZEOF_ADDR(f) /* Location of list or B-tree */                                                   \
+     + H5F_SIZEOF_ADDR(f) /* Address of heap */                                                              \
     )
 
 /* Format overhead for all SOHM tree metadata in the file */
-#define H5SM_METADATA_PREFIX_SIZE (                                           \
-    H5_SIZEOF_MAGIC             /* Signature */                               \
-    + H5SM_SIZEOF_CHECKSUM      /* Checksum */                                \
-    )
-
-#define H5SM_TABLE_SIZE(f) (                                                  \
-    /* General metadata fields */                                             \
-    H5SM_METADATA_PREFIX_SIZE                                                 \
-                                                                              \
-    /* Indices */                                                             \
-    + (H5F_SOHM_NINDEXES(f) * H5SM_INDEX_HEADER_SIZE(f))                      \
+#define H5SM_METADATA_PREFIX_SIZE                                                                            \
+    (H5_SIZEOF_MAGIC        /* Signature */                                                                  \
+     + H5SM_SIZEOF_CHECKSUM /* Checksum */                                                                   \
     )
 
-#define H5SM_LIST_SIZE(f, num_mesg) (                                         \
-    /* General metadata fields */                                             \
-    H5SM_METADATA_PREFIX_SIZE                                                 \
-                                                                              \
-    /* Message entries */                                                     \
-    + (H5SM_SOHM_ENTRY_SIZE(f) * num_mesg)                                    \
-    )
-
-#define H5SM_B2_NODE_SIZE 512
+#define H5SM_TABLE_SIZE(f)                                                                                   \
+    (/* General metadata fields */                                                                           \
+     H5SM_METADATA_PREFIX_SIZE                                                                               \
+                                                                                                             \
+     /* Indices */                                                                                           \
+     + (H5F_SOHM_NINDEXES(f) * H5SM_INDEX_HEADER_SIZE(f)))
+
+#define H5SM_LIST_SIZE(f, num_mesg)                                                                          \
+    (/* General metadata fields */                                                                           \
+     H5SM_METADATA_PREFIX_SIZE                                                                               \
+                                                                                                             \
+     /* Message entries */                                                                                   \
+     + (H5SM_SOHM_ENTRY_SIZE(f) * num_mesg))
+
+#define H5SM_B2_NODE_SIZE     512
 #define H5SM_B2_SPLIT_PERCENT 100
 #define H5SM_B2_MERGE_PERCENT 40
 
-#define H5SM_LIST_VERSION	0	/* Verion of Shared Object Header Message List Indexes */
+#define H5SM_LIST_VERSION 0 /* Verion of Shared Object Header Message List Indexes */
 
 /****************************/
 /* Package Typedefs         */
@@ -132,49 +129,49 @@
 
 /* Where a message is stored */
 typedef enum {
-    H5SM_NO_LOC = -1,
-    H5SM_IN_HEAP = 0,    	/* Message is stored in the heap */
-    H5SM_IN_OH    		/* Message is stored in an object header */
+    H5SM_NO_LOC  = -1,
+    H5SM_IN_HEAP = 0, /* Message is stored in the heap */
+    H5SM_IN_OH        /* Message is stored in an object header */
 } H5SM_storage_loc_t;
 
 /* Typedef for a record's location if it's stored in the heap */
 typedef struct {
-    hsize_t ref_count;		/* Number of times this message is used in the file */
-    H5O_fheap_id_t fheap_id;    /* ID of the OHM in the fractal heap */
+    hsize_t        ref_count; /* Number of times this message is used in the file */
+    H5O_fheap_id_t fheap_id;  /* ID of the OHM in the fractal heap */
 } H5SM_heap_loc_t;
 
 /* Typedef for a SOHM index node */
 typedef struct {
-    H5SM_storage_loc_t location;        /* Type of message location */
-    uint32_t hash;		        /* Hash value for encoded OHM */
-    unsigned msg_type_id;               /* Message's type ID */
+    H5SM_storage_loc_t location;    /* Type of message location */
+    uint32_t           hash;        /* Hash value for encoded OHM */
+    unsigned           msg_type_id; /* Message's type ID */
     union {
-        H5O_mesg_loc_t mesg_loc;        /* Location of message in object header */
-        H5SM_heap_loc_t heap_loc;       /* Heap ID for message in SOHM heap */
+        H5O_mesg_loc_t  mesg_loc; /* Location of message in object header */
+        H5SM_heap_loc_t heap_loc; /* Heap ID for message in SOHM heap */
     } u;
 } H5SM_sohm_t;
 
 /* Types of message indices */
 typedef enum {
     H5SM_BADTYPE = -1,
-    H5SM_LIST,    		/* Index is an unsorted list */
-    H5SM_BTREE    		/* Index is a sorted B-tree */
+    H5SM_LIST, /* Index is an unsorted list */
+    H5SM_BTREE /* Index is a sorted B-tree */
 } H5SM_index_type_t;
 
 /* Typedef for a SOHM index header */
 typedef struct {
-/* Stored */
-    unsigned mesg_types;	/* Bit flag vector of message types */
-    size_t min_mesg_size;	/* number of messages being tracked */
-    size_t list_max;		/* >= this many messages, index with a B-tree */
-    size_t btree_min;		/* <= this many messages, index with a list again */
-    size_t num_messages;	/* number of messages being tracked */
-    H5SM_index_type_t index_type; /* Is the index a list or a B-tree? */
-    haddr_t index_addr;		/* Address of the actual index (list or B-tree) */
-    haddr_t heap_addr;		/* Address of the fheap used to store shared messages */
-
-/* Not stored */
-    size_t list_size;           /* Size of list index on disk */
+    /* Stored */
+    unsigned          mesg_types;    /* Bit flag vector of message types */
+    size_t            min_mesg_size; /* number of messages being tracked */
+    size_t            list_max;      /* >= this many messages, index with a B-tree */
+    size_t            btree_min;     /* <= this many messages, index with a list again */
+    size_t            num_messages;  /* number of messages being tracked */
+    H5SM_index_type_t index_type;    /* Is the index a list or a B-tree? */
+    haddr_t           index_addr;    /* Address of the actual index (list or B-tree) */
+    haddr_t           heap_addr;     /* Address of the fheap used to store shared messages */
+
+    /* Not stored */
+    size_t list_size; /* Size of list index on disk */
 } H5SM_index_header_t;
 
 /* Typedef for a SOHM list */
@@ -182,8 +179,8 @@ typedef struct {
     /* Information for H5AC cache functions, _must_ be first field in structure */
     H5AC_info_t cache_info;
 
-    H5SM_index_header_t *header;    /* Pointer to the corresponding index header */
-    H5SM_sohm_t *messages;          /* Actual list, stored as an array */
+    H5SM_index_header_t *header;   /* Pointer to the corresponding index header */
+    H5SM_sohm_t *        messages; /* Actual list, stored as an array */
 } H5SM_list_t;
 
 /* Typedef for shared object header message master table */
@@ -191,21 +188,21 @@ struct H5SM_master_table_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
     H5AC_info_t cache_info;
 
-    size_t table_size;              /* Size of table on disk */
-    unsigned num_indexes;           /* Number of indexes */
-    H5SM_index_header_t *indexes;   /* Array of num_indexes indexes */
+    size_t               table_size;  /* Size of table on disk */
+    unsigned             num_indexes; /* Number of indexes */
+    H5SM_index_header_t *indexes;     /* Array of num_indexes indexes */
 };
 
 /* Typedef for searching an index (list or B-tree) */
 typedef struct {
-    H5F_t *file;                        /* File in which sharing is happening */
-    hid_t dxpl_id;                      /* DXPL for sharing messages in heap */
-    H5HF_t *fheap;    			/* The heap for this message type, open. */
-    void *encoding; 		        /* The message encoded, or NULL */
-    size_t encoding_size; 		/* Size of the encoding, or 0 */
-    H5SM_sohm_t message;                /* The message to find/insert.
-                                         * If the message doesn't yet have a
-                                         * heap ID, the heap ID will be 0. */
+    H5F_t *     file;          /* File in which sharing is happening */
+    hid_t       dxpl_id;       /* DXPL for sharing messages in heap */
+    H5HF_t *    fheap;         /* The heap for this message type, open. */
+    void *      encoding;      /* The message encoded, or NULL */
+    size_t      encoding_size; /* Size of the encoding, or 0 */
+    H5SM_sohm_t message;       /* The message to find/insert.
+                                * If the message doesn't yet have a
+                                * heap ID, the heap ID will be 0. */
 } H5SM_mesg_key_t;
 
 /*
@@ -214,36 +211,35 @@ typedef struct {
  */
 typedef struct {
     /* downward (internal) */
-    unsigned    type_id;                /* Message type */
+    unsigned type_id; /* Message type */
 
     /* upward */
-    uint32_t    hash;                   /* Hash value */
+    uint32_t hash; /* Hash value */
 } H5SM_fh_ud_gh_t;
 
 /* Typedef to increment a reference count in the B-tree */
 typedef struct {
-    H5SM_mesg_key_t *key;       /* IN: key for message being incremented */
-    H5O_fheap_id_t fheap_id;    /* OUT: fheap ID of record */
-    hid_t dxpl_id;
+    H5SM_mesg_key_t *key;      /* IN: key for message being incremented */
+    H5O_fheap_id_t   fheap_id; /* OUT: fheap ID of record */
+    hid_t            dxpl_id;
 } H5SM_incr_ref_opdata;
 
 /* v2 B-tree client callback context */
 typedef struct H5SM_bt2_ctx_t {
-    uint8_t     sizeof_addr;    /* Size of file addresses */
+    uint8_t sizeof_addr; /* Size of file addresses */
 } H5SM_bt2_ctx_t;
 
 /* Callback info for loading a shared message table index into the cache */
 typedef struct H5SM_table_cache_ud_t {
-    H5F_t *f;                   /* File that shared message index stored as a table is in */
+    H5F_t *f; /* File that shared message index stored as a table is in */
 } H5SM_table_cache_ud_t;
 
 /* Callback info for loading a shared message list index into the cache */
 typedef struct H5SM_list_cache_ud_t {
-    H5F_t *f;                   /* File that shared message index stored as a table is in */
+    H5F_t *              f;      /* File that shared message index stored as a table is in */
     H5SM_index_header_t *header; /* Index header for this list */
 } H5SM_list_cache_ud_t;
 
-
 /****************************/
 /* Package Variables        */
 /****************************/
@@ -271,7 +267,7 @@ H5_DLL herr_t H5SM_message_encode(uint8_t *raw, const void *native, void *ctx);
 H5_DLL herr_t H5SM_message_decode(const uint8_t *raw, void *native, void *ctx);
 
 /* H5B2_remove_t callback to add messages to a list index */
-H5_DLL herr_t H5SM_bt2_convert_to_list_op(const void * record, void *op_data);
+H5_DLL herr_t H5SM_bt2_convert_to_list_op(const void *record, void *op_data);
 
 /* Fractal heap 'op' callback to compute hash value for message "in place" */
 H5_DLL herr_t H5SM_get_hash_fh_cb(const void *obj, size_t obj_len, void *_udata);
@@ -282,9 +278,7 @@ herr_t H5SM_list_free(H5SM_list_t *list);
 
 /* Testing functions */
 #ifdef H5SM_TESTING
-H5_DLL herr_t H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
-    size_t *mesg_count);
+H5_DLL herr_t H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id, size_t *mesg_count);
 #endif /* H5SM_TESTING */
 
 #endif /* _H5SMpkg_H */
-
diff --git a/src/H5SMprivate.h b/src/H5SMprivate.h
index 4803e4b..8f694b6 100644
--- a/src/H5SMprivate.h
+++ b/src/H5SMprivate.h
@@ -21,8 +21,8 @@
 #ifndef _H5SMprivate_H
 #define _H5SMprivate_H
 
-#include "H5Oprivate.h"		/* Object headers			*/
-#include "H5Pprivate.h"		/* Property lists			*/
+#include "H5Oprivate.h" /* Object headers			*/
+#include "H5Pprivate.h" /* Property lists			*/
 
 /**************************/
 /* Library Private Macros */
@@ -30,9 +30,9 @@
 
 /* Flags for the "defer_flags" argument to H5SM_try_share
  */
-#define H5SM_DEFER              0x01u   /* Don't actually write shared message to index, heap; just update shared info */
-#define H5SM_WAS_DEFERRED       0x02u   /* Message was previously updated by a call to H5SM_try_share with H5SM_DEFER */
-
+#define H5SM_DEFER 0x01u /* Don't actually write shared message to index, heap; just update shared info */
+#define H5SM_WAS_DEFERRED                                                                                    \
+    0x02u /* Message was previously updated by a call to H5SM_try_share with H5SM_DEFER */
 
 /****************************/
 /* Library Private Typedefs */
@@ -41,38 +41,30 @@
 /* Forward references of package typedefs */
 typedef struct H5SM_master_table_t H5SM_master_table_t;
 
-
 /******************************/
 /* Library Private Prototypes */
 /******************************/
 
 /* Generally useful shared message routines */
-H5_DLL herr_t H5SM_init(H5F_t *f, H5P_genplist_t *fc_plist,
-    const H5O_loc_t *ext_loc, hid_t dxpl_id);
-H5_DLL htri_t H5SM_can_share(H5F_t *f, hid_t dxpl_id, H5SM_master_table_t *table,
-    ssize_t *sohm_index_num, unsigned type_id, const void *mesg);
-H5_DLL htri_t H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    unsigned defer_flags, unsigned type_id, void *mesg, unsigned *mesg_flags);
-H5_DLL herr_t H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    H5O_shared_t *sh_mesg);
-H5_DLL herr_t H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist,
-    hid_t dxpl_id);
+H5_DLL herr_t H5SM_init(H5F_t *f, H5P_genplist_t *fc_plist, const H5O_loc_t *ext_loc, hid_t dxpl_id);
+H5_DLL htri_t H5SM_can_share(H5F_t *f, hid_t dxpl_id, H5SM_master_table_t *table, ssize_t *sohm_index_num,
+                             unsigned type_id, const void *mesg);
+H5_DLL htri_t H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned defer_flags, unsigned type_id,
+                             void *mesg, unsigned *mesg_flags);
+H5_DLL herr_t H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg);
+H5_DLL herr_t H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id);
 H5_DLL htri_t H5SM_type_shared(H5F_t *f, unsigned type_id, hid_t dxpl_id);
-H5_DLL herr_t H5SM_get_fheap_addr(H5F_t *f, hid_t dxpl_id, unsigned type_id,
-    haddr_t *fheap_addr);
-H5_DLL herr_t H5SM_reconstitute(H5O_shared_t *sh_mesg, H5F_t *f,
-    unsigned msg_type_id, H5O_fheap_id_t heap_id);
-H5_DLL herr_t H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
-    const H5O_shared_t *sh_mesg, hsize_t *ref_count);
+H5_DLL herr_t H5SM_get_fheap_addr(H5F_t *f, hid_t dxpl_id, unsigned type_id, haddr_t *fheap_addr);
+H5_DLL herr_t H5SM_reconstitute(H5O_shared_t *sh_mesg, H5F_t *f, unsigned msg_type_id,
+                                H5O_fheap_id_t heap_id);
+H5_DLL herr_t H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id, const H5O_shared_t *sh_mesg,
+                                hsize_t *ref_count);
 H5_DLL herr_t H5SM_ih_size(H5F_t *f, hid_t dxpl_id, H5F_info_t *bh_info);
 
-
 /* Debugging routines */
-H5_DLL herr_t H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr,
-    FILE *stream, int indent, int fwidth, unsigned table_vers,
-    unsigned num_indexes);
-H5_DLL herr_t H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr,
-    FILE *stream, int indent, int fwidth, unsigned list_vers, size_t num_messages);
+H5_DLL herr_t H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr, FILE *stream, int indent,
+                               int fwidth, unsigned table_vers, unsigned num_indexes);
+H5_DLL herr_t H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr, FILE *stream, int indent,
+                              int fwidth, unsigned list_vers, size_t num_messages);
 
 #endif /*_H5SMprivate_H*/
-
diff --git a/src/H5SMtest.c b/src/H5SMtest.c
index 05382d9..52fe5e5 100644
--- a/src/H5SMtest.c
+++ b/src/H5SMtest.c
@@ -15,52 +15,43 @@
 /* Module Setup */
 /****************/
 
-#define H5SM_PACKAGE		/*suppress error about including H5SMpkg	  */
-#define H5SM_TESTING		/*suppress warning about H5SM testing funcs*/
-
+#define H5SM_PACKAGE /*suppress error about including H5SMpkg	  */
+#define H5SM_TESTING /*suppress warning about H5SM testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access                          */
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5SMpkg.h"            /* Shared object header messages        */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access                          */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5SMpkg.h"     /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5SM_get_mesg_count_test
  *
@@ -74,11 +65,10 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
-    size_t *mesg_count)
+H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id, size_t *mesg_count)
 {
-    H5SM_master_table_t *table = NULL;  /* SOHM master table */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5SM_master_table_t *table     = NULL;    /* SOHM master table */
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -87,20 +77,21 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     HDassert(mesg_count);
 
     /* Check for shared messages being enabled */
-    if(H5F_addr_defined(H5F_SOHM_ADDR(f))) {
-        H5SM_index_header_t *header;        /* Index header for message type */
-        H5SM_table_cache_ud_t cache_udata;  /* User-data for callback */
-        ssize_t index_num;                  /* Table index for message type */
+    if (H5F_addr_defined(H5F_SOHM_ADDR(f))) {
+        H5SM_index_header_t * header;      /* Index header for message type */
+        H5SM_table_cache_ud_t cache_udata; /* User-data for callback */
+        ssize_t               index_num;   /* Table index for message type */
 
         /* Set up user data for callback */
         cache_udata.f = f;
 
         /* Look up the master SOHM table */
-        if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
+        if (NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE,
+                                                                 H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
         /* Find the correct index for this message type */
-        if((index_num = H5SM_get_index(table, type_id)) < 0)
+        if ((index_num = H5SM_get_index(table, type_id)) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_NOTFOUND, FAIL, "unable to find correct SOHM index")
         header = &(table->indexes[index_num]);
 
@@ -113,9 +104,8 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
 
 done:
     /* Release resources */
-    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
+    if (table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SM_get_mesg_count_test() */
-
diff --git a/src/H5ST.c b/src/H5ST.c
index 4bc096a..1823da6 100644
--- a/src/H5ST.c
+++ b/src/H5ST.c
@@ -16,10 +16,9 @@
 Bentley and Robert Sedgewick in the April, 1998, Dr. Dobb's Journal.
 */
 
-
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists                           */
-#include "H5STprivate.h"        /* Ternary search trees                 */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free lists                           */
+#include "H5STprivate.h" /* Ternary search trees                 */
 
 /* Declare a free list to manage the H5ST_node_t struct */
 H5FL_DEFINE_STATIC(H5ST_node_t);
@@ -27,7 +26,6 @@ H5FL_DEFINE_STATIC(H5ST_node_t);
 /* Declare a free list to manage the H5ST_tree_t struct */
 H5FL_DEFINE_STATIC(H5ST_tree_t);
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_create
@@ -48,12 +46,12 @@ H5FL_DEFINE_STATIC(H5ST_tree_t);
 H5ST_tree_t *
 H5ST_create(void)
 {
-    H5ST_tree_t *ret_value;   /* Return value */
+    H5ST_tree_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Allocate wrapper for TST */
-    if(NULL == (ret_value = H5FL_MALLOC(H5ST_tree_t)))
+    if (NULL == (ret_value = H5FL_MALLOC(H5ST_tree_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set the internal fields */
@@ -63,7 +61,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_create() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_close_internal
@@ -88,9 +85,9 @@ H5ST_close_internal(H5ST_ptr_t p)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Recursively free TST */
-    if(p) {
+    if (p) {
         H5ST_close_internal(p->lokid);
-        if(p->splitchar)
+        if (p->splitchar)
             H5ST_close_internal(p->eqkid);
         H5ST_close_internal(p->hikid);
         p = H5FL_FREE(H5ST_node_t, p);
@@ -99,7 +96,6 @@ H5ST_close_internal(H5ST_ptr_t p)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5ST_close_internal() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_close
@@ -121,16 +117,16 @@ H5ST_close_internal(H5ST_ptr_t p)
 herr_t
 H5ST_close(H5ST_tree_t *tree)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    if(NULL == tree)
+    if (NULL == tree)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid TST")
 
     /* Free the TST itself */
-    if(H5ST_close_internal(tree->root) < 0)
+    if (H5ST_close_internal(tree->root) < 0)
         HGOTO_ERROR(H5E_TST, H5E_CANTFREE, FAIL, "can't free TST")
 
     /* Free root node itself */
@@ -140,7 +136,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_close() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_insert
@@ -164,61 +159,60 @@ done:
 herr_t
 H5ST_insert(H5ST_tree_t *tree, const char *s, void *obj)
 {
-    int d;                      /* Comparison value */
-    H5ST_ptr_t pp, *p;          /* Pointer to current node and pointer to that */
-    H5ST_ptr_t parent=NULL;     /* Pointer to parent node */
-    H5ST_ptr_t up=NULL;         /* Pointer to up node */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    int        d;                   /* Comparison value */
+    H5ST_ptr_t pp, *p;              /* Pointer to current node and pointer to that */
+    H5ST_ptr_t parent    = NULL;    /* Pointer to parent node */
+    H5ST_ptr_t up        = NULL;    /* Pointer to up node */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Find the correct location to insert object */
     p = &tree->root;
-    while((pp = *p)) {
+    while ((pp = *p)) {
         /* If this node matches the character in the key, then drop down to the lower tree */
-        if(0 == (d = *s - pp->splitchar)) {
-            if(*s++ == 0)
+        if (0 == (d = *s - pp->splitchar)) {
+            if (*s++ == 0)
                 HGOTO_ERROR(H5E_TST, H5E_EXISTS, FAIL, "key already in tree")
-            up=pp;
-            p = &(pp->eqkid);
+            up = pp;
+            p  = &(pp->eqkid);
         } /* end if */
         else {
             /* Walk through the current tree, searching for the matching character */
             parent = pp;
-            if(d < 0)
+            if (d < 0)
                 p = &(pp->lokid);
             else
                 p = &(pp->hikid);
         } /* end else */
-    } /* end while */
+    }     /* end while */
 
     /* Finish walking through the key string, adding nodes until the end */
     for (;;) {
-        if(NULL == (*p = H5FL_MALLOC(H5ST_node_t)))
+        if (NULL == (*p = H5FL_MALLOC(H5ST_node_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-        pp = *p;
+        pp            = *p;
         pp->splitchar = *s;
-        pp->up = up;
-        pp->parent = parent;
+        pp->up        = up;
+        pp->parent    = parent;
         pp->lokid = pp->eqkid = pp->hikid = NULL;
 
         /* If this is the end of the key string, break out */
-        if(*s++ == 0) {
+        if (*s++ == 0) {
             pp->eqkid = (H5ST_ptr_t)obj;
             break;
         } /* end if */
 
         /* Continue to next character */
         parent = NULL;
-        up = pp;
-        p = &(pp->eqkid);
+        up     = pp;
+        p      = &(pp->eqkid);
     } /* end for */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_insert() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_search
@@ -242,8 +236,8 @@ done:
 htri_t
 H5ST_search(H5ST_tree_t *tree, const char *s)
 {
-    H5ST_ptr_t p;               /* Temporary pointer to TST node */
-    htri_t ret_value=FALSE;     /* Return value */
+    H5ST_ptr_t p;                 /* Temporary pointer to TST node */
+    htri_t     ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -251,11 +245,12 @@ H5ST_search(H5ST_tree_t *tree, const char *s)
     while (p) {
         if (*s < p->splitchar)
             p = p->lokid;
-        else if (*s == p->splitchar)  {
+        else if (*s == p->splitchar) {
             if (*s++ == 0)
                 HGOTO_DONE(TRUE);
             p = p->eqkid;
-        } else
+        }
+        else
             p = p->hikid;
     } /* end while */
 
@@ -263,7 +258,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_search() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_find_internal
@@ -287,18 +281,19 @@ done:
 static H5ST_ptr_t
 H5ST_find_internal(H5ST_ptr_t p, const char *s)
 {
-    H5ST_ptr_t ret_value = NULL;  /* Return value */
+    H5ST_ptr_t ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     while (p) {
         if (*s < p->splitchar)
             p = p->lokid;
-        else if (*s == p->splitchar)  {
+        else if (*s == p->splitchar) {
             if (*s++ == 0)
                 HGOTO_DONE(p);
             p = p->eqkid;
-        } else
+        }
+        else
             p = p->hikid;
     } /* end while */
 
@@ -306,7 +301,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_find_internal() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_find
@@ -330,18 +324,17 @@ done:
 H5ST_ptr_t
 H5ST_find(H5ST_tree_t *tree, const char *s)
 {
-    H5ST_ptr_t ret_value;  /* Return value */
+    H5ST_ptr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(NULL == (ret_value = H5ST_find_internal(tree->root, s)))
+    if (NULL == (ret_value = H5ST_find_internal(tree->root, s)))
         HGOTO_ERROR(H5E_TST, H5E_NOTFOUND, NULL, "key not found in TST")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_find() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_locate
@@ -364,13 +357,13 @@ done:
 void *
 H5ST_locate(H5ST_tree_t *tree, const char *s)
 {
-    H5ST_ptr_t node;    /* Pointer to node located */
-    void *ret_value;    /* Return value */
+    H5ST_ptr_t node;      /* Pointer to node located */
+    void *     ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Locate the node to remove */
-    if(NULL == (node = H5ST_find_internal(tree->root, s)))
+    if (NULL == (node = H5ST_find_internal(tree->root, s)))
         HGOTO_ERROR(H5E_TST, H5E_NOTFOUND, NULL, "key not found in TST")
 
     /* Get the pointer to the object to return */
@@ -380,7 +373,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5ST_locate() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_findfirst_internal
@@ -402,17 +394,17 @@ done:
 static H5ST_ptr_t
 H5ST_findfirst_internal(H5ST_ptr_t p)
 {
-    H5ST_ptr_t ret_value = NULL;  /* Return value */
+    H5ST_ptr_t ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    while(p) {
+    while (p) {
         /* Find least node in current tree */
-        while(p->lokid)
+        while (p->lokid)
             p = p->lokid;
 
         /* Is least node '\0'? */
-        if(p->splitchar == '\0') {
+        if (p->splitchar == '\0') {
             /* Return it */
             HGOTO_DONE(p);
         } /* end if */
@@ -420,13 +412,12 @@ H5ST_findfirst_internal(H5ST_ptr_t p)
             /* Go down to next level of tree */
             p = p->eqkid;
         } /* end else */
-    } /* end while */
+    }     /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_findfirst_internal() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_findfirst
@@ -448,18 +439,17 @@ done:
 H5ST_ptr_t
 H5ST_findfirst(H5ST_tree_t *tree)
 {
-    H5ST_ptr_t ret_value;       /* Return value */
+    H5ST_ptr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(NULL == (ret_value = H5ST_findfirst_internal(tree->root)))
-        HGOTO_ERROR(H5E_TST,H5E_NOTFOUND,NULL,"no nodes in TST");
+    if (NULL == (ret_value = H5ST_findfirst_internal(tree->root)))
+        HGOTO_ERROR(H5E_TST, H5E_NOTFOUND, NULL, "no nodes in TST");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_findfirst() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_getnext
@@ -481,33 +471,33 @@ done:
 static H5ST_ptr_t
 H5ST_getnext(H5ST_ptr_t p)
 {
-    H5ST_ptr_t ret_value = NULL;  /* Return value */
+    H5ST_ptr_t ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* If the node to continue from has higher-valued nodes attached */
-    if(p->hikid) {
+    if (p->hikid) {
         /* Go to first higher-valued node */
         p = p->hikid;
 
         /* Find least node from here */
-        while(p->lokid)
+        while (p->lokid)
             p = p->lokid;
         HGOTO_DONE(p);
     } /* end if */
     else {
-        H5ST_ptr_t q;           /* Temporary TST node pointer */
+        H5ST_ptr_t q; /* Temporary TST node pointer */
 
         /* Go up one level in current tree */
         q = p->parent;
-        if(q == NULL)
+        if (q == NULL)
             HGOTO_DONE(NULL);
 
         /* While the previous node was the higher-valued node, keep backing up the tree */
-        while(q->hikid == p) {
+        while (q->hikid == p) {
             p = q;
             q = p->parent;
-            if(NULL == q)
+            if (NULL == q)
                 HGOTO_DONE(NULL);
         } /* end while */
         HGOTO_DONE(q);
@@ -517,7 +507,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_getnext() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_findnext
@@ -539,26 +528,25 @@ done:
 H5ST_ptr_t
 H5ST_findnext(H5ST_ptr_t p)
 {
-    H5ST_ptr_t q;               /* Temporary pointer to TST node */
-    H5ST_ptr_t ret_value = NULL;  /* Return value */
+    H5ST_ptr_t q;                /* Temporary pointer to TST node */
+    H5ST_ptr_t ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Find the next node at the current level, or go back up the tree */
     do {
         q = H5ST_getnext(p);
-        if(q) {
+        if (q) {
             HGOTO_DONE(H5ST_findfirst_internal(q->eqkid));
         } /* end if */
         else
             p = p->up;
-    } while(p);
+    } while (p);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_findnext() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_delete_internal
@@ -582,24 +570,24 @@ done:
 static herr_t
 H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
 {
-    H5ST_ptr_t q,               /* Temporary pointer to TST node */
-        newp;                   /* Pointer to node which will replace deleted node in tree */
+    H5ST_ptr_t q, /* Temporary pointer to TST node */
+        newp;     /* Pointer to node which will replace deleted node in tree */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Find node to replace one being deleted */
-    if(p->lokid) {
+    if (p->lokid) {
         /* If the deleted node has lo & hi kids, attach them together */
-        if(p->hikid) {
+        if (p->hikid) {
             q = p->lokid;
-            while(q->hikid)
+            while (q->hikid)
                 q = q->hikid;
-            q->hikid = p->hikid;
+            q->hikid         = p->hikid;
             p->hikid->parent = q;
         } /* end if */
         newp = p->lokid;
     } /* end if */
-    else if(p->hikid) {
+    else if (p->hikid) {
         newp = p->hikid;
     } /* end if */
     else {
@@ -607,25 +595,25 @@ H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
     } /* end else */
 
     /* Deleted node is in middle of tree */
-    if(p->parent) {
+    if (p->parent) {
         /* Attach new node to correct side of parent */
-        if(p == p->parent->lokid)
+        if (p == p->parent->lokid)
             p->parent->lokid = newp;
         else
             p->parent->hikid = newp;
-        if(newp)
+        if (newp)
             newp->parent = p->parent;
     } /* end if */
     else {
-        if(newp)
+        if (newp)
             newp->parent = p->parent;
-        if(p->up) {
+        if (p->up) {
             p->up->eqkid = newp;
 
             /* If we deleted the last node in the TST, delete the upper node also */
-            if(NULL == newp)
+            if (NULL == newp)
                 H5ST_delete_internal(root, p->up);
-        } /* end if */
+        }    /* end if */
         else /* Deleted last node at top level of tree */
             *root = newp;
     } /* end else */
@@ -635,7 +623,6 @@ H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5ST_delete_internal() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_delete
@@ -659,18 +646,17 @@ H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
 herr_t
 H5ST_delete(H5ST_tree_t *tree, H5ST_ptr_t p)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5ST_delete_internal(&tree->root, p) < 0)
+    if (H5ST_delete_internal(&tree->root, p) < 0)
         HGOTO_ERROR(H5E_TST, H5E_CANTDELETE, FAIL, "can't delete node from TST")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5ST_delete() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_remove
@@ -693,20 +679,20 @@ done:
 void *
 H5ST_remove(H5ST_tree_t *tree, const char *s)
 {
-    H5ST_ptr_t node;    /* Pointer to node to remove */
-    void *ret_value;    /* Return value */
+    H5ST_ptr_t node;      /* Pointer to node to remove */
+    void *     ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Locate the node to remove */
-    if(NULL == (node = H5ST_find_internal(tree->root, s)))
+    if (NULL == (node = H5ST_find_internal(tree->root, s)))
         HGOTO_ERROR(H5E_TST, H5E_NOTFOUND, NULL, "key not found in TST")
 
     /* Get the pointer to the object to return */
     ret_value = node->eqkid;
 
     /* Remove the node from the TST */
-    if(H5ST_delete_internal(&tree->root, node) < 0)
+    if (H5ST_delete_internal(&tree->root, node) < 0)
         HGOTO_ERROR(H5E_TST, H5E_CANTDELETE, NULL, "can't delete node from TST")
 
 done:
@@ -714,7 +700,7 @@ done:
 } /* H5ST_remove() */
 
 #ifdef H5ST_DEBUG
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5ST_dump_internal
@@ -738,7 +724,7 @@ H5ST_dump_internal(H5ST_ptr_t p)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(p) {
+    if (p) {
         printf("p=%p\n", p);
         printf("\tp->up=%p\n", p->up);
         printf("\tp->parent=%p\n", p->parent);
@@ -748,7 +734,7 @@ H5ST_dump_internal(H5ST_ptr_t p)
         printf("\tp->splitchar=%c\n", p->splitchar);
 
         H5ST_dump_internal(p->lokid);
-        if(p->splitchar)
+        if (p->splitchar)
             H5ST_dump_internal(p->eqkid);
         else
             printf("%s\n", (char *)p->eqkid);
@@ -758,7 +744,6 @@ H5ST_dump_internal(H5ST_ptr_t p)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5ST_dump_internal() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5ST_dump
@@ -788,4 +773,3 @@ H5ST_dump(H5ST_tree_t *tree)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5ST_dump() */
 #endif /* H5ST_DEBUG */
-
diff --git a/src/H5STprivate.h b/src/H5STprivate.h
index 172604c..c91afb5 100644
--- a/src/H5STprivate.h
+++ b/src/H5STprivate.h
@@ -29,34 +29,33 @@
 /* Internal nodes for TST */
 typedef struct H5ST_node *H5ST_ptr_t;
 typedef struct H5ST_node {
-    char splitchar;             /* Character represented at node */
-    H5ST_ptr_t up;              /* Pointer to the node in the tree above (before) this node */
-    H5ST_ptr_t parent;          /* Pointer to the next higher tree node in this tree */
-    H5ST_ptr_t lokid;           /* Pointer to the lower node from this one, in this tree */
-    H5ST_ptr_t eqkid;           /* Pointer to the parent node in the next tree down (after) this node */
-    H5ST_ptr_t hikid;           /* Pointer to the higher node from this one, in this tree */
+    char       splitchar; /* Character represented at node */
+    H5ST_ptr_t up;        /* Pointer to the node in the tree above (before) this node */
+    H5ST_ptr_t parent;    /* Pointer to the next higher tree node in this tree */
+    H5ST_ptr_t lokid;     /* Pointer to the lower node from this one, in this tree */
+    H5ST_ptr_t eqkid;     /* Pointer to the parent node in the next tree down (after) this node */
+    H5ST_ptr_t hikid;     /* Pointer to the higher node from this one, in this tree */
 } H5ST_node_t;
 
 /* Wrapper about TST */
 typedef struct {
-    H5ST_ptr_t root;            /* Pointer to actual TST */
+    H5ST_ptr_t root; /* Pointer to actual TST */
 } H5ST_tree_t;
 
 /* Macro to access "data" pointer in H5ST_node_t's returned from functions */
-#define H5ST_NODE_DATA(p)       ((void *)(p->eqkid))
+#define H5ST_NODE_DATA(p) ((void *)(p->eqkid))
 
 /* Private routines */
 H5_DLL H5ST_tree_t *H5ST_create(void);
-H5_DLL herr_t H5ST_close(H5ST_tree_t *p);
-H5_DLL herr_t H5ST_insert(H5ST_tree_t *root, const char *s, void *obj);
-H5_DLL htri_t H5ST_search(H5ST_tree_t *root, const char *s);
-H5_DLL H5ST_ptr_t H5ST_find(H5ST_tree_t *root, const char *s);
-H5_DLL void *H5ST_locate(H5ST_tree_t *root, const char *s);
-H5_DLL H5ST_ptr_t H5ST_findfirst(H5ST_tree_t *p);
-H5_DLL H5ST_ptr_t H5ST_findnext(H5ST_ptr_t p);
-H5_DLL void *H5ST_remove(H5ST_tree_t *root, const char *s);
-H5_DLL herr_t H5ST_delete(H5ST_tree_t *root, H5ST_ptr_t p);
-H5_DLL herr_t H5ST_dump(H5ST_ptr_t p);
+H5_DLL herr_t       H5ST_close(H5ST_tree_t *p);
+H5_DLL herr_t       H5ST_insert(H5ST_tree_t *root, const char *s, void *obj);
+H5_DLL htri_t       H5ST_search(H5ST_tree_t *root, const char *s);
+H5_DLL H5ST_ptr_t   H5ST_find(H5ST_tree_t *root, const char *s);
+H5_DLL void *       H5ST_locate(H5ST_tree_t *root, const char *s);
+H5_DLL H5ST_ptr_t   H5ST_findfirst(H5ST_tree_t *p);
+H5_DLL H5ST_ptr_t   H5ST_findnext(H5ST_ptr_t p);
+H5_DLL void *       H5ST_remove(H5ST_tree_t *root, const char *s);
+H5_DLL herr_t       H5ST_delete(H5ST_tree_t *root, H5ST_ptr_t p);
+H5_DLL herr_t       H5ST_dump(H5ST_ptr_t p);
 
 #endif /* _H5STprivate_H */
-
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 86ab0d8..d071a88 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -18,45 +18,43 @@
  * Purpose:	"All" selection data space I/O functions.
  */
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		        */
-#include "H5Iprivate.h"		/* ID Functions		                */
-#include "H5Spkg.h"		/* Dataspace functions			*/
-#include "H5VMprivate.h"         /* Vector functions                     */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		        */
+#include "H5Iprivate.h"  /* ID Functions		                */
+#include "H5Spkg.h"      /* Dataspace functions			*/
+#include "H5VMprivate.h" /* Vector functions                     */
 
 /* Static function prototypes */
 
 /* Selection callbacks */
-static herr_t H5S_all_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
-static herr_t H5S_all_get_seq_list(const H5S_t *space, unsigned flags,
-    H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,
-    size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
-static herr_t H5S_all_release(H5S_t *space);
-static htri_t H5S_all_is_valid(const H5S_t *space);
+static herr_t   H5S_all_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
+static herr_t   H5S_all_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t maxseq,
+                                     size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
+static herr_t   H5S_all_release(H5S_t *space);
+static htri_t   H5S_all_is_valid(const H5S_t *space);
 static hssize_t H5S_all_serial_size(const H5S_t *space);
-static herr_t H5S_all_serialize(const H5S_t *space, uint8_t *buf);
-static herr_t H5S_all_deserialize(H5S_t *space, const uint8_t *buf);
-static herr_t H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
-static herr_t H5S_all_offset(const H5S_t *space, hsize_t *off);
-static htri_t H5S_all_is_contiguous(const H5S_t *space);
-static htri_t H5S_all_is_single(const H5S_t *space);
-static htri_t H5S_all_is_regular(const H5S_t *space);
-static herr_t H5S_all_adjust_u(H5S_t *space, const hsize_t *offset);
-static herr_t H5S_all_project_scalar(const H5S_t *space, hsize_t *offset);
-static herr_t H5S_all_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
-static herr_t H5S_all_iter_init(H5S_sel_iter_t *iter, const H5S_t *space);
+static herr_t   H5S_all_serialize(const H5S_t *space, uint8_t *buf);
+static herr_t   H5S_all_deserialize(H5S_t *space, const uint8_t *buf);
+static herr_t   H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+static herr_t   H5S_all_offset(const H5S_t *space, hsize_t *off);
+static htri_t   H5S_all_is_contiguous(const H5S_t *space);
+static htri_t   H5S_all_is_single(const H5S_t *space);
+static htri_t   H5S_all_is_regular(const H5S_t *space);
+static herr_t   H5S_all_adjust_u(H5S_t *space, const hsize_t *offset);
+static herr_t   H5S_all_project_scalar(const H5S_t *space, hsize_t *offset);
+static herr_t   H5S_all_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
+static herr_t   H5S_all_iter_init(H5S_sel_iter_t *iter, const H5S_t *space);
 
 /* Selection iteration callbacks */
-static herr_t H5S_all_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords);
-static herr_t H5S_all_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
+static herr_t  H5S_all_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords);
+static herr_t  H5S_all_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
 static hsize_t H5S_all_iter_nelmts(const H5S_sel_iter_t *iter);
-static htri_t H5S_all_iter_has_next_block(const H5S_sel_iter_t *iter);
-static herr_t H5S_all_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
-static herr_t H5S_all_iter_next_block(H5S_sel_iter_t *sel_iter);
-static herr_t H5S_all_iter_release(H5S_sel_iter_t *sel_iter);
+static htri_t  H5S_all_iter_has_next_block(const H5S_sel_iter_t *iter);
+static herr_t  H5S_all_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
+static herr_t  H5S_all_iter_next_block(H5S_sel_iter_t *sel_iter);
+static herr_t  H5S_all_iter_release(H5S_sel_iter_t *sel_iter);
 
 /* Selection properties for "all" selections */
 const H5S_select_class_t H5S_sel_all[1] = {{
@@ -95,7 +93,6 @@ static const H5S_sel_iter_class_t H5S_sel_iter_all[1] = {{
     H5S_all_iter_release,
 }};
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_all_iter_init
  *
@@ -111,28 +108,27 @@ static const H5S_sel_iter_class_t H5S_sel_iter_all[1] = {{
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_all_iter_init (H5S_sel_iter_t *iter, const H5S_t *space)
+H5S_all_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert (space && H5S_SEL_ALL==H5S_GET_SELECT_TYPE(space));
-    HDassert (iter);
+    HDassert(space && H5S_SEL_ALL == H5S_GET_SELECT_TYPE(space));
+    HDassert(iter);
 
     /* Initialize the number of elements to iterate over */
-    iter->elmt_left=H5S_GET_SELECT_NPOINTS(space);
+    iter->elmt_left = H5S_GET_SELECT_NPOINTS(space);
 
     /* Start at the upper left location */
-    iter->u.all.elmt_offset=0;
-    iter->u.all.byte_offset=0;
+    iter->u.all.elmt_offset = 0;
+    iter->u.all.byte_offset = 0;
 
     /* Initialize type of selection iterator */
-    iter->type=H5S_sel_iter_all;
+    iter->type = H5S_sel_iter_all;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_iter_init() */
+} /* H5S_all_iter_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_all_iter_coords
  *
@@ -149,25 +145,24 @@ H5S_all_iter_init (H5S_sel_iter_t *iter, const H5S_t *space)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_all_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
+H5S_all_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords)
 {
-    herr_t ret_value=SUCCEED;        /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
-    HDassert (iter);
-    HDassert (coords);
+    HDassert(iter);
+    HDassert(coords);
 
     /* Calculate the coordinates for the current iterator offset */
-    if(H5VM_array_calc(iter->u.all.elmt_offset,iter->rank,iter->dims,coords)<0)
+    if (H5VM_array_calc(iter->u.all.elmt_offset, iter->rank, iter->dims, coords) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't retrieve coordinates");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_all_iter_coords() */
+} /* H5S_all_iter_coords() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_all_iter_block
  *
@@ -184,31 +179,30 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_all_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
+H5S_all_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
 {
-    unsigned u;                 /* Local index variable */
+    unsigned u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert (iter);
-    HDassert (start);
-    HDassert (end);
+    HDassert(iter);
+    HDassert(start);
+    HDassert(end);
 
-    for(u=0; u<iter->rank; u++) {
+    for (u = 0; u < iter->rank; u++) {
         /* Set the start of the 'all' block */
         /* (Always '0' coordinates for now) */
-        start[u]=0;
+        start[u] = 0;
 
         /* Compute the end of the 'all' block */
         /* (Always size of the extent for now) */
-        end[u]=iter->dims[u]-1;
+        end[u] = iter->dims[u] - 1;
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_iter_coords() */
+} /* H5S_all_iter_coords() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_all_iter_nelmts
  *
@@ -224,17 +218,16 @@ H5S_all_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
  *-------------------------------------------------------------------------
  */
 static hsize_t
-H5S_all_iter_nelmts (const H5S_sel_iter_t *iter)
+H5S_all_iter_nelmts(const H5S_sel_iter_t *iter)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert (iter);
+    HDassert(iter);
 
     FUNC_LEAVE_NOAPI(iter->elmt_left)
-}   /* H5S_all_iter_nelmts() */
+} /* H5S_all_iter_nelmts() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_iter_next
@@ -253,17 +246,16 @@ H5S_all_iter_nelmts (const H5S_sel_iter_t *iter)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static htri_t
-H5S_all_iter_has_next_block (const H5S_sel_iter_t H5_ATTR_UNUSED *iter)
+H5S_all_iter_has_next_block(const H5S_sel_iter_t H5_ATTR_UNUSED *iter)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert (iter);
+    HDassert(iter);
 
     FUNC_LEAVE_NOAPI(FALSE)
-}   /* H5S_all_iter_has_next_block() */
+} /* H5S_all_iter_has_next_block() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_iter_next
@@ -288,17 +280,16 @@ H5S_all_iter_next(H5S_sel_iter_t *iter, size_t nelem)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert (iter);
-    HDassert (nelem>0);
+    HDassert(iter);
+    HDassert(nelem > 0);
 
     /* Increment the iterator */
-    iter->u.all.elmt_offset+=nelem;
-    iter->u.all.byte_offset+=(nelem*iter->elmt_size);
+    iter->u.all.elmt_offset += nelem;
+    iter->u.all.byte_offset += (nelem * iter->elmt_size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_iter_next() */
+} /* H5S_all_iter_next() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_iter_next_block
@@ -322,12 +313,11 @@ H5S_all_iter_next_block(H5S_sel_iter_t H5_ATTR_UNUSED *iter)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert (iter);
+    HDassert(iter);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5S_all_iter_next_block() */
+} /* H5S_all_iter_next_block() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_iter_release
@@ -346,17 +336,16 @@ H5S_all_iter_next_block(H5S_sel_iter_t H5_ATTR_UNUSED *iter)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_all_iter_release (H5S_sel_iter_t H5_ATTR_UNUSED * iter)
+H5S_all_iter_release(H5S_sel_iter_t H5_ATTR_UNUSED *iter)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert (iter);
+    HDassert(iter);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_iter_release() */
+} /* H5S_all_iter_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_release
@@ -386,9 +375,8 @@ H5S_all_release(H5S_t *space)
     space->select.num_elem = 0;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_release() */
+} /* H5S_all_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_copy
@@ -422,7 +410,6 @@ H5S_all_copy(H5S_t *dst, const H5S_t H5_ATTR_UNUSED *src, hbool_t H5_ATTR_UNUSED
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S_all_copy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_is_valid
@@ -444,7 +431,7 @@ H5S_all_copy(H5S_t *dst, const H5S_t H5_ATTR_UNUSED *src, hbool_t H5_ATTR_UNUSED
  REVISION LOG
 --------------------------------------------------------------------------*/
 static htri_t
-H5S_all_is_valid (const H5S_t H5_ATTR_UNUSED *space)
+H5S_all_is_valid(const H5S_t H5_ATTR_UNUSED *space)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -453,7 +440,6 @@ H5S_all_is_valid (const H5S_t H5_ATTR_UNUSED *space)
     FUNC_LEAVE_NOAPI(TRUE)
 } /* end H5S_all_is_valid() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_serial_size
@@ -474,7 +460,7 @@ H5S_all_is_valid (const H5S_t H5_ATTR_UNUSED *space)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static hssize_t
-H5S_all_serial_size (const H5S_t H5_ATTR_UNUSED *space)
+H5S_all_serial_size(const H5S_t H5_ATTR_UNUSED *space)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -487,7 +473,6 @@ H5S_all_serial_size (const H5S_t H5_ATTR_UNUSED *space)
     FUNC_LEAVE_NOAPI(16)
 } /* end H5S_all_serial_size() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_serialize
@@ -508,22 +493,21 @@ H5S_all_serial_size (const H5S_t H5_ATTR_UNUSED *space)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_all_serialize (const H5S_t *space, uint8_t *buf)
+H5S_all_serialize(const H5S_t *space, uint8_t *buf)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
     /* Store the preamble information */
-    UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space));  /* Store the type of selection */
-    UINT32ENCODE(buf, (uint32_t)H5S_ALL_VERSION_1);  /* Store the version number */
-    UINT32ENCODE(buf, (uint32_t)0);  /* Store the un-used padding */
-    UINT32ENCODE(buf, (uint32_t)0);  /* Store the additional information length */
+    UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */
+    UINT32ENCODE(buf, (uint32_t)H5S_ALL_VERSION_1);          /* Store the version number */
+    UINT32ENCODE(buf, (uint32_t)0);                          /* Store the un-used padding */
+    UINT32ENCODE(buf, (uint32_t)0);                          /* Store the additional information length */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_serialize() */
+} /* H5S_all_serialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_deserialize
@@ -548,7 +532,7 @@ H5S_all_deserialize(H5S_t *space, const uint8_t *buf)
 {
     uint32_t version;   /* Decoded version */
     uint8_t *p;         /* Temporary pointer to buf */
-    herr_t ret_value;   /* return value */
+    herr_t   ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -559,18 +543,17 @@ H5S_all_deserialize(H5S_t *space, const uint8_t *buf)
     /* Decode version */
     UINT32DECODE(p, version);
 
-    if(version < H5S_ALL_VERSION_1 || version > H5S_ALL_VERSION_LATEST)
+    if (version < H5S_ALL_VERSION_1 || version > H5S_ALL_VERSION_LATEST)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "bad version number for all selection")
 
     /* Change to "all" selection */
-    if((ret_value = H5S_select_all(space, TRUE)) < 0)
+    if ((ret_value = H5S_select_all(space, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_all_deserialize() */
+} /* H5S_all_deserialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_bounds
@@ -599,8 +582,8 @@ done:
 static herr_t
 H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 {
-    unsigned rank;                  /* Dataspace rank */
-    unsigned i;                     /* index variable */
+    unsigned rank; /* Dataspace rank */
+    unsigned i;    /* index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -612,15 +595,14 @@ H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
     rank = space->extent.rank;
 
     /* Just copy over the complete extent */
-    for(i = 0; i < rank; i++) {
+    for (i = 0; i < rank; i++) {
         start[i] = 0;
-        end[i] = space->extent.size[i] - 1;
+        end[i]   = space->extent.size[i] - 1;
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_bounds() */
+} /* H5S_all_bounds() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_offset
@@ -653,9 +635,8 @@ H5S_all_offset(const H5S_t H5_ATTR_UNUSED *space, hsize_t *offset)
     *offset = 0;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_offset() */
+} /* H5S_all_offset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_is_contiguous
@@ -682,9 +663,8 @@ H5S_all_is_contiguous(const H5S_t H5_ATTR_UNUSED *space)
     HDassert(space);
 
     FUNC_LEAVE_NOAPI(TRUE)
-}   /* H5S_all_is_contiguous() */
+} /* H5S_all_is_contiguous() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_is_single
@@ -711,9 +691,8 @@ H5S_all_is_single(const H5S_t H5_ATTR_UNUSED *space)
     HDassert(space);
 
     FUNC_LEAVE_NOAPI(TRUE)
-}   /* H5S_all_is_single() */
+} /* H5S_all_is_single() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_is_regular
@@ -742,9 +721,8 @@ H5S_all_is_regular(const H5S_t H5_ATTR_UNUSED *space)
     HDassert(space);
 
     FUNC_LEAVE_NOAPI(TRUE)
-}   /* H5S_all_is_regular() */
+} /* H5S_all_is_regular() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_adjust_u
@@ -773,9 +751,8 @@ H5S_all_adjust_u(H5S_t H5_ATTR_UNUSED *space, const hsize_t H5_ATTR_UNUSED *offs
     HDassert(offset);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_adjust_u() */
+} /* H5S_all_adjust_u() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_all_project_scalar
  *
@@ -802,9 +779,8 @@ H5S_all_project_scalar(const H5S_t H5_ATTR_UNUSED *space, hsize_t *offset)
     *offset = 0;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_all_project_scalar() */
+} /* H5S_all_project_scalar() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_all_project_simple
  *
@@ -821,7 +797,7 @@ H5S_all_project_scalar(const H5S_t H5_ATTR_UNUSED *space, hsize_t *offset)
 static herr_t
 H5S_all_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offset)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -831,14 +807,13 @@ H5S_all_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offse
     HDassert(offset);
 
     /* Select the entire new space */
-    if(H5S_select_all(new_space, TRUE) < 0)
+    if (H5S_select_all(new_space, TRUE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "unable to set all selection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_all_project_simple() */
+} /* H5S_all_project_simple() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_all
@@ -860,7 +835,7 @@ done:
 herr_t
 H5S_select_all(H5S_t *space, hbool_t rel_prev)
 {
-    herr_t ret_value = SUCCEED;  /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -868,8 +843,8 @@ H5S_select_all(H5S_t *space, hbool_t rel_prev)
     HDassert(space);
 
     /* Remove current selection first */
-    if(rel_prev)
-        if(H5S_SELECT_RELEASE(space) < 0)
+    if (rel_prev)
+        if (H5S_SELECT_RELEASE(space) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release selection")
 
     /* Set number of elements in selection */
@@ -880,9 +855,8 @@ H5S_select_all(H5S_t *space, hbool_t rel_prev)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_all() */
+} /* H5S_select_all() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sselect_all
@@ -910,18 +884,17 @@ H5Sselect_all(hid_t spaceid)
     H5TRACE1("e", "i", spaceid);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
     /* Call internal routine to do the work */
-    if(H5S_select_all(space, TRUE) < 0)
+    if (H5S_select_all(space, TRUE) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sselect_all() */
+} /* H5Sselect_all() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_all_get_seq_list
@@ -955,42 +928,41 @@ done:
 --------------------------------------------------------------------------*/
 static herr_t
 H5S_all_get_seq_list(const H5S_t H5_ATTR_UNUSED *space, unsigned H5_ATTR_UNUSED flags, H5S_sel_iter_t *iter,
-    size_t H5_ATTR_UNUSED maxseq, size_t maxelem, size_t *nseq, size_t *nelem,
-    hsize_t *off, size_t *len)
+                     size_t H5_ATTR_UNUSED maxseq, size_t maxelem, size_t *nseq, size_t *nelem, hsize_t *off,
+                     size_t *len)
 {
-    size_t elem_used;           /* The number of elements used */
+    size_t elem_used; /* The number of elements used */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space);
     HDassert(iter);
-    HDassert(maxseq>0);
-    HDassert(maxelem>0);
+    HDassert(maxseq > 0);
+    HDassert(maxelem > 0);
     HDassert(nseq);
     HDassert(nelem);
     HDassert(off);
     HDassert(len);
 
     /* Determine the actual number of elements to use */
-    H5_CHECK_OVERFLOW(iter->elmt_left,hsize_t,size_t);
-    elem_used=MIN(maxelem,(size_t)iter->elmt_left);
+    H5_CHECK_OVERFLOW(iter->elmt_left, hsize_t, size_t);
+    elem_used = MIN(maxelem, (size_t)iter->elmt_left);
 
     /* Compute the offset in the dataset */
-    off[0]=iter->u.all.byte_offset;
-    len[0]=elem_used*iter->elmt_size;
+    off[0] = iter->u.all.byte_offset;
+    len[0] = elem_used * iter->elmt_size;
 
     /* Should only need one sequence for 'all' selections */
-    *nseq=1;
+    *nseq = 1;
 
     /* Set the number of elements used */
-    *nelem=elem_used;
+    *nelem = elem_used;
 
     /* Update the iterator */
-    iter->elmt_left-=elem_used;
-    iter->u.all.elmt_offset+=elem_used;
-    iter->u.all.byte_offset+=len[0];
+    iter->elmt_left -= elem_used;
+    iter->u.all.elmt_offset += elem_used;
+    iter->u.all.byte_offset += len[0];
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S_all_get_seq_list() */
-
diff --git a/src/H5Sdbg.c b/src/H5Sdbg.c
index efa8b9e..25badbb 100644
--- a/src/H5Sdbg.c
+++ b/src/H5Sdbg.c
@@ -26,53 +26,43 @@
 /* Module Setup */
 /****************/
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
-
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Spkg.h"		/* Dataspaces         			*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Spkg.h"     /* Dataspaces         			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_debug
  *
@@ -86,38 +76,32 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
-    int fwidth)
+H5S_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth)
 {
-    const H5S_t	*mesg = (const H5S_t*)_mesg;
+    const H5S_t *mesg = (const H5S_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    switch(H5S_GET_EXTENT_TYPE(mesg)) {
+    switch (H5S_GET_EXTENT_TYPE(mesg)) {
         case H5S_NULL:
-            HDfprintf(stream, "%*s%-*s H5S_NULL\n", indent, "", fwidth,
-                    "Space class:");
+            HDfprintf(stream, "%*s%-*s H5S_NULL\n", indent, "", fwidth, "Space class:");
             break;
 
         case H5S_SCALAR:
-            HDfprintf(stream, "%*s%-*s H5S_SCALAR\n", indent, "", fwidth,
-                    "Space class:");
+            HDfprintf(stream, "%*s%-*s H5S_SCALAR\n", indent, "", fwidth, "Space class:");
             break;
 
         case H5S_SIMPLE:
-            HDfprintf(stream, "%*s%-*s H5S_SIMPLE\n", indent, "", fwidth,
-                    "Space class:");
-            H5O_debug_id(H5O_SDSPACE_ID, f, dxpl_id, &(mesg->extent), stream,
-                                 indent + 3, MAX(0, fwidth - 3));
+            HDfprintf(stream, "%*s%-*s H5S_SIMPLE\n", indent, "", fwidth, "Space class:");
+            H5O_debug_id(H5O_SDSPACE_ID, f, dxpl_id, &(mesg->extent), stream, indent + 3, MAX(0, fwidth - 3));
             break;
 
         case H5S_NO_CLASS:
         default:
             HDfprintf(stream, "%*s%-*s **UNKNOWN-%ld**\n", indent, "", fwidth,
-                    "Space class:", (long)(H5S_GET_EXTENT_TYPE(mesg)));
+                      "Space class:", (long)(H5S_GET_EXTENT_TYPE(mesg)));
             break;
     } /* end switch */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S_debug() */
-
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 6c94b4d..da2a380 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -18,65 +18,64 @@
  * Purpose:	Hyperslab selection data space I/O functions.
  */
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling			*/
-#include "H5FLprivate.h"	/* Free Lists				*/
-#include "H5Iprivate.h"		/* ID Functions				*/
-#include "H5Spkg.h"		/* Dataspace functions			*/
-#include "H5VMprivate.h"         /* Vector functions			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling			*/
+#include "H5FLprivate.h" /* Free Lists				*/
+#include "H5Iprivate.h"  /* ID Functions				*/
+#include "H5Spkg.h"      /* Dataspace functions			*/
+#include "H5VMprivate.h" /* Vector functions			*/
 
 /* Local datatypes */
 
 /* Static function prototypes */
-static herr_t H5S_hyper_free_span_info(H5S_hyper_span_info_t *span_info);
-static herr_t H5S_hyper_free_span(H5S_hyper_span_t *span);
+static herr_t                 H5S_hyper_free_span_info(H5S_hyper_span_info_t *span_info);
+static herr_t                 H5S_hyper_free_span(H5S_hyper_span_t *span);
 static H5S_hyper_span_info_t *H5S_hyper_copy_span(H5S_hyper_span_info_t *spans);
-static void H5S_hyper_span_scratch(H5S_hyper_span_info_t *spans, void *scr_value);
-static herr_t H5S_hyper_span_precompute(H5S_hyper_span_info_t *spans, size_t elmt_size);
-static herr_t H5S_generate_hyperslab(H5S_t *space, H5S_seloper_t op,
-    const hsize_t start[], const hsize_t stride[], const hsize_t count[], const hsize_t block[]);
-static herr_t H5S_hyper_generate_spans(H5S_t *space);
+static void                   H5S_hyper_span_scratch(H5S_hyper_span_info_t *spans, void *scr_value);
+static herr_t                 H5S_hyper_span_precompute(H5S_hyper_span_info_t *spans, size_t elmt_size);
+static herr_t                 H5S_generate_hyperslab(H5S_t *space, H5S_seloper_t op, const hsize_t start[],
+                                                     const hsize_t stride[], const hsize_t count[], const hsize_t block[]);
+static herr_t                 H5S_hyper_generate_spans(H5S_t *space);
 /* Needed for use in hyperslab code (H5Shyper.c) */
 #ifdef NEW_HYPERSLAB_API
-static herr_t H5S_select_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2);
+static herr_t H5S_select_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2);
 #endif /*NEW_HYPERSLAB_API*/
 
 /* Selection callbacks */
 static herr_t H5S_hyper_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
-static herr_t H5S_hyper_get_seq_list(const H5S_t *space, unsigned flags,
-    H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,
-    size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
+static herr_t H5S_hyper_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t maxseq,
+                                     size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off,
+                                     size_t *len);
 static herr_t H5S_hyper_release(H5S_t *space);
 static htri_t H5S_hyper_is_valid(const H5S_t *space);
 static hssize_t H5S_hyper_serial_size(const H5S_t *space);
-static herr_t H5S_hyper_serialize(const H5S_t *space, uint8_t *buf);
-static herr_t H5S_hyper_deserialize(H5S_t *space, const uint8_t *buf);
-static herr_t H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
-static herr_t H5S_hyper_offset(const H5S_t *space, hsize_t *offset);
-static htri_t H5S_hyper_is_contiguous(const H5S_t *space);
-static htri_t H5S_hyper_is_single(const H5S_t *space);
-static htri_t H5S_hyper_is_regular(const H5S_t *space);
-static herr_t H5S_hyper_adjust_u(H5S_t *space, const hsize_t *offset);
-static herr_t H5S_hyper_project_scalar(const H5S_t *space, hsize_t *offset);
-static herr_t H5S_hyper_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
-static herr_t H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space);
+static herr_t   H5S_hyper_serialize(const H5S_t *space, uint8_t *buf);
+static herr_t   H5S_hyper_deserialize(H5S_t *space, const uint8_t *buf);
+static herr_t   H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+static herr_t   H5S_hyper_offset(const H5S_t *space, hsize_t *offset);
+static htri_t   H5S_hyper_is_contiguous(const H5S_t *space);
+static htri_t   H5S_hyper_is_single(const H5S_t *space);
+static htri_t   H5S_hyper_is_regular(const H5S_t *space);
+static herr_t   H5S_hyper_adjust_u(H5S_t *space, const hsize_t *offset);
+static herr_t   H5S_hyper_project_scalar(const H5S_t *space, hsize_t *offset);
+static herr_t   H5S_hyper_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
+static herr_t   H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space);
 
 /* Selection iteration callbacks */
-static herr_t H5S_hyper_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords);
-static herr_t H5S_hyper_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
+static herr_t  H5S_hyper_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords);
+static herr_t  H5S_hyper_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
 static hsize_t H5S_hyper_iter_nelmts(const H5S_sel_iter_t *iter);
-static htri_t H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *sel_iter);
-static herr_t H5S_hyper_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
-static herr_t H5S_hyper_iter_next_block(H5S_sel_iter_t *sel_iter);
-static herr_t H5S_hyper_iter_release(H5S_sel_iter_t *sel_iter);
+static htri_t  H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *sel_iter);
+static herr_t  H5S_hyper_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
+static herr_t  H5S_hyper_iter_next_block(H5S_sel_iter_t *sel_iter);
+static herr_t  H5S_hyper_iter_release(H5S_sel_iter_t *sel_iter);
 
 /* Static function for optimizing hyperslab */
-static hbool_t H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span,
-    H5S_hyper_dim_t span_slab_info[], unsigned rank);
-static htri_t H5S_hyper_rebuild(H5S_t *space);
+static hbool_t H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span, H5S_hyper_dim_t span_slab_info[],
+                                        unsigned rank);
+static htri_t  H5S_hyper_rebuild(H5S_t *space);
 
 /* Selection properties for hyperslab selections */
 const H5S_select_class_t H5S_sel_hyper[1] = {{
@@ -118,11 +117,8 @@ static const H5S_sel_iter_class_t H5S_sel_iter_hyper[1] = {{
 /* Static variables */
 
 /* Array for default stride, block, etc. */
-static const hsize_t _ones[H5O_LAYOUT_NDIMS]={
-    1,1,1,1, 1,1,1,1,
-    1,1,1,1, 1,1,1,1,
-    1,1,1,1, 1,1,1,1,
-    1,1,1,1, 1,1,1,1,1};
+static const hsize_t _ones[H5O_LAYOUT_NDIMS] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                                                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
 
 /* Declare a free list to manage the H5S_hyper_sel_t struct */
 H5FL_DEFINE_STATIC(H5S_hyper_sel_t);
@@ -136,17 +132,19 @@ H5FL_DEFINE_STATIC(H5S_hyper_span_info_t);
 /* #define H5S_HYPER_DEBUG */
 #ifdef H5S_HYPER_DEBUG
 static herr_t
-H5S_hyper_print_spans_helper(FILE *f, struct H5S_hyper_span_t *span,unsigned depth)
+H5S_hyper_print_spans_helper(FILE *f, struct H5S_hyper_span_t *span, unsigned depth)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    while(span) {
-        HDfprintf(f,"%s: depth=%u, span=%p, (%d, %d), nelem=%u, pstride=%u\n",FUNC,depth,span,(int)span->low,(int)span->high,(unsigned)span->nelem,(unsigned)span->pstride);
-        if(span->down && span->down->head) {
-            HDfprintf(f,"%s: spans=%p, count=%u, scratch=%p, head=%p\n",FUNC,span->down,span->down->count,span->down->scratch,span->down->head);
-            H5S_hyper_print_spans_helper(f,span->down->head,depth+1);
+    while (span) {
+        HDfprintf(f, "%s: depth=%u, span=%p, (%d, %d), nelem=%u, pstride=%u\n", FUNC, depth, span,
+                  (int)span->low, (int)span->high, (unsigned)span->nelem, (unsigned)span->pstride);
+        if (span->down && span->down->head) {
+            HDfprintf(f, "%s: spans=%p, count=%u, scratch=%p, head=%p\n", FUNC, span->down, span->down->count,
+                      span->down->scratch, span->down->head);
+            H5S_hyper_print_spans_helper(f, span->down->head, depth + 1);
         } /* end if */
-        span=span->next;
+        span = span->next;
     } /* end while */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -157,9 +155,10 @@ H5S_hyper_print_spans(FILE *f, const struct H5S_hyper_span_info_t *span_lst)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(span_lst!=NULL) {
-        HDfprintf(f,"%s: spans=%p, count=%u, scratch=%p, head=%p\n",FUNC,span_lst,span_lst->count,span_lst->scratch,span_lst->head);
-        H5S_hyper_print_spans_helper(f,span_lst->head,0);
+    if (span_lst != NULL) {
+        HDfprintf(f, "%s: spans=%p, count=%u, scratch=%p, head=%p\n", FUNC, span_lst, span_lst->count,
+                  span_lst->scratch, span_lst->head);
+        H5S_hyper_print_spans_helper(f, span_lst->head, 0);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -170,7 +169,7 @@ H5S_space_print_spans(FILE *f, const H5S_t *space)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    H5S_hyper_print_spans(f,space->select.sel_info.hslab->span_lst);
+    H5S_hyper_print_spans(f, space->select.sel_info.hslab->span_lst);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
@@ -178,26 +177,26 @@ H5S_space_print_spans(FILE *f, const H5S_t *space)
 static herr_t
 H5S_hyper_print_diminfo_helper(FILE *f, const char *field, unsigned ndims, const H5S_hyper_dim_t *dinfo)
 {
-    unsigned u;                 /* Local index variable */
+    unsigned u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(dinfo!=NULL) {
-        HDfprintf(f,"%s: %s: start=[",FUNC,field);
-        for(u=0; u<ndims; u++)
-            HDfprintf(f,"%Hd%s",dinfo[u].start, (u<(ndims-1) ? ", " : "]\n"));
-        HDfprintf(f,"%s: %s: stride=[",FUNC,field);
-        for(u=0; u<ndims; u++)
-            HDfprintf(f,"%Hu%s",dinfo[u].stride, (u<(ndims-1) ? ", " : "]\n"));
-        HDfprintf(f,"%s: %s: count=[",FUNC,field);
-        for(u=0; u<ndims; u++)
-            HDfprintf(f,"%Hu%s",dinfo[u].count, (u<(ndims-1) ? ", " : "]\n"));
-        HDfprintf(f,"%s: %s: block=[",FUNC,field);
-        for(u=0; u<ndims; u++)
-            HDfprintf(f,"%Hu%s",dinfo[u].block, (u<(ndims-1) ? ", " : "]\n"));
+    if (dinfo != NULL) {
+        HDfprintf(f, "%s: %s: start=[", FUNC, field);
+        for (u = 0; u < ndims; u++)
+            HDfprintf(f, "%Hd%s", dinfo[u].start, (u < (ndims - 1) ? ", " : "]\n"));
+        HDfprintf(f, "%s: %s: stride=[", FUNC, field);
+        for (u = 0; u < ndims; u++)
+            HDfprintf(f, "%Hu%s", dinfo[u].stride, (u < (ndims - 1) ? ", " : "]\n"));
+        HDfprintf(f, "%s: %s: count=[", FUNC, field);
+        for (u = 0; u < ndims; u++)
+            HDfprintf(f, "%Hu%s", dinfo[u].count, (u < (ndims - 1) ? ", " : "]\n"));
+        HDfprintf(f, "%s: %s: block=[", FUNC, field);
+        for (u = 0; u < ndims; u++)
+            HDfprintf(f, "%Hu%s", dinfo[u].block, (u < (ndims - 1) ? ", " : "]\n"));
     } /* end if */
     else
-        HDfprintf(f,"%s: %s==NULL\n",FUNC,field);
+        HDfprintf(f, "%s: %s==NULL\n", FUNC, field);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
@@ -207,14 +206,15 @@ H5S_hyper_print_diminfo(FILE *f, const H5S_t *space)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    H5S_hyper_print_diminfo_helper(f,"opt_diminfo",space->extent.rank,space->select.sel_info.hslab->opt_diminfo);
-    H5S_hyper_print_diminfo_helper(f,"app_diminfo",space->extent.rank,space->select.sel_info.hslab->app_diminfo);
+    H5S_hyper_print_diminfo_helper(f, "opt_diminfo", space->extent.rank,
+                                   space->select.sel_info.hslab->opt_diminfo);
+    H5S_hyper_print_diminfo_helper(f, "app_diminfo", space->extent.rank,
+                                   space->select.sel_info.hslab->app_diminfo);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 #endif /* H5S_HYPER_DEBUG */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_iter_init
  *
@@ -235,11 +235,11 @@ H5S_hyper_print_diminfo(FILE *f, const H5S_t *space)
 static herr_t
 H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
 {
-    const H5S_hyper_dim_t *tdiminfo;    /* Temporary pointer to diminfo information */
-    H5S_hyper_span_info_t *spans;   /* Pointer to hyperslab span info node */
-    unsigned rank;                  /* Dataspace's dimension rank */
-    unsigned u;                     /* Index variable */
-    int i;                          /* Index variable */
+    const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */
+    H5S_hyper_span_info_t *spans;    /* Pointer to hyperslab span info node */
+    unsigned               rank;     /* Dataspace's dimension rank */
+    unsigned               u;        /* Index variable */
+    int                    i;        /* Index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -248,7 +248,7 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
     HDassert(iter);
 
     /* Initialize the number of points to iterate over */
-    iter->elmt_left = space->select.num_elem;
+    iter->elmt_left       = space->select.num_elem;
     iter->u.hyp.iter_rank = 0;
 
     /* Get the rank of the dataspace */
@@ -258,11 +258,11 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
     tdiminfo = space->select.sel_info.hslab->opt_diminfo;
 
     /* Check for the special case of just one H5Sselect_hyperslab call made */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-/* Initialize the information needed for regular hyperslab I/O */
-        const hsize_t *mem_size;    /* Temporary pointer to dataspace extent's dimension sizes */
-        hsize_t acc;                /* Accumulator for "flattened" dimension's sizes */
-        unsigned cont_dim = 0;      /* # of contiguous dimensions */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        /* Initialize the information needed for regular hyperslab I/O */
+        const hsize_t *mem_size;     /* Temporary pointer to dataspace extent's dimension sizes */
+        hsize_t        acc;          /* Accumulator for "flattened" dimension's sizes */
+        unsigned       cont_dim = 0; /* # of contiguous dimensions */
 
         /* Set the temporary pointer to the dataspace extent's dimension sizes */
         mem_size = space->extent.size;
@@ -277,10 +277,10 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
         /* Don't flatten adjacent elements into contiguous block if the
          * element size is 0.  This is for the H5S_select_shape_same() code.
          */
-        if(iter->elmt_size > 0) {
+        if (iter->elmt_size > 0) {
             /* Check for any "contiguous" blocks that can be flattened */
-            for(u = (rank - 1); u > 0; u--) {
-                if(tdiminfo[u].count == 1 && tdiminfo[u].block == mem_size[u]) {
+            for (u = (rank - 1); u > 0; u--) {
+                if (tdiminfo[u].count == 1 && tdiminfo[u].block == mem_size[u]) {
                     cont_dim++;
                     iter->u.hyp.flattened[u] = TRUE;
                 } /* end if */
@@ -291,18 +291,18 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
         } /* end if */
 
         /* Check if the regular selection can be "flattened" */
-        if(cont_dim > 0) {
-            unsigned last_dim_flattened = 1;    /* Flag to indicate that the last dimension was flattened */
-            unsigned flat_rank = rank-cont_dim; /* Number of dimensions after flattening */
-            unsigned curr_dim;                  /* Current dimension */
+        if (cont_dim > 0) {
+            unsigned last_dim_flattened = 1; /* Flag to indicate that the last dimension was flattened */
+            unsigned flat_rank          = rank - cont_dim; /* Number of dimensions after flattening */
+            unsigned curr_dim;                             /* Current dimension */
 
             /* Set the iterator's rank to the contiguous dimensions */
             iter->u.hyp.iter_rank = flat_rank;
 
             /* "Flatten" dataspace extent and selection information */
             curr_dim = flat_rank - 1;
-            for(i = (int)rank - 1, acc = 1; i >= 0; i--) {
-                if(tdiminfo[i].block == mem_size[i] && i > 0) {
+            for (i = (int)rank - 1, acc = 1; i >= 0; i--) {
+                if (tdiminfo[i].block == mem_size[i] && i > 0) {
                     /* "Flatten" this dimension */
                     HDassert(tdiminfo[i].start == 0);
                     acc *= mem_size[i];
@@ -311,19 +311,19 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
                     last_dim_flattened = 1;
                 } /* end if */
                 else {
-                    if(last_dim_flattened) {
+                    if (last_dim_flattened) {
                         /* First dimension after flattened dimensions */
                         iter->u.hyp.diminfo[curr_dim].start = tdiminfo[i].start * acc;
 
                         /* Special case for single block regular selections */
-                        if(tdiminfo[i].count == 1)
+                        if (tdiminfo[i].count == 1)
                             iter->u.hyp.diminfo[curr_dim].stride = 1;
                         else
                             iter->u.hyp.diminfo[curr_dim].stride = tdiminfo[i].stride * acc;
                         iter->u.hyp.diminfo[curr_dim].count = tdiminfo[i].count;
                         iter->u.hyp.diminfo[curr_dim].block = tdiminfo[i].block * acc;
-                        iter->u.hyp.size[curr_dim] = mem_size[i] * acc;
-                        iter->u.hyp.sel_off[curr_dim] = space->select.offset[i] * (hssize_t)acc;
+                        iter->u.hyp.size[curr_dim]          = mem_size[i] * acc;
+                        iter->u.hyp.sel_off[curr_dim]       = space->select.offset[i] * (hssize_t)acc;
 
                         /* Reset the "last dim flattened" flag to avoid flattened any further dimensions */
                         last_dim_flattened = 0;
@@ -333,37 +333,38 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
                     } /* end if */
                     else {
                         /* All other dimensions */
-                        iter->u.hyp.diminfo[curr_dim].start = tdiminfo[i].start;
+                        iter->u.hyp.diminfo[curr_dim].start  = tdiminfo[i].start;
                         iter->u.hyp.diminfo[curr_dim].stride = tdiminfo[i].stride;
-                        iter->u.hyp.diminfo[curr_dim].count = tdiminfo[i].count;
-                        iter->u.hyp.diminfo[curr_dim].block = tdiminfo[i].block;
-                        iter->u.hyp.size[curr_dim] = mem_size[i];
-                        iter->u.hyp.sel_off[curr_dim] = space->select.offset[i];
+                        iter->u.hyp.diminfo[curr_dim].count  = tdiminfo[i].count;
+                        iter->u.hyp.diminfo[curr_dim].block  = tdiminfo[i].block;
+                        iter->u.hyp.size[curr_dim]           = mem_size[i];
+                        iter->u.hyp.sel_off[curr_dim]        = space->select.offset[i];
                     } /* end else */
 
                     /* Decrement "current" flattened dimension */
                     curr_dim--;
                 } /* end if */
-            } /* end for */
+            }     /* end for */
 
-            /* Initialize "flattened" iterator offset to initial location and dataspace extent and selection information to correct values */
-            for(u = 0; u < flat_rank; u++)
+            /* Initialize "flattened" iterator offset to initial location and dataspace extent and selection
+             * information to correct values */
+            for (u = 0; u < flat_rank; u++)
                 iter->u.hyp.off[u] = iter->u.hyp.diminfo[u].start;
         } /* end if */
         else {
             /* Initialize position to initial location */
             /* Also make local copy of the regular selection information */
-            for(u = 0; u < rank; u++) {
+            for (u = 0; u < rank; u++) {
                 /* Regular selection information */
-                iter->u.hyp.diminfo[u].start = tdiminfo[u].start;
+                iter->u.hyp.diminfo[u].start  = tdiminfo[u].start;
                 iter->u.hyp.diminfo[u].stride = tdiminfo[u].stride;
-                iter->u.hyp.diminfo[u].count = tdiminfo[u].count;
-                iter->u.hyp.diminfo[u].block = tdiminfo[u].block;
+                iter->u.hyp.diminfo[u].count  = tdiminfo[u].count;
+                iter->u.hyp.diminfo[u].block  = tdiminfo[u].block;
 
                 /* Position information */
                 iter->u.hyp.off[u] = tdiminfo[u].start;
             } /* end if */
-        } /* end else */
+        }     /* end else */
 
         /* Flag the diminfo information as valid in the iterator */
         iter->u.hyp.diminfo_valid = TRUE;
@@ -372,17 +373,17 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
         iter->u.hyp.spans = NULL;
     } /* end if */
     else {
-/* Initialize the information needed for non-regular hyperslab I/O */
+        /* Initialize the information needed for non-regular hyperslab I/O */
         HDassert(space->select.sel_info.hslab->span_lst);
         /* Make a copy of the span tree to iterate over */
         iter->u.hyp.spans = H5S_hyper_copy_span(space->select.sel_info.hslab->span_lst);
 
         /* Set the nelem & pstride values according to the element size */
-        H5S_hyper_span_precompute(iter->u.hyp.spans,iter->elmt_size);
+        H5S_hyper_span_precompute(iter->u.hyp.spans, iter->elmt_size);
 
         /* Initialize the starting span_info's and spans */
         spans = iter->u.hyp.spans;
-        for(u = 0; u < rank; u++) {
+        for (u = 0; u < rank; u++) {
             /* Set the pointers to the initial span in each dimension */
             HDassert(spans);
             HDassert(spans->head);
@@ -405,9 +406,8 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
     iter->type = H5S_sel_iter_hyper;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_iter_init() */
+} /* H5S_hyper_iter_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_iter_coords
  *
@@ -424,7 +424,7 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
+H5S_hyper_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -435,34 +435,35 @@ H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
     /* Copy the offset of the current point */
 
     /* Check for a single "regular" hyperslab */
-    if(iter->u.hyp.diminfo_valid) {
+    if (iter->u.hyp.diminfo_valid) {
         /* Check if this is a "flattened" regular hyperslab selection */
-        if(iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < iter->rank) {
-            int u, v;           /* Dimension indices */
+        if (iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < iter->rank) {
+            int u, v; /* Dimension indices */
 
             /* Set the starting rank of both the "natural" & "flattened" dimensions */
             u = (int)iter->rank - 1;
             v = (int)iter->u.hyp.iter_rank - 1;
 
             /* Construct the "natural" dimensions from a set of flattened coordinates */
-            while(u >= 0) {
-                if(iter->u.hyp.flattened[u]) {
-                    int begin = u;      /* The rank of the first flattened dimension */
+            while (u >= 0) {
+                if (iter->u.hyp.flattened[u]) {
+                    int begin = u; /* The rank of the first flattened dimension */
 
                     /* Walk up through as many flattened dimensions as possible */
                     do {
                         u--;
-                    } while(u >= 0 && iter->u.hyp.flattened[u]);
+                    } while (u >= 0 && iter->u.hyp.flattened[u]);
 
                     /* Compensate for possibly overshooting dim 0 */
-                    if(u < 0)
+                    if (u < 0)
                         u = 0;
 
                     /* Sanity check */
                     HDassert(v >= 0);
 
                     /* Compute the coords for the flattened dimensions */
-                    H5VM_array_calc(iter->u.hyp.off[v], (unsigned)((begin - u) + 1), &(iter->dims[u]), &(coords[u]));
+                    H5VM_array_calc(iter->u.hyp.off[v], (unsigned)((begin - u) + 1), &(iter->dims[u]),
+                                    &(coords[u]));
 
                     /* Continue to faster dimension in both indices */
                     u--;
@@ -470,7 +471,7 @@ H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
                 } /* end if */
                 else {
                     /* Walk up through as many non-flattened dimensions as possible */
-                    while(u >= 0 && !iter->u.hyp.flattened[u]) {
+                    while (u >= 0 && !iter->u.hyp.flattened[u]) {
                         /* Sanity check */
                         HDassert(v >= 0);
 
@@ -481,8 +482,8 @@ H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
                         u--;
                         v--;
                     } /* end while */
-                } /* end else */
-            } /* end while */
+                }     /* end else */
+            }         /* end while */
             HDassert(v < 0);
         } /* end if */
         else
@@ -492,9 +493,8 @@ H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
         HDmemcpy(coords, iter->u.hyp.off, sizeof(hsize_t) * iter->rank);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_iter_coords() */
+} /* H5S_hyper_iter_coords() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_iter_block
  *
@@ -514,9 +514,9 @@ H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
+H5S_hyper_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
 {
-    unsigned u;                 /* Local index variable */
+    unsigned u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -528,27 +528,26 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
     /* Copy the offset of the current point */
 
     /* Check for a single "regular" hyperslab */
-    if(iter->u.hyp.diminfo_valid) {
+    if (iter->u.hyp.diminfo_valid) {
         /* Compute the end of the block */
-        for(u=0; u<iter->rank; u++) {
-            start[u]=iter->u.hyp.off[u];
-            end[u]=(start[u]+iter->u.hyp.diminfo[u].block)-1;
+        for (u = 0; u < iter->rank; u++) {
+            start[u] = iter->u.hyp.off[u];
+            end[u]   = (start[u] + iter->u.hyp.diminfo[u].block) - 1;
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
         /* Copy the start of the block */
-        for(u=0; u<iter->rank; u++)
-            start[u]=iter->u.hyp.span[u]->low;
+        for (u = 0; u < iter->rank; u++)
+            start[u] = iter->u.hyp.span[u]->low;
 
         /* Copy the end of the block */
-        for(u=0; u<iter->rank; u++)
-            end[u]=iter->u.hyp.span[u]->high;
+        for (u = 0; u < iter->rank; u++)
+            end[u] = iter->u.hyp.span[u]->high;
     } /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_iter_block() */
+} /* H5S_hyper_iter_block() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_iter_nelmts
  *
@@ -564,7 +563,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
  *-------------------------------------------------------------------------
  */
 static hsize_t
-H5S_hyper_iter_nelmts (const H5S_sel_iter_t *iter)
+H5S_hyper_iter_nelmts(const H5S_sel_iter_t *iter)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -572,9 +571,8 @@ H5S_hyper_iter_nelmts (const H5S_sel_iter_t *iter)
     HDassert(iter);
 
     FUNC_LEAVE_NOAPI(iter->elmt_left)
-}   /* H5S_hyper_iter_nelmts() */
+} /* H5S_hyper_iter_nelmts() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_iter_has_next_block
@@ -596,7 +594,7 @@ static htri_t
 H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *iter)
 {
     unsigned u;                 /* Local index variable */
-    htri_t ret_value = FALSE;   /* Return value */
+    htri_t   ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -604,33 +602,32 @@ H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *iter)
     HDassert(iter);
 
     /* Check for a single "regular" hyperslab */
-    if(iter->u.hyp.diminfo_valid) {
-        const H5S_hyper_dim_t *tdiminfo;    /* Temporary pointer to diminfo information */
-        const hsize_t *toff;               /* Temporary offset in selection */
+    if (iter->u.hyp.diminfo_valid) {
+        const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */
+        const hsize_t *        toff;     /* Temporary offset in selection */
 
         /* Check if the offset of the iterator is at the last location in all dimensions */
         tdiminfo = iter->u.hyp.diminfo;
-        toff = iter->u.hyp.off;
-        for(u = 0; u < iter->rank; u++) {
+        toff     = iter->u.hyp.off;
+        for (u = 0; u < iter->rank; u++) {
             /* If there is only one block, continue */
-            if(tdiminfo[u].count == 1)
+            if (tdiminfo[u].count == 1)
                 continue;
-            if(toff[u] != (tdiminfo[u].start + ((tdiminfo[u].count - 1) * tdiminfo[u].stride)))
+            if (toff[u] != (tdiminfo[u].start + ((tdiminfo[u].count - 1) * tdiminfo[u].stride)))
                 HGOTO_DONE(TRUE);
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
         /* Check for any levels of the tree with more sequences in them */
-        for(u = 0; u < iter->rank; u++)
-            if(iter->u.hyp.span[u]->next != NULL)
+        for (u = 0; u < iter->rank; u++)
+            if (iter->u.hyp.span[u]->next != NULL)
                 HGOTO_DONE(TRUE);
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_iter_has_next_block() */
+} /* H5S_hyper_iter_has_next_block() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_iter_next
  *
@@ -652,139 +649,141 @@ done:
 static herr_t
 H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem)
 {
-    unsigned ndims;     /* Number of dimensions of dataset */
-    int fast_dim;       /* Rank of the fastest changing dimension for the dataspace */
-    unsigned i;         /* Counters */
+    unsigned ndims;    /* Number of dimensions of dataset */
+    int      fast_dim; /* Rank of the fastest changing dimension for the dataspace */
+    unsigned i;        /* Counters */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check for the special case of just one H5Sselect_hyperslab call made */
     /* (i.e. a regular hyperslab selection */
-    if(iter->u.hyp.diminfo_valid) {
-        const H5S_hyper_dim_t *tdiminfo;    /* Temporary pointer to diminfo information */
-        hsize_t iter_offset[H5O_LAYOUT_NDIMS];
-        hsize_t iter_count[H5O_LAYOUT_NDIMS];
-        int temp_dim;  /* Temporary rank holder */
+    if (iter->u.hyp.diminfo_valid) {
+        const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */
+        hsize_t                iter_offset[H5O_LAYOUT_NDIMS];
+        hsize_t                iter_count[H5O_LAYOUT_NDIMS];
+        int                    temp_dim; /* Temporary rank holder */
 
         /* Check if this is a "flattened" regular hyperslab selection */
-        if(iter->u.hyp.iter_rank!=0 && iter->u.hyp.iter_rank<iter->rank) {
+        if (iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < iter->rank) {
             /* Set the aliases for the dimension rank */
-            ndims=iter->u.hyp.iter_rank;
+            ndims = iter->u.hyp.iter_rank;
         } /* end if */
         else {
             /* Set the aliases for the dimension rank */
-            ndims=iter->rank;
+            ndims = iter->rank;
         } /* end else */
 
         /* Set the fastest dimension rank */
         fast_dim = (int)ndims - 1;
 
         /* Set the local copy of the diminfo pointer */
-        tdiminfo=iter->u.hyp.diminfo;
+        tdiminfo = iter->u.hyp.diminfo;
 
         /* Calculate the offset and block count for each dimension */
-        for(i=0; i<ndims; i++) {
-            if(tdiminfo[i].count==1) {
-                iter_offset[i]=iter->u.hyp.off[i]-tdiminfo[i].start;
-                iter_count[i]=0;
+        for (i = 0; i < ndims; i++) {
+            if (tdiminfo[i].count == 1) {
+                iter_offset[i] = iter->u.hyp.off[i] - tdiminfo[i].start;
+                iter_count[i]  = 0;
             } /* end if */
             else {
-                iter_offset[i]=(iter->u.hyp.off[i]-tdiminfo[i].start)%tdiminfo[i].stride;
-                iter_count[i]=(iter->u.hyp.off[i]-tdiminfo[i].start)/tdiminfo[i].stride;
+                iter_offset[i] = (iter->u.hyp.off[i] - tdiminfo[i].start) % tdiminfo[i].stride;
+                iter_count[i]  = (iter->u.hyp.off[i] - tdiminfo[i].start) / tdiminfo[i].stride;
             } /* end else */
-        } /* end for */
+        }     /* end for */
 
         /* Loop through, advancing the offset & counts, until all the nelements are accounted for */
-        while(nelem>0) {
+        while (nelem > 0) {
             /* Start with the fastest changing dimension */
-            temp_dim=fast_dim;
-            while(temp_dim>=0) {
-                if(temp_dim==fast_dim) {
-                    size_t actual_elem;     /* Actual # of elements advanced on each iteration through loop */
-                    hsize_t block_elem;     /* Number of elements left in a block */
+            temp_dim = fast_dim;
+            while (temp_dim >= 0) {
+                if (temp_dim == fast_dim) {
+                    size_t  actual_elem; /* Actual # of elements advanced on each iteration through loop */
+                    hsize_t block_elem;  /* Number of elements left in a block */
 
                     /* Compute the number of elements left in block */
-                    block_elem=tdiminfo[temp_dim].block-iter_offset[temp_dim];
+                    block_elem = tdiminfo[temp_dim].block - iter_offset[temp_dim];
 
                     /* Compute the number of actual elements to advance */
-                    actual_elem=(size_t)MIN(nelem,block_elem);
+                    actual_elem = (size_t)MIN(nelem, block_elem);
 
                     /* Move the iterator over as many elements as possible */
-                    iter_offset[temp_dim]+=actual_elem;
+                    iter_offset[temp_dim] += actual_elem;
 
                     /* Decrement the number of elements advanced */
-                    nelem-=actual_elem;
+                    nelem -= actual_elem;
                 } /* end if */
                 else {
                     /* Move to the next row in the current dimension */
                     iter_offset[temp_dim]++;
                 } /* end else */
 
-                /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-                if(iter_offset[temp_dim]<tdiminfo[temp_dim].block)
+                /* If this block is still in the range of blocks to output for the dimension, break out of
+                 * loop */
+                if (iter_offset[temp_dim] < tdiminfo[temp_dim].block)
                     break;
                 else {
                     /* Move to the next block in the current dimension */
-                    iter_offset[temp_dim]=0;
+                    iter_offset[temp_dim] = 0;
                     iter_count[temp_dim]++;
 
-                    /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-                    if(iter_count[temp_dim]<tdiminfo[temp_dim].count)
+                    /* If this block is still in the range of blocks to output for the dimension, break out of
+                     * loop */
+                    if (iter_count[temp_dim] < tdiminfo[temp_dim].count)
                         break;
                     else
-                        iter_count[temp_dim]=0; /* reset back to the beginning of the line */
-                } /* end else */
+                        iter_count[temp_dim] = 0; /* reset back to the beginning of the line */
+                }                                 /* end else */
 
                 /* Decrement dimension count */
                 temp_dim--;
             } /* end while */
-        } /* end while */
+        }     /* end while */
 
         /* Translate current iter_offset and iter_count into iterator position */
-        for(i=0; i<ndims; i++)
-            iter->u.hyp.off[i]=tdiminfo[i].start+(tdiminfo[i].stride*iter_count[i])+iter_offset[i];
+        for (i = 0; i < ndims; i++)
+            iter->u.hyp.off[i] = tdiminfo[i].start + (tdiminfo[i].stride * iter_count[i]) + iter_offset[i];
     } /* end if */
     /* Must be an irregular hyperslab selection */
     else {
-        H5S_hyper_span_t *curr_span;    /* Current hyperslab span node */
-        H5S_hyper_span_t **ispan;       /* Iterator's hyperslab span nodes */
-        hsize_t *abs_arr;              /* Absolute hyperslab span position */
-        int curr_dim;                   /* Temporary rank holder */
+        H5S_hyper_span_t * curr_span; /* Current hyperslab span node */
+        H5S_hyper_span_t **ispan;     /* Iterator's hyperslab span nodes */
+        hsize_t *          abs_arr;   /* Absolute hyperslab span position */
+        int                curr_dim;  /* Temporary rank holder */
 
         /* Set the rank of the fastest changing dimension */
-        ndims=iter->rank;
+        ndims    = iter->rank;
         fast_dim = (int)ndims - 1;
 
         /* Get the pointers to the current span info and span nodes */
-        abs_arr=iter->u.hyp.off;
-        ispan=iter->u.hyp.span;
+        abs_arr = iter->u.hyp.off;
+        ispan   = iter->u.hyp.span;
 
         /* Loop through, advancing the span information, until all the nelements are accounted for */
-        while(nelem>0) {
+        while (nelem > 0) {
             /* Start at the fastest dim */
-            curr_dim=fast_dim;
+            curr_dim = fast_dim;
 
             /* Work back up through the dimensions */
-            while(curr_dim>=0) {
+            while (curr_dim >= 0) {
                 /* Reset the current span */
-                curr_span=ispan[curr_dim];
+                curr_span = ispan[curr_dim];
 
                 /* Increment absolute position */
-                if(curr_dim==fast_dim) {
-                    size_t actual_elem;     /* Actual # of elements advanced on each iteration through loop */
-                    hsize_t span_elem;      /* Number of elements left in a span */
+                if (curr_dim == fast_dim) {
+                    size_t  actual_elem; /* Actual # of elements advanced on each iteration through loop */
+                    hsize_t span_elem;   /* Number of elements left in a span */
 
                     /* Compute the number of elements left in block */
-                    span_elem=(curr_span->high-abs_arr[curr_dim])+1;
+                    span_elem = (curr_span->high - abs_arr[curr_dim]) + 1;
 
                     /* Compute the number of actual elements to advance */
-                    actual_elem=(size_t)MIN(nelem,span_elem);
+                    actual_elem = (size_t)MIN(nelem, span_elem);
 
                     /* Move the iterator over as many elements as possible */
-                    abs_arr[curr_dim]+=actual_elem;
+                    abs_arr[curr_dim] += actual_elem;
 
                     /* Decrement the number of elements advanced */
-                    nelem-=actual_elem;
+                    nelem -= actual_elem;
                 } /* end if */
                 else {
                     /* Move to the next row in the current dimension */
@@ -792,35 +791,36 @@ H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem)
                 } /* end else */
 
                 /* Check if we are still within the span */
-                if(abs_arr[curr_dim]<=curr_span->high) {
+                if (abs_arr[curr_dim] <= curr_span->high) {
                     break;
                 } /* end if */
                 /* If we walked off that span, advance to the next span */
                 else {
                     /* Advance span in this dimension */
-                    curr_span=curr_span->next;
+                    curr_span = curr_span->next;
 
                     /* Check if we have a valid span in this dimension still */
-                    if(curr_span!=NULL) {
+                    if (curr_span != NULL) {
                         /* Reset the span in the current dimension */
-                        ispan[curr_dim]=curr_span;
+                        ispan[curr_dim] = curr_span;
 
                         /* Reset absolute position */
-                        abs_arr[curr_dim]=curr_span->low;
+                        abs_arr[curr_dim] = curr_span->low;
 
                         break;
                     } /* end if */
                     else {
-                        /* If we finished the span list in this dimension, decrement the dimension worked on and loop again */
+                        /* If we finished the span list in this dimension, decrement the dimension worked on
+                         * and loop again */
                         curr_dim--;
                     } /* end else */
-                } /* end else */
-            } /* end while */
+                }     /* end else */
+            }         /* end while */
 
             /* Check if we are finished with the spans in the tree */
-            if(curr_dim>=0) {
+            if (curr_dim >= 0) {
                 /* Walk back down the iterator positions, reseting them */
-                while(curr_dim<fast_dim) {
+                while (curr_dim < fast_dim) {
                     HDassert(curr_span);
                     HDassert(curr_span->down);
                     HDassert(curr_span->down->head);
@@ -829,25 +829,24 @@ H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem)
                     curr_dim++;
 
                     /* Set the new span_info & span for this dimension */
-                    ispan[curr_dim]=curr_span->down->head;
+                    ispan[curr_dim] = curr_span->down->head;
 
                     /* Advance span down the tree */
-                    curr_span=curr_span->down->head;
+                    curr_span = curr_span->down->head;
 
                     /* Reset the absolute offset for the dim */
-                    abs_arr[curr_dim]=curr_span->low;
+                    abs_arr[curr_dim] = curr_span->low;
                 } /* end while */
 
                 /* Verify that the curr_span points to the fastest dim */
-                HDassert(curr_span==ispan[fast_dim]);
+                HDassert(curr_span == ispan[fast_dim]);
             } /* end if */
-        } /* end while */
-    } /* end else */
+        }     /* end while */
+    }         /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5S_hyper_iter_next() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_iter_next_block
  *
@@ -867,54 +866,54 @@ H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem)
 static herr_t
 H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
 {
-    unsigned ndims;     /* Number of dimensions of dataset */
-    int fast_dim;       /* Rank of the fastest changing dimension for the dataspace */
-    unsigned u;         /* Counters */
+    unsigned ndims;    /* Number of dimensions of dataset */
+    int      fast_dim; /* Rank of the fastest changing dimension for the dataspace */
+    unsigned u;        /* Counters */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check for the special case of just one H5Sselect_hyperslab call made */
     /* (i.e. a regular hyperslab selection */
-    if(iter->u.hyp.diminfo_valid) {
-        const H5S_hyper_dim_t *tdiminfo;    /* Temporary pointer to diminfo information */
-        hsize_t iter_offset[H5O_LAYOUT_NDIMS];
-        hsize_t iter_count[H5O_LAYOUT_NDIMS];
-        int temp_dim;  /* Temporary rank holder */
+    if (iter->u.hyp.diminfo_valid) {
+        const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */
+        hsize_t                iter_offset[H5O_LAYOUT_NDIMS];
+        hsize_t                iter_count[H5O_LAYOUT_NDIMS];
+        int                    temp_dim; /* Temporary rank holder */
 
         /* Check if this is a "flattened" regular hyperslab selection */
-        if(iter->u.hyp.iter_rank!=0 && iter->u.hyp.iter_rank<iter->rank) {
+        if (iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < iter->rank) {
             /* Set the aliases for the dimension rank */
-            ndims=iter->u.hyp.iter_rank;
+            ndims = iter->u.hyp.iter_rank;
         } /* end if */
         else {
             /* Set the aliases for the dimension rank */
-            ndims=iter->rank;
+            ndims = iter->rank;
         } /* end else */
 
         /* Set the fastest dimension rank */
         fast_dim = (int)ndims - 1;
 
         /* Set the local copy of the diminfo pointer */
-        tdiminfo=iter->u.hyp.diminfo;
+        tdiminfo = iter->u.hyp.diminfo;
 
         /* Calculate the offset and block count for each dimension */
-        for(u=0; u<ndims; u++) {
-            if(tdiminfo[u].count==1) {
-                iter_offset[u]=iter->u.hyp.off[u]-tdiminfo[u].start;
-                iter_count[u]=0;
+        for (u = 0; u < ndims; u++) {
+            if (tdiminfo[u].count == 1) {
+                iter_offset[u] = iter->u.hyp.off[u] - tdiminfo[u].start;
+                iter_count[u]  = 0;
             } /* end if */
             else {
-                iter_offset[u]=(iter->u.hyp.off[u]-tdiminfo[u].start)%tdiminfo[u].stride;
-                iter_count[u]=(iter->u.hyp.off[u]-tdiminfo[u].start)/tdiminfo[u].stride;
+                iter_offset[u] = (iter->u.hyp.off[u] - tdiminfo[u].start) % tdiminfo[u].stride;
+                iter_count[u]  = (iter->u.hyp.off[u] - tdiminfo[u].start) / tdiminfo[u].stride;
             } /* end else */
-        } /* end for */
+        }     /* end for */
 
         /* Advance one block */
-        temp_dim=fast_dim; /* Start with the fastest changing dimension */
-        while(temp_dim>=0) {
-            if(temp_dim==fast_dim) {
+        temp_dim = fast_dim; /* Start with the fastest changing dimension */
+        while (temp_dim >= 0) {
+            if (temp_dim == fast_dim) {
                 /* Move iterator over current block */
-                iter_offset[temp_dim]+=tdiminfo[temp_dim].block;
+                iter_offset[temp_dim] += tdiminfo[temp_dim].block;
             } /* end if */
             else {
                 /* Move to the next row in the current dimension */
@@ -922,55 +921,56 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
             } /* end else */
 
             /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-            if(iter_offset[temp_dim]<tdiminfo[temp_dim].block)
+            if (iter_offset[temp_dim] < tdiminfo[temp_dim].block)
                 break;
             else {
                 /* Move to the next block in the current dimension */
-                iter_offset[temp_dim]=0;
+                iter_offset[temp_dim] = 0;
                 iter_count[temp_dim]++;
 
-                /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-                if(iter_count[temp_dim]<tdiminfo[temp_dim].count)
+                /* If this block is still in the range of blocks to output for the dimension, break out of
+                 * loop */
+                if (iter_count[temp_dim] < tdiminfo[temp_dim].count)
                     break;
                 else
-                    iter_count[temp_dim]=0; /* reset back to the beginning of the line */
-            } /* end else */
+                    iter_count[temp_dim] = 0; /* reset back to the beginning of the line */
+            }                                 /* end else */
 
             /* Decrement dimension count */
             temp_dim--;
         } /* end while */
 
         /* Translate current iter_offset and iter_count into iterator position */
-        for(u=0; u<ndims; u++)
-            iter->u.hyp.off[u]=tdiminfo[u].start+(tdiminfo[u].stride*iter_count[u])+iter_offset[u];
+        for (u = 0; u < ndims; u++)
+            iter->u.hyp.off[u] = tdiminfo[u].start + (tdiminfo[u].stride * iter_count[u]) + iter_offset[u];
     } /* end if */
     /* Must be an irregular hyperslab selection */
     else {
-        H5S_hyper_span_t *curr_span;    /* Current hyperslab span node */
-        H5S_hyper_span_t **ispan;       /* Iterator's hyperslab span nodes */
-        hsize_t *abs_arr;              /* Absolute hyperslab span position */
-        int curr_dim;                   /* Temporary rank holder */
+        H5S_hyper_span_t * curr_span; /* Current hyperslab span node */
+        H5S_hyper_span_t **ispan;     /* Iterator's hyperslab span nodes */
+        hsize_t *          abs_arr;   /* Absolute hyperslab span position */
+        int                curr_dim;  /* Temporary rank holder */
 
         /* Set the rank of the fastest changing dimension */
-        ndims = iter->rank;
+        ndims    = iter->rank;
         fast_dim = (int)ndims - 1;
 
         /* Get the pointers to the current span info and span nodes */
-        abs_arr=iter->u.hyp.off;
-        ispan=iter->u.hyp.span;
+        abs_arr = iter->u.hyp.off;
+        ispan   = iter->u.hyp.span;
 
         /* Loop through, advancing the span information, until all the nelements are accounted for */
-        curr_dim=fast_dim; /* Start at the fastest dim */
+        curr_dim = fast_dim; /* Start at the fastest dim */
 
         /* Work back up through the dimensions */
-        while(curr_dim>=0) {
+        while (curr_dim >= 0) {
             /* Reset the current span */
-            curr_span=ispan[curr_dim];
+            curr_span = ispan[curr_dim];
 
             /* Increment absolute position */
-            if(curr_dim==fast_dim) {
+            if (curr_dim == fast_dim) {
                 /* Move the iterator over rest of element in span */
-                abs_arr[curr_dim]=curr_span->high+1;
+                abs_arr[curr_dim] = curr_span->high + 1;
             } /* end if */
             else {
                 /* Move to the next row in the current dimension */
@@ -978,35 +978,36 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
             } /* end else */
 
             /* Check if we are still within the span */
-            if(abs_arr[curr_dim]<=curr_span->high) {
+            if (abs_arr[curr_dim] <= curr_span->high) {
                 break;
             } /* end if */
             /* If we walked off that span, advance to the next span */
             else {
                 /* Advance span in this dimension */
-                curr_span=curr_span->next;
+                curr_span = curr_span->next;
 
                 /* Check if we have a valid span in this dimension still */
-                if(curr_span!=NULL) {
+                if (curr_span != NULL) {
                     /* Reset the span in the current dimension */
-                    ispan[curr_dim]=curr_span;
+                    ispan[curr_dim] = curr_span;
 
                     /* Reset absolute position */
-                    abs_arr[curr_dim]=curr_span->low;
+                    abs_arr[curr_dim] = curr_span->low;
 
                     break;
                 } /* end if */
                 else {
-                    /* If we finished the span list in this dimension, decrement the dimension worked on and loop again */
+                    /* If we finished the span list in this dimension, decrement the dimension worked on and
+                     * loop again */
                     curr_dim--;
                 } /* end else */
-            } /* end else */
-        } /* end while */
+            }     /* end else */
+        }         /* end while */
 
         /* Check if we are finished with the spans in the tree */
-        if(curr_dim>=0) {
+        if (curr_dim >= 0) {
             /* Walk back down the iterator positions, reseting them */
-            while(curr_dim<fast_dim) {
+            while (curr_dim < fast_dim) {
                 HDassert(curr_span);
                 HDassert(curr_span->down);
                 HDassert(curr_span->down->head);
@@ -1015,24 +1016,23 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
                 curr_dim++;
 
                 /* Set the new span_info & span for this dimension */
-                ispan[curr_dim]=curr_span->down->head;
+                ispan[curr_dim] = curr_span->down->head;
 
                 /* Advance span down the tree */
-                curr_span=curr_span->down->head;
+                curr_span = curr_span->down->head;
 
                 /* Reset the absolute offset for the dim */
-                abs_arr[curr_dim]=curr_span->low;
+                abs_arr[curr_dim] = curr_span->low;
             } /* end while */
 
             /* Verify that the curr_span points to the fastest dim */
             HDassert(curr_span == ispan[fast_dim]);
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5S_hyper_iter_next() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_iter_release
@@ -1051,22 +1051,21 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_iter_release (H5S_sel_iter_t *iter)
+H5S_hyper_iter_release(H5S_sel_iter_t *iter)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(iter);
 
-/* Release the information needed for non-regular hyperslab I/O */
+    /* Release the information needed for non-regular hyperslab I/O */
     /* Free the copy of the selections span tree */
-    if(iter->u.hyp.spans != NULL)
+    if (iter->u.hyp.spans != NULL)
         H5S_hyper_free_span_info(iter->u.hyp.spans);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_iter_release() */
+} /* H5S_hyper_iter_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_new_span
@@ -1096,26 +1095,25 @@ H5S_hyper_new_span(hsize_t low, hsize_t high, H5S_hyper_span_info_t *down, H5S_h
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate a new span node */
-    if(NULL == (ret_value = H5FL_MALLOC(H5S_hyper_span_t)))
+    if (NULL == (ret_value = H5FL_MALLOC(H5S_hyper_span_t)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, NULL, "can't allocate hyperslab span")
 
     /* Copy the span's basic information */
-    ret_value->low = low;
-    ret_value->high = high;
-    ret_value->nelem = (high - low) + 1;
+    ret_value->low     = low;
+    ret_value->high    = high;
+    ret_value->nelem   = (high - low) + 1;
     ret_value->pstride = 0;
-    ret_value->down = down;
-    ret_value->next = next;
+    ret_value->down    = down;
+    ret_value->next    = next;
 
     /* Increment the reference count of the 'down span' if there is one */
-    if(ret_value->down)
+    if (ret_value->down)
         ret_value->down->count++;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_new_span() */
+} /* H5S_hyper_new_span() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_span_precompute_helper
@@ -1136,28 +1134,28 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_span_precompute_helper (H5S_hyper_span_info_t *spans, size_t elmt_size)
+H5S_hyper_span_precompute_helper(H5S_hyper_span_info_t *spans, size_t elmt_size)
 {
-    H5S_hyper_span_t *span;     /* Hyperslab span */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5S_hyper_span_t *span;                /* Hyperslab span */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(spans);
 
     /* Check if we've already set this down span tree */
-    if(spans->scratch!=(H5S_hyper_span_info_t *)~((size_t)NULL)) {
+    if (spans->scratch != (H5S_hyper_span_info_t *)~((size_t)NULL)) {
         /* Set the tree's scratch pointer */
-        spans->scratch=(H5S_hyper_span_info_t *)~((size_t)NULL);
+        spans->scratch = (H5S_hyper_span_info_t *)~((size_t)NULL);
 
         /* Set the scratch pointers in all the nodes */
-        span=spans->head;
+        span = spans->head;
 
         /* Loop over all the spans for this down span tree */
-        while(span!=NULL) {
+        while (span != NULL) {
             /* If there are down spans, set their scratch value also */
-            if(span->down!=NULL) {
-                if(H5S_hyper_span_precompute_helper(span->down,elmt_size)==FAIL)
+            if (span->down != NULL) {
+                if (H5S_hyper_span_precompute_helper(span->down, elmt_size) == FAIL)
                     HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "can't reset hyperslab scratch pointer")
             } /* end if */
 
@@ -1166,15 +1164,14 @@ H5S_hyper_span_precompute_helper (H5S_hyper_span_info_t *spans, size_t elmt_size
             span->pstride *= elmt_size;
 
             /* Advance to next span */
-            span=span->next;
+            span = span->next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_span_precompute_helper() */
+} /* H5S_hyper_span_precompute_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_span_precompute
@@ -1197,14 +1194,14 @@ done:
 static herr_t
 H5S_hyper_span_precompute(H5S_hyper_span_info_t *spans, size_t elmt_size)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(spans);
 
     /* Call the helper routine to actually do the work */
-    if(H5S_hyper_span_precompute_helper(spans, elmt_size) < 0)
+    if (H5S_hyper_span_precompute_helper(spans, elmt_size) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "can't precompute span info")
 
     /* Reset the scratch pointers for the next routine which needs them */
@@ -1212,9 +1209,8 @@ H5S_hyper_span_precompute(H5S_hyper_span_info_t *spans, size_t elmt_size)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_span_precompute() */
+} /* H5S_hyper_span_precompute() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_span_scratch
@@ -1240,28 +1236,27 @@ H5S_hyper_span_scratch(H5S_hyper_span_info_t *spans, void *scr_value)
     HDassert(spans);
 
     /* Check if we've already set this down span tree */
-    if(spans->scratch != scr_value) {
-        H5S_hyper_span_t *span;             /* Hyperslab span */
+    if (spans->scratch != scr_value) {
+        H5S_hyper_span_t *span; /* Hyperslab span */
 
         /* Set the tree's scratch pointer */
         spans->scratch = (H5S_hyper_span_info_t *)scr_value;
 
         /* Set the scratch pointers in all the nodes */
         span = spans->head;
-        while(span != NULL) {
+        while (span != NULL) {
             /* If there are down spans, set their scratch value also */
-            if(span->down != NULL)
+            if (span->down != NULL)
                 H5S_hyper_span_scratch(span->down, scr_value);
 
             /* Advance to next span */
             span = span->next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI_VOID
-}   /* H5S_hyper_span_scratch() */
+} /* H5S_hyper_span_scratch() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_copy_span_helper
@@ -1280,12 +1275,12 @@ H5S_hyper_span_scratch(H5S_hyper_span_info_t *spans, void *scr_value)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static H5S_hyper_span_info_t *
-H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
+H5S_hyper_copy_span_helper(H5S_hyper_span_info_t *spans)
 {
-    H5S_hyper_span_t *span;         /* Hyperslab span */
-    H5S_hyper_span_t *new_span;     /* Temporary hyperslab span */
-    H5S_hyper_span_t *prev_span;    /* Previous hyperslab span */
-    H5S_hyper_span_info_t *new_down;    /* New down span tree */
+    H5S_hyper_span_t *     span;      /* Hyperslab span */
+    H5S_hyper_span_t *     new_span;  /* Temporary hyperslab span */
+    H5S_hyper_span_t *     prev_span; /* Previous hyperslab span */
+    H5S_hyper_span_info_t *new_down;  /* New down span tree */
     H5S_hyper_span_info_t *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -1293,7 +1288,7 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
     HDassert(spans);
 
     /* Check if the span tree was already copied */
-    if(spans->scratch != NULL && spans->scratch != (H5S_hyper_span_info_t *)~((size_t)NULL)) {
+    if (spans->scratch != NULL && spans->scratch != (H5S_hyper_span_info_t *)~((size_t)NULL)) {
         /* Just return the value of the already copied span tree */
         ret_value = spans->scratch;
 
@@ -1302,27 +1297,27 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
     } /* end if */
     else {
         /* Allocate a new span_info node */
-        if(NULL == (ret_value = H5FL_MALLOC(H5S_hyper_span_info_t)))
+        if (NULL == (ret_value = H5FL_MALLOC(H5S_hyper_span_info_t)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, NULL, "can't allocate hyperslab span info")
 
         /* Copy the span_info information */
-        ret_value->count = 1;
+        ret_value->count   = 1;
         ret_value->scratch = NULL;
-        ret_value->head = NULL;
+        ret_value->head    = NULL;
 
         /* Set the scratch pointer in the node being copied to the newly allocated node */
         spans->scratch = ret_value;
 
         /* Copy over the nodes in the span list */
-        span = spans->head;
+        span      = spans->head;
         prev_span = NULL;
-        while(span != NULL) {
+        while (span != NULL) {
             /* Allocate a new node */
-            if(NULL == (new_span = H5S_hyper_new_span(span->low, span->high, NULL, NULL)))
+            if (NULL == (new_span = H5S_hyper_new_span(span->low, span->high, NULL, NULL)))
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, NULL, "can't allocate hyperslab span")
 
             /* Append to list of spans */
-            if(NULL == prev_span)
+            if (NULL == prev_span)
                 ret_value->head = new_span;
             else
                 prev_span->next = new_span;
@@ -1331,8 +1326,8 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
             new_span->pstride = span->pstride;
 
             /* Recurse to copy the 'down' spans, if there are any */
-            if(span->down != NULL) {
-                if(NULL == (new_down = H5S_hyper_copy_span_helper(span->down)))
+            if (span->down != NULL) {
+                if (NULL == (new_down = H5S_hyper_copy_span_helper(span->down)))
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy hyperslab spans")
                 new_span->down = new_down;
             } /* end if */
@@ -1343,13 +1338,12 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
             /* Advance to next span */
             span = span->next;
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_copy_span_helper() */
+} /* H5S_hyper_copy_span_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_copy_span
@@ -1379,7 +1373,7 @@ H5S_hyper_copy_span(H5S_hyper_span_info_t *spans)
     HDassert(spans);
 
     /* Copy the hyperslab span tree */
-    if(NULL == (ret_value = H5S_hyper_copy_span_helper(spans)))
+    if (NULL == (ret_value = H5S_hyper_copy_span_helper(spans)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy hyperslab span tree")
 
     /* Reset the scratch pointers for the next routine which needs them */
@@ -1387,9 +1381,8 @@ H5S_hyper_copy_span(H5S_hyper_span_info_t *spans)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_copy_span() */
+} /* H5S_hyper_copy_span() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_cmp_spans
@@ -1410,30 +1403,30 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static htri_t
-H5S_hyper_cmp_spans (H5S_hyper_span_info_t *span_info1, H5S_hyper_span_info_t *span_info2)
+H5S_hyper_cmp_spans(H5S_hyper_span_info_t *span_info1, H5S_hyper_span_info_t *span_info2)
 {
     H5S_hyper_span_t *span1;
     H5S_hyper_span_t *span2;
-    htri_t nest=FAIL;
-    htri_t ret_value=FAIL;
+    htri_t            nest      = FAIL;
+    htri_t            ret_value = FAIL;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check for redundant comparison */
-    if(span_info1==span_info2)
-        ret_value=TRUE;
+    if (span_info1 == span_info2)
+        ret_value = TRUE;
     else {
         /* Check for both spans being NULL */
-        if(span_info1==NULL && span_info2==NULL)
-            ret_value=TRUE;
+        if (span_info1 == NULL && span_info2 == NULL)
+            ret_value = TRUE;
         else {
             /* Check for one span being NULL */
-            if(span_info1==NULL || span_info2==NULL)
-                ret_value=FALSE;
+            if (span_info1 == NULL || span_info2 == NULL)
+                ret_value = FALSE;
             else {
                 /* Get the pointers to the actual lists of spans */
-                span1=span_info1->head;
-                span2=span_info2->head;
+                span1 = span_info1->head;
+                span2 = span_info2->head;
 
                 /* Sanity checking */
                 HDassert(span1);
@@ -1442,57 +1435,56 @@ H5S_hyper_cmp_spans (H5S_hyper_span_info_t *span_info1, H5S_hyper_span_info_t *s
                 /* infinite loop which must be broken out of */
                 while (1) {
                     /* Check for both spans being NULL */
-                    if(span1==NULL && span2==NULL) {
-                        ret_value=TRUE;
+                    if (span1 == NULL && span2 == NULL) {
+                        ret_value = TRUE;
                         break;
                     } /* end if */
                     else {
                         /* Check for one span being NULL */
-                        if(span1==NULL || span2==NULL) {
-                            ret_value=FALSE;
+                        if (span1 == NULL || span2 == NULL) {
+                            ret_value = FALSE;
                             break;
                         } /* end if */
                         else {
                             /* Check if the actual low & high span information is the same */
-                            if(span1->low!=span2->low || span1->high!=span2->high) {
-                                ret_value=FALSE;
+                            if (span1->low != span2->low || span1->high != span2->high) {
+                                ret_value = FALSE;
                                 break;
                             } /* end if */
                             else {
-                                if(span1->down!=NULL || span2!=NULL) {
-                                    if((nest=H5S_hyper_cmp_spans(span1->down,span2->down))==FAIL) {
-                                        ret_value=FAIL;
+                                if (span1->down != NULL || span2 != NULL) {
+                                    if ((nest = H5S_hyper_cmp_spans(span1->down, span2->down)) == FAIL) {
+                                        ret_value = FAIL;
                                         break;
                                     } /* end if */
                                     else {
-                                        if(nest==FALSE) {
-                                            ret_value=FALSE;
+                                        if (nest == FALSE) {
+                                            ret_value = FALSE;
                                             break;
                                         } /* end if */
                                         else {
                                             /* Keep going... */
                                         } /* end else */
-                                    } /* end else */
-                                } /* end if */
+                                    }     /* end else */
+                                }         /* end if */
                                 else {
                                     /* Keep going... */
                                 } /* end else */
-                            } /* end else */
-                        } /* end else */
-                    } /* end else */
+                            }     /* end else */
+                        }         /* end else */
+                    }             /* end else */
 
                     /* Advance to the next nodes in the span list */
-                    span1=span1->next;
-                    span2=span2->next;
+                    span1 = span1->next;
+                    span2 = span2->next;
                 } /* end while */
-            } /* end else */
-        } /* end else */
-    } /* end else */
+            }     /* end else */
+        }         /* end else */
+    }             /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_cmp_spans() */
+} /* H5S_hyper_cmp_spans() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_free_span_info
@@ -1513,10 +1505,10 @@ H5S_hyper_cmp_spans (H5S_hyper_span_info_t *span_info1, H5S_hyper_span_info_t *s
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_free_span_info (H5S_hyper_span_info_t *span_info)
+H5S_hyper_free_span_info(H5S_hyper_span_info_t *span_info)
 {
     H5S_hyper_span_t *span, *next_span;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1526,15 +1518,15 @@ H5S_hyper_free_span_info (H5S_hyper_span_info_t *span_info)
     span_info->count--;
 
     /* Free the span tree if the reference count drops to zero */
-    if(span_info->count==0) {
+    if (span_info->count == 0) {
 
         /* Work through the list of spans pointed to by this 'info' node */
-        span=span_info->head;
-        while(span!=NULL) {
-            next_span=span->next;
-            if(H5S_hyper_free_span(span)<0)
+        span = span_info->head;
+        while (span != NULL) {
+            next_span = span->next;
+            if (H5S_hyper_free_span(span) < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab span")
-            span=next_span;
+            span = next_span;
         } /* end while */
 
         /* Free this span info */
@@ -1543,9 +1535,8 @@ H5S_hyper_free_span_info (H5S_hyper_span_info_t *span_info)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_free_span_info() */
+} /* H5S_hyper_free_span_info() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_free_span
@@ -1566,17 +1557,17 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_free_span (H5S_hyper_span_t *span)
+H5S_hyper_free_span(H5S_hyper_span_t *span)
 {
-    herr_t ret_value=SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(span);
 
     /* Decrement the reference count of the 'down spans', freeing them if appropriate */
-    if(span->down!=NULL) {
-        if(H5S_hyper_free_span_info(span->down)<0)
+    if (span->down != NULL) {
+        if (H5S_hyper_free_span_info(span->down) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab span tree")
     } /* end if */
 
@@ -1585,9 +1576,8 @@ H5S_hyper_free_span (H5S_hyper_span_t *span)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_free_span() */
+} /* H5S_hyper_free_span() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_copy
@@ -1613,11 +1603,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_copy (H5S_t *dst, const H5S_t *src, hbool_t share_selection)
+H5S_hyper_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection)
 {
-    H5S_hyper_sel_t *dst_hslab;         /* Pointer to destination hyperslab info */
-    const H5S_hyper_sel_t *src_hslab;   /* Pointer to source hyperslab info */
-    herr_t ret_value=SUCCEED;   /* return value */
+    H5S_hyper_sel_t *      dst_hslab;           /* Pointer to destination hyperslab info */
+    const H5S_hyper_sel_t *src_hslab;           /* Pointer to source hyperslab info */
+    herr_t                 ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1625,29 +1615,29 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src, hbool_t share_selection)
     HDassert(dst);
 
     /* Allocate space for the hyperslab selection information */
-    if(NULL == (dst->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)))
+    if (NULL == (dst->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab info")
 
     /* Set temporary pointers */
-    dst_hslab=dst->select.sel_info.hslab;
-    src_hslab=src->select.sel_info.hslab;
+    dst_hslab = dst->select.sel_info.hslab;
+    src_hslab = src->select.sel_info.hslab;
 
     /* Copy the hyperslab information */
-    dst_hslab->diminfo_valid=src_hslab->diminfo_valid;
-    if(src_hslab->diminfo_valid) {
-        size_t u;       /* Local index variable */
+    dst_hslab->diminfo_valid = src_hslab->diminfo_valid;
+    if (src_hslab->diminfo_valid) {
+        size_t u; /* Local index variable */
 
-        for(u=0; u<src->extent.rank; u++) {
-            dst_hslab->opt_diminfo[u]=src_hslab->opt_diminfo[u];
-            dst_hslab->app_diminfo[u]=src_hslab->app_diminfo[u];
+        for (u = 0; u < src->extent.rank; u++) {
+            dst_hslab->opt_diminfo[u] = src_hslab->opt_diminfo[u];
+            dst_hslab->app_diminfo[u] = src_hslab->app_diminfo[u];
         } /* end for */
-    } /* end if */
-    dst->select.sel_info.hslab->span_lst=src->select.sel_info.hslab->span_lst;
+    }     /* end if */
+    dst->select.sel_info.hslab->span_lst = src->select.sel_info.hslab->span_lst;
 
     /* Check if there is hyperslab span information to copy */
     /* (Regular hyperslab information is copied with the selection structure) */
-    if(src->select.sel_info.hslab->span_lst!=NULL) {
-        if(share_selection) {
+    if (src->select.sel_info.hslab->span_lst != NULL) {
+        if (share_selection) {
             /* Share the source's span tree by incrementing the reference count on it */
             dst->select.sel_info.hslab->span_lst->count++;
         } /* end if */
@@ -1660,7 +1650,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_hyper_copy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_is_valid_helper
@@ -1685,11 +1674,12 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static htri_t
-H5S_hyper_is_valid_helper (const H5S_hyper_span_info_t *spans, const hssize_t *offset, const hsize_t *size, hsize_t rank)
+H5S_hyper_is_valid_helper(const H5S_hyper_span_info_t *spans, const hssize_t *offset, const hsize_t *size,
+                          hsize_t rank)
 {
-    H5S_hyper_span_t *curr;     /* Hyperslab information nodes */
-    htri_t tmp;                 /* temporary return value */
-    htri_t ret_value=TRUE;      /* return value */
+    H5S_hyper_span_t *curr;             /* Hyperslab information nodes */
+    htri_t            tmp;              /* temporary return value */
+    htri_t            ret_value = TRUE; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1699,34 +1689,33 @@ H5S_hyper_is_valid_helper (const H5S_hyper_span_info_t *spans, const hssize_t *o
     HDassert(rank < H5O_LAYOUT_NDIMS);
 
     /* Check each point to determine whether selection+offset is within extent */
-    curr=spans->head;
-    while(curr!=NULL && ret_value==TRUE) {
+    curr = spans->head;
+    while (curr != NULL && ret_value == TRUE) {
         /* Check if an offset has been defined */
         /* Bounds check the selected point + offset against the extent */
-        if((((hssize_t)curr->low+offset[rank])>=(hssize_t)size[rank])
-                || (((hssize_t)curr->low+offset[rank])<0)
-                || (((hssize_t)curr->high+offset[rank])>=(hssize_t)size[rank])
-                || (((hssize_t)curr->high+offset[rank])<0)) {
-            ret_value=FALSE;
+        if ((((hssize_t)curr->low + offset[rank]) >= (hssize_t)size[rank]) ||
+            (((hssize_t)curr->low + offset[rank]) < 0) ||
+            (((hssize_t)curr->high + offset[rank]) >= (hssize_t)size[rank]) ||
+            (((hssize_t)curr->high + offset[rank]) < 0)) {
+            ret_value = FALSE;
             break;
         } /* end if */
 
         /* Recurse if this node has down spans */
-        if(curr->down!=NULL) {
-            if((tmp=H5S_hyper_is_valid_helper(curr->down,offset,size,rank+1))!=TRUE) {
-                ret_value=tmp;
+        if (curr->down != NULL) {
+            if ((tmp = H5S_hyper_is_valid_helper(curr->down, offset, size, rank + 1)) != TRUE) {
+                ret_value = tmp;
                 break;
             } /* end if */
-        } /* end if */
+        }     /* end if */
 
         /* Advance to next node */
-        curr=curr->next;
+        curr = curr->next;
     } /* end while */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_hyper_is_valid_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_is_valid
@@ -1748,49 +1737,52 @@ H5S_hyper_is_valid_helper (const H5S_hyper_span_info_t *spans, const hssize_t *o
  REVISION LOG
 --------------------------------------------------------------------------*/
 static htri_t
-H5S_hyper_is_valid (const H5S_t *space)
+H5S_hyper_is_valid(const H5S_t *space)
 {
-    unsigned u;                    /* Counter */
-    htri_t ret_value=TRUE;      /* return value */
+    unsigned u;                /* Counter */
+    htri_t   ret_value = TRUE; /* return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
     HDassert(space);
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        const H5S_hyper_dim_t *diminfo=space->select.sel_info.hslab->opt_diminfo; /* local alias for diminfo */
-        hssize_t end;      /* The high bound of a region in a dimension */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        const H5S_hyper_dim_t *diminfo =
+            space->select.sel_info.hslab->opt_diminfo; /* local alias for diminfo */
+        hssize_t end;                                  /* The high bound of a region in a dimension */
 
         /* Check each dimension */
-        for(u=0; u<space->extent.rank; u++) {
+        for (u = 0; u < space->extent.rank; u++) {
             /* if block or count is zero, then can skip the test since */
             /* no data point is chosen */
             if (diminfo[u].count && diminfo[u].block) {
                 /* Bounds check the start point in this dimension */
-                if(((hssize_t)diminfo[u].start+space->select.offset[u])<0 ||
-                        ((hssize_t)diminfo[u].start+space->select.offset[u])>=(hssize_t)space->extent.size[u])
+                if (((hssize_t)diminfo[u].start + space->select.offset[u]) < 0 ||
+                    ((hssize_t)diminfo[u].start + space->select.offset[u]) >= (hssize_t)space->extent.size[u])
                     HGOTO_DONE(FALSE)
 
                 /* Compute the largest location in this dimension */
-                end=(hssize_t)(diminfo[u].start+diminfo[u].stride*(diminfo[u].count-1)+(diminfo[u].block-1))+space->select.offset[u];
+                end = (hssize_t)(diminfo[u].start + diminfo[u].stride * (diminfo[u].count - 1) +
+                                 (diminfo[u].block - 1)) +
+                      space->select.offset[u];
 
                 /* Bounds check the end point in this dimension */
-                if(end<0 || end>=(hssize_t)space->extent.size[u])
+                if (end < 0 || end >= (hssize_t)space->extent.size[u])
                     HGOTO_DONE(FALSE)
             } /* end if */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
     else {
         /* Call the recursive routine to validate the span tree */
-        ret_value=H5S_hyper_is_valid_helper(space->select.sel_info.hslab->span_lst,space->select.offset,space->extent.size,(hsize_t)0);
+        ret_value = H5S_hyper_is_valid_helper(space->select.sel_info.hslab->span_lst, space->select.offset,
+                                              space->extent.size, (hsize_t)0);
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_hyper_is_valid() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_span_nblocks
@@ -1811,17 +1803,17 @@ done:
 static hsize_t
 H5S_hyper_span_nblocks(H5S_hyper_span_info_t *spans)
 {
-    H5S_hyper_span_t *span;     /* Hyperslab span */
-    hsize_t ret_value = 0;      /* Return value */
+    H5S_hyper_span_t *span;          /* Hyperslab span */
+    hsize_t           ret_value = 0; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Count the number of elements in the span tree */
-    if(spans != NULL) {
+    if (spans != NULL) {
         span = spans->head;
-        while(span != NULL) {
+        while (span != NULL) {
             /* If there are down spans, add the total down span blocks */
-            if(span->down!=NULL)
+            if (span->down != NULL)
                 ret_value += H5S_hyper_span_nblocks(span->down);
             /* If there are no down spans, just count the block in this span */
             else
@@ -1830,12 +1822,11 @@ H5S_hyper_span_nblocks(H5S_hyper_span_info_t *spans)
             /* Advance to next span */
             span = span->next;
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_span_nblocks() */
+} /* H5S_hyper_span_nblocks() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_get_select_hyper_nblocks
@@ -1856,27 +1847,26 @@ H5S_hyper_span_nblocks(H5S_hyper_span_info_t *spans)
 static hsize_t
 H5S_get_select_hyper_nblocks(H5S_t *space)
 {
-    hsize_t ret_value;         /* return value */
+    hsize_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        unsigned u;                 /* Local index variable */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        unsigned u; /* Local index variable */
 
         /* Check each dimension */
-        for(ret_value = 1, u = 0; u < space->extent.rank; u++)
+        for (ret_value = 1, u = 0; u < space->extent.rank; u++)
             ret_value *= space->select.sel_info.hslab->app_diminfo[u].count;
     } /* end if */
     else
         ret_value = H5S_hyper_span_nblocks(space->select.sel_info.hslab->span_lst);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_get_select_hyper_nblocks() */
+} /* H5S_get_select_hyper_nblocks() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sget_select_hyper_nblocks
@@ -1897,25 +1887,24 @@ H5S_get_select_hyper_nblocks(H5S_t *space)
 hssize_t
 H5Sget_select_hyper_nblocks(hid_t spaceid)
 {
-    H5S_t *space;               /* Dataspace to modify selection of */
-    hssize_t ret_value;         /* return value */
+    H5S_t *  space;     /* Dataspace to modify selection of */
+    hssize_t ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Hs", "i", spaceid);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if(H5S_GET_SELECT_TYPE(space) != H5S_SEL_HYPERSLABS)
+    if (H5S_GET_SELECT_TYPE(space) != H5S_SEL_HYPERSLABS)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a hyperslab selection")
 
     ret_value = (hssize_t)H5S_get_select_hyper_nblocks(space);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sget_select_hyper_nblocks() */
+} /* H5Sget_select_hyper_nblocks() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_serial_size
@@ -1938,9 +1927,9 @@ done:
 static hssize_t
 H5S_hyper_serial_size(const H5S_t *space)
 {
-    unsigned u;                 /* Counter */
-    hsize_t block_count;       /* block counter for regular hyperslabs */
-    hssize_t ret_value;         /* return value */
+    unsigned u;           /* Counter */
+    hsize_t  block_count; /* block counter for regular hyperslabs */
+    hssize_t ret_value;   /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1953,9 +1942,9 @@ H5S_hyper_serial_size(const H5S_t *space)
     ret_value = 24;
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
+    if (space->select.sel_info.hslab->diminfo_valid) {
         /* Check each dimension */
-        for(block_count = 1, u = 0; u < space->extent.rank; u++)
+        for (block_count = 1, u = 0; u < space->extent.rank; u++)
             block_count *= space->select.sel_info.hslab->opt_diminfo[u].count;
     } /* end if */
     else
@@ -1968,7 +1957,6 @@ H5S_hyper_serial_size(const H5S_t *space)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_hyper_serial_size() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_serialize_helper
@@ -1992,11 +1980,12 @@ H5S_hyper_serial_size(const H5S_t *space)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start, hsize_t *end, hsize_t rank, uint8_t **buf)
+H5S_hyper_serialize_helper(const H5S_hyper_span_info_t *spans, hsize_t *start, hsize_t *end, hsize_t rank,
+                           uint8_t **buf)
 {
-    H5S_hyper_span_t *curr;     /* Pointer to current hyperslab span */
-    hsize_t u;                  /* Index variable */
-    herr_t ret_value=SUCCEED;  /* return value */
+    H5S_hyper_span_t *curr;                /* Pointer to current hyperslab span */
+    hsize_t           u;                   /* Index variable */
+    herr_t            ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2008,30 +1997,30 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start,
     HDassert(buf && *buf);
 
     /* Walk through the list of spans, recursing or outputing them */
-    curr=spans->head;
-    while(curr!=NULL) {
+    curr = spans->head;
+    while (curr != NULL) {
         /* Recurse if this node has down spans */
-        if(curr->down!=NULL) {
+        if (curr->down != NULL) {
             /* Add the starting and ending points for this span to the list */
-            start[rank]=curr->low;
-            end[rank]=curr->high;
+            start[rank] = curr->low;
+            end[rank]   = curr->high;
 
             /* Recurse down to the next dimension */
-            if(H5S_hyper_serialize_helper(curr->down,start,end,rank+1,buf)<0)
+            if (H5S_hyper_serialize_helper(curr->down, start, end, rank + 1, buf) < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans")
         } /* end if */
         else {
             /* Encode all the previous dimensions starting & ending points */
 
             /* Encode previous starting points */
-            for(u=0; u<rank; u++)
+            for (u = 0; u < rank; u++)
                 UINT32ENCODE(*buf, (uint32_t)start[u]);
 
             /* Encode starting point for this span */
             UINT32ENCODE(*buf, (uint32_t)curr->low);
 
             /* Encode previous ending points */
-            for(u=0; u<rank; u++)
+            for (u = 0; u < rank; u++)
                 UINT32ENCODE(*buf, (uint32_t)end[u]);
 
             /* Encode starting point for this span */
@@ -2039,14 +2028,13 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start,
         } /* end else */
 
         /* Advance to next node */
-        curr=curr->next;
+        curr = curr->next;
     } /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_serialize_helper() */
+} /* H5S_hyper_serialize_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_serialize
@@ -2067,38 +2055,38 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_serialize (const H5S_t *space, uint8_t *buf)
+H5S_hyper_serialize(const H5S_t *space, uint8_t *buf)
 {
-    const H5S_hyper_dim_t *diminfo;         /* Alias for dataspace's diminfo information */
-    hsize_t tmp_count[H5O_LAYOUT_NDIMS];    /* Temporary hyperslab counts */
-    hsize_t offset[H5O_LAYOUT_NDIMS];       /* Offset of element in dataspace */
-    hsize_t start[H5O_LAYOUT_NDIMS];        /* Location of start of hyperslab */
-    hsize_t end[H5O_LAYOUT_NDIMS];          /* Location of end of hyperslab */
-    hsize_t bounds_start[H5S_MAX_RANK];     /* Selection bounds */
-    hsize_t bounds_end[H5S_MAX_RANK];       /* Selection bounds */
-    hsize_t temp_off;       /* Offset in a given dimension */
-    uint8_t *lenp;          /* pointer to length location for later storage */
-    uint32_t len = 0;       /* number of bytes used */
-    hsize_t block_count;    /* block counter for regular hyperslabs */
-    unsigned fast_dim;      /* Rank of the fastest changing dimension for the dataspace */
-    unsigned ndims;         /* Rank of the dataspace */
-    int done;               /* Whether we are done with the iteration */
-    unsigned u;             /* Local index variable */
-    herr_t ret_value = SUCCEED;             /* Return value */
+    const H5S_hyper_dim_t *diminfo;                     /* Alias for dataspace's diminfo information */
+    hsize_t                tmp_count[H5O_LAYOUT_NDIMS]; /* Temporary hyperslab counts */
+    hsize_t                offset[H5O_LAYOUT_NDIMS];    /* Offset of element in dataspace */
+    hsize_t                start[H5O_LAYOUT_NDIMS];     /* Location of start of hyperslab */
+    hsize_t                end[H5O_LAYOUT_NDIMS];       /* Location of end of hyperslab */
+    hsize_t                bounds_start[H5S_MAX_RANK];  /* Selection bounds */
+    hsize_t                bounds_end[H5S_MAX_RANK];    /* Selection bounds */
+    hsize_t                temp_off;                    /* Offset in a given dimension */
+    uint8_t *              lenp;                        /* pointer to length location for later storage */
+    uint32_t               len = 0;                     /* number of bytes used */
+    hsize_t                block_count;                 /* block counter for regular hyperslabs */
+    unsigned               fast_dim;            /* Rank of the fastest changing dimension for the dataspace */
+    unsigned               ndims;               /* Rank of the dataspace */
+    int                    done;                /* Whether we are done with the iteration */
+    unsigned               u;                   /* Local index variable */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
 
     /* Set some convienence values */
-    ndims = space->extent.rank;
+    ndims    = space->extent.rank;
     fast_dim = ndims - 1;
-    diminfo=space->select.sel_info.hslab->opt_diminfo;
+    diminfo  = space->select.sel_info.hslab->opt_diminfo;
 
     /* Calculate the # of blocks */
-    if(H5S_hyper_is_regular(space)) {
+    if (H5S_hyper_is_regular(space)) {
         /* Check each dimension */
-        for(block_count = 1, u = 0; u < ndims; u++)
+        for (block_count = 1, u = 0; u < ndims; u++)
             block_count *= diminfo[u].count;
     } /* end if */
     else
@@ -2106,89 +2094,89 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf)
         block_count = H5S_hyper_span_nblocks(space->select.sel_info.hslab->span_lst);
 
     /* Get bounding box */
-    if(H5S_hyper_bounds(space, bounds_start, bounds_end) < 0)
+    if (H5S_hyper_bounds(space, bounds_start, bounds_end) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get selection bounds")
 
     /* Determine whether the number of blocks or the high bounds in the selection exceed (2^32 - 1) */
-    if(block_count > H5S_UINT32_MAX)
+    if (block_count > H5S_UINT32_MAX)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "invalid number of blocks in selection")
     else {
-        for(u = 0; u < ndims; u++)
-            if(bounds_end[u] > H5S_UINT32_MAX)
+        for (u = 0; u < ndims; u++)
+            if (bounds_end[u] > H5S_UINT32_MAX)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "invalid hyperslab selection")
     }
 
     /* Store the preamble information */
-    UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space));  /* Store the type of selection */
-    UINT32ENCODE(buf, (uint32_t)H5S_HYPER_VERSION_1);  /* Store the version number */
-    UINT32ENCODE(buf, (uint32_t)0);  /* Store the un-used padding */
-    lenp = buf;           /* keep the pointer to the length location for later */
-    buf += 4;             /* skip over space for length */
+    UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */
+    UINT32ENCODE(buf, (uint32_t)H5S_HYPER_VERSION_1);        /* Store the version number */
+    UINT32ENCODE(buf, (uint32_t)0);                          /* Store the un-used padding */
+    lenp = buf; /* keep the pointer to the length location for later */
+    buf += 4;   /* skip over space for length */
 
     /* Encode number of dimensions */
     UINT32ENCODE(buf, (uint32_t)space->extent.rank);
     len += 4;
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
+    if (space->select.sel_info.hslab->diminfo_valid) {
 
         /* Encode number of hyperslabs */
         H5_CHECK_OVERFLOW(block_count, hsize_t, uint32_t);
         UINT32ENCODE(buf, (uint32_t)block_count);
-        len+=4;
+        len += 4;
 
         /* Now serialize the information for the regular hyperslab */
 
         /* Build the tables of count sizes as well as the initial offset */
-        for(u = 0; u < ndims; u++) {
+        for (u = 0; u < ndims; u++) {
             tmp_count[u] = diminfo[u].count;
-            offset[u] = diminfo[u].start;
+            offset[u]    = diminfo[u].start;
         } /* end for */
 
         /* We're not done with the iteration */
-        done=0;
+        done = 0;
 
         /* Go iterate over the hyperslabs */
-        while(done==0) {
+        while (done == 0) {
             /* Iterate over the blocks in the fastest dimension */
-            while(tmp_count[fast_dim]>0) {
+            while (tmp_count[fast_dim] > 0) {
                 /* Add 8 bytes times the rank for each hyperslab selected */
-                len+=8*ndims;
+                len += 8 * ndims;
 
                 /* Encode hyperslab starting location */
-                for(u = 0; u < ndims; u++)
+                for (u = 0; u < ndims; u++)
                     UINT32ENCODE(buf, (uint32_t)offset[u]);
 
                 /* Encode hyperslab ending location */
-                for(u = 0; u < ndims; u++)
+                for (u = 0; u < ndims; u++)
                     UINT32ENCODE(buf, (uint32_t)(offset[u] + (diminfo[u].block - 1)));
 
                 /* Move the offset to the next sequence to start */
-                offset[fast_dim]+=diminfo[fast_dim].stride;
+                offset[fast_dim] += diminfo[fast_dim].stride;
 
                 /* Decrement the block count */
                 tmp_count[fast_dim]--;
             } /* end while */
 
             /* Work on other dimensions if necessary */
-            if(fast_dim > 0) {
-                int temp_dim;           /* Temporary rank holder */
+            if (fast_dim > 0) {
+                int temp_dim; /* Temporary rank holder */
 
                 /* Reset the block counts */
-                tmp_count[fast_dim]=diminfo[fast_dim].count;
+                tmp_count[fast_dim] = diminfo[fast_dim].count;
 
                 /* Bubble up the decrement to the slower changing dimensions */
                 temp_dim = (int)fast_dim - 1;
-                while(temp_dim >= 0 && done == 0) {
+                while (temp_dim >= 0 && done == 0) {
                     /* Decrement the block count */
                     tmp_count[temp_dim]--;
 
                     /* Check if we have more blocks left */
-                    if(tmp_count[temp_dim] > 0)
+                    if (tmp_count[temp_dim] > 0)
                         break;
 
                     /* Check for getting out of iterator */
-                    if(temp_dim == 0)
+                    if (temp_dim == 0)
                         done = 1;
 
                     /* Reset the block count in this dimension */
@@ -2197,22 +2185,22 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf)
                     /* Wrapped a dimension, go up to next dimension */
                     temp_dim--;
                 } /* end while */
-            } /* end if */
+            }     /* end if */
             else
-                break;  /* Break out now, for 1-D selections */
+                break; /* Break out now, for 1-D selections */
 
             /* Re-compute offset array */
-            for(u = 0; u < ndims; u++) {
-                temp_off = diminfo[u].start + diminfo[u].stride * (diminfo[u].count - tmp_count[u]);
+            for (u = 0; u < ndims; u++) {
+                temp_off  = diminfo[u].start + diminfo[u].stride * (diminfo[u].count - tmp_count[u]);
                 offset[u] = temp_off;
             } /* end for */
-        } /* end while */
-    } /* end if */
+        }     /* end while */
+    }         /* end if */
     else {
         /* Encode number of hyperslabs */
         H5_CHECK_OVERFLOW(block_count, hsize_t, uint32_t);
         UINT32ENCODE(buf, (uint32_t)block_count);
-        len+=4;
+        len += 4;
 
         /* Add 8 bytes times the rank for each hyperslab selected */
         H5_CHECK_OVERFLOW((8 * space->extent.rank * block_count), hsize_t, size_t);
@@ -2223,13 +2211,12 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf)
     } /* end else */
 
     /* Encode length */
-    UINT32ENCODE(lenp, (uint32_t)len);  /* Store the length of the extra information */
+    UINT32ENCODE(lenp, (uint32_t)len); /* Store the length of the extra information */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_serialize() */
+} /* H5S_hyper_serialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_deserialize
@@ -2250,24 +2237,24 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_deserialize (H5S_t *space, const uint8_t *buf)
+H5S_hyper_deserialize(H5S_t *space, const uint8_t *buf)
 {
-    uint32_t rank;           	/* rank of points */
-    size_t num_elem=0;      	/* number of elements in selection */
-    hsize_t start[H5O_LAYOUT_NDIMS];	/* hyperslab start information */
-    hsize_t end[H5O_LAYOUT_NDIMS];	/* hyperslab end information */
-    hsize_t stride[H5O_LAYOUT_NDIMS];   /* hyperslab stride information */
-    hsize_t count[H5O_LAYOUT_NDIMS];    /* hyperslab count information */
-    hsize_t block[H5O_LAYOUT_NDIMS];    /* hyperslab block information */
-    hsize_t *tstart=NULL;	/* temporary hyperslab pointers */
-    hsize_t *tend=NULL;		/* temporary hyperslab pointers */
-    hsize_t *tstride=NULL;	/* temporary hyperslab pointers */
-    hsize_t *tcount=NULL;	/* temporary hyperslab pointers */
-    hsize_t *tblock=NULL;	/* temporary hyperslab pointers */
-    unsigned i,j;           /* local counting variables */
-    uint32_t version;       /* decoded version */
-    uint8_t *p;             /* temporary pointer to buf */
-    herr_t ret_value=FAIL;  /* return value */
+    uint32_t rank;                     /* rank of points */
+    size_t   num_elem = 0;             /* number of elements in selection */
+    hsize_t  start[H5O_LAYOUT_NDIMS];  /* hyperslab start information */
+    hsize_t  end[H5O_LAYOUT_NDIMS];    /* hyperslab end information */
+    hsize_t  stride[H5O_LAYOUT_NDIMS]; /* hyperslab stride information */
+    hsize_t  count[H5O_LAYOUT_NDIMS];  /* hyperslab count information */
+    hsize_t  block[H5O_LAYOUT_NDIMS];  /* hyperslab block information */
+    hsize_t *tstart  = NULL;           /* temporary hyperslab pointers */
+    hsize_t *tend    = NULL;           /* temporary hyperslab pointers */
+    hsize_t *tstride = NULL;           /* temporary hyperslab pointers */
+    hsize_t *tcount  = NULL;           /* temporary hyperslab pointers */
+    hsize_t *tblock  = NULL;           /* temporary hyperslab pointers */
+    unsigned i, j;                     /* local counting variables */
+    uint32_t version;                  /* decoded version */
+    uint8_t *p;                        /* temporary pointer to buf */
+    herr_t   ret_value = FAIL;         /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2278,47 +2265,47 @@ H5S_hyper_deserialize (H5S_t *space, const uint8_t *buf)
     p = buf + 4;
     UINT32DECODE(p, version);
 
-    if(version < H5S_HYPER_VERSION_1 || version > H5S_HYPER_VERSION_LATEST)
+    if (version < H5S_HYPER_VERSION_1 || version > H5S_HYPER_VERSION_LATEST)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "bad version number for hyperslab selection")
 
-
     /* Deserialize slabs to select */
-    buf+=16;    /* Skip over selection header */
-    UINT32DECODE(buf,rank);  /* decode the rank of the point selection */
-    if(rank!=space->extent.rank)
+    buf += 16;               /* Skip over selection header */
+    UINT32DECODE(buf, rank); /* decode the rank of the point selection */
+    if (rank != space->extent.rank)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "rank of pointer does not match dataspace")
-    UINT32DECODE(buf,num_elem);  /* decode the number of points */
+    UINT32DECODE(buf, num_elem); /* decode the number of points */
 
     /* Set the count & stride for all blocks */
-    for(tcount=count,tstride=stride,j=0; j<rank; j++,tstride++,tcount++) {
-        *tcount=1;
-        *tstride=1;
+    for (tcount = count, tstride = stride, j = 0; j < rank; j++, tstride++, tcount++) {
+        *tcount  = 1;
+        *tstride = 1;
     } /* end for */
 
     /* Retrieve the coordinates from the buffer */
-    for(i=0; i<num_elem; i++) {
+    for (i = 0; i < num_elem; i++) {
         /* Decode the starting points */
-        for(tstart=start,j=0; j<rank; j++,tstart++)
+        for (tstart = start, j = 0; j < rank; j++, tstart++)
             UINT32DECODE(buf, *tstart);
 
         /* Decode the ending points */
-        for(tend=end,j=0; j<rank; j++,tend++)
+        for (tend = end, j = 0; j < rank; j++, tend++)
             UINT32DECODE(buf, *tend);
 
         /* Change the ending points into blocks */
-        for(tblock=block,tstart=start,tend=end,j=0; j<(unsigned)rank; j++,tstart++,tend++,tblock++)
-            *tblock=(*tend-*tstart)+1;
+        for (tblock = block, tstart = start, tend = end, j = 0; j < (unsigned)rank;
+             j++, tstart++, tend++, tblock++)
+            *tblock = (*tend - *tstart) + 1;
 
         /* Select or add the hyperslab to the current selection */
-        if((ret_value=H5S_select_hyperslab(space,(i==0 ? H5S_SELECT_SET : H5S_SELECT_OR),start,stride,count,block))<0)
+        if ((ret_value = H5S_select_hyperslab(space, (i == 0 ? H5S_SELECT_SET : H5S_SELECT_OR), start, stride,
+                                              count, block)) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
     } /* end for */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_deserialize() */
+} /* H5S_hyper_deserialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_span_blocklist
@@ -2353,11 +2340,12 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t end[], hsize_t rank, hsize_t *startblock, hsize_t *numblocks, hsize_t **buf)
+H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t end[], hsize_t rank,
+                         hsize_t *startblock, hsize_t *numblocks, hsize_t **buf)
 {
-    H5S_hyper_span_t *curr;     /* Pointer to current hyperslab span */
-    hsize_t u;                  /* Index variable */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5S_hyper_span_t *curr;                /* Pointer to current hyperslab span */
+    hsize_t           u;                   /* Index variable */
+    herr_t            ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2372,20 +2360,20 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t
 
     /* Walk through the list of spans, recursing or outputing them */
     curr = spans->head;
-    while(curr != NULL && *numblocks > 0) {
+    while (curr != NULL && *numblocks > 0) {
         /* Recurse if this node has down spans */
-        if(curr->down != NULL) {
+        if (curr->down != NULL) {
             /* Add the starting and ending points for this span to the list */
             start[rank] = curr->low;
-            end[rank] = curr->high;
+            end[rank]   = curr->high;
 
             /* Recurse down to the next dimension */
-            if(H5S_hyper_span_blocklist(curr->down, start, end, (rank + 1), startblock, numblocks, buf) < 0)
+            if (H5S_hyper_span_blocklist(curr->down, start, end, (rank + 1), startblock, numblocks, buf) < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans")
         } /* end if */
         else {
             /* Skip this block if we haven't skipped all the startblocks yet */
-            if(*startblock > 0) {
+            if (*startblock > 0) {
                 /* Decrement the starting block */
                 (*startblock)--;
             } /* end if */
@@ -2394,7 +2382,7 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t
                 /* Encode all the previous dimensions starting & ending points */
 
                 /* Copy previous starting points */
-                for(u = 0; u < rank; u++, (*buf)++)
+                for (u = 0; u < rank; u++, (*buf)++)
                     HDmemcpy(*buf, &start[u], sizeof(hsize_t));
 
                 /* Copy starting point for this span */
@@ -2402,7 +2390,7 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t
                 (*buf)++;
 
                 /* Copy previous ending points */
-                for(u = 0; u < rank; u++, (*buf)++)
+                for (u = 0; u < rank; u++, (*buf)++)
                     HDmemcpy(*buf, &end[u], sizeof(hsize_t));
 
                 /* Copy starting point for this span */
@@ -2412,7 +2400,7 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t
                 /* Decrement the number of blocks processed */
                 (*numblocks)--;
             } /* end else */
-        } /* end else */
+        }     /* end else */
 
         /* Advance to next node */
         curr = curr->next;
@@ -2420,9 +2408,8 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_span_blocklist() */
+} /* H5S_hyper_span_blocklist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_get_select_hyper_blocklist
@@ -2454,7 +2441,8 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startblock, hsize_t numblocks, hsize_t *buf)
+H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startblock, hsize_t numblocks,
+                               hsize_t *buf)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
@@ -2464,21 +2452,21 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
     HDassert(buf);
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        const H5S_hyper_dim_t *diminfo; /* Alias for dataspace's diminfo information */
-        hsize_t tmp_count[H5O_LAYOUT_NDIMS];    /* Temporary hyperslab counts */
-        hsize_t offset[H5O_LAYOUT_NDIMS];      /* Offset of element in dataspace */
-        unsigned fast_dim;          /* Rank of the fastest changing dimension for the dataspace */
-        unsigned ndims;             /* Rank of the dataspace */
-        hbool_t done;               /* Whether we are done with the iteration */
-        unsigned u;                 /* Counter */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        const H5S_hyper_dim_t *diminfo;                     /* Alias for dataspace's diminfo information */
+        hsize_t                tmp_count[H5O_LAYOUT_NDIMS]; /* Temporary hyperslab counts */
+        hsize_t                offset[H5O_LAYOUT_NDIMS];    /* Offset of element in dataspace */
+        unsigned               fast_dim; /* Rank of the fastest changing dimension for the dataspace */
+        unsigned               ndims;    /* Rank of the dataspace */
+        hbool_t                done;     /* Whether we are done with the iteration */
+        unsigned               u;        /* Counter */
 
         /* Set some convienence values */
-        ndims = space->extent.rank;
+        ndims    = space->extent.rank;
         fast_dim = ndims - 1;
 
         /* Check which set of dimension information to use */
-        if(internal)
+        if (internal)
             /*
              * Use the "optimized dimension information" to pass back information
              * on the blocks set, not the "application information".
@@ -2492,30 +2480,30 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
             diminfo = space->select.sel_info.hslab->app_diminfo;
 
         /* Build the tables of count sizes as well as the initial offset */
-        for(u = 0; u < ndims; u++) {
+        for (u = 0; u < ndims; u++) {
             tmp_count[u] = diminfo[u].count;
-            offset[u] = diminfo[u].start;
+            offset[u]    = diminfo[u].start;
         } /* end for */
 
         /* We're not done with the iteration */
         done = FALSE;
 
         /* Go iterate over the hyperslabs */
-        while(!done && numblocks > 0) {
-            hsize_t temp_off;           /* Offset in a given dimension */
+        while (!done && numblocks > 0) {
+            hsize_t temp_off; /* Offset in a given dimension */
 
             /* Iterate over the blocks in the fastest dimension */
-            while(tmp_count[fast_dim] > 0 && numblocks > 0) {
+            while (tmp_count[fast_dim] > 0 && numblocks > 0) {
 
                 /* Check if we should copy this block information */
-                if(startblock == 0) {
+                if (startblock == 0) {
                     /* Copy the starting location */
                     HDmemcpy(buf, offset, sizeof(hsize_t) * ndims);
                     buf += ndims;
 
                     /* Compute the ending location */
                     HDmemcpy(buf, offset, sizeof(hsize_t) * ndims);
-                    for(u = 0; u < ndims; u++)
+                    for (u = 0; u < ndims; u++)
                         buf[u] += (diminfo[u].block - 1);
                     buf += ndims;
 
@@ -2533,24 +2521,24 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
             } /* end while */
 
             /* Work on other dimensions if necessary */
-            if(fast_dim > 0 && numblocks > 0) {
-                int temp_dim;               /* Temporary rank holder */
+            if (fast_dim > 0 && numblocks > 0) {
+                int temp_dim; /* Temporary rank holder */
 
                 /* Reset the block counts */
                 tmp_count[fast_dim] = diminfo[fast_dim].count;
 
                 /* Bubble up the decrement to the slower changing dimensions */
                 temp_dim = (int)(fast_dim - 1);
-                while(temp_dim >= 0 && !done) {
+                while (temp_dim >= 0 && !done) {
                     /* Decrement the block count */
                     tmp_count[temp_dim]--;
 
                     /* Check if we have more blocks left */
-                    if(tmp_count[temp_dim] > 0)
+                    if (tmp_count[temp_dim] > 0)
                         break;
 
                     /* Check for getting out of iterator */
-                    if(temp_dim == 0)
+                    if (temp_dim == 0)
                         done = TRUE;
 
                     /* Reset the block count in this dimension */
@@ -2559,26 +2547,26 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
                     /* Wrapped a dimension, go up to next dimension */
                     temp_dim--;
                 } /* end while */
-            } /* end if */
+            }     /* end if */
 
             /* Re-compute offset array */
-            for(u = 0; u < ndims; u++) {
-                temp_off = diminfo[u].start + diminfo[u].stride * (diminfo[u].count - tmp_count[u]);
+            for (u = 0; u < ndims; u++) {
+                temp_off  = diminfo[u].start + diminfo[u].stride * (diminfo[u].count - tmp_count[u]);
                 offset[u] = temp_off;
             } /* end for */
-        } /* end while */
-    } /* end if */
+        }     /* end while */
+    }         /* end if */
     else {
-        hsize_t start[H5O_LAYOUT_NDIMS];   /* Location of start of hyperslab */
-        hsize_t end[H5O_LAYOUT_NDIMS];     /* Location of end of hyperslab */
+        hsize_t start[H5O_LAYOUT_NDIMS]; /* Location of start of hyperslab */
+        hsize_t end[H5O_LAYOUT_NDIMS];   /* Location of end of hyperslab */
 
-        ret_value = H5S_hyper_span_blocklist(space->select.sel_info.hslab->span_lst, start, end, (hsize_t)0, &startblock, &numblocks, &buf);
+        ret_value = H5S_hyper_span_blocklist(space->select.sel_info.hslab->span_lst, start, end, (hsize_t)0,
+                                             &startblock, &numblocks, &buf);
     } /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_get_select_hyper_blocklist() */
+} /* H5S_get_select_hyper_blocklist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sget_select_hyper_blocklist
@@ -2610,34 +2598,33 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock,
-    hsize_t numblocks, hsize_t buf[/*numblocks*/])
+H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks,
+                              hsize_t buf[/*numblocks*/])
 {
-    H5S_t *space;               /* Dataspace to modify selection of */
-    herr_t ret_value;           /* return value */
+    H5S_t *space;     /* Dataspace to modify selection of */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "ihh*[a2]h", spaceid, startblock, numblocks, buf);
 
     /* Check args */
-    if(buf == NULL)
+    if (buf == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if(H5S_GET_SELECT_TYPE(space)!=H5S_SEL_HYPERSLABS)
+    if (H5S_GET_SELECT_TYPE(space) != H5S_SEL_HYPERSLABS)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a hyperslab selection")
 
     /* Go get the correct number of blocks */
-    if(numblocks > 0)
+    if (numblocks > 0)
         ret_value = H5S_get_select_hyper_blocklist(space, 0, startblock, numblocks, buf);
     else
-        ret_value=SUCCEED;      /* Successfully got 0 blocks... */
+        ret_value = SUCCEED; /* Successfully got 0 blocks... */
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sget_select_hyper_blocklist() */
+} /* H5Sget_select_hyper_blocklist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_bounds_helper
@@ -2667,10 +2654,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_bounds_helper(const H5S_hyper_span_info_t *spans, const hssize_t *offset, hsize_t rank, hsize_t *start, hsize_t *end)
+H5S_hyper_bounds_helper(const H5S_hyper_span_info_t *spans, const hssize_t *offset, hsize_t rank,
+                        hsize_t *start, hsize_t *end)
 {
-    H5S_hyper_span_t *curr;             /* Hyperslab information nodes */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5S_hyper_span_t *curr;                /* Hyperslab information nodes */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2681,21 +2669,21 @@ H5S_hyper_bounds_helper(const H5S_hyper_span_info_t *spans, const hssize_t *offs
     HDassert(end);
 
     /* Check each point to determine whether selection+offset is within extent */
-    curr=spans->head;
-    while(curr!=NULL) {
+    curr = spans->head;
+    while (curr != NULL) {
         /* Check for offset moving selection negative */
-        if(((hssize_t)curr->low + offset[rank]) < 0)
+        if (((hssize_t)curr->low + offset[rank]) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
 
         /* Check if the current span extends the bounding box */
-        if((curr->low + (hsize_t)offset[rank]) < start[rank])
+        if ((curr->low + (hsize_t)offset[rank]) < start[rank])
             start[rank] = curr->low + (hsize_t)offset[rank];
-        if((curr->high + (hsize_t)offset[rank]) > end[rank])
+        if ((curr->high + (hsize_t)offset[rank]) > end[rank])
             end[rank] = curr->high + (hsize_t)offset[rank];
 
         /* Recurse if this node has down spans */
-        if(curr->down != NULL) {
-            if(H5S_hyper_bounds_helper(curr->down, offset, (rank + 1), start, end) < 0)
+        if (curr->down != NULL) {
+            if (H5S_hyper_bounds_helper(curr->down, offset, (rank + 1), start, end) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "failure in lower dimension")
         } /* end if */
 
@@ -2707,7 +2695,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_hyper_bounds_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_bounds
@@ -2737,9 +2724,9 @@ done:
 static herr_t
 H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 {
-    unsigned rank;              /* Dataspace rank */
-    unsigned i;                 /* index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    unsigned rank;                /* Dataspace rank */
+    unsigned i;                   /* index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2749,38 +2736,40 @@ H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 
     /* Set the start and end arrays up */
     rank = space->extent.rank;
-    for(i = 0; i < rank; i++) {
+    for (i = 0; i < rank; i++) {
         start[i] = HSIZET_MAX;
-        end[i] = 0;
+        end[i]   = 0;
     } /* end for */
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        const H5S_hyper_dim_t *diminfo = space->select.sel_info.hslab->opt_diminfo; /* local alias for diminfo */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        const H5S_hyper_dim_t *diminfo =
+            space->select.sel_info.hslab->opt_diminfo; /* local alias for diminfo */
 
         /* Check each dimension */
-        for(i = 0; i < rank; i++) {
+        for (i = 0; i < rank; i++) {
             /* Check for offset moving selection negative */
-            if((space->select.offset[i] + (hssize_t)diminfo[i].start) < 0)
+            if ((space->select.offset[i] + (hssize_t)diminfo[i].start) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
 
             /* Compute the smallest location in this dimension */
             start[i] = diminfo[i].start + (hsize_t)space->select.offset[i];
 
             /* Compute the largest location in this dimension */
-            end[i] = diminfo[i].start + diminfo[i].stride * (diminfo[i].count - 1) + (diminfo[i].block - 1) + (hsize_t)space->select.offset[i];
+            end[i] = diminfo[i].start + diminfo[i].stride * (diminfo[i].count - 1) + (diminfo[i].block - 1) +
+                     (hsize_t)space->select.offset[i];
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
         /* Call the recursive routine to get the bounds for the span tree */
-        ret_value = H5S_hyper_bounds_helper(space->select.sel_info.hslab->span_lst, space->select.offset, (hsize_t)0, start, end);
+        ret_value = H5S_hyper_bounds_helper(space->select.sel_info.hslab->span_lst, space->select.offset,
+                                            (hsize_t)0, start, end);
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_bounds() */
+} /* H5S_hyper_bounds() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_offset
@@ -2804,37 +2793,39 @@ done:
 static herr_t
 H5S_hyper_offset(const H5S_t *space, hsize_t *offset)
 {
-    const hssize_t *sel_offset; /* Pointer to the selection's offset */
-    const hsize_t *dim_size;    /* Pointer to a dataspace's extent */
-    hsize_t accum;              /* Accumulator for dimension sizes */
-    unsigned rank;              /* Dataspace rank */
-    int i;                      /* index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    const hssize_t *sel_offset;          /* Pointer to the selection's offset */
+    const hsize_t * dim_size;            /* Pointer to a dataspace's extent */
+    hsize_t         accum;               /* Accumulator for dimension sizes */
+    unsigned        rank;                /* Dataspace rank */
+    int             i;                   /* index variable */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert(space && space->extent.rank>0);
+    HDassert(space && space->extent.rank > 0);
     HDassert(offset);
 
     /* Start at linear offset 0 */
     *offset = 0;
 
     /* Set up pointers to arrays of values */
-    rank = space->extent.rank;
+    rank       = space->extent.rank;
     sel_offset = space->select.offset;
-    dim_size = space->extent.size;
+    dim_size   = space->extent.size;
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        const H5S_hyper_dim_t *diminfo = space->select.sel_info.hslab->opt_diminfo; /* Local alias for diminfo */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        const H5S_hyper_dim_t *diminfo =
+            space->select.sel_info.hslab->opt_diminfo; /* Local alias for diminfo */
 
         /* Loop through starting coordinates, calculating the linear offset */
         accum = 1;
-        for(i = (int)(rank - 1); i >= 0; i--) {
-            hssize_t hyp_offset = (hssize_t)diminfo[i].start + sel_offset[i]; /* Hyperslab's offset in this dimension */
+        for (i = (int)(rank - 1); i >= 0; i--) {
+            hssize_t hyp_offset =
+                (hssize_t)diminfo[i].start + sel_offset[i]; /* Hyperslab's offset in this dimension */
 
             /* Check for offset moving selection out of the dataspace */
-            if(hyp_offset < 0 || (hsize_t)hyp_offset >= dim_size[i])
+            if (hyp_offset < 0 || (hsize_t)hyp_offset >= dim_size[i])
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
 
             /* Add the hyperslab's offset in this dimension to the total linear offset */
@@ -2843,14 +2834,14 @@ H5S_hyper_offset(const H5S_t *space, hsize_t *offset)
             /* Increase the accumulator */
             accum *= dim_size[i];
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
-        const H5S_hyper_span_t *span;           /* Hyperslab span node */
-        hsize_t dim_accum[H5S_MAX_RANK];        /* Accumulators, for each dimension */
+        const H5S_hyper_span_t *span;                    /* Hyperslab span node */
+        hsize_t                 dim_accum[H5S_MAX_RANK]; /* Accumulators, for each dimension */
 
         /* Calculate the accumulator for each dimension */
         accum = 1;
-        for(i = (int)(rank - 1); i >= 0; i--) {
+        for (i = (int)(rank - 1); i >= 0; i--) {
             /* Set the accumulator for this dimension */
             dim_accum[i] = accum;
 
@@ -2863,18 +2854,19 @@ H5S_hyper_offset(const H5S_t *space, hsize_t *offset)
 
         /* Work down the spans, computing the linear offset */
         i = 0;
-        while(span) {
-            hssize_t hyp_offset = (hssize_t)span->low + sel_offset[i]; /* Hyperslab's offset in this dimension */
+        while (span) {
+            hssize_t hyp_offset =
+                (hssize_t)span->low + sel_offset[i]; /* Hyperslab's offset in this dimension */
 
             /* Check for offset moving selection out of the dataspace */
-            if(hyp_offset < 0 || (hsize_t)hyp_offset >= dim_size[i])
+            if (hyp_offset < 0 || (hsize_t)hyp_offset >= dim_size[i])
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
 
             /* Add the hyperslab's offset in this dimension to the total linear offset */
             *offset += (hsize_t)(hyp_offset * (hssize_t)dim_accum[i]);
 
             /* Advance to first span in "down" dimension */
-            if(span->down) {
+            if (span->down) {
                 HDassert(span->down->head);
                 span = span->down->head;
             } /* end if */
@@ -2882,13 +2874,12 @@ H5S_hyper_offset(const H5S_t *space, hsize_t *offset)
                 span = NULL;
             i++;
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_offset() */
+} /* H5S_hyper_offset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_is_contiguous
@@ -2910,18 +2901,19 @@ done:
 static htri_t
 H5S_hyper_is_contiguous(const H5S_t *space)
 {
-    unsigned small_contiguous,      /* Flag for small contiguous block */
-        large_contiguous;           /* Flag for large contiguous block */
-    unsigned u;                     /* index variable */
-    htri_t ret_value = FALSE;       /* Return value */
+    unsigned small_contiguous,  /* Flag for small contiguous block */
+        large_contiguous;       /* Flag for large contiguous block */
+    unsigned u;                 /* index variable */
+    htri_t   ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
     HDassert(space);
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        const H5S_hyper_dim_t *diminfo=space->select.sel_info.hslab->opt_diminfo; /* local alias for diminfo */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        const H5S_hyper_dim_t *diminfo =
+            space->select.sel_info.hslab->opt_diminfo; /* local alias for diminfo */
 
         /*
          * For a regular hyperslab to be contiguous, it must have only one
@@ -2937,43 +2929,43 @@ H5S_hyper_is_contiguous(const H5S_t *space)
          */
 
         /* Initialize flags */
-        large_contiguous=TRUE;	/* assume true and reset if the dimensions don't match */
-        small_contiguous=FALSE;	/* assume false initially */
+        large_contiguous = TRUE;  /* assume true and reset if the dimensions don't match */
+        small_contiguous = FALSE; /* assume false initially */
 
         /* Check for a "large contigous" block */
-        for(u=0; u<space->extent.rank; u++) {
-            if(diminfo[u].count>1) {
-                large_contiguous=FALSE;
+        for (u = 0; u < space->extent.rank; u++) {
+            if (diminfo[u].count > 1) {
+                large_contiguous = FALSE;
                 break;
             } /* end if */
-            if(u>0 && diminfo[u].block!=space->extent.size[u]) {
-                large_contiguous=FALSE;
+            if (u > 0 && diminfo[u].block != space->extent.size[u]) {
+                large_contiguous = FALSE;
                 break;
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /* If we didn't find a large contiguous block, check for a small one */
-        if(large_contiguous==FALSE) {
-            small_contiguous=TRUE;
-            for(u=0; u<space->extent.rank; u++) {
-                if(diminfo[u].count>1) {
-                    small_contiguous=FALSE;
+        if (large_contiguous == FALSE) {
+            small_contiguous = TRUE;
+            for (u = 0; u < space->extent.rank; u++) {
+                if (diminfo[u].count > 1) {
+                    small_contiguous = FALSE;
                     break;
                 } /* end if */
-                if(u<(space->extent.rank-1) && diminfo[u].block!=1) {
-                    small_contiguous=FALSE;
+                if (u < (space->extent.rank - 1) && diminfo[u].block != 1) {
+                    small_contiguous = FALSE;
                     break;
                 } /* end if */
-            } /* end for */
-        } /* end if */
+            }     /* end for */
+        }         /* end if */
 
         /* Indicate true if it's either a large or small contiguous block */
-        if(large_contiguous || small_contiguous)
-            ret_value=TRUE;
+        if (large_contiguous || small_contiguous)
+            ret_value = TRUE;
     } /* end if */
     else {
-        H5S_hyper_span_info_t *spans;   /* Hyperslab span info node */
-        H5S_hyper_span_t *span;         /* Hyperslab span node */
+        H5S_hyper_span_info_t *spans; /* Hyperslab span info node */
+        H5S_hyper_span_t *     span;  /* Hyperslab span node */
 
         /*
          * For a hyperslab to be contiguous, it must have only one block and
@@ -2983,97 +2975,98 @@ H5S_hyper_is_contiguous(const H5S_t *space)
          * block size must be 1 in all but the fastest changing dimension).
          */
         /* Initialize flags */
-        large_contiguous=TRUE;	/* assume true and reset if the dimensions don't match */
-        small_contiguous=FALSE;	/* assume false initially */
+        large_contiguous = TRUE;  /* assume true and reset if the dimensions don't match */
+        small_contiguous = FALSE; /* assume false initially */
 
         /* Get information for slowest changing information */
-        spans=space->select.sel_info.hslab->span_lst;
-        span=spans->head;
+        spans = space->select.sel_info.hslab->span_lst;
+        span  = spans->head;
 
         /* If there are multiple spans in the slowest changing dimension, the selection isn't contiguous */
-        if(span->next!=NULL)
-            large_contiguous=FALSE;
+        if (span->next != NULL)
+            large_contiguous = FALSE;
         else {
             /* Now check the rest of the dimensions */
-            if(span->down!=NULL) {
-                u=1;    /* Current dimension working on */
+            if (span->down != NULL) {
+                u = 1; /* Current dimension working on */
 
                 /* Get the span information for the next fastest dimension */
-                spans=span->down;
+                spans = span->down;
 
                 /* Cycle down the spans until we run out of down spans or find a non-contiguous span */
-                while(spans!=NULL) {
-                    span=spans->head;
+                while (spans != NULL) {
+                    span = spans->head;
 
                     /* Check that this is the only span and it spans the entire dimension */
-                    if(span->next!=NULL) {
-                        large_contiguous=FALSE;
+                    if (span->next != NULL) {
+                        large_contiguous = FALSE;
                         break;
                     } /* end if */
                     else {
-                        /* If this span doesn't cover the entire dimension, then this selection isn't contiguous */
-                        if(((span->high-span->low)+1)!=space->extent.size[u]) {
-                            large_contiguous=FALSE;
+                        /* If this span doesn't cover the entire dimension, then this selection isn't
+                         * contiguous */
+                        if (((span->high - span->low) + 1) != space->extent.size[u]) {
+                            large_contiguous = FALSE;
                             break;
                         } /* end if */
                         else {
                             /* Walk down to the next span */
-                            spans=span->down;
+                            spans = span->down;
 
                             /* Increment dimension */
                             u++;
                         } /* end else */
-                    } /* end else */
-                } /* end while */
-            } /* end if */
-        } /* end else */
+                    }     /* end else */
+                }         /* end while */
+            }             /* end if */
+        }                 /* end else */
 
         /* If we didn't find a large contiguous block, check for a small one */
-        if(large_contiguous==FALSE) {
-            small_contiguous=TRUE;
+        if (large_contiguous == FALSE) {
+            small_contiguous = TRUE;
 
             /* Get information for slowest changing information */
-            spans=space->select.sel_info.hslab->span_lst;
-            span=spans->head;
+            spans = space->select.sel_info.hslab->span_lst;
+            span  = spans->head;
 
             /* Current dimension working on */
-            u=0;
+            u = 0;
 
             /* Cycle down the spans until we run out of down spans or find a non-contiguous span */
-            while(spans!=NULL) {
-                span=spans->head;
+            while (spans != NULL) {
+                span = spans->head;
 
                 /* Check that this is the only span and it spans the entire dimension */
-                if(span->next!=NULL) {
-                    small_contiguous=FALSE;
+                if (span->next != NULL) {
+                    small_contiguous = FALSE;
                     break;
                 } /* end if */
                 else {
-                    /* If this span doesn't cover the entire dimension, then this selection isn't contiguous */
-                    if(u<(space->extent.rank-1) && ((span->high-span->low)+1)!=1) {
-                        small_contiguous=FALSE;
+                    /* If this span doesn't cover the entire dimension, then this selection isn't contiguous
+                     */
+                    if (u < (space->extent.rank - 1) && ((span->high - span->low) + 1) != 1) {
+                        small_contiguous = FALSE;
                         break;
                     } /* end if */
                     else {
                         /* Walk down to the next span */
-                        spans=span->down;
+                        spans = span->down;
 
                         /* Increment dimension */
                         u++;
                     } /* end else */
-                } /* end else */
-            } /* end while */
-        } /* end if */
+                }     /* end else */
+            }         /* end while */
+        }             /* end if */
 
         /* Indicate true if it's either a large or small contiguous block */
-        if(large_contiguous || small_contiguous)
-            ret_value=TRUE;
+        if (large_contiguous || small_contiguous)
+            ret_value = TRUE;
     } /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_is_contiguous() */
+} /* H5S_hyper_is_contiguous() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_is_single
@@ -3095,53 +3088,52 @@ H5S_hyper_is_contiguous(const H5S_t *space)
 static htri_t
 H5S_hyper_is_single(const H5S_t *space)
 {
-    H5S_hyper_span_info_t *spans;   /* Hyperslab span info node */
-    H5S_hyper_span_t *span;         /* Hyperslab span node */
-    unsigned u;                     /* index variable */
-    htri_t ret_value=TRUE;         /* return value */
+    H5S_hyper_span_info_t *spans;            /* Hyperslab span info node */
+    H5S_hyper_span_t *     span;             /* Hyperslab span node */
+    unsigned               u;                /* index variable */
+    htri_t                 ret_value = TRUE; /* return value */
 
     FUNC_ENTER_NOAPI_NOERR
 
     HDassert(space);
 
     /* Check for a "single" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
+    if (space->select.sel_info.hslab->diminfo_valid) {
         /*
          * For a regular hyperslab to be single, it must have only one
          * block (i.e. count==1 in all dimensions)
          */
 
         /* Check for a single block */
-        for(u=0; u<space->extent.rank; u++) {
-            if(space->select.sel_info.hslab->opt_diminfo[u].count>1)
+        for (u = 0; u < space->extent.rank; u++) {
+            if (space->select.sel_info.hslab->opt_diminfo[u].count > 1)
                 HGOTO_DONE(FALSE)
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
         /*
          * For a region to be single, it must have only one block
          */
         /* Get information for slowest changing information */
-        spans=space->select.sel_info.hslab->span_lst;
+        spans = space->select.sel_info.hslab->span_lst;
 
         /* Cycle down the spans until we run out of down spans or find a non-contiguous span */
-        while(spans!=NULL) {
-            span=spans->head;
+        while (spans != NULL) {
+            span = spans->head;
 
             /* Check that this is the only span and it spans the entire dimension */
-            if(span->next!=NULL)
+            if (span->next != NULL)
                 HGOTO_DONE(FALSE)
             else
                 /* Walk down to the next span */
-                spans=span->down;
+                spans = span->down;
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_is_single() */
+} /* H5S_hyper_is_single() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_is_regular
@@ -3165,7 +3157,7 @@ done:
 static htri_t
 H5S_hyper_is_regular(const H5S_t *space)
 {
-    htri_t ret_value;  /* return value */
+    htri_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -3173,15 +3165,14 @@ H5S_hyper_is_regular(const H5S_t *space)
     HDassert(space);
 
     /* Only simple check for regular hyperslabs for now... */
-    if(space->select.sel_info.hslab->diminfo_valid)
-        ret_value=TRUE;
+    if (space->select.sel_info.hslab->diminfo_valid)
+        ret_value = TRUE;
     else
-        ret_value=FALSE;
+        ret_value = FALSE;
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_is_regular() */
+} /* H5S_hyper_is_regular() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_release
@@ -3218,8 +3209,8 @@ H5S_hyper_release(H5S_t *space)
     space->select.num_elem = 0;
 
     /* Release irregular hyperslab information */
-    if(space->select.sel_info.hslab->span_lst != NULL) {
-        if(H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst) < 0)
+    if (space->select.sel_info.hslab->span_lst != NULL) {
+        if (H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans")
     } /* end if */
 
@@ -3228,9 +3219,8 @@ H5S_hyper_release(H5S_t *space)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_release() */
+} /* H5S_hyper_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_recover_span
@@ -3252,7 +3242,7 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_recover_span (unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hyper_span_t *next_span)
+H5S_hyper_recover_span(unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hyper_span_t *next_span)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -3260,18 +3250,17 @@ H5S_hyper_recover_span (unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hyp
     HDassert(curr_span);
 
     /* Check if the span should be recovered */
-    if(*recover) {
+    if (*recover) {
         H5S_hyper_free_span(*curr_span);
-        *recover=0;
+        *recover = 0;
     } /* end if */
 
     /* Set the current span to next span */
-    *curr_span=next_span;
+    *curr_span = next_span;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_recover_span() */
+} /* H5S_hyper_recover_span() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_coord_to_span
@@ -3293,9 +3282,9 @@ H5S_hyper_recover_span (unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hyp
 static H5S_hyper_span_t *
 H5S_hyper_coord_to_span(unsigned rank, hsize_t *coords)
 {
-    H5S_hyper_span_t *new_span;         /* Pointer to new span tree for coordinate */
-    H5S_hyper_span_info_t *down=NULL;   /* Pointer to new span tree for next level down */
-    H5S_hyper_span_t *ret_value=NULL;   /* Return value */
+    H5S_hyper_span_t *     new_span;         /* Pointer to new span tree for coordinate */
+    H5S_hyper_span_info_t *down      = NULL; /* Pointer to new span tree for next level down */
+    H5S_hyper_span_t *     ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3303,39 +3292,38 @@ H5S_hyper_coord_to_span(unsigned rank, hsize_t *coords)
     HDassert(coords);
 
     /* Search for location to insert new element in tree */
-    if(rank>1) {
+    if (rank > 1) {
         /* Allocate a span info node */
-        if((down = H5FL_MALLOC(H5S_hyper_span_info_t))==NULL)
+        if ((down = H5FL_MALLOC(H5S_hyper_span_info_t)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
         /* Set the reference count */
-        down->count=0;
+        down->count = 0;
 
         /* Reset the scratch pad space */
-        down->scratch=0;
+        down->scratch = 0;
 
         /* Build span tree for coordinates below this one */
-        if((down->head=H5S_hyper_coord_to_span(rank-1,&coords[1]))==NULL)
+        if ((down->head = H5S_hyper_coord_to_span(rank - 1, &coords[1])) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
     } /* end if */
 
     /* Build span for this coordinate */
-    if((new_span = H5S_hyper_new_span(coords[0],coords[0],down,NULL))==NULL)
+    if ((new_span = H5S_hyper_new_span(coords[0], coords[0], down, NULL)) == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
     /* Set return value */
-    ret_value=new_span;
+    ret_value = new_span;
 
 done:
-    if(ret_value==NULL) {
-        if(down!=NULL)
+    if (ret_value == NULL) {
+        if (down != NULL)
             H5S_hyper_free_span_info(down);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_coord_to_span() */
+} /* H5S_hyper_coord_to_span() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_add_span_element_helper
@@ -3359,12 +3347,12 @@ done:
 static herr_t
 H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned rank, hsize_t *coords)
 {
-    H5S_hyper_span_info_t *tspan_info;  /* Temporary pointer to span info */
-    H5S_hyper_span_info_t *prev_span_info;  /* Pointer to span info for level above current position */
-    H5S_hyper_span_t *tmp_span;         /* Temporary pointer to a span */
-    H5S_hyper_span_t *tmp2_span;        /* Another temporary pointer to a span */
-    H5S_hyper_span_t *new_span;         /* New span created for element */
-    herr_t ret_value=SUCCEED;           /* Return value */
+    H5S_hyper_span_info_t *tspan_info;          /* Temporary pointer to span info */
+    H5S_hyper_span_info_t *prev_span_info;      /* Pointer to span info for level above current position */
+    H5S_hyper_span_t *     tmp_span;            /* Temporary pointer to a span */
+    H5S_hyper_span_t *     tmp2_span;           /* Another temporary pointer to a span */
+    H5S_hyper_span_t *     new_span;            /* New span created for element */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3373,38 +3361,38 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
     HDassert(coords);
 
     /* Get pointer to last span in span tree */
-    tspan_info=span_tree;
-    if(span_tree->scratch)
-        tmp_span=(H5S_hyper_span_t *)span_tree->scratch;
+    tspan_info = span_tree;
+    if (span_tree->scratch)
+        tmp_span = (H5S_hyper_span_t *)span_tree->scratch;
     else {
-        tmp_span=span_tree->head;
+        tmp_span = span_tree->head;
         HDassert(tmp_span);
-        span_tree->scratch=(H5S_hyper_span_info_t *)tmp_span;
+        span_tree->scratch = (H5S_hyper_span_info_t *)tmp_span;
     } /* end else */
 
     /* Find last span tree which includes a portion of the coordinate */
-    prev_span_info=NULL;
-    while(coords[0]>=tmp_span->low && coords[0]<=tmp_span->high) {
+    prev_span_info = NULL;
+    while (coords[0] >= tmp_span->low && coords[0] <= tmp_span->high) {
         /* Move rank & coordinate offset down a dimension */
         rank--;
         coords++;
 
         /* Remember the span tree we are descending into */
-        prev_span_info=tspan_info;
-        tspan_info=tmp_span->down;
+        prev_span_info = tspan_info;
+        tspan_info     = tmp_span->down;
 
         /* Get the last span in this span's 'down' tree */
-        if(tspan_info->scratch)
-            tmp_span=(H5S_hyper_span_t *)tspan_info->scratch;
+        if (tspan_info->scratch)
+            tmp_span = (H5S_hyper_span_t *)tspan_info->scratch;
         else {
-            tmp_span=tspan_info->head;
+            tmp_span = tspan_info->head;
             HDassert(tmp_span);
-            tspan_info->scratch=(H5S_hyper_span_info_t *)tmp_span;
+            tspan_info->scratch = (H5S_hyper_span_info_t *)tmp_span;
         } /* end else */
-    } /* end while */
+    }     /* end while */
 
     /* Check if we made it all the way to the bottom span in the tree */
-    if(rank>1) {
+    if (rank > 1) {
         /* Before we create another span at this level in the tree, check if
          * the last span's "down tree" was equal to any other spans in this
          * list of spans in the span tree.
@@ -3413,11 +3401,11 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
          * previous span (if possible), or at least share their "down tree"
          * information.
          */
-        tmp2_span=tspan_info->head;
-        while(tmp2_span!=tmp_span) {
-            if(H5S_hyper_cmp_spans(tmp2_span->down,tmp_span->down)==TRUE) {
+        tmp2_span = tspan_info->head;
+        while (tmp2_span != tmp_span) {
+            if (H5S_hyper_cmp_spans(tmp2_span->down, tmp_span->down) == TRUE) {
                 /* Check for merging into previous span */
-                if(tmp2_span->high+1==tmp_span->low) {
+                if (tmp2_span->high + 1 == tmp_span->low) {
                     /* Release last span created */
                     H5S_hyper_free_span(tmp_span);
 
@@ -3426,7 +3414,7 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
                     tmp2_span->nelem++;
 
                     /* Reset the 'tmp_span' for the rest of this block's algorithm */
-                    tmp_span=tmp2_span;
+                    tmp_span = tmp2_span;
                 } /* end if */
                 /* Span is disjoint, but has the same "down tree" selection */
                 else {
@@ -3434,7 +3422,7 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
                     H5S_hyper_free_span_info(tmp_span->down);
 
                     /* Point at earlier span's "down tree" */
-                    tmp_span->down=tmp2_span->down;
+                    tmp_span->down = tmp2_span->down;
 
                     /* Increment reference count on shared "down tree" */
                     tmp_span->down->count++;
@@ -3445,32 +3433,32 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
             } /* end if */
 
             /* Advance to next span to check */
-            tmp2_span=tmp2_span->next;
+            tmp2_span = tmp2_span->next;
         } /* end while */
 
         /* Make span tree for current coordinates */
-        if((new_span=H5S_hyper_coord_to_span(rank,coords))==NULL)
+        if ((new_span = H5S_hyper_coord_to_span(rank, coords)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
         /* Add new span tree as span */
         HDassert(tmp_span);
-        tmp_span->next=new_span;
+        tmp_span->next = new_span;
 
         /* Make scratch pointer point to last span in list */
         HDassert(tspan_info);
-        tspan_info->scratch=(H5S_hyper_span_info_t *)new_span;
+        tspan_info->scratch = (H5S_hyper_span_info_t *)new_span;
 
         /* Set the proper 'pstride' for new span */
-        new_span->pstride=new_span->low-tmp_span->low;
+        new_span->pstride = new_span->low - tmp_span->low;
     } /* end if */
     else {
         /* Does new node adjoin existing node? */
-        if(tmp_span->high+1==coords[0]) {
+        if (tmp_span->high + 1 == coords[0]) {
             tmp_span->high++;
             tmp_span->nelem++;
 
             /* Check if this span tree should now be merged with a level higher in the tree */
-            if(prev_span_info!=NULL) {
+            if (prev_span_info != NULL) {
                 /* Before we create another span at this level in the tree, check if
                  * the last span's "down tree" was equal to any other spans in this
                  * list of spans in the span tree.
@@ -3479,12 +3467,12 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
                  * previous span (if possible), or at least share their "down tree"
                  * information.
                  */
-                tmp2_span=prev_span_info->head;
-                tmp_span=(H5S_hyper_span_t *)prev_span_info->scratch;
-                while(tmp2_span!=tmp_span) {
-                    if(H5S_hyper_cmp_spans(tmp2_span->down,tmp_span->down)==TRUE) {
+                tmp2_span = prev_span_info->head;
+                tmp_span  = (H5S_hyper_span_t *)prev_span_info->scratch;
+                while (tmp2_span != tmp_span) {
+                    if (H5S_hyper_cmp_spans(tmp2_span->down, tmp_span->down) == TRUE) {
                         /* Check for merging into previous span */
-                        if(tmp2_span->high+1==tmp_span->low) {
+                        if (tmp2_span->high + 1 == tmp_span->low) {
                             /* Release last span created */
                             H5S_hyper_free_span(tmp_span);
 
@@ -3493,8 +3481,8 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
                             tmp2_span->nelem++;
 
                             /* Update pointers */
-                            tmp2_span->next=NULL;
-                            prev_span_info->scratch=(H5S_hyper_span_info_t *)tmp2_span;
+                            tmp2_span->next         = NULL;
+                            prev_span_info->scratch = (H5S_hyper_span_info_t *)tmp2_span;
                         } /* end if */
                         /* Span is disjoint, but has the same "down tree" selection */
                         else {
@@ -3502,7 +3490,7 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
                             H5S_hyper_free_span_info(tmp_span->down);
 
                             /* Point at earlier span's "down tree" */
-                            tmp_span->down=tmp2_span->down;
+                            tmp_span->down = tmp2_span->down;
 
                             /* Increment reference count on shared "down tree" */
                             tmp_span->down->count++;
@@ -3513,31 +3501,30 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
                     } /* end if */
 
                     /* Advance to next span to check */
-                    tmp2_span=tmp2_span->next;
+                    tmp2_span = tmp2_span->next;
                 } /* end while */
-            } /* end if */
-        } /* end if */
+            }     /* end if */
+        }         /* end if */
         else {
-            if((new_span = H5S_hyper_new_span(coords[0],coords[0],NULL,NULL))==NULL)
+            if ((new_span = H5S_hyper_new_span(coords[0], coords[0], NULL, NULL)) == NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
             /* Add new span tree as span */
             HDassert(tmp_span);
-            tmp_span->next=new_span;
+            tmp_span->next = new_span;
 
             /* Make scratch pointer point to last span in list */
-            tspan_info->scratch=(H5S_hyper_span_info_t *)new_span;
+            tspan_info->scratch = (H5S_hyper_span_info_t *)new_span;
 
             /* Set the proper 'pstride' for new span */
-            new_span->pstride=new_span->low-tmp_span->low;
+            new_span->pstride = new_span->low - tmp_span->low;
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_add_span_element_helper() */
+} /* H5S_hyper_add_span_element_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_add_span_element
@@ -3561,8 +3548,8 @@ done:
 herr_t
 H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hsize_t *coords)
 {
-    H5S_hyper_span_info_t *head = NULL;    /* Pointer to new head of span tree */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5S_hyper_span_info_t *head      = NULL;    /* Pointer to new head of span tree */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3571,9 +3558,9 @@ H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hsize_t *coords)
     HDassert(coords);
 
     /* Check if this is the first element in the selection */
-    if(NULL == space->select.sel_info.hslab) {
+    if (NULL == space->select.sel_info.hslab) {
         /* Allocate a span info node */
-        if(NULL == (head = H5FL_MALLOC(H5S_hyper_span_info_t)))
+        if (NULL == (head = H5FL_MALLOC(H5S_hyper_span_info_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
         /* Set the reference count */
@@ -3583,11 +3570,11 @@ H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hsize_t *coords)
         head->scratch = 0;
 
         /* Build span tree for this coordinate */
-        if(NULL == (head->head = H5S_hyper_coord_to_span(rank, coords)))
+        if (NULL == (head->head = H5S_hyper_coord_to_span(rank, coords)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
         /* Allocate selection info */
-        if(NULL == (space->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)))
+        if (NULL == (space->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab info")
 
         /* Set the selection to the new span tree */
@@ -3603,7 +3590,7 @@ H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hsize_t *coords)
         space->select.num_elem = 1;
     } /* end if */
     else {
-        if(H5S_hyper_add_span_element_helper(space->select.sel_info.hslab->span_lst, rank, coords) < 0)
+        if (H5S_hyper_add_span_element_helper(space->select.sel_info.hslab->span_lst, rank, coords) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
         /* Increment # of elements in selection */
@@ -3611,14 +3598,13 @@ H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hsize_t *coords)
     } /* end else */
 
 done:
-    if(ret_value < 0)
-        if(head)
+    if (ret_value < 0)
+        if (head)
             H5S_hyper_free_span_info(head);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_add_span_element() */
+} /* H5S_hyper_add_span_element() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_reset_scratch
@@ -3645,14 +3631,13 @@ H5S_hyper_reset_scratch(H5S_t *space)
     HDassert(space);
 
     /* Check if there are spans in the span tree */
-    if(space->select.sel_info.hslab->span_lst != NULL)
+    if (space->select.sel_info.hslab->span_lst != NULL)
         /* Reset the scratch pointers for the next routine which needs them */
         H5S_hyper_span_scratch(space->select.sel_info.hslab->span_lst, NULL);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_reset_scratch() */
+} /* H5S_hyper_reset_scratch() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_convert
@@ -3676,38 +3661,39 @@ H5S_hyper_reset_scratch(H5S_t *space)
 herr_t
 H5S_hyper_convert(H5S_t *space)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
 
     /* Check the type of selection */
-    switch(H5S_GET_SELECT_TYPE(space)) {
-        case H5S_SEL_ALL:    /* All elements selected in dataspace */
+    switch (H5S_GET_SELECT_TYPE(space)) {
+        case H5S_SEL_ALL: /* All elements selected in dataspace */
             /* Convert current "all" selection to "real" hyperslab selection */
             {
-                hsize_t tmp_start[H5O_LAYOUT_NDIMS];   /* Temporary start information */
-                hsize_t tmp_stride[H5O_LAYOUT_NDIMS];   /* Temporary stride information */
-                hsize_t tmp_count[H5O_LAYOUT_NDIMS];    /* Temporary count information */
-                hsize_t tmp_block[H5O_LAYOUT_NDIMS];    /* Temporary block information */
-                unsigned u;                             /* Local index variable */
+                hsize_t  tmp_start[H5O_LAYOUT_NDIMS];  /* Temporary start information */
+                hsize_t  tmp_stride[H5O_LAYOUT_NDIMS]; /* Temporary stride information */
+                hsize_t  tmp_count[H5O_LAYOUT_NDIMS];  /* Temporary count information */
+                hsize_t  tmp_block[H5O_LAYOUT_NDIMS];  /* Temporary block information */
+                unsigned u;                            /* Local index variable */
 
                 /* Fill in temporary information for the dimensions */
-                for(u=0; u<space->extent.rank; u++) {
-                    tmp_start[u]=0;
-                    tmp_stride[u]=1;
-                    tmp_count[u]=1;
-                    tmp_block[u]=space->extent.size[u];
+                for (u = 0; u < space->extent.rank; u++) {
+                    tmp_start[u]  = 0;
+                    tmp_stride[u] = 1;
+                    tmp_count[u]  = 1;
+                    tmp_block[u]  = space->extent.size[u];
                 } /* end for */
 
                 /* Convert to hyperslab selection */
-                if(H5S_select_hyperslab(space,H5S_SELECT_SET,tmp_start,tmp_stride,tmp_count,tmp_block)<0)
+                if (H5S_select_hyperslab(space, H5S_SELECT_SET, tmp_start, tmp_stride, tmp_count, tmp_block) <
+                    0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection")
             } /* end case */
             break;
 
-        case H5S_SEL_HYPERSLABS:        /* Hyperslab selection */
+        case H5S_SEL_HYPERSLABS: /* Hyperslab selection */
             break;
 
         case H5S_SEL_NONE:   /* No elements selected in dataspace */
@@ -3720,10 +3706,10 @@ H5S_hyper_convert(H5S_t *space)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_convert() */
+} /* H5S_hyper_convert() */
 
 #ifdef LATER
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_intersect_helper
@@ -3743,12 +3729,12 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static htri_t
-H5S_hyper_intersect_helper (H5S_hyper_span_info_t *spans1, H5S_hyper_span_info_t *spans2)
+H5S_hyper_intersect_helper(H5S_hyper_span_info_t *spans1, H5S_hyper_span_info_t *spans2)
 {
-    H5S_hyper_span_t *curr1;    /* Pointer to current span in 1st span tree */
-    H5S_hyper_span_t *curr2;    /* Pointer to current span in 2nd span tree */
-    htri_t status;              /* Status from recursive call */
-    htri_t ret_value=FALSE;     /* Return value */
+    H5S_hyper_span_t *curr1;             /* Pointer to current span in 1st span tree */
+    H5S_hyper_span_t *curr2;             /* Pointer to current span in 2nd span tree */
+    htri_t            status;            /* Status from recursive call */
+    htri_t            ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3756,44 +3742,43 @@ H5S_hyper_intersect_helper (H5S_hyper_span_info_t *spans1, H5S_hyper_span_info_t
     HDassert((spans1 && spans2) || (spans1 == NULL && spans2 == NULL));
 
     /* "NULL" span trees compare as overlapping */
-    if(spans1==NULL && spans2==NULL)
+    if (spans1 == NULL && spans2 == NULL)
         HGOTO_DONE(TRUE);
 
     /* Get the span lists for each span in this tree */
-    curr1=spans1->head;
-    curr2=spans2->head;
+    curr1 = spans1->head;
+    curr2 = spans2->head;
 
     /* Iterate over the spans in each tree */
-    while(curr1!=NULL && curr2!=NULL) {
+    while (curr1 != NULL && curr2 != NULL) {
         /* Check for 1st span entirely before 2nd span */
-        if(curr1->high<curr2->low)
-            curr1=curr1->next;
+        if (curr1->high < curr2->low)
+            curr1 = curr1->next;
         /* Check for 2nd span entirely before 1st span */
-        else if(curr2->high<curr1->low)
-            curr2=curr2->next;
+        else if (curr2->high < curr1->low)
+            curr2 = curr2->next;
         /* Spans must overlap */
         else {
             /* Recursively check spans in next dimension down */
-            if((status=H5S_hyper_intersect_helper(curr1->down,curr2->down))<0)
+            if ((status = H5S_hyper_intersect_helper(curr1->down, curr2->down)) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab intersection check")
 
             /* If there is a span intersection in the down dimensions, the span trees overlap */
-            if(status==TRUE)
+            if (status == TRUE)
                 HGOTO_DONE(TRUE);
 
             /* No intersection in down dimensions, advance to next span */
-            if(curr1->high<curr2->high)
-                curr1=curr1->next;
+            if (curr1->high < curr2->high)
+                curr1 = curr1->next;
             else
-                curr2=curr2->next;
+                curr2 = curr2->next;
         } /* end else */
-    } /* end while */
+    }     /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_intersect_helper() */
+} /* H5S_hyper_intersect_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_intersect
@@ -3813,9 +3798,9 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 htri_t
-H5S_hyper_intersect (H5S_t *space1, H5S_t *space2)
+H5S_hyper_intersect(H5S_t *space1, H5S_t *space2)
 {
-    htri_t ret_value=FAIL;      /* Return value */
+    htri_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3824,24 +3809,23 @@ H5S_hyper_intersect (H5S_t *space1, H5S_t *space2)
     HDassert(space2);
 
     /* Check that the space selections both have span trees */
-    if(space1->select.sel_info.hslab->span_lst==NULL ||
-            space2->select.sel_info.hslab->span_lst==NULL)
+    if (space1->select.sel_info.hslab->span_lst == NULL || space2->select.sel_info.hslab->span_lst == NULL)
         HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, FAIL, "dataspace does not have span tree")
 
     /* Check that the dataspaces are both the same rank */
-    if(space1->extent.rank!=space2->extent.rank)
+    if (space1->extent.rank != space2->extent.rank)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "dataspace ranks don't match")
 
     /* Perform the span-by-span intersection check */
-    if((ret_value=H5S_hyper_intersect_helper(space1->select.sel_info.hslab->span_lst,space2->select.sel_info.hslab->span_lst))<0)
+    if ((ret_value = H5S_hyper_intersect_helper(space1->select.sel_info.hslab->span_lst,
+                                                space2->select.sel_info.hslab->span_lst)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab intersection check")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_intersect() */
+} /* H5S_hyper_intersect() */
 #endif /* LATER */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_intersect_block_helper
@@ -3863,11 +3847,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static htri_t
-H5S_hyper_intersect_block_helper (const H5S_hyper_span_info_t *spans, hsize_t *start, hsize_t *end)
+H5S_hyper_intersect_block_helper(const H5S_hyper_span_info_t *spans, hsize_t *start, hsize_t *end)
 {
-    H5S_hyper_span_t *curr;     /* Pointer to current span in 1st span tree */
-    htri_t status;              /* Status from recursive call */
-    htri_t ret_value=FALSE;     /* Return value */
+    H5S_hyper_span_t *curr;              /* Pointer to current span in 1st span tree */
+    htri_t            status;            /* Status from recursive call */
+    htri_t            ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3877,41 +3861,41 @@ H5S_hyper_intersect_block_helper (const H5S_hyper_span_info_t *spans, hsize_t *s
     HDassert(end);
 
     /* Get the span list for spans in this tree */
-    curr=spans->head;
+    curr = spans->head;
 
     /* Iterate over the spans in the tree */
-    while(curr!=NULL) {
+    while (curr != NULL) {
         /* Check for span entirely before block */
-        if(curr->high < *start)
+        if (curr->high < *start)
             /* Advance to next span in this dimension */
-            curr=curr->next;
+            curr = curr->next;
         /* If this span is past the end of the block, then we're done in this dimension */
-        else if(curr->low > *end)
+        else if (curr->low > *end)
             HGOTO_DONE(FALSE)
         /* block & span overlap */
         else {
-            if(curr->down==NULL)
+            if (curr->down == NULL)
                 HGOTO_DONE(TRUE)
             else {
                 /* Recursively check spans in next dimension down */
-                if((status=H5S_hyper_intersect_block_helper(curr->down,start+1,end+1))<0)
-                    HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab intersection check")
+                if ((status = H5S_hyper_intersect_block_helper(curr->down, start + 1, end + 1)) < 0)
+                    HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL,
+                                "can't perform hyperslab intersection check")
 
                 /* If there is a span intersection in the down dimensions, the span trees overlap */
-                if(status==TRUE)
+                if (status == TRUE)
                     HGOTO_DONE(TRUE);
 
                 /* No intersection in down dimensions, advance to next span */
-                curr=curr->next;
+                curr = curr->next;
             } /* end else */
-        } /* end else */
-    } /* end while */
+        }     /* end else */
+    }         /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_intersect_block_helper() */
+} /* H5S_hyper_intersect_block_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_intersect_block
@@ -3932,9 +3916,9 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 htri_t
-H5S_hyper_intersect_block (H5S_t *space, hsize_t *start, hsize_t *end)
+H5S_hyper_intersect_block(H5S_t *space, hsize_t *start, hsize_t *end)
 {
-    htri_t ret_value=FAIL;      /* Return value */
+    htri_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3945,23 +3929,23 @@ H5S_hyper_intersect_block (H5S_t *space, hsize_t *start, hsize_t *end)
 
     /* Check for 'all' selection, instead of a hyperslab selection */
     /* (Technically, this shouldn't be in the "hyperslab" routines...) */
-    if(H5S_GET_SELECT_TYPE(space)==H5S_SEL_ALL)
+    if (H5S_GET_SELECT_TYPE(space) == H5S_SEL_ALL)
         HGOTO_DONE(TRUE);
 
     /* Check that the space selection has a span tree */
-    if(space->select.sel_info.hslab->span_lst==NULL)
-        if(H5S_hyper_generate_spans(space)<0)
+    if (space->select.sel_info.hslab->span_lst == NULL)
+        if (H5S_hyper_generate_spans(space) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, FAIL, "dataspace does not have span tree")
 
     /* Perform the span-by-span intersection check */
-    if((ret_value=H5S_hyper_intersect_block_helper(space->select.sel_info.hslab->span_lst,start,end))<0)
+    if ((ret_value = H5S_hyper_intersect_block_helper(space->select.sel_info.hslab->span_lst, start, end)) <
+        0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab intersection check")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_intersect_block() */
+} /* H5S_hyper_intersect_block() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_adjust_helper_u
@@ -3981,9 +3965,9 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_adjust_helper_u (H5S_hyper_span_info_t *spans, const hsize_t *offset)
+H5S_hyper_adjust_helper_u(H5S_hyper_span_info_t *spans, const hsize_t *offset)
 {
-    H5S_hyper_span_t *span;     /* Pointer to current span in span tree */
+    H5S_hyper_span_t *span; /* Pointer to current span in span tree */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -3992,33 +3976,32 @@ H5S_hyper_adjust_helper_u (H5S_hyper_span_info_t *spans, const hsize_t *offset)
     HDassert(offset);
 
     /* Check if we've already set this down span tree */
-    if(spans->scratch!=(H5S_hyper_span_info_t *)~((size_t)NULL)) {
+    if (spans->scratch != (H5S_hyper_span_info_t *)~((size_t)NULL)) {
         /* Set the tree's scratch pointer */
-        spans->scratch=(H5S_hyper_span_info_t *)~((size_t)NULL);
+        spans->scratch = (H5S_hyper_span_info_t *)~((size_t)NULL);
 
         /* Get the span lists for each span in this tree */
-        span=spans->head;
+        span = spans->head;
 
         /* Iterate over the spans in tree */
-        while(span!=NULL) {
+        while (span != NULL) {
             /* Adjust span offset */
-            HDassert(span->low>=*offset);
-            span->low-=*offset;
-            span->high-=*offset;
+            HDassert(span->low >= *offset);
+            span->low -= *offset;
+            span->high -= *offset;
 
             /* Recursively adjust spans in next dimension down */
-            if(span->down!=NULL)
-                H5S_hyper_adjust_helper_u(span->down,offset+1);
+            if (span->down != NULL)
+                H5S_hyper_adjust_helper_u(span->down, offset + 1);
 
             /* Advance to next span in this dimension */
-            span=span->next;
+            span = span->next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_adjust_helper_u() */
+} /* H5S_hyper_adjust_helper_u() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_adjust_u
@@ -4040,8 +4023,8 @@ H5S_hyper_adjust_helper_u (H5S_hyper_span_info_t *spans, const hsize_t *offset)
 static herr_t
 H5S_hyper_adjust_u(H5S_t *space, const hsize_t *offset)
 {
-    unsigned u;                         /* Local index variable */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4049,16 +4032,16 @@ H5S_hyper_adjust_u(H5S_t *space, const hsize_t *offset)
     HDassert(offset);
 
     /* Subtract the offset from the "regular" coordinates, if they exist */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        for(u=0; u<space->extent.rank; u++) {
-            HDassert(space->select.sel_info.hslab->opt_diminfo[u].start>=offset[u]);
-            space->select.sel_info.hslab->opt_diminfo[u].start-=offset[u];
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        for (u = 0; u < space->extent.rank; u++) {
+            HDassert(space->select.sel_info.hslab->opt_diminfo[u].start >= offset[u]);
+            space->select.sel_info.hslab->opt_diminfo[u].start -= offset[u];
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Subtract the offset from the span tree coordinates, if they exist */
-    if(space->select.sel_info.hslab->span_lst) {
-        if(H5S_hyper_adjust_helper_u(space->select.sel_info.hslab->span_lst,offset)<0)
+    if (space->select.sel_info.hslab->span_lst) {
+        if (H5S_hyper_adjust_helper_u(space->select.sel_info.hslab->span_lst, offset) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab offset adjustment")
 
         /* Reset the scratch pointers for the next routine which needs them */
@@ -4067,9 +4050,8 @@ H5S_hyper_adjust_u(H5S_t *space, const hsize_t *offset)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_adjust_u() */
+} /* H5S_hyper_adjust_u() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_project_scalar
  *
@@ -4086,8 +4068,8 @@ done:
 static herr_t
 H5S_hyper_project_scalar(const H5S_t *space, hsize_t *offset)
 {
-    hsize_t block[H5S_MAX_RANK];     /* Block selected in base dataspace */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hsize_t block[H5S_MAX_RANK]; /* Block selected in base dataspace */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4096,30 +4078,33 @@ H5S_hyper_project_scalar(const H5S_t *space, hsize_t *offset)
     HDassert(offset);
 
     /* Check for a "regular" hyperslab selection */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        const H5S_hyper_dim_t *diminfo = space->select.sel_info.hslab->opt_diminfo; /* Alias for dataspace's diminfo information */
-        unsigned u;                 /* Counter */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        const H5S_hyper_dim_t *diminfo =
+            space->select.sel_info.hslab->opt_diminfo; /* Alias for dataspace's diminfo information */
+        unsigned u;                                    /* Counter */
 
         /* Build the table of the initial offset */
-        for(u = 0; u < space->extent.rank; u++) {
+        for (u = 0; u < space->extent.rank; u++) {
             block[u] = diminfo[u].start;
 
             /* Check for more than one hyperslab */
-            if(diminfo[u].count > 1 || diminfo[u].block > 1)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "hyperslab selection of one element has more than one node!")
+            if (diminfo[u].count > 1 || diminfo[u].block > 1)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL,
+                            "hyperslab selection of one element has more than one node!")
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
-        const H5S_hyper_span_t *curr;           /* Pointer to current hyperslab span */
-        unsigned curr_dim;                      /* Current dimension being operated on */
+        const H5S_hyper_span_t *curr;     /* Pointer to current hyperslab span */
+        unsigned                curr_dim; /* Current dimension being operated on */
 
         /* Advance down selected spans */
-        curr = space->select.sel_info.hslab->span_lst->head;
+        curr     = space->select.sel_info.hslab->span_lst->head;
         curr_dim = 0;
-        while(curr) {
+        while (curr) {
             /* Check for more than one span */
-            if(curr->next || curr->low != curr->high)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "hyperslab selection of one element has more than one node!")
+            if (curr->next || curr->low != curr->high)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL,
+                            "hyperslab selection of one element has more than one node!")
 
             /* Save the location of the selection in current dimension */
             block[curr_dim] = curr->low;
@@ -4128,16 +4113,15 @@ H5S_hyper_project_scalar(const H5S_t *space, hsize_t *offset)
             curr = curr->down->head;
             curr_dim++;
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
     /* Calculate offset of selection in projected buffer */
-    *offset = H5VM_array_offset(space->extent.rank, space->extent.size, block); 
+    *offset = H5VM_array_offset(space->extent.rank, space->extent.size, block);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_project_scalar() */
+} /* H5S_hyper_project_scalar() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_project_simple_lower
  *
@@ -4154,8 +4138,8 @@ done:
 static herr_t
 H5S_hyper_project_simple_lower(const H5S_t *base_space, H5S_t *new_space)
 {
-    H5S_hyper_span_info_t *down;        /* Pointer to list of spans */
-    unsigned curr_dim;                  /* Current dimension being operated on */
+    H5S_hyper_span_info_t *down;     /* Pointer to list of spans */
+    unsigned               curr_dim; /* Current dimension being operated on */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -4165,9 +4149,9 @@ H5S_hyper_project_simple_lower(const H5S_t *base_space, H5S_t *new_space)
     HDassert(new_space->extent.rank < base_space->extent.rank);
 
     /* Walk down the span tree until we reach the selection to project */
-    down = base_space->select.sel_info.hslab->span_lst;
+    down     = base_space->select.sel_info.hslab->span_lst;
     curr_dim = 0;
-    while(down && curr_dim < (base_space->extent.rank - new_space->extent.rank)) {
+    while (down && curr_dim < (base_space->extent.rank - new_space->extent.rank)) {
         /* Sanity check */
         HDassert(NULL == down->head->next);
 
@@ -4182,9 +4166,8 @@ H5S_hyper_project_simple_lower(const H5S_t *base_space, H5S_t *new_space)
     new_space->select.sel_info.hslab->span_lst->count++;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_project_simple_lower() */
+} /* H5S_hyper_project_simple_lower() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_project_simple_higher
  *
@@ -4201,9 +4184,9 @@ H5S_hyper_project_simple_lower(const H5S_t *base_space, H5S_t *new_space)
 static herr_t
 H5S_hyper_project_simple_higher(const H5S_t *base_space, H5S_t *new_space)
 {
-    H5S_hyper_span_t *prev_span = NULL; /* Pointer to previous list of spans */
-    unsigned curr_dim;                  /* Current dimension being operated on */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5S_hyper_span_t *prev_span = NULL;    /* Pointer to previous list of spans */
+    unsigned          curr_dim;            /* Current dimension being operated on */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4214,38 +4197,38 @@ H5S_hyper_project_simple_higher(const H5S_t *base_space, H5S_t *new_space)
 
     /* Create nodes until reaching the correct # of dimensions */
     new_space->select.sel_info.hslab->span_lst = NULL;
-    curr_dim = 0;
-    while(curr_dim < (new_space->extent.rank - base_space->extent.rank)) {
-        H5S_hyper_span_info_t *new_span_info;  /* Pointer to list of spans */
-        H5S_hyper_span_t *new_span;     /* Temporary hyperslab span */
+    curr_dim                                   = 0;
+    while (curr_dim < (new_space->extent.rank - base_space->extent.rank)) {
+        H5S_hyper_span_info_t *new_span_info; /* Pointer to list of spans */
+        H5S_hyper_span_t *     new_span;      /* Temporary hyperslab span */
 
         /* Allocate a new span_info node */
-        if(NULL == (new_span_info = H5FL_MALLOC(H5S_hyper_span_info_t))) {
-            if(prev_span)
-                if(H5S_hyper_free_span(prev_span) < 0)
+        if (NULL == (new_span_info = H5FL_MALLOC(H5S_hyper_span_info_t))) {
+            if (prev_span)
+                if (H5S_hyper_free_span(prev_span) < 0)
                     HERROR(H5E_DATASPACE, H5E_CANTFREE, "can't free hyperslab span");
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate hyperslab span info")
         } /* end if */
 
         /* Check for linking into higher span */
-        if(prev_span)
+        if (prev_span)
             prev_span->down = new_span_info;
 
         /* Allocate a new node */
-        if(NULL == (new_span = H5S_hyper_new_span(0, 0, NULL, NULL))) {
+        if (NULL == (new_span = H5S_hyper_new_span(0, 0, NULL, NULL))) {
             HDassert(new_span_info);
-            if(!prev_span)
+            if (!prev_span)
                 (void)H5FL_FREE(H5S_hyper_span_info_t, new_span_info);
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate hyperslab span")
         } /* end if */
 
         /* Set the span_info information */
-        new_span_info->count = 1;
+        new_span_info->count   = 1;
         new_span_info->scratch = NULL;
-        new_span_info->head = new_span;
+        new_span_info->head    = new_span;
 
         /* Attach to new space, if top span info */
-        if(NULL == new_space->select.sel_info.hslab->span_lst)
+        if (NULL == new_space->select.sel_info.hslab->span_lst)
             new_space->select.sel_info.hslab->span_lst = new_span_info;
 
         /* Remember previous span info */
@@ -4262,19 +4245,18 @@ H5S_hyper_project_simple_higher(const H5S_t *base_space, H5S_t *new_space)
     prev_span->down->count++;
 
 done:
-    if(ret_value < 0 && new_space->select.sel_info.hslab->span_lst) {
-        if(new_space->select.sel_info.hslab->span_lst->head)
-            if(H5S_hyper_free_span(
-                    new_space->select.sel_info.hslab->span_lst->head) < 0)
+    if (ret_value < 0 && new_space->select.sel_info.hslab->span_lst) {
+        if (new_space->select.sel_info.hslab->span_lst->head)
+            if (H5S_hyper_free_span(new_space->select.sel_info.hslab->span_lst->head) < 0)
                 HDONE_ERROR(H5E_DATASPACE, H5E_CANTFREE, FAIL, "can't free hyperslab span")
 
-        new_space->select.sel_info.hslab->span_lst = H5FL_FREE(H5S_hyper_span_info_t, new_space->select.sel_info.hslab->span_lst);
+        new_space->select.sel_info.hslab->span_lst =
+            H5FL_FREE(H5S_hyper_span_info_t, new_space->select.sel_info.hslab->span_lst);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_project_simple_higher() */
+} /* H5S_hyper_project_simple_higher() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_hyper_project_simple
  *
@@ -4291,7 +4273,7 @@ done:
 static herr_t
 H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offset)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4301,33 +4283,35 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
     HDassert(offset);
 
     /* We are setting a new selection, remove any current selection in new dataspace */
-    if(H5S_SELECT_RELEASE(new_space) < 0)
+    if (H5S_SELECT_RELEASE(new_space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release selection")
 
     /* Allocate space for the hyperslab selection information */
-    if(NULL == (new_space->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)))
+    if (NULL == (new_space->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab info")
 
     /* Check for a "regular" hyperslab selection */
-    if(base_space->select.sel_info.hslab->diminfo_valid) {
-        unsigned base_space_dim;    /* Current dimension in the base dataspace */
-        unsigned new_space_dim;     /* Current dimension in the new dataspace */
+    if (base_space->select.sel_info.hslab->diminfo_valid) {
+        unsigned base_space_dim; /* Current dimension in the base dataspace */
+        unsigned new_space_dim;  /* Current dimension in the new dataspace */
 
         /* Check if the new space's rank is < or > base space's rank */
-        if(new_space->extent.rank < base_space->extent.rank) {
-            const H5S_hyper_dim_t *opt_diminfo = base_space->select.sel_info.hslab->opt_diminfo; /* Alias for dataspace's diminfo information */
-            hsize_t block[H5S_MAX_RANK];     /* Block selected in base dataspace */
-            unsigned u;         /* Local index variable */
+        if (new_space->extent.rank < base_space->extent.rank) {
+            const H5S_hyper_dim_t *opt_diminfo =
+                base_space->select.sel_info.hslab
+                    ->opt_diminfo;        /* Alias for dataspace's diminfo information */
+            hsize_t  block[H5S_MAX_RANK]; /* Block selected in base dataspace */
+            unsigned u;                   /* Local index variable */
 
             /* Compute the offset for the down-projection */
             HDmemset(block, 0, sizeof(block));
-            for(u = 0; u < (base_space->extent.rank - new_space->extent.rank); u++)
+            for (u = 0; u < (base_space->extent.rank - new_space->extent.rank); u++)
                 block[u] = opt_diminfo[u].start;
-            *offset = H5VM_array_offset(base_space->extent.rank, base_space->extent.size, block); 
+            *offset = H5VM_array_offset(base_space->extent.rank, base_space->extent.size, block);
 
             /* Set the correct dimensions for the base & new spaces */
             base_space_dim = base_space->extent.rank - new_space->extent.rank;
-            new_space_dim = 0;
+            new_space_dim  = 0;
         } /* end if */
         else {
             HDassert(new_space->extent.rank > base_space->extent.rank);
@@ -4336,16 +4320,17 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
             *offset = 0;
 
             /* Set the diminfo information for the higher dimensions */
-            for(new_space_dim = 0; new_space_dim < (new_space->extent.rank - base_space->extent.rank); new_space_dim++) {
-                new_space->select.sel_info.hslab->app_diminfo[new_space_dim].start = 0;
+            for (new_space_dim = 0; new_space_dim < (new_space->extent.rank - base_space->extent.rank);
+                 new_space_dim++) {
+                new_space->select.sel_info.hslab->app_diminfo[new_space_dim].start  = 0;
                 new_space->select.sel_info.hslab->app_diminfo[new_space_dim].stride = 1;
-                new_space->select.sel_info.hslab->app_diminfo[new_space_dim].count = 1;
-                new_space->select.sel_info.hslab->app_diminfo[new_space_dim].block = 1;
+                new_space->select.sel_info.hslab->app_diminfo[new_space_dim].count  = 1;
+                new_space->select.sel_info.hslab->app_diminfo[new_space_dim].block  = 1;
 
-                new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].start = 0;
+                new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].start  = 0;
                 new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].stride = 1;
-                new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].count = 1;
-                new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].block = 1;
+                new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].count  = 1;
+                new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].block  = 1;
             } /* end for */
 
             /* Start at beginning of base space's dimension info */
@@ -4353,24 +4338,24 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
         } /* end else */
 
         /* Copy the diminfo */
-        while(base_space_dim < base_space->extent.rank) {
-            new_space->select.sel_info.hslab->app_diminfo[new_space_dim].start = 
-                    base_space->select.sel_info.hslab->app_diminfo[base_space_dim].start;
-            new_space->select.sel_info.hslab->app_diminfo[new_space_dim].stride = 
-                    base_space->select.sel_info.hslab->app_diminfo[base_space_dim].stride;
-            new_space->select.sel_info.hslab->app_diminfo[new_space_dim].count = 
-                    base_space->select.sel_info.hslab->app_diminfo[base_space_dim].count;
-            new_space->select.sel_info.hslab->app_diminfo[new_space_dim].block = 
-                    base_space->select.sel_info.hslab->app_diminfo[base_space_dim].block;
-
-            new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].start = 
-                    base_space->select.sel_info.hslab->opt_diminfo[base_space_dim].start;
+        while (base_space_dim < base_space->extent.rank) {
+            new_space->select.sel_info.hslab->app_diminfo[new_space_dim].start =
+                base_space->select.sel_info.hslab->app_diminfo[base_space_dim].start;
+            new_space->select.sel_info.hslab->app_diminfo[new_space_dim].stride =
+                base_space->select.sel_info.hslab->app_diminfo[base_space_dim].stride;
+            new_space->select.sel_info.hslab->app_diminfo[new_space_dim].count =
+                base_space->select.sel_info.hslab->app_diminfo[base_space_dim].count;
+            new_space->select.sel_info.hslab->app_diminfo[new_space_dim].block =
+                base_space->select.sel_info.hslab->app_diminfo[base_space_dim].block;
+
+            new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].start =
+                base_space->select.sel_info.hslab->opt_diminfo[base_space_dim].start;
             new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].stride =
-                    base_space->select.sel_info.hslab->opt_diminfo[base_space_dim].stride;
-            new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].count = 
-                    base_space->select.sel_info.hslab->opt_diminfo[base_space_dim].count;
-            new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].block = 
-                    base_space->select.sel_info.hslab->opt_diminfo[base_space_dim].block;
+                base_space->select.sel_info.hslab->opt_diminfo[base_space_dim].stride;
+            new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].count =
+                base_space->select.sel_info.hslab->opt_diminfo[base_space_dim].count;
+            new_space->select.sel_info.hslab->opt_diminfo[new_space_dim].block =
+                base_space->select.sel_info.hslab->opt_diminfo[base_space_dim].block;
 
             /* Advance to next dimensions */
             base_space_dim++;
@@ -4385,18 +4370,18 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
     } /* end if */
     else {
         /* Check if the new space's rank is < or > base space's rank */
-        if(new_space->extent.rank < base_space->extent.rank) {
-            const H5S_hyper_span_t *curr;    /* Pointer to current hyperslab span */
-            hsize_t block[H5S_MAX_RANK];     /* Block selected in base dataspace */
-            unsigned curr_dim;               /* Current dimension being operated on */
+        if (new_space->extent.rank < base_space->extent.rank) {
+            const H5S_hyper_span_t *curr;                /* Pointer to current hyperslab span */
+            hsize_t                 block[H5S_MAX_RANK]; /* Block selected in base dataspace */
+            unsigned                curr_dim;            /* Current dimension being operated on */
 
             /* Clear the block buffer */
             HDmemset(block, 0, sizeof(block));
 
             /* Advance down selected spans */
-            curr = base_space->select.sel_info.hslab->span_lst->head;
+            curr     = base_space->select.sel_info.hslab->span_lst->head;
             curr_dim = 0;
-            while(curr && curr_dim < (base_space->extent.rank - new_space->extent.rank)) {
+            while (curr && curr_dim < (base_space->extent.rank - new_space->extent.rank)) {
                 /* Save the location of the selection in current dimension */
                 block[curr_dim] = curr->low;
 
@@ -4406,11 +4391,12 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
             } /* end while */
 
             /* Compute the offset for the down-projection */
-            *offset = H5VM_array_offset(base_space->extent.rank, base_space->extent.size, block); 
+            *offset = H5VM_array_offset(base_space->extent.rank, base_space->extent.size, block);
 
             /* Project the base space's selection down in less dimensions */
-            if(H5S_hyper_project_simple_lower(base_space, new_space) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't project hyperslab selection into less dimensions")
+            if (H5S_hyper_project_simple_lower(base_space, new_space) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL,
+                            "can't project hyperslab selection into less dimensions")
         } /* end if */
         else {
             HDassert(new_space->extent.rank > base_space->extent.rank);
@@ -4419,8 +4405,9 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
             *offset = 0;
 
             /* Project the base space's selection down in less dimensions */
-            if(H5S_hyper_project_simple_higher(base_space, new_space) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't project hyperslab selection into less dimensions")
+            if (H5S_hyper_project_simple_higher(base_space, new_space) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL,
+                            "can't project hyperslab selection into less dimensions")
         } /* end else */
 
         /* Indicate that the dimension information is not valid */
@@ -4435,9 +4422,8 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_project_simple() */
+} /* H5S_hyper_project_simple() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_adjust_helper_s
@@ -4459,7 +4445,7 @@ done:
 static herr_t
 H5S_hyper_adjust_helper_s(H5S_hyper_span_info_t *spans, const hssize_t *offset)
 {
-    H5S_hyper_span_t *span;     /* Pointer to current span in span tree */
+    H5S_hyper_span_t *span; /* Pointer to current span in span tree */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -4468,7 +4454,7 @@ H5S_hyper_adjust_helper_s(H5S_hyper_span_info_t *spans, const hssize_t *offset)
     HDassert(offset);
 
     /* Check if we've already set this down span tree */
-    if(spans->scratch != (H5S_hyper_span_info_t *)~((size_t)NULL)) {
+    if (spans->scratch != (H5S_hyper_span_info_t *)~((size_t)NULL)) {
         /* Set the tree's scratch pointer */
         spans->scratch = (H5S_hyper_span_info_t *)~((size_t)NULL);
 
@@ -4476,25 +4462,24 @@ H5S_hyper_adjust_helper_s(H5S_hyper_span_info_t *spans, const hssize_t *offset)
         span = spans->head;
 
         /* Iterate over the spans in tree */
-        while(span != NULL) {
+        while (span != NULL) {
             /* Adjust span offset */
             HDassert((hssize_t)span->low >= *offset);
-            span->low = (hsize_t)((hssize_t)span->low - *offset);
+            span->low  = (hsize_t)((hssize_t)span->low - *offset);
             span->high = (hsize_t)((hssize_t)span->high - *offset);
 
             /* Recursively adjust spans in next dimension down */
-            if(span->down != NULL)
+            if (span->down != NULL)
                 H5S_hyper_adjust_helper_s(span->down, offset + 1);
 
             /* Advance to next span in this dimension */
             span = span->next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_adjust_helper_s() */
+} /* H5S_hyper_adjust_helper_s() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_adjust_s
@@ -4516,8 +4501,8 @@ H5S_hyper_adjust_helper_s(H5S_hyper_span_info_t *spans, const hssize_t *offset)
 herr_t
 H5S_hyper_adjust_s(H5S_t *space, const hssize_t *offset)
 {
-    unsigned u;                         /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4525,16 +4510,17 @@ H5S_hyper_adjust_s(H5S_t *space, const hssize_t *offset)
     HDassert(offset);
 
     /* Subtract the offset from the "regular" coordinates, if they exist */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        for(u = 0; u < space->extent.rank; u++) {
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        for (u = 0; u < space->extent.rank; u++) {
             HDassert((hssize_t)space->select.sel_info.hslab->opt_diminfo[u].start >= offset[u]);
-            space->select.sel_info.hslab->opt_diminfo[u].start = (hsize_t)((hssize_t)space->select.sel_info.hslab->opt_diminfo[u].start - offset[u]);
+            space->select.sel_info.hslab->opt_diminfo[u].start =
+                (hsize_t)((hssize_t)space->select.sel_info.hslab->opt_diminfo[u].start - offset[u]);
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Subtract the offset from the span tree coordinates, if they exist */
-    if(space->select.sel_info.hslab->span_lst) {
-        if(H5S_hyper_adjust_helper_s(space->select.sel_info.hslab->span_lst, offset) < 0)
+    if (space->select.sel_info.hslab->span_lst) {
+        if (H5S_hyper_adjust_helper_s(space->select.sel_info.hslab->span_lst, offset) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab offset adjustment")
 
         /* Reset the scratch pointers for the next routine which needs them */
@@ -4543,9 +4529,8 @@ H5S_hyper_adjust_s(H5S_t *space, const hssize_t *offset)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_adjust_s() */
+} /* H5S_hyper_adjust_s() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_normalize_offset
@@ -4570,23 +4555,23 @@ done:
 htri_t
 H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset)
 {
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = FALSE;           /* Return value */
+    unsigned u;                 /* Local index variable */
+    herr_t   ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
 
     /* Check for hyperslab selection & offset changed */
-    if(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS && space->select.offset_changed) {
+    if (H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS && space->select.offset_changed) {
         /* Copy & invert the selection offset */
-        for(u = 0; u<space->extent.rank; u++) {
-            old_offset[u] = space->select.offset[u];
+        for (u = 0; u < space->extent.rank; u++) {
+            old_offset[u]           = space->select.offset[u];
             space->select.offset[u] = -space->select.offset[u];
         } /* end for */
 
         /* Call the existing 'adjust' routine */
-        if(H5S_hyper_adjust_s(space, space->select.offset) < 0)
+        if (H5S_hyper_adjust_s(space, space->select.offset) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab normalization")
 
         /* Zero out the selection offset */
@@ -4598,9 +4583,8 @@ H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_normalize_offset() */
+} /* H5S_hyper_normalize_offset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_denormalize_offset
@@ -4625,7 +4609,7 @@ done:
 herr_t
 H5S_hyper_denormalize_offset(H5S_t *space, const hssize_t *old_offset)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4633,7 +4617,7 @@ H5S_hyper_denormalize_offset(H5S_t *space, const hssize_t *old_offset)
     HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
 
     /* Call the existing 'adjust' routine */
-    if(H5S_hyper_adjust_s(space, old_offset) < 0)
+    if (H5S_hyper_adjust_s(space, old_offset) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab normalization")
 
     /* Copy the selection offset over */
@@ -4641,9 +4625,8 @@ H5S_hyper_denormalize_offset(H5S_t *space, const hssize_t *old_offset)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_denormalize_offset() */
+} /* H5S_hyper_denormalize_offset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_append_span
@@ -4667,10 +4650,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_append_span (H5S_hyper_span_t **prev_span, H5S_hyper_span_info_t ** span_tree, hsize_t low, hsize_t high, H5S_hyper_span_info_t *down, H5S_hyper_span_t *next)
+H5S_hyper_append_span(H5S_hyper_span_t **prev_span, H5S_hyper_span_info_t **span_tree, hsize_t low,
+                      hsize_t high, H5S_hyper_span_info_t *down, H5S_hyper_span_t *next)
 {
-    H5S_hyper_span_t *new_span = NULL;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5S_hyper_span_t *new_span  = NULL;
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4678,77 +4662,75 @@ H5S_hyper_append_span (H5S_hyper_span_t **prev_span, H5S_hyper_span_info_t ** sp
     HDassert(span_tree);
 
     /* Check for adding first node to merged spans */
-    if(*prev_span==NULL) {
+    if (*prev_span == NULL) {
         /* Allocate new span node to append to list */
-        if((new_span = H5S_hyper_new_span(low,high,down,next))==NULL)
+        if ((new_span = H5S_hyper_new_span(low, high, down, next)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
         /* Make first node in span list */
 
         /* Check that we haven't already allocated a span tree */
-        HDassert(*span_tree==NULL);
+        HDassert(*span_tree == NULL);
 
         /* Allocate a new span_info node */
-        if((*span_tree = H5FL_MALLOC(H5S_hyper_span_info_t))==NULL)
+        if ((*span_tree = H5FL_MALLOC(H5S_hyper_span_info_t)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
         /* Set the span tree's basic information */
-        (*span_tree)->count=1;
-        (*span_tree)->scratch=NULL;
-        (*span_tree)->head=new_span;
+        (*span_tree)->count   = 1;
+        (*span_tree)->scratch = NULL;
+        (*span_tree)->head    = new_span;
 
         /* Update previous merged span */
-        *prev_span=new_span;
+        *prev_span = new_span;
     } /* end if */
     /* Merge or append to existing merged spans list */
     else {
         /* Check if span can just extend the previous merged span */
-        if((((*prev_span)->high+1)==low) &&
-                H5S_hyper_cmp_spans(down,(*prev_span)->down)==TRUE) {
+        if ((((*prev_span)->high + 1) == low) && H5S_hyper_cmp_spans(down, (*prev_span)->down) == TRUE) {
             /* Extend previous merged span to include new high bound */
-            (*prev_span)->high=high;
-            (*prev_span)->nelem+=(high-low)+1;
+            (*prev_span)->high = high;
+            (*prev_span)->nelem += (high - low) + 1;
         } /* end if */
         else {
             /* Allocate new span node to append to list */
-            if((new_span = H5S_hyper_new_span(low,high,down,next))==NULL)
+            if ((new_span = H5S_hyper_new_span(low, high, down, next)) == NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
             /* Check if there is actually a down span */
-            if(new_span->down) {
+            if (new_span->down) {
                 /* Check if the down spans for the new span node are the same as the previous span node */
-                if(H5S_hyper_cmp_spans(new_span->down,(*prev_span)->down)==TRUE) {
+                if (H5S_hyper_cmp_spans(new_span->down, (*prev_span)->down) == TRUE) {
                     /* Release the down span for the new node */
                     H5S_hyper_free_span_info(new_span->down);
 
                     /* Point the new node's down span at the previous node's down span */
-                    new_span->down=(*prev_span)->down;
+                    new_span->down = (*prev_span)->down;
 
                     /* Increment the reference count to the shared down span */
                     new_span->down->count++;
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             /* Indicate elements from previous span */
-            new_span->pstride=low-(*prev_span)->low;
+            new_span->pstride = low - (*prev_span)->low;
 
             /* Append to end of merged spans list */
-            (*prev_span)->next=new_span;
-            *prev_span=new_span;
+            (*prev_span)->next = new_span;
+            *prev_span         = new_span;
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
 done:
-    if(ret_value < 0) {
-        if(new_span)
-            if(H5S_hyper_free_span(new_span) < 0)
+    if (ret_value < 0) {
+        if (new_span)
+            if (H5S_hyper_free_span(new_span) < 0)
                 HDONE_ERROR(H5E_DATASPACE, H5E_CANTFREE, FAIL, "failed to release new hyperslab span")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_append_span() */
+} /* H5S_hyper_append_span() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_clip_spans
@@ -4780,21 +4762,24 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_spans,
-    H5S_hyper_span_info_t **a_not_b, H5S_hyper_span_info_t **a_and_b,
-    H5S_hyper_span_info_t **b_not_a)
+H5S_hyper_clip_spans(H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_spans,
+                     H5S_hyper_span_info_t **a_not_b, H5S_hyper_span_info_t **a_and_b,
+                     H5S_hyper_span_info_t **b_not_a)
 {
-    H5S_hyper_span_t *span_a;   /* Pointer to a node in span tree 'a' */
-    H5S_hyper_span_t *span_b;   /* Pointer to a node in span tree 'b' */
-    H5S_hyper_span_t *tmp_span; /* Temporary pointer to new span */
-    H5S_hyper_span_t *last_a_not_b;   /* Pointer to previous node in span tree 'a_not_b' */
-    H5S_hyper_span_t *last_a_and_b;   /* Pointer to previous node in span tree 'a_and_b' */
-    H5S_hyper_span_t *last_b_not_a;   /* Pointer to previous node in span tree 'b_not_a' */
-    H5S_hyper_span_info_t *down_a_not_b; /* Temporary pointer to a_not_b span tree of down spans for overlapping nodes */
-    H5S_hyper_span_info_t *down_a_and_b; /* Temporary pointer to a_and_b span tree of down spans for overlapping nodes */
-    H5S_hyper_span_info_t *down_b_not_a; /* Temporary pointer to b_and_a span tree of down spans for overlapping nodes */
-    unsigned recover_a, recover_b;         /* Flags to indicate when to recover temporary spans */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5S_hyper_span_t *span_a;       /* Pointer to a node in span tree 'a' */
+    H5S_hyper_span_t *span_b;       /* Pointer to a node in span tree 'b' */
+    H5S_hyper_span_t *tmp_span;     /* Temporary pointer to new span */
+    H5S_hyper_span_t *last_a_not_b; /* Pointer to previous node in span tree 'a_not_b' */
+    H5S_hyper_span_t *last_a_and_b; /* Pointer to previous node in span tree 'a_and_b' */
+    H5S_hyper_span_t *last_b_not_a; /* Pointer to previous node in span tree 'b_not_a' */
+    H5S_hyper_span_info_t
+        *down_a_not_b; /* Temporary pointer to a_not_b span tree of down spans for overlapping nodes */
+    H5S_hyper_span_info_t
+        *down_a_and_b; /* Temporary pointer to a_and_b span tree of down spans for overlapping nodes */
+    H5S_hyper_span_info_t
+        *    down_b_not_a; /* Temporary pointer to b_and_a span tree of down spans for overlapping nodes */
+    unsigned recover_a, recover_b; /* Flags to indicate when to recover temporary spans */
+    herr_t   ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -4806,101 +4791,109 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
     HDassert(b_not_a);
 
     /* Check if both span trees are not defined */
-    if(a_spans==NULL && b_spans==NULL) {
-        *a_not_b=NULL;
-        *a_and_b=NULL;
-        *b_not_a=NULL;
+    if (a_spans == NULL && b_spans == NULL) {
+        *a_not_b = NULL;
+        *a_and_b = NULL;
+        *b_not_a = NULL;
     } /* end if */
     /* If span 'a' is not defined, but 'b' is, copy 'b' and set the other return span trees to empty */
-    else if(a_spans==NULL) {
-        *a_not_b=NULL;
-        *a_and_b=NULL;
-        if((*b_not_a=H5S_hyper_copy_span(b_spans))==NULL)
+    else if (a_spans == NULL) {
+        *a_not_b = NULL;
+        *a_and_b = NULL;
+        if ((*b_not_a = H5S_hyper_copy_span(b_spans)) == NULL)
             HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, FAIL, "can't copy hyperslab span tree")
     } /* end if */
     /* If span 'b' is not defined, but 'a' is, copy 'a' and set the other return span trees to empty */
-    else if(b_spans==NULL) {
-        if((*a_not_b=H5S_hyper_copy_span(a_spans))==NULL)
+    else if (b_spans == NULL) {
+        if ((*a_not_b = H5S_hyper_copy_span(a_spans)) == NULL)
             HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, FAIL, "can't copy hyperslab span tree")
-        *a_and_b=NULL;
-        *b_not_a=NULL;
+        *a_and_b = NULL;
+        *b_not_a = NULL;
     } /* end if */
     /* If span 'a' and 'b' are both defined, calculate the proper span trees */
     else {
         /* Check if both span trees completely overlap */
-        if(H5S_hyper_cmp_spans(a_spans,b_spans)==TRUE) {
-            *a_not_b=NULL;
-            if((*a_and_b=H5S_hyper_copy_span(a_spans))==NULL)
+        if (H5S_hyper_cmp_spans(a_spans, b_spans) == TRUE) {
+            *a_not_b = NULL;
+            if ((*a_and_b = H5S_hyper_copy_span(a_spans)) == NULL)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, FAIL, "can't copy hyperslab span tree")
-            *b_not_a=NULL;
+            *b_not_a = NULL;
         } /* end if */
         else {
             /* Get the pointers to the new and old span lists */
-            span_a=a_spans->head;
-            span_b=b_spans->head;
+            span_a = a_spans->head;
+            span_b = b_spans->head;
 
             /* Set the pointer to the previous spans */
-            last_a_not_b=NULL;
-            last_a_and_b=NULL;
-            last_b_not_a=NULL;
+            last_a_not_b = NULL;
+            last_a_and_b = NULL;
+            last_b_not_a = NULL;
 
             /* No spans to recover yet */
-            recover_a=recover_b=0;
+            recover_a = recover_b = 0;
 
             /* Work through the list of spans in the new list */
-            while(span_a!=NULL && span_b!=NULL) {
+            while (span_a != NULL && span_b != NULL) {
                 /* Check if span 'a' is completely before span 'b' */
                 /*    AAAAAAA                            */
                 /* <-----------------------------------> */
                 /*             BBBBBBBBBB                */
-                if(span_a->high<span_b->low) {
+                if (span_a->high < span_b->low) {
                     /* Copy span 'a' and add to a_not_b list */
 
                     /* Merge/add span 'a' with/to a_not_b list */
-                    if(H5S_hyper_append_span(&last_a_not_b,a_not_b,span_a->low,span_a->high,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&last_a_not_b, a_not_b, span_a->low, span_a->high, span_a->down,
+                                              NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                     /* Advance span 'a', leave span 'b' */
-                    H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
+                    H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
                 } /* end if */
                 /* Check if span 'a' overlaps only the lower bound */
                 /*  of span 'b' , up to the upper bound of span 'b' */
                 /*    AAAAAAAAAAAA                       */
                 /* <-----------------------------------> */
                 /*             BBBBBBBBBB                */
-                else if(span_a->low<span_b->low && (span_a->high>=span_b->low && span_a->high<=span_b->high)) {
+                else if (span_a->low < span_b->low &&
+                         (span_a->high >= span_b->low && span_a->high <= span_b->high)) {
                     /* Split span 'a' into two parts at the low bound of span 'b' */
 
                     /* Merge/add lower part of span 'a' with/to a_not_b list */
-                    if(H5S_hyper_append_span(&last_a_not_b,a_not_b,span_a->low,span_b->low-1,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&last_a_not_b, a_not_b, span_a->low, span_b->low - 1,
+                                              span_a->down, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                     /* Check for overlaps between upper part of span 'a' and lower part of span 'b' */
 
                     /* Make certain both spans either have a down span or both don't have one */
-                    HDassert((span_a->down != NULL && span_b->down != NULL) || (span_a->down == NULL && span_b->down == NULL));
+                    HDassert((span_a->down != NULL && span_b->down != NULL) ||
+                             (span_a->down == NULL && span_b->down == NULL));
 
                     /* If there are no down spans, just add the overlapping area to the a_and_b list */
-                    if(span_a->down==NULL) {
+                    if (span_a->down == NULL) {
                         /* Merge/add overlapped part with/to a_and_b list */
-                        if(H5S_hyper_append_span(&last_a_and_b,a_and_b,span_b->low,span_a->high,NULL,NULL)==FAIL)
+                        if (H5S_hyper_append_span(&last_a_and_b, a_and_b, span_b->low, span_a->high, NULL,
+                                                  NULL) == FAIL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
                     } /* end if */
-                    /* If there are down spans, check for the overlap in them and add to each appropriate list */
+                    /* If there are down spans, check for the overlap in them and add to each appropriate list
+                     */
                     else {
                         /* NULL out the temporary pointers to clipped areas in down spans */
-                        down_a_not_b=NULL;
-                        down_a_and_b=NULL;
-                        down_b_not_a=NULL;
+                        down_a_not_b = NULL;
+                        down_a_and_b = NULL;
+                        down_b_not_a = NULL;
 
                         /* Check for overlaps in the 'down spans' of span 'a' & 'b' */
-                        if(H5S_hyper_clip_spans(span_a->down,span_b->down,&down_a_not_b,&down_a_and_b,&down_b_not_a)<0)
+                        if (H5S_hyper_clip_spans(span_a->down, span_b->down, &down_a_not_b, &down_a_and_b,
+                                                 &down_b_not_a) < 0)
                             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't clip hyperslab information")
 
                         /* Check for additions to the a_not_b list */
-                        if(down_a_not_b!=NULL) {
+                        if (down_a_not_b != NULL) {
                             /* Merge/add overlapped part with/to a_not_b list */
-                            if(H5S_hyper_append_span(&last_a_not_b,a_not_b,span_b->low,span_a->high,down_a_not_b,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_a_not_b, a_not_b, span_b->low, span_a->high,
+                                                      down_a_not_b, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
@@ -4908,9 +4901,10 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                         } /* end if */
 
                         /* Check for additions to the a_and_b list */
-                        if(down_a_and_b!=NULL) {
+                        if (down_a_and_b != NULL) {
                             /* Merge/add overlapped part with/to a_and_b list */
-                            if(H5S_hyper_append_span(&last_a_and_b,a_and_b,span_b->low,span_a->high,down_a_and_b,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_a_and_b, a_and_b, span_b->low, span_a->high,
+                                                      down_a_and_b, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
@@ -4918,76 +4912,84 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                         } /* end if */
 
                         /* Check for additions to the b_not_a list */
-                        if(down_b_not_a!=NULL) {
+                        if (down_b_not_a != NULL) {
                             /* Merge/add overlapped part with/to b_not_a list */
-                            if(H5S_hyper_append_span(&last_b_not_a,b_not_a,span_b->low,span_a->high,down_b_not_a,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_b_not_a, b_not_a, span_b->low, span_a->high,
+                                                      down_b_not_a, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
                             H5S_hyper_free_span_info(down_b_not_a);
                         } /* end if */
-                    } /* end else */
+                    }     /* end else */
 
                     /* Split off upper part of span 'b' at upper span of span 'a' */
 
                     /* Check if there is actually an upper part of span 'b' to split off */
-                    if(span_a->high<span_b->high) {
+                    if (span_a->high < span_b->high) {
                         /* Allocate new span node for upper part of span 'b' */
-                        if((tmp_span = H5S_hyper_new_span(span_a->high+1,span_b->high,span_b->down,span_b->next))==NULL)
+                        if ((tmp_span = H5S_hyper_new_span(span_a->high + 1, span_b->high, span_b->down,
+                                                           span_b->next)) == NULL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                         /* Advance span 'a' */
-                        H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
+                        H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
 
                         /* Make upper part of span 'b' into new span 'b' */
-                        H5S_hyper_recover_span(&recover_b,&span_b,tmp_span);
-                        recover_b=1;
+                        H5S_hyper_recover_span(&recover_b, &span_b, tmp_span);
+                        recover_b = 1;
                     } /* end if */
                     /* No upper part of span 'b' to split */
                     else {
                         /* Advance both 'a' and 'b' */
-                        H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
-                        H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                        H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
+                        H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
                     } /* end else */
-                } /* end if */
+                }     /* end if */
                 /* Check if span 'a' overlaps the lower & upper bound */
                 /*  of span 'b' */
                 /*    AAAAAAAAAAAAAAAAAAAAA              */
                 /* <-----------------------------------> */
                 /*             BBBBBBBBBB                */
-                else if(span_a->low<span_b->low && span_a->high>span_b->high) {
+                else if (span_a->low < span_b->low && span_a->high > span_b->high) {
                     /* Split off lower part of span 'a' at lower span of span 'b' */
 
                     /* Merge/add lower part of span 'a' with/to a_not_b list */
-                    if(H5S_hyper_append_span(&last_a_not_b,a_not_b,span_a->low,span_b->low-1,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&last_a_not_b, a_not_b, span_a->low, span_b->low - 1,
+                                              span_a->down, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                     /* Check for overlaps between middle part of span 'a' and span 'b' */
 
                     /* Make certain both spans either have a down span or both don't have one */
-                    HDassert((span_a->down != NULL && span_b->down != NULL) || (span_a->down == NULL && span_b->down == NULL));
+                    HDassert((span_a->down != NULL && span_b->down != NULL) ||
+                             (span_a->down == NULL && span_b->down == NULL));
 
                     /* If there are no down spans, just add the overlapping area to the a_and_b list */
-                    if(span_a->down==NULL) {
+                    if (span_a->down == NULL) {
                         /* Merge/add overlapped part with/to a_and_b list */
-                        if(H5S_hyper_append_span(&last_a_and_b,a_and_b,span_b->low,span_b->high,NULL,NULL)==FAIL)
+                        if (H5S_hyper_append_span(&last_a_and_b, a_and_b, span_b->low, span_b->high, NULL,
+                                                  NULL) == FAIL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
                     } /* end if */
-                    /* If there are down spans, check for the overlap in them and add to each appropriate list */
+                    /* If there are down spans, check for the overlap in them and add to each appropriate list
+                     */
                     else {
                         /* NULL out the temporary pointers to clipped areas in down spans */
-                        down_a_not_b=NULL;
-                        down_a_and_b=NULL;
-                        down_b_not_a=NULL;
+                        down_a_not_b = NULL;
+                        down_a_and_b = NULL;
+                        down_b_not_a = NULL;
 
                         /* Check for overlaps in the 'down spans' of span 'a' & 'b' */
-                        if(H5S_hyper_clip_spans(span_a->down,span_b->down,&down_a_not_b,&down_a_and_b,&down_b_not_a)<0)
+                        if (H5S_hyper_clip_spans(span_a->down, span_b->down, &down_a_not_b, &down_a_and_b,
+                                                 &down_b_not_a) < 0)
                             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't clip hyperslab information")
 
                         /* Check for additions to the a_not_b list */
-                        if(down_a_not_b!=NULL) {
+                        if (down_a_not_b != NULL) {
                             /* Merge/add overlapped part with/to a_not_b list */
-                            if(H5S_hyper_append_span(&last_a_not_b,a_not_b,span_b->low,span_b->high,down_a_not_b,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_a_not_b, a_not_b, span_b->low, span_b->high,
+                                                      down_a_not_b, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
@@ -4995,9 +4997,10 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                         } /* end if */
 
                         /* Check for additions to the a_and_b list */
-                        if(down_a_and_b!=NULL) {
+                        if (down_a_and_b != NULL) {
                             /* Merge/add overlapped part with/to a_and_b list */
-                            if(H5S_hyper_append_span(&last_a_and_b,a_and_b,span_b->low,span_b->high,down_a_and_b,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_a_and_b, a_and_b, span_b->low, span_b->high,
+                                                      down_a_and_b, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
@@ -5005,40 +5008,43 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                         } /* end if */
 
                         /* Check for additions to the b_not_a list */
-                        if(down_b_not_a!=NULL) {
+                        if (down_b_not_a != NULL) {
                             /* Merge/add overlapped part with/to b_not_a list */
-                            if(H5S_hyper_append_span(&last_b_not_a,b_not_a,span_b->low,span_b->high,down_b_not_a,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_b_not_a, b_not_a, span_b->low, span_b->high,
+                                                      down_b_not_a, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
                             H5S_hyper_free_span_info(down_b_not_a);
                         } /* end if */
-                    } /* end else */
+                    }     /* end else */
 
                     /* Split off upper part of span 'a' at upper span of span 'b' */
 
                     /* Allocate new span node for upper part of span 'a' */
-                    if((tmp_span = H5S_hyper_new_span(span_b->high+1,span_a->high,span_a->down,span_a->next))==NULL)
+                    if ((tmp_span = H5S_hyper_new_span(span_b->high + 1, span_a->high, span_a->down,
+                                                       span_a->next)) == NULL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                     /* Make upper part of span 'a' the new span 'a' */
-                    H5S_hyper_recover_span(&recover_a,&span_a,tmp_span);
-                    recover_a=1;
+                    H5S_hyper_recover_span(&recover_a, &span_a, tmp_span);
+                    recover_a = 1;
 
                     /* Advance span 'b' */
-                    H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                    H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
                 } /* end if */
                 /* Check if span 'a' is entirely within span 'b' */
                 /*                AAAAA                  */
                 /* <-----------------------------------> */
                 /*             BBBBBBBBBB                */
-                else if(span_a->low>=span_b->low && span_a->high<=span_b->high) {
+                else if (span_a->low >= span_b->low && span_a->high <= span_b->high) {
                     /* Split off lower part of span 'b' at lower span of span 'a' */
 
                     /* Check if there is actually a lower part of span 'b' to split off */
-                    if(span_a->low>span_b->low) {
+                    if (span_a->low > span_b->low) {
                         /* Merge/add lower part of span 'b' with/to b_not_a list */
-                        if(H5S_hyper_append_span(&last_b_not_a,b_not_a,span_b->low,span_a->low-1,span_b->down,NULL)==FAIL)
+                        if (H5S_hyper_append_span(&last_b_not_a, b_not_a, span_b->low, span_a->low - 1,
+                                                  span_b->down, NULL) == FAIL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
                     } /* end if */
                     else {
@@ -5048,29 +5054,34 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                     /* Check for overlaps between span 'a' and midle of span 'b' */
 
                     /* Make certain both spans either have a down span or both don't have one */
-                    HDassert((span_a->down != NULL && span_b->down != NULL) || (span_a->down == NULL && span_b->down == NULL));
+                    HDassert((span_a->down != NULL && span_b->down != NULL) ||
+                             (span_a->down == NULL && span_b->down == NULL));
 
                     /* If there are no down spans, just add the overlapping area to the a_and_b list */
-                    if(span_a->down==NULL) {
+                    if (span_a->down == NULL) {
                         /* Merge/add overlapped part with/to a_and_b list */
-                        if(H5S_hyper_append_span(&last_a_and_b,a_and_b,span_a->low,span_a->high,NULL,NULL)==FAIL)
+                        if (H5S_hyper_append_span(&last_a_and_b, a_and_b, span_a->low, span_a->high, NULL,
+                                                  NULL) == FAIL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
                     } /* end if */
-                    /* If there are down spans, check for the overlap in them and add to each appropriate list */
+                    /* If there are down spans, check for the overlap in them and add to each appropriate list
+                     */
                     else {
                         /* NULL out the temporary pointers to clipped areas in down spans */
-                        down_a_not_b=NULL;
-                        down_a_and_b=NULL;
-                        down_b_not_a=NULL;
+                        down_a_not_b = NULL;
+                        down_a_and_b = NULL;
+                        down_b_not_a = NULL;
 
                         /* Check for overlaps in the 'down spans' of span 'a' & 'b' */
-                        if(H5S_hyper_clip_spans(span_a->down,span_b->down,&down_a_not_b,&down_a_and_b,&down_b_not_a)<0)
+                        if (H5S_hyper_clip_spans(span_a->down, span_b->down, &down_a_not_b, &down_a_and_b,
+                                                 &down_b_not_a) < 0)
                             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't clip hyperslab information")
 
                         /* Check for additions to the a_not_b list */
-                        if(down_a_not_b!=NULL) {
+                        if (down_a_not_b != NULL) {
                             /* Merge/add overlapped part with/to a_not_b list */
-                            if(H5S_hyper_append_span(&last_a_not_b,a_not_b,span_a->low,span_a->high,down_a_not_b,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_a_not_b, a_not_b, span_a->low, span_a->high,
+                                                      down_a_not_b, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
@@ -5078,9 +5089,10 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                         } /* end if */
 
                         /* Check for additions to the a_and_b list */
-                        if(down_a_and_b!=NULL) {
+                        if (down_a_and_b != NULL) {
                             /* Merge/add overlapped part with/to a_and_b list */
-                            if(H5S_hyper_append_span(&last_a_and_b,a_and_b,span_a->low,span_a->high,down_a_and_b,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_a_and_b, a_and_b, span_a->low, span_a->high,
+                                                      down_a_and_b, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
@@ -5088,49 +5100,53 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                         } /* end if */
 
                         /* Check for additions to the b_not_a list */
-                        if(down_b_not_a!=NULL) {
+                        if (down_b_not_a != NULL) {
                             /* Merge/add overlapped part with/to b_not_a list */
-                            if(H5S_hyper_append_span(&last_b_not_a,b_not_a,span_a->low,span_a->high,down_b_not_a,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_b_not_a, b_not_a, span_a->low, span_a->high,
+                                                      down_b_not_a, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
                             H5S_hyper_free_span_info(down_b_not_a);
                         } /* end if */
-                    } /* end else */
+                    }     /* end else */
 
                     /* Check if there is actually an upper part of span 'b' to split off */
-                    if(span_a->high<span_b->high) {
+                    if (span_a->high < span_b->high) {
                         /* Split off upper part of span 'b' at upper span of span 'a' */
 
                         /* Allocate new span node for upper part of spans 'a' */
-                        if((tmp_span = H5S_hyper_new_span(span_a->high+1,span_b->high,span_b->down,span_b->next))==NULL)
+                        if ((tmp_span = H5S_hyper_new_span(span_a->high + 1, span_b->high, span_b->down,
+                                                           span_b->next)) == NULL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                         /* And advance span 'a' */
-                        H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
+                        H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
 
                         /* Make upper part of span 'b' the new span 'b' */
-                        H5S_hyper_recover_span(&recover_b,&span_b,tmp_span);
-                        recover_b=1;
+                        H5S_hyper_recover_span(&recover_b, &span_b, tmp_span);
+                        recover_b = 1;
                     } /* end if */
                     else {
                         /* Advance both span 'a' & span 'b' */
-                        H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
-                        H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                        H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
+                        H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
                     } /* end else */
-                } /* end if */
+                }     /* end if */
                 /* Check if span 'a' overlaps only the upper bound */
                 /*  of span 'b' */
                 /*                AAAAAAAAAA             */
                 /* <-----------------------------------> */
                 /*             BBBBBBBBBB                */
-                else if((span_a->low>=span_b->low && span_a->low<=span_b->high) && span_a->high>span_b->high) {
+                else if ((span_a->low >= span_b->low && span_a->low <= span_b->high) &&
+                         span_a->high > span_b->high) {
                     /* Check if there is actually a lower part of span 'b' to split off */
-                    if(span_a->low>span_b->low) {
+                    if (span_a->low > span_b->low) {
                         /* Split off lower part of span 'b' at lower span of span 'a' */
 
                         /* Merge/add lower part of span 'b' with/to b_not_a list */
-                        if(H5S_hyper_append_span(&last_b_not_a,b_not_a,span_b->low,span_a->low-1,span_b->down,NULL)==FAIL)
+                        if (H5S_hyper_append_span(&last_b_not_a, b_not_a, span_b->low, span_a->low - 1,
+                                                  span_b->down, NULL) == FAIL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
                     } /* end if */
                     else {
@@ -5140,29 +5156,34 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                     /* Check for overlaps between lower part of span 'a' and upper part of span 'b' */
 
                     /* Make certain both spans either have a down span or both don't have one */
-                    HDassert((span_a->down != NULL && span_b->down != NULL) || (span_a->down == NULL && span_b->down == NULL));
+                    HDassert((span_a->down != NULL && span_b->down != NULL) ||
+                             (span_a->down == NULL && span_b->down == NULL));
 
                     /* If there are no down spans, just add the overlapping area to the a_and_b list */
-                    if(span_a->down==NULL) {
+                    if (span_a->down == NULL) {
                         /* Merge/add overlapped part with/to a_and_b list */
-                        if(H5S_hyper_append_span(&last_a_and_b,a_and_b,span_a->low,span_b->high,NULL,NULL)==FAIL)
+                        if (H5S_hyper_append_span(&last_a_and_b, a_and_b, span_a->low, span_b->high, NULL,
+                                                  NULL) == FAIL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
                     } /* end if */
-                    /* If there are down spans, check for the overlap in them and add to each appropriate list */
+                    /* If there are down spans, check for the overlap in them and add to each appropriate list
+                     */
                     else {
                         /* NULL out the temporary pointers to clipped areas in down spans */
-                        down_a_not_b=NULL;
-                        down_a_and_b=NULL;
-                        down_b_not_a=NULL;
+                        down_a_not_b = NULL;
+                        down_a_and_b = NULL;
+                        down_b_not_a = NULL;
 
                         /* Check for overlaps in the 'down spans' of span 'a' & 'b' */
-                        if(H5S_hyper_clip_spans(span_a->down,span_b->down,&down_a_not_b,&down_a_and_b,&down_b_not_a)<0)
+                        if (H5S_hyper_clip_spans(span_a->down, span_b->down, &down_a_not_b, &down_a_and_b,
+                                                 &down_b_not_a) < 0)
                             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't clip hyperslab information")
 
                         /* Check for additions to the a_not_b list */
-                        if(down_a_not_b!=NULL) {
+                        if (down_a_not_b != NULL) {
                             /* Merge/add overlapped part with/to a_not_b list */
-                            if(H5S_hyper_append_span(&last_a_not_b,a_not_b,span_a->low,span_b->high,down_a_not_b,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_a_not_b, a_not_b, span_a->low, span_b->high,
+                                                      down_a_not_b, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
@@ -5170,9 +5191,10 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                         } /* end if */
 
                         /* Check for additions to the a_and_b list */
-                        if(down_a_and_b!=NULL) {
+                        if (down_a_and_b != NULL) {
                             /* Merge/add overlapped part with/to a_and_b list */
-                            if(H5S_hyper_append_span(&last_a_and_b,a_and_b,span_a->low,span_b->high,down_a_and_b,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_a_and_b, a_and_b, span_a->low, span_b->high,
+                                                      down_a_and_b, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
@@ -5180,28 +5202,30 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                         } /* end if */
 
                         /* Check for additions to the b_not_a list */
-                        if(down_b_not_a!=NULL) {
+                        if (down_b_not_a != NULL) {
                             /* Merge/add overlapped part with/to b_not_a list */
-                            if(H5S_hyper_append_span(&last_b_not_a,b_not_a,span_a->low,span_b->high,down_b_not_a,NULL)==FAIL)
+                            if (H5S_hyper_append_span(&last_b_not_a, b_not_a, span_a->low, span_b->high,
+                                                      down_b_not_a, NULL) == FAIL)
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                             /* Release the down span tree generated */
                             H5S_hyper_free_span_info(down_b_not_a);
                         } /* end if */
-                    } /* end else */
+                    }     /* end else */
 
                     /* Split off upper part of span 'a' at upper span of span 'b' */
 
                     /* Allocate new span node for upper part of span 'a' */
-                    if((tmp_span = H5S_hyper_new_span(span_b->high+1,span_a->high,span_a->down,span_a->next))==NULL)
+                    if ((tmp_span = H5S_hyper_new_span(span_b->high + 1, span_a->high, span_a->down,
+                                                       span_a->next)) == NULL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                     /* Make upper part of span 'a' into new span 'a' */
-                    H5S_hyper_recover_span(&recover_a,&span_a,tmp_span);
-                    recover_a=1;
+                    H5S_hyper_recover_span(&recover_a, &span_a, tmp_span);
+                    recover_a = 1;
 
                     /* Advance span 'b' */
-                    H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                    H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
                 } /* end if */
                 /* span 'a' must be entirely above span 'b' */
                 /*                         AAAAA         */
@@ -5211,48 +5235,50 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
                     /* Copy span 'b' and add to b_not_a list */
 
                     /* Merge/add span 'b' with/to b_not_a list */
-                    if(H5S_hyper_append_span(&last_b_not_a,b_not_a,span_b->low,span_b->high,span_b->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&last_b_not_a, b_not_a, span_b->low, span_b->high, span_b->down,
+                                              NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                     /* Advance span 'b', leave span 'a' */
-                    H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                    H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
                 } /* end else */
-            } /* end while */
+            }     /* end while */
 
             /* Clean up 'a' spans which haven't been covered yet */
-            if(span_a!=NULL && span_b==NULL) {
-                while(span_a!=NULL) {
+            if (span_a != NULL && span_b == NULL) {
+                while (span_a != NULL) {
                     /* Copy span 'a' and add to a_not_b list */
 
                     /* Merge/add span 'a' with/to a_not_b list */
-                    if(H5S_hyper_append_span(&last_a_not_b,a_not_b,span_a->low,span_a->high,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&last_a_not_b, a_not_b, span_a->low, span_a->high, span_a->down,
+                                              NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                     /* Advance to the next 'a' span */
-                    H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
+                    H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
                 } /* end while */
-            } /* end if */
+            }     /* end if */
             /* Clean up 'b' spans which haven't been covered yet */
-            else if(span_a==NULL && span_b!=NULL) {
-                while(span_b!=NULL) {
+            else if (span_a == NULL && span_b != NULL) {
+                while (span_b != NULL) {
                     /* Copy span 'b' and add to b_not_a list */
 
                     /* Merge/add span 'b' with/to b_not_a list */
-                    if(H5S_hyper_append_span(&last_b_not_a,b_not_a,span_b->low,span_b->high,span_b->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&last_b_not_a, b_not_a, span_b->low, span_b->high, span_b->down,
+                                              NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
                     /* Advance to the next 'b' span */
-                    H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                    H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
                 } /* end while */
-            } /* end if */
-        } /* end else */
-    } /* end else */
+            }     /* end if */
+        }         /* end else */
+    }             /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_clip_spans() */
+} /* H5S_hyper_clip_spans() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_merge_spans_helper
@@ -5275,15 +5301,15 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static H5S_hyper_span_info_t *
-H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_spans)
+H5S_hyper_merge_spans_helper(H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_spans)
 {
-    H5S_hyper_span_info_t *merged_spans=NULL; /* Pointer to the merged span tree */
-    H5S_hyper_span_info_t *tmp_spans;   /* Pointer to temporary new span tree */
-    H5S_hyper_span_t *tmp_span;         /* Pointer to temporary new span */
-    H5S_hyper_span_t *span_a;           /* Pointer to current span 'a' working on */
-    H5S_hyper_span_t *span_b;           /* Pointer to current span 'b' working on */
-    H5S_hyper_span_t *prev_span_merge;  /* Pointer to previous merged span */
-    unsigned recover_a, recover_b;         /* Flags to indicate when to recover temporary spans */
+    H5S_hyper_span_info_t *merged_spans = NULL;  /* Pointer to the merged span tree */
+    H5S_hyper_span_info_t *tmp_spans;            /* Pointer to temporary new span tree */
+    H5S_hyper_span_t *     tmp_span;             /* Pointer to temporary new span */
+    H5S_hyper_span_t *     span_a;               /* Pointer to current span 'a' working on */
+    H5S_hyper_span_t *     span_b;               /* Pointer to current span 'b' working on */
+    H5S_hyper_span_t *     prev_span_merge;      /* Pointer to previous merged span */
+    unsigned               recover_a, recover_b; /* Flags to indicate when to recover temporary spans */
     H5S_hyper_span_info_t *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -5292,62 +5318,67 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
     HDassert((a_spans != NULL && b_spans != NULL) || (a_spans == NULL && b_spans == NULL));
 
     /* Check if the span trees for the 'a' span and the 'b' span are the same */
-    if(H5S_hyper_cmp_spans(a_spans,b_spans)==TRUE) {
-        if(a_spans==NULL)
-            merged_spans=NULL;
+    if (H5S_hyper_cmp_spans(a_spans, b_spans) == TRUE) {
+        if (a_spans == NULL)
+            merged_spans = NULL;
         else {
             /* Copy one of the span trees to return */
-            if((merged_spans=H5S_hyper_copy_span(a_spans))==NULL)
+            if ((merged_spans = H5S_hyper_copy_span(a_spans)) == NULL)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "can't copy hyperslab span tree")
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Get the pointers to the 'a' and 'b' span lists */
-        span_a=a_spans->head;
-        span_b=b_spans->head;
+        span_a = a_spans->head;
+        span_b = b_spans->head;
 
         /* Set the pointer to the previous spans */
-        prev_span_merge=NULL;
+        prev_span_merge = NULL;
 
         /* No spans to recover yet */
-        recover_a=recover_b=0;
+        recover_a = recover_b = 0;
 
         /* Work through the list of spans in the new list */
-        while(span_a!=NULL && span_b!=NULL) {
+        while (span_a != NULL && span_b != NULL) {
             /* Check if the 'a' span is completely before 'b' span */
             /*    AAAAAAA                            */
             /* <-----------------------------------> */
             /*             BBBBBBBBBB                */
-            if(span_a->high<span_b->low) {
+            if (span_a->high < span_b->low) {
                 /* Merge/add span 'a' with/to the merged spans */
-                if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_a->low,span_a->high,span_a->down,NULL)==FAIL)
+                if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_a->low, span_a->high,
+                                          span_a->down, NULL) == FAIL)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                 /* Advance span 'a' */
-                H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
+                H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
             } /* end if */
             /* Check if span 'a' overlaps only the lower bound */
             /*  of span 'b', up to the upper bound of span 'b' */
             /*    AAAAAAAAAAAA                       */
             /* <-----------------------------------> */
             /*             BBBBBBBBBB                */
-            else if(span_a->low<span_b->low && (span_a->high>=span_b->low && span_a->high<=span_b->high)) {
+            else if (span_a->low < span_b->low &&
+                     (span_a->high >= span_b->low && span_a->high <= span_b->high)) {
                 /* Check if span 'a' and span 'b' down spans are equal */
-                if(H5S_hyper_cmp_spans(span_a->down,span_b->down)==TRUE) {
+                if (H5S_hyper_cmp_spans(span_a->down, span_b->down) == TRUE) {
                     /* Merge/add copy of span 'a' with/to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_a->low,span_a->high,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_a->low, span_a->high,
+                                              span_a->down, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
                 } /* end if */
                 else {
                     /* Merge/add lower part of span 'a' with/to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_a->low,span_b->low-1,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_a->low, span_b->low - 1,
+                                              span_a->down, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                     /* Get merged span tree for overlapped section */
-                    tmp_spans=H5S_hyper_merge_spans_helper(span_a->down,span_b->down);
+                    tmp_spans = H5S_hyper_merge_spans_helper(span_a->down, span_b->down);
 
                     /* Merge/add overlapped section to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_b->low,span_a->high,tmp_spans,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_b->low, span_a->high,
+                                              tmp_spans, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                     /* Release merged span tree for overlapped section */
@@ -5355,48 +5386,52 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
                 } /* end else */
 
                 /* Check if there is an upper part of span 'b' */
-                if(span_a->high<span_b->high) {
+                if (span_a->high < span_b->high) {
                     /* Copy upper part of span 'b' as new span 'b' */
 
                     /* Allocate new span node to append to list */
-                    if((tmp_span = H5S_hyper_new_span(span_a->high+1,span_b->high,span_b->down,span_b->next))==NULL)
+                    if ((tmp_span = H5S_hyper_new_span(span_a->high + 1, span_b->high, span_b->down,
+                                                       span_b->next)) == NULL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                     /* Advance span 'a' */
-                    H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
+                    H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
 
                     /* Set new span 'b' to tmp_span */
-                    H5S_hyper_recover_span(&recover_b,&span_b,tmp_span);
-                    recover_b=1;
+                    H5S_hyper_recover_span(&recover_b, &span_b, tmp_span);
+                    recover_b = 1;
                 } /* end if */
                 else {
                     /* Advance both span 'a' & 'b' */
-                    H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
-                    H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                    H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
+                    H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
                 } /* end else */
-            } /* end if */
+            }     /* end if */
             /* Check if span 'a' overlaps the lower & upper bound */
             /*  of span 'b' */
             /*    AAAAAAAAAAAAAAAAAAAAA              */
             /* <-----------------------------------> */
             /*             BBBBBBBBBB                */
-            else if(span_a->low<span_b->low && span_a->high>span_b->high) {
+            else if (span_a->low < span_b->low && span_a->high > span_b->high) {
                 /* Check if span 'a' and span 'b' down spans are equal */
-                if(H5S_hyper_cmp_spans(span_a->down,span_b->down)==TRUE) {
+                if (H5S_hyper_cmp_spans(span_a->down, span_b->down) == TRUE) {
                     /* Merge/add copy of lower & middle parts of span 'a' to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_a->low,span_b->high,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_a->low, span_b->high,
+                                              span_a->down, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
                 } /* end if */
                 else {
                     /* Merge/add lower part of span 'a' to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_a->low,span_b->low-1,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_a->low, span_b->low - 1,
+                                              span_a->down, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                     /* Get merged span tree for overlapped section */
-                    tmp_spans=H5S_hyper_merge_spans_helper(span_a->down,span_b->down);
+                    tmp_spans = H5S_hyper_merge_spans_helper(span_a->down, span_b->down);
 
                     /* Merge/add overlapped section to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_b->low,span_b->high,tmp_spans,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_b->low, span_b->high,
+                                              tmp_spans, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                     /* Release merged span tree for overlapped section */
@@ -5406,32 +5441,35 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
                 /* Copy upper part of span 'a' as new span 'a' (remember to free) */
 
                 /* Allocate new span node to append to list */
-                if((tmp_span = H5S_hyper_new_span(span_b->high+1,span_a->high,span_a->down,span_a->next))==NULL)
+                if ((tmp_span = H5S_hyper_new_span(span_b->high + 1, span_a->high, span_a->down,
+                                                   span_a->next)) == NULL)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                 /* Set new span 'a' to tmp_span */
-                H5S_hyper_recover_span(&recover_a,&span_a,tmp_span);
-                recover_a=1;
+                H5S_hyper_recover_span(&recover_a, &span_a, tmp_span);
+                recover_a = 1;
 
                 /* Advance span 'b' */
-                H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
             } /* end if */
             /* Check if span 'a' is entirely within span 'b' */
             /*                AAAAA                  */
             /* <-----------------------------------> */
             /*             BBBBBBBBBB                */
-            else if(span_a->low>=span_b->low && span_a->high<=span_b->high) {
+            else if (span_a->low >= span_b->low && span_a->high <= span_b->high) {
                 /* Check if span 'a' and span 'b' down spans are equal */
-                if(H5S_hyper_cmp_spans(span_a->down,span_b->down)==TRUE) {
+                if (H5S_hyper_cmp_spans(span_a->down, span_b->down) == TRUE) {
                     /* Merge/add copy of lower & middle parts of span 'b' to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_b->low,span_a->high,span_a->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_b->low, span_a->high,
+                                              span_a->down, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
                 } /* end if */
                 else {
                     /* Check if there is a lower part of span 'b' */
-                    if(span_a->low>span_b->low) {
+                    if (span_a->low > span_b->low) {
                         /* Merge/add lower part of span 'b' to merged spans */
-                        if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_b->low,span_a->low-1,span_b->down,NULL)==FAIL)
+                        if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_b->low,
+                                                  span_a->low - 1, span_b->down, NULL) == FAIL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
                     } /* end if */
                     else {
@@ -5439,10 +5477,11 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
                     } /* end else */
 
                     /* Get merged span tree for overlapped section */
-                    tmp_spans=H5S_hyper_merge_spans_helper(span_a->down,span_b->down);
+                    tmp_spans = H5S_hyper_merge_spans_helper(span_a->down, span_b->down);
 
                     /* Merge/add overlapped section to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_a->low,span_a->high,tmp_spans,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_a->low, span_a->high,
+                                              tmp_spans, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                     /* Release merged span tree for overlapped section */
@@ -5450,43 +5489,47 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
                 } /* end else */
 
                 /* Check if there is an upper part of span 'b' */
-                if(span_a->high<span_b->high) {
+                if (span_a->high < span_b->high) {
                     /* Copy upper part of span 'b' as new span 'b' (remember to free) */
 
                     /* Allocate new span node to append to list */
-                    if((tmp_span = H5S_hyper_new_span(span_a->high+1,span_b->high,span_b->down,span_b->next))==NULL)
+                    if ((tmp_span = H5S_hyper_new_span(span_a->high + 1, span_b->high, span_b->down,
+                                                       span_b->next)) == NULL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                     /* Advance span 'a' */
-                    H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
+                    H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
 
                     /* Set new span 'b' to tmp_span */
-                    H5S_hyper_recover_span(&recover_b,&span_b,tmp_span);
-                    recover_b=1;
+                    H5S_hyper_recover_span(&recover_b, &span_b, tmp_span);
+                    recover_b = 1;
                 } /* end if */
                 else {
                     /* Advance both spans */
-                    H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
-                    H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                    H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
+                    H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
                 } /* end else */
-            } /* end if */
+            }     /* end if */
             /* Check if span 'a' overlaps only the upper bound */
             /*  of span 'b' */
             /*                AAAAAAAAAA             */
             /* <-----------------------------------> */
             /*             BBBBBBBBBB                */
-            else if((span_a->low>=span_b->low && span_a->low<=span_b->high) && span_a->high>span_b->high) {
+            else if ((span_a->low >= span_b->low && span_a->low <= span_b->high) &&
+                     span_a->high > span_b->high) {
                 /* Check if span 'a' and span 'b' down spans are equal */
-                if(H5S_hyper_cmp_spans(span_a->down,span_b->down)==TRUE) {
+                if (H5S_hyper_cmp_spans(span_a->down, span_b->down) == TRUE) {
                     /* Merge/add copy of span 'b' to merged spans if so */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_b->low,span_b->high,span_b->down,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_b->low, span_b->high,
+                                              span_b->down, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
                 } /* end if */
                 else {
                     /* Check if there is a lower part of span 'b' */
-                    if(span_a->low>span_b->low) {
+                    if (span_a->low > span_b->low) {
                         /* Merge/add lower part of span 'b' to merged spans */
-                        if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_b->low,span_a->low-1,span_b->down,NULL)==FAIL)
+                        if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_b->low,
+                                                  span_a->low - 1, span_b->down, NULL) == FAIL)
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
                     } /* end if */
                     else {
@@ -5494,10 +5537,11 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
                     } /* end else */
 
                     /* Get merged span tree for overlapped section */
-                    tmp_spans=H5S_hyper_merge_spans_helper(span_a->down,span_b->down);
+                    tmp_spans = H5S_hyper_merge_spans_helper(span_a->down, span_b->down);
 
                     /* Merge/add overlapped section to merged spans */
-                    if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_a->low,span_b->high,tmp_spans,NULL)==FAIL)
+                    if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_a->low, span_b->high,
+                                              tmp_spans, NULL) == FAIL)
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                     /* Release merged span tree for overlapped section */
@@ -5507,15 +5551,16 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
                 /* Copy upper part of span 'a' as new span 'a' */
 
                 /* Allocate new span node to append to list */
-                if((tmp_span = H5S_hyper_new_span(span_b->high+1,span_a->high,span_a->down,span_a->next))==NULL)
+                if ((tmp_span = H5S_hyper_new_span(span_b->high + 1, span_a->high, span_a->down,
+                                                   span_a->next)) == NULL)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                 /* Set new span 'a' to tmp_span */
-                H5S_hyper_recover_span(&recover_a,&span_a,tmp_span);
-                recover_a=1;
+                H5S_hyper_recover_span(&recover_a, &span_a, tmp_span);
+                recover_a = 1;
 
                 /* Advance span 'b' */
-                H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
             } /* end if */
             /* Span 'a' must be entirely above span 'b' */
             /*                         AAAAA         */
@@ -5523,53 +5568,55 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
             /*             BBBBBBBBBB                */
             else {
                 /* Merge/add span 'b' with the merged spans */
-                if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_b->low,span_b->high,span_b->down,NULL)==FAIL)
+                if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_b->low, span_b->high,
+                                          span_b->down, NULL) == FAIL)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                 /* Advance span 'b' */
-                H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
             } /* end else */
-        } /* end while */
+        }     /* end while */
 
         /* Clean up 'a' spans which haven't been added to the list of merged spans */
-        if(span_a!=NULL && span_b==NULL) {
-            while(span_a!=NULL) {
+        if (span_a != NULL && span_b == NULL) {
+            while (span_a != NULL) {
                 /* Merge/add all 'a' spans into the merged spans */
-                if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_a->low,span_a->high,span_a->down,NULL)==FAIL)
+                if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_a->low, span_a->high,
+                                          span_a->down, NULL) == FAIL)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                 /* Advance to next 'a' span, until all processed */
-                H5S_hyper_recover_span(&recover_a,&span_a,span_a->next);
+                H5S_hyper_recover_span(&recover_a, &span_a, span_a->next);
             } /* end while */
-        } /* end if */
+        }     /* end if */
 
         /* Clean up 'b' spans which haven't been added to the list of merged spans */
-        if(span_a==NULL && span_b!=NULL) {
-            while(span_b!=NULL) {
+        if (span_a == NULL && span_b != NULL) {
+            while (span_b != NULL) {
                 /* Merge/add all 'b' spans into the merged spans */
-                if(H5S_hyper_append_span(&prev_span_merge,&merged_spans,span_b->low,span_b->high,span_b->down,NULL)==FAIL)
+                if (H5S_hyper_append_span(&prev_span_merge, &merged_spans, span_b->low, span_b->high,
+                                          span_b->down, NULL) == FAIL)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
                 /* Advance to next 'b' span, until all processed */
-                H5S_hyper_recover_span(&recover_b,&span_b,span_b->next);
+                H5S_hyper_recover_span(&recover_b, &span_b, span_b->next);
             } /* end while */
-        } /* end if */
-    } /* end else */
+        }     /* end if */
+    }         /* end else */
 
     /* Set return value */
     ret_value = merged_spans;
 
 done:
-    if(ret_value == NULL) {
-        if(merged_spans)
-            if(H5S_hyper_free_span_info(merged_spans) < 0)
+    if (ret_value == NULL) {
+        if (merged_spans)
+            if (H5S_hyper_free_span_info(merged_spans) < 0)
                 HDONE_ERROR(H5E_INTERNAL, H5E_CANTFREE, NULL, "failed to release merged hyperslab spans")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_merge_spans_helper() */
+} /* H5S_hyper_merge_spans_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_merge_spans
@@ -5596,7 +5643,7 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans, hbool_t can_own)
+H5S_hyper_merge_spans(H5S_t *space, H5S_hyper_span_info_t *new_spans, hbool_t can_own)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -5605,17 +5652,17 @@ H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans, hbool_t c
     HDassert(new_spans);
 
     /* If this is the first span tree in the hyperslab selection, just use it */
-    if(space->select.sel_info.hslab->span_lst==NULL) {
-        if(can_own)
-            space->select.sel_info.hslab->span_lst=new_spans;
+    if (space->select.sel_info.hslab->span_lst == NULL) {
+        if (can_own)
+            space->select.sel_info.hslab->span_lst = new_spans;
         else
-            space->select.sel_info.hslab->span_lst=H5S_hyper_copy_span(new_spans);
+            space->select.sel_info.hslab->span_lst = H5S_hyper_copy_span(new_spans);
     } /* end if */
     else {
         H5S_hyper_span_info_t *merged_spans;
 
         /* Get the merged spans */
-        merged_spans=H5S_hyper_merge_spans_helper(space->select.sel_info.hslab->span_lst, new_spans);
+        merged_spans = H5S_hyper_merge_spans_helper(space->select.sel_info.hslab->span_lst, new_spans);
 
         /* Sanity checking since we started with some spans, we should still have some after the merge */
         HDassert(merged_spans);
@@ -5624,13 +5671,12 @@ H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans, hbool_t c
         H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst);
 
         /* Point to the new merged spans */
-        space->select.sel_info.hslab->span_lst=merged_spans;
+        space->select.sel_info.hslab->span_lst = merged_spans;
     } /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_hyper_merge_spans() */
+} /* H5S_hyper_merge_spans() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_spans_nelem
@@ -5649,36 +5695,35 @@ H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans, hbool_t c
  REVISION LOG
 --------------------------------------------------------------------------*/
 static hsize_t
-H5S_hyper_spans_nelem (H5S_hyper_span_info_t *spans)
+H5S_hyper_spans_nelem(H5S_hyper_span_info_t *spans)
 {
-    H5S_hyper_span_t *span;     /* Hyperslab span */
-    hsize_t ret_value;
+    H5S_hyper_span_t *span; /* Hyperslab span */
+    hsize_t           ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Count the number of elements in the span tree */
-    if(spans==NULL)
-        ret_value=0;
+    if (spans == NULL)
+        ret_value = 0;
     else {
-        span=spans->head;
-        ret_value=0;
-        while(span!=NULL) {
+        span      = spans->head;
+        ret_value = 0;
+        while (span != NULL) {
             /* If there are down spans, multiply the size of this span by the total down span elements */
-            if(span->down!=NULL)
-                ret_value+=span->nelem*H5S_hyper_spans_nelem(span->down);
+            if (span->down != NULL)
+                ret_value += span->nelem * H5S_hyper_spans_nelem(span->down);
             /* If there are no down spans, just count the elements in this span */
             else
-                ret_value+=span->nelem;
+                ret_value += span->nelem;
 
             /* Advance to next span */
-            span=span->next;
+            span = span->next;
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_spans_nelem() */
+} /* H5S_hyper_spans_nelem() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_make_spans
@@ -5705,16 +5750,16 @@ H5S_hyper_spans_nelem (H5S_hyper_span_info_t *spans)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static H5S_hyper_span_info_t *
-H5S_hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride,
-    const hsize_t *count, const hsize_t *block)
+H5S_hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride, const hsize_t *count,
+                     const hsize_t *block)
 {
-    H5S_hyper_span_info_t *down = NULL;     /* Pointer to spans in next dimension down */
-    H5S_hyper_span_t      *last_span;       /* Current position in hyperslab span list */
-    H5S_hyper_span_t      *head = NULL;     /* Head of new hyperslab span list */
-    hsize_t                stride_iter;     /* Iterator over the stride values */
-    int                    i;               /* Counters */
-    unsigned               u;               /* Counters */
-    H5S_hyper_span_info_t *ret_value;       /* Return value */
+    H5S_hyper_span_info_t *down = NULL; /* Pointer to spans in next dimension down */
+    H5S_hyper_span_t *     last_span;   /* Current position in hyperslab span list */
+    H5S_hyper_span_t *     head = NULL; /* Head of new hyperslab span list */
+    hsize_t                stride_iter; /* Iterator over the stride values */
+    int                    i;           /* Counters */
+    unsigned               u;           /* Counters */
+    H5S_hyper_span_info_t *ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -5726,33 +5771,33 @@ H5S_hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride,
     HDassert(block);
 
     /* Start creating spans in fastest changing dimension */
-    for(i = (int)(rank - 1); i >= 0; i--) {
+    for (i = (int)(rank - 1); i >= 0; i--) {
 
         /* Sanity check */
-        if(0 == count[i])
+        if (0 == count[i])
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, NULL, "count == 0 is invalid")
 
         /* Start a new list in this dimension */
-        head = NULL;
+        head      = NULL;
         last_span = NULL;
 
         /* Generate all the span segments for this dimension */
-        for(u = 0, stride_iter = 0; u < count[i]; u++, stride_iter += stride[i]) {
-            H5S_hyper_span_t      *span;            /* New hyperslab span */
+        for (u = 0, stride_iter = 0; u < count[i]; u++, stride_iter += stride[i]) {
+            H5S_hyper_span_t *span; /* New hyperslab span */
 
             /* Allocate a span node */
-            if(NULL == (span = H5FL_MALLOC(H5S_hyper_span_t)))
+            if (NULL == (span = H5FL_MALLOC(H5S_hyper_span_t)))
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, NULL, "can't allocate hyperslab span")
 
             /* Set the span's basic information */
-            span->low = start[i] + stride_iter;
-            span->high = span->low + (block[i] - 1);
-            span->nelem = block[i];
+            span->low     = start[i] + stride_iter;
+            span->high    = span->low + (block[i] - 1);
+            span->nelem   = block[i];
             span->pstride = stride[i];
-            span->next = NULL;
+            span->next    = NULL;
 
             /* Append to the list of spans in this dimension */
-            if(head == NULL)
+            if (head == NULL)
                 head = span;
             else
                 last_span->next = span;
@@ -5761,17 +5806,17 @@ H5S_hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride,
             last_span = span;
 
             /* Set the information for the next dimension down's spans, if appropriate */
-            if(down != NULL) {
+            if (down != NULL) {
                 span->down = down;
-                down->count++;  /* Increment reference count for shared span */
-            } /* end if */
+                down->count++; /* Increment reference count for shared span */
+            }                  /* end if */
             else {
                 span->down = NULL;
             } /* end else */
-        } /* end for */
+        }     /* end for */
 
         /* Allocate a span info node */
-        if(NULL == (down = H5FL_MALLOC(H5S_hyper_span_info_t)))
+        if (NULL == (down = H5FL_MALLOC(H5S_hyper_span_info_t)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, NULL, "can't allocate hyperslab span")
 
         /* Set the reference count */
@@ -5792,32 +5837,31 @@ H5S_hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride,
 
 done:
     /* cleanup if error (ret_value will be NULL) */
-    if(!ret_value) {
-        if(head || down) {
-            if(head && down)
-                if(down->head != head)
+    if (!ret_value) {
+        if (head || down) {
+            if (head && down)
+                if (down->head != head)
                     down = NULL;
 
             do {
-                if(down) {
+                if (down) {
                     head = down->head;
                     down = H5FL_FREE(H5S_hyper_span_info_t, down);
                 } /* end if */
                 down = head->down;
 
-                while(head) {
+                while (head) {
                     last_span = head->next;
-                    head = H5FL_FREE(H5S_hyper_span_t, head);
-                    head = last_span;
+                    head      = H5FL_FREE(H5S_hyper_span_t, head);
+                    head      = last_span;
                 } /* end while */
-            } while(down);
+            } while (down);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_make_spans() */
+} /* H5S_hyper_make_spans() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_rebuild_helper
@@ -5845,33 +5889,32 @@ done:
     KY, 2005/9/22
 --------------------------------------------------------------------------*/
 static hbool_t
-H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span, H5S_hyper_dim_t span_slab_info[],
-    unsigned rank)
+H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span, H5S_hyper_dim_t span_slab_info[], unsigned rank)
 {
-    hsize_t curr_stride, next_stride;
-    hsize_t curr_block, next_block;
-    hsize_t curr_start;
-    hsize_t curr_low;
-    size_t outcount;
-    unsigned u;
-    H5S_hyper_dim_t      canon_down_span_slab_info[H5S_MAX_RANK];
-    hbool_t ret_value = TRUE;
+    hsize_t         curr_stride, next_stride;
+    hsize_t         curr_block, next_block;
+    hsize_t         curr_start;
+    hsize_t         curr_low;
+    size_t          outcount;
+    unsigned        u;
+    H5S_hyper_dim_t canon_down_span_slab_info[H5S_MAX_RANK];
+    hbool_t         ret_value = TRUE;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(span) {
+    if (span) {
         /* Initialization */
-        curr_stride     = 1;
-        curr_block      = 0;
-        outcount        = 0;
-        curr_low        = 0;
+        curr_stride = 1;
+        curr_block  = 0;
+        outcount    = 0;
+        curr_low    = 0;
 
         /* Get "canonical" down span information */
-        if(span->down) {
+        if (span->down) {
             HDassert(span->down->head);
 
             /* Go to the next down span and check whether the selection can be rebuilt.*/
-            if(!H5S_hyper_rebuild_helper(span->down->head, span_slab_info, rank - 1))
+            if (!H5S_hyper_rebuild_helper(span->down->head, span_slab_info, rank - 1))
                 HGOTO_DONE(FALSE)
 
             HDmemcpy(canon_down_span_slab_info, span_slab_info, sizeof(H5S_hyper_dim_t) * rank);
@@ -5882,54 +5925,56 @@ H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span, H5S_hyper_dim_t span_slab
         curr_block = (span->high - span->low) + 1;
 
         /* Loop the span */
-        while(span) {
-            if(outcount > 0) {
-                if(span->down) {
-                    H5S_hyper_dim_t      *curr_down_span_slab_info;
+        while (span) {
+            if (outcount > 0) {
+                if (span->down) {
+                    H5S_hyper_dim_t *curr_down_span_slab_info;
 
                     HDassert(span->down->head);
 
                     /* Go to the next down span and check whether the selection can be rebuilt.*/
-                    if(!H5S_hyper_rebuild_helper(span->down->head, span_slab_info, rank - 1))
+                    if (!H5S_hyper_rebuild_helper(span->down->head, span_slab_info, rank - 1))
                         HGOTO_DONE(FALSE)
 
                     /* Compare the slab information of the adjacent spans in the down span tree.
-                       We have to compare all the sub-tree slab information with the canon_down_span_slab_info.*/
-
-                    for( u = 0; u < rank - 1; u++) {
-                       curr_down_span_slab_info = &span_slab_info[u];
-
-                       if(curr_down_span_slab_info->count > 0 && canon_down_span_slab_info[u].count > 0) {
-                          if(curr_down_span_slab_info->start != canon_down_span_slab_info[u].start
-                              || curr_down_span_slab_info->stride != canon_down_span_slab_info[u].stride
-                              || curr_down_span_slab_info->block != canon_down_span_slab_info[u].block
-                              || curr_down_span_slab_info->count != canon_down_span_slab_info[u].count)
-                          HGOTO_DONE(FALSE)
-                       } /* end if */
-                       else if (!((curr_down_span_slab_info->count == 0) && (canon_down_span_slab_info[u].count == 0)))
-                          HGOTO_DONE(FALSE)
+                       We have to compare all the sub-tree slab information with the
+                       canon_down_span_slab_info.*/
+
+                    for (u = 0; u < rank - 1; u++) {
+                        curr_down_span_slab_info = &span_slab_info[u];
+
+                        if (curr_down_span_slab_info->count > 0 && canon_down_span_slab_info[u].count > 0) {
+                            if (curr_down_span_slab_info->start != canon_down_span_slab_info[u].start ||
+                                curr_down_span_slab_info->stride != canon_down_span_slab_info[u].stride ||
+                                curr_down_span_slab_info->block != canon_down_span_slab_info[u].block ||
+                                curr_down_span_slab_info->count != canon_down_span_slab_info[u].count)
+                                HGOTO_DONE(FALSE)
+                        } /* end if */
+                        else if (!((curr_down_span_slab_info->count == 0) &&
+                                   (canon_down_span_slab_info[u].count == 0)))
+                            HGOTO_DONE(FALSE)
                     }
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             /* Obtain values for stride and block */
-            next_stride  = span->low  - curr_low;
-            next_block   = (span->high - span->low) + 1;
+            next_stride = span->low - curr_low;
+            next_block  = (span->high - span->low) + 1;
 
             /* Compare stride and block in this span, to compare stride,
              * three spans are needed. Ignore the first two spans.
              */
-            if(outcount  > 1  && curr_stride != next_stride)
+            if (outcount > 1 && curr_stride != next_stride)
                 HGOTO_DONE(FALSE)
-            if(outcount != 0  && next_block  != curr_block)
+            if (outcount != 0 && next_block != curr_block)
                 HGOTO_DONE(FALSE)
 
             /* Keep the isolated stride to be 1 */
-            if(outcount != 0)
+            if (outcount != 0)
                 curr_stride = next_stride;
 
             /* Keep current starting point */
-            curr_low    = span->low;
+            curr_low = span->low;
 
             /* Advance to next span */
             span = span->next;
@@ -5947,7 +5992,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_hyper_rebuild_helper() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_rebuild
@@ -5979,11 +6023,11 @@ done:
 static htri_t
 H5S_hyper_rebuild(H5S_t *space)
 {
-    H5S_hyper_dim_t top_span_slab_info[H5O_LAYOUT_NDIMS];
+    H5S_hyper_dim_t  top_span_slab_info[H5O_LAYOUT_NDIMS];
     H5S_hyper_dim_t *diminfo;
     H5S_hyper_dim_t *app_diminfo;
-    unsigned rank, curr_dim;
-    htri_t ret_value = TRUE;      /* Return value */
+    unsigned         rank, curr_dim;
+    htri_t           ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -5994,20 +6038,25 @@ H5S_hyper_rebuild(H5S_t *space)
     /* Check the rank of space */
     rank = space->extent.rank;
 
-    /* Check whether the slab can be rebuilt. Only regular selection can be rebuilt. If yes, fill in correct values.*/
-    if(!H5S_hyper_rebuild_helper(space->select.sel_info.hslab->span_lst->head, top_span_slab_info, rank)) {
+    /* Check whether the slab can be rebuilt. Only regular selection can be rebuilt. If yes, fill in correct
+     * values.*/
+    if (!H5S_hyper_rebuild_helper(space->select.sel_info.hslab->span_lst->head, top_span_slab_info, rank)) {
         HGOTO_DONE(FALSE)
     } /* end if */
     else {
-        diminfo=space->select.sel_info.hslab->opt_diminfo;
-        app_diminfo=space->select.sel_info.hslab->app_diminfo;
+        diminfo     = space->select.sel_info.hslab->opt_diminfo;
+        app_diminfo = space->select.sel_info.hslab->app_diminfo;
 
-        for(curr_dim = 0; curr_dim < rank; curr_dim++) {
+        for (curr_dim = 0; curr_dim < rank; curr_dim++) {
 
-            app_diminfo[(rank - curr_dim) - 1].start  = diminfo[(rank - curr_dim) - 1].start = top_span_slab_info[curr_dim].start;
-            app_diminfo[(rank - curr_dim) - 1].stride = diminfo[(rank - curr_dim) - 1].stride = top_span_slab_info[curr_dim].stride;
-            app_diminfo[(rank - curr_dim) - 1].count  = diminfo[(rank - curr_dim) - 1].count = top_span_slab_info[curr_dim].count;
-            app_diminfo[(rank - curr_dim) - 1].block  = diminfo[(rank - curr_dim) - 1].block = top_span_slab_info[curr_dim].block;
+            app_diminfo[(rank - curr_dim) - 1].start = diminfo[(rank - curr_dim) - 1].start =
+                top_span_slab_info[curr_dim].start;
+            app_diminfo[(rank - curr_dim) - 1].stride = diminfo[(rank - curr_dim) - 1].stride =
+                top_span_slab_info[curr_dim].stride;
+            app_diminfo[(rank - curr_dim) - 1].count = diminfo[(rank - curr_dim) - 1].count =
+                top_span_slab_info[curr_dim].count;
+            app_diminfo[(rank - curr_dim) - 1].block = diminfo[(rank - curr_dim) - 1].block =
+                top_span_slab_info[curr_dim].block;
 
         } /* end for */
 
@@ -6016,9 +6065,8 @@ H5S_hyper_rebuild(H5S_t *space)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_rebuild() */
+} /* H5S_hyper_rebuild() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_generate_spans
@@ -6040,12 +6088,12 @@ done:
 static herr_t
 H5S_hyper_generate_spans(H5S_t *space)
 {
-    hsize_t tmp_start[H5O_LAYOUT_NDIMS];   /* Temporary start information */
-    hsize_t tmp_stride[H5O_LAYOUT_NDIMS];   /* Temporary stride information */
-    hsize_t tmp_count[H5O_LAYOUT_NDIMS];    /* Temporary count information */
-    hsize_t tmp_block[H5O_LAYOUT_NDIMS];    /* Temporary block information */
-    unsigned u;                             /* Counter */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    hsize_t  tmp_start[H5O_LAYOUT_NDIMS];  /* Temporary start information */
+    hsize_t  tmp_stride[H5O_LAYOUT_NDIMS]; /* Temporary stride information */
+    hsize_t  tmp_count[H5O_LAYOUT_NDIMS];  /* Temporary count information */
+    hsize_t  tmp_block[H5O_LAYOUT_NDIMS];  /* Temporary block information */
+    unsigned u;                            /* Counter */
+    herr_t   ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -6053,23 +6101,23 @@ H5S_hyper_generate_spans(H5S_t *space)
     HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
 
     /* Get the diminfo */
-    for(u=0; u<space->extent.rank; u++) {
-        tmp_start[u]=space->select.sel_info.hslab->opt_diminfo[u].start;
-        tmp_stride[u]=space->select.sel_info.hslab->opt_diminfo[u].stride;
-        tmp_count[u]=space->select.sel_info.hslab->opt_diminfo[u].count;
-        tmp_block[u]=space->select.sel_info.hslab->opt_diminfo[u].block;
+    for (u = 0; u < space->extent.rank; u++) {
+        tmp_start[u]  = space->select.sel_info.hslab->opt_diminfo[u].start;
+        tmp_stride[u] = space->select.sel_info.hslab->opt_diminfo[u].stride;
+        tmp_count[u]  = space->select.sel_info.hslab->opt_diminfo[u].count;
+        tmp_block[u]  = space->select.sel_info.hslab->opt_diminfo[u].block;
     } /* end for */
 
     /* Build the hyperslab information also */
-    if(H5S_generate_hyperslab (space, H5S_SELECT_SET, tmp_start, tmp_stride, tmp_count, tmp_block)<0)
+    if (H5S_generate_hyperslab(space, H5S_SELECT_SET, tmp_start, tmp_stride, tmp_count, tmp_block) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't generate hyperslabs")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_hyper_generate_spans() */
+} /* H5S_hyper_generate_spans() */
 
 #ifndef NEW_HYPERSLAB_API
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5S_generate_hyperlab
  *
@@ -6085,17 +6133,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
-		      const hsize_t start[],
-		      const hsize_t stride[],
-		      const hsize_t count[],
-		      const hsize_t block[])
+H5S_generate_hyperslab(H5S_t *space, H5S_seloper_t op, const hsize_t start[], const hsize_t stride[],
+                       const hsize_t count[], const hsize_t block[])
 {
-    H5S_hyper_span_info_t *new_spans=NULL;  /* Span tree for new hyperslab */
-    H5S_hyper_span_info_t *a_not_b=NULL;    /* Span tree for hyperslab spans in old span tree and not in new span tree */
-    H5S_hyper_span_info_t *a_and_b=NULL;    /* Span tree for hyperslab spans in both old and new span trees */
-    H5S_hyper_span_info_t *b_not_a=NULL;    /* Span tree for hyperslab spans in new span tree and not in old span tree */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5S_hyper_span_info_t *new_spans = NULL; /* Span tree for new hyperslab */
+    H5S_hyper_span_info_t *a_not_b =
+        NULL; /* Span tree for hyperslab spans in old span tree and not in new span tree */
+    H5S_hyper_span_info_t *a_and_b = NULL; /* Span tree for hyperslab spans in both old and new span trees */
+    H5S_hyper_span_info_t *b_not_a =
+        NULL;                   /* Span tree for hyperslab spans in new span tree and not in old span tree */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -6108,37 +6155,38 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
     HDassert(block);
 
     /* Generate span tree for new hyperslab information */
-    if((new_spans=H5S_hyper_make_spans(space->extent.rank,start,stride,count,block))==NULL)
+    if ((new_spans = H5S_hyper_make_spans(space->extent.rank, start, stride, count, block)) == NULL)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't create hyperslab information")
 
     /* Generate list of blocks to add/remove based on selection operation */
-    if(op==H5S_SELECT_SET) {
+    if (op == H5S_SELECT_SET) {
         /* Add new spans to current selection */
-        if(H5S_hyper_merge_spans(space,new_spans,TRUE)<0)
+        if (H5S_hyper_merge_spans(space, new_spans, TRUE) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
         /* Set the number of elements in current selection */
-        space->select.num_elem=H5S_hyper_spans_nelem(new_spans);
+        space->select.num_elem = H5S_hyper_spans_nelem(new_spans);
 
         /* Indicate that the new_spans are owned */
-        new_spans=NULL;
+        new_spans = NULL;
     } /* end if */
     else {
-        hbool_t updated_spans = FALSE;  /* Whether the spans in the selection were modified */
+        hbool_t updated_spans = FALSE; /* Whether the spans in the selection were modified */
 
         /* Generate lists of spans which overlap and don't overlap */
-        if(H5S_hyper_clip_spans(space->select.sel_info.hslab->span_lst,new_spans,&a_not_b,&a_and_b,&b_not_a)<0)
+        if (H5S_hyper_clip_spans(space->select.sel_info.hslab->span_lst, new_spans, &a_not_b, &a_and_b,
+                                 &b_not_a) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't clip hyperslab information")
 
-        switch(op) {
+        switch (op) {
             case H5S_SELECT_OR:
                 /* Add any new spans from b_not_a to current selection */
-                if(b_not_a!=NULL) {
-                    if(H5S_hyper_merge_spans(space,b_not_a,FALSE)<0)
+                if (b_not_a != NULL) {
+                    if (H5S_hyper_merge_spans(space, b_not_a, FALSE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    space->select.num_elem+=H5S_hyper_spans_nelem(b_not_a);
+                    space->select.num_elem += H5S_hyper_spans_nelem(b_not_a);
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6147,23 +6195,23 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
 
             case H5S_SELECT_AND:
                 /* Free the current selection */
-                if(H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst)<0)
+                if (H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst) < 0)
                     HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans")
-                space->select.sel_info.hslab->span_lst=NULL;
+                space->select.sel_info.hslab->span_lst = NULL;
 
                 /* Reset the number of items in selection */
-                space->select.num_elem=0;
+                space->select.num_elem = 0;
 
                 /* Check if there are any overlapped selections */
-                if(a_and_b!=NULL) {
-                    if(H5S_hyper_merge_spans(space,a_and_b,TRUE)<0)
+                if (a_and_b != NULL) {
+                    if (H5S_hyper_merge_spans(space, a_and_b, TRUE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    space->select.num_elem=H5S_hyper_spans_nelem(a_and_b);
+                    space->select.num_elem = H5S_hyper_spans_nelem(a_and_b);
 
                     /* Indicate that the a_and_b spans are owned */
-                    a_and_b=NULL;
+                    a_and_b = NULL;
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6172,30 +6220,30 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
 
             case H5S_SELECT_XOR:
                 /* Free the current selection */
-                if(H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst)<0)
+                if (H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst) < 0)
                     HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans")
-                space->select.sel_info.hslab->span_lst=NULL;
+                space->select.sel_info.hslab->span_lst = NULL;
 
                 /* Reset the number of items in selection */
-                space->select.num_elem=0;
+                space->select.num_elem = 0;
 
                 /* Check if there are any non-overlapped selections */
-                if(a_not_b!=NULL) {
-                    if(H5S_hyper_merge_spans(space,a_not_b,FALSE)<0)
+                if (a_not_b != NULL) {
+                    if (H5S_hyper_merge_spans(space, a_not_b, FALSE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    space->select.num_elem=H5S_hyper_spans_nelem(a_not_b);
+                    space->select.num_elem = H5S_hyper_spans_nelem(a_not_b);
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
                 } /* end if */
-                if(b_not_a!=NULL) {
-                    if(H5S_hyper_merge_spans(space,b_not_a,FALSE)<0)
+                if (b_not_a != NULL) {
+                    if (H5S_hyper_merge_spans(space, b_not_a, FALSE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    space->select.num_elem+=H5S_hyper_spans_nelem(b_not_a);
+                    space->select.num_elem += H5S_hyper_spans_nelem(b_not_a);
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6204,23 +6252,23 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
 
             case H5S_SELECT_NOTB:
                 /* Free the current selection */
-                if(H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst)<0)
+                if (H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst) < 0)
                     HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans")
-                space->select.sel_info.hslab->span_lst=NULL;
+                space->select.sel_info.hslab->span_lst = NULL;
 
                 /* Reset the number of items in selection */
-                space->select.num_elem=0;
+                space->select.num_elem = 0;
 
                 /* Check if there are any non-overlapped selections */
-                if(a_not_b!=NULL) {
-                    if(H5S_hyper_merge_spans(space,a_not_b,TRUE)<0)
+                if (a_not_b != NULL) {
+                    if (H5S_hyper_merge_spans(space, a_not_b, TRUE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    space->select.num_elem=H5S_hyper_spans_nelem(a_not_b);
+                    space->select.num_elem = H5S_hyper_spans_nelem(a_not_b);
 
                     /* Indicate that the a_not_b are owned */
-                    a_not_b=NULL;
+                    a_not_b = NULL;
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6229,23 +6277,23 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
 
             case H5S_SELECT_NOTA:
                 /* Free the current selection */
-                if(H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst)<0)
+                if (H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst) < 0)
                     HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans")
-                space->select.sel_info.hslab->span_lst=NULL;
+                space->select.sel_info.hslab->span_lst = NULL;
 
                 /* Reset the number of items in selection */
-                space->select.num_elem=0;
+                space->select.num_elem = 0;
 
                 /* Check if there are any non-overlapped selections */
-                if(b_not_a!=NULL) {
-                    if(H5S_hyper_merge_spans(space,b_not_a,TRUE)<0)
+                if (b_not_a != NULL) {
+                    if (H5S_hyper_merge_spans(space, b_not_a, TRUE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    space->select.num_elem=H5S_hyper_spans_nelem(b_not_a);
+                    space->select.num_elem = H5S_hyper_spans_nelem(b_not_a);
 
                     /* Indicate that the b_not_a are owned */
-                    b_not_a=NULL;
+                    b_not_a = NULL;
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6262,59 +6310,58 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
         } /* end switch */
 
         /* Check if the resulting hyperslab span tree is empty */
-        if(space->select.sel_info.hslab->span_lst==NULL) {
-            H5S_hyper_span_info_t *spans;     /* Empty hyperslab span tree */
+        if (space->select.sel_info.hslab->span_lst == NULL) {
+            H5S_hyper_span_info_t *spans; /* Empty hyperslab span tree */
 
             /* Sanity check */
             HDassert(space->select.num_elem == 0);
 
             /* Allocate a span info node */
-            if((spans = H5FL_MALLOC(H5S_hyper_span_info_t))==NULL)
+            if ((spans = H5FL_MALLOC(H5S_hyper_span_info_t)) == NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span")
 
             /* Set the reference count */
-            spans->count=1;
+            spans->count = 1;
 
             /* Reset the scratch pad space */
-            spans->scratch=0;
+            spans->scratch = 0;
 
             /* Set to empty tree */
-            spans->head=NULL;
+            spans->head = NULL;
 
             /* Set pointer to empty span tree */
-            space->select.sel_info.hslab->span_lst=spans;
+            space->select.sel_info.hslab->span_lst = spans;
         } /* end if */
         else {
             /* Check if we updated the spans */
-            if(updated_spans) {
+            if (updated_spans) {
                 /* Attempt to rebuild "optimized" start/stride/count/block information.
                  * from resulting hyperslab span tree
                  */
-                if(H5S_hyper_rebuild(space) < 0)
+                if (H5S_hyper_rebuild(space) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOUNT, FAIL, "can't rebuild hyperslab info")
             } /* end if */
-        } /* end else */
-    } /* end else */
+        }     /* end else */
+    }         /* end else */
 
 done:
     /* Free resources */
-    if(a_not_b)
-        if(H5S_hyper_free_span_info(a_not_b) < 0)
+    if (a_not_b)
+        if (H5S_hyper_free_span_info(a_not_b) < 0)
             HDONE_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release temporary hyperslab spans")
-    if(a_and_b)
-        if(H5S_hyper_free_span_info(a_and_b) < 0)
+    if (a_and_b)
+        if (H5S_hyper_free_span_info(a_and_b) < 0)
             HDONE_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release temporary hyperslab spans")
-    if(b_not_a)
-        if(H5S_hyper_free_span_info(b_not_a) < 0)
+    if (b_not_a)
+        if (H5S_hyper_free_span_info(b_not_a) < 0)
             HDONE_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release temporary hyperslab spans")
-    if(new_spans)
-        if(H5S_hyper_free_span_info(new_spans) < 0)
+    if (new_spans)
+        if (H5S_hyper_free_span_info(new_spans) < 0)
             HDONE_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release temporary hyperslab spans")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_generate_hyperslab() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_select_hyperslab
  *
@@ -6328,20 +6375,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
-		      const hsize_t start[],
-		      const hsize_t *stride,
-		      const hsize_t count[],
-		      const hsize_t *block)
+H5S_select_hyperslab(H5S_t *space, H5S_seloper_t op, const hsize_t start[], const hsize_t *stride,
+                     const hsize_t count[], const hsize_t *block)
 {
-    hsize_t int_stride[H5O_LAYOUT_NDIMS];   /* Internal storage for stride information */
-    hsize_t int_count[H5O_LAYOUT_NDIMS];    /* Internal storage for count information */
-    hsize_t int_block[H5O_LAYOUT_NDIMS];    /* Internal storage for block information */
-    const hsize_t *opt_stride;      /* Optimized stride information */
-    const hsize_t *opt_count;       /* Optimized count information */
-    const hsize_t *opt_block;       /* Optimized block information */
-    unsigned u;                     /* Counters */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    hsize_t        int_stride[H5O_LAYOUT_NDIMS]; /* Internal storage for stride information */
+    hsize_t        int_count[H5O_LAYOUT_NDIMS];  /* Internal storage for count information */
+    hsize_t        int_block[H5O_LAYOUT_NDIMS];  /* Internal storage for block information */
+    const hsize_t *opt_stride;                   /* Optimized stride information */
+    const hsize_t *opt_count;                    /* Optimized count information */
+    const hsize_t *opt_block;                    /* Optimized block information */
+    unsigned       u;                            /* Counters */
+    herr_t         ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -6352,36 +6396,36 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
     HDassert(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID);
 
     /* Point to the correct stride values */
-    if(stride==NULL)
+    if (stride == NULL)
         stride = _ones;
 
     /* Point to the correct block values */
-    if(block==NULL)
+    if (block == NULL)
         block = _ones;
 
     /*
      * Check new selection.
      */
-    for(u=0; u<space->extent.rank; u++) {
+    for (u = 0; u < space->extent.rank; u++) {
         /* Check for overlapping hyperslab blocks in new selection. */
-        if(count[u]>1 && stride[u]<block[u])
+        if (count[u] > 1 && stride[u] < block[u])
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "hyperslab blocks overlap")
 
         /* Detect zero-sized hyperslabs in new selection */
-        if(count[u] == 0 || block[u] == 0) {
-            switch(op) {
-                case H5S_SELECT_SET:   /* Select "set" operation */
-                case H5S_SELECT_AND:   /* Binary "and" operation for hyperslabs */
-                case H5S_SELECT_NOTA:  /* Binary "B not A" operation for hyperslabs */
+        if (count[u] == 0 || block[u] == 0) {
+            switch (op) {
+                case H5S_SELECT_SET:  /* Select "set" operation */
+                case H5S_SELECT_AND:  /* Binary "and" operation for hyperslabs */
+                case H5S_SELECT_NOTA: /* Binary "B not A" operation for hyperslabs */
                     /* Convert to "none" selection */
-                    if(H5S_select_none(space)<0)
+                    if (H5S_select_none(space) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection")
                     HGOTO_DONE(SUCCEED);
 
-                case H5S_SELECT_OR:    /* Binary "or" operation for hyperslabs */
-                case H5S_SELECT_XOR:   /* Binary "xor" operation for hyperslabs */
-                case H5S_SELECT_NOTB:  /* Binary "A not B" operation for hyperslabs */
-                    HGOTO_DONE(SUCCEED);        /* Selection stays same */
+                case H5S_SELECT_OR:      /* Binary "or" operation for hyperslabs */
+                case H5S_SELECT_XOR:     /* Binary "xor" operation for hyperslabs */
+                case H5S_SELECT_NOTB:    /* Binary "A not B" operation for hyperslabs */
+                    HGOTO_DONE(SUCCEED); /* Selection stays same */
 
                 case H5S_SELECT_NOOP:
                 case H5S_SELECT_APPEND:
@@ -6390,61 +6434,61 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
                 default:
                     HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
             } /* end switch */
-        } /* end if */
-    } /* end for */
+        }     /* end if */
+    }         /* end for */
 
     /* Optimize hyperslab parameters to merge contiguous blocks, etc. */
-    if(stride == _ones && block == _ones) {
+    if (stride == _ones && block == _ones) {
         /* Point to existing arrays */
         opt_stride = _ones;
-        opt_count = _ones;
-        opt_block = count;
+        opt_count  = _ones;
+        opt_block  = count;
     } /* end if */
     else {
         /* Point to local arrays */
         opt_stride = int_stride;
-        opt_count = int_count;
-        opt_block = int_block;
-        for(u=0; u<space->extent.rank; u++) {
+        opt_count  = int_count;
+        opt_block  = int_block;
+        for (u = 0; u < space->extent.rank; u++) {
             /* contiguous hyperslabs have the block size equal to the stride */
-            if(stride[u]==block[u]) {
-                int_count[u]=1;
-                int_stride[u]=1;
-                if(block[u]==1)
-                    int_block[u]=count[u];
+            if (stride[u] == block[u]) {
+                int_count[u]  = 1;
+                int_stride[u] = 1;
+                if (block[u] == 1)
+                    int_block[u] = count[u];
                 else
-                    int_block[u]=block[u]*count[u];
+                    int_block[u] = block[u] * count[u];
             } /* end if */
             else {
-                if(count[u]==1)
-                    int_stride[u]=1;
+                if (count[u] == 1)
+                    int_stride[u] = 1;
                 else {
                     HDassert(stride[u] > block[u]);
-                    int_stride[u]=stride[u];
+                    int_stride[u] = stride[u];
                 } /* end else */
-                int_count[u]=count[u];
-                int_block[u]=block[u];
+                int_count[u] = count[u];
+                int_block[u] = block[u];
             } /* end else */
-        } /* end for */
-    } /* end else */
+        }     /* end for */
+    }         /* end else */
 
     /* Fixup operation for non-hyperslab selections */
-    switch(H5S_GET_SELECT_TYPE(space)) {
-        case H5S_SEL_NONE:   /* No elements selected in dataspace */
-            switch(op) {
-                case H5S_SELECT_SET:   /* Select "set" operation */
+    switch (H5S_GET_SELECT_TYPE(space)) {
+        case H5S_SEL_NONE: /* No elements selected in dataspace */
+            switch (op) {
+                case H5S_SELECT_SET: /* Select "set" operation */
                     /* Change "none" selection to hyperslab selection */
                     break;
 
-                case H5S_SELECT_OR:    /* Binary "or" operation for hyperslabs */
-                case H5S_SELECT_XOR:   /* Binary "xor" operation for hyperslabs */
-                case H5S_SELECT_NOTA:  /* Binary "B not A" operation for hyperslabs */
-                    op=H5S_SELECT_SET; /* Maps to "set" operation when applied to "none" selection */
+                case H5S_SELECT_OR:      /* Binary "or" operation for hyperslabs */
+                case H5S_SELECT_XOR:     /* Binary "xor" operation for hyperslabs */
+                case H5S_SELECT_NOTA:    /* Binary "B not A" operation for hyperslabs */
+                    op = H5S_SELECT_SET; /* Maps to "set" operation when applied to "none" selection */
                     break;
 
-                case H5S_SELECT_AND:   /* Binary "and" operation for hyperslabs */
-                case H5S_SELECT_NOTB:  /* Binary "A not B" operation for hyperslabs */
-                    HGOTO_DONE(SUCCEED);        /* Selection stays "none" */
+                case H5S_SELECT_AND:     /* Binary "and" operation for hyperslabs */
+                case H5S_SELECT_NOTB:    /* Binary "A not B" operation for hyperslabs */
+                    HGOTO_DONE(SUCCEED); /* Selection stays "none" */
 
                 case H5S_SELECT_NOOP:
                 case H5S_SELECT_APPEND:
@@ -6455,46 +6499,47 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
             } /* end switch */
             break;
 
-        case H5S_SEL_ALL:    /* All elements selected in dataspace */
-            switch(op) {
-                case H5S_SELECT_SET:   /* Select "set" operation */
+        case H5S_SEL_ALL: /* All elements selected in dataspace */
+            switch (op) {
+                case H5S_SELECT_SET: /* Select "set" operation */
                     /* Change "all" selection to hyperslab selection */
                     break;
 
-                case H5S_SELECT_OR:    /* Binary "or" operation for hyperslabs */
-                    HGOTO_DONE(SUCCEED);        /* Selection stays "all" */
+                case H5S_SELECT_OR:      /* Binary "or" operation for hyperslabs */
+                    HGOTO_DONE(SUCCEED); /* Selection stays "all" */
 
-                case H5S_SELECT_AND:   /* Binary "and" operation for hyperslabs */
-                    op=H5S_SELECT_SET; /* Maps to "set" operation when applied to "none" selection */
+                case H5S_SELECT_AND:     /* Binary "and" operation for hyperslabs */
+                    op = H5S_SELECT_SET; /* Maps to "set" operation when applied to "none" selection */
                     break;
 
-                case H5S_SELECT_XOR:   /* Binary "xor" operation for hyperslabs */
-                case H5S_SELECT_NOTB:  /* Binary "A not B" operation for hyperslabs */
+                case H5S_SELECT_XOR:  /* Binary "xor" operation for hyperslabs */
+                case H5S_SELECT_NOTB: /* Binary "A not B" operation for hyperslabs */
                     /* Convert current "all" selection to "real" hyperslab selection */
                     /* Then allow operation to proceed */
                     {
-                        hsize_t tmp_start[H5O_LAYOUT_NDIMS];   /* Temporary start information */
-                        hsize_t tmp_stride[H5O_LAYOUT_NDIMS];   /* Temporary stride information */
-                        hsize_t tmp_count[H5O_LAYOUT_NDIMS];    /* Temporary count information */
-                        hsize_t tmp_block[H5O_LAYOUT_NDIMS];    /* Temporary block information */
+                        hsize_t tmp_start[H5O_LAYOUT_NDIMS];  /* Temporary start information */
+                        hsize_t tmp_stride[H5O_LAYOUT_NDIMS]; /* Temporary stride information */
+                        hsize_t tmp_count[H5O_LAYOUT_NDIMS];  /* Temporary count information */
+                        hsize_t tmp_block[H5O_LAYOUT_NDIMS];  /* Temporary block information */
 
                         /* Fill in temporary information for the dimensions */
-                        for(u=0; u<space->extent.rank; u++) {
-                            tmp_start[u]=0;
-                            tmp_stride[u]=1;
-                            tmp_count[u]=1;
-                            tmp_block[u]=space->extent.size[u];
+                        for (u = 0; u < space->extent.rank; u++) {
+                            tmp_start[u]  = 0;
+                            tmp_stride[u] = 1;
+                            tmp_count[u]  = 1;
+                            tmp_block[u]  = space->extent.size[u];
                         } /* end for */
 
                         /* Convert to hyperslab selection */
-                        if(H5S_select_hyperslab(space,H5S_SELECT_SET,tmp_start,tmp_stride,tmp_count,tmp_block)<0)
+                        if (H5S_select_hyperslab(space, H5S_SELECT_SET, tmp_start, tmp_stride, tmp_count,
+                                                 tmp_block) < 0)
                             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection")
                     } /* end case */
                     break;
 
-                case H5S_SELECT_NOTA:  /* Binary "B not A" operation for hyperslabs */
+                case H5S_SELECT_NOTA: /* Binary "B not A" operation for hyperslabs */
                     /* Convert to "none" selection */
-                    if(H5S_select_none(space)<0)
+                    if (H5S_select_none(space) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection")
                     HGOTO_DONE(SUCCEED);
 
@@ -6511,8 +6556,8 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
             /* Hyperslab operation on hyperslab selection, OK */
             break;
 
-        case H5S_SEL_POINTS: /* Can't combine hyperslab operations and point selections currently */
-            if(op==H5S_SELECT_SET)      /* Allow only "set" operation to proceed */
+        case H5S_SEL_POINTS:          /* Can't combine hyperslab operations and point selections currently */
+            if (op == H5S_SELECT_SET) /* Allow only "set" operation to proceed */
                 break;
             /* Else fall through to error */
 
@@ -6522,27 +6567,27 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
             HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
     } /* end switch */
 
-    if(op == H5S_SELECT_SET) {
+    if (op == H5S_SELECT_SET) {
         /* If we are setting a new selection, remove current selection first */
-        if(H5S_SELECT_RELEASE(space) < 0)
+        if (H5S_SELECT_RELEASE(space) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release selection")
 
         /* Allocate space for the hyperslab selection information */
-        if(NULL == (space->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)))
+        if (NULL == (space->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab info")
 
         /* Save the diminfo */
         space->select.num_elem = 1;
-        for(u = 0; u < space->extent.rank; u++) {
-            space->select.sel_info.hslab->app_diminfo[u].start = start[u];
+        for (u = 0; u < space->extent.rank; u++) {
+            space->select.sel_info.hslab->app_diminfo[u].start  = start[u];
             space->select.sel_info.hslab->app_diminfo[u].stride = stride[u];
-            space->select.sel_info.hslab->app_diminfo[u].count = count[u];
-            space->select.sel_info.hslab->app_diminfo[u].block = block[u];
+            space->select.sel_info.hslab->app_diminfo[u].count  = count[u];
+            space->select.sel_info.hslab->app_diminfo[u].block  = block[u];
 
-            space->select.sel_info.hslab->opt_diminfo[u].start = start[u];
+            space->select.sel_info.hslab->opt_diminfo[u].start  = start[u];
             space->select.sel_info.hslab->opt_diminfo[u].stride = opt_stride[u];
-            space->select.sel_info.hslab->opt_diminfo[u].count = opt_count[u];
-            space->select.sel_info.hslab->opt_diminfo[u].block = opt_block[u];
+            space->select.sel_info.hslab->opt_diminfo[u].count  = opt_count[u];
+            space->select.sel_info.hslab->opt_diminfo[u].block  = opt_block[u];
 
             space->select.num_elem *= (opt_count[u] * opt_block[u]);
         } /* end for */
@@ -6553,20 +6598,20 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
         /* Indicate that there's no slab information */
         space->select.sel_info.hslab->span_lst = NULL;
     } /* end if */
-    else if(op >= H5S_SELECT_OR && op <= H5S_SELECT_NOTA) {
+    else if (op >= H5S_SELECT_OR && op <= H5S_SELECT_NOTA) {
         /* Sanity check */
         HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
 
         /* Check if there's no hyperslab span information currently */
-        if(NULL == space->select.sel_info.hslab->span_lst)
-            if(H5S_hyper_generate_spans(space) < 0)
+        if (NULL == space->select.sel_info.hslab->span_lst)
+            if (H5S_hyper_generate_spans(space) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, FAIL, "dataspace does not have span tree")
 
         /* Indicate that the regular dimensions are no longer valid */
         space->select.sel_info.hslab->diminfo_valid = FALSE;
 
         /* Add in the new hyperslab information */
-        if(H5S_generate_hyperslab(space, op, start, opt_stride, opt_count, opt_block) < 0)
+        if (H5S_generate_hyperslab(space, op, start, opt_stride, opt_count, opt_block) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't generate hyperslabs")
     } /* end if */
     else
@@ -6577,9 +6622,8 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_select_hyperslab() */
+} /* end H5S_select_hyperslab() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sselect_hyperslab
@@ -6607,43 +6651,43 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
-         const hsize_t stride[], const hsize_t count[], const hsize_t block[])
+H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], const hsize_t stride[],
+                    const hsize_t count[], const hsize_t block[])
 {
-    H5S_t *space;               /* Dataspace to modify selection of */
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5S_t *  space;               /* Dataspace to modify selection of */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if(H5S_SCALAR == H5S_GET_EXTENT_TYPE(space))
+    if (H5S_SCALAR == H5S_GET_EXTENT_TYPE(space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "hyperslab doesn't support H5S_SCALAR space")
-    if(H5S_NULL == H5S_GET_EXTENT_TYPE(space))
+    if (H5S_NULL == H5S_GET_EXTENT_TYPE(space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "hyperslab doesn't support H5S_NULL space")
-    if(start == NULL || count == NULL)
+    if (start == NULL || count == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "hyperslab not specified")
-    if(!(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID))
+    if (!(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID))
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
-    if(stride!=NULL) {
+    if (stride != NULL) {
         /* Check for 0-sized strides */
-        for(u=0; u<space->extent.rank; u++) {
-            if(stride[u]==0)
+        for (u = 0; u < space->extent.rank; u++) {
+            if (stride[u] == 0)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid stride==0 value")
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
-    if (H5S_select_hyperslab(space, op, start, stride, count, block)<0)
+    if (H5S_select_hyperslab(space, op, start, stride, count, block) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to set hyperslab selection")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Sselect_hyperslab() */
-#else /* NEW_HYPERSLAB_API */ /* Works */
-
+#else /* NEW_HYPERSLAB_API */  /* Works */
+
 /*-------------------------------------------------------------------------
  * Function:	H5S_operate_hyperslab
  *
@@ -6660,13 +6704,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper_t op, H5S_hyper_span_info_t *spans2,
-    hbool_t can_own_span2, hbool_t *span2_owned)
+H5S_operate_hyperslab(H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper_t op,
+                      H5S_hyper_span_info_t *spans2, hbool_t can_own_span2, hbool_t *span2_owned)
 {
-    H5S_hyper_span_info_t *a_not_b=NULL;    /* Span tree for hyperslab spans in old span tree and not in new span tree */
-    H5S_hyper_span_info_t *a_and_b=NULL;    /* Span tree for hyperslab spans in both old and new span trees */
-    H5S_hyper_span_info_t *b_not_a=NULL;    /* Span tree for hyperslab spans in new span tree and not in old span tree */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5S_hyper_span_info_t *a_not_b =
+        NULL; /* Span tree for hyperslab spans in old span tree and not in new span tree */
+    H5S_hyper_span_info_t *a_and_b = NULL; /* Span tree for hyperslab spans in both old and new span trees */
+    H5S_hyper_span_info_t *b_not_a =
+        NULL;                   /* Span tree for hyperslab spans in new span tree and not in old span tree */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -6677,45 +6723,45 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
 
     /* Just copy the selection from spans2 if we are setting the selection */
     /* ('space1' to 'result' aliasing happens at the next layer up) */
-    if(op==H5S_SELECT_SET) {
-        if(H5S_hyper_merge_spans(result,spans2,can_own_span2)<0)
+    if (op == H5S_SELECT_SET) {
+        if (H5S_hyper_merge_spans(result, spans2, can_own_span2) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
         /* Update the number of elements in current selection */
-        result->select.num_elem=H5S_hyper_spans_nelem(spans2);
+        result->select.num_elem = H5S_hyper_spans_nelem(spans2);
 
         /* Indicate that we took ownership of span2, if allowed */
-        if(can_own_span2)
-            *span2_owned=TRUE;
+        if (can_own_span2)
+            *span2_owned = TRUE;
     } /* end if */
     else {
-        hbool_t updated_spans = FALSE;  /* Whether the spans in the selection were modified */
+        hbool_t updated_spans = FALSE; /* Whether the spans in the selection were modified */
 
         HDassert(spans1);
 
         /* Generate lists of spans which overlap and don't overlap */
-        if(H5S_hyper_clip_spans(spans1,spans2,&a_not_b,&a_and_b,&b_not_a)<0)
+        if (H5S_hyper_clip_spans(spans1, spans2, &a_not_b, &a_and_b, &b_not_a) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't clip hyperslab information")
 
         /* Switch on the operation */
-        switch(op) {
+        switch (op) {
             case H5S_SELECT_OR:
                 /* Copy spans from spans1 to current selection */
-                if(spans1!=NULL) {
-                    if(H5S_hyper_merge_spans(result,spans1,FALSE)<0)
+                if (spans1 != NULL) {
+                    if (H5S_hyper_merge_spans(result, spans1, FALSE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    result->select.num_elem=H5S_hyper_spans_nelem(spans1);
+                    result->select.num_elem = H5S_hyper_spans_nelem(spans1);
                 } /* end if */
 
                 /* Add any new spans from spans2 to current selection */
-                if(b_not_a!=NULL) {
-                    if(H5S_hyper_merge_spans(result,b_not_a,FALSE)<0)
+                if (b_not_a != NULL) {
+                    if (H5S_hyper_merge_spans(result, b_not_a, FALSE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    result->select.num_elem+=H5S_hyper_spans_nelem(b_not_a);
+                    result->select.num_elem += H5S_hyper_spans_nelem(b_not_a);
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6724,15 +6770,15 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
 
             case H5S_SELECT_AND:
                 /* Check if there are any overlapped selections */
-                if(a_and_b!=NULL) {
-                    if(H5S_hyper_merge_spans(result,a_and_b,TRUE)<0)
+                if (a_and_b != NULL) {
+                    if (H5S_hyper_merge_spans(result, a_and_b, TRUE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    result->select.num_elem=H5S_hyper_spans_nelem(a_and_b);
+                    result->select.num_elem = H5S_hyper_spans_nelem(a_and_b);
 
                     /* Indicate that the result owns the a_and_b spans */
-                    a_and_b=NULL;
+                    a_and_b = NULL;
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6741,22 +6787,22 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
 
             case H5S_SELECT_XOR:
                 /* Check if there are any non-overlapped selections */
-                if(a_not_b!=NULL) {
-                    if(H5S_hyper_merge_spans(result,a_not_b,FALSE)<0)
+                if (a_not_b != NULL) {
+                    if (H5S_hyper_merge_spans(result, a_not_b, FALSE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    result->select.num_elem=H5S_hyper_spans_nelem(a_not_b);
+                    result->select.num_elem = H5S_hyper_spans_nelem(a_not_b);
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
                 } /* end if */
-                if(b_not_a!=NULL) {
-                    if(H5S_hyper_merge_spans(result,b_not_a,FALSE)<0)
+                if (b_not_a != NULL) {
+                    if (H5S_hyper_merge_spans(result, b_not_a, FALSE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    result->select.num_elem+=H5S_hyper_spans_nelem(b_not_a);
+                    result->select.num_elem += H5S_hyper_spans_nelem(b_not_a);
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6765,15 +6811,15 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
 
             case H5S_SELECT_NOTB:
                 /* Check if there are any non-overlapped selections */
-                if(a_not_b!=NULL) {
-                    if(H5S_hyper_merge_spans(result,a_not_b,TRUE)<0)
+                if (a_not_b != NULL) {
+                    if (H5S_hyper_merge_spans(result, a_not_b, TRUE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    result->select.num_elem=H5S_hyper_spans_nelem(a_not_b);
+                    result->select.num_elem = H5S_hyper_spans_nelem(a_not_b);
 
                     /* Indicate that the result owns the a_not_b spans */
-                    a_not_b=NULL;
+                    a_not_b = NULL;
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6782,15 +6828,15 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
 
             case H5S_SELECT_NOTA:
                 /* Check if there are any non-overlapped selections */
-                if(b_not_a!=NULL) {
-                    if(H5S_hyper_merge_spans(result,b_not_a,TRUE)<0)
+                if (b_not_a != NULL) {
+                    if (H5S_hyper_merge_spans(result, b_not_a, TRUE) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert hyperslabs")
 
                     /* Update the number of elements in current selection */
-                    result->select.num_elem=H5S_hyper_spans_nelem(b_not_a);
+                    result->select.num_elem = H5S_hyper_spans_nelem(b_not_a);
 
                     /* Indicate that the result owns the b_not_a spans */
-                    b_not_a=NULL;
+                    b_not_a = NULL;
 
                     /* Indicate that the spans were updated */
                     updated_spans = TRUE;
@@ -6802,53 +6848,52 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
         } /* end switch */
 
         /* Free the hyperslab trees generated from the clipping algorithm */
-        if(a_not_b)
+        if (a_not_b)
             H5S_hyper_free_span_info(a_not_b);
-        if(a_and_b)
+        if (a_and_b)
             H5S_hyper_free_span_info(a_and_b);
-        if(b_not_a)
+        if (b_not_a)
             H5S_hyper_free_span_info(b_not_a);
 
         /* Check if the resulting hyperslab span tree is empty */
-        if(result->select.sel_info.hslab->span_lst==NULL) {
-            H5S_hyper_span_info_t *spans;     /* Empty hyperslab span tree */
+        if (result->select.sel_info.hslab->span_lst == NULL) {
+            H5S_hyper_span_info_t *spans; /* Empty hyperslab span tree */
 
             /* Sanity check */
             HDassert(result->select.num_elem == 0);
 
             /* Allocate a span info node */
-            if((spans = H5FL_MALLOC(H5S_hyper_span_info_t))==NULL)
+            if ((spans = H5FL_MALLOC(H5S_hyper_span_info_t)) == NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span")
 
             /* Set the reference count */
-            spans->count=1;
+            spans->count = 1;
 
             /* Reset the scratch pad space */
-            spans->scratch=0;
+            spans->scratch = 0;
 
             /* Set to empty tree */
-            spans->head=NULL;
+            spans->head = NULL;
 
             /* Set pointer to empty span tree */
-            result->select.sel_info.hslab->span_lst=spans;
+            result->select.sel_info.hslab->span_lst = spans;
         } /* end if */
         else {
             /* Check if we updated the spans */
-            if(updated_spans) {
+            if (updated_spans) {
                 /* Attempt to rebuild "optimized" start/stride/count/block information.
                  * from resulting hyperslab span tree
                  */
-                if(H5S_hyper_rebuild(result) < 0)
+                if (H5S_hyper_rebuild(result) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOUNT, FAIL, "can't rebuild hyperslab info")
             } /* end if */
-        } /* end else */
-    } /* end else */
+        }     /* end else */
+    }         /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_operate_hyperslab() */
+} /* end H5S_operate_hyperslab() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_generate_hyperlab
  *
@@ -6864,16 +6909,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
-		      const hsize_t start[],
-		      const hsize_t stride[],
-		      const hsize_t count[],
-		      const hsize_t block[])
+H5S_generate_hyperslab(H5S_t *space, H5S_seloper_t op, const hsize_t start[], const hsize_t stride[],
+                       const hsize_t count[], const hsize_t block[])
 {
-    H5S_hyper_span_info_t *new_spans=NULL;   /* Span tree for new hyperslab */
-    H5S_hyper_span_info_t *tmp_spans=NULL;   /* Temporary copy of selection */
-    hbool_t span2_owned=FALSE;          /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5S_hyper_span_info_t *new_spans = NULL; /* Span tree for new hyperslab */
+    H5S_hyper_span_info_t *tmp_spans = NULL; /* Temporary copy of selection */
+    hbool_t span2_owned = FALSE;   /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
+    herr_t  ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -6886,42 +6928,41 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
     HDassert(block);
 
     /* Generate span tree for new hyperslab information */
-    if((new_spans=H5S_hyper_make_spans(space->extent.rank,start,stride,count,block))==NULL)
+    if ((new_spans = H5S_hyper_make_spans(space->extent.rank, start, stride, count, block)) == NULL)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't create hyperslab information")
 
     /* Copy the original dataspace */
-    if(space->select.sel_info.hslab->span_lst!=NULL) {
+    if (space->select.sel_info.hslab->span_lst != NULL) {
         /* Take ownership of the dataspace's hyperslab spans */
         /* (These are freed later) */
-        tmp_spans=space->select.sel_info.hslab->span_lst;
-        space->select.sel_info.hslab->span_lst=NULL;
+        tmp_spans                              = space->select.sel_info.hslab->span_lst;
+        space->select.sel_info.hslab->span_lst = NULL;
 
         /* Reset the other dataspace selection information */
-        if(H5S_SELECT_RELEASE(space)<0)
+        if (H5S_SELECT_RELEASE(space) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release selection")
 
         /* Allocate space for the hyperslab selection information */
-        if((space->select.sel_info.hslab=H5FL_MALLOC(H5S_hyper_sel_t))==NULL)
+        if ((space->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab info")
     } /* end if */
 
     /* Combine tmp_space (really space) & new_space, with the result in space */
-    if(H5S_operate_hyperslab(space,tmp_spans,op,new_spans,TRUE,&span2_owned)<0)
+    if (H5S_operate_hyperslab(space, tmp_spans, op, new_spans, TRUE, &span2_owned) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't clip hyperslab information")
 
 done:
     /* Free temporary data structures */
-    if(tmp_spans!=NULL)
-        if(H5S_hyper_free_span_info(tmp_spans)<0)
+    if (tmp_spans != NULL)
+        if (H5S_hyper_free_span_info(tmp_spans) < 0)
             HDONE_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release temporary hyperslab spans")
-    if(new_spans!=NULL && span2_owned==FALSE)
-        if(H5S_hyper_free_span_info(new_spans)<0)
+    if (new_spans != NULL && span2_owned == FALSE)
+        if (H5S_hyper_free_span_info(new_spans) < 0)
             HDONE_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release temporary hyperslab spans")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_generate_hyperslab() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_select_hyperslab
  *
@@ -6937,20 +6978,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
-		      const hsize_t start[],
-		      const hsize_t *stride,
-		      const hsize_t count[],
-		      const hsize_t *block)
+H5S_select_hyperslab(H5S_t *space, H5S_seloper_t op, const hsize_t start[], const hsize_t *stride,
+                     const hsize_t count[], const hsize_t *block)
 {
-    hsize_t int_stride[H5O_LAYOUT_NDIMS];   /* Internal storage for stride information */
-    hsize_t int_count[H5O_LAYOUT_NDIMS];    /* Internal storage for count information */
-    hsize_t int_block[H5O_LAYOUT_NDIMS];    /* Internal storage for block information */
-    const hsize_t *opt_stride;      /* Optimized stride information */
-    const hsize_t *opt_count;       /* Optimized count information */
-    const hsize_t *opt_block;       /* Optimized block information */
-    unsigned u;                    /* Counters */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    hsize_t        int_stride[H5O_LAYOUT_NDIMS]; /* Internal storage for stride information */
+    hsize_t        int_count[H5O_LAYOUT_NDIMS];  /* Internal storage for count information */
+    hsize_t        int_block[H5O_LAYOUT_NDIMS];  /* Internal storage for block information */
+    const hsize_t *opt_stride;                   /* Optimized stride information */
+    const hsize_t *opt_count;                    /* Optimized count information */
+    const hsize_t *opt_block;                    /* Optimized block information */
+    unsigned       u;                            /* Counters */
+    herr_t         ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -6961,141 +6999,142 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
     HDassert(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID);
 
     /* Point to the correct stride values */
-    if(stride==NULL)
+    if (stride == NULL)
         stride = _ones;
 
     /* Point to the correct block values */
-    if(block==NULL)
+    if (block == NULL)
         block = _ones;
 
     /*
      * Check new selection.
      */
-    for(u=0; u<space->extent.rank; u++) {
+    for (u = 0; u < space->extent.rank; u++) {
         /* Check for overlapping hyperslab blocks in new selection. */
-        if(count[u]>1 && stride[u]<block[u])
+        if (count[u] > 1 && stride[u] < block[u])
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "hyperslab blocks overlap")
 
         /* Detect zero-sized hyperslabs in new selection */
-        if(count[u] == 0 || block[u] == 0) {
-            switch(op) {
-                case H5S_SELECT_SET:   /* Select "set" operation */
-                case H5S_SELECT_AND:   /* Binary "and" operation for hyperslabs */
-                case H5S_SELECT_NOTA:  /* Binary "B not A" operation for hyperslabs */
+        if (count[u] == 0 || block[u] == 0) {
+            switch (op) {
+                case H5S_SELECT_SET:  /* Select "set" operation */
+                case H5S_SELECT_AND:  /* Binary "and" operation for hyperslabs */
+                case H5S_SELECT_NOTA: /* Binary "B not A" operation for hyperslabs */
                     /* Convert to "none" selection */
-                    if(H5S_select_none(space)<0)
+                    if (H5S_select_none(space) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection")
                     HGOTO_DONE(SUCCEED);
 
-                case H5S_SELECT_OR:    /* Binary "or" operation for hyperslabs */
-                case H5S_SELECT_XOR:   /* Binary "xor" operation for hyperslabs */
-                case H5S_SELECT_NOTB:  /* Binary "A not B" operation for hyperslabs */
-                    HGOTO_DONE(SUCCEED);        /* Selection stays same */
+                case H5S_SELECT_OR:      /* Binary "or" operation for hyperslabs */
+                case H5S_SELECT_XOR:     /* Binary "xor" operation for hyperslabs */
+                case H5S_SELECT_NOTB:    /* Binary "A not B" operation for hyperslabs */
+                    HGOTO_DONE(SUCCEED); /* Selection stays same */
 
                 default:
                     HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
             } /* end switch */
-        } /* end if */
-    } /* end for */
+        }     /* end if */
+    }         /* end for */
 
     /* Optimize hyperslab parameters to merge contiguous blocks, etc. */
-    if(stride == _ones && block == _ones) {
+    if (stride == _ones && block == _ones) {
         /* Point to existing arrays */
         opt_stride = _ones;
-        opt_count = _ones;
-        opt_block = count;
+        opt_count  = _ones;
+        opt_block  = count;
     } /* end if */
     else {
         /* Point to local arrays */
         opt_stride = int_stride;
-        opt_count = int_count;
-        opt_block = int_block;
-        for(u=0; u<space->extent.rank; u++) {
+        opt_count  = int_count;
+        opt_block  = int_block;
+        for (u = 0; u < space->extent.rank; u++) {
             /* contiguous hyperslabs have the block size equal to the stride */
-            if(stride[u]==block[u]) {
-                int_count[u]=1;
-                int_stride[u]=1;
-                if(block[u]==1)
-                    int_block[u]=count[u];
+            if (stride[u] == block[u]) {
+                int_count[u]  = 1;
+                int_stride[u] = 1;
+                if (block[u] == 1)
+                    int_block[u] = count[u];
                 else
-                    int_block[u]=block[u]*count[u];
+                    int_block[u] = block[u] * count[u];
             } /* end if */
             else {
-                if(count[u]==1)
-                    int_stride[u]=1;
+                if (count[u] == 1)
+                    int_stride[u] = 1;
                 else {
                     HDassert(stride[u] > block[u]);
-                    int_stride[u]=stride[u];
+                    int_stride[u] = stride[u];
                 } /* end else */
-                int_count[u]=count[u];
-                int_block[u]=block[u];
+                int_count[u] = count[u];
+                int_block[u] = block[u];
             } /* end else */
-        } /* end for */
-    } /* end else */
+        }     /* end for */
+    }         /* end else */
 
     /* Fixup operation for non-hyperslab selections */
-    switch(H5S_GET_SELECT_TYPE(space)) {
-        case H5S_SEL_NONE:   /* No elements selected in dataspace */
-            switch(op) {
-                case H5S_SELECT_SET:   /* Select "set" operation */
+    switch (H5S_GET_SELECT_TYPE(space)) {
+        case H5S_SEL_NONE: /* No elements selected in dataspace */
+            switch (op) {
+                case H5S_SELECT_SET: /* Select "set" operation */
                     /* Change "none" selection to hyperslab selection */
                     break;
 
-                case H5S_SELECT_OR:    /* Binary "or" operation for hyperslabs */
-                case H5S_SELECT_XOR:   /* Binary "xor" operation for hyperslabs */
-                case H5S_SELECT_NOTA:  /* Binary "B not A" operation for hyperslabs */
-                    op=H5S_SELECT_SET; /* Maps to "set" operation when applied to "none" selection */
+                case H5S_SELECT_OR:      /* Binary "or" operation for hyperslabs */
+                case H5S_SELECT_XOR:     /* Binary "xor" operation for hyperslabs */
+                case H5S_SELECT_NOTA:    /* Binary "B not A" operation for hyperslabs */
+                    op = H5S_SELECT_SET; /* Maps to "set" operation when applied to "none" selection */
                     break;
 
-                case H5S_SELECT_AND:   /* Binary "and" operation for hyperslabs */
-                case H5S_SELECT_NOTB:  /* Binary "A not B" operation for hyperslabs */
-                    HGOTO_DONE(SUCCEED);        /* Selection stays "none" */
+                case H5S_SELECT_AND:     /* Binary "and" operation for hyperslabs */
+                case H5S_SELECT_NOTB:    /* Binary "A not B" operation for hyperslabs */
+                    HGOTO_DONE(SUCCEED); /* Selection stays "none" */
 
                 default:
                     HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
             } /* end switch */
             break;
 
-        case H5S_SEL_ALL:    /* All elements selected in dataspace */
-            switch(op) {
-                case H5S_SELECT_SET:   /* Select "set" operation */
+        case H5S_SEL_ALL: /* All elements selected in dataspace */
+            switch (op) {
+                case H5S_SELECT_SET: /* Select "set" operation */
                     /* Change "all" selection to hyperslab selection */
                     break;
 
-                case H5S_SELECT_OR:    /* Binary "or" operation for hyperslabs */
-                    HGOTO_DONE(SUCCEED);        /* Selection stays "all" */
+                case H5S_SELECT_OR:      /* Binary "or" operation for hyperslabs */
+                    HGOTO_DONE(SUCCEED); /* Selection stays "all" */
 
-                case H5S_SELECT_AND:   /* Binary "and" operation for hyperslabs */
-                    op=H5S_SELECT_SET; /* Maps to "set" operation when applied to "none" selection */
+                case H5S_SELECT_AND:     /* Binary "and" operation for hyperslabs */
+                    op = H5S_SELECT_SET; /* Maps to "set" operation when applied to "none" selection */
                     break;
 
-                case H5S_SELECT_XOR:   /* Binary "xor" operation for hyperslabs */
-                case H5S_SELECT_NOTB:  /* Binary "A not B" operation for hyperslabs */
+                case H5S_SELECT_XOR:  /* Binary "xor" operation for hyperslabs */
+                case H5S_SELECT_NOTB: /* Binary "A not B" operation for hyperslabs */
                     /* Convert current "all" selection to "real" hyperslab selection */
                     /* Then allow operation to proceed */
                     {
-                        hsize_t tmp_start[H5O_LAYOUT_NDIMS];   /* Temporary start information */
-                        hsize_t tmp_stride[H5O_LAYOUT_NDIMS];   /* Temporary stride information */
-                        hsize_t tmp_count[H5O_LAYOUT_NDIMS];    /* Temporary count information */
-                        hsize_t tmp_block[H5O_LAYOUT_NDIMS];    /* Temporary block information */
+                        hsize_t tmp_start[H5O_LAYOUT_NDIMS];  /* Temporary start information */
+                        hsize_t tmp_stride[H5O_LAYOUT_NDIMS]; /* Temporary stride information */
+                        hsize_t tmp_count[H5O_LAYOUT_NDIMS];  /* Temporary count information */
+                        hsize_t tmp_block[H5O_LAYOUT_NDIMS];  /* Temporary block information */
 
                         /* Fill in temporary information for the dimensions */
-                        for(u=0; u<space->extent.rank; u++) {
-                            tmp_start[u]=0;
-                            tmp_stride[u]=1;
-                            tmp_count[u]=1;
-                            tmp_block[u]=space->extent.size[u];
+                        for (u = 0; u < space->extent.rank; u++) {
+                            tmp_start[u]  = 0;
+                            tmp_stride[u] = 1;
+                            tmp_count[u]  = 1;
+                            tmp_block[u]  = space->extent.size[u];
                         } /* end for */
 
                         /* Convert to hyperslab selection */
-                        if(H5S_select_hyperslab(space,H5S_SELECT_SET,tmp_start,tmp_stride,tmp_count,tmp_block)<0)
+                        if (H5S_select_hyperslab(space, H5S_SELECT_SET, tmp_start, tmp_stride, tmp_count,
+                                                 tmp_block) < 0)
                             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection")
                     } /* end case */
                     break;
 
-                case H5S_SELECT_NOTA:  /* Binary "B not A" operation for hyperslabs */
+                case H5S_SELECT_NOTA: /* Binary "B not A" operation for hyperslabs */
                     /* Convert to "none" selection */
-                    if(H5S_select_none(space)<0)
+                    if (H5S_select_none(space) < 0)
                         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection")
                     HGOTO_DONE(SUCCEED);
 
@@ -7108,8 +7147,8 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
             /* Hyperslab operation on hyperslab selection, OK */
             break;
 
-        case H5S_SEL_POINTS: /* Can't combine hyperslab operations and point selections currently */
-            if(op==H5S_SELECT_SET)      /* Allow only "set" operation to proceed */
+        case H5S_SEL_POINTS:          /* Can't combine hyperslab operations and point selections currently */
+            if (op == H5S_SELECT_SET) /* Allow only "set" operation to proceed */
                 break;
             /* Else fall through to error */
 
@@ -7117,65 +7156,63 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
             HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
     } /* end switch */
 
-
-    if(op==H5S_SELECT_SET) {
+    if (op == H5S_SELECT_SET) {
         /* If we are setting a new selection, remove current selection first */
-        if(H5S_SELECT_RELEASE(space)<0)
+        if (H5S_SELECT_RELEASE(space) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release hyperslab")
 
         /* Allocate space for the hyperslab selection information */
-        if((space->select.sel_info.hslab=H5FL_MALLOC(H5S_hyper_sel_t))==NULL)
+        if ((space->select.sel_info.hslab = H5FL_MALLOC(H5S_hyper_sel_t)) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab info")
 
         /* Save the diminfo */
-        space->select.num_elem=1;
-        for(u=0; u<space->extent.rank; u++) {
-            space->select.sel_info.hslab->app_diminfo[u].start = start[u];
+        space->select.num_elem = 1;
+        for (u = 0; u < space->extent.rank; u++) {
+            space->select.sel_info.hslab->app_diminfo[u].start  = start[u];
             space->select.sel_info.hslab->app_diminfo[u].stride = stride[u];
-            space->select.sel_info.hslab->app_diminfo[u].count = count[u];
-            space->select.sel_info.hslab->app_diminfo[u].block = block[u];
+            space->select.sel_info.hslab->app_diminfo[u].count  = count[u];
+            space->select.sel_info.hslab->app_diminfo[u].block  = block[u];
 
-            space->select.sel_info.hslab->opt_diminfo[u].start = start[u];
+            space->select.sel_info.hslab->opt_diminfo[u].start  = start[u];
             space->select.sel_info.hslab->opt_diminfo[u].stride = opt_stride[u];
-            space->select.sel_info.hslab->opt_diminfo[u].count = opt_count[u];
-            space->select.sel_info.hslab->opt_diminfo[u].block = opt_block[u];
+            space->select.sel_info.hslab->opt_diminfo[u].count  = opt_count[u];
+            space->select.sel_info.hslab->opt_diminfo[u].block  = opt_block[u];
 
-            space->select.num_elem*=(opt_count[u]*opt_block[u]);
+            space->select.num_elem *= (opt_count[u] * opt_block[u]);
         } /* end for */
 
         /* Indicate that the dimension information is valid */
-        space->select.sel_info.hslab->diminfo_valid=TRUE;
+        space->select.sel_info.hslab->diminfo_valid = TRUE;
 
         /* Indicate that there's no slab information */
-        space->select.sel_info.hslab->span_lst=NULL;
+        space->select.sel_info.hslab->span_lst = NULL;
     } /* end if */
-    else if(op>=H5S_SELECT_OR && op<=H5S_SELECT_NOTA) {
+    else if (op >= H5S_SELECT_OR && op <= H5S_SELECT_NOTA) {
         /* Sanity check */
         HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
 
         /* Check if there's no hyperslab span information currently */
-        if(space->select.sel_info.hslab->span_lst==NULL)
-            if(H5S_hyper_generate_spans(space)<0)
+        if (space->select.sel_info.hslab->span_lst == NULL)
+            if (H5S_hyper_generate_spans(space) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, FAIL, "dataspace does not have span tree")
 
         /* Add in the new hyperslab information */
-        if(H5S_generate_hyperslab (space, op, start, opt_stride, opt_count, opt_block)<0)
+        if (H5S_generate_hyperslab(space, op, start, opt_stride, opt_count, opt_block) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't generate hyperslabs")
 
         /* Indicate that the regular dimensions are no longer valid */
-        space->select.sel_info.hslab->diminfo_valid=FALSE;
+        space->select.sel_info.hslab->diminfo_valid = FALSE;
     } /* end if */
     else
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
 
     /* Set selection type */
-    space->select.type=H5S_sel_hyper;
+    space->select.type = H5S_sel_hyper;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_select_hyperslab() */
+} /* end H5S_select_hyperslab() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sselect_hyperslab
@@ -7203,44 +7240,43 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
-         const hsize_t stride[], const hsize_t count[], const hsize_t block[])
+H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], const hsize_t stride[],
+                    const hsize_t count[], const hsize_t block[])
 {
-    H5S_t	*space = NULL;  /* Dataspace to modify selection of */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5S_t *space     = NULL;    /* Dataspace to modify selection of */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
 
     /* Check args */
-    if (NULL == (space=H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (space = H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if (H5S_SCALAR==H5S_GET_EXTENT_TYPE(space))
+    if (H5S_SCALAR == H5S_GET_EXTENT_TYPE(space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "hyperslab doesn't support H5S_SCALAR space")
-    if (H5S_NULL==H5S_GET_EXTENT_TYPE(space))
+    if (H5S_NULL == H5S_GET_EXTENT_TYPE(space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "hyperslab doesn't support H5S_NULL space")
-    if(start==NULL || count==NULL)
+    if (start == NULL || count == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "hyperslab not specified")
-    if(!(op>H5S_SELECT_NOOP && op<H5S_SELECT_INVALID))
+    if (!(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID))
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
-    if(stride!=NULL) {
-        unsigned u;             /* Local index variable */
+    if (stride != NULL) {
+        unsigned u; /* Local index variable */
 
         /* Check for 0-sized strides */
-        for(u=0; u<space->extent.rank; u++) {
-            if(stride[u]==0)
+        for (u = 0; u < space->extent.rank; u++) {
+            if (stride[u] == 0)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid stride==0 value")
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
-    if (H5S_select_hyperslab(space, op, start, stride, count, block)<0)
+    if (H5S_select_hyperslab(space, op, start, stride, count, block) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to set hyperslab selection")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Sselect_hyperslab() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Scombine_hyperslab
@@ -7271,45 +7307,44 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 hid_t
-H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
-         const hsize_t stride[], const hsize_t count[], const hsize_t block[])
+H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], const hsize_t stride[],
+                     const hsize_t count[], const hsize_t block[])
 {
-    H5S_t	*space = NULL;  /* Dataspace to modify selection of */
-    H5S_t	*new_space = NULL;  /* New dataspace created */
-    hid_t	ret_value;
+    H5S_t *space     = NULL; /* Dataspace to modify selection of */
+    H5S_t *new_space = NULL; /* New dataspace created */
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("i", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
 
     /* Check args */
-    if (NULL == (space=H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (space = H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if(start==NULL || count==NULL)
+    if (start == NULL || count == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "hyperslab not specified")
 
-    if(!(op>H5S_SELECT_NOOP && op<H5S_SELECT_INVALID))
+    if (!(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID))
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
 
     /* Copy the first dataspace */
-    if (NULL == (new_space = H5S_copy (space, TRUE, TRUE)))
+    if (NULL == (new_space = H5S_copy(space, TRUE, TRUE)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, NULL, "unable to copy data space")
 
     /* Go modify the selection in the new dataspace */
-    if (H5S_select_hyperslab(new_space, op, start, stride, count, block)<0)
+    if (H5S_select_hyperslab(new_space, op, start, stride, count, block) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to set hyperslab selection")
 
     /* Atomize */
-    if ((ret_value=H5I_register (H5I_DATASPACE, new_space, TRUE))<0)
+    if ((ret_value = H5I_register(H5I_DATASPACE, new_space, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom")
 
 done:
-    if (ret_value<0 && new_space)
+    if (ret_value < 0 && new_space)
         H5S_close(new_space);
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Scombine_hyperslab() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_combine_select
  *
@@ -7325,11 +7360,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5S_t *
-H5S_combine_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
+H5S_combine_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
 {
-    H5S_t *new_space=NULL;    /* New dataspace generated */
-    hbool_t span2_owned=FALSE;          /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
-    H5S_t *ret_value;         /* return value */
+    H5S_t * new_space   = NULL;  /* New dataspace generated */
+    hbool_t span2_owned = FALSE; /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
+    H5S_t * ret_value;           /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -7339,40 +7374,40 @@ H5S_combine_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
     HDassert(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID);
 
     /* Check that the space selections both have span trees */
-    if(space1->select.sel_info.hslab->span_lst==NULL)
-        if(H5S_hyper_generate_spans(space1)<0)
+    if (space1->select.sel_info.hslab->span_lst == NULL)
+        if (H5S_hyper_generate_spans(space1) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, NULL, "dataspace does not have span tree")
-    if(space2->select.sel_info.hslab->span_lst==NULL)
-        if(H5S_hyper_generate_spans(space2)<0)
+    if (space2->select.sel_info.hslab->span_lst == NULL)
+        if (H5S_hyper_generate_spans(space2) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, NULL, "dataspace does not have span tree")
 
     /* Copy the first dataspace */
-    if (NULL == (new_space = H5S_copy (space1, TRUE, TRUE)))
+    if (NULL == (new_space = H5S_copy(space1, TRUE, TRUE)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, NULL, "unable to copy data space")
 
     /* Free the current selection for the new dataspace */
-    if(H5S_SELECT_RELEASE(new_space)<0)
+    if (H5S_SELECT_RELEASE(new_space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, NULL, "can't release selection")
 
     /* Allocate space for the hyperslab selection information */
-    if((new_space->select.sel_info.hslab=H5FL_CALLOC(H5S_hyper_sel_t))==NULL)
+    if ((new_space->select.sel_info.hslab = H5FL_CALLOC(H5S_hyper_sel_t)) == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab info")
 
     /* Combine space1 & space2, with the result in new_space */
-    if(H5S_operate_hyperslab(new_space,space1->select.sel_info.hslab->span_lst,op,space2->select.sel_info.hslab->span_lst,FALSE,&span2_owned)<0)
+    if (H5S_operate_hyperslab(new_space, space1->select.sel_info.hslab->span_lst, op,
+                              space2->select.sel_info.hslab->span_lst, FALSE, &span2_owned) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, NULL, "can't clip hyperslab information")
 
     /* Set return value */
-    ret_value=new_space;
+    ret_value = new_space;
 
 done:
-    if(ret_value==NULL && new_space!=NULL)
+    if (ret_value == NULL && new_space != NULL)
         H5S_close(new_space);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_combine_select() */
+} /* end H5S_combine_select() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Scombine_select
@@ -7398,46 +7433,46 @@ done:
 hid_t
 H5Scombine_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id)
 {
-    H5S_t	*space1;                /* First Dataspace */
-    H5S_t	*space2;                /* Second Dataspace */
-    H5S_t	*new_space = NULL;      /* New Dataspace */
-    hid_t	ret_value;
+    H5S_t *space1;           /* First Dataspace */
+    H5S_t *space2;           /* Second Dataspace */
+    H5S_t *new_space = NULL; /* New Dataspace */
+    hid_t  ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "iSsi", space1_id, op, space2_id);
 
     /* Check args */
-    if (NULL == (space1=H5I_object_verify(space1_id, H5I_DATASPACE)))
+    if (NULL == (space1 = H5I_object_verify(space1_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if (NULL == (space2=H5I_object_verify(space2_id, H5I_DATASPACE)))
+    if (NULL == (space2 = H5I_object_verify(space2_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if(!(op>H5S_SELECT_NOOP && op<H5S_SELECT_INVALID))
+    if (!(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID))
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
 
     /* Check that both dataspaces have the same rank */
-    if(space1->extent.rank!=space2->extent.rank)
+    if (space1->extent.rank != space2->extent.rank)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspaces not same rank")
 
     /* Check that both dataspaces have hyperslab selections */
-    if(H5S_GET_SELECT_TYPE(space1)!=H5S_SEL_HYPERSLABS || H5S_GET_SELECT_TYPE(space2)!=H5S_SEL_HYPERSLABS)
+    if (H5S_GET_SELECT_TYPE(space1) != H5S_SEL_HYPERSLABS ||
+        H5S_GET_SELECT_TYPE(space2) != H5S_SEL_HYPERSLABS)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspaces don't have hyperslab selections")
 
     /* Go combine the dataspaces */
-    if ((new_space=H5S_combine_select(space1, op, space2))==NULL)
+    if ((new_space = H5S_combine_select(space1, op, space2)) == NULL)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to create hyperslab selection")
 
     /* Atomize */
-    if ((ret_value=H5I_register (H5I_DATASPACE, new_space, TRUE))<0)
+    if ((ret_value = H5I_register(H5I_DATASPACE, new_space, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom")
 
 done:
-    if (ret_value<0 && new_space)
+    if (ret_value < 0 && new_space)
         H5S_close(new_space);
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Scombine_select() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_select_select
  *
@@ -7453,11 +7488,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_select_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
+H5S_select_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
 {
-    H5S_hyper_span_info_t *tmp_spans=NULL;   /* Temporary copy of selection */
-    hbool_t span2_owned=FALSE;          /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5S_hyper_span_info_t *tmp_spans = NULL; /* Temporary copy of selection */
+    hbool_t span2_owned = FALSE;   /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
+    herr_t  ret_value   = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -7467,38 +7502,38 @@ H5S_select_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
     HDassert(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID);
 
     /* Check that the space selections both have span trees */
-    if(space1->select.sel_info.hslab->span_lst==NULL)
-        if(H5S_hyper_generate_spans(space1)<0)
+    if (space1->select.sel_info.hslab->span_lst == NULL)
+        if (H5S_hyper_generate_spans(space1) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, FAIL, "dataspace does not have span tree")
-    if(space2->select.sel_info.hslab->span_lst==NULL)
-        if(H5S_hyper_generate_spans(space2)<0)
+    if (space2->select.sel_info.hslab->span_lst == NULL)
+        if (H5S_hyper_generate_spans(space2) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, FAIL, "dataspace does not have span tree")
 
     /* Take ownership of the dataspace's hyperslab spans */
     /* (These are freed later) */
-    tmp_spans=space1->select.sel_info.hslab->span_lst;
-    space1->select.sel_info.hslab->span_lst=NULL;
+    tmp_spans                               = space1->select.sel_info.hslab->span_lst;
+    space1->select.sel_info.hslab->span_lst = NULL;
 
     /* Reset the other dataspace selection information */
-    if(H5S_SELECT_RELEASE(space1)<0)
+    if (H5S_SELECT_RELEASE(space1) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release selection")
 
     /* Allocate space for the hyperslab selection information */
-    if((space1->select.sel_info.hslab=H5FL_CALLOC(H5S_hyper_sel_t))==NULL)
+    if ((space1->select.sel_info.hslab = H5FL_CALLOC(H5S_hyper_sel_t)) == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab info")
 
     /* Combine tmp_spans (from space1) & spans from space2, with the result in space1 */
-    if(H5S_operate_hyperslab(space1,tmp_spans,op,space2->select.sel_info.hslab->span_lst,FALSE,&span2_owned)<0)
+    if (H5S_operate_hyperslab(space1, tmp_spans, op, space2->select.sel_info.hslab->span_lst, FALSE,
+                              &span2_owned) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't clip hyperslab information")
 
 done:
-    if(tmp_spans!=NULL)
+    if (tmp_spans != NULL)
         H5S_hyper_free_span_info(tmp_spans);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_select_select() */
+} /* end H5S_select_select() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sselect_select
@@ -7524,31 +7559,32 @@ done:
 herr_t
 H5Sselect_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id)
 {
-    H5S_t	*space1;                /* First Dataspace */
-    H5S_t	*space2;                /* Second Dataspace */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5S_t *space1;              /* First Dataspace */
+    H5S_t *space2;              /* Second Dataspace */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iSsi", space1_id, op, space2_id);
 
     /* Check args */
-    if (NULL == (space1=H5I_object_verify(space1_id, H5I_DATASPACE)))
+    if (NULL == (space1 = H5I_object_verify(space1_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if (NULL == (space2=H5I_object_verify(space2_id, H5I_DATASPACE)))
+    if (NULL == (space2 = H5I_object_verify(space2_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if(!(op>H5S_SELECT_NOOP && op<H5S_SELECT_INVALID))
+    if (!(op > H5S_SELECT_NOOP && op < H5S_SELECT_INVALID))
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation")
 
     /* Check that both dataspaces have the same rank */
-    if(space1->extent.rank!=space2->extent.rank)
+    if (space1->extent.rank != space2->extent.rank)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspaces not same rank")
 
     /* Check that both dataspaces have hyperslab selections */
-    if(H5S_GET_SELECT_TYPE(space1)!=H5S_SEL_HYPERSLABS || H5S_GET_SELECT_TYPE(space2)!=H5S_SEL_HYPERSLABS)
+    if (H5S_GET_SELECT_TYPE(space1) != H5S_SEL_HYPERSLABS ||
+        H5S_GET_SELECT_TYPE(space2) != H5S_SEL_HYPERSLABS)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspaces don't have hyperslab selections")
 
     /* Go refine the first selection */
-    if (H5S_select_select(space1, op, space2)<0)
+    if (H5S_select_select(space1, op, space2) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to modify hyperslab selection")
 
 done:
@@ -7556,7 +7592,6 @@ done:
 } /* end H5Sselect_select() */
 #endif /* NEW_HYPERSLAB_API */ /* Works */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_get_seq_list_gen
@@ -7588,29 +7623,28 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
-    size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem,
-    hsize_t *off, size_t *len)
+H5S_hyper_get_seq_list_gen(const H5S_t *space, H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem,
+                           size_t *nseq, size_t *nelem, hsize_t *off, size_t *len)
 {
-    H5S_hyper_span_t *curr_span;    /* Current hyperslab span node */
-    H5S_hyper_span_t **ispan;       /* Iterator's hyperslab span nodes */
-    hsize_t slab[H5O_LAYOUT_NDIMS]; /* Cumulative size of each dimension in bytes */
-    hsize_t acc;       /* Accumulator for computing cumulative sizes */
-    hsize_t loc_off;   /* Element offset in the dataspace */
-    hsize_t last_span_end = 0; /* The offset of the end of the last span */
-    hsize_t *abs_arr;  /* Absolute hyperslab span position */
-    const hssize_t *off_arr;  /* Offset within the dataspace extent */
-    size_t span_size = 0; /* Number of bytes in current span to actually process */
-    size_t io_left;    /* Number of elements left to process */
-    size_t io_bytes_left;   /* Number of bytes left to process */
-    size_t io_used;    /* Number of elements processed */
-    size_t curr_seq = 0; /* Number of sequence/offsets stored in the arrays */
-    size_t elem_size;  /* Size of each element iterating over */
-    unsigned ndims;    /* Number of dimensions of dataset */
-    unsigned fast_dim; /* Rank of the fastest changing dimension for the dataspace */
-    int curr_dim;      /* Current dimension being operated on */
-    unsigned u;        /* Index variable */
-    int i;             /* Index variable */
+    H5S_hyper_span_t * curr_span;              /* Current hyperslab span node */
+    H5S_hyper_span_t **ispan;                  /* Iterator's hyperslab span nodes */
+    hsize_t            slab[H5O_LAYOUT_NDIMS]; /* Cumulative size of each dimension in bytes */
+    hsize_t            acc;                    /* Accumulator for computing cumulative sizes */
+    hsize_t            loc_off;                /* Element offset in the dataspace */
+    hsize_t            last_span_end = 0;      /* The offset of the end of the last span */
+    hsize_t *          abs_arr;                /* Absolute hyperslab span position */
+    const hssize_t *   off_arr;                /* Offset within the dataspace extent */
+    size_t             span_size = 0;          /* Number of bytes in current span to actually process */
+    size_t             io_left;                /* Number of elements left to process */
+    size_t             io_bytes_left;          /* Number of bytes left to process */
+    size_t             io_used;                /* Number of elements processed */
+    size_t             curr_seq = 0;           /* Number of sequence/offsets stored in the arrays */
+    size_t             elem_size;              /* Size of each element iterating over */
+    unsigned           ndims;                  /* Number of dimensions of dataset */
+    unsigned           fast_dim;               /* Rank of the fastest changing dimension for the dataspace */
+    int                curr_dim;               /* Current dimension being operated on */
+    unsigned           u;                      /* Index variable */
+    int                i;                      /* Index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -7625,29 +7659,29 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
     HDassert(len);
 
     /* Set the rank of the fastest changing dimension */
-    ndims = space->extent.rank;
+    ndims    = space->extent.rank;
     fast_dim = (ndims - 1);
 
     /* Get the pointers to the current span info and span nodes */
     curr_span = iter->u.hyp.span[fast_dim];
-    abs_arr = iter->u.hyp.off;
-    off_arr = space->select.offset;
-    ispan = iter->u.hyp.span;
+    abs_arr   = iter->u.hyp.off;
+    off_arr   = space->select.offset;
+    ispan     = iter->u.hyp.span;
     elem_size = iter->elmt_size;
 
     /* Set the amount of elements to perform I/O on, etc. */
     H5_CHECK_OVERFLOW(iter->elmt_left, hsize_t, size_t);
-    io_left = MIN(maxelem, (size_t)iter->elmt_left);
+    io_left       = MIN(maxelem, (size_t)iter->elmt_left);
     io_bytes_left = io_left * elem_size;
 
     /* Compute the cumulative size of dataspace dimensions */
-    for(i = (int)fast_dim, acc = elem_size; i >= 0; i--) {
+    for (i = (int)fast_dim, acc = elem_size; i >= 0; i--) {
         slab[i] = acc;
         acc *= space->extent.size[i];
     } /* end for */
 
     /* Set the offset of the first element iterated on */
-    for(u = 0, loc_off = 0; u < ndims; u++)
+    for (u = 0, loc_off = 0; u < ndims; u++)
         /* Compute the sequential element offset */
         loc_off += ((hsize_t)((hssize_t)abs_arr[u] + off_arr[u])) * slab[u];
 
@@ -7655,49 +7689,50 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
     HDassert(io_bytes_left <= (iter->elmt_left * elem_size));
 
     /* Take care of any partial spans leftover from previous I/Os */
-    if(abs_arr[fast_dim]!=curr_span->low) {
+    if (abs_arr[fast_dim] != curr_span->low) {
 
         /* Finish the span in the fastest changing dimension */
 
         /* Compute the number of bytes to attempt in this span */
-        H5_CHECKED_ASSIGN(span_size, size_t, ((curr_span->high-abs_arr[fast_dim])+1)*elem_size, hsize_t);
+        H5_CHECKED_ASSIGN(span_size, size_t, ((curr_span->high - abs_arr[fast_dim]) + 1) * elem_size,
+                          hsize_t);
 
         /* Check number of bytes against upper bounds allowed */
-        if(span_size>io_bytes_left)
-            span_size=io_bytes_left;
+        if (span_size > io_bytes_left)
+            span_size = io_bytes_left;
 
         /* Add the partial span to the list of sequences */
-        off[curr_seq]=loc_off;
-        len[curr_seq]=span_size;
+        off[curr_seq] = loc_off;
+        len[curr_seq] = span_size;
 
         /* Increment sequence count */
         curr_seq++;
 
         /* Set the location of the last span's end */
-        last_span_end=loc_off+span_size;
+        last_span_end = loc_off + span_size;
 
         /* Decrement I/O left to perform */
-        io_bytes_left-=span_size;
+        io_bytes_left -= span_size;
 
         /* Advance the hyperslab iterator */
         /* Check if we are done */
-        if(io_bytes_left > 0) {
+        if (io_bytes_left > 0) {
             /* Move to next span in fastest changing dimension */
             curr_span = curr_span->next;
 
-            if(NULL != curr_span) {
+            if (NULL != curr_span) {
                 /* Move location offset of destination */
                 loc_off += (curr_span->low - abs_arr[fast_dim]) * elem_size;
 
                 /* Move iterator for fastest changing dimension */
                 abs_arr[fast_dim] = curr_span->low;
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else {
             abs_arr[fast_dim] += span_size / elem_size;
 
             /* Check if we are still within the span */
-            if(abs_arr[fast_dim] <= curr_span->high) {
+            if (abs_arr[fast_dim] <= curr_span->high) {
                 iter->u.hyp.span[fast_dim] = curr_span;
             } /* end if */
             /* If we walked off that span, advance to the next span */
@@ -7706,23 +7741,23 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
                 curr_span = curr_span->next;
 
                 /* Check if we have a valid span in this dimension still */
-                if(NULL != curr_span) {
+                if (NULL != curr_span) {
                     /* Reset absolute position */
-                    abs_arr[fast_dim] = curr_span->low;
+                    abs_arr[fast_dim]          = curr_span->low;
                     iter->u.hyp.span[fast_dim] = curr_span;
                 } /* end if */
-            } /* end else */
-        } /* end else */
+            }     /* end else */
+        }         /* end else */
 
         /* Adjust iterator pointers */
 
-        if(NULL == curr_span) {
-/* Same as code in main loop */
+        if (NULL == curr_span) {
+            /* Same as code in main loop */
             /* Start at the next fastest dim */
             curr_dim = (int)(fast_dim - 1);
 
             /* Work back up through the dimensions */
-            while(curr_dim >= 0) {
+            while (curr_dim >= 0) {
                 /* Reset the current span */
                 curr_span = iter->u.hyp.span[curr_dim];
 
@@ -7730,7 +7765,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
                 abs_arr[curr_dim]++;
 
                 /* Check if we are still within the span */
-                if(abs_arr[curr_dim] <= curr_span->high) {
+                if (abs_arr[curr_dim] <= curr_span->high) {
                     break;
                 } /* end if */
                 /* If we walked off that span, advance to the next span */
@@ -7739,7 +7774,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
                     curr_span = curr_span->next;
 
                     /* Check if we have a valid span in this dimension still */
-                    if(NULL != curr_span) {
+                    if (NULL != curr_span) {
                         /* Reset the span in the current dimension */
                         ispan[curr_dim] = curr_span;
 
@@ -7749,16 +7784,17 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
                         break;
                     } /* end if */
                     else {
-                        /* If we finished the span list in this dimension, decrement the dimension worked on and loop again */
+                        /* If we finished the span list in this dimension, decrement the dimension worked on
+                         * and loop again */
                         curr_dim--;
                     } /* end else */
-                } /* end else */
-            } /* end while */
+                }     /* end else */
+            }         /* end while */
 
             /* Check if we have more spans in the tree */
-            if(curr_dim >= 0) {
+            if (curr_dim >= 0) {
                 /* Walk back down the iterator positions, reseting them */
-                while((unsigned)curr_dim < fast_dim) {
+                while ((unsigned)curr_dim < fast_dim) {
                     HDassert(curr_span);
                     HDassert(curr_span->down);
                     HDassert(curr_span->down->head);
@@ -7780,17 +7816,17 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
                 HDassert(curr_span == iter->u.hyp.span[fast_dim]);
 
                 /* Reset the buffer offset */
-                for(u = 0, loc_off = 0; u < ndims; u++)
+                for (u = 0, loc_off = 0; u < ndims; u++)
                     loc_off += ((hsize_t)((hssize_t)abs_arr[u] + off_arr[u])) * slab[u];
             } /* end else */
             else
                 /* We had better be done with I/O or bad things are going to happen... */
                 HDassert(io_bytes_left == 0);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Perform the I/O on the elements, based on the position of the iterator */
-    while(io_bytes_left > 0 && curr_seq < maxseq) {
+    while (io_bytes_left > 0 && curr_seq < maxseq) {
         /* Sanity check */
         HDassert(curr_span);
 
@@ -7798,7 +7834,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
         loc_off -= curr_span->pstride;
 
         /* Loop over all the spans in the fastest changing dimension */
-        while(curr_span != NULL) {
+        while (curr_span != NULL) {
             /* Move location offset of destination */
             loc_off += curr_span->pstride;
 
@@ -7806,16 +7842,16 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
             H5_CHECKED_ASSIGN(span_size, size_t, curr_span->nelem, hsize_t);
 
             /* Check number of elements against upper bounds allowed */
-            if(span_size >= io_bytes_left) {
+            if (span_size >= io_bytes_left) {
                 /* Trim the number of bytes to output */
-                span_size = io_bytes_left;
+                span_size     = io_bytes_left;
                 io_bytes_left = 0;
 
-/* COMMON */
+                /* COMMON */
                 /* Store the I/O information for the span */
 
                 /* Check if this is appending onto previous sequence */
-                if(curr_seq > 0 && last_span_end == loc_off)
+                if (curr_seq > 0 && last_span_end == loc_off)
                     len[curr_seq - 1] += span_size;
                 else {
                     off[curr_seq] = loc_off;
@@ -7827,7 +7863,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
 
                 /* Set the location of the last span's end */
                 last_span_end = loc_off + span_size;
-/* end COMMON */
+                /* end COMMON */
 
                 /* Break out now, we are finished with I/O */
                 break;
@@ -7836,12 +7872,12 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
                 /* Decrement I/O left to perform */
                 io_bytes_left -= span_size;
 
-/* COMMON */
+                /* COMMON */
                 /* Store the I/O information for the span */
 
                 /* Check if this is appending onto previous sequence */
-                if(curr_seq > 0 && last_span_end == loc_off)
-                    len[curr_seq-1]+=span_size;
+                if (curr_seq > 0 && last_span_end == loc_off)
+                    len[curr_seq - 1] += span_size;
                 else {
                     off[curr_seq] = loc_off;
                     len[curr_seq] = span_size;
@@ -7852,43 +7888,43 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
 
                 /* Set the location of the last span's end */
                 last_span_end = loc_off + span_size;
-/* end COMMON */
+                /* end COMMON */
 
                 /* If the sequence & offset arrays are full, do what? */
-                if(curr_seq >= maxseq) {
+                if (curr_seq >= maxseq) {
                     /* Break out now, we are finished with sequences */
                     break;
                 } /* end else */
-            } /* end else */
+            }     /* end else */
 
-	    /* Move to next span in fastest changing dimension */
-	    curr_span=curr_span->next;
+            /* Move to next span in fastest changing dimension */
+            curr_span = curr_span->next;
         } /* end while */
 
         /* Check if we are done */
-        if(io_bytes_left==0 || curr_seq>=maxseq) {
+        if (io_bytes_left == 0 || curr_seq >= maxseq) {
             HDassert(curr_span);
-            abs_arr[fast_dim]=curr_span->low+(span_size/elem_size);
+            abs_arr[fast_dim] = curr_span->low + (span_size / elem_size);
 
             /* Check if we are still within the span */
-            if(abs_arr[fast_dim]<=curr_span->high) {
-                iter->u.hyp.span[fast_dim]=curr_span;
+            if (abs_arr[fast_dim] <= curr_span->high) {
+                iter->u.hyp.span[fast_dim] = curr_span;
                 break;
             } /* end if */
             /* If we walked off that span, advance to the next span */
             else {
                 /* Advance span in this dimension */
-                curr_span=curr_span->next;
+                curr_span = curr_span->next;
 
                 /* Check if we have a valid span in this dimension still */
-                if(curr_span!=NULL) {
+                if (curr_span != NULL) {
                     /* Reset absolute position */
-                    abs_arr[fast_dim]=curr_span->low;
-                    iter->u.hyp.span[fast_dim]=curr_span;
+                    abs_arr[fast_dim]          = curr_span->low;
+                    iter->u.hyp.span[fast_dim] = curr_span;
                     break;
                 } /* end if */
-            } /* end else */
-        } /* end if */
+            }     /* end else */
+        }         /* end if */
 
         /* Adjust iterator pointers */
 
@@ -7896,48 +7932,49 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
         curr_dim = (int)(fast_dim - 1);
 
         /* Work back up through the dimensions */
-        while(curr_dim >= 0) {
+        while (curr_dim >= 0) {
             /* Reset the current span */
-	    curr_span=iter->u.hyp.span[curr_dim];
+            curr_span = iter->u.hyp.span[curr_dim];
 
             /* Increment absolute position */
             abs_arr[curr_dim]++;
 
             /* Check if we are still within the span */
-            if(abs_arr[curr_dim]<=curr_span->high) {
+            if (abs_arr[curr_dim] <= curr_span->high) {
                 break;
             } /* end if */
             /* If we walked off that span, advance to the next span */
             else {
                 /* Advance span in this dimension */
-                curr_span=curr_span->next;
+                curr_span = curr_span->next;
 
                 /* Check if we have a valid span in this dimension still */
-                if(curr_span!=NULL) {
+                if (curr_span != NULL) {
                     /* Reset the span in the current dimension */
-                    ispan[curr_dim]=curr_span;
+                    ispan[curr_dim] = curr_span;
 
                     /* Reset absolute position */
-                    abs_arr[curr_dim]=curr_span->low;
+                    abs_arr[curr_dim] = curr_span->low;
 
                     break;
                 } /* end if */
                 else {
-                    /* If we finished the span list in this dimension, decrement the dimension worked on and loop again */
+                    /* If we finished the span list in this dimension, decrement the dimension worked on and
+                     * loop again */
                     curr_dim--;
                 } /* end else */
-            } /* end else */
-        } /* end while */
+            }     /* end else */
+        }         /* end while */
 
         /* Check if we are finished with the spans in the tree */
-        if(curr_dim < 0) {
+        if (curr_dim < 0) {
             /* We had better be done with I/O or bad things are going to happen... */
             HDassert(io_bytes_left == 0);
             break;
         } /* end if */
         else {
             /* Walk back down the iterator positions, reseting them */
-            while((unsigned)curr_dim < fast_dim) {
+            while ((unsigned)curr_dim < fast_dim) {
                 HDassert(curr_span);
                 HDassert(curr_span->down);
                 HDassert(curr_span->down->head);
@@ -7960,7 +7997,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
         } /* end else */
 
         /* Reset the buffer offset */
-        for(u = 0, loc_off = 0; u < ndims; u++)
+        for (u = 0, loc_off = 0; u < ndims; u++)
             loc_off += ((hsize_t)((hssize_t)abs_arr[u] + off_arr[u])) * slab[u];
     } /* end while */
 
@@ -7977,7 +8014,6 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S_hyper_get_seq_list_gen() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_get_seq_list_opt
@@ -8009,42 +8045,39 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
-    size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem,
-    hsize_t *off, size_t *len)
+H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem,
+                           size_t *nseq, size_t *nelem, hsize_t *off, size_t *len)
 {
-    hsize_t *mem_size;                  /* Size of the source buffer */
-    hsize_t slab[H5O_LAYOUT_NDIMS];     /* Hyperslab size */
-    const hssize_t *sel_off;            /* Selection offset in dataspace */
-    hsize_t offset[H5O_LAYOUT_NDIMS];   /* Coordinate offset in dataspace */
-    hsize_t tmp_count[H5O_LAYOUT_NDIMS];/* Temporary block count */
-    hsize_t tmp_block[H5O_LAYOUT_NDIMS];/* Temporary block offset */
-    hsize_t wrap[H5O_LAYOUT_NDIMS];     /* Bytes to wrap around at the end of a row */
-    hsize_t skip[H5O_LAYOUT_NDIMS];     /* Bytes to skip between blocks */
-    const H5S_hyper_dim_t *tdiminfo;    /* Temporary pointer to diminfo information */
-    hsize_t fast_dim_start,    /* Local copies of fastest changing dimension info */
-        fast_dim_stride,
-        fast_dim_block,
-        fast_dim_offset;
-    size_t fast_dim_buf_off;    /* Local copy of amount to move fastest dimension buffer offset */
-    size_t fast_dim_count;      /* Number of blocks left in fastest changing dimension */
-    size_t tot_blk_count;       /* Total number of blocks left to output */
-    size_t act_blk_count;       /* Actual number of blocks to output */
-    size_t total_rows;          /* Total number of entire rows to output */
-    size_t curr_rows;           /* Current number of entire rows to output */
-    unsigned fast_dim;  /* Rank of the fastest changing dimension for the dataspace */
-    unsigned ndims;     /* Number of dimensions of dataset */
-    int temp_dim;       /* Temporary rank holder */
-    hsize_t acc;	/* Accumulator */
-    hsize_t loc;        /* Coordinate offset */
-    size_t curr_seq = 0; /* Current sequence being operated on */
-    size_t actual_elem; /* The actual number of elements to count */
-    size_t actual_bytes;/* The actual number of bytes to copy */
-    size_t io_left;     /* The number of elements left in I/O operation */
-    size_t start_io_left; /* The initial number of elements left in I/O operation */
-    size_t elem_size;   /* Size of each element iterating over */
-    unsigned u;         /* Local index variable */
-    int i;              /* Local index variable */
+    hsize_t *              mem_size;                    /* Size of the source buffer */
+    hsize_t                slab[H5O_LAYOUT_NDIMS];      /* Hyperslab size */
+    const hssize_t *       sel_off;                     /* Selection offset in dataspace */
+    hsize_t                offset[H5O_LAYOUT_NDIMS];    /* Coordinate offset in dataspace */
+    hsize_t                tmp_count[H5O_LAYOUT_NDIMS]; /* Temporary block count */
+    hsize_t                tmp_block[H5O_LAYOUT_NDIMS]; /* Temporary block offset */
+    hsize_t                wrap[H5O_LAYOUT_NDIMS];      /* Bytes to wrap around at the end of a row */
+    hsize_t                skip[H5O_LAYOUT_NDIMS];      /* Bytes to skip between blocks */
+    const H5S_hyper_dim_t *tdiminfo;                    /* Temporary pointer to diminfo information */
+    hsize_t                fast_dim_start,              /* Local copies of fastest changing dimension info */
+        fast_dim_stride, fast_dim_block, fast_dim_offset;
+    size_t   fast_dim_buf_off; /* Local copy of amount to move fastest dimension buffer offset */
+    size_t   fast_dim_count;   /* Number of blocks left in fastest changing dimension */
+    size_t   tot_blk_count;    /* Total number of blocks left to output */
+    size_t   act_blk_count;    /* Actual number of blocks to output */
+    size_t   total_rows;       /* Total number of entire rows to output */
+    size_t   curr_rows;        /* Current number of entire rows to output */
+    unsigned fast_dim;         /* Rank of the fastest changing dimension for the dataspace */
+    unsigned ndims;            /* Number of dimensions of dataset */
+    int      temp_dim;         /* Temporary rank holder */
+    hsize_t  acc;              /* Accumulator */
+    hsize_t  loc;              /* Coordinate offset */
+    size_t   curr_seq = 0;     /* Current sequence being operated on */
+    size_t   actual_elem;      /* The actual number of elements to count */
+    size_t   actual_bytes;     /* The actual number of bytes to copy */
+    size_t   io_left;          /* The number of elements left in I/O operation */
+    size_t   start_io_left;    /* The initial number of elements left in I/O operation */
+    size_t   elem_size;        /* Size of each element iterating over */
+    unsigned u;                /* Local index variable */
+    int      i;                /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -8062,9 +8095,9 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
     tdiminfo = iter->u.hyp.diminfo;
 
     /* Check if this is a "flattened" regular hyperslab selection */
-    if(iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < space->extent.rank) {
+    if (iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < space->extent.rank) {
         /* Set the aliases for a few important dimension ranks */
-        ndims = iter->u.hyp.iter_rank;
+        ndims    = iter->u.hyp.iter_rank;
         fast_dim = ndims - 1;
 
         /* Set the local copy of the selection offset */
@@ -8075,7 +8108,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
     } /* end if */
     else {
         /* Set the aliases for a few important dimension ranks */
-        ndims = space->extent.rank;
+        ndims    = space->extent.rank;
         fast_dim = ndims - 1;
 
         /* Set the local copy of the selection offset */
@@ -8087,7 +8120,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
 
     /* initialize row sizes for each dimension */
     elem_size = iter->elmt_size;
-    for(i = (int)fast_dim, acc = elem_size; i >= 0; i--) {
+    for (i = (int)fast_dim, acc = elem_size; i >= 0; i--) {
         slab[i] = acc;
         acc *= mem_size[i];
     } /* end for */
@@ -8098,7 +8131,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
 
     /* Sanity check that there aren't any "remainder" sequences in process */
     HDassert(!((iter->u.hyp.off[fast_dim] - tdiminfo[fast_dim].start) % tdiminfo[fast_dim].stride != 0 ||
-            ((iter->u.hyp.off[fast_dim] != tdiminfo[fast_dim].start) && tdiminfo[fast_dim].count == 1)));
+               ((iter->u.hyp.off[fast_dim] != tdiminfo[fast_dim].start) && tdiminfo[fast_dim].count == 1)));
 
     /* We've cleared the "remainder" of the previous fastest dimension
      * sequence before calling this routine, so we must be at the beginning of
@@ -8113,12 +8146,12 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
 
     /* Copy the location of the point to get */
     /* (Add in the selection offset) */
-    for(u = 0; u < ndims; u++)
+    for (u = 0; u < ndims; u++)
         offset[u] = (hsize_t)((hssize_t)iter->u.hyp.off[u] + sel_off[u]);
 
     /* Compute the current "counts" for this location */
-    for(u = 0; u < ndims; u++) {
-        if(tdiminfo[u].count == 1) {
+    for (u = 0; u < ndims; u++) {
+        if (tdiminfo[u].count == 1) {
             tmp_count[u] = 0;
             tmp_block[u] = iter->u.hyp.off[u] - tdiminfo[u].start;
         } /* end if */
@@ -8126,10 +8159,10 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
             tmp_count[u] = (iter->u.hyp.off[u] - tdiminfo[u].start) / tdiminfo[u].stride;
             tmp_block[u] = (iter->u.hyp.off[u] - tdiminfo[u].start) % tdiminfo[u].stride;
         } /* end else */
-    } /* end for */
+    }     /* end for */
 
     /* Compute the initial buffer offset */
-    for(u = 0, loc = 0; u < ndims; u++)
+    for (u = 0, loc = 0; u < ndims; u++)
         loc += offset[u] * slab[u];
 
     /* Set the number of elements to write each time */
@@ -8139,9 +8172,9 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
     actual_bytes = actual_elem * elem_size;
 
     /* Set local copies of information for the fastest changing dimension */
-    fast_dim_start = tdiminfo[fast_dim].start;
+    fast_dim_start  = tdiminfo[fast_dim].start;
     fast_dim_stride = tdiminfo[fast_dim].stride;
-    fast_dim_block = tdiminfo[fast_dim].block;
+    fast_dim_block  = tdiminfo[fast_dim].block;
     H5_CHECKED_ASSIGN(fast_dim_buf_off, size_t, slab[fast_dim] * fast_dim_stride, hsize_t);
     fast_dim_offset = (hsize_t)((hssize_t)fast_dim_start + sel_off[fast_dim]);
 
@@ -8153,15 +8186,15 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
     tot_blk_count = MIN(tot_blk_count, (maxseq - curr_seq));
 
     /* Compute the amount to wrap at the end of each row */
-    for(u = 0; u < ndims; u++)
+    for (u = 0; u < ndims; u++)
         wrap[u] = (mem_size[u] - (tdiminfo[u].stride * tdiminfo[u].count)) * slab[u];
 
     /* Compute the amount to skip between blocks */
-    for(u = 0; u < ndims; u++)
+    for (u = 0; u < ndims; u++)
         skip[u] = (tdiminfo[u].stride - tdiminfo[u].block) * slab[u];
 
     /* Check if there is a partial row left (with full blocks) */
-    if(tmp_count[fast_dim] > 0) {
+    if (tmp_count[fast_dim] > 0) {
         /* Get number of blocks in fastest dimension */
         H5_CHECKED_ASSIGN(fast_dim_count, size_t, tdiminfo[fast_dim].count - tmp_count[fast_dim], hsize_t);
 
@@ -8172,7 +8205,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
         act_blk_count = fast_dim_count;
 
         /* Loop over all the blocks in the fastest changing dimension */
-        while(fast_dim_count > 0) {
+        while (fast_dim_count > 0) {
             /* Store the sequence information */
             off[curr_seq] = loc;
             len[curr_seq] = actual_bytes;
@@ -8197,23 +8230,24 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
         tmp_count[fast_dim] += act_blk_count;
 
         /* Check if we finished the entire row of blocks */
-        if(tmp_count[fast_dim] >= tdiminfo[fast_dim].count) {
+        if (tmp_count[fast_dim] >= tdiminfo[fast_dim].count) {
             /* Increment offset in destination buffer */
             loc += wrap[fast_dim];
 
             /* Increment information to reflect block just processed */
-            offset[fast_dim] = fast_dim_offset;    /* reset the offset in the fastest dimension */
+            offset[fast_dim]    = fast_dim_offset; /* reset the offset in the fastest dimension */
             tmp_count[fast_dim] = 0;
 
             /* Increment the offset and count for the other dimensions */
             temp_dim = (int)fast_dim - 1;
-            while(temp_dim >= 0) {
+            while (temp_dim >= 0) {
                 /* Move to the next row in the curent dimension */
                 offset[temp_dim]++;
                 tmp_block[temp_dim]++;
 
-                /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-                if(tmp_block[temp_dim] < tdiminfo[temp_dim].block)
+                /* If this block is still in the range of blocks to output for the dimension, break out of
+                 * loop */
+                if (tmp_block[temp_dim] < tdiminfo[temp_dim].block)
                     break;
                 else {
                     /* Move to the next block in the current dimension */
@@ -8222,8 +8256,9 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
                     tmp_block[temp_dim] = 0;
                     tmp_count[temp_dim]++;
 
-                    /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-                    if(tmp_count[temp_dim] < tdiminfo[temp_dim].count)
+                    /* If this block is still in the range of blocks to output for the dimension, break out of
+                     * loop */
+                    if (tmp_count[temp_dim] < tdiminfo[temp_dim].count)
                         break;
                     else {
                         offset[temp_dim] = (hsize_t)((hssize_t)tdiminfo[temp_dim].start + sel_off[temp_dim]);
@@ -8231,17 +8266,17 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
                         tmp_count[temp_dim] = 0; /* reset back to the beginning of the line */
                         tmp_block[temp_dim] = 0;
                     } /* end else */
-                } /* end else */
+                }     /* end else */
 
                 /* Decrement dimension count */
                 temp_dim--;
             } /* end while */
-        } /* end if */
+        }     /* end if */
         else {
             /* Update the offset in the fastest dimension */
             offset[fast_dim] += (fast_dim_stride * act_blk_count);
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     /* Compute the number of entire rows to read in */
     H5_CHECK_OVERFLOW(tot_blk_count / tdiminfo[fast_dim].count, hsize_t, size_t);
@@ -8251,28 +8286,28 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
     H5_CHECKED_ASSIGN(fast_dim_count, size_t, tdiminfo[fast_dim].count, hsize_t);
 
     /* Read in data until an entire sequence can't be written out any longer */
-    while(curr_rows > 0) {
-
-#define DUFF_GUTS							      \
-/* Store the sequence information */				      \
-off[curr_seq] = loc;						      \
-len[curr_seq] = actual_bytes;					      \
-                                                                          \
-/* Increment sequence count */					      \
-curr_seq++;								      \
-                                                                          \
-/* Increment information to reflect block just processed */		      \
-loc += fast_dim_buf_off;
+    while (curr_rows > 0) {
+
+#define DUFF_GUTS                                                                                            \
+    /* Store the sequence information */                                                                     \
+    off[curr_seq] = loc;                                                                                     \
+    len[curr_seq] = actual_bytes;                                                                            \
+                                                                                                             \
+    /* Increment sequence count */                                                                           \
+    curr_seq++;                                                                                              \
+                                                                                                             \
+    /* Increment information to reflect block just processed */                                              \
+    loc += fast_dim_buf_off;
 
 #ifdef NO_DUFFS_DEVICE
         /* Loop over all the blocks in the fastest changing dimension */
-        while(fast_dim_count > 0) {
+        while (fast_dim_count > 0) {
             DUFF_GUTS
 
             /* Decrement number of blocks */
             fast_dim_count--;
         } /* end while */
-#else /* NO_DUFFS_DEVICE */
+#else     /* NO_DUFFS_DEVICE */
         {
             size_t duffs_index; /* Counting index for Duff's device */
 
@@ -8282,27 +8317,26 @@ loc += fast_dim_buf_off;
                     HDassert(0 && "This Should never be executed!");
                     break;
                 case 0:
-                    do
-                      {
-                        DUFF_GUTS
-                case 7:
-                        DUFF_GUTS
-                case 6:
-                        DUFF_GUTS
-                case 5:
-                        DUFF_GUTS
-                case 4:
-                        DUFF_GUTS
-                case 3:
-                        DUFF_GUTS
-                case 2:
-                        DUFF_GUTS
-                case 1:
+                    do {
                         DUFF_GUTS
-                  } while (--duffs_index > 0);
+                        case 7:
+                            DUFF_GUTS
+                        case 6:
+                            DUFF_GUTS
+                        case 5:
+                            DUFF_GUTS
+                        case 4:
+                            DUFF_GUTS
+                        case 3:
+                            DUFF_GUTS
+                        case 2:
+                            DUFF_GUTS
+                        case 1:
+                            DUFF_GUTS
+                    } while (--duffs_index > 0);
             } /* end switch */
         }
-#endif /* NO_DUFFS_DEVICE */
+#endif    /* NO_DUFFS_DEVICE */
 #undef DUFF_GUTS
 
         /* Increment offset in destination buffer */
@@ -8310,13 +8344,13 @@ loc += fast_dim_buf_off;
 
         /* Increment the offset and count for the other dimensions */
         temp_dim = (int)fast_dim - 1;
-        while(temp_dim >= 0) {
+        while (temp_dim >= 0) {
             /* Move to the next row in the curent dimension */
             offset[temp_dim]++;
             tmp_block[temp_dim]++;
 
             /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-            if(tmp_block[temp_dim] < tdiminfo[temp_dim].block)
+            if (tmp_block[temp_dim] < tdiminfo[temp_dim].block)
                 break;
             else {
                 /* Move to the next block in the current dimension */
@@ -8325,8 +8359,9 @@ loc += fast_dim_buf_off;
                 tmp_block[temp_dim] = 0;
                 tmp_count[temp_dim]++;
 
-                /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-                if(tmp_count[temp_dim] < tdiminfo[temp_dim].count)
+                /* If this block is still in the range of blocks to output for the dimension, break out of
+                 * loop */
+                if (tmp_count[temp_dim] < tdiminfo[temp_dim].count)
                     break;
                 else {
                     offset[temp_dim] = (hsize_t)((hssize_t)tdiminfo[temp_dim].start + sel_off[temp_dim]);
@@ -8334,7 +8369,7 @@ loc += fast_dim_buf_off;
                     tmp_count[temp_dim] = 0; /* reset back to the beginning of the line */
                     tmp_block[temp_dim] = 0;
                 } /* end else */
-            } /* end else */
+            }     /* end else */
 
             /* Decrement dimension count */
             temp_dim--;
@@ -8355,12 +8390,12 @@ loc += fast_dim_buf_off;
     tot_blk_count -= (size_t)(total_rows * tdiminfo[fast_dim].count);
 
     /* Read in partial row of blocks */
-    if(io_left > 0 && curr_seq < maxseq) {
+    if (io_left > 0 && curr_seq < maxseq) {
         /* Get remaining number of blocks left to output */
         fast_dim_count = tot_blk_count;
 
         /* Loop over all the blocks in the fastest changing dimension */
-        while(fast_dim_count > 0) {
+        while (fast_dim_count > 0) {
             /* Store the sequence information */
             off[curr_seq] = loc;
             len[curr_seq] = actual_bytes;
@@ -8379,11 +8414,11 @@ loc += fast_dim_buf_off;
         io_left -= actual_elem * tot_blk_count;
 
         /* Increment information to reflect block just processed */
-        offset[fast_dim] += (fast_dim_stride * tot_blk_count);    /* move the offset in the fastest dimension */
+        offset[fast_dim] += (fast_dim_stride * tot_blk_count); /* move the offset in the fastest dimension */
 
         /* Handle any leftover, partial blocks in this row */
-        if(io_left > 0 && curr_seq < maxseq) {
-            actual_elem = io_left;
+        if (io_left > 0 && curr_seq < maxseq) {
+            actual_elem  = io_left;
             actual_bytes = actual_elem * elem_size;
 
             /* Store the sequence information */
@@ -8408,7 +8443,7 @@ loc += fast_dim_buf_off;
 
     /* Update the iterator with the location we stopped */
     /* (Subtract out the selection offset) */
-    for(u = 0; u < ndims; u++)
+    for (u = 0; u < ndims; u++)
         iter->u.hyp.off[u] = (hsize_t)((hssize_t)offset[u] - sel_off[u]);
 
     /* Decrement the number of elements left in selection */
@@ -8423,7 +8458,6 @@ loc += fast_dim_buf_off;
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S_hyper_get_seq_list_opt() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_get_seq_list_single
@@ -8456,28 +8490,27 @@ loc += fast_dim_buf_off;
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
-    size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem,
-    hsize_t *off, size_t *len)
+H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem,
+                              size_t *nseq, size_t *nelem, hsize_t *off, size_t *len)
 {
-    const H5S_hyper_dim_t *tdiminfo;    /* Temporary pointer to diminfo information */
-    const hssize_t *sel_off;    /* Selection offset in dataspace */
-    hsize_t *mem_size;      /* Size of the source buffer */
-    hsize_t base_offset[H5O_LAYOUT_NDIMS];   /* Base coordinate offset in dataspace */
-    hsize_t offset[H5O_LAYOUT_NDIMS];   /* Coordinate offset in dataspace */
-    hsize_t slab[H5O_LAYOUT_NDIMS];     /* Hyperslab size */
-    hsize_t fast_dim_block;     /* Local copies of fastest changing dimension info */
-    hsize_t acc;	        /* Accumulator */
-    hsize_t loc;                /* Coordinate offset */
-    size_t tot_blk_count;       /* Total number of blocks left to output */
-    size_t elem_size;           /* Size of each element iterating over */
-    size_t io_left;             /* The number of elements left in I/O operation */
-    size_t actual_elem;         /* The actual number of elements to count */
-    unsigned ndims;             /* Number of dimensions of dataset */
-    unsigned fast_dim;          /* Rank of the fastest changing dimension for the dataspace */
-    unsigned skip_dim;          /* Rank of the dimension to skip along */
-    unsigned u;                 /* Local index variable */
-    int i;                      /* Local index variable */
+    const H5S_hyper_dim_t *tdiminfo;                      /* Temporary pointer to diminfo information */
+    const hssize_t *       sel_off;                       /* Selection offset in dataspace */
+    hsize_t *              mem_size;                      /* Size of the source buffer */
+    hsize_t                base_offset[H5O_LAYOUT_NDIMS]; /* Base coordinate offset in dataspace */
+    hsize_t                offset[H5O_LAYOUT_NDIMS];      /* Coordinate offset in dataspace */
+    hsize_t                slab[H5O_LAYOUT_NDIMS];        /* Hyperslab size */
+    hsize_t                fast_dim_block; /* Local copies of fastest changing dimension info */
+    hsize_t                acc;            /* Accumulator */
+    hsize_t                loc;            /* Coordinate offset */
+    size_t                 tot_blk_count;  /* Total number of blocks left to output */
+    size_t                 elem_size;      /* Size of each element iterating over */
+    size_t                 io_left;        /* The number of elements left in I/O operation */
+    size_t                 actual_elem;    /* The actual number of elements to count */
+    unsigned               ndims;          /* Number of dimensions of dataset */
+    unsigned               fast_dim;       /* Rank of the fastest changing dimension for the dataspace */
+    unsigned               skip_dim;       /* Rank of the dimension to skip along */
+    unsigned               u;              /* Local index variable */
+    int                    i;              /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -8495,7 +8528,7 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
     tdiminfo = iter->u.hyp.diminfo;
 
     /* Check if this is a "flattened" regular hyperslab selection */
-    if(iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < space->extent.rank) {
+    if (iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < space->extent.rank) {
         /* Set the aliases for a few important dimension ranks */
         ndims = iter->u.hyp.iter_rank;
 
@@ -8519,23 +8552,23 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
 
     /* initialize row sizes for each dimension */
     elem_size = iter->elmt_size;
-    for(i = (int)fast_dim, acc = elem_size; i >= 0; i--) {
+    for (i = (int)fast_dim, acc = elem_size; i >= 0; i--) {
         slab[i] = acc;
         acc *= mem_size[i];
     } /* end for */
 
     /* Copy the base location of the block */
     /* (Add in the selection offset) */
-    for(u = 0; u < ndims; u++)
+    for (u = 0; u < ndims; u++)
         base_offset[u] = (hsize_t)((hssize_t)tdiminfo[u].start + sel_off[u]);
 
     /* Copy the location of the point to get */
     /* (Add in the selection offset) */
-    for(u = 0; u < ndims; u++)
+    for (u = 0; u < ndims; u++)
         offset[u] = (hsize_t)((hssize_t)iter->u.hyp.off[u] + sel_off[u]);
 
     /* Compute the initial buffer offset */
-    for(u = 0, loc = 0; u < ndims; u++)
+    for (u = 0, loc = 0; u < ndims; u++)
         loc += offset[u] * slab[u];
 
     /* Set local copies of information for the fastest changing dimension */
@@ -8556,14 +8589,14 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
     H5_CHECKED_ASSIGN(actual_elem, size_t, fast_dim_block, hsize_t);
 
     /* Check for blocks to operate on */
-    if(tot_blk_count > 0) {
-        size_t actual_bytes;        /* The actual number of bytes to copy */
+    if (tot_blk_count > 0) {
+        size_t actual_bytes; /* The actual number of bytes to copy */
 
         /* Set the number of actual bytes */
         actual_bytes = actual_elem * elem_size;
 
         /* Check for 1-dim selection */
-        if(0 == fast_dim) {
+        if (0 == fast_dim) {
             /* Sanity checks */
             HDassert(1 == tot_blk_count);
             HDassert(io_left == actual_elem);
@@ -8573,23 +8606,23 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
             *len++ = actual_bytes;
         } /* end if */
         else {
-            hsize_t skip_slab;          /* Temporary copy of slab[fast_dim - 1] */
-            size_t blk_count;           /* Total number of blocks left to output */
+            hsize_t skip_slab; /* Temporary copy of slab[fast_dim - 1] */
+            size_t  blk_count; /* Total number of blocks left to output */
 
             /* Find first dimension w/block >1 */
             skip_dim = fast_dim;
-            for(i = (int)(fast_dim - 1); i >= 0; i--)
-                if(tdiminfo[i].block > 1) {
+            for (i = (int)(fast_dim - 1); i >= 0; i--)
+                if (tdiminfo[i].block > 1) {
                     skip_dim = (unsigned)i;
                     break;
                 } /* end if */
             skip_slab = slab[skip_dim];
 
             /* Check for being able to use fast algorithm for 1-D */
-            if(0 == skip_dim) {
+            if (0 == skip_dim) {
                 /* Create sequences until an entire row can't be used */
                 blk_count = tot_blk_count;
-                while(blk_count > 0) {
+                while (blk_count > 0) {
                     /* Store the sequence information */
                     *off++ = loc;
                     *len++ = actual_bytes;
@@ -8605,21 +8638,21 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
                 offset[skip_dim] += tot_blk_count;
             } /* end if */
             else {
-                hsize_t tmp_block[H5O_LAYOUT_NDIMS];/* Temporary block offset */
-                hsize_t skip[H5O_LAYOUT_NDIMS];     /* Bytes to skip between blocks */
-                int temp_dim;               /* Temporary rank holder */
+                hsize_t tmp_block[H5O_LAYOUT_NDIMS]; /* Temporary block offset */
+                hsize_t skip[H5O_LAYOUT_NDIMS];      /* Bytes to skip between blocks */
+                int     temp_dim;                    /* Temporary rank holder */
 
                 /* Set the starting block location */
-                for(u = 0; u < ndims; u++)
+                for (u = 0; u < ndims; u++)
                     tmp_block[u] = iter->u.hyp.off[u] - tdiminfo[u].start;
 
                 /* Compute the amount to skip between sequences */
-                for(u = 0; u < ndims; u++)
+                for (u = 0; u < ndims; u++)
                     skip[u] = (mem_size[u] - tdiminfo[u].block) * slab[u];
 
                 /* Create sequences until an entire row can't be used */
                 blk_count = tot_blk_count;
-                while(blk_count > 0) {
+                while (blk_count > 0) {
                     /* Store the sequence information */
                     *off++ = loc;
                     *len++ = actual_bytes;
@@ -8631,13 +8664,14 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
                     loc += skip_slab;
 
                     /* Increment the offset and count for the other dimensions */
-                    while(temp_dim >= 0) {
+                    while (temp_dim >= 0) {
                         /* Move to the next row in the curent dimension */
                         offset[temp_dim]++;
                         tmp_block[temp_dim]++;
 
-                        /* If this block is still in the range of blocks to output for the dimension, break out of loop */
-                        if(tmp_block[temp_dim] < tdiminfo[temp_dim].block)
+                        /* If this block is still in the range of blocks to output for the dimension, break
+                         * out of loop */
+                        if (tmp_block[temp_dim] < tdiminfo[temp_dim].block)
                             break;
                         else {
                             offset[temp_dim] = base_offset[temp_dim];
@@ -8652,8 +8686,8 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
                     /* Decrement block count */
                     blk_count--;
                 } /* end while */
-            } /* end else */
-        } /* end else */
+            }     /* end else */
+        }         /* end else */
 
         /* Update the iterator, if there were any blocks used */
 
@@ -8661,10 +8695,10 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
         iter->elmt_left -= tot_blk_count * actual_elem;
 
         /* Check if there are elements left in iterator */
-        if(iter->elmt_left > 0) {
+        if (iter->elmt_left > 0) {
             /* Update the iterator with the location we stopped */
             /* (Subtract out the selection offset) */
-            for(u = 0; u < ndims; u++)
+            for (u = 0; u < ndims; u++)
                 iter->u.hyp.off[u] = (hsize_t)((hssize_t)offset[u] - sel_off[u]);
         } /* end if */
 
@@ -8676,8 +8710,8 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
     } /* end if */
 
     /* Check for partial block, with room for another sequence */
-    if(io_left > (tot_blk_count * actual_elem) && tot_blk_count < maxseq) {
-        size_t elmt_remainder;  /* Elements remaining */
+    if (io_left > (tot_blk_count * actual_elem) && tot_blk_count < maxseq) {
+        size_t elmt_remainder; /* Elements remaining */
 
         /* Compute elements left */
         elmt_remainder = io_left - (tot_blk_count * actual_elem);
@@ -8708,7 +8742,6 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S_hyper_get_seq_list_single() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_hyper_get_seq_list
@@ -8741,11 +8774,10 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_get_seq_list(const H5S_t *space, unsigned H5_ATTR_UNUSED flags, H5S_sel_iter_t *iter,
-    size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem,
-    hsize_t *off, size_t *len)
+H5S_hyper_get_seq_list(const H5S_t *space, unsigned H5_ATTR_UNUSED flags, H5S_sel_iter_t *iter, size_t maxseq,
+                       size_t maxelem, size_t *nseq, size_t *nelem, hsize_t *off, size_t *len)
 {
-    herr_t ret_value;      /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -8761,20 +8793,20 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned H5_ATTR_UNUSED flags, H5S_se
     HDassert(len);
 
     /* Check for the special case of just one H5Sselect_hyperslab call made */
-    if(space->select.sel_info.hslab->diminfo_valid) {
-        const H5S_hyper_dim_t *tdiminfo;    /* Temporary pointer to diminfo information */
-        const hssize_t *sel_off;    /* Selection offset in dataspace */
-        hsize_t *mem_size;      /* Size of the source buffer */
-        unsigned ndims;         /* Number of dimensions of dataset */
-        unsigned fast_dim;      /* Rank of the fastest changing dimension for the dataspace */
-        hbool_t single_block;   /* Whether the selection is a single block */
-        unsigned u;             /* Local index variable */
+    if (space->select.sel_info.hslab->diminfo_valid) {
+        const H5S_hyper_dim_t *tdiminfo;     /* Temporary pointer to diminfo information */
+        const hssize_t *       sel_off;      /* Selection offset in dataspace */
+        hsize_t *              mem_size;     /* Size of the source buffer */
+        unsigned               ndims;        /* Number of dimensions of dataset */
+        unsigned               fast_dim;     /* Rank of the fastest changing dimension for the dataspace */
+        hbool_t                single_block; /* Whether the selection is a single block */
+        unsigned               u;            /* Local index variable */
 
         /* Set a local copy of the diminfo pointer */
         tdiminfo = iter->u.hyp.diminfo;
 
         /* Check if this is a "flattened" regular hyperslab selection */
-        if(iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < space->extent.rank) {
+        if (iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < space->extent.rank) {
             /* Set the aliases for a few important dimension ranks */
             ndims = iter->u.hyp.iter_rank;
 
@@ -8797,23 +8829,29 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned H5_ATTR_UNUSED flags, H5S_se
         fast_dim = ndims - 1;
 
         /* Check if we stopped in the middle of a sequence of elements */
-        if((iter->u.hyp.off[fast_dim] - tdiminfo[fast_dim].start) % tdiminfo[fast_dim].stride != 0 ||
-                ((iter->u.hyp.off[fast_dim] != tdiminfo[fast_dim].start) && tdiminfo[fast_dim].count == 1)) {
-            hsize_t slab[H5O_LAYOUT_NDIMS];     /* Hyperslab size */
-            hsize_t loc;                /* Coordinate offset */
-            hsize_t acc;	        /* Accumulator */
-            size_t leftover;            /* The number of elements left over from the last sequence */
-            size_t actual_elem;         /* The actual number of elements to count */
-            size_t elem_size;           /* Size of each element iterating over */
-            int i;                      /* Local index variable */
-
+        if ((iter->u.hyp.off[fast_dim] - tdiminfo[fast_dim].start) % tdiminfo[fast_dim].stride != 0 ||
+            ((iter->u.hyp.off[fast_dim] != tdiminfo[fast_dim].start) && tdiminfo[fast_dim].count == 1)) {
+            hsize_t slab[H5O_LAYOUT_NDIMS]; /* Hyperslab size */
+            hsize_t loc;                    /* Coordinate offset */
+            hsize_t acc;                    /* Accumulator */
+            size_t  leftover;               /* The number of elements left over from the last sequence */
+            size_t  actual_elem;            /* The actual number of elements to count */
+            size_t  elem_size;              /* Size of each element iterating over */
+            int     i;                      /* Local index variable */
 
             /* Calculate the number of elements left in the sequence */
-            if(tdiminfo[fast_dim].count == 1) {
-                H5_CHECKED_ASSIGN(leftover, size_t, tdiminfo[fast_dim].block - (iter->u.hyp.off[fast_dim] - tdiminfo[fast_dim].start), hsize_t);
+            if (tdiminfo[fast_dim].count == 1) {
+                H5_CHECKED_ASSIGN(leftover, size_t,
+                                  tdiminfo[fast_dim].block -
+                                      (iter->u.hyp.off[fast_dim] - tdiminfo[fast_dim].start),
+                                  hsize_t);
             } /* end if */
             else {
-                H5_CHECKED_ASSIGN(leftover, size_t, tdiminfo[fast_dim].block - ((iter->u.hyp.off[fast_dim] - tdiminfo[fast_dim].start) % tdiminfo[fast_dim].stride), hsize_t);
+                H5_CHECKED_ASSIGN(
+                    leftover, size_t,
+                    tdiminfo[fast_dim].block -
+                        ((iter->u.hyp.off[fast_dim] - tdiminfo[fast_dim].start) % tdiminfo[fast_dim].stride),
+                    hsize_t);
             } /* end else */
 
             /* Make certain that we don't write too many */
@@ -8821,13 +8859,13 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned H5_ATTR_UNUSED flags, H5S_se
 
             /* initialize row sizes for each dimension */
             elem_size = iter->elmt_size;
-            for(i = (int)fast_dim, acc = elem_size; i >= 0; i--) {
+            for (i = (int)fast_dim, acc = elem_size; i >= 0; i--) {
                 slab[i] = acc;
                 acc *= mem_size[i];
             } /* end for */
 
             /* Compute the initial buffer offset */
-            for(u = 0, loc = 0; u < ndims; u++)
+            for (u = 0, loc = 0; u < ndims; u++)
                 loc += ((hsize_t)((hssize_t)iter->u.hyp.off[u] + sel_off[u])) * slab[u];
 
             /* Add a new sequence */
@@ -8849,29 +8887,29 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned H5_ATTR_UNUSED flags, H5S_se
             maxseq--;
 
             /* Set the number of sequences generated and elements used */
-            *nseq = 1;
+            *nseq  = 1;
             *nelem = actual_elem;
 
             /* Check for using up all the sequences/elements */
-            if(0 == iter->elmt_left || 0 == maxelem || 0 == maxseq)
-                return(SUCCEED);
+            if (0 == iter->elmt_left || 0 == maxelem || 0 == maxseq)
+                return (SUCCEED);
         } /* end if */
         else {
             /* Reset the number of sequences generated and elements used */
-            *nseq = 0;
+            *nseq  = 0;
             *nelem = 0;
         } /* end else */
 
         /* Check for a single block selected */
         single_block = TRUE;
-        for(u = 0; u < ndims; u++)
-            if(1 != tdiminfo[u].count) {
+        for (u = 0; u < ndims; u++)
+            if (1 != tdiminfo[u].count) {
                 single_block = FALSE;
                 break;
             } /* end if */
 
         /* Check for single block selection */
-        if(single_block)
+        if (single_block)
             /* Use single-block optimized call to generate sequence list */
             ret_value = H5S_hyper_get_seq_list_single(space, iter, maxseq, maxelem, nseq, nelem, off, len);
         else
@@ -8884,4 +8922,3 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned H5_ATTR_UNUSED flags, H5S_se
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_hyper_get_seq_list() */
-
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index ee774cf..bef70d6 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -20,45 +20,41 @@
  *		I didn't make them portable.
  */
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
-
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Pprivate.h"         /* Property lists                       */
-#include "H5Spkg.h"		/* Dataspaces 				*/
-#include "H5VMprivate.h"		/* Vector and array functions		*/
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Pprivate.h"  /* Property lists                       */
+#include "H5Spkg.h"      /* Dataspaces 				*/
+#include "H5VMprivate.h" /* Vector and array functions		*/
 
 #ifdef H5_HAVE_PARALLEL
 
-static herr_t H5S_mpio_all_type(const H5S_t *space, size_t elmt_size,
-    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type);
-static herr_t H5S_mpio_none_type(MPI_Datatype *new_type, int *count,
-    hbool_t *is_derived_type);
-static herr_t H5S_mpio_create_point_datatype(size_t elmt_size, hsize_t num_points, 
-    MPI_Aint *disp, MPI_Datatype *new_type);
-static herr_t H5S_mpio_point_type(const H5S_t *space, size_t elmt_size,
-    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type,
-    hbool_t do_permute, hsize_t **permute_map, hbool_t *is_permuted);
-static herr_t H5S_mpio_permute_type(const H5S_t *space, size_t elmt_size, 
-    hsize_t **permute_map, MPI_Datatype *new_type, int *count,
-    hbool_t *is_derived_type);
-static herr_t H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
-    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type);
-static herr_t H5S_mpio_span_hyper_type(const H5S_t *space, size_t elmt_size,
-    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type);
-static herr_t H5S_obtain_datatype(const hsize_t down[], H5S_hyper_span_t* span,
-    const MPI_Datatype *elmt_type, MPI_Datatype *span_type, size_t elmt_size);
-
-#define H5S_MPIO_INITIAL_ALLOC_COUNT    256
-
-
+static herr_t H5S_mpio_all_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count,
+                                hbool_t *is_derived_type);
+static herr_t H5S_mpio_none_type(MPI_Datatype *new_type, int *count, hbool_t *is_derived_type);
+static herr_t H5S_mpio_create_point_datatype(size_t elmt_size, hsize_t num_points, MPI_Aint *disp,
+                                             MPI_Datatype *new_type);
+static herr_t H5S_mpio_point_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count,
+                                  hbool_t *is_derived_type, hbool_t do_permute, hsize_t **permute_map,
+                                  hbool_t *is_permuted);
+static herr_t H5S_mpio_permute_type(const H5S_t *space, size_t elmt_size, hsize_t **permute_map,
+                                    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type);
+static herr_t H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count,
+                                  hbool_t *is_derived_type);
+static herr_t H5S_mpio_span_hyper_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
+                                       int *count, hbool_t *is_derived_type);
+static herr_t H5S_obtain_datatype(const hsize_t down[], H5S_hyper_span_t *span, const MPI_Datatype *elmt_type,
+                                  MPI_Datatype *span_type, size_t elmt_size);
+
+#define H5S_MPIO_INITIAL_ALLOC_COUNT 256
+
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_all_type
  *
@@ -76,13 +72,13 @@ static herr_t H5S_obtain_datatype(const hsize_t down[], H5S_hyper_span_t* span,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_mpio_all_type(const H5S_t *space, size_t elmt_size,
-    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type)
+H5S_mpio_all_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count,
+                  hbool_t *is_derived_type)
 {
-    hsize_t	total_bytes;
-    hssize_t	snelmts;                /* Total number of elmts	(signed) */
-    hsize_t	nelmts;                 /* Total number of elmts	*/
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    hsize_t  total_bytes;
+    hssize_t snelmts;             /* Total number of elmts	(signed) */
+    hsize_t  nelmts;              /* Total number of elmts	*/
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -90,8 +86,8 @@ H5S_mpio_all_type(const H5S_t *space, size_t elmt_size,
     HDassert(space);
 
     /* Just treat the entire extent as a block of bytes */
-    if((snelmts = (hssize_t)H5S_GET_EXTENT_NPOINTS(space)) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src dataspace has invalid selection")
+    if ((snelmts = (hssize_t)H5S_GET_EXTENT_NPOINTS(space)) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src dataspace has invalid selection")
     H5_CHECKED_ASSIGN(nelmts, hsize_t, snelmts, hssize_t);
 
     total_bytes = (hsize_t)elmt_size * nelmts;
@@ -105,7 +101,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5S_mpio_all_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_none_type
  *
@@ -128,14 +123,13 @@ H5S_mpio_none_type(MPI_Datatype *new_type, int *count, hbool_t *is_derived_type)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* fill in the return values */
-    *new_type = MPI_BYTE;
-    *count = 0;
+    *new_type        = MPI_BYTE;
+    *count           = 0;
     *is_derived_type = FALSE;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5S_mpio_none_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_create_point_datatype
  *
@@ -149,50 +143,49 @@ H5S_mpio_none_type(MPI_Datatype *new_type, int *count, hbool_t *is_derived_type)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
-H5S_mpio_create_point_datatype (size_t elmt_size, hsize_t num_points,
-    MPI_Aint *disp, MPI_Datatype *new_type) 
+static herr_t
+H5S_mpio_create_point_datatype(size_t elmt_size, hsize_t num_points, MPI_Aint *disp, MPI_Datatype *new_type)
 {
-    MPI_Datatype   elmt_type;           /* MPI datatype for individual element */
-    hbool_t        elmt_type_created = FALSE;   /* Whether the element MPI datatype was created */
-    int            mpi_code;            /* MPI error code */
-    int            *blocks = NULL;      /* Array of block sizes for MPI hindexed create call */
-    hsize_t        u;                   /* Local index variable */
-    herr_t	   ret_value = SUCCEED; /* Return value */
+    MPI_Datatype elmt_type;                 /* MPI datatype for individual element */
+    hbool_t      elmt_type_created = FALSE; /* Whether the element MPI datatype was created */
+    int          mpi_code;                  /* MPI error code */
+    int *        blocks = NULL;             /* Array of block sizes for MPI hindexed create call */
+    hsize_t      u;                         /* Local index variable */
+    herr_t       ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Create an MPI datatype for an element */
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_contiguous((int)elmt_size, MPI_BYTE, &elmt_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_contiguous((int)elmt_size, MPI_BYTE, &elmt_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
     elmt_type_created = TRUE;
-    
+
     /* Allocate block sizes for MPI datatype call */
-    if(NULL == (blocks = (int *)H5MM_malloc(sizeof(int) * num_points)))
+    if (NULL == (blocks = (int *)H5MM_malloc(sizeof(int) * num_points)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of blocks")
 
     /* Would be nice to have Create_Hindexed_block to avoid this array of all ones */
-    for(u = 0; u < num_points; u++)
+    for (u = 0; u < num_points; u++)
         blocks[u] = 1;
 
     /* Create an MPI datatype for the whole point selection */
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_create_hindexed((int)num_points, blocks, disp, elmt_type, new_type)))
+    if (MPI_SUCCESS !=
+        (mpi_code = MPI_Type_create_hindexed((int)num_points, blocks, disp, elmt_type, new_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_indexed_block failed", mpi_code)
 
     /* Commit MPI datatype for later use */
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(new_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(new_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
 
 done:
-    if(elmt_type_created)
+    if (elmt_type_created)
         MPI_Type_free(&elmt_type);
-    if(blocks)
+    if (blocks)
         H5MM_free(blocks);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5S_mpio_create_point_datatype() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_point_type
  *
@@ -214,16 +207,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_mpio_point_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, 
-    int *count, hbool_t *is_derived_type, hbool_t do_permute, hsize_t **permute,
-    hbool_t *is_permuted)
+H5S_mpio_point_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count,
+                    hbool_t *is_derived_type, hbool_t do_permute, hsize_t **permute, hbool_t *is_permuted)
 {
-    MPI_Aint *disp = NULL;      /* Datatype displacement for each point*/
-    H5S_pnt_node_t *curr = NULL; /* Current point being operated on in from the selection */
-    hssize_t snum_points;       /* Signed number of elements in selection */
-    hsize_t num_points;         /* Sumber of points in the selection */
-    hsize_t u;                  /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    MPI_Aint *      disp = NULL;         /* Datatype displacement for each point*/
+    H5S_pnt_node_t *curr = NULL;         /* Current point being operated on in from the selection */
+    hssize_t        snum_points;         /* Signed number of elements in selection */
+    hsize_t         num_points;          /* Sumber of points in the selection */
+    hsize_t         u;                   /* Local index variable */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -231,64 +223,64 @@ H5S_mpio_point_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type
     HDassert(space);
 
     /* Get the total number of points selected */
-    if((snum_points = (hssize_t)H5S_GET_SELECT_NPOINTS(space)) < 0)
+    if ((snum_points = (hssize_t)H5S_GET_SELECT_NPOINTS(space)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOUNT, FAIL, "can't get number of elements selected")
     num_points = (hsize_t)snum_points;
 
     /* Allocate array for element displacements */
-    if(NULL == (disp = (MPI_Aint *)H5MM_malloc(sizeof(MPI_Aint) * num_points)))
-         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of displacements")
+    if (NULL == (disp = (MPI_Aint *)H5MM_malloc(sizeof(MPI_Aint) * num_points)))
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of displacements")
 
     /* Allocate array for element permutation - returned to caller */
-    if(do_permute)
-        if(NULL == (*permute = (hsize_t *)H5MM_malloc(sizeof(hsize_t) * num_points)))
+    if (do_permute)
+        if (NULL == (*permute = (hsize_t *)H5MM_malloc(sizeof(hsize_t) * num_points)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate permutation array")
 
     /* Iterate through list of elements */
     curr = space->select.sel_info.pnt_lst->head;
-    for(u = 0 ; u < num_points ; u++) {
+    for (u = 0; u < num_points; u++) {
         /* calculate the displacement of the current point */
         disp[u] = H5VM_array_offset(space->extent.rank, space->extent.size, curr->pnt);
         disp[u] *= elmt_size;
 
-        /* This is a File Space used to set the file view, so adjust the displacements 
+        /* This is a File Space used to set the file view, so adjust the displacements
          * to have them monotonically non-decreasing.
-         * Generate the permutation array by indicating at each point being selected, 
-         * the position it will shifted in the new displacement. Example: 
-         * Suppose 4 points with corresponding are selected 
-         * Pt 1: disp=6 ; Pt 2: disp=3 ; Pt 3: disp=0 ; Pt 4: disp=4 
+         * Generate the permutation array by indicating at each point being selected,
+         * the position it will shifted in the new displacement. Example:
+         * Suppose 4 points with corresponding are selected
+         * Pt 1: disp=6 ; Pt 2: disp=3 ; Pt 3: disp=0 ; Pt 4: disp=4
          * The permute map to sort the displacements in order will be:
          * point 1: map[0] = L, indicating that this point is not moved (1st point selected)
-         * point 2: map[1] = 0, indicating that this point is moved to the first position, 
+         * point 2: map[1] = 0, indicating that this point is moved to the first position,
          *                      since disp_pt1(6) > disp_pt2(3)
-         * point 3: map[2] = 0, move to position 0, bec it has the lowest disp between 
+         * point 3: map[2] = 0, move to position 0, bec it has the lowest disp between
          *                      the points selected so far.
-         * point 4: map[3] = 2, move the 2nd position since point 1 has a higher disp, 
+         * point 4: map[3] = 2, move the 2nd position since point 1 has a higher disp,
          *                      but points 2 and 3 have lower displacements.
          */
-        if(do_permute) {
-            if(u > 0 && disp[u] < disp[u - 1]) {
+        if (do_permute) {
+            if (u > 0 && disp[u] < disp[u - 1]) {
                 unsigned s = 0, l = u, m = u / 2;
 
                 *is_permuted = TRUE;
                 do {
-                    if(disp[u] > disp[m])
+                    if (disp[u] > disp[m])
                         s = m + 1;
-                    else if(disp[u] < disp[m])
+                    else if (disp[u] < disp[m])
                         l = m;
                     else
                         break;
                     m = s + ((l - s) / 2);
-                } while(s < l);
+                } while (s < l);
 
-                if(m < u) {
+                if (m < u) {
                     MPI_Aint temp;
 
                     temp = disp[u];
                     HDmemmove(disp + m + 1, disp + m, (u - m) * sizeof(MPI_Aint));
                     disp[m] = temp;
                 } /* end if */
-                (*permute)[u] = m;                
+                (*permute)[u] = m;
             } /* end if */
             else
                 (*permute)[u] = num_points;
@@ -296,27 +288,27 @@ H5S_mpio_point_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type
         /* this is a memory space, and no permutation is necessary to create
            the derived datatype */
         else {
-            ;/* do nothing */
-        } /* end else */
+            ; /* do nothing */
+        }     /* end else */
 
         /* get the next point */
         curr = curr->next;
     } /* end for */
 
     /* Create the MPI datatype for the set of element displacements */
-    if(H5S_mpio_create_point_datatype(elmt_size, num_points, disp, new_type) < 0)
+    if (H5S_mpio_create_point_datatype(elmt_size, num_points, disp, new_type) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create an MPI Datatype from point selection")
 
     /* Set values about MPI datatype created */
-    *count = 1;
+    *count           = 1;
     *is_derived_type = TRUE;
 
 done:
-    if(NULL != disp)
+    if (NULL != disp)
         H5MM_free(disp);
 
     /* Release the permutation buffer, if it wasn't used */
-    if(!(*is_permuted) && (*permute)) {
+    if (!(*is_permuted) && (*permute)) {
         H5MM_free(*permute);
         *permute = NULL;
     } /* end if */
@@ -324,7 +316,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5S_mpio_point_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_permute_type
  *
@@ -349,19 +340,19 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_mpio_permute_type(const H5S_t *space, size_t elmt_size, hsize_t **permute, 
-    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type)
+H5S_mpio_permute_type(const H5S_t *space, size_t elmt_size, hsize_t **permute, MPI_Datatype *new_type,
+                      int *count, hbool_t *is_derived_type)
 {
-    MPI_Aint *disp = NULL;      /* Datatype displacement for each point*/
-    H5S_sel_iter_t sel_iter;    /* Selection iteration info */
-    hbool_t sel_iter_init = FALSE;      /* Selection iteration info has been initialized */
-    hsize_t off[H5D_IO_VECTOR_SIZE];    /* Array to store sequence offsets */
-    size_t len[H5D_IO_VECTOR_SIZE];     /* Array to store sequence lengths */
-    hssize_t snum_points;       /* Signed number of elements in selection */
-    hsize_t num_points;         /* Number of points in the selection */
-    size_t max_elem;            /* Maximum number of elements allowed in sequences */
-    hsize_t u;                  /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    MPI_Aint *     disp = NULL;             /* Datatype displacement for each point*/
+    H5S_sel_iter_t sel_iter;                /* Selection iteration info */
+    hbool_t        sel_iter_init = FALSE;   /* Selection iteration info has been initialized */
+    hsize_t        off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */
+    size_t         len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */
+    hssize_t       snum_points;             /* Signed number of elements in selection */
+    hsize_t        num_points;              /* Number of points in the selection */
+    size_t         max_elem;                /* Maximum number of elements allowed in sequences */
+    hsize_t        u;                       /* Local index variable */
+    herr_t         ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -369,37 +360,38 @@ H5S_mpio_permute_type(const H5S_t *space, size_t elmt_size, hsize_t **permute,
     HDassert(space);
 
     /* Get the total number of points selected */
-    if((snum_points = (hssize_t)H5S_GET_SELECT_NPOINTS(space)) < 0)
+    if ((snum_points = (hssize_t)H5S_GET_SELECT_NPOINTS(space)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOUNT, FAIL, "can't get number of elements selected")
     num_points = (hsize_t)snum_points;
 
     /* Allocate array to store point displacements */
-    if(NULL == (disp = (MPI_Aint *)H5MM_malloc(sizeof(MPI_Aint) * num_points)))
+    if (NULL == (disp = (MPI_Aint *)H5MM_malloc(sizeof(MPI_Aint) * num_points)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of displacements")
 
     /* Initialize selection iterator */
-    if(H5S_select_iter_init(&sel_iter, space, elmt_size) < 0)
+    if (H5S_select_iter_init(&sel_iter, space, elmt_size) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
-    sel_iter_init = TRUE;	/* Selection iteration info has been initialized */
+    sel_iter_init = TRUE; /* Selection iteration info has been initialized */
 
     /* Set the number of elements to iterate over */
     H5_CHECKED_ASSIGN(max_elem, size_t, num_points, hsize_t);
 
     /* Loop, while elements left in selection */
     u = 0;
-    while(max_elem > 0) {
-        size_t nelem;               /* Number of elements used in sequences */
-        size_t nseq;                /* Number of sequences generated */
-        size_t curr_seq;            /* Current sequence being worked on */
+    while (max_elem > 0) {
+        size_t nelem;    /* Number of elements used in sequences */
+        size_t nseq;     /* Number of sequences generated */
+        size_t curr_seq; /* Current sequence being worked on */
 
         /* Get the sequences of bytes */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, &sel_iter, (size_t)H5D_IO_VECTOR_SIZE, max_elem, &nseq, &nelem, off, len) < 0)
+        if (H5S_SELECT_GET_SEQ_LIST(space, 0, &sel_iter, (size_t)H5D_IO_VECTOR_SIZE, max_elem, &nseq, &nelem,
+                                    off, len) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
 
         /* Loop, while sequences left to process */
-        for(curr_seq = 0; curr_seq < nseq; curr_seq++) {
-            hsize_t curr_off;           /* Current offset within sequence */
-            size_t curr_len;            /* Length of bytes left to process in sequence */
+        for (curr_seq = 0; curr_seq < nseq; curr_seq++) {
+            hsize_t curr_off; /* Current offset within sequence */
+            size_t  curr_len; /* Length of bytes left to process in sequence */
 
             /* Get the current offset */
             curr_off = off[curr_seq];
@@ -408,17 +400,17 @@ H5S_mpio_permute_type(const H5S_t *space, size_t elmt_size, hsize_t **permute,
             curr_len = len[curr_seq];
 
             /* Loop, while bytes left in sequence */
-            while(curr_len > 0) {
+            while (curr_len > 0) {
                 /* Set the displacement of the current point */
                 disp[u] = curr_off;
 
-                /* This is a memory displacement, so for each point selected, 
+                /* This is a memory displacement, so for each point selected,
                  * apply the map that was generated by the file selection */
-                if((*permute)[u] != num_points) {
+                if ((*permute)[u] != num_points) {
                     MPI_Aint temp = disp[u];
 
-                    HDmemmove(disp + (*permute)[u] + 1, disp + (*permute)[u], 
-                             (u - (*permute)[u]) * sizeof(MPI_Aint));
+                    HDmemmove(disp + (*permute)[u] + 1, disp + (*permute)[u],
+                              (u - (*permute)[u]) * sizeof(MPI_Aint));
                     disp[(*permute)[u]] = temp;
                 } /* end if */
 
@@ -431,30 +423,30 @@ H5S_mpio_permute_type(const H5S_t *space, size_t elmt_size, hsize_t **permute,
                 /* Decrement number of bytes left in sequence */
                 curr_len -= elmt_size;
             } /* end while */
-        } /* end for */
+        }     /* end for */
 
         /* Decrement number of elements left to process */
         max_elem -= nelem;
     } /* end while */
 
     /* Create the MPI datatype for the set of element displacements */
-    if(H5S_mpio_create_point_datatype(elmt_size, num_points, disp, new_type) < 0)
+    if (H5S_mpio_create_point_datatype(elmt_size, num_points, disp, new_type) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create an MPI Datatype from point selection")
 
     /* Set values about MPI datatype created */
-    *count = 1;
+    *count           = 1;
     *is_derived_type = TRUE;
 
 done:
     /* Release selection iterator */
-    if(sel_iter_init)
-        if(H5S_SELECT_ITER_RELEASE(&sel_iter) < 0)
+    if (sel_iter_init)
+        if (H5S_SELECT_ITER_RELEASE(&sel_iter) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
     /* Free memory */
-    if(disp)
+    if (disp)
         H5MM_free(disp);
-    if(*permute) {
+    if (*permute) {
         H5MM_free(*permute);
         *permute = NULL;
     } /* end if */
@@ -462,7 +454,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5S_mpio_permute_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_hyper_type
  *
@@ -480,31 +471,31 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
-    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type)
+H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count,
+                    hbool_t *is_derived_type)
 {
-    H5S_sel_iter_t sel_iter;    /* Selection iteration info */
-    hbool_t sel_iter_init = FALSE;    /* Selection iteration info has been initialized */
+    H5S_sel_iter_t sel_iter;              /* Selection iteration info */
+    hbool_t        sel_iter_init = FALSE; /* Selection iteration info has been initialized */
 
-    struct dim {	/* less hassle than malloc/free & ilk */
+    struct dim { /* less hassle than malloc/free & ilk */
         hssize_t start;
-        hsize_t strid;
-        hsize_t block;
-        hsize_t xtent;
-        hsize_t count;
+        hsize_t  strid;
+        hsize_t  block;
+        hsize_t  xtent;
+        hsize_t  count;
     } d[H5S_MAX_RANK];
 
-    hsize_t		offset[H5S_MAX_RANK];
-    hsize_t		max_xtent[H5S_MAX_RANK];
-    H5S_hyper_dim_t	*diminfo;		/* [rank] */
-    unsigned		rank;
-    MPI_Datatype	inner_type, outer_type;
-    MPI_Aint            extent_len, start_disp, new_extent;
-    MPI_Aint            lb; /* Needed as an argument for MPI_Type_get_extent */
-    unsigned		u;			/* Local index variable */
-    int			i;			/* Local index variable */
-    int                 mpi_code;               /* MPI return code */
-    herr_t		ret_value = SUCCEED;
+    hsize_t          offset[H5S_MAX_RANK];
+    hsize_t          max_xtent[H5S_MAX_RANK];
+    H5S_hyper_dim_t *diminfo; /* [rank] */
+    unsigned         rank;
+    MPI_Datatype     inner_type, outer_type;
+    MPI_Aint         extent_len, start_disp, new_extent;
+    MPI_Aint         lb;       /* Needed as an argument for MPI_Type_get_extent */
+    unsigned         u;        /* Local index variable */
+    int              i;        /* Local index variable */
+    int              mpi_code; /* MPI return code */
+    herr_t           ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -513,9 +504,9 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
     HDassert(sizeof(MPI_Aint) >= sizeof(elmt_size));
 
     /* Initialize selection iterator */
-    if(H5S_select_iter_init(&sel_iter, space, elmt_size) < 0)
+    if (H5S_select_iter_init(&sel_iter, space, elmt_size) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
-    sel_iter_init = TRUE;	/* Selection iteration info has been initialized */
+    sel_iter_init = TRUE; /* Selection iteration info has been initialized */
 
     /* Abbreviate args */
     diminfo = sel_iter.u.hyp.diminfo;
@@ -524,15 +515,15 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
     /* make a local copy of the dimension info so we can operate with them */
 
     /* Check if this is a "flattened" regular hyperslab selection */
-    if(sel_iter.u.hyp.iter_rank != 0 && sel_iter.u.hyp.iter_rank < space->extent.rank) {
+    if (sel_iter.u.hyp.iter_rank != 0 && sel_iter.u.hyp.iter_rank < space->extent.rank) {
         /* Flattened selection */
         rank = sel_iter.u.hyp.iter_rank;
-        HDassert(rank <= H5S_MAX_RANK);	/* within array bounds */
+        HDassert(rank <= H5S_MAX_RANK); /* within array bounds */
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S))
-            HDfprintf(H5DEBUG(S), "%s: Flattened selection\n",FUNC);
+        if (H5DEBUG(S))
+            HDfprintf(H5DEBUG(S), "%s: Flattened selection\n", FUNC);
 #endif
-        for(u = 0; u < rank; ++u) {
+        for (u = 0; u < rank; ++u) {
             H5_CHECK_OVERFLOW(diminfo[u].start, hsize_t, hssize_t)
             d[u].start = (hssize_t)diminfo[u].start + sel_iter.u.hyp.sel_off[u];
             d[u].strid = diminfo[u].stride;
@@ -540,34 +531,34 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
             d[u].count = diminfo[u].count;
             d[u].xtent = sel_iter.u.hyp.size[u];
 #ifdef H5S_DEBUG
-       if(H5DEBUG(S)){
-            HDfprintf(H5DEBUG(S), "%s: start=%Hd  stride=%Hu  count=%Hu  block=%Hu  xtent=%Hu",
-                FUNC, d[u].start, d[u].strid, d[u].count, d[u].block, d[u].xtent );
-            if (u==0)
-                HDfprintf(H5DEBUG(S), "  rank=%u\n", rank );
-            else
-                HDfprintf(H5DEBUG(S), "\n" );
-      }
+            if (H5DEBUG(S)) {
+                HDfprintf(H5DEBUG(S), "%s: start=%Hd  stride=%Hu  count=%Hu  block=%Hu  xtent=%Hu", FUNC,
+                          d[u].start, d[u].strid, d[u].count, d[u].block, d[u].xtent);
+                if (u == 0)
+                    HDfprintf(H5DEBUG(S), "  rank=%u\n", rank);
+                else
+                    HDfprintf(H5DEBUG(S), "\n");
+            }
 #endif
-            if(0 == d[u].block)
+            if (0 == d[u].block)
                 goto empty;
-            if(0 == d[u].count)
+            if (0 == d[u].count)
                 goto empty;
-            if(0 == d[u].xtent)
+            if (0 == d[u].xtent)
                 goto empty;
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else {
         /* Non-flattened selection */
         rank = space->extent.rank;
-        HDassert(rank <= H5S_MAX_RANK);	/* within array bounds */
-        if(0 == rank)
+        HDassert(rank <= H5S_MAX_RANK); /* within array bounds */
+        if (0 == rank)
             goto empty;
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S))
-            HDfprintf(H5DEBUG(S),"%s: Non-flattened selection\n",FUNC);
+        if (H5DEBUG(S))
+            HDfprintf(H5DEBUG(S), "%s: Non-flattened selection\n", FUNC);
 #endif
-        for(u = 0; u < rank; ++u) {
+        for (u = 0; u < rank; ++u) {
             H5_CHECK_OVERFLOW(diminfo[u].start, hsize_t, hssize_t)
             d[u].start = (hssize_t)diminfo[u].start + space->select.offset[u];
             d[u].strid = diminfo[u].stride;
@@ -575,44 +566,42 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
             d[u].count = diminfo[u].count;
             d[u].xtent = space->extent.size[u];
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S)){
-    HDfprintf(H5DEBUG(S), "%s: start=%Hd  stride=%Hu  count=%Hu  block=%Hu  xtent=%Hu",
-              FUNC, d[u].start, d[u].strid, d[u].count, d[u].block, d[u].xtent );
-    if (u==0)
-        HDfprintf(H5DEBUG(S), "  rank=%u\n", rank );
-    else
-        HDfprintf(H5DEBUG(S), "\n" );
-  }
+            if (H5DEBUG(S)) {
+                HDfprintf(H5DEBUG(S), "%s: start=%Hd  stride=%Hu  count=%Hu  block=%Hu  xtent=%Hu", FUNC,
+                          d[u].start, d[u].strid, d[u].count, d[u].block, d[u].xtent);
+                if (u == 0)
+                    HDfprintf(H5DEBUG(S), "  rank=%u\n", rank);
+                else
+                    HDfprintf(H5DEBUG(S), "\n");
+            }
 #endif
-            if(0 == d[u].block)
+            if (0 == d[u].block)
                 goto empty;
-            if(0 == d[u].count)
+            if (0 == d[u].count)
                 goto empty;
-            if(0 == d[u].xtent)
+            if (0 == d[u].xtent)
                 goto empty;
         } /* end for */
-    } /* end else */
+    }     /* end else */
 
-/**********************************************************************
-    Compute array "offset[rank]" which gives the offsets for a multi-
-    dimensional array with dimensions "d[i].xtent" (i=0,1,...,rank-1).
-**********************************************************************/
-    offset[rank - 1] = 1;
+    /**********************************************************************
+        Compute array "offset[rank]" which gives the offsets for a multi-
+        dimensional array with dimensions "d[i].xtent" (i=0,1,...,rank-1).
+    **********************************************************************/
+    offset[rank - 1]    = 1;
     max_xtent[rank - 1] = d[rank - 1].xtent;
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S)) {
-     i = ((int)rank) - 1;
-     HDfprintf(H5DEBUG(S), " offset[%2d]=%Hu; max_xtent[%2d]=%Hu\n",
-                          i, offset[i], i, max_xtent[i]);
-  }
+    if (H5DEBUG(S)) {
+        i = ((int)rank) - 1;
+        HDfprintf(H5DEBUG(S), " offset[%2d]=%Hu; max_xtent[%2d]=%Hu\n", i, offset[i], i, max_xtent[i]);
+    }
 #endif
-    for(i = ((int)rank) - 2; i >= 0; --i) {
-        offset[i] = offset[i + 1] * d[i + 1].xtent;
+    for (i = ((int)rank) - 2; i >= 0; --i) {
+        offset[i]    = offset[i + 1] * d[i + 1].xtent;
         max_xtent[i] = max_xtent[i + 1] * d[i].xtent;
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S))
-    HDfprintf(H5DEBUG(S), " offset[%2d]=%Hu; max_xtent[%2d]=%Hu\n",
-                          i, offset[i], i, max_xtent[i]);
+        if (H5DEBUG(S))
+            HDfprintf(H5DEBUG(S), " offset[%2d]=%Hu; max_xtent[%2d]=%Hu\n", i, offset[i], i, max_xtent[i]);
 #endif
     } /* end for */
 
@@ -622,116 +611,115 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
      *  fastest-changing (i.e., inner) dimension * to the slowest (outer). */
 
 /*******************************************************
-*  Construct contig type for inner contig dims:
-*******************************************************/
+ *  Construct contig type for inner contig dims:
+ *******************************************************/
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S)) {
-    HDfprintf(H5DEBUG(S), "%s: Making contig type %Zu MPI_BYTEs\n", FUNC, elmt_size);
-    for(i = ((int)rank) - 1; i >= 0; --i)
-        HDfprintf(H5DEBUG(S), "d[%d].xtent=%Hu \n", i, d[i].xtent);
-  }
+    if (H5DEBUG(S)) {
+        HDfprintf(H5DEBUG(S), "%s: Making contig type %Zu MPI_BYTEs\n", FUNC, elmt_size);
+        for (i = ((int)rank) - 1; i >= 0; --i)
+            HDfprintf(H5DEBUG(S), "d[%d].xtent=%Hu \n", i, d[i].xtent);
+    }
 #endif
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_contiguous((int)elmt_size, MPI_BYTE, &inner_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_contiguous((int)elmt_size, MPI_BYTE, &inner_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
 
-/*******************************************************
-*  Construct the type by walking the hyperslab dims
-*  from the inside out:
-*******************************************************/
-    for(i = ((int)rank) - 1; i >= 0; --i) {
+    /*******************************************************
+     *  Construct the type by walking the hyperslab dims
+     *  from the inside out:
+     *******************************************************/
+    for (i = ((int)rank) - 1; i >= 0; --i) {
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S))
-    HDfprintf(H5DEBUG(S), "%s: Dimension i=%d \n"
-            "start=%Hd count=%Hu block=%Hu stride=%Hu, xtent=%Hu max_xtent=%d\n",
-            FUNC, i, d[i].start, d[i].count, d[i].block, d[i].strid, d[i].xtent, max_xtent[i]);
+        if (H5DEBUG(S))
+            HDfprintf(H5DEBUG(S),
+                      "%s: Dimension i=%d \n"
+                      "start=%Hd count=%Hu block=%Hu stride=%Hu, xtent=%Hu max_xtent=%d\n",
+                      FUNC, i, d[i].start, d[i].count, d[i].block, d[i].strid, d[i].xtent, max_xtent[i]);
 #endif
 
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S))
-    HDfprintf(H5DEBUG(S), "%s: i=%d  Making vector-type \n", FUNC,i);
+        if (H5DEBUG(S))
+            HDfprintf(H5DEBUG(S), "%s: i=%d  Making vector-type \n", FUNC, i);
 #endif
-       /****************************************
-       *  Build vector type of the selection.
-       ****************************************/
-	mpi_code = MPI_Type_vector((int)(d[i].count),       /* count */
-				   (int)(d[i].block),       /* blocklength */
-				   (int)(d[i].strid),       /* stride */
-				   inner_type,	            /* old type */
-				   &outer_type);            /* new type */
+        /****************************************
+         *  Build vector type of the selection.
+         ****************************************/
+        mpi_code = MPI_Type_vector((int)(d[i].count), /* count */
+                                   (int)(d[i].block), /* blocklength */
+                                   (int)(d[i].strid), /* stride */
+                                   inner_type,        /* old type */
+                                   &outer_type);      /* new type */
 
         MPI_Type_free(&inner_type);
-        if(mpi_code != MPI_SUCCESS)
+        if (mpi_code != MPI_SUCCESS)
             HMPI_GOTO_ERROR(FAIL, "couldn't create MPI vector type", mpi_code)
 
         /****************************************
-        *  Then build the dimension type as (start, vector type, xtent).
-        ****************************************/
+         *  Then build the dimension type as (start, vector type, xtent).
+         ****************************************/
         /* calculate start and extent values of this dimension */
-	start_disp = d[i].start * offset[i] * elmt_size;
+        start_disp = d[i].start * offset[i] * elmt_size;
         new_extent = (MPI_Aint)elmt_size * max_xtent[i];
-        if(MPI_SUCCESS != (mpi_code = MPI_Type_get_extent(outer_type, &lb, &extent_len)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Type_get_extent(outer_type, &lb, &extent_len)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_get_extent failed", mpi_code)
 
         /*************************************************
-        *  Restructure this datatype ("outer_type")
-        *  so that it still starts at 0, but its extent
-        *  is the full extent in this dimension.
-        *************************************************/
-        if(start_disp > 0 || extent_len < new_extent) {
+         *  Restructure this datatype ("outer_type")
+         *  so that it still starts at 0, but its extent
+         *  is the full extent in this dimension.
+         *************************************************/
+        if (start_disp > 0 || extent_len < new_extent) {
             MPI_Datatype interm_type;
-            int block_len = 1;
+            int          block_len = 1;
 
             HDassert(0 == lb);
 
             mpi_code = MPI_Type_create_hindexed(1, &block_len, &start_disp, outer_type, &interm_type);
             MPI_Type_free(&outer_type);
-            if(mpi_code != MPI_SUCCESS)
+            if (mpi_code != MPI_SUCCESS)
                 HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_hindexed failed", mpi_code)
 
             mpi_code = MPI_Type_create_resized(interm_type, lb, new_extent, &inner_type);
             MPI_Type_free(&interm_type);
-            if(mpi_code != MPI_SUCCESS)
+            if (mpi_code != MPI_SUCCESS)
                 HMPI_GOTO_ERROR(FAIL, "couldn't resize MPI vector type", mpi_code)
         } /* end if */
         else
             inner_type = outer_type;
     } /* end for */
-/***************************
-*  End of loop, walking
-*  thru dimensions.
-***************************/
+      /***************************
+       *  End of loop, walking
+       *  thru dimensions.
+       ***************************/
 
     /* At this point inner_type is actually the outermost type, even for 0-trip loop */
     *new_type = inner_type;
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(new_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(new_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
 
     /* fill in the remaining return values */
-    *count = 1;			/* only have to move one of these suckers! */
+    *count           = 1; /* only have to move one of these suckers! */
     *is_derived_type = TRUE;
     HGOTO_DONE(SUCCEED);
 
 empty:
     /* special case: empty hyperslab */
-    *new_type = MPI_BYTE;
-    *count = 0;
+    *new_type        = MPI_BYTE;
+    *count           = 0;
     *is_derived_type = FALSE;
 
 done:
     /* Release selection iterator */
-    if(sel_iter_init)
-        if(H5S_SELECT_ITER_RELEASE(&sel_iter) < 0)
+    if (sel_iter_init)
+        if (H5S_SELECT_ITER_RELEASE(&sel_iter) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
 #ifdef H5S_DEBUG
-  if(H5DEBUG(S))
-    HDfprintf(H5DEBUG(S), "Leave %s, count=%ld  is_derived_type=%t\n",
-		FUNC, *count, *is_derived_type );
+    if (H5DEBUG(S))
+        HDfprintf(H5DEBUG(S), "Leave %s, count=%ld  is_derived_type=%t\n", FUNC, *count, *is_derived_type);
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_mpio_hyper_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_span_hyper_type
  *
@@ -750,15 +738,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_mpio_span_hyper_type(const H5S_t *space, size_t elmt_size,
-    MPI_Datatype *new_type, int *count, hbool_t *is_derived_type)
+H5S_mpio_span_hyper_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count,
+                         hbool_t *is_derived_type)
 {
-    MPI_Datatype  elmt_type;            /* MPI datatype for an element */
-    hbool_t elmt_type_is_derived = FALSE;       /* Whether the element type has been created */
-    MPI_Datatype  span_type;            /* MPI datatype for overall span tree */
-    hsize_t       down[H5S_MAX_RANK];   /* 'down' sizes for each dimension */
-    int           mpi_code;             /* MPI return code */
-    herr_t        ret_value = SUCCEED;  /* Return value */
+    MPI_Datatype elmt_type;                    /* MPI datatype for an element */
+    hbool_t      elmt_type_is_derived = FALSE; /* Whether the element type has been created */
+    MPI_Datatype span_type;                    /* MPI datatype for overall span tree */
+    hsize_t      down[H5S_MAX_RANK];           /* 'down' sizes for each dimension */
+    int          mpi_code;                     /* MPI return code */
+    herr_t       ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -769,35 +757,35 @@ H5S_mpio_span_hyper_type(const H5S_t *space, size_t elmt_size,
     HDassert(space->select.sel_info.hslab->span_lst->head);
 
     /* Create the base type for an element */
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_contiguous((int)elmt_size, MPI_BYTE, &elmt_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_contiguous((int)elmt_size, MPI_BYTE, &elmt_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
     elmt_type_is_derived = TRUE;
 
     /* Compute 'down' sizes for each dimension */
-    if(H5VM_array_down(space->extent.rank, space->extent.size, down) < 0)
+    if (H5VM_array_down(space->extent.rank, space->extent.size, down) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGETSIZE, FAIL, "couldn't compute 'down' dimension sizes")
 
     /* Obtain derived data type */
-    if(H5S_obtain_datatype(down, space->select.sel_info.hslab->span_lst->head, &elmt_type, &span_type, elmt_size) < 0)
+    if (H5S_obtain_datatype(down, space->select.sel_info.hslab->span_lst->head, &elmt_type, &span_type,
+                            elmt_size) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't obtain  MPI derived data type")
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&span_type)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(&span_type)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
     *new_type = span_type;
 
     /* fill in the remaining return values */
-    *count = 1;
+    *count           = 1;
     *is_derived_type = TRUE;
 
 done:
     /* Release resources */
-    if(elmt_type_is_derived)
-        if(MPI_SUCCESS != (mpi_code = MPI_Type_free(&elmt_type)))
+    if (elmt_type_is_derived)
+        if (MPI_SUCCESS != (mpi_code = MPI_Type_free(&elmt_type)))
             HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_mpio_span_hyper_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_obtain_datatype
  *
@@ -813,19 +801,19 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_obtain_datatype(const hsize_t *down, H5S_hyper_span_t *span,
-    const MPI_Datatype *elmt_type, MPI_Datatype *span_type, size_t elmt_size)
+H5S_obtain_datatype(const hsize_t *down, H5S_hyper_span_t *span, const MPI_Datatype *elmt_type,
+                    MPI_Datatype *span_type, size_t elmt_size)
 {
-    size_t                alloc_count;          /* Number of span tree nodes allocated at this level */
-    size_t                outercount;           /* Number of span tree nodes at this level */
-    MPI_Datatype          *inner_type = NULL;
-    hbool_t inner_types_freed = FALSE;          /* Whether the inner_type MPI datatypes have been freed */
-    hbool_t span_type_valid = FALSE;            /* Whether the span_type MPI datatypes is valid */
-    int                   *blocklen = NULL;
-    MPI_Aint              *disp = NULL;
-    H5S_hyper_span_t      *tspan;               /* Temporary pointer to span tree node */
-    int                   mpi_code;             /* MPI return status code */
-    herr_t                ret_value = SUCCEED;  /* Return value */
+    size_t            alloc_count; /* Number of span tree nodes allocated at this level */
+    size_t            outercount;  /* Number of span tree nodes at this level */
+    MPI_Datatype *    inner_type        = NULL;
+    hbool_t           inner_types_freed = FALSE; /* Whether the inner_type MPI datatypes have been freed */
+    hbool_t           span_type_valid   = FALSE; /* Whether the span_type MPI datatypes is valid */
+    int *             blocklen          = NULL;
+    MPI_Aint *        disp              = NULL;
+    H5S_hyper_span_t *tspan;               /* Temporary pointer to span tree node */
+    int               mpi_code;            /* MPI return status code */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -834,76 +822,79 @@ H5S_obtain_datatype(const hsize_t *down, H5S_hyper_span_t *span,
 
     /* Allocate the initial displacement & block length buffers */
     alloc_count = H5S_MPIO_INITIAL_ALLOC_COUNT;
-    if(NULL == (disp = (MPI_Aint *)H5MM_malloc(alloc_count * sizeof(MPI_Aint))))
+    if (NULL == (disp = (MPI_Aint *)H5MM_malloc(alloc_count * sizeof(MPI_Aint))))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of displacements")
-    if(NULL == (blocklen = (int *)H5MM_malloc(alloc_count * sizeof(int))))
+    if (NULL == (blocklen = (int *)H5MM_malloc(alloc_count * sizeof(int))))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of block lengths")
 
     /* if this is the fastest changing dimension, it is the base case for derived datatype. */
-    if(NULL == span->down) {
-        tspan = span;
+    if (NULL == span->down) {
+        tspan      = span;
         outercount = 0;
-        while(tspan) {
+        while (tspan) {
             /* Check if we need to increase the size of the buffers */
-            if(outercount >= alloc_count) {
-                MPI_Aint     *tmp_disp;         /* Temporary pointer to new displacement buffer */
-                int          *tmp_blocklen;     /* Temporary pointer to new block length buffer */
+            if (outercount >= alloc_count) {
+                MPI_Aint *tmp_disp;     /* Temporary pointer to new displacement buffer */
+                int *     tmp_blocklen; /* Temporary pointer to new block length buffer */
 
                 /* Double the allocation count */
                 alloc_count *= 2;
 
                 /* Re-allocate the buffers */
-                if(NULL == (tmp_disp = (MPI_Aint *)H5MM_realloc(disp, alloc_count * sizeof(MPI_Aint))))
+                if (NULL == (tmp_disp = (MPI_Aint *)H5MM_realloc(disp, alloc_count * sizeof(MPI_Aint))))
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of displacements")
                 disp = tmp_disp;
-                if(NULL == (tmp_blocklen = (int *)H5MM_realloc(blocklen, alloc_count * sizeof(int))))
+                if (NULL == (tmp_blocklen = (int *)H5MM_realloc(blocklen, alloc_count * sizeof(int))))
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of block lengths")
                 blocklen = tmp_blocklen;
             } /* end if */
 
             /* Store displacement & block length */
-            disp[outercount]      = (MPI_Aint)elmt_size * tspan->low;
+            disp[outercount] = (MPI_Aint)elmt_size * tspan->low;
             H5_CHECK_OVERFLOW(tspan->nelem, hsize_t, int)
-            blocklen[outercount]  = (int)tspan->nelem;
+            blocklen[outercount] = (int)tspan->nelem;
 
-            tspan                 = tspan->next;
+            tspan = tspan->next;
             outercount++;
         } /* end while */
 
-        if(MPI_SUCCESS != (mpi_code = MPI_Type_create_hindexed((int)outercount, blocklen, disp, *elmt_type, span_type)))
-              HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_hindexed failed", mpi_code)
+        if (MPI_SUCCESS !=
+            (mpi_code = MPI_Type_create_hindexed((int)outercount, blocklen, disp, *elmt_type, span_type)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_hindexed failed", mpi_code)
         span_type_valid = TRUE;
     } /* end if */
     else {
-        size_t u;               /* Local index variable */
+        size_t u; /* Local index variable */
 
-        if(NULL == (inner_type = (MPI_Datatype *)H5MM_malloc(alloc_count * sizeof(MPI_Datatype))))
+        if (NULL == (inner_type = (MPI_Datatype *)H5MM_malloc(alloc_count * sizeof(MPI_Datatype))))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of inner MPI datatypes")
 
-        tspan = span;
+        tspan      = span;
         outercount = 0;
-        while(tspan) {
-            MPI_Datatype down_type;     /* Temporary MPI datatype for a span tree node's children */
-            MPI_Aint stride;            /* Distance between inner MPI datatypes */
+        while (tspan) {
+            MPI_Datatype down_type; /* Temporary MPI datatype for a span tree node's children */
+            MPI_Aint     stride;    /* Distance between inner MPI datatypes */
 
             /* Check if we need to increase the size of the buffers */
-            if(outercount >= alloc_count) {
-                MPI_Aint     *tmp_disp;         /* Temporary pointer to new displacement buffer */
-                int          *tmp_blocklen;     /* Temporary pointer to new block length buffer */
-                MPI_Datatype *tmp_inner_type;   /* Temporary pointer to inner MPI datatype buffer */
+            if (outercount >= alloc_count) {
+                MPI_Aint *    tmp_disp;       /* Temporary pointer to new displacement buffer */
+                int *         tmp_blocklen;   /* Temporary pointer to new block length buffer */
+                MPI_Datatype *tmp_inner_type; /* Temporary pointer to inner MPI datatype buffer */
 
                 /* Double the allocation count */
                 alloc_count *= 2;
 
                 /* Re-allocate the buffers */
-                if(NULL == (tmp_disp = (MPI_Aint *)H5MM_realloc(disp, alloc_count * sizeof(MPI_Aint))))
+                if (NULL == (tmp_disp = (MPI_Aint *)H5MM_realloc(disp, alloc_count * sizeof(MPI_Aint))))
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of displacements")
                 disp = tmp_disp;
-                if(NULL == (tmp_blocklen = (int *)H5MM_realloc(blocklen, alloc_count * sizeof(int))))
+                if (NULL == (tmp_blocklen = (int *)H5MM_realloc(blocklen, alloc_count * sizeof(int))))
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of block lengths")
                 blocklen = tmp_blocklen;
-                if(NULL == (tmp_inner_type = (MPI_Datatype *)H5MM_realloc(inner_type, alloc_count * sizeof(MPI_Datatype))))
-                    HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate array of inner MPI datatypes")
+                if (NULL == (tmp_inner_type = (MPI_Datatype *)H5MM_realloc(
+                                 inner_type, alloc_count * sizeof(MPI_Datatype))))
+                    HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL,
+                                "can't allocate array of inner MPI datatypes")
                 inner_type = tmp_inner_type;
             } /* end if */
 
@@ -911,71 +902,72 @@ H5S_obtain_datatype(const hsize_t *down, H5S_hyper_span_t *span,
             /* First using MPI Type vector to build derived data type for this span only */
             /* Need to calculate the disp in byte for this dimension. */
             /* Calculate the total bytes of the lower dimension */
-            disp[outercount]      = tspan->low * (*down) * elmt_size;
-            blocklen[outercount]  = 1;
+            disp[outercount]     = tspan->low * (*down) * elmt_size;
+            blocklen[outercount] = 1;
 
             /* Generate MPI datatype for next dimension down */
-            if(H5S_obtain_datatype(down + 1, tspan->down->head, elmt_type, &down_type, elmt_size) < 0)
+            if (H5S_obtain_datatype(down + 1, tspan->down->head, elmt_type, &down_type, elmt_size) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't obtain  MPI derived data type")
 
             /* Build the MPI datatype for this node */
             stride = (*down) * elmt_size;
             H5_CHECK_OVERFLOW(tspan->nelem, hsize_t, int)
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_create_hvector((int)tspan->nelem, 1, stride, down_type, &inner_type[outercount]))) {
+            if (MPI_SUCCESS != (mpi_code = MPI_Type_create_hvector((int)tspan->nelem, 1, stride, down_type,
+                                                                   &inner_type[outercount]))) {
                 MPI_Type_free(&down_type);
                 HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_hvector failed", mpi_code)
             } /* end if */
 
             /* Release MPI datatype for next dimension down */
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_free(&down_type)))
+            if (MPI_SUCCESS != (mpi_code = MPI_Type_free(&down_type)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
 
             tspan = tspan->next;
             outercount++;
-         } /* end while */
+        } /* end while */
 
         /* building the whole vector datatype */
         H5_CHECK_OVERFLOW(outercount, size_t, int)
-        if(MPI_SUCCESS != (mpi_code = MPI_Type_create_struct((int)outercount, blocklen, disp, inner_type, span_type)))
+        if (MPI_SUCCESS !=
+            (mpi_code = MPI_Type_create_struct((int)outercount, blocklen, disp, inner_type, span_type)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_struct failed", mpi_code)
         span_type_valid = TRUE;
 
         /* Release inner node types */
-        for(u = 0; u < outercount; u++)
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_free(&inner_type[u])))
+        for (u = 0; u < outercount; u++)
+            if (MPI_SUCCESS != (mpi_code = MPI_Type_free(&inner_type[u])))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
         inner_types_freed = TRUE;
     } /* end else */
 
 done:
     /* General cleanup */
-    if(inner_type != NULL) {
-        if(!inner_types_freed) {
-            size_t u;          /* Local index variable */
+    if (inner_type != NULL) {
+        if (!inner_types_freed) {
+            size_t u; /* Local index variable */
 
-            for(u = 0; u < outercount; u++)
-                if(MPI_SUCCESS != (mpi_code = MPI_Type_free(&inner_type[u])))
+            for (u = 0; u < outercount; u++)
+                if (MPI_SUCCESS != (mpi_code = MPI_Type_free(&inner_type[u])))
                     HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
         } /* end if */
 
         H5MM_free(inner_type);
     } /* end if */
-    if(blocklen != NULL)
+    if (blocklen != NULL)
         H5MM_free(blocklen);
-    if(disp != NULL)
+    if (disp != NULL)
         H5MM_free(disp);
 
     /* Error cleanup */
-    if(ret_value < 0) {
-        if(span_type_valid)
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_free(span_type)))
+    if (ret_value < 0) {
+        if (span_type_valid)
+            if (MPI_SUCCESS != (mpi_code = MPI_Type_free(span_type)))
                 HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
     } /* end if */
 
-  FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_obtain_datatype() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_space_type
  *
@@ -994,11 +986,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_mpio_space_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, 
-    int *count, hbool_t *is_derived_type, hbool_t do_permute, hsize_t **permute_map,
-    hbool_t *is_permuted)
+H5S_mpio_space_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count,
+                    hbool_t *is_derived_type, hbool_t do_permute, hsize_t **permute_map, hbool_t *is_permuted)
 {
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1007,7 +998,7 @@ H5S_mpio_space_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type
     HDassert(elmt_size);
 
     /* Create MPI type based on the kind of selection */
-    switch(H5S_GET_EXTENT_TYPE(space)) {
+    switch (H5S_GET_EXTENT_TYPE(space)) {
         case H5S_NULL:
         case H5S_SCALAR:
         case H5S_SIMPLE:
@@ -1015,11 +1006,12 @@ H5S_mpio_space_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type
              * out-of-order point selection, then permute this selection which
              * should be a memory selection to match the file space permutation.
              */
-            if(TRUE == *is_permuted) { 
-                switch(H5S_GET_SELECT_TYPE(space)) {
+            if (TRUE == *is_permuted) {
+                switch (H5S_GET_SELECT_TYPE(space)) {
                     case H5S_SEL_NONE:
-                        if(H5S_mpio_none_type(new_type, count, is_derived_type) < 0)
-                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't convert 'none' selection to MPI type")
+                        if (H5S_mpio_none_type(new_type, count, is_derived_type) < 0)
+                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
+                                        "couldn't convert 'none' selection to MPI type")
                         break;
 
                     case H5S_SEL_ALL:
@@ -1028,8 +1020,10 @@ H5S_mpio_space_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type
                         /* Sanity check */
                         HDassert(!do_permute);
 
-                        if(H5S_mpio_permute_type(space, elmt_size, permute_map, new_type, count, is_derived_type) < 0)
-                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't convert 'all' selection to MPI type")
+                        if (H5S_mpio_permute_type(space, elmt_size, permute_map, new_type, count,
+                                                  is_derived_type) < 0)
+                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
+                                        "couldn't convert 'all' selection to MPI type")
                         break;
 
                     case H5S_SEL_ERROR:
@@ -1038,33 +1032,40 @@ H5S_mpio_space_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type
                         HDassert("unknown selection type" && 0);
                         break;
                 } /* end switch */
-            } /* end if */
+            }     /* end if */
             /* the file space is not permuted, so do a regular selection */
             else {
-                switch(H5S_GET_SELECT_TYPE(space)) {
+                switch (H5S_GET_SELECT_TYPE(space)) {
                     case H5S_SEL_NONE:
-                        if(H5S_mpio_none_type(new_type, count, is_derived_type) < 0)
-                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't convert 'none' selection to MPI type")
+                        if (H5S_mpio_none_type(new_type, count, is_derived_type) < 0)
+                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
+                                        "couldn't convert 'none' selection to MPI type")
                         break;
 
                     case H5S_SEL_ALL:
-                        if(H5S_mpio_all_type(space, elmt_size, new_type, count, is_derived_type) < 0)
-                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't convert 'all' selection to MPI type")
+                        if (H5S_mpio_all_type(space, elmt_size, new_type, count, is_derived_type) < 0)
+                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
+                                        "couldn't convert 'all' selection to MPI type")
                         break;
 
                     case H5S_SEL_POINTS:
-                        if(H5S_mpio_point_type(space, elmt_size, new_type, count, is_derived_type, do_permute, permute_map, is_permuted) < 0)
-                           HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't convert 'point' selection to MPI type")
+                        if (H5S_mpio_point_type(space, elmt_size, new_type, count, is_derived_type,
+                                                do_permute, permute_map, is_permuted) < 0)
+                            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
+                                        "couldn't convert 'point' selection to MPI type")
                         break;
 
                     case H5S_SEL_HYPERSLABS:
-                        if((H5S_SELECT_IS_REGULAR(space) == TRUE)) {
-                            if(H5S_mpio_hyper_type(space, elmt_size, new_type, count, is_derived_type) < 0)
-                                HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't convert regular 'hyperslab' selection to MPI type")
+                        if ((H5S_SELECT_IS_REGULAR(space) == TRUE)) {
+                            if (H5S_mpio_hyper_type(space, elmt_size, new_type, count, is_derived_type) < 0)
+                                HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
+                                            "couldn't convert regular 'hyperslab' selection to MPI type")
                         } /* end if */
                         else {
-                            if(H5S_mpio_span_hyper_type(space, elmt_size, new_type, count, is_derived_type) < 0)
-                                HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't convert irregular 'hyperslab' selection to MPI type")
+                            if (H5S_mpio_span_hyper_type(space, elmt_size, new_type, count, is_derived_type) <
+                                0)
+                                HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
+                                            "couldn't convert irregular 'hyperslab' selection to MPI type")
                         } /* end else */
                         break;
 
@@ -1074,7 +1075,7 @@ H5S_mpio_space_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type
                         HDassert("unknown selection type" && 0);
                         break;
                 } /* end switch */
-            } /* end else */
+            }     /* end else */
             break;
 
         case H5S_NO_CLASS:
@@ -1086,5 +1087,4 @@ H5S_mpio_space_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_mpio_space_type() */
-#endif  /* H5_HAVE_PARALLEL */
-
+#endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5Snone.c b/src/H5Snone.c
index ed20467..354a9e3 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -18,8 +18,7 @@
  * Purpose:	"None" selection data space I/O functions.
  */
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
-
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
 
 #include "H5private.h"
 #include "H5Eprivate.h"
@@ -31,33 +30,32 @@
 /* Static function prototypes */
 
 /* Selection callbacks */
-static herr_t H5S_none_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
-static herr_t H5S_none_get_seq_list(const H5S_t *space, unsigned flags,
-    H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,
-    size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
-static herr_t H5S_none_release(H5S_t *space);
-static htri_t H5S_none_is_valid(const H5S_t *space);
+static herr_t   H5S_none_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
+static herr_t   H5S_none_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t maxseq,
+                                      size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
+static herr_t   H5S_none_release(H5S_t *space);
+static htri_t   H5S_none_is_valid(const H5S_t *space);
 static hssize_t H5S_none_serial_size(const H5S_t *space);
-static herr_t H5S_none_serialize(const H5S_t *space, uint8_t *buf);
-static herr_t H5S_none_deserialize(H5S_t *space, const uint8_t *buf);
-static herr_t H5S_none_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
-static herr_t H5S_none_offset(const H5S_t *space, hsize_t *off);
-static htri_t H5S_none_is_contiguous(const H5S_t *space);
-static htri_t H5S_none_is_single(const H5S_t *space);
-static htri_t H5S_none_is_regular(const H5S_t *space);
-static herr_t H5S_none_adjust_u(H5S_t *space, const hsize_t *offset);
-static herr_t H5S_none_project_scalar(const H5S_t *space, hsize_t *offset);
-static herr_t H5S_none_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
-static herr_t H5S_none_iter_init(H5S_sel_iter_t *iter, const H5S_t *space);
+static herr_t   H5S_none_serialize(const H5S_t *space, uint8_t *buf);
+static herr_t   H5S_none_deserialize(H5S_t *space, const uint8_t *buf);
+static herr_t   H5S_none_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+static herr_t   H5S_none_offset(const H5S_t *space, hsize_t *off);
+static htri_t   H5S_none_is_contiguous(const H5S_t *space);
+static htri_t   H5S_none_is_single(const H5S_t *space);
+static htri_t   H5S_none_is_regular(const H5S_t *space);
+static herr_t   H5S_none_adjust_u(H5S_t *space, const hsize_t *offset);
+static herr_t   H5S_none_project_scalar(const H5S_t *space, hsize_t *offset);
+static herr_t   H5S_none_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
+static herr_t   H5S_none_iter_init(H5S_sel_iter_t *iter, const H5S_t *space);
 
 /* Selection iteration callbacks */
-static herr_t H5S_none_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords);
-static herr_t H5S_none_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
+static herr_t  H5S_none_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords);
+static herr_t  H5S_none_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
 static hsize_t H5S_none_iter_nelmts(const H5S_sel_iter_t *iter);
-static htri_t H5S_none_iter_has_next_block(const H5S_sel_iter_t *iter);
-static herr_t H5S_none_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
-static herr_t H5S_none_iter_next_block(H5S_sel_iter_t *sel_iter);
-static herr_t H5S_none_iter_release(H5S_sel_iter_t *sel_iter);
+static htri_t  H5S_none_iter_has_next_block(const H5S_sel_iter_t *iter);
+static herr_t  H5S_none_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
+static herr_t  H5S_none_iter_next_block(H5S_sel_iter_t *sel_iter);
+static herr_t  H5S_none_iter_release(H5S_sel_iter_t *sel_iter);
 
 /* Selection properties for "none" selections */
 const H5S_select_class_t H5S_sel_none[1] = {{
@@ -96,7 +94,6 @@ static const H5S_sel_iter_class_t H5S_sel_iter_none[1] = {{
     H5S_none_iter_release,
 }};
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_none_iter_init
  *
@@ -117,16 +114,15 @@ H5S_none_iter_init(H5S_sel_iter_t *iter, const H5S_t H5_ATTR_UNUSED *space)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert(space && H5S_SEL_NONE==H5S_GET_SELECT_TYPE(space));
+    HDassert(space && H5S_SEL_NONE == H5S_GET_SELECT_TYPE(space));
     HDassert(iter);
 
     /* Initialize type of selection iterator */
     iter->type = H5S_sel_iter_none;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_none_iter_init() */
+} /* H5S_none_iter_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_none_iter_coords
  *
@@ -152,9 +148,8 @@ H5S_none_iter_coords(const H5S_sel_iter_t H5_ATTR_UNUSED *iter, hsize_t H5_ATTR_
     HDassert(coords);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5S_none_iter_coords() */
+} /* H5S_none_iter_coords() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_none_iter_block
  *
@@ -171,7 +166,8 @@ H5S_none_iter_coords(const H5S_sel_iter_t H5_ATTR_UNUSED *iter, hsize_t H5_ATTR_
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_none_iter_block(const H5S_sel_iter_t H5_ATTR_UNUSED *iter, hsize_t H5_ATTR_UNUSED *start, hsize_t H5_ATTR_UNUSED *end)
+H5S_none_iter_block(const H5S_sel_iter_t H5_ATTR_UNUSED *iter, hsize_t H5_ATTR_UNUSED *start,
+                    hsize_t H5_ATTR_UNUSED *end)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -181,9 +177,8 @@ H5S_none_iter_block(const H5S_sel_iter_t H5_ATTR_UNUSED *iter, hsize_t H5_ATTR_U
     HDassert(end);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5S_none_iter_block() */
+} /* H5S_none_iter_block() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_none_iter_nelmts
  *
@@ -207,9 +202,8 @@ H5S_none_iter_nelmts(const H5S_sel_iter_t H5_ATTR_UNUSED *iter)
     HDassert(iter);
 
     FUNC_LEAVE_NOAPI(0)
-}   /* H5S_none_iter_nelmts() */
+} /* H5S_none_iter_nelmts() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_iter_has_next_block
@@ -236,9 +230,8 @@ H5S_none_iter_has_next_block(const H5S_sel_iter_t H5_ATTR_UNUSED *iter)
     HDassert(iter);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5S_none_iter_has_next_block() */
+} /* H5S_none_iter_has_next_block() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_iter_next
@@ -264,12 +257,11 @@ H5S_none_iter_next(H5S_sel_iter_t H5_ATTR_UNUSED *iter, size_t H5_ATTR_UNUSED ne
 
     /* Check args */
     HDassert(iter);
-    HDassert(nelem>0);
+    HDassert(nelem > 0);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_none_iter_next() */
+} /* H5S_none_iter_next() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_iter_next_block
@@ -296,9 +288,8 @@ H5S_none_iter_next_block(H5S_sel_iter_t H5_ATTR_UNUSED *iter)
     HDassert(iter);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5S_none_iter_next_block() */
+} /* H5S_none_iter_next_block() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_iter_release
@@ -317,7 +308,7 @@ H5S_none_iter_next_block(H5S_sel_iter_t H5_ATTR_UNUSED *iter)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_none_iter_release(H5S_sel_iter_t H5_ATTR_UNUSED * iter)
+H5S_none_iter_release(H5S_sel_iter_t H5_ATTR_UNUSED *iter)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -325,9 +316,8 @@ H5S_none_iter_release(H5S_sel_iter_t H5_ATTR_UNUSED * iter)
     HDassert(iter);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_none_iter_release() */
+} /* H5S_none_iter_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_release
@@ -346,7 +336,7 @@ H5S_none_iter_release(H5S_sel_iter_t H5_ATTR_UNUSED * iter)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_none_release(H5S_t H5_ATTR_UNUSED * space)
+H5S_none_release(H5S_t H5_ATTR_UNUSED *space)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -354,9 +344,8 @@ H5S_none_release(H5S_t H5_ATTR_UNUSED * space)
     HDassert(space);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_none_release() */
+} /* H5S_none_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_copy
@@ -390,7 +379,6 @@ H5S_none_copy(H5S_t *dst, const H5S_t H5_ATTR_UNUSED *src, hbool_t H5_ATTR_UNUSE
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S_none_copy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_is_valid
@@ -421,7 +409,6 @@ H5S_none_is_valid(const H5S_t H5_ATTR_UNUSED *space)
     FUNC_LEAVE_NOAPI(TRUE)
 } /* end H5S_none_is_valid() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_serial_size
@@ -455,7 +442,6 @@ H5S_none_serial_size(const H5S_t H5_ATTR_UNUSED *space)
     FUNC_LEAVE_NOAPI(16)
 } /* end H5S_none_serial_size() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_serialize
@@ -483,15 +469,14 @@ H5S_none_serialize(const H5S_t *space, uint8_t *buf)
     HDassert(space);
 
     /* Store the preamble information */
-    UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space));  /* Store the type of selection */
-    UINT32ENCODE(buf, (uint32_t)H5S_NONE_VERSION_1);  /* Store the version number */
-    UINT32ENCODE(buf, (uint32_t)0);  /* Store the un-used padding */
-    UINT32ENCODE(buf, (uint32_t)0);  /* Store the additional information length */
+    UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */
+    UINT32ENCODE(buf, (uint32_t)H5S_NONE_VERSION_1);         /* Store the version number */
+    UINT32ENCODE(buf, (uint32_t)0);                          /* Store the un-used padding */
+    UINT32ENCODE(buf, (uint32_t)0);                          /* Store the additional information length */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_none_serialize() */
+} /* H5S_none_serialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_deserialize
@@ -514,9 +499,9 @@ H5S_none_serialize(const H5S_t *space, uint8_t *buf)
 static herr_t
 H5S_none_deserialize(H5S_t *space, const uint8_t *buf)
 {
-    uint8_t *p;                 /* Temporary pointer to buf */
-    uint32_t version;           /* Version number */
-    herr_t ret_value = SUCCEED;  /* return value */
+    uint8_t *p;                   /* Temporary pointer to buf */
+    uint32_t version;             /* Version number */
+    herr_t   ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -527,18 +512,17 @@ H5S_none_deserialize(H5S_t *space, const uint8_t *buf)
     /* Decode version */
     UINT32DECODE(p, version);
 
-    if(version < H5S_NONE_VERSION_1 || version > H5S_NONE_VERSION_LATEST)
+    if (version < H5S_NONE_VERSION_1 || version > H5S_NONE_VERSION_LATEST)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "bad version number for none selection")
 
     /* Change to "none" selection */
-    if(H5S_select_none(space) < 0)
+    if (H5S_select_none(space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_none_deserialize() */
+} /* H5S_none_deserialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_bounds
@@ -574,9 +558,8 @@ H5S_none_bounds(const H5S_t H5_ATTR_UNUSED *space, hsize_t H5_ATTR_UNUSED *start
     HDassert(end);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5Sget_none_bounds() */
+} /* H5Sget_none_bounds() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_offset
@@ -606,9 +589,8 @@ H5S_none_offset(const H5S_t H5_ATTR_UNUSED *space, hsize_t H5_ATTR_UNUSED *offse
     HDassert(offset);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5S_none_offset() */
+} /* H5S_none_offset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_is_contiguous
@@ -635,9 +617,8 @@ H5S_none_is_contiguous(const H5S_t H5_ATTR_UNUSED *space)
     HDassert(space);
 
     FUNC_LEAVE_NOAPI(FALSE)
-}   /* H5S_none_is_contiguous() */
+} /* H5S_none_is_contiguous() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_is_single
@@ -664,9 +645,8 @@ H5S_none_is_single(const H5S_t H5_ATTR_UNUSED *space)
     HDassert(space);
 
     FUNC_LEAVE_NOAPI(FALSE)
-}   /* H5S_none_is_single() */
+} /* H5S_none_is_single() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_is_regular
@@ -695,9 +675,8 @@ H5S_none_is_regular(const H5S_t H5_ATTR_UNUSED *space)
     HDassert(space);
 
     FUNC_LEAVE_NOAPI(TRUE)
-}   /* H5S_none_is_regular() */
+} /* H5S_none_is_regular() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_adjust_u
@@ -726,9 +705,8 @@ H5S_none_adjust_u(H5S_t H5_ATTR_UNUSED *space, const hsize_t H5_ATTR_UNUSED *off
     HDassert(offset);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5S_none_adjust_u() */
+} /* H5S_none_adjust_u() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_none_project_scalar
  *
@@ -751,9 +729,8 @@ H5S_none_project_scalar(const H5S_t H5_ATTR_UNUSED *space, hsize_t H5_ATTR_UNUSE
     HDassert(offset);
 
     FUNC_LEAVE_NOAPI(FAIL)
-}   /* H5S_none_project_scalar() */
+} /* H5S_none_project_scalar() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_none_project_simple
  *
@@ -770,7 +747,7 @@ H5S_none_project_scalar(const H5S_t H5_ATTR_UNUSED *space, hsize_t H5_ATTR_UNUSE
 static herr_t
 H5S_none_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offset)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -780,14 +757,13 @@ H5S_none_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offs
     HDassert(offset);
 
     /* Select the entire new space */
-    if(H5S_select_none(new_space) < 0)
+    if (H5S_select_none(new_space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "unable to set none selection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_none_project_simple() */
+} /* H5S_none_project_simple() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_none
@@ -808,7 +784,7 @@ done:
 herr_t
 H5S_select_none(H5S_t *space)
 {
-    herr_t ret_value = SUCCEED;  /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -816,7 +792,7 @@ H5S_select_none(H5S_t *space)
     HDassert(space);
 
     /* Remove current selection first */
-    if(H5S_SELECT_RELEASE(space) < 0)
+    if (H5S_SELECT_RELEASE(space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release hyperslab")
 
     /* Set number of elements in selection */
@@ -827,9 +803,8 @@ H5S_select_none(H5S_t *space)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_none() */
+} /* H5S_select_none() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sselect_none
@@ -850,25 +825,24 @@ done:
 herr_t
 H5Sselect_none(hid_t spaceid)
 {
-    H5S_t *space;                       /* Dataspace to modify selection of */
-    herr_t ret_value = SUCCEED;         /* return value */
+    H5S_t *space;               /* Dataspace to modify selection of */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", spaceid);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
     /* Change to "none" selection */
-    if(H5S_select_none(space) < 0)
+    if (H5S_select_none(space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sselect_none() */
+} /* H5Sselect_none() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_none_get_seq_list
@@ -901,9 +875,10 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_none_get_seq_list(const H5S_t H5_ATTR_UNUSED *space, unsigned H5_ATTR_UNUSED flags, H5S_sel_iter_t H5_ATTR_UNUSED *iter,
-    size_t H5_ATTR_UNUSED maxseq, size_t H5_ATTR_UNUSED maxelem, size_t *nseq, size_t *nelem,
-    hsize_t H5_ATTR_UNUSED *off, size_t H5_ATTR_UNUSED *len)
+H5S_none_get_seq_list(const H5S_t H5_ATTR_UNUSED *space, unsigned H5_ATTR_UNUSED flags,
+                      H5S_sel_iter_t H5_ATTR_UNUSED *iter, size_t H5_ATTR_UNUSED maxseq,
+                      size_t H5_ATTR_UNUSED maxelem, size_t *nseq, size_t *nelem, hsize_t H5_ATTR_UNUSED *off,
+                      size_t H5_ATTR_UNUSED *len)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -925,4 +900,3 @@ H5S_none_get_seq_list(const H5S_t H5_ATTR_UNUSED *space, unsigned H5_ATTR_UNUSED
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S_none_get_seq_list() */
-
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 3dc7780..c5785f5 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -29,56 +29,56 @@
 #include "H5Sprivate.h"
 
 /* Flags to indicate special dataspace features are active */
-#define H5S_VALID_MAX	0x01
-#define H5S_VALID_PERM	0x02
+#define H5S_VALID_MAX  0x01
+#define H5S_VALID_PERM 0x02
 
 /* Version for hyperslab selection info */
-#define H5S_HYPER_VERSION_1         1
-#define H5S_HYPER_VERSION_LATEST    H5S_HYPER_VERSION_1
+#define H5S_HYPER_VERSION_1      1
+#define H5S_HYPER_VERSION_LATEST H5S_HYPER_VERSION_1
 
 /* Version for point selection info */
-#define H5S_POINT_VERSION_1         1
-#define H5S_POINT_VERSION_LATEST    H5S_HYPER_VERSION_1
+#define H5S_POINT_VERSION_1      1
+#define H5S_POINT_VERSION_LATEST H5S_HYPER_VERSION_1
 
 /* Versions for H5S_SEL_NONE selection info */
-#define H5S_NONE_VERSION_1          1
-#define H5S_NONE_VERSION_LATEST     H5S_NONE_VERSION_1
+#define H5S_NONE_VERSION_1      1
+#define H5S_NONE_VERSION_LATEST H5S_NONE_VERSION_1
 
 /* Versions for H5S_SEL_ALL selection info */
-#define H5S_ALL_VERSION_1           1
-#define H5S_ALL_VERSION_LATEST      H5S_ALL_VERSION_1
+#define H5S_ALL_VERSION_1      1
+#define H5S_ALL_VERSION_LATEST H5S_ALL_VERSION_1
 
 /* Initial version of the dataspace information */
-#define H5O_SDSPACE_VERSION_1	1
+#define H5O_SDSPACE_VERSION_1 1
 
 /* This version adds support for "null" dataspaces, encodes the type of the
  *      dataspace in the message and eliminated the rest of the "reserved"
  *      bytes.
  */
-#define H5O_SDSPACE_VERSION_2	2
+#define H5O_SDSPACE_VERSION_2 2
 
 /* The latest version of the format.  Look through the 'encode'
  *      and 'size' callbacks for places to change when updating this. */
 #define H5O_SDSPACE_VERSION_LATEST H5O_SDSPACE_VERSION_2
 
 /* Maximum values for uint16_t and uint32_t */
-#define H5S_UINT16_MAX      65535       /* 2^16 - 1 */
-#define H5S_UINT32_MAX      4294967295  /* 2^32 - 1 */
+#define H5S_UINT16_MAX 65535      /* 2^16 - 1 */
+#define H5S_UINT32_MAX 4294967295 /* 2^32 - 1 */
 
 /*
  * Dataspace extent information
  */
 /* Extent container */
 struct H5S_extent_t {
-    H5O_shared_t sh_loc;        /* Shared message info (must be first) */
+    H5O_shared_t sh_loc; /* Shared message info (must be first) */
 
-    H5S_class_t	type;           /* Type of extent */
-    unsigned version;           /* Version of object header message to encode this object with */
-    hsize_t nelem;              /* Number of elements in extent */
+    H5S_class_t type;    /* Type of extent */
+    unsigned    version; /* Version of object header message to encode this object with */
+    hsize_t     nelem;   /* Number of elements in extent */
 
-    unsigned rank;              /* Number of dimensions */
-    hsize_t *size;              /* Current size of the dimensions */
-    hsize_t *max;               /* Maximum size of the dimensions */
+    unsigned rank; /* Number of dimensions */
+    hsize_t *size; /* Current size of the dimensions */
+    hsize_t *max;  /* Maximum size of the dimensions */
 };
 
 /*
@@ -86,49 +86,49 @@ struct H5S_extent_t {
  */
 /* Node in point selection list (typedef'd in H5Sprivate.h) */
 struct H5S_pnt_node_t {
-    hsize_t *pnt;          /* Pointer to a selected point */
-    struct H5S_pnt_node_t *next;  /* pointer to next point in list */
+    hsize_t *              pnt;  /* Pointer to a selected point */
+    struct H5S_pnt_node_t *next; /* pointer to next point in list */
 };
 
 /* Information about point selection list */
 typedef struct {
-    H5S_pnt_node_t *head;   /* Pointer to head of point list */
+    H5S_pnt_node_t *head; /* Pointer to head of point list */
 } H5S_pnt_list_t;
 
 /* Information about new-style hyperslab spans */
 
 /* Information a particular hyperslab span */
 struct H5S_hyper_span_t {
-    hsize_t low, high;          /* Low & high bounds of span */
-    hsize_t nelem;              /* Number of elements in span (only needed during I/O) */
-    hsize_t pstride;            /* Pseudo-stride from start of previous span (only used during I/O) */
-    struct H5S_hyper_span_info_t *down;     /* Pointer to list of spans in next dimension down */
-    struct H5S_hyper_span_t *next;     /* Pointer to next span in list */
+    hsize_t low, high;                  /* Low & high bounds of span */
+    hsize_t nelem;                      /* Number of elements in span (only needed during I/O) */
+    hsize_t pstride;                    /* Pseudo-stride from start of previous span (only used during I/O) */
+    struct H5S_hyper_span_info_t *down; /* Pointer to list of spans in next dimension down */
+    struct H5S_hyper_span_t *     next; /* Pointer to next span in list */
 };
 
 /* Information about a list of hyperslab spans */
 struct H5S_hyper_span_info_t {
-    unsigned count;                    /* Ref. count of number of spans which share this span */
-    struct H5S_hyper_span_info_t *scratch;  /* Scratch pointer
-                                             * (used during copies, as mark
-                                             * during precomputes for I/O &
-                                             * to point to the last span in a
-                                             * list during single element adds)
-                                             */
-    struct H5S_hyper_span_t *head;  /* Pointer to list of spans in next dimension down */
+    unsigned                      count;   /* Ref. count of number of spans which share this span */
+    struct H5S_hyper_span_info_t *scratch; /* Scratch pointer
+                                            * (used during copies, as mark
+                                            * during precomputes for I/O &
+                                            * to point to the last span in a
+                                            * list during single element adds)
+                                            */
+    struct H5S_hyper_span_t *head;         /* Pointer to list of spans in next dimension down */
 };
 
 /* Information about new-style hyperslab selection */
 typedef struct {
-    hbool_t diminfo_valid;                      /* Whether the dataset has valid diminfo */
-    H5S_hyper_dim_t opt_diminfo[H5S_MAX_RANK];  /* per-dim selection info */
-    H5S_hyper_dim_t app_diminfo[H5S_MAX_RANK];  /* per-dim selection info */
-	/* 'opt_diminfo' points to a [potentially] optimized version of the user's
-         * hyperslab information.  'app_diminfo' points to the actual parameters
-         * that the application used for setting the hyperslab selection.  These
-         * are only used for re-gurgitating the original values used to set the
-         * hyperslab to the application when it queries the hyperslab selection
-         * information. */
+    hbool_t         diminfo_valid;             /* Whether the dataset has valid diminfo */
+    H5S_hyper_dim_t opt_diminfo[H5S_MAX_RANK]; /* per-dim selection info */
+    H5S_hyper_dim_t app_diminfo[H5S_MAX_RANK]; /* per-dim selection info */
+    /* 'opt_diminfo' points to a [potentially] optimized version of the user's
+     * hyperslab information.  'app_diminfo' points to the actual parameters
+     * that the application used for setting the hyperslab selection.  These
+     * are only used for re-gurgitating the original values used to set the
+     * hyperslab to the application when it queries the hyperslab selection
+     * information. */
     H5S_hyper_span_info_t *span_lst; /* List of hyperslab span information */
 } H5S_hyper_sel_t;
 
@@ -136,9 +136,9 @@ typedef struct {
 /* Method to copy a selection */
 typedef herr_t (*H5S_sel_copy_func_t)(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
 /* Method to retrieve a list of offset/length sequences for selection */
-typedef herr_t (*H5S_sel_get_seq_list_func_t)(const H5S_t *space, unsigned flags,
-    H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,
-    size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
+typedef herr_t (*H5S_sel_get_seq_list_func_t)(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter,
+                                              size_t maxseq, size_t maxbytes, size_t *nseq, size_t *nbytes,
+                                              hsize_t *off, size_t *len);
 /* Method to release current selection */
 typedef herr_t (*H5S_sel_release_func_t)(H5S_t *space);
 /* Method to determine if current selection is valid for dataspace */
@@ -170,43 +170,49 @@ typedef herr_t (*H5S_sel_iter_init_func_t)(H5S_sel_iter_t *sel_iter, const H5S_t
 
 /* Selection class information */
 typedef struct {
-    H5S_sel_type type;                          /* Type of selection (all, none, points or hyperslab) */
+    H5S_sel_type type; /* Type of selection (all, none, points or hyperslab) */
 
     /* Methods */
-    H5S_sel_copy_func_t copy;                   /* Method to make a copy of a selection */
-    H5S_sel_get_seq_list_func_t get_seq_list;   /* Method to retrieve a list of offset/length sequences for selection */
-    H5S_sel_release_func_t release;             /* Method to release current selection */
-    H5S_sel_is_valid_func_t is_valid;           /* Method to determine if current selection is valid for dataspace */
-    H5S_sel_serial_size_func_t serial_size;     /* Method to determine number of bytes required to store current selection */
-    H5S_sel_serialize_func_t serialize;         /* Method to store current selection in "serialized" form (a byte sequence suitable for storing on disk) */
-    H5S_sel_deserialize_func_t deserialize;     /* Method to store create selection from "serialized" form (a byte sequence suitable for storing on disk) */
-    H5S_sel_bounds_func_t bounds;               /* Method to determine to smallest n-D bounding box containing the current selection */
-    H5S_sel_offset_func_t offset;               /* Method to determine linear offset of initial element in selection within dataspace */
+    H5S_sel_copy_func_t copy; /* Method to make a copy of a selection */
+    H5S_sel_get_seq_list_func_t
+                            get_seq_list; /* Method to retrieve a list of offset/length sequences for selection */
+    H5S_sel_release_func_t  release;      /* Method to release current selection */
+    H5S_sel_is_valid_func_t is_valid; /* Method to determine if current selection is valid for dataspace */
+    H5S_sel_serial_size_func_t
+                             serial_size; /* Method to determine number of bytes required to store current selection */
+    H5S_sel_serialize_func_t serialize;     /* Method to store current selection in "serialized" form (a byte
+                                               sequence suitable for storing on disk) */
+    H5S_sel_deserialize_func_t deserialize; /* Method to store create selection from "serialized" form (a byte
+                                               sequence suitable for storing on disk) */
+    H5S_sel_bounds_func_t
+        bounds; /* Method to determine to smallest n-D bounding box containing the current selection */
+    H5S_sel_offset_func_t
+                                 offset; /* Method to determine linear offset of initial element in selection within dataspace */
     H5S_sel_is_contiguous_func_t is_contiguous; /* Method to determine if current selection is contiguous */
-    H5S_sel_is_single_func_t is_single;         /* Method to determine if current selection is a single block */
-    H5S_sel_is_regular_func_t is_regular;       /* Method to determine if current selection is "regular" */
-    H5S_sel_adjust_u_func_t adjust_u;           /* Method to adjust a selection by an offset */
-    H5S_sel_project_scalar project_scalar;      /* Method to construct scalar dataspace projection */
-    H5S_sel_project_simple project_simple;      /* Method to construct simple dataspace projection */
-    H5S_sel_iter_init_func_t iter_init;         /* Method to initialize iterator for current selection */
+    H5S_sel_is_single_func_t     is_single;  /* Method to determine if current selection is a single block */
+    H5S_sel_is_regular_func_t    is_regular; /* Method to determine if current selection is "regular" */
+    H5S_sel_adjust_u_func_t      adjust_u;   /* Method to adjust a selection by an offset */
+    H5S_sel_project_scalar       project_scalar; /* Method to construct scalar dataspace projection */
+    H5S_sel_project_simple       project_simple; /* Method to construct simple dataspace projection */
+    H5S_sel_iter_init_func_t     iter_init;      /* Method to initialize iterator for current selection */
 } H5S_select_class_t;
 
 /* Selection information object */
 typedef struct {
-    const H5S_select_class_t *type;     /* Pointer to selection's class info */
-    hbool_t offset_changed;             /* Indicate that the offset for the selection has been changed */
-    hssize_t offset[H5S_MAX_RANK];      /* Offset within the extent */
-    hsize_t num_elem;   /* Number of elements in selection */
+    const H5S_select_class_t *type; /* Pointer to selection's class info */
+    hbool_t  offset_changed;        /* Indicate that the offset for the selection has been changed */
+    hssize_t offset[H5S_MAX_RANK];  /* Offset within the extent */
+    hsize_t  num_elem;              /* Number of elements in selection */
     union {
-        H5S_pnt_list_t *pnt_lst; /* List of selected points (order is important) */
-        H5S_hyper_sel_t *hslab;  /* Info about hyperslab selections */
+        H5S_pnt_list_t * pnt_lst; /* List of selected points (order is important) */
+        H5S_hyper_sel_t *hslab;   /* Info about hyperslab selections */
     } sel_info;
 } H5S_select_t;
 
 /* Main dataspace structure (typedef'd in H5Sprivate.h) */
 struct H5S_t {
-    H5S_extent_t extent;                /* Dataspace extent (must stay first) */
-    H5S_select_t select;		/* Dataspace selection */
+    H5S_extent_t extent; /* Dataspace extent (must stay first) */
+    H5S_select_t select; /* Dataspace selection */
 };
 
 /* Selection iteration methods */
@@ -227,16 +233,22 @@ typedef herr_t (*H5S_sel_iter_release_func_t)(H5S_sel_iter_t *iter);
 
 /* Selection iteration class */
 typedef struct H5S_sel_iter_class_t {
-    H5S_sel_type type;                          /* Type of selection (all, none, points or hyperslab) */
+    H5S_sel_type type; /* Type of selection (all, none, points or hyperslab) */
 
     /* Methods on selections */
-    H5S_sel_iter_coords_func_t iter_coords;     /* Method to retrieve the current coordinates of iterator for current selection */
-    H5S_sel_iter_block_func_t iter_block;       /* Method to retrieve the current block of iterator for current selection */
-    H5S_sel_iter_nelmts_func_t iter_nelmts;     /* Method to determine number of elements left in iterator for current selection */
-    H5S_sel_iter_has_next_block_func_t iter_has_next_block;         /* Method to query if there is another block left in the selection */
-    H5S_sel_iter_next_func_t iter_next;         /* Method to move selection iterator to the next element in the selection */
-    H5S_sel_iter_next_block_func_t iter_next_block;     /* Method to move selection iterator to the next block in the selection */
-    H5S_sel_iter_release_func_t iter_release;   /* Method to release iterator for current selection */
+    H5S_sel_iter_coords_func_t
+        iter_coords; /* Method to retrieve the current coordinates of iterator for current selection */
+    H5S_sel_iter_block_func_t
+        iter_block; /* Method to retrieve the current block of iterator for current selection */
+    H5S_sel_iter_nelmts_func_t
+        iter_nelmts; /* Method to determine number of elements left in iterator for current selection */
+    H5S_sel_iter_has_next_block_func_t
+        iter_has_next_block; /* Method to query if there is another block left in the selection */
+    H5S_sel_iter_next_func_t
+        iter_next; /* Method to move selection iterator to the next element in the selection */
+    H5S_sel_iter_next_block_func_t
+                                iter_next_block; /* Method to move selection iterator to the next block in the selection */
+    H5S_sel_iter_release_func_t iter_release; /* Method to release iterator for current selection */
 } H5S_sel_iter_class_t;
 
 /*
@@ -261,8 +273,7 @@ H5_DLLVAR const H5S_select_class_t H5S_sel_point[1];
 
 /* Extent functions */
 H5_DLL herr_t H5S_extent_release(H5S_extent_t *extent);
-H5_DLL herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src,
-    hbool_t copy_max);
+H5_DLL herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src, hbool_t copy_max);
 
 /* Operations on selections */
 
@@ -273,4 +284,3 @@ H5_DLL htri_t H5S_get_rebuild_status_test(hid_t space_id);
 #endif /* H5S_TESTING */
 
 #endif /*_H5Spkg_H*/
-
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 59430bb..8364bde 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -18,47 +18,46 @@
  * Purpose:	Point selection data space I/O functions.
  */
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
 
-
-#include "H5private.h"		/* Generic Functions			  */
-#include "H5Eprivate.h"		/* Error handling		  */
-#include "H5FLprivate.h"	/* Free Lists	  */
-#include "H5Iprivate.h"		/* ID Functions		  */
-#include "H5MMprivate.h"	/* Memory Management functions		  */
-#include "H5Spkg.h"		/* Dataspace functions			  */
-#include "H5VMprivate.h"         /* Vector functions */
+#include "H5private.h"   /* Generic Functions			  */
+#include "H5Eprivate.h"  /* Error handling		  */
+#include "H5FLprivate.h" /* Free Lists	  */
+#include "H5Iprivate.h"  /* ID Functions		  */
+#include "H5MMprivate.h" /* Memory Management functions		  */
+#include "H5Spkg.h"      /* Dataspace functions			  */
+#include "H5VMprivate.h" /* Vector functions */
 
 /* Static function prototypes */
 
 /* Selection callbacks */
 static herr_t H5S_point_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
-static herr_t H5S_point_get_seq_list(const H5S_t *space, unsigned flags,
-    H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,
-    size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
+static herr_t H5S_point_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t maxseq,
+                                     size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off,
+                                     size_t *len);
 static herr_t H5S_point_release(H5S_t *space);
 static htri_t H5S_point_is_valid(const H5S_t *space);
 static hssize_t H5S_point_serial_size(const H5S_t *space);
-static herr_t H5S_point_serialize(const H5S_t *space, uint8_t *buf);
-static herr_t H5S_point_deserialize(H5S_t *space, const uint8_t *buf);
-static herr_t H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
-static herr_t H5S_point_offset(const H5S_t *space, hsize_t *off);
-static htri_t H5S_point_is_contiguous(const H5S_t *space);
-static htri_t H5S_point_is_single(const H5S_t *space);
-static htri_t H5S_point_is_regular(const H5S_t *space);
-static herr_t H5S_point_adjust_u(H5S_t *space, const hsize_t *offset);
-static herr_t H5S_point_project_scalar(const H5S_t *space, hsize_t *offset);
-static herr_t H5S_point_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
-static herr_t H5S_point_iter_init(H5S_sel_iter_t *iter, const H5S_t *space);
+static herr_t   H5S_point_serialize(const H5S_t *space, uint8_t *buf);
+static herr_t   H5S_point_deserialize(H5S_t *space, const uint8_t *buf);
+static herr_t   H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+static herr_t   H5S_point_offset(const H5S_t *space, hsize_t *off);
+static htri_t   H5S_point_is_contiguous(const H5S_t *space);
+static htri_t   H5S_point_is_single(const H5S_t *space);
+static htri_t   H5S_point_is_regular(const H5S_t *space);
+static herr_t   H5S_point_adjust_u(H5S_t *space, const hsize_t *offset);
+static herr_t   H5S_point_project_scalar(const H5S_t *space, hsize_t *offset);
+static herr_t   H5S_point_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
+static herr_t   H5S_point_iter_init(H5S_sel_iter_t *iter, const H5S_t *space);
 
 /* Selection iteration callbacks */
-static herr_t H5S_point_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords);
-static herr_t H5S_point_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
+static herr_t  H5S_point_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords);
+static herr_t  H5S_point_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
 static hsize_t H5S_point_iter_nelmts(const H5S_sel_iter_t *iter);
-static htri_t H5S_point_iter_has_next_block(const H5S_sel_iter_t *iter);
-static herr_t H5S_point_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
-static herr_t H5S_point_iter_next_block(H5S_sel_iter_t *sel_iter);
-static herr_t H5S_point_iter_release(H5S_sel_iter_t *sel_iter);
+static htri_t  H5S_point_iter_has_next_block(const H5S_sel_iter_t *iter);
+static herr_t  H5S_point_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
+static herr_t  H5S_point_iter_next_block(H5S_sel_iter_t *sel_iter);
+static herr_t  H5S_point_iter_release(H5S_sel_iter_t *sel_iter);
 
 /* Selection properties for point selections */
 const H5S_select_class_t H5S_sel_point[1] = {{
@@ -103,7 +102,6 @@ H5FL_DEFINE_STATIC(H5S_pnt_node_t);
 /* Declare a free list to manage the H5S_pnt_list_t struct */
 H5FL_DEFINE_STATIC(H5S_pnt_list_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_point_iter_init
  *
@@ -124,22 +122,21 @@ H5S_point_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
-    HDassert(space && H5S_SEL_POINTS==H5S_GET_SELECT_TYPE(space));
+    HDassert(space && H5S_SEL_POINTS == H5S_GET_SELECT_TYPE(space));
     HDassert(iter);
 
     /* Initialize the number of points to iterate over */
-    iter->elmt_left=space->select.num_elem;
+    iter->elmt_left = space->select.num_elem;
 
     /* Start at the head of the list of points */
-    iter->u.pnt.curr=space->select.sel_info.pnt_lst->head;
+    iter->u.pnt.curr = space->select.sel_info.pnt_lst->head;
 
     /* Initialize type of selection iterator */
-    iter->type=H5S_sel_iter_point;
+    iter->type = H5S_sel_iter_point;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_point_iter_init() */
+} /* H5S_point_iter_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_point_iter_coords
  *
@@ -156,7 +153,7 @@ H5S_point_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_point_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
+H5S_point_iter_coords(const H5S_sel_iter_t *iter, hsize_t *coords)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -165,12 +162,11 @@ H5S_point_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
     HDassert(coords);
 
     /* Copy the offset of the current point */
-    HDmemcpy(coords,iter->u.pnt.curr->pnt,sizeof(hsize_t)*iter->rank);
+    HDmemcpy(coords, iter->u.pnt.curr->pnt, sizeof(hsize_t) * iter->rank);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_point_iter_coords() */
+} /* H5S_point_iter_coords() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_point_iter_block
  *
@@ -187,7 +183,7 @@ H5S_point_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5S_point_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
+H5S_point_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -197,13 +193,12 @@ H5S_point_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
     HDassert(end);
 
     /* Copy the current point as a block */
-    HDmemcpy(start,iter->u.pnt.curr->pnt,sizeof(hsize_t)*iter->rank);
-    HDmemcpy(end,iter->u.pnt.curr->pnt,sizeof(hsize_t)*iter->rank);
+    HDmemcpy(start, iter->u.pnt.curr->pnt, sizeof(hsize_t) * iter->rank);
+    HDmemcpy(end, iter->u.pnt.curr->pnt, sizeof(hsize_t) * iter->rank);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_point_iter_block() */
+} /* H5S_point_iter_block() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_point_iter_nelmts
  *
@@ -219,7 +214,7 @@ H5S_point_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
  *-------------------------------------------------------------------------
  */
 static hsize_t
-H5S_point_iter_nelmts (const H5S_sel_iter_t *iter)
+H5S_point_iter_nelmts(const H5S_sel_iter_t *iter)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -227,9 +222,8 @@ H5S_point_iter_nelmts (const H5S_sel_iter_t *iter)
     HDassert(iter);
 
     FUNC_LEAVE_NOAPI(iter->elmt_left)
-}   /* H5S_point_iter_nelmts() */
+} /* H5S_point_iter_nelmts() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_iter_has_next_block
@@ -250,7 +244,7 @@ H5S_point_iter_nelmts (const H5S_sel_iter_t *iter)
 static htri_t
 H5S_point_iter_has_next_block(const H5S_sel_iter_t *iter)
 {
-    htri_t ret_value=TRUE;   /* Return value */
+    htri_t ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -258,14 +252,13 @@ H5S_point_iter_has_next_block(const H5S_sel_iter_t *iter)
     HDassert(iter);
 
     /* Check if there is another point in the list */
-    if(iter->u.pnt.curr->next==NULL)
+    if (iter->u.pnt.curr->next == NULL)
         HGOTO_DONE(FALSE);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_iter_has_next_block() */
+} /* H5S_point_iter_has_next_block() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_iter_next
@@ -291,18 +284,17 @@ H5S_point_iter_next(H5S_sel_iter_t *iter, size_t nelem)
 
     /* Check args */
     HDassert(iter);
-    HDassert(nelem>0);
+    HDassert(nelem > 0);
 
     /* Increment the iterator */
-    while(nelem>0) {
-        iter->u.pnt.curr=iter->u.pnt.curr->next;
+    while (nelem > 0) {
+        iter->u.pnt.curr = iter->u.pnt.curr->next;
         nelem--;
     } /* end while */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_point_iter_next() */
+} /* H5S_point_iter_next() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_iter_next_block
@@ -329,12 +321,11 @@ H5S_point_iter_next_block(H5S_sel_iter_t *iter)
     HDassert(iter);
 
     /* Increment the iterator */
-    iter->u.pnt.curr=iter->u.pnt.curr->next;
+    iter->u.pnt.curr = iter->u.pnt.curr->next;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_point_iter_next_block() */
+} /* H5S_point_iter_next_block() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_iter_release
@@ -353,7 +344,7 @@ H5S_point_iter_next_block(H5S_sel_iter_t *iter)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_point_iter_release (H5S_sel_iter_t H5_ATTR_UNUSED * iter)
+H5S_point_iter_release(H5S_sel_iter_t H5_ATTR_UNUSED *iter)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -361,9 +352,8 @@ H5S_point_iter_release (H5S_sel_iter_t H5_ATTR_UNUSED * iter)
     HDassert(iter);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_point_iter_release() */
+} /* H5S_point_iter_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_add
@@ -387,8 +377,8 @@ static herr_t
 H5S_point_add(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *coord)
 {
     H5S_pnt_node_t *top = NULL, *curr = NULL, *new_node = NULL; /* Point selection nodes */
-    unsigned u;                         /* Counter */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned        u;                                          /* Counter */
+    herr_t          ret_value = SUCCEED;                        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -397,21 +387,21 @@ H5S_point_add(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *co
     HDassert(coord);
     HDassert(op == H5S_SELECT_SET || op == H5S_SELECT_APPEND || op == H5S_SELECT_PREPEND);
 
-    for(u = 0; u < num_elem; u++) {
+    for (u = 0; u < num_elem; u++) {
         /* Allocate space for the new node */
-        if(NULL == (new_node = H5FL_MALLOC(H5S_pnt_node_t)))
+        if (NULL == (new_node = H5FL_MALLOC(H5S_pnt_node_t)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate point node")
 
         /* Initialize fields in node */
         new_node->next = NULL;
-        if(NULL == (new_node->pnt = (hsize_t *)H5MM_malloc(space->extent.rank * sizeof(hsize_t))))
+        if (NULL == (new_node->pnt = (hsize_t *)H5MM_malloc(space->extent.rank * sizeof(hsize_t))))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate coordinate information")
 
         /* Copy over the coordinates */
         HDmemcpy(new_node->pnt, coord + (u * space->extent.rank), (space->extent.rank * sizeof(hsize_t)));
 
         /* Link into list */
-        if(top == NULL)
+        if (top == NULL)
             top = new_node;
         else
             curr->next = new_node;
@@ -420,20 +410,20 @@ H5S_point_add(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *co
     new_node = NULL;
 
     /* Insert the list of points selected in the proper place */
-    if(op == H5S_SELECT_SET || op == H5S_SELECT_PREPEND) {
+    if (op == H5S_SELECT_SET || op == H5S_SELECT_PREPEND) {
         /* Append current list, if there is one */
-        if(space->select.sel_info.pnt_lst->head != NULL)
+        if (space->select.sel_info.pnt_lst->head != NULL)
             curr->next = space->select.sel_info.pnt_lst->head;
 
         /* Put new list in point selection */
         space->select.sel_info.pnt_lst->head = top;
-    } /* end if */
-    else {  /* op==H5S_SELECT_APPEND */
-        H5S_pnt_node_t *tmp_node;       /* Temporary point selection node */
+    }                             /* end if */
+    else {                        /* op==H5S_SELECT_APPEND */
+        H5S_pnt_node_t *tmp_node; /* Temporary point selection node */
 
         tmp_node = space->select.sel_info.pnt_lst->head;
-        if(tmp_node != NULL) {
-            while(tmp_node->next != NULL)
+        if (tmp_node != NULL) {
+            while (tmp_node->next != NULL)
                 tmp_node = tmp_node->next;
 
             /* Append new list to point selection */
@@ -444,30 +434,29 @@ H5S_point_add(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *co
     } /* end else */
 
     /* Set the number of elements in the new selection */
-    if(op == H5S_SELECT_SET)
+    if (op == H5S_SELECT_SET)
         space->select.num_elem = num_elem;
     else
         space->select.num_elem += num_elem;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Release possibly partially initialized new node */
-        if(new_node)
+        if (new_node)
             new_node = H5FL_FREE(H5S_pnt_node_t, new_node);
 
         /* Release possible linked list of nodes */
-        while(top) {
-            curr = top->next; 
+        while (top) {
+            curr = top->next;
             H5MM_xfree(top->pnt);
             top = H5FL_FREE(H5S_pnt_node_t, top);
             top = curr;
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_add() */
+} /* H5S_point_add() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_release
@@ -486,9 +475,9 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_point_release (H5S_t *space)
+H5S_point_release(H5S_t *space)
 {
-    H5S_pnt_node_t *curr, *next;        /* Point selection nodes */
+    H5S_pnt_node_t *curr, *next; /* Point selection nodes */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -497,7 +486,7 @@ H5S_point_release (H5S_t *space)
 
     /* Delete all the nodes from the list */
     curr = space->select.sel_info.pnt_lst->head;
-    while(curr != NULL) {
+    while (curr != NULL) {
         next = curr->next;
         H5MM_xfree(curr->pnt);
         curr = H5FL_FREE(H5S_pnt_node_t, curr);
@@ -511,9 +500,8 @@ H5S_point_release (H5S_t *space)
     space->select.num_elem = 0;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_point_release() */
+} /* H5S_point_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_elements
@@ -545,10 +533,9 @@ H5S_point_release (H5S_t *space)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_select_elements(H5S_t *space, H5S_seloper_t op, size_t num_elem,
-    const hsize_t *coord)
+H5S_select_elements(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *coord)
 {
-    herr_t ret_value = SUCCEED;  /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -559,17 +546,17 @@ H5S_select_elements(H5S_t *space, H5S_seloper_t op, size_t num_elem,
     HDassert(op == H5S_SELECT_SET || op == H5S_SELECT_APPEND || op == H5S_SELECT_PREPEND);
 
     /* If we are setting a new selection, remove current selection first */
-    if(op == H5S_SELECT_SET || H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS)
-        if(H5S_SELECT_RELEASE(space) < 0)
+    if (op == H5S_SELECT_SET || H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS)
+        if (H5S_SELECT_RELEASE(space) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release point selection")
 
     /* Allocate space for the point selection information if necessary */
-    if(H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS || space->select.sel_info.pnt_lst == NULL)
-        if(NULL == (space->select.sel_info.pnt_lst = H5FL_CALLOC(H5S_pnt_list_t)))
+    if (H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS || space->select.sel_info.pnt_lst == NULL)
+        if (NULL == (space->select.sel_info.pnt_lst = H5FL_CALLOC(H5S_pnt_list_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate element information")
 
     /* Add points to selection */
-    if(H5S_point_add(space, op, num_elem, coord) < 0)
+    if (H5S_point_add(space, op, num_elem, coord) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert elements")
 
     /* Set selection type */
@@ -577,9 +564,8 @@ H5S_select_elements(H5S_t *space, H5S_seloper_t op, size_t num_elem,
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_elements() */
+} /* H5S_select_elements() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_copy
@@ -602,8 +588,8 @@ done:
 static herr_t
 H5S_point_copy(H5S_t *dst, const H5S_t *src, hbool_t H5_ATTR_UNUSED share_selection)
 {
-    H5S_pnt_node_t *curr, *new_node, *new_tail;    /* Point information nodes */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5S_pnt_node_t *curr, *new_node, *new_tail; /* Point information nodes */
+    herr_t          ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -611,17 +597,17 @@ H5S_point_copy(H5S_t *dst, const H5S_t *src, hbool_t H5_ATTR_UNUSED share_select
     HDassert(dst);
 
     /* Allocate room for the head of the point list */
-    if(NULL == (dst->select.sel_info.pnt_lst = H5FL_MALLOC(H5S_pnt_list_t)))
+    if (NULL == (dst->select.sel_info.pnt_lst = H5FL_MALLOC(H5S_pnt_list_t)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate point list node")
 
-    curr = src->select.sel_info.pnt_lst->head;
+    curr     = src->select.sel_info.pnt_lst->head;
     new_tail = NULL;
-    while(curr) {
+    while (curr) {
         /* Create new point */
-        if(NULL == (new_node = H5FL_MALLOC(H5S_pnt_node_t)))
+        if (NULL == (new_node = H5FL_MALLOC(H5S_pnt_node_t)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate point node")
         new_node->next = NULL;
-        if(NULL == (new_node->pnt = (hsize_t *)H5MM_malloc(src->extent.rank * sizeof(hsize_t)))) {
+        if (NULL == (new_node->pnt = (hsize_t *)H5MM_malloc(src->extent.rank * sizeof(hsize_t)))) {
             new_node = H5FL_FREE(H5S_pnt_node_t, new_node);
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate coordinate information")
         } /* end if */
@@ -630,26 +616,26 @@ H5S_point_copy(H5S_t *dst, const H5S_t *src, hbool_t H5_ATTR_UNUSED share_select
         HDmemcpy(new_node->pnt, curr->pnt, (src->extent.rank * sizeof(hsize_t)));
 
         /* Keep the order the same when copying */
-        if(NULL == new_tail)
+        if (NULL == new_tail)
             new_tail = dst->select.sel_info.pnt_lst->head = new_node;
         else {
             new_tail->next = new_node;
-            new_tail = new_node;
+            new_tail       = new_node;
         } /* end else */
 
         curr = curr->next;
     } /* end while */
 
 done:
-    if(ret_value < 0 && dst->select.sel_info.pnt_lst) {
+    if (ret_value < 0 && dst->select.sel_info.pnt_lst) {
         /* Traverse the (incomplete?) dst list, freeing all memory */
         curr = dst->select.sel_info.pnt_lst->head;
-        while(curr) {
+        while (curr) {
             H5S_pnt_node_t *tmp_node = curr;
 
             curr->pnt = (hsize_t *)H5MM_xfree(curr->pnt);
-            curr = curr->next;
-            tmp_node = H5FL_FREE(H5S_pnt_node_t, tmp_node);
+            curr      = curr->next;
+            tmp_node  = H5FL_FREE(H5S_pnt_node_t, tmp_node);
         } /* end while */
 
         dst->select.sel_info.pnt_lst = H5FL_FREE(H5S_pnt_list_t, dst->select.sel_info.pnt_lst);
@@ -658,7 +644,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_point_copy() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_is_valid
@@ -680,11 +665,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static htri_t
-H5S_point_is_valid (const H5S_t *space)
+H5S_point_is_valid(const H5S_t *space)
 {
-    H5S_pnt_node_t *curr;      /* Point information nodes */
-    unsigned u;                   /* Counter */
-    htri_t ret_value=TRUE;     /* return value */
+    H5S_pnt_node_t *curr;             /* Point information nodes */
+    unsigned        u;                /* Counter */
+    htri_t          ret_value = TRUE; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -692,13 +677,13 @@ H5S_point_is_valid (const H5S_t *space)
 
     /* Check each point to determine whether selection+offset is within extent */
     curr = space->select.sel_info.pnt_lst->head;
-    while(curr != NULL) {
+    while (curr != NULL) {
         /* Check each dimension */
-        for(u = 0; u < space->extent.rank; u++) {
+        for (u = 0; u < space->extent.rank; u++) {
             /* Check if an offset has been defined */
             /* Bounds check the selected point + offset against the extent */
-            if(((curr->pnt[u] + (hsize_t)space->select.offset[u]) > space->extent.size[u])
-                    || (((hssize_t)curr->pnt[u] + space->select.offset[u]) < 0))
+            if (((curr->pnt[u] + (hsize_t)space->select.offset[u]) > space->extent.size[u]) ||
+                (((hssize_t)curr->pnt[u] + space->select.offset[u]) < 0))
                 HGOTO_DONE(FALSE)
         } /* end for */
 
@@ -709,7 +694,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_point_is_valid() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sget_select_elem_npoints
@@ -730,25 +714,24 @@ done:
 hssize_t
 H5Sget_select_elem_npoints(hid_t spaceid)
 {
-    H5S_t *space;               /* Dataspace to modify selection of */
-    hssize_t ret_value;         /* return value */
+    H5S_t *  space;     /* Dataspace to modify selection of */
+    hssize_t ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Hs", "i", spaceid);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if(H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS)
+    if (H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an element selection")
 
     ret_value = (hssize_t)H5S_GET_SELECT_NPOINTS(space);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sget_select_elem_npoints() */
+} /* H5Sget_select_elem_npoints() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_serial_size
@@ -769,10 +752,10 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static hssize_t
-H5S_point_serial_size (const H5S_t *space)
+H5S_point_serial_size(const H5S_t *space)
 {
-    H5S_pnt_node_t *curr;       /* Point information nodes */
-    hssize_t ret_value;         /* return value */
+    H5S_pnt_node_t *curr;      /* Point information nodes */
+    hssize_t        ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -782,20 +765,19 @@ H5S_point_serial_size (const H5S_t *space)
      *  <type (4 bytes)> + <version (4 bytes)> + <padding (4 bytes)> +
      *      <length (4 bytes)> + <rank (4 bytes)> + <# of points (4 bytes)> = 24 bytes
      */
-    ret_value=24;
+    ret_value = 24;
 
     /* Count points in selection */
-    curr=space->select.sel_info.pnt_lst->head;
-    while(curr!=NULL) {
+    curr = space->select.sel_info.pnt_lst->head;
+    while (curr != NULL) {
         /* Add 4 bytes times the rank for each element selected */
-        ret_value+=4*space->extent.rank;
-        curr=curr->next;
+        ret_value += 4 * space->extent.rank;
+        curr = curr->next;
     } /* end while */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_point_serial_size() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_serialize
@@ -816,70 +798,69 @@ H5S_point_serial_size (const H5S_t *space)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_point_serialize (const H5S_t *space, uint8_t *buf)
+H5S_point_serialize(const H5S_t *space, uint8_t *buf)
 {
-    H5S_pnt_node_t *curr;   /* Point information nodes */
-    uint8_t *lenp;          /* pointer to length location for later storage */
-    uint32_t len=0;         /* number of bytes used */
-    unsigned u;                 /* local counting variable */
-    hsize_t bounds_start[H5S_MAX_RANK]; /* Selection bounding box */
-    hsize_t bounds_end[H5S_MAX_RANK];   /* Selection bounding box */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5S_pnt_node_t *curr;                       /* Point information nodes */
+    uint8_t *       lenp;                       /* pointer to length location for later storage */
+    uint32_t        len = 0;                    /* number of bytes used */
+    unsigned        u;                          /* local counting variable */
+    hsize_t         bounds_start[H5S_MAX_RANK]; /* Selection bounding box */
+    hsize_t         bounds_end[H5S_MAX_RANK];   /* Selection bounding box */
+    herr_t          ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
 
-     /* Get bounding box for the selection */
+    /* Get bounding box for the selection */
     HDmemset(bounds_end, 0, sizeof(bounds_end));
-    if(H5S_point_bounds(space, bounds_start, bounds_end) < 0)
+    if (H5S_point_bounds(space, bounds_start, bounds_end) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get selection bounds")
 
     /* Determine whether the number of points or the high bounds in the selection exceed (2^32 - 1) */
-    if(space->select.num_elem > H5S_UINT32_MAX)
+    if (space->select.num_elem > H5S_UINT32_MAX)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "invalid number of points in selection")
     else {
-        for(u = 0; u < space->extent.rank; u++)
-            if(bounds_end[u] > H5S_UINT32_MAX)
+        for (u = 0; u < space->extent.rank; u++)
+            if (bounds_end[u] > H5S_UINT32_MAX)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "invalid points selection")
     }
 
     /* Store the preamble information */
-    UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space));  /* Store the type of selection */
-    UINT32ENCODE(buf, (uint32_t)H5S_POINT_VERSION_1);  /* Store the version number */
-    UINT32ENCODE(buf, (uint32_t)0);  /* Store the un-used padding */
-    lenp=buf;           /* keep the pointer to the length location for later */
-    buf+=4;             /* skip over space for length */
+    UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */
+    UINT32ENCODE(buf, (uint32_t)H5S_POINT_VERSION_1);        /* Store the version number */
+    UINT32ENCODE(buf, (uint32_t)0);                          /* Store the un-used padding */
+    lenp = buf; /* keep the pointer to the length location for later */
+    buf += 4;   /* skip over space for length */
 
     /* Encode number of dimensions */
     UINT32ENCODE(buf, (uint32_t)space->extent.rank);
-    len+=4;
+    len += 4;
 
     /* Encode number of elements */
     UINT32ENCODE(buf, (uint32_t)space->select.num_elem);
-    len+=4;
+    len += 4;
 
     /* Encode each point in selection */
-    curr=space->select.sel_info.pnt_lst->head;
-    while(curr!=NULL) {
+    curr = space->select.sel_info.pnt_lst->head;
+    while (curr != NULL) {
         /* Add 4 bytes times the rank for each element selected */
-        len+=4*space->extent.rank;
+        len += 4 * space->extent.rank;
 
         /* Encode each point */
-        for(u=0; u<space->extent.rank; u++)
+        for (u = 0; u < space->extent.rank; u++)
             UINT32ENCODE(buf, (uint32_t)curr->pnt[u]);
 
-        curr=curr->next;
+        curr = curr->next;
     } /* end while */
 
     /* Encode length */
-    UINT32ENCODE(lenp, (uint32_t)len);  /* Store the length of the extra information */
+    UINT32ENCODE(lenp, (uint32_t)len); /* Store the length of the extra information */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_serialize() */
+} /* H5S_point_serialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_deserialize
@@ -900,16 +881,16 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_point_deserialize (H5S_t *space, const uint8_t *buf)
+H5S_point_deserialize(H5S_t *space, const uint8_t *buf)
 {
-    H5S_seloper_t op=H5S_SELECT_SET;    /* Selection operation */
-    uint32_t rank;           /* Rank of points */
-    size_t num_elem=0;      /* Number of elements in selection */
-    hsize_t *coord=NULL, *tcoord;   /* Pointer to array of elements */
-    unsigned i, j;              /* local counting variables */
-    uint32_t version;       /* Decoded version */
-    uint8_t *p;             /* Temporary pointer to buf */
-    herr_t ret_value = SUCCEED; /* return value */
+    H5S_seloper_t op = H5S_SELECT_SET;      /* Selection operation */
+    uint32_t      rank;                     /* Rank of points */
+    size_t        num_elem = 0;             /* Number of elements in selection */
+    hsize_t *     coord    = NULL, *tcoord; /* Pointer to array of elements */
+    unsigned      i, j;                     /* local counting variables */
+    uint32_t      version;                  /* Decoded version */
+    uint8_t *     p;                        /* Temporary pointer to buf */
+    herr_t        ret_value = SUCCEED;      /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -920,39 +901,37 @@ H5S_point_deserialize (H5S_t *space, const uint8_t *buf)
     p = buf + 4;
     UINT32DECODE(p, version);
 
-    if(version < H5S_POINT_VERSION_1 || version > H5S_POINT_VERSION_LATEST)
+    if (version < H5S_POINT_VERSION_1 || version > H5S_POINT_VERSION_LATEST)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "bad version number for point selection")
 
-
     /* Deserialize points to select */
-    buf += 16;    /* Skip over selection header */
-    UINT32DECODE(buf, rank);  /* decode the rank of the point selection */
-    if(rank != space->extent.rank)
+    buf += 16;               /* Skip over selection header */
+    UINT32DECODE(buf, rank); /* decode the rank of the point selection */
+    if (rank != space->extent.rank)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "rank of pointer does not match dataspace")
-    UINT32DECODE(buf, num_elem);  /* decode the number of points */
+    UINT32DECODE(buf, num_elem); /* decode the number of points */
 
     /* Allocate space for the coordinates */
-    if(NULL == (coord = (hsize_t *)H5MM_malloc(num_elem * rank * sizeof(hsize_t))))
+    if (NULL == (coord = (hsize_t *)H5MM_malloc(num_elem * rank * sizeof(hsize_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate coordinate information")
 
     /* Retrieve the coordinates from the buffer */
-    for(tcoord = coord, i = 0; i < num_elem; i++)
-        for(j = 0; j < (unsigned)rank; j++, tcoord++)
+    for (tcoord = coord, i = 0; i < num_elem; i++)
+        for (j = 0; j < (unsigned)rank; j++, tcoord++)
             UINT32DECODE(buf, *tcoord);
 
     /* Select points */
-    if(H5S_select_elements(space, op, num_elem, (const hsize_t *)coord) < 0)
+    if (H5S_select_elements(space, op, num_elem, (const hsize_t *)coord) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
 
 done:
     /* Free the coordinate array if necessary */
-    if(coord != NULL)
+    if (coord != NULL)
         H5MM_xfree(coord);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_deserialize() */
+} /* H5S_point_deserialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_get_select_elem_pointlist
@@ -985,8 +964,8 @@ done:
 static herr_t
 H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoints, hsize_t *buf)
 {
-    H5S_pnt_node_t *node;       /* Point node */
-    unsigned rank;              /* Dataspace rank */
+    H5S_pnt_node_t *node; /* Point node */
+    unsigned        rank; /* Dataspace rank */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1000,23 +979,22 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint
     node = space->select.sel_info.pnt_lst->head;
 
     /* Iterate to the first point to return */
-    while(node != NULL && startpoint > 0) {
+    while (node != NULL && startpoint > 0) {
         startpoint--;
         node = node->next;
-      } /* end while */
+    } /* end while */
 
     /* Iterate through the node, copying each point's information */
-    while(node != NULL && numpoints > 0) {
+    while (node != NULL && numpoints > 0) {
         HDmemcpy(buf, node->pnt, sizeof(hsize_t) * rank);
         buf += rank;
         numpoints--;
         node = node->next;
-      } /* end while */
+    } /* end while */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_get_select_elem_pointlist() */
+} /* H5S_get_select_elem_pointlist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sget_select_elem_pointlist
@@ -1047,30 +1025,28 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint,
-    hsize_t numpoints, hsize_t buf[/*numpoints*/])
+H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t buf[/*numpoints*/])
 {
-    H5S_t *space;               /* Dataspace to modify selection of */
-    herr_t ret_value;           /* return value */
+    H5S_t *space;     /* Dataspace to modify selection of */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "ihh*[a2]h", spaceid, startpoint, numpoints, buf);
 
     /* Check args */
-    if(NULL == buf)
+    if (NULL == buf)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
-    if(H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS)
+    if (H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a point selection")
 
     ret_value = H5S_get_select_elem_pointlist(space, startpoint, numpoints, buf);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sget_select_elem_pointlist() */
+} /* H5Sget_select_elem_pointlist() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_bounds
@@ -1100,10 +1076,10 @@ done:
 static herr_t
 H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 {
-    H5S_pnt_node_t *node;       /* Point node */
-    unsigned rank;              /* Dataspace rank */
-    unsigned u;                 /* index variable */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5S_pnt_node_t *node;                /* Point node */
+    unsigned        rank;                /* Dataspace rank */
+    unsigned        u;                   /* index variable */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1115,32 +1091,31 @@ H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
     rank = space->extent.rank;
 
     /* Set the start and end arrays up */
-    for(u = 0; u < rank; u++) {
+    for (u = 0; u < rank; u++) {
         start[u] = HSIZET_MAX;
-        end[u] = 0;
+        end[u]   = 0;
     } /* end for */
 
     /* Iterate through the node, checking the bounds on each element */
     node = space->select.sel_info.pnt_lst->head;
-    while(node != NULL) {
-        for(u = 0; u < rank; u++) {
+    while (node != NULL) {
+        for (u = 0; u < rank; u++) {
             /* Check for offset moving selection negative */
-            if(((hssize_t)node->pnt[u] + space->select.offset[u]) < 0)
+            if (((hssize_t)node->pnt[u] + space->select.offset[u]) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
 
-            if(start[u] > (node->pnt[u] + space->select.offset[u]))
+            if (start[u] > (node->pnt[u] + space->select.offset[u]))
                 start[u] = node->pnt[u] + space->select.offset[u];
-            if(end[u] < (node->pnt[u] + space->select.offset[u]))
+            if (end[u] < (node->pnt[u] + space->select.offset[u]))
                 end[u] = node->pnt[u] + space->select.offset[u];
         } /* end for */
         node = node->next;
-      } /* end while */
+    } /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_bounds() */
+} /* H5S_point_bounds() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_offset
@@ -1164,12 +1139,12 @@ done:
 static herr_t
 H5S_point_offset(const H5S_t *space, hsize_t *offset)
 {
-    const hsize_t *pnt;         /* Pointer to a selected point's coordinates */
-    const hssize_t *sel_offset; /* Pointer to the selection's offset */
-    const hsize_t *dim_size;    /* Pointer to a dataspace's extent */
-    hsize_t accum;              /* Accumulator for dimension sizes */
-    int i;                      /* index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    const hsize_t * pnt;                 /* Pointer to a selected point's coordinates */
+    const hssize_t *sel_offset;          /* Pointer to the selection's offset */
+    const hsize_t * dim_size;            /* Pointer to a dataspace's extent */
+    hsize_t         accum;               /* Accumulator for dimension sizes */
+    int             i;                   /* index variable */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1180,17 +1155,17 @@ H5S_point_offset(const H5S_t *space, hsize_t *offset)
     *offset = 0;
 
     /* Set up pointers to arrays of values */
-    pnt = space->select.sel_info.pnt_lst->head->pnt;
+    pnt        = space->select.sel_info.pnt_lst->head->pnt;
     sel_offset = space->select.offset;
-    dim_size = space->extent.size;
+    dim_size   = space->extent.size;
 
     /* Loop through coordinates, calculating the linear offset */
     accum = 1;
-    for(i = (int)space->extent.rank - 1; i >= 0; i--) {
+    for (i = (int)space->extent.rank - 1; i >= 0; i--) {
         hssize_t pnt_offset = (hssize_t)pnt[i] + sel_offset[i]; /* Point's offset in this dimension */
 
         /* Check for offset moving selection out of the dataspace */
-        if(pnt_offset < 0 || (hsize_t)pnt_offset >= dim_size[i])
+        if (pnt_offset < 0 || (hsize_t)pnt_offset >= dim_size[i])
             HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
 
         /* Add the point's offset in this dimension to the total linear offset */
@@ -1202,9 +1177,8 @@ H5S_point_offset(const H5S_t *space, hsize_t *offset)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_offset() */
+} /* H5S_point_offset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_is_contiguous
@@ -1229,22 +1203,22 @@ done:
 static htri_t
 H5S_point_is_contiguous(const H5S_t *space)
 {
-    htri_t ret_value;  /* return value */
+    htri_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
     /* One point is definitely contiguous */
-    if(space->select.num_elem==1)
-    	ret_value=TRUE;
-    else	/* More than one point might be contiguous, but it's complex to check and we don't need it right now */
-    	ret_value=FALSE;
+    if (space->select.num_elem == 1)
+        ret_value = TRUE;
+    else /* More than one point might be contiguous, but it's complex to check and we don't need it right now
+          */
+        ret_value = FALSE;
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_is_contiguous() */
+} /* H5S_point_is_contiguous() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_is_single
@@ -1266,22 +1240,21 @@ H5S_point_is_contiguous(const H5S_t *space)
 static htri_t
 H5S_point_is_single(const H5S_t *space)
 {
-    htri_t ret_value;  /* return value */
+    htri_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
     /* One point is definitely 'single' :-) */
-    if(space->select.num_elem==1)
-    	ret_value=TRUE;
+    if (space->select.num_elem == 1)
+        ret_value = TRUE;
     else
-    	ret_value=FALSE;
+        ret_value = FALSE;
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_is_single() */
+} /* H5S_point_is_single() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_is_regular
@@ -1306,7 +1279,7 @@ H5S_point_is_single(const H5S_t *space)
 static htri_t
 H5S_point_is_regular(const H5S_t *space)
 {
-    htri_t ret_value;  /* return value */
+    htri_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1314,15 +1287,14 @@ H5S_point_is_regular(const H5S_t *space)
     HDassert(space);
 
     /* Only simple check for regular points for now... */
-    if(space->select.num_elem==1)
-    	ret_value=TRUE;
+    if (space->select.num_elem == 1)
+        ret_value = TRUE;
     else
-    	ret_value=FALSE;
+        ret_value = FALSE;
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_is_regular() */
+} /* H5S_point_is_regular() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_adjust_u
@@ -1344,8 +1316,8 @@ H5S_point_is_regular(const H5S_t *space)
 static herr_t
 H5S_point_adjust_u(H5S_t *space, const hsize_t *offset)
 {
-    H5S_pnt_node_t *node;               /* Point node */
-    unsigned rank;                      /* Dataspace rank */
+    H5S_pnt_node_t *node; /* Point node */
+    unsigned        rank; /* Dataspace rank */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1355,11 +1327,11 @@ H5S_point_adjust_u(H5S_t *space, const hsize_t *offset)
     /* Iterate through the nodes, checking the bounds on each element */
     node = space->select.sel_info.pnt_lst->head;
     rank = space->extent.rank;
-    while(node) {
-        unsigned u;                         /* Local index variable */
+    while (node) {
+        unsigned u; /* Local index variable */
 
         /* Adjust each coordinate for point node */
-        for(u = 0; u < rank; u++) {
+        for (u = 0; u < rank; u++) {
             /* Check for offset moving selection negative */
             HDassert(node->pnt[u] >= offset[u]);
 
@@ -1372,9 +1344,8 @@ H5S_point_adjust_u(H5S_t *space, const hsize_t *offset)
     } /* end while */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_point_adjust_u() */
+} /* H5S_point_adjust_u() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_point_project_scalar
  *
@@ -1391,8 +1362,8 @@ H5S_point_adjust_u(H5S_t *space, const hsize_t *offset)
 static herr_t
 H5S_point_project_scalar(const H5S_t *space, hsize_t *offset)
 {
-    const H5S_pnt_node_t *node;         /* Point node */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5S_pnt_node_t *node;                /* Point node */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1404,17 +1375,17 @@ H5S_point_project_scalar(const H5S_t *space, hsize_t *offset)
     node = space->select.sel_info.pnt_lst->head;
 
     /* Check for more than one point selected */
-    if(node->next)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "point selection of one element has more than one node!")
+    if (node->next)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL,
+                    "point selection of one element has more than one node!")
 
     /* Calculate offset of selection in projected buffer */
-    *offset = H5VM_array_offset(space->extent.rank, space->extent.size, node->pnt); 
+    *offset = H5VM_array_offset(space->extent.rank, space->extent.size, node->pnt);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_project_scalar() */
+} /* H5S_point_project_scalar() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_point_project_simple
  *
@@ -1431,11 +1402,11 @@ done:
 static herr_t
 H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offset)
 {
-    const H5S_pnt_node_t *base_node;    /* Point node in base space */
-    H5S_pnt_node_t *new_node;           /* Point node in new space */
-    H5S_pnt_node_t *prev_node;          /* Previous point node in new space */
-    unsigned rank_diff;                 /* Difference in ranks between spaces */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5S_pnt_node_t *base_node;           /* Point node in base space */
+    H5S_pnt_node_t *      new_node;            /* Point node in new space */
+    H5S_pnt_node_t *      prev_node;           /* Previous point node in new space */
+    unsigned              rank_diff;           /* Difference in ranks between spaces */
+    herr_t                ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1445,16 +1416,16 @@ H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
     HDassert(offset);
 
     /* We are setting a new selection, remove any current selection in new dataspace */
-    if(H5S_SELECT_RELEASE(new_space) < 0)
+    if (H5S_SELECT_RELEASE(new_space) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release selection")
 
     /* Allocate room for the head of the point list */
-    if(NULL == (new_space->select.sel_info.pnt_lst = H5FL_MALLOC(H5S_pnt_list_t)))
+    if (NULL == (new_space->select.sel_info.pnt_lst = H5FL_MALLOC(H5S_pnt_list_t)))
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate point list node")
 
     /* Check if the new space's rank is < or > base space's rank */
-    if(new_space->extent.rank < base_space->extent.rank) {
-        hsize_t block[H5S_MAX_RANK];     /* Block selected in base dataspace */
+    if (new_space->extent.rank < base_space->extent.rank) {
+        hsize_t block[H5S_MAX_RANK]; /* Block selected in base dataspace */
 
         /* Compute the difference in ranks */
         rank_diff = base_space->extent.rank - new_space->extent.rank;
@@ -1462,17 +1433,17 @@ H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
         /* Calculate offset of selection in projected buffer */
         HDmemset(block, 0, sizeof(block));
         HDmemcpy(block, base_space->select.sel_info.pnt_lst->head->pnt, sizeof(hsize_t) * rank_diff);
-        *offset = H5VM_array_offset(base_space->extent.rank, base_space->extent.size, block); 
+        *offset = H5VM_array_offset(base_space->extent.rank, base_space->extent.size, block);
 
         /* Iterate through base space's point nodes, copying the point information */
         base_node = base_space->select.sel_info.pnt_lst->head;
         prev_node = NULL;
-        while(base_node) {
+        while (base_node) {
             /* Create new point */
-            if(NULL == (new_node = H5FL_MALLOC(H5S_pnt_node_t)))
+            if (NULL == (new_node = H5FL_MALLOC(H5S_pnt_node_t)))
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate point node")
             new_node->next = NULL;
-            if(NULL == (new_node->pnt = (hsize_t *)H5MM_malloc(new_space->extent.rank * sizeof(hsize_t)))) {
+            if (NULL == (new_node->pnt = (hsize_t *)H5MM_malloc(new_space->extent.rank * sizeof(hsize_t)))) {
                 new_node = H5FL_FREE(H5S_pnt_node_t, new_node);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate coordinate information")
             } /* end if */
@@ -1481,17 +1452,17 @@ H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
             HDmemcpy(new_node->pnt, &base_node->pnt[rank_diff], (new_space->extent.rank * sizeof(hsize_t)));
 
             /* Keep the order the same when copying */
-            if(NULL == prev_node)
+            if (NULL == prev_node)
                 prev_node = new_space->select.sel_info.pnt_lst->head = new_node;
             else {
                 prev_node->next = new_node;
-                prev_node = new_node;
+                prev_node       = new_node;
             } /* end else */
 
             /* Advance to next node */
             base_node = base_node->next;
         } /* end while */
-    } /* end if */
+    }     /* end if */
     else {
         HDassert(new_space->extent.rank > base_space->extent.rank);
 
@@ -1504,12 +1475,12 @@ H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
         /* Iterate through base space's point nodes, copying the point information */
         base_node = base_space->select.sel_info.pnt_lst->head;
         prev_node = NULL;
-        while(base_node) {
+        while (base_node) {
             /* Create new point */
-            if(NULL == (new_node = H5FL_MALLOC(H5S_pnt_node_t)))
+            if (NULL == (new_node = H5FL_MALLOC(H5S_pnt_node_t)))
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate point node")
             new_node->next = NULL;
-            if(NULL == (new_node->pnt = (hsize_t *)H5MM_malloc(new_space->extent.rank * sizeof(hsize_t)))) {
+            if (NULL == (new_node->pnt = (hsize_t *)H5MM_malloc(new_space->extent.rank * sizeof(hsize_t)))) {
                 new_node = H5FL_FREE(H5S_pnt_node_t, new_node);
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate coordinate information")
             } /* end if */
@@ -1519,17 +1490,17 @@ H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
             HDmemcpy(&new_node->pnt[rank_diff], base_node->pnt, (new_space->extent.rank * sizeof(hsize_t)));
 
             /* Keep the order the same when copying */
-            if(NULL == prev_node)
+            if (NULL == prev_node)
                 prev_node = new_space->select.sel_info.pnt_lst->head = new_node;
             else {
                 prev_node->next = new_node;
-                prev_node = new_node;
+                prev_node       = new_node;
             } /* end else */
 
             /* Advance to next node */
             base_node = base_node->next;
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
     /* Number of elements selected will be the same */
     new_space->select.num_elem = base_space->select.num_elem;
@@ -1539,9 +1510,8 @@ H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_point_project_simple() */
+} /* H5S_point_project_simple() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sselect_elements
@@ -1573,36 +1543,34 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Sselect_elements(hid_t spaceid, H5S_seloper_t op, size_t num_elem,
-    const hsize_t *coord)
+H5Sselect_elements(hid_t spaceid, H5S_seloper_t op, size_t num_elem, const hsize_t *coord)
 {
-    H5S_t    *space;               /* Dataspace to modify selection of */
-    herr_t   ret_value;            /* Return value */
+    H5S_t *space;     /* Dataspace to modify selection of */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iSsz*h", spaceid, op, num_elem, coord);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
-    if(H5S_SCALAR == H5S_GET_EXTENT_TYPE(space))
+    if (H5S_SCALAR == H5S_GET_EXTENT_TYPE(space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "point doesn't support H5S_SCALAR space")
-    if(H5S_NULL == H5S_GET_EXTENT_TYPE(space))
+    if (H5S_NULL == H5S_GET_EXTENT_TYPE(space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "point doesn't support H5S_NULL space")
-    if(coord == NULL || num_elem == 0)
+    if (coord == NULL || num_elem == 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "elements not specified")
-    if(!(op == H5S_SELECT_SET || op == H5S_SELECT_APPEND || op == H5S_SELECT_PREPEND))
+    if (!(op == H5S_SELECT_SET || op == H5S_SELECT_APPEND || op == H5S_SELECT_PREPEND))
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "unsupported operation attempted")
 
     /* Call the real element selection routine */
-    if((ret_value = H5S_select_elements(space, op, num_elem, coord)) < 0)
+    if ((ret_value = H5S_select_elements(space, op, num_elem, coord)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't select elements")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sselect_elements() */
+} /* H5Sselect_elements() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_point_get_seq_list
@@ -1635,20 +1603,19 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_point_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter,
-    size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem,
-    hsize_t *off, size_t *len)
+H5S_point_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t maxseq,
+                       size_t maxelem, size_t *nseq, size_t *nelem, hsize_t *off, size_t *len)
 {
-    size_t io_left;             /* The number of bytes left in the selection */
-    size_t start_io_left;       /* The initial number of bytes left in the selection */
-    H5S_pnt_node_t *node;       /* Point node */
-    hsize_t dims[H5O_LAYOUT_NDIMS];     /* Total size of memory buf */
-    int	ndims;                  /* Dimensionality of space*/
-    hsize_t	acc;            /* Coordinate accumulator */
-    hsize_t	loc;            /* Coordinate offset */
-    size_t      curr_seq;       /* Current sequence being operated on */
-    int         i;              /* Local index variable */
-    herr_t ret_value=SUCCEED;      /* return value */
+    size_t          io_left;                /* The number of bytes left in the selection */
+    size_t          start_io_left;          /* The initial number of bytes left in the selection */
+    H5S_pnt_node_t *node;                   /* Point node */
+    hsize_t         dims[H5O_LAYOUT_NDIMS]; /* Total size of memory buf */
+    int             ndims;                  /* Dimensionality of space*/
+    hsize_t         acc;                    /* Coordinate accumulator */
+    hsize_t         loc;                    /* Coordinate offset */
+    size_t          curr_seq;               /* Current sequence being operated on */
+    int             i;                      /* Local index variable */
+    herr_t          ret_value = SUCCEED;    /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1667,45 +1634,45 @@ H5S_point_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter,
     start_io_left = io_left = (size_t)MIN(iter->elmt_left, maxelem);
 
     /* Get the dataspace dimensions */
-    if((ndims = H5S_get_simple_extent_dims (space, dims, NULL)) < 0)
+    if ((ndims = H5S_get_simple_extent_dims(space, dims, NULL)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to retrieve data space dimensions")
 
     /* Walk through the points in the selection, starting at the current */
     /*  location in the iterator */
-    node = iter->u.pnt.curr;
+    node     = iter->u.pnt.curr;
     curr_seq = 0;
-    while(NULL != node) {
+    while (NULL != node) {
         /* Compute the offset of each selected point in the buffer */
-        for(i = ndims - 1, acc = iter->elmt_size, loc = 0; i >= 0; i--) {
+        for (i = ndims - 1, acc = iter->elmt_size, loc = 0; i >= 0; i--) {
             loc += (node->pnt[i] + space->select.offset[i]) * acc;
             acc *= dims[i];
         } /* end for */
 
         /* Check if this is a later point in the selection */
-        if(curr_seq>0) {
+        if (curr_seq > 0) {
             /* If a sorted sequence is requested, make certain we don't go backwards in the offset */
-            if((flags&H5S_GET_SEQ_LIST_SORTED) && loc<off[curr_seq-1])
+            if ((flags & H5S_GET_SEQ_LIST_SORTED) && loc < off[curr_seq - 1])
                 break;
 
             /* Check if this point extends the previous sequence */
             /* (Unlikely, but possible) */
-            if(loc==(off[curr_seq-1]+len[curr_seq-1])) {
+            if (loc == (off[curr_seq - 1] + len[curr_seq - 1])) {
                 /* Extend the previous sequence */
-                len[curr_seq-1]+=iter->elmt_size;
+                len[curr_seq - 1] += iter->elmt_size;
             } /* end if */
             else {
                 /* Add a new sequence */
-                off[curr_seq]=loc;
-                len[curr_seq]=iter->elmt_size;
+                off[curr_seq] = loc;
+                len[curr_seq] = iter->elmt_size;
 
                 /* Increment sequence count */
                 curr_seq++;
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else {
             /* Add a new sequence */
-            off[curr_seq]=loc;
-            len[curr_seq]=iter->elmt_size;
+            off[curr_seq] = loc;
+            len[curr_seq] = iter->elmt_size;
 
             /* Increment sequence count */
             curr_seq++;
@@ -1715,28 +1682,27 @@ H5S_point_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter,
         io_left--;
 
         /* Move the iterator */
-        iter->u.pnt.curr=node->next;
+        iter->u.pnt.curr = node->next;
         iter->elmt_left--;
 
         /* Check if we're finished with all sequences */
-        if(curr_seq==maxseq)
+        if (curr_seq == maxseq)
             break;
 
         /* Check if we're finished with all the elements available */
-        if(io_left==0)
+        if (io_left == 0)
             break;
 
         /* Advance to the next point */
-        node=node->next;
-      } /* end while */
+        node = node->next;
+    } /* end while */
 
     /* Set the number of sequences generated */
-    *nseq=curr_seq;
+    *nseq = curr_seq;
 
     /* Set the number of elements used */
-    *nelem=start_io_left-io_left;
+    *nelem = start_io_left - io_left;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_point_get_seq_list() */
-
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 49d5c92..23a5b0c 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -21,33 +21,33 @@
 #include "H5Spublic.h"
 
 /* Public headers needed by this file */
-#include "H5Dpublic.h"		/* Datasets				*/
+#include "H5Dpublic.h" /* Datasets				*/
 
 /* Private headers needed by this file */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Fprivate.h"		/* Files				*/
-#include "H5Gprivate.h"		/* Groups				*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Pprivate.h"		/* Property lists			*/
-#include "H5Tprivate.h"		/* Datatypes				*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Fprivate.h" /* Files				*/
+#include "H5Gprivate.h" /* Groups				*/
+#include "H5Oprivate.h" /* Object headers		  	*/
+#include "H5Pprivate.h" /* Property lists			*/
+#include "H5Tprivate.h" /* Datatypes				*/
 
 /* Flags for H5S_find */
-#define H5S_CONV_PAR_IO_POSSIBLE        0x0001
+#define H5S_CONV_PAR_IO_POSSIBLE 0x0001
 /* The storage options are mutually exclusive */
 /* (2-bits reserved for storage type currently) */
-#define H5S_CONV_STORAGE_COMPACT        0x0000  /* i.e. '0' */
-#define H5S_CONV_STORAGE_CONTIGUOUS     0x0002  /* i.e. '1' */
-#define H5S_CONV_STORAGE_CHUNKED        0x0004  /* i.e. '2' */
-#define H5S_CONV_STORAGE_MASK           0x0006
+#define H5S_CONV_STORAGE_COMPACT    0x0000 /* i.e. '0' */
+#define H5S_CONV_STORAGE_CONTIGUOUS 0x0002 /* i.e. '1' */
+#define H5S_CONV_STORAGE_CHUNKED    0x0004 /* i.e. '2' */
+#define H5S_CONV_STORAGE_MASK       0x0006
 
 /* Flags for "get_seq_list" methods */
-#define H5S_GET_SEQ_LIST_SORTED         0x0001
+#define H5S_GET_SEQ_LIST_SORTED 0x0001
 
 /* Forward references of package typedefs */
-typedef struct H5S_t H5S_t;
-typedef struct H5S_extent_t H5S_extent_t;
-typedef struct H5S_pnt_node_t H5S_pnt_node_t;
-typedef struct H5S_hyper_span_t H5S_hyper_span_t;
+typedef struct H5S_t                 H5S_t;
+typedef struct H5S_extent_t          H5S_extent_t;
+typedef struct H5S_pnt_node_t        H5S_pnt_node_t;
+typedef struct H5S_hyper_span_t      H5S_hyper_span_t;
 typedef struct H5S_hyper_span_info_t H5S_hyper_span_info_t;
 
 /* Information about one dimension in a hyperslab selection */
@@ -60,36 +60,36 @@ typedef struct H5S_hyper_dim_t {
 
 /* Point selection iteration container */
 typedef struct {
-    H5S_pnt_node_t *curr;   /* Pointer to next node to output */
+    H5S_pnt_node_t *curr; /* Pointer to next node to output */
 } H5S_point_iter_t;
 
 /* Hyperslab selection iteration container */
 typedef struct {
     /* Common fields for all hyperslab selections */
-    hsize_t off[H5S_MAX_RANK];          /* Offset in span node (used as position for regular hyperslabs) */
-    unsigned iter_rank;     /* Rank of iterator information */
-                            /* (This should always be the same as the dataspace
-                             * rank, except for regular hyperslab selections in
-                             * which there are contiguous regions in the lower
-                             * dimensions which have been "flattened" out
-                             */
-    hbool_t diminfo_valid;         /* Whether the dimension information is valid */
+    hsize_t  off[H5S_MAX_RANK]; /* Offset in span node (used as position for regular hyperslabs) */
+    unsigned iter_rank;         /* Rank of iterator information */
+                                /* (This should always be the same as the dataspace
+                                 * rank, except for regular hyperslab selections in
+                                 * which there are contiguous regions in the lower
+                                 * dimensions which have been "flattened" out
+                                 */
+    hbool_t diminfo_valid;      /* Whether the dimension information is valid */
 
     /* "Flattened" regular hyperslab selection fields */
     H5S_hyper_dim_t diminfo[H5S_MAX_RANK];   /* "Flattened" regular selection information */
-    hsize_t size[H5S_MAX_RANK];         /* "Flattened" dataspace extent information */
-    hssize_t sel_off[H5S_MAX_RANK];     /* "Flattened" selection offset information */
-    hbool_t flattened[H5S_MAX_RANK];    /* Whether this dimension has been flattened */
+    hsize_t         size[H5S_MAX_RANK];      /* "Flattened" dataspace extent information */
+    hssize_t        sel_off[H5S_MAX_RANK];   /* "Flattened" selection offset information */
+    hbool_t         flattened[H5S_MAX_RANK]; /* Whether this dimension has been flattened */
 
     /* Irregular hyperslab selection fields */
-    H5S_hyper_span_info_t *spans;  /* Pointer to copy of the span tree */
-    H5S_hyper_span_t *span[H5S_MAX_RANK];/* Array of pointers to span nodes */
+    H5S_hyper_span_info_t *spans;              /* Pointer to copy of the span tree */
+    H5S_hyper_span_t *     span[H5S_MAX_RANK]; /* Array of pointers to span nodes */
 } H5S_hyper_iter_t;
 
 /* "All" selection iteration container */
 typedef struct {
-    hsize_t elmt_offset;         /* Next element to output */
-    hsize_t byte_offset;         /* Next byte to output */
+    hsize_t elmt_offset; /* Next element to output */
+    hsize_t byte_offset; /* Next byte to output */
 } H5S_all_iter_t;
 
 /* Forward declaration of selection iteration class */
@@ -101,161 +101,157 @@ typedef struct H5S_sel_iter_t {
     const struct H5S_sel_iter_class_t *type; /* Selection iteration class info */
 
     /* Information common to all iterators */
-    unsigned rank;              /* Rank of dataspace the selection iterator is operating on */
-    hsize_t *dims;              /* Dimensions of dataspace the selection is operating on */
-    hsize_t elmt_left;          /* Number of elements left to iterate over */
-    size_t elmt_size;           /* Size of elements to iterate over */
+    unsigned rank;      /* Rank of dataspace the selection iterator is operating on */
+    hsize_t *dims;      /* Dimensions of dataspace the selection is operating on */
+    hsize_t  elmt_left; /* Number of elements left to iterate over */
+    size_t   elmt_size; /* Size of elements to iterate over */
 
     /* Information specific to each type of iterator */
     union {
-        H5S_point_iter_t pnt;   /* Point selection iteration information */
-        H5S_hyper_iter_t hyp;   /* New Hyperslab selection iteration information */
-        H5S_all_iter_t all;     /* "All" selection iteration information */
+        H5S_point_iter_t pnt; /* Point selection iteration information */
+        H5S_hyper_iter_t hyp; /* New Hyperslab selection iteration information */
+        H5S_all_iter_t   all; /* "All" selection iteration information */
     } u;
 } H5S_sel_iter_t;
 
 /* Selection iteration operator for internal library callbacks */
-typedef herr_t (*H5S_sel_iter_lib_op_t)(void *elem, const H5T_t *type,
-        unsigned ndim, const hsize_t *point, void *op_data);
+typedef herr_t (*H5S_sel_iter_lib_op_t)(void *elem, const H5T_t *type, unsigned ndim, const hsize_t *point,
+                                        void *op_data);
 
 /* Describe kind of callback to make */
 typedef enum H5S_sel_iter_op_type_t {
-    H5S_SEL_ITER_OP_APP,                /* Application callback */
-    H5S_SEL_ITER_OP_LIB                 /* Library internal callback */
+    H5S_SEL_ITER_OP_APP, /* Application callback */
+    H5S_SEL_ITER_OP_LIB  /* Library internal callback */
 } H5S_sel_iter_op_type_t;
 
 typedef struct H5S_sel_iter_app_op_t {
-    H5D_operator_t op;                  /* Callback */
-    hid_t type_id;                      /* Type ID to be passed to callback */
+    H5D_operator_t op;      /* Callback */
+    hid_t          type_id; /* Type ID to be passed to callback */
 } H5S_sel_iter_app_op_t;
 
 typedef struct H5S_sel_iter_op_t {
     H5S_sel_iter_op_type_t op_type;
     union {
-        H5S_sel_iter_app_op_t app_op;   /* Application callback */
-        H5S_sel_iter_lib_op_t lib_op;   /* Library internal callback */
+        H5S_sel_iter_app_op_t app_op; /* Application callback */
+        H5S_sel_iter_lib_op_t lib_op; /* Library internal callback */
     } u;
 } H5S_sel_iter_op_t;
 
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5S_PACKAGE
-#define H5S_GET_EXTENT_TYPE(S)          ((S)->extent.type)
-#define H5S_GET_EXTENT_NDIMS(S)         ((S)->extent.rank)
-#define H5S_GET_EXTENT_NPOINTS(S)       ((S)->extent.nelem)
-#define H5S_GET_SELECT_NPOINTS(S)       ((S)->select.num_elem)
-#define H5S_GET_SELECT_TYPE(S)          ((S)->select.type->type)
-#define H5S_SELECT_GET_SEQ_LIST(S,FLAGS,ITER,MAXSEQ,MAXBYTES,NSEQ,NBYTES,OFF,LEN)             ((*(S)->select.type->get_seq_list)(S,FLAGS,ITER,MAXSEQ,MAXBYTES,NSEQ,NBYTES,OFF,LEN))
-#define H5S_SELECT_VALID(S)             ((*(S)->select.type->is_valid)(S))
-#define H5S_SELECT_RELEASE(S)           ((*(S)->select.type->release)(S))
-#define H5S_SELECT_SERIAL_SIZE(S)       ((*(S)->select.type->serial_size)(S))
-#define H5S_SELECT_SERIALIZE(S,BUF)     ((*(S)->select.type->serialize)(S,BUF))
-#define H5S_SELECT_BOUNDS(S,START,END)  ((*(S)->select.type->bounds)(S,START,END))
-#define H5S_SELECT_OFFSET(S, OFFSET)    ((*(S)->select.type->offset)(S, OFFSET))
-#define H5S_SELECT_IS_CONTIGUOUS(S)     ((*(S)->select.type->is_contiguous)(S))
-#define H5S_SELECT_IS_SINGLE(S)         ((*(S)->select.type->is_single)(S))
-#define H5S_SELECT_IS_REGULAR(S)        ((*(S)->select.type->is_regular)(S))
-#define H5S_SELECT_ADJUST_U(S,O)        ((*(S)->select.type->adjust_u)(S, O))
-#define H5S_SELECT_PROJECT_SCALAR(S,O)  ((*(S)->select.type->project_scalar)(S, O))
-#define H5S_SELECT_PROJECT_SIMPLE(S,NS, O) ((*(S)->select.type->project_simple)(S, NS, O))
-#define H5S_SELECT_ITER_COORDS(ITER,COORDS)     ((*(ITER)->type->iter_coords)(ITER,COORDS))
-#define H5S_SELECT_ITER_BLOCK(ITER,START,END)   ((*(ITER)->type->iter_block)(ITER,START,END))
-#define H5S_SELECT_ITER_NELMTS(ITER)    ((*(ITER)->type->iter_nelmts)(ITER))
+#define H5S_GET_EXTENT_TYPE(S)    ((S)->extent.type)
+#define H5S_GET_EXTENT_NDIMS(S)   ((S)->extent.rank)
+#define H5S_GET_EXTENT_NPOINTS(S) ((S)->extent.nelem)
+#define H5S_GET_SELECT_NPOINTS(S) ((S)->select.num_elem)
+#define H5S_GET_SELECT_TYPE(S)    ((S)->select.type->type)
+#define H5S_SELECT_GET_SEQ_LIST(S, FLAGS, ITER, MAXSEQ, MAXBYTES, NSEQ, NBYTES, OFF, LEN)                    \
+    ((*(S)->select.type->get_seq_list)(S, FLAGS, ITER, MAXSEQ, MAXBYTES, NSEQ, NBYTES, OFF, LEN))
+#define H5S_SELECT_VALID(S)                     ((*(S)->select.type->is_valid)(S))
+#define H5S_SELECT_RELEASE(S)                   ((*(S)->select.type->release)(S))
+#define H5S_SELECT_SERIAL_SIZE(S)               ((*(S)->select.type->serial_size)(S))
+#define H5S_SELECT_SERIALIZE(S, BUF)            ((*(S)->select.type->serialize)(S, BUF))
+#define H5S_SELECT_BOUNDS(S, START, END)        ((*(S)->select.type->bounds)(S, START, END))
+#define H5S_SELECT_OFFSET(S, OFFSET)            ((*(S)->select.type->offset)(S, OFFSET))
+#define H5S_SELECT_IS_CONTIGUOUS(S)             ((*(S)->select.type->is_contiguous)(S))
+#define H5S_SELECT_IS_SINGLE(S)                 ((*(S)->select.type->is_single)(S))
+#define H5S_SELECT_IS_REGULAR(S)                ((*(S)->select.type->is_regular)(S))
+#define H5S_SELECT_ADJUST_U(S, O)               ((*(S)->select.type->adjust_u)(S, O))
+#define H5S_SELECT_PROJECT_SCALAR(S, O)         ((*(S)->select.type->project_scalar)(S, O))
+#define H5S_SELECT_PROJECT_SIMPLE(S, NS, O)     ((*(S)->select.type->project_simple)(S, NS, O))
+#define H5S_SELECT_ITER_COORDS(ITER, COORDS)    ((*(ITER)->type->iter_coords)(ITER, COORDS))
+#define H5S_SELECT_ITER_BLOCK(ITER, START, END) ((*(ITER)->type->iter_block)(ITER, START, END))
+#define H5S_SELECT_ITER_NELMTS(ITER)            ((*(ITER)->type->iter_nelmts)(ITER))
 #define H5S_SELECT_ITER_HAS_NEXT_BLOCK(ITER)    ((*(ITER)->type->iter_has_next_block)(ITER))
-#define H5S_SELECT_ITER_NEXT(ITER,NELEM)((*(ITER)->type->iter_next)(ITER,NELEM))
+#define H5S_SELECT_ITER_NEXT(ITER, NELEM)       ((*(ITER)->type->iter_next)(ITER, NELEM))
 #define H5S_SELECT_ITER_NEXT_BLOCK(ITER)        ((*(ITER)->type->iter_next_block)(ITER))
-#define H5S_SELECT_ITER_RELEASE(ITER)   ((*(ITER)->type->iter_release)(ITER))
+#define H5S_SELECT_ITER_RELEASE(ITER)           ((*(ITER)->type->iter_release)(ITER))
 #else /* H5S_PACKAGE */
-#define H5S_GET_EXTENT_TYPE(S)          (H5S_get_simple_extent_type(S))
-#define H5S_GET_EXTENT_NDIMS(S)         (H5S_get_simple_extent_ndims(S))
-#define H5S_GET_EXTENT_NPOINTS(S)       (H5S_get_simple_extent_npoints(S))
-#define H5S_GET_SELECT_NPOINTS(S)       (H5S_get_select_npoints(S))
-#define H5S_GET_SELECT_TYPE(S)          (H5S_get_select_type(S))
-#define H5S_SELECT_GET_SEQ_LIST(S,FLAGS,ITER,MAXSEQ,MAXBYTES,NSEQ,NBYTES,OFF,LEN)       (H5S_select_get_seq_list(S,FLAGS,ITER,MAXSEQ,MAXBYTES,NSEQ,NBYTES,OFF,LEN))
-#define H5S_SELECT_VALID(S)             (H5S_select_valid(S))
-#define H5S_SELECT_RELEASE(S)           (H5S_select_release(S))
-#define H5S_SELECT_SERIAL_SIZE(S)       (H5S_select_serial_size(S))
-#define H5S_SELECT_SERIALIZE(S,BUF)     (H5S_select_serialize(S,BUF))
-#define H5S_SELECT_BOUNDS(S,START,END)  (H5S_get_select_bounds(S,START,END))
-#define H5S_SELECT_OFFSET(S, OFFSET)    (H5S_get_select_offset(S, OFFSET))
-#define H5S_SELECT_IS_CONTIGUOUS(S)     (H5S_select_is_contiguous(S))
-#define H5S_SELECT_IS_SINGLE(S)         (H5S_select_is_single(S))
-#define H5S_SELECT_IS_REGULAR(S)        (H5S_select_is_regular(S))
-#define H5S_SELECT_ADJUST_U(S,O)        (H5S_select_adjust_u(S, O))
-#define H5S_SELECT_PROJECT_SCALAR(S,O)  (H5S_select_project_scalar)(S, O))
-#define H5S_SELECT_PROJECT_SIMPLE(S,NS,O) (H5S_select_project_simple)(S, NS, O))
-#define H5S_SELECT_ITER_COORDS(ITER,COORDS)     (H5S_select_iter_coords(ITER,COORDS))
-#define H5S_SELECT_ITER_BLOCK(ITER,START,END)   (H5S_select_iter_block(ITER,START,END))
-#define H5S_SELECT_ITER_NELMTS(ITER)    (H5S_select_iter_nelmts(ITER))
+#define H5S_GET_EXTENT_TYPE(S)    (H5S_get_simple_extent_type(S))
+#define H5S_GET_EXTENT_NDIMS(S)   (H5S_get_simple_extent_ndims(S))
+#define H5S_GET_EXTENT_NPOINTS(S) (H5S_get_simple_extent_npoints(S))
+#define H5S_GET_SELECT_NPOINTS(S) (H5S_get_select_npoints(S))
+#define H5S_GET_SELECT_TYPE(S)    (H5S_get_select_type(S))
+#define H5S_SELECT_GET_SEQ_LIST(S, FLAGS, ITER, MAXSEQ, MAXBYTES, NSEQ, NBYTES, OFF, LEN)                    \
+    (H5S_select_get_seq_list(S, FLAGS, ITER, MAXSEQ, MAXBYTES, NSEQ, NBYTES, OFF, LEN))
+#define H5S_SELECT_VALID(S)              (H5S_select_valid(S))
+#define H5S_SELECT_RELEASE(S)            (H5S_select_release(S))
+#define H5S_SELECT_SERIAL_SIZE(S)        (H5S_select_serial_size(S))
+#define H5S_SELECT_SERIALIZE(S, BUF)     (H5S_select_serialize(S, BUF))
+#define H5S_SELECT_BOUNDS(S, START, END) (H5S_get_select_bounds(S, START, END))
+#define H5S_SELECT_OFFSET(S, OFFSET)     (H5S_get_select_offset(S, OFFSET))
+#define H5S_SELECT_IS_CONTIGUOUS(S)      (H5S_select_is_contiguous(S))
+#define H5S_SELECT_IS_SINGLE(S)          (H5S_select_is_single(S))
+#define H5S_SELECT_IS_REGULAR(S)         (H5S_select_is_regular(S))
+#define H5S_SELECT_ADJUST_U(S, O)        (H5S_select_adjust_u(S, O))
+#define H5S_SELECT_PROJECT_SCALAR(S, O)  (H5S_select_project_scalar)(S, O))
+#define H5S_SELECT_PROJECT_SIMPLE(S, NS, O) (H5S_select_project_simple)(S, NS, O))
+#define H5S_SELECT_ITER_COORDS(ITER, COORDS)    (H5S_select_iter_coords(ITER, COORDS))
+#define H5S_SELECT_ITER_BLOCK(ITER, START, END) (H5S_select_iter_block(ITER, START, END))
+#define H5S_SELECT_ITER_NELMTS(ITER)            (H5S_select_iter_nelmts(ITER))
 #define H5S_SELECT_ITER_HAS_NEXT_BLOCK(ITER)    (H5S_select_iter_has_next_block(ITER))
-#define H5S_SELECT_ITER_NEXT(ITER,NELEM)(H5S_select_iter_next(ITER,NELEM))
+#define H5S_SELECT_ITER_NEXT(ITER, NELEM)       (H5S_select_iter_next(ITER, NELEM))
 #define H5S_SELECT_ITER_NEXT_BLOCK(ITER)        (H5S_select_iter_next_block(ITER))
-#define H5S_SELECT_ITER_RELEASE(ITER)   (H5S_select_iter_release(ITER))
+#define H5S_SELECT_ITER_RELEASE(ITER)           (H5S_select_iter_release(ITER))
 #endif /* H5S_PACKAGE */
 /* Handle these two callbacks in a special way, since they have prologs that need to be executed */
-#define H5S_SELECT_COPY(DST,SRC,SHARE)  (H5S_select_copy(DST,SRC,SHARE))
-#define H5S_SELECT_DESERIALIZE(S,BUF)   (H5S_select_deserialize(S,BUF))
-
+#define H5S_SELECT_COPY(DST, SRC, SHARE) (H5S_select_copy(DST, SRC, SHARE))
+#define H5S_SELECT_DESERIALIZE(S, BUF)   (H5S_select_deserialize(S, BUF))
 
 /* Operations on dataspaces */
-H5_DLL H5S_t *H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max);
-H5_DLL herr_t H5S_close(H5S_t *ds);
+H5_DLL H5S_t *     H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max);
+H5_DLL herr_t      H5S_close(H5S_t *ds);
 H5_DLL H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds);
-H5_DLL hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds);
-H5_DLL hsize_t H5S_get_npoints_max(const H5S_t *ds);
-H5_DLL hbool_t H5S_has_extent(const H5S_t *ds);
-H5_DLL int H5S_get_simple_extent_ndims(const H5S_t *ds);
-H5_DLL int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/,
-    hsize_t max_dims[]/*out*/);
-H5_DLL herr_t H5S_write(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned update_flags,
-    H5S_t *ds);
+H5_DLL hssize_t    H5S_get_simple_extent_npoints(const H5S_t *ds);
+H5_DLL hsize_t     H5S_get_npoints_max(const H5S_t *ds);
+H5_DLL hbool_t     H5S_has_extent(const H5S_t *ds);
+H5_DLL int         H5S_get_simple_extent_ndims(const H5S_t *ds);
+H5_DLL int    H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[] /*out*/, hsize_t max_dims[] /*out*/);
+H5_DLL herr_t H5S_write(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned update_flags, H5S_t *ds);
 H5_DLL herr_t H5S_append(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh, H5S_t *ds);
 H5_DLL H5S_t *H5S_read(const struct H5O_loc_t *loc, hid_t dxpl_id);
 H5_DLL htri_t H5S_set_extent(H5S_t *space, const hsize_t *size);
 H5_DLL herr_t H5S_set_extent_real(H5S_t *space, const hsize_t *size);
 H5_DLL H5S_t *H5S_create(H5S_class_t type);
-H5_DLL H5S_t *H5S_create_simple(unsigned rank, const hsize_t dims[/*rank*/],
-    const hsize_t maxdims[/*rank*/]);
+H5_DLL H5S_t *H5S_create_simple(unsigned rank, const hsize_t dims[/*rank*/], const hsize_t maxdims[/*rank*/]);
 H5_DLL herr_t H5S_set_latest_version(H5S_t *ds);
-H5_DLL herr_t H5S_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
-    int indent, int fwidth);
+H5_DLL herr_t H5S_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 H5_DLL int H5S_extend(H5S_t *space, const hsize_t *size);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /* Operations on dataspace extents */
 H5_DLL hsize_t H5S_extent_nelem(const H5S_extent_t *ext);
-H5_DLL int H5S_extent_get_dims(const H5S_extent_t *ext, hsize_t dims[], hsize_t max_dims[]);
-H5_DLL htri_t H5S_extent_equal(const H5S_t *ds1, const H5S_t *ds2);
+H5_DLL int     H5S_extent_get_dims(const H5S_extent_t *ext, hsize_t dims[], hsize_t max_dims[]);
+H5_DLL htri_t  H5S_extent_equal(const H5S_t *ds1, const H5S_t *ds2);
 
 /* Operations on selections */
-H5_DLL herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf);
+H5_DLL herr_t       H5S_select_deserialize(H5S_t *space, const uint8_t *buf);
 H5_DLL H5S_sel_type H5S_get_select_type(const H5S_t *space);
-H5_DLL herr_t H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
-    const H5S_sel_iter_op_t *op, void *op_data);
-H5_DLL herr_t H5S_select_fill(const void *fill, size_t fill_size,
-    const H5S_t *space, void *buf);
-H5_DLL htri_t H5S_select_valid(const H5S_t *space);
-H5_DLL hsize_t H5S_get_select_npoints(const H5S_t *space);
-H5_DLL herr_t H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
-H5_DLL herr_t H5S_get_select_offset(const H5S_t *space, hsize_t *offset);
-H5_DLL herr_t H5S_select_offset(H5S_t *space, const hssize_t *offset);
-H5_DLL herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
-H5_DLL htri_t H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2);
-H5_DLL herr_t H5S_select_construct_projection(const H5S_t *base_space,
-    H5S_t **new_space_ptr, unsigned new_space_rank, const void *buf,
-    void const **adj_buf_ptr, hsize_t element_size);
-H5_DLL herr_t H5S_select_release(H5S_t *ds);
-H5_DLL herr_t H5S_select_get_seq_list(const H5S_t *space, unsigned flags,
-    H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,
-    size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
+H5_DLL herr_t       H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
+                                       const H5S_sel_iter_op_t *op, void *op_data);
+H5_DLL herr_t       H5S_select_fill(const void *fill, size_t fill_size, const H5S_t *space, void *buf);
+H5_DLL htri_t       H5S_select_valid(const H5S_t *space);
+H5_DLL hsize_t      H5S_get_select_npoints(const H5S_t *space);
+H5_DLL herr_t       H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+H5_DLL herr_t       H5S_get_select_offset(const H5S_t *space, hsize_t *offset);
+H5_DLL herr_t       H5S_select_offset(H5S_t *space, const hssize_t *offset);
+H5_DLL herr_t       H5S_select_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
+H5_DLL htri_t       H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2);
+H5_DLL herr_t       H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
+                                                    unsigned new_space_rank, const void *buf,
+                                                    void const **adj_buf_ptr, hsize_t element_size);
+H5_DLL herr_t       H5S_select_release(H5S_t *ds);
+H5_DLL herr_t H5S_select_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t maxseq,
+                                      size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off,
+                                      size_t *len);
 H5_DLL hssize_t H5S_select_serial_size(const H5S_t *space);
-H5_DLL herr_t H5S_select_serialize(const H5S_t *space, uint8_t *buf);
-H5_DLL htri_t H5S_select_is_contiguous(const H5S_t *space);
-H5_DLL htri_t H5S_select_is_single(const H5S_t *space);
-H5_DLL htri_t H5S_select_is_regular(const H5S_t *space);
-H5_DLL herr_t H5S_select_adjust_u(H5S_t *space, const hsize_t *offset);
-H5_DLL herr_t H5S_select_project_scalar(const H5S_t *space, hsize_t *offset);
-H5_DLL herr_t H5S_select_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
+H5_DLL herr_t   H5S_select_serialize(const H5S_t *space, uint8_t *buf);
+H5_DLL htri_t   H5S_select_is_contiguous(const H5S_t *space);
+H5_DLL htri_t   H5S_select_is_single(const H5S_t *space);
+H5_DLL htri_t   H5S_select_is_regular(const H5S_t *space);
+H5_DLL herr_t   H5S_select_adjust_u(H5S_t *space, const hsize_t *offset);
+H5_DLL herr_t   H5S_select_project_scalar(const H5S_t *space, hsize_t *offset);
+H5_DLL herr_t   H5S_select_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
 
 /* Operations on all selections */
 H5_DLL herr_t H5S_select_all(H5S_t *space, hbool_t rel_prev);
@@ -264,40 +260,33 @@ H5_DLL herr_t H5S_select_all(H5S_t *space, hbool_t rel_prev);
 H5_DLL herr_t H5S_select_none(H5S_t *space);
 
 /* Operations on point selections */
-H5_DLL herr_t H5S_select_elements(H5S_t *space, H5S_seloper_t op,
-    size_t num_elem, const hsize_t *coord);
+H5_DLL herr_t H5S_select_elements(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *coord);
 
 /* Operations on hyperslab selections */
-H5_DLL herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, const hsize_t start[],
-    const hsize_t *stride, const hsize_t count[], const hsize_t *block);
-H5_DLL herr_t H5S_hyper_add_span_element(H5S_t *space, unsigned rank,
-    hsize_t *coords);
+H5_DLL herr_t H5S_select_hyperslab(H5S_t *space, H5S_seloper_t op, const hsize_t start[],
+                                   const hsize_t *stride, const hsize_t count[], const hsize_t *block);
+H5_DLL herr_t H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hsize_t *coords);
 H5_DLL herr_t H5S_hyper_reset_scratch(H5S_t *space);
 H5_DLL herr_t H5S_hyper_convert(H5S_t *space);
 #ifdef LATER
-H5_DLL htri_t H5S_hyper_intersect (H5S_t *space1, H5S_t *space2);
+H5_DLL htri_t H5S_hyper_intersect(H5S_t *space1, H5S_t *space2);
 #endif /* LATER */
-H5_DLL htri_t H5S_hyper_intersect_block (H5S_t *space, hsize_t *start, hsize_t *end);
+H5_DLL htri_t H5S_hyper_intersect_block(H5S_t *space, hsize_t *start, hsize_t *end);
 H5_DLL herr_t H5S_hyper_adjust_s(H5S_t *space, const hssize_t *offset);
 H5_DLL htri_t H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset);
 H5_DLL herr_t H5S_hyper_denormalize_offset(H5S_t *space, const hssize_t *old_offset);
 
 /* Operations on selection iterators */
-H5_DLL herr_t H5S_select_iter_init(H5S_sel_iter_t *iter, const H5S_t *space, size_t elmt_size);
-H5_DLL herr_t H5S_select_iter_coords(const H5S_sel_iter_t *sel_iter, hsize_t *coords);
+H5_DLL herr_t  H5S_select_iter_init(H5S_sel_iter_t *iter, const H5S_t *space, size_t elmt_size);
+H5_DLL herr_t  H5S_select_iter_coords(const H5S_sel_iter_t *sel_iter, hsize_t *coords);
 H5_DLL hsize_t H5S_select_iter_nelmts(const H5S_sel_iter_t *sel_iter);
-H5_DLL herr_t H5S_select_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
-H5_DLL herr_t H5S_select_iter_release(H5S_sel_iter_t *sel_iter);
+H5_DLL herr_t  H5S_select_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
+H5_DLL herr_t  H5S_select_iter_release(H5S_sel_iter_t *sel_iter);
 
 #ifdef H5_HAVE_PARALLEL
 H5_DLL herr_t H5S_mpio_space_type(const H5S_t *space, size_t elmt_size,
-    /* out: */  MPI_Datatype *new_type,
-                int *count,
-                hbool_t *is_derived_type,
-                hbool_t do_permute, 
-                hsize_t **permute_map,
-                hbool_t * is_permuted);
+                                  /* out: */ MPI_Datatype *new_type, int *count, hbool_t *is_derived_type,
+                                  hbool_t do_permute, hsize_t **permute_map, hbool_t *is_permuted);
 #endif /* H5_HAVE_PARALLEL */
 
 #endif /* _H5Sprivate_H */
-
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index c7c073d..105202d 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -22,129 +22,114 @@
 #include "H5Ipublic.h"
 
 /* Define atomic datatypes */
-#define H5S_ALL         (hid_t)0
-#define H5S_UNLIMITED	((hsize_t)(hssize_t)(-1))
+#define H5S_ALL       (hid_t)0
+#define H5S_UNLIMITED ((hsize_t)(hssize_t)(-1))
 
 /* Define user-level maximum number of dimensions */
-#define H5S_MAX_RANK    32
+#define H5S_MAX_RANK 32
 
 /* Different types of dataspaces */
 typedef enum H5S_class_t {
-    H5S_NO_CLASS         = -1,  /*error                                      */
-    H5S_SCALAR           = 0,   /*scalar variable                            */
-    H5S_SIMPLE           = 1,   /*simple data space                          */
-    H5S_NULL             = 2    /*null data space                            */
+    H5S_NO_CLASS = -1, /*error                                      */
+    H5S_SCALAR   = 0,  /*scalar variable                            */
+    H5S_SIMPLE   = 1,  /*simple data space                          */
+    H5S_NULL     = 2   /*null data space                            */
 } H5S_class_t;
 
 /* Different ways of combining selections */
 typedef enum H5S_seloper_t {
-    H5S_SELECT_NOOP      = -1,  /* error                                     */
-    H5S_SELECT_SET       = 0,   /* Select "set" operation 		     */
-    H5S_SELECT_OR,              /* Binary "or" operation for hyperslabs
-                                 * (add new selection to existing selection)
-                                 * Original region:  AAAAAAAAAA
-                                 * New region:             BBBBBBBBBB
-                                 * A or B:           CCCCCCCCCCCCCCCC
-                                 */
-    H5S_SELECT_AND,             /* Binary "and" operation for hyperslabs
-                                 * (only leave overlapped regions in selection)
-                                 * Original region:  AAAAAAAAAA
-                                 * New region:             BBBBBBBBBB
-                                 * A and B:                CCCC
-                                 */
-    H5S_SELECT_XOR,             /* Binary "xor" operation for hyperslabs
-                                 * (only leave non-overlapped regions in selection)
-                                 * Original region:  AAAAAAAAAA
-                                 * New region:             BBBBBBBBBB
-                                 * A xor B:          CCCCCC    CCCCCC
-                                 */
-    H5S_SELECT_NOTB,            /* Binary "not" operation for hyperslabs
-                                 * (only leave non-overlapped regions in original selection)
-                                 * Original region:  AAAAAAAAAA
-                                 * New region:             BBBBBBBBBB
-                                 * A not B:          CCCCCC
-                                 */
-    H5S_SELECT_NOTA,            /* Binary "not" operation for hyperslabs
-                                 * (only leave non-overlapped regions in new selection)
-                                 * Original region:  AAAAAAAAAA
-                                 * New region:             BBBBBBBBBB
-                                 * B not A:                    CCCCCC
-                                 */
-    H5S_SELECT_APPEND,          /* Append elements to end of point selection */
-    H5S_SELECT_PREPEND,         /* Prepend elements to beginning of point selection */
-    H5S_SELECT_INVALID          /* Invalid upper bound on selection operations */
+    H5S_SELECT_NOOP = -1, /* error                                     */
+    H5S_SELECT_SET  = 0,  /* Select "set" operation 		     */
+    H5S_SELECT_OR,        /* Binary "or" operation for hyperslabs
+                           * (add new selection to existing selection)
+                           * Original region:  AAAAAAAAAA
+                           * New region:             BBBBBBBBBB
+                           * A or B:           CCCCCCCCCCCCCCCC
+                           */
+    H5S_SELECT_AND,       /* Binary "and" operation for hyperslabs
+                           * (only leave overlapped regions in selection)
+                           * Original region:  AAAAAAAAAA
+                           * New region:             BBBBBBBBBB
+                           * A and B:                CCCC
+                           */
+    H5S_SELECT_XOR,       /* Binary "xor" operation for hyperslabs
+                           * (only leave non-overlapped regions in selection)
+                           * Original region:  AAAAAAAAAA
+                           * New region:             BBBBBBBBBB
+                           * A xor B:          CCCCCC    CCCCCC
+                           */
+    H5S_SELECT_NOTB,      /* Binary "not" operation for hyperslabs
+                           * (only leave non-overlapped regions in original selection)
+                           * Original region:  AAAAAAAAAA
+                           * New region:             BBBBBBBBBB
+                           * A not B:          CCCCCC
+                           */
+    H5S_SELECT_NOTA,      /* Binary "not" operation for hyperslabs
+                           * (only leave non-overlapped regions in new selection)
+                           * Original region:  AAAAAAAAAA
+                           * New region:             BBBBBBBBBB
+                           * B not A:                    CCCCCC
+                           */
+    H5S_SELECT_APPEND,    /* Append elements to end of point selection */
+    H5S_SELECT_PREPEND,   /* Prepend elements to beginning of point selection */
+    H5S_SELECT_INVALID    /* Invalid upper bound on selection operations */
 } H5S_seloper_t;
 
 /* Enumerated type for the type of selection */
 typedef enum {
-    H5S_SEL_ERROR	= -1, 	/* Error			*/
-    H5S_SEL_NONE	= 0,    /* Nothing selected 		*/
-    H5S_SEL_POINTS	= 1,    /* Sequence of points selected	*/
-    H5S_SEL_HYPERSLABS  = 2,    /* "New-style" hyperslab selection defined	*/
-    H5S_SEL_ALL		= 3,    /* Entire extent selected	*/
-    H5S_SEL_N			/*THIS MUST BE LAST		*/
-}H5S_sel_type;
+    H5S_SEL_ERROR      = -1, /* Error			*/
+    H5S_SEL_NONE       = 0,  /* Nothing selected 		*/
+    H5S_SEL_POINTS     = 1,  /* Sequence of points selected	*/
+    H5S_SEL_HYPERSLABS = 2,  /* "New-style" hyperslab selection defined	*/
+    H5S_SEL_ALL        = 3,  /* Entire extent selected	*/
+    H5S_SEL_N                /*THIS MUST BE LAST		*/
+} H5S_sel_type;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Functions in H5S.c */
-H5_DLL hid_t H5Screate(H5S_class_t type);
-H5_DLL hid_t H5Screate_simple(int rank, const hsize_t dims[],
-			       const hsize_t maxdims[]);
-H5_DLL herr_t H5Sset_extent_simple(hid_t space_id, int rank,
-				    const hsize_t dims[],
-				    const hsize_t max[]);
-H5_DLL hid_t H5Scopy(hid_t space_id);
-H5_DLL herr_t H5Sclose(hid_t space_id);
-H5_DLL herr_t H5Sencode(hid_t obj_id, void *buf, size_t *nalloc);
-H5_DLL hid_t H5Sdecode(const void *buf);
+H5_DLL hid_t    H5Screate(H5S_class_t type);
+H5_DLL hid_t    H5Screate_simple(int rank, const hsize_t dims[], const hsize_t maxdims[]);
+H5_DLL herr_t   H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[], const hsize_t max[]);
+H5_DLL hid_t    H5Scopy(hid_t space_id);
+H5_DLL herr_t   H5Sclose(hid_t space_id);
+H5_DLL herr_t   H5Sencode(hid_t obj_id, void *buf, size_t *nalloc);
+H5_DLL hid_t    H5Sdecode(const void *buf);
 H5_DLL hssize_t H5Sget_simple_extent_npoints(hid_t space_id);
-H5_DLL int H5Sget_simple_extent_ndims(hid_t space_id);
-H5_DLL int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[],
-				      hsize_t maxdims[]);
-H5_DLL htri_t H5Sis_simple(hid_t space_id);
+H5_DLL int      H5Sget_simple_extent_ndims(hid_t space_id);
+H5_DLL int      H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
+H5_DLL htri_t   H5Sis_simple(hid_t space_id);
 H5_DLL hssize_t H5Sget_select_npoints(hid_t spaceid);
-H5_DLL herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op,
-				   const hsize_t start[],
-				   const hsize_t _stride[],
-				   const hsize_t count[],
-				   const hsize_t _block[]);
+H5_DLL herr_t   H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
+                                    const hsize_t _stride[], const hsize_t count[], const hsize_t _block[]);
 /* #define NEW_HYPERSLAB_API */
 #ifdef NEW_HYPERSLAB_API
-H5_DLL hid_t H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op,
-				   const hsize_t start[],
-				   const hsize_t _stride[],
-				   const hsize_t count[],
-				   const hsize_t _block[]);
-H5_DLL herr_t H5Sselect_select(hid_t space1_id, H5S_seloper_t op,
-                                  hid_t space2_id);
-H5_DLL hid_t H5Scombine_select(hid_t space1_id, H5S_seloper_t op,
-                                  hid_t space2_id);
+H5_DLL hid_t  H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
+                                   const hsize_t _stride[], const hsize_t count[], const hsize_t _block[]);
+H5_DLL herr_t H5Sselect_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id);
+H5_DLL hid_t  H5Scombine_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id);
 #endif /* NEW_HYPERSLAB_API */
-H5_DLL herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op,
-    size_t num_elem, const hsize_t *coord);
-H5_DLL H5S_class_t H5Sget_simple_extent_type(hid_t space_id);
-H5_DLL herr_t H5Sset_extent_none(hid_t space_id);
-H5_DLL herr_t H5Sextent_copy(hid_t dst_id,hid_t src_id);
-H5_DLL htri_t H5Sextent_equal(hid_t sid1, hid_t sid2);
-H5_DLL herr_t H5Sselect_all(hid_t spaceid);
-H5_DLL herr_t H5Sselect_none(hid_t spaceid);
-H5_DLL herr_t H5Soffset_simple(hid_t space_id, const hssize_t *offset);
-H5_DLL htri_t H5Sselect_valid(hid_t spaceid);
-H5_DLL hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid);
-H5_DLL hssize_t H5Sget_select_elem_npoints(hid_t spaceid);
-H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock,
-    hsize_t numblocks, hsize_t buf[/*numblocks*/]);
-H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint,
-    hsize_t numpoints, hsize_t buf[/*numpoints*/]);
-H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t start[],
-    hsize_t end[]);
+H5_DLL herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op, size_t num_elem, const hsize_t *coord);
+H5_DLL H5S_class_t  H5Sget_simple_extent_type(hid_t space_id);
+H5_DLL herr_t       H5Sset_extent_none(hid_t space_id);
+H5_DLL herr_t       H5Sextent_copy(hid_t dst_id, hid_t src_id);
+H5_DLL htri_t       H5Sextent_equal(hid_t sid1, hid_t sid2);
+H5_DLL herr_t       H5Sselect_all(hid_t spaceid);
+H5_DLL herr_t       H5Sselect_none(hid_t spaceid);
+H5_DLL herr_t       H5Soffset_simple(hid_t space_id, const hssize_t *offset);
+H5_DLL htri_t       H5Sselect_valid(hid_t spaceid);
+H5_DLL hssize_t     H5Sget_select_hyper_nblocks(hid_t spaceid);
+H5_DLL hssize_t     H5Sget_select_elem_npoints(hid_t spaceid);
+H5_DLL herr_t       H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks,
+                                                  hsize_t buf[/*numblocks*/]);
+H5_DLL herr_t       H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints,
+                                                 hsize_t buf[/*numpoints*/]);
+H5_DLL herr_t       H5Sget_select_bounds(hid_t spaceid, hsize_t start[], hsize_t end[]);
 H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid);
 
 #ifdef __cplusplus
 }
 #endif
 #endif /* _H5Spublic_H */
-
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 0055421..d13fce9 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -17,18 +17,17 @@
  * Purpose:	Dataspace selection functions.
  */
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
-
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Spkg.h"		/* Dataspaces 				*/
-#include "H5VMprivate.h"		/* Vector and array functions		*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Spkg.h"      /* Dataspaces 				*/
+#include "H5VMprivate.h" /* Vector and array functions		*/
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /* Local functions */
 #ifdef LATER
@@ -37,8 +36,6 @@ static htri_t H5S_select_iter_has_next_block(const H5S_sel_iter_t *iter);
 static herr_t H5S_select_iter_next_block(H5S_sel_iter_t *iter);
 #endif /* LATER */
 
-
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_offset
@@ -69,15 +66,14 @@ H5S_select_offset(H5S_t *space, const hssize_t *offset)
     HDassert(offset);
 
     /* Copy the offset over */
-    HDmemcpy(space->select.offset, offset, sizeof(hssize_t)*space->extent.rank);
+    HDmemcpy(space->select.offset, offset, sizeof(hssize_t) * space->extent.rank);
 
     /* Indicate that the offset was changed */
     space->select.offset_changed = TRUE;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5S_select_offset() */
+} /* H5S_select_offset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_copy
@@ -103,9 +99,9 @@ H5S_select_offset(H5S_t *space, const hssize_t *offset)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_select_copy (H5S_t *dst, const H5S_t *src, hbool_t share_selection)
+H5S_select_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection)
 {
-    herr_t ret_value;     /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -114,17 +110,16 @@ H5S_select_copy (H5S_t *dst, const H5S_t *src, hbool_t share_selection)
     HDassert(src);
 
     /* Copy regular fields */
-    dst->select=src->select;
+    dst->select = src->select;
 
     /* Perform correct type of copy based on the type of selection */
-    if((ret_value=(*src->select.type->copy)(dst,src,share_selection))<0)
+    if ((ret_value = (*src->select.type->copy)(dst, src, share_selection)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "can't copy selection specific information")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_copy() */
+} /* H5S_select_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_select_release
  *
@@ -146,19 +141,18 @@ done:
 herr_t
 H5S_select_release(H5S_t *ds)
 {
-    herr_t ret_value;   /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(ds);
 
     /* Call the selection type's release function */
-    ret_value=(*ds->select.type->release)(ds);
+    ret_value = (*ds->select.type->release)(ds);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_select_release() */
+} /* end H5S_select_release() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_select_get_seq_list
  *
@@ -179,23 +173,22 @@ H5S_select_release(H5S_t *ds)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_select_get_seq_list(const H5S_t *space, unsigned flags,
-    H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,
-    size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len)
+H5S_select_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t maxseq,
+                        size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len)
 {
-    herr_t ret_value;   /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
     /* Call the selection type's get_seq_list function */
-    ret_value = (*space->select.type->get_seq_list)(space, flags, iter, maxseq, maxbytes, nseq, nbytes, off, len);
+    ret_value =
+        (*space->select.type->get_seq_list)(space, flags, iter, maxseq, maxbytes, nseq, nbytes, off, len);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_select_get_seq_list() */
+} /* end H5S_select_get_seq_list() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_select_serial_size
  *
@@ -218,19 +211,18 @@ H5S_select_get_seq_list(const H5S_t *space, unsigned flags,
 hssize_t
 H5S_select_serial_size(const H5S_t *space)
 {
-    hssize_t ret_value;   /* Return value */
+    hssize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
     /* Call the selection type's serial_size function */
-    ret_value=(*space->select.type->serial_size)(space);
+    ret_value = (*space->select.type->serial_size)(space);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_select_serial_size() */
+} /* end H5S_select_serial_size() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_serialize
@@ -256,7 +248,7 @@ H5S_select_serial_size(const H5S_t *space)
 herr_t
 H5S_select_serialize(const H5S_t *space, uint8_t *buf)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -264,12 +256,11 @@ H5S_select_serialize(const H5S_t *space, uint8_t *buf)
     HDassert(buf);
 
     /* Call the selection type's serialize function */
-    ret_value=(*space->select.type->serialize)(space,buf);
+    ret_value = (*space->select.type->serialize)(space, buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_select_serialize() */
+} /* end H5S_select_serialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sget_select_npoints
@@ -290,23 +281,22 @@ H5S_select_serialize(const H5S_t *space, uint8_t *buf)
 hssize_t
 H5Sget_select_npoints(hid_t spaceid)
 {
-    H5S_t *space;               /* Dataspace to modify selection of */
-    hssize_t ret_value;         /* return value */
+    H5S_t *  space;     /* Dataspace to modify selection of */
+    hssize_t ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Hs", "i", spaceid);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     ret_value = (hssize_t)H5S_GET_SELECT_NPOINTS(space);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sget_select_npoints() */
+} /* H5Sget_select_npoints() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_get_select_npoints
@@ -336,9 +326,8 @@ H5S_get_select_npoints(const H5S_t *space)
     HDassert(space);
 
     FUNC_LEAVE_NOAPI(space->select.num_elem)
-}   /* H5S_get_select_npoints() */
+} /* H5S_get_select_npoints() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sselect_valid
@@ -364,23 +353,22 @@ H5S_get_select_npoints(const H5S_t *space)
 htri_t
 H5Sselect_valid(hid_t spaceid)
 {
-    H5S_t *space;       /* Dataspace to modify selection of */
-    htri_t ret_value;   /* return value */
+    H5S_t *space;     /* Dataspace to modify selection of */
+    htri_t ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", spaceid);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     ret_value = H5S_SELECT_VALID(space);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sselect_valid() */
+} /* H5Sselect_valid() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_valid
@@ -407,7 +395,7 @@ done:
 htri_t
 H5S_select_valid(const H5S_t *space)
 {
-    htri_t ret_value;   /* Return value */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -416,9 +404,8 @@ H5S_select_valid(const H5S_t *space)
     ret_value = (*space->select.type->is_valid)(space);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_valid() */
+} /* H5S_select_valid() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_deserialize
@@ -442,46 +429,45 @@ H5S_select_valid(const H5S_t *space)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_select_deserialize (H5S_t *space, const uint8_t *buf)
+H5S_select_deserialize(H5S_t *space, const uint8_t *buf)
 {
-    const uint8_t *tbuf;    /* Temporary pointer to the selection type */
-    uint32_t sel_type;       /* Pointer to the selection type */
-    herr_t ret_value=FAIL;  /* return value */
+    const uint8_t *tbuf;             /* Temporary pointer to the selection type */
+    uint32_t       sel_type;         /* Pointer to the selection type */
+    herr_t         ret_value = FAIL; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(space);
 
-    tbuf=buf;
+    tbuf = buf;
     UINT32DECODE(tbuf, sel_type);
-    switch(sel_type) {
-        case H5S_SEL_POINTS:         /* Sequence of points selected */
-            ret_value=(*H5S_sel_point->deserialize)(space,buf);
+    switch (sel_type) {
+        case H5S_SEL_POINTS: /* Sequence of points selected */
+            ret_value = (*H5S_sel_point->deserialize)(space, buf);
             break;
 
-        case H5S_SEL_HYPERSLABS:     /* Hyperslab selection defined */
-            ret_value=(*H5S_sel_hyper->deserialize)(space,buf);
+        case H5S_SEL_HYPERSLABS: /* Hyperslab selection defined */
+            ret_value = (*H5S_sel_hyper->deserialize)(space, buf);
             break;
 
-        case H5S_SEL_ALL:            /* Entire extent selected */
-            ret_value=(*H5S_sel_all->deserialize)(space,buf);
+        case H5S_SEL_ALL: /* Entire extent selected */
+            ret_value = (*H5S_sel_all->deserialize)(space, buf);
             break;
 
-        case H5S_SEL_NONE:           /* Nothing selected */
-            ret_value=(*H5S_sel_none->deserialize)(space,buf);
+        case H5S_SEL_NONE: /* Nothing selected */
+            ret_value = (*H5S_sel_none->deserialize)(space, buf);
             break;
 
         default:
             break;
     }
-    if(ret_value<0)
+    if (ret_value < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTLOAD, FAIL, "can't deserialize selection")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_deserialize() */
+} /* H5S_select_deserialize() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sget_select_bounds
@@ -515,25 +501,24 @@ done:
 herr_t
 H5Sget_select_bounds(hid_t spaceid, hsize_t start[], hsize_t end[])
 {
-    H5S_t *space;       /* Dataspace to modify selection of */
-    herr_t ret_value;   /* return value */
+    H5S_t *space;     /* Dataspace to modify selection of */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*h*h", spaceid, start, end);
 
     /* Check args */
-    if(start == NULL || end == NULL)
+    if (start == NULL || end == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer")
-    if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     ret_value = H5S_SELECT_BOUNDS(space, start, end);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* H5Sget_select_bounds() */
+} /* H5Sget_select_bounds() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_get_select_bounds
@@ -564,7 +549,7 @@ done:
 herr_t
 H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 {
-    herr_t ret_value;        /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -573,12 +558,11 @@ H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
     HDassert(start);
     HDassert(end);
 
-    ret_value = (*space->select.type->bounds)(space,start,end);
+    ret_value = (*space->select.type->bounds)(space, start, end);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_get_select_bounds() */
+} /* H5S_get_select_bounds() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_get_select_offset
@@ -605,7 +589,7 @@ H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 herr_t
 H5S_get_select_offset(const H5S_t *space, hsize_t *offset)
 {
-    herr_t ret_value;        /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -616,9 +600,8 @@ H5S_get_select_offset(const H5S_t *space, hsize_t *offset)
     ret_value = (*space->select.type->offset)(space, offset);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_get_select_offset() */
+} /* H5S_get_select_offset() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_is_contiguous
@@ -643,7 +626,7 @@ H5S_get_select_offset(const H5S_t *space, hsize_t *offset)
 htri_t
 H5S_select_is_contiguous(const H5S_t *space)
 {
-    herr_t ret_value;        /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -653,9 +636,8 @@ H5S_select_is_contiguous(const H5S_t *space)
     ret_value = (*space->select.type->is_contiguous)(space);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_is_contiguous() */
+} /* H5S_select_is_contiguous() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_is_single
@@ -680,7 +662,7 @@ H5S_select_is_contiguous(const H5S_t *space)
 htri_t
 H5S_select_is_single(const H5S_t *space)
 {
-    herr_t ret_value;        /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -690,9 +672,8 @@ H5S_select_is_single(const H5S_t *space)
     ret_value = (*space->select.type->is_single)(space);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_is_single() */
+} /* H5S_select_is_single() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_is_regular
@@ -717,7 +698,7 @@ H5S_select_is_single(const H5S_t *space)
 htri_t
 H5S_select_is_regular(const H5S_t *space)
 {
-    herr_t ret_value;        /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -727,9 +708,8 @@ H5S_select_is_regular(const H5S_t *space)
     ret_value = (*space->select.type->is_regular)(space);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_is_regular() */
+} /* H5S_select_is_regular() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_adjust_u
@@ -754,7 +734,7 @@ H5S_select_is_regular(const H5S_t *space)
 herr_t
 H5S_select_adjust_u(H5S_t *space, const hsize_t *offset)
 {
-    herr_t ret_value;        /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -764,9 +744,8 @@ H5S_select_adjust_u(H5S_t *space, const hsize_t *offset)
     ret_value = (*space->select.type->adjust_u)(space, offset);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_adjust_u() */
+} /* H5S_select_adjust_u() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_project_scalar
@@ -792,7 +771,7 @@ H5S_select_adjust_u(H5S_t *space, const hsize_t *offset)
 herr_t
 H5S_select_project_scalar(const H5S_t *space, hsize_t *offset)
 {
-    herr_t ret_value;        /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -803,9 +782,8 @@ H5S_select_project_scalar(const H5S_t *space, hsize_t *offset)
     ret_value = (*space->select.type->project_scalar)(space, offset);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_project_scalar() */
+} /* H5S_select_project_scalar() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_project_simple
@@ -832,7 +810,7 @@ H5S_select_project_scalar(const H5S_t *space, hsize_t *offset)
 herr_t
 H5S_select_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset)
 {
-    herr_t ret_value;        /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -844,9 +822,8 @@ H5S_select_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset)
     ret_value = (*space->select.type->project_simple)(space, new_space, offset);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_project_simple() */
+} /* H5S_select_project_simple() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_init
@@ -867,7 +844,7 @@ H5S_select_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset)
 herr_t
 H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_size)
 {
-    herr_t ret_value;   /* Return value */
+    herr_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -881,7 +858,7 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s
     sel_iter->rank = space->extent.rank;
 
     /* Point to the dataspace dimensions, if there are any */
-    if(sel_iter->rank > 0)
+    if (sel_iter->rank > 0)
         sel_iter->dims = space->extent.size;
     else
         sel_iter->dims = NULL;
@@ -894,9 +871,8 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s
     HDassert(sel_iter->type);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_iter_init() */
+} /* H5S_select_iter_init() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_coords
@@ -922,7 +898,7 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s
 herr_t
 H5S_select_iter_coords(const H5S_sel_iter_t *sel_iter, hsize_t *coords)
 {
-    herr_t ret_value;         /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -931,13 +907,13 @@ H5S_select_iter_coords(const H5S_sel_iter_t *sel_iter, hsize_t *coords)
     HDassert(coords);
 
     /* Call iter_coords routine for selection type */
-    ret_value = (*sel_iter->type->iter_coords)(sel_iter,coords);
+    ret_value = (*sel_iter->type->iter_coords)(sel_iter, coords);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_iter_coords() */
+} /* H5S_select_iter_coords() */
 
 #ifdef LATER
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_block
@@ -964,7 +940,7 @@ H5S_select_iter_coords(const H5S_sel_iter_t *sel_iter, hsize_t *coords)
 static herr_t
 H5S_select_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
 {
-    herr_t ret_value;         /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOINIT_NOERR
 
@@ -974,13 +950,12 @@ H5S_select_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
     HDassert(end);
 
     /* Call iter_block routine for selection type */
-    ret_value = (*iter->type->iter_block)(iter,start,end);
+    ret_value = (*iter->type->iter_block)(iter, start, end);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_iter_block() */
+} /* H5S_select_iter_block() */
 #endif /* LATER */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_nelmts
@@ -1004,7 +979,7 @@ H5S_select_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
 hsize_t
 H5S_select_iter_nelmts(const H5S_sel_iter_t *sel_iter)
 {
-    hsize_t ret_value;         /* return value */
+    hsize_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1015,10 +990,10 @@ H5S_select_iter_nelmts(const H5S_sel_iter_t *sel_iter)
     ret_value = (*sel_iter->type->iter_nelmts)(sel_iter);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_iter_nelmts() */
+} /* H5S_select_iter_nelmts() */
 
 #ifdef LATER
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_has_next_block
@@ -1043,7 +1018,7 @@ H5S_select_iter_nelmts(const H5S_sel_iter_t *sel_iter)
 static htri_t
 H5S_select_iter_has_next_block(const H5S_sel_iter_t *iter)
 {
-    herr_t ret_value;         /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOINIT_NOERR
 
@@ -1054,10 +1029,9 @@ H5S_select_iter_has_next_block(const H5S_sel_iter_t *iter)
     ret_value = (*iter->type->iter_has_next_block)(iter);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_iter_has_next_block() */
+} /* H5S_select_iter_has_next_block() */
 #endif /* LATER */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_next
@@ -1083,25 +1057,25 @@ H5S_select_iter_has_next_block(const H5S_sel_iter_t *iter)
 herr_t
 H5S_select_iter_next(H5S_sel_iter_t *iter, size_t nelem)
 {
-    herr_t ret_value;         /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(iter);
-    HDassert(nelem>0);
+    HDassert(nelem > 0);
 
     /* Call iter_next routine for selection type */
-    ret_value = (*iter->type->iter_next)(iter,nelem);
+    ret_value = (*iter->type->iter_next)(iter, nelem);
 
     /* Decrement the number of elements left in selection */
-    iter->elmt_left-=nelem;
+    iter->elmt_left -= nelem;
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_iter_next() */
+} /* H5S_select_iter_next() */
 
 #ifdef LATER
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_next_block
@@ -1128,7 +1102,7 @@ H5S_select_iter_next(H5S_sel_iter_t *iter, size_t nelem)
 static herr_t
 H5S_select_iter_next_block(H5S_sel_iter_t *iter)
 {
-    herr_t ret_value;         /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1139,10 +1113,9 @@ H5S_select_iter_next_block(H5S_sel_iter_t *iter)
     ret_value = (*iter->type->iter_next_block)(iter);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_iter_next_block() */
+} /* H5S_select_iter_next_block() */
 #endif /* LATER */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_release
@@ -1166,7 +1139,7 @@ H5S_select_iter_next_block(H5S_sel_iter_t *iter)
 herr_t
 H5S_select_iter_release(H5S_sel_iter_t *sel_iter)
 {
-    herr_t ret_value;         /* return value */
+    herr_t ret_value; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1177,9 +1150,8 @@ H5S_select_iter_release(H5S_sel_iter_t *sel_iter)
     ret_value = (*sel_iter->type->iter_release)(sel_iter);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_iter_release() */
+} /* H5S_select_iter_release() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iterate
@@ -1209,18 +1181,18 @@ H5S_select_iter_release(H5S_sel_iter_t *sel_iter)
         the selection is not modified.
 --------------------------------------------------------------------------*/
 herr_t
-H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
-    const H5S_sel_iter_op_t *op, void *op_data)
+H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space, const H5S_sel_iter_op_t *op,
+                   void *op_data)
 {
-    H5S_sel_iter_t iter;        /* Selection iteration info */
-    hbool_t iter_init = FALSE;  /* Selection iteration info has been initialized */
-    hssize_t nelmts;            /* Number of elements in selection */
-    hsize_t space_size[H5O_LAYOUT_NDIMS]; /* Dataspace size */
-    size_t max_elem;            /* Maximum number of elements allowed in sequences */
-    size_t elmt_size;           /* Datatype size */
-    unsigned ndims;             /* Number of dimensions in dataspace */
-    herr_t user_ret = 0;        /* User's return value */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5S_sel_iter_t iter;                         /* Selection iteration info */
+    hbool_t        iter_init = FALSE;            /* Selection iteration info has been initialized */
+    hssize_t       nelmts;                       /* Number of elements in selection */
+    hsize_t        space_size[H5O_LAYOUT_NDIMS]; /* Dataspace size */
+    size_t         max_elem;                     /* Maximum number of elements allowed in sequences */
+    size_t         elmt_size;                    /* Datatype size */
+    unsigned       ndims;                        /* Number of dimensions in dataspace */
+    herr_t         user_ret  = 0;                /* User's return value */
+    herr_t         ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1231,25 +1203,25 @@ H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
     HDassert(op);
 
     /* Get the datatype size */
-    if(0 == (elmt_size = H5T_get_size(type)))
+    if (0 == (elmt_size = H5T_get_size(type)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADSIZE, FAIL, "datatype size invalid")
 
     /* Initialize iterator */
-    if(H5S_select_iter_init(&iter, space, elmt_size) < 0)
+    if (H5S_select_iter_init(&iter, space, elmt_size) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
-    iter_init = TRUE;	/* Selection iteration info has been initialized */
+    iter_init = TRUE; /* Selection iteration info has been initialized */
 
     /* Get the number of elements in selection */
-    if((nelmts = (hssize_t)H5S_GET_SELECT_NPOINTS(space)) < 0)
+    if ((nelmts = (hssize_t)H5S_GET_SELECT_NPOINTS(space)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOUNT, FAIL, "can't get number of elements selected")
 
     /* Get the rank of the dataspace */
     ndims = space->extent.rank;
 
-    if(ndims > 0) {
-	/* Copy the size of the space */
-	HDassert(space->extent.size);
-	HDmemcpy(space_size, space->extent.size, ndims * sizeof(hsize_t));
+    if (ndims > 0) {
+        /* Copy the size of the space */
+        HDassert(space->extent.size);
+        HDmemcpy(space_size, space->extent.size, ndims * sizeof(hsize_t));
     } /* end if */
     space_size[ndims] = elmt_size;
 
@@ -1257,21 +1229,22 @@ H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
     H5_CHECKED_ASSIGN(max_elem, size_t, nelmts, hssize_t);
 
     /* Loop, while elements left in selection */
-    while(max_elem > 0 && user_ret == 0) {
-        hsize_t off[H5D_IO_VECTOR_SIZE];        /* Array to store sequence offsets */
-        size_t len[H5D_IO_VECTOR_SIZE];         /* Array to store sequence lengths */
-        size_t nelem;               /* Number of elements used in sequences */
-        size_t nseq;                /* Number of sequences generated */
-        size_t curr_seq;            /* Current sequence being worked on */
+    while (max_elem > 0 && user_ret == 0) {
+        hsize_t off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */
+        size_t  len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */
+        size_t  nelem;                   /* Number of elements used in sequences */
+        size_t  nseq;                    /* Number of sequences generated */
+        size_t  curr_seq;                /* Current sequence being worked on */
 
         /* Get the sequences of bytes */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, &iter, (size_t)H5D_IO_VECTOR_SIZE, max_elem, &nseq, &nelem, off, len) < 0)
+        if (H5S_SELECT_GET_SEQ_LIST(space, 0, &iter, (size_t)H5D_IO_VECTOR_SIZE, max_elem, &nseq, &nelem, off,
+                                    len) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
 
         /* Loop, while sequences left to process */
-        for(curr_seq = 0; curr_seq < nseq && user_ret == 0; curr_seq++) {
-            hsize_t curr_off;           /* Current offset within sequence */
-            size_t curr_len;            /* Length of bytes left to process in sequence */
+        for (curr_seq = 0; curr_seq < nseq && user_ret == 0; curr_seq++) {
+            hsize_t curr_off; /* Current offset within sequence */
+            size_t  curr_len; /* Length of bytes left to process in sequence */
 
             /* Get the current offset */
             curr_off = off[curr_seq];
@@ -1280,14 +1253,14 @@ H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
             curr_len = len[curr_seq];
 
             /* Loop, while bytes left in sequence */
-            while(curr_len > 0 && user_ret == 0) {
-                hsize_t coords[H5O_LAYOUT_NDIMS];  /* Coordinates of element in dataspace */
-                hsize_t tmp_off;        /* Temporary offset within sequence */
-                uint8_t *loc;           /* Current element location in buffer */
-                int i;			/* Local Index variable */
+            while (curr_len > 0 && user_ret == 0) {
+                hsize_t  coords[H5O_LAYOUT_NDIMS]; /* Coordinates of element in dataspace */
+                hsize_t  tmp_off;                  /* Temporary offset within sequence */
+                uint8_t *loc;                      /* Current element location in buffer */
+                int      i;                        /* Local Index variable */
 
                 /* Compute the coordinate from the offset */
-                for(i = (int)ndims, tmp_off = curr_off; i >= 0; i--) {
+                for (i = (int)ndims, tmp_off = curr_off; i >= 0; i--) {
                     coords[i] = tmp_off % space_size[i];
                     tmp_off /= space_size[i];
                 } /* end for */
@@ -1296,15 +1269,15 @@ H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
                 loc = (unsigned char *)buf + curr_off;
 
                 /* Check which type of callback to make */
-                switch(op->op_type) {
+                switch (op->op_type) {
                     case H5S_SEL_ITER_OP_APP:
                         /* Make the application callback */
                         user_ret = (op->u.app_op.op)(loc, op->u.app_op.type_id, ndims, coords, op_data);
-                    break;
+                        break;
                     case H5S_SEL_ITER_OP_LIB:
                         /* Call the library's callback */
                         user_ret = (op->u.lib_op)(loc, type, ndims, coords, op_data);
-                    break;
+                        break;
                     default:
                         HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "unsupported op type")
                 } /* end switch */
@@ -1315,7 +1288,7 @@ H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
                 /* Decrement number of bytes left in sequence */
                 curr_len -= elmt_size;
             } /* end while */
-        } /* end for */
+        }     /* end for */
 
         /* Decrement number of elements left to process */
         max_elem -= nelem;
@@ -1326,13 +1299,12 @@ H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
 
 done:
     /* Release selection iterator */
-    if(iter_init && H5S_SELECT_ITER_RELEASE(&iter) < 0)
+    if (iter_init && H5S_SELECT_ITER_RELEASE(&iter) < 0)
         HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_select_iterate() */
+} /* end H5S_select_iterate() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5Sget_select_type
@@ -1345,20 +1317,20 @@ done:
     Non-negative on success/Negative on failure.  Return value is from the
     set of values in the H5S_sel_type enumerated type.
  DESCRIPTION
-	This function retrieves the type of selection currently defined for
+        This function retrieves the type of selection currently defined for
     a dataspace.
 --------------------------------------------------------------------------*/
 H5S_sel_type
 H5Sget_select_type(hid_t space_id)
 {
-    H5S_t *space;	        /* dataspace to modify */
-    H5S_sel_type ret_value;     /* Return value */
+    H5S_t *      space;     /* dataspace to modify */
+    H5S_sel_type ret_value; /* Return value */
 
     FUNC_ENTER_API(H5S_SEL_ERROR)
     H5TRACE1("St", "i", space_id);
 
     /* Check args */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5S_SEL_ERROR, "not a dataspace")
 
     /* Set return value */
@@ -1366,9 +1338,8 @@ H5Sget_select_type(hid_t space_id)
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Sget_select_type() */
+} /* end H5Sget_select_type() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_get_select_type
@@ -1381,7 +1352,7 @@ done:
     Non-negative on success/Negative on failure.  Return value is from the
     set of values in the H5S_sel_type enumerated type.
  DESCRIPTION
-	This function retrieves the type of selection currently defined for
+        This function retrieves the type of selection currently defined for
     a dataspace.
  COMMENTS
      This routine participates in the "Inlining C function pointers"
@@ -1391,7 +1362,7 @@ done:
 H5S_sel_type
 H5S_get_select_type(const H5S_t *space)
 {
-    H5S_sel_type        ret_value;       /* Return value */
+    H5S_sel_type ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1399,12 +1370,11 @@ H5S_get_select_type(const H5S_t *space)
     HDassert(space);
 
     /* Set return value */
-    ret_value=H5S_GET_SELECT_TYPE(space);
+    ret_value = H5S_GET_SELECT_TYPE(space);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5S_get_select_type() */
+} /* end H5S_get_select_type() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_shape_same
@@ -1425,17 +1395,17 @@ H5S_get_select_type(const H5S_t *space)
     Assumes that there is only a single "block" for hyperslab selections.
  EXAMPLES
  REVISION LOG
-    Modified function to view identical shapes with different dimensions 
+    Modified function to view identical shapes with different dimensions
     as being the same under some circumstances.
 --------------------------------------------------------------------------*/
 htri_t
 H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
 {
-    H5S_sel_iter_t iter_a;    /* Selection a iteration info */
-    H5S_sel_iter_t iter_b;    /* Selection b iteration info */
-    hbool_t iter_a_init = 0;  /* Selection a iteration info has been initialized */
-    hbool_t iter_b_init = 0;  /* Selection b iteration info has been initialized */
-    htri_t ret_value = TRUE; /* Return value */
+    H5S_sel_iter_t iter_a;             /* Selection a iteration info */
+    H5S_sel_iter_t iter_b;             /* Selection b iteration info */
+    hbool_t        iter_a_init = 0;    /* Selection a iteration info has been initialized */
+    hbool_t        iter_b_init = 0;    /* Selection b iteration info has been initialized */
+    htri_t         ret_value   = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1444,98 +1414,101 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
     HDassert(space2);
 
     /* Special case for one or both dataspaces being scalar */
-    if(space1->extent.rank == 0 || space2->extent.rank == 0) {
+    if (space1->extent.rank == 0 || space2->extent.rank == 0) {
         /* Check for different number of elements selected */
-        if(H5S_GET_SELECT_NPOINTS(space1) != H5S_GET_SELECT_NPOINTS(space2))
+        if (H5S_GET_SELECT_NPOINTS(space1) != H5S_GET_SELECT_NPOINTS(space2))
             HGOTO_DONE(FALSE)
     } /* end if */
     else {
-        const H5S_t *space_a;           /* Dataspace with larger rank */
-        const H5S_t *space_b;           /* Dataspace with smaller rank */
-        unsigned space_a_rank;          /* Number of dimensions of dataspace A */
-        unsigned space_b_rank;          /* Number of dimensions of dataspace B */
+        const H5S_t *space_a;      /* Dataspace with larger rank */
+        const H5S_t *space_b;      /* Dataspace with smaller rank */
+        unsigned     space_a_rank; /* Number of dimensions of dataspace A */
+        unsigned     space_b_rank; /* Number of dimensions of dataspace B */
 
         /* need to be able to handle spaces of different rank:
          *
          * To simplify logic, let space_a point to the element of the set
-         * {space1, space2} with the largest rank or space1 if the ranks 
+         * {space1, space2} with the largest rank or space1 if the ranks
          * are identical.
          *
          * Similarly, let space_b point to the element of {space1, space2}
          * with the smallest rank, or space2 if they are identical.
          *
-         * Let:  space_a_rank be the rank of space_a, 
+         * Let:  space_a_rank be the rank of space_a,
          *       space_b_rank be the rank of space_b,
          *       delta_rank = space_a_rank - space_b_rank.
          *
          * Set all this up below.
          */
-        if(space1->extent.rank >= space2->extent.rank) {
-            space_a = space1;
+        if (space1->extent.rank >= space2->extent.rank) {
+            space_a      = space1;
             space_a_rank = space_a->extent.rank;
 
-            space_b = space2;
+            space_b      = space2;
             space_b_rank = space_b->extent.rank;
         } /* end if */
         else {
-            space_a = space2;
+            space_a      = space2;
             space_a_rank = space_a->extent.rank;
 
-            space_b = space1;
+            space_b      = space1;
             space_b_rank = space_b->extent.rank;
         } /* end else */
         HDassert(space_a_rank >= space_b_rank);
         HDassert(space_b_rank > 0);
 
         /* Check for different number of elements selected */
-        if(H5S_GET_SELECT_NPOINTS(space_a) != H5S_GET_SELECT_NPOINTS(space_b))
+        if (H5S_GET_SELECT_NPOINTS(space_a) != H5S_GET_SELECT_NPOINTS(space_b))
             HGOTO_DONE(FALSE)
 
         /* Check for "easy" cases before getting into generalized block iteration code */
-        if((H5S_GET_SELECT_TYPE(space_a) == H5S_SEL_ALL) && (H5S_GET_SELECT_TYPE(space_b) == H5S_SEL_ALL)) {
-            hsize_t dims1[H5O_LAYOUT_NDIMS];    /* End point of selection block in dataspace #1 */
-            hsize_t dims2[H5O_LAYOUT_NDIMS];    /* End point of selection block in dataspace #2 */
-            int space_a_dim;                /* Current dimension in dataspace A */
-            int space_b_dim;                /* Current dimension in dataspace B */
+        if ((H5S_GET_SELECT_TYPE(space_a) == H5S_SEL_ALL) && (H5S_GET_SELECT_TYPE(space_b) == H5S_SEL_ALL)) {
+            hsize_t dims1[H5O_LAYOUT_NDIMS]; /* End point of selection block in dataspace #1 */
+            hsize_t dims2[H5O_LAYOUT_NDIMS]; /* End point of selection block in dataspace #2 */
+            int     space_a_dim;             /* Current dimension in dataspace A */
+            int     space_b_dim;             /* Current dimension in dataspace B */
 
-            if(H5S_get_simple_extent_dims(space_a, dims1, NULL) < 0)
+            if (H5S_get_simple_extent_dims(space_a, dims1, NULL) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimensionality")
-            if(H5S_get_simple_extent_dims(space_b, dims2, NULL) < 0)
+            if (H5S_get_simple_extent_dims(space_b, dims2, NULL) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimensionality")
 
             space_a_dim = (int)space_a_rank - 1;
             space_b_dim = (int)space_b_rank - 1;
 
-            /* recall that space_a_rank >= space_b_rank. 
+            /* recall that space_a_rank >= space_b_rank.
              *
              * In the following while loop, we test to see if space_a and space_b
              * have identical size in all dimensions they have in common.
              */
-            while(space_b_dim >= 0) {
-                if(dims1[space_a_dim] != dims2[space_b_dim])
+            while (space_b_dim >= 0) {
+                if (dims1[space_a_dim] != dims2[space_b_dim])
                     HGOTO_DONE(FALSE)
 
                 space_a_dim--;
                 space_b_dim--;
             } /* end while */
 
-            /* Since we are selecting the entire spaces, we must also verify that space_a 
+            /* Since we are selecting the entire spaces, we must also verify that space_a
              * has size 1 in all dimensions that it does not share with space_b.
              */
-            while(space_a_dim >= 0) {
-                if(dims1[space_a_dim] != 1)
+            while (space_a_dim >= 0) {
+                if (dims1[space_a_dim] != 1)
                     HGOTO_DONE(FALSE)
 
                 space_a_dim--;
             } /* end while */
-        } /* end if */
-        else if((H5S_GET_SELECT_TYPE(space1) == H5S_SEL_NONE) || (H5S_GET_SELECT_TYPE(space2) == H5S_SEL_NONE)) {
+        }     /* end if */
+        else if ((H5S_GET_SELECT_TYPE(space1) == H5S_SEL_NONE) ||
+                 (H5S_GET_SELECT_TYPE(space2) == H5S_SEL_NONE)) {
             HGOTO_DONE(TRUE)
         } /* end if */
-        else if((H5S_GET_SELECT_TYPE(space_a) == H5S_SEL_HYPERSLABS && space_a->select.sel_info.hslab->diminfo_valid)
-                && (H5S_GET_SELECT_TYPE(space_b) == H5S_SEL_HYPERSLABS && space_b->select.sel_info.hslab->diminfo_valid)) {
-            int space_a_dim;                /* Current dimension in dataspace A */
-            int space_b_dim;                /* Current dimension in dataspace B */
+        else if ((H5S_GET_SELECT_TYPE(space_a) == H5S_SEL_HYPERSLABS &&
+                  space_a->select.sel_info.hslab->diminfo_valid) &&
+                 (H5S_GET_SELECT_TYPE(space_b) == H5S_SEL_HYPERSLABS &&
+                  space_b->select.sel_info.hslab->diminfo_valid)) {
+            int space_a_dim; /* Current dimension in dataspace A */
+            int space_b_dim; /* Current dimension in dataspace B */
 
             space_a_dim = (int)space_a_rank - 1;
             space_b_dim = (int)space_b_rank - 1;
@@ -1543,30 +1516,30 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
             /* check that the shapes are the same in the common dimensions, and that
              * block == 1 in all dimensions that appear only in space_a.
              */
-            while(space_b_dim >= 0) {
-                if(space_a->select.sel_info.hslab->opt_diminfo[space_a_dim].stride != 
-                        space_b->select.sel_info.hslab->opt_diminfo[space_b_dim].stride)
+            while (space_b_dim >= 0) {
+                if (space_a->select.sel_info.hslab->opt_diminfo[space_a_dim].stride !=
+                    space_b->select.sel_info.hslab->opt_diminfo[space_b_dim].stride)
                     HGOTO_DONE(FALSE)
 
-                if(space_a->select.sel_info.hslab->opt_diminfo[space_a_dim].count !=
-                        space_b->select.sel_info.hslab->opt_diminfo[space_b_dim].count)
+                if (space_a->select.sel_info.hslab->opt_diminfo[space_a_dim].count !=
+                    space_b->select.sel_info.hslab->opt_diminfo[space_b_dim].count)
                     HGOTO_DONE(FALSE)
 
-                if(space_a->select.sel_info.hslab->opt_diminfo[space_a_dim].block != 
-                        space_b->select.sel_info.hslab->opt_diminfo[space_b_dim].block)
+                if (space_a->select.sel_info.hslab->opt_diminfo[space_a_dim].block !=
+                    space_b->select.sel_info.hslab->opt_diminfo[space_b_dim].block)
                     HGOTO_DONE(FALSE)
 
                 space_a_dim--;
                 space_b_dim--;
             } /* end while */
 
-            while(space_a_dim >= 0) {
-                if(space_a->select.sel_info.hslab->opt_diminfo[space_a_dim].block != 1)
+            while (space_a_dim >= 0) {
+                if (space_a->select.sel_info.hslab->opt_diminfo[space_a_dim].block != 1)
                     HGOTO_DONE(FALSE)
 
                 space_a_dim--;
             } /* end while */
-        } /* end if */
+        }     /* end if */
         /* Iterate through all the blocks in the selection */
         else {
             hsize_t start_a[H5O_LAYOUT_NDIMS]; /* Start point of selection block in dataspace a */
@@ -1582,38 +1555,38 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
              * that the selection iterator shouldn't be "flattened", since we
              * aren't actually going to be doing I/O with the iterators.
              */
-            if(H5S_select_iter_init(&iter_a, space_a, (size_t)0) < 0)
+            if (H5S_select_iter_init(&iter_a, space_a, (size_t)0) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator a")
             iter_a_init = 1;
-            if(H5S_select_iter_init(&iter_b, space_b, (size_t)0) < 0)
+            if (H5S_select_iter_init(&iter_b, space_b, (size_t)0) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator b")
             iter_b_init = 1;
 
             /* Iterate over all the blocks in each selection */
-            while(1) {
-                int space_a_dim;                /* Current dimension in dataspace A */
-                int space_b_dim;                /* Current dimension in dataspace B */
-                htri_t status_a, status_b;      /* Status from next block checks */
+            while (1) {
+                int    space_a_dim;        /* Current dimension in dataspace A */
+                int    space_b_dim;        /* Current dimension in dataspace B */
+                htri_t status_a, status_b; /* Status from next block checks */
 
                 /* Get the current block for each selection iterator */
-                if(H5S_SELECT_ITER_BLOCK(&iter_a, start_a, end_a) < 0)
+                if (H5S_SELECT_ITER_BLOCK(&iter_a, start_a, end_a) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get iterator block a")
-                if(H5S_SELECT_ITER_BLOCK(&iter_b, start_b, end_b) < 0)
+                if (H5S_SELECT_ITER_BLOCK(&iter_b, start_b, end_b) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get iterator block b")
 
                 space_a_dim = (int)space_a_rank - 1;
                 space_b_dim = (int)space_b_rank - 1;
 
-                /* The first block only compares the sizes and sets the 
-                 * relative offsets for later blocks 
+                /* The first block only compares the sizes and sets the
+                 * relative offsets for later blocks
                  */
-                if(first_block) {
-                    /* If the block sizes in the common dimensions from 
+                if (first_block) {
+                    /* If the block sizes in the common dimensions from
                      * each selection don't match, get out
                      */
-                    while(space_b_dim >= 0) {
-                        if((end_a[space_a_dim] - start_a[space_a_dim]) !=
-                                (end_b[space_b_dim] - start_b[space_b_dim]))
+                    while (space_b_dim >= 0) {
+                        if ((end_a[space_a_dim] - start_a[space_a_dim]) !=
+                            (end_b[space_b_dim] - start_b[space_b_dim]))
                             HGOTO_DONE(FALSE)
 
                         /* Set the relative locations of the selections */
@@ -1627,8 +1600,8 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
                     /* similarly, if the block size in any dimension that appears only
                      * in space_a is not equal to 1, get out.
                      */
-                    while(space_a_dim >= 0) {
-                        if((end_a[space_a_dim] - start_a[space_a_dim]) != 0)
+                    while (space_a_dim >= 0) {
+                        if ((end_a[space_a_dim] - start_a[space_a_dim]) != 0)
                             HGOTO_DONE(FALSE)
 
                         /* Set the relative locations of the selections */
@@ -1643,15 +1616,15 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
                 /* Check over the blocks for each selection */
                 else {
                     /* for dimensions that space_a and space_b have in common: */
-                    while(space_b_dim >= 0) {
+                    while (space_b_dim >= 0) {
                         /* Check if the blocks are in the same relative location */
-                        if((start_a[space_a_dim] - off_a[space_a_dim]) !=
-                                (start_b[space_b_dim] - off_b[space_b_dim]))
+                        if ((start_a[space_a_dim] - off_a[space_a_dim]) !=
+                            (start_b[space_b_dim] - off_b[space_b_dim]))
                             HGOTO_DONE(FALSE)
 
                         /* If the block sizes from each selection doesn't match, get out */
-                        if((end_a[space_a_dim] - start_a[space_a_dim]) !=
-                                (end_b[space_b_dim] - start_b[space_b_dim]))
+                        if ((end_a[space_a_dim] - start_a[space_a_dim]) !=
+                            (end_b[space_b_dim] - start_b[space_b_dim]))
                             HGOTO_DONE(FALSE)
 
                         space_a_dim--;
@@ -1659,210 +1632,212 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
                     } /* end while */
 
                     /* For dimensions that appear only in space_a: */
-                    while(space_a_dim >= 0) {
+                    while (space_a_dim >= 0) {
                         /* If the block size isn't 1, get out */
-                        if((end_a[space_a_dim] - start_a[space_a_dim]) != 0)
+                        if ((end_a[space_a_dim] - start_a[space_a_dim]) != 0)
                             HGOTO_DONE(FALSE)
 
                         space_a_dim--;
                     } /* end while */
-                } /* end else */
+                }     /* end else */
 
                 /* Check if we are able to advance to the next selection block */
-                if((status_a = H5S_SELECT_ITER_HAS_NEXT_BLOCK(&iter_a)) < 0)
+                if ((status_a = H5S_SELECT_ITER_HAS_NEXT_BLOCK(&iter_a)) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL, "unable to check iterator block a")
 
-                if((status_b = H5S_SELECT_ITER_HAS_NEXT_BLOCK(&iter_b)) < 0)
+                if ((status_b = H5S_SELECT_ITER_HAS_NEXT_BLOCK(&iter_b)) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL, "unable to check iterator block b")
 
                 /* Did we run out of blocks at the same time? */
-                if((status_a == FALSE) && (status_b == FALSE))
+                if ((status_a == FALSE) && (status_b == FALSE))
                     break;
-                else if(status_a != status_b)
+                else if (status_a != status_b)
                     HGOTO_DONE(FALSE)
                 else {
                     /* Advance to next block in selection iterators */
-                    if(H5S_SELECT_ITER_NEXT_BLOCK(&iter_a) < 0)
-                        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL, "unable to advance to next iterator block a")
+                    if (H5S_SELECT_ITER_NEXT_BLOCK(&iter_a) < 0)
+                        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL,
+                                    "unable to advance to next iterator block a")
 
-                    if(H5S_SELECT_ITER_NEXT_BLOCK(&iter_b) < 0)
-                        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL, "unable to advance to next iterator block b")
+                    if (H5S_SELECT_ITER_NEXT_BLOCK(&iter_b) < 0)
+                        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL,
+                                    "unable to advance to next iterator block b")
                 } /* end else */
-            } /* end while */
-        } /* end else */
-    } /* end else */
+            }     /* end while */
+        }         /* end else */
+    }             /* end else */
 
 done:
-    if(iter_a_init)
-        if(H5S_SELECT_ITER_RELEASE(&iter_a) < 0)
+    if (iter_a_init)
+        if (H5S_SELECT_ITER_RELEASE(&iter_a) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator a")
-    if(iter_b_init)
-        if(H5S_SELECT_ITER_RELEASE(&iter_b) < 0)
+    if (iter_b_init)
+        if (H5S_SELECT_ITER_RELEASE(&iter_b) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator b")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_shape_same() */
+} /* H5S_select_shape_same() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_construct_projection
 
  PURPOSE
     Given a dataspace a of rank n with some selection, construct a new
-    dataspace b of rank m (m != n), with the selection in a being 
-    topologically identical to that in b (as verified by 
+    dataspace b of rank m (m != n), with the selection in a being
+    topologically identical to that in b (as verified by
     H5S_select_shape_same().
 
-    This function exists, as some I/O code chokes of topologically 
-    identical selections with different ranks.  At least to begin 
+    This function exists, as some I/O code chokes of topologically
+    identical selections with different ranks.  At least to begin
     with, we will deal with the issue by constructing projections
-    of the memory dataspace with ranks equaling those of the file 
+    of the memory dataspace with ranks equaling those of the file
     dataspace.
 
-    Note that if m > n, it is possible that the starting point in the 
-    buffer associated with the memory dataspace will have to be 
+    Note that if m > n, it is possible that the starting point in the
+    buffer associated with the memory dataspace will have to be
     adjusted to match the projected dataspace.  If the buf parameter
     is not NULL, the function must return an adjusted buffer base
     address in *adj_buf_ptr.
 
  USAGE
-    htri_t H5S_select_construct_projection(base_space, 
+    htri_t H5S_select_construct_projection(base_space,
                                            new_space_ptr,
                                            new_space_rank,
                                            buf,
                                            adj_buf_ptr)
         const H5S_t *base_space;     IN: Ptr to Dataspace to project
         H5S_t ** new_space_ptr;     OUT: Ptr to location in which to return
-					 the address of the projected space
+                                         the address of the projected space
         int new_space_rank;	     IN: Rank of the projected space.
-        const void * buf;            IN: Base address of the buffer 
-					 associated with the base space.
-					 May be NULL.
+        const void * buf;            IN: Base address of the buffer
+                                         associated with the base space.
+                                         May be NULL.
         void ** adj_buf_ptr;        OUT: If buf != NULL, store the base
-					 address of the section of buf 
-					 that is described by *new_space_ptr
-					 in *adj_buf_ptr.
-					 
+                                         address of the section of buf
+                                         that is described by *new_space_ptr
+                                         in *adj_buf_ptr.
+
  RETURNS
     Non-negative on success/Negative on failure.
 
  DESCRIPTION
-    Construct a new dataspace and associated selection which is a 
-    projection of the supplied dataspace and associated selection into 
+    Construct a new dataspace and associated selection which is a
+    projection of the supplied dataspace and associated selection into
     the specified rank.  Return it in *new_space_ptr.
 
-    If buf is supplied, computes the base address of the projected 
+    If buf is supplied, computes the base address of the projected
     selection in buf, and stores the base address in *adj_buf_ptr.
-    
+
  GLOBAL VARIABLES
  COMMENTS, BUGS, ASSUMPTIONS
-    The selection in the supplied base_space has thickness 1 in all 
+    The selection in the supplied base_space has thickness 1 in all
     dimensions greater than new_space_rank.  Note that here we count
-    dimensions from the fastest changing coordinate to the slowest 
+    dimensions from the fastest changing coordinate to the slowest
     changing changing coordinate.
  EXAMPLES
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
-    unsigned new_space_rank, const void *buf, void const **adj_buf_ptr, hsize_t element_size)
+H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr, unsigned new_space_rank,
+                                const void *buf, void const **adj_buf_ptr, hsize_t element_size)
 {
-    H5S_t * new_space = NULL;           /* New dataspace constructed */
-    hsize_t base_space_dims[H5S_MAX_RANK];      /* Current dimensions of base dataspace */
-    hsize_t base_space_maxdims[H5S_MAX_RANK];   /* Maximum dimensions of base dataspace */
-    int sbase_space_rank;               /* Signed # of dimensions of base dataspace */
-    unsigned base_space_rank;           /* # of dimensions of base dataspace */
-    hsize_t projected_space_element_offset = 0; /* Offset of selected element in projected buffer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5S_t *  new_space = NULL;                         /* New dataspace constructed */
+    hsize_t  base_space_dims[H5S_MAX_RANK];            /* Current dimensions of base dataspace */
+    hsize_t  base_space_maxdims[H5S_MAX_RANK];         /* Maximum dimensions of base dataspace */
+    int      sbase_space_rank;                         /* Signed # of dimensions of base dataspace */
+    unsigned base_space_rank;                          /* # of dimensions of base dataspace */
+    hsize_t  projected_space_element_offset = 0;       /* Offset of selected element in projected buffer */
+    herr_t   ret_value                      = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
     HDassert(base_space != NULL);
-    HDassert((H5S_GET_EXTENT_TYPE(base_space) == H5S_SCALAR) || (H5S_GET_EXTENT_TYPE(base_space) == H5S_SIMPLE));
+    HDassert((H5S_GET_EXTENT_TYPE(base_space) == H5S_SCALAR) ||
+             (H5S_GET_EXTENT_TYPE(base_space) == H5S_SIMPLE));
     HDassert(new_space_ptr != NULL);
     HDassert((new_space_rank != 0) || (H5S_GET_SELECT_NPOINTS(base_space) <= 1));
     HDassert(new_space_rank <= H5S_MAX_RANK);
     HDassert((buf == NULL) || (adj_buf_ptr != NULL));
-    HDassert(element_size > 0 );
+    HDassert(element_size > 0);
 
     /* Get the extent info for the base dataspace */
-    if((sbase_space_rank = H5S_get_simple_extent_dims(base_space, base_space_dims, base_space_maxdims)) < 0)
+    if ((sbase_space_rank = H5S_get_simple_extent_dims(base_space, base_space_dims, base_space_maxdims)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimensionality of base space")
     base_space_rank = (unsigned)sbase_space_rank;
     HDassert(base_space_rank != new_space_rank);
 
     /* Check if projected space is scalar */
-    if(new_space_rank == 0) {
-        hssize_t npoints;               /* Number of points selected */
+    if (new_space_rank == 0) {
+        hssize_t npoints; /* Number of points selected */
 
         /* Retreve the number of elements selected */
-        if((npoints = (hssize_t)H5S_GET_SELECT_NPOINTS(base_space)) < 0)
+        if ((npoints = (hssize_t)H5S_GET_SELECT_NPOINTS(base_space)) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get number of points selected")
         HDassert(npoints <= 1);
 
         /* Create new scalar dataspace */
-        if(NULL == (new_space = H5S_create(H5S_SCALAR)))
+        if (NULL == (new_space = H5S_create(H5S_SCALAR)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "unable to create scalar dataspace")
-    
+
         /* No need to register the dataspace(i.e. get an ID) as
          * we will just be discarding it shortly.
          */
 
-        /* Selection for the new space will be either all or 
+        /* Selection for the new space will be either all or
          * none, depending on whether the base space has 0 or
          * 1 elements selected.
          *
-         * Observe that the base space can't have more than 
+         * Observe that the base space can't have more than
          * one selected element, since its selection has the
-         * same shape as the file dataspace, and that data 
+         * same shape as the file dataspace, and that data
          * space is scalar.
          */
-        if(1 == npoints) {
+        if (1 == npoints) {
             /* Assuming that the selection in the base dataspace is not
-             * empty, we must compute the offset of the selected item in 
+             * empty, we must compute the offset of the selected item in
              * the buffer associated with the base dataspace.
              *
-             * Since the new space rank is zero, we know that the 
-             * the base space must have rank at least 1 -- and 
-             * hence it is a simple dataspace.  However, the 
+             * Since the new space rank is zero, we know that the
+             * the base space must have rank at least 1 -- and
+             * hence it is a simple dataspace.  However, the
              * selection, may be either point, hyperspace, or all.
              *
              */
-            if(H5S_SELECT_PROJECT_SCALAR(base_space, &projected_space_element_offset) < 0)
+            if (H5S_SELECT_PROJECT_SCALAR(base_space, &projected_space_element_offset) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "unable to project scalar selection")
         } /* end if */
         else {
             HDassert(0 == npoints);
 
-            if(H5S_select_none(new_space) < 0)
-                 HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't delete default selection")
-        } /* end else */
-    } /* end if */
-    else { /* projected space must be simple */
-        hsize_t new_space_dims[H5S_MAX_RANK];   /* Current dimensions for new dataspace */
-        hsize_t new_space_maxdims[H5S_MAX_RANK];/* Maximum dimensions for new dataspace */
-        unsigned rank_diff;             /* Difference in ranks */
-    
+            if (H5S_select_none(new_space) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't delete default selection")
+        }                                         /* end else */
+    }                                             /* end if */
+    else {                                        /* projected space must be simple */
+        hsize_t  new_space_dims[H5S_MAX_RANK];    /* Current dimensions for new dataspace */
+        hsize_t  new_space_maxdims[H5S_MAX_RANK]; /* Maximum dimensions for new dataspace */
+        unsigned rank_diff;                       /* Difference in ranks */
+
         /* Set up the dimensions of the new, projected dataspace.
          *
-         * How we do this depends on whether we are projecting up into 
-         * increased dimensions, or down into a reduced number of 
+         * How we do this depends on whether we are projecting up into
+         * increased dimensions, or down into a reduced number of
          * dimensions.
          *
-         * If we are projecting up (the first half of the following 
-         * if statement), we copy the dimensions of the base data 
-         * space into the fastest changing dimensions of the new 
+         * If we are projecting up (the first half of the following
+         * if statement), we copy the dimensions of the base data
+         * space into the fastest changing dimensions of the new
          * projected dataspace, and set the remaining dimensions to
          * one.
          *
          * If we are projecting down (the second half of the following
-         * if statement), we just copy the dimensions with the most 
+         * if statement), we just copy the dimensions with the most
          * quickly changing dimensions into the dims for the projected
          * data set.
          *
-         * This works, because H5S_select_shape_same() will return 
+         * This works, because H5S_select_shape_same() will return
          * true on selections of different rank iff:
          *
          * 1) the selection in the lower rank dataspace matches that
@@ -1870,37 +1845,40 @@ H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
          *    the larger rank dataspace, and
          *
          * 2) the selection has thickness 1 in all ranks that appear
-         *    only in the higher rank dataspace (i.e. those with 
+         *    only in the higher rank dataspace (i.e. those with
          *    more slowly changing indicies).
-         */ 
-        if(new_space_rank > base_space_rank) {
-            hsize_t tmp_dim_size = 1;   /* Temporary dimension value, for filling arrays */
+         */
+        if (new_space_rank > base_space_rank) {
+            hsize_t tmp_dim_size = 1; /* Temporary dimension value, for filling arrays */
 
-            /* we must copy the dimensions of the base space into 
+            /* we must copy the dimensions of the base space into
              * the fastest changing dimensions of the new space,
              * and set the remaining dimensions to 1
              */
             rank_diff = new_space_rank - base_space_rank;
             H5VM_array_fill(new_space_dims, &tmp_dim_size, sizeof(tmp_dim_size), rank_diff);
             H5VM_array_fill(new_space_maxdims, &tmp_dim_size, sizeof(tmp_dim_size), rank_diff);
-            HDmemcpy(&new_space_dims[rank_diff], base_space_dims, sizeof(new_space_dims[0]) * base_space_rank);
-            HDmemcpy(&new_space_maxdims[rank_diff], base_space_maxdims, sizeof(new_space_maxdims[0]) * base_space_rank);
-        } /* end if */
+            HDmemcpy(&new_space_dims[rank_diff], base_space_dims,
+                     sizeof(new_space_dims[0]) * base_space_rank);
+            HDmemcpy(&new_space_maxdims[rank_diff], base_space_maxdims,
+                     sizeof(new_space_maxdims[0]) * base_space_rank);
+        }      /* end if */
         else { /* new_space_rank < base_space_rank */
-            /* we must copy the fastest changing dimension of the 
+            /* we must copy the fastest changing dimension of the
              * base space into the dimensions of the new space.
              */
             rank_diff = base_space_rank - new_space_rank;
             HDmemcpy(new_space_dims, &base_space_dims[rank_diff], sizeof(new_space_dims[0]) * new_space_rank);
-            HDmemcpy(new_space_maxdims, &base_space_maxdims[rank_diff], sizeof(new_space_maxdims[0]) * new_space_rank);
+            HDmemcpy(new_space_maxdims, &base_space_maxdims[rank_diff],
+                     sizeof(new_space_maxdims[0]) * new_space_rank);
         } /* end else */
 
-        /* now have the new space rank and dimensions set up -- 
+        /* now have the new space rank and dimensions set up --
          * so we can create the new simple dataspace.
          */
-        if(NULL == (new_space = H5S_create_simple(new_space_rank, new_space_dims, new_space_maxdims)))
+        if (NULL == (new_space = H5S_create_simple(new_space_rank, new_space_dims, new_space_maxdims)))
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create simple dataspace")
-    
+
         /* No need to register the dataspace(i.e. get an ID) as
          * we will just be discarding it shortly.
          */
@@ -1909,29 +1887,31 @@ H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
          * dataspace.  We must now project the selection in the base
          * dataspace into the projected dataspace.
          */
-        if(H5S_SELECT_PROJECT_SIMPLE(base_space, new_space, &projected_space_element_offset) < 0)
+        if (H5S_SELECT_PROJECT_SIMPLE(base_space, new_space, &projected_space_element_offset) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "unable to project simple selection")
-    
+
         /* If we get this far, we have created the new dataspace, and projected
          * the selection in the base dataspace into the new dataspace.
          *
-         * If the base dataspace is simple, check to see if the 
-         * offset_changed flag on the base selection has been set -- if so, 
-         * project the offset into the new dataspace and set the 
+         * If the base dataspace is simple, check to see if the
+         * offset_changed flag on the base selection has been set -- if so,
+         * project the offset into the new dataspace and set the
          * offset_changed flag.
          */
-        if(H5S_GET_EXTENT_TYPE(base_space) == H5S_SIMPLE && base_space->select.offset_changed) {
-            if(new_space_rank > base_space_rank) {
+        if (H5S_GET_EXTENT_TYPE(base_space) == H5S_SIMPLE && base_space->select.offset_changed) {
+            if (new_space_rank > base_space_rank) {
                 HDmemset(new_space->select.offset, 0, sizeof(new_space->select.offset[0]) * rank_diff);
-                HDmemcpy(&new_space->select.offset[rank_diff], base_space->select.offset, sizeof(new_space->select.offset[0]) * base_space_rank);
+                HDmemcpy(&new_space->select.offset[rank_diff], base_space->select.offset,
+                         sizeof(new_space->select.offset[0]) * base_space_rank);
             } /* end if */
             else
-                HDmemcpy(new_space->select.offset, &base_space->select.offset[rank_diff], sizeof(new_space->select.offset[0]) * new_space_rank);
+                HDmemcpy(new_space->select.offset, &base_space->select.offset[rank_diff],
+                         sizeof(new_space->select.offset[0]) * new_space_rank);
 
             /* Propagate the offset changed flag into the new dataspace. */
             new_space->select.offset_changed = TRUE;
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     /* If we have done the projection correctly, the following assertion
      * should hold.
@@ -1942,20 +1922,20 @@ H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
     *new_space_ptr = new_space;
 
     /* now adjust the buffer if required */
-    if(buf != NULL) {
-        if(new_space_rank < base_space_rank) {
+    if (buf != NULL) {
+        if (new_space_rank < base_space_rank) {
             /* a bit of pointer magic here:
              *
              * Since we can't do pointer arithmetic on void pointers, we first
              * cast buf to a pointer to byte -- i.e. uint8_t.
              *
-             * We then multiply the projected space element offset we 
-             * calculated earlier by the supplied element size, add this 
-             * value to the type cast buf pointer, cast the result back 
+             * We then multiply the projected space element offset we
+             * calculated earlier by the supplied element size, add this
+             * value to the type cast buf pointer, cast the result back
              * to a pointer to void, and assign the result to *adj_buf_ptr.
              */
-            *adj_buf_ptr = (const void *)(((const uint8_t *)buf) + 
-                    ((size_t)(projected_space_element_offset * element_size)));
+            *adj_buf_ptr = (const void *)(((const uint8_t *)buf) +
+                                          ((size_t)(projected_space_element_offset * element_size)));
         } /* end if */
         else
             /* No adjustment necessary */
@@ -1964,15 +1944,14 @@ H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
 
 done:
     /* Cleanup on error */
-    if(ret_value < 0) {
-        if(new_space && H5S_close(new_space) < 0)
+    if (ret_value < 0) {
+        if (new_space && H5S_close(new_space) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_construct_projection() */
+} /* H5S_select_construct_projection() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_fill
@@ -2000,11 +1979,11 @@ done:
 herr_t
 H5S_select_fill(const void *fill, size_t fill_size, const H5S_t *space, void *_buf)
 {
-    H5S_sel_iter_t iter;        /* Selection iteration info */
-    hbool_t iter_init = 0;      /* Selection iteration info has been initialized */
-    hssize_t nelmts;            /* Number of elements in selection */
-    size_t max_elem;            /* Total number of elements in selection */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5S_sel_iter_t iter;                /* Selection iteration info */
+    hbool_t        iter_init = 0;       /* Selection iteration info has been initialized */
+    hssize_t       nelmts;              /* Number of elements in selection */
+    size_t         max_elem;            /* Total number of elements in selection */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2015,32 +1994,33 @@ H5S_select_fill(const void *fill, size_t fill_size, const H5S_t *space, void *_b
     HDassert(_buf);
 
     /* Initialize iterator */
-    if(H5S_select_iter_init(&iter, space, fill_size) < 0)
+    if (H5S_select_iter_init(&iter, space, fill_size) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
-    iter_init = 1;	/* Selection iteration info has been initialized */
+    iter_init = 1; /* Selection iteration info has been initialized */
 
     /* Get the number of elements in selection */
-    if((nelmts = (hssize_t)H5S_GET_SELECT_NPOINTS(space)) < 0)
+    if ((nelmts = (hssize_t)H5S_GET_SELECT_NPOINTS(space)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOUNT, FAIL, "can't get number of elements selected")
 
     /* Compute the number of bytes to process */
     H5_CHECKED_ASSIGN(max_elem, size_t, nelmts, hssize_t);
 
     /* Loop, while elements left in selection */
-    while(max_elem > 0) {
-        hsize_t off[H5D_IO_VECTOR_SIZE];          /* Array to store sequence offsets */
-        size_t len[H5D_IO_VECTOR_SIZE];           /* Array to store sequence lengths */
-        size_t nseq;                /* Number of sequences generated */
-        size_t curr_seq;            /* Current sequnce being worked on */
-        size_t nelem;               /* Number of elements used in sequences */
+    while (max_elem > 0) {
+        hsize_t off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */
+        size_t  len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */
+        size_t  nseq;                    /* Number of sequences generated */
+        size_t  curr_seq;                /* Current sequnce being worked on */
+        size_t  nelem;                   /* Number of elements used in sequences */
 
         /* Get the sequences of bytes */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, &iter, (size_t)H5D_IO_VECTOR_SIZE, max_elem, &nseq, &nelem, off, len) < 0)
+        if (H5S_SELECT_GET_SEQ_LIST(space, 0, &iter, (size_t)H5D_IO_VECTOR_SIZE, max_elem, &nseq, &nelem, off,
+                                    len) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
 
         /* Loop over sequences */
-        for(curr_seq = 0; curr_seq < nseq; curr_seq++) {
-            uint8_t *buf;               /* Current location in buffer */
+        for (curr_seq = 0; curr_seq < nseq; curr_seq++) {
+            uint8_t *buf; /* Current location in buffer */
 
             /* Get offset in memory buffer */
             buf = (uint8_t *)_buf + off[curr_seq];
@@ -2056,9 +2036,8 @@ H5S_select_fill(const void *fill, size_t fill_size, const H5S_t *space, void *_b
 
 done:
     /* Release resouces */
-    if(iter_init && H5S_SELECT_ITER_RELEASE(&iter) < 0)
+    if (iter_init && H5S_SELECT_ITER_RELEASE(&iter) < 0)
         HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5S_select_fill() */
-
+} /* H5S_select_fill() */
diff --git a/src/H5Stest.c b/src/H5Stest.c
index 26515ff..860534c 100644
--- a/src/H5Stest.c
+++ b/src/H5Stest.c
@@ -17,16 +17,14 @@
  * Purpose:	Dataspace selection testing functions.
  */
 
-#define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
-#define H5S_TESTING		/*suppress warning about H5S testing funcs*/
+#define H5S_PACKAGE /*suppress error about including H5Spkg	  */
+#define H5S_TESTING /*suppress warning about H5S testing funcs*/
 
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Spkg.h"     /* Dataspaces 				*/
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Spkg.h"		/* Dataspaces 				*/
-
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_shape_same_test
@@ -50,27 +48,26 @@
 htri_t
 H5S_select_shape_same_test(hid_t sid1, hid_t sid2)
 {
-    H5S_t	*space1;                /* Pointer to 1st dataspace */
-    H5S_t	*space2;                /* Pointer to 2nd dataspace */
-    htri_t      ret_value;              /* Return value */
+    H5S_t *space1;    /* Pointer to 1st dataspace */
+    H5S_t *space2;    /* Pointer to 2nd dataspace */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get dataspace structures */
-    if(NULL == (space1 = (H5S_t *)H5I_object_verify(sid1, H5I_DATASPACE)))
+    if (NULL == (space1 = (H5S_t *)H5I_object_verify(sid1, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
-    if(NULL == (space2 = (H5S_t *)H5I_object_verify(sid2, H5I_DATASPACE)))
+    if (NULL == (space2 = (H5S_t *)H5I_object_verify(sid2, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Check if the dataspace selections are the same shape */
-    if((ret_value = H5S_select_shape_same(space1, space2)) < 0)
+    if ((ret_value = H5S_select_shape_same(space1, space2)) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOMPARE, FAIL, "unable to compare dataspace selections")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5S_select_shape_same_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_get_rebuild_status_test
@@ -92,13 +89,13 @@ done:
 htri_t
 H5S_get_rebuild_status_test(hid_t space_id)
 {
-    H5S_t *space;               /* Pointer to 1st dataspace */
-    htri_t ret_value;           /* Return value */
+    H5S_t *space;     /* Pointer to 1st dataspace */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-     /* Get dataspace structures */
-    if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    /* Get dataspace structures */
+    if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     ret_value = (htri_t)space->select.sel_info.hslab->diminfo_valid;
@@ -106,4 +103,3 @@ H5S_get_rebuild_status_test(hid_t space_id)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5S_get_rebuild_status_test() */
-
diff --git a/src/H5T.c b/src/H5T.c
index 98e124f..4f6b929 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -22,38 +22,37 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE        /*suppress error about including H5Tpkg      */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg      */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5T_init_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions        */
-#include "H5ACprivate.h"    /* Metadata cache           */
-#include "H5Dprivate.h"     /* Datasets                 */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5Fprivate.h"     /* Files                    */
-#include "H5FLprivate.h"    /* Free Lists               */
-#include "H5FOprivate.h"    /* File objects             */
-#include "H5Gprivate.h"     /* Groups                   */
-#include "H5Iprivate.h"     /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management        */
-#include "H5Pprivate.h"     /* Property lists           */
-#include "H5Tpkg.h"         /* Datatypes                */
+#include "H5private.h"   /* Generic Functions        */
+#include "H5ACprivate.h" /* Metadata cache           */
+#include "H5Dprivate.h"  /* Datasets                 */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5Fprivate.h"  /* Files                    */
+#include "H5FLprivate.h" /* Free Lists               */
+#include "H5FOprivate.h" /* File objects             */
+#include "H5Gprivate.h"  /* Groups                   */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Pprivate.h"  /* Property lists           */
+#include "H5Tpkg.h"      /* Datatypes                */
 
 /* Check for header needed for SGI floating-point code */
 #ifdef H5_HAVE_SYS_FPU_H
 #include <sys/fpu.h>
 #endif /* H5_HAVE_SYS_FPU_H */
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-#define H5T_ENCODE_VERSION      0
+#define H5T_ENCODE_VERSION 0
 
 /*
  * Type initialization macros
@@ -65,242 +64,274 @@
  */
 
 /* Define the code template for bitfields for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_BITFIELD_CORE {                       \
-    dt->shared->type = H5T_BITFIELD;                        \
-}
+#define H5T_INIT_TYPE_BITFIELD_CORE                                                                          \
+    {                                                                                                        \
+        dt->shared->type = H5T_BITFIELD;                                                                     \
+    }
 
-#define H5T_INIT_TYPE_BITFIELD_COMMON(ENDIANNESS) {            \
-    H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                       \
-    H5T_INIT_TYPE_BITFIELD_CORE;                               \
-}
+#define H5T_INIT_TYPE_BITFIELD_COMMON(ENDIANNESS)                                                            \
+    {                                                                                                        \
+        H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                                                                 \
+        H5T_INIT_TYPE_BITFIELD_CORE;                                                                         \
+    }
 
-#define H5T_INIT_TYPE_BITFIELDLE_CORE {                        \
-    H5T_INIT_TYPE_BITFIELD_COMMON(H5T_ORDER_LE)                \
-}
+#define H5T_INIT_TYPE_BITFIELDLE_CORE                                                                        \
+    {                                                                                                        \
+        H5T_INIT_TYPE_BITFIELD_COMMON(H5T_ORDER_LE)                                                          \
+    }
 
-#define H5T_INIT_TYPE_BITFIELDBE_CORE {                        \
-    H5T_INIT_TYPE_BITFIELD_COMMON(H5T_ORDER_BE)                \
-}
+#define H5T_INIT_TYPE_BITFIELDBE_CORE                                                                        \
+    {                                                                                                        \
+        H5T_INIT_TYPE_BITFIELD_COMMON(H5T_ORDER_BE)                                                          \
+    }
 
 /* Define the code template for times for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_TIME_CORE {                           \
-    dt->shared->type = H5T_TIME;                            \
-}
+#define H5T_INIT_TYPE_TIME_CORE                                                                              \
+    {                                                                                                        \
+        dt->shared->type = H5T_TIME;                                                                         \
+    }
 
 /* Define the code template for types which reset the offset for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_OFFSET_CORE {                         \
-    dt->shared->u.atomic.offset = 0;                        \
-}
+#define H5T_INIT_TYPE_OFFSET_CORE                                                                            \
+    {                                                                                                        \
+        dt->shared->u.atomic.offset = 0;                                                                     \
+    }
 
 /* Define common code for all numeric types (floating-point & int, signed & unsigned) */
-#define H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS) {              \
-    dt->shared->u.atomic.order = ENDIANNESS;                \
-    dt->shared->u.atomic.offset = 0;                        \
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;            \
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;            \
-}
+#define H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                                                                 \
+    {                                                                                                        \
+        dt->shared->u.atomic.order   = ENDIANNESS;                                                           \
+        dt->shared->u.atomic.offset  = 0;                                                                    \
+        dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;                                                         \
+        dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;                                                         \
+    }
 
 /* Define the code templates for standard floats for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_FLOAT_COMMON(ENDIANNESS) {            \
-    H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                    \
-    dt->shared->u.atomic.u.f.sign = 31;                     \
-    dt->shared->u.atomic.u.f.epos = 23;                     \
-    dt->shared->u.atomic.u.f.esize = 8;                     \
-    dt->shared->u.atomic.u.f.ebias = 0x7f;                  \
-    dt->shared->u.atomic.u.f.mpos = 0;                      \
-    dt->shared->u.atomic.u.f.msize = 23;                    \
-    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;       \
-    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;            \
-}
+#define H5T_INIT_TYPE_FLOAT_COMMON(ENDIANNESS)                                                               \
+    {                                                                                                        \
+        H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                                                                 \
+        dt->shared->u.atomic.u.f.sign  = 31;                                                                 \
+        dt->shared->u.atomic.u.f.epos  = 23;                                                                 \
+        dt->shared->u.atomic.u.f.esize = 8;                                                                  \
+        dt->shared->u.atomic.u.f.ebias = 0x7f;                                                               \
+        dt->shared->u.atomic.u.f.mpos  = 0;                                                                  \
+        dt->shared->u.atomic.u.f.msize = 23;                                                                 \
+        dt->shared->u.atomic.u.f.norm  = H5T_NORM_IMPLIED;                                                   \
+        dt->shared->u.atomic.u.f.pad   = H5T_PAD_ZERO;                                                       \
+    }
 
-#define H5T_INIT_TYPE_FLOATLE_CORE {                        \
-    H5T_INIT_TYPE_FLOAT_COMMON(H5T_ORDER_LE)                \
-}
+#define H5T_INIT_TYPE_FLOATLE_CORE                                                                           \
+    {                                                                                                        \
+        H5T_INIT_TYPE_FLOAT_COMMON(H5T_ORDER_LE)                                                             \
+    }
 
-#define H5T_INIT_TYPE_FLOATBE_CORE {                        \
-    H5T_INIT_TYPE_FLOAT_COMMON(H5T_ORDER_BE)                \
-}
+#define H5T_INIT_TYPE_FLOATBE_CORE                                                                           \
+    {                                                                                                        \
+        H5T_INIT_TYPE_FLOAT_COMMON(H5T_ORDER_BE)                                                             \
+    }
 
 /* Define the code templates for standard doubles for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_DOUBLE_COMMON(ENDIANNESS) {           \
-    H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                    \
-    dt->shared->u.atomic.u.f.sign = 63;                     \
-    dt->shared->u.atomic.u.f.epos = 52;                     \
-    dt->shared->u.atomic.u.f.esize = 11;                    \
-    dt->shared->u.atomic.u.f.ebias = 0x03ff;                \
-    dt->shared->u.atomic.u.f.mpos = 0;                      \
-    dt->shared->u.atomic.u.f.msize = 52;                    \
-    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;       \
-    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;            \
-}
+#define H5T_INIT_TYPE_DOUBLE_COMMON(ENDIANNESS)                                                              \
+    {                                                                                                        \
+        H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                                                                 \
+        dt->shared->u.atomic.u.f.sign  = 63;                                                                 \
+        dt->shared->u.atomic.u.f.epos  = 52;                                                                 \
+        dt->shared->u.atomic.u.f.esize = 11;                                                                 \
+        dt->shared->u.atomic.u.f.ebias = 0x03ff;                                                             \
+        dt->shared->u.atomic.u.f.mpos  = 0;                                                                  \
+        dt->shared->u.atomic.u.f.msize = 52;                                                                 \
+        dt->shared->u.atomic.u.f.norm  = H5T_NORM_IMPLIED;                                                   \
+        dt->shared->u.atomic.u.f.pad   = H5T_PAD_ZERO;                                                       \
+    }
 
-#define H5T_INIT_TYPE_DOUBLELE_CORE {                       \
-    H5T_INIT_TYPE_DOUBLE_COMMON(H5T_ORDER_LE)               \
-}
+#define H5T_INIT_TYPE_DOUBLELE_CORE                                                                          \
+    {                                                                                                        \
+        H5T_INIT_TYPE_DOUBLE_COMMON(H5T_ORDER_LE)                                                            \
+    }
 
-#define H5T_INIT_TYPE_DOUBLEBE_CORE {                       \
-    H5T_INIT_TYPE_DOUBLE_COMMON(H5T_ORDER_BE)               \
-}
+#define H5T_INIT_TYPE_DOUBLEBE_CORE                                                                          \
+    {                                                                                                        \
+        H5T_INIT_TYPE_DOUBLE_COMMON(H5T_ORDER_BE)                                                            \
+    }
 
 /* Define the code templates for VAX float for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_FLOATVAX_CORE {                       \
-    H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_VAX)                 \
-    dt->shared->u.atomic.u.f.sign = 31;                     \
-    dt->shared->u.atomic.u.f.epos = 23;                     \
-    dt->shared->u.atomic.u.f.esize = 8;                     \
-    dt->shared->u.atomic.u.f.ebias = 0x81;                  \
-    dt->shared->u.atomic.u.f.mpos = 0;                      \
-    dt->shared->u.atomic.u.f.msize = 23;                    \
-    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;       \
-    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;            \
-    dt->shared->version = H5O_DTYPE_VERSION_3;              \
-}
+#define H5T_INIT_TYPE_FLOATVAX_CORE                                                                          \
+    {                                                                                                        \
+        H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_VAX)                                                              \
+        dt->shared->u.atomic.u.f.sign  = 31;                                                                 \
+        dt->shared->u.atomic.u.f.epos  = 23;                                                                 \
+        dt->shared->u.atomic.u.f.esize = 8;                                                                  \
+        dt->shared->u.atomic.u.f.ebias = 0x81;                                                               \
+        dt->shared->u.atomic.u.f.mpos  = 0;                                                                  \
+        dt->shared->u.atomic.u.f.msize = 23;                                                                 \
+        dt->shared->u.atomic.u.f.norm  = H5T_NORM_IMPLIED;                                                   \
+        dt->shared->u.atomic.u.f.pad   = H5T_PAD_ZERO;                                                       \
+        dt->shared->version            = H5O_DTYPE_VERSION_3;                                                \
+    }
 
 /* Define the code templates for VAX double for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_DOUBLEVAX_CORE {                      \
-    H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_VAX)                 \
-    dt->shared->u.atomic.u.f.sign = 63;                     \
-    dt->shared->u.atomic.u.f.epos = 52;                     \
-    dt->shared->u.atomic.u.f.esize = 11;                    \
-    dt->shared->u.atomic.u.f.ebias = 0x0401;                \
-    dt->shared->u.atomic.u.f.mpos = 0;                      \
-    dt->shared->u.atomic.u.f.msize = 52;                    \
-    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;       \
-    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;            \
-    dt->shared->version = H5O_DTYPE_VERSION_3;              \
-}
+#define H5T_INIT_TYPE_DOUBLEVAX_CORE                                                                         \
+    {                                                                                                        \
+        H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_VAX)                                                              \
+        dt->shared->u.atomic.u.f.sign  = 63;                                                                 \
+        dt->shared->u.atomic.u.f.epos  = 52;                                                                 \
+        dt->shared->u.atomic.u.f.esize = 11;                                                                 \
+        dt->shared->u.atomic.u.f.ebias = 0x0401;                                                             \
+        dt->shared->u.atomic.u.f.mpos  = 0;                                                                  \
+        dt->shared->u.atomic.u.f.msize = 52;                                                                 \
+        dt->shared->u.atomic.u.f.norm  = H5T_NORM_IMPLIED;                                                   \
+        dt->shared->u.atomic.u.f.pad   = H5T_PAD_ZERO;                                                       \
+        dt->shared->version            = H5O_DTYPE_VERSION_3;                                                \
+    }
 
 /* Define the code templates for standard signed integers for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_SINT_COMMON(ENDIANNESS) {             \
-    H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                    \
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;              \
-}
+#define H5T_INIT_TYPE_SINT_COMMON(ENDIANNESS)                                                                \
+    {                                                                                                        \
+        H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                                                                 \
+        dt->shared->u.atomic.u.i.sign = H5T_SGN_2;                                                           \
+    }
 
-#define H5T_INIT_TYPE_SINTLE_CORE {                         \
-    H5T_INIT_TYPE_SINT_COMMON(H5T_ORDER_LE)                 \
-}
+#define H5T_INIT_TYPE_SINTLE_CORE                                                                            \
+    {                                                                                                        \
+        H5T_INIT_TYPE_SINT_COMMON(H5T_ORDER_LE)                                                              \
+    }
 
-#define H5T_INIT_TYPE_SINTBE_CORE {                         \
-    H5T_INIT_TYPE_SINT_COMMON(H5T_ORDER_BE)                 \
-}
+#define H5T_INIT_TYPE_SINTBE_CORE                                                                            \
+    {                                                                                                        \
+        H5T_INIT_TYPE_SINT_COMMON(H5T_ORDER_BE)                                                              \
+    }
 
 /* Define the code templates for standard unsigned integers for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_UINT_COMMON(ENDIANNESS) {             \
-    H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                    \
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;           \
-}
+#define H5T_INIT_TYPE_UINT_COMMON(ENDIANNESS)                                                                \
+    {                                                                                                        \
+        H5T_INIT_TYPE_NUM_COMMON(ENDIANNESS)                                                                 \
+        dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;                                                        \
+    }
 
-#define H5T_INIT_TYPE_UINTLE_CORE {                         \
-    H5T_INIT_TYPE_UINT_COMMON(H5T_ORDER_LE)                 \
-}
+#define H5T_INIT_TYPE_UINTLE_CORE                                                                            \
+    {                                                                                                        \
+        H5T_INIT_TYPE_UINT_COMMON(H5T_ORDER_LE)                                                              \
+    }
 
-#define H5T_INIT_TYPE_UINTBE_CORE {                         \
-    H5T_INIT_TYPE_UINT_COMMON(H5T_ORDER_BE)                 \
-}
+#define H5T_INIT_TYPE_UINTBE_CORE                                                                            \
+    {                                                                                                        \
+        H5T_INIT_TYPE_UINT_COMMON(H5T_ORDER_BE)                                                              \
+    }
 
 /* Define a macro for common code for all newly allocate datatypes */
-#define H5T_INIT_TYPE_ALLOC_COMMON(TYPE) {                  \
-    dt->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;              \
-    dt->shared->type = TYPE;                                \
-}
+#define H5T_INIT_TYPE_ALLOC_COMMON(TYPE)                                                                     \
+    {                                                                                                        \
+        dt->sh_loc.type  = H5O_SHARE_TYPE_UNSHARED;                                                          \
+        dt->shared->type = TYPE;                                                                             \
+    }
 
 /* Define the code templates for opaque for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_OPAQ_CORE {                           \
-    H5T_INIT_TYPE_ALLOC_COMMON(H5T_OPAQUE)                  \
-    dt->shared->u.opaque.tag = H5MM_xstrdup("");            \
-}
+#define H5T_INIT_TYPE_OPAQ_CORE                                                                              \
+    {                                                                                                        \
+        H5T_INIT_TYPE_ALLOC_COMMON(H5T_OPAQUE)                                                               \
+        dt->shared->u.opaque.tag = H5MM_xstrdup("");                                                         \
+    }
 
 /* Define the code templates for strings for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_STRING_COMMON {                       \
-    H5T_INIT_TYPE_ALLOC_COMMON(H5T_STRING)                  \
-    H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_NONE)                \
-    dt->shared->u.atomic.u.s.cset = H5F_DEFAULT_CSET;       \
-}
+#define H5T_INIT_TYPE_STRING_COMMON                                                                          \
+    {                                                                                                        \
+        H5T_INIT_TYPE_ALLOC_COMMON(H5T_STRING)                                                               \
+        H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_NONE)                                                             \
+        dt->shared->u.atomic.u.s.cset = H5F_DEFAULT_CSET;                                                    \
+    }
 
-#define H5T_INIT_TYPE_CSTRING_CORE {                        \
-    H5T_INIT_TYPE_STRING_COMMON                             \
-    dt->shared->u.atomic.u.s.pad = H5T_STR_NULLTERM;        \
-}
+#define H5T_INIT_TYPE_CSTRING_CORE                                                                           \
+    {                                                                                                        \
+        H5T_INIT_TYPE_STRING_COMMON                                                                          \
+        dt->shared->u.atomic.u.s.pad = H5T_STR_NULLTERM;                                                     \
+    }
 
-#define H5T_INIT_TYPE_FORSTRING_CORE {                      \
-    H5T_INIT_TYPE_STRING_COMMON                             \
-    dt->shared->u.atomic.u.s.pad = H5T_STR_SPACEPAD;        \
-}
+#define H5T_INIT_TYPE_FORSTRING_CORE                                                                         \
+    {                                                                                                        \
+        H5T_INIT_TYPE_STRING_COMMON                                                                          \
+        dt->shared->u.atomic.u.s.pad = H5T_STR_SPACEPAD;                                                     \
+    }
 
 /* Define the code templates for references for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_REF_COMMON {                          \
-    H5T_INIT_TYPE_ALLOC_COMMON(H5T_REFERENCE)               \
-    H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_NONE)                \
-}
+#define H5T_INIT_TYPE_REF_COMMON                                                                             \
+    {                                                                                                        \
+        H5T_INIT_TYPE_ALLOC_COMMON(H5T_REFERENCE)                                                            \
+        H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_NONE)                                                             \
+    }
 
-#define H5T_INIT_TYPE_OBJREF_CORE {                         \
-    H5T_INIT_TYPE_REF_COMMON                                \
-    dt->shared->force_conv = TRUE;                          \
-    dt->shared->u.atomic.u.r.rtype = H5R_OBJECT;            \
-    dt->shared->u.atomic.u.r.loc = H5T_LOC_MEMORY;          \
-}
+#define H5T_INIT_TYPE_OBJREF_CORE                                                                            \
+    {                                                                                                        \
+        H5T_INIT_TYPE_REF_COMMON                                                                             \
+        dt->shared->force_conv         = TRUE;                                                               \
+        dt->shared->u.atomic.u.r.rtype = H5R_OBJECT;                                                         \
+        dt->shared->u.atomic.u.r.loc   = H5T_LOC_MEMORY;                                                     \
+    }
 
-#define H5T_INIT_TYPE_REGREF_CORE {                         \
-    H5T_INIT_TYPE_REF_COMMON                                \
-    dt->shared->u.atomic.u.r.rtype = H5R_DATASET_REGION;    \
-}
+#define H5T_INIT_TYPE_REGREF_CORE                                                                            \
+    {                                                                                                        \
+        H5T_INIT_TYPE_REF_COMMON                                                                             \
+        dt->shared->u.atomic.u.r.rtype = H5R_DATASET_REGION;                                                 \
+    }
 
 /* Define the code templates for the "SIZE_TMPL" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_SET_SIZE(SIZE) {                      \
-    dt->shared->size = SIZE;                                \
-    dt->shared->u.atomic.prec = 8 * SIZE;                   \
-}
+#define H5T_INIT_TYPE_SET_SIZE(SIZE)                                                                         \
+    {                                                                                                        \
+        dt->shared->size          = SIZE;                                                                    \
+        dt->shared->u.atomic.prec = 8 * SIZE;                                                                \
+    }
 
-#define H5T_INIT_TYPE_NOSET_SIZE(SIZE) {                    \
-}
+#define H5T_INIT_TYPE_NOSET_SIZE(SIZE)                                                                       \
+    {                                                                                                        \
+    }
 
 /* Define the code templates for the "CRT_TMPL" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_COPY_CREATE(BASE) {                   \
-    /* Base off of existing datatype */                     \
-    if(NULL == (dt = H5T_copy(BASE, H5T_COPY_TRANSIENT)))   \
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, FAIL, "duplicating base type failed") \
-}
-
-#define H5T_INIT_TYPE_ALLOC_CREATE(BASE) {                  \
-    /* Allocate new datatype info */                        \
-    if(NULL == (dt = H5T__alloc()))                         \
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed") \
-}
-
+#define H5T_INIT_TYPE_COPY_CREATE(BASE)                                                                      \
+    {                                                                                                        \
+        /* Base off of existing datatype */                                                                  \
+        if (NULL == (dt = H5T_copy(BASE, H5T_COPY_TRANSIENT)))                                               \
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, FAIL, "duplicating base type failed")                    \
+    }
 
-#define H5T_INIT_TYPE(GUTS,GLOBAL,CRT_TMPL,BASE,SIZE_TMPL,SIZE) { \
-    /* Get new datatype struct */                           \
-    H5_GLUE3(H5T_INIT_TYPE_,CRT_TMPL,_CREATE)(BASE)         \
-                                                            \
-    /* Adjust information for all types */                  \
-    dt->shared->state = H5T_STATE_IMMUTABLE;                \
-    H5_GLUE3(H5T_INIT_TYPE_,SIZE_TMPL,_SIZE)(SIZE)          \
-                                                            \
-    /* Adjust information for this type */                  \
-    H5_GLUE3(H5T_INIT_TYPE_, GUTS, _CORE)                   \
-                                                            \
-    /* Atomize result */                                    \
-    if((GLOBAL = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)  \
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom") \
-}
+#define H5T_INIT_TYPE_ALLOC_CREATE(BASE)                                                                     \
+    {                                                                                                        \
+        /* Allocate new datatype info */                                                                     \
+        if (NULL == (dt = H5T__alloc()))                                                                     \
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed")                       \
+    }
 
+#define H5T_INIT_TYPE(GUTS, GLOBAL, CRT_TMPL, BASE, SIZE_TMPL, SIZE)                                         \
+    {                                                                                                        \
+        /* Get new datatype struct */                                                                        \
+        H5_GLUE3(H5T_INIT_TYPE_, CRT_TMPL, _CREATE)                                                          \
+        (BASE)                                                                                               \
+                                                                                                             \
+            /* Adjust information for all types */                                                           \
+            dt->shared->state = H5T_STATE_IMMUTABLE;                                                         \
+        H5_GLUE3(H5T_INIT_TYPE_, SIZE_TMPL, _SIZE)                                                           \
+        (SIZE)                                                                                               \
+                                                                                                             \
+            /* Adjust information for this type */                                                           \
+            H5_GLUE3(H5T_INIT_TYPE_, GUTS, _CORE)                                                            \
+                                                                                                             \
+            /* Atomize result */                                                                             \
+            if ((GLOBAL = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)                                        \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom")        \
+    }
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src,
-            H5T_t *dst, H5T_conv_t func, hid_t dxpl_id);
-static herr_t H5T_register(H5T_pers_t pers, const char *name, H5T_t *src,
-            H5T_t *dst, H5T_conv_t func, hid_t dxpl_id, hbool_t api_call);
+static herr_t H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_conv_t func,
+                             hid_t dxpl_id);
+static herr_t H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_conv_t func,
+                           hid_t dxpl_id, hbool_t api_call);
 static htri_t H5T_compiler_conv(H5T_t *src, H5T_t *dst);
 static herr_t H5T_set_size(H5T_t *dt, size_t size);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
@@ -308,7 +339,6 @@ static herr_t H5T_set_size(H5T_t *dt, size_t size);
 /* The native endianess of the platform */
 H5T_order_t H5T_native_order_g = H5T_ORDER_ERROR;
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -320,82 +350,82 @@ H5T_order_t H5T_native_order_g = H5T_ORDER_ERROR;
  * If more of these are added, the new ones must be added to the list of
  * types to reset in H5T_term_interface().
  */
-hid_t H5T_IEEE_F32BE_g          = FAIL;
-hid_t H5T_IEEE_F32LE_g          = FAIL;
-hid_t H5T_IEEE_F64BE_g          = FAIL;
-hid_t H5T_IEEE_F64LE_g          = FAIL;
-
-hid_t H5T_VAX_F32_g             = FAIL;
-hid_t H5T_VAX_F64_g             = FAIL;
-
-hid_t H5T_STD_I8BE_g            = FAIL;
-hid_t H5T_STD_I8LE_g            = FAIL;
-hid_t H5T_STD_I16BE_g           = FAIL;
-hid_t H5T_STD_I16LE_g           = FAIL;
-hid_t H5T_STD_I32BE_g           = FAIL;
-hid_t H5T_STD_I32LE_g           = FAIL;
-hid_t H5T_STD_I64BE_g           = FAIL;
-hid_t H5T_STD_I64LE_g           = FAIL;
-hid_t H5T_STD_U8BE_g            = FAIL;
-hid_t H5T_STD_U8LE_g            = FAIL;
-hid_t H5T_STD_U16BE_g           = FAIL;
-hid_t H5T_STD_U16LE_g           = FAIL;
-hid_t H5T_STD_U32BE_g           = FAIL;
-hid_t H5T_STD_U32LE_g           = FAIL;
-hid_t H5T_STD_U64BE_g           = FAIL;
-hid_t H5T_STD_U64LE_g           = FAIL;
-hid_t H5T_STD_B8BE_g            = FAIL;
-hid_t H5T_STD_B8LE_g            = FAIL;
-hid_t H5T_STD_B16BE_g           = FAIL;
-hid_t H5T_STD_B16LE_g           = FAIL;
-hid_t H5T_STD_B32BE_g           = FAIL;
-hid_t H5T_STD_B32LE_g           = FAIL;
-hid_t H5T_STD_B64BE_g           = FAIL;
-hid_t H5T_STD_B64LE_g           = FAIL;
-hid_t H5T_STD_REF_OBJ_g         = FAIL;
-hid_t H5T_STD_REF_DSETREG_g     = FAIL;
-
-hid_t H5T_UNIX_D32BE_g          = FAIL;
-hid_t H5T_UNIX_D32LE_g          = FAIL;
-hid_t H5T_UNIX_D64BE_g          = FAIL;
-hid_t H5T_UNIX_D64LE_g          = FAIL;
-
-hid_t H5T_C_S1_g                = FAIL;
-
-hid_t H5T_FORTRAN_S1_g          = FAIL;
-
-hid_t H5T_NATIVE_SCHAR_g        = FAIL;
-hid_t H5T_NATIVE_UCHAR_g        = FAIL;
-hid_t H5T_NATIVE_SHORT_g        = FAIL;
-hid_t H5T_NATIVE_USHORT_g       = FAIL;
-hid_t H5T_NATIVE_INT_g          = FAIL;
-hid_t H5T_NATIVE_UINT_g         = FAIL;
-hid_t H5T_NATIVE_LONG_g         = FAIL;
-hid_t H5T_NATIVE_ULONG_g        = FAIL;
-hid_t H5T_NATIVE_LLONG_g        = FAIL;
-hid_t H5T_NATIVE_ULLONG_g       = FAIL;
-hid_t H5T_NATIVE_FLOAT_g        = FAIL;
-hid_t H5T_NATIVE_DOUBLE_g       = FAIL;
-#if H5_SIZEOF_LONG_DOUBLE !=0
-hid_t H5T_NATIVE_LDOUBLE_g      = FAIL;
+hid_t H5T_IEEE_F32BE_g = FAIL;
+hid_t H5T_IEEE_F32LE_g = FAIL;
+hid_t H5T_IEEE_F64BE_g = FAIL;
+hid_t H5T_IEEE_F64LE_g = FAIL;
+
+hid_t H5T_VAX_F32_g = FAIL;
+hid_t H5T_VAX_F64_g = FAIL;
+
+hid_t H5T_STD_I8BE_g        = FAIL;
+hid_t H5T_STD_I8LE_g        = FAIL;
+hid_t H5T_STD_I16BE_g       = FAIL;
+hid_t H5T_STD_I16LE_g       = FAIL;
+hid_t H5T_STD_I32BE_g       = FAIL;
+hid_t H5T_STD_I32LE_g       = FAIL;
+hid_t H5T_STD_I64BE_g       = FAIL;
+hid_t H5T_STD_I64LE_g       = FAIL;
+hid_t H5T_STD_U8BE_g        = FAIL;
+hid_t H5T_STD_U8LE_g        = FAIL;
+hid_t H5T_STD_U16BE_g       = FAIL;
+hid_t H5T_STD_U16LE_g       = FAIL;
+hid_t H5T_STD_U32BE_g       = FAIL;
+hid_t H5T_STD_U32LE_g       = FAIL;
+hid_t H5T_STD_U64BE_g       = FAIL;
+hid_t H5T_STD_U64LE_g       = FAIL;
+hid_t H5T_STD_B8BE_g        = FAIL;
+hid_t H5T_STD_B8LE_g        = FAIL;
+hid_t H5T_STD_B16BE_g       = FAIL;
+hid_t H5T_STD_B16LE_g       = FAIL;
+hid_t H5T_STD_B32BE_g       = FAIL;
+hid_t H5T_STD_B32LE_g       = FAIL;
+hid_t H5T_STD_B64BE_g       = FAIL;
+hid_t H5T_STD_B64LE_g       = FAIL;
+hid_t H5T_STD_REF_OBJ_g     = FAIL;
+hid_t H5T_STD_REF_DSETREG_g = FAIL;
+
+hid_t H5T_UNIX_D32BE_g = FAIL;
+hid_t H5T_UNIX_D32LE_g = FAIL;
+hid_t H5T_UNIX_D64BE_g = FAIL;
+hid_t H5T_UNIX_D64LE_g = FAIL;
+
+hid_t H5T_C_S1_g = FAIL;
+
+hid_t H5T_FORTRAN_S1_g = FAIL;
+
+hid_t H5T_NATIVE_SCHAR_g  = FAIL;
+hid_t H5T_NATIVE_UCHAR_g  = FAIL;
+hid_t H5T_NATIVE_SHORT_g  = FAIL;
+hid_t H5T_NATIVE_USHORT_g = FAIL;
+hid_t H5T_NATIVE_INT_g    = FAIL;
+hid_t H5T_NATIVE_UINT_g   = FAIL;
+hid_t H5T_NATIVE_LONG_g   = FAIL;
+hid_t H5T_NATIVE_ULONG_g  = FAIL;
+hid_t H5T_NATIVE_LLONG_g  = FAIL;
+hid_t H5T_NATIVE_ULLONG_g = FAIL;
+hid_t H5T_NATIVE_FLOAT_g  = FAIL;
+hid_t H5T_NATIVE_DOUBLE_g = FAIL;
+#if H5_SIZEOF_LONG_DOUBLE != 0
+hid_t H5T_NATIVE_LDOUBLE_g = FAIL;
 #endif
-hid_t H5T_NATIVE_B8_g           = FAIL;
-hid_t H5T_NATIVE_B16_g          = FAIL;
-hid_t H5T_NATIVE_B32_g          = FAIL;
-hid_t H5T_NATIVE_B64_g          = FAIL;
-hid_t H5T_NATIVE_OPAQUE_g       = FAIL;
-hid_t H5T_NATIVE_HADDR_g        = FAIL;
-hid_t H5T_NATIVE_HSIZE_g        = FAIL;
-hid_t H5T_NATIVE_HSSIZE_g       = FAIL;
-hid_t H5T_NATIVE_HERR_g         = FAIL;
-hid_t H5T_NATIVE_HBOOL_g        = FAIL;
-
-hid_t H5T_NATIVE_INT8_g         = FAIL;
-hid_t H5T_NATIVE_UINT8_g        = FAIL;
-hid_t H5T_NATIVE_INT_LEAST8_g   = FAIL;
-hid_t H5T_NATIVE_UINT_LEAST8_g  = FAIL;
-hid_t H5T_NATIVE_INT_FAST8_g    = FAIL;
-hid_t H5T_NATIVE_UINT_FAST8_g   = FAIL;
+hid_t H5T_NATIVE_B8_g     = FAIL;
+hid_t H5T_NATIVE_B16_g    = FAIL;
+hid_t H5T_NATIVE_B32_g    = FAIL;
+hid_t H5T_NATIVE_B64_g    = FAIL;
+hid_t H5T_NATIVE_OPAQUE_g = FAIL;
+hid_t H5T_NATIVE_HADDR_g  = FAIL;
+hid_t H5T_NATIVE_HSIZE_g  = FAIL;
+hid_t H5T_NATIVE_HSSIZE_g = FAIL;
+hid_t H5T_NATIVE_HERR_g   = FAIL;
+hid_t H5T_NATIVE_HBOOL_g  = FAIL;
+
+hid_t H5T_NATIVE_INT8_g        = FAIL;
+hid_t H5T_NATIVE_UINT8_g       = FAIL;
+hid_t H5T_NATIVE_INT_LEAST8_g  = FAIL;
+hid_t H5T_NATIVE_UINT_LEAST8_g = FAIL;
+hid_t H5T_NATIVE_INT_FAST8_g   = FAIL;
+hid_t H5T_NATIVE_UINT_FAST8_g  = FAIL;
 
 hid_t H5T_NATIVE_INT16_g        = FAIL;
 hid_t H5T_NATIVE_UINT16_g       = FAIL;
@@ -424,45 +454,45 @@ hid_t H5T_NATIVE_UINT_FAST64_g  = FAIL;
  * datatype or C structures, which are different from the alignments for memory
  * address below this group of variables.
  */
-size_t H5T_NATIVE_SCHAR_COMP_ALIGN_g        = 0;
-size_t H5T_NATIVE_UCHAR_COMP_ALIGN_g        = 0;
-size_t H5T_NATIVE_SHORT_COMP_ALIGN_g        = 0;
-size_t H5T_NATIVE_USHORT_COMP_ALIGN_g       = 0;
-size_t H5T_NATIVE_INT_COMP_ALIGN_g          = 0;
-size_t H5T_NATIVE_UINT_COMP_ALIGN_g         = 0;
-size_t H5T_NATIVE_LONG_COMP_ALIGN_g         = 0;
-size_t H5T_NATIVE_ULONG_COMP_ALIGN_g        = 0;
-size_t H5T_NATIVE_LLONG_COMP_ALIGN_g        = 0;
-size_t H5T_NATIVE_ULLONG_COMP_ALIGN_g       = 0;
-size_t H5T_NATIVE_FLOAT_COMP_ALIGN_g        = 0;
-size_t H5T_NATIVE_DOUBLE_COMP_ALIGN_g       = 0;
-#if H5_SIZEOF_LONG_DOUBLE !=0
-size_t H5T_NATIVE_LDOUBLE_COMP_ALIGN_g      = 0;
+size_t H5T_NATIVE_SCHAR_COMP_ALIGN_g  = 0;
+size_t H5T_NATIVE_UCHAR_COMP_ALIGN_g  = 0;
+size_t H5T_NATIVE_SHORT_COMP_ALIGN_g  = 0;
+size_t H5T_NATIVE_USHORT_COMP_ALIGN_g = 0;
+size_t H5T_NATIVE_INT_COMP_ALIGN_g    = 0;
+size_t H5T_NATIVE_UINT_COMP_ALIGN_g   = 0;
+size_t H5T_NATIVE_LONG_COMP_ALIGN_g   = 0;
+size_t H5T_NATIVE_ULONG_COMP_ALIGN_g  = 0;
+size_t H5T_NATIVE_LLONG_COMP_ALIGN_g  = 0;
+size_t H5T_NATIVE_ULLONG_COMP_ALIGN_g = 0;
+size_t H5T_NATIVE_FLOAT_COMP_ALIGN_g  = 0;
+size_t H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 0;
+#if H5_SIZEOF_LONG_DOUBLE != 0
+size_t H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 0;
 #endif
 
-size_t H5T_POINTER_COMP_ALIGN_g             = 0;
-size_t H5T_HVL_COMP_ALIGN_g                 = 0;
-size_t H5T_HOBJREF_COMP_ALIGN_g             = 0;
-size_t H5T_HDSETREGREF_COMP_ALIGN_g         = 0;
+size_t H5T_POINTER_COMP_ALIGN_g     = 0;
+size_t H5T_HVL_COMP_ALIGN_g         = 0;
+size_t H5T_HOBJREF_COMP_ALIGN_g     = 0;
+size_t H5T_HDSETREGREF_COMP_ALIGN_g = 0;
 
 /*
  * Alignment constraints for native types. These are initialized at run time
  * in H5Tinit.c
  */
-size_t H5T_NATIVE_SCHAR_ALIGN_g             = 0;
-size_t H5T_NATIVE_UCHAR_ALIGN_g             = 0;
-size_t H5T_NATIVE_SHORT_ALIGN_g             = 0;
-size_t H5T_NATIVE_USHORT_ALIGN_g            = 0;
-size_t H5T_NATIVE_INT_ALIGN_g               = 0;
-size_t H5T_NATIVE_UINT_ALIGN_g              = 0;
-size_t H5T_NATIVE_LONG_ALIGN_g              = 0;
-size_t H5T_NATIVE_ULONG_ALIGN_g             = 0;
-size_t H5T_NATIVE_LLONG_ALIGN_g             = 0;
-size_t H5T_NATIVE_ULLONG_ALIGN_g            = 0;
-size_t H5T_NATIVE_FLOAT_ALIGN_g             = 0;
-size_t H5T_NATIVE_DOUBLE_ALIGN_g            = 0;
-#if H5_SIZEOF_LONG_DOUBLE !=0
-size_t H5T_NATIVE_LDOUBLE_ALIGN_g           = 0;
+size_t H5T_NATIVE_SCHAR_ALIGN_g  = 0;
+size_t H5T_NATIVE_UCHAR_ALIGN_g  = 0;
+size_t H5T_NATIVE_SHORT_ALIGN_g  = 0;
+size_t H5T_NATIVE_USHORT_ALIGN_g = 0;
+size_t H5T_NATIVE_INT_ALIGN_g    = 0;
+size_t H5T_NATIVE_UINT_ALIGN_g   = 0;
+size_t H5T_NATIVE_LONG_ALIGN_g   = 0;
+size_t H5T_NATIVE_ULONG_ALIGN_g  = 0;
+size_t H5T_NATIVE_LLONG_ALIGN_g  = 0;
+size_t H5T_NATIVE_ULLONG_ALIGN_g = 0;
+size_t H5T_NATIVE_FLOAT_ALIGN_g  = 0;
+size_t H5T_NATIVE_DOUBLE_ALIGN_g = 0;
+#if H5_SIZEOF_LONG_DOUBLE != 0
+size_t H5T_NATIVE_LDOUBLE_ALIGN_g = 0;
 #endif
 
 /*
@@ -470,46 +500,45 @@ size_t H5T_NATIVE_LDOUBLE_ALIGN_g           = 0;
  * H5Tinit.c if the types are provided by the system. Otherwise we set their
  * values to 0 here (no alignment calculated).
  */
-size_t H5T_NATIVE_INT8_ALIGN_g              = 0;
-size_t H5T_NATIVE_UINT8_ALIGN_g             = 0;
-size_t H5T_NATIVE_INT_LEAST8_ALIGN_g        = 0;
-size_t H5T_NATIVE_UINT_LEAST8_ALIGN_g       = 0;
-size_t H5T_NATIVE_INT_FAST8_ALIGN_g         = 0;
-size_t H5T_NATIVE_UINT_FAST8_ALIGN_g        = 0;
-
-size_t H5T_NATIVE_INT16_ALIGN_g             = 0;
-size_t H5T_NATIVE_UINT16_ALIGN_g            = 0;
-size_t H5T_NATIVE_INT_LEAST16_ALIGN_g       = 0;
-size_t H5T_NATIVE_UINT_LEAST16_ALIGN_g      = 0;
-size_t H5T_NATIVE_INT_FAST16_ALIGN_g        = 0;
-size_t H5T_NATIVE_UINT_FAST16_ALIGN_g       = 0;
-
-size_t H5T_NATIVE_INT32_ALIGN_g             = 0;
-size_t H5T_NATIVE_UINT32_ALIGN_g            = 0;
-size_t H5T_NATIVE_INT_LEAST32_ALIGN_g       = 0;
-size_t H5T_NATIVE_UINT_LEAST32_ALIGN_g      = 0;
-size_t H5T_NATIVE_INT_FAST32_ALIGN_g        = 0;
-size_t H5T_NATIVE_UINT_FAST32_ALIGN_g       = 0;
-
-size_t H5T_NATIVE_INT64_ALIGN_g             = 0;
-size_t H5T_NATIVE_UINT64_ALIGN_g            = 0;
-size_t H5T_NATIVE_INT_LEAST64_ALIGN_g       = 0;
-size_t H5T_NATIVE_UINT_LEAST64_ALIGN_g      = 0;
-size_t H5T_NATIVE_INT_FAST64_ALIGN_g        = 0;
-size_t H5T_NATIVE_UINT_FAST64_ALIGN_g       = 0;
+size_t H5T_NATIVE_INT8_ALIGN_g        = 0;
+size_t H5T_NATIVE_UINT8_ALIGN_g       = 0;
+size_t H5T_NATIVE_INT_LEAST8_ALIGN_g  = 0;
+size_t H5T_NATIVE_UINT_LEAST8_ALIGN_g = 0;
+size_t H5T_NATIVE_INT_FAST8_ALIGN_g   = 0;
+size_t H5T_NATIVE_UINT_FAST8_ALIGN_g  = 0;
+
+size_t H5T_NATIVE_INT16_ALIGN_g        = 0;
+size_t H5T_NATIVE_UINT16_ALIGN_g       = 0;
+size_t H5T_NATIVE_INT_LEAST16_ALIGN_g  = 0;
+size_t H5T_NATIVE_UINT_LEAST16_ALIGN_g = 0;
+size_t H5T_NATIVE_INT_FAST16_ALIGN_g   = 0;
+size_t H5T_NATIVE_UINT_FAST16_ALIGN_g  = 0;
+
+size_t H5T_NATIVE_INT32_ALIGN_g        = 0;
+size_t H5T_NATIVE_UINT32_ALIGN_g       = 0;
+size_t H5T_NATIVE_INT_LEAST32_ALIGN_g  = 0;
+size_t H5T_NATIVE_UINT_LEAST32_ALIGN_g = 0;
+size_t H5T_NATIVE_INT_FAST32_ALIGN_g   = 0;
+size_t H5T_NATIVE_UINT_FAST32_ALIGN_g  = 0;
+
+size_t H5T_NATIVE_INT64_ALIGN_g        = 0;
+size_t H5T_NATIVE_UINT64_ALIGN_g       = 0;
+size_t H5T_NATIVE_INT_LEAST64_ALIGN_g  = 0;
+size_t H5T_NATIVE_UINT_LEAST64_ALIGN_g = 0;
+size_t H5T_NATIVE_INT_FAST64_ALIGN_g   = 0;
+size_t H5T_NATIVE_UINT_FAST64_ALIGN_g  = 0;
 
 /* Useful floating-point values for conversion routines */
 /* (+/- Inf for all floating-point types) */
-float H5T_NATIVE_FLOAT_POS_INF_g            = 0.0f;
-float H5T_NATIVE_FLOAT_NEG_INF_g            = 0.0f;
-double H5T_NATIVE_DOUBLE_POS_INF_g          = (double)0.0f;
-double H5T_NATIVE_DOUBLE_NEG_INF_g          = (double)0.0f;
+float  H5T_NATIVE_FLOAT_POS_INF_g  = 0.0f;
+float  H5T_NATIVE_FLOAT_NEG_INF_g  = 0.0f;
+double H5T_NATIVE_DOUBLE_POS_INF_g = (double)0.0f;
+double H5T_NATIVE_DOUBLE_NEG_INF_g = (double)0.0f;
 
 /* Declare the free list for H5T_t's and H5T_shared_t's */
 H5FL_DEFINE(H5T_t);
 H5FL_DEFINE(H5T_shared_t);
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -519,12 +548,12 @@ H5FL_DEFINE(H5T_shared_t);
  * which is used as the key by which the `entries' array is sorted.
  */
 static struct {
-    int            npaths;        /*number of paths defined               */
-    size_t         apaths;        /*number of paths allocated             */
-    H5T_path_t   **path;          /*sorted array of path pointers         */
-    int            nsoft;         /*number of soft conversions defined    */
-    size_t         asoft;         /*number of soft conversions allocated  */
-    H5T_soft_t    *soft;          /*unsorted array of soft conversions    */
+    int          npaths; /*number of paths defined               */
+    size_t       apaths; /*number of paths allocated             */
+    H5T_path_t **path;   /*sorted array of path pointers         */
+    int          nsoft;  /*number of soft conversions defined    */
+    size_t       asoft;  /*number of soft conversions allocated  */
+    H5T_soft_t * soft;   /*unsorted array of soft conversions    */
 } H5T_g;
 
 /* Declare the free list for H5T_path_t's */
@@ -532,15 +561,12 @@ H5FL_DEFINE_STATIC(H5T_path_t);
 
 /* Datatype ID class */
 static const H5I_class_t H5I_DATATYPE_CLS[1] = {{
-    H5I_DATATYPE,        /* ID class value */
-    H5I_CLASS_REUSE_IDS,                   /* Class flags    */
-    8,                   /* # of reserved IDs for class */
-    (H5I_free_t)H5T_close    /* Callback routine for closing objects of this class */
+    H5I_DATATYPE,         /* ID class value */
+    H5I_CLASS_REUSE_IDS,  /* Class flags    */
+    8,                    /* # of reserved IDs for class */
+    (H5I_free_t)H5T_close /* Callback routine for closing objects of this class */
 }};
 
-
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_init
  *
@@ -557,7 +583,7 @@ static const H5I_class_t H5I_DATATYPE_CLS[1] = {{
 herr_t
 H5T_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -566,7 +592,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_init_inf
  *
@@ -584,22 +609,22 @@ done:
 static herr_t
 H5T_init_inf(void)
 {
-    H5T_t        *dst_p;        /* Datatype type operate on */
-    H5T_atomic_t *dst;          /* Datatype's atomic info   */
-    uint8_t      *d;            /* Pointer to value to set  */
-    size_t        half_size;    /* Half the type size       */
-    size_t        u;            /* Local index value        */
-    herr_t ret_value = SUCCEED; /* Return value             */
+    H5T_t *       dst_p;               /* Datatype type operate on */
+    H5T_atomic_t *dst;                 /* Datatype's atomic info   */
+    uint8_t *     d;                   /* Pointer to value to set  */
+    size_t        half_size;           /* Half the type size       */
+    size_t        u;                   /* Local index value        */
+    herr_t        ret_value = SUCCEED; /* Return value             */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get the float datatype */
-    if(NULL == (dst_p = (H5T_t *)H5I_object(H5T_NATIVE_FLOAT_g)))
+    if (NULL == (dst_p = (H5T_t *)H5I_object(H5T_NATIVE_FLOAT_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
     dst = &dst_p->shared->u.atomic;
 
     /* Check that we can re-order the bytes correctly */
-    if(H5T_ORDER_LE != H5T_native_order_g && H5T_ORDER_BE != H5T_native_order_g)
+    if (H5T_ORDER_LE != H5T_native_order_g && H5T_ORDER_BE != H5T_native_order_g)
         HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
 
     /* +Inf */
@@ -611,12 +636,12 @@ H5T_init_inf(void)
     /* Swap the bytes if the machine architecture is big-endian */
     if (H5T_ORDER_BE == H5T_native_order_g) {
         half_size = dst_p->shared->size / 2;
-        for(u = 0; u < half_size; u++) {
-            uint8_t tmp = d[dst_p->shared->size - (u + 1)];
+        for (u = 0; u < half_size; u++) {
+            uint8_t tmp                      = d[dst_p->shared->size - (u + 1)];
             d[dst_p->shared->size - (u + 1)] = d[u];
-            d[u] = tmp;
+            d[u]                             = tmp;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* -Inf */
     d = (uint8_t *)&H5T_NATIVE_FLOAT_NEG_INF_g;
@@ -625,22 +650,22 @@ H5T_init_inf(void)
     H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, FALSE);
 
     /* Swap the bytes if the machine architecture is big-endian */
-    if(H5T_ORDER_BE == H5T_native_order_g) {
+    if (H5T_ORDER_BE == H5T_native_order_g) {
         half_size = dst_p->shared->size / 2;
-        for(u = 0; u < half_size; u++) {
-            uint8_t tmp = d[dst_p->shared->size - (u + 1)];
+        for (u = 0; u < half_size; u++) {
+            uint8_t tmp                      = d[dst_p->shared->size - (u + 1)];
             d[dst_p->shared->size - (u + 1)] = d[u];
-            d[u] = tmp;
+            d[u]                             = tmp;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Get the double datatype */
-    if(NULL == (dst_p = (H5T_t *)H5I_object(H5T_NATIVE_DOUBLE_g)))
+    if (NULL == (dst_p = (H5T_t *)H5I_object(H5T_NATIVE_DOUBLE_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
     dst = &dst_p->shared->u.atomic;
 
     /* Check that we can re-order the bytes correctly */
-    if(H5T_ORDER_LE != H5T_native_order_g && H5T_ORDER_BE != H5T_native_order_g)
+    if (H5T_ORDER_LE != H5T_native_order_g && H5T_ORDER_BE != H5T_native_order_g)
         HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
 
     /* +Inf */
@@ -650,14 +675,14 @@ H5T_init_inf(void)
     H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, FALSE);
 
     /* Swap the bytes if the machine architecture is big-endian */
-    if(H5T_ORDER_BE == H5T_native_order_g) {
+    if (H5T_ORDER_BE == H5T_native_order_g) {
         half_size = dst_p->shared->size / 2;
-        for(u = 0; u < half_size; u++) {
-            uint8_t tmp = d[dst_p->shared->size - (u + 1)];
+        for (u = 0; u < half_size; u++) {
+            uint8_t tmp                      = d[dst_p->shared->size - (u + 1)];
             d[dst_p->shared->size - (u + 1)] = d[u];
-            d[u] = tmp;
+            d[u]                             = tmp;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* -Inf */
     d = (uint8_t *)&H5T_NATIVE_DOUBLE_NEG_INF_g;
@@ -666,20 +691,19 @@ H5T_init_inf(void)
     H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, FALSE);
 
     /* Swap the bytes if the machine architecture is big-endian */
-    if(H5T_ORDER_BE == H5T_native_order_g) {
+    if (H5T_ORDER_BE == H5T_native_order_g) {
         half_size = dst_p->shared->size / 2;
-        for(u = 0; u < half_size; u++) {
-            uint8_t tmp = d[dst_p->shared->size - (u + 1)];
+        for (u = 0; u < half_size; u++) {
+            uint8_t tmp                      = d[dst_p->shared->size - (u + 1)];
             d[dst_p->shared->size - (u + 1)] = d[u];
-            d[u] = tmp;
+            d[u]                             = tmp;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_init_inf() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_init_hw
  *
@@ -698,8 +722,8 @@ H5T_init_hw(void)
 {
 #ifdef H5_HAVE_GET_FPC_CSR
     union fpc_csr csr;          /* Union to hold results of floating-point status register query */
-#endif /* H5_HAVE_GET_FPC_CSR */
-    herr_t ret_value = SUCCEED;   /* Return value */
+#endif                          /* H5_HAVE_GET_FPC_CSR */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -710,16 +734,15 @@ H5T_init_hw(void)
     csr.fc_word = get_fpc_csr();
 
     /* If the "flush denormalized values to zero" flag is set, unset it */
-    if(csr.fc_struct.flush) {
+    if (csr.fc_struct.flush) {
         csr.fc_struct.flush = 0;
         set_fpc_csr(csr.fc_word);
-    } /* end if */
+    }  /* end if */
 #endif /* H5_HAVE_GET_FPC_CSR */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_init_hw() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_interface -- Initialize interface-specific information
@@ -734,48 +757,49 @@ DESCRIPTION
 static herr_t
 H5T_init_interface(void)
 {
-    H5T_t       *native_schar=NULL;     /* Datatype structure for native signed char */
-    H5T_t       *native_uchar=NULL;     /* Datatype structure for native unsigned char */
-    H5T_t       *native_short=NULL;     /* Datatype structure for native short */
-    H5T_t       *native_ushort=NULL;    /* Datatype structure for native unsigned short */
-    H5T_t       *native_int=NULL;       /* Datatype structure for native int */
-    H5T_t       *native_uint=NULL;      /* Datatype structure for native unsigned int */
-    H5T_t       *native_long=NULL;      /* Datatype structure for native long */
-    H5T_t       *native_ulong=NULL;     /* Datatype structure for native unsigned long */
-    H5T_t       *native_llong=NULL;     /* Datatype structure for native long long */
-    H5T_t       *native_ullong=NULL;    /* Datatype structure for native unsigned long long */
-    H5T_t       *native_float=NULL;     /* Datatype structure for native float */
-    H5T_t       *native_double=NULL;    /* Datatype structure for native double */
-#if H5_SIZEOF_LONG_DOUBLE !=0
-    H5T_t       *native_ldouble=NULL;   /* Datatype structure for native long double */
+    H5T_t *native_schar  = NULL; /* Datatype structure for native signed char */
+    H5T_t *native_uchar  = NULL; /* Datatype structure for native unsigned char */
+    H5T_t *native_short  = NULL; /* Datatype structure for native short */
+    H5T_t *native_ushort = NULL; /* Datatype structure for native unsigned short */
+    H5T_t *native_int    = NULL; /* Datatype structure for native int */
+    H5T_t *native_uint   = NULL; /* Datatype structure for native unsigned int */
+    H5T_t *native_long   = NULL; /* Datatype structure for native long */
+    H5T_t *native_ulong  = NULL; /* Datatype structure for native unsigned long */
+    H5T_t *native_llong  = NULL; /* Datatype structure for native long long */
+    H5T_t *native_ullong = NULL; /* Datatype structure for native unsigned long long */
+    H5T_t *native_float  = NULL; /* Datatype structure for native float */
+    H5T_t *native_double = NULL; /* Datatype structure for native double */
+#if H5_SIZEOF_LONG_DOUBLE != 0
+    H5T_t *native_ldouble = NULL; /* Datatype structure for native long double */
 #endif
-    H5T_t       *std_u8le=NULL;         /* Datatype structure for unsigned 8-bit little-endian integer */
-    H5T_t       *std_u8be=NULL;         /* Datatype structure for unsigned 8-bit big-endian integer */
-    H5T_t       *std_u16le=NULL;        /* Datatype structure for unsigned 16-bit little-endian integer */
-    H5T_t       *std_u16be=NULL;        /* Datatype structure for unsigned 16-bit big-endian integer */
-    H5T_t       *std_u32le=NULL;        /* Datatype structure for unsigned 32-bit little-endian integer */
-    H5T_t       *std_u32be=NULL;        /* Datatype structure for unsigned 32-bit big-endian integer */
-    H5T_t       *std_u64le=NULL;        /* Datatype structure for unsigned 64-bit little-endian integer */
-    H5T_t       *std_u64be=NULL;        /* Datatype structure for unsigned 64-bit big-endian integer */
-    H5T_t       *dt = NULL;
-    H5T_t       *fixedpt=NULL;          /* Datatype structure for native int */
-    H5T_t       *floatpt=NULL;          /* Datatype structure for native float */
-    H5T_t       *string=NULL;           /* Datatype structure for C string */
-    H5T_t       *bitfield=NULL;         /* Datatype structure for bitfield */
-    H5T_t       *compound=NULL;         /* Datatype structure for compound objects */
-    H5T_t       *enum_type=NULL;        /* Datatype structure for enum objects */
-    H5T_t       *vlen=NULL;             /* Datatype structure for vlen objects */
-    H5T_t       *array=NULL;            /* Datatype structure for array objects */
-    H5T_t       *objref=NULL;           /* Datatype structure for object reference objects */
-    hsize_t     dim[1]={1};             /* Dimension info for array datatype */
-    herr_t      status;
-    unsigned    copied_dtype=1;         /* Flag to indicate whether datatype was copied or allocated (for error cleanup) */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *  std_u8le  = NULL; /* Datatype structure for unsigned 8-bit little-endian integer */
+    H5T_t *  std_u8be  = NULL; /* Datatype structure for unsigned 8-bit big-endian integer */
+    H5T_t *  std_u16le = NULL; /* Datatype structure for unsigned 16-bit little-endian integer */
+    H5T_t *  std_u16be = NULL; /* Datatype structure for unsigned 16-bit big-endian integer */
+    H5T_t *  std_u32le = NULL; /* Datatype structure for unsigned 32-bit little-endian integer */
+    H5T_t *  std_u32be = NULL; /* Datatype structure for unsigned 32-bit big-endian integer */
+    H5T_t *  std_u64le = NULL; /* Datatype structure for unsigned 64-bit little-endian integer */
+    H5T_t *  std_u64be = NULL; /* Datatype structure for unsigned 64-bit big-endian integer */
+    H5T_t *  dt        = NULL;
+    H5T_t *  fixedpt   = NULL; /* Datatype structure for native int */
+    H5T_t *  floatpt   = NULL; /* Datatype structure for native float */
+    H5T_t *  string    = NULL; /* Datatype structure for C string */
+    H5T_t *  bitfield  = NULL; /* Datatype structure for bitfield */
+    H5T_t *  compound  = NULL; /* Datatype structure for compound objects */
+    H5T_t *  enum_type = NULL; /* Datatype structure for enum objects */
+    H5T_t *  vlen      = NULL; /* Datatype structure for vlen objects */
+    H5T_t *  array     = NULL; /* Datatype structure for array objects */
+    H5T_t *  objref    = NULL; /* Datatype structure for object reference objects */
+    hsize_t  dim[1]    = {1};  /* Dimension info for array datatype */
+    herr_t   status;
+    unsigned copied_dtype =
+        1; /* Flag to indicate whether datatype was copied or allocated (for error cleanup) */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Initialize the atom group for the file IDs */
-    if(H5I_register_type(H5I_DATATYPE_CLS) < 0)
+    if (H5I_register_type(H5I_DATATYPE_CLS) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
     /* Make certain there aren't too many classes of datatypes defined */
@@ -783,43 +807,43 @@ H5T_init_interface(void)
     HDassert(H5T_NCLASSES < 16);
 
     /* Perform any necessary hardware initializations */
-    if(H5T_init_hw() < 0)
-    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize interface")
+    if (H5T_init_hw() < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
     /*
      * Initialize pre-defined native datatypes from code generated during
      * the library configuration by H5detect.
      */
-    if(H5TN_init_interface() < 0)
+    if (H5TN_init_interface() < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
     /* Get the atomic datatype structures needed by the initialization code below */
-    if(NULL == (native_schar = (H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g)))
+    if (NULL == (native_schar = (H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_uchar = (H5T_t *)H5I_object(H5T_NATIVE_UCHAR_g)))
+    if (NULL == (native_uchar = (H5T_t *)H5I_object(H5T_NATIVE_UCHAR_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_short = (H5T_t *)H5I_object(H5T_NATIVE_SHORT_g)))
+    if (NULL == (native_short = (H5T_t *)H5I_object(H5T_NATIVE_SHORT_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_ushort = (H5T_t *)H5I_object(H5T_NATIVE_USHORT_g)))
+    if (NULL == (native_ushort = (H5T_t *)H5I_object(H5T_NATIVE_USHORT_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_int = (H5T_t *)H5I_object(H5T_NATIVE_INT_g)))
+    if (NULL == (native_int = (H5T_t *)H5I_object(H5T_NATIVE_INT_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_uint = (H5T_t *)H5I_object(H5T_NATIVE_UINT_g)))
+    if (NULL == (native_uint = (H5T_t *)H5I_object(H5T_NATIVE_UINT_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_long = (H5T_t *)H5I_object(H5T_NATIVE_LONG_g)))
+    if (NULL == (native_long = (H5T_t *)H5I_object(H5T_NATIVE_LONG_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_ulong = (H5T_t *)H5I_object(H5T_NATIVE_ULONG_g)))
+    if (NULL == (native_ulong = (H5T_t *)H5I_object(H5T_NATIVE_ULONG_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_llong = (H5T_t *)H5I_object(H5T_NATIVE_LLONG_g)))
+    if (NULL == (native_llong = (H5T_t *)H5I_object(H5T_NATIVE_LLONG_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_ullong = (H5T_t *)H5I_object(H5T_NATIVE_ULLONG_g)))
+    if (NULL == (native_ullong = (H5T_t *)H5I_object(H5T_NATIVE_ULLONG_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_float = (H5T_t *)H5I_object(H5T_NATIVE_FLOAT_g)))
+    if (NULL == (native_float = (H5T_t *)H5I_object(H5T_NATIVE_FLOAT_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(NULL == (native_double = (H5T_t *)H5I_object(H5T_NATIVE_DOUBLE_g)))
+    if (NULL == (native_double = (H5T_t *)H5I_object(H5T_NATIVE_DOUBLE_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-#if H5_SIZEOF_LONG_DOUBLE !=0
-    if(NULL == (native_ldouble = (H5T_t *)H5I_object(H5T_NATIVE_LDOUBLE_g)))
+#if H5_SIZEOF_LONG_DOUBLE != 0
+    if (NULL == (native_ldouble = (H5T_t *)H5I_object(H5T_NATIVE_LDOUBLE_g)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
 #endif
 
@@ -829,31 +853,31 @@ H5T_init_interface(void)
      */
 
     /* 1-byte bit field */
-    H5T_INIT_TYPE(BITFIELD,H5T_NATIVE_B8_g,COPY,native_uint,SET,1)
+    H5T_INIT_TYPE(BITFIELD, H5T_NATIVE_B8_g, COPY, native_uint, SET, 1)
 
     /* 2-byte bit field */
-    H5T_INIT_TYPE(BITFIELD,H5T_NATIVE_B16_g,COPY,native_uint,SET,2)
+    H5T_INIT_TYPE(BITFIELD, H5T_NATIVE_B16_g, COPY, native_uint, SET, 2)
 
     /* 4-byte bit field */
-    H5T_INIT_TYPE(BITFIELD,H5T_NATIVE_B32_g,COPY,native_uint,SET,4)
+    H5T_INIT_TYPE(BITFIELD, H5T_NATIVE_B32_g, COPY, native_uint, SET, 4)
 
     /* 8-byte bit field */
-    H5T_INIT_TYPE(BITFIELD,H5T_NATIVE_B64_g,COPY,native_uint,SET,8)
+    H5T_INIT_TYPE(BITFIELD, H5T_NATIVE_B64_g, COPY, native_uint, SET, 8)
 
     /* haddr_t */
-    H5T_INIT_TYPE(OFFSET,H5T_NATIVE_HADDR_g,COPY,native_uint,SET,sizeof(haddr_t))
+    H5T_INIT_TYPE(OFFSET, H5T_NATIVE_HADDR_g, COPY, native_uint, SET, sizeof(haddr_t))
 
     /* hsize_t */
-    H5T_INIT_TYPE(OFFSET,H5T_NATIVE_HSIZE_g,COPY,native_uint,SET,sizeof(hsize_t))
+    H5T_INIT_TYPE(OFFSET, H5T_NATIVE_HSIZE_g, COPY, native_uint, SET, sizeof(hsize_t))
 
     /* hssize_t */
-    H5T_INIT_TYPE(OFFSET,H5T_NATIVE_HSSIZE_g,COPY,native_int,SET,sizeof(hssize_t))
+    H5T_INIT_TYPE(OFFSET, H5T_NATIVE_HSSIZE_g, COPY, native_int, SET, sizeof(hssize_t))
 
     /* herr_t */
-    H5T_INIT_TYPE(OFFSET,H5T_NATIVE_HERR_g,COPY,native_int,SET,sizeof(herr_t))
+    H5T_INIT_TYPE(OFFSET, H5T_NATIVE_HERR_g, COPY, native_int, SET, sizeof(herr_t))
 
     /* hbool_t */
-    H5T_INIT_TYPE(OFFSET,H5T_NATIVE_HBOOL_g,COPY,native_uint,SET,sizeof(hbool_t))
+    H5T_INIT_TYPE(OFFSET, H5T_NATIVE_HBOOL_g, COPY, native_uint, SET, sizeof(hbool_t))
 
     /*------------------------------------------------------------
      * IEEE Types
@@ -861,16 +885,16 @@ H5T_init_interface(void)
      */
 
     /* IEEE 4-byte little-endian float */
-    H5T_INIT_TYPE(FLOATLE,H5T_IEEE_F32LE_g,COPY,native_double,SET,4)
+    H5T_INIT_TYPE(FLOATLE, H5T_IEEE_F32LE_g, COPY, native_double, SET, 4)
 
     /* IEEE 4-byte big-endian float */
-    H5T_INIT_TYPE(FLOATBE,H5T_IEEE_F32BE_g,COPY,native_double,SET,4)
+    H5T_INIT_TYPE(FLOATBE, H5T_IEEE_F32BE_g, COPY, native_double, SET, 4)
 
     /* IEEE 8-byte little-endian float */
-    H5T_INIT_TYPE(DOUBLELE,H5T_IEEE_F64LE_g,COPY,native_double,SET,8)
+    H5T_INIT_TYPE(DOUBLELE, H5T_IEEE_F64LE_g, COPY, native_double, SET, 8)
 
     /* IEEE 8-byte big-endian float */
-    H5T_INIT_TYPE(DOUBLEBE,H5T_IEEE_F64BE_g,COPY,native_double,SET,8)
+    H5T_INIT_TYPE(DOUBLEBE, H5T_IEEE_F64BE_g, COPY, native_double, SET, 8)
 
     /*------------------------------------------------------------
      * VAX Types
@@ -878,10 +902,10 @@ H5T_init_interface(void)
      */
 
     /* VAX 4-byte float */
-    H5T_INIT_TYPE(FLOATVAX,H5T_VAX_F32_g,COPY,native_double,SET,4)
+    H5T_INIT_TYPE(FLOATVAX, H5T_VAX_F32_g, COPY, native_double, SET, 4)
 
     /* VAX 8-byte double */
-    H5T_INIT_TYPE(DOUBLEVAX,H5T_VAX_F64_g,COPY,native_double,SET,8)
+    H5T_INIT_TYPE(DOUBLEVAX, H5T_VAX_F64_g, COPY, native_double, SET, 8)
 
     /*------------------------------------------------------------
      * C99 types
@@ -889,60 +913,60 @@ H5T_init_interface(void)
      */
 
     /* 1-byte little-endian (endianness is irrelevant) signed integer */
-    H5T_INIT_TYPE(SINTLE,H5T_STD_I8LE_g,COPY,native_int,SET,1)
+    H5T_INIT_TYPE(SINTLE, H5T_STD_I8LE_g, COPY, native_int, SET, 1)
 
     /* 1-byte big-endian (endianness is irrelevant) signed integer */
-    H5T_INIT_TYPE(SINTBE,H5T_STD_I8BE_g,COPY,native_int,SET,1)
+    H5T_INIT_TYPE(SINTBE, H5T_STD_I8BE_g, COPY, native_int, SET, 1)
 
     /* 2-byte little-endian signed integer */
-    H5T_INIT_TYPE(SINTLE,H5T_STD_I16LE_g,COPY,native_int,SET,2)
+    H5T_INIT_TYPE(SINTLE, H5T_STD_I16LE_g, COPY, native_int, SET, 2)
 
     /* 2-byte big-endian signed integer */
-    H5T_INIT_TYPE(SINTBE,H5T_STD_I16BE_g,COPY,native_int,SET,2)
+    H5T_INIT_TYPE(SINTBE, H5T_STD_I16BE_g, COPY, native_int, SET, 2)
 
     /* 4-byte little-endian signed integer */
-    H5T_INIT_TYPE(SINTLE,H5T_STD_I32LE_g,COPY,native_int,SET,4)
+    H5T_INIT_TYPE(SINTLE, H5T_STD_I32LE_g, COPY, native_int, SET, 4)
 
     /* 4-byte big-endian signed integer */
-    H5T_INIT_TYPE(SINTBE,H5T_STD_I32BE_g,COPY,native_int,SET,4)
+    H5T_INIT_TYPE(SINTBE, H5T_STD_I32BE_g, COPY, native_int, SET, 4)
 
     /* 8-byte little-endian signed integer */
-    H5T_INIT_TYPE(SINTLE,H5T_STD_I64LE_g,COPY,native_int,SET,8)
+    H5T_INIT_TYPE(SINTLE, H5T_STD_I64LE_g, COPY, native_int, SET, 8)
 
     /* 8-byte big-endian signed integer */
-    H5T_INIT_TYPE(SINTBE,H5T_STD_I64BE_g,COPY,native_int,SET,8)
+    H5T_INIT_TYPE(SINTBE, H5T_STD_I64BE_g, COPY, native_int, SET, 8)
 
     /* 1-byte little-endian (endianness is irrelevant) unsigned integer */
-    H5T_INIT_TYPE(UINTLE,H5T_STD_U8LE_g,COPY,native_uint,SET,1)
-    std_u8le=dt;    /* Keep type for later */
+    H5T_INIT_TYPE(UINTLE, H5T_STD_U8LE_g, COPY, native_uint, SET, 1)
+    std_u8le = dt; /* Keep type for later */
 
     /* 1-byte big-endian (endianness is irrelevant) unsigned integer */
-    H5T_INIT_TYPE(UINTBE,H5T_STD_U8BE_g,COPY,native_uint,SET,1)
-    std_u8be=dt;    /* Keep type for later */
+    H5T_INIT_TYPE(UINTBE, H5T_STD_U8BE_g, COPY, native_uint, SET, 1)
+    std_u8be = dt; /* Keep type for later */
 
     /* 2-byte little-endian unsigned integer */
-    H5T_INIT_TYPE(UINTLE,H5T_STD_U16LE_g,COPY,native_uint,SET,2)
-    std_u16le=dt;    /* Keep type for later */
+    H5T_INIT_TYPE(UINTLE, H5T_STD_U16LE_g, COPY, native_uint, SET, 2)
+    std_u16le = dt; /* Keep type for later */
 
     /* 2-byte big-endian unsigned integer */
-    H5T_INIT_TYPE(UINTBE,H5T_STD_U16BE_g,COPY,native_uint,SET,2)
-    std_u16be=dt;    /* Keep type for later */
+    H5T_INIT_TYPE(UINTBE, H5T_STD_U16BE_g, COPY, native_uint, SET, 2)
+    std_u16be = dt; /* Keep type for later */
 
     /* 4-byte little-endian unsigned integer */
-    H5T_INIT_TYPE(UINTLE,H5T_STD_U32LE_g,COPY,native_uint,SET,4)
-    std_u32le=dt;    /* Keep type for later */
+    H5T_INIT_TYPE(UINTLE, H5T_STD_U32LE_g, COPY, native_uint, SET, 4)
+    std_u32le = dt; /* Keep type for later */
 
     /* 4-byte big-endian unsigned integer */
-    H5T_INIT_TYPE(UINTBE,H5T_STD_U32BE_g,COPY,native_uint,SET,4)
-    std_u32be=dt;    /* Keep type for later */
+    H5T_INIT_TYPE(UINTBE, H5T_STD_U32BE_g, COPY, native_uint, SET, 4)
+    std_u32be = dt; /* Keep type for later */
 
     /* 8-byte little-endian unsigned integer */
-    H5T_INIT_TYPE(UINTLE,H5T_STD_U64LE_g,COPY,native_uint,SET,8)
-    std_u64le=dt;    /* Keep type for later */
+    H5T_INIT_TYPE(UINTLE, H5T_STD_U64LE_g, COPY, native_uint, SET, 8)
+    std_u64le = dt; /* Keep type for later */
 
     /* 8-byte big-endian unsigned integer */
-    H5T_INIT_TYPE(UINTBE,H5T_STD_U64BE_g,COPY,native_uint,SET,8)
-    std_u64be=dt;    /* Keep type for later */
+    H5T_INIT_TYPE(UINTBE, H5T_STD_U64BE_g, COPY, native_uint, SET, 8)
+    std_u64be = dt; /* Keep type for later */
 
     /*------------------------------------------------------------
      * Native, Little- & Big-endian bitfields
@@ -951,7 +975,7 @@ H5T_init_interface(void)
 
     /* little-endian (order is irrelevant) 8-bit bitfield */
     H5T_INIT_TYPE(BITFIELDLE, H5T_STD_B8LE_g, COPY, std_u8le, NOSET, -)
-    bitfield=dt;    /* Keep type for later */
+    bitfield = dt; /* Keep type for later */
 
     /* big-endian (order is irrelevant) 8-bit bitfield */
     H5T_INIT_TYPE(BITFIELDBE, H5T_STD_B8BE_g, COPY, std_u8be, NOSET, -)
@@ -991,7 +1015,6 @@ H5T_init_interface(void)
     /* Big-endian 64-bit UNIX time_t */
     H5T_INIT_TYPE(TIME, H5T_UNIX_D64BE_g, COPY, std_u64be, NOSET, -)
 
-
     /* Indicate that the types that are created from here down are allocated
      * H5FL_ALLOC(), not copied with H5T_copy()
      */
@@ -1007,7 +1030,7 @@ H5T_init_interface(void)
 
     /* One-byte character string */
     H5T_INIT_TYPE(CSTRING, H5T_C_S1_g, ALLOC, -, SET, 1)
-    string = dt;    /* Keep type for later */
+    string = dt; /* Keep type for later */
 
     /*------------------------------------------------------------
      * The `Fortran' architecture
@@ -1024,7 +1047,7 @@ H5T_init_interface(void)
 
     /* Object reference (i.e. object header address in file) */
     H5T_INIT_TYPE(OBJREF, H5T_STD_REF_OBJ_g, ALLOC, -, SET, H5R_OBJ_REF_BUF_SIZE)
-    objref = dt;    /* Keep type for later */
+    objref = dt; /* Keep type for later */
 
     /* Dataset Region reference (i.e. selection inside a dataset) */
     H5T_INIT_TYPE(REGREF, H5T_STD_REF_DSETREG_g, ALLOC, -, SET, H5R_DSET_REG_REF_BUF_SIZE)
@@ -1052,17 +1075,25 @@ H5T_init_interface(void)
     status |= H5T_register(H5T_PERS_SOFT, "s_s", string, string, H5T__conv_s_s, H5AC_ind_dxpl_id, FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "b_b", bitfield, bitfield, H5T__conv_b_b, H5AC_ind_dxpl_id, FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "ibo", fixedpt, fixedpt, H5T__conv_order, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "ibo(opt)", fixedpt, fixedpt, H5T__conv_order_opt, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "ibo(opt)", fixedpt, fixedpt, H5T__conv_order_opt, H5AC_ind_dxpl_id,
+                           FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "fbo", floatpt, floatpt, H5T__conv_order, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "fbo(opt)", floatpt, floatpt, H5T__conv_order_opt, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "struct(no-opt)", compound, compound, H5T__conv_struct, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "struct(opt)", compound, compound, H5T__conv_struct_opt, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "enum", enum_type, enum_type, H5T__conv_enum, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "enum_i", enum_type, fixedpt, H5T__conv_enum_numeric, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "enum_f", enum_type, floatpt, H5T__conv_enum_numeric, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "fbo(opt)", floatpt, floatpt, H5T__conv_order_opt, H5AC_ind_dxpl_id,
+                           FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "struct(no-opt)", compound, compound, H5T__conv_struct,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "struct(opt)", compound, compound, H5T__conv_struct_opt,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |=
+        H5T_register(H5T_PERS_SOFT, "enum", enum_type, enum_type, H5T__conv_enum, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "enum_i", enum_type, fixedpt, H5T__conv_enum_numeric,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "enum_f", enum_type, floatpt, H5T__conv_enum_numeric,
+                           H5AC_ind_dxpl_id, FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "vlen", vlen, vlen, H5T__conv_vlen, H5AC_ind_dxpl_id, FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "array", array, array, H5T__conv_array, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "objref", objref, objref, H5T__conv_order_opt, H5AC_ind_dxpl_id, FALSE);
+    status |=
+        H5T_register(H5T_PERS_SOFT, "objref", objref, objref, H5T__conv_order_opt, H5AC_ind_dxpl_id, FALSE);
 
     /*
      * Native conversions should be listed last since we can use hardware to
@@ -1073,221 +1104,377 @@ H5T_init_interface(void)
      */
 
     /* floating point */
-    status |= H5T_register(H5T_PERS_HARD, "flt_dbl", native_float, native_double, H5T__conv_float_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_flt", native_double, native_float, H5T__conv_double_float, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_dbl", native_float, native_double, H5T__conv_float_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_flt", native_double, native_float, H5T__conv_double_float,
+                           H5AC_ind_dxpl_id, FALSE);
 #if H5_SIZEOF_LONG_DOUBLE != 0
-    status |= H5T_register(H5T_PERS_HARD, "flt_ldbl", native_float, native_ldouble, H5T__conv_float_ldouble, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_ldbl", native_double, native_ldouble, H5T__conv_double_ldouble, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_flt", native_ldouble, native_float, H5T__conv_ldouble_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_dbl", native_ldouble, native_double, H5T__conv_ldouble_double, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_ldbl", native_float, native_ldouble, H5T__conv_float_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_ldbl", native_double, native_ldouble, H5T__conv_double_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_flt", native_ldouble, native_float, H5T__conv_ldouble_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_dbl", native_ldouble, native_double, H5T__conv_ldouble_double,
+                           H5AC_ind_dxpl_id, FALSE);
 #endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
 
     /* from long long */
-    status |= H5T_register(H5T_PERS_HARD, "llong_ullong", native_llong, native_ullong, H5T__conv_llong_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_llong", native_ullong, native_llong, H5T__conv_ullong_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_long", native_llong, native_long, H5T__conv_llong_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_ulong", native_llong, native_ulong, H5T__conv_llong_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_long", native_ullong, native_long, H5T__conv_ullong_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_ulong", native_ullong, native_ulong, H5T__conv_ullong_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_short", native_llong, native_short, H5T__conv_llong_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_ushort", native_llong, native_ushort, H5T__conv_llong_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_short", native_ullong, native_short, H5T__conv_ullong_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_ushort", native_ullong, native_ushort, H5T__conv_ullong_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_int", native_llong, native_int, H5T__conv_llong_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_uint", native_llong, native_uint, H5T__conv_llong_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_int", native_ullong, native_int, H5T__conv_ullong_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_uint", native_ullong, native_uint, H5T__conv_ullong_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_schar", native_llong, native_schar, H5T__conv_llong_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_uchar", native_llong, native_uchar, H5T__conv_llong_uchar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_schar", native_ullong, native_schar, H5T__conv_ullong_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_uchar", native_ullong, native_uchar, H5T__conv_ullong_uchar, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_ullong", native_llong, native_ullong, H5T__conv_llong_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_llong", native_ullong, native_llong, H5T__conv_ullong_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_long", native_llong, native_long, H5T__conv_llong_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_ulong", native_llong, native_ulong, H5T__conv_llong_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_long", native_ullong, native_long, H5T__conv_ullong_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_ulong", native_ullong, native_ulong, H5T__conv_ullong_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_short", native_llong, native_short, H5T__conv_llong_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_ushort", native_llong, native_ushort, H5T__conv_llong_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_short", native_ullong, native_short, H5T__conv_ullong_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_ushort", native_ullong, native_ushort,
+                           H5T__conv_ullong_ushort, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_int", native_llong, native_int, H5T__conv_llong_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_uint", native_llong, native_uint, H5T__conv_llong_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_int", native_ullong, native_int, H5T__conv_ullong_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_uint", native_ullong, native_uint, H5T__conv_ullong_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_schar", native_llong, native_schar, H5T__conv_llong_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_uchar", native_llong, native_uchar, H5T__conv_llong_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_schar", native_ullong, native_schar, H5T__conv_ullong_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_uchar", native_ullong, native_uchar, H5T__conv_ullong_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From long */
-    status |= H5T_register(H5T_PERS_HARD, "long_llong", native_long, native_llong, H5T__conv_long_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_ullong", native_long, native_ullong, H5T__conv_long_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_llong", native_ulong, native_llong, H5T__conv_ulong_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_ullong", native_ulong, native_ullong, H5T__conv_ulong_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_ulong", native_long, native_ulong, H5T__conv_long_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_long", native_ulong, native_long, H5T__conv_ulong_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_short", native_long, native_short, H5T__conv_long_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_ushort", native_long, native_ushort, H5T__conv_long_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_short", native_ulong, native_short, H5T__conv_ulong_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_ushort", native_ulong, native_ushort, H5T__conv_ulong_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_int", native_long, native_int, H5T__conv_long_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_uint", native_long, native_uint, H5T__conv_long_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_int", native_ulong, native_int, H5T__conv_ulong_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_uint", native_ulong, native_uint, H5T__conv_ulong_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_schar", native_long, native_schar, H5T__conv_long_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_uchar", native_long, native_uchar, H5T__conv_long_uchar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_schar", native_ulong, native_schar, H5T__conv_ulong_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_uchar", native_ulong, native_uchar, H5T__conv_ulong_uchar, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_llong", native_long, native_llong, H5T__conv_long_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_ullong", native_long, native_ullong, H5T__conv_long_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_llong", native_ulong, native_llong, H5T__conv_ulong_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_ullong", native_ulong, native_ullong, H5T__conv_ulong_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_ulong", native_long, native_ulong, H5T__conv_long_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_long", native_ulong, native_long, H5T__conv_ulong_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_short", native_long, native_short, H5T__conv_long_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_ushort", native_long, native_ushort, H5T__conv_long_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_short", native_ulong, native_short, H5T__conv_ulong_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_ushort", native_ulong, native_ushort, H5T__conv_ulong_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_int", native_long, native_int, H5T__conv_long_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_uint", native_long, native_uint, H5T__conv_long_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_int", native_ulong, native_int, H5T__conv_ulong_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_uint", native_ulong, native_uint, H5T__conv_ulong_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_schar", native_long, native_schar, H5T__conv_long_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_uchar", native_long, native_uchar, H5T__conv_long_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_schar", native_ulong, native_schar, H5T__conv_ulong_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_uchar", native_ulong, native_uchar, H5T__conv_ulong_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From short */
-    status |= H5T_register(H5T_PERS_HARD, "short_llong", native_short, native_llong, H5T__conv_short_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_ullong", native_short, native_ullong, H5T__conv_short_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_llong", native_ushort, native_llong, H5T__conv_ushort_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_ullong", native_ushort, native_ullong, H5T__conv_ushort_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_long", native_short, native_long, H5T__conv_short_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_ulong", native_short, native_ulong, H5T__conv_short_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_long", native_ushort, native_long, H5T__conv_ushort_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_ulong", native_ushort, native_ulong, H5T__conv_ushort_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_ushort", native_short, native_ushort, H5T__conv_short_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_short", native_ushort, native_short, H5T__conv_ushort_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_int", native_short, native_int, H5T__conv_short_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_uint", native_short, native_uint, H5T__conv_short_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_int", native_ushort, native_int, H5T__conv_ushort_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_uint", native_ushort, native_uint, H5T__conv_ushort_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_schar", native_short, native_schar, H5T__conv_short_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_uchar", native_short, native_uchar, H5T__conv_short_uchar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_schar", native_ushort, native_schar, H5T__conv_ushort_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_uchar", native_ushort, native_uchar, H5T__conv_ushort_uchar, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_llong", native_short, native_llong, H5T__conv_short_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_ullong", native_short, native_ullong, H5T__conv_short_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_llong", native_ushort, native_llong, H5T__conv_ushort_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_ullong", native_ushort, native_ullong,
+                           H5T__conv_ushort_ullong, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_long", native_short, native_long, H5T__conv_short_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_ulong", native_short, native_ulong, H5T__conv_short_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_long", native_ushort, native_long, H5T__conv_ushort_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_ulong", native_ushort, native_ulong, H5T__conv_ushort_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_ushort", native_short, native_ushort, H5T__conv_short_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_short", native_ushort, native_short, H5T__conv_ushort_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_int", native_short, native_int, H5T__conv_short_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_uint", native_short, native_uint, H5T__conv_short_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_int", native_ushort, native_int, H5T__conv_ushort_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_uint", native_ushort, native_uint, H5T__conv_ushort_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_schar", native_short, native_schar, H5T__conv_short_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_uchar", native_short, native_uchar, H5T__conv_short_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_schar", native_ushort, native_schar, H5T__conv_ushort_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_uchar", native_ushort, native_uchar, H5T__conv_ushort_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From int */
-    status |= H5T_register(H5T_PERS_HARD, "int_llong", native_int, native_llong, H5T__conv_int_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_ullong", native_int, native_ullong, H5T__conv_int_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_llong", native_uint, native_llong, H5T__conv_uint_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_ullong", native_uint, native_ullong, H5T__conv_uint_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_long", native_int, native_long, H5T__conv_int_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_ulong", native_int, native_ulong, H5T__conv_int_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_long", native_uint, native_long, H5T__conv_uint_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_ulong", native_uint, native_ulong, H5T__conv_uint_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_short", native_int, native_short, H5T__conv_int_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_ushort", native_int, native_ushort, H5T__conv_int_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_short", native_uint, native_short, H5T__conv_uint_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_ushort", native_uint, native_ushort, H5T__conv_uint_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_uint", native_int, native_uint, H5T__conv_int_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_int", native_uint, native_int, H5T__conv_uint_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_schar", native_int, native_schar, H5T__conv_int_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_uchar", native_int, native_uchar, H5T__conv_int_uchar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_schar", native_uint, native_schar, H5T__conv_uint_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_uchar", native_uint, native_uchar, H5T__conv_uint_uchar, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_llong", native_int, native_llong, H5T__conv_int_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_ullong", native_int, native_ullong, H5T__conv_int_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_llong", native_uint, native_llong, H5T__conv_uint_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_ullong", native_uint, native_ullong, H5T__conv_uint_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_long", native_int, native_long, H5T__conv_int_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_ulong", native_int, native_ulong, H5T__conv_int_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_long", native_uint, native_long, H5T__conv_uint_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_ulong", native_uint, native_ulong, H5T__conv_uint_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_short", native_int, native_short, H5T__conv_int_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_ushort", native_int, native_ushort, H5T__conv_int_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_short", native_uint, native_short, H5T__conv_uint_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_ushort", native_uint, native_ushort, H5T__conv_uint_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_uint", native_int, native_uint, H5T__conv_int_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_int", native_uint, native_int, H5T__conv_uint_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_schar", native_int, native_schar, H5T__conv_int_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_uchar", native_int, native_uchar, H5T__conv_int_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_schar", native_uint, native_schar, H5T__conv_uint_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_uchar", native_uint, native_uchar, H5T__conv_uint_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From char */
-    status |= H5T_register(H5T_PERS_HARD, "schar_llong", native_schar, native_llong, H5T__conv_schar_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_ullong", native_schar, native_ullong, H5T__conv_schar_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_llong", native_uchar, native_llong, H5T__conv_uchar_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_ullong", native_uchar, native_ullong, H5T__conv_uchar_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_long", native_schar, native_long, H5T__conv_schar_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_ulong", native_schar, native_ulong, H5T__conv_schar_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_long", native_uchar, native_long, H5T__conv_uchar_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_ulong", native_uchar, native_ulong, H5T__conv_uchar_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_short", native_schar, native_short, H5T__conv_schar_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_ushort", native_schar, native_ushort, H5T__conv_schar_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_short", native_uchar, native_short, H5T__conv_uchar_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_ushort", native_uchar, native_ushort, H5T__conv_uchar_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_int", native_schar, native_int, H5T__conv_schar_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_uint", native_schar, native_uint, H5T__conv_schar_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_int", native_uchar, native_int, H5T__conv_uchar_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_uint", native_uchar, native_uint, H5T__conv_uchar_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_uchar", native_schar, native_uchar, H5T__conv_schar_uchar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_schar", native_uchar, native_schar, H5T__conv_uchar_schar, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_llong", native_schar, native_llong, H5T__conv_schar_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_ullong", native_schar, native_ullong, H5T__conv_schar_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_llong", native_uchar, native_llong, H5T__conv_uchar_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_ullong", native_uchar, native_ullong, H5T__conv_uchar_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_long", native_schar, native_long, H5T__conv_schar_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_ulong", native_schar, native_ulong, H5T__conv_schar_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_long", native_uchar, native_long, H5T__conv_uchar_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_ulong", native_uchar, native_ulong, H5T__conv_uchar_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_short", native_schar, native_short, H5T__conv_schar_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_ushort", native_schar, native_ushort, H5T__conv_schar_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_short", native_uchar, native_short, H5T__conv_uchar_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_ushort", native_uchar, native_ushort, H5T__conv_uchar_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_int", native_schar, native_int, H5T__conv_schar_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_uint", native_schar, native_uint, H5T__conv_schar_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_int", native_uchar, native_int, H5T__conv_uchar_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_uint", native_uchar, native_uint, H5T__conv_uchar_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_uchar", native_schar, native_uchar, H5T__conv_schar_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_schar", native_uchar, native_schar, H5T__conv_uchar_schar,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From char to floats */
-    status |= H5T_register(H5T_PERS_HARD, "schar_flt", native_schar, native_float, H5T__conv_schar_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_dbl", native_schar, native_double, H5T__conv_schar_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_ldbl", native_schar, native_ldouble, H5T__conv_schar_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_flt", native_schar, native_float, H5T__conv_schar_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_dbl", native_schar, native_double, H5T__conv_schar_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_ldbl", native_schar, native_ldouble, H5T__conv_schar_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From unsigned char to floats */
-    status |= H5T_register(H5T_PERS_HARD, "uchar_flt", native_uchar, native_float, H5T__conv_uchar_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_dbl", native_uchar, native_double, H5T__conv_uchar_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_ldbl", native_uchar, native_ldouble, H5T__conv_uchar_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_flt", native_uchar, native_float, H5T__conv_uchar_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_dbl", native_uchar, native_double, H5T__conv_uchar_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_ldbl", native_uchar, native_ldouble, H5T__conv_uchar_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From short to floats */
-    status |= H5T_register(H5T_PERS_HARD, "short_flt", native_short, native_float, H5T__conv_short_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_dbl", native_short, native_double, H5T__conv_short_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_ldbl", native_short, native_ldouble, H5T__conv_short_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_flt", native_short, native_float, H5T__conv_short_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_dbl", native_short, native_double, H5T__conv_short_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_ldbl", native_short, native_ldouble, H5T__conv_short_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From unsigned short to floats */
-    status |= H5T_register(H5T_PERS_HARD, "ushort_flt", native_ushort, native_float, H5T__conv_ushort_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_dbl", native_ushort, native_double, H5T__conv_ushort_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_ldbl", native_ushort, native_ldouble, H5T__conv_ushort_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_flt", native_ushort, native_float, H5T__conv_ushort_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_dbl", native_ushort, native_double, H5T__conv_ushort_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_ldbl", native_ushort, native_ldouble,
+                           H5T__conv_ushort_ldouble, H5AC_ind_dxpl_id, FALSE);
 
     /* From int to floats */
-    status |= H5T_register(H5T_PERS_HARD, "int_flt", native_int, native_float, H5T__conv_int_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_dbl", native_int, native_double, H5T__conv_int_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_ldbl", native_int, native_ldouble, H5T__conv_int_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_flt", native_int, native_float, H5T__conv_int_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_dbl", native_int, native_double, H5T__conv_int_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_ldbl", native_int, native_ldouble, H5T__conv_int_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From unsigned int to floats */
-    status |= H5T_register(H5T_PERS_HARD, "uint_flt", native_uint, native_float, H5T__conv_uint_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_dbl", native_uint, native_double, H5T__conv_uint_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_ldbl", native_uint, native_ldouble, H5T__conv_uint_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_flt", native_uint, native_float, H5T__conv_uint_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_dbl", native_uint, native_double, H5T__conv_uint_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_ldbl", native_uint, native_ldouble, H5T__conv_uint_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From long to floats */
-    status |= H5T_register(H5T_PERS_HARD, "long_flt", native_long, native_float, H5T__conv_long_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_dbl", native_long, native_double, H5T__conv_long_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_ldbl", native_long, native_ldouble, H5T__conv_long_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_flt", native_long, native_float, H5T__conv_long_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_dbl", native_long, native_double, H5T__conv_long_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_ldbl", native_long, native_ldouble, H5T__conv_long_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From unsigned long to floats */
-    status |= H5T_register(H5T_PERS_HARD, "ulong_flt", native_ulong, native_float, H5T__conv_ulong_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_dbl", native_ulong, native_double, H5T__conv_ulong_double, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_ldbl", native_ulong, native_ldouble, H5T__conv_ulong_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_flt", native_ulong, native_float, H5T__conv_ulong_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_dbl", native_ulong, native_double, H5T__conv_ulong_double,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_ldbl", native_ulong, native_ldouble, H5T__conv_ulong_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From long long to floats */
-    status |= H5T_register(H5T_PERS_HARD, "llong_flt", native_llong, native_float, H5T__conv_llong_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_dbl", native_llong, native_double, H5T__conv_llong_double, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_flt", native_llong, native_float, H5T__conv_llong_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_dbl", native_llong, native_double, H5T__conv_llong_double,
+                           H5AC_ind_dxpl_id, FALSE);
 #ifdef H5T_CONV_INTERNAL_LLONG_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "llong_ldbl", native_llong, native_ldouble, H5T__conv_llong_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_ldbl", native_llong, native_ldouble, H5T__conv_llong_ldouble,
+                           H5AC_ind_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LLONG_LDOUBLE */
 
     /* From unsigned long long to floats */
-    status |= H5T_register(H5T_PERS_HARD, "ullong_flt", native_ullong, native_float, H5T__conv_ullong_float, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_dbl", native_ullong, native_double, H5T__conv_ullong_double, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_flt", native_ullong, native_float, H5T__conv_ullong_float,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_dbl", native_ullong, native_double, H5T__conv_ullong_double,
+                           H5AC_ind_dxpl_id, FALSE);
 #ifdef H5T_CONV_INTERNAL_ULLONG_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "ullong_ldbl", native_ullong, native_ldouble, H5T__conv_ullong_ldouble, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_ldbl", native_ullong, native_ldouble,
+                           H5T__conv_ullong_ldouble, H5AC_ind_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_ULLONG_LDOUBLE */
 
     /* From floats to char */
-    status |= H5T_register(H5T_PERS_HARD, "flt_schar", native_float, native_schar, H5T__conv_float_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_schar", native_double, native_schar, H5T__conv_double_schar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_schar", native_ldouble, native_schar, H5T__conv_ldouble_schar, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_schar", native_float, native_schar, H5T__conv_float_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_schar", native_double, native_schar, H5T__conv_double_schar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_schar", native_ldouble, native_schar, H5T__conv_ldouble_schar,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From floats to unsigned char */
-    status |= H5T_register(H5T_PERS_HARD, "flt_uchar", native_float, native_uchar, H5T__conv_float_uchar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_uchar", native_double, native_uchar, H5T__conv_double_uchar, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_uchar", native_ldouble, native_uchar, H5T__conv_ldouble_uchar, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_uchar", native_float, native_uchar, H5T__conv_float_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_uchar", native_double, native_uchar, H5T__conv_double_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_uchar", native_ldouble, native_uchar, H5T__conv_ldouble_uchar,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From floats to short */
-    status |= H5T_register(H5T_PERS_HARD, "flt_short", native_float, native_short, H5T__conv_float_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_short", native_double, native_short, H5T__conv_double_short, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_short", native_ldouble, native_short, H5T__conv_ldouble_short, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_short", native_float, native_short, H5T__conv_float_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_short", native_double, native_short, H5T__conv_double_short,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_short", native_ldouble, native_short, H5T__conv_ldouble_short,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From floats to unsigned short */
-    status |= H5T_register(H5T_PERS_HARD, "flt_ushort", native_float, native_ushort, H5T__conv_float_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_ushort", native_double, native_ushort, H5T__conv_double_ushort, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_ushort", native_ldouble, native_ushort, H5T__conv_ldouble_ushort, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_ushort", native_float, native_ushort, H5T__conv_float_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_ushort", native_double, native_ushort, H5T__conv_double_ushort,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_ushort", native_ldouble, native_ushort,
+                           H5T__conv_ldouble_ushort, H5AC_ind_dxpl_id, FALSE);
 
     /* From floats to int */
-    status |= H5T_register(H5T_PERS_HARD, "flt_int", native_float, native_int, H5T__conv_float_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_int", native_double, native_int, H5T__conv_double_int, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_int", native_ldouble, native_int, H5T__conv_ldouble_int, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_int", native_float, native_int, H5T__conv_float_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_int", native_double, native_int, H5T__conv_double_int,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_int", native_ldouble, native_int, H5T__conv_ldouble_int,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From floats to unsigned int */
-    status |= H5T_register(H5T_PERS_HARD, "flt_uint", native_float, native_uint, H5T__conv_float_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_uint", native_double, native_uint, H5T__conv_double_uint, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_uint", native_ldouble, native_uint, H5T__conv_ldouble_uint, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_uint", native_float, native_uint, H5T__conv_float_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_uint", native_double, native_uint, H5T__conv_double_uint,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_uint", native_ldouble, native_uint, H5T__conv_ldouble_uint,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From floats to long */
-    status |= H5T_register(H5T_PERS_HARD, "flt_long", native_float, native_long, H5T__conv_float_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_long", native_double, native_long, H5T__conv_double_long, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_long", native_ldouble, native_long, H5T__conv_ldouble_long, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_long", native_float, native_long, H5T__conv_float_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_long", native_double, native_long, H5T__conv_double_long,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_long", native_ldouble, native_long, H5T__conv_ldouble_long,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From floats to unsigned long */
-    status |= H5T_register(H5T_PERS_HARD, "flt_ulong", native_float, native_ulong, H5T__conv_float_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_ulong", native_double, native_ulong, H5T__conv_double_ulong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_ulong", native_ldouble, native_ulong, H5T__conv_ldouble_ulong, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_ulong", native_float, native_ulong, H5T__conv_float_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_ulong", native_double, native_ulong, H5T__conv_double_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_ulong", native_ldouble, native_ulong, H5T__conv_ldouble_ulong,
+                           H5AC_ind_dxpl_id, FALSE);
 
     /* From floats to long long */
-    status |= H5T_register(H5T_PERS_HARD, "flt_llong", native_float, native_llong, H5T__conv_float_llong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_llong", native_double, native_llong, H5T__conv_double_llong, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_llong", native_float, native_llong, H5T__conv_float_llong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_llong", native_double, native_llong, H5T__conv_double_llong,
+                           H5AC_ind_dxpl_id, FALSE);
 #ifdef H5T_CONV_INTERNAL_LDOUBLE_LLONG
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_llong", native_ldouble, native_llong, H5T__conv_ldouble_llong, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_llong", native_ldouble, native_llong, H5T__conv_ldouble_llong,
+                           H5AC_ind_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_LLONG */
 
     /* From floats to unsigned long long */
-    status |= H5T_register(H5T_PERS_HARD, "flt_ullong", native_float, native_ullong, H5T__conv_float_ullong, H5AC_ind_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_ullong", native_double, native_ullong, H5T__conv_double_ullong, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_ullong", native_float, native_ullong, H5T__conv_float_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_ullong", native_double, native_ullong, H5T__conv_double_ullong,
+                           H5AC_ind_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_ULLONG
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_ullong", native_ldouble, native_ullong, H5T__conv_ldouble_ullong, H5AC_ind_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_ullong", native_ldouble, native_ullong,
+                           H5T__conv_ldouble_ullong, H5AC_ind_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_ULLONG */
 
     /*
@@ -1295,12 +1482,13 @@ H5T_init_interface(void)
      * data types we use are not important as long as the source and
      * destination are equal.
      */
-    status |= H5T_register(H5T_PERS_HARD, "no-op", native_int, native_int, H5T__conv_noop, H5AC_ind_dxpl_id, FALSE);
+    status |=
+        H5T_register(H5T_PERS_HARD, "no-op", native_int, native_int, H5T__conv_noop, H5AC_ind_dxpl_id, FALSE);
 
     /* Initialize the +/- Infinity values for floating-point types */
     status |= H5T_init_inf();
 
-    if(status < 0)
+    if (status < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to register conversion function(s)")
 
     /* Register datatype creation property class properties here.  See similar
@@ -1308,43 +1496,42 @@ H5T_init_interface(void)
      */
 
     /* Only register the default property list if it hasn't been created yet */
-    if(H5P_LST_DATATYPE_CREATE_ID_g == (-1)) {
+    if (H5P_LST_DATATYPE_CREATE_ID_g == (-1)) {
         /* ========== Datatype Creation Property Class Initialization ============*/
         HDassert(H5P_CLS_DATATYPE_CREATE_g != NULL);
 
         /* Register the default datatype creation property list */
-        if((H5P_LST_DATATYPE_CREATE_ID_g = H5P_create_id(H5P_CLS_DATATYPE_CREATE_g, FALSE)) < 0)
-             HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't insert property into class")
+        if ((H5P_LST_DATATYPE_CREATE_ID_g = H5P_create_id(H5P_CLS_DATATYPE_CREATE_g, FALSE)) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't insert property into class")
     } /* end if */
 
 done:
     /* General cleanup */
-    if(compound != NULL)
+    if (compound != NULL)
         H5T_close(compound);
-    if(enum_type != NULL)
+    if (enum_type != NULL)
         H5T_close(enum_type);
-    if(vlen != NULL)
+    if (vlen != NULL)
         H5T_close(vlen);
-    if(array != NULL)
+    if (array != NULL)
         H5T_close(array);
 
     /* Error cleanup */
-    if(ret_value < 0) {
-        if(dt) {
+    if (ret_value < 0) {
+        if (dt) {
             /* Check if we should call H5T_close or H5FL_FREE */
-            if(copied_dtype)
+            if (copied_dtype)
                 H5T_close(dt);
             else {
                 dt->shared = H5FL_FREE(H5T_shared_t, dt->shared);
-                dt = H5FL_FREE(H5T_t, dt);
+                dt         = H5FL_FREE(H5T_t, dt);
             } /* end else */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_init_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5T_unlock_cb
  *
@@ -1362,19 +1549,18 @@ done:
 static int
 H5T_unlock_cb(void *_dt, hid_t H5_ATTR_UNUSED id, void H5_ATTR_UNUSED *key)
 {
-    H5T_t    *dt = (H5T_t *)_dt;
+    H5T_t *dt = (H5T_t *)_dt;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert (dt && dt->shared);
+    HDassert(dt && dt->shared);
 
-    if(H5T_STATE_IMMUTABLE==dt->shared->state)
+    if (H5T_STATE_IMMUTABLE == dt->shared->state)
         dt->shared->state = H5T_STATE_RDONLY;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5T_unlock_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5T_term_interface
  *
@@ -1392,158 +1578,159 @@ H5T_unlock_cb(void *_dt, hid_t H5_ATTR_UNUSED id, void H5_ATTR_UNUSED *key)
 int
 H5T_term_interface(void)
 {
-    int    n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
+    if (H5_interface_initialize_g) {
         int i, nprint = 0;
 
         /* Unregister all conversion functions */
-        for(i = 0; i < H5T_g.npaths; i++) {
+        for (i = 0; i < H5T_g.npaths; i++) {
             H5T_path_t *path;
 
             path = H5T_g.path[i];
             HDassert(path);
-            if(path->func) {
-                H5T__print_stats(path, &nprint/*in,out*/);
+            if (path->func) {
+                H5T__print_stats(path, &nprint /*in,out*/);
                 path->cdata.command = H5T_CONV_FREE;
-                if((path->func)((hid_t)FAIL, (hid_t)FAIL, &(path->cdata), (size_t)0,
-                        (size_t)0, (size_t)0, NULL, NULL,H5AC_ind_dxpl_id) < 0) {
+                if ((path->func)((hid_t)FAIL, (hid_t)FAIL, &(path->cdata), (size_t)0, (size_t)0, (size_t)0,
+                                 NULL, NULL, H5AC_ind_dxpl_id) < 0) {
 #ifdef H5T_DEBUG
-                        if (H5DEBUG(T)) {
-                            HDfprintf(H5DEBUG(T), "H5T: conversion function "
-                                    "0x%08lx failed to free private data for "
-                                    "%s (ignored)\n",
-                                    (unsigned long)(path->func), path->name);
-                        } /* end if */
-#endif
-                        H5E_clear_stack(NULL); /*ignore the error*/
+                    if (H5DEBUG(T)) {
+                        HDfprintf(H5DEBUG(T),
+                                  "H5T: conversion function "
+                                  "0x%08lx failed to free private data for "
+                                  "%s (ignored)\n",
+                                  (unsigned long)(path->func), path->name);
                     } /* end if */
-                } /* end if */
-
-                if(path->src)
-                    H5T_close(path->src);
-                if(path->dst)
-                    H5T_close(path->dst);
-                path = H5FL_FREE(H5T_path_t, path);
-                H5T_g.path[i] = NULL;
-            } /* end for */
+#endif
+                    H5E_clear_stack(NULL); /*ignore the error*/
+                }                          /* end if */
+            }                              /* end if */
+
+            if (path->src)
+                H5T_close(path->src);
+            if (path->dst)
+                H5T_close(path->dst);
+            path          = H5FL_FREE(H5T_path_t, path);
+            H5T_g.path[i] = NULL;
+        } /* end for */
 
-            /* Clear conversion tables */
-            H5T_g.path = (H5T_path_t **)H5MM_xfree(H5T_g.path);
-            H5T_g.npaths = 0;
-            H5T_g.apaths = 0;
-            H5T_g.soft = (H5T_soft_t *)H5MM_xfree(H5T_g.soft);
-            H5T_g.nsoft = 0;
-            H5T_g.asoft = 0;
-
-            /* Unlock all datatypes, then free them */
-            /* note that we are ignoring the return value from H5I_iterate() */
-            H5I_iterate(H5I_DATATYPE, H5T_unlock_cb, NULL, FALSE);
-
-            /* Close deprecated interface */
-            n += H5T__term_deprec_interface();
-
-            /* Destroy the datatype object id group */
-            (void)H5I_dec_type_ref(H5I_DATATYPE);
-            n++; /*H5I*/
-
-            /* Reset all the datatype IDs */
-            H5T_IEEE_F32BE_g            = FAIL;
-            H5T_IEEE_F32LE_g            = FAIL;
-            H5T_IEEE_F64BE_g            = FAIL;
-            H5T_IEEE_F64LE_g            = FAIL;
-
-            H5T_STD_I8BE_g              = FAIL;
-            H5T_STD_I8LE_g              = FAIL;
-            H5T_STD_I16BE_g             = FAIL;
-            H5T_STD_I16LE_g             = FAIL;
-            H5T_STD_I32BE_g             = FAIL;
-            H5T_STD_I32LE_g             = FAIL;
-            H5T_STD_I64BE_g             = FAIL;
-            H5T_STD_I64LE_g             = FAIL;
-            H5T_STD_U8BE_g              = FAIL;
-            H5T_STD_U8LE_g              = FAIL;
-            H5T_STD_U16BE_g             = FAIL;
-            H5T_STD_U16LE_g             = FAIL;
-            H5T_STD_U32BE_g             = FAIL;
-            H5T_STD_U32LE_g             = FAIL;
-            H5T_STD_U64BE_g             = FAIL;
-            H5T_STD_U64LE_g             = FAIL;
-            H5T_STD_B8BE_g              = FAIL;
-            H5T_STD_B8LE_g              = FAIL;
-            H5T_STD_B16BE_g             = FAIL;
-            H5T_STD_B16LE_g             = FAIL;
-            H5T_STD_B32BE_g             = FAIL;
-            H5T_STD_B32LE_g             = FAIL;
-            H5T_STD_B64BE_g             = FAIL;
-            H5T_STD_B64LE_g             = FAIL;
-            H5T_STD_REF_OBJ_g           = FAIL;
-            H5T_STD_REF_DSETREG_g       = FAIL;
-
-            H5T_UNIX_D32BE_g            = FAIL;
-            H5T_UNIX_D32LE_g            = FAIL;
-            H5T_UNIX_D64BE_g            = FAIL;
-            H5T_UNIX_D64LE_g            = FAIL;
-
-            H5T_C_S1_g                  = FAIL;
-
-            H5T_FORTRAN_S1_g            = FAIL;
-
-            H5T_NATIVE_SCHAR_g          = FAIL;
-            H5T_NATIVE_UCHAR_g          = FAIL;
-            H5T_NATIVE_SHORT_g          = FAIL;
-            H5T_NATIVE_USHORT_g         = FAIL;
-            H5T_NATIVE_INT_g            = FAIL;
-            H5T_NATIVE_UINT_g           = FAIL;
-            H5T_NATIVE_LONG_g           = FAIL;
-            H5T_NATIVE_ULONG_g          = FAIL;
-            H5T_NATIVE_LLONG_g          = FAIL;
-            H5T_NATIVE_ULLONG_g         = FAIL;
-            H5T_NATIVE_FLOAT_g          = FAIL;
-            H5T_NATIVE_DOUBLE_g         = FAIL;
-#if H5_SIZEOF_LONG_DOUBLE !=0
-            H5T_NATIVE_LDOUBLE_g        = FAIL;
+        /* Clear conversion tables */
+        H5T_g.path   = (H5T_path_t **)H5MM_xfree(H5T_g.path);
+        H5T_g.npaths = 0;
+        H5T_g.apaths = 0;
+        H5T_g.soft   = (H5T_soft_t *)H5MM_xfree(H5T_g.soft);
+        H5T_g.nsoft  = 0;
+        H5T_g.asoft  = 0;
+
+        /* Unlock all datatypes, then free them */
+        /* note that we are ignoring the return value from H5I_iterate() */
+        H5I_iterate(H5I_DATATYPE, H5T_unlock_cb, NULL, FALSE);
+
+        /* Close deprecated interface */
+        n += H5T__term_deprec_interface();
+
+        /* Destroy the datatype object id group */
+        (void)H5I_dec_type_ref(H5I_DATATYPE);
+        n++; /*H5I*/
+
+        /* Reset all the datatype IDs */
+        H5T_IEEE_F32BE_g = FAIL;
+        H5T_IEEE_F32LE_g = FAIL;
+        H5T_IEEE_F64BE_g = FAIL;
+        H5T_IEEE_F64LE_g = FAIL;
+
+        H5T_STD_I8BE_g        = FAIL;
+        H5T_STD_I8LE_g        = FAIL;
+        H5T_STD_I16BE_g       = FAIL;
+        H5T_STD_I16LE_g       = FAIL;
+        H5T_STD_I32BE_g       = FAIL;
+        H5T_STD_I32LE_g       = FAIL;
+        H5T_STD_I64BE_g       = FAIL;
+        H5T_STD_I64LE_g       = FAIL;
+        H5T_STD_U8BE_g        = FAIL;
+        H5T_STD_U8LE_g        = FAIL;
+        H5T_STD_U16BE_g       = FAIL;
+        H5T_STD_U16LE_g       = FAIL;
+        H5T_STD_U32BE_g       = FAIL;
+        H5T_STD_U32LE_g       = FAIL;
+        H5T_STD_U64BE_g       = FAIL;
+        H5T_STD_U64LE_g       = FAIL;
+        H5T_STD_B8BE_g        = FAIL;
+        H5T_STD_B8LE_g        = FAIL;
+        H5T_STD_B16BE_g       = FAIL;
+        H5T_STD_B16LE_g       = FAIL;
+        H5T_STD_B32BE_g       = FAIL;
+        H5T_STD_B32LE_g       = FAIL;
+        H5T_STD_B64BE_g       = FAIL;
+        H5T_STD_B64LE_g       = FAIL;
+        H5T_STD_REF_OBJ_g     = FAIL;
+        H5T_STD_REF_DSETREG_g = FAIL;
+
+        H5T_UNIX_D32BE_g = FAIL;
+        H5T_UNIX_D32LE_g = FAIL;
+        H5T_UNIX_D64BE_g = FAIL;
+        H5T_UNIX_D64LE_g = FAIL;
+
+        H5T_C_S1_g = FAIL;
+
+        H5T_FORTRAN_S1_g = FAIL;
+
+        H5T_NATIVE_SCHAR_g  = FAIL;
+        H5T_NATIVE_UCHAR_g  = FAIL;
+        H5T_NATIVE_SHORT_g  = FAIL;
+        H5T_NATIVE_USHORT_g = FAIL;
+        H5T_NATIVE_INT_g    = FAIL;
+        H5T_NATIVE_UINT_g   = FAIL;
+        H5T_NATIVE_LONG_g   = FAIL;
+        H5T_NATIVE_ULONG_g  = FAIL;
+        H5T_NATIVE_LLONG_g  = FAIL;
+        H5T_NATIVE_ULLONG_g = FAIL;
+        H5T_NATIVE_FLOAT_g  = FAIL;
+        H5T_NATIVE_DOUBLE_g = FAIL;
+#if H5_SIZEOF_LONG_DOUBLE != 0
+        H5T_NATIVE_LDOUBLE_g = FAIL;
 #endif
-            H5T_NATIVE_B8_g             = FAIL;
-            H5T_NATIVE_B16_g            = FAIL;
-            H5T_NATIVE_B32_g            = FAIL;
-            H5T_NATIVE_B64_g            = FAIL;
-            H5T_NATIVE_OPAQUE_g         = FAIL;
-            H5T_NATIVE_HADDR_g          = FAIL;
-            H5T_NATIVE_HSIZE_g          = FAIL;
-            H5T_NATIVE_HSSIZE_g         = FAIL;
-            H5T_NATIVE_HERR_g           = FAIL;
-            H5T_NATIVE_HBOOL_g          = FAIL;
-
-            H5T_NATIVE_INT8_g           = FAIL;
-            H5T_NATIVE_UINT8_g          = FAIL;
-            H5T_NATIVE_INT_LEAST8_g     = FAIL;
-            H5T_NATIVE_UINT_LEAST8_g    = FAIL;
-            H5T_NATIVE_INT_FAST8_g      = FAIL;
-            H5T_NATIVE_UINT_FAST8_g     = FAIL;
-
-            H5T_NATIVE_INT16_g          = FAIL;
-            H5T_NATIVE_UINT16_g         = FAIL;
-            H5T_NATIVE_INT_LEAST16_g    = FAIL;
-            H5T_NATIVE_UINT_LEAST16_g   = FAIL;
-            H5T_NATIVE_INT_FAST16_g     = FAIL;
-            H5T_NATIVE_UINT_FAST16_g    = FAIL;
-
-            H5T_NATIVE_INT32_g          = FAIL;
-            H5T_NATIVE_UINT32_g         = FAIL;
-            H5T_NATIVE_INT_LEAST32_g    = FAIL;
-            H5T_NATIVE_UINT_LEAST32_g   = FAIL;
-            H5T_NATIVE_INT_FAST32_g     = FAIL;
-            H5T_NATIVE_UINT_FAST32_g    = FAIL;
-
-            H5T_NATIVE_INT64_g          = FAIL;
-            H5T_NATIVE_UINT64_g         = FAIL;
-            H5T_NATIVE_INT_LEAST64_g    = FAIL;
-            H5T_NATIVE_UINT_LEAST64_g   = FAIL;
-            H5T_NATIVE_INT_FAST64_g     = FAIL;
-            H5T_NATIVE_UINT_FAST64_g    = FAIL;
+        H5T_NATIVE_B8_g     = FAIL;
+        H5T_NATIVE_B16_g    = FAIL;
+        H5T_NATIVE_B32_g    = FAIL;
+        H5T_NATIVE_B64_g    = FAIL;
+        H5T_NATIVE_OPAQUE_g = FAIL;
+        H5T_NATIVE_HADDR_g  = FAIL;
+        H5T_NATIVE_HSIZE_g  = FAIL;
+        H5T_NATIVE_HSSIZE_g = FAIL;
+        H5T_NATIVE_HERR_g   = FAIL;
+        H5T_NATIVE_HBOOL_g  = FAIL;
+
+        H5T_NATIVE_INT8_g        = FAIL;
+        H5T_NATIVE_UINT8_g       = FAIL;
+        H5T_NATIVE_INT_LEAST8_g  = FAIL;
+        H5T_NATIVE_UINT_LEAST8_g = FAIL;
+        H5T_NATIVE_INT_FAST8_g   = FAIL;
+        H5T_NATIVE_UINT_FAST8_g  = FAIL;
+
+        H5T_NATIVE_INT16_g        = FAIL;
+        H5T_NATIVE_UINT16_g       = FAIL;
+        H5T_NATIVE_INT_LEAST16_g  = FAIL;
+        H5T_NATIVE_UINT_LEAST16_g = FAIL;
+        H5T_NATIVE_INT_FAST16_g   = FAIL;
+        H5T_NATIVE_UINT_FAST16_g  = FAIL;
+
+        H5T_NATIVE_INT32_g        = FAIL;
+        H5T_NATIVE_UINT32_g       = FAIL;
+        H5T_NATIVE_INT_LEAST32_g  = FAIL;
+        H5T_NATIVE_UINT_LEAST32_g = FAIL;
+        H5T_NATIVE_INT_FAST32_g   = FAIL;
+        H5T_NATIVE_UINT_FAST32_g  = FAIL;
+
+        H5T_NATIVE_INT64_g        = FAIL;
+        H5T_NATIVE_UINT64_g       = FAIL;
+        H5T_NATIVE_INT_LEAST64_g  = FAIL;
+        H5T_NATIVE_UINT_LEAST64_g = FAIL;
+        H5T_NATIVE_INT_FAST64_g   = FAIL;
+        H5T_NATIVE_UINT_FAST64_g  = FAIL;
 
         /* Mark interface as closed */
         H5_interface_initialize_g = 0;
@@ -1552,7 +1739,6 @@ H5T_term_interface(void)
     FUNC_LEAVE_NOAPI(n)
 } /* end H5T_term_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5Tcreate
  *
@@ -1575,29 +1761,28 @@ H5T_term_interface(void)
 hid_t
 H5Tcreate(H5T_class_t type, size_t size)
 {
-    H5T_t    *dt = NULL;     /* New datatype constructed */
-    hid_t    ret_value;      /* Return value */
+    H5T_t *dt = NULL; /* New datatype constructed */
+    hid_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "Ttz", type, size);
 
     /* check args. We support string (fixed-size or variable-length) now. */
-    if(size <= 0 && size != H5T_VARIABLE)
-    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "size must be positive")
+    if (size <= 0 && size != H5T_VARIABLE)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "size must be positive")
 
     /* create the type */
-    if(NULL == (dt = H5T__create(type, size)))
-    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to create type")
+    if (NULL == (dt = H5T__create(type, size)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to create type")
 
     /* Get an ID for the datatype */
-    if((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
-    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype ID")
+    if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype ID")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcreate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tcopy
  *
@@ -1625,31 +1810,29 @@ done:
 hid_t
 H5Tcopy(hid_t type_id)
 {
-    H5T_t    *dt;                    /* Pointer to the datatype to copy */
-    H5T_t    *new_dt = NULL;
-    hid_t    ret_value;              /* Return value */
+    H5T_t *dt; /* Pointer to the datatype to copy */
+    H5T_t *new_dt = NULL;
+    hid_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", type_id);
 
-    switch(H5I_get_type(type_id)) {
+    switch (H5I_get_type(type_id)) {
         case H5I_DATATYPE:
             /* The argument is a datatype handle */
-            if(NULL == (dt = (H5T_t *)H5I_object(type_id)))
+            if (NULL == (dt = (H5T_t *)H5I_object(type_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
             break;
 
-        case H5I_DATASET:
-            {
-                H5D_t    *dset;          /* Dataset for datatype */
+        case H5I_DATASET: {
+            H5D_t *dset; /* Dataset for datatype */
 
-                /* The argument is a dataset handle */
-                if(NULL == (dset = (H5D_t *)H5I_object(type_id)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
-                if(NULL == (dt = H5D_typeof(dset)))
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get the dataset datatype")
-            }
-            break;
+            /* The argument is a dataset handle */
+            if (NULL == (dset = (H5D_t *)H5I_object(type_id)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+            if (NULL == (dt = H5D_typeof(dset)))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get the dataset datatype")
+        } break;
 
         case H5I_UNINIT:
         case H5I_BADID:
@@ -1670,22 +1853,21 @@ H5Tcopy(hid_t type_id)
     } /* end switch */
 
     /* Copy datatype */
-    if(NULL == (new_dt = H5T_copy(dt, H5T_COPY_TRANSIENT)))
+    if (NULL == (new_dt = H5T_copy(dt, H5T_COPY_TRANSIENT)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy");
 
     /* Atomize result */
-    if((ret_value = H5I_register(H5I_DATATYPE, new_dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, new_dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom")
 
 done:
-    if(ret_value < 0)
-        if(new_dt && H5T_close(new_dt) < 0)
+    if (ret_value < 0)
+        if (new_dt && H5T_close(new_dt) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release datatype info")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcopy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tclose
  *
@@ -1700,27 +1882,26 @@ done:
 herr_t
 H5Tclose(hid_t type_id)
 {
-    H5T_t    *dt;                    /* Pointer to datatype to close */
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5T_t *dt;                  /* Pointer to datatype to close */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_STATE_IMMUTABLE == dt->shared->state)
+    if (H5T_STATE_IMMUTABLE == dt->shared->state)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "immutable datatype")
 
     /* When the reference count reaches zero the resources are freed */
-    if(H5I_dec_app_ref(type_id) < 0)
+    if (H5I_dec_app_ref(type_id) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "problem freeing id")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tequal
  *
@@ -1738,17 +1919,17 @@ done:
 htri_t
 H5Tequal(hid_t type1_id, hid_t type2_id)
 {
-    const H5T_t    *dt1;           /* Pointer to first datatype */
-    const H5T_t    *dt2;           /* Pointer to second datatype */
-    htri_t         ret_value;      /* Return value */
+    const H5T_t *dt1;       /* Pointer to first datatype */
+    const H5T_t *dt2;       /* Pointer to second datatype */
+    htri_t       ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("t", "ii", type1_id, type2_id);
 
     /* check args */
-    if(NULL == (dt1 = (H5T_t *)H5I_object_verify(type1_id, H5I_DATATYPE)))
+    if (NULL == (dt1 = (H5T_t *)H5I_object_verify(type1_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(NULL == (dt2 = (H5T_t *)H5I_object_verify(type2_id, H5I_DATATYPE)))
+    if (NULL == (dt2 = (H5T_t *)H5I_object_verify(type2_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     ret_value = (0 == H5T_cmp(dt1, dt2, FALSE)) ? TRUE : FALSE;
@@ -1757,7 +1938,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tequal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tlock
  *
@@ -1785,26 +1965,25 @@ done:
 herr_t
 H5Tlock(hid_t type_id)
 {
-    H5T_t       *dt;                    /* Datatype to operate on */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype to operate on */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_STATE_NAMED==dt->shared->state || H5T_STATE_OPEN==dt->shared->state)
+    if (H5T_STATE_NAMED == dt->shared->state || H5T_STATE_OPEN == dt->shared->state)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to lock named datatype")
 
-    if(H5T_lock(dt, TRUE) < 0)
+    if (H5T_lock(dt, TRUE) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to lock transient datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tlock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tget_class
  *
@@ -1822,14 +2001,14 @@ done:
 H5T_class_t
 H5Tget_class(hid_t type_id)
 {
-    H5T_t       *dt;            /* Pointer to datatype */
-    H5T_class_t ret_value;      /* Return value */
+    H5T_t *     dt;        /* Pointer to datatype */
+    H5T_class_t ret_value; /* Return value */
 
     FUNC_ENTER_API(H5T_NO_CLASS)
     H5TRACE1("Tt", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NO_CLASS, "not a datatype")
 
     /* Set return value */
@@ -1839,7 +2018,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_get_class
  *
@@ -1860,28 +2038,27 @@ done:
 H5T_class_t
 H5T_get_class(const H5T_t *dt, htri_t internal)
 {
-    H5T_class_t ret_value = H5T_NO_CLASS;       /* Return value */
+    H5T_class_t ret_value = H5T_NO_CLASS; /* Return value */
 
     FUNC_ENTER_NOAPI(H5T_NO_CLASS)
 
     HDassert(dt);
 
     /* Externally, a VL string is a string; internally, a VL string is a VL. */
-    if(internal) {
-        ret_value=dt->shared->type;
+    if (internal) {
+        ret_value = dt->shared->type;
     }
     else {
-        if(H5T_IS_VL_STRING(dt->shared))
-            ret_value=H5T_STRING;
+        if (H5T_IS_VL_STRING(dt->shared))
+            ret_value = H5T_STRING;
         else
-            ret_value=dt->shared->type;
+            ret_value = dt->shared->type;
     }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_get_class() */
+} /* end H5T_get_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5Tdetect_class
  *
@@ -1897,27 +2074,26 @@ done:
 htri_t
 H5Tdetect_class(hid_t type, H5T_class_t cls)
 {
-    H5T_t       *dt;            /* Datatype to query */
-    htri_t      ret_value;      /* Return value */
+    H5T_t *dt;        /* Datatype to query */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("t", "iTt", type, cls);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type,H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NO_CLASS, "not a datatype")
-    if(!(cls > H5T_NO_CLASS && cls < H5T_NCLASSES))
+    if (!(cls > H5T_NO_CLASS && cls < H5T_NCLASSES))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NO_CLASS, "not a datatype class")
 
     /* Set return value */
-    if((ret_value = H5T_detect_class(dt, cls, TRUE)) < 0)
+    if ((ret_value = H5T_detect_class(dt, cls, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5T_NO_CLASS, "can't get datatype class")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tdetect_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5T_detect_class
  *
@@ -1943,8 +2119,8 @@ done:
 htri_t
 H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api)
 {
-    unsigned    i;
-    htri_t      ret_value = FALSE;        /* Return value */
+    unsigned i;
+    htri_t   ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1956,26 +2132,27 @@ H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api)
      *  string belongs to the H5T_VLEN class, which would otherwise return
      *  true. -QAK)
      */
-    if(from_api && H5T_IS_VL_STRING(dt->shared))
+    if (from_api && H5T_IS_VL_STRING(dt->shared))
         HGOTO_DONE(H5T_STRING == cls);
 
     /* Check if this type is the correct type */
-    if(dt->shared->type == cls)
+    if (dt->shared->type == cls)
         HGOTO_DONE(TRUE);
 
     /* check for types that might have the correct type as a component */
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_COMPOUND:
-            for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-                htri_t nested_ret;      /* Return value from nested call */
+            for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+                htri_t nested_ret; /* Return value from nested call */
 
                 /* Check if this field's type is the correct type */
-                if(dt->shared->u.compnd.memb[i].type->shared->type == cls)
+                if (dt->shared->u.compnd.memb[i].type->shared->type == cls)
                     HGOTO_DONE(TRUE);
 
                 /* Recurse if it's VL, compound, enum or array */
-                if(H5T_IS_COMPLEX(dt->shared->u.compnd.memb[i].type->shared->type))
-                    if((nested_ret = H5T_detect_class(dt->shared->u.compnd.memb[i].type, cls, from_api)) != FALSE)
+                if (H5T_IS_COMPLEX(dt->shared->u.compnd.memb[i].type->shared->type))
+                    if ((nested_ret = H5T_detect_class(dt->shared->u.compnd.memb[i].type, cls, from_api)) !=
+                        FALSE)
                         HGOTO_DONE(nested_ret);
             } /* end for */
             break;
@@ -2002,7 +2179,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_detect_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tis_variable_str
  *
@@ -2018,25 +2194,24 @@ done:
 htri_t
 H5Tis_variable_str(hid_t dtype_id)
 {
-    H5T_t       *dt;            /* Datatype to query */
-    htri_t      ret_value;      /* Return value */
+    H5T_t *dt;        /* Datatype to query */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", dtype_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Set return value */
-    if((ret_value = H5T_is_variable_str(dt)) < 0)
+    if ((ret_value = H5T_is_variable_str(dt)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "can't determine if datatype is VL-string")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tis_variable_str() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_is_variable_str
  *
@@ -2057,7 +2232,6 @@ H5T_is_variable_str(const H5T_t *dt)
     FUNC_LEAVE_NOAPI(H5T_IS_VL_STRING(dt->shared))
 } /* end H5T_is_variable_str() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tget_size
  *
@@ -2077,14 +2251,14 @@ H5T_is_variable_str(const H5T_t *dt)
 size_t
 H5Tget_size(hid_t type_id)
 {
-    H5T_t     *dt;            /* Datatype to query */
-    size_t    ret_value;      /* Return value */
+    H5T_t *dt;        /* Datatype to query */
+    size_t ret_value; /* Return value */
 
     FUNC_ENTER_API(0)
     H5TRACE1("z", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype")
 
     /* size */
@@ -2094,7 +2268,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tset_size
  *
@@ -2122,35 +2295,34 @@ done:
 herr_t
 H5Tset_size(hid_t type_id, size_t size)
 {
-    H5T_t       *dt;                    /* Datatype to modify */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype to modify */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", type_id, size);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_STATE_TRANSIENT!=dt->shared->state)
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "datatype is read-only")
-    if(size <= 0 && size != H5T_VARIABLE)
+    if (size <= 0 && size != H5T_VARIABLE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "size must be positive")
-    if(size == H5T_VARIABLE && !H5T_IS_STRING(dt->shared))
+    if (size == H5T_VARIABLE && !H5T_IS_STRING(dt->shared))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "only strings may be variable length")
-    if(H5T_ENUM == dt->shared->type && dt->shared->u.enumer.nmembs > 0)
+    if (H5T_ENUM == dt->shared->type && dt->shared->u.enumer.nmembs > 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
-    if(H5T_REFERENCE == dt->shared->type)
+    if (H5T_REFERENCE == dt->shared->type)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not defined for this datatype")
 
     /* Modify the datatype */
-    if(H5T_set_size(dt, size) < 0)
+    if (H5T_set_size(dt, size) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set size for datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tset_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tget_super
  *
@@ -2168,29 +2340,28 @@ done:
 hid_t
 H5Tget_super(hid_t type)
 {
-    H5T_t    *dt;            /* Datatype to query */
-    H5T_t    *super = NULL;  /* Supertype */
-    hid_t    ret_value;      /* Return value */
+    H5T_t *dt;           /* Datatype to query */
+    H5T_t *super = NULL; /* Supertype */
+    hid_t  ret_value;    /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", type);
 
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type,H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(NULL == (super = H5T_get_super(dt)))
+    if (NULL == (super = H5T_get_super(dt)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "not a datatype")
-    if((ret_value = H5I_register(H5I_DATATYPE, super, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, super, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register parent datatype")
 
 done:
-    if(ret_value < 0)
-        if(super && H5T_close(super) < 0)
+    if (ret_value < 0)
+        if (super && H5T_close(super) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release super datatype info")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_super() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_get_super
  *
@@ -2209,7 +2380,7 @@ done:
 H5T_t *
 H5T_get_super(const H5T_t *dt)
 {
-    H5T_t    *ret_value=NULL;
+    H5T_t *ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -2217,14 +2388,13 @@ H5T_get_super(const H5T_t *dt)
 
     if (!dt->shared->parent)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "not a derived data type");
-    if (NULL==(ret_value=H5T_copy(dt->shared->parent, H5T_COPY_ALL)))
+    if (NULL == (ret_value = H5T_copy(dt->shared->parent, H5T_COPY_ALL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy parent data type");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_register
  *
@@ -2244,16 +2414,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
-        H5T_conv_t func, hid_t dxpl_id, hbool_t api_call)
+H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_conv_t func, hid_t dxpl_id,
+             hbool_t api_call)
 {
-    hid_t         tmp_sid = -1, tmp_did = -1; /*temporary data type IDs    */
-    H5T_path_t    *old_path = NULL;           /*existing conversion path   */
-    H5T_path_t    *new_path = NULL;           /*new conversion path        */
-    H5T_cdata_t   cdata;                      /*temporary conversion data  */
-    int           nprint=0;                   /*number of paths shut down  */
-    int           i;                          /*counter                    */
-    herr_t        ret_value = SUCCEED;        /*return value               */
+    hid_t       tmp_sid = -1, tmp_did = -1; /*temporary data type IDs    */
+    H5T_path_t *old_path = NULL;            /*existing conversion path   */
+    H5T_path_t *new_path = NULL;            /*new conversion path        */
+    H5T_cdata_t cdata;                      /*temporary conversion data  */
+    int         nprint = 0;                 /*number of paths shut down  */
+    int         i;                          /*counter                    */
+    herr_t      ret_value = SUCCEED;        /*return value               */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -2261,14 +2431,14 @@ H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
     HDassert(src);
     HDassert(dst);
     HDassert(func);
-    HDassert(H5T_PERS_HARD==pers || H5T_PERS_SOFT==pers);
+    HDassert(H5T_PERS_HARD == pers || H5T_PERS_SOFT == pers);
     HDassert(name && *name);
 
-    if(H5T_PERS_HARD == pers) {
+    if (H5T_PERS_HARD == pers) {
         /* Only bother to register the path if it's not a no-op path (for this machine) */
-        if(H5T_cmp(src, dst, FALSE)) {
+        if (H5T_cmp(src, dst, FALSE)) {
             /* Locate or create a new conversion path */
-            if(NULL == (new_path = H5T_path_find(src, dst, name, func, dxpl_id, api_call)))
+            if (NULL == (new_path = H5T_path_find(src, dst, name, func, dxpl_id, api_call)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to locate/allocate conversion path")
 
             /*
@@ -2278,27 +2448,27 @@ H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
              * functions for the members, so adding a new function should cause
              * the list to be recalculated to use the new function.
              */
-            for(i = 0; i < H5T_g.npaths; i++)
-                if(new_path != H5T_g.path[i])
+            for (i = 0; i < H5T_g.npaths; i++)
+                if (new_path != H5T_g.path[i])
                     H5T_g.path[i]->cdata.recalc = TRUE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else {
         /* Add function to end of soft list */
-        if((size_t)H5T_g.nsoft >= H5T_g.asoft) {
-            size_t na = MAX(32, 2 * H5T_g.asoft);
+        if ((size_t)H5T_g.nsoft >= H5T_g.asoft) {
+            size_t      na = MAX(32, 2 * H5T_g.asoft);
             H5T_soft_t *x;
 
-            if(NULL == (x = (H5T_soft_t *)H5MM_realloc(H5T_g.soft, na * sizeof(H5T_soft_t))))
+            if (NULL == (x = (H5T_soft_t *)H5MM_realloc(H5T_g.soft, na * sizeof(H5T_soft_t))))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
             H5T_g.asoft = na;
-            H5T_g.soft = x;
+            H5T_g.soft  = x;
         } /* end if */
         HDstrncpy(H5T_g.soft[H5T_g.nsoft].name, name, (size_t)H5T_NAMELEN);
         H5T_g.soft[H5T_g.nsoft].name[H5T_NAMELEN - 1] = '\0';
-        H5T_g.soft[H5T_g.nsoft].src = src->shared->type;
-        H5T_g.soft[H5T_g.nsoft].dst = dst->shared->type;
-        H5T_g.soft[H5T_g.nsoft].func = func;
+        H5T_g.soft[H5T_g.nsoft].src                   = src->shared->type;
+        H5T_g.soft[H5T_g.nsoft].dst                   = dst->shared->type;
+        H5T_g.soft[H5T_g.nsoft].func                  = func;
         H5T_g.nsoft++;
 
         /*
@@ -2306,23 +2476,22 @@ H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
          * conversion function applies should be replaced by a new path that
          * uses this function.
          */
-        for (i=1; i<H5T_g.npaths; i++) {
+        for (i = 1; i < H5T_g.npaths; i++) {
             old_path = H5T_g.path[i];
             HDassert(old_path);
 
             /* Does the new soft conversion function apply to this path? */
-            if (old_path->is_hard ||
-                    old_path->src->shared->type!=src->shared->type ||
-                    old_path->dst->shared->type!=dst->shared->type) {
+            if (old_path->is_hard || old_path->src->shared->type != src->shared->type ||
+                old_path->dst->shared->type != dst->shared->type) {
                 continue;
             }
-            if((tmp_sid = H5I_register(H5I_DATATYPE, H5T_copy(old_path->src, H5T_COPY_ALL), FALSE)) < 0 ||
-                    (tmp_did = H5I_register(H5I_DATATYPE, H5T_copy(old_path->dst, H5T_COPY_ALL), FALSE)) < 0)
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data types for conv query")
+            if ((tmp_sid = H5I_register(H5I_DATATYPE, H5T_copy(old_path->src, H5T_COPY_ALL), FALSE)) < 0 ||
+                (tmp_did = H5I_register(H5I_DATATYPE, H5T_copy(old_path->dst, H5T_COPY_ALL), FALSE)) < 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL,
+                            "unable to register data types for conv query")
             HDmemset(&cdata, 0, sizeof cdata);
             cdata.command = H5T_CONV_INIT;
-            if((func)(tmp_sid, tmp_did, &cdata, (size_t)0, (size_t)0, (size_t)0,
-                    NULL, NULL, dxpl_id) < 0) {
+            if ((func)(tmp_sid, tmp_did, &cdata, (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
                 H5I_dec_ref(tmp_sid);
                 H5I_dec_ref(tmp_did);
                 tmp_sid = tmp_did = -1;
@@ -2331,32 +2500,33 @@ H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
             } /* end if */
 
             /* Create a new conversion path */
-            if(NULL == (new_path = H5FL_CALLOC(H5T_path_t)))
+            if (NULL == (new_path = H5FL_CALLOC(H5T_path_t)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
             HDstrncpy(new_path->name, name, (size_t)H5T_NAMELEN);
             new_path->name[H5T_NAMELEN - 1] = '\0';
-            if(NULL == (new_path->src = H5T_copy(old_path->src, H5T_COPY_ALL)) ||
-                    NULL == (new_path->dst=H5T_copy(old_path->dst, H5T_COPY_ALL)))
+            if (NULL == (new_path->src = H5T_copy(old_path->src, H5T_COPY_ALL)) ||
+                NULL == (new_path->dst = H5T_copy(old_path->dst, H5T_COPY_ALL)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy data types")
-            new_path->func = func;
+            new_path->func    = func;
             new_path->is_hard = FALSE;
-            new_path->cdata = cdata;
+            new_path->cdata   = cdata;
 
             /* Replace previous path */
             H5T_g.path[i] = new_path;
-            new_path = NULL; /*so we don't free it on error*/
+            new_path      = NULL; /*so we don't free it on error*/
 
             /* Free old path */
             H5T__print_stats(old_path, &nprint);
             old_path->cdata.command = H5T_CONV_FREE;
-            if ((old_path->func)(tmp_sid, tmp_did, &(old_path->cdata),
-                    (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id)<0) {
+            if ((old_path->func)(tmp_sid, tmp_did, &(old_path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL,
+                                 NULL, dxpl_id) < 0) {
 #ifdef H5T_DEBUG
-        if (H5DEBUG(T)) {
-            HDfprintf (H5DEBUG(T), "H5T: conversion function 0x%08lx "
-                "failed to free private data for %s (ignored)\n",
-                (unsigned long)(old_path->func), old_path->name);
-        }
+                if (H5DEBUG(T)) {
+                    HDfprintf(H5DEBUG(T),
+                              "H5T: conversion function 0x%08lx "
+                              "failed to free private data for %s (ignored)\n",
+                              (unsigned long)(old_path->func), old_path->name);
+                }
 #endif
             } /* end if */
             H5T_close(old_path->src);
@@ -2371,27 +2541,26 @@ H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
             /* We don't care about any failures during the freeing process */
             H5E_clear_stack(NULL);
         } /* end for */
-    } /* end else */
+    }     /* end else */
 
 done:
-    if(ret_value < 0) {
-        if(new_path) {
-            if(new_path->src)
-                    H5T_close(new_path->src);
-            if(new_path->dst)
-                    H5T_close(new_path->dst);
-                new_path = H5FL_FREE(H5T_path_t, new_path);
+    if (ret_value < 0) {
+        if (new_path) {
+            if (new_path->src)
+                H5T_close(new_path->src);
+            if (new_path->dst)
+                H5T_close(new_path->dst);
+            new_path = H5FL_FREE(H5T_path_t, new_path);
         } /* end if */
-        if(tmp_sid >= 0)
-                H5I_dec_ref(tmp_sid);
-        if(tmp_did >= 0)
-                H5I_dec_ref(tmp_did);
+        if (tmp_sid >= 0)
+            H5I_dec_ref(tmp_sid);
+        if (tmp_did >= 0)
+            H5I_dec_ref(tmp_did);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_register() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tregister
  *
@@ -2412,37 +2581,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
-        H5T_conv_t func)
+H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func)
 {
-    H5T_t     *src;                  /*source data type descriptor    */
-    H5T_t     *dst;                  /*destination data type desc     */
-    herr_t    ret_value = SUCCEED;   /*return value                   */
+    H5T_t *src;                 /*source data type descriptor    */
+    H5T_t *dst;                 /*destination data type desc     */
+    herr_t ret_value = SUCCEED; /*return value                   */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "Te*siix", pers, name, src_id, dst_id, func);
 
     /* Check args */
-    if(H5T_PERS_HARD != pers && H5T_PERS_SOFT != pers)
+    if (H5T_PERS_HARD != pers && H5T_PERS_SOFT != pers)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid function persistence")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "conversion must have a name for debugging")
-    if(NULL == (src = (H5T_t *)H5I_object_verify(src_id,H5I_DATATYPE)))
+    if (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if(NULL == (dst = (H5T_t *)H5I_object_verify(dst_id,H5I_DATATYPE)))
+    if (NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if(!func)
+    if (!func)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no conversion function specified")
 
     /* Go register the function */
-    if(H5T_register(pers, name, src, dst, func, H5AC_ind_dxpl_id, TRUE) < 0)
+    if (H5T_register(pers, name, src, dst, func, H5AC_ind_dxpl_id, TRUE) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register conversion function")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5T_unregister
  *
@@ -2463,47 +2630,44 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
-        H5T_conv_t func, hid_t dxpl_id)
+H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_conv_t func, hid_t dxpl_id)
 {
-    H5T_path_t    *path = NULL;     /*conversion path             */
-    H5T_soft_t    *soft = NULL;     /*soft conversion information */
-    int           nprint = 0;       /*number of paths shut down   */
-    int           i;                /*counter                     */
+    H5T_path_t *path   = NULL; /*conversion path             */
+    H5T_soft_t *soft   = NULL; /*soft conversion information */
+    int         nprint = 0;    /*number of paths shut down   */
+    int         i;             /*counter                     */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Remove matching entries from the soft list */
-    if(H5T_PERS_DONTCARE == pers || H5T_PERS_SOFT == pers) {
-        for(i = H5T_g.nsoft - 1; i >= 0; --i) {
+    if (H5T_PERS_DONTCARE == pers || H5T_PERS_SOFT == pers) {
+        for (i = H5T_g.nsoft - 1; i >= 0; --i) {
             soft = H5T_g.soft + i;
             HDassert(soft);
-            if(name && *name && HDstrcmp(name, soft->name))
+            if (name && *name && HDstrcmp(name, soft->name))
                 continue;
-            if(src && src->shared->type != soft->src)
+            if (src && src->shared->type != soft->src)
                 continue;
-            if(dst && dst->shared->type != soft->dst)
+            if (dst && dst->shared->type != soft->dst)
                 continue;
-            if(func && func != soft->func)
+            if (func && func != soft->func)
                 continue;
 
-            HDmemmove(H5T_g.soft + i, H5T_g.soft + i + 1, (size_t)(H5T_g.nsoft - (i + 1)) * sizeof(H5T_soft_t));
+            HDmemmove(H5T_g.soft + i, H5T_g.soft + i + 1,
+                      (size_t)(H5T_g.nsoft - (i + 1)) * sizeof(H5T_soft_t));
             --H5T_g.nsoft;
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Remove matching conversion paths, except no-op path */
-    for(i = H5T_g.npaths - 1; i > 0; --i) {
+    for (i = H5T_g.npaths - 1; i > 0; --i) {
         path = H5T_g.path[i];
         HDassert(path);
 
         /* Not a match */
-        if(((H5T_PERS_SOFT == pers && path->is_hard) ||
-                    (H5T_PERS_HARD == pers && !path->is_hard)) ||
-                (name && *name && HDstrcmp(name, path->name)) ||
-                (src && H5T_cmp(src, path->src, FALSE)) ||
-                (dst && H5T_cmp(dst, path->dst, FALSE)) ||
-                (func && func!=path->func)) {
+        if (((H5T_PERS_SOFT == pers && path->is_hard) || (H5T_PERS_HARD == pers && !path->is_hard)) ||
+            (name && *name && HDstrcmp(name, path->name)) || (src && H5T_cmp(src, path->src, FALSE)) ||
+            (dst && H5T_cmp(dst, path->dst, FALSE)) || (func && func != path->func)) {
             /*
              * Notify all other functions to recalculate private data since some
              * functions might cache a list of conversion functions.  For
@@ -2515,19 +2679,21 @@ H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
         } /* end if */
         else {
             /* Remove from table */
-            HDmemmove(H5T_g.path + i, H5T_g.path + i + 1, (size_t)(H5T_g.npaths - (i + 1)) * sizeof(H5T_path_t*));
+            HDmemmove(H5T_g.path + i, H5T_g.path + i + 1,
+                      (size_t)(H5T_g.npaths - (i + 1)) * sizeof(H5T_path_t *));
             --H5T_g.npaths;
 
             /* Shut down path */
             H5T__print_stats(path, &nprint);
             path->cdata.command = H5T_CONV_FREE;
-            if((path->func)((hid_t)FAIL, (hid_t)FAIL, &(path->cdata),
-                    (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
+            if ((path->func)((hid_t)FAIL, (hid_t)FAIL, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL,
+                             NULL, dxpl_id) < 0) {
 #ifdef H5T_DEBUG
-                if(H5DEBUG(T)) {
-                    HDfprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx failed "
-                            "to free private data for %s (ignored)\n",
-                            (unsigned long)(path->func), path->name);
+                if (H5DEBUG(T)) {
+                    HDfprintf(H5DEBUG(T),
+                              "H5T: conversion function 0x%08lx failed "
+                              "to free private data for %s (ignored)\n",
+                              (unsigned long)(path->func), path->name);
                 }
 #endif
             }
@@ -2535,13 +2701,12 @@ H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
             H5T_close(path->dst);
             path = H5FL_FREE(H5T_path_t, path);
             H5E_clear_stack(NULL); /*ignore all shutdown errors*/
-        } /* end else */
-    } /* end for */
+        }                          /* end else */
+    }                              /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5T_unregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tunregister
  *
@@ -2559,29 +2724,27 @@ H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
-        H5T_conv_t func)
+H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func)
 {
-    H5T_t       *src = NULL, *dst = NULL;    /* Datatype descriptors */
-    herr_t      ret_value = SUCCEED;         /* Return value */
+    H5T_t *src = NULL, *dst = NULL; /* Datatype descriptors */
+    herr_t ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "Te*siix", pers, name, src_id, dst_id, func);
 
     /* Check arguments */
-    if(src_id > 0 && (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE))))
+    if (src_id > 0 && (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "src is not a data type")
-    if(dst_id > 0 && (NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE))))
+    if (dst_id > 0 && (NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "dst is not a data type")
 
-    if(H5T_unregister(pers, name, src, dst, func, H5AC_ind_dxpl_id) < 0)
+    if (H5T_unregister(pers, name, src, dst, func, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "internal unregister function failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tunregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tfind
  *
@@ -2603,25 +2766,25 @@ done:
 H5T_conv_t
 H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata)
 {
-    H5T_t         *src, *dst;
-    H5T_path_t    *path;
-    H5T_conv_t    ret_value;      /* Return value */
+    H5T_t *     src, *dst;
+    H5T_path_t *path;
+    H5T_conv_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(NULL)
     H5TRACE3("x", "ii**x", src_id, dst_id, pcdata);
 
     /* Check args */
-    if(NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) ||
-            NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE)))
+    if (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) ||
+        NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
-    if(!pcdata)
+    if (!pcdata)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "no address to receive cdata pointer")
 
     /* Find it */
-    if(NULL == (path = H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
+    if (NULL == (path = H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, NULL, "conversion function not found")
 
-    if(pcdata)
+    if (pcdata)
         *pcdata = &(path->cdata);
 
     /* Set return value */
@@ -2631,7 +2794,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tfind() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tcompiler_conv
  *
@@ -2652,26 +2814,25 @@ done:
 htri_t
 H5Tcompiler_conv(hid_t src_id, hid_t dst_id)
 {
-    H5T_t     *src, *dst;
-    htri_t    ret_value;      /* Return value */
+    H5T_t *src, *dst;
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("t", "ii", src_id, dst_id);
 
     /* Check args */
-    if(NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) ||
-            NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE)))
+    if (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) ||
+        NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
 
     /* Find it */
-    if((ret_value = H5T_compiler_conv(src, dst)) < 0)
+    if ((ret_value = H5T_compiler_conv(src, dst)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "conversion function not found")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcompiler_conv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tconvert
  *
@@ -2696,38 +2857,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf,
-        void *background, hid_t dxpl_id)
+H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background, hid_t dxpl_id)
 {
-    H5T_path_t    *tpath;                 /* type conversion info    */
-    H5T_t         *src, *dst;             /* unatomized types        */
-    herr_t        ret_value = SUCCEED;    /* Return value            */
+    H5T_path_t *tpath;               /* type conversion info    */
+    H5T_t *     src, *dst;           /* unatomized types        */
+    herr_t      ret_value = SUCCEED; /* Return value            */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iiz*x*xi", src_id, dst_id, nelmts, buf, background, dxpl_id);
 
     /* Check args */
-    if(NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) ||
-            NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE)))
+    if (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) ||
+        NULL == (dst = (H5T_t *)H5I_object_verify(dst_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if(H5P_DEFAULT == dxpl_id)
+    if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset transfer property list")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset transfer property list")
 
     /* Find the conversion function */
-    if(NULL == (tpath = H5T_path_find(src, dst, NULL, NULL, dxpl_id, FALSE)))
+    if (NULL == (tpath = H5T_path_find(src, dst, NULL, NULL, dxpl_id, FALSE)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert between src and dst data types")
 
-    if(H5T_convert(tpath, src_id, dst_id, nelmts, (size_t)0, (size_t)0, buf, background, dxpl_id) < 0)
+    if (H5T_convert(tpath, src_id, dst_id, nelmts, (size_t)0, (size_t)0, buf, background, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tconvert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tencode
  *
@@ -2746,27 +2904,26 @@ done:
 herr_t
 H5Tencode(hid_t obj_id, void *buf, size_t *nalloc)
 {
-    H5T_t       *dtype;
-    herr_t      ret_value = SUCCEED;
+    H5T_t *dtype;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*x*z", obj_id, buf, nalloc);
 
     /* Check argument and retrieve object */
-    if(NULL == (dtype = (H5T_t *)H5I_object_verify(obj_id, H5I_DATATYPE)))
+    if (NULL == (dtype = (H5T_t *)H5I_object_verify(obj_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(nalloc == NULL)
+    if (nalloc == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL pointer for buffer size")
 
     /* Go encode the datatype */
-    if(H5T_encode(dtype, (unsigned char *)buf, nalloc) < 0)
+    if (H5T_encode(dtype, (unsigned char *)buf, nalloc) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tencode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5Tdecode
  *
@@ -2789,14 +2946,14 @@ done:
 hid_t
 H5Tdecode(const void *buf)
 {
-    H5T_t       *dt;
-    hid_t       ret_value;      /* Return value */
+    H5T_t *dt;
+    hid_t  ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "*x", buf);
 
     /* Check args */
-    if(buf == NULL)
+    if (buf == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "empty buffer")
 
     /* Create datatype by decoding buffer
@@ -2805,11 +2962,11 @@ H5Tdecode(const void *buf)
      * Really fixing this will require an H5Tdecode2() call that
      * takes a size parameter.
      */
-    if(NULL == (dt = H5T_decode(SIZE_MAX, (const unsigned char *)buf)))
+    if (NULL == (dt = H5T_decode(SIZE_MAX, (const unsigned char *)buf)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "can't decode object")
 
     /* Register the type and return the ID */
-    if((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type")
 
 done:
@@ -2821,7 +2978,6 @@ done:
  *-------------------------------------------------------------------------
  */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_encode
  *
@@ -2840,22 +2996,22 @@ done:
 herr_t
 H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc)
 {
-    size_t      buf_size;               /* Encoded size of datatype */
-    H5F_t       *f = NULL;              /* Fake file structure*/
-    herr_t      ret_value = SUCCEED;
+    size_t buf_size;         /* Encoded size of datatype */
+    H5F_t *f         = NULL; /* Fake file structure*/
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate "fake" file structure */
-    if(NULL == (f = H5F_fake_alloc((uint8_t)0)))
+    if (NULL == (f = H5F_fake_alloc((uint8_t)0)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "can't allocate fake file struct")
 
     /* Find out the size of buffer needed */
-    if((buf_size = H5O_msg_raw_size(f, H5O_DTYPE_ID, TRUE, obj)) == 0)
+    if ((buf_size = H5O_msg_raw_size(f, H5O_DTYPE_ID, TRUE, obj)) == 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADSIZE, FAIL, "can't find datatype size")
 
     /* Don't encode if buffer size isn't big enough or buffer is empty */
-    if(!buf || *nalloc < (buf_size + 1 + 1))
+    if (!buf || *nalloc < (buf_size + 1 + 1))
         *nalloc = buf_size + 1 + 1;
     else {
         /* Encode the type of the information */
@@ -2865,19 +3021,18 @@ H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc)
         *buf++ = H5T_ENCODE_VERSION;
 
         /* Encode into user's buffer */
-        if(H5O_msg_encode(f, H5O_DTYPE_ID, TRUE, buf, obj) < 0)
+        if (H5O_msg_encode(f, H5O_DTYPE_ID, TRUE, buf, obj) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode object")
     } /* end else */
 
 done:
     /* Release fake file structure */
-    if(f && H5F_fake_free(f) < 0)
+    if (f && H5F_fake_free(f) < 0)
         HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release fake file struct")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_decode
  *
@@ -2896,40 +3051,39 @@ done:
 H5T_t *
 H5T_decode(size_t buf_size, const unsigned char *buf)
 {
-    H5F_t *f = NULL;            /* Fake file structure*/
-    H5T_t *ret_value = NULL;    /* Return value */
+    H5F_t *f         = NULL; /* Fake file structure*/
+    H5T_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate "fake" file structure */
-    if(NULL == (f = H5F_fake_alloc((uint8_t)0)))
+    if (NULL == (f = H5F_fake_alloc((uint8_t)0)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, NULL, "can't allocate fake file struct")
 
     /* Decode the type of the information */
-    if(*buf++ != H5O_DTYPE_ID)
+    if (*buf++ != H5O_DTYPE_ID)
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADMESG, NULL, "not an encoded datatype")
 
     /* Decode the version of the datatype information */
-    if(*buf++ != H5T_ENCODE_VERSION)
+    if (*buf++ != H5T_ENCODE_VERSION)
         HGOTO_ERROR(H5E_DATATYPE, H5E_VERSION, NULL, "unknown version of encoded datatype")
 
     /* Decode the serialized datatype message */
-    if(NULL == (ret_value = (H5T_t *)H5O_msg_decode(f, H5AC_ind_dxpl_id, NULL, H5O_DTYPE_ID, buf_size, buf)))
+    if (NULL == (ret_value = (H5T_t *)H5O_msg_decode(f, H5AC_ind_dxpl_id, NULL, H5O_DTYPE_ID, buf_size, buf)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, NULL, "can't decode object")
 
     /* Mark datatype as being in memory now */
-    if(H5T_set_loc(ret_value, NULL, H5T_LOC_MEMORY) < 0)
+    if (H5T_set_loc(ret_value, NULL, H5T_LOC_MEMORY) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location")
 
 done:
     /* Release fake file structure */
-    if(f && H5F_fake_free(f) < 0)
+    if (f && H5F_fake_free(f) < 0)
         HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, NULL, "unable to release fake file struct")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T__create
  *
@@ -2953,82 +3107,78 @@ done:
 H5T_t *
 H5T__create(H5T_class_t type, size_t size)
 {
-    H5T_t  *dt = NULL;
-    H5T_t  *ret_value = NULL;
+    H5T_t *dt        = NULL;
+    H5T_t *ret_value = NULL;
 
     FUNC_ENTER_PACKAGE
 
-    switch(type) {
+    switch (type) {
         case H5T_INTEGER:
         case H5T_FLOAT:
         case H5T_TIME:
-        case H5T_STRING:
-            {
-                H5T_t *origin_dt = NULL;
+        case H5T_STRING: {
+            H5T_t *origin_dt = NULL;
 
-                if(NULL == (origin_dt = (H5T_t *)H5I_object(H5T_C_S1)))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, NULL, "can't get structure for string type")
+            if (NULL == (origin_dt = (H5T_t *)H5I_object(H5T_C_S1)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, NULL, "can't get structure for string type")
 
-                /* Copy the default string datatype */
-                if(NULL == (dt = H5T_copy(origin_dt, H5T_COPY_TRANSIENT)))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy");
+            /* Copy the default string datatype */
+            if (NULL == (dt = H5T_copy(origin_dt, H5T_COPY_TRANSIENT)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy");
 
-                /* Modify the datatype */
-                if(H5T_set_size(dt, size) < 0)
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to set size for string type")
-            }
-            break;
+            /* Modify the datatype */
+            if (H5T_set_size(dt, size) < 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to set size for string type")
+        } break;
 
         case H5T_BITFIELD:
             HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, NULL, "type class is not appropriate - use H5Tcopy()")
 
         case H5T_OPAQUE:
         case H5T_COMPOUND:
-            if(NULL == (dt = H5T__alloc()))
+            if (NULL == (dt = H5T__alloc()))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
             dt->shared->type = type;
 
-            if(type == H5T_COMPOUND) {
-                dt->shared->u.compnd.packed=FALSE;       /* Start out unpacked */
-                dt->shared->u.compnd.memb_size=0;
+            if (type == H5T_COMPOUND) {
+                dt->shared->u.compnd.packed    = FALSE; /* Start out unpacked */
+                dt->shared->u.compnd.memb_size = 0;
             } /* end if */
-            else if(type == H5T_OPAQUE)
+            else if (type == H5T_OPAQUE)
                 /* Initialize the tag in case it's not set later.  A null tag will
                  * cause problems for later operations. */
                 dt->shared->u.opaque.tag = H5MM_strdup("");
             break;
 
-        case H5T_ENUM:
-            {
-                hid_t  subtype;
-                H5T_t  *sub_t_obj;
-
-                if(sizeof(char) == size)
-                    subtype = H5T_NATIVE_SCHAR_g;
-                else if(sizeof(short) == size)
-                    subtype = H5T_NATIVE_SHORT_g;
-                else if(sizeof(int) == size)
-                    subtype = H5T_NATIVE_INT_g;
-                else if(sizeof(long) == size)
-                    subtype = H5T_NATIVE_LONG_g;
-                else if(sizeof(long long) == size)
-                    subtype = H5T_NATIVE_LLONG_g;
-                else
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "no applicable native integer type")
-                if(NULL == (dt = H5T__alloc()))
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-                dt->shared->type = type;
-                if(NULL == (sub_t_obj = (H5T_t *)H5I_object(subtype)))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, NULL, "unable to get datatype object")
-                if(NULL == (dt->shared->parent = H5T_copy(sub_t_obj, H5T_COPY_ALL)))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "unable to copy base datatype")
-            }
-            break;
+        case H5T_ENUM: {
+            hid_t  subtype;
+            H5T_t *sub_t_obj;
+
+            if (sizeof(char) == size)
+                subtype = H5T_NATIVE_SCHAR_g;
+            else if (sizeof(short) == size)
+                subtype = H5T_NATIVE_SHORT_g;
+            else if (sizeof(int) == size)
+                subtype = H5T_NATIVE_INT_g;
+            else if (sizeof(long) == size)
+                subtype = H5T_NATIVE_LONG_g;
+            else if (sizeof(long long) == size)
+                subtype = H5T_NATIVE_LLONG_g;
+            else
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "no applicable native integer type")
+            if (NULL == (dt = H5T__alloc()))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+            dt->shared->type = type;
+            if (NULL == (sub_t_obj = (H5T_t *)H5I_object(subtype)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, NULL, "unable to get datatype object")
+            if (NULL == (dt->shared->parent = H5T_copy(sub_t_obj, H5T_COPY_ALL)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "unable to copy base datatype")
+        } break;
 
-        case H5T_VLEN:  /* Variable length datatype */
+        case H5T_VLEN: /* Variable length datatype */
             HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, NULL, "base type required - use H5Tvlen_create()")
 
-        case H5T_ARRAY:  /* Array datatype */
+        case H5T_ARRAY: /* Array datatype */
             HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, NULL, "base type required - use H5Tarray_create2()")
 
         case H5T_NO_CLASS:
@@ -3039,24 +3189,23 @@ H5T__create(H5T_class_t type, size_t size)
     } /* end switch */
 
     /* Set the size except VL string */
-    if(H5T_STRING != type || H5T_VARIABLE != size)
+    if (H5T_STRING != type || H5T_VARIABLE != size)
         dt->shared->size = size;
 
     /* Set return value */
     ret_value = dt;
 
 done:
-    if(NULL == ret_value) {
-        if(dt) {
+    if (NULL == ret_value) {
+        if (dt) {
             dt->shared = H5FL_FREE(H5T_shared_t, dt->shared);
-            dt = H5FL_FREE(H5T_t, dt);
+            dt         = H5FL_FREE(H5T_t, dt);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_copy
  *
@@ -3096,11 +3245,11 @@ done:
 H5T_t *
 H5T_copy(H5T_t *old_dt, H5T_copy_t method)
 {
-    H5T_t           *new_dt = NULL, *tmp = NULL;
-    H5T_shared_t    *reopened_fo = NULL;
-    unsigned        i;
-    char            *s;
-    H5T_t           *ret_value = NULL;    /* Return value */
+    H5T_t *       new_dt = NULL, *tmp = NULL;
+    H5T_shared_t *reopened_fo = NULL;
+    unsigned      i;
+    char *        s;
+    H5T_t *       ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -3108,9 +3257,9 @@ H5T_copy(H5T_t *old_dt, H5T_copy_t method)
     HDassert(old_dt);
 
     /* Allocate space */
-    if(NULL == (new_dt = H5FL_MALLOC(H5T_t)))
+    if (NULL == (new_dt = H5FL_MALLOC(H5T_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
-    if(NULL == (new_dt->shared = H5FL_MALLOC(H5T_shared_t)))
+    if (NULL == (new_dt->shared = H5FL_MALLOC(H5T_shared_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
 
     /* Copy shared information (entry information is copied last) */
@@ -3130,9 +3279,9 @@ H5T_copy(H5T_t *old_dt, H5T_copy_t method)
              * Return a transient type (locked or unlocked) or an unopened named
              * type.  Immutable transient types are degraded to read-only.
              */
-            if(H5T_STATE_OPEN==old_dt->shared->state)
+            if (H5T_STATE_OPEN == old_dt->shared->state)
                 new_dt->shared->state = H5T_STATE_NAMED;
-            else if(H5T_STATE_IMMUTABLE==old_dt->shared->state)
+            else if (H5T_STATE_IMMUTABLE == old_dt->shared->state)
                 new_dt->shared->state = H5T_STATE_RDONLY;
             break;
 
@@ -3141,22 +3290,25 @@ H5T_copy(H5T_t *old_dt, H5T_copy_t method)
              * Return a transient type (locked or unlocked) or an opened named
              * type.  Immutable transient types are degraded to read-only.
              */
-            if(old_dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED) {
+            if (old_dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED) {
                 /* Check if the object is already open */
-                if(NULL == (reopened_fo = (H5T_shared_t *)H5FO_opened(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr))) {
+                if (NULL == (reopened_fo = (H5T_shared_t *)H5FO_opened(old_dt->sh_loc.file,
+                                                                       old_dt->sh_loc.u.loc.oh_addr))) {
                     /* Clear any errors from H5FO_opened() */
                     H5E_clear_stack(NULL);
 
                     /* Open named datatype again */
-                    if(H5O_open(&old_dt->oloc) < 0)
+                    if (H5O_open(&old_dt->oloc) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to reopen named data type");
 
                     /* Insert opened named datatype into opened object list for the file */
-                    if(H5FO_insert(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr, new_dt->shared, FALSE)<0)
-                        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, NULL, "can't insert datatype into list of open objects")
+                    if (H5FO_insert(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr, new_dt->shared,
+                                    FALSE) < 0)
+                        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, NULL,
+                                    "can't insert datatype into list of open objects")
 
                     /* Increment object count for the object in the top file */
-                    if(H5FO_top_incr(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr) < 0)
+                    if (H5FO_top_incr(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, NULL, "can't increment object count")
 
                     new_dt->shared->fo_count = 1;
@@ -3171,19 +3323,19 @@ H5T_copy(H5T_t *old_dt, H5T_copy_t method)
                     reopened_fo->fo_count++;
 
                     /* Check if the object has been opened through the top file yet */
-                    if(H5FO_top_count(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr) == 0) {
+                    if (H5FO_top_count(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr) == 0) {
                         /* Open the object through this top file */
-                        if(H5O_open(&old_dt->oloc) < 0)
+                        if (H5O_open(&old_dt->oloc) < 0)
                             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to open object header")
                     } /* end if */
 
                     /* Increment object count for the object in the top file */
-                    if(H5FO_top_incr(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr) < 0)
+                    if (H5FO_top_incr(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, NULL, "can't increment object count")
                 } /* end else */
                 new_dt->shared->state = H5T_STATE_OPEN;
             }
-            else if(H5T_STATE_IMMUTABLE == old_dt->shared->state) {
+            else if (H5T_STATE_IMMUTABLE == old_dt->shared->state) {
                 new_dt->shared->state = H5T_STATE_RDONLY;
             }
             break;
@@ -3193,121 +3345,126 @@ H5T_copy(H5T_t *old_dt, H5T_copy_t method)
 
     /* Update fields in the new struct, if we aren't sharing an already opened
      * committed datatype */
-    if(!reopened_fo) {
+    if (!reopened_fo) {
         /* Copy parent information */
-        if(old_dt->shared->parent)
+        if (old_dt->shared->parent)
             new_dt->shared->parent = H5T_copy(old_dt->shared->parent, method);
 
-        switch(new_dt->shared->type) {
-            case H5T_COMPOUND:
-                {
-                    ssize_t accum_change = 0; /* Amount of change in the offset of the fields */
-
-                    /*
-                    * Copy all member fields to new type, then overwrite the
-                    * name and type fields of each new member with copied values.
-                    * That is, H5T_copy() is a deep copy.
-                    */
-                    /* Only malloc if space has been allocated for members - NAF */
-                    if(new_dt->shared->u.compnd.nalloc > 0) {
-                        new_dt->shared->u.compnd.memb =
-                                (H5T_cmemb_t *)H5MM_malloc(new_dt->shared->u.compnd.nalloc * sizeof(H5T_cmemb_t));
-                        if (NULL == new_dt->shared->u.compnd.memb)
-                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
-
-                        HDmemcpy(new_dt->shared->u.compnd.memb, old_dt->shared->u.compnd.memb,
-                                new_dt->shared->u.compnd.nmembs * sizeof(H5T_cmemb_t));
-                    } /* end if */
+        switch (new_dt->shared->type) {
+            case H5T_COMPOUND: {
+                ssize_t accum_change = 0; /* Amount of change in the offset of the fields */
 
-                    for(i = 0; i < new_dt->shared->u.compnd.nmembs; i++) {
-                        unsigned    j;
-                        int         old_match;
-
-                        s = new_dt->shared->u.compnd.memb[i].name;
-                        new_dt->shared->u.compnd.memb[i].name = H5MM_xstrdup(s);
-                        tmp = H5T_copy (old_dt->shared->u.compnd.memb[i].type, method);
-                        new_dt->shared->u.compnd.memb[i].type = tmp;
-                        HDassert(tmp != NULL);
-
-                        /* Range check against compound member's offset */
-                        if ((accum_change < 0) && ((ssize_t) new_dt->shared->u.compnd.memb[i].offset < accum_change))
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, NULL, "invalid field size in datatype");
-
-                        /* Apply the accumulated size change to the offset of the field */
-                        new_dt->shared->u.compnd.memb[i].offset += (size_t) accum_change;
-
-                        if(old_dt->shared->u.compnd.sorted != H5T_SORT_VALUE) {
-                            for(old_match = -1, j = 0; j < old_dt->shared->u.compnd.nmembs; j++) {
-                                if(!HDstrcmp(new_dt->shared->u.compnd.memb[i].name, old_dt->shared->u.compnd.memb[j].name)) {
-                                    old_match = (int) j;
-                                    break;
-                                } /* end if */
-                            } /* end for */
-
-                            /* check if we couldn't find a match */
-                            if(old_match < 0)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "fields in datatype corrupted");
-                        } /* end if */
-                        else
-                            old_match = (int) i;
+                /*
+                 * Copy all member fields to new type, then overwrite the
+                 * name and type fields of each new member with copied values.
+                 * That is, H5T_copy() is a deep copy.
+                 */
+                /* Only malloc if space has been allocated for members - NAF */
+                if (new_dt->shared->u.compnd.nalloc > 0) {
+                    new_dt->shared->u.compnd.memb =
+                        (H5T_cmemb_t *)H5MM_malloc(new_dt->shared->u.compnd.nalloc * sizeof(H5T_cmemb_t));
+                    if (NULL == new_dt->shared->u.compnd.memb)
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+
+                    HDmemcpy(new_dt->shared->u.compnd.memb, old_dt->shared->u.compnd.memb,
+                             new_dt->shared->u.compnd.nmembs * sizeof(H5T_cmemb_t));
+                } /* end if */
 
-                        /* If the field changed size, add that change to the accumulated size change */
-                        if(new_dt->shared->u.compnd.memb[i].type->shared->size != old_dt->shared->u.compnd.memb[old_match].type->shared->size) {
-                            /* Adjust the size of the member */
-                            new_dt->shared->u.compnd.memb[i].size = (old_dt->shared->u.compnd.memb[old_match].size*tmp->shared->size)/old_dt->shared->u.compnd.memb[old_match].type->shared->size;
+                for (i = 0; i < new_dt->shared->u.compnd.nmembs; i++) {
+                    unsigned j;
+                    int      old_match;
 
-                            accum_change += (ssize_t) (new_dt->shared->u.compnd.memb[i].type->shared->size - old_dt->shared->u.compnd.memb[old_match].type->shared->size);
-                        } /* end if */
-                    } /* end for */
+                    s                                     = new_dt->shared->u.compnd.memb[i].name;
+                    new_dt->shared->u.compnd.memb[i].name = H5MM_xstrdup(s);
+                    tmp = H5T_copy(old_dt->shared->u.compnd.memb[i].type, method);
+                    new_dt->shared->u.compnd.memb[i].type = tmp;
+                    HDassert(tmp != NULL);
 
-                    /* Range check against datatype size */
-                    if ((accum_change < 0) && ((ssize_t) new_dt->shared->size < accum_change))
+                    /* Range check against compound member's offset */
+                    if ((accum_change < 0) &&
+                        ((ssize_t)new_dt->shared->u.compnd.memb[i].offset < accum_change))
                         HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, NULL, "invalid field size in datatype");
 
-                    /* Apply the accumulated size change to the size of the compound struct */
-                    new_dt->shared->size += (size_t) accum_change;
-                }
-                break;
+                    /* Apply the accumulated size change to the offset of the field */
+                    new_dt->shared->u.compnd.memb[i].offset += (size_t)accum_change;
+
+                    if (old_dt->shared->u.compnd.sorted != H5T_SORT_VALUE) {
+                        for (old_match = -1, j = 0; j < old_dt->shared->u.compnd.nmembs; j++) {
+                            if (!HDstrcmp(new_dt->shared->u.compnd.memb[i].name,
+                                          old_dt->shared->u.compnd.memb[j].name)) {
+                                old_match = (int)j;
+                                break;
+                            } /* end if */
+                        }     /* end for */
+
+                        /* check if we couldn't find a match */
+                        if (old_match < 0)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "fields in datatype corrupted");
+                    } /* end if */
+                    else
+                        old_match = (int)i;
+
+                    /* If the field changed size, add that change to the accumulated size change */
+                    if (new_dt->shared->u.compnd.memb[i].type->shared->size !=
+                        old_dt->shared->u.compnd.memb[old_match].type->shared->size) {
+                        /* Adjust the size of the member */
+                        new_dt->shared->u.compnd.memb[i].size =
+                            (old_dt->shared->u.compnd.memb[old_match].size * tmp->shared->size) /
+                            old_dt->shared->u.compnd.memb[old_match].type->shared->size;
+
+                        accum_change +=
+                            (ssize_t)(new_dt->shared->u.compnd.memb[i].type->shared->size -
+                                      old_dt->shared->u.compnd.memb[old_match].type->shared->size);
+                    } /* end if */
+                }     /* end for */
+
+                /* Range check against datatype size */
+                if ((accum_change < 0) && ((ssize_t)new_dt->shared->size < accum_change))
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, NULL, "invalid field size in datatype");
+
+                /* Apply the accumulated size change to the size of the compound struct */
+                new_dt->shared->size += (size_t)accum_change;
+            } break;
 
             case H5T_ENUM:
                 /*
-                * Copy all member fields to new type, then overwrite the name fields
-                * of each new member with copied values. That is, H5T_copy() is a
-                * deep copy.
-                */
+                 * Copy all member fields to new type, then overwrite the name fields
+                 * of each new member with copied values. That is, H5T_copy() is a
+                 * deep copy.
+                 */
                 new_dt->shared->u.enumer.name =
-                        (char **)H5MM_malloc(new_dt->shared->u.enumer.nalloc * sizeof(char*));
+                    (char **)H5MM_malloc(new_dt->shared->u.enumer.nalloc * sizeof(char *));
                 new_dt->shared->u.enumer.value =
-                        (uint8_t *)H5MM_malloc(new_dt->shared->u.enumer.nalloc * new_dt->shared->size);
-                if(NULL == new_dt->shared->u.enumer.value)
+                    (uint8_t *)H5MM_malloc(new_dt->shared->u.enumer.nalloc * new_dt->shared->size);
+                if (NULL == new_dt->shared->u.enumer.value)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
                 HDmemcpy(new_dt->shared->u.enumer.value, old_dt->shared->u.enumer.value,
-                        new_dt->shared->u.enumer.nmembs * new_dt->shared->size);
-                for(i = 0; i < new_dt->shared->u.enumer.nmembs; i++) {
-                    s = old_dt->shared->u.enumer.name[i];
+                         new_dt->shared->u.enumer.nmembs * new_dt->shared->size);
+                for (i = 0; i < new_dt->shared->u.enumer.nmembs; i++) {
+                    s                                = old_dt->shared->u.enumer.name[i];
                     new_dt->shared->u.enumer.name[i] = H5MM_xstrdup(s);
                 } /* end for */
                 break;
 
             case H5T_VLEN:
             case H5T_REFERENCE:
-                if(method == H5T_COPY_TRANSIENT || method == H5T_COPY_REOPEN) {
+                if (method == H5T_COPY_TRANSIENT || method == H5T_COPY_REOPEN) {
                     /* H5T_copy converts any type into a memory type */
-                    if(H5T_set_loc(new_dt, NULL, H5T_LOC_MEMORY) < 0)
+                    if (H5T_set_loc(new_dt, NULL, H5T_LOC_MEMORY) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location");
                 } /* end if */
                 break;
 
             case H5T_OPAQUE:
                 /*
-                * Copy the tag name.
-                */
+                 * Copy the tag name.
+                 */
                 new_dt->shared->u.opaque.tag = H5MM_xstrdup(new_dt->shared->u.opaque.tag);
                 break;
 
             case H5T_ARRAY:
                 /* Re-compute the array's size, in case it's base type changed size */
-                new_dt->shared->size=new_dt->shared->u.array.nelem*new_dt->shared->parent->shared->size;
+                new_dt->shared->size = new_dt->shared->u.array.nelem * new_dt->shared->parent->shared->size;
                 break;
 
             case H5T_NO_CLASS:
@@ -3320,29 +3477,29 @@ H5T_copy(H5T_t *old_dt, H5T_copy_t method)
             default:
                 break;
         } /* end switch */
-    } /* end if */
+    }     /* end if */
 
     /* Set the cached location & name path if the original type was a named
      * type and the new type is also named.
      */
-    if(H5O_loc_reset(&new_dt->oloc) < 0)
+    if (H5O_loc_reset(&new_dt->oloc) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRESET, NULL, "unable to initialize location")
-    if(H5G_name_reset(&new_dt->path) < 0)
+    if (H5G_name_reset(&new_dt->path) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to reset path")
 
-    if(new_dt->shared->state == H5T_STATE_NAMED || new_dt->shared->state == H5T_STATE_OPEN) {
-        if(H5O_loc_copy(&(new_dt->oloc), &(old_dt->oloc), H5_COPY_DEEP) < 0)
+    if (new_dt->shared->state == H5T_STATE_NAMED || new_dt->shared->state == H5T_STATE_OPEN) {
+        if (H5O_loc_copy(&(new_dt->oloc), &(old_dt->oloc), H5_COPY_DEEP) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy object location")
-        if(H5G_name_copy(&(new_dt->path), &(old_dt->path), H5_COPY_DEEP) < 0)
+        if (H5G_name_copy(&(new_dt->path), &(old_dt->path), H5_COPY_DEEP) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to copy path")
     } /* end if */
 
     /* Copy shared location information if the new type is named or if it is
      * shared in the heap.
      */
-    if((old_dt->sh_loc.type == H5O_SHARE_TYPE_SOHM || old_dt->sh_loc.type == H5O_SHARE_TYPE_HERE) ||
-            new_dt->shared->state == H5T_STATE_NAMED || new_dt->shared->state == H5T_STATE_OPEN) {
-        if(H5O_set_shared(&(new_dt->sh_loc), &(old_dt->sh_loc)) < 0)
+    if ((old_dt->sh_loc.type == H5O_SHARE_TYPE_SOHM || old_dt->sh_loc.type == H5O_SHARE_TYPE_HERE) ||
+        new_dt->shared->state == H5T_STATE_NAMED || new_dt->shared->state == H5T_STATE_OPEN) {
+        if (H5O_set_shared(&(new_dt->sh_loc), &(old_dt->sh_loc)) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy shared information")
     } /* end if */
     else
@@ -3353,18 +3510,17 @@ H5T_copy(H5T_t *old_dt, H5T_copy_t method)
     ret_value = new_dt;
 
 done:
-    if(ret_value == NULL) {
-        if(new_dt) {
-            if(new_dt->shared)
+    if (ret_value == NULL) {
+        if (new_dt) {
+            if (new_dt->shared)
                 new_dt->shared = H5FL_FREE(H5T_shared_t, new_dt->shared);
             new_dt = H5FL_FREE(H5T_t, new_dt);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_lock
  *
@@ -3382,20 +3538,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T_lock (H5T_t *dt, hbool_t immutable)
+H5T_lock(H5T_t *dt, hbool_t immutable)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert (dt);
+    HDassert(dt);
 
     switch (dt->shared->state) {
         case H5T_STATE_TRANSIENT:
             dt->shared->state = immutable ? H5T_STATE_IMMUTABLE : H5T_STATE_RDONLY;
             break;
         case H5T_STATE_RDONLY:
-            if (immutable) dt->shared->state = H5T_STATE_IMMUTABLE;
+            if (immutable)
+                dt->shared->state = H5T_STATE_IMMUTABLE;
             break;
         case H5T_STATE_IMMUTABLE:
         case H5T_STATE_NAMED:
@@ -3410,7 +3567,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T__alloc
  *
@@ -3426,20 +3582,20 @@ done:
 H5T_t *
 H5T__alloc(void)
 {
-    H5T_t *dt = NULL;           /* Pointer to datatype allocated */
-    H5T_t *ret_value = NULL;    /* Return value */
+    H5T_t *dt        = NULL; /* Pointer to datatype allocated */
+    H5T_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Allocate & initialize datatype wrapper info */
-    if(NULL == (dt = H5FL_CALLOC(H5T_t)))
+    if (NULL == (dt = H5FL_CALLOC(H5T_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     H5O_loc_reset(&(dt->oloc));
     H5G_name_reset(&(dt->path));
     H5O_msg_reset_share(H5O_DTYPE_ID, dt);
 
     /* Allocate & initialize shared datatype structure */
-    if(NULL == (dt->shared = H5FL_CALLOC(H5T_shared_t)))
+    if (NULL == (dt->shared = H5FL_CALLOC(H5T_shared_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     dt->shared->version = H5O_DTYPE_VERSION_1;
 
@@ -3447,9 +3603,9 @@ H5T__alloc(void)
     ret_value = dt;
 
 done:
-    if(ret_value == NULL)
-        if(dt) {
-            if(dt->shared)
+    if (ret_value == NULL)
+        if (dt) {
+            if (dt->shared)
                 dt->shared = H5FL_FREE(H5T_shared_t, dt->shared);
             dt = H5FL_FREE(H5T_t, dt);
         } /* end if */
@@ -3457,7 +3613,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T__free
  *
@@ -3475,8 +3630,8 @@ done:
 herr_t
 H5T__free(H5T_t *dt)
 {
-    unsigned    i;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    unsigned i;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -3486,17 +3641,18 @@ H5T__free(H5T_t *dt)
      * If a named type is being closed then close the object header and
      * remove from the list of open objects in the file.
      */
-    if(H5T_STATE_OPEN == dt->shared->state) {
+    if (H5T_STATE_OPEN == dt->shared->state) {
         HDassert(dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED);
         HDassert(H5F_addr_defined(dt->sh_loc.u.loc.oh_addr));
         HDassert(H5F_addr_defined(dt->oloc.addr));
 
         /* Remove the datatype from the list of opened objects in the file */
-        if(H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+        if (H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-        if(H5FO_delete(dt->sh_loc.file, H5AC_dxpl_id, dt->sh_loc.u.loc.oh_addr) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "can't remove datatype from list of open objects")
-        if(H5O_close(&dt->oloc) < 0)
+        if (H5FO_delete(dt->sh_loc.file, H5AC_dxpl_id, dt->sh_loc.u.loc.oh_addr) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL,
+                        "can't remove datatype from list of open objects")
+        if (H5O_close(&dt->oloc) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to close data type object header")
         dt->shared->state = H5T_STATE_NAMED;
     } /* end if */
@@ -3507,13 +3663,13 @@ H5T__free(H5T_t *dt)
     /*
      * Don't free locked datatypes.
      */
-    if(H5T_STATE_IMMUTABLE==dt->shared->state)
+    if (H5T_STATE_IMMUTABLE == dt->shared->state)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to close immutable datatype")
 
     /* Close the datatype */
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_COMPOUND:
-            for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+            for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
                 H5MM_xfree(dt->shared->u.compnd.memb[i].name);
                 H5T_close(dt->shared->u.compnd.memb[i].type);
             } /* end for */
@@ -3521,7 +3677,7 @@ H5T__free(H5T_t *dt)
             break;
 
         case H5T_ENUM:
-            for(i = 0; i < dt->shared->u.enumer.nmembs; i++)
+            for (i = 0; i < dt->shared->u.enumer.nmembs; i++)
                 H5MM_xfree(dt->shared->u.enumer.name[i]);
             H5MM_xfree(dt->shared->u.enumer.name);
             H5MM_xfree(dt->shared->u.enumer.value);
@@ -3547,14 +3703,13 @@ H5T__free(H5T_t *dt)
 
     /* Close the parent */
     HDassert(dt->shared->parent != dt);
-    if(dt->shared->parent && H5T_close(dt->shared->parent) < 0)
+    if (dt->shared->parent && H5T_close(dt->shared->parent) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCLOSEOBJ, FAIL, "unable to close parent data type")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_close
  *
@@ -3571,17 +3726,17 @@ done:
 herr_t
 H5T_close(H5T_t *dt)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(dt && dt->shared);
 
-    if(dt->shared->state == H5T_STATE_OPEN)
+    if (dt->shared->state == H5T_STATE_OPEN)
         dt->shared->fo_count--;
 
-    if(dt->shared->state != H5T_STATE_OPEN || dt->shared->fo_count == 0) {
-        if(H5T__free(dt) < 0)
+    if (dt->shared->state != H5T_STATE_OPEN || dt->shared->fo_count == 0) {
+        if (H5T__free(dt) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "unable to free datatype");
 
         dt->shared = H5FL_FREE(H5T_shared_t, dt->shared);
@@ -3591,24 +3746,24 @@ H5T_close(H5T_t *dt)
          * If a named type is being closed then close the object header and
          * remove from the list of open objects in the file.
          */
-        if(H5T_STATE_OPEN == dt->shared->state) {
+        if (H5T_STATE_OPEN == dt->shared->state) {
             HDassert(dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED);
 
             /* Decrement the ref. count for this object in the top file */
-            if(H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+            if (H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
 
             /* Check reference count for this object in the top file */
-            if(H5FO_top_count(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) == 0) {
+            if (H5FO_top_count(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) == 0) {
                 /* Close object location for named datatype */
-                if(H5O_close(&dt->oloc) < 0)
+                if (H5O_close(&dt->oloc) < 0)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to close")
             } /* end if */
             else
                 /* Free object location (i.e. "unhold" the file if appropriate)
                  */
-                if(H5O_loc_free(&(dt->oloc)) < 0)
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
+                if (H5O_loc_free(&(dt->oloc)) < 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
         } /* end if */
 
         /* Free the group hier. path since we're not calling H5T__free() */
@@ -3622,7 +3777,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_set_size
  *
@@ -3656,39 +3810,38 @@ done:
 static herr_t
 H5T_set_size(H5T_t *dt, size_t size)
 {
-    size_t    prec, offset;
-    herr_t    ret_value=SUCCEED;       /* Return value */
+    size_t prec, offset;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(dt);
-    HDassert(size!=0);
-    HDassert(H5T_REFERENCE!=dt->shared->type);
-    HDassert(!(H5T_ENUM==dt->shared->type && 0==dt->shared->u.enumer.nmembs));
+    HDassert(size != 0);
+    HDassert(H5T_REFERENCE != dt->shared->type);
+    HDassert(!(H5T_ENUM == dt->shared->type && 0 == dt->shared->u.enumer.nmembs));
 
     if (dt->shared->parent) {
-        if (H5T_set_size(dt->shared->parent, size)<0)
+        if (H5T_set_size(dt->shared->parent, size) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set size for parent data type");
 
         /* Adjust size of datatype appropriately */
-        if(dt->shared->type==H5T_ARRAY)
+        if (dt->shared->type == H5T_ARRAY)
             dt->shared->size = dt->shared->parent->shared->size * dt->shared->u.array.nelem;
-        else if(dt->shared->type!=H5T_VLEN)
+        else if (dt->shared->type != H5T_VLEN)
             dt->shared->size = dt->shared->parent->shared->size;
     }
     else {
         if (H5T_IS_ATOMIC(dt->shared)) {
             offset = dt->shared->u.atomic.offset;
-            prec = dt->shared->u.atomic.prec;
+            prec   = dt->shared->u.atomic.prec;
 
             /* Decrement the offset and precision if necessary */
-            if (prec > 8*size)
+            if (prec > 8 * size)
                 offset = 0;
-            else
-                if (offset+prec > 8*size)
-                    offset = 8 * size - prec;
-            if (prec > 8*size)
+            else if (offset + prec > 8 * size)
+                offset = 8 * size - prec;
+            if (prec > 8 * size)
                 prec = 8 * size;
         }
         else {
@@ -3705,28 +3858,29 @@ H5T_set_size(H5T_t *dt, size_t size)
 
             case H5T_COMPOUND:
                 /* If decreasing size, check the last member isn't being cut. */
-                if(size < dt->shared->size) {
-                    int         num_membs = 0;
-                    unsigned    i, max_index = 0;
-                    size_t      memb_offset, max_offset = 0;
-                    size_t      max_size;
+                if (size < dt->shared->size) {
+                    int      num_membs = 0;
+                    unsigned i, max_index            = 0;
+                    size_t   memb_offset, max_offset = 0;
+                    size_t   max_size;
 
-                    if((num_membs = H5T_get_nmembers(dt)) < 0)
+                    if ((num_membs = H5T_get_nmembers(dt)) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to get number of members");
 
-                    if(num_membs) {
-                        for(i = 0; i < (unsigned)num_membs; i++) {
+                    if (num_membs) {
+                        for (i = 0; i < (unsigned)num_membs; i++) {
                             memb_offset = H5T_get_member_offset(dt, i);
-                            if(memb_offset > max_offset) {
+                            if (memb_offset > max_offset) {
                                 max_offset = memb_offset;
-                                max_index = i;
+                                max_index  = i;
                             }
                         }
 
                         max_size = H5T__get_member_size(dt, max_index);
 
-                        if(size < (max_offset + max_size))
-                            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "size shrinking will cut off last member ");
+                        if (size < (max_offset + max_size))
+                            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                        "size shrinking will cut off last member ");
                     }
 
                     /* Compound must not have been packed previously */
@@ -3739,15 +3893,15 @@ H5T_set_size(H5T_t *dt, size_t size)
 
             case H5T_STRING:
                 /* Convert string to variable-length datatype */
-                if(size == H5T_VARIABLE) {
-                    H5T_t       *base = NULL;        /* base data type */
-                    H5T_cset_t  tmp_cset;            /* Temp. cset info */
-                    H5T_str_t   tmp_strpad;          /* Temp. strpad info */
+                if (size == H5T_VARIABLE) {
+                    H5T_t *    base = NULL; /* base data type */
+                    H5T_cset_t tmp_cset;    /* Temp. cset info */
+                    H5T_str_t  tmp_strpad;  /* Temp. strpad info */
 
                     /* Get a copy of unsigned char type as the base/parent type */
-                    if(NULL == (base = (H5T_t *)H5I_object(H5T_NATIVE_UCHAR)))
+                    if (NULL == (base = (H5T_t *)H5I_object(H5T_NATIVE_UCHAR)))
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid base datatype");
-                    dt->shared->parent=H5T_copy(base,H5T_COPY_ALL);
+                    dt->shared->parent = H5T_copy(base, H5T_COPY_ALL);
 
                     /* change this datatype into a VL string */
                     dt->shared->type = H5T_VLEN;
@@ -3760,7 +3914,7 @@ H5T_set_size(H5T_t *dt, size_t size)
 
                     /* Before we mess with the info in the union, extract the
                      * values we need */
-                    tmp_cset = dt->shared->u.atomic.u.s.cset;
+                    tmp_cset   = dt->shared->u.atomic.u.s.cset;
                     tmp_strpad = dt->shared->u.atomic.u.s.pad;
 
                     /* This is a string, not a sequence */
@@ -3771,12 +3925,11 @@ H5T_set_size(H5T_t *dt, size_t size)
                     dt->shared->u.vlen.pad  = tmp_strpad;
 
                     /* Set up VL information */
-                    if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY)<0)
+                    if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid datatype location");
-
                 }
                 else {
-                    prec = 8 * size;
+                    prec   = 8 * size;
                     offset = 0;
                 } /* end else */
                 break;
@@ -3786,10 +3939,11 @@ H5T_set_size(H5T_t *dt, size_t size)
                  * The sign, mantissa, and exponent fields should be adjusted
                  * first when decreasing the size of a floating point type.
                  */
-                if (dt->shared->u.atomic.u.f.sign >= prec+offset ||
-                        dt->shared->u.atomic.u.f.epos + dt->shared->u.atomic.u.f.esize > prec+offset ||
-                        dt->shared->u.atomic.u.f.mpos + dt->shared->u.atomic.u.f.msize > prec+offset) {
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "adjust sign, mantissa, and exponent fields first");
+                if (dt->shared->u.atomic.u.f.sign >= prec + offset ||
+                    dt->shared->u.atomic.u.f.epos + dt->shared->u.atomic.u.f.esize > prec + offset ||
+                    dt->shared->u.atomic.u.f.mpos + dt->shared->u.atomic.u.f.msize > prec + offset) {
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                "adjust sign, mantissa, and exponent fields first");
                 }
                 break;
 
@@ -3809,16 +3963,16 @@ H5T_set_size(H5T_t *dt, size_t size)
         }
 
         /* Commit (if we didn't convert this type to a VL string) */
-        if(dt->shared->type != H5T_VLEN) {
+        if (dt->shared->type != H5T_VLEN) {
             dt->shared->size = size;
             if (H5T_IS_ATOMIC(dt->shared)) {
                 dt->shared->u.atomic.offset = offset;
-                dt->shared->u.atomic.prec = prec;
+                dt->shared->u.atomic.prec   = prec;
             }
         } /* end if */
 
         /* Check if the new compound type is packed */
-        if(dt->shared->type == H5T_COMPOUND)
+        if (dt->shared->type == H5T_COMPOUND)
             H5T__update_packed(dt);
     }
 
@@ -3826,7 +3980,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_get_size
  *
@@ -3854,7 +4007,6 @@ H5T_get_size(const H5T_t *dt)
     FUNC_LEAVE_NOAPI(dt->shared->size)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_cmp
  *
@@ -3874,12 +4026,12 @@ H5T_get_size(const H5T_t *dt)
 int
 H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
 {
-    unsigned    *idx1 = NULL, *idx2 = NULL;
-    size_t      base_size;
-    hbool_t     swapped;
-    unsigned    u;
-    int         tmp;
-    int         ret_value = 0;
+    unsigned *idx1 = NULL, *idx2 = NULL;
+    size_t    base_size;
+    hbool_t   swapped;
+    unsigned  u;
+    int       tmp;
+    int       ret_value = 0;
 
     FUNC_ENTER_NOAPI(0)
 
@@ -3888,106 +4040,112 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
     HDassert(dt2);
 
     /* the easy case */
-    if(dt1 == dt2)
+    if (dt1 == dt2)
         HGOTO_DONE(0);
 
     /* compare */
-    if(dt1->shared->type < dt2->shared->type)
+    if (dt1->shared->type < dt2->shared->type)
         HGOTO_DONE(-1);
-    if(dt1->shared->type > dt2->shared->type)
+    if (dt1->shared->type > dt2->shared->type)
         HGOTO_DONE(1);
 
-    if(dt1->shared->size < dt2->shared->size)
+    if (dt1->shared->size < dt2->shared->size)
         HGOTO_DONE(-1);
-    if(dt1->shared->size > dt2->shared->size)
+    if (dt1->shared->size > dt2->shared->size)
         HGOTO_DONE(1);
 
-    if(dt1->shared->parent && !dt2->shared->parent)
+    if (dt1->shared->parent && !dt2->shared->parent)
         HGOTO_DONE(-1);
-    if(!dt1->shared->parent && dt2->shared->parent)
+    if (!dt1->shared->parent && dt2->shared->parent)
         HGOTO_DONE(1);
-    if(dt1->shared->parent) {
+    if (dt1->shared->parent) {
         tmp = H5T_cmp(dt1->shared->parent, dt2->shared->parent, superset);
-        if(tmp < 0)
+        if (tmp < 0)
             HGOTO_DONE(-1);
-        if(tmp > 0)
+        if (tmp > 0)
             HGOTO_DONE(1);
     } /* end if */
 
-    switch(dt1->shared->type) {
+    switch (dt1->shared->type) {
         case H5T_COMPOUND:
             /*
              * Compound data types...
              */
-            if(dt1->shared->u.compnd.nmembs < dt2->shared->u.compnd.nmembs)
+            if (dt1->shared->u.compnd.nmembs < dt2->shared->u.compnd.nmembs)
                 HGOTO_DONE(-1);
-            if(dt1->shared->u.compnd.nmembs > dt2->shared->u.compnd.nmembs)
+            if (dt1->shared->u.compnd.nmembs > dt2->shared->u.compnd.nmembs)
                 HGOTO_DONE(1);
 
             /* Build an index for each type so the names are sorted */
-            if(NULL == (idx1 = (unsigned *)H5MM_malloc(dt1->shared->u.compnd.nmembs * sizeof(unsigned))) ||
-                    NULL == (idx2 = (unsigned *)H5MM_malloc(dt2->shared->u.compnd.nmembs * sizeof(unsigned))))
+            if (NULL == (idx1 = (unsigned *)H5MM_malloc(dt1->shared->u.compnd.nmembs * sizeof(unsigned))) ||
+                NULL == (idx2 = (unsigned *)H5MM_malloc(dt2->shared->u.compnd.nmembs * sizeof(unsigned))))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed");
-            for(u = 0; u < dt1->shared->u.compnd.nmembs; u++)
+            for (u = 0; u < dt1->shared->u.compnd.nmembs; u++)
                 idx1[u] = idx2[u] = u;
-            if(dt1->shared->u.enumer.nmembs > 1) {
+            if (dt1->shared->u.enumer.nmembs > 1) {
                 int i;
 
-                for(i = (int) dt1->shared->u.compnd.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) {
+                for (i = (int)dt1->shared->u.compnd.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) {
                     int j;
 
-                    for(j = 0, swapped=FALSE; j < i; j++)
-                        if(HDstrcmp(dt1->shared->u.compnd.memb[idx1[j]].name,
-                                 dt1->shared->u.compnd.memb[idx1[j + 1]].name) > 0) {
+                    for (j = 0, swapped = FALSE; j < i; j++)
+                        if (HDstrcmp(dt1->shared->u.compnd.memb[idx1[j]].name,
+                                     dt1->shared->u.compnd.memb[idx1[j + 1]].name) > 0) {
                             unsigned tmp_idx = idx1[j];
-                            idx1[j] = idx1[j + 1];
-                            idx1[j + 1] = tmp_idx;
-                            swapped = TRUE;
+                            idx1[j]          = idx1[j + 1];
+                            idx1[j + 1]      = tmp_idx;
+                            swapped          = TRUE;
                         }
                 }
-                for(i = (int) dt2->shared->u.compnd.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) {
+                for (i = (int)dt2->shared->u.compnd.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) {
                     int j;
 
-                    for(j = 0, swapped = FALSE; j<i; j++)
-                        if(HDstrcmp(dt2->shared->u.compnd.memb[idx2[j]].name,
-                                 dt2->shared->u.compnd.memb[idx2[j + 1]].name) > 0) {
+                    for (j = 0, swapped = FALSE; j < i; j++)
+                        if (HDstrcmp(dt2->shared->u.compnd.memb[idx2[j]].name,
+                                     dt2->shared->u.compnd.memb[idx2[j + 1]].name) > 0) {
                             unsigned tmp_idx = idx2[j];
-                            idx2[j] = idx2[j + 1];
-                            idx2[j + 1] = tmp_idx;
-                            swapped = TRUE;
+                            idx2[j]          = idx2[j + 1];
+                            idx2[j + 1]      = tmp_idx;
+                            swapped          = TRUE;
                         }
                 }
             } /* end if */
 
 #ifdef H5T_DEBUG
             /* I don't quite trust the code above yet :-)  --RPM */
-            for(u=0; u<dt1->shared->u.compnd.nmembs-1; u++) {
+            for (u = 0; u < dt1->shared->u.compnd.nmembs - 1; u++) {
                 HDassert(HDstrcmp(dt1->shared->u.compnd.memb[idx1[u]].name,
-                        dt1->shared->u.compnd.memb[idx1[u + 1]].name));
+                                  dt1->shared->u.compnd.memb[idx1[u + 1]].name));
                 HDassert(HDstrcmp(dt2->shared->u.compnd.memb[idx2[u]].name,
-                        dt2->shared->u.compnd.memb[idx2[u + 1]].name));
+                                  dt2->shared->u.compnd.memb[idx2[u + 1]].name));
             }
 #endif
 
             /* Compare the members */
-            for(u=0; u<dt1->shared->u.compnd.nmembs; u++) {
+            for (u = 0; u < dt1->shared->u.compnd.nmembs; u++) {
                 tmp = HDstrcmp(dt1->shared->u.compnd.memb[idx1[u]].name,
-                       dt2->shared->u.compnd.memb[idx2[u]].name);
-                if(tmp < 0)
+                               dt2->shared->u.compnd.memb[idx2[u]].name);
+                if (tmp < 0)
                     HGOTO_DONE(-1);
-                if(tmp > 0)
+                if (tmp > 0)
                     HGOTO_DONE(1);
 
-                if(dt1->shared->u.compnd.memb[idx1[u]].offset < dt2->shared->u.compnd.memb[idx2[u]].offset) HGOTO_DONE(-1);
-                if(dt1->shared->u.compnd.memb[idx1[u]].offset > dt2->shared->u.compnd.memb[idx2[u]].offset) HGOTO_DONE(1);
+                if (dt1->shared->u.compnd.memb[idx1[u]].offset < dt2->shared->u.compnd.memb[idx2[u]].offset)
+                    HGOTO_DONE(-1);
+                if (dt1->shared->u.compnd.memb[idx1[u]].offset > dt2->shared->u.compnd.memb[idx2[u]].offset)
+                    HGOTO_DONE(1);
 
-                if(dt1->shared->u.compnd.memb[idx1[u]].size < dt2->shared->u.compnd.memb[idx2[u]].size) HGOTO_DONE(-1);
-                if(dt1->shared->u.compnd.memb[idx1[u]].size > dt2->shared->u.compnd.memb[idx2[u]].size) HGOTO_DONE(1);
+                if (dt1->shared->u.compnd.memb[idx1[u]].size < dt2->shared->u.compnd.memb[idx2[u]].size)
+                    HGOTO_DONE(-1);
+                if (dt1->shared->u.compnd.memb[idx1[u]].size > dt2->shared->u.compnd.memb[idx2[u]].size)
+                    HGOTO_DONE(1);
 
                 tmp = H5T_cmp(dt1->shared->u.compnd.memb[idx1[u]].type,
-                      dt2->shared->u.compnd.memb[idx2[u]].type, superset);
-                if(tmp < 0) HGOTO_DONE(-1);
-                if(tmp > 0) HGOTO_DONE(1);
+                              dt2->shared->u.compnd.memb[idx2[u]].type, superset);
+                if (tmp < 0)
+                    HGOTO_DONE(-1);
+                if (tmp > 0)
+                    HGOTO_DONE(1);
             }
             break;
 
@@ -3999,75 +4157,75 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
             /* If we are doing a "superset" comparison, dt2 is allowed to have
              * more members than dt1
              */
-            if(superset) {
-                if(dt1->shared->u.enumer.nmembs > dt2->shared->u.enumer.nmembs)
+            if (superset) {
+                if (dt1->shared->u.enumer.nmembs > dt2->shared->u.enumer.nmembs)
                     HGOTO_DONE(1);
             } /* end if */
             else {
-                if(dt1->shared->u.enumer.nmembs < dt2->shared->u.enumer.nmembs)
+                if (dt1->shared->u.enumer.nmembs < dt2->shared->u.enumer.nmembs)
                     HGOTO_DONE(-1);
-                if(dt1->shared->u.enumer.nmembs > dt2->shared->u.enumer.nmembs)
+                if (dt1->shared->u.enumer.nmembs > dt2->shared->u.enumer.nmembs)
                     HGOTO_DONE(1);
             } /* end else */
 
             /* Build an index for each type so the names are sorted */
-            if(NULL == (idx1 = (unsigned *)H5MM_malloc(dt1->shared->u.enumer.nmembs * sizeof(unsigned))) ||
-                    NULL == (idx2 = (unsigned *)H5MM_malloc(dt2->shared->u.enumer.nmembs * sizeof(unsigned))))
+            if (NULL == (idx1 = (unsigned *)H5MM_malloc(dt1->shared->u.enumer.nmembs * sizeof(unsigned))) ||
+                NULL == (idx2 = (unsigned *)H5MM_malloc(dt2->shared->u.enumer.nmembs * sizeof(unsigned))))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed");
-            for(u=0; u<dt1->shared->u.enumer.nmembs; u++)
+            for (u = 0; u < dt1->shared->u.enumer.nmembs; u++)
                 idx1[u] = u;
-            if(dt1->shared->u.enumer.nmembs > 1) {
+            if (dt1->shared->u.enumer.nmembs > 1) {
                 int i;
-                for (i = (int) dt1->shared->u.enumer.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) {
+                for (i = (int)dt1->shared->u.enumer.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) {
                     int j;
 
-                    for(j = 0, swapped = FALSE; j < i; j++)
-                        if(HDstrcmp(dt1->shared->u.enumer.name[idx1[j]],
-                                 dt1->shared->u.enumer.name[idx1[j+1]]) > 0) {
+                    for (j = 0, swapped = FALSE; j < i; j++)
+                        if (HDstrcmp(dt1->shared->u.enumer.name[idx1[j]],
+                                     dt1->shared->u.enumer.name[idx1[j + 1]]) > 0) {
                             unsigned tmp_idx = idx1[j];
-                            idx1[j] = idx1[j+1];
-                            idx1[j+1] = tmp_idx;
-                            swapped = TRUE;
+                            idx1[j]          = idx1[j + 1];
+                            idx1[j + 1]      = tmp_idx;
+                            swapped          = TRUE;
                         }
                 }
             }
-            for(u=0; u<dt2->shared->u.enumer.nmembs; u++)
+            for (u = 0; u < dt2->shared->u.enumer.nmembs; u++)
                 idx2[u] = u;
-            if(dt2->shared->u.enumer.nmembs > 1) {
+            if (dt2->shared->u.enumer.nmembs > 1) {
                 int i;
 
-                for(i = (int) dt2->shared->u.enumer.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) {
+                for (i = (int)dt2->shared->u.enumer.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) {
                     int j;
 
-                    for(j = 0, swapped = FALSE; j < i; j++)
-                        if(HDstrcmp(dt2->shared->u.enumer.name[idx2[j]],
-                                 dt2->shared->u.enumer.name[idx2[j+1]]) > 0) {
+                    for (j = 0, swapped = FALSE; j < i; j++)
+                        if (HDstrcmp(dt2->shared->u.enumer.name[idx2[j]],
+                                     dt2->shared->u.enumer.name[idx2[j + 1]]) > 0) {
                             unsigned tmp_idx = idx2[j];
-                            idx2[j] = idx2[j+1];
-                            idx2[j+1] = tmp_idx;
-                            swapped = TRUE;
+                            idx2[j]          = idx2[j + 1];
+                            idx2[j + 1]      = tmp_idx;
+                            swapped          = TRUE;
                         }
                 }
             }
 
 #ifdef H5T_DEBUG
             /* I don't quite trust the code above yet :-)  --RPM */
-            for(u=0; u<dt1->shared->u.enumer.nmembs-1; u++) {
-                HDassert(HDstrcmp(dt1->shared->u.enumer.name[idx1[u]],
-                        dt1->shared->u.enumer.name[idx1[u+1]]));
-                HDassert(HDstrcmp(dt2->shared->u.enumer.name[idx2[u]],
-                        dt2->shared->u.enumer.name[idx2[u+1]]));
+            for (u = 0; u < dt1->shared->u.enumer.nmembs - 1; u++) {
+                HDassert(
+                    HDstrcmp(dt1->shared->u.enumer.name[idx1[u]], dt1->shared->u.enumer.name[idx1[u + 1]]));
+                HDassert(
+                    HDstrcmp(dt2->shared->u.enumer.name[idx2[u]], dt2->shared->u.enumer.name[idx2[u + 1]]));
             }
 #endif
 
             /* Compare the members */
             base_size = dt1->shared->parent->shared->size;
-            for(u=0; u<dt1->shared->u.enumer.nmembs; u++) {
+            for (u = 0; u < dt1->shared->u.enumer.nmembs; u++) {
                 unsigned idx = 0;
 
-                if(superset) {
-                    unsigned    lt = 0, rt;        /* Final, left & right key indices */
-                    int            cmp = 1;                /* Key comparison value */
+                if (superset) {
+                    unsigned lt  = 0, rt; /* Final, left & right key indices */
+                    int      cmp = 1;     /* Key comparison value */
 
                     /* If a superset is allowed, dt2 may have more members
                      * than dt1, so binary search for matching member name in
@@ -4075,99 +4233,100 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
                      */
                     rt = dt2->shared->u.enumer.nmembs;
 
-                    while(lt < rt && cmp) {
+                    while (lt < rt && cmp) {
                         idx = (lt + rt) / 2;
 
                         /* compare */
-                        if((cmp = HDstrcmp(dt1->shared->u.enumer.name[idx1[u]],
-                                dt2->shared->u.enumer.name[idx2[idx]] ) ) < 0)
+                        if ((cmp = HDstrcmp(dt1->shared->u.enumer.name[idx1[u]],
+                                            dt2->shared->u.enumer.name[idx2[idx]])) < 0)
                             rt = idx;
                         else
-                            lt = idx+1;
+                            lt = idx + 1;
                     }
                     /* Leave, if we couldn't find match */
-                    if(cmp)
+                    if (cmp)
                         HGOTO_DONE(-1);
                 } /* end if */
                 else {
                     /* Check for exact member name match when not doing
                      * "superset" comparison
                      */
-                    tmp = HDstrcmp(dt1->shared->u.enumer.name[idx1[u]],
-                           dt2->shared->u.enumer.name[idx2[u]]);
-                    if (tmp<0) HGOTO_DONE(-1);
-                    if (tmp>0) HGOTO_DONE(1);
+                    tmp = HDstrcmp(dt1->shared->u.enumer.name[idx1[u]], dt2->shared->u.enumer.name[idx2[u]]);
+                    if (tmp < 0)
+                        HGOTO_DONE(-1);
+                    if (tmp > 0)
+                        HGOTO_DONE(1);
 
                     /* Set index value appropriately */
                     idx = u;
                 } /* end else */
 
-                tmp = HDmemcmp(dt1->shared->u.enumer.value+idx1[u]*base_size,
-                       dt2->shared->u.enumer.value+idx2[idx]*base_size,
-                       base_size);
-                if(tmp<0) HGOTO_DONE(-1);
-                if(tmp>0) HGOTO_DONE(1);
+                tmp = HDmemcmp(dt1->shared->u.enumer.value + idx1[u] * base_size,
+                               dt2->shared->u.enumer.value + idx2[idx] * base_size, base_size);
+                if (tmp < 0)
+                    HGOTO_DONE(-1);
+                if (tmp > 0)
+                    HGOTO_DONE(1);
             }
             break;
 
         case H5T_VLEN:
-            HDassert(dt1->shared->u.vlen.type>H5T_VLEN_BADTYPE && dt1->shared->u.vlen.type<H5T_VLEN_MAXTYPE);
-            HDassert(dt2->shared->u.vlen.type>H5T_VLEN_BADTYPE && dt2->shared->u.vlen.type<H5T_VLEN_MAXTYPE);
-            HDassert(dt1->shared->u.vlen.loc>=H5T_LOC_BADLOC && dt1->shared->u.vlen.loc<H5T_LOC_MAXLOC);
-            HDassert(dt2->shared->u.vlen.loc>=H5T_LOC_BADLOC && dt2->shared->u.vlen.loc<H5T_LOC_MAXLOC);
+            HDassert(dt1->shared->u.vlen.type > H5T_VLEN_BADTYPE &&
+                     dt1->shared->u.vlen.type < H5T_VLEN_MAXTYPE);
+            HDassert(dt2->shared->u.vlen.type > H5T_VLEN_BADTYPE &&
+                     dt2->shared->u.vlen.type < H5T_VLEN_MAXTYPE);
+            HDassert(dt1->shared->u.vlen.loc >= H5T_LOC_BADLOC && dt1->shared->u.vlen.loc < H5T_LOC_MAXLOC);
+            HDassert(dt2->shared->u.vlen.loc >= H5T_LOC_BADLOC && dt2->shared->u.vlen.loc < H5T_LOC_MAXLOC);
 
             /* Arbitrarily sort sequence VL datatypes before string VL datatypes */
-            if(dt1->shared->u.vlen.type==H5T_VLEN_SEQUENCE &&
-                    dt2->shared->u.vlen.type==H5T_VLEN_STRING) {
+            if (dt1->shared->u.vlen.type == H5T_VLEN_SEQUENCE &&
+                dt2->shared->u.vlen.type == H5T_VLEN_STRING) {
                 HGOTO_DONE(-1);
             }
-            else if(dt1->shared->u.vlen.type==H5T_VLEN_STRING &&
-                    dt2->shared->u.vlen.type==H5T_VLEN_SEQUENCE) {
+            else if (dt1->shared->u.vlen.type == H5T_VLEN_STRING &&
+                     dt2->shared->u.vlen.type == H5T_VLEN_SEQUENCE) {
                 HGOTO_DONE(1);
             }
             /* Arbitrarily sort VL datatypes in memory before disk */
-            if(dt1->shared->u.vlen.loc==H5T_LOC_MEMORY &&
-                    dt2->shared->u.vlen.loc==H5T_LOC_DISK) {
+            if (dt1->shared->u.vlen.loc == H5T_LOC_MEMORY && dt2->shared->u.vlen.loc == H5T_LOC_DISK) {
                 HGOTO_DONE(-1);
             }
-            else if(dt1->shared->u.vlen.loc==H5T_LOC_DISK &&
-                    dt2->shared->u.vlen.loc==H5T_LOC_MEMORY) {
+            else if (dt1->shared->u.vlen.loc == H5T_LOC_DISK && dt2->shared->u.vlen.loc == H5T_LOC_MEMORY) {
                 HGOTO_DONE(1);
             }
-            else if(dt1->shared->u.vlen.loc==H5T_LOC_BADLOC &&
-                    dt2->shared->u.vlen.loc!=H5T_LOC_BADLOC) {
+            else if (dt1->shared->u.vlen.loc == H5T_LOC_BADLOC && dt2->shared->u.vlen.loc != H5T_LOC_BADLOC) {
                 HGOTO_DONE(1);
             }
 
             /* Don't allow VL types in different files to compare as equal */
-            if(dt1->shared->u.vlen.f < dt2->shared->u.vlen.f)
+            if (dt1->shared->u.vlen.f < dt2->shared->u.vlen.f)
                 HGOTO_DONE(-1);
-            if(dt1->shared->u.vlen.f > dt2->shared->u.vlen.f)
+            if (dt1->shared->u.vlen.f > dt2->shared->u.vlen.f)
                 HGOTO_DONE(1);
             break;
 
         case H5T_OPAQUE:
-            if(dt1->shared->u.opaque.tag && dt2->shared->u.opaque.tag)
-                HGOTO_DONE(HDstrcmp(dt1->shared->u.opaque.tag,dt2->shared->u.opaque.tag));
+            if (dt1->shared->u.opaque.tag && dt2->shared->u.opaque.tag)
+                HGOTO_DONE(HDstrcmp(dt1->shared->u.opaque.tag, dt2->shared->u.opaque.tag));
             break;
 
         case H5T_ARRAY:
-            if(dt1->shared->u.array.ndims < dt2->shared->u.array.ndims)
+            if (dt1->shared->u.array.ndims < dt2->shared->u.array.ndims)
                 HGOTO_DONE(-1);
-            if(dt1->shared->u.array.ndims > dt2->shared->u.array.ndims)
+            if (dt1->shared->u.array.ndims > dt2->shared->u.array.ndims)
                 HGOTO_DONE(1);
 
-            for(u=0; u<dt1->shared->u.array.ndims; u++) {
-                if(dt1->shared->u.array.dim[u] < dt2->shared->u.array.dim[u])
+            for (u = 0; u < dt1->shared->u.array.ndims; u++) {
+                if (dt1->shared->u.array.dim[u] < dt2->shared->u.array.dim[u])
                     HGOTO_DONE(-1);
-                if(dt1->shared->u.array.dim[u] > dt2->shared->u.array.dim[u])
+                if (dt1->shared->u.array.dim[u] > dt2->shared->u.array.dim[u])
                     HGOTO_DONE(1);
             }
 
             tmp = H5T_cmp(dt1->shared->parent, dt2->shared->parent, superset);
-            if(tmp < 0)
+            if (tmp < 0)
                 HGOTO_DONE(-1);
-            if(tmp > 0)
+            if (tmp > 0)
                 HGOTO_DONE(1);
             break;
 
@@ -4183,79 +4342,95 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
             /*
              * Atomic datatypes...
              */
-            if(dt1->shared->u.atomic.order < dt2->shared->u.atomic.order) HGOTO_DONE(-1);
-            if(dt1->shared->u.atomic.order > dt2->shared->u.atomic.order) HGOTO_DONE(1);
+            if (dt1->shared->u.atomic.order < dt2->shared->u.atomic.order)
+                HGOTO_DONE(-1);
+            if (dt1->shared->u.atomic.order > dt2->shared->u.atomic.order)
+                HGOTO_DONE(1);
 
-            if(dt1->shared->u.atomic.prec < dt2->shared->u.atomic.prec) HGOTO_DONE(-1);
-            if(dt1->shared->u.atomic.prec > dt2->shared->u.atomic.prec) HGOTO_DONE(1);
+            if (dt1->shared->u.atomic.prec < dt2->shared->u.atomic.prec)
+                HGOTO_DONE(-1);
+            if (dt1->shared->u.atomic.prec > dt2->shared->u.atomic.prec)
+                HGOTO_DONE(1);
 
-            if(dt1->shared->u.atomic.offset < dt2->shared->u.atomic.offset) HGOTO_DONE(-1);
-            if(dt1->shared->u.atomic.offset > dt2->shared->u.atomic.offset) HGOTO_DONE(1);
+            if (dt1->shared->u.atomic.offset < dt2->shared->u.atomic.offset)
+                HGOTO_DONE(-1);
+            if (dt1->shared->u.atomic.offset > dt2->shared->u.atomic.offset)
+                HGOTO_DONE(1);
 
-            if(dt1->shared->u.atomic.lsb_pad < dt2->shared->u.atomic.lsb_pad) HGOTO_DONE(-1);
-            if(dt1->shared->u.atomic.lsb_pad > dt2->shared->u.atomic.lsb_pad) HGOTO_DONE(1);
+            if (dt1->shared->u.atomic.lsb_pad < dt2->shared->u.atomic.lsb_pad)
+                HGOTO_DONE(-1);
+            if (dt1->shared->u.atomic.lsb_pad > dt2->shared->u.atomic.lsb_pad)
+                HGOTO_DONE(1);
 
-            if(dt1->shared->u.atomic.msb_pad < dt2->shared->u.atomic.msb_pad) HGOTO_DONE(-1);
-            if(dt1->shared->u.atomic.msb_pad > dt2->shared->u.atomic.msb_pad) HGOTO_DONE(1);
+            if (dt1->shared->u.atomic.msb_pad < dt2->shared->u.atomic.msb_pad)
+                HGOTO_DONE(-1);
+            if (dt1->shared->u.atomic.msb_pad > dt2->shared->u.atomic.msb_pad)
+                HGOTO_DONE(1);
 
             switch (dt1->shared->type) {
                 case H5T_INTEGER:
-                    if(dt1->shared->u.atomic.u.i.sign < dt2->shared->u.atomic.u.i.sign)
+                    if (dt1->shared->u.atomic.u.i.sign < dt2->shared->u.atomic.u.i.sign)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.i.sign > dt2->shared->u.atomic.u.i.sign)
+                    if (dt1->shared->u.atomic.u.i.sign > dt2->shared->u.atomic.u.i.sign)
                         HGOTO_DONE(1);
                     break;
 
                 case H5T_FLOAT:
-                    if(dt1->shared->u.atomic.u.f.sign < dt2->shared->u.atomic.u.f.sign)
+                    if (dt1->shared->u.atomic.u.f.sign < dt2->shared->u.atomic.u.f.sign)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.f.sign > dt2->shared->u.atomic.u.f.sign)
+                    if (dt1->shared->u.atomic.u.f.sign > dt2->shared->u.atomic.u.f.sign)
                         HGOTO_DONE(1);
 
-                    if(dt1->shared->u.atomic.u.f.epos < dt2->shared->u.atomic.u.f.epos)
+                    if (dt1->shared->u.atomic.u.f.epos < dt2->shared->u.atomic.u.f.epos)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.f.epos > dt2->shared->u.atomic.u.f.epos)
+                    if (dt1->shared->u.atomic.u.f.epos > dt2->shared->u.atomic.u.f.epos)
                         HGOTO_DONE(1);
 
-                    if(dt1->shared->u.atomic.u.f.esize < dt2->shared->u.atomic.u.f.esize) HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.f.esize > dt2->shared->u.atomic.u.f.esize) HGOTO_DONE(1);
+                    if (dt1->shared->u.atomic.u.f.esize < dt2->shared->u.atomic.u.f.esize)
+                        HGOTO_DONE(-1);
+                    if (dt1->shared->u.atomic.u.f.esize > dt2->shared->u.atomic.u.f.esize)
+                        HGOTO_DONE(1);
 
-                    if(dt1->shared->u.atomic.u.f.ebias < dt2->shared->u.atomic.u.f.ebias) HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.f.ebias > dt2->shared->u.atomic.u.f.ebias) HGOTO_DONE(1);
+                    if (dt1->shared->u.atomic.u.f.ebias < dt2->shared->u.atomic.u.f.ebias)
+                        HGOTO_DONE(-1);
+                    if (dt1->shared->u.atomic.u.f.ebias > dt2->shared->u.atomic.u.f.ebias)
+                        HGOTO_DONE(1);
 
-                    if(dt1->shared->u.atomic.u.f.mpos < dt2->shared->u.atomic.u.f.mpos)
+                    if (dt1->shared->u.atomic.u.f.mpos < dt2->shared->u.atomic.u.f.mpos)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.f.mpos > dt2->shared->u.atomic.u.f.mpos)
+                    if (dt1->shared->u.atomic.u.f.mpos > dt2->shared->u.atomic.u.f.mpos)
                         HGOTO_DONE(1);
 
-                    if(dt1->shared->u.atomic.u.f.msize < dt2->shared->u.atomic.u.f.msize) HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.f.msize > dt2->shared->u.atomic.u.f.msize) HGOTO_DONE(1);
+                    if (dt1->shared->u.atomic.u.f.msize < dt2->shared->u.atomic.u.f.msize)
+                        HGOTO_DONE(-1);
+                    if (dt1->shared->u.atomic.u.f.msize > dt2->shared->u.atomic.u.f.msize)
+                        HGOTO_DONE(1);
 
-                    if(dt1->shared->u.atomic.u.f.norm < dt2->shared->u.atomic.u.f.norm)
+                    if (dt1->shared->u.atomic.u.f.norm < dt2->shared->u.atomic.u.f.norm)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.f.norm > dt2->shared->u.atomic.u.f.norm)
+                    if (dt1->shared->u.atomic.u.f.norm > dt2->shared->u.atomic.u.f.norm)
                         HGOTO_DONE(1);
 
-                    if(dt1->shared->u.atomic.u.f.pad < dt2->shared->u.atomic.u.f.pad)
+                    if (dt1->shared->u.atomic.u.f.pad < dt2->shared->u.atomic.u.f.pad)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.f.pad > dt2->shared->u.atomic.u.f.pad)
+                    if (dt1->shared->u.atomic.u.f.pad > dt2->shared->u.atomic.u.f.pad)
                         HGOTO_DONE(1);
 
                     break;
 
-                case H5T_TIME:  /* order and precision are checked above */
+                case H5T_TIME: /* order and precision are checked above */
                     /*void */
                     break;
 
                 case H5T_STRING:
-                    if(dt1->shared->u.atomic.u.s.cset < dt2->shared->u.atomic.u.s.cset)
+                    if (dt1->shared->u.atomic.u.s.cset < dt2->shared->u.atomic.u.s.cset)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.s.cset > dt2->shared->u.atomic.u.s.cset)
+                    if (dt1->shared->u.atomic.u.s.cset > dt2->shared->u.atomic.u.s.cset)
                         HGOTO_DONE(1);
 
-                    if(dt1->shared->u.atomic.u.s.pad < dt2->shared->u.atomic.u.s.pad)
+                    if (dt1->shared->u.atomic.u.s.pad < dt2->shared->u.atomic.u.s.pad)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.s.pad > dt2->shared->u.atomic.u.s.pad)
+                    if (dt1->shared->u.atomic.u.s.pad > dt2->shared->u.atomic.u.s.pad)
                         HGOTO_DONE(1);
 
                     break;
@@ -4265,21 +4440,21 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
                     break;
 
                 case H5T_REFERENCE:
-                    if(dt1->shared->u.atomic.u.r.rtype < dt2->shared->u.atomic.u.r.rtype)
+                    if (dt1->shared->u.atomic.u.r.rtype < dt2->shared->u.atomic.u.r.rtype)
                         HGOTO_DONE(-1);
-                    if(dt1->shared->u.atomic.u.r.rtype > dt2->shared->u.atomic.u.r.rtype)
+                    if (dt1->shared->u.atomic.u.r.rtype > dt2->shared->u.atomic.u.r.rtype)
                         HGOTO_DONE(1);
 
-                    switch(dt1->shared->u.atomic.u.r.rtype) {
+                    switch (dt1->shared->u.atomic.u.r.rtype) {
                         case H5R_OBJECT:
-                            if(dt1->shared->u.atomic.u.r.loc < dt2->shared->u.atomic.u.r.loc)
+                            if (dt1->shared->u.atomic.u.r.loc < dt2->shared->u.atomic.u.r.loc)
                                 HGOTO_DONE(-1);
-                            if(dt1->shared->u.atomic.u.r.loc > dt2->shared->u.atomic.u.r.loc)
+                            if (dt1->shared->u.atomic.u.r.loc > dt2->shared->u.atomic.u.r.loc)
                                 HGOTO_DONE(1);
                             break;
 
                         case H5R_DATASET_REGION:
-                    /* Does this need more to distinguish it? -QAK 11/30/98 */
+                            /* Does this need more to distinguish it? -QAK 11/30/98 */
                             /*void */
                             break;
 
@@ -4304,19 +4479,18 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
                     HDassert("not implemented yet" && 0);
                     break;
             }
-        break;
+            break;
     } /* end switch */
 
 done:
-    if(NULL != idx1)
+    if (NULL != idx1)
         H5MM_xfree(idx1);
-    if(NULL != idx2)
+    if (NULL != idx2)
         H5MM_xfree(idx2);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_path_find
  *
@@ -4355,19 +4529,19 @@ done:
  *-------------------------------------------------------------------------
  */
 H5T_path_t *
-H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
-    H5T_conv_t func, hid_t dxpl_id, hbool_t is_api)
+H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_t func, hid_t dxpl_id,
+              hbool_t is_api)
 {
-    int           lt, rt;                      /* left and right edges */
-    int           md;                          /* middle */
-    int           cmp;                         /* comparison result  */
-    int           old_npaths;                  /* Previous number of paths in table */
-    H5T_path_t    *table = NULL;               /* path existing in the table */
-    H5T_path_t    *path = NULL;                /* new path */
-    hid_t         src_id = -1, dst_id = -1;    /* src and dst type identifiers */
-    int           i;                           /* counter */
-    int           nprint = 0;                  /* lines of output printed */
-    H5T_path_t    *ret_value = NULL;           /* Return value */
+    int         lt, rt;                   /* left and right edges */
+    int         md;                       /* middle */
+    int         cmp;                      /* comparison result  */
+    int         old_npaths;               /* Previous number of paths in table */
+    H5T_path_t *table  = NULL;            /* path existing in the table */
+    H5T_path_t *path   = NULL;            /* new path */
+    hid_t       src_id = -1, dst_id = -1; /* src and dst type identifiers */
+    int         i;                        /* counter */
+    int         nprint    = 0;            /* lines of output printed */
+    H5T_path_t *ret_value = NULL;         /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -4378,24 +4552,26 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
     /*
      * Make sure the first entry in the table is the no-op conversion path.
      */
-    if(0 == H5T_g.npaths) {
-        if(NULL == (H5T_g.path = (H5T_path_t **)H5MM_malloc(128 * sizeof(H5T_path_t *))))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for type conversion path table")
+    if (0 == H5T_g.npaths) {
+        if (NULL == (H5T_g.path = (H5T_path_t **)H5MM_malloc(128 * sizeof(H5T_path_t *))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                        "memory allocation failed for type conversion path table")
         H5T_g.apaths = 128;
-        if(NULL == (H5T_g.path[0] = H5FL_CALLOC(H5T_path_t)))
+        if (NULL == (H5T_g.path[0] = H5FL_CALLOC(H5T_path_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for no-op conversion path")
         HDsnprintf(H5T_g.path[0]->name, sizeof(H5T_g.path[0]->name), "no-op");
-        H5T_g.path[0]->func = H5T__conv_noop;
+        H5T_g.path[0]->func          = H5T__conv_noop;
         H5T_g.path[0]->cdata.command = H5T_CONV_INIT;
-        if(H5T__conv_noop((hid_t)FAIL, (hid_t)FAIL, &(H5T_g.path[0]->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
+        if (H5T__conv_noop((hid_t)FAIL, (hid_t)FAIL, &(H5T_g.path[0]->cdata), (size_t)0, (size_t)0, (size_t)0,
+                           NULL, NULL, dxpl_id) < 0) {
 #ifdef H5T_DEBUG
-            if(H5DEBUG(T))
-            HDfprintf(H5DEBUG(T), "H5T: unable to initialize no-op conversion function (ignored)\n");
+            if (H5DEBUG(T))
+                HDfprintf(H5DEBUG(T), "H5T: unable to initialize no-op conversion function (ignored)\n");
 #endif
             H5E_clear_stack(NULL); /*ignore the error*/
-        } /* end if */
+        }                          /* end if */
         H5T_g.path[0]->is_noop = TRUE;
-        H5T_g.npaths = 1;
+        H5T_g.npaths           = 1;
     } /* end if */
 
     /*
@@ -4407,30 +4583,31 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      * Only allow the no-op conversion to occur if no "force conversion" flags
      * are set
      */
-    if(src->shared->force_conv == FALSE && dst->shared->force_conv == FALSE && 0 == H5T_cmp(src, dst, TRUE)) {
+    if (src->shared->force_conv == FALSE && dst->shared->force_conv == FALSE &&
+        0 == H5T_cmp(src, dst, TRUE)) {
         table = H5T_g.path[0];
-        cmp = 0;
-        md = 0;
+        cmp   = 0;
+        md    = 0;
     } /* end if */
     else {
         lt = md = 1;
-        rt = H5T_g.npaths;
-        cmp = -1;
+        rt      = H5T_g.npaths;
+        cmp     = -1;
 
-        while(cmp && lt < rt) {
+        while (cmp && lt < rt) {
             md = (lt + rt) / 2;
             HDassert(H5T_g.path[md]);
             cmp = H5T_cmp(src, H5T_g.path[md]->src, FALSE);
-            if(0 == cmp)
+            if (0 == cmp)
                 cmp = H5T_cmp(dst, H5T_g.path[md]->dst, FALSE);
-            if(cmp < 0)
+            if (cmp < 0)
                 rt = md;
-            else if(cmp > 0)
+            else if (cmp > 0)
                 lt = md + 1;
             else
                 table = H5T_g.path[md];
         } /* end while */
-    } /* end else */
+    }     /* end else */
 
     /* Keep a record of the number of paths in the table, in case one of the
      * initialization calls below (hard or soft) causes more entries to be
@@ -4444,18 +4621,18 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      * specifying a new hard conversion and the path is a soft conversion, then
      * create a new path and add the new function to the path.
      */
-    if(!table || (table && func && is_api) || (table && !table->is_hard && func && !is_api)) {
-        if(NULL == (path = H5FL_CALLOC(H5T_path_t)))
+    if (!table || (table && func && is_api) || (table && !table->is_hard && func && !is_api)) {
+        if (NULL == (path = H5FL_CALLOC(H5T_path_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for type conversion path")
-        if(name && *name) {
+        if (name && *name) {
             HDstrncpy(path->name, name, (size_t)H5T_NAMELEN);
             path->name[H5T_NAMELEN - 1] = '\0';
         } /* end if */
         else
             HDsnprintf(path->name, sizeof(path->name), "NONAME");
-        if(NULL == (path->src = H5T_copy(src, H5T_COPY_ALL)))
+        if (NULL == (path->src = H5T_copy(src, H5T_COPY_ALL)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy datatype for conversion path")
-        if(NULL == (path->dst = H5T_copy(dst, H5T_COPY_ALL)))
+        if (NULL == (path->dst = H5T_copy(dst, H5T_COPY_ALL)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy datatype for conversion path")
     } /* end if */
     else
@@ -4467,23 +4644,25 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      * the existing path is a soft function, then add the new conversion to the path
      * and initialize its conversion data.
      */
-    if(func && (!table || (table && is_api) || (table && !table->is_hard && !is_api))) {
+    if (func && (!table || (table && is_api) || (table && !table->is_hard && !is_api))) {
         HDassert(path != table);
         HDassert(NULL == path->func);
-        if(path->src && (src_id = H5I_register(H5I_DATATYPE, H5T_copy(path->src, H5T_COPY_ALL), FALSE)) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register source conversion type for query")
-        if(path->dst && (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(path->dst, H5T_COPY_ALL), FALSE)) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register destination conversion type for query")
+        if (path->src && (src_id = H5I_register(H5I_DATATYPE, H5T_copy(path->src, H5T_COPY_ALL), FALSE)) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
+                        "unable to register source conversion type for query")
+        if (path->dst && (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(path->dst, H5T_COPY_ALL), FALSE)) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
+                        "unable to register destination conversion type for query")
         path->cdata.command = H5T_CONV_INIT;
-        if((func)(src_id, dst_id, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0)
+        if ((func)(src_id, dst_id, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to initialize conversion function")
-        if(src_id >= 0)
+        if (src_id >= 0)
             H5I_dec_ref(src_id);
-        if(dst_id >= 0)
+        if (dst_id >= 0)
             H5I_dec_ref(dst_id);
         src_id = dst_id = -1;
-        path->func = func;
-        path->is_hard = TRUE;
+        path->func      = func;
+        path->is_hard   = TRUE;
     } /* end if */
 
     /*
@@ -4493,121 +4672,125 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      * for the no-op conversion path.
      */
     HDassert(path->func || (src && dst));
-    for(i = H5T_g.nsoft - 1; i >= 0 && !path->func; --i) {
-        if(src->shared->type != H5T_g.soft[i].src || dst->shared->type != H5T_g.soft[i].dst)
+    for (i = H5T_g.nsoft - 1; i >= 0 && !path->func; --i) {
+        if (src->shared->type != H5T_g.soft[i].src || dst->shared->type != H5T_g.soft[i].dst)
             continue;
-        if((src_id = H5I_register(H5I_DATATYPE, H5T_copy(path->src, H5T_COPY_ALL), FALSE)) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register src conversion type for query")
-           if((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(path->dst, H5T_COPY_ALL), FALSE)) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register dst conversion type for query")
+        if ((src_id = H5I_register(H5I_DATATYPE, H5T_copy(path->src, H5T_COPY_ALL), FALSE)) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
+                        "unable to register src conversion type for query")
+        if ((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(path->dst, H5T_COPY_ALL), FALSE)) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
+                        "unable to register dst conversion type for query")
         path->cdata.command = H5T_CONV_INIT;
-        if((H5T_g.soft[i].func)(src_id, dst_id, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
+        if ((H5T_g.soft[i].func)(src_id, dst_id, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL,
+                                 dxpl_id) < 0) {
             HDmemset(&(path->cdata), 0, sizeof(H5T_cdata_t));
             H5E_clear_stack(H5E_DEFAULT); /*ignore the error*/
-        } /* end if */
+        }                                 /* end if */
         else {
             HDstrncpy(path->name, H5T_g.soft[i].name, (size_t)H5T_NAMELEN);
             path->name[H5T_NAMELEN - 1] = '\0';
-            path->func = H5T_g.soft[i].func;
-            path->is_hard = FALSE;
+            path->func                  = H5T_g.soft[i].func;
+            path->is_hard               = FALSE;
         } /* end else */
         H5I_dec_ref(src_id);
         H5I_dec_ref(dst_id);
         src_id = dst_id = -1;
     } /* end for */
-    if(!path->func)
+    if (!path->func)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "no appropriate function for conversion path")
 
     /* Check if paths were inserted into the table through a recursive call
      * and re-compute the correct location for this path if so. - QAK, 1/26/02
      */
-    if(old_npaths != H5T_g.npaths) {
+    if (old_npaths != H5T_g.npaths) {
         lt = md = 1;
-        rt = H5T_g.npaths;
-        cmp = -1;
+        rt      = H5T_g.npaths;
+        cmp     = -1;
 
-        while(cmp && lt < rt) {
+        while (cmp && lt < rt) {
             md = (lt + rt) / 2;
             HDassert(H5T_g.path[md]);
             cmp = H5T_cmp(src, H5T_g.path[md]->src, FALSE);
-            if(0 == cmp)
+            if (0 == cmp)
                 cmp = H5T_cmp(dst, H5T_g.path[md]->dst, FALSE);
-            if(cmp < 0)
+            if (cmp < 0)
                 rt = md;
-            else if(cmp > 0)
+            else if (cmp > 0)
                 lt = md + 1;
             else
                 table = H5T_g.path[md];
         } /* end while */
-    } /* end if */
+    }     /* end if */
 
     /* Replace an existing table entry or add a new entry */
-    if(table && path != table) {
+    if (table && path != table) {
         HDassert(table == H5T_g.path[md]);
-        H5T__print_stats(table, &nprint/*in,out*/);
+        H5T__print_stats(table, &nprint /*in,out*/);
         table->cdata.command = H5T_CONV_FREE;
-        if((table->func)((hid_t)FAIL, (hid_t)FAIL, &(table->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
+        if ((table->func)((hid_t)FAIL, (hid_t)FAIL, &(table->cdata), (size_t)0, (size_t)0, (size_t)0, NULL,
+                          NULL, dxpl_id) < 0) {
 #ifdef H5T_DEBUG
-            if(H5DEBUG(T)) {
-                HDfprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx free "
-                        "failed for %s (ignored)\n",
-                        (unsigned long)(path->func), path->name);
+            if (H5DEBUG(T)) {
+                HDfprintf(H5DEBUG(T),
+                          "H5T: conversion function 0x%08lx free "
+                          "failed for %s (ignored)\n",
+                          (unsigned long)(path->func), path->name);
             } /* end if */
 #endif
             H5E_clear_stack(NULL); /*ignore the failure*/
-        } /* end if */
-        if(table->src)
+        }                          /* end if */
+        if (table->src)
             H5T_close(table->src);
-        if(table->dst)
+        if (table->dst)
             H5T_close(table->dst);
-        table = H5FL_FREE(H5T_path_t, table);
-        table = path;
+        table          = H5FL_FREE(H5T_path_t, table);
+        table          = path;
         H5T_g.path[md] = path;
     }
-    else if(path != table) {
+    else if (path != table) {
         HDassert(cmp);
-        if((size_t)H5T_g.npaths >= H5T_g.apaths) {
-            size_t na = MAX(128, 2 * H5T_g.apaths);
+        if ((size_t)H5T_g.npaths >= H5T_g.apaths) {
+            size_t       na = MAX(128, 2 * H5T_g.apaths);
             H5T_path_t **x;
 
-            if(NULL == (x = (H5T_path_t **)H5MM_realloc(H5T_g.path, na * sizeof(H5T_path_t*))))
+            if (NULL == (x = (H5T_path_t **)H5MM_realloc(H5T_g.path, na * sizeof(H5T_path_t *))))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
             H5T_g.apaths = na;
-            H5T_g.path = x;
+            H5T_g.path   = x;
         } /* end if */
-        if(cmp > 0)
+        if (cmp > 0)
             md++;
-        HDmemmove(H5T_g.path + md + 1, H5T_g.path + md, (size_t) (H5T_g.npaths - md) * sizeof(H5T_path_t*));
+        HDmemmove(H5T_g.path + md + 1, H5T_g.path + md, (size_t)(H5T_g.npaths - md) * sizeof(H5T_path_t *));
         H5T_g.npaths++;
         H5T_g.path[md] = path;
-        table = path;
+        table          = path;
     } /* end else-if */
 
     /* Set the flag to indicate both source and destination types are compound types
      * for the optimization of data reading (in H5Dio.c). */
-    if(H5T_COMPOUND == H5T_get_class(src, TRUE) && H5T_COMPOUND == H5T_get_class(dst, TRUE))
+    if (H5T_COMPOUND == H5T_get_class(src, TRUE) && H5T_COMPOUND == H5T_get_class(dst, TRUE))
         path->are_compounds = TRUE;
 
     /* Set return value */
     ret_value = path;
 
 done:
-    if(!ret_value && path && path != table) {
-        if(path->src)
+    if (!ret_value && path && path != table) {
+        if (path->src)
             H5T_close(path->src);
-        if(path->dst)
+        if (path->dst)
             H5T_close(path->dst);
         path = H5FL_FREE(H5T_path_t, path);
     } /* end if */
-    if(src_id >= 0)
+    if (src_id >= 0)
         H5I_dec_ref(src_id);
-    if(dst_id >= 0)
+    if (dst_id >= 0)
         H5I_dec_ref(dst_id);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_path_find() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_path_noop
  *
@@ -4629,10 +4812,9 @@ H5T_path_noop(const H5T_path_t *p)
 
     HDassert(p);
 
-    FUNC_LEAVE_NOAPI(p->is_noop || (p->is_hard && 0==H5T_cmp(p->src, p->dst, FALSE)))
+    FUNC_LEAVE_NOAPI(p->is_noop || (p->is_hard && 0 == H5T_cmp(p->src, p->dst, FALSE)))
 } /* end H5T_path_noop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_path_compound_subset
  *
@@ -4670,13 +4852,12 @@ H5T_path_compound_subset(const H5T_path_t *p)
 
     HDassert(p);
 
-    if(p->are_compounds)
+    if (p->are_compounds)
         ret_value = H5T__conv_struct_subset(&(p->cdata));
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_path_compound_subset */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_path_bkg
  *
@@ -4698,7 +4879,6 @@ H5T_path_bkg(const H5T_path_t *p)
     FUNC_LEAVE_NOAPI(p->cdata.need_bkg)
 } /* end H5T_path_bkg() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_compiler_conv
  *
@@ -4717,13 +4897,13 @@ H5T_path_bkg(const H5T_path_t *p)
 static htri_t
 H5T_compiler_conv(H5T_t *src, H5T_t *dst)
 {
-    H5T_path_t    *path;
-    htri_t    ret_value = FAIL;       /* Return value */
+    H5T_path_t *path;
+    htri_t      ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Find it */
-    if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
+    if (NULL == (path = H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "conversion function not found")
 
     ret_value = (htri_t)path->is_hard;
@@ -4732,7 +4912,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_convert
  *
@@ -4775,23 +4954,23 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t nelmts,
-        size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
-            hid_t dset_xfer_plist)
+H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t nelmts, size_t buf_stride,
+            size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist)
 {
 #ifdef H5T_DEBUG
-    H5_timer_t        timer;
+    H5_timer_t timer;
 #endif
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
 #ifdef H5T_DEBUG
-    if (H5DEBUG(T)) H5_timer_begin(&timer);
+    if (H5DEBUG(T))
+        H5_timer_begin(&timer);
 #endif
     tpath->cdata.command = H5T_CONV_CONV;
-    if ((tpath->func)(src_id, dst_id, &(tpath->cdata), nelmts, buf_stride,
-                      bkg_stride, buf, bkg, dset_xfer_plist)<0)
+    if ((tpath->func)(src_id, dst_id, &(tpath->cdata), nelmts, buf_stride, bkg_stride, buf, bkg,
+                      dset_xfer_plist) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "data type conversion failed");
 #ifdef H5T_DEBUG
     if (H5DEBUG(T)) {
@@ -4805,7 +4984,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_oloc
  *
@@ -4828,7 +5006,7 @@ H5T_oloc(H5T_t *dt)
 
     HDassert(dt);
 
-    switch(dt->shared->state) {
+    switch (dt->shared->state) {
         case H5T_STATE_TRANSIENT:
         case H5T_STATE_RDONLY:
         case H5T_STATE_IMMUTABLE:
@@ -4846,7 +5024,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_oloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_nameof
  *
@@ -4869,7 +5046,7 @@ H5T_nameof(H5T_t *dt)
 
     HDassert(dt);
 
-    switch(dt->shared->state) {
+    switch (dt->shared->state) {
         case H5T_STATE_TRANSIENT:
         case H5T_STATE_RDONLY:
         case H5T_STATE_IMMUTABLE:
@@ -4886,7 +5063,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_nameof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_is_immutable
  *
@@ -4909,14 +5085,13 @@ H5T_is_immutable(const H5T_t *dt)
 
     HDassert(dt);
 
-    if(dt->shared->state == H5T_STATE_IMMUTABLE)
+    if (dt->shared->state == H5T_STATE_IMMUTABLE)
         ret_value = TRUE;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_is_named
  *
@@ -4939,7 +5114,7 @@ H5T_is_named(const H5T_t *dt)
 
     HDassert(dt);
 
-    if(dt->shared->state == H5T_STATE_OPEN || dt->shared->state == H5T_STATE_NAMED)
+    if (dt->shared->state == H5T_STATE_OPEN || dt->shared->state == H5T_STATE_NAMED)
         ret_value = TRUE;
 
 done:
@@ -4966,20 +5141,20 @@ done:
 herr_t
 H5T_convert_committed_datatype(H5T_t *dt, H5F_t *f)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(dt);
     HDassert(f);
 
-    if(H5T_is_named(dt) && (dt->sh_loc.file != f)) {
-       HDassert(dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED);
+    if (H5T_is_named(dt) && (dt->sh_loc.file != f)) {
+        HDassert(dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED);
 
         H5O_msg_reset_share(H5O_DTYPE_ID, dt);
-        if(H5O_loc_free(&dt->oloc) < 0)
+        if (H5O_loc_free(&dt->oloc) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRESET, FAIL, "unable to initialize location")
-        if(H5G_name_free(&dt->path) < 0)
+        if (H5G_name_free(&dt->path) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to reset path")
 
         dt->shared->state = H5T_STATE_TRANSIENT;
@@ -4987,9 +5162,8 @@ H5T_convert_committed_datatype(H5T_t *dt, H5F_t *f)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_convert_committed_datatype() */
+} /* end H5T_convert_committed_datatype() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5T_get_ref_type
  *
@@ -5011,14 +5185,13 @@ H5T_get_ref_type(const H5T_t *dt)
 
     HDassert(dt);
 
-    if(dt->shared->type==H5T_REFERENCE)
-        ret_value=dt->shared->u.atomic.u.r.rtype;
+    if (dt->shared->type == H5T_REFERENCE)
+        ret_value = dt->shared->u.atomic.u.r.rtype;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_get_ref_type() */
+} /* end H5T_get_ref_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_is_sensible
  *
@@ -5036,27 +5209,27 @@ done:
 htri_t
 H5T_is_sensible(const H5T_t *dt)
 {
-    htri_t    ret_value = FAIL;       /* Return value */
+    htri_t ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(dt);
 
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_COMPOUND:
             /* Only allow compound datatypes with at least one member to be stored on disk */
-            if(dt->shared->u.compnd.nmembs > 0)
-                ret_value=TRUE;
+            if (dt->shared->u.compnd.nmembs > 0)
+                ret_value = TRUE;
             else
-                ret_value=FALSE;
+                ret_value = FALSE;
             break;
 
         case H5T_ENUM:
             /* Only allow enum datatypes with at least one member to be stored on disk */
-            if(dt->shared->u.enumer.nmembs > 0)
-                ret_value=TRUE;
+            if (dt->shared->u.enumer.nmembs > 0)
+                ret_value = TRUE;
             else
-                ret_value=FALSE;
+                ret_value = FALSE;
             break;
 
         case H5T_NO_CLASS:
@@ -5072,7 +5245,7 @@ H5T_is_sensible(const H5T_t *dt)
         case H5T_NCLASSES:
         default:
             /* Assume all other datatype are sensible to store on disk */
-            ret_value=TRUE;
+            ret_value = TRUE;
             break;
     } /* end switch */
 
@@ -5080,7 +5253,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5T_set_loc
@@ -5105,127 +5277,132 @@ done:
 htri_t
 H5T_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc)
 {
-    htri_t      changed;         /* Whether H5T_set_loc changed the type (even if the size didn't change) */
-    htri_t      ret_value = 0;   /* Indicate that success, but no location change */
-    unsigned    i;               /* Local index variable */
-    size_t      old_size;        /* Previous size of a field */
+    htri_t   changed;       /* Whether H5T_set_loc changed the type (even if the size didn't change) */
+    htri_t   ret_value = 0; /* Indicate that success, but no location change */
+    unsigned i;             /* Local index variable */
+    size_t   old_size;      /* Previous size of a field */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(dt);
-    HDassert(loc>=H5T_LOC_BADLOC && loc<H5T_LOC_MAXLOC);
+    HDassert(loc >= H5T_LOC_BADLOC && loc < H5T_LOC_MAXLOC);
 
     /* Datatypes can't change in size if the force_conv flag is not set */
-    if(dt->shared->force_conv) {
+    if (dt->shared->force_conv) {
         /* Check the datatype of this element */
-        switch(dt->shared->type) {
-            case H5T_ARRAY:  /* Recurse on VL, compound and array base element type */
+        switch (dt->shared->type) {
+            case H5T_ARRAY: /* Recurse on VL, compound and array base element type */
                 /* Recurse if it's VL, compound, enum or array */
                 /* (If the force_conv flag is _not_ set, the type cannot change in size, so don't recurse) */
-                if(dt->shared->parent->shared->force_conv && H5T_IS_COMPLEX(dt->shared->parent->shared->type)) {
+                if (dt->shared->parent->shared->force_conv &&
+                    H5T_IS_COMPLEX(dt->shared->parent->shared->type)) {
                     /* Keep the old base element size for later */
-                    old_size=dt->shared->parent->shared->size;
+                    old_size = dt->shared->parent->shared->size;
 
                     /* Mark the VL, compound or array type */
-                    if((changed=H5T_set_loc(dt->shared->parent,f,loc))<0)
+                    if ((changed = H5T_set_loc(dt->shared->parent, f, loc)) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "Unable to set VL location");
-                    if(changed>0)
-                        ret_value=changed;
+                    if (changed > 0)
+                        ret_value = changed;
 
                     /* Check if the field changed size */
-                    if(old_size != dt->shared->parent->shared->size) {
+                    if (old_size != dt->shared->parent->shared->size) {
                         /* Adjust the size of the array */
-                        dt->shared->size = dt->shared->u.array.nelem*dt->shared->parent->shared->size;
+                        dt->shared->size = dt->shared->u.array.nelem * dt->shared->parent->shared->size;
                     } /* end if */
-                } /* end if */
+                }     /* end if */
                 break;
 
-            case H5T_COMPOUND:  /* Check each field and recurse on VL, compound and array type */
-                {
-                    ssize_t accum_change = 0; /* Amount of change in the offset of the fields */
+            case H5T_COMPOUND: /* Check each field and recurse on VL, compound and array type */
+            {
+                ssize_t accum_change = 0; /* Amount of change in the offset of the fields */
 
-                    /* Sort the fields based on offsets */
-                    H5T__sort_value(dt, NULL);
+                /* Sort the fields based on offsets */
+                H5T__sort_value(dt, NULL);
 
-                    for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-                        H5T_t *memb_type;   /* Member's datatype pointer */
+                for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+                    H5T_t *memb_type; /* Member's datatype pointer */
 
-                        /* Range check against compound member's offset */
-                        if ((accum_change < 0) && ((ssize_t) dt->shared->u.compnd.memb[i].offset < accum_change))
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "invalid field size in datatype");
+                    /* Range check against compound member's offset */
+                    if ((accum_change < 0) && ((ssize_t)dt->shared->u.compnd.memb[i].offset < accum_change))
+                        HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "invalid field size in datatype");
 
-                        /* Apply the accumulated size change to the offset of the field */
-                        dt->shared->u.compnd.memb[i].offset += (size_t) accum_change;
+                    /* Apply the accumulated size change to the offset of the field */
+                    dt->shared->u.compnd.memb[i].offset += (size_t)accum_change;
 
-                        /* Set the member type pointer (for convenience) */
-                        memb_type = dt->shared->u.compnd.memb[i].type;
+                    /* Set the member type pointer (for convenience) */
+                    memb_type = dt->shared->u.compnd.memb[i].type;
 
-                        /* Recurse if it's VL, compound, enum or array */
-                        /* (If the force_conv flag is _not_ set, the type cannot change in size, so don't recurse) */
-                        if(memb_type->shared->force_conv && H5T_IS_COMPLEX(memb_type->shared->type)) {
-                            /* Keep the old field size for later */
-                            old_size = memb_type->shared->size;
+                    /* Recurse if it's VL, compound, enum or array */
+                    /* (If the force_conv flag is _not_ set, the type cannot change in size, so don't recurse)
+                     */
+                    if (memb_type->shared->force_conv && H5T_IS_COMPLEX(memb_type->shared->type)) {
+                        /* Keep the old field size for later */
+                        old_size = memb_type->shared->size;
 
-                            /* Mark the VL, compound, enum or array type */
-                            if((changed = H5T_set_loc(memb_type,f,loc)) < 0)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "Unable to set VL location");
-                            if(changed > 0)
-                                ret_value = changed;
+                        /* Mark the VL, compound, enum or array type */
+                        if ((changed = H5T_set_loc(memb_type, f, loc)) < 0)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "Unable to set VL location");
+                        if (changed > 0)
+                            ret_value = changed;
 
-                            /* Check if the field changed size */
-                            if(old_size != memb_type->shared->size) {
+                        /* Check if the field changed size */
+                        if (old_size != memb_type->shared->size) {
 
-                                /* Fail if the old_size is zero */
-                                if (0 == old_size)
-                                    HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "old_size of zero would cause division by zero");
+                            /* Fail if the old_size is zero */
+                            if (0 == old_size)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL,
+                                            "old_size of zero would cause division by zero");
 
-                                /* Adjust the size of the member */
-                                dt->shared->u.compnd.memb[i].size = (dt->shared->u.compnd.memb[i].size*memb_type->shared->size)/old_size;
+                            /* Adjust the size of the member */
+                            dt->shared->u.compnd.memb[i].size =
+                                (dt->shared->u.compnd.memb[i].size * memb_type->shared->size) / old_size;
 
-                                /* Add that change to the accumulated size change */
-                                accum_change += (ssize_t) (memb_type->shared->size - old_size);
-                            } /* end if */
+                            /* Add that change to the accumulated size change */
+                            accum_change += (ssize_t)(memb_type->shared->size - old_size);
                         } /* end if */
-                    } /* end for */
+                    }     /* end if */
+                }         /* end for */
 
-                    /* Range check against datatype size */
-                    if ((accum_change < 0) && ((ssize_t) dt->shared->size < accum_change))
-                        HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "invalid field size in datatype");
+                /* Range check against datatype size */
+                if ((accum_change < 0) && ((ssize_t)dt->shared->size < accum_change))
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "invalid field size in datatype");
 
-                    /* Apply the accumulated size change to the datatype */
-                    dt->shared->size += (size_t) accum_change;
-                }
-                break;
+                /* Apply the accumulated size change to the datatype */
+                dt->shared->size += (size_t)accum_change;
+            } break;
 
-            case H5T_VLEN: /* Recurse on the VL information if it's VL, compound or array, then free VL sequence */
+            case H5T_VLEN: /* Recurse on the VL information if it's VL, compound or array, then free VL
+                              sequence */
                 /* Recurse if it's VL, compound, enum or array */
                 /* (If the force_conv flag is _not_ set, the type cannot change in size, so don't recurse) */
-                if(dt->shared->parent->shared->force_conv && H5T_IS_COMPLEX(dt->shared->parent->shared->type)) {
-                    if((changed = H5T_set_loc(dt->shared->parent,f,loc)) < 0)
+                if (dt->shared->parent->shared->force_conv &&
+                    H5T_IS_COMPLEX(dt->shared->parent->shared->type)) {
+                    if ((changed = H5T_set_loc(dt->shared->parent, f, loc)) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "Unable to set VL location");
-                    if(changed > 0)
+                    if (changed > 0)
                         ret_value = changed;
                 } /* end if */
 
                 /* Mark this VL sequence */
-                if((changed = H5T__vlen_set_loc(dt, f, loc)) < 0)
+                if ((changed = H5T__vlen_set_loc(dt, f, loc)) < 0)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "Unable to set VL location");
-                if(changed > 0)
+                if (changed > 0)
                     ret_value = changed;
                 break;
 
             case H5T_REFERENCE:
                 /* Only need to change location of object references */
-                if(dt->shared->u.atomic.u.r.rtype == H5R_OBJECT) {
+                if (dt->shared->u.atomic.u.r.rtype == H5R_OBJECT) {
                     /* Mark this reference */
-                    if(loc != dt->shared->u.atomic.u.r.loc) {
+                    if (loc != dt->shared->u.atomic.u.r.loc) {
                         /* Set the location */
                         dt->shared->u.atomic.u.r.loc = loc;
 
                         /* Indicate that the location changed */
                         ret_value = TRUE;
                     } /* end if */
-                } /* end if */
+                }     /* end if */
                 break;
 
             case H5T_NO_CLASS:
@@ -5240,13 +5417,12 @@ H5T_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc)
             default:
                 break;
         } /* end switch */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_set_loc() */
+} /* end H5T_set_loc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_is_relocatable
  *
@@ -5278,14 +5454,13 @@ H5T_is_relocatable(const H5T_t *dt)
     HDassert(dt);
 
     /* VL and reference datatypes are relocatable */
-    if(H5T_detect_class(dt, H5T_VLEN, FALSE) || H5T_detect_class(dt, H5T_REFERENCE, FALSE))
+    if (H5T_detect_class(dt, H5T_VLEN, FALSE) || H5T_detect_class(dt, H5T_REFERENCE, FALSE))
         ret_value = TRUE;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_is_relocatable() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_upgrade_version_cb
  *
@@ -5313,17 +5488,17 @@ H5T_upgrade_version_cb(H5T_t *dt, void *op_value)
     HDassert(op_value);
 
     /* Special behavior for each type of datatype */
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_COMPOUND:
         case H5T_ARRAY:
         case H5T_ENUM:
             /* These types benefit from "upgrading" their version */
-            if(*(unsigned *)op_value > dt->shared->version)
+            if (*(unsigned *)op_value > dt->shared->version)
                 dt->shared->version = *(unsigned *)op_value;
             break;
 
         case H5T_VLEN:
-            if(dt->shared->parent->shared->version > dt->shared->version)
+            if (dt->shared->parent->shared->version > dt->shared->version)
                 dt->shared->version = dt->shared->parent->shared->version;
             break;
 
@@ -5343,7 +5518,6 @@ H5T_upgrade_version_cb(H5T_t *dt, void *op_value)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5T_upgrade_version_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__upgrade_version
  *
@@ -5361,7 +5535,7 @@ H5T_upgrade_version_cb(H5T_t *dt, void *op_value)
 herr_t
 H5T__upgrade_version(H5T_t *dt, unsigned new_version)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -5369,14 +5543,13 @@ H5T__upgrade_version(H5T_t *dt, unsigned new_version)
     HDassert(dt);
 
     /* Iterate over entire datatype, upgrading the version of components, if it's useful */
-    if(H5T__visit(dt, (H5T_VISIT_SIMPLE | H5T_VISIT_COMPLEX_LAST), H5T_upgrade_version_cb, &new_version) < 0)
+    if (H5T__visit(dt, (H5T_VISIT_SIMPLE | H5T_VISIT_COMPLEX_LAST), H5T_upgrade_version_cb, &new_version) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADITER, FAIL, "iteration to upgrade datatype encoding version failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__upgrade_version() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_set_latest_version
  *
@@ -5392,7 +5565,7 @@ done:
 herr_t
 H5T_set_latest_version(H5T_t *dt)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -5400,14 +5573,13 @@ H5T_set_latest_version(H5T_t *dt)
     HDassert(dt);
 
     /* Upgrade the format version for the datatype to the latest */
-    if(H5T__upgrade_version(dt, H5O_DTYPE_VERSION_LATEST) < 0)
+    if (H5T__upgrade_version(dt, H5O_DTYPE_VERSION_LATEST) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade datatype encoding")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_set_latest_version() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_patch_file
  *
@@ -5434,8 +5606,8 @@ H5T_patch_file(H5T_t *dt, H5F_t *f)
     HDassert(dt);
     HDassert(f);
 
-    if(H5T_STATE_OPEN == dt->shared->state || H5T_STATE_NAMED == dt->shared->state) {
-        dt->oloc.file = f;
+    if (H5T_STATE_OPEN == dt->shared->state || H5T_STATE_NAMED == dt->shared->state) {
+        dt->oloc.file   = f;
         dt->sh_loc.file = f;
     } /* end if */
 
@@ -5443,7 +5615,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_patch_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_patch_vlen_file
  *
@@ -5466,7 +5637,7 @@ H5T_patch_vlen_file(H5T_t *dt, H5F_t *f)
     HDassert(dt->shared);
     HDassert(f);
 
-    if((dt->shared->type == H5T_VLEN) && dt->shared->u.vlen.f != f)
+    if ((dt->shared->type == H5T_VLEN) && dt->shared->u.vlen.f != f)
         dt->shared->u.vlen.f = f;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5TS.c b/src/H5TS.c
index 501132b..a76ed5a 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -12,9 +12,9 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* private headers */
-#include "H5private.h"    /*library                     */
-#include "H5Eprivate.h"    /*error handling              */
-#include "H5MMprivate.h"  /*memory management functions    */
+#include "H5private.h"   /*library                     */
+#include "H5Eprivate.h"  /*error handling              */
+#include "H5MMprivate.h" /*memory management functions    */
 
 #ifdef H5_HAVE_THREADSAFE
 
@@ -22,21 +22,20 @@
 
 /* cancelability structure */
 typedef struct H5TS_cancel_struct {
-    int previous_state;
+    int          previous_state;
     unsigned int cancel_count;
 } H5TS_cancel_t;
 
 /* Global variable definitions */
 #ifdef H5_HAVE_WIN_THREADS
 H5TS_once_t H5TS_first_init_g;
-#else /* H5_HAVE_WIN_THREADS */
+#else  /* H5_HAVE_WIN_THREADS */
 H5TS_once_t H5TS_first_init_g = PTHREAD_ONCE_INIT;
 #endif /* H5_HAVE_WIN_THREADS */
 H5TS_key_t H5TS_errstk_key_g;
 H5TS_key_t H5TS_funcstk_key_g;
 H5TS_key_t H5TS_cancel_key_g;
 
-
 /*--------------------------------------------------------------------------
  * NAME
  *    H5TS_key_destructor
@@ -60,11 +59,10 @@ static void
 H5TS_key_destructor(void *key_val)
 {
     /* Use HDfree here instead of H5MM_xfree(), to avoid calling the H5CS routines */
-    if(key_val!=NULL)
+    if (key_val != NULL)
         HDfree(key_val);
 }
 
-
 #ifndef H5_HAVE_WIN_THREADS
 
 /*--------------------------------------------------------------------------
@@ -90,11 +88,11 @@ void
 H5TS_pthread_first_thread_init(void)
 {
     H5_g.H5_libinit_g = FALSE;
-    
+
 #ifdef H5_HAVE_WIN32_API
-# ifdef PTW32_STATIC_LIB
+#ifdef PTW32_STATIC_LIB
     pthread_win32_process_attach_np();
-# endif
+#endif
 #endif
 
     /* initialize global API mutex lock */
@@ -113,7 +111,6 @@ H5TS_pthread_first_thread_init(void)
 }
 #endif /* H5_HAVE_WIN_THREADS */
 
-
 /*--------------------------------------------------------------------------
  * NAME
  *    H5TS_mutex_lock
@@ -137,33 +134,33 @@ H5TS_pthread_first_thread_init(void)
 herr_t
 H5TS_mutex_lock(H5TS_mutex_t *mutex)
 {
-#ifdef  H5_HAVE_WIN_THREADS
-    EnterCriticalSection( &mutex->CriticalSection); 
+#ifdef H5_HAVE_WIN_THREADS
+    EnterCriticalSection(&mutex->CriticalSection);
     return 0;
-#else /* H5_HAVE_WIN_THREADS */
+#else  /* H5_HAVE_WIN_THREADS */
     herr_t ret_value = pthread_mutex_lock(&mutex->atomic_lock);
 
     if (ret_value)
         return ret_value;
 
-    if(mutex->lock_count && pthread_equal(HDpthread_self(), mutex->owner_thread)) {
+    if (mutex->lock_count && pthread_equal(HDpthread_self(), mutex->owner_thread)) {
         /* already owned by self - increment count */
         mutex->lock_count++;
-    } else {
+    }
+    else {
         /* if owned by other thread, wait for condition signal */
-        while(mutex->lock_count)
+        while (mutex->lock_count)
             pthread_cond_wait(&mutex->cond_var, &mutex->atomic_lock);
 
         /* After we've received the signal, take ownership of the mutex */
         mutex->owner_thread = HDpthread_self();
-        mutex->lock_count = 1;
+        mutex->lock_count   = 1;
     }
 
-    return pthread_mutex_unlock(&mutex->atomic_lock); 
+    return pthread_mutex_unlock(&mutex->atomic_lock);
 #endif /* H5_HAVE_WIN_THREADS */
 }
 
-
 /*--------------------------------------------------------------------------
  * NAME
  *    H5TS_mutex_unlock
@@ -187,33 +184,32 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex)
 herr_t
 H5TS_mutex_unlock(H5TS_mutex_t *mutex)
 {
-#ifdef  H5_HAVE_WIN_THREADS
+#ifdef H5_HAVE_WIN_THREADS
     /* Releases ownership of the specified critical section object. */
     LeaveCriticalSection(&mutex->CriticalSection);
-    return 0; 
+    return 0;
 #else  /* H5_HAVE_WIN_THREADS */
     herr_t ret_value = pthread_mutex_lock(&mutex->atomic_lock);
 
-    if(ret_value)
+    if (ret_value)
         return ret_value;
 
     mutex->lock_count--;
 
     ret_value = pthread_mutex_unlock(&mutex->atomic_lock);
 
-    if(mutex->lock_count == 0) {
+    if (mutex->lock_count == 0) {
         int err;
 
         err = pthread_cond_signal(&mutex->cond_var);
-        if(err != 0)
+        if (err != 0)
             ret_value = err;
     } /* end if */
 
-    return ret_value; 
+    return ret_value;
 #endif /* H5_HAVE_WIN_THREADS */
 } /* H5TS_mutex_unlock */
 
-
 /*--------------------------------------------------------------------------
  * NAME
  *    H5TS_cancel_count_inc
@@ -241,44 +237,41 @@ H5TS_mutex_unlock(H5TS_mutex_t *mutex)
 herr_t
 H5TS_cancel_count_inc(void)
 {
-#ifdef  H5_HAVE_WIN_THREADS
+#ifdef H5_HAVE_WIN_THREADS
     /* unsupported; just return 0 */
     return SUCCEED;
-#else /* H5_HAVE_WIN_THREADS */
+#else  /* H5_HAVE_WIN_THREADS */
     H5TS_cancel_t *cancel_counter;
-    herr_t ret_value = SUCCEED; 
+    herr_t         ret_value = SUCCEED;
 
-    cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g); 
+    cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g);
 
     if (!cancel_counter) {
         /*
-   * First time thread calls library - create new counter and associate
+         * First time thread calls library - create new counter and associate
          * with key
          */
-  cancel_counter = (H5TS_cancel_t *)H5MM_calloc(sizeof(H5TS_cancel_t));
+        cancel_counter = (H5TS_cancel_t *)H5MM_calloc(sizeof(H5TS_cancel_t));
 
-  if (!cancel_counter) {
-      H5E_push_stack(NULL, "H5TS_cancel_count_inc",
-         __FILE__, __LINE__, H5E_ERR_CLS_g, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed");
-      return FAIL;
-  }
+        if (!cancel_counter) {
+            H5E_push_stack(NULL, "H5TS_cancel_count_inc", __FILE__, __LINE__, H5E_ERR_CLS_g, H5E_RESOURCE,
+                           H5E_NOSPACE, "memory allocation failed");
+            return FAIL;
+        }
 
-        ret_value = pthread_setspecific(H5TS_cancel_key_g,
-          (void *)cancel_counter);
+        ret_value = pthread_setspecific(H5TS_cancel_key_g, (void *)cancel_counter);
     }
 
     if (cancel_counter->cancel_count == 0)
         /* thread entering library */
-        ret_value = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE,
-             &cancel_counter->previous_state);
+        ret_value = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_counter->previous_state);
 
     ++cancel_counter->cancel_count;
 
-    return ret_value; 
+    return ret_value;
 #endif /* H5_HAVE_WIN_THREADS */
 }
 
-
 /*--------------------------------------------------------------------------
  * NAME
  *    H5TS_cancel_count_dec
@@ -304,25 +297,24 @@ H5TS_cancel_count_inc(void)
 herr_t
 H5TS_cancel_count_dec(void)
 {
-#ifdef  H5_HAVE_WIN_THREADS 
+#ifdef H5_HAVE_WIN_THREADS
     /* unsupported; will just return 0 */
     return SUCCEED;
-#else /* H5_HAVE_WIN_THREADS */
-    register H5TS_cancel_t *cancel_counter; 
-    herr_t ret_value = SUCCEED;
+#else  /* H5_HAVE_WIN_THREADS */
+    register H5TS_cancel_t *cancel_counter;
+    herr_t                  ret_value = SUCCEED;
 
-    cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g); 
+    cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g);
 
     if (cancel_counter->cancel_count == 1)
         ret_value = pthread_setcancelstate(cancel_counter->previous_state, NULL);
 
-    --cancel_counter->cancel_count; 
+    --cancel_counter->cancel_count;
 
     return ret_value;
 #endif /* H5_HAVE_WIN_THREADS */
 }
 
-
 #ifdef H5_HAVE_WIN_THREADS
 /*--------------------------------------------------------------------------
  * NAME
@@ -336,7 +328,7 @@ H5TS_cancel_count_dec(void)
  *
  *--------------------------------------------------------------------------
  */
-H5_DLL BOOL CALLBACK 
+H5_DLL BOOL CALLBACK
 H5TS_win32_process_enter(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContex)
 {
     BOOL ret_value = TRUE;
@@ -345,11 +337,11 @@ H5TS_win32_process_enter(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContex)
     InitializeCriticalSection(&H5_g.init_lock.CriticalSection);
 
     /* Set up thread local storage */
-    if(TLS_OUT_OF_INDEXES == (H5TS_errstk_key_g = TlsAlloc()))
+    if (TLS_OUT_OF_INDEXES == (H5TS_errstk_key_g = TlsAlloc()))
         ret_value = FALSE;
 
 #ifdef H5_HAVE_CODESTACK
-    if(TLS_OUT_OF_INDEXES == (H5TS_funcstk_key_g = TlsAlloc()))
+    if (TLS_OUT_OF_INDEXES == (H5TS_funcstk_key_g = TlsAlloc()))
         ret_value = FALSE;
 #endif /* H5_HAVE_CODESTACK */
 
@@ -357,7 +349,6 @@ H5TS_win32_process_enter(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContex)
 } /* H5TS_win32_process_enter() */
 #endif /* H5_HAVE_WIN_THREADS */
 
-
 #ifdef H5_HAVE_WIN_THREADS
 /*--------------------------------------------------------------------------
  * NAME
@@ -388,7 +379,6 @@ H5TS_win32_thread_enter(void)
 } /* H5TS_win32_thread_enter() */
 #endif /* H5_HAVE_WIN_THREADS */
 
-
 #ifdef H5_HAVE_WIN_THREADS
 /*--------------------------------------------------------------------------
  * NAME
@@ -427,7 +417,6 @@ H5TS_win32_process_exit(void)
 } /* H5TS_win32_process_exit() */
 #endif /* H5_HAVE_WIN_THREADS */
 
-
 #ifdef H5_HAVE_WIN_THREADS
 /*--------------------------------------------------------------------------
  * NAME
@@ -457,12 +446,12 @@ H5TS_win32_thread_exit(void)
 
     /* Clean up per-thread thread local storage */
     lpvData = TlsGetValue(H5TS_errstk_key_g);
-    if(lpvData)
+    if (lpvData)
         LocalFree((HLOCAL)lpvData);
 
 #ifdef H5_HAVE_CODESTACK
     lpvData = TlsGetValue(H5TS_funcstk_key_g);
-    if(lpvData)
+    if (lpvData)
         LocalFree((HLOCAL)lpvData);
 #endif /* H5_HAVE_CODESTACK */
 
@@ -470,7 +459,6 @@ H5TS_win32_thread_exit(void)
 } /* H5TS_win32_thread_exit() */
 #endif /* H5_HAVE_WIN_THREADS */
 
-
 /*--------------------------------------------------------------------------
  * NAME
  *    H5TS_create_thread
@@ -491,7 +479,7 @@ H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata)
 {
     H5TS_thread_t ret_value;
 
-#ifdef  H5_HAVE_WIN_THREADS 
+#ifdef H5_HAVE_WIN_THREADS
 
     /* When calling C runtime functions, you should use _beginthread or
      * _beginthreadex instead of CreateThread.  Threads created with
@@ -507,7 +495,7 @@ H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata)
 
 #else /* H5_HAVE_WIN_THREADS */
 
-    pthread_create(&ret_value, attr, (void * (*)(void *))func, udata);
+    pthread_create(&ret_value, attr, (void *(*)(void *))func, udata);
 
 #endif /* H5_HAVE_WIN_THREADS */
 
@@ -515,4 +503,4 @@ H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata)
 
 } /* H5TS_create_thread */
 
-#endif  /* H5_HAVE_THREADSAFE */
+#endif /* H5_HAVE_THREADSAFE */
diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h
index e5c41af..ea03828 100644
--- a/src/H5TSprivate.h
+++ b/src/H5TSprivate.h
@@ -28,8 +28,8 @@
 
 /* Public headers needed by this file */
 #ifdef LATER
-#include "H5TSpublic.h"		/*Public API prototypes */
-#endif /* LATER */
+#include "H5TSpublic.h" /*Public API prototypes */
+#endif                  /* LATER */
 
 #ifdef H5_HAVE_WIN_THREADS
 
@@ -37,38 +37,36 @@
 
 /* Mutexes, Threads, and Attributes */
 typedef struct H5TS_mutex_struct {
-	CRITICAL_SECTION CriticalSection;
+    CRITICAL_SECTION CriticalSection;
 } H5TS_mutex_t;
 typedef CRITICAL_SECTION H5TS_mutex_simple_t;
-typedef HANDLE H5TS_thread_t;
-typedef HANDLE H5TS_attr_t;
-typedef DWORD H5TS_key_t;
-typedef INIT_ONCE H5TS_once_t;
+typedef HANDLE           H5TS_thread_t;
+typedef HANDLE           H5TS_attr_t;
+typedef DWORD            H5TS_key_t;
+typedef INIT_ONCE        H5TS_once_t;
 
 /* Defines */
 /* not used on windows side, but need to be defined to something */
-#define H5TS_SCOPE_SYSTEM 0
+#define H5TS_SCOPE_SYSTEM  0
 #define H5TS_SCOPE_PROCESS 0
-#define H5TS_CALL_CONV WINAPI
+#define H5TS_CALL_CONV     WINAPI
 
 /* Functions */
-#define H5TS_get_thread_local_value(key)	TlsGetValue( key )
-#define H5TS_set_thread_local_value(key, value)	TlsSetValue( key, value )
-#define H5TS_attr_init(attr_ptr) 0
-#define H5TS_attr_setscope(attr_ptr, scope) 0
-#define H5TS_attr_destroy(attr_ptr) 0
-#define H5TS_wait_for_thread(thread) WaitForSingleObject(thread, INFINITE)
-#define H5TS_mutex_init(mutex) InitializeCriticalSection(mutex)
-#define H5TS_mutex_lock_simple(mutex) EnterCriticalSection(mutex)
-#define H5TS_mutex_unlock_simple(mutex) LeaveCriticalSection(mutex)
+#define H5TS_get_thread_local_value(key)        TlsGetValue(key)
+#define H5TS_set_thread_local_value(key, value) TlsSetValue(key, value)
+#define H5TS_attr_init(attr_ptr)                0
+#define H5TS_attr_setscope(attr_ptr, scope)     0
+#define H5TS_attr_destroy(attr_ptr)             0
+#define H5TS_wait_for_thread(thread)            WaitForSingleObject(thread, INFINITE)
+#define H5TS_mutex_init(mutex)                  InitializeCriticalSection(mutex)
+#define H5TS_mutex_lock_simple(mutex)           EnterCriticalSection(mutex)
+#define H5TS_mutex_unlock_simple(mutex)         LeaveCriticalSection(mutex)
 
 /* Functions called from DllMain */
 H5_DLL BOOL CALLBACK H5TS_win32_process_enter(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContex);
-H5_DLL void H5TS_win32_process_exit(void);
-H5_DLL herr_t H5TS_win32_thread_enter(void);
-H5_DLL herr_t H5TS_win32_thread_exit(void);
-
-
+H5_DLL void          H5TS_win32_process_exit(void);
+H5_DLL herr_t        H5TS_win32_thread_enter(void);
+H5_DLL herr_t        H5TS_win32_thread_exit(void);
 
 #else /* H5_HAVE_WIN_THREADS */
 
@@ -76,54 +74,53 @@ H5_DLL herr_t H5TS_win32_thread_exit(void);
 
 /* Mutexes, Threads, and Attributes */
 typedef struct H5TS_mutex_struct {
-    pthread_t owner_thread;		/* current lock owner */
-    pthread_mutex_t atomic_lock;	/* lock for atomicity of new mechanism */
-    pthread_cond_t cond_var;		/* condition variable */
-    unsigned int lock_count;
+    pthread_t       owner_thread; /* current lock owner */
+    pthread_mutex_t atomic_lock;  /* lock for atomicity of new mechanism */
+    pthread_cond_t  cond_var;     /* condition variable */
+    unsigned int    lock_count;
 } H5TS_mutex_t;
-typedef pthread_t      H5TS_thread_t;
-typedef pthread_attr_t H5TS_attr_t;
+typedef pthread_t       H5TS_thread_t;
+typedef pthread_attr_t  H5TS_attr_t;
 typedef pthread_mutex_t H5TS_mutex_simple_t;
-typedef pthread_key_t  H5TS_key_t;
-typedef pthread_once_t H5TS_once_t;
+typedef pthread_key_t   H5TS_key_t;
+typedef pthread_once_t  H5TS_once_t;
 
 /* Scope Definitions */
-#define H5TS_SCOPE_SYSTEM PTHREAD_SCOPE_SYSTEM
-#define H5TS_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS
-#define H5TS_CALL_CONV /* unused - Windows only */
+#define H5TS_SCOPE_SYSTEM                       PTHREAD_SCOPE_SYSTEM
+#define H5TS_SCOPE_PROCESS                      PTHREAD_SCOPE_PROCESS
+#define H5TS_CALL_CONV                          /* unused - Windows only */
 
 /* Functions */
-#define H5TS_get_thread_local_value(key)	pthread_getspecific( key )
-#define H5TS_set_thread_local_value(key, value)	pthread_setspecific( key, value )
-#define H5TS_attr_init(attr_ptr) pthread_attr_init((attr_ptr))
-#define H5TS_attr_setscope(attr_ptr, scope) pthread_attr_setscope(attr_ptr, scope)
-#define H5TS_attr_destroy(attr_ptr) pthread_attr_destroy(attr_ptr)
-#define H5TS_wait_for_thread(thread) pthread_join(thread, NULL)
-#define H5TS_mutex_init(mutex) pthread_mutex_init(mutex, NULL)
-#define H5TS_mutex_lock_simple(mutex) pthread_mutex_lock(mutex)
-#define H5TS_mutex_unlock_simple(mutex) pthread_mutex_unlock(mutex)
+#define H5TS_get_thread_local_value(key)        pthread_getspecific(key)
+#define H5TS_set_thread_local_value(key, value) pthread_setspecific(key, value)
+#define H5TS_attr_init(attr_ptr)                pthread_attr_init((attr_ptr))
+#define H5TS_attr_setscope(attr_ptr, scope)     pthread_attr_setscope(attr_ptr, scope)
+#define H5TS_attr_destroy(attr_ptr)             pthread_attr_destroy(attr_ptr)
+#define H5TS_wait_for_thread(thread)            pthread_join(thread, NULL)
+#define H5TS_mutex_init(mutex)                  pthread_mutex_init(mutex, NULL)
+#define H5TS_mutex_lock_simple(mutex)           pthread_mutex_lock(mutex)
+#define H5TS_mutex_unlock_simple(mutex)         pthread_mutex_unlock(mutex)
 
 #endif /* H5_HAVE_WIN_THREADS */
 
 /* External global variables */
 extern H5TS_once_t H5TS_first_init_g;
-extern H5TS_key_t H5TS_errstk_key_g;
-extern H5TS_key_t H5TS_funcstk_key_g;
+extern H5TS_key_t  H5TS_errstk_key_g;
+extern H5TS_key_t  H5TS_funcstk_key_g;
 
 #if defined c_plusplus || defined __cplusplus
-extern      "C"
-{
-#endif	/* c_plusplus || __cplusplus */
+extern "C" {
+#endif /* c_plusplus || __cplusplus */
 
-H5_DLL void   H5TS_pthread_first_thread_init(void);
-H5_DLL herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex);
-H5_DLL herr_t H5TS_mutex_unlock(H5TS_mutex_t *mutex);
-H5_DLL herr_t H5TS_cancel_count_inc(void);
-H5_DLL herr_t H5TS_cancel_count_dec(void);
-H5_DLL H5TS_thread_t H5TS_create_thread(void *(*func)(void *), H5TS_attr_t * attr, void *udata);
+H5_DLL void          H5TS_pthread_first_thread_init(void);
+H5_DLL herr_t        H5TS_mutex_lock(H5TS_mutex_t *mutex);
+H5_DLL herr_t        H5TS_mutex_unlock(H5TS_mutex_t *mutex);
+H5_DLL herr_t        H5TS_cancel_count_inc(void);
+H5_DLL herr_t        H5TS_cancel_count_dec(void);
+H5_DLL H5TS_thread_t H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata);
 
 #if defined c_plusplus || defined __cplusplus
 }
-#endif	/* c_plusplus || __cplusplus */
+#endif /* c_plusplus || __cplusplus */
 
-#endif	/* H5TSprivate_H_ */
+#endif /* H5TSprivate_H_ */
diff --git a/src/H5Tarray.c b/src/H5Tarray.c
index 5b513ed..f9a8da0 100644
--- a/src/H5Tarray.c
+++ b/src/H5Tarray.c
@@ -20,62 +20,51 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_array_interface
-
+#define H5_INTERFACE_INIT_FUNC H5T_init_array_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling			*/
-#include "H5Iprivate.h"		/* IDs					*/
-#include "H5Tpkg.h"		/* Datatypes				*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling			*/
+#include "H5Iprivate.h" /* IDs					*/
+#include "H5Tpkg.h"     /* Datatypes				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Public Variables */
 /*********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_array_interface -- Initialize interface-specific information
@@ -97,7 +86,6 @@ H5T_init_array_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_array_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tarray_create2
  *
@@ -120,43 +108,42 @@ H5T_init_array_interface(void)
 hid_t
 H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/* ndims */])
 {
-    H5T_t	*base;		/* base datatype	*/
-    H5T_t	*dt = NULL;	/* new array datatype	*/
-    unsigned    u;              /* local index variable */
-    hid_t	ret_value;	/* return value	*/
+    H5T_t *  base;      /* base datatype	*/
+    H5T_t *  dt = NULL; /* new array datatype	*/
+    unsigned u;         /* local index variable */
+    hid_t    ret_value; /* return value	*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "iIu*h", base_id, ndims, dim);
 
     /* Check args */
-    if(ndims < 1 || ndims > H5S_MAX_RANK)
+    if (ndims < 1 || ndims > H5S_MAX_RANK)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid dimensionality")
-    if(!dim)
+    if (!dim)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no dimensions specified")
-    for(u = 0; u < ndims; u++)
-        if(!(dim[u] > 0))
+    for (u = 0; u < ndims; u++)
+        if (!(dim[u] > 0))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "zero-sized dimension specified")
-    if(NULL == (base = (H5T_t *)H5I_object_verify(base_id, H5I_DATATYPE)))
+    if (NULL == (base = (H5T_t *)H5I_object_verify(base_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype")
 
     /* Create the array datatype */
-    if(NULL == (dt = H5T__array_create(base, ndims, dim)))
+    if (NULL == (dt = H5T__array_create(base, ndims, dim)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to create datatype")
 
     /* Atomize the type */
-    if((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype")
 
 done:
-    if(ret_value < 0) {
-        if(dt && H5T_close(dt) < 0)
+    if (ret_value < 0) {
+        if (dt && H5T_close(dt) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "can't release datatype")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Tarray_create2() */
+} /* end H5Tarray_create2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__array_create
  *
@@ -177,8 +164,8 @@ done:
 H5T_t *
 H5T__array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */])
 {
-    H5T_t	*ret_value;	/* new array data type	*/
-    unsigned    u;              /* local index variable */
+    H5T_t *  ret_value; /* new array data type	*/
+    unsigned u;         /* local index variable */
 
     FUNC_ENTER_PACKAGE
 
@@ -187,19 +174,19 @@ H5T__array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */])
     HDassert(dim);
 
     /* Build new type */
-    if(NULL == (ret_value = H5T__alloc()))
+    if (NULL == (ret_value = H5T__alloc()))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     ret_value->shared->type = H5T_ARRAY;
 
     /* Copy the base type of the array */
-    if(NULL == (ret_value->shared->parent = H5T_copy(base, H5T_COPY_ALL)))
+    if (NULL == (ret_value->shared->parent = H5T_copy(base, H5T_COPY_ALL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "unable to copy base datatype")
 
     /* Set the array parameters */
     ret_value->shared->u.array.ndims = ndims;
 
     /* Copy the array dimensions & compute the # of elements in the array */
-    for(u = 0, ret_value->shared->u.array.nelem = 1; u < ndims; u++) {
+    for (u = 0, ret_value->shared->u.array.nelem = 1; u < ndims; u++) {
         H5_CHECKED_ASSIGN(ret_value->shared->u.array.dim[u], size_t, dim[u], hsize_t);
         ret_value->shared->u.array.nelem *= (size_t)dim[u];
     } /* end for */
@@ -208,7 +195,7 @@ H5T__array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */])
     ret_value->shared->size = ret_value->shared->parent->shared->size * ret_value->shared->u.array.nelem;
 
     /* Set the "force conversion" flag if the base datatype indicates */
-    if(base->shared->force_conv == TRUE)
+    if (base->shared->force_conv == TRUE)
         ret_value->shared->force_conv = TRUE;
 
     /* Array datatypes need a later version of the datatype object header message */
@@ -216,9 +203,8 @@ H5T__array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */])
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T__array_create */
+} /* end H5T__array_create */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_array_ndims
  *
@@ -235,16 +221,16 @@ done:
 int
 H5Tget_array_ndims(hid_t type_id)
 {
-    H5T_t *dt;		    /* pointer to array datatype	*/
-    int	ret_value;	    /* return value			*/
+    H5T_t *dt;        /* pointer to array datatype	*/
+    int    ret_value; /* return value			*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(dt->shared->type != H5T_ARRAY)
+    if (dt->shared->type != H5T_ARRAY)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an array datatype")
 
     /* Retrieve the number of dimensions */
@@ -252,9 +238,8 @@ H5Tget_array_ndims(hid_t type_id)
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Tget_array_ndims */
+} /* end H5Tget_array_ndims */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__get_array_ndims
  *
@@ -279,9 +264,8 @@ H5T__get_array_ndims(const H5T_t *dt)
 
     /* Retrieve the number of dimensions */
     FUNC_LEAVE_NOAPI((int)dt->shared->u.array.ndims)
-}   /* end H5T__get_array_ndims */
+} /* end H5T__get_array_ndims */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_array_dims2
  *
@@ -298,26 +282,25 @@ H5T__get_array_ndims(const H5T_t *dt)
 int
 H5Tget_array_dims2(hid_t type_id, hsize_t dims[])
 {
-    H5T_t *dt;		/* pointer to array data type	*/
-    int	ret_value;	/* return value			*/
+    H5T_t *dt;        /* pointer to array data type	*/
+    int    ret_value; /* return value			*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("Is", "i*h", type_id, dims);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(dt->shared->type != H5T_ARRAY)
+    if (dt->shared->type != H5T_ARRAY)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an array datatype")
 
     /* Retrieve the sizes of the dimensions */
-    if((ret_value = H5T__get_array_dims(dt, dims)) < 0)
+    if ((ret_value = H5T__get_array_dims(dt, dims)) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get dimension sizes")
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Tget_array_dims2() */
+} /* end H5Tget_array_dims2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__get_array_dims
  *
@@ -335,7 +318,7 @@ done:
 int
 H5T__get_array_dims(const H5T_t *dt, hsize_t dims[])
 {
-    unsigned u;         /* Local index variable */
+    unsigned u; /* Local index variable */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -343,16 +326,16 @@ H5T__get_array_dims(const H5T_t *dt, hsize_t dims[])
     HDassert(dt->shared->type == H5T_ARRAY);
 
     /* Retrieve the sizes of the dimensions */
-    if(dims)
-        for(u = 0; u < dt->shared->u.array.ndims; u++)
+    if (dims)
+        for (u = 0; u < dt->shared->u.array.ndims; u++)
             dims[u] = dt->shared->u.array.dim[u];
 
     /* Pass along the array rank as the return value */
     FUNC_LEAVE_NOAPI((int)dt->shared->u.array.ndims)
-}   /* end H5T__get_array_dims */
+} /* end H5T__get_array_dims */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5Tarray_create1
  *
@@ -374,45 +357,44 @@ H5T__get_array_dims(const H5T_t *dt, hsize_t dims[])
  */
 hid_t
 H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
-    const int H5_ATTR_UNUSED perm[/* ndims */])
+                 const int H5_ATTR_UNUSED perm[/* ndims */])
 {
-    H5T_t	*base;		/* base datatype	*/
-    H5T_t	*dt = NULL;	/* new array datatype	*/
-    unsigned    u;              /* local index variable */
-    hid_t	ret_value;	/* return value	*/
+    H5T_t *  base;      /* base datatype	*/
+    H5T_t *  dt = NULL; /* new array datatype	*/
+    unsigned u;         /* local index variable */
+    hid_t    ret_value; /* return value	*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("i", "iIs*h*Is", base_id, ndims, dim, perm);
 
     /* Check args */
-    if(ndims < 1 || ndims > H5S_MAX_RANK)
+    if (ndims < 1 || ndims > H5S_MAX_RANK)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid dimensionality")
-    if(!dim)
+    if (!dim)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no dimensions specified")
-    for(u = 0; u < (unsigned)ndims; u++)
-        if(!(dim[u] > 0))
+    for (u = 0; u < (unsigned)ndims; u++)
+        if (!(dim[u] > 0))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "zero-sized dimension specified")
-    if(NULL == (base = (H5T_t *)H5I_object_verify(base_id, H5I_DATATYPE)))
+    if (NULL == (base = (H5T_t *)H5I_object_verify(base_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype")
 
     /* Create the array datatype */
-    if(NULL == (dt = H5T__array_create(base, (unsigned)ndims, dim)))
+    if (NULL == (dt = H5T__array_create(base, (unsigned)ndims, dim)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to create datatype")
 
     /* Atomize the type */
-    if((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype")
 
 done:
-    if(ret_value < 0) {
-        if(dt && H5T_close(dt) < 0)
+    if (ret_value < 0) {
+        if (dt && H5T_close(dt) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "can't release datatype")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Tarray_create1() */
+} /* end H5Tarray_create1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_array_dims1
  *
@@ -429,24 +411,23 @@ done:
 int
 H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int H5_ATTR_UNUSED perm[])
 {
-    H5T_t *dt;		/* Array datatype to query	*/
-    int	ret_value;	/* return value			*/
+    H5T_t *dt;        /* Array datatype to query	*/
+    int    ret_value; /* return value			*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Is", "i*h*Is", type_id, dims, perm);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object")
-    if(dt->shared->type != H5T_ARRAY)
+    if (dt->shared->type != H5T_ARRAY)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an array datatype")
 
     /* Retrieve the sizes of the dimensions */
-    if((ret_value = H5T__get_array_dims(dt, dims)) < 0)
+    if ((ret_value = H5T__get_array_dims(dt, dims)) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get dimension sizes")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}   /* end H5Tget_array_dims1() */
+} /* end H5Tget_array_dims1() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index b297405..178e0bf 100644
--- a/src/H5Tbit.c
+++ b/src/H5Tbit.c
@@ -17,17 +17,14 @@
  *		the bytes are in little-endian order.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
+#include "H5private.h"   /*generic functions			  */
+#include "H5Eprivate.h"  /*error handling			  */
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Tpkg.h"      /*data-type functions			  */
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
-#include "H5private.h"		/*generic functions			  */
-#include "H5Eprivate.h"		/*error handling			  */
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Tpkg.h"		/*data-type functions			  */
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
-
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_copy
  *
@@ -41,12 +38,11 @@
  *-------------------------------------------------------------------------
  */
 void
-H5T__bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src,
-    size_t src_offset, size_t size)
+H5T__bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src, size_t src_offset, size_t size)
 {
-    size_t  shift;
-    size_t  mask_lo, mask_hi;
-    size_t  s_idx, d_idx;
+    size_t shift;
+    size_t mask_lo, mask_hi;
+    size_t s_idx, d_idx;
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -75,26 +71,26 @@ H5T__bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src,
      *      ...+---------------+---------------+
      *           dst[d_idx+1]      dst[d_idx]
      */
-    while(src_offset && size > 0) {
-	size_t nbits = MIN3(size, 8 - dst_offset, 8 - src_offset);
-	size_t mask = ((size_t)1 << nbits) - 1;
-
-	dst[d_idx] &= (uint8_t)~(mask << dst_offset);
-	dst[d_idx] |= (uint8_t)(((src[s_idx] >> src_offset) & (uint8_t)mask) << dst_offset);
-
-	src_offset += nbits;
-	if(src_offset >= 8) {
-	    s_idx++;
-	    src_offset %= 8;
-	} /* end if */
-
-	dst_offset += nbits;
-	if(dst_offset >= 8) {
-	    d_idx++;
-	    dst_offset %= 8;
-	} /* end if */
-
-	size -= nbits;
+    while (src_offset && size > 0) {
+        size_t nbits = MIN3(size, 8 - dst_offset, 8 - src_offset);
+        size_t mask  = ((size_t)1 << nbits) - 1;
+
+        dst[d_idx] &= (uint8_t) ~(mask << dst_offset);
+        dst[d_idx] |= (uint8_t)(((src[s_idx] >> src_offset) & (uint8_t)mask) << dst_offset);
+
+        src_offset += nbits;
+        if (src_offset >= 8) {
+            s_idx++;
+            src_offset %= 8;
+        } /* end if */
+
+        dst_offset += nbits;
+        if (dst_offset >= 8) {
+            d_idx++;
+            dst_offset %= 8;
+        } /* end if */
+
+        size -= nbits;
     } /* end while */
 
     /*
@@ -118,48 +114,47 @@ H5T__bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src,
      * bits). SHIFT is three since the source must be shifted right three bits
      * to line up with the destination.
      */
-    shift = dst_offset;
+    shift   = dst_offset;
     mask_lo = ((size_t)1 << (8 - shift)) - 1;
     mask_hi = (~mask_lo) & 0xff;
 
-    for(/*void*/; size > 8; size -= 8, d_idx++, s_idx++) {
-	if(shift) {
-	    dst[d_idx + 0] &= (uint8_t)(~(mask_lo << shift));
-	    dst[d_idx + 0] |= (uint8_t)((src[s_idx] & mask_lo) << shift);
-	    dst[d_idx + 1] &= (uint8_t)(~(mask_hi >> (8 - shift)));
-	    dst[d_idx + 1] |= (uint8_t)((src[s_idx] & mask_hi) >> (8 - shift));
-	} /* end if */
+    for (/*void*/; size > 8; size -= 8, d_idx++, s_idx++) {
+        if (shift) {
+            dst[d_idx + 0] &= (uint8_t)(~(mask_lo << shift));
+            dst[d_idx + 0] |= (uint8_t)((src[s_idx] & mask_lo) << shift);
+            dst[d_idx + 1] &= (uint8_t)(~(mask_hi >> (8 - shift)));
+            dst[d_idx + 1] |= (uint8_t)((src[s_idx] & mask_hi) >> (8 - shift));
+        } /* end if */
         else
-	    dst[d_idx] = src[s_idx];
+            dst[d_idx] = src[s_idx];
     } /* end for */
 
     /* Finish up */
-    while(size > 0) {
-	size_t nbits = (size_t)MIN3 (size, 8 - dst_offset, 8 - src_offset);
-	size_t mask = ((size_t)1 << nbits) - 1;
-
-	dst[d_idx] &= (uint8_t)(~(mask << dst_offset));
-	dst[d_idx] |= (uint8_t)(((src[s_idx] >> src_offset) & (uint8_t)mask) << dst_offset);
-
-	src_offset += nbits;
-	if(src_offset >= 8) {
-	    s_idx++;
-	    src_offset %= 8;
-	} /* end if */
-
-	dst_offset += nbits;
-	if(dst_offset >= 8) {
-	    d_idx++;
-	    dst_offset %= 8;
-	} /* end if */
-
-	size -= nbits;
+    while (size > 0) {
+        size_t nbits = (size_t)MIN3(size, 8 - dst_offset, 8 - src_offset);
+        size_t mask  = ((size_t)1 << nbits) - 1;
+
+        dst[d_idx] &= (uint8_t)(~(mask << dst_offset));
+        dst[d_idx] |= (uint8_t)(((src[s_idx] >> src_offset) & (uint8_t)mask) << dst_offset);
+
+        src_offset += nbits;
+        if (src_offset >= 8) {
+            s_idx++;
+            src_offset %= 8;
+        } /* end if */
+
+        dst_offset += nbits;
+        if (dst_offset >= 8) {
+            d_idx++;
+            dst_offset %= 8;
+        } /* end if */
+
+        size -= nbits;
     } /* end while */
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5T__bit_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_shift
  *
@@ -183,9 +178,9 @@ H5T__bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src,
 herr_t
 H5T__bit_shift(uint8_t *buf, ssize_t shift_dist, size_t offset, size_t size)
 {
-    uint8_t tmp_buf[512];       /* Temporary buffer */
-    H5WB_t *wb = NULL;          /* Wrapped buffer for temporary buffer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    uint8_t tmp_buf[512];        /* Temporary buffer */
+    H5WB_t *wb        = NULL;    /* Wrapped buffer for temporary buffer */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -193,25 +188,25 @@ H5T__bit_shift(uint8_t *buf, ssize_t shift_dist, size_t offset, size_t size)
     HDassert(buf);
     HDassert(size);
 
-    if(shift_dist) {
+    if (shift_dist) {
         size_t abs_shift_dist = (size_t)ABS(shift_dist);
 
-        if(abs_shift_dist >= size)
+        if (abs_shift_dist >= size)
             H5T__bit_set(buf, offset, size, 0);
         else {
-            size_t buf_size = (size / 8) + 1;   /* Size of shift buffer needed */
+            size_t   buf_size = (size / 8) + 1; /* Size of shift buffer needed */
             uint8_t *shift_buf;                 /* Pointer to shift buffer */
 
             /* Wrap the local buffer for serialized header info */
-            if(NULL == (wb = H5WB_wrap(tmp_buf, sizeof(tmp_buf))))
+            if (NULL == (wb = H5WB_wrap(tmp_buf, sizeof(tmp_buf))))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't wrap buffer")
 
             /* Get a pointer to a buffer that's large enough  */
-            if(NULL == (shift_buf = (uint8_t *)H5WB_actual(wb, buf_size)))
+            if (NULL == (shift_buf = (uint8_t *)H5WB_actual(wb, buf_size)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
             /* Shift vector by making copies */
-            if(shift_dist > 0) { /* left shift */
+            if (shift_dist > 0) { /* left shift */
                 /* Copy part to be shifted to a temporary buffer */
                 H5T__bit_copy(shift_buf, (size_t)0, buf, offset, size - abs_shift_dist);
 
@@ -220,24 +215,23 @@ H5T__bit_shift(uint8_t *buf, ssize_t shift_dist, size_t offset, size_t size)
 
                 /* Zero-set the left part*/
                 H5T__bit_set(buf, offset, abs_shift_dist, 0);
-            } /* end if */
+            }      /* end if */
             else { /* right shift */
                 H5T__bit_copy(shift_buf, (size_t)0, buf, offset + abs_shift_dist, size - abs_shift_dist);
                 H5T__bit_copy(buf, offset, shift_buf, (size_t)0, size - abs_shift_dist);
                 H5T__bit_set(buf, offset + size - abs_shift_dist, abs_shift_dist, 0);
             } /* end else */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
 
 done:
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
+    if (wb && H5WB_unwrap(wb) < 0)
         HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__bit_shift() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_get_d
  *
@@ -257,24 +251,24 @@ done:
 uint64_t
 H5T__bit_get_d(uint8_t *buf, size_t offset, size_t size)
 {
-    uint64_t	val = 0;
-    size_t	i, hs;
-    uint64_t	ret_value;      /* Return value */
+    uint64_t val = 0;
+    size_t   i, hs;
+    uint64_t ret_value; /* Return value */
 
     FUNC_ENTER_PACKAGE_NOERR
 
     HDassert(8 * sizeof(val) >= size);
 
-    H5T__bit_copy((uint8_t*)&val, (size_t)0, buf, offset, size);
-    switch(H5T_native_order_g) {
+    H5T__bit_copy((uint8_t *)&val, (size_t)0, buf, offset, size);
+    switch (H5T_native_order_g) {
         case H5T_ORDER_LE:
             break;
 
         case H5T_ORDER_BE:
-            for(i = 0, hs = sizeof(val) / 2; i < hs; i++) {
-                uint8_t tmp = ((uint8_t*)&val)[i];
-                ((uint8_t*)&val)[i] = ((uint8_t*)&val)[sizeof(val) - (i + 1)];
-                ((uint8_t*)&val)[sizeof(val) - (i + 1)] = tmp;
+            for (i = 0, hs = sizeof(val) / 2; i < hs; i++) {
+                uint8_t tmp                              = ((uint8_t *)&val)[i];
+                ((uint8_t *)&val)[i]                     = ((uint8_t *)&val)[sizeof(val) - (i + 1)];
+                ((uint8_t *)&val)[sizeof(val) - (i + 1)] = tmp;
             } /* end for */
             break;
 
@@ -294,7 +288,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__bit_get_d() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_set_d
  *
@@ -310,20 +303,20 @@ done:
 void
 H5T__bit_set_d(uint8_t *buf, size_t offset, size_t size, uint64_t val)
 {
-    size_t	i, hs;
+    size_t i, hs;
 
     FUNC_ENTER_PACKAGE_NOERR
 
     HDassert(8 * sizeof(val) >= size);
 
-    switch(H5T_native_order_g) {
+    switch (H5T_native_order_g) {
         case H5T_ORDER_LE:
             break;
 
         case H5T_ORDER_BE:
-            for(i = 0, hs = sizeof(val) / 2; i < hs; i++) {
-                uint8_t tmp = ((uint8_t *)&val)[i];
-                ((uint8_t *)&val)[i] = ((uint8_t *)&val)[sizeof(val) - (i + 1)];
+            for (i = 0, hs = sizeof(val) / 2; i < hs; i++) {
+                uint8_t tmp                              = ((uint8_t *)&val)[i];
+                ((uint8_t *)&val)[i]                     = ((uint8_t *)&val)[sizeof(val) - (i + 1)];
                 ((uint8_t *)&val)[sizeof(val) - (i + 1)] = tmp;
             } /* end for */
             break;
@@ -336,12 +329,11 @@ H5T__bit_set_d(uint8_t *buf, size_t offset, size_t size, uint64_t val)
             HDabort();
     } /* end switch */
 
-    H5T__bit_copy(buf, offset, (uint8_t*)&val, (size_t)0, size);
+    H5T__bit_copy(buf, offset, (uint8_t *)&val, (size_t)0, size);
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5T__bit_set_d() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_set
  *
@@ -360,7 +352,7 @@ H5T__bit_set_d(uint8_t *buf, size_t offset, size_t size, uint64_t val)
 void
 H5T__bit_set(uint8_t *buf, size_t offset, size_t size, hbool_t value)
 {
-    int	idx;
+    int idx;
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -369,35 +361,34 @@ H5T__bit_set(uint8_t *buf, size_t offset, size_t size, hbool_t value)
     offset %= 8;
 
     /* The first partial byte */
-    if(size && offset % 8) {
-	size_t nbits = MIN(size, 8 - offset);
-	unsigned mask = ((unsigned)1 << nbits) - 1;
-
-	if(value)
-	    buf[idx++] |= (uint8_t)(mask << offset);
-	else
-	    buf[idx++] &= (uint8_t)(~(mask << offset));
-	size -= nbits;
+    if (size && offset % 8) {
+        size_t   nbits = MIN(size, 8 - offset);
+        unsigned mask  = ((unsigned)1 << nbits) - 1;
+
+        if (value)
+            buf[idx++] |= (uint8_t)(mask << offset);
+        else
+            buf[idx++] &= (uint8_t)(~(mask << offset));
+        size -= nbits;
     } /* end if */
 
     /* The middle bytes */
-    while(size >= 8) {
-	buf[idx++] = value ? 0xff : 0x00;
-	size -= 8;
+    while (size >= 8) {
+        buf[idx++] = value ? 0xff : 0x00;
+        size -= 8;
     } /* end while */
 
     /* The last partial byte */
-    if(size) {
-	if(value)
-	    buf[idx] |= (uint8_t)(((unsigned)1 << size) - 1);
-	else
-	    buf[idx] &= (uint8_t)(~(((unsigned)1 << size) - 1));
+    if (size) {
+        if (value)
+            buf[idx] |= (uint8_t)(((unsigned)1 << size) - 1);
+        else
+            buf[idx] &= (uint8_t)(~(((unsigned)1 << size) - 1));
     } /* end if */
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5T__bit_set() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_find
  *
@@ -419,13 +410,12 @@ H5T__bit_set(uint8_t *buf, size_t offset, size_t size, hbool_t value)
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
-	      hbool_t value)
+H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction, hbool_t value)
 {
-    ssize_t	base = (ssize_t)offset;
-    ssize_t	idx, i;
-    size_t	iu;
-    ssize_t     ret_value = (-1);         /* Return value */
+    ssize_t base = (ssize_t)offset;
+    ssize_t idx, i;
+    size_t  iu;
+    ssize_t ret_value = (-1); /* Return value */
 
     /* Use FUNC_ENTER_PACKAGE_NOERR here to avoid performance issues */
     FUNC_ENTER_PACKAGE_NOERR
@@ -433,16 +423,16 @@ H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
     /* Some functions call this with value=TRUE */
     HDassert(TRUE == 1);
 
-    switch(direction) {
+    switch (direction) {
         case H5T_BIT_LSB:
             /* Calculate index */
             idx = (ssize_t)(offset / 8);
             offset %= 8;
 
             /* Beginning */
-            if(offset) {
-                for(iu = offset; iu < 8 && size > 0; iu++, size--)
-                    if(value == (hbool_t)((buf[idx] >> iu) & 0x01))
+            if (offset) {
+                for (iu = offset; iu < 8 && size > 0; iu++, size--)
+                    if (value == (hbool_t)((buf[idx] >> iu) & 0x01))
                         HGOTO_DONE(8 * idx + (ssize_t)iu - base);
 
                 offset = 0;
@@ -450,10 +440,10 @@ H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
             } /* end if */
 
             /* Middle */
-            while(size >= 8) {
-                if((value ? 0x00 : 0xff) != buf[idx])
-                    for(i = 0; i < 8; i++)
-                        if(value == (hbool_t)((buf[idx] >> i) & 0x01))
+            while (size >= 8) {
+                if ((value ? 0x00 : 0xff) != buf[idx])
+                    for (i = 0; i < 8; i++)
+                        if (value == (hbool_t)((buf[idx] >> i) & 0x01))
                             HGOTO_DONE(8 * idx + i - base);
 
                 size -= 8;
@@ -461,8 +451,8 @@ H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
             } /* end while */
 
             /* End */
-            for(i = 0; i < (ssize_t)size; i++)
-                if(value == (hbool_t)((buf[idx] >> i) & 0x01))
+            for (i = 0; i < (ssize_t)size; i++)
+                if (value == (hbool_t)((buf[idx] >> i) & 0x01))
                     HGOTO_DONE(8 * idx + i - base);
             break;
 
@@ -472,19 +462,19 @@ H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
             offset %= 8;
 
             /* Beginning */
-            if(size > 8 - offset && (offset + size) % 8) {
-                for(iu = (offset + size) % 8; iu > 0; --iu, --size)
-                    if(value == (hbool_t)((buf[idx] >> (iu - 1)) & 0x01))
+            if (size > 8 - offset && (offset + size) % 8) {
+                for (iu = (offset + size) % 8; iu > 0; --iu, --size)
+                    if (value == (hbool_t)((buf[idx] >> (iu - 1)) & 0x01))
                         HGOTO_DONE(8 * idx + (ssize_t)(iu - 1) - base);
 
                 --idx;
             } /* end if */
 
             /* Middle */
-            while(size >= 8) {
-                if((value ? 0x00 : 0xff) != buf[idx]) {
-                    for(i = 7; i >= 0; --i)
-                        if(value == (hbool_t)((buf[idx] >> i) & 0x01))
+            while (size >= 8) {
+                if ((value ? 0x00 : 0xff) != buf[idx]) {
+                    for (i = 7; i >= 0; --i)
+                        if (value == (hbool_t)((buf[idx] >> i) & 0x01))
                             HGOTO_DONE(8 * idx + i - base);
                 } /* end if */
 
@@ -493,9 +483,9 @@ H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
             } /* end while */
 
             /* End */
-            if(size > 0) {
-                for(iu = offset + size; iu > offset; --iu)
-                    if(value == (hbool_t)((buf[idx] >> (iu - 1)) & 0x01))
+            if (size > 0) {
+                for (iu = offset + size; iu > offset; --iu)
+                    if (value == (hbool_t)((buf[idx] >> (iu - 1)) & 0x01))
                         HGOTO_DONE(8 * idx + (ssize_t)(iu - 1) - base);
             } /* end if */
             break;
@@ -508,7 +498,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__bit_find() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_inc
  *
@@ -528,9 +517,9 @@ done:
 htri_t
 H5T__bit_inc(uint8_t *buf, size_t start, size_t size)
 {
-    size_t	idx = start / 8;
-    unsigned	carry = 1;
-    unsigned	acc, mask;
+    size_t   idx   = start / 8;
+    unsigned carry = 1;
+    unsigned acc, mask;
 
     /* Use FUNC_ENTER_PACKAGE_NOERR here to avoid performance issues */
     FUNC_ENTER_PACKAGE_NOERR
@@ -540,45 +529,44 @@ H5T__bit_inc(uint8_t *buf, size_t start, size_t size)
     start %= 8;
 
     /* The first partial byte */
-    if(start) {
-	if(size + start < 8)
+    if (start) {
+        if (size + start < 8)
             mask = ((unsigned)1 << size) - 1;
-	else
+        else
             mask = ((unsigned)1 << (8 - start)) - 1;
-	acc = ((unsigned)buf[idx] >> start) & mask;
-	acc++;
-	carry = acc & ((unsigned)1 << MIN(size, 8 - start));
-	buf[idx] &= (uint8_t)(~(mask << start));
-	buf[idx] |= (uint8_t)((acc & mask) << start);
-	size -= MIN(size, 8 - start);
-	start = 0;
-	idx++;
+        acc = ((unsigned)buf[idx] >> start) & mask;
+        acc++;
+        carry = acc & ((unsigned)1 << MIN(size, 8 - start));
+        buf[idx] &= (uint8_t)(~(mask << start));
+        buf[idx] |= (uint8_t)((acc & mask) << start);
+        size -= MIN(size, 8 - start);
+        start = 0;
+        idx++;
     } /* end if */
 
     /* The middle */
-    while(carry && size >= 8) {
-	acc = buf[idx];
-	acc++;
-	carry = acc & 0x100;
-	buf[idx] = acc & 0xff;
-	idx++;
-	size -= 8;
+    while (carry && size >= 8) {
+        acc = buf[idx];
+        acc++;
+        carry    = acc & 0x100;
+        buf[idx] = acc & 0xff;
+        idx++;
+        size -= 8;
     } /* end while */
 
     /* The last bits */
-    if(carry && size > 0) {
-	mask = ((unsigned)1 << size) - 1;
-	acc = buf[idx] & mask;
-	acc++;
-	carry = acc & ((unsigned)1 << size);
-	buf[idx] &= (uint8_t)(~mask);
-	buf[idx] |= (uint8_t)(acc & mask);
+    if (carry && size > 0) {
+        mask = ((unsigned)1 << size) - 1;
+        acc  = buf[idx] & mask;
+        acc++;
+        carry = acc & ((unsigned)1 << size);
+        buf[idx] &= (uint8_t)(~mask);
+        buf[idx] |= (uint8_t)(acc & mask);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(carry ? TRUE : FALSE)
 } /* end H5T__bit_inc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_dec
  *
@@ -598,10 +586,10 @@ H5T__bit_inc(uint8_t *buf, size_t start, size_t size)
 htri_t
 H5T__bit_dec(uint8_t *buf, size_t start, size_t size)
 {
-    size_t	idx = start / 8;
-    size_t      pos = start % 8;
-    uint8_t     tmp;
-    unsigned	borrow = 0;
+    size_t   idx = start / 8;
+    size_t   pos = start % 8;
+    uint8_t  tmp;
+    unsigned borrow = 0;
 
     /* Use FUNC_ENTER_PACKAGE_NOERR here to avoid performance issues */
     FUNC_ENTER_PACKAGE_NOERR
@@ -610,21 +598,21 @@ H5T__bit_dec(uint8_t *buf, size_t start, size_t size)
     HDassert(size);
 
     /* The first partial byte */
-    if((size + start - 1) / 8 > idx) { /*bit sequence doesn't end in the same byte as starts*/
+    if ((size + start - 1) / 8 > idx) { /*bit sequence doesn't end in the same byte as starts*/
         /* Example:  a sequence like 11000100 and start = 3.  We substract 00001000 from
          * it and get 10111100.  If a sequence is 00000111, we do right shift for START
          * bits and get 00000000.  So we need to borrow from higher byte when we substract
          * 00001000.
          */
-        if(!(buf[idx] >> pos))
+        if (!(buf[idx] >> pos))
             borrow = 1;
         buf[idx] = (uint8_t)(buf[idx] - (1 << pos));
         idx++;
         size -= (8 - pos);
 
         /* The middle bytes */
-        while(borrow && size >= 8) {
-            if(buf[idx])
+        while (borrow && size >= 8) {
+            if (buf[idx])
                 borrow = 0;
             buf[idx]--;
 
@@ -633,31 +621,30 @@ H5T__bit_dec(uint8_t *buf, size_t start, size_t size)
         } /* end while */
 
         /* The last partial byte */
-        if(borrow && size > 0) {
+        if (borrow && size > 0) {
             /* Similar to the first byte case, where sequence ends in the same byte as starts */
             tmp = buf[idx];
             buf[idx]--;
-            if((buf[idx] >> size) != tmp >> size)
+            if ((buf[idx] >> size) != tmp >> size)
                 buf[idx] = (uint8_t)(buf[idx] + (1 << size));
-        } /* end if */
-    } /* end if */
+        }  /* end if */
+    }      /* end if */
     else { /* bit sequence ends in the same byte as starts */
         /* Example: a sequence like 11000100 and pos=3, size=3.  We substract 00001000
          * and get 10111100.  A bit is borrowed from 6th bit(buf[idx]>>6=00000010, tmp>>6=00000011,
          * not equal).  We need to put this bit back by increment 1000000.
          */
-        tmp = buf[idx];
+        tmp      = buf[idx];
         buf[idx] = (uint8_t)(buf[idx] - (1 << pos));
-        if((buf[idx] >> (pos + size)) != tmp >> (pos + size)) {
+        if ((buf[idx] >> (pos + size)) != tmp >> (pos + size)) {
             buf[idx] = (uint8_t)(buf[idx] + (1 << (pos + size)));
-            borrow = 1;
+            borrow   = 1;
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     FUNC_LEAVE_NOAPI(borrow ? TRUE : FALSE)
 } /* end H5T__bit_dec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__bit_neg
  *
@@ -674,9 +661,9 @@ H5T__bit_dec(uint8_t *buf, size_t start, size_t size)
 void
 H5T__bit_neg(uint8_t *buf, size_t start, size_t size)
 {
-    size_t	idx = start / 8;
-    size_t      pos = start % 8;
-    uint8_t     tmp[1];
+    size_t  idx = start / 8;
+    size_t  pos = start % 8;
+    uint8_t tmp[1];
 
     /* Use FUNC_ENTER_PACKAGE_NOERR here to avoid performance issues */
     FUNC_ENTER_PACKAGE_NOERR
@@ -688,28 +675,27 @@ H5T__bit_neg(uint8_t *buf, size_t start, size_t size)
     tmp[0] = (uint8_t)~buf[idx];
 
     /* Simply copy the negated bit field back to the original byte */
-    if((size + start - 1) / 8 > idx) {   /*bit sequence doesn't end in the same byte as starts*/
-        H5T__bit_copy(&(buf[idx]), pos, tmp, pos, (8-pos));
+    if ((size + start - 1) / 8 > idx) { /*bit sequence doesn't end in the same byte as starts*/
+        H5T__bit_copy(&(buf[idx]), pos, tmp, pos, (8 - pos));
         idx++;
         size -= (8 - pos);
 
         /* The middle bytes */
-        while(size >= 8) {
-            buf[idx] = (uint8_t)~(buf[idx]);
+        while (size >= 8) {
+            buf[idx] = (uint8_t) ~(buf[idx]);
             idx++;
             size -= 8;
         } /* end while */
 
         /* The last partial byte */
-        if(size > 0) {
+        if (size > 0) {
             /* Similar to the first byte case, where sequence ends in the same byte as starts */
             tmp[0] = (uint8_t)~buf[idx];
             H5T__bit_copy(&(buf[idx]), (size_t)0, tmp, (size_t)0, size);
         } /* end if */
-    } /* end if */
+    }     /* end if */
     else  /* bit sequence ends in the same byte as starts */
         H5T__bit_copy(&(buf[idx]), pos, tmp, pos, size);
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5T__bit_neg() */
-
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 3c1ab80..438637f 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -20,67 +20,56 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_commit_interface
-
+#define H5_INTERFACE_INIT_FUNC H5T_init_commit_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"		/* Error handling			*/
-#include "H5FOprivate.h"	/* File objects				*/
-#include "H5Iprivate.h"		/* IDs					*/
-#include "H5Lprivate.h"		/* Links				*/
-#include "H5Pprivate.h"         /* Property lists                       */
-#include "H5Tpkg.h"		/* Datatypes				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling			*/
+#include "H5FOprivate.h" /* File objects				*/
+#include "H5Iprivate.h"  /* IDs					*/
+#include "H5Lprivate.h"  /* Links				*/
+#include "H5Pprivate.h"  /* Property lists                       */
+#include "H5Tpkg.h"      /* Datatypes				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 static H5T_t *H5T_open_oid(const H5G_loc_t *loc, hid_t dxpl_id);
 
-
 /*********************/
 /* Public Variables */
 /*********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_commit_interface -- Initialize interface-specific information
@@ -102,7 +91,6 @@ H5T_init_commit_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_commit_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tcommit2
  *
@@ -117,54 +105,49 @@ H5T_init_commit_interface(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id,
-    hid_t tcpl_id, hid_t tapl_id)
+H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id)
 {
-    H5G_loc_t	loc;                    /* Location to create datatype */
-    H5T_t	*type;                  /* Datatype for ID */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Location to create datatype */
+    H5T_t *   type;                /* Datatype for ID */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "i*siiii", loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == lcpl_id)
+    if (H5P_DEFAULT == lcpl_id)
         lcpl_id = H5P_LINK_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
+    else if (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == tcpl_id)
+    if (H5P_DEFAULT == tcpl_id)
         tcpl_id = H5P_DATATYPE_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(tcpl_id, H5P_DATATYPE_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype creation property list")
+    else if (TRUE != H5P_isa_class(tcpl_id, H5P_DATATYPE_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype creation property list")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == tapl_id)
+    if (H5P_DEFAULT == tapl_id)
         tapl_id = H5P_DATATYPE_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(tapl_id, H5P_DATATYPE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
+    else if (TRUE != H5P_isa_class(tapl_id, H5P_DATATYPE_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
 
     /* Commit the type */
-    if(H5T__commit_named(&loc, name, type, lcpl_id, tcpl_id, tapl_id, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
+    if (H5T__commit_named(&loc, name, type, lcpl_id, tcpl_id, tapl_id, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcommit2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__commit_named
  *
@@ -179,13 +162,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt,
-    hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id)
+H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, hid_t lcpl_id, hid_t tcpl_id,
+                  hid_t tapl_id, hid_t dxpl_id)
 {
-    H5O_obj_create_t ocrt_info;             /* Information for object creation */
-    H5T_obj_create_t tcrt_info;             /* Information for named datatype creation */
-    H5T_state_t old_state = H5T_STATE_TRANSIENT;        /* The state of the datatype before H5T__commit. */
-    herr_t      ret_value = SUCCEED;        /* Return value */
+    H5O_obj_create_t ocrt_info;                       /* Information for object creation */
+    H5T_obj_create_t tcrt_info;                       /* Information for named datatype creation */
+    H5T_state_t      old_state = H5T_STATE_TRANSIENT; /* The state of the datatype before H5T__commit. */
+    herr_t           ret_value = SUCCEED;             /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -202,16 +185,16 @@ H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt,
     old_state = dt->shared->state;
 
     /* Set up named datatype creation info */
-    tcrt_info.dt = dt;
+    tcrt_info.dt      = dt;
     tcrt_info.tcpl_id = tcpl_id;
 
     /* Set up object creation information */
     ocrt_info.obj_type = H5O_TYPE_NAMED_DATATYPE;
     ocrt_info.crt_info = &tcrt_info;
-    ocrt_info.new_obj = NULL;
+    ocrt_info.new_obj  = NULL;
 
     /* Create the new named datatype and link it to its parent group */
-    if(H5L_link_object(loc, name, &ocrt_info, lcpl_id, tapl_id, dxpl_id) < 0)
+    if (H5L_link_object(loc, name, &ocrt_info, lcpl_id, tapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to create and link to named datatype")
     HDassert(ocrt_info.new_obj);
 
@@ -219,34 +202,34 @@ done:
     /* If the datatype was committed but something failed after that, we need
      * to return it to the state it was in before it was committed.
      */
-    if(ret_value < 0 && (NULL != ocrt_info.new_obj)) {
-	if(dt->shared->state == H5T_STATE_OPEN && dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED) {
+    if (ret_value < 0 && (NULL != ocrt_info.new_obj)) {
+        if (dt->shared->state == H5T_STATE_OPEN && dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED) {
             /* Remove the datatype from the list of opened objects in the file */
-            if(H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+            if (H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-            if(H5FO_delete(dt->sh_loc.file, dxpl_id, dt->sh_loc.u.loc.oh_addr) < 0)
-                HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't remove dataset from list of open objects")
+            if (H5FO_delete(dt->sh_loc.file, dxpl_id, dt->sh_loc.u.loc.oh_addr) < 0)
+                HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL,
+                            "can't remove dataset from list of open objects")
 
             /* Close the datatype object */
-	    if(H5O_close(&(dt->oloc)) < 0)
+            if (H5O_close(&(dt->oloc)) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release object header")
 
             /* Remove the datatype's object header from the file */
-            if(H5O_delete(dt->sh_loc.file, dxpl_id, dt->sh_loc.u.loc.oh_addr) < 0)
+            if (H5O_delete(dt->sh_loc.file, dxpl_id, dt->sh_loc.u.loc.oh_addr) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "unable to delete object header")
 
             /* Mark datatype as being back in memory */
-            if(H5T_set_loc(dt, dt->sh_loc.file, H5T_LOC_MEMORY))
+            if (H5T_set_loc(dt, dt->sh_loc.file, H5T_LOC_MEMORY))
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "unable to return datatype to memory")
-	    dt->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;
+            dt->sh_loc.type   = H5O_SHARE_TYPE_UNSHARED;
             dt->shared->state = old_state;
-	} /* end if */
-    } /* end if */
+        } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__commit_named() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tcommit_anon
  *
@@ -269,55 +252,54 @@ done:
 herr_t
 H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id)
 {
-    H5G_loc_t	loc;                    /* Group location for location */
-    H5T_t	*type = NULL;           /* Datatype created */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Group location for location */
+    H5T_t *   type      = NULL;    /* Datatype created */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iiii", loc_id, type_id, tcpl_id, tapl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == tcpl_id)
+    if (H5P_DEFAULT == tcpl_id)
         tcpl_id = H5P_DATATYPE_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(tcpl_id, H5P_DATATYPE_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype creation property list")
+    else if (TRUE != H5P_isa_class(tcpl_id, H5P_DATATYPE_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype creation property list")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == tapl_id)
+    if (H5P_DEFAULT == tapl_id)
         tapl_id = H5P_DATATYPE_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(tapl_id, H5P_DATATYPE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
+    else if (TRUE != H5P_isa_class(tapl_id, H5P_DATATYPE_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
 
     /* Commit the type */
-    if(H5T__commit(loc.oloc->file, type, tcpl_id, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
+    if (H5T__commit(loc.oloc->file, type, tcpl_id, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
     /* Release the datatype's object header */
     {
-        H5O_loc_t *oloc;         /* Object location for datatype */
+        H5O_loc_t *oloc; /* Object location for datatype */
 
         /* Get the new committed datatype's object location */
-        if(NULL == (oloc = H5T_oloc(type)))
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to get object location of committed datatype")
+        if (NULL == (oloc = H5T_oloc(type)))
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL,
+                        "unable to get object location of committed datatype")
 
         /* Decrement refcount on committed datatype's object header in memory */
-        if(H5O_dec_rc_by_loc(oloc, H5AC_dxpl_id) < 0)
-           HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
+        if (H5O_dec_rc_by_loc(oloc, H5AC_dxpl_id) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL,
+                        "unable to decrement refcount on newly created object")
     } /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcommit_anon() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__commit
  *
@@ -334,11 +316,11 @@ done:
 herr_t
 H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id)
 {
-    H5O_loc_t   temp_oloc;              /* Temporary object header location */
-    H5G_name_t  temp_path;              /* Temporary path */
-    hbool_t     loc_init = FALSE;       /* Have temp_oloc and temp_path been initialized? */
-    size_t      dtype_size;             /* Size of the datatype message */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_loc_t  temp_oloc;           /* Temporary object header location */
+    H5G_name_t temp_path;           /* Temporary path */
+    hbool_t    loc_init = FALSE;    /* Have temp_oloc and temp_path been initialized? */
+    size_t     dtype_size;          /* Size of the datatype message */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -347,7 +329,7 @@ H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id)
     HDassert(tcpl_id != H5P_DEFAULT);
 
     /* Check if we are allowed to write to this file */
-    if(0 == (H5F_INTENT(file) & H5F_ACC_RDWR))
+    if (0 == (H5F_INTENT(file) & H5F_ACC_RDWR))
         HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /*
@@ -355,31 +337,31 @@ H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id)
      * normally fails on such types (try H5Tclose(H5T_NATIVE_INT)) but closing
      * a named type should always succeed.
      */
-    if(H5T_STATE_NAMED == type->shared->state || H5T_STATE_OPEN == type->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "datatype is already committed")
-    if(H5T_STATE_IMMUTABLE == type->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "datatype is immutable")
+    if (H5T_STATE_NAMED == type->shared->state || H5T_STATE_OPEN == type->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "datatype is already committed")
+    if (H5T_STATE_IMMUTABLE == type->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "datatype is immutable")
 
     /* Check for a "sensible" datatype to store on disk */
-    if(H5T_is_sensible(type) <= 0)
+    if (H5T_is_sensible(type) <= 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "datatype is not sensible")
 
     /* Mark datatype as being on disk now.  This step changes the size of
      *  datatype as stored on disk.
      */
-    if(H5T_set_loc(type, file, H5T_LOC_DISK) < 0)
+    if (H5T_set_loc(type, file, H5T_LOC_DISK) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "cannot mark datatype on disk")
 
     /* Reset datatype location and path */
-    if(H5O_loc_reset(&temp_oloc) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize location")
-    if(H5G_name_reset(&temp_path) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize path")
+    if (H5O_loc_reset(&temp_oloc) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize location")
+    if (H5G_name_reset(&temp_path) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize path")
     loc_init = TRUE;
 
     /* Set the latest format, if requested */
-    if(H5F_USE_LATEST_FORMAT(file))
-        if(H5T_set_latest_version(type) < 0)
+    if (H5F_USE_LATEST_FORMAT(file))
+        if (H5T_set_latest_version(type) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set latest version of datatype")
 
     /* Calculate message size infomation, for creating object header */
@@ -390,56 +372,58 @@ H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id)
      * Create the object header and open it for write access. Insert the data
      * type message and then give the object header a name.
      */
-    if(H5O_create(file, dxpl_id, dtype_size, (size_t)1, tcpl_id, &temp_oloc) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to create datatype object header")
-    if(H5O_msg_create(&temp_oloc, H5O_DTYPE_ID, H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, type, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to update type header message")
+    if (H5O_create(file, dxpl_id, dtype_size, (size_t)1, tcpl_id, &temp_oloc) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to create datatype object header")
+    if (H5O_msg_create(&temp_oloc, H5O_DTYPE_ID, H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_DONTSHARE,
+                       H5O_UPDATE_TIME, type, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to update type header message")
 
     /* Copy the new object header's location into the datatype, taking ownership of it */
-    if(H5O_loc_copy(&(type->oloc), &temp_oloc, H5_COPY_SHALLOW) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy datatype location")
-    if(H5G_name_copy(&(type->path), &temp_path, H5_COPY_SHALLOW) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy datatype location")
+    if (H5O_loc_copy(&(type->oloc), &temp_oloc, H5_COPY_SHALLOW) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy datatype location")
+    if (H5G_name_copy(&(type->path), &temp_path, H5_COPY_SHALLOW) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy datatype location")
     loc_init = FALSE;
 
     /* Set the shared info fields */
     H5T_update_shared(type);
-    type->shared->state = H5T_STATE_OPEN;
+    type->shared->state    = H5T_STATE_OPEN;
     type->shared->fo_count = 1;
 
     /* Add datatype to the list of open objects in the file */
-    if(H5FO_top_incr(type->sh_loc.file, type->sh_loc.u.loc.oh_addr) < 0)
+    if (H5FO_top_incr(type->sh_loc.file, type->sh_loc.u.loc.oh_addr) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, FAIL, "can't incr object ref. count")
-    if(H5FO_insert(type->sh_loc.file, type->sh_loc.u.loc.oh_addr, type->shared, TRUE) < 0)
+    if (H5FO_insert(type->sh_loc.file, type->sh_loc.u.loc.oh_addr, type->shared, TRUE) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "can't insert datatype into list of open objects")
 
     /* Mark datatype as being on memory again.  Since this datatype may still be
      *  used in memory after committed to disk, change its size back as in memory.
      */
-    if(H5T_set_loc(type, NULL, H5T_LOC_MEMORY) < 0)
+    if (H5T_set_loc(type, NULL, H5T_LOC_MEMORY) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "cannot mark datatype in memory")
 
 done:
-    if(ret_value < 0) {
-        if(loc_init) {
+    if (ret_value < 0) {
+        if (loc_init) {
             H5O_loc_free(&temp_oloc);
             H5G_name_free(&temp_path);
         } /* end if */
-        if((type->shared->state == H5T_STATE_TRANSIENT || type->shared->state == H5T_STATE_RDONLY) && (type->sh_loc.type == H5O_SHARE_TYPE_COMMITTED)) {
-            if(H5O_dec_rc_by_loc(&(type->oloc), dxpl_id) < 0)
-                HDONE_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
-	    if(H5O_close(&(type->oloc)) < 0)
+        if ((type->shared->state == H5T_STATE_TRANSIENT || type->shared->state == H5T_STATE_RDONLY) &&
+            (type->sh_loc.type == H5O_SHARE_TYPE_COMMITTED)) {
+            if (H5O_dec_rc_by_loc(&(type->oloc), dxpl_id) < 0)
+                HDONE_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL,
+                            "unable to decrement refcount on newly created object")
+            if (H5O_close(&(type->oloc)) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release object header")
-            if(H5O_delete(file, dxpl_id, type->sh_loc.u.loc.oh_addr) < 0)
+            if (H5O_delete(file, dxpl_id, type->sh_loc.u.loc.oh_addr) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "unable to delete object header")
-	    type->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;
-	} /* end if */
-    } /* end if */
+            type->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;
+        } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5T__commit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tcommitted
  *
@@ -457,15 +441,15 @@ done:
 htri_t
 H5Tcommitted(hid_t type_id)
 {
-    H5T_t	*type;          /* Datatype to query */
-    htri_t      ret_value;      /* Return value */
+    H5T_t *type;      /* Datatype to query */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", type_id);
 
     /* Check arguments */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Set return value */
     ret_value = H5T_committed(type);
@@ -474,7 +458,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcommitted() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_committed
  *
@@ -498,7 +481,6 @@ H5T_committed(const H5T_t *type)
     FUNC_LEAVE_NOAPI(H5T_STATE_OPEN == type->shared->state || H5T_STATE_NAMED == type->shared->state)
 } /* end H5T_committed() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_link
  *
@@ -516,7 +498,7 @@ H5T_committed(const H5T_t *type)
 int
 H5T_link(const H5T_t *type, int adjust, hid_t dxpl_id)
 {
-    int ret_value;      /* Return value */
+    int ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -524,14 +506,13 @@ H5T_link(const H5T_t *type, int adjust, hid_t dxpl_id)
     HDassert(type->sh_loc.type == H5O_SHARE_TYPE_COMMITTED);
 
     /* Adjust the link count on the named datatype */
-    if((ret_value = H5O_link(&type->oloc, adjust, dxpl_id)) < 0)
+    if ((ret_value = H5O_link(&type->oloc, adjust, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_LINKCOUNT, FAIL, "unable to adjust named datatype link count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Topen2
  *
@@ -549,31 +530,30 @@ done:
 hid_t
 H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
 {
-    H5T_t      *type = NULL;           /* Datatype opened in file */
-    H5G_loc_t	 loc;                   /* Group location of object to open */
-    H5G_name_t   path;            	/* Datatype group hier. path */
-    H5O_loc_t    oloc;            	/* Datatype object location */
-    H5O_type_t   obj_type;              /* Type of object at location */
-    H5G_loc_t    type_loc;              /* Group object for datatype */
-    hbool_t      obj_found = FALSE;     /* Object at 'name' found */
-    hid_t        dxpl_id = H5AC_ind_dxpl_id; /* dxpl to use to open datatype */
-    hid_t        ret_value = FAIL;      /* Return value */
+    H5T_t *    type = NULL;                  /* Datatype opened in file */
+    H5G_loc_t  loc;                          /* Group location of object to open */
+    H5G_name_t path;                         /* Datatype group hier. path */
+    H5O_loc_t  oloc;                         /* Datatype object location */
+    H5O_type_t obj_type;                     /* Type of object at location */
+    H5G_loc_t  type_loc;                     /* Group object for datatype */
+    hbool_t    obj_found = FALSE;            /* Object at 'name' found */
+    hid_t      dxpl_id   = H5AC_ind_dxpl_id; /* dxpl to use to open datatype */
+    hid_t      ret_value = FAIL;             /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "i*si", loc_id, name, tapl_id);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == tapl_id)
+    if (H5P_DEFAULT == tapl_id)
         tapl_id = H5P_DATATYPE_ACCESS_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(tapl_id, H5P_DATATYPE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
+    else if (TRUE != H5P_isa_class(tapl_id, H5P_DATATYPE_ACCESS))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
 
     /* Set up datatype location to fill in */
     type_loc.oloc = &oloc;
@@ -584,38 +564,37 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
      * Find the named datatype object header and read the datatype message
      * from it.
      */
-    if(H5G_loc_find(&loc, name, &type_loc/*out*/, tapl_id, dxpl_id) < 0)
+    if (H5G_loc_find(&loc, name, &type_loc /*out*/, tapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "not found")
     obj_found = TRUE;
 
     /* Check that the object found is the correct type */
-    if(H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
+    if (H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get object type")
-    if(obj_type != H5O_TYPE_NAMED_DATATYPE)
+    if (obj_type != H5O_TYPE_NAMED_DATATYPE)
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a named datatype")
 
     /* Open it */
-    if(NULL == (type = H5T_open(&type_loc, dxpl_id)))
+    if (NULL == (type = H5T_open(&type_loc, dxpl_id)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to open named datatype")
 
     /* Register the type and return the ID */
-    if((ret_value = H5I_register(H5I_DATATYPE, type, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, type, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register named datatype")
 
 done:
-    if(ret_value < 0) {
-        if(type != NULL)
+    if (ret_value < 0) {
+        if (type != NULL)
             H5T_close(type);
         else {
-            if(obj_found && H5F_addr_defined(type_loc.oloc->addr))
+            if (obj_found && H5F_addr_defined(type_loc.oloc->addr))
                 H5G_loc_free(&type_loc);
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Topen2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_create_plist
  *
@@ -635,39 +614,39 @@ done:
 hid_t
 H5Tget_create_plist(hid_t dtype_id)
 {
-    H5T_t	        *type;          /* Datatype object for ID */
-    H5P_genplist_t      *tcpl_plist;    /* Existing datatype creation propertty list */
-    hid_t		new_tcpl_id = FAIL;     /* New datatype creation property list */
-    herr_t              status;         /* Generic status value */
-    hid_t		ret_value;      /* Return value */
+    H5T_t *         type;               /* Datatype object for ID */
+    H5P_genplist_t *tcpl_plist;         /* Existing datatype creation propertty list */
+    hid_t           new_tcpl_id = FAIL; /* New datatype creation property list */
+    herr_t          status;             /* Generic status value */
+    hid_t           ret_value;          /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", dtype_id);
 
     /* Check arguments */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Copy the default datatype creation property list */
-    if(NULL == (tcpl_plist = (H5P_genplist_t *)H5I_object(H5P_LST_DATATYPE_CREATE_ID_g)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get default creation property list")
-    if((new_tcpl_id = H5P_copy_plist(tcpl_plist, TRUE)) < 0)
+    if (NULL == (tcpl_plist = (H5P_genplist_t *)H5I_object(H5P_LST_DATATYPE_CREATE_ID_g)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get default creation property list")
+    if ((new_tcpl_id = H5P_copy_plist(tcpl_plist, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to copy the creation property list")
 
     /* Check if the datatype is committed */
-    if((status = H5T_committed(type)) < 0)
+    if ((status = H5T_committed(type)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't check whether datatype is committed")
 
     /* Retrieve further information, if the datatype is committed */
-    if(status > 0) {
-        H5P_genplist_t  *new_plist;     /* New datatype creation property list */
+    if (status > 0) {
+        H5P_genplist_t *new_plist; /* New datatype creation property list */
 
         /* Get property list object for new TCPL */
-        if(NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_tcpl_id)))
+        if (NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_tcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
         /* Retrieve any object creation properties */
-        if(H5O_get_create_plist(&type->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
+        if (H5O_get_create_plist(&type->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get object creation info")
     } /* end if */
 
@@ -675,15 +654,14 @@ H5Tget_create_plist(hid_t dtype_id)
     ret_value = new_tcpl_id;
 
 done:
-    if(ret_value < 0)
-        if(new_tcpl_id > 0)
-            if(H5I_dec_app_ref(new_tcpl_id) < 0)
+    if (ret_value < 0)
+        if (new_tcpl_id > 0)
+            if (H5I_dec_app_ref(new_tcpl_id) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "unable to close temporary object")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_open
  *
@@ -701,57 +679,57 @@ done:
 H5T_t *
 H5T_open(const H5G_loc_t *loc, hid_t dxpl_id)
 {
-    H5T_shared_t   *shared_fo = NULL;
-    H5T_t          *dt = NULL;
-    H5T_t          *ret_value;
+    H5T_shared_t *shared_fo = NULL;
+    H5T_t *       dt        = NULL;
+    H5T_t *       ret_value;
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(loc);
 
     /* Check if datatype was already open */
-    if(NULL == (shared_fo = (H5T_shared_t *)H5FO_opened(loc->oloc->file, loc->oloc->addr))) {
+    if (NULL == (shared_fo = (H5T_shared_t *)H5FO_opened(loc->oloc->file, loc->oloc->addr))) {
         /* Clear any errors from H5FO_opened() */
         H5E_clear_stack(NULL);
 
         /* Open the datatype object */
-        if(NULL == (dt = H5T_open_oid(loc, dxpl_id)))
+        if (NULL == (dt = H5T_open_oid(loc, dxpl_id)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, NULL, "not found")
 
         /* Add the datatype to the list of opened objects in the file */
-        if(H5FO_insert(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr, dt->shared, FALSE) < 0)
+        if (H5FO_insert(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr, dt->shared, FALSE) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, NULL, "can't insert datatype into list of open objects")
 
         /* Increment object count for the object in the top file */
-        if(H5FO_top_incr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+        if (H5FO_top_incr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, NULL, "can't increment object count")
 
         /* Mark any datatypes as being in memory now */
-        if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
+        if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location")
 
         dt->shared->fo_count = 1;
     } /* end if */
     else {
-        if(NULL == (dt = H5FL_MALLOC(H5T_t)))
+        if (NULL == (dt = H5FL_MALLOC(H5T_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for datatype")
 
 #if defined(H5_USING_MEMCHECKER) || !defined(NDEBUG)
         /* Clear object location */
-        if(H5O_loc_reset(&(dt->oloc)) < 0)
+        if (H5O_loc_reset(&(dt->oloc)) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to reset location")
 
         /* Clear path name */
-        if(H5G_name_reset(&(dt->path)) < 0)
+        if (H5G_name_reset(&(dt->path)) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to reset path")
 #endif /* H5_USING_MEMCHECKER */
 
         /* Shallow copy (take ownership) of the object location object */
-        if(H5O_loc_copy(&dt->oloc, loc->oloc, H5_COPY_SHALLOW) < 0)
+        if (H5O_loc_copy(&dt->oloc, loc->oloc, H5_COPY_SHALLOW) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy object location")
 
         /* Shallow copy (take ownership) of the group hier. path */
-        if(H5G_name_copy(&(dt->path), loc->path, H5_COPY_SHALLOW) < 0)
+        if (H5G_name_copy(&(dt->path), loc->path, H5_COPY_SHALLOW) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy path")
 
         /* Set the shared component info */
@@ -761,30 +739,30 @@ H5T_open(const H5G_loc_t *loc, hid_t dxpl_id)
         dt->shared = shared_fo;
 
         /* Mark any datatypes as being in memory now */
-        if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
+        if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location")
 
         /* Increment ref. count on shared info */
         shared_fo->fo_count++;
 
         /* Check if the object has been opened through the top file yet */
-        if(H5FO_top_count(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) == 0) {
+        if (H5FO_top_count(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) == 0) {
             /* Open the object through this top file */
-            if(H5O_open(&(dt->oloc)) < 0)
+            if (H5O_open(&(dt->oloc)) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to open object header")
         } /* end if */
 
         /* Increment object count for the object in the top file */
-        if(H5FO_top_incr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+        if (H5FO_top_incr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, NULL, "can't increment object count")
     } /* end else */
 
     ret_value = dt;
 
 done:
-    if(ret_value == NULL) {
-        if(dt) {
-            if(shared_fo == NULL)   /* Need to free shared fo */
+    if (ret_value == NULL) {
+        if (dt) {
+            if (shared_fo == NULL) /* Need to free shared fo */
                 dt->shared = H5FL_FREE(H5T_shared_t, dt->shared);
 
             H5O_loc_free(&(dt->oloc));
@@ -793,14 +771,13 @@ done:
             dt = H5FL_FREE(H5T_t, dt);
         } /* end if */
 
-        if(shared_fo)
+        if (shared_fo)
             shared_fo->fo_count--;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_open_oid
  *
@@ -818,30 +795,30 @@ done:
 static H5T_t *
 H5T_open_oid(const H5G_loc_t *loc, hid_t dxpl_id)
 {
-    H5T_t *dt = NULL;          /* Datatype from the file */
-    H5T_t *ret_value;          /* Return value */
+    H5T_t *dt = NULL; /* Datatype from the file */
+    H5T_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(loc);
 
     /* Open named datatype object in file */
-    if(H5O_open(loc->oloc) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to open named datatype")
+    if (H5O_open(loc->oloc) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to open named datatype")
 
     /* Deserialize the datatype message into a datatype in memory */
-    if(NULL == (dt = (H5T_t *)H5O_msg_read(loc->oloc, H5O_DTYPE_ID, NULL, dxpl_id)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to load type message from object header")
+    if (NULL == (dt = (H5T_t *)H5O_msg_read(loc->oloc, H5O_DTYPE_ID, NULL, dxpl_id)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to load type message from object header")
 
     /* Mark the type as named and open */
     dt->shared->state = H5T_STATE_OPEN;
 
     /* Shallow copy (take ownership) of the object location object */
-    if(H5O_loc_copy(&dt->oloc, loc->oloc, H5_COPY_SHALLOW) < 0)
+    if (H5O_loc_copy(&dt->oloc, loc->oloc, H5_COPY_SHALLOW) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy object location")
 
     /* Shallow copy (take ownership) of the group hier. path */
-    if(H5G_name_copy(&(dt->path), loc->path, H5_COPY_SHALLOW) < 0)
+    if (H5G_name_copy(&(dt->path), loc->path, H5_COPY_SHALLOW) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy path")
 
     /* Set the shared component info */
@@ -851,14 +828,13 @@ H5T_open_oid(const H5G_loc_t *loc, hid_t dxpl_id)
     ret_value = dt;
 
 done:
-    if(ret_value == NULL)
-        if(dt == NULL)
+    if (ret_value == NULL)
+        if (dt == NULL)
             H5O_close(loc->oloc);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_open_oid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_update_shared
  *
@@ -883,4 +859,3 @@ H5T_update_shared(H5T_t *dt)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5T_update_shared() */
-
diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c
index ca87d22..ba067be 100644
--- a/src/H5Tcompound.c
+++ b/src/H5Tcompound.c
@@ -20,64 +20,54 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_compound_interface
-
+#define H5_INTERFACE_INIT_FUNC H5T_init_compound_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/*generic functions			  */
-#include "H5Eprivate.h"		/*error handling			  */
-#include "H5Iprivate.h"		/*ID functions		   		  */
-#include "H5MMprivate.h"	/*memory management			  */
-#include "H5Tpkg.h"		/*data-type functions			  */
+#include "H5private.h"   /*generic functions			  */
+#include "H5Eprivate.h"  /*error handling			  */
+#include "H5Iprivate.h"  /*ID functions		   		  */
+#include "H5MMprivate.h" /*memory management			  */
+#include "H5Tpkg.h"      /*data-type functions			  */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 static herr_t H5T_pack(const H5T_t *dt);
 static htri_t H5T_is_packed(const H5T_t *dt);
 
-
 /*********************/
 /* Public Variables */
 /*********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_compound_interface -- Initialize interface-specific information
@@ -97,7 +87,6 @@ H5T_init_compound_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_compound_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_member_offset
  *
@@ -121,17 +110,17 @@ H5T_init_compound_interface(void)
 size_t
 H5Tget_member_offset(hid_t type_id, unsigned membno)
 {
-    H5T_t	*dt;            /* Datatype to query */
-    size_t	ret_value;      /* Return value */
+    H5T_t *dt;        /* Datatype to query */
+    size_t ret_value; /* Return value */
 
     FUNC_ENTER_API(0)
     H5TRACE2("z", "iIu", type_id, membno);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a compound datatype")
-    if(membno >= dt->shared->u.compnd.nmembs)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid member number")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a compound datatype")
+    if (membno >= dt->shared->u.compnd.nmembs)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid member number")
 
     /* Value */
     ret_value = H5T_GET_MEMBER_OFFSET(dt->shared, membno);
@@ -140,7 +129,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_member_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_get_member_offset
  *
@@ -171,7 +159,6 @@ H5T_get_member_offset(const H5T_t *dt, unsigned membno)
     FUNC_LEAVE_NOAPI(dt->shared->u.compnd.memb[membno].offset)
 } /* end H5T_get_member_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_member_class
  *
@@ -191,16 +178,16 @@ H5T_get_member_offset(const H5T_t *dt, unsigned membno)
 H5T_class_t
 H5Tget_member_class(hid_t type_id, unsigned membno)
 {
-    H5T_t	*dt;            /* Datatype to query */
-    H5T_class_t	ret_value;      /* Return value */
+    H5T_t *     dt;        /* Datatype to query */
+    H5T_class_t ret_value; /* Return value */
 
     FUNC_ENTER_API(H5T_NO_CLASS)
     H5TRACE2("Tt", "iIu", type_id, membno);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NO_CLASS, "not a compound datatype")
-    if(membno >= dt->shared->u.compnd.nmembs)
+    if (membno >= dt->shared->u.compnd.nmembs)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5T_NO_CLASS, "invalid member number")
 
     /* Get the type's class.  We have to use this function to get type class
@@ -212,7 +199,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_member_class() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_member_type
  *
@@ -234,32 +220,31 @@ done:
 hid_t
 H5Tget_member_type(hid_t type_id, unsigned membno)
 {
-    H5T_t	*dt;                    /* Datatype to query */
-    H5T_t	*memb_dt = NULL;        /* Member datatype */
-    hid_t	ret_value;              /* Return value */
+    H5T_t *dt;             /* Datatype to query */
+    H5T_t *memb_dt = NULL; /* Member datatype */
+    hid_t  ret_value;      /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "iIu", type_id, membno);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
-    if(membno >= dt->shared->u.compnd.nmembs)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid member number")
-    if(NULL == (memb_dt = H5T_get_member_type(dt, membno, H5T_COPY_REOPEN)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to retrieve member type")
-    if((ret_value = H5I_register(H5I_DATATYPE, memb_dt, TRUE)) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable register datatype atom")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
+    if (membno >= dt->shared->u.compnd.nmembs)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid member number")
+    if (NULL == (memb_dt = H5T_get_member_type(dt, membno, H5T_COPY_REOPEN)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to retrieve member type")
+    if ((ret_value = H5I_register(H5I_DATATYPE, memb_dt, TRUE)) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable register datatype atom")
 
 done:
-    if(ret_value < 0)
-        if(memb_dt && H5T_close(memb_dt) < 0)
+    if (ret_value < 0)
+        if (memb_dt && H5T_close(memb_dt) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CANTCLOSEOBJ, FAIL, "can't close datatype")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_member_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_get_member_type
  *
@@ -280,7 +265,7 @@ done:
 H5T_t *
 H5T_get_member_type(const H5T_t *dt, unsigned membno, H5T_copy_t method)
 {
-    H5T_t	*ret_value;     /* Return value */
+    H5T_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -288,14 +273,13 @@ H5T_get_member_type(const H5T_t *dt, unsigned membno, H5T_copy_t method)
     HDassert(membno < dt->shared->u.compnd.nmembs);
 
     /* Copy datatype into an atom */
-    if(NULL == (ret_value = H5T_copy(dt->shared->u.compnd.memb[membno].type, method)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy member datatype")
+    if (NULL == (ret_value = H5T_copy(dt->shared->u.compnd.memb[membno].type, method)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy member datatype")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_get_member_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__get_member_size
  *
@@ -320,7 +304,6 @@ H5T__get_member_size(const H5T_t *dt, unsigned membno)
     FUNC_LEAVE_NOAPI(dt->shared->u.compnd.memb[membno].type->shared->size)
 } /* end H5T__get_member_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tinsert
  *
@@ -348,34 +331,34 @@ H5T__get_member_size(const H5T_t *dt, unsigned membno)
 herr_t
 H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id)
 {
-    H5T_t	*parent;		/* The compound parent datatype */
-    H5T_t	*member;		/* The member datatype	*/
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *parent;              /* The compound parent datatype */
+    H5T_t *member;              /* The member datatype	*/
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*szi", parent_id, name, offset, member_id);
 
     /* Check args */
-    if(parent_id == member_id)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't insert compound datatype within itself")
-    if(NULL == (parent = (H5T_t *)H5I_object_verify(parent_id, H5I_DATATYPE)) || H5T_COMPOUND != parent->shared->type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
-    if(H5T_STATE_TRANSIENT != parent->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "parent type read-only")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no member name")
-    if(NULL == (member = (H5T_t *)H5I_object_verify(member_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (parent_id == member_id)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't insert compound datatype within itself")
+    if (NULL == (parent = (H5T_t *)H5I_object_verify(parent_id, H5I_DATATYPE)) ||
+        H5T_COMPOUND != parent->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
+    if (H5T_STATE_TRANSIENT != parent->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "parent type read-only")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no member name")
+    if (NULL == (member = (H5T_t *)H5I_object_verify(member_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Insert */
-    if(H5T__insert(parent, name, offset, member) < 0)
+    if (H5T__insert(parent, name, offset, member) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "unable to insert member")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tinsert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tpack
  *
@@ -394,25 +377,25 @@ done:
 herr_t
 H5Tpack(hid_t type_id)
 {
-    H5T_t	*dt;                    /* Datatype to modify */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype to modify */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_detect_class(dt, H5T_COMPOUND, TRUE) <= 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) ||
+        H5T_detect_class(dt, H5T_COMPOUND, TRUE) <= 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
 
     /* Pack */
-    if(H5T_pack(dt) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to pack compound datatype")
+    if (H5T_pack(dt) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to pack compound datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tpack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__insert
  *
@@ -431,10 +414,10 @@ done:
 herr_t
 H5T__insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
 {
-    unsigned	idx;                        /* Index of member to insert */
-    size_t	total_size;
-    unsigned	i;                          /* Local index variable */
-    herr_t      ret_value = SUCCEED;        /* Return value */
+    unsigned idx; /* Index of member to insert */
+    size_t   total_size;
+    unsigned i;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -445,45 +428,44 @@ H5T__insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
     HDassert(name && *name);
 
     /* Does NAME already exist in PARENT? */
-    for(i = 0; i < parent->shared->u.compnd.nmembs; i++)
-	if(!HDstrcmp(parent->shared->u.compnd.memb[i].name, name))
-	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "member name is not unique")
+    for (i = 0; i < parent->shared->u.compnd.nmembs; i++)
+        if (!HDstrcmp(parent->shared->u.compnd.memb[i].name, name))
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "member name is not unique")
 
     /* Does the new member overlap any existing member ? */
     total_size = member->shared->size;
-    for(i = 0; i < parent->shared->u.compnd.nmembs; i++)
-        if((offset <= parent->shared->u.compnd.memb[i].offset &&
-                 (offset + total_size) > parent->shared->u.compnd.memb[i].offset) ||
-                (parent->shared->u.compnd.memb[i].offset <= offset &&
-                 (parent->shared->u.compnd.memb[i].offset +
-                 parent->shared->u.compnd.memb[i].size) > offset))
+    for (i = 0; i < parent->shared->u.compnd.nmembs; i++)
+        if ((offset <= parent->shared->u.compnd.memb[i].offset &&
+             (offset + total_size) > parent->shared->u.compnd.memb[i].offset) ||
+            (parent->shared->u.compnd.memb[i].offset <= offset &&
+             (parent->shared->u.compnd.memb[i].offset + parent->shared->u.compnd.memb[i].size) > offset))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "member overlaps with another member")
 
     /* Does the new member overlap the end of the compound type? */
-    if((offset + total_size) > parent->shared->size)
+    if ((offset + total_size) > parent->shared->size)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "member extends past end of compound type")
 
     /* Increase member array if necessary */
-    if(parent->shared->u.compnd.nmembs >= parent->shared->u.compnd.nalloc) {
-        unsigned na = MAX(1, parent->shared->u.compnd.nalloc * 2);
+    if (parent->shared->u.compnd.nmembs >= parent->shared->u.compnd.nalloc) {
+        unsigned     na = MAX(1, parent->shared->u.compnd.nalloc * 2);
         H5T_cmemb_t *x = (H5T_cmemb_t *)H5MM_realloc(parent->shared->u.compnd.memb, na * sizeof(H5T_cmemb_t));
 
-        if(!x)
+        if (!x)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed")
         parent->shared->u.compnd.nalloc = na;
-        parent->shared->u.compnd.memb = x;
+        parent->shared->u.compnd.memb   = x;
     } /* end if */
 
     /* Add member to end of member array */
-    idx = parent->shared->u.compnd.nmembs;
-    parent->shared->u.compnd.memb[idx].name = H5MM_xstrdup(name);
+    idx                                       = parent->shared->u.compnd.nmembs;
+    parent->shared->u.compnd.memb[idx].name   = H5MM_xstrdup(name);
     parent->shared->u.compnd.memb[idx].offset = offset;
-    parent->shared->u.compnd.memb[idx].size = total_size;
-    parent->shared->u.compnd.memb[idx].type = H5T_copy(member, H5T_COPY_ALL);
+    parent->shared->u.compnd.memb[idx].size   = total_size;
+    parent->shared->u.compnd.memb[idx].type   = H5T_copy(member, H5T_COPY_ALL);
 
     parent->shared->u.compnd.sorted = H5T_SORT_NONE;
     parent->shared->u.compnd.nmembs++;
-    parent->shared->u.compnd.memb_size+=total_size;
+    parent->shared->u.compnd.memb_size += total_size;
 
     /* It should not be possible to get this far if the type is already packed
      * - the new member would overlap something */
@@ -493,23 +475,22 @@ H5T__insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
     H5T__update_packed(parent);
 
     /* Set the "force conversion" flag if the field's datatype indicates */
-    if(member->shared->force_conv == TRUE)
+    if (member->shared->force_conv == TRUE)
         parent->shared->force_conv = TRUE;
 
     /* Check for member having a later version than the parent */
-    if(parent->shared->version < member->shared->version)
+    if (parent->shared->version < member->shared->version)
         /* Upgrade parent datatype (and all other members also) */
         /* (can't use a partial datatype and later versions of the format are
          *  more efficient, so might as well upgrade all members also... -QAK)
          */
-        if(H5T__upgrade_version(parent, member->shared->version) < 0)
-	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade member encoding version")
+        if (H5T__upgrade_version(parent, member->shared->version) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade member encoding version")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_pack
  *
@@ -526,48 +507,49 @@ done:
 static herr_t
 H5T_pack(const H5T_t *dt)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(dt);
 
-    if(H5T_detect_class(dt, H5T_COMPOUND, FALSE) > 0) {
+    if (H5T_detect_class(dt, H5T_COMPOUND, FALSE) > 0) {
         /* If datatype has been packed, skip packing it and indicate success */
-        if(TRUE == H5T_is_packed(dt))
+        if (TRUE == H5T_is_packed(dt))
             HGOTO_DONE(SUCCEED)
 
         /* Check for packing unmodifiable datatype */
-        if(H5T_STATE_TRANSIENT != dt->shared->state)
+        if (H5T_STATE_TRANSIENT != dt->shared->state)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "datatype is read-only")
 
-        if(dt->shared->parent) {
+        if (dt->shared->parent) {
             if (H5T_pack(dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to pack parent of datatype")
 
             /* Adjust size of datatype appropriately */
-            if(dt->shared->type == H5T_ARRAY)
+            if (dt->shared->type == H5T_ARRAY)
                 dt->shared->size = dt->shared->parent->shared->size * dt->shared->u.array.nelem;
-            else if(dt->shared->type != H5T_VLEN)
+            else if (dt->shared->type != H5T_VLEN)
                 dt->shared->size = dt->shared->parent->shared->size;
         } /* end if */
-        else if(dt->shared->type == H5T_COMPOUND) {
-            size_t	offset;                 /* Offset of member */
-            unsigned i;                     /* Local index variable */
+        else if (dt->shared->type == H5T_COMPOUND) {
+            size_t   offset; /* Offset of member */
+            unsigned i;      /* Local index variable */
 
             /* Recursively pack the members */
-            for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-                if(H5T_pack(dt->shared->u.compnd.memb[i].type) < 0)
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to pack part of a compound datatype")
+            for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+                if (H5T_pack(dt->shared->u.compnd.memb[i].type) < 0)
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+                                "unable to pack part of a compound datatype")
 
                 /* Update the member size */
                 dt->shared->u.compnd.memb[i].size = (dt->shared->u.compnd.memb[i].type)->shared->size;
             } /* end for */
 
             /* Remove padding between members */
-            if(H5T__sort_value(dt, NULL) < 0)
-		HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOMPARE, FAIL, "value sort failed")
-            for(i = 0, offset = 0; i < dt->shared->u.compnd.nmembs; i++) {
+            if (H5T__sort_value(dt, NULL) < 0)
+                HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOMPARE, FAIL, "value sort failed")
+            for (i = 0, offset = 0; i < dt->shared->u.compnd.nmembs; i++) {
                 dt->shared->u.compnd.memb[i].offset = offset;
                 offset += dt->shared->u.compnd.memb[i].size;
             }
@@ -578,13 +560,12 @@ H5T_pack(const H5T_t *dt)
             /* Mark the type as packed now */
             dt->shared->u.compnd.packed = TRUE;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_pack() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_is_packed
  *
@@ -603,25 +584,24 @@ done:
 static htri_t
 H5T_is_packed(const H5T_t *dt)
 {
-    htri_t      ret_value = TRUE;       /* Return value */
+    htri_t ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(dt);
 
     /* Go up the chain as far as possible */
-    while(dt->shared->parent)
+    while (dt->shared->parent)
         dt = dt->shared->parent;
 
     /* If this is a compound datatype, check if it is packed */
-    if(dt->shared->type == H5T_COMPOUND) {
+    if (dt->shared->type == H5T_COMPOUND) {
         ret_value = (htri_t)(dt->shared->u.compnd.packed);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_is_packed() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__update_packed
  *
@@ -642,7 +622,7 @@ H5T_is_packed(const H5T_t *dt)
 void
 H5T__update_packed(const H5T_t *dt)
 {
-    unsigned    i;                      /* Index */
+    unsigned i; /* Index */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -650,20 +630,19 @@ H5T__update_packed(const H5T_t *dt)
     HDassert(dt->shared->type == H5T_COMPOUND);
 
     /* First check if all space is used in the "top level" type */
-    if(dt->shared->size == dt->shared->u.compnd.memb_size) {
+    if (dt->shared->size == dt->shared->u.compnd.memb_size) {
         /* Set the packed flag to TRUE */
         dt->shared->u.compnd.packed = TRUE;
 
         /* Now check if all members are packed */
-        for(i = 0; i < dt->shared->u.compnd.nmembs; i++)
-            if(!H5T_is_packed(dt->shared->u.compnd.memb[i].type)) {
+        for (i = 0; i < dt->shared->u.compnd.nmembs; i++)
+            if (!H5T_is_packed(dt->shared->u.compnd.memb[i].type)) {
                 dt->shared->u.compnd.packed = FALSE;
                 break;
             } /* end if */
-    } /* end if */
+    }         /* end if */
     else
         dt->shared->u.compnd.packed = FALSE;
 
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5T__update_packed() */
-
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index cf131a7..46bb738 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -19,25 +19,23 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE        /*suppress error about including H5Tpkg         */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg         */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5T_init_conv_interface
-
+#define H5_INTERFACE_INIT_FUNC H5T_init_conv_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Dprivate.h"        /* Datasets                */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5FLprivate.h"    /* Free Lists                           */
-#include "H5HGprivate.h"    /* Global Heaps                */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Pprivate.h"        /* Property lists            */
-#include "H5Tpkg.h"        /* Datatypes                */
-
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Dprivate.h"  /* Datasets                */
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5HGprivate.h" /* Global Heaps                */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Pprivate.h"  /* Property lists            */
+#include "H5Tpkg.h"      /* Datatypes                */
 
 /****************/
 /* Local Macros */
@@ -172,12 +170,14 @@
  *        destination.
  *
  */
-#define H5T_CONV_xX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    *(D) = (DT)(*(S));                                  \
-}
-#define H5T_CONV_xX_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    *(D) = (DT)(*(S));                                  \
-}
+#define H5T_CONV_xX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        *(D) = (DT)(*(S));                                                                                   \
+    }
+#define H5T_CONV_xX_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        *(D) = (DT)(*(S));                                                                                   \
+    }
 
 /* Added a condition branch(else if (*(S) == (DT)(D_MAX))) which seems redundant.
  * It handles a special situation when the source is "float" and assigned the value
@@ -186,356 +186,403 @@
  * equal. In this case, do not return exception but make sure the maximum is assigned
  * to the destination.   SLU - 2005/06/29
  */
-#define H5T_CONV_Xx_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if (*(S) > (ST)(D_MAX)) {                                                 \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(D_MAX);                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else if (*(S) < (ST)(D_MIN)) {                                          \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(D_MIN);                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else                                       \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_Xx_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if (*(S) > (ST)(D_MAX)) {                                                 \
-        *(D) = (DT)(D_MAX);                              \
-    } else if (*(S) < (ST)(D_MIN)) {                                          \
-        *(D) = (DT)(D_MIN);                              \
-    } else                                       \
-        *(D) = (DT)(*(S));                              \
-}
-
-#define H5T_CONV_Ux_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if (*(S) > (ST)(D_MAX)) {                                                 \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI,               \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(D_MAX);                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_Ux_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if (*(S) > (ST)(D_MAX)) {                                                 \
-        *(D) = (DT)(D_MAX);                              \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-
-#define H5T_CONV_sS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)<=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_xX, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_sU_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if (*(S) < 0) {                                                           \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW,              \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = 0;                                      \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_sU_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if(*(S) < 0)                                                              \
-        *(D) = 0;                                      \
-    else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-
-#define H5T_CONV_sU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)<=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_sU, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_uS_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if(sizeof(ST) == sizeof(DT) && *(S) > (DT)(D_MAX)) {                      \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI,               \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(D_MAX);                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_uS_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if (sizeof(ST)==sizeof(DT) && *(S) > (DT)(D_MAX)) {                       \
-        *(D) = (D_MAX);                                  \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-
-#define H5T_CONV_uS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)<=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_uS, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_uU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)<=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_xX, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_Ss(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)>=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_Xx, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_Su_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if(*(S) < 0) {                                                            \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW,              \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = 0;                                      \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else if (sizeof(ST)>sizeof(DT) && *(S) > (ST)(D_MAX)) {                 \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI,               \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(D_MAX);                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_Su_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if(*(S) < 0)                                                              \
-        *(D) = 0;                                      \
-    else if (sizeof(ST)>sizeof(DT) && *(S) > (ST)(D_MAX))                     \
-        *(D) = (DT)(D_MAX);                              \
-    else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-
-#define H5T_CONV_Su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)>=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_Su, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_Us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)>=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_Ux, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_Uu(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)>=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_Ux, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_su_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    /* Assumes memory format of unsigned & signed integers is same */          \
-    if(*(S) < 0) {                                                            \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW,              \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = 0;                                      \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_su_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    /* Assumes memory format of unsigned & signed integers is same */          \
-    if(*(S) < 0)                                                              \
-        *(D) = 0;                                      \
-    else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-
-#define H5T_CONV_su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)==sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_su, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_us_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    /* Assumes memory format of unsigned & signed integers is same */          \
-    if (*(S) > (ST)(D_MAX)) {                                                 \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI,               \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(D_MAX);                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_us_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    /* Assumes memory format of unsigned & signed integers is same */          \
-    if(*(S) > (ST)(D_MAX))                                                    \
-        *(D) = (DT)(D_MAX);                              \
-    else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-
-#define H5T_CONV_us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)==sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_us, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_CONV_fF(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)<=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_xX, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
+#define H5T_CONV_Xx_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        if (*(S) > (ST)(D_MAX)) {                                                                            \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, S, D, cb_struct.user_data);       \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(D_MAX);                                                                          \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else if (*(S) < (ST)(D_MIN)) {                                                                       \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, S, D, cb_struct.user_data);      \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(D_MIN);                                                                          \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_Xx_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        if (*(S) > (ST)(D_MAX)) {                                                                            \
+            *(D) = (DT)(D_MAX);                                                                              \
+        }                                                                                                    \
+        else if (*(S) < (ST)(D_MIN)) {                                                                       \
+            *(D) = (DT)(D_MIN);                                                                              \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_Ux_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        if (*(S) > (ST)(D_MAX)) {                                                                            \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, S, D, cb_struct.user_data);       \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(D_MAX);                                                                          \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_Ux_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        if (*(S) > (ST)(D_MAX)) {                                                                            \
+            *(D) = (DT)(D_MAX);                                                                              \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_sS(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) <= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_xX, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_sU_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        if (*(S) < 0) {                                                                                      \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, S, D, cb_struct.user_data);      \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = 0;                                                                                    \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_sU_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        if (*(S) < 0)                                                                                        \
+            *(D) = 0;                                                                                        \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_sU(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) <= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_sU, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_uS_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        if (sizeof(ST) == sizeof(DT) && *(S) > (DT)(D_MAX)) {                                                \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, S, D, cb_struct.user_data);       \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(D_MAX);                                                                          \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_uS_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        if (sizeof(ST) == sizeof(DT) && *(S) > (DT)(D_MAX)) {                                                \
+            *(D) = (D_MAX);                                                                                  \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_uS(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) <= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_uS, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_uU(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) <= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_xX, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_Ss(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) >= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_Xx, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_Su_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        if (*(S) < 0) {                                                                                      \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, S, D, cb_struct.user_data);      \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = 0;                                                                                    \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else if (sizeof(ST) > sizeof(DT) && *(S) > (ST)(D_MAX)) {                                            \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, S, D, cb_struct.user_data);       \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(D_MAX);                                                                          \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_Su_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        if (*(S) < 0)                                                                                        \
+            *(D) = 0;                                                                                        \
+        else if (sizeof(ST) > sizeof(DT) && *(S) > (ST)(D_MAX))                                              \
+            *(D) = (DT)(D_MAX);                                                                              \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_Su(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) >= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_Su, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_Us(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) >= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_Ux, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_Uu(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) >= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_Ux, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_su_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        /* Assumes memory format of unsigned & signed integers is same */                                    \
+        if (*(S) < 0) {                                                                                      \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, S, D, cb_struct.user_data);      \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = 0;                                                                                    \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_su_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        /* Assumes memory format of unsigned & signed integers is same */                                    \
+        if (*(S) < 0)                                                                                        \
+            *(D) = 0;                                                                                        \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_su(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) == sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_su, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_us_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        /* Assumes memory format of unsigned & signed integers is same */                                    \
+        if (*(S) > (ST)(D_MAX)) {                                                                            \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, S, D, cb_struct.user_data);       \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(D_MAX);                                                                          \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_us_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        /* Assumes memory format of unsigned & signed integers is same */                                    \
+        if (*(S) > (ST)(D_MAX))                                                                              \
+            *(D) = (DT)(D_MAX);                                                                              \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_us(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) == sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_us, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_CONV_fF(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) <= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_xX, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
 
 /* Same as H5T_CONV_Xx_CORE, except that instead of using D_MAX and D_MIN
  * when an overflow occurs, use the 'float' infinity values.
  */
-#define H5T_CONV_Ff_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if(*(S) > (ST)(D_MAX)) {                                                  \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI,               \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (H5T_NATIVE_FLOAT_POS_INF_g);                      \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else if (*(S) < (ST)(D_MIN)) {                                          \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW,              \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (H5T_NATIVE_FLOAT_NEG_INF_g);                      \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_Ff_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if(*(S) > (ST)(D_MAX))                                                    \
-        *(D) = (H5T_NATIVE_FLOAT_POS_INF_g);                              \
-    else if (*(S) < (ST)(D_MIN))                                              \
-        *(D) = (H5T_NATIVE_FLOAT_NEG_INF_g);                              \
-    else                                      \
-        *(D) = (DT)(*(S));                                  \
-}
-
-#define H5T_CONV_Ff(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    HDcompile_assert(sizeof(ST)>=sizeof(DT));                      \
-    H5T_CONV(H5T_CONV_Ff, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)              \
-}
-
-#define H5T_HI_LO_BIT_SET(TYP, V, LO, HI) {                                   \
-    unsigned count;                                                           \
-    unsigned char p;                                                          \
-    unsigned u;                                                               \
-                                                                              \
-    count = 0;                                                                \
-    for(u = 0; u < sizeof(TYP); u++) {                                        \
-        count = (((unsigned)sizeof(TYP) - 1) - u) * 8;                        \
-        p = (unsigned char)((V) >> count);                                    \
-        if(p > 0) {                                                           \
-            if(p & 0x80)                                                      \
-                count += 7;                                                   \
-            else if(p & 0x40)                                                 \
-                count += 6;                                                   \
-            else if(p & 0x20)                                                 \
-                count += 5;                                                   \
-            else if(p & 0x10)                                                 \
-                count += 4;                                                   \
-            else if(p & 0x08)                                                 \
-                count += 3;                                                   \
-            else if(p & 0x04)                                                 \
-                count += 2;                                                   \
-            else if(p & 0x02)                                                 \
-                count += 1;                                                   \
-            break;                                                            \
-        } /* end if */                                                        \
-    } /* end for */                                                           \
-                                                                              \
-    HI = count;                                                               \
-                                                                              \
-    count = 0;                                                                \
-    for(u = 0; u < sizeof(TYP); u++) {                                        \
-        p = (unsigned char)((V) >> (u * 8));                                  \
-        if(p > 0) {                                                           \
-            count = u * 8;                                                    \
-                                                                              \
-            if(p & 0x01)                                                      \
-                ;                                                             \
-            else if(p & 0x02)                                                 \
-                count += 1;                                                   \
-            else if(p & 0x04)                                                 \
-                count += 2;                                                   \
-            else if(p & 0x08)                                                 \
-                count += 3;                                                   \
-            else if(p & 0x10)                                                 \
-                count += 4;                                                   \
-            else if(p & 0x20)                                                 \
-                count += 5;                                                   \
-            else if(p & 0x40)                                                 \
-                count += 6;                                                   \
-            else if(p & 0x80)                                                 \
-                count += 7;                                                   \
-            break;                                                            \
-        } /* end if */                                                        \
-    } /* end for */                                                           \
-                                                                              \
-    LO = count;                                                               \
-}
-
-#define H5T_CONV_xF_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if (sprec > dprec) {                              \
-        unsigned low_bit_pos, high_bit_pos;                                   \
-                                                                              \
-        /* Detect high & low bits set in source */                            \
-        H5T_HI_LO_BIT_SET(ST, *(S), low_bit_pos, high_bit_pos)                \
-                                                                              \
-        /* Check for more bits of precision in src than available in dst */   \
-        if((high_bit_pos - low_bit_pos) >= dprec) {                  \
-            H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PRECISION,          \
-                    src_id, dst_id, S, D, cb_struct.user_data);               \
-            if(except_ret == H5T_CONV_UNHANDLED)                              \
-                /* Let compiler convert if case is ignored by user handler*/  \
-                *(D) = (DT)(*(S));                          \
-            else if(except_ret == H5T_CONV_ABORT)                             \
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-        }                                          \
-        else                                                                  \
-            *(D) = (DT)(*(S));                              \
-    }                                              \
-    else                                                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_xF_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    *(D) = (DT)(*(S));                                  \
-}
-
-#define H5T_CONV_xF(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    H5T_CONV(H5T_CONV_xF, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, Y)                 \
-}
+#define H5T_CONV_Ff_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        if (*(S) > (ST)(D_MAX)) {                                                                            \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, S, D, cb_struct.user_data);       \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (H5T_NATIVE_FLOAT_POS_INF_g);                                                         \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else if (*(S) < (ST)(D_MIN)) {                                                                       \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, S, D, cb_struct.user_data);      \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (H5T_NATIVE_FLOAT_NEG_INF_g);                                                         \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_Ff_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        if (*(S) > (ST)(D_MAX))                                                                              \
+            *(D) = (H5T_NATIVE_FLOAT_POS_INF_g);                                                             \
+        else if (*(S) < (ST)(D_MIN))                                                                         \
+            *(D) = (H5T_NATIVE_FLOAT_NEG_INF_g);                                                             \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_Ff(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(ST) >= sizeof(DT));                                                          \
+        H5T_CONV(H5T_CONV_Ff, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, N)                                         \
+    }
+
+#define H5T_HI_LO_BIT_SET(TYP, V, LO, HI)                                                                    \
+    {                                                                                                        \
+        unsigned      count;                                                                                 \
+        unsigned char p;                                                                                     \
+        unsigned      u;                                                                                     \
+                                                                                                             \
+        count = 0;                                                                                           \
+        for (u = 0; u < sizeof(TYP); u++) {                                                                  \
+            count = (((unsigned)sizeof(TYP) - 1) - u) * 8;                                                   \
+            p     = (unsigned char)((V) >> count);                                                           \
+            if (p > 0) {                                                                                     \
+                if (p & 0x80)                                                                                \
+                    count += 7;                                                                              \
+                else if (p & 0x40)                                                                           \
+                    count += 6;                                                                              \
+                else if (p & 0x20)                                                                           \
+                    count += 5;                                                                              \
+                else if (p & 0x10)                                                                           \
+                    count += 4;                                                                              \
+                else if (p & 0x08)                                                                           \
+                    count += 3;                                                                              \
+                else if (p & 0x04)                                                                           \
+                    count += 2;                                                                              \
+                else if (p & 0x02)                                                                           \
+                    count += 1;                                                                              \
+                break;                                                                                       \
+            } /* end if */                                                                                   \
+        }     /* end for */                                                                                  \
+                                                                                                             \
+        HI = count;                                                                                          \
+                                                                                                             \
+        count = 0;                                                                                           \
+        for (u = 0; u < sizeof(TYP); u++) {                                                                  \
+            p = (unsigned char)((V) >> (u * 8));                                                             \
+            if (p > 0) {                                                                                     \
+                count = u * 8;                                                                               \
+                                                                                                             \
+                if (p & 0x01)                                                                                \
+                    ;                                                                                        \
+                else if (p & 0x02)                                                                           \
+                    count += 1;                                                                              \
+                else if (p & 0x04)                                                                           \
+                    count += 2;                                                                              \
+                else if (p & 0x08)                                                                           \
+                    count += 3;                                                                              \
+                else if (p & 0x10)                                                                           \
+                    count += 4;                                                                              \
+                else if (p & 0x20)                                                                           \
+                    count += 5;                                                                              \
+                else if (p & 0x40)                                                                           \
+                    count += 6;                                                                              \
+                else if (p & 0x80)                                                                           \
+                    count += 7;                                                                              \
+                break;                                                                                       \
+            } /* end if */                                                                                   \
+        }     /* end for */                                                                                  \
+                                                                                                             \
+        LO = count;                                                                                          \
+    }
+
+#define H5T_CONV_xF_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        if (sprec > dprec) {                                                                                 \
+            unsigned low_bit_pos, high_bit_pos;                                                              \
+                                                                                                             \
+            /* Detect high & low bits set in source */                                                       \
+            H5T_HI_LO_BIT_SET(ST, *(S), low_bit_pos, high_bit_pos)                                           \
+                                                                                                             \
+            /* Check for more bits of precision in src than available in dst */                              \
+            if ((high_bit_pos - low_bit_pos) >= dprec) {                                                     \
+                H5T_conv_ret_t except_ret =                                                                  \
+                    (cb_struct.func)(H5T_CONV_EXCEPT_PRECISION, src_id, dst_id, S, D, cb_struct.user_data);  \
+                if (except_ret == H5T_CONV_UNHANDLED)                                                        \
+                    /* Let compiler convert if case is ignored by user handler*/                             \
+                    *(D) = (DT)(*(S));                                                                       \
+                else if (except_ret == H5T_CONV_ABORT)                                                       \
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")    \
+                /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                        \
+            }                                                                                                \
+            else                                                                                             \
+                *(D) = (DT)(*(S));                                                                           \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_xF_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        *(D) = (DT)(*(S));                                                                                   \
+    }
+
+#define H5T_CONV_xF(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        H5T_CONV(H5T_CONV_xF, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, Y)                                         \
+    }
 
 /* Quincey added the condition branch (else if (*(S) != (ST)((DT)(*(S))))).
  * It handles a special situation when the source is "float" and assigned the value
@@ -545,363 +592,399 @@
  * (ST)(D_MAX))) is for some compilers like Sun, HP, IBM, and SGI where under
  * the same situation the "int" doesn't overflow.  SLU - 2005/9/12
  */
-#define H5T_CONV_Fx_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if(*(S) > (ST)(D_MAX) || (sprec < dprec && *(S) == (ST)(D_MAX))) {        \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(D_MAX);                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else if (*(S) < (ST)(D_MIN)) {                                          \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(D_MIN);                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    } else if (*(S) != (ST)((DT)(*(S)))) {                                    \
-        H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE, \
-                src_id, dst_id, S, D, cb_struct.user_data);                   \
-        if(except_ret == H5T_CONV_UNHANDLED)                                  \
-            /* Let compiler convert if case is ignored by user handler*/      \
-            *(D) = (DT)(*(S));                              \
-        else if(except_ret == H5T_CONV_ABORT)                                 \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \
-        /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \
-    }                                              \
-    else                                                                      \
-        *(D) = (DT)(*(S));                              \
-}
-#define H5T_CONV_Fx_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) {                  \
-    if(*(S) > (ST)(D_MAX))                                                    \
-        *(D) = (DT)(D_MAX);                              \
-    else if(*(S) < (ST)(D_MIN))                                               \
-        *(D) = (DT)(D_MIN);                              \
-    else                                                                      \
-        *(D) = (DT)(*(S));                                  \
-}
-
-#define H5T_CONV_Fx(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {                  \
-    H5T_CONV(H5T_CONV_Fx, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, Y)              \
-}
+#define H5T_CONV_Fx_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                         \
+    {                                                                                                        \
+        if (*(S) > (ST)(D_MAX) || (sprec < dprec && *(S) == (ST)(D_MAX))) {                                  \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, S, D, cb_struct.user_data);       \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(D_MAX);                                                                          \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else if (*(S) < (ST)(D_MIN)) {                                                                       \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, S, D, cb_struct.user_data);      \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(D_MIN);                                                                          \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else if (*(S) != (ST)((DT)(*(S)))) {                                                                 \
+            H5T_conv_ret_t except_ret =                                                                      \
+                (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE, src_id, dst_id, S, D, cb_struct.user_data);       \
+            if (except_ret == H5T_CONV_UNHANDLED)                                                            \
+                /* Let compiler convert if case is ignored by user handler*/                                 \
+                *(D) = (DT)(*(S));                                                                           \
+            else if (except_ret == H5T_CONV_ABORT)                                                           \
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")        \
+            /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */                            \
+        }                                                                                                    \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+#define H5T_CONV_Fx_NOEX_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                    \
+    {                                                                                                        \
+        if (*(S) > (ST)(D_MAX))                                                                              \
+            *(D) = (DT)(D_MAX);                                                                              \
+        else if (*(S) < (ST)(D_MIN))                                                                         \
+            *(D) = (DT)(D_MIN);                                                                              \
+        else                                                                                                 \
+            *(D) = (DT)(*(S));                                                                               \
+    }
+
+#define H5T_CONV_Fx(STYPE, DTYPE, ST, DT, D_MIN, D_MAX)                                                      \
+    {                                                                                                        \
+        H5T_CONV(H5T_CONV_Fx, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, Y)                                         \
+    }
 
 /* Since all "no exception" cores do the same thing (assign the value in the
  * source location to the destination location, using casting), use one "core"
  * to do them all.
  */
 #ifndef H5_WANT_DCONV_EXCEPTION
-#define H5T_CONV_NO_EXCEPT_CORE(S,D,ST,DT,D_MIN,D_MAX) {              \
-    *(D) = (DT)(*(S));                                      \
-}
+#define H5T_CONV_NO_EXCEPT_CORE(S, D, ST, DT, D_MIN, D_MAX)                                                  \
+    {                                                                                                        \
+        *(D) = (DT)(*(S));                                                                                   \
+    }
 #endif /* H5_WANT_DCONV_EXCEPTION */
 
-
 /* The main part of every integer hardware conversion macro */
-#define H5T_CONV(GUTS,STYPE,DTYPE,ST,DT,D_MIN,D_MAX,PREC)                \
-{                                                                             \
-    herr_t      ret_value=SUCCEED;      /* Return value         */            \
-                                                                              \
-    FUNC_ENTER_PACKAGE                                                        \
-                                                                              \
-{                                                                             \
-    size_t    elmtno;            /*element number        */    \
-    H5T_CONV_DECL_PREC(PREC)            /*declare precision variables, or not */ \
-    uint8_t     *src_buf;        /*'raw' source buffer        */    \
-    uint8_t     *dst_buf;        /*'raw' destination buffer    */    \
-    ST    *src, *s;            /*source buffer            */    \
-    DT    *dst, *d;            /*destination buffer        */    \
-    H5T_t    *st, *dt;        /*datatype descriptors        */    \
-    ST    src_aligned;            /*source aligned type        */    \
-    DT    dst_aligned;            /*destination aligned type    */    \
-    hbool_t    s_mv, d_mv;        /*move data to align it?    */    \
-    ssize_t    s_stride, d_stride;    /*src and dst strides        */    \
-    size_t      safe;                   /*how many elements are safe to process in each pass */ \
-    H5P_genplist_t      *plist;         /*Property list pointer         */    \
-    H5T_conv_cb_t       cb_struct;      /*conversion callback structure */    \
-                                                                              \
-    switch (cdata->command) {                              \
-    case H5T_CONV_INIT:                                  \
-    /* Sanity check and initialize statistics */                  \
-    cdata->need_bkg = H5T_BKG_NO;                          \
-        if (NULL==(st=(H5T_t*)H5I_object(src_id)) || NULL==(dt=(H5T_t*)H5I_object(dst_id)))   \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,              \
-                          "unable to dereference datatype object ID")          \
-    if (st->shared->size!=sizeof(ST) || dt->shared->size!=sizeof(DT))     \
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,              \
-            "disagreement about datatype size")              \
-    CI_ALLOC_PRIV                                                          \
-    break;                                      \
-                                        \
-    case H5T_CONV_FREE:                                  \
-    /* Print and free statistics */                          \
-    CI_PRINT_STATS(STYPE,DTYPE);                          \
-    CI_FREE_PRIV                                                          \
-    break;                                      \
-                                        \
-    case H5T_CONV_CONV:                                  \
-    /* Initialize source & destination strides */                  \
-    if (buf_stride) {                              \
-            HDassert(buf_stride >= sizeof(ST));                      \
-            HDassert(buf_stride >= sizeof(DT));                      \
-        s_stride = d_stride = (ssize_t)buf_stride;                  \
-    } else {                                  \
-            s_stride = sizeof(ST);                          \
-            d_stride = sizeof(DT);                          \
-        }                                      \
-                                        \
-    /* Is alignment required for source or dest? */                  \
-    s_mv = H5T_NATIVE_##STYPE##_ALIGN_g>1 &&                  \
-               ((size_t)buf%H5T_NATIVE_##STYPE##_ALIGN_g ||              \
-     /* Cray */ ((size_t)((ST*)buf)!=(size_t)buf) ||                  \
-        (size_t)s_stride%H5T_NATIVE_##STYPE##_ALIGN_g);                  \
-    d_mv = H5T_NATIVE_##DTYPE##_ALIGN_g>1 &&                  \
-               ((size_t)buf%H5T_NATIVE_##DTYPE##_ALIGN_g ||              \
-     /* Cray */ ((size_t)((DT*)buf)!=(size_t)buf) ||                  \
-                (size_t)d_stride%H5T_NATIVE_##DTYPE##_ALIGN_g);                  \
-    CI_INC_SRC(s_mv)                              \
-    CI_INC_DST(d_mv)                              \
-                                                                        \
-        /* Get the plist structure */                                         \
-        if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))    \
-            HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find property list for ID") \
-                                                                              \
-        /* Get conversion exception callback property */                      \
-        if(H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)             \
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback") \
-                                                                              \
-        /* Get source and destination datatypes */                  \
-        if(NULL == (st = (H5T_t *)H5I_object(src_id)) || NULL == (dt = (H5T_t *)H5I_object(dst_id))) \
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to dereference datatype object ID") \
-                                        \
-        H5T_CONV_SET_PREC(PREC)            /*init precision variables, or not */ \
-                                                                              \
-        /* The outer loop of the type conversion macro, controlling which */  \
-        /* direction the buffer is walked */                      \
-        while (nelmts>0) {                              \
-            /* Check if we need to go backwards through the buffer */          \
-            if(d_stride>s_stride) {                          \
-                /* Compute the number of "safe" destination elements at */    \
-                /* the end of the buffer (Those which don't overlap with */   \
-                /* any source elements at the beginning of the buffer) */     \
-                safe = nelmts - (((nelmts * (size_t)s_stride) + (size_t)(d_stride - 1)) / (size_t)d_stride);      \
-                                        \
-                /* If we're down to the last few elements, just wrap up */    \
-                /* with a "real" reverse copy */                  \
-                if(safe<2) {                              \
-                    src = (ST *)(src_buf = (uint8_t *)buf + (nelmts - 1) * (size_t)s_stride); \
-                    dst = (DT *)(dst_buf = (uint8_t *)buf + (nelmts - 1) * (size_t)d_stride); \
-                    s_stride = -s_stride;                      \
-                    d_stride = -d_stride;                      \
-                                        \
-                    safe=nelmts;                          \
-                } /* end if */                              \
-                else {                                  \
-                    src = (ST *)(src_buf = (uint8_t *)buf + (nelmts - safe) * (size_t)s_stride); \
-                    dst = (DT *)(dst_buf = (uint8_t *)buf + (nelmts - safe) * (size_t)d_stride); \
-                } /* end else */                          \
-            } /* end if */                              \
-            else {                                  \
-                /* Single forward pass over all data */                  \
-                src = (ST *)(src_buf = (uint8_t*)buf);                  \
-                dst = (DT *)(dst_buf = (uint8_t*)buf);                  \
-                safe=nelmts;                              \
-            } /* end else */                              \
-                                                                              \
-            /* Perform loop over elements to convert */                  \
-            if (s_mv && d_mv) {                              \
-                /* Alignment is required for both source and dest */          \
-                s = &src_aligned;                          \
-                H5T_CONV_LOOP_OUTER(PRE_SALIGN,PRE_DALIGN,POST_SALIGN,POST_DALIGN,GUTS,s,d,ST,DT,D_MIN,D_MAX) \
-            } else if(s_mv) {                              \
-                /* Alignment is required only for source */              \
-                s = &src_aligned;                          \
-                H5T_CONV_LOOP_OUTER(PRE_SALIGN,PRE_DNOALIGN,POST_SALIGN,POST_DNOALIGN,GUTS,s,dst,ST,DT,D_MIN,D_MAX) \
-            } else if(d_mv) {                              \
-                /* Alignment is required only for destination */          \
-                H5T_CONV_LOOP_OUTER(PRE_SNOALIGN,PRE_DALIGN,POST_SNOALIGN,POST_DALIGN,GUTS,src,d,ST,DT,D_MIN,D_MAX) \
-            } else {                                  \
-                /* Alignment is not required for both source and destination */ \
-                H5T_CONV_LOOP_OUTER(PRE_SNOALIGN,PRE_DNOALIGN,POST_SNOALIGN,POST_DNOALIGN,GUTS,src,dst,ST,DT,D_MIN,D_MAX) \
-            }                                             \
-                                        \
-            /* Decrement number of elements left to convert */              \
-            nelmts-=safe;                              \
-        } /* end while */                              \
-        break;                                      \
-                                        \
-    default:                                      \
-    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,              \
-            "unknown conversion command");                  \
-    }                                          \
-}                                                                             \
-                                        \
-done:                                                                         \
-    FUNC_LEAVE_NOAPI(ret_value)                                               \
-}
+#define H5T_CONV(GUTS, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, PREC)                                               \
+    {                                                                                                          \
+        herr_t ret_value = SUCCEED; /* Return value         */                                                 \
+                                                                                                               \
+        FUNC_ENTER_PACKAGE                                                                                     \
+                                                                                                               \
+        {                                                                                                      \
+            size_t elmtno;                      /*element number        */                                     \
+            H5T_CONV_DECL_PREC(PREC)            /*declare precision variables, or not */                       \
+            uint8_t *       src_buf;            /*'raw' source buffer        */                                \
+            uint8_t *       dst_buf;            /*'raw' destination buffer    */                               \
+            ST *            src, *s;            /*source buffer            */                                  \
+            DT *            dst, *d;            /*destination buffer        */                                 \
+            H5T_t *         st, *dt;            /*datatype descriptors        */                               \
+            ST              src_aligned;        /*source aligned type        */                                \
+            DT              dst_aligned;        /*destination aligned type    */                               \
+            hbool_t         s_mv, d_mv;         /*move data to align it?    */                                 \
+            ssize_t         s_stride, d_stride; /*src and dst strides        */                                \
+            size_t          safe;               /*how many elements are safe to process in each pass */        \
+            H5P_genplist_t *plist;              /*Property list pointer         */                             \
+            H5T_conv_cb_t   cb_struct;          /*conversion callback structure */                             \
+                                                                                                               \
+            switch (cdata->command) {                                                                          \
+                case H5T_CONV_INIT:                                                                            \
+                    /* Sanity check and initialize statistics */                                               \
+                    cdata->need_bkg = H5T_BKG_NO;                                                              \
+                    if (NULL == (st = (H5T_t *)H5I_object(src_id)) ||                                          \
+                        NULL == (dt = (H5T_t *)H5I_object(dst_id)))                                            \
+                        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,                                          \
+                                    "unable to dereference datatype object ID")                                \
+                    if (st->shared->size != sizeof(ST) || dt->shared->size != sizeof(DT))                      \
+                        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "disagreement about datatype size")      \
+                    CI_ALLOC_PRIV                                                                              \
+                    break;                                                                                     \
+                                                                                                               \
+                case H5T_CONV_FREE:                                                                            \
+                    /* Print and free statistics */                                                            \
+                    CI_PRINT_STATS(STYPE, DTYPE);                                                              \
+                    CI_FREE_PRIV                                                                               \
+                    break;                                                                                     \
+                                                                                                               \
+                case H5T_CONV_CONV:                                                                            \
+                    /* Initialize source & destination strides */                                              \
+                    if (buf_stride) {                                                                          \
+                        HDassert(buf_stride >= sizeof(ST));                                                    \
+                        HDassert(buf_stride >= sizeof(DT));                                                    \
+                        s_stride = d_stride = (ssize_t)buf_stride;                                             \
+                    }                                                                                          \
+                    else {                                                                                     \
+                        s_stride = sizeof(ST);                                                                 \
+                        d_stride = sizeof(DT);                                                                 \
+                    }                                                                                          \
+                                                                                                               \
+                    /* Is alignment required for source or dest? */                                            \
+                    s_mv = H5T_NATIVE_##STYPE##_ALIGN_g > 1 &&                                                 \
+                           ((size_t)buf % H5T_NATIVE_##STYPE##_ALIGN_g ||                                      \
+                            /* Cray */ ((size_t)((ST *)buf) != (size_t)buf) ||                                 \
+                            (size_t)s_stride % H5T_NATIVE_##STYPE##_ALIGN_g);                                  \
+                    d_mv = H5T_NATIVE_##DTYPE##_ALIGN_g > 1 &&                                                 \
+                           ((size_t)buf % H5T_NATIVE_##DTYPE##_ALIGN_g ||                                      \
+                            /* Cray */ ((size_t)((DT *)buf) != (size_t)buf) ||                                 \
+                            (size_t)d_stride % H5T_NATIVE_##DTYPE##_ALIGN_g);                                  \
+                    CI_INC_SRC(s_mv)                                                                           \
+                    CI_INC_DST(d_mv)                                                                           \
+                                                                                                               \
+                    /* Get the plist structure */                                                              \
+                    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))                        \
+                        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find property list for ID")            \
+                                                                                                               \
+                    /* Get conversion exception callback property */                                           \
+                    if (H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)                                 \
+                        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL,                                              \
+                                    "unable to get conversion exception callback")                             \
+                                                                                                               \
+                    /* Get source and destination datatypes */                                                 \
+                    if (NULL == (st = (H5T_t *)H5I_object(src_id)) ||                                          \
+                        NULL == (dt = (H5T_t *)H5I_object(dst_id)))                                            \
+                        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,                                          \
+                                    "unable to dereference datatype object ID")                                \
+                                                                                                               \
+                    H5T_CONV_SET_PREC(PREC) /*init precision variables, or not */                              \
+                                                                                                               \
+                    /* The outer loop of the type conversion macro, controlling which */                       \
+                    /* direction the buffer is walked */                                                       \
+                    while (nelmts > 0) {                                                                       \
+                        /* Check if we need to go backwards through the buffer */                              \
+                        if (d_stride > s_stride) {                                                             \
+                            /* Compute the number of "safe" destination elements at */                         \
+                            /* the end of the buffer (Those which don't overlap with */                        \
+                            /* any source elements at the beginning of the buffer) */                          \
+                            safe = nelmts - (((nelmts * (size_t)s_stride) + (size_t)(d_stride - 1)) /          \
+                                             (size_t)d_stride);                                                \
+                                                                                                               \
+                            /* If we're down to the last few elements, just wrap up */                         \
+                            /* with a "real" reverse copy */                                                   \
+                            if (safe < 2) {                                                                    \
+                                src      = (ST *)(src_buf = (uint8_t *)buf + (nelmts - 1) * (size_t)s_stride); \
+                                dst      = (DT *)(dst_buf = (uint8_t *)buf + (nelmts - 1) * (size_t)d_stride); \
+                                s_stride = -s_stride;                                                          \
+                                d_stride = -d_stride;                                                          \
+                                                                                                               \
+                                safe = nelmts;                                                                 \
+                            } /* end if */                                                                     \
+                            else {                                                                             \
+                                src = (ST *)(src_buf = (uint8_t *)buf + (nelmts - safe) * (size_t)s_stride);   \
+                                dst = (DT *)(dst_buf = (uint8_t *)buf + (nelmts - safe) * (size_t)d_stride);   \
+                            } /* end else */                                                                   \
+                        }     /* end if */                                                                     \
+                        else {                                                                                 \
+                            /* Single forward pass over all data */                                            \
+                            src  = (ST *)(src_buf = (uint8_t *)buf);                                           \
+                            dst  = (DT *)(dst_buf = (uint8_t *)buf);                                           \
+                            safe = nelmts;                                                                     \
+                        } /* end else */                                                                       \
+                                                                                                               \
+                        /* Perform loop over elements to convert */                                            \
+                        if (s_mv && d_mv) {                                                                    \
+                            /* Alignment is required for both source and dest */                               \
+                            s = &src_aligned;                                                                  \
+                            H5T_CONV_LOOP_OUTER(PRE_SALIGN, PRE_DALIGN, POST_SALIGN, POST_DALIGN, GUTS, s,     \
+                                                d, ST, DT, D_MIN, D_MAX)                                       \
+                        }                                                                                      \
+                        else if (s_mv) {                                                                       \
+                            /* Alignment is required only for source */                                        \
+                            s = &src_aligned;                                                                  \
+                            H5T_CONV_LOOP_OUTER(PRE_SALIGN, PRE_DNOALIGN, POST_SALIGN, POST_DNOALIGN, GUTS,    \
+                                                s, dst, ST, DT, D_MIN, D_MAX)                                  \
+                        }                                                                                      \
+                        else if (d_mv) {                                                                       \
+                            /* Alignment is required only for destination */                                   \
+                            H5T_CONV_LOOP_OUTER(PRE_SNOALIGN, PRE_DALIGN, POST_SNOALIGN, POST_DALIGN, GUTS,    \
+                                                src, d, ST, DT, D_MIN, D_MAX)                                  \
+                        }                                                                                      \
+                        else {                                                                                 \
+                            /* Alignment is not required for both source and destination */                    \
+                            H5T_CONV_LOOP_OUTER(PRE_SNOALIGN, PRE_DNOALIGN, POST_SNOALIGN, POST_DNOALIGN,      \
+                                                GUTS, src, dst, ST, DT, D_MIN, D_MAX)                          \
+                        }                                                                                      \
+                                                                                                               \
+                        /* Decrement number of elements left to convert */                                     \
+                        nelmts -= safe;                                                                        \
+                    } /* end while */                                                                          \
+                    break;                                                                                     \
+                                                                                                               \
+                default:                                                                                       \
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unknown conversion command");            \
+            }                                                                                                  \
+        }                                                                                                      \
+                                                                                                               \
+done:                                                                                                          \
+        FUNC_LEAVE_NOAPI(ret_value)                                                                            \
+    }
 
 /* Declare the source & destination precision variables */
 #define H5T_CONV_DECL_PREC(PREC) H5_GLUE(H5T_CONV_DECL_PREC_, PREC)
 
-#define H5T_CONV_DECL_PREC_Y                                                  \
-    size_t    sprec;            /*source precision        */    \
-    size_t    dprec;            /*destination precision        */    \
-    H5T_class_t tclass;                 /*datatype's class        */
+#define H5T_CONV_DECL_PREC_Y                                                                                 \
+    size_t      sprec;  /*source precision        */                                                         \
+    size_t      dprec;  /*destination precision        */                                                    \
+    H5T_class_t tclass; /*datatype's class        */
 
-#define H5T_CONV_DECL_PREC_N            /*no precision variables        */
+#define H5T_CONV_DECL_PREC_N /*no precision variables        */
 
 /* Initialize the source & destination precision variables */
 #define H5T_CONV_SET_PREC(PREC) H5_GLUE(H5T_CONV_SET_PREC_, PREC)
 
-#define H5T_CONV_SET_PREC_Y                                                   \
-        /* Get source & destination precisions into a variable */          \
-        tclass = st->shared->type;                          \
-        HDassert(tclass == H5T_INTEGER || tclass == H5T_FLOAT);              \
-        if(tclass == H5T_INTEGER)                          \
-            sprec = st->shared->u.atomic.prec;                      \
-        else                                      \
-            sprec = 1 + st->shared->u.atomic.u.f.msize;                  \
-        tclass = dt->shared->type;                          \
-        HDassert(tclass == H5T_INTEGER || tclass == H5T_FLOAT);              \
-        if(tclass == H5T_INTEGER)                          \
-            dprec = dt->shared->u.atomic.prec;                      \
-        else                                      \
-            dprec = 1 + dt->shared->u.atomic.u.f.msize;
-
-#define H5T_CONV_SET_PREC_N             /*don't init precision variables */
+#define H5T_CONV_SET_PREC_Y                                                                                  \
+    /* Get source & destination precisions into a variable */                                                \
+    tclass = st->shared->type;                                                                               \
+    HDassert(tclass == H5T_INTEGER || tclass == H5T_FLOAT);                                                  \
+    if (tclass == H5T_INTEGER)                                                                               \
+        sprec = st->shared->u.atomic.prec;                                                                   \
+    else                                                                                                     \
+        sprec = 1 + st->shared->u.atomic.u.f.msize;                                                          \
+    tclass = dt->shared->type;                                                                               \
+    HDassert(tclass == H5T_INTEGER || tclass == H5T_FLOAT);                                                  \
+    if (tclass == H5T_INTEGER)                                                                               \
+        dprec = dt->shared->u.atomic.prec;                                                                   \
+    else                                                                                                     \
+        dprec = 1 + dt->shared->u.atomic.u.f.msize;
+
+#define H5T_CONV_SET_PREC_N /*don't init precision variables */
 
 /* Macro defining action on source data which needs to be aligned (before main action) */
-#define H5T_CONV_LOOP_PRE_SALIGN(ST) {                          \
-    HDmemcpy(&src_aligned, src, sizeof(ST));                      \
-}
+#define H5T_CONV_LOOP_PRE_SALIGN(ST)                                                                         \
+    {                                                                                                        \
+        HDmemcpy(&src_aligned, src, sizeof(ST));                                                             \
+    }
 
 /* Macro defining action on source data which doesn't need to be aligned (before main action) */
-#define H5T_CONV_LOOP_PRE_SNOALIGN(ST) {                      \
-}
+#define H5T_CONV_LOOP_PRE_SNOALIGN(ST)                                                                       \
+    {                                                                                                        \
+    }
 
 /* Macro defining action on destination data which needs to be aligned (before main action) */
-#define H5T_CONV_LOOP_PRE_DALIGN(DT) {                          \
-    d = &dst_aligned;                                  \
-}
+#define H5T_CONV_LOOP_PRE_DALIGN(DT)                                                                         \
+    {                                                                                                        \
+        d = &dst_aligned;                                                                                    \
+    }
 
 /* Macro defining action on destination data which doesn't need to be aligned (before main action) */
-#define H5T_CONV_LOOP_PRE_DNOALIGN(DT) {                      \
-}
+#define H5T_CONV_LOOP_PRE_DNOALIGN(DT)                                                                       \
+    {                                                                                                        \
+    }
 
 /* Macro defining action on source data which needs to be aligned (after main action) */
-#define H5T_CONV_LOOP_POST_SALIGN(ST) {                          \
-}
+#define H5T_CONV_LOOP_POST_SALIGN(ST)                                                                        \
+    {                                                                                                        \
+    }
 
 /* Macro defining action on source data which doesn't need to be aligned (after main action) */
-#define H5T_CONV_LOOP_POST_SNOALIGN(ST) {                      \
-}
+#define H5T_CONV_LOOP_POST_SNOALIGN(ST)                                                                      \
+    {                                                                                                        \
+    }
 
 /* Macro defining action on destination data which needs to be aligned (after main action) */
-#define H5T_CONV_LOOP_POST_DALIGN(DT) {                          \
-    HDmemcpy(dst, &dst_aligned, sizeof(DT));                      \
-}
+#define H5T_CONV_LOOP_POST_DALIGN(DT)                                                                        \
+    {                                                                                                        \
+        HDmemcpy(dst, &dst_aligned, sizeof(DT));                                                             \
+    }
 
 /* Macro defining action on destination data which doesn't need to be aligned (after main action) */
-#define H5T_CONV_LOOP_POST_DNOALIGN(DT) {                      \
-}
+#define H5T_CONV_LOOP_POST_DNOALIGN(DT)                                                                      \
+    {                                                                                                        \
+    }
 
 /* The outer wrapper for the type conversion loop, to check for an exception handling routine */
-#define H5T_CONV_LOOP_OUTER(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX) \
-    if(cb_struct.func) {                                          \
-        H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX) \
-    }                                                                         \
-    else {                                                                    \
-        H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,H5_GLUE(GUTS,_NOEX),S,D,ST,DT,D_MIN,D_MAX) \
+#define H5T_CONV_LOOP_OUTER(PRE_SALIGN_GUTS, PRE_DALIGN_GUTS, POST_SALIGN_GUTS, POST_DALIGN_GUTS, GUTS, S,   \
+                            D, ST, DT, D_MIN, D_MAX)                                                         \
+    if (cb_struct.func) {                                                                                    \
+        H5T_CONV_LOOP(PRE_SALIGN_GUTS, PRE_DALIGN_GUTS, POST_SALIGN_GUTS, POST_DALIGN_GUTS, GUTS, S, D, ST,  \
+                      DT, D_MIN, D_MAX)                                                                      \
+    }                                                                                                        \
+    else {                                                                                                   \
+        H5T_CONV_LOOP(PRE_SALIGN_GUTS, PRE_DALIGN_GUTS, POST_SALIGN_GUTS, POST_DALIGN_GUTS,                  \
+                      H5_GLUE(GUTS, _NOEX), S, D, ST, DT, D_MIN, D_MAX)                                      \
     }
 
 /* The inner loop of the type conversion macro, actually converting the elements */
-#define H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX) \
-    for (elmtno=0; elmtno<safe; elmtno++) {                      \
-        /* Handle source pre-alignment */                      \
-        H5_GLUE(H5T_CONV_LOOP_,PRE_SALIGN_GUTS)(ST)                  \
-                                                                              \
-        /* Handle destination pre-alignment */                      \
-        H5_GLUE(H5T_CONV_LOOP_,PRE_DALIGN_GUTS)(DT)                  \
-                                                                              \
-        /* ... user-defined stuff here -- the conversion ... */              \
-        H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX)                  \
-                                                                              \
-        /* Handle source post-alignment */                      \
-        H5_GLUE(H5T_CONV_LOOP_,POST_SALIGN_GUTS)(ST)                  \
-                                                                              \
-        /* Handle destination post-alignment */                      \
-        H5_GLUE(H5T_CONV_LOOP_,POST_DALIGN_GUTS)(DT)                  \
-                                                                              \
-        /* Advance pointers */                              \
-        src_buf += s_stride;                              \
-        src = (ST *)src_buf;                              \
-        dst_buf += d_stride;                              \
-        dst = (DT *)dst_buf;                              \
+#define H5T_CONV_LOOP(PRE_SALIGN_GUTS, PRE_DALIGN_GUTS, POST_SALIGN_GUTS, POST_DALIGN_GUTS, GUTS, S, D, ST,  \
+                      DT, D_MIN, D_MAX)                                                                      \
+    for (elmtno = 0; elmtno < safe; elmtno++) {                                                              \
+        /* Handle source pre-alignment */                                                                    \
+        H5_GLUE(H5T_CONV_LOOP_, PRE_SALIGN_GUTS)                                                             \
+        (ST)                                                                                                 \
+                                                                                                             \
+            /* Handle destination pre-alignment */                                                           \
+            H5_GLUE(H5T_CONV_LOOP_, PRE_DALIGN_GUTS)(DT)                                                     \
+                                                                                                             \
+            /* ... user-defined stuff here -- the conversion ... */                                          \
+            H5T_CONV_LOOP_GUTS(GUTS, S, D, ST, DT, D_MIN, D_MAX)                                             \
+                                                                                                             \
+            /* Handle source post-alignment */                                                               \
+            H5_GLUE(H5T_CONV_LOOP_, POST_SALIGN_GUTS)(ST)                                                    \
+                                                                                                             \
+            /* Handle destination post-alignment */                                                          \
+            H5_GLUE(H5T_CONV_LOOP_, POST_DALIGN_GUTS)(DT)                                                    \
+                                                                                                             \
+            /* Advance pointers */                                                                           \
+            src_buf += s_stride;                                                                             \
+        src = (ST *)src_buf;                                                                                 \
+        dst_buf += d_stride;                                                                                 \
+        dst = (DT *)dst_buf;                                                                                 \
     }
 
 /* Macro to call the actual "guts" of the type conversion, or call the "no exception" guts */
 #ifdef H5_WANT_DCONV_EXCEPTION
-#define H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX)                  \
-        /* ... user-defined stuff here -- the conversion ... */              \
-        H5_GLUE(GUTS,_CORE)(S,D,ST,DT,D_MIN,D_MAX)
+#define H5T_CONV_LOOP_GUTS(GUTS, S, D, ST, DT, D_MIN, D_MAX)                                                 \
+    /* ... user-defined stuff here -- the conversion ... */                                                  \
+    H5_GLUE(GUTS, _CORE)(S, D, ST, DT, D_MIN, D_MAX)
 #else /* H5_WANT_DCONV_EXCEPTION */
-#define H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX)                  \
-        H5_GLUE(H5T_CONV_NO_EXCEPT,_CORE)(S,D,ST,DT,D_MIN,D_MAX)
+#define H5T_CONV_LOOP_GUTS(GUTS, S, D, ST, DT, D_MIN, D_MAX)                                                 \
+    H5_GLUE(H5T_CONV_NO_EXCEPT, _CORE)(S, D, ST, DT, D_MIN, D_MAX)
 #endif /* H5_WANT_DCONV_EXCEPTION */
 
-
 #ifdef H5T_DEBUG
 
 /* Print alignment statistics */
-#   define CI_PRINT_STATS(STYPE,DTYPE) {                      \
-    if (H5DEBUG(T) && ((H5T_conv_hw_t *)cdata->priv)->s_aligned) {          \
-    HDfprintf(H5DEBUG(T),                              \
-        "      %Hu src elements aligned on %lu-byte boundaries\n",  \
-        ((H5T_conv_hw_t *)cdata->priv)->s_aligned,              \
-        (unsigned long)H5T_NATIVE_##STYPE##_ALIGN_g);              \
-    }                                          \
-    if (H5DEBUG(T) && ((H5T_conv_hw_t *)cdata->priv)->d_aligned) {          \
-    HDfprintf(H5DEBUG(T),                              \
-        "      %Hu dst elements aligned on %lu-byte boundaries\n",  \
-        ((H5T_conv_hw_t *)cdata->priv)->d_aligned,              \
-        (unsigned long)H5T_NATIVE_##DTYPE##_ALIGN_g);              \
-    }                                          \
-}
+#define CI_PRINT_STATS(STYPE, DTYPE)                                                                         \
+    {                                                                                                        \
+        if (H5DEBUG(T) && ((H5T_conv_hw_t *)cdata->priv)->s_aligned) {                                       \
+            HDfprintf(H5DEBUG(T), "      %Hu src elements aligned on %lu-byte boundaries\n",                 \
+                      ((H5T_conv_hw_t *)cdata->priv)->s_aligned,                                             \
+                      (unsigned long)H5T_NATIVE_##STYPE##_ALIGN_g);                                          \
+        }                                                                                                    \
+        if (H5DEBUG(T) && ((H5T_conv_hw_t *)cdata->priv)->d_aligned) {                                       \
+            HDfprintf(H5DEBUG(T), "      %Hu dst elements aligned on %lu-byte boundaries\n",                 \
+                      ((H5T_conv_hw_t *)cdata->priv)->d_aligned,                                             \
+                      (unsigned long)H5T_NATIVE_##DTYPE##_ALIGN_g);                                          \
+        }                                                                                                    \
+    }
 
 /* Allocate private alignment structure for atomic types */
-#   define CI_ALLOC_PRIV \
-    if (NULL==(cdata->priv=H5MM_calloc(sizeof(H5T_conv_hw_t)))) {          \
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,              \
-            "memory allocation failed");                  \
+#define CI_ALLOC_PRIV                                                                                        \
+    if (NULL == (cdata->priv = H5MM_calloc(sizeof(H5T_conv_hw_t)))) {                                        \
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");                            \
     }
 
 /* Free private alignment structure for atomic types */
-#   define CI_FREE_PRIV                                 \
-    if(cdata->priv!=NULL)                               \
+#define CI_FREE_PRIV                                                                                         \
+    if (cdata->priv != NULL)                                                                                 \
         cdata->priv = H5MM_xfree(cdata->priv);
 
 /* Increment source alignment counter */
-#   define CI_INC_SRC(s)   if (s) ((H5T_conv_hw_t *)cdata->priv)->s_aligned += nelmts;
+#define CI_INC_SRC(s)                                                                                        \
+    if (s)                                                                                                   \
+        ((H5T_conv_hw_t *)cdata->priv)->s_aligned += nelmts;
 
 /* Increment destination alignment counter */
-#   define CI_INC_DST(d)   if (d) ((H5T_conv_hw_t *)cdata->priv)->d_aligned += nelmts;
-#else /* H5T_DEBUG */
-#   define CI_PRINT_STATS(STYPE,DTYPE) /*void*/
-#   define CI_ALLOC_PRIV cdata->priv=NULL;
-#   define CI_FREE_PRIV  /* void */
-#   define CI_INC_SRC(s) /* void */
-#   define CI_INC_DST(d) /* void */
-#endif /* H5T_DEBUG */
+#define CI_INC_DST(d)                                                                                        \
+    if (d)                                                                                                   \
+        ((H5T_conv_hw_t *)cdata->priv)->d_aligned += nelmts;
+#else                                /* H5T_DEBUG */
+#define CI_PRINT_STATS(STYPE, DTYPE) /*void*/
+#define CI_ALLOC_PRIV                cdata->priv = NULL;
+#define CI_FREE_PRIV                 /* void */
+#define CI_INC_SRC(s)                /* void */
+#define CI_INC_DST(d)                /* void */
+#endif                               /* H5T_DEBUG */
 
 /* Swap two elements (I & J) of an array using a temporary variable */
-#define H5_SWAP_BYTES(ARRAY,I,J) {uint8_t _tmp; _tmp=ARRAY[I]; ARRAY[I]=ARRAY[J]; ARRAY[J]=_tmp;}
+#define H5_SWAP_BYTES(ARRAY, I, J)                                                                           \
+    {                                                                                                        \
+        uint8_t _tmp;                                                                                        \
+        _tmp     = ARRAY[I];                                                                                 \
+        ARRAY[I] = ARRAY[J];                                                                                 \
+        ARRAY[J] = _tmp;                                                                                     \
+    }
 
 /* Minimum size of variable-length conversion buffer */
-#define H5T_VLEN_MIN_CONF_BUF_SIZE      4096
+#define H5T_VLEN_MIN_CONF_BUF_SIZE 4096
 
 /******************/
 /* Local Typedefs */
@@ -909,54 +992,49 @@ done:                                                                         \
 
 /* Conversion data for H5T__conv_struct() */
 typedef struct H5T_conv_struct_t {
-    int    *src2dst;        /*mapping from src to dst member num */
-    hid_t    *src_memb_id;        /*source member type ID's         */
-    hid_t    *dst_memb_id;        /*destination member type ID's         */
-    H5T_path_t    **memb_path;        /*conversion path for each member    */
-    H5T_subset_info_t   subset_info;    /*info related to compound subsets   */
-    unsigned            src_nmembs;     /*needed by free function            */
+    int *             src2dst;     /*mapping from src to dst member num */
+    hid_t *           src_memb_id; /*source member type ID's         */
+    hid_t *           dst_memb_id; /*destination member type ID's         */
+    H5T_path_t **     memb_path;   /*conversion path for each member    */
+    H5T_subset_info_t subset_info; /*info related to compound subsets   */
+    unsigned          src_nmembs;  /*needed by free function            */
 } H5T_conv_struct_t;
 
 /* Conversion data for H5T__conv_enum() */
 typedef struct H5T_enum_struct_t {
-    int    base;            /*lowest `in' value             */
-    unsigned length;        /*num elements in arrays         */
-    int    *src2dst;        /*map from src to dst index         */
+    int      base;    /*lowest `in' value             */
+    unsigned length;  /*num elements in arrays         */
+    int *    src2dst; /*map from src to dst index         */
 } H5T_enum_struct_t;
 
 /* Conversion data for the hardware conversion functions */
 typedef struct H5T_conv_hw_t {
-    size_t    s_aligned;        /*number source elements aligned     */
-    size_t    d_aligned;        /*number destination elements aligned*/
+    size_t s_aligned; /*number source elements aligned     */
+    size_t d_aligned; /*number destination elements aligned*/
 } H5T_conv_hw_t;
 
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static herr_t H5T_reverse_order(uint8_t *rev, uint8_t *s, size_t size, H5T_order_t order);
 
-
 /*********************/
 /* Public Variables */
 /*********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -967,7 +1045,6 @@ H5FL_BLK_DEFINE_STATIC(vlen_seq);
 /* Declare a free list to manage pieces of array data */
 H5FL_BLK_DEFINE_STATIC(array_seq);
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_conv_interface -- Initialize interface-specific information
@@ -987,7 +1064,6 @@ H5T_init_conv_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_conv_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_noop
  *
@@ -1003,15 +1079,15 @@ H5T_init_conv_interface(void)
  */
 herr_t
 H5T__conv_noop(hid_t H5_ATTR_UNUSED src_id, hid_t H5_ATTR_UNUSED dst_id, H5T_cdata_t *cdata,
-        size_t H5_ATTR_UNUSED nelmts, size_t H5_ATTR_UNUSED buf_stride,
-              size_t H5_ATTR_UNUSED bkg_stride, void H5_ATTR_UNUSED *buf,
-        void H5_ATTR_UNUSED *background, hid_t H5_ATTR_UNUSED dxpl_id)
+               size_t H5_ATTR_UNUSED nelmts, size_t H5_ATTR_UNUSED buf_stride,
+               size_t H5_ATTR_UNUSED bkg_stride, void H5_ATTR_UNUSED *buf, void H5_ATTR_UNUSED *background,
+               hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             cdata->need_bkg = H5T_BKG_NO;
             break;
@@ -1031,7 +1107,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_noop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_order_opt
  *
@@ -1051,39 +1126,38 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                   size_t nelmts, size_t buf_stride,
-                   size_t H5_ATTR_UNUSED bkg_stride, void *_buf,
-                   void H5_ATTR_UNUSED *background, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *background,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    uint8_t    *buf = (uint8_t*)_buf;
-    H5T_t    *src = NULL;
-    H5T_t    *dst = NULL;
-    size_t      i;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    uint8_t *buf = (uint8_t *)_buf;
+    H5T_t *  src = NULL;
+    H5T_t *  dst = NULL;
+    size_t   i;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             /* Capability query */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            if(src->shared->size != dst->shared->size ||
-                    0 != src->shared->u.atomic.offset ||
-                    0 != dst->shared->u.atomic.offset)
+            if (src->shared->size != dst->shared->size || 0 != src->shared->u.atomic.offset ||
+                0 != dst->shared->u.atomic.offset)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "conversion not supported")
-            if((src->shared->type == H5T_REFERENCE && dst->shared->type != H5T_REFERENCE) ||
-                    (dst->shared->type == H5T_REFERENCE && src->shared->type != H5T_REFERENCE))
+            if ((src->shared->type == H5T_REFERENCE && dst->shared->type != H5T_REFERENCE) ||
+                (dst->shared->type == H5T_REFERENCE && src->shared->type != H5T_REFERENCE))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "conversion not supported")
-            if(src->shared->type != H5T_REFERENCE &&
-                    !((H5T_ORDER_BE == src->shared->u.atomic.order && H5T_ORDER_LE == dst->shared->u.atomic.order) ||
-                      (H5T_ORDER_LE == src->shared->u.atomic.order && H5T_ORDER_BE == dst->shared->u.atomic.order)))
+            if (src->shared->type != H5T_REFERENCE && !((H5T_ORDER_BE == src->shared->u.atomic.order &&
+                                                         H5T_ORDER_LE == dst->shared->u.atomic.order) ||
+                                                        (H5T_ORDER_LE == src->shared->u.atomic.order &&
+                                                         H5T_ORDER_BE == dst->shared->u.atomic.order)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "conversion not supported")
-            if(src->shared->size != 1 && src->shared->size != 2 && src->shared->size != 4 &&
-                    src->shared->size != 8 && src->shared->size != 16)
+            if (src->shared->size != 1 && src->shared->size != 2 && src->shared->size != 4 &&
+                src->shared->size != 8 && src->shared->size != 16)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "conversion not supported")
-            switch(src->shared->type) {
+            switch (src->shared->type) {
                 case H5T_INTEGER:
                 case H5T_BITFIELD:
                 case H5T_REFERENCE:
@@ -1091,14 +1165,14 @@ H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
                     break;
 
                 case H5T_FLOAT:
-                    if(src->shared->u.atomic.u.f.sign != dst->shared->u.atomic.u.f.sign ||
-                            src->shared->u.atomic.u.f.epos != dst->shared->u.atomic.u.f.epos ||
-                            src->shared->u.atomic.u.f.esize != dst->shared->u.atomic.u.f.esize ||
-                            src->shared->u.atomic.u.f.ebias != dst->shared->u.atomic.u.f.ebias ||
-                            src->shared->u.atomic.u.f.mpos != dst->shared->u.atomic.u.f.mpos ||
-                            src->shared->u.atomic.u.f.msize != dst->shared->u.atomic.u.f.msize ||
-                            src->shared->u.atomic.u.f.norm != dst->shared->u.atomic.u.f.norm ||
-                            src->shared->u.atomic.u.f.pad != dst->shared->u.atomic.u.f.pad)
+                    if (src->shared->u.atomic.u.f.sign != dst->shared->u.atomic.u.f.sign ||
+                        src->shared->u.atomic.u.f.epos != dst->shared->u.atomic.u.f.epos ||
+                        src->shared->u.atomic.u.f.esize != dst->shared->u.atomic.u.f.esize ||
+                        src->shared->u.atomic.u.f.ebias != dst->shared->u.atomic.u.f.ebias ||
+                        src->shared->u.atomic.u.f.mpos != dst->shared->u.atomic.u.f.mpos ||
+                        src->shared->u.atomic.u.f.msize != dst->shared->u.atomic.u.f.msize ||
+                        src->shared->u.atomic.u.f.norm != dst->shared->u.atomic.u.f.norm ||
+                        src->shared->u.atomic.u.f.pad != dst->shared->u.atomic.u.f.pad)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "conversion not supported")
                     break;
 
@@ -1119,13 +1193,13 @@ H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
         case H5T_CONV_CONV:
             /* The conversion */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
             /* Check for "no op" reference conversion */
-            if(src->shared->type == H5T_REFERENCE) {
+            if (src->shared->type == H5T_REFERENCE) {
                 /* Sanity check */
-                if(dst->shared->type != H5T_REFERENCE)
+                if (dst->shared->type != H5T_REFERENCE)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_REFERENCE datatype")
 
                 /* Check if we are on a little-endian machine (the order that
@@ -1137,186 +1211,186 @@ H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
                  * "native" hobj_ref_t datatype and I think that would break a
                  * lot of existing programs.  -QAK
                  */
-                if(H5T_native_order_g == H5T_ORDER_LE)
+                if (H5T_native_order_g == H5T_ORDER_LE)
                     break;
             } /* end if */
 
             buf_stride = buf_stride ? buf_stride : src->shared->size;
-            switch(src->shared->size) {
+            switch (src->shared->size) {
                 case 1:
                     /*no-op*/
                     break;
 
                 case 2:
-                    for(/*void*/; nelmts >= 20; nelmts -= 20) {
-                        H5_SWAP_BYTES(buf, 0,   1); /*  0 */
+                    for (/*void*/; nelmts >= 20; nelmts -= 20) {
+                        H5_SWAP_BYTES(buf, 0, 1); /*  0 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  1 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  1 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  2 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  2 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  3 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  3 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  4 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  4 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  5 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  5 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  6 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  6 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  7 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  7 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  8 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  8 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /*  9 */
+                        H5_SWAP_BYTES(buf, 0, 1); /*  9 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 10 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 10 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 11 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 11 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 12 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 12 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 13 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 13 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 14 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 14 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 15 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 15 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 16 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 16 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 17 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 17 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 18 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 18 */
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf, 0,   1); /* 19 */
+                        H5_SWAP_BYTES(buf, 0, 1); /* 19 */
                         buf += buf_stride;
                     } /* end for */
-                    for(i = 0; i < nelmts; i++, buf += buf_stride)
+                    for (i = 0; i < nelmts; i++, buf += buf_stride)
                         H5_SWAP_BYTES(buf, 0, 1);
                     break;
 
                 case 4:
-                    for(/*void*/; nelmts >= 20; nelmts -= 20) {
-                        H5_SWAP_BYTES(buf,  0,  3); /*  0 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                    for (/*void*/; nelmts >= 20; nelmts -= 20) {
+                        H5_SWAP_BYTES(buf, 0, 3); /*  0 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  1 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  1 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  2 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  2 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  3 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  3 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  4 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  4 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  5 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  5 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  6 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  6 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  7 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  7 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  8 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  8 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /*  9 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /*  9 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 10 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 10 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 11 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 11 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 12 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 12 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 13 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 13 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 14 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 14 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 15 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 15 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 16 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 16 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 17 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 17 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 18 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 18 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  3); /* 19 */
-                        H5_SWAP_BYTES(buf,  1,  2);
+                        H5_SWAP_BYTES(buf, 0, 3); /* 19 */
+                        H5_SWAP_BYTES(buf, 1, 2);
                         buf += buf_stride;
                     } /* end for */
-                    for(i = 0; i < nelmts; i++, buf += buf_stride) {
+                    for (i = 0; i < nelmts; i++, buf += buf_stride) {
                         H5_SWAP_BYTES(buf, 0, 3);
                         H5_SWAP_BYTES(buf, 1, 2);
                     } /* end for */
                     break;
 
                 case 8:
-                    for(/*void*/; nelmts >= 10; nelmts -= 10) {
-                        H5_SWAP_BYTES(buf,  0,  7); /*  0 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                    for (/*void*/; nelmts >= 10; nelmts -= 10) {
+                        H5_SWAP_BYTES(buf, 0, 7); /*  0 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  1 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  1 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  2 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  2 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  3 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  3 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  4 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  4 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  5 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  5 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  6 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  6 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  7 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  7 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  8 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  8 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,  0,  7); /*  9 */
-                        H5_SWAP_BYTES(buf,  1,  6);
-                        H5_SWAP_BYTES(buf,  2,  5);
-                        H5_SWAP_BYTES(buf,  3,  4);
+                        H5_SWAP_BYTES(buf, 0, 7); /*  9 */
+                        H5_SWAP_BYTES(buf, 1, 6);
+                        H5_SWAP_BYTES(buf, 2, 5);
+                        H5_SWAP_BYTES(buf, 3, 4);
                         buf += buf_stride;
                     } /* end for */
-                    for(i = 0; i < nelmts; i++, buf += buf_stride) {
+                    for (i = 0; i < nelmts; i++, buf += buf_stride) {
                         H5_SWAP_BYTES(buf, 0, 7);
                         H5_SWAP_BYTES(buf, 1, 6);
                         H5_SWAP_BYTES(buf, 2, 5);
@@ -1325,107 +1399,107 @@ H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
                     break;
 
                 case 16:
-                    for(/*void*/; nelmts >= 10; nelmts -= 10) {
-                        H5_SWAP_BYTES(buf,   0,  15); /*  0 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                    for (/*void*/; nelmts >= 10; nelmts -= 10) {
+                        H5_SWAP_BYTES(buf, 0, 15); /*  0 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  1 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  1 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  2 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  2 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  3 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  3 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  4 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  4 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  5 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  5 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  6 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  6 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  7 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  7 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  8 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  8 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
-                        H5_SWAP_BYTES(buf,   0,  15); /*  9 */
-                        H5_SWAP_BYTES(buf,   1,  14);
-                        H5_SWAP_BYTES(buf,   2,  13);
-                        H5_SWAP_BYTES(buf,   3,  12);
-                        H5_SWAP_BYTES(buf,   4,  11);
-                        H5_SWAP_BYTES(buf,   5,  10);
-                        H5_SWAP_BYTES(buf,   6,   9);
-                        H5_SWAP_BYTES(buf,   7,   8);
+                        H5_SWAP_BYTES(buf, 0, 15); /*  9 */
+                        H5_SWAP_BYTES(buf, 1, 14);
+                        H5_SWAP_BYTES(buf, 2, 13);
+                        H5_SWAP_BYTES(buf, 3, 12);
+                        H5_SWAP_BYTES(buf, 4, 11);
+                        H5_SWAP_BYTES(buf, 5, 10);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                         buf += buf_stride;
                     } /* end for */
-                    for(i = 0; i < nelmts; i++, buf += buf_stride) {
+                    for (i = 0; i < nelmts; i++, buf += buf_stride) {
                         H5_SWAP_BYTES(buf, 0, 15);
                         H5_SWAP_BYTES(buf, 1, 14);
                         H5_SWAP_BYTES(buf, 2, 13);
                         H5_SWAP_BYTES(buf, 3, 12);
                         H5_SWAP_BYTES(buf, 4, 11);
                         H5_SWAP_BYTES(buf, 5, 10);
-                        H5_SWAP_BYTES(buf, 6,  9);
-                        H5_SWAP_BYTES(buf, 7,  8);
+                        H5_SWAP_BYTES(buf, 6, 9);
+                        H5_SWAP_BYTES(buf, 7, 8);
                     } /* end for */
                     break;
 
@@ -1446,7 +1520,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_order_opt() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_order
  *
@@ -1471,47 +1544,46 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-        size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *_buf,
-               void H5_ATTR_UNUSED *background, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *background,
+                hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    uint8_t    *buf = (uint8_t*)_buf;
-    H5T_t    *src = NULL;
-    H5T_t    *dst = NULL;
-    size_t    i;
-    size_t    j, md;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    uint8_t *buf = (uint8_t *)_buf;
+    H5T_t *  src = NULL;
+    H5T_t *  dst = NULL;
+    size_t   i;
+    size_t   j, md;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             /* Capability query */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) ||
-                    NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            if(src->shared->size != dst->shared->size || 0 != src->shared->u.atomic.offset ||
-                    0 != dst->shared->u.atomic.offset ||
-                    !((H5T_ORDER_BE == src->shared->u.atomic.order &&
-                       H5T_ORDER_LE == dst->shared->u.atomic.order) ||
-                      (H5T_ORDER_LE == src->shared->u.atomic.order &&
-                       H5T_ORDER_BE == dst->shared->u.atomic.order)))
+            if (src->shared->size != dst->shared->size || 0 != src->shared->u.atomic.offset ||
+                0 != dst->shared->u.atomic.offset ||
+                !((H5T_ORDER_BE == src->shared->u.atomic.order &&
+                   H5T_ORDER_LE == dst->shared->u.atomic.order) ||
+                  (H5T_ORDER_LE == src->shared->u.atomic.order &&
+                   H5T_ORDER_BE == dst->shared->u.atomic.order)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "conversion not supported")
-            switch(src->shared->type) {
+            switch (src->shared->type) {
                 case H5T_INTEGER:
                 case H5T_BITFIELD:
                     /* nothing to check */
                     break;
 
                 case H5T_FLOAT:
-                    if(src->shared->u.atomic.u.f.sign != dst->shared->u.atomic.u.f.sign ||
-                            src->shared->u.atomic.u.f.epos != dst->shared->u.atomic.u.f.epos ||
-                            src->shared->u.atomic.u.f.esize != dst->shared->u.atomic.u.f.esize ||
-                            src->shared->u.atomic.u.f.ebias != dst->shared->u.atomic.u.f.ebias ||
-                            src->shared->u.atomic.u.f.mpos != dst->shared->u.atomic.u.f.mpos ||
-                            src->shared->u.atomic.u.f.msize != dst->shared->u.atomic.u.f.msize ||
-                            src->shared->u.atomic.u.f.norm != dst->shared->u.atomic.u.f.norm ||
-                            src->shared->u.atomic.u.f.pad != dst->shared->u.atomic.u.f.pad) {
+                    if (src->shared->u.atomic.u.f.sign != dst->shared->u.atomic.u.f.sign ||
+                        src->shared->u.atomic.u.f.epos != dst->shared->u.atomic.u.f.epos ||
+                        src->shared->u.atomic.u.f.esize != dst->shared->u.atomic.u.f.esize ||
+                        src->shared->u.atomic.u.f.ebias != dst->shared->u.atomic.u.f.ebias ||
+                        src->shared->u.atomic.u.f.mpos != dst->shared->u.atomic.u.f.mpos ||
+                        src->shared->u.atomic.u.f.msize != dst->shared->u.atomic.u.f.msize ||
+                        src->shared->u.atomic.u.f.norm != dst->shared->u.atomic.u.f.norm ||
+                        src->shared->u.atomic.u.f.pad != dst->shared->u.atomic.u.f.pad) {
                         HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "conversion not supported")
                     } /* end if */
                     break;
@@ -1534,13 +1606,13 @@ H5T__conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
         case H5T_CONV_CONV:
             /* The conversion */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
             buf_stride = buf_stride ? buf_stride : src->shared->size;
-            md = src->shared->size / 2;
-            for(i = 0; i < nelmts; i++, buf += buf_stride)
-                for(j = 0; j < md; j++)
+            md         = src->shared->size / 2;
+            for (i = 0; i < nelmts; i++, buf += buf_stride)
+                for (j = 0; j < md; j++)
                     H5_SWAP_BYTES(buf, j, src->shared->size - (j + 1));
             break;
 
@@ -1556,7 +1628,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_b_b
  *
@@ -1576,40 +1647,36 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-        size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *_buf,
-             void H5_ATTR_UNUSED *background, hid_t dxpl_id)
-{
-    uint8_t    *buf = (uint8_t*)_buf;
-    H5T_t    *src = NULL, *dst = NULL;    /*source and dest datatypes    */
-    ssize_t    direction;        /*direction of traversal    */
-    size_t    elmtno;            /*element number        */
-    size_t    olap;            /*num overlapping elements    */
-    size_t    half_size;        /*1/2 of total size for swapping*/
-    uint8_t    *s, *sp, *d, *dp;    /*source and dest traversal ptrs*/
-    uint8_t    dbuf[256];        /*temp destination buffer    */
-    size_t    msb_pad_offset;        /*offset for dest MSB padding    */
-    size_t    i;
-    uint8_t     *src_rev=NULL;          /*order-reversed source buffer  */
-    H5P_genplist_t      *plist;         /*property list pointer         */
-    H5T_conv_cb_t       cb_struct = {NULL, NULL};      /*conversion callback structure */
-    H5T_conv_ret_t      except_ret;     /*return of callback function   */
-    hbool_t             reverse;        /*if reverse the order of destination        */
-    herr_t      ret_value = SUCCEED;      /* Return value */
+H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+              size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *background, hid_t dxpl_id)
+{
+    uint8_t *       buf = (uint8_t *)_buf;
+    H5T_t *         src = NULL, *dst = NULL; /*source and dest datatypes    */
+    ssize_t         direction;               /*direction of traversal    */
+    size_t          elmtno;                  /*element number        */
+    size_t          olap;                    /*num overlapping elements    */
+    size_t          half_size;               /*1/2 of total size for swapping*/
+    uint8_t *       s, *sp, *d, *dp;         /*source and dest traversal ptrs*/
+    uint8_t         dbuf[256];               /*temp destination buffer    */
+    size_t          msb_pad_offset;          /*offset for dest MSB padding    */
+    size_t          i;
+    uint8_t *       src_rev = NULL;           /*order-reversed source buffer  */
+    H5P_genplist_t *plist;                    /*property list pointer         */
+    H5T_conv_cb_t   cb_struct = {NULL, NULL}; /*conversion callback structure */
+    H5T_conv_ret_t  except_ret;               /*return of callback function   */
+    hbool_t         reverse;                  /*if reverse the order of destination        */
+    herr_t          ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             /* Capability query */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) ||
-                    NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            if(H5T_ORDER_LE != src->shared->u.atomic.order &&
-                    H5T_ORDER_BE != src->shared->u.atomic.order)
+            if (H5T_ORDER_LE != src->shared->u.atomic.order && H5T_ORDER_BE != src->shared->u.atomic.order)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
-            if(H5T_ORDER_LE != dst->shared->u.atomic.order &&
-                    H5T_ORDER_BE != dst->shared->u.atomic.order)
+            if (H5T_ORDER_LE != dst->shared->u.atomic.order && H5T_ORDER_BE != dst->shared->u.atomic.order)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
             cdata->need_bkg = H5T_BKG_NO;
             break;
@@ -1619,7 +1686,7 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the datatypes */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
             /*
@@ -1627,32 +1694,34 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * how many of the elements have the source and destination areas
              * overlapping?
              */
-            if(src->shared->size == dst->shared->size || buf_stride) {
-                sp = dp = (uint8_t*)buf;
+            if (src->shared->size == dst->shared->size || buf_stride) {
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-                olap = nelmts;
-            } else if(src->shared->size >= dst->shared->size) {
-                double olap_d = HDceil((double)(dst->shared->size) /
-                                       (double)(src->shared->size - dst->shared->size));
+                olap      = nelmts;
+            }
+            else if (src->shared->size >= dst->shared->size) {
+                double olap_d =
+                    HDceil((double)(dst->shared->size) / (double)(src->shared->size - dst->shared->size));
 
                 olap = (size_t)olap_d;
-                sp = dp = (uint8_t*)buf;
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-            } else {
-                double olap_d = HDceil((double)(src->shared->size) /
-                                       (double)(dst->shared->size - src->shared->size));
-                olap = (size_t)olap_d;
-                sp = (uint8_t*)buf + (nelmts-1) * src->shared->size;
-                dp = (uint8_t*)buf + (nelmts-1) * dst->shared->size;
+            }
+            else {
+                double olap_d =
+                    HDceil((double)(src->shared->size) / (double)(dst->shared->size - src->shared->size));
+                olap      = (size_t)olap_d;
+                sp        = (uint8_t *)buf + (nelmts - 1) * src->shared->size;
+                dp        = (uint8_t *)buf + (nelmts - 1) * dst->shared->size;
                 direction = -1;
             }
 
             /* Get the plist structure */
-            if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+            if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
                 HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find property list for ID")
 
             /* Get conversion exception callback property */
-            if(H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
+            if (H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback")
 
             /* Allocate space for order-reversed source buffer */
@@ -1662,13 +1731,13 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             H5_CHECK_OVERFLOW(buf_stride, size_t, ssize_t);
             H5_CHECK_OVERFLOW(src->shared->size, size_t, ssize_t);
             H5_CHECK_OVERFLOW(dst->shared->size, size_t, ssize_t);
-            for(elmtno = 0; elmtno < nelmts; elmtno++) {
+            for (elmtno = 0; elmtno < nelmts; elmtno++) {
 
                 /*
                  * If the source and destination buffers overlap then use a
                  * temporary buffer for the destination.
                  */
-                if(direction > 0) {
+                if (direction > 0) {
                     s = sp;
                     d = elmtno < olap ? dbuf : dp;
                 } /* end if */
@@ -1678,12 +1747,12 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 } /* end else */
 #ifndef NDEBUG
                 /* I don't quite trust the overlap calculations yet --rpm */
-                if(d == dbuf)
+                if (d == dbuf)
                     HDassert((dp >= sp && dp < sp + src->shared->size) ||
-                            (sp >= dp && sp < dp + dst->shared->size));
+                             (sp >= dp && sp < dp + dst->shared->size));
                 else
-                    HDassert((dp < sp && dp + dst->shared->size<=sp) ||
-                            (sp < dp && sp + src->shared->size<=dp));
+                    HDassert((dp < sp && dp + dst->shared->size <= sp) ||
+                             (sp < dp && sp + src->shared->size <= dp));
 #endif
 
                 /*
@@ -1691,14 +1760,14 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * complicated.  We'll do all the conversion stuff assuming
                  * little endian and then we'll fix the order at the end.
                  */
-                if(H5T_ORDER_BE == src->shared->u.atomic.order) {
+                if (H5T_ORDER_BE == src->shared->u.atomic.order) {
                     half_size = src->shared->size / 2;
-                    for(i = 0; i < half_size; i++) {
-                        uint8_t tmp = s[src->shared->size - (i + 1)];
+                    for (i = 0; i < half_size; i++) {
+                        uint8_t tmp                    = s[src->shared->size - (i + 1)];
                         s[src->shared->size - (i + 1)] = s[i];
-                        s[i] = tmp;
+                        s[i]                           = tmp;
                     } /* end for */
-                } /* end if */
+                }     /* end if */
 
                 /* Initiate these variables */
                 except_ret = H5T_CONV_UNHANDLED;
@@ -1709,34 +1778,36 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * than the destination then invoke the overflow function or copy
                  * as many bits as possible. Zero extra bits in the destination.
                  */
-                if(src->shared->u.atomic.prec > dst->shared->u.atomic.prec) {
+                if (src->shared->u.atomic.prec > dst->shared->u.atomic.prec) {
                     /*overflow*/
-                    if(cb_struct.func) { /*If user's exception handler is present, use it*/
-                        H5T_reverse_order(src_rev, s, src->shared->size, src->shared->u.atomic.order); /*reverse order first*/
-                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                src_rev, d, cb_struct.user_data);
+                    if (cb_struct.func) { /*If user's exception handler is present, use it*/
+                        H5T_reverse_order(src_rev, s, src->shared->size,
+                                          src->shared->u.atomic.order); /*reverse order first*/
+                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev, d,
+                                                      cb_struct.user_data);
                     } /* end if */
 
-                    if(except_ret == H5T_CONV_UNHANDLED) {
-                        H5T__bit_copy(d, dst->shared->u.atomic.offset,
-                                     s, src->shared->u.atomic.offset, dst->shared->u.atomic.prec);
-                    } else if(except_ret == H5T_CONV_ABORT)
+                    if (except_ret == H5T_CONV_UNHANDLED) {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      dst->shared->u.atomic.prec);
+                    }
+                    else if (except_ret == H5T_CONV_ABORT)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                    else if(except_ret == H5T_CONV_HANDLED)
+                    else if (except_ret == H5T_CONV_HANDLED)
                         /*Don't reverse because user handles it*/
                         reverse = FALSE;
-                } else {
-                    H5T__bit_copy(d, dst->shared->u.atomic.offset,
-                                 s, src->shared->u.atomic.offset,
-                                 src->shared->u.atomic.prec);
-                    H5T__bit_set(d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
-                                dst->shared->u.atomic.prec-src->shared->u.atomic.prec, FALSE);
+                }
+                else {
+                    H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                  src->shared->u.atomic.prec);
+                    H5T__bit_set(d, dst->shared->u.atomic.offset + src->shared->u.atomic.prec,
+                                 dst->shared->u.atomic.prec - src->shared->u.atomic.prec, FALSE);
                 }
 
                 /*
                  * Fill the destination padding areas.
                  */
-                switch(dst->shared->u.atomic.lsb_pad) {
+                switch (dst->shared->u.atomic.lsb_pad) {
                     case H5T_PAD_ZERO:
                         H5T__bit_set(d, (size_t)0, dst->shared->u.atomic.offset, FALSE);
                         break;
@@ -1752,7 +1823,7 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                         HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported LSB padding")
                 } /* end switch */
                 msb_pad_offset = dst->shared->u.atomic.offset + dst->shared->u.atomic.prec;
-                switch(dst->shared->u.atomic.msb_pad) {
+                switch (dst->shared->u.atomic.msb_pad) {
                     case H5T_PAD_ZERO:
                         H5T__bit_set(d, msb_pad_offset, 8 * dst->shared->size - msb_pad_offset, FALSE);
                         break;
@@ -1772,30 +1843,36 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * Put the destination in the correct byte order.  See note at
                  * beginning of loop.
                  */
-                if(H5T_ORDER_BE == dst->shared->u.atomic.order && reverse) {
+                if (H5T_ORDER_BE == dst->shared->u.atomic.order && reverse) {
                     half_size = dst->shared->size / 2;
-                    for(i = 0; i < half_size; i++) {
-                        uint8_t tmp = d[dst->shared->size - (i + 1)];
+                    for (i = 0; i < half_size; i++) {
+                        uint8_t tmp                    = d[dst->shared->size - (i + 1)];
                         d[dst->shared->size - (i + 1)] = d[i];
-                        d[i] = tmp;
+                        d[i]                           = tmp;
                     } /* end for */
-                } /* end if */
+                }     /* end if */
 
                 /*
                  * If we had used a temporary buffer for the destination then we
                  * should copy the value to the true destination buffer.
                  */
-                if(d == dbuf)
+                if (d == dbuf)
                     HDmemcpy(dp, d, dst->shared->size);
-                if(buf_stride) {
-                    sp += direction * (ssize_t)buf_stride; /* Note that cast is checked with H5_CHECK_OVERFLOW, above */
-                    dp += direction * (ssize_t)buf_stride; /* Note that cast is checked with H5_CHECK_OVERFLOW, above */
-                } /* end if */
+                if (buf_stride) {
+                    sp += direction *
+                          (ssize_t)buf_stride; /* Note that cast is checked with H5_CHECK_OVERFLOW, above */
+                    dp += direction *
+                          (ssize_t)buf_stride; /* Note that cast is checked with H5_CHECK_OVERFLOW, above */
+                }                              /* end if */
                 else {
-                    sp += direction * (ssize_t)src->shared->size; /* Note that cast is checked with H5_CHECK_OVERFLOW, above */
-                    dp += direction * (ssize_t)dst->shared->size; /* Note that cast is checked with H5_CHECK_OVERFLOW, above */
-                } /* end else */
-            } /* end for */
+                    sp += direction *
+                          (ssize_t)
+                              src->shared->size; /* Note that cast is checked with H5_CHECK_OVERFLOW, above */
+                    dp += direction *
+                          (ssize_t)
+                              dst->shared->size; /* Note that cast is checked with H5_CHECK_OVERFLOW, above */
+                }                                /* end else */
+            }                                    /* end for */
 
             break;
 
@@ -1804,12 +1881,11 @@ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
     } /* end switch */
 
 done:
-    if(src_rev)
+    if (src_rev)
         H5MM_free(src_rev);
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_b_b() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_conv_struct_free
  *
@@ -1828,15 +1904,14 @@ done:
 static H5T_conv_struct_t *
 H5T_conv_struct_free(H5T_conv_struct_t *priv)
 {
-    int         *src2dst = priv->src2dst;
-    hid_t       *src_memb_id = priv->src_memb_id,
-                *dst_memb_id = priv->dst_memb_id;
-    unsigned    i;
+    int *    src2dst     = priv->src2dst;
+    hid_t *  src_memb_id = priv->src_memb_id, *dst_memb_id = priv->dst_memb_id;
+    unsigned i;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    for(i = 0; i < priv->src_nmembs; i++)
-        if(src2dst[i] >= 0) {
+    for (i = 0; i < priv->src_nmembs; i++)
+        if (src2dst[i] >= 0) {
             int status;
 
             status = H5I_dec_ref(src_memb_id[i]);
@@ -1853,7 +1928,6 @@ H5T_conv_struct_free(H5T_conv_struct_t *priv)
     FUNC_LEAVE_NOAPI((H5T_conv_struct_t *)H5MM_xfree(priv))
 } /* end H5T_conv_struct_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_conv_struct_init
  *
@@ -1905,32 +1979,32 @@ H5T_conv_struct_free(H5T_conv_struct_t *priv)
 static herr_t
 H5T_conv_struct_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
 {
-    H5T_conv_struct_t    *priv = (H5T_conv_struct_t*)(cdata->priv);
-    int                *src2dst = NULL;
-    unsigned            src_nmembs, dst_nmembs;
-    unsigned        i, j;
-    herr_t              ret_value = SUCCEED;       /* Return value */
+    H5T_conv_struct_t *priv    = (H5T_conv_struct_t *)(cdata->priv);
+    int *              src2dst = NULL;
+    unsigned           src_nmembs, dst_nmembs;
+    unsigned           i, j;
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     src_nmembs = src->shared->u.compnd.nmembs;
     dst_nmembs = dst->shared->u.compnd.nmembs;
 
-    if(!priv) {
+    if (!priv) {
         /*
          * Allocate private data structure and arrays.
          */
-        if(NULL == (priv = (H5T_conv_struct_t *)(cdata->priv=H5MM_calloc(sizeof(H5T_conv_struct_t)))) ||
-                NULL == (priv->src2dst = (int *)H5MM_malloc(src_nmembs * sizeof(int))) ||
-                NULL == (priv->src_memb_id = (hid_t *)H5MM_malloc(src_nmembs * sizeof(hid_t))) ||
-                NULL == (priv->dst_memb_id = (hid_t *)H5MM_malloc(dst_nmembs * sizeof(hid_t))))
+        if (NULL == (priv = (H5T_conv_struct_t *)(cdata->priv = H5MM_calloc(sizeof(H5T_conv_struct_t)))) ||
+            NULL == (priv->src2dst = (int *)H5MM_malloc(src_nmembs * sizeof(int))) ||
+            NULL == (priv->src_memb_id = (hid_t *)H5MM_malloc(src_nmembs * sizeof(hid_t))) ||
+            NULL == (priv->dst_memb_id = (hid_t *)H5MM_malloc(dst_nmembs * sizeof(hid_t))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-        src2dst = priv->src2dst;
+        src2dst          = priv->src2dst;
         priv->src_nmembs = src_nmembs;
 
         /* The flag of special optimization to indicate if source members and destination
          * members are a subset of each other.  Initialize it to FALSE */
-        priv->subset_info.subset = H5T_SUBSET_FALSE;
+        priv->subset_info.subset    = H5T_SUBSET_FALSE;
         priv->subset_info.copy_size = 0;
 
         /*
@@ -1946,30 +2020,30 @@ H5T_conv_struct_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
          * source and destination member datatype so we can look up the
          * member datatype conversion functions later.
          */
-        for(i = 0; i < src_nmembs; i++) {
+        for (i = 0; i < src_nmembs; i++) {
             src2dst[i] = -1;
-            for(j = 0; j < dst_nmembs; j++) {
-                if(!HDstrcmp(src->shared->u.compnd.memb[i].name, dst->shared->u.compnd.memb[j].name)) {
+            for (j = 0; j < dst_nmembs; j++) {
+                if (!HDstrcmp(src->shared->u.compnd.memb[i].name, dst->shared->u.compnd.memb[j].name)) {
                     H5_CHECKED_ASSIGN(src2dst[i], int, j, unsigned);
                     break;
                 } /* end if */
-            } /* end for */
-            if(src2dst[i] >= 0) {
-                hid_t    tid;
-                H5T_t    *type;
+            }     /* end for */
+            if (src2dst[i] >= 0) {
+                hid_t  tid;
+                H5T_t *type;
 
                 type = H5T_copy(src->shared->u.compnd.memb[i].type, H5T_COPY_ALL);
-                tid = H5I_register(H5I_DATATYPE, type, FALSE);
+                tid  = H5I_register(H5I_DATATYPE, type, FALSE);
                 HDassert(tid >= 0);
                 priv->src_memb_id[i] = tid;
 
                 type = H5T_copy(dst->shared->u.compnd.memb[src2dst[i]].type, H5T_COPY_ALL);
-                tid = H5I_register(H5I_DATATYPE, type, FALSE);
+                tid  = H5I_register(H5I_DATATYPE, type, FALSE);
                 HDassert(tid >= 0);
                 priv->dst_memb_id[src2dst[i]] = tid;
             } /* end if */
-        } /* end for */
-    } /* end if */
+        }     /* end for */
+    }         /* end if */
     else {
         /* Restore sorted conditions for the datatypes */
         /* (Required for the src2dst array to be valid) */
@@ -1983,62 +2057,73 @@ H5T_conv_struct_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
      */
     src2dst = priv->src2dst;
     H5MM_xfree(priv->memb_path);
-    if(NULL == (priv->memb_path = (H5T_path_t **)H5MM_malloc(src->shared->u.compnd.nmembs * sizeof(H5T_path_t*))))
+    if (NULL ==
+        (priv->memb_path = (H5T_path_t **)H5MM_malloc(src->shared->u.compnd.nmembs * sizeof(H5T_path_t *))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
-    for(i = 0; i < src_nmembs; i++) {
-        if(src2dst[i] >= 0) {
-            H5T_path_t *tpath = H5T_path_find(src->shared->u.compnd.memb[i].type, dst->shared->u.compnd.memb[src2dst[i]].type, NULL, NULL, dxpl_id, FALSE);
+    for (i = 0; i < src_nmembs; i++) {
+        if (src2dst[i] >= 0) {
+            H5T_path_t *tpath =
+                H5T_path_find(src->shared->u.compnd.memb[i].type, dst->shared->u.compnd.memb[src2dst[i]].type,
+                              NULL, NULL, dxpl_id, FALSE);
 
-            if(NULL == (priv->memb_path[i] = tpath)) {
+            if (NULL == (priv->memb_path[i] = tpath)) {
                 cdata->priv = H5T_conv_struct_free(priv);
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unable to convert member datatype")
             } /* end if */
-        } /* end if */
-    } /* end for */
+        }     /* end if */
+    }         /* end for */
 
     /* The compound conversion functions need a background buffer */
     cdata->need_bkg = H5T_BKG_YES;
 
-    if(src_nmembs < dst_nmembs) {
+    if (src_nmembs < dst_nmembs) {
         priv->subset_info.subset = H5T_SUBSET_SRC;
-        for(i = 0; i < src_nmembs; i++) {
+        for (i = 0; i < src_nmembs; i++) {
             /* If any of source members doesn't have counterpart in the same
-                * order or there's conversion between members, don't do the
-                * optimization.
-                */
-            if(src2dst[i] != (int)i || (src->shared->u.compnd.memb[i].offset != dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == FALSE) {
+             * order or there's conversion between members, don't do the
+             * optimization.
+             */
+            if (src2dst[i] != (int)i ||
+                (src->shared->u.compnd.memb[i].offset != dst->shared->u.compnd.memb[i].offset) ||
+                (priv->memb_path[i])->is_noop == FALSE) {
                 priv->subset_info.subset = H5T_SUBSET_FALSE;
                 break;
             } /* end if */
-        } /* end for */
+        }     /* end for */
         /* Compute the size of the data to be copied for each element.  It
-            * may be smaller than either src or dst if there is extra space at
-            * the end of src.
-            */
-        if(priv->subset_info.subset == H5T_SUBSET_SRC)
-            priv->subset_info.copy_size = src->shared->u.compnd.memb[src_nmembs - 1].offset
-                + src->shared->u.compnd.memb[src_nmembs - 1].size;
-    } else if(dst_nmembs < src_nmembs) {
+         * may be smaller than either src or dst if there is extra space at
+         * the end of src.
+         */
+        if (priv->subset_info.subset == H5T_SUBSET_SRC)
+            priv->subset_info.copy_size = src->shared->u.compnd.memb[src_nmembs - 1].offset +
+                                          src->shared->u.compnd.memb[src_nmembs - 1].size;
+    }
+    else if (dst_nmembs < src_nmembs) {
         priv->subset_info.subset = H5T_SUBSET_DST;
-        for(i = 0; i < dst_nmembs; i++) {
+        for (i = 0; i < dst_nmembs; i++) {
             /* If any of source members doesn't have counterpart in the same order or
-                * there's conversion between members, don't do the optimization. */
-            if(src2dst[i] != (int)i || (src->shared->u.compnd.memb[i].offset != dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == FALSE) {
+             * there's conversion between members, don't do the optimization. */
+            if (src2dst[i] != (int)i ||
+                (src->shared->u.compnd.memb[i].offset != dst->shared->u.compnd.memb[i].offset) ||
+                (priv->memb_path[i])->is_noop == FALSE) {
                 priv->subset_info.subset = H5T_SUBSET_FALSE;
                 break;
             }
         } /* end for */
         /* Compute the size of the data to be copied for each element.  It
-            * may be smaller than either src or dst if there is extra space at
-            * the end of dst.
-            */
-        if(priv->subset_info.subset == H5T_SUBSET_DST)
-            priv->subset_info.copy_size = dst->shared->u.compnd.memb[dst_nmembs-1].offset
-                + dst->shared->u.compnd.memb[dst_nmembs-1].size;
-    } else /* If the numbers of source and dest members are equal and no conversion is needed,
-            * the case should have been handled as noop earlier in H5Dio.c. */
-        {;}
+         * may be smaller than either src or dst if there is extra space at
+         * the end of dst.
+         */
+        if (priv->subset_info.subset == H5T_SUBSET_DST)
+            priv->subset_info.copy_size = dst->shared->u.compnd.memb[dst_nmembs - 1].offset +
+                                          dst->shared->u.compnd.memb[dst_nmembs - 1].size;
+    }
+    else /* If the numbers of source and dest members are equal and no conversion is needed,
+          * the case should have been handled as noop earlier in H5Dio.c. */
+    {
+        ;
+    }
 
     cdata->recalc = FALSE;
 
@@ -2046,7 +2131,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_conv_struct_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_struct_subset
  *
@@ -2074,7 +2158,7 @@ done:
 H5T_subset_info_t *
 H5T__conv_struct_subset(const H5T_cdata_t *cdata)
 {
-    H5T_conv_struct_t    *priv;
+    H5T_conv_struct_t *priv;
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -2083,10 +2167,9 @@ H5T__conv_struct_subset(const H5T_cdata_t *cdata)
 
     priv = (H5T_conv_struct_t *)(cdata->priv);
 
-    FUNC_LEAVE_NOAPI((H5T_subset_info_t *) &priv->subset_info)
+    FUNC_LEAVE_NOAPI((H5T_subset_info_t *)&priv->subset_info)
 } /* end H5T__conv_struct_subset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_struct
  *
@@ -2114,29 +2197,29 @@ H5T__conv_struct_subset(const H5T_cdata_t *cdata)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-    size_t buf_stride, size_t bkg_stride, void *_buf, void *_bkg, hid_t dxpl_id)
+H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                 size_t bkg_stride, void *_buf, void *_bkg, hid_t dxpl_id)
 {
-    uint8_t    *buf = (uint8_t *)_buf;    /*cast for pointer arithmetic    */
-    uint8_t    *bkg = (uint8_t *)_bkg;    /*background pointer arithmetic    */
-    uint8_t     *xbuf = buf, *xbkg = bkg;   /*temp pointers into buf and bkg*/
-    H5T_t    *src = NULL;        /*source datatype        */
-    H5T_t    *dst = NULL;        /*destination datatype        */
-    int    *src2dst = NULL;    /*maps src member to dst member    */
-    H5T_cmemb_t    *src_memb = NULL;    /*source struct member descript.*/
-    H5T_cmemb_t    *dst_memb = NULL;    /*destination struct memb desc.    */
-    size_t    offset;            /*byte offset wrt struct    */
-    ssize_t    src_delta;            /*source stride    */
-    ssize_t    bkg_delta;            /*background stride    */
-    size_t    elmtno;
-    unsigned    u;                /*counters            */
-    int            i;            /*counters            */
-    H5T_conv_struct_t *priv = (H5T_conv_struct_t *)(cdata->priv);
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    uint8_t *          buf  = (uint8_t *)_buf;  /*cast for pointer arithmetic    */
+    uint8_t *          bkg  = (uint8_t *)_bkg;  /*background pointer arithmetic    */
+    uint8_t *          xbuf = buf, *xbkg = bkg; /*temp pointers into buf and bkg*/
+    H5T_t *            src      = NULL;         /*source datatype        */
+    H5T_t *            dst      = NULL;         /*destination datatype        */
+    int *              src2dst  = NULL;         /*maps src member to dst member    */
+    H5T_cmemb_t *      src_memb = NULL;         /*source struct member descript.*/
+    H5T_cmemb_t *      dst_memb = NULL;         /*destination struct memb desc.    */
+    size_t             offset;                  /*byte offset wrt struct    */
+    ssize_t            src_delta;               /*source stride    */
+    ssize_t            bkg_delta;               /*background stride    */
+    size_t             elmtno;
+    unsigned           u; /*counters            */
+    int                i; /*counters            */
+    H5T_conv_struct_t *priv      = (H5T_conv_struct_t *)(cdata->priv);
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             /*
              * First, determine if this conversion function applies to the
@@ -2146,12 +2229,12 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              */
             if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
-            if(H5T_COMPOUND != src->shared->type)
+            if (H5T_COMPOUND != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_COMPOUND datatype")
-            if(H5T_COMPOUND != dst->shared->type)
+            if (H5T_COMPOUND != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_COMPOUND datatype")
 
-            if(H5T_conv_struct_init(src, dst, cdata, dxpl_id) < 0)
+            if (H5T_conv_struct_init(src, dst, cdata, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize conversion data")
             break;
 
@@ -2166,12 +2249,12 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             /*
              * Conversion.
              */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
             HDassert(priv);
             HDassert(bkg && cdata->need_bkg);
 
-            if(cdata->recalc && H5T_conv_struct_init(src, dst, cdata, dxpl_id) < 0)
+            if (cdata->recalc && H5T_conv_struct_init(src, dst, cdata, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize conversion data")
 
             /*
@@ -2184,15 +2267,15 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             /*
              * Direction of conversion and striding through background.
              */
-            if(buf_stride) {
+            if (buf_stride) {
                 H5_CHECKED_ASSIGN(src_delta, ssize_t, buf_stride, size_t);
-                if(!bkg_stride) {
+                if (!bkg_stride) {
                     H5_CHECKED_ASSIGN(bkg_delta, ssize_t, dst->shared->size, size_t);
                 } /* end if */
                 else
                     H5_CHECKED_ASSIGN(bkg_delta, ssize_t, bkg_stride, size_t);
             } /* end if */
-            else if(dst->shared->size <= src->shared->size) {
+            else if (dst->shared->size <= src->shared->size) {
                 H5_CHECKED_ASSIGN(src_delta, ssize_t, src->shared->size, size_t);
                 H5_CHECKED_ASSIGN(bkg_delta, ssize_t, dst->shared->size, size_t);
             } /* end else-if */
@@ -2206,7 +2289,7 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             } /* end else */
 
             /* Conversion loop... */
-            for(elmtno = 0; elmtno < nelmts; elmtno++) {
+            for (elmtno = 0; elmtno < nelmts; elmtno++) {
                 /*
                  * For each source member which will be present in the
                  * destination, convert the member to the destination type unless
@@ -2215,28 +2298,27 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * data point as small as possible with all the free space on the
                  * right side.
                  */
-                for(u = 0, offset = 0; u < src->shared->u.compnd.nmembs; u++) {
-                    if(src2dst[u] < 0)
+                for (u = 0, offset = 0; u < src->shared->u.compnd.nmembs; u++) {
+                    if (src2dst[u] < 0)
                         continue; /*subsetting*/
                     src_memb = src->shared->u.compnd.memb + u;
                     dst_memb = dst->shared->u.compnd.memb + src2dst[u];
 
-                    if(dst_memb->size <= src_memb->size) {
-                        if(H5T_convert(priv->memb_path[u], priv->src_memb_id[u],
-                                priv->dst_memb_id[src2dst[u]],
-                                (size_t)1, (size_t)0, (size_t)0, /*no striding (packed array)*/
-                                xbuf + src_memb->offset, xbkg + dst_memb->offset,
-                                dxpl_id) < 0)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert compound datatype member")
+                    if (dst_memb->size <= src_memb->size) {
+                        if (H5T_convert(priv->memb_path[u], priv->src_memb_id[u],
+                                        priv->dst_memb_id[src2dst[u]], (size_t)1, (size_t)0,
+                                        (size_t)0, /*no striding (packed array)*/
+                                        xbuf + src_memb->offset, xbkg + dst_memb->offset, dxpl_id) < 0)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+                                        "unable to convert compound datatype member")
                         HDmemmove(xbuf + offset, xbuf + src_memb->offset, dst_memb->size);
                         offset += dst_memb->size;
                     } /* end if */
                     else {
-                        HDmemmove (xbuf+offset, xbuf+src_memb->offset,
-                                   src_memb->size);
+                        HDmemmove(xbuf + offset, xbuf + src_memb->offset, src_memb->size);
                         offset += src_memb->size;
                     } /* end else */
-                } /* end for */
+                }     /* end for */
 
                 /*
                  * For each source member which will be present in the
@@ -2246,20 +2328,20 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * background buffer.
                  */
                 H5_CHECK_OVERFLOW(src->shared->u.compnd.nmembs, size_t, int);
-                for(i = (int)src->shared->u.compnd.nmembs - 1; i >= 0; --i) {
-                    if(src2dst[i] < 0)
+                for (i = (int)src->shared->u.compnd.nmembs - 1; i >= 0; --i) {
+                    if (src2dst[i] < 0)
                         continue; /*subsetting*/
                     src_memb = src->shared->u.compnd.memb + i;
                     dst_memb = dst->shared->u.compnd.memb + src2dst[i];
 
-                    if(dst_memb->size > src_memb->size) {
+                    if (dst_memb->size > src_memb->size) {
                         offset -= src_memb->size;
-                        if(H5T_convert(priv->memb_path[i],
-                                    priv->src_memb_id[i], priv->dst_memb_id[src2dst[i]],
-                                    (size_t)1, (size_t)0, (size_t)0, /*no striding (packed array)*/
-                                    xbuf + offset, xbkg + dst_memb->offset,
-                                    dxpl_id) < 0)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert compound datatype member")
+                        if (H5T_convert(priv->memb_path[i], priv->src_memb_id[i],
+                                        priv->dst_memb_id[src2dst[i]], (size_t)1, (size_t)0,
+                                        (size_t)0, /*no striding (packed array)*/
+                                        xbuf + offset, xbkg + dst_memb->offset, dxpl_id) < 0)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+                                        "unable to convert compound datatype member")
                     } /* end if */
                     else
                         offset -= dst_memb->size;
@@ -2275,14 +2357,14 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             } /* end for */
 
             /* If the bkg_delta was set to -(dst->shared->size), make it positive now */
-            if(buf_stride == 0 && dst->shared->size > src->shared->size)
+            if (buf_stride == 0 && dst->shared->size > src->shared->size)
                 H5_CHECKED_ASSIGN(bkg_delta, ssize_t, dst->shared->size, size_t);
 
             /*
              * Copy the background buffer back into the in-place conversion
              * buffer.
              */
-            for(xbuf = buf, xbkg = bkg, elmtno = 0; elmtno < nelmts; elmtno++) {
+            for (xbuf = buf, xbkg = bkg, elmtno = 0; elmtno < nelmts; elmtno++) {
                 HDmemmove(xbuf, xbkg, dst->shared->size);
                 xbuf += buf_stride ? buf_stride : dst->shared->size;
                 xbkg += bkg_delta;
@@ -2298,7 +2380,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_struct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_struct_opt
  *
@@ -2368,31 +2449,30 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-    size_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf,
-    void *_bkg, hid_t dxpl_id)
+H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t bkg_stride, void *_buf, void *_bkg, hid_t dxpl_id)
 {
-    uint8_t    *buf = (uint8_t *)_buf;    /*cast for pointer arithmetic    */
-    uint8_t    *bkg = (uint8_t *)_bkg;    /*background pointer arithmetic    */
-    uint8_t    *xbuf = NULL;        /*temporary pointer into `buf'    */
-    uint8_t    *xbkg = NULL;        /*temporary pointer into `bkg'    */
-    H5T_t    *src = NULL;        /*source datatype        */
-    H5T_t    *dst = NULL;        /*destination datatype        */
-    int    *src2dst = NULL;        /*maps src member to dst member    */
-    H5T_cmemb_t    *src_memb = NULL;    /*source struct member descript.*/
-    H5T_cmemb_t    *dst_memb = NULL;    /*destination struct memb desc.    */
-    size_t    offset;            /*byte offset wrt struct    */
-    size_t    elmtno;            /*element counter        */
-    size_t      copy_size;              /*size of element for copying   */
-    H5T_conv_struct_t *priv = NULL;    /*private data            */
-    hbool_t     no_stride = FALSE;      /*flag to indicate no stride    */
-    unsigned    u;            /*counters            */
-    int        i;            /*counters            */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    uint8_t *          buf      = (uint8_t *)_buf; /*cast for pointer arithmetic    */
+    uint8_t *          bkg      = (uint8_t *)_bkg; /*background pointer arithmetic    */
+    uint8_t *          xbuf     = NULL;            /*temporary pointer into `buf'    */
+    uint8_t *          xbkg     = NULL;            /*temporary pointer into `bkg'    */
+    H5T_t *            src      = NULL;            /*source datatype        */
+    H5T_t *            dst      = NULL;            /*destination datatype        */
+    int *              src2dst  = NULL;            /*maps src member to dst member    */
+    H5T_cmemb_t *      src_memb = NULL;            /*source struct member descript.*/
+    H5T_cmemb_t *      dst_memb = NULL;            /*destination struct memb desc.    */
+    size_t             offset;                     /*byte offset wrt struct    */
+    size_t             elmtno;                     /*element counter        */
+    size_t             copy_size;                  /*size of element for copying   */
+    H5T_conv_struct_t *priv      = NULL;           /*private data            */
+    hbool_t            no_stride = FALSE;          /*flag to indicate no stride    */
+    unsigned           u;                          /*counters            */
+    int                i;                          /*counters            */
+    herr_t             ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             /*
              * First, determine if this conversion function applies to the
@@ -2400,17 +2480,17 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
              * otherwise initialize the `priv' field of `cdata' with information
              * that remains (almost) constant for this conversion path.
              */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            if(H5T_COMPOUND != src->shared->type)
+            if (H5T_COMPOUND != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_COMPOUND datatype")
-            if(H5T_COMPOUND != dst->shared->type)
+            if (H5T_COMPOUND != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_COMPOUND datatype")
 
             /* Initialize data which is relatively constant */
-            if(H5T_conv_struct_init(src, dst, cdata, dxpl_id) < 0)
+            if (H5T_conv_struct_init(src, dst, cdata, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize conversion data")
-            priv = (H5T_conv_struct_t *)(cdata->priv);
+            priv    = (H5T_conv_struct_t *)(cdata->priv);
             src2dst = priv->src2dst;
 
             /*
@@ -2423,30 +2503,31 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
              * of loops as in the actual conversion except it checks that there
              * is room for each conversion instead of actually doing anything.
              */
-            if(dst->shared->size > src->shared->size) {
-                for(u = 0, offset = 0; u < src->shared->u.compnd.nmembs; u++) {
-                    if(src2dst[u] < 0)
+            if (dst->shared->size > src->shared->size) {
+                for (u = 0, offset = 0; u < src->shared->u.compnd.nmembs; u++) {
+                    if (src2dst[u] < 0)
                         continue;
                     src_memb = src->shared->u.compnd.memb + u;
                     dst_memb = dst->shared->u.compnd.memb + src2dst[u];
-                    if(dst_memb->size > src_memb->size)
+                    if (dst_memb->size > src_memb->size)
                         offset += src_memb->size;
                 } /* end for */
                 H5_CHECK_OVERFLOW(src->shared->u.compnd.nmembs, size_t, int);
-                for(i = (int)src->shared->u.compnd.nmembs - 1; i >= 0; --i) {
-                    if(src2dst[i] < 0)
+                for (i = (int)src->shared->u.compnd.nmembs - 1; i >= 0; --i) {
+                    if (src2dst[i] < 0)
                         continue;
                     src_memb = src->shared->u.compnd.memb + i;
                     dst_memb = dst->shared->u.compnd.memb + src2dst[i];
-                    if(dst_memb->size > src_memb->size) {
+                    if (dst_memb->size > src_memb->size) {
                         offset -= src_memb->size;
-                        if(dst_memb->size > src->shared->size-offset) {
+                        if (dst_memb->size > src->shared->size - offset) {
                             cdata->priv = H5T_conv_struct_free(priv);
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "convertion is unsupported by this function")
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                        "convertion is unsupported by this function")
                         } /* end if */
-                    } /* end if */
-                } /* end for */
-            } /* end if */
+                    }     /* end if */
+                }         /* end for */
+            }             /* end if */
             break;
 
         case H5T_CONV_FREE:
@@ -2460,11 +2541,11 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
             /*
              * Conversion.
              */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
             /* Update cached data if necessary */
-            if(cdata->recalc && H5T_conv_struct_init(src, dst, cdata, dxpl_id)<0)
+            if (cdata->recalc && H5T_conv_struct_init(src, dst, cdata, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize conversion data")
             priv = (H5T_conv_struct_t *)(cdata->priv);
             HDassert(priv);
@@ -2487,29 +2568,29 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
              * background data into the BKG buffer at multiples of BKG_STRIDE;
              * otherwise assume BKG buffer is the packed destination datatype.
              */
-            if(!buf_stride || !bkg_stride)
+            if (!buf_stride || !bkg_stride)
                 bkg_stride = dst->shared->size;
-            if(!buf_stride) {
-                no_stride = TRUE;
+            if (!buf_stride) {
+                no_stride  = TRUE;
                 buf_stride = src->shared->size;
             } /* end if */
 
-            if(priv->subset_info.subset == H5T_SUBSET_SRC || priv->subset_info.subset == H5T_SUBSET_DST) {
+            if (priv->subset_info.subset == H5T_SUBSET_SRC || priv->subset_info.subset == H5T_SUBSET_DST) {
                 /* If the optimization flag is set to indicate source members are a subset and
                  * in the top of the destination, simply copy the source members to background buffer.
                  */
-                xbuf = buf;
-                xbkg = bkg;
+                xbuf      = buf;
+                xbkg      = bkg;
                 copy_size = priv->subset_info.copy_size;
 
-                for(elmtno = 0; elmtno < nelmts; elmtno++) {
+                for (elmtno = 0; elmtno < nelmts; elmtno++) {
                     HDmemmove(xbkg, xbuf, copy_size);
 
                     /* Update pointers */
                     xbuf += buf_stride;
                     xbkg += bkg_stride;
                 } /* end for */
-            } /* end if */
+            }     /* end if */
             else {
                 /*
                  * For each member where the destination is not larger than the
@@ -2518,33 +2599,34 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
                  * destination in the bkg buffer. Otherwise move the element as far
                  * left as possible in the buffer.
                  */
-                for(u = 0, offset = 0; u < src->shared->u.compnd.nmembs; u++) {
-                    if(src2dst[u] < 0)
+                for (u = 0, offset = 0; u < src->shared->u.compnd.nmembs; u++) {
+                    if (src2dst[u] < 0)
                         continue; /*subsetting*/
                     src_memb = src->shared->u.compnd.memb + u;
                     dst_memb = dst->shared->u.compnd.memb + src2dst[u];
 
-                    if(dst_memb->size <= src_memb->size) {
+                    if (dst_memb->size <= src_memb->size) {
                         xbuf = buf + src_memb->offset;
                         xbkg = bkg + dst_memb->offset;
-                        if(H5T_convert(priv->memb_path[u], priv->src_memb_id[u],
-                                priv->dst_memb_id[src2dst[u]], nelmts,
-                                buf_stride, bkg_stride, xbuf, xbkg, dxpl_id) < 0)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert compound datatype member")
-                        for(elmtno = 0; elmtno < nelmts; elmtno++) {
+                        if (H5T_convert(priv->memb_path[u], priv->src_memb_id[u],
+                                        priv->dst_memb_id[src2dst[u]], nelmts, buf_stride, bkg_stride, xbuf,
+                                        xbkg, dxpl_id) < 0)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+                                        "unable to convert compound datatype member")
+                        for (elmtno = 0; elmtno < nelmts; elmtno++) {
                             HDmemmove(xbkg, xbuf, dst_memb->size);
                             xbuf += buf_stride;
                             xbkg += bkg_stride;
                         } /* end for */
-                    } /* end if */
+                    }     /* end if */
                     else {
-                        for(xbuf = buf, elmtno = 0; elmtno < nelmts; elmtno++) {
+                        for (xbuf = buf, elmtno = 0; elmtno < nelmts; elmtno++) {
                             HDmemmove(xbuf + offset, xbuf + src_memb->offset, src_memb->size);
                             xbuf += buf_stride;
                         } /* end for */
                         offset += src_memb->size;
                     } /* end else */
-                } /* end else */
+                }     /* end else */
 
                 /*
                  * Work from right to left, converting those members that weren't
@@ -2553,34 +2635,35 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
                  * bkg buffer.
                  */
                 H5_CHECK_OVERFLOW(src->shared->u.compnd.nmembs, size_t, int);
-                for(i = (int)src->shared->u.compnd.nmembs - 1; i >= 0; --i) {
-                    if(src2dst[i] < 0)
+                for (i = (int)src->shared->u.compnd.nmembs - 1; i >= 0; --i) {
+                    if (src2dst[i] < 0)
                         continue;
                     src_memb = src->shared->u.compnd.memb + i;
                     dst_memb = dst->shared->u.compnd.memb + src2dst[i];
 
-                    if(dst_memb->size > src_memb->size) {
+                    if (dst_memb->size > src_memb->size) {
                         offset -= src_memb->size;
                         xbuf = buf + offset;
                         xbkg = bkg + dst_memb->offset;
-                        if(H5T_convert(priv->memb_path[i], priv->src_memb_id[i],
-                                priv->dst_memb_id[src2dst[i]], nelmts,
-                                buf_stride, bkg_stride, xbuf, xbkg, dxpl_id) < 0)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert compound datatype member")
-                        for(elmtno = 0; elmtno < nelmts; elmtno++) {
+                        if (H5T_convert(priv->memb_path[i], priv->src_memb_id[i],
+                                        priv->dst_memb_id[src2dst[i]], nelmts, buf_stride, bkg_stride, xbuf,
+                                        xbkg, dxpl_id) < 0)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+                                        "unable to convert compound datatype member")
+                        for (elmtno = 0; elmtno < nelmts; elmtno++) {
                             HDmemmove(xbkg, xbuf, dst_memb->size);
                             xbuf += buf_stride;
                             xbkg += bkg_stride;
                         } /* end for */
-                    } /* end if */
-                } /* end for */
-            } /* end else */
+                    }     /* end if */
+                }         /* end for */
+            }             /* end else */
 
-            if(no_stride)
+            if (no_stride)
                 buf_stride = dst->shared->size;
 
             /* Move background buffer into result buffer */
-            for(xbuf = buf, xbkg = bkg, elmtno = 0; elmtno < nelmts; elmtno++) {
+            for (xbuf = buf, xbkg = bkg, elmtno = 0; elmtno < nelmts; elmtno++) {
                 HDmemmove(xbuf, xbkg, dst->shared->size);
                 xbuf += buf_stride;
                 xbkg += bkg_stride;
@@ -2596,7 +2679,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_struct_opt() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_conv_enum_init
  *
@@ -2616,21 +2698,21 @@ done:
 static herr_t
 H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
 {
-    H5T_enum_struct_t    *priv = NULL;    /*private conversion data    */
-    int        n;        /*src value cast as native int    */
-    int        domain[2] = {0, 0};    /*min and max source values    */
-    int        *map = NULL;    /*map from src value to dst idx    */
-    unsigned    length;        /*nelmts in map array        */
-    unsigned    i, j;        /*counters            */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_enum_struct_t *priv = NULL;         /*private conversion data    */
+    int                n;                   /*src value cast as native int    */
+    int                domain[2] = {0, 0};  /*min and max source values    */
+    int *              map       = NULL;    /*map from src value to dst idx    */
+    unsigned           length;              /*nelmts in map array        */
+    unsigned           i, j;                /*counters            */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     cdata->need_bkg = H5T_BKG_NO;
-    if(NULL == (priv = (H5T_enum_struct_t *)(cdata->priv = H5MM_calloc(sizeof(*priv)))))
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    if(0 == src->shared->u.enumer.nmembs)
-    HGOTO_DONE(SUCCEED);
+    if (NULL == (priv = (H5T_enum_struct_t *)(cdata->priv = H5MM_calloc(sizeof(*priv)))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    if (0 == src->shared->u.enumer.nmembs)
+        HGOTO_DONE(SUCCEED);
 
     /*
      * Check that the source symbol names are a subset of the destination
@@ -2639,17 +2721,16 @@ H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
      */
     H5T__sort_name(src, NULL);
     H5T__sort_name(dst, NULL);
-    if(NULL == (priv->src2dst = (int *)H5MM_malloc(src->shared->u.enumer.nmembs * sizeof(int))))
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    for(i = 0, j = 0;
-             i < src->shared->u.enumer.nmembs && j < dst->shared->u.enumer.nmembs;
-             i++, j++) {
-    while(j < dst->shared->u.enumer.nmembs &&
-        HDstrcmp(src->shared->u.enumer.name[i], dst->shared->u.enumer.name[j]))
+    if (NULL == (priv->src2dst = (int *)H5MM_malloc(src->shared->u.enumer.nmembs * sizeof(int))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    for (i = 0, j = 0; i < src->shared->u.enumer.nmembs && j < dst->shared->u.enumer.nmembs; i++, j++) {
+        while (j < dst->shared->u.enumer.nmembs &&
+               HDstrcmp(src->shared->u.enumer.name[i], dst->shared->u.enumer.name[j]))
             j++;
-    if(j >= dst->shared->u.enumer.nmembs)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "source type is not a subset of destination type")
-    priv->src2dst[i] = (int)j;
+        if (j >= dst->shared->u.enumer.nmembs)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                        "source type is not a subset of destination type")
+        priv->src2dst[i] = (int)j;
     } /* end for */
 
     /*
@@ -2678,69 +2759,69 @@ H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
      * Because this is the optimized code, we won't fix it. It should still work in some
      * situations. SLU - 2011/5/24)
      */
-    if(1 == src->shared->size || sizeof(short) == src->shared->size || sizeof(int) == src->shared->size) {
-    for(i = 0; i < src->shared->u.enumer.nmembs; i++) {
-        if(1 == src->shared->size)
-        n = *((signed char *)(src->shared->u.enumer.value + i));
-        else if (sizeof(short) == src->shared->size)
-        n = *((short *)(src->shared->u.enumer.value + i * src->shared->size));
-        else
-        n = *((int *)(src->shared->u.enumer.value + i * src->shared->size));
-        if(0 == i) {
-        domain[0] = domain[1] = n;
-        } else {
-        domain[0] = MIN(domain[0], n);
-        domain[1] = MAX(domain[1], n);
-        }
-    } /* end for */
+    if (1 == src->shared->size || sizeof(short) == src->shared->size || sizeof(int) == src->shared->size) {
+        for (i = 0; i < src->shared->u.enumer.nmembs; i++) {
+            if (1 == src->shared->size)
+                n = *((signed char *)(src->shared->u.enumer.value + i));
+            else if (sizeof(short) == src->shared->size)
+                n = *((short *)(src->shared->u.enumer.value + i * src->shared->size));
+            else
+                n = *((int *)(src->shared->u.enumer.value + i * src->shared->size));
+            if (0 == i) {
+                domain[0] = domain[1] = n;
+            }
+            else {
+                domain[0] = MIN(domain[0], n);
+                domain[1] = MAX(domain[1], n);
+            }
+        } /* end for */
 
         HDassert(domain[1] >= domain[0]);
-    length = (unsigned)(domain[1] - domain[0]) + 1;
-    if(src->shared->u.enumer.nmembs < 2 ||
-                (double)length / src->shared->u.enumer.nmembs < (double)(1.2f)) {
-        priv->base = domain[0];
-        priv->length = length;
-        if(NULL == (map = (int *)H5MM_malloc(length * sizeof(int))))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-        for(i = 0; i < length; i++)
+        length = (unsigned)(domain[1] - domain[0]) + 1;
+        if (src->shared->u.enumer.nmembs < 2 ||
+            (double)length / src->shared->u.enumer.nmembs < (double)(1.2f)) {
+            priv->base   = domain[0];
+            priv->length = length;
+            if (NULL == (map = (int *)H5MM_malloc(length * sizeof(int))))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+            for (i = 0; i < length; i++)
                 map[i] = -1; /*entry unused*/
-        for(i = 0; i < src->shared->u.enumer.nmembs; i++) {
-        if(1 == src->shared->size)
-            n = *((signed char *)(src->shared->u.enumer.value + i));
-        else if(sizeof(short) == src->shared->size)
-            n = *((short *)(src->shared->u.enumer.value + i * src->shared->size));
-        else
-            n = *((int *)(src->shared->u.enumer.value + i * src->shared->size));
-        n -= priv->base;
-        HDassert(n >= 0 && (unsigned)n < priv->length);
-        HDassert(map[n] < 0);
-        map[n] = priv->src2dst[i];
-        } /* end for */
+            for (i = 0; i < src->shared->u.enumer.nmembs; i++) {
+                if (1 == src->shared->size)
+                    n = *((signed char *)(src->shared->u.enumer.value + i));
+                else if (sizeof(short) == src->shared->size)
+                    n = *((short *)(src->shared->u.enumer.value + i * src->shared->size));
+                else
+                    n = *((int *)(src->shared->u.enumer.value + i * src->shared->size));
+                n -= priv->base;
+                HDassert(n >= 0 && (unsigned)n < priv->length);
+                HDassert(map[n] < 0);
+                map[n] = priv->src2dst[i];
+            } /* end for */
 
-        /*
-        * Replace original src2dst array with our new one. The original
-        * was indexed by source member number while the new one is
-        * indexed by source values.
-        */
-        H5MM_xfree(priv->src2dst);
-        priv->src2dst = map;
-        HGOTO_DONE(SUCCEED);
-    }
+            /*
+             * Replace original src2dst array with our new one. The original
+             * was indexed by source member number while the new one is
+             * indexed by source values.
+             */
+            H5MM_xfree(priv->src2dst);
+            priv->src2dst = map;
+            HGOTO_DONE(SUCCEED);
+        }
     }
 
     /* Sort source type by value and adjust src2dst[] appropriately */
     H5T__sort_value(src, priv->src2dst);
 
 done:
-    if (ret_value<0 && priv) {
-    H5MM_xfree(priv->src2dst);
-    H5MM_xfree(priv);
-    cdata->priv = NULL;
+    if (ret_value < 0 && priv) {
+        H5MM_xfree(priv->src2dst);
+        H5MM_xfree(priv);
+        cdata->priv = NULL;
     }
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_enum
  *
@@ -2755,25 +2836,25 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-        size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *_buf,
-              void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+               size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *bkg,
+               hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    uint8_t    *buf = (uint8_t*)_buf;    /*cast for pointer arithmetic    */
-    H5T_t    *src = NULL, *dst = NULL;    /*src and dst datatypes    */
-    uint8_t    *s = NULL, *d = NULL;    /*src and dst BUF pointers    */
-    ssize_t    src_delta, dst_delta;    /*conversion strides        */
-    int    n;            /*src value cast as native int    */
-    H5T_enum_struct_t *priv = (H5T_enum_struct_t*)(cdata->priv);
-    H5P_genplist_t      *plist;         /*property list pointer         */
-    H5T_conv_cb_t       cb_struct;      /*conversion callback structure */
-    H5T_conv_ret_t      except_ret;     /*return of callback function   */
-    size_t    i;            /*counters            */
-    herr_t      ret_value = SUCCEED;    /* Return value                 */
+    uint8_t *          buf = (uint8_t *)_buf;   /*cast for pointer arithmetic    */
+    H5T_t *            src = NULL, *dst = NULL; /*src and dst datatypes    */
+    uint8_t *          s = NULL, *d = NULL;     /*src and dst BUF pointers    */
+    ssize_t            src_delta, dst_delta;    /*conversion strides        */
+    int                n;                       /*src value cast as native int    */
+    H5T_enum_struct_t *priv = (H5T_enum_struct_t *)(cdata->priv);
+    H5P_genplist_t *   plist;               /*property list pointer         */
+    H5T_conv_cb_t      cb_struct;           /*conversion callback structure */
+    H5T_conv_ret_t     except_ret;          /*return of callback function   */
+    size_t             i;                   /*counters            */
+    herr_t             ret_value = SUCCEED; /* Return value                 */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             /*
              * Determine if this conversion function applies to the conversion
@@ -2781,14 +2862,14 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * the `priv' field of `cdata' with information about the underlying
              * integer conversion.
              */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
-            if(H5T_ENUM != src->shared->type)
+            if (H5T_ENUM != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_ENUM datatype")
-            if(H5T_ENUM != dst->shared->type)
+            if (H5T_ENUM != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_ENUM datatype")
 
-            if(H5T_conv_enum_init(src, dst, cdata) < 0)
+            if (H5T_conv_enum_init(src, dst, cdata) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize private data")
             break;
 
@@ -2796,8 +2877,8 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 #ifdef H5T_DEBUG
             if (H5DEBUG(T)) {
                 HDfprintf(H5DEBUG(T), "      Using %s mapping function%s\n",
-                        priv->length?"O(1)":"O(log N)",
-                        priv->length?"":", where N is the number of enum members");
+                          priv->length ? "O(1)" : "O(log N)",
+                          priv->length ? "" : ", where N is the number of enum members");
             }
 #endif
             if (priv) {
@@ -2808,11 +2889,11 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             break;
 
         case H5T_CONV_CONV:
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            if(H5T_ENUM != src->shared->type)
+            if (H5T_ENUM != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_ENUM datatype")
-            if(H5T_ENUM != dst->shared->type)
+            if (H5T_ENUM != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_ENUM datatype")
 
             /* priv->src2dst map was computed for certain sort keys. Make sure those same
@@ -2820,39 +2901,41 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * we actually don't care about the source type's order when doing the O(1)
              * conversion algorithm, which is turned on by non-zero priv->length */
             H5T__sort_name(dst, NULL);
-            if(!priv->length)
+            if (!priv->length)
                 H5T__sort_value(src, NULL);
 
             /*
              * Direction of conversion.
              */
-            if(buf_stride) {
+            if (buf_stride) {
                 H5_CHECK_OVERFLOW(buf_stride, size_t, ssize_t);
                 src_delta = dst_delta = (ssize_t)buf_stride;
                 s = d = buf;
-            } else if(dst->shared->size <= src->shared->size) {
+            }
+            else if (dst->shared->size <= src->shared->size) {
                 H5_CHECKED_ASSIGN(src_delta, ssize_t, src->shared->size, size_t);
                 H5_CHECKED_ASSIGN(dst_delta, ssize_t, dst->shared->size, size_t);
                 s = d = buf;
-            } else {
+            }
+            else {
                 H5_CHECK_OVERFLOW(src->shared->size, size_t, ssize_t);
                 H5_CHECK_OVERFLOW(dst->shared->size, size_t, ssize_t);
                 src_delta = -(ssize_t)src->shared->size;
                 dst_delta = -(ssize_t)dst->shared->size;
-                s = buf + (nelmts - 1) * src->shared->size;
-                d = buf + (nelmts - 1) * dst->shared->size;
+                s         = buf + (nelmts - 1) * src->shared->size;
+                d         = buf + (nelmts - 1) * dst->shared->size;
             }
 
             /* Get the plist structure */
-            if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+            if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
                 HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find property list for ID")
 
             /* Get conversion exception callback property */
-            if(H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
+            if (H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback")
 
-            for(i = 0; i < nelmts; i++, s += src_delta, d += dst_delta) {
-                if(priv->length) {
+            for (i = 0; i < nelmts; i++, s += src_delta, d += dst_delta) {
+                if (priv->length) {
                     /* Use O(1) lookup */
                     /* (The casting won't work when the byte orders are different. i.g. if the source value
                      * is big-endian 0x0000000f, the direct casting "n = *((int*)s);" will make it a big
@@ -2860,26 +2943,28 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                      * optimization code. Please also see the comment in the H5T_conv_enum_init() function.
                      * SLU - 2011/5/24)
                      */
-                    if(1 == src->shared->size)
-                        n = *((signed char*)s);
-                    else if(sizeof(short) == src->shared->size)
-                        n = *((short*)s);
+                    if (1 == src->shared->size)
+                        n = *((signed char *)s);
+                    else if (sizeof(short) == src->shared->size)
+                        n = *((short *)s);
                     else
-                        n = *((int*)s);
+                        n = *((int *)s);
                     n -= priv->base;
-                    if(n < 0 || (unsigned)n >= priv->length || priv->src2dst[n] < 0) {
+                    if (n < 0 || (unsigned)n >= priv->length || priv->src2dst[n] < 0) {
                         /*overflow*/
                         except_ret = H5T_CONV_UNHANDLED;
                         /*If user's exception handler is present, use it*/
-                        if(cb_struct.func)
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                    s, d, cb_struct.user_data);
+                        if (cb_struct.func)
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, s, d,
+                                                          cb_struct.user_data);
 
-                        if(except_ret == H5T_CONV_UNHANDLED)
+                        if (except_ret == H5T_CONV_UNHANDLED)
                             HDmemset(d, 0xff, dst->shared->size);
-                        else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                    } else
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                    }
+                    else
                         HDmemcpy(d,
                                  dst->shared->u.enumer.value + (unsigned)priv->src2dst[n] * dst->shared->size,
                                  dst->shared->size);
@@ -2889,38 +2974,39 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                     unsigned lt = 0;
                     unsigned rt = src->shared->u.enumer.nmembs;
                     unsigned md;
-                    int cmp;
+                    int      cmp;
 
-                    while(lt < rt) {
-                        md = (lt + rt) / 2;
+                    while (lt < rt) {
+                        md  = (lt + rt) / 2;
                         cmp = HDmemcmp(s, src->shared->u.enumer.value + md * src->shared->size,
                                        src->shared->size);
-                        if(cmp < 0)
+                        if (cmp < 0)
                             rt = md;
-                        else if(cmp > 0)
+                        else if (cmp > 0)
                             lt = md + 1;
                         else
                             break;
                     } /* end while */
-                    if(lt >= rt) {
+                    if (lt >= rt) {
                         except_ret = H5T_CONV_UNHANDLED;
                         /*If user's exception handler is present, use it*/
-                        if(cb_struct.func)
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                    src, d, cb_struct.user_data);
+                        if (cb_struct.func)
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src, d,
+                                                          cb_struct.user_data);
 
-                        if(except_ret == H5T_CONV_UNHANDLED)
+                        if (except_ret == H5T_CONV_UNHANDLED)
                             HDmemset(d, 0xff, dst->shared->size);
-                        else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
                     } /* end if */
                     else {
                         HDassert(priv->src2dst[md] >= 0);
-                        HDmemcpy(d,
-                                 dst->shared->u.enumer.value + (unsigned)priv->src2dst[md] * dst->shared->size,
-                                 dst->shared->size);
+                        HDmemcpy(
+                            d, dst->shared->u.enumer.value + (unsigned)priv->src2dst[md] * dst->shared->size,
+                            dst->shared->size);
                     } /* end else */
-                } /* end else */
+                }     /* end else */
             }
 
             break;
@@ -2934,7 +3020,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_enum() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_enum_numeric
  *
@@ -2953,28 +3038,28 @@ done:
  */
 herr_t
 H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-        size_t H5_ATTR_UNUSED buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *_buf,
-              void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+                       size_t H5_ATTR_UNUSED buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *_buf,
+                       void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    H5T_t    *src, *dst;        /*src and dst datatypes    */
-    H5T_t    *src_parent;        /*parent type for src           */
-    hid_t       src_parent_id = -1;     /*ID for parent of the source   */
-    H5T_path_t  *tpath;                 /* Conversion information       */
-    herr_t      ret_value = SUCCEED;    /* Return value                 */
+    H5T_t *     src, *dst;           /*src and dst datatypes    */
+    H5T_t *     src_parent;          /*parent type for src           */
+    hid_t       src_parent_id = -1;  /*ID for parent of the source   */
+    H5T_path_t *tpath;               /* Conversion information       */
+    herr_t      ret_value = SUCCEED; /* Return value                 */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             /*
              * Determine if this conversion function applies to the conversion
              * path SRC_ID->DST_ID.  If not, return failure.
              */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
-            if(H5T_ENUM != src->shared->type)
+            if (H5T_ENUM != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "source type is not a H5T_ENUM datatype")
-            if(H5T_INTEGER != dst->shared->type && H5T_FLOAT != dst->shared->type)
+            if (H5T_INTEGER != dst->shared->type && H5T_FLOAT != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "destination is not an integer type")
 
             cdata->need_bkg = H5T_BKG_NO;
@@ -2984,19 +3069,24 @@ H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t ne
             break;
 
         case H5T_CONV_CONV:
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
             src_parent = src->shared->parent;
 
-            if(NULL == (tpath = H5T_path_find(src_parent, dst, NULL, NULL, dxpl_id, FALSE))) {
-            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
-            } else if(!H5T_path_noop(tpath)) {
-                if((src_parent_id = H5I_register(H5I_DATATYPE, H5T_copy(src_parent, H5T_COPY_ALL), FALSE)) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
+            if (NULL == (tpath = H5T_path_find(src_parent, dst, NULL, NULL, dxpl_id, FALSE))) {
+                HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
+                            "unable to convert between src and dest datatype")
+            }
+            else if (!H5T_path_noop(tpath)) {
+                if ((src_parent_id = H5I_register(H5I_DATATYPE, H5T_copy(src_parent, H5T_COPY_ALL), FALSE)) <
+                    0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL,
+                                "unable to register types for conversion")
 
                 /* Convert the data */
-                if(H5T_convert(tpath, src_parent_id, dst_id, nelmts, buf_stride, bkg_stride, _buf, bkg, dxpl_id) < 0)
+                if (H5T_convert(tpath, src_parent_id, dst_id, nelmts, buf_stride, bkg_stride, _buf, bkg,
+                                dxpl_id) < 0)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
             }
             break;
@@ -3008,13 +3098,12 @@ H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t ne
 
 done:
     /* Release the temporary datatype IDs used */
-    if(src_parent_id >= 0)
+    if (src_parent_id >= 0)
         H5I_dec_ref(src_parent_id);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_enum_numeric() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_vlen
  *
@@ -3056,38 +3145,38 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dxpl_id)
-{
-    H5T_vlen_alloc_info_t _vl_alloc_info;       /* VL allocation info buffer */
-    H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info;   /* VL allocation info */
-    H5T_path_t    *tpath = NULL;        /* Type conversion path             */
-    hbool_t     noop_conv = FALSE;      /* Flag to indicate a noop conversion */
-    hbool_t     write_to_file = FALSE;  /* Flag to indicate writing to file */
-    htri_t      parent_is_vlen;         /* Flag to indicate parent is vlen datatyp */
-    hid_t       tsrc_id = -1, tdst_id = -1;/*temporary type atoms         */
-    H5T_t    *src = NULL;        /*source datatype             */
-    H5T_t    *dst = NULL;        /*destination datatype             */
-    H5HG_t    bg_hobjid, parent_hobjid;
-    uint8_t    *s = NULL;        /*source buffer            */
-    uint8_t    *d = NULL;        /*destination buffer        */
-    uint8_t    *b = NULL;        /*background buffer        */
-    ssize_t    s_stride, d_stride;    /*src and dst strides        */
-    ssize_t    b_stride;            /*bkg stride            */
-    size_t      safe;                   /*how many elements are safe to process in each pass */
-    size_t    bg_seq_len = 0;
-    size_t    src_base_size, dst_base_size;/*source & destination base size*/
-    void    *conv_buf = NULL;         /*temporary conversion buffer          */
-    size_t    conv_buf_size = 0;      /*size of conversion buffer in bytes */
-    void    *tmp_buf = NULL;         /*temporary background buffer          */
-    size_t    tmp_buf_size = 0;    /*size of temporary bkg buffer         */
-    hbool_t     nested = FALSE;         /*flag of nested VL case             */
-    size_t    elmtno;            /*element number counter         */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+               size_t bkg_stride, void *buf, void *bkg, hid_t dxpl_id)
+{
+    H5T_vlen_alloc_info_t  _vl_alloc_info;                  /* VL allocation info buffer */
+    H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info; /* VL allocation info */
+    H5T_path_t *           tpath         = NULL;            /* Type conversion path             */
+    hbool_t                noop_conv     = FALSE;           /* Flag to indicate a noop conversion */
+    hbool_t                write_to_file = FALSE;           /* Flag to indicate writing to file */
+    htri_t                 parent_is_vlen;                  /* Flag to indicate parent is vlen datatyp */
+    hid_t                  tsrc_id = -1, tdst_id = -1;      /*temporary type atoms         */
+    H5T_t *                src = NULL;                      /*source datatype             */
+    H5T_t *                dst = NULL;                      /*destination datatype             */
+    H5HG_t                 bg_hobjid, parent_hobjid;
+    uint8_t *              s = NULL;           /*source buffer            */
+    uint8_t *              d = NULL;           /*destination buffer        */
+    uint8_t *              b = NULL;           /*background buffer        */
+    ssize_t                s_stride, d_stride; /*src and dst strides        */
+    ssize_t                b_stride;           /*bkg stride            */
+    size_t                 safe;               /*how many elements are safe to process in each pass */
+    size_t                 bg_seq_len = 0;
+    size_t                 src_base_size, dst_base_size; /*source & destination base size*/
+    void *                 conv_buf      = NULL;         /*temporary conversion buffer          */
+    size_t                 conv_buf_size = 0;            /*size of conversion buffer in bytes */
+    void *                 tmp_buf       = NULL;         /*temporary background buffer          */
+    size_t                 tmp_buf_size  = 0;            /*size of temporary bkg buffer         */
+    hbool_t                nested        = FALSE;        /*flag of nested VL case             */
+    size_t                 elmtno;                       /*element number counter         */
+    herr_t                 ret_value = SUCCEED;          /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
             /*
              * First, determine if this conversion function applies to the
@@ -3096,16 +3185,18 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * information that remains (almost) constant for this
              * conversion path.
              */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
-            if(H5T_VLEN != src->shared->type)
+            if (H5T_VLEN != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_VLEN datatype")
-            if(H5T_VLEN != dst->shared->type)
+            if (H5T_VLEN != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_VLEN datatype")
-            if(H5T_VLEN_STRING == src->shared->u.vlen.type && H5T_VLEN_STRING == dst->shared->u.vlen.type) {
-                if((H5T_CSET_ASCII == src->shared->u.vlen.cset && H5T_CSET_UTF8 == dst->shared->u.vlen.cset)
-                    || (H5T_CSET_ASCII == dst->shared->u.vlen.cset && H5T_CSET_UTF8 == src->shared->u.vlen.cset))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "The library doesn't convert between strings of ASCII and UTF")
+            if (H5T_VLEN_STRING == src->shared->u.vlen.type && H5T_VLEN_STRING == dst->shared->u.vlen.type) {
+                if ((H5T_CSET_ASCII == src->shared->u.vlen.cset &&
+                     H5T_CSET_UTF8 == dst->shared->u.vlen.cset) ||
+                    (H5T_CSET_ASCII == dst->shared->u.vlen.cset && H5T_CSET_UTF8 == src->shared->u.vlen.cset))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                "The library doesn't convert between strings of ASCII and UTF")
             }
 
             /* Variable-length types don't need a background buffer */
@@ -3121,11 +3212,11 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             /*
              * Conversion.
              */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
             /* Initialize source & destination strides */
-            if(buf_stride) {
+            if (buf_stride) {
                 HDassert(buf_stride >= src->shared->size);
                 HDassert(buf_stride >= dst->shared->size);
                 H5_CHECK_OVERFLOW(buf_stride, size_t, ssize_t);
@@ -3137,8 +3228,8 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 s_stride = (ssize_t)src->shared->size;
                 d_stride = (ssize_t)dst->shared->size;
             } /* end else */
-            if(bkg) {
-                if(bkg_stride)
+            if (bkg) {
+                if (bkg_stride)
                     b_stride = (ssize_t)bkg_stride;
                 else
                     b_stride = d_stride;
@@ -3151,43 +3242,50 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             dst_base_size = H5T_get_size(dst->shared->parent);
 
             /* Set up conversion path for base elements */
-            if(NULL == (tpath = H5T_path_find(src->shared->parent, dst->shared->parent, NULL, NULL, dxpl_id, FALSE)))
-                HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatypes")
-            else if(!H5T_path_noop(tpath)) {
-                if((tsrc_id = H5I_register(H5I_DATATYPE, H5T_copy(src->shared->parent, H5T_COPY_ALL), FALSE)) < 0 ||
-                        (tdst_id = H5I_register(H5I_DATATYPE, H5T_copy(dst->shared->parent, H5T_COPY_ALL), FALSE)) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
+            if (NULL ==
+                (tpath = H5T_path_find(src->shared->parent, dst->shared->parent, NULL, NULL, dxpl_id, FALSE)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                            "unable to convert between src and dest datatypes")
+            else if (!H5T_path_noop(tpath)) {
+                if ((tsrc_id = H5I_register(H5I_DATATYPE, H5T_copy(src->shared->parent, H5T_COPY_ALL),
+                                            FALSE)) < 0 ||
+                    (tdst_id =
+                         H5I_register(H5I_DATATYPE, H5T_copy(dst->shared->parent, H5T_COPY_ALL), FALSE)) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL,
+                                "unable to register types for conversion")
             } /* end else-if */
             else
                 noop_conv = TRUE;
 
             /* Check if we need a temporary buffer for this conversion */
-            if((parent_is_vlen = H5T_detect_class(dst->shared->parent, H5T_VLEN, FALSE)) < 0)
-                HGOTO_ERROR(H5E_DATATYPE, H5E_SYSTEM, FAIL, "internal error when detecting variable-length class")
-            if(tpath->cdata.need_bkg || parent_is_vlen) {
+            if ((parent_is_vlen = H5T_detect_class(dst->shared->parent, H5T_VLEN, FALSE)) < 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_SYSTEM, FAIL,
+                            "internal error when detecting variable-length class")
+            if (tpath->cdata.need_bkg || parent_is_vlen) {
                 /* Set up initial background buffer */
                 tmp_buf_size = MAX(src_base_size, dst_base_size);
-                if(NULL == (tmp_buf = H5FL_BLK_CALLOC(vlen_seq,tmp_buf_size)))
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion")
+                if (NULL == (tmp_buf = H5FL_BLK_CALLOC(vlen_seq, tmp_buf_size)))
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL,
+                                "memory allocation failed for type conversion")
             } /* end if */
 
             /* Get the allocation info */
-            if(H5T_vlen_get_alloc_info(dxpl_id, &vl_alloc_info) < 0)
+            if (H5T_vlen_get_alloc_info(dxpl_id, &vl_alloc_info) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to retrieve VL allocation info")
 
             /* Set flags to indicate we are writing to or reading from the file */
-            if(dst->shared->u.vlen.f != NULL)
+            if (dst->shared->u.vlen.f != NULL)
                 write_to_file = TRUE;
 
             /* Set the flag for nested VL case */
-            if(write_to_file && parent_is_vlen && bkg != NULL)
+            if (write_to_file && parent_is_vlen && bkg != NULL)
                 nested = TRUE;
 
             /* The outer loop of the type conversion macro, controlling which */
             /* direction the buffer is walked */
-            while(nelmts > 0) {
+            while (nelmts > 0) {
                 /* Check if we need to go backwards through the buffer */
-                if(d_stride > s_stride) {
+                if (d_stride > s_stride) {
                     /* Sanity check */
                     HDassert(s_stride > 0);
                     HDassert(d_stride > 0);
@@ -3196,14 +3294,15 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                     /* Compute the number of "safe" destination elements at */
                     /* the end of the buffer (Those which don't overlap with */
                     /* any source elements at the beginning of the buffer) */
-                    safe = nelmts - (((nelmts * (size_t)s_stride) + ((size_t)d_stride - 1)) / (size_t)d_stride);
+                    safe =
+                        nelmts - (((nelmts * (size_t)s_stride) + ((size_t)d_stride - 1)) / (size_t)d_stride);
 
                     /* If we're down to the last few elements, just wrap up */
                     /* with a "real" reverse copy */
-                    if(safe < 2) {
-                        s = (uint8_t *)buf + (nelmts - 1) * (size_t)s_stride;
-                        d = (uint8_t *)buf + (nelmts - 1) * (size_t)d_stride;
-                        b = (uint8_t *)bkg + (nelmts - 1) * (size_t)b_stride;
+                    if (safe < 2) {
+                        s        = (uint8_t *)buf + (nelmts - 1) * (size_t)s_stride;
+                        d        = (uint8_t *)buf + (nelmts - 1) * (size_t)d_stride;
+                        b        = (uint8_t *)bkg + (nelmts - 1) * (size_t)b_stride;
                         s_stride = -s_stride;
                         d_stride = -d_stride;
                         b_stride = -b_stride;
@@ -3215,38 +3314,39 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                         d = (uint8_t *)buf + (nelmts - safe) * (size_t)d_stride;
                         b = (uint8_t *)bkg + (nelmts - safe) * (size_t)b_stride;
                     } /* end else */
-                } /* end if */
+                }     /* end if */
                 else {
                     /* Single forward pass over all data */
                     s = d = (uint8_t *)buf;
-                    b = (uint8_t *)bkg;
-                    safe = nelmts;
+                    b     = (uint8_t *)bkg;
+                    safe  = nelmts;
                 } /* end else */
 
-                for(elmtno = 0; elmtno < safe; elmtno++) {
+                for (elmtno = 0; elmtno < safe; elmtno++) {
                     /* Check for "nil" source sequence */
-                    if((*(src->shared->u.vlen.isnull))(src->shared->u.vlen.f, s)) {
+                    if ((*(src->shared->u.vlen.isnull))(src->shared->u.vlen.f, s)) {
                         /* Write "nil" sequence to destination location */
-                        if((*(dst->shared->u.vlen.setnull))(dst->shared->u.vlen.f, dxpl_id, d, b) < 0)
+                        if ((*(dst->shared->u.vlen.setnull))(dst->shared->u.vlen.f, dxpl_id, d, b) < 0)
                             HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "can't set VL data to 'nil'")
                     } /* end if */
                     else {
-                        ssize_t sseq_len;   /* (signed) The number of elements in the current sequence*/
-                        size_t     seq_len;    /* The number of elements in the current sequence*/
+                        ssize_t sseq_len; /* (signed) The number of elements in the current sequence*/
+                        size_t  seq_len;  /* The number of elements in the current sequence*/
 
                         /* Get length of element sequences */
-                        if((sseq_len = (*(src->shared->u.vlen.getlen))(s)) < 0)
+                        if ((sseq_len = (*(src->shared->u.vlen.getlen))(s)) < 0)
                             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "incorrect length")
                         seq_len = (size_t)sseq_len;
 
-                        /* If we are reading from memory and there is no conversion, just get the pointer to sequence */
-                        if(write_to_file && noop_conv) {
+                        /* If we are reading from memory and there is no conversion, just get the pointer to
+                         * sequence */
+                        if (write_to_file && noop_conv) {
                             /* Get direct pointer to sequence */
-                            if(NULL == (conv_buf = (*(src->shared->u.vlen.getptr))(s)))
+                            if (NULL == (conv_buf = (*(src->shared->u.vlen.getptr))(s)))
                                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid source pointer")
                         } /* end if */
                         else {
-                            size_t    src_size, dst_size;     /*source & destination total size in bytes*/
+                            size_t src_size, dst_size; /*source & destination total size in bytes*/
 
                             src_size = seq_len * src_base_size;
                             dst_size = seq_len * dst_base_size;
@@ -3254,89 +3354,105 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                             /* Check if conversion buffer is large enough, resize if
                              * necessary.  If the SEQ_LEN is 0, allocate a minimal size buffer.
                              */
-                if(!seq_len && !conv_buf) {
-                                conv_buf_size = ((1 / H5T_VLEN_MIN_CONF_BUF_SIZE) + 1) * H5T_VLEN_MIN_CONF_BUF_SIZE;
-                                if(NULL == (conv_buf = H5FL_BLK_CALLOC(vlen_seq, conv_buf_size)))
-                                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
-                }
-                            else if(conv_buf_size < MAX(src_size, dst_size)) {
+                            if (!seq_len && !conv_buf) {
+                                conv_buf_size =
+                                    ((1 / H5T_VLEN_MIN_CONF_BUF_SIZE) + 1) * H5T_VLEN_MIN_CONF_BUF_SIZE;
+                                if (NULL == (conv_buf = H5FL_BLK_CALLOC(vlen_seq, conv_buf_size)))
+                                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                                "memory allocation failed for type conversion")
+                            }
+                            else if (conv_buf_size < MAX(src_size, dst_size)) {
                                 /* Only allocate conversion buffer in H5T_VLEN_MIN_CONF_BUF_SIZE increments */
-                                conv_buf_size = ((MAX(src_size, dst_size) / H5T_VLEN_MIN_CONF_BUF_SIZE) + 1) * H5T_VLEN_MIN_CONF_BUF_SIZE;
-                                if(NULL == (conv_buf = H5FL_BLK_REALLOC(vlen_seq, conv_buf, conv_buf_size)))
-                                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+                                conv_buf_size = ((MAX(src_size, dst_size) / H5T_VLEN_MIN_CONF_BUF_SIZE) + 1) *
+                                                H5T_VLEN_MIN_CONF_BUF_SIZE;
+                                if (NULL == (conv_buf = H5FL_BLK_REALLOC(vlen_seq, conv_buf, conv_buf_size)))
+                                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                                "memory allocation failed for type conversion")
                                 HDmemset(conv_buf, 0, conv_buf_size);
                             } /* end if */
 
                             /* Read in VL sequence */
-                            if((*(src->shared->u.vlen.read))(src->shared->u.vlen.f, dxpl_id, s, conv_buf, src_size) < 0)
+                            if ((*(src->shared->u.vlen.read))(src->shared->u.vlen.f, dxpl_id, s, conv_buf,
+                                                              src_size) < 0)
                                 HGOTO_ERROR(H5E_DATATYPE, H5E_READERROR, FAIL, "can't read VL data")
                         } /* end else */
 
-                        if(!noop_conv) {
+                        if (!noop_conv) {
                             /* Check if temporary buffer is large enough, resize if necessary */
                             /* (Chain off the conversion buffer size) */
-                            if(tmp_buf && tmp_buf_size < conv_buf_size) {
+                            if (tmp_buf && tmp_buf_size < conv_buf_size) {
                                 /* Set up initial background buffer */
                                 tmp_buf_size = conv_buf_size;
-                                if(NULL == (tmp_buf = H5FL_BLK_REALLOC(vlen_seq, tmp_buf, tmp_buf_size)))
-                                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+                                if (NULL == (tmp_buf = H5FL_BLK_REALLOC(vlen_seq, tmp_buf, tmp_buf_size)))
+                                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                                "memory allocation failed for type conversion")
                                 HDmemset(tmp_buf, 0, tmp_buf_size);
                             } /* end if */
 
                             /* If we are writing and there is a nested VL type, read
                              * the sequence into the background buffer */
-                            if(nested) {
+                            if (nested) {
                                 const uint8_t *tmp = b;
 
                                 UINT32DECODE(tmp, bg_seq_len);
-                                if(bg_seq_len > 0) {
-                                    if(tmp_buf_size < (bg_seq_len * MAX(src_base_size, dst_base_size))) {
+                                if (bg_seq_len > 0) {
+                                    if (tmp_buf_size < (bg_seq_len * MAX(src_base_size, dst_base_size))) {
                                         tmp_buf_size = (bg_seq_len * MAX(src_base_size, dst_base_size));
-                                        if(NULL == (tmp_buf = H5FL_BLK_REALLOC(vlen_seq, tmp_buf, tmp_buf_size)))
-                                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+                                        if (NULL ==
+                                            (tmp_buf = H5FL_BLK_REALLOC(vlen_seq, tmp_buf, tmp_buf_size)))
+                                            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                                        "memory allocation failed for type conversion")
                                         HDmemset(tmp_buf, 0, tmp_buf_size);
                                     } /* end if */
                                     H5F_addr_decode(dst->shared->u.vlen.f, &tmp, &(bg_hobjid.addr));
                                     UINT32DECODE(tmp, bg_hobjid.idx);
-                                    if(NULL == H5HG_read(dst->shared->u.vlen.f, dxpl_id, &bg_hobjid, tmp_buf, NULL))
-                                        HGOTO_ERROR(H5E_DATATYPE, H5E_READERROR, FAIL, "can't read VL sequence into background buffer")
+                                    if (NULL ==
+                                        H5HG_read(dst->shared->u.vlen.f, dxpl_id, &bg_hobjid, tmp_buf, NULL))
+                                        HGOTO_ERROR(H5E_DATATYPE, H5E_READERROR, FAIL,
+                                                    "can't read VL sequence into background buffer")
                                 } /* end if */
 
                                 /* If the sequence gets shorter, pad out the original sequence with zeros */
-                                if(bg_seq_len < seq_len)
-                                    HDmemset((uint8_t *)tmp_buf + dst_base_size * bg_seq_len, 0, (seq_len - bg_seq_len) * dst_base_size);
+                                if (bg_seq_len < seq_len)
+                                    HDmemset((uint8_t *)tmp_buf + dst_base_size * bg_seq_len, 0,
+                                             (seq_len - bg_seq_len) * dst_base_size);
                             } /* end if */
 
                             /* Convert VL sequence */
-                            if(H5T_convert(tpath, tsrc_id, tdst_id, seq_len, (size_t)0, (size_t)0, conv_buf, tmp_buf, dxpl_id) < 0)
+                            if (H5T_convert(tpath, tsrc_id, tdst_id, seq_len, (size_t)0, (size_t)0, conv_buf,
+                                            tmp_buf, dxpl_id) < 0)
                                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
                         } /* end if */
 
                         /* Write sequence to destination location */
-                        if((*(dst->shared->u.vlen.write))(dst->shared->u.vlen.f, dxpl_id, vl_alloc_info, d, conv_buf, b, seq_len, dst_base_size) < 0)
+                        if ((*(dst->shared->u.vlen.write))(dst->shared->u.vlen.f, dxpl_id, vl_alloc_info, d,
+                                                           conv_buf, b, seq_len, dst_base_size) < 0)
                             HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "can't write VL data")
 
-                        if(!noop_conv) {
-                            /* For nested VL case, free leftover heap objects from the deeper level if the length of new data elements is shorter than the old data elements.*/
-                            if(nested && seq_len < bg_seq_len) {
-                                size_t parent_seq_len;
+                        if (!noop_conv) {
+                            /* For nested VL case, free leftover heap objects from the deeper level if the
+                             * length of new data elements is shorter than the old data elements.*/
+                            if (nested && seq_len < bg_seq_len) {
+                                size_t         parent_seq_len;
                                 const uint8_t *tmp;
-                                size_t u;
+                                size_t         u;
 
-                                /* TMP_P is reset each time in the loop because DST_BASE_SIZE may include some data in addition to VL info. - SLU */
-                                for(u = seq_len; u < bg_seq_len; u++) {
+                                /* TMP_P is reset each time in the loop because DST_BASE_SIZE may include some
+                                 * data in addition to VL info. - SLU */
+                                for (u = seq_len; u < bg_seq_len; u++) {
                                     tmp = (uint8_t *)tmp_buf + u * dst_base_size;
                                     UINT32DECODE(tmp, parent_seq_len);
-                                    if(parent_seq_len > 0) {
+                                    if (parent_seq_len > 0) {
                                         H5F_addr_decode(dst->shared->u.vlen.f, &tmp, &(parent_hobjid.addr));
                                         UINT32DECODE(tmp, parent_hobjid.idx);
-                                        if(H5HG_remove(dst->shared->u.vlen.f, dxpl_id, &parent_hobjid) < 0)
-                                            HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "Unable to remove heap object")
+                                        if (H5HG_remove(dst->shared->u.vlen.f, dxpl_id, &parent_hobjid) < 0)
+                                            HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL,
+                                                        "Unable to remove heap object")
                                     } /* end if */
-                                } /* end for */
-                            } /* end if */
-                        } /* end if */
-                    } /* end else */
+                                }     /* end for */
+                            }         /* end if */
+                        }             /* end if */
+                    }                 /* end else */
 
                     /* Advance pointers */
                     s += s_stride;
@@ -3349,31 +3465,30 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             } /* end while */
 
             /* Release the temporary datatype IDs used */
-            if(tsrc_id >= 0)
+            if (tsrc_id >= 0)
                 H5I_dec_ref(tsrc_id);
-            if(tdst_id >= 0)
+            if (tdst_id >= 0)
                 H5I_dec_ref(tdst_id);
             break;
 
-        default:    /* Some other command we don't know about yet.*/
+        default: /* Some other command we don't know about yet.*/
             HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unknown conversion command")
-    }   /* end switch */
+    } /* end switch */
 
 done:
     /* If the conversion buffer doesn't need to be freed, reset its pointer */
-    if(write_to_file && noop_conv)
+    if (write_to_file && noop_conv)
         conv_buf = NULL;
     /* Release the conversion buffer (always allocated, except on errors) */
-    if(conv_buf)
+    if (conv_buf)
         conv_buf = H5FL_BLK_FREE(vlen_seq, conv_buf);
     /* Release the background buffer, if we have one */
-    if(tmp_buf)
+    if (tmp_buf)
         tmp_buf = H5FL_BLK_FREE(vlen_seq, tmp_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_vlen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_array
  *
@@ -3390,21 +3505,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-        size_t buf_stride, size_t bkg_stride, void *_buf,
-              void H5_ATTR_UNUSED *_bkg, hid_t dxpl_id)
+H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                size_t bkg_stride, void *_buf, void H5_ATTR_UNUSED *_bkg, hid_t dxpl_id)
 {
-    H5T_path_t    *tpath;                /* Type conversion path             */
-    hid_t       tsrc_id = -1, tdst_id = -1;/*temporary type atoms         */
-    H5T_t    *src = NULL;            /*source datatype             */
-    H5T_t    *dst = NULL;            /*destination datatype             */
-    uint8_t    *sp, *dp;            /*source and dest traversal ptrs     */
-    ssize_t    src_delta, dst_delta;    /*source & destination stride         */
-    int            direction;        /*direction of traversal         */
-    size_t    elmtno;            /*element number counter         */
-    unsigned    u;                      /* local index variable */
-    void    *bkg_buf = NULL;         /*temporary background buffer          */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_path_t *tpath;                      /* Type conversion path             */
+    hid_t       tsrc_id = -1, tdst_id = -1; /*temporary type atoms         */
+    H5T_t *     src = NULL;                 /*source datatype             */
+    H5T_t *     dst = NULL;                 /*destination datatype             */
+    uint8_t *   sp, *dp;                    /*source and dest traversal ptrs     */
+    ssize_t     src_delta, dst_delta;       /*source & destination stride         */
+    int         direction;                  /*direction of traversal         */
+    size_t      elmtno;                     /*element number counter         */
+    unsigned    u;                          /* local index variable */
+    void *      bkg_buf   = NULL;           /*temporary background buffer          */
+    herr_t      ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -3417,17 +3531,19 @@ H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * information that remains (almost) constant for this
              * conversion path.
              */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            HDassert(H5T_ARRAY==src->shared->type);
-            HDassert(H5T_ARRAY==dst->shared->type);
+            HDassert(H5T_ARRAY == src->shared->type);
+            HDassert(H5T_ARRAY == dst->shared->type);
 
             /* Check the number and sizes of the dimensions */
-            if(src->shared->u.array.ndims != dst->shared->u.array.ndims)
-                HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "array datatypes do not have the same number of dimensions")
-            for(u = 0; u < src->shared->u.array.ndims; u++)
-                if(src->shared->u.array.dim[u] != dst->shared->u.array.dim[u])
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "array datatypes do not have the same sizes of dimensions")
+            if (src->shared->u.array.ndims != dst->shared->u.array.ndims)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                            "array datatypes do not have the same number of dimensions")
+            for (u = 0; u < src->shared->u.array.ndims; u++)
+                if (src->shared->u.array.dim[u] != dst->shared->u.array.dim[u])
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                "array datatypes do not have the same sizes of dimensions")
 
             /* Array datatypes don't need a background buffer */
             cdata->need_bkg = H5T_BKG_NO;
@@ -3450,14 +3566,13 @@ H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * versa? Also, how many of the elements have the source and
              * destination areas overlapping?
              */
-            if(src->shared->size >= dst->shared->size || buf_stride > 0) {
-                sp = dp = (uint8_t*)_buf;
+            if (src->shared->size >= dst->shared->size || buf_stride > 0) {
+                sp = dp   = (uint8_t *)_buf;
                 direction = 1;
-            } else {
-                sp = (uint8_t*)_buf + (nelmts - 1) *
-                     (buf_stride ? buf_stride : src->shared->size);
-                dp = (uint8_t*)_buf + (nelmts - 1) *
-                     (buf_stride ? buf_stride : dst->shared->size);
+            }
+            else {
+                sp        = (uint8_t *)_buf + (nelmts - 1) * (buf_stride ? buf_stride : src->shared->size);
+                dp        = (uint8_t *)_buf + (nelmts - 1) * (buf_stride ? buf_stride : dst->shared->size);
                 direction = -1;
             }
 
@@ -3471,31 +3586,39 @@ H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             dst_delta = (ssize_t)direction * (ssize_t)(buf_stride ? buf_stride : dst->shared->size);
 
             /* Set up conversion path for base elements */
-            if(NULL == (tpath = H5T_path_find(src->shared->parent, dst->shared->parent, NULL, NULL, dxpl_id, FALSE))) {
-                HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatypes")
-            } else if (!H5T_path_noop(tpath)) {
-                if((tsrc_id = H5I_register(H5I_DATATYPE, H5T_copy(src->shared->parent, H5T_COPY_ALL), FALSE)) < 0 ||
-                        (tdst_id = H5I_register(H5I_DATATYPE, H5T_copy(dst->shared->parent, H5T_COPY_ALL), FALSE)) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
+            if (NULL == (tpath = H5T_path_find(src->shared->parent, dst->shared->parent, NULL, NULL, dxpl_id,
+                                               FALSE))) {
+                HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                            "unable to convert between src and dest datatypes")
+            }
+            else if (!H5T_path_noop(tpath)) {
+                if ((tsrc_id = H5I_register(H5I_DATATYPE, H5T_copy(src->shared->parent, H5T_COPY_ALL),
+                                            FALSE)) < 0 ||
+                    (tdst_id =
+                         H5I_register(H5I_DATATYPE, H5T_copy(dst->shared->parent, H5T_COPY_ALL), FALSE)) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL,
+                                "unable to register types for conversion")
             }
 
             /* Check if we need a background buffer for this conversion */
-            if(tpath->cdata.need_bkg) {
-                size_t    bkg_buf_size;            /*size of background buffer in bytes */
+            if (tpath->cdata.need_bkg) {
+                size_t bkg_buf_size; /*size of background buffer in bytes */
 
                 /* Allocate background buffer */
                 bkg_buf_size = src->shared->u.array.nelem * MAX(src->shared->size, dst->shared->size);
-                if(NULL == (bkg_buf = H5FL_BLK_CALLOC(array_seq, bkg_buf_size)))
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+                if (NULL == (bkg_buf = H5FL_BLK_CALLOC(array_seq, bkg_buf_size)))
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                "memory allocation failed for type conversion")
             } /* end if */
 
             /* Perform the actual conversion */
-            for(elmtno = 0; elmtno < nelmts; elmtno++) {
+            for (elmtno = 0; elmtno < nelmts; elmtno++) {
                 /* Copy the source array into the correct location for the destination */
                 HDmemmove(dp, sp, src->shared->size);
 
                 /* Convert array */
-                if(H5T_convert(tpath, tsrc_id, tdst_id, src->shared->u.array.nelem, (size_t)0, bkg_stride, dp, bkg_buf, dxpl_id) < 0)
+                if (H5T_convert(tpath, tsrc_id, tdst_id, src->shared->u.array.nelem, (size_t)0, bkg_stride,
+                                dp, bkg_buf, dxpl_id) < 0)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
 
                 /* Advance the source & destination pointers */
@@ -3504,25 +3627,24 @@ H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             } /* end for */
 
             /* Release the temporary datatype IDs used */
-            if(tsrc_id >= 0)
+            if (tsrc_id >= 0)
                 H5I_dec_ref(tsrc_id);
-            if(tdst_id >= 0)
+            if (tdst_id >= 0)
                 H5I_dec_ref(tdst_id);
             break;
 
-        default:    /* Some other command we don't know about yet.*/
+        default: /* Some other command we don't know about yet.*/
             HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unknown conversion command")
     } /* end switch */
 
 done:
     /* Release the background buffer, if we have one */
-    if(bkg_buf)
+    if (bkg_buf)
         bkg_buf = H5FL_BLK_FREE(array_seq, bkg_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_array() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_i_i
  *
@@ -3552,40 +3674,39 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-    size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-    hid_t dxpl_id)
-{
-    H5T_t    *src = NULL;        /*source datatype        */
-    H5T_t    *dst = NULL;        /*destination datatype        */
-    ssize_t    src_delta, dst_delta;    /*source & destination stride    */
-    int        direction;        /*direction of traversal    */
-    size_t    elmtno;            /*element number        */
-    size_t    half_size;        /*half the type size        */
-    size_t    olap;            /*num overlapping elements    */
-    uint8_t    *s, *sp, *d, *dp;    /*source and dest traversal ptrs*/
-    uint8_t     *src_rev=NULL;          /*order-reversed source buffer  */
-    uint8_t    dbuf[64];        /*temp destination buffer    */
-    size_t    first;
-    ssize_t    sfirst;            /*a signed version of `first'    */
-    size_t    i;                      /*Local index variables         */
-    H5P_genplist_t      *plist;         /*property list pointer         */
-    H5T_conv_cb_t       cb_struct={NULL, NULL};      /*conversion callback structure */
-    H5T_conv_ret_t      except_ret;     /*return of callback function   */
-    hbool_t             reverse;        /*if reverse the order of destination        */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+              size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id)
+{
+    H5T_t *         src = NULL;           /*source datatype        */
+    H5T_t *         dst = NULL;           /*destination datatype        */
+    ssize_t         src_delta, dst_delta; /*source & destination stride    */
+    int             direction;            /*direction of traversal    */
+    size_t          elmtno;               /*element number        */
+    size_t          half_size;            /*half the type size        */
+    size_t          olap;                 /*num overlapping elements    */
+    uint8_t *       s, *sp, *d, *dp;      /*source and dest traversal ptrs*/
+    uint8_t *       src_rev = NULL;       /*order-reversed source buffer  */
+    uint8_t         dbuf[64];             /*temp destination buffer    */
+    size_t          first;
+    ssize_t         sfirst;                   /*a signed version of `first'    */
+    size_t          i;                        /*Local index variables         */
+    H5P_genplist_t *plist;                    /*property list pointer         */
+    H5T_conv_cb_t   cb_struct = {NULL, NULL}; /*conversion callback structure */
+    H5T_conv_ret_t  except_ret;               /*return of callback function   */
+    hbool_t         reverse;                  /*if reverse the order of destination        */
+    herr_t          ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            if(H5T_ORDER_LE != src->shared->u.atomic.order && H5T_ORDER_BE != src->shared->u.atomic.order)
+            if (H5T_ORDER_LE != src->shared->u.atomic.order && H5T_ORDER_BE != src->shared->u.atomic.order)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
-            if(H5T_ORDER_LE != dst->shared->u.atomic.order && H5T_ORDER_BE != dst->shared->u.atomic.order)
+            if (H5T_ORDER_LE != dst->shared->u.atomic.order && H5T_ORDER_BE != dst->shared->u.atomic.order)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
-            if(dst->shared->size > sizeof dbuf)
+            if (dst->shared->size > sizeof dbuf)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "destination size is too large")
             cdata->need_bkg = H5T_BKG_NO;
             break;
@@ -3595,7 +3716,7 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the datatypes */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
             /*
@@ -3603,23 +3724,25 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * how many of the elements have the source and destination areas
              * overlapping?
              */
-            if (src->shared->size==dst->shared->size || buf_stride) {
-                sp = dp = (uint8_t*)buf;
+            if (src->shared->size == dst->shared->size || buf_stride) {
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-                olap = nelmts;
-            } else if (src->shared->size>=dst->shared->size) {
-                double olap_d = HDceil((double)(dst->shared->size)/
-                                       (double)(src->shared->size-dst->shared->size));
+                olap      = nelmts;
+            }
+            else if (src->shared->size >= dst->shared->size) {
+                double olap_d =
+                    HDceil((double)(dst->shared->size) / (double)(src->shared->size - dst->shared->size));
 
                 olap = (size_t)olap_d;
-                sp = dp = (uint8_t*)buf;
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-            } else {
-                double olap_d = HDceil((double)(src->shared->size)/
-                                       (double)(dst->shared->size-src->shared->size));
-                olap = (size_t)olap_d;
-                sp = (uint8_t*)buf + (nelmts - 1) * src->shared->size;
-                dp = (uint8_t*)buf + (nelmts - 1) * dst->shared->size;
+            }
+            else {
+                double olap_d =
+                    HDceil((double)(src->shared->size) / (double)(dst->shared->size - src->shared->size));
+                olap      = (size_t)olap_d;
+                sp        = (uint8_t *)buf + (nelmts - 1) * src->shared->size;
+                dp        = (uint8_t *)buf + (nelmts - 1) * dst->shared->size;
                 direction = -1;
             }
 
@@ -3633,36 +3756,40 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             dst_delta = (ssize_t)direction * (ssize_t)(buf_stride ? buf_stride : dst->shared->size);
 
             /* Get the plist structure */
-            if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+            if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
                 HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find property list for ID")
 
             /* Get conversion exception callback property */
-            if(H5P_get(plist,H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
+            if (H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback")
 
             /* Allocate space for order-reversed source buffer */
-            src_rev = (uint8_t*)H5MM_calloc(src->shared->size);
+            src_rev = (uint8_t *)H5MM_calloc(src->shared->size);
 
             /* The conversion loop */
-            for(elmtno = 0; elmtno < nelmts; elmtno++) {
+            for (elmtno = 0; elmtno < nelmts; elmtno++) {
 
                 /*
                  * If the source and destination buffers overlap then use a
                  * temporary buffer for the destination.
                  */
-                if(direction > 0) {
+                if (direction > 0) {
                     s = sp;
                     d = elmtno < olap ? dbuf : dp;
-                } else {
+                }
+                else {
                     s = sp;
                     d = elmtno + olap >= nelmts ? dbuf : dp;
                 }
 #ifndef NDEBUG
                 /* I don't quite trust the overlap calculations yet --rpm */
-                if (d==dbuf) {
-                    HDassert((dp>=sp && dp<sp+src->shared->size) || (sp>=dp && sp<dp+dst->shared->size));
-                } else {
-                    HDassert((dp<sp && dp+dst->shared->size<=sp) || (sp<dp && sp+src->shared->size<=dp));
+                if (d == dbuf) {
+                    HDassert((dp >= sp && dp < sp + src->shared->size) ||
+                             (sp >= dp && sp < dp + dst->shared->size));
+                }
+                else {
+                    HDassert((dp < sp && dp + dst->shared->size <= sp) ||
+                             (sp < dp && sp + src->shared->size <= dp));
                 }
 #endif
 
@@ -3671,12 +3798,12 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * complicated.  We'll do all the conversion stuff assuming
                  * little endian and then we'll fix the order at the end.
                  */
-                if (H5T_ORDER_BE==src->shared->u.atomic.order) {
-                    half_size = src->shared->size/2;
-                    for (i=0; i<half_size; i++) {
-                        uint8_t tmp = s[src->shared->size-(i+1)];
-                        s[src->shared->size-(i+1)] = s[i];
-                        s[i] = tmp;
+                if (H5T_ORDER_BE == src->shared->u.atomic.order) {
+                    half_size = src->shared->size / 2;
+                    for (i = 0; i < half_size; i++) {
+                        uint8_t tmp                    = s[src->shared->size - (i + 1)];
+                        s[src->shared->size - (i + 1)] = s[i];
+                        s[i]                           = tmp;
                     }
                 }
 
@@ -3684,23 +3811,23 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * What is the bit number for the msb bit of S which is set? The
                  * bit number is relative to the significant part of the number.
                  */
-                sfirst = H5T__bit_find (s, src->shared->u.atomic.offset, src->shared->u.atomic.prec,
+                sfirst = H5T__bit_find(s, src->shared->u.atomic.offset, src->shared->u.atomic.prec,
                                        H5T_BIT_MSB, TRUE);
-                first = (size_t)sfirst;
+                first  = (size_t)sfirst;
 
                 /* Set these variables to default */
                 except_ret = H5T_CONV_UNHANDLED;
                 reverse    = TRUE;
 
-                if (sfirst<0) {
+                if (sfirst < 0) {
                     /*
                      * The source has no bits set and must therefore be zero.
                      * Set the destination to zero.
                      */
-                    H5T__bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, FALSE);
-
-                } else if (H5T_SGN_NONE==src->shared->u.atomic.u.i.sign &&
-                           H5T_SGN_NONE==dst->shared->u.atomic.u.i.sign) {
+                    H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, FALSE);
+                }
+                else if (H5T_SGN_NONE == src->shared->u.atomic.u.i.sign &&
+                         H5T_SGN_NONE == dst->shared->u.atomic.u.i.sign) {
                     /*
                      * Source and destination are both unsigned, but if the
                      * source has more precision bits than the destination then
@@ -3708,32 +3835,37 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                      * destination will be set to the maximum possible value.
                      */
                     if (src->shared->u.atomic.prec <= dst->shared->u.atomic.prec) {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
-                              src->shared->u.atomic.prec);
-                        H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
-                             dst->shared->u.atomic.prec-src->shared->u.atomic.prec, FALSE);
-                    } else if (first>=dst->shared->u.atomic.prec) {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      src->shared->u.atomic.prec);
+                        H5T__bit_set(d, dst->shared->u.atomic.offset + src->shared->u.atomic.prec,
+                                     dst->shared->u.atomic.prec - src->shared->u.atomic.prec, FALSE);
+                    }
+                    else if (first >= dst->shared->u.atomic.prec) {
                         /*overflow*/
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
-                            H5T_reverse_order(src_rev, s, src->shared->size, src->shared->u.atomic.order); /*reverse order first*/
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                    src_rev, d, cb_struct.user_data);
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
+                            H5T_reverse_order(src_rev, s, src->shared->size,
+                                              src->shared->u.atomic.order); /*reverse order first*/
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev,
+                                                          d, cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
-                            H5T__bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, TRUE);
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        else if(except_ret == H5T_CONV_HANDLED)
+                        if (except_ret == H5T_CONV_UNHANDLED) {
+                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, TRUE);
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_HANDLED)
                             /*Don't reverse because user handles it already*/
                             reverse = FALSE;
-                    } else {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
-                              dst->shared->u.atomic.prec);
                     }
-
-                } else if (H5T_SGN_2==src->shared->u.atomic.u.i.sign &&
-                           H5T_SGN_NONE==dst->shared->u.atomic.u.i.sign) {
+                    else {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      dst->shared->u.atomic.prec);
+                    }
+                }
+                else if (H5T_SGN_2 == src->shared->u.atomic.u.i.sign &&
+                         H5T_SGN_NONE == dst->shared->u.atomic.u.i.sign) {
                     /*
                      * If the source is signed and the destination isn't then we
                      * can have overflow if the source contains more bits than
@@ -3741,79 +3873,95 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                      * possible value) or overflow if the source is negative
                      * (destination is set to zero).
                      */
-                    if (first+1 == src->shared->u.atomic.prec) {
+                    if (first + 1 == src->shared->u.atomic.prec) {
                         /*overflow - source is negative*/
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
-                            H5T_reverse_order(src_rev, s, src->shared->size, src->shared->u.atomic.order); /*reverse order first*/
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id,
-                                    src_rev, d, cb_struct.user_data);
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
+                            H5T_reverse_order(src_rev, s, src->shared->size,
+                                              src->shared->u.atomic.order); /*reverse order first*/
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, src_rev,
+                                                          d, cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
-                            H5T__bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, FALSE);
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        else if(except_ret == H5T_CONV_HANDLED)
+                        if (except_ret == H5T_CONV_UNHANDLED) {
+                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, FALSE);
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_HANDLED)
                             /*Don't reverse because user handles it already*/
                             reverse = FALSE;
-                    } else if (src->shared->u.atomic.prec < dst->shared->u.atomic.prec) {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
-                              src->shared->u.atomic.prec-1);
-                        H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec-1,
-                             (dst->shared->u.atomic.prec-src->shared->u.atomic.prec)+1, FALSE);
-                    } else if (first>=dst->shared->u.atomic.prec) {
+                    }
+                    else if (src->shared->u.atomic.prec < dst->shared->u.atomic.prec) {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      src->shared->u.atomic.prec - 1);
+                        H5T__bit_set(d, dst->shared->u.atomic.offset + src->shared->u.atomic.prec - 1,
+                                     (dst->shared->u.atomic.prec - src->shared->u.atomic.prec) + 1, FALSE);
+                    }
+                    else if (first >= dst->shared->u.atomic.prec) {
                         /*overflow - source is positive*/
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
-                            H5T_reverse_order(src_rev, s, src->shared->size, src->shared->u.atomic.order); /*reverse order first*/
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                    src_rev, d, cb_struct.user_data);
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
+                            H5T_reverse_order(src_rev, s, src->shared->size,
+                                              src->shared->u.atomic.order); /*reverse order first*/
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev,
+                                                          d, cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED)
-                            H5T__bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, TRUE);
-                        else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        else if(except_ret == H5T_CONV_HANDLED)
+                        if (except_ret == H5T_CONV_UNHANDLED)
+                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, TRUE);
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_HANDLED)
                             /*Don't reverse because user handles it already*/
                             reverse = FALSE;
-                    } else {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
-                              dst->shared->u.atomic.prec);
                     }
-
-                } else if (H5T_SGN_NONE==src->shared->u.atomic.u.i.sign &&
-                           H5T_SGN_2==dst->shared->u.atomic.u.i.sign) {
+                    else {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      dst->shared->u.atomic.prec);
+                    }
+                }
+                else if (H5T_SGN_NONE == src->shared->u.atomic.u.i.sign &&
+                         H5T_SGN_2 == dst->shared->u.atomic.u.i.sign) {
                     /*
                      * If the source is not signed but the destination is then
                      * overflow can occur in which case the destination is set to
                      * the largest possible value (all bits set except the msb).
                      */
-                    if (first+1 >= dst->shared->u.atomic.prec) {
+                    if (first + 1 >= dst->shared->u.atomic.prec) {
                         /*overflow*/
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
-                            H5T_reverse_order(src_rev, s, src->shared->size, src->shared->u.atomic.order); /*reverse order first*/
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                    src_rev, d, cb_struct.user_data);
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
+                            H5T_reverse_order(src_rev, s, src->shared->size,
+                                              src->shared->u.atomic.order); /*reverse order first*/
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev,
+                                                          d, cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
-                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, TRUE);
-                            H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, FALSE);
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        else if(except_ret == H5T_CONV_HANDLED)
+                        if (except_ret == H5T_CONV_UNHANDLED) {
+                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec - 1,
+                                         TRUE);
+                            H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec - 1),
+                                         (size_t)1, FALSE);
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_HANDLED)
                             /*Don't reverse because user handles it already*/
                             reverse = FALSE;
-                    } else if (src->shared->u.atomic.prec<dst->shared->u.atomic.prec) {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
-                              src->shared->u.atomic.prec);
-                        H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
-                             dst->shared->u.atomic.prec-src->shared->u.atomic.prec, FALSE);
-                    } else {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
-                              dst->shared->u.atomic.prec);
                     }
-                } else if (first+1 == src->shared->u.atomic.prec) {
+                    else if (src->shared->u.atomic.prec < dst->shared->u.atomic.prec) {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      src->shared->u.atomic.prec);
+                        H5T__bit_set(d, dst->shared->u.atomic.offset + src->shared->u.atomic.prec,
+                                     dst->shared->u.atomic.prec - src->shared->u.atomic.prec, FALSE);
+                    }
+                    else {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      dst->shared->u.atomic.prec);
+                    }
+                }
+                else if (first + 1 == src->shared->u.atomic.prec) {
                     /*
                      * Both the source and the destination are signed and the
                      * source value is negative.  We could experience overflow
@@ -3821,91 +3969,112 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                      * destination is set to a negative number with the largest
                      * possible magnitude.
                      */
-                    ssize_t sfz = H5T__bit_find (s, src->shared->u.atomic.offset,
-                                    src->shared->u.atomic.prec-1, H5T_BIT_MSB, FALSE);
-                    size_t fz = (size_t)sfz;
+                    ssize_t sfz = H5T__bit_find(s, src->shared->u.atomic.offset,
+                                                src->shared->u.atomic.prec - 1, H5T_BIT_MSB, FALSE);
+                    size_t  fz  = (size_t)sfz;
 
-                    if (sfz>=0 && fz+1>=dst->shared->u.atomic.prec) {
+                    if (sfz >= 0 && fz + 1 >= dst->shared->u.atomic.prec) {
                         /*overflow*/
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
-                            H5T_reverse_order(src_rev, s, src->shared->size, src->shared->u.atomic.order); /*reverse order first*/
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id,
-                                    src_rev, d, cb_struct.user_data);
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
+                            H5T_reverse_order(src_rev, s, src->shared->size,
+                                              src->shared->u.atomic.order); /*reverse order first*/
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, src_rev,
+                                                          d, cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
-                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, FALSE);
-                            H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, TRUE);
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        else if(except_ret == H5T_CONV_HANDLED)
+                        if (except_ret == H5T_CONV_UNHANDLED) {
+                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec - 1,
+                                         FALSE);
+                            H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec - 1),
+                                         (size_t)1, TRUE);
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_HANDLED)
                             /*Don't reverse because user handles it already*/
                             reverse = FALSE;
-                    } else if (src->shared->u.atomic.prec<dst->shared->u.atomic.prec) {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset, src->shared->u.atomic.prec);
-                        H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec, dst->shared->u.atomic.prec-src->shared->u.atomic.prec, TRUE);
-                    } else {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset, dst->shared->u.atomic.prec);
                     }
-
-                } else {
+                    else if (src->shared->u.atomic.prec < dst->shared->u.atomic.prec) {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      src->shared->u.atomic.prec);
+                        H5T__bit_set(d, dst->shared->u.atomic.offset + src->shared->u.atomic.prec,
+                                     dst->shared->u.atomic.prec - src->shared->u.atomic.prec, TRUE);
+                    }
+                    else {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      dst->shared->u.atomic.prec);
+                    }
+                }
+                else {
                     /*
                      * Source and destination are both signed but the source
                      * value is positive.  We could have an overflow in which
                      * case the destination is set to the largest possible
                      * positive value.
                      */
-                    if (first+1>=dst->shared->u.atomic.prec) {
+                    if (first + 1 >= dst->shared->u.atomic.prec) {
                         /*overflow*/
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
-                            H5T_reverse_order(src_rev, s, src->shared->size, src->shared->u.atomic.order); /*reverse order first*/
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev, d,
-                                    cb_struct.user_data);
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
+                            H5T_reverse_order(src_rev, s, src->shared->size,
+                                              src->shared->u.atomic.order); /*reverse order first*/
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev,
+                                                          d, cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
-                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, TRUE);
-                            H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, FALSE);
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        else if(except_ret == H5T_CONV_HANDLED)
+                        if (except_ret == H5T_CONV_UNHANDLED) {
+                            H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec - 1,
+                                         TRUE);
+                            H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec - 1),
+                                         (size_t)1, FALSE);
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_HANDLED)
                             /*Don't reverse because user handles it already*/
                             reverse = FALSE;
-                    } else if (src->shared->u.atomic.prec<dst->shared->u.atomic.prec) {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
-                              src->shared->u.atomic.prec);
-                        H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
-                             dst->shared->u.atomic.prec-src->shared->u.atomic.prec, FALSE);
-                    } else {
-                        H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
-                              dst->shared->u.atomic.prec);
+                    }
+                    else if (src->shared->u.atomic.prec < dst->shared->u.atomic.prec) {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      src->shared->u.atomic.prec);
+                        H5T__bit_set(d, dst->shared->u.atomic.offset + src->shared->u.atomic.prec,
+                                     dst->shared->u.atomic.prec - src->shared->u.atomic.prec, FALSE);
+                    }
+                    else {
+                        H5T__bit_copy(d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+                                      dst->shared->u.atomic.prec);
                     }
                 }
 
                 /*
                  * Set padding areas in destination.
                  */
-                if (dst->shared->u.atomic.offset>0) {
-                    HDassert(H5T_PAD_ZERO==dst->shared->u.atomic.lsb_pad || H5T_PAD_ONE==dst->shared->u.atomic.lsb_pad);
-                    H5T__bit_set(d, (size_t)0, dst->shared->u.atomic.offset, (hbool_t)(H5T_PAD_ONE==dst->shared->u.atomic.lsb_pad));
+                if (dst->shared->u.atomic.offset > 0) {
+                    HDassert(H5T_PAD_ZERO == dst->shared->u.atomic.lsb_pad ||
+                             H5T_PAD_ONE == dst->shared->u.atomic.lsb_pad);
+                    H5T__bit_set(d, (size_t)0, dst->shared->u.atomic.offset,
+                                 (hbool_t)(H5T_PAD_ONE == dst->shared->u.atomic.lsb_pad));
                 }
-                if (dst->shared->u.atomic.offset+dst->shared->u.atomic.prec!=8*dst->shared->size) {
-                    HDassert(H5T_PAD_ZERO==dst->shared->u.atomic.msb_pad || H5T_PAD_ONE==dst->shared->u.atomic.msb_pad);
-                    H5T__bit_set (d, dst->shared->u.atomic.offset+dst->shared->u.atomic.prec,
-                                 8*dst->shared->size - (dst->shared->u.atomic.offset+ dst->shared->u.atomic.prec),
-                                 (hbool_t)(H5T_PAD_ONE==dst->shared->u.atomic.msb_pad));
+                if (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec != 8 * dst->shared->size) {
+                    HDassert(H5T_PAD_ZERO == dst->shared->u.atomic.msb_pad ||
+                             H5T_PAD_ONE == dst->shared->u.atomic.msb_pad);
+                    H5T__bit_set(d, dst->shared->u.atomic.offset + dst->shared->u.atomic.prec,
+                                 8 * dst->shared->size -
+                                     (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec),
+                                 (hbool_t)(H5T_PAD_ONE == dst->shared->u.atomic.msb_pad));
                 }
 
                 /*
                  * Put the destination in the correct byte order.  See note at
                  * beginning of loop.
                  */
-                if (H5T_ORDER_BE==dst->shared->u.atomic.order && reverse) {
-                    half_size = dst->shared->size/2;
-                    for (i=0; i<half_size; i++) {
-                        uint8_t tmp = d[dst->shared->size-(i+1)];
-                        d[dst->shared->size-(i+1)] = d[i];
-                        d[i] = tmp;
+                if (H5T_ORDER_BE == dst->shared->u.atomic.order && reverse) {
+                    half_size = dst->shared->size / 2;
+                    for (i = 0; i < half_size; i++) {
+                        uint8_t tmp                    = d[dst->shared->size - (i + 1)];
+                        d[dst->shared->size - (i + 1)] = d[i];
+                        d[i]                           = tmp;
                     }
                 }
 
@@ -3913,7 +4082,7 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * If we had used a temporary buffer for the destination then we
                  * should copy the value to the true destination buffer.
                  */
-                if(d==dbuf)
+                if (d == dbuf)
                     HDmemcpy(dp, d, dst->shared->size);
 
                 /* Advance source & destination pointers by delta amounts */
@@ -3928,12 +4097,11 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
     } /* end switch */
 
 done:
-    if(src_rev)
+    if (src_rev)
         H5MM_free(src_rev);
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_i_i() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_f_f
  *
@@ -3966,59 +4134,59 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-    size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-    hid_t dxpl_id)
+H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+              size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id)
 {
     /* Traversal-related variables */
-    H5T_t    *src_p;            /*source datatype        */
-    H5T_t    *dst_p;            /*destination datatype        */
-    H5T_atomic_t src;            /*atomic source info        */
-    H5T_atomic_t dst;            /*atomic destination info    */
-    ssize_t    src_delta, dst_delta;    /*source & destination stride    */
-    int    direction;                /*forward or backward traversal    */
-    size_t    elmtno;            /*element number        */
-    size_t    half_size;        /*half the type size        */
-    size_t      tsize;                  /*type size for swapping bytes  */
-    size_t    olap;            /*num overlapping elements    */
-    ssize_t    bitno = 0;        /*bit number            */
-    uint8_t    *s, *sp, *d, *dp;    /*source and dest traversal ptrs*/
-    uint8_t     *src_rev = NULL;        /*order-reversed source buffer  */
-    uint8_t    dbuf[64];        /*temp destination buffer    */
-    uint8_t     tmp1, tmp2;             /*temp variables for swapping bytes*/
+    H5T_t *      src_p;                /*source datatype        */
+    H5T_t *      dst_p;                /*destination datatype        */
+    H5T_atomic_t src;                  /*atomic source info        */
+    H5T_atomic_t dst;                  /*atomic destination info    */
+    ssize_t      src_delta, dst_delta; /*source & destination stride    */
+    int          direction;            /*forward or backward traversal    */
+    size_t       elmtno;               /*element number        */
+    size_t       half_size;            /*half the type size        */
+    size_t       tsize;                /*type size for swapping bytes  */
+    size_t       olap;                 /*num overlapping elements    */
+    ssize_t      bitno = 0;            /*bit number            */
+    uint8_t *    s, *sp, *d, *dp;      /*source and dest traversal ptrs*/
+    uint8_t *    src_rev = NULL;       /*order-reversed source buffer  */
+    uint8_t      dbuf[64];             /*temp destination buffer    */
+    uint8_t      tmp1, tmp2;           /*temp variables for swapping bytes*/
 
     /* Conversion-related variables */
-    int64_t    expo;            /*exponent            */
-    hssize_t    expo_max;        /*maximum possible dst exponent    */
-    size_t    msize = 0;        /*useful size of mantissa in src*/
-    size_t    mpos;            /*offset to useful mant is src    */
-    uint64_t    sign;                   /*source sign bit value         */
-    size_t    mrsh;            /*amount to right shift mantissa*/
-    hbool_t    carry = 0;        /*carry after rounding mantissa    */
-    size_t    i;            /*miscellaneous counters    */
-    size_t    implied;        /*destination implied bits    */
-    hbool_t     denormalized = FALSE;   /*is either source or destination denormalized?*/
-    H5P_genplist_t      *plist;         /*property list pointer         */
-    H5T_conv_cb_t       cb_struct = {NULL, NULL};      /*conversion callback structure */
-    H5T_conv_ret_t      except_ret;     /*return of callback function   */
-    hbool_t             reverse;        /*if reverse the order of destination        */
-    herr_t      ret_value = SUCCEED;    /*return value                 */
+    int64_t         expo;                     /*exponent            */
+    hssize_t        expo_max;                 /*maximum possible dst exponent    */
+    size_t          msize = 0;                /*useful size of mantissa in src*/
+    size_t          mpos;                     /*offset to useful mant is src    */
+    uint64_t        sign;                     /*source sign bit value         */
+    size_t          mrsh;                     /*amount to right shift mantissa*/
+    hbool_t         carry = 0;                /*carry after rounding mantissa    */
+    size_t          i;                        /*miscellaneous counters    */
+    size_t          implied;                  /*destination implied bits    */
+    hbool_t         denormalized = FALSE;     /*is either source or destination denormalized?*/
+    H5P_genplist_t *plist;                    /*property list pointer         */
+    H5T_conv_cb_t   cb_struct = {NULL, NULL}; /*conversion callback structure */
+    H5T_conv_ret_t  except_ret;               /*return of callback function   */
+    hbool_t         reverse;                  /*if reverse the order of destination        */
+    herr_t          ret_value = SUCCEED;      /*return value                 */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
-            if(NULL == (src_p = (H5T_t *)H5I_object(src_id)) || NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src_p = (H5T_t *)H5I_object(src_id)) ||
+                NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
             src = src_p->shared->u.atomic;
             dst = dst_p->shared->u.atomic;
-            if(H5T_ORDER_LE != src.order && H5T_ORDER_BE != src.order && H5T_ORDER_VAX != src.order)
+            if (H5T_ORDER_LE != src.order && H5T_ORDER_BE != src.order && H5T_ORDER_VAX != src.order)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
-            if(H5T_ORDER_LE != dst.order && H5T_ORDER_BE != dst.order && H5T_ORDER_VAX != dst.order)
+            if (H5T_ORDER_LE != dst.order && H5T_ORDER_BE != dst.order && H5T_ORDER_VAX != dst.order)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
-            if(dst_p->shared->size > sizeof(dbuf))
+            if (dst_p->shared->size > sizeof(dbuf))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "destination size is too large")
-            if(8 * sizeof(expo) - 1 < src.u.f.esize || 8 * sizeof(expo) - 1 < dst.u.f.esize)
+            if (8 * sizeof(expo) - 1 < src.u.f.esize || 8 * sizeof(expo) - 1 < dst.u.f.esize)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "exponent field is too large")
             cdata->need_bkg = H5T_BKG_NO;
             break;
@@ -4028,10 +4196,11 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the datatypes */
-            if(NULL == (src_p = (H5T_t *)H5I_object(src_id)) || NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src_p = (H5T_t *)H5I_object(src_id)) ||
+                NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            src = src_p->shared->u.atomic;
-            dst = dst_p->shared->u.atomic;
+            src      = src_p->shared->u.atomic;
+            dst      = dst_p->shared->u.atomic;
             expo_max = ((hssize_t)1 << dst.u.f.esize) - 1;
 
             /*
@@ -4039,23 +4208,25 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * how many of the elements have the source and destination areas
              * overlapping?
              */
-            if (src_p->shared->size==dst_p->shared->size || buf_stride) {
-                sp = dp = (uint8_t*)buf;
+            if (src_p->shared->size == dst_p->shared->size || buf_stride) {
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-                olap = nelmts;
-            } else if (src_p->shared->size>=dst_p->shared->size) {
-                double olap_d = HDceil((double)(dst_p->shared->size)/
-                                       (double)(src_p->shared->size-dst_p->shared->size));
-                olap = (size_t)olap_d;
-                sp = dp = (uint8_t*)buf;
+                olap      = nelmts;
+            }
+            else if (src_p->shared->size >= dst_p->shared->size) {
+                double olap_d = HDceil((double)(dst_p->shared->size) /
+                                       (double)(src_p->shared->size - dst_p->shared->size));
+                olap          = (size_t)olap_d;
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-            } else {
-                double olap_d = HDceil((double)(src_p->shared->size)/
-                                       (double)(dst_p->shared->size-src_p->shared->size));
-                olap = (size_t)olap_d;
-                sp = (uint8_t*)buf + (nelmts-1) * src_p->shared->size;
-                dp = (uint8_t*)buf + (nelmts-1) * dst_p->shared->size;
-                direction = -1;
+            }
+            else {
+                double olap_d = HDceil((double)(src_p->shared->size) /
+                                       (double)(dst_p->shared->size - src_p->shared->size));
+                olap          = (size_t)olap_d;
+                sp            = (uint8_t *)buf + (nelmts - 1) * src_p->shared->size;
+                dp            = (uint8_t *)buf + (nelmts - 1) * dst_p->shared->size;
+                direction     = -1;
             }
 
             /*
@@ -4068,18 +4239,18 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             dst_delta = (ssize_t)direction * (ssize_t)(buf_stride ? buf_stride : dst_p->shared->size);
 
             /* Get the plist structure */
-            if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+            if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
                 HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find property list for ID")
 
             /* Get conversion exception callback property */
-            if(H5P_get(plist,H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
+            if (H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback")
 
             /* Allocate space for order-reversed source buffer */
-            src_rev = (uint8_t*)H5MM_calloc(src_p->shared->size);
+            src_rev = (uint8_t *)H5MM_calloc(src_p->shared->size);
 
             /* The conversion loop */
-            for (elmtno=0; elmtno<nelmts; elmtno++) {
+            for (elmtno = 0; elmtno < nelmts; elmtno++) {
                 /* Set these variables to default */
                 except_ret = H5T_CONV_UNHANDLED;
                 reverse    = TRUE;
@@ -4088,21 +4259,23 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * If the source and destination buffers overlap then use a
                  * temporary buffer for the destination.
                  */
-                if (direction>0) {
+                if (direction > 0) {
                     s = sp;
-                    d = elmtno<olap ? dbuf : dp;
-                } else {
+                    d = elmtno < olap ? dbuf : dp;
+                }
+                else {
                     s = sp;
-                    d = elmtno+olap >= nelmts ? dbuf : dp;
+                    d = elmtno + olap >= nelmts ? dbuf : dp;
                 }
 #ifndef NDEBUG
                 /* I don't quite trust the overlap calculations yet --rpm */
-                if (d==dbuf) {
-                    HDassert((dp>=sp && dp<sp+src_p->shared->size) ||
-                            (sp>=dp && sp<dp+dst_p->shared->size));
-                } else {
-                    HDassert((dp<sp && dp+dst_p->shared->size<=sp) ||
-                            (sp<dp && sp+src_p->shared->size<=dp));
+                if (d == dbuf) {
+                    HDassert((dp >= sp && dp < sp + src_p->shared->size) ||
+                             (sp >= dp && sp < dp + dst_p->shared->size));
+                }
+                else {
+                    HDassert((dp < sp && dp + dst_p->shared->size <= sp) ||
+                             (sp < dp && sp + src_p->shared->size <= dp));
                 }
 #endif
 
@@ -4111,26 +4284,27 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * complicated.  We'll do all the conversion stuff assuming
                  * little endian and then we'll fix the order at the end.
                  */
-                if (H5T_ORDER_BE==src.order) {
-                    half_size = src_p->shared->size/2;
-                    for (i=0; i<half_size; i++) {
-                        tmp1 = s[src_p->shared->size-(i+1)];
-                        s[src_p->shared->size-(i+1)] = s[i];
-                        s[i] = tmp1;
+                if (H5T_ORDER_BE == src.order) {
+                    half_size = src_p->shared->size / 2;
+                    for (i = 0; i < half_size; i++) {
+                        tmp1                             = s[src_p->shared->size - (i + 1)];
+                        s[src_p->shared->size - (i + 1)] = s[i];
+                        s[i]                             = tmp1;
                     }
-                } else if (H5T_ORDER_VAX==src.order) {
+                }
+                else if (H5T_ORDER_VAX == src.order) {
                     tsize = src_p->shared->size;
                     HDassert(0 == tsize % 2);
 
                     for (i = 0; i < tsize; i += 4) {
                         tmp1 = s[i];
-                        tmp2 = s[i+1];
+                        tmp2 = s[i + 1];
 
-                        s[i] = s[(tsize-2)-i];
-                        s[i+1] = s[(tsize-1)-i];
+                        s[i]     = s[(tsize - 2) - i];
+                        s[i + 1] = s[(tsize - 1) - i];
 
-                        s[(tsize-2)-i] = tmp1;
-                        s[(tsize-1)-i] = tmp2;
+                        s[(tsize - 2) - i] = tmp1;
+                        s[(tsize - 1) - i] = tmp2;
                     }
                 }
 
@@ -4142,108 +4316,114 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 /*
                  * Check for special cases: +0, -0, +Inf, -Inf, NaN
                  */
-                if (H5T__bit_find (s, src.u.f.mpos, src.u.f.msize,
-                                  H5T_BIT_LSB, TRUE)<0) {
-                    if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
-                                      H5T_BIT_LSB, TRUE)<0) {
+                if (H5T__bit_find(s, src.u.f.mpos, src.u.f.msize, H5T_BIT_LSB, TRUE) < 0) {
+                    if (H5T__bit_find(s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, TRUE) < 0) {
                         /* +0 or -0 */
-                        H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
-                        H5T__bit_set (d, dst.u.f.epos, dst.u.f.esize, FALSE);
-                        H5T__bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+                        H5T__bit_copy(d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+                        H5T__bit_set(d, dst.u.f.epos, dst.u.f.esize, FALSE);
+                        H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
                         goto padding;
-                    } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
-                                             H5T_BIT_LSB, FALSE)<0) {
+                    }
+                    else if (H5T__bit_find(s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, FALSE) < 0) {
                         /* +Inf or -Inf */
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
                             /*reverse order first*/
                             H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                            if(sign)
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NINF,
-                                    src_id, dst_id, src_rev, d, cb_struct.user_data);
+                            if (sign)
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NINF, src_id, dst_id, src_rev,
+                                                              d, cb_struct.user_data);
                             else
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PINF,
-                                    src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PINF, src_id, dst_id, src_rev,
+                                                              d, cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
-                            H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
-                            H5T__bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
-                            H5T__bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+                        if (except_ret == H5T_CONV_UNHANDLED) {
+                            H5T__bit_copy(d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+                            H5T__bit_set(d, dst.u.f.epos, dst.u.f.esize, TRUE);
+                            H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
                             /*If the destination no implied mantissa bit, we'll need to set
                              *the 1st bit of mantissa to 1.  The Intel-Linux long double is
                              *this case.*/
-                            if (H5T_NORM_NONE==dst.u.f.norm)
-                                H5T__bit_set (d, dst.u.f.mpos+dst.u.f.msize-1, (size_t)1, TRUE);
-                        } else if(except_ret == H5T_CONV_HANDLED) {
+                            if (H5T_NORM_NONE == dst.u.f.norm)
+                                H5T__bit_set(d, dst.u.f.mpos + dst.u.f.msize - 1, (size_t)1, TRUE);
+                        }
+                        else if (except_ret == H5T_CONV_HANDLED) {
                             /*No need to reverse the order of destination because user handles it*/
                             reverse = FALSE;
                             goto next;
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
 
                         goto padding;
                     }
-                } else if (H5T_NORM_NONE==src.u.f.norm && H5T__bit_find (s, src.u.f.mpos, src.u.f.msize-1,
-                                  H5T_BIT_LSB, TRUE)<0 && H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
-                                  H5T_BIT_LSB, FALSE)<0) {
+                }
+                else if (H5T_NORM_NONE == src.u.f.norm &&
+                         H5T__bit_find(s, src.u.f.mpos, src.u.f.msize - 1, H5T_BIT_LSB, TRUE) < 0 &&
+                         H5T__bit_find(s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, FALSE) < 0) {
                     /*This is a special case for the source of no implied mantissa bit.
                      *If the exponent bits are all 1s and only the 1st bit of mantissa
                      *is set to 1.  It's infinity. The Intel-Linux "long double" is this case.*/
                     /* +Inf or -Inf */
-                    if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                    if (cb_struct.func) { /*If user's exception handler is present, use it*/
                         /*reverse order first*/
                         H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                        if(sign)
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NINF,
-                                src_id, dst_id, src_rev, d, cb_struct.user_data);
+                        if (sign)
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NINF, src_id, dst_id, src_rev, d,
+                                                          cb_struct.user_data);
                         else
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PINF,
-                                src_id, dst_id, src_rev, d, cb_struct.user_data);
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PINF, src_id, dst_id, src_rev, d,
+                                                          cb_struct.user_data);
                     }
 
-                    if(except_ret == H5T_CONV_UNHANDLED) {
-                        H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
-                        H5T__bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
-                        H5T__bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+                    if (except_ret == H5T_CONV_UNHANDLED) {
+                        H5T__bit_copy(d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+                        H5T__bit_set(d, dst.u.f.epos, dst.u.f.esize, TRUE);
+                        H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
                         /*If the destination no implied mantissa bit, we'll need to set
                          *the 1st bit of mantissa to 1.  The Intel-Linux long double is
                          *this case.*/
-                        if (H5T_NORM_NONE==dst.u.f.norm)
-                            H5T__bit_set (d, dst.u.f.mpos+dst.u.f.msize-1, (size_t)1, TRUE);
-                    } else if(except_ret == H5T_CONV_HANDLED) {
+                        if (H5T_NORM_NONE == dst.u.f.norm)
+                            H5T__bit_set(d, dst.u.f.mpos + dst.u.f.msize - 1, (size_t)1, TRUE);
+                    }
+                    else if (except_ret == H5T_CONV_HANDLED) {
                         /*No need to reverse the order of destination because user handles it*/
                         reverse = FALSE;
                         goto next;
-                    } else if(except_ret == H5T_CONV_ABORT)
+                    }
+                    else if (except_ret == H5T_CONV_ABORT)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
 
                     goto padding;
-                /* Temporary solution to handle VAX special values.
-                 * Note that even though we don't support VAX anymore, we
-                 * still need to handle legacy VAX files so this code must
-                 * remain in place.
-                 */
-                } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
-                                         H5T_BIT_LSB, FALSE)<0) {
+                    /* Temporary solution to handle VAX special values.
+                     * Note that even though we don't support VAX anymore, we
+                     * still need to handle legacy VAX files so this code must
+                     * remain in place.
+                     */
+                }
+                else if (H5T__bit_find(s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, FALSE) < 0) {
                     /* NaN */
-                    if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                    if (cb_struct.func) { /*If user's exception handler is present, use it*/
                         /*reverse order first*/
                         H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NAN,
-                                src_id, dst_id, src_rev, d, cb_struct.user_data);
+                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NAN, src_id, dst_id, src_rev, d,
+                                                      cb_struct.user_data);
                     }
 
-                    if(except_ret == H5T_CONV_UNHANDLED) {
+                    if (except_ret == H5T_CONV_UNHANDLED) {
                         /* There are many NaN values, so we just set all bits of
                          * the significand. */
-                        H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
-                        H5T__bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
+                        H5T__bit_copy(d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+                        H5T__bit_set(d, dst.u.f.epos, dst.u.f.esize, TRUE);
                         H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, TRUE);
-                    } else if(except_ret == H5T_CONV_HANDLED) {
+                    }
+                    else if (except_ret == H5T_CONV_HANDLED) {
                         /*No need to reverse the order of destination because user handles it*/
                         reverse = FALSE;
                         goto next;
-                    } else if(except_ret == H5T_CONV_ABORT)
+                    }
+                    else if (except_ret == H5T_CONV_ABORT)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
 
                     goto padding;
@@ -4256,53 +4436,60 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  */
                 expo = (int64_t)H5T__bit_get_d(s, src.u.f.epos, src.u.f.esize);
 
-                if(expo==0)
-                   denormalized=TRUE;
+                if (expo == 0)
+                    denormalized = TRUE;
 
                 /*
                  * Set markers for the source mantissa, excluding the leading `1'
                  * (might be implied).
                  */
                 implied = 1;
-                mpos = src.u.f.mpos;
-                mrsh = 0;
-                if(0 == expo || H5T_NORM_NONE == src.u.f.norm) {
-                    if((bitno = H5T__bit_find(s, src.u.f.mpos, src.u.f.msize, H5T_BIT_MSB, TRUE)) > 0) {
+                mpos    = src.u.f.mpos;
+                mrsh    = 0;
+                if (0 == expo || H5T_NORM_NONE == src.u.f.norm) {
+                    if ((bitno = H5T__bit_find(s, src.u.f.mpos, src.u.f.msize, H5T_BIT_MSB, TRUE)) > 0) {
                         msize = (size_t)bitno;
-                    } else if (0==bitno) {
+                    }
+                    else if (0 == bitno) {
                         msize = 1;
                         H5T__bit_set(s, src.u.f.mpos, (size_t)1, FALSE);
                     }
-                } else if (H5T_NORM_IMPLIED==src.u.f.norm) {
+                }
+                else if (H5T_NORM_IMPLIED == src.u.f.norm) {
                     msize = src.u.f.msize;
-                } else {
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "normalization method not implemented yet")
+                }
+                else {
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                "normalization method not implemented yet")
                 }
 
                 /*
                  * The sign for the destination is the same as the sign for the
                  * source in all cases.
                  */
-                H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+                H5T__bit_copy(d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
 
                 /*
                  * Calculate the true source exponent by adjusting according to
                  * the source exponent bias.
                  */
-                if (0==expo || H5T_NORM_NONE==src.u.f.norm) {
-                    HDassert(bitno>=0);
+                if (0 == expo || H5T_NORM_NONE == src.u.f.norm) {
+                    HDassert(bitno >= 0);
                     expo -= (int64_t)((src.u.f.ebias - 1) + (src.u.f.msize - (size_t)bitno));
-                } else if (H5T_NORM_IMPLIED==src.u.f.norm) {
+                }
+                else if (H5T_NORM_IMPLIED == src.u.f.norm) {
                     expo -= (int64_t)src.u.f.ebias;
-                } else {
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "normalization method not implemented yet")
+                }
+                else {
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                "normalization method not implemented yet")
                 }
 
                 /*
                  * If the destination is not normalized then right shift the
                  * mantissa by one.
                  */
-                if (H5T_NORM_NONE==dst.u.f.norm)
+                if (H5T_NORM_NONE == dst.u.f.norm)
                     mrsh++;
 
                 /*
@@ -4317,7 +4504,8 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                     expo = 0;
                     H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
                     msize = 0;
-                } else if (expo<=0) {
+                }
+                else if (expo <= 0) {
                     /*
                      * The exponent is too small to fit in the exponent field,
                      * but by shifting the mantissa to the right we can
@@ -4325,9 +4513,10 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                      * longer normalized.
                      */
                     mrsh += (size_t)(1 - expo);
-                    expo = 0;
-                    denormalized=TRUE;
-                } else if (expo>=expo_max) {
+                    expo         = 0;
+                    denormalized = TRUE;
+                }
+                else if (expo >= expo_max) {
                     /*
                      * The exponent is too large to fit in the available region
                      * or it results in the maximum possible value.     Use positive
@@ -4336,20 +4525,21 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                      * handler make sure the source buffer we hand it is in the
                      * original byte order.
                      */
-                    if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                    if (cb_struct.func) { /*If user's exception handler is present, use it*/
                         /*reverse order first*/
                         H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                src_rev, d, cb_struct.user_data);
+                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev, d,
+                                                      cb_struct.user_data);
                     }
 
-                    if(except_ret == H5T_CONV_UNHANDLED) {
+                    if (except_ret == H5T_CONV_UNHANDLED) {
                         expo = expo_max;
                         H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
                         msize = 0;
-                    } else if(except_ret == H5T_CONV_ABORT)
+                    }
+                    else if (except_ret == H5T_CONV_ABORT)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                    else if(except_ret == H5T_CONV_HANDLED) {
+                    else if (except_ret == H5T_CONV_HANDLED) {
                         reverse = FALSE;
                         goto next;
                     }
@@ -4362,59 +4552,62 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * overflow.  That is, if `carry' is clear then the implied
                  * mantissa bit is `1', else it is `10' binary.
                  */
-                if (msize>0 && mrsh<=dst.u.f.msize && mrsh+msize>dst.u.f.msize) {
+                if (msize > 0 && mrsh <= dst.u.f.msize && mrsh + msize > dst.u.f.msize) {
                     bitno = (ssize_t)(mrsh + msize - dst.u.f.msize);
                     HDassert(bitno >= 0 && (size_t)bitno <= msize);
                     /* If the 1st bit being cut off is set and source isn't denormalized.*/
-                    if(H5T__bit_get_d(s, (mpos + (size_t)bitno) - 1, (size_t)1) && !denormalized) {
+                    if (H5T__bit_get_d(s, (mpos + (size_t)bitno) - 1, (size_t)1) && !denormalized) {
                         /* Don't do rounding if exponent is 111...110 and mantissa is 111...11.
                          * To do rounding and increment exponent in this case will create an infinity value.*/
-                        if((H5T__bit_find(s, mpos + (size_t)bitno, msize - (size_t)bitno, H5T_BIT_LSB, FALSE) >= 0 || expo < expo_max - 1)) {
-                            carry = (hbool_t)H5T__bit_inc(s, mpos + (size_t)bitno - 1, 1 + msize - (size_t)bitno);
-                            if(carry)
+                        if ((H5T__bit_find(s, mpos + (size_t)bitno, msize - (size_t)bitno, H5T_BIT_LSB,
+                                           FALSE) >= 0 ||
+                             expo < expo_max - 1)) {
+                            carry =
+                                (hbool_t)H5T__bit_inc(s, mpos + (size_t)bitno - 1, 1 + msize - (size_t)bitno);
+                            if (carry)
                                 implied = 2;
                         }
-                    } else if(H5T__bit_get_d(s, (mpos + (size_t)bitno) - 1, (size_t)1) && denormalized)
+                    }
+                    else if (H5T__bit_get_d(s, (mpos + (size_t)bitno) - 1, (size_t)1) && denormalized)
                         /* For either source or destination, denormalized value doesn't increment carry.*/
                         H5T__bit_inc(s, mpos + (size_t)bitno - 1, 1 + msize - (size_t)bitno);
                 }
                 else
-                    carry=0;
+                    carry = 0;
 
                 /*
                  * Write the mantissa to the destination
                  */
-                if (mrsh>dst.u.f.msize+1) {
+                if (mrsh > dst.u.f.msize + 1) {
                     H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
-                } else if (mrsh==dst.u.f.msize+1) {
-                    H5T__bit_set(d, dst.u.f.mpos+1, dst.u.f.msize-1, FALSE);
+                }
+                else if (mrsh == dst.u.f.msize + 1) {
+                    H5T__bit_set(d, dst.u.f.mpos + 1, dst.u.f.msize - 1, FALSE);
                     H5T__bit_set(d, dst.u.f.mpos, (size_t)1, TRUE);
-                } else if (mrsh==dst.u.f.msize) {
+                }
+                else if (mrsh == dst.u.f.msize) {
                     H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
                     H5T__bit_set_d(d, dst.u.f.mpos, MIN(2, dst.u.f.msize), (hsize_t)implied);
-                } else {
-                    if (mrsh>0) {
-                        H5T__bit_set(d, dst.u.f.mpos+dst.u.f.msize-mrsh, mrsh,
-                                    FALSE);
-                        H5T__bit_set_d(d, dst.u.f.mpos+dst.u.f.msize-mrsh, (size_t)2,
-                                      (hsize_t)implied);
+                }
+                else {
+                    if (mrsh > 0) {
+                        H5T__bit_set(d, dst.u.f.mpos + dst.u.f.msize - mrsh, mrsh, FALSE);
+                        H5T__bit_set_d(d, dst.u.f.mpos + dst.u.f.msize - mrsh, (size_t)2, (hsize_t)implied);
                     }
-                    if (mrsh+msize>=dst.u.f.msize) {
-                        H5T__bit_copy(d, dst.u.f.mpos,
-                                     s, (mpos+msize+mrsh-dst.u.f.msize),
-                                     dst.u.f.msize-mrsh);
-                    } else {
-                        H5T__bit_copy(d, dst.u.f.mpos+dst.u.f.msize-(mrsh+msize),
-                                     s, mpos, msize);
-                        H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize-(mrsh+msize),
-                                    FALSE);
+                    if (mrsh + msize >= dst.u.f.msize) {
+                        H5T__bit_copy(d, dst.u.f.mpos, s, (mpos + msize + mrsh - dst.u.f.msize),
+                                      dst.u.f.msize - mrsh);
+                    }
+                    else {
+                        H5T__bit_copy(d, dst.u.f.mpos + dst.u.f.msize - (mrsh + msize), s, mpos, msize);
+                        H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize - (mrsh + msize), FALSE);
                     }
                 }
 
                 /* Write the exponent */
                 if (carry) {
                     expo++;
-                    if (expo>=expo_max) {
+                    if (expo >= expo_max) {
                         /*
                          * The exponent is too large to fit in the available
                          * region or it results in the maximum possible value.
@@ -4423,19 +4616,21 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                          * calling the overflow handler make sure the source
                          * buffer we hand it is in the original byte order.
                          */
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
                             /*reverse order first*/
                             H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                    src_rev, d, cb_struct.user_data);
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev,
+                                                          d, cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
+                        if (except_ret == H5T_CONV_UNHANDLED) {
                             expo = expo_max;
                             H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        else if(except_ret == H5T_CONV_HANDLED) {
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_HANDLED) {
                             reverse = FALSE;
                             goto next;
                         }
@@ -4444,48 +4639,49 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 /*reset CARRY*/
                 carry = 0;
 
-                H5_CHECK_OVERFLOW(expo,hssize_t,hsize_t);
+                H5_CHECK_OVERFLOW(expo, hssize_t, hsize_t);
                 H5T__bit_set_d(d, dst.u.f.epos, dst.u.f.esize, (hsize_t)expo);
 
-            padding:
+padding:
 
                 /*
                  * Set external padding areas
                  */
-                if (dst.offset>0) {
-                    HDassert(H5T_PAD_ZERO==dst.lsb_pad || H5T_PAD_ONE==dst.lsb_pad);
-                    H5T__bit_set (d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
+                if (dst.offset > 0) {
+                    HDassert(H5T_PAD_ZERO == dst.lsb_pad || H5T_PAD_ONE == dst.lsb_pad);
+                    H5T__bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE == dst.lsb_pad));
                 }
-                if (dst.offset+dst.prec!=8*dst_p->shared->size) {
-                    HDassert(H5T_PAD_ZERO==dst.msb_pad || H5T_PAD_ONE==dst.msb_pad);
-                    H5T__bit_set (d, dst.offset+dst.prec, 8*dst_p->shared->size - (dst.offset+dst.prec),
-                         (hbool_t)(H5T_PAD_ONE==dst.msb_pad));
+                if (dst.offset + dst.prec != 8 * dst_p->shared->size) {
+                    HDassert(H5T_PAD_ZERO == dst.msb_pad || H5T_PAD_ONE == dst.msb_pad);
+                    H5T__bit_set(d, dst.offset + dst.prec, 8 * dst_p->shared->size - (dst.offset + dst.prec),
+                                 (hbool_t)(H5T_PAD_ONE == dst.msb_pad));
                 }
 
                 /*
                  * Put the destination in the correct byte order.  See note at
                  * beginning of loop.
                  */
-                if (H5T_ORDER_BE==dst.order && reverse) {
-                    half_size = dst_p->shared->size/2;
-                    for (i=0; i<half_size; i++) {
-                        uint8_t tmp = d[dst_p->shared->size-(i+1)];
-                        d[dst_p->shared->size-(i+1)] = d[i];
-                        d[i] = tmp;
+                if (H5T_ORDER_BE == dst.order && reverse) {
+                    half_size = dst_p->shared->size / 2;
+                    for (i = 0; i < half_size; i++) {
+                        uint8_t tmp                      = d[dst_p->shared->size - (i + 1)];
+                        d[dst_p->shared->size - (i + 1)] = d[i];
+                        d[i]                             = tmp;
                     }
-                } else if (H5T_ORDER_VAX==dst.order && reverse) {
+                }
+                else if (H5T_ORDER_VAX == dst.order && reverse) {
                     tsize = dst_p->shared->size;
                     HDassert(0 == tsize % 2);
 
                     for (i = 0; i < tsize; i += 4) {
                         tmp1 = d[i];
-                        tmp2 = d[i+1];
+                        tmp2 = d[i + 1];
 
-                        d[i] = d[(tsize-2)-i];
-                        d[i+1] = d[(tsize-1)-i];
+                        d[i]     = d[(tsize - 2) - i];
+                        d[i + 1] = d[(tsize - 1) - i];
 
-                        d[(tsize-2)-i] = tmp1;
-                        d[(tsize-1)-i] = tmp2;
+                        d[(tsize - 2) - i] = tmp1;
+                        d[(tsize - 1) - i] = tmp2;
                     }
                 }
 
@@ -4493,8 +4689,8 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * If we had used a temporary buffer for the destination then we
                  * should copy the value to the true destination buffer.
                  */
-            next:
-                if(d == dbuf)
+next:
+                if (d == dbuf)
                     HDmemcpy(dp, d, dst_p->shared->size);
 
                 /* Advance source & destination pointers by delta amounts */
@@ -4509,13 +4705,12 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
     } /* end switch */
 
 done:
-    if(src_rev)
+    if (src_rev)
         H5MM_free(src_rev);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_f_f() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_s_s
  *
@@ -4539,40 +4734,46 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-        size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *buf,
-              void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+              size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+              hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    H5T_t    *src=NULL;        /*source datatype        */
-    H5T_t    *dst=NULL;        /*destination datatype        */
-    ssize_t    src_delta, dst_delta;    /*source & destination stride    */
-    int            direction;        /*direction of traversal    */
-    size_t    elmtno;            /*element number        */
-    size_t    olap;            /*num overlapping elements    */
-    size_t    nchars=0;        /*number of characters copied    */
-    uint8_t    *s, *sp, *d, *dp;    /*src and dst traversal pointers*/
-    uint8_t    *dbuf=NULL;        /*temp buf for overlap convers.    */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *  src = NULL;           /*source datatype        */
+    H5T_t *  dst = NULL;           /*destination datatype        */
+    ssize_t  src_delta, dst_delta; /*source & destination stride    */
+    int      direction;            /*direction of traversal    */
+    size_t   elmtno;               /*element number        */
+    size_t   olap;                 /*num overlapping elements    */
+    size_t   nchars = 0;           /*number of characters copied    */
+    uint8_t *s, *sp, *d, *dp;      /*src and dst traversal pointers*/
+    uint8_t *dbuf      = NULL;     /*temp buf for overlap convers.    */
+    herr_t   ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-            if(8 * src->shared->size != src->shared->u.atomic.prec || 8 * dst->shared->size != dst->shared->u.atomic.prec)
+            if (8 * src->shared->size != src->shared->u.atomic.prec ||
+                8 * dst->shared->size != dst->shared->u.atomic.prec)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad precision")
-            if(0 != src->shared->u.atomic.offset || 0 != dst->shared->u.atomic.offset)
+            if (0 != src->shared->u.atomic.offset || 0 != dst->shared->u.atomic.offset)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad offset")
-            if(H5T_CSET_ASCII != src->shared->u.atomic.u.s.cset && H5T_CSET_UTF8 != src->shared->u.atomic.u.s.cset)
+            if (H5T_CSET_ASCII != src->shared->u.atomic.u.s.cset &&
+                H5T_CSET_UTF8 != src->shared->u.atomic.u.s.cset)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad source character set")
-            if(H5T_CSET_ASCII != dst->shared->u.atomic.u.s.cset && H5T_CSET_UTF8 != dst->shared->u.atomic.u.s.cset)
+            if (H5T_CSET_ASCII != dst->shared->u.atomic.u.s.cset &&
+                H5T_CSET_UTF8 != dst->shared->u.atomic.u.s.cset)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad destination character set")
-            if((H5T_CSET_ASCII == src->shared->u.atomic.u.s.cset && H5T_CSET_UTF8 == dst->shared->u.atomic.u.s.cset)
-                    || (H5T_CSET_ASCII == dst->shared->u.atomic.u.s.cset && H5T_CSET_UTF8 == src->shared->u.atomic.u.s.cset))
-                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "The library doesn't convert between strings of ASCII and UTF")
-            if(src->shared->u.atomic.u.s.pad < 0 || src->shared->u.atomic.u.s.pad >= H5T_NSTR ||
-                    dst->shared->u.atomic.u.s.pad < 0 || dst->shared->u.atomic.u.s.pad >= H5T_NSTR)
+            if ((H5T_CSET_ASCII == src->shared->u.atomic.u.s.cset &&
+                 H5T_CSET_UTF8 == dst->shared->u.atomic.u.s.cset) ||
+                (H5T_CSET_ASCII == dst->shared->u.atomic.u.s.cset &&
+                 H5T_CSET_UTF8 == src->shared->u.atomic.u.s.cset))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                            "The library doesn't convert between strings of ASCII and UTF")
+            if (src->shared->u.atomic.u.s.pad < 0 || src->shared->u.atomic.u.s.pad >= H5T_NSTR ||
+                dst->shared->u.atomic.u.s.pad < 0 || dst->shared->u.atomic.u.s.pad >= H5T_NSTR)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad character padding")
             cdata->need_bkg = H5T_BKG_NO;
             break;
@@ -4582,7 +4783,7 @@ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the datatypes */
-            if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
             /*
@@ -4590,26 +4791,28 @@ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * how many of the elements have the source and destination areas
              * overlapping?
              */
-            if (src->shared->size==dst->shared->size || buf_stride) {
+            if (src->shared->size == dst->shared->size || buf_stride) {
                 /*
                  * When the source and destination are the same size we can do
                  * all the conversions in place.
                  */
-                sp = dp = (uint8_t*)buf;
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-                olap = 0;
-            } else if (src->shared->size>=dst->shared->size) {
-                double olapd = HDceil((double)(dst->shared->size)/
-                          (double)(src->shared->size-dst->shared->size));
+                olap      = 0;
+            }
+            else if (src->shared->size >= dst->shared->size) {
+                double olapd =
+                    HDceil((double)(dst->shared->size) / (double)(src->shared->size - dst->shared->size));
                 olap = (size_t)olapd;
-                sp = dp = (uint8_t*)buf;
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-            } else {
-                double olapd = HDceil((double)(src->shared->size)/
-                          (double)(dst->shared->size-src->shared->size));
-                olap = (size_t)olapd;
-                sp = (uint8_t*)buf + (nelmts-1) * src->shared->size;
-                dp = (uint8_t*)buf + (nelmts-1) * dst->shared->size;
+            }
+            else {
+                double olapd =
+                    HDceil((double)(src->shared->size) / (double)(dst->shared->size - src->shared->size));
+                olap      = (size_t)olapd;
+                sp        = (uint8_t *)buf + (nelmts - 1) * src->shared->size;
+                dp        = (uint8_t *)buf + (nelmts - 1) * dst->shared->size;
                 direction = -1;
             }
 
@@ -4623,49 +4826,52 @@ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             dst_delta = (ssize_t)direction * (ssize_t)(buf_stride ? buf_stride : dst->shared->size);
 
             /* Allocate the overlap buffer */
-            if(NULL == (dbuf = (uint8_t *)H5MM_malloc(dst->shared->size)))
+            if (NULL == (dbuf = (uint8_t *)H5MM_malloc(dst->shared->size)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for string conversion")
 
             /* The conversion loop. */
-            for(elmtno = 0; elmtno < nelmts; elmtno++) {
+            for (elmtno = 0; elmtno < nelmts; elmtno++) {
 
                 /*
                  * If the source and destination buffers overlap then use a
                  * temporary buffer for the destination.
                  */
-                if(direction > 0) {
+                if (direction > 0) {
                     s = sp;
                     d = elmtno < olap ? dbuf : dp;
-                } else {
+                }
+                else {
                     s = sp;
                     d = elmtno + olap >= nelmts ? dbuf : dp;
                 }
 #ifndef NDEBUG
                 /* I don't quite trust the overlap calculations yet --rpm */
-                if (src->shared->size==dst->shared->size || buf_stride) {
-                    HDassert(s==d);
-                } else if (d==dbuf) {
-                    HDassert((dp>=sp && dp<sp+src->shared->size) ||
-                       (sp>=dp && sp<dp+dst->shared->size));
-                } else {
-                    HDassert((dp<sp && dp+dst->shared->size<=sp) ||
-                       (sp<dp && sp+src->shared->size<=dp));
+                if (src->shared->size == dst->shared->size || buf_stride) {
+                    HDassert(s == d);
+                }
+                else if (d == dbuf) {
+                    HDassert((dp >= sp && dp < sp + src->shared->size) ||
+                             (sp >= dp && sp < dp + dst->shared->size));
+                }
+                else {
+                    HDassert((dp < sp && dp + dst->shared->size <= sp) ||
+                             (sp < dp && sp + src->shared->size <= dp));
                 }
 #endif
 
                 /* Copy characters from source to destination */
-                switch(src->shared->u.atomic.u.s.pad) {
+                switch (src->shared->u.atomic.u.s.pad) {
                     case H5T_STR_NULLTERM:
-                        for (nchars=0;
-                             nchars<dst->shared->size && nchars<src->shared->size && s[nchars];
+                        for (nchars = 0;
+                             nchars < dst->shared->size && nchars < src->shared->size && s[nchars];
                              nchars++) {
                             d[nchars] = s[nchars];
                         }
                         break;
 
                     case H5T_STR_NULLPAD:
-                        for (nchars=0;
-                             nchars<dst->shared->size && nchars<src->shared->size && s[nchars];
+                        for (nchars = 0;
+                             nchars < dst->shared->size && nchars < src->shared->size && s[nchars];
                              nchars++) {
                             d[nchars] = s[nchars];
                         }
@@ -4673,10 +4879,10 @@ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
                     case H5T_STR_SPACEPAD:
                         nchars = src->shared->size;
-                        while (nchars>0 && ' '==s[nchars-1])
+                        while (nchars > 0 && ' ' == s[nchars - 1])
                             --nchars;
                         nchars = MIN(dst->shared->size, nchars);
-                        if(d != s)
+                        if (d != s)
                             HDmemcpy(d, s, nchars);
                         break;
 
@@ -4695,24 +4901,25 @@ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                     case H5T_STR_RESERVED_15:
                     case H5T_STR_ERROR:
                     default:
-                        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "source string padding method not supported")
+                        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                    "source string padding method not supported")
                 } /* end switch */
 
                 /* Terminate or pad the destination */
-                switch(dst->shared->u.atomic.u.s.pad) {
+                switch (dst->shared->u.atomic.u.s.pad) {
                     case H5T_STR_NULLTERM:
-                        while(nchars < dst->shared->size)
+                        while (nchars < dst->shared->size)
                             d[nchars++] = '\0';
                         d[dst->shared->size - 1] = '\0';
                         break;
 
                     case H5T_STR_NULLPAD:
-                        while(nchars < dst->shared->size)
+                        while (nchars < dst->shared->size)
                             d[nchars++] = '\0';
                         break;
 
                     case H5T_STR_SPACEPAD:
-                        while(nchars < dst->shared->size)
+                        while (nchars < dst->shared->size)
                             d[nchars++] = ' ';
                         break;
 
@@ -4731,14 +4938,15 @@ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                     case H5T_STR_RESERVED_15:
                     case H5T_STR_ERROR:
                     default:
-                        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "destination string padding method not supported")
+                        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+                                    "destination string padding method not supported")
                 } /* end switch */
 
                 /*
                  * If we used a temporary buffer for the destination then we
                  * should copy the value to the true destination buffer.
                  */
-                if(d == dbuf)
+                if (d == dbuf)
                     HDmemcpy(dp, d, dst->shared->size);
 
                 /* Advance source & destination pointers by delta amounts */
@@ -4757,7 +4965,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_s_s() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_uchar
  *
@@ -4775,15 +4982,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                     hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_su(SCHAR, UCHAR, signed char, unsigned char, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_schar
  *
@@ -4801,15 +5006,13 @@ H5T__conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                     hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_us(UCHAR, SCHAR, unsigned char, signed char, -, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_short
  *
@@ -4827,15 +5030,13 @@ H5T__conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                     hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(SCHAR, SHORT, signed char, short, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_ushort
  *
@@ -4853,15 +5054,13 @@ H5T__conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(SCHAR, USHORT, signed char, unsigned short, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_short
  *
@@ -4879,15 +5078,13 @@ H5T__conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                     hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(UCHAR, SHORT, unsigned char, short, -, SHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_ushort
  *
@@ -4905,15 +5102,13 @@ H5T__conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(UCHAR, USHORT, unsigned char, unsigned short, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_int
  *
@@ -4931,14 +5126,13 @@ H5T__conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                   void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(SCHAR, INT, signed char, int, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_uint
  *
@@ -4956,14 +5150,13 @@ H5T__conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(SCHAR, UINT, signed char, unsigned, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_int
  *
@@ -4981,14 +5174,13 @@ H5T__conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                   void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(UCHAR, INT, unsigned char, int, -, INT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_uint
  *
@@ -5006,14 +5198,13 @@ H5T__conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(UCHAR, UINT, unsigned char, unsigned, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_long
  *
@@ -5031,14 +5222,13 @@ H5T__conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(SCHAR, LONG, signed char, long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_ulong
  *
@@ -5056,15 +5246,13 @@ H5T__conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(SCHAR, ULONG, signed char, unsigned long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_long
  *
@@ -5082,14 +5270,13 @@ H5T__conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(UCHAR, LONG, unsigned char, long, -, LONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_ulong
  *
@@ -5107,15 +5294,13 @@ H5T__conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(UCHAR, ULONG, unsigned char, unsigned long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_llong
  *
@@ -5133,15 +5318,13 @@ H5T__conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(SCHAR, LLONG, signed char, long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_ullong
  *
@@ -5159,15 +5342,13 @@ H5T__conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_llong
  *
@@ -5185,15 +5366,13 @@ H5T__conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(UCHAR, LLONG, unsigned char, long long, -, LLONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_ullong
  *
@@ -5211,15 +5390,13 @@ H5T__conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_schar
  *
@@ -5237,15 +5414,13 @@ H5T__conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(SHORT, SCHAR, short, signed char, SCHAR_MIN, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_uchar
  *
@@ -5263,15 +5438,13 @@ H5T__conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(SHORT, UCHAR, short, unsigned char, -, UCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_schar
  *
@@ -5289,15 +5462,13 @@ H5T__conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(USHORT, SCHAR, unsigned short, signed char, -, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_uchar
  *
@@ -5315,15 +5486,13 @@ H5T__conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(USHORT, UCHAR, unsigned short, unsigned char, -, UCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_ushort
  *
@@ -5341,15 +5510,13 @@ H5T__conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_su(SHORT, USHORT, short, unsigned short, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_short
  *
@@ -5367,15 +5534,13 @@ H5T__conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_us(USHORT, SHORT, unsigned short, short, -, SHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_int
  *
@@ -5393,15 +5558,13 @@ H5T__conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride,
-                   size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-        hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(SHORT, INT, short, int, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_uint
  *
@@ -5419,15 +5582,13 @@ H5T__conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(SHORT, UINT, short, unsigned, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_int
  *
@@ -5445,15 +5606,13 @@ H5T__conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(USHORT, INT, unsigned short, int, -, INT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_uint
  *
@@ -5471,15 +5630,13 @@ H5T__conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(USHORT, UINT, unsigned short, unsigned, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_long
  *
@@ -5497,15 +5654,13 @@ H5T__conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(SHORT, LONG, short, long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_ulong
  *
@@ -5523,15 +5678,13 @@ H5T__conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(SHORT, ULONG, short, unsigned long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_long
  *
@@ -5549,15 +5702,13 @@ H5T__conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(USHORT, LONG, unsigned short, long, -, LONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_ulong
  *
@@ -5575,15 +5726,13 @@ H5T__conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(USHORT, ULONG, unsigned short, unsigned long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_llong
  *
@@ -5601,15 +5750,13 @@ H5T__conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(SHORT, LLONG, short, long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_ullong
  *
@@ -5627,15 +5774,13 @@ H5T__conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(SHORT, ULLONG, short, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_llong
  *
@@ -5653,15 +5798,13 @@ H5T__conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(USHORT, LLONG, unsigned short, long long, -, LLONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_ullong
  *
@@ -5679,15 +5822,13 @@ H5T__conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_schar
  *
@@ -5705,15 +5846,13 @@ H5T__conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride,
-                   size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-        hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(INT, SCHAR, int, signed char, SCHAR_MIN, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_uchar
  *
@@ -5731,15 +5870,13 @@ H5T__conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride,
-                   size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-        hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(INT, UCHAR, int, unsigned char, -, UCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_schar
  *
@@ -5757,15 +5894,13 @@ H5T__conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(UINT, SCHAR, unsigned, signed char, -, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_uchar
  *
@@ -5783,15 +5918,13 @@ H5T__conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(UINT, UCHAR, unsigned, unsigned char, -, UCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_short
  *
@@ -5809,15 +5942,13 @@ H5T__conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride,
-                   size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-        hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(INT, SHORT, int, short, SHRT_MIN, SHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_ushort
  *
@@ -5835,15 +5966,13 @@ H5T__conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(INT, USHORT, int, unsigned short, -, USHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_short
  *
@@ -5861,15 +5990,13 @@ H5T__conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(UINT, SHORT, unsigned, short, -, SHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_ushort
  *
@@ -5887,15 +6014,13 @@ H5T__conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(UINT, USHORT, unsigned, unsigned short, -, USHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_uint
  *
@@ -5913,14 +6038,13 @@ H5T__conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                  void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                   size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                   hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_su(INT, UINT, int, unsigned, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_int
  *
@@ -5938,14 +6062,13 @@ H5T__conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                  void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                   size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                   hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_us(UINT, INT, unsigned, int, -, INT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_long
  *
@@ -5963,14 +6086,13 @@ H5T__conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                  void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                   size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                   hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(INT, LONG, int, long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_ulong
  *
@@ -5988,14 +6110,13 @@ H5T__conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                   void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(INT, LONG, int, unsigned long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_long
  *
@@ -6013,14 +6134,13 @@ H5T__conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                   void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(UINT, LONG, unsigned, long, -, LONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_ulong
  *
@@ -6038,14 +6158,13 @@ H5T__conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(UINT, ULONG, unsigned, unsigned long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_llong
  *
@@ -6063,14 +6182,13 @@ H5T__conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                   void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(INT, LLONG, int, long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_ullong
  *
@@ -6088,14 +6206,13 @@ H5T__conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(INT, ULLONG, int, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_llong
  *
@@ -6113,14 +6230,13 @@ H5T__conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(UINT, LLONG, unsigned, long long, -, LLONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_ullong
  *
@@ -6138,15 +6254,13 @@ H5T__conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_schar
  *
@@ -6164,14 +6278,13 @@ H5T__conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(LONG, SCHAR, long, signed char, SCHAR_MIN, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_uchar
  *
@@ -6189,14 +6302,13 @@ H5T__conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(LONG, UCHAR, long, unsigned char, -, UCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_schar
  *
@@ -6214,15 +6326,13 @@ H5T__conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(ULONG, SCHAR, unsigned long, signed char, -, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_uchar
  *
@@ -6240,15 +6350,13 @@ H5T__conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(ULONG, UCHAR, unsigned long, unsigned char, -, UCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_short
  *
@@ -6266,14 +6374,13 @@ H5T__conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(LONG, SHORT, long, short, SHRT_MIN, SHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_ushort
  *
@@ -6291,15 +6398,13 @@ H5T__conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(LONG, USHORT, long, unsigned short, -, USHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_short
  *
@@ -6317,14 +6422,13 @@ H5T__conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                     void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(ULONG, SHORT, unsigned long, short, -, SHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_ushort
  *
@@ -6342,15 +6446,13 @@ H5T__conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(ULONG, USHORT, unsigned long, unsigned short, -, USHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_int
  *
@@ -6368,14 +6470,13 @@ H5T__conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                  void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                   size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                   hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(LONG, INT, long, int, INT_MIN, INT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_uint
  *
@@ -6393,14 +6494,13 @@ H5T__conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                   void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(LONG, UINT, long, unsigned, -, UINT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_int
  *
@@ -6418,14 +6518,13 @@ H5T__conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                   void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(ULONG, INT, unsigned long, int, -, INT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_uint
  *
@@ -6443,14 +6542,13 @@ H5T__conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(ULONG, UINT, unsigned long, unsigned, -, UINT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_ulong
  *
@@ -6468,14 +6566,13 @@ H5T__conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_su(LONG, ULONG, long, unsigned long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_long
  *
@@ -6493,14 +6590,13 @@ H5T__conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_us(ULONG, LONG, unsigned long, long, -, LONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_llong
  *
@@ -6518,14 +6614,13 @@ H5T__conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sS(LONG, LLONG, long, long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_ullong
  *
@@ -6543,15 +6638,13 @@ H5T__conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_sU(LONG, ULLONG, long, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_llong
  *
@@ -6569,15 +6662,13 @@ H5T__conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uS(ULONG, LLONG, unsigned long, long long, -, LLONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_ullong
  *
@@ -6595,15 +6686,13 @@ H5T__conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_schar
  *
@@ -6621,15 +6710,13 @@ H5T__conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(LLONG, SCHAR, long long, signed char, SCHAR_MIN, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_uchar
  *
@@ -6647,15 +6734,13 @@ H5T__conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(LLONG, UCHAR, long long, unsigned char, -, UCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_schar
  *
@@ -6673,15 +6758,13 @@ H5T__conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(ULLONG, SCHAR, unsigned long long, signed char, -, SCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_uchar
  *
@@ -6699,15 +6782,13 @@ H5T__conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                      size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(ULLONG, UCHAR, unsigned long long, unsigned char, -, UCHAR_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_short
  *
@@ -6725,15 +6806,13 @@ H5T__conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(LLONG, SHORT, long long, short, SHRT_MIN, SHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_ushort
  *
@@ -6751,15 +6830,13 @@ H5T__conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(LLONG, USHORT, long long, unsigned short, -, USHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_short
  *
@@ -6777,15 +6854,13 @@ H5T__conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(ULLONG, SHORT, unsigned long long, short, -, SHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_ushort
  *
@@ -6803,15 +6878,13 @@ H5T__conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(ULLONG, USHORT, unsigned long long, unsigned short, -, USHRT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_int
  *
@@ -6829,14 +6902,13 @@ H5T__conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                   void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(LLONG, INT, long long, int, INT_MIN, INT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_uint
  *
@@ -6854,14 +6926,13 @@ H5T__conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(LLONG, UINT, long long, unsigned, -, UINT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_int
  *
@@ -6879,14 +6950,13 @@ H5T__conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(ULLONG, INT, unsigned long long, int, -, INT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_uint
  *
@@ -6904,15 +6974,13 @@ H5T__conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(ULLONG, UINT, unsigned long long, unsigned, -, UINT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_long
  *
@@ -6930,14 +6998,13 @@ H5T__conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride,
-                    void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ss(LLONG, LONG, long long, long, LONG_MIN, LONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_ulong
  *
@@ -6955,15 +7022,13 @@ H5T__conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Su(LLONG, ULONG, long long, unsigned long, -, ULONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_long
  *
@@ -6981,15 +7046,13 @@ H5T__conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-            hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Us(ULLONG, LONG, unsigned long long, long, -, LONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_ulong
  *
@@ -7007,15 +7070,13 @@ H5T__conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Uu(ULLONG, ULONG, unsigned long long, unsigned long, -, ULONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_ullong
  *
@@ -7033,15 +7094,13 @@ H5T__conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_su(LLONG, ULLONG, long long, unsigned long long, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_llong
  *
@@ -7059,15 +7118,13 @@ H5T__conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                      hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                       hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_us(ULLONG, LLONG, unsigned long long, long long, -, LLONG_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_double
  *
@@ -7088,15 +7145,13 @@ H5T__conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_float_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_fF(FLOAT, DOUBLE, float, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_ldouble
  *
@@ -7114,16 +7169,14 @@ H5T__conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 #if H5_SIZEOF_LONG_DOUBLE != 0
 herr_t
-H5T__conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_fF(FLOAT, LDOUBLE, float, long double, -, -);
 }
 #endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_float
  *
@@ -7147,15 +7200,13 @@ H5T__conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_double_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ff(DOUBLE, FLOAT, double, float, -FLT_MAX, FLT_MAX);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_ldouble
  *
@@ -7173,16 +7224,14 @@ H5T__conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 #if H5_SIZEOF_LONG_DOUBLE != 0
 herr_t
-H5T__conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_double_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                         size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                         hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_fF(DOUBLE, LDOUBLE, double, long double, -, -);
 }
 #endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_float
  *
@@ -7200,16 +7249,14 @@ H5T__conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 #if H5_SIZEOF_LONG_DOUBLE != 0
 herr_t
-H5T__conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ff(LDOUBLE, FLOAT, long double, float, -FLT_MAX, FLT_MAX);
 }
 #endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_double
  *
@@ -7227,16 +7274,14 @@ H5T__conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 #if H5_SIZEOF_LONG_DOUBLE != 0
 herr_t
-H5T__conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                         size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                         hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_Ff(LDOUBLE, DOUBLE, long double, double, -DBL_MAX, DBL_MAX);
 }
 #endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_float
  *
@@ -7253,15 +7298,13 @@ H5T__conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(SCHAR, FLOAT, signed char, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_double
  *
@@ -7278,15 +7321,13 @@ H5T__conv_schar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_schar_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(SCHAR, DOUBLE, signed char, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_schar_ldouble
  *
@@ -7303,15 +7344,13 @@ H5T__conv_schar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_schar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_schar_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(SCHAR, LDOUBLE, signed char, long double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_float
  *
@@ -7328,15 +7367,13 @@ H5T__conv_schar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(UCHAR, FLOAT, unsigned char, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_double
  *
@@ -7353,15 +7390,13 @@ H5T__conv_uchar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_uchar_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(UCHAR, DOUBLE, unsigned char, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uchar_ldouble
  *
@@ -7378,15 +7413,13 @@ H5T__conv_uchar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uchar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uchar_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(UCHAR, LDOUBLE, unsigned char, long double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_float
  *
@@ -7403,15 +7436,13 @@ H5T__conv_uchar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(SHORT, FLOAT, short, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_double
  *
@@ -7428,15 +7459,13 @@ H5T__conv_short_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_short_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(SHORT, DOUBLE, short, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_short_ldouble
  *
@@ -7453,15 +7482,13 @@ H5T__conv_short_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_short_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_short_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(SHORT, LDOUBLE, short, long double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_float
  *
@@ -7478,15 +7505,13 @@ H5T__conv_short_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_ushort_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(USHORT, FLOAT, unsigned short, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_double
  *
@@ -7503,15 +7528,13 @@ H5T__conv_ushort_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(USHORT, DOUBLE, unsigned short, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ushort_ldouble
  *
@@ -7528,15 +7551,13 @@ H5T__conv_ushort_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ushort_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ushort_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                         size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                         hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(USHORT, LDOUBLE, unsigned short, long double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_float
  *
@@ -7553,15 +7574,13 @@ H5T__conv_ushort_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(INT, FLOAT, int, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_double
  *
@@ -7578,15 +7597,13 @@ H5T__conv_int_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(INT, DOUBLE, int, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_int_ldouble
  *
@@ -7603,15 +7620,13 @@ H5T__conv_int_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_int_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_int_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(INT, LDOUBLE, int, long double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_float
  *
@@ -7628,15 +7643,13 @@ H5T__conv_int_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(UINT, FLOAT, unsigned int, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_double
  *
@@ -7653,15 +7666,13 @@ H5T__conv_uint_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_uint_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(UINT, DOUBLE, unsigned int, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_uint_ldouble
  *
@@ -7678,15 +7689,13 @@ H5T__conv_uint_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_uint_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_uint_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(UINT, LDOUBLE, unsigned int, long double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_float
  *
@@ -7703,15 +7712,13 @@ H5T__conv_uint_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(LONG, FLOAT, long, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_double
  *
@@ -7728,15 +7735,13 @@ H5T__conv_long_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_long_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(LONG, DOUBLE, long, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_long_ldouble
  *
@@ -7753,15 +7758,13 @@ H5T__conv_long_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_long_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_long_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(LONG, LDOUBLE, long, long double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_float
  *
@@ -7778,15 +7781,13 @@ H5T__conv_long_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(ULONG, FLOAT, unsigned long, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_double
  *
@@ -7803,15 +7804,13 @@ H5T__conv_ulong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_ulong_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(ULONG, DOUBLE, unsigned long, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ulong_ldouble
  *
@@ -7828,15 +7827,13 @@ H5T__conv_ulong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ulong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ulong_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(ULONG, LDOUBLE, unsigned long, long double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_float
  *
@@ -7853,15 +7850,13 @@ H5T__conv_ulong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(LLONG, FLOAT, long long, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_double
  *
@@ -7878,15 +7873,13 @@ H5T__conv_llong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_llong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_llong_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(LLONG, DOUBLE, long long, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_llong_ldouble
  *
@@ -7904,16 +7897,14 @@ H5T__conv_llong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 #if H5T_CONV_INTERNAL_LLONG_LDOUBLE
 herr_t
-H5T__conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_llong_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(LLONG, LDOUBLE, long long, long double, -, -);
 }
 #endif /* H5T_CONV_INTERNAL_LLONG_LDOUBLE */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_float
  *
@@ -7930,15 +7921,13 @@ H5T__conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_ullong_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(ULLONG, FLOAT, unsigned long long, float, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_double
  *
@@ -7955,15 +7944,13 @@ H5T__conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(ULLONG, DOUBLE, unsigned long long, double, -, -);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ullong_ldouble
  *
@@ -7981,16 +7968,14 @@ H5T__conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 #if H5T_CONV_INTERNAL_ULLONG_LDOUBLE
 herr_t
-H5T__conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ullong_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                         size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                         hid_t H5_ATTR_UNUSED dxpl_id)
 {
     H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long long, long double, -, -);
 }
 #endif /*H5T_CONV_INTERNAL_ULLONG_LDOUBLE*/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_schar
  *
@@ -8007,17 +7992,15 @@ H5T__conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, SCHAR, float, signed char, SCHAR_MIN, SCHAR_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_uchar
  *
@@ -8034,17 +8017,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, UCHAR, float, unsigned char, 0, UCHAR_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_schar
  *
@@ -8059,17 +8040,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_double_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, SCHAR, double, signed char, SCHAR_MIN, SCHAR_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_uchar
  *
@@ -8084,17 +8063,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_double_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, UCHAR, double, unsigned char, 0, UCHAR_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_schar
  *
@@ -8109,17 +8086,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ldouble_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, SCHAR, long double, signed char, SCHAR_MIN, SCHAR_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_uchar
  *
@@ -8134,17 +8109,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ldouble_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, UCHAR, long double, unsigned char, 0, UCHAR_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_short
  *
@@ -8159,17 +8132,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, SHORT, float, short, SHRT_MIN, SHRT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_ushort
  *
@@ -8184,17 +8155,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_float_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, USHORT, float, unsigned short, 0, USHRT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_short
  *
@@ -8209,17 +8178,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_double_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, SHORT, double, short, SHRT_MIN, SHRT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_ushort
  *
@@ -8234,17 +8201,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_double_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, USHORT, double, unsigned short, 0, USHRT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_short
  *
@@ -8259,17 +8224,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ldouble_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, SHORT, long double, short, SHRT_MIN, SHRT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_ushort
  *
@@ -8284,17 +8247,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ldouble_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                         size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                         hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, USHORT, long double, unsigned short, 0, USHRT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_int
  *
@@ -8309,17 +8270,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                    size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                    hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, INT, float, int, INT_MIN, INT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_uint
  *
@@ -8334,17 +8293,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, UINT, float, unsigned int, 0, UINT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_int
  *
@@ -8361,17 +8318,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_double_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, INT, double, int, INT_MIN, INT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_uint
  *
@@ -8386,17 +8341,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_double_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, UINT, double, unsigned int, 0, UINT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_int
  *
@@ -8411,17 +8364,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ldouble_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, INT, long double, int, INT_MIN, INT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_uint
  *
@@ -8436,17 +8387,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ldouble_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_ldouble_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, UINT, long double, unsigned int, 0, UINT_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_long
  *
@@ -8461,17 +8410,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                     size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                     hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, LONG, float, long, LONG_MIN, LONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_ulong
  *
@@ -8486,17 +8433,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, ULONG, float, unsigned long, 0, ULONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_long
  *
@@ -8511,17 +8456,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_double_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, LONG, double, long, LONG_MIN, LONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_ulong
  *
@@ -8536,17 +8479,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_double_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, ULONG, double, unsigned long, 0, ULONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_long
  *
@@ -8561,17 +8502,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ldouble_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_ldouble_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, LONG, long double, long, LONG_MIN, LONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_ulong
  *
@@ -8586,17 +8525,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_ldouble_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, ULONG, long double, unsigned long, 0, ULONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_llong
  *
@@ -8611,17 +8548,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_float_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                      size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                      hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, LLONG, float, long long, LLONG_MIN, LLONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_float_ullong
  *
@@ -8636,17 +8571,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_float_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_llong
  *
@@ -8661,17 +8594,15 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
+H5T__conv_double_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, LLONG, double, long long, LLONG_MIN, LLONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_double_ullong
  *
@@ -8686,17 +8617,14 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t dxpl_id)
+H5T__conv_double_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_llong
  *
@@ -8712,18 +8640,16 @@ H5_GCC_DIAG_ON("float-equal")
  */
 #if H5T_CONV_INTERNAL_LDOUBLE_LLONG
 herr_t
-H5T__conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t H5_ATTR_UNUSED dxpl_id)
+H5T__conv_ldouble_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                        size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
+                        hid_t H5_ATTR_UNUSED dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, LLONG, long double, long long, LLONG_MIN, LLONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 #endif /*H5T_CONV_INTERNAL_LDOUBLE_LLONG*/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_ldouble_ullong
  *
@@ -8739,18 +8665,15 @@ H5_GCC_DIAG_ON("float-equal")
  */
 #if H5T_CONV_INTERNAL_LDOUBLE_ULLONG
 herr_t
-H5T__conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-            size_t nelmts, size_t buf_stride,
-                       size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-                       hid_t dxpl_id)
+H5T__conv_ldouble_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                         size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id)
 {
-H5_GCC_DIAG_OFF("float-equal")
+    H5_GCC_DIAG_OFF("float-equal")
     H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX);
-H5_GCC_DIAG_ON("float-equal")
+    H5_GCC_DIAG_ON("float-equal")
 }
 #endif /*H5T_CONV_INTERNAL_LDOUBLE_ULLONG*/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_f_i
  *
@@ -8774,53 +8697,53 @@ H5_GCC_DIAG_ON("float-equal")
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-    size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-    hid_t dxpl_id)
+H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+              size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id)
 {
     /* Traversal-related variables */
-    H5T_t    *src_p;            /*source datatype        */
-    H5T_t    *dst_p;            /*destination datatype        */
-    H5T_atomic_t src;            /*atomic source info        */
-    H5T_atomic_t dst;            /*atomic destination info    */
-    int    direction;                /*forward or backward traversal    */
-    size_t    elmtno;            /*element number        */
-    size_t    half_size;        /*half the type size        */
-    size_t      tsize;                  /*type size for swapping bytes  */
-    size_t    olap;            /*num overlapping elements    */
-    uint8_t    *s, *sp, *d, *dp;    /*source and dest traversal ptrs*/
-    uint8_t     *src_rev=NULL;          /*order-reversed source buffer  */
-    uint8_t    dbuf[64];        /*temp destination buffer    */
-    uint8_t     tmp1, tmp2;             /*temp variables for swapping bytes*/
+    H5T_t *      src_p;           /*source datatype        */
+    H5T_t *      dst_p;           /*destination datatype        */
+    H5T_atomic_t src;             /*atomic source info        */
+    H5T_atomic_t dst;             /*atomic destination info    */
+    int          direction;       /*forward or backward traversal    */
+    size_t       elmtno;          /*element number        */
+    size_t       half_size;       /*half the type size        */
+    size_t       tsize;           /*type size for swapping bytes  */
+    size_t       olap;            /*num overlapping elements    */
+    uint8_t *    s, *sp, *d, *dp; /*source and dest traversal ptrs*/
+    uint8_t *    src_rev = NULL;  /*order-reversed source buffer  */
+    uint8_t      dbuf[64];        /*temp destination buffer    */
+    uint8_t      tmp1, tmp2;      /*temp variables for swapping bytes*/
 
     /* Conversion-related variables */
-    hssize_t    expo;            /*source exponent        */
-    hssize_t    sign;                   /*source sign bit value         */
-    uint8_t     *int_buf=NULL;          /*buffer for temporary value    */
-    size_t      buf_size;               /*buffer size for temporary value */
-    size_t    i;            /*miscellaneous counters    */
-    size_t    first;                  /*first bit(MSB) in an integer  */
-    ssize_t    sfirst;            /*a signed version of `first'    */
-    H5P_genplist_t      *plist;         /*Property list pointer         */
-    H5T_conv_cb_t       cb_struct={NULL, NULL};      /*conversion callback structure */
-    hbool_t     truncated;              /*if fraction value is dropped  */
-    hbool_t     reverse;                /*if reverse order of destination at the end */
-    H5T_conv_ret_t      except_ret;     /*return of callback function   */
-    herr_t      ret_value=SUCCEED;      /* Return value                 */
+    hssize_t        expo;                     /*source exponent        */
+    hssize_t        sign;                     /*source sign bit value         */
+    uint8_t *       int_buf = NULL;           /*buffer for temporary value    */
+    size_t          buf_size;                 /*buffer size for temporary value */
+    size_t          i;                        /*miscellaneous counters    */
+    size_t          first;                    /*first bit(MSB) in an integer  */
+    ssize_t         sfirst;                   /*a signed version of `first'    */
+    H5P_genplist_t *plist;                    /*Property list pointer         */
+    H5T_conv_cb_t   cb_struct = {NULL, NULL}; /*conversion callback structure */
+    hbool_t         truncated;                /*if fraction value is dropped  */
+    hbool_t         reverse;                  /*if reverse order of destination at the end */
+    H5T_conv_ret_t  except_ret;               /*return of callback function   */
+    herr_t          ret_value = SUCCEED;      /* Return value                 */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
-            if(NULL == (src_p = (H5T_t*)H5I_object(src_id)) || NULL == (dst_p = (H5T_t*)H5I_object(dst_id)))
+            if (NULL == (src_p = (H5T_t *)H5I_object(src_id)) ||
+                NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
             src = src_p->shared->u.atomic;
             dst = dst_p->shared->u.atomic;
-            if(H5T_ORDER_LE != src.order && H5T_ORDER_BE != src.order && H5T_ORDER_VAX != src.order)
+            if (H5T_ORDER_LE != src.order && H5T_ORDER_BE != src.order && H5T_ORDER_VAX != src.order)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
-            if(dst_p->shared->size > sizeof(dbuf))
+            if (dst_p->shared->size > sizeof(dbuf))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "destination size is too large")
-            if(8 * sizeof(expo) - 1 < src.u.f.esize)
+            if (8 * sizeof(expo) - 1 < src.u.f.esize)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "exponent field is too large")
             cdata->need_bkg = H5T_BKG_NO;
             break;
@@ -8830,7 +8753,8 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the datatypes */
-            if(NULL == (src_p = (H5T_t*)H5I_object(src_id)) || NULL == (dst_p = (H5T_t*)H5I_object(dst_id)))
+            if (NULL == (src_p = (H5T_t *)H5I_object(src_id)) ||
+                NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
             src = src_p->shared->u.atomic;
             dst = dst_p->shared->u.atomic;
@@ -8840,44 +8764,46 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * how many of the elements have the source and destination areas
              * overlapping?
              */
-            if(src_p->shared->size==dst_p->shared->size || buf_stride) {
-                sp = dp = (uint8_t*)buf;
+            if (src_p->shared->size == dst_p->shared->size || buf_stride) {
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-                olap = nelmts;
-            } else if (src_p->shared->size>=dst_p->shared->size) {
-                double olap_d = HDceil((double)(dst_p->shared->size)/
-                                       (double)(src_p->shared->size-dst_p->shared->size));
-                olap = (size_t)olap_d;
-                sp = dp = (uint8_t*)buf;
+                olap      = nelmts;
+            }
+            else if (src_p->shared->size >= dst_p->shared->size) {
+                double olap_d = HDceil((double)(dst_p->shared->size) /
+                                       (double)(src_p->shared->size - dst_p->shared->size));
+                olap          = (size_t)olap_d;
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-            } else {
-                double olap_d = HDceil((double)(src_p->shared->size)/
-                                       (double)(dst_p->shared->size-src_p->shared->size));
-                olap = (size_t)olap_d;
-                sp = (uint8_t*)buf + (nelmts-1) * src_p->shared->size;
-                dp = (uint8_t*)buf + (nelmts-1) * dst_p->shared->size;
-                direction = -1;
+            }
+            else {
+                double olap_d = HDceil((double)(src_p->shared->size) /
+                                       (double)(dst_p->shared->size - src_p->shared->size));
+                olap          = (size_t)olap_d;
+                sp            = (uint8_t *)buf + (nelmts - 1) * src_p->shared->size;
+                dp            = (uint8_t *)buf + (nelmts - 1) * dst_p->shared->size;
+                direction     = -1;
             }
 
             /* Allocate enough space for the buffer holding temporary
              * converted value
              */
-            buf_size = (size_t) (HDpow((double)2.0f, (double)src.u.f.esize) / 8 + 1);
-            int_buf = (uint8_t*)H5MM_calloc(buf_size);
+            buf_size = (size_t)(HDpow((double)2.0f, (double)src.u.f.esize) / 8 + 1);
+            int_buf  = (uint8_t *)H5MM_calloc(buf_size);
 
             /* Get the plist structure. Do I need to close it? */
-            if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+            if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
                 HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find property list for ID")
 
             /* Get conversion exception callback property */
-            if(H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
+            if (H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback")
 
             /* Allocate space for order-reversed source buffer */
-            src_rev = (uint8_t*)H5MM_calloc(src_p->shared->size);
+            src_rev = (uint8_t *)H5MM_calloc(src_p->shared->size);
 
             /* The conversion loop */
-            for(elmtno = 0; elmtno < nelmts; elmtno++) {
+            for (elmtno = 0; elmtno < nelmts; elmtno++) {
                 /* Set these variables to default */
                 except_ret = H5T_CONV_UNHANDLED;
                 truncated  = FALSE;
@@ -8887,21 +8813,23 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * If the source and destination buffers overlap then use a
                  * temporary buffer for the destination.
                  */
-                if(direction > 0) {
+                if (direction > 0) {
                     s = sp;
-                    d = elmtno<olap ? dbuf : dp;
-                } else {
+                    d = elmtno < olap ? dbuf : dp;
+                }
+                else {
                     s = sp;
-                    d = elmtno+olap >= nelmts ? dbuf : dp;
+                    d = elmtno + olap >= nelmts ? dbuf : dp;
                 }
 #ifndef NDEBUG
                 /* I don't quite trust the overlap calculations yet --rpm */
-                if (d==dbuf) {
-                    HDassert((dp>=sp && dp<sp+src_p->shared->size) ||
-                            (sp>=dp && sp<dp+dst_p->shared->size));
-                } else {
-                    HDassert((dp<sp && dp+dst_p->shared->size<=sp) ||
-                            (sp<dp && sp+src_p->shared->size<=dp));
+                if (d == dbuf) {
+                    HDassert((dp >= sp && dp < sp + src_p->shared->size) ||
+                             (sp >= dp && sp < dp + dst_p->shared->size));
+                }
+                else {
+                    HDassert((dp < sp && dp + dst_p->shared->size <= sp) ||
+                             (sp < dp && sp + src_p->shared->size <= dp));
                 }
 #endif
                 /*
@@ -8909,31 +8837,32 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * complicated.  We'll do all the conversion stuff assuming
                  * little endian and then we'll fix the order at the end.
                  */
-                if (H5T_ORDER_BE==src.order) {
-                    half_size = src_p->shared->size/2;
-                    for (i=0; i<half_size; i++) {
-                        tmp1 = s[src_p->shared->size-(i+1)];
-                        s[src_p->shared->size-(i+1)] = s[i];
-                        s[i] = tmp1;
+                if (H5T_ORDER_BE == src.order) {
+                    half_size = src_p->shared->size / 2;
+                    for (i = 0; i < half_size; i++) {
+                        tmp1                             = s[src_p->shared->size - (i + 1)];
+                        s[src_p->shared->size - (i + 1)] = s[i];
+                        s[i]                             = tmp1;
                     }
-                } else if (H5T_ORDER_VAX==src.order) {
+                }
+                else if (H5T_ORDER_VAX == src.order) {
                     tsize = src_p->shared->size;
                     HDassert(0 == tsize % 2);
 
                     for (i = 0; i < tsize; i += 4) {
                         tmp1 = s[i];
-                        tmp2 = s[i+1];
+                        tmp2 = s[i + 1];
 
-                        s[i] = s[(tsize-2)-i];
-                        s[i+1] = s[(tsize-1)-i];
+                        s[i]     = s[(tsize - 2) - i];
+                        s[i + 1] = s[(tsize - 1) - i];
 
-                        s[(tsize-2)-i] = tmp1;
-                        s[(tsize-1)-i] = tmp2;
+                        s[(tsize - 2) - i] = tmp1;
+                        s[(tsize - 1) - i] = tmp2;
                     }
                 }
 
                 /*zero-set all destination bits*/
-                H5T__bit_set (d, dst.offset, dst.prec, FALSE);
+                H5T__bit_set(d, dst.offset, dst.prec, FALSE);
 
                 /*
                  * Find the sign bit value of the source.
@@ -8943,118 +8872,135 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 /*
                  * Check for special cases: +0, -0, +Inf, -Inf, NaN
                  */
-                if (H5T__bit_find (s, src.u.f.mpos, src.u.f.msize,
-                                  H5T_BIT_LSB, TRUE)<0) {
-                    if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
-                                      H5T_BIT_LSB, TRUE)<0) {
+                if (H5T__bit_find(s, src.u.f.mpos, src.u.f.msize, H5T_BIT_LSB, TRUE) < 0) {
+                    if (H5T__bit_find(s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, TRUE) < 0) {
                         /* +0 or -0 */
                         /* Set all bits to zero */
                         goto padding;
-                    } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
-                                             H5T_BIT_LSB, FALSE)<0) {
+                    }
+                    else if (H5T__bit_find(s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, FALSE) < 0) {
                         /* +Infinity or -Infinity */
-                        if(sign) { /* -Infinity */
-                            if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                        if (sign) {               /* -Infinity */
+                            if (cb_struct.func) { /*If user's exception handler is present, use it*/
                                 /*reverse order first*/
-                                H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NINF,
-                                        src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                                  src_p->shared->u.atomic.order);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NINF, src_id, dst_id, src_rev,
+                                                              d, cb_struct.user_data);
                             }
 
-                            if(except_ret == H5T_CONV_UNHANDLED) {
-                                if (H5T_SGN_2==dst.u.i.sign)
-                                    H5T__bit_set (d, dst.prec-1, (size_t)1, TRUE);
-                            } else if(except_ret == H5T_CONV_HANDLED) {
+                            if (except_ret == H5T_CONV_UNHANDLED) {
+                                if (H5T_SGN_2 == dst.u.i.sign)
+                                    H5T__bit_set(d, dst.prec - 1, (size_t)1, TRUE);
+                            }
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
-                            } else if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        } else { /* +Infinity */
-                            if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                            }
+                            else if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
+                        }
+                        else {                    /* +Infinity */
+                            if (cb_struct.func) { /*If user's exception handler is present, use it*/
                                 /*reverse order first*/
-                                H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PINF,
-                                        src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                                  src_p->shared->u.atomic.order);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PINF, src_id, dst_id, src_rev,
+                                                              d, cb_struct.user_data);
                             }
 
-                            if(except_ret == H5T_CONV_UNHANDLED) {
-                                if (H5T_SGN_NONE==dst.u.i.sign)
-                                    H5T__bit_set (d, dst.offset, dst.prec, TRUE);
-                                else if (H5T_SGN_2==dst.u.i.sign)
-                                    H5T__bit_set (d, dst.offset, dst.prec-1, TRUE);
-                            } else if(except_ret == H5T_CONV_HANDLED) {
+                            if (except_ret == H5T_CONV_UNHANDLED) {
+                                if (H5T_SGN_NONE == dst.u.i.sign)
+                                    H5T__bit_set(d, dst.offset, dst.prec, TRUE);
+                                else if (H5T_SGN_2 == dst.u.i.sign)
+                                    H5T__bit_set(d, dst.offset, dst.prec - 1, TRUE);
+                            }
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
-                            } else if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
+                            }
+                            else if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
                         }
                         goto padding;
                     }
-                } else if (H5T_NORM_NONE==src.u.f.norm && H5T__bit_find (s, src.u.f.mpos, src.u.f.msize-1,
-                                  H5T_BIT_LSB, TRUE)<0 && H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
-                                  H5T_BIT_LSB, FALSE)<0) {
+                }
+                else if (H5T_NORM_NONE == src.u.f.norm &&
+                         H5T__bit_find(s, src.u.f.mpos, src.u.f.msize - 1, H5T_BIT_LSB, TRUE) < 0 &&
+                         H5T__bit_find(s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, FALSE) < 0) {
                     /*This is a special case for the source of no implied mantissa bit.
                      *If the exponent bits are all 1s and only the 1st bit of mantissa
                      *is set to 1.  It's infinity. The Intel-Linux "long double" is this case.*/
                     /* +Infinity or -Infinity */
-                    if(sign) { /* -Infinity */
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                    if (sign) {               /* -Infinity */
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
                             /*reverse order first*/
                             H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NINF,
-                                    src_id, dst_id, src_rev, d, cb_struct.user_data);
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NINF, src_id, dst_id, src_rev, d,
+                                                          cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
-                            if (H5T_SGN_2==dst.u.i.sign)
-                                H5T__bit_set (d, dst.prec-1, (size_t)1, TRUE);
-                        } else if(except_ret == H5T_CONV_HANDLED) {
+                        if (except_ret == H5T_CONV_UNHANDLED) {
+                            if (H5T_SGN_2 == dst.u.i.sign)
+                                H5T__bit_set(d, dst.prec - 1, (size_t)1, TRUE);
+                        }
+                        else if (except_ret == H5T_CONV_HANDLED) {
                             /*No need to reverse the order of destination because user handles it*/
                             reverse = FALSE;
                             goto next;
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                    } else { /* +Infinity */
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                    }
+                    else {                    /* +Infinity */
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
                             /*reverse order first*/
                             H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PINF,
-                                    src_id, dst_id, src_rev, d, cb_struct.user_data);
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PINF, src_id, dst_id, src_rev, d,
+                                                          cb_struct.user_data);
                         }
 
-                        if(except_ret == H5T_CONV_UNHANDLED) {
-                            if (H5T_SGN_NONE==dst.u.i.sign)
-                                H5T__bit_set (d, dst.offset, dst.prec, TRUE);
-                            else if (H5T_SGN_2==dst.u.i.sign)
-                                H5T__bit_set (d, dst.offset, dst.prec-1, TRUE);
-                        } else if(except_ret == H5T_CONV_HANDLED) {
+                        if (except_ret == H5T_CONV_UNHANDLED) {
+                            if (H5T_SGN_NONE == dst.u.i.sign)
+                                H5T__bit_set(d, dst.offset, dst.prec, TRUE);
+                            else if (H5T_SGN_2 == dst.u.i.sign)
+                                H5T__bit_set(d, dst.offset, dst.prec - 1, TRUE);
+                        }
+                        else if (except_ret == H5T_CONV_HANDLED) {
                             /*No need to reverse the order of destination because user handles it*/
                             reverse = FALSE;
                             goto next;
-                        } else if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
+                        }
+                        else if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
                     }
                     goto padding;
-                } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
-                                         H5T_BIT_LSB, FALSE)<0) {
+                }
+                else if (H5T__bit_find(s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, FALSE) < 0) {
                     /* NaN */
-                    if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                    if (cb_struct.func) { /*If user's exception handler is present, use it*/
                         /*reverse order first*/
                         H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NAN,
-                                src_id, dst_id, src_rev, d, cb_struct.user_data);
+                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_NAN, src_id, dst_id, src_rev, d,
+                                                      cb_struct.user_data);
                     }
 
-                    if(except_ret == H5T_CONV_UNHANDLED) {
+                    if (except_ret == H5T_CONV_UNHANDLED) {
                         /*Just set all bits to zero.*/
                         goto padding;
-                    } else if(except_ret == H5T_CONV_HANDLED) {
+                    }
+                    else if (except_ret == H5T_CONV_HANDLED) {
                         /*No need to reverse the order of destination because user handles it*/
                         reverse = FALSE;
                         goto next;
-                    } else if(except_ret == H5T_CONV_ABORT)
+                    }
+                    else if (except_ret == H5T_CONV_ABORT)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
 
                     goto padding;
@@ -9071,12 +9017,15 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * Calculate the true source exponent by adjusting according to
                  * the source exponent bias.
                  */
-                if (0==expo || H5T_NORM_NONE==src.u.f.norm) {
-                    expo -= (src.u.f.ebias-1);
-                } else if (H5T_NORM_IMPLIED==src.u.f.norm) {
+                if (0 == expo || H5T_NORM_NONE == src.u.f.norm) {
+                    expo -= (src.u.f.ebias - 1);
+                }
+                else if (H5T_NORM_IMPLIED == src.u.f.norm) {
                     expo -= src.u.f.ebias;
-                } else {
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "normalization method not implemented yet")
+                }
+                else {
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                "normalization method not implemented yet")
                 }
 
                 /*
@@ -9095,7 +9044,7 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * Restore the implicit bit for mantissa if it's implied.
                  * Equivalent to mantissa |= (hsize_t)1<<src.u.f.msize.
                  */
-                if(H5T_NORM_IMPLIED == src.u.f.norm)
+                if (H5T_NORM_IMPLIED == src.u.f.norm)
                     H5T__bit_inc(int_buf, src.u.f.msize, 8 * buf_size - src.u.f.msize);
 
                 /*
@@ -9104,7 +9053,7 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * 10...010111, expo=20, expo-msize=-3.  Right-shift the sequence, we get
                  * 00010...10.  The last three bits were dropped.
                  */
-                H5T__bit_shift(int_buf, (ssize_t)(expo-src.u.f.msize), (size_t)0, buf_size * 8);
+                H5T__bit_shift(int_buf, (ssize_t)(expo - src.u.f.msize), (size_t)0, buf_size * 8);
 
                 /*
                  * If expo is less than mantissa size, the frantional value is dropped off
@@ -9119,14 +9068,15 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * integer.
                  */
                 sfirst = H5T__bit_find(int_buf, (size_t)0, 8 * buf_size, H5T_BIT_MSB, TRUE);
-                first = (size_t)sfirst;
+                first  = (size_t)sfirst;
 
-                if(sfirst < 0) {
+                if (sfirst < 0) {
                     /*
                      * The source has no bits set and must therefore be zero.
                      * Set the destination to zero - nothing to do.
                      */
-                } else if (H5T_SGN_NONE==dst.u.i.sign) { /*destination is unsigned*/
+                }
+                else if (H5T_SGN_NONE == dst.u.i.sign) { /*destination is unsigned*/
                     /*
                      * Destination is unsigned.  Library's default way: If the source value
                      * is greater than the maximal destination value then it overflows, the
@@ -9135,136 +9085,162 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                      * zero(do nothing).  If user's exception handler is set, call it and
                      * let user handle it.
                      */
-                    if(sign) { /*source is negative*/
-                        if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                    if (sign) {               /*source is negative*/
+                        if (cb_struct.func) { /*If user's exception handler is present, use it*/
                             /*reverse order first*/
                             H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW,
-                                    src_id, dst_id, src_rev, d, cb_struct.user_data);
-                            if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                            else if(except_ret == H5T_CONV_HANDLED) {
+                            except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id, src_rev,
+                                                          d, cb_struct.user_data);
+                            if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
                             }
                         }
-                    } else { /*source is positive*/
-                        if (first>=dst.prec) {
+                    }
+                    else { /*source is positive*/
+                        if (first >= dst.prec) {
                             /*overflow*/
-                            if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                            if (cb_struct.func) { /*If user's exception handler is present, use it*/
                                 /*reverse order first*/
-                                H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI,
-                                        src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                                  src_p->shared->u.atomic.order);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
+                                                              src_rev, d, cb_struct.user_data);
                             }
 
-                            if(except_ret == H5T_CONV_UNHANDLED)
-                                H5T__bit_set (d, dst.offset, dst.prec, TRUE);
-                            else if(except_ret == H5T_CONV_HANDLED) {
+                            if (except_ret == H5T_CONV_UNHANDLED)
+                                H5T__bit_set(d, dst.offset, dst.prec, TRUE);
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
-                            } else if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        } else if (first <dst.prec) {
-                            if(truncated && cb_struct.func) { /*If user's exception handler is present, use it*/
+                            }
+                            else if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
+                        }
+                        else if (first < dst.prec) {
+                            if (truncated &&
+                                cb_struct.func) { /*If user's exception handler is present, use it*/
                                 /*reverse order first*/
-                                H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE,
-                                        src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                                  src_p->shared->u.atomic.order);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE, src_id, dst_id,
+                                                              src_rev, d, cb_struct.user_data);
                             }
 
-                            if(except_ret == H5T_CONV_UNHANDLED)
+                            if (except_ret == H5T_CONV_UNHANDLED)
                                 /*copy source value into it if case is ignored by user handler*/
-                                H5T__bit_copy (d, dst.offset, int_buf, (size_t)0, first+1);
-                            else if(except_ret == H5T_CONV_HANDLED) {
+                                H5T__bit_copy(d, dst.offset, int_buf, (size_t)0, first + 1);
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
-                            } else if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
+                            }
+                            else if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
                         }
                     }
-                } else if (H5T_SGN_2==dst.u.i.sign) {  /*Destination is signed*/
-                    if(sign) { /*source is negative*/
-                        if(first < dst.prec-1) {
-                            if(truncated && cb_struct.func) { /*If user's exception handler is present, use it*/
+                }
+                else if (H5T_SGN_2 == dst.u.i.sign) { /*Destination is signed*/
+                    if (sign) {                       /*source is negative*/
+                        if (first < dst.prec - 1) {
+                            if (truncated &&
+                                cb_struct.func) { /*If user's exception handler is present, use it*/
                                 /*reverse order first*/
-                                H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE,
-                                        src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                                  src_p->shared->u.atomic.order);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE, src_id, dst_id,
+                                                              src_rev, d, cb_struct.user_data);
                             }
 
-                            if(except_ret == H5T_CONV_UNHANDLED) { /*If this case ignored by user handler*/
+                            if (except_ret == H5T_CONV_UNHANDLED) { /*If this case ignored by user handler*/
                                 /*Convert to integer representation.  Equivalent to ~(value - 1).*/
                                 H5T__bit_dec(int_buf, (size_t)0, 8 * buf_size);
                                 H5T__bit_neg(int_buf, (size_t)0, 8 * buf_size);
 
                                 /*copy source value into destination*/
-                                H5T__bit_copy(d, dst.offset, int_buf, (size_t)0, dst.prec-1);
-                                H5T__bit_set(d, (dst.offset + dst.prec-1), (size_t)1, TRUE);
-                            } else if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                            else if(except_ret == H5T_CONV_HANDLED) {
+                                H5T__bit_copy(d, dst.offset, int_buf, (size_t)0, dst.prec - 1);
+                                H5T__bit_set(d, (dst.offset + dst.prec - 1), (size_t)1, TRUE);
+                            }
+                            else if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
                             }
-                        } else {
+                        }
+                        else {
                             /* if underflows and no callback, do nothing except turn on
                              * the sign bit because 0x80...00 is the biggest negative value.
                              */
-                            if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                            if (cb_struct.func) { /*If user's exception handler is present, use it*/
                                 /*reverse order first*/
-                                H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW,
-                                        src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                                  src_p->shared->u.atomic.order);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, src_id, dst_id,
+                                                              src_rev, d, cb_struct.user_data);
                             }
 
-                            if(except_ret == H5T_CONV_UNHANDLED)
-                                H5T__bit_set(d, (dst.offset + dst.prec-1), (size_t)1, TRUE);
-                            else if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                            else if(except_ret == H5T_CONV_HANDLED) {
+                            if (except_ret == H5T_CONV_UNHANDLED)
+                                H5T__bit_set(d, (dst.offset + dst.prec - 1), (size_t)1, TRUE);
+                            else if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
                             }
                         }
-                    } else { /*source is positive*/
-                        if (first >= dst.prec-1) {
+                    }
+                    else { /*source is positive*/
+                        if (first >= dst.prec - 1) {
                             /*overflow*/
-                            if(cb_struct.func) { /*If user's exception handler is present, use it*/
+                            if (cb_struct.func) { /*If user's exception handler is present, use it*/
                                 /*reverse order first*/
-                                H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI,
-                                        src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                                  src_p->shared->u.atomic.order);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
+                                                              src_rev, d, cb_struct.user_data);
                             }
 
-                            if(except_ret == H5T_CONV_UNHANDLED)
-                                H5T__bit_set(d, dst.offset, dst.prec-1, TRUE);
-                            else if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                            else if(except_ret == H5T_CONV_HANDLED) {
+                            if (except_ret == H5T_CONV_UNHANDLED)
+                                H5T__bit_set(d, dst.offset, dst.prec - 1, TRUE);
+                            else if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
                             }
-                        } else if(first < dst.prec-1) {
-                            if(truncated && cb_struct.func) { /*If user's exception handler is present, use it*/
+                        }
+                        else if (first < dst.prec - 1) {
+                            if (truncated &&
+                                cb_struct.func) { /*If user's exception handler is present, use it*/
                                 /*reverse order first*/
-                                H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order);
-                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE,
-                                        src_id, dst_id, src_rev, d, cb_struct.user_data);
+                                H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                                  src_p->shared->u.atomic.order);
+                                except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE, src_id, dst_id,
+                                                              src_rev, d, cb_struct.user_data);
                             }
 
-                            if(except_ret == H5T_CONV_UNHANDLED) {
+                            if (except_ret == H5T_CONV_UNHANDLED) {
                                 /*copy source value into it if case is ignored by user handler*/
-                                H5T__bit_copy (d, dst.offset, int_buf, (size_t)0, first+1);
-                            } else if(except_ret == H5T_CONV_ABORT)
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                            else if(except_ret == H5T_CONV_HANDLED) {
+                                H5T__bit_copy(d, dst.offset, int_buf, (size_t)0, first + 1);
+                            }
+                            else if (except_ret == H5T_CONV_ABORT)
+                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                            "can't handle conversion exception")
+                            else if (except_ret == H5T_CONV_HANDLED) {
                                 /*No need to reverse the order of destination because user handles it*/
                                 reverse = FALSE;
                                 goto next;
@@ -9273,45 +9249,45 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                     }
                 }
 
-            padding:
+padding:
                 /*
                  * Set padding areas in destination.
                  */
-                if (dst.offset>0) {
-                    HDassert(H5T_PAD_ZERO==dst.lsb_pad || H5T_PAD_ONE==dst.lsb_pad);
-                    H5T__bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
+                if (dst.offset > 0) {
+                    HDassert(H5T_PAD_ZERO == dst.lsb_pad || H5T_PAD_ONE == dst.lsb_pad);
+                    H5T__bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE == dst.lsb_pad));
                 }
-                if (dst.offset+dst.prec!=8*dst_p->shared->size) {
-                    HDassert(H5T_PAD_ZERO==dst.msb_pad || H5T_PAD_ONE==dst.msb_pad);
-                    H5T__bit_set(d, dst.offset+dst.prec,
-                                 8*dst_p->shared->size - (dst.offset+ dst.prec),
-                                 (hbool_t)(H5T_PAD_ONE==dst.msb_pad));
+                if (dst.offset + dst.prec != 8 * dst_p->shared->size) {
+                    HDassert(H5T_PAD_ZERO == dst.msb_pad || H5T_PAD_ONE == dst.msb_pad);
+                    H5T__bit_set(d, dst.offset + dst.prec, 8 * dst_p->shared->size - (dst.offset + dst.prec),
+                                 (hbool_t)(H5T_PAD_ONE == dst.msb_pad));
                 }
 
                 /*
                  * Put the destination in the correct byte order.  See note at
                  * beginning of loop.
                  */
-                if (H5T_ORDER_BE==dst.order && reverse) {
-                    half_size = dst_p->shared->size/2;
-                    for (i=0; i<half_size; i++) {
-                        tmp1 = d[dst_p->shared->size-(i+1)];
-                        d[dst_p->shared->size-(i+1)] = d[i];
-                        d[i] = tmp1;
+                if (H5T_ORDER_BE == dst.order && reverse) {
+                    half_size = dst_p->shared->size / 2;
+                    for (i = 0; i < half_size; i++) {
+                        tmp1                             = d[dst_p->shared->size - (i + 1)];
+                        d[dst_p->shared->size - (i + 1)] = d[i];
+                        d[i]                             = tmp1;
                     }
                 }
 
-            next:
+next:
                 /*
                  * If we had used a temporary buffer for the destination then we
                  * should copy the value to the true destination buffer.
                  */
-                if (d==dbuf)
-                    HDmemcpy (dp, d, dst_p->shared->size);
+                if (d == dbuf)
+                    HDmemcpy(dp, d, dst_p->shared->size);
                 if (buf_stride) {
                     sp += direction * buf_stride;
                     dp += direction * buf_stride;
-                } else {
+                }
+                else {
                     sp += direction * src_p->shared->size;
                     dp += direction * dst_p->shared->size;
                 }
@@ -9326,15 +9302,14 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
     } /* end switch */
 
 done:
-    if(int_buf)
+    if (int_buf)
         H5MM_xfree(int_buf);
-    if(src_rev)
+    if (src_rev)
         H5MM_free(src_rev);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_f_i() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__conv_i_f
  *
@@ -9360,55 +9335,55 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-    size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg,
-    hid_t dxpl_id)
+H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+              size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id)
 {
     /* Traversal-related variables */
-    H5T_t    *src_p;            /*source datatype        */
-    H5T_t    *dst_p;            /*destination datatype        */
-    H5T_atomic_t src;            /*atomic source info        */
-    H5T_atomic_t dst;            /*atomic destination info    */
-    int    direction;        /*forward or backward traversal    */
-    size_t    elmtno;            /*element number        */
-    size_t    half_size;        /*half the type size        */
-    size_t      tsize;                  /*type size for swapping bytes  */
-    size_t    olap;            /*num overlapping elements    */
-    uint8_t    *s, *sp, *d, *dp;    /*source and dest traversal ptrs*/
-    uint8_t     *src_rev = NULL;        /*order-reversed source buffer  */
-    uint8_t    dbuf[64];        /*temp destination buffer    */
-    uint8_t     tmp1, tmp2;             /*temp variables for swapping bytes*/
+    H5T_t *      src_p;           /*source datatype        */
+    H5T_t *      dst_p;           /*destination datatype        */
+    H5T_atomic_t src;             /*atomic source info        */
+    H5T_atomic_t dst;             /*atomic destination info    */
+    int          direction;       /*forward or backward traversal    */
+    size_t       elmtno;          /*element number        */
+    size_t       half_size;       /*half the type size        */
+    size_t       tsize;           /*type size for swapping bytes  */
+    size_t       olap;            /*num overlapping elements    */
+    uint8_t *    s, *sp, *d, *dp; /*source and dest traversal ptrs*/
+    uint8_t *    src_rev = NULL;  /*order-reversed source buffer  */
+    uint8_t      dbuf[64];        /*temp destination buffer    */
+    uint8_t      tmp1, tmp2;      /*temp variables for swapping bytes*/
 
     /* Conversion-related variables */
-    hsize_t    expo;            /*destination exponent        */
-    hsize_t    expo_max;        /*maximal possible exponent value       */
-    size_t      sign;                   /*source sign bit value         */
-    hbool_t     is_max_neg;             /*source is maximal negative value*/
-    hbool_t     do_round;               /*whether there is roundup      */
-    uint8_t     *int_buf = NULL;        /*buffer for temporary value    */
-    size_t      buf_size;               /*buffer size for temporary value */
-    size_t    i;            /*miscellaneous counters    */
-    size_t    first;                  /*first bit(MSB) in an integer  */
-    ssize_t    sfirst;            /*a signed version of `first'    */
-    H5P_genplist_t      *plist;         /*Property list pointer         */
-    H5T_conv_cb_t       cb_struct = {NULL, NULL};      /*conversion callback structure */
-    H5T_conv_ret_t      except_ret;     /*return of callback function   */
-    hbool_t             reverse;        /*if reverse the order of destination   */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    hsize_t         expo;                     /*destination exponent        */
+    hsize_t         expo_max;                 /*maximal possible exponent value       */
+    size_t          sign;                     /*source sign bit value         */
+    hbool_t         is_max_neg;               /*source is maximal negative value*/
+    hbool_t         do_round;                 /*whether there is roundup      */
+    uint8_t *       int_buf = NULL;           /*buffer for temporary value    */
+    size_t          buf_size;                 /*buffer size for temporary value */
+    size_t          i;                        /*miscellaneous counters    */
+    size_t          first;                    /*first bit(MSB) in an integer  */
+    ssize_t         sfirst;                   /*a signed version of `first'    */
+    H5P_genplist_t *plist;                    /*Property list pointer         */
+    H5T_conv_cb_t   cb_struct = {NULL, NULL}; /*conversion callback structure */
+    H5T_conv_ret_t  except_ret;               /*return of callback function   */
+    hbool_t         reverse;                  /*if reverse the order of destination   */
+    herr_t          ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_PACKAGE
 
-    switch(cdata->command) {
+    switch (cdata->command) {
         case H5T_CONV_INIT:
-            if(NULL == (src_p = (H5T_t *)H5I_object(src_id)) || NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src_p = (H5T_t *)H5I_object(src_id)) ||
+                NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
             src = src_p->shared->u.atomic;
             dst = dst_p->shared->u.atomic;
-            if(H5T_ORDER_LE != dst.order && H5T_ORDER_BE != dst.order && H5T_ORDER_VAX != dst.order)
+            if (H5T_ORDER_LE != dst.order && H5T_ORDER_BE != dst.order && H5T_ORDER_VAX != dst.order)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported byte order")
-            if(dst_p->shared->size > sizeof(dbuf))
+            if (dst_p->shared->size > sizeof(dbuf))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "destination size is too large")
-            if(8 * sizeof(expo) - 1 < src.u.f.esize)
+            if (8 * sizeof(expo) - 1 < src.u.f.esize)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "exponent field is too large")
             cdata->need_bkg = H5T_BKG_NO;
             break;
@@ -9418,7 +9393,8 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the datatypes */
-            if(NULL == (src_p = (H5T_t *)H5I_object(src_id)) || NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
+            if (NULL == (src_p = (H5T_t *)H5I_object(src_id)) ||
+                NULL == (dst_p = (H5T_t *)H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
             src = src_p->shared->u.atomic;
             dst = dst_p->shared->u.atomic;
@@ -9428,73 +9404,77 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
              * how many of the elements have the source and destination areas
              * overlapping?
              */
-            if (src_p->shared->size==dst_p->shared->size || buf_stride) {
-                sp = dp = (uint8_t*)buf;
+            if (src_p->shared->size == dst_p->shared->size || buf_stride) {
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-                olap = nelmts;
-            } else if (src_p->shared->size>=dst_p->shared->size) {
-                double olap_d = HDceil((double)(dst_p->shared->size)/
-                                       (double)(src_p->shared->size-dst_p->shared->size));
-                olap = (size_t)olap_d;
-                sp = dp = (uint8_t*)buf;
+                olap      = nelmts;
+            }
+            else if (src_p->shared->size >= dst_p->shared->size) {
+                double olap_d = HDceil((double)(dst_p->shared->size) /
+                                       (double)(src_p->shared->size - dst_p->shared->size));
+                olap          = (size_t)olap_d;
+                sp = dp   = (uint8_t *)buf;
                 direction = 1;
-            } else {
-                double olap_d = HDceil((double)(src_p->shared->size)/
-                                       (double)(dst_p->shared->size-src_p->shared->size));
-                olap = (size_t)olap_d;
-                sp = (uint8_t*)buf + (nelmts-1) * src_p->shared->size;
-                dp = (uint8_t*)buf + (nelmts-1) * dst_p->shared->size;
-                direction = -1;
+            }
+            else {
+                double olap_d = HDceil((double)(src_p->shared->size) /
+                                       (double)(dst_p->shared->size - src_p->shared->size));
+                olap          = (size_t)olap_d;
+                sp            = (uint8_t *)buf + (nelmts - 1) * src_p->shared->size;
+                dp            = (uint8_t *)buf + (nelmts - 1) * dst_p->shared->size;
+                direction     = -1;
             }
 
             /* Allocate enough space for the buffer holding temporary
              * converted value
              */
-            buf_size = (src.prec > dst.u.f.msize ? src.prec : dst.u.f.msize)/8 + 1;
-            int_buf = (uint8_t*)H5MM_calloc(buf_size);
+            buf_size = (src.prec > dst.u.f.msize ? src.prec : dst.u.f.msize) / 8 + 1;
+            int_buf  = (uint8_t *)H5MM_calloc(buf_size);
 
             /* Get the plist structure */
-            if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+            if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
                 HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find property list for ID")
 
             /* Get conversion exception callback property */
-            if(H5P_get(plist,H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
+            if (H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback")
 
             /* Allocate space for order-reversed source buffer */
-            src_rev = (uint8_t*)H5MM_calloc(src_p->shared->size);
+            src_rev = (uint8_t *)H5MM_calloc(src_p->shared->size);
 
             /* The conversion loop */
-            for (elmtno=0; elmtno<nelmts; elmtno++) {
+            for (elmtno = 0; elmtno < nelmts; elmtno++) {
                 /* Set these variables to default */
                 except_ret = H5T_CONV_UNHANDLED;
                 reverse    = TRUE;
 
                 /* Make sure these variables are reset to 0. */
-                sign = 0;               /*source sign bit value         */
-                is_max_neg = 0;         /*source is maximal negative value*/
-                do_round = 0;           /*whether there is roundup      */
-                sfirst = 0;
+                sign       = 0; /*source sign bit value         */
+                is_max_neg = 0; /*source is maximal negative value*/
+                do_round   = 0; /*whether there is roundup      */
+                sfirst     = 0;
 
                 /*
                  * If the source and destination buffers overlap then use a
                  * temporary buffer for the destination.
                  */
-                if (direction>0) {
+                if (direction > 0) {
                     s = sp;
-                    d = elmtno<olap ? dbuf : dp;
-                } else {
+                    d = elmtno < olap ? dbuf : dp;
+                }
+                else {
                     s = sp;
-                    d = elmtno+olap >= nelmts ? dbuf : dp;
+                    d = elmtno + olap >= nelmts ? dbuf : dp;
                 }
 #ifndef NDEBUG
                 /* I don't quite trust the overlap calculations yet --rpm */
-                if (d==dbuf) {
-                    HDassert((dp>=sp && dp<sp+src_p->shared->size) ||
-                            (sp>=dp && sp<dp+dst_p->shared->size));
-                } else {
-                    HDassert((dp<sp && dp+dst_p->shared->size<=sp) ||
-                            (sp<dp && sp+src_p->shared->size<=dp));
+                if (d == dbuf) {
+                    HDassert((dp >= sp && dp < sp + src_p->shared->size) ||
+                             (sp >= dp && sp < dp + dst_p->shared->size));
+                }
+                else {
+                    HDassert((dp < sp && dp + dst_p->shared->size <= sp) ||
+                             (sp < dp && sp + src_p->shared->size <= dp));
                 }
 #endif
 
@@ -9502,56 +9482,58 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * complicated.  We'll do all the conversion stuff assuming
                  * little endian and then we'll fix the order at the end.
                  */
-                if (H5T_ORDER_BE==src.order) {
-                    half_size = src_p->shared->size/2;
-                    for (i=0; i<half_size; i++) {
-                        tmp1 = s[src_p->shared->size-(i+1)];
-                        s[src_p->shared->size-(i+1)] = s[i];
-                        s[i] = tmp1;
+                if (H5T_ORDER_BE == src.order) {
+                    half_size = src_p->shared->size / 2;
+                    for (i = 0; i < half_size; i++) {
+                        tmp1                             = s[src_p->shared->size - (i + 1)];
+                        s[src_p->shared->size - (i + 1)] = s[i];
+                        s[i]                             = tmp1;
                     }
                 }
 
                 /* Zero-set all destination bits*/
-                H5T__bit_set (d, dst.offset, dst.prec, FALSE);
+                H5T__bit_set(d, dst.offset, dst.prec, FALSE);
 
                 /* Copy source into a temporary buffer */
                 H5T__bit_copy(int_buf, (size_t)0, s, src.offset, src.prec);
 
                 /* Find the sign bit value of the source */
-                if(H5T_SGN_2 == src.u.i.sign)
+                if (H5T_SGN_2 == src.u.i.sign)
                     sign = (size_t)H5T__bit_get_d(int_buf, src.prec - 1, (size_t)1);
 
                 /* What is the bit position(starting from 0 as first one) for the most significant
                  * bit(MSB) of S which is set?
                  */
-                if(H5T_SGN_2 == src.u.i.sign) {
+                if (H5T_SGN_2 == src.u.i.sign) {
                     sfirst = H5T__bit_find(int_buf, (size_t)0, src.prec - 1, H5T_BIT_MSB, TRUE);
-                    if(sign && sfirst < 0)
-            /* The case 0x80...00, which is negative with maximal value */
+                    if (sign && sfirst < 0)
+                        /* The case 0x80...00, which is negative with maximal value */
                         is_max_neg = 1;
-                } else if(H5T_SGN_NONE == src.u.i.sign)
+                }
+                else if (H5T_SGN_NONE == src.u.i.sign)
                     sfirst = H5T__bit_find(int_buf, (size_t)0, src.prec, H5T_BIT_MSB, TRUE);
 
                 /* Handle special cases here.  Integer is zero */
-                if(!sign && sfirst < 0)
+                if (!sign && sfirst < 0)
                     goto padding;
 
                 /* Convert source integer if it's negative */
-                if(H5T_SGN_2 == src.u.i.sign && sign) {
-                    if(!is_max_neg) {
+                if (H5T_SGN_2 == src.u.i.sign && sign) {
+                    if (!is_max_neg) {
                         /* Equivalent to ~(i - 1) */
                         H5T__bit_dec(int_buf, (size_t)0, buf_size * 8);
                         H5T__bit_neg(int_buf, (size_t)0, buf_size * 8);
                         sfirst = H5T__bit_find(int_buf, (size_t)0, src.prec - 1, H5T_BIT_MSB, TRUE);
-                    } else {
+                    }
+                    else {
                         /* If it's maximal negative number 0x80...000, treat it as if it overflowed
                          * (create a carry) to help conversion.  i.e. a character type number 0x80
                          * is treated as 0x100.
                          */
-                        sfirst = (ssize_t)(src.prec - 1);
+                        sfirst     = (ssize_t)(src.prec - 1);
                         is_max_neg = 0;
                     }
-                    if(sfirst < 0)
+                    if (sfirst < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "zero bit not found")
 
                     /* Sign bit has been negated if bit vector isn't 0x80...00.  Set all bits in front of
@@ -9570,35 +9552,40 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * the destination exponent bias.  Implied and non-implied normalization
                  * should be the same.
                  */
-                if (H5T_NORM_NONE==dst.u.f.norm || H5T_NORM_IMPLIED==dst.u.f.norm) {
+                if (H5T_NORM_NONE == dst.u.f.norm || H5T_NORM_IMPLIED == dst.u.f.norm) {
                     expo = first + dst.u.f.ebias;
-                } else {
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "normalization method not implemented yet")
+                }
+                else {
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                "normalization method not implemented yet")
                 }
 
                 /* Handle mantissa part here */
-                if (H5T_NORM_IMPLIED==dst.u.f.norm) {
+                if (H5T_NORM_IMPLIED == dst.u.f.norm) {
                     /* Imply first bit */
                     H5T__bit_set(int_buf, first, (size_t)1, 0);
-            } else if (H5T_NORM_NONE==dst.u.f.norm) {
-            first++;
-        }
+                }
+                else if (H5T_NORM_NONE == dst.u.f.norm) {
+                    first++;
+                }
 
                 /* Roundup for mantissa */
-                if(first > dst.u.f.msize) {
+                if (first > dst.u.f.msize) {
                     /* If the bit sequence is bigger than the mantissa part, there'll be some
                      * precision loss.  Let user's handler deal with the case if it's present
                      */
-                    if(cb_struct.func) {
-                        H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order); /*reverse order first*/
-                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PRECISION, src_id, dst_id,
-                                src_rev, d, cb_struct.user_data);
+                    if (cb_struct.func) {
+                        H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                          src_p->shared->u.atomic.order); /*reverse order first*/
+                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PRECISION, src_id, dst_id, src_rev, d,
+                                                      cb_struct.user_data);
                     }
 
-                    if(except_ret == H5T_CONV_HANDLED) {
+                    if (except_ret == H5T_CONV_HANDLED) {
                         reverse = FALSE;
                         goto padding;
-                    } else if(except_ret == H5T_CONV_ABORT)
+                    }
+                    else if (except_ret == H5T_CONV_ABORT)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
 
                     /* If user's exception handler does deal with it, we do it by dropping off the
@@ -9608,66 +9595,71 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                      */
 
                     /* Check 1st dropoff bit, see if it's set. */
-                    if(H5T__bit_get_d(int_buf, ((first - dst.u.f.msize) - 1), (size_t)1)) {
+                    if (H5T__bit_get_d(int_buf, ((first - dst.u.f.msize) - 1), (size_t)1)) {
                         /* Check all bits after 1st dropoff bit, see if any of them is set. */
-                        if(((first - dst.u.f.msize) - 1) > 0 && H5T__bit_get_d(int_buf, (size_t)0, ((first - dst.u.f.msize) - 1)))
+                        if (((first - dst.u.f.msize) - 1) > 0 &&
+                            H5T__bit_get_d(int_buf, (size_t)0, ((first - dst.u.f.msize) - 1)))
                             do_round = 1;
-                        else {  /* The .50...0 case */
+                        else { /* The .50...0 case */
                             /* Check if the least significant bit is odd. */
-                            if(H5T__bit_get_d(int_buf, (first - dst.u.f.msize), (size_t)1))
-                               do_round = 1;
+                            if (H5T__bit_get_d(int_buf, (first - dst.u.f.msize), (size_t)1))
+                                do_round = 1;
                         }
-            }
+                    }
 
                     /* Right shift to drop off extra bits */
                     H5T__bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, buf_size * 8);
 
-                    if(do_round) {
+                    if (do_round) {
                         H5T__bit_inc(int_buf, (size_t)0, buf_size * 8);
                         do_round = 0;
 
                         /* If integer is like 0x0ff...fff and we need to round up the
                          * last f, we get 0x100...000.  Treat this special case here.
                          */
-                        if(H5T__bit_get_d(int_buf, dst.u.f.msize, (size_t)1)) {
-                        if (H5T_NORM_IMPLIED==dst.u.f.norm) {
-                    /* The bit at this 1's position was impled already, so this
-                    * number should be 0x200...000.  We need to increment the
-                    * exponent in this case.
-                    */
-                    expo++;
-                    } else if (H5T_NORM_NONE==dst.u.f.norm) {
-                /* Right shift 1 bit to let the carried 1 fit in the mantissa,
-                * and increment exponent by 1.
-                */
+                        if (H5T__bit_get_d(int_buf, dst.u.f.msize, (size_t)1)) {
+                            if (H5T_NORM_IMPLIED == dst.u.f.norm) {
+                                /* The bit at this 1's position was impled already, so this
+                                 * number should be 0x200...000.  We need to increment the
+                                 * exponent in this case.
+                                 */
+                                expo++;
+                            }
+                            else if (H5T_NORM_NONE == dst.u.f.norm) {
+                                /* Right shift 1 bit to let the carried 1 fit in the mantissa,
+                                 * and increment exponent by 1.
+                                 */
                                 H5T__bit_shift(int_buf, (ssize_t)-1, (size_t)0, buf_size * 8);
-                expo++;
-                }
-            }
+                                expo++;
+                            }
+                        }
                     }
-                } else {
+                }
+                else {
                     /* The bit sequence can fit mantissa part.  Left shift to fit in from high-order of
                      * bit position. */
                     H5T__bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, dst.u.f.msize);
                 }
 
-
                 /* Check if the exponent is too big */
-                expo_max = (hsize_t) (HDpow((double)2.0f, (double)dst.u.f.esize) - 1);
-
-                if(expo > expo_max) {  /*overflows*/
-                    if(cb_struct.func) { /*user's exception handler.  Reverse back source order*/
-                        H5T_reverse_order(src_rev, s, src_p->shared->size, src_p->shared->u.atomic.order); /*reverse order first*/
-                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id,
-                                src_rev, d, cb_struct.user_data);
-
-                        if(except_ret == H5T_CONV_ABORT)
-                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
-                        else if(except_ret == H5T_CONV_HANDLED) {
+                expo_max = (hsize_t)(HDpow((double)2.0f, (double)dst.u.f.esize) - 1);
+
+                if (expo > expo_max) {    /*overflows*/
+                    if (cb_struct.func) { /*user's exception handler.  Reverse back source order*/
+                        H5T_reverse_order(src_rev, s, src_p->shared->size,
+                                          src_p->shared->u.atomic.order); /*reverse order first*/
+                        except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, src_id, dst_id, src_rev, d,
+                                                      cb_struct.user_data);
+
+                        if (except_ret == H5T_CONV_ABORT)
+                            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL,
+                                        "can't handle conversion exception")
+                        else if (except_ret == H5T_CONV_HANDLED) {
                             reverse = FALSE;
                             goto padding;
                         }
-                    } else {
+                    }
+                    else {
                         /*make destination infinity by setting exponent to maximal number and
                          *mantissa to zero.*/
                         expo = expo_max;
@@ -9675,26 +9667,26 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                     }
                 }
 
-                if(except_ret == H5T_CONV_UNHANDLED) {
+                if (except_ret == H5T_CONV_UNHANDLED) {
                     /* Set exponent in destination */
                     H5T__bit_set_d(d, dst.u.f.epos, dst.u.f.esize, expo);
 
                     /* Copy mantissa into destination */
-                    H5T__bit_copy(d, dst.u.f.mpos, int_buf, (size_t)0, (buf_size * 8) > dst.u.f.msize ? dst.u.f.msize : buf_size * 8);
+                    H5T__bit_copy(d, dst.u.f.mpos, int_buf, (size_t)0,
+                                  (buf_size * 8) > dst.u.f.msize ? dst.u.f.msize : buf_size * 8);
                 }
 
-            padding:
+padding:
                 /*
                  * Set padding areas in destination.
                  */
-                if(dst.offset > 0) {
+                if (dst.offset > 0) {
                     HDassert(H5T_PAD_ZERO == dst.lsb_pad || H5T_PAD_ONE == dst.lsb_pad);
-                    H5T__bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
+                    H5T__bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE == dst.lsb_pad));
                 }
-                if(dst.offset + dst.prec != 8 * dst_p->shared->size) {
+                if (dst.offset + dst.prec != 8 * dst_p->shared->size) {
                     HDassert(H5T_PAD_ZERO == dst.msb_pad || H5T_PAD_ONE == dst.msb_pad);
-                    H5T__bit_set(d, dst.offset + dst.prec,
-                                 8 * dst_p->shared->size - (dst.offset + dst.prec),
+                    H5T__bit_set(d, dst.offset + dst.prec, 8 * dst_p->shared->size - (dst.offset + dst.prec),
                                  (hbool_t)(H5T_PAD_ONE == dst.msb_pad));
                 }
 
@@ -9702,26 +9694,27 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * Put the destination in the correct byte order.  See note at
                  * beginning of loop.
                  */
-                if (H5T_ORDER_BE==dst.order && reverse) {
-                    half_size = dst_p->shared->size/2;
-                    for (i=0; i<half_size; i++) {
-                        uint8_t tmp = d[dst_p->shared->size-(i+1)];
-                        d[dst_p->shared->size-(i+1)] = d[i];
-                        d[i] = tmp;
+                if (H5T_ORDER_BE == dst.order && reverse) {
+                    half_size = dst_p->shared->size / 2;
+                    for (i = 0; i < half_size; i++) {
+                        uint8_t tmp                      = d[dst_p->shared->size - (i + 1)];
+                        d[dst_p->shared->size - (i + 1)] = d[i];
+                        d[i]                             = tmp;
                     }
-                } else if (H5T_ORDER_VAX==dst.order && reverse) {
+                }
+                else if (H5T_ORDER_VAX == dst.order && reverse) {
                     tsize = dst_p->shared->size;
                     HDassert(0 == tsize % 2);
 
                     for (i = 0; i < tsize; i += 4) {
                         tmp1 = d[i];
-                        tmp2 = d[i+1];
+                        tmp2 = d[i + 1];
 
-                        d[i] = d[(tsize-2)-i];
-                        d[i+1] = d[(tsize-1)-i];
+                        d[i]     = d[(tsize - 2) - i];
+                        d[i + 1] = d[(tsize - 1) - i];
 
-                        d[(tsize-2)-i] = tmp1;
-                        d[(tsize-1)-i] = tmp2;
+                        d[(tsize - 2) - i] = tmp1;
+                        d[(tsize - 1) - i] = tmp2;
                     }
                 }
 
@@ -9729,12 +9722,13 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                  * If we had used a temporary buffer for the destination then we
                  * should copy the value to the true destination buffer.
                  */
-                if (d==dbuf)
-                    HDmemcpy (dp, d, dst_p->shared->size);
+                if (d == dbuf)
+                    HDmemcpy(dp, d, dst_p->shared->size);
                 if (buf_stride) {
                     sp += direction * buf_stride;
                     dp += direction * buf_stride;
-                } else {
+                }
+                else {
                     sp += direction * src_p->shared->size;
                     dp += direction * dst_p->shared->size;
                 }
@@ -9749,15 +9743,14 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
     } /* end switch */
 
 done:
-    if(int_buf)
+    if (int_buf)
         H5MM_xfree(int_buf);
-    if(src_rev)
+    if (src_rev)
         H5MM_free(src_rev);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__conv_i_f() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_reverse_order
  *
@@ -9782,7 +9775,7 @@ done:
 static herr_t
 H5T_reverse_order(uint8_t *rev, uint8_t *s, size_t size, H5T_order_t order)
 {
-    size_t      i;
+    size_t i;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -9791,17 +9784,18 @@ H5T_reverse_order(uint8_t *rev, uint8_t *s, size_t size, H5T_order_t order)
 
     if (H5T_ORDER_VAX == order) {
         for (i = 0; i < size; i += 2) {
-            rev[i] = s[(size - 2) - i];
+            rev[i]     = s[(size - 2) - i];
             rev[i + 1] = s[(size - 1) - i];
         }
-    } else if (H5T_ORDER_BE == order) {
-        for (i=0; i<size; i++)
-            rev[size-(i+1)] = s[i];
-    } else {
-        for (i=0; i<size; i++)
+    }
+    else if (H5T_ORDER_BE == order) {
+        for (i = 0; i < size; i++)
+            rev[size - (i + 1)] = s[i];
+    }
+    else {
+        for (i = 0; i < size; i++)
             rev[i] = s[i];
     }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
-
diff --git a/src/H5Tcset.c b/src/H5Tcset.c
index 54af65b..f9e0540 100644
--- a/src/H5Tcset.c
+++ b/src/H5Tcset.c
@@ -16,18 +16,16 @@
  *      the character set (cset) for the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_cset_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_cset_interface
 
+#include "H5private.h"  /*generic functions			  */
+#include "H5Eprivate.h" /*error handling			  */
+#include "H5Iprivate.h" /*ID functions		   		  */
+#include "H5Tpkg.h"     /*data-type functions			  */
 
-#include "H5private.h"		/*generic functions			  */
-#include "H5Eprivate.h"		/*error handling			  */
-#include "H5Iprivate.h"		/*ID functions		   		  */
-#include "H5Tpkg.h"		/*data-type functions			  */
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_cset_interface -- Initialize interface-specific information
@@ -49,7 +47,6 @@ H5T_init_cset_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_cset_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_cset
  *
@@ -73,22 +70,23 @@ H5T_init_cset_interface(void)
 H5T_cset_t
 H5Tget_cset(hid_t type_id)
 {
-    H5T_t	*dt;
-    H5T_cset_t	ret_value;
+    H5T_t *    dt;
+    H5T_cset_t ret_value;
 
     FUNC_ENTER_API(H5T_CSET_ERROR)
     H5TRACE1("Tc", "i", type_id);
 
     /* Check args */
-    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_CSET_ERROR, "not a data type")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_CSET_ERROR, "not a data type")
     while (dt->shared->parent && !H5T_IS_STRING(dt->shared))
-        dt = dt->shared->parent;  /*defer to parent*/
+        dt = dt->shared->parent; /*defer to parent*/
     if (!H5T_IS_STRING(dt->shared))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_CSET_ERROR, "operation not defined for data type class")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_CSET_ERROR,
+                    "operation not defined for data type class")
 
     /* result */
-    if(H5T_IS_FIXED_STRING(dt->shared))
+    if (H5T_IS_FIXED_STRING(dt->shared))
         ret_value = dt->shared->u.atomic.u.s.cset;
     else
         ret_value = dt->shared->u.vlen.cset;
@@ -97,7 +95,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_cset
  *
@@ -119,26 +116,26 @@ done:
 herr_t
 H5Tset_cset(hid_t type_id, H5T_cset_t cset)
 {
-    H5T_t	*dt;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iTc", type_id, cset);
 
     /* Check args */
-    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
     if (cset < H5T_CSET_ASCII || cset >= H5T_NCSET)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal character set type")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal character set type")
     while (dt->shared->parent && !H5T_IS_STRING(dt->shared))
-        dt = dt->shared->parent;  /*defer to parent*/
+        dt = dt->shared->parent; /*defer to parent*/
     if (!H5T_IS_STRING(dt->shared))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for data type class")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for data type class")
 
     /* Commit */
-    if(H5T_IS_FIXED_STRING(dt->shared))
+    if (H5T_IS_FIXED_STRING(dt->shared))
         dt->shared->u.atomic.u.s.cset = cset;
     else
         dt->shared->u.vlen.cset = cset;
@@ -146,4 +143,3 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset)
 done:
     FUNC_LEAVE_API(ret_value)
 }
-
diff --git a/src/H5Tdbg.c b/src/H5Tdbg.c
index 41cdd4d..11268c4 100644
--- a/src/H5Tdbg.c
+++ b/src/H5Tdbg.c
@@ -26,53 +26,43 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
-
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Tpkg.h"		/* Datatypes         			*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Tpkg.h"     /* Datatypes         			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__print_stats
  *
@@ -100,50 +90,42 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__print_stats(H5T_path_t H5_ATTR_UNUSED * path, int H5_ATTR_UNUSED * nprint/*in,out*/)
+H5T__print_stats(H5T_path_t H5_ATTR_UNUSED *path, int H5_ATTR_UNUSED *nprint /*in,out*/)
 {
 #ifdef H5T_DEBUG
-    hsize_t	nbytes;
-    char	bandwidth[32];
+    hsize_t nbytes;
+    char    bandwidth[32];
 #endif
 
     FUNC_ENTER_PACKAGE_NOERR
 
 #ifdef H5T_DEBUG
-    if(H5DEBUG(T) && path->stats.ncalls > 0) {
-	if(nprint && 0 == (*nprint)++) {
-	    HDfprintf(H5DEBUG(T), "H5T: type conversion statistics:\n");
-	    HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
-		       "Conversion", "Elmts", "Calls", "User",
-		       "System", "Elapsed", "Bandwidth");
-	    HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
-		       "----------", "-----", "-----", "----",
-		       "------", "-------", "---------");
-	}
-        if(path->src && path->dst)
+    if (H5DEBUG(T) && path->stats.ncalls > 0) {
+        if (nprint && 0 == (*nprint)++) {
+            HDfprintf(H5DEBUG(T), "H5T: type conversion statistics:\n");
+            HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n", "Conversion", "Elmts", "Calls",
+                      "User", "System", "Elapsed", "Bandwidth");
+            HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n", "----------", "-----", "-----",
+                      "----", "------", "-------", "---------");
+        }
+        if (path->src && path->dst)
             nbytes = MAX(H5T_get_size(path->src), H5T_get_size(path->dst));
-        else if(path->src)
+        else if (path->src)
             nbytes = H5T_get_size(path->src);
-        else if(path->dst)
+        else if (path->dst)
             nbytes = H5T_get_size(path->dst);
         else
             nbytes = 0;
-	nbytes *= path->stats.nelmts;
-	H5_bandwidth(bandwidth, (double)nbytes, path->stats.timer.etime);
-	HDfprintf(H5DEBUG(T), "   %-16s %10Hd %10d %8.2f %8.2f %8.2f %10s\n",
-		   path->name,
-		   path->stats.nelmts,
-		   path->stats.ncalls,
-		   path->stats.timer.utime,
-		   path->stats.timer.stime,
-		   path->stats.timer.etime,
-		   bandwidth);
+        nbytes *= path->stats.nelmts;
+        H5_bandwidth(bandwidth, (double)nbytes, path->stats.timer.etime);
+        HDfprintf(H5DEBUG(T), "   %-16s %10Hd %10d %8.2f %8.2f %8.2f %10s\n", path->name, path->stats.nelmts,
+                  path->stats.ncalls, path->stats.timer.utime, path->stats.timer.stime,
+                  path->stats.timer.etime, bandwidth);
     }
 #endif
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5T__print_stats() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_debug
  *
@@ -161,8 +143,8 @@ H5T__print_stats(H5T_path_t H5_ATTR_UNUSED * path, int H5_ATTR_UNUSED * nprint/*
 herr_t
 H5T_debug(const H5T_t *dt, FILE *stream)
 {
-    const char	*s1 = "", *s2 = "";
-    unsigned	i;
+    const char *s1 = "", *s2 = "";
+    unsigned    i;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -170,7 +152,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
     HDassert(dt);
     HDassert(stream);
 
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_INTEGER:
             s1 = "int";
             break;
@@ -204,7 +186,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
             break;
 
         case H5T_VLEN:
-            if(H5T_IS_VL_STRING(dt->shared))
+            if (H5T_IS_VL_STRING(dt->shared))
                 s1 = "str";
             else
                 s1 = "vlen";
@@ -215,7 +197,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
             break;
     } /* end switch */
 
-    switch(dt->shared->state) {
+    switch (dt->shared->state) {
         case H5T_STATE_TRANSIENT:
             s2 = "[transient]";
             break;
@@ -241,10 +223,10 @@ H5T_debug(const H5T_t *dt, FILE *stream)
 
     HDfprintf(stream, "%s%s {nbytes=%lu", s1, s2, (unsigned long)(dt->shared->size));
 
-    if(H5T_IS_ATOMIC(dt->shared)) {
-        uint64_t	tmp;
+    if (H5T_IS_ATOMIC(dt->shared)) {
+        uint64_t tmp;
 
-	switch(dt->shared->u.atomic.order) {
+        switch (dt->shared->u.atomic.order) {
             case H5T_ORDER_BE:
                 s1 = "BE";
                 break;
@@ -264,19 +246,17 @@ H5T_debug(const H5T_t *dt, FILE *stream)
             default:
                 s1 = "order?";
                 break;
-	} /* end switch */
+        } /* end switch */
 
-	HDfprintf(stream, ", %s", s1);
+        HDfprintf(stream, ", %s", s1);
 
-	if(dt->shared->u.atomic.offset)
-	    HDfprintf(stream, ", offset=%lu",
-		    (unsigned long) (dt->shared->u.atomic.offset));
-	if(dt->shared->u.atomic.prec != 8 * dt->shared->size)
-	    HDfprintf(stream, ", prec=%lu",
-		    (unsigned long) (dt->shared->u.atomic.prec));
-	switch(dt->shared->type) {
+        if (dt->shared->u.atomic.offset)
+            HDfprintf(stream, ", offset=%lu", (unsigned long)(dt->shared->u.atomic.offset));
+        if (dt->shared->u.atomic.prec != 8 * dt->shared->size)
+            HDfprintf(stream, ", prec=%lu", (unsigned long)(dt->shared->u.atomic.prec));
+        switch (dt->shared->type) {
             case H5T_INTEGER:
-                switch(dt->shared->u.atomic.u.i.sign) {
+                switch (dt->shared->u.atomic.u.i.sign) {
                     case H5T_SGN_NONE:
                         s1 = "unsigned";
                         break;
@@ -290,12 +270,12 @@ H5T_debug(const H5T_t *dt, FILE *stream)
                         break;
 
                 } /* end switch */
-                if(s1)
+                if (s1)
                     HDfprintf(stream, ", %s", s1);
                 break;
 
             case H5T_FLOAT:
-                switch(dt->shared->u.atomic.u.f.norm) {
+                switch (dt->shared->u.atomic.u.f.norm) {
                     case H5T_NORM_IMPLIED:
                         s1 = "implied";
                         break;
@@ -313,21 +293,18 @@ H5T_debug(const H5T_t *dt, FILE *stream)
                         break;
                 } /* end switch */
 
-                HDfprintf(stream, ", sign=%lu+1",
-                        (unsigned long)(dt->shared->u.atomic.u.f.sign));
-                HDfprintf(stream, ", mant=%lu+%lu (%s)",
-                        (unsigned long)(dt->shared->u.atomic.u.f.mpos),
-                        (unsigned long)(dt->shared->u.atomic.u.f.msize), s1);
-                HDfprintf(stream, ", exp=%lu+%lu",
-                        (unsigned long)(dt->shared->u.atomic.u.f.epos),
-                        (unsigned long)(dt->shared->u.atomic.u.f.esize));
+                HDfprintf(stream, ", sign=%lu+1", (unsigned long)(dt->shared->u.atomic.u.f.sign));
+                HDfprintf(stream, ", mant=%lu+%lu (%s)", (unsigned long)(dt->shared->u.atomic.u.f.mpos),
+                          (unsigned long)(dt->shared->u.atomic.u.f.msize), s1);
+                HDfprintf(stream, ", exp=%lu+%lu", (unsigned long)(dt->shared->u.atomic.u.f.epos),
+                          (unsigned long)(dt->shared->u.atomic.u.f.esize));
                 tmp = dt->shared->u.atomic.u.f.ebias >> 32;
-                if(tmp) {
+                if (tmp) {
                     size_t hi = (size_t)tmp;
                     size_t lo = (size_t)(dt->shared->u.atomic.u.f.ebias & 0xffffffff);
-                    HDfprintf(stream, " bias=0x%08lx%08lx",
-                            (unsigned long)hi, (unsigned long)lo);
-                } else {
+                    HDfprintf(stream, " bias=0x%08lx%08lx", (unsigned long)hi, (unsigned long)lo);
+                }
+                else {
                     size_t lo = (size_t)(dt->shared->u.atomic.u.f.ebias & 0xffffffff);
                     HDfprintf(stream, " bias=0x%08lx", (unsigned long)lo);
                 }
@@ -336,19 +313,20 @@ H5T_debug(const H5T_t *dt, FILE *stream)
             default:
                 /* No additional info */
                 break;
-	} /* end switch */
-    } else if(H5T_COMPOUND == dt->shared->type) {
-	/* Compound data type */
-	for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-	    HDfprintf(stream, "\n\"%s\" @%lu",
-		    dt->shared->u.compnd.memb[i].name,
-		    (unsigned long)(dt->shared->u.compnd.memb[i].offset));
-	    HDfprintf(stream, " ");
-	    H5T_debug(dt->shared->u.compnd.memb[i].type, stream);
-	} /* end for */
-	HDfprintf(stream, "\n");
-    } else if(H5T_VLEN == dt->shared->type) {
-        switch(dt->shared->u.vlen.loc) {
+        } /* end switch */
+    }
+    else if (H5T_COMPOUND == dt->shared->type) {
+        /* Compound data type */
+        for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+            HDfprintf(stream, "\n\"%s\" @%lu", dt->shared->u.compnd.memb[i].name,
+                      (unsigned long)(dt->shared->u.compnd.memb[i].offset));
+            HDfprintf(stream, " ");
+            H5T_debug(dt->shared->u.compnd.memb[i].type, stream);
+        } /* end for */
+        HDfprintf(stream, "\n");
+    }
+    else if (H5T_VLEN == dt->shared->type) {
+        switch (dt->shared->u.vlen.loc) {
             case H5T_LOC_MEMORY:
                 HDfprintf(stream, ", loc=memory");
                 break;
@@ -362,7 +340,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
                 break;
         } /* end switch */
 
-        if(H5T_IS_VL_STRING(dt->shared))
+        if (H5T_IS_VL_STRING(dt->shared))
             /* Variable length string datatype */
             HDfprintf(stream, ", variable-length");
         else {
@@ -371,30 +349,31 @@ H5T_debug(const H5T_t *dt, FILE *stream)
             H5T_debug(dt->shared->parent, stream);
             HDfprintf(stream, "\n");
         } /* end else */
-    } else if(H5T_ENUM == dt->shared->type) {
-        size_t	base_size;
-
-	/* Enumeration data type */
-	HDfprintf(stream, " ");
-	H5T_debug(dt->shared->parent, stream);
-	base_size = dt->shared->parent->shared->size;
-	for(i = 0; i < dt->shared->u.enumer.nmembs; i++) {
-            size_t	k;
-
-	    HDfprintf(stream, "\n\"%s\" = 0x", dt->shared->u.enumer.name[i]);
-	    for(k = 0; k < base_size; k++)
-		HDfprintf(stream, "%02lx",
-			(unsigned long)(dt->shared->u.enumer.value + (i * base_size) + k));
-	} /* end for */
-	HDfprintf(stream, "\n");
-    } else if(H5T_OPAQUE == dt->shared->type) {
-	HDfprintf(stream, ", tag=\"%s\"", dt->shared->u.opaque.tag);
-    } else {
-	/* Unknown */
-	HDfprintf(stream, "unknown class %d\n", (int)(dt->shared->type));
+    }
+    else if (H5T_ENUM == dt->shared->type) {
+        size_t base_size;
+
+        /* Enumeration data type */
+        HDfprintf(stream, " ");
+        H5T_debug(dt->shared->parent, stream);
+        base_size = dt->shared->parent->shared->size;
+        for (i = 0; i < dt->shared->u.enumer.nmembs; i++) {
+            size_t k;
+
+            HDfprintf(stream, "\n\"%s\" = 0x", dt->shared->u.enumer.name[i]);
+            for (k = 0; k < base_size; k++)
+                HDfprintf(stream, "%02lx", (unsigned long)(dt->shared->u.enumer.value + (i * base_size) + k));
+        } /* end for */
+        HDfprintf(stream, "\n");
+    }
+    else if (H5T_OPAQUE == dt->shared->type) {
+        HDfprintf(stream, ", tag=\"%s\"", dt->shared->u.opaque.tag);
+    }
+    else {
+        /* Unknown */
+        HDfprintf(stream, "unknown class %d\n", (int)(dt->shared->type));
     }
     HDfprintf(stream, "}");
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5T_debug() */
-
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c
index cb2a320..1a49fef 100644
--- a/src/H5Tdeprec.c
+++ b/src/H5Tdeprec.c
@@ -29,60 +29,50 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg   */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T__init_deprec_interface
-
+#define H5_INTERFACE_INIT_FUNC H5T__init_deprec_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FOprivate.h"	/* File objects				*/
-#include "H5Iprivate.h"		/* IDs					*/
-#include "H5Ppublic.h"		/* Property Lists			*/
-#include "H5Tpkg.h"		/* Datatypes				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FOprivate.h" /* File objects				*/
+#include "H5Iprivate.h"  /* IDs					*/
+#include "H5Ppublic.h"   /* Property Lists			*/
+#include "H5Tpkg.h"      /* Datatypes				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T__init_deprec_interface -- Initialize interface-specific information
@@ -103,7 +93,6 @@ H5T__init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T__init_deprec_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5T__term_deprec_interface -- Terminate interface
@@ -128,7 +117,7 @@ H5T__term_deprec_interface(void)
 } /* H5T__term_deprec_interface() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5Tcommit1
  *
@@ -147,31 +136,30 @@ H5T__term_deprec_interface(void)
 herr_t
 H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id)
 {
-    H5G_loc_t	loc;                    /* Location to create datatype */
-    H5T_t	*type;                  /* Datatype for ID */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5G_loc_t loc;                 /* Location to create datatype */
+    H5T_t *   type;                /* Datatype for ID */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*si", loc_id, name, type_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Commit the datatype to the file, using default property list values */
-    if(H5T__commit_named(&loc, name, type, H5P_LINK_CREATE_DEFAULT,
-            H5P_DATATYPE_CREATE_DEFAULT, H5P_DATATYPE_ACCESS_DEFAULT, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
+    if (H5T__commit_named(&loc, name, type, H5P_LINK_CREATE_DEFAULT, H5P_DATATYPE_CREATE_DEFAULT,
+                          H5P_DATATYPE_ACCESS_DEFAULT, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcommit1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Topen1
  *
@@ -191,23 +179,23 @@ done:
 hid_t
 H5Topen1(hid_t loc_id, const char *name)
 {
-    H5T_t       *type = NULL;
-    H5G_loc_t	 loc;
-    H5G_name_t   path;            	/* Datatype group hier. path */
-    H5O_loc_t    oloc;            	/* Datatype object location */
-    H5O_type_t   obj_type;              /* Type of object at location */
-    H5G_loc_t    type_loc;              /* Group object for datatype */
-    hbool_t      obj_found = FALSE;     /* Object at 'name' found */
-    hid_t        dxpl_id = H5AC_ind_dxpl_id; /* dxpl to use to open datatype */
-    hid_t        ret_value = FAIL;
+    H5T_t *    type = NULL;
+    H5G_loc_t  loc;
+    H5G_name_t path;                         /* Datatype group hier. path */
+    H5O_loc_t  oloc;                         /* Datatype object location */
+    H5O_type_t obj_type;                     /* Type of object at location */
+    H5G_loc_t  type_loc;                     /* Group object for datatype */
+    hbool_t    obj_found = FALSE;            /* Object at 'name' found */
+    hid_t      dxpl_id   = H5AC_ind_dxpl_id; /* dxpl to use to open datatype */
+    hid_t      ret_value = FAIL;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "i*s", loc_id, name);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Set up datatype location to fill in */
@@ -219,35 +207,34 @@ H5Topen1(hid_t loc_id, const char *name)
      * Find the named datatype object header and read the datatype message
      * from it.
      */
-    if(H5G_loc_find(&loc, name, &type_loc/*out*/, H5P_DEFAULT, dxpl_id) < 0)
+    if (H5G_loc_find(&loc, name, &type_loc /*out*/, H5P_DEFAULT, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "not found")
     obj_found = TRUE;
 
     /* Check that the object found is the correct type */
-    if(H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
+    if (H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get object type")
-    if(obj_type != H5O_TYPE_NAMED_DATATYPE)
+    if (obj_type != H5O_TYPE_NAMED_DATATYPE)
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a named datatype")
 
     /* Open it */
-    if((type = H5T_open(&type_loc, dxpl_id)) == NULL)
+    if ((type = H5T_open(&type_loc, dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to open named datatype")
 
     /* Register the type and return the ID */
-    if((ret_value = H5I_register(H5I_DATATYPE, type, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, type, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register named datatype")
 
 done:
-    if(ret_value < 0) {
-        if(type != NULL)
+    if (ret_value < 0) {
+        if (type != NULL)
             H5T_close(type);
         else {
-            if(obj_found && H5F_addr_defined(type_loc.oloc->addr))
+            if (obj_found && H5F_addr_defined(type_loc.oloc->addr))
                 H5G_loc_free(&type_loc);
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Topen1() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
diff --git a/src/H5Tenum.c b/src/H5Tenum.c
index b2b978a..115e56d 100644
--- a/src/H5Tenum.c
+++ b/src/H5Tenum.c
@@ -16,25 +16,21 @@
  *      in the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_enum_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_enum_interface
 
-
-#include "H5private.h"		/*generic functions			  */
-#include "H5Eprivate.h"		/*error handling			  */
-#include "H5Iprivate.h"		/*ID functions		   		  */
-#include "H5MMprivate.h"	/*memory management			  */
-#include "H5Tpkg.h"		/*data-type functions			  */
+#include "H5private.h"   /*generic functions			  */
+#include "H5Eprivate.h"  /*error handling			  */
+#include "H5Iprivate.h"  /*ID functions		   		  */
+#include "H5MMprivate.h" /*memory management			  */
+#include "H5Tpkg.h"      /*data-type functions			  */
 
 /* Static local functions */
-static char *H5T_enum_nameof(const H5T_t *dt, const void *value, char *name/*out*/,
-			      size_t size);
-static herr_t H5T_enum_valueof(const H5T_t *dt, const char *name,
-				void *value/*out*/);
+static char * H5T_enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size);
+static herr_t H5T_enum_valueof(const H5T_t *dt, const char *name, void *value /*out*/);
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_enum_interface -- Initialize interface-specific information
@@ -56,7 +52,6 @@ H5T_init_enum_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_enum_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tenum_create
  *
@@ -77,29 +72,29 @@ H5T_init_enum_interface(void)
 hid_t
 H5Tenum_create(hid_t parent_id)
 {
-    H5T_t	*parent = NULL;		/*base integer data type	*/
-    H5T_t	*dt = NULL;		/*new enumeration data type	*/
-    hid_t	ret_value;	        /*return value			*/
+    H5T_t *parent = NULL; /*base integer data type	*/
+    H5T_t *dt     = NULL; /*new enumeration data type	*/
+    hid_t  ret_value;     /*return value			*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", parent_id);
 
     /* Check args */
-    if(NULL == (parent = (H5T_t *)H5I_object_verify(parent_id, H5I_DATATYPE)) || H5T_INTEGER != parent->shared->type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an integer data type")
+    if (NULL == (parent = (H5T_t *)H5I_object_verify(parent_id, H5I_DATATYPE)) ||
+        H5T_INTEGER != parent->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an integer data type")
 
     /* Build new type */
-    if(NULL == (dt = H5T__enum_create(parent)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "cannot create enum type")
+    if (NULL == (dt = H5T__enum_create(parent)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "cannot create enum type")
     /* Atomize the type */
-    if ((ret_value=H5I_register(H5I_DATATYPE, dt, TRUE))<0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type atom")
+    if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type atom")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__enum_create
  *
@@ -121,16 +116,16 @@ done:
 H5T_t *
 H5T__enum_create(const H5T_t *parent)
 {
-    H5T_t	*ret_value;		/*new enumeration data type	*/
+    H5T_t *ret_value; /*new enumeration data type	*/
 
     FUNC_ENTER_PACKAGE
 
     HDassert(parent);
 
     /* Build new type */
-    if(NULL == (ret_value = H5T__alloc()))
+    if (NULL == (ret_value = H5T__alloc()))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    ret_value->shared->type = H5T_ENUM;
+    ret_value->shared->type   = H5T_ENUM;
     ret_value->shared->parent = H5T_copy(parent, H5T_COPY_ALL);
     HDassert(ret_value->shared->parent);
     ret_value->shared->size = ret_value->shared->parent->shared->size;
@@ -139,7 +134,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tenum_insert
  *
@@ -164,31 +158,30 @@ done:
 herr_t
 H5Tenum_insert(hid_t type, const char *name, const void *value)
 {
-    H5T_t	*dt=NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*s*x", type, name, value);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if(H5T_ENUM != dt->shared->type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an enumeration data type")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
+    if (H5T_ENUM != dt->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an enumeration data type")
     if (!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
     if (!value)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no value specified")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no value specified")
 
     /* Do work */
-    if(H5T__enum_insert(dt, name, value) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to insert new enumeration member")
+    if (H5T__enum_insert(dt, name, value) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to insert new enumeration member")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__enum_insert
  *
@@ -211,10 +204,10 @@ done:
 herr_t
 H5T__enum_insert(const H5T_t *dt, const char *name, const void *value)
 {
-    unsigned	i;
-    char	**names=NULL;
-    uint8_t	*values=NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    unsigned i;
+    char **  names     = NULL;
+    uint8_t *values    = NULL;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -223,38 +216,37 @@ H5T__enum_insert(const H5T_t *dt, const char *name, const void *value)
     HDassert(value);
 
     /* The name and value had better not already exist */
-    for (i=0; i<dt->shared->u.enumer.nmembs; i++) {
-	if (!HDstrcmp(dt->shared->u.enumer.name[i], name))
-	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "name redefinition")
-	if (!HDmemcmp(dt->shared->u.enumer.value+i*dt->shared->size, value, dt->shared->size))
-	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "value redefinition")
+    for (i = 0; i < dt->shared->u.enumer.nmembs; i++) {
+        if (!HDstrcmp(dt->shared->u.enumer.name[i], name))
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "name redefinition")
+        if (!HDmemcmp(dt->shared->u.enumer.value + i * dt->shared->size, value, dt->shared->size))
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "value redefinition")
     }
 
     /* Increase table sizes */
-    if(dt->shared->u.enumer.nmembs >= dt->shared->u.enumer.nalloc) {
-	unsigned n = MAX(32, 2*dt->shared->u.enumer.nalloc);
+    if (dt->shared->u.enumer.nmembs >= dt->shared->u.enumer.nalloc) {
+        unsigned n = MAX(32, 2 * dt->shared->u.enumer.nalloc);
 
-	if(NULL == (names = (char **)H5MM_realloc(dt->shared->u.enumer.name, n * sizeof(char *))))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-	dt->shared->u.enumer.name = names;
+        if (NULL == (names = (char **)H5MM_realloc(dt->shared->u.enumer.name, n * sizeof(char *))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+        dt->shared->u.enumer.name = names;
 
-	if(NULL == (values = (uint8_t *)H5MM_realloc(dt->shared->u.enumer.value, n * dt->shared->size)))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-	dt->shared->u.enumer.value = values;
-	dt->shared->u.enumer.nalloc = n;
+        if (NULL == (values = (uint8_t *)H5MM_realloc(dt->shared->u.enumer.value, n * dt->shared->size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+        dt->shared->u.enumer.value  = values;
+        dt->shared->u.enumer.nalloc = n;
     }
 
     /* Insert new member at end of member arrays */
-    dt->shared->u.enumer.sorted = H5T_SORT_NONE;
-    i = dt->shared->u.enumer.nmembs++;
+    dt->shared->u.enumer.sorted  = H5T_SORT_NONE;
+    i                            = dt->shared->u.enumer.nmembs++;
     dt->shared->u.enumer.name[i] = H5MM_xstrdup(name);
-    HDmemcpy(dt->shared->u.enumer.value+i*dt->shared->size, value, dt->shared->size);
+    HDmemcpy(dt->shared->u.enumer.value + i * dt->shared->size, value, dt->shared->size);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_member_value
  *
@@ -273,30 +265,29 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tget_member_value(hid_t type, unsigned membno, void *value/*out*/)
+H5Tget_member_value(hid_t type, unsigned membno, void *value /*out*/)
 {
-    H5T_t	*dt=NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIux", type, membno, value);
 
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if(H5T_ENUM != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not defined for data type class")
-    if (membno>=dt->shared->u.enumer.nmembs)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid member number")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
+    if (H5T_ENUM != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not defined for data type class")
+    if (membno >= dt->shared->u.enumer.nmembs)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid member number")
     if (!value)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null value buffer")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null value buffer")
 
-    if(H5T__get_member_value(dt, membno, value) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get member value")
+    if (H5T__get_member_value(dt, membno, value) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get member value")
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__get_member_value
  *
@@ -316,20 +307,18 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__get_member_value(const H5T_t *dt, unsigned membno, void *value/*out*/)
+H5T__get_member_value(const H5T_t *dt, unsigned membno, void *value /*out*/)
 {
     FUNC_ENTER_PACKAGE_NOERR
 
     HDassert(dt);
     HDassert(value);
 
-    HDmemcpy(value, dt->shared->u.enumer.value + membno*dt->shared->size, dt->shared->size);
+    HDmemcpy(value, dt->shared->u.enumer.value + membno * dt->shared->size, dt->shared->size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tenum_nameof
  *
@@ -353,32 +342,31 @@ H5T__get_member_value(const H5T_t *dt, unsigned membno, void *value/*out*/)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tenum_nameof(hid_t type, const void *value, char *name/*out*/, size_t size)
+H5Tenum_nameof(hid_t type, const void *value, char *name /*out*/, size_t size)
 {
-    H5T_t	*dt = NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*xxz", type, value, name, size);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if(H5T_ENUM != dt->shared->type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an enumeration data type")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
+    if (H5T_ENUM != dt->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an enumeration data type")
     if (!value)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no value supplied")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no value supplied")
     if (!name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name buffer supplied")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name buffer supplied")
 
-    if (NULL==H5T_enum_nameof(dt, value, name, size))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "nameof query failed")
+    if (NULL == H5T_enum_nameof(dt, value, name, size))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "nameof query failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_enum_nameof
  *
@@ -408,13 +396,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static char *
-H5T_enum_nameof(const H5T_t *dt, const void *value, char *name/*out*/, size_t size)
+H5T_enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size)
 {
-    H5T_t       *copied_dt = NULL;      /* Do sorting in copied datatype */
-    unsigned	lt, md = 0, rt;		/* Indices for binary search	*/
-    int	        cmp = (-1);		/* Comparison result		*/
-    hbool_t     alloc_name = FALSE;     /* Whether name has been allocated */
-    char        *ret_value;             /* Return value */
+    H5T_t *  copied_dt = NULL;   /* Do sorting in copied datatype */
+    unsigned lt, md = 0, rt;     /* Indices for binary search	*/
+    int      cmp        = (-1);  /* Comparison result		*/
+    hbool_t  alloc_name = FALSE; /* Whether name has been allocated */
+    char *   ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -423,62 +411,61 @@ H5T_enum_nameof(const H5T_t *dt, const void *value, char *name/*out*/, size_t si
     HDassert(value);
     HDassert(name || 0 == size);
 
-    if(name && size > 0)
+    if (name && size > 0)
         *name = '\0';
 
     /* Sanity check */
-    if(dt->shared->u.enumer.nmembs == 0)
+    if (dt->shared->u.enumer.nmembs == 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, NULL, "datatype has no members")
 
     /* Do a binary search over the values to find the correct one.  Do sorting
      * and search on the copied datatype to protect the original order. */
-    if(NULL == (copied_dt = H5T_copy(dt, H5T_COPY_ALL)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy data type")
-    if(H5T__sort_value(copied_dt, NULL) < 0)
+    if (NULL == (copied_dt = H5T_copy(dt, H5T_COPY_ALL)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy data type")
+    if (H5T__sort_value(copied_dt, NULL) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOMPARE, NULL, "value sort failed")
 
     lt = 0;
     rt = copied_dt->shared->u.enumer.nmembs;
-    while(lt < rt) {
-	md = (lt + rt) / 2;
-	cmp = HDmemcmp(value, copied_dt->shared->u.enumer.value + md * copied_dt->shared->size, copied_dt->shared->size);
-	if(cmp < 0)
-	    rt = md;
-	else if(cmp > 0)
-	    lt = md + 1;
-	else
-	    break;
+    while (lt < rt) {
+        md  = (lt + rt) / 2;
+        cmp = HDmemcmp(value, copied_dt->shared->u.enumer.value + md * copied_dt->shared->size,
+                       copied_dt->shared->size);
+        if (cmp < 0)
+            rt = md;
+        else if (cmp > 0)
+            lt = md + 1;
+        else
+            break;
     } /* end while */
 
     /* Value was not yet defined. This fixes bug # 774, 2002/06/05 EIP */
-    if(cmp != 0)
+    if (cmp != 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, NULL, "value is currently not defined")
 
     /* Save result name */
-    if(!name) {
-        if(NULL == (name = (char *)H5MM_malloc(
-                HDstrlen(copied_dt->shared->u.enumer.name[md]) + 1)))
+    if (!name) {
+        if (NULL == (name = (char *)H5MM_malloc(HDstrlen(copied_dt->shared->u.enumer.name[md]) + 1)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
         alloc_name = TRUE;
     } /* end if */
     HDstrncpy(name, copied_dt->shared->u.enumer.name[md], size);
-    if(HDstrlen(copied_dt->shared->u.enumer.name[md]) >= size)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, NULL, "name has been truncated")
+    if (HDstrlen(copied_dt->shared->u.enumer.name[md]) >= size)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, NULL, "name has been truncated")
 
     /* Set return value */
     ret_value = name;
 
 done:
-    if(copied_dt)
-        if(H5T_close(copied_dt) < 0)
+    if (copied_dt)
+        if (H5T_close(copied_dt) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CANTCLOSEOBJ, NULL, "unable to close data type");
-    if(!ret_value && alloc_name)
+    if (!ret_value && alloc_name)
         H5MM_free(name);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_enum_nameof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tenum_valueof
  *
@@ -502,32 +489,31 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/)
+H5Tenum_valueof(hid_t type, const char *name, void *value /*out*/)
 {
-    H5T_t	*dt;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5T_t *dt;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*sx", type, name, value);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if(H5T_ENUM != dt->shared->type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an enumeration data type")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(!value)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no value buffer")
-
-    if(H5T_enum_valueof(dt, name, value) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "valueof query failed")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
+    if (H5T_ENUM != dt->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an enumeration data type")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (!value)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no value buffer")
+
+    if (H5T_enum_valueof(dt, name, value) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "valueof query failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Tenum_valueof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_enum_valueof
  *
@@ -551,17 +537,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T_enum_valueof(const H5T_t *dt, const char *name, void *value/*out*/)
+H5T_enum_valueof(const H5T_t *dt, const char *name, void *value /*out*/)
 {
-    unsigned	lt, md=0, rt;		/*indices for binary search	*/
-    int	        cmp=(-1);		/*comparison result		*/
-    H5T_t       *copied_dt = NULL;      /*do sorting in copied datatype */
-    herr_t      ret_value=SUCCEED;      /* Return value */
+    unsigned lt, md = 0, rt;      /*indices for binary search	*/
+    int      cmp       = (-1);    /*comparison result		*/
+    H5T_t *  copied_dt = NULL;    /*do sorting in copied datatype */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
-    HDassert(dt && H5T_ENUM==dt->shared->type);
+    HDassert(dt && H5T_ENUM == dt->shared->type);
     HDassert(name && *name);
     HDassert(value);
 
@@ -571,36 +557,38 @@ H5T_enum_valueof(const H5T_t *dt, const char *name, void *value/*out*/)
 
     /* Do a binary search over the names to find the correct one.  Do sorting
      * and search on the copied datatype to protect the original order. */
-    if (NULL==(copied_dt=H5T_copy(dt, H5T_COPY_ALL)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy data type");
-    if(H5T__sort_name(copied_dt, NULL) < 0)
+    if (NULL == (copied_dt = H5T_copy(dt, H5T_COPY_ALL)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy data type");
+    if (H5T__sort_name(copied_dt, NULL) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOMPARE, FAIL, "value sort failed")
 
     lt = 0;
     rt = copied_dt->shared->u.enumer.nmembs;
 
-    while (lt<rt) {
-	md = (lt+rt)/2;
-	cmp = HDstrcmp(name, copied_dt->shared->u.enumer.name[md]);
-	if (cmp<0) {
-	    rt = md;
-	} else if (cmp>0) {
-	    lt = md+1;
-	} else {
-	    break;
-	}
+    while (lt < rt) {
+        md  = (lt + rt) / 2;
+        cmp = HDstrcmp(name, copied_dt->shared->u.enumer.name[md]);
+        if (cmp < 0) {
+            rt = md;
+        }
+        else if (cmp > 0) {
+            lt = md + 1;
+        }
+        else {
+            break;
+        }
     }
     /* Value was not yet defined. This fixes bug # 774, 2002/06/05 EIP */
-    if (cmp!=0)
+    if (cmp != 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "string doesn't exist in the enumeration type")
 
-    HDmemcpy(value, copied_dt->shared->u.enumer.value+md*copied_dt->shared->size, copied_dt->shared->size);
+    HDmemcpy(value, copied_dt->shared->u.enumer.value + md * copied_dt->shared->size,
+             copied_dt->shared->size);
 
 done:
-    if(copied_dt)
-        if(H5T_close(copied_dt) < 0)
+    if (copied_dt)
+        if (H5T_close(copied_dt) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CANTCLOSEOBJ, FAIL, "unable to close data type")
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
-
diff --git a/src/H5Tfields.c b/src/H5Tfields.c
index 013436b..2453e2a 100644
--- a/src/H5Tfields.c
+++ b/src/H5Tfields.c
@@ -16,19 +16,17 @@
  *      enumerated & compound datatypes in the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_fields_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_fields_interface
 
+#include "H5private.h"   /*generic functions			  */
+#include "H5Eprivate.h"  /*error handling			  */
+#include "H5Iprivate.h"  /*ID functions		   		  */
+#include "H5MMprivate.h" /*memory management			  */
+#include "H5Tpkg.h"      /*data-type functions			  */
 
-#include "H5private.h"		/*generic functions			  */
-#include "H5Eprivate.h"		/*error handling			  */
-#include "H5Iprivate.h"		/*ID functions		   		  */
-#include "H5MMprivate.h"	/*memory management			  */
-#include "H5Tpkg.h"		/*data-type functions			  */
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_fields_interface -- Initialize interface-specific information
@@ -50,7 +48,6 @@ H5T_init_fields_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_fields_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_nmembers
  *
@@ -74,24 +71,23 @@ H5T_init_fields_interface(void)
 int
 H5Tget_nmembers(hid_t type_id)
 {
-    H5T_t *dt;          /* Datatype to query */
-    int	ret_value;      /* Return value */
+    H5T_t *dt;        /* Datatype to query */
+    int    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
-    if((ret_value = H5T_get_nmembers(dt)) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "cannot return member number")
+    if ((ret_value = H5T_get_nmembers(dt)) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "cannot return member number")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_nmembers() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_get_nmembers
  *
@@ -115,24 +111,23 @@ done:
 int
 H5T_get_nmembers(const H5T_t *dt)
 {
-    int	ret_value;
+    int ret_value;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(dt);
 
-    if(H5T_COMPOUND == dt->shared->type)
-	ret_value = (int)dt->shared->u.compnd.nmembs;
-    else if(H5T_ENUM == dt->shared->type)
-	ret_value = (int)dt->shared->u.enumer.nmembs;
+    if (H5T_COMPOUND == dt->shared->type)
+        ret_value = (int)dt->shared->u.compnd.nmembs;
+    else if (H5T_ENUM == dt->shared->type)
+        ret_value = (int)dt->shared->u.enumer.nmembs;
     else
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "operation not supported for type class")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "operation not supported for type class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_get_nmembers() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_member_name
  *
@@ -157,24 +152,23 @@ done:
 char *
 H5Tget_member_name(hid_t type_id, unsigned membno)
 {
-    H5T_t	*dt = NULL;
-    char	*ret_value;
+    H5T_t *dt = NULL;
+    char * ret_value;
 
     FUNC_ENTER_API(NULL)
     H5TRACE2("*s", "iIu", type_id, membno);
 
     /* Check args */
-    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a datatype")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a datatype")
 
-    if(NULL == (ret_value = H5T__get_member_name(dt, membno)))
+    if (NULL == (ret_value = H5T__get_member_name(dt, membno)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get member name")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__get_member_name
  *
@@ -197,7 +191,7 @@ done:
 char *
 H5T__get_member_name(H5T_t const *dt, unsigned membno)
 {
-    char	*ret_value;
+    char *ret_value;
 
     FUNC_ENTER_PACKAGE
 
@@ -205,13 +199,13 @@ H5T__get_member_name(H5T_t const *dt, unsigned membno)
 
     switch (dt->shared->type) {
         case H5T_COMPOUND:
-            if (membno>=dt->shared->u.compnd.nmembs)
+            if (membno >= dt->shared->u.compnd.nmembs)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid member number")
             ret_value = H5MM_xstrdup(dt->shared->u.compnd.memb[membno].name);
             break;
 
         case H5T_ENUM:
-            if (membno>=dt->shared->u.enumer.nmembs)
+            if (membno >= dt->shared->u.enumer.nmembs)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid member number")
             ret_value = H5MM_xstrdup(dt->shared->u.enumer.name[membno]);
             break;
@@ -235,7 +229,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tget_member_index
  *
@@ -257,28 +250,28 @@ done:
 int
 H5Tget_member_index(hid_t type_id, const char *name)
 {
-    H5T_t       *dt = NULL;
-    int         ret_value=FAIL;
-    unsigned    i;
+    H5T_t *  dt        = NULL;
+    int      ret_value = FAIL;
+    unsigned i;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("Is", "i*s", type_id, name);
 
     /* Check arguments */
     HDassert(name);
-    if(NULL == (dt = (H5T_t*)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Locate member by name */
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_COMPOUND:
-            for(i = 0; i < dt->shared->u.compnd.nmembs; i++)
-                if(!HDstrcmp(dt->shared->u.compnd.memb[i].name, name))
+            for (i = 0; i < dt->shared->u.compnd.nmembs; i++)
+                if (!HDstrcmp(dt->shared->u.compnd.memb[i].name, name))
                     HGOTO_DONE((int)i)
             break;
         case H5T_ENUM:
-            for(i = 0; i < dt->shared->u.enumer.nmembs; i++)
-                if(!HDstrcmp(dt->shared->u.enumer.name[i], name))
+            for (i = 0; i < dt->shared->u.enumer.nmembs; i++)
+                if (!HDstrcmp(dt->shared->u.enumer.name[i], name))
                     HGOTO_DONE((int)i)
             break;
 
@@ -301,7 +294,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_member_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__sort_value
  *
@@ -321,12 +313,12 @@ done:
 herr_t
 H5T__sort_value(const H5T_t *dt, int *map)
 {
-    unsigned	nmembs;                 /* Number of members for datatype */
-    size_t	size;
-    hbool_t	swapped;                /* Whether we've swapped fields */
-    uint8_t	tbuf[32];
-    unsigned	i, j;                   /* Local index variables */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    unsigned nmembs; /* Number of members for datatype */
+    size_t   size;
+    hbool_t  swapped; /* Whether we've swapped fields */
+    uint8_t  tbuf[32];
+    unsigned i, j;                /* Local index variables */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -335,76 +327,78 @@ H5T__sort_value(const H5T_t *dt, int *map)
     HDassert(H5T_COMPOUND == dt->shared->type || H5T_ENUM == dt->shared->type);
 
     /* Use a bubble sort because we can short circuit */
-    if(H5T_COMPOUND == dt->shared->type) {
-	if(H5T_SORT_VALUE != dt->shared->u.compnd.sorted) {
-	    dt->shared->u.compnd.sorted = H5T_SORT_VALUE;
-	    nmembs = dt->shared->u.compnd.nmembs;
-	    for(i = nmembs - 1, swapped = TRUE; i > 0 && swapped; --i) {
-		for(j = 0, swapped = FALSE; j < i; j++) {
-		    if(dt->shared->u.compnd.memb[j].offset > dt->shared->u.compnd.memb[j + 1].offset) {
-                        H5T_cmemb_t tmp = dt->shared->u.compnd.memb[j];
-			dt->shared->u.compnd.memb[j] = dt->shared->u.compnd.memb[j + 1];
-			dt->shared->u.compnd.memb[j + 1] = tmp;
-			if(map) {
-			    int x = map[j];
-
-			    map[j] = map[j + 1];
-			    map[j + 1] = x;
-			} /* end if */
-			swapped = TRUE;
-		    } /* end if */
-		} /* end for */
-	    } /* end for */
+    if (H5T_COMPOUND == dt->shared->type) {
+        if (H5T_SORT_VALUE != dt->shared->u.compnd.sorted) {
+            dt->shared->u.compnd.sorted = H5T_SORT_VALUE;
+            nmembs                      = dt->shared->u.compnd.nmembs;
+            for (i = nmembs - 1, swapped = TRUE; i > 0 && swapped; --i) {
+                for (j = 0, swapped = FALSE; j < i; j++) {
+                    if (dt->shared->u.compnd.memb[j].offset > dt->shared->u.compnd.memb[j + 1].offset) {
+                        H5T_cmemb_t tmp                  = dt->shared->u.compnd.memb[j];
+                        dt->shared->u.compnd.memb[j]     = dt->shared->u.compnd.memb[j + 1];
+                        dt->shared->u.compnd.memb[j + 1] = tmp;
+                        if (map) {
+                            int x = map[j];
+
+                            map[j]     = map[j + 1];
+                            map[j + 1] = x;
+                        } /* end if */
+                        swapped = TRUE;
+                    } /* end if */
+                }     /* end for */
+            }         /* end for */
 #ifndef NDEBUG
-	    /* I never trust a sort :-) -RPM */
-	    for(i = 0; i < (nmembs - 1); i++)
-		HDassert(dt->shared->u.compnd.memb[i].offset < dt->shared->u.compnd.memb[i + 1].offset);
+            /* I never trust a sort :-) -RPM */
+            for (i = 0; i < (nmembs - 1); i++)
+                HDassert(dt->shared->u.compnd.memb[i].offset < dt->shared->u.compnd.memb[i + 1].offset);
 #endif
-	} /* end if */
-    } else if(H5T_ENUM == dt->shared->type) {
-	if(H5T_SORT_VALUE != dt->shared->u.enumer.sorted) {
-	    dt->shared->u.enumer.sorted = H5T_SORT_VALUE;
-	    nmembs = dt->shared->u.enumer.nmembs;
-	    size = dt->shared->size;
-	    HDassert(size <= sizeof(tbuf));
-	    for(i = (nmembs - 1), swapped = TRUE; i > 0 && swapped; --i) {
-		for(j = 0, swapped = FALSE; j < i; j++) {
-		    if(HDmemcmp(dt->shared->u.enumer.value + (j * size), dt->shared->u.enumer.value + ((j + 1) * size), size) > 0) {
-			/* Swap names */
-			char *tmp = dt->shared->u.enumer.name[j];
-			dt->shared->u.enumer.name[j] = dt->shared->u.enumer.name[j + 1];
-			dt->shared->u.enumer.name[j + 1] = tmp;
-
-			/* Swap values */
-			HDmemcpy(tbuf, dt->shared->u.enumer.value + (j * size), size);
-			HDmemcpy(dt->shared->u.enumer.value + (j * size),
-				 dt->shared->u.enumer.value + ((j + 1) * size), size);
-			HDmemcpy(dt->shared->u.enumer.value + ((j + 1) * size), tbuf, size);
-
-			/* Swap map */
-			if(map) {
-			    int x = map[j];
-
-			    map[j] = map[j + 1];
-			    map[j + 1] = x;
-			} /* end if */
-
-			swapped = TRUE;
-		    } /* end if */
-		} /* end for */
-	    } /* end for */
+        } /* end if */
+    }
+    else if (H5T_ENUM == dt->shared->type) {
+        if (H5T_SORT_VALUE != dt->shared->u.enumer.sorted) {
+            dt->shared->u.enumer.sorted = H5T_SORT_VALUE;
+            nmembs                      = dt->shared->u.enumer.nmembs;
+            size                        = dt->shared->size;
+            HDassert(size <= sizeof(tbuf));
+            for (i = (nmembs - 1), swapped = TRUE; i > 0 && swapped; --i) {
+                for (j = 0, swapped = FALSE; j < i; j++) {
+                    if (HDmemcmp(dt->shared->u.enumer.value + (j * size),
+                                 dt->shared->u.enumer.value + ((j + 1) * size), size) > 0) {
+                        /* Swap names */
+                        char *tmp                        = dt->shared->u.enumer.name[j];
+                        dt->shared->u.enumer.name[j]     = dt->shared->u.enumer.name[j + 1];
+                        dt->shared->u.enumer.name[j + 1] = tmp;
+
+                        /* Swap values */
+                        HDmemcpy(tbuf, dt->shared->u.enumer.value + (j * size), size);
+                        HDmemcpy(dt->shared->u.enumer.value + (j * size),
+                                 dt->shared->u.enumer.value + ((j + 1) * size), size);
+                        HDmemcpy(dt->shared->u.enumer.value + ((j + 1) * size), tbuf, size);
+
+                        /* Swap map */
+                        if (map) {
+                            int x = map[j];
+
+                            map[j]     = map[j + 1];
+                            map[j + 1] = x;
+                        } /* end if */
+
+                        swapped = TRUE;
+                    } /* end if */
+                }     /* end for */
+            }         /* end for */
 #ifndef NDEBUG
-	    /* I never trust a sort :-) -RPM */
-	    for(i = 0; i < (nmembs - 1); i++)
-		HDassert(HDmemcmp(dt->shared->u.enumer.value + (i * size), dt->shared->u.enumer.value + ((i + 1) * size), size) < 0);
+            /* I never trust a sort :-) -RPM */
+            for (i = 0; i < (nmembs - 1); i++)
+                HDassert(HDmemcmp(dt->shared->u.enumer.value + (i * size),
+                                  dt->shared->u.enumer.value + ((i + 1) * size), size) < 0);
 #endif
-	} /* end if */
-    } /* end else */
+        } /* end if */
+    }     /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__sort_value() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__sort_name
  *
@@ -426,86 +420,85 @@ H5T__sort_value(const H5T_t *dt, int *map)
 herr_t
 H5T__sort_name(const H5T_t *dt, int *map)
 {
-    unsigned	i, j, nmembs;
-    size_t	size;
-    hbool_t	swapped;
-    uint8_t	tbuf[32];
+    unsigned i, j, nmembs;
+    size_t   size;
+    hbool_t  swapped;
+    uint8_t  tbuf[32];
 
     FUNC_ENTER_PACKAGE_NOERR
 
     /* Check args */
     HDassert(dt);
-    HDassert(H5T_COMPOUND==dt->shared->type || H5T_ENUM==dt->shared->type);
+    HDassert(H5T_COMPOUND == dt->shared->type || H5T_ENUM == dt->shared->type);
 
     /* Use a bubble sort because we can short circuit */
-    if (H5T_COMPOUND==dt->shared->type) {
-	if (H5T_SORT_NAME!=dt->shared->u.compnd.sorted) {
-	    dt->shared->u.compnd.sorted = H5T_SORT_NAME;
-	    nmembs = dt->shared->u.compnd.nmembs;
-	    for (i=nmembs-1, swapped=TRUE; i>0 && swapped; --i) {
-		for (j=0, swapped=FALSE; j<i; j++) {
-		    if (HDstrcmp(dt->shared->u.compnd.memb[j].name,
-				 dt->shared->u.compnd.memb[j+1].name)>0) {
-			H5T_cmemb_t tmp = dt->shared->u.compnd.memb[j];
-			dt->shared->u.compnd.memb[j] = dt->shared->u.compnd.memb[j+1];
-			dt->shared->u.compnd.memb[j+1] = tmp;
-			swapped = TRUE;
-			if (map) {
-			    int x = map[j];
-			    map[j] = map[j+1];
-			    map[j+1] = x;
-			}
-		    }
-		}
-	    }
+    if (H5T_COMPOUND == dt->shared->type) {
+        if (H5T_SORT_NAME != dt->shared->u.compnd.sorted) {
+            dt->shared->u.compnd.sorted = H5T_SORT_NAME;
+            nmembs                      = dt->shared->u.compnd.nmembs;
+            for (i = nmembs - 1, swapped = TRUE; i > 0 && swapped; --i) {
+                for (j = 0, swapped = FALSE; j < i; j++) {
+                    if (HDstrcmp(dt->shared->u.compnd.memb[j].name, dt->shared->u.compnd.memb[j + 1].name) >
+                        0) {
+                        H5T_cmemb_t tmp                  = dt->shared->u.compnd.memb[j];
+                        dt->shared->u.compnd.memb[j]     = dt->shared->u.compnd.memb[j + 1];
+                        dt->shared->u.compnd.memb[j + 1] = tmp;
+                        swapped                          = TRUE;
+                        if (map) {
+                            int x      = map[j];
+                            map[j]     = map[j + 1];
+                            map[j + 1] = x;
+                        }
+                    }
+                }
+            }
 #ifndef NDEBUG
-	    /* I never trust a sort :-) -RPM */
-	    for (i=0; i<nmembs-1; i++) {
-		HDassert(HDstrcmp(dt->shared->u.compnd.memb[i].name,
-				dt->shared->u.compnd.memb[i+1].name)<0);
-	    }
+            /* I never trust a sort :-) -RPM */
+            for (i = 0; i < nmembs - 1; i++) {
+                HDassert(HDstrcmp(dt->shared->u.compnd.memb[i].name, dt->shared->u.compnd.memb[i + 1].name) <
+                         0);
+            }
 #endif
-	}
-    } else if (H5T_ENUM==dt->shared->type) {
-	if (H5T_SORT_NAME!=dt->shared->u.enumer.sorted) {
-	    dt->shared->u.enumer.sorted = H5T_SORT_NAME;
-	    nmembs = dt->shared->u.enumer.nmembs;
-	    size = dt->shared->size;
-	    HDassert(size<=sizeof(tbuf));
-	    for (i=nmembs-1, swapped=TRUE; i>0 && swapped; --i) {
-		for (j=0, swapped=FALSE; j<i; j++) {
-		    if (HDstrcmp(dt->shared->u.enumer.name[j],
-				 dt->shared->u.enumer.name[j+1])>0) {
-			/* Swap names */
-			char *tmp = dt->shared->u.enumer.name[j];
-			dt->shared->u.enumer.name[j] = dt->shared->u.enumer.name[j+1];
-			dt->shared->u.enumer.name[j+1] = tmp;
-
-			/* Swap values */
-			HDmemcpy(tbuf, dt->shared->u.enumer.value+j*size, size);
-			HDmemcpy(dt->shared->u.enumer.value+j*size,
-				 dt->shared->u.enumer.value+(j+1)*size, size);
-			HDmemcpy(dt->shared->u.enumer.value+(j+1)*size, tbuf, size);
-
-			/* Swap map */
-			if (map) {
-			    int x = map[j];
-			    map[j] = map[j+1];
-			    map[j+1] = x;
-			}
-
-			swapped = TRUE;
-		    }
-		}
-	    }
+        }
+    }
+    else if (H5T_ENUM == dt->shared->type) {
+        if (H5T_SORT_NAME != dt->shared->u.enumer.sorted) {
+            dt->shared->u.enumer.sorted = H5T_SORT_NAME;
+            nmembs                      = dt->shared->u.enumer.nmembs;
+            size                        = dt->shared->size;
+            HDassert(size <= sizeof(tbuf));
+            for (i = nmembs - 1, swapped = TRUE; i > 0 && swapped; --i) {
+                for (j = 0, swapped = FALSE; j < i; j++) {
+                    if (HDstrcmp(dt->shared->u.enumer.name[j], dt->shared->u.enumer.name[j + 1]) > 0) {
+                        /* Swap names */
+                        char *tmp                        = dt->shared->u.enumer.name[j];
+                        dt->shared->u.enumer.name[j]     = dt->shared->u.enumer.name[j + 1];
+                        dt->shared->u.enumer.name[j + 1] = tmp;
+
+                        /* Swap values */
+                        HDmemcpy(tbuf, dt->shared->u.enumer.value + j * size, size);
+                        HDmemcpy(dt->shared->u.enumer.value + j * size,
+                                 dt->shared->u.enumer.value + (j + 1) * size, size);
+                        HDmemcpy(dt->shared->u.enumer.value + (j + 1) * size, tbuf, size);
+
+                        /* Swap map */
+                        if (map) {
+                            int x      = map[j];
+                            map[j]     = map[j + 1];
+                            map[j + 1] = x;
+                        }
+
+                        swapped = TRUE;
+                    }
+                }
+            }
 #ifndef NDEBUG
-	    /* I never trust a sort :-) -RPM */
-	    for (i=0; i<nmembs-1; i++)
-		HDassert(HDstrcmp(dt->shared->u.enumer.name[i], dt->shared->u.enumer.name[i+1])<0);
+            /* I never trust a sort :-) -RPM */
+            for (i = 0; i < nmembs - 1; i++)
+                HDassert(HDstrcmp(dt->shared->u.enumer.name[i], dt->shared->u.enumer.name[i + 1]) < 0);
 #endif
-	}
+        }
     }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
-
diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c
index 9d71e64..3d6e448 100644
--- a/src/H5Tfixed.c
+++ b/src/H5Tfixed.c
@@ -16,18 +16,16 @@
  *      integer) datatypes in the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_fixed_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_fixed_interface
 
+#include "H5private.h"  /*generic functions			  */
+#include "H5Eprivate.h" /*error handling			  */
+#include "H5Iprivate.h" /*ID functions		   		  */
+#include "H5Tpkg.h"     /*data-type functions			  */
 
-#include "H5private.h"		/*generic functions			  */
-#include "H5Eprivate.h"		/*error handling			  */
-#include "H5Iprivate.h"		/*ID functions		   		  */
-#include "H5Tpkg.h"		/*data-type functions			  */
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_fixed_interface -- Initialize interface-specific information
@@ -49,7 +47,6 @@ H5T_init_fixed_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_fixed_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_sign
  *
@@ -70,15 +67,15 @@ H5T_init_fixed_interface(void)
 H5T_sign_t
 H5Tget_sign(hid_t type_id)
 {
-    H5T_t		*dt = NULL;
-    H5T_sign_t		ret_value;
+    H5T_t *    dt = NULL;
+    H5T_sign_t ret_value;
 
     FUNC_ENTER_API(H5T_SGN_ERROR)
     H5TRACE1("Ts", "i", type_id);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_SGN_ERROR, "not an integer datatype")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_SGN_ERROR, "not an integer datatype")
 
     ret_value = H5T_get_sign(dt);
 
@@ -86,7 +83,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_get_sign
  *
@@ -107,19 +103,19 @@ done:
 H5T_sign_t
 H5T_get_sign(H5T_t const *dt)
 {
-    H5T_sign_t		ret_value;
+    H5T_sign_t ret_value;
 
     FUNC_ENTER_NOAPI(H5T_SGN_ERROR)
 
     HDassert(dt);
 
     /* Defer to parent */
-    while(dt->shared->parent)
+    while (dt->shared->parent)
         dt = dt->shared->parent;
 
     /* Check args */
-    if (H5T_INTEGER!=dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5T_SGN_ERROR, "operation not defined for datatype class")
+    if (H5T_INTEGER != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5T_SGN_ERROR, "operation not defined for datatype class")
 
     /* Sign */
     ret_value = dt->shared->u.atomic.u.i.sign;
@@ -128,8 +124,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_sign
  *
@@ -149,25 +143,25 @@ done:
 herr_t
 H5Tset_sign(hid_t type_id, H5T_sign_t sign)
 {
-    H5T_t	*dt = NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iTs", type_id, sign);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an integer datatype")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "datatype is read-only")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an integer datatype")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "datatype is read-only")
     if (sign < H5T_SGN_NONE || sign >= H5T_NSGN)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal sign type")
-    if (H5T_ENUM==dt->shared->type && dt->shared->u.enumer.nmembs>0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal sign type")
+    if (H5T_ENUM == dt->shared->type && dt->shared->u.enumer.nmembs > 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
     while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if (H5T_INTEGER!=dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not defined for datatype class")
+    if (H5T_INTEGER != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not defined for datatype class")
 
     /* Commit */
     dt->shared->u.atomic.u.i.sign = sign;
@@ -175,4 +169,3 @@ H5Tset_sign(hid_t type_id, H5T_sign_t sign)
 done:
     FUNC_LEAVE_API(ret_value)
 }
-
diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c
index ef51251..cb470c3 100644
--- a/src/H5Tfloat.c
+++ b/src/H5Tfloat.c
@@ -16,18 +16,16 @@
  *      datatypes in the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_float_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_float_interface
 
+#include "H5private.h"  /*generic functions			  */
+#include "H5Eprivate.h" /*error handling			  */
+#include "H5Iprivate.h" /*ID functions		   		  */
+#include "H5Tpkg.h"     /*data-type functions			  */
 
-#include "H5private.h"		/*generic functions			  */
-#include "H5Eprivate.h"		/*error handling			  */
-#include "H5Iprivate.h"		/*ID functions		   		  */
-#include "H5Tpkg.h"		/*data-type functions			  */
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_float_interface -- Initialize interface-specific information
@@ -49,7 +47,6 @@ H5T_init_float_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_float_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_fields
  *
@@ -71,40 +68,39 @@ H5T_init_float_interface(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tget_fields(hid_t type_id, size_t *spos/*out*/, size_t *epos/*out*/,
-size_t *esize/*out*/, size_t *mpos/*out*/, size_t *msize/*out*/)
+H5Tget_fields(hid_t type_id, size_t *spos /*out*/, size_t *epos /*out*/, size_t *esize /*out*/,
+              size_t *mpos /*out*/, size_t *msize /*out*/)
 {
-    H5T_t	*dt;                    /* Datatype */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "ixxxxx", type_id, spos, epos, esize, mpos, msize);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    while(dt->shared->parent)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if(H5T_FLOAT != dt->shared->type)
+    if (H5T_FLOAT != dt->shared->type)
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
 
     /* Get values */
-    if(spos)
+    if (spos)
         *spos = dt->shared->u.atomic.u.f.sign;
-    if(epos)
+    if (epos)
         *epos = dt->shared->u.atomic.u.f.epos;
-    if(esize)
+    if (esize)
         *esize = dt->shared->u.atomic.u.f.esize;
-    if(mpos)
+    if (mpos)
         *mpos = dt->shared->u.atomic.u.f.mpos;
-    if(msize)
+    if (msize)
         *msize = dt->shared->u.atomic.u.f.msize;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_fields() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_fields
  *
@@ -124,43 +120,42 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize,
-    size_t mpos, size_t msize)
+H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize)
 {
-    H5T_t	*dt;                    /* Datatype */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "izzzzz", type_id, spos, epos, esize, mpos, msize);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_STATE_TRANSIENT != dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
-    while(dt->shared->parent)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
+    while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if(H5T_FLOAT != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
-    if(epos + esize > dt->shared->u.atomic.prec)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "exponent bit field size/location is invalid")
-    if(mpos + msize > dt->shared->u.atomic.prec)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "mantissa bit field size/location is invalid")
-    if(spos >= dt->shared->u.atomic.prec)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "sign location is not valid")
+    if (H5T_FLOAT != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
+    if (epos + esize > dt->shared->u.atomic.prec)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "exponent bit field size/location is invalid")
+    if (mpos + msize > dt->shared->u.atomic.prec)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "mantissa bit field size/location is invalid")
+    if (spos >= dt->shared->u.atomic.prec)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "sign location is not valid")
 
     /* Check for overlap */
-    if(spos >= epos && spos < epos + esize)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "sign bit appears within exponent field")
-    if(spos >= mpos && spos < mpos + msize)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "sign bit appears within mantissa field")
-    if((mpos < epos && mpos + msize > epos) || (epos < mpos && epos + esize > mpos))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "exponent and mantissa fields overlap")
+    if (spos >= epos && spos < epos + esize)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "sign bit appears within exponent field")
+    if (spos >= mpos && spos < mpos + msize)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "sign bit appears within mantissa field")
+    if ((mpos < epos && mpos + msize > epos) || (epos < mpos && epos + esize > mpos))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "exponent and mantissa fields overlap")
 
     /* Commit */
-    dt->shared->u.atomic.u.f.sign = spos;
-    dt->shared->u.atomic.u.f.epos = epos;
-    dt->shared->u.atomic.u.f.mpos = mpos;
+    dt->shared->u.atomic.u.f.sign  = spos;
+    dt->shared->u.atomic.u.f.epos  = epos;
+    dt->shared->u.atomic.u.f.mpos  = mpos;
     dt->shared->u.atomic.u.f.esize = esize;
     dt->shared->u.atomic.u.f.msize = msize;
 
@@ -168,7 +163,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tset_fields() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_ebias
  *
@@ -186,19 +180,19 @@ done:
 size_t
 H5Tget_ebias(hid_t type_id)
 {
-    H5T_t	*dt;                    /* Datatype */
-    size_t	ret_value;              /* Return value */
+    H5T_t *dt;        /* Datatype */
+    size_t ret_value; /* Return value */
 
     FUNC_ENTER_API(0)
     H5TRACE1("z", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype")
-    while(dt->shared->parent)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype")
+    while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if(H5T_FLOAT != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, 0, "operation not defined for datatype class")
+    if (H5T_FLOAT != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, 0, "operation not defined for datatype class")
 
     /* bias */
     H5_CHECKED_ASSIGN(ret_value, size_t, dt->shared->u.atomic.u.f.ebias, uint64_t);
@@ -207,7 +201,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_ebias() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_ebias
  *
@@ -227,21 +220,21 @@ done:
 herr_t
 H5Tset_ebias(hid_t type_id, size_t ebias)
 {
-    H5T_t	*dt;                    /* Datatype */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", type_id, ebias);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_STATE_TRANSIENT != dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
-    while(dt->shared->parent)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
+    while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if(H5T_FLOAT != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
+    if (H5T_FLOAT != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
 
     /* Commit */
     dt->shared->u.atomic.u.f.ebias = ebias;
@@ -250,7 +243,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tset_ebias() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_norm
  *
@@ -269,19 +261,19 @@ done:
 H5T_norm_t
 H5Tget_norm(hid_t type_id)
 {
-    H5T_t	*dt;            /* Datatype */
-    H5T_norm_t	ret_value;      /* Return value */
+    H5T_t *    dt;        /* Datatype */
+    H5T_norm_t ret_value; /* Return value */
 
     FUNC_ENTER_API(H5T_NORM_ERROR)
     H5TRACE1("Tn", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NORM_ERROR, "not a datatype")
-    while(dt->shared->parent)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NORM_ERROR, "not a datatype")
+    while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if(H5T_FLOAT != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5T_NORM_ERROR, "operation not defined for datatype class")
+    if (H5T_FLOAT != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5T_NORM_ERROR, "operation not defined for datatype class")
 
     /* norm */
     ret_value = dt->shared->u.atomic.u.f.norm;
@@ -290,7 +282,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_norm() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_norm
  *
@@ -307,23 +298,23 @@ done:
 herr_t
 H5Tset_norm(hid_t type_id, H5T_norm_t norm)
 {
-    H5T_t	*dt;                    /* Datatype */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iTn", type_id, norm);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_STATE_TRANSIENT != dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
-    if(norm < H5T_NORM_IMPLIED || norm > H5T_NORM_NONE)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal normalization")
-    while(dt->shared->parent)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
+    if (norm < H5T_NORM_IMPLIED || norm > H5T_NORM_NONE)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal normalization")
+    while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if(H5T_FLOAT != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
+    if (H5T_FLOAT != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
 
     /* Commit */
     dt->shared->u.atomic.u.f.norm = norm;
@@ -332,7 +323,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tset_norm() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_inpad
  *
@@ -353,19 +343,19 @@ done:
 H5T_pad_t
 H5Tget_inpad(hid_t type_id)
 {
-    H5T_t	*dt;            /* Datatype */
-    H5T_pad_t	ret_value;      /* Return value */
+    H5T_t *   dt;        /* Datatype */
+    H5T_pad_t ret_value; /* Return value */
 
     FUNC_ENTER_API(H5T_PAD_ERROR)
     H5TRACE1("Tp", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_PAD_ERROR, "not a datatype")
-    while(dt->shared->parent)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_PAD_ERROR, "not a datatype")
+    while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if(H5T_FLOAT != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5T_PAD_ERROR, "operation not defined for datatype class")
+    if (H5T_FLOAT != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5T_PAD_ERROR, "operation not defined for datatype class")
 
     /* pad */
     ret_value = dt->shared->u.atomic.u.f.pad;
@@ -374,7 +364,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_inpad() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_inpad
  *
@@ -393,23 +382,23 @@ done:
 herr_t
 H5Tset_inpad(hid_t type_id, H5T_pad_t pad)
 {
-    H5T_t	*dt;                    /* Datatype */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iTp", type_id, pad);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_STATE_TRANSIENT != dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
-    if(pad < H5T_PAD_ZERO || pad >= H5T_NPAD)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal internal pad type")
-    while(dt->shared->parent)
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
+    if (pad < H5T_PAD_ZERO || pad >= H5T_NPAD)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal internal pad type")
+    while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if(H5T_FLOAT != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
+    if (H5T_FLOAT != dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "operation not defined for datatype class")
 
     /* Commit */
     dt->shared->u.atomic.u.f.pad = pad;
@@ -417,4 +406,3 @@ H5Tset_inpad(hid_t type_id, H5T_pad_t pad)
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tset_inpad() */
-
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index 19b25d1..9a53557 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -16,31 +16,29 @@
  *      a "native" datatype for the H5T interface.
  */
 
-#define H5T_PACKAGE        /*suppress error about including H5Tpkg      */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg      */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5T_init_native_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_native_interface
 
-
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5Pprivate.h"        /* Property lists            */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Tpkg.h"        /* Datatypes                */
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5Pprivate.h"  /* Property lists            */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Tpkg.h"      /* Datatypes                */
 
 /* Static local functions */
-static H5T_t *H5T_get_native_type(H5T_t *dt, H5T_direction_t direction,
-                                  size_t *struct_align, size_t *offset, size_t *comp_size);
+static H5T_t *H5T_get_native_type(H5T_t *dt, H5T_direction_t direction, size_t *struct_align, size_t *offset,
+                                  size_t *comp_size);
 static H5T_t *H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
                                      size_t *struct_align, size_t *offset, size_t *comp_size);
-static H5T_t *H5T_get_native_float(size_t size, H5T_direction_t direction,
-                                   size_t *struct_align, size_t *offset, size_t *comp_size);
-static H5T_t* H5T_get_native_bitfield(size_t prec, H5T_direction_t direction,
-                                   size_t *struct_align, size_t *offset, size_t *comp_size);
-static herr_t H5T_cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size,
-                         size_t nelems, size_t align, size_t *struct_align);
-
+static H5T_t *H5T_get_native_float(size_t size, H5T_direction_t direction, size_t *struct_align,
+                                   size_t *offset, size_t *comp_size);
+static H5T_t *H5T_get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_align,
+                                      size_t *offset, size_t *comp_size);
+static herr_t H5T_cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size, size_t nelems, size_t align,
+                             size_t *struct_align);
 
 /*--------------------------------------------------------------------------
 NAME
@@ -63,7 +61,6 @@ H5T_init_native_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_native_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tget_native_type
  *
@@ -97,40 +94,38 @@ H5T_init_native_interface(void)
 hid_t
 H5Tget_native_type(hid_t type_id, H5T_direction_t direction)
 {
-    H5T_t       *dt;                /* Datatype to create native datatype from */
-    H5T_t       *new_dt=NULL;       /* Datatype for native datatype created */
-    size_t      comp_size=0;        /* Compound datatype's size */
-    hid_t       ret_value;          /* Return value */
+    H5T_t *dt;               /* Datatype to create native datatype from */
+    H5T_t *new_dt    = NULL; /* Datatype for native datatype created */
+    size_t comp_size = 0;    /* Compound datatype's size */
+    hid_t  ret_value;        /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "iTd", type_id, direction);
 
     /* check argument */
-    if(NULL==(dt=(H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
 
-    if(direction!=H5T_DIR_DEFAULT && direction!=H5T_DIR_ASCEND
-            && direction!=H5T_DIR_DESCEND)
+    if (direction != H5T_DIR_DEFAULT && direction != H5T_DIR_ASCEND && direction != H5T_DIR_DESCEND)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not valid direction value")
 
-    if((new_dt = H5T_get_native_type(dt, direction, NULL, NULL, &comp_size))==NULL)
+    if ((new_dt = H5T_get_native_type(dt, direction, NULL, NULL, &comp_size)) == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "cannot retrieve native type")
 
-    if((ret_value=H5I_register(H5I_DATATYPE, new_dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, new_dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type")
 
 done:
     /* Error cleanup */
-    if(ret_value<0) {
-        if(new_dt)
-            if(H5T_close(new_dt)<0)
+    if (ret_value < 0) {
+        if (new_dt)
+            if (H5T_close(new_dt) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release datatype")
     } /* end if */
 
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_get_native_type
  *
@@ -146,71 +141,75 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5T_t *
-H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_align, size_t *offset, size_t *comp_size)
+H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_align, size_t *offset,
+                    size_t *comp_size)
 {
-    H5T_t       *dt;                /* Datatype to make native */
-    H5T_t       *super_type;        /* Super type of VL, array and enum datatypes */
-    H5T_t       *nat_super_type;    /* Native form of VL, array & enum super datatype */
-    H5T_t       *new_type = NULL;   /* New native datatype */
-    H5T_t       *memb_type = NULL;  /* Datatype of member */
-    H5T_t       **memb_list = NULL; /* List of compound member IDs */
-    size_t      *memb_offset = NULL; /* List of member offsets in compound type, including member size and alignment */
-    char        **comp_mname = NULL; /* List of member names in compound type */
-    char        *memb_name = NULL;  /* Enum's member name */
-    void        *memb_value = NULL; /* Enum's member value */
-    void        *tmp_memb_value = NULL; /* Enum's member value */
-    hsize_t     *dims = NULL;       /* Dimension sizes for array */
-    H5T_class_t h5_class;           /* Class of datatype to make native */
-    size_t      size;               /* Size of datatype to make native */
-    size_t      prec;               /* Precision of datatype to make native */
-    int         snmemb;             /* Number of members in compound & enum types */
-    unsigned    nmemb = 0;          /* Number of members in compound & enum types */
-    unsigned    u;                  /* Local index variable */
-    H5T_t       *ret_value;         /* Return value */
+    H5T_t * dt;               /* Datatype to make native */
+    H5T_t * super_type;       /* Super type of VL, array and enum datatypes */
+    H5T_t * nat_super_type;   /* Native form of VL, array & enum super datatype */
+    H5T_t * new_type  = NULL; /* New native datatype */
+    H5T_t * memb_type = NULL; /* Datatype of member */
+    H5T_t **memb_list = NULL; /* List of compound member IDs */
+    size_t *memb_offset =
+        NULL; /* List of member offsets in compound type, including member size and alignment */
+    char **     comp_mname     = NULL; /* List of member names in compound type */
+    char *      memb_name      = NULL; /* Enum's member name */
+    void *      memb_value     = NULL; /* Enum's member value */
+    void *      tmp_memb_value = NULL; /* Enum's member value */
+    hsize_t *   dims           = NULL; /* Dimension sizes for array */
+    H5T_class_t h5_class;              /* Class of datatype to make native */
+    size_t      size;                  /* Size of datatype to make native */
+    size_t      prec;                  /* Precision of datatype to make native */
+    int         snmemb;                /* Number of members in compound & enum types */
+    unsigned    nmemb = 0;             /* Number of members in compound & enum types */
+    unsigned    u;                     /* Local index variable */
+    H5T_t *     ret_value;             /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(dtype);
 
-    if(H5T_NO_CLASS == (h5_class = H5T_get_class(dtype, FALSE)))
+    if (H5T_NO_CLASS == (h5_class = H5T_get_class(dtype, FALSE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid class")
 
-    if(0 == (size =  H5T_get_size(dtype)))
+    if (0 == (size = H5T_get_size(dtype)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid size")
 
-    switch(h5_class) {
-        case H5T_INTEGER:
-            {
-                H5T_sign_t  sign;       /* Signedness of integer type */
+    switch (h5_class) {
+        case H5T_INTEGER: {
+            H5T_sign_t sign; /* Signedness of integer type */
 
-                if(H5T_SGN_ERROR == (sign =  H5T_get_sign(dtype)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid signess")
+            if (H5T_SGN_ERROR == (sign = H5T_get_sign(dtype)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid signess")
 
-                prec =  dtype->shared->u.atomic.prec;
+            prec = dtype->shared->u.atomic.prec;
 
-                if(NULL == (ret_value = H5T_get_native_integer(prec, sign, direction, struct_align, offset, comp_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer type")
-            } /* end case */
-            break;
+            if (NULL ==
+                (ret_value = H5T_get_native_integer(prec, sign, direction, struct_align, offset, comp_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer type")
+        } /* end case */
+        break;
 
         case H5T_FLOAT:
-            if(NULL == (ret_value = H5T_get_native_float(size, direction, struct_align, offset, comp_size)))
+            if (NULL == (ret_value = H5T_get_native_float(size, direction, struct_align, offset, comp_size)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
             break;
 
         case H5T_STRING:
-            if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
+            if (NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
-            if(H5T_IS_VL_STRING(dtype->shared)) {
+            if (H5T_IS_VL_STRING(dtype->shared)) {
                 /* Update size, offset and compound alignment for parent. */
-                if(H5T_cmp_offset(comp_size, offset, sizeof(char *), (size_t)1, H5T_POINTER_COMP_ALIGN_g, struct_align) < 0)
+                if (H5T_cmp_offset(comp_size, offset, sizeof(char *), (size_t)1, H5T_POINTER_COMP_ALIGN_g,
+                                   struct_align) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
             } /* end if */
             else {
                 /* Update size, offset and compound alignment for parent. */
-                if(H5T_cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g, struct_align) < 0)
+                if (H5T_cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g,
+                                   struct_align) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
             } /* end else */
             break;
@@ -220,286 +219,290 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
         case H5T_TIME:
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "time type is not supported yet")
 
-        case H5T_BITFIELD:
-            {
-                prec =  dtype->shared->u.atomic.prec;
+        case H5T_BITFIELD: {
+            prec = dtype->shared->u.atomic.prec;
 
-                if(NULL == (ret_value = H5T_get_native_bitfield(prec, direction, struct_align, offset, comp_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer for bitfield type")
-            } /* end case */
-            break;
+            if (NULL ==
+                (ret_value = H5T_get_native_bitfield(prec, direction, struct_align, offset, comp_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer for bitfield type")
+        } /* end case */
+        break;
 
         case H5T_OPAQUE:
-            if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
-                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
+            if (NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
             /* Update size, offset and compound alignment for parent. */
-            if(H5T_cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g, struct_align) < 0)
+            if (H5T_cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g,
+                               struct_align) < 0)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
             break;
 
-        case H5T_REFERENCE:
-            {
-                size_t align;
-                size_t ref_size;
-                int    not_equal;
+        case H5T_REFERENCE: {
+            size_t align;
+            size_t ref_size;
+            int    not_equal;
 
-                if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
+            if (NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
-                /* Decide if the data type is object or dataset region reference. */
-                if(NULL == (dt = (H5T_t *)H5I_object(H5T_STD_REF_OBJ_g)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
-                not_equal = H5T_cmp(ret_value, dt, FALSE);
+            /* Decide if the data type is object or dataset region reference. */
+            if (NULL == (dt = (H5T_t *)H5I_object(H5T_STD_REF_OBJ_g)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
+            not_equal = H5T_cmp(ret_value, dt, FALSE);
 
-                /* Update size, offset and compound alignment for parent. */
-                if(!not_equal) {
-                    align = H5T_HOBJREF_COMP_ALIGN_g;
-                    ref_size = sizeof(hobj_ref_t);
-                } /* end if */
-                else {
-                    align = H5T_HDSETREGREF_COMP_ALIGN_g;
-                    ref_size = sizeof(hdset_reg_ref_t);
-                } /* end else */
-
-                if(H5T_cmp_offset(comp_size, offset, ref_size, (size_t)1, align, struct_align) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
-            } /* end case */
-            break;
+            /* Update size, offset and compound alignment for parent. */
+            if (!not_equal) {
+                align    = H5T_HOBJREF_COMP_ALIGN_g;
+                ref_size = sizeof(hobj_ref_t);
+            } /* end if */
+            else {
+                align    = H5T_HDSETREGREF_COMP_ALIGN_g;
+                ref_size = sizeof(hdset_reg_ref_t);
+            } /* end else */
 
-        case H5T_COMPOUND:
-            {
-                size_t      children_size = 0;/* Total size of compound members */
-                size_t      children_st_align = 0;    /* The max alignment among compound members.  This'll be the compound alignment */
-
-                if((snmemb = H5T_get_nmembers(dtype)) <= 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "compound data type doesn't have any member")
-                H5_CHECKED_ASSIGN(nmemb, unsigned, snmemb, int);
-
-                if(NULL == (memb_list   = (H5T_t **)H5MM_calloc(nmemb * sizeof(H5T_t *))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if(NULL == (memb_offset = (size_t *)H5MM_calloc(nmemb * sizeof(size_t))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if(NULL == (comp_mname = (char **)H5MM_calloc(nmemb * sizeof(char *))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-
-                /* Construct child compound type and retrieve a list of their IDs, offsets, total size, and alignment for compound type. */
-                for(u = 0; u < nmemb; u++) {
-                    if(NULL == (memb_type = H5T_get_member_type(dtype, u, H5T_COPY_TRANSIENT)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
-
-                    if(NULL == (comp_mname[u] = H5T__get_member_name(dtype, u)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
-
-                    if(NULL == (memb_list[u] = H5T_get_native_type(memb_type, direction, &children_st_align, &(memb_offset[u]), &children_size)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member identifier retrieval failed")
-
-                    if(H5T_close(memb_type) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
-                } /* end for */
-
-                /* The alignment for whole compound type */
-                if(children_st_align && children_size % children_st_align)
-                    children_size += children_st_align - (children_size % children_st_align);
-
-                /* Construct new compound type based on native type */
-                if(NULL == (new_type = H5T__create(H5T_COMPOUND, children_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot create a compound type")
-
-                /* Insert members for the new compound type */
-                for(u = 0; u < nmemb; u++)
-                    if(H5T__insert(new_type, comp_mname[u], memb_offset[u], memb_list[u]) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member to compound datatype")
-
-                /* Update size, offset and compound alignment for parent in the case of
-                 * nested compound type.  The alignment for a compound type as one field in
-                 * a compound type is the biggest compound alignment among all its members.
-                 * e.g. in the structure
-                 *    typedef struct s1 {
-                 *        char            c;
-                 *        int             i;
-                 *        s2              st;
-                 *        unsigned long long       l;
-                 *    } s1;
-                 *    typedef struct s2 {
-                 *        short           c2;
-                 *        long            l2;
-                 *        long long       ll2;
-                 *    } s2;
-                 * The alignment for ST in S1 is the biggest structure alignment of all the
-                 * members of S2, which is probably the LL2 of 'long long'. -SLU 2010/4/28
-                 */
-                if(H5T_cmp_offset(comp_size, offset, children_size, (size_t)1, children_st_align,
-                                  struct_align) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+            if (H5T_cmp_offset(comp_size, offset, ref_size, (size_t)1, align, struct_align) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+        } /* end case */
+        break;
+
+        case H5T_COMPOUND: {
+            size_t children_size = 0; /* Total size of compound members */
+            size_t children_st_align =
+                0; /* The max alignment among compound members.  This'll be the compound alignment */
+
+            if ((snmemb = H5T_get_nmembers(dtype)) <= 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "compound data type doesn't have any member")
+            H5_CHECKED_ASSIGN(nmemb, unsigned, snmemb, int);
+
+            if (NULL == (memb_list = (H5T_t **)H5MM_calloc(nmemb * sizeof(H5T_t *))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+            if (NULL == (memb_offset = (size_t *)H5MM_calloc(nmemb * sizeof(size_t))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+            if (NULL == (comp_mname = (char **)H5MM_calloc(nmemb * sizeof(char *))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+
+            /* Construct child compound type and retrieve a list of their IDs, offsets, total size, and
+             * alignment for compound type. */
+            for (u = 0; u < nmemb; u++) {
+                if (NULL == (memb_type = H5T_get_member_type(dtype, u, H5T_COPY_TRANSIENT)))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
+
+                if (NULL == (comp_mname[u] = H5T__get_member_name(dtype, u)))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
+
+                if (NULL == (memb_list[u] = H5T_get_native_type(memb_type, direction, &children_st_align,
+                                                                &(memb_offset[u]), &children_size)))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member identifier retrieval failed")
+
+                if (H5T_close(memb_type) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+            } /* end for */
+
+            /* The alignment for whole compound type */
+            if (children_st_align && children_size % children_st_align)
+                children_size += children_st_align - (children_size % children_st_align);
+
+            /* Construct new compound type based on native type */
+            if (NULL == (new_type = H5T__create(H5T_COMPOUND, children_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot create a compound type")
+
+            /* Insert members for the new compound type */
+            for (u = 0; u < nmemb; u++)
+                if (H5T__insert(new_type, comp_mname[u], memb_offset[u], memb_list[u]) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member to compound datatype")
+
+            /* Update size, offset and compound alignment for parent in the case of
+             * nested compound type.  The alignment for a compound type as one field in
+             * a compound type is the biggest compound alignment among all its members.
+             * e.g. in the structure
+             *    typedef struct s1 {
+             *        char            c;
+             *        int             i;
+             *        s2              st;
+             *        unsigned long long       l;
+             *    } s1;
+             *    typedef struct s2 {
+             *        short           c2;
+             *        long            l2;
+             *        long long       ll2;
+             *    } s2;
+             * The alignment for ST in S1 is the biggest structure alignment of all the
+             * members of S2, which is probably the LL2 of 'long long'. -SLU 2010/4/28
+             */
+            if (H5T_cmp_offset(comp_size, offset, children_size, (size_t)1, children_st_align, struct_align) <
+                0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
-                /* Close member data type */
-                for(u = 0; u < nmemb; u++) {
-                    if(H5T_close(memb_list[u]) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+            /* Close member data type */
+            for (u = 0; u < nmemb; u++) {
+                if (H5T_close(memb_list[u]) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
 
-                    /* Free member names in list */
-                    comp_mname[u] = (char *)H5MM_xfree(comp_mname[u]);
-                } /* end for */
+                /* Free member names in list */
+                comp_mname[u] = (char *)H5MM_xfree(comp_mname[u]);
+            } /* end for */
+
+            /* Free lists for members */
+            memb_list   = (H5T_t **)H5MM_xfree(memb_list);
+            memb_offset = (size_t *)H5MM_xfree(memb_offset);
+            comp_mname  = (char **)H5MM_xfree(comp_mname);
+
+            ret_value = new_type;
+        } /* end case */
+        break;
+
+        case H5T_ENUM: {
+            H5T_path_t *tpath; /* Type conversion info    */
+            hid_t       super_type_id, nat_super_type_id;
+
+            /* Don't need to do anything special for alignment, offset since the ENUM type usually is integer.
+             */
+
+            /* Retrieve base type for enumerated type */
+            if (NULL == (super_type = H5T_get_super(dtype)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get base type for enumerate type")
+            if (NULL == (nat_super_type =
+                             H5T_get_native_type(super_type, direction, struct_align, offset, comp_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "base native type retrieval failed")
+
+            if ((super_type_id = H5I_register(H5I_DATATYPE, super_type, FALSE)) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype")
+            if ((nat_super_type_id = H5I_register(H5I_DATATYPE, nat_super_type, FALSE)) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype")
+
+            /* Allocate room for the enum values */
+            if (NULL == (tmp_memb_value = H5MM_calloc(H5T_get_size(super_type))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+            if (NULL == (memb_value = H5MM_calloc(H5T_get_size(nat_super_type))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+
+            /* Construct new enum type based on native type */
+            if (NULL == (new_type = H5T__enum_create(nat_super_type)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create enum type")
+
+            /* Find the conversion function */
+            if (NULL == (tpath = H5T_path_find(super_type, nat_super_type, NULL, NULL, H5P_DEFAULT, FALSE)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
+                            "unable to convert between src and dst data types")
+
+            /* Retrieve member info and insert members into new enum type */
+            if ((snmemb = H5T_get_nmembers(dtype)) <= 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "enumerate data type doesn't have any member")
+            H5_CHECKED_ASSIGN(nmemb, unsigned, snmemb, int);
+            for (u = 0; u < nmemb; u++) {
+                if (NULL == (memb_name = H5T__get_member_name(dtype, u)))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member name")
+                if (H5T__get_member_value(dtype, u, tmp_memb_value) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
+                HDmemcpy(memb_value, tmp_memb_value, H5T_get_size(super_type));
+
+                if (H5T_convert(tpath, super_type_id, nat_super_type_id, (size_t)1, (size_t)0, (size_t)0,
+                                memb_value, NULL, H5P_DATASET_XFER_DEFAULT) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
+
+                if (H5T__enum_insert(new_type, memb_name, memb_value) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member")
+                memb_name = (char *)H5MM_xfree(memb_name);
+            }
+            memb_value     = H5MM_xfree(memb_value);
+            tmp_memb_value = H5MM_xfree(tmp_memb_value);
+
+            /* Close base type */
+            if (H5I_dec_app_ref(nat_super_type_id) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+            /* Close super type */
+            if (H5I_dec_app_ref(super_type_id) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+
+            ret_value = new_type;
+        } /* end case */
+        break;
+
+        case H5T_ARRAY: {
+            int      sarray_rank; /* Array's rank */
+            unsigned array_rank;  /* Array's rank */
+            hsize_t  nelems       = 1;
+            size_t   super_offset = 0;
+            size_t   super_size   = 0;
+            size_t   super_align  = 0;
+
+            /* Retrieve dimension information for array data type */
+            if ((sarray_rank = H5T__get_array_ndims(dtype)) <= 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension rank")
+            H5_CHECKED_ASSIGN(array_rank, unsigned, sarray_rank, int);
+            if (NULL == (dims = (hsize_t *)H5MM_malloc(array_rank * sizeof(hsize_t))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+            if (H5T__get_array_dims(dtype, dims) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension size")
+
+            /* Retrieve base type for array type */
+            if (NULL == (super_type = H5T_get_super(dtype)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for array type")
+            if (NULL == (nat_super_type = H5T_get_native_type(super_type, direction, &super_align,
+                                                              &super_offset, &super_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed")
+
+            /* Close super type */
+            if (H5T_close(super_type) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
+
+            /* Create a new array type based on native type */
+            if (NULL == (new_type = H5T__array_create(nat_super_type, array_rank, dims)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create array type")
+
+            /* Close base type */
+            if (H5T_close(nat_super_type) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
+
+            for (u = 0; u < array_rank; u++)
+                nelems *= dims[u];
+            H5_CHECK_OVERFLOW(nelems, hsize_t, size_t);
+            if (H5T_cmp_offset(comp_size, offset, super_size, (size_t)nelems, super_align, struct_align) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
-                /* Free lists for members */
-                memb_list = (H5T_t **)H5MM_xfree(memb_list);
-                memb_offset = (size_t *)H5MM_xfree(memb_offset);
-                comp_mname = (char **)H5MM_xfree(comp_mname);
+            dims = (hsize_t *)H5MM_xfree(dims);
 
-                ret_value = new_type;
-            } /* end case */
-            break;
+            ret_value = new_type;
+        } /* end case */
+        break;
 
-        case H5T_ENUM:
-            {
-                H5T_path_t *tpath;    /* Type conversion info    */
-                hid_t       super_type_id, nat_super_type_id;
-
-                /* Don't need to do anything special for alignment, offset since the ENUM type usually is integer. */
-
-                /* Retrieve base type for enumerated type */
-                if(NULL == (super_type = H5T_get_super(dtype)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get base type for enumerate type")
-                if(NULL == (nat_super_type = H5T_get_native_type(super_type, direction, struct_align, offset, comp_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "base native type retrieval failed")
-
-                if((super_type_id = H5I_register(H5I_DATATYPE, super_type, FALSE)) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype")
-                if((nat_super_type_id = H5I_register(H5I_DATATYPE, nat_super_type, FALSE)) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype")
-
-                /* Allocate room for the enum values */
-                if(NULL == (tmp_memb_value = H5MM_calloc(H5T_get_size(super_type))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if(NULL == (memb_value = H5MM_calloc(H5T_get_size(nat_super_type))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-
-                /* Construct new enum type based on native type */
-                if(NULL == (new_type = H5T__enum_create(nat_super_type)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create enum type")
-
-                /* Find the conversion function */
-                if(NULL == (tpath = H5T_path_find(super_type, nat_super_type, NULL, NULL, H5P_DEFAULT, FALSE)))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to convert between src and dst data types")
-
-                /* Retrieve member info and insert members into new enum type */
-                if((snmemb = H5T_get_nmembers(dtype)) <= 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "enumerate data type doesn't have any member")
-                H5_CHECKED_ASSIGN(nmemb, unsigned, snmemb, int);
-                for(u = 0; u < nmemb; u++) {
-                    if(NULL == (memb_name = H5T__get_member_name(dtype, u)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member name")
-                    if(H5T__get_member_value(dtype, u, tmp_memb_value) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
-                    HDmemcpy(memb_value, tmp_memb_value, H5T_get_size(super_type));
-
-                    if(H5T_convert(tpath, super_type_id, nat_super_type_id, (size_t)1, (size_t)0, (size_t)0, memb_value, NULL, H5P_DATASET_XFER_DEFAULT) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
-
-                    if(H5T__enum_insert(new_type, memb_name, memb_value) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member")
-                    memb_name = (char *)H5MM_xfree(memb_name);
-                }
-                memb_value = H5MM_xfree(memb_value);
-                tmp_memb_value = H5MM_xfree(tmp_memb_value);
-
-                /* Close base type */
-                if(H5I_dec_app_ref(nat_super_type_id) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
-                /* Close super type */
-                if(H5I_dec_app_ref(super_type_id) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+        case H5T_VLEN: {
+            size_t vl_align   = 0;
+            size_t vl_size    = 0;
+            size_t super_size = 0;
 
-                ret_value = new_type;
-            } /* end case */
-            break;
+            /* Retrieve base type for array type */
+            if (NULL == (super_type = H5T_get_super(dtype)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for VL type")
+            /* Don't need alignment, offset information if this VL isn't a field of compound type.  If it
+             * is, go to a few steps below to compute the information directly. */
+            if (NULL ==
+                (nat_super_type = H5T_get_native_type(super_type, direction, NULL, NULL, &super_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed")
 
-        case H5T_ARRAY:
-            {
-                int         sarray_rank;        /* Array's rank */
-                unsigned    array_rank;         /* Array's rank */
-                hsize_t     nelems = 1;
-                size_t      super_offset = 0;
-                size_t      super_size = 0;
-                size_t      super_align = 0;
-
-                /* Retrieve dimension information for array data type */
-                if((sarray_rank = H5T__get_array_ndims(dtype)) <= 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension rank")
-                H5_CHECKED_ASSIGN(array_rank, unsigned, sarray_rank, int);
-                if(NULL == (dims = (hsize_t*)H5MM_malloc(array_rank * sizeof(hsize_t))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if(H5T__get_array_dims(dtype, dims) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension size")
-
-                /* Retrieve base type for array type */
-                if(NULL == (super_type = H5T_get_super(dtype)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for array type")
-                if(NULL == (nat_super_type = H5T_get_native_type(super_type, direction, &super_align,
-                                                         &super_offset, &super_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed")
-
-                /* Close super type */
-                if(H5T_close(super_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
-
-                /* Create a new array type based on native type */
-                if(NULL == (new_type = H5T__array_create(nat_super_type, array_rank, dims)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create array type")
-
-                /* Close base type */
-                if(H5T_close(nat_super_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
-
-                for(u = 0; u < array_rank; u++)
-                    nelems *= dims[u];
-                H5_CHECK_OVERFLOW(nelems, hsize_t, size_t);
-                if(H5T_cmp_offset(comp_size, offset, super_size, (size_t)nelems, super_align, struct_align) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+            /* Close super type */
+            if (H5T_close(super_type) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
 
-                dims = (hsize_t *)H5MM_xfree(dims);
+            /* Create a new array type based on native type */
+            if (NULL == (new_type = H5T__vlen_create(nat_super_type)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create VL type")
 
-                ret_value = new_type;
-            } /* end case */
-            break;
+            /* Close base type */
+            if (H5T_close(nat_super_type) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
 
-        case H5T_VLEN:
-            {
-                size_t      vl_align = 0;
-                size_t      vl_size  = 0;
-                size_t      super_size = 0;
-
-                /* Retrieve base type for array type */
-                if(NULL == (super_type = H5T_get_super(dtype)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for VL type")
-                /* Don't need alignment, offset information if this VL isn't a field of compound type.  If it
-                 * is, go to a few steps below to compute the information directly. */
-                if(NULL == (nat_super_type = H5T_get_native_type(super_type, direction, NULL, NULL, &super_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed")
-
-                /* Close super type */
-                if(H5T_close(super_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
-
-                /* Create a new array type based on native type */
-                if(NULL == (new_type = H5T__vlen_create(nat_super_type)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create VL type")
-
-                /* Close base type */
-                if(H5T_close(nat_super_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
-
-                /* Update size, offset and compound alignment for parent compound type directly. */
-                vl_align = H5T_HVL_COMP_ALIGN_g;
-                vl_size  = sizeof(hvl_t);
-
-                if(H5T_cmp_offset(comp_size, offset, vl_size, (size_t)1, vl_align, struct_align) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+            /* Update size, offset and compound alignment for parent compound type directly. */
+            vl_align = H5T_HVL_COMP_ALIGN_g;
+            vl_size  = sizeof(hvl_t);
 
-                ret_value = new_type;
-            } /* end case */
-            break;
+            if (H5T_cmp_offset(comp_size, offset, vl_size, (size_t)1, vl_align, struct_align) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+
+            ret_value = new_type;
+        } /* end case */
+        break;
 
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
@@ -509,30 +512,30 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
 
 done:
     /* Error cleanup */
-    if(NULL == ret_value) {
-        if(new_type)
-            if(H5T_close(new_type) < 0)
+    if (NULL == ret_value) {
+        if (new_type)
+            if (H5T_close(new_type) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, NULL, "unable to release datatype")
 
         /* Free lists for members */
-        if(memb_list) {
-            for(u = 0; u < nmemb; u++)
-                if(memb_list[u] && H5T_close(memb_list[u]) < 0)
+        if (memb_list) {
+            for (u = 0; u < nmemb; u++)
+                if (memb_list[u] && H5T_close(memb_list[u]) < 0)
                     HDONE_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
 
             memb_list = (H5T_t **)H5MM_xfree(memb_list);
         } /* end if */
         memb_offset = (size_t *)H5MM_xfree(memb_offset);
-        if(comp_mname) {
-            for(u = 0; u < nmemb; u++)
-                if(comp_mname[u])
+        if (comp_mname) {
+            for (u = 0; u < nmemb; u++)
+                if (comp_mname[u])
                     H5MM_xfree(comp_mname[u]);
             comp_mname = (char **)H5MM_xfree(comp_mname);
         } /* end if */
-        memb_name = (char *)H5MM_xfree(memb_name);
-        memb_value = H5MM_xfree(memb_value);
+        memb_name      = (char *)H5MM_xfree(memb_name);
+        memb_value     = H5MM_xfree(memb_value);
         tmp_memb_value = H5MM_xfree(tmp_memb_value);
-        dims = (hsize_t *)H5MM_xfree(dims);
+        dims           = (hsize_t *)H5MM_xfree(dims);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -561,68 +564,78 @@ H5_GCC_DIAG_OFF("duplicated-branches")
  *-------------------------------------------------------------------------
  */
 static H5T_t *
-H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
-                       size_t *struct_align, size_t *offset, size_t *comp_size)
+H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, size_t *struct_align,
+                       size_t *offset, size_t *comp_size)
 {
-    H5T_t       *dt;            /* Appropriate native datatype to copy */
-    hid_t       tid = (-1);     /* Datatype ID of appropriate native datatype */
-    size_t      align = 0;      /* Alignment necessary for native datatype */
-    size_t  native_size = 0;    /* Datatype size of the native type */
-    enum match_type {           /* The different kinds of integers we can match */
-        H5T_NATIVE_INT_MATCH_CHAR,
-        H5T_NATIVE_INT_MATCH_SHORT,
-        H5T_NATIVE_INT_MATCH_INT,
-        H5T_NATIVE_INT_MATCH_LONG,
-        H5T_NATIVE_INT_MATCH_LLONG,
-        H5T_NATIVE_INT_MATCH_UNKNOWN
+    H5T_t *dt;                 /* Appropriate native datatype to copy */
+    hid_t  tid         = (-1); /* Datatype ID of appropriate native datatype */
+    size_t align       = 0;    /* Alignment necessary for native datatype */
+    size_t native_size = 0;    /* Datatype size of the native type */
+    enum match_type {          /* The different kinds of integers we can match */
+                      H5T_NATIVE_INT_MATCH_CHAR,
+                      H5T_NATIVE_INT_MATCH_SHORT,
+                      H5T_NATIVE_INT_MATCH_INT,
+                      H5T_NATIVE_INT_MATCH_LONG,
+                      H5T_NATIVE_INT_MATCH_LLONG,
+                      H5T_NATIVE_INT_MATCH_UNKNOWN
     } match = H5T_NATIVE_INT_MATCH_UNKNOWN;
-    H5T_t       *ret_value;     /* Return value */
+    H5T_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
-        if(prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g))) {
-            match = H5T_NATIVE_INT_MATCH_CHAR;
+    if (direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
+        if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g))) {
+            match       = H5T_NATIVE_INT_MATCH_CHAR;
             native_size = sizeof(char);
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SHORT_g))) {
-            match = H5T_NATIVE_INT_MATCH_SHORT;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SHORT_g))) {
+            match       = H5T_NATIVE_INT_MATCH_SHORT;
             native_size = sizeof(short);
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_INT_g))) {
-            match = H5T_NATIVE_INT_MATCH_INT;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_INT_g))) {
+            match       = H5T_NATIVE_INT_MATCH_INT;
             native_size = sizeof(int);
-        } else if(prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LONG_g))) {
-            match = H5T_NATIVE_INT_MATCH_LONG;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LONG_g))) {
+            match       = H5T_NATIVE_INT_MATCH_LONG;
             native_size = sizeof(long);
-        } else if(prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LLONG_g))) {
-            match = H5T_NATIVE_INT_MATCH_LLONG;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LLONG_g))) {
+            match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
-        } else {  /* If no native type matches the querried datatype, simply choose the type of biggest size. */
-            match = H5T_NATIVE_INT_MATCH_LLONG;
+        }
+        else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
+            match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
         }
-    } else if(direction == H5T_DIR_DESCEND) {
-        if(prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LONG_g))) {
-            match = H5T_NATIVE_INT_MATCH_LLONG;
+    }
+    else if (direction == H5T_DIR_DESCEND) {
+        if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LONG_g))) {
+            match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
-        } else if(prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_INT_g))) {
-            match = H5T_NATIVE_INT_MATCH_LONG;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_INT_g))) {
+            match       = H5T_NATIVE_INT_MATCH_LONG;
             native_size = sizeof(long);
-        } else if(prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SHORT_g))) {
-            match = H5T_NATIVE_INT_MATCH_INT;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SHORT_g))) {
+            match       = H5T_NATIVE_INT_MATCH_INT;
             native_size = sizeof(int);
-        } else if(prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g))) {
-            match = H5T_NATIVE_INT_MATCH_SHORT;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g))) {
+            match       = H5T_NATIVE_INT_MATCH_SHORT;
             native_size = sizeof(short);
-        } else {
-            match = H5T_NATIVE_INT_MATCH_CHAR;
+        }
+        else {
+            match       = H5T_NATIVE_INT_MATCH_CHAR;
             native_size = sizeof(char);
         }
     }
 
     /* Set the appropriate native datatype information */
-    switch(match) {
+    switch (match) {
         case H5T_NATIVE_INT_MATCH_CHAR:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_SCHAR;
             else
                 tid = H5T_NATIVE_UCHAR;
@@ -631,7 +644,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             break;
 
         case H5T_NATIVE_INT_MATCH_SHORT:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_SHORT;
             else
                 tid = H5T_NATIVE_USHORT;
@@ -639,7 +652,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             break;
 
         case H5T_NATIVE_INT_MATCH_INT:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_INT;
             else
                 tid = H5T_NATIVE_UINT;
@@ -648,7 +661,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             break;
 
         case H5T_NATIVE_INT_MATCH_LONG:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_LONG;
             else
                 tid = H5T_NATIVE_ULONG;
@@ -657,7 +670,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             break;
 
         case H5T_NATIVE_INT_MATCH_LLONG:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_LLONG;
             else
                 tid = H5T_NATIVE_ULLONG;
@@ -672,15 +685,15 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
 
     /* Create new native type */
     HDassert(tid >= 0);
-    if(NULL == (dt = (H5T_t *)H5I_object(tid)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
+    if (NULL == (dt = (H5T_t *)H5I_object(tid)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
 
-    if(NULL == (ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type")
+    if (NULL == (ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type")
 
     /* compute size and offset of compound type member. */
-    if(H5T_cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+    if (H5T_cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -709,92 +722,94 @@ H5_GCC_DIAG_OFF("duplicated-branches")
  *
  *-------------------------------------------------------------------------
  */
-static H5T_t*
-H5T_get_native_float(size_t size, H5T_direction_t direction, size_t *struct_align, size_t *offset, size_t *comp_size)
+static H5T_t *
+H5T_get_native_float(size_t size, H5T_direction_t direction, size_t *struct_align, size_t *offset,
+                     size_t *comp_size)
 {
-    H5T_t       *dt=NULL;       /* Appropriate native datatype to copy */
-    hid_t       tid=(-1);       /* Datatype ID of appropriate native datatype */
-    size_t      align=0;        /* Alignment necessary for native datatype */
-    size_t     native_size=0;  /* Datatype size of the native type */
-    enum match_type {           /* The different kinds of floating point types we can match */
-        H5T_NATIVE_FLOAT_MATCH_FLOAT,
-        H5T_NATIVE_FLOAT_MATCH_DOUBLE,
-#if H5_SIZEOF_LONG_DOUBLE !=0
-        H5T_NATIVE_FLOAT_MATCH_LDOUBLE,
+    H5T_t *dt          = NULL; /* Appropriate native datatype to copy */
+    hid_t  tid         = (-1); /* Datatype ID of appropriate native datatype */
+    size_t align       = 0;    /* Alignment necessary for native datatype */
+    size_t native_size = 0;    /* Datatype size of the native type */
+    enum match_type {          /* The different kinds of floating point types we can match */
+                      H5T_NATIVE_FLOAT_MATCH_FLOAT,
+                      H5T_NATIVE_FLOAT_MATCH_DOUBLE,
+#if H5_SIZEOF_LONG_DOUBLE != 0
+                      H5T_NATIVE_FLOAT_MATCH_LDOUBLE,
 #endif
-        H5T_NATIVE_FLOAT_MATCH_UNKNOWN
-    } match=H5T_NATIVE_FLOAT_MATCH_UNKNOWN;
-    H5T_t       *ret_value;     /* Return value */
+                      H5T_NATIVE_FLOAT_MATCH_UNKNOWN
+    } match = H5T_NATIVE_FLOAT_MATCH_UNKNOWN;
+    H5T_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
-    HDassert(size>0);
+    HDassert(size > 0);
 
-    if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
-        if(size<=sizeof(float)) {
-            match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
-        native_size = sizeof(float);
+    if (direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
+        if (size <= sizeof(float)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_FLOAT;
+            native_size = sizeof(float);
         }
-        else if(size<=sizeof(double)) {
-            match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
-        native_size = sizeof(double);
+        else if (size <= sizeof(double)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_DOUBLE;
+            native_size = sizeof(double);
         }
-#if H5_SIZEOF_LONG_DOUBLE !=0
-        else if(size<=sizeof(long double)) {
-            match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
-        native_size = sizeof(long double);
+#if H5_SIZEOF_LONG_DOUBLE != 0
+        else if (size <= sizeof(long double)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
+            native_size = sizeof(long double);
         }
 #endif
-        else {   /* If not match, return the biggest datatype */
-#if H5_SIZEOF_LONG_DOUBLE !=0
-            match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
-        native_size = sizeof(long double);
+        else { /* If not match, return the biggest datatype */
+#if H5_SIZEOF_LONG_DOUBLE != 0
+            match       = H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
+            native_size = sizeof(long double);
 #else
-            match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
+            match       = H5T_NATIVE_FLOAT_MATCH_DOUBLE;
             native_size = sizeof(double);
 #endif
+        }
     }
-    } else {
-#if H5_SIZEOF_LONG_DOUBLE !=0
-        if(size>sizeof(double)) {
-            match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
-        native_size = sizeof(long double);
+    else {
+#if H5_SIZEOF_LONG_DOUBLE != 0
+        if (size > sizeof(double)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
+            native_size = sizeof(long double);
         }
-        else if(size>sizeof(float)) {
-            match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
-        native_size = sizeof(double);
+        else if (size > sizeof(float)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_DOUBLE;
+            native_size = sizeof(double);
         }
         else {
-            match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
-        native_size = sizeof(float);
-    }
+            match       = H5T_NATIVE_FLOAT_MATCH_FLOAT;
+            native_size = sizeof(float);
+        }
 #else
-        if(size>sizeof(float)) {
-            match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
-        native_size = sizeof(double);
+        if (size > sizeof(float)) {
+            match = H5T_NATIVE_FLOAT_MATCH_DOUBLE;
+            native_size = sizeof(double);
         }
         else {
-            match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
-        native_size = sizeof(float);
-    }
+            match = H5T_NATIVE_FLOAT_MATCH_FLOAT;
+            native_size = sizeof(float);
+        }
 #endif
     }
 
     /* Set the appropriate native floating point information */
-    switch(match) {
+    switch (match) {
         case H5T_NATIVE_FLOAT_MATCH_FLOAT:
-            tid = H5T_NATIVE_FLOAT;
+            tid   = H5T_NATIVE_FLOAT;
             align = H5T_NATIVE_FLOAT_COMP_ALIGN_g;
             break;
 
         case H5T_NATIVE_FLOAT_MATCH_DOUBLE:
-            tid = H5T_NATIVE_DOUBLE;
+            tid   = H5T_NATIVE_DOUBLE;
             align = H5T_NATIVE_DOUBLE_COMP_ALIGN_g;
             break;
 
-#if H5_SIZEOF_LONG_DOUBLE !=0
+#if H5_SIZEOF_LONG_DOUBLE != 0
         case H5T_NATIVE_FLOAT_MATCH_LDOUBLE:
-            tid = H5T_NATIVE_LDOUBLE;
+            tid   = H5T_NATIVE_LDOUBLE;
             align = H5T_NATIVE_LDOUBLE_COMP_ALIGN_g;
             break;
 #endif
@@ -804,15 +819,15 @@ H5T_get_native_float(size_t size, H5T_direction_t direction, size_t *struct_alig
     } /* end switch */
 
     /* Create new native type */
-    HDassert(tid>=0);
-    if(NULL==(dt=(H5T_t *)H5I_object(tid)))
+    HDassert(tid >= 0);
+    if (NULL == (dt = (H5T_t *)H5I_object(tid)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
-    if((ret_value=H5T_copy(dt, H5T_COPY_TRANSIENT))==NULL)
+    if ((ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT)) == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
     /* compute offset of compound type member. */
-    if(H5T_cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align)<0)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+    if (H5T_cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -842,78 +857,85 @@ H5_GCC_DIAG_OFF("duplicated-branches")
  *
  *-------------------------------------------------------------------------
  */
-static H5T_t*
-H5T_get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_align,
-                        size_t *offset, size_t *comp_size)
+static H5T_t *
+H5T_get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_align, size_t *offset,
+                        size_t *comp_size)
 {
-    H5T_t       *dt;            /* Appropriate native datatype to copy */
-    hid_t       tid=(-1);       /* Datatype ID of appropriate native datatype */
-    size_t      align=0;        /* Alignment necessary for native datatype */
-    size_t      native_size=0;  /* Datatype size of the native type */
-    H5T_t       *ret_value;     /* Return value */
+    H5T_t *dt;                 /* Appropriate native datatype to copy */
+    hid_t  tid         = (-1); /* Datatype ID of appropriate native datatype */
+    size_t align       = 0;    /* Alignment necessary for native datatype */
+    size_t native_size = 0;    /* Datatype size of the native type */
+    H5T_t *ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
-        if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B8_g))) {
-            tid = H5T_NATIVE_B8;
+    if (direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
+        if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B8_g))) {
+            tid         = H5T_NATIVE_B8;
             native_size = 1;
-            align = H5T_NATIVE_UINT8_ALIGN_g;
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B16_g))) {
-            tid = H5T_NATIVE_B16;
+            align       = H5T_NATIVE_UINT8_ALIGN_g;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B16_g))) {
+            tid         = H5T_NATIVE_B16;
             native_size = 2;
-            align = H5T_NATIVE_UINT16_ALIGN_g;
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B32_g))) {
-            tid = H5T_NATIVE_B32;
+            align       = H5T_NATIVE_UINT16_ALIGN_g;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B32_g))) {
+            tid         = H5T_NATIVE_B32;
             native_size = 4;
-            align = H5T_NATIVE_UINT32_ALIGN_g;
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B64_g))) {
-            tid = H5T_NATIVE_B64;
+            align       = H5T_NATIVE_UINT32_ALIGN_g;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B64_g))) {
+            tid         = H5T_NATIVE_B64;
             native_size = 8;
-            align = H5T_NATIVE_UINT64_ALIGN_g;
-        } else {  /* If no native type matches the querried datatype, simply choose the type of biggest size. */
-            tid = H5T_NATIVE_B64;
+            align       = H5T_NATIVE_UINT64_ALIGN_g;
+        }
+        else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
+            tid         = H5T_NATIVE_B64;
             native_size = 8;
-            align = H5T_NATIVE_UINT64_ALIGN_g;
+            align       = H5T_NATIVE_UINT64_ALIGN_g;
         }
-    } else if(direction == H5T_DIR_DESCEND) {
-        if(prec>H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B32_g))) {
-            tid = H5T_NATIVE_B64;
+    }
+    else if (direction == H5T_DIR_DESCEND) {
+        if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B32_g))) {
+            tid         = H5T_NATIVE_B64;
             native_size = 8;
-            align = H5T_NATIVE_UINT64_ALIGN_g;
-        } else if(prec>H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B16_g))) {
-            tid = H5T_NATIVE_B32;
+            align       = H5T_NATIVE_UINT64_ALIGN_g;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B16_g))) {
+            tid         = H5T_NATIVE_B32;
             native_size = 4;
-            align = H5T_NATIVE_UINT32_ALIGN_g;
-        } else if(prec>H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B8_g))) {
-            tid = H5T_NATIVE_B16;
+            align       = H5T_NATIVE_UINT32_ALIGN_g;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B8_g))) {
+            tid         = H5T_NATIVE_B16;
             native_size = 2;
-            align = H5T_NATIVE_UINT16_ALIGN_g;
-        } else {
-            tid = H5T_NATIVE_B8;
+            align       = H5T_NATIVE_UINT16_ALIGN_g;
+        }
+        else {
+            tid         = H5T_NATIVE_B8;
             native_size = 1;
-            align = H5T_NATIVE_UINT8_ALIGN_g;
+            align       = H5T_NATIVE_UINT8_ALIGN_g;
         }
     }
 
     /* Create new native type */
-    HDassert(tid>=0);
-    if(NULL==(dt=(H5T_t *)H5I_object(tid)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
+    HDassert(tid >= 0);
+    if (NULL == (dt = (H5T_t *)H5I_object(tid)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
 
-    if((ret_value=H5T_copy(dt, H5T_COPY_TRANSIENT))==NULL)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type")
+    if ((ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT)) == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type")
 
     /* compute size and offset of compound type member. */
-    if(H5T_cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align)<0)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+    if (H5T_cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_get_native_bitfield() */
 H5_GCC_DIAG_ON("duplicated-branches")
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_cmp_offset
  *
@@ -931,29 +953,29 @@ H5_GCC_DIAG_ON("duplicated-branches")
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T_cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size,
-                      size_t nelems, size_t align, size_t *struct_align)
+H5T_cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size, size_t nelems, size_t align,
+               size_t *struct_align)
 {
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(offset && comp_size) {
-        if(align>1 && *comp_size%align) {
+    if (offset && comp_size) {
+        if (align > 1 && *comp_size % align) {
             /* Add alignment value */
-            *offset = *comp_size +  (align - *comp_size%align);
-            *comp_size += (align - *comp_size%align);
-        } else
+            *offset = *comp_size + (align - *comp_size % align);
+            *comp_size += (align - *comp_size % align);
+        }
+        else
             *offset = *comp_size;
 
         /* compute size of compound type member. */
-        *comp_size += nelems*elem_size;
+        *comp_size += nelems * elem_size;
     }
 
-    if(struct_align && *struct_align < align)
+    if (struct_align && *struct_align < align)
         *struct_align = align;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
-
diff --git a/src/H5Toffset.c b/src/H5Toffset.c
index c17ea11..c26cf6c 100644
--- a/src/H5Toffset.c
+++ b/src/H5Toffset.c
@@ -16,21 +16,19 @@
  *      the datatype offset for the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_offset_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_offset_interface
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Tpkg.h"		/* Datatypes				*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Tpkg.h"     /* Datatypes				*/
 
 /* Static local functions */
 static herr_t H5T_set_offset(const H5T_t *dt, size_t offset);
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_offset_interface -- Initialize interface-specific information
@@ -52,7 +50,6 @@ H5T_init_offset_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_offset_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_offset
  *
@@ -85,25 +82,24 @@ H5T_init_offset_interface(void)
 int
 H5Tget_offset(hid_t type_id)
 {
-    H5T_t	*dt;
-    int	ret_value;
+    H5T_t *dt;
+    int    ret_value;
 
     FUNC_ENTER_API(-1)
     H5TRACE1("Is", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type")
 
     /* Get offset */
-    if((ret_value = H5T_get_offset(dt)) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "cant't get offset for specified datatype")
+    if ((ret_value = H5T_get_offset(dt)) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "cant't get offset for specified datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_get_offset
  *
@@ -136,15 +132,15 @@ done:
 int
 H5T_get_offset(const H5T_t *dt)
 {
-    int	ret_value;
+    int ret_value;
 
     FUNC_ENTER_NOAPI(-1)
 
     /* Defer to parent*/
-    while(dt->shared->parent)
+    while (dt->shared->parent)
         dt = dt->shared->parent;
-    if(!H5T_IS_ATOMIC(dt->shared))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified data type")
+    if (!H5T_IS_ATOMIC(dt->shared))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified data type")
 
     /* Offset */
     ret_value = (int)dt->shared->u.atomic.offset;
@@ -153,7 +149,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_get_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_offset
  *
@@ -196,33 +191,33 @@ done:
 herr_t
 H5Tset_offset(hid_t type_id, size_t offset)
 {
-    H5T_t	*dt;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", type_id, offset);
 
     /* Check args */
-    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
     if (H5T_STRING == dt->shared->type && offset != 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "offset must be zero for this type")
-    if (H5T_ENUM==dt->shared->type && dt->shared->u.enumer.nmembs>0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
-    if (H5T_COMPOUND==dt->shared->type || H5T_REFERENCE==dt->shared->type || H5T_OPAQUE==dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for this datatype")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "offset must be zero for this type")
+    if (H5T_ENUM == dt->shared->type && dt->shared->u.enumer.nmembs > 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
+    if (H5T_COMPOUND == dt->shared->type || H5T_REFERENCE == dt->shared->type ||
+        H5T_OPAQUE == dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for this datatype")
 
     /* Do the real work */
-    if (H5T_set_offset(dt, offset)<0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset")
+    if (H5T_set_offset(dt, offset) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_set_offset
  *
@@ -265,29 +260,30 @@ done:
 static herr_t
 H5T_set_offset(const H5T_t *dt, size_t offset)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(dt);
-    HDassert(H5T_STRING!=dt->shared->type || 0==offset);
-    HDassert(H5T_REFERENCE!=dt->shared->type);
-    HDassert(H5T_OPAQUE!=dt->shared->type);
-    HDassert(H5T_COMPOUND!=dt->shared->type);
-    HDassert(!(H5T_ENUM==dt->shared->type && 0==dt->shared->u.enumer.nmembs));
+    HDassert(H5T_STRING != dt->shared->type || 0 == offset);
+    HDassert(H5T_REFERENCE != dt->shared->type);
+    HDassert(H5T_OPAQUE != dt->shared->type);
+    HDassert(H5T_COMPOUND != dt->shared->type);
+    HDassert(!(H5T_ENUM == dt->shared->type && 0 == dt->shared->u.enumer.nmembs));
 
     if (dt->shared->parent) {
-	if (H5T_set_offset(dt->shared->parent, offset)<0)
-	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset for base type")
+        if (H5T_set_offset(dt->shared->parent, offset) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset for base type")
 
         /* Adjust size of datatype appropriately */
-        if(dt->shared->type==H5T_ARRAY)
+        if (dt->shared->type == H5T_ARRAY)
             dt->shared->size = dt->shared->parent->shared->size * dt->shared->u.array.nelem;
-        else if(dt->shared->type!=H5T_VLEN)
+        else if (dt->shared->type != H5T_VLEN)
             dt->shared->size = dt->shared->parent->shared->size;
-    } else {
-        if (offset+dt->shared->u.atomic.prec > 8*dt->shared->size)
+    }
+    else {
+        if (offset + dt->shared->u.atomic.prec > 8 * dt->shared->size)
             dt->shared->size = (offset + dt->shared->u.atomic.prec + 7) / 8;
         dt->shared->u.atomic.offset = offset;
     }
@@ -295,4 +291,3 @@ H5T_set_offset(const H5T_t *dt, size_t offset)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
-
diff --git a/src/H5Toh.c b/src/H5Toh.c
index 0c70f0e..2772c79 100644
--- a/src/H5Toh.c
+++ b/src/H5Toh.c
@@ -15,71 +15,61 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
-
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Tpkg.h"		/* Datatypes				*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Opkg.h"     /* Object headers			*/
+#include "H5Tpkg.h"     /* Datatypes				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-static htri_t H5O_dtype_isa(H5O_t *loc);
-static hid_t H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t lapl_id,
-    hid_t dxpl_id, hbool_t app_ref);
-static void *H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc,
-    hid_t dxpl_id);
+static htri_t     H5O_dtype_isa(H5O_t *loc);
+static hid_t      H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref);
+static void *     H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id);
 static H5O_loc_t *H5O_dtype_get_oloc(hid_t obj_id);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* This message derives from H5O object class */
 const H5O_obj_class_t H5O_OBJ_DATATYPE[1] = {{
-    H5O_TYPE_NAMED_DATATYPE,	/* object type			*/
-    "named datatype",		/* object name, for debugging	*/
-    NULL,			/* get 'copy file' user data	*/
-    NULL,			/* free 'copy file' user data	*/
-    H5O_dtype_isa, 		/* "isa" 			*/
-    H5O_dtype_open, 		/* open an object of this class */
-    H5O_dtype_create, 		/* create an object of this class */
-    H5O_dtype_get_oloc,		/* get an object header location for an object */
-    NULL,			/* get the index & heap info for an object */
-    NULL 			/* flush an opened object of this class */
+    H5O_TYPE_NAMED_DATATYPE, /* object type			*/
+    "named datatype",        /* object name, for debugging	*/
+    NULL,                    /* get 'copy file' user data	*/
+    NULL,                    /* free 'copy file' user data	*/
+    H5O_dtype_isa,           /* "isa" 			*/
+    H5O_dtype_open,          /* open an object of this class */
+    H5O_dtype_create,        /* create an object of this class */
+    H5O_dtype_get_oloc,      /* get an object header location for an object */
+    NULL,                    /* get the index & heap info for an object */
+    NULL                     /* flush an opened object of this class */
 }};
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_isa
  *
@@ -100,20 +90,19 @@ const H5O_obj_class_t H5O_OBJ_DATATYPE[1] = {{
 static htri_t
 H5O_dtype_isa(struct H5O_t *oh)
 {
-    htri_t	ret_value;              /* Return value */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(oh);
 
-    if((ret_value = H5O_msg_exists_oh(oh, H5O_DTYPE_ID)) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to read object header")
+    if ((ret_value = H5O_msg_exists_oh(oh, H5O_DTYPE_ID)) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to read object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_isa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_open
  *
@@ -130,30 +119,29 @@ done:
 static hid_t
 H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t H5_ATTR_UNUSED lapl_id, hid_t dxpl_id, hbool_t app_ref)
 {
-    H5T_t       *type = NULL;           /* Datatype opened */
-    hid_t	ret_value;              /* Return value */
+    H5T_t *type = NULL; /* Datatype opened */
+    hid_t  ret_value;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(obj_loc);
 
     /* Open the datatype */
-    if(NULL == (type = H5T_open(obj_loc, dxpl_id)))
+    if (NULL == (type = H5T_open(obj_loc, dxpl_id)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to open datatype")
 
     /* Register an ID for the datatype */
-    if((ret_value = H5I_register(H5I_DATATYPE, type, app_ref)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, type, app_ref)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register datatype")
 
 done:
-    if(ret_value < 0)
-        if(type && H5T_close(type) < 0)
+    if (ret_value < 0)
+        if (type && H5T_close(type) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release datatype")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_create
  *
@@ -171,7 +159,7 @@ static void *
 H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
 {
     H5T_obj_create_t *crt_info = (H5T_obj_create_t *)_crt_info; /* Named datatype creation parameters */
-    void *ret_value;            /* Return value */
+    void *            ret_value;                                /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -181,13 +169,13 @@ H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
     HDassert(obj_loc);
 
     /* Commit the type to the file */
-    if(H5T__commit(f, crt_info->dt, crt_info->tcpl_id, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to commit datatype")
+    if (H5T__commit(f, crt_info->dt, crt_info->tcpl_id, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to commit datatype")
 
     /* Set up the new named datatype's location */
-    if(NULL == (obj_loc->oloc = H5T_oloc(crt_info->dt)))
+    if (NULL == (obj_loc->oloc = H5T_oloc(crt_info->dt)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get object location of named datatype")
-    if(NULL == (obj_loc->path = H5T_nameof(crt_info->dt)))
+    if (NULL == (obj_loc->path = H5T_nameof(crt_info->dt)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get path of named datatype")
 
     /* Set the return value */
@@ -197,7 +185,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_dtype_get_oloc
  *
@@ -214,20 +201,19 @@ done:
 static H5O_loc_t *
 H5O_dtype_get_oloc(hid_t obj_id)
 {
-    H5T_t       *type;                  /* Datatype opened */
-    H5O_loc_t	*ret_value;             /* Return value */
+    H5T_t *    type;      /* Datatype opened */
+    H5O_loc_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get the datatype */
-    if(NULL == (type = (H5T_t *)H5I_object(obj_id)))
+    if (NULL == (type = (H5T_t *)H5I_object(obj_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_BADATOM, NULL, "couldn't get object from ID")
 
     /* Get the datatype's object header location */
-    if(NULL == (ret_value = H5T_oloc(type)))
+    if (NULL == (ret_value = H5T_oloc(type)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_get_oloc() */
-
diff --git a/src/H5Topaque.c b/src/H5Topaque.c
index 51d4171..2243900 100644
--- a/src/H5Topaque.c
+++ b/src/H5Topaque.c
@@ -16,19 +16,17 @@
  *      datatypes in the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_opaque_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_opaque_interface
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Tpkg.h"      /* Datatypes				*/
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Tpkg.h"		/* Datatypes				*/
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_opaque_interface -- Initialize interface-specific information
@@ -50,7 +48,6 @@ H5T_init_opaque_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_opaque_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_tag
  *
@@ -68,25 +65,25 @@ H5T_init_opaque_interface(void)
 herr_t
 H5Tset_tag(hid_t type_id, const char *tag)
 {
-    H5T_t	*dt=NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*s", type_id, tag);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
     while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
-    if (H5T_OPAQUE!=dt->shared->type)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an opaque data type")
+    if (H5T_OPAQUE != dt->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an opaque data type")
     if (!tag)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no tag")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no tag")
     if (HDstrlen(tag) >= H5T_OPAQUE_TAG_MAX)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "tag too long")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "tag too long")
 
     /* Commit */
     H5MM_xfree(dt->shared->u.opaque.tag);
@@ -96,7 +93,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_tag
  *
@@ -115,25 +111,24 @@ done:
 char *
 H5Tget_tag(hid_t type_id)
 {
-    H5T_t	*dt=NULL;
-    char	*ret_value;
+    H5T_t *dt = NULL;
+    char * ret_value;
 
     FUNC_ENTER_API(NULL)
     H5TRACE1("*s", "i", type_id);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
     while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
     if (H5T_OPAQUE != dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "operation not defined for data type class")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "operation not defined for data type class")
 
     /* result */
-    if (NULL==(ret_value=H5MM_strdup(dt->shared->u.opaque.tag)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (ret_value = H5MM_strdup(dt->shared->u.opaque.tag)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
-
diff --git a/src/H5Torder.c b/src/H5Torder.c
index c654e7b..bb7ff99 100644
--- a/src/H5Torder.c
+++ b/src/H5Torder.c
@@ -20,63 +20,52 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_order_interface
-
+#define H5_INTERFACE_INIT_FUNC H5T_init_order_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Tpkg.h"		/* Datatypes				*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Tpkg.h"     /* Datatypes				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 static herr_t H5T_set_order(H5T_t *dtype, H5T_order_t order);
 
-
 /*********************/
 /* Public Variables */
 /*********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_order_interface -- Initialize interface-specific information
@@ -97,7 +86,6 @@ H5T_init_order_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_order_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_order
  *
@@ -110,31 +98,30 @@ H5T_init_order_interface(void)
  *
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
- * 
+ *
  *-------------------------------------------------------------------------
  */
 H5T_order_t
 H5Tget_order(hid_t type_id)
 {
-    H5T_t		*dt;            /* Datatype to query */
-    H5T_order_t		ret_value;      /* Return value */
+    H5T_t *     dt;        /* Datatype to query */
+    H5T_order_t ret_value; /* Return value */
 
     FUNC_ENTER_API(H5T_ORDER_ERROR)
     H5TRACE1("To", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5T_ORDER_ERROR, "not a datatype")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5T_ORDER_ERROR, "not a datatype")
 
     /* Get order */
-    if(H5T_ORDER_ERROR == (ret_value = H5T_get_order(dt)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_ORDER_ERROR, "cant't get order for specified datatype")
+    if (H5T_ORDER_ERROR == (ret_value = H5T_get_order(dt)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_ORDER_ERROR, "cant't get order for specified datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_get_order
  *
@@ -151,55 +138,55 @@ done:
 H5T_order_t
 H5T_get_order(const H5T_t *dtype)
 {
-    H5T_order_t	ret_value = H5T_ORDER_NONE;      /* Return value */
+    H5T_order_t ret_value = H5T_ORDER_NONE; /* Return value */
 
     FUNC_ENTER_NOAPI(H5T_ORDER_ERROR)
 
     /* Defer to parent */
-    while(dtype->shared->parent)
+    while (dtype->shared->parent)
         dtype = dtype->shared->parent;
 
     /* Set order for atomic type. */
-    if(H5T_IS_ATOMIC(dtype->shared))
+    if (H5T_IS_ATOMIC(dtype->shared))
         ret_value = dtype->shared->u.atomic.order;
     else {
         /* Check for compound datatype */
-        if(H5T_COMPOUND == dtype->shared->type) {
+        if (H5T_COMPOUND == dtype->shared->type) {
             H5T_order_t memb_order = H5T_ORDER_NONE;
-            int nmemb;          /* Number of members in compound & enum types */
-            int i;              /* Local index variable */
+            int         nmemb; /* Number of members in compound & enum types */
+            int         i;     /* Local index variable */
 
             /* Retrieve the number of members */
-            if((nmemb = H5T_get_nmembers(dtype)) < 0)
-                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_ORDER_ERROR, "can't get number of members from compound data type")
+            if ((nmemb = H5T_get_nmembers(dtype)) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_ORDER_ERROR,
+                            "can't get number of members from compound data type")
 
             /* Get order for each compound member type. */
-            for(i = 0; i < nmemb; i++) {
+            for (i = 0; i < nmemb; i++) {
                 /* Get order for member */
-                if((memb_order = H5T_get_order(dtype->shared->u.compnd.memb[i].type)) == H5T_ORDER_ERROR)
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5T_ORDER_ERROR, "can't get order for compound member")
+                if ((memb_order = H5T_get_order(dtype->shared->u.compnd.memb[i].type)) == H5T_ORDER_ERROR)
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5T_ORDER_ERROR,
+                                "can't get order for compound member")
 
                 /* Ignore the H5T_ORDER_NONE, write down the first non H5T_ORDER_NONE order. */
-                if(memb_order != H5T_ORDER_NONE && ret_value == H5T_ORDER_NONE)
+                if (memb_order != H5T_ORDER_NONE && ret_value == H5T_ORDER_NONE)
                     ret_value = memb_order;
 
-                /* If the orders are mixed, stop the loop and report it.  
+                /* If the orders are mixed, stop the loop and report it.
                  * (H5T_ORDER_NONE is ignored)
                  */
-                if(memb_order != H5T_ORDER_NONE && ret_value != H5T_ORDER_NONE
-                        && memb_order != ret_value) {
+                if (memb_order != H5T_ORDER_NONE && ret_value != H5T_ORDER_NONE && memb_order != ret_value) {
                     ret_value = H5T_ORDER_MIXED;
                     break;
                 } /* end if */
-            } /* end for */
-        } /* end if */
-    } /* end else */
+            }     /* end for */
+        }         /* end if */
+    }             /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_get_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_order
  *
@@ -210,7 +197,7 @@ done:
  *		2. H5T_ORDER_NONE only works for reference and fixed-length
  *			string.
  *		3. For opaque type, the order will be ignored.
- *		4. For compound type, all restrictions above apply to the 
+ *		4. For compound type, all restrictions above apply to the
  *			members.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -223,29 +210,28 @@ done:
 herr_t
 H5Tset_order(hid_t type_id, H5T_order_t order)
 {
-    H5T_t	*dt;                    /* Datatype to modify */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5T_t *dt;                  /* Datatype to modify */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iTo", type_id, order);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
-    if(order < H5T_ORDER_LE || order > H5T_ORDER_NONE || order == H5T_ORDER_MIXED)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "illegal byte order")
-    if(H5T_STATE_TRANSIENT != dt->shared->state)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype is read-only")
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
+    if (order < H5T_ORDER_LE || order > H5T_ORDER_NONE || order == H5T_ORDER_MIXED)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "illegal byte order")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype is read-only")
 
     /* Call internal routine to set the order */
-    if(H5T_set_order(dt, order) < 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "can't set order")
+    if (H5T_set_order(dt, order) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "can't set order")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tset_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_set_order
  *
@@ -261,47 +247,47 @@ done:
 static herr_t
 H5T_set_order(H5T_t *dtype, H5T_order_t order)
 {
-    herr_t      ret_value = SUCCEED;  /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5T_ENUM == dtype->shared->type && dtype->shared->u.enumer.nmembs > 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after enum members are defined")
+    if (H5T_ENUM == dtype->shared->type && dtype->shared->u.enumer.nmembs > 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after enum members are defined")
 
-    /* For derived data type, defer to parent */ 
-    while(dtype->shared->parent)
+    /* For derived data type, defer to parent */
+    while (dtype->shared->parent)
         dtype = dtype->shared->parent;
 
     /* Check for setting order on inappropriate datatype */
-    if(order == H5T_ORDER_NONE && !(H5T_REFERENCE == dtype->shared->type || 
-            H5T_OPAQUE == dtype->shared->type || H5T_IS_FIXED_STRING(dtype->shared)))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "illegal byte order for type")
+    if (order == H5T_ORDER_NONE && !(H5T_REFERENCE == dtype->shared->type ||
+                                     H5T_OPAQUE == dtype->shared->type || H5T_IS_FIXED_STRING(dtype->shared)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "illegal byte order for type")
 
     /* For atomic data type */
-    if(H5T_IS_ATOMIC(dtype->shared))
+    if (H5T_IS_ATOMIC(dtype->shared))
         dtype->shared->u.atomic.order = order;
     else {
         /* Check for compound datatype */
-        if(H5T_COMPOUND == dtype->shared->type) {
-            int nmemb;          /* Number of members in type */
-            int i;              /* Local index variable */
+        if (H5T_COMPOUND == dtype->shared->type) {
+            int nmemb; /* Number of members in type */
+            int i;     /* Local index variable */
 
             /* Retrieve the number of fields in the compound datatype */
-            if((nmemb = H5T_get_nmembers(dtype)) < 0)
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get number of members from compound data type")
+            if ((nmemb = H5T_get_nmembers(dtype)) < 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL,
+                            "can't get number of members from compound data type")
 
             /* Check for uninitialized compound datatype */
-            if(nmemb == 0)
+            if (nmemb == 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_UNINITIALIZED, FAIL, "no member is in the compound data type")
 
             /* Loop through all fields of compound type, setting the order */
-            for(i = 0; i < nmemb; i++)
-                if(H5T_set_order(dtype->shared->u.compnd.memb[i].type, order) < 0)
+            for (i = 0; i < nmemb; i++)
+                if (H5T_set_order(dtype->shared->u.compnd.memb[i].type, order) < 0)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set order for compound member")
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_set_order() */
-
diff --git a/src/H5Tpad.c b/src/H5Tpad.c
index 538da4a..923a4ae 100644
--- a/src/H5Tpad.c
+++ b/src/H5Tpad.c
@@ -16,18 +16,16 @@
  *      the datatype padding for the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_pad_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_pad_interface
 
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Tpkg.h"     /* Datatypes				*/
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Tpkg.h"		/* Datatypes				*/
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_pad_interface -- Initialize interface-specific information
@@ -49,7 +47,6 @@ H5T_init_pad_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_pad_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_pad
  *
@@ -69,21 +66,21 @@ H5T_init_pad_interface(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, H5T_pad_t *msb/*out*/)
+H5Tget_pad(hid_t type_id, H5T_pad_t *lsb /*out*/, H5T_pad_t *msb /*out*/)
 {
-    H5T_t	*dt = NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", type_id, lsb, msb);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
     while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
     if (!H5T_IS_ATOMIC(dt->shared))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified data type")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified data type")
 
     /* Get values */
     if (lsb)
@@ -95,7 +92,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_pad
  *
@@ -115,25 +111,25 @@ done:
 herr_t
 H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb)
 {
-    H5T_t *dt = NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iTpTp", type_id, lsb, msb);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
     if (lsb < H5T_PAD_ZERO || lsb >= H5T_NPAD || msb < H5T_PAD_ZERO || msb >= H5T_NPAD)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pad type")
-    if (H5T_ENUM==dt->shared->type && dt->shared->u.enumer.nmembs>0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pad type")
+    if (H5T_ENUM == dt->shared->type && dt->shared->u.enumer.nmembs > 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
     while (dt->shared->parent)
         dt = dt->shared->parent; /*defer to parent*/
     if (!H5T_IS_ATOMIC(dt->shared))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified data type")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified data type")
 
     /* Commit */
     dt->shared->u.atomic.lsb_pad = lsb;
@@ -142,4 +138,3 @@ H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb)
 done:
     FUNC_LEAVE_API(ret_value)
 }
-
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index d63b30d..d96d809 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -30,45 +30,45 @@
  * Define this to enable debugging.
  */
 #ifdef NDEBUG
-#  undef H5T_DEBUG
+#undef H5T_DEBUG
 #endif
 
 /* Get package's private header */
 #include "H5Tprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5Fprivate.h"		/* Files				*/
-#include "H5FLprivate.h"	/* Free Lists				*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
+#include "H5Fprivate.h"  /* Files				*/
+#include "H5FLprivate.h" /* Free Lists				*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
 
 /* Other public headers needed by this file */
-#include "H5Spublic.h"		/* Dataspace functions			*/
+#include "H5Spublic.h" /* Dataspace functions			*/
 
 /* Length of debugging name buffer */
-#define H5T_NAMELEN		32
+#define H5T_NAMELEN 32
 
 /* Macro to ease detecting "complex" datatypes (i.e. those with base types or fields) */
-#define H5T_IS_COMPLEX(t)       ((t) == H5T_COMPOUND || (t) == H5T_ENUM || (t) == H5T_VLEN || (t) == H5T_ARRAY)
+#define H5T_IS_COMPLEX(t) ((t) == H5T_COMPOUND || (t) == H5T_ENUM || (t) == H5T_VLEN || (t) == H5T_ARRAY)
 
 /* Macro to ease detecting fixed "string" datatypes */
 #define H5T_IS_FIXED_STRING(dt) (H5T_STRING == (dt)->type)
 
 /* Macro to ease detecting variable-length "string" datatypes */
-#define H5T_IS_VL_STRING(dt)    (H5T_VLEN == (dt)->type && H5T_VLEN_STRING == (dt)->u.vlen.type)
+#define H5T_IS_VL_STRING(dt) (H5T_VLEN == (dt)->type && H5T_VLEN_STRING == (dt)->u.vlen.type)
 
 /* Macro to ease detecting fixed or variable-length "string" datatypes */
-#define H5T_IS_STRING(dt)       (H5T_IS_FIXED_STRING(dt) || H5T_IS_VL_STRING(dt))
+#define H5T_IS_STRING(dt) (H5T_IS_FIXED_STRING(dt) || H5T_IS_VL_STRING(dt))
 
 /* Macro to ease detecting atomic datatypes */
-#define H5T_IS_ATOMIC(dt)       (!(H5T_IS_COMPLEX((dt)->type) || (dt)->type == H5T_OPAQUE))
+#define H5T_IS_ATOMIC(dt) (!(H5T_IS_COMPLEX((dt)->type) || (dt)->type == H5T_OPAQUE))
 
 /* Macro to ease retrieving class of shared datatype */
 /* (Externally, a VL string is a string; internally, a VL string is a VL.  Lie
  *      to the user if they have a VL string and tell them it's in the string
  *      class)
  */
-#define H5T_GET_CLASS(shared, internal) ((internal) ? (shared)->type : (H5T_IS_VL_STRING(shared) ?  H5T_STRING : (shared)->type))
-
+#define H5T_GET_CLASS(shared, internal)                                                                      \
+    ((internal) ? (shared)->type : (H5T_IS_VL_STRING(shared) ? H5T_STRING : (shared)->type))
 
 /*
  * Datatype encoding versions
@@ -79,13 +79,13 @@
  * vlen sequences of objects which aren't arrays, etc.) or VAX byte-ordered
  * objects.
  */
-#define H5O_DTYPE_VERSION_1	1
+#define H5O_DTYPE_VERSION_1 1
 
 /* This is the version to create all datatypes which contain H5T_ARRAY
  * class objects (array definitely, potentially compound & vlen sequences also),
  * but not VAX byte-ordered objects.
  */
-#define H5O_DTYPE_VERSION_2	2
+#define H5O_DTYPE_VERSION_2 2
 
 /* This is the version to create all datatypes which contain VAX byte-ordered
  * objects (floating-point types, currently).
@@ -93,26 +93,26 @@
 /* This version also packs compound & enum field names without padding */
 /* This version also encodes the member offset of compound fields more efficiently */
 /* This version also encodes array types more efficiently */
-#define H5O_DTYPE_VERSION_3	3
+#define H5O_DTYPE_VERSION_3 3
 
 /* The latest version of the format.  Look through the 'encode helper' routine
  *      and 'size' callback for places to change when updating this. */
 #define H5O_DTYPE_VERSION_LATEST H5O_DTYPE_VERSION_3
 
-
 /* Flags for visiting datatype */
-#define H5T_VISIT_COMPLEX_FIRST 0x01            /* Visit complex datatype before visiting member/parent datatypes */
-#define H5T_VISIT_COMPLEX_LAST  0x02            /* Visit complex datatype after visiting member/parent datatypes */
-                                                /* (setting both flags will mean visiting complex type twice) */
-#define H5T_VISIT_SIMPLE        0x04            /* Visit simple datatypes (at all) */
-                                                /* (setting H5T_VISIT_SIMPLE and _not_ setting either H5T_VISIT_COMPLEX_FIRST or H5T_VISIT_COMPLEX_LAST will mean visiting _only_ "simple" "leafs" in the "tree" */
-                                                /* (_not_ setting H5T_VISIT_SIMPLE and setting either H5T_VISIT_COMPLEX_FIRST or H5T_VISIT_COMPLEX_LAST will mean visiting all nodes _except_ "simple" "leafs" in the "tree" */
-
+#define H5T_VISIT_COMPLEX_FIRST 0x01 /* Visit complex datatype before visiting member/parent datatypes */
+#define H5T_VISIT_COMPLEX_LAST  0x02 /* Visit complex datatype after visiting member/parent datatypes */
+                                     /* (setting both flags will mean visiting complex type twice) */
+#define H5T_VISIT_SIMPLE 0x04        /* Visit simple datatypes (at all) */
+/* (setting H5T_VISIT_SIMPLE and _not_ setting either H5T_VISIT_COMPLEX_FIRST or H5T_VISIT_COMPLEX_LAST will
+ * mean visiting _only_ "simple" "leafs" in the "tree" */
+/* (_not_ setting H5T_VISIT_SIMPLE and setting either H5T_VISIT_COMPLEX_FIRST or H5T_VISIT_COMPLEX_LAST will
+ * mean visiting all nodes _except_ "simple" "leafs" in the "tree" */
 
 /* Define an internal macro for converting long long to long double.  Mac OS 10.4 gives some
  * incorrect conversions. */
 #if (H5_WANT_DATA_ACCURACY && defined(H5_LLONG_TO_LDOUBLE_CORRECT)) || (!H5_WANT_DATA_ACCURACY)
-#define H5T_CONV_INTERNAL_LLONG_LDOUBLE       1
+#define H5T_CONV_INTERNAL_LLONG_LDOUBLE 1
 #endif
 
 /* Define an internal macro for converting unsigned long long to long double.  SGI compilers give
@@ -121,126 +121,125 @@
  * compiler tries to do the conversion.  For Cygwin, compiler doesn't do rounding correctly.
  * Mac OS 10.4 gives some incorrect result. */
 #if (H5_WANT_DATA_ACCURACY && defined(H5_LLONG_TO_LDOUBLE_CORRECT)) || (!H5_WANT_DATA_ACCURACY)
-#define H5T_CONV_INTERNAL_ULLONG_LDOUBLE         1
+#define H5T_CONV_INTERNAL_ULLONG_LDOUBLE 1
 #endif
 
 /* Define an internal macro for converting long double to long long.  SGI compilers give some incorrect
  * conversions. Mac OS 10.4 gives incorrect conversions. HP-UX 11.00 compiler generates floating exception.
  * The hard conversion on Windows .NET 2003 has a bug and gives wrong exception value. */
-#if (H5_WANT_DATA_ACCURACY && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \
-    (!H5_WANT_DATA_ACCURACY)
-#define H5T_CONV_INTERNAL_LDOUBLE_LLONG         1
+#if (H5_WANT_DATA_ACCURACY && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || (!H5_WANT_DATA_ACCURACY)
+#define H5T_CONV_INTERNAL_LDOUBLE_LLONG 1
 #endif
 
 /* Define an internal macro for converting long double to unsigned long long.  SGI compilers give some
  * incorrect conversions.  Mac OS 10.4 gives incorrect conversions. HP-UX 11.00 compiler generates
  * floating exception. */
-#if (H5_WANT_DATA_ACCURACY && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \
-    (!H5_WANT_DATA_ACCURACY)
-#define H5T_CONV_INTERNAL_LDOUBLE_ULLONG         1
+#if (H5_WANT_DATA_ACCURACY && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || (!H5_WANT_DATA_ACCURACY)
+#define H5T_CONV_INTERNAL_LDOUBLE_ULLONG 1
 #else
-#define H5T_CONV_INTERNAL_LDOUBLE_ULLONG         0
+#define H5T_CONV_INTERNAL_LDOUBLE_ULLONG 0
 #endif
 
 /* Statistics about a conversion function */
 struct H5T_stats_t {
-    unsigned	ncalls;			/*num calls to conversion function   */
-    hsize_t	nelmts;			/*total data points converted	     */
-    H5_timer_t	timer;			/*total time for conversion	     */
+    unsigned   ncalls; /*num calls to conversion function   */
+    hsize_t    nelmts; /*total data points converted	     */
+    H5_timer_t timer;  /*total time for conversion	     */
 };
 
 /* The datatype conversion database */
 struct H5T_path_t {
-    char	name[H5T_NAMELEN];	/*name for debugging only	     */
-    H5T_t	*src;			/*source datatype 		     */
-    H5T_t	*dst;			/*destination datatype		     */
-    H5T_conv_t	func;			/*data conversion function	     */
-    hbool_t	is_hard;		/*is it a hard function?	     */
-    hbool_t	is_noop;		/*is it the noop conversion?	     */
-    hbool_t	are_compounds;		/*are source and dest both compounds?*/
-    H5T_stats_t	stats;			/*statistics for the conversion	     */
-    H5T_cdata_t	cdata;			/*data for this function	     */
+    char        name[H5T_NAMELEN]; /*name for debugging only	     */
+    H5T_t *     src;               /*source datatype 		     */
+    H5T_t *     dst;               /*destination datatype		     */
+    H5T_conv_t  func;              /*data conversion function	     */
+    hbool_t     is_hard;           /*is it a hard function?	     */
+    hbool_t     is_noop;           /*is it the noop conversion?	     */
+    hbool_t     are_compounds;     /*are source and dest both compounds?*/
+    H5T_stats_t stats;             /*statistics for the conversion	     */
+    H5T_cdata_t cdata;             /*data for this function	     */
 };
 
 typedef struct H5T_atomic_t {
-    H5T_order_t		order;	/*byte order				     */
-    size_t		prec;	/*precision in bits			     */
-    size_t		offset; /*bit position of lsb of value		     */
-    H5T_pad_t	        lsb_pad;/*type of lsb padding			     */
-    H5T_pad_t		msb_pad;/*type of msb padding			     */
+    H5T_order_t order;   /*byte order				     */
+    size_t      prec;    /*precision in bits			     */
+    size_t      offset;  /*bit position of lsb of value		     */
+    H5T_pad_t   lsb_pad; /*type of lsb padding			     */
+    H5T_pad_t   msb_pad; /*type of msb padding			     */
     union {
-	struct {
-	    H5T_sign_t	sign;	/*type of integer sign			     */
-	} i;			/*integer; integer types		     */
-
-	struct {
-	    size_t	sign;	/*bit position of sign bit		     */
-	    size_t	epos;	/*position of lsb of exponent		     */
-	    size_t	esize;	/*size of exponent in bits		     */
-	    uint64_t	ebias;	/*exponent bias				     */
-	    size_t	mpos;	/*position of lsb of mantissa		     */
-	    size_t	msize;	/*size of mantissa			     */
-	    H5T_norm_t	norm;	/*normalization				     */
-	    H5T_pad_t	pad;	/*type of padding for internal bits	     */
-	} f;			/*floating-point types			     */
-
-	struct {
-	    H5T_cset_t	cset;	/*character set				     */
-	    H5T_str_t	pad;	/*space or null padding of extra bytes	     */
-	} s;			/*string types				     */
-
-	struct {
-	    H5R_type_t	rtype;	/*type of reference stored		     */
-            H5T_loc_t   loc;    /* Location of data in buffer		     */
-	} r;			/*reference types			     */
+        struct {
+            H5T_sign_t sign; /*type of integer sign			     */
+        } i;                 /*integer; integer types		     */
+
+        struct {
+            size_t     sign;  /*bit position of sign bit		     */
+            size_t     epos;  /*position of lsb of exponent		     */
+            size_t     esize; /*size of exponent in bits		     */
+            uint64_t   ebias; /*exponent bias				     */
+            size_t     mpos;  /*position of lsb of mantissa		     */
+            size_t     msize; /*size of mantissa			     */
+            H5T_norm_t norm;  /*normalization				     */
+            H5T_pad_t  pad;   /*type of padding for internal bits	     */
+        } f;                  /*floating-point types			     */
+
+        struct {
+            H5T_cset_t cset; /*character set				     */
+            H5T_str_t  pad;  /*space or null padding of extra bytes	     */
+        } s;                 /*string types				     */
+
+        struct {
+            H5R_type_t rtype; /*type of reference stored		     */
+            H5T_loc_t  loc;   /* Location of data in buffer		     */
+        } r;                  /*reference types			     */
     } u;
 } H5T_atomic_t;
 
 /* How members are sorted for compound or enum datatypes */
 typedef enum H5T_sort_t {
-    H5T_SORT_NONE	= 0,		/*not sorted			     */
-    H5T_SORT_NAME	= 1,		/*sorted by member name		     */
-    H5T_SORT_VALUE	= 2 		/*sorted by memb offset or enum value*/
+    H5T_SORT_NONE  = 0, /*not sorted			     */
+    H5T_SORT_NAME  = 1, /*sorted by member name		     */
+    H5T_SORT_VALUE = 2  /*sorted by memb offset or enum value*/
 } H5T_sort_t;
 
 /* A compound datatype member */
 typedef struct H5T_cmemb_t {
-    char		*name;		/*name of this member		     */
-    size_t		offset;		/*offset from beginning of struct    */
-    size_t		size;		/*size of this member		     */
-    struct H5T_t	*type;		/*type of this member		     */
+    char *        name;   /*name of this member		     */
+    size_t        offset; /*offset from beginning of struct    */
+    size_t        size;   /*size of this member		     */
+    struct H5T_t *type;   /*type of this member		     */
 } H5T_cmemb_t;
 
 /* A compound datatype */
 typedef struct H5T_compnd_t {
-    unsigned	nalloc;		/*num entries allocated in MEMB array*/
-    unsigned	nmembs;		/*number of members defined in struct*/
-    H5T_sort_t	sorted;		/*how are members sorted?	     */
-    hbool_t     packed;		/*are members packed together?       */
-    H5T_cmemb_t	*memb;		/*array of struct members	     */
-    size_t      memb_size;	/*total of all member sizes          */
+    unsigned     nalloc;    /*num entries allocated in MEMB array*/
+    unsigned     nmembs;    /*number of members defined in struct*/
+    H5T_sort_t   sorted;    /*how are members sorted?	     */
+    hbool_t      packed;    /*are members packed together?       */
+    H5T_cmemb_t *memb;      /*array of struct members	     */
+    size_t       memb_size; /*total of all member sizes          */
 } H5T_compnd_t;
 
 /* An enumeration datatype */
 typedef struct H5T_enum_t {
-    unsigned	nalloc;		/*num entries allocated		     */
-    unsigned	nmembs;		/*number of members defined in enum  */
-    H5T_sort_t	sorted;		/*how are members sorted?	     */
-    uint8_t	*value;		/*array of values		     */
-    char	**name;		/*array of symbol names		     */
+    unsigned   nalloc; /*num entries allocated		     */
+    unsigned   nmembs; /*number of members defined in enum  */
+    H5T_sort_t sorted; /*how are members sorted?	     */
+    uint8_t *  value;  /*array of values		     */
+    char **    name;   /*array of symbol names		     */
 } H5T_enum_t;
 
 /* VL function pointers */
 typedef ssize_t (*H5T_vlen_getlenfunc_t)(const void *vl_addr);
-typedef void * (*H5T_vlen_getptrfunc_t)(void *vl_addr);
+typedef void *(*H5T_vlen_getptrfunc_t)(void *vl_addr);
 typedef htri_t (*H5T_vlen_isnullfunc_t)(const H5F_t *f, void *vl_addr);
 typedef herr_t (*H5T_vlen_readfunc_t)(H5F_t *f, hid_t dxpl_id, void *_vl, void *buf, size_t len);
-typedef herr_t (*H5T_vlen_writefunc_t)(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf, void *_bg, size_t seq_len, size_t base_size);
+typedef herr_t (*H5T_vlen_writefunc_t)(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info,
+                                       void *_vl, void *buf, void *_bg, size_t seq_len, size_t base_size);
 typedef herr_t (*H5T_vlen_setnullfunc_t)(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg);
 
 /* VL types */
 typedef enum {
-    H5T_VLEN_BADTYPE =  -1, /* invalid VL Type */
+    H5T_VLEN_BADTYPE  = -1, /* invalid VL Type */
     H5T_VLEN_SEQUENCE = 0,  /* VL sequence */
     H5T_VLEN_STRING,        /* VL string */
     H5T_VLEN_MAXTYPE        /* highest type (Invalid as true type) */
@@ -248,89 +247,90 @@ typedef enum {
 
 /* A VL datatype */
 typedef struct H5T_vlen_t {
-    H5T_vlen_type_t     type;   /* Type of VL data in buffer */
-    H5T_loc_t		loc;    /* Location of VL data in buffer */
-    H5T_cset_t          cset;   /* For VL string. character set */
-    H5T_str_t           pad;    /* For VL string.  space or null padding of
-                                 * extra bytes */
-    H5F_t *f;                   /* File ID (if VL data is on disk) */
-    H5T_vlen_getptrfunc_t getptr;   /* Function to get VL sequence pointer */
-    H5T_vlen_getlenfunc_t getlen;   /* Function to get VL sequence size (in element units, not bytes) */
-    H5T_vlen_isnullfunc_t isnull;   /* Function to check if VL value is NIL */
-    H5T_vlen_readfunc_t read;   /* Function to read VL sequence into buffer */
-    H5T_vlen_writefunc_t write; /* Function to write VL sequence from buffer */
+    H5T_vlen_type_t type;           /* Type of VL data in buffer */
+    H5T_loc_t       loc;            /* Location of VL data in buffer */
+    H5T_cset_t      cset;           /* For VL string. character set */
+    H5T_str_t       pad;            /* For VL string.  space or null padding of
+                                     * extra bytes */
+    H5F_t *                f;       /* File ID (if VL data is on disk) */
+    H5T_vlen_getptrfunc_t  getptr;  /* Function to get VL sequence pointer */
+    H5T_vlen_getlenfunc_t  getlen;  /* Function to get VL sequence size (in element units, not bytes) */
+    H5T_vlen_isnullfunc_t  isnull;  /* Function to check if VL value is NIL */
+    H5T_vlen_readfunc_t    read;    /* Function to read VL sequence into buffer */
+    H5T_vlen_writefunc_t   write;   /* Function to write VL sequence from buffer */
     H5T_vlen_setnullfunc_t setnull; /* Function to set a VL value to NIL */
 } H5T_vlen_t;
 
 /* An opaque datatype */
 typedef struct H5T_opaque_t {
-    char		*tag;		/*short type description string	     */
+    char *tag; /*short type description string	     */
 } H5T_opaque_t;
 
 /* An array datatype */
 typedef struct H5T_array_t {
-    size_t	nelem;		/* total number of elements in array */
-    unsigned	ndims;		/* member dimensionality        */
-    size_t	dim[H5S_MAX_RANK];  /* size in each dimension       */
+    size_t   nelem;             /* total number of elements in array */
+    unsigned ndims;             /* member dimensionality        */
+    size_t   dim[H5S_MAX_RANK]; /* size in each dimension       */
 } H5T_array_t;
 
 typedef enum H5T_state_t {
-    H5T_STATE_TRANSIENT, 		/*type is a modifiable, closable transient */
-    H5T_STATE_RDONLY,			/*transient, not modifiable, closable */
-    H5T_STATE_IMMUTABLE,		/*transient, not modifiable, not closable */
-    H5T_STATE_NAMED,			/*named constant, not open	     */
-    H5T_STATE_OPEN			/*named constant, open object header */
+    H5T_STATE_TRANSIENT, /*type is a modifiable, closable transient */
+    H5T_STATE_RDONLY,    /*transient, not modifiable, closable */
+    H5T_STATE_IMMUTABLE, /*transient, not modifiable, not closable */
+    H5T_STATE_NAMED,     /*named constant, not open	     */
+    H5T_STATE_OPEN       /*named constant, open object header */
 } H5T_state_t;
 
-    /* This struct is shared between all occurrences of an open named type */
+/* This struct is shared between all occurrences of an open named type */
 typedef struct H5T_shared_t {
-    hsize_t		fo_count; /* number of references to this file object */
-    H5T_state_t		state;	/*current state of the type		     */
-    H5T_class_t		type;	/*which class of type is this?		     */
-    size_t		size;	/*total size of an instance of this type     */
-    unsigned            version;        /* Version of object header message to encode this object with */
-    hbool_t		force_conv;/* Set if this type always needs to be converted and H5T__conv_noop cannot be called */
-    struct H5T_t	*parent;/*parent type for derived datatypes	     */
+    hsize_t     fo_count; /* number of references to this file object */
+    H5T_state_t state;    /*current state of the type		     */
+    H5T_class_t type;     /*which class of type is this?		     */
+    size_t      size;     /*total size of an instance of this type     */
+    unsigned    version;  /* Version of object header message to encode this object with */
+    hbool_t
+                  force_conv; /* Set if this type always needs to be converted and H5T__conv_noop cannot be called */
+    struct H5T_t *parent; /*parent type for derived datatypes	     */
     union {
-        H5T_atomic_t	atomic; /* an atomic datatype              */
-        H5T_compnd_t	compnd; /* a compound datatype (struct)    */
-        H5T_enum_t	enumer; /* an enumeration type (enum)       */
-        H5T_vlen_t	vlen;   /* a variable-length datatype       */
-        H5T_opaque_t	opaque; /* an opaque datatype              */
-        H5T_array_t	array;  /* an array datatype                */
+        H5T_atomic_t atomic; /* an atomic datatype              */
+        H5T_compnd_t compnd; /* a compound datatype (struct)    */
+        H5T_enum_t   enumer; /* an enumeration type (enum)       */
+        H5T_vlen_t   vlen;   /* a variable-length datatype       */
+        H5T_opaque_t opaque; /* an opaque datatype              */
+        H5T_array_t  array;  /* an array datatype                */
     } u;
 } H5T_shared_t;
 
 struct H5T_t {
-    H5O_shared_t    sh_loc;     /* Shared message info (must be first) */
+    H5O_shared_t sh_loc; /* Shared message info (must be first) */
 
-    H5T_shared_t   *shared;     /* all other information */
-    H5O_loc_t       oloc;       /* Object location, if the type is a named type */
-    H5G_name_t      path;       /* group hier. path if the type is a named type */
+    H5T_shared_t *shared; /* all other information */
+    H5O_loc_t     oloc;   /* Object location, if the type is a named type */
+    H5G_name_t    path;   /* group hier. path if the type is a named type */
 };
 
 /* The master list of soft conversion functions */
 typedef struct H5T_soft_t {
-    char	name[H5T_NAMELEN];	/*name for debugging only	     */
-    H5T_class_t src;			/*source datatype class	     */
-    H5T_class_t dst;			/*destination datatype class	     */
-    H5T_conv_t	func;			/*the conversion function	     */
+    char        name[H5T_NAMELEN]; /*name for debugging only	     */
+    H5T_class_t src;               /*source datatype class	     */
+    H5T_class_t dst;               /*destination datatype class	     */
+    H5T_conv_t  func;              /*the conversion function	     */
 } H5T_soft_t;
 
 /* Bit search direction */
 typedef enum H5T_sdir_t {
-    H5T_BIT_LSB,			/*search lsb toward msb		     */
-    H5T_BIT_MSB				/*search msb toward lsb		     */
+    H5T_BIT_LSB, /*search lsb toward msb		     */
+    H5T_BIT_MSB  /*search msb toward lsb		     */
 } H5T_sdir_t;
 
 /* Typedef for named datatype creation operation */
 typedef struct {
-    H5T_t *dt;                  /* Datatype to commit */
-    hid_t tcpl_id;              /* Named datatype creation property list */
+    H5T_t *dt;      /* Datatype to commit */
+    hid_t  tcpl_id; /* Named datatype creation property list */
 } H5T_obj_create_t;
 
 /* Typedef for datatype iteration operations */
-typedef herr_t (*H5T_operator_t)(H5T_t *dt, void *op_data/*in,out*/);
+typedef herr_t (*H5T_operator_t)(H5T_t *dt, void *op_data /*in,out*/);
 
 /*
  * Alignment information for native types. A value of N indicates that the
@@ -339,15 +339,15 @@ typedef herr_t (*H5T_operator_t)(H5T_t *dt, void *op_data/*in,out*/);
  * not calculated.  These alignment info is only for H5Tget_native_type.
  * These values are used for structure alignment.
  */
-H5_DLLVAR size_t	H5T_NATIVE_SCHAR_COMP_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_SHORT_COMP_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_COMP_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_LONG_COMP_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_LLONG_COMP_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_FLOAT_COMP_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_DOUBLE_COMP_ALIGN_g;
-#if H5_SIZEOF_LONG_DOUBLE !=0
-H5_DLLVAR size_t	H5T_NATIVE_LDOUBLE_COMP_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_SCHAR_COMP_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_SHORT_COMP_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_COMP_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_LONG_COMP_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_LLONG_COMP_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_FLOAT_COMP_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_DOUBLE_COMP_ALIGN_g;
+#if H5_SIZEOF_LONG_DOUBLE != 0
+H5_DLLVAR size_t H5T_NATIVE_LDOUBLE_COMP_ALIGN_g;
 #endif
 
 H5_DLLVAR size_t H5T_POINTER_COMP_ALIGN_g;
@@ -361,58 +361,58 @@ H5_DLLVAR size_t H5T_HDSETREGREF_COMP_ALIGN_g;
  * N=1 no alignment is required; N=0 implies that alignment constraints were
  * not calculated.
  */
-H5_DLLVAR size_t	H5T_NATIVE_SCHAR_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UCHAR_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_SHORT_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_USHORT_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_LONG_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_ULONG_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_LLONG_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_ULLONG_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_FLOAT_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_DOUBLE_ALIGN_g;
-#if H5_SIZEOF_LONG_DOUBLE !=0
-H5_DLLVAR size_t	H5T_NATIVE_LDOUBLE_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_SCHAR_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UCHAR_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_SHORT_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_USHORT_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_LONG_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_ULONG_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_LLONG_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_ULLONG_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_FLOAT_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_DOUBLE_ALIGN_g;
+#if H5_SIZEOF_LONG_DOUBLE != 0
+H5_DLLVAR size_t H5T_NATIVE_LDOUBLE_ALIGN_g;
 #endif
 
 /* C9x alignment constraints */
-H5_DLLVAR size_t	H5T_NATIVE_INT8_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT8_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_LEAST8_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_LEAST8_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_FAST8_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_FAST8_ALIGN_g;
-
-H5_DLLVAR size_t	H5T_NATIVE_INT16_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT16_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_LEAST16_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_LEAST16_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_FAST16_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_FAST16_ALIGN_g;
-
-H5_DLLVAR size_t	H5T_NATIVE_INT32_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT32_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_LEAST32_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_LEAST32_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_FAST32_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_FAST32_ALIGN_g;
-
-H5_DLLVAR size_t	H5T_NATIVE_INT64_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT64_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_LEAST64_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_LEAST64_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_INT_FAST64_ALIGN_g;
-H5_DLLVAR size_t	H5T_NATIVE_UINT_FAST64_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT8_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT8_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_LEAST8_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_LEAST8_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_FAST8_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_FAST8_ALIGN_g;
+
+H5_DLLVAR size_t H5T_NATIVE_INT16_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT16_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_LEAST16_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_LEAST16_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_FAST16_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_FAST16_ALIGN_g;
+
+H5_DLLVAR size_t H5T_NATIVE_INT32_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT32_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_LEAST32_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_LEAST32_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_FAST32_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_FAST32_ALIGN_g;
+
+H5_DLLVAR size_t H5T_NATIVE_INT64_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT64_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_LEAST64_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_LEAST64_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_INT_FAST64_ALIGN_g;
+H5_DLLVAR size_t H5T_NATIVE_UINT_FAST64_ALIGN_g;
 
 /* Useful floating-point values for conversion routines */
 /* (+/- Inf for all floating-point types) */
-H5_DLLVAR float H5T_NATIVE_FLOAT_POS_INF_g;
-H5_DLLVAR float H5T_NATIVE_FLOAT_NEG_INF_g;
+H5_DLLVAR float  H5T_NATIVE_FLOAT_POS_INF_g;
+H5_DLLVAR float  H5T_NATIVE_FLOAT_NEG_INF_g;
 H5_DLLVAR double H5T_NATIVE_DOUBLE_POS_INF_g;
 H5_DLLVAR double H5T_NATIVE_DOUBLE_NEG_INF_g;
-#if H5_SIZEOF_LONG_DOUBLE !=0
+#if H5_SIZEOF_LONG_DOUBLE != 0
 H5_DLLVAR double H5T_NATIVE_LDOUBLE_POS_INF_g;
 H5_DLLVAR double H5T_NATIVE_LDOUBLE_NEG_INF_g;
 #endif
@@ -425,873 +425,539 @@ H5FL_EXTERN(H5T_shared_t);
 H5_DLL herr_t H5T__term_deprec_interface(void);
 H5_DLL H5T_t *H5T__create(H5T_class_t type, size_t size);
 H5_DLL herr_t H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id);
-H5_DLL herr_t H5T__commit_named(const H5G_loc_t *loc, const char *name,
-    H5T_t *dt, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, hid_t lcpl_id,
+                                hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id);
 H5_DLL H5T_t *H5T__alloc(void);
 H5_DLL herr_t H5T__free(H5T_t *dt);
-H5_DLL herr_t H5T__visit(H5T_t *dt, unsigned visit_flags, H5T_operator_t op,
-    void *op_value);
+H5_DLL herr_t H5T__visit(H5T_t *dt, unsigned visit_flags, H5T_operator_t op, void *op_value);
 H5_DLL herr_t H5T__upgrade_version(H5T_t *dt, unsigned new_version);
 
 /* Conversion functions */
-H5_DLL herr_t H5T__conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-
-H5_DLL herr_t H5T__conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *_buf, void *bkg,
-                            hid_t dset_xfer_plist);
-
-H5_DLL herr_t H5T__conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-                            size_t nelmts, size_t buf_stride,
-                            size_t bkg_stride, void *buf, void *bkg,
-                            hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_int(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                             size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+
+H5_DLL herr_t H5T__conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                              size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg,
+                              hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_uint(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                               size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg,
+                               hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_int(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                             size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                             size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                              size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                              hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist);
+
+H5_DLL herr_t H5T__conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_uint(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_long(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_ulong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_long(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_ulong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_llong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_llong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
 
-H5_DLL herr_t H5T__conv_short_schar(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_uchar(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_schar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_uchar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_ushort(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_short(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_int(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_uint(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_int(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_uint(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_long(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_ulong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_long(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_ulong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_llong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_llong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_ullong(hid_t src_id, hid_t dst_id,
-				      H5T_cdata_t *cdata, size_t nelmts,
-				      size_t buf_stride, size_t bkg_stride,
-                                      void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                       hid_t dset_xfer_plist);
 
-H5_DLL herr_t H5T__conv_int_schar(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_uchar(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_schar(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_uchar(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_short(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_ushort(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_short(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_ushort(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_uint(hid_t src_id, hid_t dst_id,
-				 H5T_cdata_t *cdata, size_t nelmts,
-				 size_t buf_stride, size_t bkg_stride,
-                                 void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                 size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                  hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_int(hid_t src_id, hid_t dst_id,
-				 H5T_cdata_t *cdata, size_t nelmts,
-				 size_t buf_stride, size_t bkg_stride,
-                                 void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                 size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                  hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_long(hid_t src_id, hid_t dst_id,
-				 H5T_cdata_t *cdata, size_t nelmts,
-				 size_t buf_stride, size_t bkg_stride,
-                                 void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                 size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                  hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_ulong(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_long(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_ulong(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_llong(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_ullong(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_llong(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_ullong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
 
-H5_DLL herr_t H5T__conv_long_schar(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_uchar(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_schar(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_uchar(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_short(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_ushort(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_short(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_ushort(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_int(hid_t src_id, hid_t dst_id,
-				 H5T_cdata_t *cdata, size_t nelmts,
-				 size_t buf_stride, size_t bkg_stride,
-                                 void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                 size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                  hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_uint(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_int(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_uint(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_ulong(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_long(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_llong(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_ullong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_llong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
 
-H5_DLL herr_t H5T__conv_llong_schar(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_uchar(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_schar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_uchar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_short(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_ushort(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_short(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_ushort(hid_t src_id, hid_t dst_id,
-				      H5T_cdata_t *cdata, size_t nelmts,
-				      size_t buf_stride, size_t bkg_stride,
-                                      void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                       hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_int(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t buf_stride, size_t bkg_stride,
-                                  void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                   hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_uint(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_int(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_uint(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_long(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t buf_stride, size_t bkg_stride,
-                                   void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_ulong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_long(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t buf_stride, size_t bkg_stride,
-                                    void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_ulong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_llong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_schar_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uchar_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_short_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ushort_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_int_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_uint_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_long_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ulong_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_llong_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_float(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_double(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ullong_ldouble(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_schar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_uchar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_short(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_ushort(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_float_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_int(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_uint(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_long(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_ulong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_llong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_float_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_schar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_uchar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
-                                     hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_short(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_float_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_double_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_double_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                       size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                       hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                       size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                       hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_schar_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_schar_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_ushort(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_schar_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uchar_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uchar_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_int(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_uchar_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_short_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_short_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_uint(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_short_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ushort_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_long(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ushort_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ushort_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                       size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                       hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_int_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_int_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_int_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uint_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uint_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_uint_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_ulong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_long_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_long_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_long_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_llong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ulong_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_double_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ulong_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_llong_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_llong_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_schar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_llong_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ullong_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_uchar(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ullong_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ullong_ldouble(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                       size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                       hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_short(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_float_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                  size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_float_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_ushort(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_double_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_int(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_double_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_uint(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_double_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_long(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_double_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_double_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                   size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_double_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_double_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_double_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_ulong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_double_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_llong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_double_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                       size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                       hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                    size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
-H5_DLL herr_t H5T__conv_ldouble_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t buf_stride, size_t bkg_stride,
-                                     void *buf, void *bkg,
+H5_DLL herr_t H5T__conv_ldouble_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                     size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                      size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
+H5_DLL herr_t H5T__conv_ldouble_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+                                       size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
+                                       hid_t dset_xfer_plist);
 
 /* Bit twiddling functions */
-H5_DLL void H5T__bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src,
-			  size_t src_offset, size_t size);
-H5_DLL herr_t H5T__bit_shift(uint8_t *buf, ssize_t shift_dist, size_t offset, size_t size);
-H5_DLL void H5T__bit_set(uint8_t *buf, size_t offset, size_t size,
-			 hbool_t value);
+H5_DLL void     H5T__bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src, size_t src_offset,
+                              size_t size);
+H5_DLL herr_t   H5T__bit_shift(uint8_t *buf, ssize_t shift_dist, size_t offset, size_t size);
+H5_DLL void     H5T__bit_set(uint8_t *buf, size_t offset, size_t size, hbool_t value);
 H5_DLL uint64_t H5T__bit_get_d(uint8_t *buf, size_t offset, size_t size);
-H5_DLL void H5T__bit_set_d(uint8_t *buf, size_t offset, size_t size,
-			   uint64_t val);
-H5_DLL ssize_t H5T__bit_find(uint8_t *buf, size_t offset, size_t size,
-			     H5T_sdir_t direction, hbool_t value);
-H5_DLL htri_t H5T__bit_inc(uint8_t *buf, size_t start, size_t size);
-H5_DLL htri_t H5T__bit_dec(uint8_t *buf, size_t start, size_t size);
-H5_DLL void H5T__bit_neg(uint8_t *buf, size_t start, size_t size);
+H5_DLL void     H5T__bit_set_d(uint8_t *buf, size_t offset, size_t size, uint64_t val);
+H5_DLL ssize_t  H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction, hbool_t value);
+H5_DLL htri_t   H5T__bit_inc(uint8_t *buf, size_t start, size_t size);
+H5_DLL htri_t   H5T__bit_dec(uint8_t *buf, size_t start, size_t size);
+H5_DLL void     H5T__bit_neg(uint8_t *buf, size_t start, size_t size);
 
 /* VL functions */
-H5_DLL H5T_t * H5T__vlen_create(const H5T_t *base);
+H5_DLL H5T_t *H5T__vlen_create(const H5T_t *base);
 H5_DLL htri_t H5T__vlen_set_loc(const H5T_t *dt, H5F_t *f, H5T_loc_t loc);
 
 /* Array functions */
@@ -1300,10 +966,9 @@ H5_DLL int    H5T__get_array_ndims(const H5T_t *dt);
 H5_DLL int    H5T__get_array_dims(const H5T_t *dt, hsize_t dims[]);
 
 /* Compound functions */
-H5_DLL herr_t H5T__insert(H5T_t *parent, const char *name, size_t offset,
-        const H5T_t *member);
+H5_DLL herr_t H5T__insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member);
 H5_DLL size_t H5T__get_member_size(const H5T_t *dt, unsigned membno);
-H5_DLL void H5T__update_packed(const H5T_t *dt);
+H5_DLL void   H5T__update_packed(const H5T_t *dt);
 H5_DLL H5T_subset_info_t *H5T__conv_struct_subset(const H5T_cdata_t *cdata);
 
 /* Enumerated type functions */
@@ -1312,12 +977,11 @@ H5_DLL herr_t H5T__enum_insert(const H5T_t *dt, const char *name, const void *va
 H5_DLL herr_t H5T__get_member_value(const H5T_t *dt, unsigned membno, void *value);
 
 /* Field functions (for both compound & enumerated types) */
-H5_DLL char  *H5T__get_member_name(H5T_t const *dt, unsigned membno);
+H5_DLL char * H5T__get_member_name(H5T_t const *dt, unsigned membno);
 H5_DLL herr_t H5T__sort_value(const H5T_t *dt, int *map);
 H5_DLL herr_t H5T__sort_name(const H5T_t *dt, int *map);
 
 /* Debugging functions */
-H5_DLL herr_t H5T__print_stats(H5T_path_t *path, int *nprint/*in,out*/);
+H5_DLL herr_t H5T__print_stats(H5T_path_t *path, int *nprint /*in,out*/);
 
 #endif /* _H5Tpkg_H */
-
diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c
index badab78..2319d83 100644
--- a/src/H5Tprecis.c
+++ b/src/H5Tprecis.c
@@ -16,21 +16,19 @@
  *      the datatype precision for the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_precis_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_precis_interface
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Tpkg.h"		/* Datatypes				*/
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Tpkg.h"     /* Datatypes				*/
 
 /* Static local functions */
 static herr_t H5T_set_precision(const H5T_t *dt, size_t prec);
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_precis_interface -- Initialize interface-specific information
@@ -52,7 +50,6 @@ H5T_init_precis_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_precis_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_precision
  *
@@ -78,25 +75,24 @@ H5T_init_precis_interface(void)
 size_t
 H5Tget_precision(hid_t type_id)
 {
-    H5T_t	*dt;
-    size_t	ret_value;
+    H5T_t *dt;
+    size_t ret_value;
 
     FUNC_ENTER_API(0)
     H5TRACE1("z", "i", type_id);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype")
 
     /* Get precision */
-    if((ret_value = H5T_get_precision(dt)) == 0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, 0, "cant't get precision for specified datatype")
+    if ((ret_value = H5T_get_precision(dt)) == 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, 0, "cant't get precision for specified datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_precision() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_get_precision
  *
@@ -117,15 +113,15 @@ done:
 size_t
 H5T_get_precision(const H5T_t *dt)
 {
-    size_t	ret_value;
+    size_t ret_value;
 
     FUNC_ENTER_NOAPI(0)
 
     /* Defer to parent*/
-    while(dt->shared->parent)
+    while (dt->shared->parent)
         dt = dt->shared->parent;
-    if(!H5T_IS_ATOMIC(dt->shared))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, 0, "operation not defined for specified datatype")
+    if (!H5T_IS_ATOMIC(dt->shared))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, 0, "operation not defined for specified datatype")
 
     /* Precision */
     ret_value = dt->shared->u.atomic.prec;
@@ -134,7 +130,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_get_precision() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_precision
  *
@@ -167,35 +162,34 @@ done:
 herr_t
 H5Tset_precision(hid_t type_id, size_t prec)
 {
-    H5T_t	*dt = NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", type_id, prec);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is read-only")
     if (prec == 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "precision must be positive")
-    if (H5T_ENUM==dt->shared->type && dt->shared->u.enumer.nmembs>0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after members are defined")
-    if (H5T_STRING==dt->shared->type)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "precision must be positive")
+    if (H5T_ENUM == dt->shared->type && dt->shared->u.enumer.nmembs > 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after members are defined")
+    if (H5T_STRING == dt->shared->type)
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "precision for this type is read-only")
-    if (H5T_COMPOUND==dt->shared->type || H5T_OPAQUE==dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified datatype")
+    if (H5T_COMPOUND == dt->shared->type || H5T_OPAQUE == dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified datatype")
 
     /* Do the work */
-    if (H5T_set_precision(dt, prec)<0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "unable to set precision")
+    if (H5T_set_precision(dt, prec) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "unable to set precision")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_set_precision
  *
@@ -228,42 +222,43 @@ done:
 static herr_t
 H5T_set_precision(const H5T_t *dt, size_t prec)
 {
-    size_t	offset, size;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    size_t offset, size;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(dt);
-    HDassert(prec>0);
-    HDassert(H5T_OPAQUE!=dt->shared->type);
-    HDassert(H5T_COMPOUND!=dt->shared->type);
-    HDassert(H5T_STRING!=dt->shared->type);
-    HDassert(!(H5T_ENUM==dt->shared->type && 0==dt->shared->u.enumer.nmembs));
+    HDassert(prec > 0);
+    HDassert(H5T_OPAQUE != dt->shared->type);
+    HDassert(H5T_COMPOUND != dt->shared->type);
+    HDassert(H5T_STRING != dt->shared->type);
+    HDassert(!(H5T_ENUM == dt->shared->type && 0 == dt->shared->u.enumer.nmembs));
 
     if (dt->shared->parent) {
-	if (H5T_set_precision(dt->shared->parent, prec)<0)
-	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "unable to set precision for base type")
+        if (H5T_set_precision(dt->shared->parent, prec) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "unable to set precision for base type")
 
         /* Adjust size of datatype appropriately */
-        if(dt->shared->type==H5T_ARRAY)
+        if (dt->shared->type == H5T_ARRAY)
             dt->shared->size = dt->shared->parent->shared->size * dt->shared->u.array.nelem;
-        else if(dt->shared->type!=H5T_VLEN)
+        else if (dt->shared->type != H5T_VLEN)
             dt->shared->size = dt->shared->parent->shared->size;
-    } else {
+    }
+    else {
         if (H5T_IS_ATOMIC(dt->shared)) {
-	    /* Adjust the offset and size */
-	    offset = dt->shared->u.atomic.offset;
-	    size = dt->shared->size;
-	    if (prec > 8*size)
+            /* Adjust the offset and size */
+            offset = dt->shared->u.atomic.offset;
+            size   = dt->shared->size;
+            if (prec > 8 * size)
                 offset = 0;
-	    else if (offset+prec > 8 * size)
+            else if (offset + prec > 8 * size)
                 offset = 8 * size - prec;
-	    if (prec > 8*size)
-                size = (prec+7) / 8;
+            if (prec > 8 * size)
+                size = (prec + 7) / 8;
 
-	    /* Check that things are still kosher */
-	    switch (dt->shared->type) {
+            /* Check that things are still kosher */
+            switch (dt->shared->type) {
                 case H5T_INTEGER:
                 case H5T_TIME:
                 case H5T_BITFIELD:
@@ -276,20 +271,21 @@ H5T_set_precision(const H5T_t *dt, size_t prec)
                      * first when decreasing the precision of a floating point
                      * type.
                      */
-                    if (dt->shared->u.atomic.u.f.sign >= prec+offset ||
-                            dt->shared->u.atomic.u.f.epos + dt->shared->u.atomic.u.f.esize > prec+offset ||
-                            dt->shared->u.atomic.u.f.mpos + dt->shared->u.atomic.u.f.msize > prec+offset)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "adjust sign, mantissa, and exponent fields first")
+                    if (dt->shared->u.atomic.u.f.sign >= prec + offset ||
+                        dt->shared->u.atomic.u.f.epos + dt->shared->u.atomic.u.f.esize > prec + offset ||
+                        dt->shared->u.atomic.u.f.mpos + dt->shared->u.atomic.u.f.msize > prec + offset)
+                        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                                    "adjust sign, mantissa, and exponent fields first")
                     break;
                 default:
                     HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "operation not defined for datatype class")
-	    } /* end switch */ /*lint !e788 All appropriate cases are covered */
+            } /* end switch */ /*lint !e788 All appropriate cases are covered */
 
-	    /* Commit */
-	    dt->shared->size = size;
+            /* Commit */
+            dt->shared->size            = size;
             dt->shared->u.atomic.offset = offset;
-            dt->shared->u.atomic.prec = prec;
-	} /* end if */
+            dt->shared->u.atomic.prec   = prec;
+        } /* end if */
         else
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not defined for specified datatype")
     } /* end else */
@@ -297,4 +293,3 @@ H5T_set_precision(const H5T_t *dt, size_t prec)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
-
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index e7211f7..a996169 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -21,61 +21,57 @@
 #include "H5Tpublic.h"
 
 /* Other public headers needed by this file */
-#include "H5MMpublic.h"         /* Memory management                    */
+#include "H5MMpublic.h" /* Memory management                    */
 
 /* Private headers needed by this file */
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Gprivate.h"        /* Groups                   */
-#include "H5Rprivate.h"        /* References                */
+#include "H5private.h"  /* Generic Functions            */
+#include "H5Gprivate.h" /* Groups                   */
+#include "H5Rprivate.h" /* References                */
 
 /* Macro for size of temporary buffers to contain a single element */
-#define H5T_ELEM_BUF_SIZE       256
+#define H5T_ELEM_BUF_SIZE 256
 
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5T_PACKAGE
-#define H5T_GET_SIZE(T)                 ((T)->shared->size)
-#define H5T_GET_SHARED(T)               ((T)->shared)
-#define H5T_GET_MEMBER_OFFSET(T, I)     ((T)->u.compnd.memb[I].offset)
-#define H5T_GET_MEMBER_SIZE(T, I)       ((T)->u.compnd.memb[I].shared->size)
+#define H5T_GET_SIZE(T)             ((T)->shared->size)
+#define H5T_GET_SHARED(T)           ((T)->shared)
+#define H5T_GET_MEMBER_OFFSET(T, I) ((T)->u.compnd.memb[I].offset)
+#define H5T_GET_MEMBER_SIZE(T, I)   ((T)->u.compnd.memb[I].shared->size)
 #else /* H5T_PACKAGE */
-#define H5T_GET_SIZE(T)                 (H5T_get_size(T))
-#define H5T_GET_SHARED(T)               (H5T_get_shared(T))
-#define H5T_GET_MEMBER_OFFSET(T, I)     (H5T_get_member_offset((T), (I)))
-#define H5T_GET_MEMBER_SIZE(T, I)       (H5T_get_member_size((T), (I)))
+#define H5T_GET_SIZE(T)             (H5T_get_size(T))
+#define H5T_GET_SHARED(T)           (H5T_get_shared(T))
+#define H5T_GET_MEMBER_OFFSET(T, I) (H5T_get_member_offset((T), (I)))
+#define H5T_GET_MEMBER_SIZE(T, I)   (H5T_get_member_size((T), (I)))
 #endif /* H5T_PACKAGE */
 
 /* Forward references of package typedefs (declared in H5Tpkg.h) */
-typedef struct H5T_t H5T_t;
+typedef struct H5T_t       H5T_t;
 typedef struct H5T_stats_t H5T_stats_t;
-typedef struct H5T_path_t H5T_path_t;
+typedef struct H5T_path_t  H5T_path_t;
 
 /* How to copy a datatype */
-typedef enum H5T_copy_t {
-    H5T_COPY_TRANSIENT,
-    H5T_COPY_ALL,
-    H5T_COPY_REOPEN
-} H5T_copy_t;
+typedef enum H5T_copy_t { H5T_COPY_TRANSIENT, H5T_COPY_ALL, H5T_COPY_REOPEN } H5T_copy_t;
 
 /* Location of datatype information */
 typedef enum {
-    H5T_LOC_BADLOC =   0,  /* invalid datatype location */
-    H5T_LOC_MEMORY,        /* data stored in memory */
-    H5T_LOC_DISK,          /* data stored on disk */
-    H5T_LOC_MAXLOC         /* highest value (Invalid as true value) */
+    H5T_LOC_BADLOC = 0, /* invalid datatype location */
+    H5T_LOC_MEMORY,     /* data stored in memory */
+    H5T_LOC_DISK,       /* data stored on disk */
+    H5T_LOC_MAXLOC      /* highest value (Invalid as true value) */
 } H5T_loc_t;
 
 /* VL allocation information */
 typedef struct {
     H5MM_allocate_t alloc_func; /* Allocation function */
-    void *alloc_info;           /* Allocation information */
-    H5MM_free_t free_func;      /* Free function */
-    void *free_info;            /* Free information */
+    void *          alloc_info; /* Allocation information */
+    H5MM_free_t     free_func;  /* Free function */
+    void *          free_info;  /* Free information */
 } H5T_vlen_alloc_info_t;
 
 /* Structure for conversion callback property */
 typedef struct H5T_conv_cb_t {
-    H5T_conv_except_func_t      func;
-    void*                       user_data;
+    H5T_conv_except_func_t func;
+    void *                 user_data;
 } H5T_conv_cb_t;
 
 /* Values for the optimization of compound data reading and writing.  They indicate
@@ -83,16 +79,16 @@ typedef struct H5T_conv_cb_t {
  * there is no conversion needed.
  */
 typedef enum {
-    H5T_SUBSET_BADVALUE = -1,   /* Invalid value */
-    H5T_SUBSET_FALSE = 0,       /* Source and destination aren't subset of each other */
-    H5T_SUBSET_SRC,             /* Source is the subset of dest and no conversion is needed */
-    H5T_SUBSET_DST,             /* Dest is the subset of source and no conversion is needed */
-    H5T_SUBSET_CAP              /* Must be the last value */
+    H5T_SUBSET_BADVALUE = -1, /* Invalid value */
+    H5T_SUBSET_FALSE    = 0,  /* Source and destination aren't subset of each other */
+    H5T_SUBSET_SRC,           /* Source is the subset of dest and no conversion is needed */
+    H5T_SUBSET_DST,           /* Dest is the subset of source and no conversion is needed */
+    H5T_SUBSET_CAP            /* Must be the last value */
 } H5T_subset_t;
 
 typedef struct H5T_subset_info_t {
-    H5T_subset_t    subset;     /* See above */
-    size_t          copy_size;  /* Size in bytes, to copy for each element */
+    H5T_subset_t subset;    /* See above */
+    size_t       copy_size; /* Size in bytes, to copy for each element */
 } H5T_subset_info_t;
 
 /* Forward declarations for prototype arguments */
@@ -107,38 +103,38 @@ H5_DLL herr_t H5T_init(void);
 H5_DLL H5T_t *H5T_copy(H5T_t *old_dt, H5T_copy_t method);
 H5_DLL herr_t H5T_lock(H5T_t *dt, hbool_t immutable);
 H5_DLL herr_t H5T_close(H5T_t *dt);
-H5_DLL H5T_t *H5T_get_super(const H5T_t *dt);
+H5_DLL H5T_t *     H5T_get_super(const H5T_t *dt);
 H5_DLL H5T_class_t H5T_get_class(const H5T_t *dt, htri_t internal);
-H5_DLL htri_t H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api);
-H5_DLL size_t H5T_get_size(const H5T_t *dt);
-H5_DLL int    H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset);
-H5_DLL herr_t H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc);
-H5_DLL H5T_t *H5T_decode(size_t buf_size, const unsigned char *buf);
-H5_DLL herr_t H5T_debug(const H5T_t *dt, FILE * stream);
+H5_DLL htri_t      H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api);
+H5_DLL size_t      H5T_get_size(const H5T_t *dt);
+H5_DLL int         H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset);
+H5_DLL herr_t      H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc);
+H5_DLL H5T_t *           H5T_decode(size_t buf_size, const unsigned char *buf);
+H5_DLL herr_t            H5T_debug(const H5T_t *dt, FILE *stream);
 H5_DLL struct H5O_loc_t *H5T_oloc(H5T_t *dt);
 H5_DLL H5G_name_t *H5T_nameof(H5T_t *dt);
-H5_DLL htri_t H5T_is_immutable(const H5T_t *dt);
-H5_DLL htri_t H5T_is_named(const H5T_t *dt);
-H5_DLL herr_t H5T_convert_committed_datatype(H5T_t *dt, H5F_t *f);
-H5_DLL htri_t H5T_is_relocatable(const H5T_t *dt);
-H5_DLL H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst,
-    const char *name, H5T_conv_t func, hid_t dxpl_id, hbool_t is_api);
-H5_DLL hbool_t H5T_path_noop(const H5T_path_t *p);
-H5_DLL H5T_bkg_t H5T_path_bkg(const H5T_path_t *p);
+H5_DLL htri_t      H5T_is_immutable(const H5T_t *dt);
+H5_DLL htri_t      H5T_is_named(const H5T_t *dt);
+H5_DLL herr_t      H5T_convert_committed_datatype(H5T_t *dt, H5F_t *f);
+H5_DLL htri_t      H5T_is_relocatable(const H5T_t *dt);
+H5_DLL H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_t func,
+                                 hid_t dxpl_id, hbool_t is_api);
+H5_DLL hbool_t     H5T_path_noop(const H5T_path_t *p);
+H5_DLL H5T_bkg_t   H5T_path_bkg(const H5T_path_t *p);
 H5_DLL H5T_subset_info_t *H5T_path_compound_subset(const H5T_path_t *p);
-H5_DLL herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id,
-    size_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg,
-    hid_t dset_xfer_plist);
-H5_DLL herr_t H5T_vlen_reclaim(void *elem, hid_t type_id, unsigned ndim, const hsize_t *point, void *_op_data);
-H5_DLL herr_t H5T_vlen_reclaim_elmt(void *elem, H5T_t *dt, hid_t dxpl_id);
-H5_DLL herr_t H5T_vlen_get_alloc_info(hid_t dxpl_id, H5T_vlen_alloc_info_t **vl_alloc_info);
-H5_DLL htri_t H5T_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc);
-H5_DLL htri_t H5T_is_sensible(const H5T_t *dt);
-H5_DLL uint32_t H5T_hash(H5F_t * file, const H5T_t *dt);
-H5_DLL herr_t H5T_set_latest_version(H5T_t *dt);
-H5_DLL herr_t H5T_patch_file(H5T_t *dt, H5F_t *f);
-H5_DLL htri_t H5T_is_variable_str(const H5T_t *dt);
-H5_DLL herr_t H5T_patch_vlen_file(H5T_t *dt, H5F_t *f);
+H5_DLL herr_t   H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+H5_DLL herr_t   H5T_vlen_reclaim(void *elem, hid_t type_id, unsigned ndim, const hsize_t *point,
+                                 void *_op_data);
+H5_DLL herr_t   H5T_vlen_reclaim_elmt(void *elem, H5T_t *dt, hid_t dxpl_id);
+H5_DLL herr_t   H5T_vlen_get_alloc_info(hid_t dxpl_id, H5T_vlen_alloc_info_t **vl_alloc_info);
+H5_DLL htri_t   H5T_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc);
+H5_DLL htri_t   H5T_is_sensible(const H5T_t *dt);
+H5_DLL uint32_t H5T_hash(H5F_t *file, const H5T_t *dt);
+H5_DLL herr_t   H5T_set_latest_version(H5T_t *dt);
+H5_DLL herr_t   H5T_patch_file(H5T_t *dt, H5F_t *f);
+H5_DLL htri_t   H5T_is_variable_str(const H5T_t *dt);
+H5_DLL herr_t   H5T_patch_vlen_file(H5T_t *dt, H5F_t *f);
 
 /* Reference specific functions */
 H5_DLL H5R_type_t H5T_get_ref_type(const H5T_t *dt);
@@ -146,7 +142,7 @@ H5_DLL H5R_type_t H5T_get_ref_type(const H5T_t *dt);
 /* Operations on named datatypes */
 H5_DLL H5T_t *H5T_open(const H5G_loc_t *loc, hid_t dxpl_id);
 H5_DLL htri_t H5T_committed(const H5T_t *type);
-H5_DLL int H5T_link(const H5T_t *type, int adjust, hid_t dxpl_id);
+H5_DLL int    H5T_link(const H5T_t *type, int adjust, hid_t dxpl_id);
 H5_DLL herr_t H5T_update_shared(H5T_t *type);
 
 /* Field functions (for both compound & enumerated types) */
@@ -156,11 +152,10 @@ H5_DLL size_t H5T_get_member_offset(const H5T_t *dt, unsigned membno);
 
 /* Atomic functions */
 H5_DLL H5T_order_t H5T_get_order(const H5T_t *dt);
-H5_DLL size_t H5T_get_precision(const H5T_t *dt);
-H5_DLL int H5T_get_offset(const H5T_t *dt);
+H5_DLL size_t      H5T_get_precision(const H5T_t *dt);
+H5_DLL int         H5T_get_offset(const H5T_t *dt);
 
 /* Fixed-point functions */
 H5_DLL H5T_sign_t H5T_get_sign(H5T_t const *dt);
 
 #endif /* _H5Tprivate_H */
-
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 00ba91a..30e0a3d 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -21,53 +21,53 @@
 #include "H5public.h"
 #include "H5Ipublic.h"
 
-#define HOFFSET(S,M)    (offsetof(S,M))
+#define HOFFSET(S, M) (offsetof(S, M))
 
 /* These are the various classes of datatypes */
 /* If this goes over 16 types (0-15), the file format will need to change) */
 typedef enum H5T_class_t {
-    H5T_NO_CLASS         = -1,  /*error                                      */
-    H5T_INTEGER          = 0,   /*integer types                              */
-    H5T_FLOAT            = 1,   /*floating-point types                       */
-    H5T_TIME             = 2,   /*date and time types                        */
-    H5T_STRING           = 3,   /*character string types                     */
-    H5T_BITFIELD         = 4,   /*bit field types                            */
-    H5T_OPAQUE           = 5,   /*opaque types                               */
-    H5T_COMPOUND         = 6,   /*compound types                             */
-    H5T_REFERENCE        = 7,   /*reference types                            */
-    H5T_ENUM		 = 8,	/*enumeration types                          */
-    H5T_VLEN		 = 9,	/*Variable-Length types                      */
-    H5T_ARRAY	         = 10,	/*Array types                                */
-
-    H5T_NCLASSES                /*this must be last                          */
+    H5T_NO_CLASS  = -1, /*error                                      */
+    H5T_INTEGER   = 0,  /*integer types                              */
+    H5T_FLOAT     = 1,  /*floating-point types                       */
+    H5T_TIME      = 2,  /*date and time types                        */
+    H5T_STRING    = 3,  /*character string types                     */
+    H5T_BITFIELD  = 4,  /*bit field types                            */
+    H5T_OPAQUE    = 5,  /*opaque types                               */
+    H5T_COMPOUND  = 6,  /*compound types                             */
+    H5T_REFERENCE = 7,  /*reference types                            */
+    H5T_ENUM      = 8,  /*enumeration types                          */
+    H5T_VLEN      = 9,  /*Variable-Length types                      */
+    H5T_ARRAY     = 10, /*Array types                                */
+
+    H5T_NCLASSES /*this must be last                          */
 } H5T_class_t;
 
 /* Byte orders */
 typedef enum H5T_order_t {
-    H5T_ORDER_ERROR      = -1,  /*error                                      */
-    H5T_ORDER_LE         = 0,   /*little endian                              */
-    H5T_ORDER_BE         = 1,   /*bit endian                                 */
-    H5T_ORDER_VAX        = 2,   /*VAX mixed endian                           */
-    H5T_ORDER_MIXED      = 3,   /*Compound type with mixed member orders     */
-    H5T_ORDER_NONE       = 4    /*no particular order (strings, bits,..)     */
+    H5T_ORDER_ERROR = -1, /*error                                      */
+    H5T_ORDER_LE    = 0,  /*little endian                              */
+    H5T_ORDER_BE    = 1,  /*bit endian                                 */
+    H5T_ORDER_VAX   = 2,  /*VAX mixed endian                           */
+    H5T_ORDER_MIXED = 3,  /*Compound type with mixed member orders     */
+    H5T_ORDER_NONE  = 4   /*no particular order (strings, bits,..)     */
     /*H5T_ORDER_NONE must be last */
 } H5T_order_t;
 
 /* Types of integer sign schemes */
 typedef enum H5T_sign_t {
-    H5T_SGN_ERROR        = -1,  /*error                                      */
-    H5T_SGN_NONE         = 0,   /*this is an unsigned type                   */
-    H5T_SGN_2            = 1,   /*two's complement                           */
+    H5T_SGN_ERROR = -1, /*error                                      */
+    H5T_SGN_NONE  = 0,  /*this is an unsigned type                   */
+    H5T_SGN_2     = 1,  /*two's complement                           */
 
-    H5T_NSGN             = 2    /*this must be last!                         */
+    H5T_NSGN = 2 /*this must be last!                         */
 } H5T_sign_t;
 
 /* Floating-point normalization schemes */
 typedef enum H5T_norm_t {
-    H5T_NORM_ERROR       = -1,  /*error                                      */
-    H5T_NORM_IMPLIED     = 0,   /*msb of mantissa isn't stored, always 1     */
-    H5T_NORM_MSBSET      = 1,   /*msb of mantissa is always 1                */
-    H5T_NORM_NONE        = 2    /*not normalized                             */
+    H5T_NORM_ERROR   = -1, /*error                                      */
+    H5T_NORM_IMPLIED = 0,  /*msb of mantissa isn't stored, always 1     */
+    H5T_NORM_MSBSET  = 1,  /*msb of mantissa is always 1                */
+    H5T_NORM_NONE    = 2   /*not normalized                             */
     /*H5T_NORM_NONE must be last */
 } H5T_norm_t;
 
@@ -76,159 +76,160 @@ typedef enum H5T_norm_t {
  * they appear in HDF5 files!
  */
 typedef enum H5T_cset_t {
-    H5T_CSET_ERROR       = -1,  /*error                                      */
-    H5T_CSET_ASCII       = 0,   /*US ASCII                                   */
-    H5T_CSET_UTF8        = 1,   /*UTF-8 Unicode encoding		     */
-    H5T_CSET_RESERVED_2  = 2,   /*reserved for later use		     */
-    H5T_CSET_RESERVED_3  = 3,   /*reserved for later use		     */
-    H5T_CSET_RESERVED_4  = 4,   /*reserved for later use		     */
-    H5T_CSET_RESERVED_5  = 5,   /*reserved for later use		     */
-    H5T_CSET_RESERVED_6  = 6,   /*reserved for later use		     */
-    H5T_CSET_RESERVED_7  = 7,   /*reserved for later use		     */
-    H5T_CSET_RESERVED_8  = 8,   /*reserved for later use		     */
-    H5T_CSET_RESERVED_9  = 9,   /*reserved for later use		     */
-    H5T_CSET_RESERVED_10 = 10,  /*reserved for later use		     */
-    H5T_CSET_RESERVED_11 = 11,  /*reserved for later use		     */
-    H5T_CSET_RESERVED_12 = 12,  /*reserved for later use		     */
-    H5T_CSET_RESERVED_13 = 13,  /*reserved for later use		     */
-    H5T_CSET_RESERVED_14 = 14,  /*reserved for later use		     */
-    H5T_CSET_RESERVED_15 = 15   /*reserved for later use		     */
+    H5T_CSET_ERROR       = -1, /*error                                      */
+    H5T_CSET_ASCII       = 0,  /*US ASCII                                   */
+    H5T_CSET_UTF8        = 1,  /*UTF-8 Unicode encoding		     */
+    H5T_CSET_RESERVED_2  = 2,  /*reserved for later use		     */
+    H5T_CSET_RESERVED_3  = 3,  /*reserved for later use		     */
+    H5T_CSET_RESERVED_4  = 4,  /*reserved for later use		     */
+    H5T_CSET_RESERVED_5  = 5,  /*reserved for later use		     */
+    H5T_CSET_RESERVED_6  = 6,  /*reserved for later use		     */
+    H5T_CSET_RESERVED_7  = 7,  /*reserved for later use		     */
+    H5T_CSET_RESERVED_8  = 8,  /*reserved for later use		     */
+    H5T_CSET_RESERVED_9  = 9,  /*reserved for later use		     */
+    H5T_CSET_RESERVED_10 = 10, /*reserved for later use		     */
+    H5T_CSET_RESERVED_11 = 11, /*reserved for later use		     */
+    H5T_CSET_RESERVED_12 = 12, /*reserved for later use		     */
+    H5T_CSET_RESERVED_13 = 13, /*reserved for later use		     */
+    H5T_CSET_RESERVED_14 = 14, /*reserved for later use		     */
+    H5T_CSET_RESERVED_15 = 15  /*reserved for later use		     */
 } H5T_cset_t;
-#define H5T_NCSET H5T_CSET_RESERVED_2    		/*Number of character sets actually defined  */
+#define H5T_NCSET H5T_CSET_RESERVED_2 /*Number of character sets actually defined  */
 
 /*
  * Type of padding to use in character strings.  Do not change these values
  * since they appear in HDF5 files!
  */
 typedef enum H5T_str_t {
-    H5T_STR_ERROR        = -1,  /*error                                      */
-    H5T_STR_NULLTERM     = 0,   /*null terminate like in C                   */
-    H5T_STR_NULLPAD      = 1,   /*pad with nulls                             */
-    H5T_STR_SPACEPAD     = 2,   /*pad with spaces like in Fortran            */
-    H5T_STR_RESERVED_3   = 3,   /*reserved for later use		     */
-    H5T_STR_RESERVED_4   = 4,   /*reserved for later use		     */
-    H5T_STR_RESERVED_5   = 5,   /*reserved for later use		     */
-    H5T_STR_RESERVED_6   = 6,   /*reserved for later use		     */
-    H5T_STR_RESERVED_7   = 7,   /*reserved for later use		     */
-    H5T_STR_RESERVED_8   = 8,   /*reserved for later use		     */
-    H5T_STR_RESERVED_9   = 9,   /*reserved for later use		     */
-    H5T_STR_RESERVED_10  = 10,  /*reserved for later use		     */
-    H5T_STR_RESERVED_11  = 11,  /*reserved for later use		     */
-    H5T_STR_RESERVED_12  = 12,  /*reserved for later use		     */
-    H5T_STR_RESERVED_13  = 13,  /*reserved for later use		     */
-    H5T_STR_RESERVED_14  = 14,  /*reserved for later use		     */
-    H5T_STR_RESERVED_15  = 15   /*reserved for later use		     */
+    H5T_STR_ERROR       = -1, /*error                                      */
+    H5T_STR_NULLTERM    = 0,  /*null terminate like in C                   */
+    H5T_STR_NULLPAD     = 1,  /*pad with nulls                             */
+    H5T_STR_SPACEPAD    = 2,  /*pad with spaces like in Fortran            */
+    H5T_STR_RESERVED_3  = 3,  /*reserved for later use		     */
+    H5T_STR_RESERVED_4  = 4,  /*reserved for later use		     */
+    H5T_STR_RESERVED_5  = 5,  /*reserved for later use		     */
+    H5T_STR_RESERVED_6  = 6,  /*reserved for later use		     */
+    H5T_STR_RESERVED_7  = 7,  /*reserved for later use		     */
+    H5T_STR_RESERVED_8  = 8,  /*reserved for later use		     */
+    H5T_STR_RESERVED_9  = 9,  /*reserved for later use		     */
+    H5T_STR_RESERVED_10 = 10, /*reserved for later use		     */
+    H5T_STR_RESERVED_11 = 11, /*reserved for later use		     */
+    H5T_STR_RESERVED_12 = 12, /*reserved for later use		     */
+    H5T_STR_RESERVED_13 = 13, /*reserved for later use		     */
+    H5T_STR_RESERVED_14 = 14, /*reserved for later use		     */
+    H5T_STR_RESERVED_15 = 15  /*reserved for later use		     */
 } H5T_str_t;
-#define H5T_NSTR H5T_STR_RESERVED_3		/*num H5T_str_t types actually defined	     */
+#define H5T_NSTR H5T_STR_RESERVED_3 /*num H5T_str_t types actually defined	     */
 
 /* Type of padding to use in other atomic types */
 typedef enum H5T_pad_t {
-    H5T_PAD_ERROR        = -1,  /*error                                      */
-    H5T_PAD_ZERO         = 0,   /*always set to zero                         */
-    H5T_PAD_ONE          = 1,   /*always set to one                          */
-    H5T_PAD_BACKGROUND   = 2,   /*set to background value                    */
+    H5T_PAD_ERROR      = -1, /*error                                      */
+    H5T_PAD_ZERO       = 0,  /*always set to zero                         */
+    H5T_PAD_ONE        = 1,  /*always set to one                          */
+    H5T_PAD_BACKGROUND = 2,  /*set to background value                    */
 
-    H5T_NPAD             = 3    /*THIS MUST BE LAST                          */
+    H5T_NPAD = 3 /*THIS MUST BE LAST                          */
 } H5T_pad_t;
 
 /* Commands sent to conversion functions */
 typedef enum H5T_cmd_t {
-    H5T_CONV_INIT	= 0,	/*query and/or initialize private data	     */
-    H5T_CONV_CONV	= 1, 	/*convert data from source to dest datatype */
-    H5T_CONV_FREE	= 2	/*function is being removed from path	     */
+    H5T_CONV_INIT = 0, /*query and/or initialize private data	     */
+    H5T_CONV_CONV = 1, /*convert data from source to dest datatype */
+    H5T_CONV_FREE = 2  /*function is being removed from path	     */
 } H5T_cmd_t;
 
 /* How is the `bkg' buffer used by the conversion function? */
 typedef enum H5T_bkg_t {
-    H5T_BKG_NO		= 0, 	/*background buffer is not needed, send NULL */
-    H5T_BKG_TEMP	= 1,	/*bkg buffer used as temp storage only       */
-    H5T_BKG_YES		= 2	/*init bkg buf with data before conversion   */
+    H5T_BKG_NO   = 0, /*background buffer is not needed, send NULL */
+    H5T_BKG_TEMP = 1, /*bkg buffer used as temp storage only       */
+    H5T_BKG_YES  = 2  /*init bkg buf with data before conversion   */
 } H5T_bkg_t;
 
 /* Type conversion client data */
 typedef struct H5T_cdata_t {
-    H5T_cmd_t		command;/*what should the conversion function do?    */
-    H5T_bkg_t		need_bkg;/*is the background buffer needed?	     */
-    hbool_t		recalc;	/*recalculate private data		     */
-    void		*priv;	/*private data				     */
+    H5T_cmd_t command;  /*what should the conversion function do?    */
+    H5T_bkg_t need_bkg; /*is the background buffer needed?	     */
+    hbool_t   recalc;   /*recalculate private data		     */
+    void *    priv;     /*private data				     */
 } H5T_cdata_t;
 
 /* Conversion function persistence */
 typedef enum H5T_pers_t {
-    H5T_PERS_DONTCARE	= -1, 	/*wild card				     */
-    H5T_PERS_HARD	= 0,	/*hard conversion function		     */
-    H5T_PERS_SOFT	= 1 	/*soft conversion function		     */
+    H5T_PERS_DONTCARE = -1, /*wild card				     */
+    H5T_PERS_HARD     = 0,  /*hard conversion function		     */
+    H5T_PERS_SOFT     = 1   /*soft conversion function		     */
 } H5T_pers_t;
 
 /* The order to retrieve atomic native datatype */
 typedef enum H5T_direction_t {
-    H5T_DIR_DEFAULT     = 0,    /*default direction is inscendent            */
-    H5T_DIR_ASCEND      = 1,    /*in inscendent order                        */
-    H5T_DIR_DESCEND     = 2     /*in descendent order                        */
+    H5T_DIR_DEFAULT = 0, /*default direction is inscendent            */
+    H5T_DIR_ASCEND  = 1, /*in inscendent order                        */
+    H5T_DIR_DESCEND = 2  /*in descendent order                        */
 } H5T_direction_t;
 
 /* The exception type passed into the conversion callback function */
 typedef enum H5T_conv_except_t {
-    H5T_CONV_EXCEPT_RANGE_HI       = 0,   /*source value is greater than destination's range */
-    H5T_CONV_EXCEPT_RANGE_LOW      = 1,   /*source value is less than destination's range    */
-    H5T_CONV_EXCEPT_PRECISION      = 2,   /*source value loses precision in destination      */
-    H5T_CONV_EXCEPT_TRUNCATE       = 3,   /*source value is truncated in destination         */
-    H5T_CONV_EXCEPT_PINF           = 4,   /*source value is positive infinity(floating number) */
-    H5T_CONV_EXCEPT_NINF           = 5,   /*source value is negative infinity(floating number) */
-    H5T_CONV_EXCEPT_NAN            = 6    /*source value is NaN(floating number)             */
+    H5T_CONV_EXCEPT_RANGE_HI  = 0, /*source value is greater than destination's range */
+    H5T_CONV_EXCEPT_RANGE_LOW = 1, /*source value is less than destination's range    */
+    H5T_CONV_EXCEPT_PRECISION = 2, /*source value loses precision in destination      */
+    H5T_CONV_EXCEPT_TRUNCATE  = 3, /*source value is truncated in destination         */
+    H5T_CONV_EXCEPT_PINF      = 4, /*source value is positive infinity(floating number) */
+    H5T_CONV_EXCEPT_NINF      = 5, /*source value is negative infinity(floating number) */
+    H5T_CONV_EXCEPT_NAN       = 6  /*source value is NaN(floating number)             */
 } H5T_conv_except_t;
 
 /* The return value from conversion callback function H5T_conv_except_func_t */
 typedef enum H5T_conv_ret_t {
-    H5T_CONV_ABORT      = -1,   /*abort conversion                           */
-    H5T_CONV_UNHANDLED  = 0,    /*callback function failed to handle the exception      */
-    H5T_CONV_HANDLED    = 1     /*callback function handled the exception successfully  */
+    H5T_CONV_ABORT     = -1, /*abort conversion                           */
+    H5T_CONV_UNHANDLED = 0,  /*callback function failed to handle the exception      */
+    H5T_CONV_HANDLED   = 1   /*callback function handled the exception successfully  */
 } H5T_conv_ret_t;
 
 /* Variable Length Datatype struct in memory */
 /* (This is only used for VL sequences, not VL strings, which are stored in char *'s) */
 typedef struct {
     size_t len; /* Length of VL data (in base type units) */
-    void *p;    /* Pointer to VL data */
+    void * p;   /* Pointer to VL data */
 } hvl_t;
 
 /* Variable Length String information */
-#define H5T_VARIABLE    ((size_t)(-1))  /* Indicate that a string is variable length (null-terminated in C, instead of fixed length) */
+#define H5T_VARIABLE                                                                                         \
+    ((size_t)(                                                                                               \
+        -1)) /* Indicate that a string is variable length (null-terminated in C, instead of fixed length) */
 
 /* Opaque information */
-#define H5T_OPAQUE_TAG_MAX      256     /* Maximum length of an opaque tag */
-                                        /* This could be raised without too much difficulty */
+#define H5T_OPAQUE_TAG_MAX 256 /* Maximum length of an opaque tag */
+                               /* This could be raised without too much difficulty */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* All datatype conversion functions are... */
-typedef herr_t (*H5T_conv_t) (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-      size_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf,
-      void *bkg, hid_t dset_xfer_plist);
+typedef herr_t (*H5T_conv_t)(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                             size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist);
 
 /* Exception handler.  If an exception like overflow happenes during conversion,
  * this function is called if it's registered through H5Pset_type_conv_cb.
  */
-typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type,
-    hid_t src_id, hid_t dst_id, void *src_buf, void *dst_buf, void *user_data);
+typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type, hid_t src_id, hid_t dst_id,
+                                                 void *src_buf, void *dst_buf, void *user_data);
 
 /* When this header is included from a private header, don't make calls to H5open() */
 #undef H5OPEN
 #ifndef _H5private_H
-#define H5OPEN          H5open(),
-#else   /* _H5private_H */
+#define H5OPEN H5open(),
+#else /* _H5private_H */
 #define H5OPEN
-#endif  /* _H5private_H */
+#endif /* _H5private_H */
 
 /*
  * The IEEE floating point types in various byte orders.
  */
-#define H5T_IEEE_F32BE		(H5OPEN H5T_IEEE_F32BE_g)
-#define H5T_IEEE_F32LE		(H5OPEN H5T_IEEE_F32LE_g)
-#define H5T_IEEE_F64BE		(H5OPEN H5T_IEEE_F64BE_g)
-#define H5T_IEEE_F64LE		(H5OPEN H5T_IEEE_F64LE_g)
+#define H5T_IEEE_F32BE (H5OPEN H5T_IEEE_F32BE_g)
+#define H5T_IEEE_F32LE (H5OPEN H5T_IEEE_F32LE_g)
+#define H5T_IEEE_F64BE (H5OPEN H5T_IEEE_F64BE_g)
+#define H5T_IEEE_F64LE (H5OPEN H5T_IEEE_F64LE_g)
 H5_DLLVAR hid_t H5T_IEEE_F32BE_g;
 H5_DLLVAR hid_t H5T_IEEE_F32LE_g;
 H5_DLLVAR hid_t H5T_IEEE_F64BE_g;
@@ -238,32 +239,32 @@ H5_DLLVAR hid_t H5T_IEEE_F64LE_g;
  * These are "standard" types.  For instance, signed (2's complement) and
  * unsigned integers of various sizes and byte orders.
  */
-#define H5T_STD_I8BE		(H5OPEN H5T_STD_I8BE_g)
-#define H5T_STD_I8LE		(H5OPEN H5T_STD_I8LE_g)
-#define H5T_STD_I16BE		(H5OPEN H5T_STD_I16BE_g)
-#define H5T_STD_I16LE		(H5OPEN H5T_STD_I16LE_g)
-#define H5T_STD_I32BE		(H5OPEN H5T_STD_I32BE_g)
-#define H5T_STD_I32LE		(H5OPEN H5T_STD_I32LE_g)
-#define H5T_STD_I64BE		(H5OPEN H5T_STD_I64BE_g)
-#define H5T_STD_I64LE		(H5OPEN H5T_STD_I64LE_g)
-#define H5T_STD_U8BE		(H5OPEN H5T_STD_U8BE_g)
-#define H5T_STD_U8LE		(H5OPEN H5T_STD_U8LE_g)
-#define H5T_STD_U16BE		(H5OPEN H5T_STD_U16BE_g)
-#define H5T_STD_U16LE		(H5OPEN H5T_STD_U16LE_g)
-#define H5T_STD_U32BE		(H5OPEN H5T_STD_U32BE_g)
-#define H5T_STD_U32LE		(H5OPEN H5T_STD_U32LE_g)
-#define H5T_STD_U64BE		(H5OPEN H5T_STD_U64BE_g)
-#define H5T_STD_U64LE		(H5OPEN H5T_STD_U64LE_g)
-#define H5T_STD_B8BE		(H5OPEN H5T_STD_B8BE_g)
-#define H5T_STD_B8LE		(H5OPEN H5T_STD_B8LE_g)
-#define H5T_STD_B16BE		(H5OPEN H5T_STD_B16BE_g)
-#define H5T_STD_B16LE		(H5OPEN H5T_STD_B16LE_g)
-#define H5T_STD_B32BE		(H5OPEN H5T_STD_B32BE_g)
-#define H5T_STD_B32LE		(H5OPEN H5T_STD_B32LE_g)
-#define H5T_STD_B64BE		(H5OPEN H5T_STD_B64BE_g)
-#define H5T_STD_B64LE		(H5OPEN H5T_STD_B64LE_g)
-#define H5T_STD_REF_OBJ	        (H5OPEN H5T_STD_REF_OBJ_g)
-#define H5T_STD_REF_DSETREG     (H5OPEN H5T_STD_REF_DSETREG_g)
+#define H5T_STD_I8BE        (H5OPEN H5T_STD_I8BE_g)
+#define H5T_STD_I8LE        (H5OPEN H5T_STD_I8LE_g)
+#define H5T_STD_I16BE       (H5OPEN H5T_STD_I16BE_g)
+#define H5T_STD_I16LE       (H5OPEN H5T_STD_I16LE_g)
+#define H5T_STD_I32BE       (H5OPEN H5T_STD_I32BE_g)
+#define H5T_STD_I32LE       (H5OPEN H5T_STD_I32LE_g)
+#define H5T_STD_I64BE       (H5OPEN H5T_STD_I64BE_g)
+#define H5T_STD_I64LE       (H5OPEN H5T_STD_I64LE_g)
+#define H5T_STD_U8BE        (H5OPEN H5T_STD_U8BE_g)
+#define H5T_STD_U8LE        (H5OPEN H5T_STD_U8LE_g)
+#define H5T_STD_U16BE       (H5OPEN H5T_STD_U16BE_g)
+#define H5T_STD_U16LE       (H5OPEN H5T_STD_U16LE_g)
+#define H5T_STD_U32BE       (H5OPEN H5T_STD_U32BE_g)
+#define H5T_STD_U32LE       (H5OPEN H5T_STD_U32LE_g)
+#define H5T_STD_U64BE       (H5OPEN H5T_STD_U64BE_g)
+#define H5T_STD_U64LE       (H5OPEN H5T_STD_U64LE_g)
+#define H5T_STD_B8BE        (H5OPEN H5T_STD_B8BE_g)
+#define H5T_STD_B8LE        (H5OPEN H5T_STD_B8LE_g)
+#define H5T_STD_B16BE       (H5OPEN H5T_STD_B16BE_g)
+#define H5T_STD_B16LE       (H5OPEN H5T_STD_B16LE_g)
+#define H5T_STD_B32BE       (H5OPEN H5T_STD_B32BE_g)
+#define H5T_STD_B32LE       (H5OPEN H5T_STD_B32LE_g)
+#define H5T_STD_B64BE       (H5OPEN H5T_STD_B64BE_g)
+#define H5T_STD_B64LE       (H5OPEN H5T_STD_B64LE_g)
+#define H5T_STD_REF_OBJ     (H5OPEN H5T_STD_REF_OBJ_g)
+#define H5T_STD_REF_DSETREG (H5OPEN H5T_STD_REF_DSETREG_g)
 H5_DLLVAR hid_t H5T_STD_I8BE_g;
 H5_DLLVAR hid_t H5T_STD_I8LE_g;
 H5_DLLVAR hid_t H5T_STD_I16BE_g;
@@ -294,10 +295,10 @@ H5_DLLVAR hid_t H5T_STD_REF_DSETREG_g;
 /*
  * Types which are particular to Unix.
  */
-#define H5T_UNIX_D32BE		(H5OPEN H5T_UNIX_D32BE_g)
-#define H5T_UNIX_D32LE		(H5OPEN H5T_UNIX_D32LE_g)
-#define H5T_UNIX_D64BE		(H5OPEN H5T_UNIX_D64BE_g)
-#define H5T_UNIX_D64LE		(H5OPEN H5T_UNIX_D64LE_g)
+#define H5T_UNIX_D32BE (H5OPEN H5T_UNIX_D32BE_g)
+#define H5T_UNIX_D32LE (H5OPEN H5T_UNIX_D32LE_g)
+#define H5T_UNIX_D64BE (H5OPEN H5T_UNIX_D64BE_g)
+#define H5T_UNIX_D64LE (H5OPEN H5T_UNIX_D64LE_g)
 H5_DLLVAR hid_t H5T_UNIX_D32BE_g;
 H5_DLLVAR hid_t H5T_UNIX_D32LE_g;
 H5_DLLVAR hid_t H5T_UNIX_D64BE_g;
@@ -307,77 +308,77 @@ H5_DLLVAR hid_t H5T_UNIX_D64LE_g;
  * Types particular to the C language.  String types use `bytes' instead
  * of `bits' as their size.
  */
-#define H5T_C_S1		(H5OPEN H5T_C_S1_g)
+#define H5T_C_S1 (H5OPEN H5T_C_S1_g)
 H5_DLLVAR hid_t H5T_C_S1_g;
 
 /*
  * Types particular to Fortran.
  */
-#define H5T_FORTRAN_S1		(H5OPEN H5T_FORTRAN_S1_g)
+#define H5T_FORTRAN_S1 (H5OPEN H5T_FORTRAN_S1_g)
 H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
 
 /*
  * These types are for Intel CPU's.  They are little endian with IEEE
  * floating point.
  */
-#define H5T_INTEL_I8		H5T_STD_I8LE
-#define H5T_INTEL_I16		H5T_STD_I16LE
-#define H5T_INTEL_I32		H5T_STD_I32LE
-#define H5T_INTEL_I64		H5T_STD_I64LE
-#define H5T_INTEL_U8		H5T_STD_U8LE
-#define H5T_INTEL_U16		H5T_STD_U16LE
-#define H5T_INTEL_U32		H5T_STD_U32LE
-#define H5T_INTEL_U64		H5T_STD_U64LE
-#define H5T_INTEL_B8		H5T_STD_B8LE
-#define H5T_INTEL_B16		H5T_STD_B16LE
-#define H5T_INTEL_B32		H5T_STD_B32LE
-#define H5T_INTEL_B64		H5T_STD_B64LE
-#define H5T_INTEL_F32		H5T_IEEE_F32LE
-#define H5T_INTEL_F64		H5T_IEEE_F64LE
+#define H5T_INTEL_I8  H5T_STD_I8LE
+#define H5T_INTEL_I16 H5T_STD_I16LE
+#define H5T_INTEL_I32 H5T_STD_I32LE
+#define H5T_INTEL_I64 H5T_STD_I64LE
+#define H5T_INTEL_U8  H5T_STD_U8LE
+#define H5T_INTEL_U16 H5T_STD_U16LE
+#define H5T_INTEL_U32 H5T_STD_U32LE
+#define H5T_INTEL_U64 H5T_STD_U64LE
+#define H5T_INTEL_B8  H5T_STD_B8LE
+#define H5T_INTEL_B16 H5T_STD_B16LE
+#define H5T_INTEL_B32 H5T_STD_B32LE
+#define H5T_INTEL_B64 H5T_STD_B64LE
+#define H5T_INTEL_F32 H5T_IEEE_F32LE
+#define H5T_INTEL_F64 H5T_IEEE_F64LE
 
 /*
  * These types are for DEC Alpha CPU's.  They are little endian with IEEE
  * floating point.
  */
-#define H5T_ALPHA_I8		H5T_STD_I8LE
-#define H5T_ALPHA_I16		H5T_STD_I16LE
-#define H5T_ALPHA_I32		H5T_STD_I32LE
-#define H5T_ALPHA_I64		H5T_STD_I64LE
-#define H5T_ALPHA_U8		H5T_STD_U8LE
-#define H5T_ALPHA_U16		H5T_STD_U16LE
-#define H5T_ALPHA_U32		H5T_STD_U32LE
-#define H5T_ALPHA_U64		H5T_STD_U64LE
-#define H5T_ALPHA_B8		H5T_STD_B8LE
-#define H5T_ALPHA_B16		H5T_STD_B16LE
-#define H5T_ALPHA_B32		H5T_STD_B32LE
-#define H5T_ALPHA_B64		H5T_STD_B64LE
-#define H5T_ALPHA_F32		H5T_IEEE_F32LE
-#define H5T_ALPHA_F64		H5T_IEEE_F64LE
+#define H5T_ALPHA_I8  H5T_STD_I8LE
+#define H5T_ALPHA_I16 H5T_STD_I16LE
+#define H5T_ALPHA_I32 H5T_STD_I32LE
+#define H5T_ALPHA_I64 H5T_STD_I64LE
+#define H5T_ALPHA_U8  H5T_STD_U8LE
+#define H5T_ALPHA_U16 H5T_STD_U16LE
+#define H5T_ALPHA_U32 H5T_STD_U32LE
+#define H5T_ALPHA_U64 H5T_STD_U64LE
+#define H5T_ALPHA_B8  H5T_STD_B8LE
+#define H5T_ALPHA_B16 H5T_STD_B16LE
+#define H5T_ALPHA_B32 H5T_STD_B32LE
+#define H5T_ALPHA_B64 H5T_STD_B64LE
+#define H5T_ALPHA_F32 H5T_IEEE_F32LE
+#define H5T_ALPHA_F64 H5T_IEEE_F64LE
 
 /*
  * These types are for MIPS cpu's commonly used in SGI systems. They are big
  * endian with IEEE floating point.
  */
-#define H5T_MIPS_I8		H5T_STD_I8BE
-#define H5T_MIPS_I16		H5T_STD_I16BE
-#define H5T_MIPS_I32		H5T_STD_I32BE
-#define H5T_MIPS_I64		H5T_STD_I64BE
-#define H5T_MIPS_U8		H5T_STD_U8BE
-#define H5T_MIPS_U16		H5T_STD_U16BE
-#define H5T_MIPS_U32		H5T_STD_U32BE
-#define H5T_MIPS_U64		H5T_STD_U64BE
-#define H5T_MIPS_B8		H5T_STD_B8BE
-#define H5T_MIPS_B16		H5T_STD_B16BE
-#define H5T_MIPS_B32		H5T_STD_B32BE
-#define H5T_MIPS_B64		H5T_STD_B64BE
-#define H5T_MIPS_F32		H5T_IEEE_F32BE
-#define H5T_MIPS_F64		H5T_IEEE_F64BE
+#define H5T_MIPS_I8  H5T_STD_I8BE
+#define H5T_MIPS_I16 H5T_STD_I16BE
+#define H5T_MIPS_I32 H5T_STD_I32BE
+#define H5T_MIPS_I64 H5T_STD_I64BE
+#define H5T_MIPS_U8  H5T_STD_U8BE
+#define H5T_MIPS_U16 H5T_STD_U16BE
+#define H5T_MIPS_U32 H5T_STD_U32BE
+#define H5T_MIPS_U64 H5T_STD_U64BE
+#define H5T_MIPS_B8  H5T_STD_B8BE
+#define H5T_MIPS_B16 H5T_STD_B16BE
+#define H5T_MIPS_B32 H5T_STD_B32BE
+#define H5T_MIPS_B64 H5T_STD_B64BE
+#define H5T_MIPS_F32 H5T_IEEE_F32BE
+#define H5T_MIPS_F64 H5T_IEEE_F64BE
 
 /*
  * The VAX floating point types (i.e. in VAX byte order)
  */
-#define H5T_VAX_F32		(H5OPEN H5T_VAX_F32_g)
-#define H5T_VAX_F64		(H5OPEN H5T_VAX_F64_g)
+#define H5T_VAX_F32 (H5OPEN H5T_VAX_F32_g)
+#define H5T_VAX_F64 (H5OPEN H5T_VAX_F64_g)
 H5_DLLVAR hid_t H5T_VAX_F32_g;
 H5_DLLVAR hid_t H5T_VAX_F64_g;
 
@@ -390,32 +391,32 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
  * to C's `long long' and LDOUBLE is `long double' (these types might be the
  * same as `LONG' and `DOUBLE' respectively).
  */
-#define H5T_NATIVE_CHAR		(CHAR_MIN?H5T_NATIVE_SCHAR:H5T_NATIVE_UCHAR)
-#define H5T_NATIVE_SCHAR        (H5OPEN H5T_NATIVE_SCHAR_g)
-#define H5T_NATIVE_UCHAR        (H5OPEN H5T_NATIVE_UCHAR_g)
-#define H5T_NATIVE_SHORT        (H5OPEN H5T_NATIVE_SHORT_g)
-#define H5T_NATIVE_USHORT       (H5OPEN H5T_NATIVE_USHORT_g)
-#define H5T_NATIVE_INT          (H5OPEN H5T_NATIVE_INT_g)
-#define H5T_NATIVE_UINT         (H5OPEN H5T_NATIVE_UINT_g)
-#define H5T_NATIVE_LONG         (H5OPEN H5T_NATIVE_LONG_g)
-#define H5T_NATIVE_ULONG        (H5OPEN H5T_NATIVE_ULONG_g)
-#define H5T_NATIVE_LLONG        (H5OPEN H5T_NATIVE_LLONG_g)
-#define H5T_NATIVE_ULLONG       (H5OPEN H5T_NATIVE_ULLONG_g)
-#define H5T_NATIVE_FLOAT        (H5OPEN H5T_NATIVE_FLOAT_g)
-#define H5T_NATIVE_DOUBLE       (H5OPEN H5T_NATIVE_DOUBLE_g)
-#if H5_SIZEOF_LONG_DOUBLE !=0
-#define H5T_NATIVE_LDOUBLE	(H5OPEN H5T_NATIVE_LDOUBLE_g)
+#define H5T_NATIVE_CHAR   (CHAR_MIN ? H5T_NATIVE_SCHAR : H5T_NATIVE_UCHAR)
+#define H5T_NATIVE_SCHAR  (H5OPEN H5T_NATIVE_SCHAR_g)
+#define H5T_NATIVE_UCHAR  (H5OPEN H5T_NATIVE_UCHAR_g)
+#define H5T_NATIVE_SHORT  (H5OPEN H5T_NATIVE_SHORT_g)
+#define H5T_NATIVE_USHORT (H5OPEN H5T_NATIVE_USHORT_g)
+#define H5T_NATIVE_INT    (H5OPEN H5T_NATIVE_INT_g)
+#define H5T_NATIVE_UINT   (H5OPEN H5T_NATIVE_UINT_g)
+#define H5T_NATIVE_LONG   (H5OPEN H5T_NATIVE_LONG_g)
+#define H5T_NATIVE_ULONG  (H5OPEN H5T_NATIVE_ULONG_g)
+#define H5T_NATIVE_LLONG  (H5OPEN H5T_NATIVE_LLONG_g)
+#define H5T_NATIVE_ULLONG (H5OPEN H5T_NATIVE_ULLONG_g)
+#define H5T_NATIVE_FLOAT  (H5OPEN H5T_NATIVE_FLOAT_g)
+#define H5T_NATIVE_DOUBLE (H5OPEN H5T_NATIVE_DOUBLE_g)
+#if H5_SIZEOF_LONG_DOUBLE != 0
+#define H5T_NATIVE_LDOUBLE (H5OPEN H5T_NATIVE_LDOUBLE_g)
 #endif
-#define H5T_NATIVE_B8		(H5OPEN H5T_NATIVE_B8_g)
-#define H5T_NATIVE_B16		(H5OPEN H5T_NATIVE_B16_g)
-#define H5T_NATIVE_B32		(H5OPEN H5T_NATIVE_B32_g)
-#define H5T_NATIVE_B64		(H5OPEN H5T_NATIVE_B64_g)
-#define H5T_NATIVE_OPAQUE       (H5OPEN H5T_NATIVE_OPAQUE_g)
-#define H5T_NATIVE_HADDR	(H5OPEN H5T_NATIVE_HADDR_g)
-#define H5T_NATIVE_HSIZE	(H5OPEN H5T_NATIVE_HSIZE_g)
-#define H5T_NATIVE_HSSIZE	(H5OPEN H5T_NATIVE_HSSIZE_g)
-#define H5T_NATIVE_HERR		(H5OPEN H5T_NATIVE_HERR_g)
-#define H5T_NATIVE_HBOOL	(H5OPEN H5T_NATIVE_HBOOL_g)
+#define H5T_NATIVE_B8     (H5OPEN H5T_NATIVE_B8_g)
+#define H5T_NATIVE_B16    (H5OPEN H5T_NATIVE_B16_g)
+#define H5T_NATIVE_B32    (H5OPEN H5T_NATIVE_B32_g)
+#define H5T_NATIVE_B64    (H5OPEN H5T_NATIVE_B64_g)
+#define H5T_NATIVE_OPAQUE (H5OPEN H5T_NATIVE_OPAQUE_g)
+#define H5T_NATIVE_HADDR  (H5OPEN H5T_NATIVE_HADDR_g)
+#define H5T_NATIVE_HSIZE  (H5OPEN H5T_NATIVE_HSIZE_g)
+#define H5T_NATIVE_HSSIZE (H5OPEN H5T_NATIVE_HSSIZE_g)
+#define H5T_NATIVE_HERR   (H5OPEN H5T_NATIVE_HERR_g)
+#define H5T_NATIVE_HBOOL  (H5OPEN H5T_NATIVE_HBOOL_g)
 H5_DLLVAR hid_t H5T_NATIVE_SCHAR_g;
 H5_DLLVAR hid_t H5T_NATIVE_UCHAR_g;
 H5_DLLVAR hid_t H5T_NATIVE_SHORT_g;
@@ -428,7 +429,7 @@ H5_DLLVAR hid_t H5T_NATIVE_LLONG_g;
 H5_DLLVAR hid_t H5T_NATIVE_ULLONG_g;
 H5_DLLVAR hid_t H5T_NATIVE_FLOAT_g;
 H5_DLLVAR hid_t H5T_NATIVE_DOUBLE_g;
-#if H5_SIZEOF_LONG_DOUBLE !=0
+#if H5_SIZEOF_LONG_DOUBLE != 0
 H5_DLLVAR hid_t H5T_NATIVE_LDOUBLE_g;
 #endif
 H5_DLLVAR hid_t H5T_NATIVE_B8_g;
@@ -443,12 +444,12 @@ H5_DLLVAR hid_t H5T_NATIVE_HERR_g;
 H5_DLLVAR hid_t H5T_NATIVE_HBOOL_g;
 
 /* C9x integer types */
-#define H5T_NATIVE_INT8			(H5OPEN H5T_NATIVE_INT8_g)
-#define H5T_NATIVE_UINT8		(H5OPEN H5T_NATIVE_UINT8_g)
-#define H5T_NATIVE_INT_LEAST8		(H5OPEN H5T_NATIVE_INT_LEAST8_g)
-#define H5T_NATIVE_UINT_LEAST8		(H5OPEN H5T_NATIVE_UINT_LEAST8_g)
-#define H5T_NATIVE_INT_FAST8 		(H5OPEN H5T_NATIVE_INT_FAST8_g)
-#define H5T_NATIVE_UINT_FAST8		(H5OPEN H5T_NATIVE_UINT_FAST8_g)
+#define H5T_NATIVE_INT8        (H5OPEN H5T_NATIVE_INT8_g)
+#define H5T_NATIVE_UINT8       (H5OPEN H5T_NATIVE_UINT8_g)
+#define H5T_NATIVE_INT_LEAST8  (H5OPEN H5T_NATIVE_INT_LEAST8_g)
+#define H5T_NATIVE_UINT_LEAST8 (H5OPEN H5T_NATIVE_UINT_LEAST8_g)
+#define H5T_NATIVE_INT_FAST8   (H5OPEN H5T_NATIVE_INT_FAST8_g)
+#define H5T_NATIVE_UINT_FAST8  (H5OPEN H5T_NATIVE_UINT_FAST8_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT8_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT8_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST8_g;
@@ -456,12 +457,12 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST8_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_FAST8_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST8_g;
 
-#define H5T_NATIVE_INT16		(H5OPEN H5T_NATIVE_INT16_g)
-#define H5T_NATIVE_UINT16		(H5OPEN H5T_NATIVE_UINT16_g)
-#define H5T_NATIVE_INT_LEAST16		(H5OPEN H5T_NATIVE_INT_LEAST16_g)
-#define H5T_NATIVE_UINT_LEAST16		(H5OPEN H5T_NATIVE_UINT_LEAST16_g)
-#define H5T_NATIVE_INT_FAST16		(H5OPEN H5T_NATIVE_INT_FAST16_g)
-#define H5T_NATIVE_UINT_FAST16		(H5OPEN H5T_NATIVE_UINT_FAST16_g)
+#define H5T_NATIVE_INT16        (H5OPEN H5T_NATIVE_INT16_g)
+#define H5T_NATIVE_UINT16       (H5OPEN H5T_NATIVE_UINT16_g)
+#define H5T_NATIVE_INT_LEAST16  (H5OPEN H5T_NATIVE_INT_LEAST16_g)
+#define H5T_NATIVE_UINT_LEAST16 (H5OPEN H5T_NATIVE_UINT_LEAST16_g)
+#define H5T_NATIVE_INT_FAST16   (H5OPEN H5T_NATIVE_INT_FAST16_g)
+#define H5T_NATIVE_UINT_FAST16  (H5OPEN H5T_NATIVE_UINT_FAST16_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT16_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT16_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST16_g;
@@ -469,12 +470,12 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST16_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_FAST16_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST16_g;
 
-#define H5T_NATIVE_INT32		(H5OPEN H5T_NATIVE_INT32_g)
-#define H5T_NATIVE_UINT32		(H5OPEN H5T_NATIVE_UINT32_g)
-#define H5T_NATIVE_INT_LEAST32		(H5OPEN H5T_NATIVE_INT_LEAST32_g)
-#define H5T_NATIVE_UINT_LEAST32		(H5OPEN H5T_NATIVE_UINT_LEAST32_g)
-#define H5T_NATIVE_INT_FAST32		(H5OPEN H5T_NATIVE_INT_FAST32_g)
-#define H5T_NATIVE_UINT_FAST32		(H5OPEN H5T_NATIVE_UINT_FAST32_g)
+#define H5T_NATIVE_INT32        (H5OPEN H5T_NATIVE_INT32_g)
+#define H5T_NATIVE_UINT32       (H5OPEN H5T_NATIVE_UINT32_g)
+#define H5T_NATIVE_INT_LEAST32  (H5OPEN H5T_NATIVE_INT_LEAST32_g)
+#define H5T_NATIVE_UINT_LEAST32 (H5OPEN H5T_NATIVE_UINT_LEAST32_g)
+#define H5T_NATIVE_INT_FAST32   (H5OPEN H5T_NATIVE_INT_FAST32_g)
+#define H5T_NATIVE_UINT_FAST32  (H5OPEN H5T_NATIVE_UINT_FAST32_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT32_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT32_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST32_g;
@@ -482,12 +483,12 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST32_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_FAST32_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST32_g;
 
-#define H5T_NATIVE_INT64		(H5OPEN H5T_NATIVE_INT64_g)
-#define H5T_NATIVE_UINT64		(H5OPEN H5T_NATIVE_UINT64_g)
-#define H5T_NATIVE_INT_LEAST64		(H5OPEN H5T_NATIVE_INT_LEAST64_g)
-#define H5T_NATIVE_UINT_LEAST64 	(H5OPEN H5T_NATIVE_UINT_LEAST64_g)
-#define H5T_NATIVE_INT_FAST64		(H5OPEN H5T_NATIVE_INT_FAST64_g)
-#define H5T_NATIVE_UINT_FAST64		(H5OPEN H5T_NATIVE_UINT_FAST64_g)
+#define H5T_NATIVE_INT64        (H5OPEN H5T_NATIVE_INT64_g)
+#define H5T_NATIVE_UINT64       (H5OPEN H5T_NATIVE_UINT64_g)
+#define H5T_NATIVE_INT_LEAST64  (H5OPEN H5T_NATIVE_INT_LEAST64_g)
+#define H5T_NATIVE_UINT_LEAST64 (H5OPEN H5T_NATIVE_UINT_LEAST64_g)
+#define H5T_NATIVE_INT_FAST64   (H5OPEN H5T_NATIVE_INT_FAST64_g)
+#define H5T_NATIVE_UINT_FAST64  (H5OPEN H5T_NATIVE_UINT_FAST64_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT64_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT64_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST64_g;
@@ -496,74 +497,68 @@ H5_DLLVAR hid_t H5T_NATIVE_INT_FAST64_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST64_g;
 
 /* Operations defined on all datatypes */
-H5_DLL hid_t H5Tcreate(H5T_class_t type, size_t size);
-H5_DLL hid_t H5Tcopy(hid_t type_id);
+H5_DLL hid_t  H5Tcreate(H5T_class_t type, size_t size);
+H5_DLL hid_t  H5Tcopy(hid_t type_id);
 H5_DLL herr_t H5Tclose(hid_t type_id);
 H5_DLL htri_t H5Tequal(hid_t type1_id, hid_t type2_id);
 H5_DLL herr_t H5Tlock(hid_t type_id);
-H5_DLL herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id,
-    hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id);
-H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id);
+H5_DLL herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id,
+                         hid_t tapl_id);
+H5_DLL hid_t  H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id);
 H5_DLL herr_t H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id);
-H5_DLL hid_t H5Tget_create_plist(hid_t type_id);
+H5_DLL hid_t  H5Tget_create_plist(hid_t type_id);
 H5_DLL htri_t H5Tcommitted(hid_t type_id);
 H5_DLL herr_t H5Tencode(hid_t obj_id, void *buf, size_t *nalloc);
-H5_DLL hid_t H5Tdecode(const void *buf);
+H5_DLL hid_t  H5Tdecode(const void *buf);
 
 /* Operations defined on compound datatypes */
-H5_DLL herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset,
-			 hid_t member_id);
+H5_DLL herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id);
 H5_DLL herr_t H5Tpack(hid_t type_id);
 
 /* Operations defined on enumeration datatypes */
-H5_DLL hid_t H5Tenum_create(hid_t base_id);
+H5_DLL hid_t  H5Tenum_create(hid_t base_id);
 H5_DLL herr_t H5Tenum_insert(hid_t type, const char *name, const void *value);
-H5_DLL herr_t H5Tenum_nameof(hid_t type, const void *value, char *name/*out*/,
-			     size_t size);
-H5_DLL herr_t H5Tenum_valueof(hid_t type, const char *name,
-			      void *value/*out*/);
+H5_DLL herr_t H5Tenum_nameof(hid_t type, const void *value, char *name /*out*/, size_t size);
+H5_DLL herr_t H5Tenum_valueof(hid_t type, const char *name, void *value /*out*/);
 
 /* Operations defined on variable-length datatypes */
 H5_DLL hid_t H5Tvlen_create(hid_t base_id);
 
 /* Operations defined on array datatypes */
-H5_DLL hid_t H5Tarray_create2(hid_t base_id, unsigned ndims,
-            const hsize_t dim[/* ndims */]);
-H5_DLL int H5Tget_array_ndims(hid_t type_id);
-H5_DLL int H5Tget_array_dims2(hid_t type_id, hsize_t dims[]);
+H5_DLL hid_t H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/* ndims */]);
+H5_DLL int   H5Tget_array_ndims(hid_t type_id);
+H5_DLL int   H5Tget_array_dims2(hid_t type_id, hsize_t dims[]);
 
 /* Operations defined on opaque datatypes */
 H5_DLL herr_t H5Tset_tag(hid_t type, const char *tag);
-H5_DLL char *H5Tget_tag(hid_t type);
+H5_DLL char * H5Tget_tag(hid_t type);
 
 /* Querying property values */
-H5_DLL hid_t H5Tget_super(hid_t type);
+H5_DLL hid_t       H5Tget_super(hid_t type);
 H5_DLL H5T_class_t H5Tget_class(hid_t type_id);
-H5_DLL htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls);
-H5_DLL size_t H5Tget_size(hid_t type_id);
+H5_DLL htri_t      H5Tdetect_class(hid_t type_id, H5T_class_t cls);
+H5_DLL size_t      H5Tget_size(hid_t type_id);
 H5_DLL H5T_order_t H5Tget_order(hid_t type_id);
-H5_DLL size_t H5Tget_precision(hid_t type_id);
-H5_DLL int H5Tget_offset(hid_t type_id);
-H5_DLL herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/,
-			  H5T_pad_t *msb/*out*/);
-H5_DLL H5T_sign_t H5Tget_sign(hid_t type_id);
-H5_DLL herr_t H5Tget_fields(hid_t type_id, size_t *spos/*out*/,
-			     size_t *epos/*out*/, size_t *esize/*out*/,
-			     size_t *mpos/*out*/, size_t *msize/*out*/);
+H5_DLL size_t      H5Tget_precision(hid_t type_id);
+H5_DLL int         H5Tget_offset(hid_t type_id);
+H5_DLL herr_t      H5Tget_pad(hid_t type_id, H5T_pad_t *lsb /*out*/, H5T_pad_t *msb /*out*/);
+H5_DLL H5T_sign_t  H5Tget_sign(hid_t type_id);
+H5_DLL herr_t H5Tget_fields(hid_t type_id, size_t *spos /*out*/, size_t *epos /*out*/, size_t *esize /*out*/,
+                            size_t *mpos /*out*/, size_t *msize /*out*/);
 H5_DLL size_t H5Tget_ebias(hid_t type_id);
-H5_DLL H5T_norm_t H5Tget_norm(hid_t type_id);
-H5_DLL H5T_pad_t H5Tget_inpad(hid_t type_id);
-H5_DLL H5T_str_t H5Tget_strpad(hid_t type_id);
-H5_DLL int H5Tget_nmembers(hid_t type_id);
-H5_DLL char *H5Tget_member_name(hid_t type_id, unsigned membno);
-H5_DLL int H5Tget_member_index(hid_t type_id, const char *name);
-H5_DLL size_t H5Tget_member_offset(hid_t type_id, unsigned membno);
+H5_DLL H5T_norm_t  H5Tget_norm(hid_t type_id);
+H5_DLL H5T_pad_t   H5Tget_inpad(hid_t type_id);
+H5_DLL H5T_str_t   H5Tget_strpad(hid_t type_id);
+H5_DLL int         H5Tget_nmembers(hid_t type_id);
+H5_DLL char *      H5Tget_member_name(hid_t type_id, unsigned membno);
+H5_DLL int         H5Tget_member_index(hid_t type_id, const char *name);
+H5_DLL size_t      H5Tget_member_offset(hid_t type_id, unsigned membno);
 H5_DLL H5T_class_t H5Tget_member_class(hid_t type_id, unsigned membno);
-H5_DLL hid_t H5Tget_member_type(hid_t type_id, unsigned membno);
-H5_DLL herr_t H5Tget_member_value(hid_t type_id, unsigned membno, void *value/*out*/);
-H5_DLL H5T_cset_t H5Tget_cset(hid_t type_id);
-H5_DLL htri_t H5Tis_variable_str(hid_t type_id);
-H5_DLL hid_t H5Tget_native_type(hid_t type_id, H5T_direction_t direction);
+H5_DLL hid_t       H5Tget_member_type(hid_t type_id, unsigned membno);
+H5_DLL herr_t      H5Tget_member_value(hid_t type_id, unsigned membno, void *value /*out*/);
+H5_DLL H5T_cset_t  H5Tget_cset(hid_t type_id);
+H5_DLL htri_t      H5Tis_variable_str(hid_t type_id);
+H5_DLL hid_t       H5Tget_native_type(hid_t type_id, H5T_direction_t direction);
 
 /* Setting property values */
 H5_DLL herr_t H5Tset_size(hid_t type_id, size_t size);
@@ -572,8 +567,7 @@ H5_DLL herr_t H5Tset_precision(hid_t type_id, size_t prec);
 H5_DLL herr_t H5Tset_offset(hid_t type_id, size_t offset);
 H5_DLL herr_t H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb);
 H5_DLL herr_t H5Tset_sign(hid_t type_id, H5T_sign_t sign);
-H5_DLL herr_t H5Tset_fields(hid_t type_id, size_t spos, size_t epos,
-			     size_t esize, size_t mpos, size_t msize);
+H5_DLL herr_t H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize);
 H5_DLL herr_t H5Tset_ebias(hid_t type_id, size_t ebias);
 H5_DLL herr_t H5Tset_norm(hid_t type_id, H5T_norm_t norm);
 H5_DLL herr_t H5Tset_inpad(hid_t type_id, H5T_pad_t pad);
@@ -581,14 +575,12 @@ H5_DLL herr_t H5Tset_cset(hid_t type_id, H5T_cset_t cset);
 H5_DLL herr_t H5Tset_strpad(hid_t type_id, H5T_str_t strpad);
 
 /* Type conversion database */
-H5_DLL herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id,
-			   hid_t dst_id, H5T_conv_t func);
-H5_DLL herr_t H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id,
-			     hid_t dst_id, H5T_conv_t func);
+H5_DLL herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func);
+H5_DLL herr_t H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func);
 H5_DLL H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata);
-H5_DLL htri_t H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
-H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts,
-			  void *buf, void *background, hid_t plist_id);
+H5_DLL htri_t     H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
+H5_DLL herr_t     H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background,
+                             hid_t plist_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
@@ -598,17 +590,14 @@ H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts,
 
 /* Macros */
 
-
 /* Typedefs */
 
-
 /* Function prototypes */
 H5_DLL herr_t H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id);
-H5_DLL hid_t H5Topen1(hid_t loc_id, const char *name);
-H5_DLL hid_t H5Tarray_create1(hid_t base_id, int ndims,
-            const hsize_t dim[/* ndims */],
-            const int perm[/* ndims */]);
-H5_DLL int H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
+H5_DLL hid_t  H5Topen1(hid_t loc_id, const char *name);
+H5_DLL hid_t  H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
+                               const int perm[/* ndims */]);
+H5_DLL int    H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
@@ -616,4 +605,3 @@ H5_DLL int H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
 }
 #endif
 #endif /* _H5Tpublic_H */
-
diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c
index 328642f..119e390 100644
--- a/src/H5Tstrpad.c
+++ b/src/H5Tstrpad.c
@@ -16,18 +16,16 @@
  *      the datatype string padding for the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_strpad_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_strpad_interface
 
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5Tpkg.h"     /* Datatypes				*/
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Tpkg.h"		/* Datatypes				*/
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_strpad_interface -- Initialize interface-specific information
@@ -49,7 +47,6 @@ H5T_init_strpad_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_strpad_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_strpad
  *
@@ -74,22 +71,22 @@ H5T_init_strpad_interface(void)
 H5T_str_t
 H5Tget_strpad(hid_t type_id)
 {
-    H5T_t	*dt = NULL;
-    H5T_str_t	ret_value;
+    H5T_t *   dt = NULL;
+    H5T_str_t ret_value;
 
     FUNC_ENTER_API(H5T_STR_ERROR)
     H5TRACE1("Tz", "i", type_id);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_STR_ERROR, "not a datatype")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_STR_ERROR, "not a datatype")
     while (dt->shared->parent && !H5T_IS_STRING(dt->shared))
-        dt = dt->shared->parent;  /*defer to parent*/
+        dt = dt->shared->parent; /*defer to parent*/
     if (!H5T_IS_STRING(dt->shared))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_STR_ERROR, "operation not defined for datatype class")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_STR_ERROR, "operation not defined for datatype class")
 
     /* result */
-    if(H5T_IS_FIXED_STRING(dt->shared))
+    if (H5T_IS_FIXED_STRING(dt->shared))
         ret_value = dt->shared->u.atomic.u.s.pad;
     else
         ret_value = dt->shared->u.vlen.pad;
@@ -98,7 +95,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tset_strpad
  *
@@ -131,26 +127,26 @@ done:
 herr_t
 H5Tset_strpad(hid_t type_id, H5T_str_t strpad)
 {
-    H5T_t	*dt = NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t *dt        = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iTz", type_id, strpad);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "datatype is read-only")
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "datatype is read-only")
     if (strpad < H5T_STR_NULLTERM || strpad >= H5T_NSTR)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal string pad type")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal string pad type")
     while (dt->shared->parent && !H5T_IS_STRING(dt->shared))
-        dt = dt->shared->parent;  /*defer to parent*/
+        dt = dt->shared->parent; /*defer to parent*/
     if (!H5T_IS_STRING(dt->shared))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for datatype class")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for datatype class")
 
     /* Commit */
-    if(H5T_IS_FIXED_STRING(dt->shared))
+    if (H5T_IS_FIXED_STRING(dt->shared))
         dt->shared->u.atomic.u.s.pad = strpad;
     else
         dt->shared->u.vlen.pad = strpad;
@@ -158,4 +154,3 @@ H5Tset_strpad(hid_t type_id, H5T_str_t strpad)
 done:
     FUNC_LEAVE_API(ret_value)
 }
-
diff --git a/src/H5Tvisit.c b/src/H5Tvisit.c
index 76c87a3..2a130df 100644
--- a/src/H5Tvisit.c
+++ b/src/H5Tvisit.c
@@ -33,53 +33,43 @@
 /* Module Setup */
 /****************/
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
-
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Tpkg.h"		/* Datatypes         			*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Tpkg.h"     /* Datatypes         			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__visit
  *
@@ -96,8 +86,8 @@
 herr_t
 H5T__visit(H5T_t *dt, unsigned visit_flags, H5T_operator_t op, void *op_value)
 {
-    hbool_t is_complex;                 /* Flag indicating current datatype is "complex" */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    hbool_t is_complex;          /* Flag indicating current datatype is "complex" */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -106,48 +96,46 @@ H5T__visit(H5T_t *dt, unsigned visit_flags, H5T_operator_t op, void *op_value)
     HDassert(op);
 
     /* Check for complex datatype */
-    is_complex  = H5T_IS_COMPLEX(dt->shared->type);
+    is_complex = H5T_IS_COMPLEX(dt->shared->type);
 
     /* If the callback is to be made on the datatype first, do that */
-    if(is_complex && (visit_flags & H5T_VISIT_COMPLEX_FIRST))
-        if(op(dt, op_value) < 0)
+    if (is_complex && (visit_flags & H5T_VISIT_COMPLEX_FIRST))
+        if (op(dt, op_value) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_BADITER, FAIL, "operator callback failed")
 
     /* Make callback for each member/child, if requested */
-    switch(dt->shared->type) {
-        case H5T_COMPOUND:
-            {
-                unsigned u;             /* Local index variable */
-
-                /* Visit each member of the compound datatype */
-                for(u = 0; u < dt->shared->u.compnd.nmembs; u++)
-                    if(H5T__visit(dt->shared->u.compnd.memb[u].type, visit_flags, op, op_value) < 0)
-                        HGOTO_ERROR(H5E_DATATYPE, H5E_BADITER, FAIL, "can't visit member datatype")
-            } /* end case */
-            break;
+    switch (dt->shared->type) {
+        case H5T_COMPOUND: {
+            unsigned u; /* Local index variable */
+
+            /* Visit each member of the compound datatype */
+            for (u = 0; u < dt->shared->u.compnd.nmembs; u++)
+                if (H5T__visit(dt->shared->u.compnd.memb[u].type, visit_flags, op, op_value) < 0)
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_BADITER, FAIL, "can't visit member datatype")
+        } /* end case */
+        break;
 
         case H5T_ARRAY:
         case H5T_VLEN:
         case H5T_ENUM:
             /* Visit parent type */
-            if(H5T__visit(dt->shared->parent, visit_flags, op, op_value) < 0)
+            if (H5T__visit(dt->shared->parent, visit_flags, op, op_value) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADITER, FAIL, "can't visit parent datatype")
             break;
 
         default:
             /* Visit "simple" datatypes here */
-            if(visit_flags & H5T_VISIT_SIMPLE)
-                if(op(dt, op_value) < 0)
+            if (visit_flags & H5T_VISIT_SIMPLE)
+                if (op(dt, op_value) < 0)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_BADITER, FAIL, "operator callback failed")
             break;
     } /* end switch */
 
     /* If the callback is to be made on the datatype last, do that */
-    if(is_complex && (visit_flags & H5T_VISIT_COMPLEX_LAST))
-        if(op(dt, op_value) < 0)
+    if (is_complex && (visit_flags & H5T_VISIT_COMPLEX_LAST))
+        if (op(dt, op_value) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_BADITER, FAIL, "operator callback failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__visit() */
-
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index abb719f..5c08130 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -16,53 +16,50 @@
  *      datatypes in the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	     */
+#define H5T_PACKAGE /*suppress error about including H5Tpkg	     */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_vlen_interface
+#define H5_INTERFACE_INIT_FUNC H5T_init_vlen_interface
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5HGprivate.h"	/* Global Heaps				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"		/* Property lists			*/
-#include "H5Tpkg.h"		/* Datatypes				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Dataset functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5HGprivate.h" /* Global Heaps				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Pprivate.h"  /* Property lists			*/
+#include "H5Tpkg.h"      /* Datatypes				*/
 
 /* Local functions */
-static herr_t H5T_vlen_reclaim_recurse(void *elem, const H5T_t *dt, H5MM_free_t free_func, void *free_info);
+static herr_t  H5T_vlen_reclaim_recurse(void *elem, const H5T_t *dt, H5MM_free_t free_func, void *free_info);
 static ssize_t H5T_vlen_seq_mem_getlen(const void *_vl);
-static void * H5T_vlen_seq_mem_getptr(void *_vl);
-static htri_t H5T_vlen_seq_mem_isnull(const H5F_t *f, void *_vl);
-static herr_t H5T_vlen_seq_mem_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len);
-static herr_t H5T_vlen_seq_mem_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *_buf, void *_bg, size_t seq_len, size_t base_size);
-static herr_t H5T_vlen_seq_mem_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg);
+static void *  H5T_vlen_seq_mem_getptr(void *_vl);
+static htri_t  H5T_vlen_seq_mem_isnull(const H5F_t *f, void *_vl);
+static herr_t  H5T_vlen_seq_mem_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len);
+static herr_t  H5T_vlen_seq_mem_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info,
+                                      void *_vl, void *_buf, void *_bg, size_t seq_len, size_t base_size);
+static herr_t  H5T_vlen_seq_mem_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg);
 static ssize_t H5T_vlen_str_mem_getlen(const void *_vl);
-static void * H5T_vlen_str_mem_getptr(void *_vl);
-static htri_t H5T_vlen_str_mem_isnull(const H5F_t *f, void *_vl);
-static herr_t H5T_vlen_str_mem_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len);
-static herr_t H5T_vlen_str_mem_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *_buf, void *_bg, size_t seq_len, size_t base_size);
-static herr_t H5T_vlen_str_mem_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg);
+static void *  H5T_vlen_str_mem_getptr(void *_vl);
+static htri_t  H5T_vlen_str_mem_isnull(const H5F_t *f, void *_vl);
+static herr_t  H5T_vlen_str_mem_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len);
+static herr_t  H5T_vlen_str_mem_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info,
+                                      void *_vl, void *_buf, void *_bg, size_t seq_len, size_t base_size);
+static herr_t  H5T_vlen_str_mem_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg);
 static ssize_t H5T_vlen_disk_getlen(const void *_vl);
-static void * H5T_vlen_disk_getptr(void *_vl);
-static htri_t H5T_vlen_disk_isnull(const H5F_t *f, void *_vl);
-static herr_t H5T_vlen_disk_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len);
-static herr_t H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *_buf, void *_bg, size_t seq_len, size_t base_size);
-static herr_t H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg);
+static void *  H5T_vlen_disk_getptr(void *_vl);
+static htri_t  H5T_vlen_disk_isnull(const H5F_t *f, void *_vl);
+static herr_t  H5T_vlen_disk_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len);
+static herr_t  H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info,
+                                   void *_vl, void *_buf, void *_bg, size_t seq_len, size_t base_size);
+static herr_t  H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg);
 
 /* Local variables */
 
 /* Default settings for variable-length allocation routines */
-static H5T_vlen_alloc_info_t H5T_vlen_def_vl_alloc_info ={
-    H5D_VLEN_ALLOC,
-    H5D_VLEN_ALLOC_INFO,
-    H5D_VLEN_FREE,
-    H5D_VLEN_FREE_INFO
-};
-
-
+static H5T_vlen_alloc_info_t H5T_vlen_def_vl_alloc_info = {H5D_VLEN_ALLOC, H5D_VLEN_ALLOC_INFO, H5D_VLEN_FREE,
+                                                           H5D_VLEN_FREE_INFO};
+
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_vlen_interface -- Initialize interface-specific information
@@ -84,7 +81,6 @@ H5T_init_vlen_interface(void)
     FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_vlen_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Tvlen_create
  *
@@ -103,30 +99,29 @@ H5T_init_vlen_interface(void)
 hid_t
 H5Tvlen_create(hid_t base_id)
 {
-    H5T_t	*base = NULL;		/*base datatype	*/
-    H5T_t	*dt = NULL;		/*new datatype	*/
-    hid_t	ret_value;	        /*return value			*/
+    H5T_t *base = NULL; /*base datatype	*/
+    H5T_t *dt   = NULL; /*new datatype	*/
+    hid_t  ret_value;   /*return value			*/
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", base_id);
 
     /* Check args */
-    if(NULL == (base = H5I_object_verify(base_id, H5I_DATATYPE)))
+    if (NULL == (base = H5I_object_verify(base_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype")
 
     /* Create up VL datatype */
-    if((dt = H5T__vlen_create(base)) == NULL)
+    if ((dt = H5T__vlen_create(base)) == NULL)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid VL location")
 
     /* Atomize the type */
-    if((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tvlen_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__vlen_create
  *
@@ -145,8 +140,8 @@ done:
 H5T_t *
 H5T__vlen_create(const H5T_t *base)
 {
-    H5T_t	*dt = NULL;		/*new VL datatype	*/
-    H5T_t	*ret_value;	/*return value			*/
+    H5T_t *dt = NULL; /*new VL datatype	*/
+    H5T_t *ret_value; /*return value			*/
 
     FUNC_ENTER_PACKAGE
 
@@ -154,7 +149,7 @@ H5T__vlen_create(const H5T_t *base)
     HDassert(base);
 
     /* Build new type */
-    if(NULL == (dt = H5T__alloc()))
+    if (NULL == (dt = H5T__alloc()))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, NULL, "memory allocation failed")
     dt->shared->type = H5T_VLEN;
 
@@ -163,7 +158,7 @@ H5T__vlen_create(const H5T_t *base)
      * data, not point to the same VL sequences)
      */
     dt->shared->force_conv = TRUE;
-    if(NULL == (dt->shared->parent = H5T_copy(base, H5T_COPY_ALL)))
+    if (NULL == (dt->shared->parent = H5T_copy(base, H5T_COPY_ALL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy base datatype")
 
     /* Inherit encoding version from base type */
@@ -173,21 +168,20 @@ H5T__vlen_create(const H5T_t *base)
     dt->shared->u.vlen.type = H5T_VLEN_SEQUENCE;
 
     /* Set up VL information */
-    if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
+    if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location")
 
     /* Set return value */
     ret_value = dt;
 
 done:
-    if(!ret_value)
-        if(dt && H5T_close(dt) < 0)
+    if (!ret_value)
+        if (dt && H5T_close(dt) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, NULL, "unable to release datatype info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__vlen_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5T__vlen_set_loc
  *
@@ -207,7 +201,7 @@ done:
 htri_t
 H5T__vlen_set_loc(const H5T_t *dt, H5F_t *f, H5T_loc_t loc)
 {
-    htri_t ret_value = FALSE;   /* Indicate success, but no location change */
+    htri_t ret_value = FALSE; /* Indicate success, but no location change */
 
     FUNC_ENTER_PACKAGE
 
@@ -216,37 +210,39 @@ H5T__vlen_set_loc(const H5T_t *dt, H5F_t *f, H5T_loc_t loc)
     HDassert(loc >= H5T_LOC_BADLOC && loc < H5T_LOC_MAXLOC);
 
     /* Only change the location if it's different */
-    if(loc != dt->shared->u.vlen.loc || f != dt->shared->u.vlen.f) {
-        switch(loc) {
-            case H5T_LOC_MEMORY:   /* Memory based VL datatype */
+    if (loc != dt->shared->u.vlen.loc || f != dt->shared->u.vlen.f) {
+        switch (loc) {
+            case H5T_LOC_MEMORY: /* Memory based VL datatype */
                 HDassert(NULL == f);
 
                 /* Mark this type as being stored in memory */
                 dt->shared->u.vlen.loc = H5T_LOC_MEMORY;
 
-                if(dt->shared->u.vlen.type == H5T_VLEN_SEQUENCE) {
+                if (dt->shared->u.vlen.type == H5T_VLEN_SEQUENCE) {
                     /* size in memory, disk size is different */
                     dt->shared->size = sizeof(hvl_t);
 
                     /* Set up the function pointers to access the VL sequence in memory */
-                    dt->shared->u.vlen.getlen = H5T_vlen_seq_mem_getlen;
-                    dt->shared->u.vlen.getptr = H5T_vlen_seq_mem_getptr;
-                    dt->shared->u.vlen.isnull = H5T_vlen_seq_mem_isnull;
-                    dt->shared->u.vlen.read = H5T_vlen_seq_mem_read;
-                    dt->shared->u.vlen.write = H5T_vlen_seq_mem_write;
+                    dt->shared->u.vlen.getlen  = H5T_vlen_seq_mem_getlen;
+                    dt->shared->u.vlen.getptr  = H5T_vlen_seq_mem_getptr;
+                    dt->shared->u.vlen.isnull  = H5T_vlen_seq_mem_isnull;
+                    dt->shared->u.vlen.read    = H5T_vlen_seq_mem_read;
+                    dt->shared->u.vlen.write   = H5T_vlen_seq_mem_write;
                     dt->shared->u.vlen.setnull = H5T_vlen_seq_mem_setnull;
-                } else if(dt->shared->u.vlen.type == H5T_VLEN_STRING) {
+                }
+                else if (dt->shared->u.vlen.type == H5T_VLEN_STRING) {
                     /* size in memory, disk size is different */
                     dt->shared->size = sizeof(char *);
 
                     /* Set up the function pointers to access the VL string in memory */
-                    dt->shared->u.vlen.getlen = H5T_vlen_str_mem_getlen;
-                    dt->shared->u.vlen.getptr = H5T_vlen_str_mem_getptr;
-                    dt->shared->u.vlen.isnull = H5T_vlen_str_mem_isnull;
-                    dt->shared->u.vlen.read = H5T_vlen_str_mem_read;
-                    dt->shared->u.vlen.write = H5T_vlen_str_mem_write;
+                    dt->shared->u.vlen.getlen  = H5T_vlen_str_mem_getlen;
+                    dt->shared->u.vlen.getptr  = H5T_vlen_str_mem_getptr;
+                    dt->shared->u.vlen.isnull  = H5T_vlen_str_mem_isnull;
+                    dt->shared->u.vlen.read    = H5T_vlen_str_mem_read;
+                    dt->shared->u.vlen.write   = H5T_vlen_str_mem_write;
                     dt->shared->u.vlen.setnull = H5T_vlen_str_mem_setnull;
-                } else {
+                }
+                else {
                     HDassert(0 && "Invalid VL type");
                 }
 
@@ -254,7 +250,7 @@ H5T__vlen_set_loc(const H5T_t *dt, H5F_t *f, H5T_loc_t loc)
                 dt->shared->u.vlen.f = NULL;
                 break;
 
-            case H5T_LOC_DISK:   /* Disk based VL datatype */
+            case H5T_LOC_DISK: /* Disk based VL datatype */
                 HDassert(f);
 
                 /* Mark this type as being stored on disk */
@@ -269,11 +265,11 @@ H5T__vlen_set_loc(const H5T_t *dt, H5F_t *f, H5T_loc_t loc)
 
                 /* Set up the function pointers to access the VL information on disk */
                 /* VL sequences and VL strings are stored identically on disk, so use the same functions */
-                dt->shared->u.vlen.getlen = H5T_vlen_disk_getlen;
-                dt->shared->u.vlen.getptr = H5T_vlen_disk_getptr;
-                dt->shared->u.vlen.isnull = H5T_vlen_disk_isnull;
-                dt->shared->u.vlen.read = H5T_vlen_disk_read;
-                dt->shared->u.vlen.write = H5T_vlen_disk_write;
+                dt->shared->u.vlen.getlen  = H5T_vlen_disk_getlen;
+                dt->shared->u.vlen.getptr  = H5T_vlen_disk_getptr;
+                dt->shared->u.vlen.isnull  = H5T_vlen_disk_isnull;
+                dt->shared->u.vlen.read    = H5T_vlen_disk_read;
+                dt->shared->u.vlen.write   = H5T_vlen_disk_write;
                 dt->shared->u.vlen.setnull = H5T_vlen_disk_setnull;
 
                 /* Set file ID (since this VL is on disk) */
@@ -296,9 +292,8 @@ H5T__vlen_set_loc(const H5T_t *dt, H5F_t *f, H5T_loc_t loc)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T__vlen_set_loc() */
+} /* end H5T__vlen_set_loc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_seq_mem_getlen
  *
@@ -315,9 +310,9 @@ static ssize_t
 H5T_vlen_seq_mem_getlen(const void *_vl)
 {
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
-    const hvl_t *vl=(const hvl_t *)_vl;   /* Pointer to the user's hvl_t information */
+    const hvl_t *vl = (const hvl_t *)_vl; /* Pointer to the user's hvl_t information */
 #else
-    hvl_t vl;             /* User's hvl_t information */
+    hvl_t vl; /* User's hvl_t information */
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -333,9 +328,8 @@ H5T_vlen_seq_mem_getlen(const void *_vl)
 
     FUNC_LEAVE_NOAPI((ssize_t)vl.len)
 #endif
-}   /* end H5T_vlen_seq_mem_getlen() */
+} /* end H5T_vlen_seq_mem_getlen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_seq_mem_getptr
  *
@@ -352,9 +346,9 @@ static void *
 H5T_vlen_seq_mem_getptr(void *_vl)
 {
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
-    const hvl_t *vl=(const hvl_t *)_vl;   /* Pointer to the user's hvl_t information */
+    const hvl_t *vl = (const hvl_t *)_vl; /* Pointer to the user's hvl_t information */
 #else
-    hvl_t vl;             /* User's hvl_t information */
+    hvl_t vl; /* User's hvl_t information */
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -370,9 +364,8 @@ H5T_vlen_seq_mem_getptr(void *_vl)
 
     FUNC_LEAVE_NOAPI(vl.p)
 #endif
-}   /* end H5T_vlen_seq_mem_getptr() */
+} /* end H5T_vlen_seq_mem_getptr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_seq_mem_isnull
  *
@@ -390,9 +383,9 @@ static htri_t
 H5T_vlen_seq_mem_isnull(const H5F_t H5_ATTR_UNUSED *f, void *_vl)
 {
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
-    const hvl_t *vl=(const hvl_t *)_vl;   /* Pointer to the user's hvl_t information */
+    const hvl_t *vl = (const hvl_t *)_vl; /* Pointer to the user's hvl_t information */
 #else
-    hvl_t vl;             /* User's hvl_t information */
+    hvl_t vl; /* User's hvl_t information */
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -401,16 +394,15 @@ H5T_vlen_seq_mem_isnull(const H5F_t H5_ATTR_UNUSED *f, void *_vl)
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
     HDassert(vl);
 
-    FUNC_LEAVE_NOAPI((vl->len==0 || vl->p==NULL) ? TRUE : FALSE)
+    FUNC_LEAVE_NOAPI((vl->len == 0 || vl->p == NULL) ? TRUE : FALSE)
 #else
     HDassert(_vl);
     HDmemcpy(&vl, _vl, sizeof(hvl_t));
 
-    FUNC_LEAVE_NOAPI((vl.len==0 || vl.p==NULL) ? TRUE : FALSE)
+    FUNC_LEAVE_NOAPI((vl.len == 0 || vl.p == NULL) ? TRUE : FALSE)
 #endif
-}   /* end H5T_vlen_seq_mem_isnull() */
+} /* end H5T_vlen_seq_mem_isnull() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_seq_mem_read
  *
@@ -428,9 +420,9 @@ static herr_t
 H5T_vlen_seq_mem_read(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, void *_vl, void *buf, size_t len)
 {
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
-    const hvl_t *vl=(const hvl_t *)_vl;   /* Pointer to the user's hvl_t information */
+    const hvl_t *vl = (const hvl_t *)_vl; /* Pointer to the user's hvl_t information */
 #else
-    hvl_t vl;             /* User's hvl_t information */
+    hvl_t vl; /* User's hvl_t information */
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -440,19 +432,18 @@ H5T_vlen_seq_mem_read(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, voi
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
     HDassert(vl && vl->p);
 
-    HDmemcpy(buf,vl->p,len);
+    HDmemcpy(buf, vl->p, len);
 #else
     HDassert(_vl);
     HDmemcpy(&vl, _vl, sizeof(hvl_t));
     HDassert(vl.p);
 
-    HDmemcpy(buf,vl.p,len);
+    HDmemcpy(buf, vl.p, len);
 #endif
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* end H5T_vlen_seq_mem_read() */
+} /* end H5T_vlen_seq_mem_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_seq_mem_write
  *
@@ -467,11 +458,13 @@ H5T_vlen_seq_mem_read(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, voi
  */
 /* ARGSUSED */
 static herr_t
-H5T_vlen_seq_mem_write(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf, void H5_ATTR_UNUSED *_bg, size_t seq_len, size_t base_size)
+H5T_vlen_seq_mem_write(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
+                       const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf,
+                       void H5_ATTR_UNUSED *_bg, size_t seq_len, size_t base_size)
 {
-    hvl_t vl;                       /* Temporary hvl_t to use during operation */
+    hvl_t  vl; /* Temporary hvl_t to use during operation */
     size_t len;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -479,37 +472,36 @@ H5T_vlen_seq_mem_write(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, co
     HDassert(_vl);
     HDassert(buf);
 
-    if(seq_len!=0) {
-        len=seq_len*base_size;
+    if (seq_len != 0) {
+        len = seq_len * base_size;
 
         /* Use the user's memory allocation routine is one is defined */
-        if(vl_alloc_info->alloc_func!=NULL) {
-            if(NULL==(vl.p=(vl_alloc_info->alloc_func)(len,vl_alloc_info->alloc_info)))
+        if (vl_alloc_info->alloc_func != NULL) {
+            if (NULL == (vl.p = (vl_alloc_info->alloc_func)(len, vl_alloc_info->alloc_info)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for VL data")
-          } /* end if */
-        else {  /* Default to system malloc */
-            if(NULL==(vl.p=H5MM_malloc(len)))
+        }      /* end if */
+        else { /* Default to system malloc */
+            if (NULL == (vl.p = H5MM_malloc(len)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for VL data")
-          } /* end else */
+        } /* end else */
 
         /* Copy the data into the newly allocated buffer */
-        HDmemcpy(vl.p,buf,len);
+        HDmemcpy(vl.p, buf, len);
 
     } /* end if */
     else
-        vl.p=NULL;
+        vl.p = NULL;
 
     /* Set the sequence length */
-    vl.len=seq_len;
+    vl.len = seq_len;
 
     /* Set pointer in user's buffer with memcpy, to avoid alignment issues */
-    HDmemcpy(_vl,&vl,sizeof(hvl_t));
+    HDmemcpy(_vl, &vl, sizeof(hvl_t));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_vlen_seq_mem_write() */
+} /* end H5T_vlen_seq_mem_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_seq_mem_setnull
  *
@@ -524,9 +516,10 @@ done:
  */
 /* ARGSUSED */
 static herr_t
-H5T_vlen_seq_mem_setnull(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, void *_vl, void H5_ATTR_UNUSED *_bg)
+H5T_vlen_seq_mem_setnull(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, void *_vl,
+                         void H5_ATTR_UNUSED *_bg)
 {
-    hvl_t vl;                       /* Temporary hvl_t to use during operation */
+    hvl_t vl; /* Temporary hvl_t to use during operation */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -534,16 +527,15 @@ H5T_vlen_seq_mem_setnull(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
     HDassert(_vl);
 
     /* Set the "nil" hvl_t */
-    vl.len=0;
-    vl.p=NULL;
+    vl.len = 0;
+    vl.p   = NULL;
 
     /* Set pointer in user's buffer with memcpy, to avoid alignment issues */
-    HDmemcpy(_vl,&vl,sizeof(hvl_t));
+    HDmemcpy(_vl, &vl, sizeof(hvl_t));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* end H5T_vlen_seq_mem_setnull() */
+} /* end H5T_vlen_seq_mem_setnull() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_str_mem_getlen
  *
@@ -560,9 +552,9 @@ static ssize_t
 H5T_vlen_str_mem_getlen(const void *_vl)
 {
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
-    const char *s=*(const char * const *)_vl;   /* Pointer to the user's string information */
+    const char *s = *(const char *const *)_vl; /* Pointer to the user's string information */
 #else
-    const char *s;      /* Pointer to the user's string information */
+    const char *s; /* Pointer to the user's string information */
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -576,9 +568,8 @@ H5T_vlen_str_mem_getlen(const void *_vl)
 #endif
 
     FUNC_LEAVE_NOAPI((ssize_t)HDstrlen(s))
-}   /* end H5T_vlen_str_mem_getlen() */
+} /* end H5T_vlen_str_mem_getlen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_str_mem_getptr
  *
@@ -595,9 +586,9 @@ static void *
 H5T_vlen_str_mem_getptr(void *_vl)
 {
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
-    char *s=*(char **)_vl;   /* Pointer to the user's string information */
+    char *s = *(char **)_vl; /* Pointer to the user's string information */
 #else
-    char *s;      /* Pointer to the user's string information */
+    char *s; /* Pointer to the user's string information */
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -611,9 +602,8 @@ H5T_vlen_str_mem_getptr(void *_vl)
 #endif
 
     FUNC_LEAVE_NOAPI(s)
-}   /* end H5T_vlen_str_mem_getptr() */
+} /* end H5T_vlen_str_mem_getptr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_str_mem_isnull
  *
@@ -631,9 +621,9 @@ static htri_t
 H5T_vlen_str_mem_isnull(const H5F_t H5_ATTR_UNUSED *f, void *_vl)
 {
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
-    char *s=*(char **)_vl;   /* Pointer to the user's string information */
+    char *s = *(char **)_vl; /* Pointer to the user's string information */
 #else
-    char *s;      /* Pointer to the user's string information */
+    char *s; /* Pointer to the user's string information */
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -642,10 +632,9 @@ H5T_vlen_str_mem_isnull(const H5F_t H5_ATTR_UNUSED *f, void *_vl)
     HDmemcpy(&s, _vl, sizeof(char *));
 #endif
 
-    FUNC_LEAVE_NOAPI(s==NULL ? TRUE : FALSE)
-}   /* end H5T_vlen_str_mem_isnull() */
+    FUNC_LEAVE_NOAPI(s == NULL ? TRUE : FALSE)
+} /* end H5T_vlen_str_mem_isnull() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_str_mem_read
  *
@@ -663,14 +652,14 @@ static herr_t
 H5T_vlen_str_mem_read(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, void *_vl, void *buf, size_t len)
 {
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
-    char *s=*(char **)_vl;   /* Pointer to the user's string information */
+    char *s = *(char **)_vl; /* Pointer to the user's string information */
 #else
-    char *s;      /* Pointer to the user's string information */
+    char *s; /* Pointer to the user's string information */
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(len>0) {
+    if (len > 0) {
         /* check parameters */
         HDassert(buf);
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS
@@ -680,13 +669,12 @@ H5T_vlen_str_mem_read(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, voi
         HDmemcpy(&s, _vl, sizeof(char *));
 #endif
 
-        HDmemcpy(buf,s,len);
+        HDmemcpy(buf, s, len);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* end H5T_vlen_str_mem_read() */
+} /* end H5T_vlen_str_mem_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_str_mem_write
  *
@@ -701,11 +689,13 @@ H5T_vlen_str_mem_read(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, voi
  */
 /* ARGSUSED */
 static herr_t
-H5T_vlen_str_mem_write(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf, void H5_ATTR_UNUSED *_bg, size_t seq_len, size_t base_size)
+H5T_vlen_str_mem_write(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
+                       const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf,
+                       void H5_ATTR_UNUSED *_bg, size_t seq_len, size_t base_size)
 {
-    char *t;                        /* Pointer to temporary buffer allocated */
-    size_t len;                     /* Maximum length of the string to copy */
-    herr_t      ret_value=SUCCEED;  /* Return value */
+    char * t;                   /* Pointer to temporary buffer allocated */
+    size_t len;                 /* Maximum length of the string to copy */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -713,27 +703,26 @@ H5T_vlen_str_mem_write(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, co
     HDassert(buf);
 
     /* Use the user's memory allocation routine if one is defined */
-    if(vl_alloc_info->alloc_func!=NULL) {
-        if(NULL==(t=(vl_alloc_info->alloc_func)((seq_len+1)*base_size,vl_alloc_info->alloc_info)))
+    if (vl_alloc_info->alloc_func != NULL) {
+        if (NULL == (t = (vl_alloc_info->alloc_func)((seq_len + 1) * base_size, vl_alloc_info->alloc_info)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for VL data")
-      } /* end if */
-    else {  /* Default to system malloc */
-        if(NULL==(t=H5MM_malloc((seq_len+1)*base_size)))
+    }      /* end if */
+    else { /* Default to system malloc */
+        if (NULL == (t = H5MM_malloc((seq_len + 1) * base_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for VL data")
-      } /* end else */
+    } /* end else */
 
-    len=(seq_len*base_size);
-    HDmemcpy(t,buf,len);
-    t[len]='\0';
+    len = (seq_len * base_size);
+    HDmemcpy(t, buf, len);
+    t[len] = '\0';
 
     /* Set pointer in user's buffer with memcpy, to avoid alignment issues */
-    HDmemcpy(_vl,&t,sizeof(char *));
+    HDmemcpy(_vl, &t, sizeof(char *));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value) /*lint !e429 The pointer in 't' has been copied */
-}   /* end H5T_vlen_str_mem_write() */
+} /* end H5T_vlen_str_mem_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_str_mem_setnull
  *
@@ -748,19 +737,19 @@ done:
  */
 /* ARGSUSED */
 static herr_t
-H5T_vlen_str_mem_setnull(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, void *_vl, void H5_ATTR_UNUSED *_bg)
+H5T_vlen_str_mem_setnull(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, void *_vl,
+                         void H5_ATTR_UNUSED *_bg)
 {
-    char *t=NULL;                   /* Pointer to temporary buffer allocated */
+    char *t = NULL; /* Pointer to temporary buffer allocated */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set pointer in user's buffer with memcpy, to avoid alignment issues */
-    HDmemcpy(_vl,&t,sizeof(char *));
+    HDmemcpy(_vl, &t, sizeof(char *));
 
     FUNC_LEAVE_NOAPI(SUCCEED) /*lint !e429 The pointer in 't' has been copied */
-}   /* end H5T_vlen_str_mem_setnull() */
+} /* end H5T_vlen_str_mem_setnull() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_disk_getlen
  *
@@ -776,8 +765,8 @@ H5T_vlen_str_mem_setnull(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
 static ssize_t
 H5T_vlen_disk_getlen(const void *_vl)
 {
-    const uint8_t *vl=(const uint8_t *)_vl; /* Pointer to the disk VL information */
-    size_t	seq_len;        /* Sequence length */
+    const uint8_t *vl = (const uint8_t *)_vl; /* Pointer to the disk VL information */
+    size_t         seq_len;                   /* Sequence length */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -787,9 +776,8 @@ H5T_vlen_disk_getlen(const void *_vl)
     UINT32DECODE(vl, seq_len);
 
     FUNC_LEAVE_NOAPI((ssize_t)seq_len)
-}   /* end H5T_vlen_disk_getlen() */
+} /* end H5T_vlen_disk_getlen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_disk_getptr
  *
@@ -812,9 +800,8 @@ H5T_vlen_disk_getptr(void H5_ATTR_UNUSED *vl)
     HDassert(vl);
 
     FUNC_LEAVE_NOAPI(NULL)
-}   /* end H5T_vlen_disk_getptr() */
+} /* end H5T_vlen_disk_getptr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_disk_isnull
  *
@@ -830,8 +817,8 @@ H5T_vlen_disk_getptr(void H5_ATTR_UNUSED *vl)
 static htri_t
 H5T_vlen_disk_isnull(const H5F_t *f, void *_vl)
 {
-    uint8_t *vl=(uint8_t *)_vl; /* Pointer to the disk VL information */
-    haddr_t addr;               /* Sequence's heap address */
+    uint8_t *vl = (uint8_t *)_vl; /* Pointer to the disk VL information */
+    haddr_t  addr;                /* Sequence's heap address */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -839,15 +826,14 @@ H5T_vlen_disk_isnull(const H5F_t *f, void *_vl)
     HDassert(vl);
 
     /* Skip the sequence's length */
-    vl+=4;
+    vl += 4;
 
     /* Get the heap address */
-    H5F_addr_decode(f,(const uint8_t **)&vl,&addr);
+    H5F_addr_decode(f, (const uint8_t **)&vl, &addr);
 
-    FUNC_LEAVE_NOAPI(addr==0 ? TRUE : FALSE)
-}   /* end H5T_vlen_disk_isnull() */
+    FUNC_LEAVE_NOAPI(addr == 0 ? TRUE : FALSE)
+} /* end H5T_vlen_disk_isnull() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_disk_read
  *
@@ -864,9 +850,9 @@ H5T_vlen_disk_isnull(const H5F_t *f, void *_vl)
 static herr_t
 H5T_vlen_disk_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *buf, size_t H5_ATTR_UNUSED len)
 {
-    uint8_t *vl=(uint8_t *)_vl;   /* Pointer to the user's hvl_t information */
-    H5HG_t hobjid;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    uint8_t *vl = (uint8_t *)_vl; /* Pointer to the user's hvl_t information */
+    H5HG_t   hobjid;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -879,21 +865,20 @@ H5T_vlen_disk_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *buf, size_t H5_ATTR
     vl += 4;
 
     /* Get the heap information */
-    H5F_addr_decode(f,(const uint8_t **)&vl,&(hobjid.addr));
-    UINT32DECODE(vl,hobjid.idx);
+    H5F_addr_decode(f, (const uint8_t **)&vl, &(hobjid.addr));
+    UINT32DECODE(vl, hobjid.idx);
 
     /* Check if this sequence actually has any data */
-    if(hobjid.addr>0) {
+    if (hobjid.addr > 0) {
         /* Read the VL information from disk */
-        if(H5HG_read(f,dxpl_id,&hobjid,buf, NULL)==NULL)
+        if (H5HG_read(f, dxpl_id, &hobjid, buf, NULL) == NULL)
             HGOTO_ERROR(H5E_DATATYPE, H5E_READERROR, FAIL, "Unable to read VL information")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_vlen_disk_read() */
+} /* end H5T_vlen_disk_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_disk_write
  *
@@ -909,13 +894,13 @@ done:
 /* ARGSUSED */
 static herr_t
 H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t H5_ATTR_UNUSED *vl_alloc_info,
-    void *_vl, void *buf, void *_bg, size_t seq_len, size_t base_size)
+                    void *_vl, void *buf, void *_bg, size_t seq_len, size_t base_size)
 {
     uint8_t *vl = (uint8_t *)_vl; /*Pointer to the user's hvl_t information*/
     uint8_t *bg = (uint8_t *)_bg; /*Pointer to the old data hvl_t          */
-    H5HG_t hobjid;              /* New VL sequence's heap ID */
-    size_t len;                 /* Size of new sequence on disk (in bytes) */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5HG_t   hobjid;              /* New VL sequence's heap ID */
+    size_t   len;                 /* Size of new sequence on disk (in bytes) */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -925,8 +910,8 @@ H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t H5_ATTR
     HDassert(f);
 
     /* Free heap object for old data.  */
-    if(bg!=NULL) {
-        H5HG_t bg_hobjid;       /* "Background" VL info sequence's ID info */
+    if (bg != NULL) {
+        H5HG_t bg_hobjid; /* "Background" VL info sequence's ID info */
 
         /* Skip the length of the sequence and heap object ID from background data. */
         bg += 4;
@@ -936,19 +921,19 @@ H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t H5_ATTR
         UINT32DECODE(bg, bg_hobjid.idx);
 
         /* Free heap object for old data */
-        if(bg_hobjid.addr > 0) {
+        if (bg_hobjid.addr > 0) {
             /* Free heap object */
-            if(H5HG_remove(f, dxpl_id, &bg_hobjid) < 0)
+            if (H5HG_remove(f, dxpl_id, &bg_hobjid) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "Unable to remove heap object")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Set the length of the sequence */
     UINT32ENCODE(vl, seq_len);
 
     /* Write the VL information to disk (allocates space also) */
-    len = (seq_len*base_size);
-    if(H5HG_insert(f, dxpl_id, len, buf, &hobjid) < 0)
+    len = (seq_len * base_size);
+    if (H5HG_insert(f, dxpl_id, len, buf, &hobjid) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "Unable to write VL information")
 
     /* Encode the heap information */
@@ -957,9 +942,8 @@ H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t H5_ATTR
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_vlen_disk_write() */
+} /* end H5T_vlen_disk_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_disk_setnull
  *
@@ -975,10 +959,10 @@ done:
 static herr_t
 H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg)
 {
-    uint8_t *vl = (uint8_t *)_vl; /*Pointer to the user's hvl_t information*/
-    uint8_t *bg = (uint8_t *)_bg; /*Pointer to the old data hvl_t          */
-    uint32_t seq_len = 0;         /* Sequence length */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    uint8_t *vl        = (uint8_t *)_vl; /*Pointer to the user's hvl_t information*/
+    uint8_t *bg        = (uint8_t *)_bg; /*Pointer to the old data hvl_t          */
+    uint32_t seq_len   = 0;              /* Sequence length */
+    herr_t   ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -987,8 +971,8 @@ H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg)
     HDassert(vl);
 
     /* Free heap object for old data.  */
-    if(bg != NULL) {
-        H5HG_t bg_hobjid;       /* "Background" VL info sequence's ID info */
+    if (bg != NULL) {
+        H5HG_t bg_hobjid; /* "Background" VL info sequence's ID info */
 
         /* Skip the length of the sequence and heap object ID from background data. */
         bg += 4;
@@ -998,12 +982,12 @@ H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg)
         UINT32DECODE(bg, bg_hobjid.idx);
 
         /* Free heap object for old data */
-        if(bg_hobjid.addr > 0) {
+        if (bg_hobjid.addr > 0) {
             /* Free heap object */
-            if(H5HG_remove(f, dxpl_id, &bg_hobjid) < 0)
+            if (H5HG_remove(f, dxpl_id, &bg_hobjid) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "Unable to remove heap object")
-         } /* end if */
-    } /* end if */
+        } /* end if */
+    }     /* end if */
 
     /* Set the length of the sequence */
     UINT32ENCODE(vl, seq_len);
@@ -1014,9 +998,8 @@ H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_vlen_disk_setnull() */
+} /* end H5T_vlen_disk_setnull() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5T_vlen_reclaim_recurse
@@ -1041,8 +1024,8 @@ done:
 static herr_t
 H5T_vlen_reclaim_recurse(void *elem, const H5T_t *dt, H5MM_free_t free_func, void *free_info)
 {
-    unsigned u;                     /* Local index variable */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1050,69 +1033,72 @@ H5T_vlen_reclaim_recurse(void *elem, const H5T_t *dt, H5MM_free_t free_func, voi
     HDassert(dt);
 
     /* Check the datatype of this element */
-    switch(dt->shared->type) {
+    switch (dt->shared->type) {
         case H5T_ARRAY:
             /* Recurse on each element, if the array's base type is array, VL, enum or compound */
-            if(H5T_IS_COMPLEX(dt->shared->parent->shared->type)) {
-                void *off;     /* offset of field */
+            if (H5T_IS_COMPLEX(dt->shared->parent->shared->type)) {
+                void *off; /* offset of field */
 
                 /* Calculate the offset member and recurse on it */
-                for(u = 0; u < dt->shared->u.array.nelem; u++) {
+                for (u = 0; u < dt->shared->u.array.nelem; u++) {
                     off = ((uint8_t *)elem) + u * (dt->shared->parent->shared->size);
-                    if(H5T_vlen_reclaim_recurse(off, dt->shared->parent, free_func, free_info) < 0)
+                    if (H5T_vlen_reclaim_recurse(off, dt->shared->parent, free_func, free_info) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "Unable to free array element")
                 } /* end for */
-            } /* end if */
+            }     /* end if */
             break;
 
         case H5T_COMPOUND:
             /* Check each field and recurse on VL, compound, enum or array ones */
-            for(u = 0; u < dt->shared->u.compnd.nmembs; u++) {
+            for (u = 0; u < dt->shared->u.compnd.nmembs; u++) {
                 /* Recurse if it's VL, compound, enum or array */
-                if(H5T_IS_COMPLEX(dt->shared->u.compnd.memb[u].type->shared->type)) {
-                    void *off;     /* offset of field */
+                if (H5T_IS_COMPLEX(dt->shared->u.compnd.memb[u].type->shared->type)) {
+                    void *off; /* offset of field */
 
                     /* Calculate the offset member and recurse on it */
                     off = ((uint8_t *)elem) + dt->shared->u.compnd.memb[u].offset;
-                    if(H5T_vlen_reclaim_recurse(off, dt->shared->u.compnd.memb[u].type, free_func, free_info) < 0)
+                    if (H5T_vlen_reclaim_recurse(off, dt->shared->u.compnd.memb[u].type, free_func,
+                                                 free_info) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "Unable to free compound field")
                 } /* end if */
-            } /* end for */
+            }     /* end for */
             break;
 
         case H5T_VLEN:
             /* Recurse on the VL information if it's VL, compound, enum or array, then free VL sequence */
-            if(dt->shared->u.vlen.type == H5T_VLEN_SEQUENCE) {
-                hvl_t *vl = (hvl_t *)elem;    /* Temp. ptr to the vl info */
+            if (dt->shared->u.vlen.type == H5T_VLEN_SEQUENCE) {
+                hvl_t *vl = (hvl_t *)elem; /* Temp. ptr to the vl info */
 
                 /* Check if there is anything actually in this sequence */
-                if(vl->len!=0) {
+                if (vl->len != 0) {
                     /* Recurse if it's VL, array, enum or compound */
-                    if(H5T_IS_COMPLEX(dt->shared->parent->shared->type)) {
-                        void *off;     /* offset of field */
+                    if (H5T_IS_COMPLEX(dt->shared->parent->shared->type)) {
+                        void *off; /* offset of field */
 
                         /* Calculate the offset of each array element and recurse on it */
-                        while(vl->len > 0) {
+                        while (vl->len > 0) {
                             off = ((uint8_t *)vl->p) + (vl->len - 1) * dt->shared->parent->shared->size;
-                            if(H5T_vlen_reclaim_recurse(off, dt->shared->parent, free_func, free_info) < 0)
+                            if (H5T_vlen_reclaim_recurse(off, dt->shared->parent, free_func, free_info) < 0)
                                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "Unable to free VL element")
                             vl->len--;
                         } /* end while */
-                    } /* end if */
+                    }     /* end if */
 
                     /* Free the VL sequence */
-                    if(free_func != NULL)
+                    if (free_func != NULL)
                         (*free_func)(vl->p, free_info);
                     else
                         H5MM_xfree(vl->p);
                 } /* end if */
-            } else if(dt->shared->u.vlen.type == H5T_VLEN_STRING) {
+            }
+            else if (dt->shared->u.vlen.type == H5T_VLEN_STRING) {
                 /* Free the VL string */
-                if(free_func != NULL)
+                if (free_func != NULL)
                     (*free_func)(*(char **)elem, free_info);
                 else
                     H5MM_xfree(*(char **)elem);
-            } else {
+            }
+            else {
                 HDassert(0 && "Invalid VL type");
             } /* end else */
             break;
@@ -1123,9 +1109,8 @@ H5T_vlen_reclaim_recurse(void *elem, const H5T_t *dt, H5MM_free_t free_func, voi
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_vlen_reclaim_recurse() */
+} /* end H5T_vlen_reclaim_recurse() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5T_vlen_reclaim
@@ -1152,11 +1137,13 @@ done:
 --------------------------------------------------------------------------*/
 /* ARGSUSED */
 herr_t
-H5T_vlen_reclaim(void *elem, hid_t type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t H5_ATTR_UNUSED *point, void *op_data)
+H5T_vlen_reclaim(void *elem, hid_t type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t H5_ATTR_UNUSED *point,
+                 void *op_data)
 {
-    H5T_vlen_alloc_info_t *vl_alloc_info = (H5T_vlen_alloc_info_t *)op_data; /* VL allocation info from iterator */
-    H5T_t	*dt;
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5T_vlen_alloc_info_t *vl_alloc_info =
+        (H5T_vlen_alloc_info_t *)op_data; /* VL allocation info from iterator */
+    H5T_t *dt;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1165,18 +1152,18 @@ H5T_vlen_reclaim(void *elem, hid_t type_id, unsigned H5_ATTR_UNUSED ndim, const
     HDassert(H5I_DATATYPE == H5I_get_type(type_id));
 
     /* Check args */
-    if(NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
-    /* Pull the free function and free info pointer out of the op_data and call the recurse datatype free function */
-    if(H5T_vlen_reclaim_recurse(elem, dt, vl_alloc_info->free_func, vl_alloc_info->free_info) < 0)
+    /* Pull the free function and free info pointer out of the op_data and call the recurse datatype free
+     * function */
+    if (H5T_vlen_reclaim_recurse(elem, dt, vl_alloc_info->free_func, vl_alloc_info->free_info) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "can't reclaim vlen elements")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_vlen_reclaim() */
+} /* end H5T_vlen_reclaim() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5T_vlen_get_alloc_info
@@ -1203,8 +1190,8 @@ done:
 herr_t
 H5T_vlen_get_alloc_info(hid_t dxpl_id, H5T_vlen_alloc_info_t **vl_alloc_info)
 {
-    H5P_genplist_t *plist;              /* DX property list */
-    herr_t ret_value=SUCCEED;
+    H5P_genplist_t *plist; /* DX property list */
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1212,35 +1199,34 @@ H5T_vlen_get_alloc_info(hid_t dxpl_id, H5T_vlen_alloc_info_t **vl_alloc_info)
     HDassert(vl_alloc_info);
 
     /* Check for the default DXPL */
-    if(dxpl_id==H5P_DATASET_XFER_DEFAULT)
-        *vl_alloc_info=&H5T_vlen_def_vl_alloc_info;
+    if (dxpl_id == H5P_DATASET_XFER_DEFAULT)
+        *vl_alloc_info = &H5T_vlen_def_vl_alloc_info;
     else {
         /* Check args */
-        if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+        if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
         /* Get the allocation functions & information */
-        if (H5P_get(plist,H5D_XFER_VLEN_ALLOC_NAME,&(*vl_alloc_info)->alloc_func) < 0)
+        if (H5P_get(plist, H5D_XFER_VLEN_ALLOC_NAME, &(*vl_alloc_info)->alloc_func) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
-        if (H5P_get(plist,H5D_XFER_VLEN_ALLOC_INFO_NAME,&(*vl_alloc_info)->alloc_info) < 0)
+        if (H5P_get(plist, H5D_XFER_VLEN_ALLOC_INFO_NAME, &(*vl_alloc_info)->alloc_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
-        if (H5P_get(plist,H5D_XFER_VLEN_FREE_NAME,&(*vl_alloc_info)->free_func) < 0)
+        if (H5P_get(plist, H5D_XFER_VLEN_FREE_NAME, &(*vl_alloc_info)->free_func) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
-        if (H5P_get(plist,H5D_XFER_VLEN_FREE_INFO_NAME,&(*vl_alloc_info)->free_info) < 0)
+        if (H5P_get(plist, H5D_XFER_VLEN_FREE_INFO_NAME, &(*vl_alloc_info)->free_info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5T_vlen_get_alloc_info() */
+} /* end H5T_vlen_get_alloc_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_reclaim_elmt
  *
  * Purpose: Alternative method to reclaim any VL data for a buffer element.
- * 
- *          Use this function when the datatype is already available, but 
+ *
+ *          Use this function when the datatype is already available, but
  *          the allocation info is needed from the dxpl_id before jumping
  *          into recursion.
  *
@@ -1254,9 +1240,9 @@ done:
 herr_t
 H5T_vlen_reclaim_elmt(void *elem, H5T_t *dt, hid_t dxpl_id)
 {
-    H5T_vlen_alloc_info_t _vl_alloc_info;       /* VL allocation info buffer */
-    H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info;   /* VL allocation info */
-    herr_t ret_value = SUCCEED;                  /* return value */
+    H5T_vlen_alloc_info_t  _vl_alloc_info;                  /* VL allocation info buffer */
+    H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info; /* VL allocation info */
+    herr_t                 ret_value     = SUCCEED;         /* return value */
 
     HDassert(dt);
     HDassert(elem);
@@ -1264,14 +1250,13 @@ H5T_vlen_reclaim_elmt(void *elem, H5T_t *dt, hid_t dxpl_id)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get VL allocation info */
-    if(H5T_vlen_get_alloc_info(dxpl_id, &vl_alloc_info) < 0)
+    if (H5T_vlen_get_alloc_info(dxpl_id, &vl_alloc_info) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to retrieve VL allocation info")
 
     /* Recurse on buffer to free dynamic fields */
-    if(H5T_vlen_reclaim_recurse(elem, dt, vl_alloc_info->free_func, vl_alloc_info->free_info) < 0)
+    if (H5T_vlen_reclaim_recurse(elem, dt, vl_alloc_info->free_func, vl_alloc_info->free_info) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "can't reclaim vlen elements")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5T_vlen_reclaim_elmt */
-
diff --git a/src/H5VM.c b/src/H5VM.c
index 4e48001..a4dda6a 100644
--- a/src/H5VM.c
+++ b/src/H5VM.c
@@ -16,7 +16,6 @@
  *	       Friday, October 10, 1997
  */
 
-
 #include "H5private.h"
 #include "H5Eprivate.h"
 #include "H5Oprivate.h"
@@ -24,28 +23,24 @@
 
 /* Local typedefs */
 typedef struct H5VM_memcpy_ud_t {
-    unsigned char *dst;         /* Pointer to destination buffer */
-    const unsigned char *src;   /* Pointer to source buffer */
+    unsigned char *      dst; /* Pointer to destination buffer */
+    const unsigned char *src; /* Pointer to source buffer */
 } H5VM_memcpy_ud_t;
 
 /* Local macros */
 #define H5VM_HYPER_NDIMS H5O_LAYOUT_NDIMS
 
 /* Local prototypes */
-static void
-H5VM_stride_optimize1(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
-		     const hsize_t *size, hsize_t *stride1);
-static void
-H5VM_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
-		     const hsize_t *size, hsize_t *stride1, hsize_t *stride2);
+static void H5VM_stride_optimize1(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/, const hsize_t *size,
+                                  hsize_t *stride1);
+static void H5VM_stride_optimize2(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/, const hsize_t *size,
+                                  hsize_t *stride1, hsize_t *stride2);
 #ifdef LATER
-static void
-H5VM_stride_copy2(hsize_t nelmts, hsize_t elmt_size,
-     unsigned dst_n, const hsize_t *dst_size, const ssize_t *dst_stride, void *_dst,
-     unsigned src_n, const hsize_t *src_size, const ssize_t *src_stride, const void *_src);
+static void H5VM_stride_copy2(hsize_t nelmts, hsize_t elmt_size, unsigned dst_n, const hsize_t *dst_size,
+                              const ssize_t *dst_stride, void *_dst, unsigned src_n, const hsize_t *src_size,
+                              const ssize_t *src_stride, const void *_src);
 #endif /* LATER */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_optimize1
  *
@@ -67,8 +62,8 @@ H5VM_stride_copy2(hsize_t nelmts, hsize_t elmt_size,
  *-------------------------------------------------------------------------
  */
 static void
-H5VM_stride_optimize1(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
-		     const hsize_t *size, hsize_t *stride1)
+H5VM_stride_optimize1(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/, const hsize_t *size,
+                      hsize_t *stride1)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -81,17 +76,15 @@ H5VM_stride_optimize1(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
     /*
      * Combine adjacent memory accesses
      */
-    while (*np && stride1[*np-1]>0 &&
-           (hsize_t)(stride1[*np-1])==*elmt_size) {
-        *elmt_size *= size[*np-1];
+    while (*np && stride1[*np - 1] > 0 && (hsize_t)(stride1[*np - 1]) == *elmt_size) {
+        *elmt_size *= size[*np - 1];
         if (--*np)
-            stride1[*np-1] += size[*np] * stride1[*np];
+            stride1[*np - 1] += size[*np] * stride1[*np];
     }
 
     FUNC_LEAVE_NOAPI_VOID
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_optimize2
  *
@@ -116,8 +109,8 @@ H5VM_stride_optimize1(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
  *-------------------------------------------------------------------------
  */
 static void
-H5VM_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
-		     const hsize_t *size, hsize_t *stride1, hsize_t *stride2)
+H5VM_stride_optimize2(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/, const hsize_t *size,
+                      hsize_t *stride1, hsize_t *stride2)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -126,92 +119,90 @@ H5VM_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
      * zero we still must make one reference.
      */
     HDassert(1 == H5VM_vector_reduce_product(0, NULL));
-    HDassert(*elmt_size>0);
+    HDassert(*elmt_size > 0);
 
     /*
      * Combine adjacent memory accesses
      */
 
     /* Unroll loop for common cases */
-    switch(*np) {
+    switch (*np) {
         case 1: /* For 0-D datasets (dunno if this ever gets used...) */
-            if(stride1[0] == *elmt_size && stride2[0] == *elmt_size) {
+            if (stride1[0] == *elmt_size && stride2[0] == *elmt_size) {
                 *elmt_size *= size[0];
-                --*np;  /* *np decrements to a value of 0 now */
-            } /* end if */
+                --*np; /* *np decrements to a value of 0 now */
+            }          /* end if */
             break;
 
         case 2: /* For 1-D datasets */
-            if(stride1[1] == *elmt_size && stride2[1] == *elmt_size) {
+            if (stride1[1] == *elmt_size && stride2[1] == *elmt_size) {
                 *elmt_size *= size[1];
-                --*np;  /* *np decrements to a value of 1 now */
+                --*np; /* *np decrements to a value of 1 now */
                 stride1[0] += size[1] * stride1[1];
                 stride2[0] += size[1] * stride2[1];
 
-                if(stride1[0] == *elmt_size && stride2[0] == *elmt_size) {
+                if (stride1[0] == *elmt_size && stride2[0] == *elmt_size) {
                     *elmt_size *= size[0];
-                    --*np;  /* *np decrements to a value of 0 now */
-                } /* end if */
-            } /* end if */
+                    --*np; /* *np decrements to a value of 0 now */
+                }          /* end if */
+            }              /* end if */
             break;
 
         case 3: /* For 2-D datasets */
-            if(stride1[2] == *elmt_size && stride2[2] == *elmt_size) {
+            if (stride1[2] == *elmt_size && stride2[2] == *elmt_size) {
                 *elmt_size *= size[2];
-                --*np;  /* *np decrements to a value of 2 now */
+                --*np; /* *np decrements to a value of 2 now */
                 stride1[1] += size[2] * stride1[2];
                 stride2[1] += size[2] * stride2[2];
 
-                if(stride1[1] == *elmt_size && stride2[1] == *elmt_size) {
+                if (stride1[1] == *elmt_size && stride2[1] == *elmt_size) {
                     *elmt_size *= size[1];
-                    --*np;  /* *np decrements to a value of 1 now */
+                    --*np; /* *np decrements to a value of 1 now */
                     stride1[0] += size[1] * stride1[1];
                     stride2[0] += size[1] * stride2[1];
 
-                    if(stride1[0] == *elmt_size && stride2[0] == *elmt_size) {
+                    if (stride1[0] == *elmt_size && stride2[0] == *elmt_size) {
                         *elmt_size *= size[0];
-                        --*np;  /* *np decrements to a value of 0 now */
-                    } /* end if */
-                } /* end if */
-            } /* end if */
+                        --*np; /* *np decrements to a value of 0 now */
+                    }          /* end if */
+                }              /* end if */
+            }                  /* end if */
             break;
 
         case 4: /* For 3-D datasets */
-            if(stride1[3] == *elmt_size && stride2[3] == *elmt_size) {
+            if (stride1[3] == *elmt_size && stride2[3] == *elmt_size) {
                 *elmt_size *= size[3];
-                --*np;  /* *np decrements to a value of 3 now */
+                --*np; /* *np decrements to a value of 3 now */
                 stride1[2] += size[3] * stride1[3];
                 stride2[2] += size[3] * stride2[3];
 
-                if(stride1[2] == *elmt_size && stride2[2] == *elmt_size) {
+                if (stride1[2] == *elmt_size && stride2[2] == *elmt_size) {
                     *elmt_size *= size[2];
-                    --*np;  /* *np decrements to a value of 2 now */
+                    --*np; /* *np decrements to a value of 2 now */
                     stride1[1] += size[2] * stride1[2];
                     stride2[1] += size[2] * stride2[2];
 
-                    if(stride1[1] == *elmt_size && stride2[1] == *elmt_size) {
+                    if (stride1[1] == *elmt_size && stride2[1] == *elmt_size) {
                         *elmt_size *= size[1];
-                        --*np;  /* *np decrements to a value of 1 now */
+                        --*np; /* *np decrements to a value of 1 now */
                         stride1[0] += size[1] * stride1[1];
                         stride2[0] += size[1] * stride2[1];
 
-                        if(stride1[0] == *elmt_size && stride2[0] == *elmt_size) {
+                        if (stride1[0] == *elmt_size && stride2[0] == *elmt_size) {
                             *elmt_size *= size[0];
-                            --*np;  /* *np decrements to a value of 0 now */
-                        } /* end if */
-                    } /* end if */
-                } /* end if */
-            } /* end if */
+                            --*np; /* *np decrements to a value of 0 now */
+                        }          /* end if */
+                    }              /* end if */
+                }                  /* end if */
+            }                      /* end if */
             break;
 
         default:
-            while (*np &&
-                    stride1[*np-1] == *elmt_size &&
-                    stride2[*np-1] == *elmt_size) {
-                *elmt_size *= size[*np-1];
+            while (*np && stride1[*np - 1] == *elmt_size && stride2[*np - 1] == *elmt_size) {
+                *elmt_size *= size[*np - 1];
                 if (--*np) {
-                    stride1[*np-1] += size[*np] * stride1[*np];
-                    stride2[*np-1] += size[*np] * stride2[*np];
+                    stride1[*np - 1] += size[*np] * stride1[*np];
+                    stride2[*np - 1] += size[*np] * stride2[*np];
                 }
             }
             break;
@@ -220,7 +211,6 @@ H5VM_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
     FUNC_LEAVE_NOAPI_VOID
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_hyper_stride
  *
@@ -254,14 +244,13 @@ H5VM_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
  *-------------------------------------------------------------------------
  */
 hsize_t
-H5VM_hyper_stride(unsigned n, const hsize_t *size,
-		 const hsize_t *total_size, const hsize_t *offset,
-		 hsize_t *stride/*out*/)
+H5VM_hyper_stride(unsigned n, const hsize_t *size, const hsize_t *total_size, const hsize_t *offset,
+                  hsize_t *stride /*out*/)
 {
-    hsize_t	    skip;	/*starting point byte offset		*/
-    hsize_t	    acc;	/*accumulator				*/
-    int		i;		/*counter				*/
-    hsize_t	    ret_value;  /* Return value */
+    hsize_t skip;      /*starting point byte offset		*/
+    hsize_t acc;       /*accumulator				*/
+    int     i;         /*counter				*/
+    hsize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -271,42 +260,42 @@ H5VM_hyper_stride(unsigned n, const hsize_t *size,
     HDassert(stride);
 
     /* init */
-    HDassert(n>0);
-    stride[n-1] = 1;
-    skip = offset ? offset[n-1] : 0;
+    HDassert(n > 0);
+    stride[n - 1] = 1;
+    skip          = offset ? offset[n - 1] : 0;
 
-    switch(n) {
+    switch (n) {
         case 2: /* 1-D dataset */
-            HDassert(total_size[1]>=size[1]);
-            stride[0] = total_size[1]-size[1]; /*overflow checked*/
-            acc = total_size[1];
+            HDassert(total_size[1] >= size[1]);
+            stride[0] = total_size[1] - size[1]; /*overflow checked*/
+            acc       = total_size[1];
             skip += acc * (offset ? offset[0] : 0);
             break;
 
         case 3: /* 2-D dataset */
-            HDassert(total_size[2]>=size[2]);
-            stride[1] = total_size[2]-size[2]; /*overflow checked*/
-            acc = total_size[2];
+            HDassert(total_size[2] >= size[2]);
+            stride[1] = total_size[2] - size[2]; /*overflow checked*/
+            acc       = total_size[2];
             skip += acc * (offset ? (hsize_t)offset[1] : 0);
 
-            HDassert(total_size[1]>=size[1]);
+            HDassert(total_size[1] >= size[1]);
             stride[0] = acc * (total_size[1] - size[1]); /*overflow checked*/
             acc *= total_size[1];
             skip += acc * (offset ? (hsize_t)offset[0] : 0);
             break;
 
         case 4: /* 3-D dataset */
-            HDassert(total_size[3]>=size[3]);
-            stride[2] = total_size[3]-size[3]; /*overflow checked*/
-            acc = total_size[3];
+            HDassert(total_size[3] >= size[3]);
+            stride[2] = total_size[3] - size[3]; /*overflow checked*/
+            acc       = total_size[3];
             skip += acc * (offset ? (hsize_t)offset[2] : 0);
 
-            HDassert(total_size[2]>=size[2]);
+            HDassert(total_size[2] >= size[2]);
             stride[1] = acc * (total_size[2] - size[2]); /*overflow checked*/
             acc *= total_size[2];
             skip += acc * (offset ? (hsize_t)offset[1] : 0);
 
-            HDassert(total_size[1]>=size[1]);
+            HDassert(total_size[1] >= size[1]);
             stride[0] = acc * (total_size[1] - size[1]); /*overflow checked*/
             acc *= total_size[1];
             skip += acc * (offset ? (hsize_t)offset[0] : 0);
@@ -314,22 +303,21 @@ H5VM_hyper_stride(unsigned n, const hsize_t *size,
 
         default:
             /* others */
-            for (i=(int)(n-2), acc=1; i>=0; --i) {
-                HDassert(total_size[i+1]>=size[i+1]);
-                stride[i] = acc * (total_size[i+1] - size[i+1]); /*overflow checked*/
-                acc *= total_size[i+1];
+            for (i = (int)(n - 2), acc = 1; i >= 0; --i) {
+                HDassert(total_size[i + 1] >= size[i + 1]);
+                stride[i] = acc * (total_size[i + 1] - size[i + 1]); /*overflow checked*/
+                acc *= total_size[i + 1];
                 skip += acc * (offset ? (hsize_t)offset[i] : 0);
             }
             break;
     } /* end switch */
 
     /* Set return value */
-    ret_value=skip;
+    ret_value = skip;
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_hyper_eq
  *
@@ -354,27 +342,27 @@ H5VM_hyper_stride(unsigned n, const hsize_t *size,
  *-------------------------------------------------------------------------
  */
 htri_t
-H5VM_hyper_eq(unsigned n,
-	     const hsize_t *offset1, const hsize_t *size1,
-	     const hsize_t *offset2, const hsize_t *size2)
+H5VM_hyper_eq(unsigned n, const hsize_t *offset1, const hsize_t *size1, const hsize_t *offset2,
+              const hsize_t *size2)
 {
-    hsize_t	nelmts1 = 1, nelmts2 = 1;
-    unsigned	i;
-    htri_t      ret_value=TRUE;         /* Return value */
+    hsize_t  nelmts1 = 1, nelmts2 = 1;
+    unsigned i;
+    htri_t   ret_value = TRUE; /* Return value */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if (n == 0) HGOTO_DONE(TRUE)
+    if (n == 0)
+        HGOTO_DONE(TRUE)
 
-    for (i=0; i<n; i++) {
-	if ((offset1 ? offset1[i] : 0) != (offset2 ? offset2[i] : 0))
-	    HGOTO_DONE(FALSE)
-	if ((size1 ? size1[i] : 0) != (size2 ? size2[i] : 0))
-	    HGOTO_DONE(FALSE)
-	if (0 == (nelmts1 *= (size1 ? size1[i] : 0)))
+    for (i = 0; i < n; i++) {
+        if ((offset1 ? offset1[i] : 0) != (offset2 ? offset2[i] : 0))
+            HGOTO_DONE(FALSE)
+        if ((size1 ? size1[i] : 0) != (size2 ? size2[i] : 0))
             HGOTO_DONE(FALSE)
-	if (0 == (nelmts2 *= (size2 ? size2[i] : 0)))
+        if (0 == (nelmts1 *= (size1 ? size1[i] : 0)))
+            HGOTO_DONE(FALSE)
+        if (0 == (nelmts2 *= (size2 ? size2[i] : 0)))
             HGOTO_DONE(FALSE)
     }
 
@@ -382,7 +370,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_hyper_disjointp
  *
@@ -402,29 +389,28 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5VM_hyper_disjointp(unsigned n,
-    const hsize_t *offset1, const uint32_t *size1,
-    const hsize_t *offset2, const uint32_t *size2)
+H5VM_hyper_disjointp(unsigned n, const hsize_t *offset1, const uint32_t *size1, const hsize_t *offset2,
+                     const uint32_t *size2)
 {
-    unsigned	u;
-    htri_t      ret_value = FALSE;        /* Return value */
+    unsigned u;
+    htri_t   ret_value = FALSE; /* Return value */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(!n || !size1 || !size2)
+    if (!n || !size1 || !size2)
         HGOTO_DONE(TRUE)
 
-    for(u = 0; u < n; u++) {
+    for (u = 0; u < n; u++) {
         HDassert(size1[u] < HSIZET_MAX);
         HDassert(size2[u] < HSIZET_MAX);
 
-        if(0 == size1[u] || 0 == size2[u])
+        if (0 == size1[u] || 0 == size2[u])
             HGOTO_DONE(TRUE)
-        if(((offset1 ? offset1[u] : 0) < (offset2 ? offset2[u] : 0) &&
-                    ((offset1 ? offset1[u] : 0) + size1[u] <= (offset2 ? offset2[u] : 0))) ||
-                ((offset2 ? offset2[u] : 0) < (offset1 ? offset1[u] : 0) &&
-                    ((offset2 ? offset2[u] : 0) + size2[u] <= (offset1 ? offset1[u] : 0))))
+        if (((offset1 ? offset1[u] : 0) < (offset2 ? offset2[u] : 0) &&
+             ((offset1 ? offset1[u] : 0) + size1[u] <= (offset2 ? offset2[u] : 0))) ||
+            ((offset2 ? offset2[u] : 0) < (offset1 ? offset1[u] : 0) &&
+             ((offset2 ? offset2[u] : 0) + size2[u] <= (offset1 ? offset1[u] : 0))))
             HGOTO_DONE(TRUE)
     } /* end for */
 
@@ -432,7 +418,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5VM_hyper_disjointp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_hyper_fill
  *
@@ -455,18 +440,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VM_hyper_fill(unsigned n, const hsize_t *_size,
-	       const hsize_t *total_size, const hsize_t *offset, void *_dst,
-	       unsigned fill_value)
+H5VM_hyper_fill(unsigned n, const hsize_t *_size, const hsize_t *total_size, const hsize_t *offset,
+                void *_dst, unsigned fill_value)
 {
-    uint8_t	*dst = (uint8_t*)_dst;	/*cast for ptr arithmetic	*/
-    hsize_t	size[H5VM_HYPER_NDIMS];	/*a modifiable copy of _size	*/
-    hsize_t	dst_stride[H5VM_HYPER_NDIMS]; /*destination stride info  */
-    hsize_t	dst_start;		/*byte offset to start of stride*/
-    hsize_t	elmt_size = 1;		/*bytes per element		*/
-    herr_t	ret_value;		/*function return status	*/
+    uint8_t *dst = (uint8_t *)_dst;        /*cast for ptr arithmetic	*/
+    hsize_t  size[H5VM_HYPER_NDIMS];       /*a modifiable copy of _size	*/
+    hsize_t  dst_stride[H5VM_HYPER_NDIMS]; /*destination stride info  */
+    hsize_t  dst_start;                    /*byte offset to start of stride*/
+    hsize_t  elmt_size = 1;                /*bytes per element		*/
+    herr_t   ret_value;                    /*function return status	*/
 #ifndef NDEBUG
-    unsigned	u;
+    unsigned u;
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -491,13 +475,11 @@ H5VM_hyper_fill(unsigned n, const hsize_t *_size,
     H5VM_stride_optimize1(&n, &elmt_size, size, dst_stride);
 
     /* Copy */
-    ret_value = H5VM_stride_fill(n, elmt_size, size, dst_stride, dst+dst_start,
-			     fill_value);
+    ret_value = H5VM_stride_fill(n, elmt_size, size, dst_stride, dst + dst_start, fill_value);
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_hyper_copy
  *
@@ -535,24 +517,22 @@ H5VM_hyper_fill(unsigned n, const hsize_t *_size,
 herr_t
 H5VM_hyper_copy(unsigned n, const hsize_t *_size,
 
-	       /*destination*/
-	       const hsize_t *dst_size, const hsize_t *dst_offset,
-	       void *_dst,
+                /*destination*/
+                const hsize_t *dst_size, const hsize_t *dst_offset, void *_dst,
 
-	       /*source*/
-	       const hsize_t *src_size, const hsize_t *src_offset,
-	       const void *_src)
+                /*source*/
+                const hsize_t *src_size, const hsize_t *src_offset, const void *_src)
 {
-    const uint8_t *src = (const uint8_t*)_src;	/*cast for ptr arithmtc */
-    uint8_t	*dst = (uint8_t*) _dst;		/*cast for ptr arithmtc */
-    hsize_t	size[H5VM_HYPER_NDIMS];		/*a modifiable _size	*/
-    hsize_t	src_stride[H5VM_HYPER_NDIMS];	/*source stride info	*/
-    hsize_t	dst_stride[H5VM_HYPER_NDIMS];	/*dest stride info	*/
-    hsize_t	dst_start, src_start;		/*offset to start at	*/
-    hsize_t	elmt_size = 1;			/*element size in bytes */
-    herr_t	ret_value;			/*return status		*/
+    const uint8_t *src = (const uint8_t *)_src;  /*cast for ptr arithmtc */
+    uint8_t *      dst = (uint8_t *)_dst;        /*cast for ptr arithmtc */
+    hsize_t        size[H5VM_HYPER_NDIMS];       /*a modifiable _size	*/
+    hsize_t        src_stride[H5VM_HYPER_NDIMS]; /*source stride info	*/
+    hsize_t        dst_stride[H5VM_HYPER_NDIMS]; /*dest stride info	*/
+    hsize_t        dst_start, src_start;         /*offset to start at	*/
+    hsize_t        elmt_size = 1;                /*element size in bytes */
+    herr_t         ret_value;                    /*return status		*/
 #ifndef NDEBUG
-    unsigned	u;
+    unsigned u;
 #endif
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -579,45 +559,45 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size,
 #ifdef NO_INLINED_CODE
     dst_start = H5VM_hyper_stride(n, size, dst_size, dst_offset, dst_stride);
     src_start = H5VM_hyper_stride(n, size, src_size, src_offset, src_stride);
-#else /* NO_INLINED_CODE */
+#else  /* NO_INLINED_CODE */
     /* in-line version of two calls to H5VM_hyper_stride() */
     {
-        hsize_t	    dst_acc;	/*accumulator				*/
-        hsize_t	    src_acc;	/*accumulator				*/
-        int        ii;		    /*counter				*/
+        hsize_t dst_acc; /*accumulator				*/
+        hsize_t src_acc; /*accumulator				*/
+        int     ii;      /*counter				*/
 
         /* init */
-        HDassert(n>0);
-        dst_stride[n-1] = 1;
-        src_stride[n-1] = 1;
-        dst_start = dst_offset ? dst_offset[n-1] : 0;
-        src_start = src_offset ? src_offset[n-1] : 0;
+        HDassert(n > 0);
+        dst_stride[n - 1] = 1;
+        src_stride[n - 1] = 1;
+        dst_start         = dst_offset ? dst_offset[n - 1] : 0;
+        src_start         = src_offset ? src_offset[n - 1] : 0;
 
         /* Unroll loop for common cases */
-        switch(n) {
+        switch (n) {
             case 2:
-                HDassert(dst_size[1]>=size[1]);
-                HDassert(src_size[1]>=size[1]);
+                HDassert(dst_size[1] >= size[1]);
+                HDassert(src_size[1] >= size[1]);
                 dst_stride[0] = dst_size[1] - size[1]; /*overflow checked*/
                 src_stride[0] = src_size[1] - size[1]; /*overflow checked*/
-                dst_acc = dst_size[1];
-                src_acc = src_size[1];
+                dst_acc       = dst_size[1];
+                src_acc       = src_size[1];
                 dst_start += dst_acc * (dst_offset ? dst_offset[0] : 0);
                 src_start += src_acc * (src_offset ? src_offset[0] : 0);
                 break;
 
             case 3:
-                HDassert(dst_size[2]>=size[2]);
-                HDassert(src_size[2]>=size[2]);
+                HDassert(dst_size[2] >= size[2]);
+                HDassert(src_size[2] >= size[2]);
                 dst_stride[1] = dst_size[2] - size[2]; /*overflow checked*/
                 src_stride[1] = src_size[2] - size[2]; /*overflow checked*/
-                dst_acc = dst_size[2];
-                src_acc = src_size[2];
+                dst_acc       = dst_size[2];
+                src_acc       = src_size[2];
                 dst_start += dst_acc * (dst_offset ? dst_offset[1] : 0);
                 src_start += src_acc * (src_offset ? src_offset[1] : 0);
 
-                HDassert(dst_size[1]>=size[1]);
-                HDassert(src_size[1]>=size[1]);
+                HDassert(dst_size[1] >= size[1]);
+                HDassert(src_size[1] >= size[1]);
                 dst_stride[0] = dst_acc * (dst_size[1] - size[1]); /*overflow checked*/
                 src_stride[0] = src_acc * (src_size[1] - size[1]); /*overflow checked*/
                 dst_acc *= dst_size[1];
@@ -627,17 +607,17 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size,
                 break;
 
             case 4:
-                HDassert(dst_size[3]>=size[3]);
-                HDassert(src_size[3]>=size[3]);
+                HDassert(dst_size[3] >= size[3]);
+                HDassert(src_size[3] >= size[3]);
                 dst_stride[2] = dst_size[3] - size[3]; /*overflow checked*/
                 src_stride[2] = src_size[3] - size[3]; /*overflow checked*/
-                dst_acc = dst_size[3];
-                src_acc = src_size[3];
+                dst_acc       = dst_size[3];
+                src_acc       = src_size[3];
                 dst_start += dst_acc * (dst_offset ? dst_offset[2] : 0);
                 src_start += src_acc * (src_offset ? src_offset[2] : 0);
 
-                HDassert(dst_size[2]>=size[2]);
-                HDassert(src_size[2]>=size[2]);
+                HDassert(dst_size[2] >= size[2]);
+                HDassert(src_size[2] >= size[2]);
                 dst_stride[1] = dst_acc * (dst_size[2] - size[2]); /*overflow checked*/
                 src_stride[1] = src_acc * (src_size[2] - size[2]); /*overflow checked*/
                 dst_acc *= dst_size[2];
@@ -645,8 +625,8 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size,
                 dst_start += dst_acc * (dst_offset ? dst_offset[1] : 0);
                 src_start += src_acc * (src_offset ? src_offset[1] : 0);
 
-                HDassert(dst_size[1]>=size[1]);
-                HDassert(src_size[1]>=size[1]);
+                HDassert(dst_size[1] >= size[1]);
+                HDassert(src_size[1] >= size[1]);
                 dst_stride[0] = dst_acc * (dst_size[1] - size[1]); /*overflow checked*/
                 src_stride[0] = src_acc * (src_size[1] - size[1]); /*overflow checked*/
                 dst_acc *= dst_size[1];
@@ -657,13 +637,13 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size,
 
             default:
                 /* others */
-                for (ii=(int)(n-2), dst_acc=1, src_acc=1; ii>=0; --ii) {
-                    HDassert(dst_size[ii+1]>=size[ii+1]);
-                    HDassert(src_size[ii+1]>=size[ii+1]);
-                    dst_stride[ii] = dst_acc * (dst_size[ii+1] - size[ii+1]); /*overflow checked*/
-                    src_stride[ii] = src_acc * (src_size[ii+1] - size[ii+1]); /*overflow checked*/
-                    dst_acc *= dst_size[ii+1];
-                    src_acc *= src_size[ii+1];
+                for (ii = (int)(n - 2), dst_acc = 1, src_acc = 1; ii >= 0; --ii) {
+                    HDassert(dst_size[ii + 1] >= size[ii + 1]);
+                    HDassert(src_size[ii + 1] >= size[ii + 1]);
+                    dst_stride[ii] = dst_acc * (dst_size[ii + 1] - size[ii + 1]); /*overflow checked*/
+                    src_stride[ii] = src_acc * (src_size[ii + 1] - size[ii + 1]); /*overflow checked*/
+                    dst_acc *= dst_size[ii + 1];
+                    src_acc *= src_size[ii + 1];
                     dst_start += dst_acc * (dst_offset ? dst_offset[ii] : 0);
                     src_start += src_acc * (src_offset ? src_offset[ii] : 0);
                 }
@@ -676,13 +656,12 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size,
     H5VM_stride_optimize2(&n, &elmt_size, size, dst_stride, src_stride);
 
     /* Perform the copy in terms of stride */
-    ret_value = H5VM_stride_copy(n, elmt_size, size,
-             dst_stride, dst+dst_start, src_stride, src+src_start);
+    ret_value =
+        H5VM_stride_copy(n, elmt_size, size, dst_stride, dst + dst_start, src_stride, src + src_start);
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_fill
  *
@@ -699,15 +678,15 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size,
-		const hsize_t *stride, void *_dst, unsigned fill_value)
+H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize_t *stride, void *_dst,
+                 unsigned fill_value)
 {
-    uint8_t	*dst = (uint8_t*)_dst; 	/*cast for ptr arithmetic	*/
-    hsize_t	idx[H5VM_HYPER_NDIMS]; 	/*1-origin indices		*/
-    hsize_t	nelmts;			/*number of elements to fill	*/
-    hsize_t	i;			/*counter			*/
-    int	j;			/*counter			*/
-    hbool_t	carry;			/*subtraction carray value	*/
+    uint8_t *dst = (uint8_t *)_dst; /*cast for ptr arithmetic	*/
+    hsize_t  idx[H5VM_HYPER_NDIMS]; /*1-origin indices		*/
+    hsize_t  nelmts;                /*number of elements to fill	*/
+    hsize_t  i;                     /*counter			*/
+    int      j;                     /*counter			*/
+    hbool_t  carry;                 /*subtraction carray value	*/
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -715,13 +694,13 @@ H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size,
 
     H5VM_vector_cpy(n, idx, size);
     nelmts = H5VM_vector_reduce_product(n, size);
-    for (i=0; i<nelmts; i++) {
+    for (i = 0; i < nelmts; i++) {
         /* Copy an element */
-        H5_CHECK_OVERFLOW(elmt_size,hsize_t,size_t);
+        H5_CHECK_OVERFLOW(elmt_size, hsize_t, size_t);
         HDmemset(dst, (int)fill_value, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
 
         /* Decrement indices and advance pointer */
-        for (j=(int)(n-1), carry=TRUE; j>=0 && carry; --j) {
+        for (j = (int)(n - 1), carry = TRUE; j >= 0 && carry; --j) {
             dst += stride[j];
 
             if (--idx[j])
@@ -736,7 +715,6 @@ H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size,
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_copy
  *
@@ -759,33 +737,32 @@ H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size,
-		const hsize_t *dst_stride, void *_dst,
-		const hsize_t *src_stride, const void *_src)
+H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize_t *dst_stride, void *_dst,
+                 const hsize_t *src_stride, const void *_src)
 {
-    uint8_t	*dst = (uint8_t*)_dst;		/*cast for ptr arithmetic*/
-    const uint8_t *src = (const uint8_t*) _src;	/*cast for ptr arithmetic*/
-    hsize_t	idx[H5VM_HYPER_NDIMS];		/*1-origin indices	*/
-    hsize_t	nelmts;				/*num elements to copy	*/
-    hsize_t	i;				/*counter		*/
-    int	j;				/*counters		*/
-    hbool_t	carry;				/*carray for subtraction*/
+    uint8_t *      dst = (uint8_t *)_dst;       /*cast for ptr arithmetic*/
+    const uint8_t *src = (const uint8_t *)_src; /*cast for ptr arithmetic*/
+    hsize_t        idx[H5VM_HYPER_NDIMS];       /*1-origin indices	*/
+    hsize_t        nelmts;                      /*num elements to copy	*/
+    hsize_t        i;                           /*counter		*/
+    int            j;                           /*counters		*/
+    hbool_t        carry;                       /*carray for subtraction*/
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(elmt_size<SIZET_MAX);
+    HDassert(elmt_size < SIZET_MAX);
 
     if (n) {
         H5VM_vector_cpy(n, idx, size);
         nelmts = H5VM_vector_reduce_product(n, size);
-        for (i=0; i<nelmts; i++) {
+        for (i = 0; i < nelmts; i++) {
 
             /* Copy an element */
-            H5_CHECK_OVERFLOW(elmt_size,hsize_t,size_t);
+            H5_CHECK_OVERFLOW(elmt_size, hsize_t, size_t);
             HDmemcpy(dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
 
             /* Decrement indices and advance pointers */
-            for (j=(int)(n-1), carry=TRUE; j>=0 && carry; --j) {
+            for (j = (int)(n - 1), carry = TRUE; j >= 0 && carry; --j) {
                 src += src_stride[j];
                 dst += dst_stride[j];
 
@@ -797,15 +774,15 @@ H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size,
                 }
             }
         }
-    } else {
-        H5_CHECK_OVERFLOW(elmt_size,hsize_t,size_t);
-        HDmemcpy (dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
+    }
+    else {
+        H5_CHECK_OVERFLOW(elmt_size, hsize_t, size_t);
+        HDmemcpy(dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
     }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_copy_s
  *
@@ -828,33 +805,32 @@ H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size,
-		const hssize_t *dst_stride, void *_dst,
-		const hssize_t *src_stride, const void *_src)
+H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size, const hssize_t *dst_stride, void *_dst,
+                   const hssize_t *src_stride, const void *_src)
 {
-    uint8_t	*dst = (uint8_t*)_dst;		/*cast for ptr arithmetic*/
-    const uint8_t *src = (const uint8_t*) _src;	/*cast for ptr arithmetic*/
-    hsize_t	idx[H5VM_HYPER_NDIMS];		/*1-origin indices	*/
-    hsize_t	nelmts;				/*num elements to copy	*/
-    hsize_t	i;				/*counter		*/
-    int	j;				/*counters		*/
-    hbool_t	carry;				/*carray for subtraction*/
+    uint8_t *      dst = (uint8_t *)_dst;       /*cast for ptr arithmetic*/
+    const uint8_t *src = (const uint8_t *)_src; /*cast for ptr arithmetic*/
+    hsize_t        idx[H5VM_HYPER_NDIMS];       /*1-origin indices	*/
+    hsize_t        nelmts;                      /*num elements to copy	*/
+    hsize_t        i;                           /*counter		*/
+    int            j;                           /*counters		*/
+    hbool_t        carry;                       /*carray for subtraction*/
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(elmt_size<SIZET_MAX);
+    HDassert(elmt_size < SIZET_MAX);
 
     if (n) {
         H5VM_vector_cpy(n, idx, size);
         nelmts = H5VM_vector_reduce_product(n, size);
-        for (i=0; i<nelmts; i++) {
+        for (i = 0; i < nelmts; i++) {
 
             /* Copy an element */
-            H5_CHECK_OVERFLOW(elmt_size,hsize_t,size_t);
+            H5_CHECK_OVERFLOW(elmt_size, hsize_t, size_t);
             HDmemcpy(dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
 
             /* Decrement indices and advance pointers */
-            for (j=(int)(n-1), carry=TRUE; j>=0 && carry; --j) {
+            for (j = (int)(n - 1), carry = TRUE; j >= 0 && carry; --j) {
                 src += src_stride[j];
                 dst += dst_stride[j];
 
@@ -866,16 +842,17 @@ H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size,
                 }
             }
         }
-    } else {
-        H5_CHECK_OVERFLOW(elmt_size,hsize_t,size_t);
-        HDmemcpy (dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
+    }
+    else {
+        H5_CHECK_OVERFLOW(elmt_size, hsize_t, size_t);
+        HDmemcpy(dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
     }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
 #ifdef LATER
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_copy2
  *
@@ -896,65 +873,60 @@ H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size,
 static void
 H5VM_stride_copy2(hsize_t nelmts, hsize_t elmt_size,
 
-		 /* destination */
-		 unsigned dst_n, const hsize_t *dst_size,
-		 const hsize_t *dst_stride,
-		 void *_dst,
+                  /* destination */
+                  unsigned dst_n, const hsize_t *dst_size, const hsize_t *dst_stride, void *_dst,
 
-		 /* source */
-		 unsigned src_n, const hsize_t *src_size,
-		 const hsize_t *src_stride,
-		 const void *_src)
+                  /* source */
+                  unsigned src_n, const hsize_t *src_size, const hsize_t *src_stride, const void *_src)
 {
-    uint8_t	*dst = (uint8_t *) _dst;
-    const uint8_t *src = (const uint8_t *) _src;
-    hsize_t	dst_idx[H5VM_HYPER_NDIMS];
-    hsize_t	src_idx[H5VM_HYPER_NDIMS];
-    hsize_t	i;              /* Local index variable */
-    int		j;              /* Local index variable */
-    hbool_t	carry;
+    uint8_t *      dst = (uint8_t *)_dst;
+    const uint8_t *src = (const uint8_t *)_src;
+    hsize_t        dst_idx[H5VM_HYPER_NDIMS];
+    hsize_t        src_idx[H5VM_HYPER_NDIMS];
+    hsize_t        i; /* Local index variable */
+    int            j; /* Local index variable */
+    hbool_t        carry;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(elmt_size < SIZET_MAX);
-    HDassert(dst_n>0);
-    HDassert(src_n>0);
+    HDassert(dst_n > 0);
+    HDassert(src_n > 0);
 
     H5VM_vector_cpy(dst_n, dst_idx, dst_size);
     H5VM_vector_cpy(src_n, src_idx, src_size);
 
-    for (i=0; i<nelmts; i++) {
+    for (i = 0; i < nelmts; i++) {
 
-	/* Copy an element */
-        H5_CHECK_OVERFLOW(elmt_size,hsize_t,size_t);
-	HDmemcpy(dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
+        /* Copy an element */
+        H5_CHECK_OVERFLOW(elmt_size, hsize_t, size_t);
+        HDmemcpy(dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
 
-	/* Decrement indices and advance pointers */
-	for (j=(int)(dst_n-1), carry=TRUE; j>=0 && carry; --j) {
-	    dst += dst_stride[j];
-	    if (--dst_idx[j])
+        /* Decrement indices and advance pointers */
+        for (j = (int)(dst_n - 1), carry = TRUE; j >= 0 && carry; --j) {
+            dst += dst_stride[j];
+            if (--dst_idx[j])
                 carry = FALSE;
-	    else {
+            else {
                 HDassert(dst_size);
                 dst_idx[j] = dst_size[j];
             } /* end else */
-	}
-	for (j=(int)(src_n-1), carry=TRUE; j>=0 && carry; --j) {
-	    src += src_stride[j];
-	    if (--src_idx[j])
+        }
+        for (j = (int)(src_n - 1), carry = TRUE; j >= 0 && carry; --j) {
+            src += src_stride[j];
+            if (--src_idx[j])
                 carry = FALSE;
-	    else {
+            else {
                 HDassert(src_size);
                 src_idx[j] = src_size[j];
             } /* end else */
-	}
+        }
     }
 
     FUNC_LEAVE_NOAPI_VOID
 }
 #endif /* LATER */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_fill
  *
@@ -974,10 +946,10 @@ H5VM_stride_copy2(hsize_t nelmts, hsize_t elmt_size,
 herr_t
 H5VM_array_fill(void *_dst, const void *src, size_t size, size_t count)
 {
-    size_t      copy_size;          /* size of the buffer to copy	*/
-    size_t      copy_items;         /* number of items currently copying*/
-    size_t      items_left;         /* number of items left to copy 	*/
-    uint8_t     *dst=(uint8_t*)_dst;/* alias for pointer arithmetic	*/
+    size_t   copy_size;             /* size of the buffer to copy	*/
+    size_t   copy_items;            /* number of items currently copying*/
+    size_t   items_left;            /* number of items left to copy 	*/
+    uint8_t *dst = (uint8_t *)_dst; /* alias for pointer arithmetic	*/
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -986,31 +958,29 @@ H5VM_array_fill(void *_dst, const void *src, size_t size, size_t count)
     HDassert(size < SIZET_MAX && size > 0);
     HDassert(count < SIZET_MAX && count > 0);
 
-    HDmemcpy(dst, src, size);   /* copy first item */
+    HDmemcpy(dst, src, size); /* copy first item */
 
     /* Initialize counters, etc. while compensating for first element copied */
-    copy_size = size;
+    copy_size  = size;
     copy_items = 1;
     items_left = count - 1;
     dst += size;
 
     /* copy until we've copied at least half of the items */
-    while (items_left >= copy_items)
-    {
-        HDmemcpy(dst, _dst, copy_size);   /* copy the current chunk */
-        dst += copy_size;     /* move the offset for the next chunk */
-        items_left -= copy_items;   /* decrement the number of items left */
-
-        copy_size *= 2;     /* increase the size of the chunk to copy */
-        copy_items *= 2;    /* increase the count of items we are copying */
-    }   /* end while */
-    if (items_left > 0)   /* if there are any items left to copy */
+    while (items_left >= copy_items) {
+        HDmemcpy(dst, _dst, copy_size); /* copy the current chunk */
+        dst += copy_size;               /* move the offset for the next chunk */
+        items_left -= copy_items;       /* decrement the number of items left */
+
+        copy_size *= 2;  /* increase the size of the chunk to copy */
+        copy_items *= 2; /* increase the count of items we are copying */
+    }                    /* end while */
+    if (items_left > 0)  /* if there are any items left to copy */
         HDmemcpy(dst, _dst, items_left * size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}   /* H5VM_array_fill() */
+} /* H5VM_array_fill() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_down
  *
@@ -1031,8 +1001,8 @@ H5VM_array_fill(void *_dst, const void *src, size_t size, size_t count)
 herr_t
 H5VM_array_down(unsigned n, const hsize_t *total_size, hsize_t *down)
 {
-    hsize_t	acc;	                /*accumulator			*/
-    int	        i;		        /*counter			*/
+    hsize_t acc; /*accumulator			*/
+    int     i;   /*counter			*/
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1042,15 +1012,14 @@ H5VM_array_down(unsigned n, const hsize_t *total_size, hsize_t *down)
 
     /* Build the sizes of each dimension in the array */
     /* (From fastest to slowest) */
-    for(i=(int)(n-1),acc=1; i>=0; i--) {
-        down[i]=acc;
+    for (i = (int)(n - 1), acc = 1; i >= 0; i--) {
+        down[i] = acc;
         acc *= total_size[i];
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5VM_array_down() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_offset_pre
  *
@@ -1077,8 +1046,8 @@ H5VM_array_down(unsigned n, const hsize_t *total_size, hsize_t *down)
 hsize_t
 H5VM_array_offset_pre(unsigned n, const hsize_t *acc, const hsize_t *offset)
 {
-    int             i;		/*counter				*/
-    hsize_t	    ret_value;  /* Return value */
+    int     i;         /*counter				*/
+    hsize_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1087,13 +1056,12 @@ H5VM_array_offset_pre(unsigned n, const hsize_t *acc, const hsize_t *offset)
     HDassert(offset);
 
     /* Compute offset in array */
-    for(i = (int)(n - 1), ret_value = 0; i >= 0; --i)
+    for (i = (int)(n - 1), ret_value = 0; i >= 0; --i)
         ret_value += acc[i] * offset[i];
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5VM_array_offset_pre() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_offset
  *
@@ -1117,8 +1085,8 @@ H5VM_array_offset_pre(unsigned n, const hsize_t *acc, const hsize_t *offset)
 hsize_t
 H5VM_array_offset(unsigned n, const hsize_t *total_size, const hsize_t *offset)
 {
-    hsize_t	acc_arr[H5VM_HYPER_NDIMS];	/* Accumulated size of down dimensions */
-    hsize_t	ret_value;  /* Return value */
+    hsize_t acc_arr[H5VM_HYPER_NDIMS]; /* Accumulated size of down dimensions */
+    hsize_t ret_value;                 /* Return value */
 
     FUNC_ENTER_NOAPI((HDabort(), 0)) /*lint !e527 Don't worry about unreachable statement */
 
@@ -1127,17 +1095,16 @@ H5VM_array_offset(unsigned n, const hsize_t *total_size, const hsize_t *offset)
     HDassert(offset);
 
     /* Build the sizes of each dimension in the array */
-    if(H5VM_array_down(n,total_size,acc_arr)<0)
+    if (H5VM_array_down(n, total_size, acc_arr) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, UFAIL, "can't compute down sizes")
 
     /* Set return value */
-    ret_value=H5VM_array_offset_pre(n,acc_arr,offset);
+    ret_value = H5VM_array_offset_pre(n, acc_arr, offset);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5VM_array_offset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_calc_pre
  *
@@ -1157,10 +1124,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5VM_array_calc_pre(hsize_t offset, unsigned n, const hsize_t *down,
-    hsize_t *coords)
+H5VM_array_calc_pre(hsize_t offset, unsigned n, const hsize_t *down, hsize_t *coords)
 {
-    unsigned    u;                      /* Local index variable */
+    unsigned u; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1169,7 +1135,7 @@ H5VM_array_calc_pre(hsize_t offset, unsigned n, const hsize_t *down,
     HDassert(coords);
 
     /* Compute the coordinates from the offset */
-    for(u = 0; u < n; u++) {
+    for (u = 0; u < n; u++) {
         coords[u] = offset / down[u];
         offset %= down[u];
     } /* end for */
@@ -1177,7 +1143,6 @@ H5VM_array_calc_pre(hsize_t offset, unsigned n, const hsize_t *down,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5VM_array_calc_pre() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_calc
  *
@@ -1201,8 +1166,8 @@ H5VM_array_calc_pre(hsize_t offset, unsigned n, const hsize_t *down,
 herr_t
 H5VM_array_calc(hsize_t offset, unsigned n, const hsize_t *total_size, hsize_t *coords)
 {
-    hsize_t	idx[H5VM_HYPER_NDIMS];	/* Size of each dimension in bytes */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    hsize_t idx[H5VM_HYPER_NDIMS]; /* Size of each dimension in bytes */
+    herr_t  ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1212,18 +1177,17 @@ H5VM_array_calc(hsize_t offset, unsigned n, const hsize_t *total_size, hsize_t *
     HDassert(coords);
 
     /* Build the sizes of each dimension in the array */
-    if(H5VM_array_down(n, total_size, idx) < 0)
+    if (H5VM_array_down(n, total_size, idx) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "can't compute down sizes")
 
     /* Compute the coordinates from the offset */
-    if(H5VM_array_calc_pre(offset, n, idx, coords) < 0)
+    if (H5VM_array_calc_pre(offset, n, idx, coords) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "can't compute coordinates")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5VM_array_calc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_chunk_index
  *
@@ -1267,11 +1231,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VM_chunk_index(unsigned ndims, const hsize_t *coord, const uint32_t *chunk,
-    const hsize_t *down_nchunks, hsize_t *chunk_idx)
+H5VM_chunk_index(unsigned ndims, const hsize_t *coord, const uint32_t *chunk, const hsize_t *down_nchunks,
+                 hsize_t *chunk_idx)
 {
-    hsize_t	scaled_coord[H5VM_HYPER_NDIMS];	/* Scaled, coordinates, in terms of chunks */
-    unsigned    u;                      /* Local index variable */
+    hsize_t  scaled_coord[H5VM_HYPER_NDIMS]; /* Scaled, coordinates, in terms of chunks */
+    unsigned u;                              /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1282,16 +1246,16 @@ H5VM_chunk_index(unsigned ndims, const hsize_t *coord, const uint32_t *chunk,
     HDassert(chunk_idx);
 
     /* Compute the scaled coordinates for actual coordinates */
-    for(u=0; u<ndims; u++)
-        scaled_coord[u]=coord[u]/chunk[u];
+    for (u = 0; u < ndims; u++)
+        scaled_coord[u] = coord[u] / chunk[u];
 
     /* Compute the chunk index */
-    *chunk_idx=H5VM_array_offset_pre(ndims,down_nchunks,scaled_coord); /*lint !e772 scaled_coord will always be initialized */
+    *chunk_idx = H5VM_array_offset_pre(ndims, down_nchunks,
+                                       scaled_coord); /*lint !e772 scaled_coord will always be initialized */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5VM_chunk_index() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_opvv
  *
@@ -1315,19 +1279,17 @@ H5VM_chunk_index(unsigned ndims, const hsize_t *coord, const uint32_t *chunk,
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5VM_opvv(size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[],
-    hsize_t dst_off_arr[],
-    size_t src_max_nseq, size_t *src_curr_seq, size_t src_len_arr[],
-    hsize_t src_off_arr[],
-    H5VM_opvv_func_t op, void *op_data)
+H5VM_opvv(size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[], hsize_t dst_off_arr[],
+          size_t src_max_nseq, size_t *src_curr_seq, size_t src_len_arr[], hsize_t src_off_arr[],
+          H5VM_opvv_func_t op, void *op_data)
 {
-    hsize_t *max_dst_off_ptr, *max_src_off_ptr;  /* Pointers to max. source and destination offset locations */
-    hsize_t *dst_off_ptr, *src_off_ptr; /* Pointers to source and destination offset arrays */
-    size_t *dst_len_ptr, *src_len_ptr;  /* Pointers to source and destination length arrays */
-    hsize_t tmp_dst_off, tmp_src_off;   /* Temporary source and destination offset values */
-    size_t tmp_dst_len, tmp_src_len;    /* Temporary source and destination length values */
-    size_t acc_len;             /* Accumulated length of sequences */
-    ssize_t ret_value = 0;      /* Return value (Total size of sequence in bytes) */
+    hsize_t *max_dst_off_ptr, *max_src_off_ptr; /* Pointers to max. source and destination offset locations */
+    hsize_t *dst_off_ptr, *src_off_ptr;         /* Pointers to source and destination offset arrays */
+    size_t * dst_len_ptr, *src_len_ptr;         /* Pointers to source and destination length arrays */
+    hsize_t  tmp_dst_off, tmp_src_off;          /* Temporary source and destination offset values */
+    size_t   tmp_dst_len, tmp_src_len;          /* Temporary source and destination length values */
+    size_t   acc_len;                           /* Accumulated length of sequences */
+    ssize_t  ret_value = 0;                     /* Return value (Total size of sequence in bytes) */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1358,16 +1320,16 @@ H5VM_opvv(size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[],
     max_dst_off_ptr = dst_off_arr + dst_max_nseq;
     max_src_off_ptr = src_off_arr + src_max_nseq;
 
-/* Work through the sequences */
-/* (Choose smallest sequence available initially) */
+    /* Work through the sequences */
+    /* (Choose smallest sequence available initially) */
 
     /* Source sequence is less than destination sequence */
-    if(tmp_src_len < tmp_dst_len) {
+    if (tmp_src_len < tmp_dst_len) {
 src_smaller:
         acc_len = 0;
         do {
             /* Make operator callback */
-            if((*op)(tmp_dst_off, tmp_src_off, tmp_src_len, op_data) < 0)
+            if ((*op)(tmp_dst_off, tmp_src_off, tmp_src_len, op_data) < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_CANTOPERATE, FAIL, "can't perform operation")
 
             /* Accumulate number of bytes copied */
@@ -1379,7 +1341,7 @@ src_smaller:
 
             /* Advance source offset & check for being finished */
             src_off_ptr++;
-            if(src_off_ptr >= max_src_off_ptr) {
+            if (src_off_ptr >= max_src_off_ptr) {
                 /* Roll accumulated changes into appropriate counters */
                 *dst_off_ptr = tmp_dst_off;
                 *dst_len_ptr = tmp_dst_len;
@@ -1392,24 +1354,24 @@ src_smaller:
             /* Update source information */
             src_len_ptr++;
             tmp_src_len = *src_len_ptr;
-        } while(tmp_src_len < tmp_dst_len);
+        } while (tmp_src_len < tmp_dst_len);
 
         /* Roll accumulated sequence lengths into return value */
         ret_value += (ssize_t)acc_len;
 
         /* Transition to next state */
-        if(tmp_dst_len < tmp_src_len)
+        if (tmp_dst_len < tmp_src_len)
             goto dst_smaller;
         else
             goto equal;
     } /* end if */
     /* Destination sequence is less than source sequence */
-    else if(tmp_dst_len < tmp_src_len) {
+    else if (tmp_dst_len < tmp_src_len) {
 dst_smaller:
         acc_len = 0;
         do {
             /* Make operator callback */
-            if((*op)(tmp_dst_off, tmp_src_off, tmp_dst_len, op_data) < 0)
+            if ((*op)(tmp_dst_off, tmp_src_off, tmp_dst_len, op_data) < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_CANTOPERATE, FAIL, "can't perform operation")
 
             /* Accumulate number of bytes copied */
@@ -1421,7 +1383,7 @@ dst_smaller:
 
             /* Advance destination offset & check for being finished */
             dst_off_ptr++;
-            if(dst_off_ptr >= max_dst_off_ptr) {
+            if (dst_off_ptr >= max_dst_off_ptr) {
                 /* Roll accumulated changes into appropriate counters */
                 *src_off_ptr = tmp_src_off;
                 *src_len_ptr = tmp_src_len;
@@ -1434,13 +1396,13 @@ dst_smaller:
             /* Update destination information */
             dst_len_ptr++;
             tmp_dst_len = *dst_len_ptr;
-        } while(tmp_dst_len < tmp_src_len);
+        } while (tmp_dst_len < tmp_src_len);
 
         /* Roll accumulated sequence lengths into return value */
         ret_value += (ssize_t)acc_len;
 
         /* Transition to next state */
-        if(tmp_src_len < tmp_dst_len)
+        if (tmp_src_len < tmp_dst_len)
             goto src_smaller;
         else
             goto equal;
@@ -1451,7 +1413,7 @@ equal:
         acc_len = 0;
         do {
             /* Make operator callback */
-            if((*op)(tmp_dst_off, tmp_src_off, tmp_dst_len, op_data) < 0)
+            if ((*op)(tmp_dst_off, tmp_src_off, tmp_dst_len, op_data) < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_CANTOPERATE, FAIL, "can't perform operation")
 
             /* Accumulate number of bytes copied */
@@ -1460,7 +1422,7 @@ equal:
             /* Advance source & destination offset & check for being finished */
             src_off_ptr++;
             dst_off_ptr++;
-            if(src_off_ptr >= max_src_off_ptr || dst_off_ptr >= max_dst_off_ptr)
+            if (src_off_ptr >= max_src_off_ptr || dst_off_ptr >= max_dst_off_ptr)
                 /* Done with sequences */
                 goto finished;
             tmp_src_off = *src_off_ptr;
@@ -1473,13 +1435,13 @@ equal:
             /* Update destination information */
             dst_len_ptr++;
             tmp_dst_len = *dst_len_ptr;
-        } while(tmp_dst_len == tmp_src_len);
+        } while (tmp_dst_len == tmp_src_len);
 
         /* Roll accumulated sequence lengths into return value */
         ret_value += (ssize_t)acc_len;
 
         /* Transition to next state */
-        if(tmp_dst_len < tmp_src_len)
+        if (tmp_dst_len < tmp_src_len)
             goto dst_smaller;
         else
             goto src_smaller;
@@ -1497,7 +1459,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5VM_opvv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5VM_memcpyvv
  *
@@ -1522,20 +1483,19 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5VM_memcpyvv(void *_dst,
-    size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[], hsize_t dst_off_arr[],
-    const void *_src,
-    size_t src_max_nseq, size_t *src_curr_seq, size_t src_len_arr[], hsize_t src_off_arr[])
+H5VM_memcpyvv(void *_dst, size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[],
+              hsize_t dst_off_arr[], const void *_src, size_t src_max_nseq, size_t *src_curr_seq,
+              size_t src_len_arr[], hsize_t src_off_arr[])
 {
-    unsigned char *dst;         /* Destination buffer pointer */
-    const unsigned char *src;   /* Source buffer pointer */
-    hsize_t *max_dst_off_ptr, *max_src_off_ptr;  /* Pointers to max. source and destination offset locations */
-    hsize_t *dst_off_ptr, *src_off_ptr;  /* Pointers to source and destination offset arrays */
-    size_t *dst_len_ptr, *src_len_ptr;  /* Pointers to source and destination length arrays */
-    size_t tmp_dst_len;         /* Temporary dest. length value */
-    size_t tmp_src_len;         /* Temporary source length value */
-    size_t acc_len;             /* Accumulated length of sequences */
-    ssize_t ret_value = 0;      /* Return value (Total size of sequence in bytes) */
+    unsigned char *      dst;                   /* Destination buffer pointer */
+    const unsigned char *src;                   /* Source buffer pointer */
+    hsize_t *max_dst_off_ptr, *max_src_off_ptr; /* Pointers to max. source and destination offset locations */
+    hsize_t *dst_off_ptr, *src_off_ptr;         /* Pointers to source and destination offset arrays */
+    size_t * dst_len_ptr, *src_len_ptr;         /* Pointers to source and destination length arrays */
+    size_t   tmp_dst_len;                       /* Temporary dest. length value */
+    size_t   tmp_src_len;                       /* Temporary source length value */
+    size_t   acc_len;                           /* Accumulated length of sequences */
+    ssize_t  ret_value = 0;                     /* Return value (Total size of sequence in bytes) */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1569,11 +1529,11 @@ H5VM_memcpyvv(void *_dst,
     dst = (unsigned char *)_dst + *dst_off_ptr;
     src = (const unsigned char *)_src + *src_off_ptr;
 
-/* Work through the sequences */
-/* (Choose smallest sequence available initially) */
+    /* Work through the sequences */
+    /* (Choose smallest sequence available initially) */
 
     /* Source sequence is less than destination sequence */
-    if(tmp_src_len < tmp_dst_len) {
+    if (tmp_src_len < tmp_dst_len) {
 src_smaller:
         acc_len = 0;
         do {
@@ -1588,7 +1548,7 @@ src_smaller:
 
             /* Advance source offset & check for being finished */
             src_off_ptr++;
-            if(src_off_ptr >= max_src_off_ptr) {
+            if (src_off_ptr >= max_src_off_ptr) {
                 /* Roll accumulated changes into appropriate counters */
                 *dst_off_ptr += acc_len;
                 *dst_len_ptr = tmp_dst_len;
@@ -1603,20 +1563,20 @@ src_smaller:
             /* Update source information */
             src_len_ptr++;
             tmp_src_len = *src_len_ptr;
-            src = (const unsigned char *)_src + *src_off_ptr;
-        } while(tmp_src_len < tmp_dst_len);
+            src         = (const unsigned char *)_src + *src_off_ptr;
+        } while (tmp_src_len < tmp_dst_len);
 
         /* Roll accumulated sequence lengths into return value */
         ret_value += (ssize_t)acc_len;
 
         /* Transition to next state */
-        if(tmp_dst_len < tmp_src_len)
+        if (tmp_dst_len < tmp_src_len)
             goto dst_smaller;
         else
             goto equal;
     } /* end if */
     /* Destination sequence is less than source sequence */
-    else if(tmp_dst_len < tmp_src_len) {
+    else if (tmp_dst_len < tmp_src_len) {
 dst_smaller:
         acc_len = 0;
         do {
@@ -1631,7 +1591,7 @@ dst_smaller:
 
             /* Advance destination offset & check for being finished */
             dst_off_ptr++;
-            if(dst_off_ptr >= max_dst_off_ptr) {
+            if (dst_off_ptr >= max_dst_off_ptr) {
                 /* Roll accumulated changes into appropriate counters */
                 *src_off_ptr += acc_len;
                 *src_len_ptr = tmp_src_len;
@@ -1646,14 +1606,14 @@ dst_smaller:
             /* Update destination information */
             dst_len_ptr++;
             tmp_dst_len = *dst_len_ptr;
-            dst = (unsigned char *)_dst + *dst_off_ptr;
-        } while(tmp_dst_len < tmp_src_len);
+            dst         = (unsigned char *)_dst + *dst_off_ptr;
+        } while (tmp_dst_len < tmp_src_len);
 
         /* Roll accumulated sequence lengths into return value */
         ret_value += (ssize_t)acc_len;
 
         /* Transition to next state */
-        if(tmp_src_len < tmp_dst_len)
+        if (tmp_src_len < tmp_dst_len)
             goto src_smaller;
         else
             goto equal;
@@ -1672,26 +1632,26 @@ equal:
             /* Advance source & destination offset & check for being finished */
             src_off_ptr++;
             dst_off_ptr++;
-            if(src_off_ptr >= max_src_off_ptr || dst_off_ptr >= max_dst_off_ptr)
+            if (src_off_ptr >= max_src_off_ptr || dst_off_ptr >= max_dst_off_ptr)
                 /* Done with sequences */
                 goto finished;
 
             /* Update source information */
             src_len_ptr++;
             tmp_src_len = *src_len_ptr;
-            src = (const unsigned char *)_src + *src_off_ptr;
+            src         = (const unsigned char *)_src + *src_off_ptr;
 
             /* Update destination information */
             dst_len_ptr++;
             tmp_dst_len = *dst_len_ptr;
-            dst = (unsigned char *)_dst + *dst_off_ptr;
-        } while(tmp_dst_len == tmp_src_len);
+            dst         = (unsigned char *)_dst + *dst_off_ptr;
+        } while (tmp_dst_len == tmp_src_len);
 
         /* Roll accumulated sequence lengths into return value */
         ret_value += (ssize_t)acc_len;
 
         /* Transition to next state */
-        if(tmp_dst_len < tmp_src_len)
+        if (tmp_dst_len < tmp_src_len)
             goto dst_smaller;
         else
             goto src_smaller;
@@ -1707,4 +1667,3 @@ finished:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5VM_memcpyvv() */
-
diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h
index ea46f1f..48422b3 100644
--- a/src/H5VMprivate.h
+++ b/src/H5VMprivate.h
@@ -19,86 +19,70 @@
 #define H5VMprivate_H
 
 /* Private headers needed by this file */
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Eprivate.h"        /* Error handling              */
+#include "H5private.h"  /* Generic Functions            */
+#include "H5Eprivate.h" /* Error handling              */
 
 /* Vector-Vector sequence operation callback */
-typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off,
-    size_t len, void *udata);
+typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, size_t len, void *udata);
 
 /* Vector comparison functions like Fortran66 comparison operators */
-#define H5VM_vector_eq_s(N,V1,V2) (H5VM_vector_cmp_s (N, V1, V2)==0)
-#define H5VM_vector_lt_s(N,V1,V2) (H5VM_vector_cmp_s (N, V1, V2)<0)
-#define H5VM_vector_gt_s(N,V1,V2) (H5VM_vector_cmp_s (N, V1, V2)>0)
-#define H5VM_vector_le_s(N,V1,V2) (H5VM_vector_cmp_s (N, V1, V2)<=0)
-#define H5VM_vector_ge_s(N,V1,V2) (H5VM_vector_cmp_s (N, V1, V2)>=0)
-#define H5VM_vector_eq_u(N,V1,V2) (H5VM_vector_cmp_u (N, V1, V2)==0)
-#define H5VM_vector_lt_u(N,V1,V2) (H5VM_vector_cmp_u (N, V1, V2)<0)
-#define H5VM_vector_gt_u(N,V1,V2) (H5VM_vector_cmp_u (N, V1, V2)>0)
-#define H5VM_vector_le_u(N,V1,V2) (H5VM_vector_cmp_u (N, V1, V2)<=0)
-#define H5VM_vector_ge_u(N,V1,V2) (H5VM_vector_cmp_u (N, V1, V2)>=0)
+#define H5VM_vector_eq_s(N, V1, V2) (H5VM_vector_cmp_s(N, V1, V2) == 0)
+#define H5VM_vector_lt_s(N, V1, V2) (H5VM_vector_cmp_s(N, V1, V2) < 0)
+#define H5VM_vector_gt_s(N, V1, V2) (H5VM_vector_cmp_s(N, V1, V2) > 0)
+#define H5VM_vector_le_s(N, V1, V2) (H5VM_vector_cmp_s(N, V1, V2) <= 0)
+#define H5VM_vector_ge_s(N, V1, V2) (H5VM_vector_cmp_s(N, V1, V2) >= 0)
+#define H5VM_vector_eq_u(N, V1, V2) (H5VM_vector_cmp_u(N, V1, V2) == 0)
+#define H5VM_vector_lt_u(N, V1, V2) (H5VM_vector_cmp_u(N, V1, V2) < 0)
+#define H5VM_vector_gt_u(N, V1, V2) (H5VM_vector_cmp_u(N, V1, V2) > 0)
+#define H5VM_vector_le_u(N, V1, V2) (H5VM_vector_cmp_u(N, V1, V2) <= 0)
+#define H5VM_vector_ge_u(N, V1, V2) (H5VM_vector_cmp_u(N, V1, V2) >= 0)
 
 /* Other functions */
-#define H5VM_vector_cpy(N,DST,SRC) {                                           \
-    HDassert(sizeof(*(DST))==sizeof(*(SRC)));                                  \
-    if (SRC) HDmemcpy (DST, SRC, (N)*sizeof(*(DST)));                         \
-    else HDmemset (DST, 0, (N)*sizeof(*(DST)));                               \
-}
+#define H5VM_vector_cpy(N, DST, SRC)                                                                         \
+    {                                                                                                        \
+        HDassert(sizeof(*(DST)) == sizeof(*(SRC)));                                                          \
+        if (SRC)                                                                                             \
+            HDmemcpy(DST, SRC, (N) * sizeof(*(DST)));                                                        \
+        else                                                                                                 \
+            HDmemset(DST, 0, (N) * sizeof(*(DST)));                                                          \
+    }
 
-#define H5VM_vector_zero(N,DST) HDmemset(DST,0,(N)*sizeof(*(DST)))
+#define H5VM_vector_zero(N, DST) HDmemset(DST, 0, (N) * sizeof(*(DST)))
 
 /* A null pointer is equivalent to a zero vector */
-#define H5VM_ZERO        NULL
-
-H5_DLL hsize_t H5VM_hyper_stride(unsigned n, const hsize_t *size,
-                const hsize_t *total_size,
-                const hsize_t *offset,
-                hsize_t *stride);
-H5_DLL htri_t H5VM_hyper_disjointp(unsigned n, const hsize_t *offset1,
-    const uint32_t *size1, const hsize_t *offset2, const uint32_t *size2);
-H5_DLL htri_t H5VM_hyper_eq(unsigned n, const hsize_t *offset1,
-                const hsize_t *size1, const hsize_t *offset2,
-                const hsize_t *size2);
-H5_DLL herr_t H5VM_hyper_fill(unsigned n, const hsize_t *_size,
-                const hsize_t *total_size,
-                const hsize_t *offset, void *_dst,
-                unsigned fill_value);
-H5_DLL herr_t H5VM_hyper_copy(unsigned n, const hsize_t *size,
-                const hsize_t *dst_total_size,
-                const hsize_t *dst_offset, void *_dst,
-                const hsize_t *src_total_size,
-                const hsize_t *src_offset, const void *_src);
-H5_DLL herr_t H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size,
-                const hsize_t *stride, void *_dst,
-                unsigned fill_value);
-H5_DLL herr_t H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *_size,
-                const hsize_t *dst_stride, void *_dst,
-                const hsize_t *src_stride, const void *_src);
+#define H5VM_ZERO NULL
+
+H5_DLL hsize_t H5VM_hyper_stride(unsigned n, const hsize_t *size, const hsize_t *total_size,
+                                 const hsize_t *offset, hsize_t *stride);
+H5_DLL htri_t  H5VM_hyper_disjointp(unsigned n, const hsize_t *offset1, const uint32_t *size1,
+                                    const hsize_t *offset2, const uint32_t *size2);
+H5_DLL htri_t  H5VM_hyper_eq(unsigned n, const hsize_t *offset1, const hsize_t *size1, const hsize_t *offset2,
+                             const hsize_t *size2);
+H5_DLL herr_t  H5VM_hyper_fill(unsigned n, const hsize_t *_size, const hsize_t *total_size,
+                               const hsize_t *offset, void *_dst, unsigned fill_value);
+H5_DLL herr_t  H5VM_hyper_copy(unsigned n, const hsize_t *size, const hsize_t *dst_total_size,
+                               const hsize_t *dst_offset, void *_dst, const hsize_t *src_total_size,
+                               const hsize_t *src_offset, const void *_src);
+H5_DLL herr_t  H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize_t *stride,
+                                void *_dst, unsigned fill_value);
+H5_DLL herr_t H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *_size, const hsize_t *dst_stride,
+                               void *_dst, const hsize_t *src_stride, const void *_src);
 H5_DLL herr_t H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *_size,
-                const hssize_t *dst_stride, void *_dst,
-                const hssize_t *src_stride, const void *_src);
-H5_DLL herr_t H5VM_array_fill(void *_dst, const void *src, size_t size,
-                size_t count);
-H5_DLL herr_t H5VM_array_down(unsigned n, const hsize_t *total_size,
-    hsize_t *down);
-H5_DLL hsize_t H5VM_array_offset_pre(unsigned n,
-    const hsize_t *acc, const hsize_t *offset);
-H5_DLL hsize_t H5VM_array_offset(unsigned n, const hsize_t *total_size,
-    const hsize_t *offset);
-H5_DLL herr_t H5VM_array_calc(hsize_t offset, unsigned n,
-    const hsize_t *total_size, hsize_t *coords);
-H5_DLL herr_t H5VM_chunk_index(unsigned ndims, const hsize_t *coord,
-    const uint32_t *chunk, const hsize_t *down_nchunks, hsize_t *chunk_idx);
+                                 const hssize_t *dst_stride, void *_dst, const hssize_t *src_stride,
+                                 const void *_src);
+H5_DLL herr_t H5VM_array_fill(void *_dst, const void *src, size_t size, size_t count);
+H5_DLL herr_t H5VM_array_down(unsigned n, const hsize_t *total_size, hsize_t *down);
+H5_DLL hsize_t H5VM_array_offset_pre(unsigned n, const hsize_t *acc, const hsize_t *offset);
+H5_DLL hsize_t H5VM_array_offset(unsigned n, const hsize_t *total_size, const hsize_t *offset);
+H5_DLL herr_t  H5VM_array_calc(hsize_t offset, unsigned n, const hsize_t *total_size, hsize_t *coords);
+H5_DLL herr_t  H5VM_chunk_index(unsigned ndims, const hsize_t *coord, const uint32_t *chunk,
+                                const hsize_t *down_nchunks, hsize_t *chunk_idx);
 H5_DLL ssize_t H5VM_opvv(size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[],
-    hsize_t dst_off_arr[],
-    size_t src_max_nseq, size_t *src_curr_seq, size_t src_len_arr[],
-    hsize_t src_off_arr[],
-    H5VM_opvv_func_t op, void *op_data);
-H5_DLL ssize_t H5VM_memcpyvv(void *_dst,
-    size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[], hsize_t dst_off_arr[],
-    const void *_src,
-    size_t src_max_nseq, size_t *src_curr_seq, size_t src_len_arr[], hsize_t src_off_arr[]);
-
+                         hsize_t dst_off_arr[], size_t src_max_nseq, size_t *src_curr_seq,
+                         size_t src_len_arr[], hsize_t src_off_arr[], H5VM_opvv_func_t op, void *op_data);
+H5_DLL ssize_t H5VM_memcpyvv(void *_dst, size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[],
+                             hsize_t dst_off_arr[], const void *_src, size_t src_max_nseq,
+                             size_t *src_curr_seq, size_t src_len_arr[], hsize_t src_off_arr[]);
 
 /*-------------------------------------------------------------------------
  * Function:    H5VM_vector_reduce_product
@@ -122,13 +106,15 @@ H5_DLL ssize_t H5VM_memcpyvv(void *_dst,
 static H5_INLINE hsize_t H5_ATTR_UNUSED
 H5VM_vector_reduce_product(unsigned n, const hsize_t *v)
 {
-    hsize_t                  ret_value = 1;
+    hsize_t ret_value = 1;
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if (n && !v) HGOTO_DONE(0)
-    while (n--) ret_value *= *v++;
+    if (n && !v)
+        HGOTO_DONE(0)
+    while (n--)
+        ret_value *= *v++;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -154,7 +140,7 @@ done:
 static H5_INLINE htri_t H5_ATTR_UNUSED
 H5VM_vector_zerop_u(int n, const hsize_t *v)
 {
-    htri_t      ret_value=TRUE;       /* Return value */
+    htri_t ret_value = TRUE; /* Return value */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -162,7 +148,7 @@ H5VM_vector_zerop_u(int n, const hsize_t *v)
     if (!v)
         HGOTO_DONE(TRUE)
     while (n--)
-    if (*v++)
+        if (*v++)
             HGOTO_DONE(FALSE)
 
 done:
@@ -189,7 +175,7 @@ done:
 static H5_INLINE htri_t H5_ATTR_UNUSED
 H5VM_vector_zerop_s(int n, const hssize_t *v)
 {
-    htri_t      ret_value=TRUE;       /* Return value */
+    htri_t ret_value = TRUE; /* Return value */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -197,7 +183,7 @@ H5VM_vector_zerop_s(int n, const hssize_t *v)
     if (!v)
         HGOTO_DONE(TRUE)
     while (n--)
-    if (*v++)
+        if (*v++)
             HGOTO_DONE(FALSE)
 
 done:
@@ -224,19 +210,24 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5_INLINE int H5_ATTR_UNUSED
-H5VM_vector_cmp_u (unsigned n, const hsize_t *v1, const hsize_t *v2)
+H5VM_vector_cmp_u(unsigned n, const hsize_t *v1, const hsize_t *v2)
 {
-    int ret_value=0;    /* Return value */
+    int ret_value = 0; /* Return value */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if (v1 == v2) HGOTO_DONE(0)
-    if (v1 == NULL) HGOTO_DONE(-1)
-    if (v2 == NULL) HGOTO_DONE(1)
+    if (v1 == v2)
+        HGOTO_DONE(0)
+    if (v1 == NULL)
+        HGOTO_DONE(-1)
+    if (v2 == NULL)
+        HGOTO_DONE(1)
     while (n--) {
-        if (*v1 < *v2) HGOTO_DONE(-1)
-        if (*v1 > *v2) HGOTO_DONE(1)
+        if (*v1 < *v2)
+            HGOTO_DONE(-1)
+        if (*v1 > *v2)
+            HGOTO_DONE(1)
         v1++;
         v2++;
     }
@@ -245,7 +236,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5VM_vector_cmp_s
  *
@@ -266,19 +256,24 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5_INLINE int H5_ATTR_UNUSED
-H5VM_vector_cmp_s (unsigned n, const hssize_t *v1, const hssize_t *v2)
+H5VM_vector_cmp_s(unsigned n, const hssize_t *v1, const hssize_t *v2)
 {
-    int ret_value=0;    /* Return value */
+    int ret_value = 0; /* Return value */
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if (v1 == v2) HGOTO_DONE(0)
-    if (v1 == NULL) HGOTO_DONE(-1)
-    if (v2 == NULL) HGOTO_DONE(1)
+    if (v1 == v2)
+        HGOTO_DONE(0)
+    if (v1 == NULL)
+        HGOTO_DONE(-1)
+    if (v2 == NULL)
+        HGOTO_DONE(1)
     while (n--) {
-        if (*v1 < *v2) HGOTO_DONE(-1)
-        if (*v1 > *v2) HGOTO_DONE(1)
+        if (*v1 < *v2)
+            HGOTO_DONE(-1)
+        if (*v1 > *v2)
+            HGOTO_DONE(1)
         v1++;
         v2++;
     }
@@ -287,7 +282,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5VM_vector_inc
  *
@@ -305,33 +299,24 @@ done:
 static H5_INLINE void H5_ATTR_UNUSED
 H5VM_vector_inc(int n, hsize_t *v1, const hsize_t *v2)
 {
-    while (n--) *v1++ += *v2++;
+    while (n--)
+        *v1++ += *v2++;
 }
 
 /* Lookup table for general log2(n) routine */
-static const unsigned char LogTable256[] =
-{
+static const unsigned char LogTable256[] = {
     /* clang-clang-format off */
-    0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
+    0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
     /* clang-clang-format on */
 };
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5VM_log2_gen
  *
@@ -354,32 +339,29 @@ static const unsigned char LogTable256[] =
 static H5_INLINE unsigned H5_ATTR_UNUSED
 H5VM_log2_gen(uint64_t n)
 {
-    unsigned r;                         /* r will be log2(n) */
-    register unsigned int t, tt, ttt;   /* temporaries */
+    unsigned              r;          /* r will be log2(n) */
+    register unsigned int t, tt, ttt; /* temporaries */
 
-    if((ttt = (unsigned)(n >> 32)))
-        if((tt = (unsigned)(n >> 48)))
-            r = (t = (unsigned)(n >> 56)) ? 56 + (unsigned)LogTable256[t] : 48 + (unsigned)LogTable256[tt & 0xFF];
+    if ((ttt = (unsigned)(n >> 32)))
+        if ((tt = (unsigned)(n >> 48)))
+            r = (t = (unsigned)(n >> 56)) ? 56 + (unsigned)LogTable256[t]
+                                          : 48 + (unsigned)LogTable256[tt & 0xFF];
         else
-            r = (t = (unsigned)(n >> 40)) ? 40 + (unsigned)LogTable256[t] : 32 + (unsigned)LogTable256[ttt & 0xFF];
+            r = (t = (unsigned)(n >> 40)) ? 40 + (unsigned)LogTable256[t]
+                                          : 32 + (unsigned)LogTable256[ttt & 0xFF];
+    else if ((tt = (unsigned)(n >> 16)))
+        r = (t = (unsigned)(n >> 24)) ? 24 + (unsigned)LogTable256[t] : 16 + (unsigned)LogTable256[tt & 0xFF];
     else
-        if((tt = (unsigned)(n >> 16)))
-            r = (t = (unsigned)(n >> 24)) ? 24 + (unsigned)LogTable256[t] : 16 + (unsigned)LogTable256[tt & 0xFF];
-        else
-            /* Added 'uint8_t' cast to pacify PGCC compiler */
-            r = (t = (unsigned)(n >> 8)) ? 8 + (unsigned)LogTable256[t] : (unsigned)LogTable256[(uint8_t)n];
+        /* Added 'uint8_t' cast to pacify PGCC compiler */
+        r = (t = (unsigned)(n >> 8)) ? 8 + (unsigned)LogTable256[t] : (unsigned)LogTable256[(uint8_t)n];
 
-    return(r);
+    return (r);
 } /* H5VM_log2_gen() */
 
-
 /* Lookup table for specialized log2(n) of power of two routine */
-static const unsigned MultiplyDeBruijnBitPosition[32] =
-{
-      0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
-        31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
-};
-
+static const unsigned MultiplyDeBruijnBitPosition[32] = {0,  1,  28, 2,  29, 14, 24, 3,  30, 22, 20,
+                                                         15, 25, 17, 4,  8,  31, 27, 13, 23, 21, 19,
+                                                         16, 7,  26, 12, 18, 6,  11, 5,  10, 9};
 
 /*-------------------------------------------------------------------------
  * Function:    H5VM_log2_of2
@@ -405,10 +387,9 @@ H5VM_log2_of2(uint32_t n)
 #ifndef NDEBUG
     HDassert(POWER_OF_TWO(n));
 #endif /* NDEBUG */
-    return(MultiplyDeBruijnBitPosition[(n * (uint32_t)0x077CB531UL) >> 27]);
+    return (MultiplyDeBruijnBitPosition[(n * (uint32_t)0x077CB531UL) >> 27]);
 } /* H5VM_log2_of2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5VM_limit_enc_size
  *
@@ -428,10 +409,9 @@ H5VM_limit_enc_size(uint64_t limit)
     return (H5VM_log2_gen(limit) / 8) + 1;
 } /* end H5VM_limit_enc_size() */
 
-static const unsigned char H5VM_bit_set_g[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
+static const unsigned char H5VM_bit_set_g[8]   = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
 static const unsigned char H5VM_bit_clear_g[8] = {0x7F, 0xBF, 0xDF, 0xEF, 0xF7, 0xFB, 0xFD, 0xFE};
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5VM_bit_get
  *
@@ -458,7 +438,6 @@ H5VM_bit_get(const unsigned char *buf, size_t offset)
     return (hbool_t)((buf[offset / 8] & (H5VM_bit_set_g[offset % 8])) ? TRUE : FALSE);
 } /* end H5VM_bit_get() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5VM_bit_set
  *
@@ -482,11 +461,10 @@ static H5_INLINE void H5_ATTR_UNUSED
 H5VM_bit_set(unsigned char *buf, size_t offset, hbool_t val)
 {
     /* Set/reset the appropriate bit in the buffer */
-    if(val)
+    if (val)
         buf[offset / 8] |= H5VM_bit_set_g[offset % 8];
     else
         buf[offset / 8] &= H5VM_bit_clear_g[offset % 8];
 } /* end H5VM_bit_set() */
 
 #endif /* H5VMprivate_H */
-
diff --git a/src/H5WB.c b/src/H5WB.c
index 8a85a3a..8d0bcd1 100644
--- a/src/H5WB.c
+++ b/src/H5WB.c
@@ -28,54 +28,47 @@
 /* Module Setup */
 /****************/
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5WBprivate.h" /* Wrapped Buffers                      */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
 /* Typedef for buffer wrapper */
 struct H5WB_t {
-    void *wrapped_buf;          /* Pointer to wrapped buffer */
-    size_t wrapped_size;        /* Size of wrapped buffer */
-    void *actual_buf;           /* Pointer to actual buffer */
-    size_t actual_size;         /* Size of actual buffer used */
-    size_t alloc_size;          /* Size of actual buffer allocated */
+    void * wrapped_buf;  /* Pointer to wrapped buffer */
+    size_t wrapped_size; /* Size of wrapped buffer */
+    void * actual_buf;   /* Pointer to actual buffer */
+    size_t actual_size;  /* Size of actual buffer used */
+    size_t alloc_size;   /* Size of actual buffer allocated */
 };
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -86,8 +79,6 @@ H5FL_DEFINE_STATIC(H5WB_t);
 /* Declare a free list to manage the extra buffer information */
 H5FL_BLK_DEFINE_STATIC(extra_buf);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5WB_wrap
  *
@@ -105,8 +96,8 @@ H5FL_BLK_DEFINE_STATIC(extra_buf);
 H5WB_t *
 H5WB_wrap(void *buf, size_t buf_size)
 {
-    H5WB_t *wb = NULL;          /* Wrapped buffer info */
-    H5WB_t *ret_value;          /* Return value */
+    H5WB_t *wb = NULL; /* Wrapped buffer info */
+    H5WB_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -117,30 +108,29 @@ H5WB_wrap(void *buf, size_t buf_size)
     HDassert(buf_size);
 
     /* Create wrapped buffer info */
-    if(NULL == (wb = H5FL_MALLOC(H5WB_t)))
+    if (NULL == (wb = H5FL_MALLOC(H5WB_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for wrapped buffer info")
 
     /* Wrap buffer given */
-    wb->wrapped_buf = buf;
+    wb->wrapped_buf  = buf;
     wb->wrapped_size = buf_size;
 
     /* No actual buffer yet */
-    wb->actual_buf = NULL;
+    wb->actual_buf  = NULL;
     wb->actual_size = 0;
-    wb->alloc_size = 0;
+    wb->alloc_size  = 0;
 
     /* Set the return value */
     ret_value = wb;
 
 done:
     /* Release resources on error */
-    if(!ret_value && wb)
+    if (!ret_value && wb)
         wb = H5FL_FREE(H5WB_t, wb);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5WB_wrap() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5WB_actual
  *
@@ -159,7 +149,7 @@ done:
 void *
 H5WB_actual(H5WB_t *wb, size_t need)
 {
-    void *ret_value;            /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -170,12 +160,12 @@ H5WB_actual(H5WB_t *wb, size_t need)
     HDassert(wb->wrapped_buf);
 
     /* Check for previously allocated buffer */
-    if(wb->actual_buf && wb->actual_buf != wb->wrapped_buf) {
+    if (wb->actual_buf && wb->actual_buf != wb->wrapped_buf) {
         /* Sanity check */
         HDassert(wb->actual_size > wb->wrapped_size);
 
         /* Check if we can re-use existing buffer */
-        if(need <= wb->alloc_size)
+        if (need <= wb->alloc_size)
             HGOTO_DONE(wb->actual_buf)
         /* Can't re-use existing buffer, free it and proceed */
         else
@@ -183,9 +173,9 @@ H5WB_actual(H5WB_t *wb, size_t need)
     } /* end if */
 
     /* Check if size needed can be fulfilled with wrapped buffer */
-    if(need > wb->wrapped_size) {
+    if (need > wb->wrapped_size) {
         /* Need to allocate new buffer */
-        if(NULL == (wb->actual_buf = H5FL_BLK_MALLOC(extra_buf, need)))
+        if (NULL == (wb->actual_buf = H5FL_BLK_MALLOC(extra_buf, need)))
             HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, NULL, "memory allocation failed")
 
         /* Remember size of buffer allocated */
@@ -202,13 +192,12 @@ H5WB_actual(H5WB_t *wb, size_t need)
 
 done:
     /* Remember size of buffer used, if we were successful */
-    if(ret_value)
+    if (ret_value)
         wb->actual_size = need;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5WB_actual() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5WB_actual_clear
  *
@@ -227,7 +216,7 @@ done:
 void *
 H5WB_actual_clear(H5WB_t *wb, size_t need)
 {
-    void *ret_value;            /* Return value */
+    void *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -238,7 +227,7 @@ H5WB_actual_clear(H5WB_t *wb, size_t need)
     HDassert(wb->wrapped_buf);
 
     /* Get a pointer to an actual buffer */
-    if(NULL == (ret_value = H5WB_actual(wb, need)))
+    if (NULL == (ret_value = H5WB_actual(wb, need)))
         HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Clear the buffer */
@@ -248,7 +237,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5WB_actual_clear() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5WB_unwrap
  *
@@ -274,7 +262,7 @@ H5WB_unwrap(H5WB_t *wb)
     HDassert(wb->wrapped_buf);
 
     /* Release any extra buffers allocated */
-    if(wb->actual_buf && wb->actual_buf != wb->wrapped_buf) {
+    if (wb->actual_buf && wb->actual_buf != wb->wrapped_buf) {
         /* Sanity check */
         HDassert(wb->actual_size > wb->wrapped_size);
 
@@ -286,4 +274,3 @@ H5WB_unwrap(H5WB_t *wb)
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5WB_unwrap() */
-
diff --git a/src/H5WBprivate.h b/src/H5WBprivate.h
index 4460808..34077a6 100644
--- a/src/H5WBprivate.h
+++ b/src/H5WBprivate.h
@@ -34,7 +34,6 @@
 /* Library Private Macros */
 /**************************/
 
-
 /****************************/
 /* Library Private Typedefs */
 /****************************/
@@ -42,21 +41,18 @@
 /* Wrapped buffer info (forward decl - defined in H5WB.c) */
 typedef struct H5WB_t H5WB_t;
 
-
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
 
 /* General routines for wrapped buffer operations */
 H5_DLL H5WB_t *H5WB_wrap(void *buf, size_t buf_size);
-H5_DLL void *H5WB_actual(H5WB_t *wb, size_t need);
-H5_DLL void *H5WB_actual_clear(H5WB_t *wb, size_t need);
-H5_DLL herr_t H5WB_unwrap(H5WB_t *wb);
+H5_DLL void *  H5WB_actual(H5WB_t *wb, size_t need);
+H5_DLL void *  H5WB_actual_clear(H5WB_t *wb, size_t need);
+H5_DLL herr_t  H5WB_unwrap(H5WB_t *wb);
 
 #endif /* _H5WBprivate_H */
-
diff --git a/src/H5Z.c b/src/H5Z.c
index a5cf1be..354e6e6 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -11,56 +11,55 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5Z_PACKAGE        /* suppress error about including H5Zpkg */
+#define H5Z_PACKAGE /* suppress error about including H5Zpkg */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC    H5Z_init_interface
-
-
-#include "H5private.h"         /* Generic Functions */
-#include "H5Dprivate.h"        /* Dataset functions */
-#include "H5Eprivate.h"        /* Error handling */
-#include "H5Fprivate.h"        /* File */
-#include "H5Iprivate.h"        /* IDs */
-#include "H5MMprivate.h"       /* Memory management */
-#include "H5Oprivate.h"        /* Object headers */
-#include "H5Pprivate.h"        /* Property lists */
-#include "H5PLprivate.h"       /* Plugins */
-#include "H5Sprivate.h"        /* Dataspace functions */
-#include "H5Zpkg.h"            /* Data filters */
+#define H5_INTERFACE_INIT_FUNC H5Z_init_interface
+
+#include "H5private.h"   /* Generic Functions */
+#include "H5Dprivate.h"  /* Dataset functions */
+#include "H5Eprivate.h"  /* Error handling */
+#include "H5Fprivate.h"  /* File */
+#include "H5Iprivate.h"  /* IDs */
+#include "H5MMprivate.h" /* Memory management */
+#include "H5Oprivate.h"  /* Object headers */
+#include "H5Pprivate.h"  /* Property lists */
+#include "H5PLprivate.h" /* Plugins */
+#include "H5Sprivate.h"  /* Dataspace functions */
+#include "H5Zpkg.h"      /* Data filters */
 
 #ifdef H5_HAVE_SZLIB_H
-#   include "szlib.h"
+#include "szlib.h"
 #endif
 
 /* Local typedefs */
 #ifdef H5Z_DEBUG
 typedef struct H5Z_stats_t {
     struct {
-        hsize_t    total;    /* total number of bytes processed */
-        hsize_t    errors;   /* bytes of total attributable to errors */
-        H5_timer_t timer;    /* execution time including errors */
-    } stats[2];              /* 0=output, 1=input */
+        hsize_t    total;  /* total number of bytes processed */
+        hsize_t    errors; /* bytes of total attributable to errors */
+        H5_timer_t timer;  /* execution time including errors */
+    } stats[2];            /* 0=output, 1=input */
 } H5Z_stats_t;
 #endif /* H5Z_DEBUG */
 
 typedef struct H5Z_object_t {
-    H5Z_filter_t filter_id;     /* ID of the filter we're looking for */
-    htri_t       found;         /* Whether we find an object using the filter */
+    H5Z_filter_t filter_id; /* ID of the filter we're looking for */
+    htri_t       found;     /* Whether we find an object using the filter */
 } H5Z_object_t;
 
 /* Enumerated type for dataset creation prelude callbacks */
 typedef enum {
-    H5Z_PRELUDE_CAN_APPLY,      /* Call "can apply" callback */
-    H5Z_PRELUDE_SET_LOCAL       /* Call "set local" callback */
+    H5Z_PRELUDE_CAN_APPLY, /* Call "can apply" callback */
+    H5Z_PRELUDE_SET_LOCAL  /* Call "set local" callback */
 } H5Z_prelude_type_t;
 
 /* Local variables */
-static size_t           H5Z_table_alloc_g = 0;
-static size_t           H5Z_table_used_g = 0;
-static H5Z_class2_t    *H5Z_table_g = NULL;
+static size_t        H5Z_table_alloc_g = 0;
+static size_t        H5Z_table_used_g  = 0;
+static H5Z_class2_t *H5Z_table_g       = NULL;
 #ifdef H5Z_DEBUG
-static H5Z_stats_t     *H5Z_stat_table_g = NULL;
+static H5Z_stats_t *H5Z_stat_table_g = NULL;
 #endif /* H5Z_DEBUG */
 
 /* Local functions */
@@ -69,7 +68,6 @@ static int H5Z__check_unregister_dset_cb(void *obj_ptr, hid_t obj_id, void *key)
 static int H5Z__check_unregister_group_cb(void *obj_ptr, hid_t obj_id, void *key);
 static int H5Z__flush_file_cb(void *obj_ptr, hid_t obj_id, void *key);
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_init_interface
  *
@@ -79,38 +77,37 @@ static int H5Z__flush_file_cb(void *obj_ptr, hid_t obj_id, void *key);
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5Z_init_interface (void)
+H5Z_init_interface(void)
 {
-    herr_t    ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Internal filters */
-    if (H5Z_register (H5Z_SHUFFLE) < 0)
-        HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register shuffle filter")
-    if (H5Z_register (H5Z_FLETCHER32) < 0)
-        HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register fletcher32 filter")
-    if (H5Z_register (H5Z_NBIT) < 0)
-        HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register nbit filter")
-    if (H5Z_register (H5Z_SCALEOFFSET) < 0)
-        HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register scaleoffset filter")
-
-    /* External filters */
+    if (H5Z_register(H5Z_SHUFFLE) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register shuffle filter")
+    if (H5Z_register(H5Z_FLETCHER32) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register fletcher32 filter")
+    if (H5Z_register(H5Z_NBIT) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register nbit filter")
+    if (H5Z_register(H5Z_SCALEOFFSET) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register scaleoffset filter")
+
+        /* External filters */
 #ifdef H5_HAVE_FILTER_DEFLATE
-    if (H5Z_register (H5Z_DEFLATE) < 0)
-        HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register deflate filter")
+    if (H5Z_register(H5Z_DEFLATE) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register deflate filter")
 #endif /* H5_HAVE_FILTER_DEFLATE */
 #ifdef H5_HAVE_FILTER_SZIP
     H5Z_SZIP->encoder_present = SZ_encoder_enabled();
-    if (H5Z_register (H5Z_SZIP) < 0)
-        HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register szip filter")
+    if (H5Z_register(H5Z_SZIP) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register szip filter")
 #endif /* H5_HAVE_FILTER_SZIP */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_term_interface
  *
@@ -123,57 +120,52 @@ int
 H5Z_term_interface(void)
 {
 #ifdef H5Z_DEBUG
-    size_t    i;
-    int       dir;
-    int       nprint = 0;
-    char      comment[16];
-    char      bandwidth[32];
+    size_t i;
+    int    dir;
+    int    nprint = 0;
+    char   comment[16];
+    char   bandwidth[32];
 #endif
 
     if (H5_interface_initialize_g) {
 #ifdef H5Z_DEBUG
-    if (H5DEBUG(Z)) {
-        for (i = 0; i < H5Z_table_used_g; i++) {
-            for (dir = 0; dir < 2; dir++) {
-                if (0 == H5Z_stat_table_g[i].stats[dir].total) continue;
-
-                if (0 == nprint++) {
-                    /* Print column headers */
-                    HDfprintf (H5DEBUG(Z), "H5Z: filter statistics "
-                            "accumulated over life of library:\n");
-                    HDfprintf (H5DEBUG(Z),
-                            "   %-16s %10s %10s %8s %8s %8s %10s\n",
-                            "Filter", "Total", "Errors", "User",
-                            "System", "Elapsed", "Bandwidth");
-                    HDfprintf (H5DEBUG(Z),
-                            "   %-16s %10s %10s %8s %8s %8s %10s\n",
-                            "------", "-----", "------", "----",
-                            "------", "-------", "---------");
-                }
-
-                /* Truncate the comment to fit in the field */
-                HDstrncpy (comment, H5Z_table_g[i].name, sizeof comment);
-                comment[sizeof(comment)-1] = '\0';
-
-                /*
-                * Format bandwidth to have four significant digits and
-                * units of `B/s', `kB/s', `MB/s', `GB/s', or `TB/s' or
-                * the word `Inf' if the elapsed time is zero.
-                */
-                H5_bandwidth (bandwidth,
-                        (double)(H5Z_stat_table_g[i].stats[dir].total),
-                        H5Z_stat_table_g[i].stats[dir].timer.etime);
-
-                /* Print the statistics */
-                HDfprintf (H5DEBUG(Z),
-                        "   %s%-15s %10Hd %10Hd %8.2f %8.2f %8.2f "
-                        "%10s\n", dir?"<":">", comment,
-                        H5Z_stat_table_g[i].stats[dir].total,
-                        H5Z_stat_table_g[i].stats[dir].errors,
-                        H5Z_stat_table_g[i].stats[dir].timer.utime,
-                        H5Z_stat_table_g[i].stats[dir].timer.stime,
-                        H5Z_stat_table_g[i].stats[dir].timer.etime,
-                        bandwidth);
+        if (H5DEBUG(Z)) {
+            for (i = 0; i < H5Z_table_used_g; i++) {
+                for (dir = 0; dir < 2; dir++) {
+                    if (0 == H5Z_stat_table_g[i].stats[dir].total)
+                        continue;
+
+                    if (0 == nprint++) {
+                        /* Print column headers */
+                        HDfprintf(H5DEBUG(Z), "H5Z: filter statistics "
+                                              "accumulated over life of library:\n");
+                        HDfprintf(H5DEBUG(Z), "   %-16s %10s %10s %8s %8s %8s %10s\n", "Filter", "Total",
+                                  "Errors", "User", "System", "Elapsed", "Bandwidth");
+                        HDfprintf(H5DEBUG(Z), "   %-16s %10s %10s %8s %8s %8s %10s\n", "------", "-----",
+                                  "------", "----", "------", "-------", "---------");
+                    }
+
+                    /* Truncate the comment to fit in the field */
+                    HDstrncpy(comment, H5Z_table_g[i].name, sizeof comment);
+                    comment[sizeof(comment) - 1] = '\0';
+
+                    /*
+                     * Format bandwidth to have four significant digits and
+                     * units of `B/s', `kB/s', `MB/s', `GB/s', or `TB/s' or
+                     * the word `Inf' if the elapsed time is zero.
+                     */
+                    H5_bandwidth(bandwidth, (double)(H5Z_stat_table_g[i].stats[dir].total),
+                                 H5Z_stat_table_g[i].stats[dir].timer.etime);
+
+                    /* Print the statistics */
+                    HDfprintf(H5DEBUG(Z),
+                              "   %s%-15s %10Hd %10Hd %8.2f %8.2f %8.2f "
+                              "%10s\n",
+                              dir ? "<" : ">", comment, H5Z_stat_table_g[i].stats[dir].total,
+                              H5Z_stat_table_g[i].stats[dir].errors,
+                              H5Z_stat_table_g[i].stats[dir].timer.utime,
+                              H5Z_stat_table_g[i].stats[dir].timer.stime,
+                              H5Z_stat_table_g[i].stats[dir].timer.etime, bandwidth);
                 }
             }
         }
@@ -184,13 +176,12 @@ H5Z_term_interface(void)
         H5Z_stat_table_g = (H5Z_stats_t *)H5MM_xfree(H5Z_stat_table_g);
 #endif /* H5Z_DEBUG */
         H5Z_table_used_g = H5Z_table_alloc_g = 0;
-        H5_interface_initialize_g = 0;
+        H5_interface_initialize_g            = 0;
     } /* end if */
 
-    return(0);
+    return (0);
 } /* end H5Z_term_interface() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Zregister
  *
@@ -202,15 +193,15 @@ H5Z_term_interface(void)
 herr_t
 H5Zregister(const void *cls)
 {
-    const H5Z_class2_t  *cls_real = (const H5Z_class2_t *) cls; /* "Real" class pointer */
-    H5Z_class2_t        cls_new;                  /* Translated class struct */
-    herr_t              ret_value = SUCCEED;      /* Return value */
+    const H5Z_class2_t *cls_real = (const H5Z_class2_t *)cls; /* "Real" class pointer */
+    H5Z_class2_t        cls_new;                              /* Translated class struct */
+    herr_t              ret_value = SUCCEED;                  /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "*x", cls);
 
     /* Check args */
-    if (cls_real==NULL)
+    if (cls_real == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter class")
 
     /* Check H5Z_class_t version number; this is where a function to convert
@@ -226,26 +217,26 @@ H5Zregister(const void *cls)
     if (cls_real->version != H5Z_CLASS_T_VERS) {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
         /* Assume it is an old "H5Z_class1_t" instead */
-        const H5Z_class1_t *cls_old = (const H5Z_class1_t *) cls;
+        const H5Z_class1_t *cls_old = (const H5Z_class1_t *)cls;
 
         /* Translate to new H5Z_class2_t */
-        cls_new.version = H5Z_CLASS_T_VERS;
-        cls_new.id = cls_old->id;
+        cls_new.version         = H5Z_CLASS_T_VERS;
+        cls_new.id              = cls_old->id;
         cls_new.encoder_present = 1;
         cls_new.decoder_present = 1;
-        cls_new.name = cls_old->name;
-        cls_new.can_apply = cls_old->can_apply;
-        cls_new.set_local = cls_old->set_local;
-        cls_new.filter = cls_old->filter;
+        cls_new.name            = cls_old->name;
+        cls_new.can_apply       = cls_old->can_apply;
+        cls_new.set_local       = cls_old->set_local;
+        cls_new.filter          = cls_old->filter;
 
         /* Set cls_real to point to the translated structure */
         cls_real = &cls_new;
 
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else  /* H5_NO_DEPRECATED_SYMBOLS */
         /* Deprecated symbols not allowed, throw an error */
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid H5Z_class_t version number");
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-    } /* end if */
+    }  /* end if */
 
     if (cls_real->id < 0 || cls_real->id > H5Z_FILTER_MAX)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identification number")
@@ -255,14 +246,13 @@ H5Zregister(const void *cls)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no filter function specified")
 
     /* Do it */
-    if (H5Z_register (cls_real) < 0)
+    if (H5Z_register(cls_real) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter")
 
 done:
     FUNC_LEAVE_API(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_register
  *
@@ -274,15 +264,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Z_register (const H5Z_class2_t *cls)
+H5Z_register(const H5Z_class2_t *cls)
 {
-    size_t    i;
-    herr_t    ret_value = SUCCEED;       /* Return value */
+    size_t i;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert (cls);
-    HDassert (cls->id >= 0 && cls->id <= H5Z_FILTER_MAX);
+    HDassert(cls);
+    HDassert(cls->id >= 0 && cls->id <= H5Z_FILTER_MAX);
 
     /* Is the filter already registered? */
     for (i = 0; i < H5Z_table_used_g; i++)
@@ -292,13 +282,13 @@ H5Z_register (const H5Z_class2_t *cls)
     /* Filter not already registered */
     if (i >= H5Z_table_used_g) {
         if (H5Z_table_used_g >= H5Z_table_alloc_g) {
-            size_t n = MAX(H5Z_MAX_NFILTERS, 2 * H5Z_table_alloc_g);
+            size_t        n     = MAX(H5Z_MAX_NFILTERS, 2 * H5Z_table_alloc_g);
             H5Z_class2_t *table = (H5Z_class2_t *)H5MM_realloc(H5Z_table_g, n * sizeof(H5Z_class2_t));
 #ifdef H5Z_DEBUG
             H5Z_stats_t *stat_table = (H5Z_stats_t *)H5MM_realloc(H5Z_stat_table_g, n * sizeof(H5Z_stats_t));
 #endif /* H5Z_DEBUG */
             if (!table)
-                HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to extend filter table")
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to extend filter table")
             H5Z_table_g = table;
 #ifdef H5Z_DEBUG
             if (!stat_table)
@@ -310,22 +300,21 @@ H5Z_register (const H5Z_class2_t *cls)
 
         /* Initialize */
         i = H5Z_table_used_g++;
-        HDmemcpy (H5Z_table_g+i, cls, sizeof(H5Z_class2_t));
+        HDmemcpy(H5Z_table_g + i, cls, sizeof(H5Z_class2_t));
 #ifdef H5Z_DEBUG
-        HDmemset (H5Z_stat_table_g+i, 0, sizeof(H5Z_stats_t));
+        HDmemset(H5Z_stat_table_g + i, 0, sizeof(H5Z_stats_t));
 #endif /* H5Z_DEBUG */
-    } /* end if */
+    }  /* end if */
     /* Filter already registered */
     else {
         /* Replace old contents */
-        HDmemcpy (H5Z_table_g+i, cls, sizeof(H5Z_class2_t));
+        HDmemcpy(H5Z_table_g + i, cls, sizeof(H5Z_class2_t));
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Zunregister
  *
@@ -338,7 +327,7 @@ done:
 herr_t
 H5Zunregister(H5Z_filter_t id)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "Zf", id);
@@ -357,7 +346,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Zunregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_unregister
  *
@@ -371,13 +359,13 @@ done:
 herr_t
 H5Z_unregister(H5Z_filter_t filter_id)
 {
-    size_t       filter_index;          /* Local index variable for filter */
+    size_t       filter_index; /* Local index variable for filter */
     H5Z_object_t object;
-    herr_t       ret_value = SUCCEED;   /* Return value */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert(filter_id>=0 && filter_id<=H5Z_FILTER_MAX);
+    HDassert(filter_id >= 0 && filter_id <= H5Z_FILTER_MAX);
 
     /* Is the filter already registered? */
     for (filter_index = 0; filter_index < H5Z_table_used_g; filter_index++)
@@ -390,21 +378,23 @@ H5Z_unregister(H5Z_filter_t filter_id)
 
     /* Initialize the structure object for iteration */
     object.filter_id = filter_id;
-    object.found = FALSE;
+    object.found     = FALSE;
 
     /* Iterate through all opened datasets, returns a failure if any of them uses the filter */
     if (H5I_iterate(H5I_DATASET, H5Z__check_unregister_dset_cb, &object, FALSE) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_BADITER, FAIL, "iteration failed")
 
     if (object.found)
-        HGOTO_ERROR(H5E_PLINE, H5E_CANTRELEASE, FAIL, "can't unregister filter because a dataset is still using it")
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTRELEASE, FAIL,
+                    "can't unregister filter because a dataset is still using it")
 
     /* Iterate through all opened groups, returns a failure if any of them uses the filter */
     if (H5I_iterate(H5I_GROUP, H5Z__check_unregister_group_cb, &object, FALSE) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_BADITER, FAIL, "iteration failed")
 
     if (object.found)
-        HGOTO_ERROR(H5E_PLINE, H5E_CANTRELEASE, FAIL, "can't unregister filter because a group is still using it")
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTRELEASE, FAIL,
+                    "can't unregister filter because a group is still using it")
 
     /* Iterate through all opened files and flush them */
     if (H5I_iterate(H5I_FILE, H5Z__flush_file_cb, NULL, FALSE) < 0)
@@ -412,9 +402,11 @@ H5Z_unregister(H5Z_filter_t filter_id)
 
     /* Remove filter from table */
     /* Don't worry about shrinking table size (for now) */
-    HDmemmove (&H5Z_table_g[filter_index], &H5Z_table_g[filter_index+1], sizeof(H5Z_class2_t)*((H5Z_table_used_g-1)-filter_index));
+    HDmemmove(&H5Z_table_g[filter_index], &H5Z_table_g[filter_index + 1],
+              sizeof(H5Z_class2_t) * ((H5Z_table_used_g - 1) - filter_index));
 #ifdef H5Z_DEBUG
-    HDmemmove (&H5Z_stat_table_g[filter_index], &H5Z_stat_table_g[filter_index+1], sizeof(H5Z_stats_t)*((H5Z_table_used_g-1)-filter_index));
+    HDmemmove(&H5Z_stat_table_g[filter_index], &H5Z_stat_table_g[filter_index + 1],
+              sizeof(H5Z_stats_t) * ((H5Z_table_used_g - 1) - filter_index));
 #endif /* H5Z_DEBUG */
     H5Z_table_used_g--;
 
@@ -422,7 +414,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_unregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z__check_unregister
  *
@@ -435,8 +426,8 @@ done:
 static htri_t
 H5Z__check_unregister(hid_t ocpl_id, H5Z_filter_t filter_id)
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    htri_t          ret_value = FALSE;      /* Return value */
+    H5P_genplist_t *plist;             /* Property list */
+    htri_t          ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -452,14 +443,13 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z__check_unregister() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z__check_unregister_group_cb
  *
- * Purpose:	The callback function for H5Z_unregister. It iterates 
+ * Purpose:	The callback function for H5Z_unregister. It iterates
  *              through all opened objects.  If the object is a dataset
- *              or a group and it uses the filter to be unregistered, the 
- *              function returns TRUE. 
+ *              or a group and it uses the filter to be unregistered, the
+ *              function returns TRUE.
  *
  * Return:      TRUE if the object uses the filter.
  *              FALSE otherwise.
@@ -472,47 +462,46 @@ done:
 static int
 H5Z__check_unregister_group_cb(void *obj_ptr, hid_t H5_ATTR_UNUSED obj_id, void *key)
 {
-    hid_t           ocpl_id = -1;
-    H5Z_object_t    *object = (H5Z_object_t *)key;
-    htri_t          filter_in_pline = FALSE;
-    int             ret_value = FALSE;    /* Return value */
+    hid_t         ocpl_id         = -1;
+    H5Z_object_t *object          = (H5Z_object_t *)key;
+    htri_t        filter_in_pline = FALSE;
+    int           ret_value       = FALSE; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(obj_ptr);
 
     /* Get the group creation property */
-    if((ocpl_id = H5G_get_create_plist((H5G_t *)obj_ptr)) < 0) 
+    if ((ocpl_id = H5G_get_create_plist((H5G_t *)obj_ptr)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get group creation property list")
 
     /* Check if the filter is in the group creation property list */
-    if((filter_in_pline = H5Z__check_unregister(ocpl_id, object->filter_id)) < 0)
+    if ((filter_in_pline = H5Z__check_unregister(ocpl_id, object->filter_id)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't check filter in pipeline")
 
     /* H5I_iterate expects TRUE to stop the loop over objects. Stop the loop and
      * let H5Z_unregister return failure.
-     */ 
-    if(filter_in_pline) {
+     */
+    if (filter_in_pline) {
         object->found = TRUE;
-        ret_value = TRUE;
+        ret_value     = TRUE;
     } /* end if */
 
 done:
-    if(ocpl_id > 0)
-        if(H5I_dec_app_ref(ocpl_id) < 0)
+    if (ocpl_id > 0)
+        if (H5I_dec_app_ref(ocpl_id) < 0)
             HDONE_ERROR(H5E_PLINE, H5E_CANTDEC, FAIL, "can't release plist")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z__check_unregister_group_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z__check_unregister_dset_cb
  *
- * Purpose:	The callback function for H5Z_unregister. It iterates 
+ * Purpose:	The callback function for H5Z_unregister. It iterates
  *              through all opened objects.  If the object is a dataset
- *              or a group and it uses the filter to be unregistered, the 
- *              function returns TRUE. 
+ *              or a group and it uses the filter to be unregistered, the
+ *              function returns TRUE.
  *
  * Return:      TRUE if the object uses the filter.
  *              FALSE otherwise.
@@ -525,45 +514,44 @@ done:
 static int
 H5Z__check_unregister_dset_cb(void *obj_ptr, hid_t H5_ATTR_UNUSED obj_id, void *key)
 {
-    hid_t           ocpl_id = -1;
-    H5Z_object_t    *object = (H5Z_object_t *)key;
-    htri_t          filter_in_pline = FALSE;
-    int             ret_value = FALSE;    /* Return value */
+    hid_t         ocpl_id         = -1;
+    H5Z_object_t *object          = (H5Z_object_t *)key;
+    htri_t        filter_in_pline = FALSE;
+    int           ret_value       = FALSE; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(obj_ptr);
 
     /* Get the dataset creation property */
-    if((ocpl_id = H5D_get_create_plist((H5D_t *)obj_ptr)) < 0) 
+    if ((ocpl_id = H5D_get_create_plist((H5D_t *)obj_ptr)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get dataset creation property list")
 
     /* Check if the filter is in the dataset creation property list */
-    if((filter_in_pline = H5Z__check_unregister(ocpl_id, object->filter_id)) < 0)
+    if ((filter_in_pline = H5Z__check_unregister(ocpl_id, object->filter_id)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't check filter in pipeline")
 
     /* H5I_iterate expects TRUE to stop the loop over objects. Stop the loop and
      * let H5Z_unregister return failure.
-     */ 
-    if(filter_in_pline) {
+     */
+    if (filter_in_pline) {
         object->found = TRUE;
-        ret_value = TRUE;
+        ret_value     = TRUE;
     } /* end if */
 
 done:
-    if(ocpl_id > 0)
-        if(H5I_dec_app_ref(ocpl_id) < 0)
+    if (ocpl_id > 0)
+        if (H5I_dec_app_ref(ocpl_id) < 0)
             HDONE_ERROR(H5E_PLINE, H5E_CANTDEC, FAIL, "can't release plist")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z__check_unregister_dset_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z__flush_file_cb
  *
- * Purpose:	The callback function for H5Z_unregister. It iterates 
- *              through all opened files and flush them. 
+ * Purpose:	The callback function for H5Z_unregister. It iterates
+ *              through all opened files and flush them.
  *
  * Return:      FALSE if finishes flushing and moves on
  *              FAIL if there is an error
@@ -576,16 +564,16 @@ done:
 static int
 H5Z__flush_file_cb(void *obj_ptr, hid_t H5_ATTR_UNUSED obj_id, void H5_ATTR_UNUSED *key)
 {
-    int             ret_value = FALSE;    /* Return value */
+    int ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(obj_ptr);
 
-    /* Call the flush routine for mounted file hierarchies. Do a global flush 
+    /* Call the flush routine for mounted file hierarchies. Do a global flush
      * if the file is opened for write */
-    if(H5F_ACC_RDWR & H5F_INTENT((H5F_t *)obj_ptr)) {
-        if(H5F_flush_mounts((H5F_t *)obj_ptr, H5AC_dxpl_id) < 0)
+    if (H5F_ACC_RDWR & H5F_INTENT((H5F_t *)obj_ptr)) {
+        if (H5F_flush_mounts((H5F_t *)obj_ptr, H5AC_dxpl_id) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTFLUSH, FAIL, "unable to flush file hierarchy")
     } /* end if */
 
@@ -593,7 +581,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z__flush_file_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Zfilter_avail
  *
@@ -611,23 +598,22 @@ done:
 htri_t
 H5Zfilter_avail(H5Z_filter_t id)
 {
-    htri_t ret_value=FALSE;     /* Return value */
+    htri_t ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "Zf", id);
 
     /* Check args */
-    if(id<0 || id>H5Z_FILTER_MAX)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identification number")
+    if (id < 0 || id > H5Z_FILTER_MAX)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identification number")
 
-    if((ret_value = H5Z_filter_avail(id)) < 0)
+    if ((ret_value = H5Z_filter_avail(id)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "unable to check the availability of the filter")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Zfilter_avail() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_avail
  *
@@ -643,15 +629,15 @@ done:
 htri_t
 H5Z_filter_avail(H5Z_filter_t id)
 {
-    size_t i;                   /* Local index variable */
+    size_t              i; /* Local index variable */
     const H5Z_class2_t *filter_info;
-    htri_t ret_value = FALSE;   /* Return value */
+    htri_t              ret_value = FALSE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Is the filter already registered? */
-    for(i = 0; i < H5Z_table_used_g; i++)
-        if(H5Z_table_g[i].id == id)
+    for (i = 0; i < H5Z_table_used_g; i++)
+        if (H5Z_table_g[i].id == id)
             HGOTO_DONE(TRUE)
 
     if (NULL != (filter_info = (const H5Z_class2_t *)H5PL_load(H5PL_TYPE_FILTER, (int)id))) {
@@ -663,7 +649,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_filter_avail() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_prelude_callback
  *
@@ -683,57 +668,57 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5Z_prelude_callback(const H5O_pline_t *pline, hid_t dcpl_id, hid_t type_id,
-    hid_t space_id, H5Z_prelude_type_t prelude_type)
+H5Z_prelude_callback(const H5O_pline_t *pline, hid_t dcpl_id, hid_t type_id, hid_t space_id,
+                     H5Z_prelude_type_t prelude_type)
 {
-    H5Z_class2_t    *fclass;                /* Individual filter information */
-    size_t          u;                      /* Local index variable */
-    htri_t          ret_value = TRUE;    /* Return value */
+    H5Z_class2_t *fclass;           /* Individual filter information */
+    size_t        u;                /* Local index variable */
+    htri_t        ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(pline->nused > 0);
 
     /* Iterate over filters */
-    for(u = 0; u < pline->nused; u++) {
+    for (u = 0; u < pline->nused; u++) {
         /* Get filter information */
-        if(NULL == (fclass = H5Z_find(pline->filter[u].id))) {
+        if (NULL == (fclass = H5Z_find(pline->filter[u].id))) {
             /* Ignore errors from optional filters */
-            if(pline->filter[u].flags & H5Z_FLAG_OPTIONAL)
+            if (pline->filter[u].flags & H5Z_FLAG_OPTIONAL)
                 H5E_clear_stack(NULL);
             else
                 HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "required filter was not located")
         } /* end if */
         else {
             /* Make correct callback */
-            switch(prelude_type) {
+            switch (prelude_type) {
                 case H5Z_PRELUDE_CAN_APPLY:
                     /* Check if filter is configured to be able to encode */
-                    if(!fclass->encoder_present)
-                        HGOTO_ERROR(H5E_PLINE, H5E_NOENCODER, FAIL, "Filter present but encoding is disabled.");
-
+                    if (!fclass->encoder_present)
+                        HGOTO_ERROR(H5E_PLINE, H5E_NOENCODER, FAIL,
+                                    "Filter present but encoding is disabled.");
 
                     /* Check if there is a "can apply" callback */
-                    if(fclass->can_apply) {
+                    if (fclass->can_apply) {
                         /* Make callback to filter's "can apply" function */
                         htri_t status = (fclass->can_apply)(dcpl_id, type_id, space_id);
 
                         /* Indicate error during filter callback */
-                        if(status < 0)
+                        if (status < 0)
                             HGOTO_ERROR(H5E_PLINE, H5E_CANAPPLY, FAIL, "error during user callback")
 
-                        /* Indicate filter can't apply to this combination of parameters.  
+                        /* Indicate filter can't apply to this combination of parameters.
                          * If the filter is NOT optional, returns failure. */
-                        if(status == FALSE && !(pline->filter[u].flags & H5Z_FLAG_OPTIONAL))
+                        if (status == FALSE && !(pline->filter[u].flags & H5Z_FLAG_OPTIONAL))
                             HGOTO_ERROR(H5E_PLINE, H5E_CANAPPLY, FAIL, "filter parameters not appropriate")
                     } /* end if */
                     break;
 
                 case H5Z_PRELUDE_SET_LOCAL:
                     /* Check if there is a "set local" callback */
-                    if(fclass->set_local) {
+                    if (fclass->set_local) {
                         /* Make callback to filter's "set local" function */
-                        if((fclass->set_local)(dcpl_id, type_id, space_id) < 0)
+                        if ((fclass->set_local)(dcpl_id, type_id, space_id) < 0)
                             /* Indicate error during filter callback */
                             HGOTO_ERROR(H5E_PLINE, H5E_SETLOCAL, FAIL, "error during user callback")
                     } /* end if */
@@ -742,15 +727,14 @@ H5Z_prelude_callback(const H5O_pline_t *pline, hid_t dcpl_id, hid_t type_id,
                 default:
                     HDassert("invalid prelude type" && 0);
             } /* end switch */
-        } /* end else */
-    } /* end for */
+        }     /* end else */
+    }         /* end for */
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_prelude_callback() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_prepare_prelude_callback_dcpl
  *
@@ -772,8 +756,8 @@ done:
 static herr_t
 H5Z_prepare_prelude_callback_dcpl(hid_t dcpl_id, hid_t type_id, H5Z_prelude_type_t prelude_type)
 {
-    hid_t space_id = -1;            /* ID for dataspace describing chunk */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    hid_t  space_id  = -1;      /* ID for dataspace describing chunk */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -781,59 +765,58 @@ H5Z_prepare_prelude_callback_dcpl(hid_t dcpl_id, hid_t type_id, H5Z_prelude_type
     HDassert(H5I_DATATYPE == H5I_get_type(type_id));
 
     /* Check if the property list is non-default */
-    if(dcpl_id != H5P_DATASET_CREATE_DEFAULT) {
-        H5P_genplist_t 	*dc_plist;      /* Dataset creation property list object */
-        H5O_layout_t    dcpl_layout;    /* Dataset's layout information */
+    if (dcpl_id != H5P_DATASET_CREATE_DEFAULT) {
+        H5P_genplist_t *dc_plist;    /* Dataset creation property list object */
+        H5O_layout_t    dcpl_layout; /* Dataset's layout information */
 
         /* Get dataset creation property list object */
-        if(NULL == (dc_plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
+        if (NULL == (dc_plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get dataset creation property list")
 
         /* Get layout information */
-        if(H5P_get(dc_plist, H5D_CRT_LAYOUT_NAME, &dcpl_layout) < 0)
+        if (H5P_get(dc_plist, H5D_CRT_LAYOUT_NAME, &dcpl_layout) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve layout")
 
         /* Check if the dataset is chunked */
-        if(H5D_CHUNKED == dcpl_layout.type) {
-            H5O_pline_t     dcpl_pline;     /* Object's I/O pipeline information */
+        if (H5D_CHUNKED == dcpl_layout.type) {
+            H5O_pline_t dcpl_pline; /* Object's I/O pipeline information */
 
             /* Get I/O pipeline information */
-            if(H5P_get(dc_plist, H5O_CRT_PIPELINE_NAME, &dcpl_pline) < 0)
+            if (H5P_get(dc_plist, H5O_CRT_PIPELINE_NAME, &dcpl_pline) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve pipeline filter")
 
             /* Check if the chunks have filters */
-            if(dcpl_pline.nused > 0) {
-                hsize_t chunk_dims[H5O_LAYOUT_NDIMS];      /* Size of chunk dimensions */
-                H5S_t *space;           /* Dataspace describing chunk */
-                size_t u;               /* Local index variable */
+            if (dcpl_pline.nused > 0) {
+                hsize_t chunk_dims[H5O_LAYOUT_NDIMS]; /* Size of chunk dimensions */
+                H5S_t * space;                        /* Dataspace describing chunk */
+                size_t  u;                            /* Local index variable */
 
                 /* Create a dataspace for a chunk & set the extent */
-                for(u = 0; u < dcpl_layout.u.chunk.ndims; u++)
+                for (u = 0; u < dcpl_layout.u.chunk.ndims; u++)
                     chunk_dims[u] = dcpl_layout.u.chunk.dim[u];
-                if(NULL == (space = H5S_create_simple(dcpl_layout.u.chunk.ndims, chunk_dims, NULL)))
+                if (NULL == (space = H5S_create_simple(dcpl_layout.u.chunk.ndims, chunk_dims, NULL)))
                     HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create simple dataspace")
 
                 /* Get ID for dataspace to pass to filter routines */
-                if((space_id = H5I_register(H5I_DATASPACE, space, FALSE)) < 0) {
+                if ((space_id = H5I_register(H5I_DATASPACE, space, FALSE)) < 0) {
                     (void)H5S_close(space);
                     HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace ID")
                 } /* end if */
 
                 /* Make the callbacks */
-                if(H5Z_prelude_callback(&dcpl_pline, dcpl_id, type_id, space_id, prelude_type) < 0)
+                if (H5Z_prelude_callback(&dcpl_pline, dcpl_id, type_id, space_id, prelude_type) < 0)
                     HGOTO_ERROR(H5E_PLINE, H5E_CANAPPLY, FAIL, "unable to apply filter")
             } /* end if */
-        } /* end if */
-    } /* end if */
+        }     /* end if */
+    }         /* end if */
 
 done:
-    if(space_id > 0 && H5I_dec_ref(space_id) < 0)
+    if (space_id > 0 && H5I_dec_ref(space_id) < 0)
         HDONE_ERROR(H5E_PLINE, H5E_CANTRELEASE, FAIL, "unable to close dataspace")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_prepare_prelude_callback_dcpl() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_can_apply
  *
@@ -856,19 +839,18 @@ done:
 herr_t
 H5Z_can_apply(hid_t dcpl_id, hid_t type_id)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Make "can apply" callbacks for filters in pipeline */
-    if(H5Z_prepare_prelude_callback_dcpl(dcpl_id, type_id, H5Z_PRELUDE_CAN_APPLY) < 0)
+    if (H5Z_prepare_prelude_callback_dcpl(dcpl_id, type_id, H5Z_PRELUDE_CAN_APPLY) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANAPPLY, FAIL, "unable to apply filter")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_can_apply() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_set_local
  *
@@ -891,19 +873,18 @@ done:
 herr_t
 H5Z_set_local(hid_t dcpl_id, hid_t type_id)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Make "set local" callbacks for filters in pipeline */
-    if(H5Z_prepare_prelude_callback_dcpl(dcpl_id, type_id, H5Z_PRELUDE_SET_LOCAL) < 0)
+    if (H5Z_prepare_prelude_callback_dcpl(dcpl_id, type_id, H5Z_PRELUDE_SET_LOCAL) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_SETLOCAL, FAIL, "local filter parameters not set")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_local() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_can_apply_direct
  *
@@ -921,21 +902,20 @@ done:
 herr_t
 H5Z_can_apply_direct(const H5O_pline_t *pline)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(pline->nused > 0);
 
     /* Make "can apply" callbacks for filters in pipeline */
-    if(H5Z_prelude_callback(pline, (hid_t)-1, (hid_t)-1, (hid_t)-1, H5Z_PRELUDE_CAN_APPLY) < 0)
+    if (H5Z_prelude_callback(pline, (hid_t)-1, (hid_t)-1, (hid_t)-1, H5Z_PRELUDE_CAN_APPLY) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANAPPLY, FAIL, "unable to apply filter")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_can_apply_direct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_set_local_direct
  *
@@ -958,21 +938,20 @@ done:
 herr_t
 H5Z_set_local_direct(const H5O_pline_t *pline)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(pline->nused > 0);
 
     /* Make "set local" callbacks for filters in pipeline */
-    if(H5Z_prelude_callback(pline, (hid_t)-1, (hid_t)-1, (hid_t)-1, H5Z_PRELUDE_SET_LOCAL) < 0)
+    if (H5Z_prelude_callback(pline, (hid_t)-1, (hid_t)-1, (hid_t)-1, H5Z_PRELUDE_SET_LOCAL) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_SETLOCAL, FAIL, "local filter parameters not set")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_local_direct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_modify
  *
@@ -988,11 +967,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Z_modify(const H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
-	   size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/])
+H5Z_modify(const H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags, size_t cd_nelmts,
+           const unsigned int cd_values[/*cd_nelmts*/])
 {
-    size_t	idx;                    /* Index of filter in pipeline */
-    herr_t      ret_value = SUCCEED;      /* Return value */
+    size_t idx;                 /* Index of filter in pipeline */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1002,47 +981,46 @@ H5Z_modify(const H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
     HDassert(0 == cd_nelmts || cd_values);
 
     /* Locate the filter in the pipeline */
-    for(idx = 0; idx < pline->nused; idx++)
-        if(pline->filter[idx].id == filter)
+    for (idx = 0; idx < pline->nused; idx++)
+        if (pline->filter[idx].id == filter)
             break;
 
     /* Check if the filter was not already in the pipeline */
-    if(idx > pline->nused)
-	HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "filter not in pipeline")
+    if (idx > pline->nused)
+        HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "filter not in pipeline")
 
     /* Change parameters for filter */
-    pline->filter[idx].flags = flags;
+    pline->filter[idx].flags     = flags;
     pline->filter[idx].cd_nelmts = cd_nelmts;
 
     /* Free any existing parameters */
-    if(pline->filter[idx].cd_values != NULL && pline->filter[idx].cd_values != pline->filter[idx]._cd_values)
-	H5MM_xfree(pline->filter[idx].cd_values);
+    if (pline->filter[idx].cd_values != NULL && pline->filter[idx].cd_values != pline->filter[idx]._cd_values)
+        H5MM_xfree(pline->filter[idx].cd_values);
 
     /* Set parameters */
-    if(cd_nelmts > 0) {
-        size_t	i;                      /* Local index variable */
+    if (cd_nelmts > 0) {
+        size_t i; /* Local index variable */
 
         /* Allocate memory or point at internal buffer */
-        if(cd_nelmts > H5Z_COMMON_CD_VALUES) {
+        if (cd_nelmts > H5Z_COMMON_CD_VALUES) {
             pline->filter[idx].cd_values = (unsigned *)H5MM_malloc(cd_nelmts * sizeof(unsigned));
-            if(NULL == pline->filter[idx].cd_values)
+            if (NULL == pline->filter[idx].cd_values)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for filter parameters")
         } /* end if */
         else
             pline->filter[idx].cd_values = pline->filter[idx]._cd_values;
 
         /* Copy client data values */
-	for(i = 0; i < cd_nelmts; i++)
-	    pline->filter[idx].cd_values[i] = cd_values[i];
+        for (i = 0; i < cd_nelmts; i++)
+            pline->filter[idx].cd_values[i] = cd_values[i];
     } /* end if */
     else
-       pline->filter[idx].cd_values = NULL;
+        pline->filter[idx].cd_values = NULL;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_modify() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_append
  *
@@ -1058,11 +1036,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
-	   size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/])
+H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags, size_t cd_nelmts,
+           const unsigned int cd_values[/*cd_nelmts*/])
 {
-    size_t	idx;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    size_t idx;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1075,17 +1053,17 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
      * Check filter limit.  We do it here for early warnings although we may
      * decide to relax this restriction in the future.
      */
-    if(pline->nused >= H5Z_MAX_NFILTERS)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "too many filters in pipeline")
+    if (pline->nused >= H5Z_MAX_NFILTERS)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "too many filters in pipeline")
 
     /* Check for freshly allocated filter pipeline */
-    if(pline->version == 0)
+    if (pline->version == 0)
         pline->version = H5O_PLINE_VERSION_1;
 
     /* Allocate additional space in the pipeline if it's full */
-    if(pline->nused >= pline->nalloc) {
-	H5O_pline_t x;
-        size_t n;
+    if (pline->nused >= pline->nalloc) {
+        H5O_pline_t x;
+        size_t      n;
 
         /* Each filter's data may be stored internally or may be
          * a separate block of memory.
@@ -1094,51 +1072,51 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
          * filter struct is reallocated.  Set these pointers to ~NULL
          * so that we can reset them after reallocating the filters array.
          */
-        for(n = 0; n < pline->nalloc; ++n)
-            if(pline->filter[n].cd_values == pline->filter[n]._cd_values)
-                pline->filter[n].cd_values = (unsigned *)((void *) ~((size_t)NULL));
+        for (n = 0; n < pline->nalloc; ++n)
+            if (pline->filter[n].cd_values == pline->filter[n]._cd_values)
+                pline->filter[n].cd_values = (unsigned *)((void *)~((size_t)NULL));
 
-	x.nalloc = MAX(H5Z_MAX_NFILTERS, 2 * pline->nalloc);
-	x.filter = (H5Z_filter_info_t *)H5MM_realloc(pline->filter, x.nalloc * sizeof(x.filter[0]));
-	if(NULL == x.filter)
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for filter pipeline")
+        x.nalloc = MAX(H5Z_MAX_NFILTERS, 2 * pline->nalloc);
+        x.filter = (H5Z_filter_info_t *)H5MM_realloc(pline->filter, x.nalloc * sizeof(x.filter[0]));
+        if (NULL == x.filter)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for filter pipeline")
 
         /* Fix pointers in previous filters that need to point to their own
          *      internal data.
          */
-        for(n = 0; n < pline->nalloc; ++n)
-            if(x.filter[n].cd_values == (void *) ~((size_t) NULL))
+        for (n = 0; n < pline->nalloc; ++n)
+            if (x.filter[n].cd_values == (void *)~((size_t)NULL))
                 x.filter[n].cd_values = x.filter[n]._cd_values;
 
         /* Point to newly allocated buffer */
-	pline->nalloc = x.nalloc;
-	pline->filter = x.filter;
+        pline->nalloc = x.nalloc;
+        pline->filter = x.filter;
     } /* end if */
 
     /* Add the new filter to the pipeline */
-    idx = pline->nused;
-    pline->filter[idx].id = filter;
-    pline->filter[idx].flags = flags;
-    pline->filter[idx].name = NULL; /*we'll pick it up later*/
+    idx                          = pline->nused;
+    pline->filter[idx].id        = filter;
+    pline->filter[idx].flags     = flags;
+    pline->filter[idx].name      = NULL; /*we'll pick it up later*/
     pline->filter[idx].cd_nelmts = cd_nelmts;
-    if(cd_nelmts > 0) {
-        size_t	i;                      /* Local index variable */
+    if (cd_nelmts > 0) {
+        size_t i; /* Local index variable */
 
         /* Allocate memory or point at internal buffer */
-        if(cd_nelmts > H5Z_COMMON_CD_VALUES) {
+        if (cd_nelmts > H5Z_COMMON_CD_VALUES) {
             pline->filter[idx].cd_values = (unsigned *)H5MM_malloc(cd_nelmts * sizeof(unsigned));
-            if(NULL == pline->filter[idx].cd_values)
+            if (NULL == pline->filter[idx].cd_values)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for filter")
         } /* end if */
         else
             pline->filter[idx].cd_values = pline->filter[idx]._cd_values;
 
         /* Copy client data values */
-	for(i = 0; i < cd_nelmts; i++)
-	    pline->filter[idx].cd_values[i] = cd_values[i];
+        for (i = 0; i < cd_nelmts; i++)
+            pline->filter[idx].cd_values[i] = cd_values[i];
     } /* end if */
     else
-       pline->filter[idx].cd_values = NULL;
+        pline->filter[idx].cd_values = NULL;
 
     pline->nused++;
 
@@ -1146,7 +1124,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_append() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_find_idx
  *
@@ -1166,20 +1143,19 @@ done:
 static int
 H5Z_find_idx(H5Z_filter_t id)
 {
-    size_t i;                   /* Local index variable */
-    int ret_value=FAIL;         /* Return value */
+    size_t i;                /* Local index variable */
+    int    ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    for (i=0; i<H5Z_table_used_g; i++)
-	if (H5Z_table_g[i].id == id)
-	    HGOTO_DONE((int)i)
+    for (i = 0; i < H5Z_table_used_g; i++)
+        if (H5Z_table_g[i].id == id)
+            HGOTO_DONE((int)i)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_find_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_find
  *
@@ -1201,23 +1177,22 @@ done:
 H5Z_class2_t *
 H5Z_find(H5Z_filter_t id)
 {
-    int	idx;                            /* Filter index in global table */
-    H5Z_class2_t *ret_value=NULL;        /* Return value */
+    int           idx;              /* Filter index in global table */
+    H5Z_class2_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* Get the index in the global table */
-    if((idx=H5Z_find_idx(id))<0)
+    if ((idx = H5Z_find_idx(id)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, NULL, "required filter is not registered")
 
     /* Set return value */
-    ret_value=H5Z_table_g+idx;
+    ret_value = H5Z_table_g + idx;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5Z_find() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_pipeline
  *
@@ -1247,132 +1222,141 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
- 	     unsigned *filter_mask/*in,out*/, H5Z_EDC_t edc_read,
-             H5Z_cb_t cb_struct, size_t *nbytes/*in,out*/,
-             size_t *buf_size/*in,out*/, void **buf/*in,out*/)
+H5Z_pipeline(const H5O_pline_t *pline, unsigned flags, unsigned *filter_mask /*in,out*/, H5Z_EDC_t edc_read,
+             H5Z_cb_t cb_struct, size_t *nbytes /*in,out*/, size_t *buf_size /*in,out*/,
+             void **buf /*in,out*/)
 {
-    size_t	i, idx, new_nbytes;
-    int fclass_idx;             /* Index of filter class in global table */
-    H5Z_class2_t	*fclass=NULL;   /* Filter class pointer */
+    size_t        i, idx, new_nbytes;
+    int           fclass_idx;    /* Index of filter class in global table */
+    H5Z_class2_t *fclass = NULL; /* Filter class pointer */
 #ifdef H5Z_DEBUG
-    H5Z_stats_t	*fstats=NULL;   /* Filter stats pointer */
-    H5_timer_t	timer;
+    H5Z_stats_t *fstats = NULL; /* Filter stats pointer */
+    H5_timer_t   timer;
 #endif
-    unsigned	failed = 0;
-    unsigned	tmp_flags;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    unsigned failed = 0;
+    unsigned tmp_flags;
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert(0==(flags & ~((unsigned)H5Z_FLAG_INVMASK)));
+    HDassert(0 == (flags & ~((unsigned)H5Z_FLAG_INVMASK)));
     HDassert(filter_mask);
-    HDassert(nbytes && *nbytes>0);
-    HDassert(buf_size && *buf_size>0);
+    HDassert(nbytes && *nbytes > 0);
+    HDassert(buf_size && *buf_size > 0);
     HDassert(buf && *buf);
-    HDassert(!pline || pline->nused<H5Z_MAX_NFILTERS);
+    HDassert(!pline || pline->nused < H5Z_MAX_NFILTERS);
 
     if (pline && (flags & H5Z_FLAG_REVERSE)) { /* Read */
-	for (i=pline->nused; i>0; --i) {
-	    idx = i-1;
+        for (i = pline->nused; i > 0; --i) {
+            idx = i - 1;
 
-	    if (*filter_mask & ((unsigned)1<<idx)) {
-		failed |= (unsigned)1 << idx;
-		continue;/*filter excluded*/
-	    }
+            if (*filter_mask & ((unsigned)1 << idx)) {
+                failed |= (unsigned)1 << idx;
+                continue; /*filter excluded*/
+            }
 
-            /* If the filter isn't registered and the application doesn't 
-             * indicate no plugin through HDF5_PRELOAD_PLUG (using the symbol "::"), 
+            /* If the filter isn't registered and the application doesn't
+             * indicate no plugin through HDF5_PRELOAD_PLUG (using the symbol "::"),
              * try to load it dynamically and register it.  Otherwise, return failure
              */
-	    if((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0) {
+            if ((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0) {
                 hbool_t issue_error = FALSE;
 
-                    const H5Z_class2_t    *filter_info;
+                const H5Z_class2_t *filter_info;
 
-                    /* Try loading the filter */
-                    if(NULL != (filter_info = (const H5Z_class2_t *)H5PL_load(H5PL_TYPE_FILTER, (int)(pline->filter[idx].id)))) {
-                        /* Register the filter we loaded */
-                        if(H5Z_register(filter_info) < 0)
-                            HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter")
+                /* Try loading the filter */
+                if (NULL != (filter_info = (const H5Z_class2_t *)H5PL_load(H5PL_TYPE_FILTER,
+                                                                           (int)(pline->filter[idx].id)))) {
+                    /* Register the filter we loaded */
+                    if (H5Z_register(filter_info) < 0)
+                        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter")
 
-                        /* Search in the table of registered filters again to find the dynamic filter just loaded and registered */ 
-                        if((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0)
-                            issue_error = TRUE;
-                    } /* end if */
-                    else
+                    /* Search in the table of registered filters again to find the dynamic filter just loaded
+                     * and registered */
+                    if ((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0)
                         issue_error = TRUE;
+                } /* end if */
+                else
+                    issue_error = TRUE;
 
                 /* Check for error */
-                if(issue_error) {
-                    /* Print out the filter name to give more info.  But the name is optional for 
+                if (issue_error) {
+                    /* Print out the filter name to give more info.  But the name is optional for
                      * the filter */
-                    if(pline->filter[idx].name)
-                        HGOTO_ERROR(H5E_PLINE, H5E_READERROR, FAIL, "required filter '%s' is not registered", pline->filter[idx].name)
+                    if (pline->filter[idx].name)
+                        HGOTO_ERROR(H5E_PLINE, H5E_READERROR, FAIL, "required filter '%s' is not registered",
+                                    pline->filter[idx].name)
                     else
-                        HGOTO_ERROR(H5E_PLINE, H5E_READERROR, FAIL, "required filter (name unavailable) is not registered")
+                        HGOTO_ERROR(H5E_PLINE, H5E_READERROR, FAIL,
+                                    "required filter (name unavailable) is not registered")
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
-            fclass=&H5Z_table_g[fclass_idx];
+            fclass = &H5Z_table_g[fclass_idx];
 #ifdef H5Z_DEBUG
-            fstats=&H5Z_stat_table_g[fclass_idx];
-	    H5_timer_begin(&timer);
+            fstats = &H5Z_stat_table_g[fclass_idx];
+            H5_timer_begin(&timer);
 #endif
-            tmp_flags=flags|(pline->filter[idx].flags);
-            tmp_flags|=(edc_read== H5Z_DISABLE_EDC) ? H5Z_FLAG_SKIP_EDC : 0;
-	    new_nbytes = (fclass->filter)(tmp_flags, pline->filter[idx].cd_nelmts,
-                                        pline->filter[idx].cd_values, *nbytes, buf_size, buf);
+            tmp_flags = flags | (pline->filter[idx].flags);
+            tmp_flags |= (edc_read == H5Z_DISABLE_EDC) ? H5Z_FLAG_SKIP_EDC : 0;
+            new_nbytes = (fclass->filter)(tmp_flags, pline->filter[idx].cd_nelmts,
+                                          pline->filter[idx].cd_values, *nbytes, buf_size, buf);
 
 #ifdef H5Z_DEBUG
-	    H5_timer_end(&(fstats->stats[1].timer), &timer);
-	    fstats->stats[1].total += MAX(*nbytes, new_nbytes);
-	    if (0==new_nbytes) fstats->stats[1].errors += *nbytes;
+            H5_timer_end(&(fstats->stats[1].timer), &timer);
+            fstats->stats[1].total += MAX(*nbytes, new_nbytes);
+            if (0 == new_nbytes)
+                fstats->stats[1].errors += *nbytes;
 #endif
 
-            if(0==new_nbytes) {
-                if((cb_struct.func && (H5Z_CB_FAIL==cb_struct.func(pline->filter[idx].id, *buf, *buf_size, cb_struct.op_data)))
-                    || !cb_struct.func)
-		      HGOTO_ERROR(H5E_PLINE, H5E_READERROR, FAIL, "filter returned failure during read")
+            if (0 == new_nbytes) {
+                if ((cb_struct.func && (H5Z_CB_FAIL == cb_struct.func(pline->filter[idx].id, *buf, *buf_size,
+                                                                      cb_struct.op_data))) ||
+                    !cb_struct.func)
+                    HGOTO_ERROR(H5E_PLINE, H5E_READERROR, FAIL, "filter returned failure during read")
 
                 *nbytes = *buf_size;
                 failed |= (unsigned)1 << idx;
                 H5E_clear_stack(NULL);
-            } else {
+            }
+            else {
                 *nbytes = new_nbytes;
             }
-	}
-    } else if (pline) { /* Write */
-	for (idx=0; idx<pline->nused; idx++) {
-	    if (*filter_mask & ((unsigned)1<<idx)) {
-		failed |= (unsigned)1 << idx;
-		continue; /*filter excluded*/
-	    }
-	    if ((fclass_idx=H5Z_find_idx(pline->filter[idx].id))<0) {
+        }
+    }
+    else if (pline) { /* Write */
+        for (idx = 0; idx < pline->nused; idx++) {
+            if (*filter_mask & ((unsigned)1 << idx)) {
+                failed |= (unsigned)1 << idx;
+                continue; /*filter excluded*/
+            }
+            if ((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0) {
                 /* Check if filter is optional -- If it isn't, then error */
-		if ((pline->filter[idx].flags & H5Z_FLAG_OPTIONAL) == 0)
-		    HGOTO_ERROR(H5E_PLINE, H5E_WRITEERROR, FAIL, "required filter is not registered")
+                if ((pline->filter[idx].flags & H5Z_FLAG_OPTIONAL) == 0)
+                    HGOTO_ERROR(H5E_PLINE, H5E_WRITEERROR, FAIL, "required filter is not registered")
 
-		failed |= (unsigned)1 << idx;
+                failed |= (unsigned)1 << idx;
                 H5E_clear_stack(NULL);
-		continue; /*filter excluded*/
-	    }
-            fclass=&H5Z_table_g[fclass_idx];
+                continue; /*filter excluded*/
+            }
+            fclass = &H5Z_table_g[fclass_idx];
 #ifdef H5Z_DEBUG
-            fstats=&H5Z_stat_table_g[fclass_idx];
-	    H5_timer_begin(&timer);
+            fstats = &H5Z_stat_table_g[fclass_idx];
+            H5_timer_begin(&timer);
 #endif
-	    new_nbytes = (fclass->filter)(flags|(pline->filter[idx].flags), pline->filter[idx].cd_nelmts,
-					pline->filter[idx].cd_values, *nbytes, buf_size, buf);
+            new_nbytes = (fclass->filter)(flags | (pline->filter[idx].flags), pline->filter[idx].cd_nelmts,
+                                          pline->filter[idx].cd_values, *nbytes, buf_size, buf);
 #ifdef H5Z_DEBUG
-	    H5_timer_end(&(fstats->stats[0].timer), &timer);
-	    fstats->stats[0].total += MAX(*nbytes, new_nbytes);
-	    if (0==new_nbytes) fstats->stats[0].errors += *nbytes;
+            H5_timer_end(&(fstats->stats[0].timer), &timer);
+            fstats->stats[0].total += MAX(*nbytes, new_nbytes);
+            if (0 == new_nbytes)
+                fstats->stats[0].errors += *nbytes;
 #endif
-            if(0==new_nbytes) {
-                if (0==(pline->filter[idx].flags & H5Z_FLAG_OPTIONAL)) {
-                    if((cb_struct.func && (H5Z_CB_FAIL==cb_struct.func(pline->filter[idx].id, *buf, *nbytes, cb_struct.op_data)))
-                            || !cb_struct.func)
+            if (0 == new_nbytes) {
+                if (0 == (pline->filter[idx].flags & H5Z_FLAG_OPTIONAL)) {
+                    if ((cb_struct.func && (H5Z_CB_FAIL == cb_struct.func(pline->filter[idx].id, *buf,
+                                                                          *nbytes, cb_struct.op_data))) ||
+                        !cb_struct.func)
                         HGOTO_ERROR(H5E_PLINE, H5E_WRITEERROR, FAIL, "filter returned failure")
 
                     *nbytes = *buf_size;
@@ -1380,10 +1364,11 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
 
                 failed |= (unsigned)1 << idx;
                 H5E_clear_stack(NULL);
-            } else {
+            }
+            else {
                 *nbytes = new_nbytes;
             }
-	}
+        }
     }
 
     *filter_mask = failed;
@@ -1392,7 +1377,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_info
  *
@@ -1410,35 +1394,34 @@ done:
 H5Z_filter_info_t *
 H5Z_filter_info(const H5O_pline_t *pline, H5Z_filter_t filter)
 {
-    size_t	idx;                    /* Index of filter in pipeline */
-    H5Z_filter_info_t *ret_value;       /* Return value */
+    size_t             idx;       /* Index of filter in pipeline */
+    H5Z_filter_info_t *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(pline);
-    HDassert(filter>=0 && filter<=H5Z_FILTER_MAX);
+    HDassert(filter >= 0 && filter <= H5Z_FILTER_MAX);
 
     /* Locate the filter in the pipeline */
-    for(idx=0; idx<pline->nused; idx++)
-        if(pline->filter[idx].id==filter)
+    for (idx = 0; idx < pline->nused; idx++)
+        if (pline->filter[idx].id == filter)
             break;
 
     /* Check if the filter was not already in the pipeline */
-    if(idx>=pline->nused)
-	HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, NULL, "filter not in pipeline")
+    if (idx >= pline->nused)
+        HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, NULL, "filter not in pipeline")
 
     /* Set return value */
-    ret_value=&pline->filter[idx];
+    ret_value = &pline->filter[idx];
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_filter_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_in_pline
  *
- * Purpose:	Check wheter a filter is in the filter pipeline using the 
+ * Purpose:	Check wheter a filter is in the filter pipeline using the
  *              filter ID.  This function is very similar to H5Z_filter_info
  *
  * Return:	TRUE   - found filter
@@ -1455,29 +1438,27 @@ done:
 htri_t
 H5Z_filter_in_pline(const H5O_pline_t *pline, H5Z_filter_t filter)
 {
-    size_t	idx;                    /* Index of filter in pipeline */
-    htri_t      ret_value = TRUE;       /* Return value */
+    size_t idx;              /* Index of filter in pipeline */
+    htri_t ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(pline);
-    HDassert(filter>=0 && filter<=H5Z_FILTER_MAX);
+    HDassert(filter >= 0 && filter <= H5Z_FILTER_MAX);
 
     /* Locate the filter in the pipeline */
-    for(idx=0; idx<pline->nused; idx++)
-        if(pline->filter[idx].id==filter)
+    for (idx = 0; idx < pline->nused; idx++)
+        if (pline->filter[idx].id == filter)
             break;
 
     /* Check if the filter was not already in the pipeline */
-    if(idx>=pline->nused)
-	ret_value = FALSE;
+    if (idx >= pline->nused)
+        ret_value = FALSE;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_filter_in_pline() */
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_all_filters_avail
  *
@@ -1496,8 +1477,8 @@ done:
 htri_t
 H5Z_all_filters_avail(const H5O_pline_t *pline)
 {
-    size_t i,j;                 /* Local index variable */
-    htri_t ret_value=TRUE;      /* Return value */
+    size_t i, j;             /* Local index variable */
+    htri_t ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1505,15 +1486,15 @@ H5Z_all_filters_avail(const H5O_pline_t *pline)
     HDassert(pline);
 
     /* Iterate through all the filters in pipeline */
-    for(i=0; i<pline->nused; i++) {
+    for (i = 0; i < pline->nused; i++) {
 
         /* Look for each filter in the list of registered filters */
-        for(j=0; j<H5Z_table_used_g; j++)
-            if(H5Z_table_g[j].id==pline->filter[i].id)
+        for (j = 0; j < H5Z_table_used_g; j++)
+            if (H5Z_table_g[j].id == pline->filter[i].id)
                 break;
 
         /* Check if we didn't find the filter */
-        if(j==H5Z_table_used_g)
+        if (j == H5Z_table_used_g)
             HGOTO_DONE(FALSE)
     } /* end for */
 
@@ -1521,8 +1502,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_all_filters_avail() */
 
-
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_delete
  *
@@ -1550,51 +1529,51 @@ H5Z_delete(H5O_pline_t *pline, H5Z_filter_t filter)
     HDassert(filter >= 0 && filter <= H5Z_FILTER_MAX);
 
     /* if the pipeline has no filters, just return */
-    if(pline->nused==0)
+    if (pline->nused == 0)
         HGOTO_DONE(SUCCEED)
 
     /* Delete all filters */
-    if(H5Z_FILTER_ALL == filter) {
-        if(H5O_msg_reset(H5O_PLINE_ID, pline) < 0)
+    if (H5Z_FILTER_ALL == filter) {
+        if (H5O_msg_reset(H5O_PLINE_ID, pline) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTFREE, FAIL, "can't release pipeline info")
     } /* end if */
     /* Delete filter */
     else {
-        size_t idx;             /* Index of filter in pipeline */
-        hbool_t found = FALSE;  /* Indicate filter was found in pipeline */
+        size_t  idx;           /* Index of filter in pipeline */
+        hbool_t found = FALSE; /* Indicate filter was found in pipeline */
 
         /* Locate the filter in the pipeline */
-        for(idx = 0; idx < pline->nused; idx++)
-            if(pline->filter[idx].id == filter) {
+        for (idx = 0; idx < pline->nused; idx++)
+            if (pline->filter[idx].id == filter) {
                 found = TRUE;
                 break;
             } /* end if */
 
         /* filter was not found in the pipeline */
-        if(!found)
+        if (!found)
             HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "filter not in pipeline")
 
         /* Free information for deleted filter */
-        if(pline->filter[idx].name && pline->filter[idx].name != pline->filter[idx]._name)
+        if (pline->filter[idx].name && pline->filter[idx].name != pline->filter[idx]._name)
             HDassert((HDstrlen(pline->filter[idx].name) + 1) > H5Z_COMMON_NAME_LEN);
-        if(pline->filter[idx].name != pline->filter[idx]._name)
+        if (pline->filter[idx].name != pline->filter[idx]._name)
             pline->filter[idx].name = (char *)H5MM_xfree(pline->filter[idx].name);
-        if(pline->filter[idx].cd_values && pline->filter[idx].cd_values != pline->filter[idx]._cd_values)
+        if (pline->filter[idx].cd_values && pline->filter[idx].cd_values != pline->filter[idx]._cd_values)
             HDassert(pline->filter[idx].cd_nelmts > H5Z_COMMON_CD_VALUES);
-        if(pline->filter[idx].cd_values != pline->filter[idx]._cd_values)
+        if (pline->filter[idx].cd_values != pline->filter[idx]._cd_values)
             pline->filter[idx].cd_values = (unsigned *)H5MM_xfree(pline->filter[idx].cd_values);
 
         /* Remove filter from pipeline array */
-        if((idx + 1) < pline->nused) {
+        if ((idx + 1) < pline->nused) {
             /* Copy filters down & fix up any client data value arrays using internal storage */
-            for(; (idx + 1) < pline->nused; idx++) {
+            for (; (idx + 1) < pline->nused; idx++) {
                 pline->filter[idx] = pline->filter[idx + 1];
-                if(pline->filter[idx].name && (HDstrlen(pline->filter[idx].name) + 1) <= H5Z_COMMON_NAME_LEN)
+                if (pline->filter[idx].name && (HDstrlen(pline->filter[idx].name) + 1) <= H5Z_COMMON_NAME_LEN)
                     pline->filter[idx].name = pline->filter[idx]._name;
-                if(pline->filter[idx].cd_nelmts <= H5Z_COMMON_CD_VALUES)
+                if (pline->filter[idx].cd_nelmts <= H5Z_COMMON_CD_VALUES)
                     pline->filter[idx].cd_values = pline->filter[idx]._cd_values;
             } /* end for */
-        } /* end if */
+        }     /* end if */
 
         /* Decrement number of used filters */
         pline->nused--;
@@ -1607,7 +1586,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Zget_filter_info
  *
@@ -1630,14 +1608,13 @@ H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags)
     H5TRACE2("e", "Zf*Iu", filter, filter_config_flags);
 
     /* Get the filter info */
-    if(H5Z_get_filter_info(filter, filter_config_flags) < 0)
+    if (H5Z_get_filter_info(filter, filter_config_flags) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "Filter info not retrieved")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Zget_filter_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_get_filter_info
  *
@@ -1655,25 +1632,24 @@ herr_t
 H5Z_get_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags)
 {
     H5Z_class2_t *fclass;
-    herr_t ret_value = SUCCEED;
+    herr_t        ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Look up the filter class info */
-    if(NULL == (fclass = H5Z_find(filter)))
+    if (NULL == (fclass = H5Z_find(filter)))
         HGOTO_ERROR(H5E_PLINE, H5E_BADVALUE, FAIL, "Filter not defined")
 
     /* Set the filter config flags for the application */
-    if(filter_config_flags != NULL) {
+    if (filter_config_flags != NULL) {
         *filter_config_flags = 0;
 
-        if(fclass->encoder_present)
+        if (fclass->encoder_present)
             *filter_config_flags |= H5Z_FILTER_CONFIG_ENCODE_ENABLED;
-        if(fclass->decoder_present)
+        if (fclass->decoder_present)
             *filter_config_flags |= H5Z_FILTER_CONFIG_DECODE_ENABLED;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_get_filter_info() */
-
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c
index 0c47628..a2a2443 100644
--- a/src/H5Zdeflate.c
+++ b/src/H5Zdeflate.c
@@ -16,42 +16,40 @@
  *              Friday, August 27, 1999
  */
 
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Zpkg.h"		/* Data filters				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER) 
-# define H5_ZLIB_HEADER "zlib.h"
+#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER)
+#define H5_ZLIB_HEADER "zlib.h"
 #endif
 #if defined(H5_ZLIB_HEADER)
-# include H5_ZLIB_HEADER /* "zlib.h" */
+#include H5_ZLIB_HEADER /* "zlib.h" */
 #endif
 
 /* Local function prototypes */
-static size_t H5Z_filter_deflate (unsigned flags, size_t cd_nelmts,
-    const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf);
+static size_t H5Z_filter_deflate(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes,
+                                 size_t *buf_size, void **buf);
 
 /* This message derives from H5Z */
 const H5Z_class2_t H5Z_DEFLATE[1] = {{
-    H5Z_CLASS_T_VERS,       /* H5Z_class_t version */
-    H5Z_FILTER_DEFLATE,		/* Filter id number		*/
-    1,              /* encoder_present flag (set to true) */
-    1,              /* decoder_present flag (set to true) */
-    "deflate",			/* Filter name for debugging	*/
-    NULL,                       /* The "can apply" callback     */
-    NULL,                       /* The "set local" callback     */
-    H5Z_filter_deflate,         /* The actual filter function	*/
+    H5Z_CLASS_T_VERS,   /* H5Z_class_t version */
+    H5Z_FILTER_DEFLATE, /* Filter id number		*/
+    1,                  /* encoder_present flag (set to true) */
+    1,                  /* decoder_present flag (set to true) */
+    "deflate",          /* Filter name for debugging	*/
+    NULL,               /* The "can apply" callback     */
+    NULL,               /* The "set local" callback     */
+    H5Z_filter_deflate, /* The actual filter function	*/
 }};
 
 #define H5Z_DEFLATE_SIZE_ADJUST(s) (HDceil(((double)(s)) * (double)1.001f) + 12)
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_deflate
  *
@@ -69,13 +67,12 @@ const H5Z_class2_t H5Z_DEFLATE[1] = {{
  *-------------------------------------------------------------------------
  */
 static size_t
-H5Z_filter_deflate (unsigned flags, size_t cd_nelmts,
-		    const unsigned cd_values[], size_t nbytes,
-		    size_t *buf_size, void **buf)
+H5Z_filter_deflate(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes,
+                   size_t *buf_size, void **buf)
 {
-    void	*outbuf = NULL;         /* Pointer to new buffer */
-    int		status;                 /* Status from zlib operation */
-    size_t	ret_value;              /* Return value */
+    void * outbuf = NULL; /* Pointer to new buffer */
+    int    status;        /* Status from zlib operation */
+    size_t ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI(0)
 
@@ -85,122 +82,122 @@ H5Z_filter_deflate (unsigned flags, size_t cd_nelmts,
     HDassert(*buf);
 
     /* Check arguments */
-    if (cd_nelmts!=1 || cd_values[0]>9)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid deflate aggression level")
+    if (cd_nelmts != 1 || cd_values[0] > 9)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid deflate aggression level")
 
     if (flags & H5Z_FLAG_REVERSE) {
-	/* Input; uncompress */
-	z_stream	z_strm;                 /* zlib parameters */
-	size_t		nalloc = *buf_size;     /* Number of bytes for output (compressed) buffer */
+        /* Input; uncompress */
+        z_stream z_strm;             /* zlib parameters */
+        size_t   nalloc = *buf_size; /* Number of bytes for output (compressed) buffer */
 
         /* Allocate space for the compressed buffer */
-	if (NULL==(outbuf = H5MM_malloc(nalloc)))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for deflate uncompression")
+        if (NULL == (outbuf = H5MM_malloc(nalloc)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for deflate uncompression")
 
         /* Set the uncompression parameters */
-	HDmemset(&z_strm, 0, sizeof(z_strm));
-	z_strm.next_in = (Bytef *)*buf;
+        HDmemset(&z_strm, 0, sizeof(z_strm));
+        z_strm.next_in = (Bytef *)*buf;
         H5_CHECKED_ASSIGN(z_strm.avail_in, unsigned, nbytes, size_t);
-	z_strm.next_out = (Bytef *)outbuf;
+        z_strm.next_out = (Bytef *)outbuf;
         H5_CHECKED_ASSIGN(z_strm.avail_out, unsigned, nalloc, size_t);
 
         /* Initialize the uncompression routines */
-	if (Z_OK!=inflateInit(&z_strm))
-	    HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "inflateInit() failed")
+        if (Z_OK != inflateInit(&z_strm))
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "inflateInit() failed")
 
         /* Loop to uncompress the buffer */
-	do {
+        do {
             /* Uncompress some data */
-	    status = inflate(&z_strm, Z_SYNC_FLUSH);
+            status = inflate(&z_strm, Z_SYNC_FLUSH);
 
             /* Check if we are done uncompressing data */
-	    if (Z_STREAM_END==status)
-                break;	/*done*/
+            if (Z_STREAM_END == status)
+                break; /*done*/
 
             /* Check for error */
-	    if (Z_OK!=status) {
-		(void)inflateEnd(&z_strm);
-		HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "inflate() failed")
-	    }
+            if (Z_OK != status) {
+                (void)inflateEnd(&z_strm);
+                HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "inflate() failed")
+            }
             else {
                 /* If we're not done and just ran out of buffer space, get more */
-                if(0 == z_strm.avail_out) {
-                    void	*new_outbuf;         /* Pointer to new output buffer */
+                if (0 == z_strm.avail_out) {
+                    void *new_outbuf; /* Pointer to new output buffer */
 
                     /* Allocate a buffer twice as big */
                     nalloc *= 2;
-                    if(NULL == (new_outbuf = H5MM_realloc(outbuf, nalloc))) {
+                    if (NULL == (new_outbuf = H5MM_realloc(outbuf, nalloc))) {
                         (void)inflateEnd(&z_strm);
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for deflate uncompression")
+                        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0,
+                                    "memory allocation failed for deflate uncompression")
                     } /* end if */
                     outbuf = new_outbuf;
 
                     /* Update pointers to buffer for next set of uncompressed data */
-                    z_strm.next_out = (unsigned char*)outbuf + z_strm.total_out;
+                    z_strm.next_out  = (unsigned char *)outbuf + z_strm.total_out;
                     z_strm.avail_out = (uInt)(nalloc - z_strm.total_out);
                 } /* end if */
-            } /* end else */
-	} while(status==Z_OK);
+            }     /* end else */
+        } while (status == Z_OK);
 
         /* Free the input buffer */
-	H5MM_xfree(*buf);
+        H5MM_xfree(*buf);
 
         /* Set return values */
-	*buf = outbuf;
-	outbuf = NULL;
-	*buf_size = nalloc;
-	ret_value = z_strm.total_out;
+        *buf      = outbuf;
+        outbuf    = NULL;
+        *buf_size = nalloc;
+        ret_value = z_strm.total_out;
 
         /* Finish uncompressing the stream */
-	(void)inflateEnd(&z_strm);
+        (void)inflateEnd(&z_strm);
     } /* end if */
     else {
-	/*
-	 * Output; compress but fail if the result would be larger than the
-	 * input.  The library doesn't provide in-place compression, so we
-	 * must allocate a separate buffer for the result.
-	 */
-	const Bytef *z_src = (const Bytef*)(*buf);
-	Bytef	    *z_dst;		/*destination buffer		*/
-	uLongf	     z_dst_nbytes = (uLongf)H5Z_DEFLATE_SIZE_ADJUST(nbytes);
-	uLong	     z_src_nbytes = (uLong)nbytes;
-        int          aggression;     /* Compression aggression setting */
+        /*
+         * Output; compress but fail if the result would be larger than the
+         * input.  The library doesn't provide in-place compression, so we
+         * must allocate a separate buffer for the result.
+         */
+        const Bytef *z_src = (const Bytef *)(*buf);
+        Bytef *      z_dst; /*destination buffer		*/
+        uLongf       z_dst_nbytes = (uLongf)H5Z_DEFLATE_SIZE_ADJUST(nbytes);
+        uLong        z_src_nbytes = (uLong)nbytes;
+        int          aggression; /* Compression aggression setting */
 
         /* Set the compression aggression level */
         H5_CHECKED_ASSIGN(aggression, int, cd_values[0], unsigned);
 
         /* Allocate output (compressed) buffer */
-	if(NULL == (outbuf = H5MM_malloc(z_dst_nbytes)))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "unable to allocate deflate destination buffer")
+        if (NULL == (outbuf = H5MM_malloc(z_dst_nbytes)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "unable to allocate deflate destination buffer")
         z_dst = (Bytef *)outbuf;
 
         /* Perform compression from the source to the destination buffer */
-	status = compress2(z_dst, &z_dst_nbytes, z_src, z_src_nbytes, aggression);
+        status = compress2(z_dst, &z_dst_nbytes, z_src, z_src_nbytes, aggression);
 
         /* Check for various zlib errors */
-	if(Z_BUF_ERROR == status)
-	    HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "overflow")
-	else if(Z_MEM_ERROR == status)
-	    HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "deflate memory error")
-	else if(Z_OK != status)
-	    HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "other deflate error")
+        if (Z_BUF_ERROR == status)
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "overflow")
+        else if (Z_MEM_ERROR == status)
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "deflate memory error")
+        else if (Z_OK != status)
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "other deflate error")
         /* Successfully uncompressed the buffer */
         else {
             /* Free the input buffer */
-	    H5MM_xfree(*buf);
+            H5MM_xfree(*buf);
 
             /* Set return values */
-	    *buf = outbuf;
-	    outbuf = NULL;
-	    *buf_size = nbytes;
-	    ret_value = z_dst_nbytes;
-	} /* end else */
-    } /* end else */
+            *buf      = outbuf;
+            outbuf    = NULL;
+            *buf_size = nbytes;
+            ret_value = z_dst_nbytes;
+        } /* end else */
+    }     /* end else */
 
 done:
-    if(outbuf)
+    if (outbuf)
         H5MM_xfree(outbuf);
     FUNC_LEAVE_NOAPI(ret_value)
 }
 #endif /* H5_HAVE_FILTER_DEFLATE */
-
diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c
index 411f051..1779910 100644
--- a/src/H5Zfletcher32.c
+++ b/src/H5Zfletcher32.c
@@ -16,34 +16,32 @@
  *              Jan 3, 2003
  */
 
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"         /* File access                          */
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Zpkg.h"		/* Data filters				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access                          */
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 /* Local function prototypes */
-static size_t H5Z_filter_fletcher32 (unsigned flags, size_t cd_nelmts,
-    const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf);
+static size_t H5Z_filter_fletcher32(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
+                                    size_t nbytes, size_t *buf_size, void **buf);
 
 /* This message derives from H5Z */
 const H5Z_class2_t H5Z_FLETCHER32[1] = {{
-    H5Z_CLASS_T_VERS,       /* H5Z_class_t version */
-    H5Z_FILTER_FLETCHER32,	/* Filter id number		*/
-    1,              /* encoder_present flag (set to true) */
-    1,              /* decoder_present flag (set to true) */
-    "fletcher32",		/* Filter name for debugging	*/
-    NULL,                       /* The "can apply" callback     */
-    NULL,                       /* The "set local" callback     */
-    H5Z_filter_fletcher32,	/* The actual filter function	*/
+    H5Z_CLASS_T_VERS,      /* H5Z_class_t version */
+    H5Z_FILTER_FLETCHER32, /* Filter id number		*/
+    1,                     /* encoder_present flag (set to true) */
+    1,                     /* decoder_present flag (set to true) */
+    "fletcher32",          /* Filter name for debugging	*/
+    NULL,                  /* The "can apply" callback     */
+    NULL,                  /* The "set local" callback     */
+    H5Z_filter_fletcher32, /* The actual filter function	*/
 }};
 
-#define FLETCHER_LEN       4
+#define FLETCHER_LEN 4
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_fletcher32
  *
@@ -70,32 +68,32 @@ const H5Z_class2_t H5Z_FLETCHER32[1] = {{
  */
 /* ARGSUSED */
 static size_t
-H5Z_filter_fletcher32 (unsigned flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned H5_ATTR_UNUSED cd_values[],
-                     size_t nbytes, size_t *buf_size, void **buf)
+H5Z_filter_fletcher32(unsigned flags, size_t H5_ATTR_UNUSED cd_nelmts,
+                      const unsigned H5_ATTR_UNUSED cd_values[], size_t nbytes, size_t *buf_size, void **buf)
 {
-    void    *outbuf = NULL;     /* Pointer to new buffer */
-    unsigned char *src = (unsigned char*)(*buf);
-    uint32_t fletcher;          /* Checksum value */
-    uint32_t reversed_fletcher; /* Possible wrong checksum value */
-    uint8_t  c[4];
-    uint8_t  tmp;
-    size_t   ret_value;         /* Return value */
+    void *         outbuf = NULL; /* Pointer to new buffer */
+    unsigned char *src    = (unsigned char *)(*buf);
+    uint32_t       fletcher;          /* Checksum value */
+    uint32_t       reversed_fletcher; /* Possible wrong checksum value */
+    uint8_t        c[4];
+    uint8_t        tmp;
+    size_t         ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(0)
 
-    HDassert(sizeof(uint32_t)>=4);
+    HDassert(sizeof(uint32_t) >= 4);
 
     if (flags & H5Z_FLAG_REVERSE) { /* Read */
         /* Do checksum if it's enabled for read; otherwise skip it
          * to save performance. */
         if (!(flags & H5Z_FLAG_SKIP_EDC)) {
             unsigned char *tmp_src;             /* Pointer to checksum in buffer */
-            size_t  src_nbytes = nbytes;        /* Original number of bytes */
-            uint32_t stored_fletcher;           /* Stored checksum value */
+            size_t         src_nbytes = nbytes; /* Original number of bytes */
+            uint32_t       stored_fletcher;     /* Stored checksum value */
 
             /* Get the stored checksum */
             src_nbytes -= FLETCHER_LEN;
-            tmp_src=src+src_nbytes;
+            tmp_src = src + src_nbytes;
             UINT32DECODE(tmp_src, stored_fletcher);
 
             /* Compute checksum (can't fail) */
@@ -122,44 +120,45 @@ H5Z_filter_fletcher32 (unsigned flags, size_t H5_ATTR_UNUSED cd_nelmts, const un
             HDmemcpy(&reversed_fletcher, c, (size_t)4);
 
             /* Verify computed checksum matches stored checksum */
-            if(stored_fletcher != fletcher && stored_fletcher != reversed_fletcher)
-	        HGOTO_ERROR(H5E_STORAGE, H5E_READERROR, 0, "data error detected by Fletcher32 checksum")
+            if (stored_fletcher != fletcher && stored_fletcher != reversed_fletcher)
+                HGOTO_ERROR(H5E_STORAGE, H5E_READERROR, 0, "data error detected by Fletcher32 checksum")
         }
 
         /* Set return values */
         /* (Re-use the input buffer, just note that the size is smaller by the size of the checksum) */
-        ret_value = nbytes-FLETCHER_LEN;
-    } else { /* Write */
-        unsigned char *dst;     /* Temporary pointer to destination buffer */
+        ret_value = nbytes - FLETCHER_LEN;
+    }
+    else {                  /* Write */
+        unsigned char *dst; /* Temporary pointer to destination buffer */
 
         /* Compute checksum (can't fail) */
         fletcher = H5_checksum_fletcher32(src, nbytes);
 
-	if (NULL == (outbuf = H5MM_malloc(nbytes + FLETCHER_LEN)))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "unable to allocate Fletcher32 checksum destination buffer")
+        if (NULL == (outbuf = H5MM_malloc(nbytes + FLETCHER_LEN)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0,
+                        "unable to allocate Fletcher32 checksum destination buffer")
 
-        dst = (unsigned char *) outbuf;
+        dst = (unsigned char *)outbuf;
 
         /* Copy raw data */
-        HDmemcpy((void*)dst, (void*)(*buf), nbytes);
+        HDmemcpy((void *)dst, (void *)(*buf), nbytes);
 
         /* Append checksum to raw data for storage */
         dst += nbytes;
         UINT32ENCODE(dst, fletcher);
 
         /* Free input buffer */
- 	H5MM_xfree(*buf);
+        H5MM_xfree(*buf);
 
         /* Set return values */
         *buf_size = nbytes + FLETCHER_LEN;
-	*buf = outbuf;
-	outbuf = NULL;
-	ret_value = *buf_size;
+        *buf      = outbuf;
+        outbuf    = NULL;
+        ret_value = *buf_size;
     }
 
 done:
-    if(outbuf)
+    if (outbuf)
         H5MM_xfree(outbuf);
     FUNC_LEAVE_NOAPI(ret_value)
 }
-
diff --git a/src/H5Znbit.c b/src/H5Znbit.c
index 8db74b8..7b02240 100644
--- a/src/H5Znbit.c
+++ b/src/H5Znbit.c
@@ -11,36 +11,36 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Ppublic.h"		/* Property lists			*/
-#include "H5Oprivate.h"         /* Object headers                       */
-#include "H5Sprivate.h"		/* Dataspaces         			*/
-#include "H5Tprivate.h"		/* Datatypes         			*/
-#include "H5Zpkg.h"		/* Data filters				*/
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Ppublic.h"   /* Property lists			*/
+#include "H5Oprivate.h"  /* Object headers                       */
+#include "H5Sprivate.h"  /* Dataspaces         			*/
+#include "H5Tprivate.h"  /* Datatypes         			*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 /* Struct of parameters needed for compressing/decompressing
  * one nbit atomic datatype: integer or floating-point
  */
 typedef struct {
-   size_t size;   /* size of datatype */
-   int order;     /* datatype endianness order */
-   int precision; /* datatype precision */
-   int offset;    /* datatype offset */
+    size_t size;      /* size of datatype */
+    int    order;     /* datatype endianness order */
+    int    precision; /* datatype precision */
+    int    offset;    /* datatype offset */
 } parms_atomic;
 
 /* Local function prototypes */
 static htri_t H5Z_can_apply_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 static herr_t H5Z_set_local_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id);
-static size_t H5Z_filter_nbit(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
-                              size_t nbytes, size_t *buf_size, void **buf);
+static size_t H5Z_filter_nbit(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes,
+                              size_t *buf_size, void **buf);
 
-static void H5Z_calc_parms_nooptype(void);
-static void H5Z_calc_parms_atomic(void);
+static void   H5Z_calc_parms_nooptype(void);
+static void   H5Z_calc_parms_atomic(void);
 static herr_t H5Z_calc_parms_array(const H5T_t *type);
 static herr_t H5Z_calc_parms_compound(const H5T_t *type);
 
@@ -51,50 +51,53 @@ static herr_t H5Z_set_parms_compound(const H5T_t *type, unsigned cd_values[]);
 
 static void H5Z_nbit_next_byte(size_t *j, int *buf_len);
 static void H5Z_nbit_decompress_one_byte(unsigned char *data, size_t data_offset, int k, int begin_i,
-int end_i, unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p, int datatype_len);
-static void H5Z_nbit_compress_one_byte(unsigned char *data, size_t data_offset, int k, int begin_i,
-int end_i, unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p, int datatype_len);
-static void H5Z_nbit_decompress_one_nooptype(unsigned char *data, size_t data_offset,
-                       unsigned char *buffer, size_t *j, int *buf_len, unsigned size);
-static void H5Z_nbit_decompress_one_atomic(unsigned char *data, size_t data_offset,
-                    unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p);
-static herr_t H5Z__nbit_decompress_one_array(unsigned char *data, size_t data_offset,
-           unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[]);
+                                         int end_i, unsigned char *buffer, size_t *j, int *buf_len,
+                                         parms_atomic p, int datatype_len);
+static void H5Z_nbit_compress_one_byte(unsigned char *data, size_t data_offset, int k, int begin_i, int end_i,
+                                       unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p,
+                                       int datatype_len);
+static void H5Z_nbit_decompress_one_nooptype(unsigned char *data, size_t data_offset, unsigned char *buffer,
+                                             size_t *j, int *buf_len, unsigned size);
+static void H5Z_nbit_decompress_one_atomic(unsigned char *data, size_t data_offset, unsigned char *buffer,
+                                           size_t *j, int *buf_len, parms_atomic p);
+static herr_t H5Z__nbit_decompress_one_array(unsigned char *data, size_t data_offset, unsigned char *buffer,
+                                             size_t *j, int *buf_len, const unsigned parms[]);
 static herr_t H5Z__nbit_decompress_one_compound(unsigned char *data, size_t data_offset,
-              unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[]);
+                                                unsigned char *buffer, size_t *j, int *buf_len,
+                                                const unsigned parms[]);
 static herr_t H5Z__nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
-                                const unsigned parms[]);
-static void H5Z_nbit_compress_one_nooptype(unsigned char *data, size_t data_offset,
-                     unsigned char *buffer, size_t *j, int *buf_len, unsigned size);
-static void H5Z_nbit_compress_one_atomic(unsigned char *data, size_t data_offset,
-                  unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p);
-static void H5Z_nbit_compress_one_array(unsigned char *data, size_t data_offset,
-         unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[]);
-static void H5Z_nbit_compress_one_compound(unsigned char *data, size_t data_offset,
-            unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[]);
-static void H5Z_nbit_compress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
-                              size_t *buffer_size, const unsigned parms[]);
+                                   const unsigned parms[]);
+static void   H5Z_nbit_compress_one_nooptype(unsigned char *data, size_t data_offset, unsigned char *buffer,
+                                             size_t *j, int *buf_len, unsigned size);
+static void   H5Z_nbit_compress_one_atomic(unsigned char *data, size_t data_offset, unsigned char *buffer,
+                                           size_t *j, int *buf_len, parms_atomic p);
+static void   H5Z_nbit_compress_one_array(unsigned char *data, size_t data_offset, unsigned char *buffer,
+                                          size_t *j, int *buf_len, const unsigned parms[]);
+static void   H5Z_nbit_compress_one_compound(unsigned char *data, size_t data_offset, unsigned char *buffer,
+                                             size_t *j, int *buf_len, const unsigned parms[]);
+static void   H5Z_nbit_compress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
+                                size_t *buffer_size, const unsigned parms[]);
 
 /* This message derives from H5Z */
 H5Z_class2_t H5Z_NBIT[1] = {{
-    H5Z_CLASS_T_VERS,       /* H5Z_class_t version */
-    H5Z_FILTER_NBIT,		/* Filter id number		*/
-    1,              /* Assume encoder present: check before registering */
+    H5Z_CLASS_T_VERS,   /* H5Z_class_t version */
+    H5Z_FILTER_NBIT,    /* Filter id number		*/
+    1,                  /* Assume encoder present: check before registering */
     1,                  /* decoder_present flag (set to true) */
-    "nbit",			    /* Filter name for debugging	*/
-    H5Z_can_apply_nbit,		/* The "can apply" callback     */
-    H5Z_set_local_nbit,         /* The "set local" callback     */
-    H5Z_filter_nbit,		/* The actual filter function	*/
+    "nbit",             /* Filter name for debugging	*/
+    H5Z_can_apply_nbit, /* The "can apply" callback     */
+    H5Z_set_local_nbit, /* The "set local" callback     */
+    H5Z_filter_nbit,    /* The actual filter function	*/
 }};
 
 /* Local macros */
-#define H5Z_NBIT_ATOMIC          1     /* Atomic datatype class: integer/floating-point */
-#define H5Z_NBIT_ARRAY           2     /* Array datatype class */
-#define H5Z_NBIT_COMPOUND        3     /* Compound datatype class */
-#define H5Z_NBIT_NOOPTYPE        4     /* Other datatype class: nbit does no compression */
-#define H5Z_NBIT_MAX_NPARMS      4096  /* Max number of parameters for filter */
-#define H5Z_NBIT_ORDER_LE        0     /* Little endian for datatype byte order */
-#define H5Z_NBIT_ORDER_BE        1     /* Big endian for datatype byte order */
+#define H5Z_NBIT_ATOMIC     1    /* Atomic datatype class: integer/floating-point */
+#define H5Z_NBIT_ARRAY      2    /* Array datatype class */
+#define H5Z_NBIT_COMPOUND   3    /* Compound datatype class */
+#define H5Z_NBIT_NOOPTYPE   4    /* Other datatype class: nbit does no compression */
+#define H5Z_NBIT_MAX_NPARMS 4096 /* Max number of parameters for filter */
+#define H5Z_NBIT_ORDER_LE   0    /* Little endian for datatype byte order */
+#define H5Z_NBIT_ORDER_BE   1    /* Big endian for datatype byte order */
 
 /* Local variables */
 /*
@@ -103,12 +106,11 @@ H5Z_class2_t H5Z_NBIT[1] = {{
  * need_not_compress: flag if TRUE indicating no need to do nbit compression
  * parms_index: index of array parms used by compression/decompression functions
  */
-static unsigned cd_values_index = 0;
-static size_t cd_values_actual_nparms = 0;
-static unsigned char need_not_compress = FALSE;
-static unsigned parms_index = 0;
+static unsigned      cd_values_index         = 0;
+static size_t        cd_values_actual_nparms = 0;
+static unsigned char need_not_compress       = FALSE;
+static unsigned      parms_index             = 0;
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_can_apply_nbit
  *
@@ -128,28 +130,27 @@ static unsigned parms_index = 0;
 static htri_t
 H5Z_can_apply_nbit(hid_t H5_ATTR_UNUSED dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id)
 {
-    const H5T_t	*type;                  /* Datatype */
-    htri_t ret_value = TRUE;            /* Return value */
+    const H5T_t *type;             /* Datatype */
+    htri_t       ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get datatype */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Get datatype's class, for checking the "datatype class" */
-    if(H5T_get_class(type, TRUE) == H5T_NO_CLASS)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
+    if (H5T_get_class(type, TRUE) == H5T_NO_CLASS)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
 
     /* Get datatype's size, for checking the "datatype size" */
-    if(H5T_get_size(type) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if (H5T_get_size(type) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_can_apply_nbit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_calc_parms_nooptype
  *
@@ -164,7 +165,8 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static void H5Z_calc_parms_nooptype(void)
+static void
+H5Z_calc_parms_nooptype(void)
 {
     /* Store datatype class code */
     ++cd_values_actual_nparms;
@@ -173,7 +175,6 @@ static void H5Z_calc_parms_nooptype(void)
     ++cd_values_actual_nparms;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_calc_parms_atomic
  *
@@ -188,7 +189,8 @@ static void H5Z_calc_parms_nooptype(void)
  *
  *-------------------------------------------------------------------------
  */
-static void H5Z_calc_parms_atomic(void)
+static void
+H5Z_calc_parms_atomic(void)
 {
     /* Store datatype class code */
     ++cd_values_actual_nparms;
@@ -206,7 +208,6 @@ static void H5Z_calc_parms_atomic(void)
     ++cd_values_actual_nparms;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_calc_parms_array
  *
@@ -227,9 +228,9 @@ static void H5Z_calc_parms_atomic(void)
 static herr_t
 H5Z_calc_parms_array(const H5T_t *type)
 {
-    H5T_t *dtype_base = NULL;      /* Array datatype's base datatype */
-    H5T_class_t dtype_base_class;  /* Array datatype's base datatype's class */
-    herr_t ret_value = SUCCEED;    /* Return value */
+    H5T_t *     dtype_base = NULL;   /* Array datatype's base datatype */
+    H5T_class_t dtype_base_class;    /* Array datatype's base datatype's class */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -240,27 +241,27 @@ H5Z_calc_parms_array(const H5T_t *type)
     ++cd_values_actual_nparms;
 
     /* Get array datatype's base datatype */
-    if(NULL == (dtype_base = H5T_get_super(type)))
+    if (NULL == (dtype_base = H5T_get_super(type)))
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad base datatype")
 
     /* Get base datatype's class */
-    if((dtype_base_class = H5T_get_class(dtype_base, TRUE)) == H5T_NO_CLASS)
+    if ((dtype_base_class = H5T_get_class(dtype_base, TRUE)) == H5T_NO_CLASS)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad base datatype class")
 
     /* Calculate number of the rest parameters according to base datatype's class */
-    switch(dtype_base_class) {
+    switch (dtype_base_class) {
         case H5T_INTEGER:
         case H5T_FLOAT:
             H5Z_calc_parms_atomic();
             break;
 
         case H5T_ARRAY:
-            if(H5Z_calc_parms_array(dtype_base) == FAIL)
+            if (H5Z_calc_parms_array(dtype_base) == FAIL)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot compute parameters for datatype")
             break;
 
         case H5T_COMPOUND:
-            if(H5Z_calc_parms_compound(dtype_base) == FAIL)
+            if (H5Z_calc_parms_compound(dtype_base) == FAIL)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot compute parameters for datatype")
             break;
 
@@ -270,14 +271,13 @@ H5Z_calc_parms_array(const H5T_t *type)
     } /* end switch */
 
 done:
-    if(dtype_base)
-        if(H5T_close(dtype_base) < 0)
+    if (dtype_base)
+        if (H5T_close(dtype_base) < 0)
             HDONE_ERROR(H5E_PLINE, H5E_CLOSEERROR, FAIL, "Unable to close base datatype")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_calc_parms_array() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_calc_parms_compound
  *
@@ -298,11 +298,11 @@ done:
 static herr_t
 H5Z_calc_parms_compound(const H5T_t *type)
 {
-    int         nmembers;           /* Compound datatype's number of members */
-    H5T_t *dtype_member = NULL;     /* Compound datatype's member datatype */
-    H5T_class_t dtype_member_class; /* Compound datatype's member datatype's class */
-    unsigned    u;                  /* Local index variable */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    int         nmembers;            /* Compound datatype's number of members */
+    H5T_t *     dtype_member = NULL; /* Compound datatype's member datatype */
+    H5T_class_t dtype_member_class;  /* Compound datatype's member datatype's class */
+    unsigned    u;                   /* Local index variable */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -313,39 +313,39 @@ H5Z_calc_parms_compound(const H5T_t *type)
     ++cd_values_actual_nparms;
 
     /* Get number of members */
-    if((nmembers = H5T_get_nmembers(type)) < 0)
+    if ((nmembers = H5T_get_nmembers(type)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype number of members")
 
     /* Store number of members */
     ++cd_values_actual_nparms;
 
     /* For each member, calculate parameters */
-    for(u = 0; u < (unsigned)nmembers; u++) {
+    for (u = 0; u < (unsigned)nmembers; u++) {
         /* Get member datatype */
-        if(NULL == (dtype_member = H5T_get_member_type(type, u, H5T_COPY_TRANSIENT)))
+        if (NULL == (dtype_member = H5T_get_member_type(type, u, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad member datatype")
 
         /* Get member datatype's class */
-        if((dtype_member_class = H5T_get_class(dtype_member, TRUE)) == H5T_NO_CLASS)
+        if ((dtype_member_class = H5T_get_class(dtype_member, TRUE)) == H5T_NO_CLASS)
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad member datatype class")
 
         /* Store member offset */
         ++cd_values_actual_nparms;
 
         /* Calculate parameters according to member's datatype class */
-        switch(dtype_member_class) {
+        switch (dtype_member_class) {
             case H5T_INTEGER:
             case H5T_FLOAT:
                 H5Z_calc_parms_atomic();
                 break;
 
             case H5T_ARRAY:
-                if(H5Z_calc_parms_array(dtype_member) == FAIL)
+                if (H5Z_calc_parms_array(dtype_member) == FAIL)
                     HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot compute parameters for datatype")
                 break;
 
             case H5T_COMPOUND:
-                if(H5Z_calc_parms_compound(dtype_member) == FAIL)
+                if (H5Z_calc_parms_compound(dtype_member) == FAIL)
                     HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot compute parameters for datatype")
                 break;
 
@@ -355,20 +355,19 @@ H5Z_calc_parms_compound(const H5T_t *type)
         } /* end switch */
 
         /* Close member datatype */
-        if(H5T_close(dtype_member) < 0)
+        if (H5T_close(dtype_member) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CLOSEERROR, FAIL, "Unable to close member datatype")
         dtype_member = NULL;
     } /* end for */
 
 done:
-    if(dtype_member)
-        if(H5T_close(dtype_member) < 0)
+    if (dtype_member)
+        if (H5T_close(dtype_member) < 0)
             HDONE_ERROR(H5E_PLINE, H5E_CLOSEERROR, FAIL, "Unable to close member datatype")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_calc_params_compound */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_set_parms_nooptype
  *
@@ -399,8 +398,8 @@ H5Z_set_parms_nooptype(const H5T_t *type, unsigned cd_values[])
     cd_values[cd_values_index++] = H5Z_NBIT_NOOPTYPE;
 
     /* Get datatype's size */
-    if((dtype_size = H5T_get_size(type)) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if ((dtype_size = H5T_get_size(type)) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
     /* Set "local" parameter for datatype size */
     cd_values[cd_values_index++] = dtype_size;
@@ -409,7 +408,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_parms_nooptype() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_set_parms_atomic
  *
@@ -429,11 +427,11 @@ done:
 static herr_t
 H5Z_set_parms_atomic(const H5T_t *type, unsigned cd_values[])
 {
-    H5T_order_t dtype_order;    /* Atomic datatype's endianness order */
-    size_t dtype_size;          /* Atomic datatype's size (in bytes) */
-    size_t dtype_precision;     /* Atomic datatype's precision (in bits) */
-    int dtype_offset;           /* Atomic datatype's offset (in bits) */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5T_order_t dtype_order;         /* Atomic datatype's endianness order */
+    size_t      dtype_size;          /* Atomic datatype's size (in bytes) */
+    size_t      dtype_precision;     /* Atomic datatype's precision (in bits) */
+    int         dtype_offset;        /* Atomic datatype's offset (in bits) */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -441,23 +439,23 @@ H5Z_set_parms_atomic(const H5T_t *type, unsigned cd_values[])
     cd_values[cd_values_index++] = H5Z_NBIT_ATOMIC;
 
     /* Get datatype's size */
-    if((dtype_size = H5T_get_size(type)) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if ((dtype_size = H5T_get_size(type)) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
     /* Set "local" parameter for datatype size */
     cd_values[cd_values_index++] = dtype_size;
 
     /* Get datatype's endianness order */
-    if((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
+    if ((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype endianness order")
 
     /* Set "local" parameter for datatype endianness */
-    switch(dtype_order) {
-        case H5T_ORDER_LE:      /* Little-endian byte order */
+    switch (dtype_order) {
+        case H5T_ORDER_LE: /* Little-endian byte order */
             cd_values[cd_values_index++] = H5Z_NBIT_ORDER_LE;
             break;
 
-        case H5T_ORDER_BE:      /* Big-endian byte order */
+        case H5T_ORDER_BE: /* Big-endian byte order */
             cd_values[cd_values_index++] = H5Z_NBIT_ORDER_BE;
             break;
 
@@ -466,16 +464,16 @@ H5Z_set_parms_atomic(const H5T_t *type, unsigned cd_values[])
     } /* end switch */
 
     /* Get datatype's precision */
-    if((dtype_precision = H5T_get_precision(type)) == 0)
+    if ((dtype_precision = H5T_get_precision(type)) == 0)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype precision")
 
     /* Get datatype's offset */
-    if((dtype_offset = H5T_get_offset(type)) < 0)
+    if ((dtype_offset = H5T_get_offset(type)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype offset")
 
     /* Check values of precision and offset */
-    if(dtype_precision > dtype_size * 8 || (dtype_precision + dtype_offset) > dtype_size * 8
-            || dtype_precision <= 0 || dtype_offset < 0)
+    if (dtype_precision > dtype_size * 8 || (dtype_precision + dtype_offset) > dtype_size * 8 ||
+        dtype_precision <= 0 || dtype_offset < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
 
     /* Set "local" parameter for datatype precision */
@@ -488,14 +486,13 @@ H5Z_set_parms_atomic(const H5T_t *type, unsigned cd_values[])
      * compress at this point. If current datatype is not full-precision,
      * flag need_not_compress should be set to FALSE.
      */
-    if(need_not_compress) /* so far no need to compress */
-       if(dtype_offset != 0 || dtype_precision != dtype_size * 8)
-          need_not_compress = FALSE;
+    if (need_not_compress) /* so far no need to compress */
+        if (dtype_offset != 0 || dtype_precision != dtype_size * 8)
+            need_not_compress = FALSE;
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_parms_atomic() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_set_parms_array
  *
@@ -515,11 +512,11 @@ done:
 static herr_t
 H5Z_set_parms_array(const H5T_t *type, unsigned cd_values[])
 {
-    H5T_t *dtype_base = NULL;      /* Array datatype's base datatype */
-    H5T_class_t dtype_base_class;  /* Array datatype's base datatype's class */
-    size_t dtype_size;             /* Array datatype's size (in bytes) */
-    htri_t is_vlstring;            /* flag indicating if datatype is varible-length string */
-    herr_t ret_value=SUCCEED;      /* Return value */
+    H5T_t *     dtype_base = NULL;   /* Array datatype's base datatype */
+    H5T_class_t dtype_base_class;    /* Array datatype's base datatype's class */
+    size_t      dtype_size;          /* Array datatype's size (in bytes) */
+    htri_t      is_vlstring;         /* flag indicating if datatype is varible-length string */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -527,61 +524,61 @@ H5Z_set_parms_array(const H5T_t *type, unsigned cd_values[])
     cd_values[cd_values_index++] = H5Z_NBIT_ARRAY;
 
     /* Get array datatype's size */
-    if((dtype_size = H5T_get_size(type)) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if ((dtype_size = H5T_get_size(type)) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
     /* Set "local" parameter for array datatype's size */
-    cd_values[cd_values_index++]=dtype_size;
+    cd_values[cd_values_index++] = dtype_size;
 
     /* Get array datatype's base datatype */
-    if(NULL == (dtype_base = H5T_get_super(type)))
+    if (NULL == (dtype_base = H5T_get_super(type)))
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad base datatype")
 
     /* Get base datatype's class */
-    if((dtype_base_class = H5T_get_class(dtype_base, TRUE)) == H5T_NO_CLASS)
+    if ((dtype_base_class = H5T_get_class(dtype_base, TRUE)) == H5T_NO_CLASS)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad base datatype class")
 
     /* Call appropriate function according to base datatype's class */
-    switch(dtype_base_class) {
+    switch (dtype_base_class) {
         case H5T_INTEGER:
         case H5T_FLOAT:
-            if(H5Z_set_parms_atomic(dtype_base, cd_values) == FAIL)
+            if (H5Z_set_parms_atomic(dtype_base, cd_values) == FAIL)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
             break;
 
         case H5T_ARRAY:
-            if(H5Z_set_parms_array(dtype_base, cd_values) == FAIL)
+            if (H5Z_set_parms_array(dtype_base, cd_values) == FAIL)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
             break;
 
         case H5T_COMPOUND:
-            if(H5Z_set_parms_compound(dtype_base, cd_values) == FAIL)
+            if (H5Z_set_parms_compound(dtype_base, cd_values) == FAIL)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
             break;
 
         default: /* other datatype that nbit does no compression */
             /* Check if base datatype is a variable-length string */
-            if((is_vlstring = H5T_is_variable_str(dtype_base)) < 0)
-                HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot determine if datatype is a variable-length string")
+            if ((is_vlstring = H5T_is_variable_str(dtype_base)) < 0)
+                HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL,
+                            "cannot determine if datatype is a variable-length string")
 
             /* base datatype of VL or VL-string is not supported */
-            if(dtype_base_class == H5T_VLEN || is_vlstring)
+            if (dtype_base_class == H5T_VLEN || is_vlstring)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "datatype not supported by nbit")
 
-            if(H5Z_set_parms_nooptype(dtype_base, cd_values) == FAIL)
+            if (H5Z_set_parms_nooptype(dtype_base, cd_values) == FAIL)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
             break;
     } /* end switch */
 
 done:
-    if(dtype_base)
-        if(H5T_close(dtype_base) < 0)
+    if (dtype_base)
+        if (H5T_close(dtype_base) < 0)
             HDONE_ERROR(H5E_PLINE, H5E_CLOSEERROR, FAIL, "Unable to close base datatype")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_parms_array() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_set_parms_compound
  *
@@ -601,15 +598,15 @@ done:
 static herr_t
 H5Z_set_parms_compound(const H5T_t *type, unsigned cd_values[])
 {
-    int         nmembers;           /* Compound datatype's number of members */
-    H5T_t *dtype_member = NULL;     /* Compound datatype's member datatype */
-    H5T_class_t dtype_member_class; /* Compound datatype's member datatype's class */
-    size_t dtype_member_offset;     /* Compound datatype's current member datatype's offset (in bytes) */
-    size_t dtype_next_member_offset;/* Compound datatype's next member datatype's offset (in bytes) */
-    size_t dtype_size;              /* Compound datatype's size (in bytes) */
-    htri_t is_vlstring;             /* flag indicating if datatype is varible-length string */
-    unsigned u;                     /* Local index variable */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    int         nmembers;            /* Compound datatype's number of members */
+    H5T_t *     dtype_member = NULL; /* Compound datatype's member datatype */
+    H5T_class_t dtype_member_class;  /* Compound datatype's member datatype's class */
+    size_t      dtype_member_offset; /* Compound datatype's current member datatype's offset (in bytes) */
+    size_t      dtype_next_member_offset; /* Compound datatype's next member datatype's offset (in bytes) */
+    size_t      dtype_size;               /* Compound datatype's size (in bytes) */
+    htri_t      is_vlstring;              /* flag indicating if datatype is varible-length string */
+    unsigned    u;                        /* Local index variable */
+    herr_t      ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -617,96 +614,96 @@ H5Z_set_parms_compound(const H5T_t *type, unsigned cd_values[])
     cd_values[cd_values_index++] = H5Z_NBIT_COMPOUND;
 
     /* Get datatype's size */
-    if((dtype_size = H5T_get_size(type)) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if ((dtype_size = H5T_get_size(type)) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
     /* Set "local" parameter for compound datatype size */
     cd_values[cd_values_index++] = dtype_size;
 
     /* Get number of members */
-    if((nmembers = H5T_get_nmembers(type)) < 0)
+    if ((nmembers = H5T_get_nmembers(type)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype number of members")
 
     /* Set "local" parameter for number of members */
     cd_values[cd_values_index++] = nmembers;
 
     /* For each member, set parameters */
-    for(u = 0; u < (unsigned)nmembers; u++) {
+    for (u = 0; u < (unsigned)nmembers; u++) {
         /* Get member datatype */
-        if(NULL == (dtype_member = H5T_get_member_type(type, u, H5T_COPY_TRANSIENT)))
+        if (NULL == (dtype_member = H5T_get_member_type(type, u, H5T_COPY_TRANSIENT)))
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad member datatype")
 
         /* Get member datatype's class */
-        if((dtype_member_class = H5T_get_class(dtype_member, TRUE)) < 0)
+        if ((dtype_member_class = H5T_get_class(dtype_member, TRUE)) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad member datatype class")
 
         /* Get member offset, success if H5T_get_class() success */
-        dtype_member_offset =  H5T_get_member_offset(type, u);
+        dtype_member_offset = H5T_get_member_offset(type, u);
 
         /* Set "local" parameter for member offset */
         cd_values[cd_values_index++] = dtype_member_offset;
 
         /* Call appropriate function according to member's datatype class */
-        switch(dtype_member_class) {
+        switch (dtype_member_class) {
             case H5T_INTEGER:
             case H5T_FLOAT:
-                if(H5Z_set_parms_atomic(dtype_member, cd_values) == FAIL)
+                if (H5Z_set_parms_atomic(dtype_member, cd_values) == FAIL)
                     HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
                 break;
 
             case H5T_ARRAY:
-                if(H5Z_set_parms_array(dtype_member, cd_values) == FAIL)
+                if (H5Z_set_parms_array(dtype_member, cd_values) == FAIL)
                     HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
                 break;
 
             case H5T_COMPOUND:
-                if(H5Z_set_parms_compound(dtype_member, cd_values) == FAIL)
+                if (H5Z_set_parms_compound(dtype_member, cd_values) == FAIL)
                     HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
                 break;
 
             default: /* other datatype that nbit does no compression */
                 /* Check if datatype is a variable-length string */
-                if((is_vlstring = H5T_is_variable_str(dtype_member)) < 0)
-                    HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot determine if datatype is a variable-length string")
+                if ((is_vlstring = H5T_is_variable_str(dtype_member)) < 0)
+                    HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL,
+                                "cannot determine if datatype is a variable-length string")
 
                 /* Because for some no-op datatype (VL datatype and VL string datatype), its
-		 * size can not be retrieved correctly by using function call H5T_get_size,
-		 * special handling is needed for getting the size. Here the difference between
+                 * size can not be retrieved correctly by using function call H5T_get_size,
+                 * special handling is needed for getting the size. Here the difference between
                  * adjacent member offset is used (if alignment is present, the result can be
-		 * larger, but it does not affect the nbit filter's correctness).
+                 * larger, but it does not affect the nbit filter's correctness).
                  */
-                if(dtype_member_class == H5T_VLEN || is_vlstring) {
+                if (dtype_member_class == H5T_VLEN || is_vlstring) {
                     /* Set datatype class code */
                     cd_values[cd_values_index++] = H5Z_NBIT_NOOPTYPE;
 
-                    if(u != (unsigned)nmembers - 1)
+                    if (u != (unsigned)nmembers - 1)
                         dtype_next_member_offset = H5T_get_member_offset(type, u + 1);
                     else /* current member is the last member */
                         dtype_next_member_offset = dtype_size;
 
                     /* Set "local" parameter for datatype size */
                     cd_values[cd_values_index++] = dtype_next_member_offset - dtype_member_offset;
-                } else
-                    if(H5Z_set_parms_nooptype(dtype_member, cd_values)==FAIL)
-                        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
+                }
+                else if (H5Z_set_parms_nooptype(dtype_member, cd_values) == FAIL)
+                    HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
                 break;
         } /* end switch */
 
         /* Close member datatype */
-        if(H5T_close(dtype_member) < 0)
+        if (H5T_close(dtype_member) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CLOSEERROR, FAIL, "Unable to close member datatype")
         dtype_member = NULL;
     } /* end for */
 
 done:
-    if(dtype_member)
-        if(H5T_close(dtype_member) < 0)
+    if (dtype_member)
+        if (H5T_close(dtype_member) < 0)
             HDONE_ERROR(H5E_PLINE, H5E_CLOSEERROR, FAIL, "Unable to close member datatype")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_params_compound */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_set_local_nbit
  *
@@ -725,25 +722,25 @@ done:
 static herr_t
 H5Z_set_local_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id)
 {
-    H5P_genplist_t *dcpl_plist;     /* Property list pointer */
-    const H5T_t	*type;              /* Datatype */
-    const H5S_t	*ds;                /* Dataspace */
-    unsigned flags;                 /* Filter flags */
-    size_t cd_nelmts = H5Z_NBIT_USER_NPARMS;  /* Number of filter parameters */
-    unsigned *cd_values = NULL;     /* Filter parameters */
-    hssize_t npoints;               /* Number of points in the dataspace */
-    H5T_class_t dtype_class;        /* Datatype's class */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5P_genplist_t *dcpl_plist;                       /* Property list pointer */
+    const H5T_t *   type;                             /* Datatype */
+    const H5S_t *   ds;                               /* Dataspace */
+    unsigned        flags;                            /* Filter flags */
+    size_t          cd_nelmts = H5Z_NBIT_USER_NPARMS; /* Number of filter parameters */
+    unsigned *      cd_values = NULL;                 /* Filter parameters */
+    hssize_t        npoints;                          /* Number of points in the dataspace */
+    H5T_class_t     dtype_class;                      /* Datatype's class */
+    herr_t          ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get datatype */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Get datatype's class */
-    if((dtype_class = H5T_get_class(type, TRUE)) == H5T_NO_CLASS)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
+    if ((dtype_class = H5T_get_class(type, TRUE)) == H5T_NO_CLASS)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
 
     /* Calculate how many parameters will fill the cd_values array
      * First three parameters reserved for:
@@ -752,48 +749,49 @@ H5Z_set_local_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id)
      *   3. number of elements in the chunk
      */
     cd_values_actual_nparms = 3;
-    switch(dtype_class) {
+    switch (dtype_class) {
         case H5T_INTEGER:
         case H5T_FLOAT:
             H5Z_calc_parms_atomic();
             break;
 
         case H5T_ARRAY:
-            if(H5Z_calc_parms_array(type) == FAIL)
+            if (H5Z_calc_parms_array(type) == FAIL)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot compute parameters for datatype")
             break;
 
         case H5T_COMPOUND:
-            if(H5Z_calc_parms_compound(type) == FAIL)
+            if (H5Z_calc_parms_compound(type) == FAIL)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot compute parameters for datatype")
             break;
 
         default: /* no need to calculate other datatypes at top level */
-             break;
+            break;
     } /* end switch */
 
     /* Check if the number of parameters exceed what cd_values[] can store */
-    if(cd_values_actual_nparms > H5Z_NBIT_MAX_NPARMS)
+    if (cd_values_actual_nparms > H5Z_NBIT_MAX_NPARMS)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "datatype needs too many nbit parameters")
 
     /* Allocate memory space for cd_values[] */
-    if(NULL == (cd_values = (unsigned *)H5MM_malloc(cd_values_actual_nparms * sizeof(unsigned))))
+    if (NULL == (cd_values = (unsigned *)H5MM_malloc(cd_values_actual_nparms * sizeof(unsigned))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for cd_values[]")
 
     /* Get the plist structure */
-    if(NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
+    if (NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the filter's current parameters */
-    if(H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_NBIT, &flags, &cd_nelmts, cd_values, (size_t)0, NULL, NULL) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get nbit parameters")
+    if (H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_NBIT, &flags, &cd_nelmts, cd_values, (size_t)0, NULL,
+                             NULL) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get nbit parameters")
 
     /* Get dataspace */
-    if(NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
     /* Get total number of elements in the chunk */
-    if((npoints = H5S_GET_EXTENT_NPOINTS(ds)) < 0)
+    if ((npoints = H5S_GET_EXTENT_NPOINTS(ds)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get number of points in the dataspace")
     HDassert(npoints);
 
@@ -807,25 +805,25 @@ H5Z_set_local_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id)
     need_not_compress = TRUE;
 
     /* Call appropriate function according to the datatype class */
-    switch(dtype_class) {
+    switch (dtype_class) {
         case H5T_INTEGER:
         case H5T_FLOAT:
-            if(H5Z_set_parms_atomic(type, cd_values) < 0)
+            if (H5Z_set_parms_atomic(type, cd_values) < 0)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
             break;
 
         case H5T_ARRAY:
-            if(H5Z_set_parms_array(type, cd_values) < 0)
+            if (H5Z_set_parms_array(type, cd_values) < 0)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
             break;
 
         case H5T_COMPOUND:
-            if(H5Z_set_parms_compound(type, cd_values) < 0)
+            if (H5Z_set_parms_compound(type, cd_values) < 0)
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "nbit cannot set parameters for datatype")
             break;
 
         default: /* no need to set parameters for other datatypes at top level */
-             break;
+            break;
     } /* end switch */
 
     /* Check if calculation of parameters matches with setting of parameters */
@@ -836,17 +834,16 @@ H5Z_set_local_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id)
     cd_values[1] = need_not_compress;
 
     /* Modify the filter's parameters for this dataset */
-    if(H5P_modify_filter(dcpl_plist, H5Z_FILTER_NBIT, flags, cd_values_actual_nparms, cd_values) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local nbit parameters")
+    if (H5P_modify_filter(dcpl_plist, H5Z_FILTER_NBIT, flags, cd_values_actual_nparms, cd_values) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local nbit parameters")
 
 done:
-    if(cd_values)
-	H5MM_xfree(cd_values);
+    if (cd_values)
+        H5MM_xfree(cd_values);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_local_nbit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_nbit
  *
@@ -861,41 +858,41 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5Z_filter_nbit(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
-                size_t nbytes, size_t *buf_size, void **buf)
+H5Z_filter_nbit(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes, size_t *buf_size,
+                void **buf)
 {
-    unsigned char *outbuf;      /* pointer to new output buffer */
-    size_t size_out  = 0;       /* size of output buffer */
-    unsigned d_nelmts = 0;      /* number of elements in the chunk */
-    size_t ret_value = 0;       /* return value */
+    unsigned char *outbuf;        /* pointer to new output buffer */
+    size_t         size_out  = 0; /* size of output buffer */
+    unsigned       d_nelmts  = 0; /* number of elements in the chunk */
+    size_t         ret_value = 0; /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check arguments
      * cd_values[0] stores actual number of parameters in cd_values[]
      */
-    if(cd_nelmts != cd_values[0])
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid nbit aggression level")
+    if (cd_nelmts != cd_values[0])
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid nbit aggression level")
 
     /* check if need to do nbit compress or decompress
      * cd_values[1] stores the flag if true indicating no need to compress
      */
-    if(cd_values[1])
+    if (cd_values[1])
         HGOTO_DONE(*buf_size)
 
     /* copy a filter parameter to d_nelmts */
     d_nelmts = cd_values[2];
 
     /* input; decompress */
-    if(flags & H5Z_FLAG_REVERSE) {
+    if (flags & H5Z_FLAG_REVERSE) {
         size_out = d_nelmts * cd_values[4]; /* cd_values[4] stores datatype size */
 
         /* allocate memory space for decompressed buffer */
-        if(NULL == (outbuf = (unsigned char *)H5MM_malloc(size_out)))
+        if (NULL == (outbuf = (unsigned char *)H5MM_malloc(size_out)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for nbit decompression")
 
         /* decompress the buffer */
-        if(H5Z__nbit_decompress(outbuf, d_nelmts, (unsigned char *)*buf, cd_values) < 0)
+        if (H5Z__nbit_decompress(outbuf, d_nelmts, (unsigned char *)*buf, cd_values) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, 0, "can't decompress buffer")
     } /* end if */
     /* output; compress */
@@ -905,7 +902,7 @@ H5Z_filter_nbit(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
         size_out = nbytes;
 
         /* allocate memory space for compressed buffer */
-        if(NULL == (outbuf = (unsigned char *)H5MM_malloc(size_out)))
+        if (NULL == (outbuf = (unsigned char *)H5MM_malloc(size_out)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for nbit compression")
 
         /* compress the buffer, size_out will be changed */
@@ -916,7 +913,7 @@ H5Z_filter_nbit(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
     H5MM_xfree(*buf);
 
     /* set return values */
-    *buf = outbuf;
+    *buf      = outbuf;
     *buf_size = size_out;
     ret_value = size_out;
 
@@ -935,538 +932,538 @@ done:
 static void
 H5Z_nbit_next_byte(size_t *j, int *buf_len)
 {
-   ++(*j);
-   *buf_len = 8 * sizeof(unsigned char);
+    ++(*j);
+    *buf_len = 8 * sizeof(unsigned char);
 }
 
 static void
-H5Z_nbit_decompress_one_byte(unsigned char *data, size_t data_offset, int k,
-    int begin_i, int end_i, unsigned char *buffer, size_t *j, int *buf_len,
-    parms_atomic p, int datatype_len)
+H5Z_nbit_decompress_one_byte(unsigned char *data, size_t data_offset, int k, int begin_i, int end_i,
+                             unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p, int datatype_len)
 {
-   int dat_len; /* dat_len is the number of bits to be copied in each data byte */
-   int uchar_offset;
-   unsigned char val; /* value to be copied in each data byte */
-
-   /* initialize value and bits of unsigned char to be copied */
-   val = buffer[*j];
-   uchar_offset = 0;
-
-   if(begin_i != end_i) { /* significant bits occupy >1 unsigned char */
-      if(k == begin_i)
-         dat_len = 8 - (datatype_len - p.precision - p.offset) % 8;
-      else if(k == end_i) {
-         dat_len = 8 - p.offset %8;
-         uchar_offset = 8 - dat_len;
-      }
-      else
-         dat_len = 8;
-   } else { /* all significant bits in one unsigned char */
-      uchar_offset = p.offset % 8;
-      dat_len = p.precision;
-   }
-
-   if(*buf_len > dat_len) {
-      data[data_offset + k] =
-      ((val >> (*buf_len - dat_len)) & ~(~0 << dat_len)) << uchar_offset;
-      *buf_len -= dat_len;
-   } else {
-      data[data_offset + k] =
-      ((val & ~(~0 << *buf_len)) << (dat_len - *buf_len)) << uchar_offset;
-      dat_len -= *buf_len;
-      H5Z_nbit_next_byte(j, buf_len);
-      if(dat_len == 0) return;
-
-      val = buffer[*j];
-      data[data_offset + k] |=
-      ((val >> (*buf_len - dat_len)) & ~(~0 << dat_len)) << uchar_offset;
-      *buf_len -= dat_len;
-   }
+    int           dat_len; /* dat_len is the number of bits to be copied in each data byte */
+    int           uchar_offset;
+    unsigned char val; /* value to be copied in each data byte */
+
+    /* initialize value and bits of unsigned char to be copied */
+    val          = buffer[*j];
+    uchar_offset = 0;
+
+    if (begin_i != end_i) { /* significant bits occupy >1 unsigned char */
+        if (k == begin_i)
+            dat_len = 8 - (datatype_len - p.precision - p.offset) % 8;
+        else if (k == end_i) {
+            dat_len      = 8 - p.offset % 8;
+            uchar_offset = 8 - dat_len;
+        }
+        else
+            dat_len = 8;
+    }
+    else { /* all significant bits in one unsigned char */
+        uchar_offset = p.offset % 8;
+        dat_len      = p.precision;
+    }
+
+    if (*buf_len > dat_len) {
+        data[data_offset + k] = ((val >> (*buf_len - dat_len)) & ~(~0 << dat_len)) << uchar_offset;
+        *buf_len -= dat_len;
+    }
+    else {
+        data[data_offset + k] = ((val & ~(~0 << *buf_len)) << (dat_len - *buf_len)) << uchar_offset;
+        dat_len -= *buf_len;
+        H5Z_nbit_next_byte(j, buf_len);
+        if (dat_len == 0)
+            return;
+
+        val = buffer[*j];
+        data[data_offset + k] |= ((val >> (*buf_len - dat_len)) & ~(~0 << dat_len)) << uchar_offset;
+        *buf_len -= dat_len;
+    }
 }
 
 static void
-H5Z_nbit_decompress_one_nooptype(unsigned char *data, size_t data_offset,
-                       unsigned char *buffer, size_t *j, int *buf_len, unsigned size)
+H5Z_nbit_decompress_one_nooptype(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                                 int *buf_len, unsigned size)
 {
-   unsigned i;        /* index */
-   unsigned dat_len;  /* dat_len is the number of bits to be copied in each data byte */
-   unsigned char val; /* value to be copied in each data byte */
-
-   for(i = 0; i < size; i++) {
-      /* initialize value and bits of unsigned char to be copied */
-      val = buffer[*j];
-      dat_len = sizeof(unsigned char) * 8;
-
-      data[data_offset + i] = ((val & ~(~0 << *buf_len)) << (dat_len - *buf_len));
-      dat_len -= *buf_len;
-      H5Z_nbit_next_byte(j, buf_len);
-      if(dat_len == 0) continue;
-
-      val = buffer[*j];
-      data[data_offset + i] |= ((val >> (*buf_len - dat_len)) & ~(~0 << dat_len));
-      *buf_len -= dat_len;
-   }
+    unsigned      i;       /* index */
+    unsigned      dat_len; /* dat_len is the number of bits to be copied in each data byte */
+    unsigned char val;     /* value to be copied in each data byte */
+
+    for (i = 0; i < size; i++) {
+        /* initialize value and bits of unsigned char to be copied */
+        val     = buffer[*j];
+        dat_len = sizeof(unsigned char) * 8;
+
+        data[data_offset + i] = ((val & ~(~0 << *buf_len)) << (dat_len - *buf_len));
+        dat_len -= *buf_len;
+        H5Z_nbit_next_byte(j, buf_len);
+        if (dat_len == 0)
+            continue;
+
+        val = buffer[*j];
+        data[data_offset + i] |= ((val >> (*buf_len - dat_len)) & ~(~0 << dat_len));
+        *buf_len -= dat_len;
+    }
 }
 
 static void
-H5Z_nbit_decompress_one_atomic(unsigned char *data, size_t data_offset,
-                    unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p)
+H5Z_nbit_decompress_one_atomic(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                               int *buf_len, parms_atomic p)
 {
-   /* begin_i: the index of byte having first significant bit
-      end_i: the index of byte having last significant bit */
-   int k, begin_i, end_i, datatype_len;
-
-   datatype_len = p.size * 8;
-
-   if(p.order == H5Z_NBIT_ORDER_LE) { /* little endian */
-      /* calculate begin_i and end_i */
-      if((p.precision + p.offset) % 8 != 0)
-         begin_i = (p.precision + p.offset) / 8;
-      else
-         begin_i = (p.precision + p.offset) / 8 - 1;
-      end_i = p.offset / 8;
-
-      for(k = begin_i; k >= end_i; k--)
-         H5Z_nbit_decompress_one_byte(data, data_offset, k, begin_i, end_i,
-                                      buffer, j, buf_len, p, datatype_len);
-   }
-
-   if(p.order == H5Z_NBIT_ORDER_BE) { /* big endian */
-      /* calculate begin_i and end_i */
-      begin_i = (datatype_len - p.precision - p.offset) / 8;
-      if(p.offset % 8 != 0)
-         end_i = (datatype_len - p.offset) / 8;
-      else
-         end_i = (datatype_len - p.offset) / 8 - 1;
-
-      for(k = begin_i; k <= end_i; k++)
-         H5Z_nbit_decompress_one_byte(data, data_offset, k, begin_i, end_i,
-                                      buffer, j, buf_len, p, datatype_len);
-   }
+    /* begin_i: the index of byte having first significant bit
+       end_i: the index of byte having last significant bit */
+    int k, begin_i, end_i, datatype_len;
+
+    datatype_len = p.size * 8;
+
+    if (p.order == H5Z_NBIT_ORDER_LE) { /* little endian */
+        /* calculate begin_i and end_i */
+        if ((p.precision + p.offset) % 8 != 0)
+            begin_i = (p.precision + p.offset) / 8;
+        else
+            begin_i = (p.precision + p.offset) / 8 - 1;
+        end_i = p.offset / 8;
+
+        for (k = begin_i; k >= end_i; k--)
+            H5Z_nbit_decompress_one_byte(data, data_offset, k, begin_i, end_i, buffer, j, buf_len, p,
+                                         datatype_len);
+    }
+
+    if (p.order == H5Z_NBIT_ORDER_BE) { /* big endian */
+        /* calculate begin_i and end_i */
+        begin_i = (datatype_len - p.precision - p.offset) / 8;
+        if (p.offset % 8 != 0)
+            end_i = (datatype_len - p.offset) / 8;
+        else
+            end_i = (datatype_len - p.offset) / 8 - 1;
+
+        for (k = begin_i; k <= end_i; k++)
+            H5Z_nbit_decompress_one_byte(data, data_offset, k, begin_i, end_i, buffer, j, buf_len, p,
+                                         datatype_len);
+    }
 }
 
 static herr_t
-H5Z__nbit_decompress_one_array(unsigned char *data, size_t data_offset,
-           unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[])
+H5Z__nbit_decompress_one_array(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                               int *buf_len, const unsigned parms[])
 {
-   unsigned i, total_size, base_class, base_size, n, begin_index;
-   parms_atomic p;
-   herr_t ret_value = SUCCEED; /* Return value */
-
-   FUNC_ENTER_STATIC
-
-   total_size = parms[parms_index++];
-   base_class = parms[parms_index++];
-
-   switch(base_class) {
-      case H5Z_NBIT_ATOMIC:
-           p.size = parms[parms_index++];
-           p.order = parms[parms_index++];
-           p.precision = parms[parms_index++];
-           p.offset = parms[parms_index++];
-
-           /* Check values of precision and offset */
-           if(p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
-              HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
-
-           n = total_size / p.size;
-           for(i = 0; i < n; i++)
-              H5Z_nbit_decompress_one_atomic(data, data_offset + i*p.size,
-                                             buffer, j, buf_len, p);
-           break;
-      case H5Z_NBIT_ARRAY:
-           base_size = parms[parms_index]; /* read in advance */
-           n = total_size/base_size; /* number of base_type elements inside the array datatype */
-           begin_index = parms_index;
-           for(i = 0; i < n; i++) {
-              if(H5Z__nbit_decompress_one_array(data, data_offset + i * base_size,
-                                            buffer, j, buf_len, parms) < 0)
-                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
-              parms_index = begin_index;
-           }
-           break;
-      case H5Z_NBIT_COMPOUND:
-           base_size = parms[parms_index]; /* read in advance */
-           n = total_size/base_size; /* number of base_type elements inside the array datatype */
-           begin_index = parms_index;
-           for(i = 0; i < n; i++) {
-              if(H5Z__nbit_decompress_one_compound(data, data_offset + i * base_size,
-                                               buffer, j, buf_len, parms) < 0)
-                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
-              parms_index = begin_index;
-           }
-           break;
-      case H5Z_NBIT_NOOPTYPE:
-           parms_index++; /* skip size of no-op type */
-           H5Z_nbit_decompress_one_nooptype(data, data_offset, buffer, j, buf_len, total_size);
-           break;
-      default:
-          HDassert(0 && "This Should never be executed!");
-   } /* end switch */
+    unsigned     i, total_size, base_class, base_size, n, begin_index;
+    parms_atomic p;
+    herr_t       ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_STATIC
+
+    total_size = parms[parms_index++];
+    base_class = parms[parms_index++];
+
+    switch (base_class) {
+        case H5Z_NBIT_ATOMIC:
+            p.size      = parms[parms_index++];
+            p.order     = parms[parms_index++];
+            p.precision = parms[parms_index++];
+            p.offset    = parms[parms_index++];
+
+            /* Check values of precision and offset */
+            if (p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
+                HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
+
+            n = total_size / p.size;
+            for (i = 0; i < n; i++)
+                H5Z_nbit_decompress_one_atomic(data, data_offset + i * p.size, buffer, j, buf_len, p);
+            break;
+        case H5Z_NBIT_ARRAY:
+            base_size   = parms[parms_index];     /* read in advance */
+            n           = total_size / base_size; /* number of base_type elements inside the array datatype */
+            begin_index = parms_index;
+            for (i = 0; i < n; i++) {
+                if (H5Z__nbit_decompress_one_array(data, data_offset + i * base_size, buffer, j, buf_len,
+                                                   parms) < 0)
+                    HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
+                parms_index = begin_index;
+            }
+            break;
+        case H5Z_NBIT_COMPOUND:
+            base_size   = parms[parms_index];     /* read in advance */
+            n           = total_size / base_size; /* number of base_type elements inside the array datatype */
+            begin_index = parms_index;
+            for (i = 0; i < n; i++) {
+                if (H5Z__nbit_decompress_one_compound(data, data_offset + i * base_size, buffer, j, buf_len,
+                                                      parms) < 0)
+                    HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
+                parms_index = begin_index;
+            }
+            break;
+        case H5Z_NBIT_NOOPTYPE:
+            parms_index++; /* skip size of no-op type */
+            H5Z_nbit_decompress_one_nooptype(data, data_offset, buffer, j, buf_len, total_size);
+            break;
+        default:
+            HDassert(0 && "This Should never be executed!");
+    } /* end switch */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
 static herr_t
-H5Z__nbit_decompress_one_compound(unsigned char *data, size_t data_offset,
-              unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[])
+H5Z__nbit_decompress_one_compound(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                                  int *buf_len, const unsigned parms[])
 {
-   unsigned i, nmembers, member_offset, member_class, member_size, used_size = 0, size;
-   parms_atomic p;
-   herr_t ret_value = SUCCEED; /* Return value */
-
-   FUNC_ENTER_STATIC
-
-   size = parms[parms_index++];
-   nmembers = parms[parms_index++];
-
-   for(i = 0; i < nmembers; i++) {
-      member_offset = parms[parms_index++];
-      member_class = parms[parms_index++];
-
-      /* Check for overflow */
-      member_size = parms[parms_index];
-      used_size += member_size;
-      if(used_size > size)
-         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "compound member offset overflowed compound size")
-      switch(member_class) {
-         case H5Z_NBIT_ATOMIC:
-              p.size = member_size;
-              /* Advance past member size */
-              parms_index++;
-              p.order = parms[parms_index++];
-              p.precision = parms[parms_index++];
-              p.offset = parms[parms_index++];
-
-              /* Check values of precision and offset */
-              if(p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
-                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
-
-              H5Z_nbit_decompress_one_atomic(data, data_offset + member_offset,
-                                             buffer, j, buf_len, p);
-              break;
-         case H5Z_NBIT_ARRAY:
-              if(H5Z__nbit_decompress_one_array(data, data_offset + member_offset,
-                                            buffer, j, buf_len, parms) < 0)
-                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
-              break;
-         case H5Z_NBIT_COMPOUND:
-              if(H5Z__nbit_decompress_one_compound(data, data_offset+member_offset,
-                                            buffer, j, buf_len, parms) < 0)
-                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
-              break;
-         case H5Z_NBIT_NOOPTYPE:
-              /* Advance past member size */
-              parms_index++;
-              H5Z_nbit_decompress_one_nooptype(data, data_offset+member_offset,
-                                               buffer, j, buf_len, member_size);
-              break;
-          default:
-              HDassert(0 && "This Should never be executed!");
-      } /* end switch */
-   }
+    unsigned     i, nmembers, member_offset, member_class, member_size, used_size = 0, size;
+    parms_atomic p;
+    herr_t       ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_STATIC
+
+    size     = parms[parms_index++];
+    nmembers = parms[parms_index++];
+
+    for (i = 0; i < nmembers; i++) {
+        member_offset = parms[parms_index++];
+        member_class  = parms[parms_index++];
+
+        /* Check for overflow */
+        member_size = parms[parms_index];
+        used_size += member_size;
+        if (used_size > size)
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "compound member offset overflowed compound size")
+        switch (member_class) {
+            case H5Z_NBIT_ATOMIC:
+                p.size = member_size;
+                /* Advance past member size */
+                parms_index++;
+                p.order     = parms[parms_index++];
+                p.precision = parms[parms_index++];
+                p.offset    = parms[parms_index++];
+
+                /* Check values of precision and offset */
+                if (p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
+                    HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
+
+                H5Z_nbit_decompress_one_atomic(data, data_offset + member_offset, buffer, j, buf_len, p);
+                break;
+            case H5Z_NBIT_ARRAY:
+                if (H5Z__nbit_decompress_one_array(data, data_offset + member_offset, buffer, j, buf_len,
+                                                   parms) < 0)
+                    HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
+                break;
+            case H5Z_NBIT_COMPOUND:
+                if (H5Z__nbit_decompress_one_compound(data, data_offset + member_offset, buffer, j, buf_len,
+                                                      parms) < 0)
+                    HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
+                break;
+            case H5Z_NBIT_NOOPTYPE:
+                /* Advance past member size */
+                parms_index++;
+                H5Z_nbit_decompress_one_nooptype(data, data_offset + member_offset, buffer, j, buf_len,
+                                                 member_size);
+                break;
+            default:
+                HDassert(0 && "This Should never be executed!");
+        } /* end switch */
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
 static herr_t
-H5Z__nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
-                                const unsigned parms[])
+H5Z__nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer, const unsigned parms[])
 {
-   /* i: index of data, j: index of buffer,
-      buf_len: number of bits to be filled in current byte */
-   size_t i, j, size;
-   int buf_len;
-   parms_atomic p;
-   herr_t ret_value = SUCCEED; /* Return value */
-
-   FUNC_ENTER_STATIC
-
-   /* may not have to initialize to zeros */
-   for(i = 0; i < d_nelmts*parms[4]; i++) data[i] = 0;
-
-   /* initialization before the loop */
-   j = 0;
-   buf_len = sizeof(unsigned char) * 8;
-
-   switch(parms[3]) {
-      case H5Z_NBIT_ATOMIC:
-           /* set the index before goto function call */
-           p.size = parms[4];
-           p.order = parms[5];
-           p.precision = parms[6];
-           p.offset = parms[7];
-
-           /* Check values of precision and offset */
-           if(p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
-              HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
-
-           for(i = 0; i < d_nelmts; i++) {
-              H5Z_nbit_decompress_one_atomic(data, i*p.size, buffer, &j, &buf_len, p);
-           }
-           break;
-      case H5Z_NBIT_ARRAY:
-           size = parms[4];
-           parms_index = 4;
-           for(i = 0; i < d_nelmts; i++) {
-              if(H5Z__nbit_decompress_one_array(data, i*size, buffer, &j, &buf_len, parms) < 0)
-                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
-              parms_index = 4;
-           }
-           break;
-      case H5Z_NBIT_COMPOUND:
-           size = parms[4];
-           parms_index = 4;
-           for(i = 0; i < d_nelmts; i++) {
-              if(H5Z__nbit_decompress_one_compound(data, i*size, buffer, &j, &buf_len, parms) < 0)
-                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
-              parms_index = 4;
-           }
-           break;
-      default:
-          HDassert(0 && "This Should never be executed!");
-   } /* end switch */
+    /* i: index of data, j: index of buffer,
+       buf_len: number of bits to be filled in current byte */
+    size_t       i, j, size;
+    int          buf_len;
+    parms_atomic p;
+    herr_t       ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_STATIC
+
+    /* may not have to initialize to zeros */
+    for (i = 0; i < d_nelmts * parms[4]; i++)
+        data[i] = 0;
+
+    /* initialization before the loop */
+    j       = 0;
+    buf_len = sizeof(unsigned char) * 8;
+
+    switch (parms[3]) {
+        case H5Z_NBIT_ATOMIC:
+            /* set the index before goto function call */
+            p.size      = parms[4];
+            p.order     = parms[5];
+            p.precision = parms[6];
+            p.offset    = parms[7];
+
+            /* Check values of precision and offset */
+            if (p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
+                HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
+
+            for (i = 0; i < d_nelmts; i++) {
+                H5Z_nbit_decompress_one_atomic(data, i * p.size, buffer, &j, &buf_len, p);
+            }
+            break;
+        case H5Z_NBIT_ARRAY:
+            size        = parms[4];
+            parms_index = 4;
+            for (i = 0; i < d_nelmts; i++) {
+                if (H5Z__nbit_decompress_one_array(data, i * size, buffer, &j, &buf_len, parms) < 0)
+                    HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
+                parms_index = 4;
+            }
+            break;
+        case H5Z_NBIT_COMPOUND:
+            size        = parms[4];
+            parms_index = 4;
+            for (i = 0; i < d_nelmts; i++) {
+                if (H5Z__nbit_decompress_one_compound(data, i * size, buffer, &j, &buf_len, parms) < 0)
+                    HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
+                parms_index = 4;
+            }
+            break;
+        default:
+            HDassert(0 && "This Should never be executed!");
+    } /* end switch */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-static void H5Z_nbit_compress_one_byte(unsigned char *data, size_t data_offset, int k, int begin_i,
-int end_i, unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p, int datatype_len)
+static void
+H5Z_nbit_compress_one_byte(unsigned char *data, size_t data_offset, int k, int begin_i, int end_i,
+                           unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p, int datatype_len)
 {
-   int dat_len; /* dat_len is the number of bits to be copied in each data byte */
-   unsigned char val; /* value to be copied in each data byte */
-
-   /* initialize value and bits of unsigned char to be copied */
-   val = data[data_offset + k];
-   if(begin_i != end_i) { /* significant bits occupy >1 unsigned char */
-      if(k == begin_i)
-         dat_len = 8 - (datatype_len - p.precision - p.offset) % 8;
-      else if(k == end_i) {
-         dat_len = 8 - p.offset % 8;
-         val >>= 8 - dat_len;
-      }
-      else
-         dat_len = 8;
-   } else { /* all significant bits in one unsigned char */
-      val >>= p.offset % 8;
-      dat_len = p.precision;
-   }
-
-   if(*buf_len > dat_len) {
-      buffer[*j] |= (val & ~(~0 << dat_len)) << (*buf_len - dat_len);
-      *buf_len -= dat_len;
-   } else {
-      buffer[*j] |= (val >> (dat_len - *buf_len)) & ~(~0 << *buf_len);
-      dat_len -= *buf_len;
-      H5Z_nbit_next_byte(j, buf_len);
-      if(dat_len == 0) return;
-
-      buffer[*j] = (val & ~(~0 << dat_len)) << (*buf_len - dat_len);
-      *buf_len -= dat_len;
-   }
+    int           dat_len; /* dat_len is the number of bits to be copied in each data byte */
+    unsigned char val;     /* value to be copied in each data byte */
+
+    /* initialize value and bits of unsigned char to be copied */
+    val = data[data_offset + k];
+    if (begin_i != end_i) { /* significant bits occupy >1 unsigned char */
+        if (k == begin_i)
+            dat_len = 8 - (datatype_len - p.precision - p.offset) % 8;
+        else if (k == end_i) {
+            dat_len = 8 - p.offset % 8;
+            val >>= 8 - dat_len;
+        }
+        else
+            dat_len = 8;
+    }
+    else { /* all significant bits in one unsigned char */
+        val >>= p.offset % 8;
+        dat_len = p.precision;
+    }
+
+    if (*buf_len > dat_len) {
+        buffer[*j] |= (val & ~(~0 << dat_len)) << (*buf_len - dat_len);
+        *buf_len -= dat_len;
+    }
+    else {
+        buffer[*j] |= (val >> (dat_len - *buf_len)) & ~(~0 << *buf_len);
+        dat_len -= *buf_len;
+        H5Z_nbit_next_byte(j, buf_len);
+        if (dat_len == 0)
+            return;
+
+        buffer[*j] = (val & ~(~0 << dat_len)) << (*buf_len - dat_len);
+        *buf_len -= dat_len;
+    }
 }
 
-static void H5Z_nbit_compress_one_nooptype(unsigned char *data, size_t data_offset,
-                     unsigned char *buffer, size_t *j, int *buf_len, unsigned size)
+static void
+H5Z_nbit_compress_one_nooptype(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                               int *buf_len, unsigned size)
 {
-   unsigned i;        /* index */
-   unsigned dat_len;  /* dat_len is the number of bits to be copied in each data byte */
-   unsigned char val; /* value to be copied in each data byte */
-
-   for(i = 0; i < size; i++) {
-      /* initialize value and bits of unsigned char to be copied */
-      val = data[data_offset + i];
-      dat_len = sizeof(unsigned char) * 8;
-
-      buffer[*j] |= (val >> (dat_len - *buf_len)) & ~(~0 << *buf_len);
-      dat_len -= *buf_len;
-      H5Z_nbit_next_byte(j, buf_len);
-      if(dat_len == 0) continue;
-
-      buffer[*j] = (val & ~(~0 << dat_len)) << (*buf_len - dat_len);
-      *buf_len -= dat_len;
-   }
+    unsigned      i;       /* index */
+    unsigned      dat_len; /* dat_len is the number of bits to be copied in each data byte */
+    unsigned char val;     /* value to be copied in each data byte */
+
+    for (i = 0; i < size; i++) {
+        /* initialize value and bits of unsigned char to be copied */
+        val     = data[data_offset + i];
+        dat_len = sizeof(unsigned char) * 8;
+
+        buffer[*j] |= (val >> (dat_len - *buf_len)) & ~(~0 << *buf_len);
+        dat_len -= *buf_len;
+        H5Z_nbit_next_byte(j, buf_len);
+        if (dat_len == 0)
+            continue;
+
+        buffer[*j] = (val & ~(~0 << dat_len)) << (*buf_len - dat_len);
+        *buf_len -= dat_len;
+    }
 }
 
-static void H5Z_nbit_compress_one_atomic(unsigned char *data, size_t data_offset,
-                  unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p)
+static void
+H5Z_nbit_compress_one_atomic(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                             int *buf_len, parms_atomic p)
 {
-   /* begin_i: the index of byte having first significant bit
-      end_i: the index of byte having last significant bit */
-   int k, begin_i, end_i, datatype_len;
-
-   datatype_len = p.size * 8;
-
-   if(p.order == H5Z_NBIT_ORDER_LE) { /* little endian */
-      /* calculate begin_i and end_i */
-      if((p.precision + p.offset) % 8 != 0)
-         begin_i = (p.precision + p.offset) / 8;
-      else
-         begin_i = (p.precision + p.offset) / 8 - 1;
-      end_i = p.offset / 8;
-
-      for(k = begin_i; k >= end_i; k--)
-         H5Z_nbit_compress_one_byte(data, data_offset, k, begin_i, end_i,
-                                    buffer, j, buf_len, p, datatype_len);
-   }
-
-   if(p.order == H5Z_NBIT_ORDER_BE) { /* big endian */
-      /* calculate begin_i and end_i */
-      begin_i = (datatype_len - p.precision - p.offset) / 8;
-      if(p.offset % 8 != 0)
-         end_i = (datatype_len - p.offset) / 8;
-      else
-         end_i = (datatype_len - p.offset) / 8 - 1;
-
-      for(k = begin_i; k <= end_i; k++)
-         H5Z_nbit_compress_one_byte(data, data_offset, k, begin_i, end_i,
-                                    buffer, j, buf_len, p, datatype_len);
-   }
+    /* begin_i: the index of byte having first significant bit
+       end_i: the index of byte having last significant bit */
+    int k, begin_i, end_i, datatype_len;
+
+    datatype_len = p.size * 8;
+
+    if (p.order == H5Z_NBIT_ORDER_LE) { /* little endian */
+        /* calculate begin_i and end_i */
+        if ((p.precision + p.offset) % 8 != 0)
+            begin_i = (p.precision + p.offset) / 8;
+        else
+            begin_i = (p.precision + p.offset) / 8 - 1;
+        end_i = p.offset / 8;
+
+        for (k = begin_i; k >= end_i; k--)
+            H5Z_nbit_compress_one_byte(data, data_offset, k, begin_i, end_i, buffer, j, buf_len, p,
+                                       datatype_len);
+    }
+
+    if (p.order == H5Z_NBIT_ORDER_BE) { /* big endian */
+        /* calculate begin_i and end_i */
+        begin_i = (datatype_len - p.precision - p.offset) / 8;
+        if (p.offset % 8 != 0)
+            end_i = (datatype_len - p.offset) / 8;
+        else
+            end_i = (datatype_len - p.offset) / 8 - 1;
+
+        for (k = begin_i; k <= end_i; k++)
+            H5Z_nbit_compress_one_byte(data, data_offset, k, begin_i, end_i, buffer, j, buf_len, p,
+                                       datatype_len);
+    }
 }
 
-static void H5Z_nbit_compress_one_array(unsigned char *data, size_t data_offset, unsigned char *buffer,
-                                 size_t *j, int *buf_len, const unsigned parms[])
+static void
+H5Z_nbit_compress_one_array(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                            int *buf_len, const unsigned parms[])
 {
-   unsigned i, total_size, base_class, base_size, n, begin_index;
-   parms_atomic p;
-
-   total_size = parms[parms_index++];
-   base_class = parms[parms_index++];
-
-   switch(base_class) {
-      case H5Z_NBIT_ATOMIC:
-           p.size = parms[parms_index++];
-           p.order = parms[parms_index++];
-           p.precision = parms[parms_index++];
-           p.offset = parms[parms_index++];
-           n = total_size/p.size;
-           for(i = 0; i < n; i++)
-              H5Z_nbit_compress_one_atomic(data, data_offset + i*p.size,
-                                           buffer, j, buf_len, p);
-           break;
-      case H5Z_NBIT_ARRAY:
-           base_size = parms[parms_index]; /* read in advance */
-           n = total_size/base_size; /* number of base_type elements inside the array datatype */
-           begin_index = parms_index;
-           for(i = 0; i < n; i++) {
-              H5Z_nbit_compress_one_array(data, data_offset + i*base_size,
-                                          buffer, j, buf_len, parms);
-              parms_index = begin_index;
-           }
-           break;
-      case H5Z_NBIT_COMPOUND:
-           base_size = parms[parms_index]; /* read in advance */
-           n = total_size/base_size; /* number of base_type elements inside the array datatype */
-           begin_index = parms_index;
-           for(i = 0; i < n; i++) {
-              H5Z_nbit_compress_one_compound(data, data_offset + i*base_size,
-                                             buffer, j, buf_len, parms);
-              parms_index = begin_index;
-           }
-           break;
-      case H5Z_NBIT_NOOPTYPE:
-           parms_index++; /* skip size of no-op type */
-           H5Z_nbit_compress_one_nooptype(data, data_offset, buffer, j, buf_len, total_size);
-           break;
-      default:
-          HDassert(0 && "This Should never be executed!");
-   } /* end switch */
+    unsigned     i, total_size, base_class, base_size, n, begin_index;
+    parms_atomic p;
+
+    total_size = parms[parms_index++];
+    base_class = parms[parms_index++];
+
+    switch (base_class) {
+        case H5Z_NBIT_ATOMIC:
+            p.size      = parms[parms_index++];
+            p.order     = parms[parms_index++];
+            p.precision = parms[parms_index++];
+            p.offset    = parms[parms_index++];
+            n           = total_size / p.size;
+            for (i = 0; i < n; i++)
+                H5Z_nbit_compress_one_atomic(data, data_offset + i * p.size, buffer, j, buf_len, p);
+            break;
+        case H5Z_NBIT_ARRAY:
+            base_size   = parms[parms_index];     /* read in advance */
+            n           = total_size / base_size; /* number of base_type elements inside the array datatype */
+            begin_index = parms_index;
+            for (i = 0; i < n; i++) {
+                H5Z_nbit_compress_one_array(data, data_offset + i * base_size, buffer, j, buf_len, parms);
+                parms_index = begin_index;
+            }
+            break;
+        case H5Z_NBIT_COMPOUND:
+            base_size   = parms[parms_index];     /* read in advance */
+            n           = total_size / base_size; /* number of base_type elements inside the array datatype */
+            begin_index = parms_index;
+            for (i = 0; i < n; i++) {
+                H5Z_nbit_compress_one_compound(data, data_offset + i * base_size, buffer, j, buf_len, parms);
+                parms_index = begin_index;
+            }
+            break;
+        case H5Z_NBIT_NOOPTYPE:
+            parms_index++; /* skip size of no-op type */
+            H5Z_nbit_compress_one_nooptype(data, data_offset, buffer, j, buf_len, total_size);
+            break;
+        default:
+            HDassert(0 && "This Should never be executed!");
+    } /* end switch */
 }
 
-static void H5Z_nbit_compress_one_compound(unsigned char *data, size_t data_offset,
-            unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[])
+static void
+H5Z_nbit_compress_one_compound(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                               int *buf_len, const unsigned parms[])
 {
-   unsigned i, nmembers, member_offset, member_class, size;
-   parms_atomic p;
-
-   parms_index++; /* skip size of compound datatype */
-   nmembers = parms[parms_index++];
-
-   for(i = 0; i < nmembers; i++) {
-      member_offset = parms[parms_index++];
-      member_class = parms[parms_index++];
-
-      switch(member_class) {
-         case H5Z_NBIT_ATOMIC:
-              p.size = parms[parms_index++];
-              p.order = parms[parms_index++];
-              p.precision = parms[parms_index++];
-              p.offset = parms[parms_index++];
-              H5Z_nbit_compress_one_atomic(data, data_offset + member_offset,
-                                           buffer, j, buf_len, p);
-              break;
-         case H5Z_NBIT_ARRAY:
-              H5Z_nbit_compress_one_array(data, data_offset + member_offset,
-                                          buffer, j, buf_len, parms);
-              break;
-         case H5Z_NBIT_COMPOUND:
-              H5Z_nbit_compress_one_compound(data, data_offset+member_offset,
-                                             buffer, j, buf_len, parms);
-              break;
-         case H5Z_NBIT_NOOPTYPE:
-              size = parms[parms_index++];
-              H5Z_nbit_compress_one_nooptype(data, data_offset+member_offset,
-                                             buffer, j, buf_len, size);
-              break;
-         default:
-             HDassert(0 && "This Should never be executed!");
-      } /* end switch */
-   }
+    unsigned     i, nmembers, member_offset, member_class, size;
+    parms_atomic p;
+
+    parms_index++; /* skip size of compound datatype */
+    nmembers = parms[parms_index++];
+
+    for (i = 0; i < nmembers; i++) {
+        member_offset = parms[parms_index++];
+        member_class  = parms[parms_index++];
+
+        switch (member_class) {
+            case H5Z_NBIT_ATOMIC:
+                p.size      = parms[parms_index++];
+                p.order     = parms[parms_index++];
+                p.precision = parms[parms_index++];
+                p.offset    = parms[parms_index++];
+                H5Z_nbit_compress_one_atomic(data, data_offset + member_offset, buffer, j, buf_len, p);
+                break;
+            case H5Z_NBIT_ARRAY:
+                H5Z_nbit_compress_one_array(data, data_offset + member_offset, buffer, j, buf_len, parms);
+                break;
+            case H5Z_NBIT_COMPOUND:
+                H5Z_nbit_compress_one_compound(data, data_offset + member_offset, buffer, j, buf_len, parms);
+                break;
+            case H5Z_NBIT_NOOPTYPE:
+                size = parms[parms_index++];
+                H5Z_nbit_compress_one_nooptype(data, data_offset + member_offset, buffer, j, buf_len, size);
+                break;
+            default:
+                HDassert(0 && "This Should never be executed!");
+        } /* end switch */
+    }
 }
 
-static void H5Z_nbit_compress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
-                              size_t *buffer_size, const unsigned parms[])
+static void
+H5Z_nbit_compress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer, size_t *buffer_size,
+                  const unsigned parms[])
 {
-   /* i: index of data, new_size: index of buffer,
-      buf_len: number of bits to be filled in current byte */
-   size_t i, size;
-   size_t new_size = 0;
-   int buf_len;
-   parms_atomic p;
-
-   /* must initialize buffer to be zeros */
-   HDmemset(buffer, 0, *buffer_size);
-
-   /* initialization before the loop */
-   buf_len = sizeof(unsigned char) * 8;
-
-   switch(parms[3]) {
-      case H5Z_NBIT_ATOMIC:
-           /* set the index before goto function call */
-           p.size = parms[4];
-           p.order = parms[5];
-           p.precision = parms[6];
-           p.offset = parms[7];
-
-           for(i = 0; i < d_nelmts; i++) {
-              H5Z_nbit_compress_one_atomic(data, i*p.size, buffer, &new_size, &buf_len, p);
-           }
-           break;
-      case H5Z_NBIT_ARRAY:
-           size = parms[4];
-           parms_index = 4;
-           for(i = 0; i < d_nelmts; i++) {
-              H5Z_nbit_compress_one_array(data, i*size, buffer, &new_size, &buf_len, parms);
-              parms_index = 4;
-           }
-           break;
-      case H5Z_NBIT_COMPOUND:
-           size = parms[4];
-           parms_index = 4;
-           for(i = 0; i < d_nelmts; i++) {
-              H5Z_nbit_compress_one_compound(data, i*size, buffer, &new_size, &buf_len, parms);
-              parms_index = 4;
-           }
-           break;
-       default:
-           HDassert(0 && "This Should never be executed!");
-   } /* end switch */
-
-   /* Update the size to the new value after compression.  If there are any bits hanging over in
-    * the last byte, increment the value by 1. */
-   *buffer_size = new_size + 1;
-}
+    /* i: index of data, new_size: index of buffer,
+       buf_len: number of bits to be filled in current byte */
+    size_t       i, size;
+    size_t       new_size = 0;
+    int          buf_len;
+    parms_atomic p;
+
+    /* must initialize buffer to be zeros */
+    HDmemset(buffer, 0, *buffer_size);
+
+    /* initialization before the loop */
+    buf_len = sizeof(unsigned char) * 8;
+
+    switch (parms[3]) {
+        case H5Z_NBIT_ATOMIC:
+            /* set the index before goto function call */
+            p.size      = parms[4];
+            p.order     = parms[5];
+            p.precision = parms[6];
+            p.offset    = parms[7];
+
+            for (i = 0; i < d_nelmts; i++) {
+                H5Z_nbit_compress_one_atomic(data, i * p.size, buffer, &new_size, &buf_len, p);
+            }
+            break;
+        case H5Z_NBIT_ARRAY:
+            size        = parms[4];
+            parms_index = 4;
+            for (i = 0; i < d_nelmts; i++) {
+                H5Z_nbit_compress_one_array(data, i * size, buffer, &new_size, &buf_len, parms);
+                parms_index = 4;
+            }
+            break;
+        case H5Z_NBIT_COMPOUND:
+            size        = parms[4];
+            parms_index = 4;
+            for (i = 0; i < d_nelmts; i++) {
+                H5Z_nbit_compress_one_compound(data, i * size, buffer, &new_size, &buf_len, parms);
+                parms_index = 4;
+            }
+            break;
+        default:
+            HDassert(0 && "This Should never be executed!");
+    } /* end switch */
 
+    /* Update the size to the new value after compression.  If there are any bits hanging over in
+     * the last byte, increment the value by 1. */
+    *buffer_size = new_size + 1;
+}
diff --git a/src/H5Zpkg.h b/src/H5Zpkg.h
index 89f77fe..23779c6 100644
--- a/src/H5Zpkg.h
+++ b/src/H5Zpkg.h
@@ -19,7 +19,7 @@
 #define _H5Zpkg_H
 
 /* Include private header file */
-#include "H5Zprivate.h"          /* Filter functions                */
+#include "H5Zprivate.h" /* Filter functions                */
 
 /********************/
 /* Internal filters */
@@ -52,4 +52,3 @@ H5_DLLVAR H5Z_class2_t H5Z_SZIP[1];
 #endif /* H5_HAVE_FILTER_SZIP */
 
 #endif /* _H5Zpkg_H */
-
diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h
index fe182ad..2e227e6 100644
--- a/src/H5Zprivate.h
+++ b/src/H5Zprivate.h
@@ -22,7 +22,7 @@
 #include "H5Zpublic.h"
 
 /* Private headers needed by this file */
-#include "H5Tprivate.h"		/* Datatypes				*/
+#include "H5Tprivate.h" /* Datatypes				*/
 
 /**************************/
 /* Library Private Macros */
@@ -32,17 +32,17 @@
 /* [These are aliases for the similar definitions in szlib.h, which we can't
  * include directly due to the duplication of various symbols with the zlib.h
  * header file] */
-#define H5_SZIP_LSB_OPTION_MASK         8
-#define H5_SZIP_MSB_OPTION_MASK         16
-#define H5_SZIP_RAW_OPTION_MASK         128
+#define H5_SZIP_LSB_OPTION_MASK 8
+#define H5_SZIP_MSB_OPTION_MASK 16
+#define H5_SZIP_RAW_OPTION_MASK 128
 
 /* Common # of 'client data values' for filters */
 /* (avoids dynamic memory allocation in most cases) */
-#define H5Z_COMMON_CD_VALUES    4
+#define H5Z_COMMON_CD_VALUES 4
 
 /* Common size of filter name */
 /* (avoids dynamic memory allocation in most cases) */
-#define H5Z_COMMON_NAME_LEN    12
+#define H5Z_COMMON_NAME_LEN 12
 
 /****************************/
 /* Library Private Typedefs */
@@ -50,20 +50,19 @@
 
 /* Structure to store information about each filter's parameters */
 typedef struct H5Z_filter_info_t {
-    H5Z_filter_t	id;		/*filter identification number	     */
-    unsigned		flags;		/*defn and invocation flags	     */
-    char		_name[H5Z_COMMON_NAME_LEN];	/*internal filter name		     */
-    char		*name;		/*optional filter name		     */
-    size_t		cd_nelmts;	/*number of elements in cd_values[]  */
-    unsigned		_cd_values[H5Z_COMMON_CD_VALUES];	/*internal client data values		     */
-    unsigned		*cd_values;	/*client data values		     */
+    H5Z_filter_t id;                               /*filter identification number	     */
+    unsigned     flags;                            /*defn and invocation flags	     */
+    char         _name[H5Z_COMMON_NAME_LEN];       /*internal filter name		     */
+    char *       name;                             /*optional filter name		     */
+    size_t       cd_nelmts;                        /*number of elements in cd_values[]  */
+    unsigned     _cd_values[H5Z_COMMON_CD_VALUES]; /*internal client data values		     */
+    unsigned *   cd_values;                        /*client data values		     */
 } H5Z_filter_info_t;
 
 /*****************************/
 /* Library-private Variables */
 /*****************************/
 
-
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
@@ -72,38 +71,35 @@ struct H5O_pline_t; /*forward decl*/
 /* Internal API routines */
 H5_DLL herr_t H5Z_init(void);
 H5_DLL herr_t H5Z_register(const H5Z_class2_t *cls);
-H5_DLL herr_t H5Z_append(struct H5O_pline_t *pline, H5Z_filter_t filter,
-        unsigned flags, size_t cd_nelmts, const unsigned int cd_values[]);
-H5_DLL herr_t H5Z_modify(const struct H5O_pline_t *pline, H5Z_filter_t filter,
-        unsigned flags, size_t cd_nelmts, const unsigned int cd_values[]);
-H5_DLL herr_t H5Z_pipeline(const struct H5O_pline_t *pline,
-			    unsigned flags, unsigned *filter_mask/*in,out*/,
- 			    H5Z_EDC_t edc_read, H5Z_cb_t cb_struct,
-			    size_t *nbytes/*in,out*/, size_t *buf_size/*in,out*/,
-                            void **buf/*in,out*/);
+H5_DLL herr_t H5Z_append(struct H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags, size_t cd_nelmts,
+                         const unsigned int cd_values[]);
+H5_DLL herr_t H5Z_modify(const struct H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
+                         size_t cd_nelmts, const unsigned int cd_values[]);
+H5_DLL herr_t H5Z_pipeline(const struct H5O_pline_t *pline, unsigned flags, unsigned *filter_mask /*in,out*/,
+                           H5Z_EDC_t edc_read, H5Z_cb_t cb_struct, size_t *nbytes /*in,out*/,
+                           size_t *buf_size /*in,out*/, void **buf /*in,out*/);
 H5_DLL H5Z_class2_t *H5Z_find(H5Z_filter_t id);
-H5_DLL herr_t H5Z_can_apply(hid_t dcpl_id, hid_t type_id);
-H5_DLL herr_t H5Z_set_local(hid_t dcpl_id, hid_t type_id);
-H5_DLL herr_t H5Z_can_apply_direct(const struct H5O_pline_t *pline);
-H5_DLL herr_t H5Z_set_local_direct(const struct H5O_pline_t *pline);
-H5_DLL H5Z_filter_info_t *H5Z_filter_info(const struct H5O_pline_t *pline,
-        H5Z_filter_t filter);
-H5_DLL htri_t H5Z_filter_in_pline(const struct H5O_pline_t *pline, H5Z_filter_t filter);
-H5_DLL htri_t H5Z_all_filters_avail(const struct H5O_pline_t *pline);
-H5_DLL herr_t H5Z_unregister(H5Z_filter_t filter_id);
-H5_DLL htri_t H5Z_filter_avail(H5Z_filter_t id);
-H5_DLL herr_t H5Z_delete(struct H5O_pline_t *pline, H5Z_filter_t filter);
-H5_DLL herr_t H5Z_get_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags);
+H5_DLL herr_t        H5Z_can_apply(hid_t dcpl_id, hid_t type_id);
+H5_DLL herr_t        H5Z_set_local(hid_t dcpl_id, hid_t type_id);
+H5_DLL herr_t        H5Z_can_apply_direct(const struct H5O_pline_t *pline);
+H5_DLL herr_t        H5Z_set_local_direct(const struct H5O_pline_t *pline);
+H5_DLL H5Z_filter_info_t *H5Z_filter_info(const struct H5O_pline_t *pline, H5Z_filter_t filter);
+H5_DLL htri_t             H5Z_filter_in_pline(const struct H5O_pline_t *pline, H5Z_filter_t filter);
+H5_DLL htri_t             H5Z_all_filters_avail(const struct H5O_pline_t *pline);
+H5_DLL herr_t             H5Z_unregister(H5Z_filter_t filter_id);
+H5_DLL htri_t             H5Z_filter_avail(H5Z_filter_t id);
+H5_DLL herr_t             H5Z_delete(struct H5O_pline_t *pline, H5Z_filter_t filter);
+H5_DLL herr_t             H5Z_get_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags);
 
 /* Data Transform Functions */
 typedef struct H5Z_data_xform_t H5Z_data_xform_t; /* Defined in H5Ztrans.c */
 
 H5_DLL H5Z_data_xform_t *H5Z_xform_create(const char *expr);
-H5_DLL herr_t H5Z_xform_copy(H5Z_data_xform_t **data_xform_prop);
-H5_DLL herr_t H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop);
-H5_DLL herr_t H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array,
-    size_t array_size, const H5T_t *buf_type);
-H5_DLL hbool_t H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop);
-H5_DLL const char *H5Z_xform_extract_xform_str(const H5Z_data_xform_t *data_xform_prop);
+H5_DLL herr_t            H5Z_xform_copy(H5Z_data_xform_t **data_xform_prop);
+H5_DLL herr_t            H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop);
+H5_DLL herr_t            H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array, size_t array_size,
+                                        const H5T_t *buf_type);
+H5_DLL hbool_t           H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop);
+H5_DLL const char *      H5Z_xform_extract_xform_str(const H5Z_data_xform_t *data_xform_prop);
 
 #endif
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index f6b313e..78227b1 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -31,66 +31,65 @@
 typedef int H5Z_filter_t;
 
 /* Filter IDs */
-#define H5Z_FILTER_ERROR	(-1)	/*no filter			*/
-#define H5Z_FILTER_NONE		0	/*reserved indefinitely		*/
-#define H5Z_FILTER_DEFLATE	1 	/*deflation like gzip	     	*/
-#define H5Z_FILTER_SHUFFLE      2       /*shuffle the data              */
-#define H5Z_FILTER_FLETCHER32   3       /*fletcher32 checksum of EDC    */
-#define H5Z_FILTER_SZIP         4       /*szip compression              */
-#define H5Z_FILTER_NBIT         5       /*nbit compression              */
-#define H5Z_FILTER_SCALEOFFSET  6       /*scale+offset compression      */
-#define H5Z_FILTER_RESERVED     256	/*filter ids below this value are reserved for library use */
-
-#define H5Z_FILTER_MAX		65535	/*maximum filter id		*/
+#define H5Z_FILTER_ERROR       (-1) /*no filter			*/
+#define H5Z_FILTER_NONE        0    /*reserved indefinitely		*/
+#define H5Z_FILTER_DEFLATE     1    /*deflation like gzip	     	*/
+#define H5Z_FILTER_SHUFFLE     2    /*shuffle the data              */
+#define H5Z_FILTER_FLETCHER32  3    /*fletcher32 checksum of EDC    */
+#define H5Z_FILTER_SZIP        4    /*szip compression              */
+#define H5Z_FILTER_NBIT        5    /*nbit compression              */
+#define H5Z_FILTER_SCALEOFFSET 6    /*scale+offset compression      */
+#define H5Z_FILTER_RESERVED    256  /*filter ids below this value are reserved for library use */
+
+#define H5Z_FILTER_MAX 65535 /*maximum filter id		*/
 
 /* General macros */
-#define H5Z_FILTER_ALL	 	0	/* Symbol to remove all filters in H5Premove_filter */
-#define H5Z_MAX_NFILTERS        32      /* Maximum number of filters allowed in a pipeline */
-                                        /* (should probably be allowed to be an
-                                         * unlimited amount, but currently each
-                                         * filter uses a bit in a 32-bit field,
-                                         * so the format would have to be
-                                         * changed to accomodate that)
-                                         */
+#define H5Z_FILTER_ALL   0  /* Symbol to remove all filters in H5Premove_filter */
+#define H5Z_MAX_NFILTERS 32 /* Maximum number of filters allowed in a pipeline */
+                            /* (should probably be allowed to be an
+                             * unlimited amount, but currently each
+                             * filter uses a bit in a 32-bit field,
+                             * so the format would have to be
+                             * changed to accomodate that)
+                             */
 
 /* Flags for filter definition (stored) */
-#define H5Z_FLAG_DEFMASK	0x00ff	/*definition flag mask		*/
-#define H5Z_FLAG_MANDATORY      0x0000  /*filter is mandatory		*/
-#define H5Z_FLAG_OPTIONAL	0x0001	/*filter is optional		*/
+#define H5Z_FLAG_DEFMASK   0x00ff /*definition flag mask		*/
+#define H5Z_FLAG_MANDATORY 0x0000 /*filter is mandatory		*/
+#define H5Z_FLAG_OPTIONAL  0x0001 /*filter is optional		*/
 
 /* Additional flags for filter invocation (not stored) */
-#define H5Z_FLAG_INVMASK	0xff00	/*invocation flag mask		*/
-#define H5Z_FLAG_REVERSE	0x0100	/*reverse direction; read	*/
-#define H5Z_FLAG_SKIP_EDC	0x0200	/*skip EDC filters for read	*/
+#define H5Z_FLAG_INVMASK  0xff00 /*invocation flag mask		*/
+#define H5Z_FLAG_REVERSE  0x0100 /*reverse direction; read	*/
+#define H5Z_FLAG_SKIP_EDC 0x0200 /*skip EDC filters for read	*/
 
 /* Special parameters for szip compression */
 /* [These are aliases for the similar definitions in szlib.h, which we can't
  * include directly due to the duplication of various symbols with the zlib.h
  * header file] */
-#define H5_SZIP_ALLOW_K13_OPTION_MASK   1
-#define H5_SZIP_CHIP_OPTION_MASK        2
-#define H5_SZIP_EC_OPTION_MASK          4
-#define H5_SZIP_NN_OPTION_MASK          32
-#define H5_SZIP_MAX_PIXELS_PER_BLOCK    32
+#define H5_SZIP_ALLOW_K13_OPTION_MASK 1
+#define H5_SZIP_CHIP_OPTION_MASK      2
+#define H5_SZIP_EC_OPTION_MASK        4
+#define H5_SZIP_NN_OPTION_MASK        32
+#define H5_SZIP_MAX_PIXELS_PER_BLOCK  32
 
 /* Macros for the shuffle filter */
-#define H5Z_SHUFFLE_USER_NPARMS    0    /* Number of parameters that users can set */
-#define H5Z_SHUFFLE_TOTAL_NPARMS   1    /* Total number of parameters for filter */
+#define H5Z_SHUFFLE_USER_NPARMS  0 /* Number of parameters that users can set */
+#define H5Z_SHUFFLE_TOTAL_NPARMS 1 /* Total number of parameters for filter */
 
 /* Macros for the szip filter */
-#define H5Z_SZIP_USER_NPARMS    2       /* Number of parameters that users can set */
-#define H5Z_SZIP_TOTAL_NPARMS   4       /* Total number of parameters for filter */
-#define H5Z_SZIP_PARM_MASK      0       /* "User" parameter for option mask */
-#define H5Z_SZIP_PARM_PPB       1       /* "User" parameter for pixels-per-block */
-#define H5Z_SZIP_PARM_BPP       2       /* "Local" parameter for bits-per-pixel */
-#define H5Z_SZIP_PARM_PPS       3       /* "Local" parameter for pixels-per-scanline */
+#define H5Z_SZIP_USER_NPARMS  2 /* Number of parameters that users can set */
+#define H5Z_SZIP_TOTAL_NPARMS 4 /* Total number of parameters for filter */
+#define H5Z_SZIP_PARM_MASK    0 /* "User" parameter for option mask */
+#define H5Z_SZIP_PARM_PPB     1 /* "User" parameter for pixels-per-block */
+#define H5Z_SZIP_PARM_BPP     2 /* "Local" parameter for bits-per-pixel */
+#define H5Z_SZIP_PARM_PPS     3 /* "Local" parameter for pixels-per-scanline */
 
 /* Macros for the nbit filter */
-#define H5Z_NBIT_USER_NPARMS     0     /* Number of parameters that users can set */
+#define H5Z_NBIT_USER_NPARMS 0 /* Number of parameters that users can set */
 
 /* Macros for the scale offset filter */
-#define H5Z_SCALEOFFSET_USER_NPARMS      2    /* Number of parameters that users can set */
-
+#define H5Z_SCALEOFFSET_USER_NPARMS 2 /* Number of parameters that users can set */
 
 /* Special parameters for ScaleOffset filter*/
 #define H5Z_SO_INT_MINBITS_DEFAULT 0
@@ -105,10 +104,10 @@ typedef enum H5Z_SO_scale_type_t {
 
 /* Values to decide if EDC is enabled for reading data */
 typedef enum H5Z_EDC_t {
-    H5Z_ERROR_EDC       = -1,   /* error value */
-    H5Z_DISABLE_EDC     = 0,
-    H5Z_ENABLE_EDC      = 1,
-    H5Z_NO_EDC          = 2     /* must be the last */
+    H5Z_ERROR_EDC   = -1, /* error value */
+    H5Z_DISABLE_EDC = 0,
+    H5Z_ENABLE_EDC  = 1,
+    H5Z_NO_EDC      = 2 /* must be the last */
 } H5Z_EDC_t;
 
 /* Bit flags for H5Zget_filter_info */
@@ -117,20 +116,19 @@ typedef enum H5Z_EDC_t {
 
 /* Return values for filter callback function */
 typedef enum H5Z_cb_return_t {
-    H5Z_CB_ERROR  = -1,
-    H5Z_CB_FAIL   = 0,    /* I/O should fail if filter fails. */
-    H5Z_CB_CONT   = 1,    /* I/O continues if filter fails.   */
-    H5Z_CB_NO     = 2
+    H5Z_CB_ERROR = -1,
+    H5Z_CB_FAIL  = 0, /* I/O should fail if filter fails. */
+    H5Z_CB_CONT  = 1, /* I/O continues if filter fails.   */
+    H5Z_CB_NO    = 2
 } H5Z_cb_return_t;
 
 /* Filter callback function definition */
-typedef H5Z_cb_return_t (*H5Z_filter_func_t)(H5Z_filter_t filter, void* buf,
-                                size_t buf_size, void* op_data);
+typedef H5Z_cb_return_t (*H5Z_filter_func_t)(H5Z_filter_t filter, void *buf, size_t buf_size, void *op_data);
 
 /* Structure for filter callback property */
 typedef struct H5Z_cb_t {
     H5Z_filter_func_t func;
-    void*              op_data;
+    void *            op_data;
 } H5Z_cb_t;
 
 #ifdef __cplusplus
@@ -197,23 +195,22 @@ typedef herr_t (*H5Z_set_local_func_t)(hid_t dcpl_id, hid_t type_id, hid_t space
  * buffer. If an error occurs then the function should return zero and leave
  * all pointer arguments unchanged.
  */
-typedef size_t (*H5Z_func_t)(unsigned int flags, size_t cd_nelmts,
-			     const unsigned int cd_values[], size_t nbytes,
-			     size_t *buf_size, void **buf);
+typedef size_t (*H5Z_func_t)(unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[],
+                             size_t nbytes, size_t *buf_size, void **buf);
 
 /*
  * The filter table maps filter identification numbers to structs that
  * contain a pointers to the filter function and timing statistics.
  */
 typedef struct H5Z_class2_t {
-    int version;                /* Version number of the H5Z_class_t struct */
-    H5Z_filter_t id;		/* Filter ID number			     */
-    unsigned encoder_present;   /* Does this filter have an encoder? */
-    unsigned decoder_present;   /* Does this filter have a decoder? */
-    const char	*name;		/* Comment for debugging		     */
-    H5Z_can_apply_func_t can_apply; /* The "can apply" callback for a filter */
-    H5Z_set_local_func_t set_local; /* The "set local" callback for a filter */
-    H5Z_func_t filter;		/* The actual filter function		     */
+    int                  version;         /* Version number of the H5Z_class_t struct */
+    H5Z_filter_t         id;              /* Filter ID number			     */
+    unsigned             encoder_present; /* Does this filter have an encoder? */
+    unsigned             decoder_present; /* Does this filter have a decoder? */
+    const char *         name;            /* Comment for debugging		     */
+    H5Z_can_apply_func_t can_apply;       /* The "can apply" callback for a filter */
+    H5Z_set_local_func_t set_local;       /* The "set local" callback for a filter */
+    H5Z_func_t           filter;          /* The actual filter function		     */
 } H5Z_class2_t;
 
 H5_DLL herr_t H5Zregister(const void *cls);
@@ -232,11 +229,11 @@ H5_DLL herr_t H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_confi
  * contain a pointers to the filter function and timing statistics.
  */
 typedef struct H5Z_class1_t {
-    H5Z_filter_t id;		/* Filter ID number			     */
-    const char	*name;		/* Comment for debugging		     */
+    H5Z_filter_t         id;        /* Filter ID number			     */
+    const char *         name;      /* Comment for debugging		     */
     H5Z_can_apply_func_t can_apply; /* The "can apply" callback for a filter */
     H5Z_set_local_func_t set_local; /* The "set local" callback for a filter */
-    H5Z_func_t filter;		/* The actual filter function		     */
+    H5Z_func_t           filter;    /* The actual filter function		     */
 } H5Z_class1_t;
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -245,4 +242,3 @@ typedef struct H5Z_class1_t {
 }
 #endif
 #endif
-
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index aeb0be1..fdfaa2f 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -11,665 +11,721 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"         /* Property lists                       */
-#include "H5Oprivate.h"         /* Object headers                       */
-#include "H5Sprivate.h"		/* Dataspaces         			*/
-#include "H5Tprivate.h"		/* Datatypes         			*/
-#include "H5Zpkg.h"		/* Data filters				*/
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Pprivate.h"  /* Property lists                       */
+#include "H5Oprivate.h"  /* Object headers                       */
+#include "H5Sprivate.h"  /* Dataspaces         			*/
+#include "H5Tprivate.h"  /* Datatypes         			*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 /* Struct of parameters needed for compressing/decompressing one atomic datatype */
 typedef struct {
-   size_t size;        /* datatype size */
-   uint32_t minbits;   /* minimum bits to compress one value of such datatype */
-   unsigned mem_order; /* current memory endianness order */
+    size_t   size;      /* datatype size */
+    uint32_t minbits;   /* minimum bits to compress one value of such datatype */
+    unsigned mem_order; /* current memory endianness order */
 } parms_atomic;
 
-enum H5Z_scaleoffset_t {t_bad=0, t_uchar=1, t_ushort, t_uint, t_ulong, t_ulong_long,
-                           t_schar, t_short, t_int, t_long, t_long_long,
-                           t_float, t_double};
+enum H5Z_scaleoffset_t {
+    t_bad   = 0,
+    t_uchar = 1,
+    t_ushort,
+    t_uint,
+    t_ulong,
+    t_ulong_long,
+    t_schar,
+    t_short,
+    t_int,
+    t_long,
+    t_long_long,
+    t_float,
+    t_double
+};
 
 /* Local function prototypes */
-static double H5Z_scaleoffset_rnd(double val);
-static htri_t H5Z_can_apply_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id);
-static enum H5Z_scaleoffset_t H5Z_scaleoffset_get_type(unsigned dtype_class,
-    unsigned dtype_size, unsigned dtype_sign);
-static herr_t H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist,
-    H5T_t *type, enum H5Z_scaleoffset_t scale_type, unsigned cd_values[],
-    int need_convert, hid_t dxpl_id);
-static herr_t H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id);
-static size_t H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts,
-    const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf);
-static void H5Z_scaleoffset_convert(void *buf, unsigned d_nelmts, size_t dtype_size);
+static double                 H5Z_scaleoffset_rnd(double val);
+static htri_t                 H5Z_can_apply_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id);
+static enum H5Z_scaleoffset_t H5Z_scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size,
+                                                       unsigned dtype_sign);
+static herr_t                 H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist, H5T_t *type,
+                                                                enum H5Z_scaleoffset_t scale_type, unsigned cd_values[],
+                                                                int need_convert, hid_t dxpl_id);
+static herr_t                 H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id);
+static size_t   H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
+                                       size_t nbytes, size_t *buf_size, void **buf);
+static void     H5Z_scaleoffset_convert(void *buf, unsigned d_nelmts, size_t dtype_size);
 static unsigned H5Z_scaleoffset_log2(unsigned long long num);
-static void H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts,
-    enum H5Z_scaleoffset_t type, unsigned filavail, const unsigned cd_values[],
-    uint32_t *minbits, unsigned long long *minval);
-static void H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts,
-    enum H5Z_scaleoffset_t type, unsigned filavail, const unsigned cd_values[],
-    uint32_t minbits, unsigned long long minval);
-static herr_t H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts,
-    enum H5Z_scaleoffset_t type, unsigned filavail, const unsigned cd_values[],
-    uint32_t *minbits, unsigned long long *minval, double D_val);
-static herr_t H5Z_scaleoffset_postdecompress_fd(void *data, unsigned d_nelmts,
-    enum H5Z_scaleoffset_t type, unsigned filavail, const unsigned cd_values[],
-    uint32_t minbits, unsigned long long minval, double D_val);
-static void H5Z_scaleoffset_next_byte(size_t *j, unsigned *buf_len);
-static void H5Z_scaleoffset_decompress_one_byte(unsigned char *data, size_t data_offset,
-    unsigned k, unsigned begin_i, unsigned char *buffer, size_t *j, unsigned *buf_len,
-    parms_atomic p, unsigned dtype_len);
-static void H5Z_scaleoffset_compress_one_byte(unsigned char *data, size_t data_offset,
-    unsigned k, unsigned begin_i, unsigned char *buffer, size_t *j, unsigned *buf_len,
-    parms_atomic p, unsigned dtype_len);
-static void H5Z_scaleoffset_decompress_one_atomic(unsigned char *data, size_t data_offset,
-    unsigned char *buffer, size_t *j, unsigned *buf_len, parms_atomic p);
-static void H5Z_scaleoffset_compress_one_atomic(unsigned char *data, size_t data_offset,
-    unsigned char *buffer, size_t *j, unsigned *buf_len, parms_atomic p);
-static void H5Z_scaleoffset_decompress(unsigned char *data, unsigned d_nelmts,
-    unsigned char *buffer, parms_atomic p);
-static void H5Z_scaleoffset_compress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
-    size_t buffer_size, parms_atomic p);
+static void     H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type,
+                                              unsigned filavail, const unsigned cd_values[], uint32_t *minbits,
+                                              unsigned long long *minval);
+static void     H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type,
+                                                 unsigned filavail, const unsigned cd_values[], uint32_t minbits,
+                                                 unsigned long long minval);
+static herr_t   H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type,
+                                               unsigned filavail, const unsigned cd_values[], uint32_t *minbits,
+                                               unsigned long long *minval, double D_val);
+static herr_t   H5Z_scaleoffset_postdecompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type,
+                                                  unsigned filavail, const unsigned cd_values[],
+                                                  uint32_t minbits, unsigned long long minval, double D_val);
+static void     H5Z_scaleoffset_next_byte(size_t *j, unsigned *buf_len);
+static void     H5Z_scaleoffset_decompress_one_byte(unsigned char *data, size_t data_offset, unsigned k,
+                                                    unsigned begin_i, unsigned char *buffer, size_t *j,
+                                                    unsigned *buf_len, parms_atomic p, unsigned dtype_len);
+static void     H5Z_scaleoffset_compress_one_byte(unsigned char *data, size_t data_offset, unsigned k,
+                                                  unsigned begin_i, unsigned char *buffer, size_t *j,
+                                                  unsigned *buf_len, parms_atomic p, unsigned dtype_len);
+static void     H5Z_scaleoffset_decompress_one_atomic(unsigned char *data, size_t data_offset,
+                                                      unsigned char *buffer, size_t *j, unsigned *buf_len,
+                                                      parms_atomic p);
+static void     H5Z_scaleoffset_compress_one_atomic(unsigned char *data, size_t data_offset,
+                                                    unsigned char *buffer, size_t *j, unsigned *buf_len,
+                                                    parms_atomic p);
+static void     H5Z_scaleoffset_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
+                                           parms_atomic p);
+static void     H5Z_scaleoffset_compress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
+                                         size_t buffer_size, parms_atomic p);
 
 /* This message derives from H5Z */
 H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
-    H5Z_CLASS_T_VERS,       /* H5Z_class_t version */
-    H5Z_FILTER_SCALEOFFSET, /* Filter id number		*/
-    1,              /* Assume encoder present: check before registering */
-    1,              /* decoder_present flag (set to true) */
-    "scaleoffset",		/* Filter name for debugging	*/
-    H5Z_can_apply_scaleoffset,	/* The "can apply" callback     */
-    H5Z_set_local_scaleoffset,  /* The "set local" callback     */
-    H5Z_filter_scaleoffset,	/* The actual filter function	*/
+    H5Z_CLASS_T_VERS,          /* H5Z_class_t version */
+    H5Z_FILTER_SCALEOFFSET,    /* Filter id number		*/
+    1,                         /* Assume encoder present: check before registering */
+    1,                         /* decoder_present flag (set to true) */
+    "scaleoffset",             /* Filter name for debugging	*/
+    H5Z_can_apply_scaleoffset, /* The "can apply" callback     */
+    H5Z_set_local_scaleoffset, /* The "set local" callback     */
+    H5Z_filter_scaleoffset,    /* The actual filter function	*/
 }};
 
 /* Local macros */
-#define H5Z_SCALEOFFSET_TOTAL_NPARMS     20   /* Total number of parameters for filter */
-#define H5Z_SCALEOFFSET_PARM_SCALETYPE   0    /* "User" parameter for scale type */
-#define H5Z_SCALEOFFSET_PARM_SCALEFACTOR 1    /* "User" parameter for scale factor */
-#define H5Z_SCALEOFFSET_PARM_NELMTS      2    /* "Local" parameter for number of elements in the chunk */
-#define H5Z_SCALEOFFSET_PARM_CLASS       3    /* "Local" parameter for datatype class */
-#define H5Z_SCALEOFFSET_PARM_SIZE        4    /* "Local" parameter for datatype size */
-#define H5Z_SCALEOFFSET_PARM_SIGN        5    /* "Local" parameter for integer datatype sign */
-#define H5Z_SCALEOFFSET_PARM_ORDER       6    /* "Local" parameter for datatype byte order */
-#define H5Z_SCALEOFFSET_PARM_FILAVAIL    7    /* "Local" parameter for dataset fill value existence */
-#define H5Z_SCALEOFFSET_PARM_FILVAL      8    /* "Local" parameter for start location to store dataset fill value */
+#define H5Z_SCALEOFFSET_TOTAL_NPARMS     20 /* Total number of parameters for filter */
+#define H5Z_SCALEOFFSET_PARM_SCALETYPE   0  /* "User" parameter for scale type */
+#define H5Z_SCALEOFFSET_PARM_SCALEFACTOR 1  /* "User" parameter for scale factor */
+#define H5Z_SCALEOFFSET_PARM_NELMTS      2  /* "Local" parameter for number of elements in the chunk */
+#define H5Z_SCALEOFFSET_PARM_CLASS       3  /* "Local" parameter for datatype class */
+#define H5Z_SCALEOFFSET_PARM_SIZE        4  /* "Local" parameter for datatype size */
+#define H5Z_SCALEOFFSET_PARM_SIGN        5  /* "Local" parameter for integer datatype sign */
+#define H5Z_SCALEOFFSET_PARM_ORDER       6  /* "Local" parameter for datatype byte order */
+#define H5Z_SCALEOFFSET_PARM_FILAVAIL    7  /* "Local" parameter for dataset fill value existence */
+#define H5Z_SCALEOFFSET_PARM_FILVAL      8 /* "Local" parameter for start location to store dataset fill value */
 
-#define H5Z_SCALEOFFSET_CLS_INTEGER      0    /* Integer (datatype class) */
-#define H5Z_SCALEOFFSET_CLS_FLOAT        1    /* Floatig-point (datatype class) */
+#define H5Z_SCALEOFFSET_CLS_INTEGER 0 /* Integer (datatype class) */
+#define H5Z_SCALEOFFSET_CLS_FLOAT   1 /* Floatig-point (datatype class) */
 
-#define H5Z_SCALEOFFSET_SGN_NONE         0    /* Unsigned integer type */
-#define H5Z_SCALEOFFSET_SGN_2            1    /* Two's complement signed integer type */
+#define H5Z_SCALEOFFSET_SGN_NONE 0 /* Unsigned integer type */
+#define H5Z_SCALEOFFSET_SGN_2    1 /* Two's complement signed integer type */
 
-#define H5Z_SCALEOFFSET_ORDER_LE         0    /* Little endian (datatype byte order) */
-#define H5Z_SCALEOFFSET_ORDER_BE         1    /* Big endian (datatype byte order) */
+#define H5Z_SCALEOFFSET_ORDER_LE 0 /* Little endian (datatype byte order) */
+#define H5Z_SCALEOFFSET_ORDER_BE 1 /* Big endian (datatype byte order) */
 
-#define H5Z_SCALEOFFSET_FILL_UNDEFINED   0    /* Fill value is not defined */
-#define H5Z_SCALEOFFSET_FILL_DEFINED     1    /* Fill value is defined */
+#define H5Z_SCALEOFFSET_FILL_UNDEFINED 0 /* Fill value is not defined */
+#define H5Z_SCALEOFFSET_FILL_DEFINED   1 /* Fill value is defined */
 
 /* Store fill value in cd_values[] */
-#define H5Z_scaleoffset_save_filval(type, cd_values, fill_val)                   \
-{                                                                                \
-    unsigned _i = H5Z_SCALEOFFSET_PARM_FILVAL; /* index into cd_values  */       \
-    uint32_t _cd_value;         /* Current cd_value */                           \
-    char *_fv_p;                /* Pointer to current byte in fill_val */        \
-    size_t _copy_size = 4;      /* # of bytes to copy this iteration */          \
-    size_t _size_rem = sizeof(type); /* # of bytes left to copy to cd_values */  \
-                                                                                 \
-    /* Store the fill value as the last entry in cd_values[]                     \
-     * Store byte by byte from least significant byte to most significant byte   \
-     * Plenty of space left for the fill value (from index 8 to 19)              \
-     * H5O_pline_encode will byte-swap each individual cd value, but we still    \
-     * need to swap the cd values as a whole if we are on a BE machine.  Note    \
-     * that we need to make sure to put the data only in the lowest 4 bytes of   \
-     * each, if sizeof(unsigned) > 4.                                            \
-     */                                                                          \
-    if(H5T_native_order_g == H5T_ORDER_LE) {                                     \
-        _fv_p = (char *)&(fill_val);                                             \
-        /* Copy 4 bytes at a time to each cd value */                            \
-        do {                                                                     \
-            if(_size_rem < 4) {                                                  \
-                /* Amount left to copy is smaller than a cd_value, adjust copy   \
-                 * size and initialize cd_value as it will not be fully          \
-                 * overwritten */                                                \
-                _copy_size = _size_rem;                                          \
-                _cd_value = (uint32_t)0;                                         \
-            } /* end if */                                                       \
-                                                                                 \
-            /* Copy the value */                                                 \
-            HDmemcpy(&_cd_value, _fv_p, _copy_size);                             \
-            (cd_values)[_i] = (unsigned)_cd_value;                               \
-                                                                                 \
-            /* Next field */                                                     \
-            _i++;                                                                \
-            _fv_p += _copy_size;                                                 \
-            _size_rem -= _copy_size;                                             \
-        } while(_size_rem);                                                      \
-    } /* end if */                                                               \
-    else {                                                                       \
-        HDassert(H5T_native_order_g == H5T_ORDER_BE);                            \
-                                                                                 \
-        /* Copy 4 bytes at a time to each cd value, but start at the end         \
-         * (highest address) of fill_val */                                      \
-        _fv_p = ((char *)&(fill_val)) + sizeof(type) - MIN(4, _size_rem);        \
-        while(_size_rem >= 4) {                                                  \
-            /* Copy the value */                                                 \
-            HDmemcpy(&_cd_value, _fv_p, _copy_size);                             \
-            (cd_values)[_i] = (unsigned)_cd_value;                               \
-                                                                                 \
-            /* Next field */                                                     \
-            _i++;                                                                \
-            _size_rem -= 4;                                                      \
-            if(_size_rem >= 4)                                                   \
-                _fv_p -= 4;                                                      \
-            else                                                                 \
-                _fv_p -= _size_rem;                                              \
-        } /* end while */                                                        \
-                                                                                 \
-        HDassert(_fv_p == (char *)&(fill_val));                                  \
-        if(_size_rem) {                                                          \
-            /* Amount left to copy is smaller than a cd_value, initialize        \
-             * _cd_value as it will not be fully overwritten and copy to the end \
-             * of _cd value as it is BE. */                                      \
-            _cd_value = (uint32_t)0;                                             \
-            HDmemcpy((char *)&_cd_value + 4 - _size_rem, _fv_p, _size_rem);      \
-            (cd_values)[_i] = (unsigned)_cd_value;                               \
-        } /* end if */                                                           \
-    } /* end else */                                                             \
-}
+#define H5Z_scaleoffset_save_filval(type, cd_values, fill_val)                                               \
+    {                                                                                                        \
+        unsigned _i = H5Z_SCALEOFFSET_PARM_FILVAL; /* index into cd_values  */                               \
+        uint32_t _cd_value;                        /* Current cd_value */                                    \
+        char *   _fv_p;                            /* Pointer to current byte in fill_val */                 \
+        size_t   _copy_size = 4;                   /* # of bytes to copy this iteration */                   \
+        size_t   _size_rem  = sizeof(type);        /* # of bytes left to copy to cd_values */                \
+                                                                                                             \
+        /* Store the fill value as the last entry in cd_values[]                                             \
+         * Store byte by byte from least significant byte to most significant byte                           \
+         * Plenty of space left for the fill value (from index 8 to 19)                                      \
+         * H5O_pline_encode will byte-swap each individual cd value, but we still                            \
+         * need to swap the cd values as a whole if we are on a BE machine.  Note                            \
+         * that we need to make sure to put the data only in the lowest 4 bytes of                           \
+         * each, if sizeof(unsigned) > 4.                                                                    \
+         */                                                                                                  \
+        if (H5T_native_order_g == H5T_ORDER_LE) {                                                            \
+            _fv_p = (char *)&(fill_val);                                                                     \
+            /* Copy 4 bytes at a time to each cd value */                                                    \
+            do {                                                                                             \
+                if (_size_rem < 4) {                                                                         \
+                    /* Amount left to copy is smaller than a cd_value, adjust copy                           \
+                     * size and initialize cd_value as it will not be fully                                  \
+                     * overwritten */                                                                        \
+                    _copy_size = _size_rem;                                                                  \
+                    _cd_value  = (uint32_t)0;                                                                \
+                } /* end if */                                                                               \
+                                                                                                             \
+                /* Copy the value */                                                                         \
+                HDmemcpy(&_cd_value, _fv_p, _copy_size);                                                     \
+                (cd_values)[_i] = (unsigned)_cd_value;                                                       \
+                                                                                                             \
+                /* Next field */                                                                             \
+                _i++;                                                                                        \
+                _fv_p += _copy_size;                                                                         \
+                _size_rem -= _copy_size;                                                                     \
+            } while (_size_rem);                                                                             \
+        } /* end if */                                                                                       \
+        else {                                                                                               \
+            HDassert(H5T_native_order_g == H5T_ORDER_BE);                                                    \
+                                                                                                             \
+            /* Copy 4 bytes at a time to each cd value, but start at the end                                 \
+             * (highest address) of fill_val */                                                              \
+            _fv_p = ((char *)&(fill_val)) + sizeof(type) - MIN(4, _size_rem);                                \
+            while (_size_rem >= 4) {                                                                         \
+                /* Copy the value */                                                                         \
+                HDmemcpy(&_cd_value, _fv_p, _copy_size);                                                     \
+                (cd_values)[_i] = (unsigned)_cd_value;                                                       \
+                                                                                                             \
+                /* Next field */                                                                             \
+                _i++;                                                                                        \
+                _size_rem -= 4;                                                                              \
+                if (_size_rem >= 4)                                                                          \
+                    _fv_p -= 4;                                                                              \
+                else                                                                                         \
+                    _fv_p -= _size_rem;                                                                      \
+            } /* end while */                                                                                \
+                                                                                                             \
+            HDassert(_fv_p == (char *)&(fill_val));                                                          \
+            if (_size_rem) {                                                                                 \
+                /* Amount left to copy is smaller than a cd_value, initialize                                \
+                 * _cd_value as it will not be fully overwritten and copy to the end                         \
+                 * of _cd value as it is BE. */                                                              \
+                _cd_value = (uint32_t)0;                                                                     \
+                HDmemcpy((char *)&_cd_value + 4 - _size_rem, _fv_p, _size_rem);                              \
+                (cd_values)[_i] = (unsigned)_cd_value;                                                       \
+            } /* end if */                                                                                   \
+        }     /* end else */                                                                                 \
+    }
 
 /* Set the fill value parameter in cd_values[] for unsigned integer type */
-#define H5Z_scaleoffset_set_filval_1(type, dcpl_plist, dt, cd_values, need_convert, dxpl_id)\
-{                                                                                    \
-    type fill_val;                                                                   \
-                                                                                     \
-    /* Get dataset fill value */                                                     \
-    if(H5P_get_fill_value(dcpl_plist, dt, &fill_val, dxpl_id) < 0)                   \
-        HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get fill value")        \
-                                                                                     \
-    if(need_convert)                                                                 \
-       H5Z_scaleoffset_convert(&fill_val, 1, sizeof(type));                          \
-                                                                                     \
-    H5Z_scaleoffset_save_filval(type, cd_values, fill_val)                           \
-}
+#define H5Z_scaleoffset_set_filval_1(type, dcpl_plist, dt, cd_values, need_convert, dxpl_id)                 \
+    {                                                                                                        \
+        type fill_val;                                                                                       \
+                                                                                                             \
+        /* Get dataset fill value */                                                                         \
+        if (H5P_get_fill_value(dcpl_plist, dt, &fill_val, dxpl_id) < 0)                                      \
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get fill value")                            \
+                                                                                                             \
+        if (need_convert)                                                                                    \
+            H5Z_scaleoffset_convert(&fill_val, 1, sizeof(type));                                             \
+                                                                                                             \
+        H5Z_scaleoffset_save_filval(type, cd_values, fill_val)                                               \
+    }
 
 /* Set the fill value parameter in cd_values[] for signed integer type */
-#define H5Z_scaleoffset_set_filval_2(type, dcpl_plist, dt, cd_values, need_convert, dxpl_id)\
-{                                                                                    \
-    type fill_val;                                                                   \
-                                                                                     \
-    /* Get dataset fill value */                                                     \
-    if(H5P_get_fill_value(dcpl_plist, dt, &fill_val, dxpl_id) < 0)                   \
-        HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get fill value")        \
-                                                                                     \
-    if(need_convert)                                                                 \
-       H5Z_scaleoffset_convert(&fill_val, 1, sizeof(type));                          \
-                                                                                     \
-    H5Z_scaleoffset_save_filval(unsigned type, cd_values, fill_val)                  \
-}
+#define H5Z_scaleoffset_set_filval_2(type, dcpl_plist, dt, cd_values, need_convert, dxpl_id)                 \
+    {                                                                                                        \
+        type fill_val;                                                                                       \
+                                                                                                             \
+        /* Get dataset fill value */                                                                         \
+        if (H5P_get_fill_value(dcpl_plist, dt, &fill_val, dxpl_id) < 0)                                      \
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get fill value")                            \
+                                                                                                             \
+        if (need_convert)                                                                                    \
+            H5Z_scaleoffset_convert(&fill_val, 1, sizeof(type));                                             \
+                                                                                                             \
+        H5Z_scaleoffset_save_filval(unsigned type, cd_values, fill_val)                                      \
+    }
 
 /* Set the fill value parameter in cd_values[] for character integer type */
-#define H5Z_scaleoffset_set_filval_3(type, dcpl_plist, dt, cd_values, need_convert, dxpl_id)\
-{                                                                                    \
-    type fill_val;                                                                   \
-                                                                                     \
-    /* Get dataset fill value */                                                     \
-    if(H5P_get_fill_value(dcpl_plist, dt, &fill_val, dxpl_id) < 0)                   \
-        HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get fill value")        \
-                                                                                     \
-    /* Store the fill value as the last entry in cd_values[] */                      \
-    (cd_values)[H5Z_SCALEOFFSET_PARM_FILVAL] = (unsigned)((unsigned char)fill_val);  \
-}
+#define H5Z_scaleoffset_set_filval_3(type, dcpl_plist, dt, cd_values, need_convert, dxpl_id)                 \
+    {                                                                                                        \
+        type fill_val;                                                                                       \
+                                                                                                             \
+        /* Get dataset fill value */                                                                         \
+        if (H5P_get_fill_value(dcpl_plist, dt, &fill_val, dxpl_id) < 0)                                      \
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get fill value")                            \
+                                                                                                             \
+        /* Store the fill value as the last entry in cd_values[] */                                          \
+        (cd_values)[H5Z_SCALEOFFSET_PARM_FILVAL] = (unsigned)((unsigned char)fill_val);                      \
+    }
 
 /* Set the fill value parameter in cd_values[] for floating-point type */
-#define H5Z_scaleoffset_set_filval_4(type, dcpl_plist, dt, cd_values, need_convert, dxpl_id)\
-{                                                                             \
-    type fill_val;                                                            \
-                                                                              \
-    /* Get dataset fill value */                                              \
-    if(H5P_get_fill_value(dcpl_plist, dt, &fill_val, dxpl_id) < 0)            \
-        HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get fill value") \
-                                                                              \
-    if(need_convert)                                                          \
-       H5Z_scaleoffset_convert(&fill_val, 1, sizeof(type));                   \
-                                                                              \
-    H5Z_scaleoffset_save_filval(type, cd_values, fill_val)                    \
-}
+#define H5Z_scaleoffset_set_filval_4(type, dcpl_plist, dt, cd_values, need_convert, dxpl_id)                 \
+    {                                                                                                        \
+        type fill_val;                                                                                       \
+                                                                                                             \
+        /* Get dataset fill value */                                                                         \
+        if (H5P_get_fill_value(dcpl_plist, dt, &fill_val, dxpl_id) < 0)                                      \
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get fill value")                            \
+                                                                                                             \
+        if (need_convert)                                                                                    \
+            H5Z_scaleoffset_convert(&fill_val, 1, sizeof(type));                                             \
+                                                                                                             \
+        H5Z_scaleoffset_save_filval(type, cd_values, fill_val)                                               \
+    }
 
 /* Get the fill value for integer type */
-#define H5Z_scaleoffset_get_filval_1(type, cd_values, fill_val)                  \
-{                                                                                \
-    unsigned _i = H5Z_SCALEOFFSET_PARM_FILVAL; /* index into cd_values  */       \
-    uint32_t _cd_value;         /* Current cd_value */                           \
-    char *_fv_p;                /* Pointer to current byte in fill_val */        \
-    size_t _copy_size = 4;      /* # of bytes to copy this iteration */          \
-    size_t _size_rem = sizeof(type); /* # of bytes left to copy to filval */     \
-                                                                                 \
-    /* Retrieve the fill value from the last entry in cd_values[]                \
-     * Store byte by byte from least significant byte to most significant byte   \
-     * Plenty of space left for the fill value (from index 8 to 19)              \
-     * H5O_pline_encode will byte-swap each individual cd value, but we still    \
-     * need to swap the cd values as a whole if we are on a BE machine.  Note    \
-     * that we need to make sure to put the data only in the lowest 4 bytes of   \
-     * each, if sizeof(unsigned) > 4.                                            \
-     */                                                                          \
-    if(H5T_native_order_g == H5T_ORDER_LE) {                                     \
-        _fv_p = (char *)&(fill_val);                                             \
-        /* Copy 4 bytes at a time to each cd value */                            \
-        do {                                                                     \
-            if(_size_rem < 4)                                                    \
-                /* Amount left to copy is smaller than a cd_value, adjust copy   \
-                 * size and initialize cd_value as it will not be fully          \
-                 * overwritten */                                                \
-                _copy_size = _size_rem;                                          \
-                                                                                 \
-            /* Copy the value */                                                 \
-            _cd_value = (uint32_t)(cd_values)[_i];                               \
-            HDmemcpy(_fv_p, &_cd_value, _copy_size);                             \
-                                                                                 \
-            /* Next field */                                                     \
-            _i++;                                                                \
-            _fv_p += _copy_size;                                                 \
-            _size_rem -= _copy_size;                                             \
-        } while(_size_rem);                                                      \
-    } /* end if */                                                               \
-    else {                                                                       \
-        HDassert(H5T_native_order_g == H5T_ORDER_BE);                            \
-                                                                                 \
-        /* Copy 4 bytes at a time to each cd value, but start at the end         \
-         * (highest address) of fill_val */                                      \
-        _fv_p = ((char *)&(fill_val)) + sizeof(type) - MIN(4, _size_rem);        \
-        while(_size_rem >= 4) {                                                  \
-            /* Copy the value */                                                 \
-            _cd_value = (uint32_t)(cd_values)[_i];                               \
-            HDmemcpy(_fv_p, &_cd_value, _copy_size);                             \
-                                                                                 \
-            /* Next field */                                                     \
-            _i++;                                                                \
-            _size_rem -= 4;                                                      \
-            if(_size_rem >=4)                                                    \
-                _fv_p -= 4;                                                      \
-            else                                                                 \
-                _fv_p -= _size_rem;                                              \
-        } /* end while */                                                        \
-                                                                                 \
-        HDassert(_fv_p == (char *)&(fill_val));                                  \
-        if(_size_rem) {                                                          \
-            /* Amount left to copy is smaller than a cd_value, initialize        \
-             * _cd_value as it will not be fully overwritten and copy to the end \
-             * of _cd value as it is BE. */                                      \
-            _cd_value = (uint32_t)(cd_values)[_i];                               \
-            HDmemcpy(_fv_p, (char *)&_cd_value + 4 - _size_rem, _size_rem);      \
-        } /* end if */                                                           \
-    } /* end else */                                                             \
-}
+#define H5Z_scaleoffset_get_filval_1(type, cd_values, fill_val)                                              \
+    {                                                                                                        \
+        unsigned _i = H5Z_SCALEOFFSET_PARM_FILVAL; /* index into cd_values  */                               \
+        uint32_t _cd_value;                        /* Current cd_value */                                    \
+        char *   _fv_p;                            /* Pointer to current byte in fill_val */                 \
+        size_t   _copy_size = 4;                   /* # of bytes to copy this iteration */                   \
+        size_t   _size_rem  = sizeof(type);        /* # of bytes left to copy to filval */                   \
+                                                                                                             \
+        /* Retrieve the fill value from the last entry in cd_values[]                                        \
+         * Store byte by byte from least significant byte to most significant byte                           \
+         * Plenty of space left for the fill value (from index 8 to 19)                                      \
+         * H5O_pline_encode will byte-swap each individual cd value, but we still                            \
+         * need to swap the cd values as a whole if we are on a BE machine.  Note                            \
+         * that we need to make sure to put the data only in the lowest 4 bytes of                           \
+         * each, if sizeof(unsigned) > 4.                                                                    \
+         */                                                                                                  \
+        if (H5T_native_order_g == H5T_ORDER_LE) {                                                            \
+            _fv_p = (char *)&(fill_val);                                                                     \
+            /* Copy 4 bytes at a time to each cd value */                                                    \
+            do {                                                                                             \
+                if (_size_rem < 4)                                                                           \
+                    /* Amount left to copy is smaller than a cd_value, adjust copy                           \
+                     * size and initialize cd_value as it will not be fully                                  \
+                     * overwritten */                                                                        \
+                    _copy_size = _size_rem;                                                                  \
+                                                                                                             \
+                /* Copy the value */                                                                         \
+                _cd_value = (uint32_t)(cd_values)[_i];                                                       \
+                HDmemcpy(_fv_p, &_cd_value, _copy_size);                                                     \
+                                                                                                             \
+                /* Next field */                                                                             \
+                _i++;                                                                                        \
+                _fv_p += _copy_size;                                                                         \
+                _size_rem -= _copy_size;                                                                     \
+            } while (_size_rem);                                                                             \
+        } /* end if */                                                                                       \
+        else {                                                                                               \
+            HDassert(H5T_native_order_g == H5T_ORDER_BE);                                                    \
+                                                                                                             \
+            /* Copy 4 bytes at a time to each cd value, but start at the end                                 \
+             * (highest address) of fill_val */                                                              \
+            _fv_p = ((char *)&(fill_val)) + sizeof(type) - MIN(4, _size_rem);                                \
+            while (_size_rem >= 4) {                                                                         \
+                /* Copy the value */                                                                         \
+                _cd_value = (uint32_t)(cd_values)[_i];                                                       \
+                HDmemcpy(_fv_p, &_cd_value, _copy_size);                                                     \
+                                                                                                             \
+                /* Next field */                                                                             \
+                _i++;                                                                                        \
+                _size_rem -= 4;                                                                              \
+                if (_size_rem >= 4)                                                                          \
+                    _fv_p -= 4;                                                                              \
+                else                                                                                         \
+                    _fv_p -= _size_rem;                                                                      \
+            } /* end while */                                                                                \
+                                                                                                             \
+            HDassert(_fv_p == (char *)&(fill_val));                                                          \
+            if (_size_rem) {                                                                                 \
+                /* Amount left to copy is smaller than a cd_value, initialize                                \
+                 * _cd_value as it will not be fully overwritten and copy to the end                         \
+                 * of _cd value as it is BE. */                                                              \
+                _cd_value = (uint32_t)(cd_values)[_i];                                                       \
+                HDmemcpy(_fv_p, (char *)&_cd_value + 4 - _size_rem, _size_rem);                              \
+            } /* end if */                                                                                   \
+        }     /* end else */                                                                                 \
+    }
 
 /* Get the fill value for floating-point type */
-#define H5Z_scaleoffset_get_filval_2(type, cd_values, filval)                          \
-{                                                                                      \
-   if(sizeof(type) <= sizeof(long long))                                               \
-      H5Z_scaleoffset_get_filval_1(type, cd_values, filval)                            \
-   else                                                                                \
-      HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
-}
+#define H5Z_scaleoffset_get_filval_2(type, cd_values, filval)                                                \
+    {                                                                                                        \
+        if (sizeof(type) <= sizeof(long long))                                                               \
+            H5Z_scaleoffset_get_filval_1(type, cd_values, filval) else HGOTO_ERROR(                          \
+                H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                         \
+    }
 
 /* Find maximum and minimum values of a buffer with fill value defined for integer type */
-#define H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min)\
-{                                                                  \
-   i = 0; while(i < d_nelmts && buf[i]== filval) i++;              \
-   if(i < d_nelmts) min = max = buf[i];                            \
-   for(; i < d_nelmts; i++) {                                      \
-      if(buf[i] == filval) continue; /* ignore fill value */       \
-      if(buf[i] > max) max = buf[i];                               \
-      if(buf[i] < min) min = buf[i];                               \
-   }                                                               \
-}
+#define H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min)                                        \
+    {                                                                                                        \
+        i = 0;                                                                                               \
+        while (i < d_nelmts && buf[i] == filval)                                                             \
+            i++;                                                                                             \
+        if (i < d_nelmts)                                                                                    \
+            min = max = buf[i];                                                                              \
+        for (; i < d_nelmts; i++) {                                                                          \
+            if (buf[i] == filval)                                                                            \
+                continue; /* ignore fill value */                                                            \
+            if (buf[i] > max)                                                                                \
+                max = buf[i];                                                                                \
+            if (buf[i] < min)                                                                                \
+                min = buf[i];                                                                                \
+        }                                                                                                    \
+    }
 
 /* Find maximum and minimum values of a buffer with fill value undefined */
-#define H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)\
-{                                                            \
-   min = max = buf[0];                                       \
-   for(i = 0; i < d_nelmts; i++) {                           \
-      if(buf[i] > max) max = buf[i];                         \
-      if(buf[i] < min) min = buf[i];                         \
-   }                                                         \
-}
+#define H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)                                                \
+    {                                                                                                        \
+        min = max = buf[0];                                                                                  \
+        for (i = 0; i < d_nelmts; i++) {                                                                     \
+            if (buf[i] > max)                                                                                \
+                max = buf[i];                                                                                \
+            if (buf[i] < min)                                                                                \
+                min = buf[i];                                                                                \
+        }                                                                                                    \
+    }
 
 /* Find maximum and minimum values of a buffer with fill value defined for floating-point type */
-#define H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val)      \
-{                                                                                 \
-   i = 0; while(i < d_nelmts && HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val)) i++; \
-   if(i < d_nelmts) min = max = buf[i];                                           \
-   for(; i < d_nelmts; i++) {                                                     \
-      if(HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                          \
-         continue; /* ignore fill value */                                        \
-      if(buf[i] > max) max = buf[i];                                              \
-      if(buf[i] < min) min = buf[i];                                              \
-   }                                                                              \
-}
+#define H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val)                                 \
+    {                                                                                                        \
+        i = 0;                                                                                               \
+        while (i < d_nelmts && HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                               \
+            i++;                                                                                             \
+        if (i < d_nelmts)                                                                                    \
+            min = max = buf[i];                                                                              \
+        for (; i < d_nelmts; i++) {                                                                          \
+            if (HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                                              \
+                continue; /* ignore fill value */                                                            \
+            if (buf[i] > max)                                                                                \
+                max = buf[i];                                                                                \
+            if (buf[i] < min)                                                                                \
+                min = buf[i];                                                                                \
+        }                                                                                                    \
+    }
 
 /* Find minimum value of a buffer with fill value defined for integer type */
-#define H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min) \
-{                                                            \
-   i = 0; while(i < d_nelmts && buf[i]== filval) i++;        \
-   if(i < d_nelmts) min = buf[i];                            \
-   for(; i < d_nelmts; i++) {                                \
-      if(buf[i] == filval) continue; /* ignore fill value */ \
-      if(buf[i] < min) min = buf[i];                         \
-   }                                                         \
-}
+#define H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min)                                                 \
+    {                                                                                                        \
+        i = 0;                                                                                               \
+        while (i < d_nelmts && buf[i] == filval)                                                             \
+            i++;                                                                                             \
+        if (i < d_nelmts)                                                                                    \
+            min = buf[i];                                                                                    \
+        for (; i < d_nelmts; i++) {                                                                          \
+            if (buf[i] == filval)                                                                            \
+                continue; /* ignore fill value */                                                            \
+            if (buf[i] < min)                                                                                \
+                min = buf[i];                                                                                \
+        }                                                                                                    \
+    }
 
 /* Find minimum value of a buffer with fill value undefined */
-#define H5Z_scaleoffset_min_2(i, d_nelmts, buf, min)\
-{                                                   \
-   min = buf[0];                                    \
-   for(i = 0; i < d_nelmts; i++)                    \
-      if(buf[i] < min) min = buf[i];                \
-}
+#define H5Z_scaleoffset_min_2(i, d_nelmts, buf, min)                                                         \
+    {                                                                                                        \
+        min = buf[0];                                                                                        \
+        for (i = 0; i < d_nelmts; i++)                                                                       \
+            if (buf[i] < min)                                                                                \
+                min = buf[i];                                                                                \
+    }
 
 /* Check and handle special situation for unsigned integer type */
-#define H5Z_scaleoffset_check_1(type, max, min, minbits) \
-{                                                        \
-   if(max - min > (type)(~(type)0 - 2))                  \
-   { *minbits = sizeof(type)*8; return; }                \
-}
+#define H5Z_scaleoffset_check_1(type, max, min, minbits)                                                     \
+    {                                                                                                        \
+        if (max - min > (type)(~(type)0 - 2)) {                                                              \
+            *minbits = sizeof(type) * 8;                                                                     \
+            return;                                                                                          \
+        }                                                                                                    \
+    }
 
 /* Check and handle special situation for signed integer type */
-#define H5Z_scaleoffset_check_2(type, max, min, minbits)                   \
-{                                                                          \
-   if((unsigned type)(max - min) > (unsigned type)(~(unsigned type)0 - 2)) \
-   { *minbits = sizeof(type)*8; return; }                                  \
-}
+#define H5Z_scaleoffset_check_2(type, max, min, minbits)                                                     \
+    {                                                                                                        \
+        if ((unsigned type)(max - min) > (unsigned type)(~(unsigned type)0 - 2)) {                           \
+            *minbits = sizeof(type) * 8;                                                                     \
+            return;                                                                                          \
+        }                                                                                                    \
+    }
 
 /* Check and handle special situation for floating-point type */
-#define H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val)                    \
-{                                                                                     \
-   if(sizeof(type)==sizeof(int)) {                                                    \
-      if(H5Z_scaleoffset_rnd(max*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val))       \
-         > HDpow(2.0f, (double)(sizeof(int)*8 - 1))) {                                \
-         *minbits = sizeof(int)*8; goto done;                                         \
-      }                                                                               \
-   } else if(sizeof(type)==sizeof(long)) {                                            \
-      if(H5Z_scaleoffset_rnd(max*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val))       \
-         > HDpow(2.0f, (double)(sizeof(long)*8 - 1))) {                               \
-         *minbits = sizeof(long)*8; goto done;                                        \
-      }                                                                               \
-   } else if(sizeof(type)==sizeof(long long)) {                                       \
-      if(H5Z_scaleoffset_rnd(max*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val))       \
-         > HDpow(2.0f, (double)(sizeof(long long)*8 - 1))) {                          \
-         *minbits = sizeof(long long)*8; goto done;                                   \
-      }                                                                               \
-   } else                                                                             \
-      HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
-}
+#define H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val)                                           \
+    {                                                                                                        \
+        if (sizeof(type) == sizeof(int)) {                                                                   \
+            if (H5Z_scaleoffset_rnd(max * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val)) >                 \
+                HDpow(2.0f, (double)(sizeof(int) * 8 - 1))) {                                                \
+                *minbits = sizeof(int) * 8;                                                                  \
+                goto done;                                                                                   \
+            }                                                                                                \
+        }                                                                                                    \
+        else if (sizeof(type) == sizeof(long)) {                                                             \
+            if (H5Z_scaleoffset_rnd(max * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val)) >                 \
+                HDpow(2.0f, (double)(sizeof(long) * 8 - 1))) {                                               \
+                *minbits = sizeof(long) * 8;                                                                 \
+                goto done;                                                                                   \
+            }                                                                                                \
+        }                                                                                                    \
+        else if (sizeof(type) == sizeof(long long)) {                                                        \
+            if (H5Z_scaleoffset_rnd(max * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val)) >                 \
+                HDpow(2.0f, (double)(sizeof(long long) * 8 - 1))) {                                          \
+                *minbits = sizeof(long long) * 8;                                                            \
+                goto done;                                                                                   \
+            }                                                                                                \
+        }                                                                                                    \
+        else                                                                                                 \
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
+    }
 
 /* Precompress for unsigned integer type */
-#define H5Z_scaleoffset_precompress_1(type, data, d_nelmts, filavail, cd_values, minbits, minval)\
-{                                                                                          \
-    type *buf = (type *)data, min = 0, max = 0, span, filval = 0;                          \
-    unsigned i;                                                                            \
-                                                                                           \
-    if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */                \
-        H5Z_scaleoffset_get_filval_1(type, cd_values, filval)                              \
-        if(*minbits == H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */ \
-            H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min)                  \
-            H5Z_scaleoffset_check_1(type, max, min, minbits)                               \
-            span = (type)(max - min + 1);                                                  \
-            *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1));                 \
-        } else /* minbits already set, only calculate min */                               \
-            H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min)                           \
-        if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */    \
-            for(i = 0; i < d_nelmts; i++)                                                  \
-                buf[i] = (type)((buf[i] == filval) ? (((type)1 << *minbits) - 1) : (buf[i] - min)); \
-    } else { /* fill value undefined */                                                    \
-        if(*minbits == H5Z_SO_INT_MINBITS_DEFAULT ) { /* minbits not set yet, calculate max, min, and minbits */ \
-            H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)                          \
-            H5Z_scaleoffset_check_1(type, max, min, minbits)                               \
-            span = (type)(max - min + 1);                                                  \
-            *minbits = H5Z_scaleoffset_log2((unsigned long long)span);                     \
-        } else /* minbits already set, only calculate min */                               \
-            H5Z_scaleoffset_min_2(i, d_nelmts, buf, min)                                   \
-        if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */    \
-            for(i = 0; i < d_nelmts; i++)                                                  \
-                buf[i] = (type)(buf[i] - min);                                             \
-    }                                                                                      \
-    *minval = min;                                                                         \
-}
+#define H5Z_scaleoffset_precompress_1(type, data, d_nelmts, filavail, cd_values, minbits, minval)            \
+    {                                                                                                        \
+        type *   buf = (type *)data, min = 0, max = 0, span, filval = 0;                                     \
+        unsigned i;                                                                                          \
+                                                                                                             \
+        if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */                             \
+            H5Z_scaleoffset_get_filval_1(type, cd_values,                                                    \
+                                         filval) if (*minbits == H5Z_SO_INT_MINBITS_DEFAULT)                 \
+            { /* minbits not set yet, calculate max, min, and minbits */                                     \
+                H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min)                                \
+                    H5Z_scaleoffset_check_1(type, max, min, minbits) span = (type)(max - min + 1);           \
+                *minbits = H5Z_scaleoffset_log2((unsigned long long)(span + 1));                             \
+            }                                                                                                \
+            else /* minbits already set, only calculate min */                                               \
+                H5Z_scaleoffset_min_1(                                                                       \
+                    i, d_nelmts, buf, filval,                                                                \
+                    min) if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */  \
+                for (i = 0; i < d_nelmts; i++) buf[i] =                                                      \
+                    (type)((buf[i] == filval) ? (((type)1 << *minbits) - 1) : (buf[i] - min));               \
+        }                                                                                                    \
+        else { /* fill value undefined */                                                                    \
+            if (*minbits ==                                                                                  \
+                H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */     \
+                H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)                                        \
+                    H5Z_scaleoffset_check_1(type, max, min, minbits) span = (type)(max - min + 1);           \
+                *minbits = H5Z_scaleoffset_log2((unsigned long long)span);                                   \
+            }                                                                                                \
+            else /* minbits already set, only calculate min */                                               \
+                H5Z_scaleoffset_min_2(                                                                       \
+                    i, d_nelmts, buf,                                                                        \
+                    min) if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */  \
+                    for (i = 0; i < d_nelmts; i++) buf[i] = (type)(buf[i] - min);                            \
+        }                                                                                                    \
+        *minval = min;                                                                                       \
+    }
 
 /* Precompress for signed integer type */
-#define H5Z_scaleoffset_precompress_2(type, data, d_nelmts, filavail, cd_values, minbits, minval)\
-{                                                                                            \
-   type *buf = (type *)data, min = 0, max = 0, filval = 0;                                   \
-   unsigned type span; unsigned i;                                                           \
-                                                                                             \
-   if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */                   \
-      H5Z_scaleoffset_get_filval_1(type, cd_values, filval)                                  \
-      if(*minbits == H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */ \
-         H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min)                       \
-         H5Z_scaleoffset_check_2(type, max, min, minbits)                                    \
-         span = (unsigned type)(max - min + 1);                                              \
-         *minbits = H5Z_scaleoffset_log2((unsigned long long)(span + 1));                    \
-      } else /* minbits already set, only calculate min */                                   \
-         H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min)                                \
-      if(*minbits != sizeof(type) * 8) /* change values if minbits != full precision */      \
-         for(i = 0; i < d_nelmts; i++)                                                       \
-            buf[i] = (type)((buf[i] == filval) ? (type)(((unsigned type)1 << *minbits) - 1) : (buf[i] - min)); \
-   } else { /* fill value undefined */                                                       \
-      if(*minbits == H5Z_SO_INT_MINBITS_DEFAULT ) { /* minbits not set yet, calculate max, min, and minbits */\
-         H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)                               \
-         H5Z_scaleoffset_check_2(type, max, min, minbits)                                    \
-         span = (unsigned type)(max - min + 1);                                              \
-         *minbits = H5Z_scaleoffset_log2((unsigned long long)span);                          \
-      } else /* minbits already set, only calculate min */                                   \
-         H5Z_scaleoffset_min_2(i, d_nelmts, buf, min)                                        \
-      if(*minbits != sizeof(type) * 8) /* change values if minbits != full precision */      \
-         for(i = 0; i < d_nelmts; i++)                                                       \
-            buf[i] = (type)(buf[i] - min);                                                   \
-   }                                                                                         \
-   *minval = (unsigned long long)min;                                                        \
-}
+#define H5Z_scaleoffset_precompress_2(type, data, d_nelmts, filavail, cd_values, minbits, minval)            \
+    {                                                                                                        \
+        type *        buf = (type *)data, min = 0, max = 0, filval = 0;                                      \
+        unsigned type span;                                                                                  \
+        unsigned      i;                                                                                     \
+                                                                                                             \
+        if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */                             \
+            H5Z_scaleoffset_get_filval_1(type, cd_values,                                                    \
+                                         filval) if (*minbits == H5Z_SO_INT_MINBITS_DEFAULT)                 \
+            { /* minbits not set yet, calculate max, min, and minbits */                                     \
+                H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min)                                \
+                    H5Z_scaleoffset_check_2(type, max, min, minbits) span = (unsigned type)(max - min + 1);  \
+                *minbits = H5Z_scaleoffset_log2((unsigned long long)(span + 1));                             \
+            }                                                                                                \
+            else /* minbits already set, only calculate min */                                               \
+                H5Z_scaleoffset_min_1(                                                                       \
+                    i, d_nelmts, buf, filval,                                                                \
+                    min) if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */  \
+                for (i = 0; i < d_nelmts; i++) buf[i] = (type)(                                              \
+                    (buf[i] == filval) ? (type)(((unsigned type)1 << *minbits) - 1) : (buf[i] - min));       \
+        }                                                                                                    \
+        else { /* fill value undefined */                                                                    \
+            if (*minbits ==                                                                                  \
+                H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */     \
+                H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)                                        \
+                    H5Z_scaleoffset_check_2(type, max, min, minbits) span = (unsigned type)(max - min + 1);  \
+                *minbits = H5Z_scaleoffset_log2((unsigned long long)span);                                   \
+            }                                                                                                \
+            else /* minbits already set, only calculate min */                                               \
+                H5Z_scaleoffset_min_2(                                                                       \
+                    i, d_nelmts, buf,                                                                        \
+                    min) if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */  \
+                    for (i = 0; i < d_nelmts; i++) buf[i] = (type)(buf[i] - min);                            \
+        }                                                                                                    \
+        *minval = (unsigned long long)min;                                                                   \
+    }
 
 /* Modify values of data in precompression if fill value defined for floating-point type */
-#define H5Z_scaleoffset_modify_1(i, type, buf, d_nelmts, filval, minbits, min, D_val) \
-{                                                                                     \
-   if(sizeof(type)==sizeof(int))                                                      \
-      for(i = 0; i < d_nelmts; i++) {                                                 \
-         if(HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                           \
-            *(int *)&buf[i] = (int)(((unsigned int)1 << *minbits) - 1);               \
-         else                                                                         \
-            *(int *)&buf[i] = H5Z_scaleoffset_rnd(                                    \
-                              buf[i]*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val));  \
-      }                                                                               \
-   else if(sizeof(type)==sizeof(long))                                                \
-      for(i = 0; i < d_nelmts; i++) {                                                 \
-         if(HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                           \
-            *(long *)&buf[i] = (long)(((unsigned long)1 << *minbits) - 1);            \
-         else                                                                         \
-            *(long *)&buf[i] = H5Z_scaleoffset_rnd(                                   \
-                               buf[i]*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val)); \
-      }                                                                               \
-   else if(sizeof(type)==sizeof(long long))                                           \
-      for(i = 0; i < d_nelmts; i++) {                                                 \
-         if(HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                           \
-            *(long long *)&buf[i] = (long long)(((unsigned long long)1 << *minbits) - 1); \
-         else                                                                         \
-            *(long long *)&buf[i] = H5Z_scaleoffset_rnd(                              \
-                                    buf[i]*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val)); \
-      }                                                                               \
-   else                                                                               \
-      HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
-}
+#define H5Z_scaleoffset_modify_1(i, type, buf, d_nelmts, filval, minbits, min, D_val)                        \
+    {                                                                                                        \
+        if (sizeof(type) == sizeof(int))                                                                     \
+            for (i = 0; i < d_nelmts; i++) {                                                                 \
+                if (HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                                          \
+                    *(int *)&buf[i] = (int)(((unsigned int)1 << *minbits) - 1);                              \
+                else                                                                                         \
+                    *(int *)&buf[i] =                                                                        \
+                        H5Z_scaleoffset_rnd(buf[i] * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val));       \
+            }                                                                                                \
+        else if (sizeof(type) == sizeof(long))                                                               \
+            for (i = 0; i < d_nelmts; i++) {                                                                 \
+                if (HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                                          \
+                    *(long *)&buf[i] = (long)(((unsigned long)1 << *minbits) - 1);                           \
+                else                                                                                         \
+                    *(long *)&buf[i] =                                                                       \
+                        H5Z_scaleoffset_rnd(buf[i] * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val));       \
+            }                                                                                                \
+        else if (sizeof(type) == sizeof(long long))                                                          \
+            for (i = 0; i < d_nelmts; i++) {                                                                 \
+                if (HDfabs(buf[i] - filval) < HDpow(10.0f, -D_val))                                          \
+                    *(long long *)&buf[i] = (long long)(((unsigned long long)1 << *minbits) - 1);            \
+                else                                                                                         \
+                    *(long long *)&buf[i] =                                                                  \
+                        H5Z_scaleoffset_rnd(buf[i] * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val));       \
+            }                                                                                                \
+        else                                                                                                 \
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
+    }
 
 /* Modify values of data in precompression if fill value undefined for floating-point type */
-#define H5Z_scaleoffset_modify_2(i, type, buf, d_nelmts, min, D_val)                  \
-{                                                                                     \
-   if(sizeof(type)==sizeof(int))                                                      \
-      for(i = 0; i < d_nelmts; i++)                                                   \
-         *(int *)&buf[i] = H5Z_scaleoffset_rnd(                                       \
-                           buf[i]*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val));     \
-   else if(sizeof(type)==sizeof(long))                                                \
-      for(i = 0; i < d_nelmts; i++)                                                   \
-         *(long *)&buf[i] = H5Z_scaleoffset_rnd(                                      \
-                            buf[i]*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val));    \
-   else if(sizeof(type)==sizeof(long long))                                           \
-      for(i = 0; i < d_nelmts; i++)                                                   \
-         *(long long *)&buf[i] = H5Z_scaleoffset_rnd(                                 \
-                                 buf[i]*HDpow(10.0f, D_val) - min*HDpow(10.0f, D_val)); \
-   else                                                                               \
-      HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
-}
+#define H5Z_scaleoffset_modify_2(i, type, buf, d_nelmts, min, D_val)                                         \
+    {                                                                                                        \
+        if (sizeof(type) == sizeof(int))                                                                     \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                *(int *)&buf[i] =                                                                            \
+                    H5Z_scaleoffset_rnd(buf[i] * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val));           \
+        else if (sizeof(type) == sizeof(long))                                                               \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                *(long *)&buf[i] =                                                                           \
+                    H5Z_scaleoffset_rnd(buf[i] * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val));           \
+        else if (sizeof(type) == sizeof(long long))                                                          \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                *(long long *)&buf[i] =                                                                      \
+                    H5Z_scaleoffset_rnd(buf[i] * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val));           \
+        else                                                                                                 \
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
+    }
 
 /* Save the minimum value for floating-point type */
-#define H5Z_scaleoffset_save_min(i, type, minval, min)                                \
-{                                                                                     \
-    if(sizeof(type) <= sizeof(long long))                                             \
-        /* Save min value to corresponding position                                   \
-         * byte-order will be swapped as appropriate, but be sure to                  \
-         * account for offset in BE if sizes differ                                   \
-         */                                                                           \
-        if(H5T_native_order_g == H5T_ORDER_LE)                                        \
-            HDmemcpy(minval, &min, sizeof(type));                                     \
-        else {                                                                        \
-            HDassert(H5T_native_order_g == H5T_ORDER_BE);                             \
-            HDmemcpy(((char *)minval) + (sizeof(long long) - sizeof(type)),           \
-                    &min, sizeof(type));                                              \
-        } /* end else */                                                              \
-    else                                                                              \
-        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
-}
+#define H5Z_scaleoffset_save_min(i, type, minval, min)                                                       \
+    {                                                                                                        \
+        if (sizeof(type) <= sizeof(long long))                                                               \
+            /* Save min value to corresponding position                                                      \
+             * byte-order will be swapped as appropriate, but be sure to                                     \
+             * account for offset in BE if sizes differ                                                      \
+             */                                                                                              \
+            if (H5T_native_order_g == H5T_ORDER_LE)                                                          \
+                HDmemcpy(minval, &min, sizeof(type));                                                        \
+            else {                                                                                           \
+                HDassert(H5T_native_order_g == H5T_ORDER_BE);                                                \
+                HDmemcpy(((char *)minval) + (sizeof(long long) - sizeof(type)), &min, sizeof(type));         \
+            } /* end else */                                                                                 \
+        else                                                                                                 \
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
+    }
 
 /* Precompress for floating-point type using variable-minimum-bits method */
-#define H5Z_scaleoffset_precompress_3(type, data, d_nelmts, filavail, cd_values,         \
-                                      minbits, minval, D_val)                            \
-{                                                                                        \
-   type *buf = (type *)data, min = 0, max = 0, filval = 0;                               \
-   unsigned long long span;                                                              \
-   unsigned i;                                                                           \
-                                                                                         \
-   *minval = 0;                                                                          \
-   if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */               \
-      H5Z_scaleoffset_get_filval_2(type, cd_values, filval)                              \
-      H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val)               \
-      H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val)                         \
-      span = H5Z_scaleoffset_rnd(max * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val)) + 1; \
-      *minbits = H5Z_scaleoffset_log2((unsigned long long)(span + 1));                   \
-      if(*minbits != sizeof(type) * 8) /* change values if minbits != full precision */  \
-         H5Z_scaleoffset_modify_1(i, type, buf, d_nelmts, filval, minbits, min, D_val)   \
-   } else { /* fill value undefined */                                                   \
-      H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)                              \
-      H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val)                         \
-      span = H5Z_scaleoffset_rnd(max * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val)) + 1; \
-      *minbits = H5Z_scaleoffset_log2((unsigned long long)span);                         \
-      if(*minbits != sizeof(type) * 8) /* change values if minbits != full precision */  \
-         H5Z_scaleoffset_modify_2(i, type, buf, d_nelmts, min, D_val)                    \
-   }                                                                                     \
-   H5Z_scaleoffset_save_min(i, type, minval, min)                                        \
-}
+#define H5Z_scaleoffset_precompress_3(type, data, d_nelmts, filavail, cd_values, minbits, minval, D_val)     \
+    {                                                                                                        \
+        type *             buf = (type *)data, min = 0, max = 0, filval = 0;                                 \
+        unsigned long long span;                                                                             \
+        unsigned           i;                                                                                \
+                                                                                                             \
+        *minval = 0;                                                                                         \
+        if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */                             \
+            H5Z_scaleoffset_get_filval_2(type, cd_values, filval)                                            \
+                H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val)                         \
+                    H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val) span =                        \
+                        H5Z_scaleoffset_rnd(max * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val)) + 1;      \
+            *minbits = H5Z_scaleoffset_log2((unsigned long long)(span + 1));                                 \
+            if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */               \
+                H5Z_scaleoffset_modify_1(i, type, buf, d_nelmts, filval, minbits, min, D_val)                \
+        }                                                                                                    \
+        else { /* fill value undefined */                                                                    \
+            H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)                                            \
+                H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val) span =                            \
+                    H5Z_scaleoffset_rnd(max * HDpow(10.0f, D_val) - min * HDpow(10.0f, D_val)) + 1;          \
+            *minbits = H5Z_scaleoffset_log2((unsigned long long)span);                                       \
+            if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */               \
+                H5Z_scaleoffset_modify_2(i, type, buf, d_nelmts, min, D_val)                                 \
+        }                                                                                                    \
+        H5Z_scaleoffset_save_min(i, type, minval, min)                                                       \
+    }
 
 /* Postdecompress for unsigned integer type */
-#define H5Z_scaleoffset_postdecompress_1(type, data, d_nelmts, filavail, cd_values, minbits, minval)\
-{                                                                                 \
-   type *buf = (type *)data, filval = 0; unsigned i;                              \
-                                                                                  \
-   if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */        \
-      H5Z_scaleoffset_get_filval_1(type, cd_values, filval)                       \
-      for(i = 0; i < d_nelmts; i++)                                               \
-         buf[i] = (type)((buf[i] == (((type)1 << minbits) - 1)) ? filval : (buf[i] + minval)); \
-   } else /* fill value undefined */                                              \
-      for(i = 0; i < d_nelmts; i++) buf[i] = (type)(buf[i] + (type)(minval));     \
-}
+#define H5Z_scaleoffset_postdecompress_1(type, data, d_nelmts, filavail, cd_values, minbits, minval)         \
+    {                                                                                                        \
+        type *   buf = (type *)data, filval = 0;                                                             \
+        unsigned i;                                                                                          \
+                                                                                                             \
+        if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */                             \
+            H5Z_scaleoffset_get_filval_1(type, cd_values, filval) for (i = 0; i < d_nelmts; i++) buf[i] =    \
+                (type)((buf[i] == (((type)1 << minbits) - 1)) ? filval : (buf[i] + minval));                 \
+        }                                                                                                    \
+        else /* fill value undefined */                                                                      \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                buf[i] = (type)(buf[i] + (type)(minval));                                                    \
+    }
 
 /* Postdecompress for signed integer type */
-#define H5Z_scaleoffset_postdecompress_2(type, data, d_nelmts, filavail, cd_values, minbits, minval)\
-{                                                                                          \
-   type *buf = (type *)data, filval = 0;                                                   \
-   unsigned i;                                                                             \
-                                                                                           \
-   if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */                 \
-      H5Z_scaleoffset_get_filval_1(type, cd_values, filval)                                \
-      for(i = 0; i < d_nelmts; i++)                                                        \
-         buf[i] = (type)(((unsigned type)buf[i] == (((unsigned type)1 << minbits) - 1)) ? filval : (buf[i] + minval));\
-   } else /* fill value undefined */                                                       \
-      for(i = 0; i < d_nelmts; i++)                                                        \
-          buf[i] = (type)(buf[i] + (type)(minval));                                        \
-}
+#define H5Z_scaleoffset_postdecompress_2(type, data, d_nelmts, filavail, cd_values, minbits, minval)         \
+    {                                                                                                        \
+        type *   buf = (type *)data, filval = 0;                                                             \
+        unsigned i;                                                                                          \
+                                                                                                             \
+        if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */                             \
+            H5Z_scaleoffset_get_filval_1(type, cd_values, filval) for (i = 0; i < d_nelmts; i++) buf[i] =    \
+                (type)(((unsigned type)buf[i] == (((unsigned type)1 << minbits) - 1)) ? filval               \
+                                                                                      : (buf[i] + minval));  \
+        }                                                                                                    \
+        else /* fill value undefined */                                                                      \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                buf[i] = (type)(buf[i] + (type)(minval));                                                    \
+    }
 
 /* Retrive minimum value of floating-point type */
-#define H5Z_scaleoffset_get_min(type, minval, min)                                 \
-{                                                                                  \
-    if(sizeof(type) <= sizeof(long long))                                          \
-        /* retrieve min value from corresponding position                          \
-         * byte-order has already been swapped as appropriate, but be sure to      \
-         * account for offset in BE if sizes differ                                \
-         */                                                                        \
-        if(H5T_native_order_g == H5T_ORDER_LE)                                     \
-            HDmemcpy(&min, &minval, sizeof(type));                                 \
-        else {                                                                     \
-            HDassert(H5T_native_order_g == H5T_ORDER_BE);                          \
-            HDmemcpy(&min, ((char *)&minval) + (sizeof(long long)                  \
-                    - sizeof(type)), sizeof(type));                                \
-        } /* end else */                                                           \
-    else                                                                           \
-        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
-}
+#define H5Z_scaleoffset_get_min(type, minval, min)                                                           \
+    {                                                                                                        \
+        if (sizeof(type) <= sizeof(long long))                                                               \
+            /* retrieve min value from corresponding position                                                \
+             * byte-order has already been swapped as appropriate, but be sure to                            \
+             * account for offset in BE if sizes differ                                                      \
+             */                                                                                              \
+            if (H5T_native_order_g == H5T_ORDER_LE)                                                          \
+                HDmemcpy(&min, &minval, sizeof(type));                                                       \
+            else {                                                                                           \
+                HDassert(H5T_native_order_g == H5T_ORDER_BE);                                                \
+                HDmemcpy(&min, ((char *)&minval) + (sizeof(long long) - sizeof(type)), sizeof(type));        \
+            } /* end else */                                                                                 \
+        else                                                                                                 \
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
+    }
 
 /* Modify values of data in postdecompression if fill value defined for floating-point type */
-#define H5Z_scaleoffset_modify_3(i, type, buf, d_nelmts, filval, minbits, min, D_val)     \
-{                                                                                         \
-   if(sizeof(type)==sizeof(int))                                                          \
-      for(i = 0; i < d_nelmts; i++)                                                       \
-         buf[i] = (type)((*(int *)&buf[i] == (int)(((unsigned int)1 << minbits) - 1)) ?   \
-                  filval : (double)(*(int *)&buf[i]) / HDpow(10.0f, D_val) + min);        \
-   else if(sizeof(type)==sizeof(long))                                                    \
-      for(i = 0; i < d_nelmts; i++)                                                       \
-         buf[i] = (type)((*(long *)&buf[i] == (long)(((unsigned long)1 << minbits) - 1)) ? \
-                  filval : (double)(*(long *)&buf[i]) / HDpow(10.0f, D_val) + min);       \
-   else if(sizeof(type)==sizeof(long long))                                               \
-      for(i = 0; i < d_nelmts; i++)                                                       \
-         buf[i] = (type)((*(long long *)&buf[i] == (long long)(((unsigned long long)1 << minbits) - 1)) ? \
-                  filval : (double)(*(long long *)&buf[i]) / HDpow(10.0f, D_val) + min);  \
-   else                                                                                   \
-      HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")    \
-}
+#define H5Z_scaleoffset_modify_3(i, type, buf, d_nelmts, filval, minbits, min, D_val)                        \
+    {                                                                                                        \
+        if (sizeof(type) == sizeof(int))                                                                     \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                buf[i] = (type)((*(int *)&buf[i] == (int)(((unsigned int)1 << minbits) - 1))                 \
+                                    ? filval                                                                 \
+                                    : (double)(*(int *)&buf[i]) / HDpow(10.0f, D_val) + min);                \
+        else if (sizeof(type) == sizeof(long))                                                               \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                buf[i] = (type)((*(long *)&buf[i] == (long)(((unsigned long)1 << minbits) - 1))              \
+                                    ? filval                                                                 \
+                                    : (double)(*(long *)&buf[i]) / HDpow(10.0f, D_val) + min);               \
+        else if (sizeof(type) == sizeof(long long))                                                          \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                buf[i] =                                                                                     \
+                    (type)((*(long long *)&buf[i] == (long long)(((unsigned long long)1 << minbits) - 1))    \
+                               ? filval                                                                      \
+                               : (double)(*(long long *)&buf[i]) / HDpow(10.0f, D_val) + min);               \
+        else                                                                                                 \
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
+    }
 
 /* Modify values of data in postdecompression if fill value undefined for floating-point type */
-#define H5Z_scaleoffset_modify_4(i, type, buf, d_nelmts, min, D_val)                   \
-{                                                                                      \
-   if(sizeof(type)==sizeof(int))                                                       \
-      for(i = 0; i < d_nelmts; i++)                                                    \
-         buf[i] = (type)((double)(*(int *)&buf[i]) / HDpow(10.0f, D_val) + min);       \
-   else if(sizeof(type)==sizeof(long))                                                 \
-      for(i = 0; i < d_nelmts; i++)                                                    \
-         buf[i] = (type)((double)(*(long *)&buf[i]) / HDpow(10.0f, D_val) + min);      \
-   else if(sizeof(type)==sizeof(long long))                                            \
-      for(i = 0; i < d_nelmts; i++)                                                    \
-         buf[i] = (type)((double)(*(long long *)&buf[i]) / HDpow(10.0f, D_val) + min); \
-   else                                                                                \
-      HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
-}
+#define H5Z_scaleoffset_modify_4(i, type, buf, d_nelmts, min, D_val)                                         \
+    {                                                                                                        \
+        if (sizeof(type) == sizeof(int))                                                                     \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                buf[i] = (type)((double)(*(int *)&buf[i]) / HDpow(10.0f, D_val) + min);                      \
+        else if (sizeof(type) == sizeof(long))                                                               \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                buf[i] = (type)((double)(*(long *)&buf[i]) / HDpow(10.0f, D_val) + min);                     \
+        else if (sizeof(type) == sizeof(long long))                                                          \
+            for (i = 0; i < d_nelmts; i++)                                                                   \
+                buf[i] = (type)((double)(*(long long *)&buf[i]) / HDpow(10.0f, D_val) + min);                \
+        else                                                                                                 \
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
+    }
 
 /* Postdecompress for floating-point type using variable-minimum-bits method */
-#define H5Z_scaleoffset_postdecompress_3(type, data, d_nelmts, filavail, cd_values,    \
-                                         minbits, minval, D_val)                       \
-{                                                                                      \
-   type *buf = (type *)data, filval = 0, min = 0;                                      \
-   unsigned i;                                                                         \
-                                                                                       \
-   H5Z_scaleoffset_get_min(type, minval, min)                                          \
-                                                                                       \
-   if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */             \
-      H5Z_scaleoffset_get_filval_2(type, cd_values, filval)                            \
-      H5Z_scaleoffset_modify_3(i, type, buf, d_nelmts, filval, minbits, min, D_val)    \
-   } else /* fill value undefined */                                                   \
-      H5Z_scaleoffset_modify_4(i, type, buf, d_nelmts, min, D_val)                     \
-}
+#define H5Z_scaleoffset_postdecompress_3(type, data, d_nelmts, filavail, cd_values, minbits, minval, D_val)  \
+    {                                                                                                        \
+        type *   buf = (type *)data, filval = 0, min = 0;                                                    \
+        unsigned i;                                                                                          \
+                                                                                                             \
+        H5Z_scaleoffset_get_min(type, minval, min)                                                           \
+                                                                                                             \
+            if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED)                                                    \
+        { /* fill value defined */                                                                           \
+            H5Z_scaleoffset_get_filval_2(type, cd_values, filval)                                            \
+                H5Z_scaleoffset_modify_3(i, type, buf, d_nelmts, filval, minbits, min, D_val)                \
+        }                                                                                                    \
+        else /* fill value undefined */                                                                      \
+            H5Z_scaleoffset_modify_4(i, type, buf, d_nelmts, min, D_val)                                     \
+    }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_can_apply_scaleoffset
  *
@@ -689,41 +745,41 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
 static htri_t
 H5Z_can_apply_scaleoffset(hid_t H5_ATTR_UNUSED dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id)
 {
-    const H5T_t	*type;                  /* Datatype */
-    H5T_class_t dtype_class;            /* Datatype's class */
-    H5T_order_t dtype_order;            /* Datatype's endianness order */
-    htri_t ret_value = TRUE;            /* Return value */
+    const H5T_t *type;             /* Datatype */
+    H5T_class_t  dtype_class;      /* Datatype's class */
+    H5T_order_t  dtype_order;      /* Datatype's endianness order */
+    htri_t       ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get datatype */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Get datatype's class, for checking the "datatype class" */
-    if((dtype_class = H5T_get_class(type, TRUE)) == H5T_NO_CLASS)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
+    if ((dtype_class = H5T_get_class(type, TRUE)) == H5T_NO_CLASS)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
 
     /* Get datatype's size, for checking the "datatype size" */
-    if(H5T_get_size(type) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if (H5T_get_size(type) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
-    if(dtype_class == H5T_INTEGER || dtype_class == H5T_FLOAT) {
+    if (dtype_class == H5T_INTEGER || dtype_class == H5T_FLOAT) {
         /* Get datatype's endianness order */
-        if((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
-	    HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "can't retrieve datatype endianness order")
+        if ((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
+            HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "can't retrieve datatype endianness order")
 
         /* Range check datatype's endianness order */
-        if(dtype_order != H5T_ORDER_LE && dtype_order != H5T_ORDER_BE)
+        if (dtype_order != H5T_ORDER_LE && dtype_order != H5T_ORDER_BE)
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FALSE, "bad datatype endianness order")
-    } else
+    }
+    else
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FALSE, "datatype class not supported by scaleoffset")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_can_apply_scaleoffset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_scaleoffset_get_type
  *
@@ -744,35 +800,47 @@ static enum H5Z_scaleoffset_t
 H5Z_scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dtype_sign)
 {
     enum H5Z_scaleoffset_t type = t_bad; /* integer type */
-    enum H5Z_scaleoffset_t ret_value;             /* return value */
+    enum H5Z_scaleoffset_t ret_value;    /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(dtype_class==H5Z_SCALEOFFSET_CLS_INTEGER) {
-        if(dtype_sign==H5Z_SCALEOFFSET_SGN_NONE) { /* unsigned integer */
-            if     (dtype_size == sizeof(unsigned char))      type = t_uchar;
-            else if(dtype_size == sizeof(unsigned short))     type = t_ushort;
-            else if(dtype_size == sizeof(unsigned int))       type = t_uint;
-            else if(dtype_size == sizeof(unsigned long))      type = t_ulong;
-            else if(dtype_size == sizeof(unsigned long long)) type = t_ulong_long;
+    if (dtype_class == H5Z_SCALEOFFSET_CLS_INTEGER) {
+        if (dtype_sign == H5Z_SCALEOFFSET_SGN_NONE) { /* unsigned integer */
+            if (dtype_size == sizeof(unsigned char))
+                type = t_uchar;
+            else if (dtype_size == sizeof(unsigned short))
+                type = t_ushort;
+            else if (dtype_size == sizeof(unsigned int))
+                type = t_uint;
+            else if (dtype_size == sizeof(unsigned long))
+                type = t_ulong;
+            else if (dtype_size == sizeof(unsigned long long))
+                type = t_ulong_long;
             else
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
         }
 
-        if(dtype_sign==H5Z_SCALEOFFSET_SGN_2) { /* signed integer */
-            if     (dtype_size == sizeof(signed char)) type = t_schar;
-            else if(dtype_size == sizeof(short))       type = t_short;
-            else if(dtype_size == sizeof(int))         type = t_int;
-            else if(dtype_size == sizeof(long))        type = t_long;
-            else if(dtype_size == sizeof(long long))   type = t_long_long;
+        if (dtype_sign == H5Z_SCALEOFFSET_SGN_2) { /* signed integer */
+            if (dtype_size == sizeof(signed char))
+                type = t_schar;
+            else if (dtype_size == sizeof(short))
+                type = t_short;
+            else if (dtype_size == sizeof(int))
+                type = t_int;
+            else if (dtype_size == sizeof(long))
+                type = t_long;
+            else if (dtype_size == sizeof(long long))
+                type = t_long_long;
             else
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
         }
     }
 
-    if(dtype_class==H5Z_SCALEOFFSET_CLS_FLOAT) {
-        if(dtype_size == sizeof(float))       type = t_float;
-        else if(dtype_size == sizeof(double)) type = t_double;
+    if (dtype_class == H5Z_SCALEOFFSET_CLS_FLOAT) {
+        if (dtype_size == sizeof(float))
+            type = t_float;
+        else if (dtype_size == sizeof(double))
+            type = t_double;
         else
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
     }
@@ -784,7 +852,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_scaleoffset_set_parms_fillval
  *
@@ -799,44 +866,47 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist,
-    H5T_t *type, enum H5Z_scaleoffset_t scale_type,
-    unsigned cd_values[], int need_convert, hid_t dxpl_id)
+H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist, H5T_t *type, enum H5Z_scaleoffset_t scale_type,
+                                  unsigned cd_values[], int need_convert, hid_t dxpl_id)
 {
-    herr_t ret_value = SUCCEED;          /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(scale_type == t_uchar)
-        H5Z_scaleoffset_set_filval_3(unsigned char, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_ushort)
-        H5Z_scaleoffset_set_filval_1(unsigned short, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_uint)
-        H5Z_scaleoffset_set_filval_1(unsigned int, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_ulong)
-        H5Z_scaleoffset_set_filval_1(unsigned long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_ulong_long)
-        H5Z_scaleoffset_set_filval_1(unsigned long long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_schar)
-        H5Z_scaleoffset_set_filval_3(signed char, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_short)
-        H5Z_scaleoffset_set_filval_2(short, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_int)
-        H5Z_scaleoffset_set_filval_2(int, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_long)
-        H5Z_scaleoffset_set_filval_2(long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_long_long)
-        H5Z_scaleoffset_set_filval_2(long long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_float)
-        H5Z_scaleoffset_set_filval_4(float, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-    else if(scale_type == t_double)
-        H5Z_scaleoffset_set_filval_4(double, dcpl_plist, type, cd_values, need_convert, dxpl_id)
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    if (scale_type == t_uchar)
+        H5Z_scaleoffset_set_filval_3(
+            unsigned char, dcpl_plist, type, cd_values, need_convert,
+            dxpl_id) else if (scale_type ==
+                              t_ushort) H5Z_scaleoffset_set_filval_1(unsigned short, dcpl_plist, type,
+                                                                     cd_values, need_convert,
+                                                                     dxpl_id) else if (scale_type == t_uint)
+            H5Z_scaleoffset_set_filval_1(unsigned int, dcpl_plist, type, cd_values, need_convert,
+                                         dxpl_id) else if (scale_type == t_ulong)
+                H5Z_scaleoffset_set_filval_1(unsigned long, dcpl_plist, type, cd_values, need_convert,
+                                             dxpl_id) else if (scale_type == t_ulong_long)
+                    H5Z_scaleoffset_set_filval_1(unsigned long long, dcpl_plist, type, cd_values,
+                                                 need_convert, dxpl_id) else if (scale_type == t_schar)
+                        H5Z_scaleoffset_set_filval_3(signed char, dcpl_plist, type, cd_values, need_convert,
+                                                     dxpl_id) else if (scale_type == t_short)
+                            H5Z_scaleoffset_set_filval_2(short, dcpl_plist, type, cd_values, need_convert,
+                                                         dxpl_id) else if (scale_type == t_int)
+                                H5Z_scaleoffset_set_filval_2(int, dcpl_plist, type, cd_values, need_convert,
+                                                             dxpl_id) else if (scale_type == t_long)
+                                    H5Z_scaleoffset_set_filval_2(long, dcpl_plist, type, cd_values,
+                                                                 need_convert,
+                                                                 dxpl_id) else if (scale_type == t_long_long)
+                                        H5Z_scaleoffset_set_filval_2(long long, dcpl_plist, type, cd_values,
+                                                                     need_convert,
+                                                                     dxpl_id) else if (scale_type == t_float)
+                                            H5Z_scaleoffset_set_filval_4(
+                                                float, dcpl_plist, type, cd_values, need_convert,
+                                                dxpl_id) else if (scale_type == t_double)
+                                                H5Z_scaleoffset_set_filval_4(double, dcpl_plist, type,
+                                                                             cd_values, need_convert, dxpl_id)
+
+                                                    done : FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_scaleoffset_set_parms_fillval() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_set_local_scaleoffset
  *
@@ -856,30 +926,30 @@ done:
 static herr_t
 H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
 {
-    H5P_genplist_t *dcpl_plist;     /* Property list pointer */
-    H5T_t	*type;              /* Datatype */
-    const H5S_t	*ds;                /* Dataspace */
-    unsigned flags;                 /* Filter flags */
-    size_t cd_nelmts = H5Z_SCALEOFFSET_USER_NPARMS;  /* Number of filter parameters */
-    unsigned cd_values[H5Z_SCALEOFFSET_TOTAL_NPARMS]; /* Filter parameters */
-    hssize_t npoints;               /* Number of points in the dataspace */
-    H5T_class_t dtype_class;        /* Datatype's class */
-    H5T_order_t dtype_order;        /* Datatype's endianness order */
-    size_t dtype_size;              /* Datatype's size (in bytes) */
-    H5T_sign_t dtype_sign;          /* Datatype's sign */
-    enum H5Z_scaleoffset_t scale_type; /* Specific datatype */
-    H5D_fill_value_t status;        /* Status of fill value in property list */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    H5P_genplist_t *       dcpl_plist;                              /* Property list pointer */
+    H5T_t *                type;                                    /* Datatype */
+    const H5S_t *          ds;                                      /* Dataspace */
+    unsigned               flags;                                   /* Filter flags */
+    size_t                 cd_nelmts = H5Z_SCALEOFFSET_USER_NPARMS; /* Number of filter parameters */
+    unsigned               cd_values[H5Z_SCALEOFFSET_TOTAL_NPARMS]; /* Filter parameters */
+    hssize_t               npoints;                                 /* Number of points in the dataspace */
+    H5T_class_t            dtype_class;                             /* Datatype's class */
+    H5T_order_t            dtype_order;                             /* Datatype's endianness order */
+    size_t                 dtype_size;                              /* Datatype's size (in bytes) */
+    H5T_sign_t             dtype_sign;                              /* Datatype's sign */
+    enum H5Z_scaleoffset_t scale_type;                              /* Specific datatype */
+    H5D_fill_value_t       status;              /* Status of fill value in property list */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Get the plist structure */
-    if(NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
+    if (NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get datatype */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
 #ifdef H5_CLEAR_MEMORY
     /* Initialize the parameters to a known state */
@@ -887,26 +957,27 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
 #endif /* H5_CLEAR_MEMORY */
 
     /* Get the filter's current parameters */
-    if(H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_SCALEOFFSET, &flags, &cd_nelmts, cd_values, (size_t)0, NULL, NULL) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get scaleoffset parameters")
+    if (H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_SCALEOFFSET, &flags, &cd_nelmts, cd_values, (size_t)0,
+                             NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get scaleoffset parameters")
 
     /* Get dataspace */
-    if(NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
     /* Get total number of elements in the chunk */
-    if((npoints = H5S_GET_EXTENT_NPOINTS(ds)) < 0)
+    if ((npoints = H5S_GET_EXTENT_NPOINTS(ds)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get number of points in the dataspace")
 
     /* Set "local" parameter for this dataset's number of elements */
     H5_CHECKED_ASSIGN(cd_values[H5Z_SCALEOFFSET_PARM_NELMTS], unsigned, npoints, hssize_t);
 
     /* Get datatype's class */
-    if((dtype_class = H5T_get_class(type, TRUE)) == H5T_NO_CLASS)
+    if ((dtype_class = H5T_get_class(type, TRUE)) == H5T_NO_CLASS)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
 
     /* Set "local" parameter for datatype's class */
-    switch(dtype_class) {
+    switch (dtype_class) {
         case H5T_INTEGER:
             cd_values[H5Z_SCALEOFFSET_PARM_CLASS] = H5Z_SCALEOFFSET_CLS_INTEGER;
             break;
@@ -931,19 +1002,19 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
     } /* end switch */
 
     /* Get datatype's size */
-    if((dtype_size = H5T_get_size(type)) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if ((dtype_size = H5T_get_size(type)) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
     /* Set "local" parameter for datatype size */
     cd_values[H5Z_SCALEOFFSET_PARM_SIZE] = dtype_size;
 
-    if(dtype_class == H5T_INTEGER) {
+    if (dtype_class == H5T_INTEGER) {
         /* Get datatype's sign */
-        if((dtype_sign = H5T_get_sign(type)) == H5T_SGN_ERROR)
+        if ((dtype_sign = H5T_get_sign(type)) == H5T_SGN_ERROR)
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype sign")
 
         /* Set "local" parameter for integer datatype sign */
-        switch(dtype_sign) {
+        switch (dtype_sign) {
             case H5T_SGN_NONE:
                 cd_values[H5Z_SCALEOFFSET_PARM_SIGN] = H5Z_SCALEOFFSET_SGN_NONE;
                 break;
@@ -957,19 +1028,19 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
             default:
                 HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad integer sign")
         } /* end switch */
-    } /* end if */
+    }     /* end if */
 
     /* Get datatype's endianness order */
-    if((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
+    if ((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
         HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype endianness order")
 
     /* Set "local" parameter for datatype endianness */
-    switch(dtype_order) {
-        case H5T_ORDER_LE:      /* Little-endian byte order */
+    switch (dtype_order) {
+        case H5T_ORDER_LE: /* Little-endian byte order */
             cd_values[H5Z_SCALEOFFSET_PARM_ORDER] = H5Z_SCALEOFFSET_ORDER_LE;
             break;
 
-        case H5T_ORDER_BE:      /* Big-endian byte order */
+        case H5T_ORDER_BE: /* Big-endian byte order */
             cd_values[H5Z_SCALEOFFSET_PARM_ORDER] = H5Z_SCALEOFFSET_ORDER_BE;
             break;
 
@@ -981,40 +1052,42 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
     } /* end switch */
 
     /* Check whether fill value is defined for dataset */
-    if(H5P_fill_value_defined(dcpl_plist, &status) < 0)
+    if (H5P_fill_value_defined(dcpl_plist, &status) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to determine if fill value is defined")
 
     /* Set local parameter for availability of fill value */
-    if(status == H5D_FILL_VALUE_UNDEFINED)
+    if (status == H5D_FILL_VALUE_UNDEFINED)
         cd_values[H5Z_SCALEOFFSET_PARM_FILAVAIL] = H5Z_SCALEOFFSET_FILL_UNDEFINED;
     else {
-        int need_convert = FALSE;       /* Flag indicating convertion of byte order */
+        int need_convert = FALSE; /* Flag indicating convertion of byte order */
 
         cd_values[H5Z_SCALEOFFSET_PARM_FILAVAIL] = H5Z_SCALEOFFSET_FILL_DEFINED;
 
         /* Check if memory byte order matches dataset datatype byte order */
-        if(H5T_native_order_g != dtype_order)
+        if (H5T_native_order_g != dtype_order)
             need_convert = TRUE;
 
         /* Before getting fill value, get its type */
-        if((scale_type = H5Z_scaleoffset_get_type(cd_values[H5Z_SCALEOFFSET_PARM_CLASS],
-                cd_values[H5Z_SCALEOFFSET_PARM_SIZE], cd_values[H5Z_SCALEOFFSET_PARM_SIGN])) == 0)
+        if ((scale_type = H5Z_scaleoffset_get_type(cd_values[H5Z_SCALEOFFSET_PARM_CLASS],
+                                                   cd_values[H5Z_SCALEOFFSET_PARM_SIZE],
+                                                   cd_values[H5Z_SCALEOFFSET_PARM_SIGN])) == 0)
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot use C integer datatype for cast")
 
         /* Get dataset fill value and store in cd_values[] */
-        if(H5Z_scaleoffset_set_parms_fillval(dcpl_plist, type, scale_type, cd_values, need_convert, H5AC_ind_dxpl_id) < 0)
+        if (H5Z_scaleoffset_set_parms_fillval(dcpl_plist, type, scale_type, cd_values, need_convert,
+                                              H5AC_ind_dxpl_id) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "unable to set fill value")
     } /* end else */
 
     /* Modify the filter's parameters for this dataset */
-    if(H5P_modify_filter(dcpl_plist, H5Z_FILTER_SCALEOFFSET, flags, (size_t)H5Z_SCALEOFFSET_TOTAL_NPARMS, cd_values) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local scaleoffset parameters")
+    if (H5P_modify_filter(dcpl_plist, H5Z_FILTER_SCALEOFFSET, flags, (size_t)H5Z_SCALEOFFSET_TOTAL_NPARMS,
+                          cd_values) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local scaleoffset parameters")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_local_scaleoffset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_scaleoffset
  *
@@ -1032,42 +1105,42 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
-    size_t nbytes, size_t *buf_size, void **buf)
+H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes,
+                       size_t *buf_size, void **buf)
 {
-    size_t ret_value = 0;           /* return value */
-    size_t size_out  = 0;           /* size of output buffer */
-    unsigned d_nelmts = 0;          /* number of data elements in the chunk */
-    unsigned dtype_class;           /* datatype class */
-    unsigned dtype_sign;            /* integer datatype sign */
-    unsigned filavail;              /* flag indicating if fill value is defined or not */
-    H5Z_SO_scale_type_t scale_type = H5Z_SO_FLOAT_DSCALE;/* scale type */
-    int scale_factor = 0;           /* scale factor */
-    double D_val = 0.0f;            /* decimal scale factor */
-    uint32_t minbits = 0;           /* minimum number of bits to store values */
-    unsigned long long minval= 0;   /* minimum value of input buffer */
-    enum H5Z_scaleoffset_t type; /* memory type corresponding to dataset datatype */
-    int need_convert = FALSE;       /* flag indicating convertion of byte order */
-    unsigned char *outbuf = NULL;   /* pointer to new output buffer */
-    unsigned buf_offset = 21;       /* buffer offset because of parameters stored in file */
-    unsigned i;                     /* index */
-    parms_atomic p;                 /* paramters needed for compress/decompress functions */
+    size_t                 ret_value = 0; /* return value */
+    size_t                 size_out  = 0; /* size of output buffer */
+    unsigned               d_nelmts  = 0; /* number of data elements in the chunk */
+    unsigned               dtype_class;   /* datatype class */
+    unsigned               dtype_sign;    /* integer datatype sign */
+    unsigned               filavail;      /* flag indicating if fill value is defined or not */
+    H5Z_SO_scale_type_t    scale_type   = H5Z_SO_FLOAT_DSCALE; /* scale type */
+    int                    scale_factor = 0;                   /* scale factor */
+    double                 D_val        = 0.0f;                /* decimal scale factor */
+    uint32_t               minbits      = 0;                   /* minimum number of bits to store values */
+    unsigned long long     minval       = 0;                   /* minimum value of input buffer */
+    enum H5Z_scaleoffset_t type;                 /* memory type corresponding to dataset datatype */
+    int                    need_convert = FALSE; /* flag indicating convertion of byte order */
+    unsigned char *        outbuf       = NULL;  /* pointer to new output buffer */
+    unsigned               buf_offset   = 21;    /* buffer offset because of parameters stored in file */
+    unsigned               i;                    /* index */
+    parms_atomic           p;                    /* paramters needed for compress/decompress functions */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* check arguments */
-    if(cd_nelmts != H5Z_SCALEOFFSET_TOTAL_NPARMS)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid scaleoffset number of paramters")
+    if (cd_nelmts != H5Z_SCALEOFFSET_TOTAL_NPARMS)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid scaleoffset number of paramters")
 
     /* Check if memory byte order matches dataset datatype byte order */
-    switch(H5T_native_order_g) {
-        case H5T_ORDER_LE:      /* memory is little-endian byte order */
-            if(cd_values[H5Z_SCALEOFFSET_PARM_ORDER] == H5Z_SCALEOFFSET_ORDER_BE)
+    switch (H5T_native_order_g) {
+        case H5T_ORDER_LE: /* memory is little-endian byte order */
+            if (cd_values[H5Z_SCALEOFFSET_PARM_ORDER] == H5Z_SCALEOFFSET_ORDER_BE)
                 need_convert = TRUE;
             break;
 
-        case H5T_ORDER_BE:      /* memory is big-endian byte order */
-            if(cd_values[H5Z_SCALEOFFSET_PARM_ORDER] == H5Z_SCALEOFFSET_ORDER_LE)
+        case H5T_ORDER_BE: /* memory is big-endian byte order */
+            if (cd_values[H5Z_SCALEOFFSET_PARM_ORDER] == H5Z_SCALEOFFSET_ORDER_LE)
                 need_convert = TRUE;
             break;
 
@@ -1094,33 +1167,35 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
      *                      scale factor is the fixed minimum number of bits
      * H5Z_SO_INT          : integer type, scale_factor is minimum number of bits
      */
-    if(dtype_class==H5Z_SCALEOFFSET_CLS_FLOAT) { /* floating-point type */
-        if(scale_type!=H5Z_SO_FLOAT_DSCALE && scale_type!=H5Z_SO_FLOAT_ESCALE)
+    if (dtype_class == H5Z_SCALEOFFSET_CLS_FLOAT) { /* floating-point type */
+        if (scale_type != H5Z_SO_FLOAT_DSCALE && scale_type != H5Z_SO_FLOAT_ESCALE)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid scale type")
     }
 
-    if(dtype_class==H5Z_SCALEOFFSET_CLS_INTEGER) { /* integer type */
-        if(scale_type!=H5Z_SO_INT)
+    if (dtype_class == H5Z_SCALEOFFSET_CLS_INTEGER) { /* integer type */
+        if (scale_type != H5Z_SO_INT)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid scale type")
 
         /* if scale_factor is less than 0 for integer, library will reset it to 0
          * in this case, library will calculate the minimum-bits
          */
-	if(scale_factor < 0) scale_factor = 0;
+        if (scale_factor < 0)
+            scale_factor = 0;
     }
 
     /* fixed-minimum-bits method is not implemented and is forbidden */
-    if(scale_type==H5Z_SO_FLOAT_ESCALE)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "E-scaling method not supported")
+    if (scale_type == H5Z_SO_FLOAT_ESCALE)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "E-scaling method not supported")
 
-    if(scale_type==H5Z_SO_FLOAT_DSCALE) { /* floating-point type, variable-minimum-bits */
+    if (scale_type == H5Z_SO_FLOAT_DSCALE) { /* floating-point type, variable-minimum-bits */
         D_val = (double)scale_factor;
-    } else { /* integer type, or floating-point type with fixed-minimum-bits method */
-        if(scale_factor > (int)(cd_values[H5Z_SCALEOFFSET_PARM_SIZE] * 8))
+    }
+    else { /* integer type, or floating-point type with fixed-minimum-bits method */
+        if (scale_factor > (int)(cd_values[H5Z_SCALEOFFSET_PARM_SIZE] * 8))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "minimum number of bits exceeds maximum")
 
         /* no need to process data */
-        if(scale_factor == (int)(cd_values[H5Z_SCALEOFFSET_PARM_SIZE] * 8)) {
+        if (scale_factor == (int)(cd_values[H5Z_SCALEOFFSET_PARM_SIZE] * 8)) {
             ret_value = *buf_size;
             goto done;
         }
@@ -1128,7 +1203,7 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
     }
 
     /* prepare paramters to pass to compress/decompress functions */
-    p.size = cd_values[H5Z_SCALEOFFSET_PARM_SIZE];
+    p.size      = cd_values[H5Z_SCALEOFFSET_PARM_SIZE];
     p.mem_order = H5T_native_order_g;
 
     /* input; decompress */
@@ -1136,14 +1211,14 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
         /* retrieve values of minbits and minval from input compressed buffer
          * retrieve them corresponding to how they are stored during compression
          */
-        uint32_t minbits_mask = 0;
-        unsigned long long minval_mask = 0;
-        unsigned minval_size = 0;
+        uint32_t           minbits_mask = 0;
+        unsigned long long minval_mask  = 0;
+        unsigned           minval_size  = 0;
 
         minbits = 0;
-        for(i = 0; i < 4; i++) {
+        for (i = 0; i < 4; i++) {
             minbits_mask = ((unsigned char *)*buf)[i];
-            minbits_mask <<= i*8;
+            minbits_mask <<= i * 8;
             minbits |= minbits_mask;
         }
 
@@ -1151,12 +1226,12 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
          * unsigned long long (datatype of minval) may change from compression
          * to decompression, only smaller size is used
          */
-        minval_size = sizeof(unsigned long long) <= ((unsigned char *)*buf)[4] ?
-                      sizeof(unsigned long long) : ((unsigned char *)*buf)[4];
+        minval_size = sizeof(unsigned long long) <= ((unsigned char *)*buf)[4] ? sizeof(unsigned long long)
+                                                                               : ((unsigned char *)*buf)[4];
         minval = 0;
-        for(i = 0; i < minval_size; i++) {
-            minval_mask = ((unsigned char *)*buf)[5+i];
-            minval_mask <<= i*8;
+        for (i = 0; i < minval_size; i++) {
+            minval_mask = ((unsigned char *)*buf)[5 + i];
+            minval_mask <<= i * 8;
             minval |= minval_mask;
         }
 
@@ -1167,50 +1242,51 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
         size_out = d_nelmts * p.size;
 
         /* allocate memory space for decompressed buffer */
-        if(NULL == (outbuf = (unsigned char *)H5MM_malloc(size_out)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for scaleoffset decompression")
+        if (NULL == (outbuf = (unsigned char *)H5MM_malloc(size_out)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0,
+                        "memory allocation failed for scaleoffset decompression")
 
         /* special case: minbits equal to full precision */
-        if(minbits == p.size * 8) {
-            HDmemcpy(outbuf, (unsigned char*)(*buf)+buf_offset, size_out);
+        if (minbits == p.size * 8) {
+            HDmemcpy(outbuf, (unsigned char *)(*buf) + buf_offset, size_out);
 
             /* convert to dataset datatype endianness order if needed */
-            if(need_convert)
+            if (need_convert)
                 H5Z_scaleoffset_convert(outbuf, d_nelmts, p.size);
 
-            *buf = outbuf;
-            outbuf = NULL;
+            *buf      = outbuf;
+            outbuf    = NULL;
             *buf_size = size_out;
             ret_value = size_out;
             goto done;
         }
 
         /* decompress the buffer if minbits not equal to zero */
-        if(minbits != 0)
-            H5Z_scaleoffset_decompress(outbuf, d_nelmts, (unsigned char*)(*buf)+buf_offset, p);
+        if (minbits != 0)
+            H5Z_scaleoffset_decompress(outbuf, d_nelmts, (unsigned char *)(*buf) + buf_offset, p);
         else {
             /* fill value is not defined and all data elements have the same value */
-            for(i = 0; i < size_out; i++) outbuf[i] = 0;
+            for (i = 0; i < size_out; i++)
+                outbuf[i] = 0;
         }
 
         /* before postprocess, get memory type */
-        if((type = H5Z_scaleoffset_get_type(dtype_class, (unsigned)p.size, dtype_sign)) == 0)
+        if ((type = H5Z_scaleoffset_get_type(dtype_class, (unsigned)p.size, dtype_sign)) == 0)
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, 0, "cannot use C integer datatype for cast")
 
         /* postprocess after decompression */
-        if(dtype_class==H5Z_SCALEOFFSET_CLS_INTEGER)
-            H5Z_scaleoffset_postdecompress_i(outbuf, d_nelmts, type, filavail,
-                                             cd_values, minbits, minval);
-
-        if(dtype_class==H5Z_SCALEOFFSET_CLS_FLOAT)
-            if(scale_type==0) { /* variable-minimum-bits method */
-                if(H5Z_scaleoffset_postdecompress_fd(outbuf, d_nelmts, type, filavail,
-                        cd_values, minbits, minval, D_val)==FAIL)
+        if (dtype_class == H5Z_SCALEOFFSET_CLS_INTEGER)
+            H5Z_scaleoffset_postdecompress_i(outbuf, d_nelmts, type, filavail, cd_values, minbits, minval);
+
+        if (dtype_class == H5Z_SCALEOFFSET_CLS_FLOAT)
+            if (scale_type == 0) { /* variable-minimum-bits method */
+                if (H5Z_scaleoffset_postdecompress_fd(outbuf, d_nelmts, type, filavail, cd_values, minbits,
+                                                      minval, D_val) == FAIL)
                     HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, 0, "post-decompression failed")
             }
 
         /* after postprocess, convert to dataset datatype endianness order if needed */
-        if(need_convert)
+        if (need_convert)
             H5Z_scaleoffset_convert(outbuf, d_nelmts, p.size);
     }
     /* output; compress */
@@ -1218,22 +1294,21 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
         HDassert(nbytes == d_nelmts * p.size);
 
         /* before preprocess, convert to memory endianness order if needed */
-        if(need_convert)
+        if (need_convert)
             H5Z_scaleoffset_convert(*buf, d_nelmts, p.size);
 
         /* before preprocess, get memory type */
-        if((type = H5Z_scaleoffset_get_type(dtype_class, (unsigned)p.size, dtype_sign))==0)
+        if ((type = H5Z_scaleoffset_get_type(dtype_class, (unsigned)p.size, dtype_sign)) == 0)
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, 0, "cannot use C integer datatype for cast")
 
         /* preprocess before compression */
-        if(dtype_class==H5Z_SCALEOFFSET_CLS_INTEGER)
-            H5Z_scaleoffset_precompress_i(*buf, d_nelmts, type, filavail,
-                                          cd_values, &minbits, &minval);
-
-        if(dtype_class==H5Z_SCALEOFFSET_CLS_FLOAT)
-            if(scale_type==0) { /* variable-minimum-bits method */
-                if(H5Z_scaleoffset_precompress_fd(*buf, d_nelmts, type, filavail,
-                        cd_values, &minbits, &minval, D_val)==FAIL)
+        if (dtype_class == H5Z_SCALEOFFSET_CLS_INTEGER)
+            H5Z_scaleoffset_precompress_i(*buf, d_nelmts, type, filavail, cd_values, &minbits, &minval);
+
+        if (dtype_class == H5Z_SCALEOFFSET_CLS_FLOAT)
+            if (scale_type == 0) { /* variable-minimum-bits method */
+                if (H5Z_scaleoffset_precompress_fd(*buf, d_nelmts, type, filavail, cd_values, &minbits,
+                                                   &minval, D_val) == FAIL)
                     HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, 0, "pre-compression failed")
             }
 
@@ -1243,10 +1318,10 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
          * minbits and minval are stored in the front of the compressed buffer
          */
         p.minbits = minbits;
-        size_out = buf_offset + nbytes * p.minbits / (p.size * 8) + 1; /* may be 1 larger */
+        size_out  = buf_offset + nbytes * p.minbits / (p.size * 8) + 1; /* may be 1 larger */
 
         /* allocate memory space for compressed buffer */
-        if(NULL == (outbuf = (unsigned char *)H5MM_malloc(size_out)))
+        if (NULL == (outbuf = (unsigned char *)H5MM_malloc(size_out)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for scaleoffset compression")
 
         /* store minbits and minval in the front of output compressed buffer
@@ -1254,13 +1329,14 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
          * constant buffer size (21 bytes) is left for these two parameters
          * 4 bytes for minbits, 1 byte for size of minval, 16 bytes for minval
          */
-        for(i = 0; i < 4; i++)
-            ((unsigned char *)outbuf)[i] = (unsigned char)((minbits & ((uint32_t)0xff << i*8)) >> i*8);
+        for (i = 0; i < 4; i++)
+            ((unsigned char *)outbuf)[i] = (unsigned char)((minbits & ((uint32_t)0xff << i * 8)) >> i * 8);
 
         ((unsigned char *)outbuf)[4] = sizeof(unsigned long long);
 
-        for(i = 0; i < sizeof(unsigned long long); i++)
-            ((unsigned char *)outbuf)[5+i] = (unsigned char)((minval & ((unsigned long long)0xff << i*8)) >> i*8);
+        for (i = 0; i < sizeof(unsigned long long); i++)
+            ((unsigned char *)outbuf)[5 + i] =
+                (unsigned char)((minval & ((unsigned long long)0xff << i * 8)) >> i * 8);
 
 #ifdef H5_CLEAR_MEMORY
         /* Zero out remaining, unused bytes */
@@ -1271,10 +1347,10 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
 #endif /* H5_CLEAR_MEMORY */
 
         /* special case: minbits equal to full precision */
-        if(minbits == p.size * 8) {
+        if (minbits == p.size * 8) {
             HDmemcpy(outbuf + buf_offset, *buf, nbytes);
-            *buf = outbuf;
-            outbuf = NULL;
+            *buf      = outbuf;
+            outbuf    = NULL;
             *buf_size = size_out;
             ret_value = buf_offset + nbytes;
             goto done;
@@ -1284,21 +1360,22 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
          * minbits equal to zero only when fill value is not defined and
          * all data elements have the same value
          */
-        if(minbits != 0)
-            H5Z_scaleoffset_compress((unsigned char *)*buf, d_nelmts, outbuf + buf_offset, size_out - buf_offset, p);
+        if (minbits != 0)
+            H5Z_scaleoffset_compress((unsigned char *)*buf, d_nelmts, outbuf + buf_offset,
+                                     size_out - buf_offset, p);
     }
 
     /* free the input buffer */
     H5MM_xfree(*buf);
 
     /* set return values */
-    *buf = outbuf;
-    outbuf = NULL;
+    *buf      = outbuf;
+    outbuf    = NULL;
     *buf_size = size_out;
     ret_value = size_out;
 
 done:
-    if(outbuf)
+    if (outbuf)
         H5MM_xfree(outbuf);
     FUNC_LEAVE_NOAPI(ret_value)
 }
@@ -1311,26 +1388,25 @@ done:
  * atomic datatype is treated on byte basis
  */
 
-
 /* change byte order of input buffer either from little-endian to big-endian
  * or from big-endian to little-endian  2/21/2005
  */
 static void
 H5Z_scaleoffset_convert(void *buf, unsigned d_nelmts, size_t dtype_size)
 {
-   if(dtype_size > 1) {
-       unsigned i, j;
-       unsigned char *buffer, temp;
-
-       buffer = (unsigned char *)buf;
-       for(i = 0; i < d_nelmts * dtype_size; i += dtype_size)
-          for(j = 0; j < dtype_size / 2; j++) {
-             /* swap pair of bytes */
-             temp = buffer[i + j];
-             buffer[i + j] = buffer[i + dtype_size - 1 - j];
-             buffer[i + dtype_size - 1 - j] = temp;
-          } /* end for */
-    } /* end if */
+    if (dtype_size > 1) {
+        unsigned       i, j;
+        unsigned char *buffer, temp;
+
+        buffer = (unsigned char *)buf;
+        for (i = 0; i < d_nelmts * dtype_size; i += dtype_size)
+            for (j = 0; j < dtype_size / 2; j++) {
+                /* swap pair of bytes */
+                temp                           = buffer[i + j];
+                buffer[i + j]                  = buffer[i + dtype_size - 1 - j];
+                buffer[i + dtype_size - 1 - j] = temp;
+            } /* end for */
+    }         /* end if */
 } /* end H5Z_scaleoffset_convert() */
 
 /* Round a floating-point value to the nearest integer value 4/19/05 */
@@ -1345,14 +1421,14 @@ H5Z_scaleoffset_rnd(double val)
     u_val = HDceil(val);
     l_val = HDfloor(val);
 
-    if(val > 0) {
-        if((u_val - val) <= (val - l_val))
+    if (val > 0) {
+        if ((u_val - val) <= (val - l_val))
             return u_val;
         else
             return l_val;
     } /* end if */
     else {
-        if((val - l_val) <= (u_val - val))
+        if ((val - l_val) <= (u_val - val))
             return l_val;
         else
             return u_val;
@@ -1365,357 +1441,353 @@ H5Z_scaleoffset_rnd(double val)
 static unsigned
 H5Z_scaleoffset_log2(unsigned long long num)
 {
-   unsigned v = 0;
-   unsigned long long lower_bound = 1; /* is power of 2, largest value <= num */
-   unsigned long long val = num;
-
-   while(val >>= 1) {
-       v++;
-       lower_bound <<= 1;
-   }
-
-   if(num == lower_bound)
-       return v;
-   else
-       return v + 1;
+    unsigned           v           = 0;
+    unsigned long long lower_bound = 1; /* is power of 2, largest value <= num */
+    unsigned long long val         = num;
+
+    while (val >>= 1) {
+        v++;
+        lower_bound <<= 1;
+    }
+
+    if (num == lower_bound)
+        return v;
+    else
+        return v + 1;
 }
 
 /* precompress for integer type */
 static void
-H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type,
-    unsigned filavail, const unsigned cd_values[], uint32_t *minbits, unsigned long long *minval)
+H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type, unsigned filavail,
+                              const unsigned cd_values[], uint32_t *minbits, unsigned long long *minval)
 {
-    if(type ==  t_uchar)
-        H5Z_scaleoffset_precompress_1(unsigned char, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
-    else if(type == t_ushort)
-        H5Z_scaleoffset_precompress_1(unsigned short, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
-    else if(type == t_uint)
-        H5Z_scaleoffset_precompress_1(unsigned int, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
-    else if(type == t_ulong)
-        H5Z_scaleoffset_precompress_1(unsigned long, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
-    else if(type == t_ulong_long)
-        H5Z_scaleoffset_precompress_1(unsigned long long, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
-    else if(type == t_schar) {
-        signed char *buf = (signed char *)data, min = 0, max = 0, filval = 0;
-        unsigned char span;
-        unsigned i;
-
-        if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */
-            H5Z_scaleoffset_get_filval_1(signed char, cd_values, filval);
-            if(*minbits == H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */
-                H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min)
-                if((unsigned char)(max - min) > (unsigned char)(~(unsigned char)0 - 2)) {
-                    *minbits = sizeof(signed char)*8;
-                    return;
+    if (type == t_uchar)
+        H5Z_scaleoffset_precompress_1(unsigned char, data, d_nelmts, filavail, cd_values, minbits,
+                                      minval) else if (type == t_ushort)
+            H5Z_scaleoffset_precompress_1(unsigned short, data, d_nelmts, filavail, cd_values, minbits,
+                                          minval) else if (type == t_uint)
+                H5Z_scaleoffset_precompress_1(unsigned int, data, d_nelmts, filavail, cd_values, minbits,
+                                              minval) else if (type == t_ulong)
+                    H5Z_scaleoffset_precompress_1(unsigned long, data, d_nelmts, filavail, cd_values, minbits,
+                                                  minval) else if (type == t_ulong_long)
+                        H5Z_scaleoffset_precompress_1(unsigned long long, data, d_nelmts, filavail, cd_values,
+                                                      minbits, minval) else if (type == t_schar)
+        {
+            signed char * buf = (signed char *)data, min = 0, max = 0, filval = 0;
+            unsigned char span;
+            unsigned      i;
+
+            if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */
+                H5Z_scaleoffset_get_filval_1(signed char, cd_values, filval);
+                if (*minbits ==
+                    H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */
+                    H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max,
+                                              min) if ((unsigned char)(max - min) >
+                                                       (unsigned char)(~(unsigned char)0 - 2))
+                    {
+                        *minbits = sizeof(signed char) * 8;
+                        return;
+                    }
+                    span     = (unsigned char)(max - min + 1);
+                    *minbits = H5Z_scaleoffset_log2((unsigned long long)(span + 1));
                 }
-                span = (unsigned char)(max - min + 1);
-                *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1));
-            } else /* minbits already set, only calculate min */
-                H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min)
-            if(*minbits != sizeof(signed char)*8) /* change values if minbits != full precision */
-                for(i = 0; i < d_nelmts; i++)
-                    buf[i] = (signed char)((buf[i] == filval) ? (((unsigned char)1 << *minbits) - 1) : (buf[i] - min));
-        } else { /* fill value undefined */
-            if(*minbits == H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */
-                H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)
-                if((unsigned char)(max - min) > (unsigned char)(~(unsigned char)0 - 2)) {
-                    *minbits = sizeof(signed char)*8;
-                    *minval = (unsigned long long)min;
-                    return;
+                else /* minbits already set, only calculate min */
+                    H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval,
+                                          min) if (*minbits !=
+                                                   sizeof(signed char) *
+                                                       8) /* change values if minbits != full precision */
+                        for (i = 0; i < d_nelmts; i++) buf[i] =
+                            (signed char)((buf[i] == filval) ? (((unsigned char)1 << *minbits) - 1)
+                                                             : (buf[i] - min));
+            }
+            else { /* fill value undefined */
+                if (*minbits ==
+                    H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */
+                    H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max,
+                                              min) if ((unsigned char)(max - min) >
+                                                       (unsigned char)(~(unsigned char)0 - 2))
+                    {
+                        *minbits = sizeof(signed char) * 8;
+                        *minval  = (unsigned long long)min;
+                        return;
+                    }
+                    span     = (unsigned char)(max - min + 1);
+                    *minbits = H5Z_scaleoffset_log2((unsigned long long)span);
                 }
-                span = (unsigned char)(max - min + 1);
-                *minbits = H5Z_scaleoffset_log2((unsigned long long)span);
-            } else /* minbits already set, only calculate min */
-                H5Z_scaleoffset_min_2(i, d_nelmts, buf, min)
-            if(*minbits != sizeof(signed char) * 8) /* change values if minbits != full precision */
-                for(i = 0; i < d_nelmts; i++)
-                    buf[i] = (signed char)(buf[i] - min);
+                else /* minbits already set, only calculate min */
+                    H5Z_scaleoffset_min_2(i, d_nelmts, buf,
+                                          min) if (*minbits !=
+                                                   sizeof(signed char) *
+                                                       8) /* change values if minbits != full precision */
+                        for (i = 0; i < d_nelmts; i++) buf[i] = (signed char)(buf[i] - min);
+            }
+            *minval = (unsigned long long)min;
         }
-        *minval = (unsigned long long)min;
-    }
-    else if(type == t_short)
-        H5Z_scaleoffset_precompress_2(short, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
-    else if(type == t_int)
-        H5Z_scaleoffset_precompress_2(int, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
-    else if(type == t_long)
-        H5Z_scaleoffset_precompress_2(long, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
-    else if(type == t_long_long)
-        H5Z_scaleoffset_precompress_2(long long, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval)
+    else if (type == t_short)
+        H5Z_scaleoffset_precompress_2(short, data, d_nelmts, filavail, cd_values, minbits,
+                                      minval) else if (type == t_int)
+            H5Z_scaleoffset_precompress_2(int, data, d_nelmts, filavail, cd_values, minbits,
+                                          minval) else if (type == t_long)
+                H5Z_scaleoffset_precompress_2(long, data, d_nelmts, filavail, cd_values, minbits,
+                                              minval) else if (type == t_long_long)
+                    H5Z_scaleoffset_precompress_2(long long, data, d_nelmts, filavail, cd_values, minbits,
+                                                  minval)
 }
 
 /* postdecompress for integer type */
 static void
 H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type,
-    unsigned filavail, const unsigned cd_values[], uint32_t minbits, unsigned long long minval)
+                                 unsigned filavail, const unsigned cd_values[], uint32_t minbits,
+                                 unsigned long long minval)
 {
-   long long sminval = *(long long*)&minval; /* for signed integer types */
-
-   if(type == t_uchar)
-      H5Z_scaleoffset_postdecompress_1(unsigned char, data, d_nelmts, filavail,
-                                       cd_values, minbits, minval)
-   else if(type == t_ushort)
-      H5Z_scaleoffset_postdecompress_1(unsigned short, data, d_nelmts, filavail,
-                                       cd_values, minbits, minval)
-   else if(type == t_uint)
-      H5Z_scaleoffset_postdecompress_1(unsigned int, data, d_nelmts, filavail,
-                                       cd_values, minbits, minval)
-   else if(type == t_ulong)
-      H5Z_scaleoffset_postdecompress_1(unsigned long, data, d_nelmts, filavail,
-                                       cd_values, minbits, minval)
-   else if(type == t_ulong_long)
-      H5Z_scaleoffset_postdecompress_1(unsigned long long, data, d_nelmts, filavail,
-                                       cd_values, minbits, minval)
-   else if(type == t_schar) {
-      signed char *buf = (signed char *)data, filval = 0;
-      unsigned i;
-
-      if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */
-         H5Z_scaleoffset_get_filval_1(signed char, cd_values, filval)
-         for(i = 0; i < d_nelmts; i++)
-            buf[i] = (signed char)((buf[i] == (((unsigned char)1 << minbits) - 1)) ? filval : (buf[i] + sminval));
-      } else /* fill value undefined */
-         for(i = 0; i < d_nelmts; i++)
-             buf[i] = (signed char)(buf[i] + sminval);
-   }
-   else if(type == t_short)
-      H5Z_scaleoffset_postdecompress_2(short, data, d_nelmts, filavail,
-                                       cd_values, minbits, sminval)
-   else if(type == t_int)
-      H5Z_scaleoffset_postdecompress_2(int, data, d_nelmts, filavail,
-                                       cd_values, minbits, sminval)
-   else if(type == t_long)
-      H5Z_scaleoffset_postdecompress_2(long, data, d_nelmts, filavail,
-                                       cd_values, minbits, sminval)
-   else if(type == t_long_long)
-      H5Z_scaleoffset_postdecompress_2(long long, data, d_nelmts, filavail,
-                                       cd_values, minbits, sminval)
+    long long sminval = *(long long *)&minval; /* for signed integer types */
+
+    if (type == t_uchar)
+        H5Z_scaleoffset_postdecompress_1(unsigned char, data, d_nelmts, filavail, cd_values, minbits,
+                                         minval) else if (type == t_ushort)
+            H5Z_scaleoffset_postdecompress_1(unsigned short, data, d_nelmts, filavail, cd_values, minbits,
+                                             minval) else if (type == t_uint)
+                H5Z_scaleoffset_postdecompress_1(unsigned int, data, d_nelmts, filavail, cd_values, minbits,
+                                                 minval) else if (type == t_ulong)
+                    H5Z_scaleoffset_postdecompress_1(unsigned long, data, d_nelmts, filavail, cd_values,
+                                                     minbits, minval) else if (type == t_ulong_long)
+                        H5Z_scaleoffset_postdecompress_1(unsigned long long, data, d_nelmts, filavail,
+                                                         cd_values, minbits, minval) else if (type == t_schar)
+        {
+            signed char *buf = (signed char *)data, filval = 0;
+            unsigned     i;
+
+            if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */
+                H5Z_scaleoffset_get_filval_1(signed char, cd_values, filval) for (i = 0; i < d_nelmts; i++)
+                    buf[i] =
+                        (signed char)((buf[i] == (((unsigned char)1 << minbits) - 1)) ? filval
+                                                                                      : (buf[i] + sminval));
+            }
+            else /* fill value undefined */
+                for (i = 0; i < d_nelmts; i++)
+                    buf[i] = (signed char)(buf[i] + sminval);
+        }
+    else if (type == t_short)
+        H5Z_scaleoffset_postdecompress_2(short, data, d_nelmts, filavail, cd_values, minbits,
+                                         sminval) else if (type == t_int)
+            H5Z_scaleoffset_postdecompress_2(int, data, d_nelmts, filavail, cd_values, minbits,
+                                             sminval) else if (type == t_long)
+                H5Z_scaleoffset_postdecompress_2(long, data, d_nelmts, filavail, cd_values, minbits,
+                                                 sminval) else if (type == t_long_long)
+                    H5Z_scaleoffset_postdecompress_2(long long, data, d_nelmts, filavail, cd_values, minbits,
+                                                     sminval)
 }
 
 /* precompress for floating-point type, variable-minimum-bits method
    success: non-negative, failure: negative 4/15/05 */
 static herr_t
-H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type,
-    unsigned filavail, const unsigned cd_values[], uint32_t *minbits,
-    unsigned long long *minval, double D_val)
+H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type, unsigned filavail,
+                               const unsigned cd_values[], uint32_t *minbits, unsigned long long *minval,
+                               double D_val)
 {
-   herr_t ret_value=SUCCEED; /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
-   FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_NOAPI_NOINIT
 
-   if(type == t_float)
-      H5Z_scaleoffset_precompress_3(float, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval, D_val)
-   else if(type == t_double)
-      H5Z_scaleoffset_precompress_3(double, data, d_nelmts,
-                                    filavail, cd_values, minbits, minval, D_val)
+    if (type == t_float)
+        H5Z_scaleoffset_precompress_3(float, data, d_nelmts, filavail, cd_values, minbits, minval,
+                                      D_val) else if (type == t_double)
+            H5Z_scaleoffset_precompress_3(double, data, d_nelmts, filavail, cd_values, minbits, minval, D_val)
 
-done:
-   FUNC_LEAVE_NOAPI(ret_value)
+                done : FUNC_LEAVE_NOAPI(ret_value)
 }
 
 /* postdecompress for floating-point type, variable-minimum-bits method
    success: non-negative, failure: negative 4/15/05 */
 static herr_t
 H5Z_scaleoffset_postdecompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_t type,
-    unsigned filavail, const unsigned cd_values[], uint32_t minbits,
-    unsigned long long minval, double D_val)
+                                  unsigned filavail, const unsigned cd_values[], uint32_t minbits,
+                                  unsigned long long minval, double D_val)
 {
-   long long sminval = (long long)minval;    /* for signed integer types */
-   herr_t ret_value=SUCCEED;                 /* Return value */
+    long long sminval   = (long long)minval; /* for signed integer types */
+    herr_t    ret_value = SUCCEED;           /* Return value */
 
-   FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_NOAPI_NOINIT
 
-   if(type == t_float)
-      H5Z_scaleoffset_postdecompress_3(float, data, d_nelmts, filavail,
-                                       cd_values, minbits, sminval, D_val)
-   else if(type == t_double)
-      H5Z_scaleoffset_postdecompress_3(double, data, d_nelmts, filavail,
-                                       cd_values, minbits, sminval, D_val)
+    if (type == t_float)
+        H5Z_scaleoffset_postdecompress_3(float, data, d_nelmts, filavail, cd_values, minbits, sminval,
+                                         D_val) else if (type == t_double)
+            H5Z_scaleoffset_postdecompress_3(double, data, d_nelmts, filavail, cd_values, minbits, sminval,
+                                             D_val)
 
-done:
-   FUNC_LEAVE_NOAPI(ret_value)
+                done : FUNC_LEAVE_NOAPI(ret_value)
 }
 
 static void
 H5Z_scaleoffset_next_byte(size_t *j, unsigned *buf_len)
 {
-   ++(*j);
-   *buf_len = 8 * sizeof(unsigned char);
+    ++(*j);
+    *buf_len = 8 * sizeof(unsigned char);
 }
 
 static void
-H5Z_scaleoffset_decompress_one_byte(unsigned char *data, size_t data_offset,
-    unsigned k, unsigned begin_i, unsigned char *buffer, size_t *j, unsigned *buf_len,
-    parms_atomic p, unsigned dtype_len)
+H5Z_scaleoffset_decompress_one_byte(unsigned char *data, size_t data_offset, unsigned k, unsigned begin_i,
+                                    unsigned char *buffer, size_t *j, unsigned *buf_len, parms_atomic p,
+                                    unsigned dtype_len)
 {
-   unsigned dat_len;    /* dat_len is the number of bits to be copied in each data byte */
-   unsigned char val;   /* value to be copied in each data byte */
-
-   /* initialize value and bits of unsigned char to be copied */
-   val = buffer[*j];
-   if(k == begin_i)
-      dat_len = 8 - (dtype_len - p.minbits) % 8;
-   else
-      dat_len = 8;
-
-   if(*buf_len > dat_len) {
-      data[data_offset + k] = (unsigned char)((val >> (*buf_len - dat_len)) & ~(~0 << dat_len));
-      *buf_len -= dat_len;
-   } /* end if */
-   else {
-      data[data_offset + k] = (unsigned char)((val & ~(~0 << *buf_len)) << (dat_len - *buf_len));
-      dat_len -= *buf_len;
-      H5Z_scaleoffset_next_byte(j, buf_len);
-      if(dat_len == 0)
-          return;
-
-      val = buffer[*j];
-      data[data_offset + k] |= (unsigned char)((val >> (*buf_len - dat_len)) & ~(~0 << dat_len));
-      *buf_len -= dat_len;
-   } /* end else */
+    unsigned      dat_len; /* dat_len is the number of bits to be copied in each data byte */
+    unsigned char val;     /* value to be copied in each data byte */
+
+    /* initialize value and bits of unsigned char to be copied */
+    val = buffer[*j];
+    if (k == begin_i)
+        dat_len = 8 - (dtype_len - p.minbits) % 8;
+    else
+        dat_len = 8;
+
+    if (*buf_len > dat_len) {
+        data[data_offset + k] = (unsigned char)((val >> (*buf_len - dat_len)) & ~(~0 << dat_len));
+        *buf_len -= dat_len;
+    } /* end if */
+    else {
+        data[data_offset + k] = (unsigned char)((val & ~(~0 << *buf_len)) << (dat_len - *buf_len));
+        dat_len -= *buf_len;
+        H5Z_scaleoffset_next_byte(j, buf_len);
+        if (dat_len == 0)
+            return;
+
+        val = buffer[*j];
+        data[data_offset + k] |= (unsigned char)((val >> (*buf_len - dat_len)) & ~(~0 << dat_len));
+        *buf_len -= dat_len;
+    } /* end else */
 }
 
 static void
-H5Z_scaleoffset_decompress_one_atomic(unsigned char *data, size_t data_offset,
-    unsigned char *buffer, size_t *j, unsigned *buf_len, parms_atomic p)
+H5Z_scaleoffset_decompress_one_atomic(unsigned char *data, size_t data_offset, unsigned char *buffer,
+                                      size_t *j, unsigned *buf_len, parms_atomic p)
 {
-   /* begin_i: the index of byte having first significant bit */
-   unsigned begin_i;
-   unsigned dtype_len;
-   int k;
+    /* begin_i: the index of byte having first significant bit */
+    unsigned begin_i;
+    unsigned dtype_len;
+    int      k;
 
-   HDassert(p.minbits > 0);
+    HDassert(p.minbits > 0);
 
-   dtype_len = p.size * 8;
+    dtype_len = p.size * 8;
 
-   if(p.mem_order == H5Z_SCALEOFFSET_ORDER_LE) { /* little endian */
-      begin_i = p.size - 1 - (dtype_len - p.minbits) / 8;
+    if (p.mem_order == H5Z_SCALEOFFSET_ORDER_LE) { /* little endian */
+        begin_i = p.size - 1 - (dtype_len - p.minbits) / 8;
 
-      for(k = (int)begin_i; k >= 0; k--)
-         H5Z_scaleoffset_decompress_one_byte(data, data_offset, (unsigned)k, begin_i,
-                                             buffer, j, buf_len, p, dtype_len);
-   }
-   else { /* big endian */
-      HDassert(p.mem_order == H5Z_SCALEOFFSET_ORDER_BE);
+        for (k = (int)begin_i; k >= 0; k--)
+            H5Z_scaleoffset_decompress_one_byte(data, data_offset, (unsigned)k, begin_i, buffer, j, buf_len,
+                                                p, dtype_len);
+    }
+    else { /* big endian */
+        HDassert(p.mem_order == H5Z_SCALEOFFSET_ORDER_BE);
 
-      begin_i = (dtype_len - p.minbits) / 8;
+        begin_i = (dtype_len - p.minbits) / 8;
 
-      for(k = (int)begin_i; k <= (int)(p.size - 1); k++)
-         H5Z_scaleoffset_decompress_one_byte(data, data_offset, (unsigned)k, begin_i,
-                                             buffer, j, buf_len, p, dtype_len);
-   }
+        for (k = (int)begin_i; k <= (int)(p.size - 1); k++)
+            H5Z_scaleoffset_decompress_one_byte(data, data_offset, (unsigned)k, begin_i, buffer, j, buf_len,
+                                                p, dtype_len);
+    }
 }
 
 static void
-H5Z_scaleoffset_decompress(unsigned char *data, unsigned d_nelmts,
-    unsigned char *buffer, parms_atomic p)
+H5Z_scaleoffset_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer, parms_atomic p)
 {
     /* i: index of data, j: index of buffer,
        buf_len: number of bits to be filled in current byte */
-    size_t i, j;
+    size_t   i, j;
     unsigned buf_len;
 
     /* must initialize to zeros */
-    for(i = 0; i < d_nelmts*p.size; i++)
+    for (i = 0; i < d_nelmts * p.size; i++)
         data[i] = 0;
 
     /* initialization before the loop */
-    j = 0;
+    j       = 0;
     buf_len = sizeof(unsigned char) * 8;
 
     /* decompress */
-    for(i = 0; i < d_nelmts; i++)
+    for (i = 0; i < d_nelmts; i++)
         H5Z_scaleoffset_decompress_one_atomic(data, i * p.size, buffer, &j, &buf_len, p);
 }
 
 static void
-H5Z_scaleoffset_compress_one_byte(unsigned char *data, size_t data_offset,
-    unsigned k, unsigned begin_i, unsigned char *buffer, size_t *j, unsigned *buf_len,
-    parms_atomic p, unsigned dtype_len)
+H5Z_scaleoffset_compress_one_byte(unsigned char *data, size_t data_offset, unsigned k, unsigned begin_i,
+                                  unsigned char *buffer, size_t *j, unsigned *buf_len, parms_atomic p,
+                                  unsigned dtype_len)
 {
-   unsigned dat_len;    /* dat_len is the number of bits to be copied in each data byte */
-   unsigned char val;   /* value to be copied in each data byte */
-
-   /* initialize value and bits of unsigned char to be copied */
-   val = data[data_offset + k];
-   if(k == begin_i)
-      dat_len = 8 - (dtype_len - p.minbits) % 8;
-   else
-      dat_len = 8;
-
-   if(*buf_len > dat_len) {
-      buffer[*j] |= (unsigned char)((val & ~(~0 << dat_len)) << (*buf_len - dat_len));
-      *buf_len -= dat_len;
-   } else {
-      buffer[*j] |= (unsigned char)((val >> (dat_len - *buf_len)) & ~(~0 << *buf_len));
-      dat_len -= *buf_len;
-      H5Z_scaleoffset_next_byte(j, buf_len);
-      if(dat_len == 0)
-          return;
-
-      buffer[*j] = (unsigned char)((val & ~(~0 << dat_len)) << (*buf_len - dat_len));
-      *buf_len -= dat_len;
-   } /* end else */
+    unsigned      dat_len; /* dat_len is the number of bits to be copied in each data byte */
+    unsigned char val;     /* value to be copied in each data byte */
+
+    /* initialize value and bits of unsigned char to be copied */
+    val = data[data_offset + k];
+    if (k == begin_i)
+        dat_len = 8 - (dtype_len - p.minbits) % 8;
+    else
+        dat_len = 8;
+
+    if (*buf_len > dat_len) {
+        buffer[*j] |= (unsigned char)((val & ~(~0 << dat_len)) << (*buf_len - dat_len));
+        *buf_len -= dat_len;
+    }
+    else {
+        buffer[*j] |= (unsigned char)((val >> (dat_len - *buf_len)) & ~(~0 << *buf_len));
+        dat_len -= *buf_len;
+        H5Z_scaleoffset_next_byte(j, buf_len);
+        if (dat_len == 0)
+            return;
+
+        buffer[*j] = (unsigned char)((val & ~(~0 << dat_len)) << (*buf_len - dat_len));
+        *buf_len -= dat_len;
+    } /* end else */
 }
 
 static void
-H5Z_scaleoffset_compress_one_atomic(unsigned char *data, size_t data_offset,
-    unsigned char *buffer, size_t *j, unsigned *buf_len, parms_atomic p)
+H5Z_scaleoffset_compress_one_atomic(unsigned char *data, size_t data_offset, unsigned char *buffer, size_t *j,
+                                    unsigned *buf_len, parms_atomic p)
 {
-   /* begin_i: the index of byte having first significant bit */
-   unsigned begin_i;
-   unsigned dtype_len;
-   int k;
-
-   HDassert(p.minbits > 0);
-
-   dtype_len = p.size * 8;
-
-   if(p.mem_order == H5Z_SCALEOFFSET_ORDER_LE) { /* little endian */
-      begin_i = p.size - 1 - (dtype_len - p.minbits) / 8;
-
-      for(k = (int)begin_i; k >= 0; k--)
-         H5Z_scaleoffset_compress_one_byte(data, data_offset, (unsigned)k, begin_i,
-                                           buffer, j, buf_len, p, dtype_len);
-   }
-   else { /* big endian */
-      HDassert(p.mem_order == H5Z_SCALEOFFSET_ORDER_BE);
-      begin_i = (dtype_len - p.minbits) / 8;
-
-      for(k = (int)begin_i; k <= (int)(p.size - 1); k++)
-         H5Z_scaleoffset_compress_one_byte(data, data_offset, (unsigned)k, begin_i,
-                                           buffer, j, buf_len, p, dtype_len);
-   }
+    /* begin_i: the index of byte having first significant bit */
+    unsigned begin_i;
+    unsigned dtype_len;
+    int      k;
+
+    HDassert(p.minbits > 0);
+
+    dtype_len = p.size * 8;
+
+    if (p.mem_order == H5Z_SCALEOFFSET_ORDER_LE) { /* little endian */
+        begin_i = p.size - 1 - (dtype_len - p.minbits) / 8;
+
+        for (k = (int)begin_i; k >= 0; k--)
+            H5Z_scaleoffset_compress_one_byte(data, data_offset, (unsigned)k, begin_i, buffer, j, buf_len, p,
+                                              dtype_len);
+    }
+    else { /* big endian */
+        HDassert(p.mem_order == H5Z_SCALEOFFSET_ORDER_BE);
+        begin_i = (dtype_len - p.minbits) / 8;
+
+        for (k = (int)begin_i; k <= (int)(p.size - 1); k++)
+            H5Z_scaleoffset_compress_one_byte(data, data_offset, (unsigned)k, begin_i, buffer, j, buf_len, p,
+                                              dtype_len);
+    }
 }
 
 static void
-H5Z_scaleoffset_compress(unsigned char *data, unsigned d_nelmts,
-    unsigned char *buffer, size_t buffer_size, parms_atomic p)
+H5Z_scaleoffset_compress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer, size_t buffer_size,
+                         parms_atomic p)
 {
-   /* i: index of data, j: index of buffer,
-      buf_len: number of bits to be filled in current byte */
-   size_t i, j;
-   unsigned buf_len;
-
-   /* must initialize buffer to be zeros */
-   for(j = 0; j < buffer_size; j++)
-      buffer[j] = 0;
-
-   /* initialization before the loop */
-   j = 0;
-   buf_len = sizeof(unsigned char) * 8;
-
-   /* compress */
-   for(i = 0; i < d_nelmts; i++)
-       H5Z_scaleoffset_compress_one_atomic(data, i * p.size, buffer, &j, &buf_len, p);
-}
+    /* i: index of data, j: index of buffer,
+       buf_len: number of bits to be filled in current byte */
+    size_t   i, j;
+    unsigned buf_len;
+
+    /* must initialize buffer to be zeros */
+    for (j = 0; j < buffer_size; j++)
+        buffer[j] = 0;
+
+    /* initialization before the loop */
+    j       = 0;
+    buf_len = sizeof(unsigned char) * 8;
 
+    /* compress */
+    for (i = 0; i < d_nelmts; i++)
+        H5Z_scaleoffset_compress_one_atomic(data, i * p.size, buffer, &j, &buf_len, p);
+}
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c
index 06d5040..71b3d22 100644
--- a/src/H5Zshuffle.c
+++ b/src/H5Zshuffle.c
@@ -11,38 +11,36 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"         /* Property lists                       */
-#include "H5Tprivate.h"		/* Datatypes         			*/
-#include "H5Zpkg.h"		/* Data filters				*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Pprivate.h"  /* Property lists                       */
+#include "H5Tprivate.h"  /* Datatypes         			*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 /* Local function prototypes */
 static herr_t H5Z_set_local_shuffle(hid_t dcpl_id, hid_t type_id, hid_t space_id);
-static size_t H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts,
-    const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf);
+static size_t H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes,
+                                 size_t *buf_size, void **buf);
 
 /* This message derives from H5Z */
 const H5Z_class2_t H5Z_SHUFFLE[1] = {{
-    H5Z_CLASS_T_VERS,       /* H5Z_class_t version */
-    H5Z_FILTER_SHUFFLE,		/* Filter id number		*/
-    1,              /* encoder_present flag (set to true) */
-    1,              /* decoder_present flag (set to true) */
-    "shuffle",			/* Filter name for debugging	*/
-    NULL,                       /* The "can apply" callback     */
-    H5Z_set_local_shuffle,      /* The "set local" callback     */
-    H5Z_filter_shuffle,		/* The actual filter function	*/
+    H5Z_CLASS_T_VERS,      /* H5Z_class_t version */
+    H5Z_FILTER_SHUFFLE,    /* Filter id number		*/
+    1,                     /* encoder_present flag (set to true) */
+    1,                     /* decoder_present flag (set to true) */
+    "shuffle",             /* Filter name for debugging	*/
+    NULL,                  /* The "can apply" callback     */
+    H5Z_set_local_shuffle, /* The "set local" callback     */
+    H5Z_filter_shuffle,    /* The actual filter function	*/
 }};
 
 /* Local macros */
-#define H5Z_SHUFFLE_PARM_SIZE      0       /* "Local" parameter for shuffling size */
+#define H5Z_SHUFFLE_PARM_SIZE 0 /* "Local" parameter for shuffling size */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_set_local_shuffle
  *
@@ -63,40 +61,41 @@ const H5Z_class2_t H5Z_SHUFFLE[1] = {{
 static herr_t
 H5Z_set_local_shuffle(hid_t dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id)
 {
-    H5P_genplist_t *dcpl_plist;     /* Property list pointer */
-    const H5T_t	*type;                  /* Datatype */
-    unsigned flags;                     /* Filter flags */
-    size_t cd_nelmts = H5Z_SHUFFLE_USER_NPARMS;     /* Number of filter parameters */
-    unsigned cd_values[H5Z_SHUFFLE_TOTAL_NPARMS];  /* Filter parameters */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *dcpl_plist;                          /* Property list pointer */
+    const H5T_t *   type;                                /* Datatype */
+    unsigned        flags;                               /* Filter flags */
+    size_t          cd_nelmts = H5Z_SHUFFLE_USER_NPARMS; /* Number of filter parameters */
+    unsigned        cd_values[H5Z_SHUFFLE_TOTAL_NPARMS]; /* Filter parameters */
+    herr_t          ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the plist structure */
-    if(NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
+    if (NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get datatype */
-    if(NULL == (type = (const H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = (const H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Get the filter's current parameters */
-    if(H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_SHUFFLE, &flags, &cd_nelmts, cd_values, (size_t)0, NULL, NULL) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get shuffle parameters")
+    if (H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_SHUFFLE, &flags, &cd_nelmts, cd_values, (size_t)0, NULL,
+                             NULL) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get shuffle parameters")
 
     /* Set "local" parameter for this dataset */
-    if((cd_values[H5Z_SHUFFLE_PARM_SIZE] = (unsigned)H5T_get_size(type)) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if ((cd_values[H5Z_SHUFFLE_PARM_SIZE] = (unsigned)H5T_get_size(type)) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
     /* Modify the filter's parameters for this dataset */
-    if(H5P_modify_filter(dcpl_plist, H5Z_FILTER_SHUFFLE, flags, (size_t)H5Z_SHUFFLE_TOTAL_NPARMS, cd_values) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local shuffle parameters")
+    if (H5P_modify_filter(dcpl_plist, H5Z_FILTER_SHUFFLE, flags, (size_t)H5Z_SHUFFLE_TOTAL_NPARMS,
+                          cd_values) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local shuffle parameters")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_local_shuffle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_shuffle
  *
@@ -120,156 +119,154 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
-                   size_t nbytes, size_t *buf_size, void **buf)
+H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes,
+                   size_t *buf_size, void **buf)
 {
-    void *dest = NULL;          /* Buffer to deposit [un]shuffled bytes into */
-    unsigned char *_src=NULL;   /* Alias for source buffer */
-    unsigned char *_dest=NULL;  /* Alias for destination buffer */
-    unsigned bytesoftype;       /* Number of bytes per element */
-    size_t numofelements;       /* Number of elements in buffer */
-    size_t i;                   /* Local index variables */
+    void *         dest  = NULL;  /* Buffer to deposit [un]shuffled bytes into */
+    unsigned char *_src  = NULL;  /* Alias for source buffer */
+    unsigned char *_dest = NULL;  /* Alias for destination buffer */
+    unsigned       bytesoftype;   /* Number of bytes per element */
+    size_t         numofelements; /* Number of elements in buffer */
+    size_t         i;             /* Local index variables */
 #ifdef NO_DUFFS_DEVICE
-    size_t j;                   /* Local index variable */
-#endif /* NO_DUFFS_DEVICE */
-    size_t leftover;            /* Extra bytes at end of buffer */
-    size_t ret_value;           /* Return value */
+    size_t j;         /* Local index variable */
+#endif                /* NO_DUFFS_DEVICE */
+    size_t leftover;  /* Extra bytes at end of buffer */
+    size_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(0)
 
     /* Check arguments */
-    if (cd_nelmts!=H5Z_SHUFFLE_TOTAL_NPARMS || cd_values[H5Z_SHUFFLE_PARM_SIZE]==0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid shuffle parameters")
+    if (cd_nelmts != H5Z_SHUFFLE_TOTAL_NPARMS || cd_values[H5Z_SHUFFLE_PARM_SIZE] == 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid shuffle parameters")
 
     /* Get the number of bytes per element from the parameter block */
-    bytesoftype=cd_values[H5Z_SHUFFLE_PARM_SIZE];
+    bytesoftype = cd_values[H5Z_SHUFFLE_PARM_SIZE];
 
     /* Compute the number of elements in buffer */
-    numofelements=nbytes/bytesoftype;
+    numofelements = nbytes / bytesoftype;
 
     /* Don't do anything for 1-byte elements, or "fractional" elements */
-    if(bytesoftype > 1 && numofelements > 1) {
+    if (bytesoftype > 1 && numofelements > 1) {
         /* Compute the leftover bytes if there are any */
-        leftover = nbytes%bytesoftype;
+        leftover = nbytes % bytesoftype;
 
         /* Allocate the destination buffer */
-        if (NULL==(dest = H5MM_malloc(nbytes)))
+        if (NULL == (dest = H5MM_malloc(nbytes)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for shuffle buffer")
 
-        if(flags & H5Z_FLAG_REVERSE) {
+        if (flags & H5Z_FLAG_REVERSE) {
             /* Get the pointer to the source buffer */
-            _src =(unsigned char *)(*buf);
+            _src = (unsigned char *)(*buf);
 
             /* Input; unshuffle */
-            for(i=0; i<bytesoftype; i++) {
-                _dest=((unsigned char *)dest)+i;
-#define DUFF_GUTS							    \
-    *_dest=*_src++;                             \
-    _dest+=bytesoftype;
+            for (i = 0; i < bytesoftype; i++) {
+                _dest = ((unsigned char *)dest) + i;
+#define DUFF_GUTS                                                                                            \
+    *_dest = *_src++;                                                                                        \
+    _dest += bytesoftype;
 #ifdef NO_DUFFS_DEVICE
                 j = numofelements;
-                while(j > 0) {
+                while (j > 0) {
                     DUFF_GUTS;
 
                     j--;
                 } /* end for */
-#else /* NO_DUFFS_DEVICE */
-            {
-                size_t duffs_index; /* Counting index for Duff's device */
-
-                duffs_index = (numofelements + 7) / 8;
-                switch (numofelements % 8) {
-                    default:
-                        HDassert(0 && "This Should never be executed!");
-                        break;
-                    case 0:
-                        do
-                          {
-                            DUFF_GUTS
-                    case 7:
-                            DUFF_GUTS
-                    case 6:
-                            DUFF_GUTS
-                    case 5:
-                            DUFF_GUTS
-                    case 4:
-                            DUFF_GUTS
-                    case 3:
-                            DUFF_GUTS
-                    case 2:
-                            DUFF_GUTS
-                    case 1:
-                            DUFF_GUTS
-                      } while (--duffs_index > 0);
-                } /* end switch */
-            }
-#endif /* NO_DUFFS_DEVICE */
+#else             /* NO_DUFFS_DEVICE */
+                {
+                    size_t duffs_index; /* Counting index for Duff's device */
+
+                    duffs_index = (numofelements + 7) / 8;
+                    switch (numofelements % 8) {
+                        default:
+                            HDassert(0 && "This Should never be executed!");
+                            break;
+                        case 0:
+                            do {
+                                DUFF_GUTS
+                                case 7:
+                                    DUFF_GUTS
+                                case 6:
+                                    DUFF_GUTS
+                                case 5:
+                                    DUFF_GUTS
+                                case 4:
+                                    DUFF_GUTS
+                                case 3:
+                                    DUFF_GUTS
+                                case 2:
+                                    DUFF_GUTS
+                                case 1:
+                                    DUFF_GUTS
+                            } while (--duffs_index > 0);
+                    } /* end switch */
+                }
+#endif            /* NO_DUFFS_DEVICE */
 #undef DUFF_GUTS
             } /* end for */
 
             /* Add leftover to the end of data */
-            if(leftover>0) {
+            if (leftover > 0) {
                 /* Adjust back to end of shuffled bytes */
-                _dest -= (bytesoftype - 1);     /*lint !e794 _dest is initialized */
-                HDmemcpy((void*)_dest, (void*)_src, leftover);
+                _dest -= (bytesoftype - 1); /*lint !e794 _dest is initialized */
+                HDmemcpy((void *)_dest, (void *)_src, leftover);
             }
         } /* end if */
         else {
             /* Get the pointer to the destination buffer */
-            _dest =(unsigned char *)dest;
+            _dest = (unsigned char *)dest;
 
             /* Output; shuffle */
-            for(i=0; i<bytesoftype; i++) {
-                _src=((unsigned char *)(*buf))+i;
-#define DUFF_GUTS							    \
-    *_dest++=*_src;                             \
-    _src+=bytesoftype;
+            for (i = 0; i < bytesoftype; i++) {
+                _src = ((unsigned char *)(*buf)) + i;
+#define DUFF_GUTS                                                                                            \
+    *_dest++ = *_src;                                                                                        \
+    _src += bytesoftype;
 #ifdef NO_DUFFS_DEVICE
                 j = numofelements;
-                while(j > 0) {
+                while (j > 0) {
                     DUFF_GUTS;
 
                     j--;
                 } /* end for */
-#else /* NO_DUFFS_DEVICE */
-            {
-                size_t duffs_index; /* Counting index for Duff's device */
-
-                duffs_index = (numofelements + 7) / 8;
-                switch (numofelements % 8) {
-                    default:
-                        HDassert(0 && "This Should never be executed!");
-                        break;
-                    case 0:
-                        do
-                          {
-                            DUFF_GUTS
-                    case 7:
-                            DUFF_GUTS
-                    case 6:
-                            DUFF_GUTS
-                    case 5:
-                            DUFF_GUTS
-                    case 4:
-                            DUFF_GUTS
-                    case 3:
-                            DUFF_GUTS
-                    case 2:
-                            DUFF_GUTS
-                    case 1:
-                            DUFF_GUTS
-                      } while (--duffs_index > 0);
-                } /* end switch */
-            }
-#endif /* NO_DUFFS_DEVICE */
+#else             /* NO_DUFFS_DEVICE */
+                {
+                    size_t duffs_index; /* Counting index for Duff's device */
+
+                    duffs_index = (numofelements + 7) / 8;
+                    switch (numofelements % 8) {
+                        default:
+                            HDassert(0 && "This Should never be executed!");
+                            break;
+                        case 0:
+                            do {
+                                DUFF_GUTS
+                                case 7:
+                                    DUFF_GUTS
+                                case 6:
+                                    DUFF_GUTS
+                                case 5:
+                                    DUFF_GUTS
+                                case 4:
+                                    DUFF_GUTS
+                                case 3:
+                                    DUFF_GUTS
+                                case 2:
+                                    DUFF_GUTS
+                                case 1:
+                                    DUFF_GUTS
+                            } while (--duffs_index > 0);
+                    } /* end switch */
+                }
+#endif            /* NO_DUFFS_DEVICE */
 #undef DUFF_GUTS
             } /* end for */
 
             /* Add leftover to the end of data */
-            if(leftover>0) {
+            if (leftover > 0) {
                 /* Adjust back to end of shuffled bytes */
-                _src -= (bytesoftype - 1);      /*lint !e794 _src is initialized */
-                HDmemcpy((void*)_dest, (void*)_src, leftover);
+                _src -= (bytesoftype - 1); /*lint !e794 _src is initialized */
+                HDmemcpy((void *)_dest, (void *)_src, leftover);
             }
         } /* end else */
 
@@ -277,8 +274,8 @@ H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
         H5MM_xfree(*buf);
 
         /* Set the buffer information to return */
-        *buf = dest;
-        *buf_size=nbytes;
+        *buf      = dest;
+        *buf_size = nbytes;
     } /* end else */
 
     /* Set the return value */
@@ -287,4 +284,3 @@ H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
-
diff --git a/src/H5Zszip.c b/src/H5Zszip.c
index a183923..301490c 100644
--- a/src/H5Zszip.c
+++ b/src/H5Zszip.c
@@ -11,46 +11,43 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
-
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"         /* File access                          */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Oprivate.h"		/* Object headers		  	*/
-#include "H5Pprivate.h"         /* Property lists                       */
-#include "H5Sprivate.h"		/* Dataspaces         			*/
-#include "H5Tprivate.h"		/* Datatypes         			*/
-#include "H5Zpkg.h"		/* Data filters				*/
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
+
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access                          */
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Oprivate.h"  /* Object headers		  	*/
+#include "H5Pprivate.h"  /* Property lists                       */
+#include "H5Sprivate.h"  /* Dataspaces         			*/
+#include "H5Tprivate.h"  /* Datatypes         			*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 #ifdef H5_HAVE_FILTER_SZIP
 
 #ifdef H5_HAVE_SZLIB_H
-#   include "szlib.h"
+#include "szlib.h"
 #endif
 
 /* Local function prototypes */
 static htri_t H5Z_can_apply_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 static herr_t H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id);
-static size_t H5Z_filter_szip (unsigned flags, size_t cd_nelmts,
-    const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf);
+static size_t H5Z_filter_szip(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes,
+                              size_t *buf_size, void **buf);
 
 /* This message derives from H5Z */
 H5Z_class2_t H5Z_SZIP[1] = {{
-    H5Z_CLASS_T_VERS,       /* H5Z_class_t version */
-    H5Z_FILTER_SZIP,		/* Filter id number		*/
-    1,              /* Assume encoder present: check before registering */
+    H5Z_CLASS_T_VERS,   /* H5Z_class_t version */
+    H5Z_FILTER_SZIP,    /* Filter id number		*/
+    1,                  /* Assume encoder present: check before registering */
     1,                  /* decoder_present flag (set to true) */
-    "szip",			    /* Filter name for debugging	*/
-    H5Z_can_apply_szip,		/* The "can apply" callback     */
-    H5Z_set_local_szip,         /* The "set local" callback     */
-    H5Z_filter_szip,		/* The actual filter function	*/
+    "szip",             /* Filter name for debugging	*/
+    H5Z_can_apply_szip, /* The "can apply" callback     */
+    H5Z_set_local_szip, /* The "set local" callback     */
+    H5Z_filter_szip,    /* The actual filter function	*/
 }};
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_can_apply_szip
  *
@@ -77,39 +74,38 @@ H5Z_class2_t H5Z_SZIP[1] = {{
 static htri_t
 H5Z_can_apply_szip(hid_t H5_ATTR_UNUSED dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id)
 {
-    const H5T_t	*type;                  /* Datatype */
-    unsigned dtype_size;                /* Datatype's size (in bits) */
-    H5T_order_t dtype_order;            /* Datatype's endianness order */
-    htri_t ret_value = TRUE;            /* Return value */
+    const H5T_t *type;             /* Datatype */
+    unsigned     dtype_size;       /* Datatype's size (in bits) */
+    H5T_order_t  dtype_order;      /* Datatype's endianness order */
+    htri_t       ret_value = TRUE; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get datatype */
-    if(NULL == (type = H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Get datatype's size, for checking the "bits-per-pixel" */
-    if((dtype_size = (8 * H5T_get_size(type))) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
+    if ((dtype_size = (8 * H5T_get_size(type))) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
 
     /* Range check datatype's size */
-    if(dtype_size > 32 && dtype_size != 64)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FALSE, "invalid datatype size")
+    if (dtype_size > 32 && dtype_size != 64)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FALSE, "invalid datatype size")
 
     /* Get datatype's endianness order */
-    if((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "can't retrieve datatype endianness order")
+    if ((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "can't retrieve datatype endianness order")
 
     /* Range check datatype's endianness order */
     /* (Note: this may not handle non-atomic datatypes well) */
-    if(dtype_order != H5T_ORDER_LE && dtype_order != H5T_ORDER_BE)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FALSE, "invalid datatype endianness order")
+    if (dtype_order != H5T_ORDER_LE && dtype_order != H5T_ORDER_BE)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FALSE, "invalid datatype endianness order")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_can_apply_szip() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_set_local_szip
  *
@@ -134,52 +130,52 @@ done:
 static herr_t
 H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id)
 {
-    H5P_genplist_t *dcpl_plist; /* Property list pointer */
-    const H5T_t	*type;          /* Datatype */
-    const H5S_t	*ds;            /* Dataspace */
-    unsigned flags;             /* Filter flags */
-    size_t cd_nelmts = H5Z_SZIP_USER_NPARMS;     /* Number of filter parameters */
-    unsigned cd_values[H5Z_SZIP_TOTAL_NPARMS];  /* Filter parameters */
-    hsize_t dims[H5O_LAYOUT_NDIMS];             /* Dataspace (i.e. chunk) dimensions */
-    int ndims;                  /* Number of (chunk) dimensions */
-    H5T_order_t dtype_order;    /* Datatype's endianness order */
-    size_t dtype_size;          /* Datatype's size (in bits) */
-    size_t dtype_precision;     /* Datatype's precision (in bits) */
-    size_t dtype_offset;        /* Datatype's offset (in bits) */
-    hsize_t scanline;           /* Size of dataspace's fastest changing dimension */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *dcpl_plist;                       /* Property list pointer */
+    const H5T_t *   type;                             /* Datatype */
+    const H5S_t *   ds;                               /* Dataspace */
+    unsigned        flags;                            /* Filter flags */
+    size_t          cd_nelmts = H5Z_SZIP_USER_NPARMS; /* Number of filter parameters */
+    unsigned        cd_values[H5Z_SZIP_TOTAL_NPARMS]; /* Filter parameters */
+    hsize_t         dims[H5O_LAYOUT_NDIMS];           /* Dataspace (i.e. chunk) dimensions */
+    int             ndims;                            /* Number of (chunk) dimensions */
+    H5T_order_t     dtype_order;                      /* Datatype's endianness order */
+    size_t          dtype_size;                       /* Datatype's size (in bits) */
+    size_t          dtype_precision;                  /* Datatype's precision (in bits) */
+    size_t          dtype_offset;                     /* Datatype's offset (in bits) */
+    hsize_t         scanline;                         /* Size of dataspace's fastest changing dimension */
+    herr_t          ret_value = SUCCEED;              /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the plist structure */
-    if(NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
+    if (NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get datatype */
-    if(NULL == (type = H5I_object_verify(type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+    if (NULL == (type = H5I_object_verify(type_id, H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Get the filter's current parameters */
-    if(H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_SZIP, &flags, &cd_nelmts, cd_values, 0, NULL, NULL) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get szip parameters")
+    if (H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_SZIP, &flags, &cd_nelmts, cd_values, 0, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get szip parameters")
 
     /* Get datatype's size, for checking the "bits-per-pixel" */
-    if((dtype_size = (8 * H5T_get_size(type))) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size");
+    if ((dtype_size = (8 * H5T_get_size(type))) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size");
 
     /* Get datatype's precision, in case is less than full bits  */
-    if((dtype_precision = H5T_get_precision(type)) == 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype precision");
+    if ((dtype_precision = H5T_get_precision(type)) == 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype precision");
 
-    if(dtype_precision < dtype_size) {
+    if (dtype_precision < dtype_size) {
         dtype_offset = H5T_get_offset(type);
-        if(dtype_offset != 0)
+        if (dtype_offset != 0)
             dtype_precision = dtype_size;
     } /* end if */
-    if(dtype_precision > 24) {
-	if(dtype_precision <= 32)
+    if (dtype_precision > 24) {
+        if (dtype_precision <= 32)
             dtype_precision = 32;
-	else if(dtype_precision <= 64)
+        else if (dtype_precision <= 64)
             dtype_precision = 64;
     } /* end if */
 
@@ -187,11 +183,11 @@ H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id)
     cd_values[H5Z_SZIP_PARM_BPP] = dtype_precision;
 
     /* Get dataspace */
-    if(NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
+    if (NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Get dimensions for dataspace */
-    if((ndims = H5S_get_simple_extent_dims(ds, dims, NULL)) < 0)
+    if ((ndims = H5S_get_simple_extent_dims(ds, dims, NULL)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get dataspace dimensions")
 
     /* Set "local" parameter for this dataset's "pixels-per-scanline" */
@@ -204,19 +200,20 @@ H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id)
        SZ_MAX_BLOCKS_PER_SCANLINE blocks per scanline  */
 
     /* Check the pixels per block against the 'scanline' size */
-    if(scanline < cd_values[H5Z_SZIP_PARM_PPB]) {
-        hssize_t npoints;                   /* Number of points in the dataspace */
+    if (scanline < cd_values[H5Z_SZIP_PARM_PPB]) {
+        hssize_t npoints; /* Number of points in the dataspace */
 
         /* Get number of elements for the dataspace;  use
            total number of elements in the chunk to define the new 'scanline' size */
-        if((npoints = H5S_GET_EXTENT_NPOINTS(ds)) < 0)
+        if ((npoints = H5S_GET_EXTENT_NPOINTS(ds)) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get number of points in the dataspace")
-        if(npoints < cd_values[H5Z_SZIP_PARM_PPB])
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "pixels per block greater than total number of elements in the chunk")
+        if (npoints < cd_values[H5Z_SZIP_PARM_PPB])
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+                        "pixels per block greater than total number of elements in the chunk")
         scanline = MIN((cd_values[H5Z_SZIP_PARM_PPB] * SZ_MAX_BLOCKS_PER_SCANLINE), npoints);
     }
     else {
-        if(scanline <= SZ_MAX_PIXELS_PER_SCANLINE)
+        if (scanline <= SZ_MAX_PIXELS_PER_SCANLINE)
             scanline = MIN((cd_values[H5Z_SZIP_PARM_PPB] * SZ_MAX_BLOCKS_PER_SCANLINE), scanline);
         else
             scanline = cd_values[H5Z_SZIP_PARM_PPB] * SZ_MAX_BLOCKS_PER_SCANLINE;
@@ -226,18 +223,18 @@ H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id)
     H5_CHECKED_ASSIGN(cd_values[H5Z_SZIP_PARM_PPS], unsigned, scanline, hsize_t);
 
     /* Get datatype's endianness order */
-    if((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
-	HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype endianness order")
+    if ((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
+        HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype endianness order")
 
     /* Set the correct endianness flag for szip */
     /* (Note: this may not handle non-atomic datatypes well) */
-    cd_values[H5Z_SZIP_PARM_MASK] &= ~(SZ_LSB_OPTION_MASK|SZ_MSB_OPTION_MASK);
-    switch(dtype_order) {
-        case H5T_ORDER_LE:      /* Little-endian byte order */
+    cd_values[H5Z_SZIP_PARM_MASK] &= ~(SZ_LSB_OPTION_MASK | SZ_MSB_OPTION_MASK);
+    switch (dtype_order) {
+        case H5T_ORDER_LE: /* Little-endian byte order */
             cd_values[H5Z_SZIP_PARM_MASK] |= SZ_LSB_OPTION_MASK;
             break;
 
-        case H5T_ORDER_BE:      /* Big-endian byte order */
+        case H5T_ORDER_BE: /* Big-endian byte order */
             cd_values[H5Z_SZIP_PARM_MASK] |= SZ_MSB_OPTION_MASK;
             break;
 
@@ -246,14 +243,13 @@ H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id)
     } /* end switch */
 
     /* Modify the filter's parameters for this dataset */
-    if(H5P_modify_filter(dcpl_plist, H5Z_FILTER_SZIP, flags, H5Z_SZIP_TOTAL_NPARMS, cd_values) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local szip parameters")
+    if (H5P_modify_filter(dcpl_plist, H5Z_FILTER_SZIP, flags, H5Z_SZIP_TOTAL_NPARMS, cd_values) < 0)
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local szip parameters")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_set_local_szip() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Z_filter_szip
  *
@@ -273,30 +269,30 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5Z_filter_szip (unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
-    size_t nbytes, size_t *buf_size, void **buf)
+H5Z_filter_szip(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes, size_t *buf_size,
+                void **buf)
 {
-    size_t ret_value = 0;       /* Return value */
-    size_t size_out  = 0;       /* Size of output buffer */
-    unsigned char *outbuf = NULL;    /* Pointer to new output buffer */
-    unsigned char *newbuf = NULL;    /* Pointer to input buffer */
-    SZ_com_t sz_param;          /* szip parameter block */
+    size_t         ret_value = 0;    /* Return value */
+    size_t         size_out  = 0;    /* Size of output buffer */
+    unsigned char *outbuf    = NULL; /* Pointer to new output buffer */
+    unsigned char *newbuf    = NULL; /* Pointer to input buffer */
+    SZ_com_t       sz_param;         /* szip parameter block */
 
     FUNC_ENTER_NOAPI(0)
 
     /* Sanity check to make certain that we haven't drifted out of date with
      * the mask options from the szlib.h header */
-    HDassert(H5_SZIP_ALLOW_K13_OPTION_MASK==SZ_ALLOW_K13_OPTION_MASK);
-    HDassert(H5_SZIP_CHIP_OPTION_MASK==SZ_CHIP_OPTION_MASK);
-    HDassert(H5_SZIP_EC_OPTION_MASK==SZ_EC_OPTION_MASK);
-    HDassert(H5_SZIP_LSB_OPTION_MASK==SZ_LSB_OPTION_MASK);
-    HDassert(H5_SZIP_MSB_OPTION_MASK==SZ_MSB_OPTION_MASK);
-    HDassert(H5_SZIP_NN_OPTION_MASK==SZ_NN_OPTION_MASK);
-    HDassert(H5_SZIP_RAW_OPTION_MASK==SZ_RAW_OPTION_MASK);
+    HDassert(H5_SZIP_ALLOW_K13_OPTION_MASK == SZ_ALLOW_K13_OPTION_MASK);
+    HDassert(H5_SZIP_CHIP_OPTION_MASK == SZ_CHIP_OPTION_MASK);
+    HDassert(H5_SZIP_EC_OPTION_MASK == SZ_EC_OPTION_MASK);
+    HDassert(H5_SZIP_LSB_OPTION_MASK == SZ_LSB_OPTION_MASK);
+    HDassert(H5_SZIP_MSB_OPTION_MASK == SZ_MSB_OPTION_MASK);
+    HDassert(H5_SZIP_NN_OPTION_MASK == SZ_NN_OPTION_MASK);
+    HDassert(H5_SZIP_RAW_OPTION_MASK == SZ_RAW_OPTION_MASK);
 
     /* Check arguments */
-    if (cd_nelmts!=4)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid deflate aggression level")
+    if (cd_nelmts != 4)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid deflate aggression level")
 
     /* Copy the filter parameters into the szip parameter block */
     H5_CHECKED_ASSIGN(sz_param.options_mask, int, cd_values[H5Z_SZIP_PARM_MASK], unsigned);
@@ -306,66 +302,65 @@ H5Z_filter_szip (unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
 
     /* Input; uncompress */
     if (flags & H5Z_FLAG_REVERSE) {
-        uint32_t stored_nalloc;  /* Number of bytes the compressed block will expand into */
-        size_t nalloc;  /* Number of bytes the compressed block will expand into */
+        uint32_t stored_nalloc; /* Number of bytes the compressed block will expand into */
+        size_t   nalloc;        /* Number of bytes the compressed block will expand into */
 
         /* Get the size of the uncompressed buffer */
         newbuf = *buf;
-        UINT32DECODE(newbuf,stored_nalloc);
+        UINT32DECODE(newbuf, stored_nalloc);
         H5_CHECKED_ASSIGN(nalloc, size_t, stored_nalloc, uint32_t);
 
         /* Allocate space for the uncompressed buffer */
-        if(NULL==(outbuf = H5MM_malloc(nalloc)))
+        if (NULL == (outbuf = H5MM_malloc(nalloc)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for szip decompression")
 
         /* Decompress the buffer */
-        size_out=nalloc;
-        if(SZ_BufftoBuffDecompress(outbuf, &size_out, newbuf, nbytes-4, &sz_param) != SZ_OK)
+        size_out = nalloc;
+        if (SZ_BufftoBuffDecompress(outbuf, &size_out, newbuf, nbytes - 4, &sz_param) != SZ_OK)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "szip_filter: decompression failed")
-        HDassert(size_out==nalloc);
+        HDassert(size_out == nalloc);
 
         /* Free the input buffer */
         H5MM_xfree(*buf);
 
         /* Set return values */
-        *buf = outbuf;
-        outbuf = NULL;
+        *buf      = outbuf;
+        outbuf    = NULL;
         *buf_size = nalloc;
         ret_value = nalloc;
     }
     /* Output; compress */
     else {
-        unsigned char *dst = NULL;    /* Temporary pointer to new output buffer */
+        unsigned char *dst = NULL; /* Temporary pointer to new output buffer */
 
         /* Allocate space for the compressed buffer & header (assume data won't get bigger) */
-        if(NULL==(dst=outbuf = H5MM_malloc(nbytes+4)))
+        if (NULL == (dst = outbuf = H5MM_malloc(nbytes + 4)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "unable to allocate szip destination buffer")
 
         /* Encode the uncompressed length */
-        H5_CHECK_OVERFLOW(nbytes,size_t,uint32_t);
-        UINT32ENCODE(dst,nbytes);
+        H5_CHECK_OVERFLOW(nbytes, size_t, uint32_t);
+        UINT32ENCODE(dst, nbytes);
 
         /* Compress the buffer */
         size_out = nbytes;
-        if(SZ_OK!= SZ_BufftoBuffCompress(dst, &size_out, *buf, nbytes, &sz_param))
-	    HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "overflow")
-        HDassert(size_out<=nbytes);
+        if (SZ_OK != SZ_BufftoBuffCompress(dst, &size_out, *buf, nbytes, &sz_param))
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "overflow")
+        HDassert(size_out <= nbytes);
 
         /* Free the input buffer */
         H5MM_xfree(*buf);
 
         /* Set return values */
-        *buf = outbuf;
-        outbuf = NULL;
-        *buf_size = size_out+4;
-        ret_value = size_out+4;
+        *buf      = outbuf;
+        outbuf    = NULL;
+        *buf_size = size_out + 4;
+        ret_value = size_out + 4;
     }
 
 done:
-    if(outbuf)
+    if (outbuf)
         H5MM_xfree(outbuf);
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
 #endif /* H5_HAVE_FILTER_SZIP */
-
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index c4a16e1..be0472f 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -11,22 +11,20 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
-
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5VMprivate.h"		/* H5VM_array_fill			*/
-#include "H5Zpkg.h"		/* Data filters				*/
+#define H5Z_PACKAGE /*suppress error about including H5Zpkg	  */
 
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5VMprivate.h" /* H5VM_array_fill			*/
+#include "H5Zpkg.h"      /* Data filters				*/
 
 /* Token types */
 typedef enum {
     H5Z_XFORM_ERROR,
     H5Z_XFORM_INTEGER, /* this represents an integer type in the data transform expression */
-    H5Z_XFORM_FLOAT,  /* this represents a floating point type in the data transform expression */
+    H5Z_XFORM_FLOAT,   /* this represents a floating point type in the data transform expression */
     H5Z_XFORM_SYMBOL,
     H5Z_XFORM_PLUS,
     H5Z_XFORM_MINUS,
@@ -37,31 +35,29 @@ typedef enum {
     H5Z_XFORM_END
 } H5Z_token_type;
 
-
 typedef struct {
-    unsigned int	num_ptrs;
-    void**	ptr_dat_val;
+    unsigned int num_ptrs;
+    void **      ptr_dat_val;
 } H5Z_datval_ptrs;
 
-
 /* Used to represent values in transform expression */
 typedef union {
-    void   *dat_val;
-    long    int_val;
-    double  float_val;
+    void * dat_val;
+    long   int_val;
+    double float_val;
 } H5Z_num_val;
 
 typedef struct H5Z_node {
-    struct H5Z_node    *lchild;
-    struct H5Z_node    *rchild;
-    H5Z_token_type      type;
-    H5Z_num_val         value;
+    struct H5Z_node *lchild;
+    struct H5Z_node *rchild;
+    H5Z_token_type   type;
+    H5Z_num_val      value;
 } H5Z_node;
 
 struct H5Z_data_xform_t {
-    char*       xform_exp;
-    H5Z_node*       parse_root;
-    H5Z_datval_ptrs*	dat_val_pointers;
+    char *           xform_exp;
+    H5Z_node *       parse_root;
+    H5Z_datval_ptrs *dat_val_pointers;
 };
 
 typedef struct result {
@@ -69,242 +65,245 @@ typedef struct result {
     H5Z_num_val    value;
 } H5Z_result;
 
-
 /* The token */
 typedef struct {
-    const char *tok_expr;       /* Holds the original expression        */
+    const char *tok_expr; /* Holds the original expression        */
 
     /* Current token values */
-    H5Z_token_type  tok_type;       /* The type of the current token        */
-    const char *tok_begin;      /* The beginning of the current token   */
-    const char *tok_end;        /* The end of the current token         */
+    H5Z_token_type tok_type;  /* The type of the current token        */
+    const char *   tok_begin; /* The beginning of the current token   */
+    const char *   tok_end;   /* The end of the current token         */
 
     /* Previous token values */
-    H5Z_token_type  tok_last_type;  /* The type of the last token           */
-    const char *tok_last_begin; /* The beginning of the last token      */
-    const char *tok_last_end;   /* The end of the last token            */
+    H5Z_token_type tok_last_type;  /* The type of the last token           */
+    const char *   tok_last_begin; /* The beginning of the last token      */
+    const char *   tok_last_end;   /* The end of the last token            */
 } H5Z_token;
 
 /* Local function prototypes */
 static H5Z_token *H5Z_get_token(H5Z_token *current);
-static H5Z_node *H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers);
-static H5Z_node *H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers);
-static H5Z_node *H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers);
-static H5Z_node *H5Z_new_node(H5Z_token_type type);
-static void H5Z_do_op(H5Z_node* tree);
-static hbool_t H5Z_op_is_numbs(H5Z_node* _tree);
-static hbool_t H5Z_op_is_numbs2(H5Z_node* _tree);
-static hid_t H5Z_xform_find_type(const H5T_t* type);
-static herr_t H5Z_xform_eval_full(H5Z_node *tree, const size_t array_size, const hid_t array_type, H5Z_result* res);
-static void H5Z_xform_destroy_parse_tree(H5Z_node *tree);
-static void* H5Z_xform_parse(const char *expression, H5Z_datval_ptrs* dat_val_pointers);
-static void* H5Z_xform_copy_tree(H5Z_node* tree, H5Z_datval_ptrs* dat_val_pointers, H5Z_datval_ptrs* new_dat_val_pointers);
-static void H5Z_xform_reduce_tree(H5Z_node* tree);
+static H5Z_node * H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers);
+static H5Z_node * H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers);
+static H5Z_node * H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers);
+static H5Z_node * H5Z_new_node(H5Z_token_type type);
+static void       H5Z_do_op(H5Z_node *tree);
+static hbool_t    H5Z_op_is_numbs(H5Z_node *_tree);
+static hbool_t    H5Z_op_is_numbs2(H5Z_node *_tree);
+static hid_t      H5Z_xform_find_type(const H5T_t *type);
+static herr_t     H5Z_xform_eval_full(H5Z_node *tree, const size_t array_size, const hid_t array_type,
+                                      H5Z_result *res);
+static void       H5Z_xform_destroy_parse_tree(H5Z_node *tree);
+static void *     H5Z_xform_parse(const char *expression, H5Z_datval_ptrs *dat_val_pointers);
+static void *     H5Z_xform_copy_tree(H5Z_node *tree, H5Z_datval_ptrs *dat_val_pointers,
+                                      H5Z_datval_ptrs *new_dat_val_pointers);
+static void       H5Z_xform_reduce_tree(H5Z_node *tree);
 #ifdef H5Z_XFORM_DEBUG
 static void H5Z_XFORM_DEBUG(H5Z_node *tree);
 static void H5Z_print(H5Z_node *tree, FILE *stream);
-#endif  /* H5Z_XFORM_DEBUG */
+#endif /* H5Z_XFORM_DEBUG */
 
-/* PGCC (11.8-0) has trouble with the command *p++ = *p OP tree_val. It increments P first before 
+/* PGCC (11.8-0) has trouble with the command *p++ = *p OP tree_val. It increments P first before
  * doing the operation.  So I break down the command into two lines:
  *     *p = *p OP tree_val; p++;
- * Actually, the behavior of *p++ = *p OP tree_val is undefined. (SLU - 2012/3/19) 
+ * Actually, the behavior of *p++ = *p OP tree_val is undefined. (SLU - 2012/3/19)
  */
-#define H5Z_XFORM_DO_OP1(RESL,RESR,TYPE,OP,SIZE)                            \
-{   								  	    \
-    size_t u;                                                               \
-                                                                            \
-    if(((RESL).type == H5Z_XFORM_SYMBOL) && ((RESR).type != H5Z_XFORM_SYMBOL)) \
-    {   								    \
-	TYPE* p;                                                            \
-	double tree_val;                                                    \
-		                                                            \
-	tree_val = ((RESR).type==H5Z_XFORM_INTEGER ? (double)(RESR).value.int_val : (RESR).value.float_val); \
-	p = (TYPE*)(RESL).value.dat_val;                                    \
-                                                                            \
-	for(u=0; u<(SIZE); u++) {                                           \
-	    *p = *p OP tree_val;                                            \
-            p++;                                                            \
-        }                                                                   \
-    }									    \
-    else if(((RESR).type == H5Z_XFORM_SYMBOL) && ((RESL).type != H5Z_XFORM_SYMBOL)) \
-    {   								    \
-	TYPE* p;                                                            \
-	double tree_val;                                                    \
-		                                                            \
-        /* The case that the left operand is nothing, like -x or +x */      \
-	if((RESL).type == H5Z_XFORM_ERROR)                                  \
-            tree_val = 0;                                                   \
-	else                                                                \
-	    tree_val = ((RESL).type==H5Z_XFORM_INTEGER ? (double)(RESL).value.int_val : (RESL).value.float_val); \
-                                                                            \
-	p = (TYPE*)(RESR).value.dat_val;                                    \
-	for(u=0; u<(SIZE); u++) {                                           \
-	    *p = tree_val OP *p;                                            \
-            p++;                                                            \
-        }                                                                   \
-    }									    \
-    else if( ((RESL).type == H5Z_XFORM_SYMBOL) && ((RESR).type==H5Z_XFORM_SYMBOL))  \
-    {										\
-	TYPE* pl = (TYPE*)(RESL).value.dat_val;                             	\
-	TYPE* pr = (TYPE*)(RESR).value.dat_val;                             	\
-										\
-	for(u=0; u<(SIZE); u++) {                                            	\
-	    *pl = *pl OP *pr;                                           	\
-            pl++; pr++;                                                         \
-        }                                                                       \
-    }										\
-    else									\
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unexpected type conversion operation")	\
-}
+#define H5Z_XFORM_DO_OP1(RESL, RESR, TYPE, OP, SIZE)                                                         \
+    {                                                                                                        \
+        size_t u;                                                                                            \
+                                                                                                             \
+        if (((RESL).type == H5Z_XFORM_SYMBOL) && ((RESR).type != H5Z_XFORM_SYMBOL)) {                        \
+            TYPE * p;                                                                                        \
+            double tree_val;                                                                                 \
+                                                                                                             \
+            tree_val =                                                                                       \
+                ((RESR).type == H5Z_XFORM_INTEGER ? (double)(RESR).value.int_val : (RESR).value.float_val);  \
+            p = (TYPE *)(RESL).value.dat_val;                                                                \
+                                                                                                             \
+            for (u = 0; u < (SIZE); u++) {                                                                   \
+                *p = *p OP tree_val;                                                                         \
+                p++;                                                                                         \
+            }                                                                                                \
+        }                                                                                                    \
+        else if (((RESR).type == H5Z_XFORM_SYMBOL) && ((RESL).type != H5Z_XFORM_SYMBOL)) {                   \
+            TYPE * p;                                                                                        \
+            double tree_val;                                                                                 \
+                                                                                                             \
+            /* The case that the left operand is nothing, like -x or +x */                                   \
+            if ((RESL).type == H5Z_XFORM_ERROR)                                                              \
+                tree_val = 0;                                                                                \
+            else                                                                                             \
+                tree_val = ((RESL).type == H5Z_XFORM_INTEGER ? (double)(RESL).value.int_val                  \
+                                                             : (RESL).value.float_val);                      \
+                                                                                                             \
+            p = (TYPE *)(RESR).value.dat_val;                                                                \
+            for (u = 0; u < (SIZE); u++) {                                                                   \
+                *p = tree_val OP * p;                                                                        \
+                p++;                                                                                         \
+            }                                                                                                \
+        }                                                                                                    \
+        else if (((RESL).type == H5Z_XFORM_SYMBOL) && ((RESR).type == H5Z_XFORM_SYMBOL)) {                   \
+            TYPE *pl = (TYPE *)(RESL).value.dat_val;                                                         \
+            TYPE *pr = (TYPE *)(RESR).value.dat_val;                                                         \
+                                                                                                             \
+            for (u = 0; u < (SIZE); u++) {                                                                   \
+                *pl = *pl OP * pr;                                                                           \
+                pl++;                                                                                        \
+                pr++;                                                                                        \
+            }                                                                                                \
+        }                                                                                                    \
+        else                                                                                                 \
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unexpected type conversion operation")                \
+    }
 
-#if H5_SIZEOF_LONG_DOUBLE !=0
-#define H5Z_XFORM_TYPE_OP(RESL,RESR,TYPE,OP,SIZE)			\
-{									\
-    if((TYPE) == H5T_NATIVE_CHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), char, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_UCHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned char, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_SCHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), signed char, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_SHORT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), short, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_USHORT)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned short, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_INT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), int, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_UINT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned int, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_LONG)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), long, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_ULONG)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_LLONG)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), long long, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_ULLONG)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE)) \
-    else if((TYPE) == H5T_NATIVE_FLOAT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_DOUBLE)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), double, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_LDOUBLE)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), long double, OP, (SIZE))	\
-}
+#if H5_SIZEOF_LONG_DOUBLE != 0
+#define H5Z_XFORM_TYPE_OP(RESL, RESR, TYPE, OP, SIZE)                                                        \
+    {                                                                                                        \
+        if ((TYPE) == H5T_NATIVE_CHAR)                                                                       \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), char, OP, (SIZE))                                               \
+        else if ((TYPE) == H5T_NATIVE_UCHAR)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned char, OP, (SIZE))                                      \
+        else if ((TYPE) == H5T_NATIVE_SCHAR)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), signed char, OP, (SIZE))                                        \
+        else if ((TYPE) == H5T_NATIVE_SHORT)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), short, OP, (SIZE))                                              \
+        else if ((TYPE) == H5T_NATIVE_USHORT)                                                                \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned short, OP, (SIZE))                                     \
+        else if ((TYPE) == H5T_NATIVE_INT)                                                                   \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), int, OP, (SIZE))                                                \
+        else if ((TYPE) == H5T_NATIVE_UINT)                                                                  \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned int, OP, (SIZE))                                       \
+        else if ((TYPE) == H5T_NATIVE_LONG)                                                                  \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), long, OP, (SIZE))                                               \
+        else if ((TYPE) == H5T_NATIVE_ULONG)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE))                                      \
+        else if ((TYPE) == H5T_NATIVE_LLONG)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), long long, OP, (SIZE))                                          \
+        else if ((TYPE) == H5T_NATIVE_ULLONG)                                                                \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE))                                 \
+        else if ((TYPE) == H5T_NATIVE_FLOAT)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE))                                              \
+        else if ((TYPE) == H5T_NATIVE_DOUBLE)                                                                \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), double, OP, (SIZE))                                             \
+        else if ((TYPE) == H5T_NATIVE_LDOUBLE)                                                               \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), long double, OP, (SIZE))                                        \
+    }
 #else
-#define H5Z_XFORM_TYPE_OP(RESL,RESR,TYPE,OP,SIZE)			\
-{									\
-    if((TYPE) == H5T_NATIVE_CHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), char, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_UCHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned char, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_SCHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), signed char, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_SHORT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), short, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_USHORT)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned short, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_INT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), int, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_UINT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned int, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_LONG)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), long, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_ULONG)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_LLONG)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), long long, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_ULLONG)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE)) \
-    else if((TYPE) == H5T_NATIVE_FLOAT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_DOUBLE)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), double, OP, (SIZE))		\
-}
+#define H5Z_XFORM_TYPE_OP(RESL, RESR, TYPE, OP, SIZE)                                                        \
+    {                                                                                                        \
+        if ((TYPE) == H5T_NATIVE_CHAR)                                                                       \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), char, OP, (SIZE))                                               \
+        else if ((TYPE) == H5T_NATIVE_UCHAR)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned char, OP, (SIZE))                                      \
+        else if ((TYPE) == H5T_NATIVE_SCHAR)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), signed char, OP, (SIZE))                                        \
+        else if ((TYPE) == H5T_NATIVE_SHORT)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), short, OP, (SIZE))                                              \
+        else if ((TYPE) == H5T_NATIVE_USHORT)                                                                \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned short, OP, (SIZE))                                     \
+        else if ((TYPE) == H5T_NATIVE_INT)                                                                   \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), int, OP, (SIZE))                                                \
+        else if ((TYPE) == H5T_NATIVE_UINT)                                                                  \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned int, OP, (SIZE))                                       \
+        else if ((TYPE) == H5T_NATIVE_LONG)                                                                  \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), long, OP, (SIZE))                                               \
+        else if ((TYPE) == H5T_NATIVE_ULONG)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE))                                      \
+        else if ((TYPE) == H5T_NATIVE_LLONG)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), long long, OP, (SIZE))                                          \
+        else if ((TYPE) == H5T_NATIVE_ULLONG)                                                                \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE))                                 \
+        else if ((TYPE) == H5T_NATIVE_FLOAT)                                                                 \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE))                                              \
+        else if ((TYPE) == H5T_NATIVE_DOUBLE)                                                                \
+            H5Z_XFORM_DO_OP1((RESL), (RESR), double, OP, (SIZE))                                             \
+    }
 #endif /*H5_SIZEOF_LONG_DOUBLE */
 
-#define H5Z_XFORM_DO_OP3(OP)                                                                                                                    \
-{                                                                                                                                               \
-        if((tree->lchild->type == H5Z_XFORM_INTEGER) && (tree->rchild->type==H5Z_XFORM_INTEGER))                                                \
-        {																	\
-            tree->type = H5Z_XFORM_INTEGER;													\
-            tree->value.int_val = tree->lchild->value.int_val OP tree->rchild->value.int_val;							\
-            H5MM_xfree(tree->lchild);														\
-            H5MM_xfree(tree->rchild);														\
-            tree->lchild = NULL;														\
-            tree->rchild = NULL;														\
-        }																	\
-	else if( ( (tree->lchild->type == H5Z_XFORM_FLOAT) || (tree->lchild->type == H5Z_XFORM_INTEGER)) && 					\
-	            ( (tree->rchild->type == H5Z_XFORM_FLOAT) || (tree->rchild->type == H5Z_XFORM_INTEGER)))					\
-	{																	\
-	    tree->type = H5Z_XFORM_FLOAT;													\
-           tree->value.float_val = ((tree->lchild->type == H5Z_XFORM_FLOAT) ? tree->lchild->value.float_val : (double)tree->lchild->value.int_val) OP 	\
-				    ((tree->rchild->type == H5Z_XFORM_FLOAT) ? tree->rchild->value.float_val : (double)tree->rchild->value.int_val);	\
-            H5MM_xfree(tree->lchild);														\
-            H5MM_xfree(tree->rchild);														\
-            tree->lchild = NULL;														\
-            tree->rchild = NULL;														\
-        }																	\
-}
+#define H5Z_XFORM_DO_OP3(OP)                                                                                 \
+    {                                                                                                        \
+        if ((tree->lchild->type == H5Z_XFORM_INTEGER) && (tree->rchild->type == H5Z_XFORM_INTEGER)) {        \
+            tree->type          = H5Z_XFORM_INTEGER;                                                         \
+            tree->value.int_val = tree->lchild->value.int_val OP tree->rchild->value.int_val;                \
+            H5MM_xfree(tree->lchild);                                                                        \
+            H5MM_xfree(tree->rchild);                                                                        \
+            tree->lchild = NULL;                                                                             \
+            tree->rchild = NULL;                                                                             \
+        }                                                                                                    \
+        else if (((tree->lchild->type == H5Z_XFORM_FLOAT) || (tree->lchild->type == H5Z_XFORM_INTEGER)) &&   \
+                 ((tree->rchild->type == H5Z_XFORM_FLOAT) || (tree->rchild->type == H5Z_XFORM_INTEGER))) {   \
+            tree->type = H5Z_XFORM_FLOAT;                                                                    \
+            tree->value.float_val =                                                                          \
+                ((tree->lchild->type == H5Z_XFORM_FLOAT) ? tree->lchild->value.float_val                     \
+                                                         : (double)tree->lchild->value.int_val)              \
+                    OP((tree->rchild->type == H5Z_XFORM_FLOAT) ? tree->rchild->value.float_val               \
+                                                               : (double)tree->rchild->value.int_val);       \
+            H5MM_xfree(tree->lchild);                                                                        \
+            H5MM_xfree(tree->rchild);                                                                        \
+            tree->lchild = NULL;                                                                             \
+            tree->rchild = NULL;                                                                             \
+        }                                                                                                    \
+    }
 
-#define H5Z_XFORM_DO_OP4(TYPE)                                                                                          \
-{                                                                                                                       \
-    if ((ret_value = (H5Z_node*) H5MM_malloc(sizeof(H5Z_node))) == NULL)                                                \
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Ran out of memory trying to copy parse tree")                     \
-    else                                                                                                                \
-    {                                                                                                                   \
-        ret_value->type = (TYPE);                                                                                       \
-        ret_value->lchild = (H5Z_node*) H5Z_xform_copy_tree(tree->lchild, dat_val_pointers, new_dat_val_pointers);      \
-        ret_value->rchild = (H5Z_node*) H5Z_xform_copy_tree(tree->rchild, dat_val_pointers, new_dat_val_pointers);      \
-    }                                                                                                                   \
-}
+#define H5Z_XFORM_DO_OP4(TYPE)                                                                               \
+    {                                                                                                        \
+        if ((ret_value = (H5Z_node *)H5MM_malloc(sizeof(H5Z_node))) == NULL)                                 \
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Ran out of memory trying to copy parse tree")      \
+        else {                                                                                               \
+            ret_value->type = (TYPE);                                                                        \
+            ret_value->lchild =                                                                              \
+                (H5Z_node *)H5Z_xform_copy_tree(tree->lchild, dat_val_pointers, new_dat_val_pointers);       \
+            ret_value->rchild =                                                                              \
+                (H5Z_node *)H5Z_xform_copy_tree(tree->rchild, dat_val_pointers, new_dat_val_pointers);       \
+        }                                                                                                    \
+    }
 
-#define H5Z_XFORM_DO_OP5(TYPE, SIZE)                                                               \
-{                                                                                                  \
-    TYPE val = (TYPE)((tree->type == H5Z_XFORM_INTEGER) ? tree->value.int_val : tree->value.float_val); \
-    H5VM_array_fill(array, &val, sizeof(TYPE), (SIZE));                                             \
-}
+#define H5Z_XFORM_DO_OP5(TYPE, SIZE)                                                                         \
+    {                                                                                                        \
+        TYPE val = (TYPE)((tree->type == H5Z_XFORM_INTEGER) ? tree->value.int_val : tree->value.float_val);  \
+        H5VM_array_fill(array, &val, sizeof(TYPE), (SIZE));                                                  \
+    }
 
-/* The difference of this macro from H5Z_XFORM_DO_OP3 is that it handles the operations when the left operand is empty, like -x or +x.  
- * The reason that it's seperated from H5Z_XFORM_DO_OP3 is because compilers don't accept operations like *x or /x.  So in H5Z_do_op, 
- * these two macros are called in different ways. (SLU 2012/3/20) 
+/* The difference of this macro from H5Z_XFORM_DO_OP3 is that it handles the operations when the left operand
+ * is empty, like -x or +x. The reason that it's seperated from H5Z_XFORM_DO_OP3 is because compilers don't
+ * accept operations like *x or /x.  So in H5Z_do_op, these two macros are called in different ways. (SLU
+ * 2012/3/20)
  */
-#define H5Z_XFORM_DO_OP6(OP)                                                                                                                    \
-{                                                                                                                                               \
-        if(!tree->lchild && (tree->rchild->type==H5Z_XFORM_INTEGER))                                                                            \
-        {																	\
-            tree->type = H5Z_XFORM_INTEGER;													\
-            tree->value.int_val = OP tree->rchild->value.int_val;							                        \
-            H5MM_xfree(tree->rchild);														\
-            tree->rchild = NULL;														\
-        }	                                                                                                                                \
-        else if(!tree->lchild && (tree->rchild->type==H5Z_XFORM_FLOAT))                                                                         \
-        {																	\
-            tree->type = H5Z_XFORM_FLOAT;													\
-            tree->value.float_val = OP tree->rchild->value.float_val;							                        \
-            H5MM_xfree(tree->rchild);														\
-            tree->rchild = NULL;														\
-        }	                                                                                                                                \
-        else if((tree->lchild->type == H5Z_XFORM_INTEGER) && (tree->rchild->type==H5Z_XFORM_INTEGER))                                           \
-        {																	\
-            tree->type = H5Z_XFORM_INTEGER;													\
-            tree->value.int_val = tree->lchild->value.int_val OP tree->rchild->value.int_val;							\
-            H5MM_xfree(tree->lchild);														\
-            H5MM_xfree(tree->rchild);														\
-            tree->lchild = NULL;														\
-            tree->rchild = NULL;														\
-        }																	\
-	else if( ( (tree->lchild->type == H5Z_XFORM_FLOAT) || (tree->lchild->type == H5Z_XFORM_INTEGER)) && 					\
-	            ( (tree->rchild->type == H5Z_XFORM_FLOAT) || (tree->rchild->type == H5Z_XFORM_INTEGER)))					\
-	{																	\
-	    tree->type = H5Z_XFORM_FLOAT;													\
-            tree->value.float_val = ((tree->lchild->type == H5Z_XFORM_FLOAT) ? tree->lchild->value.float_val : (double)tree->lchild->value.int_val) OP 	\
-				    ((tree->rchild->type == H5Z_XFORM_FLOAT) ? tree->rchild->value.float_val : (double)tree->rchild->value.int_val);	\
-            H5MM_xfree(tree->lchild);														\
-            H5MM_xfree(tree->rchild);														\
-            tree->lchild = NULL;														\
-            tree->rchild = NULL;														\
-        }																	\
-}
+#define H5Z_XFORM_DO_OP6(OP)                                                                                 \
+    {                                                                                                        \
+        if (!tree->lchild && (tree->rchild->type == H5Z_XFORM_INTEGER)) {                                    \
+            tree->type          = H5Z_XFORM_INTEGER;                                                         \
+            tree->value.int_val = OP tree->rchild->value.int_val;                                            \
+            H5MM_xfree(tree->rchild);                                                                        \
+            tree->rchild = NULL;                                                                             \
+        }                                                                                                    \
+        else if (!tree->lchild && (tree->rchild->type == H5Z_XFORM_FLOAT)) {                                 \
+            tree->type            = H5Z_XFORM_FLOAT;                                                         \
+            tree->value.float_val = OP tree->rchild->value.float_val;                                        \
+            H5MM_xfree(tree->rchild);                                                                        \
+            tree->rchild = NULL;                                                                             \
+        }                                                                                                    \
+        else if ((tree->lchild->type == H5Z_XFORM_INTEGER) && (tree->rchild->type == H5Z_XFORM_INTEGER)) {   \
+            tree->type          = H5Z_XFORM_INTEGER;                                                         \
+            tree->value.int_val = tree->lchild->value.int_val OP tree->rchild->value.int_val;                \
+            H5MM_xfree(tree->lchild);                                                                        \
+            H5MM_xfree(tree->rchild);                                                                        \
+            tree->lchild = NULL;                                                                             \
+            tree->rchild = NULL;                                                                             \
+        }                                                                                                    \
+        else if (((tree->lchild->type == H5Z_XFORM_FLOAT) || (tree->lchild->type == H5Z_XFORM_INTEGER)) &&   \
+                 ((tree->rchild->type == H5Z_XFORM_FLOAT) || (tree->rchild->type == H5Z_XFORM_INTEGER))) {   \
+            tree->type = H5Z_XFORM_FLOAT;                                                                    \
+            tree->value.float_val =                                                                          \
+                ((tree->lchild->type == H5Z_XFORM_FLOAT) ? tree->lchild->value.float_val                     \
+                                                         : (double)tree->lchild->value.int_val)              \
+                    OP((tree->rchild->type == H5Z_XFORM_FLOAT) ? tree->rchild->value.float_val               \
+                                                               : (double)tree->rchild->value.int_val);       \
+            H5MM_xfree(tree->lchild);                                                                        \
+            H5MM_xfree(tree->rchild);                                                                        \
+            tree->lchild = NULL;                                                                             \
+            tree->rchild = NULL;                                                                             \
+        }                                                                                                    \
+    }
 
 /*
  *  Programmer: Bill Wendling <wendling@ncsa.uiuc.edu>
@@ -327,7 +326,6 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
  *      // FLOAT is a C double
  */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_unget_token
  * Purpose:     Rollback the H5Z_token to the previous H5Z_token retrieved. There
@@ -337,8 +335,8 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
  * Programmer:  Bill Wendling
  *              26. August 2003
  * Modifications:
-  *              Leon Arber:  Added FUNC_ENTER / FUNC_LEAVE pairs
-*
+ *              Leon Arber:  Added FUNC_ENTER / FUNC_LEAVE pairs
+ *
  *-------------------------------------------------------------------------
  */
 static void
@@ -349,14 +347,13 @@ H5Z_unget_token(H5Z_token *current)
     /* check args */
     HDassert(current);
 
-    current->tok_type = current->tok_last_type;
+    current->tok_type  = current->tok_last_type;
     current->tok_begin = current->tok_last_begin;
-    current->tok_end = current->tok_last_end;
+    current->tok_end   = current->tok_last_end;
 
     FUNC_LEAVE_NOAPI_VOID
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_get_token
  *
@@ -386,17 +383,17 @@ H5Z_get_token(H5Z_token *current)
     HDassert(current);
 
     /* Save the last position for possible ungets */
-    current->tok_last_type = current->tok_type;
+    current->tok_last_type  = current->tok_type;
     current->tok_last_begin = current->tok_begin;
-    current->tok_last_end = current->tok_end;
+    current->tok_last_end   = current->tok_end;
 
     current->tok_begin = current->tok_end;
 
     while (current->tok_begin[0] != '\0') {
         if (HDisspace(current->tok_begin[0])) {
             /* ignore whitespace */
-        } else if (HDisdigit(current->tok_begin[0]) ||
-                   current->tok_begin[0] == '.') {
+        }
+        else if (HDisdigit(current->tok_begin[0]) || current->tok_begin[0] == '.') {
             current->tok_end = current->tok_begin;
 
             /*
@@ -419,9 +416,7 @@ H5Z_get_token(H5Z_token *current)
              *                      '.' digit-sequence
              * exponent         :=  [Ee] [-+]? digit-sequence
              */
-            if (current->tok_end[0] == '.' ||
-                    current->tok_end[0] == 'e' ||
-                    current->tok_end[0] == 'E') {
+            if (current->tok_end[0] == '.' || current->tok_end[0] == 'e' || current->tok_end[0] == 'E') {
                 current->tok_type = H5Z_XFORM_FLOAT;
 
                 if (current->tok_end[0] == '.')
@@ -429,17 +424,16 @@ H5Z_get_token(H5Z_token *current)
                         ++current->tok_end;
                     } while (HDisdigit(current->tok_end[0]));
 
-                if (current->tok_end[0] == 'e' ||
-                    current->tok_end[0] == 'E') {
+                if (current->tok_end[0] == 'e' || current->tok_end[0] == 'E') {
                     ++current->tok_end;
 
-                    if (current->tok_end[0] == '-' ||
-                        current->tok_end[0] == '+')
+                    if (current->tok_end[0] == '-' || current->tok_end[0] == '+')
                         ++current->tok_end;
 
                     if (!HDisdigit(current->tok_end[0])) {
                         current->tok_type = H5Z_XFORM_ERROR;
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, current, "Invalidly formatted floating point number")
+                        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, current,
+                                    "Invalidly formatted floating point number")
                     }
 
                     while (HDisdigit(current->tok_end[0]))
@@ -454,27 +448,42 @@ H5Z_get_token(H5Z_token *current)
             }
 
             break;
-        } else if (HDisalpha(current->tok_begin[0])) {
+        }
+        else if (HDisalpha(current->tok_begin[0])) {
             /* is symbol */
             current->tok_type = H5Z_XFORM_SYMBOL;
-            current->tok_end = current->tok_begin;
+            current->tok_end  = current->tok_begin;
 
             while (HDisalnum(current->tok_end[0]))
                 ++current->tok_end;
 
             break;
-        } else {
+        }
+        else {
             /* should be +, -, *, /, (, or ) */
             switch (current->tok_begin[0]) {
-                case '+':   current->tok_type = H5Z_XFORM_PLUS;    break;
-                case '-':   current->tok_type = H5Z_XFORM_MINUS;   break;
-                case '*':   current->tok_type = H5Z_XFORM_MULT;    break;
-                case '/':   current->tok_type = H5Z_XFORM_DIVIDE;  break;
-                case '(':   current->tok_type = H5Z_XFORM_LPAREN;  break;
-                case ')':   current->tok_type = H5Z_XFORM_RPAREN;  break;
+                case '+':
+                    current->tok_type = H5Z_XFORM_PLUS;
+                    break;
+                case '-':
+                    current->tok_type = H5Z_XFORM_MINUS;
+                    break;
+                case '*':
+                    current->tok_type = H5Z_XFORM_MULT;
+                    break;
+                case '/':
+                    current->tok_type = H5Z_XFORM_DIVIDE;
+                    break;
+                case '(':
+                    current->tok_type = H5Z_XFORM_LPAREN;
+                    break;
+                case ')':
+                    current->tok_type = H5Z_XFORM_RPAREN;
+                    break;
                 default:
                     current->tok_type = H5Z_XFORM_ERROR;
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, current, "Unknown H5Z_token in data transform expression ")
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, current,
+                                "Unknown H5Z_token in data transform expression ")
             }
 
             current->tok_end = current->tok_begin + 1;
@@ -494,7 +503,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_xform_destroy_parse_tree
  * Purpose:     Recursively destroys the expression tree.
@@ -511,18 +519,16 @@ H5Z_xform_destroy_parse_tree(H5Z_node *tree)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if (tree)
-    {
-	H5Z_xform_destroy_parse_tree(tree->lchild);
-	H5Z_xform_destroy_parse_tree(tree->rchild);
-	H5MM_xfree(tree);
-	tree = NULL;
+    if (tree) {
+        H5Z_xform_destroy_parse_tree(tree->lchild);
+        H5Z_xform_destroy_parse_tree(tree->rchild);
+        H5MM_xfree(tree);
+        tree = NULL;
     }
 
     FUNC_LEAVE_NOAPI_VOID
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_parse
  *
@@ -537,28 +543,27 @@ H5Z_xform_destroy_parse_tree(H5Z_node *tree)
  *-------------------------------------------------------------------------
  */
 static void *
-H5Z_xform_parse(const char *expression, H5Z_datval_ptrs* dat_val_pointers)
+H5Z_xform_parse(const char *expression, H5Z_datval_ptrs *dat_val_pointers)
 {
     H5Z_token tok;
-    void* ret_value;
+    void *    ret_value;
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(!expression)
+    if (!expression)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "No expression provided?")
 
     /* Set up the initial H5Z_token for parsing */
     tok.tok_expr = tok.tok_begin = tok.tok_end = expression;
 
-    ret_value = (void*)H5Z_parse_expression(&tok, dat_val_pointers);
+    ret_value = (void *)H5Z_parse_expression(&tok, dat_val_pointers);
 
-    H5Z_xform_reduce_tree((H5Z_node*)ret_value);
+    H5Z_xform_reduce_tree((H5Z_node *)ret_value);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_parse_expression
  * Purpose:     Beginning of the recursive descent parser to parse the
@@ -571,15 +576,15 @@ done:
  * Programmer:  Bill Wendling
  *              26. August 2003
  * Modifications:
-  *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
-*
+ *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
+ *
  *-------------------------------------------------------------------------
  */
 static H5Z_node *
-H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
+H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers)
 {
     H5Z_node *expr;
-    H5Z_node *ret_value;        /* Return value */
+    H5Z_node *ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -590,7 +595,7 @@ H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
 
         current = H5Z_get_token(current);
 
-        switch(current->tok_type) {
+        switch (current->tok_type) {
             case H5Z_XFORM_PLUS:
                 new_node = H5Z_new_node(H5Z_XFORM_PLUS);
 
@@ -653,7 +658,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_parse_term
  * Purpose:     Parses a term in our expression language. A term is:
@@ -665,12 +669,12 @@ done:
  * Programmer:  Bill Wendling
  *              26. August 2003
  * Modifications:
-  *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
-*
+ *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
+ *
  *-------------------------------------------------------------------------
  */
 static H5Z_node *
-H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
+H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers)
 {
     H5Z_node *term = NULL;
     H5Z_node *ret_value;
@@ -714,7 +718,7 @@ H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
 
                 new_node->lchild = term;
                 new_node->rchild = H5Z_parse_factor(current, dat_val_pointers);
-                term = new_node;
+                term             = new_node;
 
                 if (!new_node->rchild) {
                     H5Z_xform_destroy_parse_tree(new_node);
@@ -732,14 +736,13 @@ H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
             default:
                 H5Z_unget_token(current);
                 HGOTO_DONE(term)
-	}
+        }
     }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_parse_factor
  * Purpose:     Parses a factor in our expression language. A factor is:
@@ -760,75 +763,75 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5Z_node *
-H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
+H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers)
 {
-    H5Z_node 	*factor=NULL;
-    H5Z_node 	*new_node;
-    H5Z_node    *ret_value;
+    H5Z_node *factor = NULL;
+    H5Z_node *new_node;
+    H5Z_node *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT
 
     current = H5Z_get_token(current);
 
     switch (current->tok_type) {
-	case H5Z_XFORM_INTEGER:
-	    factor = H5Z_new_node(H5Z_XFORM_INTEGER);
+        case H5Z_XFORM_INTEGER:
+            factor = H5Z_new_node(H5Z_XFORM_INTEGER);
 
-	    if (!factor)
+            if (!factor)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Unable to allocate new node")
             sscanf(current->tok_begin, "%ld", &factor->value.int_val);
-	    break;
+            break;
 
-	case H5Z_XFORM_FLOAT:
-	    factor = H5Z_new_node(H5Z_XFORM_FLOAT);
+        case H5Z_XFORM_FLOAT:
+            factor = H5Z_new_node(H5Z_XFORM_FLOAT);
 
-	    if (!factor)
+            if (!factor)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Unable to allocate new node")
             sscanf(current->tok_begin, "%lf", &factor->value.float_val);
-	    break;
+            break;
 
-	case H5Z_XFORM_SYMBOL:
-	    factor = H5Z_new_node(H5Z_XFORM_SYMBOL);
+        case H5Z_XFORM_SYMBOL:
+            factor = H5Z_new_node(H5Z_XFORM_SYMBOL);
 
-	    if (!factor)
+            if (!factor)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Unable to allocate new node")
 
             factor->value.dat_val = &(dat_val_pointers->ptr_dat_val[dat_val_pointers->num_ptrs]);
-	    dat_val_pointers->num_ptrs++;
-	    break;
+            dat_val_pointers->num_ptrs++;
+            break;
 
-	case H5Z_XFORM_LPAREN:
-	    factor = H5Z_parse_expression(current, dat_val_pointers);
+        case H5Z_XFORM_LPAREN:
+            factor = H5Z_parse_expression(current, dat_val_pointers);
 
-	    if (!factor)
+            if (!factor)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Unable to allocate new node")
 
             current = H5Z_get_token(current);
 
-	    if (current->tok_type != H5Z_XFORM_RPAREN) {
-		H5Z_xform_destroy_parse_tree(factor);
-		HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Syntax error in data transform expression")
-	    }
-	    break;
+            if (current->tok_type != H5Z_XFORM_RPAREN) {
+                H5Z_xform_destroy_parse_tree(factor);
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Syntax error in data transform expression")
+            }
+            break;
 
-	case H5Z_XFORM_RPAREN:
-	    /* We shouldn't see a ) right now */
-	    H5Z_xform_destroy_parse_tree(factor);
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Syntax error: unexpected ')' ")
+        case H5Z_XFORM_RPAREN:
+            /* We shouldn't see a ) right now */
+            H5Z_xform_destroy_parse_tree(factor);
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Syntax error: unexpected ')' ")
 
-	case H5Z_XFORM_PLUS:
+        case H5Z_XFORM_PLUS:
             /* unary + */
             new_node = H5Z_parse_factor(current, dat_val_pointers);
 
             if (new_node) {
                 if (new_node->type != H5Z_XFORM_INTEGER && new_node->type != H5Z_XFORM_FLOAT &&
-                        new_node->type != H5Z_XFORM_SYMBOL) {
+                    new_node->type != H5Z_XFORM_SYMBOL) {
                     H5Z_xform_destroy_parse_tree(new_node);
                     H5Z_xform_destroy_parse_tree(factor);
                     HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Error parsing data transform expression")
                 }
 
-                factor = new_node;
+                factor   = new_node;
                 new_node = H5Z_new_node(H5Z_XFORM_PLUS);
 
                 if (!new_node) {
@@ -837,26 +840,27 @@ H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
                 }
 
                 new_node->rchild = factor;
-                factor = new_node;
-            } else {
+                factor           = new_node;
+            }
+            else {
                 H5Z_xform_destroy_parse_tree(factor);
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Error parsing data transform expression")
             }
             break;
 
-	case H5Z_XFORM_MINUS:
+        case H5Z_XFORM_MINUS:
             /* unary - */
             new_node = H5Z_parse_factor(current, dat_val_pointers);
 
             if (new_node) {
                 if (new_node->type != H5Z_XFORM_INTEGER && new_node->type != H5Z_XFORM_FLOAT &&
-                        new_node->type != H5Z_XFORM_SYMBOL) {
+                    new_node->type != H5Z_XFORM_SYMBOL) {
                     H5Z_xform_destroy_parse_tree(new_node);
                     H5Z_xform_destroy_parse_tree(factor);
                     HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Error parsing data transform expression")
                 }
 
-                factor = new_node;
+                factor   = new_node;
                 new_node = H5Z_new_node(H5Z_XFORM_MINUS);
 
                 if (!new_node) {
@@ -865,29 +869,28 @@ H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
                 }
 
                 new_node->rchild = factor;
-                factor = new_node;
-            } else {
+                factor           = new_node;
+            }
+            else {
                 H5Z_xform_destroy_parse_tree(factor);
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Error parsing data transform expression")
             }
             break;
 
-	case H5Z_XFORM_END:
+        case H5Z_XFORM_END:
             break;
 
-	default:
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Invalid token while parsing data transform expression")
-
+        default:
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Invalid token while parsing data transform expression")
     }
 
     /* Set return value */
-    ret_value=factor;
+    ret_value = factor;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_new_node
  * Purpose:     Create and initilize a new H5Z_node structure.
@@ -907,8 +910,9 @@ H5Z_new_node(H5Z_token_type type)
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(NULL == (ret_value = (H5Z_node *)H5MM_calloc(sizeof(H5Z_node))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Ran out of memory trying to allocate space for nodes in the parse tree")
+    if (NULL == (ret_value = (H5Z_node *)H5MM_calloc(sizeof(H5Z_node))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "Ran out of memory trying to allocate space for nodes in the parse tree")
 
     ret_value->type = type;
 
@@ -916,7 +920,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_xform_eval
  * Purpose: 	If the transform is trivial, this function applies it.
@@ -930,13 +933,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size, const H5T_t *buf_type)
+H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array, size_t array_size, const H5T_t *buf_type)
 {
-    H5Z_node *tree;
-    hid_t array_type;
+    H5Z_node * tree;
+    hid_t      array_type;
     H5Z_result res;
-    size_t i;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t     i;
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -945,89 +948,91 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size
     tree = data_xform_prop->parse_root;
 
     /* Get the datatype ID for the buffer's type */
-    if((array_type = H5Z_xform_find_type(buf_type)) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Cannot perform data transform on this type.")
+    if ((array_type = H5Z_xform_find_type(buf_type)) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Cannot perform data transform on this type.")
 
     /* After this point, we're assured that the type of the array is handled by the eval code,
      *  so we no longer have to check for valid types
      */
 
     /* If it's a trivial data transform, perform it */
-    if(tree->type == H5Z_XFORM_INTEGER || tree->type == H5Z_XFORM_FLOAT) {
-        if(array_type == H5T_NATIVE_CHAR)
+    if (tree->type == H5Z_XFORM_INTEGER || tree->type == H5Z_XFORM_FLOAT) {
+        if (array_type == H5T_NATIVE_CHAR)
             H5Z_XFORM_DO_OP5(char, array_size)
-        else if(array_type ==  H5T_NATIVE_UCHAR)
+        else if (array_type == H5T_NATIVE_UCHAR)
             H5Z_XFORM_DO_OP5(unsigned char, array_size)
-        else if(array_type == H5T_NATIVE_SCHAR)
+        else if (array_type == H5T_NATIVE_SCHAR)
             H5Z_XFORM_DO_OP5(signed char, array_size)
-        else if(array_type == H5T_NATIVE_SHORT)
+        else if (array_type == H5T_NATIVE_SHORT)
             H5Z_XFORM_DO_OP5(short, array_size)
-        else if(array_type == H5T_NATIVE_USHORT)
+        else if (array_type == H5T_NATIVE_USHORT)
             H5Z_XFORM_DO_OP5(unsigned short, array_size)
-        else if(array_type == H5T_NATIVE_INT)
+        else if (array_type == H5T_NATIVE_INT)
             H5Z_XFORM_DO_OP5(int, array_size)
-        else if(array_type ==  H5T_NATIVE_UINT)
+        else if (array_type == H5T_NATIVE_UINT)
             H5Z_XFORM_DO_OP5(unsigned int, array_size)
-        else if(array_type == H5T_NATIVE_LONG)
+        else if (array_type == H5T_NATIVE_LONG)
             H5Z_XFORM_DO_OP5(long, array_size)
-        else if(array_type == H5T_NATIVE_ULONG)
+        else if (array_type == H5T_NATIVE_ULONG)
             H5Z_XFORM_DO_OP5(unsigned long, array_size)
-        else if(array_type == H5T_NATIVE_LLONG)
+        else if (array_type == H5T_NATIVE_LLONG)
             H5Z_XFORM_DO_OP5(long long, array_size)
-        else if(array_type == H5T_NATIVE_ULLONG)
+        else if (array_type == H5T_NATIVE_ULLONG)
             H5Z_XFORM_DO_OP5(unsigned long long, array_size)
-        else if(array_type == H5T_NATIVE_FLOAT)
+        else if (array_type == H5T_NATIVE_FLOAT)
             H5Z_XFORM_DO_OP5(float, array_size)
-	else if(array_type == H5T_NATIVE_DOUBLE)
+        else if (array_type == H5T_NATIVE_DOUBLE)
             H5Z_XFORM_DO_OP5(double, array_size)
-#if H5_SIZEOF_LONG_DOUBLE !=0
-	else if(array_type == H5T_NATIVE_LDOUBLE)
+#if H5_SIZEOF_LONG_DOUBLE != 0
+        else if (array_type == H5T_NATIVE_LDOUBLE)
             H5Z_XFORM_DO_OP5(long double, array_size)
 #endif
 
     } /* end if */
     /* Otherwise, do the full data transform */
     else {
-	/* Optimization for linear transform: */
-	if(data_xform_prop->dat_val_pointers->num_ptrs == 1)
-	    data_xform_prop->dat_val_pointers->ptr_dat_val[0] = array;
+        /* Optimization for linear transform: */
+        if (data_xform_prop->dat_val_pointers->num_ptrs == 1)
+            data_xform_prop->dat_val_pointers->ptr_dat_val[0] = array;
 
-	/* If it's a quadratic transform, we have no choice but to store multiple copies of the data */
-	else {
-	    for(i = 0; i < data_xform_prop->dat_val_pointers->num_ptrs; i++) {
-		if(NULL == (data_xform_prop->dat_val_pointers->ptr_dat_val[i] = (void*)H5MM_malloc(array_size * H5T_get_size((H5T_t *)H5I_object(array_type)))))
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "Ran out of memory trying to allocate space for data in data transform")
+        /* If it's a quadratic transform, we have no choice but to store multiple copies of the data */
+        else {
+            for (i = 0; i < data_xform_prop->dat_val_pointers->num_ptrs; i++) {
+                if (NULL == (data_xform_prop->dat_val_pointers->ptr_dat_val[i] = (void *)H5MM_malloc(
+                                 array_size * H5T_get_size((H5T_t *)H5I_object(array_type)))))
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                                "Ran out of memory trying to allocate space for data in data transform")
 
-                HDmemcpy(data_xform_prop->dat_val_pointers->ptr_dat_val[i], array, array_size * H5T_get_size((H5T_t *)H5I_object(array_type)));
-	    } /* end for */
-	} /* end else */
+                HDmemcpy(data_xform_prop->dat_val_pointers->ptr_dat_val[i], array,
+                         array_size * H5T_get_size((H5T_t *)H5I_object(array_type)));
+            } /* end for */
+        }     /* end else */
 
-	if(H5Z_xform_eval_full(tree, array_size, array_type, &res) < 0)
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform")
+        if (H5Z_xform_eval_full(tree, array_size, array_type, &res) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform")
 
-	if(data_xform_prop->dat_val_pointers->num_ptrs > 1)
-	    HDmemcpy(array, res.value.dat_val, array_size * H5T_get_size((H5T_t *)H5I_object(array_type)));
+        if (data_xform_prop->dat_val_pointers->num_ptrs > 1)
+            HDmemcpy(array, res.value.dat_val, array_size * H5T_get_size((H5T_t *)H5I_object(array_type)));
 
         /* Free the temporary arrays we used */
-        if(data_xform_prop->dat_val_pointers->num_ptrs > 1)
-            for(i=0; i<data_xform_prop->dat_val_pointers->num_ptrs; i++)
+        if (data_xform_prop->dat_val_pointers->num_ptrs > 1)
+            for (i = 0; i < data_xform_prop->dat_val_pointers->num_ptrs; i++)
                 HDfree(data_xform_prop->dat_val_pointers->ptr_dat_val[i]);
     } /* end else */
 
 done:
-    if(ret_value < 0) {
-	/* If we ran out of memory above copying the array for temp storage (which we easily can for
-	 * polynomial transforms of high order) we free those arrays which we already allocated */
-	if(data_xform_prop->dat_val_pointers->num_ptrs > 1)
-	    for(i = 0; i < data_xform_prop->dat_val_pointers->num_ptrs; i++)
-		if(data_xform_prop->dat_val_pointers->ptr_dat_val[i])
-		    HDfree(data_xform_prop->dat_val_pointers->ptr_dat_val[i]);
+    if (ret_value < 0) {
+        /* If we ran out of memory above copying the array for temp storage (which we easily can for
+         * polynomial transforms of high order) we free those arrays which we already allocated */
+        if (data_xform_prop->dat_val_pointers->num_ptrs > 1)
+            for (i = 0; i < data_xform_prop->dat_val_pointers->num_ptrs; i++)
+                if (data_xform_prop->dat_val_pointers->ptr_dat_val[i])
+                    HDfree(data_xform_prop->dat_val_pointers->ptr_dat_val[i]);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_xform_eval() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_xform_eval_full
  * Purpose: 	Does a full evaluation of the parse tree contained in tree
@@ -1044,10 +1049,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5Z_xform_eval_full(H5Z_node *tree, const size_t array_size,  const hid_t array_type, H5Z_result *res)
+H5Z_xform_eval_full(H5Z_node *tree, const size_t array_size, const hid_t array_type, H5Z_result *res)
 {
     H5Z_result resl, resr;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1058,72 +1063,70 @@ H5Z_xform_eval_full(H5Z_node *tree, const size_t array_size,  const hid_t array_
     HDmemset(&resr, 0, sizeof(H5Z_result));
 
     if (tree->type == H5Z_XFORM_INTEGER) {
-	res->type = H5Z_XFORM_INTEGER;
-	res->value.int_val = tree->value.int_val;
+        res->type          = H5Z_XFORM_INTEGER;
+        res->value.int_val = tree->value.int_val;
     } /* end if */
     else if (tree->type == H5Z_XFORM_FLOAT) {
-	res->type = H5Z_XFORM_FLOAT;
-	res->value.float_val = tree->value.float_val;
+        res->type            = H5Z_XFORM_FLOAT;
+        res->value.float_val = tree->value.float_val;
     } /* end if */
     else if (tree->type == H5Z_XFORM_SYMBOL) {
-	res->type = H5Z_XFORM_SYMBOL;
+        res->type = H5Z_XFORM_SYMBOL;
 
-	/*since dat_val stores the address of the array which is really stored in the dat_val_pointers,
-	 * here we make dat_val store a pointer to the array itself instead of the address of it so that the
-	 * rest of the code below works normally. */
-	res->value.dat_val = *((void**)(tree->value.dat_val));
+        /*since dat_val stores the address of the array which is really stored in the dat_val_pointers,
+         * here we make dat_val store a pointer to the array itself instead of the address of it so that the
+         * rest of the code below works normally. */
+        res->value.dat_val = *((void **)(tree->value.dat_val));
     } /* end if */
     else {
-	if(tree->lchild && H5Z_xform_eval_full(tree->lchild, array_size, array_type, &resl) < 0)
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform")
-	if(H5Z_xform_eval_full(tree->rchild, array_size, array_type, &resr) < 0)
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform")
-
-	res->type = H5Z_XFORM_SYMBOL;
-
-	/* For each type of operation:
-	 * 1.  See if "x" is on left hand side, right hand side, or if both sides are "x"
-	 * 2.  Figure out what type of data we're going to be manipulating
-	 * 3.  Do the operation on the data. */
-
-
-	switch (tree->type) {
-	    case H5Z_XFORM_PLUS:
-	 	H5Z_XFORM_TYPE_OP(resl, resr, array_type, +, array_size)
-		break;
-
-	    case H5Z_XFORM_MINUS:
-	 	H5Z_XFORM_TYPE_OP(resl, resr, array_type, -, array_size)
-		break;
-
-	    case H5Z_XFORM_MULT:
-		H5Z_XFORM_TYPE_OP(resl, resr, array_type, *, array_size)
-		break;
-
-	    case H5Z_XFORM_DIVIDE:
-	 	H5Z_XFORM_TYPE_OP(resl, resr, array_type, /, array_size)
-		break;
-
-	    default:
-		HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid expression tree")
-	} /* end switch */
-
-	/* The result stores a pointer to the new data */
-	/* So, if the left hand side got its data modified, the result stores a pointers
-	 * to the left hand side's data, ditto for rhs */
-	if(resl.type ==  H5Z_XFORM_SYMBOL)
-	    res->value.dat_val = resl.value.dat_val;
-	else if(resr.type == H5Z_XFORM_SYMBOL)
-	    res->value.dat_val = resr.value.dat_val;
-	else
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error during transform evaluation")
+        if (tree->lchild && H5Z_xform_eval_full(tree->lchild, array_size, array_type, &resl) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform")
+        if (H5Z_xform_eval_full(tree->rchild, array_size, array_type, &resr) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform")
+
+        res->type = H5Z_XFORM_SYMBOL;
+
+        /* For each type of operation:
+         * 1.  See if "x" is on left hand side, right hand side, or if both sides are "x"
+         * 2.  Figure out what type of data we're going to be manipulating
+         * 3.  Do the operation on the data. */
+
+        switch (tree->type) {
+            case H5Z_XFORM_PLUS:
+                H5Z_XFORM_TYPE_OP(resl, resr, array_type, +, array_size)
+                break;
+
+            case H5Z_XFORM_MINUS:
+                H5Z_XFORM_TYPE_OP(resl, resr, array_type, -, array_size)
+                break;
+
+            case H5Z_XFORM_MULT:
+                H5Z_XFORM_TYPE_OP(resl, resr, array_type, *, array_size)
+                break;
+
+            case H5Z_XFORM_DIVIDE:
+                H5Z_XFORM_TYPE_OP(resl, resr, array_type, /, array_size)
+                break;
+
+            default:
+                HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid expression tree")
+        } /* end switch */
+
+        /* The result stores a pointer to the new data */
+        /* So, if the left hand side got its data modified, the result stores a pointers
+         * to the left hand side's data, ditto for rhs */
+        if (resl.type == H5Z_XFORM_SYMBOL)
+            res->value.dat_val = resl.value.dat_val;
+        else if (resr.type == H5Z_XFORM_SYMBOL)
+            res->value.dat_val = resr.value.dat_val;
+        else
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error during transform evaluation")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_xform_eval_full() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_find_type
  * Return:      Native type of datatype that is passed in
@@ -1134,81 +1137,66 @@ done:
  *-------------------------------------------------------------------------
  */
 static hid_t
-H5Z_xform_find_type(const H5T_t* type)
+H5Z_xform_find_type(const H5T_t *type)
 {
-    H5T_t *tmp;                         /* Temporary datatype */
-    hid_t ret_value = SUCCEED;          /* Return value */
+    H5T_t *tmp;                 /* Temporary datatype */
+    hid_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(type);
 
     /* Check for SHORT type */
-    if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_SHORT)) 
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_SHORT)
+    if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_SHORT)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_SHORT)
     /* Check for INT type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_INT)) 
-            && 0 == H5T_cmp(type, tmp, FALSE))
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_INT)) && 0 == H5T_cmp(type, tmp, FALSE))
         HGOTO_DONE(H5T_NATIVE_INT)
     /* Check for LONG type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_LONG)) 
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_LONG)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_LONG)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_LONG)
     /* Check for LONGLONG type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_LLONG))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_LLONG)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_LLONG)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_LLONG)
     /* Check for UCHAR type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_UCHAR))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_UCHAR)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_UCHAR)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_UCHAR)
     /* Check for CHAR type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_CHAR))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_CHAR)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_CHAR)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_CHAR)
     /* Check for SCHAR type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_SCHAR))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_SCHAR)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_SCHAR)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_SCHAR)
     /* Check for USHORT type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_USHORT))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_USHORT)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_USHORT)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_USHORT)
     /* Check for UINT type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_UINT))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_UINT)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_UINT)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_UINT)
     /* Check for ULONG type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_ULONG))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_ULONG)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_ULONG)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_ULONG)
     /* Check for ULONGLONG type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_ULLONG))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_ULLONG)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_ULLONG)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_ULLONG)
     /* Check for FLOAT type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_FLOAT))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_FLOAT)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_FLOAT)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_FLOAT)
     /* Check for DOUBLE type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_DOUBLE))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_DOUBLE)
-#if H5_SIZEOF_LONG_DOUBLE !=0
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_DOUBLE)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_DOUBLE)
+#if H5_SIZEOF_LONG_DOUBLE != 0
     /* Check for LONGDOUBLE type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_LDOUBLE))
-            && 0 == H5T_cmp(type, tmp, FALSE))
-	HGOTO_DONE(H5T_NATIVE_LDOUBLE)
+    else if ((tmp = (H5T_t *)H5I_object(H5T_NATIVE_LDOUBLE)) && 0 == H5T_cmp(type, tmp, FALSE))
+        HGOTO_DONE(H5T_NATIVE_LDOUBLE)
 #endif
     else
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "could not find matching type")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "could not find matching type")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5Z_xform_find_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_xform_copy_tree
  * Purpose:     Makes a copy of the parse tree passed in.
@@ -1221,74 +1209,65 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5Z_xform_copy_tree(H5Z_node* tree, H5Z_datval_ptrs* dat_val_pointers, H5Z_datval_ptrs* new_dat_val_pointers)
+H5Z_xform_copy_tree(H5Z_node *tree, H5Z_datval_ptrs *dat_val_pointers, H5Z_datval_ptrs *new_dat_val_pointers)
 {
-    H5Z_node* ret_value=NULL;
+    H5Z_node *ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(tree);
 
-    if(tree->type == H5Z_XFORM_INTEGER)
-    {
-        if ((ret_value = (H5Z_node*) H5MM_malloc(sizeof(H5Z_node))) == NULL)
+    if (tree->type == H5Z_XFORM_INTEGER) {
+        if ((ret_value = (H5Z_node *)H5MM_malloc(sizeof(H5Z_node))) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Ran out of memory trying to copy parse tree")
-        else
-        {
-	    ret_value -> type = H5Z_XFORM_INTEGER;
-	    ret_value ->value.int_val = tree->value.int_val;
-	    ret_value -> lchild = NULL;
-	    ret_value -> rchild = NULL;
-	}
+        else {
+            ret_value->type          = H5Z_XFORM_INTEGER;
+            ret_value->value.int_val = tree->value.int_val;
+            ret_value->lchild        = NULL;
+            ret_value->rchild        = NULL;
+        }
     }
-    else if (tree->type == H5Z_XFORM_FLOAT)
-    {
-        if ((ret_value = (H5Z_node*) H5MM_malloc(sizeof(H5Z_node))) == NULL)
+    else if (tree->type == H5Z_XFORM_FLOAT) {
+        if ((ret_value = (H5Z_node *)H5MM_malloc(sizeof(H5Z_node))) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Ran out of memory trying to copy parse tree")
-        else
-	{
-	    ret_value -> type = H5Z_XFORM_FLOAT;
-	    ret_value ->value.float_val = tree->value.float_val;
-	    ret_value -> lchild = NULL;
-	    ret_value -> rchild = NULL;
-	}
+        else {
+            ret_value->type            = H5Z_XFORM_FLOAT;
+            ret_value->value.float_val = tree->value.float_val;
+            ret_value->lchild          = NULL;
+            ret_value->rchild          = NULL;
+        }
     }
-    else if(tree->type == H5Z_XFORM_SYMBOL)
-    {
-        if ((ret_value = (H5Z_node*) H5MM_malloc(sizeof(H5Z_node))) == NULL)
+    else if (tree->type == H5Z_XFORM_SYMBOL) {
+        if ((ret_value = (H5Z_node *)H5MM_malloc(sizeof(H5Z_node))) == NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Ran out of memory trying to copy parse tree")
-	else
-	{
-	    ret_value -> type = H5Z_XFORM_SYMBOL;
-
-	    ret_value -> value.dat_val = &(new_dat_val_pointers->ptr_dat_val[new_dat_val_pointers->num_ptrs]);
-	    new_dat_val_pointers->num_ptrs++;
-	    ret_value -> lchild = NULL;
-	    ret_value -> rchild = NULL;
-	}
+        else {
+            ret_value->type = H5Z_XFORM_SYMBOL;
+
+            ret_value->value.dat_val = &(new_dat_val_pointers->ptr_dat_val[new_dat_val_pointers->num_ptrs]);
+            new_dat_val_pointers->num_ptrs++;
+            ret_value->lchild = NULL;
+            ret_value->rchild = NULL;
+        }
     }
-    else if(tree->type == H5Z_XFORM_MULT)
+    else if (tree->type == H5Z_XFORM_MULT)
         H5Z_XFORM_DO_OP4(H5Z_XFORM_MULT)
-    else if(tree->type == H5Z_XFORM_PLUS)
+    else if (tree->type == H5Z_XFORM_PLUS)
         H5Z_XFORM_DO_OP4(H5Z_XFORM_PLUS)
-    else if(tree->type == H5Z_XFORM_MINUS)
+    else if (tree->type == H5Z_XFORM_MINUS)
         H5Z_XFORM_DO_OP4(H5Z_XFORM_MINUS)
-    else if(tree->type == H5Z_XFORM_DIVIDE)
+    else if (tree->type == H5Z_XFORM_DIVIDE)
         H5Z_XFORM_DO_OP4(H5Z_XFORM_DIVIDE)
 
     else
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Error in parse tree while trying to copy")
 
-
-
-            done:
-            FUNC_LEAVE_NOAPI(ret_value)
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_op_is_numbs
- * Purpose:     Internal function to facilitate the condition check in 
+ * Purpose:     Internal function to facilitate the condition check in
  *              H5Z_xform_reduce_tree to reduce the bulkiness of the code.
  * Return:      TRUE or FALSE
  * Programmer:  Raymond Lu
@@ -1298,7 +1277,7 @@ H5Z_xform_copy_tree(H5Z_node* tree, H5Z_datval_ptrs* dat_val_pointers, H5Z_datva
  *-------------------------------------------------------------------------
  */
 static hbool_t
-H5Z_op_is_numbs(H5Z_node* _tree)
+H5Z_op_is_numbs(H5Z_node *_tree)
 {
     hbool_t ret_value = FALSE;
 
@@ -1306,16 +1285,16 @@ H5Z_op_is_numbs(H5Z_node* _tree)
 
     HDassert(_tree);
 
-    if(((_tree->lchild->type == H5Z_XFORM_INTEGER) || (_tree->lchild->type == H5Z_XFORM_FLOAT)) && ((_tree->rchild->type == H5Z_XFORM_INTEGER) || (_tree->rchild->type == H5Z_XFORM_FLOAT)))
-      ret_value = TRUE;
+    if (((_tree->lchild->type == H5Z_XFORM_INTEGER) || (_tree->lchild->type == H5Z_XFORM_FLOAT)) &&
+        ((_tree->rchild->type == H5Z_XFORM_INTEGER) || (_tree->rchild->type == H5Z_XFORM_FLOAT)))
+        ret_value = TRUE;
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_op_is_numbs2
- * Purpose:     Internal function to facilitate the condition check in 
+ * Purpose:     Internal function to facilitate the condition check in
  *              H5Z_xform_reduce_tree to reduce the bulkiness of the code.
  *              The difference from H5Z_op_is_numbs is that the left child
  *              can be empty, like -x or +x.
@@ -1327,7 +1306,7 @@ H5Z_op_is_numbs(H5Z_node* _tree)
  *-------------------------------------------------------------------------
  */
 static hbool_t
-H5Z_op_is_numbs2(H5Z_node* _tree)
+H5Z_op_is_numbs2(H5Z_node *_tree)
 {
     hbool_t ret_value = FALSE;
 
@@ -1335,14 +1314,17 @@ H5Z_op_is_numbs2(H5Z_node* _tree)
 
     HDassert(_tree);
 
-    if((!_tree->lchild && ((_tree->rchild->type == H5Z_XFORM_INTEGER) || (_tree->rchild->type == H5Z_XFORM_FLOAT))) ||
-       ((_tree->lchild && ((_tree->lchild->type == H5Z_XFORM_INTEGER) || (_tree->lchild->type == H5Z_XFORM_FLOAT))) && (_tree->rchild && ((_tree->rchild->type == H5Z_XFORM_INTEGER) || (_tree->rchild->type == H5Z_XFORM_FLOAT)))))
-      ret_value = TRUE;
+    if ((!_tree->lchild &&
+         ((_tree->rchild->type == H5Z_XFORM_INTEGER) || (_tree->rchild->type == H5Z_XFORM_FLOAT))) ||
+        ((_tree->lchild &&
+          ((_tree->lchild->type == H5Z_XFORM_INTEGER) || (_tree->lchild->type == H5Z_XFORM_FLOAT))) &&
+         (_tree->rchild &&
+          ((_tree->rchild->type == H5Z_XFORM_INTEGER) || (_tree->rchild->type == H5Z_XFORM_FLOAT)))))
+        ret_value = TRUE;
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_xform_reduce_tree
  * Purpose:     Simplifies parse tree passed in by performing any obvious
@@ -1356,48 +1338,44 @@ H5Z_op_is_numbs2(H5Z_node* _tree)
  *-------------------------------------------------------------------------
  */
 static void
-H5Z_xform_reduce_tree(H5Z_node* tree)
+H5Z_xform_reduce_tree(H5Z_node *tree)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(tree) {
-        if((tree->type == H5Z_XFORM_DIVIDE) || (tree->type == H5Z_XFORM_MULT))
-        {
-            if(H5Z_op_is_numbs(tree))
+    if (tree) {
+        if ((tree->type == H5Z_XFORM_DIVIDE) || (tree->type == H5Z_XFORM_MULT)) {
+            if (H5Z_op_is_numbs(tree))
                 H5Z_do_op(tree);
-            else
-            {
+            else {
                 H5Z_xform_reduce_tree(tree->lchild);
-                if(H5Z_op_is_numbs(tree))
+                if (H5Z_op_is_numbs(tree))
                     H5Z_do_op(tree);
                 else {
                     H5Z_xform_reduce_tree(tree->rchild);
-                    if(H5Z_op_is_numbs(tree))
+                    if (H5Z_op_is_numbs(tree))
                         H5Z_do_op(tree);
                 }
             }
-        } else if((tree->type == H5Z_XFORM_PLUS) || (tree->type == H5Z_XFORM_MINUS)) {
-            if(H5Z_op_is_numbs2(tree))
+        }
+        else if ((tree->type == H5Z_XFORM_PLUS) || (tree->type == H5Z_XFORM_MINUS)) {
+            if (H5Z_op_is_numbs2(tree))
                 H5Z_do_op(tree);
-            else
-            {
+            else {
                 H5Z_xform_reduce_tree(tree->lchild);
-                if(H5Z_op_is_numbs2(tree))
+                if (H5Z_op_is_numbs2(tree))
                     H5Z_do_op(tree);
                 else {
                     H5Z_xform_reduce_tree(tree->rchild);
-                    if(H5Z_op_is_numbs2(tree))
+                    if (H5Z_op_is_numbs2(tree))
                         H5Z_do_op(tree);
                 }
             }
         }
-
     }
 
     FUNC_LEAVE_NOAPI_VOID;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Z_do_op
  * Purpose:     If the root of the tree passed in points to a simple
@@ -1417,23 +1395,22 @@ H5Z_xform_reduce_tree(H5Z_node* tree)
  *-------------------------------------------------------------------------
  */
 static void
-H5Z_do_op(H5Z_node* tree)
+H5Z_do_op(H5Z_node *tree)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(tree->type == H5Z_XFORM_DIVIDE)
-	H5Z_XFORM_DO_OP3(/)
-    else if(tree->type == H5Z_XFORM_MULT)
-	H5Z_XFORM_DO_OP3(*)
-    else if(tree->type == H5Z_XFORM_PLUS)
-	H5Z_XFORM_DO_OP6(+)
-    else if(tree->type == H5Z_XFORM_MINUS)
-	H5Z_XFORM_DO_OP6(-)
+    if (tree->type == H5Z_XFORM_DIVIDE)
+        H5Z_XFORM_DO_OP3(/)
+    else if (tree->type == H5Z_XFORM_MULT)
+        H5Z_XFORM_DO_OP3(*)
+    else if (tree->type == H5Z_XFORM_PLUS)
+        H5Z_XFORM_DO_OP6(+)
+    else if (tree->type == H5Z_XFORM_MINUS)
+        H5Z_XFORM_DO_OP6(-)
 
     FUNC_LEAVE_NOAPI_VOID;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: H5D_xform_create
  *
@@ -1456,75 +1433,80 @@ H5Z_do_op(H5Z_node* tree)
 H5Z_data_xform_t *
 H5Z_xform_create(const char *expr)
 {
-    H5Z_data_xform_t *data_xform_prop=NULL;
+    H5Z_data_xform_t *data_xform_prop = NULL;
     H5Z_data_xform_t *ret_value;
-    unsigned int i;
-    unsigned int count = 0;
+    unsigned int      i;
+    unsigned int      count = 0;
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(expr);
 
     /* Allocate space for the data transform information */
-    if(NULL == (data_xform_prop = (H5Z_data_xform_t *)H5MM_calloc(sizeof(H5Z_data_xform_t))))
+    if (NULL == (data_xform_prop = (H5Z_data_xform_t *)H5MM_calloc(sizeof(H5Z_data_xform_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate memory for data transform info")
 
-    if(NULL == (data_xform_prop->dat_val_pointers = (H5Z_datval_ptrs *)H5MM_malloc(sizeof(H5Z_datval_ptrs))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate memory for data transform array storage")
+    if (NULL == (data_xform_prop->dat_val_pointers = (H5Z_datval_ptrs *)H5MM_malloc(sizeof(H5Z_datval_ptrs))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "unable to allocate memory for data transform array storage")
 
     /* copy the user's string into the property */
-    if(NULL == (data_xform_prop->xform_exp = (char *)H5MM_xstrdup(expr)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate memory for data transform expression")
+    if (NULL == (data_xform_prop->xform_exp = (char *)H5MM_xstrdup(expr)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                    "unable to allocate memory for data transform expression")
 
-    /* Find the number of times "x" is used in this equation, and allocate room for storing that many points */
-    for(i = 0; i < HDstrlen(expr); i++)
-	if(HDisalpha(expr[i]))
-	    count++;
+    /* Find the number of times "x" is used in this equation, and allocate room for storing that many points
+     */
+    for (i = 0; i < HDstrlen(expr); i++)
+        if (HDisalpha(expr[i]))
+            count++;
 
     /* When there are no "x"'s in the equation (ie, simple transform case),
      * we don't need to allocate any space since no array will have to be
      * stored */
-    if(count > 0)
-	if(NULL == (data_xform_prop->dat_val_pointers->ptr_dat_val = (void **)H5MM_calloc(count * sizeof(void *))))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate memory for pointers in transform array")
+    if (count > 0)
+        if (NULL ==
+            (data_xform_prop->dat_val_pointers->ptr_dat_val = (void **)H5MM_calloc(count * sizeof(void *))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+                        "unable to allocate memory for pointers in transform array")
 
     /* Initialize the num_ptrs field, which will be used to keep track of the number of copies
      * of the data we have for polynomial transforms */
     data_xform_prop->dat_val_pointers->num_ptrs = 0;
 
-     /* we generate the parse tree right here and store a poitner to its root in the property. */
-    if((data_xform_prop->parse_root = (H5Z_node *)H5Z_xform_parse(expr, data_xform_prop->dat_val_pointers))==NULL)
+    /* we generate the parse tree right here and store a poitner to its root in the property. */
+    if ((data_xform_prop->parse_root =
+             (H5Z_node *)H5Z_xform_parse(expr, data_xform_prop->dat_val_pointers)) == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to generate parse tree from expression")
 
     /* Sanity check
      * count should be the same num_ptrs */
-    if(count != data_xform_prop->dat_val_pointers->num_ptrs)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "error copying the parse tree, did not find correct number of \"variables\"")
+    if (count != data_xform_prop->dat_val_pointers->num_ptrs)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL,
+                    "error copying the parse tree, did not find correct number of \"variables\"")
 
     /* Assign return value */
-    ret_value=data_xform_prop;
-
+    ret_value = data_xform_prop;
 
 done:
     /* Clean up on error */
-    if(ret_value==NULL) {
-        if(data_xform_prop) {
-            if(data_xform_prop->parse_root)
+    if (ret_value == NULL) {
+        if (data_xform_prop) {
+            if (data_xform_prop->parse_root)
                 H5Z_xform_destroy_parse_tree(data_xform_prop->parse_root);
-            if(data_xform_prop->xform_exp)
+            if (data_xform_prop->xform_exp)
                 H5MM_xfree(data_xform_prop->xform_exp);
-	    if(count > 0 && data_xform_prop->dat_val_pointers->ptr_dat_val)
-		H5MM_xfree(data_xform_prop->dat_val_pointers->ptr_dat_val);
-	    if(data_xform_prop->dat_val_pointers)
-		H5MM_xfree(data_xform_prop->dat_val_pointers);
+            if (count > 0 && data_xform_prop->dat_val_pointers->ptr_dat_val)
+                H5MM_xfree(data_xform_prop->dat_val_pointers->ptr_dat_val);
+            if (data_xform_prop->dat_val_pointers)
+                H5MM_xfree(data_xform_prop->dat_val_pointers);
             H5MM_xfree(data_xform_prop);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5Z_xform_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_xform_destroy
  *
@@ -1549,19 +1531,19 @@ H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(data_xform_prop) {
-	/* Destroy the parse tree */
+    if (data_xform_prop) {
+        /* Destroy the parse tree */
         H5Z_xform_destroy_parse_tree(data_xform_prop->parse_root);
 
         /* Free the expression */
         H5MM_xfree(data_xform_prop->xform_exp);
 
-	/* Free the pointers to the temp. arrays, if there are any */
-	if(data_xform_prop->dat_val_pointers->num_ptrs > 0)
-	    H5MM_xfree(data_xform_prop->dat_val_pointers->ptr_dat_val);
+        /* Free the pointers to the temp. arrays, if there are any */
+        if (data_xform_prop->dat_val_pointers->num_ptrs > 0)
+            H5MM_xfree(data_xform_prop->dat_val_pointers->ptr_dat_val);
 
-	/* Free the data storage struct */
-	H5MM_xfree(data_xform_prop->dat_val_pointers);
+        /* Free the data storage struct */
+        H5MM_xfree(data_xform_prop->dat_val_pointers);
 
         /* Free the node */
         H5MM_xfree(data_xform_prop);
@@ -1570,7 +1552,6 @@ H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5Z_xform_destroy() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_xform_copy
  *
@@ -1595,66 +1576,75 @@ H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop)
 herr_t
 H5Z_xform_copy(H5Z_data_xform_t **data_xform_prop)
 {
-    unsigned int i;
-    unsigned int count = 0;
-    H5Z_data_xform_t *new_data_xform_prop=NULL;
-    herr_t ret_value=SUCCEED;
+    unsigned int      i;
+    unsigned int      count               = 0;
+    H5Z_data_xform_t *new_data_xform_prop = NULL;
+    herr_t            ret_value           = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(*data_xform_prop) {
+    if (*data_xform_prop) {
         /* Allocate new node */
-        if(NULL == (new_data_xform_prop = (H5Z_data_xform_t *)H5MM_calloc(sizeof(H5Z_data_xform_t))))
+        if (NULL == (new_data_xform_prop = (H5Z_data_xform_t *)H5MM_calloc(sizeof(H5Z_data_xform_t))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory for data transform info")
 
         /* Copy string */
-        if(NULL == (new_data_xform_prop->xform_exp = (char *)H5MM_xstrdup((*data_xform_prop)->xform_exp)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory for data transform expression")
-
-	if(NULL == (new_data_xform_prop->dat_val_pointers = (H5Z_datval_ptrs *)H5MM_malloc(sizeof(H5Z_datval_ptrs))))
-	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory for data transform array storage")
-
-	/* Find the number of times "x" is used in this equation, and allocate room for storing that many points */
-	for(i = 0; i < HDstrlen(new_data_xform_prop->xform_exp); i++)
-	    if(HDisalpha(new_data_xform_prop->xform_exp[i]))
-		count++;
-
-	if(count > 0)
-	    if(NULL == (new_data_xform_prop->dat_val_pointers->ptr_dat_val = (void **)H5MM_calloc(count * sizeof(void *))))
-		HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory for pointers in transform array")
-
-	/* Zero out num_pointers prior to H5Z_xform_cop_tree call; that call will increment it to the right amount */
-	new_data_xform_prop->dat_val_pointers->num_ptrs = 0;
+        if (NULL == (new_data_xform_prop->xform_exp = (char *)H5MM_xstrdup((*data_xform_prop)->xform_exp)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                        "unable to allocate memory for data transform expression")
+
+        if (NULL ==
+            (new_data_xform_prop->dat_val_pointers = (H5Z_datval_ptrs *)H5MM_malloc(sizeof(H5Z_datval_ptrs))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                        "unable to allocate memory for data transform array storage")
+
+        /* Find the number of times "x" is used in this equation, and allocate room for storing that many
+         * points */
+        for (i = 0; i < HDstrlen(new_data_xform_prop->xform_exp); i++)
+            if (HDisalpha(new_data_xform_prop->xform_exp[i]))
+                count++;
+
+        if (count > 0)
+            if (NULL == (new_data_xform_prop->dat_val_pointers->ptr_dat_val =
+                             (void **)H5MM_calloc(count * sizeof(void *))))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+                            "unable to allocate memory for pointers in transform array")
+
+        /* Zero out num_pointers prior to H5Z_xform_cop_tree call; that call will increment it to the right
+         * amount */
+        new_data_xform_prop->dat_val_pointers->num_ptrs = 0;
 
         /* Copy parse tree */
-        if((new_data_xform_prop->parse_root = (H5Z_node*)H5Z_xform_copy_tree((*data_xform_prop)->parse_root, (*data_xform_prop)->dat_val_pointers, new_data_xform_prop->dat_val_pointers)) == NULL)
+        if ((new_data_xform_prop->parse_root = (H5Z_node *)H5Z_xform_copy_tree(
+                 (*data_xform_prop)->parse_root, (*data_xform_prop)->dat_val_pointers,
+                 new_data_xform_prop->dat_val_pointers)) == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "error copying the parse tree")
 
-	/* Sanity check
-	 * count should be the same num_ptrs */
-	if(count != new_data_xform_prop->dat_val_pointers->num_ptrs)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "error copying the parse tree, did not find correct number of \"variables\"")
+        /* Sanity check
+         * count should be the same num_ptrs */
+        if (count != new_data_xform_prop->dat_val_pointers->num_ptrs)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
+                        "error copying the parse tree, did not find correct number of \"variables\"")
 
         /* Copy new information on top of old information */
-        *data_xform_prop=new_data_xform_prop;
+        *data_xform_prop = new_data_xform_prop;
     } /* end if */
 
 done:
     /* Clean up on error */
-    if(ret_value<0) {
-        if(new_data_xform_prop) {
-            if(new_data_xform_prop->parse_root)
+    if (ret_value < 0) {
+        if (new_data_xform_prop) {
+            if (new_data_xform_prop->parse_root)
                 H5Z_xform_destroy_parse_tree(new_data_xform_prop->parse_root);
-            if(new_data_xform_prop->xform_exp)
+            if (new_data_xform_prop->xform_exp)
                 H5MM_xfree(new_data_xform_prop->xform_exp);
             H5MM_xfree(new_data_xform_prop);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5Z_xform_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_xform_noop
  *
@@ -1679,12 +1669,11 @@ H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    ret_value=(data_xform_prop ? FALSE : TRUE);
+    ret_value = (data_xform_prop ? FALSE : TRUE);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5Z_xform_noop() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Z_xform_extract_xform_str
  *
@@ -1713,4 +1702,3 @@ H5Z_xform_extract_xform_str(const H5Z_data_xform_t *data_xform_prop)
 
     FUNC_LEAVE_NOAPI(data_xform_prop->xform_exp)
 } /* H5Z_xform_extract_xform_str() */
-
diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h
index 76f8d85..6328244 100644
--- a/src/H5api_adpt.h
+++ b/src/H5api_adpt.h
@@ -27,18 +27,18 @@
  * attributes we use.
  */
 #ifdef __cplusplus
-#   define H5_ATTR_FORMAT(X,Y,Z)  /*void*/
-#   define H5_ATTR_UNUSED    /*void*/
-#   define H5_ATTR_NORETURN  /*void*/
-#else /* __cplusplus */
+#define H5_ATTR_FORMAT(X, Y, Z) /*void*/
+#define H5_ATTR_UNUSED          /*void*/
+#define H5_ATTR_NORETURN        /*void*/
+#else                           /* __cplusplus */
 #if defined(H5_HAVE_ATTRIBUTE) && !defined(__SUNPRO_C)
-#   define H5_ATTR_FORMAT(X,Y,Z)  __attribute__((format(X, Y, Z)))
-#   define H5_ATTR_UNUSED    __attribute__((unused))
-#   define H5_ATTR_NORETURN  __attribute__((noreturn))
+#define H5_ATTR_FORMAT(X, Y, Z) __attribute__((format(X, Y, Z)))
+#define H5_ATTR_UNUSED          __attribute__((unused))
+#define H5_ATTR_NORETURN        __attribute__((noreturn))
 #else
-#   define H5_ATTR_FORMAT(X,Y,Z)  /*void*/
-#   define H5_ATTR_UNUSED    /*void*/
-#   define H5_ATTR_NORETURN  /*void*/
+#define H5_ATTR_FORMAT(X, Y, Z) /*void*/
+#define H5_ATTR_UNUSED          /*void*/
+#define H5_ATTR_NORETURN        /*void*/
 #endif
 #endif /* __cplusplus */
 
@@ -46,231 +46,231 @@
 #ifdef H5_BUILT_AS_DYNAMIC_LIB
 
 #if defined(hdf5_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_DLL __declspec(dllexport)
-    #define H5_DLLVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_DLL __attribute__ ((visibility("default")))
-    #define H5_DLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_DLL    __declspec(dllexport)
+#define H5_DLLVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_DLL    __attribute__((visibility("default")))
+#define H5_DLLVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_DLL __declspec(dllimport)
-    #define H5_DLLVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_DLL __attribute__ ((visibility("default")))
-    #define H5_DLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_DLL    __declspec(dllimport)
+#define H5_DLLVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_DLL    __attribute__((visibility("default")))
+#define H5_DLLVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef H5_DLL
-  #define H5_DLL
-  #define H5_DLLVAR extern
+#define H5_DLL
+#define H5_DLLVAR extern
 #endif /* _HDF5DLL_ */
 
 #if defined(hdf5_test_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5TEST_DLL __declspec(dllexport)
-    #define H5TEST_DLLVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5TEST_DLL __attribute__ ((visibility("default")))
-    #define H5TEST_DLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5TEST_DLL    __declspec(dllexport)
+#define H5TEST_DLLVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5TEST_DLL    __attribute__((visibility("default")))
+#define H5TEST_DLLVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5TEST_DLL __declspec(dllimport)
-    #define H5TEST_DLLVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5TEST_DLL __attribute__ ((visibility("default")))
-    #define H5TEST_DLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5TEST_DLL    __declspec(dllimport)
+#define H5TEST_DLLVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5TEST_DLL    __attribute__((visibility("default")))
+#define H5TEST_DLLVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef H5TEST_DLL
-  #define H5TEST_DLL
-  #define H5TEST_DLLVAR extern
+#define H5TEST_DLL
+#define H5TEST_DLLVAR extern
 #endif /* H5TEST_DLL */
 
 #if defined(hdf5_tools_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5TOOLS_DLL __declspec(dllexport)
-    #define H5TOOLS_DLLVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5TOOLS_DLL __attribute__ ((visibility("default")))
-    #define H5TOOLS_DLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5TOOLS_DLL    __declspec(dllexport)
+#define H5TOOLS_DLLVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5TOOLS_DLL    __attribute__((visibility("default")))
+#define H5TOOLS_DLLVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5TOOLS_DLL __declspec(dllimport)
-    #define H5TOOLS_DLLVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5TOOLS_DLL __attribute__ ((visibility("default")))
-    #define H5TOOLS_DLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5TOOLS_DLL    __declspec(dllimport)
+#define H5TOOLS_DLLVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5TOOLS_DLL    __attribute__((visibility("default")))
+#define H5TOOLS_DLLVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef H5TOOLS_DLL
-  #define H5TOOLS_DLL
-  #define H5TOOLS_DLLVAR extern
+#define H5TOOLS_DLL
+#define H5TOOLS_DLLVAR extern
 #endif /* H5TOOLS_DLL */
 
 #if defined(hdf5_cpp_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_DLLCPP __declspec(dllexport)
-    #define H5_DLLCPPVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_DLLCPP __attribute__ ((visibility("default")))
-    #define H5_DLLCPPVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_DLLCPP    __declspec(dllexport)
+#define H5_DLLCPPVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_DLLCPP    __attribute__((visibility("default")))
+#define H5_DLLCPPVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_DLLCPP __declspec(dllimport)
-    #define H5_DLLCPPVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_DLLCPP __attribute__ ((visibility("default")))
-    #define H5_DLLCPPVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_DLLCPP    __declspec(dllimport)
+#define H5_DLLCPPVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_DLLCPP    __attribute__((visibility("default")))
+#define H5_DLLCPPVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef H5_DLLCPP
-  #define H5_DLLCPP
-  #define H5_DLLCPPVAR extern
+#define H5_DLLCPP
+#define H5_DLLCPPVAR extern
 #endif /* H5_DLLCPP */
 
 #if defined(hdf5_hl_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_HLDLL __declspec(dllexport)
-    #define H5_HLDLLVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_HLDLL __attribute__ ((visibility("default")))
-    #define H5_HLDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_HLDLL    __declspec(dllexport)
+#define H5_HLDLLVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_HLDLL    __attribute__((visibility("default")))
+#define H5_HLDLLVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_HLDLL __declspec(dllimport)
-    #define H5_HLDLLVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_HLDLL __attribute__ ((visibility("default")))
-    #define H5_HLDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_HLDLL    __declspec(dllimport)
+#define H5_HLDLLVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_HLDLL    __attribute__((visibility("default")))
+#define H5_HLDLLVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef H5_HLDLL
-  #define H5_HLDLL
-  #define H5_HLDLLVAR extern
+#define H5_HLDLL
+#define H5_HLDLLVAR extern
 #endif /* H5_HLDLL */
 
 #if defined(hdf5_hl_cpp_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_HLCPPDLL __declspec(dllexport)
-    #define H5_HLCPPDLLVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_HLCPPDLL __attribute__ ((visibility("default")))
-    #define H5_HLCPPDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_HLCPPDLL    __declspec(dllexport)
+#define H5_HLCPPDLLVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_HLCPPDLL    __attribute__((visibility("default")))
+#define H5_HLCPPDLLVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_HLCPPDLL __declspec(dllimport)
-    #define H5_HLCPPDLLVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_HLCPPDLL __attribute__ ((visibility("default")))
-    #define H5_HLCPPDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_HLCPPDLL    __declspec(dllimport)
+#define H5_HLCPPDLLVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_HLCPPDLL    __attribute__((visibility("default")))
+#define H5_HLCPPDLLVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef H5_HLCPPDLL
-  #define H5_HLCPPDLL
-  #define H5_HLCPPDLLVAR extern
+#define H5_HLCPPDLL
+#define H5_HLCPPDLLVAR extern
 #endif /* H5_HLCPPDLL */
 
 #if defined(hdf5_f90cstub_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_FCDLL __declspec(dllexport)
-    #define H5_FCDLLVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_FCDLL __attribute__ ((visibility("default")))
-    #define H5_FCDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_FCDLL    __declspec(dllexport)
+#define H5_FCDLLVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_FCDLL    __attribute__((visibility("default")))
+#define H5_FCDLLVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_FCDLL __declspec(dllimport)
-    #define H5_FCDLLVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_FCDLL __attribute__ ((visibility("default")))
-    #define H5_FCDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_FCDLL    __declspec(dllimport)
+#define H5_FCDLLVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_FCDLL    __attribute__((visibility("default")))
+#define H5_FCDLLVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef H5_FCDLL
-  #define H5_FCDLL
-  #define H5_FCDLLVAR extern
+#define H5_FCDLL
+#define H5_FCDLLVAR extern
 #endif /* H5_FCDLL */
 
 #if defined(hdf5_test_f90cstub_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_FCTESTDLL __declspec(dllexport)
-    #define H5_FCTESTDLLVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_FCTESTDLL __attribute__ ((visibility("default")))
-    #define H5_FCTESTDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_FCTESTDLL    __declspec(dllexport)
+#define H5_FCTESTDLLVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_FCTESTDLL    __attribute__((visibility("default")))
+#define H5_FCTESTDLLVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define H5_FCTESTDLL __declspec(dllimport)
-    #define H5_FCTESTDLLVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define H5_FCTESTDLL __attribute__ ((visibility("default")))
-    #define H5_FCTESTDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define H5_FCTESTDLL    __declspec(dllimport)
+#define H5_FCTESTDLLVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define H5_FCTESTDLL    __attribute__((visibility("default")))
+#define H5_FCTESTDLLVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef H5_FCTESTDLL
-  #define H5_FCTESTDLL
-  #define H5_FCTESTDLLVAR extern
+#define H5_FCTESTDLL
+#define H5_FCTESTDLLVAR extern
 #endif /* H5_FCTESTDLL */
 
 #if defined(hdf5_hl_f90cstub_shared_EXPORTS)
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define HDF5_HL_F90CSTUBDLL __declspec(dllexport)
-    #define HDF5_HL_F90CSTUBDLLVAR extern __declspec(dllexport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define HDF5_HL_F90CSTUBDLL __attribute__ ((visibility("default")))
-    #define HDF5_HL_F90CSTUBDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define HDF5_HL_F90CSTUBDLL    __declspec(dllexport)
+#define HDF5_HL_F90CSTUBDLLVAR extern __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define HDF5_HL_F90CSTUBDLL    __attribute__((visibility("default")))
+#define HDF5_HL_F90CSTUBDLLVAR extern __attribute__((visibility("default")))
+#endif
 #else
-  #if defined (_MSC_VER)  /* MSVC Compiler Case */
-    #define HDF5_HL_F90CSTUBDLL __declspec(dllimport)
-    #define HDF5_HL_F90CSTUBDLLVAR __declspec(dllimport)
-  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-    #define HDF5_HL_F90CSTUBDLL __attribute__ ((visibility("default")))
-    #define HDF5_HL_F90CSTUBDLLVAR extern __attribute__ ((visibility("default")))
-  #endif
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define HDF5_HL_F90CSTUBDLL    __declspec(dllimport)
+#define HDF5_HL_F90CSTUBDLLVAR __declspec(dllimport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define HDF5_HL_F90CSTUBDLL    __attribute__((visibility("default")))
+#define HDF5_HL_F90CSTUBDLLVAR extern __attribute__((visibility("default")))
+#endif
 #endif
 
 #ifndef HDF5_HL_F90CSTUBDLL
-  #define HDF5_HL_F90CSTUBDLL
-  #define HDF5_HL_F90CSTUBDLLVAR extern
+#define HDF5_HL_F90CSTUBDLL
+#define HDF5_HL_F90CSTUBDLLVAR extern
 #endif /* HDF5_HL_F90CSTUBDLL */
 
 #else
-  #define H5_DLL
-  #define H5_DLLVAR extern
-  #define H5TEST_DLL
-  #define H5TEST_DLLVAR extern
-  #define H5TOOLS_DLL
-  #define H5TOOLS_DLLVAR extern
-  #define H5_DLLCPP
-  #define H5_DLLCPPVAR extern
-  #define H5_HLDLL
-  #define H5_HLDLLVAR extern
-  #define H5_HLCPPDLL
-  #define H5_HLCPPDLLVAR extern
-  #define H5_FCDLL
-  #define H5_FCDLLVAR extern
-  #define H5_FCTESTDLL
-  #define H5_FCTESTDLLVAR extern
-  #define HDF5_HL_F90CSTUBDLL
-  #define HDF5_HL_F90CSTUBDLLVAR extern
+#define H5_DLL
+#define H5_DLLVAR extern
+#define H5TEST_DLL
+#define H5TEST_DLLVAR extern
+#define H5TOOLS_DLL
+#define H5TOOLS_DLLVAR extern
+#define H5_DLLCPP
+#define H5_DLLCPPVAR extern
+#define H5_HLDLL
+#define H5_HLDLLVAR extern
+#define H5_HLCPPDLL
+#define H5_HLCPPDLLVAR extern
+#define H5_FCDLL
+#define H5_FCDLLVAR extern
+#define H5_FCTESTDLL
+#define H5_FCTESTDLLVAR extern
+#define HDF5_HL_F90CSTUBDLL
+#define HDF5_HL_F90CSTUBDLLVAR extern
 #endif /* H5_BUILT_AS_DYNAMIC_LIB */
 
 #endif /* H5API_ADPT_H */
diff --git a/src/H5checksum.c b/src/H5checksum.c
index 64d527e..04c76e5 100644
--- a/src/H5checksum.c
+++ b/src/H5checksum.c
@@ -26,12 +26,10 @@
 /* Module Setup */
 /****************/
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-
+#include "H5private.h" /* Generic Functions			*/
 
 /****************/
 /* Local Macros */
@@ -41,32 +39,26 @@
 /* (same as the IEEE 802.3 (Ethernet) quotient) */
 #define H5_CRC_QUOTIENT 0x04C11DB7
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -77,8 +69,6 @@ static uint32_t H5_crc_table[256];
 /* Flag: has the table been computed? */
 static hbool_t H5_crc_table_computed = FALSE;
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5_checksum_fletcher32
  *
@@ -109,9 +99,9 @@ static hbool_t H5_crc_table_computed = FALSE;
 uint32_t
 H5_checksum_fletcher32(const void *_data, size_t _len)
 {
-    const uint8_t *data = (const uint8_t *)_data;  /* Pointer to the data to be summed */
-    size_t len = _len / 2;      /* Length in 16-bit words */
-    uint32_t sum1 = 0, sum2 = 0;
+    const uint8_t *data = (const uint8_t *)_data; /* Pointer to the data to be summed */
+    size_t         len  = _len / 2;               /* Length in 16-bit words */
+    uint32_t       sum1 = 0, sum2 = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -136,7 +126,7 @@ H5_checksum_fletcher32(const void *_data, size_t _len)
     }
 
     /* Check for odd # of bytes */
-    if(_len % 2) {
+    if (_len % 2) {
         sum1 += (uint32_t)(((uint16_t)*data) << 8);
         sum2 += sum1;
         sum1 = (sum1 & 0xffff) + (sum1 >> 16);
@@ -150,7 +140,6 @@ H5_checksum_fletcher32(const void *_data, size_t _len)
     FUNC_LEAVE_NOAPI((sum2 << 16) | sum1)
 } /* end H5_checksum_fletcher32() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_checksum_crc_make_table
  *
@@ -166,16 +155,16 @@ H5_checksum_fletcher32(const void *_data, size_t _len)
 static void
 H5_checksum_crc_make_table(void)
 {
-    uint32_t c;         /* Checksum for each byte value */
-    unsigned n, k;      /* Local index variables */
+    uint32_t c;    /* Checksum for each byte value */
+    unsigned n, k; /* Local index variables */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Compute the checksum for each possible byte value */
-    for(n = 0; n < 256; n++) {
-        c = (uint32_t) n;
-        for(k = 0; k < 8; k++)
-            if(c & 1)
+    for (n = 0; n < 256; n++) {
+        c = (uint32_t)n;
+        for (k = 0; k < 8; k++)
+            if (c & 1)
                 c = H5_CRC_QUOTIENT ^ (c >> 1);
             else
                 c = c >> 1;
@@ -186,7 +175,6 @@ H5_checksum_crc_make_table(void)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5_checksum_crc_make_table() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_checksum_crc_make_table
  *
@@ -205,22 +193,21 @@ H5_checksum_crc_make_table(void)
 static uint32_t
 H5_checksum_crc_update(uint32_t crc, const uint8_t *buf, size_t len)
 {
-    size_t n;           /* Local index variable */
+    size_t n; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Initialize the CRC table if necessary */
-    if(!H5_crc_table_computed)
+    if (!H5_crc_table_computed)
         H5_checksum_crc_make_table();
 
     /* Update the CRC with the results from this buffer */
-    for(n = 0; n < len; n++)
+    for (n = 0; n < len; n++)
         crc = H5_crc_table[(crc ^ buf[n]) & 0xff] ^ (crc >> 8);
 
     FUNC_LEAVE_NOAPI(crc)
 } /* end H5_checksum_crc_update() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_checksum_crc
  *
@@ -294,16 +281,28 @@ on, and rotates are much kinder to the top and bottom bits, so I used
 rotates.
 -------------------------------------------------------------------------------
 */
-#define H5_lookup3_rot(x,k) (((x)<<(k)) ^ ((x)>>(32-(k))))
-#define H5_lookup3_mix(a,b,c) \
-{ \
-  a -= c;  a ^= H5_lookup3_rot(c, 4);  c += b; \
-  b -= a;  b ^= H5_lookup3_rot(a, 6);  a += c; \
-  c -= b;  c ^= H5_lookup3_rot(b, 8);  b += a; \
-  a -= c;  a ^= H5_lookup3_rot(c,16);  c += b; \
-  b -= a;  b ^= H5_lookup3_rot(a,19);  a += c; \
-  c -= b;  c ^= H5_lookup3_rot(b, 4);  b += a; \
-}
+#define H5_lookup3_rot(x, k) (((x) << (k)) ^ ((x) >> (32 - (k))))
+#define H5_lookup3_mix(a, b, c)                                                                              \
+    {                                                                                                        \
+        a -= c;                                                                                              \
+        a ^= H5_lookup3_rot(c, 4);                                                                           \
+        c += b;                                                                                              \
+        b -= a;                                                                                              \
+        b ^= H5_lookup3_rot(a, 6);                                                                           \
+        a += c;                                                                                              \
+        c -= b;                                                                                              \
+        c ^= H5_lookup3_rot(b, 8);                                                                           \
+        b += a;                                                                                              \
+        a -= c;                                                                                              \
+        a ^= H5_lookup3_rot(c, 16);                                                                          \
+        c += b;                                                                                              \
+        b -= a;                                                                                              \
+        b ^= H5_lookup3_rot(a, 19);                                                                          \
+        a += c;                                                                                              \
+        c -= b;                                                                                              \
+        c ^= H5_lookup3_rot(b, 4);                                                                           \
+        b += a;                                                                                              \
+    }
 
 /*
 -------------------------------------------------------------------------------
@@ -330,16 +329,23 @@ and these came close:
  11  8 15 26 3 22 24
 -------------------------------------------------------------------------------
 */
-#define H5_lookup3_final(a,b,c) \
-{ \
-  c ^= b; c -= H5_lookup3_rot(b,14); \
-  a ^= c; a -= H5_lookup3_rot(c,11); \
-  b ^= a; b -= H5_lookup3_rot(a,25); \
-  c ^= b; c -= H5_lookup3_rot(b,16); \
-  a ^= c; a -= H5_lookup3_rot(c,4);  \
-  b ^= a; b -= H5_lookup3_rot(a,14); \
-  c ^= b; c -= H5_lookup3_rot(b,24); \
-}
+#define H5_lookup3_final(a, b, c)                                                                            \
+    {                                                                                                        \
+        c ^= b;                                                                                              \
+        c -= H5_lookup3_rot(b, 14);                                                                          \
+        a ^= c;                                                                                              \
+        a -= H5_lookup3_rot(c, 11);                                                                          \
+        b ^= a;                                                                                              \
+        b -= H5_lookup3_rot(a, 25);                                                                          \
+        c ^= b;                                                                                              \
+        c -= H5_lookup3_rot(b, 16);                                                                          \
+        a ^= c;                                                                                              \
+        a -= H5_lookup3_rot(c, 4);                                                                           \
+        b ^= a;                                                                                              \
+        b -= H5_lookup3_rot(a, 14);                                                                          \
+        c ^= b;                                                                                              \
+        c -= H5_lookup3_rot(b, 24);                                                                          \
+    }
 
 /*
 -------------------------------------------------------------------------------
@@ -372,7 +378,7 @@ uint32_t
 H5_checksum_lookup3(const void *key, size_t length, uint32_t initval)
 {
     const uint8_t *k = (const uint8_t *)key;
-    uint32_t a, b, c;           /* internal state */
+    uint32_t       a, b, c; /* internal state */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -384,42 +390,54 @@ H5_checksum_lookup3(const void *key, size_t length, uint32_t initval)
     a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
 
     /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((uint32_t)k[1])<<8;
-      a += ((uint32_t)k[2])<<16;
-      a += ((uint32_t)k[3])<<24;
-      b += k[4];
-      b += ((uint32_t)k[5])<<8;
-      b += ((uint32_t)k[6])<<16;
-      b += ((uint32_t)k[7])<<24;
-      c += k[8];
-      c += ((uint32_t)k[9])<<8;
-      c += ((uint32_t)k[10])<<16;
-      c += ((uint32_t)k[11])<<24;
-      H5_lookup3_mix(a, b, c);
-      length -= 12;
-      k += 12;
+    while (length > 12) {
+        a += k[0];
+        a += ((uint32_t)k[1]) << 8;
+        a += ((uint32_t)k[2]) << 16;
+        a += ((uint32_t)k[3]) << 24;
+        b += k[4];
+        b += ((uint32_t)k[5]) << 8;
+        b += ((uint32_t)k[6]) << 16;
+        b += ((uint32_t)k[7]) << 24;
+        c += k[8];
+        c += ((uint32_t)k[9]) << 8;
+        c += ((uint32_t)k[10]) << 16;
+        c += ((uint32_t)k[11]) << 24;
+        H5_lookup3_mix(a, b, c);
+        length -= 12;
+        k += 12;
     }
 
     /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
+    switch (length) /* all the case statements fall through */
     {
-        case 12: c+=((uint32_t)k[11])<<24;
-        case 11: c+=((uint32_t)k[10])<<16;
-        case 10: c+=((uint32_t)k[9])<<8;
-        case 9 : c+=k[8];
-        case 8 : b+=((uint32_t)k[7])<<24;
-        case 7 : b+=((uint32_t)k[6])<<16;
-        case 6 : b+=((uint32_t)k[5])<<8;
-        case 5 : b+=k[4];
-        case 4 : a+=((uint32_t)k[3])<<24;
-        case 3 : a+=((uint32_t)k[2])<<16;
-        case 2 : a+=((uint32_t)k[1])<<8;
-        case 1 : a+=k[0];
-                 break;
-        case 0 : goto done;
+        case 12:
+            c += ((uint32_t)k[11]) << 24;
+        case 11:
+            c += ((uint32_t)k[10]) << 16;
+        case 10:
+            c += ((uint32_t)k[9]) << 8;
+        case 9:
+            c += k[8];
+        case 8:
+            b += ((uint32_t)k[7]) << 24;
+        case 7:
+            b += ((uint32_t)k[6]) << 16;
+        case 6:
+            b += ((uint32_t)k[5]) << 8;
+        case 5:
+            b += k[4];
+        case 4:
+            a += ((uint32_t)k[3]) << 24;
+        case 3:
+            a += ((uint32_t)k[2]) << 16;
+        case 2:
+            a += ((uint32_t)k[1]) << 8;
+        case 1:
+            a += k[0];
+            break;
+        case 0:
+            goto done;
         default:
             HDassert(0 && "This Should never be executed!");
     }
@@ -430,7 +448,6 @@ done:
     FUNC_LEAVE_NOAPI(c)
 } /* end H5_checksum_lookup3() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_checksum_metadata
  *
@@ -459,7 +476,6 @@ H5_checksum_metadata(const void *data, size_t len, uint32_t initval)
     FUNC_LEAVE_NOAPI(H5_checksum_lookup3(data, len, initval))
 } /* end H5_checksum_metadata() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_hash_string
  *
@@ -479,16 +495,15 @@ uint32_t
 H5_hash_string(const char *str)
 {
     uint32_t hash = 5381;
-    int c;
+    int      c;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Sanity check */
     HDassert(str);
 
-    while((c = *str++))
+    while ((c = *str++))
         hash = ((hash << 5) + hash) + (uint32_t)c; /* hash * 33 + c */
 
     FUNC_LEAVE_NOAPI(hash)
 } /* end H5_hash_string() */
-
diff --git a/src/H5dbg.c b/src/H5dbg.c
index 4939bca..e0b2b74 100644
--- a/src/H5dbg.c
+++ b/src/H5dbg.c
@@ -29,39 +29,32 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
+#include "H5private.h" /* Generic Functions			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5_buffer_dump
  *
@@ -76,10 +69,10 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf,
-    const uint8_t *marker, size_t buf_offset, size_t buf_size)
+H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf, const uint8_t *marker, size_t buf_offset,
+               size_t buf_size)
 {
-    size_t	u, v;                   /* Local index variable */
+    size_t u, v; /* Local index variable */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -95,50 +88,48 @@ H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf,
     /*
      * Print the buffer in a VMS-style octal dump.
      */
-    HDfprintf(stream, "%*sData follows (`__' indicates free region)...\n",
-	    indent, "");
-    for(u = 0; u < buf_size; u += 16) {
-        uint8_t		c;
+    HDfprintf(stream, "%*sData follows (`__' indicates free region)...\n", indent, "");
+    for (u = 0; u < buf_size; u += 16) {
+        uint8_t c;
 
-	HDfprintf(stream, "%*s %8d: ", indent, "", u + buf_offset);
+        HDfprintf(stream, "%*s %8d: ", indent, "", u + buf_offset);
 
         /* Print the hex values */
-	for(v = 0; v < 16; v++) {
-	    if(u + v < buf_size) {
-		if(marker[u + v])
-		    HDfprintf(stream, "__ ");
-		else {
-		    c = buf[buf_offset + u + v];
-		    HDfprintf(stream, "%02x ", c);
-		} /* end else */
-	    } /* end if */
+        for (v = 0; v < 16; v++) {
+            if (u + v < buf_size) {
+                if (marker[u + v])
+                    HDfprintf(stream, "__ ");
+                else {
+                    c = buf[buf_offset + u + v];
+                    HDfprintf(stream, "%02x ", c);
+                } /* end else */
+            }     /* end if */
             else
-		HDfprintf(stream, "   ");
-	    if(7 == v)
-		HDfputc(' ', stream);
-	} /* end for */
+                HDfprintf(stream, "   ");
+            if (7 == v)
+                HDfputc(' ', stream);
+        } /* end for */
         HDfputc(' ', stream);
 
         /* Print the character values */
-	for(v = 0; v < 16; v++) {
-	    if(u + v < buf_size) {
-		if(marker[u + v])
-		    HDfputc(' ', stream);
-		else {
-		    c = buf[buf_offset + u + v];
-		    if(HDisprint(c))
-			HDfputc(c, stream);
-		    else
-			HDfputc('.', stream);
-		} /* end else */
-	    } /* end if */
-	    if(7 == v)
-		HDfputc(' ', stream);
-	} /* end for */
-
-	HDfputc('\n', stream);
+        for (v = 0; v < 16; v++) {
+            if (u + v < buf_size) {
+                if (marker[u + v])
+                    HDfputc(' ', stream);
+                else {
+                    c = buf[buf_offset + u + v];
+                    if (HDisprint(c))
+                        HDfputc(c, stream);
+                    else
+                        HDfputc('.', stream);
+                } /* end else */
+            }     /* end if */
+            if (7 == v)
+                HDfputc(' ', stream);
+        } /* end for */
+
+        HDfputc('\n', stream);
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5_buffer_dump() */
-
diff --git a/src/H5detect.c b/src/H5detect.c
index de82839..5227811 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -55,13 +55,13 @@ static const char *FileHeader = "\n\
 H5_GCC_DIAG_OFF("cast-align")
 
 #if defined(__has_attribute)
-# if __has_attribute(no_sanitize_address)
-#  define HDF_NO_UBSAN __attribute__((no_sanitize_address))
-# else
-#  define HDF_NO_UBSAN
-# endif
+#if __has_attribute(no_sanitize_address)
+#define HDF_NO_UBSAN __attribute__((no_sanitize_address))
 #else
-# define HDF_NO_UBSAN
+#define HDF_NO_UBSAN
+#endif
+#else
+#define HDF_NO_UBSAN
 #endif
 
 #define MAXDETECT 64
@@ -76,80 +76,79 @@ H5_GCC_DIAG_OFF("cast-align")
 /* supported. */
 #if defined(H5_HAVE_SIGSETJMP) && defined(H5_HAVE_SIGLONGJMP)
 /* Always save blocked signals to be restored by siglongjmp. */
-#define H5JMP_BUF    sigjmp_buf
-#define H5SETJMP(buf)    HDsigsetjmp(buf, 1)
-#define H5LONGJMP(buf, val)    HDsiglongjmp(buf, val)
-#define H5HAVE_SIGJMP        /* sigsetjmp/siglongjmp are supported. */
+#define H5JMP_BUF           sigjmp_buf
+#define H5SETJMP(buf)       HDsigsetjmp(buf, 1)
+#define H5LONGJMP(buf, val) HDsiglongjmp(buf, val)
+#define H5HAVE_SIGJMP       /* sigsetjmp/siglongjmp are supported. */
 #elif defined(H5_HAVE_LONGJMP)
-#define H5JMP_BUF    jmp_buf
-#define H5SETJMP(buf)    HDsetjmp(buf)
-#define H5LONGJMP(buf, val)    HDlongjmp(buf, val)
+#define H5JMP_BUF           jmp_buf
+#define H5SETJMP(buf)       HDsetjmp(buf)
+#define H5LONGJMP(buf, val) HDlongjmp(buf, val)
 #endif
 
 /* ALIGNMENT and signal-handling status codes */
-#define STA_NoALIGNMENT        0x0001  /* No ALIGNMENT Test */
-#define STA_NoHandlerVerify    0x0002  /* No signal handler Tests */
-
+#define STA_NoALIGNMENT     0x0001 /* No ALIGNMENT Test */
+#define STA_NoHandlerVerify 0x0002 /* No signal handler Tests */
 
 /*
  * This structure holds information about a type that
  * was detected.
  */
 typedef struct detected_t {
-    const char *varname;
-    unsigned int size;                  /* total byte size                  */
-    unsigned int precision;             /* meaningful bits                  */
-    unsigned int offset;                /* bit offset to meaningful bits    */
-    int perm[32];                       /* for detection of byte order      */
-    hbool_t is_vax;                     /* for vax (float & double) only    */
-    unsigned int sign;                  /* location of sign bit             */
-    unsigned int mpos, msize, imp;      /* information about mantissa       */
-    unsigned int epos, esize;           /* information about exponent       */
-    unsigned long bias;                 /* exponent bias for floating pt    */
-    unsigned int align;                 /* required byte alignment          */
-    unsigned int comp_align;            /* alignment for structure          */
+    const char *  varname;
+    unsigned int  size;             /* total byte size                  */
+    unsigned int  precision;        /* meaningful bits                  */
+    unsigned int  offset;           /* bit offset to meaningful bits    */
+    int           perm[32];         /* for detection of byte order      */
+    hbool_t       is_vax;           /* for vax (float & double) only    */
+    unsigned int  sign;             /* location of sign bit             */
+    unsigned int  mpos, msize, imp; /* information about mantissa       */
+    unsigned int  epos, esize;      /* information about exponent       */
+    unsigned long bias;             /* exponent bias for floating pt    */
+    unsigned int  align;            /* required byte alignment          */
+    unsigned int  comp_align;       /* alignment for structure          */
 } detected_t;
 
 /* This structure holds structure alignment for pointers, hvl_t, hobj_ref_t,
  * hdset_reg_ref_t */
 typedef struct malign_t {
-    const char          *name;
-    unsigned int         comp_align;    /* alignment for structure          */
+    const char * name;
+    unsigned int comp_align; /* alignment for structure          */
 } malign_t;
 
-FILE       *rawoutstream = NULL;
+FILE *rawoutstream = NULL;
 
 /* global variables types detection code */
 H5_GCC_DIAG_OFF("larger-than=")
 static detected_t d_g[MAXDETECT];
 H5_GCC_DIAG_ON("larger-than=")
-static malign_t m_g[MAXDETECT];
+static malign_t     m_g[MAXDETECT];
 static volatile int nd_g = 0, na_g = 0;
 
-static void print_results(int nd, detected_t *d, int na, malign_t *m);
-static void iprint(detected_t *);
-static int byte_cmp(int, const void *, const void *, const unsigned char *);
+static void         print_results(int nd, detected_t *d, int na, malign_t *m);
+static void         iprint(detected_t *);
+static int          byte_cmp(int, const void *, const void *, const unsigned char *);
 static unsigned int bit_cmp(unsigned int, int *, void *, void *, const unsigned char *);
-static void fix_order(int, int, int *, const char **);
+static void         fix_order(int, int, int *, const char **);
 static unsigned int imp_bit(unsigned int, int *, void *, void *, const unsigned char *);
 static unsigned int find_bias(unsigned int, unsigned int, int *, void *);
-static void precision (detected_t*);
-static void print_header(void);
-static void detect_C89_integers(void);
-static void detect_C89_floats(void);
-static void detect_C99_integers(void);
-static void detect_C99_floats(void);
-static void detect_C99_integers8(void);
-static void detect_C99_integers16(void);
-static void detect_C99_integers32(void);
-static void detect_C99_integers64(void);
-static void detect_alignments(void);
-static unsigned int align_g[] = {1, 2, 4, 8, 16};
-static int align_status_g = 0;             /* ALIGNMENT Signal Status */
-static int sigbus_handler_called_g = 0;    /* how many times called */
-static int sigsegv_handler_called_g = 0;   /* how many times called */
-static int sigill_handler_called_g = 0;    /* how many times called */
-static int signal_handler_tested_g = 0;    /* how many times tested */
+static void         precision(detected_t *);
+static void         print_header(void);
+static void         detect_C89_integers(void);
+static void         detect_C89_floats(void);
+static void         detect_C99_integers(void);
+static void         detect_C99_floats(void);
+static void         detect_C99_integers8(void);
+static void         detect_C99_integers16(void);
+static void         detect_C99_integers32(void);
+static void         detect_C99_integers64(void);
+static void         detect_alignments(void);
+static unsigned int align_g[]                = {1, 2, 4, 8, 16};
+static int          align_status_g           = 0; /* ALIGNMENT Signal Status */
+static int          sigbus_handler_called_g  = 0; /* how many times called */
+static int          sigsegv_handler_called_g = 0; /* how many times called */
+static int          sigill_handler_called_g  = 0; /* how many times called */
+static int          signal_handler_tested_g  = 0; /* how many times tested */
 #if defined(H5SETJMP) && defined(H5_HAVE_SIGNAL)
 static int verify_signal_handlers(int signum, void (*handler)(int));
 #endif
@@ -157,8 +156,6 @@ static int verify_signal_handlers(int signum, void (*handler)(int));
 static H5JMP_BUF jbuf_g;
 #endif
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    precision
  *
@@ -168,50 +165,49 @@ static H5JMP_BUF jbuf_g;
  *-------------------------------------------------------------------------
  */
 static void
-precision (detected_t *d)
+precision(detected_t *d)
 {
     unsigned int n;
 
-    if(0 == d->msize) {
+    if (0 == d->msize) {
         /*
          * An integer.    The permutation can have negative values at the
          * beginning or end which represent padding of bytes.  We must adjust
          * the precision and offset accordingly.
          */
-        if(d->perm[0] < 0) {
+        if (d->perm[0] < 0) {
             /*
              * Lower addresses are padded.
              */
-            for(n = 0; n < d->size && d->perm[n] < 0; n++)
+            for (n = 0; n < d->size && d->perm[n] < 0; n++)
                 /*void*/;
             d->precision = 8 * (d->size - n);
-            d->offset = 0;
+            d->offset    = 0;
         }
-        else if(d->perm[d->size - 1] < 0) {
+        else if (d->perm[d->size - 1] < 0) {
             /*
              * Higher addresses are padded.
              */
             for (n = 0; n < d->size && d->perm[d->size - (n + 1)]; n++)
                 /*void*/;
             d->precision = 8 * (d->size - n);
-            d->offset = 8 * n;
+            d->offset    = 8 * n;
         }
         else {
             /*
              * No padding.
              */
             d->precision = 8 * d->size;
-            d->offset = 0;
+            d->offset    = 0;
         }
     }
     else {
         /* A floating point */
-        d->offset = MIN3(d->mpos, d->epos, d->sign);
+        d->offset    = MIN3(d->mpos, d->epos, d->sign);
         d->precision = d->msize + d->esize + 1;
     }
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    DETECT_I/DETECT_BYTE
  *
@@ -245,46 +241,48 @@ precision (detected_t *d)
  *
  *-------------------------------------------------------------------------
  */
-#define DETECT_I_BYTE_CORE(TYPE,VAR,INFO,DETECT_TYPE) {                       \
-    DETECT_TYPE _v;                                                           \
-    int _i, _j;                                                               \
-    unsigned char *_x;                                                        \
-                                                                              \
-    HDmemset(&INFO, 0, sizeof(INFO));                                         \
-    INFO.varname = #VAR;                                                      \
-    INFO.size = sizeof(TYPE);                                                 \
-                                                                              \
-    for(_i = sizeof(DETECT_TYPE), _v = 0; _i > 0; --_i)                       \
-        _v = (DETECT_TYPE) ((DETECT_TYPE) (_v << 8) + (DETECT_TYPE) _i);      \
-                                                                              \
-    for(_i = 0, _x = (unsigned char *)&_v; _i < (signed)sizeof(DETECT_TYPE); _i++) { \
-        _j = (*_x++) - 1;                                                     \
-        HDassert(_j < (signed)sizeof(DETECT_TYPE));                           \
-        INFO.perm[_i] = _j;                                                   \
-    } /* end for */                                                           \
-                                                                              \
-    INFO.sign = ('U' != *(#VAR));                                             \
-    precision (&(INFO));                                                      \
-    ALIGNMENT(TYPE, INFO);                                                    \
-    if(!HDstrcmp(INFO.varname, "SCHAR")  || !HDstrcmp(INFO.varname, "SHORT") || \
-        !HDstrcmp(INFO.varname, "INT")   || !HDstrcmp(INFO.varname, "LONG")  || \
-        !HDstrcmp(INFO.varname, "LLONG")) {                                   \
-        COMP_ALIGNMENT(TYPE, INFO.comp_align);                                \
-    }                                                                         \
-}
-
-#define DETECT_BYTE(TYPE,VAR,INFO) {                                          \
-    HDcompile_assert(sizeof(TYPE) == 1);                                      \
-                                                                              \
-    DETECT_I_BYTE_CORE(TYPE,VAR,INFO,int)                                     \
-}
+#define DETECT_I_BYTE_CORE(TYPE, VAR, INFO, DETECT_TYPE)                                                     \
+    {                                                                                                        \
+        DETECT_TYPE    _v;                                                                                   \
+        int            _i, _j;                                                                               \
+        unsigned char *_x;                                                                                   \
+                                                                                                             \
+        HDmemset(&INFO, 0, sizeof(INFO));                                                                    \
+        INFO.varname = #VAR;                                                                                 \
+        INFO.size    = sizeof(TYPE);                                                                         \
+                                                                                                             \
+        for (_i = sizeof(DETECT_TYPE), _v = 0; _i > 0; --_i)                                                 \
+            _v = (DETECT_TYPE)((DETECT_TYPE)(_v << 8) + (DETECT_TYPE)_i);                                    \
+                                                                                                             \
+        for (_i = 0, _x = (unsigned char *)&_v; _i < (signed)sizeof(DETECT_TYPE); _i++) {                    \
+            _j = (*_x++) - 1;                                                                                \
+            HDassert(_j < (signed)sizeof(DETECT_TYPE));                                                      \
+            INFO.perm[_i] = _j;                                                                              \
+        } /* end for */                                                                                      \
+                                                                                                             \
+        INFO.sign = ('U' != *(#VAR));                                                                        \
+        precision(&(INFO));                                                                                  \
+        ALIGNMENT(TYPE, INFO);                                                                               \
+        if (!HDstrcmp(INFO.varname, "SCHAR") || !HDstrcmp(INFO.varname, "SHORT") ||                          \
+            !HDstrcmp(INFO.varname, "INT") || !HDstrcmp(INFO.varname, "LONG") ||                             \
+            !HDstrcmp(INFO.varname, "LLONG")) {                                                              \
+            COMP_ALIGNMENT(TYPE, INFO.comp_align);                                                           \
+        }                                                                                                    \
+    }
 
-#define DETECT_I(TYPE,VAR,INFO) {                          \
-    HDcompile_assert(sizeof(TYPE) > 1);                                       \
-                                                                              \
-    DETECT_I_BYTE_CORE(TYPE,VAR,INFO,TYPE)                                    \
-}
+#define DETECT_BYTE(TYPE, VAR, INFO)                                                                         \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(TYPE) == 1);                                                                 \
+                                                                                                             \
+        DETECT_I_BYTE_CORE(TYPE, VAR, INFO, int)                                                             \
+    }
 
+#define DETECT_I(TYPE, VAR, INFO)                                                                            \
+    {                                                                                                        \
+        HDcompile_assert(sizeof(TYPE) > 1);                                                                  \
+                                                                                                             \
+        DETECT_I_BYTE_CORE(TYPE, VAR, INFO, TYPE)                                                            \
+    }
 
 /*-------------------------------------------------------------------------
  * Function:    DETECT_F
@@ -296,92 +294,92 @@ precision (detected_t *d)
  *              initializes a detected_t structure with those properties.
  *-------------------------------------------------------------------------
  */
-#define DETECT_F(TYPE,VAR,INFO) {                                             \
-    TYPE _v1, _v2, _v3;                                                       \
-    unsigned char _buf1[sizeof(TYPE)], _buf3[sizeof(TYPE)];                   \
-    unsigned char _pad_mask[sizeof(TYPE)];                                    \
-    unsigned char _byte_mask;                                                 \
-    int _i, _j, _last = (-1);                                                 \
-    const char *_mesg;                                                        \
-                                                                              \
-    HDmemset(&INFO, 0, sizeof(INFO));                                         \
-    INFO.varname = #VAR;                                                      \
-    INFO.size = sizeof(TYPE);                                                 \
-                                                                              \
-    /* Initialize padding mask */                                             \
-    HDmemset(_pad_mask, 0, sizeof(_pad_mask));                                \
-                                                                              \
-    /* Padding bits.  Set a variable to 4.0, then flip each bit and see if    \
-     * the modified variable is equal ("==") to the original.  Build a        \
-     * padding bitmask to indicate which bits in the type are padding (i.e.   \
-     * have no effect on the value and should be ignored by subsequent        \
-     * steps).  This is necessary because padding bits can change arbitrarily \
-     * and interfere with detection of the various properties below unless we \
-     * know to ignore them. */                                                \
-    _v1 = (TYPE)4.0L;                                                         \
-    HDmemcpy(_buf1, (const void *)&_v1, sizeof(TYPE));                        \
-    for(_i = 0; _i < (int)sizeof(TYPE); _i++)                                 \
-        for(_byte_mask = (unsigned char)1; _byte_mask; _byte_mask = (unsigned char) (_byte_mask << 1)) {    \
-            _buf1[_i] ^= _byte_mask;                                          \
-            HDmemcpy((void *)&_v2, (const void *)_buf1, sizeof(TYPE));        \
-            H5_GCC_DIAG_OFF("float-equal")                                      \
-            if(_v1 != _v2)                                                    \
-                _pad_mask[_i] |= _byte_mask;                                  \
-            H5_GCC_DIAG_ON("float-equal")                                       \
-            _buf1[_i] ^= _byte_mask;                                          \
-        } /* end for */                                                       \
-                                                                              \
-    /* Byte Order */                                                          \
-    for(_i = 0, _v1 = (TYPE)0.0L, _v2 = (TYPE)1.0L; _i < (int)sizeof(TYPE); _i++) {         \
-        _v3 = _v1;                                                            \
-        _v1 += _v2;                                                           \
-        _v2 /= (TYPE)256.0L;                                                  \
-        HDmemcpy(_buf1, (const void *)&_v1, sizeof(TYPE));                    \
-        HDmemcpy(_buf3, (const void *)&_v3, sizeof(TYPE));                    \
-        _j = byte_cmp(sizeof(TYPE), _buf3, _buf1, _pad_mask);                 \
-        if(_j >= 0) {                                                         \
-            INFO.perm[_i] = _j;                                               \
-            _last = _i;                                                       \
-        }                                                                     \
-    }                                                                         \
-    fix_order(sizeof(TYPE), _last, INFO.perm, (const char**)&_mesg);          \
-                                                                              \
-    if(!HDstrcmp(_mesg, "VAX"))                                               \
-        INFO.is_vax = TRUE;                                                   \
-                                                                              \
-    /* Implicit mantissa bit */                                               \
-    _v1 = (TYPE)0.5L;                                                         \
-    _v2 = (TYPE)1.0L;                                                         \
-    INFO.imp = imp_bit (sizeof(TYPE), INFO.perm, &_v1, &_v2, _pad_mask);      \
-                                                                              \
-    /* Sign bit */                                                            \
-    _v1 = (TYPE)1.0L;                                                         \
-    _v2 = (TYPE)-1.0L;                                                        \
-    INFO.sign = bit_cmp (sizeof(TYPE), INFO.perm, &_v1, &_v2, _pad_mask);     \
-                                                                              \
-    /* Mantissa */                                                            \
-    INFO.mpos = 0;                                                            \
-                                                                              \
-    _v1 = (TYPE)1.0L;                                                         \
-    _v2 = (TYPE)1.5L;                                                         \
-    INFO.msize = bit_cmp (sizeof(TYPE), INFO.perm, &_v1, &_v2, _pad_mask);    \
-    INFO.msize += 1 + (unsigned int) (INFO.imp ? 0 : 1) - INFO.mpos;          \
-                                                                              \
-    /* Exponent */                                                            \
-    INFO.epos = INFO.mpos + INFO.msize;                                       \
-                                                                              \
-    INFO.esize = INFO.sign - INFO.epos;                                       \
-                                                                              \
-    _v1 = (TYPE)1.0L;                                                         \
-    INFO.bias = find_bias (INFO.epos, INFO.esize, INFO.perm, &_v1);           \
-    precision (&(INFO));                                                      \
-    ALIGNMENT(TYPE, INFO);                                                    \
-    if(!HDstrcmp(INFO.varname, "FLOAT") || !HDstrcmp(INFO.varname, "DOUBLE") || \
-        !HDstrcmp(INFO.varname, "LDOUBLE")) {                                 \
-        COMP_ALIGNMENT(TYPE,INFO.comp_align);                                 \
-    }                                                                         \
-}
-
+#define DETECT_F(TYPE, VAR, INFO)                                                                            \
+    {                                                                                                        \
+        TYPE          _v1, _v2, _v3;                                                                         \
+        unsigned char _buf1[sizeof(TYPE)], _buf3[sizeof(TYPE)];                                              \
+        unsigned char _pad_mask[sizeof(TYPE)];                                                               \
+        unsigned char _byte_mask;                                                                            \
+        int           _i, _j, _last = (-1);                                                                  \
+        const char *  _mesg;                                                                                 \
+                                                                                                             \
+        HDmemset(&INFO, 0, sizeof(INFO));                                                                    \
+        INFO.varname = #VAR;                                                                                 \
+        INFO.size    = sizeof(TYPE);                                                                         \
+                                                                                                             \
+        /* Initialize padding mask */                                                                        \
+        HDmemset(_pad_mask, 0, sizeof(_pad_mask));                                                           \
+                                                                                                             \
+        /* Padding bits.  Set a variable to 4.0, then flip each bit and see if                               \
+         * the modified variable is equal ("==") to the original.  Build a                                   \
+         * padding bitmask to indicate which bits in the type are padding (i.e.                              \
+         * have no effect on the value and should be ignored by subsequent                                   \
+         * steps).  This is necessary because padding bits can change arbitrarily                            \
+         * and interfere with detection of the various properties below unless we                            \
+         * know to ignore them. */                                                                           \
+        _v1 = (TYPE)4.0L;                                                                                    \
+        HDmemcpy(_buf1, (const void *)&_v1, sizeof(TYPE));                                                   \
+        for (_i = 0; _i < (int)sizeof(TYPE); _i++)                                                           \
+            for (_byte_mask = (unsigned char)1; _byte_mask; _byte_mask = (unsigned char)(_byte_mask << 1)) { \
+                _buf1[_i] ^= _byte_mask;                                                                     \
+                HDmemcpy((void *)&_v2, (const void *)_buf1, sizeof(TYPE));                                   \
+                H5_GCC_DIAG_OFF("float-equal")                                                               \
+                if (_v1 != _v2)                                                                              \
+                    _pad_mask[_i] |= _byte_mask;                                                             \
+                H5_GCC_DIAG_ON("float-equal")                                                                \
+                _buf1[_i] ^= _byte_mask;                                                                     \
+            } /* end for */                                                                                  \
+                                                                                                             \
+        /* Byte Order */                                                                                     \
+        for (_i = 0, _v1 = (TYPE)0.0L, _v2 = (TYPE)1.0L; _i < (int)sizeof(TYPE); _i++) {                     \
+            _v3 = _v1;                                                                                       \
+            _v1 += _v2;                                                                                      \
+            _v2 /= (TYPE)256.0L;                                                                             \
+            HDmemcpy(_buf1, (const void *)&_v1, sizeof(TYPE));                                               \
+            HDmemcpy(_buf3, (const void *)&_v3, sizeof(TYPE));                                               \
+            _j = byte_cmp(sizeof(TYPE), _buf3, _buf1, _pad_mask);                                            \
+            if (_j >= 0) {                                                                                   \
+                INFO.perm[_i] = _j;                                                                          \
+                _last         = _i;                                                                          \
+            }                                                                                                \
+        }                                                                                                    \
+        fix_order(sizeof(TYPE), _last, INFO.perm, (const char **)&_mesg);                                    \
+                                                                                                             \
+        if (!HDstrcmp(_mesg, "VAX"))                                                                         \
+            INFO.is_vax = TRUE;                                                                              \
+                                                                                                             \
+        /* Implicit mantissa bit */                                                                          \
+        _v1      = (TYPE)0.5L;                                                                               \
+        _v2      = (TYPE)1.0L;                                                                               \
+        INFO.imp = imp_bit(sizeof(TYPE), INFO.perm, &_v1, &_v2, _pad_mask);                                  \
+                                                                                                             \
+        /* Sign bit */                                                                                       \
+        _v1       = (TYPE)1.0L;                                                                              \
+        _v2       = (TYPE)-1.0L;                                                                             \
+        INFO.sign = bit_cmp(sizeof(TYPE), INFO.perm, &_v1, &_v2, _pad_mask);                                 \
+                                                                                                             \
+        /* Mantissa */                                                                                       \
+        INFO.mpos = 0;                                                                                       \
+                                                                                                             \
+        _v1        = (TYPE)1.0L;                                                                             \
+        _v2        = (TYPE)1.5L;                                                                             \
+        INFO.msize = bit_cmp(sizeof(TYPE), INFO.perm, &_v1, &_v2, _pad_mask);                                \
+        INFO.msize += 1 + (unsigned int)(INFO.imp ? 0 : 1) - INFO.mpos;                                      \
+                                                                                                             \
+        /* Exponent */                                                                                       \
+        INFO.epos = INFO.mpos + INFO.msize;                                                                  \
+                                                                                                             \
+        INFO.esize = INFO.sign - INFO.epos;                                                                  \
+                                                                                                             \
+        _v1       = (TYPE)1.0L;                                                                              \
+        INFO.bias = find_bias(INFO.epos, INFO.esize, INFO.perm, &_v1);                                       \
+        precision(&(INFO));                                                                                  \
+        ALIGNMENT(TYPE, INFO);                                                                               \
+        if (!HDstrcmp(INFO.varname, "FLOAT") || !HDstrcmp(INFO.varname, "DOUBLE") ||                         \
+            !HDstrcmp(INFO.varname, "LDOUBLE")) {                                                            \
+            COMP_ALIGNMENT(TYPE, INFO.comp_align);                                                           \
+        }                                                                                                    \
+    }
 
 /*-------------------------------------------------------------------------
  * Function:    DETECT_M
@@ -393,70 +391,78 @@ precision (detected_t *d)
  * Return:      void
  *-------------------------------------------------------------------------
  */
-#define DETECT_M(TYPE,VAR,INFO) {                          \
-   INFO.name = #VAR;                                  \
-   COMP_ALIGNMENT(TYPE, INFO.comp_align);                      \
-}
+#define DETECT_M(TYPE, VAR, INFO)                                                                            \
+    {                                                                                                        \
+        INFO.name = #VAR;                                                                                    \
+        COMP_ALIGNMENT(TYPE, INFO.comp_align);                                                               \
+    }
 
 /* Detect alignment for C structure */
-#define COMP_ALIGNMENT(TYPE,COMP_ALIGN) {                          \
-    struct {                                                                  \
-        char    c;                                                            \
-        TYPE    x;                                                            \
-    } s;                                                                      \
-                                                                              \
-    COMP_ALIGN = (unsigned int)((char*)(&(s.x)) - (char*)(&s));               \
-}
+#define COMP_ALIGNMENT(TYPE, COMP_ALIGN)                                                                     \
+    {                                                                                                        \
+        struct {                                                                                             \
+            char c;                                                                                          \
+            TYPE x;                                                                                          \
+        } s;                                                                                                 \
+                                                                                                             \
+        COMP_ALIGN = (unsigned int)((char *)(&(s.x)) - (char *)(&s));                                        \
+    }
 
 #if defined(H5SETJMP) && defined(H5_HAVE_SIGNAL)
-#define ALIGNMENT(TYPE,INFO) {                              \
-    char *volatile _buf = NULL;                             \
-    TYPE _val = 1, _val2;                              \
-    volatile size_t    _ano = 0;                          \
-    void        (*_handler)(int) = HDsignal(SIGBUS, sigbus_handler);  \
-    void        (*_handler2)(int) = HDsignal(SIGSEGV, sigsegv_handler);\
-    void        (*_handler3)(int) = HDsignal(SIGILL, sigill_handler);  \
-                                        \
-    _buf = (char*)HDmalloc(sizeof(TYPE) + align_g[NELMTS(align_g) - 1]);          \
-    if(H5SETJMP(jbuf_g)) _ano++;                          \
-    if(_ano < NELMTS(align_g)) {                          \
-        *((TYPE*)(_buf+align_g[_ano])) = _val; /*possible SIGBUS or SEGSEGV*/ \
-        _val2 = *((TYPE*)(_buf+align_g[_ano]));    /*possible SIGBUS or SEGSEGV*/\
-        /* Cray Check: This section helps detect alignment on Cray's */          \
-        /*              vector machines (like the SV1) which mask off */      \
-        /*              pointer values when pointing to non-word aligned */   \
-        /*              locations with pointers that are supposed to be */    \
-        /*              word aligned. -QAK */                                 \
-        HDmemset(_buf, 0xff, sizeof(TYPE)+align_g[NELMTS(align_g)-1]);          \
-            /*How to handle VAX types?*/                                          \
-        if(INFO.perm[0]) /* Big-Endian */                      \
-            HDmemcpy(_buf+align_g[_ano]+(INFO.size-((INFO.offset+INFO.precision)/8)),((char *)&_val)+(INFO.size-((INFO.offset+INFO.precision)/8)),(size_t)(INFO.precision/8)); \
-        else /* Little-Endian */                          \
-            HDmemcpy(_buf+align_g[_ano]+(INFO.offset/8),((char *)&_val)+(INFO.offset/8),(size_t)(INFO.precision/8)); \
-        _val2 = *((TYPE*)(_buf+align_g[_ano]));                      \
-        H5_GCC_DIAG_OFF("float-equal")                          \
-        if(_val!=_val2)                                  \
-            H5LONGJMP(jbuf_g, 1);                              \
-        H5_GCC_DIAG_ON("float-equal")                           \
-        /* End Cray Check */                              \
-        (INFO.align)=align_g[_ano];                          \
-    } else {                                      \
-    (INFO.align)=0;                                  \
-        fprintf(stderr, "unable to calculate alignment for %s\n", #TYPE);     \
-    }                                          \
-    HDfree(_buf);                                      \
-    HDsignal(SIGBUS, _handler); /*restore original handler*/              \
-    HDsignal(SIGSEGV, _handler2); /*restore original handler*/              \
-    HDsignal(SIGILL, _handler3); /*restore original handler*/              \
-}
+#define ALIGNMENT(TYPE, INFO)                                                                                \
+    {                                                                                                        \
+        char *volatile _buf    = NULL;                                                                       \
+        TYPE            _val   = 1, _val2;                                                                   \
+        volatile size_t _ano   = 0;                                                                          \
+        void (*_handler)(int)  = HDsignal(SIGBUS, sigbus_handler);                                           \
+        void (*_handler2)(int) = HDsignal(SIGSEGV, sigsegv_handler);                                         \
+        void (*_handler3)(int) = HDsignal(SIGILL, sigill_handler);                                           \
+                                                                                                             \
+        _buf = (char *)HDmalloc(sizeof(TYPE) + align_g[NELMTS(align_g) - 1]);                                \
+        if (H5SETJMP(jbuf_g))                                                                                \
+            _ano++;                                                                                          \
+        if (_ano < NELMTS(align_g)) {                                                                        \
+            *((TYPE *)(_buf + align_g[_ano])) = _val;  /*possible SIGBUS or SEGSEGV*/                        \
+            _val2 = *((TYPE *)(_buf + align_g[_ano])); /*possible SIGBUS or SEGSEGV*/                        \
+            /* Cray Check: This section helps detect alignment on Cray's */                                  \
+            /*              vector machines (like the SV1) which mask off */                                 \
+            /*              pointer values when pointing to non-word aligned */                              \
+            /*              locations with pointers that are supposed to be */                               \
+            /*              word aligned. -QAK */                                                            \
+            HDmemset(_buf, 0xff, sizeof(TYPE) + align_g[NELMTS(align_g) - 1]);                               \
+            /*How to handle VAX types?*/                                                                     \
+            if (INFO.perm[0]) /* Big-Endian */                                                               \
+                HDmemcpy(_buf + align_g[_ano] + (INFO.size - ((INFO.offset + INFO.precision) / 8)),          \
+                         ((char *)&_val) + (INFO.size - ((INFO.offset + INFO.precision) / 8)),               \
+                         (size_t)(INFO.precision / 8));                                                      \
+            else /* Little-Endian */                                                                         \
+                HDmemcpy(_buf + align_g[_ano] + (INFO.offset / 8), ((char *)&_val) + (INFO.offset / 8),      \
+                         (size_t)(INFO.precision / 8));                                                      \
+            _val2 = *((TYPE *)(_buf + align_g[_ano]));                                                       \
+            H5_GCC_DIAG_OFF("float-equal")                                                                   \
+            if (_val != _val2)                                                                               \
+                H5LONGJMP(jbuf_g, 1);                                                                        \
+            H5_GCC_DIAG_ON("float-equal")                                                                    \
+            /* End Cray Check */                                                                             \
+            (INFO.align) = align_g[_ano];                                                                    \
+        }                                                                                                    \
+        else {                                                                                               \
+            (INFO.align) = 0;                                                                                \
+            fprintf(stderr, "unable to calculate alignment for %s\n", #TYPE);                                \
+        }                                                                                                    \
+        HDfree(_buf);                                                                                        \
+        HDsignal(SIGBUS, _handler);   /*restore original handler*/                                           \
+        HDsignal(SIGSEGV, _handler2); /*restore original handler*/                                           \
+        HDsignal(SIGILL, _handler3);  /*restore original handler*/                                           \
+    }
 #else
-#define ALIGNMENT(TYPE,INFO) {                              \
-    align_status_g |= STA_NoALIGNMENT;                          \
-    (INFO.align)=0;                                  \
-}
+#define ALIGNMENT(TYPE, INFO)                                                                                \
+    {                                                                                                        \
+        align_status_g |= STA_NoALIGNMENT;                                                                   \
+        (INFO.align) = 0;                                                                                    \
+    }
 #endif
 
-
 #if defined(H5LONGJMP) && defined(H5_HAVE_SIGNAL)
 
 /*-------------------------------------------------------------------------
@@ -489,7 +495,6 @@ sigsegv_handler(int H5_ATTR_UNUSED signo)
 }
 #endif
 
-
 #if defined(H5LONGJMP) && defined(H5_HAVE_SIGNAL)
 
 /*-------------------------------------------------------------------------
@@ -522,7 +527,6 @@ sigbus_handler(int H5_ATTR_UNUSED signo)
 }
 #endif
 
-
 #if defined(H5LONGJMP) && defined(H5_HAVE_SIGNAL)
 
 /*-------------------------------------------------------------------------
@@ -555,7 +559,6 @@ sigill_handler(int H5_ATTR_UNUSED signo)
 }
 #endif
 
-
 /*-------------------------------------------------------------------------
  * Function:    print_results
  *
@@ -567,8 +570,8 @@ sigill_handler(int H5_ATTR_UNUSED signo)
 static void
 print_results(int nd, detected_t *d, int na, malign_t *misc_align)
 {
-    int         byte_order=0;   /*byte order of data types*/
-    int        i, j;
+    int byte_order = 0; /*byte order of data types*/
+    int i, j;
 
     /* Include files */
     fprintf(rawoutstream, "\
@@ -630,7 +633,6 @@ print_results(int nd, detected_t *d, int na, malign_t *misc_align)
 /*******************/\n\
 \n");
 
-
     /* The interface initialization function */
     fprintf(rawoutstream, "\n\
 \n\
@@ -656,43 +658,43 @@ H5TN_init_interface(void)\n\
 \n\
     FUNC_ENTER_NOAPI(FAIL)\n");
 
-    for(i = 0; i < nd; i++) {
+    for (i = 0; i < nd; i++) {
         /* The native endianness of this machine */
         /* The INFO.perm now contains `-1' for bytes that aren't used and
          * are always zero.  This happens on the Cray for `short' where
          * sizeof(short) is 8, but only the low-order 4 bytes are ever used.
          */
-        if(d[i].is_vax)    /* the type is a VAX floating number */
-            byte_order=-1;
+        if (d[i].is_vax) /* the type is a VAX floating number */
+            byte_order = -1;
         else {
-            for(j=0; j<32; j++) {
+            for (j = 0; j < 32; j++) {
                 /*Find the 1st containing valid data*/
-                if(d[i].perm[j]>-1) {
-                    byte_order=d[i].perm[j];
+                if (d[i].perm[j] > -1) {
+                    byte_order = d[i].perm[j];
                     break;
                 }
             }
         }
 
-    /* Print a comment to describe this section of definitions. */
-    fprintf(rawoutstream, "\n   /*\n");
-    iprint(d+i);
-    fprintf(rawoutstream, "    */\n");
+        /* Print a comment to describe this section of definitions. */
+        fprintf(rawoutstream, "\n   /*\n");
+        iprint(d + i);
+        fprintf(rawoutstream, "    */\n");
 
-    /* The part common to fixed and floating types */
-    fprintf(rawoutstream, "\
+        /* The part common to fixed and floating types */
+        fprintf(rawoutstream, "\
     if(NULL == (dt = H5T__alloc()))\n\
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, \"datatype allocation failed\")\n\
     dt->shared->state = H5T_STATE_IMMUTABLE;\n\
     dt->shared->type = H5T_%s;\n\
     dt->shared->size = %d;\n",
-        d[i].msize ? "FLOAT" : "INTEGER",/*class            */
-        d[i].size);            /*size            */
+                d[i].msize ? "FLOAT" : "INTEGER", /*class            */
+                d[i].size);                       /*size            */
 
-        if(byte_order==-1)
+        if (byte_order == -1)
             fprintf(rawoutstream, "\
     dt->shared->u.atomic.order = H5T_ORDER_VAX;\n");
-        else if(byte_order==0)
+        else if (byte_order == 0)
             fprintf(rawoutstream, "\
     dt->shared->u.atomic.order = H5T_ORDER_LE;\n");
         else
@@ -704,19 +706,19 @@ H5TN_init_interface(void)\n\
     dt->shared->u.atomic.prec = %d;\n\
     dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;\n\
     dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;\n",
-        d[i].offset,            /*offset        */
-        d[i].precision);            /*precision        */
-    /*HDassert((d[i].perm[0]>0)==(byte_order>0));*/   /* Double-check that byte-order doesn't change */
+                d[i].offset,                            /*offset        */
+                d[i].precision);                        /*precision        */
+        /*HDassert((d[i].perm[0]>0)==(byte_order>0));*/ /* Double-check that byte-order doesn't change */
 
-    if(0 == d[i].msize) {
-        /* The part unique to fixed point types */
-        fprintf(rawoutstream, "\
+        if (0 == d[i].msize) {
+            /* The part unique to fixed point types */
+            fprintf(rawoutstream, "\
     dt->shared->u.atomic.u.i.sign = H5T_SGN_%s;\n",
-        d[i].sign ? "2" : "NONE");
-    }
-    else {
-        /* The part unique to floating point types */
-        fprintf(rawoutstream, "\
+                    d[i].sign ? "2" : "NONE");
+        }
+        else {
+            /* The part unique to floating point types */
+            fprintf(rawoutstream, "\
     dt->shared->u.atomic.u.f.sign = %d;\n\
     dt->shared->u.atomic.u.f.epos = %d;\n\
     dt->shared->u.atomic.u.f.esize = %d;\n\
@@ -725,49 +727,53 @@ H5TN_init_interface(void)\n\
     dt->shared->u.atomic.u.f.msize = %d;\n\
     dt->shared->u.atomic.u.f.norm = H5T_NORM_%s;\n\
     dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;\n",
-        d[i].sign,    /*sign location */
-        d[i].epos,    /*exponent loc    */
-        d[i].esize,    /*exponent size */
-        (unsigned long)(d[i].bias),     /*exponent bias */
-        d[i].mpos,    /*mantissa loc    */
-        d[i].msize,    /*mantissa size */
-        d[i].imp ? "IMPLIED" : "NONE");    /*normalization */
-    }
+                    d[i].sign,                      /*sign location */
+                    d[i].epos,                      /*exponent loc    */
+                    d[i].esize,                     /*exponent size */
+                    (unsigned long)(d[i].bias),     /*exponent bias */
+                    d[i].mpos,                      /*mantissa loc    */
+                    d[i].msize,                     /*mantissa size */
+                    d[i].imp ? "IMPLIED" : "NONE"); /*normalization */
+        }
 
-    /* Atomize the type */
-    fprintf(rawoutstream, "\
+        /* Atomize the type */
+        fprintf(rawoutstream, "\
     if((H5T_NATIVE_%s_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)\n\
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, \"can't register ID for built-in datatype\")\n",
-        d[i].varname);
-    fprintf(rawoutstream, "    H5T_NATIVE_%s_ALIGN_g = %lu;\n",
-        d[i].varname, (unsigned long)(d[i].align));
+                d[i].varname);
+        fprintf(rawoutstream, "    H5T_NATIVE_%s_ALIGN_g = %lu;\n", d[i].varname,
+                (unsigned long)(d[i].align));
 
         /* Variables for alignment of compound datatype */
-        if(!HDstrcmp(d[i].varname, "SCHAR")  || !HDstrcmp(d[i].varname, "SHORT") ||
-            !HDstrcmp(d[i].varname, "INT")   || !HDstrcmp(d[i].varname, "LONG")  ||
+        if (!HDstrcmp(d[i].varname, "SCHAR") || !HDstrcmp(d[i].varname, "SHORT") ||
+            !HDstrcmp(d[i].varname, "INT") || !HDstrcmp(d[i].varname, "LONG") ||
             !HDstrcmp(d[i].varname, "LLONG") || !HDstrcmp(d[i].varname, "FLOAT") ||
             !HDstrcmp(d[i].varname, "DOUBLE") || !HDstrcmp(d[i].varname, "LDOUBLE")) {
-            fprintf(rawoutstream, "    H5T_NATIVE_%s_COMP_ALIGN_g = %lu;\n",
-                    d[i].varname, (unsigned long)(d[i].comp_align));
+            fprintf(rawoutstream, "    H5T_NATIVE_%s_COMP_ALIGN_g = %lu;\n", d[i].varname,
+                    (unsigned long)(d[i].comp_align));
         }
     }
 
     /* Consider VAX a little-endian machine */
-    if(byte_order==0 || byte_order==-1) {
+    if (byte_order == 0 || byte_order == -1) {
         fprintf(rawoutstream, "\n\
     /* Set the native order for this machine */\n\
-    H5T_native_order_g = H5T_ORDER_%s;\n", "LE");
+    H5T_native_order_g = H5T_ORDER_%s;\n",
+                "LE");
     }
     else {
         fprintf(rawoutstream, "\n\
     /* Set the native order for this machine */\n\
-    H5T_native_order_g = H5T_ORDER_%s;\n", "BE");
+    H5T_native_order_g = H5T_ORDER_%s;\n",
+                "BE");
     }
 
     /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
-    fprintf(rawoutstream, "\n    /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */\n");
-    for(j=0; j<na; j++)
-        fprintf(rawoutstream, "    H5T_%s_COMP_ALIGN_g = %lu;\n", misc_align[j].name, (unsigned long)(misc_align[j].comp_align));
+    fprintf(rawoutstream,
+            "\n    /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */\n");
+    for (j = 0; j < na; j++)
+        fprintf(rawoutstream, "    H5T_%s_COMP_ALIGN_g = %lu;\n", misc_align[j].name,
+                (unsigned long)(misc_align[j].comp_align));
 
     fprintf(rawoutstream, "\
 \n\
@@ -783,15 +789,15 @@ done:\n\
 
     /* Print the ALIGNMENT and signal-handling status as comments */
     fprintf(rawoutstream, "\n"
-    "/****************************************/\n"
-    "/* ALIGNMENT and signal-handling status */\n"
-    "/****************************************/\n");
+                          "/****************************************/\n"
+                          "/* ALIGNMENT and signal-handling status */\n"
+                          "/****************************************/\n");
     if (align_status_g & STA_NoALIGNMENT)
-    fprintf(rawoutstream, "/* ALIGNAMENT test is not available */\n");
+        fprintf(rawoutstream, "/* ALIGNAMENT test is not available */\n");
     if (align_status_g & STA_NoHandlerVerify)
-    fprintf(rawoutstream, "/* Signal handlers verify test is not available */\n");
-    /* The following is available in H5pubconf.h. Printing them here for */
-    /* convenience. */
+        fprintf(rawoutstream, "/* Signal handlers verify test is not available */\n");
+        /* The following is available in H5pubconf.h. Printing them here for */
+        /* convenience. */
 #ifdef H5_HAVE_SIGNAL
     fprintf(rawoutstream, "/* Signal() support: yes */\n");
 #else
@@ -825,16 +831,15 @@ done:\n\
 
     /* Print the statics of signal handlers called for debugging */
     fprintf(rawoutstream, "\n"
-    "/******************************/\n"
-    "/* signal handlers statistics */\n"
-    "/******************************/\n");
+                          "/******************************/\n"
+                          "/* signal handlers statistics */\n"
+                          "/******************************/\n");
     fprintf(rawoutstream, "/* signal_handlers tested: %d times */\n", signal_handler_tested_g);
     fprintf(rawoutstream, "/* sigbus_handler called: %d times */\n", sigbus_handler_called_g);
     fprintf(rawoutstream, "/* sigsegv_handler called: %d times */\n", sigsegv_handler_called_g);
     fprintf(rawoutstream, "/* sigill_handler called: %d times */\n", sigill_handler_called_g);
 } /* end print_results() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    iprint
  *
@@ -849,17 +854,17 @@ iprint(detected_t *d)
 {
     unsigned int pass;
 
-    for(pass = (d->size - 1) / 4; ; --pass) {
+    for (pass = (d->size - 1) / 4;; --pass) {
         unsigned int i, k;
         /*
          * Print the byte ordering above the bit fields.
          */
         fprintf(rawoutstream, "    * ");
-        for(i = MIN(pass * 4 + 3, d->size - 1); i >= pass * 4; --i) {
+        for (i = MIN(pass * 4 + 3, d->size - 1); i >= pass * 4; --i) {
             fprintf(rawoutstream, "%4d", d->perm[i]);
-            if(i > pass * 4)
+            if (i > pass * 4)
                 HDfputs("     ", stdout);
-            if(!i)
+            if (!i)
                 break;
         }
 
@@ -867,24 +872,24 @@ iprint(detected_t *d)
          * Print the bit fields
          */
         fprintf(rawoutstream, "\n    * ");
-        for(i = MIN(pass * 4 + 3, d->size - 1), k = MIN(pass * 32 + 31,
-                8 * d->size - 1); i >= pass * 4; --i) {
+        for (i = MIN(pass * 4 + 3, d->size - 1), k = MIN(pass * 32 + 31, 8 * d->size - 1); i >= pass * 4;
+             --i) {
             unsigned int j;
 
-            for(j = 8; j > 0; --j) {
-                if(k == d->sign && d->msize) {
+            for (j = 8; j > 0; --j) {
+                if (k == d->sign && d->msize) {
                     HDfputc('S', rawoutstream);
                 }
-                else if(k >= d->epos && k < d->epos + d->esize) {
+                else if (k >= d->epos && k < d->epos + d->esize) {
                     HDfputc('E', rawoutstream);
                 }
-                else if(k >= d->mpos && k < d->mpos + d->msize) {
+                else if (k >= d->mpos && k < d->mpos + d->msize) {
                     HDfputc('M', rawoutstream);
                 }
-                else if(d->msize) {
+                else if (d->msize) {
                     HDfputc('?', rawoutstream); /*unknown floating point bit */
                 }
-                else if(d->sign) {
+                else if (d->sign) {
                     HDfputc('I', rawoutstream);
                 }
                 else {
@@ -892,39 +897,37 @@ iprint(detected_t *d)
                 }
                 --k;
             }
-            if(i > pass * 4)
+            if (i > pass * 4)
                 HDfputc(' ', rawoutstream);
-            if(!i)
+            if (!i)
                 break;
         }
         HDfputc('\n', rawoutstream);
-        if(!pass)
+        if (!pass)
             break;
     }
 
     /*
      * Is there an implicit bit in the mantissa.
      */
-    if(d->msize) {
+    if (d->msize) {
         fprintf(rawoutstream, "    * Implicit bit? %s\n", d->imp ? "yes" : "no");
     }
 
     /*
      * Alignment
      */
-    if(0 == d->align) {
+    if (0 == d->align) {
         fprintf(rawoutstream, "    * Alignment: NOT CALCULATED\n");
     }
-    else if(1 == d->align) {
+    else if (1 == d->align) {
         fprintf(rawoutstream, "    * Alignment: none\n");
     }
     else {
-        fprintf(rawoutstream, "    * Alignment: %lu\n", (unsigned long) (d->align));
+        fprintf(rawoutstream, "    * Alignment: %lu\n", (unsigned long)(d->align));
     }
-
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    byte_cmp
  *
@@ -940,18 +943,17 @@ iprint(detected_t *d)
 static int
 byte_cmp(int n, const void *_a, const void *_b, const unsigned char *pad_mask)
 {
-    int i;
-    const unsigned char *a = (const unsigned char *) _a;
-    const unsigned char *b = (const unsigned char *) _b;
+    int                  i;
+    const unsigned char *a = (const unsigned char *)_a;
+    const unsigned char *b = (const unsigned char *)_b;
 
-    for(i = 0; i < n; i++)
-        if((a[i] & pad_mask[i]) != (b[i] & pad_mask[i]))
+    for (i = 0; i < n; i++)
+        if ((a[i] & pad_mask[i]) != (b[i] & pad_mask[i]))
             return i;
 
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    bit_cmp
  *
@@ -966,22 +968,22 @@ byte_cmp(int n, const void *_a, const void *_b, const unsigned char *pad_mask)
  *-------------------------------------------------------------------------
  */
 static unsigned int
-bit_cmp(unsigned int nbytes, int *perm, void *_a, void *_b,
-        const unsigned char *pad_mask)
+bit_cmp(unsigned int nbytes, int *perm, void *_a, void *_b, const unsigned char *pad_mask)
 {
-    unsigned int i;
-    unsigned char *a = (unsigned char *) _a;
-    unsigned char *b = (unsigned char *) _b;
-    unsigned char aa, bb;
-
-    for(i = 0; i < nbytes; i++) {
-        HDassert(perm[i] < (int) nbytes);
-        if((aa = (unsigned char) (a[perm[i]] & pad_mask[perm[i]]))
-                != (bb = (unsigned char) (b[perm[i]] & pad_mask[perm[i]]))) {
+    unsigned int   i;
+    unsigned char *a = (unsigned char *)_a;
+    unsigned char *b = (unsigned char *)_b;
+    unsigned char  aa, bb;
+
+    for (i = 0; i < nbytes; i++) {
+        HDassert(perm[i] < (int)nbytes);
+        if ((aa = (unsigned char)(a[perm[i]] & pad_mask[perm[i]])) !=
+            (bb = (unsigned char)(b[perm[i]] & pad_mask[perm[i]]))) {
             unsigned int j;
 
-            for(j = 0; j < 8; j++, aa >>= 1, bb >>= 1) {
-                if((aa & 1) != (bb & 1)) return i * 8 + j;
+            for (j = 0; j < 8; j++, aa >>= 1, bb >>= 1) {
+                if ((aa & 1) != (bb & 1))
+                    return i * 8 + j;
             }
             fprintf(stderr, "INTERNAL ERROR");
             HDabort();
@@ -992,7 +994,6 @@ bit_cmp(unsigned int nbytes, int *perm, void *_a, void *_b,
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    fix_order
  *
@@ -1010,32 +1011,29 @@ bit_cmp(unsigned int nbytes, int *perm, void *_a, void *_b,
 static void
 fix_order(int n, int last, int *perm, const char **mesg)
 {
-    int        i;
+    int i;
 
-    if(last > 1) {
+    if (last > 1) {
         /*
          * We have at least three points to consider.
          */
-        if(perm[last] < perm[last - 1] && perm[last - 1] < perm[last - 2]) {
+        if (perm[last] < perm[last - 1] && perm[last - 1] < perm[last - 2]) {
             /*
              * Little endian.
              */
-            if(mesg)
+            if (mesg)
                 *mesg = "Little-endian";
-            for(i = 0; i < n; i++)
+            for (i = 0; i < n; i++)
                 perm[i] = i;
-
         }
-        else if(perm[last] > perm[last - 1]
-                && perm[last - 1] > perm[last - 2]) {
+        else if (perm[last] > perm[last - 1] && perm[last - 1] > perm[last - 2]) {
             /*
              * Big endian.
              */
-            if(mesg)
+            if (mesg)
                 *mesg = "Big-endian";
-            for(i = 0; i < n; i++)
+            for (i = 0; i < n; i++)
                 perm[i] = (n - 1) - i;
-
         }
         else {
             /*
@@ -1045,22 +1043,20 @@ fix_order(int n, int last, int *perm, const char **mesg)
              *          case - JKM & QAK)
              */
             HDassert(0 == n % 2);
-            if(mesg)
+            if (mesg)
                 *mesg = "VAX";
-            for(i = 0; i < n; i += 2) {
-                perm[i] = (n - 2) - i;
+            for (i = 0; i < n; i += 2) {
+                perm[i]     = (n - 2) - i;
                 perm[i + 1] = (n - 1) - i;
             }
         }
     }
     else {
-        fprintf(stderr,
-            "Failed to detect byte order of %d-byte floating point.\n", n);
+        fprintf(stderr, "Failed to detect byte order of %d-byte floating point.\n", n);
         HDexit(1);
     }
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    imp_bit
  *
@@ -1091,10 +1087,10 @@ fix_order(int n, int last, int *perm, const char **mesg)
 static unsigned int
 imp_bit(unsigned int n, int *perm, void *_a, void *_b, const unsigned char *pad_mask)
 {
-    unsigned char *a = (unsigned char *) _a;
-    unsigned char *b = (unsigned char *) _b;
-    unsigned int changed, major, minor;
-    unsigned int msmb; /* most significant mantissa bit */
+    unsigned char *a = (unsigned char *)_a;
+    unsigned char *b = (unsigned char *)_b;
+    unsigned int   changed, major, minor;
+    unsigned int   msmb; /* most significant mantissa bit */
 
     /*
      * Look for the least significant bit that has changed between
@@ -1107,14 +1103,13 @@ imp_bit(unsigned int n, int *perm, void *_a, void *_b, const unsigned char *pad_
      * be the most significant bit of the mantissa.  If it is non-zero
      * then the format does not remove the leading `1' of the mantissa.
      */
-    msmb = changed - 1;
+    msmb  = changed - 1;
     major = msmb / 8;
     minor = msmb % 8;
 
     return (a[perm[major]] >> minor) & 0x01 ? 0 : 1;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  find_bias
  *
@@ -1128,14 +1123,14 @@ imp_bit(unsigned int n, int *perm, void *_a, void *_b, const unsigned char *pad_
 static unsigned int
 find_bias(unsigned int epos, unsigned int esize, int *perm, void *_a)
 {
-    unsigned char *a = (unsigned char *) _a;
-    unsigned char mask;
-    unsigned int b, shift = 0, nbits, bias = 0;
+    unsigned char *a = (unsigned char *)_a;
+    unsigned char  mask;
+    unsigned int   b, shift = 0, nbits, bias = 0;
 
-    while(esize > 0) {
+    while (esize > 0) {
         nbits = MIN(esize, (8 - epos % 8));
-        mask = (unsigned char) ((1 << nbits) - 1);
-        b = (unsigned int) (a[perm[epos / 8]] >> (epos % 8)) & mask;
+        mask  = (unsigned char)((1 << nbits) - 1);
+        b     = (unsigned int)(a[perm[epos / 8]] >> (epos % 8)) & mask;
         bias |= b << shift;
 
         shift += nbits;
@@ -1145,7 +1140,6 @@ find_bias(unsigned int epos, unsigned int esize, int *perm, void *_a)
     return bias;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    print_header
  *
@@ -1158,22 +1152,20 @@ static void
 print_header(void)
 {
 
-    time_t         now = HDtime(NULL);
-    struct tm     *tm = HDlocaltime(&now);
-    char           real_name[30];
-    char           host_name[256];
-    int            i;
-    const char    *s;
+    time_t      now = HDtime(NULL);
+    struct tm * tm  = HDlocaltime(&now);
+    char        real_name[30];
+    char        host_name[256];
+    int         i;
+    const char *s;
 #ifdef H5_HAVE_GETPWUID
     struct passwd *pwd = NULL;
 #else
-    int            pwd = 1;
+    int pwd      = 1;
 #endif
-    static const char    *month_name[] =
-    {
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-    static const char    *purpose = "\
+    static const char *month_name[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                                       "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+    static const char *purpose      = "\
 This machine-generated source code contains\n\
 information about the various integer and\n\
 floating point numeric formats found on this\n\
@@ -1217,10 +1209,10 @@ bit.\n";
 #ifdef H5_HAVE_GETPWUID
     {
         size_t n;
-        char *comma;
-        if((pwd = HDgetpwuid(HDgetuid()))) {
-            if((comma = HDstrchr(pwd->pw_gecos, ','))) {
-                n = MIN(sizeof(real_name)-1, (unsigned)(comma-pwd->pw_gecos));
+        char * comma;
+        if ((pwd = HDgetpwuid(HDgetuid()))) {
+            if ((comma = HDstrchr(pwd->pw_gecos, ','))) {
+                n = MIN(sizeof(real_name) - 1, (unsigned)(comma - pwd->pw_gecos));
                 HDstrncpy(real_name, pwd->pw_gecos, n);
                 real_name[n] = '\0';
             }
@@ -1240,7 +1232,7 @@ bit.\n";
      * The FQDM of this host or the empty string.
      */
 #ifdef H5_HAVE_GETHOSTNAME
-    if(HDgethostname(host_name, sizeof(host_name)) < 0) {
+    if (HDgethostname(host_name, sizeof(host_name)) < 0) {
         host_name[0] = '\0';
     }
 #else
@@ -1251,27 +1243,28 @@ bit.\n";
      * The file header: warning, copyright notice, build information.
      */
     fprintf(rawoutstream, "/* Generated automatically by H5detect -- do not edit */\n\n\n");
-    HDfputs(FileHeader, rawoutstream);        /*the copyright notice--see top of this file */
+    HDfputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */
 
-    fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n",
-    month_name[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year);
-    if(pwd || real_name[0] || host_name[0]) {
+    fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday,
+            1900 + tm->tm_year);
+    if (pwd || real_name[0] || host_name[0]) {
         fprintf(rawoutstream, " *\t\t\t");
-        if(real_name[0])
+        if (real_name[0])
             fprintf(rawoutstream, "%s <", real_name);
 #ifdef H5_HAVE_GETPWUID
-        if(pwd) HDfputs(pwd->pw_name, rawoutstream);
+        if (pwd)
+            HDfputs(pwd->pw_name, rawoutstream);
 #endif
-        if(host_name[0])
+        if (host_name[0])
             fprintf(rawoutstream, "@%s", host_name);
-        if(real_name[0])
+        if (real_name[0])
             fprintf(rawoutstream, ">");
         HDfputc('\n', rawoutstream);
     }
     fprintf(rawoutstream, " *\n * Purpose:\t\t");
-    for(s = purpose; *s; s++) {
+    for (s = purpose; *s; s++) {
         HDfputc(*s, rawoutstream);
-        if('\n' == *s && s[1])
+        if ('\n' == *s && s[1])
             fprintf(rawoutstream, " *\t\t\t");
     }
 
@@ -1280,13 +1273,11 @@ bit.\n";
     fprintf(rawoutstream, " *\tIt was generated by code in `H5detect.c'.\n");
 
     fprintf(rawoutstream, " *\n *");
-    for(i = 0; i < 73; i++)
+    for (i = 0; i < 73; i++)
         HDfputc('-', rawoutstream);
     fprintf(rawoutstream, "\n */\n\n");
-
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_C89_integers
  *
@@ -1298,17 +1289,24 @@ bit.\n";
 static void HDF_NO_UBSAN
 detect_C89_integers(void)
 {
-    DETECT_BYTE(signed char,   SCHAR,        d_g[nd_g]); nd_g++;
-    DETECT_BYTE(unsigned char, UCHAR,        d_g[nd_g]); nd_g++;
-    DETECT_I(short,            SHORT,        d_g[nd_g]); nd_g++;
-    DETECT_I(unsigned short,   USHORT,       d_g[nd_g]); nd_g++;
-    DETECT_I(int,              INT,          d_g[nd_g]); nd_g++;
-    DETECT_I(unsigned int,     UINT,         d_g[nd_g]); nd_g++;
-    DETECT_I(long,             LONG,         d_g[nd_g]); nd_g++;
-    DETECT_I(unsigned long,    ULONG,        d_g[nd_g]); nd_g++;
+    DETECT_BYTE(signed char, SCHAR, d_g[nd_g]);
+    nd_g++;
+    DETECT_BYTE(unsigned char, UCHAR, d_g[nd_g]);
+    nd_g++;
+    DETECT_I(short, SHORT, d_g[nd_g]);
+    nd_g++;
+    DETECT_I(unsigned short, USHORT, d_g[nd_g]);
+    nd_g++;
+    DETECT_I(int, INT, d_g[nd_g]);
+    nd_g++;
+    DETECT_I(unsigned int, UINT, d_g[nd_g]);
+    nd_g++;
+    DETECT_I(long, LONG, d_g[nd_g]);
+    nd_g++;
+    DETECT_I(unsigned long, ULONG, d_g[nd_g]);
+    nd_g++;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_C89_floats
  *
@@ -1320,11 +1318,12 @@ detect_C89_integers(void)
 static void HDF_NO_UBSAN
 detect_C89_floats(void)
 {
-    DETECT_F(float,     FLOAT,      d_g[nd_g]); nd_g++;
-    DETECT_F(double,    DOUBLE,     d_g[nd_g]); nd_g++;
+    DETECT_F(float, FLOAT, d_g[nd_g]);
+    nd_g++;
+    DETECT_F(double, DOUBLE, d_g[nd_g]);
+    nd_g++;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers8
  *
@@ -1336,51 +1335,62 @@ detect_C89_floats(void)
 static void HDF_NO_UBSAN
 detect_C99_integers8(void)
 {
-#if H5_SIZEOF_INT8_T>0
-  #if H5_SIZEOF_INT8_T==1
-    DETECT_BYTE(int8_t,         INT8,         d_g[nd_g]); nd_g++;
-  #else
-    DETECT_I(int8_t,            INT8,         d_g[nd_g]); nd_g++;
-  #endif
+#if H5_SIZEOF_INT8_T > 0
+#if H5_SIZEOF_INT8_T == 1
+    DETECT_BYTE(int8_t, INT8, d_g[nd_g]);
+    nd_g++;
+#else
+    DETECT_I(int8_t, INT8, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT8_T>0
-  #if H5_SIZEOF_UINT8_T==1
-    DETECT_BYTE(uint8_t,        UINT8,        d_g[nd_g]); nd_g++;
-  #else
-    DETECT_I(uint8_t,           UINT8,        d_g[nd_g]); nd_g++;
-  #endif
 #endif
-#if H5_SIZEOF_INT_LEAST8_T>0
-  #if H5_SIZEOF_INT_LEAST8_T==1
-    DETECT_BYTE(int_least8_t,   INT_LEAST8,   d_g[nd_g]); nd_g++;
-  #else
-    DETECT_I(int_least8_t,      INT_LEAST8,   d_g[nd_g]); nd_g++;
-  #endif
+#if H5_SIZEOF_UINT8_T > 0
+#if H5_SIZEOF_UINT8_T == 1
+    DETECT_BYTE(uint8_t, UINT8, d_g[nd_g]);
+    nd_g++;
+#else
+    DETECT_I(uint8_t, UINT8, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT_LEAST8_T>0
-  #if H5_SIZEOF_UINT_LEAST8_T==1
-    DETECT_BYTE(uint_least8_t,  UINT_LEAST8,  d_g[nd_g]); nd_g++;
-  #else
-    DETECT_I(uint_least8_t,     UINT_LEAST8,  d_g[nd_g]); nd_g++;
-  #endif
 #endif
-#if H5_SIZEOF_INT_FAST8_T>0
-  #if H5_SIZEOF_INT_FAST8_T==1
-    DETECT_BYTE(int_fast8_t,    INT_FAST8,    d_g[nd_g]); nd_g++;
-  #else
-    DETECT_I(int_fast8_t,       INT_FAST8,    d_g[nd_g]); nd_g++;
-  #endif
+#if H5_SIZEOF_INT_LEAST8_T > 0
+#if H5_SIZEOF_INT_LEAST8_T == 1
+    DETECT_BYTE(int_least8_t, INT_LEAST8, d_g[nd_g]);
+    nd_g++;
+#else
+    DETECT_I(int_least8_t, INT_LEAST8, d_g[nd_g]);
+    nd_g++;
+#endif
+#endif
+#if H5_SIZEOF_UINT_LEAST8_T > 0
+#if H5_SIZEOF_UINT_LEAST8_T == 1
+    DETECT_BYTE(uint_least8_t, UINT_LEAST8, d_g[nd_g]);
+    nd_g++;
+#else
+    DETECT_I(uint_least8_t, UINT_LEAST8, d_g[nd_g]);
+    nd_g++;
+#endif
+#endif
+#if H5_SIZEOF_INT_FAST8_T > 0
+#if H5_SIZEOF_INT_FAST8_T == 1
+    DETECT_BYTE(int_fast8_t, INT_FAST8, d_g[nd_g]);
+    nd_g++;
+#else
+    DETECT_I(int_fast8_t, INT_FAST8, d_g[nd_g]);
+    nd_g++;
+#endif
+#endif
+#if H5_SIZEOF_UINT_FAST8_T > 0
+#if H5_SIZEOF_UINT_FAST8_T == 1
+    DETECT_BYTE(uint_fast8_t, UINT_FAST8, d_g[nd_g]);
+    nd_g++;
+#else
+    DETECT_I(uint_fast8_t, UINT_FAST8, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT_FAST8_T>0
-  #if H5_SIZEOF_UINT_FAST8_T==1
-    DETECT_BYTE(uint_fast8_t,   UINT_FAST8,   d_g[nd_g]); nd_g++;
-  #else
-    DETECT_I(uint_fast8_t,      UINT_FAST8,   d_g[nd_g]); nd_g++;
-  #endif
 #endif
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers16
  *
@@ -1392,27 +1402,32 @@ detect_C99_integers8(void)
 static void HDF_NO_UBSAN
 detect_C99_integers16(void)
 {
-#if H5_SIZEOF_INT16_T>0
-    DETECT_I(int16_t,           INT16,        d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT16_T > 0
+    DETECT_I(int16_t, INT16, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT16_T>0
-    DETECT_I(uint16_t,          UINT16,       d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT16_T > 0
+    DETECT_I(uint16_t, UINT16, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_INT_LEAST16_T>0
-    DETECT_I(int_least16_t,     INT_LEAST16,  d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT_LEAST16_T > 0
+    DETECT_I(int_least16_t, INT_LEAST16, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT_LEAST16_T>0
-    DETECT_I(uint_least16_t,    UINT_LEAST16, d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT_LEAST16_T > 0
+    DETECT_I(uint_least16_t, UINT_LEAST16, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_INT_FAST16_T>0
-    DETECT_I(int_fast16_t,      INT_FAST16,   d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT_FAST16_T > 0
+    DETECT_I(int_fast16_t, INT_FAST16, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT_FAST16_T>0
-    DETECT_I(uint_fast16_t,     UINT_FAST16,  d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT_FAST16_T > 0
+    DETECT_I(uint_fast16_t, UINT_FAST16, d_g[nd_g]);
+    nd_g++;
 #endif
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers32
  *
@@ -1424,27 +1439,32 @@ detect_C99_integers16(void)
 static void HDF_NO_UBSAN
 detect_C99_integers32(void)
 {
-#if H5_SIZEOF_INT32_T>0
-    DETECT_I(int32_t,           INT32,        d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT32_T > 0
+    DETECT_I(int32_t, INT32, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT32_T>0
-    DETECT_I(uint32_t,          UINT32,       d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT32_T > 0
+    DETECT_I(uint32_t, UINT32, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_INT_LEAST32_T>0
-    DETECT_I(int_least32_t,     INT_LEAST32,  d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT_LEAST32_T > 0
+    DETECT_I(int_least32_t, INT_LEAST32, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT_LEAST32_T>0
-    DETECT_I(uint_least32_t,    UINT_LEAST32, d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT_LEAST32_T > 0
+    DETECT_I(uint_least32_t, UINT_LEAST32, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_INT_FAST32_T>0
-    DETECT_I(int_fast32_t,      INT_FAST32,   d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT_FAST32_T > 0
+    DETECT_I(int_fast32_t, INT_FAST32, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT_FAST32_T>0
-    DETECT_I(uint_fast32_t,     UINT_FAST32,  d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT_FAST32_T > 0
+    DETECT_I(uint_fast32_t, UINT_FAST32, d_g[nd_g]);
+    nd_g++;
 #endif
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers64
  *
@@ -1457,40 +1477,49 @@ detect_C99_integers32(void)
 static void HDF_NO_UBSAN
 detect_C99_integers64(void)
 {
-#if H5_SIZEOF_INT64_T>0
-    DETECT_I(int64_t,           INT64,        d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT64_T > 0
+    DETECT_I(int64_t, INT64, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT64_T>0
-    DETECT_I(uint64_t,          UINT64,       d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT64_T > 0
+    DETECT_I(uint64_t, UINT64, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_INT_LEAST64_T>0
-    DETECT_I(int_least64_t,     INT_LEAST64,  d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT_LEAST64_T > 0
+    DETECT_I(int_least64_t, INT_LEAST64, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT_LEAST64_T>0
-    DETECT_I(uint_least64_t,    UINT_LEAST64, d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT_LEAST64_T > 0
+    DETECT_I(uint_least64_t, UINT_LEAST64, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_INT_FAST64_T>0
-    DETECT_I(int_fast64_t,      INT_FAST64,   d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_INT_FAST64_T > 0
+    DETECT_I(int_fast64_t, INT_FAST64, d_g[nd_g]);
+    nd_g++;
 #endif
-#if H5_SIZEOF_UINT_FAST64_T>0
-    DETECT_I(uint_fast64_t,     UINT_FAST64,  d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_UINT_FAST64_T > 0
+    DETECT_I(uint_fast64_t, UINT_FAST64, d_g[nd_g]);
+    nd_g++;
 #endif
 
-#if H5_SIZEOF_LONG_LONG>0
-    DETECT_I(long long,          LLONG,        d_g[nd_g]); nd_g++;
-    DETECT_I(unsigned long long, ULLONG,       d_g[nd_g]); nd_g++;
+#if H5_SIZEOF_LONG_LONG > 0
+    DETECT_I(long long, LLONG, d_g[nd_g]);
+    nd_g++;
+    DETECT_I(unsigned long long, ULLONG, d_g[nd_g]);
+    nd_g++;
 #else
     /*
      * This architecture doesn't support an integer type larger than `long'
      * so we'll just make H5T_NATIVE_LLONG the same as H5T_NATIVE_LONG since
      * `long long' is probably equivalent to `long' here anyway.
      */
-    DETECT_I(long,          LLONG,        d_g[nd_g]); nd_g++;
-    DETECT_I(unsigned long, ULLONG,       d_g[nd_g]); nd_g++;
+    DETECT_I(long, LLONG, d_g[nd_g]);
+    nd_g++;
+    DETECT_I(unsigned long, ULLONG, d_g[nd_g]);
+    nd_g++;
 #endif
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers
  *
@@ -1510,7 +1539,6 @@ detect_C99_integers(void)
     detect_C99_integers64();
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_floats
  *
@@ -1529,13 +1557,14 @@ detect_C99_floats(void)
      * some systems and `long double' is probably the same as `double' here
      * anyway.
      */
-    DETECT_F(double,          LDOUBLE,      d_g[nd_g]); nd_g++;
-#elif H5_SIZEOF_LONG_DOUBLE !=0
-    DETECT_F(long double,      LDOUBLE,      d_g[nd_g]); nd_g++;
+    DETECT_F(double, LDOUBLE, d_g[nd_g]);
+    nd_g++;
+#elif H5_SIZEOF_LONG_DOUBLE != 0
+    DETECT_F(long double, LDOUBLE, d_g[nd_g]);
+    nd_g++;
 #endif
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    detect_alignments
  *
@@ -1548,20 +1577,24 @@ static void HDF_NO_UBSAN
 detect_alignments(void)
 {
     /* Detect structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
-    DETECT_M(void *,              POINTER,      m_g[na_g]); na_g++;
-    DETECT_M(hvl_t,               HVL,          m_g[na_g]); na_g++;
-    DETECT_M(hobj_ref_t,          HOBJREF,      m_g[na_g]); na_g++;
-    DETECT_M(hdset_reg_ref_t,     HDSETREGREF,  m_g[na_g]); na_g++;
+    DETECT_M(void *, POINTER, m_g[na_g]);
+    na_g++;
+    DETECT_M(hvl_t, HVL, m_g[na_g]);
+    na_g++;
+    DETECT_M(hobj_ref_t, HOBJREF, m_g[na_g]);
+    na_g++;
+    DETECT_M(hdset_reg_ref_t, HDSETREGREF, m_g[na_g]);
+    na_g++;
 }
 
-
 #if defined(H5SETJMP) && defined(H5_HAVE_SIGNAL)
 /* Verify the signal handler for signal signum works correctly multiple times.
  * One possible cause of failure is that the signal handling is blocked or
  * changed to SIG_DFL after H5LONGJMP.
  * Return  0 for success, -1 for failure.
  */
-static int verify_signal_handlers(int signum, void (*handler)(int))
+static int
+verify_signal_handlers(int signum, void (*handler)(int))
 {
 #if defined(__has_feature) /* Clang */
 #if __has_feature(address_sanitizer) || __has_feature(thread_sanitizer)
@@ -1571,15 +1604,15 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
 #elif defined(__SANITIZE_ADDRESS__) || defined(__SANITIZE_THREAD__) /* GCC */
     return 0;
 #endif
-    void    (*save_handler)(int) = HDsignal(signum, handler);
+    void (*save_handler)(int) = HDsignal(signum, handler);
     volatile int i, val;
-    int          ntries = 5;
-    volatile int nfailures = 0;
+    int          ntries     = 5;
+    volatile int nfailures  = 0;
     volatile int nsuccesses = 0;
 
-    for(i=0;i<ntries; i++) {
-        val=H5SETJMP(jbuf_g);
-        if(val==0) {
+    for (i = 0; i < ntries; i++) {
+        val = H5SETJMP(jbuf_g);
+        if (val == 0) {
             /* send self the signal to trigger the handler */
             signal_handler_tested_g++;
             HDraise(signum);
@@ -1587,7 +1620,7 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
             nfailures++;
         }
         else {
-            if(val==signum) {
+            if (val == signum) {
                 /* return from signum handler. Record a sucess. */
                 nsuccesses++;
             }
@@ -1599,10 +1632,11 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
     }
     /* restore save handler, check results and report failures */
     HDsignal(signum, save_handler);
-    if(nfailures>0 || nsuccesses != ntries) {
-        fprintf(stderr, "verify_signal_handlers for signal %d did %d tries. "
-            "Found %d failures and %d successes\n",
-            signum, ntries, nfailures, nsuccesses);
+    if (nfailures > 0 || nsuccesses != ntries) {
+        fprintf(stderr,
+                "verify_signal_handlers for signal %d did %d tries. "
+                "Found %d failures and %d successes\n",
+                signum, ntries, nfailures, nsuccesses);
         return -1;
     }
     else {
@@ -1612,7 +1646,6 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
 }
 #endif
 
-
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -1631,20 +1664,20 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
 int HDF_NO_UBSAN
 main(int argc, char *argv[])
 {
-    char    *fname = NULL;
-    FILE    *f;    /* temporary holding place for the stream pointer
-                    * so that rawoutstream is changed only when succeeded */
+    char *fname = NULL;
+    FILE *f; /* temporary holding place for the stream pointer
+              * so that rawoutstream is changed only when succeeded */
 
-    if(argc > 1)
+    if (argc > 1)
         fname = argv[1];
 
     /* First check if filename is string "NULL" */
-    if(fname != NULL) {
+    if (fname != NULL) {
         /* binary output */
-        if((f = HDfopen(fname, "w")) != NULL)
+        if ((f = HDfopen(fname, "w")) != NULL)
             rawoutstream = f;
     }
-    if(!rawoutstream)
+    if (!rawoutstream)
         rawoutstream = stdout;
 
 #if defined(H5_HAVE_SETSYSINFO) && defined(SSI_NVPAIRS)
@@ -1653,29 +1686,25 @@ main(int argc, char *argv[])
      * Make sure unaligned access generates SIGBUS and doesn't print warning
      * messages so that we can detect alignment constraints on the DEC Alpha.
      */
-    int            nvpairs[2];
+    int nvpairs[2];
     nvpairs[0] = SSIN_UACPROC;
     nvpairs[1] = UAC_NOPRINT | UAC_SIGBUS;
-    if(setsysinfo(SSI_NVPAIRS, nvpairs, 1, 0, 0)<0) {
-        fprintf(stderr, "H5detect: unable to turn off UAC handling: %s\n",
-        HDstrerror(errno));
+    if (setsysinfo(SSI_NVPAIRS, nvpairs, 1, 0, 0) < 0) {
+        fprintf(stderr, "H5detect: unable to turn off UAC handling: %s\n", HDstrerror(errno));
     }
 #endif
 #endif
 
 #if defined(H5SETJMP) && defined(H5_HAVE_SIGNAL)
     /* verify the SIGBUS and SIGSEGV handlers work properly */
-    if(verify_signal_handlers(SIGBUS, sigbus_handler) != 0) {
-        fprintf(stderr, "Signal handler %s for signal %d failed\n",
-                "sigbus_handler", SIGBUS);
+    if (verify_signal_handlers(SIGBUS, sigbus_handler) != 0) {
+        fprintf(stderr, "Signal handler %s for signal %d failed\n", "sigbus_handler", SIGBUS);
     }
-    if(verify_signal_handlers(SIGSEGV, sigsegv_handler) != 0) {
-        fprintf(stderr, "Signal handler %s for signal %d failed\n",
-                "sigsegv_handler", SIGSEGV);
+    if (verify_signal_handlers(SIGSEGV, sigsegv_handler) != 0) {
+        fprintf(stderr, "Signal handler %s for signal %d failed\n", "sigsegv_handler", SIGSEGV);
     }
-    if(verify_signal_handlers(SIGILL, sigill_handler) != 0) {
-        fprintf(stderr, "Signal handler %s for signal %d failed\n",
-                "sigill_handler", SIGILL);
+    if (verify_signal_handlers(SIGILL, sigill_handler) != 0) {
+        fprintf(stderr, "Signal handler %s for signal %d failed\n", "sigill_handler", SIGILL);
     }
 #else
     align_status_g |= STA_NoHandlerVerify;
@@ -1698,10 +1727,10 @@ main(int argc, char *argv[])
     /* Detect structure alignment */
     detect_alignments();
 
-    print_results (nd_g, d_g, na_g, m_g);
+    print_results(nd_g, d_g, na_g, m_g);
 
-    if(rawoutstream && rawoutstream != stdout) {
-        if(HDfclose(rawoutstream))
+    if (rawoutstream && rawoutstream != stdout) {
+        if (HDfclose(rawoutstream))
             fprintf(stderr, "closing rawoutstream");
         else
             rawoutstream = NULL;
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
index 2f3224e..44768dd 100644
--- a/src/H5make_libsettings.c
+++ b/src/H5make_libsettings.c
@@ -41,8 +41,7 @@ static const char *FileHeader = "\n\
 
 #define LIBSETTINGSFNAME "libhdf5.settings"
 
-FILE       *rawoutstream = NULL;
-
+FILE *rawoutstream = NULL;
 
 /*-------------------------------------------------------------------------
  * Function:  insert_libhdf5_settings
@@ -59,11 +58,11 @@ static void
 insert_libhdf5_settings(FILE *flibinfo)
 {
 #ifdef H5_HAVE_EMBEDDED_LIBINFO
-    FILE *fsettings;    /* for files libhdf5.settings */
-    int inchar;
-    int    bol = 0;    /* indicates the beginning of a new line */
+    FILE *fsettings; /* for files libhdf5.settings */
+    int   inchar;
+    int   bol = 0; /* indicates the beginning of a new line */
 
-    if(NULL == (fsettings = HDfopen(LIBSETTINGSFNAME, "r"))) {
+    if (NULL == (fsettings = HDfopen(LIBSETTINGSFNAME, "r"))) {
         HDperror(LIBSETTINGSFNAME);
         HDexit(EXIT_FAILURE);
     } /* end if */
@@ -72,13 +71,13 @@ insert_libhdf5_settings(FILE *flibinfo)
     /* Do not use const else AIX strings does not show it. */
     fprintf(flibinfo, "char H5libhdf5_settings[]=\n");
     bol++;
-    while(EOF != (inchar = HDgetc(fsettings))) {
-        if(bol) {
+    while (EOF != (inchar = HDgetc(fsettings))) {
+        if (bol) {
             /* Start a new line */
             fprintf(flibinfo, "\t\"");
             bol = 0;
         } /* end if */
-        if(inchar == '\n') {
+        if (inchar == '\n') {
             /* end of a line */
             fprintf(flibinfo, "\\n\"\n");
             bol++;
@@ -86,9 +85,9 @@ insert_libhdf5_settings(FILE *flibinfo)
         else
             HDputc(inchar, flibinfo);
     } /* end while */
-    if(HDfeof(fsettings)) {
+    if (HDfeof(fsettings)) {
         /* wrap up */
-        if(!bol)
+        if (!bol)
             /* EOF found without a new line */
             fprintf(flibinfo, "\\n\"\n");
         fprintf(flibinfo, ";\n\n");
@@ -97,7 +96,7 @@ insert_libhdf5_settings(FILE *flibinfo)
         fprintf(stderr, "Read errors encountered with %s\n", LIBSETTINGSFNAME);
         HDexit(EXIT_FAILURE);
     } /* end else */
-    if(0 != HDfclose(fsettings)) {
+    if (0 != HDfclose(fsettings)) {
         HDperror(LIBSETTINGSFNAME);
         HDexit(EXIT_FAILURE);
     } /* end if */
@@ -108,7 +107,6 @@ insert_libhdf5_settings(FILE *flibinfo)
 #endif
 } /* insert_libhdf5_settings() */
 
-
 /*-------------------------------------------------------------------------
  * Function:  make_libinfo
  *
@@ -126,7 +124,6 @@ make_libinfo(void)
     insert_libhdf5_settings(rawoutstream);
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  print_header
  *
@@ -138,22 +135,20 @@ make_libinfo(void)
 static void
 print_header(void)
 {
-    time_t        now = HDtime(NULL);
-    struct tm        *tm = HDlocaltime(&now);
+    time_t      now = HDtime(NULL);
+    struct tm * tm  = HDlocaltime(&now);
     char        real_name[30];
     char        host_name[256];
-    int            i;
-    const char        *s;
+    int         i;
+    const char *s;
 #ifdef H5_HAVE_GETPWUID
-    struct passwd    *pwd = NULL;
+    struct passwd *pwd = NULL;
 #else
-    int            pwd = 1;
+    int pwd      = 1;
 #endif
-    static const char    *month_name[] =
-    {
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-    static const char    *purpose = "\
+    static const char *month_name[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                                       "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+    static const char *purpose      = "\
 This machine-generated source code contains\n\
 information about the library build configuration\n";
 
@@ -163,10 +158,10 @@ information about the library build configuration\n";
 #ifdef H5_HAVE_GETPWUID
     {
         size_t n;
-        char *comma;
+        char * comma;
 
-        if((pwd = HDgetpwuid(HDgetuid()))) {
-            if((comma = HDstrchr(pwd->pw_gecos, ','))) {
+        if ((pwd = HDgetpwuid(HDgetuid()))) {
+            if ((comma = HDstrchr(pwd->pw_gecos, ','))) {
                 n = MIN(sizeof(real_name) - 1, (unsigned)(comma - pwd->pw_gecos));
                 HDstrncpy(real_name, pwd->pw_gecos, n);
                 real_name[n] = '\0';
@@ -175,7 +170,7 @@ information about the library build configuration\n";
                 HDstrncpy(real_name, pwd->pw_gecos, sizeof(real_name));
                 real_name[sizeof(real_name) - 1] = '\0';
             } /* end else */
-        } /* end if */
+        }     /* end if */
         else
             real_name[0] = '\0';
     }
@@ -187,7 +182,7 @@ information about the library build configuration\n";
      * The FQDM of this host or the empty string.
      */
 #ifdef H5_HAVE_GETHOSTNAME
-    if(HDgethostname(host_name, sizeof(host_name)) < 0)
+    if (HDgethostname(host_name, sizeof(host_name)) < 0)
         host_name[0] = '\0';
 #else
     host_name[0] = '\0';
@@ -197,27 +192,28 @@ information about the library build configuration\n";
      * The file header: warning, copyright notice, build information.
      */
     fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n");
-    HDfputs(FileHeader, rawoutstream);        /*the copyright notice--see top of this file */
+    HDfputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */
 
-    fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year);
-    if(pwd || real_name[0] || host_name[0]) {
+    fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday,
+            1900 + tm->tm_year);
+    if (pwd || real_name[0] || host_name[0]) {
         fprintf(rawoutstream, " *\t\t\t");
-        if(real_name[0])
+        if (real_name[0])
             fprintf(rawoutstream, "%s <", real_name);
 #ifdef H5_HAVE_GETPWUID
-        if(pwd)
+        if (pwd)
             HDfputs(pwd->pw_name, rawoutstream);
 #endif
-        if(host_name[0])
+        if (host_name[0])
             fprintf(rawoutstream, "@%s", host_name);
-        if(real_name[0])
+        if (real_name[0])
             fprintf(rawoutstream, ">");
         HDfputc('\n', rawoutstream);
     } /* end if */
     fprintf(rawoutstream, " *\n * Purpose:\t\t");
-    for(s = purpose; *s; s++) {
+    for (s = purpose; *s; s++) {
         HDfputc(*s, rawoutstream);
-        if('\n' == *s && s[1])
+        if ('\n' == *s && s[1])
             fprintf(rawoutstream, " *\t\t\t");
     } /* end for */
 
@@ -226,12 +222,11 @@ information about the library build configuration\n";
     fprintf(rawoutstream, " *\tIt was generated by code in `H5make_libsettings.c'.\n");
 
     fprintf(rawoutstream, " *\n *");
-    for(i = 0; i < 73; i++)
+    for (i = 0; i < 73; i++)
         HDfputc('-', rawoutstream);
     fprintf(rawoutstream, "\n */\n\n");
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  print_footer
  *
@@ -246,7 +241,6 @@ print_footer(void)
     /* nothing */
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:  main
  *
@@ -258,21 +252,21 @@ print_footer(void)
 int
 main(int argc, char *argv[])
 {
-    char    *fname = NULL;
-    FILE    *f;    /* temporary holding place for the stream pointer
-                    * so that rawoutstream is changed only when succeeded
-                    */
+    char *fname = NULL;
+    FILE *f; /* temporary holding place for the stream pointer
+              * so that rawoutstream is changed only when succeeded
+              */
 
-    if(argc > 1)
+    if (argc > 1)
         fname = argv[1];
 
     /* First check if filename is string "NULL" */
-    if(fname != NULL) {
+    if (fname != NULL) {
         /* binary output */
-        if((f = HDfopen(fname, "w")) != NULL)
+        if ((f = HDfopen(fname, "w")) != NULL)
             rawoutstream = f;
     }
-    if(!rawoutstream)
+    if (!rawoutstream)
         rawoutstream = stdout;
 
     print_header();
@@ -282,8 +276,8 @@ main(int argc, char *argv[])
 
     print_footer();
 
-    if(rawoutstream && rawoutstream != stdout) {
-        if(HDfclose(rawoutstream))
+    if (rawoutstream && rawoutstream != stdout) {
+        if (HDfclose(rawoutstream))
             fprintf(stderr, "closing rawoutstream");
         else
             rawoutstream = NULL;
@@ -291,4 +285,3 @@ main(int argc, char *argv[])
 
     HDexit(EXIT_SUCCESS);
 }
-
diff --git a/src/H5overflow.h b/src/H5overflow.h
index af21277..54433c8 100644
--- a/src/H5overflow.h
+++ b/src/H5overflow.h
@@ -14,11 +14,9 @@
 /* Generated automatically by bin/make_overflow -- do not edit */
 /* Add new types to H5overflow.txt file */
 
-
 #ifndef _H5overflow_H
 #define _H5overflow_H
 
-
 /* Each type in this file is tested for assignment to the other types,
  *      and range checks are defined for bad assignments at run-time.
  */
@@ -27,2226 +25,2186 @@
 
 /* src: unsigned, dst: int8_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_INT8_T
-    #define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_INT8_T
-    #define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_INT8_T */
-    #define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: int8_t */
 
 /* src: unsigned, dst: int */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_INT
-    #define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_INT
-    #define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_INT */
-    #define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: int */
 
 /* src: unsigned, dst: uint8_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_UINT8_T
-    #define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_UINT8_T
-    #define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: uint8_t */
 
 /* src: unsigned, dst: uint16_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_UINT16_T
-    #define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_UINT16_T
-    #define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: uint16_t */
 
 /* src: unsigned, dst: uint32_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_UINT32_T
-    #define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_UINT32_T
-    #define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: uint32_t */
 
 /* src: unsigned, dst: uint64_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_UINT64_T
-    #define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_UINT64_T
-    #define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: uint64_t */
 
 /* src: unsigned, dst: ptrdiff_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: ptrdiff_t */
 
 /* src: unsigned, dst: size_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_SIZE_T
-    #define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_SIZE_T
-    #define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: size_t */
 
 /* src: unsigned, dst: ssize_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: ssize_t */
 
 /* src: unsigned, dst: haddr_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_HADDR_T
-    #define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_HADDR_T
-    #define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: haddr_t */
 
 /* src: unsigned, dst: hsize_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: hsize_t */
 
 /* src: unsigned, dst: hssize_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: hssize_t */
 
 /* src: unsigned, dst: h5_stat_size_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: h5_stat_size_t */
 
-
 /* Assignment checks for int8_t */
 
 /* src: int8_t, dst: unsigned */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: unsigned */
 
 /* src: int8_t, dst: int */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_INT
-    #define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype)                                                     \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_INT
-    #define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_INT */
-    #define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype)                                                     \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: int */
 
 /* src: int8_t, dst: uint8_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: uint8_t */
 
 /* src: int8_t, dst: uint16_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: uint16_t */
 
 /* src: int8_t, dst: uint32_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: uint32_t */
 
 /* src: int8_t, dst: uint64_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: uint64_t */
 
 /* src: int8_t, dst: ptrdiff_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: ptrdiff_t */
 
 /* src: int8_t, dst: size_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype)                                                  \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype)                                                  \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: size_t */
 
 /* src: int8_t, dst: ssize_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: ssize_t */
 
 /* src: int8_t, dst: haddr_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: haddr_t */
 
 /* src: int8_t, dst: hsize_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: hsize_t */
 
 /* src: int8_t, dst: hssize_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: hssize_t */
 
 /* src: int8_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for int */
 
 /* src: int, dst: unsigned */
 #if H5_SIZEOF_INT < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: unsigned */
 
 /* src: int, dst: int8_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_INT8_T
-    #define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype)                                                     \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_INT8_T
-    #define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_INT8_T */
-    #define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype)                                                     \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: int8_t */
 
 /* src: int, dst: uint8_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_UINT8_T
-    #define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UINT8_T
-    #define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: uint8_t */
 
 /* src: int, dst: uint16_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_UINT16_T
-    #define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UINT16_T
-    #define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: uint16_t */
 
 /* src: int, dst: uint32_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_UINT32_T
-    #define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UINT32_T
-    #define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: uint32_t */
 
 /* src: int, dst: uint64_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_UINT64_T
-    #define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UINT64_T
-    #define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: uint64_t */
 
 /* src: int, dst: ptrdiff_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype)                                                  \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype)                                                  \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: ptrdiff_t */
 
 /* src: int, dst: size_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_SIZE_T
-    #define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype)                                                     \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_SIZE_T
-    #define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype)                                                     \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: size_t */
 
 /* src: int, dst: ssize_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: ssize_t */
 
 /* src: int, dst: haddr_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_HADDR_T
-    #define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_HADDR_T
-    #define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: haddr_t */
 
 /* src: int, dst: hsize_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: hsize_t */
 
 /* src: int, dst: hssize_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: hssize_t */
 
 /* src: int, dst: h5_stat_size_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: h5_stat_size_t */
 
-
 /* Assignment checks for uint8_t */
 
 /* src: uint8_t, dst: unsigned */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: unsigned */
 
 /* src: uint8_t, dst: int8_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: int8_t */
 
 /* src: uint8_t, dst: int */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_INT
-    #define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_INT
-    #define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_INT */
-    #define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: int */
 
 /* src: uint8_t, dst: uint16_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: uint16_t */
 
 /* src: uint8_t, dst: uint32_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: uint32_t */
 
 /* src: uint8_t, dst: uint64_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: uint64_t */
 
 /* src: uint8_t, dst: ptrdiff_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: ptrdiff_t */
 
 /* src: uint8_t, dst: size_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: size_t */
 
 /* src: uint8_t, dst: ssize_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: ssize_t */
 
 /* src: uint8_t, dst: haddr_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: haddr_t */
 
 /* src: uint8_t, dst: hsize_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: hsize_t */
 
 /* src: uint8_t, dst: hssize_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: hssize_t */
 
 /* src: uint8_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for uint16_t */
 
 /* src: uint16_t, dst: unsigned */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: unsigned */
 
 /* src: uint16_t, dst: int8_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: int8_t */
 
 /* src: uint16_t, dst: int */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_INT
-    #define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_INT
-    #define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_INT */
-    #define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: int */
 
 /* src: uint16_t, dst: uint8_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: uint8_t */
 
 /* src: uint16_t, dst: uint32_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: uint32_t */
 
 /* src: uint16_t, dst: uint64_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: uint64_t */
 
 /* src: uint16_t, dst: ptrdiff_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: ptrdiff_t */
 
 /* src: uint16_t, dst: size_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: size_t */
 
 /* src: uint16_t, dst: ssize_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: ssize_t */
 
 /* src: uint16_t, dst: haddr_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: haddr_t */
 
 /* src: uint16_t, dst: hsize_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: hsize_t */
 
 /* src: uint16_t, dst: hssize_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: hssize_t */
 
 /* src: uint16_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for uint32_t */
 
 /* src: uint32_t, dst: unsigned */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: unsigned */
 
 /* src: uint32_t, dst: int8_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: int8_t */
 
 /* src: uint32_t, dst: int */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_INT
-    #define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_INT
-    #define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_INT */
-    #define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: int */
 
 /* src: uint32_t, dst: uint8_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: uint8_t */
 
 /* src: uint32_t, dst: uint16_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: uint16_t */
 
 /* src: uint32_t, dst: uint64_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: uint64_t */
 
 /* src: uint32_t, dst: ptrdiff_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: ptrdiff_t */
 
 /* src: uint32_t, dst: size_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: size_t */
 
 /* src: uint32_t, dst: ssize_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: ssize_t */
 
 /* src: uint32_t, dst: haddr_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: haddr_t */
 
 /* src: uint32_t, dst: hsize_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: hsize_t */
 
 /* src: uint32_t, dst: hssize_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: hssize_t */
 
 /* src: uint32_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for uint64_t */
 
 /* src: uint64_t, dst: unsigned */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: unsigned */
 
 /* src: uint64_t, dst: int8_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: int8_t */
 
 /* src: uint64_t, dst: int */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_INT
-    #define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_INT
-    #define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_INT */
-    #define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: int */
 
 /* src: uint64_t, dst: uint8_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: uint8_t */
 
 /* src: uint64_t, dst: uint16_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: uint16_t */
 
 /* src: uint64_t, dst: uint32_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: uint32_t */
 
 /* src: uint64_t, dst: ptrdiff_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: ptrdiff_t */
 
 /* src: uint64_t, dst: size_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: size_t */
 
 /* src: uint64_t, dst: ssize_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: ssize_t */
 
 /* src: uint64_t, dst: haddr_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: haddr_t */
 
 /* src: uint64_t, dst: hsize_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: hsize_t */
 
 /* src: uint64_t, dst: hssize_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: hssize_t */
 
 /* src: uint64_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for ptrdiff_t */
 
 /* src: ptrdiff_t, dst: unsigned */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: unsigned */
 
 /* src: ptrdiff_t, dst: int8_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: int8_t */
 
 /* src: ptrdiff_t, dst: int */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_INT
-    #define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype)                                                  \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_INT
-    #define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_INT */
-    #define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype)                                                  \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: int */
 
 /* src: ptrdiff_t, dst: uint8_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: uint8_t */
 
 /* src: ptrdiff_t, dst: uint16_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: uint16_t */
 
 /* src: ptrdiff_t, dst: uint32_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: uint32_t */
 
 /* src: ptrdiff_t, dst: uint64_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: uint64_t */
 
 /* src: ptrdiff_t, dst: size_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: size_t */
 
 /* src: ptrdiff_t, dst: ssize_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: ssize_t */
 
 /* src: ptrdiff_t, dst: haddr_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: haddr_t */
 
 /* src: ptrdiff_t, dst: hsize_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: hsize_t */
 
 /* src: ptrdiff_t, dst: hssize_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: hssize_t */
 
 /* src: ptrdiff_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                       \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                       \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                       \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for size_t */
 
 /* src: size_t, dst: unsigned */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: unsigned */
 
 /* src: size_t, dst: int8_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype)                                                  \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype)                                                  \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: int8_t */
 
 /* src: size_t, dst: int */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_INT
-    #define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype)                                                     \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_INT
-    #define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_INT */
-    #define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype)                                                     \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: int */
 
 /* src: size_t, dst: uint8_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: uint8_t */
 
 /* src: size_t, dst: uint16_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: uint16_t */
 
 /* src: size_t, dst: uint32_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: uint32_t */
 
 /* src: size_t, dst: uint64_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: uint64_t */
 
 /* src: size_t, dst: ptrdiff_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: ptrdiff_t */
 
 /* src: size_t, dst: ssize_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: ssize_t */
 
 /* src: size_t, dst: haddr_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: haddr_t */
 
 /* src: size_t, dst: hsize_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: hsize_t */
 
 /* src: size_t, dst: hssize_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: hssize_t */
 
 /* src: size_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for ssize_t */
 
 /* src: ssize_t, dst: unsigned */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: unsigned */
 
 /* src: ssize_t, dst: int8_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: int8_t */
 
 /* src: ssize_t, dst: int */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_INT
-    #define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_INT
-    #define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_INT */
-    #define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: int */
 
 /* src: ssize_t, dst: uint8_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: uint8_t */
 
 /* src: ssize_t, dst: uint16_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: uint16_t */
 
 /* src: ssize_t, dst: uint32_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: uint32_t */
 
 /* src: ssize_t, dst: uint64_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: uint64_t */
 
 /* src: ssize_t, dst: ptrdiff_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: ptrdiff_t */
 
 /* src: ssize_t, dst: size_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: size_t */
 
 /* src: ssize_t, dst: haddr_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: haddr_t */
 
 /* src: ssize_t, dst: hsize_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: hsize_t */
 
 /* src: ssize_t, dst: hssize_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: hssize_t */
 
 /* src: ssize_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for haddr_t */
 
 /* src: haddr_t, dst: unsigned */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: unsigned */
 
 /* src: haddr_t, dst: int8_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: int8_t */
 
 /* src: haddr_t, dst: int */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_INT
-    #define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_INT
-    #define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_INT */
-    #define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: int */
 
 /* src: haddr_t, dst: uint8_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: uint8_t */
 
 /* src: haddr_t, dst: uint16_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: uint16_t */
 
 /* src: haddr_t, dst: uint32_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: uint32_t */
 
 /* src: haddr_t, dst: uint64_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: uint64_t */
 
 /* src: haddr_t, dst: ptrdiff_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: ptrdiff_t */
 
 /* src: haddr_t, dst: size_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: size_t */
 
 /* src: haddr_t, dst: ssize_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: ssize_t */
 
 /* src: haddr_t, dst: hsize_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: hsize_t */
 
 /* src: haddr_t, dst: hssize_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: hssize_t */
 
 /* src: haddr_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for hsize_t */
 
 /* src: hsize_t, dst: unsigned */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: unsigned */
 
 /* src: hsize_t, dst: int8_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: int8_t */
 
 /* src: hsize_t, dst: int */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_INT
-    #define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_INT
-    #define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_INT */
-    #define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype)                                                    \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: int */
 
 /* src: hsize_t, dst: uint8_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: uint8_t */
 
 /* src: hsize_t, dst: uint16_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: uint16_t */
 
 /* src: hsize_t, dst: uint32_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: uint32_t */
 
 /* src: hsize_t, dst: uint64_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: uint64_t */
 
 /* src: hsize_t, dst: ptrdiff_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: ptrdiff_t */
 
 /* src: hsize_t, dst: size_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: size_t */
 
 /* src: hsize_t, dst: ssize_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: ssize_t */
 
 /* src: hsize_t, dst: haddr_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: haddr_t */
 
 /* src: hsize_t, dst: hssize_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: hssize_t */
 
 /* src: hsize_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for hssize_t */
 
 /* src: hssize_t, dst: unsigned */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: unsigned */
 
 /* src: hssize_t, dst: int8_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: int8_t */
 
 /* src: hssize_t, dst: int */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_INT
-    #define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_INT
-    #define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_INT */
-    #define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype)                                                   \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: int */
 
 /* src: hssize_t, dst: uint8_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: uint8_t */
 
 /* src: hssize_t, dst: uint16_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: uint16_t */
 
 /* src: hssize_t, dst: uint32_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: uint32_t */
 
 /* src: hssize_t, dst: uint64_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: uint64_t */
 
 /* src: hssize_t, dst: ptrdiff_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: ptrdiff_t */
 
 /* src: hssize_t, dst: size_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype)                                                \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: size_t */
 
 /* src: hssize_t, dst: ssize_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: ssize_t */
 
 /* src: hssize_t, dst: haddr_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: haddr_t */
 
 /* src: hssize_t, dst: hsize_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: hsize_t */
 
 /* src: hssize_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_H5_STAT_SIZE_T
-    #define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_H5_STAT_SIZE_T */
-    #define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: h5_stat_size_t */
 
-
 /* Assignment checks for h5_stat_size_t */
 
 /* src: h5_stat_size_t, dst: unsigned */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UNSIGNED
-    #define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UNSIGNED
-    #define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UNSIGNED */
-    #define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: unsigned */
 
 /* src: h5_stat_size_t, dst: int8_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_INT8_T
-    #define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_INT8_T
-    #define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_INT8_T */
-    #define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: int8_t */
 
 /* src: h5_stat_size_t, dst: int */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_INT
-    #define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_INT
-    #define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_INT */
-    #define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype)                                             \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: int */
 
 /* src: h5_stat_size_t, dst: uint8_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UINT8_T
-    #define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UINT8_T
-    #define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UINT8_T */
-    #define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: uint8_t */
 
 /* src: h5_stat_size_t, dst: uint16_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UINT16_T
-    #define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UINT16_T
-    #define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UINT16_T */
-    #define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: uint16_t */
 
 /* src: h5_stat_size_t, dst: uint32_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UINT32_T
-    #define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UINT32_T
-    #define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UINT32_T */
-    #define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: uint32_t */
 
 /* src: h5_stat_size_t, dst: uint64_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UINT64_T
-    #define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UINT64_T
-    #define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UINT64_T */
-    #define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: uint64_t */
 
 /* src: h5_stat_size_t, dst: ptrdiff_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                       \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_PTRDIFF_T
-    #define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                       \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_PTRDIFF_T */
-    #define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                       \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: ptrdiff_t */
 
 /* src: h5_stat_size_t, dst: size_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_SIZE_T
-    #define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_SIZE_T
-    #define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_SIZE_T */
-    #define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype)                                          \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: size_t */
 
 /* src: h5_stat_size_t, dst: ssize_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_SSIZE_T
-    #define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_SSIZE_T
-    #define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_SSIZE_T */
-    #define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: ssize_t */
 
 /* src: h5_stat_size_t, dst: haddr_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_HADDR_T
-    #define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_HADDR_T
-    #define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_HADDR_T */
-    #define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: haddr_t */
 
 /* src: h5_stat_size_t, dst: hsize_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_HSIZE_T
-    #define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_HSIZE_T
-    #define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_HSIZE_T */
-    #define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                         \
+    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: hsize_t */
 
 /* src: h5_stat_size_t, dst: hssize_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_HSSIZE_T
-    #define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_HSSIZE_T */
-    #define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
-        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+#define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                        \
+    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: hssize_t */
 
 #endif /* H5overflow_H */
-
diff --git a/src/H5private.h b/src/H5private.h
index a8d2fa4..e7cbd81 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -24,39 +24,39 @@
 #ifndef _H5private_H
 #define _H5private_H
 
-#include "H5public.h"    /* Include Public Definitions    */
+#include "H5public.h" /* Include Public Definitions    */
 
 /* include the pthread header */
 #ifdef H5_HAVE_THREADSAFE
- #ifdef H5_HAVE_WIN32_API
-  #ifndef H5_HAVE_WIN_THREADS
-   #ifdef H5_HAVE_PTHREAD_H
-    #include <pthread.h>
-   #endif /* H5_HAVE_PTHREAD_H */
-  #endif /* H5_HAVE_WIN_THREADS */
- #else /* H5_HAVE_WIN32_API */
-  #ifdef H5_HAVE_PTHREAD_H
-   #include <pthread.h>
-  #endif /* H5_HAVE_PTHREAD_H */
- #endif /* H5_HAVE_WIN32_API */
+#ifdef H5_HAVE_WIN32_API
+#ifndef H5_HAVE_WIN_THREADS
+#ifdef H5_HAVE_PTHREAD_H
+#include <pthread.h>
+#endif /* H5_HAVE_PTHREAD_H */
+#endif /* H5_HAVE_WIN_THREADS */
+#else  /* H5_HAVE_WIN32_API */
+#ifdef H5_HAVE_PTHREAD_H
+#include <pthread.h>
+#endif /* H5_HAVE_PTHREAD_H */
+#endif /* H5_HAVE_WIN32_API */
 #endif /* H5_HAVE_THREADSAFE */
 
 /*
  * Include ANSI-C header files.
  */
 #ifdef H5_STDC_HEADERS
-#   include <assert.h>
-#   include <ctype.h>
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <float.h>
-#   include <limits.h>
-#   include <math.h>
-#   include <signal.h>
-#   include <stdarg.h>
-#   include <stdio.h>
-#   include <stdlib.h>
-#   include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #endif
 
 /*
@@ -64,12 +64,12 @@
  * compliant. Otherwise all bets are off.
  */
 #ifdef H5_HAVE_UNISTD_H
-#   include <sys/types.h>
-#   include <unistd.h>
+#include <sys/types.h>
+#include <unistd.h>
 #endif
 #ifdef _POSIX_VERSION
-#   include <sys/wait.h>
-#   include <pwd.h>
+#include <sys/wait.h>
+#include <pwd.h>
 #endif
 
 /*
@@ -77,7 +77,7 @@
  */
 #ifndef __cplusplus
 #ifdef H5_HAVE_STDINT_H
-#   include <stdint.h>
+#include <stdint.h>
 #endif
 #endif
 
@@ -87,7 +87,7 @@
  * for hdf5 to compile, although only a few fields are actually used.
  */
 #ifdef H5_HAVE_SYS_STAT_H
-#   include <sys/stat.h>
+#include <sys/stat.h>
 #endif
 
 /*
@@ -101,19 +101,19 @@
  * by `AC_CHECK_HEADERS(sys/time.h)' in configure.ac.
  */
 #if defined(H5_TIME_WITH_SYS_TIME)
-#   include <sys/time.h>
-#   include <time.h>
+#include <sys/time.h>
+#include <time.h>
 #elif defined(H5_HAVE_SYS_TIME_H)
-#   include <sys/time.h>
+#include <sys/time.h>
 #else
-#   include <time.h>
+#include <time.h>
 #endif
 
 /*
  * Longjumps are used to detect alignment constrants
  */
 #ifdef H5_HAVE_SETJMP_H
-#   include <setjmp.h>
+#include <setjmp.h>
 #endif
 
 /*
@@ -121,7 +121,7 @@
  * and debugging code if available.
  */
 #ifdef H5_HAVE_SYS_RESOURCE_H
-#   include <sys/resource.h>
+#include <sys/resource.h>
 #endif
 
 /*
@@ -129,7 +129,7 @@
  * reasonable output width.
  */
 #ifdef H5_HAVE_SYS_IOCTL_H
-#   include <sys/ioctl.h>
+#include <sys/ioctl.h>
 #endif
 
 /*
@@ -138,13 +138,13 @@
  * alignment constraints in H5detect.c:main().
  */
 #ifdef H5_HAVE_SYS_SYSINFO_H
-#   include <sys/sysinfo.h>
+#include <sys/sysinfo.h>
 #endif
 #ifdef H5_HAVE_SYS_PROC_H
-#   include <sys/proc.h>
+#include <sys/proc.h>
 #endif
 #ifdef H5_HAVE_IO_H
-#   include <io.h>
+#include <io.h>
 #endif
 
 /*
@@ -161,47 +161,47 @@
 /* Define the default VFD for this platform.
  * Since the removal of the Windows VFD, this is sec2 for all platforms.
  */
-#define H5_DEFAULT_VFD      H5FD_SEC2
+#define H5_DEFAULT_VFD H5FD_SEC2
 
 #ifdef H5_HAVE_WIN32_API
 /* The following two defines must be before any windows headers are included */
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
-#define NOGDI                  /* Exclude Graphic Display Interface macros */
+#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */
+#define NOGDI               /* Exclude Graphic Display Interface macros */
 
 #ifdef H5_HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 
 #ifdef H5_HAVE_THREADSAFE
-#include <process.h>        /* For _beginthread() */
+#include <process.h> /* For _beginthread() */
 #endif
 
 #include <windows.h>
-#include <direct.h>         /* For _getcwd() */
+#include <direct.h> /* For _getcwd() */
 
 #endif /*H5_HAVE_WIN32_API*/
 
 /* Various ways that inline functions can be declared */
 #if defined(H5_HAVE___INLINE__)
-    /* GNU (alternative form) */
-    #define H5_INLINE __inline__
+/* GNU (alternative form) */
+#define H5_INLINE __inline__
 #elif defined(H5_HAVE___INLINE)
-    /* Visual Studio */
-    #define H5_INLINE __inline
+/* Visual Studio */
+#define H5_INLINE __inline
 #elif defined(H5_HAVE_INLINE)
-    /* GNU, C++
-     * Use "inline" as a last resort on the off-chance that there will
-     * be C++ problems.
-     */
-    #define H5_INLINE inline
+/* GNU, C++
+ * Use "inline" as a last resort on the off-chance that there will
+ * be C++ problems.
+ */
+#define H5_INLINE inline
 #else
-    #define H5_INLINE
+#define H5_INLINE
 #endif /* inline choices */
 
 #ifndef F_OK
-#   define F_OK  00
-#   define W_OK 02
-#   define R_OK 04
+#define F_OK 00
+#define W_OK 02
+#define R_OK 04
 #endif
 
 /*
@@ -221,12 +221,12 @@
  * #define eventa(func_name)   h5_mpe_ ## func_name ## _a
  * #define eventb(func_name)   h5_mpe_ ## func_name ## _b
  */
-#define eventa(func_name)   h5_mpe_eventa
-#define eventb(func_name)   h5_mpe_eventb
-#define MPE_LOG_VARS                                                    \
-    static int eventa(FUNC) = -1;                                       \
-    static int eventb(FUNC) = -1;                                       \
-    char p_event_start[128];
+#define eventa(func_name) h5_mpe_eventa
+#define eventb(func_name) h5_mpe_eventb
+#define MPE_LOG_VARS                                                                                         \
+    static int eventa(FUNC) = -1;                                                                            \
+    static int eventb(FUNC) = -1;                                                                            \
+    char       p_event_start[128];
 
 /* Hardwire the color to "red", since that's what all the routines are using
  * now.  In the future, if we want to change that color for a given routine,
@@ -235,34 +235,33 @@
  * color information down to the BEGIN_MPE_LOG macro (which should have a new
  * BEGIN_MPE_LOG_COLOR variant). -QAK
  */
-#define BEGIN_MPE_LOG                                                   \
-    if (H5_MPEinit_g){                                                  \
-        sprintf(p_event_start, "start %s", FUNC);                       \
-        if (eventa(FUNC) == -1 && eventb(FUNC) == -1) {                 \
-            const char* p_color = "red";                                \
-            eventa(FUNC)=MPE_Log_get_event_number();                    \
-            eventb(FUNC)=MPE_Log_get_event_number();                    \
-            MPE_Describe_state(eventa(FUNC), eventb(FUNC), FUNC, p_color); \
-        }                                                               \
-        MPE_Log_event(eventa(FUNC), 0, p_event_start);                  \
+#define BEGIN_MPE_LOG                                                                                        \
+    if (H5_MPEinit_g) {                                                                                      \
+        sprintf(p_event_start, "start %s", FUNC);                                                            \
+        if (eventa(FUNC) == -1 && eventb(FUNC) == -1) {                                                      \
+            const char *p_color = "red";                                                                     \
+            eventa(FUNC)        = MPE_Log_get_event_number();                                                \
+            eventb(FUNC)        = MPE_Log_get_event_number();                                                \
+            MPE_Describe_state(eventa(FUNC), eventb(FUNC), FUNC, p_color);                                   \
+        }                                                                                                    \
+        MPE_Log_event(eventa(FUNC), 0, p_event_start);                                                       \
     }
 
-
 /*------------------------------------------------------------------------
  * Purpose:   Finish the collection of MPE log information for a function.
  *            It should be after the actual function's process.
  *
  * Programmer: Long Wang
  */
-#define FINISH_MPE_LOG                                                  \
-    if (H5_MPEinit_g) {                                                 \
-        MPE_Log_event(eventb(FUNC), 0, FUNC);                           \
+#define FINISH_MPE_LOG                                                                                       \
+    if (H5_MPEinit_g) {                                                                                      \
+        MPE_Log_event(eventb(FUNC), 0, FUNC);                                                                \
     }
 
-#else /* H5_HAVE_MPE */
-#define MPE_LOG_VARS /* void */
-#define BEGIN_MPE_LOG /* void */
-#define FINISH_MPE_LOG   /* void */
+#else                  /* H5_HAVE_MPE */
+#define MPE_LOG_VARS   /* void */
+#define BEGIN_MPE_LOG  /* void */
+#define FINISH_MPE_LOG /* void */
 
 #endif /* H5_HAVE_MPE */
 
@@ -280,7 +279,7 @@
  * never be raised by the hdf5 library).
  */
 #ifndef SIGBUS
-#  define SIGBUS SIGILL
+#define SIGBUS SIGILL
 #endif
 
 /*
@@ -288,10 +287,10 @@
  * big deal if we don't.
  */
 #ifdef __cplusplus
-#   define __attribute__(X)  /*void*/
-#else /* __cplusplus */
+#define __attribute__(X) /*void*/
+#else                    /* __cplusplus */
 #ifndef H5_HAVE_ATTRIBUTE
-#   define __attribute__(X)  /*void*/
+#define __attribute__(X) /*void*/
 #endif
 #endif /* __cplusplus */
 
@@ -304,57 +303,57 @@
  * function, remember to compare against zero and not one of these two
  * values.
  */
-#define SUCCEED    0
+#define SUCCEED 0
 #define FAIL    (-1)
-#define UFAIL    (unsigned)(-1)
+#define UFAIL   (unsigned)(-1)
 
 /* number of members in an array */
 #ifndef NELMTS
-#    define NELMTS(X)    (sizeof(X)/sizeof(X[0]))
+#define NELMTS(X) (sizeof(X) / sizeof(X[0]))
 #endif
 
 /* minimum of two, three, or four values */
 #undef MIN
-#define MIN(a,b)    (((a)<(b)) ? (a) : (b))
-#define MIN2(a,b)    MIN(a,b)
-#define MIN3(a,b,c)    MIN(a,MIN(b,c))
-#define MIN4(a,b,c,d)    MIN(MIN(a,b),MIN(c,d))
+#define MIN(a, b)        (((a) < (b)) ? (a) : (b))
+#define MIN2(a, b)       MIN(a, b)
+#define MIN3(a, b, c)    MIN(a, MIN(b, c))
+#define MIN4(a, b, c, d) MIN(MIN(a, b), MIN(c, d))
 
 /* maximum of two, three, or four values */
 #undef MAX
-#define MAX(a,b)    (((a)>(b)) ? (a) : (b))
-#define MAX2(a,b)    MAX(a,b)
-#define MAX3(a,b,c)    MAX(a,MAX(b,c))
-#define MAX4(a,b,c,d)    MAX(MAX(a,b),MAX(c,d))
+#define MAX(a, b)        (((a) > (b)) ? (a) : (b))
+#define MAX2(a, b)       MAX(a, b)
+#define MAX3(a, b, c)    MAX(a, MAX(b, c))
+#define MAX4(a, b, c, d) MAX(MAX(a, b), MAX(c, d))
 
 /* limit the middle value to be within a range (inclusive) */
-#define RANGE(LO,X,HI)    MAX(LO,MIN(X,HI))
+#define RANGE(LO, X, HI) MAX(LO, MIN(X, HI))
 
 /* absolute value */
 #ifndef ABS
-#   define ABS(a)    (((a)>=0) ? (a) : -(a))
+#define ABS(a) (((a) >= 0) ? (a) : -(a))
 #endif
 
 /* sign of argument */
 #ifndef SIGN
-#   define SIGN(a)    ((a)>0 ? 1 : (a)<0 ? -1 : 0)
+#define SIGN(a) ((a) > 0 ? 1 : (a) < 0 ? -1 : 0)
 #endif
 
 /* test for number that is a power of 2 */
 /* (from: http://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2) */
-#  define POWER_OF_TWO(n)  (!(n & (n - 1)) && n)
+#define POWER_OF_TWO(n) (!(n & (n - 1)) && n)
 
 /* Raise an integer to a power of 2 */
-#  define H5_EXP2(n)    (1 << (n))
+#define H5_EXP2(n) (1 << (n))
 
 /*
  * HDF Boolean type.
  */
 #ifndef FALSE
-#   define FALSE 0
+#define FALSE 0
 #endif
 #ifndef TRUE
-#   define TRUE 1
+#define TRUE 1
 #endif
 
 /*
@@ -364,65 +363,65 @@
  * be exactly one byte wide because we use it for pointer calculations to
  * void* memory.
  */
-#if H5_SIZEOF_INT8_T==0
-    typedef signed char int8_t;
-#   undef H5_SIZEOF_INT8_T
-#   define H5_SIZEOF_INT8_T H5_SIZEOF_CHAR
-#elif H5_SIZEOF_INT8_T==1
+#if H5_SIZEOF_INT8_T == 0
+typedef signed char int8_t;
+#undef H5_SIZEOF_INT8_T
+#define H5_SIZEOF_INT8_T H5_SIZEOF_CHAR
+#elif H5_SIZEOF_INT8_T == 1
 #else
-#   error "the int8_t type must be 1 byte wide"
+#error "the int8_t type must be 1 byte wide"
 #endif
 
-#if H5_SIZEOF_UINT8_T==0
-    typedef unsigned char uint8_t;
-#   undef H5_SIZEOF_UINT8_T
-#   define H5_SIZEOF_UINT8_T H5_SIZEOF_CHAR
-#elif H5_SIZEOF_UINT8_T==1
+#if H5_SIZEOF_UINT8_T == 0
+typedef unsigned char uint8_t;
+#undef H5_SIZEOF_UINT8_T
+#define H5_SIZEOF_UINT8_T H5_SIZEOF_CHAR
+#elif H5_SIZEOF_UINT8_T == 1
 #else
-#   error "the uint8_t type must be 1 byte wide"
+#error "the uint8_t type must be 1 byte wide"
 #endif
 
-#if H5_SIZEOF_INT16_T>=2
-#elif H5_SIZEOF_SHORT>=2
-    typedef short int16_t;
-#   undef H5_SIZEOF_INT16_T
-#   define H5_SIZEOF_INT16_T H5_SIZEOF_SHORT
-#elif H5_SIZEOF_INT>=2
-    typedef int int16_t;
-#   undef H5_SIZEOF_INT16_T
-#   define H5_SIZEOF_INT16_T H5_SIZEOF_INT
+#if H5_SIZEOF_INT16_T >= 2
+#elif H5_SIZEOF_SHORT >= 2
+typedef short          int16_t;
+#undef H5_SIZEOF_INT16_T
+#define H5_SIZEOF_INT16_T H5_SIZEOF_SHORT
+#elif H5_SIZEOF_INT >= 2
+typedef int      int16_t;
+#undef H5_SIZEOF_INT16_T
+#define H5_SIZEOF_INT16_T H5_SIZEOF_INT
 #else
-#   error "nothing appropriate for int16_t"
+#error "nothing appropriate for int16_t"
 #endif
 
-#if H5_SIZEOF_UINT16_T>=2
-#elif H5_SIZEOF_SHORT>=2
-    typedef unsigned short uint16_t;
-#   undef H5_SIZEOF_UINT16_T
-#   define H5_SIZEOF_UINT16_T H5_SIZEOF_SHORT
-#elif H5_SIZEOF_INT>=2
-    typedef unsigned uint16_t;
-#   undef H5_SIZEOF_UINT16_T
-#   define H5_SIZEOF_UINT16_T H5_SIZEOF_INT
+#if H5_SIZEOF_UINT16_T >= 2
+#elif H5_SIZEOF_SHORT >= 2
+typedef unsigned short uint16_t;
+#undef H5_SIZEOF_UINT16_T
+#define H5_SIZEOF_UINT16_T H5_SIZEOF_SHORT
+#elif H5_SIZEOF_INT >= 2
+typedef unsigned uint16_t;
+#undef H5_SIZEOF_UINT16_T
+#define H5_SIZEOF_UINT16_T H5_SIZEOF_INT
 #else
-#   error "nothing appropriate for uint16_t"
+#error "nothing appropriate for uint16_t"
 #endif
 
-#if H5_SIZEOF_INT32_T>=4
-#elif H5_SIZEOF_SHORT>=4
-    typedef short int32_t;
-#   undef H5_SIZEOF_INT32_T
-#   define H5_SIZEOF_INT32_T H5_SIZEOF_SHORT
-#elif H5_SIZEOF_INT>=4
-    typedef int int32_t;
-#   undef H5_SIZEOF_INT32_T
-#   define H5_SIZEOF_INT32_T H5_SIZEOF_INT
-#elif H5_SIZEOF_LONG>=4
-    typedef long int32_t;
-#   undef H5_SIZEOF_INT32_T
-#   define H5_SIZEOF_INT32_T H5_SIZEOF_LONG
+#if H5_SIZEOF_INT32_T >= 4
+#elif H5_SIZEOF_SHORT >= 4
+typedef short          int32_t;
+#undef H5_SIZEOF_INT32_T
+#define H5_SIZEOF_INT32_T H5_SIZEOF_SHORT
+#elif H5_SIZEOF_INT >= 4
+typedef int      int32_t;
+#undef H5_SIZEOF_INT32_T
+#define H5_SIZEOF_INT32_T H5_SIZEOF_INT
+#elif H5_SIZEOF_LONG >= 4
+typedef long int32_t;
+#undef H5_SIZEOF_INT32_T
+#define H5_SIZEOF_INT32_T H5_SIZEOF_LONG
 #else
-#   error "nothing appropriate for int32_t"
+#error "nothing appropriate for int32_t"
 #endif
 
 /*
@@ -430,64 +429,63 @@
  * most part.
  */
 #ifndef LLONG_MAX
-#   define LLONG_MAX  ((long long)(((unsigned long long)1          \
-              <<(8*sizeof(long long)-1))-1))
-#   define LLONG_MIN    ((long long)(-LLONG_MAX)-1)
+#define LLONG_MAX ((long long)(((unsigned long long)1 << (8 * sizeof(long long) - 1)) - 1))
+#define LLONG_MIN ((long long)(-LLONG_MAX) - 1)
 #endif
 #ifndef ULLONG_MAX
-#   define ULLONG_MAX  ((unsigned long long)((long long)(-1)))
+#define ULLONG_MAX ((unsigned long long)((long long)(-1)))
 #endif
 #ifndef SIZET_MAX
-#   define SIZET_MAX  ((size_t)(ssize_t)(-1))
-#   define SSIZET_MAX  ((ssize_t)(((size_t)1<<(8*sizeof(ssize_t)-1))-1))
+#define SIZET_MAX  ((size_t)(ssize_t)(-1))
+#define SSIZET_MAX ((ssize_t)(((size_t)1 << (8 * sizeof(ssize_t) - 1)) - 1))
 #endif
 
 /*
  * Maximum & minimum values for our typedefs.
  */
-#define HSIZET_MAX   ((hsize_t)ULLONG_MAX)
-#define HSSIZET_MAX  ((hssize_t)LLONG_MAX)
-#define HSSIZET_MIN  (~(HSSIZET_MAX))
+#define HSIZET_MAX  ((hsize_t)ULLONG_MAX)
+#define HSSIZET_MAX ((hssize_t)LLONG_MAX)
+#define HSSIZET_MIN (~(HSSIZET_MAX))
 
 /*
  * Types and max sizes for POSIX I/O.
  * OS X (Darwin) is odd since the max I/O size does not match the types.
  */
 #if defined(H5_HAVE_WIN32_API)
-#   define h5_posix_io_t                unsigned int
-#   define h5_posix_io_ret_t            int
-#   define H5_POSIX_MAX_IO_BYTES        INT_MAX
+#define h5_posix_io_t         unsigned int
+#define h5_posix_io_ret_t     int
+#define H5_POSIX_MAX_IO_BYTES INT_MAX
 #elif defined(H5_HAVE_DARWIN)
-#   define h5_posix_io_t                size_t
-#   define h5_posix_io_ret_t            ssize_t
-#   define H5_POSIX_MAX_IO_BYTES        INT_MAX
+#define h5_posix_io_t         size_t
+#define h5_posix_io_ret_t     ssize_t
+#define H5_POSIX_MAX_IO_BYTES INT_MAX
 #else
-#   define h5_posix_io_t                size_t
-#   define h5_posix_io_ret_t            ssize_t
-#   define H5_POSIX_MAX_IO_BYTES        SSIZET_MAX
+#define h5_posix_io_t         size_t
+#define h5_posix_io_ret_t     ssize_t
+#define H5_POSIX_MAX_IO_BYTES SSIZET_MAX
 #endif
 
 /* POSIX I/O mode used as the third parameter to open/_open
  * when creating a new file (O_CREAT is set).
  */
 #if defined(H5_HAVE_WIN32_API)
-#   define H5_POSIX_CREATE_MODE_RW      (_S_IREAD | _S_IWRITE)
+#define H5_POSIX_CREATE_MODE_RW (_S_IREAD | _S_IWRITE)
 #else
-#   define H5_POSIX_CREATE_MODE_RW      0666
+#define H5_POSIX_CREATE_MODE_RW 0666
 #endif
 
 /*
  * A macro to portably increment enumerated types.
  */
 #ifndef H5_INC_ENUM
-#  define H5_INC_ENUM(TYPE,VAR) (VAR)=((TYPE)((VAR)+1))
+#define H5_INC_ENUM(TYPE, VAR) (VAR) = ((TYPE)((VAR) + 1))
 #endif
 
 /*
  * A macro to portably decrement enumerated types.
  */
 #ifndef H5_DEC_ENUM
-#  define H5_DEC_ENUM(TYPE,VAR) (VAR)=((TYPE)((VAR)-1))
+#define H5_DEC_ENUM(TYPE, VAR) (VAR) = ((TYPE)((VAR)-1))
 #endif
 
 /* Double constant wrapper
@@ -503,7 +501,7 @@
  * is important. For most code, suffixing constants with F will quiet the
  * compiler and not produce erroneous code.
  */
-#define H5_DOUBLE(S) ((double) S ## L)
+#define H5_DOUBLE(S) ((double)S##L)
 
 /*
  * Methods to compare the equality of floating-point values:
@@ -517,13 +515,13 @@
  *       It's the developer's responsibility not to pass in the value 0, which
  *       may cause the equation to fail.
  */
-#define H5_FLT_ABS_EQUAL(X,Y)       (HDfabsf((X)-(Y)) < FLT_EPSILON)
-#define H5_DBL_ABS_EQUAL(X,Y)       (HDfabs ((X)-(Y)) < DBL_EPSILON)
-#define H5_LDBL_ABS_EQUAL(X,Y)      (HDfabsl((X)-(Y)) < LDBL_EPSILON)
+#define H5_FLT_ABS_EQUAL(X, Y)  (HDfabsf((X) - (Y)) < FLT_EPSILON)
+#define H5_DBL_ABS_EQUAL(X, Y)  (HDfabs((X) - (Y)) < DBL_EPSILON)
+#define H5_LDBL_ABS_EQUAL(X, Y) (HDfabsl((X) - (Y)) < LDBL_EPSILON)
 
-#define H5_FLT_REL_EQUAL(X,Y,M)     (HDfabsf(((Y)-(X)) / (X)) < (M))
-#define H5_DBL_REL_EQUAL(X,Y,M)     (HDfabs (((Y)-(X)) / (X)) < (M))
-#define H5_LDBL_REL_EQUAL(X,Y,M)    (HDfabsl(((Y)-(X)) / (X)) < (M))
+#define H5_FLT_REL_EQUAL(X, Y, M)  (HDfabsf(((Y) - (X)) / (X)) < (M))
+#define H5_DBL_REL_EQUAL(X, Y, M)  (HDfabs(((Y) - (X)) / (X)) < (M))
+#define H5_LDBL_REL_EQUAL(X, Y, M) (HDfabsl(((Y) - (X)) / (X)) < (M))
 
 /* KiB, MiB, GiB, TiB, EiB - Used in profiling and timing code */
 #define H5_KB (1024.0F)
@@ -536,33 +534,32 @@
  * Data types and functions for timing certain parts of the library.
  */
 typedef struct {
-    double  utime;    /*user time      */
-    double  stime;    /*system time      */
-    double  etime;    /*elapsed wall-clock time  */
+    double utime; /*user time      */
+    double stime; /*system time      */
+    double etime; /*elapsed wall-clock time  */
 } H5_timer_t;
 
-H5_DLL void H5_timer_reset (H5_timer_t *timer);
-H5_DLL void H5_timer_begin (H5_timer_t *timer);
-H5_DLL void H5_timer_end (H5_timer_t *sum/*in,out*/,
-         H5_timer_t *timer/*in,out*/);
-H5_DLL void H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds);
+H5_DLL void   H5_timer_reset(H5_timer_t *timer);
+H5_DLL void   H5_timer_begin(H5_timer_t *timer);
+H5_DLL void   H5_timer_end(H5_timer_t *sum /*in,out*/, H5_timer_t *timer /*in,out*/);
+H5_DLL void   H5_bandwidth(char *buf /*out*/, double nbytes, double nseconds);
 H5_DLL time_t H5_now(void);
 
 /* Depth of object copy */
 typedef enum {
-    H5_COPY_SHALLOW,    /* Shallow copy from source to destination, just copy field pointers */
-    H5_COPY_DEEP        /* Deep copy from source to destination, including duplicating fields pointed to */
+    H5_COPY_SHALLOW, /* Shallow copy from source to destination, just copy field pointers */
+    H5_COPY_DEEP     /* Deep copy from source to destination, including duplicating fields pointed to */
 } H5_copy_depth_t;
 
 /* Common object copying udata (right now only used for groups and datasets) */
 typedef struct H5O_copy_file_ud_common_t {
-    struct H5O_pline_t *src_pline;      /* Copy of filter pipeline for object */
+    struct H5O_pline_t *src_pline; /* Copy of filter pipeline for object */
 } H5O_copy_file_ud_common_t;
 
 /* Unique object "position" */
 typedef struct {
-    unsigned long fileno;       /* The unique identifier for the file of the object */
-    haddr_t addr;               /* The unique address of the object's header in that file */
+    unsigned long fileno; /* The unique identifier for the file of the object */
+    haddr_t       addr;   /* The unique address of the object's header in that file */
 } H5_obj_t;
 
 /*
@@ -572,898 +569,898 @@ typedef struct {
 
 /* Put all platform-specific definitions in the following file */
 /* so that the following definitions are platform free. */
-#include "H5win32defs.h"  /* For Windows-specific definitions */
+#include "H5win32defs.h" /* For Windows-specific definitions */
 
 #ifndef HDabort
-    #define HDabort()    abort()
+#define HDabort() abort()
 #endif /* HDabort */
 #ifndef HDabs
-    #define HDabs(X)    abs(X)
+#define HDabs(X) abs(X)
 #endif /* HDabs */
 #ifndef HDaccess
-    #define HDaccess(F,M)    access(F, M)
+#define HDaccess(F, M) access(F, M)
 #endif /* HDaccess */
 #ifndef HDacos
-    #define HDacos(X)    acos(X)
+#define HDacos(X) acos(X)
 #endif /* HDacos */
 #ifndef HDalarm
-    #ifdef H5_HAVE_ALARM
-        #define HDalarm(N)              alarm(N)
-    #else /* H5_HAVE_ALARM */
-        #define HDalarm(N)              (0)
-    #endif /* H5_HAVE_ALARM */
+#ifdef H5_HAVE_ALARM
+#define HDalarm(N) alarm(N)
+#else /* H5_HAVE_ALARM */
+#define HDalarm(N) (0)
+#endif /* H5_HAVE_ALARM */
 #endif /* HDalarm */
 #ifndef HDasctime
-    #define HDasctime(T)    asctime(T)
+#define HDasctime(T) asctime(T)
 #endif /* HDasctime */
 #ifndef HDasin
-    #define HDasin(X)    asin(X)
+#define HDasin(X) asin(X)
 #endif /* HDasin */
 #ifndef HDasprintf
-    #define HDasprintf    asprintf /*varargs*/
-#endif /* HDasprintf */
+#define HDasprintf asprintf /*varargs*/
+#endif                      /* HDasprintf */
 #ifndef HDassert
-    #define HDassert(X)    assert(X)
+#define HDassert(X) assert(X)
 #endif /* HDassert */
 #ifndef HDatan
-    #define HDatan(X)    atan(X)
+#define HDatan(X) atan(X)
 #endif /* HDatan */
 #ifndef HDatan2
-    #define HDatan2(X,Y)    atan2(X,Y)
+#define HDatan2(X, Y) atan2(X, Y)
 #endif /* HDatan2 */
 #ifndef HDatexit
-    #define HDatexit(F)    atexit(F)
+#define HDatexit(F) atexit(F)
 #endif /* HDatexit */
 #ifndef HDatof
-    #define HDatof(S)    atof(S)
+#define HDatof(S) atof(S)
 #endif /* HDatof */
 #ifndef HDatoi
-    #define HDatoi(S)    atoi(S)
+#define HDatoi(S) atoi(S)
 #endif /* HDatoi */
 #ifndef HDatol
-    #define HDatol(S)    atol(S)
+#define HDatol(S) atol(S)
 #endif /* HDatol */
 #ifndef HDatoll
-    #define HDatoll(S)   atoll(S)
+#define HDatoll(S) atoll(S)
 #endif /* HDatol */
 #ifndef HDbsearch
-    #define HDbsearch(K,B,N,Z,F)  bsearch(K,B,N,Z,F)
+#define HDbsearch(K, B, N, Z, F) bsearch(K, B, N, Z, F)
 #endif /* HDbsearch */
 #ifndef HDcalloc
-    #define HDcalloc(N,Z)    calloc(N,Z)
+#define HDcalloc(N, Z) calloc(N, Z)
 #endif /* HDcalloc */
 #ifndef HDceil
-    #define HDceil(X)    ceil(X)
+#define HDceil(X) ceil(X)
 #endif /* HDceil */
 #ifndef HDcfgetispeed
-    #define HDcfgetispeed(T)  cfgetispeed(T)
+#define HDcfgetispeed(T) cfgetispeed(T)
 #endif /* HDcfgetispeed */
 #ifndef HDcfgetospeed
-    #define HDcfgetospeed(T)  cfgetospeed(T)
+#define HDcfgetospeed(T) cfgetospeed(T)
 #endif /* HDcfgetospeed */
 #ifndef HDcfsetispeed
-    #define HDcfsetispeed(T,S)  cfsetispeed(T,S)
+#define HDcfsetispeed(T, S) cfsetispeed(T, S)
 #endif /* HDcfsetispeed */
 #ifndef HDcfsetospeed
-    #define HDcfsetospeed(T,S)  cfsetospeed(T,S)
+#define HDcfsetospeed(T, S) cfsetospeed(T, S)
 #endif /* HDcfsetospeed */
 #ifndef HDchdir
-    #define HDchdir(S)    chdir(S)
+#define HDchdir(S) chdir(S)
 #endif /* HDchdir */
 #ifndef HDchmod
-    #define HDchmod(S,M)    chmod(S,M)
+#define HDchmod(S, M) chmod(S, M)
 #endif /* HDchmod */
 #ifndef HDchown
-    #define HDchown(S,O,G)    chown(S,O,G)
+#define HDchown(S, O, G) chown(S, O, G)
 #endif /* HDchown */
 #ifndef HDclearerr
-    #define HDclearerr(F)    clearerr(F)
+#define HDclearerr(F) clearerr(F)
 #endif /* HDclearerr */
 #ifndef HDclock
-    #define HDclock()    clock()
+#define HDclock() clock()
 #endif /* HDclock */
 #ifndef HDclose
-    #define HDclose(F)    close(F)
+#define HDclose(F) close(F)
 #endif /* HDclose */
 #ifndef HDclosedir
-    #define HDclosedir(D)    closedir(D)
+#define HDclosedir(D) closedir(D)
 #endif /* HDclosedir */
 #ifndef HDcos
-    #define HDcos(X)    cos(X)
+#define HDcos(X) cos(X)
 #endif /* HDcos */
 #ifndef HDcosh
-    #define HDcosh(X)    cosh(X)
+#define HDcosh(X) cosh(X)
 #endif /* HDcosh */
 #ifndef HDcreat
-    #define HDcreat(S,M)    creat(S,M)
+#define HDcreat(S, M) creat(S, M)
 #endif /* HDcreat */
 #ifndef HDctermid
-    #define HDctermid(S)    ctermid(S)
+#define HDctermid(S) ctermid(S)
 #endif /* HDctermid */
 #ifndef HDctime
-    #define HDctime(T)    ctime(T)
+#define HDctime(T) ctime(T)
 #endif /* HDctime */
 #ifndef HDcuserid
-    #define HDcuserid(S)    cuserid(S)
+#define HDcuserid(S) cuserid(S)
 #endif /* HDcuserid */
 #ifndef HDdifftime
-    #ifdef H5_HAVE_DIFFTIME
-        #define HDdifftime(X,Y)    difftime(X,Y)
-    #else /* H5_HAVE_DIFFTIME */
-        #define HDdifftime(X,Y)    ((double)(X)-(double)(Y))
-    #endif /* H5_HAVE_DIFFTIME */
+#ifdef H5_HAVE_DIFFTIME
+#define HDdifftime(X, Y) difftime(X, Y)
+#else /* H5_HAVE_DIFFTIME */
+#define HDdifftime(X, Y) ((double)(X) - (double)(Y))
+#endif /* H5_HAVE_DIFFTIME */
 #endif /* HDdifftime */
 #ifndef HDdiv
-    #define HDdiv(X,Y)    div(X,Y)
+#define HDdiv(X, Y) div(X, Y)
 #endif /* HDdiv */
 #ifndef HDdup
-    #define HDdup(F)    dup(F)
+#define HDdup(F) dup(F)
 #endif /* HDdup */
 #ifndef HDdup2
-    #define HDdup2(F,I)    dup2(F,I)
+#define HDdup2(F, I) dup2(F, I)
 #endif /* HDdup2 */
 /* execl() variable arguments */
 /* execle() variable arguments */
 /* execlp() variable arguments */
 #ifndef HDexecv
-    #define HDexecv(S,AV)    execv(S,AV)
+#define HDexecv(S, AV) execv(S, AV)
 #endif /* HDexecv */
 #ifndef HDexecve
-    #define HDexecve(S,AV,E)  execve(S,AV,E)
+#define HDexecve(S, AV, E) execve(S, AV, E)
 #endif /* HDexecve */
 #ifndef HDexecvp
-    #define HDexecvp(S,AV)    execvp(S,AV)
+#define HDexecvp(S, AV) execvp(S, AV)
 #endif /* HDexecvp */
 #ifndef HDexit
-    #define HDexit(N)    exit(N)
+#define HDexit(N) exit(N)
 #endif /* HDexit */
 #ifndef HD_exit
-    #define HD_exit(N)    _exit(N)
+#define HD_exit(N) _exit(N)
 #endif /* HD_exit */
 #ifndef HDexp
-    #define HDexp(X)    exp(X)
+#define HDexp(X) exp(X)
 #endif /* HDexp */
 #ifndef HDexp2
-    #define HDexp2(X)    exp2(X)
+#define HDexp2(X) exp2(X)
 #endif /* HDexp2 */
 #ifndef HDfabs
-    #define HDfabs(X)    fabs(X)
+#define HDfabs(X) fabs(X)
 #endif /* HDfabs */
 /* use ABS() because fabsf() fabsl() are not common yet. */
 #ifndef HDfabsf
-    #define HDfabsf(X)    ABS(X)
+#define HDfabsf(X) ABS(X)
 #endif /* HDfabsf */
 #ifndef HDfabsl
-    #define HDfabsl(X)    ABS(X)
+#define HDfabsl(X) ABS(X)
 #endif /* HDfabsl */
 #ifndef HDfclose
-    #define HDfclose(F)    fclose(F)
+#define HDfclose(F) fclose(F)
 #endif /* HDfclose */
 /* fcntl() variable arguments */
 #ifndef HDfdopen
-    #define HDfdopen(N,S)    fdopen(N,S)
+#define HDfdopen(N, S) fdopen(N, S)
 #endif /* HDfdopen */
 #ifndef HDfeof
-    #define HDfeof(F)    feof(F)
+#define HDfeof(F) feof(F)
 #endif /* HDfeof */
 #ifndef HDferror
-    #define HDferror(F)    ferror(F)
+#define HDferror(F) ferror(F)
 #endif /* HDferror */
 #ifndef HDfflush
-    #define HDfflush(F)    fflush(F)
+#define HDfflush(F) fflush(F)
 #endif /* HDfflush */
 #ifndef HDfgetc
-    #define HDfgetc(F)    fgetc(F)
+#define HDfgetc(F) fgetc(F)
 #endif /* HDfgetc */
 #ifndef HDfgetpos
-    #define HDfgetpos(F,P)    fgetpos(F,P)
+#define HDfgetpos(F, P) fgetpos(F, P)
 #endif /* HDfgetpos */
 #ifndef HDfgets
-    #define HDfgets(S,N,F)    fgets(S,N,F)
+#define HDfgets(S, N, F) fgets(S, N, F)
 #endif /* HDfgets */
 #ifndef HDfileno
-    #define HDfileno(F)    fileno(F)
+#define HDfileno(F) fileno(F)
 #endif /* HDfileno */
 #ifndef HDfloor
-    #define HDfloor(X)    floor(X)
+#define HDfloor(X) floor(X)
 #endif /* HDfloor */
 #ifndef HDfmod
-    #define HDfmod(X,Y)    fmod(X,Y)
+#define HDfmod(X, Y) fmod(X, Y)
 #endif /* HDfmod */
 #ifndef HDfopen
-    #define HDfopen(S,M)    fopen(S,M)
+#define HDfopen(S, M) fopen(S, M)
 #endif /* HDfopen */
 #ifndef HDfork
-    #define HDfork()    fork()
+#define HDfork() fork()
 #endif /* HDfork */
 #ifndef HDfpathconf
-    #define HDfpathconf(F,N)  fpathconf(F,N)
+#define HDfpathconf(F, N) fpathconf(F, N)
 #endif /* HDfpathconf */
-H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
+H5_DLL int HDfprintf(FILE *stream, const char *fmt, ...);
 #ifndef HDfputc
-    #define HDfputc(C,F)    fputc(C,F)
+#define HDfputc(C, F) fputc(C, F)
 #endif /* HDfputc */
 #ifndef HDfputs
-    #define HDfputs(S,F)    fputs(S,F)
+#define HDfputs(S, F) fputs(S, F)
 #endif /* HDfputs */
 #ifndef HDfread
-    #define HDfread(M,Z,N,F)  fread(M,Z,N,F)
+#define HDfread(M, Z, N, F) fread(M, Z, N, F)
 #endif /* HDfread */
 #ifndef HDfree
-    #define HDfree(M)    free(M)
+#define HDfree(M) free(M)
 #endif /* HDfree */
 #ifndef HDfreopen
-    #define HDfreopen(S,M,F)  freopen(S,M,F)
+#define HDfreopen(S, M, F) freopen(S, M, F)
 #endif /* HDfreopen */
 #ifndef HDfrexp
-    #define HDfrexp(X,N)    frexp(X,N)
+#define HDfrexp(X, N) frexp(X, N)
 #endif /* HDfrexp */
 /* Check for Cray-specific 'frexpf()' and 'frexpl()' routines */
 #ifndef HDfrexpf
-    #ifdef H5_HAVE_FREXPF
-        #define HDfrexpf(X,N)    frexpf(X,N)
-    #else /* H5_HAVE_FREXPF */
-        #define HDfrexpf(X,N)    frexp(X,N)
-    #endif /* H5_HAVE_FREXPF */
+#ifdef H5_HAVE_FREXPF
+#define HDfrexpf(X, N) frexpf(X, N)
+#else /* H5_HAVE_FREXPF */
+#define HDfrexpf(X, N) frexp(X, N)
+#endif /* H5_HAVE_FREXPF */
 #endif /* HDfrexpf */
 #ifndef HDfrexpl
-    #ifdef H5_HAVE_FREXPL
-        #define HDfrexpl(X,N)    frexpl(X,N)
-    #else /* H5_HAVE_FREXPL */
-        #define HDfrexpl(X,N)    frexp(X,N)
-    #endif /* H5_HAVE_FREXPL */
+#ifdef H5_HAVE_FREXPL
+#define HDfrexpl(X, N) frexpl(X, N)
+#else /* H5_HAVE_FREXPL */
+#define HDfrexpl(X, N) frexp(X, N)
+#endif /* H5_HAVE_FREXPL */
 #endif /* HDfrexpl */
 /* fscanf() variable arguments */
 #ifndef HDfseek
-    #define HDfseek(F,O,W)  fseeko(F,O,W)
+#define HDfseek(F, O, W) fseeko(F, O, W)
 #endif /* HDfseek */
 #ifndef HDfsetpos
-    #define HDfsetpos(F,P)    fsetpos(F,P)
+#define HDfsetpos(F, P) fsetpos(F, P)
 #endif /* HDfsetpos */
 #ifndef HDfstat
-    #define HDfstat(F,B)        fstat(F,B)
+#define HDfstat(F, B) fstat(F, B)
 #endif /* HDfstat */
 #ifndef HDlstat
-    #define HDlstat(S,B)    lstat(S,B)
+#define HDlstat(S, B) lstat(S, B)
 #endif /* HDlstat */
 #ifndef HDstat
-    #define HDstat(S,B)    stat(S,B)
+#define HDstat(S, B) stat(S, B)
 #endif /* HDstat */
 
 #ifndef H5_HAVE_WIN32_API
 /* These definitions differ in Windows and are defined in
  * H5win32defs for that platform.
  */
-typedef struct stat         h5_stat_t;
-typedef off_t               h5_stat_size_t;
-#define HDoff_t             off_t
+typedef struct stat h5_stat_t;
+typedef off_t       h5_stat_size_t;
+#define HDoff_t off_t
 #endif /* H5_HAVE_WIN32_API */
 
 #define H5_SIZEOF_H5_STAT_SIZE_T H5_SIZEOF_OFF_T
 
 #ifndef HDftell
-    #define HDftell(F)    ftello(F)
+#define HDftell(F) ftello(F)
 #endif /* HDftell */
 #ifndef HDftruncate
-    #define HDftruncate(F,L)        ftruncate(F,L)
+#define HDftruncate(F, L) ftruncate(F, L)
 #endif /* HDftruncate */
 #ifndef HDfwrite
-    #define HDfwrite(M,Z,N,F)  fwrite(M,Z,N,F)
+#define HDfwrite(M, Z, N, F) fwrite(M, Z, N, F)
 #endif /* HDfwrite */
 #ifndef HDgetc
-    #define HDgetc(F)    getc(F)
+#define HDgetc(F) getc(F)
 #endif /* HDgetc */
 #ifndef HDgetchar
-    #define HDgetchar()    getchar()
+#define HDgetchar() getchar()
 #endif /* HDgetchar */
 #ifndef HDgetcwd
-    #define HDgetcwd(S,Z)    getcwd(S,Z)
+#define HDgetcwd(S, Z) getcwd(S, Z)
 #endif /* HDgetcwd */
 #ifndef HDgetdcwd
-    #define HDgetdcwd(D,S,Z)  getcwd(S,Z)
+#define HDgetdcwd(D, S, Z) getcwd(S, Z)
 #endif /* HDgetdcwd */
 #ifndef HDgetdrive
-    #define HDgetdrive()    0
+#define HDgetdrive() 0
 #endif /* HDgetdrive */
 #ifndef HDgetegid
-    #define HDgetegid()    getegid()
+#define HDgetegid() getegid()
 #endif /* HDgetegid() */
 #ifndef HDgetenv
-    #define HDgetenv(S)    getenv(S)
+#define HDgetenv(S) getenv(S)
 #endif /* HDgetenv */
 #ifndef HDgeteuid
-    #define HDgeteuid()    geteuid()
+#define HDgeteuid() geteuid()
 #endif /* HDgeteuid */
 #ifndef HDgetgid
-    #define HDgetgid()    getgid()
+#define HDgetgid() getgid()
 #endif /* HDgetgid */
 #ifndef HDgetgrgid
-    #define HDgetgrgid(G)    getgrgid(G)
+#define HDgetgrgid(G) getgrgid(G)
 #endif /* HDgetgrgid */
 #ifndef HDgetgrnam
-    #define HDgetgrnam(S)    getgrnam(S)
+#define HDgetgrnam(S) getgrnam(S)
 #endif /* HDgetgrnam */
 #ifndef HDgetgroups
-    #define HDgetgroups(Z,G)  getgroups(Z,G)
+#define HDgetgroups(Z, G) getgroups(Z, G)
 #endif /* HDgetgroups */
 #ifndef HDgethostname
-    #define HDgethostname(N,L)    gethostname(N,L)
+#define HDgethostname(N, L) gethostname(N, L)
 #endif /* HDgetlogin */
 #ifndef HDgetlogin
-    #define HDgetlogin()    getlogin()
+#define HDgetlogin() getlogin()
 #endif /* HDgetlogin */
 #ifndef HDgetpgrp
-    #define HDgetpgrp()    getpgrp()
+#define HDgetpgrp() getpgrp()
 #endif /* HDgetpgrp */
 #ifndef HDgetpid
-    #define HDgetpid()    getpid()
+#define HDgetpid() getpid()
 #endif /* HDgetpid */
 #ifndef HDgetppid
-    #define HDgetppid()    getppid()
+#define HDgetppid() getppid()
 #endif /* HDgetppid */
 #ifndef HDgetpwnam
-    #define HDgetpwnam(S)    getpwnam(S)
+#define HDgetpwnam(S) getpwnam(S)
 #endif /* HDgetpwnam */
 #ifndef HDgetpwuid
-    #define HDgetpwuid(U)    getpwuid(U)
+#define HDgetpwuid(U) getpwuid(U)
 #endif /* HDgetpwuid */
 #ifndef HDgetrusage
-    #define HDgetrusage(X,S)  getrusage(X,S)
+#define HDgetrusage(X, S) getrusage(X, S)
 #endif /* HDgetrusage */
 #ifndef HDgets
-    #define HDgets(S)    gets(S)
+#define HDgets(S) gets(S)
 #endif /* HDgets */
 #ifndef HDgettimeofday
-    #define HDgettimeofday(S,P)  gettimeofday(S,P)
+#define HDgettimeofday(S, P) gettimeofday(S, P)
 #endif /* HDgettimeofday */
 #ifndef HDgetuid
-    #define HDgetuid()    getuid()
+#define HDgetuid() getuid()
 #endif /* HDgetuid */
 #ifndef HDgmtime
-    #define HDgmtime(T)    gmtime(T)
+#define HDgmtime(T) gmtime(T)
 #endif /* HDgmtime */
 #ifndef HDisalnum
-    #define HDisalnum(C)    isalnum((int)(C)) /*cast for solaris warning*/
-#endif /* HDisalnum */
+#define HDisalnum(C) isalnum((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDisalnum */
 #ifndef HDisalpha
-    #define HDisalpha(C)    isalpha((int)(C)) /*cast for solaris warning*/
-#endif /* HDisalpha */
+#define HDisalpha(C) isalpha((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDisalpha */
 #ifndef HDisatty
-    #define HDisatty(F)    isatty(F)
+#define HDisatty(F) isatty(F)
 #endif /* HDisatty */
 #ifndef HDiscntrl
-    #define HDiscntrl(C)    iscntrl((int)(C)) /*cast for solaris warning*/
-#endif /* HDiscntrl */
+#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDiscntrl */
 #ifndef HDisdigit
-    #define HDisdigit(C)    isdigit((int)(C)) /*cast for solaris warning*/
-#endif /* HDisdigit */
+#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDisdigit */
 #ifndef HDisgraph
-    #define HDisgraph(C)    isgraph((int)(C)) /*cast for solaris warning*/
-#endif /* HDisgraph */
+#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDisgraph */
 #ifndef HDislower
-    #define HDislower(C)    islower((int)(C)) /*cast for solaris warning*/
-#endif /* HDislower */
+#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDislower */
 #ifndef HDisnan
-    #define HDisnan(X)      isnan(X)
+#define HDisnan(X) isnan(X)
 #endif /* HDisnan */
 #ifndef HDisprint
-    #define HDisprint(C)    isprint((int)(C)) /*cast for solaris warning*/
-#endif /* HDisprint */
+#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDisprint */
 #ifndef HDispunct
-    #define HDispunct(C)    ispunct((int)(C)) /*cast for solaris warning*/
-#endif /* HDispunct */
+#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDispunct */
 #ifndef HDisspace
-    #define HDisspace(C)    isspace((int)(C)) /*cast for solaris warning*/
-#endif /* HDisspace */
+#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDisspace */
 #ifndef HDisupper
-    #define HDisupper(C)    isupper((int)(C)) /*cast for solaris warning*/
-#endif /* HDisupper */
+#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
+#endif                                 /* HDisupper */
 #ifndef HDisxdigit
-    #define HDisxdigit(C)    isxdigit((int)(C)) /*cast for solaris warning*/
-#endif /* HDisxdigit */
+#define HDisxdigit(C) isxdigit((int)(C)) /*cast for solaris warning*/
+#endif                                   /* HDisxdigit */
 #ifndef HDkill
-    #define HDkill(P,S)    kill(P,S)
+#define HDkill(P, S) kill(P, S)
 #endif /* HDkill */
 #ifndef HDlabs
-    #define HDlabs(X)    labs(X)
+#define HDlabs(X) labs(X)
 #endif /* HDlabs */
 #ifndef HDldexp
-    #define HDldexp(X,N)    ldexp(X,N)
+#define HDldexp(X, N) ldexp(X, N)
 #endif /* HDldexp */
 #ifndef HDldiv
-    #define HDldiv(X,Y)    ldiv(X,Y)
+#define HDldiv(X, Y) ldiv(X, Y)
 #endif /* HDldiv */
 #ifndef HDlink
-    #define HDlink(OLD,NEW)    link(OLD,NEW)
+#define HDlink(OLD, NEW) link(OLD, NEW)
 #endif /* HDlink */
 #ifndef HDllround
-    #define HDllround(V)     llround(V)
+#define HDllround(V) llround(V)
 #endif /* HDround */
 #ifndef HDllroundf
-    #define HDllroundf(V)    llroundf(V)
+#define HDllroundf(V) llroundf(V)
 #endif /* HDllroundf */
 #ifndef HDllroundl
-    #define HDllroundl(V)    llroundl(V)
+#define HDllroundl(V) llroundl(V)
 #endif /* HDllroundl */
 #ifndef HDlocaleconv
-    #define HDlocaleconv()    localeconv()
+#define HDlocaleconv() localeconv()
 #endif /* HDlocaleconv */
 #ifndef HDlocaltime
-    #define HDlocaltime(T)    localtime(T)
+#define HDlocaltime(T) localtime(T)
 #endif /* HDlocaltime */
 #ifndef HDlog
-    #define HDlog(X)    log(X)
+#define HDlog(X) log(X)
 #endif /* HDlog */
 #ifndef HDlog10
-    #define HDlog10(X)    log10(X)
+#define HDlog10(X) log10(X)
 #endif /* HDlog10 */
 #ifndef HDlongjmp
-    #define HDlongjmp(J,N)    longjmp(J,N)
+#define HDlongjmp(J, N) longjmp(J, N)
 #endif /* HDlongjmp */
 #ifndef HDlround
-    #define HDlround(V)     lround(V)
+#define HDlround(V) lround(V)
 #endif /* HDround */
 #ifndef HDlroundf
-    #define HDlroundf(V)    lroundf(V)
+#define HDlroundf(V) lroundf(V)
 #endif /* HDlroundf */
 #ifndef HDlroundl
-    #define HDlroundl(V)    lroundl(V)
+#define HDlroundl(V) lroundl(V)
 #endif /* HDroundl */
 #ifndef HDlseek
-    #define HDlseek(F,O,W)  lseek(F,O,W)
+#define HDlseek(F, O, W) lseek(F, O, W)
 #endif /* HDlseek */
 #ifndef HDmalloc
-    #define HDmalloc(Z)    malloc(Z)
+#define HDmalloc(Z) malloc(Z)
 #endif /* HDmalloc */
 #ifndef HDposix_memalign
-    #define HDposix_memalign(P,A,Z) posix_memalign(P,A,Z)
+#define HDposix_memalign(P, A, Z) posix_memalign(P, A, Z)
 #endif /* HDposix_memalign */
 #ifndef HDmblen
-    #define HDmblen(S,N)    mblen(S,N)
+#define HDmblen(S, N) mblen(S, N)
 #endif /* HDmblen */
 #ifndef HDmbstowcs
-    #define HDmbstowcs(P,S,Z)  mbstowcs(P,S,Z)
+#define HDmbstowcs(P, S, Z) mbstowcs(P, S, Z)
 #endif /* HDmbstowcs */
 #ifndef HDmbtowc
-    #define HDmbtowc(P,S,Z)    mbtowc(P,S,Z)
+#define HDmbtowc(P, S, Z) mbtowc(P, S, Z)
 #endif /* HDmbtowc */
 #ifndef HDmemchr
-    #define HDmemchr(S,C,Z)    memchr(S,C,Z)
+#define HDmemchr(S, C, Z) memchr(S, C, Z)
 #endif /* HDmemchr */
 #ifndef HDmemcmp
-    #define HDmemcmp(X,Y,Z)    memcmp(X,Y,Z)
+#define HDmemcmp(X, Y, Z) memcmp(X, Y, Z)
 #endif /* HDmemcmp */
 /*
  * The (char*) casts are required for the DEC when optimizations are turned
  * on and the source and/or destination are not aligned.
  */
 #ifndef HDmemcpy
-    #define HDmemcpy(X,Y,Z)    memcpy((char*)(X),(const char*)(Y),Z)
+#define HDmemcpy(X, Y, Z) memcpy((char *)(X), (const char *)(Y), Z)
 #endif /* HDmemcpy */
 #ifndef HDmemmove
-    #define HDmemmove(X,Y,Z)  memmove((char*)(X),(const char*)(Y),Z)
+#define HDmemmove(X, Y, Z) memmove((char *)(X), (const char *)(Y), Z)
 #endif /* HDmemmove */
 #ifndef HDmemset
-    #define HDmemset(X,C,Z)    memset(X,C,Z)
+#define HDmemset(X, C, Z) memset(X, C, Z)
 #endif /* HDmemset */
 #ifndef HDmkdir
-    #define HDmkdir(S,M)    mkdir(S,M)
+#define HDmkdir(S, M) mkdir(S, M)
 #endif /* HDmkdir */
 #ifndef HDmkfifo
-    #define HDmkfifo(S,M)    mkfifo(S,M)
+#define HDmkfifo(S, M) mkfifo(S, M)
 #endif /* HDmkfifo */
 #ifndef HDmktime
-    #define HDmktime(T)    mktime(T)
+#define HDmktime(T) mktime(T)
 #endif /* HDmktime */
 #ifndef HDmodf
-    #define HDmodf(X,Y)    modf(X,Y)
+#define HDmodf(X, Y) modf(X, Y)
 #endif /* HDmodf */
 #ifndef HDnanosleep
-    #define HDnanosleep(N, O)    nanosleep(N, O)
+#define HDnanosleep(N, O) nanosleep(N, O)
 #endif /* HDnanosleep */
 #ifndef HDopen
-    #define HDopen(F,...)    open(F,__VA_ARGS__)
+#define HDopen(F, ...) open(F, __VA_ARGS__)
 #endif /* HDopen */
 #ifndef HDopendir
-    #define HDopendir(S)    opendir(S)
+#define HDopendir(S) opendir(S)
 #endif /* HDopendir */
 #ifndef HDpathconf
-    #define HDpathconf(S,N)    pathconf(S,N)
+#define HDpathconf(S, N) pathconf(S, N)
 #endif /* HDpathconf */
 #ifndef HDpause
-    #define HDpause()    pause()
+#define HDpause() pause()
 #endif /* HDpause */
 #ifndef HDperror
-    #define HDperror(S)    perror(S)
+#define HDperror(S) perror(S)
 #endif /* HDperror */
 #ifndef HDpipe
-    #define HDpipe(F)    pipe(F)
+#define HDpipe(F) pipe(F)
 #endif /* HDpipe */
 #ifndef HDpow
-    #define HDpow(X,Y)    pow(X,Y)
+#define HDpow(X, Y) pow(X, Y)
 #endif /* HDpow */
 /* printf() variable arguments */
 #ifndef HDprintf
-    #define HDprintf(...)   HDfprintf(stdout, __VA_ARGS__)
+#define HDprintf(...) HDfprintf(stdout, __VA_ARGS__)
 #endif /* HDprintf */
 #ifndef HDputc
-    #define HDputc(C,F)    putc(C,F)
+#define HDputc(C, F) putc(C, F)
 #endif /* HDputc*/
 #ifndef HDputchar
-    #define HDputchar(C)    putchar(C)
+#define HDputchar(C) putchar(C)
 #endif /* HDputchar */
 #ifndef HDputs
-    #define HDputs(S)    puts(S)
+#define HDputs(S) puts(S)
 #endif /* HDputs */
 #ifndef HDqsort
-    #define HDqsort(M,N,Z,F)  qsort(M,N,Z,F)
+#define HDqsort(M, N, Z, F) qsort(M, N, Z, F)
 #endif /* HDqsort*/
 #ifndef HDraise
-    #define HDraise(N)    raise(N)
+#define HDraise(N) raise(N)
 #endif /* HDraise */
 
 #ifdef H5_HAVE_RAND_R
-    #ifndef HDrandom
-        #define HDrandom()    HDrand()
-    #endif /* HDrandom */
-    H5_DLL int HDrand(void);
+#ifndef HDrandom
+#define HDrandom() HDrand()
+#endif /* HDrandom */
+H5_DLL int HDrand(void);
 #elif H5_HAVE_RANDOM
-    #ifndef HDrand
-        #define HDrand()    random()
-    #endif /* HDrand */
-    #ifndef HDrandom
-        #define HDrandom()    random()
-    #endif /* HDrandom */
-#else /* H5_HAVE_RANDOM */
-    #ifndef HDrand
-        #define HDrand()    rand()
-    #endif /* HDrand */
-    #ifndef HDrandom
-        #define HDrandom()    rand()
-    #endif /* HDrandom */
+#ifndef HDrand
+#define HDrand() random()
+#endif /* HDrand */
+#ifndef HDrandom
+#define HDrandom() random()
+#endif /* HDrandom */
+#else  /* H5_HAVE_RANDOM */
+#ifndef HDrand
+#define HDrand() rand()
+#endif /* HDrand */
+#ifndef HDrandom
+#define HDrandom() rand()
+#endif /* HDrandom */
 #endif /* H5_HAVE_RANDOM */
 
 #ifndef HDread
-    #define HDread(F,M,Z)    read(F,M,Z)
+#define HDread(F, M, Z) read(F, M, Z)
 #endif /* HDread */
 #ifndef HDreaddir
-    #define HDreaddir(D)    readdir(D)
+#define HDreaddir(D) readdir(D)
 #endif /* HDreaddir */
 #ifndef HDrealloc
-    #define HDrealloc(M,Z)    realloc(M,Z)
+#define HDrealloc(M, Z) realloc(M, Z)
 #endif /* HDrealloc */
 #ifndef HDrealpath
-    #define HDrealpath(F1,F2)    realpath(F1,F2)
+#define HDrealpath(F1, F2) realpath(F1, F2)
 #endif /* HDrealloc */
 #ifndef HDremove
-    #define HDremove(S)    remove(S)
+#define HDremove(S) remove(S)
 #endif /* HDremove */
 #ifndef HDrename
-    #define HDrename(OLD,NEW)  rename(OLD,NEW)
+#define HDrename(OLD, NEW) rename(OLD, NEW)
 #endif /* HDrename */
 #ifndef HDrewind
-    #define HDrewind(F)    rewind(F)
+#define HDrewind(F) rewind(F)
 #endif /* HDrewind */
 #ifndef HDrewinddir
-    #define HDrewinddir(D)    rewinddir(D)
+#define HDrewinddir(D) rewinddir(D)
 #endif /* HDrewinddir */
 #ifndef HDround
-    #define HDround(V)    round(V)
+#define HDround(V) round(V)
 #endif /* HDround */
 #ifndef HDroundf
-    #define HDroundf(V)    roundf(V)
+#define HDroundf(V) roundf(V)
 #endif /* HDroundf */
 #ifndef HDroundl
-    #define HDroundl(V)    roundl(V)
+#define HDroundl(V) roundl(V)
 #endif /* HDroundl */
 #ifndef HDrmdir
-    #define HDrmdir(S)    rmdir(S)
+#define HDrmdir(S) rmdir(S)
 #endif /* HDrmdir */
 /* scanf() variable arguments */
 #ifndef HDselect
-    #define HDselect(N,RD,WR,ER,T)    select(N,RD,WR,ER,T)
+#define HDselect(N, RD, WR, ER, T) select(N, RD, WR, ER, T)
 #endif /* HDsetbuf */
 #ifndef HDsetbuf
-    #define HDsetbuf(F,S)    setbuf(F,S)
+#define HDsetbuf(F, S) setbuf(F, S)
 #endif /* HDsetbuf */
 #ifndef HDsetenv
-    #define HDsetenv(N,V,O)    setenv(N,V,O)
+#define HDsetenv(N, V, O) setenv(N, V, O)
 #endif /* HDsetenv */
 #ifndef HDsetgid
-    #define HDsetgid(G)    setgid(G)
+#define HDsetgid(G) setgid(G)
 #endif /* HDsetgid */
 #ifndef HDsetjmp
-    #define HDsetjmp(J)    setjmp(J)
+#define HDsetjmp(J) setjmp(J)
 #endif /* HDsetjmp */
 #ifndef HDsetlocale
-    #define HDsetlocale(N,S)  setlocale(N,S)
+#define HDsetlocale(N, S) setlocale(N, S)
 #endif /* HDsetlocale */
 #ifndef HDsetpgid
-    #define HDsetpgid(P,PG)    setpgid(P,PG)
+#define HDsetpgid(P, PG) setpgid(P, PG)
 #endif /* HDsetpgid */
 #ifndef HDsetsid
-    #define HDsetsid()    setsid()
+#define HDsetsid() setsid()
 #endif /* HDsetsid */
 #ifndef HDsetuid
-    #define HDsetuid(U)    setuid(U)
+#define HDsetuid(U) setuid(U)
 #endif /* HDsetuid */
 #ifndef HDsetvbuf
-    #define HDsetvbuf(F,S,M,Z)  setvbuf(F,S,M,Z)
+#define HDsetvbuf(F, S, M, Z) setvbuf(F, S, M, Z)
 #endif /* HDsetvbuf */
 #ifndef HDsigaddset
-    #define HDsigaddset(S,N)  sigaddset(S,N)
+#define HDsigaddset(S, N) sigaddset(S, N)
 #endif /* HDsigaddset */
 #ifndef HDsigdelset
-    #define HDsigdelset(S,N)  sigdelset(S,N)
+#define HDsigdelset(S, N) sigdelset(S, N)
 #endif /* HDsigdelset */
 #ifndef HDsigemptyset
-    #define HDsigemptyset(S)  sigemptyset(S)
+#define HDsigemptyset(S) sigemptyset(S)
 #endif /* HDsigemptyset */
 #ifndef HDsigfillset
-    #define HDsigfillset(S)    sigfillset(S)
+#define HDsigfillset(S) sigfillset(S)
 #endif /* HDsigfillset */
 #ifndef HDsigismember
-    #define HDsigismember(S,N)  sigismember(S,N)
+#define HDsigismember(S, N) sigismember(S, N)
 #endif /* HDsigismember */
 #ifndef HDsiglongjmp
-    #define HDsiglongjmp(J,N)  siglongjmp(J,N)
+#define HDsiglongjmp(J, N) siglongjmp(J, N)
 #endif /* HDsiglongjmp */
 #ifndef HDsignal
-    #define HDsignal(N,F)    signal(N,F)
+#define HDsignal(N, F) signal(N, F)
 #endif /* HDsignal */
 #ifndef HDsigpending
-    #define HDsigpending(S)    sigpending(S)
+#define HDsigpending(S) sigpending(S)
 #endif /* HDsigpending */
 #ifndef HDsigprocmask
-    #define HDsigprocmask(H,S,O)  sigprocmask(H,S,O)
+#define HDsigprocmask(H, S, O) sigprocmask(H, S, O)
 #endif /* HDsigprocmask */
 #ifndef HDsigsetjmp
-    #define HDsigsetjmp(J,N)  sigsetjmp(J,N)
+#define HDsigsetjmp(J, N) sigsetjmp(J, N)
 #endif /* HDsigsetjmp */
 #ifndef HDsigsuspend
-    #define HDsigsuspend(S)    sigsuspend(S)
+#define HDsigsuspend(S) sigsuspend(S)
 #endif /* HDsigsuspend */
 #ifndef HDsin
-    #define HDsin(X)    sin(X)
+#define HDsin(X) sin(X)
 #endif /* HDsin */
 #ifndef HDsinh
-    #define HDsinh(X)    sinh(X)
+#define HDsinh(X) sinh(X)
 #endif /* HDsinh */
 #ifndef HDsleep
-    #define HDsleep(N)    sleep(N)
+#define HDsleep(N) sleep(N)
 #endif /* HDsleep */
 #ifndef HDsnprintf
-    #define HDsnprintf    snprintf /*varargs*/
-#endif /* HDsnprintf */
+#define HDsnprintf snprintf /*varargs*/
+#endif                      /* HDsnprintf */
 #ifndef HDsprintf
-    #define HDsprintf    sprintf /*varargs*/
-#endif /* HDsprintf */
+#define HDsprintf sprintf /*varargs*/
+#endif                    /* HDsprintf */
 #ifndef HDsqrt
-    #define HDsqrt(X)    sqrt(X)
+#define HDsqrt(X) sqrt(X)
 #endif /* HDsqrt */
 #ifdef H5_HAVE_RAND_R
-    H5_DLL void HDsrand(unsigned int seed);
-    #ifndef HDsrandom
-        #define HDsrandom(S)    HDsrand(S)
-    #endif /* HDsrandom */
+H5_DLL void HDsrand(unsigned int seed);
+#ifndef HDsrandom
+#define HDsrandom(S) HDsrand(S)
+#endif /* HDsrandom */
 #elif H5_HAVE_RANDOM
-    #ifndef HDsrand
-        #define HDsrand(S)    srandom(S)
-    #endif /* HDsrand */
-    #ifndef HDsrandom
-        #define HDsrandom(S)    srandom(S)
-    #endif /* HDsrandom */
-#else /* H5_HAVE_RAND_R */
-    #ifndef HDsrand
-        #define HDsrand(S)    srand(S)
-    #endif /* HDsrand */
-    #ifndef HDsrandom
-        #define HDsrandom(S)    srand(S)
-    #endif /* HDsrandom */
+#ifndef HDsrand
+#define HDsrand(S) srandom(S)
+#endif /* HDsrand */
+#ifndef HDsrandom
+#define HDsrandom(S) srandom(S)
+#endif /* HDsrandom */
+#else  /* H5_HAVE_RAND_R */
+#ifndef HDsrand
+#define HDsrand(S) srand(S)
+#endif /* HDsrand */
+#ifndef HDsrandom
+#define HDsrandom(S) srand(S)
+#endif /* HDsrandom */
 #endif /* H5_HAVE_RAND_R */
 #ifndef HDsscanf
-    #define HDsscanf(S,FMT,...)   sscanf(S,FMT,__VA_ARGS__)
+#define HDsscanf(S, FMT, ...) sscanf(S, FMT, __VA_ARGS__)
 #endif /* HDsscanf */
 #ifndef HDstrcat
-    #define HDstrcat(X,Y)    strcat(X,Y)
+#define HDstrcat(X, Y) strcat(X, Y)
 #endif /* HDstrcat */
 #ifndef HDstrchr
-    #define HDstrchr(S,C)    strchr(S,C)
+#define HDstrchr(S, C) strchr(S, C)
 #endif /* HDstrchr */
 #ifndef HDstrcmp
-    #define HDstrcmp(X,Y)       strcmp(X,Y)
+#define HDstrcmp(X, Y) strcmp(X, Y)
 #endif /* HDstrcmp */
 #ifndef HDstrcasecmp
-    #define HDstrcasecmp(X,Y)       strcasecmp(X,Y)
+#define HDstrcasecmp(X, Y) strcasecmp(X, Y)
 #endif /* HDstrcasecmp */
 #ifndef HDstrcoll
-    #define HDstrcoll(X,Y)    strcoll(X,Y)
+#define HDstrcoll(X, Y) strcoll(X, Y)
 #endif /* HDstrcoll */
 #ifndef HDstrcpy
-    #define HDstrcpy(X,Y)    strcpy(X,Y)
+#define HDstrcpy(X, Y) strcpy(X, Y)
 #endif /* HDstrcpy */
 #ifndef HDstrcspn
-    #define HDstrcspn(X,Y)    strcspn(X,Y)
+#define HDstrcspn(X, Y) strcspn(X, Y)
 #endif /* HDstrcspn */
 #ifndef HDstrerror
-    #define HDstrerror(N)    strerror(N)
+#define HDstrerror(N) strerror(N)
 #endif /* HDstrerror */
 #ifndef HDstrftime
-    #define HDstrftime(S,Z,F,T)  strftime(S,Z,F,T)
+#define HDstrftime(S, Z, F, T) strftime(S, Z, F, T)
 #endif /* HDstrftime */
 #ifndef HDstrlen
-    #define HDstrlen(S)    strlen(S)
+#define HDstrlen(S) strlen(S)
 #endif /* HDstrlen */
 #ifndef HDstrncat
-    #define HDstrncat(X,Y,Z)  strncat(X,Y,Z)
+#define HDstrncat(X, Y, Z) strncat(X, Y, Z)
 #endif /* HDstrncat */
 #ifndef HDstrncmp
-    #define HDstrncmp(X,Y,Z)  strncmp(X,Y,Z)
+#define HDstrncmp(X, Y, Z) strncmp(X, Y, Z)
 #endif /* HDstrncmp */
 #ifndef HDstrncpy
-    #define HDstrncpy(X,Y,Z)  strncpy(X,Y,Z)
+#define HDstrncpy(X, Y, Z) strncpy(X, Y, Z)
 #endif /* HDstrncpy */
 #ifndef HDstrpbrk
-    #define HDstrpbrk(X,Y)    strpbrk(X,Y)
+#define HDstrpbrk(X, Y) strpbrk(X, Y)
 #endif /* HDstrpbrk */
 #ifndef HDstrrchr
-    #define HDstrrchr(S,C)    strrchr(S,C)
+#define HDstrrchr(S, C) strrchr(S, C)
 #endif /* HDstrrchr */
 #ifndef HDstrspn
-    #define HDstrspn(X,Y)    strspn(X,Y)
+#define HDstrspn(X, Y) strspn(X, Y)
 #endif /* HDstrspn */
 #ifndef HDstrstr
-    #define HDstrstr(X,Y)    strstr(X,Y)
+#define HDstrstr(X, Y) strstr(X, Y)
 #endif /* HDstrstr */
 #ifndef HDstrtod
-    #define HDstrtod(S,R)    strtod(S,R)
+#define HDstrtod(S, R) strtod(S, R)
 #endif /* HDstrtod */
 #ifndef HDstrtok
-    #define HDstrtok(X,Y)    strtok(X,Y)
+#define HDstrtok(X, Y) strtok(X, Y)
 #endif /* HDstrtok */
 #ifndef HDstrtok_r
-    #define HDstrtok_r(X,Y,Z) strtok_r(X,Y,Z)
+#define HDstrtok_r(X, Y, Z) strtok_r(X, Y, Z)
 #endif /* HDstrtok */
 #ifndef HDstrtol
-    #define HDstrtol(S,R,N)    strtol(S,R,N)
+#define HDstrtol(S, R, N) strtol(S, R, N)
 #endif /* HDstrtol */
 #ifndef HDstrtoll
-    #ifdef H5_HAVE_STRTOLL
-        #define HDstrtoll(S,R,N)  strtoll(S,R,N)
-    #else
-        H5_DLL int64_t HDstrtoll (const char *s, const char **rest, int base);
-    #endif /* H5_HAVE_STRTOLL */
+#ifdef H5_HAVE_STRTOLL
+#define HDstrtoll(S, R, N) strtoll(S, R, N)
+#else
+H5_DLL int64_t HDstrtoll(const char *s, const char **rest, int base);
+#endif /* H5_HAVE_STRTOLL */
 #endif /* HDstrtoll */
 #ifndef HDstrtoul
-    #define HDstrtoul(S,R,N)  strtoul(S,R,N)
+#define HDstrtoul(S, R, N) strtoul(S, R, N)
 #endif /* HDstrtoul */
 #ifndef HDstrtoull
-    #define HDstrtoull(S,R,N)  strtoull(S,R,N)
+#define HDstrtoull(S, R, N) strtoull(S, R, N)
 #endif /* HDstrtoul */
 #ifndef HDstrxfrm
-    #define HDstrxfrm(X,Y,Z)  strxfrm(X,Y,Z)
+#define HDstrxfrm(X, Y, Z) strxfrm(X, Y, Z)
 #endif /* HDstrxfrm */
 #ifdef H5_HAVE_SYMLINK
-    #ifndef HDsymlink
-        #define HDsymlink(F1,F2)  symlink(F1,F2)
-    #endif /* HDsymlink */
+#ifndef HDsymlink
+#define HDsymlink(F1, F2) symlink(F1, F2)
+#endif /* HDsymlink */
 #endif /* H5_HAVE_SYMLINK */
 #ifndef HDsysconf
-    #define HDsysconf(N)    sysconf(N)
+#define HDsysconf(N) sysconf(N)
 #endif /* HDsysconf */
 #ifndef HDsystem
-    #define HDsystem(S)    system(S)
+#define HDsystem(S) system(S)
 #endif /* HDsystem */
 #ifndef HDtan
-    #define HDtan(X)    tan(X)
+#define HDtan(X) tan(X)
 #endif /* HDtan */
 #ifndef HDtanh
-    #define HDtanh(X)    tanh(X)
+#define HDtanh(X) tanh(X)
 #endif /* HDtanh */
 #ifndef HDtcdrain
-    #define HDtcdrain(F)    tcdrain(F)
+#define HDtcdrain(F) tcdrain(F)
 #endif /* HDtcdrain */
 #ifndef HDtcflow
-    #define HDtcflow(F,A)    tcflow(F,A)
+#define HDtcflow(F, A) tcflow(F, A)
 #endif /* HDtcflow */
 #ifndef HDtcflush
-    #define HDtcflush(F,N)    tcflush(F,N)
+#define HDtcflush(F, N) tcflush(F, N)
 #endif /* HDtcflush */
 #ifndef HDtcgetattr
-    #define HDtcgetattr(F,T)  tcgetattr(F,T)
+#define HDtcgetattr(F, T) tcgetattr(F, T)
 #endif /* HDtcgetattr */
 #ifndef HDtcgetpgrp
-    #define HDtcgetpgrp(F)    tcgetpgrp(F)
+#define HDtcgetpgrp(F) tcgetpgrp(F)
 #endif /* HDtcgetpgrp */
 #ifndef HDtcsendbreak
-    #define HDtcsendbreak(F,N)  tcsendbreak(F,N)
+#define HDtcsendbreak(F, N) tcsendbreak(F, N)
 #endif /* HDtcsendbreak */
 #ifndef HDtcsetattr
-    #define HDtcsetattr(F,O,T)  tcsetattr(F,O,T)
+#define HDtcsetattr(F, O, T) tcsetattr(F, O, T)
 #endif /* HDtcsetattr */
 #ifndef HDtcsetpgrp
-    #define HDtcsetpgrp(F,N)  tcsetpgrp(F,N)
+#define HDtcsetpgrp(F, N) tcsetpgrp(F, N)
 #endif /* HDtcsetpgrp */
 #ifndef HDtime
-    #define HDtime(T)    time(T)
+#define HDtime(T) time(T)
 #endif /* HDtime */
 #ifndef HDtimes
-    #define HDtimes(T)    times(T)
+#define HDtimes(T) times(T)
 #endif /* HDtimes*/
 #ifndef HDtmpfile
-    #define HDtmpfile()    tmpfile()
+#define HDtmpfile() tmpfile()
 #endif /* HDtmpfile */
 #ifndef HDtmpnam
-    #define HDtmpnam(S)    tmpnam(S)
+#define HDtmpnam(S) tmpnam(S)
 #endif /* HDtmpnam */
 #ifndef HDtolower
-    #define HDtolower(C)    tolower(C)
+#define HDtolower(C) tolower(C)
 #endif /* HDtolower */
 #ifndef HDtoupper
-    #define HDtoupper(C)    toupper(C)
+#define HDtoupper(C) toupper(C)
 #endif /* HDtoupper */
 #ifndef HDttyname
-    #define HDttyname(F)    ttyname(F)
+#define HDttyname(F) ttyname(F)
 #endif /* HDttyname */
 #ifndef HDtzset
-    #define HDtzset()    tzset()
+#define HDtzset() tzset()
 #endif /* HDtzset */
 #ifndef HDumask
-    #define HDumask(N)    umask(N)
+#define HDumask(N) umask(N)
 #endif /* HDumask */
 #ifndef HDuname
-    #define HDuname(S)    uname(S)
+#define HDuname(S) uname(S)
 #endif /* HDuname */
 #ifndef HDungetc
-    #define HDungetc(C,F)    ungetc(C,F)
+#define HDungetc(C, F) ungetc(C, F)
 #endif /* HDungetc */
 #ifndef HDunlink
-    #define HDunlink(S)    unlink(S)
+#define HDunlink(S) unlink(S)
 #endif /* HDunlink */
 #ifndef HDutime
-    #define HDutime(S,T)    utime(S,T)
+#define HDutime(S, T) utime(S, T)
 #endif /* HDutime */
 #ifndef HDva_arg
-    #define HDva_arg(A,T)    va_arg(A,T)
+#define HDva_arg(A, T) va_arg(A, T)
 #endif /* HDva_arg */
 #ifndef HDva_copy
-#define HDva_copy(D,S)    va_copy(D,S)
+#define HDva_copy(D, S) va_copy(D, S)
 #endif /* HDva_copy */
 #ifndef HDva_end
-    #define HDva_end(A)    va_end(A)
+#define HDva_end(A) va_end(A)
 #endif /* HDva_end */
 #ifndef HDva_start
-    #define HDva_start(A,P)    va_start(A,P)
+#define HDva_start(A, P) va_start(A, P)
 #endif /* HDva_start */
 #ifndef HDvasprintf
-    #define HDvasprintf(RET,FMT,A)  vasprintf(RET,FMT,A)
+#define HDvasprintf(RET, FMT, A) vasprintf(RET, FMT, A)
 #endif /* HDvasprintf */
 #ifndef HDvfprintf
-    #define HDvfprintf(F,FMT,A)  vfprintf(F,FMT,A)
+#define HDvfprintf(F, FMT, A) vfprintf(F, FMT, A)
 #endif /* HDvfprintf */
 #ifndef HDvprintf
-    #define HDvprintf(FMT,A)  vprintf(FMT,A)
+#define HDvprintf(FMT, A) vprintf(FMT, A)
 #endif /* HDvprintf */
 #ifndef HDvsprintf
-    #define HDvsprintf(S,FMT,A)  vsprintf(S,FMT,A)
+#define HDvsprintf(S, FMT, A) vsprintf(S, FMT, A)
 #endif /* HDvsprintf */
 #ifndef HDvsnprintf
-    #define HDvsnprintf(S,N,FMT,A) vsnprintf(S,N,FMT,A)
+#define HDvsnprintf(S, N, FMT, A) vsnprintf(S, N, FMT, A)
 #endif /* HDvsnprintf */
 #ifndef HDwait
-    #define HDwait(W)    wait(W)
+#define HDwait(W) wait(W)
 #endif /* HDwait */
 #ifndef HDwaitpid
-    #define HDwaitpid(P,W,O)  waitpid(P,W,O)
+#define HDwaitpid(P, W, O) waitpid(P, W, O)
 #endif /* HDwaitpid */
 #ifndef HDwcstombs
-    #define HDwcstombs(S,P,Z)  wcstombs(S,P,Z)
+#define HDwcstombs(S, P, Z) wcstombs(S, P, Z)
 #endif /* HDwcstombs */
 #ifndef HDwctomb
-    #define HDwctomb(S,C)    wctomb(S,C)
+#define HDwctomb(S, C) wctomb(S, C)
 #endif /* HDwctomb */
 #ifndef HDwrite
-    #define HDwrite(F,M,Z)    write(F,M,Z)
+#define HDwrite(F, M, Z) write(F, M, Z)
 #endif /* HDwrite */
 
 /*
@@ -1471,41 +1468,41 @@ typedef off_t               h5_stat_size_t;
  * define these in terms of macros.
  */
 #if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *strdup(const char *s);
+extern char *                   strdup(const char *s);
 #endif
 
 #ifndef HDstrdup
-    #define HDstrdup(S)     strdup(S)
+#define HDstrdup(S) strdup(S)
 #endif /* HDstrdup */
 
 #ifndef HDpthread_self
-    #define HDpthread_self()    pthread_self()
+#define HDpthread_self() pthread_self()
 #endif /* HDpthread_self */
 
 /* Use this version of pthread_self for printing the thread ID */
 #ifndef HDpthread_self_ulong
-    #define HDpthread_self_ulong()    ((unsigned long)pthread_self())
+#define HDpthread_self_ulong() ((unsigned long)pthread_self())
 #endif /* HDpthread_self_ulong */
 
 /* Macro for "stringizing" an integer in the C preprocessor (use H5_TOSTRING) */
 /* (use H5_TOSTRING, H5_STRINGIZE is just part of the implementation) */
 #define H5_STRINGIZE(x) #x
-#define H5_TOSTRING(x) H5_STRINGIZE(x)
+#define H5_TOSTRING(x)  H5_STRINGIZE(x)
 
 /* Macro for "glueing" together items, for re-scanning macros */
-#define H5_GLUE(x,y)       x##y
-#define H5_GLUE3(x,y,z)    x##y##z
-#define H5_GLUE4(w,x,y,z)  w##x##y##z
+#define H5_GLUE(x, y)        x##y
+#define H5_GLUE3(x, y, z)    x##y##z
+#define H5_GLUE4(w, x, y, z) w##x##y##z
 
 /*
  * A macro for detecting over/under-flow when casting between types
  */
 #ifndef NDEBUG
-#define H5_CHECK_OVERFLOW(var, vartype, casttype) \
-{                                                 \
-    casttype _tmp_overflow = (casttype)(var);     \
-    HDassert((var) == (vartype)_tmp_overflow);      \
-}
+#define H5_CHECK_OVERFLOW(var, vartype, casttype)                                                            \
+    {                                                                                                        \
+        casttype _tmp_overflow = (casttype)(var);                                                            \
+        HDassert((var) == (vartype)_tmp_overflow);                                                           \
+    }
 #else /* NDEBUG */
 #define H5_CHECK_OVERFLOW(var, vartype, casttype)
 #endif /* NDEBUG */
@@ -1514,49 +1511,46 @@ extern char *strdup(const char *s);
  * A macro for detecting over/under-flow when assigning between types
  */
 #ifndef NDEBUG
-#define ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)       \
-{                                                       \
-    srctype _tmp_src = (srctype)(src);  \
-    dsttype _tmp_dst = (dsttype)(_tmp_src);  \
-    HDassert(_tmp_src == (srctype)_tmp_dst);   \
-    (dst) = _tmp_dst;                             \
-}
-
-#define ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)       \
-    (dst) = (dsttype)(src);
-
-#define ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)       \
-{                                                       \
-    srctype _tmp_src = (srctype)(src);  \
-    dsttype _tmp_dst = (dsttype)(_tmp_src);  \
-    HDassert(_tmp_src >= 0);   \
-    HDassert(_tmp_src == (srctype)_tmp_dst);   \
-    (dst) = _tmp_dst;                             \
-}
-
-#define ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)       \
-    (dst) = (dsttype)(src);
-
-#define ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)       \
-{                                                       \
-    srctype _tmp_src = (srctype)(src);  \
-    dsttype _tmp_dst = (dsttype)(_tmp_src);  \
-    HDassert(_tmp_dst >= 0);   \
-    HDassert(_tmp_src == (srctype)_tmp_dst);   \
-    (dst) = _tmp_dst;                             \
-}
-
-#define ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)       \
-{                                                       \
-    srctype _tmp_src = (srctype)(src);  \
-    dsttype _tmp_dst = (dsttype)(_tmp_src);  \
-    HDassert(_tmp_src >= 0);   \
-    HDassert(_tmp_src == (srctype)_tmp_dst);   \
-    (dst) = _tmp_dst;                             \
-}
-
-#define ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)       \
-    (dst) = (dsttype)(src);
+#define ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)                                                   \
+    {                                                                                                        \
+        srctype _tmp_src = (srctype)(src);                                                                   \
+        dsttype _tmp_dst = (dsttype)(_tmp_src);                                                              \
+        HDassert(_tmp_src == (srctype)_tmp_dst);                                                             \
+        (dst) = _tmp_dst;                                                                                    \
+    }
+
+#define ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype) (dst) = (dsttype)(src);
+
+#define ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)                                 \
+    {                                                                                                        \
+        srctype _tmp_src = (srctype)(src);                                                                   \
+        dsttype _tmp_dst = (dsttype)(_tmp_src);                                                              \
+        HDassert(_tmp_src >= 0);                                                                             \
+        HDassert(_tmp_src == (srctype)_tmp_dst);                                                             \
+        (dst) = _tmp_dst;                                                                                    \
+    }
+
+#define ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype) (dst) = (dsttype)(src);
+
+#define ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)                                   \
+    {                                                                                                        \
+        srctype _tmp_src = (srctype)(src);                                                                   \
+        dsttype _tmp_dst = (dsttype)(_tmp_src);                                                              \
+        HDassert(_tmp_dst >= 0);                                                                             \
+        HDassert(_tmp_src == (srctype)_tmp_dst);                                                             \
+        (dst) = _tmp_dst;                                                                                    \
+    }
+
+#define ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)                                   \
+    {                                                                                                        \
+        srctype _tmp_src = (srctype)(src);                                                                   \
+        dsttype _tmp_dst = (dsttype)(_tmp_src);                                                              \
+        HDassert(_tmp_src >= 0);                                                                             \
+        HDassert(_tmp_src == (srctype)_tmp_dst);                                                             \
+        (dst) = _tmp_dst;                                                                                    \
+    }
+
+#define ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype) (dst) = (dsttype)(src);
 
 /* Include the generated overflow header file */
 #include "H5overflow.h"
@@ -1573,50 +1567,49 @@ extern char *strdup(const char *s);
  * The preprocessor does not expand macros in w##x##y##z, so
  * that will always generate the expected name.
  */
-#define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype)  \
-    ASSIGN_##srctype##_TO_##dsttype(dst,dsttype,src,srctype)\
+#define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype)                                                        \
+    ASSIGN_##srctype##_TO_##dsttype(dst, dsttype, src, srctype)
 
 #else /* NDEBUG */
-#define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype)  \
-    (dst) = (dsttype)(src);
+#define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype) (dst) = (dsttype)(src);
 #endif /* NDEBUG */
 
 #if defined(H5_HAVE_WINDOW_PATH)
 
 /* directory delimiter for Windows: slash and backslash are acceptable on Windows */
-#define H5_DIR_SLASH_SEPC       '/'
-#define H5_DIR_SEPC             '\\'
-#define H5_DIR_SEPS             "\\"
-#define H5_CHECK_DELIMITER(SS)     ((SS == H5_DIR_SEPC) || (SS == H5_DIR_SLASH_SEPC))
-#define H5_CHECK_ABSOLUTE(NAME)    ((HDisalpha(NAME[0])) && (NAME[1] == ':') && (H5_CHECK_DELIMITER(NAME[2])))
-#define H5_CHECK_ABS_DRIVE(NAME)   ((HDisalpha(NAME[0])) && (NAME[1] == ':'))
-#define H5_CHECK_ABS_PATH(NAME)    (H5_CHECK_DELIMITER(NAME[0]))
-
-#define H5_GET_LAST_DELIMITER(NAME, ptr) {                 \
-    char        *slash, *backslash;                     \
-                                                        \
-    slash = HDstrrchr(NAME, H5_DIR_SLASH_SEPC);         \
-    backslash = HDstrrchr(NAME, H5_DIR_SEPC);           \
-    if(backslash > slash)                               \
-        (ptr = backslash);                              \
-    else                                                \
-        (ptr = slash);                                  \
-}
+#define H5_DIR_SLASH_SEPC        '/'
+#define H5_DIR_SEPC              '\\'
+#define H5_DIR_SEPS              "\\"
+#define H5_CHECK_DELIMITER(SS)   ((SS == H5_DIR_SEPC) || (SS == H5_DIR_SLASH_SEPC))
+#define H5_CHECK_ABSOLUTE(NAME)  ((HDisalpha(NAME[0])) && (NAME[1] == ':') && (H5_CHECK_DELIMITER(NAME[2])))
+#define H5_CHECK_ABS_DRIVE(NAME) ((HDisalpha(NAME[0])) && (NAME[1] == ':'))
+#define H5_CHECK_ABS_PATH(NAME)  (H5_CHECK_DELIMITER(NAME[0]))
+
+#define H5_GET_LAST_DELIMITER(NAME, ptr)                                                                     \
+    {                                                                                                        \
+        char *slash, *backslash;                                                                             \
+                                                                                                             \
+        slash     = HDstrrchr(NAME, H5_DIR_SLASH_SEPC);                                                      \
+        backslash = HDstrrchr(NAME, H5_DIR_SEPC);                                                            \
+        if (backslash > slash)                                                                               \
+            (ptr = backslash);                                                                               \
+        else                                                                                                 \
+            (ptr = slash);                                                                                   \
+    }
 
 #else /* H5_HAVE_WINDOW_PATH */
 
-#define H5_DIR_SEPC             '/'
-#define H5_DIR_SEPS             "/"
-#define H5_CHECK_DELIMITER(SS)     (SS == H5_DIR_SEPC)
-#define H5_CHECK_ABSOLUTE(NAME)    (H5_CHECK_DELIMITER(*NAME))
-#define H5_CHECK_ABS_DRIVE(NAME)   (0)
-#define H5_CHECK_ABS_PATH(NAME)    (0)
-#define H5_GET_LAST_DELIMITER(NAME, ptr)   ptr = HDstrrchr(NAME, H5_DIR_SEPC);
+#define H5_DIR_SEPC                      '/'
+#define H5_DIR_SEPS                      "/"
+#define H5_CHECK_DELIMITER(SS)           (SS == H5_DIR_SEPC)
+#define H5_CHECK_ABSOLUTE(NAME)          (H5_CHECK_DELIMITER(*NAME))
+#define H5_CHECK_ABS_DRIVE(NAME)         (0)
+#define H5_CHECK_ABS_PATH(NAME)          (0)
+#define H5_GET_LAST_DELIMITER(NAME, ptr) ptr = HDstrrchr(NAME, H5_DIR_SEPC);
 
 #endif /* H5_HAVE_WINDOW_PATH */
 
-#define   H5_COLON_SEPC  ':'
-
+#define H5_COLON_SEPC ':'
 
 /* Use FUNC to safely handle variations of C99 __func__ keyword handling */
 #ifdef H5_HAVE_C99_FUNC
@@ -1638,45 +1631,45 @@ extern char *strdup(const char *s);
  *    information about the package in H5_init_library().
  */
 typedef enum {
-    H5_PKG_A,       /* Attributes               */
-    H5_PKG_AC,      /* Metadata cache           */
-    H5_PKG_B,       /* B-trees                  */
-    H5_PKG_D,       /* Datasets                 */
-    H5_PKG_E,       /* Error handling           */
-    H5_PKG_F,       /* Files                    */
-    H5_PKG_G,       /* Groups                   */
-    H5_PKG_HG,      /* Global heaps             */
-    H5_PKG_HL,      /* Local heaps              */
-    H5_PKG_I,       /* IDs                      */
-    H5_PKG_MF,      /* File memory management   */
-    H5_PKG_MM,      /* Core memory management   */
-    H5_PKG_O,       /* Object headers           */
-    H5_PKG_P,       /* Property lists           */
-    H5_PKG_S,       /* Dataspaces               */
-    H5_PKG_T,       /* Datatypes                */
-    H5_PKG_V,       /* Vector functions         */
-    H5_PKG_Z,       /* Raw data filters         */
-    H5_NPKGS        /* Must be last             */
+    H5_PKG_A,  /* Attributes               */
+    H5_PKG_AC, /* Metadata cache           */
+    H5_PKG_B,  /* B-trees                  */
+    H5_PKG_D,  /* Datasets                 */
+    H5_PKG_E,  /* Error handling           */
+    H5_PKG_F,  /* Files                    */
+    H5_PKG_G,  /* Groups                   */
+    H5_PKG_HG, /* Global heaps             */
+    H5_PKG_HL, /* Local heaps              */
+    H5_PKG_I,  /* IDs                      */
+    H5_PKG_MF, /* File memory management   */
+    H5_PKG_MM, /* Core memory management   */
+    H5_PKG_O,  /* Object headers           */
+    H5_PKG_P,  /* Property lists           */
+    H5_PKG_S,  /* Dataspaces               */
+    H5_PKG_T,  /* Datatypes                */
+    H5_PKG_V,  /* Vector functions         */
+    H5_PKG_Z,  /* Raw data filters         */
+    H5_NPKGS   /* Must be last             */
 } H5_pkg_t;
 
 typedef struct H5_debug_open_stream_t {
-    FILE        *stream;                /* Open output stream */
-    struct H5_debug_open_stream_t *next; /* Next open output stream */
+    FILE *                         stream; /* Open output stream */
+    struct H5_debug_open_stream_t *next;   /* Next open output stream */
 } H5_debug_open_stream_t;
 
 typedef struct H5_debug_t {
-    FILE    *trace;    /*API trace output stream  */
-    hbool_t             ttop;           /*Show only top-level calls?    */
-    hbool_t             ttimes;         /*Show trace event times?       */
+    FILE *  trace;  /*API trace output stream  */
+    hbool_t ttop;   /*Show only top-level calls?    */
+    hbool_t ttimes; /*Show trace event times?       */
     struct {
-  const char  *name;    /*package name      */
-  FILE    *stream;  /*output stream  or NULL    */
+        const char *name;   /*package name      */
+        FILE *      stream; /*output stream  or NULL    */
     } pkg[H5_NPKGS];
     H5_debug_open_stream_t *open_stream; /* Stack of open output streams */
 } H5_debug_t;
 
-extern H5_debug_t    H5_debug_g;
-#define H5DEBUG(X)    (H5_debug_g.pkg[H5_PKG_##X].stream)
+extern H5_debug_t H5_debug_g;
+#define H5DEBUG(X) (H5_debug_g.pkg[H5_PKG_##X].stream)
 /* Do not use const else AIX strings does not show it. */
 extern char H5libhdf5_settings[]; /* embedded library information */
 
@@ -1695,80 +1688,79 @@ extern char H5libhdf5_settings[]; /* embedded library information */
  */
 #ifdef H5_DEBUG_API
 
-#define H5TRACE_DECL                                                                                    \
-            const char *RTYPE = NULL;                                                                   \
-            double CALLTIME;
-
-#define H5TRACE0(R,T)                                                                                   \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T)
-#define H5TRACE1(R,T,A0)                                                                                \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0)
-#define H5TRACE2(R,T,A0,A1)                                                                             \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1)
-#define H5TRACE3(R,T,A0,A1,A2)                                                                          \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2)
-#define H5TRACE4(R,T,A0,A1,A2,A3)                                                                       \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3)
-#define H5TRACE5(R,T,A0,A1,A2,A3,A4)                                                                    \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3,#A4,A4)
-#define H5TRACE6(R,T,A0,A1,A2,A3,A4,A5)                                                                 \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3,#A4,A4,#A5,A5)
-#define H5TRACE7(R,T,A0,A1,A2,A3,A4,A5,A6)                                                              \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3,#A4,A4,#A5,A5,#A6,A6)
-#define H5TRACE8(R,T,A0,A1,A2,A3,A4,A5,A6,A7)                                                           \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3,#A4,A4,#A5,A5,#A6,A6,#A7,A7)
-#define H5TRACE9(R,T,A0,A1,A2,A3,A4,A5,A6,A7,A8)                                                        \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3,#A4,A4,#A5,A5,#A6,A6,#A7,A7,      \
-                                          #A8,A8)
-#define H5TRACE10(R,T,A0,A1,A2,A3,A4,A5,A6,A7,A8,A9)                                                    \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3,#A4,A4,#A5,A5,#A6,A6,#A7,A7,      \
-                                          #A8,A8,#A9,A9)
-#define H5TRACE11(R,T,A0,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10)                                                \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3,#A4,A4,#A5,A5,#A6,A6,#A7,A7,      \
-                                          #A8,A8,#A9,A9,#A10,A10)
-#define H5TRACE12(R,T,A0,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)                                            \
-            RTYPE=R;                                                                                    \
-            CALLTIME=H5_trace(NULL,FUNC,T,#A0,A0,#A1,A1,#A2,A2,#A3,A3,#A4,A4,#A5,A5,#A6,A6,#A7,A7,      \
-                                          #A8,A8,#A9,A9,#A10,A10,#A11,A11)
-
-#define H5TRACE_RETURN(V)                                                                               \
-            if (RTYPE) {                                                                                \
-                H5_trace(&CALLTIME, FUNC, RTYPE, NULL, V);                                              \
-                RTYPE = NULL;                                                                           \
-            }
+#define H5TRACE_DECL                                                                                         \
+    const char *RTYPE = NULL;                                                                                \
+    double      CALLTIME;
+
+#define H5TRACE0(R, T)                                                                                       \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T)
+#define H5TRACE1(R, T, A0)                                                                                   \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0)
+#define H5TRACE2(R, T, A0, A1)                                                                               \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1)
+#define H5TRACE3(R, T, A0, A1, A2)                                                                           \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2)
+#define H5TRACE4(R, T, A0, A1, A2, A3)                                                                       \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3)
+#define H5TRACE5(R, T, A0, A1, A2, A3, A4)                                                                   \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4)
+#define H5TRACE6(R, T, A0, A1, A2, A3, A4, A5)                                                               \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5)
+#define H5TRACE7(R, T, A0, A1, A2, A3, A4, A5, A6)                                                           \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6)
+#define H5TRACE8(R, T, A0, A1, A2, A3, A4, A5, A6, A7)                                                       \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, #A7, A7)
+#define H5TRACE9(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8)                                                   \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, #A7,   \
+                        A7, #A8, A8)
+#define H5TRACE10(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9)                                              \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, #A7,   \
+                        A7, #A8, A8, #A9, A9)
+#define H5TRACE11(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)                                         \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, #A7,   \
+                        A7, #A8, A8, #A9, A9, #A10, A10)
+#define H5TRACE12(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11)                                    \
+    RTYPE    = R;                                                                                            \
+    CALLTIME = H5_trace(NULL, FUNC, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, #A7,   \
+                        A7, #A8, A8, #A9, A9, #A10, A10, #A11, A11)
+
+#define H5TRACE_RETURN(V)                                                                                    \
+    if (RTYPE) {                                                                                             \
+        H5_trace(&CALLTIME, FUNC, RTYPE, NULL, V);                                                           \
+        RTYPE = NULL;                                                                                        \
+    }
 #else
-#define H5TRACE_DECL                                            /*void*/
-#define H5TRACE0(R,T)                                           /*void*/
-#define H5TRACE1(R,T,A0)                                        /*void*/
-#define H5TRACE2(R,T,A0,A1)                                     /*void*/
-#define H5TRACE3(R,T,A0,A1,A2)                                  /*void*/
-#define H5TRACE4(R,T,A0,A1,A2,A3)                               /*void*/
-#define H5TRACE5(R,T,A0,A1,A2,A3,A4)                            /*void*/
-#define H5TRACE6(R,T,A0,A1,A2,A3,A4,A5)                         /*void*/
-#define H5TRACE7(R,T,A0,A1,A2,A3,A4,A5,A6)                      /*void*/
-#define H5TRACE8(R,T,A0,A1,A2,A3,A4,A5,A6,A7)                   /*void*/
-#define H5TRACE9(R,T,A0,A1,A2,A3,A4,A5,A6,A7,A8)                /*void*/
-#define H5TRACE10(R,T,A0,A1,A2,A3,A4,A5,A6,A7,A8,A9)            /*void*/
-#define H5TRACE11(R,T,A0,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10)        /*void*/
-#define H5TRACE12(R,T,A0,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)    /*void*/
-#define H5TRACE_RETURN(V)                                       /*void*/
-#endif /* H5_DEBUG_API */
+#define H5TRACE_DECL                                                      /*void*/
+#define H5TRACE0(R, T)                                                    /*void*/
+#define H5TRACE1(R, T, A0)                                                /*void*/
+#define H5TRACE2(R, T, A0, A1)                                            /*void*/
+#define H5TRACE3(R, T, A0, A1, A2)                                        /*void*/
+#define H5TRACE4(R, T, A0, A1, A2, A3)                                    /*void*/
+#define H5TRACE5(R, T, A0, A1, A2, A3, A4)                                /*void*/
+#define H5TRACE6(R, T, A0, A1, A2, A3, A4, A5)                            /*void*/
+#define H5TRACE7(R, T, A0, A1, A2, A3, A4, A5, A6)                        /*void*/
+#define H5TRACE8(R, T, A0, A1, A2, A3, A4, A5, A6, A7)                    /*void*/
+#define H5TRACE9(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8)                /*void*/
+#define H5TRACE10(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9)           /*void*/
+#define H5TRACE11(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)      /*void*/
+#define H5TRACE12(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) /*void*/
+#define H5TRACE_RETURN(V)                                                 /*void*/
+#endif                                                                    /* H5_DEBUG_API */
 
 H5_DLL double H5_trace(const double *calltime, const char *func, const char *type, ...);
 
-
 /*-------------------------------------------------------------------------
  * Purpose:  Register function entry for library initialization and code
  *    profiling.
@@ -1798,36 +1790,38 @@ H5_DLL double H5_trace(const double *calltime, const char *func, const char *typ
  *      - Underscore at position 4 if position 3 is uppercase or a digit.
  *        Handles H5XY_.
  */
-#define H5_IS_API(S) (\
-    '_'!=((const char *)S)[2]       /* underscore at position 2     */  \
-    && '_'!=((const char *)S)[3]    /* underscore at position 3     */  \
-    && !(                                       /* NOT              */  \
-        ((const char *)S)[4]                    /* pos 4 exists     */  \
-        && (HDisupper(S[3]) || HDisdigit(S[3])) /* pos 3 dig | uc   */  \
-        && '_'==((const char *)S)[4]            /* pos 4 underscore */  \
-    )\
-)
+#define H5_IS_API(S)                                                                                         \
+    ('_' != ((const char *)S)[2]                  /* underscore at position 2     */                         \
+     && '_' != ((const char *)S)[3]               /* underscore at position 3     */                         \
+     && !(                                        /* NOT              */                                     \
+          ((const char *)S)[4]                    /* pos 4 exists     */                                     \
+          && (HDisupper(S[3]) || HDisdigit(S[3])) /* pos 3 dig | uc   */                                     \
+          && '_' == ((const char *)S)[4]          /* pos 4 underscore */                                     \
+          ))
 
 /* `S' is the name of a function which is being tested to check if it's */
 /*      a public API function */
-#define H5_IS_PUB(S) (((HDisdigit(S[1]) || HDisupper(S[1])) && HDislower(S[2])) || \
-    ((HDisdigit(S[2]) || HDisupper(S[2])) && HDislower(S[3])) || \
-    (!S[4] || ((HDisdigit(S[3]) || HDisupper(S[3])) && HDislower(S[4]))))
+#define H5_IS_PUB(S)                                                                                         \
+    (((HDisdigit(S[1]) || HDisupper(S[1])) && HDislower(S[2])) ||                                            \
+     ((HDisdigit(S[2]) || HDisupper(S[2])) && HDislower(S[3])) ||                                            \
+     (!S[4] || ((HDisdigit(S[3]) || HDisupper(S[3])) && HDislower(S[4]))))
 
 /* `S' is the name of a function which is being tested to check if it's */
 /*      a private library function */
-#define H5_IS_PRIV(S) (((HDisdigit(S[1]) || HDisupper(S[1])) && '_' == S[2] && HDislower(S[3])) || \
-    ((HDisdigit(S[2]) || HDisupper(S[2])) && '_' == S[3] && HDislower(S[4])) || \
-    ((HDisdigit(S[3]) || HDisupper(S[3])) && '_' == S[4] && HDislower(S[5])))
+#define H5_IS_PRIV(S)                                                                                        \
+    (((HDisdigit(S[1]) || HDisupper(S[1])) && '_' == S[2] && HDislower(S[3])) ||                             \
+     ((HDisdigit(S[2]) || HDisupper(S[2])) && '_' == S[3] && HDislower(S[4])) ||                             \
+     ((HDisdigit(S[3]) || HDisupper(S[3])) && '_' == S[4] && HDislower(S[5])))
 
 /* `S' is the name of a function which is being tested to check if it's */
 /*      a package private function */
-#define H5_IS_PKG(S) (((HDisdigit(S[1]) || HDisupper(S[1])) && '_' == S[2] && '_' == S[3] && HDislower(S[4])) || \
-    ((HDisdigit(S[2]) || HDisupper(S[2])) && '_' == S[3] && '_' == S[4] && HDislower(S[5])) || \
-    ((HDisdigit(S[3]) || HDisupper(S[3])) && '_' == S[4] && '_' == S[5] && HDislower(S[6])))
+#define H5_IS_PKG(S)                                                                                         \
+    (((HDisdigit(S[1]) || HDisupper(S[1])) && '_' == S[2] && '_' == S[3] && HDislower(S[4])) ||              \
+     ((HDisdigit(S[2]) || HDisupper(S[2])) && '_' == S[3] && '_' == S[4] && HDislower(S[5])) ||              \
+     ((HDisdigit(S[3]) || HDisupper(S[3])) && '_' == S[4] && '_' == S[5] && HDislower(S[6])))
 
 /* global library version information string */
-extern char  H5_lib_vers_info_g[];
+extern char H5_lib_vers_info_g[];
 
 /* Lock headers */
 #ifdef H5_HAVE_THREADSAFE
@@ -1837,8 +1831,8 @@ extern char  H5_lib_vers_info_g[];
 
 /* replacement structure for original global variable */
 typedef struct H5_api_struct {
-    H5TS_mutex_t init_lock;  /* API entrance mutex */
-    hbool_t H5_libinit_g;    /* Has the library been initialized? */
+    H5TS_mutex_t init_lock;    /* API entrance mutex */
+    hbool_t      H5_libinit_g; /* Has the library been initialized? */
 } H5_api_t;
 
 /* Macros for accessing the global variables */
@@ -1852,17 +1846,13 @@ typedef struct H5_api_struct {
 #endif
 
 /* Macros for threadsafe HDF-5 Phase I locks */
-#define H5_API_LOCK                                                           \
-     H5TS_mutex_lock(&H5_g.init_lock);
-#define H5_API_UNLOCK                                                         \
-     H5TS_mutex_unlock(&H5_g.init_lock);
+#define H5_API_LOCK   H5TS_mutex_lock(&H5_g.init_lock);
+#define H5_API_UNLOCK H5TS_mutex_unlock(&H5_g.init_lock);
 
 /* Macros for thread cancellation-safe mechanism */
-#define H5_API_UNSET_CANCEL                                                   \
-    H5TS_cancel_count_inc();
+#define H5_API_UNSET_CANCEL H5TS_cancel_count_inc();
 
-#define H5_API_SET_CANCEL                                                     \
-    H5TS_cancel_count_dec();
+#define H5_API_SET_CANCEL H5TS_cancel_count_dec();
 
 extern H5_api_t H5_g;
 
@@ -1880,7 +1870,7 @@ extern H5_api_t H5_g;
 #define H5_API_SET_CANCEL
 
 /* extern global variables */
-extern hbool_t H5_libinit_g;    /* Has the library been initialized? */
+extern hbool_t H5_libinit_g; /* Has the library been initialized? */
 
 /* Macros for accessing the global variables */
 #define H5_INIT_GLOBAL H5_libinit_g
@@ -1892,114 +1882,113 @@ extern hbool_t H5_libinit_g;    /* Has the library been initialized? */
 /* Include required function stack header */
 #include "H5CSprivate.h"
 
-#define H5_PUSH_FUNC            H5CS_push(FUNC);
-#define H5_POP_FUNC             H5CS_pop();
-#else /* H5_HAVE_CODESTACK */
-#define H5_PUSH_FUNC            /* void */
-#define H5_POP_FUNC             /* void */
-#endif /* H5_HAVE_CODESTACK */
+#define H5_PUSH_FUNC H5CS_push(FUNC);
+#define H5_POP_FUNC  H5CS_pop();
+#else                /* H5_HAVE_CODESTACK */
+#define H5_PUSH_FUNC /* void */
+#define H5_POP_FUNC  /* void */
+#endif               /* H5_HAVE_CODESTACK */
 
 #ifdef H5_HAVE_MPE
-extern hbool_t H5_MPEinit_g;   /* Has the MPE Library been initialized? */
+extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
 #endif
 
 /* Macros for defining interface initialization routines */
 #ifdef H5_INTERFACE_INIT_FUNC
 static int    H5_interface_initialize_g = 0;
-static herr_t    H5_INTERFACE_INIT_FUNC(void);
-#define H5_INTERFACE_INIT(err)                  \
-   /* Initialize this interface or bust */              \
-   if (!H5_interface_initialize_g) {                \
-      H5_interface_initialize_g = 1;                \
-      if (H5_INTERFACE_INIT_FUNC()<0) {                \
-         H5_interface_initialize_g = 0;                      \
-         HGOTO_ERROR (H5E_FUNC, H5E_CANTINIT, err,                  \
-            "interface initialization failed")                          \
-      }                              \
-   }
+static herr_t H5_INTERFACE_INIT_FUNC(void);
+#define H5_INTERFACE_INIT(err)                                                                               \
+    /* Initialize this interface or bust */                                                                  \
+    if (!H5_interface_initialize_g) {                                                                        \
+        H5_interface_initialize_g = 1;                                                                       \
+        if (H5_INTERFACE_INIT_FUNC() < 0) {                                                                  \
+            H5_interface_initialize_g = 0;                                                                   \
+            HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, err, "interface initialization failed")                      \
+        }                                                                                                    \
+    }
 #else /* H5_INTERFACE_INIT_FUNC */
 #define H5_INTERFACE_INIT(err)
 #endif /* H5_INTERFACE_INIT_FUNC */
 
-
 #ifndef NDEBUG
-#define FUNC_ENTER_CHECK_NAME(asrt)                                           \
-    {                                                                         \
-        static hbool_t func_check = FALSE;                                    \
-                                                                              \
-        if(!func_check) {                     \
-            /* Check function naming status */              \
-            HDassert(asrt);                                    \
-                                                                              \
-            /* Don't check again */                                           \
-            func_check = TRUE;                                                \
-        } /* end if */                                                        \
-    } /* end scope */
-#else /* NDEBUG */
+#define FUNC_ENTER_CHECK_NAME(asrt)                                                                          \
+    {                                                                                                        \
+        static hbool_t func_check = FALSE;                                                                   \
+                                                                                                             \
+        if (!func_check) {                                                                                   \
+            /* Check function naming status */                                                               \
+            HDassert(asrt);                                                                                  \
+                                                                                                             \
+            /* Don't check again */                                                                          \
+            func_check = TRUE;                                                                               \
+        } /* end if */                                                                                       \
+    }     /* end scope */
+#else     /* NDEBUG */
 #define FUNC_ENTER_CHECK_NAME(asrt)
 #endif /* NDEBUG */
 
-
-#define FUNC_ENTER_COMMON(asrt)                                               \
-    hbool_t err_occurred = FALSE;                                             \
-                                                                              \
+#define FUNC_ENTER_COMMON(asrt)                                                                              \
+    hbool_t err_occurred = FALSE;                                                                            \
+                                                                                                             \
     FUNC_ENTER_CHECK_NAME(asrt);
 
-#define FUNC_ENTER_COMMON_NOERR(asrt)                                         \
-    FUNC_ENTER_CHECK_NAME(asrt);
+#define FUNC_ENTER_COMMON_NOERR(asrt) FUNC_ENTER_CHECK_NAME(asrt);
 
 /* Threadsafety initialization code for API routines */
-#define FUNC_ENTER_API_THREADSAFE                                             \
-   /* Initialize the thread-safe code */                                      \
-   H5_FIRST_THREAD_INIT                                                       \
-                                                                              \
-   /* Grab the mutex for the library */                                       \
-   H5_API_UNSET_CANCEL                                                        \
-   H5_API_LOCK
+#define FUNC_ENTER_API_THREADSAFE                                                                            \
+    /* Initialize the thread-safe code */                                                                    \
+    H5_FIRST_THREAD_INIT                                                                                     \
+                                                                                                             \
+    /* Grab the mutex for the library */                                                                     \
+    H5_API_UNSET_CANCEL                                                                                      \
+    H5_API_LOCK
 
 /* Local variables for API routines */
-#define FUNC_ENTER_API_VARS                                                   \
-    MPE_LOG_VARS                                                              \
+#define FUNC_ENTER_API_VARS                                                                                  \
+    MPE_LOG_VARS                                                                                             \
     H5TRACE_DECL
 
-#define FUNC_ENTER_API_COMMON                                                 \
-    FUNC_ENTER_API_VARS                                                       \
-    FUNC_ENTER_COMMON(H5_IS_API(FUNC));                                       \
+#define FUNC_ENTER_API_COMMON                                                                                \
+    FUNC_ENTER_API_VARS                                                                                      \
+    FUNC_ENTER_COMMON(H5_IS_API(FUNC));                                                                      \
     FUNC_ENTER_API_THREADSAFE;
 
-#define FUNC_ENTER_API_INIT(err)                     \
-   /* Initialize the library */                         \
-   if(!(H5_INIT_GLOBAL)) {                                                    \
-       H5_INIT_GLOBAL = TRUE;                                                 \
-       if(H5_init_library() < 0)                  \
-          HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, err,                  \
-            "library initialization failed")                          \
-   }                              \
-                                                                              \
-   /* Initialize the interface, if appropriate */                  \
-   H5_INTERFACE_INIT(err)                  \
-                                                                              \
-    /* Push the name of this function on the function stack */                \
-    H5_PUSH_FUNC                                                              \
-                                                                              \
-   BEGIN_MPE_LOG
+#define FUNC_ENTER_API_INIT(err)                                                                             \
+    /* Initialize the library */                                                                             \
+    if (!(H5_INIT_GLOBAL)) {                                                                                 \
+        H5_INIT_GLOBAL = TRUE;                                                                               \
+        if (H5_init_library() < 0)                                                                           \
+            HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, err, "library initialization failed")                        \
+    }                                                                                                        \
+                                                                                                             \
+    /* Initialize the interface, if appropriate */                                                           \
+    H5_INTERFACE_INIT(err)                                                                                   \
+                                                                                                             \
+    /* Push the name of this function on the function stack */                                               \
+    H5_PUSH_FUNC                                                                                             \
+                                                                                                             \
+    BEGIN_MPE_LOG
 
 /* Use this macro for all "normal" API functions */
-#define FUNC_ENTER_API(err) {{                                                \
-    FUNC_ENTER_API_COMMON                                                     \
-    FUNC_ENTER_API_INIT(err);                                                 \
-    /* Clear thread error stack entering public functions */                  \
-    H5E_clear_stack(NULL);                                                    \
-    {
+#define FUNC_ENTER_API(err)                                                                                  \
+    {                                                                                                        \
+        {                                                                                                    \
+            FUNC_ENTER_API_COMMON                                                                            \
+            FUNC_ENTER_API_INIT(err);                                                                        \
+            /* Clear thread error stack entering public functions */                                         \
+            H5E_clear_stack(NULL);                                                                           \
+            {
 
 /*
  * Use this macro for API functions that shouldn't clear the error stack
  *      like H5Eprint and H5Ewalk.
  */
-#define FUNC_ENTER_API_NOCLEAR(err) {{                                        \
-    FUNC_ENTER_API_COMMON                                                     \
-    FUNC_ENTER_API_INIT(err);                                                 \
-    {
+#define FUNC_ENTER_API_NOCLEAR(err)                                                                          \
+    {                                                                                                        \
+        {                                                                                                    \
+            FUNC_ENTER_API_COMMON                                                                            \
+            FUNC_ENTER_API_INIT(err);                                                                        \
+            {
 
 /*
  * Use this macro for API functions that shouldn't perform _any_ initialization
@@ -2007,11 +1996,13 @@ static herr_t    H5_INTERFACE_INIT_FUNC(void);
  *      are: H5check_version, etc.
  *
  */
-#define FUNC_ENTER_API_NOINIT {{                                              \
-    FUNC_ENTER_API_COMMON                                                     \
-    H5_PUSH_FUNC                                                              \
-    BEGIN_MPE_LOG                                                             \
-    {
+#define FUNC_ENTER_API_NOINIT                                                                                \
+    {                                                                                                        \
+        {                                                                                                    \
+            FUNC_ENTER_API_COMMON                                                                            \
+            H5_PUSH_FUNC                                                                                     \
+            BEGIN_MPE_LOG                                                                                    \
+            {
 
 /*
  * Use this macro for API functions that shouldn't perform _any_ initialization
@@ -2020,56 +2011,64 @@ static herr_t    H5_INTERFACE_INIT_FUNC(void);
  *      are: H5close, H5check_version, etc.
  *
  */
-#define FUNC_ENTER_API_NOINIT_NOERR_NOFS {{                                   \
-    FUNC_ENTER_API_VARS                                                       \
-    FUNC_ENTER_COMMON_NOERR(H5_IS_API(FUNC));                                 \
-    FUNC_ENTER_API_THREADSAFE;                                                \
-    BEGIN_MPE_LOG                                                             \
-    {
+#define FUNC_ENTER_API_NOINIT_NOERR_NOFS                                                                     \
+    {                                                                                                        \
+        {                                                                                                    \
+            FUNC_ENTER_API_VARS                                                                              \
+            FUNC_ENTER_COMMON_NOERR(H5_IS_API(FUNC));                                                        \
+            FUNC_ENTER_API_THREADSAFE;                                                                       \
+            BEGIN_MPE_LOG                                                                                    \
+            {
 
 /* Note: this macro only works when there's _no_ interface initialization routine for the module */
-#define FUNC_ENTER_NOAPI_INIT(err)                     \
-   /* Initialize the interface, if appropriate */                  \
-   H5_INTERFACE_INIT(err)                  \
-                                                                              \
-    /* Push the name of this function on the function stack */                \
+#define FUNC_ENTER_NOAPI_INIT(err)                                                                           \
+    /* Initialize the interface, if appropriate */                                                           \
+    H5_INTERFACE_INIT(err)                                                                                   \
+                                                                                                             \
+    /* Push the name of this function on the function stack */                                               \
     H5_PUSH_FUNC
 
 /* Use this macro for all "normal" non-API functions */
-#define FUNC_ENTER_NOAPI(err) {                                     \
-    FUNC_ENTER_COMMON(!H5_IS_API(FUNC));                     \
-    FUNC_ENTER_NOAPI_INIT(err)                          \
-    {
+#define FUNC_ENTER_NOAPI(err)                                                                                \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON(!H5_IS_API(FUNC));                                                                 \
+        FUNC_ENTER_NOAPI_INIT(err)                                                                           \
+        {
 
 /* Use this macro for all "normal" package-level functions */
-#define FUNC_ENTER_PACKAGE {                                                  \
-    FUNC_ENTER_COMMON(H5_IS_PKG(FUNC));                                       \
-    H5_PUSH_FUNC                                                              \
-    {
+#define FUNC_ENTER_PACKAGE                                                                                   \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON(H5_IS_PKG(FUNC));                                                                  \
+        H5_PUSH_FUNC                                                                                         \
+        {
 
 /* Use this macro for package-level functions which propgate errors, but don't issue them */
-#define FUNC_ENTER_PACKAGE_NOERR {                                            \
-    FUNC_ENTER_COMMON_NOERR(H5_IS_PKG(FUNC));                                 \
-    H5_PUSH_FUNC                                                              \
-    {
+#define FUNC_ENTER_PACKAGE_NOERR                                                                             \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON_NOERR(H5_IS_PKG(FUNC));                                                            \
+        H5_PUSH_FUNC                                                                                         \
+        {
 
 /* Use this macro for all "normal" staticly-scoped functions */
-#define FUNC_ENTER_STATIC {                                                   \
-    FUNC_ENTER_COMMON(H5_IS_PKG(FUNC));                                       \
-    H5_PUSH_FUNC                                                              \
-    {
+#define FUNC_ENTER_STATIC                                                                                    \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON(H5_IS_PKG(FUNC));                                                                  \
+        H5_PUSH_FUNC                                                                                         \
+        {
 
 /* Use this macro for staticly-scoped functions which propgate errors, but don't issue them */
-#define FUNC_ENTER_STATIC_NOERR {                                             \
-    FUNC_ENTER_COMMON_NOERR(H5_IS_PKG(FUNC));                                 \
-    H5_PUSH_FUNC                                                              \
-    {
+#define FUNC_ENTER_STATIC_NOERR                                                                              \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON_NOERR(H5_IS_PKG(FUNC));                                                            \
+        H5_PUSH_FUNC                                                                                         \
+        {
 
 /* Use this macro for all non-API functions, which propagate errors, but don't issue them */
-#define FUNC_ENTER_NOAPI_NOERR {                               \
-    FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC));               \
-    FUNC_ENTER_NOAPI_INIT(-)                          \
-    {
+#define FUNC_ENTER_NOAPI_NOERR                                                                               \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC));                                                           \
+        FUNC_ENTER_NOAPI_INIT(-)                                                                             \
+        {
 
 /*
  * Use this macro for non-API functions which fall into these categories:
@@ -2079,10 +2078,11 @@ static herr_t    H5_INTERFACE_INIT_FUNC(void);
  *      - functions which are called during library shutdown, since we don't
  *              want to re-initialize the library.
  */
-#define FUNC_ENTER_NOAPI_NOINIT {                                             \
-    FUNC_ENTER_COMMON(!H5_IS_API(FUNC));                                      \
-    H5_PUSH_FUNC                                                              \
-    {
+#define FUNC_ENTER_NOAPI_NOINIT                                                                              \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON(!H5_IS_API(FUNC));                                                                 \
+        H5_PUSH_FUNC                                                                                         \
+        {
 
 /*
  * Use this macro for non-API functions which fall into these categories:
@@ -2093,10 +2093,11 @@ static herr_t    H5_INTERFACE_INIT_FUNC(void);
  *              want to re-initialize the library.
  *      - functions that propagate, but don't issue errors
  */
-#define FUNC_ENTER_NOAPI_NOINIT_NOERR {                                       \
-    FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC));                                \
-    H5_PUSH_FUNC                                                              \
-    {
+#define FUNC_ENTER_NOAPI_NOINIT_NOERR                                                                        \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC));                                                           \
+        H5_PUSH_FUNC                                                                                         \
+        {
 
 /*
  * Use this macro for non-API functions which fall into these categories:
@@ -2107,9 +2108,10 @@ static herr_t    H5_INTERFACE_INIT_FUNC(void);
  * also don't use the 'FUNC' variable (i.e. don't push errors on the error stack)
  *
  */
-#define FUNC_ENTER_NOAPI_NOERR_NOFS {                             \
-    FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC));               \
-    {
+#define FUNC_ENTER_NOAPI_NOERR_NOFS                                                                          \
+    {                                                                                                        \
+        FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC));                                                           \
+        {
 
 /*-------------------------------------------------------------------------
  * Purpose:  Register function exit for code profiling.  This should be
@@ -2120,56 +2122,56 @@ static herr_t    H5_INTERFACE_INIT_FUNC(void);
  *-------------------------------------------------------------------------
  */
 /* Threadsafety termination code for API routines */
-#define FUNC_LEAVE_API_THREADSAFE                                             \
-    H5_API_UNLOCK                                                             \
+#define FUNC_LEAVE_API_THREADSAFE                                                                            \
+    H5_API_UNLOCK                                                                                            \
     H5_API_SET_CANCEL
 
-#define FUNC_LEAVE_API(ret_value)                                             \
-        FINISH_MPE_LOG                                                       \
-        H5TRACE_RETURN(ret_value);                \
-        H5_POP_FUNC                                                           \
-        if(err_occurred)                  \
-           (void)H5E_dump_api_stack(TRUE);              \
-        FUNC_LEAVE_API_THREADSAFE                                             \
-        return(ret_value);                  \
-    } /*end scope from end of FUNC_ENTER*/                                    \
-}} /*end scope from beginning of FUNC_ENTER*/
+#define FUNC_LEAVE_API(ret_value)                                                                            \
+    FINISH_MPE_LOG                                                                                           \
+    H5TRACE_RETURN(ret_value);                                                                               \
+    H5_POP_FUNC                                                                                              \
+    if (err_occurred)                                                                                        \
+        (void)H5E_dump_api_stack(TRUE);                                                                      \
+    FUNC_LEAVE_API_THREADSAFE                                                                                \
+    return (ret_value);                                                                                      \
+    } /*end scope from end of FUNC_ENTER*/                                                                   \
+    }                                                                                                        \
+    } /*end scope from beginning of FUNC_ENTER*/
 
 /* Use this macro to match the FUNC_ENTER_API_NOFS macro */
-#define FUNC_LEAVE_API_NOFS(ret_value)                                        \
-        FINISH_MPE_LOG                                                       \
-        H5TRACE_RETURN(ret_value);                \
-        FUNC_LEAVE_API_THREADSAFE                                             \
-        return(ret_value);                  \
-    } /*end scope from end of FUNC_ENTER*/                                    \
-}} /*end scope from beginning of FUNC_ENTER*/
-
-#define FUNC_LEAVE_NOAPI(ret_value)                                           \
-        H5_POP_FUNC                                                           \
-        return(ret_value);                  \
-    } /*end scope from end of FUNC_ENTER*/                                    \
-} /*end scope from beginning of FUNC_ENTER*/
-
-#define FUNC_LEAVE_NOAPI_VOID                                                 \
-        H5_POP_FUNC                                                           \
-        return;                                  \
-    } /*end scope from end of FUNC_ENTER*/                                    \
-} /*end scope from beginning of FUNC_ENTER*/
+#define FUNC_LEAVE_API_NOFS(ret_value)                                                                       \
+    FINISH_MPE_LOG                                                                                           \
+    H5TRACE_RETURN(ret_value);                                                                               \
+    FUNC_LEAVE_API_THREADSAFE                                                                                \
+    return (ret_value);                                                                                      \
+    } /*end scope from end of FUNC_ENTER*/                                                                   \
+    }                                                                                                        \
+    } /*end scope from beginning of FUNC_ENTER*/
+
+#define FUNC_LEAVE_NOAPI(ret_value)                                                                          \
+    H5_POP_FUNC                                                                                              \
+    return (ret_value);                                                                                      \
+    } /*end scope from end of FUNC_ENTER*/                                                                   \
+    } /*end scope from beginning of FUNC_ENTER*/
+
+#define FUNC_LEAVE_NOAPI_VOID                                                                                \
+    H5_POP_FUNC                                                                                              \
+    return;                                                                                                  \
+    } /*end scope from end of FUNC_ENTER*/                                                                   \
+    } /*end scope from beginning of FUNC_ENTER*/
 
 /*
  * Use this macro for non-API functions which fall into these categories:
  *      - functions which didn't push their name on the function stack
  *              (so far, just the H5CS routines themselves)
  */
-#define FUNC_LEAVE_NOAPI_NOFS(ret_value)                                      \
-        return(ret_value);                  \
-    } /*end scope from end of FUNC_ENTER*/                                    \
-} /*end scope from beginning of FUNC_ENTER*/
-
-
+#define FUNC_LEAVE_NOAPI_NOFS(ret_value)                                                                     \
+    return (ret_value);                                                                                      \
+    } /*end scope from end of FUNC_ENTER*/                                                                   \
+    } /*end scope from beginning of FUNC_ENTER*/
 
 /* Compile-time "assert" macro */
-#define HDcompile_assert(e)     ((void)sizeof(char[ !!(e) ? 1 : -1]))
+#define HDcompile_assert(e) ((void)sizeof(char[!!(e) ? 1 : -1]))
 /* Variants that are correct, but generate compile-time warnings in some circumstances:
   #define HDcompile_assert(e)     do { enum { compile_assert__ = 1 / (e) }; } while(0)
   #define HDcompile_assert(e)     do { typedef struct { unsigned int b: (e); } x; } while(0)
@@ -2177,7 +2179,7 @@ static herr_t    H5_INTERFACE_INIT_FUNC(void);
 
 /* Private functions, not part of the publicly documented API */
 H5_DLL herr_t H5_init_library(void);
-H5_DLL void H5_term_library(void);
+H5_DLL void   H5_term_library(void);
 
 /* Functions to terminate interfaces */
 H5_DLL int H5A_term_interface(void);
@@ -2205,16 +2207,15 @@ H5_DLL uint32_t H5_hash_string(const char *str);
 
 /* Time related routines */
 H5_DLL time_t H5_make_time(struct tm *tm);
-H5_DLL void H5_nanosleep(uint64_t nanosec);
+H5_DLL void   H5_nanosleep(uint64_t nanosec);
 H5_DLL double H5_get_time(void);
 
 /* Functions for building paths, etc. */
-H5_DLL herr_t   H5_build_extpath(const char *name, char **extpath /*out*/);
-H5_DLL herr_t   H5_combine_path(const char *path1, const char *path2, char **full_name /*out*/);
+H5_DLL herr_t H5_build_extpath(const char *name, char **extpath /*out*/);
+H5_DLL herr_t H5_combine_path(const char *path1, const char *path2, char **full_name /*out*/);
 
 /* Functions for debugging */
-H5_DLL herr_t H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf,
-    const uint8_t *marker, size_t buf_offset, size_t buf_size);
+H5_DLL herr_t H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf, const uint8_t *marker,
+                             size_t buf_offset, size_t buf_size);
 
 #endif /* _H5private_H */
-
diff --git a/src/H5public.h b/src/H5public.h
index 055543f..6cd9416 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -26,47 +26,46 @@
  * it via H5public.h.  The #ifndef _H5public_H guard above would
  * prevent repeated include.
  */
-#include "H5pubconf.h"          /* From configure */
+#include "H5pubconf.h" /* From configure */
 
 /* API Version macro wrapper definitions */
 #include "H5version.h"
 
 #ifdef H5_HAVE_FEATURES_H
-#include <features.h>           /* For setting POSIX, BSD, etc. compatibility */
+#include <features.h> /* For setting POSIX, BSD, etc. compatibility */
 #endif
 #ifdef H5_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef H5_STDC_HEADERS
-#   include <limits.h>          /* For H5T_NATIVE_CHAR defn in H5Tpublic.h  */
-#   include <stdarg.h>          /* For variadic functions in H5VLpublic.h   */
+#include <limits.h> /* For H5T_NATIVE_CHAR defn in H5Tpublic.h  */
+#include <stdarg.h> /* For variadic functions in H5VLpublic.h   */
 #endif
 #ifndef __cplusplus
-# ifdef H5_HAVE_STDINT_H
-#   include <stdint.h>          /* For C9x types */
-# endif
+#ifdef H5_HAVE_STDINT_H
+#include <stdint.h> /* For C9x types */
+#endif
 #else
-# ifdef H5_HAVE_STDINT_H_CXX
-#   include <stdint.h>          /* For C9x types (when included from C++) */
-# endif
+#ifdef H5_HAVE_STDINT_H_CXX
+#include <stdint.h> /* For C9x types (when included from C++) */
+#endif
 #endif
 #ifdef H5_HAVE_INTTYPES_H
-#   include <inttypes.h>        /* C99/POSIX.1 header for uint64_t, PRIu64 */
+#include <inttypes.h> /* C99/POSIX.1 header for uint64_t, PRIu64 */
 #endif
 #ifdef H5_HAVE_STDDEF_H
-#   include <stddef.h>
+#include <stddef.h>
 #endif
 #ifdef H5_HAVE_PARALLEL
 /* Don't link against MPI C++ bindings */
-#   define MPICH_SKIP_MPICXX 1
-#   define OMPI_SKIP_MPICXX 1
-#   include <mpi.h>
-#ifndef MPI_FILE_NULL           /* MPIO may be defined in mpi.h already */
-#   include <mpio.h>
+#define MPICH_SKIP_MPICXX 1
+#define OMPI_SKIP_MPICXX  1
+#include <mpi.h>
+#ifndef MPI_FILE_NULL /* MPIO may be defined in mpi.h already */
+#include <mpio.h>
 #endif
 #endif
 
-
 /* Include the Windows API adapter header early */
 #include "H5api_adpt.h"
 
@@ -81,38 +80,35 @@ extern "C" {
  */
 /* These pragmas are only implemented usefully in gcc 4.6+ */
 #if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
-    #define H5_GCC_DIAG_JOINSTR(x, y) x y
-    #define H5_GCC_DIAG_DO_PRAGMA(x)  _Pragma(#x)
-    #define H5_GCC_DIAG_PRAGMA(x)     H5_GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
+#define H5_GCC_DIAG_JOINSTR(x, y) x y
+#define H5_GCC_DIAG_DO_PRAGMA(x)  _Pragma(#x)
+#define H5_GCC_DIAG_PRAGMA(x)     H5_GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
 
-    #define H5_GCC_DIAG_OFF(x) H5_GCC_DIAG_PRAGMA(push) H5_GCC_DIAG_PRAGMA(ignored H5_GCC_DIAG_JOINSTR("-W",x))
-    #define H5_GCC_DIAG_ON(x) H5_GCC_DIAG_PRAGMA(pop)
+#define H5_GCC_DIAG_OFF(x) H5_GCC_DIAG_PRAGMA(push) H5_GCC_DIAG_PRAGMA(ignored H5_GCC_DIAG_JOINSTR("-W", x))
+#define H5_GCC_DIAG_ON(x)  H5_GCC_DIAG_PRAGMA(pop)
 #else
-    #define H5_GCC_DIAG_OFF(x)
-    #define H5_GCC_DIAG_ON(x)
+#define H5_GCC_DIAG_OFF(x)
+#define H5_GCC_DIAG_ON(x)
 #endif
 
 /* Version numbers TAB char must surround the H5_VERS_xxx number */
-#define H5_VERS_MAJOR    1    /* For major interface/format changes           */
-#define H5_VERS_MINOR    8    /* For minor interface/format changes           */
-#define H5_VERS_RELEASE    22    /* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap11"    /* For pre-releases like snap0       */
-                /* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.22-snap11"      /* Full version string */
+#define H5_VERS_MAJOR      1                               /* For major interface/format changes           */
+#define H5_VERS_MINOR      8                               /* For minor interface/format changes           */
+#define H5_VERS_RELEASE    22                              /* For tweaks, bug-fixes, or development     */
+#define H5_VERS_SUBRELEASE "snap11"                        /* For pre-releases like snap0       */
+                                                           /* Empty string for real releases.           */
+#define H5_VERS_INFO "HDF5 library version: 1.8.22-snap11" /* Full version string */
 
-#define H5check()    H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,          \
-                        H5_VERS_RELEASE)
+#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)
 
 /* macros for comparing the version */
-#define H5_VERSION_GE(Maj,Min,Rel) \
-       (((H5_VERS_MAJOR==Maj) && (H5_VERS_MINOR==Min) && (H5_VERS_RELEASE>=Rel)) || \
-        ((H5_VERS_MAJOR==Maj) && (H5_VERS_MINOR>Min)) || \
-        (H5_VERS_MAJOR>Maj))
+#define H5_VERSION_GE(Maj, Min, Rel)                                                                         \
+    (((H5_VERS_MAJOR == Maj) && (H5_VERS_MINOR == Min) && (H5_VERS_RELEASE >= Rel)) ||                       \
+     ((H5_VERS_MAJOR == Maj) && (H5_VERS_MINOR > Min)) || (H5_VERS_MAJOR > Maj))
 
-#define H5_VERSION_LE(Maj,Min,Rel) \
-       (((H5_VERS_MAJOR==Maj) && (H5_VERS_MINOR==Min) && (H5_VERS_RELEASE<=Rel)) || \
-        ((H5_VERS_MAJOR==Maj) && (H5_VERS_MINOR<Min)) || \
-        (H5_VERS_MAJOR<Maj))
+#define H5_VERSION_LE(Maj, Min, Rel)                                                                         \
+    (((H5_VERS_MAJOR == Maj) && (H5_VERS_MINOR == Min) && (H5_VERS_RELEASE <= Rel)) ||                       \
+     ((H5_VERS_MAJOR == Maj) && (H5_VERS_MINOR < Min)) || (H5_VERS_MAJOR < Maj))
 
 /*
  * Status return values.  Failed integer functions in HDF5 result almost
@@ -126,7 +122,6 @@ extern "C" {
  */
 typedef int herr_t;
 
-
 /*
  * Boolean type.  Successful return values are zero (false) or positive
  * (true). The typical true value is 1 but don't bet on it.  Boolean
@@ -143,23 +138,23 @@ typedef int herr_t;
  *  }
  */
 typedef unsigned int hbool_t;
-typedef int htri_t;
+typedef int          htri_t;
 
 /* Define the ssize_t type if it not is defined */
-#if H5_SIZEOF_SSIZE_T==0
+#if H5_SIZEOF_SSIZE_T == 0
 /* Undefine this size, we will re-define it in one of the sections below */
 #undef H5_SIZEOF_SSIZE_T
-#if H5_SIZEOF_SIZE_T==H5_SIZEOF_INT
+#if H5_SIZEOF_SIZE_T == H5_SIZEOF_INT
 typedef int ssize_t;
-#       define H5_SIZEOF_SSIZE_T H5_SIZEOF_INT
-#elif H5_SIZEOF_SIZE_T==H5_SIZEOF_LONG
+#define H5_SIZEOF_SSIZE_T H5_SIZEOF_INT
+#elif H5_SIZEOF_SIZE_T == H5_SIZEOF_LONG
 typedef long ssize_t;
-#       define H5_SIZEOF_SSIZE_T H5_SIZEOF_LONG
-#elif H5_SIZEOF_SIZE_T==H5_SIZEOF_LONG_LONG
+#define H5_SIZEOF_SSIZE_T H5_SIZEOF_LONG
+#elif H5_SIZEOF_SIZE_T == H5_SIZEOF_LONG_LONG
 typedef long long ssize_t;
-#       define H5_SIZEOF_SSIZE_T H5_SIZEOF_LONG_LONG
+#define H5_SIZEOF_SSIZE_T H5_SIZEOF_LONG_LONG
 #else /* Can't find matching type for ssize_t */
-#   error "nothing appropriate for ssize_t"
+#error "nothing appropriate for ssize_t"
 #endif
 #endif
 
@@ -169,136 +164,136 @@ typedef long long ssize_t;
  */
 #if H5_SIZEOF_LONG_LONG >= 8
 H5_GCC_DIAG_OFF("long-long")
-typedef unsigned long long  hsize_t;
-typedef signed long long    hssize_t;
+typedef unsigned long long hsize_t;
+typedef signed long long   hssize_t;
 H5_GCC_DIAG_ON("long-long")
-#       define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG
-#       define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
+#define H5_SIZEOF_HSIZE_T  H5_SIZEOF_LONG_LONG
+#define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
 #else
-#   error "nothing appropriate for hsize_t"
+#error "nothing appropriate for hsize_t"
 #endif
 
 /*
  * File addresses have their own types.
  */
-#if H5_SIZEOF_INT64_T>=8
-    typedef uint64_t                haddr_t;
-#   define HADDR_UNDEF              ((haddr_t)(int64_t)(-1))
-#   define H5_SIZEOF_HADDR_T        H5_SIZEOF_INT64_T
-#   ifdef H5_HAVE_PARALLEL
-#       define HADDR_AS_MPI_TYPE    MPI_LONG_LONG_INT
-#   endif  /* H5_HAVE_PARALLEL */
-#elif H5_SIZEOF_INT>=8
-    typedef unsigned                haddr_t;
-#   define HADDR_UNDEF              ((haddr_t)(-1))
-#   define H5_SIZEOF_HADDR_T        H5_SIZEOF_INT
-#   ifdef H5_HAVE_PARALLEL
-#       define HADDR_AS_MPI_TYPE    MPI_UNSIGNED
-#   endif  /* H5_HAVE_PARALLEL */
-#elif H5_SIZEOF_LONG>=8
-    typedef unsigned long           haddr_t;
-#   define HADDR_UNDEF              ((haddr_t)(long)(-1))
-#   define H5_SIZEOF_HADDR_T        H5_SIZEOF_LONG
-#   ifdef H5_HAVE_PARALLEL
-#       define HADDR_AS_MPI_TYPE    MPI_UNSIGNED_LONG
-#   endif  /* H5_HAVE_PARALLEL */
-#elif H5_SIZEOF_LONG_LONG>=8
-    typedef unsigned long long      haddr_t;
-#   define HADDR_UNDEF              ((haddr_t)(long long)(-1))
-#   define H5_SIZEOF_HADDR_T        H5_SIZEOF_LONG_LONG
-#   ifdef H5_HAVE_PARALLEL
-#       define HADDR_AS_MPI_TYPE    MPI_LONG_LONG_INT
-#   endif  /* H5_HAVE_PARALLEL */
+#if H5_SIZEOF_INT64_T >= 8
+typedef uint64_t haddr_t;
+#define HADDR_UNDEF       ((haddr_t)(int64_t)(-1))
+#define H5_SIZEOF_HADDR_T H5_SIZEOF_INT64_T
+#ifdef H5_HAVE_PARALLEL
+#define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT
+#endif /* H5_HAVE_PARALLEL */
+#elif H5_SIZEOF_INT >= 8
+typedef unsigned haddr_t;
+#define HADDR_UNDEF       ((haddr_t)(-1))
+#define H5_SIZEOF_HADDR_T H5_SIZEOF_INT
+#ifdef H5_HAVE_PARALLEL
+#define HADDR_AS_MPI_TYPE MPI_UNSIGNED
+#endif /* H5_HAVE_PARALLEL */
+#elif H5_SIZEOF_LONG >= 8
+typedef unsigned long haddr_t;
+#define HADDR_UNDEF       ((haddr_t)(long)(-1))
+#define H5_SIZEOF_HADDR_T H5_SIZEOF_LONG
+#ifdef H5_HAVE_PARALLEL
+#define HADDR_AS_MPI_TYPE MPI_UNSIGNED_LONG
+#endif /* H5_HAVE_PARALLEL */
+#elif H5_SIZEOF_LONG_LONG >= 8
+typedef unsigned long long haddr_t;
+#define HADDR_UNDEF       ((haddr_t)(long long)(-1))
+#define H5_SIZEOF_HADDR_T H5_SIZEOF_LONG_LONG
+#ifdef H5_HAVE_PARALLEL
+#define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT
+#endif /* H5_HAVE_PARALLEL */
 #else
-#   error "nothing appropriate for haddr_t"
+#error "nothing appropriate for haddr_t"
 #endif
-#if H5_SIZEOF_HADDR_T ==H5_SIZEOF_INT
-#   define H5_PRINTF_HADDR_FMT  "%u"
-#elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG
-#   define H5_PRINTF_HADDR_FMT  "%lu"
-#elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG_LONG
-#   define H5_PRINTF_HADDR_FMT  "%" H5_PRINTF_LL_WIDTH "u"
+#if H5_SIZEOF_HADDR_T == H5_SIZEOF_INT
+#define H5_PRINTF_HADDR_FMT "%u"
+#elif H5_SIZEOF_HADDR_T == H5_SIZEOF_LONG
+#define H5_PRINTF_HADDR_FMT "%lu"
+#elif H5_SIZEOF_HADDR_T == H5_SIZEOF_LONG_LONG
+#define H5_PRINTF_HADDR_FMT "%" H5_PRINTF_LL_WIDTH "u"
 #else
-#   error "nothing appropriate for H5_PRINTF_HADDR_FMT"
+#error "nothing appropriate for H5_PRINTF_HADDR_FMT"
 #endif
-#define HADDR_MAX        (HADDR_UNDEF-1)
+#define HADDR_MAX (HADDR_UNDEF - 1)
 
 /* uint32_t type is used for creation order field for messages.  It may be
  * defined in Posix.1g, otherwise it is defined here.
  */
-#if H5_SIZEOF_UINT32_T>=4
-#elif H5_SIZEOF_SHORT>=4
-    typedef short uint32_t;
-#   undef H5_SIZEOF_UINT32_T
-#   define H5_SIZEOF_UINT32_T H5_SIZEOF_SHORT
-#elif H5_SIZEOF_INT>=4
-    typedef unsigned int uint32_t;
-#   undef H5_SIZEOF_UINT32_T
-#   define H5_SIZEOF_UINT32_T H5_SIZEOF_INT
-#elif H5_SIZEOF_LONG>=4
-    typedef unsigned long uint32_t;
-#   undef H5_SIZEOF_UINT32_T
-#   define H5_SIZEOF_UINT32_T H5_SIZEOF_LONG
+#if H5_SIZEOF_UINT32_T >= 4
+#elif H5_SIZEOF_SHORT >= 4
+typedef short    uint32_t;
+#undef H5_SIZEOF_UINT32_T
+#define H5_SIZEOF_UINT32_T H5_SIZEOF_SHORT
+#elif H5_SIZEOF_INT >= 4
+typedef unsigned int  uint32_t;
+#undef H5_SIZEOF_UINT32_T
+#define H5_SIZEOF_UINT32_T H5_SIZEOF_INT
+#elif H5_SIZEOF_LONG >= 4
+typedef unsigned long      uint32_t;
+#undef H5_SIZEOF_UINT32_T
+#define H5_SIZEOF_UINT32_T H5_SIZEOF_LONG
 #else
-#   error "nothing appropriate for uint32_t"
+#error "nothing appropriate for uint32_t"
 #endif
 
 /* int64_t type is used for creation order field for links.  It may be
  * defined in Posix.1g, otherwise it is defined here.
  */
-#if H5_SIZEOF_INT64_T>=8
-#elif H5_SIZEOF_INT>=8
-    typedef int int64_t;
-#   undef H5_SIZEOF_INT64_T
-#   define H5_SIZEOF_INT64_T H5_SIZEOF_INT
-#elif H5_SIZEOF_LONG>=8
-    typedef long int64_t;
-#   undef H5_SIZEOF_INT64_T
-#   define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
-#elif H5_SIZEOF_LONG_LONG>=8
-    typedef long long int64_t;
-#   undef H5_SIZEOF_INT64_T
-#   define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
+#if H5_SIZEOF_INT64_T >= 8
+#elif H5_SIZEOF_INT >= 8
+typedef int      int64_t;
+#undef H5_SIZEOF_INT64_T
+#define H5_SIZEOF_INT64_T H5_SIZEOF_INT
+#elif H5_SIZEOF_LONG >= 8
+typedef long          int64_t;
+#undef H5_SIZEOF_INT64_T
+#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
+#elif H5_SIZEOF_LONG_LONG >= 8
+typedef long long          int64_t;
+#undef H5_SIZEOF_INT64_T
+#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
 #else
-#   error "nothing appropriate for int64_t"
+#error "nothing appropriate for int64_t"
 #endif
 
 /* uint64_t type is used for fields for H5O_info_t.  It may be
  * defined in Posix.1g, otherwise it is defined here.
  */
-#if H5_SIZEOF_UINT64_T>=8
-#elif H5_SIZEOF_INT>=8
-    typedef unsigned uint64_t;
-#   undef H5_SIZEOF_UINT64_T
-#   define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
-#elif H5_SIZEOF_LONG>=8
-    typedef unsigned long uint64_t;
-#   undef H5_SIZEOF_UINT64_T
-#   define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
-#elif H5_SIZEOF_LONG_LONG>=8
-    typedef unsigned long long uint64_t;
-#   undef H5_SIZEOF_UINT64_T
-#   define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG
+#if H5_SIZEOF_UINT64_T >= 8
+#elif H5_SIZEOF_INT >= 8
+typedef unsigned uint64_t;
+#undef H5_SIZEOF_UINT64_T
+#define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
+#elif H5_SIZEOF_LONG >= 8
+typedef unsigned long uint64_t;
+#undef H5_SIZEOF_UINT64_T
+#define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
+#elif H5_SIZEOF_LONG_LONG >= 8
+typedef unsigned long long uint64_t;
+#undef H5_SIZEOF_UINT64_T
+#define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG
 #else
-#   error "nothing appropriate for uint64_t"
+#error "nothing appropriate for uint64_t"
 #endif
 
 /* Common iteration orders */
 typedef enum {
-    H5_ITER_UNKNOWN = -1,       /* Unknown order */
-    H5_ITER_INC,                /* Increasing order */
-    H5_ITER_DEC,                /* Decreasing order */
-    H5_ITER_NATIVE,             /* No particular order, whatever is fastest */
-    H5_ITER_N                /* Number of iteration orders */
+    H5_ITER_UNKNOWN = -1, /* Unknown order */
+    H5_ITER_INC,          /* Increasing order */
+    H5_ITER_DEC,          /* Decreasing order */
+    H5_ITER_NATIVE,       /* No particular order, whatever is fastest */
+    H5_ITER_N             /* Number of iteration orders */
 } H5_iter_order_t;
 
 /* Iteration callback values */
 /* (Actually, any positive value will cause the iterator to stop and pass back
  *      that positive value to the function that called the iterator)
  */
-#define H5_ITER_ERROR   (-1)
-#define H5_ITER_CONT    (0)
-#define H5_ITER_STOP    (1)
+#define H5_ITER_ERROR (-1)
+#define H5_ITER_CONT  (0)
+#define H5_ITER_STOP  (1)
 
 /*
  * The types of indices on links in groups/attributes on objects.
@@ -306,18 +301,18 @@ typedef enum {
  * links in groups/attributes on objects.
  */
 typedef enum H5_index_t {
-    H5_INDEX_UNKNOWN = -1,      /* Unknown index type                   */
-    H5_INDEX_NAME,              /* Index on names                       */
-    H5_INDEX_CRT_ORDER,         /* Index on creation order              */
-    H5_INDEX_N                  /* Number of indices defined            */
+    H5_INDEX_UNKNOWN = -1, /* Unknown index type                   */
+    H5_INDEX_NAME,         /* Index on names                       */
+    H5_INDEX_CRT_ORDER,    /* Index on creation order              */
+    H5_INDEX_N             /* Number of indices defined            */
 } H5_index_t;
 
 /*
  * Storage info struct used by H5O_info_t and H5F_info_t
  */
 typedef struct H5_ih_info_t {
-    hsize_t     index_size;     /* btree and/or list */
-    hsize_t     heap_size;
+    hsize_t index_size; /* btree and/or list */
+    hsize_t heap_size;
 } H5_ih_info_t;
 
 /* Functions in H5.c */
@@ -325,21 +320,16 @@ H5_DLL herr_t H5open(void);
 H5_DLL herr_t H5close(void);
 H5_DLL herr_t H5dont_atexit(void);
 H5_DLL herr_t H5garbage_collect(void);
-H5_DLL herr_t H5set_free_list_limits (int reg_global_lim, int reg_list_lim,
-                int arr_global_lim, int arr_list_lim, int blk_global_lim,
-                int blk_list_lim);
-H5_DLL herr_t H5get_libversion(unsigned *majnum, unsigned *minnum,
-                unsigned *relnum);
-H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum,
-                unsigned relnum);
+H5_DLL herr_t H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim,
+                                     int arr_list_lim, int blk_global_lim, int blk_list_lim);
+H5_DLL herr_t H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum);
+H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum, unsigned relnum);
 H5_DLL herr_t H5is_library_threadsafe(hbool_t *is_ts);
 H5_DLL herr_t H5free_memory(void *mem);
-H5_DLL void *H5allocate_memory(size_t size, hbool_t clear);
-H5_DLL void *H5resize_memory(void *mem, size_t size);
+H5_DLL void * H5allocate_memory(size_t size, hbool_t clear);
+H5_DLL void * H5resize_memory(void *mem, size_t size);
 
 #ifdef __cplusplus
 }
 #endif
 #endif /* _H5public_H */
-
-
diff --git a/src/H5system.c b/src/H5system.c
index c471bc9..0e0c4ae 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -26,46 +26,38 @@
 /* Module Setup */
 /****************/
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions        */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5Fprivate.h"     /* File access              */
-#include "H5MMprivate.h"    /* Memory management        */
-
+#include "H5private.h"   /* Generic Functions        */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5Fprivate.h"  /* File access              */
+#include "H5MMprivate.h" /* Memory management        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -73,7 +65,6 @@
 /* Track whether tzset routine was called */
 static hbool_t H5_ntzset = FALSE;
 
-
 /*-------------------------------------------------------------------------
  * Function:  HDfprintf
  *
@@ -109,43 +100,44 @@ H5_GCC_DIAG_OFF("format-nonliteral")
 int
 HDfprintf(FILE *stream, const char *fmt, ...)
 {
-    int    n=0, nout = 0;
-    int    fwidth, prec;
-    int    zerofill;
-    int    leftjust;
-    int    plussign;
-    int    ldspace;
-    int    prefix;
-    char  modifier[8];
-    int    conv;
-    char  *rest, format_templ[128];
-    int    len;
-    const char  *s;
-    va_list  ap;
+    int         n = 0, nout = 0;
+    int         fwidth, prec;
+    int         zerofill;
+    int         leftjust;
+    int         plussign;
+    int         ldspace;
+    int         prefix;
+    char        modifier[8];
+    int         conv;
+    char *      rest, format_templ[128];
+    int         len;
+    const char *s;
+    va_list     ap;
 
     HDassert(stream);
     HDassert(fmt);
 
-    HDva_start (ap, fmt);
+    HDva_start(ap, fmt);
     while (*fmt) {
         fwidth = prec = 0;
-        zerofill = 0;
-        leftjust = 0;
-        plussign = 0;
-        prefix = 0;
-        ldspace = 0;
-        modifier[0] = '\0';
-
-        if ('%'==fmt[0] && '%'==fmt[1]) {
-            HDputc ('%', stream);
+        zerofill      = 0;
+        leftjust      = 0;
+        plussign      = 0;
+        prefix        = 0;
+        ldspace       = 0;
+        modifier[0]   = '\0';
+
+        if ('%' == fmt[0] && '%' == fmt[1]) {
+            HDputc('%', stream);
             fmt += 2;
             nout++;
-        } else if ('%'==fmt[0]) {
+        }
+        else if ('%' == fmt[0]) {
             s = fmt + 1;
 
             /* Flags */
-            while(HDstrchr("-+ #", *s)) {
-                switch(*s) {
+            while (HDstrchr("-+ #", *s)) {
+                switch (*s) {
                     case '-':
                         leftjust = 1;
                         break;
@@ -169,43 +161,44 @@ HDfprintf(FILE *stream, const char *fmt, ...)
             } /* end while */
 
             /* Field width */
-            if(HDisdigit(*s)) {
+            if (HDisdigit(*s)) {
                 zerofill = ('0' == *s);
-                fwidth = (int)HDstrtol (s, &rest, 10);
-                s = rest;
+                fwidth   = (int)HDstrtol(s, &rest, 10);
+                s        = rest;
             } /* end if */
-            else if ('*'==*s) {
+            else if ('*' == *s) {
                 fwidth = HDva_arg(ap, int);
-                if(fwidth < 0) {
+                if (fwidth < 0) {
                     leftjust = 1;
-                    fwidth = -fwidth;
+                    fwidth   = -fwidth;
                 }
                 s++;
             }
 
             /* Precision */
-            if('.'==*s) {
+            if ('.' == *s) {
                 s++;
-                if(HDisdigit(*s)) {
+                if (HDisdigit(*s)) {
                     prec = (int)HDstrtol(s, &rest, 10);
-                    s = rest;
-                } else if('*'==*s) {
+                    s    = rest;
+                }
+                else if ('*' == *s) {
                     prec = HDva_arg(ap, int);
                     s++;
                 }
-                if(prec < 1)
+                if (prec < 1)
                     prec = 1;
             }
 
             /* Extra type modifiers */
-            if(HDstrchr("zZHhlqLI", *s)) {
-                switch(*s) {
+            if (HDstrchr("zZHhlqLI", *s)) {
+                switch (*s) {
                     /*lint --e{506} Don't issue warnings about constant value booleans */
                     /*lint --e{774} Don't issue warnings boolean within 'if' always evaluates false/true */
                     case 'H':
-                        if(sizeof(hsize_t) < sizeof(long))
+                        if (sizeof(hsize_t) < sizeof(long))
                             modifier[0] = '\0';
-                        else if(sizeof(hsize_t) == sizeof(long)) {
+                        else if (sizeof(hsize_t) == sizeof(long)) {
                             HDstrncpy(modifier, "l", sizeof(modifier));
                             modifier[sizeof(modifier) - 1] = '\0';
                         } /* end if */
@@ -217,9 +210,9 @@ HDfprintf(FILE *stream, const char *fmt, ...)
 
                     case 'Z':
                     case 'z':
-                        if(sizeof(size_t) < sizeof(long))
+                        if (sizeof(size_t) < sizeof(long))
                             modifier[0] = '\0';
-                        else if(sizeof(size_t) == sizeof(long)) {
+                        else if (sizeof(size_t) == sizeof(long)) {
                             HDstrncpy(modifier, "l", sizeof(modifier));
                             modifier[sizeof(modifier) - 1] = '\0';
                         } /* end if */
@@ -231,26 +224,26 @@ HDfprintf(FILE *stream, const char *fmt, ...)
 
                     default:
                         /* Handle 'I64' modifier for Microsoft's "__int64" type */
-                        if(*s=='I' && *(s+1)=='6' && *(s+2)=='4') {
+                        if (*s == 'I' && *(s + 1) == '6' && *(s + 2) == '4') {
                             modifier[0] = *s;
-                            modifier[1] = *(s+1);
-                            modifier[2] = *(s+2);
+                            modifier[1] = *(s + 1);
+                            modifier[2] = *(s + 2);
                             modifier[3] = '\0';
                             s += 2; /* Increment over 'I6', the '4' is taken care of below */
-                        } /* end if */
+                        }           /* end if */
                         else {
                             /* Handle 'll' for long long types */
-                            if(*s=='l' && *(s+1)=='l') {
+                            if (*s == 'l' && *(s + 1) == 'l') {
                                 modifier[0] = *s;
                                 modifier[1] = *s;
                                 modifier[2] = '\0';
                                 s++; /* Increment over first 'l', second is taken care of below */
-                            } /* end if */
+                            }        /* end if */
                             else {
                                 modifier[0] = *s;
                                 modifier[1] = '\0';
                             } /* end else */
-                        } /* end else */
+                        }     /* end else */
                         break;
                 }
                 s++;
@@ -261,33 +254,39 @@ HDfprintf(FILE *stream, const char *fmt, ...)
 
             /* Create the format template */
             len = 0;
-            len += HDsnprintf(format_templ, (sizeof(format_templ) - (size_t)(len + 1)), "%%%s%s%s%s%s", (leftjust ? "-" : ""),
-                    (plussign ? "+" : ""), (ldspace ? " " : ""),
-                    (prefix ? "#" : ""), (zerofill ? "0" : ""));
-            if(fwidth > 0)
-                len += HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)), "%d", fwidth);
-            if(prec > 0)
-                len += HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)), ".%d", prec);
-            if(*modifier)
-                len += HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)), "%s", modifier);
+            len += HDsnprintf(format_templ, (sizeof(format_templ) - (size_t)(len + 1)), "%%%s%s%s%s%s",
+                              (leftjust ? "-" : ""), (plussign ? "+" : ""), (ldspace ? " " : ""),
+                              (prefix ? "#" : ""), (zerofill ? "0" : ""));
+            if (fwidth > 0)
+                len +=
+                    HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)), "%d", fwidth);
+            if (prec > 0)
+                len +=
+                    HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)), ".%d", prec);
+            if (*modifier)
+                len += HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)), "%s",
+                                  modifier);
             HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)), "%c", conv);
 
             /* Conversion */
             switch (conv) {
                 case 'd':
                 case 'i':
-                    if(!HDstrcmp(modifier, "h")) {
+                    if (!HDstrcmp(modifier, "h")) {
                         short x = (short)HDva_arg(ap, int);
-                        n = fprintf(stream, format_templ, x);
-                    } else if(!*modifier) {
+                        n       = fprintf(stream, format_templ, x);
+                    }
+                    else if (!*modifier) {
                         int x = HDva_arg(ap, int);
-                        n = fprintf(stream, format_templ, x);
-                    } else if(!HDstrcmp(modifier, "l")) {
+                        n     = fprintf(stream, format_templ, x);
+                    }
+                    else if (!HDstrcmp(modifier, "l")) {
                         long x = HDva_arg(ap, long);
-                        n = fprintf(stream, format_templ, x);
-                    } else {
+                        n      = fprintf(stream, format_templ, x);
+                    }
+                    else {
                         int64_t x = HDva_arg(ap, int64_t);
-                        n = fprintf(stream, format_templ, x);
+                        n         = fprintf(stream, format_templ, x);
                     }
                     break;
 
@@ -295,18 +294,21 @@ HDfprintf(FILE *stream, const char *fmt, ...)
                 case 'u':
                 case 'x':
                 case 'X':
-                    if(!HDstrcmp(modifier, "h")) {
+                    if (!HDstrcmp(modifier, "h")) {
                         unsigned short x = (unsigned short)HDva_arg(ap, unsigned int);
-                        n = fprintf(stream, format_templ, x);
-                    } else if(!*modifier) {
+                        n                = fprintf(stream, format_templ, x);
+                    }
+                    else if (!*modifier) {
                         unsigned int x = HDva_arg(ap, unsigned int);
-                        n = fprintf(stream, format_templ, x);
-                    } else if(!HDstrcmp(modifier, "l")) {
+                        n              = fprintf(stream, format_templ, x);
+                    }
+                    else if (!HDstrcmp(modifier, "l")) {
                         unsigned long x = HDva_arg(ap, unsigned long);
-                        n = fprintf(stream, format_templ, x);
-                    } else {
+                        n               = fprintf(stream, format_templ, x);
+                    }
+                    else {
                         uint64_t x = HDva_arg(ap, uint64_t);
-                        n = fprintf(stream, format_templ, x);
+                        n          = fprintf(stream, format_templ, x);
                     }
                     break;
 
@@ -315,105 +317,103 @@ HDfprintf(FILE *stream, const char *fmt, ...)
                 case 'E':
                 case 'g':
                 case 'G':
-                    if(!HDstrcmp(modifier, "h")) {
+                    if (!HDstrcmp(modifier, "h")) {
                         float x = (float)HDva_arg(ap, double);
-                        n = fprintf(stream, format_templ, (double)x);
-                    } else if(!*modifier || !HDstrcmp(modifier, "l")) {
+                        n       = fprintf(stream, format_templ, (double)x);
+                    }
+                    else if (!*modifier || !HDstrcmp(modifier, "l")) {
                         double x = HDva_arg(ap, double);
-                        n = fprintf(stream, format_templ, x);
-                    } else {
-                    /*
-                    * Some compilers complain when `long double' and
-                    * `double' are the same thing.
-                    */
+                        n        = fprintf(stream, format_templ, x);
+                    }
+                    else {
+                        /*
+                         * Some compilers complain when `long double' and
+                         * `double' are the same thing.
+                         */
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
                         long double x = HDva_arg(ap, long double);
-                        n = fprintf(stream, format_templ, x);
+                        n             = fprintf(stream, format_templ, x);
 #else
                         double x = HDva_arg(ap, double);
-                        n = fprintf(stream, format_templ, x);
+                        n        = fprintf(stream, format_templ, x);
 #endif
                     }
                     break;
 
-                case 'a':
-                    {
-                        haddr_t x = HDva_arg(ap, haddr_t);
-
-                        if(H5F_addr_defined(x)) {
-                            len = 0;
-                            len += HDsnprintf(format_templ, (sizeof(format_templ) - (size_t)(len + 1)), "%%%s%s%s%s%s",
-                                (leftjust ? "-" : ""), (plussign ? "+" : ""),
-                                (ldspace ? " " : ""), (prefix ? "#" : ""),
-                                (zerofill ? "0" : ""));
-                            if(fwidth > 0)
-                                len += HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)), "%d", fwidth);
-
-                            /*lint --e{506} Don't issue warnings about constant value booleans */
-                            /*lint --e{774} Don't issue warnings boolean within 'if' always evaluates false/true */
-                            if(sizeof(x) == H5_SIZEOF_INT) {
-                                HDstrncat(format_templ, "u", (sizeof(format_templ) - (size_t)(len + 1)));
-                                len++;
-                            } /* end if */
-                            else if(sizeof(x) == H5_SIZEOF_LONG) {
-                                HDstrncat(format_templ, "lu", (sizeof(format_templ) - (size_t)(len + 1)));
-                                len++;
-                            } /* end if */
-                            else if(sizeof(x) == H5_SIZEOF_LONG_LONG) {
-                                HDstrncat(format_templ, H5_PRINTF_LL_WIDTH, (sizeof(format_templ) - (size_t)(len + 1)));
-                                len += (int)sizeof(H5_PRINTF_LL_WIDTH);
-                                HDstrncat(format_templ, "u", (sizeof(format_templ) - (size_t)(len + 1)));
-                                len++;
-                            }
-                            n = fprintf(stream, format_templ, x);
-                        } else {
-                            len = 0;
-                            HDstrncpy(format_templ, "%", (sizeof(format_templ) - (size_t)(len + 1)));
+                case 'a': {
+                    haddr_t x = HDva_arg(ap, haddr_t);
+
+                    if (H5F_addr_defined(x)) {
+                        len = 0;
+                        len += HDsnprintf(format_templ, (sizeof(format_templ) - (size_t)(len + 1)),
+                                          "%%%s%s%s%s%s", (leftjust ? "-" : ""), (plussign ? "+" : ""),
+                                          (ldspace ? " " : ""), (prefix ? "#" : ""), (zerofill ? "0" : ""));
+                        if (fwidth > 0)
+                            len += HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)),
+                                              "%d", fwidth);
+
+                        /*lint --e{506} Don't issue warnings about constant value booleans */
+                        /*lint --e{774} Don't issue warnings boolean within 'if' always evaluates false/true
+                         */
+                        if (sizeof(x) == H5_SIZEOF_INT) {
+                            HDstrncat(format_templ, "u", (sizeof(format_templ) - (size_t)(len + 1)));
+                            len++;
+                        } /* end if */
+                        else if (sizeof(x) == H5_SIZEOF_LONG) {
+                            HDstrncat(format_templ, "lu", (sizeof(format_templ) - (size_t)(len + 1)));
+                            len++;
+                        } /* end if */
+                        else if (sizeof(x) == H5_SIZEOF_LONG_LONG) {
+                            HDstrncat(format_templ, H5_PRINTF_LL_WIDTH,
+                                      (sizeof(format_templ) - (size_t)(len + 1)));
+                            len += (int)sizeof(H5_PRINTF_LL_WIDTH);
+                            HDstrncat(format_templ, "u", (sizeof(format_templ) - (size_t)(len + 1)));
                             len++;
-                            if(leftjust) {
-                                HDstrncat(format_templ, "-", (sizeof(format_templ) - (size_t)(len + 1)));
-                                len++;
-                            } /* end if */
-                            if(fwidth)
-                                len += HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)),  "%d", fwidth);
-                            HDstrncat(format_templ, "s", (sizeof(format_templ) - (size_t)(len + 1)));
-                            fprintf(stream, format_templ, "UNDEF");
                         }
-                    }
-                    break;
-
-                case 'c':
-                    {
-                        char x = (char)HDva_arg(ap, int);
                         n = fprintf(stream, format_templ, x);
                     }
-                    break;
+                    else {
+                        len = 0;
+                        HDstrncpy(format_templ, "%", (sizeof(format_templ) - (size_t)(len + 1)));
+                        len++;
+                        if (leftjust) {
+                            HDstrncat(format_templ, "-", (sizeof(format_templ) - (size_t)(len + 1)));
+                            len++;
+                        } /* end if */
+                        if (fwidth)
+                            len += HDsnprintf(format_templ + len, (sizeof(format_templ) - (size_t)(len + 1)),
+                                              "%d", fwidth);
+                        HDstrncat(format_templ, "s", (sizeof(format_templ) - (size_t)(len + 1)));
+                        fprintf(stream, format_templ, "UNDEF");
+                    }
+                } break;
+
+                case 'c': {
+                    char x = (char)HDva_arg(ap, int);
+                    n      = fprintf(stream, format_templ, x);
+                } break;
 
                 case 's':
-                case 'p':
-                    {
-                        char *x = HDva_arg(ap, char*);
-                        n = fprintf(stream, format_templ, x);
-                    }
-                    break;
+                case 'p': {
+                    char *x = HDva_arg(ap, char *);
+                    n       = fprintf(stream, format_templ, x);
+                } break;
 
                 case 'n':
                     format_templ[HDstrlen(format_templ) - 1] = 'u';
-                    n = fprintf(stream, format_templ, nout);
+                    n                                        = fprintf(stream, format_templ, nout);
                     break;
 
-                case 't':
-                    {
-                        htri_t tri_var = HDva_arg(ap, htri_t);
+                case 't': {
+                    htri_t tri_var = HDva_arg(ap, htri_t);
 
-                        if(tri_var > 0)
-                            fprintf(stream, "TRUE");
-                        else if(!tri_var)
-                            fprintf(stream, "FALSE");
-                        else
-                            fprintf(stream, "FAIL(%d)", (int)tri_var);
-                    }
-                    break;
+                    if (tri_var > 0)
+                        fprintf(stream, "TRUE");
+                    else if (!tri_var)
+                        fprintf(stream, "FALSE");
+                    else
+                        fprintf(stream, "FAIL(%d)", (int)tri_var);
+                } break;
 
                 default:
                     HDfputs(format_templ, stream);
@@ -422,7 +422,8 @@ HDfprintf(FILE *stream, const char *fmt, ...)
             }
             nout += n;
             fmt = s;
-        } else {
+        }
+        else {
             HDputc(*fmt, stream);
             fmt++;
             nout++;
@@ -479,61 +480,61 @@ H5_GCC_DIAG_ON("format-nonliteral")
 int64_t
 HDstrtoll(const char *s, const char **rest, int base)
 {
-    int64_t  sign=1, acc=0;
-    hbool_t  overflow = FALSE;
+    int64_t sign = 1, acc = 0;
+    hbool_t overflow = FALSE;
 
     errno = 0;
-    if (!s || (base && (base<2 || base>36))) {
+    if (!s || (base && (base < 2 || base > 36))) {
         if (rest)
             *rest = s;
         return 0;
     }
 
     /* Skip white space */
-    while (HDisspace (*s)) s++;
+    while (HDisspace(*s))
+        s++;
 
     /* Optional minus or plus sign */
-    if ('+'==*s) {
+    if ('+' == *s) {
         s++;
     }
-    else if ('-'==*s) {
+    else if ('-' == *s) {
         sign = -1;
         s++;
     }
 
     /* Zero base prefix */
-    if (0==base && '0'==*s && ('x'==s[1] || 'X'==s[1])) {
+    if (0 == base && '0' == *s && ('x' == s[1] || 'X' == s[1])) {
         base = 16;
         s += 2;
     }
-    else if (0==base && '0'==*s) {
+    else if (0 == base && '0' == *s) {
         base = 8;
         s++;
     }
-    else if (0==base) {
+    else if (0 == base) {
         base = 10;
     }
 
     /* Digits */
-    while ((base<=10 && *s>='0' && *s<'0'+base) ||
-     (base>10 && ((*s>='0' && *s<='9') ||
-      (*s>='a' && *s<'a'+base-10) ||
-      (*s>='A' && *s<'A'+base-10)))) {
+    while ((base <= 10 && *s >= '0' && *s < '0' + base) ||
+           (base > 10 && ((*s >= '0' && *s <= '9') || (*s >= 'a' && *s < 'a' + base - 10) ||
+                          (*s >= 'A' && *s < 'A' + base - 10)))) {
         if (!overflow) {
             int64_t digit = 0;
 
-            if (*s>='0' && *s<='9')
+            if (*s >= '0' && *s <= '9')
                 digit = *s - '0';
-            else if (*s>='a' && *s<='z')
-                digit = (*s-'a')+10;
+            else if (*s >= 'a' && *s <= 'z')
+                digit = (*s - 'a') + 10;
             else
-                digit = (*s-'A')+10;
+                digit = (*s - 'A') + 10;
 
-            if (acc*base+digit < acc) {
+            if (acc * base + digit < acc) {
                 overflow = TRUE;
             }
             else {
-                acc = acc*base + digit;
+                acc = acc * base + digit;
             }
         }
         s++;
@@ -541,11 +542,11 @@ HDstrtoll(const char *s, const char **rest, int base)
 
     /* Overflow */
     if (overflow) {
-        if (sign>0) {
-            acc = ((uint64_t)1<<(8*sizeof(int64_t)-1))-1;
+        if (sign > 0) {
+            acc = ((uint64_t)1 << (8 * sizeof(int64_t) - 1)) - 1;
         }
         else {
-            acc = (int64_t)((uint64_t)1<<(8*sizeof(int64_t)-1));
+            acc = (int64_t)((uint64_t)1 << (8 * sizeof(int64_t) - 1));
         }
         errno = ERANGE;
     }
@@ -581,19 +582,19 @@ HDstrtoll(const char *s, const char **rest, int base)
 
 static unsigned int g_seed = 42;
 
-int HDrand(void)
+int
+HDrand(void)
 {
     return rand_r(&g_seed);
 }
 
-void HDsrand(unsigned int seed)
+void
+HDsrand(unsigned int seed)
 {
     g_seed = seed;
 }
 #endif /* H5_HAVE_RAND_R */
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5_make_time
  *
@@ -616,15 +617,15 @@ void HDsrand(unsigned int seed)
 time_t
 H5_make_time(struct tm *tm)
 {
-    time_t the_time;    /* The converted time */
-#if defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900)  /* VS 2015 */
+    time_t the_time;                                     /* The converted time */
+#if defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900) /* VS 2015 */
     /* In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
      * variable declared in time.h. That variable was deprecated and in
      * VS 2015 is removed, with _get_timezone replacing it.
      */
     long timezone = 0;
-#endif /* defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900) */
-    time_t ret_value;   /* Return value */
+#endif                /* defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900) */
+    time_t ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -632,21 +633,21 @@ H5_make_time(struct tm *tm)
     HDassert(tm);
 
     /* Initialize timezone information */
-    if(!H5_ntzset) {
+    if (!H5_ntzset) {
         HDtzset();
         H5_ntzset = TRUE;
     } /* end if */
 
     /* Perform base conversion */
-    if((time_t)-1 == (the_time = HDmktime(tm)))
+    if ((time_t)-1 == (the_time = HDmktime(tm)))
         HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCONVERT, FAIL, "badly formatted modification time message")
 
-    /* Adjust for timezones */
+        /* Adjust for timezones */
 #if defined(H5_HAVE_TM_GMTOFF)
     /* BSD-like systems */
     the_time += tm->tm_gmtoff;
 #elif defined(H5_HAVE_TIMEZONE)
-#if defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900)  /* VS 2015 */
+#if defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900) /* VS 2015 */
     /* In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
      * variable declared in time.h. That variable was deprecated and in
      * VS 2015 is removed, with _get_timezone replacing it.
@@ -678,7 +679,6 @@ done:
 /* Offset between 1/1/1601 and 1/1/1970 in 100 nanosecond units */
 #define _W32_FT_OFFSET (116444736000000000ULL)
 
-
 /*-------------------------------------------------------------------------
  * Function:  Wgettimeofday
  *
@@ -703,34 +703,33 @@ done:
 int
 Wgettimeofday(struct timeval *tv, struct timezone *tz)
 {
-  union {
-    unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */
-    FILETIME ft;
-  }  _now;
+    union {
+        unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */
+        FILETIME           ft;
+    } _now;
 
     static int tzsetflag;
 
-    if(tv) {
-      GetSystemTimeAsFileTime (&_now.ft);
-      tv->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL );
-      tv->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
+    if (tv) {
+        GetSystemTimeAsFileTime(&_now.ft);
+        tv->tv_usec = (long)((_now.ns100 / 10ULL) % 1000000ULL);
+        tv->tv_sec  = (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
     }
 
-    if(tz) {
-        if(!tzsetflag) {
+    if (tz) {
+        if (!tzsetflag) {
             _tzset();
             tzsetflag = 1;
         }
         tz->tz_minuteswest = _timezone / 60;
-        tz->tz_dsttime = _daylight;
+        tz->tz_dsttime     = _daylight;
     }
 
-  /* Always return 0 as per Open Group Base Specifications Issue 6.
-     Do not set errno on error.  */
-  return 0;
+    /* Always return 0 as per Open Group Base Specifications Issue 6.
+       Do not set errno on error.  */
+    return 0;
 } /* end Wgettimeofday() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    Wsetenv
  *
@@ -749,14 +748,14 @@ Wgettimeofday(struct timeval *tv, struct timezone *tz)
 int
 Wsetenv(const char *name, const char *value, int overwrite)
 {
-    size_t bufsize;
+    size_t  bufsize;
     errno_t err;
 
     /* If we're not overwriting, check if the environment variable exists.
      * If it does (i.e.: the required buffer size to store the variable's
      * value is non-zero), then return an error code.
      */
-    if(!overwrite) {
+    if (!overwrite) {
         err = getenv_s(&bufsize, NULL, 0, name);
         if (err || bufsize)
             return (int)err;
@@ -772,7 +771,7 @@ Wsetenv(const char *name, const char *value, int overwrite)
 #define WloginBuffer_count 256
 static char Wlogin_buffer[WloginBuffer_count];
 
-char*
+char *
 Wgetlogin(void)
 {
 
@@ -785,9 +784,10 @@ Wgetlogin(void)
         return NULL;
 }
 
-int c99_snprintf(char* str, size_t size, const char* format, ...)
+int
+c99_snprintf(char *str, size_t size, const char *format, ...)
 {
-    int count;
+    int     count;
     va_list ap;
 
     HDva_start(ap, format);
@@ -797,7 +797,8 @@ int c99_snprintf(char* str, size_t size, const char* format, ...)
     return count;
 }
 
-int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
+int
+c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 {
     int count = -1;
 
@@ -809,17 +810,17 @@ int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
     return count;
 }
 
- /*--------------------------------------------------------------------------
-  * Function:    Wnanosleep
-  *
-  * Purpose:     Sleep for a given # of nanoseconds (Windows version)
-  *
-  * Return:      SUCCEED/FAIL
-  *
-  * Programmer:  Dana Robinson
-  *              Fall 2016
-  *--------------------------------------------------------------------------
-  */
+/*--------------------------------------------------------------------------
+ * Function:    Wnanosleep
+ *
+ * Purpose:     Sleep for a given # of nanoseconds (Windows version)
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ * Programmer:  Dana Robinson
+ *              Fall 2016
+ *--------------------------------------------------------------------------
+ */
 int
 Wnanosleep(const struct timespec *req, struct timespec *rem)
 {
@@ -828,7 +829,6 @@ Wnanosleep(const struct timespec *req, struct timespec *rem)
 
 } /* end Wnanosleep() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    Wllround, Wllroundf, Wlround, Wlroundf, Wround, Wroundf
  *
@@ -879,44 +879,44 @@ Wroundf(float arg)
 }
 
 /*-------------------------------------------------------------------------
-* Function:     H5_get_utf16_str
-*
-* Purpose:      Gets a UTF-16 string from an UTF-8 (or ASCII) string.
-*
-* Return:       Success:    A pointer to a UTF-16 string
-*                           This must be freed by the caller using H5MM_xfree()
-*               Failure:    NULL
-*
-* Programmer:  Dana Robinson
-*              Spring 2019
-*
-*-------------------------------------------------------------------------
-*/
+ * Function:     H5_get_utf16_str
+ *
+ * Purpose:      Gets a UTF-16 string from an UTF-8 (or ASCII) string.
+ *
+ * Return:       Success:    A pointer to a UTF-16 string
+ *                           This must be freed by the caller using H5MM_xfree()
+ *               Failure:    NULL
+ *
+ * Programmer:  Dana Robinson
+ *              Spring 2019
+ *
+ *-------------------------------------------------------------------------
+ */
 const wchar_t *
 H5_get_utf16_str(const char *s)
 {
-    int     nwchars = -1;       /* Length of the UTF-16 buffer */
-    wchar_t *ret_s  = NULL;     /* UTF-16 version of the string */
+    int      nwchars = -1;   /* Length of the UTF-16 buffer */
+    wchar_t *ret_s   = NULL; /* UTF-16 version of the string */
 
     /* Get the number of UTF-16 characters needed */
-    if(0 == (nwchars = MultiByteToWideChar(CP_UTF8, 0, s, -1, NULL, 0)))
+    if (0 == (nwchars = MultiByteToWideChar(CP_UTF8, 0, s, -1, NULL, 0)))
         goto error;
 
     /* Allocate a buffer for the UTF-16 string */
-    if(NULL == (ret_s = (wchar_t *)H5MM_calloc(sizeof(wchar_t) * (size_t)nwchars)))
+    if (NULL == (ret_s = (wchar_t *)H5MM_calloc(sizeof(wchar_t) * (size_t)nwchars)))
         goto error;
 
     /* Convert the input UTF-8 string to UTF-16 */
-    if(0 == MultiByteToWideChar(CP_UTF8, 0, s, -1, ret_s, nwchars))
+    if (0 == MultiByteToWideChar(CP_UTF8, 0, s, -1, ret_s, nwchars))
         goto error;
 
     return ret_s;
 
 error:
-    if(ret_s)
+    if (ret_s)
         H5MM_xfree((void *)ret_s);
     return NULL;
-}   /* end H5_get_utf16_str() */
+} /* end H5_get_utf16_str() */
 
 /*-------------------------------------------------------------------------
  * Function:     Wopen_utf8
@@ -936,22 +936,22 @@ error:
 int
 Wopen_utf8(const char *path, int oflag, ...)
 {
-    int fd          = -1;       /* POSIX file descriptor to be returned */
-    wchar_t *wpath  = NULL;     /* UTF-16 version of the path */
-    int pmode       = 0;        /* mode (optionally set via variable args) */
+    int      fd    = -1;   /* POSIX file descriptor to be returned */
+    wchar_t *wpath = NULL; /* UTF-16 version of the path */
+    int      pmode = 0;    /* mode (optionally set via variable args) */
 
     /* Convert the input UTF-8 path to UTF-16 */
-    if(NULL == (wpath = H5_get_utf16_str(path)))
+    if (NULL == (wpath = H5_get_utf16_str(path)))
         goto done;
 
     /* _O_BINARY must be set in Windows to avoid CR-LF <-> LF EOL
-    * transformations when performing I/O. Note that this will
-    * produce Unix-style text files, though.
-    */
+     * transformations when performing I/O. Note that this will
+     * produce Unix-style text files, though.
+     */
     oflag |= _O_BINARY;
 
     /* Get the mode, if O_CREAT was specified */
-    if(oflag & O_CREAT) {
+    if (oflag & O_CREAT) {
         va_list vl;
 
         HDva_start(vl, oflag);
@@ -963,11 +963,11 @@ Wopen_utf8(const char *path, int oflag, ...)
     fd = _wopen(wpath, oflag, pmode);
 
 done:
-    if(wpath)
+    if (wpath)
         H5MM_xfree((void *)wpath);
 
     return fd;
-}   /* end Wopen_utf8() */
+} /* end Wopen_utf8() */
 
 /*-------------------------------------------------------------------------
  * Function:     Wremove_utf8
@@ -987,26 +987,25 @@ done:
 int
 Wremove_utf8(const char *path)
 {
-    wchar_t *wpath = NULL;     /* UTF-16 version of the path */
-    int ret;
+    wchar_t *wpath = NULL; /* UTF-16 version of the path */
+    int      ret;
 
     /* Convert the input UTF-8 path to UTF-16 */
-    if(NULL == (wpath = H5_get_utf16_str(path)))
+    if (NULL == (wpath = H5_get_utf16_str(path)))
         goto done;
 
     /* Open the file */
     ret = _wremove(wpath);
 
 done:
-    if(wpath)
+    if (wpath)
         H5MM_xfree((void *)wpath);
 
     return ret;
-}   /* end Wremove_utf8() */
+} /* end Wremove_utf8() */
 
 #endif /* H5_HAVE_WIN32_API */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5_build_extpath
  *
@@ -1023,15 +1022,15 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-#define MAX_PATH_LEN     1024
+#define MAX_PATH_LEN 1024
 
 herr_t
 H5_build_extpath(const char *name, char **extpath /*out*/)
 {
-    char        *full_path = NULL;      /* Pointer to the full path, as built or passed in */
-    char        *cwdpath = NULL;        /* Pointer to the current working directory path */
-    char        *new_name = NULL;       /* Pointer to the name of the file */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    char * full_path = NULL;    /* Pointer to the full path, as built or passed in */
+    char * cwdpath   = NULL;    /* Pointer to the current working directory path */
+    char * new_name  = NULL;    /* Pointer to the name of the file */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1046,19 +1045,19 @@ H5_build_extpath(const char *name, char **extpath /*out*/)
      * Unix: name[0] is a "/"
      * Windows: name[0-2] is "<drive letter>:\" or "<drive-letter>:/"
      */
-    if(H5_CHECK_ABSOLUTE(name)) {
-        if(NULL == (full_path = (char *)H5MM_strdup(name)))
+    if (H5_CHECK_ABSOLUTE(name)) {
+        if (NULL == (full_path = (char *)H5MM_strdup(name)))
             HGOTO_ERROR(H5E_INTERNAL, H5E_NOSPACE, FAIL, "memory allocation failed")
-    } /* end if */
+    }      /* end if */
     else { /* relative pathname */
-        char *retcwd;
+        char * retcwd;
         size_t name_len;
-        int drive;
+        int    drive;
 
-        if(NULL == (cwdpath = (char *)H5MM_malloc(MAX_PATH_LEN)))
+        if (NULL == (cwdpath = (char *)H5MM_malloc(MAX_PATH_LEN)))
             HGOTO_ERROR(H5E_INTERNAL, H5E_NOSPACE, FAIL, "memory allocation failed")
         name_len = HDstrlen(name) + 1;
-        if(NULL == (new_name = (char *)H5MM_malloc(name_len)))
+        if (NULL == (new_name = (char *)H5MM_malloc(name_len)))
             HGOTO_ERROR(H5E_INTERNAL, H5E_NOSPACE, FAIL, "memory allocation failed")
 
         /*
@@ -1066,17 +1065,17 @@ H5_build_extpath(const char *name, char **extpath /*out*/)
          *   Get current working directory on the drive specified in NAME
          * Unix: does not apply
          */
-        if(H5_CHECK_ABS_DRIVE(name)) {
-            drive = HDtoupper(name[0]) - 'A' + 1;
+        if (H5_CHECK_ABS_DRIVE(name)) {
+            drive  = HDtoupper(name[0]) - 'A' + 1;
             retcwd = HDgetdcwd(drive, cwdpath, MAX_PATH_LEN);
             HDstrncpy(new_name, &name[2], name_len);
         } /* end if */
-       /*
-        * Windows: name[0] is a '/' or '\'
-        *  Get current drive
-        * Unix: does not apply
-        */
-        else if(H5_CHECK_ABS_PATH(name) && (0 != (drive = HDgetdrive()))) {
+          /*
+           * Windows: name[0] is a '/' or '\'
+           *  Get current drive
+           * Unix: does not apply
+           */
+        else if (H5_CHECK_ABS_PATH(name) && (0 != (drive = HDgetdrive()))) {
             HDsnprintf(cwdpath, MAX_PATH_LEN, "%c:%c", (drive + 'A' - 1), name[0]);
             retcwd = cwdpath;
             HDstrncpy(new_name, &name[1], name_len);
@@ -1087,7 +1086,7 @@ H5_build_extpath(const char *name, char **extpath /*out*/)
             HDstrncpy(new_name, name, name_len);
         } /* end if */
 
-        if(retcwd != NULL) {
+        if (retcwd != NULL) {
             size_t cwdlen;
             size_t path_len;
 
@@ -1096,37 +1095,36 @@ H5_build_extpath(const char *name, char **extpath /*out*/)
             HDassert(cwdlen);
             HDassert(new_name);
             path_len = cwdlen + HDstrlen(new_name) + 2;
-            if(NULL == (full_path = (char *)H5MM_malloc(path_len)))
+            if (NULL == (full_path = (char *)H5MM_malloc(path_len)))
                 HGOTO_ERROR(H5E_INTERNAL, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             HDstrncpy(full_path, cwdpath, cwdlen + 1);
-            if(!H5_CHECK_DELIMITER(cwdpath[cwdlen - 1]))
+            if (!H5_CHECK_DELIMITER(cwdpath[cwdlen - 1]))
                 HDstrncat(full_path, H5_DIR_SEPS, HDstrlen(H5_DIR_SEPS));
             HDstrncat(full_path, new_name, HDstrlen(new_name));
         } /* end if */
-    } /* end else */
+    }     /* end else */
 
     /* strip out the last component (the file name itself) from the path */
-    if(full_path) {
+    if (full_path) {
         char *ptr = NULL;
 
         H5_GET_LAST_DELIMITER(full_path, ptr)
         HDassert(ptr);
-        *++ptr = '\0';
+        *++ptr   = '\0';
         *extpath = full_path;
     } /* end if */
 
 done:
     /* Release resources */
-    if(cwdpath)
+    if (cwdpath)
         H5MM_xfree(cwdpath);
-    if(new_name)
+    if (new_name)
         H5MM_xfree(new_name);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5_build_extpath() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5_combine_path
  *
@@ -1141,35 +1139,35 @@ done:
  *--------------------------------------------------------------------------
  */
 herr_t
-H5_combine_path(const char* path1, const char* path2, char **full_name /*out*/)
+H5_combine_path(const char *path1, const char *path2, char **full_name /*out*/)
 {
-    size_t      path1_len;            /* length of path1 */
-    size_t      path2_len;            /* length of path2 */
-    herr_t      ret_value = SUCCEED;  /* Return value */
+    size_t path1_len;           /* length of path1 */
+    size_t path2_len;           /* length of path2 */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(path2);
 
-    if(path1)
+    if (path1)
         path1_len = HDstrlen(path1);
     path2_len = HDstrlen(path2);
 
-    if(path1 == NULL || *path1 == '\0' || H5_CHECK_ABSOLUTE(path2)) {
+    if (path1 == NULL || *path1 == '\0' || H5_CHECK_ABSOLUTE(path2)) {
 
         /* If path1 is empty or path2 is absolute, simply use path2 */
-        if(NULL == (*full_name = (char *)H5MM_strdup(path2)))
+        if (NULL == (*full_name = (char *)H5MM_strdup(path2)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     } /* end if */
-    else if(H5_CHECK_ABS_PATH(path2)) {
+    else if (H5_CHECK_ABS_PATH(path2)) {
 
         /* On windows path2 is a path absolute name */
         if (H5_CHECK_ABSOLUTE(path1) || H5_CHECK_ABS_DRIVE(path1)) {
             /* path1 is absolute or drive absolute and path2 is path absolute.
              * Use the drive letter of path1 + path2
              */
-            if(NULL == (*full_name = (char *)H5MM_malloc(path2_len + 3)))
+            if (NULL == (*full_name = (char *)H5MM_malloc(path2_len + 3)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate path2 buffer")
             HDsnprintf(*full_name, (path2_len + 3), "%c:%s", path1[0], path2);
         } /* end if */
@@ -1178,7 +1176,7 @@ H5_combine_path(const char* path1, const char* path2, char **full_name /*out*/)
              * path1 does not have a drive letter (i.e. is "a\b" or "\a\b").
              * Use path2.
              */
-            if(NULL == (*full_name = (char *)H5MM_strdup(path2)))
+            if (NULL == (*full_name = (char *)H5MM_strdup(path2)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
         } /* end else */
 
@@ -1189,11 +1187,14 @@ H5_combine_path(const char* path1, const char* path2, char **full_name /*out*/)
          * Allocate a buffer to hold path1 + path2 + possibly the delimiter
          *      + terminating null byte
          */
-        if(NULL == (*full_name = (char *)H5MM_malloc(path1_len + path2_len + 2 + 2))) /* Extra "+2" to quiet GCC warning - 2019/07/05, QAK */
+        if (NULL ==
+            (*full_name = (char *)H5MM_malloc(path1_len + path2_len + 2 +
+                                              2))) /* Extra "+2" to quiet GCC warning - 2019/07/05, QAK */
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate filename buffer")
 
         /* Compose the full file name */
-        HDsnprintf(*full_name, (path1_len + path2_len + 2 + 2), "%s%s%s", path1, /* Extra "+2" to quiet GCC warning - 2019/07/05, QAK */
+        HDsnprintf(*full_name, (path1_len + path2_len + 2 + 2), "%s%s%s",
+                   path1, /* Extra "+2" to quiet GCC warning - 2019/07/05, QAK */
                    (H5_CHECK_DELIMITER(path1[path1_len - 1]) ? "" : H5_DIR_SEPS), path2);
     } /* end else */
 
@@ -1201,7 +1202,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5_combine_path() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5_nanosleep
  *
@@ -1216,12 +1216,12 @@ done:
 void
 H5_nanosleep(uint64_t nanosec)
 {
-    struct timespec sleeptime;  /* Struct to hold time to sleep */
+    struct timespec sleeptime; /* Struct to hold time to sleep */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Set up time to sleep */
-    sleeptime.tv_sec = 0;
+    sleeptime.tv_sec  = 0;
     sleeptime.tv_nsec = (long)nanosec;
 
     HDnanosleep(&sleeptime, NULL);
@@ -1229,7 +1229,6 @@ H5_nanosleep(uint64_t nanosec)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5_nanosleep() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5_get_time
  *
@@ -1260,11 +1259,9 @@ H5_get_time(void)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5_get_time() */
 
-
 #ifdef H5_HAVE_WIN32_API
 
-#define H5_WIN32_ENV_VAR_BUFFER_SIZE    32767
-
+#define H5_WIN32_ENV_VAR_BUFFER_SIZE 32767
 
 /*-------------------------------------------------------------------------
  * Function:    H5_expand_windows_env_vars()
@@ -1279,9 +1276,9 @@ H5_get_time(void)
 herr_t
 H5_expand_windows_env_vars(char **env_var)
 {
-    long    n_chars = 0;
-    char   *temp_buf = NULL;
-    herr_t  ret_value = SUCCEED;    /* Return value */
+    long   n_chars   = 0;
+    char * temp_buf  = NULL;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1290,7 +1287,8 @@ H5_expand_windows_env_vars(char **env_var)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for expanded path")
 
     /* Expand the environment variable string */
-    if ((n_chars = ExpandEnvironmentStringsA(*env_var, temp_buf, H5_WIN32_ENV_VAR_BUFFER_SIZE)) > H5_WIN32_ENV_VAR_BUFFER_SIZE)
+    if ((n_chars = ExpandEnvironmentStringsA(*env_var, temp_buf, H5_WIN32_ENV_VAR_BUFFER_SIZE)) >
+        H5_WIN32_ENV_VAR_BUFFER_SIZE)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "expanded path is too long")
 
     if (0 == n_chars)
@@ -1306,4 +1304,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5_expand_windows_env_vars() */
 #endif /* H5_HAVE_WIN32_API */
-
diff --git a/src/H5timer.c b/src/H5timer.c
index 4f9f893..e5aded7 100644
--- a/src/H5timer.c
+++ b/src/H5timer.c
@@ -26,57 +26,48 @@
 /* Module Setup */
 /****************/
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
+#include "H5private.h" /* Generic Functions			*/
 
 /* We need this for the struct rusage declaration */
 #if defined(H5_HAVE_GETRUSAGE) && defined(H5_HAVE_SYS_RESOURCE_H)
-#   include <sys/resource.h>
+#include <sys/resource.h>
 #endif
 
 #if defined(H5_HAVE_GETTIMEOFDAY) && defined(H5_HAVE_SYS_TIME_H)
 #include <sys/time.h>
 #endif
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_timer_reset
  *
@@ -91,13 +82,12 @@
  *-------------------------------------------------------------------------
  */
 void
-H5_timer_reset (H5_timer_t *timer)
+H5_timer_reset(H5_timer_t *timer)
 {
     HDassert(timer);
     HDmemset(timer, 0, sizeof *timer);
 } /* end H5_timer_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_timer_begin
  *
@@ -111,36 +101,33 @@ H5_timer_reset (H5_timer_t *timer)
  *-------------------------------------------------------------------------
  */
 void
-H5_timer_begin (H5_timer_t *timer)
+H5_timer_begin(H5_timer_t *timer)
 {
 #ifdef H5_HAVE_GETRUSAGE
-    struct rusage	rusage;
+    struct rusage rusage;
 #endif
 #ifdef H5_HAVE_GETTIMEOFDAY
-    struct timeval	etime;
+    struct timeval etime;
 #endif
 
     HDassert(timer);
 
 #ifdef H5_HAVE_GETRUSAGE
-    HDgetrusage (RUSAGE_SELF, &rusage);
-    timer->utime = (double)rusage.ru_utime.tv_sec +
-                   ((double)rusage.ru_utime.tv_usec / 1e6F);
-    timer->stime = (double)rusage.ru_stime.tv_sec +
-                   ((double)rusage.ru_stime.tv_usec / 1e6F);
+    HDgetrusage(RUSAGE_SELF, &rusage);
+    timer->utime = (double)rusage.ru_utime.tv_sec + ((double)rusage.ru_utime.tv_usec / 1e6F);
+    timer->stime = (double)rusage.ru_stime.tv_sec + ((double)rusage.ru_stime.tv_usec / 1e6F);
 #else
     timer->utime = 0.0F;
     timer->stime = 0.0F;
 #endif
 #ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday (&etime, NULL);
+    HDgettimeofday(&etime, NULL);
     timer->etime = (double)etime.tv_sec + ((double)etime.tv_usec / 1e6F);
 #else
     timer->etime = 0.0F;
 #endif
 } /* end H5_timer_begin() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_timer_end
  *
@@ -157,9 +144,9 @@ H5_timer_begin (H5_timer_t *timer)
  *-------------------------------------------------------------------------
  */
 void
-H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
+H5_timer_end(H5_timer_t *sum /*in,out*/, H5_timer_t *timer /*in,out*/)
 {
-    H5_timer_t		now;
+    H5_timer_t now;
 
     HDassert(timer);
     H5_timer_begin(&now);
@@ -175,7 +162,6 @@ H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
     }
 } /* end H5_timer_end() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_bandwidth
  *
@@ -202,42 +188,46 @@ H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
  *-------------------------------------------------------------------------
  */
 void
-H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds)
+H5_bandwidth(char *buf /*out*/, double nbytes, double nseconds)
 {
-    double	bw;
+    double bw;
 
-    if(nseconds <= 0.0F)
+    if (nseconds <= 0.0F)
         HDstrcpy(buf, "       NaN");
     else {
-        bw = nbytes/nseconds;
-        if(H5_DBL_ABS_EQUAL(bw, 0.0F))
-	        HDstrcpy(buf, "0.000  B/s");
-        else if(bw < 1.0F)
+        bw = nbytes / nseconds;
+        if (H5_DBL_ABS_EQUAL(bw, 0.0F))
+            HDstrcpy(buf, "0.000  B/s");
+        else if (bw < 1.0F)
             HDsprintf(buf, "%10.4e", bw);
-        else if(bw < H5_KB) {
+        else if (bw < H5_KB) {
             HDsprintf(buf, "%05.4f", bw);
-            HDstrcpy(buf+5, "  B/s");
-        } else if(bw < H5_MB) {
+            HDstrcpy(buf + 5, "  B/s");
+        }
+        else if (bw < H5_MB) {
             HDsprintf(buf, "%05.4f", bw / H5_KB);
-            HDstrcpy(buf+5, " kB/s");
-        } else if(bw < H5_GB) {
+            HDstrcpy(buf + 5, " kB/s");
+        }
+        else if (bw < H5_GB) {
             HDsprintf(buf, "%05.4f", bw / H5_MB);
-            HDstrcpy(buf+5, " MB/s");
-        } else if(bw < H5_TB) {
+            HDstrcpy(buf + 5, " MB/s");
+        }
+        else if (bw < H5_TB) {
             HDsprintf(buf, "%05.4f", bw / H5_GB);
-            HDstrcpy(buf+5, " GB/s");
-        } else if(bw < H5_EB) {
+            HDstrcpy(buf + 5, " GB/s");
+        }
+        else if (bw < H5_EB) {
             HDsprintf(buf, "%05.4f", bw / H5_TB);
-            HDstrcpy(buf+5, " TB/s");
-        } else {
+            HDstrcpy(buf + 5, " TB/s");
+        }
+        else {
             HDsprintf(buf, "%10.4e", bw);
-            if(HDstrlen(buf) > 10)
+            if (HDstrlen(buf) > 10)
                 HDsprintf(buf, "%10.3e", bw);
         }
     }
 } /* end H5_bandwidth() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5_now
  *
@@ -253,7 +243,7 @@ H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds)
 time_t
 H5_now(void)
 {
-    time_t	now;                    /* Current time */
+    time_t now; /* Current time */
 
 #ifdef H5_HAVE_GETTIMEOFDAY
     {
@@ -262,10 +252,9 @@ H5_now(void)
         HDgettimeofday(&now_tv, NULL);
         now = now_tv.tv_sec;
     }
-#else /* H5_HAVE_GETTIMEOFDAY */
-    now = HDtime(NULL);
+#else  /* H5_HAVE_GETTIMEOFDAY */
+    now          = HDtime(NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
-    return(now);
+    return (now);
 } /* end H5_now() */
-
diff --git a/src/H5trace.c b/src/H5trace.c
index 30da8de..3d8dc4a 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -25,61 +25,51 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5I_PACKAGE		/*suppress error about including H5Ipkg	  */
-
+#define H5I_PACKAGE /*suppress error about including H5Ipkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Ipkg.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Dprivate.h"  /* Datasets				*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Ipkg.h"      /* IDs			  		*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 #ifdef H5_HAVE_PARALLEL
 /* datatypes of predefined drivers needed by H5_trace() */
 #include "H5FDmpio.h"
 #endif /* H5_HAVE_PARALLEL */
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5_trace
  *
@@ -118,46 +108,46 @@
 double
 H5_trace(const double *returning, const char *func, const char *type, ...)
 {
-    va_list		ap;
-    char		buf[64], *rest;
-    const char		*argname;
-    int			argno = 0, ptr, asize_idx;
-    hssize_t		asize[16];
-    hssize_t		i;
-    void		*vp = NULL;
-    FILE		*out = H5_debug_g.trace;
-    H5_timer_t          event_time;
-    static H5_timer_t   first_time = {0.0F, 0.0F, 0.0F};
-    static int          current_depth = 0;
-    static int          last_call_depth = 0;
+    va_list           ap;
+    char              buf[64], *rest;
+    const char *      argname;
+    int               argno = 0, ptr, asize_idx;
+    hssize_t          asize[16];
+    hssize_t          i;
+    void *            vp  = NULL;
+    FILE *            out = H5_debug_g.trace;
+    H5_timer_t        event_time;
+    static H5_timer_t first_time      = {0.0F, 0.0F, 0.0F};
+    static int        current_depth   = 0;
+    static int        last_call_depth = 0;
 
     /* FUNC_ENTER() should not be called */
 
-    if(!out)
-        return 0.0F;	/*tracing is off*/
+    if (!out)
+        return 0.0F; /*tracing is off*/
     va_start(ap, type);
 
-    if(H5_debug_g.ttop) {
-        if(returning) {
-            if(current_depth > 1) {
+    if (H5_debug_g.ttop) {
+        if (returning) {
+            if (current_depth > 1) {
                 --current_depth;
                 return 0.0F;
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else {
-            if(current_depth > 0) {
+            if (current_depth > 0) {
                 /*do not update last_call_depth*/
                 current_depth++;
                 return 0.0F;
             } /* end if */
-        } /* end else */
-    } /* end if */
+        }     /* end else */
+    }         /* end if */
 
     /* Get time for event */
-    if(HDfabs(first_time.etime) < 0.0000000001F)
+    if (HDfabs(first_time.etime) < 0.0000000001F)
         /* That is == 0.0, but direct comparison between floats is bad */
         H5_timer_begin(&first_time);
-    if(H5_debug_g.ttimes)
+    if (H5_debug_g.ttimes)
         H5_timer_begin(&event_time);
     else
         HDmemset(&event_time, 0, sizeof event_time);
@@ -168,87 +158,89 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
      * function return and no other calls have been made to H5_trace()
      * since the one for the function call, then we're continuing
      * the same line. */
-    if(returning) {
+    if (returning) {
         HDassert(current_depth > 0);
         --current_depth;
-        if(current_depth < last_call_depth) {
+        if (current_depth < last_call_depth) {
             /* We are at the beginning of a line */
-            if(H5_debug_g.ttimes) {
+            if (H5_debug_g.ttimes) {
                 char tmp[128];
 
-                HDsprintf(tmp, "%.6f", event_time.etime-first_time.etime);
+                HDsprintf(tmp, "%.6f", event_time.etime - first_time.etime);
                 HDfprintf(out, " %*s ", (int)HDstrlen(tmp), "");
             } /* end if */
-            for(i = 0; i < current_depth; i++)
+            for (i = 0; i < current_depth; i++)
                 HDfputc('+', out);
-            HDfprintf(out, "%*s%s = ", 2*current_depth, "", func);
+            HDfprintf(out, "%*s%s = ", 2 * current_depth, "", func);
         } /* end if */
         else {
             /* Continue current line with return value */
             HDfprintf(out, " = ");
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
-        if(current_depth>last_call_depth)
+        if (current_depth > last_call_depth)
             HDfputs(" = <delayed>\n", out);
-        if(H5_debug_g.ttimes)
+        if (H5_debug_g.ttimes)
             HDfprintf(out, "@%.6f ", event_time.etime - first_time.etime);
-        for(i = 0; i < current_depth; i++)
+        for (i = 0; i < current_depth; i++)
             HDfputc('+', out);
-        HDfprintf(out, "%*s%s(", 2*current_depth, "", func);
+        HDfprintf(out, "%*s%s(", 2 * current_depth, "", func);
     } /* end else */
 
     /* Clear array sizes */
-    for(i = 0; i < (hssize_t)NELMTS(asize); i++)
+    for (i = 0; i < (hssize_t)NELMTS(asize); i++)
         asize[i] = -1;
 
     /* Parse the argument types */
-    for(argno = 0; *type; argno++, type += (HDisupper(*type) ? 2 : 1)) {
-	/* Count levels of indirection */
-	for(ptr = 0; '*' == *type; type++)
+    for (argno = 0; *type; argno++, type += (HDisupper(*type) ? 2 : 1)) {
+        /* Count levels of indirection */
+        for (ptr = 0; '*' == *type; type++)
             ptr++;
-	if('[' == *type) {
-	    if('a' == type[1]) {
-		asize_idx = (int)HDstrtol(type + 2, &rest, 10);
-                HDassert(0 <= asize_idx && asize_idx < (int) NELMTS(asize));
-		HDassert(']'==*rest);
-		type = rest + 1;
-	    } else {
-		rest = (char *)HDstrchr(type, ']');
-		HDassert(rest);
-		type = rest + 1;
-		asize_idx = -1;
-	    }
-	} /* end if */
+        if ('[' == *type) {
+            if ('a' == type[1]) {
+                asize_idx = (int)HDstrtol(type + 2, &rest, 10);
+                HDassert(0 <= asize_idx && asize_idx < (int)NELMTS(asize));
+                HDassert(']' == *rest);
+                type = rest + 1;
+            }
+            else {
+                rest = (char *)HDstrchr(type, ']');
+                HDassert(rest);
+                type      = rest + 1;
+                asize_idx = -1;
+            }
+        } /* end if */
         else
-	    asize_idx = -1;
-
-	/*
-	 * The argument name.  Leave off the `_id' part.  If the argument
-	 * name is the null pointer then don't print the argument or the
-	 * following `='.  This is used for return values.
-	 */
-	argname = va_arg(ap, char *); /*lint !e64 Type mismatch not really occuring */
-	if(argname) {
-	    unsigned n = (unsigned)MAX (0, (int)HDstrlen(argname) - 3); /*lint !e666 Allow expression with side effects */
-
-	    if(!HDstrcmp(argname + n, "_id")) {
-		HDstrncpy(buf, argname, (size_t)MIN((int)sizeof(buf) - 1, n));
-		buf[MIN((int)sizeof(buf) - 1, n)] = '\0';
-		argname = buf;
-	    } /* end if */
-	    HDfprintf(out, "%s%s=", argno?", ":"", argname);
-	} /* end if */
+            asize_idx = -1;
+
+        /*
+         * The argument name.  Leave off the `_id' part.  If the argument
+         * name is the null pointer then don't print the argument or the
+         * following `='.  This is used for return values.
+         */
+        argname = va_arg(ap, char *); /*lint !e64 Type mismatch not really occuring */
+        if (argname) {
+            unsigned n = (unsigned)MAX(0, (int)HDstrlen(argname) -
+                                              3); /*lint !e666 Allow expression with side effects */
+
+            if (!HDstrcmp(argname + n, "_id")) {
+                HDstrncpy(buf, argname, (size_t)MIN((int)sizeof(buf) - 1, n));
+                buf[MIN((int)sizeof(buf) - 1, n)] = '\0';
+                argname                           = buf;
+            } /* end if */
+            HDfprintf(out, "%s%s=", argno ? ", " : "", argname);
+        } /* end if */
         else
-	    argname = "";
+            argname = "";
 
-	/* The value */
-	if(ptr)
+        /* The value */
+        if (ptr)
             vp = va_arg(ap, void *); /*lint !e64 Type mismatch not really occuring */
-	switch(type[0]) {
+        switch (type[0]) {
             case 'a':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
@@ -261,8 +253,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'b':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
@@ -270,9 +262,9 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 else {
                     hbool_t bool_var = va_arg(ap, hbool_t); /*lint !e732 Loss of sign not really occuring */
 
-                    if(TRUE == bool_var)
+                    if (TRUE == bool_var)
                         HDfprintf(out, "TRUE");
-                    else if(!bool_var)
+                    else if (!bool_var)
                         HDfprintf(out, "FALSE");
                     else
                         HDfprintf(out, "TRUE(%u)", (unsigned)bool_var);
@@ -280,8 +272,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'd':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
@@ -294,18 +286,18 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'D':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 'a':
-                        if(ptr) {
-                            if(vp)
-                                HDfprintf (out, "0x%lx", (unsigned long)vp);
+                        if (ptr) {
+                            if (vp)
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_alloc_time_t alloc_time = (H5D_alloc_time_t)va_arg(ap, int);
 
-                            switch(alloc_time) {
+                            switch (alloc_time) {
                                 case H5D_ALLOC_TIME_ERROR:
                                     HDfprintf(out, "H5D_ALLOC_TIME_ERROR");
                                     break;
@@ -330,12 +322,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)alloc_time);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'c':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -343,7 +335,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5FD_mpio_collective_opt_t opt = (H5FD_mpio_collective_opt_t)va_arg(ap, int);
 
-                            switch(opt) {
+                            switch (opt) {
                                 case H5FD_MPIO_COLLECTIVE_IO:
                                     HDfprintf(out, "H5FD_MPIO_COLLECTIVE_IO");
                                     break;
@@ -356,12 +348,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)opt);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'f':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -369,7 +361,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5D_fill_time_t fill_time = (H5D_fill_time_t)va_arg(ap, int);
 
-                            switch(fill_time) {
+                            switch (fill_time) {
                                 case H5D_FILL_TIME_ERROR:
                                     HDfprintf(out, "H5D_FILL_TIME_ERROR");
                                     break;
@@ -390,12 +382,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)fill_time);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'F':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -403,7 +395,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5D_fill_value_t fill_value = (H5D_fill_value_t)va_arg(ap, int);
 
-                            switch(fill_value) {
+                            switch (fill_value) {
                                 case H5D_FILL_VALUE_ERROR:
                                     HDfprintf(out, "H5D_FILL_VALUE_ERROR");
                                     break;
@@ -424,12 +416,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)fill_value);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'h':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -437,7 +429,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5FD_mpio_chunk_opt_t opt = (H5FD_mpio_chunk_opt_t)va_arg(ap, int);
 
-                            switch(opt) {
+                            switch (opt) {
                                 case H5FD_MPIO_CHUNK_DEFAULT:
                                     HDfprintf(out, "H5FD_MPIO_CHUNK_DEFAULT");
                                     break;
@@ -454,20 +446,21 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)opt);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'i':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_actual_io_mode_t actual_io_mode = (H5D_mpio_actual_io_mode_t)va_arg(ap, int);
+                            H5D_mpio_actual_io_mode_t actual_io_mode =
+                                (H5D_mpio_actual_io_mode_t)va_arg(ap, int);
 
-                            switch(actual_io_mode) {
+                            switch (actual_io_mode) {
                                 case H5D_MPIO_NO_COLLECTIVE:
                                     HDfprintf(out, "H5D_MPIO_NO_COLLECTIVE");
                                     break;
@@ -492,12 +485,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)actual_io_mode);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'l':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -505,7 +498,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5D_layout_t layout = (H5D_layout_t)va_arg(ap, int);
 
-                            switch(layout) {
+                            switch (layout) {
                                 case H5D_LAYOUT_ERROR:
                                     HDfprintf(out, "H5D_LAYOUT_ERROR");
                                     break;
@@ -530,71 +523,79 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)layout);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'n':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_no_collective_cause_t nocol_cause_mode = (H5D_mpio_no_collective_cause_t)va_arg(ap, int);
+                            H5D_mpio_no_collective_cause_t nocol_cause_mode =
+                                (H5D_mpio_no_collective_cause_t)va_arg(ap, int);
                             hbool_t flag_already_displayed = FALSE;
 
                             /* Check for all bit-flags which might be set */
-                            if(nocol_cause_mode & H5D_MPIO_COLLECTIVE) {
+                            if (nocol_cause_mode & H5D_MPIO_COLLECTIVE) {
                                 HDfprintf(out, "H5D_MPIO_COLLECTIVE");
                                 flag_already_displayed = TRUE;
                             } /* end if */
-                            if(nocol_cause_mode & H5D_MPIO_SET_INDEPENDENT) {
-                                HDfprintf(out, "%sH5D_MPIO_SET_INDEPENDENT", flag_already_displayed ? " | " : "");
+                            if (nocol_cause_mode & H5D_MPIO_SET_INDEPENDENT) {
+                                HDfprintf(out, "%sH5D_MPIO_SET_INDEPENDENT",
+                                          flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
-                            if(nocol_cause_mode & H5D_MPIO_DATATYPE_CONVERSION) {
-                                HDfprintf(out, "%sH5D_MPIO_DATATYPE_CONVERSION", flag_already_displayed ? " | " : "");
+                            if (nocol_cause_mode & H5D_MPIO_DATATYPE_CONVERSION) {
+                                HDfprintf(out, "%sH5D_MPIO_DATATYPE_CONVERSION",
+                                          flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
-                            if(nocol_cause_mode & H5D_MPIO_DATA_TRANSFORMS) {
-                                HDfprintf(out, "%sH5D_MPIO_DATA_TRANSFORMS", flag_already_displayed ? " | " : "");
+                            if (nocol_cause_mode & H5D_MPIO_DATA_TRANSFORMS) {
+                                HDfprintf(out, "%sH5D_MPIO_DATA_TRANSFORMS",
+                                          flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
-                            if(nocol_cause_mode & H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED) {
-                                HDfprintf(out, "%sH5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED", flag_already_displayed ? " | " : "");
+                            if (nocol_cause_mode & H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED) {
+                                HDfprintf(out, "%sH5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED",
+                                          flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
-                            if(nocol_cause_mode & H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES) {
-                                HDfprintf(out, "%sH5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES", flag_already_displayed ? " | " : "");
+                            if (nocol_cause_mode & H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES) {
+                                HDfprintf(out, "%sH5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES",
+                                          flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
-                            if(nocol_cause_mode & H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET) {
-                                HDfprintf(out, "%sH5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET", flag_already_displayed ? " | " : "");
+                            if (nocol_cause_mode & H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET) {
+                                HDfprintf(out, "%sH5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET",
+                                          flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
-                            if(nocol_cause_mode & H5D_MPIO_FILTERS) {
+                            if (nocol_cause_mode & H5D_MPIO_FILTERS) {
                                 HDfprintf(out, "%sH5D_MPIO_FILTERS", flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
 
                             /* Display '<none>' if there's no flags set */
-                            if(!flag_already_displayed)
+                            if (!flag_already_displayed)
                                 HDfprintf(out, "<none>");
                         } /* end else */
                         break;
 
                     case 'o':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_actual_chunk_opt_mode_t chunk_opt_mode = (H5D_mpio_actual_chunk_opt_mode_t)va_arg(ap, int);
+                            H5D_mpio_actual_chunk_opt_mode_t chunk_opt_mode =
+                                (H5D_mpio_actual_chunk_opt_mode_t)va_arg(ap, int);
 
-                            switch(chunk_opt_mode) {
+                            switch (chunk_opt_mode) {
                                 case H5D_MPIO_NO_CHUNK_OPTIMIZATION:
                                     HDfprintf(out, "H5D_MPIO_NO_CHUNK_OPTIMIZATION");
                                     break;
@@ -611,12 +612,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)chunk_opt_mode);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 's':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -624,7 +625,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5D_space_status_t space_status = (H5D_space_status_t)va_arg(ap, int);
 
-                            switch(space_status) {
+                            switch (space_status) {
                                 case H5D_SPACE_STATUS_NOT_ALLOCATED:
                                     HDfprintf(out, "H5D_SPACE_STATUS_NOT_ALLOCATED");
                                     break;
@@ -645,12 +646,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)space_status);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 't':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -658,7 +659,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5FD_mpio_xfer_t transfer = (H5FD_mpio_xfer_t)va_arg(ap, int);
 
-                            switch(transfer) {
+                            switch (transfer) {
                                 case H5FD_MPIO_INDEPENDENT:
                                     HDfprintf(out, "H5FD_MPIO_INDEPENDENT");
                                     break;
@@ -671,18 +672,18 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)transfer);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
-                        HDfprintf (out, "BADTYPE(D%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(D%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
 
             case 'e':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
@@ -690,18 +691,18 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 else {
                     herr_t status = va_arg(ap, herr_t);
 
-                    if(status >= 0)
+                    if (status >= 0)
                         HDfprintf(out, "SUCCEED");
-                    else 
+                    else
                         HDfprintf(out, "FAIL");
                 } /* end else */
                 break;
 
             case 'E':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 'd':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -709,7 +710,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5E_direction_t direction = (H5E_direction_t)va_arg(ap, int);
 
-                            switch(direction) {
+                            switch (direction) {
                                 case H5E_WALK_UPWARD:
                                     HDfprintf(out, "H5E_WALK_UPWARD");
                                     break;
@@ -722,26 +723,27 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)direction);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'e':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5E_error2_t *error = va_arg(ap, H5E_error2_t *); /*lint !e64 Type mismatch not really occuring */
+                            H5E_error2_t *error =
+                                va_arg(ap, H5E_error2_t *); /*lint !e64 Type mismatch not really occuring */
 
                             HDfprintf(out, "0x%lx", (unsigned long)error);
                         } /* end else */
                         break;
 
                     case 't':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -749,7 +751,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5E_type_t etype = (H5E_type_t)va_arg(ap, int);
 
-                            switch(etype) {
+                            switch (etype) {
                                 case H5E_MAJOR:
                                     HDfprintf(out, "H5E_MAJOR");
                                     break;
@@ -762,7 +764,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)etype);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
@@ -772,10 +774,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'F':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 'd':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -783,7 +785,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5F_close_degree_t degree = (H5F_close_degree_t)va_arg(ap, int);
 
-                            switch(degree) {
+                            switch (degree) {
                                 case H5F_CLOSE_DEFAULT:
                                     HDfprintf(out, "H5F_CLOSE_DEFAULT");
                                     break;
@@ -804,12 +806,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)degree);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'm':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -817,7 +819,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5F_mem_t mem_type = (H5F_mem_t)va_arg(ap, int);
 
-                            switch(mem_type) {
+                            switch (mem_type) {
                                 case H5FD_MEM_NOLIST:
                                     HDfprintf(out, "H5FD_MEM_NOLIST");
                                     break;
@@ -855,12 +857,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)mem_type);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 's':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -868,7 +870,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5F_scope_t scope = (H5F_scope_t)va_arg(ap, int);
 
-                            switch(scope) {
+                            switch (scope) {
                                 case H5F_SCOPE_LOCAL:
                                     HDfprintf(out, "H5F_SCOPE_LOCAL");
                                     break;
@@ -881,12 +883,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)scope);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'v':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -894,7 +896,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5F_libver_t libver_vers = (H5F_libver_t)va_arg(ap, int);
 
-                            switch(libver_vers) {
+                            switch (libver_vers) {
                                 case H5F_LIBVER_EARLIEST:
                                     HDfprintf(out, "H5F_LIBVER_EARLIEST");
                                     break;
@@ -907,7 +909,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)libver_vers);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
@@ -917,11 +919,11 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'G':
-                switch(type[1]) {
+                switch (type[1]) {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
                     case 'o':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -929,7 +931,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5G_obj_t obj_type = (H5G_obj_t)va_arg(ap, int);
 
-                            switch(obj_type) {
+                            switch (obj_type) {
                                 case H5G_UNKNOWN:
                                     HDfprintf(out, "H5G_UNKNOWN");
                                     break;
@@ -964,18 +966,19 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)obj_type);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 's':
-                        if(ptr) {
-                            if(vp)
-                                HDfprintf (out, "0x%lx", (unsigned long)vp);
+                        if (ptr) {
+                            if (vp)
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5G_stat_t *statbuf = va_arg(ap, H5G_stat_t*); /*lint !e64 Type mismatch not really occuring */
+                            H5G_stat_t *statbuf =
+                                va_arg(ap, H5G_stat_t *); /*lint !e64 Type mismatch not really occuring */
 
                             HDfprintf(out, "0x%lx", (unsigned long)statbuf);
                         }
@@ -989,52 +992,52 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'h':
-                if(ptr) {
-                    if(vp) {
+                if (ptr) {
+                    if (vp) {
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
-                        if(asize_idx >= 0 && asize[asize_idx] >= 0) {
+                        if (asize_idx >= 0 && asize[asize_idx] >= 0) {
                             hsize_t *p = (hsize_t *)vp;
 
                             HDfprintf(out, " {");
-                            for(i = 0; i < asize[asize_idx]; i++) {
-                                if(H5S_UNLIMITED == p[i])
+                            for (i = 0; i < asize[asize_idx]; i++) {
+                                if (H5S_UNLIMITED == p[i])
                                     HDfprintf(out, "%sH5S_UNLIMITED", (i ? ", " : ""));
                                 else
                                     HDfprintf(out, "%s%Hu", (i ? ", " : ""), p[i]);
                             } /* end for */
                             HDfprintf(out, "}");
                         } /* end if */
-                    } /* end if */
+                    }     /* end if */
                     else
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     hsize_t hsize = va_arg(ap, hsize_t); /*lint !e732 Loss of sign not really occuring */
 
-                    if(H5S_UNLIMITED == hsize)
+                    if (H5S_UNLIMITED == hsize)
                         HDfprintf(out, "H5S_UNLIMITED");
                     else {
                         HDfprintf(out, "%Hu", hsize);
                         asize[argno] = (hssize_t)hsize;
                     } /* end else */
-                } /* end else */
+                }     /* end else */
                 break;
 
             case 'H':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 's':
-                        if(ptr) {
-                            if(vp) {
+                        if (ptr) {
+                            if (vp) {
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
-                                if(asize_idx >= 0 && asize[asize_idx] >= 0) {
+                                if (asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     hssize_t *p = (hssize_t *)vp;
 
                                     HDfprintf(out, " {");
-                                    for(i = 0; i < asize[asize_idx]; i++)
+                                    for (i = 0; i < asize[asize_idx]; i++)
                                         HDfprintf(out, "%s%Hd", (i ? ", " : ""), p[i]);
                                     HDfprintf(out, "}");
                                 } /* end if */
-                            } /* end if */
+                            }     /* end if */
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
@@ -1047,14 +1050,14 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         break;
 
                     default:
-                        HDfprintf (out, "BADTYPE(H%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(H%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
 
             case 'i':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
@@ -1062,12 +1065,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 else {
                     hid_t obj = va_arg(ap, hid_t);
 
-                    if(H5P_DEFAULT == obj)
+                    if (H5P_DEFAULT == obj)
                         HDfprintf(out, "H5P_DEFAULT");
-                    else if(obj < 0)
+                    else if (obj < 0)
                         HDfprintf(out, "FAIL");
                     else {
-                        switch(H5I_TYPE(obj)) { /* Use internal H5I macro instead of function call */
+                        switch (H5I_TYPE(obj)) { /* Use internal H5I macro instead of function call */
                             case H5I_UNINIT:
                                 HDfprintf(out, "%ld (uninit - error)", (long)obj);
                                 break;
@@ -1085,93 +1088,93 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 break;
 
                             case H5I_DATATYPE:
-                                if(obj == H5T_NATIVE_SCHAR_g)
+                                if (obj == H5T_NATIVE_SCHAR_g)
                                     HDfprintf(out, "H5T_NATIVE_SCHAR");
-                                else if(obj == H5T_NATIVE_UCHAR_g)
+                                else if (obj == H5T_NATIVE_UCHAR_g)
                                     HDfprintf(out, "H5T_NATIVE_UCHAR");
-                                else if(obj == H5T_NATIVE_SHORT_g)
+                                else if (obj == H5T_NATIVE_SHORT_g)
                                     HDfprintf(out, "H5T_NATIVE_SHORT");
-                                else if(obj == H5T_NATIVE_USHORT_g)
+                                else if (obj == H5T_NATIVE_USHORT_g)
                                     HDfprintf(out, "H5T_NATIVE_USHORT");
-                                else if(obj == H5T_NATIVE_INT_g)
+                                else if (obj == H5T_NATIVE_INT_g)
                                     HDfprintf(out, "H5T_NATIVE_INT");
-                                else if(obj == H5T_NATIVE_UINT_g)
+                                else if (obj == H5T_NATIVE_UINT_g)
                                     HDfprintf(out, "H5T_NATIVE_UINT");
-                                else if(obj == H5T_NATIVE_LONG_g)
+                                else if (obj == H5T_NATIVE_LONG_g)
                                     HDfprintf(out, "H5T_NATIVE_LONG");
-                                else if(obj == H5T_NATIVE_ULONG_g)
+                                else if (obj == H5T_NATIVE_ULONG_g)
                                     HDfprintf(out, "H5T_NATIVE_ULONG");
-                                else if(obj == H5T_NATIVE_LLONG_g)
+                                else if (obj == H5T_NATIVE_LLONG_g)
                                     HDfprintf(out, "H5T_NATIVE_LLONG");
-                                else if(obj == H5T_NATIVE_ULLONG_g)
+                                else if (obj == H5T_NATIVE_ULLONG_g)
                                     HDfprintf(out, "H5T_NATIVE_ULLONG");
-                                else if(obj == H5T_NATIVE_FLOAT_g)
+                                else if (obj == H5T_NATIVE_FLOAT_g)
                                     HDfprintf(out, "H5T_NATIVE_FLOAT");
-                                else if(obj == H5T_NATIVE_DOUBLE_g)
+                                else if (obj == H5T_NATIVE_DOUBLE_g)
                                     HDfprintf(out, "H5T_NATIVE_DOUBLE");
-#if H5_SIZEOF_LONG_DOUBLE !=0
-                                else if(obj == H5T_NATIVE_LDOUBLE_g)
+#if H5_SIZEOF_LONG_DOUBLE != 0
+                                else if (obj == H5T_NATIVE_LDOUBLE_g)
                                     HDfprintf(out, "H5T_NATIVE_LDOUBLE");
 #endif
-                                else if(obj == H5T_IEEE_F32BE_g)
+                                else if (obj == H5T_IEEE_F32BE_g)
                                     HDfprintf(out, "H5T_IEEE_F32BE");
-                                else if(obj == H5T_IEEE_F32LE_g)
+                                else if (obj == H5T_IEEE_F32LE_g)
                                     HDfprintf(out, "H5T_IEEE_F32LE");
-                                else if(obj == H5T_IEEE_F64BE_g)
+                                else if (obj == H5T_IEEE_F64BE_g)
                                     HDfprintf(out, "H5T_IEEE_F64BE");
-                                else if(obj == H5T_IEEE_F64LE_g)
+                                else if (obj == H5T_IEEE_F64LE_g)
                                     HDfprintf(out, "H5T_IEEE_F64LE");
-                                else if(obj == H5T_STD_I8BE_g)
+                                else if (obj == H5T_STD_I8BE_g)
                                     HDfprintf(out, "H5T_STD_I8BE");
-                                else if(obj == H5T_STD_I8LE_g)
+                                else if (obj == H5T_STD_I8LE_g)
                                     HDfprintf(out, "H5T_STD_I8LE");
-                                else if(obj == H5T_STD_I16BE_g)
+                                else if (obj == H5T_STD_I16BE_g)
                                     HDfprintf(out, "H5T_STD_I16BE");
-                                else if(obj == H5T_STD_I16LE_g)
+                                else if (obj == H5T_STD_I16LE_g)
                                     HDfprintf(out, "H5T_STD_I16LE");
-                                else if(obj == H5T_STD_I32BE_g)
+                                else if (obj == H5T_STD_I32BE_g)
                                     HDfprintf(out, "H5T_STD_I32BE");
-                                else if(obj == H5T_STD_I32LE_g)
+                                else if (obj == H5T_STD_I32LE_g)
                                     HDfprintf(out, "H5T_STD_I32LE");
-                                else if(obj == H5T_STD_I64BE_g)
+                                else if (obj == H5T_STD_I64BE_g)
                                     HDfprintf(out, "H5T_STD_I64BE");
-                                else if(obj == H5T_STD_I64LE_g)
+                                else if (obj == H5T_STD_I64LE_g)
                                     HDfprintf(out, "H5T_STD_I64LE");
-                                else if(obj == H5T_STD_U8BE_g)
+                                else if (obj == H5T_STD_U8BE_g)
                                     HDfprintf(out, "H5T_STD_U8BE");
-                                else if(obj == H5T_STD_U8LE_g)
+                                else if (obj == H5T_STD_U8LE_g)
                                     HDfprintf(out, "H5T_STD_U8LE");
-                                else if(obj == H5T_STD_U16BE_g)
+                                else if (obj == H5T_STD_U16BE_g)
                                     HDfprintf(out, "H5T_STD_U16BE");
-                                else if(obj == H5T_STD_U16LE_g)
+                                else if (obj == H5T_STD_U16LE_g)
                                     HDfprintf(out, "H5T_STD_U16LE");
-                                else if(obj == H5T_STD_U32BE_g)
+                                else if (obj == H5T_STD_U32BE_g)
                                     HDfprintf(out, "H5T_STD_U32BE");
-                                else if(obj == H5T_STD_U32LE_g)
+                                else if (obj == H5T_STD_U32LE_g)
                                     HDfprintf(out, "H5T_STD_U32LE");
-                                else if(obj == H5T_STD_U64BE_g)
+                                else if (obj == H5T_STD_U64BE_g)
                                     HDfprintf(out, "H5T_STD_U64BE");
-                                else if(obj == H5T_STD_U64LE_g)
+                                else if (obj == H5T_STD_U64LE_g)
                                     HDfprintf(out, "H5T_STD_U64LE");
-                                else if(obj == H5T_STD_B8BE_g)
+                                else if (obj == H5T_STD_B8BE_g)
                                     HDfprintf(out, "H5T_STD_B8BE");
-                                else if(obj == H5T_STD_B8LE_g)
+                                else if (obj == H5T_STD_B8LE_g)
                                     HDfprintf(out, "H5T_STD_B8LE");
-                                else if(obj == H5T_STD_B16BE_g)
+                                else if (obj == H5T_STD_B16BE_g)
                                     HDfprintf(out, "H5T_STD_B16BE");
-                                else if(obj == H5T_STD_B16LE_g)
+                                else if (obj == H5T_STD_B16LE_g)
                                     HDfprintf(out, "H5T_STD_B16LE");
-                                else if(obj == H5T_STD_B32BE_g)
+                                else if (obj == H5T_STD_B32BE_g)
                                     HDfprintf(out, "H5T_STD_B32BE");
-                                else if(obj == H5T_STD_B32LE_g)
+                                else if (obj == H5T_STD_B32LE_g)
                                     HDfprintf(out, "H5T_STD_B32LE");
-                                else if(obj == H5T_STD_B64BE_g)
+                                else if (obj == H5T_STD_B64BE_g)
                                     HDfprintf(out, "H5T_STD_B64BE");
-                                else if(obj == H5T_STD_B64LE_g)
+                                else if (obj == H5T_STD_B64LE_g)
                                     HDfprintf(out, "H5T_STD_B64LE");
-                                else if(obj == H5T_C_S1_g)
+                                else if (obj == H5T_C_S1_g)
                                     HDfprintf(out, "H5T_C_S1");
-                                else if(obj == H5T_FORTRAN_S1_g)
+                                else if (obj == H5T_FORTRAN_S1_g)
                                     HDfprintf(out, "H5T_FORTRAN_S1");
                                 else
                                     HDfprintf(out, "%ld (dtype)", (long)obj);
@@ -1184,8 +1187,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 {
                                     H5S_t *space;
 
-                                    if(NULL != (space = (H5S_t *)H5I_object(obj)))
-                                        if(H5S_SIMPLE == H5S_GET_EXTENT_TYPE(space))
+                                    if (NULL != (space = (H5S_t *)H5I_object(obj)))
+                                        if (H5S_SIMPLE == H5S_GET_EXTENT_TYPE(space))
                                             asize[argno] = H5S_GET_EXTENT_NDIMS(space);
                                 }
                                 break;
@@ -1227,22 +1230,22 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 break;
 
                             case H5I_NTYPES:
-                                HDfprintf (out, "%ld (ntypes - error)", (long)obj);
+                                HDfprintf(out, "%ld (ntypes - error)", (long)obj);
                                 break;
 
                             default:
                                 HDfprintf(out, "%ld (unknown class)", (long)obj);
                                 break;
                         } /* end switch */
-                    } /* end else */
-                } /* end else */
+                    }     /* end else */
+                }         /* end else */
                 break;
 
             case 'I':
                 switch (type[1]) {
                     case 'i':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1250,7 +1253,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5_index_t idx_type = (H5_index_t)va_arg(ap, int);
 
-                            switch(idx_type) {
+                            switch (idx_type) {
                                 case H5_INDEX_UNKNOWN:
                                     HDfprintf(out, "H5_INDEX_UNKNOWN");
                                     break;
@@ -1271,12 +1274,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)idx_type);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'o':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1284,7 +1287,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5_iter_order_t order = (H5_iter_order_t)va_arg(ap, int);
 
-                            switch(order) {
+                            switch (order) {
                                 case H5_ITER_UNKNOWN:
                                     HDfprintf(out, "H5_ITER_UNKNOWN");
                                     break;
@@ -1309,36 +1312,36 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)order);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 's':
-                        if(ptr) {
-                            if(vp) {
+                        if (ptr) {
+                            if (vp) {
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
-                                if(asize_idx >= 0 && asize[asize_idx] >= 0) {
-                                    int *p = (int*)vp;
+                                if (asize_idx >= 0 && asize[asize_idx] >= 0) {
+                                    int *p = (int *)vp;
 
                                     HDfprintf(out, " {");
-                                    for(i = 0; i < asize[asize_idx]; i++)
+                                    for (i = 0; i < asize[asize_idx]; i++)
                                         HDfprintf(out, "%s%d", (i ? ", " : ""), p[i]);
                                     HDfprintf(out, "}");
                                 } /* end if */
-                            } /* end if */
+                            }     /* end if */
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             int is = va_arg(ap, int);
 
-                            HDfprintf (out, "%d", is);
+                            HDfprintf(out, "%d", is);
                             asize[argno] = is;
                         } /* end else */
                         break;
 
                     case 't':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1415,27 +1418,28 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)id_type);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'u':
-                        if(ptr) {
-                            if(vp) {
+                        if (ptr) {
+                            if (vp) {
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
-                                if(asize_idx >= 0 && asize[asize_idx] >= 0) {
-                                    unsigned *p = (unsigned*)vp;
+                                if (asize_idx >= 0 && asize[asize_idx] >= 0) {
+                                    unsigned *p = (unsigned *)vp;
 
                                     HDfprintf(out, " {");
-                                    for(i = 0; i < asize[asize_idx]; i++)
-                                        HDfprintf(out, "%s%u", i?", ":"", p[i]);
+                                    for (i = 0; i < asize[asize_idx]; i++)
+                                        HDfprintf(out, "%s%u", i ? ", " : "", p[i]);
                                     HDfprintf(out, "}");
                                 } /* end if */
-                            } /* end if */
+                            }     /* end if */
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned iu = va_arg(ap, unsigned); /*lint !e732 Loss of sign not really occuring */
+                            unsigned iu =
+                                va_arg(ap, unsigned); /*lint !e732 Loss of sign not really occuring */
 
                             HDfprintf(out, "%u", iu);
                             asize[argno] = iu;
@@ -1443,24 +1447,24 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         break;
 
                     default:
-                        HDfprintf (out, "BADTYPE(I%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(I%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
 
             case 'L':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 'l':
-                        if(ptr) {
-                            if(vp)
-                                HDfprintf (out, "0x%lx", (unsigned long)vp);
+                        if (ptr) {
+                            if (vp)
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5L_type_t link_type = (H5L_type_t)va_arg(ap, int);
 
-                            switch(link_type) {
+                            switch (link_type) {
                                 case H5L_TYPE_ERROR:
                                     HDfprintf(out, "H5L_TYPE_ERROR");
                                     break;
@@ -1485,7 +1489,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)link_type);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
@@ -1495,10 +1499,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'M':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 'c':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1509,12 +1513,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
 
                             HDfprintf(out, "%ld", (long)comm);
                         } /* end else */
-#endif /* H5_HAVE_PARALLEL */
+#endif                    /* H5_HAVE_PARALLEL */
                         break;
 
                     case 'i':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1525,12 +1529,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
 
                             HDfprintf(out, "%ld", (long)info);
                         } /* end else */
-#endif /* H5_HAVE_PARALLEL */
+#endif                    /* H5_HAVE_PARALLEL */
                         break;
 
                     case 't':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1538,7 +1542,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5FD_mem_t mt = (H5FD_mem_t)va_arg(ap, int);
 
-                            switch(mt) {
+                            switch (mt) {
                                 case H5FD_MEM_NOLIST:
                                     HDfprintf(out, "H5FD_MEM_NOLIST");
                                     break;
@@ -1579,7 +1583,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)mt);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
@@ -1588,8 +1592,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'o':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
@@ -1597,15 +1601,15 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 else {
                     off_t offset = va_arg(ap, off_t);
 
-                    HDfprintf (out, "%ld", (long)offset);
+                    HDfprintf(out, "%ld", (long)offset);
                 } /* end else */
                 break;
 
             case 'O':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 't':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1613,7 +1617,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5O_type_t objtype = (H5O_type_t)va_arg(ap, int);
 
-                            switch(objtype) {
+                            switch (objtype) {
                                 case H5O_TYPE_UNKNOWN:
                                     HDfprintf(out, "H5O_TYPE_UNKNOWN");
                                     break;
@@ -1638,7 +1642,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "BADTYPE(%ld)", (long)objtype);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
@@ -1648,21 +1652,21 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'p':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hid_t pclass_id = va_arg(ap, hid_t);
-                    char *class_name = NULL;
+                    hid_t           pclass_id  = va_arg(ap, hid_t);
+                    char *          class_name = NULL;
                     H5P_genclass_t *pclass;
 
                     /* Get the class name and print it */
                     /* (This may generate recursive call to the library... -QAK) */
-                    if(NULL != (pclass = (H5P_genclass_t *)H5I_object(pclass_id)) &&
-                            NULL != (class_name = H5P_get_class_name(pclass))) {
+                    if (NULL != (pclass = (H5P_genclass_t *)H5I_object(pclass_id)) &&
+                        NULL != (class_name = H5P_get_class_name(pclass))) {
                         HDfprintf(out, "%s", class_name);
                         H5MM_xfree(class_name);
                     } /* end if */
@@ -1672,8 +1676,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'r':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
@@ -1686,10 +1690,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'R':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 't':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1697,7 +1701,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5R_type_t reftype = (H5R_type_t)va_arg(ap, int);
 
-                            switch(reftype) {
+                            switch (reftype) {
                                 case H5R_BADTYPE:
                                     HDfprintf(out, "H5R_BADTYPE");
                                     break;
@@ -1718,7 +1722,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "BADTYPE(%ld)", (long)reftype);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
@@ -1728,10 +1732,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'S':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 'c':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1739,7 +1743,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5S_class_t cls = (H5S_class_t)va_arg(ap, int);
 
-                            switch(cls) {
+                            switch (cls) {
                                 case H5S_NO_CLASS:
                                     HDfprintf(out, "H5S_NO_CLASS");
                                     break;
@@ -1760,12 +1764,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)cls);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 's':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1773,7 +1777,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5S_seloper_t so = (H5S_seloper_t)va_arg(ap, int);
 
-                            switch(so) {
+                            switch (so) {
                                 case H5S_SELECT_NOOP:
                                     HDfprintf(out, "H5S_NOOP");
                                     break;
@@ -1818,12 +1822,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)so);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 't':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1831,7 +1835,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5S_sel_type st = (H5S_sel_type)va_arg(ap, int);
 
-                            switch(st) {
+                            switch (st) {
                                 case H5S_SEL_ERROR:
                                     HDfprintf(out, "H5S_SEL_ERROR");
                                     break;
@@ -1860,7 +1864,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)st);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
@@ -1870,24 +1874,25 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 's':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    const char *str = va_arg(ap, const char *); /*lint !e64 Type mismatch not really occuring */
+                    const char *str =
+                        va_arg(ap, const char *); /*lint !e64 Type mismatch not really occuring */
 
                     HDfprintf(out, "\"%s\"", str);
                 } /* end else */
                 break;
 
             case 'T':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 'c':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1895,7 +1900,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_cset_t cset = (H5T_cset_t)va_arg(ap, int);
 
-                            switch(cset) {
+                            switch (cset) {
                                 case H5T_CSET_ERROR:
                                     HDfprintf(out, "H5T_CSET_ERROR");
                                     break;
@@ -1929,12 +1934,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)cset);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'd':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1942,7 +1947,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_direction_t direct = (H5T_direction_t)va_arg(ap, int);
 
-                            switch(direct) {
+                            switch (direct) {
                                 case H5T_DIR_DEFAULT:
                                     HDfprintf(out, "H5T_DIR_DEFAULT");
                                     break;
@@ -1959,12 +1964,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)direct);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'e':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -1972,7 +1977,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_pers_t pers = (H5T_pers_t)va_arg(ap, int);
 
-                            switch(pers) {
+                            switch (pers) {
                                 case H5T_PERS_DONTCARE:
                                     HDfprintf(out, "H5T_PERS_DONTCARE");
                                     break;
@@ -1989,12 +1994,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)pers);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'n':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2002,7 +2007,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_norm_t norm = (H5T_norm_t)va_arg(ap, int);
 
-                            switch(norm) {
+                            switch (norm) {
                                 case H5T_NORM_ERROR:
                                     HDfprintf(out, "H5T_NORM_ERROR");
                                     break;
@@ -2023,12 +2028,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)norm);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'o':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2036,7 +2041,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_order_t order = (H5T_order_t)va_arg(ap, int);
 
-                            switch(order) {
+                            switch (order) {
                                 case H5T_ORDER_ERROR:
                                     HDfprintf(out, "H5T_ORDER_ERROR");
                                     break;
@@ -2065,12 +2070,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)order);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'p':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2078,7 +2083,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_pad_t pad = (H5T_pad_t)va_arg(ap, int);
 
-                            switch(pad) {
+                            switch (pad) {
                                 case H5T_PAD_ERROR:
                                     HDfprintf(out, "H5T_PAD_ERROR");
                                     break;
@@ -2103,12 +2108,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)pad);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 's':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2116,7 +2121,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_sign_t sign = (H5T_sign_t)va_arg(ap, int);
 
-                            switch(sign) {
+                            switch (sign) {
                                 case H5T_SGN_ERROR:
                                     HDfprintf(out, "H5T_SGN_ERROR");
                                     break;
@@ -2137,12 +2142,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)sign);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 't':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2150,7 +2155,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_class_t type_class = (H5T_class_t)va_arg(ap, int);
 
-                            switch(type_class) {
+                            switch (type_class) {
                                 case H5T_NO_CLASS:
                                     HDfprintf(out, "H5T_NO_CLASS");
                                     break;
@@ -2207,12 +2212,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)type_class);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'z':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2220,7 +2225,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5T_str_t str = (H5T_str_t)va_arg(ap, int);
 
-                            switch(str) {
+                            switch (str) {
                                 case H5T_STR_ERROR:
                                     HDfprintf(out, "H5T_STR_ERROR");
                                     break;
@@ -2250,61 +2255,62 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 case H5T_STR_RESERVED_13:
                                 case H5T_STR_RESERVED_14:
                                 case H5T_STR_RESERVED_15:
-                                    HDfprintf(out, "H5T_STR_RESERVED(%ld)",(long)str);
+                                    HDfprintf(out, "H5T_STR_RESERVED(%ld)", (long)str);
                                     break;
 
                                 default:
                                     HDfprintf(out, "%ld", (long)str);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     default:
-                        HDfprintf (out, "BADTYPE(T%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(T%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
 
             case 't':
-                if(ptr) {
-                    if(vp)
+                if (ptr) {
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    htri_t tri_var = va_arg (ap, htri_t);
+                    htri_t tri_var = va_arg(ap, htri_t);
 
-                    if(tri_var>0)
-                        HDfprintf (out, "TRUE");
-                    else if(!tri_var)
-                        HDfprintf (out, "FALSE");
+                    if (tri_var > 0)
+                        HDfprintf(out, "TRUE");
+                    else if (!tri_var)
+                        HDfprintf(out, "FALSE");
                     else
                         HDfprintf(out, "FAIL(%d)", (int)tri_var);
                 } /* end else */
                 break;
 
             case 'U':
-                switch(type[1]) {
+                switch (type[1]) {
                     case 'l':
-                        if(ptr) {
-                            if(vp) {
+                        if (ptr) {
+                            if (vp) {
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
-                                if(asize_idx >= 0 && asize[asize_idx] >= 0) {
+                                if (asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     unsigned long *p = (unsigned long *)vp;
 
                                     HDfprintf(out, " {");
-                                    for(i = 0; i < asize[asize_idx]; i++)
-                                        HDfprintf(out, "%s%lu", i?", ":"", p[i]);
+                                    for (i = 0; i < asize[asize_idx]; i++)
+                                        HDfprintf(out, "%s%lu", i ? ", " : "", p[i]);
                                     HDfprintf(out, "}");
                                 } /* end if */
-                            } /* end if */
+                            }     /* end if */
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned long iul = va_arg(ap, unsigned long); /*lint !e732 Loss of sign not really occuring */
+                            unsigned long iul =
+                                va_arg(ap, unsigned long); /*lint !e732 Loss of sign not really occuring */
 
                             HDfprintf(out, "%lu", iul);
                             asize[argno] = iul;
@@ -2312,23 +2318,24 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         break;
 
                     case 'L':
-                        if(ptr) {
-                            if(vp) {
+                        if (ptr) {
+                            if (vp) {
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
-                                if(asize_idx >= 0 && asize[asize_idx] >= 0) {
+                                if (asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     unsigned long long *p = (unsigned long long *)vp;
 
                                     HDfprintf(out, " {");
-                                    for(i = 0; i < asize[asize_idx]; i++)
-                                        HDfprintf(out, "%s%llu", i?", ":"", p[i]);
+                                    for (i = 0; i < asize[asize_idx]; i++)
+                                        HDfprintf(out, "%s%llu", i ? ", " : "", p[i]);
                                     HDfprintf(out, "}");
                                 } /* end if */
-                            } /* end if */
+                            }     /* end if */
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned long long iull = va_arg(ap, unsigned long long); /*lint !e732 Loss of sign not really occuring */
+                            unsigned long long iull = va_arg(
+                                ap, unsigned long long); /*lint !e732 Loss of sign not really occuring */
 
                             HDfprintf(out, "%llu", iull);
                             asize[argno] = iull;
@@ -2336,35 +2343,35 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         break;
 
                     default:
-                        HDfprintf (out, "BADTYPE(U%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(U%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
 
             case 'x':
-                if(ptr) {
-                    if(vp) {
+                if (ptr) {
+                    if (vp) {
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
-                        if(asize_idx >= 0 && asize[asize_idx] >= 0) {
-                            void **p = (void**)vp;
+                        if (asize_idx >= 0 && asize[asize_idx] >= 0) {
+                            void **p = (void **)vp;
 
                             HDfprintf(out, " {");
-                            for(i = 0; i < asize[asize_idx]; i++) {
-                                if(p[i])
+                            for (i = 0; i < asize[asize_idx]; i++) {
+                                if (p[i])
                                     HDfprintf(out, "%s0x%lx", (i ? ", " : ""), (unsigned long)(p[i]));
                                 else
                                     HDfprintf(out, "%sNULL", (i ? ", " : ""));
                             } /* end for */
                             HDfprintf(out, "}");
                         } /* end if */
-                    } /* end if */
+                    }     /* end if */
                     else
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    vp = va_arg (ap, void *); /*lint !e64 Type mismatch not really occuring */
+                    vp = va_arg(ap, void *); /*lint !e64 Type mismatch not really occuring */
 
-                    if(vp)
+                    if (vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
                         HDfprintf(out, "NULL");
@@ -2372,18 +2379,18 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             case 'z':
-                if(ptr) {
-                    if(vp) {
+                if (ptr) {
+                    if (vp) {
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
-                        if(asize_idx >= 0 && asize[asize_idx] >= 0) {
+                        if (asize_idx >= 0 && asize[asize_idx] >= 0) {
                             size_t *p = (size_t *)vp;
 
                             HDfprintf(out, " {");
-                            for(i = 0; i < asize[asize_idx]; i++)
+                            for (i = 0; i < asize[asize_idx]; i++)
                                 HDfprintf(out, "%s%Zu", (i ? ", " : ""), p[i]);
                             HDfprintf(out, "}");
                         } /* end if */
-                    } /* end if */
+                    }     /* end if */
                     else
                         HDfprintf(out, "NULL");
                 } /* end if */
@@ -2398,8 +2405,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'Z':
                 switch (type[1]) {
                     case 'a':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2407,7 +2414,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5Z_SO_scale_type_t scale_type = (H5Z_SO_scale_type_t)va_arg(ap, int);
 
-                            switch(scale_type) {
+                            switch (scale_type) {
                                 case H5Z_SO_FLOAT_DSCALE:
                                     HDfprintf(out, "H5Z_SO_FLOAT_DSCALE");
                                     break;
@@ -2424,26 +2431,27 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "%ld", (long)scale_type);
                                     break;
                             } /* end switch */
-                        } /* end else */
+                        }     /* end else */
                         break;
 
                     case 'c':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_class2_t *filter = va_arg(ap, H5Z_class2_t*); /*lint !e64 Type mismatch not really occuring */
+                            H5Z_class2_t *filter =
+                                va_arg(ap, H5Z_class2_t *); /*lint !e64 Type mismatch not really occuring */
 
                             HDfprintf(out, "0x%lx", (unsigned long)filter);
                         } /* end else */
                         break;
 
                     case 'e':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2451,7 +2459,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5Z_EDC_t edc = (H5Z_EDC_t)va_arg(ap, int);
 
-                            if(H5Z_DISABLE_EDC == edc)
+                            if (H5Z_DISABLE_EDC == edc)
                                 HDfprintf(out, "H5Z_DISABLE_EDC");
                             else if (H5Z_ENABLE_EDC == edc)
                                 HDfprintf(out, "H5Z_ENABLE_EDC");
@@ -2461,8 +2469,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         break;
 
                     case 'f':
-                        if(ptr) {
-                            if(vp)
+                        if (ptr) {
+                            if (vp)
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
                                 HDfprintf(out, "NULL");
@@ -2470,7 +2478,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         else {
                             H5Z_filter_t id = va_arg(ap, H5Z_filter_t);
 
-                            if(H5Z_FILTER_DEFLATE == id)
+                            if (H5Z_FILTER_DEFLATE == id)
                                 HDfprintf(out, "H5Z_FILTER_DEFLATE");
                             else
                                 HDfprintf(out, "%ld", (long)id);
@@ -2478,18 +2486,18 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         break;
 
                     case 's':
-                        if(ptr) {
-                            if(vp) {
+                        if (ptr) {
+                            if (vp) {
                                 HDfprintf(out, "0x%lx", (unsigned long)vp);
-                                if(asize_idx >= 0 && asize[asize_idx] >= 0) {
+                                if (asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     ssize_t *p = (ssize_t *)vp;
 
                                     HDfprintf(out, " {");
-                                    for(i = 0; i < asize[asize_idx]; i++)
+                                    for (i = 0; i < asize[asize_idx]; i++)
                                         HDfprintf(out, "%s%Zd", (i ? ", " : ""), p[i]);
                                     HDfprintf(out, "}");
                                 } /* end if */
-                            } /* end if */
+                            }     /* end if */
                             else
                                 HDfprintf(out, "NULL");
                         } /* end if */
@@ -2508,29 +2516,28 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 break;
 
             default:
-                if(HDisupper(type[0]))
+                if (HDisupper(type[0]))
                     HDfprintf(out, "BADTYPE(%c%c)", type[0], type[1]);
                 else
                     HDfprintf(out, "BADTYPE(%c)", type[0]);
                 goto error;
-	} /* end switch */
-    } /* end for */
+        } /* end switch */
+    }     /* end for */
 
     /* Display event time for return */
-    if(returning && H5_debug_g.ttimes)
+    if (returning && H5_debug_g.ttimes)
         HDfprintf(out, " @%.6f [dt=%.6f]", (event_time.etime - first_time.etime),
-                (event_time.etime - *returning));
+                  (event_time.etime - *returning));
 
 error:
     va_end(ap);
-    if(returning)
-	HDfprintf(out, ";\n");
+    if (returning)
+        HDfprintf(out, ";\n");
     else {
-	last_call_depth = current_depth++;
-	HDfprintf (out, ")");
+        last_call_depth = current_depth++;
+        HDfprintf(out, ")");
     } /* end else */
     HDfflush(out);
 
     return event_time.etime;
 } /* end H5_trace() */
-
diff --git a/src/H5version.h b/src/H5version.h
index 71044dd..5f35b99 100644
--- a/src/H5version.h
+++ b/src/H5version.h
@@ -14,7 +14,6 @@
 /* Generated automatically by bin/make_vers -- do not edit */
 /* Add new versioned symbols to H5vers.txt file */
 
-
 #ifndef _H5version_H
 #define _H5version_H
 
@@ -23,7 +22,6 @@
 #error "Can't choose old API versions when deprecated APIs are disabled"
 #endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */
 
-
 /* If a particular "global" version of the library's interfaces is chosen,
  *      set the versions for the API symbols affected.
  *
@@ -138,7 +136,6 @@
 
 #endif /* H5_USE_16_API */
 
-
 /* Choose the correct version of each API symbol, defaulting to the latest
  *      version of each.  The "best" name for API parameters/data structures
  *      that have changed definitions is also set.  An error is issued for
@@ -164,10 +161,10 @@
 #ifndef H5Aiterate_vers
 #define H5Aiterate_vers 2
 #endif /* H5Aiterate_vers */
-#define H5Aiterate H5Aiterate2
+#define H5Aiterate     H5Aiterate2
 #define H5A_operator_t H5A_operator2_t
 #elif H5Aiterate_vers == 1
-#define H5Aiterate H5Aiterate1
+#define H5Aiterate     H5Aiterate1
 #define H5A_operator_t H5A_operator1_t
 #else /* H5Aiterate_vers */
 #error "H5Aiterate_vers set to invalid value"
@@ -254,13 +251,13 @@
 #ifndef H5Ewalk_vers
 #define H5Ewalk_vers 2
 #endif /* H5Ewalk_vers */
-#define H5Ewalk H5Ewalk2
+#define H5Ewalk     H5Ewalk2
 #define H5E_error_t H5E_error2_t
-#define H5E_walk_t H5E_walk2_t
+#define H5E_walk_t  H5E_walk2_t
 #elif H5Ewalk_vers == 1
-#define H5Ewalk H5Ewalk1
+#define H5Ewalk     H5Ewalk1
 #define H5E_error_t H5E_error1_t
-#define H5E_walk_t H5E_walk1_t
+#define H5E_walk_t  H5E_walk1_t
 #else /* H5Ewalk_vers */
 #error "H5Ewalk_vers set to invalid value"
 #endif /* H5Ewalk_vers */
@@ -401,7 +398,6 @@
 #error "H5E_auto_t_vers set to invalid value"
 #endif /* H5E_auto_t_vers */
 
-
 #if !defined(H5Z_class_t_vers) || H5Z_class_t_vers == 2
 #ifndef H5Z_class_t_vers
 #define H5Z_class_t_vers 2
@@ -414,4 +410,3 @@
 #endif /* H5Z_class_t_vers */
 
 #endif /* H5version_H */
-
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index f1c26a8..b097512 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -27,37 +27,37 @@
  * *may* provide these definitions.
  */
 #ifdef _WIN64
-#       define PRIdPTR "lld"
-#       define PRIoPTR "llo"
-#       define PRIuPTR "llu"
-#       define PRIxPTR "llx"
+#define PRIdPTR "lld"
+#define PRIoPTR "llo"
+#define PRIuPTR "llu"
+#define PRIxPTR "llx"
 #else /* _WIN64 */
-#       define PRIdPTR "ld"
-#       define PRIoPTR "lo"
-#       define PRIuPTR "lu"
-#       define PRIxPTR "lx"
+#define PRIdPTR "ld"
+#define PRIoPTR "lo"
+#define PRIuPTR "lu"
+#define PRIxPTR "lx"
 #endif /* _WIN64 */
 
-#   define PRId8 "d"
-#   define PRIo8 "o"
-#   define PRIu8 "u"
-#   define PRIx8 "x"
-#   define PRId16 "d"
-#   define PRIo16 "o"
-#   define PRIu16 "u"
-#   define PRIx16 "x"
-#   define PRId32 "d"
-#   define PRIo32 "o"
-#   define PRIu32 "u"
-#   define PRIx32 "x"
-#   define PRId64 "lld"
-#   define PRIo64 "llo"
-#   define PRIu64 "llu"
-#   define PRIx64 "llx"
-#   define PRIdMAX "lld"
-#   define PRIoMAX "llo"
-#   define PRIuMAX "llu"
-#   define PRIxMAX "llx"
+#define PRId8   "d"
+#define PRIo8   "o"
+#define PRIu8   "u"
+#define PRIx8   "x"
+#define PRId16  "d"
+#define PRIo16  "o"
+#define PRIu16  "u"
+#define PRIx16  "x"
+#define PRId32  "d"
+#define PRIo32  "o"
+#define PRIu32  "u"
+#define PRIx32  "x"
+#define PRId64  "lld"
+#define PRIo64  "llo"
+#define PRIu64  "llu"
+#define PRIx64  "llx"
+#define PRIdMAX "lld"
+#define PRIoMAX "llo"
+#define PRIuMAX "llu"
+#define PRIxMAX "llx"
 #endif
 
 /*
@@ -67,69 +67,69 @@
  */
 #ifdef H5_HAVE_WIN32_API
 
-typedef struct _stati64     h5_stat_t;
-typedef __int64             h5_stat_size_t;
-
-#define HDaccess(F,M)       _access(F,M)
-#define HDchdir(S)          _chdir(S)
-#define HDclose(F)          _close(F)
-#define HDcreat(S,M)        Wopen_utf8(S,O_CREAT|O_TRUNC|O_RDWR,M)
-#define HDdup(F)            _dup(F)
-#define HDfdopen(N,S)       _fdopen(N,S)
-#define HDfileno(F)         _fileno(F)
-#define HDfstat(F,B)        _fstati64(F,B)
-#define HDisatty(F)         _isatty(F)
-
-#define HDgetcwd(S,Z)       _getcwd(S,Z)
-#define HDgetdcwd(D,S,Z)    _getdcwd(D,S,Z)
-#define HDgetdrive()        _getdrive()
-#define HDlseek(F,O,W)      _lseeki64(F,O,W)
-#define HDlstat(S,B)        _lstati64(S,B)
-#define HDmkdir(S,M)        _mkdir(S)
-#define HDnanosleep(N, O)   Wnanosleep(N, O)
-#define HDoff_t             __int64
+typedef struct _stati64 h5_stat_t;
+typedef __int64         h5_stat_size_t;
+
+#define HDaccess(F, M) _access(F, M)
+#define HDchdir(S)     _chdir(S)
+#define HDclose(F)     _close(F)
+#define HDcreat(S, M)  Wopen_utf8(S, O_CREAT | O_TRUNC | O_RDWR, M)
+#define HDdup(F)       _dup(F)
+#define HDfdopen(N, S) _fdopen(N, S)
+#define HDfileno(F)    _fileno(F)
+#define HDfstat(F, B)  _fstati64(F, B)
+#define HDisatty(F)    _isatty(F)
+
+#define HDgetcwd(S, Z)     _getcwd(S, Z)
+#define HDgetdcwd(D, S, Z) _getdcwd(D, S, Z)
+#define HDgetdrive()       _getdrive()
+#define HDlseek(F, O, W)   _lseeki64(F, O, W)
+#define HDlstat(S, B)      _lstati64(S, B)
+#define HDmkdir(S, M)      _mkdir(S)
+#define HDnanosleep(N, O)  Wnanosleep(N, O)
+#define HDoff_t            __int64
 
 /* Note that the variadic HDopen macro is using a VC++ extension
  * where the comma is dropped if nothing is passed to the ellipsis.
  */
 #ifndef H5_HAVE_MINGW
-#define HDopen(S,F,...)     Wopen_utf8(S,F,__VA_ARGS__)
+#define HDopen(S, F, ...) Wopen_utf8(S, F, __VA_ARGS__)
 #else
-#define HDopen(S,F,...)     Wopen_utf8(S,F,##__VA_ARGS__)
+#define HDopen(S, F, ...) Wopen_utf8(S, F, ##__VA_ARGS__)
 #endif
-#define HDread(F,M,Z)       _read(F,M,Z)
-#define HDremove(S)         Wremove_utf8(S)
-#define HDrmdir(S)          _rmdir(S)
-#define HDsetvbuf(F,S,M,Z)  setvbuf(F,S,M,(Z>1?Z:2))
-#define HDsleep(S)          Sleep(S*1000)
-#define HDstat(S,B)         _stati64(S,B)
-#define HDstrcasecmp(A,B)   _stricmp(A,B)
-#define HDstrdup(S)         _strdup(S)
-#define HDstrtok_r(X,Y,Z)   strtok_s(X,Y,Z)
-#define HDtzset()           _tzset()
-#define HDunlink(S)         _unlink(S)
-#define HDwrite(F,M,Z)      _write(F,M,Z)
+#define HDread(F, M, Z)       _read(F, M, Z)
+#define HDremove(S)           Wremove_utf8(S)
+#define HDrmdir(S)            _rmdir(S)
+#define HDsetvbuf(F, S, M, Z) setvbuf(F, S, M, (Z > 1 ? Z : 2))
+#define HDsleep(S)            Sleep(S * 1000)
+#define HDstat(S, B)          _stati64(S, B)
+#define HDstrcasecmp(A, B)    _stricmp(A, B)
+#define HDstrdup(S)           _strdup(S)
+#define HDstrtok_r(X, Y, Z)   strtok_s(X, Y, Z)
+#define HDtzset()             _tzset()
+#define HDunlink(S)           _unlink(S)
+#define HDwrite(F, M, Z)      _write(F, M, Z)
 
 #ifdef H5_HAVE_VISUAL_STUDIO
 
 #if (_MSC_VER < 1800)
-  #ifndef H5_HAVE_STRTOLL
-    #define HDstrtoll(S,R,N)    _strtoi64(S,R,N)
-  #endif /* H5_HAVE_STRTOLL */
-  #ifndef H5_HAVE_STRTOULL
-    #define HDstrtoull(S,R,N)   _strtoui64(S,R,N)
-  #endif /* H5_HAVE_STRTOULL */
-  /* va_copy() does not exist on pre-2013 Visual Studio. Since va_lists are
-   * just pointers into the stack in those CRTs, the usual work-around
-   * is to just define the operation as a pointer copy.
-   */
-  #define HDva_copy(D,S)      ((D) = (S))
+#ifndef H5_HAVE_STRTOLL
+#define HDstrtoll(S, R, N) _strtoi64(S, R, N)
+#endif /* H5_HAVE_STRTOLL */
+#ifndef H5_HAVE_STRTOULL
+#define HDstrtoull(S, R, N) _strtoui64(S, R, N)
+#endif /* H5_HAVE_STRTOULL */
+/* va_copy() does not exist on pre-2013 Visual Studio. Since va_lists are
+ * just pointers into the stack in those CRTs, the usual work-around
+ * is to just define the operation as a pointer copy.
+ */
+#define HDva_copy(D, S) ((D) = (S))
 #endif /* MSC_VER < 1800 */
 
 /*
  * The (void*) cast just avoids a compiler warning in H5_HAVE_VISUAL_STUDIO
  */
-#define HDmemset(X,C,Z)     memset((void*)(X),C,Z)
+#define HDmemset(X, C, Z) memset((void *)(X), C, Z)
 
 struct timezone {
     int tz_minuteswest;
@@ -138,8 +138,7 @@ struct timezone {
 
 /* time.h before VS2015 does not include timespec */
 #if (_MSC_VER < 1900)
-struct timespec
-{
+struct timespec {
     time_t tv_sec;  /* Seconds - >= 0 */
     long   tv_nsec; /* Nanoseconds - [0, 999999999] */
 };
@@ -147,53 +146,52 @@ struct timespec
 
 #if (_MSC_VER <= 1700)
 /* The isnan function needs underscore in VS2012 and earlier */
-#define HDisnan(X)         _isnan(X)
+#define HDisnan(X) _isnan(X)
 /* The round functions do not exist in VS2012 and earlier */
-#define HDllround(V)        Wllround(V)
-#define HDllroundf(V)       Wllroundf(V)
-#define HDlround(V)         Wlround(V)
-#define HDlroundf(V)        Wlroundf(V)
-#define HDround(V)          Wround(V)
-#define HDroundf(V)         Wroundf(V)
+#define HDllround(V)  Wllround(V)
+#define HDllroundf(V) Wllroundf(V)
+#define HDlround(V)   Wlround(V)
+#define HDlroundf(V)  Wlroundf(V)
+#define HDround(V)    Wround(V)
+#define HDroundf(V)   Wroundf(V)
 #endif /* MSC_VER < 1700 */
 
 #endif /* H5_HAVE_VISUAL_STUDIO */
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
-    H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
-    H5_DLL int Wsetenv(const char *name, const char *value, int overwrite);
-    H5_DLL char* Wgetlogin(void);
-    H5_DLL int c99_snprintf(char* str, size_t size, const char* format, ...);
-    H5_DLL int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap);
-    H5_DLL int Wnanosleep(const struct timespec *req, struct timespec *rem);
-    H5_DLL herr_t H5_expand_windows_env_vars(char **env_var);
-    H5_DLL const wchar_t *H5_get_utf16_str(const char *s);
-    H5_DLL int Wopen_utf8(const char *path, int oflag, ...);
-    H5_DLL int Wremove_utf8(const char *path);
-
-    /* Round functions only needed for VS2012 and earlier.
-     * They are always built to ensure they don't go stale and
-     * can be deleted (along with their #defines, above) when we
-     * drop VS2012 support.
-     */
-    H5_DLL long long Wllround(double arg);
-    H5_DLL long long Wllroundf(float arg);
-    H5_DLL long Wlround(double arg);
-    H5_DLL long Wlroundf(float arg);
-    H5_DLL double Wround(double arg);
-    H5_DLL float Wroundf(float arg);
+H5_DLL int    Wgettimeofday(struct timeval *tv, struct timezone *tz);
+H5_DLL int    Wsetenv(const char *name, const char *value, int overwrite);
+H5_DLL char * Wgetlogin(void);
+H5_DLL int    c99_snprintf(char *str, size_t size, const char *format, ...);
+H5_DLL int    c99_vsnprintf(char *str, size_t size, const char *format, va_list ap);
+H5_DLL int    Wnanosleep(const struct timespec *req, struct timespec *rem);
+H5_DLL herr_t H5_expand_windows_env_vars(char **env_var);
+H5_DLL const wchar_t *H5_get_utf16_str(const char *s);
+H5_DLL int            Wopen_utf8(const char *path, int oflag, ...);
+H5_DLL int            Wremove_utf8(const char *path);
+
+/* Round functions only needed for VS2012 and earlier.
+ * They are always built to ensure they don't go stale and
+ * can be deleted (along with their #defines, above) when we
+ * drop VS2012 support.
+ */
+H5_DLL long long Wllround(double arg);
+H5_DLL long long Wllroundf(float arg);
+H5_DLL long      Wlround(double arg);
+H5_DLL long      Wlroundf(float arg);
+H5_DLL double    Wround(double arg);
+H5_DLL float     Wroundf(float arg);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#define HDgettimeofday(V,Z) Wgettimeofday(V,Z)
-#define HDsetenv(N,V,O)     Wsetenv(N,V,O)
-#define HDgetlogin()        Wgetlogin()
-#define HDsnprintf          c99_snprintf /*varargs*/
-#define HDvsnprintf         c99_vsnprintf /*varargs*/
+#define HDgettimeofday(V, Z) Wgettimeofday(V, Z)
+#define HDsetenv(N, V, O)    Wsetenv(N, V, O)
+#define HDgetlogin()         Wgetlogin()
+#define HDsnprintf           c99_snprintf  /*varargs*/
+#define HDvsnprintf          c99_vsnprintf /*varargs*/
 
 /* Non-POSIX functions */
 
@@ -202,9 +200,8 @@ extern "C" {
 #define HDpthread_self_ulong() ((unsigned long)GetCurrentThreadId())
 
 #ifndef H5_HAVE_MINGW
-#define HDftruncate(F,L)    _chsize_s(F,L)
-#define HDfseek(F,O,W)      _fseeki64(F,O,W)
+#define HDftruncate(F, L) _chsize_s(F, L)
+#define HDfseek(F, O, W)  _fseeki64(F, O, W)
 #endif /* H5_HAVE_MINGW */
 
 #endif /* H5_HAVE_WIN32_API */
-
diff --git a/src/hdf5.h b/src/hdf5.h
index 6b7b1f2..551ff2e 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -20,37 +20,37 @@
 #define _HDF5_H
 
 #include "H5public.h"
-#include "H5Apublic.h"		/* Attributes				*/
-#include "H5ACpublic.h"		/* Metadata cache			*/
-#include "H5Dpublic.h"		/* Datasets				*/
-#include "H5Epublic.h"		/* Errors				*/
-#include "H5Fpublic.h"		/* Files				*/
-#include "H5FDpublic.h"		/* File drivers				*/
-#include "H5Gpublic.h"		/* Groups				*/
-#include "H5Ipublic.h"		/* ID management			*/
-#include "H5Lpublic.h"		/* Links				*/
-#include "H5MMpublic.h"		/* Memory management			*/
-#include "H5Opublic.h"		/* Object headers			*/
-#include "H5Ppublic.h"      /* Property lists           */
-#include "H5PLpublic.h"     /* Plugins           */
-#include "H5Rpublic.h"		/* References				*/
-#include "H5Spublic.h"		/* Dataspaces				*/
-#include "H5Tpublic.h"		/* Datatypes				*/
-#include "H5Zpublic.h"		/* Data filters				*/
+#include "H5Apublic.h"  /* Attributes				*/
+#include "H5ACpublic.h" /* Metadata cache			*/
+#include "H5Dpublic.h"  /* Datasets				*/
+#include "H5Epublic.h"  /* Errors				*/
+#include "H5Fpublic.h"  /* Files				*/
+#include "H5FDpublic.h" /* File drivers				*/
+#include "H5Gpublic.h"  /* Groups				*/
+#include "H5Ipublic.h"  /* ID management			*/
+#include "H5Lpublic.h"  /* Links				*/
+#include "H5MMpublic.h" /* Memory management			*/
+#include "H5Opublic.h"  /* Object headers			*/
+#include "H5Ppublic.h"  /* Property lists           */
+#include "H5PLpublic.h" /* Plugins           */
+#include "H5Rpublic.h"  /* References				*/
+#include "H5Spublic.h"  /* Dataspaces				*/
+#include "H5Tpublic.h"  /* Datatypes				*/
+#include "H5Zpublic.h"  /* Data filters				*/
 
 /* Predefined file drivers */
-#include "H5FDcore.h"		/* Files stored entirely in memory	*/
-#include "H5FDfamily.h"		/* File families 			*/
-#include "H5FDhdfs.h"           /* Hadoop HDFS                              */
-#include "H5FDlog.h"        	/* sec2 driver with I/O logging (for debugging) */
-#include "H5FDmpi.h"            /* MPI-based file drivers		*/
-#include "H5FDmulti.h"		/* Usage-partitioned file family	*/
-#include "H5FDros3.h"           /* R/O S3 "file" I/O                        */
-#include "H5FDsec2.h"		/* POSIX unbuffered file I/O		*/
-#include "H5FDstdio.h"		/* Standard C buffered I/O		*/
+#include "H5FDcore.h"   /* Files stored entirely in memory	*/
+#include "H5FDfamily.h" /* File families 			*/
+#include "H5FDhdfs.h"   /* Hadoop HDFS                              */
+#include "H5FDlog.h"    /* sec2 driver with I/O logging (for debugging) */
+#include "H5FDmpi.h"    /* MPI-based file drivers		*/
+#include "H5FDmulti.h"  /* Usage-partitioned file family	*/
+#include "H5FDros3.h"   /* R/O S3 "file" I/O                        */
+#include "H5FDsec2.h"   /* POSIX unbuffered file I/O		*/
+#include "H5FDstdio.h"  /* Standard C buffered I/O		*/
 #ifdef H5_HAVE_WINDOWS
-#include "H5FDwindows.h"        /* Windows buffered I/O     */
+#include "H5FDwindows.h" /* Windows buffered I/O     */
 #endif
-#include "H5FDdirect.h"     	/* Linux direct I/O			*/
+#include "H5FDdirect.h" /* Linux direct I/O			*/
 
 #endif